diff --git a/.scrutinizer.yml b/.scrutinizer.yml
index 6dbf39bde26..3cffed355fa 100644
--- a/.scrutinizer.yml
+++ b/.scrutinizer.yml
@@ -17,8 +17,10 @@ filter:
         - build/*
         - dev/*
         - doc/*
-        - test/*
+        - documents/*
         - htdocs/includes/*
+        - node_modules/*
+        - test/*
     paths: 
         - htdocs/*
         - scripts/*
diff --git a/.travis.yml b/.travis.yml
index 9d0700d3a84..0aa5594790a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -35,10 +35,6 @@ addons:
 
 php:
 - '5.6'
-- '7.0'
-- '7.1'
-- '7.2'
-- '7.3'
 - '7.4'
 - nightly
 
@@ -121,19 +117,31 @@ install:
 
 - |
   echo "Installing Composer dependencies - PHP Unit, Parallel Lint, PHP CodeSniffer - for $TRAVIS_PHP_VERSION"
-  if [ "$TRAVIS_PHP_VERSION" = '5.6' ] || [ "$TRAVIS_PHP_VERSION" = '7.0' ] || [ "$TRAVIS_PHP_VERSION" = '7.1' ] \
-     [ "$TRAVIS_PHP_VERSION" = '7.2' ] || [ "$TRAVIS_PHP_VERSION" = '7.3' ] || [ "$TRAVIS_PHP_VERSION" = '7.4' ]; then
+  if [ "$TRAVIS_PHP_VERSION" = '5.6' ]; then
     composer -n require phpunit/phpunit ^5 \
                         php-parallel-lint/php-parallel-lint ^1 \
                         php-parallel-lint/php-console-highlighter ^0 \
                         squizlabs/php_codesniffer ^3
   fi
+  if [ "$TRAVIS_PHP_VERSION" = '7.0' ] || [ "$TRAVIS_PHP_VERSION" = '7.1' ] || [ "$TRAVIS_PHP_VERSION" = '7.2' ]; then
+    composer -n require phpunit/phpunit ^6 \
+                        php-parallel-lint/php-parallel-lint ^1 \
+                        php-parallel-lint/php-console-highlighter ^0 \
+                        squizlabs/php_codesniffer ^3
+  fi
+  if [ "$TRAVIS_PHP_VERSION" = '7.3' ] || [ "$TRAVIS_PHP_VERSION" = '7.4' ]; then
+    composer -n require phpunit/phpunit ^7 \
+                        php-parallel-lint/php-parallel-lint ^1.2 \
+                        php-parallel-lint/php-console-highlighter ^0 \
+                        squizlabs/php_codesniffer ^3
+  fi
+  # phpunit 9 is required for php 8
   if [ "$TRAVIS_PHP_VERSION" = 'nightly' ]; then
-      composer -n require --ignore-platform-reqs phpunit/phpunit ^5 \
+      composer -n require --ignore-platform-reqs phpunit/phpunit ^7 \
                                                  php-parallel-lint/php-parallel-lint ^1.2 \
                                                  php-parallel-lint/php-console-highlighter ^0 \
                                                  squizlabs/php_codesniffer ^3
-    fi
+  fi
   echo
 
 - |
@@ -165,15 +173,20 @@ before_script:
 
   - |
     echo "Versions information"
+    echo
     # Check PHP
     echo "PHP version"
     php -i | head -
-    # Check PHP CodeSniffer installation
+    # Check Parallel-lin version
+    echo "Parallel-lint version"
+    which parallel-lint
+    parallel-lint -V
+    # Check PHP CodeSniffer version
     echo "PHPCS version"
     which phpcs
     phpcs --version | head -
     phpcs -i | head -
-    # Check PHPUnit installation
+    # Check PHPUnit version
     echo "PHPUnit version"
     which phpunit
     phpunit --version | head -
@@ -287,12 +300,13 @@ script:
   echo
 
 - |
-  echo "Checking coding style (excluding Pull Requests builds)"
+  echo "Checking coding style (excluding Pull Requests builds to not overload travis, excluding also for some jobs to avoid duplicate tests)"
   # Ensure we catch errors
   set -e
   # Exclusions are defined in the ruleset.xml file
-  #phpcs -s -p -d memory_limit=-1 --extensions=php --colors --tab-width=4 --standard=dev/setup/codesniffer/ruleset.xml --encoding=utf-8 --runtime-set ignore_warnings_on_exit true .
-  if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then phpcs -s -p -d memory_limit=-1 --extensions=php --colors --tab-width=4 --standard=dev/setup/codesniffer/ruleset.xml --encoding=utf-8 --runtime-set ignore_warnings_on_exit true .; fi
+  if [ "$TRAVIS_PULL_REQUEST" = "false" ] && [ "$TRAVIS_PHP_VERSION" = "7.4" ] && [ "$DB" = "mysql" ]; then
+    phpcs -s -p -d memory_limit=-1 --extensions=php --colors --tab-width=4 --standard=dev/setup/codesniffer/ruleset.xml --encoding=utf-8 --runtime-set ignore_warnings_on_exit true .;
+  fi
   set +e
   echo
 
@@ -409,7 +423,7 @@ script:
   php step5.php 12.0.0 13.0.0 > $TRAVIS_BUILD_DIR/upgrade12001300-3.log
 
   # Enable modules not enabled into original dump
-  php upgrade2.php 0.0.0 0.0.0 MAIN_MODULE_API,MAIN_MODULE_SUPPLIERPROPOSAL,MAIN_MODULE_WEBSITE,MAIN_MODULE_TICKETSUP,MAIN_MODULE_ACCOUNTING > $TRAVIS_BUILD_DIR/enablemodule.log
+  php upgrade2.php 0.0.0 0.0.0 MAIN_MODULE_API,MAIN_MODULE_SUPPLIERPROPOSAL,MAIN_MODULE_WEBSITE,MAIN_MODULE_TICKET,MAIN_MODULE_ACCOUNTING,MAIN_MODULE_MRP > $TRAVIS_BUILD_DIR/enablemodule.log
   echo $?
   cd -
   set +e
diff --git a/COPYRIGHT b/COPYRIGHT
index d8cefedcd65..d43f4d506f1 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -21,6 +21,7 @@ Mobiledetect           2.8.34        MIT License                 Yes
 NuSoap                 0.9.5         LGPL 2.1+                   Yes             Library to develop SOAP Web services (not into rpm and deb package)
 PEAR Mail_MIME         1.8.9         BSD                         Yes             NuSoap dependency
 ParseDown              1.6           MIT License                 Yes             Markdown parser
+PCLZip                 2.8.4         LGPL-3+                     Yes             Library to zip/unzip files             
 PHPDebugBar            1.15.1        MIT License	             Yes             Used only by the module "debugbar" for developers
 PHPExcel               1.8.1         LGPL-2.1+                   Yes             Read/Write XLS files, read ODS files
 PHPSpreadSheet         ?             LGPL-2.1+                   Yes             Read/Write XLS files, read ODS files
diff --git a/ChangeLog b/ChangeLog
index 2e365b4f645..516bc270321 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,29 +8,29 @@ For users:
 NEW: Add module "Credit transfer SEPA" to manage payment of vendors using bank credit transfer SEPA files.
 NEW: Module Reception (for a more accurate management of your receptions) moved from experimental to stable.
 NEW: Several security issues after a private bug bounty campaign. 
-NEW: #15065 Fix formatting
 NEW: #15065 Put the product label in bold in the PDF templates if configured
 NEW: Accountancy - Add chart of sub accounts
 NEW: Accountancy - Add options to disable binding on sales, purchases & expense reports independently of the modules
-NEW: Accountancy balance - Add a input to show subtotal by group
+NEW: Accountancy balance - Add a menu entry to show subtotal by group
 NEW: Accountancy - Move to real ledger, real journals, menu disposition
 NEW: Accountancy - On transfers, select the periodicity by default
+NEW: New currency rate editor.
 NEW: Add 2 rules for emailcollector: Message send/not sent from Dolibarr
-NEW: Add a counter of number of words of pages in website module
-NEW: add alert before change thirdparty in takepos
-NEW: Add a page to list Stock at a given date.
+NEW: Add a counter of number of words for pages in website module
+NEW: add alert before changing thirdparty in takepos
+NEW: Add a page to list Stock at a given date in the past.
 NEW: Add a start date to begin binding in accountancy
-NEW: Add a stat page to list popularity of products on invoices
+NEW: Add a statistics page to list popularity of products on invoices
 NEW: Add calendar selection for agenda view
-NEW: add class for ticket edition (pdf or odt)
+NEW: Support documents generation for ticket edition (pdf or odt)
 NEW: Add column payment term into list of supplier invoices.
 NEW: Add column quantity in product margin page
 NEW: Add column vat rate in page to define accounting account on product/service
 NEW: Add common list function for available app/module page
 NEW: add costprice in fields of products list
-NEW: ADDED IMPORT TOOL FOR CUSTOMER ORDER, PO, PROPOSAL MODULE, SUPPLIER INVOICE
-NEW: Added incoterms to substitution array
-NEW: Add employee in expense report binding page
+NEW: Added an import profile for CUSTOMER ORDER, PO, PROPOSAL MODULE, SUPPLIER INVOICE
+NEW: Added incoterms dara into the substitution array
+NEW: Add employee link in expense report binding page
 NEW: Add export for various payment
 NEW: add extra fields labels and values in mail on create ticket
 NEW: Add extrafields support on ECM module
@@ -45,13 +45,14 @@ NEW: Add helper function for table headers with numbers
 NEW: add hooks on stats pages
 NEW: Add link to edit property from search result of website pages
 NEW: Add link to reset qty on supplier dispatch page
-NEW: add MAIN_EMAILCOLLECTOR_MAIL_WITHOUT_HEADER const to remove header in email collector
-NEW: Add Manufacturing Orders into the automatic ECM
+NEW: add MAIN_EMAILCOLLECTOR_MAIL_WITHOUT_HEADER const to remove header stored by email collector
+NEW: Add Manufacturing Orders attached files into the automatic ECM view
 NEW: add margin info in invoice list
 NEW: Add mass action to set category on a list of website pages.
 NEW: Add mass deletion for events
+NEW: Add mass deletion for draft invoices
 NEW: Add __MEMBER_TYPE__ substitution key
-NEW: Add message in error_log after detection of SQL or script injection
+NEW: Add a message in error_log after detection of SQL or script injection
 NEW: Add module Credit transfer SEPA to manage payment of supplier using
 NEW: Add more filters on monthly statement list
 NEW: Add option TAKEPOS_CAN_FORCE_BANK_ACCOUNT_DURING_PAYMENT
diff --git a/README-FR.md b/README-FR.md
index bccb7b0143b..77bb5a3e27a 100644
--- a/README-FR.md
+++ b/README-FR.md
@@ -6,7 +6,7 @@
 Dolibarr ERP & CRM est un logiciel moderne pour gérer votre activité (société, association, auto-entrepreneurs, artisans).
 Il est simple d'utilisation et modulaire, vous permettant de n'activez que les fonctions dont vous avez besoin (contacts, fournisseurs, factures, commandes, stocks, agenda, ...).
 
-![ScreenShot](https://www.dolibarr.org/images/dolibarr_screenshot1_1920x1080.jpg)
+![ScreenShot](https://www.dolibarr.org/medias/dolibarr_screenshot1_1920x1080.jpg)
 
 ## LICENCE
 
diff --git a/README.md b/README.md
index 919fc62ae5b..ac8f1d06382 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@ You can use it as a standalone application or as a web application to access it
 
 Dolibarr has a large community ready to help you, free forums and [oficially preferred partners ready to offer commercial support should you need it](https://partners.dolibarr.org)
 
-![ScreenShot](https://www.dolibarr.org/images/dolibarr_screenshot1_1920x1080.jpg)
+![ScreenShot](https://www.dolibarr.org/medias/dolibarr_screenshot1_1920x1080.jpg)
 
 ## LICENSE
 
diff --git a/build/debian/conf.php.install b/build/debian/conf.php.install
index 6741d7ea544..c373664deef 100644
--- a/build/debian/conf.php.install
+++ b/build/debian/conf.php.install
@@ -232,7 +232,7 @@ $dolibarr_main_prod='0';
 # Examples:
 # $dolibarr_mailing_limit_sendbycli='0';
 
-# dolibarr_distrib
+# dolibarr_main_distrib
 # A key to identify the distribution used for first installation
-$dolibarr_distrib = 'deb';
+$dolibarr_main_distrib = 'debian';
 
diff --git a/build/debian/install.forced.php.install b/build/debian/install.forced.php.install
index e55ffae138e..0cb02c2342d 100644
--- a/build/debian/install.forced.php.install
+++ b/build/debian/install.forced.php.install
@@ -24,6 +24,7 @@ $force_install_databaserootpass='__SUPERUSERPASSWORD__';
 $force_install_dolibarrlogin='admin';
 $force_install_nophpinfo='1';
 $force_install_lockinstall='444';
+$force_install_distrib='debian';
 
 // Value to overwrite path to use shared libraries/fonts instead of embedded one.
 // If during install, we enable/disable declaration to use non embedded libraries, we must also check they are 
diff --git a/build/docker/Dockerfile b/build/docker/Dockerfile
index 2be287c2db9..dca74e9e720 100644
--- a/build/docker/Dockerfile
+++ b/build/docker/Dockerfile
@@ -20,6 +20,9 @@ RUN apt-get update -y \
         unzip \
         curl \
         apt-utils \
+        msmtp \
+        msmtp-mta \
+        mailutils \
     && apt-get autoremove -y \
     && rm -rf /var/lib/apt/lists/* \
     && docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \
@@ -44,7 +47,17 @@ RUN echo 'xdebug.remote_port=9000' >> ${PHP_INI_DIR}/php.ini
 RUN echo 'xdebug.remote_connect_back=1' >> ${PHP_INI_DIR}/php.ini
 RUN echo 'xdebug.profiler_enable=0' >> ${PHP_INI_DIR}/php.ini
 RUN echo 'xdebug.remote_log="/tmp/xdebug.log"' >> ${PHP_INI_DIR}/php.ini
-#RUN echo '172.17.0.1 docker.host' >> /etc/hosts
+#RUN echo 'localhost docker.host' >> /etc/hosts
+
+# set up sendmail config, to use maildev
+RUN echo "account default" > /etc/msmtprc
+RUN echo "auth off" >> /etc/msmtprc
+RUN echo "port 25" >> /etc/msmtprc
+RUN echo "host mail" >> /etc/msmtprc
+RUN echo "from local@localdomain.com" >> /etc/msmtprc
+RUN echo "domain localhost.localdomain" >> /etc/msmtprc
+RUN echo "sendmail_path=/usr/bin/msmtp -t" >> /usr/local/etc/php/conf.d/php-sendmail.ini
+RUN echo "localhost localhost.localdomain" >> /etc/hosts
 
 EXPOSE 80
 
diff --git a/build/docker/README.md b/build/docker/README.md
index 2fd278a531f..d469c7c7aae 100644
--- a/build/docker/README.md
+++ b/build/docker/README.md
@@ -16,7 +16,7 @@ And then, you can run :
 
         docker-compose up
 
-This will run 3 container Docker : Dolibarr, MariaDB and PhpMyAdmin.
+This will run 4 containers Docker : Dolibarr, MariaDB, PhpMyAdmin and MailDev.
 
 The URL to go to the Dolibarr is :
 
@@ -25,7 +25,10 @@ The URL to go to the Dolibarr is :
 The URL to go to PhpMyAdmin is (login/password is root/root) :
 
         http://0.0.0.0:8080
+        
+In Dolibarr configuration Email let PHP mail function, To see all mail send by Dolibarr go to maildev
 
-Setup the database connection during the installation process, please use mariad
-b (name of the database container) as database host.
+        http://0.0.0.0:8081
+
+Setup the database connection during the installation process, please use mariadb (name of the database container) as database host.
 Setup documents folder, during the installation process, to /var/documents
diff --git a/build/docker/docker-compose.yml b/build/docker/docker-compose.yml
index 7e4ceda902e..2167f069f25 100644
--- a/build/docker/docker-compose.yml
+++ b/build/docker/docker-compose.yml
@@ -52,3 +52,6 @@ services:
         ports:
             - "8081:80"
             - "25:25"
+        networks:
+            - internal-pod
+            - external-pod
diff --git a/build/exe/doliwamp/install.forced.php.install b/build/exe/doliwamp/install.forced.php.install
index c59b373a7a0..8947154a57b 100644
--- a/build/exe/doliwamp/install.forced.php.install
+++ b/build/exe/doliwamp/install.forced.php.install
@@ -22,6 +22,7 @@ $force_install_databaserootpass='WAMPMYSQLNEWPASSWORD';
 $force_install_dolibarrlogin='admin';
 $force_install_nophpinfo='1';
 $force_install_lockinstall='644';
+$force_install_distrib='doliwamp';
 
 $force_install_module='';
 ?>
\ No newline at end of file
diff --git a/build/rpm/install.forced.php.fedora b/build/rpm/install.forced.php.fedora
index a8db3e25c9e..4d25010a533 100644
--- a/build/rpm/install.forced.php.fedora
+++ b/build/rpm/install.forced.php.fedora
@@ -17,6 +17,7 @@ $force_install_databaserootpass='__SUPERUSERPASSWORD__';
 $force_install_dolibarrlogin='admin';
 $force_install_nophpinfo='1';
 $force_install_lockinstall='444';
+$force_install_distrib='rpmfedora';
 
 // Value to overwrite path to use shared libraries/fonts instead of embedded one
 $force_dolibarr_lib_ADODB_PATH='/usr/share/php/adodb';
diff --git a/build/rpm/install.forced.php.generic b/build/rpm/install.forced.php.generic
index 107ef533310..20ec33a1af0 100644
--- a/build/rpm/install.forced.php.generic
+++ b/build/rpm/install.forced.php.generic
@@ -17,6 +17,7 @@ $force_install_databaserootpass='__SUPERUSERPASSWORD__';
 $force_install_dolibarrlogin='admin';
 $force_install_nophpinfo='1';
 $force_install_lockinstall='444';
+$force_install_distrib='rpmgeneric';
 
 // Value to overwrite path to use shared libraries/fonts instead of embedded one
 // We don't force any external lib with generic package
diff --git a/build/rpm/install.forced.php.mandriva b/build/rpm/install.forced.php.mandriva
index 927877b59d0..835f5f45570 100644
--- a/build/rpm/install.forced.php.mandriva
+++ b/build/rpm/install.forced.php.mandriva
@@ -17,6 +17,7 @@ $force_install_databaserootpass='__SUPERUSERPASSWORD__';
 $force_install_dolibarrlogin='admin';
 $force_install_nophpinfo='1';
 $force_install_lockinstall='444';
+$force_install_distrib='rpmmandriva';
 
 // Value to overwrite path to use shared libraries/fonts instead of embedded one
 $force_dolibarr_lib_ADODB_PATH='/usr/share/php/adodb';
diff --git a/build/rpm/install.forced.php.opensuse b/build/rpm/install.forced.php.opensuse
index c91836918f4..b3cab5a0e4d 100644
--- a/build/rpm/install.forced.php.opensuse
+++ b/build/rpm/install.forced.php.opensuse
@@ -17,6 +17,7 @@ $force_install_databaserootpass='__SUPERUSERPASSWORD__';
 $force_install_dolibarrlogin='admin';
 $force_install_nophpinfo='1';
 $force_install_lockinstall='444';
+$force_install_distrib='rpmopensuse';
 
 // Value to overwrite path to use shared libraries/fonts instead of embedded one
 //$force_dolibarr_lib_ADODB_PATH='/usr/share/php/adodb';
diff --git a/dev/setup/codesniffer/ruleset.xml b/dev/setup/codesniffer/ruleset.xml
index 03104270dcf..bf283993628 100644
--- a/dev/setup/codesniffer/ruleset.xml
+++ b/dev/setup/codesniffer/ruleset.xml
@@ -17,6 +17,7 @@
 	<exclude-pattern type="relative">*/nltechno*</exclude-pattern>
 	<exclude-pattern type="relative">*/htdocs/includes</exclude-pattern>
 	<exclude-pattern type="relative">*/htdocs/includes</exclude-pattern>
+	<exclude-pattern type="relative">.git</exclude-pattern>
 
 	<!-- List of all tests -->
 
diff --git a/htdocs/accountancy/admin/account.php b/htdocs/accountancy/admin/account.php
index 88282447c51..47a984cd467 100644
--- a/htdocs/accountancy/admin/account.php
+++ b/htdocs/accountancy/admin/account.php
@@ -65,12 +65,12 @@ if (!$sortfield) $sortfield = "aa.account_number";
 if (!$sortorder) $sortorder = "ASC";
 
 $arrayfields = array(
-    'aa.account_number'=>array('label'=>$langs->trans("AccountNumber"), 'checked'=>1),
-    'aa.label'=>array('label'=>$langs->trans("Label"), 'checked'=>1),
+	'aa.account_number'=>array('label'=>$langs->trans("AccountNumber"), 'checked'=>1),
+	'aa.label'=>array('label'=>$langs->trans("Label"), 'checked'=>1),
 	'aa.labelshort'=>array('label'=>$langs->trans("LabelToShow"), 'checked'=>1),
 	'aa.account_parent'=>array('label'=>$langs->trans("Accountparent"), 'checked'=>1),
-    'aa.pcg_type'=>array('label'=>$langs->trans("Pcgtype"), 'checked'=>1, 'help'=>'PcgtypeDesc'),
-    'aa.reconcilable'=>array('label'=>$langs->trans("Reconcilable"), 'checked'=>1),
+	'aa.pcg_type'=>array('label'=>$langs->trans("Pcgtype"), 'checked'=>1, 'help'=>'PcgtypeDesc'),
+	'aa.reconcilable'=>array('label'=>$langs->trans("Reconcilable"), 'checked'=>1),
 	'aa.active'=>array('label'=>$langs->trans("Activated"), 'checked'=>1)
 );
 
@@ -93,24 +93,24 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 
 if (empty($reshook))
 {
-    if (!empty($cancel)) $action = '';
+	if (!empty($cancel)) $action = '';
 
-    include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
+	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
-    if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All test are required to be compatible with all browsers
-    {
-    	$search_account = "";
-    	$search_label = "";
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All test are required to be compatible with all browsers
+	{
+		$search_account = "";
+		$search_label = "";
 		$search_labelshort = "";
 		$search_accountparent = "";
-    	$search_pcgtype = "";
+		$search_pcgtype = "";
 		$search_array_options = array();
-    }
-    if ((GETPOST('valid_change_chart', 'alpha') && GETPOST('chartofaccounts', 'int') > 0)	// explicit click on button 'Change and load' with js on
-    	|| (GETPOST('chartofaccounts', 'int') > 0 && GETPOST('chartofaccounts', 'int') != $conf->global->CHARTOFACCOUNTS))	// a submit of form is done and chartofaccounts combo has been modified
-    {
-        if ($chartofaccounts > 0)
-        {
+	}
+	if ((GETPOST('valid_change_chart', 'alpha') && GETPOST('chartofaccounts', 'int') > 0)	// explicit click on button 'Change and load' with js on
+		|| (GETPOST('chartofaccounts', 'int') > 0 && GETPOST('chartofaccounts', 'int') != $conf->global->CHARTOFACCOUNTS))	// a submit of form is done and chartofaccounts combo has been modified
+	{
+		if ($chartofaccounts > 0)
+		{
 			// Get language code for this $chartofaccounts
 			$sql = 'SELECT code FROM '.MAIN_DB_PREFIX.'c_country as c, '.MAIN_DB_PREFIX.'accounting_system as a';
 			$sql .= ' WHERE c.rowid = a.fk_country AND a.rowid = '.(int) $chartofaccounts;
@@ -147,34 +147,34 @@ if (empty($reshook))
 				}
 			}
 
-            if (!dolibarr_set_const($db, 'CHARTOFACCOUNTS', $chartofaccounts, 'chaine', 0, '', $conf->entity)) {
-                $error++;
-            }
-        } else {
-            $error++;
-        }
-    }
+			if (!dolibarr_set_const($db, 'CHARTOFACCOUNTS', $chartofaccounts, 'chaine', 0, '', $conf->entity)) {
+				$error++;
+			}
+		} else {
+			$error++;
+		}
+	}
 
-    if ($action == 'disable') {
-    	if ($accounting->fetch($id)) {
-            $mode = GETPOST('mode', 'int');
-    		$result = $accounting->accountDeactivate($id, $mode);
-    	}
+	if ($action == 'disable') {
+		if ($accounting->fetch($id)) {
+			$mode = GETPOST('mode', 'int');
+			$result = $accounting->accountDeactivate($id, $mode);
+		}
 
-    	$action = 'update';
-    	if ($result < 0) {
-    		setEventMessages($accounting->error, $accounting->errors, 'errors');
-    	}
-    } elseif ($action == 'enable') {
-    	if ($accounting->fetch($id)) {
-            $mode = GETPOST('mode', 'int');
-    		$result = $accounting->account_activate($id, $mode);
-    	}
-    	$action = 'update';
-    	if ($result < 0) {
-    		setEventMessages($accounting->error, $accounting->errors, 'errors');
-    	}
-    }
+		$action = 'update';
+		if ($result < 0) {
+			setEventMessages($accounting->error, $accounting->errors, 'errors');
+		}
+	} elseif ($action == 'enable') {
+		if ($accounting->fetch($id)) {
+			$mode = GETPOST('mode', 'int');
+			$result = $accounting->account_activate($id, $mode);
+		}
+		$action = 'update';
+		if ($result < 0) {
+			setEventMessages($accounting->error, $accounting->errors, 'errors');
+		}
+	}
 }
 
 
@@ -273,9 +273,9 @@ if ($resql)
 	if ($search_pcgtype) $param .= '&search_pcgtype='.urlencode($search_pcgtype);
 	if ($optioncss != '') $param .= '&optioncss='.urlencode($optioncss);
 
-    if (!empty($conf->use_javascript_ajax))
-    {
-	    print '<!-- Add javascript to reload page when we click "Change plan" -->
+	if (!empty($conf->use_javascript_ajax))
+	{
+		print '<!-- Add javascript to reload page when we click "Change plan" -->
 			<script type="text/javascript">
 			$(document).ready(function () {
 		    	$("#change_chart").on("click", function (e) {
@@ -285,7 +285,7 @@ if ($resql)
 			    });
 			});
 	    	</script>';
-    }
+	}
 
 	print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
 	if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
@@ -296,48 +296,48 @@ if ($resql)
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 	print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
-    $newcardbutton .= dolGetButtonTitle($langs->trans("New"), $langs->trans("Addanaccount"), 'fa fa-plus-circle', './card.php?action=create');
+	$newcardbutton .= dolGetButtonTitle($langs->trans("New"), $langs->trans("Addanaccount"), 'fa fa-plus-circle', './card.php?action=create');
 
-    print_barre_liste($langs->trans('ListAccounts'), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_accountancy', 0, $newcardbutton, '', $limit, 0, 0, 1);
+	print_barre_liste($langs->trans('ListAccounts'), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_accountancy', 0, $newcardbutton, '', $limit, 0, 0, 1);
 
 	// Box to select active chart of account
-    print $langs->trans("Selectchartofaccounts")." : ";
-    print '<select class="flat" name="chartofaccounts" id="chartofaccounts">';
-    $sql = "SELECT a.rowid, a.pcg_version, a.label, a.active, c.code as country_code";
-    $sql .= " FROM ".MAIN_DB_PREFIX."accounting_system as a";
-    $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON a.fk_country = c.rowid AND c.active = 1";
-    $sql .= " WHERE a.active = 1";
-    dol_syslog('accountancy/admin/account.php $sql='.$sql);
-    print $sql;
-    $resqlchart = $db->query($sql);
-    if ($resqlchart) {
-        $numbis = $db->num_rows($resqlchart);
-        $i = 0;
-        while ($i < $numbis) {
-            $obj = $db->fetch_object($resqlchart);
+	print $langs->trans("Selectchartofaccounts")." : ";
+	print '<select class="flat" name="chartofaccounts" id="chartofaccounts">';
+	$sql = "SELECT a.rowid, a.pcg_version, a.label, a.active, c.code as country_code";
+	$sql .= " FROM ".MAIN_DB_PREFIX."accounting_system as a";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON a.fk_country = c.rowid AND c.active = 1";
+	$sql .= " WHERE a.active = 1";
+	dol_syslog('accountancy/admin/account.php $sql='.$sql);
+	print $sql;
+	$resqlchart = $db->query($sql);
+	if ($resqlchart) {
+		$numbis = $db->num_rows($resqlchart);
+		$i = 0;
+		while ($i < $numbis) {
+			$obj = $db->fetch_object($resqlchart);
 
-            print '<option value="'.$obj->rowid.'"';
-            print ($pcgver == $obj->rowid) ? ' selected' : '';
-            print '>'.$obj->pcg_version.' - '.$obj->label.' - ('.$obj->country_code.')</option>';
+			print '<option value="'.$obj->rowid.'"';
+			print ($pcgver == $obj->rowid) ? ' selected' : '';
+			print '>'.$obj->pcg_version.' - '.$obj->label.' - ('.$obj->country_code.')</option>';
 
-            $i++;
-        }
-    } else dol_print_error($db);
-    print "</select>";
-    print ajax_combobox("chartofaccounts");
-    print '<input type="'.(empty($conf->use_javascript_ajax) ? 'submit' : 'button').'" class="button" name="change_chart" id="change_chart" value="'.dol_escape_htmltag($langs->trans("ChangeAndLoad")).'">';
+			$i++;
+		}
+	} else dol_print_error($db);
+	print "</select>";
+	print ajax_combobox("chartofaccounts");
+	print '<input type="'.(empty($conf->use_javascript_ajax) ? 'submit' : 'button').'" class="button" name="change_chart" id="change_chart" value="'.dol_escape_htmltag($langs->trans("ChangeAndLoad")).'">';
 
-    print '<br>';
+	print '<br>';
 	print '<br>';
 
 	$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-    $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
+	$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
 
-    $moreforfilter = '';
-    $massactionbutton = '';
+	$moreforfilter = '';
+	$massactionbutton = '';
 
-    print '<div class="div-table-responsive">';
-    print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
+	print '<div class="div-table-responsive">';
+	print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 	// Line for search fields
 	print '<tr class="liste_titre_filter">';
@@ -358,7 +358,7 @@ if ($resql)
 	print '</td>';
 	print '</tr>';
 
-    print '<tr class="liste_titre">';
+	print '<tr class="liste_titre">';
 	if (!empty($arrayfields['aa.account_number']['checked']))	print_liste_field_titre($arrayfields['aa.account_number']['label'], $_SERVER["PHP_SELF"], "aa.account_number", "", $param, '', $sortfield, $sortorder);
 	if (!empty($arrayfields['aa.label']['checked']))			print_liste_field_titre($arrayfields['aa.label']['label'], $_SERVER["PHP_SELF"], "aa.label", "", $param, '', $sortfield, $sortorder);
 	if (!empty($arrayfields['aa.labelshort']['checked']))		print_liste_field_titre($arrayfields['aa.labelshort']['label'], $_SERVER["PHP_SELF"], "aa.labelshort", "", $param, '', $sortfield, $sortorder);
@@ -422,7 +422,7 @@ if ($resql)
 				print '<!-- obj->account_parent = '.$obj->account_parent.' obj->rowid2 = '.$obj->rowid2.' -->';
 				$accountparent->id = $obj->rowid2;
 				$accountparent->label = $obj->label2;
-				$accountparent->account_number = $obj->account_number2;	// Sotre an account number for output
+				$accountparent->account_number = $obj->account_number2; // Sotre an account number for output
 				print $accountparent->getNomUrl(1);
 				print "</td>\n";
 				if (!$i) $totalarray['nbfield']++;
diff --git a/htdocs/accountancy/admin/accountmodel.php b/htdocs/accountancy/admin/accountmodel.php
index d3bd17d95a5..acec1468d79 100644
--- a/htdocs/accountancy/admin/accountmodel.php
+++ b/htdocs/accountancy/admin/accountmodel.php
@@ -472,13 +472,13 @@ if ($id)
 
 			if ($valuetoshow != '') {
 				print '<td class="'.$class.'">';
-                if (!empty($tabhelp[$id][$value]) && preg_match('/^http(s*):/i', $tabhelp[$id][$value])) {
-                    print '<a href="'.$tabhelp[$id][$value].'" target="_blank">'.$valuetoshow.' '.img_help(1, $valuetoshow).'</a>';
-                } elseif (!empty($tabhelp[$id][$value])) {
-                    print $form->textwithpicto($valuetoshow, $tabhelp[$id][$value]);
-                } else {
-                    print $valuetoshow;
-                }
+				if (!empty($tabhelp[$id][$value]) && preg_match('/^http(s*):/i', $tabhelp[$id][$value])) {
+					print '<a href="'.$tabhelp[$id][$value].'" target="_blank">'.$valuetoshow.' '.img_help(1, $valuetoshow).'</a>';
+				} elseif (!empty($tabhelp[$id][$value])) {
+					print $form->textwithpicto($valuetoshow, $tabhelp[$id][$value]);
+				} else {
+					print $valuetoshow;
+				}
 				print '</td>';
 			}
 			if ($fieldlist[$field] == 'libelle' || $fieldlist[$field] == 'label') $alabelisused = 1;
diff --git a/htdocs/accountancy/admin/card.php b/htdocs/accountancy/admin/card.php
index fdbb86d1a62..b4f90f19675 100644
--- a/htdocs/accountancy/admin/card.php
+++ b/htdocs/accountancy/admin/card.php
@@ -108,16 +108,16 @@ if ($action == 'add' && $user->rights->accounting->chartofaccount)
 			setEventMessages($object->error, $object->errors, 'errors');
 		} elseif ($res < 0)
 		{
-		    $error++;
-		    setEventMessages($object->error, $object->errors, 'errors');
-		    $action = "create";
+			$error++;
+			setEventMessages($object->error, $object->errors, 'errors');
+			$action = "create";
 		}
 		if (!$error)
 		{
-		    setEventMessages("RecordCreatedSuccessfully", null, 'mesgs');
-		    $urltogo = $backtopage ? $backtopage : dol_buildpath('/accountancy/admin/account.php', 1);
-		    header("Location: ".$urltogo);
-		    exit;
+			setEventMessages("RecordCreatedSuccessfully", null, 'mesgs');
+			$urltogo = $backtopage ? $backtopage : dol_buildpath('/accountancy/admin/account.php', 1);
+			header("Location: ".$urltogo);
+			exit;
 		}
 	}
 } elseif ($action == 'edit' && $user->rights->accounting->chartofaccount) {
@@ -158,15 +158,15 @@ if ($action == 'add' && $user->rights->accounting->chartofaccount)
 		$result = $object->update($user);
 
 		if ($result > 0) {
-		    $urltogo = $backtopage ? $backtopage : ($_SERVER["PHP_SELF"]."?id=".$id);
-		    header("Location: ".$urltogo);
+			$urltogo = $backtopage ? $backtopage : ($_SERVER["PHP_SELF"]."?id=".$id);
+			header("Location: ".$urltogo);
 			exit();
 		} else {
 			$mesg = $object->error;
 		}
 	} else {
-	    $urltogo = $backtopage ? $backtopage : ($_SERVER["PHP_SELF"]."?id=".$id);
-	    header("Location: ".$urltogo);
+		$urltogo = $backtopage ? $backtopage : ($_SERVER["PHP_SELF"]."?id=".$id);
+		header("Location: ".$urltogo);
 		exit();
 	}
 } elseif ($action == 'delete' && $user->rights->accounting->chartofaccount) {
@@ -252,7 +252,7 @@ if ($action == 'create') {
 
 	print '</table>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div class="center">';
 	print '<input class="button" type="submit" value="'.$langs->trans("Save").'">';
@@ -314,7 +314,7 @@ if ($action == 'create') {
 
 			print '</table>';
 
-			dol_fiche_end();
+			print dol_get_fiche_end();
 
 			print '<div class="center">';
 			print '<input type="submit" class="button" value="'.$langs->trans("Save").'">';
@@ -364,7 +364,7 @@ if ($action == 'create') {
 
 			print '</div>';
 
-			dol_fiche_end();
+			print dol_get_fiche_end();
 
 			/*
 			 * Actions buttons
diff --git a/htdocs/accountancy/admin/categories.php b/htdocs/accountancy/admin/categories.php
index db17be68e1e..eefe62a47a4 100644
--- a/htdocs/accountancy/admin/categories.php
+++ b/htdocs/accountancy/admin/categories.php
@@ -146,7 +146,7 @@ if (!empty($cat_id))
 
 print '</table>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '</form>';
 
diff --git a/htdocs/accountancy/admin/categories_list.php b/htdocs/accountancy/admin/categories_list.php
index 9469a1e64f1..c9adac2f5a3 100644
--- a/htdocs/accountancy/admin/categories_list.php
+++ b/htdocs/accountancy/admin/categories_list.php
@@ -135,249 +135,249 @@ $sourceList = array();
 
 if (GETPOST('button_removefilter', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter_x', 'alpha'))
 {
-    $search_country_id = '';
+	$search_country_id = '';
 }
 
 // Actions add or modify an entry into a dictionary
 if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha'))
 {
-    $listfield = explode(',', str_replace(' ', '', $tabfield[$id]));
-    $listfieldinsert = explode(',', $tabfieldinsert[$id]);
-    $listfieldmodify = explode(',', $tabfieldinsert[$id]);
-    $listfieldvalue = explode(',', $tabfieldvalue[$id]);
+	$listfield = explode(',', str_replace(' ', '', $tabfield[$id]));
+	$listfieldinsert = explode(',', $tabfieldinsert[$id]);
+	$listfieldmodify = explode(',', $tabfieldinsert[$id]);
+	$listfieldvalue = explode(',', $tabfieldvalue[$id]);
 
-    // Check that all fields are filled
-    $ok = 1;
-    foreach ($listfield as $f => $value)
-    {
+	// Check that all fields are filled
+	$ok = 1;
+	foreach ($listfield as $f => $value)
+	{
 		if ($value == 'formula' && empty($_POST['formula'])) continue;
 		if ($value == 'range_account' && empty($_POST['range_account'])) continue;
 		if ($value == 'country' || $value == 'country_id') continue;
 		if (!GETPOSTISSET($value) || GETPOST($value) == '')
-        {
-            $ok = 0;
-            $fieldnamekey = $listfield[$f];
-            // We take translate key of field
-            if ($fieldnamekey == 'libelle' || ($fieldnamekey == 'label'))  $fieldnamekey = 'Label';
-            if ($fieldnamekey == 'code') $fieldnamekey = 'Code';
-            if ($fieldnamekey == 'note') $fieldnamekey = 'Note';
-            if ($fieldnamekey == 'type') $fieldnamekey = 'Type';
-            if ($fieldnamekey == 'position') $fieldnamekey = 'Position';
+		{
+			$ok = 0;
+			$fieldnamekey = $listfield[$f];
+			// We take translate key of field
+			if ($fieldnamekey == 'libelle' || ($fieldnamekey == 'label'))  $fieldnamekey = 'Label';
+			if ($fieldnamekey == 'code') $fieldnamekey = 'Code';
+			if ($fieldnamekey == 'note') $fieldnamekey = 'Note';
+			if ($fieldnamekey == 'type') $fieldnamekey = 'Type';
+			if ($fieldnamekey == 'position') $fieldnamekey = 'Position';
 			if ($fieldnamekey == 'category_type') $fieldnamekey = 'Calculated';
 
-            setEventMessages($langs->transnoentities("ErrorFieldRequired", $langs->transnoentities($fieldnamekey)), null, 'errors');
-        }
-    }
-    if (isset($_POST["code"]))
-    {
-        if ($_POST["code"] == '0')
-    	{
-        	$ok = 0;
-    		setEventMessages($langs->transnoentities('ErrorCodeCantContainZero'), null, 'errors');
-        }
-    }
-    if (!is_numeric(GETPOST('position', 'alpha')))
-    {
-    	$langs->loadLangs(array("errors"));
+			setEventMessages($langs->transnoentities("ErrorFieldRequired", $langs->transnoentities($fieldnamekey)), null, 'errors');
+		}
+	}
+	if (isset($_POST["code"]))
+	{
+		if ($_POST["code"] == '0')
+		{
+			$ok = 0;
+			setEventMessages($langs->transnoentities('ErrorCodeCantContainZero'), null, 'errors');
+		}
+	}
+	if (!is_numeric(GETPOST('position', 'alpha')))
+	{
+		$langs->loadLangs(array("errors"));
    		$ok = 0;
    		setEventMessages($langs->transnoentities('ErrorFieldMustBeANumeric', $langs->transnoentities("Position")), null, 'errors');
-    }
+	}
 
 	// Clean some parameters
 	if ($_POST["accountancy_code"] <= 0) $_POST["accountancy_code"] = ''; // If empty, we force to null
 	if ($_POST["accountancy_code_sell"] <= 0) $_POST["accountancy_code_sell"] = ''; // If empty, we force to null
 	if ($_POST["accountancy_code_buy"] <= 0) $_POST["accountancy_code_buy"] = ''; // If empty, we force to null
 
-    // Si verif ok et action add, on ajoute la ligne
-    if ($ok && GETPOST('actionadd', 'alpha'))
-    {
-        if ($tabrowid[$id])
-        {
-            // Recupere id libre pour insertion
-            $newid = 0;
-            $sql = "SELECT max(".$tabrowid[$id].") newid from ".$tabname[$id];
-            $result = $db->query($sql);
-            if ($result)
-            {
-                $obj = $db->fetch_object($result);
-                $newid = ($obj->newid + 1);
-            } else {
-                dol_print_error($db);
-            }
-        }
+	// Si verif ok et action add, on ajoute la ligne
+	if ($ok && GETPOST('actionadd', 'alpha'))
+	{
+		if ($tabrowid[$id])
+		{
+			// Recupere id libre pour insertion
+			$newid = 0;
+			$sql = "SELECT max(".$tabrowid[$id].") newid from ".$tabname[$id];
+			$result = $db->query($sql);
+			if ($result)
+			{
+				$obj = $db->fetch_object($result);
+				$newid = ($obj->newid + 1);
+			} else {
+				dol_print_error($db);
+			}
+		}
 
-        // Add new entry
-        $sql = "INSERT INTO ".$tabname[$id]." (";
-        // List of fields
-        if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldinsert)) $sql .= $tabrowid[$id].",";
-        $sql .= $tabfieldinsert[$id];
-        $sql .= ",active)";
-        $sql .= " VALUES(";
+		// Add new entry
+		$sql = "INSERT INTO ".$tabname[$id]." (";
+		// List of fields
+		if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldinsert)) $sql .= $tabrowid[$id].",";
+		$sql .= $tabfieldinsert[$id];
+		$sql .= ",active)";
+		$sql .= " VALUES(";
 
-        // List of values
-        if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldinsert)) $sql .= $newid.",";
-        $i = 0;
-        foreach ($listfieldinsert as $f => $value)
-        {
-            if ($value == 'entity') {
-            	$_POST[$listfieldvalue[$i]] = $conf->entity;
-            }
-            if ($i) $sql .= ",";
-            if ($_POST[$listfieldvalue[$i]] == '' && !$listfieldvalue[$i] == 'formula') $sql .= "null"; // For vat, we want/accept code = ''
-            else $sql .= "'".$db->escape($_POST[$listfieldvalue[$i]])."'";
-            $i++;
-        }
-        $sql .= ",1)";
+		// List of values
+		if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldinsert)) $sql .= $newid.",";
+		$i = 0;
+		foreach ($listfieldinsert as $f => $value)
+		{
+			if ($value == 'entity') {
+				$_POST[$listfieldvalue[$i]] = $conf->entity;
+			}
+			if ($i) $sql .= ",";
+			if ($_POST[$listfieldvalue[$i]] == '' && !$listfieldvalue[$i] == 'formula') $sql .= "null"; // For vat, we want/accept code = ''
+			else $sql .= "'".$db->escape($_POST[$listfieldvalue[$i]])."'";
+			$i++;
+		}
+		$sql .= ",1)";
 
-        dol_syslog("actionadd", LOG_DEBUG);
-        $result = $db->query($sql);
-        if ($result)	// Add is ok
-        {
-            setEventMessages($langs->transnoentities("RecordSaved"), null, 'mesgs');
-        	$_POST = array('id'=>$id); // Clean $_POST array, we keep only
-        } else {
-            if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
-                setEventMessages($langs->transnoentities("ErrorRecordAlreadyExists"), null, 'errors');
-            } else {
-                dol_print_error($db);
-            }
-        }
-    }
+		dol_syslog("actionadd", LOG_DEBUG);
+		$result = $db->query($sql);
+		if ($result)	// Add is ok
+		{
+			setEventMessages($langs->transnoentities("RecordSaved"), null, 'mesgs');
+			$_POST = array('id'=>$id); // Clean $_POST array, we keep only
+		} else {
+			if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
+				setEventMessages($langs->transnoentities("ErrorRecordAlreadyExists"), null, 'errors');
+			} else {
+				dol_print_error($db);
+			}
+		}
+	}
 
-    // Si verif ok et action modify, on modifie la ligne
-    if ($ok && GETPOST('actionmodify', 'alpha'))
-    {
-        if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
+	// Si verif ok et action modify, on modifie la ligne
+	if ($ok && GETPOST('actionmodify', 'alpha'))
+	{
+		if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
 
-        // Modify entry
-        $sql = "UPDATE ".$tabname[$id]." SET ";
-        // Modifie valeur des champs
-        if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldmodify))
-        {
-            $sql .= $tabrowid[$id]."=";
-            $sql .= "'".$db->escape($rowid)."', ";
-        }
-        $i = 0;
-        foreach ($listfieldmodify as $field)
-        {
-            if ($field == 'fk_country' && $_POST['country'] > 0) {
-            	$_POST[$listfieldvalue[$i]] = $_POST['country'];
-            } elseif ($field == 'entity') {
-            	$_POST[$listfieldvalue[$i]] = $conf->entity;
-            }
-            if ($i) $sql .= ",";
-            $sql .= $field."=";
-            if ($_POST[$listfieldvalue[$i]] == '' && !$listfieldvalue[$i] == 'range_account') $sql .= "null"; // For range_account, we want/accept code = ''
-            else $sql .= "'".$db->escape($_POST[$listfieldvalue[$i]])."'";
-            $i++;
-        }
-        $sql .= " WHERE ".$rowidcol." = ".((int) $rowid);
+		// Modify entry
+		$sql = "UPDATE ".$tabname[$id]." SET ";
+		// Modifie valeur des champs
+		if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldmodify))
+		{
+			$sql .= $tabrowid[$id]."=";
+			$sql .= "'".$db->escape($rowid)."', ";
+		}
+		$i = 0;
+		foreach ($listfieldmodify as $field)
+		{
+			if ($field == 'fk_country' && $_POST['country'] > 0) {
+				$_POST[$listfieldvalue[$i]] = $_POST['country'];
+			} elseif ($field == 'entity') {
+				$_POST[$listfieldvalue[$i]] = $conf->entity;
+			}
+			if ($i) $sql .= ",";
+			$sql .= $field."=";
+			if ($_POST[$listfieldvalue[$i]] == '' && !$listfieldvalue[$i] == 'range_account') $sql .= "null"; // For range_account, we want/accept code = ''
+			else $sql .= "'".$db->escape($_POST[$listfieldvalue[$i]])."'";
+			$i++;
+		}
+		$sql .= " WHERE ".$rowidcol." = ".((int) $rowid);
 
-        dol_syslog("actionmodify", LOG_DEBUG);
-        //print $sql;
-        $resql = $db->query($sql);
-        if (!$resql)
-        {
-            setEventMessages($db->error(), null, 'errors');
-        }
-    }
-    //$_GET["id"]=GETPOST('id', 'int');       // Force affichage dictionnaire en cours d'edition
+		dol_syslog("actionmodify", LOG_DEBUG);
+		//print $sql;
+		$resql = $db->query($sql);
+		if (!$resql)
+		{
+			setEventMessages($db->error(), null, 'errors');
+		}
+	}
+	//$_GET["id"]=GETPOST('id', 'int');       // Force affichage dictionnaire en cours d'edition
 }
 
 if (GETPOST('actioncancel', 'alpha'))
 {
-    //$_GET["id"]=GETPOST('id', 'int');       // Force affichage dictionnaire en cours d'edition
+	//$_GET["id"]=GETPOST('id', 'int');       // Force affichage dictionnaire en cours d'edition
 }
 
 if ($action == 'confirm_delete' && $confirm == 'yes')       // delete
 {
-    if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
+	if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
 
-    $sql = "DELETE from ".$tabname[$id]." WHERE ".$rowidcol." = ".((int) $rowid);
+	$sql = "DELETE from ".$tabname[$id]." WHERE ".$rowidcol." = ".((int) $rowid);
 
-    dol_syslog("delete", LOG_DEBUG);
-    $result = $db->query($sql);
-    if (!$result)
-    {
-        if ($db->errno() == 'DB_ERROR_CHILD_EXISTS')
-        {
-            setEventMessages($langs->transnoentities("ErrorRecordIsUsedByChild"), null, 'errors');
-        } else {
-            dol_print_error($db);
-        }
-    }
+	dol_syslog("delete", LOG_DEBUG);
+	$result = $db->query($sql);
+	if (!$result)
+	{
+		if ($db->errno() == 'DB_ERROR_CHILD_EXISTS')
+		{
+			setEventMessages($langs->transnoentities("ErrorRecordIsUsedByChild"), null, 'errors');
+		} else {
+			dol_print_error($db);
+		}
+	}
 }
 
 // activate
 if ($action == $acts[0])
 {
-    if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
+	if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
 
-    if ($rowid) {
-        $sql = "UPDATE ".$tabname[$id]." SET active = 1 WHERE ".$rowidcol." = ".((int) $rowid);
-    } elseif ($code) {
-    	$sql = "UPDATE ".$tabname[$id]." SET active = 1 WHERE code = '".$db->escape($code)."'";
-    }
+	if ($rowid) {
+		$sql = "UPDATE ".$tabname[$id]." SET active = 1 WHERE ".$rowidcol." = ".((int) $rowid);
+	} elseif ($code) {
+		$sql = "UPDATE ".$tabname[$id]." SET active = 1 WHERE code = '".$db->escape($code)."'";
+	}
 
-    $result = $db->query($sql);
-    if (!$result)
-    {
-        dol_print_error($db);
-    }
+	$result = $db->query($sql);
+	if (!$result)
+	{
+		dol_print_error($db);
+	}
 }
 
 // disable
 if ($action == $acts[1])
 {
-    if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
+	if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
 
-    if ($rowid) {
-    	$sql = "UPDATE ".$tabname[$id]." SET active = 0 WHERE ".$rowidcol." = ".((int) $rowid);
-    } elseif ($code) {
-    	$sql = "UPDATE ".$tabname[$id]." SET active = 0 WHERE code = '".$db->escape($code)."'";
-    }
+	if ($rowid) {
+		$sql = "UPDATE ".$tabname[$id]." SET active = 0 WHERE ".$rowidcol." = ".((int) $rowid);
+	} elseif ($code) {
+		$sql = "UPDATE ".$tabname[$id]." SET active = 0 WHERE code = '".$db->escape($code)."'";
+	}
 
-    $result = $db->query($sql);
-    if (!$result)
-    {
-        dol_print_error($db);
-    }
+	$result = $db->query($sql);
+	if (!$result)
+	{
+		dol_print_error($db);
+	}
 }
 
 // favorite
 if ($action == 'activate_favorite')
 {
-    if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
+	if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
 
-    if ($rowid) {
-    	$sql = "UPDATE ".$tabname[$id]." SET favorite = 1 WHERE ".$rowidcol." = ".((int) $rowid);
-    } elseif ($code) {
-    	$sql = "UPDATE ".$tabname[$id]." SET favorite = 1 WHERE code = '".$db->escape($code)."'";
-    }
+	if ($rowid) {
+		$sql = "UPDATE ".$tabname[$id]." SET favorite = 1 WHERE ".$rowidcol." = ".((int) $rowid);
+	} elseif ($code) {
+		$sql = "UPDATE ".$tabname[$id]." SET favorite = 1 WHERE code = '".$db->escape($code)."'";
+	}
 
-    $result = $db->query($sql);
-    if (!$result)
-    {
-        dol_print_error($db);
-    }
+	$result = $db->query($sql);
+	if (!$result)
+	{
+		dol_print_error($db);
+	}
 }
 
 // disable favorite
 if ($action == 'disable_favorite')
 {
-    if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
+	if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
 
-    if ($rowid) {
-    	$sql = "UPDATE ".$tabname[$id]." SET favorite = 0 WHERE ".$rowidcol." = ".((int) $rowid);
-    } elseif ($code) {
-    	$sql = "UPDATE ".$tabname[$id]." SET favorite = 0 WHERE code = '".$db->escape($code)."'";
-    }
+	if ($rowid) {
+		$sql = "UPDATE ".$tabname[$id]." SET favorite = 0 WHERE ".$rowidcol." = ".((int) $rowid);
+	} elseif ($code) {
+		$sql = "UPDATE ".$tabname[$id]." SET favorite = 0 WHERE code = '".$db->escape($code)."'";
+	}
 
-    $result = $db->query($sql);
-    if (!$result)
-    {
-        dol_print_error($db);
-    }
+	$result = $db->query($sql);
+	if (!$result)
+	{
+		dol_print_error($db);
+	}
 }
 
 
@@ -401,7 +401,7 @@ print '<span class="opacitymedium">'.$langs->trans("AccountingAccountGroupsDesc"
 // Confirmation de la suppression de la ligne
 if ($action == 'delete')
 {
-    print $form->formconfirm($_SERVER["PHP_SELF"].'?'.($page ? 'page='.$page.'&' : '').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.$rowid.'&code='.$code.'&id='.$id.($search_country_id > 0 ? '&search_country_id='.$search_country_id : ''), $langs->trans('DeleteLine'), $langs->trans('ConfirmDeleteLine'), 'confirm_delete', '', 0, 1);
+	print $form->formconfirm($_SERVER["PHP_SELF"].'?'.($page ? 'page='.$page.'&' : '').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.$rowid.'&code='.$code.'&id='.$id.($search_country_id > 0 ? '&search_country_id='.$search_country_id : ''), $langs->trans('DeleteLine'), $langs->trans('ConfirmDeleteLine'), 'confirm_delete', '', 0, 1);
 }
 //var_dump($elementList);
 
@@ -410,407 +410,407 @@ if ($action == 'delete')
  */
 if ($id)
 {
-    // Complete requete recherche valeurs avec critere de tri
-    $sql = $tabsql[$id];
+	// Complete requete recherche valeurs avec critere de tri
+	$sql = $tabsql[$id];
 
-    if ($search_country_id > 0)
-    {
-        if (preg_match('/ WHERE /', $sql)) $sql .= " AND ";
-        else $sql .= " WHERE ";
-        $sql .= " (a.fk_country = ".$search_country_id." OR a.fk_country = 0)";
-    }
+	if ($search_country_id > 0)
+	{
+		if (preg_match('/ WHERE /', $sql)) $sql .= " AND ";
+		else $sql .= " WHERE ";
+		$sql .= " (a.fk_country = ".$search_country_id." OR a.fk_country = 0)";
+	}
 
-    // If sort order is "country", we use country_code instead
-    if ($sortfield == 'country') $sortfield = 'country_code';
-    $sql .= $db->order($sortfield, $sortorder);
-    $sql .= $db->plimit($listlimit + 1, $offset);
-    //print $sql;
+	// If sort order is "country", we use country_code instead
+	if ($sortfield == 'country') $sortfield = 'country_code';
+	$sql .= $db->order($sortfield, $sortorder);
+	$sql .= $db->plimit($listlimit + 1, $offset);
+	//print $sql;
 
-    $fieldlist = explode(',', $tabfield[$id]);
+	$fieldlist = explode(',', $tabfield[$id]);
 
-    print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$id.'" method="POST">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    print '<input type="hidden" name="from" value="'.dol_escape_htmltag(GETPOST('from', 'alpha')).'">';
+	print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$id.'" method="POST">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="from" value="'.dol_escape_htmltag(GETPOST('from', 'alpha')).'">';
 
 	print '<div class="div-table-responsive">';
-    print '<table class="noborder centpercent">';
+	print '<table class="noborder centpercent">';
 
-    // Form to add a new line
-    if ($tabname[$id])
-    {
-        $alabelisused = 0;
+	// Form to add a new line
+	if ($tabname[$id])
+	{
+		$alabelisused = 0;
 
-        $fieldlist = explode(',', $tabfield[$id]);
+		$fieldlist = explode(',', $tabfield[$id]);
 
-        // Line for title
-        print '<tr class="liste_titre">';
-        foreach ($fieldlist as $field => $value)
-        {
-            // Determine le nom du champ par rapport aux noms possibles
-            // dans les dictionnaires de donnees
-            $valuetoshow = ucfirst($fieldlist[$field]); // Par defaut
-            $valuetoshow = $langs->trans($valuetoshow); // try to translate
-            $class = "left";
-            if ($fieldlist[$field] == 'type') {
-                if ($tabname[$id] == MAIN_DB_PREFIX."c_paiement") {
-                    $valuetoshow = $form->textwithtooltip($langs->trans("Type"), $langs->trans("TypePaymentDesc"), 2, 1, img_help(1, ''));
-                } else {
-                    $valuetoshow = $langs->trans("Type");
-                }
-            }
-            if ($fieldlist[$field] == 'code') {
-                $valuetoshow = $langs->trans("Code");
-            }
-            if ($fieldlist[$field] == 'libelle' || $fieldlist[$field] == 'label') {
-            	$valuetoshow = $langs->trans("Label");
-            }
-            if ($fieldlist[$field] == 'libelle_facture') {
-                $valuetoshow = $langs->trans("LabelOnDocuments");
-            }
-            if ($fieldlist[$field] == 'country') {
-                $valuetoshow = $langs->trans("Country");
-            }
-            if ($fieldlist[$field] == 'accountancy_code') {
-                $valuetoshow = $langs->trans("AccountancyCode");
-            }
-            if ($fieldlist[$field] == 'accountancy_code_sell') {
-                $valuetoshow = $langs->trans("AccountancyCodeSell");
-            }
-            if ($fieldlist[$field] == 'accountancy_code_buy') {
-                $valuetoshow = $langs->trans("AccountancyCodeBuy");
-            }
-            if ($fieldlist[$field] == 'pcg_version' || $fieldlist[$field] == 'fk_pcg_version') {
-                $valuetoshow = $langs->trans("Pcg_version");
-            }
-            if ($fieldlist[$field] == 'range_account') {
-                $valuetoshow = $langs->trans("Comment");
-            }
-            if ($fieldlist[$field] == 'category_type') {
-                $valuetoshow = $langs->trans("Calculated");
-            }
-
-            if ($valuetoshow != '') {
-                print '<td class="'.$class.'">';
-            	if (!empty($tabhelp[$id][$value]) && preg_match('/^http(s*):/i', $tabhelp[$id][$value])) print '<a href="'.$tabhelp[$id][$value].'" target="_blank">'.$valuetoshow.' '.img_help(1, $valuetoshow).'</a>';
-            	elseif (!empty($tabhelp[$id][$value])) print $form->textwithpicto($valuetoshow, $tabhelp[$id][$value]);
-            	else print $valuetoshow;
-                print '</td>';
-            }
-            if ($fieldlist[$field] == 'libelle' || $fieldlist[$field] == 'label') $alabelisused = 1;
-        }
-
-        print '<td>';
-        print '<input type="hidden" name="id" value="'.$id.'">';
-        print '</td>';
-        print '<td style="min-width: 26px;"></td>';
-        print '<td style="min-width: 26px;"></td>';
-        print '<td style="min-width: 26px;"></td>';
-        print '</tr>';
-
-        // Line to enter new values
-        print '<tr class="oddeven nodrag nodrop nohover">';
-
-        $obj = new stdClass();
-        // If data was already input, we define them in obj to populate input fields.
-        if (GETPOST('actionadd', 'alpha'))
-        {
-            foreach ($fieldlist as $key=>$val)
-            {
-                if (GETPOST($val) != '')
-                	$obj->$val = GETPOST($val);
-            }
-        }
-
-        $tmpaction = 'create';
-        $parameters = array('fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
-        $reshook = $hookmanager->executeHooks('createDictionaryFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
-        $error = $hookmanager->error; $errors = $hookmanager->errors;
-
-        if (empty($reshook))
-        {
-       		fieldListAccountingCategories($fieldlist, $obj, $tabname[$id], 'add');
-        }
-
-        print '<td colspan="4" class="right">';
-       	print '<input type="submit" class="button" name="actionadd" value="'.$langs->trans("Add").'">';
-        print '</td>';
-        print "</tr>";
-
-        $colspan = count($fieldlist) + 3;
-        if ($id == 32) $colspan++;
-
-        print '<tr><td colspan="'.$colspan.'">&nbsp;</td></tr>'; // Keep &nbsp; to have a line with enough height
-    }
-
-    // List of available record in database
-    dol_syslog("htdocs/admin/dict", LOG_DEBUG);
-    $resql = $db->query($sql);
-    if ($resql)
-    {
-        $num = $db->num_rows($resql);
-        $i = 0;
-
-        $param = '&id='.$id;
-        if ($search_country_id > 0) $param .= '&search_country_id='.$search_country_id;
-        $paramwithsearch = $param;
-        if ($sortorder) $paramwithsearch .= '&sortorder='.$sortorder;
-        if ($sortfield) $paramwithsearch .= '&sortfield='.$sortfield;
-        if (GETPOST('from', 'alpha')) $paramwithsearch .= '&from='.GETPOST('from', 'alpha');
-        // There is several pages
-        if ($num > $listlimit)
-        {
-            print '<tr class="none"><td class="right" colspan="'.(3 + count($fieldlist)).'">';
-            print_fleche_navigation($page, $_SERVER["PHP_SELF"], $paramwithsearch, ($num > $listlimit), '<li class="pagination"><span>'.$langs->trans("Page").' '.($page + 1).'</span></li>');
-            print '</td></tr>';
-        }
-
-        // Title line with search boxes
-        print '<tr class="liste_titre liste_titre_add liste_titre_filter">';
-        $filterfound = 0;
-        foreach ($fieldlist as $field => $value)
-        {
-            $showfield = 1; // By defaut
-
-            if ($fieldlist[$field] == 'region_id' || $fieldlist[$field] == 'country_id') { $showfield = 0; }
-
-            if ($showfield)
-            {
-                if ($value == 'country')
-                {
-                    print '<td class="liste_titre">';
-                    print $form->select_country($search_country_id, 'search_country_id', '', 28, 'maxwidth200 maxwidthonsmartphone');
-                    print '</td>';
-                    $filterfound++;
-                } else {
-                    print '<td class="liste_titre"></td>';
-                }
-            }
-        }
-        print '<td class="liste_titre"></td>';
-        print '<td class="liste_titre"></td>';
-        print '<td class="liste_titre"></td>';
-        print '<td class="liste_titre center">';
-    	if ($filterfound)
-    	{
-        	$searchpicto = $form->showFilterAndCheckAddButtons(0);
-        	print $searchpicto;
-    	}
-    	print '</td>';
-    	print '</tr>';
-
-    	// Title of lines
-        print '<tr class="liste_titre">';
-        foreach ($fieldlist as $field => $value)
-        {
-            // Determine le nom du champ par rapport aux noms possibles
-            // dans les dictionnaires de donnees
-            $showfield = 1; // By defaut
-            $class = "left";
-            $sortable = 1;
-            $valuetoshow = '';
-
-            $valuetoshow = ucfirst($fieldlist[$field]); // By defaut
-            $valuetoshow = $langs->trans($valuetoshow); // try to translate
-            if ($fieldlist[$field] == 'source') {
-                $valuetoshow = $langs->trans("Contact");
-            }
-            if ($fieldlist[$field] == 'price') {
-                $valuetoshow = $langs->trans("PriceUHT");
-            }
-            if ($fieldlist[$field] == 'taux') {
-                if ($tabname[$id] != MAIN_DB_PREFIX."c_revenuestamp") {
-                    $valuetoshow = $langs->trans("Rate");
-                } else {
-                    $valuetoshow = $langs->trans("Amount");
-                }
-				$class = 'center';
-            }
-            if ($fieldlist[$field] == 'type') {
-                $valuetoshow = $langs->trans("Type");
-            }
-            if ($fieldlist[$field] == 'code') {
-                $valuetoshow = $langs->trans("Code");
-            }
-            if ($fieldlist[$field] == 'libelle' || $fieldlist[$field] == 'label') {
-            	$valuetoshow = $langs->trans("Label");
-            }
-            if ($fieldlist[$field] == 'country') {
-                $valuetoshow = $langs->trans("Country");
-            }
-            if ($fieldlist[$field] == 'region_id' || $fieldlist[$field] == 'country_id') {
-                $showfield = 0;
-            }
-            if ($fieldlist[$field] == 'accountancy_code') {
-                $valuetoshow = $langs->trans("AccountancyCode");
-            }
-            if ($fieldlist[$field] == 'accountancy_code_sell') {
-                $valuetoshow = $langs->trans("AccountancyCodeSell");
-                $sortable = 0;
-            }
-            if ($fieldlist[$field] == 'accountancy_code_buy') {
-                $valuetoshow = $langs->trans("AccountancyCodeBuy");
-                $sortable = 0;
-            }
-			if ($fieldlist[$field] == 'fk_pcg_version') {
-                $valuetoshow = $langs->trans("Pcg_version");
-            }
-            if ($fieldlist[$field] == 'account_parent') {
-                $valuetoshow = $langs->trans("Accountsparent");
-            }
-            if ($fieldlist[$field] == 'pcg_type') {
-                $valuetoshow = $langs->trans("Pcg_type");
-            }
-        	if ($fieldlist[$field] == 'type_template') {
-                $valuetoshow = $langs->trans("TypeOfTemplate");
-            }
+		// Line for title
+		print '<tr class="liste_titre">';
+		foreach ($fieldlist as $field => $value)
+		{
+			// Determine le nom du champ par rapport aux noms possibles
+			// dans les dictionnaires de donnees
+			$valuetoshow = ucfirst($fieldlist[$field]); // Par defaut
+			$valuetoshow = $langs->trans($valuetoshow); // try to translate
+			$class = "left";
+			if ($fieldlist[$field] == 'type') {
+				if ($tabname[$id] == MAIN_DB_PREFIX."c_paiement") {
+					$valuetoshow = $form->textwithtooltip($langs->trans("Type"), $langs->trans("TypePaymentDesc"), 2, 1, img_help(1, ''));
+				} else {
+					$valuetoshow = $langs->trans("Type");
+				}
+			}
+			if ($fieldlist[$field] == 'code') {
+				$valuetoshow = $langs->trans("Code");
+			}
+			if ($fieldlist[$field] == 'libelle' || $fieldlist[$field] == 'label') {
+				$valuetoshow = $langs->trans("Label");
+			}
+			if ($fieldlist[$field] == 'libelle_facture') {
+				$valuetoshow = $langs->trans("LabelOnDocuments");
+			}
+			if ($fieldlist[$field] == 'country') {
+				$valuetoshow = $langs->trans("Country");
+			}
+			if ($fieldlist[$field] == 'accountancy_code') {
+				$valuetoshow = $langs->trans("AccountancyCode");
+			}
+			if ($fieldlist[$field] == 'accountancy_code_sell') {
+				$valuetoshow = $langs->trans("AccountancyCodeSell");
+			}
+			if ($fieldlist[$field] == 'accountancy_code_buy') {
+				$valuetoshow = $langs->trans("AccountancyCodeBuy");
+			}
+			if ($fieldlist[$field] == 'pcg_version' || $fieldlist[$field] == 'fk_pcg_version') {
+				$valuetoshow = $langs->trans("Pcg_version");
+			}
 			if ($fieldlist[$field] == 'range_account') {
-                $valuetoshow = $langs->trans("Comment");
-            }
+				$valuetoshow = $langs->trans("Comment");
+			}
 			if ($fieldlist[$field] == 'category_type') {
-                $valuetoshow = $langs->trans("Calculated");
-            }
-            // Affiche nom du champ
-            if ($showfield) {
-                print getTitleFieldOfList($valuetoshow, 0, $_SERVER["PHP_SELF"], ($sortable ? $fieldlist[$field] : ''), ($page ? 'page='.$page.'&' : ''), $param, "", $sortfield, $sortorder, $class.' ');
-            }
-        }
+				$valuetoshow = $langs->trans("Calculated");
+			}
+
+			if ($valuetoshow != '') {
+				print '<td class="'.$class.'">';
+				if (!empty($tabhelp[$id][$value]) && preg_match('/^http(s*):/i', $tabhelp[$id][$value])) print '<a href="'.$tabhelp[$id][$value].'" target="_blank">'.$valuetoshow.' '.img_help(1, $valuetoshow).'</a>';
+				elseif (!empty($tabhelp[$id][$value])) print $form->textwithpicto($valuetoshow, $tabhelp[$id][$value]);
+				else print $valuetoshow;
+				print '</td>';
+			}
+			if ($fieldlist[$field] == 'libelle' || $fieldlist[$field] == 'label') $alabelisused = 1;
+		}
+
+		print '<td>';
+		print '<input type="hidden" name="id" value="'.$id.'">';
+		print '</td>';
+		print '<td style="min-width: 26px;"></td>';
+		print '<td style="min-width: 26px;"></td>';
+		print '<td style="min-width: 26px;"></td>';
+		print '</tr>';
+
+		// Line to enter new values
+		print '<tr class="oddeven nodrag nodrop nohover">';
+
+		$obj = new stdClass();
+		// If data was already input, we define them in obj to populate input fields.
+		if (GETPOST('actionadd', 'alpha'))
+		{
+			foreach ($fieldlist as $key=>$val)
+			{
+				if (GETPOST($val) != '')
+					$obj->$val = GETPOST($val);
+			}
+		}
+
+		$tmpaction = 'create';
+		$parameters = array('fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
+		$reshook = $hookmanager->executeHooks('createDictionaryFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
+		$error = $hookmanager->error; $errors = $hookmanager->errors;
+
+		if (empty($reshook))
+		{
+	   		fieldListAccountingCategories($fieldlist, $obj, $tabname[$id], 'add');
+		}
+
+		print '<td colspan="4" class="right">';
+	   	print '<input type="submit" class="button" name="actionadd" value="'.$langs->trans("Add").'">';
+		print '</td>';
+		print "</tr>";
+
+		$colspan = count($fieldlist) + 3;
+		if ($id == 32) $colspan++;
+
+		print '<tr><td colspan="'.$colspan.'">&nbsp;</td></tr>'; // Keep &nbsp; to have a line with enough height
+	}
+
+	// List of available record in database
+	dol_syslog("htdocs/admin/dict", LOG_DEBUG);
+	$resql = $db->query($sql);
+	if ($resql)
+	{
+		$num = $db->num_rows($resql);
+		$i = 0;
+
+		$param = '&id='.$id;
+		if ($search_country_id > 0) $param .= '&search_country_id='.$search_country_id;
+		$paramwithsearch = $param;
+		if ($sortorder) $paramwithsearch .= '&sortorder='.$sortorder;
+		if ($sortfield) $paramwithsearch .= '&sortfield='.$sortfield;
+		if (GETPOST('from', 'alpha')) $paramwithsearch .= '&from='.GETPOST('from', 'alpha');
+		// There is several pages
+		if ($num > $listlimit)
+		{
+			print '<tr class="none"><td class="right" colspan="'.(3 + count($fieldlist)).'">';
+			print_fleche_navigation($page, $_SERVER["PHP_SELF"], $paramwithsearch, ($num > $listlimit), '<li class="pagination"><span>'.$langs->trans("Page").' '.($page + 1).'</span></li>');
+			print '</td></tr>';
+		}
+
+		// Title line with search boxes
+		print '<tr class="liste_titre liste_titre_add liste_titre_filter">';
+		$filterfound = 0;
+		foreach ($fieldlist as $field => $value)
+		{
+			$showfield = 1; // By defaut
+
+			if ($fieldlist[$field] == 'region_id' || $fieldlist[$field] == 'country_id') { $showfield = 0; }
+
+			if ($showfield)
+			{
+				if ($value == 'country')
+				{
+					print '<td class="liste_titre">';
+					print $form->select_country($search_country_id, 'search_country_id', '', 28, 'maxwidth200 maxwidthonsmartphone');
+					print '</td>';
+					$filterfound++;
+				} else {
+					print '<td class="liste_titre"></td>';
+				}
+			}
+		}
+		print '<td class="liste_titre"></td>';
+		print '<td class="liste_titre"></td>';
+		print '<td class="liste_titre"></td>';
+		print '<td class="liste_titre center">';
+		if ($filterfound)
+		{
+			$searchpicto = $form->showFilterAndCheckAddButtons(0);
+			print $searchpicto;
+		}
+		print '</td>';
+		print '</tr>';
+
+		// Title of lines
+		print '<tr class="liste_titre">';
+		foreach ($fieldlist as $field => $value)
+		{
+			// Determine le nom du champ par rapport aux noms possibles
+			// dans les dictionnaires de donnees
+			$showfield = 1; // By defaut
+			$class = "left";
+			$sortable = 1;
+			$valuetoshow = '';
+
+			$valuetoshow = ucfirst($fieldlist[$field]); // By defaut
+			$valuetoshow = $langs->trans($valuetoshow); // try to translate
+			if ($fieldlist[$field] == 'source') {
+				$valuetoshow = $langs->trans("Contact");
+			}
+			if ($fieldlist[$field] == 'price') {
+				$valuetoshow = $langs->trans("PriceUHT");
+			}
+			if ($fieldlist[$field] == 'taux') {
+				if ($tabname[$id] != MAIN_DB_PREFIX."c_revenuestamp") {
+					$valuetoshow = $langs->trans("Rate");
+				} else {
+					$valuetoshow = $langs->trans("Amount");
+				}
+				$class = 'center';
+			}
+			if ($fieldlist[$field] == 'type') {
+				$valuetoshow = $langs->trans("Type");
+			}
+			if ($fieldlist[$field] == 'code') {
+				$valuetoshow = $langs->trans("Code");
+			}
+			if ($fieldlist[$field] == 'libelle' || $fieldlist[$field] == 'label') {
+				$valuetoshow = $langs->trans("Label");
+			}
+			if ($fieldlist[$field] == 'country') {
+				$valuetoshow = $langs->trans("Country");
+			}
+			if ($fieldlist[$field] == 'region_id' || $fieldlist[$field] == 'country_id') {
+				$showfield = 0;
+			}
+			if ($fieldlist[$field] == 'accountancy_code') {
+				$valuetoshow = $langs->trans("AccountancyCode");
+			}
+			if ($fieldlist[$field] == 'accountancy_code_sell') {
+				$valuetoshow = $langs->trans("AccountancyCodeSell");
+				$sortable = 0;
+			}
+			if ($fieldlist[$field] == 'accountancy_code_buy') {
+				$valuetoshow = $langs->trans("AccountancyCodeBuy");
+				$sortable = 0;
+			}
+			if ($fieldlist[$field] == 'fk_pcg_version') {
+				$valuetoshow = $langs->trans("Pcg_version");
+			}
+			if ($fieldlist[$field] == 'account_parent') {
+				$valuetoshow = $langs->trans("Accountsparent");
+			}
+			if ($fieldlist[$field] == 'pcg_type') {
+				$valuetoshow = $langs->trans("Pcg_type");
+			}
+			if ($fieldlist[$field] == 'type_template') {
+				$valuetoshow = $langs->trans("TypeOfTemplate");
+			}
+			if ($fieldlist[$field] == 'range_account') {
+				$valuetoshow = $langs->trans("Comment");
+			}
+			if ($fieldlist[$field] == 'category_type') {
+				$valuetoshow = $langs->trans("Calculated");
+			}
+			// Affiche nom du champ
+			if ($showfield) {
+				print getTitleFieldOfList($valuetoshow, 0, $_SERVER["PHP_SELF"], ($sortable ? $fieldlist[$field] : ''), ($page ? 'page='.$page.'&' : ''), $param, "", $sortfield, $sortorder, $class.' ');
+			}
+		}
 		print getTitleFieldOfList($langs->trans("Status"), 0, $_SERVER["PHP_SELF"], "active", ($page ? 'page='.$page.'&' : ''), $param, '', $sortfield, $sortorder, 'center ');
-        print getTitleFieldOfList('');
-        print getTitleFieldOfList('');
-        print getTitleFieldOfList('');
-        print '</tr>';
+		print getTitleFieldOfList('');
+		print getTitleFieldOfList('');
+		print getTitleFieldOfList('');
+		print '</tr>';
 
-        if ($num)
-        {
-            // Lines with values
-            while ($i < $num)
-            {
-                $obj = $db->fetch_object($resql);
-                //print_r($obj);
-                print '<tr class="oddeven" id="rowid-'.$obj->rowid.'">';
-                if ($action == 'edit' && ($rowid == (!empty($obj->rowid) ? $obj->rowid : $obj->code)))
-                {
-                    $tmpaction = 'edit';
-                    $parameters = array('fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
-                    $reshook = $hookmanager->executeHooks('editDictionaryFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
-                    $error = $hookmanager->error; $errors = $hookmanager->errors;
+		if ($num)
+		{
+			// Lines with values
+			while ($i < $num)
+			{
+				$obj = $db->fetch_object($resql);
+				//print_r($obj);
+				print '<tr class="oddeven" id="rowid-'.$obj->rowid.'">';
+				if ($action == 'edit' && ($rowid == (!empty($obj->rowid) ? $obj->rowid : $obj->code)))
+				{
+					$tmpaction = 'edit';
+					$parameters = array('fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
+					$reshook = $hookmanager->executeHooks('editDictionaryFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
+					$error = $hookmanager->error; $errors = $hookmanager->errors;
 
-                    // Show fields
-                    if (empty($reshook)) fieldListAccountingCategories($fieldlist, $obj, $tabname[$id], 'edit');
+					// Show fields
+					if (empty($reshook)) fieldListAccountingCategories($fieldlist, $obj, $tabname[$id], 'edit');
 
-                    print '<td></td>';
-                    print '<td></td>';
-                    print '<td class="center">';
-                    print '<input type="hidden" name="page" value="'.$page.'">';
-                    print '<input type="hidden" name="rowid" value="'.$rowid.'">';
-                    print '<input type="submit" class="button" name="actionmodify" value="'.$langs->trans("Modify").'">';
-                    print '<div name="'.(!empty($obj->rowid) ? $obj->rowid : $obj->code).'"></div>';
-                    print '<input type="submit" class="button" name="actioncancel" value="'.$langs->trans("Cancel").'">';
-                    print '</td>';
-                    print '<td></td>';
-                } else {
-                    $tmpaction = 'view';
-                    $parameters = array('var'=>$var, 'fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
-                    $reshook = $hookmanager->executeHooks('viewDictionaryFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
+					print '<td></td>';
+					print '<td></td>';
+					print '<td class="center">';
+					print '<input type="hidden" name="page" value="'.$page.'">';
+					print '<input type="hidden" name="rowid" value="'.$rowid.'">';
+					print '<input type="submit" class="button" name="actionmodify" value="'.$langs->trans("Modify").'">';
+					print '<div name="'.(!empty($obj->rowid) ? $obj->rowid : $obj->code).'"></div>';
+					print '<input type="submit" class="button" name="actioncancel" value="'.$langs->trans("Cancel").'">';
+					print '</td>';
+					print '<td></td>';
+				} else {
+					$tmpaction = 'view';
+					$parameters = array('var'=>$var, 'fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
+					$reshook = $hookmanager->executeHooks('viewDictionaryFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
 
-                    $error = $hookmanager->error; $errors = $hookmanager->errors;
+					$error = $hookmanager->error; $errors = $hookmanager->errors;
 
-                    if (empty($reshook))
-                    {
-                        foreach ($fieldlist as $field => $value)
-                        {
-                            $showfield = 1;
-                        	$class = "left";
-                            $valuetoshow = $obj->{$fieldlist[$field]};
-                            if ($value == 'category_type')
-                            {
-                                $valuetoshow = yn($valuetoshow);
-                            } elseif ($valuetoshow == 'all') {
-                                $valuetoshow = $langs->trans('All');
-                            } elseif ($fieldlist[$field] == 'country') {
-                                if (empty($obj->country_code))
-                                {
-                                    $valuetoshow = '-';
-                                } else {
-                                    $key = $langs->trans("Country".strtoupper($obj->country_code));
-                                    $valuetoshow = ($key != "Country".strtoupper($obj->country_code) ? $obj->country_code." - ".$key : $obj->country);
-                                }
-                            } elseif ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_country') {
-                                $key = $langs->trans("Country".strtoupper($obj->code));
-                                $valuetoshow = ($obj->code && $key != "Country".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-                            } elseif ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_availability') {
-                                $langs->loadLangs(array("propal"));
-                                $key = $langs->trans("AvailabilityType".strtoupper($obj->code));
-                                $valuetoshow = ($obj->code && $key != "AvailabilityType".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-                            } elseif ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_actioncomm') {
-                                $key = $langs->trans("Action".strtoupper($obj->code));
-                                $valuetoshow = ($obj->code && $key != "Action".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-                            } elseif ($fieldlist[$field] == 'region_id' || $fieldlist[$field] == 'country_id') {
-                                $showfield = 0;
-                            }
+					if (empty($reshook))
+					{
+						foreach ($fieldlist as $field => $value)
+						{
+							$showfield = 1;
+							$class = "left";
+							$valuetoshow = $obj->{$fieldlist[$field]};
+							if ($value == 'category_type')
+							{
+								$valuetoshow = yn($valuetoshow);
+							} elseif ($valuetoshow == 'all') {
+								$valuetoshow = $langs->trans('All');
+							} elseif ($fieldlist[$field] == 'country') {
+								if (empty($obj->country_code))
+								{
+									$valuetoshow = '-';
+								} else {
+									$key = $langs->trans("Country".strtoupper($obj->country_code));
+									$valuetoshow = ($key != "Country".strtoupper($obj->country_code) ? $obj->country_code." - ".$key : $obj->country);
+								}
+							} elseif ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_country') {
+								$key = $langs->trans("Country".strtoupper($obj->code));
+								$valuetoshow = ($obj->code && $key != "Country".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
+							} elseif ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_availability') {
+								$langs->loadLangs(array("propal"));
+								$key = $langs->trans("AvailabilityType".strtoupper($obj->code));
+								$valuetoshow = ($obj->code && $key != "AvailabilityType".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
+							} elseif ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_actioncomm') {
+								$key = $langs->trans("Action".strtoupper($obj->code));
+								$valuetoshow = ($obj->code && $key != "Action".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
+							} elseif ($fieldlist[$field] == 'region_id' || $fieldlist[$field] == 'country_id') {
+								$showfield = 0;
+							}
 
-                            $class = 'tddict';
+							$class = 'tddict';
 							// Show value for field
 							if ($showfield) print '<!-- '.$fieldlist[$field].' --><td class="'.$class.'">'.$valuetoshow.'</td>';
-                        }
-                    }
+						}
+					}
 
-                    // Can an entry be erased or disabled ?
-                    $iserasable = 1; $canbedisabled = 1; $canbemodified = 1; // true by default
-                    if (isset($obj->code))
-                    {
-                    	if (($obj->code == '0' || $obj->code == '' || preg_match('/unknown/i', $obj->code))) { $iserasable = 0; $canbedisabled = 0; }
-                    }
+					// Can an entry be erased or disabled ?
+					$iserasable = 1; $canbedisabled = 1; $canbemodified = 1; // true by default
+					if (isset($obj->code))
+					{
+						if (($obj->code == '0' || $obj->code == '' || preg_match('/unknown/i', $obj->code))) { $iserasable = 0; $canbedisabled = 0; }
+					}
 
-                    $canbemodified = $iserasable;
+					$canbemodified = $iserasable;
 
-                    $url = $_SERVER["PHP_SELF"].'?'.($page ? 'page='.$page.'&' : '').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.(!empty($obj->rowid) ? $obj->rowid : (!empty($obj->code) ? $obj->code : '')).'&code='.(!empty($obj->code) ?urlencode($obj->code) : '');
-                    if ($param) $url .= '&'.$param;
-                    $url .= '&';
+					$url = $_SERVER["PHP_SELF"].'?'.($page ? 'page='.$page.'&' : '').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.(!empty($obj->rowid) ? $obj->rowid : (!empty($obj->code) ? $obj->code : '')).'&code='.(!empty($obj->code) ?urlencode($obj->code) : '');
+					if ($param) $url .= '&'.$param;
+					$url .= '&';
 
-                    // Active
-                    print '<td class="center" class="nowrap">';
-                    if ($canbedisabled) print '<a href="'.$url.'action='.$acts[$obj->active].'">'.$actl[$obj->active].'</a>';
-                    else {
-                    	print $langs->trans("AlwaysActive");
-                    }
-                    print "</td>";
+					// Active
+					print '<td class="center" class="nowrap">';
+					if ($canbedisabled) print '<a href="'.$url.'action='.$acts[$obj->active].'">'.$actl[$obj->active].'</a>';
+					else {
+						print $langs->trans("AlwaysActive");
+					}
+					print "</td>";
 
-                    // Modify link
-                    if ($canbemodified) print '<td class="center"><a class="reposition editfielda" href="'.$url.'action=edit">'.img_edit().'</a></td>';
-                    else print '<td>&nbsp;</td>';
+					// Modify link
+					if ($canbemodified) print '<td class="center"><a class="reposition editfielda" href="'.$url.'action=edit">'.img_edit().'</a></td>';
+					else print '<td>&nbsp;</td>';
 
-                    // Delete link
-                    if ($iserasable)
-                    {
-                        print '<td class="center">';
-                        if ($user->admin) print '<a href="'.$url.'action=delete">'.img_delete().'</a>';
-                        //else print '<a href="#">'.img_delete().'</a>';    // Some dictionary can be edited by other profile than admin
-                        print '</td>';
-                    } else print '<td>&nbsp;</td>';
+					// Delete link
+					if ($iserasable)
+					{
+						print '<td class="center">';
+						if ($user->admin) print '<a href="'.$url.'action=delete">'.img_delete().'</a>';
+						//else print '<a href="#">'.img_delete().'</a>';    // Some dictionary can be edited by other profile than admin
+						print '</td>';
+					} else print '<td>&nbsp;</td>';
 
-                    // Link to setup the group
-                    print '<td class="center">';
-                    if (empty($obj->formula))
-                    {
-                        print '<a href="'.DOL_URL_ROOT.'/accountancy/admin/categories.php?action=display&save_lastsearch_values=1&account_category='.$obj->rowid.'">';
-                        print $langs->trans("ListOfAccounts");
-                        print '</a>';
-                    }
-                    print '</td>';
-                }
-                print "</tr>\n";
-                $i++;
-            }
-        }
-    } else {
-        dol_print_error($db);
-    }
+					// Link to setup the group
+					print '<td class="center">';
+					if (empty($obj->formula))
+					{
+						print '<a href="'.DOL_URL_ROOT.'/accountancy/admin/categories.php?action=display&save_lastsearch_values=1&account_category='.$obj->rowid.'">';
+						print $langs->trans("ListOfAccounts");
+						print '</a>';
+					}
+					print '</td>';
+				}
+				print "</tr>\n";
+				$i++;
+			}
+		}
+	} else {
+		dol_print_error($db);
+	}
 
-    print '</table>';
+	print '</table>';
 	print '</div>';
 
-    print '</form>';
+	print '</form>';
 }
 
 print '<br>';
@@ -865,7 +865,7 @@ function fieldListAccountingCategories($fieldlist, $obj = '', $tabname = '', $co
 				print '</td>';
 			}
 		} elseif ($fieldlist[$field] == 'category_type') {
-		    print '<td>';
+			print '<td>';
 			print $form->selectyesno($fieldlist[$field], (!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:''), 1);
 			print '</td>';
 		} elseif ($fieldlist[$field] == 'code' && isset($obj->{$fieldlist[$field]})) {
diff --git a/htdocs/accountancy/admin/closure.php b/htdocs/accountancy/admin/closure.php
index a425fd45768..7e781b3fc71 100644
--- a/htdocs/accountancy/admin/closure.php
+++ b/htdocs/accountancy/admin/closure.php
@@ -39,8 +39,8 @@ $action = GETPOST('action', 'aZ09');
 
 
 $list_account_main = array(
-    'ACCOUNTING_RESULT_PROFIT',
-    'ACCOUNTING_RESULT_LOSS'
+	'ACCOUNTING_RESULT_PROFIT',
+	'ACCOUNTING_RESULT_LOSS'
 );
 
 /*
@@ -48,17 +48,17 @@ $list_account_main = array(
  */
 
 if ($action == 'update') {
-    $error = 0;
+	$error = 0;
 
-    $defaultjournal = GETPOST('ACCOUNTING_CLOSURE_DEFAULT_JOURNAL', 'alpha');
+	$defaultjournal = GETPOST('ACCOUNTING_CLOSURE_DEFAULT_JOURNAL', 'alpha');
 
-    if (!empty($defaultjournal)) {
-        if (!dolibarr_set_const($db, 'ACCOUNTING_CLOSURE_DEFAULT_JOURNAL', $defaultjournal, 'chaine', 0, '', $conf->entity)) {
-            $error++;
-        }
-    } else {
-        $error++;
-    }
+	if (!empty($defaultjournal)) {
+		if (!dolibarr_set_const($db, 'ACCOUNTING_CLOSURE_DEFAULT_JOURNAL', $defaultjournal, 'chaine', 0, '', $conf->entity)) {
+			$error++;
+		}
+	} else {
+		$error++;
+	}
 
 	foreach ($list_account_main as $constname) {
 		$constvalue = GETPOST($constname, 'alpha');
@@ -99,20 +99,20 @@ print '<input type="hidden" name="action" value="update">';
 print '<table class="noborder centpercent">';
 
 foreach ($list_account_main as $key) {
-    print '<tr class="oddeven value">';
-    // Param
-    $label = $langs->trans($key);
-    $keydesc = $key.'_Desc';
+	print '<tr class="oddeven value">';
+	// Param
+	$label = $langs->trans($key);
+	$keydesc = $key.'_Desc';
 
-    $htmltext = $langs->trans($keydesc);
-    print '<td class="fieldrequired" width="50%">';
-    print $form->textwithpicto($label, $htmltext);
-    print '</td>';
-    // Value
-    print '<td>'; // Do not force class=right, or it align also the content of the select box
-    print $formaccounting->select_account($conf->global->$key, $key, 1, '', 1, 1);
-    print '</td>';
-    print '</tr>';
+	$htmltext = $langs->trans($keydesc);
+	print '<td class="fieldrequired" width="50%">';
+	print $form->textwithpicto($label, $htmltext);
+	print '</td>';
+	// Value
+	print '<td>'; // Do not force class=right, or it align also the content of the select box
+	print $formaccounting->select_account($conf->global->$key, $key, 1, '', 1, 1);
+	print '</td>';
+	print '</tr>';
 }
 
 // Journal
diff --git a/htdocs/accountancy/admin/export.php b/htdocs/accountancy/admin/export.php
index b2262c603f9..ba45220c8cc 100644
--- a/htdocs/accountancy/admin/export.php
+++ b/htdocs/accountancy/admin/export.php
@@ -45,7 +45,7 @@ $action = GETPOST('action', 'aZ09');
 
 // Parameters ACCOUNTING_EXPORT_*
 $main_option = array(
-    'ACCOUNTING_EXPORT_PREFIX_SPEC',
+	'ACCOUNTING_EXPORT_PREFIX_SPEC',
 );
 
 $configuration = AccountancyExport::getTypeConfig();
@@ -58,22 +58,22 @@ $listcr = $configuration['cr'];
 
 
 $model_option = array(
-    '1' => array(
-        'label' => 'ACCOUNTING_EXPORT_FORMAT',
-        'param' => $listformat,
-    ),
-    '2' => array(
-        'label' => 'ACCOUNTING_EXPORT_SEPARATORCSV',
-        'param' => '',
-    ),
-    '3' => array(
-        'label' => 'ACCOUNTING_EXPORT_ENDLINE',
-        'param' => $listcr,
-    ),
-    '4' => array(
-        'label' => 'ACCOUNTING_EXPORT_DATE',
-        'param' => '',
-    ),
+	'1' => array(
+		'label' => 'ACCOUNTING_EXPORT_FORMAT',
+		'param' => $listformat,
+	),
+	'2' => array(
+		'label' => 'ACCOUNTING_EXPORT_SEPARATORCSV',
+		'param' => '',
+	),
+	'3' => array(
+		'label' => 'ACCOUNTING_EXPORT_ENDLINE',
+		'param' => $listcr,
+	),
+	'4' => array(
+		'label' => 'ACCOUNTING_EXPORT_DATE',
+		'param' => '',
+	),
 );
 
 
@@ -105,22 +105,22 @@ if ($action == 'update') {
 		}
 	}
 
-    foreach ($listparam[$modelcsv] as $key => $value) {
-        $constante = $key;
+	foreach ($listparam[$modelcsv] as $key => $value) {
+		$constante = $key;
 
-        if (strpos($constante, 'ACCOUNTING') !== false) {
-            $constvalue = GETPOST($key, 'alpha');
-            if (!dolibarr_set_const($db, $constante, $constvalue, 'chaine', 0, '', $conf->entity)) {
-                $error++;
-            }
-        }
-    }
+		if (strpos($constante, 'ACCOUNTING') !== false) {
+			$constvalue = GETPOST($key, 'alpha');
+			if (!dolibarr_set_const($db, $constante, $constvalue, 'chaine', 0, '', $conf->entity)) {
+				$error++;
+			}
+		}
+	}
 
 	if (!$error) {
-        // reload
-        $configuration = AccountancyExport::getTypeConfig();
-        $listparam = $configuration['param'];
-        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+		// reload
+		$configuration = AccountancyExport::getTypeConfig();
+		$listparam = $configuration['param'];
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
@@ -148,36 +148,36 @@ print 'jQuery(document).ready(function () {'."\n";
 print '    function initfields()'."\n";
 print '    {'."\n";
 foreach ($listparam as $key => $param) {
-    print '        if (jQuery("#ACCOUNTING_EXPORT_MODELCSV").val()=="'.$key.'")'."\n";
-    print '        {'."\n";
-    print '            //console.log("'.$param['label'].'");'."\n";
-    if (empty($param['ACCOUNTING_EXPORT_FORMAT'])) {
-        print '            jQuery("#ACCOUNTING_EXPORT_FORMAT").val("'.$conf->global->ACCOUNTING_EXPORT_FORMAT.'");'."\n";
-        print '            jQuery("#ACCOUNTING_EXPORT_FORMAT").prop("disabled", true);'."\n";
-    } else {
-        print '            jQuery("#ACCOUNTING_EXPORT_FORMAT").val("'.$param['ACCOUNTING_EXPORT_FORMAT'].'");'."\n";
-        print '            jQuery("#ACCOUNTING_EXPORT_FORMAT").removeAttr("disabled");'."\n";
-    }
-    if (empty($param['ACCOUNTING_EXPORT_SEPARATORCSV'])) {
-        print '            jQuery("#ACCOUNTING_EXPORT_SEPARATORCSV").val("");'."\n";
-        print '            jQuery("#ACCOUNTING_EXPORT_SEPARATORCSV").prop("disabled", true);'."\n";
-    } else {
-        print '            jQuery("#ACCOUNTING_EXPORT_SEPARATORCSV").val("'.$conf->global->ACCOUNTING_EXPORT_SEPARATORCSV.'");'."\n";
-        print '            jQuery("#ACCOUNTING_EXPORT_SEPARATORCSV").removeAttr("disabled");'."\n";
-    }
-    if (empty($param['ACCOUNTING_EXPORT_ENDLINE'])) {
-        print '            jQuery("#ACCOUNTING_EXPORT_ENDLINE").prop("disabled", true);'."\n";
-    } else {
-        print '            jQuery("#ACCOUNTING_EXPORT_ENDLINE").removeAttr("disabled");'."\n";
-    }
-    if (empty($param['ACCOUNTING_EXPORT_DATE'])) {
-        print '            jQuery("#ACCOUNTING_EXPORT_DATE").val("");'."\n";
-        print '            jQuery("#ACCOUNTING_EXPORT_DATE").prop("disabled", true);'."\n";
-    } else {
-        print '            jQuery("#ACCOUNTING_EXPORT_DATE").val("'.$conf->global->ACCOUNTING_EXPORT_DATE.'");'."\n";
-        print '            jQuery("#ACCOUNTING_EXPORT_DATE").removeAttr("disabled");'."\n";
-    }
-    print '        }'."\n";
+	print '        if (jQuery("#ACCOUNTING_EXPORT_MODELCSV").val()=="'.$key.'")'."\n";
+	print '        {'."\n";
+	print '            //console.log("'.$param['label'].'");'."\n";
+	if (empty($param['ACCOUNTING_EXPORT_FORMAT'])) {
+		print '            jQuery("#ACCOUNTING_EXPORT_FORMAT").val("'.$conf->global->ACCOUNTING_EXPORT_FORMAT.'");'."\n";
+		print '            jQuery("#ACCOUNTING_EXPORT_FORMAT").prop("disabled", true);'."\n";
+	} else {
+		print '            jQuery("#ACCOUNTING_EXPORT_FORMAT").val("'.$param['ACCOUNTING_EXPORT_FORMAT'].'");'."\n";
+		print '            jQuery("#ACCOUNTING_EXPORT_FORMAT").removeAttr("disabled");'."\n";
+	}
+	if (empty($param['ACCOUNTING_EXPORT_SEPARATORCSV'])) {
+		print '            jQuery("#ACCOUNTING_EXPORT_SEPARATORCSV").val("");'."\n";
+		print '            jQuery("#ACCOUNTING_EXPORT_SEPARATORCSV").prop("disabled", true);'."\n";
+	} else {
+		print '            jQuery("#ACCOUNTING_EXPORT_SEPARATORCSV").val("'.$conf->global->ACCOUNTING_EXPORT_SEPARATORCSV.'");'."\n";
+		print '            jQuery("#ACCOUNTING_EXPORT_SEPARATORCSV").removeAttr("disabled");'."\n";
+	}
+	if (empty($param['ACCOUNTING_EXPORT_ENDLINE'])) {
+		print '            jQuery("#ACCOUNTING_EXPORT_ENDLINE").prop("disabled", true);'."\n";
+	} else {
+		print '            jQuery("#ACCOUNTING_EXPORT_ENDLINE").removeAttr("disabled");'."\n";
+	}
+	if (empty($param['ACCOUNTING_EXPORT_DATE'])) {
+		print '            jQuery("#ACCOUNTING_EXPORT_DATE").val("");'."\n";
+		print '            jQuery("#ACCOUNTING_EXPORT_DATE").prop("disabled", true);'."\n";
+	} else {
+		print '            jQuery("#ACCOUNTING_EXPORT_DATE").val("'.$conf->global->ACCOUNTING_EXPORT_DATE.'");'."\n";
+		print '            jQuery("#ACCOUNTING_EXPORT_DATE").removeAttr("disabled");'."\n";
+	}
+	print '        }'."\n";
 }
 print '    }'."\n";
 print '    initfields();'."\n";
@@ -262,17 +262,17 @@ if ($num2) {
 	foreach ($model_option as $key) {
 		print '<tr class="oddeven value">';
 
-        // Param
-        $label = $key['label'];
+		// Param
+		$label = $key['label'];
 		print '<td width="50%">'.$langs->trans($label).'</td>';
 
 		// Value
-        print '<td>';
-        if (is_array($key['param'])) {
-            print $form->selectarray($label, $key['param'], $conf->global->$label, 0);
-        } else {
-            print '<input type="text" size="20" id="'.$label.'" name="'.$key['label'].'" value="'.$conf->global->$label.'">';
-        }
+		print '<td>';
+		if (is_array($key['param'])) {
+			print $form->selectarray($label, $key['param'], $conf->global->$label, 0);
+		} else {
+			print '<input type="text" size="20" id="'.$label.'" name="'.$key['label'].'" value="'.$conf->global->$label.'">';
+		}
 
 		print '</td></tr>';
 	}
diff --git a/htdocs/accountancy/admin/fiscalyear.php b/htdocs/accountancy/admin/fiscalyear.php
index 1ddcddf13e6..4aa1fd99ff4 100644
--- a/htdocs/accountancy/admin/fiscalyear.php
+++ b/htdocs/accountancy/admin/fiscalyear.php
@@ -113,7 +113,7 @@ if ($result)
 	$i = 0;
 
 
-    $addbutton .= dolGetButtonTitle($langs->trans('NewFiscalYear'), '', 'fa fa-plus-circle', 'fiscalyear_card.php?action=create', '', $user->rights->accounting->fiscalyear->write);
+	$addbutton .= dolGetButtonTitle($langs->trans('NewFiscalYear'), '', 'fa fa-plus-circle', 'fiscalyear_card.php?action=create', '', $user->rights->accounting->fiscalyear->write);
 
 
 	$title = $langs->trans('AccountingPeriods');
diff --git a/htdocs/accountancy/admin/fiscalyear_card.php b/htdocs/accountancy/admin/fiscalyear_card.php
index 97b92bdd172..aa10c0101c1 100644
--- a/htdocs/accountancy/admin/fiscalyear_card.php
+++ b/htdocs/accountancy/admin/fiscalyear_card.php
@@ -187,7 +187,7 @@ if ($action == 'create')
 
 	print '</table>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div class="center">';
 	print '<input class="button" type="submit" value="'.$langs->trans("Save").'">';
@@ -248,7 +248,7 @@ if ($action == 'create')
 
 			print '</form>';
 
-			dol_fiche_end();
+			print dol_get_fiche_end();
 		} else {
 			/*
 			 * Confirm delete
@@ -296,7 +296,7 @@ if ($action == 'create')
 
 			print "</table>";
 
-			dol_fiche_end();
+			print dol_get_fiche_end();
 
 			if (!empty($user->rights->accounting->fiscalyear->write))
 			{
diff --git a/htdocs/accountancy/admin/journals_list.php b/htdocs/accountancy/admin/journals_list.php
index 819160e7d23..68a9660a0e9 100644
--- a/htdocs/accountancy/admin/journals_list.php
+++ b/htdocs/accountancy/admin/journals_list.php
@@ -420,15 +420,15 @@ if ($id)
 			$valuetoshow = ucfirst($fieldlist[$field]); // Par defaut
 			$valuetoshow = $langs->trans($valuetoshow); // try to translate
 			$class = "left";
-            if ($fieldlist[$field] == 'code') {
-                $valuetoshow = $langs->trans("Code");
-            }
+			if ($fieldlist[$field] == 'code') {
+				$valuetoshow = $langs->trans("Code");
+			}
 			if ($fieldlist[$field] == 'libelle' || $fieldlist[$field] == 'label') {
 				$valuetoshow = $langs->trans("Label");
 			}
-            if ($fieldlist[$field] == 'nature') {
-                $valuetoshow = $langs->trans("NatureOfJournal");
-            }
+			if ($fieldlist[$field] == 'nature') {
+				$valuetoshow = $langs->trans("NatureOfJournal");
+			}
 
 			if ($valuetoshow != '') {
 				print '<td class="'.$class.'">';
@@ -540,14 +540,14 @@ if ($id)
 			$valuetoshow = ucfirst($fieldlist[$field]); // By defaut
 			$valuetoshow = $langs->trans($valuetoshow); // try to translate
 			if ($fieldlist[$field] == 'code') {
-                $valuetoshow = $langs->trans("Code");
-            }
+				$valuetoshow = $langs->trans("Code");
+			}
 			if ($fieldlist[$field] == 'libelle' || $fieldlist[$field] == 'label') {
-                $valuetoshow = $langs->trans("Label");
-            }
+				$valuetoshow = $langs->trans("Label");
+			}
 			if ($fieldlist[$field] == 'nature') {
-                $valuetoshow = $langs->trans("NatureOfJournal");
-            }
+				$valuetoshow = $langs->trans("NatureOfJournal");
+			}
 
 			// Affiche nom du champ
 			if ($showfield) {
@@ -594,7 +594,7 @@ if ($id)
 
 					if (empty($reshook))
 					{
-                        $langs->load("accountancy");
+						$langs->load("accountancy");
 						foreach ($fieldlist as $field => $value)
 						{
 							$showfield = 1;
@@ -607,7 +607,7 @@ if ($id)
 								$valuetoshow = ($obj->nature && $key != "AccountingJournalType".strtoupper($langs->trans($obj->nature)) ? $key : $obj->{$fieldlist[$field]});
 							} elseif ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'accounting_journal') {
 								$valuetoshow = $langs->trans($obj->label);
-                            }
+							}
 
 							$class = 'tddict';
 							// Show value for field
@@ -619,15 +619,15 @@ if ($id)
 					$iserasable = 1; $canbedisabled = 1; $canbemodified = 1; // true by default
 					if (isset($obj->code) && $id != 10) {
 						if (($obj->code == '0' || $obj->code == '' || preg_match('/unknown/i', $obj->code))) {
-                            $iserasable = 0;
-                            $canbedisabled = 0;
-                        } elseif ($obj->code == 'RECEP') {
-                            $iserasable = 0;
-                            $canbedisabled = 0;
-                        } elseif ($obj->code == 'EF0') {
-                            $iserasable = 0;
-                            $canbedisabled = 0;
-                        }
+							$iserasable = 0;
+							$canbedisabled = 0;
+						} elseif ($obj->code == 'RECEP') {
+							$iserasable = 0;
+							$canbedisabled = 0;
+						} elseif ($obj->code == 'EF0') {
+							$iserasable = 0;
+							$canbedisabled = 0;
+						}
 					}
 
 					$canbemodified = $iserasable;
diff --git a/htdocs/accountancy/admin/productaccount.php b/htdocs/accountancy/admin/productaccount.php
index d88800016a8..e09f6ec14cf 100644
--- a/htdocs/accountancy/admin/productaccount.php
+++ b/htdocs/accountancy/admin/productaccount.php
@@ -42,7 +42,7 @@ if (empty($conf->accounting->enabled)) {
 	accessforbidden();
 }
 if (!$user->rights->accounting->bind->write)
-    accessforbidden();
+	accessforbidden();
 
 // search & action GETPOST
 $action = GETPOST('action', 'aZ09');
@@ -100,14 +100,14 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 // Purge search criteria
 if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All test are required to be compatible with all browsers
 {
-    $search_ref = '';
-    $search_label = '';
-    $search_desc = '';
+	$search_ref = '';
+	$search_label = '';
+	$search_desc = '';
 	$search_vat = '';
-    $search_onsell = '';
-    $search_onpurchase = '';
-    $search_current_account = '';
-    $search_current_account_valid = '-1';
+	$search_onsell = '';
+	$search_onpurchase = '';
+	$search_current_account = '';
+	$search_current_account_valid = '-1';
 }
 
 // Sales or Purchase mode ?
@@ -117,8 +117,8 @@ if ($action == 'update') {
 
 		$accounting_product_modes = array(
 				'ACCOUNTANCY_SELL',
-                'ACCOUNTANCY_SELL_INTRA',
-                'ACCOUNTANCY_SELL_EXPORT',
+				'ACCOUNTANCY_SELL_INTRA',
+				'ACCOUNTANCY_SELL_EXPORT',
 				'ACCOUNTANCY_BUY',
 				'ACCOUNTANCY_BUY_INTRA',
 				'ACCOUNTANCY_BUY_EXPORT'
@@ -172,22 +172,22 @@ if ($action == 'update') {
 					if ($accounting_product_mode == 'ACCOUNTANCY_SELL') {
 						$sql .= " SET accountancy_code_sell = ".$accounting->account_number;
 					}
-                    if ($accounting_product_mode == 'ACCOUNTANCY_SELL_INTRA') {
-                        $sql .= " SET accountancy_code_sell_intra = ".$accounting->account_number;
-                    }
-                    if ($accounting_product_mode == 'ACCOUNTANCY_SELL_EXPORT') {
-                        $sql .= " SET accountancy_code_sell_export = ".$accounting->account_number;
-                    }
+					if ($accounting_product_mode == 'ACCOUNTANCY_SELL_INTRA') {
+						$sql .= " SET accountancy_code_sell_intra = ".$accounting->account_number;
+					}
+					if ($accounting_product_mode == 'ACCOUNTANCY_SELL_EXPORT') {
+						$sql .= " SET accountancy_code_sell_export = ".$accounting->account_number;
+					}
 					$sql .= " WHERE rowid = ".((int) $productid);
 
 					dol_syslog("/accountancy/admin/productaccount.php sql=".$sql, LOG_DEBUG);
 					if ($db->query($sql))
 					{
-					    $ok++;
-					    $db->commit();
+						$ok++;
+						$db->commit();
 					} else {
-					    $ko++;
-					    $db->rollback();
+						$ko++;
+						$db->rollback();
 					}
 				}
 
@@ -253,7 +253,7 @@ $sql .= " aa.rowid as aaid";
 $sql .= " FROM ".MAIN_DB_PREFIX."product as p";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa ON";
 if ($accounting_product_mode == 'ACCOUNTANCY_BUY') {
-    $sql .= " p.accountancy_code_buy = aa.account_number AND aa.fk_pcg_version = '".$db->escape($pcgvercode)."'";
+	$sql .= " p.accountancy_code_buy = aa.account_number AND aa.fk_pcg_version = '".$db->escape($pcgvercode)."'";
 } elseif ($accounting_product_mode == 'ACCOUNTANCY_BUY_INTRA')
 {
 	$sql .= " p.accountancy_code_buy_intra = aa.account_number AND aa.fk_pcg_version = '".$db->escape($pcgvercode)."'";
@@ -271,9 +271,9 @@ if ($accounting_product_mode == 'ACCOUNTANCY_BUY') {
 }
 $sql .= ' WHERE p.entity IN ('.getEntity('product').')';
 if ($accounting_product_mode == 'ACCOUNTANCY_BUY') {
-    if (strlen(trim($search_current_account))) {
-        $sql .= natural_search("p.accountancy_code_buy", $search_current_account);
-    }
+	if (strlen(trim($search_current_account))) {
+		$sql .= natural_search("p.accountancy_code_buy", $search_current_account);
+	}
 } elseif ($accounting_product_mode == 'ACCOUNTANCY_BUY_INTRA') {
 	if (strlen(trim($search_current_account))) {
 		$sql .= natural_search("p.accountancy_code_buy_intra", $search_current_account);
@@ -283,17 +283,17 @@ if ($accounting_product_mode == 'ACCOUNTANCY_BUY') {
 		$sql .= natural_search("p.accountancy_code_buy_export", $search_current_account);
 	}
 } elseif ($accounting_product_mode == 'ACCOUNTANCY_SELL') {
-    if (strlen(trim($search_current_account))) {
-        $sql .= natural_search("p.accountancy_code_sell", $search_current_account);
-    }
+	if (strlen(trim($search_current_account))) {
+		$sql .= natural_search("p.accountancy_code_sell", $search_current_account);
+	}
 } elseif ($accounting_product_mode == 'ACCOUNTANCY_SELL_INTRA') {
-    if (strlen(trim($search_current_account))) {
-        $sql .= natural_search("p.accountancy_code_sell_intra", $search_current_account);
-    }
+	if (strlen(trim($search_current_account))) {
+		$sql .= natural_search("p.accountancy_code_sell_intra", $search_current_account);
+	}
 } else {
-    if (strlen(trim($search_current_account))) {
-        $sql .= natural_search("p.accountancy_code_sell_export", $search_current_account);
-    }
+	if (strlen(trim($search_current_account))) {
+		$sql .= natural_search("p.accountancy_code_sell_export", $search_current_account);
+	}
 }
 if ($search_current_account_valid == 'withoutvalidaccount')
 {
@@ -301,7 +301,7 @@ if ($search_current_account_valid == 'withoutvalidaccount')
 }
 if ($search_current_account_valid == 'withvalidaccount')
 {
-    $sql .= " AND aa.account_number IS NOT NULL";
+	$sql .= " AND aa.account_number IS NOT NULL";
 }
 // Add search filter like
 if (strlen(trim($search_ref))) {
@@ -324,13 +324,13 @@ $sql .= $db->order($sortfield, $sortorder);
 $nbtotalofrecords = '';
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
-    $result = $db->query($sql);
-    $nbtotalofrecords = $db->num_rows($result);
-    if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
-    {
-    	$page = 0;
-    	$offset = 0;
-    }
+	$result = $db->query($sql);
+	$nbtotalofrecords = $db->num_rows($result);
+	if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+	{
+		$page = 0;
+		$offset = 0;
+	}
 }
 
 $sql .= $db->plimit($limit + 1, $offset);
@@ -342,32 +342,32 @@ if ($result)
 	$num = $db->num_rows($result);
 	$i = 0;
 
-    $param = '';
-    if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
-    if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
-    if ($search_ref > 0) $param .= "&search_desc=".urlencode($search_ref);
-    if ($search_label > 0) $param .= "&search_desc=".urlencode($search_label);
-    if ($search_desc > 0) $param .= "&search_desc=".urlencode($search_desc);
+	$param = '';
+	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
+	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
+	if ($search_ref > 0) $param .= "&search_desc=".urlencode($search_ref);
+	if ($search_label > 0) $param .= "&search_desc=".urlencode($search_label);
+	if ($search_desc > 0) $param .= "&search_desc=".urlencode($search_desc);
 	if ($search_vat > 0) $param .= '&search_vat='.urlencode($search_vat);
-    if ($search_current_account > 0) $param .= "&search_current_account=".urlencode($search_current_account);
-    if ($search_current_account_valid && $search_current_account_valid != '-1') $param .= "&search_current_account_valid=".urlencode($search_current_account_valid);
-    if ($accounting_product_mode) $param .= '&accounting_product_mode='.urlencode($accounting_product_mode);
+	if ($search_current_account > 0) $param .= "&search_current_account=".urlencode($search_current_account);
+	if ($search_current_account_valid && $search_current_account_valid != '-1') $param .= "&search_current_account_valid=".urlencode($search_current_account_valid);
+	if ($accounting_product_mode) $param .= '&accounting_product_mode='.urlencode($accounting_product_mode);
 
-    print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
-    if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
-    print '<input type="hidden" name="action" value="update">';
-    print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
-    print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+	print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
+	if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
+	print '<input type="hidden" name="action" value="update">';
+	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 
-    print load_fiche_titre($langs->trans("ProductsBinding"), '', 'title_accountancy');
+	print load_fiche_titre($langs->trans("ProductsBinding"), '', 'title_accountancy');
 	print '<br>';
 
 	print '<span class="opacitymedium">'.$langs->trans("InitAccountancyDesc").'</span><br>';
 	print '<br>';
 
-    // Select mode
+	// Select mode
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre">';
 	print '<td>'.$langs->trans('Options').'</td><td>'.$langs->trans('Description').'</td>';
@@ -377,13 +377,13 @@ if ($result)
 	print "</td></tr>\n";
 	if ($mysoc->isInEEC())
 	{
-        print '<tr class="oddeven"><td class="titlefield"><input type="radio" name="accounting_product_mode" value="ACCOUNTANCY_SELL_INTRA"'.($accounting_product_mode == 'ACCOUNTANCY_SELL_INTRA' ? ' checked' : '').'> '.$langs->trans('OptionModeProductSellIntra').'</td>';
-        print '<td>'.$langs->trans('OptionModeProductSellIntraDesc');
-        print "</td></tr>\n";
+		print '<tr class="oddeven"><td class="titlefield"><input type="radio" name="accounting_product_mode" value="ACCOUNTANCY_SELL_INTRA"'.($accounting_product_mode == 'ACCOUNTANCY_SELL_INTRA' ? ' checked' : '').'> '.$langs->trans('OptionModeProductSellIntra').'</td>';
+		print '<td>'.$langs->trans('OptionModeProductSellIntraDesc');
+		print "</td></tr>\n";
 	}
-    print '<tr class="oddeven"><td class="titlefield"><input type="radio" name="accounting_product_mode" value="ACCOUNTANCY_SELL_EXPORT"'.($accounting_product_mode == 'ACCOUNTANCY_SELL_EXPORT' ? ' checked' : '').'> '.$langs->trans('OptionModeProductSellExport').'</td>';
-    print '<td>'.$langs->trans('OptionModeProductSellExportDesc');
-    print "</td></tr>\n";
+	print '<tr class="oddeven"><td class="titlefield"><input type="radio" name="accounting_product_mode" value="ACCOUNTANCY_SELL_EXPORT"'.($accounting_product_mode == 'ACCOUNTANCY_SELL_EXPORT' ? ' checked' : '').'> '.$langs->trans('OptionModeProductSellExport').'</td>';
+	print '<td>'.$langs->trans('OptionModeProductSellExportDesc');
+	print "</td></tr>\n";
 	print '<tr class="oddeven"><td class="titlefield"><input type="radio" name="accounting_product_mode" value="ACCOUNTANCY_BUY"'.($accounting_product_mode == 'ACCOUNTANCY_BUY' ? ' checked' : '').'> '.$langs->trans('OptionModeProductBuy').'</td>';
 	print '<td>'.$langs->trans('OptionModeProductBuyDesc')."</td></tr>\n";
 	if ($mysoc->isInEEC())
@@ -405,8 +405,8 @@ if ($result)
 	$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 	$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
 
-    $buttonsave = '<input type="submit" class="button" id="changeaccount" name="changeaccount" value="'.$langs->trans("Save").'">';
-    //print '<br><div class="center">'.$buttonsave.'</div>';
+	$buttonsave = '<input type="submit" class="button" id="changeaccount" name="changeaccount" value="'.$langs->trans("Save").'">';
+	//print '<br><div class="center">'.$buttonsave.'</div>';
 
 	$texte = $langs->trans("ListOfProductsServices");
 	print_barre_liste($texte, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $buttonsave, $num, $nbtotalofrecords, '', 0, '', '', $limit, 0, 0, 1);
@@ -444,22 +444,22 @@ if ($result)
 	print '<tr class="liste_titre">';
 	print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "p.ref", "", $param, '', $sortfield, $sortorder);
 	print_liste_field_titre("Label", $_SERVER["PHP_SELF"], "p.label", "", $param, '', $sortfield, $sortorder);
-    if (!empty($conf->global->ACCOUNTANCY_SHOW_PROD_DESC)) print_liste_field_titre("Description", $_SERVER["PHP_SELF"], "p.description", "", $param, '', $sortfield, $sortorder);
+	if (!empty($conf->global->ACCOUNTANCY_SHOW_PROD_DESC)) print_liste_field_titre("Description", $_SERVER["PHP_SELF"], "p.description", "", $param, '', $sortfield, $sortorder);
 	print_liste_field_titre("VATRate", $_SERVER["PHP_SELF"], "p.tva_tx", "", $param, '', $sortfield, $sortorder, 'right ');
 	// On sell / On purchase
-    if ($accounting_product_mode == 'ACCOUNTANCY_SELL') {
-        print_liste_field_titre("OnSell", $_SERVER["PHP_SELF"], "p.tosell", "", $param, '', $sortfield, $sortorder, 'center ');
-        $fieldtosortaccount = "p.accountancy_code_sell";
-    } elseif ($accounting_product_mode == 'ACCOUNTANCY_SELL_INTRA') {
-        print_liste_field_titre("OnSell", $_SERVER["PHP_SELF"], "p.tosell", "", $param, '', $sortfield, $sortorder, 'center ');
-        $fieldtosortaccount = "p.accountancy_code_sell_intra";
-    } elseif ($accounting_product_mode == 'ACCOUNTANCY_SELL_EXPORT') {
-        print_liste_field_titre("OnSell", $_SERVER["PHP_SELF"], "p.tosell", "", $param, '', $sortfield, $sortorder, 'center ');
-        $fieldtosortaccount = "p.accountancy_code_sell_export";
-    } elseif ($accounting_product_mode == 'ACCOUNTANCY_BUY') {
-    	print_liste_field_titre("OnBuy", $_SERVER["PHP_SELF"], "p.tobuy", "", $param, '', $sortfield, $sortorder, 'center ');
-        $fieldtosortaccount = "p.accountancy_code_buy";
-    } elseif ($accounting_product_mode == 'ACCOUNTANCY_BUY_INTRA') {
+	if ($accounting_product_mode == 'ACCOUNTANCY_SELL') {
+		print_liste_field_titre("OnSell", $_SERVER["PHP_SELF"], "p.tosell", "", $param, '', $sortfield, $sortorder, 'center ');
+		$fieldtosortaccount = "p.accountancy_code_sell";
+	} elseif ($accounting_product_mode == 'ACCOUNTANCY_SELL_INTRA') {
+		print_liste_field_titre("OnSell", $_SERVER["PHP_SELF"], "p.tosell", "", $param, '', $sortfield, $sortorder, 'center ');
+		$fieldtosortaccount = "p.accountancy_code_sell_intra";
+	} elseif ($accounting_product_mode == 'ACCOUNTANCY_SELL_EXPORT') {
+		print_liste_field_titre("OnSell", $_SERVER["PHP_SELF"], "p.tosell", "", $param, '', $sortfield, $sortorder, 'center ');
+		$fieldtosortaccount = "p.accountancy_code_sell_export";
+	} elseif ($accounting_product_mode == 'ACCOUNTANCY_BUY') {
+		print_liste_field_titre("OnBuy", $_SERVER["PHP_SELF"], "p.tobuy", "", $param, '', $sortfield, $sortorder, 'center ');
+		$fieldtosortaccount = "p.accountancy_code_buy";
+	} elseif ($accounting_product_mode == 'ACCOUNTANCY_BUY_INTRA') {
 		print_liste_field_titre("OnBuy", $_SERVER["PHP_SELF"], "p.tobuy", "", $param, '', $sortfield, $sortorder, 'center ');
 		$fieldtosortaccount = "p.accountancy_code_buy_intra";
 	} elseif ($accounting_product_mode == 'ACCOUNTANCY_BUY_EXPORT') {
@@ -475,8 +475,8 @@ if ($result)
 	$product_static = new Product($db);
 
 	$i = 0;
-    while ($i < min($num, $limit))
-    {
+	while ($i < min($num, $limit))
+	{
 		$obj = $db->fetch_object($result);
 
 		// Ref produit as link
@@ -494,12 +494,12 @@ if ($result)
 				$compta_prodsell = (!empty($conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT : $langs->trans("CodeNotDef"));
 				$compta_prodsell_id = $aarowid_prodsell;
 			} elseif ($accounting_product_mode == 'ACCOUNTANCY_SELL_INTRA') {
-	            $compta_prodsell = (!empty($conf->global->ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT : $langs->trans("CodeNotDef"));
-    	        $compta_prodsell_id = $aarowid_prodsell_intra;
+				$compta_prodsell = (!empty($conf->global->ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT : $langs->trans("CodeNotDef"));
+				$compta_prodsell_id = $aarowid_prodsell_intra;
 			} elseif ($accounting_product_mode == 'ACCOUNTANCY_SELL_EXPORT') {
-            	$compta_prodsell = (!empty($conf->global->ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT : $langs->trans("CodeNotDef"));
-            	$compta_prodsell_id = $aarowid_prodsell_export;
-        	} else {
+				$compta_prodsell = (!empty($conf->global->ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT : $langs->trans("CodeNotDef"));
+				$compta_prodsell_id = $aarowid_prodsell_export;
+			} else {
 				$compta_prodsell = (!empty($conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT : $langs->trans("CodeNotDef"));
 				$compta_prodsell_id = $aarowid_prodsell;
 			}
@@ -560,11 +560,11 @@ if ($result)
 
 		if (!empty($conf->global->ACCOUNTANCY_SHOW_PROD_DESC))
 		{
-		    // TODO ADJUST DESCRIPTION SIZE
-    		// print '<td class="left">' . $obj->description . '</td>';
-    		// TODO: we should set a user defined value to adjust user square / wide screen size
-    		$trunclength = empty($conf->global->ACCOUNTING_LENGTH_DESCRIPTION) ? 32 : $conf->global->ACCOUNTING_LENGTH_DESCRIPTION;
-    		print '<td>'.nl2br(dol_trunc($obj->description, $trunclength)).'</td>';
+			// TODO ADJUST DESCRIPTION SIZE
+			// print '<td class="left">' . $obj->description . '</td>';
+			// TODO: we should set a user defined value to adjust user square / wide screen size
+			$trunclength = empty($conf->global->ACCOUNTING_LENGTH_DESCRIPTION) ? 32 : $conf->global->ACCOUNTING_LENGTH_DESCRIPTION;
+			print '<td>'.nl2br(dol_trunc($obj->description, $trunclength)).'</td>';
 		}
 
 		// VAT
@@ -581,36 +581,36 @@ if ($result)
 		// Current accounting account
 		print '<td class="left">';
 		if ($accounting_product_mode == 'ACCOUNTANCY_BUY') {
-		    print length_accountg($obj->accountancy_code_buy);
-		    if ($obj->accountancy_code_buy && empty($obj->aaid)) print ' '.img_warning($langs->trans("ValueNotIntoChartOfAccount"));
+			print length_accountg($obj->accountancy_code_buy);
+			if ($obj->accountancy_code_buy && empty($obj->aaid)) print ' '.img_warning($langs->trans("ValueNotIntoChartOfAccount"));
 		} elseif ($accounting_product_mode == 'ACCOUNTANCY_BUY_INTRA') {
-            print length_accountg($obj->accountancy_code_buy_intra);
-            if ($obj->accountancy_code_buy_intra && empty($obj->aaid)) print ' '.img_warning($langs->trans("ValueNotIntoChartOfAccount"));
-        } elseif ($accounting_product_mode == 'ACCOUNTANCY_BUY_EXPORT') {
-            print length_accountg($obj->accountancy_code_buy_export);
-            if ($obj->accountancy_code_buy_export && empty($obj->aaid)) print ' '.img_warning($langs->trans("ValueNotIntoChartOfAccount"));
-        } elseif ($accounting_product_mode == 'ACCOUNTANCY_SELL') {
-            print length_accountg($obj->accountancy_code_sell);
-            if ($obj->accountancy_code_sell && empty($obj->aaid)) print ' '.img_warning($langs->trans("ValueNotIntoChartOfAccount"));
-        } elseif ($accounting_product_mode == 'ACCOUNTANCY_SELL_INTRA') {
-		    print length_accountg($obj->accountancy_code_sell_intra);
-		    if ($obj->accountancy_code_sell_intra && empty($obj->aaid)) print ' '.img_warning($langs->trans("ValueNotIntoChartOfAccount"));
+			print length_accountg($obj->accountancy_code_buy_intra);
+			if ($obj->accountancy_code_buy_intra && empty($obj->aaid)) print ' '.img_warning($langs->trans("ValueNotIntoChartOfAccount"));
+		} elseif ($accounting_product_mode == 'ACCOUNTANCY_BUY_EXPORT') {
+			print length_accountg($obj->accountancy_code_buy_export);
+			if ($obj->accountancy_code_buy_export && empty($obj->aaid)) print ' '.img_warning($langs->trans("ValueNotIntoChartOfAccount"));
+		} elseif ($accounting_product_mode == 'ACCOUNTANCY_SELL') {
+			print length_accountg($obj->accountancy_code_sell);
+			if ($obj->accountancy_code_sell && empty($obj->aaid)) print ' '.img_warning($langs->trans("ValueNotIntoChartOfAccount"));
+		} elseif ($accounting_product_mode == 'ACCOUNTANCY_SELL_INTRA') {
+			print length_accountg($obj->accountancy_code_sell_intra);
+			if ($obj->accountancy_code_sell_intra && empty($obj->aaid)) print ' '.img_warning($langs->trans("ValueNotIntoChartOfAccount"));
 		} else {
-            print length_accountg($obj->accountancy_code_sell_export);
-            if ($obj->accountancy_code_sell_export && empty($obj->aaid)) print ' '.img_warning($langs->trans("ValueNotIntoChartOfAccount"));
-        }
+			print length_accountg($obj->accountancy_code_sell_export);
+			if ($obj->accountancy_code_sell_export && empty($obj->aaid)) print ' '.img_warning($langs->trans("ValueNotIntoChartOfAccount"));
+		}
 		print '</td>';
 
 		// New account to set
 		$defaultvalue = '';
 		if ($accounting_product_mode == 'ACCOUNTANCY_BUY') {
-    		// Accounting account buy
+			// Accounting account buy
 			print '<td class="left">';
 			//$defaultvalue=GETPOST('codeventil_' . $product_static->id,'alpha');        This is id and we need a code
 			if (empty($defaultvalue)) $defaultvalue = $compta_prodbuy;
 			$codesell = length_accountg($obj->accountancy_code_buy);
 			if (!empty($obj->aaid)) $defaultvalue = ''; // Do not suggest default new value is code is already valid
-			print $form->select_account($defaultvalue, 'codeventil_'.$product_static->id, 1, array(), 1);
+			print $form->select_account($defaultvalue, 'codeventil_'.$product_static->id, 1, array(), 1, 0, 'maxwidth300 maxwidthonsmartphone productforselect');
 			print '</td>';
 		} elseif ($accounting_product_mode == 'ACCOUNTANCY_BUY_INTRA') {
 			// Accounting account buy intra (In EEC)
@@ -620,7 +620,7 @@ if ($result)
 			$codesell = length_accountg($obj->accountancy_code_buy_intra);
 			//var_dump($defaultvalue.' - '.$codesell.' - '.$compta_prodsell);
 			if (!empty($obj->aaid)) $defaultvalue = ''; // Do not suggest default new value is code is already valid
-			print $form->select_account($defaultvalue, 'codeventil_'.$product_static->id, 1, array(), 1);
+			print $form->select_account($defaultvalue, 'codeventil_'.$product_static->id, 1, array(), 1, 0, 'maxwidth300 maxwidthonsmartphone productforselect');
 			print '</td>';
 		} elseif ($accounting_product_mode == 'ACCOUNTANCY_BUY_EXPORT') {
 			// Accounting account buy export (Out of EEC)
@@ -630,7 +630,7 @@ if ($result)
 			$codesell = length_accountg($obj->accountancy_code_buy_export);
 			//var_dump($defaultvalue.' - '.$codesell.' - '.$compta_prodsell);
 			if (!empty($obj->aaid)) $defaultvalue = ''; // Do not suggest default new value is code is already valid
-			print $form->select_account($defaultvalue, 'codeventil_'.$product_static->id, 1, array(), 1);
+			print $form->select_account($defaultvalue, 'codeventil_'.$product_static->id, 1, array(), 1, 0, 'maxwidth300 maxwidthonsmartphone productforselect');
 			print '</td>';
 		} elseif ($accounting_product_mode == 'ACCOUNTANCY_SELL') {
 			// Accounting account sell
@@ -640,32 +640,32 @@ if ($result)
 			$codesell = length_accountg($obj->accountancy_code_sell);
 			//var_dump($defaultvalue.' - '.$codesell.' - '.$compta_prodsell);
 			if (!empty($obj->aaid)) $defaultvalue = ''; // Do not suggest default new value is code is already valid
-			print $form->select_account($defaultvalue, 'codeventil_'.$product_static->id, 1, array(), 1);
+			print $form->select_account($defaultvalue, 'codeventil_'.$product_static->id, 1, array(), 1, 0, 'maxwidth300 maxwidthonsmartphone productforselect');
 			print '</td>';
 		} elseif ($accounting_product_mode == 'ACCOUNTANCY_SELL_INTRA') {
-            // Accounting account sell intra (In EEC)
-            print '<td class="left">';
-            //$defaultvalue=GETPOST('codeventil_' . $product_static->id,'alpha');        This is id and we need a code
-            if (empty($defaultvalue)) $defaultvalue = $compta_prodsell;
-            $codesell = length_accountg($obj->accountancy_code_sell_intra);
-            //var_dump($defaultvalue.' - '.$codesell.' - '.$compta_prodsell);
-            if (!empty($obj->aaid)) $defaultvalue = ''; // Do not suggest default new value is code is already valid
-            print $form->select_account($defaultvalue, 'codeventil_'.$product_static->id, 1, array(), 1);
-            print '</td>';
-        } else {
-            // Accounting account sell export (Out of EEC)
-            print '<td class="left">';
-            //$defaultvalue=GETPOST('codeventil_' . $product_static->id,'alpha');        This is id and we need a code
-            if (empty($defaultvalue)) $defaultvalue = $compta_prodsell;
-            $codesell = length_accountg($obj->accountancy_code_sell_export);
-            if (!empty($obj->aaid)) $defaultvalue = ''; // Do not suggest default new value is code is already valid
-            print $form->select_account($defaultvalue, 'codeventil_'.$product_static->id, 1, array(), 1);
-            print '</td>';
-        }
+			// Accounting account sell intra (In EEC)
+			print '<td class="left">';
+			//$defaultvalue=GETPOST('codeventil_' . $product_static->id,'alpha');        This is id and we need a code
+			if (empty($defaultvalue)) $defaultvalue = $compta_prodsell;
+			$codesell = length_accountg($obj->accountancy_code_sell_intra);
+			//var_dump($defaultvalue.' - '.$codesell.' - '.$compta_prodsell);
+			if (!empty($obj->aaid)) $defaultvalue = ''; // Do not suggest default new value is code is already valid
+			print $form->select_account($defaultvalue, 'codeventil_'.$product_static->id, 1, array(), 1, 0, 'maxwidth300 maxwidthonsmartphone productforselect');
+			print '</td>';
+		} else {
+			// Accounting account sell export (Out of EEC)
+			print '<td class="left">';
+			//$defaultvalue=GETPOST('codeventil_' . $product_static->id,'alpha');        This is id and we need a code
+			if (empty($defaultvalue)) $defaultvalue = $compta_prodsell;
+			$codesell = length_accountg($obj->accountancy_code_sell_export);
+			if (!empty($obj->aaid)) $defaultvalue = ''; // Do not suggest default new value is code is already valid
+			print $form->select_account($defaultvalue, 'codeventil_'.$product_static->id, 1, array(), 1, 0, 'maxwidth300 maxwidthonsmartphone productforselect');
+			print '</td>';
+		}
 
 		// Checkbox select
 		print '<td class="center">';
-		print '<input type="checkbox" class="checkforselect" name="chk_prod[]" value="'.$obj->rowid.'"/></td>';
+		print '<input type="checkbox" class="checkforselect productforselectcodeventil_'.$product_static->id.'" name="chk_prod[]" value="'.$obj->rowid.'"/></td>';
 		print "</tr>";
 		$i++;
 	}
@@ -689,7 +689,17 @@ if ($result)
 	            if (atleastoneselected) jQuery("#changeaccount").attr(\'class\',\'button\');
 	            else jQuery("#changeaccount").attr(\'class\',\'button\');
         	}
-        	jQuery(".checkforselect, #checkallactions").click(function() {
+
+        	jQuery(".checkforselect").change(function() {
+        		init_savebutton();
+        	});
+        	jQuery(".productforselect").change(function() {
+				console.log($(this).attr("id")+" "+$(this).val());
+				if ($(this).val() && $(this).val() != -1) {
+					$(".productforselect"+$(this).attr("id")).prop(\'checked\', true);
+				} else {
+					$(".productforselect"+$(this).attr("id")).prop(\'checked\', false);
+				}
         		init_savebutton();
         	});
 
diff --git a/htdocs/accountancy/bookkeeping/balance.php b/htdocs/accountancy/bookkeeping/balance.php
index c3e225e5399..a930ed12852 100644
--- a/htdocs/accountancy/bookkeeping/balance.php
+++ b/htdocs/accountancy/bookkeeping/balance.php
@@ -274,11 +274,11 @@ if ($action != 'export_csv')
 	$sous_total_credit = 0;
 	$displayed_account = "";
 
-    $accountingaccountstatic = new AccountingAccount($db);
+	$accountingaccountstatic = new AccountingAccount($db);
 
 	$sql = "SELECT t.numero_compte, (SUM(t.debit) - SUM(t.credit)) as opening_balance";
 	$sql .= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as t";
-	$sql .= " WHERE t.entity = ".$conf->entity;		// Never do sharing into accounting features
+	$sql .= " WHERE t.entity = ".$conf->entity; // Never do sharing into accounting features
 	$sql .= " AND t.doc_date < '".$db->idate($search_date_start)."'";
 	$sql .= " GROUP BY t.numero_compte";
 
@@ -292,12 +292,12 @@ if ($action != 'export_csv')
 
 	foreach ($object->lines as $line)
 	{
-        $accountingaccountstatic->fetch(null, $line->numero_compte, true);
-        if (!empty($accountingaccountstatic->account_number)) {
-            $accounting_account = $accountingaccountstatic->getNomUrl(0, 1);
-        } else {
-            $accounting_account = length_accountg($line->numero_compte);
-        }
+		$accountingaccountstatic->fetch(null, $line->numero_compte, true);
+		if (!empty($accountingaccountstatic->account_number)) {
+			$accounting_account = $accountingaccountstatic->getNomUrl(0, 1);
+		} else {
+			$accounting_account = length_accountg($line->numero_compte);
+		}
 
 		$link = '';
 		$total_debit += $line->debit;
diff --git a/htdocs/accountancy/bookkeeping/card.php b/htdocs/accountancy/bookkeeping/card.php
index 6a9fdcbffff..c2a478c79ec 100644
--- a/htdocs/accountancy/bookkeeping/card.php
+++ b/htdocs/accountancy/bookkeeping/card.php
@@ -114,12 +114,12 @@ if ($action == "confirm_update") {
 			$object->credit = $credit;
 
 			if (floatval($debit) != 0.0) {
-				$object->montant = $debit;	// deprecated
+				$object->montant = $debit; // deprecated
 				$object->amount = $debit;
 				$object->sens = 'D';
 			}
 			if (floatval($credit) != 0.0) {
-				$object->montant = $credit;	// deprecated
+				$object->montant = $credit; // deprecated
 				$object->amount = $credit;
 				$object->sens = 'C';
 			}
@@ -175,13 +175,13 @@ if ($action == "confirm_update") {
 		$object->fk_docdet = (int) GETPOST('fk_docdet', 'int');
 
 		if (floatval($debit) != 0.0) {
-			$object->montant = $debit;	// deprecated
+			$object->montant = $debit; // deprecated
 			$object->amount = $debit;
 			$object->sens = 'D';
 		}
 
 		if (floatval($credit) != 0.0) {
-			$object->montant = $credit;	// deprecated
+			$object->montant = $credit; // deprecated
 			$object->amount = $credit;
 			$object->sens = 'C';
 		}
@@ -245,7 +245,7 @@ if ($action == "confirm_update") {
 		$object->journal_label = $journal_label;
 		$object->fk_doc = 0;
 		$object->fk_docdet = 0;
-		$object->montant = 0;	// deprecated
+		$object->montant = 0; // deprecated
 		$object->amount = 0;
 
 		$result = $object->createStd($user, 0, $mode);
@@ -386,7 +386,7 @@ if ($action == 'create')
 
 	print '</table>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div class="center">';
 	print '<input type="submit" class="button" value="'.$langs->trans("Create").'">';
@@ -573,7 +573,7 @@ if ($action == 'create')
 
 		print '</div></div><!-ee-->';
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 		print '<div style="clear:both"></div>';
 
@@ -719,7 +719,7 @@ if ($action == 'create')
 	}
 }
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // End of page
 llxFooter();
diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index d89d0dca60c..6d663edcf4e 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -151,7 +151,7 @@ $arrayfields = array(
 	't.code_journal'=>array('label'=>$langs->trans("Codejournal"), 'checked'=>1),
 	't.date_creation'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0),
 	't.tms'=>array('label'=>$langs->trans("DateModification"), 'checked'=>0),
-    't.date_export'=>array('label'=>$langs->trans("DateExport"), 'checked'=>1),
+	't.date_export'=>array('label'=>$langs->trans("DateExport"), 'checked'=>1),
 );
 
 if (empty($conf->global->ACCOUNTING_ENABLE_LETTERING)) unset($arrayfields['t.lettering_code']);
@@ -176,145 +176,145 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 
 if (empty($reshook))
 {
-    include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
+	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
-    if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
-    {
-        $search_mvt_num = '';
-        $search_doc_type = '';
-        $search_doc_ref = '';
-        $search_doc_date = '';
-        $search_accountancy_code = '';
-        $search_accountancy_code_start = '';
-        $search_accountancy_code_end = '';
-        $search_accountancy_aux_code = '';
-        $search_accountancy_aux_code_start = '';
-        $search_accountancy_aux_code_end = '';
-        $search_mvt_label = '';
-        $search_direction = '';
-        $search_ledger_code = '';
-        $search_date_start = '';
-        $search_date_end = '';
-        $search_date_creation_start = '';
-        $search_date_creation_end = '';
-        $search_date_modification_start = '';
-        $search_date_modification_end = '';
-        $search_date_export_start = '';
-        $search_date_export_end = '';
-        $search_debit = '';
-        $search_credit = '';
-        $search_lettering_code = '';
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
+	{
+		$search_mvt_num = '';
+		$search_doc_type = '';
+		$search_doc_ref = '';
+		$search_doc_date = '';
+		$search_accountancy_code = '';
+		$search_accountancy_code_start = '';
+		$search_accountancy_code_end = '';
+		$search_accountancy_aux_code = '';
+		$search_accountancy_aux_code_start = '';
+		$search_accountancy_aux_code_end = '';
+		$search_mvt_label = '';
+		$search_direction = '';
+		$search_ledger_code = '';
+		$search_date_start = '';
+		$search_date_end = '';
+		$search_date_creation_start = '';
+		$search_date_creation_end = '';
+		$search_date_modification_start = '';
+		$search_date_modification_end = '';
+		$search_date_export_start = '';
+		$search_date_export_end = '';
+		$search_debit = '';
+		$search_credit = '';
+		$search_lettering_code = '';
 		$search_not_reconciled = '';
-    }
+	}
 
-    // Must be after the remove filter action, before the export.
-    $param = '';
-    $filter = array();
-    if (!empty($search_date_start)) {
-        $filter['t.doc_date>='] = $search_date_start;
-        $tmp = dol_getdate($search_date_start);
-        $param .= '&search_date_startmonth='.urlencode($tmp['mon']).'&search_date_startday='.urlencode($tmp['mday']).'&search_date_startyear='.urlencode($tmp['year']);
-    }
-    if (!empty($search_date_end)) {
-        $filter['t.doc_date<='] = $search_date_end;
-        $tmp = dol_getdate($search_date_end);
-        $param .= '&search_date_endmonth='.urlencode($tmp['mon']).'&search_date_endday='.urlencode($tmp['mday']).'&search_date_endyear='.urlencode($tmp['year']);
-    }
-    if (!empty($search_doc_date)) {
-        $filter['t.doc_date'] = $search_doc_date;
-        $tmp = dol_getdate($search_doc_date);
-        $param .= '&doc_datemonth='.urlencode($tmp['mon']).'&doc_dateday='.urlencode($tmp['mday']).'&doc_dateyear='.urlencode($tmp['year']);
-    }
-    if (!empty($search_doc_type)) {
-        $filter['t.doc_type'] = $search_doc_type;
-        $param .= '&search_doc_type='.urlencode($search_doc_type);
-    }
-    if (!empty($search_doc_ref)) {
-        $filter['t.doc_ref'] = $search_doc_ref;
-        $param .= '&search_doc_ref='.urlencode($search_doc_ref);
-    }
-    if (!empty($search_accountancy_code)) {
-        $filter['t.numero_compte'] = $search_accountancy_code;
-        $param .= '&search_accountancy_code='.urlencode($search_accountancy_code);
-    }
-    if (!empty($search_accountancy_code_start)) {
-        $filter['t.numero_compte>='] = $search_accountancy_code_start;
-        $param .= '&search_accountancy_code_start='.urlencode($search_accountancy_code_start);
-    }
-    if (!empty($search_accountancy_code_end)) {
-        $filter['t.numero_compte<='] = $search_accountancy_code_end;
-        $param .= '&search_accountancy_code_end='.urlencode($search_accountancy_code_end);
-    }
-    if (!empty($search_accountancy_aux_code)) {
-        $filter['t.subledger_account'] = $search_accountancy_aux_code;
-        $param .= '&search_accountancy_aux_code='.urlencode($search_accountancy_aux_code);
-    }
-    if (!empty($search_accountancy_aux_code_start)) {
-        $filter['t.subledger_account>='] = $search_accountancy_aux_code_start;
-        $param .= '&search_accountancy_aux_code_start='.urlencode($search_accountancy_aux_code_start);
-    }
-    if (!empty($search_accountancy_aux_code_end)) {
-        $filter['t.subledger_account<='] = $search_accountancy_aux_code_end;
-        $param .= '&search_accountancy_aux_code_end='.urlencode($search_accountancy_aux_code_end);
-    }
-    if (!empty($search_mvt_label)) {
-        $filter['t.label_operation'] = $search_mvt_label;
-        $param .= '&search_mvt_label='.urlencode($search_mvt_label);
-    }
-    if (!empty($search_direction)) {
-        $filter['t.sens'] = $search_direction;
-        $param .= '&search_direction='.urlencode($search_direction);
-    }
-    if (!empty($search_ledger_code)) {
-        $filter['t.code_journal'] = $search_ledger_code;
-        $param .= '&search_ledger_code='.urlencode($search_ledger_code);
-    }
-    if (!empty($search_mvt_num)) {
-        $filter['t.piece_num'] = $search_mvt_num;
-        $param .= '&search_mvt_num='.urlencode($search_mvt_num);
-    }
-    if (!empty($search_date_creation_start)) {
-        $filter['t.date_creation>='] = $search_date_creation_start;
-        $tmp = dol_getdate($search_date_creation_start);
-        $param .= '&date_creation_startmonth='.urlencode($tmp['mon']).'&date_creation_startday='.urlencode($tmp['mday']).'&date_creation_startyear='.urlencode($tmp['year']);
-    }
-    if (!empty($search_date_creation_end)) {
-        $filter['t.date_creation<='] = $search_date_creation_end;
-        $tmp = dol_getdate($search_date_creation_end);
-        $param .= '&date_creation_endmonth='.urlencode($tmp['mon']).'&date_creation_endday='.urlencode($tmp['mday']).'&date_creation_endyear='.urlencode($tmp['year']);
-    }
-    if (!empty($search_date_modification_start)) {
-        $filter['t.tms>='] = $search_date_modification_start;
-        $tmp = dol_getdate($search_date_modification_start);
-        $param .= '&date_modification_startmonth='.urlencode($tmp['mon']).'&date_modification_startday='.urlencode($tmp['mday']).'&date_modification_startyear='.urlencode($tmp['year']);
-    }
-    if (!empty($search_date_modification_end)) {
-        $filter['t.tms<='] = $search_date_modification_end;
-        $tmp = dol_getdate($search_date_modification_end);
-        $param .= '&date_modification_endmonth='.urlencode($tmp['mon']).'&date_modification_endday='.urlencode($tmp['mday']).'&date_modification_endyear='.urlencode($tmp['year']);
-    }
-    if (!empty($search_date_export_start)) {
-        $filter['t.date_export>='] = $search_date_export_start;
-        $tmp = dol_getdate($search_date_export_start);
-        $param .= '&date_export_startmonth='.urlencode($tmp['mon']).'&date_export_startday='.urlencode($tmp['mday']).'&date_export_startyear='.urlencode($tmp['year']);
-    }
-    if (!empty($search_date_export_end)) {
-        $filter['t.date_export<='] = $search_date_export_end;
-        $tmp = dol_getdate($search_date_export_end);
-        $param .= '&date_export_endmonth='.urlencode($tmp['mon']).'&date_export_endday='.urlencode($tmp['mday']).'&date_export_endyear='.urlencode($tmp['year']);
-    }
-    if (!empty($search_debit)) {
-        $filter['t.debit'] = $search_debit;
-        $param .= '&search_debit='.urlencode($search_debit);
-    }
-    if (!empty($search_credit)) {
-        $filter['t.credit'] = $search_credit;
-        $param .= '&search_credit='.urlencode($search_credit);
-    }
-    if (!empty($search_lettering_code)) {
-        $filter['t.lettering_code'] = $search_lettering_code;
-        $param .= '&search_lettering_code='.urlencode($search_lettering_code);
-    }
+	// Must be after the remove filter action, before the export.
+	$param = '';
+	$filter = array();
+	if (!empty($search_date_start)) {
+		$filter['t.doc_date>='] = $search_date_start;
+		$tmp = dol_getdate($search_date_start);
+		$param .= '&search_date_startmonth='.urlencode($tmp['mon']).'&search_date_startday='.urlencode($tmp['mday']).'&search_date_startyear='.urlencode($tmp['year']);
+	}
+	if (!empty($search_date_end)) {
+		$filter['t.doc_date<='] = $search_date_end;
+		$tmp = dol_getdate($search_date_end);
+		$param .= '&search_date_endmonth='.urlencode($tmp['mon']).'&search_date_endday='.urlencode($tmp['mday']).'&search_date_endyear='.urlencode($tmp['year']);
+	}
+	if (!empty($search_doc_date)) {
+		$filter['t.doc_date'] = $search_doc_date;
+		$tmp = dol_getdate($search_doc_date);
+		$param .= '&doc_datemonth='.urlencode($tmp['mon']).'&doc_dateday='.urlencode($tmp['mday']).'&doc_dateyear='.urlencode($tmp['year']);
+	}
+	if (!empty($search_doc_type)) {
+		$filter['t.doc_type'] = $search_doc_type;
+		$param .= '&search_doc_type='.urlencode($search_doc_type);
+	}
+	if (!empty($search_doc_ref)) {
+		$filter['t.doc_ref'] = $search_doc_ref;
+		$param .= '&search_doc_ref='.urlencode($search_doc_ref);
+	}
+	if (!empty($search_accountancy_code)) {
+		$filter['t.numero_compte'] = $search_accountancy_code;
+		$param .= '&search_accountancy_code='.urlencode($search_accountancy_code);
+	}
+	if (!empty($search_accountancy_code_start)) {
+		$filter['t.numero_compte>='] = $search_accountancy_code_start;
+		$param .= '&search_accountancy_code_start='.urlencode($search_accountancy_code_start);
+	}
+	if (!empty($search_accountancy_code_end)) {
+		$filter['t.numero_compte<='] = $search_accountancy_code_end;
+		$param .= '&search_accountancy_code_end='.urlencode($search_accountancy_code_end);
+	}
+	if (!empty($search_accountancy_aux_code)) {
+		$filter['t.subledger_account'] = $search_accountancy_aux_code;
+		$param .= '&search_accountancy_aux_code='.urlencode($search_accountancy_aux_code);
+	}
+	if (!empty($search_accountancy_aux_code_start)) {
+		$filter['t.subledger_account>='] = $search_accountancy_aux_code_start;
+		$param .= '&search_accountancy_aux_code_start='.urlencode($search_accountancy_aux_code_start);
+	}
+	if (!empty($search_accountancy_aux_code_end)) {
+		$filter['t.subledger_account<='] = $search_accountancy_aux_code_end;
+		$param .= '&search_accountancy_aux_code_end='.urlencode($search_accountancy_aux_code_end);
+	}
+	if (!empty($search_mvt_label)) {
+		$filter['t.label_operation'] = $search_mvt_label;
+		$param .= '&search_mvt_label='.urlencode($search_mvt_label);
+	}
+	if (!empty($search_direction)) {
+		$filter['t.sens'] = $search_direction;
+		$param .= '&search_direction='.urlencode($search_direction);
+	}
+	if (!empty($search_ledger_code)) {
+		$filter['t.code_journal'] = $search_ledger_code;
+		$param .= '&search_ledger_code='.urlencode($search_ledger_code);
+	}
+	if (!empty($search_mvt_num)) {
+		$filter['t.piece_num'] = $search_mvt_num;
+		$param .= '&search_mvt_num='.urlencode($search_mvt_num);
+	}
+	if (!empty($search_date_creation_start)) {
+		$filter['t.date_creation>='] = $search_date_creation_start;
+		$tmp = dol_getdate($search_date_creation_start);
+		$param .= '&date_creation_startmonth='.urlencode($tmp['mon']).'&date_creation_startday='.urlencode($tmp['mday']).'&date_creation_startyear='.urlencode($tmp['year']);
+	}
+	if (!empty($search_date_creation_end)) {
+		$filter['t.date_creation<='] = $search_date_creation_end;
+		$tmp = dol_getdate($search_date_creation_end);
+		$param .= '&date_creation_endmonth='.urlencode($tmp['mon']).'&date_creation_endday='.urlencode($tmp['mday']).'&date_creation_endyear='.urlencode($tmp['year']);
+	}
+	if (!empty($search_date_modification_start)) {
+		$filter['t.tms>='] = $search_date_modification_start;
+		$tmp = dol_getdate($search_date_modification_start);
+		$param .= '&date_modification_startmonth='.urlencode($tmp['mon']).'&date_modification_startday='.urlencode($tmp['mday']).'&date_modification_startyear='.urlencode($tmp['year']);
+	}
+	if (!empty($search_date_modification_end)) {
+		$filter['t.tms<='] = $search_date_modification_end;
+		$tmp = dol_getdate($search_date_modification_end);
+		$param .= '&date_modification_endmonth='.urlencode($tmp['mon']).'&date_modification_endday='.urlencode($tmp['mday']).'&date_modification_endyear='.urlencode($tmp['year']);
+	}
+	if (!empty($search_date_export_start)) {
+		$filter['t.date_export>='] = $search_date_export_start;
+		$tmp = dol_getdate($search_date_export_start);
+		$param .= '&date_export_startmonth='.urlencode($tmp['mon']).'&date_export_startday='.urlencode($tmp['mday']).'&date_export_startyear='.urlencode($tmp['year']);
+	}
+	if (!empty($search_date_export_end)) {
+		$filter['t.date_export<='] = $search_date_export_end;
+		$tmp = dol_getdate($search_date_export_end);
+		$param .= '&date_export_endmonth='.urlencode($tmp['mon']).'&date_export_endday='.urlencode($tmp['mday']).'&date_export_endyear='.urlencode($tmp['year']);
+	}
+	if (!empty($search_debit)) {
+		$filter['t.debit'] = $search_debit;
+		$param .= '&search_debit='.urlencode($search_debit);
+	}
+	if (!empty($search_credit)) {
+		$filter['t.credit'] = $search_credit;
+		$param .= '&search_credit='.urlencode($search_credit);
+	}
+	if (!empty($search_lettering_code)) {
+		$filter['t.lettering_code'] = $search_lettering_code;
+		$param .= '&search_lettering_code='.urlencode($search_lettering_code);
+	}
 	if (!empty($search_not_reconciled)) {
 		$filter['t.reconciled_option'] = $search_not_reconciled;
 		$param .= '&search_not_reconciled='.urlencode($search_not_reconciled);
@@ -475,48 +475,48 @@ if ($action == 'export_file' && $user->rights->accounting->mouvements->export) {
 	{
 		setEventMessages($object->error, $object->errors, 'errors');
 	} else {
-	    // Export files
+		// Export files
 		$accountancyexport = new AccountancyExport($db);
 		$accountancyexport->export($object->lines, $formatexportset);
 
-        if (!empty($accountancyexport->errors))
-        {
-            setEventMessages('', $accountancyexport->errors, 'errors');
-        } else {
-            // Specify as export : update field date_export
-            $error = 0;
-            $db->begin();
+		if (!empty($accountancyexport->errors))
+		{
+			setEventMessages('', $accountancyexport->errors, 'errors');
+		} else {
+			// Specify as export : update field date_export
+			$error = 0;
+			$db->begin();
 
-            if (is_array($object->lines))
-            {
-                foreach ($object->lines as $movement)
-                {
-                    $now = dol_now();
+			if (is_array($object->lines))
+			{
+				foreach ($object->lines as $movement)
+				{
+					$now = dol_now();
 
-                    $sql = " UPDATE ".MAIN_DB_PREFIX."accounting_bookkeeping";
-                    $sql .= " SET date_export = '".$db->idate($now)."'";
-                    $sql .= " WHERE rowid = ".$movement->id;
+					$sql = " UPDATE ".MAIN_DB_PREFIX."accounting_bookkeeping";
+					$sql .= " SET date_export = '".$db->idate($now)."'";
+					$sql .= " WHERE rowid = ".$movement->id;
 
-                    dol_syslog("/accountancy/bookeeping/list.php Function export_file Specify movements as exported sql=".$sql, LOG_DEBUG);
-                    $result = $db->query($sql);
-                    if (!$result)
-                    {
-                    	$error++;
-                        break;
-                    }
-                }
-            }
+					dol_syslog("/accountancy/bookeeping/list.php Function export_file Specify movements as exported sql=".$sql, LOG_DEBUG);
+					$result = $db->query($sql);
+					if (!$result)
+					{
+						$error++;
+						break;
+					}
+				}
+			}
 
-            if (!$error)
-            {
-            	$db->commit();
-            	// setEventMessages($langs->trans("AllExportedMovementsWereRecordedAsExported"), null, 'mesgs');
-            } else {
-            	$error++;
-            	$db->rollback();
-            	setEventMessages($langs->trans("NotAllExportedMovementsCouldBeRecordedAsExported"), null, 'errors');
-            }
-        }
+			if (!$error)
+			{
+				$db->commit();
+				// setEventMessages($langs->trans("AllExportedMovementsWereRecordedAsExported"), null, 'mesgs');
+			} else {
+				$error++;
+				$db->rollback();
+				setEventMessages($langs->trans("NotAllExportedMovementsCouldBeRecordedAsExported"), null, 'errors');
+			}
+		}
 		exit;
 	}
 }
@@ -629,9 +629,9 @@ else $buttonLabel = $langs->trans("ExportList");
 
 // Button re-export
 if (!empty($conf->global->ACCOUNTING_REEXPORT)) {
-    $newcardbutton = '<a class="valignmiddle" href="'.$_SERVER['PHP_SELF'].'?action=setreexport&token='.newToken().'&value=0'.($param ? '&'.$param : '').'">'.img_picto($langs->trans("Activated"), 'switch_on').'</a> ';
+	$newcardbutton = '<a class="valignmiddle" href="'.$_SERVER['PHP_SELF'].'?action=setreexport&token='.newToken().'&value=0'.($param ? '&'.$param : '').'">'.img_picto($langs->trans("Activated"), 'switch_on').'</a> ';
 } else {
-    $newcardbutton = '<a class="valignmiddle" href="'.$_SERVER['PHP_SELF'].'?action=setreexport&token='.newToken().'&value=1'.($param ? '&'.$param : '').'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a> ';
+	$newcardbutton = '<a class="valignmiddle" href="'.$_SERVER['PHP_SELF'].'?action=setreexport&token='.newToken().'&value=1'.($param ? '&'.$param : '').'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a> ';
 }
 $newcardbutton .= '<span class="valignmiddle marginrightonly">'.$langs->trans("IncludeDocsAlreadyExported").'</span>';
 
@@ -791,14 +791,14 @@ if (!empty($arrayfields['t.tms']['checked']))
 // Date export
 if (!empty($arrayfields['t.date_export']['checked']))
 {
-    print '<td class="liste_titre center">';
-    print '<div class="nowrap">';
-    print $form->selectDate($search_date_export_start, 'date_export_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("From"));
-    print '</div>';
-    print '<div class="nowrap">';
-    print $form->selectDate($search_date_export_end, 'date_export_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("to"));
-    print '</div>';
-    print '</td>';
+	print '<td class="liste_titre center">';
+	print '<div class="nowrap">';
+	print $form->selectDate($search_date_export_start, 'date_export_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("From"));
+	print '</div>';
+	print '<div class="nowrap">';
+	print $form->selectDate($search_date_export_end, 'date_export_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("to"));
+	print '</div>';
+	print '</td>';
 }
 // Action column
 print '<td class="liste_titre center">';
@@ -854,7 +854,7 @@ while ($i < min($num, $limit))
 	$line->label_operation = $obj->label_operation;
 	$line->debit = $obj->debit;
 	$line->credit = $obj->credit;
-	$line->montant = $obj->amount;	// deprecated
+	$line->montant = $obj->amount; // deprecated
 	$line->amount = $obj->amount;
 	$line->sens = $obj->sens;
 	$line->lettering_code = $obj->lettering_code;
@@ -893,65 +893,65 @@ while ($i < min($num, $limit))
 	// Document ref
 	if (!empty($arrayfields['t.doc_ref']['checked']))
 	{
-        if ($line->doc_type == 'customer_invoice')
-        {
-            $langs->loadLangs(array('bills'));
+		if ($line->doc_type == 'customer_invoice')
+		{
+			$langs->loadLangs(array('bills'));
 
-            require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-            $objectstatic = new Facture($db);
-            $objectstatic->fetch($line->fk_doc);
-            //$modulepart = 'facture';
+			require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+			$objectstatic = new Facture($db);
+			$objectstatic->fetch($line->fk_doc);
+			//$modulepart = 'facture';
 
-            $filename = dol_sanitizeFileName($line->doc_ref);
-            $filedir = $conf->facture->dir_output.'/'.dol_sanitizeFileName($line->doc_ref);
-            $urlsource = $_SERVER['PHP_SELF'].'?id='.$objectstatic->id;
-            $documentlink = $formfile->getDocumentsLink($objectstatic->element, $filename, $filedir);
-        } elseif ($line->doc_type == 'supplier_invoice')
-        {
-            $langs->loadLangs(array('bills'));
+			$filename = dol_sanitizeFileName($line->doc_ref);
+			$filedir = $conf->facture->dir_output.'/'.dol_sanitizeFileName($line->doc_ref);
+			$urlsource = $_SERVER['PHP_SELF'].'?id='.$objectstatic->id;
+			$documentlink = $formfile->getDocumentsLink($objectstatic->element, $filename, $filedir);
+		} elseif ($line->doc_type == 'supplier_invoice')
+		{
+			$langs->loadLangs(array('bills'));
 
-            require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
-            $objectstatic = new FactureFournisseur($db);
-            $objectstatic->fetch($line->fk_doc);
-            //$modulepart = 'invoice_supplier';
+			require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
+			$objectstatic = new FactureFournisseur($db);
+			$objectstatic->fetch($line->fk_doc);
+			//$modulepart = 'invoice_supplier';
 
-            $filename = dol_sanitizeFileName($line->doc_ref);
-            $filedir = $conf->fournisseur->facture->dir_output.'/'.get_exdir($line->fk_doc, 2, 0, 0, $objectstatic, $modulepart).dol_sanitizeFileName($line->doc_ref);
-            $subdir = get_exdir($objectstatic->id, 2, 0, 0, $objectstatic, $modulepart).dol_sanitizeFileName($line->doc_ref);
-            $documentlink = $formfile->getDocumentsLink($objectstatic->element, $subdir, $filedir);
-        } elseif ($line->doc_type == 'expense_report')
-        {
-            $langs->loadLangs(array('trips'));
+			$filename = dol_sanitizeFileName($line->doc_ref);
+			$filedir = $conf->fournisseur->facture->dir_output.'/'.get_exdir($line->fk_doc, 2, 0, 0, $objectstatic, $modulepart).dol_sanitizeFileName($line->doc_ref);
+			$subdir = get_exdir($objectstatic->id, 2, 0, 0, $objectstatic, $modulepart).dol_sanitizeFileName($line->doc_ref);
+			$documentlink = $formfile->getDocumentsLink($objectstatic->element, $subdir, $filedir);
+		} elseif ($line->doc_type == 'expense_report')
+		{
+			$langs->loadLangs(array('trips'));
 
-            require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
-            $objectstatic = new ExpenseReport($db);
-            $objectstatic->fetch($line->fk_doc);
-            //$modulepart = 'expensereport';
+			require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
+			$objectstatic = new ExpenseReport($db);
+			$objectstatic->fetch($line->fk_doc);
+			//$modulepart = 'expensereport';
 
-            $filename = dol_sanitizeFileName($line->doc_ref);
-            $filedir = $conf->expensereport->dir_output.'/'.dol_sanitizeFileName($line->doc_ref);
-            $urlsource = $_SERVER['PHP_SELF'].'?id='.$objectstatic->id;
-            $documentlink = $formfile->getDocumentsLink($objectstatic->element, $filename, $filedir);
-        } else {
-            // Other type
-        }
+			$filename = dol_sanitizeFileName($line->doc_ref);
+			$filedir = $conf->expensereport->dir_output.'/'.dol_sanitizeFileName($line->doc_ref);
+			$urlsource = $_SERVER['PHP_SELF'].'?id='.$objectstatic->id;
+			$documentlink = $formfile->getDocumentsLink($objectstatic->element, $filename, $filedir);
+		} else {
+			// Other type
+		}
 
-        print '<td class="nowrap">';
+		print '<td class="nowrap">';
 
-        print '<table class="nobordernopadding"><tr class="nocellnopadd">';
-        // Picto + Ref
-        print '<td class="nobordernopadding nowrap">';
+		print '<table class="nobordernopadding"><tr class="nocellnopadd">';
+		// Picto + Ref
+		print '<td class="nobordernopadding nowrap">';
 
-        if ($line->doc_type == 'customer_invoice' || $line->doc_type == 'supplier_invoice' || $line->doc_type == 'expense_report')
-        {
-            print $objectstatic->getNomUrl(1, '', 0, 0, '', 0, -1, 1);
-            print $documentlink;
-        } else {
-            print $line->doc_ref;
-        }
-        print '</td></tr></table>';
+		if ($line->doc_type == 'customer_invoice' || $line->doc_type == 'supplier_invoice' || $line->doc_type == 'expense_report')
+		{
+			print $objectstatic->getNomUrl(1, '', 0, 0, '', 0, -1, 1);
+			print $documentlink;
+		} else {
+			print $line->doc_ref;
+		}
+		print '</td></tr></table>';
 
-        print "</td>\n";
+		print "</td>\n";
 		if (!$i) $totalarray['nbfield']++;
 	}
 
@@ -1065,9 +1065,9 @@ print '</div>';
 
 // TODO Replace this with mass delete action
 if ($user->rights->accounting->mouvements->supprimer_tous) {
-    print '<div class="tabsAction tabsActionNoBottom">'."\n";
-    print '<a class="butActionDelete" name="button_delmvt" href="'.$_SERVER["PHP_SELF"].'?action=delbookkeepingyear'.($param ? '&'.$param : '').'">'.$langs->trans("DeleteMvt").'</a>';
-    print '</div>';
+	print '<div class="tabsAction tabsActionNoBottom">'."\n";
+	print '<a class="butActionDelete" name="button_delmvt" href="'.$_SERVER["PHP_SELF"].'?action=delbookkeepingyear'.($param ? '&'.$param : '').'">'.$langs->trans("DeleteMvt").'</a>';
+	print '</div>';
 }
 
 print '</form>';
diff --git a/htdocs/accountancy/bookkeeping/listbyaccount.php b/htdocs/accountancy/bookkeeping/listbyaccount.php
index 4ed055be0b1..45e8c6aee70 100644
--- a/htdocs/accountancy/bookkeeping/listbyaccount.php
+++ b/htdocs/accountancy/bookkeeping/listbyaccount.php
@@ -36,7 +36,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array("accountancy"));
+$langs->loadLangs(array("accountancy", "compta"));
 
 $action = GETPOST('action', 'aZ09');
 $search_date_start = dol_mktime(0, 0, 0, GETPOST('search_date_startmonth', 'int'), GETPOST('search_date_startday', 'int'), GETPOST('search_date_startyear', 'int'));
@@ -138,7 +138,7 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 
 if (empty($reshook))
 {
-	include DOL_DOCUMENT_ROOT . '/core/actions_changeselectedfields.inc.php';
+	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
 	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
 	{
@@ -172,55 +172,55 @@ if (empty($reshook))
 
 	if (!empty($search_date_start)) {
 		$filter['t.doc_date>='] = $search_date_start;
-		$param .= '&search_date_startmonth=' . GETPOST('search_date_startmonth', 'int') . '&search_date_startday=' . GETPOST('search_date_startday', 'int') . '&search_date_startyear=' . GETPOST('search_date_startyear', 'int');
+		$param .= '&search_date_startmonth='.GETPOST('search_date_startmonth', 'int').'&search_date_startday='.GETPOST('search_date_startday', 'int').'&search_date_startyear='.GETPOST('search_date_startyear', 'int');
 	}
 	if (!empty($search_date_end)) {
 		$filter['t.doc_date<='] = $search_date_end;
-		$param .= '&search_date_endmonth=' . GETPOST('search_date_endmonth', 'int') . '&search_date_endday=' . GETPOST('search_date_endday', 'int') . '&search_date_endyear=' . GETPOST('search_date_endyear', 'int');
+		$param .= '&search_date_endmonth='.GETPOST('search_date_endmonth', 'int').'&search_date_endday='.GETPOST('search_date_endday', 'int').'&search_date_endyear='.GETPOST('search_date_endyear', 'int');
 	}
 	if (!empty($search_doc_date)) {
 		$filter['t.doc_date'] = $search_doc_date;
-		$param .= '&doc_datemonth=' . GETPOST('doc_datemonth', 'int') . '&doc_dateday=' . GETPOST('doc_dateday', 'int') . '&doc_dateyear=' . GETPOST('doc_dateyear', 'int');
+		$param .= '&doc_datemonth='.GETPOST('doc_datemonth', 'int').'&doc_dateday='.GETPOST('doc_dateday', 'int').'&doc_dateyear='.GETPOST('doc_dateyear', 'int');
 	}
 	if (!empty($search_accountancy_code_start)) {
 		$filter['t.numero_compte>='] = $search_accountancy_code_start;
-		$param .= '&search_accountancy_code_start=' . urlencode($search_accountancy_code_start);
+		$param .= '&search_accountancy_code_start='.urlencode($search_accountancy_code_start);
 	}
 	if (!empty($search_accountancy_code_end)) {
 		$filter['t.numero_compte<='] = $search_accountancy_code_end;
-		$param .= '&search_accountancy_code_end=' . urlencode($search_accountancy_code_end);
+		$param .= '&search_accountancy_code_end='.urlencode($search_accountancy_code_end);
 	}
 	if (!empty($search_label_account)) {
 		$filter['t.label_compte'] = $search_label_account;
-		$param .= '&search_label_compte=' . urlencode($search_label_account);
+		$param .= '&search_label_compte='.urlencode($search_label_account);
 	}
 	if (!empty($search_mvt_num)) {
 		$filter['t.piece_num'] = $search_mvt_num;
-		$param .= '&search_mvt_num=' . urlencode($search_mvt_num);
+		$param .= '&search_mvt_num='.urlencode($search_mvt_num);
 	}
 	if (!empty($search_doc_ref)) {
 		$filter['t.doc_ref'] = $search_doc_ref;
-		$param .= '&search_doc_ref=' . urlencode($search_doc_ref);
+		$param .= '&search_doc_ref='.urlencode($search_doc_ref);
 	}
 	if (!empty($search_label_operation)) {
 		$filter['t.label_operation'] = $search_label_operation;
-		$param .= '&search_label_operation=' . urlencode($search_label_operation);
+		$param .= '&search_label_operation='.urlencode($search_label_operation);
 	}
 	if (!empty($search_direction)) {
 		$filter['t.sens'] = $search_direction;
-		$param .= '&search_direction=' . urlencode($search_direction);
+		$param .= '&search_direction='.urlencode($search_direction);
 	}
 	if (!empty($search_ledger_code)) {
 		$filter['t.code_journal'] = $search_ledger_code;
-		$param .= '&search_ledger_code=' . urlencode($search_ledger_code);
+		$param .= '&search_ledger_code='.urlencode($search_ledger_code);
 	}
 	if (!empty($search_debit)) {
 		$filter['t.debit'] = $search_debit;
-		$param .= '&search_debit=' . urlencode($search_debit);
+		$param .= '&search_debit='.urlencode($search_debit);
 	}
 	if (!empty($search_credit)) {
 		$filter['t.credit'] = $search_credit;
-		$param .= '&search_credit=' . urlencode($search_credit);
+		$param .= '&search_credit='.urlencode($search_credit);
 	}
 	if (!empty($search_lettering_code)) {
 		$filter['t.lettering_code'] = $search_lettering_code;
@@ -376,18 +376,17 @@ print '<input type="hidden" name="formfilteraction" id="formfilteraction" value=
 print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 
-
 $newcardbutton .= dolGetButtonTitle($langs->trans('ViewFlatList'), '', 'fa fa-list paddingleft imgforviewmode', DOL_URL_ROOT.'/accountancy/bookkeeping/list.php?'.$param);
 $newcardbutton .= dolGetButtonTitle($langs->trans('VueByAccountAccounting'), '', 'fa fa-stream paddingleft imgforviewmode', DOL_URL_ROOT.'/accountancy/bookkeeping/listbyaccount.php?'.$param, '', 1, array('morecss'=>'marginleftonly btnTitleSelected'));
 
 $newcardbutton .= ' &nbsp; ';
 
-$newcardbutton .= dolGetButtonTitle($langs->trans('NewAccountingMvt'), '', 'fa fa-plus-circle paddingleft', './card.php?action=create');
+$newcardbutton .= dolGetButtonTitle($langs->trans('NewAccountingMvt'), '', 'fa fa-plus-circle paddingleft', DOL_URL_ROOT.'/accountancy/bookkeeping/card.php?action=create');
 
 if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
 if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
 
-print_barre_liste($title_page, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $result, $nbtotalofrecords, 'title_accountancy', 0, $viewflat.$newcardbutton, '', $limit, 0, 0, 1);
+print_barre_liste($title_page, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $result, $nbtotalofrecords, 'title_accountancy', 0, $newcardbutton, '', $limit, 0, 0, 1);
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
@@ -427,7 +426,7 @@ print '<tr class="liste_titre_filter">';
 
 // Code journal
 if (!empty($arrayfields['t.code_journal']['checked'])) {
-	print '<td class="liste_titre center"><input type="text" name="search_ledger_code" size="3" value="' . dol_escape_htmltag($search_ledger_code) . '"></td>';
+	print '<td class="liste_titre center"><input type="text" name="search_ledger_code" size="3" value="'.dol_escape_htmltag($search_ledger_code).'"></td>';
 }
 // Date document
 if (!empty($arrayfields['t.doc_date']['checked'])) {
@@ -447,19 +446,19 @@ if (!empty($arrayfields['t.piece_num']['checked']))
 }
 // Ref document
 if (!empty($arrayfields['t.doc_ref']['checked'])) {
-	print '<td class="liste_titre"><input type="text" size="7" class="flat" name="search_doc_ref" value="' . dol_escape_htmltag($search_doc_ref) . '"/></td>';
+	print '<td class="liste_titre"><input type="text" size="7" class="flat" name="search_doc_ref" value="'.dol_escape_htmltag($search_doc_ref).'"/></td>';
 }
 // Label operation
 if (!empty($arrayfields['t.label_operation']['checked'])) {
-	print '<td class="liste_titre"><input type="text" size="7" class="flat" name="search_label_operation" value="' . dol_escape_htmltag($search_label_operation) . '"/></td>';
+	print '<td class="liste_titre"><input type="text" size="7" class="flat" name="search_label_operation" value="'.dol_escape_htmltag($search_label_operation).'"/></td>';
 }
 // Debit
 if (!empty($arrayfields['t.debit']['checked'])) {
-	print '<td class="liste_titre right"><input type="text" class="flat" name="search_debit" size="4" value="' . dol_escape_htmltag($search_debit) . '"></td>';
+	print '<td class="liste_titre right"><input type="text" class="flat" name="search_debit" size="4" value="'.dol_escape_htmltag($search_debit).'"></td>';
 }
 // Credit
 if (!empty($arrayfields['t.credit']['checked'])) {
-	print '<td class="liste_titre right"><input type="text" class="flat" name="search_credit" size="4" value="' . dol_escape_htmltag($search_credit) . '"></td>';
+	print '<td class="liste_titre right"><input type="text" class="flat" name="search_credit" size="4" value="'.dol_escape_htmltag($search_credit).'"></td>';
 }
 // Lettering code
 if (!empty($arrayfields['t.lettering_code']['checked']))
@@ -535,7 +534,7 @@ while ($i < min($num, $limit))
 			$balance = $sous_total_debit - $sous_total_credit;
 			print '<tr class="liste_total">';
 			print '<td class="right" colspan="'.$colspan.'">'.$langs->trans("Balance").':</td>';
-			if ($balance > 0 )
+			if ($balance > 0)
 			{
 				print '<td class="nowraponall right">';
 				print price($sous_total_debit - $sous_total_credit);
@@ -666,7 +665,7 @@ while ($i < min($num, $limit))
 	if (!empty($arrayfields['t.label_operation']['checked'])) {
 		// Affiche un lien vers la facture client/fournisseur
 		$doc_ref = preg_replace('/\(.*\)/', '', $line->doc_ref);
-		print strlen(length_accounta($line->subledger_account)) == 0 ? '<td>' . $line->label_operation . '</td>' : '<td>' . $line->label_operation . '<br><span style="font-size:0.8em">(' . length_accounta($line->subledger_account) . ')</span></td>';
+		print strlen(length_accounta($line->subledger_account)) == 0 ? '<td>'.$line->label_operation.'</td>' : '<td>'.$line->label_operation.'<br><span style="font-size:0.8em">('.length_accounta($line->subledger_account).')</span></td>';
 		if (!$i) $totalarray['nbfield']++;
 	}
 
@@ -681,7 +680,7 @@ while ($i < min($num, $limit))
 
 	// Amount credit
 	if (!empty($arrayfields['t.credit']['checked'])) {
-		print '<td class="nowrap right">' . ($line->credit ? price($line->credit) : '') . '</td>';
+		print '<td class="nowrap right">'.($line->credit ? price($line->credit) : '').'</td>';
 		if (!$i) $totalarray['nbfield']++;
 		if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'totalcredit';
 		$totalarray['val']['totalcredit'] += $line->credit;
@@ -734,7 +733,7 @@ print '</tr>';
 $balance = $sous_total_debit - $sous_total_credit;
 print '<tr class="liste_total">';
 print '<td class="right" colspan="'.$colspan.'">'.$langs->trans("Balance").':</td>';
-if ($balance > 0 )
+if ($balance > 0)
 {
 	print '<td class="nowraponall right">';
 	print price($sous_total_debit - $sous_total_credit);
diff --git a/htdocs/accountancy/bookkeeping/listbysubaccount.php b/htdocs/accountancy/bookkeeping/listbysubaccount.php
new file mode 100644
index 00000000000..c286780e572
--- /dev/null
+++ b/htdocs/accountancy/bookkeeping/listbysubaccount.php
@@ -0,0 +1,766 @@
+<?php
+/* Copyright (C) 2016       Neil Orley          <neil.orley@oeris.fr>
+ * Copyright (C) 2013-2016  Olivier Geffroy     <jeff@jeffinfo.com>
+ * Copyright (C) 2013-2016  Florian Henry       <florian.henry@open-concept.pro>
+ * Copyright (C) 2013-2020  Alexandre Spangaro  <aspangaro@open-dsi.fr>
+ * Copyright (C) 2018       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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file 		htdocs/accountancy/bookkeeping/listbysubaccount.php
+ * \ingroup 	Accountancy (Double entries)
+ * \brief 		List operation of ledger ordered by subaccount number
+ */
+
+require '../../main.inc.php';
+
+require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/accountancy/class/bookkeeping.class.php';
+require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+
+// Load translation files required by the page
+$langs->loadLangs(array("accountancy", "compta"));
+
+$action = GETPOST('action', 'aZ09');
+$search_date_start = dol_mktime(0, 0, 0, GETPOST('search_date_startmonth', 'int'), GETPOST('search_date_startday', 'int'), GETPOST('search_date_startyear', 'int'));
+$search_date_end = dol_mktime(0, 0, 0, GETPOST('search_date_endmonth', 'int'), GETPOST('search_date_endday', 'int'), GETPOST('search_date_endyear', 'int'));
+$search_doc_date = dol_mktime(0, 0, 0, GETPOST('doc_datemonth', 'int'), GETPOST('doc_dateday', 'int'), GETPOST('doc_dateyear', 'int'));
+
+$search_accountancy_code = GETPOST("search_accountancy_code");
+$search_accountancy_code_start = GETPOST('search_accountancy_code_start', 'alpha');
+if ($search_accountancy_code_start == - 1) {
+	$search_accountancy_code_start = '';
+}
+$search_accountancy_code_end = GETPOST('search_accountancy_code_end', 'alpha');
+if ($search_accountancy_code_end == - 1) {
+	$search_accountancy_code_end = '';
+}
+$search_doc_ref = GETPOST('search_doc_ref', 'alpha');
+$search_label_operation = GETPOST('search_label_operation', 'alpha');
+$search_mvt_num = GETPOST('search_mvt_num', 'int');
+$search_direction = GETPOST('search_direction', 'alpha');
+$search_ledger_code = GETPOST('search_ledger_code', 'alpha');
+$search_debit = GETPOST('search_debit', 'alpha');
+$search_credit = GETPOST('search_credit', 'alpha');
+$search_lettering_code = GETPOST('search_lettering_code', 'alpha');
+$search_not_reconciled = GETPOST('search_reconciled_option', 'alpha');
+
+if (GETPOST("button_delmvt_x") || GETPOST("button_delmvt.x") || GETPOST("button_delmvt")) {
+	$action = 'delbookkeepingyear';
+}
+
+// Load variable for pagination
+$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : (empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION) ? $conf->liste_limit : $conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION);
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+if (empty($page) || $page < 0) { $page = 0; }
+$offset = $limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+if ($sortorder == "") $sortorder = "ASC";
+if ($sortfield == "") $sortfield = "t.doc_date,t.rowid";
+
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+$object = new BookKeeping($db);
+$formfile = new FormFile($db);
+$hookmanager->initHooks(array('bookkeepingbysubaccountlist'));
+
+$formaccounting = new FormAccounting($db);
+$form = new Form($db);
+
+if (empty($search_date_start) && empty($search_date_end) && !GETPOSTISSET('search_date_startday') && !GETPOSTISSET('search_date_startmonth') && !GETPOSTISSET('search_date_starthour')) {
+	$sql = "SELECT date_start, date_end from ".MAIN_DB_PREFIX."accounting_fiscalyear ";
+	$sql .= " where date_start < '".$db->idate(dol_now())."' and date_end > '".$db->idate(dol_now())."'";
+	$sql .= $db->plimit(1);
+	$res = $db->query($sql);
+
+	if ($res->num_rows > 0) {
+		$fiscalYear = $db->fetch_object($res);
+		$search_date_start = strtotime($fiscalYear->date_start);
+		$search_date_end = strtotime($fiscalYear->date_end);
+	} else {
+		$month_start = ($conf->global->SOCIETE_FISCAL_MONTH_START ? ($conf->global->SOCIETE_FISCAL_MONTH_START) : 1);
+		$year_start = dol_print_date(dol_now(), '%Y');
+		if (dol_print_date(dol_now(), '%m') < $month_start) $year_start--; // If current month is lower that starting fiscal month, we start last year
+		$year_end = $year_start + 1;
+		$month_end = $month_start - 1;
+		if ($month_end < 1)
+		{
+			$month_end = 12;
+			$year_end--;
+		}
+		$search_date_start = dol_mktime(0, 0, 0, $month_start, 1, $year_start);
+		$search_date_end = dol_get_last_day($year_end, $month_end);
+	}
+}
+
+$arrayfields = array(
+	// 't.subledger_account'=>array('label'=>$langs->trans("SubledgerAccount"), 'checked'=>1),
+	't.code_journal'=>array('label'=>$langs->trans("Codejournal"), 'checked'=>1),
+	't.piece_num'=>array('label'=>$langs->trans("TransactionNumShort"), 'checked'=>1),
+	't.doc_date'=>array('label'=>$langs->trans("Docdate"), 'checked'=>1),
+	't.doc_ref'=>array('label'=>$langs->trans("Piece"), 'checked'=>1),
+	't.label_operation'=>array('label'=>$langs->trans("Label"), 'checked'=>1),
+	't.debit'=>array('label'=>$langs->trans("Debit"), 'checked'=>1),
+	't.credit'=>array('label'=>$langs->trans("Credit"), 'checked'=>1),
+	't.lettering_code'=>array('label'=>$langs->trans("LetteringCode"), 'checked'=>1),
+);
+
+if (empty($conf->global->ACCOUNTING_ENABLE_LETTERING)) unset($arrayfields['t.lettering_code']);
+
+/*
+ * Action
+ */
+if (GETPOST('cancel', 'alpha')) { $action = 'list'; $massaction = ''; }
+if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction = ''; }
+
+$parameters = array('socid'=>$socid);
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+if (empty($reshook))
+{
+	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
+
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
+	{
+		$search_doc_date = '';
+		$search_accountancy_code = '';
+		$search_accountancy_code_start = '';
+		$search_accountancy_code_end = '';
+		$search_label_account = '';
+		$search_doc_ref = '';
+		$search_label_operation = '';
+		$search_mvt_num = '';
+		$search_direction = '';
+		$search_ledger_code = '';
+		$search_date_start = '';
+		$search_date_end = '';
+		$search_date_startyear = '';
+		$search_date_startmonth = '';
+		$search_date_startday = '';
+		$search_date_endyear = '';
+		$search_date_endmonth = '';
+		$search_date_endday = '';
+		$search_debit = '';
+		$search_credit = '';
+		$search_lettering_code = '';
+		$search_not_reconciled = '';
+	}
+
+	// Must be after the remove filter action, before the export.
+	$param = '';
+	$filter = array();
+
+	if (!empty($search_date_start)) {
+		$filter['t.doc_date>='] = $search_date_start;
+		$param .= '&search_date_startmonth='.GETPOST('search_date_startmonth', 'int').'&search_date_startday='.GETPOST('search_date_startday', 'int').'&search_date_startyear='.GETPOST('search_date_startyear', 'int');
+	}
+	if (!empty($search_date_end)) {
+		$filter['t.doc_date<='] = $search_date_end;
+		$param .= '&search_date_endmonth='.GETPOST('search_date_endmonth', 'int').'&search_date_endday='.GETPOST('search_date_endday', 'int').'&search_date_endyear='.GETPOST('search_date_endyear', 'int');
+	}
+	if (!empty($search_doc_date)) {
+		$filter['t.doc_date'] = $search_doc_date;
+		$param .= '&doc_datemonth='.GETPOST('doc_datemonth', 'int').'&doc_dateday='.GETPOST('doc_dateday', 'int').'&doc_dateyear='.GETPOST('doc_dateyear', 'int');
+	}
+	if (!empty($search_accountancy_code_start)) {
+		$filter['t.subledger_account>='] = $search_accountancy_code_start;
+		$param .= '&search_accountancy_code_start='.urlencode($search_accountancy_code_start);
+	}
+	if (!empty($search_accountancy_code_end)) {
+		$filter['t.subledger_account<='] = $search_accountancy_code_end;
+		$param .= '&search_accountancy_code_end='.urlencode($search_accountancy_code_end);
+	}
+	if (!empty($search_label_account)) {
+		$filter['t.label_compte'] = $search_label_account;
+		$param .= '&search_label_compte='.urlencode($search_label_account);
+	}
+	if (!empty($search_mvt_num)) {
+		$filter['t.piece_num'] = $search_mvt_num;
+		$param .= '&search_mvt_num='.urlencode($search_mvt_num);
+	}
+	if (!empty($search_doc_ref)) {
+		$filter['t.doc_ref'] = $search_doc_ref;
+		$param .= '&search_doc_ref='.urlencode($search_doc_ref);
+	}
+	if (!empty($search_label_operation)) {
+		$filter['t.label_operation'] = $search_label_operation;
+		$param .= '&search_label_operation='.urlencode($search_label_operation);
+	}
+	if (!empty($search_direction)) {
+		$filter['t.sens'] = $search_direction;
+		$param .= '&search_direction='.urlencode($search_direction);
+	}
+	if (!empty($search_ledger_code)) {
+		$filter['t.code_journal'] = $search_ledger_code;
+		$param .= '&search_ledger_code='.urlencode($search_ledger_code);
+	}
+	if (!empty($search_debit)) {
+		$filter['t.debit'] = $search_debit;
+		$param .= '&search_debit='.urlencode($search_debit);
+	}
+	if (!empty($search_credit)) {
+		$filter['t.credit'] = $search_credit;
+		$param .= '&search_credit='.urlencode($search_credit);
+	}
+	if (!empty($search_lettering_code)) {
+		$filter['t.lettering_code'] = $search_lettering_code;
+		$param .= '&search_lettering_code='.urlencode($search_lettering_code);
+	}
+	if (!empty($search_not_reconciled)) {
+		$filter['t.reconciled_option'] = $search_not_reconciled;
+		$param .= '&search_not_reconciled='.urlencode($search_not_reconciled);
+	}
+}
+
+if ($action == 'delbookkeeping' && $user->rights->accounting->mouvements->supprimer) {
+	$import_key = GETPOST('importkey', 'alpha');
+
+	if (!empty($import_key)) {
+		$result = $object->deleteByImportkey($import_key);
+		if ($result < 0) {
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
+
+		// Make a redirect to avoid to launch the delete later after a back button
+		header("Location: listbyaccount.php".($param ? '?'.$param : ''));
+		exit;
+	}
+}
+if ($action == 'delbookkeepingyearconfirm' && $user->rights->accounting->mouvements->supprimer_tous) {
+	$delmonth = GETPOST('delmonth', 'int');
+	$delyear = GETPOST('delyear', 'int');
+	if ($delyear == -1) {
+		$delyear = 0;
+	}
+	$deljournal = GETPOST('deljournal', 'alpha');
+	if ($deljournal == -1) {
+		$deljournal = 0;
+	}
+
+	if (!empty($delmonth) || !empty($delyear) || !empty($deljournal))
+	{
+		$result = $object->deleteByYearAndJournal($delyear, $deljournal, '', ($delmonth > 0 ? $delmonth : 0));
+		if ($result < 0) {
+			setEventMessages($object->error, $object->errors, 'errors');
+		} else {
+			setEventMessages("RecordDeleted", null, 'mesgs');
+		}
+
+		// Make a redirect to avoid to launch the delete later after a back button
+		header("Location: listbysubaccount.php".($param ? '?'.$param : ''));
+		exit;
+	} else {
+		setEventMessages("NoRecordDeleted", null, 'warnings');
+	}
+}
+if ($action == 'delmouvconfirm' && $user->rights->accounting->mouvements->supprimer) {
+	$mvt_num = GETPOST('mvt_num', 'int');
+
+	if (!empty($mvt_num)) {
+		$result = $object->deleteMvtNum($mvt_num);
+		if ($result < 0) {
+			setEventMessages($object->error, $object->errors, 'errors');
+		} else {
+			setEventMessages($langs->trans("RecordDeleted"), null, 'mesgs');
+		}
+
+		header("Location: listbysubaccount.php?noreset=1".($param ? '&'.$param : ''));
+		exit;
+	}
+}
+
+
+/*
+ * View
+ */
+
+$formaccounting = new FormAccounting($db);
+$formfile = new FormFile($db);
+$formother = new FormOther($db);
+$form = new Form($db);
+
+$title_page = $langs->trans("Operations").' - '.$langs->trans("VueByAccountAccounting").' ('.$langs->trans("BookkeepingSubAccount").')';
+
+llxHeader('', $title_page);
+
+
+// List
+$nbtotalofrecords = '';
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
+	$nbtotalofrecords = $object->fetchAllByAccount($sortorder, $sortfield, 0, 0, $filter, 'AND', 1);
+	if ($nbtotalofrecords < 0) {
+		setEventMessages($object->error, $object->errors, 'errors');
+	}
+}
+
+$result = $object->fetchAllByAccount($sortorder, $sortfield, $limit, $offset, $filter, 'AND', 1);
+
+if ($result < 0) {
+	setEventMessages($object->error, $object->errors, 'errors');
+}
+
+$num = count($object->lines);
+
+
+if ($action == 'delmouv') {
+	$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?mvt_num='.GETPOST('mvt_num'), $langs->trans('DeleteMvt'), $langs->trans('ConfirmDeleteMvtPartial'), 'delmouvconfirm', '', 0, 1);
+	print $formconfirm;
+}
+if ($action == 'delbookkeepingyear') {
+	$form_question = array();
+	$delyear = GETPOST('delyear', 'int');
+	$deljournal = GETPOST('deljournal', 'alpha');
+
+	if (empty($delyear)) {
+		$delyear = dol_print_date(dol_now(), '%Y');
+	}
+	$month_array = array();
+	for ($i = 1; $i <= 12; $i++) {
+		$month_array[$i] = $langs->trans("Month".sprintf("%02d", $i));
+	}
+	$year_array = $formaccounting->selectyear_accountancy_bookkepping($delyear, 'delyear', 0, 'array');
+	$journal_array = $formaccounting->select_journal($deljournal, 'deljournal', '', 1, 1, 1, '', 0, 1);
+
+	$form_question['delmonth'] = array(
+		'name' => 'delmonth',
+		'type' => 'select',
+		'label' => $langs->trans('DelMonth'),
+		'values' => $month_array,
+		'default' => ''
+	);
+	$form_question['delyear'] = array(
+		'name' => 'delyear',
+		'type' => 'select',
+		'label' => $langs->trans('DelYear'),
+		'values' => $year_array,
+		'default' => $delyear
+	);
+	$form_question['deljournal'] = array(
+		'name' => 'deljournal',
+		'type' => 'other', // We don't use select here, the journal_array is already a select html component
+		'label' => $langs->trans('DelJournal'),
+		'value' => $journal_array,
+		'default' => $deljournal
+	);
+
+	$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?'.$param, $langs->trans('DeleteMvt'), $langs->trans('ConfirmDeleteMvt', $langs->transnoentitiesnoconv("RegistrationInAccounting")), 'delbookkeepingyearconfirm', $form_question, '', 1, 300);
+	print $formconfirm;
+}
+
+
+print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
+print '<input type="hidden" name="token" value="'.newToken().'">';
+print '<input type="hidden" name="action" value="list">';
+if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
+print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+
+
+$newcardbutton = dolGetButtonTitle($langs->trans('ViewAccountList'), '', 'fa fa-stream paddingleft imgforviewmode', DOL_URL_ROOT.'/accountancy/bookkeeping/listbyaccount.php', '', 1, array('morecss'=>'marginleftonly btnTitleSelected'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('NewAccountingMvt'), '', 'fa fa-plus-circle paddingleft', DOL_URL_ROOT.'/accountancy/bookkeeping/card.php?action=create');
+
+if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
+if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
+
+print_barre_liste($title_page, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $result, $nbtotalofrecords, 'title_accountancy', 0, $newcardbutton, '', $limit);
+
+$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
+$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
+if ($massactionbutton) $selectedfields .= $form->showCheckAddButtons('checkforselect', 1);
+
+// Reverse sort order
+if (preg_match('/^asc/i', $sortorder)) $sortorder = "asc";
+else $sortorder = "desc";
+
+$moreforfilter = '';
+
+// Accountancy account
+$moreforfilter .= '<div class="divsearchfield">';
+$moreforfilter .= $langs->trans('AccountAccounting').': ';
+$moreforfilter .= '<div class="nowrap inline-block">';
+$moreforfilter .= $langs->trans('From').' ';
+$moreforfilter .= $formaccounting->select_auxaccount($search_accountancy_code_start, 'search_accountancy_code_start', 1, 'maxwidth200');
+$moreforfilter .= ' '.$langs->trans('to').' ';
+$moreforfilter .= $formaccounting->select_auxaccount($search_accountancy_code_end, 'search_accountancy_code_end', 1, 'maxwidth200');
+$moreforfilter .= '</div>';
+$moreforfilter .= '</div>';
+
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters); // Note that $action and $object may have been modified by hook
+if (empty($reshook)) $moreforfilter .= $hookmanager->resPrint;
+else $moreforfilter = $hookmanager->resPrint;
+
+print '<div class="liste_titre liste_titre_bydiv centpercent">';
+print $moreforfilter;
+print '</div>';
+
+print '<div class="div-table-responsive">';
+print '<table class="tagtable liste centpercent">';
+
+// Filters lines
+print '<tr class="liste_titre_filter">';
+
+// Code journal
+if (!empty($arrayfields['t.code_journal']['checked'])) {
+	print '<td class="liste_titre center"><input type="text" name="search_ledger_code" size="3" value="'.dol_escape_htmltag($search_ledger_code).'"></td>';
+}
+// Date document
+if (!empty($arrayfields['t.doc_date']['checked'])) {
+	print '<td class="liste_titre center">';
+	print '<div class="nowrap">';
+	print $form->selectDate($search_date_start, 'search_date_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("From"));
+	print '</div>';
+	print '<div class="nowrap">';
+	print $form->selectDate($search_date_end, 'search_date_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("to"));
+	print '</div>';
+	print '</td>';
+}
+// Movement number
+if (!empty($arrayfields['t.piece_num']['checked']))
+{
+	print '<td class="liste_titre"><input type="text" name="search_mvt_num" size="6" value="'.dol_escape_htmltag($search_mvt_num).'"></td>';
+}
+// Ref document
+if (!empty($arrayfields['t.doc_ref']['checked'])) {
+	print '<td class="liste_titre"><input type="text" size="7" class="flat" name="search_doc_ref" value="'.dol_escape_htmltag($search_doc_ref).'"/></td>';
+}
+// Label operation
+if (!empty($arrayfields['t.label_operation']['checked'])) {
+	print '<td class="liste_titre"><input type="text" size="7" class="flat" name="search_label_operation" value="'.dol_escape_htmltag($search_label_operation).'"/></td>';
+}
+// Debit
+if (!empty($arrayfields['t.debit']['checked'])) {
+	print '<td class="liste_titre right"><input type="text" class="flat" name="search_debit" size="4" value="'.dol_escape_htmltag($search_debit).'"></td>';
+}
+// Credit
+if (!empty($arrayfields['t.credit']['checked'])) {
+	print '<td class="liste_titre right"><input type="text" class="flat" name="search_credit" size="4" value="'.dol_escape_htmltag($search_credit).'"></td>';
+}
+// Lettering code
+if (!empty($arrayfields['t.lettering_code']['checked']))
+{
+	print '<td class="liste_titre center">';
+	print '<input type="text" size="3" class="flat" name="search_lettering_code" value="'.$search_lettering_code.'"/>';
+	print '<br><span class="nowrap"><input type="checkbox" name="search_reconciled_option" value="notreconciled"'.($search_not_reconciled == 'notreconciled' ? ' checked' : '').'>'.$langs->trans("NotReconciled").'</span>';
+	print '</td>';
+}
+
+// Fields from hook
+$parameters = array('arrayfields'=>$arrayfields);
+$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook
+print $hookmanager->resPrint;
+
+// Action column
+print '<td class="liste_titre center">';
+$searchpicto = $form->showFilterButtons();
+print $searchpicto;
+print '</td>';
+print "</tr>\n";
+
+print '<tr class="liste_titre">';
+if (!empty($arrayfields['t.code_journal']['checked']))			print_liste_field_titre($arrayfields['t.code_journal']['label'], $_SERVER['PHP_SELF'], "t.code_journal", "", $param, '', $sortfield, $sortorder, 'center ');
+if (!empty($arrayfields['t.doc_date']['checked']))				print_liste_field_titre($arrayfields['t.doc_date']['label'], $_SERVER['PHP_SELF'], "t.doc_date", "", $param, '', $sortfield, $sortorder, 'center ');
+if (!empty($arrayfields['t.piece_num']['checked']))				print_liste_field_titre($arrayfields['t.piece_num']['label'], $_SERVER['PHP_SELF'], "t.piece_num", "", $param, '', $sortfield, $sortorder);
+if (!empty($arrayfields['t.doc_ref']['checked']))				print_liste_field_titre($arrayfields['t.doc_ref']['label'], $_SERVER['PHP_SELF'], "t.doc_ref", "", $param, "", $sortfield, $sortorder);
+if (!empty($arrayfields['t.label_operation']['checked']))		print_liste_field_titre($arrayfields['t.label_operation']['label'], $_SERVER['PHP_SELF'], "t.label_operation", "", $param, "", $sortfield, $sortorder);
+if (!empty($arrayfields['t.debit']['checked']))					print_liste_field_titre($arrayfields['t.debit']['label'], $_SERVER['PHP_SELF'], "t.debit", "", $param, '', $sortfield, $sortorder, 'right ');
+if (!empty($arrayfields['t.credit']['checked']))				print_liste_field_titre($arrayfields['t.credit']['label'], $_SERVER['PHP_SELF'], "t.credit", "", $param, '', $sortfield, $sortorder, 'right ');
+if (!empty($arrayfields['t.lettering_code']['checked']))		print_liste_field_titre($arrayfields['t.lettering_code']['label'], $_SERVER['PHP_SELF'], "t.lettering_code", "", $param, '', $sortfield, $sortorder, 'center ');
+// Hook fields
+$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
+$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
+print $hookmanager->resPrint;
+print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
+print "</tr>\n";
+
+
+$total_debit = 0;
+$total_credit = 0;
+$sous_total_debit = 0;
+$sous_total_credit = 0;
+$displayed_account_number = null; // Start with undefined to be able to distinguish with empty
+
+// Loop on record
+// --------------------------------------------------------------------
+$i = 0;
+$totalarray = array();
+while ($i < min($num, $limit))
+{
+	$line = $object->lines[$i];
+
+	$total_debit += $line->debit;
+	$total_credit += $line->credit;
+
+	$accountg = length_accounta($line->subledger_account);
+	//if (empty($accountg)) $accountg = '-';
+
+	// Is it a break ?
+	if ($accountg != $displayed_account_number || !isset($displayed_account_number)) {
+		$colspan = $totalarray['nbfield'] - 3;
+		$colspanend = $totalarray['nbfield'] - 7;
+		// Show a subtotal by accounting account
+		if (isset($displayed_account_number)) {
+			print '<tr class="liste_total">';
+			print '<td class="right" colspan="'.$colspan.'">'.$langs->trans("TotalForAccount").' '.length_accounta($displayed_account_number).':</td>';
+			print '<td class="nowrap right">'.price($sous_total_debit).'</td>';
+			print '<td class="nowrap right">'.price($sous_total_credit).'</td>';
+			print '<td colspan="'.$colspanend.'"></td>';
+			print '</tr>';
+			// Show balance of last shown account
+			$balance = $sous_total_debit - $sous_total_credit;
+			print '<tr class="liste_total">';
+			print '<td class="right" colspan="'.$colspan.'">'.$langs->trans("Balance").':</td>';
+			if ($balance > 0)
+			{
+				print '<td class="nowraponall right">';
+				print price($sous_total_debit - $sous_total_credit);
+				print '</td>';
+				print '<td></td>';
+			} else {
+				print '<td></td>';
+				print '<td class="nowraponall right">';
+				print price($sous_total_credit - $sous_total_debit);
+				print '</td>';
+			}
+			print '<td colspan="'.$colspanend.'"></td>';
+			print '</tr>';
+		}
+
+		// Show the break account
+		print "<tr>";
+		print '<td colspan="'.($totalarray['nbfield'] ? $totalarray['nbfield'] : 9).'" style="font-weight:bold; border-bottom: 1pt solid black;">';
+		if ($line->subledger_account != "" && $line->subledger_account != '-1') print length_accounta($line->subledger_account).' : '.$object->get_compte_desc($line->numero_compte);
+		else print '<span class="error">'.$langs->trans("Unknown").'</span>';
+		print '</td>';
+		print '</tr>';
+
+		$displayed_account_number = $accountg;
+		//if (empty($displayed_account_number)) $displayed_account_number='-';
+		$sous_total_debit = 0;
+		$sous_total_credit = 0;
+
+		$colspan = 0;
+	}
+
+	print '<tr class="oddeven">';
+
+	// Journal code
+	if (!empty($arrayfields['t.code_journal']['checked']))
+	{
+		$accountingjournal = new AccountingJournal($db);
+		$result = $accountingjournal->fetch('', $line->code_journal);
+		$journaltoshow = (($result > 0) ? $accountingjournal->getNomUrl(0, 0, 0, '', 0) : $line->code_journal);
+		print '<td class="center">'.$journaltoshow.'</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
+
+	// Document date
+	if (!empty($arrayfields['t.doc_date']['checked']))
+	{
+		print '<td class="center">'.dol_print_date($line->doc_date, 'day').'</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
+
+	// Piece number
+	if (!empty($arrayfields['t.piece_num']['checked']))
+	{
+		print '<td>';
+		$object->id = $line->id;
+		$object->piece_num = $line->piece_num;
+		print $object->getNomUrl(1, '', 0, '', 1);
+		print '</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
+
+	// Document ref
+	if (!empty($arrayfields['t.doc_ref']['checked']))
+	{
+		if ($line->doc_type == 'customer_invoice')
+		{
+			$langs->loadLangs(array('bills'));
+
+			require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+			$objectstatic = new Facture($db);
+			$objectstatic->fetch($line->fk_doc);
+			//$modulepart = 'facture';
+
+			$filename = dol_sanitizeFileName($line->doc_ref);
+			$filedir = $conf->facture->dir_output.'/'.dol_sanitizeFileName($line->doc_ref);
+			$urlsource = $_SERVER['PHP_SELF'].'?id='.$objectstatic->id;
+			$documentlink = $formfile->getDocumentsLink($objectstatic->element, $filename, $filedir);
+		} elseif ($line->doc_type == 'supplier_invoice')
+		{
+			$langs->loadLangs(array('bills'));
+
+			require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
+			$objectstatic = new FactureFournisseur($db);
+			$objectstatic->fetch($line->fk_doc);
+			//$modulepart = 'invoice_supplier';
+
+			$filename = dol_sanitizeFileName($line->doc_ref);
+			$filedir = $conf->fournisseur->facture->dir_output.'/'.get_exdir($line->fk_doc, 2, 0, 0, $objectstatic, $modulepart).dol_sanitizeFileName($line->doc_ref);
+			$subdir = get_exdir($objectstatic->id, 2, 0, 0, $objectstatic, $modulepart).dol_sanitizeFileName($line->doc_ref);
+			$documentlink = $formfile->getDocumentsLink($objectstatic->element, $subdir, $filedir);
+		} elseif ($line->doc_type == 'expense_report')
+		{
+			$langs->loadLangs(array('trips'));
+
+			require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
+			$objectstatic = new ExpenseReport($db);
+			$objectstatic->fetch($line->fk_doc);
+			//$modulepart = 'expensereport';
+
+			$filename = dol_sanitizeFileName($line->doc_ref);
+			$filedir = $conf->expensereport->dir_output.'/'.dol_sanitizeFileName($line->doc_ref);
+			$urlsource = $_SERVER['PHP_SELF'].'?id='.$objectstatic->id;
+			$documentlink = $formfile->getDocumentsLink($objectstatic->element, $filename, $filedir);
+		} else {
+			// Other type
+		}
+
+		print '<td class="nowrap">';
+
+		print '<table class="nobordernopadding"><tr class="nocellnopadd">';
+		// Picto + Ref
+		print '<td class="nobordernopadding nowrap">';
+
+		if ($line->doc_type == 'customer_invoice' || $line->doc_type == 'supplier_invoice' || $line->doc_type == 'expense_report')
+		{
+			print $objectstatic->getNomUrl(1, '', 0, 0, '', 0, -1, 1);
+			print $documentlink;
+		} else {
+			print $line->doc_ref;
+		}
+		print '</td></tr></table>';
+
+		print "</td>\n";
+		if (!$i) $totalarray['nbfield']++;
+	}
+
+	// Label operation
+	if (!empty($arrayfields['t.label_operation']['checked'])) {
+		// Affiche un lien vers la facture client/fournisseur
+		$doc_ref = preg_replace('/\(.*\)/', '', $line->doc_ref);
+		print strlen(length_accounta($line->subledger_account)) == 0 ? '<td>'.$line->label_operation.'</td>' : '<td>'.$line->label_operation.'<br><span style="font-size:0.8em">('.length_accounta($line->subledger_account).')</span></td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
+
+	// Amount debit
+	if (!empty($arrayfields['t.debit']['checked']))
+	{
+		print '<td class="nowrap right">'.($line->debit ? price($line->debit) : '').'</td>';
+		if (!$i) $totalarray['nbfield']++;
+		if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'totaldebit';
+		$totalarray['val']['totaldebit'] += $line->debit;
+	}
+
+	// Amount credit
+	if (!empty($arrayfields['t.credit']['checked'])) {
+		print '<td class="nowrap right">'.($line->credit ? price($line->credit) : '').'</td>';
+		if (!$i) $totalarray['nbfield']++;
+		if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'totalcredit';
+		$totalarray['val']['totalcredit'] += $line->credit;
+	}
+
+	// Lettering code
+	if (!empty($arrayfields['t.lettering_code']['checked']))
+	{
+		print '<td class="center">'.$line->lettering_code.'</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
+
+	// Fields from hook
+	$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj);
+	$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
+	print $hookmanager->resPrint;
+
+	// Action column
+	print '<td class="nowraponall center">';
+	if (empty($line->date_export)) {
+		if ($user->rights->accounting->mouvements->creer) {
+			print '<a class="editfielda" href="'.DOL_URL_ROOT.'/accountancy/bookkeeping/card.php?piece_num='.$line->piece_num.$param.'&page='.$page.($sortfield ? '&sortfield='.$sortfield : '').($sortorder ? '&sortorder='.$sortorder : '').'">'.img_edit().'</a>';
+		}
+		if ($user->rights->accounting->mouvements->supprimer) {
+			print ' &nbsp; <a class="paddingleft" href="'.$_SERVER['PHP_SELF'].'?action=delmouv&mvt_num='.$line->piece_num.$param.'&page='.$page.($sortfield ? '&sortfield='.$sortfield : '').($sortorder ? '&sortorder='.$sortorder : '').'">'.img_delete().'</a>';
+		}
+	}
+	print '</td>';
+	if (!$i) $totalarray['nbfield']++;
+
+	// Comptabilise le sous-total
+	$sous_total_debit += $line->debit;
+	$sous_total_credit += $line->credit;
+
+	print "</tr>\n";
+
+	$i++;
+}
+
+// Show sub-total of last shown account
+$colspan = $totalarray['nbfield'] - 3;
+$colspanend = $totalarray['nbfield'] - 8;
+print '<tr class="liste_total">';
+print '<td class="right" colspan="'.$colspan.'">'.$langs->trans("TotalForAccount").' '.$accountg.':</td>';
+print '<td class="nowrap right">'.price($sous_total_debit).'</td>';
+print '<td class="nowrap right">'.price($sous_total_credit).'</td>';
+print '<td colspan="'.$colspanend.'"></td>';
+print '</tr>';
+// Show balance of last shown account
+$balance = $sous_total_debit - $sous_total_credit;
+print '<tr class="liste_total">';
+print '<td class="right" colspan="'.$colspan.'">'.$langs->trans("Balance").':</td>';
+if ($balance > 0)
+{
+	print '<td class="nowraponall right">';
+	print price($sous_total_debit - $sous_total_credit);
+	print '</td>';
+	print '<td></td>';
+} else {
+	print '<td></td>';
+	print '<td class="nowraponall right">';
+	print price($sous_total_credit - $sous_total_debit);
+	print '</td>';
+}
+print '<td colspan="'.$colspanend.'"></td>';
+print '</tr>';
+
+// Show total line
+include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
+
+
+print "</table>";
+print '</div>';
+
+// TODO Replace this with mass delete action
+if ($user->rights->accounting->mouvements->supprimer_tous) {
+	print '<div class="tabsAction tabsActionNoBottom">'."\n";
+	print '<a class="butActionDelete" name="button_delmvt" href="'.$_SERVER["PHP_SELF"].'?action=delbookkeepingyear'.($param ? '&'.$param : '').'">'.$langs->trans("DeleteMvt").'</a>';
+	print '</div>';
+}
+
+print '</form>';
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/accountancy/bookkeeping/thirdparty_lettering_customer.php b/htdocs/accountancy/bookkeeping/thirdparty_lettering_customer.php
index 9e21a712e7e..e831e21f814 100644
--- a/htdocs/accountancy/bookkeeping/thirdparty_lettering_customer.php
+++ b/htdocs/accountancy/bookkeeping/thirdparty_lettering_customer.php
@@ -141,7 +141,7 @@ $linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_value
 
 dol_banner_tab($object, 'socid', $linkback, ($user->socid ? 0 : 1), 'rowid', 'nom', '', '', 0, '', '', 'arearefnobottom');
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 $sql = "SELECT bk.rowid, bk.doc_date, bk.doc_type, bk.doc_ref, ";
 $sql .= " bk.subledger_account, bk.numero_compte , bk.label_compte, bk.debit, ";
@@ -195,17 +195,17 @@ dol_syslog("/accountancy/bookkeeping/thirdparty_lettering_customer.php", LOG_DEB
 if ($resql) {
 	$i = 0;
 
-    $param = "&socid=".$socid;
+	$param = "&socid=".$socid;
 	print '<form name="add" action="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'" method="POST">';
-    print '<input type="hidden" name="token" value="'.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>';
+	$letteringbutton = '<a class="divButAction"><span class="valignmiddle"><input class="butAction" type="submit" value="lettering" name="lettering" id="lettering"></span></a>';
 
 	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_companies', 0, $letteringbutton, '', $limit);
 
-    print '<div class="div-table-responsive-no-min">';
-    print '<table class="liste centpercent">'."\n";
+	print '<div class="div-table-responsive-no-min">';
+	print '<table class="liste centpercent">'."\n";
 
 	/*
     print '<tr class="liste_titre">';
@@ -244,13 +244,13 @@ if ($resql) {
 	print_liste_field_titre("Balancing", $_SERVER["PHP_SELF"], "", "", $param, "", $sortfield, $sortorder);
 	print_liste_field_titre("Codejournal", $_SERVER["PHP_SELF"], "bk.code_journal", "", $param, "", $sortfield, $sortorder, 'center ');
 	print_liste_field_titre("LetteringCode", $_SERVER["PHP_SELF"], "bk.lettering_code", "", $param, "", $sortfield, $sortorder, 'center ');
-    print_liste_field_titre("", "", "", '', '', "", $sortfield, $sortorder, 'maxwidthsearch center ');
+	print_liste_field_titre("", "", "", '', '', "", $sortfield, $sortorder, 'maxwidthsearch center ');
 	print "</tr>\n";
 
 	$solde = 0;
 	$tmp = '';
 
-    while ($obj = $db->fetch_object($resql)) {
+	while ($obj = $db->fetch_object($resql)) {
 		if ($tmp != $obj->lettering_code || empty($tmp))						$tmp = $obj->lettering_code;
 		/*if ($tmp != $obj->lettering_code || empty($obj->lettering_code))*/	$solde += ($obj->credit - $obj->debit);
 
@@ -265,20 +265,20 @@ if ($resql) {
 		print '<td class="nowrap right">'.price(round($solde, 2)).'</td>';
 
 		// Journal
-        $accountingjournal = new AccountingJournal($db);
-        $result = $accountingjournal->fetch('', $obj->code_journal);
-        $journaltoshow = (($result > 0) ? $accountingjournal->getNomUrl(0, 0, 0, '', 0) : $obj->code_journal);
-        print '<td class="center">'.$journaltoshow.'</td>';
+		$accountingjournal = new AccountingJournal($db);
+		$result = $accountingjournal->fetch('', $obj->code_journal);
+		$journaltoshow = (($result > 0) ? $accountingjournal->getNomUrl(0, 0, 0, '', 0) : $obj->code_journal);
+		print '<td class="center">'.$journaltoshow.'</td>';
 
-        if (empty($obj->lettering_code)) {
-            print '<td class="nowrap center"><input type="checkbox" class="flat checkforselect" name="toselect[]" id="toselect[]" value="'.$obj->rowid.'" /></td>';
-            print '<td><a href="'.DOL_URL_ROOT.'/accountancy/bookkeeping/card.php?piece_num='.$obj->piece_num.'">';
-            print img_edit();
-            print '</a></td>'."\n";
-        } else {
-            print '<td class="center">'.$obj->lettering_code.'</td>';
-            print '<td></td>';
-        }
+		if (empty($obj->lettering_code)) {
+			print '<td class="nowrap center"><input type="checkbox" class="flat checkforselect" name="toselect[]" id="toselect[]" value="'.$obj->rowid.'" /></td>';
+			print '<td><a href="'.DOL_URL_ROOT.'/accountancy/bookkeeping/card.php?piece_num='.$obj->piece_num.'">';
+			print img_edit();
+			print '</a></td>'."\n";
+		} else {
+			print '<td class="center">'.$obj->lettering_code.'</td>';
+			print '<td></td>';
+		}
 
 		print "</tr>\n";
 	}
@@ -299,9 +299,9 @@ if ($resql) {
 
 	print "</table>";
 
-    print '<div class="tabsAction tabsActionNoBottom">'."\n";
-    print $letteringbutton;
-    print '</div>';
+	print '<div class="tabsAction tabsActionNoBottom">'."\n";
+	print $letteringbutton;
+	print '</div>';
 
 	print "</form>";
 	$db->free($resql);
diff --git a/htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php b/htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php
index a0f930e50d7..16aa51beded 100644
--- a/htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php
+++ b/htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php
@@ -140,7 +140,7 @@ $linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_value
 
 dol_banner_tab($object, 'socid', $linkback, ($user->socid ? 0 : 1), 'rowid', 'nom', '', '', 0, '', '', 'arearefnobottom');
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 $sql = "SELECT bk.rowid, bk.doc_date, bk.doc_type, bk.doc_ref, ";
 $sql .= " bk.subledger_account, bk.numero_compte , bk.label_compte, bk.debit, ";
@@ -193,17 +193,17 @@ if ($resql) {
 	$num = $db->num_rows($resql);
 	$i = 0;
 
-    $param = "&socid=".$socid;
+	$param = "&socid=".$socid;
 	print '<form name="add" action="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'" method="POST">';
-    print '<input type="hidden" name="token" value="'.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>';
+	$letteringbutton = '<a class="divButAction"><span class="valignmiddle"><input class="butAction" type="submit" value="lettering" name="lettering" id="lettering"></span></a>';
 
-    print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_companies', 0, $letteringbutton, '', $limit);
+	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_companies', 0, $letteringbutton, '', $limit);
 
-    print '<div class="div-table-responsive-no-min">';
-    print '<table class="liste centpercent">'."\n";
+	print '<div class="div-table-responsive-no-min">';
+	print '<table class="liste centpercent">'."\n";
 
 	/*
     print '<tr class="liste_titre">';
@@ -242,7 +242,7 @@ if ($resql) {
 	print_liste_field_titre("Balancing", $_SERVER["PHP_SELF"], "", "", $param, "", $sortfield, $sortorder);
 	print_liste_field_titre("Codejournal", $_SERVER["PHP_SELF"], "bk.code_journal", "", $param, "", $sortfield, $sortorder, 'center ');
 	print_liste_field_titre("LetteringCode", $_SERVER["PHP_SELF"], "bk.lettering_code", "", $param, "", $sortfield, $sortorder, 'center ');
-    print_liste_field_titre("", "", "", '', '', "", $sortfield, $sortorder, 'maxwidthsearch center ');
+	print_liste_field_titre("", "", "", '', '', "", $sortfield, $sortorder, 'maxwidthsearch center ');
 	print "</tr>\n";
 
 	$solde = 0;
@@ -261,21 +261,21 @@ if ($resql) {
 		print '<td class="nowrap right">'.price($obj->credit).'</td>';
 		print '<td class="nowrap right">'.price(round($solde, 2)).'</td>';
 
-        // Journal
-        $accountingjournal = new AccountingJournal($db);
-        $result = $accountingjournal->fetch('', $obj->code_journal);
-        $journaltoshow = (($result > 0) ? $accountingjournal->getNomUrl(0, 0, 0, '', 0) : $obj->code_journal);
-        print '<td class="center">'.$journaltoshow.'</td>';
+		// Journal
+		$accountingjournal = new AccountingJournal($db);
+		$result = $accountingjournal->fetch('', $obj->code_journal);
+		$journaltoshow = (($result > 0) ? $accountingjournal->getNomUrl(0, 0, 0, '', 0) : $obj->code_journal);
+		print '<td class="center">'.$journaltoshow.'</td>';
 
 		if (empty($obj->lettering_code) && empty($obj->date_validated)) {
 			print '<td class="nowrap center"><input type="checkbox" class="flat checkforselect" name="toselect[]" id="toselect[]" value="'.$obj->rowid.'" /></td>';
-		    print '<td><a href="'.DOL_URL_ROOT.'/accountancy/bookkeeping/card.php?piece_num='.$obj->piece_num.'">';
-		    print img_edit();
-            print '</a></td>'."\n";
+			print '<td><a href="'.DOL_URL_ROOT.'/accountancy/bookkeeping/card.php?piece_num='.$obj->piece_num.'">';
+			print img_edit();
+			print '</a></td>'."\n";
 		} else {
-            print '<td class="center">'.$obj->lettering_code.'</td>';
-            print '<td></td>';
-        }
+			print '<td class="center">'.$obj->lettering_code.'</td>';
+			print '<td></td>';
+		}
 
 		print "</tr>\n";
 	}
@@ -296,9 +296,9 @@ if ($resql) {
 
 	print "</table>";
 
-    print '<div class="tabsAction tabsActionNoBottom">'."\n";
+	print '<div class="tabsAction tabsActionNoBottom">'."\n";
 	print $letteringbutton;
-    print '</div>';
+	print '</div>';
 
 	print "</form>";
 	$db->free($resql);
diff --git a/htdocs/accountancy/class/accountancycategory.class.php b/htdocs/accountancy/class/accountancycategory.class.php
index c7f7f8cf68c..eb43348f1ea 100644
--- a/htdocs/accountancy/class/accountancycategory.class.php
+++ b/htdocs/accountancy/class/accountancycategory.class.php
@@ -31,10 +31,10 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
  */
 class AccountancyCategory // extends CommonObject
 {
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
 	/**
 	 * @var string 		Error string
@@ -63,9 +63,9 @@ class AccountancyCategory // extends CommonObject
 	public $rowid;
 
 	/**
-     * @var int ID
-     */
-    public $id;
+	 * @var int ID
+	 */
+	public $id;
 
 	/**
 	 * @var string Accountancy code
@@ -73,11 +73,11 @@ class AccountancyCategory // extends CommonObject
 	public $code;
 
 	/**
-     * @var string Accountancy Category label
-     */
-    public $label;
+	 * @var string Accountancy Category label
+	 */
+	public $label;
 
-    /**
+	/**
 	 * @var string Accountancy range account
 	 */
 	public $range_account;
@@ -381,8 +381,8 @@ class AccountancyCategory // extends CommonObject
 	 * @param int $id Id
 	 * @return int <0 if KO, 0 if not found, >0 if OK
 	 */
-    public function display($id)
-    {
+	public function display($id)
+	{
 		global $conf;
 		$sql = "SELECT t.rowid, t.account_number, t.label";
 		$sql .= " FROM ".MAIN_DB_PREFIX."accounting_account as t";
@@ -408,7 +408,7 @@ class AccountancyCategory // extends CommonObject
 
 			return -1;
 		}
-    }
+	}
 
 	/**
 	 * Function to select accounting category of an accounting account present in chart of accounts
@@ -417,8 +417,8 @@ class AccountancyCategory // extends CommonObject
 	 *
 	 * @return int <0 if KO, 0 if not found, >0 if OK
 	 */
-    public function getCptBK($id)
-    {
+	public function getCptBK($id)
+	{
 		global $conf;
 
 		$sql = "SELECT t.numero_compte, t.label_operation, t.doc_ref";
@@ -457,7 +457,7 @@ class AccountancyCategory // extends CommonObject
 
 			return -1;
 		}
-    }
+	}
 
 	/**
 	 * Function to select accounting category of an accounting account present in chart of accounts
@@ -466,41 +466,41 @@ class AccountancyCategory // extends CommonObject
 	 *
 	 * @return int <0 if KO, 0 if not found, >0 if OK
 	 */
-    public function getAccountsWithNoCategory($id)
-    {
-        global $conf;
+	public function getAccountsWithNoCategory($id)
+	{
+		global $conf;
 
-	    $sql = "SELECT aa.account_number as numero_compte, aa.label as label_compte";
-	    $sql .= " FROM ".MAIN_DB_PREFIX."accounting_account as aa";
-	    $sql .= " INNER JOIN ".MAIN_DB_PREFIX."accounting_system as asy ON aa.fk_pcg_version = asy.pcg_version";
-	    $sql .= " WHERE (aa.fk_accounting_category != ".$id." OR aa.fk_accounting_category IS NULL)";
-	    $sql .= " AND asy.rowid = ".$conf->global->CHARTOFACCOUNTS;
-	    $sql .= " AND aa.active = 1";
-	    $sql .= " AND aa.entity = ".$conf->entity;
-	    $sql .= " GROUP BY aa.account_number, aa.label";
-	    $sql .= " ORDER BY aa.account_number, aa.label";
+		$sql = "SELECT aa.account_number as numero_compte, aa.label as label_compte";
+		$sql .= " FROM ".MAIN_DB_PREFIX."accounting_account as aa";
+		$sql .= " INNER JOIN ".MAIN_DB_PREFIX."accounting_system as asy ON aa.fk_pcg_version = asy.pcg_version";
+		$sql .= " WHERE (aa.fk_accounting_category != ".$id." OR aa.fk_accounting_category IS NULL)";
+		$sql .= " AND asy.rowid = ".$conf->global->CHARTOFACCOUNTS;
+		$sql .= " AND aa.active = 1";
+		$sql .= " AND aa.entity = ".$conf->entity;
+		$sql .= " GROUP BY aa.account_number, aa.label";
+		$sql .= " ORDER BY aa.account_number, aa.label";
 
-	    $this->lines_CptBk = array();
+		$this->lines_CptBk = array();
 
-	    dol_syslog(__METHOD__, LOG_DEBUG);
-	    $resql = $this->db->query($sql);
-	    if ($resql) {
-	        $num = $this->db->num_rows($resql);
-	        if ($num) {
-	            while ($obj = $this->db->fetch_object($resql)) {
-	                $this->lines_cptbk[] = $obj;
-	            }
-	        }
+		dol_syslog(__METHOD__, LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			$num = $this->db->num_rows($resql);
+			if ($num) {
+				while ($obj = $this->db->fetch_object($resql)) {
+					$this->lines_cptbk[] = $obj;
+				}
+			}
 
-	        return $num;
-	    } else {
-	        $this->error = "Error ".$this->db->lasterror();
-	        $this->errors[] = $this->error;
-	        dol_syslog(__METHOD__." ".implode(','.$this->errors), LOG_ERR);
+			return $num;
+		} else {
+			$this->error = "Error ".$this->db->lasterror();
+			$this->errors[] = $this->error;
+			dol_syslog(__METHOD__." ".implode(','.$this->errors), LOG_ERR);
 
-	        return -1;
-	    }
-    }
+			return -1;
+		}
+	}
 
 	/**
 	 * Function to add an accounting account in an accounting category
@@ -510,8 +510,8 @@ class AccountancyCategory // extends CommonObject
 	 *
 	 * @return int <0 if KO, >0 if OK
 	 */
-    public function updateAccAcc($id_cat, $cpts = array())
-    {
+	public function updateAccAcc($id_cat, $cpts = array())
+	{
 		global $conf;
 		$error = 0;
 
@@ -523,7 +523,7 @@ class AccountancyCategory // extends CommonObject
 		$sql .= " AND asy.rowid = ".$conf->global->CHARTOFACCOUNTS;
 		$sql .= " AND aa.active = 1";
 		$sql .= " AND aa.entity = ".$conf->entity;
-        $sql .= " ORDER BY LENGTH(aa.account_number) DESC;"; // LENGTH is ok with mysql and postgresql
+		$sql .= " ORDER BY LENGTH(aa.account_number) DESC;"; // LENGTH is ok with mysql and postgresql
 
 		$this->db->begin();
 
@@ -539,13 +539,13 @@ class AccountancyCategory // extends CommonObject
 		$accountincptsadded = array();
 		while ($obj = $this->db->fetch_object($resql))
 		{
-		    $account_number_formated = length_accountg($obj->account_number);
-		    if (!empty($accountincptsadded[$account_number_formated])) continue;
+			$account_number_formated = length_accountg($obj->account_number);
+			if (!empty($accountincptsadded[$account_number_formated])) continue;
 
-		    if (array_key_exists($account_number_formated, $cpts))
+			if (array_key_exists($account_number_formated, $cpts))
 			{
-			    $accountincptsadded[$account_number_formated] = 1;
-			    // We found an account number that is in list $cpts of account to add
+				$accountincptsadded[$account_number_formated] = 1;
+				// We found an account number that is in list $cpts of account to add
 				$sql = "UPDATE ".MAIN_DB_PREFIX."accounting_account";
 				$sql .= " SET fk_accounting_category=".$id_cat;
 				$sql .= " WHERE rowid=".$obj->rowid;
@@ -572,7 +572,7 @@ class AccountancyCategory // extends CommonObject
 
 			return 1;
 		}
-    }
+	}
 
 	/**
 	 * Function to delete an accounting account from an accounting category
@@ -581,8 +581,8 @@ class AccountancyCategory // extends CommonObject
 	 *
 	 * @return int <0 if KO, >0 if OK
 	 */
-    public function deleteCptCat($cpt_id)
-    {
+	public function deleteCptCat($cpt_id)
+	{
 		$error = 0;
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."accounting_account as aa";
@@ -598,7 +598,7 @@ class AccountancyCategory // extends CommonObject
 		}
 
 		// Commit or rollback
-        if ($error) {
+		if ($error) {
 			foreach ($this->errors as $errmsg) {
 				dol_syslog(__METHOD__." ".$errmsg, LOG_ERR);
 				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
@@ -606,12 +606,12 @@ class AccountancyCategory // extends CommonObject
 			$this->db->rollback();
 
 			return -1 * $error;
-        } else {
+		} else {
 			$this->db->commit();
 
-            return 1;
-        }
-    }
+			return 1;
+		}
+	}
 
 	/**
 	 * Function to know all category from accounting account
@@ -781,7 +781,7 @@ class AccountancyCategory // extends CommonObject
 							'formula' => $obj->formula,
 							'position' => $obj->position,
 							'category_type' => $obj->category_type,
-					        'bc' => $obj->sens
+							'bc' => $obj->sens
 					);
 					$i++;
 				}
diff --git a/htdocs/accountancy/class/accountancyexport.class.php b/htdocs/accountancy/class/accountancyexport.class.php
index aa806cb084a..80907b527a8 100644
--- a/htdocs/accountancy/class/accountancyexport.class.php
+++ b/htdocs/accountancy/class/accountancyexport.class.php
@@ -55,7 +55,7 @@ class AccountancyExport
 	public static $EXPORT_TYPE_QUADRATUS = 60;
 	public static $EXPORT_TYPE_WINFIC = 70;
 	public static $EXPORT_TYPE_OPENCONCERTO = 100;
-    public static $EXPORT_TYPE_LDCOMPTA = 110;
+	public static $EXPORT_TYPE_LDCOMPTA = 110;
 	public static $EXPORT_TYPE_LDCOMPTA10 = 120;
     public static $EXPORT_TYPE_GESTINUMV3 = 130;
     public static $EXPORT_TYPE_GESTINUMV5 = 135;
@@ -113,7 +113,7 @@ class AccountancyExport
 			self::$EXPORT_TYPE_EBP => $langs->trans('Modelcsv_ebp'),
 			self::$EXPORT_TYPE_COGILOG => $langs->trans('Modelcsv_cogilog'),
 			self::$EXPORT_TYPE_AGIRIS => $langs->trans('Modelcsv_agiris'),
-            self::$EXPORT_TYPE_OPENCONCERTO => $langs->trans('Modelcsv_openconcerto'),
+			self::$EXPORT_TYPE_OPENCONCERTO => $langs->trans('Modelcsv_openconcerto'),
 			self::$EXPORT_TYPE_SAGE50_SWISS => $langs->trans('Modelcsv_Sage50_Swiss'),
             self::$EXPORT_TYPE_CHARLEMAGNE => $langs->trans('Modelcsv_charlemagne'),
 			self::$EXPORT_TYPE_LDCOMPTA => $langs->trans('Modelcsv_LDCompta'),
@@ -263,7 +263,7 @@ class AccountancyExport
 		$filename = 'general_ledger-'.$this->getFormatCode($formatexportset);
 		$type_export = 'general_ledger';
 
-		global $db; 	// The tpl file use $db
+		global $db; // The tpl file use $db
 		include DOL_DOCUMENT_ROOT.'/accountancy/tpl/export_journal.tpl.php';
 
 
@@ -298,9 +298,9 @@ class AccountancyExport
 			case self::$EXPORT_TYPE_AGIRIS :
 				$this->exportAgiris($TData);
 				break;
-            case self::$EXPORT_TYPE_OPENCONCERTO :
-                $this->exportOpenConcerto($TData);
-                break;
+			case self::$EXPORT_TYPE_OPENCONCERTO :
+				$this->exportOpenConcerto($TData);
+				break;
 			case self::$EXPORT_TYPE_SAGE50_SWISS :
 				$this->exportSAGE50SWISS($TData);
 				break;
@@ -614,7 +614,7 @@ class AccountancyExport
 			$Tab['num_compte'] = str_pad(self::trunc($code_compta, 6), 6, '0');
 
 			if ($data->sens == 'D') {
-				$Tab['montant_debit']  =  str_pad(number_format(abs($data->montant), 2, ',', ''), 13, ' ', STR_PAD_LEFT);
+				$Tab['montant_debit']  = str_pad(number_format(abs($data->montant), 2, ',', ''), 13, ' ', STR_PAD_LEFT);
 
 				$Tab['montant_crebit'] = str_pad(number_format(0, 2, ',', ''), 13, ' ', STR_PAD_LEFT);
 			} else {
@@ -674,10 +674,10 @@ class AccountancyExport
 			print $date.$separator;
 			print $line->code_journal.$separator;
 			if (empty($line->subledger_account)) {
-                print $line->numero_compte.$separator;
-            } else {
-                print $line->subledger_account.$separator;
-            }
+				print $line->numero_compte.$separator;
+			} else {
+				print $line->subledger_account.$separator;
+			}
 			//print substr(length_accountg($line->numero_compte), 0, 2) . $separator;
 			print '"'.dol_trunc($line->label_operation, 40, 'right', 'UTF-8', 1).'"'.$separator;
 			print '"'.dol_trunc($line->piece_num, 15, 'right', 'UTF-8', 1).'"'.$separator;
@@ -729,36 +729,36 @@ class AccountancyExport
 		}
 	}
 
-    /**
-     * Export format : OpenConcerto
-     *
-     * @param array $objectLines data
-     * @return void
-     */
-    public function exportOpenConcerto($objectLines)
-    {
+	/**
+	 * Export format : OpenConcerto
+	 *
+	 * @param array $objectLines data
+	 * @return void
+	 */
+	public function exportOpenConcerto($objectLines)
+	{
 
-        $separator = ';';
-        $end_line = "\n";
+		$separator = ';';
+		$end_line = "\n";
 
-        foreach ($objectLines as $line) {
-            $date = dol_print_date($line->doc_date, '%d/%m/%Y');
+		foreach ($objectLines as $line) {
+			$date = dol_print_date($line->doc_date, '%d/%m/%Y');
 
-            print $date.$separator;
-            print $line->code_journal.$separator;
-            if (empty($line->subledger_account)) {
-                print length_accountg($line->numero_compte).$separator;
-            } else {
-                print length_accounta($line->subledger_account).$separator;
-            }
-            print $line->doc_ref.$separator;
-            print $line->label_operation.$separator;
-            print price($line->debit).$separator;
-            print price($line->credit).$separator;
+			print $date.$separator;
+			print $line->code_journal.$separator;
+			if (empty($line->subledger_account)) {
+				print length_accountg($line->numero_compte).$separator;
+			} else {
+				print length_accounta($line->subledger_account).$separator;
+			}
+			print $line->doc_ref.$separator;
+			print $line->label_operation.$separator;
+			print price($line->debit).$separator;
+			print price($line->credit).$separator;
 
-            print $end_line;
-        }
-    }
+			print $end_line;
+		}
+	}
 
 	/**
 	 * Export format : Configurable CSV
@@ -837,25 +837,25 @@ class AccountancyExport
 			print $line->piece_num.$separator;
 
 			// FEC:EcritureDate
-			print $date_document . $separator;
+			print $date_document.$separator;
 
 			// FEC:CompteNum
 			print $line->numero_compte.$separator;
 
 			// FEC:CompteLib
-			print dol_string_unaccent($line->label_compte) . $separator;
+			print dol_string_unaccent($line->label_compte).$separator;
 
 			// FEC:CompAuxNum
 			print $line->subledger_account.$separator;
 
 			// FEC:CompAuxLib
-			print dol_string_unaccent($line->subledger_label) . $separator;
+			print dol_string_unaccent($line->subledger_label).$separator;
 
 			// FEC:PieceRef
 			print $line->doc_ref.$separator;
 
 			// FEC:PieceDate
-			print dol_string_unaccent($date_creation) . $separator;
+			print dol_string_unaccent($date_creation).$separator;
 
 			// FEC:EcritureLib
 			print $line->label_operation.$separator;
@@ -873,7 +873,7 @@ class AccountancyExport
 			print $line->date_lettering.$separator;
 
 			// FEC:ValidDate
-			print $date_validation . $separator;
+			print $date_validation.$separator;
 
 			// FEC:Montantdevise
 			print $line->multicurrency_amount.$separator;
@@ -885,152 +885,152 @@ class AccountancyExport
 		}
 	}
 
-    /**
-     * Export format : SAGE50SWISS
-     *
-     * https://onlinehelp.sageschweiz.ch/default.aspx?tabid=19984
-     * http://media.topal.ch/Public/Schnittstellen/TAF/Specification/Sage50-TAF-format.pdf
-     *
-     * @param array $objectLines data
-     *
-     * @return void
-     */
-    public function exportSAGE50SWISS($objectLines)
-    {
-        // SAGE50SWISS
-        $this->separator = ',';
-        $this->end_line = "\r\n";
+	/**
+	 * Export format : SAGE50SWISS
+	 *
+	 * https://onlinehelp.sageschweiz.ch/default.aspx?tabid=19984
+	 * http://media.topal.ch/Public/Schnittstellen/TAF/Specification/Sage50-TAF-format.pdf
+	 *
+	 * @param array $objectLines data
+	 *
+	 * @return void
+	 */
+	public function exportSAGE50SWISS($objectLines)
+	{
+		// SAGE50SWISS
+		$this->separator = ',';
+		$this->end_line = "\r\n";
 
-        // Print header line
-        print "Blg,Datum,Kto,S/H,Grp,GKto,SId,SIdx,KIdx,BTyp,MTyp,Code,Netto,Steuer,FW-Betrag,Tx1,Tx2,PkKey,OpId,Flag";
-        print $this->end_line;
-        $thisPieceNum = "";
-        $thisPieceAccountNr = "";
-        $aSize = count($objectLines);
-        foreach ($objectLines as $aIndex=>$line)
+		// Print header line
+		print "Blg,Datum,Kto,S/H,Grp,GKto,SId,SIdx,KIdx,BTyp,MTyp,Code,Netto,Steuer,FW-Betrag,Tx1,Tx2,PkKey,OpId,Flag";
+		print $this->end_line;
+		$thisPieceNum = "";
+		$thisPieceAccountNr = "";
+		$aSize = count($objectLines);
+		foreach ($objectLines as $aIndex=>$line)
 		{
-            $sammelBuchung = false;
-            if ($aIndex - 2 >= 0 && $objectLines[$aIndex - 2]->piece_num == $line->piece_num)
-            {
-                $sammelBuchung = true;
-            } elseif ($aIndex + 2 < $aSize && $objectLines[$aIndex + 2]->piece_num == $line->piece_num)
-            {
-                $sammelBuchung = true;
-            } elseif ($aIndex + 1 < $aSize
-                    && $objectLines[$aIndex + 1]->piece_num == $line->piece_num
-                    && $aIndex - 1 < $aSize
-                    && $objectLines[$aIndex - 1]->piece_num == $line->piece_num
-                    )
-            {
-                $sammelBuchung = true;
-            }
+			$sammelBuchung = false;
+			if ($aIndex - 2 >= 0 && $objectLines[$aIndex - 2]->piece_num == $line->piece_num)
+			{
+				$sammelBuchung = true;
+			} elseif ($aIndex + 2 < $aSize && $objectLines[$aIndex + 2]->piece_num == $line->piece_num)
+			{
+				$sammelBuchung = true;
+			} elseif ($aIndex + 1 < $aSize
+					&& $objectLines[$aIndex + 1]->piece_num == $line->piece_num
+					&& $aIndex - 1 < $aSize
+					&& $objectLines[$aIndex - 1]->piece_num == $line->piece_num
+					)
+			{
+				$sammelBuchung = true;
+			}
 
-            //Blg
-            print $line->piece_num.$this->separator;
+			//Blg
+			print $line->piece_num.$this->separator;
 
-            // Datum
-            $date = dol_print_date($line->doc_date, '%d.%m.%Y');
-            print $date.$this->separator;
+			// Datum
+			$date = dol_print_date($line->doc_date, '%d.%m.%Y');
+			print $date.$this->separator;
 
-            // Kto
-            print length_accountg($line->numero_compte).$this->separator;
-            // S/H
-            if ($line->sens == 'D')
-            {
-                print 'S'.$this->separator;
-            } else {
-                print 'H'.$this->separator;
-            }
-            //Grp
-            print self::trunc($line->code_journal, 1).$this->separator;
-            // GKto
-            if (empty($line->code_tiers))
-            {
-                if ($line->piece_num == $thisPieceNum)
-                {
-                    print length_accounta($thisPieceAccountNr).$this->separator;
-                } else {
-                    print "div".$this->separator;
-                }
-            } else {
-                print length_accounta($line->code_tiers).$this->separator;
-            }
-            //SId
-            print $this->separator;
-            //SIdx
-            print "0".$this->separator;
-            //KIdx
-            print "0".$this->separator;
-            //BTyp
-            print "0".$this->separator;
+			// Kto
+			print length_accountg($line->numero_compte).$this->separator;
+			// S/H
+			if ($line->sens == 'D')
+			{
+				print 'S'.$this->separator;
+			} else {
+				print 'H'.$this->separator;
+			}
+			//Grp
+			print self::trunc($line->code_journal, 1).$this->separator;
+			// GKto
+			if (empty($line->code_tiers))
+			{
+				if ($line->piece_num == $thisPieceNum)
+				{
+					print length_accounta($thisPieceAccountNr).$this->separator;
+				} else {
+					print "div".$this->separator;
+				}
+			} else {
+				print length_accounta($line->code_tiers).$this->separator;
+			}
+			//SId
+			print $this->separator;
+			//SIdx
+			print "0".$this->separator;
+			//KIdx
+			print "0".$this->separator;
+			//BTyp
+			print "0".$this->separator;
 
-            //MTyp 1=Fibu Einzelbuchung 2=Sammebuchung
-            if ($sammelBuchung)
-            {
-                print "2".$this->separator;
-            } else {
-                print "1".$this->separator;
-            }
-            // Code
-            print '""'.$this->separator;
-            // Netto
-            if ($line->montant >= 0)
-            {
-                print $line->montant.$this->separator;
-            } else {
-                print ($line->montant * -1).$this->separator;
-            }
-            // Steuer
-            print "0.00".$this->separator;
-            // FW-Betrag
-            print "0.00".$this->separator;
-            // Tx1
-            $line1 = self::toAnsi($line->label_compte, 29);
-            if ($line1 == "LIQ" || $line1 == "LIQ Beleg ok" || strlen($line1) <= 3)
-            {
-                $line1 = "";
-            }
-            $line2 = self::toAnsi($line->doc_ref, 29);
-            if (strlen($line1) == 0)
-            {
-                $line1 = $line2;
-                $line2 = "";
-            }
-            if (strlen($line1) > 0 && strlen($line2) > 0 && (strlen($line1) + strlen($line2)) < 27)
-            {
-                $line1 = $line1.' / '.$line2;
-                $line2 = "";
-            }
+			//MTyp 1=Fibu Einzelbuchung 2=Sammebuchung
+			if ($sammelBuchung)
+			{
+				print "2".$this->separator;
+			} else {
+				print "1".$this->separator;
+			}
+			// Code
+			print '""'.$this->separator;
+			// Netto
+			if ($line->montant >= 0)
+			{
+				print $line->montant.$this->separator;
+			} else {
+				print ($line->montant * -1).$this->separator;
+			}
+			// Steuer
+			print "0.00".$this->separator;
+			// FW-Betrag
+			print "0.00".$this->separator;
+			// Tx1
+			$line1 = self::toAnsi($line->label_compte, 29);
+			if ($line1 == "LIQ" || $line1 == "LIQ Beleg ok" || strlen($line1) <= 3)
+			{
+				$line1 = "";
+			}
+			$line2 = self::toAnsi($line->doc_ref, 29);
+			if (strlen($line1) == 0)
+			{
+				$line1 = $line2;
+				$line2 = "";
+			}
+			if (strlen($line1) > 0 && strlen($line2) > 0 && (strlen($line1) + strlen($line2)) < 27)
+			{
+				$line1 = $line1.' / '.$line2;
+				$line2 = "";
+			}
 
-            print '"'.self::toAnsi($line1).'"'.$this->separator;
-            // Tx2
-            print '"'.self::toAnsi($line2).'"'.$this->separator;
-            //PkKey
-            print "0".$this->separator;
-            //OpId
-            print $this->separator;
+			print '"'.self::toAnsi($line1).'"'.$this->separator;
+			// Tx2
+			print '"'.self::toAnsi($line2).'"'.$this->separator;
+			//PkKey
+			print "0".$this->separator;
+			//OpId
+			print $this->separator;
 
-            // Flag
-            print "0";
+			// Flag
+			print "0";
 
-            print $this->end_line;
+			print $this->end_line;
 
-            if ($line->piece_num !== $thisPieceNum)
-            {
-                $thisPieceNum = $line->piece_num;
-                $thisPieceAccountNr = $line->numero_compte;
-            }
-        }
-    }
+			if ($line->piece_num !== $thisPieceNum)
+			{
+				$thisPieceNum = $line->piece_num;
+				$thisPieceAccountNr = $line->numero_compte;
+			}
+		}
+	}
 
-    /**
-     * Export format : LD Compta version 9
-     * http://www.ldsysteme.fr/fileadmin/telechargement/np/ldcompta/Documentation/IntCptW9.pdf
-     *
-     * @param array $objectLines data
-     *
-     * @return void
-     */
+	/**
+	 * Export format : LD Compta version 9
+	 * http://www.ldsysteme.fr/fileadmin/telechargement/np/ldcompta/Documentation/IntCptW9.pdf
+	 *
+	 * @param array $objectLines data
+	 *
+	 * @return void
+	 */
 	public function exportLDCompta($objectLines)
 	{
 
@@ -1183,23 +1183,23 @@ class AccountancyExport
 				{
 					$soc = $this->db->fetch_object($resql);
 
-	                $address = array('', '', '');
-                    if (strpos($soc->address, "\n") !== false) {
-	                    $address = explode("\n", $soc->address);
-	                    if (is_array($address) && count($address) > 0) {
-	                    	foreach ($address as $key=>$data) {
-			                    $address[$key] = str_replace(array("\t", "\n", "\r"), "", $data);
-			                    $address[$key] = dol_trunc($address[$key], 40, 'right', 'UTF-8', 1);
-		                    }
-	                    }
-                    } else {
-	                    $address[0] = substr(str_replace(array("\t", "\r"), " ", $soc->address), 0, 40);
-	                    $address[1] = substr(str_replace(array("\t", "\r"), " ", $soc->address), 41, 40);
-	                    $address[2] = substr(str_replace(array("\t", "\r"), " ", $soc->address), 82, 40);
-                    }
+					$address = array('', '', '');
+					if (strpos($soc->address, "\n") !== false) {
+						$address = explode("\n", $soc->address);
+						if (is_array($address) && count($address) > 0) {
+							foreach ($address as $key=>$data) {
+								$address[$key] = str_replace(array("\t", "\n", "\r"), "", $data);
+								$address[$key] = dol_trunc($address[$key], 40, 'right', 'UTF-8', 1);
+							}
+						}
+					} else {
+						$address[0] = substr(str_replace(array("\t", "\r"), " ", $soc->address), 0, 40);
+						$address[1] = substr(str_replace(array("\t", "\r"), " ", $soc->address), 41, 40);
+						$address[2] = substr(str_replace(array("\t", "\r"), " ", $soc->address), 82, 40);
+					}
 
 					$type_enregistrement = 'C';
-                    //TYPE
+					//TYPE
 					print $type_enregistrement.$separator;
 					//NOCL
 					print $soc->code_client.$separator;
@@ -1208,15 +1208,15 @@ class AccountancyExport
 					//LIBI
 					print $separator;
 					//TITR
-                    print $separator;
+					print $separator;
 					//RSSO
 					print $soc->nom.$separator;
 					//CAD1
-                    print  $address[0].$separator;
+					print  $address[0].$separator;
 					//CAD2
-                    print  $address[1].$separator;
+					print  $address[1].$separator;
 					//CAD3
-                    print  $address[2].$separator;
+					print  $address[2].$separator;
 					//COPO
 					print  $soc->zip.$separator;
 					//BUDI
@@ -1238,7 +1238,7 @@ class AccountancyExport
 					//COMM
 					print $separator;
 					//SIRE
-                    print str_replace(" ", "", $soc->siret).$separator;
+					print str_replace(" ", "", $soc->siret).$separator;
 					//RIBP
 					print $separator;
 					//DOBQ
@@ -1631,15 +1631,15 @@ class AccountancyExport
 	 *
 	 * @param string	$str 		Original string to encode and optionaly truncate
 	 * @param integer 	$size 		Truncate string after $size characters
-     * @return string 				String encoded in Windows-1251 charset
+	 * @return string 				String encoded in Windows-1251 charset
 	 */
 	public static function toAnsi($str, $size = -1)
-    {
+	{
 		$retVal = dol_string_nohtmltag($str, 1, 'Windows-1251');
-        if ($retVal >= 0 && $size >= 0)
-        {
-            $retVal = mb_substr($retVal, 0, $size, 'Windows-1251');
-        }
-        return $retVal;
+		if ($retVal >= 0 && $size >= 0)
+		{
+			$retVal = mb_substr($retVal, 0, $size, 'Windows-1251');
+		}
+		return $retVal;
 	}
 }
diff --git a/htdocs/accountancy/class/accountancysystem.class.php b/htdocs/accountancy/class/accountancysystem.class.php
index c2f3468016c..193a03f1726 100644
--- a/htdocs/accountancy/class/accountancysystem.class.php
+++ b/htdocs/accountancy/class/accountancysystem.class.php
@@ -28,10 +28,10 @@
  */
 class AccountancySystem
 {
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
 	/**
 	 * @var string Error code (or message)
@@ -44,13 +44,13 @@ class AccountancySystem
 	public $rowid;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_pcg_version;
 
-    /**
-     * @var string pcg type
-     */
+	/**
+	 * @var string pcg type
+	 */
 	public $pcg_type;
 
 	/**
@@ -59,18 +59,18 @@ class AccountancySystem
 	public $numero;
 
 	/**
-     * @var string Accountancy System label
-     */
-    public $label;
+	 * @var string Accountancy System label
+	 */
+	public $label;
 
-    /**
-     * @var string account number
-     */
+	/**
+	 * @var string account number
+	 */
 	public $account_number;
 
-    /**
-     * @var string account parent
-     */
+	/**
+	 * @var string account parent
+	 */
 	public $account_parent;
 
 	/**
@@ -78,10 +78,10 @@ class AccountancySystem
 	 *
 	 * @param DoliDB $db handler
 	 */
-    public function __construct($db)
-    {
+	public function __construct($db)
+	{
 		$this->db = $db;
-    }
+	}
 
 
 	/**
@@ -93,42 +93,42 @@ class AccountancySystem
 	 */
 	public function fetch($rowid = 0, $ref = '')
 	{
-	    global $conf;
+		global $conf;
 
-	    if ($rowid > 0 || $ref)
-	    {
-	        $sql  = "SELECT a.rowid, a.pcg_version, a.label, a.active";
-	        $sql .= " FROM ".MAIN_DB_PREFIX."accounting_system as a";
-	        $sql .= " WHERE";
-	        if ($rowid) {
-	            $sql .= " a.rowid = ".((int) $rowid);
-	        } elseif ($ref) {
-	            $sql .= " a.pcg_version = '".$this->db->escape($ref)."'";
-	        }
+		if ($rowid > 0 || $ref)
+		{
+			$sql  = "SELECT a.rowid, a.pcg_version, a.label, a.active";
+			$sql .= " FROM ".MAIN_DB_PREFIX."accounting_system as a";
+			$sql .= " WHERE";
+			if ($rowid) {
+				$sql .= " a.rowid = ".((int) $rowid);
+			} elseif ($ref) {
+				$sql .= " a.pcg_version = '".$this->db->escape($ref)."'";
+			}
 
-	        dol_syslog(get_class($this)."::fetch sql=".$sql, LOG_DEBUG);
-	        $result = $this->db->query($sql);
-	        if ($result) {
-	            $obj = $this->db->fetch_object($result);
+			dol_syslog(get_class($this)."::fetch sql=".$sql, LOG_DEBUG);
+			$result = $this->db->query($sql);
+			if ($result) {
+				$obj = $this->db->fetch_object($result);
 
-	            if ($obj) {
-	                $this->id = $obj->rowid;
-	                $this->rowid = $obj->rowid;
-	                $this->pcg_version = $obj->pcg_version;
-	                $this->ref = $obj->pcg_version;
-	                $this->label = $obj->label;
-	                $this->active = $obj->active;
+				if ($obj) {
+					$this->id = $obj->rowid;
+					$this->rowid = $obj->rowid;
+					$this->pcg_version = $obj->pcg_version;
+					$this->ref = $obj->pcg_version;
+					$this->label = $obj->label;
+					$this->active = $obj->active;
 
-	                return $this->id;
-	            } else {
-	                return 0;
-	            }
-	        } else {
-	            $this->error = "Error ".$this->db->lasterror();
-	            $this->errors[] = "Error ".$this->db->lasterror();
-	        }
-	    }
-	    return -1;
+					return $this->id;
+				} else {
+					return 0;
+				}
+			} else {
+				$this->error = "Error ".$this->db->lasterror();
+				$this->errors[] = "Error ".$this->db->lasterror();
+			}
+		}
+		return -1;
 	}
 
 
@@ -138,8 +138,8 @@ class AccountancySystem
 	 * @param User $user making insert
 	 * @return int if KO, Id of line if OK
 	 */
-    public function create($user)
-    {
+	public function create($user)
+	{
 		$now = dol_now();
 
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."accounting_system";
@@ -165,6 +165,6 @@ class AccountancySystem
 			dol_syslog($this->error, LOG_ERR);
 		}
 
-        return $result;
-    }
+		return $result;
+	}
 }
diff --git a/htdocs/accountancy/class/accountingaccount.class.php b/htdocs/accountancy/class/accountingaccount.class.php
index 199899f89d5..ebf397c2dfd 100644
--- a/htdocs/accountancy/class/accountingaccount.class.php
+++ b/htdocs/accountancy/class/accountingaccount.class.php
@@ -74,35 +74,35 @@ class AccountingAccount extends CommonObject
 	public $rowid;
 
 	/**
-     * Date creation record (datec)
-     *
-     * @var integer
-     */
-    public $datec;
+	 * Date creation record (datec)
+	 *
+	 * @var integer
+	 */
+	public $datec;
 
 	/**
-     * @var string pcg version
-     */
+	 * @var string pcg version
+	 */
 	public $fk_pcg_version;
 
-    /**
-     * @var string pcg type
-     */
+	/**
+	 * @var string pcg type
+	 */
 	public $pcg_type;
 
-    /**
-     * @var string account number
-     */
+	/**
+	 * @var string account number
+	 */
 	public $account_number;
 
-    /**
-     * @var int ID parent account
-     */
+	/**
+	 * @var int ID parent account
+	 */
 	public $account_parent;
 
-    /**
-     * @var int ID category account
-     */
+	/**
+	 * @var int ID category account
+	 */
 	public $account_category;
 
 	/**
@@ -110,10 +110,10 @@ class AccountingAccount extends CommonObject
 	 */
 	public $status;
 
-    /**
-     * @var string Label of account
-     */
-    public $label;
+	/**
+	 * @var string Label of account
+	 */
+	public $label;
 
 	/**
 	 * @var string Label short of account
@@ -121,19 +121,19 @@ class AccountingAccount extends CommonObject
 	public $labelshort;
 
 	/**
-     * @var int ID
-     */
-    public $fk_user_author;
+	 * @var int ID
+	 */
+	public $fk_user_author;
 
-    /**
-     * @var int ID
-     */
-    public $fk_user_modif;
+	/**
+	 * @var int ID
+	 */
+	public $fk_user_modif;
 
 	/**
 	 * @var int active (duplicate with status)
 	 */
-    public $active;
+	public $active;
 
 	/**
 	 * @var int reconcilable
@@ -145,13 +145,13 @@ class AccountingAccount extends CommonObject
 	 *
 	 * @param DoliDB $db Database handle
 	 */
-    public function __construct($db)
-    {
+	public function __construct($db)
+	{
 		global $conf;
 
 		$this->db = $db;
 		$this->next_prev_filter = 'fk_pcg_version IN (SELECT pcg_version FROM '.MAIN_DB_PREFIX.'accounting_system WHERE rowid='.$conf->global->CHARTOFACCOUNTS.')'; // Used to add a filter in Form::showrefnav method
-    }
+	}
 
 	/**
 	 * Load record in memory
@@ -162,7 +162,7 @@ class AccountingAccount extends CommonObject
 	 * @param   string         $limittoachartaccount    'ABC'=Load record only if it is into chart account with code 'ABC' (better and faster than previous parameter if you have chart of account code).
 	 * @return 	int                                     <0 if KO, 0 if not found, Id of record if OK and found
 	 */
-    public function fetch($rowid = null, $account_number = null, $limittocurrentchart = 0, $limittoachartaccount = '')
+	public function fetch($rowid = null, $account_number = null, $limittocurrentchart = 0, $limittoachartaccount = '')
 	{
 		global $conf;
 
@@ -182,7 +182,7 @@ class AccountingAccount extends CommonObject
 				$sql .= ' AND a.fk_pcg_version IN (SELECT pcg_version FROM '.MAIN_DB_PREFIX.'accounting_system WHERE rowid='.$this->db->escape($conf->global->CHARTOFACCOUNTS).')';
 			}
 			if (!empty($limittoachartaccount)) {
-			    $sql .= " AND a.fk_pcg_version = '".$this->db->escape($limittoachartaccount)."'";
+				$sql .= " AND a.fk_pcg_version = '".$this->db->escape($limittoachartaccount)."'";
 			}
 
 			dol_syslog(get_class($this)."::fetch sql=".$sql, LOG_DEBUG);
@@ -229,8 +229,8 @@ class AccountingAccount extends CommonObject
 	 * @param  int     $notrigger  Disable triggers
 	 * @return int                 <0 if KO, >0 if OK
 	 */
-    public function create($user, $notrigger = 0)
-    {
+	public function create($user, $notrigger = 0)
+	{
 		global $conf;
 		$error = 0;
 		$now = dol_now();
@@ -318,7 +318,7 @@ class AccountingAccount extends CommonObject
 			$this->db->commit();
 			return $this->id;
 		}
-    }
+	}
 
 	/**
 	 * Update record
@@ -366,8 +366,8 @@ class AccountingAccount extends CommonObject
 	 *
 	 * @return int <0 if KO, >0 if OK
 	 */
-    public function checkUsage()
-    {
+	public function checkUsage()
+	{
 		global $langs;
 
 		$sql = "(SELECT fk_code_ventilation FROM ".MAIN_DB_PREFIX."facturedet";
@@ -400,8 +400,8 @@ class AccountingAccount extends CommonObject
 	 * @param int $notrigger 0=triggers after, 1=disable triggers
 	 * @return int <0 if KO, >0 if OK
 	 */
-    public function delete($user, $notrigger = 0)
-    {
+	public function delete($user, $notrigger = 0)
+	{
 		$error = 0;
 
 		$result = $this->checkUsage();
@@ -436,9 +436,9 @@ class AccountingAccount extends CommonObject
 		} else {
 			return -1;
 		}
-    }
+	}
 
-    /**
+	/**
 	 * Return clicable name (with picto eventually)
 	 *
 	 * @param	int		$withpicto					0=No picto, 1=Include picto into link, 2=Only picto
@@ -446,28 +446,29 @@ class AccountingAccount extends CommonObject
 	 * @param	int  	$nourl						1=Disable url
 	 * @param	string  $moretitle					Add more text to title tooltip
 	 * @param	int  	$notooltip					1=Disable tooltip
-     * @param	int     $save_lastsearch_value		-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+	 * @param	int     $save_lastsearch_value		-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
 	 * @param	int     $withcompletelabel		    0=Short label (field short label), 1=Complete label (field label)
 	 * @param	string	$option						'ledger', 'journals', 'accountcard'
 	 * @return  string	String with URL
 	 */
-    public function getNomUrl($withpicto = 0, $withlabel = 0, $nourl = 0, $moretitle = '', $notooltip = 0, $save_lastsearch_value = -1, $withcompletelabel = 0, $option = '')
+	public function getNomUrl($withpicto = 0, $withlabel = 0, $nourl = 0, $moretitle = '', $notooltip = 0, $save_lastsearch_value = -1, $withcompletelabel = 0, $option = '')
 	{
-		global $langs, $conf, $user;
+		global $langs, $conf;
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
 
 		if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
 
 		$result = '';
 
+		$url = '';
 		if (empty($option) || $option == 'ledger') {
-			$url = DOL_URL_ROOT . '/accountancy/bookkeeping/listbyaccount.php?search_accountancy_code_start=' . $this->account_number . '&search_accountancy_code_end=' . $this->account_number;
+			$url = DOL_URL_ROOT.'/accountancy/bookkeeping/listbyaccount.php?search_accountancy_code_start='.urlencode($this->account_number).'&search_accountancy_code_end='.urlencode($this->account_number);
 			$labelurl = $langs->trans("ShowAccountingAccountInLedger");
 		} elseif ($option == 'journals') {
-			$url = DOL_URL_ROOT . '/accountancy/bookkeeping/list.php?search_accountancy_code_start=' . $this->account_number . '&search_accountancy_code_end=' . $this->account_number;
+			$url = DOL_URL_ROOT.'/accountancy/bookkeeping/list.php?search_accountancy_code_start='.urlencode($this->account_number).'&search_accountancy_code_end='.urlencode($this->account_number);
 			$labelurl = $langs->trans("ShowAccountingAccountInJournals");
 		} elseif ($option == 'accountcard') {
-			$url = DOL_URL_ROOT . '/accountancy/admin/card.php?id=' . $this->id;
+			$url = DOL_URL_ROOT.'/accountancy/admin/card.php?id='.urlencode($this->id);
 			$labelurl = $langs->trans("ShowAccountingAccount");
 		}
 
@@ -523,7 +524,7 @@ class AccountingAccount extends CommonObject
 		if ($withpicto && $withpicto != 2) $result .= ' ';
 		if ($withpicto != 2) $result .= $linkstart.$label_link.$linkend;
 		return $result;
-    }
+	}
 
 	/**
 	 * Information on record
@@ -531,8 +532,8 @@ class AccountingAccount extends CommonObject
 	 * @param int $id of record
 	 * @return void
 	 */
-    public function info($id)
-    {
+	public function info($id)
+	{
 		$sql = 'SELECT a.rowid, a.datec, a.fk_user_author, a.fk_user_modif, a.tms';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'accounting_account as a';
 		$sql .= ' WHERE a.rowid = '.$id;
@@ -567,18 +568,18 @@ class AccountingAccount extends CommonObject
 	 * Deactivate an account (for status active or status reconcilable)
 	 *
 	 * @param  int  $id         Id
-     * @param  int  $mode       0=field active, 1=field reconcilable
+	 * @param  int  $mode       0=field active, 1=field reconcilable
 	 * @return int              <0 if KO, >0 if OK
 	 */
-    public function accountDeactivate($id, $mode = 0)
-    {
+	public function accountDeactivate($id, $mode = 0)
+	{
 		$result = $this->checkUsage();
 
 		$fieldtouse = 'active';
-        if ($mode == 1)
-        {
+		if ($mode == 1)
+		{
 			$fieldtouse = 'reconcilable';
-        }
+		}
 
 		if ($result > 0) {
 			$this->db->begin();
@@ -603,26 +604,26 @@ class AccountingAccount extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Account activated
 	 *
 	 * @param  int  $id         Id
-     * @param  int  $mode       0=field active, 1=field reconcilable
+	 * @param  int  $mode       0=field active, 1=field reconcilable
 	 * @return int              <0 if KO, >0 if OK
 	 */
-    public function account_activate($id, $mode = 0)
-    {
-        // phpcs:enable
+	public function account_activate($id, $mode = 0)
+	{
+		// phpcs:enable
 		$this->db->begin();
 
-        if ($mode == 0)
-        {
-            $fieldtouse = 'active';
-        } elseif ($mode == 1)
-        {
-            $fieldtouse = 'reconcilable';
-        }
+		if ($mode == 0)
+		{
+			$fieldtouse = 'active';
+		} elseif ($mode == 1)
+		{
+			$fieldtouse = 'reconcilable';
+		}
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."accounting_account ";
 		$sql .= "SET ".$fieldtouse." = '1'";
@@ -630,15 +631,15 @@ class AccountingAccount extends CommonObject
 
 		dol_syslog(get_class($this)."::account_activate ".$fieldtouse." sql=".$sql, LOG_DEBUG);
 		$result = $this->db->query($sql);
-        if ($result) {
+		if ($result) {
 			$this->db->commit();
 			return 1;
-        } else {
+		} else {
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
-        }
-    }
+		}
+	}
 
 
 	/**
@@ -652,7 +653,7 @@ class AccountingAccount extends CommonObject
 		return $this->LibStatut($this->status, $mode);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Renvoi le libelle d'un statut donne
 	 *
@@ -662,7 +663,7 @@ class AccountingAccount extends CommonObject
 	 */
 	public function LibStatut($status, $mode = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 		$langs->loadLangs(array("users"));
 
diff --git a/htdocs/accountancy/class/accountingjournal.class.php b/htdocs/accountancy/class/accountingjournal.class.php
index 882eee71769..c002abf2a89 100644
--- a/htdocs/accountancy/class/accountingjournal.class.php
+++ b/htdocs/accountancy/class/accountingjournal.class.php
@@ -56,29 +56,29 @@ class AccountingJournal extends CommonObject
 	 */
 	public $rowid;
 
-    /**
-     * @var string Accounting journal code
-     */
+	/**
+	 * @var string Accounting journal code
+	 */
 	public $code;
 
 	/**
-     * @var string Accounting Journal label
-     */
-    public $label;
+	 * @var string Accounting Journal label
+	 */
+	public $label;
 
-    /**
-     * @var int 1:various operations, 2:sale, 3:purchase, 4:bank, 5:expense-report, 8:inventory, 9: has-new
-     */
-    public $nature;
+	/**
+	 * @var int 1:various operations, 2:sale, 3:purchase, 4:bank, 5:expense-report, 8:inventory, 9: has-new
+	 */
+	public $nature;
 
-    /**
-     * @var int is active or not
-     */
+	/**
+	 * @var int is active or not
+	 */
 	public $active;
 
-    /**
-     * @var array array of lines
-     */
+	/**
+	 * @var array array of lines
+	 */
 	public $lines;
 
 	/**
@@ -86,10 +86,10 @@ class AccountingJournal extends CommonObject
 	 *
 	 * @param DoliDB $db Database handle
 	 */
-    public function __construct($db)
-    {
-        $this->db = $db;
-    }
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
 
 	/**
 	 * Load an object from database
@@ -155,8 +155,8 @@ class AccountingJournal extends CommonObject
 	 *
 	 * @return int <0 if KO, >0 if OK
 	 */
-    public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
-    {
+	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
+	{
 		$sql = "SELECT rowid, code, label, nature, active";
 		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
 		// Manage filter
@@ -284,7 +284,7 @@ class AccountingJournal extends CommonObject
 		return $this->LibType($this->nature, $mode);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return type of an accounting journal
 	 *
@@ -294,7 +294,7 @@ class AccountingJournal extends CommonObject
 	 */
 	public function LibType($nature, $mode = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 
 		$langs->loadLangs(array("accountancy"));
diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php
index f5f4bf80221..505c51d27fe 100644
--- a/htdocs/accountancy/class/bookkeeping.class.php
+++ b/htdocs/accountancy/class/bookkeeping.class.php
@@ -768,10 +768,11 @@ class BookKeeping extends CommonObject
 	 * @param int $offset offset limit
 	 * @param array $filter filter array
 	 * @param string $filtermode filter mode (AND or OR)
+	 * @param int $option option (0: general account or 1: subaccount)
 	 *
 	 * @return int <0 if KO, >=0 if OK
 	 */
-	public function fetchAllByAccount($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
+	public function fetchAllByAccount($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND', $option = 0)
 	{
 		global $conf;
 
@@ -836,7 +837,13 @@ class BookKeeping extends CommonObject
 			$sql .= ' AND '.implode(' '.$filtermode.' ', $sqlwhere);
 		}
 		// Affichage par compte comptable
-		$sql .= ' ORDER BY t.numero_compte ASC';
+		if (!empty($option)) {
+			$sql .= ' AND t.subledger_account IS NOT NULL';
+			$sql .= ' ORDER BY t.subledger_account ASC';
+		} else {
+			$sql .= ' ORDER BY t.numero_compte ASC';
+		}
+
 		if (!empty($sortfield)) {
 			$sql .= ', '.$sortfield.' '.$sortorder;
 		}
@@ -1530,14 +1537,14 @@ class BookKeeping extends CommonObject
 		$this->label_compte = 'Customer';
 		$this->label_operation = 'Sales of pea';
 		$this->debit = 99.9;
-		$this->credit = '';
-		$this->montant = '';
+		$this->credit = 0.0;
+		$this->amount = 0.0;
 		$this->sens = 'D';
 		$this->fk_user_author = $user->id;
-		$this->import_key = '';
+		$this->import_key = '20201027';
 		$this->code_journal = 'VT';
 		$this->journal_label = 'Journal de vente';
-		$this->piece_num = '';
+		$this->piece_num = 1234;
 		$this->date_creation = $now;
 	}
 
diff --git a/htdocs/accountancy/closure/validate.php b/htdocs/accountancy/closure/validate.php
index 808ccfba0ef..1013ad1b6ce 100644
--- a/htdocs/accountancy/closure/validate.php
+++ b/htdocs/accountancy/closure/validate.php
@@ -63,24 +63,24 @@ $year_current = $year_start;
 
 if ($action == 'validate')
 {
-    $now = dol_now();
+	$now = dol_now();
 
-    // Update database
-    $db->begin();
-    $sql = "UPDATE ".MAIN_DB_PREFIX."accounting_bookkeeping as b";
-    $sql .= " SET b.date_validated = '".$db->idate($now)."'";
-    $sql .= ' WHERE b.date_validated IS NULL';
+	// Update database
+	$db->begin();
+	$sql = "UPDATE ".MAIN_DB_PREFIX."accounting_bookkeeping as b";
+	$sql .= " SET b.date_validated = '".$db->idate($now)."'";
+	$sql .= ' WHERE b.date_validated IS NULL';
 
-    dol_syslog("htdocs/accountancy/closure/validate.php validate", LOG_DEBUG);
-    $resql = $db->query($sql);
-    if (!$resql1) {
-        $error++;
-        $db->rollback();
-        setEventMessages($db->lasterror(), null, 'errors');
-    } else {
-        $db->commit();
-    }
-    // End clean database
+	dol_syslog("htdocs/accountancy/closure/validate.php validate", LOG_DEBUG);
+	$resql = $db->query($sql);
+	if (!$resql1) {
+		$error++;
+		$db->rollback();
+		setEventMessages($db->lasterror(), null, 'errors');
+	} else {
+		$db->commit();
+	}
+	// End clean database
 }
 
 
@@ -135,8 +135,8 @@ if ($resql) {
 	while ($row = $db->fetch_row($resql)) {
 		for ($i = 1; $i <= 12; $i++) {
 			print '<td class="nowrap center">'.$row[$i].'<br><br>';
-            print '<input id="cb'.$row[$i].'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$row[$i].'"'.($selected ? ' checked="checked"' : '').'>';
-            print '</td>';
+			print '<input id="cb'.$row[$i].'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$row[$i].'"'.($selected ? ' checked="checked"' : '').'>';
+			print '</td>';
 		}
 		print '<td class="valigntop"><b>'.$row[13].'</b></td>';
 	}
diff --git a/htdocs/accountancy/customer/card.php b/htdocs/accountancy/customer/card.php
index 4343946a85e..90f3d4c04ef 100644
--- a/htdocs/accountancy/customer/card.php
+++ b/htdocs/accountancy/customer/card.php
@@ -50,7 +50,7 @@ if ($action == 'ventil' && $user->rights->accounting->bind->write)
 {
 	if (!$cancel)
 	{
-	    if ($codeventil < 0) $codeventil = 0;
+		if ($codeventil < 0) $codeventil = 0;
 
 		$sql = " UPDATE ".MAIN_DB_PREFIX."facturedet";
 		$sql .= " SET fk_code_ventilation = ".$codeventil;
@@ -60,12 +60,12 @@ if ($action == 'ventil' && $user->rights->accounting->bind->write)
 		if (!$resql) {
 			setEventMessages($db->lasterror(), null, 'errors');
 		} else {
-		    setEventMessages($langs->trans("RecordModifiedSuccessfully"), null, 'mesgs');
-		    if ($backtopage)
-		    {
-		    	header("Location: ".$backtopage);
-		    	exit();
-		    }
+			setEventMessages($langs->trans("RecordModifiedSuccessfully"), null, 'mesgs');
+			if ($backtopage)
+			{
+				header("Location: ".$backtopage);
+				exit();
+			}
 		}
 	} else {
 		header("Location: ./lines.php");
@@ -137,7 +137,7 @@ if (!empty($id)) {
 			print '</td></tr>';
 			print '</table>';
 
-			dol_fiche_end();
+			print dol_get_fiche_end();
 
 			print '<div class="center">';
 			print '<input class="button" type="submit" value="'.$langs->trans("Save").'">';
diff --git a/htdocs/accountancy/expensereport/card.php b/htdocs/accountancy/expensereport/card.php
index 153717d05e4..67c790a9c36 100644
--- a/htdocs/accountancy/expensereport/card.php
+++ b/htdocs/accountancy/expensereport/card.php
@@ -146,7 +146,7 @@ if (!empty($id)) {
 			print '</td></tr>';
 			print '</table>';
 
-			dol_fiche_end();
+			print dol_get_fiche_end();
 
 			print '<div class="center">';
 			print '<input class="button" type="submit" value="'.$langs->trans("Save").'">';
diff --git a/htdocs/accountancy/index.php b/htdocs/accountancy/index.php
index 80ed833b828..20010cc8f5c 100644
--- a/htdocs/accountancy/index.php
+++ b/htdocs/accountancy/index.php
@@ -45,14 +45,14 @@ $hookmanager->initHooks(array('accountancyindex'));
 
 if (GETPOST('addbox'))	// Add box (when submit is done from a form when ajax disabled)
 {
-    require_once DOL_DOCUMENT_ROOT.'/core/class/infobox.class.php';
-    $zone = GETPOST('areacode', 'aZ09');
-    $userid = GETPOST('userid', 'int');
-    $boxorder = GETPOST('boxorder', 'aZ09');
-    $boxorder .= GETPOST('boxcombo', 'aZ09');
+	require_once DOL_DOCUMENT_ROOT.'/core/class/infobox.class.php';
+	$zone = GETPOST('areacode', 'aZ09');
+	$userid = GETPOST('userid', 'int');
+	$boxorder = GETPOST('boxorder', 'aZ09');
+	$boxorder .= GETPOST('boxcombo', 'aZ09');
 
-    $result = InfoBox::saveboxorder($db, $zone, $boxorder, $userid);
-    if ($result > 0) setEventMessages($langs->trans("BoxAdded"), null);
+	$result = InfoBox::saveboxorder($db, $zone, $boxorder, $userid);
+	if ($result > 0) setEventMessages($langs->trans("BoxAdded"), null);
 }
 
 
@@ -64,11 +64,11 @@ llxHeader('', $langs->trans("AccountancyArea"));
 
 if ($conf->accounting->enabled)
 {
-    $step = 0;
+	$step = 0;
 
-    $resultboxes = FormOther::getBoxesArea($user, "27"); // Load $resultboxes (selectboxlist + boxactivated + boxlista + boxlistb)
+	$resultboxes = FormOther::getBoxesArea($user, "27"); // Load $resultboxes (selectboxlist + boxactivated + boxlista + boxlistb)
 
-    $helpisexpanded = empty($resultboxes['boxactivated']) || (empty($resultboxes['boxlista']) && empty($resultboxes['boxlistb'])); // If there is no widget, the tooltip help is expanded by default.
+	$helpisexpanded = empty($resultboxes['boxactivated']) || (empty($resultboxes['boxlista']) && empty($resultboxes['boxlistb'])); // If there is no widget, the tooltip help is expanded by default.
 	$showtutorial = '';
 
 	if (!$helpisexpanded)
@@ -92,9 +92,9 @@ if ($conf->accounting->enabled)
 
 	print load_fiche_titre($langs->trans("AccountancyArea"), $resultboxes['selectboxlist'], 'title_accountancy', 0, '', '', $showtutorial);
 
-    print '<div class="'.($helpisexpanded ? '' : 'hideobject').'" id="idfaq">'; // hideobject is to start hidden
-    print "<br>\n";
-    print '<span class="opacitymedium">'.$langs->trans("AccountancyAreaDescIntro")."</span><br>\n";
+	print '<div class="'.($helpisexpanded ? '' : 'hideobject').'" id="idfaq">'; // hideobject is to start hidden
+	print "<br>\n";
+	print '<span class="opacitymedium">'.$langs->trans("AccountancyAreaDescIntro")."</span><br>\n";
 	print "<br>\n"; print "<br>\n";
 
 	print load_fiche_titre('<span class="fa fa-calendar-check-o"></span> '.$langs->trans("AccountancyAreaDescActionOnce"), '', '')."\n";
@@ -132,9 +132,9 @@ if ($conf->accounting->enabled)
 	if (!empty($conf->tax->enabled))
 	{
 		$textlink = '<a href="'.DOL_URL_ROOT.'/admin/dict.php?id=7&from=accountancy"><strong>'.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("MenuTaxAccounts").'</strong></a>';
-	    $step++;
-	    print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescContrib", $step, $textlink);
-	    print "<br>\n";
+		$step++;
+		print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescContrib", $step, $textlink);
+		print "<br>\n";
 	}
 	/*if (! empty($conf->salaries->enabled))
 	{
@@ -146,9 +146,9 @@ if ($conf->accounting->enabled)
 	}*/
 	if (!empty($conf->expensereport->enabled))  // TODO Move this in the default account page because this is only one accounting account per purpose, not several.
 	{
-	    $step++;
-	    print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescExpenseReport", $step, '<a href="'.DOL_URL_ROOT.'/admin/dict.php?id=17&from=accountancy"><strong>'.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("MenuExpenseReportAccounts").'</strong></a>');
-	    print "<br>\n";
+		$step++;
+		print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescExpenseReport", $step, '<a href="'.DOL_URL_ROOT.'/admin/dict.php?id=17&from=accountancy"><strong>'.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("MenuExpenseReportAccounts").'</strong></a>');
+		print "<br>\n";
 	}
 	/*
 	if (! empty($conf->loan->enabled))
@@ -177,7 +177,7 @@ if ($conf->accounting->enabled)
 
 	print '<br>';
 
-    // Step A - E
+	// Step A - E
 
 	print "<br>\n";
 	print load_fiche_titre('<span class="fa fa-calendar"></span> '.$langs->trans("AccountancyAreaDescActionFreq"), '', '');
@@ -199,7 +199,7 @@ if ($conf->accounting->enabled)
 	{
 		$step++;
 		print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescBind", chr(64 + $step), $langs->transnoentitiesnoconv("ExpenseReports"), '<a href="'.DOL_URL_ROOT.'/accountancy/expensereport/index.php"><strong>'.$langs->transnoentitiesnoconv("TransferInAccounting").' - '.$langs->transnoentitiesnoconv("ExpenseReportsVentilation").'</strong></a>')."\n";
-	    print "<br>\n";
+		print "<br>\n";
 	}
 
 	$step++;
@@ -214,36 +214,36 @@ if ($conf->accounting->enabled)
 
 	print '</div>';
 
-    print '<div class="clearboth"></div>';
+	print '<div class="clearboth"></div>';
 
-    print '<div class="fichecenter fichecenterbis">';
+	print '<div class="fichecenter fichecenterbis">';
 
-    /*
+	/*
      * Show boxes
      */
-    $boxlist .= '<div class="twocolumns">';
+	$boxlist .= '<div class="twocolumns">';
 
-    $boxlist .= '<div class="firstcolumn fichehalfleft boxhalfleft" id="boxhalfleft">';
+	$boxlist .= '<div class="firstcolumn fichehalfleft boxhalfleft" id="boxhalfleft">';
 
-    $boxlist .= $resultboxes['boxlista'];
+	$boxlist .= $resultboxes['boxlista'];
 
-    $boxlist .= '</div>';
+	$boxlist .= '</div>';
 
-    $boxlist .= '<div class="secondcolumn fichehalfright boxhalfright" id="boxhalfright">';
+	$boxlist .= '<div class="secondcolumn fichehalfright boxhalfright" id="boxhalfright">';
 
-    $boxlist .= $resultboxes['boxlistb'];
+	$boxlist .= $resultboxes['boxlistb'];
 
-    $boxlist .= '</div>';
-    $boxlist .= "\n";
+	$boxlist .= '</div>';
+	$boxlist .= "\n";
 
-    $boxlist .= '</div>';
+	$boxlist .= '</div>';
 
 
-    print $boxlist;
+	print $boxlist;
 
-    print '</div>';
+	print '</div>';
 } else {
-    print load_fiche_titre($langs->trans("AccountancyArea"), '', 'accountancy');
+	print load_fiche_titre($langs->trans("AccountancyArea"), '', 'accountancy');
 
 	print '<span class="opacitymedium">'.$langs->trans("Module10Desc")."</span><br>\n";
 }
diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php
index 29777316a64..baafcfe5e87 100644
--- a/htdocs/accountancy/journal/bankjournal.php
+++ b/htdocs/accountancy/journal/bankjournal.php
@@ -394,9 +394,9 @@ if ($result) {
 					$tabpay[$obj->rowid]["paymentvariousid"] = $paymentvariousstatic->id;
 					$paymentvariousstatic->fetch($paymentvariousstatic->id);
 					$account_various = (!empty($paymentvariousstatic->accountancy_code) ? $paymentvariousstatic->accountancy_code : 'NotDefined'); // NotDefined is a reserved word
-                    $account_subledger = (!empty($paymentvariousstatic->subledger_account) ? $paymentvariousstatic->subledger_account : ''); // NotDefined is a reserved word
-                    $tabpay[$obj->rowid]["account_various"] = $account_various;
-                    $tabtp[$obj->rowid][$account_subledger] += $obj->amount;
+					$account_subledger = (!empty($paymentvariousstatic->subledger_account) ? $paymentvariousstatic->subledger_account : ''); // NotDefined is a reserved word
+					$tabpay[$obj->rowid]["account_various"] = $account_various;
+					$tabtp[$obj->rowid][$account_subledger] += $obj->amount;
 				} elseif ($links[$key]['type'] == 'payment_loan') {
 					$paymentloanstatic->id = $links[$key]['url_id'];
 					$paymentloanstatic->ref = $links[$key]['url_id'];
@@ -668,7 +668,7 @@ if (!$error && $action == 'writebookkeeping') {
 							$bookkeeping->label_compte = $accountingaccount->label;
 						} elseif ($tabtype[$key] == 'payment_various') {
 							$bookkeeping->subledger_account = $k;
-                            $bookkeeping->subledger_label = $tabcompany[$key]['name'];
+							$bookkeeping->subledger_label = $tabcompany[$key]['name'];
 							$bookkeeping->numero_compte = $tabpay[$key]["account_various"];
 
 							$accountingaccount->fetch(null, $bookkeeping->numero_compte, true);
@@ -954,8 +954,8 @@ if (empty($action) || $action == 'view') {
 	$description .= $langs->trans("DescJournalOnlyBindedVisible").'<br>';
 
 	$listofchoices = array('notyet'=>$langs->trans("NotYetInGeneralLedger"), 'already'=>$langs->trans("AlreadyInGeneralLedger"));
-    $period = $form->selectDate($date_start ? $date_start : -1, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end ? $date_end : -1, 'date_end', 0, 0, 0, '', 1, 0);
-    $period .= ' -  '.$langs->trans("JournalizationInLedgerStatus").' '.$form->selectarray('in_bookkeeping', $listofchoices, $in_bookkeeping, 1);
+	$period = $form->selectDate($date_start ? $date_start : -1, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end ? $date_end : -1, 'date_end', 0, 0, 0, '', 1, 0);
+	$period .= ' -  '.$langs->trans("JournalizationInLedgerStatus").' '.$form->selectarray('in_bookkeeping', $listofchoices, $in_bookkeeping, 1);
 
 	$varlink = 'id_journal='.$id_journal;
 
@@ -991,11 +991,11 @@ if (empty($action) || $action == 'view') {
 	if (!empty($conf->global->ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL) && $in_bookkeeping == 'notyet') print '<input type="button" class="butAction" name="exportcsv" value="'.$langs->trans("ExportDraftJournal").'" onclick="launch_export();" />';
 
 	if (($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER == "") || $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER == '-1'
-	    || ($conf->global->ACCOUNTING_ACCOUNT_SUPPLIER == "") || $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER == '-1') {
-	    print '<input type="button" class="butActionRefused classfortooltip" title="'.dol_escape_htmltag($langs->trans("SomeMandatoryStepsOfSetupWereNotDone")).'" value="'.$langs->trans("WriteBookKeeping").'" />';
+		|| ($conf->global->ACCOUNTING_ACCOUNT_SUPPLIER == "") || $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER == '-1') {
+		print '<input type="button" class="butActionRefused classfortooltip" title="'.dol_escape_htmltag($langs->trans("SomeMandatoryStepsOfSetupWereNotDone")).'" value="'.$langs->trans("WriteBookKeeping").'" />';
 	} else {
-	    if ($in_bookkeeping == 'notyet') print '<input type="button" class="butAction" name="writebookkeeping" value="'.$langs->trans("WriteBookKeeping").'" onclick="writebookkeeping();" />';
-        else print '<a class="butActionRefused classfortooltip" name="writebookkeeping">'.$langs->trans("WriteBookKeeping").'</a>';
+		if ($in_bookkeeping == 'notyet') print '<input type="button" class="butAction" name="writebookkeeping" value="'.$langs->trans("WriteBookKeeping").'" onclick="writebookkeeping();" />';
+		else print '<a class="butActionRefused classfortooltip" name="writebookkeeping">'.$langs->trans("WriteBookKeeping").'</a>';
 	}
 
 	print '</div>';
diff --git a/htdocs/accountancy/journal/expensereportsjournal.php b/htdocs/accountancy/journal/expensereportsjournal.php
index bf8275cee1c..26e2b4cdf77 100644
--- a/htdocs/accountancy/journal/expensereportsjournal.php
+++ b/htdocs/accountancy/journal/expensereportsjournal.php
@@ -110,11 +110,11 @@ if (!empty($conf->global->ACCOUNTING_DATE_START_BINDING)) {
 // Already in bookkeeping or not
 if ($in_bookkeeping == 'already')
 {
-    $sql .= " AND er.rowid IN (SELECT fk_doc FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as ab  WHERE ab.doc_type='expense_report')";
+	$sql .= " AND er.rowid IN (SELECT fk_doc FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as ab  WHERE ab.doc_type='expense_report')";
 }
 if ($in_bookkeeping == 'notyet')
 {
-    $sql .= " AND er.rowid NOT IN (SELECT fk_doc FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as ab  WHERE ab.doc_type='expense_report')";
+	$sql .= " AND er.rowid NOT IN (SELECT fk_doc FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as ab  WHERE ab.doc_type='expense_report')";
 }
 $sql .= " ORDER BY er.date_debut";
 
@@ -370,8 +370,8 @@ if ($action == 'writebookkeeping') {
 
 			if ($error >= 10)
 			{
-			    setEventMessages($langs->trans("ErrorTooManyErrorsProcessStopped"), null, 'errors');
-			    break; // Break in the foreach
+				setEventMessages($langs->trans("ErrorTooManyErrorsProcessStopped"), null, 'errors');
+				break; // Break in the foreach
 			}
 		}
 	}
@@ -433,48 +433,48 @@ if ($action == 'exportcsv') {		// ISO and not UTF8 !
 	print "\n";
 
 	foreach ($taber as $key => $val) {
-	    $date = dol_print_date($val["date"], 'day');
+		$date = dol_print_date($val["date"], 'day');
 
-	    $userstatic->id = $tabuser[$key]['id'];
-	    $userstatic->name = $tabuser[$key]['name'];
+		$userstatic->id = $tabuser[$key]['id'];
+		$userstatic->name = $tabuser[$key]['name'];
 
-	    // Fees
-	    foreach ($tabht[$key] as $k => $mt) {
-	        $accountingaccount = new AccountingAccount($db);
-	        $accountingaccount->fetch(null, $k, true);
-	        if ($mt) {
-	            print '"'.$date.'"'.$sep;
-	            print '"'.$val["ref"].'"'.$sep;
-	            print '"'.length_accountg(html_entity_decode($k)).'"'.$sep;
-	            print '"'.dol_trunc($accountingaccount->label, 32).'"'.$sep;
-	            print '"'.($mt >= 0 ? price($mt) : '').'"'.$sep;
-	            print '"'.($mt < 0 ? price(-$mt) : '').'"';
-	            print "\n";
-	        }
-	    }
-	    // VAT
-	    foreach ($tabtva[$key] as $k => $mt) {
-	        if ($mt) {
-	            print '"'.$date.'"'.$sep;
-	            print '"'.$val["ref"].'"'.$sep;
-	            print '"'.length_accountg(html_entity_decode($k)).'"'.$sep;
-	            print '"'.dol_trunc($langs->trans("VAT")).'"'.$sep;
-	            print '"'.($mt >= 0 ? price($mt) : '').'"'.$sep;
-	            print '"'.($mt < 0 ? price(-$mt) : '').'"';
-	            print "\n";
-	        }
-	    }
+		// Fees
+		foreach ($tabht[$key] as $k => $mt) {
+			$accountingaccount = new AccountingAccount($db);
+			$accountingaccount->fetch(null, $k, true);
+			if ($mt) {
+				print '"'.$date.'"'.$sep;
+				print '"'.$val["ref"].'"'.$sep;
+				print '"'.length_accountg(html_entity_decode($k)).'"'.$sep;
+				print '"'.dol_trunc($accountingaccount->label, 32).'"'.$sep;
+				print '"'.($mt >= 0 ? price($mt) : '').'"'.$sep;
+				print '"'.($mt < 0 ? price(-$mt) : '').'"';
+				print "\n";
+			}
+		}
+		// VAT
+		foreach ($tabtva[$key] as $k => $mt) {
+			if ($mt) {
+				print '"'.$date.'"'.$sep;
+				print '"'.$val["ref"].'"'.$sep;
+				print '"'.length_accountg(html_entity_decode($k)).'"'.$sep;
+				print '"'.dol_trunc($langs->trans("VAT")).'"'.$sep;
+				print '"'.($mt >= 0 ? price($mt) : '').'"'.$sep;
+				print '"'.($mt < 0 ? price(-$mt) : '').'"';
+				print "\n";
+			}
+		}
 
-	    // Third party
-	    foreach ($tabttc[$key] as $k => $mt) {
-	        print '"'.$date.'"'.$sep;
-	        print '"'.$val["ref"].'"'.$sep;
-	        print '"'.length_accounta(html_entity_decode($k)).'"'.$sep;
-	        print '"'.dol_trunc($userstatic->name).'"'.$sep;
-	        print '"'.($mt < 0 ? price(-$mt) : '').'"'.$sep;
-	        print '"'.($mt >= 0 ? price($mt) : '').'"';
-	    }
-	    print "\n";
+		// Third party
+		foreach ($tabttc[$key] as $k => $mt) {
+			print '"'.$date.'"'.$sep;
+			print '"'.$val["ref"].'"'.$sep;
+			print '"'.length_accounta(html_entity_decode($k)).'"'.$sep;
+			print '"'.dol_trunc($userstatic->name).'"'.$sep;
+			print '"'.($mt < 0 ? price(-$mt) : '').'"'.$sep;
+			print '"'.($mt >= 0 ? price($mt) : '').'"';
+		}
+		print "\n";
 	}
 }
 
@@ -489,8 +489,8 @@ if (empty($action) || $action == 'view') {
 	$description .= $langs->trans("DescJournalOnlyBindedVisible").'<br>';
 
 	$listofchoices = array('notyet'=>$langs->trans("NotYetInGeneralLedger"), 'already'=>$langs->trans("AlreadyInGeneralLedger"));
-    $period = $form->selectDate($date_start ? $date_start : -1, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end ? $date_end : -1, 'date_end', 0, 0, 0, '', 1, 0);
-    $period .= ' -  '.$langs->trans("JournalizationInLedgerStatus").' '.$form->selectarray('in_bookkeeping', $listofchoices, $in_bookkeeping, 1);
+	$period = $form->selectDate($date_start ? $date_start : -1, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end ? $date_end : -1, 'date_end', 0, 0, 0, '', 1, 0);
+	$period .= ' -  '.$langs->trans("JournalizationInLedgerStatus").' '.$form->selectarray('in_bookkeeping', $listofchoices, $in_bookkeeping, 1);
 
 	$varlink = 'id_journal='.$id_journal;
 
diff --git a/htdocs/accountancy/journal/purchasesjournal.php b/htdocs/accountancy/journal/purchasesjournal.php
index 8e409b497b5..a656643be57 100644
--- a/htdocs/accountancy/journal/purchasesjournal.php
+++ b/htdocs/accountancy/journal/purchasesjournal.php
@@ -719,8 +719,8 @@ if (empty($action) || $action == 'view') {
 	}
 
 	$listofchoices = array('notyet'=>$langs->trans("NotYetInGeneralLedger"), 'already'=>$langs->trans("AlreadyInGeneralLedger"));
-    $period = $form->selectDate($date_start ? $date_start : -1, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end ? $date_end : -1, 'date_end', 0, 0, 0, '', 1, 0);
-    $period .= ' -  '.$langs->trans("JournalizationInLedgerStatus").' '.$form->selectarray('in_bookkeeping', $listofchoices, $in_bookkeeping, 1);
+	$period = $form->selectDate($date_start ? $date_start : -1, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end ? $date_end : -1, 'date_end', 0, 0, 0, '', 1, 0);
+	$period .= ' -  '.$langs->trans("JournalizationInLedgerStatus").' '.$form->selectarray('in_bookkeeping', $listofchoices, $in_bookkeeping, 1);
 
 	$varlink = 'id_journal='.$id_journal;
 
diff --git a/htdocs/accountancy/journal/sellsjournal.php b/htdocs/accountancy/journal/sellsjournal.php
index 589bad72749..debe1fa8cb0 100644
--- a/htdocs/accountancy/journal/sellsjournal.php
+++ b/htdocs/accountancy/journal/sellsjournal.php
@@ -130,7 +130,7 @@ if ($in_bookkeeping == 'already')
 if ($in_bookkeeping == 'notyet')
 {
 	$sql .= " AND f.rowid NOT IN (SELECT fk_doc FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as ab WHERE ab.doc_type='customer_invoice')";
-    // $sql .= " AND fd.rowid NOT IN (SELECT fk_docdet FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping as ab WHERE ab.doc_type='customer_invoice')";		// Useless, we save one line for all products with same account
+	// $sql .= " AND fd.rowid NOT IN (SELECT fk_docdet FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping as ab WHERE ab.doc_type='customer_invoice')";		// Useless, we save one line for all products with same account
 }
 $sql .= " ORDER BY f.datef";
 //print $sql;
@@ -658,8 +658,8 @@ if (empty($action) || $action == 'view') {
 	}
 
 	$listofchoices = array('notyet'=>$langs->trans("NotYetInGeneralLedger"), 'already'=>$langs->trans("AlreadyInGeneralLedger"));
-    $period = $form->selectDate($date_start ? $date_start : -1, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end ? $date_end : -1, 'date_end', 0, 0, 0, '', 1, 0);
-    $period .= ' -  '.$langs->trans("JournalizationInLedgerStatus").' '.$form->selectarray('in_bookkeeping', $listofchoices, $in_bookkeeping, 1);
+	$period = $form->selectDate($date_start ? $date_start : -1, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end ? $date_end : -1, 'date_end', 0, 0, 0, '', 1, 0);
+	$period .= ' -  '.$langs->trans("JournalizationInLedgerStatus").' '.$form->selectarray('in_bookkeeping', $listofchoices, $in_bookkeeping, 1);
 
 	$varlink = 'id_journal='.$id_journal;
 
diff --git a/htdocs/accountancy/supplier/card.php b/htdocs/accountancy/supplier/card.php
index bee34f291f5..cf13302d866 100644
--- a/htdocs/accountancy/supplier/card.php
+++ b/htdocs/accountancy/supplier/card.php
@@ -54,7 +54,7 @@ if ($action == 'ventil' && $user->rights->accounting->bind->write)
 {
 	if (!$cancel)
 	{
-	    if ($codeventil < 0) $codeventil = 0;
+		if ($codeventil < 0) $codeventil = 0;
 
 		$sql = " UPDATE ".MAIN_DB_PREFIX."facture_fourn_det";
 		$sql .= " SET fk_code_ventilation = ".$codeventil;
@@ -64,12 +64,12 @@ if ($action == 'ventil' && $user->rights->accounting->bind->write)
 		if (!$resql) {
 			setEventMessages($db->lasterror(), null, 'errors');
 		} else {
-		    setEventMessages($langs->trans("RecordModifiedSuccessfully"), null, 'mesgs');
-		    if ($backtopage)
-		    {
-		    	header("Location: ".$backtopage);
-		    	exit();
-		    }
+			setEventMessages($langs->trans("RecordModifiedSuccessfully"), null, 'mesgs');
+			if ($backtopage)
+			{
+				header("Location: ".$backtopage);
+				exit();
+			}
 		}
 	} else {
 		header("Location: ./lines.php");
@@ -141,7 +141,7 @@ if (!empty($id)) {
 			print '</td></tr>';
 			print '</table>';
 
-			dol_fiche_end();
+			print dol_get_fiche_end();
 
 			print '<div class="center">';
 			print '<input class="button" type="submit" value="'.$langs->trans("Save").'">';
diff --git a/htdocs/adherents/admin/adherent.php b/htdocs/adherents/admin/adherent.php
index 07d4454feae..51577218eb9 100644
--- a/htdocs/adherents/admin/adherent.php
+++ b/htdocs/adherents/admin/adherent.php
@@ -50,27 +50,27 @@ $action = GETPOST('action', 'aZ09');
 
 //
 if ($action == 'updateall') {
-    $db->begin();
-    $res1 = $res2 = $res3 = $res4 = $res5 = $res6 = 0;
-    $res1 = dolibarr_set_const($db, 'ADHERENT_LOGIN_NOT_REQUIRED', GETPOST('ADHERENT_LOGIN_NOT_REQUIRED', 'alpha') ? 0 : 1, 'chaine', 0, '', $conf->entity);
-    $res2 = dolibarr_set_const($db, 'ADHERENT_MAIL_REQUIRED', GETPOST('ADHERENT_MAIL_REQUIRED', 'alpha'), 'chaine', 0, '', $conf->entity);
-    $res3 = dolibarr_set_const($db, 'ADHERENT_DEFAULT_SENDINFOBYMAIL', GETPOST('ADHERENT_DEFAULT_SENDINFOBYMAIL', 'alpha'), 'chaine', 0, '', $conf->entity);
-    $res4 = dolibarr_set_const($db, 'ADHERENT_BANK_USE', GETPOST('ADHERENT_BANK_USE', 'alpha'), 'chaine', 0, '', $conf->entity);
-    // Use vat for invoice creation
-    if ($conf->facture->enabled) {
-        $res4 = dolibarr_set_const($db, 'ADHERENT_VAT_FOR_SUBSCRIPTIONS', GETPOST('ADHERENT_VAT_FOR_SUBSCRIPTIONS', 'alpha'), 'chaine', 0, '', $conf->entity);
-        $res5 = dolibarr_set_const($db, 'ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS', GETPOST('ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS', 'alpha'), 'chaine', 0, '', $conf->entity);
-        if (!empty($conf->product->enabled) || !empty($conf->service->enabled)) {
-            $res6 = dolibarr_set_const($db, 'ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS', GETPOST('ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS', 'alpha'), 'chaine', 0, '', $conf->entity);
-        }
-    }
-    if ($res1 < 0 || $res2 < 0 || $res3 < 0 || $res4 < 0 || $res5 < 0 || $res6 < 0) {
-        setEventMessages('ErrorFailedToSaveDate', null, 'errors');
-        $db->rollback();
-    } else {
-        setEventMessages('RecordModifiedSuccessfully', null, 'mesgs');
-        $db->commit();
-    }
+	$db->begin();
+	$res1 = $res2 = $res3 = $res4 = $res5 = $res6 = 0;
+	$res1 = dolibarr_set_const($db, 'ADHERENT_LOGIN_NOT_REQUIRED', GETPOST('ADHERENT_LOGIN_NOT_REQUIRED', 'alpha') ? 0 : 1, 'chaine', 0, '', $conf->entity);
+	$res2 = dolibarr_set_const($db, 'ADHERENT_MAIL_REQUIRED', GETPOST('ADHERENT_MAIL_REQUIRED', 'alpha'), 'chaine', 0, '', $conf->entity);
+	$res3 = dolibarr_set_const($db, 'ADHERENT_DEFAULT_SENDINFOBYMAIL', GETPOST('ADHERENT_DEFAULT_SENDINFOBYMAIL', 'alpha'), 'chaine', 0, '', $conf->entity);
+	$res4 = dolibarr_set_const($db, 'ADHERENT_BANK_USE', GETPOST('ADHERENT_BANK_USE', 'alpha'), 'chaine', 0, '', $conf->entity);
+	// Use vat for invoice creation
+	if ($conf->facture->enabled) {
+		$res4 = dolibarr_set_const($db, 'ADHERENT_VAT_FOR_SUBSCRIPTIONS', GETPOST('ADHERENT_VAT_FOR_SUBSCRIPTIONS', 'alpha'), 'chaine', 0, '', $conf->entity);
+		$res5 = dolibarr_set_const($db, 'ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS', GETPOST('ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS', 'alpha'), 'chaine', 0, '', $conf->entity);
+		if (!empty($conf->product->enabled) || !empty($conf->service->enabled)) {
+			$res6 = dolibarr_set_const($db, 'ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS', GETPOST('ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS', 'alpha'), 'chaine', 0, '', $conf->entity);
+		}
+	}
+	if ($res1 < 0 || $res2 < 0 || $res3 < 0 || $res4 < 0 || $res5 < 0 || $res6 < 0) {
+		setEventMessages('ErrorFailedToSaveDate', null, 'errors');
+		$db->rollback();
+	} else {
+		setEventMessages('RecordModifiedSuccessfully', null, 'mesgs');
+		$db->commit();
+	}
 }
 
 // Action to update or add a constant
@@ -99,18 +99,18 @@ if ($action == 'update' || $action == 'add') {
 
 // Action to enable of a submodule of the adherent module
 if ($action == 'set') {
-    $result = dolibarr_set_const($db, GETPOST('name', 'alpha'), GETPOST('value'), '', 0, '', $conf->entity);
-    if ($result < 0) {
-        print $db->error();
-    }
+	$result = dolibarr_set_const($db, GETPOST('name', 'alpha'), GETPOST('value'), '', 0, '', $conf->entity);
+	if ($result < 0) {
+		print $db->error();
+	}
 }
 
 // Action to disable a submodule of the adherent module
 if ($action == 'unset') {
-    $result = dolibarr_del_const($db, GETPOST('name', 'alpha'), $conf->entity);
-    if ($result < 0) {
-        print $db->error();
-    }
+	$result = dolibarr_del_const($db, GETPOST('name', 'alpha'), $conf->entity);
+	if ($result < 0) {
+		print $db->error();
+	}
 }
 
 
@@ -169,7 +169,7 @@ if (!empty($conf->banque->enabled) && !empty($conf->societe->enabled) && !empty(
 print '<td>';
 print $form->selectarray('ADHERENT_BANK_USE', $arraychoices, $conf->global->ADHERENT_BANK_USE, 0);
 if ($conf->global->ADHERENT_BANK_USE == 'bankdirect' || $conf->global->ADHERENT_BANK_USE == 'bankviainvoice') {
-    print '<br><div style="padding-top: 5px;"><span class="opacitymedium">'.$langs->trans("ABankAccountMustBeDefinedOnPaymentModeSetup").'</span></div>';
+	print '<br><div style="padding-top: 5px;"><span class="opacitymedium">'.$langs->trans("ABankAccountMustBeDefinedOnPaymentModeSetup").'</span></div>';
 }
 print '</td>';
 print "</tr>\n";
@@ -246,7 +246,7 @@ $helptext .= '__YEAR__, __MONTH__, __DAY__';
 
 form_constantes($constantes, 0, $helptext);
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // End of page
 llxFooter();
diff --git a/htdocs/adherents/admin/adherent_emails.php b/htdocs/adherents/admin/adherent_emails.php
index e5b612e3d86..4374d281895 100644
--- a/htdocs/adherents/admin/adherent_emails.php
+++ b/htdocs/adherents/admin/adherent_emails.php
@@ -136,7 +136,7 @@ form_constantes($constantes, 0, $helptext);
 //print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Update").'" name="update"></div>';
 //print '</form>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // End of page
 llxFooter();
diff --git a/htdocs/adherents/admin/adherent_extrafields.php b/htdocs/adherents/admin/adherent_extrafields.php
index 689e7c11be3..a391770fdd5 100644
--- a/htdocs/adherents/admin/adherent_extrafields.php
+++ b/htdocs/adherents/admin/adherent_extrafields.php
@@ -74,7 +74,7 @@ print dol_get_fiche_head($head, 'attributes', $langs->trans("Members"), -1, 'use
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 // Buttons
@@ -95,7 +95,7 @@ if ($action == 'create') {
 	print '<div name="topofform"></div><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';
 }
 
 /* ************************************************************************** */
@@ -107,7 +107,7 @@ if ($action == 'edit' && !empty($attrname)) {
 	print '<div name="topofform"></div><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/admin/adherent_type_extrafields.php b/htdocs/adherents/admin/adherent_type_extrafields.php
index 9fef3ad5c21..92b5ed990e3 100644
--- a/htdocs/adherents/admin/adherent_type_extrafields.php
+++ b/htdocs/adherents/admin/adherent_type_extrafields.php
@@ -77,7 +77,7 @@ print dol_get_fiche_head($head, 'attributes_type', $langs->trans("Members"), -1,
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 // Buttons
diff --git a/htdocs/adherents/admin/website.php b/htdocs/adherents/admin/website.php
index beaf05ce3fa..d0cdb098bae 100644
--- a/htdocs/adherents/admin/website.php
+++ b/htdocs/adherents/admin/website.php
@@ -54,22 +54,22 @@ if ($action == 'update') {
 	$payonline = GETPOST('MEMBER_NEWFORM_PAYONLINE');
 	$forcetype = GETPOST('MEMBER_NEWFORM_FORCETYPE');
 
-    $res = dolibarr_set_const($db, "MEMBER_ENABLE_PUBLIC", $public, 'chaine', 0, '', $conf->entity);
-    $res = dolibarr_set_const($db, "MEMBER_NEWFORM_AMOUNT", $amount, 'chaine', 0, '', $conf->entity);
-    $res = dolibarr_set_const($db, "MEMBER_NEWFORM_EDITAMOUNT", $editamount, 'chaine', 0, '', $conf->entity);
-    $res = dolibarr_set_const($db, "MEMBER_NEWFORM_PAYONLINE", $payonline, 'chaine', 0, '', $conf->entity);
-    if ($forcetype < 0) $res = dolibarr_del_const($db, "MEMBER_NEWFORM_FORCETYPE", $conf->entity);
-    else {
-        $res = dolibarr_set_const($db, "MEMBER_NEWFORM_FORCETYPE", $forcetype, 'chaine', 0, '', $conf->entity);
-    }
+	$res = dolibarr_set_const($db, "MEMBER_ENABLE_PUBLIC", $public, 'chaine', 0, '', $conf->entity);
+	$res = dolibarr_set_const($db, "MEMBER_NEWFORM_AMOUNT", $amount, 'chaine', 0, '', $conf->entity);
+	$res = dolibarr_set_const($db, "MEMBER_NEWFORM_EDITAMOUNT", $editamount, 'chaine', 0, '', $conf->entity);
+	$res = dolibarr_set_const($db, "MEMBER_NEWFORM_PAYONLINE", $payonline, 'chaine', 0, '', $conf->entity);
+	if ($forcetype < 0) $res = dolibarr_del_const($db, "MEMBER_NEWFORM_FORCETYPE", $conf->entity);
+	else {
+		$res = dolibarr_set_const($db, "MEMBER_NEWFORM_FORCETYPE", $forcetype, 'chaine', 0, '', $conf->entity);
+	}
 
-    if (!$res > 0) $error++;
+	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');
+	}
 }
 
 
@@ -97,8 +97,8 @@ print '<input type="hidden" name="token" value="'.newToken().'">';
 print dol_get_fiche_head($head, 'website', $langs->trans("Members"), -1, 'user');
 
 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 initemail()
                 {
                     if (jQuery("#MEMBER_NEWFORM_PAYONLINE").val()==\'-1\')
@@ -127,7 +127,7 @@ if ($conf->use_javascript_ajax) {
                 jQuery("#MEMBER_ENABLE_PUBLIC").change(function() { initfields(); });
                 jQuery("#MEMBER_NEWFORM_PAYONLINE").change(function() { initemail(); });
 			})';
-    print '</script>'."\n";
+	print '</script>'."\n";
 }
 
 
@@ -208,7 +208,7 @@ if (!empty($conf->global->MEMBER_ENABLE_PUBLIC)) {
 }
 
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '</form>';
 
diff --git a/htdocs/adherents/agenda.php b/htdocs/adherents/agenda.php
index c0b5998f035..2e74fdde9be 100644
--- a/htdocs/adherents/agenda.php
+++ b/htdocs/adherents/agenda.php
@@ -65,8 +65,8 @@ $result = $object->fetch($id);
 if ($result > 0) {
 	$object->fetch_thirdparty();
 
-    $adht = new AdherentType($db);
-    $result = $adht->fetch($object->typeid);
+	$adht = new AdherentType($db);
+	$result = $adht->fetch($object->typeid);
 }
 
 
@@ -79,17 +79,17 @@ $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
 if (empty($reshook)) {
-    // Cancel
-    if (GETPOST('cancel', 'alpha') && !empty($backtopage)) {
-        header("Location: ".$backtopage);
-        exit;
-    }
+	// Cancel
+	if (GETPOST('cancel', 'alpha') && !empty($backtopage)) {
+		header("Location: ".$backtopage);
+		exit;
+	}
 
-    // Purge search criteria
-    if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All test are required to be compatible with all browsers
+	// Purge search criteria
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All test are required to be compatible with all browsers
 		$actioncode = '';
-        $search_agenda_label = '';
-    }
+		$search_agenda_label = '';
+	}
 }
 
 
@@ -133,34 +133,34 @@ if ($object->id > 0) {
 
 	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 
-    //print '<div class="tabsAction">';
-    //print '</div>';
+	//print '<div class="tabsAction">';
+	//print '</div>';
 
 
 	$newcardbutton = '';
-    if (!empty($conf->agenda->enabled)) {
-        $newcardbutton .= dolGetButtonTitle($langs->trans('AddAction'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/comm/action/card.php?action=create&backtopage=1&origin=member&originid='.$id);
-    }
+	if (!empty($conf->agenda->enabled)) {
+		$newcardbutton .= dolGetButtonTitle($langs->trans('AddAction'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/comm/action/card.php?action=create&backtopage=1&origin=member&originid='.$id);
+	}
 
-    if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) {
-    	print '<br>';
+	if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) {
+		print '<br>';
 
-    	$param = '&id='.$id;
-    	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
-    	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
+		$param = '&id='.$id;
+		if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
+		if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
 
-    	print_barre_liste($langs->trans("ActionsOnMember"), 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', 0, -1, '', '', $newcardbutton, '', 0, 1, 1);
+		print_barre_liste($langs->trans("ActionsOnMember"), 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', 0, -1, '', '', $newcardbutton, '', 0, 1, 1);
 
-    	// List of all actions
-    	$filters = array();
-    	$filters['search_agenda_label'] = $search_agenda_label;
+		// List of all actions
+		$filters = array();
+		$filters['search_agenda_label'] = $search_agenda_label;
 
-    	// TODO Replace this with same code than into list.php
-    	show_actions_done($conf, $langs, $db, $object, null, 0, $actioncode, '', $filters, $sortfield, $sortorder);
-    }
+		// TODO Replace this with same code than into list.php
+		show_actions_done($conf, $langs, $db, $object, null, 0, $actioncode, '', $filters, $sortfield, $sortorder);
+	}
 }
 
 // End of page
diff --git a/htdocs/adherents/canvas/actions_adherentcard_common.class.php b/htdocs/adherents/canvas/actions_adherentcard_common.class.php
index aa9797959a7..46c4b07b57c 100644
--- a/htdocs/adherents/canvas/actions_adherentcard_common.class.php
+++ b/htdocs/adherents/canvas/actions_adherentcard_common.class.php
@@ -27,15 +27,15 @@
  */
 abstract class ActionsAdherentCardCommon
 {
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $dirmodule;
-    public $targetmodule;
-    public $canvas;
-    public $card;
+	public $dirmodule;
+	public $targetmodule;
+	public $canvas;
+	public $card;
 
 	//! Template container
 	public $tpl = array();
@@ -54,52 +54,52 @@ abstract class ActionsAdherentCardCommon
 
 
 	/**
-     *  Get object
+	 *  Get object
 	 *
-     *  @param	int		$id		Object id
-     *  @return	object			Object loaded
-     */
-    public function getObject($id)
-    {
-    	//$ret = $this->getInstanceDao();
+	 *  @param	int		$id		Object id
+	 *  @return	object			Object loaded
+	 */
+	public function getObject($id)
+	{
+		//$ret = $this->getInstanceDao();
 
-    	/*if (is_object($this->object) && method_exists($this->object,'fetch'))
+		/*if (is_object($this->object) && method_exists($this->object,'fetch'))
     	{
     		if (! empty($id)) $this->object->fetch($id);
     	}
     	else
     	{*/
-    		$object = new Adherent($this->db);
-    		if (!empty($id)) $object->fetch($id);
-            $this->object = $object;
-    	//}
-    }
+			$object = new Adherent($this->db);
+			if (!empty($id)) $object->fetch($id);
+			$this->object = $object;
+		//}
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Set content of ->tpl array, to use into template
-     *
-     *  @param	string		$action    Type of action
-     *  @param	int			$id			Id
-     *  @return	string					HTML output
-     */
-    public function assign_values(&$action, $id)
-    {
-        // phpcs:enable
-        global $conf, $langs, $user, $canvas;
-        global $form, $formcompany, $objsoc;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Set content of ->tpl array, to use into template
+	 *
+	 *  @param	string		$action    Type of action
+	 *  @param	int			$id			Id
+	 *  @return	string					HTML output
+	 */
+	public function assign_values(&$action, $id)
+	{
+		// phpcs:enable
+		global $conf, $langs, $user, $canvas;
+		global $form, $formcompany, $objsoc;
 
-        if ($action == 'add' || $action == 'update') $this->assign_post();
+		if ($action == 'add' || $action == 'update') $this->assign_post();
 
-        foreach ($this->object as $key => $value) {
-            $this->tpl[$key] = $value;
-        }
+		foreach ($this->object as $key => $value) {
+			$this->tpl[$key] = $value;
+		}
 
-        $this->tpl['error'] = $this->error;
-        $this->tpl['errors'] = $this->errors;
+		$this->tpl['error'] = $this->error;
+		$this->tpl['errors'] = $this->errors;
 
-        if ($action == 'create' || $action == 'edit') {
-        	if ($conf->use_javascript_ajax) {
+		if ($action == 'create' || $action == 'edit') {
+			if ($conf->use_javascript_ajax) {
 				$this->tpl['ajax_selectcountry'] = "\n".'<script type="text/javascript" language="javascript">
 				jQuery(document).ready(function () {
 						jQuery("#selectcountry_id").change(function() {
@@ -111,153 +111,153 @@ abstract class ActionsAdherentCardCommon
 				</script>'."\n";
 			}
 
-        	if (is_object($objsoc) && $objsoc->id > 0) {
-        		$this->tpl['company'] = $objsoc->getNomUrl(1);
-        		$this->tpl['company_id'] = $objsoc->id;
-        	} else {
-        		$this->tpl['company'] = $form->select_company($this->object->socid, 'socid', '', 1);
-        	}
+			if (is_object($objsoc) && $objsoc->id > 0) {
+				$this->tpl['company'] = $objsoc->getNomUrl(1);
+				$this->tpl['company_id'] = $objsoc->id;
+			} else {
+				$this->tpl['company'] = $form->select_company($this->object->socid, 'socid', '', 1);
+			}
 
-        	// Civility
-        	$this->tpl['select_civility'] = $formcompany->select_civility($this->object->civility_id);
+			// Civility
+			$this->tpl['select_civility'] = $formcompany->select_civility($this->object->civility_id);
 
-        	// Predefined with third party
-        	if ((isset($objsoc->typent_code) && $objsoc->typent_code == 'TE_PRIVATE')) {
-        		if (dol_strlen(trim($this->object->address)) == 0) $this->tpl['address'] = $objsoc->address;
-        		if (dol_strlen(trim($this->object->zip)) == 0) $this->object->zip = $objsoc->zip;
-        		if (dol_strlen(trim($this->object->town)) == 0) $this->object->town = $objsoc->town;
-        		if (dol_strlen(trim($this->object->phone_perso)) == 0) $this->object->phone_perso = $objsoc->phone;
-        		if (dol_strlen(trim($this->object->phone_mobile)) == 0) $this->object->phone_mobile = $objsoc->phone_mobile;
-        		if (dol_strlen(trim($this->object->email)) == 0) $this->object->email = $objsoc->email;
-        	}
+			// Predefined with third party
+			if ((isset($objsoc->typent_code) && $objsoc->typent_code == 'TE_PRIVATE')) {
+				if (dol_strlen(trim($this->object->address)) == 0) $this->tpl['address'] = $objsoc->address;
+				if (dol_strlen(trim($this->object->zip)) == 0) $this->object->zip = $objsoc->zip;
+				if (dol_strlen(trim($this->object->town)) == 0) $this->object->town = $objsoc->town;
+				if (dol_strlen(trim($this->object->phone_perso)) == 0) $this->object->phone_perso = $objsoc->phone;
+				if (dol_strlen(trim($this->object->phone_mobile)) == 0) $this->object->phone_mobile = $objsoc->phone_mobile;
+				if (dol_strlen(trim($this->object->email)) == 0) $this->object->email = $objsoc->email;
+			}
 
-            // Zip
-            $this->tpl['select_zip'] = $formcompany->select_ziptown($this->object->zip, 'zipcode', array('town', 'selectcountry_id', 'state_id'), 6);
+			// Zip
+			$this->tpl['select_zip'] = $formcompany->select_ziptown($this->object->zip, 'zipcode', array('town', 'selectcountry_id', 'state_id'), 6);
 
-            // Town
-            $this->tpl['select_town'] = $formcompany->select_ziptown($this->object->town, 'town', array('zipcode', 'selectcountry_id', 'state_id'));
+			// Town
+			$this->tpl['select_town'] = $formcompany->select_ziptown($this->object->town, 'town', array('zipcode', 'selectcountry_id', 'state_id'));
 
-            if (dol_strlen(trim($this->object->country_id)) == 0) $this->object->country_id = $objsoc->country_id;
+			if (dol_strlen(trim($this->object->country_id)) == 0) $this->object->country_id = $objsoc->country_id;
 
-            // Country
-            $this->tpl['select_country'] = $form->select_country($this->object->country_id, 'country_id');
-            $countrynotdefined = $langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("SeeAbove").')';
+			// Country
+			$this->tpl['select_country'] = $form->select_country($this->object->country_id, 'country_id');
+			$countrynotdefined = $langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("SeeAbove").')';
 
-            if ($user->admin) $this->tpl['info_admin'] = info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+			if ($user->admin) $this->tpl['info_admin'] = info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 
-            // State
-            if ($this->object->country_id) $this->tpl['select_state'] = $formcompany->select_state($this->object->state_id, $this->object->country_code);
-            else $this->tpl['select_state'] = $countrynotdefined;
+			// State
+			if ($this->object->country_id) $this->tpl['select_state'] = $formcompany->select_state($this->object->state_id, $this->object->country_code);
+			else $this->tpl['select_state'] = $countrynotdefined;
 
-            // Physical or Moral
-            $selectarray = array('0'=>$langs->trans("Physical"), '1'=>$langs->trans("Moral"));
-            $this->tpl['select_morphy'] = $form->selectarray('morphy', $selectarray, $this->object->morphy, 0);
-        }
+			// Physical or Moral
+			$selectarray = array('0'=>$langs->trans("Physical"), '1'=>$langs->trans("Moral"));
+			$this->tpl['select_morphy'] = $form->selectarray('morphy', $selectarray, $this->object->morphy, 0);
+		}
 
-        if ($action == 'view' || $action == 'edit' || $action == 'delete') {
-        	// Emailing
-        	if (!empty($conf->mailing->enabled)) {
+		if ($action == 'view' || $action == 'edit' || $action == 'delete') {
+			// Emailing
+			if (!empty($conf->mailing->enabled)) {
 				$langs->load("mails");
 				$this->tpl['nb_emailing'] = $this->object->getNbOfEMailings();
 			}
 
-        	// Dolibarr user
-        	if ($this->object->user_id) {
+			// Dolibarr user
+			if ($this->object->user_id) {
 				$dolibarr_user = new User($this->db);
 				$result = $dolibarr_user->fetch($this->object->user_id);
 				$this->tpl['dolibarr_user'] = $dolibarr_user->getLoginUrl(1);
 			} else $this->tpl['dolibarr_user'] = $langs->trans("NoDolibarrAccess");
-        }
+		}
 
-        if ($action == 'view' || $action == 'delete') {
-        	$this->tpl['showrefnav'] = $form->showrefnav($this->object, 'id');
+		if ($action == 'view' || $action == 'delete') {
+			$this->tpl['showrefnav'] = $form->showrefnav($this->object, 'id');
 
-        	if ($this->object->socid > 0) {
-        		$objsoc = new Societe($this->db);
+			if ($this->object->socid > 0) {
+				$objsoc = new Societe($this->db);
 
-        		$objsoc->fetch($this->object->socid);
-        		$this->tpl['company'] = $objsoc->getNomUrl(1);
-        	} else {
-        		$this->tpl['company'] = $langs->trans("AdherentNotLinkedToThirdParty");
-        	}
+				$objsoc->fetch($this->object->socid);
+				$this->tpl['company'] = $objsoc->getNomUrl(1);
+			} else {
+				$this->tpl['company'] = $langs->trans("AdherentNotLinkedToThirdParty");
+			}
 
-        	$this->tpl['civility'] = $this->object->getCivilityLabel();
+			$this->tpl['civility'] = $this->object->getCivilityLabel();
 
-            $this->tpl['address'] = dol_nl2br($this->object->address);
+			$this->tpl['address'] = dol_nl2br($this->object->address);
 
-            $this->tpl['zip'] = ($this->object->zip ? $this->object->zip.'&nbsp;' : '');
+			$this->tpl['zip'] = ($this->object->zip ? $this->object->zip.'&nbsp;' : '');
 
-            $img = picto_from_langcode($this->object->country_code);
-            $this->tpl['country'] = ($img ? $img.' ' : '').$this->object->country;
+			$img = picto_from_langcode($this->object->country_code);
+			$this->tpl['country'] = ($img ? $img.' ' : '').$this->object->country;
 
-            $this->tpl['phone_perso'] = dol_print_phone($this->object->phone_perso, $this->object->country_code, 0, $this->object->id, 'AC_TEL');
-            $this->tpl['phone_mobile'] = dol_print_phone($this->object->phone_mobile, $this->object->country_code, 0, $this->object->id, 'AC_TEL');
-            $this->tpl['email'] = dol_print_email($this->object->email, 0, $this->object->id, 'AC_EMAIL');
+			$this->tpl['phone_perso'] = dol_print_phone($this->object->phone_perso, $this->object->country_code, 0, $this->object->id, 'AC_TEL');
+			$this->tpl['phone_mobile'] = dol_print_phone($this->object->phone_mobile, $this->object->country_code, 0, $this->object->id, 'AC_TEL');
+			$this->tpl['email'] = dol_print_email($this->object->email, 0, $this->object->id, 'AC_EMAIL');
 
-            $this->tpl['visibility'] = $this->object->getmorphylib($this->object->morphy);
+			$this->tpl['visibility'] = $this->object->getmorphylib($this->object->morphy);
 
-            $this->tpl['note'] = nl2br($this->object->note);
-        }
+			$this->tpl['note'] = nl2br($this->object->note);
+		}
 
-        if ($action == 'create_user') {
-        	// Full firstname and lastname separated with a dot : firstname.lastname
-        	include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-            require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
-        	$login = dol_buildlogin($this->object->lastname, $this->object->firstname);
+		if ($action == 'create_user') {
+			// Full firstname and lastname separated with a dot : firstname.lastname
+			include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+			require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
+			$login = dol_buildlogin($this->object->lastname, $this->object->firstname);
 
-       		$generated_password = getRandomPassword(false);
-        	$password = $generated_password;
+	   		$generated_password = getRandomPassword(false);
+			$password = $generated_password;
 
-        	// Create a form array
-        	$formquestion = array(
-        	array('label' => $langs->trans("LoginToCreate"), 'type' => 'text', 'name' => 'login', 'value' => $login),
-        	array('label' => $langs->trans("Password"), 'type' => 'text', 'name' => 'password', 'value' => $password));
+			// Create a form array
+			$formquestion = array(
+			array('label' => $langs->trans("LoginToCreate"), 'type' => 'text', 'name' => 'login', 'value' => $login),
+			array('label' => $langs->trans("Password"), 'type' => 'text', 'name' => 'password', 'value' => $password));
 
-        	$this->tpl['action_create_user'] = $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$this->object->id, $langs->trans("CreateDolibarrLogin"), $langs->trans("ConfirmCreateAdherent"), "confirm_create_user", $formquestion, 'no');
-        }
-    }
+			$this->tpl['action_create_user'] = $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$this->object->id, $langs->trans("CreateDolibarrLogin"), $langs->trans("ConfirmCreateAdherent"), "confirm_create_user", $formquestion, 'no');
+		}
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Assign POST values into object
-     *
-     *  @return		string					HTML output
-     */
-    private function assign_post()
-    {
-        // phpcs:enable
-        global $langs, $mysoc;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Assign POST values into object
+	 *
+	 *  @return		string					HTML output
+	 */
+	private function assign_post()
+	{
+		// phpcs:enable
+		global $langs, $mysoc;
 
-        $this->object->old_name = $_POST["old_name"];
-        $this->object->old_firstname = $_POST["old_firstname"];
+		$this->object->old_name = $_POST["old_name"];
+		$this->object->old_firstname = $_POST["old_firstname"];
 
-        $this->object->fk_soc = $_POST["fk_soc"];
-        $this->object->lastname			= $_POST["lastname"];
-        $this->object->firstname		= $_POST["firstname"];
-        $this->object->civility_id = $_POST["civility_id"];
-        $this->object->address = $_POST["address"];
-        $this->object->zip = $_POST["zipcode"];
-        $this->object->town = $_POST["town"];
-        $this->object->country_id = $_POST["country_id"] ? $_POST["country_id"] : $mysoc->country_id;
-        $this->object->state_id = $_POST["state_id"];
-        $this->object->phone_perso = $_POST["phone_perso"];
-        $this->object->phone_mobile = $_POST["phone_mobile"];
-        $this->object->email			= $_POST["email"];
-        $this->object->note				= $_POST["note"];
-        $this->object->canvas = $_POST["canvas"];
+		$this->object->fk_soc = $_POST["fk_soc"];
+		$this->object->lastname			= $_POST["lastname"];
+		$this->object->firstname		= $_POST["firstname"];
+		$this->object->civility_id = $_POST["civility_id"];
+		$this->object->address = $_POST["address"];
+		$this->object->zip = $_POST["zipcode"];
+		$this->object->town = $_POST["town"];
+		$this->object->country_id = $_POST["country_id"] ? $_POST["country_id"] : $mysoc->country_id;
+		$this->object->state_id = $_POST["state_id"];
+		$this->object->phone_perso = $_POST["phone_perso"];
+		$this->object->phone_mobile = $_POST["phone_mobile"];
+		$this->object->email			= $_POST["email"];
+		$this->object->note				= $_POST["note"];
+		$this->object->canvas = $_POST["canvas"];
 
-        // We set country_id, and country_code label of the chosen country
-        if ($this->object->country_id) {
-            $sql = "SELECT code, label FROM ".MAIN_DB_PREFIX."c_country WHERE rowid = ".$this->object->country_id;
-            $resql = $this->db->query($sql);
-            if ($resql) {
-                $obj = $this->db->fetch_object($resql);
+		// We set country_id, and country_code label of the chosen country
+		if ($this->object->country_id) {
+			$sql = "SELECT code, label FROM ".MAIN_DB_PREFIX."c_country WHERE rowid = ".$this->object->country_id;
+			$resql = $this->db->query($sql);
+			if ($resql) {
+				$obj = $this->db->fetch_object($resql);
 
-                $this->object->country_code = $obj->code;
-                $this->object->country = $langs->trans("Country".$obj->code) ? $langs->trans("Country".$obj->code) : $obj->libelle;
-            } else {
-                dol_print_error($this->db);
-            }
-        }
-    }
+				$this->object->country_code = $obj->code;
+				$this->object->country = $langs->trans("Country".$obj->code) ? $langs->trans("Country".$obj->code) : $obj->libelle;
+			} else {
+				dol_print_error($this->db);
+			}
+		}
+	}
 }
diff --git a/htdocs/adherents/canvas/default/actions_adherentcard_default.class.php b/htdocs/adherents/canvas/default/actions_adherentcard_default.class.php
index db2473c55d9..43d6622f8c9 100644
--- a/htdocs/adherents/canvas/default/actions_adherentcard_default.class.php
+++ b/htdocs/adherents/canvas/default/actions_adherentcard_default.class.php
@@ -31,21 +31,21 @@ include_once DOL_DOCUMENT_ROOT.'/adherents/canvas/actions_adherentcard_common.cl
 class ActionsAdherentCardDefault extends ActionsAdherentCardCommon
 {
 	/**
-     *	Constructor
-     *
-     *	@param	DoliDB	$db				Handler acces data base
-     *	@param	string	$dirmodule		Name of directory of module
-     *	@param	string	$targetmodule	Name of directory of module where canvas is stored
-     *	@param	string	$canvas			Name of canvas
-     *	@param	string	$card			Name of tab (sub-canvas)
+	 *	Constructor
+	 *
+	 *	@param	DoliDB	$db				Handler acces data base
+	 *	@param	string	$dirmodule		Name of directory of module
+	 *	@param	string	$targetmodule	Name of directory of module where canvas is stored
+	 *	@param	string	$canvas			Name of canvas
+	 *	@param	string	$card			Name of tab (sub-canvas)
 	 */
 	public function __construct($db, $dirmodule, $targetmodule, $canvas, $card)
 	{
-        $this->db               = $db;
-        $this->dirmodule = $dirmodule;
-        $this->targetmodule     = $targetmodule;
-        $this->canvas           = $canvas;
-        $this->card             = $card;
+		$this->db               = $db;
+		$this->dirmodule = $dirmodule;
+		$this->targetmodule     = $targetmodule;
+		$this->canvas           = $canvas;
+		$this->card             = $card;
 	}
 
 	/**
@@ -67,7 +67,7 @@ class ActionsAdherentCardDefault extends ActionsAdherentCardCommon
 		return $out;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Assign custom values for canvas
 	 *
@@ -77,47 +77,47 @@ class ActionsAdherentCardDefault extends ActionsAdherentCardCommon
 	 */
 	public function assign_values(&$action, $id)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $limit, $offset, $sortfield, $sortorder;
 		global $conf, $db, $langs, $user;
 		global $form;
 
 		$ret = $this->getObject($id);
 
-        parent::assign_values($action, $id);
+		parent::assign_values($action, $id);
 
-        $this->tpl['title'] = $this->getTitle($action);
-        $this->tpl['error'] = $this->error;
-        $this->tpl['errors'] = $this->errors;
+		$this->tpl['title'] = $this->getTitle($action);
+		$this->tpl['error'] = $this->error;
+		$this->tpl['errors'] = $this->errors;
 
 		if ($action == 'view') {
-            // Card header
-            $head = member_prepare_head($this->object);
-            $title = $this->getTitle($action);
+			// Card header
+			$head = member_prepare_head($this->object);
+			$title = $this->getTitle($action);
 
-		    $this->tpl['showhead'] = dol_get_fiche_head($head, 'card', $title, 0, 'adherent');
-		    $this->tpl['showend'] = dol_get_fiche_end();
+			$this->tpl['showhead'] = dol_get_fiche_head($head, 'card', $title, 0, 'adherent');
+			$this->tpl['showend'] = dol_get_fiche_end();
 
-        	$objsoc = new Societe($db);
-            $objsoc->fetch($this->object->socid);
+			$objsoc = new Societe($db);
+			$objsoc->fetch($this->object->socid);
 
-            $this->tpl['actionstodo'] = show_actions_todo($conf, $langs, $db, $objsoc, $this->object, 1);
+			$this->tpl['actionstodo'] = show_actions_todo($conf, $langs, $db, $objsoc, $this->object, 1);
 
-            $this->tpl['actionsdone'] = show_actions_done($conf, $langs, $db, $objsoc, $this->object, 1);
-        } else {
+			$this->tpl['actionsdone'] = show_actions_done($conf, $langs, $db, $objsoc, $this->object, 1);
+		} else {
 			// Confirm delete contact
-        	if ($action == 'delete' && $user->rights->adherent->supprimer) {
-        		$this->tpl['action_delete'] = $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$this->object->id, $langs->trans("DeleteAdherent"), $langs->trans("ConfirmDeleteAdherent"), "confirm_delete", '', 0, 1);
-        	}
+			if ($action == 'delete' && $user->rights->adherent->supprimer) {
+				$this->tpl['action_delete'] = $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$this->object->id, $langs->trans("DeleteAdherent"), $langs->trans("ConfirmDeleteAdherent"), "confirm_delete", '', 0, 1);
+			}
 		}
 
 		if ($action == 'list') {
-	        $this->LoadListDatas($limit, $offset, $sortfield, $sortorder);
+			$this->LoadListDatas($limit, $offset, $sortfield, $sortorder);
 		}
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * 	Fetch datas list and save into ->list_datas
 	 *
@@ -129,11 +129,11 @@ class ActionsAdherentCardDefault extends ActionsAdherentCardCommon
 	 */
 	public function LoadListDatas($limit, $offset, $sortfield, $sortorder)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $langs;
 
-        //$this->getFieldList();
+		//$this->getFieldList();
 
-        $this->list_datas = array();
+		$this->list_datas = array();
 	}
 }
diff --git a/htdocs/adherents/canvas/default/tpl/adherentcard_view.tpl.php b/htdocs/adherents/canvas/default/tpl/adherentcard_view.tpl.php
index 8789b2fcb34..539e174681f 100644
--- a/htdocs/adherents/canvas/default/tpl/adherentcard_view.tpl.php
+++ b/htdocs/adherents/canvas/default/tpl/adherentcard_view.tpl.php
@@ -118,21 +118,21 @@ if (!empty($this->control->tpl['action_delete'])) echo $this->control->tpl['acti
 <?php echo $this->control->tpl['showend'];
 
 if (empty($user->socid)) {
-    echo '<div class="tabsAction">';
+	echo '<div class="tabsAction">';
 
-    if ($user->rights->adherent->creer) {
-        echo '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$this->control->tpl['id'].'&amp;action=edit&amp;canvas='.$canvas.'">'.$langs->trans('Modify').'</a>';
-    }
+	if ($user->rights->adherent->creer) {
+		echo '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$this->control->tpl['id'].'&amp;action=edit&amp;canvas='.$canvas.'">'.$langs->trans('Modify').'</a>';
+	}
 
-    if (!$this->control->tpl['user_id'] && $user->rights->user->user->creer) {
-        echo '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$this->control->tpl['id'].'&amp;action=create_user&amp;canvas='.$canvas.'">'.$langs->trans("CreateDolibarrLogin").'</a>';
-    }
+	if (!$this->control->tpl['user_id'] && $user->rights->user->user->creer) {
+		echo '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$this->control->tpl['id'].'&amp;action=create_user&amp;canvas='.$canvas.'">'.$langs->trans("CreateDolibarrLogin").'</a>';
+	}
 
-    if ($user->rights->adherent->supprimer) {
-        echo '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$this->control->tpl['id'].'&amp;action=delete&amp;canvas='.$canvas.'">'.$langs->trans('Delete').'</a>';
-    }
+	if ($user->rights->adherent->supprimer) {
+		echo '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$this->control->tpl['id'].'&amp;action=delete&amp;canvas='.$canvas.'">'.$langs->trans('Delete').'</a>';
+	}
 
-    echo '</div><br>';
+	echo '</div><br>';
 }
 
 echo $this->control->tpl['actionstodo'];
diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php
index 128b915ef0f..bd3ad481cd8 100644
--- a/htdocs/adherents/card.php
+++ b/htdocs/adherents/card.php
@@ -191,6 +191,9 @@ if (empty($reshook)) {
 			if ($result < 0) {
 				$langs->load("errors");
 				setEventMessages($langs->trans($nuser->error), null, 'errors');
+			} else {
+				setEventMessages($langs->trans("NewUserCreated", $nuser->login), null, 'mesgs');
+				$action = '';
 			}
 		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
@@ -218,7 +221,7 @@ if (empty($reshook)) {
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 		$birthdate = '';
-		if (GETPOST("birthday", 'int')	&& GETPOST("birthmonth", 'int') && GETPOST("birthyear", 'int'))
+		if (GETPOST("birthday", 'int') && GETPOST("birthmonth", 'int') && GETPOST("birthyear", 'int'))
 		{
 			$birthdate = dol_mktime(12, 0, 0, GETPOST("birthmonth", 'int'), GETPOST("birthday", 'int'), GETPOST("birthyear", 'int'));
 		}
@@ -969,7 +972,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		print '<tbody>';
 		print "</table>\n";
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 		print '<div class="center">';
 		print '<input type="submit" name="button" class="button" value="'.$langs->trans("AddMember").'">';
@@ -1229,7 +1232,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_add.tpl.php';
 
 		print '</table>';
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 		print '<div class="center">';
 		print '<input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
@@ -1272,7 +1275,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 
 		// Confirm create user
 		if ($action == 'create_user') {
-			$login = $object->login;
+			$login = (GETPOSTISSET('login') ? GETPOST('login', 'alphanohtml') : $object->login);
 			if (empty($login)) {
 				// Full firstname and name separated with a dot : firstname.name
 				include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
@@ -1608,7 +1611,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		print "</div></div></div>\n";
 		print '<div style="clear:both"></div>';
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 
 		/*
@@ -1701,13 +1704,6 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 					}
 				}
 
-				// Delete
-				if ($user->rights->adherent->supprimer) {
-					print '<div class="inline-block divButAction"><a class="butActionDelete" href="card.php?rowid='.$object->id.'&action=delete&token='.newToken().'">'.$langs->trans("Delete")."</a></div>\n";
-				} else {
-					print '<div class="inline-block divButAction"><font class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("Delete")."</font></div>";
-				}
-
 				// Action SPIP
 				if (!empty($conf->mailmanspip->enabled) && !empty($conf->global->ADHERENT_USE_SPIP)) {
 					$isinspip = $mailmanspip->is_in_spip($object);
@@ -1719,6 +1715,13 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 						print '<div class="inline-block divButAction"><a class="butAction" href="card.php?rowid='.$object->id.'&action=add_spip">'.$langs->trans("AddIntoSpip")."</a></div>\n";
 					}
 				}
+
+				// Delete
+				if ($user->rights->adherent->supprimer) {
+					print '<div class="inline-block divButAction"><a class="butActionDelete" href="card.php?rowid='.$object->id.'&action=delete&token='.newToken().'">'.$langs->trans("Delete")."</a></div>\n";
+				} else {
+					print '<div class="inline-block divButAction"><font class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("Delete")."</font></div>";
+				}
 			}
 		}
 		print '</div>';
diff --git a/htdocs/adherents/cartes/carte.php b/htdocs/adherents/cartes/carte.php
index 958750178f1..b62f58117a2 100644
--- a/htdocs/adherents/cartes/carte.php
+++ b/htdocs/adherents/cartes/carte.php
@@ -56,163 +56,163 @@ $extrafields->fetch_name_optionals_label($object->table_element);
  */
 
 if ($mode == 'cardlogin' && empty($foruserlogin)) {
-    $mesg = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Login"));
+	$mesg = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Login"));
 }
 
 if ((!empty($foruserid) || !empty($foruserlogin) || !empty($mode)) && !$mesg) {
-    $arrayofmembers = array();
+	$arrayofmembers = array();
 
-    // request taking into account member with up to date subscriptions
-    $sql = "SELECT d.rowid, d.firstname, d.lastname, d.login, d.societe as company, d.datefin,";
-    $sql .= " d.address, d.zip, d.town, d.country, d.birth, d.email, d.photo,";
-    $sql .= " t.libelle as type,";
-    $sql .= " c.code as country_code, c.label as country";
-    // Add fields from extrafields
-    if (!empty($extrafields->attributes[$object->table_element]['label']))
-    	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) $sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef.".$key.' as options_'.$key : '');
-    $sql .= " FROM ".MAIN_DB_PREFIX."adherent_type as t, ".MAIN_DB_PREFIX."adherent as d";
-    $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON d.country = c.rowid";
-    if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."adherent_extrafields as ef on (d.rowid = ef.fk_object)";
-    $sql .= " WHERE d.fk_adherent_type = t.rowid AND d.statut = 1";
-    $sql .= " AND d.entity IN (".getEntity('adherent').")";
-    if (is_numeric($foruserid)) $sql .= " AND d.rowid=".$foruserid;
-    if ($foruserlogin) $sql .= " AND d.login='".$db->escape($foruserlogin)."'";
-    $sql .= " ORDER BY d.rowid ASC";
+	// request taking into account member with up to date subscriptions
+	$sql = "SELECT d.rowid, d.firstname, d.lastname, d.login, d.societe as company, d.datefin,";
+	$sql .= " d.address, d.zip, d.town, d.country, d.birth, d.email, d.photo,";
+	$sql .= " t.libelle as type,";
+	$sql .= " c.code as country_code, c.label as country";
+	// Add fields from extrafields
+	if (!empty($extrafields->attributes[$object->table_element]['label']))
+		foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) $sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef.".$key.' as options_'.$key : '');
+	$sql .= " FROM ".MAIN_DB_PREFIX."adherent_type as t, ".MAIN_DB_PREFIX."adherent as d";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON d.country = c.rowid";
+	if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."adherent_extrafields as ef on (d.rowid = ef.fk_object)";
+	$sql .= " WHERE d.fk_adherent_type = t.rowid AND d.statut = 1";
+	$sql .= " AND d.entity IN (".getEntity('adherent').")";
+	if (is_numeric($foruserid)) $sql .= " AND d.rowid=".$foruserid;
+	if ($foruserlogin) $sql .= " AND d.login='".$db->escape($foruserlogin)."'";
+	$sql .= " ORDER BY d.rowid ASC";
 
-    dol_syslog("Search members", LOG_DEBUG);
-    $result = $db->query($sql);
-    if ($result) {
-    	$num = $db->num_rows($result);
-    	$i = 0;
-    	while ($i < $num) {
-    		$objp = $db->fetch_object($result);
+	dol_syslog("Search members", LOG_DEBUG);
+	$result = $db->query($sql);
+	if ($result) {
+		$num = $db->num_rows($result);
+		$i = 0;
+		while ($i < $num) {
+			$objp = $db->fetch_object($result);
 
-    		if ($objp->country == '-') $objp->country = '';
+			if ($objp->country == '-') $objp->country = '';
 
-    		$adherentstatic->id = $objp->rowid;
-    		$adherentstatic->lastname = $objp->lastname;
-    		$adherentstatic->firstname = $objp->firstname;
+			$adherentstatic->id = $objp->rowid;
+			$adherentstatic->lastname = $objp->lastname;
+			$adherentstatic->firstname = $objp->firstname;
 
-            // Format extrafield so they can be parsed in function complete_substitutions_array
-    		if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
-                $adherentstatic->array_options = array();
-                foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
-                    $tmpkey = 'options_'.$key;
-                    if (!empty($objp->$tmpkey)) {
-                        $adherentstatic->array_options[$tmpkey] = $objp->$tmpkey;
-                    }
-                    //if (!empty($objp->$key))
-                    //    $objp->array_options[$tmpkey] = $objp->$key;
-                    //$objp->array_options[$tmpkey] = $extrafields->showOutputField($key, $objp->$tmpkey, '', 1); //$objp->$tmpkey;
-                }
-            }
+			// Format extrafield so they can be parsed in function complete_substitutions_array
+			if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
+				$adherentstatic->array_options = array();
+				foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
+					$tmpkey = 'options_'.$key;
+					if (!empty($objp->$tmpkey)) {
+						$adherentstatic->array_options[$tmpkey] = $objp->$tmpkey;
+					}
+					//if (!empty($objp->$key))
+					//    $objp->array_options[$tmpkey] = $objp->$key;
+					//$objp->array_options[$tmpkey] = $extrafields->showOutputField($key, $objp->$tmpkey, '', 1); //$objp->$tmpkey;
+				}
+			}
 
-    		// List of values to scan for a replacement
-            $substitutionarray = array(
-                '__ID__'=>$objp->rowid,
-                '__LOGIN__'=>$objp->login,
-                '__FIRSTNAME__'=>$objp->firstname,
-                '__LASTNAME__'=>$objp->lastname,
-                '__FULLNAME__'=>$adherentstatic->getFullName($langs),
-                '__COMPANY__'=>$objp->company,
-                '__ADDRESS__'=>$objp->address,
-                '__ZIP__'=>$objp->zip,
-                '__TOWN__'=>$objp->town,
-                '__COUNTRY__'=>$objp->country,
-                '__COUNTRY_CODE__'=>$objp->country_code,
-                '__EMAIL__'=>$objp->email,
-                '__BIRTH__'=>dol_print_date($objp->birth, 'day'),
-                '__TYPE__'=>$objp->type,
-                '__YEAR__'=>$year,
-                '__MONTH__'=>$month,
-                '__DAY__'=>$day,
-                '__DOL_MAIN_URL_ROOT__'=>DOL_MAIN_URL_ROOT,
-                '__SERVER__'=>"http://".$_SERVER["SERVER_NAME"]."/"
-            );
-            complete_substitutions_array($substitutionarray, $langs, $adherentstatic);
+			// List of values to scan for a replacement
+			$substitutionarray = array(
+				'__ID__'=>$objp->rowid,
+				'__LOGIN__'=>$objp->login,
+				'__FIRSTNAME__'=>$objp->firstname,
+				'__LASTNAME__'=>$objp->lastname,
+				'__FULLNAME__'=>$adherentstatic->getFullName($langs),
+				'__COMPANY__'=>$objp->company,
+				'__ADDRESS__'=>$objp->address,
+				'__ZIP__'=>$objp->zip,
+				'__TOWN__'=>$objp->town,
+				'__COUNTRY__'=>$objp->country,
+				'__COUNTRY_CODE__'=>$objp->country_code,
+				'__EMAIL__'=>$objp->email,
+				'__BIRTH__'=>dol_print_date($objp->birth, 'day'),
+				'__TYPE__'=>$objp->type,
+				'__YEAR__'=>$year,
+				'__MONTH__'=>$month,
+				'__DAY__'=>$day,
+				'__DOL_MAIN_URL_ROOT__'=>DOL_MAIN_URL_ROOT,
+				'__SERVER__'=>"http://".$_SERVER["SERVER_NAME"]."/"
+			);
+			complete_substitutions_array($substitutionarray, $langs, $adherentstatic);
 
-            // For business cards
-            if (empty($mode) || $mode == 'card' || $mode == 'cardlogin') {
-                $textleft = make_substitutions($conf->global->ADHERENT_CARD_TEXT, $substitutionarray);
-                $textheader = make_substitutions($conf->global->ADHERENT_CARD_HEADER_TEXT, $substitutionarray);
-                $textfooter = make_substitutions($conf->global->ADHERENT_CARD_FOOTER_TEXT, $substitutionarray);
-                $textright = make_substitutions($conf->global->ADHERENT_CARD_TEXT_RIGHT, $substitutionarray);
+			// For business cards
+			if (empty($mode) || $mode == 'card' || $mode == 'cardlogin') {
+				$textleft = make_substitutions($conf->global->ADHERENT_CARD_TEXT, $substitutionarray);
+				$textheader = make_substitutions($conf->global->ADHERENT_CARD_HEADER_TEXT, $substitutionarray);
+				$textfooter = make_substitutions($conf->global->ADHERENT_CARD_FOOTER_TEXT, $substitutionarray);
+				$textright = make_substitutions($conf->global->ADHERENT_CARD_TEXT_RIGHT, $substitutionarray);
 
-                if (is_numeric($foruserid) || $foruserlogin) {
-                    $nb = $_Avery_Labels[$model]['NX'] * $_Avery_Labels[$model]['NY'];
-                    if ($nb <= 0) $nb = 1; // Protection to avoid empty page
+				if (is_numeric($foruserid) || $foruserlogin) {
+					$nb = $_Avery_Labels[$model]['NX'] * $_Avery_Labels[$model]['NY'];
+					if ($nb <= 0) $nb = 1; // Protection to avoid empty page
 
-                    for ($j = 0; $j < $nb; $j++) {
-                        $arrayofmembers[] = array(
-                        	'textleft'=>$textleft,
-                            'textheader'=>$textheader,
-                            'textfooter'=>$textfooter,
-                            'textright'=>$textright,
-                            'id'=>$objp->rowid,
-                            'photo'=>$objp->photo
-                        );
-                    }
-                } else {
-                    $arrayofmembers[] = array(
-                        'textleft'=>$textleft,
-                        'textheader'=>$textheader,
-                        'textfooter'=>$textfooter,
-                        'textright'=>$textright,
-                        'id'=>$objp->rowid,
-                        'photo'=>$objp->photo
-                    );
-                }
-            }
+					for ($j = 0; $j < $nb; $j++) {
+						$arrayofmembers[] = array(
+							'textleft'=>$textleft,
+							'textheader'=>$textheader,
+							'textfooter'=>$textfooter,
+							'textright'=>$textright,
+							'id'=>$objp->rowid,
+							'photo'=>$objp->photo
+						);
+					}
+				} else {
+					$arrayofmembers[] = array(
+						'textleft'=>$textleft,
+						'textheader'=>$textheader,
+						'textfooter'=>$textfooter,
+						'textright'=>$textright,
+						'id'=>$objp->rowid,
+						'photo'=>$objp->photo
+					);
+				}
+			}
 
-            // For labels
-            if ($mode == 'label') {
-            	if (empty($conf->global->ADHERENT_ETIQUETTE_TEXT)) $conf->global->ADHERENT_ETIQUETTE_TEXT = "__FULLNAME__\n__ADDRESS__\n__ZIP__ __TOWN__\n__COUNTRY__";
-                $textleft = make_substitutions($conf->global->ADHERENT_ETIQUETTE_TEXT, $substitutionarray);
-                $textheader = '';
-                $textfooter = '';
-                $textright = '';
+			// For labels
+			if ($mode == 'label') {
+				if (empty($conf->global->ADHERENT_ETIQUETTE_TEXT)) $conf->global->ADHERENT_ETIQUETTE_TEXT = "__FULLNAME__\n__ADDRESS__\n__ZIP__ __TOWN__\n__COUNTRY__";
+				$textleft = make_substitutions($conf->global->ADHERENT_ETIQUETTE_TEXT, $substitutionarray);
+				$textheader = '';
+				$textfooter = '';
+				$textright = '';
 
-                $arrayofmembers[] = array('textleft'=>$textleft,
-                                        'textheader'=>$textheader,
-                                        'textfooter'=>$textfooter,
-                                        'textright'=>$textright,
-                                        'id'=>$objp->rowid,
-                                        'photo'=>$objp->photo);
-            }
+				$arrayofmembers[] = array('textleft'=>$textleft,
+										'textheader'=>$textheader,
+										'textfooter'=>$textfooter,
+										'textright'=>$textright,
+										'id'=>$objp->rowid,
+										'photo'=>$objp->photo);
+			}
 
-            $i++;
-    	}
+			$i++;
+		}
 
-    	// Build and output PDF
-        if (empty($mode) || $mode == 'card' || $mode == 'cardlogin') {
-            if (!count($arrayofmembers)) {
-                $mesg = $langs->trans("ErrorRecordNotFound");
-            }
-            if (empty($model) || $model == '-1') {
-            	$mesg = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("DescADHERENT_CARD_TYPE"));
-            }
-            if (!$mesg) $result = members_card_pdf_create($db, $arrayofmembers, $model, $outputlangs);
-        } elseif ($mode == 'label') {
-            if (!count($arrayofmembers)) {
-                $mesg = $langs->trans("ErrorRecordNotFound");
-            }
-        	if (empty($modellabel) || $modellabel == '-1') {
-    			$mesg = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("DescADHERENT_ETIQUETTE_TYPE"));
-    		}
-        	if (!$mesg) $result = doc_label_pdf_create($db, $arrayofmembers, $modellabel, $outputlangs);
-        }
+		// Build and output PDF
+		if (empty($mode) || $mode == 'card' || $mode == 'cardlogin') {
+			if (!count($arrayofmembers)) {
+				$mesg = $langs->trans("ErrorRecordNotFound");
+			}
+			if (empty($model) || $model == '-1') {
+				$mesg = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("DescADHERENT_CARD_TYPE"));
+			}
+			if (!$mesg) $result = members_card_pdf_create($db, $arrayofmembers, $model, $outputlangs);
+		} elseif ($mode == 'label') {
+			if (!count($arrayofmembers)) {
+				$mesg = $langs->trans("ErrorRecordNotFound");
+			}
+			if (empty($modellabel) || $modellabel == '-1') {
+				$mesg = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("DescADHERENT_ETIQUETTE_TYPE"));
+			}
+			if (!$mesg) $result = doc_label_pdf_create($db, $arrayofmembers, $modellabel, $outputlangs);
+		}
 
-    	if ($result <= 0) {
-    		dol_print_error('', $result);
-    	}
-    } else {
-    	dol_print_error($db);
-    }
+		if ($result <= 0) {
+			dol_print_error('', $result);
+		}
+	} else {
+		dol_print_error($db);
+	}
 
-    if (!$mesg) {
-    	$db->close();
-    	exit;
-    }
+	if (!$mesg) {
+		$db->close();
+		exit;
+	}
 }
 
 
diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index 3f128ab9c5a..a8cb095a889 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -7,7 +7,7 @@
  * Copyright (C) 2009-2017	Regis Houssin			<regis.houssin@inodbox.com>
  * Copyright (C) 2014-2018	Alexandre Spangaro		<aspangaro@open-dsi.fr>
  * Copyright (C) 2015		Marcos García			<marcosgdf@gmail.com>
- * Copyright (C) 2015-2018	Frédéric France			<frederic.france@netlogic.fr>
+ * Copyright (C) 2015-2020	Frédéric France			<frederic.france@netlogic.fr>
  * Copyright (C) 2015		Raphaël Doursenaud		<rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2016		Juanjo Menent			<jmenent@2byte.es>
  * Copyright (C) 2018-2019	Thibault FOUCART		<support@ptibogxiv.net>
@@ -60,6 +60,9 @@ class Adherent extends CommonObject
 	 */
 	public $ismultientitymanaged = 1;
 
+	/**
+	 * @var string picto
+	 */
 	public $picto = 'member';
 
 
@@ -70,13 +73,19 @@ class Adherent extends CommonObject
 	 */
 	public $login;
 
-	//! Clear password in memory
+	/**
+	 * @var string Clear password in memory
+	 */
 	public $pass;
 
-	//! Clear password in database (defined if DATABASE_PWD_ENCRYPTED=0)
+	/**
+	  * @var string Clear password in database (defined if DATABASE_PWD_ENCRYPTED=0)
+	  */
 	public $pass_indatabase;
 
-	//! Encrypted password in database (always defined)
+	/**
+	 * @var string Encrypted password in database (always defined)
+	 */
 	public $pass_indatabase_crypted;
 
 	/**
@@ -169,6 +178,11 @@ class Adherent extends CommonObject
 	 */
 	public $phone_perso;
 
+	/**
+	 * @var string Professional Phone number
+	 */
+	public $phone_pro;
+
 	/**
 	 * @var string Mobile phone number
 	 */
@@ -184,6 +198,9 @@ class Adherent extends CommonObject
 	 */
 	public $poste;
 
+	/**
+	 * @var string mor or phy
+	 */
 	public $morphy;
 
 	public $public;
@@ -191,6 +208,10 @@ class Adherent extends CommonObject
 	// -1:brouillon, 0:resilie, >=1:valide,paye
 	// def in common object
 	//public $status;
+
+	/**
+	 * @var string photo of member
+	 */
 	public $photo;
 
 	/**
@@ -209,6 +230,9 @@ class Adherent extends CommonObject
 
 	public $datevalid;
 
+	/**
+	 * @var string gender
+	 */
 	public $gender;
 
 	public $birth;
@@ -258,7 +282,11 @@ class Adherent extends CommonObject
 	 */
 	public $entity;
 
-	public $fields = array('rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 10),
+	/**
+	 * @var array fields
+	 */
+	public $fields = array(
+		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 10),
 		'entity' => array('type' => 'integer', 'label' => 'Entity', 'default' => 1, 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 15, 'index' => 1),
 		'ref_ext' => array('type' => 'varchar(128)', 'label' => 'Ref ext', 'enabled' => 1, 'visible' => 0, 'position' => 20),
 		'civility' => array('type' => 'varchar(6)', 'label' => 'Civility', 'enabled' => 1, 'visible' => -1, 'position' => 25),
@@ -296,9 +324,10 @@ class Adherent extends CommonObject
 		'fk_user_valid' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserValidation', 'enabled' => 1, 'visible' => -1, 'position' => 190),
 		'canvas' => array('type' => 'varchar(32)', 'label' => 'Canvas', 'enabled' => 1, 'visible' => -1, 'position' => 195),
 		'statut' => array('type' => 'smallint(6)', 'label' => 'Statut', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 500,
-			'arrayofkeyval' => array(0 => 'Draft', 1 => 'Validated', -1 => 'MemberStatusResiliatedShort')),
+		'arrayofkeyval' => array(0 => 'Draft', 1 => 'Validated', -1 => 'MemberStatusResiliatedShort')),
 		'model_pdf' => array('type' => 'varchar(255)', 'label' => 'Model pdf', 'enabled' => 1, 'visible' => 0, 'position' => 800),
-		'import_key' => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => 1, 'visible' => -2, 'position' => 805));
+		'import_key' => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => 1, 'visible' => -2, 'position' => 805)
+	);
 
 
 	/**
@@ -407,7 +436,8 @@ class Adherent extends CommonObject
 		$infos .= $langs->transnoentities("Public").": ".yn($this->public);
 
 		// Substitutions
-		$substitutionarray = array('__ID__' => $this->id, '__MEMBER_ID__' => $this->id, '__CIVILITY__' => $this->getCivilityLabel(),
+		$substitutionarray = array(
+			'__ID__' => $this->id, '__MEMBER_ID__' => $this->id, '__CIVILITY__' => $this->getCivilityLabel(),
 			'__FIRSTNAME__' => $msgishtml ? dol_htmlentitiesbr($this->firstname) : ($this->firstname ? $this->firstname : ''),
 			'__LASTNAME__' => $msgishtml ? dol_htmlentitiesbr($this->lastname) : ($this->lastname ? $this->lastname : ''),
 			'__FULLNAME__' => $msgishtml ? dol_htmlentitiesbr($this->getFullName($langs)) : $this->getFullName($langs),
@@ -422,7 +452,8 @@ class Adherent extends CommonObject
 			'__PHONE__' => $msgishtml ? dol_htmlentitiesbr($this->phone) : ($this->phone ? $this->phone : ''),
 			'__PHONEPRO__' => $msgishtml ? dol_htmlentitiesbr($this->phone_perso) : ($this->phone_perso ? $this->phone_perso : ''),
 			'__PHONEMOBILE__' => $msgishtml ? dol_htmlentitiesbr($this->phone_mobile) : ($this->phone_mobile ? $this->phone_mobile : ''),
-			'__TYPE__' => $msgishtml ? dol_htmlentitiesbr($this->type) : ($this->type ? $this->type : ''));
+			'__TYPE__' => $msgishtml ? dol_htmlentitiesbr($this->type) : ($this->type ? $this->type : '')
+		);
 
 		complete_substitutions_array($substitutionarray, $langs, $this);
 
@@ -589,8 +620,7 @@ class Adherent extends CommonObject
 		$this->town = ($this->town ? $this->town : $this->town);
 		$this->country_id = ($this->country_id > 0 ? $this->country_id : $this->country_id);
 		$this->state_id = ($this->state_id > 0 ? $this->state_id : $this->state_id);
-		if (!empty($conf->global->MAIN_FIRST_TO_UPPER)) $this->lastname = ucwords(trim($this->lastname));
-		if (!empty($conf->global->MAIN_FIRST_TO_UPPER)) $this->firstname = ucwords(trim($this->firstname));
+		$this->setUpperOrLowerCase();
 		$this->note_public = ($this->note_public ? $this->note_public : $this->note_public);
 		$this->note_private = ($this->note_private ? $this->note_private : $this->note_private);
 
@@ -1983,7 +2013,8 @@ class Adherent extends CommonObject
 		}
 
 		$label .= '<div class="centpercent">';
-		$label .= '<u>'.$langs->trans("Member").'</u>';
+		$label .= img_picto('', $this->picto).' <u class="paddingrightonly">'.$langs->trans("Member").'</u>';
+		$label .= ' '.$this->getLibStatut(4);
 		if (!empty($this->ref)) $label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
 		if (!empty($this->firstname) || !empty($this->lastname)) $label .= '<br><b>'.$langs->trans('Name').':</b> '.$this->getFullName($langs);
 		if (!empty($this->company)) $label .= '<br><b>'.$langs->trans('Company').':</b> '.$this->company;
diff --git a/htdocs/adherents/class/adherent_type.class.php b/htdocs/adherents/class/adherent_type.class.php
index 94bf34208ff..b5c701f2ad4 100644
--- a/htdocs/adherents/class/adherent_type.class.php
+++ b/htdocs/adherents/class/adherent_type.class.php
@@ -85,7 +85,6 @@ class AdherentType extends CommonObject
 
 	/**
 	 * @var int Subsription required (0 or 1)
-	 * @since 5.0
 	 */
 	public $subscription;
 
@@ -95,9 +94,15 @@ class AdherentType extends CommonObject
 	/** @var integer	Can vote */
 	public $vote;
 
-	/** @var string Email sent during validation */
+	/** @var string Email sent during validation of member */
 	public $mail_valid;
 
+	/** @var string Email sent after recording a new subscription */
+	public $mail_subscription = '';
+
+	/** @var string Email sent after resiliation */
+	public $mail_resiliate = '';
+
 	/** @var array Array of members */
 	public $members = array();
 
@@ -116,7 +121,7 @@ class AdherentType extends CommonObject
 	}
 
 	/**
-	 *    Load array this->multilangs
+	 * Load array this->multilangs
 	 *
 	 * @return int        <0 if KO, >0 if OK
 	 */
@@ -151,7 +156,7 @@ class AdherentType extends CommonObject
 	}
 
 	/**
-	 *    Update or add a translation for a product
+	 * Update or add a translation for this member type
 	 *
 	 * @param  User $user Object user making update
 	 * @return int        <0 if KO, >0 if OK
@@ -236,12 +241,11 @@ class AdherentType extends CommonObject
 	}
 
 	   /**
-	    *    Delete a language for this product
+	    * Delete a language for this member type
 	    *
-	    * @param string $langtodelete Language code to delete
-	    * @param User   $user         Object user making delete
-	    *
-	    * @return int                            <0 if KO, >0 if OK
+	    * @param string $langtodelete 	Language code to delete
+	    * @param User   $user         	Object user making delete
+	    * @return int                   <0 if KO, >0 if OK
 	    */
 	public function delMultiLangs($langtodelete, $user)
 	{
@@ -268,9 +272,9 @@ class AdherentType extends CommonObject
 	}
 
 	/**
-	 *  Fonction qui permet de creer le status de l'adherent
+	 *  Function to create the member type
 	 *
-	 *  @param	User		$user			User making creation
+	 *  @param	User	$user			User making creation
 	 *  @param	int		$notrigger		1=do not execute triggers, 0 otherwise
 	 *  @return	int						>0 if OK, < 0 if KO
 	 */
@@ -574,7 +578,7 @@ class AdherentType extends CommonObject
 	public function getmorphylib($morphy = '')
 	{
 		global $langs;
-		if ($morphy == 'phy') { return $langs->trans("Physical"); } elseif ($morphy == 'mor') { return $langs->trans("Moral"); } else return $langs->trans("MorPhy");
+		if ($morphy == 'phy') { return $langs->trans("Physical"); } elseif ($morphy == 'mor') { return $langs->trans("Moral"); } else return $langs->trans("MorAndPhy");
 		//return $morphy;
 	}
 
@@ -591,7 +595,15 @@ class AdherentType extends CommonObject
 		global $langs;
 
 		$result = '';
-		$label = $langs->trans("ShowTypeCard", $this->label);
+
+		$label = '';
+
+		$label = img_picto('', $this->picto).' <u class="paddingrightonly">'.$langs->trans("MemberType").'</u>';
+		$label .= ' '.$this->getLibStatut(4);
+		$label .= '<br>'.$langs->trans("Label").': '.$this->label;
+		if (isset($this->subscription)) {
+			$label .= '<br>'.$langs->trans("SubscriptionRequired").': '.yn($this->subscription);
+		}
 
 		$linkstart = '<a href="'.DOL_URL_ROOT.'/adherents/type.php?rowid='.$this->id.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
 		$linkend = '</a>';
@@ -707,7 +719,7 @@ class AdherentType extends CommonObject
 	 */
 	public function initAsSpecimen()
 	{
-		global $conf, $user, $langs;
+		global $user;
 
 		// Initialise parametres
 		$this->id = 0;
@@ -735,8 +747,6 @@ class AdherentType extends CommonObject
 	 */
 	public function getMailOnValid()
 	{
-		global $conf;
-
 		if (!empty($this->mail_valid) && trim(dol_htmlentitiesbr_decode($this->mail_valid))) {
 			return $this->mail_valid;
 		}
@@ -751,8 +761,6 @@ class AdherentType extends CommonObject
 	 */
 	public function getMailOnSubscription()
 	{
-		global $conf;
-
 		// mail_subscription not  defined so never used
 		if (!empty($this->mail_subscription) && trim(dol_htmlentitiesbr_decode($this->mail_subscription))) {  // Property not yet defined
 			return $this->mail_subscription;
@@ -768,8 +776,6 @@ class AdherentType extends CommonObject
 	 */
 	public function getMailOnResiliate()
 	{
-		global $conf;
-
 		// NOTE mail_resiliate not defined so never used
 		if (!empty($this->mail_resiliate) && trim(dol_htmlentitiesbr_decode($this->mail_resiliate))) {  // Property not yet defined
 			return $this->mail_resiliate;
diff --git a/htdocs/adherents/class/adherentstats.class.php b/htdocs/adherents/class/adherentstats.class.php
index d86a9e21d8c..62d0e03e27e 100644
--- a/htdocs/adherents/class/adherentstats.class.php
+++ b/htdocs/adherents/class/adherentstats.class.php
@@ -32,18 +32,18 @@ include_once DOL_DOCUMENT_ROOT.'/adherents/class/subscription.class.php';
  */
 class AdherentStats extends Stats
 {
-    /**
-     * @var string Name of table without prefix where object is stored
-     */
-    public $table_element;
+	/**
+	 * @var string Name of table without prefix where object is stored
+	 */
+	public $table_element;
 
-    public $memberid;
-    public $socid;
-    public $userid;
+	public $memberid;
+	public $socid;
+	public $userid;
 
-    public $from;
-    public $field;
-    public $where;
+	public $from;
+	public $field;
+	public $where;
 
 
 	/**
@@ -51,15 +51,15 @@ class AdherentStats extends Stats
 	 *
 	 *	@param 		DoliDB		$db			Database handler
 	 * 	@param 		int			$socid	   	Id third party
-     * 	@param   	int			$userid    	Id user for filter
+	 * 	@param   	int			$userid    	Id user for filter
 	 */
 	public function __construct($db, $socid = 0, $userid = 0)
 	{
 		global $user, $conf;
 
 		$this->db = $db;
-        $this->socid = $socid;
-        $this->userid = $userid;
+		$this->socid = $socid;
+		$this->userid = $userid;
 
 		$object = new Subscription($this->db);
 
@@ -74,16 +74,16 @@ class AdherentStats extends Stats
 		if ($this->memberid) {
 			$this->where .= " AND m.rowid = ".$this->memberid;
 		}
-        //if ($this->userid > 0) $this->where.=' AND fk_user_author = '.$this->userid;
+		//if ($this->userid > 0) $this->where.=' AND fk_user_author = '.$this->userid;
 	}
 
 
 	/**
 	 * Return the number of proposition by month for a given year
 	 *
-     * @param   int		$year       Year
-     *	@param	int		$format		0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
-     * @return	array				Array of nb each month
+	 * @param   int		$year       Year
+	 *	@param	int		$format		0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
+	 * @return	array				Array of nb each month
 	 */
 	public function getNbByMonth($year, $format = 0)
 	{
@@ -95,7 +95,7 @@ class AdherentStats extends Stats
 		$sql .= " WHERE date_format(p.dateadh,'%Y') = ".((int) $year);
 		$sql .= " AND ".$this->where;
 		$sql .= " GROUP BY dm";
-        $sql .= $this->db->order('dm', 'DESC');
+		$sql .= $this->db->order('dm', 'DESC');
 
 		return $this->_getNbByMonth($year, $sql, $format);
 	}
@@ -103,7 +103,7 @@ class AdherentStats extends Stats
 	/**
 	 * Return the number of subscriptions by year
 	 *
-     * @return	array				Array of nb each year
+	 * @return	array				Array of nb each year
 	 */
 	public function getNbByYear()
 	{
@@ -114,7 +114,7 @@ class AdherentStats extends Stats
 		//if (!$user->rights->societe->client->voir && !$user->socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		$sql .= " WHERE ".$this->where;
 		$sql .= " GROUP BY dm";
-        $sql .= $this->db->order('dm', 'DESC');
+		$sql .= $this->db->order('dm', 'DESC');
 
 		return $this->_getNbByYear($sql);
 	}
@@ -122,9 +122,9 @@ class AdherentStats extends Stats
 	/**
 	 * Return the number of subscriptions by month for a given year
 	 *
-     * @param   int		$year       Year
-     * @param	int		$format		0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
-     * @return	array				Array of amount each month
+	 * @param   int		$year       Year
+	 * @param	int		$format		0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
+	 * @return	array				Array of amount each month
 	 */
 	public function getAmountByMonth($year, $format = 0)
 	{
@@ -136,7 +136,7 @@ class AdherentStats extends Stats
 		$sql .= " WHERE date_format(p.dateadh,'%Y') = ".((int) $year);
 		$sql .= " AND ".$this->where;
 		$sql .= " GROUP BY dm";
-        $sql .= $this->db->order('dm', 'DESC');
+		$sql .= $this->db->order('dm', 'DESC');
 
 		return $this->_getAmountByMonth($year, $sql, $format);
 	}
@@ -144,8 +144,8 @@ class AdherentStats extends Stats
 	/**
 	 * Return average amount each month
 	 *
-     * @param   int		$year       Year
-     * @return	array				Array of average each month
+	 * @param   int		$year       Year
+	 * @return	array				Array of average each month
 	 */
 	public function getAverageByMonth($year)
 	{
@@ -157,7 +157,7 @@ class AdherentStats extends Stats
 		$sql .= " WHERE date_format(p.dateadh,'%Y') = ".((int) $year);
 		$sql .= " AND ".$this->where;
 		$sql .= " GROUP BY dm";
-        $sql .= $this->db->order('dm', 'DESC');
+		$sql .= $this->db->order('dm', 'DESC');
 
 		return $this->_getAverageByMonth($year, $sql);
 	}
@@ -177,7 +177,7 @@ class AdherentStats extends Stats
 		//if (!$user->rights->societe->client->voir && !$this->socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		$sql .= " WHERE ".$this->where;
 		$sql .= " GROUP BY year";
-        $sql .= $this->db->order('year', 'DESC');
+		$sql .= $this->db->order('year', 'DESC');
 
 		return $this->_getAllByYear($sql);
 	}
diff --git a/htdocs/adherents/class/api_members.class.php b/htdocs/adherents/class/api_members.class.php
index 230b839f726..954ea42f9b4 100644
--- a/htdocs/adherents/class/api_members.class.php
+++ b/htdocs/adherents/class/api_members.class.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2016	Xebax Christy	<xebax@wanadoo.fr>
  * Copyright (C) 2017	Regis Houssin	<regis.houssin@inodbox.com>
  * Copyright (C) 2020	Thibault FOUCART<support@ptibogxiv.net>
+ * Copyright (C) 2020		Frédéric France		<frederic.france@netlogic.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -32,477 +33,477 @@ require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
  */
 class Members extends DolibarrApi
 {
-    /**
-     * @var array   $FIELDS     Mandatory fields, checked when create and update object
-     */
-    static $FIELDS = array(
-        'morphy',
-        'typeid'
-    );
+	/**
+	 * @var array   $FIELDS     Mandatory fields, checked when create and update object
+	 */
+	static $FIELDS = array(
+		'morphy',
+		'typeid'
+	);
 
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-        global $db, $conf;
-        $this->db = $db;
-    }
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		global $db, $conf;
+		$this->db = $db;
+	}
 
-    /**
-     * Get properties of a member object
-     *
-     * Return an array with member informations
-     *
-     * @param     int     $id ID of member
-     * @return    array|mixed data without useless information
-     *
-     * @throws    RestException
-     */
-    public function get($id)
-    {
-        if (!DolibarrApiAccess::$user->rights->adherent->lire) {
-            throw new RestException(401);
-        }
+	/**
+	 * Get properties of a member object
+	 *
+	 * Return an array with member informations
+	 *
+	 * @param     int     $id ID of member
+	 * @return    array|mixed data without useless information
+	 *
+	 * @throws    RestException
+	 */
+	public function get($id)
+	{
+		if (!DolibarrApiAccess::$user->rights->adherent->lire) {
+			throw new RestException(401);
+		}
 
-        $member = new Adherent($this->db);
-        $result = $member->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'member not found');
-        }
+		$member = new Adherent($this->db);
+		$result = $member->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'member not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('adherent', $member->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('adherent', $member->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        return $this->_cleanObjectDatas($member);
-    }
+		return $this->_cleanObjectDatas($member);
+	}
 
-    /**
-     * Get properties of a member object by linked thirdparty
-     *
-     * Return an array with member informations
-     *
-     * @param     int     $thirdparty ID of third party
-     *
-     * @return array|mixed Data without useless information
-     *
-     * @url GET thirdparty/{thirdparty}
-     *
-     * @throws RestException 401
-     * @throws RestException 404
-     */
-    public function getByThirdparty($thirdparty)
-    {
-        if (! DolibarrApiAccess::$user->rights->adherent->lire) {
-            throw new RestException(401);
-        }
+	/**
+	 * Get properties of a member object by linked thirdparty
+	 *
+	 * Return an array with member informations
+	 *
+	 * @param     int     $thirdparty 	ID of third party
+	 *
+	 * @return Object 					Data without useless information
+	 *
+	 * @url GET thirdparty/{thirdparty}
+	 *
+	 * @throws RestException 401
+	 * @throws RestException 404
+	 */
+	public function getByThirdparty($thirdparty)
+	{
+		if (!DolibarrApiAccess::$user->rights->adherent->lire) {
+			throw new RestException(401);
+		}
 
-        $member = new Adherent($this->db);
-        $result = $member->fetch('', '', $thirdparty);
-        if ( ! $result ) {
-            throw new RestException(404, 'member not found');
-        }
+		$member = new Adherent($this->db);
+		$result = $member->fetch('', '', $thirdparty);
+		if (!$result) {
+			throw new RestException(404, 'member not found');
+		}
 
-        if ( ! DolibarrApi::_checkAccessToResource('adherent', $member->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('adherent', $member->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        return $this->_cleanObjectDatas($member);
-    }
+		return $this->_cleanObjectDatas($member);
+	}
 
-    /**
-     * Get properties of a member object by linked thirdparty email
-     *
-     * Return an array with member informations
-     *
-     * @param  string $email            Email of third party
-     *
-     * @return array|mixed Data without useless information
-     *
-     * @url GET thirdparty/email/{email}
-     *
-     * @throws RestException 401
-     * @throws RestException 404
-     */
-    public function getByThirdpartyEmail($email)
-    {
-        if (! DolibarrApiAccess::$user->rights->adherent->lire) {
-            throw new RestException(401);
-        }
+	/**
+	 * Get properties of a member object by linked thirdparty email
+	 *
+	 * Return an array with member informations
+	 *
+	 * @param  string $email            Email of third party
+	 *
+	 * @return Object 					Data without useless information
+	 *
+	 * @url GET thirdparty/email/{email}
+	 *
+	 * @throws RestException 401
+	 * @throws RestException 404
+	 */
+	public function getByThirdpartyEmail($email)
+	{
+		if (!DolibarrApiAccess::$user->rights->adherent->lire) {
+			throw new RestException(401);
+		}
 
-        $thirdparty = new Societe($this->db);
-        $result = $thirdparty->fetch('', '', '', '', '', '', '', '', '', '', $email);
-        if ( ! $result ) {
-            throw new RestException(404, 'thirdparty not found');
-        }
+		$thirdparty = new Societe($this->db);
+		$result = $thirdparty->fetch('', '', '', '', '', '', '', '', '', '', $email);
+		if (!$result) {
+			throw new RestException(404, 'thirdparty not found');
+		}
 
-        $member = new Adherent($this->db);
-        $result = $member->fetch('', '', $thirdparty->id);
-        if ( ! $result ) {
-            throw new RestException(404, 'member not found');
-        }
+		$member = new Adherent($this->db);
+		$result = $member->fetch('', '', $thirdparty->id);
+		if (!$result) {
+			throw new RestException(404, 'member not found');
+		}
 
-        if ( ! DolibarrApi::_checkAccessToResource('adherent', $member->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('adherent', $member->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        return $this->_cleanObjectDatas($member);
-    }
+		return $this->_cleanObjectDatas($member);
+	}
 
-    /**
-     * Get properties of a member object by linked thirdparty barcode
-     *
-     * Return an array with member informations
-     *
-     * @param  string $barcode            Barcode of third party
-     *
-     * @return array|mixed Data without useless information
-     *
-     * @url GET thirdparty/barcode/{barcode}
-     *
-     * @throws RestException 401
-     * @throws RestException 404
-     */
-    public function getByThirdpartyBarcode($barcode)
-    {
-        if (! DolibarrApiAccess::$user->rights->adherent->lire) {
-            throw new RestException(401);
-        }
+	/**
+	 * Get properties of a member object by linked thirdparty barcode
+	 *
+	 * Return an array with member informations
+	 *
+	 * @param  string $barcode      	Barcode of third party
+	 *
+	 * @return Object 					Data without useless information
+	 *
+	 * @url GET thirdparty/barcode/{barcode}
+	 *
+	 * @throws RestException 401
+	 * @throws RestException 404
+	 */
+	public function getByThirdpartyBarcode($barcode)
+	{
+		if (!DolibarrApiAccess::$user->rights->adherent->lire) {
+			throw new RestException(401);
+		}
 
-        $thirdparty = new Societe($this->db);
-        $result = $thirdparty->fetch('', '', '', $barcode);
-        if ( ! $result ) {
-            throw new RestException(404, 'thirdparty not found');
-        }
+		$thirdparty = new Societe($this->db);
+		$result = $thirdparty->fetch('', '', '', $barcode);
+		if (!$result) {
+			throw new RestException(404, 'thirdparty not found');
+		}
 
-        $member = new Adherent($this->db);
-        $result = $member->fetch('', '', $thirdparty->id);
-        if ( ! $result ) {
-            throw new RestException(404, 'member not found');
-        }
+		$member = new Adherent($this->db);
+		$result = $member->fetch('', '', $thirdparty->id);
+		if (!$result) {
+			throw new RestException(404, 'member not found');
+		}
 
-        if ( ! DolibarrApi::_checkAccessToResource('adherent', $member->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('adherent', $member->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        return $this->_cleanObjectDatas($member);
-    }
+		return $this->_cleanObjectDatas($member);
+	}
 
-    /**
-     * List members
-     *
-     * Get a list of members
-     *
-     * @param string    $sortfield  Sort field
-     * @param string    $sortorder  Sort order
-     * @param int       $limit      Limit for list
-     * @param int       $page       Page number
-     * @param string    $typeid     ID of the type of member
+	/**
+	 * List members
+	 *
+	 * Get a list of members
+	 *
+	 * @param string    $sortfield  Sort field
+	 * @param string    $sortorder  Sort order
+	 * @param int       $limit      Limit for list
+	 * @param int       $page       Page number
+	 * @param string    $typeid     ID of the type of member
 	 * @param  int    $category   Use this param to filter list by category
-     * @param string    $sqlfilters Other criteria to filter answers separated by a comma.
-     *                              Example: "(t.ref:like:'SO-%') and ((t.date_creation:<:'20160101') or (t.nature:is:NULL))"
-     * @return array                Array of member objects
-     *
-     * @throws RestException
-     */
-    public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $typeid = '', $category = 0, $sqlfilters = '')
-    {
-        global $db, $conf;
+	 * @param string    $sqlfilters Other criteria to filter answers separated by a comma.
+	 *                              Example: "(t.ref:like:'SO-%') and ((t.date_creation:<:'20160101') or (t.nature:is:NULL))"
+	 * @return array                Array of member objects
+	 *
+	 * @throws RestException
+	 */
+	public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $typeid = '', $category = 0, $sqlfilters = '')
+	{
+		global $db, $conf;
 
-        $obj_ret = array();
+		$obj_ret = array();
 
-        if (!DolibarrApiAccess::$user->rights->adherent->lire) {
-            throw new RestException(401);
-        }
+		if (!DolibarrApiAccess::$user->rights->adherent->lire) {
+			throw new RestException(401);
+		}
 
-        $sql = "SELECT t.rowid";
-        $sql .= " FROM ".MAIN_DB_PREFIX."adherent as t";
-    	if ($category > 0) {
+		$sql = "SELECT t.rowid";
+		$sql .= " FROM ".MAIN_DB_PREFIX."adherent as t";
+		if ($category > 0) {
 			$sql .= ", ".MAIN_DB_PREFIX."categorie_member as c";
-    	}
-        $sql .= ' WHERE t.entity IN ('.getEntity('adherent').')';
-        if (!empty($typeid)) {
-            $sql .= ' AND t.fk_adherent_type='.$typeid;
-        }
-    	// Select members of given category
-    	if ($category > 0) {
+		}
+		$sql .= ' WHERE t.entity IN ('.getEntity('adherent').')';
+		if (!empty($typeid)) {
+			$sql .= ' AND t.fk_adherent_type='.$typeid;
+		}
+		// Select members of given category
+		if ($category > 0) {
 			$sql .= " AND c.fk_categorie = ".$this->db->escape($category);
 			$sql .= " AND c.fk_member = t.rowid ";
-    	}
-        // Add sql filters
-        if ($sqlfilters) {
-            if (!DolibarrApi::_checkFilters($sqlfilters)) {
-                throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
-            }
-	        $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-        }
+		}
+		// Add sql filters
+		if ($sqlfilters) {
+			if (!DolibarrApi::_checkFilters($sqlfilters)) {
+				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+			}
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
 
-        $sql .= $this->db->order($sortfield, $sortorder);
-        if ($limit) {
-            if ($page < 0) {
-                $page = 0;
-            }
-            $offset = $limit * $page;
+		$sql .= $this->db->order($sortfield, $sortorder);
+		if ($limit) {
+			if ($page < 0) {
+				$page = 0;
+			}
+			$offset = $limit * $page;
 
-            $sql .= $this->db->plimit($limit + 1, $offset);
-        }
+			$sql .= $this->db->plimit($limit + 1, $offset);
+		}
 
-        $result = $this->db->query($sql);
-        if ($result) {
-            $i = 0;
-            $num = $this->db->num_rows($result);
-            $min = min($num, ($limit <= 0 ? $num : $limit));
-            while ($i < $min) {
-            	$obj = $this->db->fetch_object($result);
-                $member = new Adherent($this->db);
-                if ($member->fetch($obj->rowid)) {
-                    $obj_ret[] = $this->_cleanObjectDatas($member);
-                }
-                $i++;
-            }
-        } else {
-        	throw new RestException(503, 'Error when retrieve member list : '.$this->db->lasterror());
-        }
-        if (!count($obj_ret)) {
-            throw new RestException(404, 'No member found');
-        }
+		$result = $this->db->query($sql);
+		if ($result) {
+			$i = 0;
+			$num = $this->db->num_rows($result);
+			$min = min($num, ($limit <= 0 ? $num : $limit));
+			while ($i < $min) {
+				$obj = $this->db->fetch_object($result);
+				$member = new Adherent($this->db);
+				if ($member->fetch($obj->rowid)) {
+					$obj_ret[] = $this->_cleanObjectDatas($member);
+				}
+				$i++;
+			}
+		} else {
+			throw new RestException(503, 'Error when retrieve member list : '.$this->db->lasterror());
+		}
+		if (!count($obj_ret)) {
+			throw new RestException(404, 'No member found');
+		}
 
-        return $obj_ret;
-    }
+		return $obj_ret;
+	}
 
-    /**
-     * Create member object
-     *
-     * @param array $request_data   Request data
-     * @return int  ID of member
-     */
-    public function post($request_data = null)
-    {
-        if (!DolibarrApiAccess::$user->rights->adherent->creer) {
-            throw new RestException(401);
-        }
-        // Check mandatory fields
-        $result = $this->_validate($request_data);
+	/**
+	 * Create member object
+	 *
+	 * @param array $request_data   Request data
+	 * @return int  ID of member
+	 */
+	public function post($request_data = null)
+	{
+		if (!DolibarrApiAccess::$user->rights->adherent->creer) {
+			throw new RestException(401);
+		}
+		// Check mandatory fields
+		$result = $this->_validate($request_data);
 
-        $member = new Adherent($this->db);
-        foreach ($request_data as $field => $value) {
-            $member->$field = $value;
-        }
-        if ($member->create(DolibarrApiAccess::$user) < 0) {
-            throw new RestException(500, 'Error creating member', array_merge(array($member->error), $member->errors));
-        }
-        return $member->id;
-    }
+		$member = new Adherent($this->db);
+		foreach ($request_data as $field => $value) {
+			$member->$field = $value;
+		}
+		if ($member->create(DolibarrApiAccess::$user) < 0) {
+			throw new RestException(500, 'Error creating member', array_merge(array($member->error), $member->errors));
+		}
+		return $member->id;
+	}
 
-    /**
-     * Update member
-     *
-     * @param int   $id             ID of member to update
-     * @param array $request_data   Datas
-     * @return int
-     */
-    public function put($id, $request_data = null)
-    {
-        if (!DolibarrApiAccess::$user->rights->adherent->creer) {
-            throw new RestException(401);
-        }
+	/**
+	 * Update member
+	 *
+	 * @param int   $id             ID of member to update
+	 * @param array $request_data   Datas
+	 * @return Object				Updated object
+	 */
+	public function put($id, $request_data = null)
+	{
+		if (!DolibarrApiAccess::$user->rights->adherent->creer) {
+			throw new RestException(401);
+		}
 
-        $member = new Adherent($this->db);
-        $result = $member->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'member not found');
-        }
+		$member = new Adherent($this->db);
+		$result = $member->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'member not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('member', $member->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('member', $member->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        foreach ($request_data as $field => $value) {
-            if ($field == 'id') continue;
-            // Process the status separately because it must be updated using
-            // the validate() and resiliate() methods of the class Adherent.
-            if ($field == 'statut') {
-                if ($value == '0') {
-                    $result = $member->resiliate(DolibarrApiAccess::$user);
-                    if ($result < 0) {
-                        throw new RestException(500, 'Error when resiliating member: '.$member->error);
-                    }
-                } elseif ($value == '1') {
-                    $result = $member->validate(DolibarrApiAccess::$user);
-                    if ($result < 0) {
-                        throw new RestException(500, 'Error when validating member: '.$member->error);
-                    }
-                }
-            } else {
-                $member->$field = $value;
-            }
-        }
+		foreach ($request_data as $field => $value) {
+			if ($field == 'id') continue;
+			// Process the status separately because it must be updated using
+			// the validate() and resiliate() methods of the class Adherent.
+			if ($field == 'statut') {
+				if ($value == '0') {
+					$result = $member->resiliate(DolibarrApiAccess::$user);
+					if ($result < 0) {
+						throw new RestException(500, 'Error when resiliating member: '.$member->error);
+					}
+				} elseif ($value == '1') {
+					$result = $member->validate(DolibarrApiAccess::$user);
+					if ($result < 0) {
+						throw new RestException(500, 'Error when validating member: '.$member->error);
+					}
+				}
+			} else {
+				$member->$field = $value;
+			}
+		}
 
-        // If there is no error, update() returns the number of affected rows
-        // so if the update is a no op, the return value is zero.
-        if ($member->update(DolibarrApiAccess::$user) >= 0) {
-            return $this->get($id);
-        } else {
-            throw new RestException(500, $member->error);
-        }
-    }
+		// If there is no error, update() returns the number of affected rows
+		// so if the update is a no op, the return value is zero.
+		if ($member->update(DolibarrApiAccess::$user) >= 0) {
+			return $this->get($id);
+		} else {
+			throw new RestException(500, $member->error);
+		}
+	}
 
-    /**
-     * Delete member
-     *
-     * @param int $id   member ID
-     * @return array
-     */
-    public function delete($id)
-    {
-        if (!DolibarrApiAccess::$user->rights->adherent->supprimer) {
-            throw new RestException(401);
-        }
-        $member = new Adherent($this->db);
-        $result = $member->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'member not found');
-        }
+	/**
+	 * Delete member
+	 *
+	 * @param int $id   member ID
+	 * @return array
+	 */
+	public function delete($id)
+	{
+		if (!DolibarrApiAccess::$user->rights->adherent->supprimer) {
+			throw new RestException(401);
+		}
+		$member = new Adherent($this->db);
+		$result = $member->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'member not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('member', $member->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('member', $member->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        if (!$member->delete($member->id, DolibarrApiAccess::$user)) {
-            throw new RestException(401, 'error when deleting member');
-        }
+		if (!$member->delete($member->id, DolibarrApiAccess::$user)) {
+			throw new RestException(401, 'error when deleting member');
+		}
 
-        return array(
-            'success' => array(
-                'code' => 200,
-                'message' => 'member deleted'
-            )
-        );
-    }
+		return array(
+			'success' => array(
+				'code' => 200,
+				'message' => 'member deleted'
+			)
+		);
+	}
 
-    /**
-     * Validate fields before creating an object
-     *
-     * @param array|null    $data   Data to validate
-     * @return array
-     *
-     * @throws RestException
-     */
-    private function _validate($data)
-    {
-        $member = array();
-        foreach (Members::$FIELDS as $field) {
-            if (!isset($data[$field]))
-                throw new RestException(400, "$field field missing");
-            $member[$field] = $data[$field];
-        }
-        return $member;
-    }
+	/**
+	 * Validate fields before creating an object
+	 *
+	 * @param array|null    $data   Data to validate
+	 * @return array
+	 *
+	 * @throws RestException
+	 */
+	private function _validate($data)
+	{
+		$member = array();
+		foreach (Members::$FIELDS as $field) {
+			if (!isset($data[$field]))
+				throw new RestException(400, "$field field missing");
+			$member[$field] = $data[$field];
+		}
+		return $member;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
-    /**
-     * Clean sensible object datas
-     *
-     * @param   object  $object    Object to clean
-     * @return    array    Array of cleaned object properties
-     */
-    protected function _cleanObjectDatas($object)
-    {
-        // phpcs:enable
-        $object = parent::_cleanObjectDatas($object);
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	/**
+	 * Clean sensible object datas
+	 *
+	 * @param   Object  $object    Object to clean
+	 * @return  Object    Object with cleaned properties
+	 */
+	protected function _cleanObjectDatas($object)
+	{
+		// phpcs:enable
+		$object = parent::_cleanObjectDatas($object);
 
-        // Remove the subscriptions because they are handled as a subresource.
-        unset($object->subscriptions);
-        unset($object->fk_incoterms);
-        unset($object->label_incoterms);
-        unset($object->location_incoterms);
-        unset($object->fk_delivery_address);
-        unset($object->shipping_method_id);
+		// Remove the subscriptions because they are handled as a subresource.
+		unset($object->subscriptions);
+		unset($object->fk_incoterms);
+		unset($object->label_incoterms);
+		unset($object->location_incoterms);
+		unset($object->fk_delivery_address);
+		unset($object->shipping_method_id);
 
-        unset($object->total_ht);
-        unset($object->total_ttc);
-        unset($object->total_tva);
-        unset($object->total_localtax1);
-        unset($object->total_localtax2);
+		unset($object->total_ht);
+		unset($object->total_ttc);
+		unset($object->total_tva);
+		unset($object->total_localtax1);
+		unset($object->total_localtax2);
 
-        return $object;
-    }
+		return $object;
+	}
 
-    /**
-     * List subscriptions of a member
-     *
-     * Get a list of subscriptions
-     *
-     * @param int $id ID of member
-     * @return array Array of subscription objects
-     *
-     * @throws RestException
-     *
-     * @url GET {id}/subscriptions
-     */
-    public function getSubscriptions($id)
-    {
-        $obj_ret = array();
+	/**
+	 * List subscriptions of a member
+	 *
+	 * Get a list of subscriptions
+	 *
+	 * @param int $id ID of member
+	 * @return array Array of subscription objects
+	 *
+	 * @throws RestException
+	 *
+	 * @url GET {id}/subscriptions
+	 */
+	public function getSubscriptions($id)
+	{
+		$obj_ret = array();
 
-        if (!DolibarrApiAccess::$user->rights->adherent->cotisation->lire) {
-            throw new RestException(401);
-        }
+		if (!DolibarrApiAccess::$user->rights->adherent->cotisation->lire) {
+			throw new RestException(401);
+		}
 
-        $member = new Adherent($this->db);
-        $result = $member->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'member not found');
-        }
+		$member = new Adherent($this->db);
+		$result = $member->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'member not found');
+		}
 
-        $obj_ret = array();
-        foreach ($member->subscriptions as $subscription) {
-            $obj_ret[] = $this->_cleanObjectDatas($subscription);
-        }
-        return $obj_ret;
-    }
+		$obj_ret = array();
+		foreach ($member->subscriptions as $subscription) {
+			$obj_ret[] = $this->_cleanObjectDatas($subscription);
+		}
+		return $obj_ret;
+	}
 
-    /**
-     * Add a subscription for a member
-     *
-     * @param int $id               ID of member
-     * @param int $start_date       Start date {@from body} {@type timestamp}
-     * @param int $end_date         End date {@from body} {@type timestamp}
-     * @param float $amount         Amount (may be 0) {@from body}
-     * @param string $label         Label {@from body}
-     * @return int  ID of subscription
-     *
-     * @url POST {id}/subscriptions
-     */
-    public function createSubscription($id, $start_date, $end_date, $amount, $label = '')
-    {
-        if (!DolibarrApiAccess::$user->rights->adherent->cotisation->creer) {
-            throw new RestException(401);
-        }
+	/**
+	 * Add a subscription for a member
+	 *
+	 * @param int $id               ID of member
+	 * @param int $start_date       Start date {@from body} {@type timestamp}
+	 * @param int $end_date         End date {@from body} {@type timestamp}
+	 * @param float $amount         Amount (may be 0) {@from body}
+	 * @param string $label         Label {@from body}
+	 * @return int  ID of subscription
+	 *
+	 * @url POST {id}/subscriptions
+	 */
+	public function createSubscription($id, $start_date, $end_date, $amount, $label = '')
+	{
+		if (!DolibarrApiAccess::$user->rights->adherent->cotisation->creer) {
+			throw new RestException(401);
+		}
 
-        $member = new Adherent($this->db);
-        $result = $member->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'member not found');
-        }
+		$member = new Adherent($this->db);
+		$result = $member->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'member not found');
+		}
 
-        return $member->subscription($start_date, $amount, 0, '', $label, '', '', '', $end_date);
-    }
+		return $member->subscription($start_date, $amount, 0, '', $label, '', '', '', $end_date);
+	}
 
-    /**
-     * Get categories for a member
-     *
-     * @param int		$id         ID of member
-     * @param string		$sortfield	Sort field
-     * @param string		$sortorder	Sort order
-     * @param int		$limit		Limit for list
-     * @param int		$page		Page number
-     *
-     * @return mixed
-     *
-     * @url GET {id}/categories
-     */
+	/**
+	 * Get categories for a member
+	 *
+	 * @param int		$id         ID of member
+	 * @param string		$sortfield	Sort field
+	 * @param string		$sortorder	Sort order
+	 * @param int		$limit		Limit for list
+	 * @param int		$page		Page number
+	 *
+	 * @return mixed
+	 *
+	 * @url GET {id}/categories
+	 */
 	public function getCategories($id, $sortfield = "s.rowid", $sortorder = 'ASC', $limit = 0, $page = 0)
 	{
 		if (!DolibarrApiAccess::$user->rights->categorie->lire) {
diff --git a/htdocs/adherents/class/api_memberstypes.class.php b/htdocs/adherents/class/api_memberstypes.class.php
index 682fb9d707c..f9f410f34aa 100644
--- a/htdocs/adherents/class/api_memberstypes.class.php
+++ b/htdocs/adherents/class/api_memberstypes.class.php
@@ -27,289 +27,289 @@ require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
  */
 class MembersTypes extends DolibarrApi
 {
-    /**
-     * @var array   $FIELDS     Mandatory fields, checked when create and update object
-     */
-    static $FIELDS = array(
-        'label',
-    );
+	/**
+	 * @var array   $FIELDS     Mandatory fields, checked when create and update object
+	 */
+	static $FIELDS = array(
+		'label',
+	);
 
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-        global $db, $conf;
-        $this->db = $db;
-    }
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		global $db, $conf;
+		$this->db = $db;
+	}
 
-    /**
-     * Get properties of a member type object
-     *
-     * Return an array with member type informations
-     *
-     * @param     int     $id ID of member type
-     * @return    array|mixed data without useless information
-     *
-     * @throws    RestException
-     */
-    public function get($id)
-    {
-        if (!DolibarrApiAccess::$user->rights->adherent->lire) {
-            throw new RestException(401);
-        }
+	/**
+	 * Get properties of a member type object
+	 *
+	 * Return an array with member type informations
+	 *
+	 * @param     int     $id ID of member type
+	 * @return    array|mixed data without useless information
+	 *
+	 * @throws    RestException
+	 */
+	public function get($id)
+	{
+		if (!DolibarrApiAccess::$user->rights->adherent->lire) {
+			throw new RestException(401);
+		}
 
-        $membertype = new AdherentType($this->db);
-        $result = $membertype->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'member type not found');
-        }
+		$membertype = new AdherentType($this->db);
+		$result = $membertype->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'member type not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('member', $membertype->id, 'adherent_type')) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('member', $membertype->id, 'adherent_type')) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        return $this->_cleanObjectDatas($membertype);
-    }
+		return $this->_cleanObjectDatas($membertype);
+	}
 
-    /**
-     * List members types
-     *
-     * Get a list of members types
-     *
-     * @param string    $sortfield  Sort field
-     * @param string    $sortorder  Sort order
-     * @param int       $limit      Limit for list
-     * @param int       $page       Page number
-     * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.libelle:like:'SO-%') and (t.subscription:=:'1')"
-     * @return array                Array of member type objects
-     *
-     * @throws RestException
-     */
-    public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $sqlfilters = '')
-    {
-        global $db, $conf;
+	/**
+	 * List members types
+	 *
+	 * Get a list of members types
+	 *
+	 * @param string    $sortfield  Sort field
+	 * @param string    $sortorder  Sort order
+	 * @param int       $limit      Limit for list
+	 * @param int       $page       Page number
+	 * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.libelle:like:'SO-%') and (t.subscription:=:'1')"
+	 * @return array                Array of member type objects
+	 *
+	 * @throws RestException
+	 */
+	public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $sqlfilters = '')
+	{
+		global $db, $conf;
 
-        $obj_ret = array();
+		$obj_ret = array();
 
-        if (!DolibarrApiAccess::$user->rights->adherent->lire) {
-            throw new RestException(401);
-        }
+		if (!DolibarrApiAccess::$user->rights->adherent->lire) {
+			throw new RestException(401);
+		}
 
-        $sql = "SELECT t.rowid";
-        $sql .= " FROM ".MAIN_DB_PREFIX."adherent_type as t";
-        $sql .= ' WHERE t.entity IN ('.getEntity('member_type').')';
+		$sql = "SELECT t.rowid";
+		$sql .= " FROM ".MAIN_DB_PREFIX."adherent_type as t";
+		$sql .= ' WHERE t.entity IN ('.getEntity('member_type').')';
 
-        // Add sql filters
-        if ($sqlfilters) {
-            if (!DolibarrApi::_checkFilters($sqlfilters)) {
-                throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
-            }
-	        $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-        }
+		// Add sql filters
+		if ($sqlfilters) {
+			if (!DolibarrApi::_checkFilters($sqlfilters)) {
+				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+			}
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
 
-        $sql .= $this->db->order($sortfield, $sortorder);
-        if ($limit) {
-            if ($page < 0) {
-                $page = 0;
-            }
-            $offset = $limit * $page;
+		$sql .= $this->db->order($sortfield, $sortorder);
+		if ($limit) {
+			if ($page < 0) {
+				$page = 0;
+			}
+			$offset = $limit * $page;
 
-            $sql .= $this->db->plimit($limit + 1, $offset);
-        }
+			$sql .= $this->db->plimit($limit + 1, $offset);
+		}
 
-        $result = $this->db->query($sql);
-        if ($result) {
-            $i = 0;
-            $num = $this->db->num_rows($result);
-            $min = min($num, ($limit <= 0 ? $num : $limit));
-            while ($i < $min) {
-            	$obj = $this->db->fetch_object($result);
-                $membertype = new AdherentType($this->db);
-                if ($membertype->fetch($obj->rowid)) {
-                    $obj_ret[] = $this->_cleanObjectDatas($membertype);
-                }
-                $i++;
-            }
-        } else {
-        	throw new RestException(503, 'Error when retrieve member type list : '.$this->db->lasterror());
-        }
-        if (!count($obj_ret)) {
-            throw new RestException(404, 'No member type found');
-        }
+		$result = $this->db->query($sql);
+		if ($result) {
+			$i = 0;
+			$num = $this->db->num_rows($result);
+			$min = min($num, ($limit <= 0 ? $num : $limit));
+			while ($i < $min) {
+				$obj = $this->db->fetch_object($result);
+				$membertype = new AdherentType($this->db);
+				if ($membertype->fetch($obj->rowid)) {
+					$obj_ret[] = $this->_cleanObjectDatas($membertype);
+				}
+				$i++;
+			}
+		} else {
+			throw new RestException(503, 'Error when retrieve member type list : '.$this->db->lasterror());
+		}
+		if (!count($obj_ret)) {
+			throw new RestException(404, 'No member type found');
+		}
 
-        return $obj_ret;
-    }
+		return $obj_ret;
+	}
 
-    /**
-     * Create member type object
-     *
-     * @param array $request_data   Request data
-     * @return int  ID of member type
-     */
-    public function post($request_data = null)
-    {
-        if (!DolibarrApiAccess::$user->rights->adherent->configurer) {
-            throw new RestException(401);
-        }
-        // Check mandatory fields
-        $result = $this->_validate($request_data);
+	/**
+	 * Create member type object
+	 *
+	 * @param array $request_data   Request data
+	 * @return int  ID of member type
+	 */
+	public function post($request_data = null)
+	{
+		if (!DolibarrApiAccess::$user->rights->adherent->configurer) {
+			throw new RestException(401);
+		}
+		// Check mandatory fields
+		$result = $this->_validate($request_data);
 
-        $membertype = new AdherentType($this->db);
-        foreach ($request_data as $field => $value) {
-            $membertype->$field = $value;
-        }
-        if ($membertype->create(DolibarrApiAccess::$user) < 0) {
-            throw new RestException(500, 'Error creating member type', array_merge(array($membertype->error), $membertype->errors));
-        }
-        return $membertype->id;
-    }
+		$membertype = new AdherentType($this->db);
+		foreach ($request_data as $field => $value) {
+			$membertype->$field = $value;
+		}
+		if ($membertype->create(DolibarrApiAccess::$user) < 0) {
+			throw new RestException(500, 'Error creating member type', array_merge(array($membertype->error), $membertype->errors));
+		}
+		return $membertype->id;
+	}
 
-    /**
-     * Update member type
-     *
-     * @param int   $id             ID of member type to update
-     * @param array $request_data   Datas
-     * @return int
-     */
-    public function put($id, $request_data = null)
-    {
-        if (!DolibarrApiAccess::$user->rights->adherent->configurer) {
-            throw new RestException(401);
-        }
+	/**
+	 * Update member type
+	 *
+	 * @param int   $id             ID of member type to update
+	 * @param array $request_data   Datas
+	 * @return int
+	 */
+	public function put($id, $request_data = null)
+	{
+		if (!DolibarrApiAccess::$user->rights->adherent->configurer) {
+			throw new RestException(401);
+		}
 
-        $membertype = new AdherentType($this->db);
-        $result = $membertype->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'member type not found');
-        }
+		$membertype = new AdherentType($this->db);
+		$result = $membertype->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'member type not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('member', $membertype->id, 'adherent_type')) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('member', $membertype->id, 'adherent_type')) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        foreach ($request_data as $field => $value) {
-            if ($field == 'id') continue;
-            // Process the status separately because it must be updated using
-            // the validate() and resiliate() methods of the class AdherentType.
-            $membertype->$field = $value;
-        }
+		foreach ($request_data as $field => $value) {
+			if ($field == 'id') continue;
+			// Process the status separately because it must be updated using
+			// the validate() and resiliate() methods of the class AdherentType.
+			$membertype->$field = $value;
+		}
 
-        // If there is no error, update() returns the number of affected rows
-        // so if the update is a no op, the return value is zero.
-        if ($membertype->update(DolibarrApiAccess::$user) >= 0) {
-            return $this->get($id);
-        } else {
-            throw new RestException(500, $membertype->error);
-        }
-    }
+		// If there is no error, update() returns the number of affected rows
+		// so if the update is a no op, the return value is zero.
+		if ($membertype->update(DolibarrApiAccess::$user) >= 0) {
+			return $this->get($id);
+		} else {
+			throw new RestException(500, $membertype->error);
+		}
+	}
 
-    /**
-     * Delete member type
-     *
-     * @param int $id   member type ID
-     * @return array
-     */
-    public function delete($id)
-    {
-        if (!DolibarrApiAccess::$user->rights->adherent->configurer) {
-            throw new RestException(401);
-        }
-        $membertype = new AdherentType($this->db);
-        $result = $membertype->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'member type not found');
-        }
+	/**
+	 * Delete member type
+	 *
+	 * @param int $id   member type ID
+	 * @return array
+	 */
+	public function delete($id)
+	{
+		if (!DolibarrApiAccess::$user->rights->adherent->configurer) {
+			throw new RestException(401);
+		}
+		$membertype = new AdherentType($this->db);
+		$result = $membertype->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'member type not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('member', $membertype->id, 'adherent_type')) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('member', $membertype->id, 'adherent_type')) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        if (!$membertype->delete()) {
-            throw new RestException(401, 'error when deleting member type');
-        }
+		if (!$membertype->delete()) {
+			throw new RestException(401, 'error when deleting member type');
+		}
 
-        return array(
-            'success' => array(
-                'code' => 200,
-                'message' => 'member type deleted'
-            )
-        );
-    }
+		return array(
+			'success' => array(
+				'code' => 200,
+				'message' => 'member type deleted'
+			)
+		);
+	}
 
-    /**
-     * Validate fields before creating an object
-     *
-     * @param array|null    $data   Data to validate
-     * @return array
-     *
-     * @throws RestException
-     */
-    private function _validate($data)
-    {
-        $membertype = array();
-        foreach (MembersTypes::$FIELDS as $field) {
-            if (!isset($data[$field]))
-                throw new RestException(400, "$field field missing");
-            $membertype[$field] = $data[$field];
-        }
-        return $membertype;
-    }
+	/**
+	 * Validate fields before creating an object
+	 *
+	 * @param array|null    $data   Data to validate
+	 * @return array
+	 *
+	 * @throws RestException
+	 */
+	private function _validate($data)
+	{
+		$membertype = array();
+		foreach (MembersTypes::$FIELDS as $field) {
+			if (!isset($data[$field]))
+				throw new RestException(400, "$field field missing");
+			$membertype[$field] = $data[$field];
+		}
+		return $membertype;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
-    /**
-     * Clean sensible object datas
-     *
-     * @param   object  $object    Object to clean
-     * @return    array    Array of cleaned object properties
-     */
-    protected function _cleanObjectDatas($object)
-    {
-        // phpcs:enable
-        $object = parent::_cleanObjectDatas($object);
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	/**
+	 * Clean sensible object datas
+	 *
+	 * @param   Object  $object    Object to clean
+	 * @return    Object    Object with cleaned properties
+	 */
+	protected function _cleanObjectDatas($object)
+	{
+		// phpcs:enable
+		$object = parent::_cleanObjectDatas($object);
 
-        unset($object->array_options);
-        unset($object->linkedObjectsIds);
-        unset($object->context);
-        unset($object->canvas);
-        unset($object->fk_project);
-        unset($object->contact);
-        unset($object->contact_id);
-        unset($object->thirdparty);
-        unset($object->user);
-        unset($object->origin);
-        unset($object->origin_id);
-        unset($object->ref_ext);
-        unset($object->country);
-        unset($object->country_id);
-        unset($object->country_code);
-        unset($object->barcode_type);
-        unset($object->barcode_type_code);
-        unset($object->barcode_type_label);
-        unset($object->barcode_type_coder);
-        unset($object->mode_reglement_id);
-        unset($object->cond_reglement_id);
-        unset($object->cond_reglement);
-        unset($object->fk_delivery_address);
-        unset($object->shipping_method_id);
-        unset($object->model_pdf);
-        unset($object->fk_account);
-        unset($object->note_public);
-        unset($object->note_private);
-        unset($object->fk_incoterms);
-        unset($object->label_incoterms);
-        unset($object->location_incoterms);
-        unset($object->name);
-        unset($object->lastname);
-        unset($object->firstname);
-        unset($object->civility_id);
-        unset($object->total_ht);
-        unset($object->total_tva);
-        unset($object->total_localtax1);
-        unset($object->total_localtax2);
-        unset($object->total_ttc);
+		unset($object->array_options);
+		unset($object->linkedObjectsIds);
+		unset($object->context);
+		unset($object->canvas);
+		unset($object->fk_project);
+		unset($object->contact);
+		unset($object->contact_id);
+		unset($object->thirdparty);
+		unset($object->user);
+		unset($object->origin);
+		unset($object->origin_id);
+		unset($object->ref_ext);
+		unset($object->country);
+		unset($object->country_id);
+		unset($object->country_code);
+		unset($object->barcode_type);
+		unset($object->barcode_type_code);
+		unset($object->barcode_type_label);
+		unset($object->barcode_type_coder);
+		unset($object->mode_reglement_id);
+		unset($object->cond_reglement_id);
+		unset($object->cond_reglement);
+		unset($object->fk_delivery_address);
+		unset($object->shipping_method_id);
+		unset($object->model_pdf);
+		unset($object->fk_account);
+		unset($object->note_public);
+		unset($object->note_private);
+		unset($object->fk_incoterms);
+		unset($object->label_incoterms);
+		unset($object->location_incoterms);
+		unset($object->name);
+		unset($object->lastname);
+		unset($object->firstname);
+		unset($object->civility_id);
+		unset($object->total_ht);
+		unset($object->total_tva);
+		unset($object->total_localtax1);
+		unset($object->total_localtax2);
+		unset($object->total_ttc);
 
-        return $object;
-    }
+		return $object;
+	}
 }
diff --git a/htdocs/adherents/class/api_subscriptions.class.php b/htdocs/adherents/class/api_subscriptions.class.php
index d5adbb0bc5b..031a7d2b468 100644
--- a/htdocs/adherents/class/api_subscriptions.class.php
+++ b/htdocs/adherents/class/api_subscriptions.class.php
@@ -27,219 +27,219 @@ require_once DOL_DOCUMENT_ROOT.'/adherents/class/subscription.class.php';
  */
 class Subscriptions extends DolibarrApi
 {
-    /**
-     * @var array   $FIELDS     Mandatory fields, checked when create and update object
-     */
-    static $FIELDS = array(
-        'fk_adherent',
-        'dateh',
-        'datef',
-        'amount',
-    );
+	/**
+	 * @var array   $FIELDS     Mandatory fields, checked when create and update object
+	 */
+	static $FIELDS = array(
+		'fk_adherent',
+		'dateh',
+		'datef',
+		'amount',
+	);
 
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-        global $db, $conf;
-        $this->db = $db;
-    }
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		global $db, $conf;
+		$this->db = $db;
+	}
 
-    /**
-     * Get properties of a subscription object
-     *
-     * Return an array with subscription informations
-     *
-     * @param     int     $id ID of subscription
-     * @return    array|mixed data without useless information
-     *
-     * @throws    RestException
-     */
-    public function get($id)
-    {
-        if (!DolibarrApiAccess::$user->rights->adherent->cotisation->lire) {
-            throw new RestException(401);
-        }
+	/**
+	 * Get properties of a subscription object
+	 *
+	 * Return an array with subscription informations
+	 *
+	 * @param     int     $id ID of subscription
+	 * @return    array|mixed data without useless information
+	 *
+	 * @throws    RestException
+	 */
+	public function get($id)
+	{
+		if (!DolibarrApiAccess::$user->rights->adherent->cotisation->lire) {
+			throw new RestException(401);
+		}
 
-        $subscription = new Subscription($this->db);
-        $result = $subscription->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Subscription not found');
-        }
+		$subscription = new Subscription($this->db);
+		$result = $subscription->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Subscription not found');
+		}
 
-        return $this->_cleanObjectDatas($subscription);
-    }
+		return $this->_cleanObjectDatas($subscription);
+	}
 
-    /**
-     * List subscriptions
-     *
-     * Get a list of subscriptions
-     *
-     * @param string    $sortfield  Sort field
-     * @param string    $sortorder  Sort order
-     * @param int       $limit      Limit for list
-     * @param int       $page       Page number
-     * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.import_key:<:'20160101')"
-     * @return array Array of subscription objects
-     *
-     * @throws RestException
-     */
-    public function index($sortfield = "dateadh", $sortorder = 'ASC', $limit = 100, $page = 0, $sqlfilters = '')
-    {
-        global $db, $conf;
+	/**
+	 * List subscriptions
+	 *
+	 * Get a list of subscriptions
+	 *
+	 * @param string    $sortfield  Sort field
+	 * @param string    $sortorder  Sort order
+	 * @param int       $limit      Limit for list
+	 * @param int       $page       Page number
+	 * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.import_key:<:'20160101')"
+	 * @return array Array of subscription objects
+	 *
+	 * @throws RestException
+	 */
+	public function index($sortfield = "dateadh", $sortorder = 'ASC', $limit = 100, $page = 0, $sqlfilters = '')
+	{
+		global $db, $conf;
 
-        $obj_ret = array();
+		$obj_ret = array();
 
-        if (!DolibarrApiAccess::$user->rights->adherent->cotisation->lire) {
-            throw new RestException(401);
-        }
+		if (!DolibarrApiAccess::$user->rights->adherent->cotisation->lire) {
+			throw new RestException(401);
+		}
 
-        $sql = "SELECT rowid";
-        $sql .= " FROM ".MAIN_DB_PREFIX."subscription as t";
-        $sql .= ' WHERE 1 = 1';
-        // Add sql filters
-        if ($sqlfilters) {
-            if (!DolibarrApi::_checkFilters($sqlfilters)) {
-                throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
-            }
-	        $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-        }
+		$sql = "SELECT rowid";
+		$sql .= " FROM ".MAIN_DB_PREFIX."subscription as t";
+		$sql .= ' WHERE 1 = 1';
+		// Add sql filters
+		if ($sqlfilters) {
+			if (!DolibarrApi::_checkFilters($sqlfilters)) {
+				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+			}
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
 
-        $sql .= $this->db->order($sortfield, $sortorder);
-        if ($limit) {
-            if ($page < 0) {
-                $page = 0;
-            }
-            $offset = $limit * $page;
+		$sql .= $this->db->order($sortfield, $sortorder);
+		if ($limit) {
+			if ($page < 0) {
+				$page = 0;
+			}
+			$offset = $limit * $page;
 
-            $sql .= $this->db->plimit($limit + 1, $offset);
-        }
+			$sql .= $this->db->plimit($limit + 1, $offset);
+		}
 
-        $result = $this->db->query($sql);
-        if ($result) {
-            $i = 0;
-            $num = $this->db->num_rows($result);
-            while ($i < min($limit, $num)) {
-            	$obj = $this->db->fetch_object($result);
-                $subscription = new Subscription($this->db);
-                if ($subscription->fetch($obj->rowid)) {
-                    $obj_ret[] = $this->_cleanObjectDatas($subscription);
-                }
-                $i++;
-            }
-        } else {
-        	throw new RestException(503, 'Error when retrieve subscription list : '.$this->db->lasterror());
-        }
-        if (!count($obj_ret)) {
-            throw new RestException(404, 'No Subscription found');
-        }
+		$result = $this->db->query($sql);
+		if ($result) {
+			$i = 0;
+			$num = $this->db->num_rows($result);
+			while ($i < min($limit, $num)) {
+				$obj = $this->db->fetch_object($result);
+				$subscription = new Subscription($this->db);
+				if ($subscription->fetch($obj->rowid)) {
+					$obj_ret[] = $this->_cleanObjectDatas($subscription);
+				}
+				$i++;
+			}
+		} else {
+			throw new RestException(503, 'Error when retrieve subscription list : '.$this->db->lasterror());
+		}
+		if (!count($obj_ret)) {
+			throw new RestException(404, 'No Subscription found');
+		}
 
-        return $obj_ret;
-    }
+		return $obj_ret;
+	}
 
-    /**
-     * Create subscription object
-     *
-     * @param array $request_data   Request data
-     * @return int  ID of subscription
-     */
-    public function post($request_data = null)
-    {
-        if (!DolibarrApiAccess::$user->rights->adherent->cotisation->creer) {
-            throw new RestException(401);
-        }
-        // Check mandatory fields
-        $result = $this->_validate($request_data);
+	/**
+	 * Create subscription object
+	 *
+	 * @param array $request_data   Request data
+	 * @return int  ID of subscription
+	 */
+	public function post($request_data = null)
+	{
+		if (!DolibarrApiAccess::$user->rights->adherent->cotisation->creer) {
+			throw new RestException(401);
+		}
+		// Check mandatory fields
+		$result = $this->_validate($request_data);
 
-        $subscription = new Subscription($this->db);
-        foreach ($request_data as $field => $value) {
-            $subscription->$field = $value;
-        }
-        if ($subscription->create(DolibarrApiAccess::$user) < 0) {
-            throw new RestException(500, 'Error when creating subscription', array_merge(array($subscription->error), $subscription->errors));
-        }
-        return $subscription->id;
-    }
+		$subscription = new Subscription($this->db);
+		foreach ($request_data as $field => $value) {
+			$subscription->$field = $value;
+		}
+		if ($subscription->create(DolibarrApiAccess::$user) < 0) {
+			throw new RestException(500, 'Error when creating subscription', array_merge(array($subscription->error), $subscription->errors));
+		}
+		return $subscription->id;
+	}
 
-    /**
-     * Update subscription
-     *
-     * @param int   $id             ID of subscription to update
-     * @param array $request_data   Datas
-     * @return int
-     */
-    public function put($id, $request_data = null)
-    {
-        if (!DolibarrApiAccess::$user->rights->adherent->creer) {
-            throw new RestException(401);
-        }
+	/**
+	 * Update subscription
+	 *
+	 * @param int   $id             ID of subscription to update
+	 * @param array $request_data   Datas
+	 * @return int
+	 */
+	public function put($id, $request_data = null)
+	{
+		if (!DolibarrApiAccess::$user->rights->adherent->creer) {
+			throw new RestException(401);
+		}
 
-        $subscription = new Subscription($this->db);
-        $result = $subscription->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Subscription not found');
-        }
+		$subscription = new Subscription($this->db);
+		$result = $subscription->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Subscription not found');
+		}
 
-        foreach ($request_data as $field => $value) {
-            if ($field == 'id') continue;
-            $subscription->$field = $value;
-        }
+		foreach ($request_data as $field => $value) {
+			if ($field == 'id') continue;
+			$subscription->$field = $value;
+		}
 
-        if ($subscription->update(DolibarrApiAccess::$user) > 0) {
-            return $this->get($id);
-        } else {
-            throw new RestException(500, $subscription->error);
-        }
-    }
+		if ($subscription->update(DolibarrApiAccess::$user) > 0) {
+			return $this->get($id);
+		} else {
+			throw new RestException(500, $subscription->error);
+		}
+	}
 
-    /**
-     * Delete subscription
-     *
-     * @param int $id   ID of subscription to delete
-     * @return array
-     */
-    public function delete($id)
-    {
-        // The right to delete a subscription comes with the right to create one.
-        if (!DolibarrApiAccess::$user->rights->adherent->cotisation->creer) {
-            throw new RestException(401);
-        }
-        $subscription = new Subscription($this->db);
-        $result = $subscription->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Subscription not found');
-        }
+	/**
+	 * Delete subscription
+	 *
+	 * @param int $id   ID of subscription to delete
+	 * @return array
+	 */
+	public function delete($id)
+	{
+		// The right to delete a subscription comes with the right to create one.
+		if (!DolibarrApiAccess::$user->rights->adherent->cotisation->creer) {
+			throw new RestException(401);
+		}
+		$subscription = new Subscription($this->db);
+		$result = $subscription->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Subscription not found');
+		}
 
-        if (!$subscription->delete(DolibarrApiAccess::$user)) {
-            throw new RestException(401, 'error when deleting subscription');
-        }
+		if (!$subscription->delete(DolibarrApiAccess::$user)) {
+			throw new RestException(401, 'error when deleting subscription');
+		}
 
-        return array(
-            'success' => array(
-                'code' => 200,
-                'message' => 'subscription deleted'
-            )
-        );
-    }
+		return array(
+			'success' => array(
+				'code' => 200,
+				'message' => 'subscription deleted'
+			)
+		);
+	}
 
-    /**
-     * Validate fields before creating an object
-     *
-     * @param array|null    $data   Data to validate
-     * @return array
-     *
-     * @throws RestException
-     */
-    private function _validate($data)
-    {
-        $subscription = array();
-        foreach (Subscriptions::$FIELDS as $field) {
-            if (!isset($data[$field]))
-                throw new RestException(400, "$field field missing");
-            $subscription[$field] = $data[$field];
-        }
-        return $subscription;
-    }
+	/**
+	 * Validate fields before creating an object
+	 *
+	 * @param array|null    $data   Data to validate
+	 * @return array
+	 *
+	 * @throws RestException
+	 */
+	private function _validate($data)
+	{
+		$subscription = array();
+		foreach (Subscriptions::$FIELDS as $field) {
+			if (!isset($data[$field]))
+				throw new RestException(400, "$field field missing");
+			$subscription[$field] = $data[$field];
+		}
+		return $subscription;
+	}
 }
diff --git a/htdocs/adherents/class/subscription.class.php b/htdocs/adherents/class/subscription.class.php
index 5a75fdbae2e..1e6356ee6e4 100644
--- a/htdocs/adherents/class/subscription.class.php
+++ b/htdocs/adherents/class/subscription.class.php
@@ -32,435 +32,435 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
  */
 class Subscription extends CommonObject
 {
-    /**
-     * @var string ID to identify managed object
-     */
-    public $element = 'subscription';
+	/**
+	 * @var string ID to identify managed object
+	 */
+	public $element = 'subscription';
 
-    /**
-     * @var string Name of table without prefix where object is stored
-     */
-    public $table_element = 'subscription';
+	/**
+	 * @var string Name of table without prefix where object is stored
+	 */
+	public $table_element = 'subscription';
 
-    /**
-     * @var int  Does myobject support multicompany module ? 0=No test on entity, 1=Test with field entity, 2=Test with link by fk_soc, 'field@table'=Test with link by field@table
-     */
-    public $ismultientitymanaged = 'fk_adherent@adherent';
+	/**
+	 * @var int  Does myobject support multicompany module ? 0=No test on entity, 1=Test with field entity, 2=Test with link by fk_soc, 'field@table'=Test with link by field@table
+	 */
+	public $ismultientitymanaged = 'fk_adherent@adherent';
 
-    /**
-     * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
-     */
-    public $picto = 'payment';
+	/**
+	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+	 */
+	public $picto = 'payment';
 
-    /**
-     * Date creation record (datec)
-     *
-     * @var integer
-     */
-    public $datec;
+	/**
+	 * Date creation record (datec)
+	 *
+	 * @var integer
+	 */
+	public $datec;
 
-    /**
-     * Date modification record (tms)
-     *
-     * @var integer
-     */
-    public $datem;
+	/**
+	 * Date modification record (tms)
+	 *
+	 * @var integer
+	 */
+	public $datem;
 
-    /**
-     * Subscription start date (date subscription)
-     *
-     * @var integer
-     */
-    public $dateh;
+	/**
+	 * Subscription start date (date subscription)
+	 *
+	 * @var integer
+	 */
+	public $dateh;
 
-    /**
-     * Subscription end date
-     *
-     * @var integer
-     */
-    public $datef;
+	/**
+	 * Subscription end date
+	 *
+	 * @var integer
+	 */
+	public $datef;
 
-    /**
-     * @var int ID
-     */
-    public $fk_type;
-    public $fk_adherent;
+	/**
+	 * @var int ID
+	 */
+	public $fk_type;
+	public $fk_adherent;
 
-    public $amount;
+	public $amount;
 
-    /**
-     * @var int ID
-     */
-    public $fk_bank;
+	/**
+	 * @var int ID
+	 */
+	public $fk_bank;
 
-    public $fields = array(
-    	'rowid' =>array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>10),
-    	'tms' =>array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>15),
-    	'datec' =>array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-1, 'position'=>20),
-    	'fk_adherent' =>array('type'=>'integer', 'label'=>'Member', 'enabled'=>1, 'visible'=>-1, 'position'=>25),
-    	'dateadh' =>array('type'=>'datetime', 'label'=>'DateSubscription', 'enabled'=>1, 'visible'=>-1, 'position'=>30),
-    	'datef' =>array('type'=>'datetime', 'label'=>'DateEndSubscription', 'enabled'=>1, 'visible'=>-1, 'position'=>35),
-    	'subscription' =>array('type'=>'double(24,8)', 'label'=>'Amount', 'enabled'=>1, 'visible'=>-1, 'position'=>40, 'isameasure'=>1),
-    	'fk_bank' =>array('type'=>'integer', 'label'=>'BankId', 'enabled'=>1, 'visible'=>-1, 'position'=>45),
-    	'note' =>array('type'=>'text', 'label'=>'Note', 'enabled'=>1, 'visible'=>-1, 'position'=>50),
-    	'fk_type' =>array('type'=>'integer', 'label'=>'MemberType', 'enabled'=>1, 'visible'=>-1, 'position'=>55),
-    	'fk_user_creat' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserAuthor', 'enabled'=>1, 'visible'=>-2, 'position'=>60),
-    	'fk_user_valid' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserValidation', 'enabled'=>1, 'visible'=>-1, 'position'=>65),
-    );
+	public $fields = array(
+		'rowid' =>array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>10),
+		'tms' =>array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>15),
+		'datec' =>array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-1, 'position'=>20),
+		'fk_adherent' =>array('type'=>'integer', 'label'=>'Member', 'enabled'=>1, 'visible'=>-1, 'position'=>25),
+		'dateadh' =>array('type'=>'datetime', 'label'=>'DateSubscription', 'enabled'=>1, 'visible'=>-1, 'position'=>30),
+		'datef' =>array('type'=>'datetime', 'label'=>'DateEndSubscription', 'enabled'=>1, 'visible'=>-1, 'position'=>35),
+		'subscription' =>array('type'=>'double(24,8)', 'label'=>'Amount', 'enabled'=>1, 'visible'=>-1, 'position'=>40, 'isameasure'=>1),
+		'fk_bank' =>array('type'=>'integer', 'label'=>'BankId', 'enabled'=>1, 'visible'=>-1, 'position'=>45),
+		'note' =>array('type'=>'text', 'label'=>'Note', 'enabled'=>1, 'visible'=>-1, 'position'=>50),
+		'fk_type' =>array('type'=>'integer', 'label'=>'MemberType', 'enabled'=>1, 'visible'=>-1, 'position'=>55),
+		'fk_user_creat' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserAuthor', 'enabled'=>1, 'visible'=>-2, 'position'=>60),
+		'fk_user_valid' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserValidation', 'enabled'=>1, 'visible'=>-1, 'position'=>65),
+	);
 
 
-    /**
-     *	Constructor
-     *
-     *	@param 		DoliDB		$db		Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-    }
+	/**
+	 *	Constructor
+	 *
+	 *	@param 		DoliDB		$db		Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
 
 
-    /**
-     *	Function who permitted cretaion of the subscription
-     *
-     *	@param	User	$user			User that create
-     *	@param  bool 	$notrigger 		false=launch triggers after, true=disable triggers
-     *	@return	int						<0 if KO, Id subscription created if OK
-     */
-    public function create($user, $notrigger = false)
-    {
-        global $langs;
+	/**
+	 *	Function who permitted cretaion of the subscription
+	 *
+	 *	@param	User	$user			User that create
+	 *	@param  bool 	$notrigger 		false=launch triggers after, true=disable triggers
+	 *	@return	int						<0 if KO, Id subscription created if OK
+	 */
+	public function create($user, $notrigger = false)
+	{
+		global $langs;
 
-        $error = 0;
+		$error = 0;
 
-        $now = dol_now();
+		$now = dol_now();
 
-        // Check parameters
-        if ($this->datef <= $this->dateh) {
-            $this->error = $langs->trans("ErrorBadValueForDate");
-            return -1;
-        }
-        if (empty($this->datec)) $this->datec = $now;
+		// Check parameters
+		if ($this->datef <= $this->dateh) {
+			$this->error = $langs->trans("ErrorBadValueForDate");
+			return -1;
+		}
+		if (empty($this->datec)) $this->datec = $now;
 
 
-        $this->db->begin();
+		$this->db->begin();
 
-        $sql = "INSERT INTO ".MAIN_DB_PREFIX."subscription (fk_adherent, fk_type, datec, dateadh, datef, subscription, note)";
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."subscription (fk_adherent, fk_type, datec, dateadh, datef, subscription, note)";
 
-        require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
-        $member = new Adherent($this->db);
-        $result = $member->fetch($this->fk_adherent);
+		require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
+		$member = new Adherent($this->db);
+		$result = $member->fetch($this->fk_adherent);
 
-        if ($this->fk_type == null) {	// If type not defined, we use the type of member
-            $type = $member->typeid;
-        } else {
-            $type = $this->fk_type;
-        }
-        $sql .= " VALUES (".$this->fk_adherent.", '".$type."', '".$this->db->idate($now)."',";
-        $sql .= " '".$this->db->idate($this->dateh)."',";
-        $sql .= " '".$this->db->idate($this->datef)."',";
-        $sql .= " ".$this->amount.",";
-        $sql .= " '".$this->db->escape($this->note_public ? $this->note_public : $this->note)."')";
+		if ($this->fk_type == null) {	// If type not defined, we use the type of member
+			$type = $member->typeid;
+		} else {
+			$type = $this->fk_type;
+		}
+		$sql .= " VALUES (".$this->fk_adherent.", '".$type."', '".$this->db->idate($now)."',";
+		$sql .= " '".$this->db->idate($this->dateh)."',";
+		$sql .= " '".$this->db->idate($this->datef)."',";
+		$sql .= " ".$this->amount.",";
+		$sql .= " '".$this->db->escape($this->note_public ? $this->note_public : $this->note)."')";
 
-        $resql = $this->db->query($sql);
-        if (!$resql) {
-            $error++;
-            $this->errors[] = $this->db->lasterror();
-        }
+		$resql = $this->db->query($sql);
+		if (!$resql) {
+			$error++;
+			$this->errors[] = $this->db->lasterror();
+		}
 
-        if (!$error) {
-            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);
-            $this->fk_type = $type;
-        }
+		if (!$error) {
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);
+			$this->fk_type = $type;
+		}
 
-        if (!$error && !$notrigger) {
-        	$this->context = array('member'=>$member);
-        	// Call triggers
-            $result = $this->call_trigger('MEMBER_SUBSCRIPTION_CREATE', $user);
-            if ($result < 0) { $error++; }
-            // End call triggers
-        }
+		if (!$error && !$notrigger) {
+			$this->context = array('member'=>$member);
+			// Call triggers
+			$result = $this->call_trigger('MEMBER_SUBSCRIPTION_CREATE', $user);
+			if ($result < 0) { $error++; }
+			// End call triggers
+		}
 
-        // Commit or rollback
-        if ($error) {
-            $this->db->rollback();
-            return -1;
-        } else {
-            $this->db->commit();
-            return $this->id;
-        }
-    }
+		// Commit or rollback
+		if ($error) {
+			$this->db->rollback();
+			return -1;
+		} else {
+			$this->db->commit();
+			return $this->id;
+		}
+	}
 
 
-    /**
-     *  Method to load a subscription
-     *
-     *  @param	int		$rowid		Id subscription
-     *  @return	int					<0 if KO, =0 if not found, >0 if OK
-     */
-    public function fetch($rowid)
-    {
-        $sql = "SELECT rowid, fk_type, fk_adherent, datec,";
-        $sql .= " tms,";
-        $sql .= " dateadh as dateh,";
-        $sql .= " datef,";
-        $sql .= " subscription, note, fk_bank";
-        $sql .= " FROM ".MAIN_DB_PREFIX."subscription";
-        $sql .= "	WHERE rowid=".$rowid;
+	/**
+	 *  Method to load a subscription
+	 *
+	 *  @param	int		$rowid		Id subscription
+	 *  @return	int					<0 if KO, =0 if not found, >0 if OK
+	 */
+	public function fetch($rowid)
+	{
+		$sql = "SELECT rowid, fk_type, fk_adherent, datec,";
+		$sql .= " tms,";
+		$sql .= " dateadh as dateh,";
+		$sql .= " datef,";
+		$sql .= " subscription, note, fk_bank";
+		$sql .= " FROM ".MAIN_DB_PREFIX."subscription";
+		$sql .= "	WHERE rowid=".$rowid;
 
-        dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if ($resql) {
-            if ($this->db->num_rows($resql)) {
-                $obj = $this->db->fetch_object($resql);
+		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			if ($this->db->num_rows($resql)) {
+				$obj = $this->db->fetch_object($resql);
 
-                $this->id             = $obj->rowid;
-                $this->ref            = $obj->rowid;
+				$this->id             = $obj->rowid;
+				$this->ref            = $obj->rowid;
 
-                $this->fk_type        = $obj->fk_type;
-                $this->fk_adherent    = $obj->fk_adherent;
-                $this->datec          = $this->db->jdate($obj->datec);
-                $this->datem          = $this->db->jdate($obj->tms);
-                $this->dateh          = $this->db->jdate($obj->dateh);
-                $this->datef          = $this->db->jdate($obj->datef);
-                $this->amount         = $obj->subscription;
-                $this->note           = $obj->note;
-                $this->fk_bank        = $obj->fk_bank;
-                return 1;
-            } else {
-                return 0;
-            }
-        } else {
-            $this->error = $this->db->lasterror();
-            return -1;
-        }
-    }
+				$this->fk_type        = $obj->fk_type;
+				$this->fk_adherent    = $obj->fk_adherent;
+				$this->datec          = $this->db->jdate($obj->datec);
+				$this->datem          = $this->db->jdate($obj->tms);
+				$this->dateh          = $this->db->jdate($obj->dateh);
+				$this->datef          = $this->db->jdate($obj->datef);
+				$this->amount         = $obj->subscription;
+				$this->note           = $obj->note;
+				$this->fk_bank        = $obj->fk_bank;
+				return 1;
+			} else {
+				return 0;
+			}
+		} else {
+			$this->error = $this->db->lasterror();
+			return -1;
+		}
+	}
 
 
-    /**
-     *	Update subscription
-     *
-     *	@param	User	$user			User who updated
-     *	@param 	int		$notrigger		0=Disable triggers
-     *	@return	int						<0 if KO, >0 if OK
-     */
-    public function update($user, $notrigger = 0)
-    {
-        $error = 0;
+	/**
+	 *	Update subscription
+	 *
+	 *	@param	User	$user			User who updated
+	 *	@param 	int		$notrigger		0=Disable triggers
+	 *	@return	int						<0 if KO, >0 if OK
+	 */
+	public function update($user, $notrigger = 0)
+	{
+		$error = 0;
 
-        $this->db->begin();
+		$this->db->begin();
 
-        $sql = "UPDATE ".MAIN_DB_PREFIX."subscription SET ";
-        $sql .= " fk_type = ".$this->fk_type.",";
-        $sql .= " fk_adherent = ".$this->fk_adherent.",";
-        $sql .= " note=".($this->note ? "'".$this->db->escape($this->note)."'" : 'null').",";
-        $sql .= " subscription = '".price2num($this->amount)."',";
-        $sql .= " dateadh='".$this->db->idate($this->dateh)."',";
-        $sql .= " datef='".$this->db->idate($this->datef)."',";
-        $sql .= " datec='".$this->db->idate($this->datec)."',";
-        $sql .= " fk_bank = ".($this->fk_bank ? $this->fk_bank : 'null');
-        $sql .= " WHERE rowid = ".$this->id;
+		$sql = "UPDATE ".MAIN_DB_PREFIX."subscription SET ";
+		$sql .= " fk_type = ".$this->fk_type.",";
+		$sql .= " fk_adherent = ".$this->fk_adherent.",";
+		$sql .= " note=".($this->note ? "'".$this->db->escape($this->note)."'" : 'null').",";
+		$sql .= " subscription = '".price2num($this->amount)."',";
+		$sql .= " dateadh='".$this->db->idate($this->dateh)."',";
+		$sql .= " datef='".$this->db->idate($this->datef)."',";
+		$sql .= " datec='".$this->db->idate($this->datec)."',";
+		$sql .= " fk_bank = ".($this->fk_bank ? $this->fk_bank : 'null');
+		$sql .= " WHERE rowid = ".$this->id;
 
-        dol_syslog(get_class($this)."::update", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if ($resql) {
-            require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
-            $member = new Adherent($this->db);
-            $result = $member->fetch($this->fk_adherent);
-            $result = $member->update_end_date($user);
+		dol_syslog(get_class($this)."::update", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
+			$member = new Adherent($this->db);
+			$result = $member->fetch($this->fk_adherent);
+			$result = $member->update_end_date($user);
 
-            if (!$error && !$notrigger) {
-            	$this->context = array('member'=>$member);
-            	// Call triggers
-                $result = $this->call_trigger('MEMBER_SUBSCRIPTION_MODIFY', $user);
-                if ($result < 0) { $error++; } //Do also here what you must do to rollback action if trigger fail
-                // End call triggers
-            }
-        } else {
-            $error++;
-            $this->error = $this->db->lasterror();
-        }
+			if (!$error && !$notrigger) {
+				$this->context = array('member'=>$member);
+				// Call triggers
+				$result = $this->call_trigger('MEMBER_SUBSCRIPTION_MODIFY', $user);
+				if ($result < 0) { $error++; } //Do also here what you must do to rollback action if trigger fail
+				// End call triggers
+			}
+		} else {
+			$error++;
+			$this->error = $this->db->lasterror();
+		}
 
-        // Commit or rollback
-        if ($error) {
-            $this->db->rollback();
-            return -1;
-        } else {
-            $this->db->commit();
-            return $this->id;
-        }
-    }
+		// Commit or rollback
+		if ($error) {
+			$this->db->rollback();
+			return -1;
+		} else {
+			$this->db->commit();
+			return $this->id;
+		}
+	}
 
-    /**
-     *	Delete a subscription
-     *
-     *	@param	User	$user		User that delete
-     *	@param 	bool 	$notrigger  false=launch triggers after, true=disable triggers
-     *	@return	int					<0 if KO, 0 if not found, >0 if OK
-     */
-    public function delete($user, $notrigger = false)
-    {
-        $error = 0;
+	/**
+	 *	Delete a subscription
+	 *
+	 *	@param	User	$user		User that delete
+	 *	@param 	bool 	$notrigger  false=launch triggers after, true=disable triggers
+	 *	@return	int					<0 if KO, 0 if not found, >0 if OK
+	 */
+	public function delete($user, $notrigger = false)
+	{
+		$error = 0;
 
-        // It subscription is linked to a bank transaction, we get it
-        if ($this->fk_bank > 0) {
-            require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
-            $accountline = new AccountLine($this->db);
-            $result = $accountline->fetch($this->fk_bank);
-        }
+		// It subscription is linked to a bank transaction, we get it
+		if ($this->fk_bank > 0) {
+			require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+			$accountline = new AccountLine($this->db);
+			$result = $accountline->fetch($this->fk_bank);
+		}
 
-        $this->db->begin();
+		$this->db->begin();
 
-        if (!$error) {
-            if (!$notrigger) {
-                // Call triggers
-                $result = $this->call_trigger('MEMBER_SUBSCRIPTION_DELETE', $user);
-                if ($result < 0) { $error++; } // Do also here what you must do to rollback action if trigger fail
-                // End call triggers
-            }
-        }
+		if (!$error) {
+			if (!$notrigger) {
+				// Call triggers
+				$result = $this->call_trigger('MEMBER_SUBSCRIPTION_DELETE', $user);
+				if ($result < 0) { $error++; } // Do also here what you must do to rollback action if trigger fail
+				// End call triggers
+			}
+		}
 
-        if (!$error) {
-            $sql = "DELETE FROM ".MAIN_DB_PREFIX."subscription WHERE rowid = ".$this->id;
-            dol_syslog(get_class($this)."::delete", LOG_DEBUG);
-            $resql = $this->db->query($sql);
-            if ($resql) {
-                $num = $this->db->affected_rows($resql);
-                if ($num) {
-                    require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
-                    $member = new Adherent($this->db);
-                    $result = $member->fetch($this->fk_adherent);
-                    $result = $member->update_end_date($user);
+		if (!$error) {
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX."subscription WHERE rowid = ".$this->id;
+			dol_syslog(get_class($this)."::delete", LOG_DEBUG);
+			$resql = $this->db->query($sql);
+			if ($resql) {
+				$num = $this->db->affected_rows($resql);
+				if ($num) {
+					require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
+					$member = new Adherent($this->db);
+					$result = $member->fetch($this->fk_adherent);
+					$result = $member->update_end_date($user);
 
-                    if ($this->fk_bank > 0 && is_object($accountline) && $accountline->id > 0) {	// If we found bank account line (this means this->fk_bank defined)
+					if ($this->fk_bank > 0 && is_object($accountline) && $accountline->id > 0) {	// If we found bank account line (this means this->fk_bank defined)
 						$result = $accountline->delete($user); // Return false if refused because line is conciliated
-                        if ($result > 0) {
-                            $this->db->commit();
-                            return 1;
-                        } else {
-                            $this->error = $accountline->error;
-                            $this->db->rollback();
-                            return -1;
-                        }
-                    } else {
-                        $this->db->commit();
-                        return 1;
-                    }
-                } else {
-                    $this->db->commit();
-                    return 0;
-                }
-            } else {
-                $error++;
-                $this->error = $this->db->lasterror();
-            }
-        }
+						if ($result > 0) {
+							$this->db->commit();
+							return 1;
+						} else {
+							$this->error = $accountline->error;
+							$this->db->rollback();
+							return -1;
+						}
+					} else {
+						$this->db->commit();
+						return 1;
+					}
+				} else {
+					$this->db->commit();
+					return 0;
+				}
+			} else {
+				$error++;
+				$this->error = $this->db->lasterror();
+			}
+		}
 
-        // Commit or rollback
-        if ($error) {
-            $this->db->rollback();
-            return -1;
-        } else {
-            $this->db->commit();
-            return 1;
-        }
-    }
+		// Commit or rollback
+		if ($error) {
+			$this->db->rollback();
+			return -1;
+		} else {
+			$this->db->commit();
+			return 1;
+		}
+	}
 
 
-    /**
-     *  Return clicable name (with picto eventually)
-     *
-     *	@param	int		$withpicto					0=No picto, 1=Include picto into link, 2=Only picto
-     *  @param	int  	$notooltip					1=Disable tooltip
-     *	@param	string	$option						Page for link ('', 'nolink', ...)
-     *  @param  string  $morecss        			Add more css on link
-     *  @param  int     $save_lastsearch_value    	-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
-     *	@return	string								Chaine avec URL
-     */
-    public function getNomUrl($withpicto = 0, $notooltip = 0, $option = '', $morecss = '', $save_lastsearch_value = -1)
-    {
-        global $langs;
+	/**
+	 *  Return clicable name (with picto eventually)
+	 *
+	 *	@param	int		$withpicto					0=No picto, 1=Include picto into link, 2=Only picto
+	 *  @param	int  	$notooltip					1=Disable tooltip
+	 *	@param	string	$option						Page for link ('', 'nolink', ...)
+	 *  @param  string  $morecss        			Add more css on link
+	 *  @param  int     $save_lastsearch_value    	-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+	 *	@return	string								Chaine avec URL
+	 */
+	public function getNomUrl($withpicto = 0, $notooltip = 0, $option = '', $morecss = '', $save_lastsearch_value = -1)
+	{
+		global $langs;
 
-        $result = '';
+		$result = '';
 
-        $langs->load("members");
-        $label = $langs->trans("ShowSubscription").': '.$this->ref;
+		$langs->load("members");
+		$label = $langs->trans("ShowSubscription").': '.$this->ref;
 
-        $url = DOL_URL_ROOT.'/adherents/subscription/card.php?rowid='.$this->id;
+		$url = DOL_URL_ROOT.'/adherents/subscription/card.php?rowid='.$this->id;
 
-        if ($option != 'nolink') {
-            // Add param to save lastsearch_values or not
-            $add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
-            if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
-            if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
-        }
+		if ($option != 'nolink') {
+			// Add param to save lastsearch_values or not
+			$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
+			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
+			if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
+		}
 
-        $linkstart = '<a href="'.$url.'" class="classfortooltip" title="'.dol_escape_htmltag($label, 1).'">';
-        $linkend = '</a>';
+		$linkstart = '<a href="'.$url.'" class="classfortooltip" title="'.dol_escape_htmltag($label, 1).'">';
+		$linkend = '</a>';
 
-        $picto = 'payment';
+		$picto = 'payment';
 
-        $result .= $linkstart;
-        if ($withpicto) $result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
-        if ($withpicto != 2) $result .= $this->ref;
-        $result .= $linkend;
+		$result .= $linkstart;
+		if ($withpicto) $result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+		if ($withpicto != 2) $result .= $this->ref;
+		$result .= $linkend;
 
-        return $result;
-    }
+		return $result;
+	}
 
 
-    /**
-     *  Retourne le libelle du statut d'une adhesion
-     *
-     *  @param	int		$mode       0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
-     *  @return string				Label
-     */
-    public function getLibStatut($mode = 0)
-    {
-        return '';
-    }
+	/**
+	 *  Retourne le libelle du statut d'une adhesion
+	 *
+	 *  @param	int		$mode       0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
+	 *  @return string				Label
+	 */
+	public function getLibStatut($mode = 0)
+	{
+		return '';
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Renvoi le libelle d'un statut donne
-     *
-     *  @param	int			$status      			Id status
-     *  @return string      						Label
-     */
-    public function LibStatut($status)
-    {
-        // phpcs:enable
-        global $langs;
-        $langs->load("members");
-        return '';
-    }
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Renvoi le libelle d'un statut donne
+	 *
+	 *  @param	int			$status      			Id status
+	 *  @return string      						Label
+	 */
+	public function LibStatut($status)
+	{
+		// phpcs:enable
+		global $langs;
+		$langs->load("members");
+		return '';
+	}
 
-    /**
-     *  Load information of the subscription object
-     *
-     *  @param	int		$id       Id subscription
-     *  @return	void
-     */
-    public function info($id)
-    {
-        $sql = 'SELECT c.rowid, c.datec,';
-        $sql .= ' c.tms as datem';
-        $sql .= ' FROM '.MAIN_DB_PREFIX.'subscription as c';
-        $sql .= ' WHERE c.rowid = '.$id;
+	/**
+	 *  Load information of the subscription object
+	 *
+	 *  @param	int		$id       Id subscription
+	 *  @return	void
+	 */
+	public function info($id)
+	{
+		$sql = 'SELECT c.rowid, c.datec,';
+		$sql .= ' c.tms as datem';
+		$sql .= ' FROM '.MAIN_DB_PREFIX.'subscription as c';
+		$sql .= ' WHERE c.rowid = '.$id;
 
-        $result = $this->db->query($sql);
-        if ($result) {
-            if ($this->db->num_rows($result)) {
-                $obj = $this->db->fetch_object($result);
-                $this->id = $obj->rowid;
+		$result = $this->db->query($sql);
+		if ($result) {
+			if ($this->db->num_rows($result)) {
+				$obj = $this->db->fetch_object($result);
+				$this->id = $obj->rowid;
 
-                $this->date_creation = $this->db->jdate($obj->datec);
-                $this->date_modification = $this->db->jdate($obj->datem);
-            }
+				$this->date_creation = $this->db->jdate($obj->datec);
+				$this->date_modification = $this->db->jdate($obj->datem);
+			}
 
-            $this->db->free($result);
-        } else {
-            dol_print_error($this->db);
-        }
-    }
+			$this->db->free($result);
+		} else {
+			dol_print_error($this->db);
+		}
+	}
 }
diff --git a/htdocs/adherents/document.php b/htdocs/adherents/document.php
index 0f6e6250796..f9c14b91ac3 100644
--- a/htdocs/adherents/document.php
+++ b/htdocs/adherents/document.php
@@ -86,7 +86,7 @@ $helpurl = "EN:Module_Foundations|FR:Module_Adh&eacute;rents|ES:M&oacute;dulo_Mi
 llxHeader("", $title, $helpurl);
 
 if ($id > 0) {
-    $result = $membert->fetch($object->typeid);
+	$result = $membert->fetch($object->typeid);
 	if ($result > 0) {
 		// Build file list
 		$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
@@ -95,47 +95,47 @@ if ($id > 0) {
 			$totalsize += $file['size'];
 		}
 
-	    if (!empty($conf->notification->enabled))
+		if (!empty($conf->notification->enabled))
 			$langs->load("mails");
 
 		$head = member_prepare_head($object);
 
 		print dol_get_fiche_head($head, 'document', $langs->trans("Member"), -1, 'user');
 
-    	$linkback = '<a href="'.DOL_URL_ROOT.'/adherents/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+		$linkback = '<a href="'.DOL_URL_ROOT.'/adherents/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-    	dol_banner_tab($object, 'rowid', $linkback);
+		dol_banner_tab($object, 'rowid', $linkback);
 
-        print '<div class="fichecenter">';
+		print '<div class="fichecenter">';
 
-        print '<div class="underbanner clearboth"></div>';
+		print '<div class="underbanner clearboth"></div>';
 		print '<table class="border tableforfield centpercent">';
 
 		$linkback = '<a href="'.DOL_URL_ROOT.'/adherents/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-        // Login
-        if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) {
-            print '<tr><td class="titlefield">'.$langs->trans("Login").' / '.$langs->trans("Id").'</td><td class="valeur">'.$object->login.'&nbsp;</td></tr>';
-        }
+		// Login
+		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) {
+			print '<tr><td class="titlefield">'.$langs->trans("Login").' / '.$langs->trans("Id").'</td><td class="valeur">'.$object->login.'&nbsp;</td></tr>';
+		}
 
-        // Type
-        print '<tr><td>'.$langs->trans("Type").'</td><td class="valeur">'.$membert->getNomUrl(1)."</td></tr>\n";
+		// Type
+		print '<tr><td>'.$langs->trans("Type").'</td><td class="valeur">'.$membert->getNomUrl(1)."</td></tr>\n";
 
-        // Morphy
-        print '<tr><td class="titlefield">'.$langs->trans("MemberNature").'</td><td class="valeur" >'.$object->getmorphylib().'</td>';
-        /*print '<td rowspan="'.$rowspan.'" class="center" valign="middle" width="25%">';
+		// Morphy
+		print '<tr><td class="titlefield">'.$langs->trans("MemberNature").'</td><td class="valeur" >'.$object->getmorphylib().'</td>';
+		/*print '<td rowspan="'.$rowspan.'" class="center" valign="middle" width="25%">';
         print $form->showphoto('memberphoto',$object);
         print '</td>';*/
-        print '</tr>';
+		print '</tr>';
 
-        // Company
-        print '<tr><td>'.$langs->trans("Company").'</td><td class="valeur">'.$object->company.'</td></tr>';
+		// Company
+		print '<tr><td>'.$langs->trans("Company").'</td><td class="valeur">'.$object->company.'</td></tr>';
 
-        // Civility
-        print '<tr><td>'.$langs->trans("UserTitle").'</td><td class="valeur">'.$object->getCivilityLabel().'&nbsp;</td>';
-        print '</tr>';
+		// Civility
+		print '<tr><td>'.$langs->trans("UserTitle").'</td><td class="valeur">'.$object->getCivilityLabel().'&nbsp;</td>';
+		print '</tr>';
 
-    	// Number of Attached Files
+		// Number of Attached Files
 		print '<tr><td>'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
 
 		//Total Size Of Attached Files
@@ -145,7 +145,7 @@ if ($id > 0) {
 
 		print '</div>';
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 		$modulepart = 'member';
 		$permission = $user->rights->adherent->creer;
@@ -157,7 +157,7 @@ if ($id > 0) {
 		dol_print_error($db);
 	}
 } else {
-    $langs->load("errors");
+	$langs->load("errors");
 	print $langs->trans("ErrorRecordNotFound");
 }
 
diff --git a/htdocs/adherents/index.php b/htdocs/adherents/index.php
index aa7564007a6..35b0fcfb478 100644
--- a/htdocs/adherents/index.php
+++ b/htdocs/adherents/index.php
@@ -125,29 +125,29 @@ 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 contact/address
-    if (!empty($conf->adherent->enabled) && $user->rights->adherent->lire) {
-    	$listofsearchfields['search_member'] = array('text'=>'Member');
-    }
+	if (!empty($conf->adherent->enabled) && $user->rights->adherent->lire) {
+		$listofsearchfields['search_member'] = array('text'=>'Member');
+	}
 
-    if (count($listofsearchfields)) {
-    	print '<form method="post" action="'.DOL_URL_ROOT.'/core/search.php">';
-    	print '<input type="hidden" name="token" value="'.newToken().'">';
-        print '<div class="div-table-responsive-no-min">';
-    	print '<table class="noborder nohover centpercent">';
-    	$i = 0;
-    	foreach ($listofsearchfields as $key => $value) {
-    		if ($i == 0) print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
-    		print '<tr class="oddeven">';
-    		print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label>:</td><td><input type="text" class="flat inputsearch" name="'.$key.'" id="'.$key.'" size="18"></td>';
-    		if ($i == 0) print '<td rowspan="'.count($listofsearchfields).'"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
-    		print '</tr>';
-    		$i++;
-    	}
-    	print '</table>';
-        print '</div>';
-    	print '</form>';
-    	print '<br>';
-    }
+	if (count($listofsearchfields)) {
+		print '<form method="post" action="'.DOL_URL_ROOT.'/core/search.php">';
+		print '<input type="hidden" name="token" value="'.newToken().'">';
+		print '<div class="div-table-responsive-no-min">';
+		print '<table class="noborder nohover centpercent">';
+		$i = 0;
+		foreach ($listofsearchfields as $key => $value) {
+			if ($i == 0) print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
+			print '<tr class="oddeven">';
+			print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label>:</td><td><input type="text" class="flat inputsearch" name="'.$key.'" id="'.$key.'" size="18"></td>';
+			if ($i == 0) print '<td rowspan="'.count($listofsearchfields).'"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
+			print '</tr>';
+			$i++;
+		}
+		print '</table>';
+		print '</div>';
+		print '</form>';
+		print '<br>';
+	}
 }
 
 
@@ -158,53 +158,53 @@ if (!empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS)) {     // This is usel
 if ($conf->use_javascript_ajax) {
 	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").'</th></tr>';
-    print '<tr><td class="center" colspan="2">';
+	print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Statistics").'</th></tr>';
+	print '<tr><td class="center" colspan="2">';
 
-    $SommeA = 0;
-    $SommeB = 0;
-    $SommeC = 0;
-    $SommeD = 0;
-    $total = 0;
-    $dataval = array();
-    $i = 0;
-    foreach ($AdherentType as $key => $adhtype) {
-        $dataval['draft'][] = array($i, isset($MemberToValidate[$key]) ? $MemberToValidate[$key] : 0);
-        $dataval['notuptodate'][] = array($i, isset($MembersValidated[$key]) ? $MembersValidated[$key] - (isset($MemberUpToDate[$key]) ? $MemberUpToDate[$key] : 0) : 0);
-        $dataval['uptodate'][] = array($i, isset($MemberUpToDate[$key]) ? $MemberUpToDate[$key] : 0);
-        $dataval['resiliated'][] = array($i, isset($MembersResiliated[$key]) ? $MembersResiliated[$key] : 0);
-        $SommeA += isset($MemberToValidate[$key]) ? $MemberToValidate[$key] : 0;
-        $SommeB += isset($MembersValidated[$key]) ? $MembersValidated[$key] - (isset($MemberUpToDate[$key]) ? $MemberUpToDate[$key] : 0) : 0;
-        $SommeC += isset($MemberUpToDate[$key]) ? $MemberUpToDate[$key] : 0;
-        $SommeD += isset($MembersResiliated[$key]) ? $MembersResiliated[$key] : 0;
-        $i++;
-    }
-    $total = $SommeA + $SommeB + $SommeC + $SommeD;
-    $dataseries = array();
-    $dataseries[] = array($langs->transnoentitiesnoconv("MenuMembersNotUpToDate"), round($SommeB));
-    $dataseries[] = array($langs->transnoentitiesnoconv("MenuMembersUpToDate"), round($SommeC));
-    $dataseries[] = array($langs->transnoentitiesnoconv("MembersStatusResiliated"), round($SommeD));
-    $dataseries[] = array($langs->transnoentitiesnoconv("MembersStatusToValid"), round($SommeA));
+	$SommeA = 0;
+	$SommeB = 0;
+	$SommeC = 0;
+	$SommeD = 0;
+	$total = 0;
+	$dataval = array();
+	$i = 0;
+	foreach ($AdherentType as $key => $adhtype) {
+		$dataval['draft'][] = array($i, isset($MemberToValidate[$key]) ? $MemberToValidate[$key] : 0);
+		$dataval['notuptodate'][] = array($i, isset($MembersValidated[$key]) ? $MembersValidated[$key] - (isset($MemberUpToDate[$key]) ? $MemberUpToDate[$key] : 0) : 0);
+		$dataval['uptodate'][] = array($i, isset($MemberUpToDate[$key]) ? $MemberUpToDate[$key] : 0);
+		$dataval['resiliated'][] = array($i, isset($MembersResiliated[$key]) ? $MembersResiliated[$key] : 0);
+		$SommeA += isset($MemberToValidate[$key]) ? $MemberToValidate[$key] : 0;
+		$SommeB += isset($MembersValidated[$key]) ? $MembersValidated[$key] - (isset($MemberUpToDate[$key]) ? $MemberUpToDate[$key] : 0) : 0;
+		$SommeC += isset($MemberUpToDate[$key]) ? $MemberUpToDate[$key] : 0;
+		$SommeD += isset($MembersResiliated[$key]) ? $MembersResiliated[$key] : 0;
+		$i++;
+	}
+	$total = $SommeA + $SommeB + $SommeC + $SommeD;
+	$dataseries = array();
+	$dataseries[] = array($langs->transnoentitiesnoconv("MenuMembersNotUpToDate"), round($SommeB));
+	$dataseries[] = array($langs->transnoentitiesnoconv("MenuMembersUpToDate"), round($SommeC));
+	$dataseries[] = array($langs->transnoentitiesnoconv("MembersStatusResiliated"), round($SommeD));
+	$dataseries[] = array($langs->transnoentitiesnoconv("MembersStatusToValid"), round($SommeA));
 
-    include_once DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/theme_vars.inc.php';
+	include_once DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/theme_vars.inc.php';
 
-    include_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
-    $dolgraph = new DolGraph();
-    $dolgraph->SetData($dataseries);
-    $dolgraph->SetDataColor(array($badgeStatus1, $badgeStatus4, $badgeStatus6, '-'.$badgeStatus0));
-    $dolgraph->setShowLegend(2);
-    $dolgraph->setShowPercent(1);
-    $dolgraph->SetType(array('pie'));
-    $dolgraph->setHeight('200');
-    $dolgraph->draw('idgraphstatus');
-    print $dolgraph->show($total ? 0 : 1);
+	include_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
+	$dolgraph = new DolGraph();
+	$dolgraph->SetData($dataseries);
+	$dolgraph->SetDataColor(array($badgeStatus1, $badgeStatus4, $badgeStatus6, '-'.$badgeStatus0));
+	$dolgraph->setShowLegend(2);
+	$dolgraph->setShowPercent(1);
+	$dolgraph->SetType(array('pie'));
+	$dolgraph->setHeight('200');
+	$dolgraph->draw('idgraphstatus');
+	print $dolgraph->show($total ? 0 : 1);
 
-    print '</td></tr>';
-    print '<tr class="liste_total"><td>'.$langs->trans("Total").'</td><td class="right">';
-    print $SommeA + $SommeB + $SommeC + $SommeD;
-    print '</td></tr>';
-    print '</table>';
-    print '</div>';
+	print '</td></tr>';
+	print '<tr class="liste_total"><td>'.$langs->trans("Total").'</td><td class="right">';
+	print $SommeA + $SommeB + $SommeC + $SommeD;
+	print '</td></tr>';
+	print '</table>';
+	print '</div>';
 }
 
 print '<br>';
@@ -223,17 +223,17 @@ $sql .= " AND d.rowid = c.fk_adherent";
 
 $result = $db->query($sql);
 if ($result) {
-    $num = $db->num_rows($result);
-    $i = 0;
-    while ($i < $num) {
-        $objp = $db->fetch_object($result);
-        $year = dol_print_date($db->jdate($objp->dateh), "%Y");
-        $Total[$year] = (isset($Total[$year]) ? $Total[$year] : 0) + $objp->subscription;
-        $Number[$year] = (isset($Number[$year]) ? $Number[$year] : 0) + 1;
-        $tot += $objp->subscription;
-        $numb += 1;
-        $i++;
-    }
+	$num = $db->num_rows($result);
+	$i = 0;
+	while ($i < $num) {
+		$objp = $db->fetch_object($result);
+		$year = dol_print_date($db->jdate($objp->dateh), "%Y");
+		$Total[$year] = (isset($Total[$year]) ? $Total[$year] : 0) + $objp->subscription;
+		$Number[$year] = (isset($Number[$year]) ? $Number[$year] : 0) + 1;
+		$tot += $objp->subscription;
+		$numb += 1;
+		$i++;
+	}
 }
 
 print '<div class="div-table-responsive-no-min">';
@@ -258,12 +258,12 @@ foreach ($Total as $key=>$value) {
 		break;
 	}
 	print '<tr class="oddeven">';
-    print "<td><a href=\"./subscription/list.php?date_select=$key\">$key</a></td>";
-    print "<td class=\"right\">".$Number[$key]."</td>";
-    print "<td class=\"right\">".price($value)."</td>";
-    print "<td class=\"right\">".price(price2num($value / $Number[$key], 'MT'))."</td>";
-    print "</tr>\n";
-    $i++;
+	print "<td><a href=\"./subscription/list.php?date_select=$key\">$key</a></td>";
+	print "<td class=\"right\">".$Number[$key]."</td>";
+	print "<td class=\"right\">".price($value)."</td>";
+	print "<td class=\"right\">".price(price2num($value / $Number[$key], 'MT'))."</td>";
+	print "</tr>\n";
+	$i++;
 }
 
 // Total
@@ -284,10 +284,10 @@ print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
  */
 $max = $conf->global->MAIN_SIZE_SHORTLIST_LIMIT;
 
-$sql = "SELECT a.rowid, a.statut, a.lastname, a.firstname, a.societe as company, a.fk_soc,";
+$sql = "SELECT a.rowid, a.statut as status, a.lastname, a.firstname, a.societe as company, a.fk_soc,";
 $sql .= " a.gender, a.email, a.photo, a.morphy,";
-$sql .= " a.tms as datem, datefin as date_end_subscription,";
-$sql .= " ta.rowid as typeid, ta.libelle as label, ta.subscription";
+$sql .= " a.tms as datem, a.datefin as date_end_subscription,";
+$sql .= " ta.rowid as typeid, ta.libelle as label, ta.subscription as need_subscription";
 $sql .= " FROM ".MAIN_DB_PREFIX."adherent as a, ".MAIN_DB_PREFIX."adherent_type as ta";
 $sql .= " WHERE a.entity IN (".getEntity('adherent').")";
 $sql .= " AND a.fk_adherent_type = ta.rowid";
@@ -306,7 +306,7 @@ if ($resql) {
 		$i = 0;
 		while ($i < $num) {
 			$obj = $db->fetch_object($resql);
-			print '<tr class="oddeven">';
+
 			$staticmember->id = $obj->rowid;
 			$staticmember->ref = $obj->rowid;
 			$staticmember->lastname = $obj->lastname;
@@ -315,6 +315,9 @@ if ($resql) {
 			$staticmember->email = $obj->email;
 			$staticmember->photo = $obj->photo;
 			$staticmember->morphy = $obj->morphy;
+			$staticmember->statut = $obj->status;
+			$staticmember->need_subscription = $obj->need_subscription;
+			$staticmember->datefin = $db->jdate($obj->date_end_subscription);
 			if (!empty($obj->fk_soc)) {
 				$staticmember->fk_soc = $obj->fk_soc;
 				$staticmember->fetch_thirdparty();
@@ -322,12 +325,16 @@ if ($resql) {
 			} else {
 				$staticmember->name = $obj->company;
 			}
+
 			$statictype->id = $obj->typeid;
 			$statictype->label = $obj->label;
+			$statictype->subscription = $obj->need_subscription;
+
+			print '<tr class="oddeven">';
 			print '<td class="nowraponall">'.$staticmember->getNomUrl(-1, 32).'</td>';
 			print '<td>'.$statictype->getNomUrl(1, 32).'</td>';
 			print '<td>'.dol_print_date($db->jdate($obj->datem), 'dayhour').'</td>';
-			print '<td class="right">'.$staticmember->LibStatut($obj->statut, ($obj->subscription == 'yes' ? 1 : 0), $db->jdate($obj->date_end_subscription), 3).'</td>';
+			print '<td class="right">'.$staticmember->getLibStatut(3).'</td>';
 			print '</tr>';
 			$i++;
 		}
@@ -344,12 +351,14 @@ if ($resql) {
  */
 $max = $conf->global->MAIN_SIZE_SHORTLIST_LIMIT;
 
-$sql = "SELECT a.rowid, a.statut, a.lastname, a.firstname, a.societe as company, a.fk_soc,";
+$sql = "SELECT a.rowid, a.statut as status, a.lastname, a.firstname, a.societe as company, a.fk_soc,";
 $sql .= " a.gender, a.email, a.photo, a.morphy,";
 $sql .= " a.datefin as date_end_subscription,";
+$sql .= " ta.rowid as typeid, ta.libelle as label, ta.subscription as need_subscription,";
 $sql .= " c.rowid as cid, c.tms as datem, c.datec as datec, c.dateadh as date_start, c.datef as date_end, c.subscription";
-$sql .= " FROM ".MAIN_DB_PREFIX."adherent as a, ".MAIN_DB_PREFIX."subscription as c";
+$sql .= " FROM ".MAIN_DB_PREFIX."adherent as a, ".MAIN_DB_PREFIX."adherent_type as ta, ".MAIN_DB_PREFIX."subscription as c";
 $sql .= " WHERE a.entity IN (".getEntity('adherent').")";
+$sql .= " AND a.fk_adherent_type = ta.rowid";
 $sql .= " AND c.fk_adherent = a.rowid";
 $sql .= $db->order("c.tms", "DESC");
 $sql .= $db->plimit($max, 0);
@@ -366,9 +375,7 @@ if ($resql) {
 		$i = 0;
 		while ($i < $num) {
 			$obj = $db->fetch_object($resql);
-			print '<tr class="oddeven">';
-			$subscriptionstatic->id = $obj->cid;
-			$subscriptionstatic->ref = $obj->cid;
+
 			$staticmember->id = $obj->rowid;
 			$staticmember->ref = $obj->rowid;
 			$staticmember->lastname = $obj->lastname;
@@ -377,6 +384,9 @@ if ($resql) {
 			$staticmember->email = $obj->email;
 			$staticmember->photo = $obj->photo;
 			$staticmember->morphy = $obj->morphy;
+			$staticmember->statut = $obj->status;
+			$staticmember->need_subscription = $obj->need_subscription;
+			$staticmember->datefin = $db->jdate($obj->date_end_subscription);
 			if (!empty($obj->fk_soc)) {
 				$staticmember->fk_soc = $obj->fk_soc;
 				$staticmember->fetch_thirdparty();
@@ -384,6 +394,11 @@ if ($resql) {
 			} else {
 				$staticmember->name = $obj->company;
 			}
+
+			$subscriptionstatic->id = $obj->cid;
+			$subscriptionstatic->ref = $obj->cid;
+
+			print '<tr class="oddeven">';
 			print '<td class="nowraponall">'.$subscriptionstatic->getNomUrl(1).'</td>';
 			print '<td class="nowraponall">'.$staticmember->getNomUrl(-1, 32, 'subscription').'</td>';
 			print '<td class="nowraponall">'.get_date_range($db->jdate($obj->date_start), $db->jdate($obj->date_end)).'</td>';
diff --git a/htdocs/adherents/ldap.php b/htdocs/adherents/ldap.php
index 80fdfc99479..6be535b6e3b 100644
--- a/htdocs/adherents/ldap.php
+++ b/htdocs/adherents/ldap.php
@@ -38,7 +38,7 @@ $action = GETPOST('action', 'aZ09');
 // Protection
 $socid = 0;
 if ($user->socid > 0) {
-    $socid = $user->socid;
+	$socid = $user->socid;
 }
 
 $object = new Adherent($db);
@@ -128,7 +128,7 @@ print '</table>';
 
 print '</div>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 /*
  * Barre d'actions
@@ -165,24 +165,24 @@ if ($result > 0) {
 	$search = "(".$object->_load_ldap_dn($info, 2).")";
 
 	if (empty($dn)) {
-	    $langs->load("errors");
-	    print '<tr class="oddeven"><td colspan="2"><font class="error">'.$langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("Member")).'</font></td></tr>';
+		$langs->load("errors");
+		print '<tr class="oddeven"><td colspan="2"><font class="error">'.$langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("Member")).'</font></td></tr>';
 	} else {
-    	$records = $ldap->getAttribute($dn, $search);
+		$records = $ldap->getAttribute($dn, $search);
 
-    	//print_r($records);
+		//print_r($records);
 
-    	// Show tree
-    	if (((!is_numeric($records)) || $records != 0) && (!isset($records['count']) || $records['count'] > 0)) {
-    		if (!is_array($records)) {
-    			print '<tr class="oddeven"><td colspan="2"><font class="error">'.$langs->trans("ErrorFailedToReadLDAP").'</font></td></tr>';
-    		} else {
-    			$result = show_ldap_content($records, 0, $records['count'], true);
-    		}
-    	} else {
-    		print '<tr class="oddeven"><td colspan="2">'.$langs->trans("LDAPRecordNotFound").' (dn='.$dn.' - search='.$search.')</td></tr>';
-    	}
-    }
+		// Show tree
+		if (((!is_numeric($records)) || $records != 0) && (!isset($records['count']) || $records['count'] > 0)) {
+			if (!is_array($records)) {
+				print '<tr class="oddeven"><td colspan="2"><font class="error">'.$langs->trans("ErrorFailedToReadLDAP").'</font></td></tr>';
+			} else {
+				$result = show_ldap_content($records, 0, $records['count'], true);
+			}
+		} else {
+			print '<tr class="oddeven"><td colspan="2">'.$langs->trans("LDAPRecordNotFound").' (dn='.$dn.' - search='.$search.')</td></tr>';
+		}
+	}
 
 	$ldap->unbind();
 	$ldap->close();
diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
index 05100582ec2..c9aaa856d22 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -204,30 +204,30 @@ if (empty($reshook)) {
 
 	// Close
 	if ($massaction == 'close' && $user->rights->adherent->creer) {
-	    $tmpmember = new Adherent($db);
-	    $error = 0;
-	    $nbclose = 0;
+		$tmpmember = new Adherent($db);
+		$error = 0;
+		$nbclose = 0;
 
-	    $db->begin();
+		$db->begin();
 
-        foreach ($toselect as $idtoclose) {
-            $tmpmember->fetch($idtoclose);
-            $result = $tmpmember->resiliate($user);
+		foreach ($toselect as $idtoclose) {
+			$tmpmember->fetch($idtoclose);
+			$result = $tmpmember->resiliate($user);
 
-            if ($result < 0 && !count($tmpmember->errors)) {
-    	        setEventMessages($tmpmember->error, $tmpmember->errors, 'errors');
-    	    } else {
-    	        if ($result > 0) $nbclose++;
-    	    }
-        }
+			if ($result < 0 && !count($tmpmember->errors)) {
+				setEventMessages($tmpmember->error, $tmpmember->errors, 'errors');
+			} else {
+				if ($result > 0) $nbclose++;
+			}
+		}
 
-        if (!$error) {
-            setEventMessages($langs->trans("XMembersClosed", $nbclose), null, 'mesgs');
+		if (!$error) {
+			setEventMessages($langs->trans("XMembersClosed", $nbclose), null, 'mesgs');
 
-            $db->commit();
-        } else {
-            $db->rollback();
-        }
+			$db->commit();
+		} else {
+			$db->rollback();
+		}
 	}
 
 	// Mass actions
@@ -409,7 +409,7 @@ $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
 $newcardbutton = '';
 if ($user->rights->adherent->creer) {
-    $newcardbutton .= dolGetButtonTitle($langs->trans('NewMember'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/adherents/card.php?action=create');
+	$newcardbutton .= dolGetButtonTitle($langs->trans('NewMember'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/adherents/card.php?action=create');
 }
 
 print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
@@ -560,7 +560,7 @@ if (!empty($arrayfields['d.email']['checked'])) {
 // End of subscription date
 if (!empty($arrayfields['d.datefin']['checked'])) {
 	print '<td class="liste_titre left">';
-	$selectarray=array('-1'=>'', 'withoutsubscription'=>$langs->trans("WithoutSubscription"), 'uptodate'=>$langs->trans("UpToDate"), 'outofdate'=>$langs->trans("OutOfDate"));
+	$selectarray = array('-1'=>'', 'withoutsubscription'=>$langs->trans("WithoutSubscription"), 'uptodate'=>$langs->trans("UpToDate"), 'outofdate'=>$langs->trans("OutOfDate"));
 	print $form->selectarray('search_filter', $selectarray, $search_filter);
 	print '</td>';
 }
diff --git a/htdocs/adherents/note.php b/htdocs/adherents/note.php
index 4026dded2a2..e611eb3bbcf 100644
--- a/htdocs/adherents/note.php
+++ b/htdocs/adherents/note.php
@@ -40,8 +40,8 @@ $result = restrictedArea($user, 'adherent', $id);
 $object = new Adherent($db);
 $result = $object->fetch($id);
 if ($result > 0) {
-    $adht = new AdherentType($db);
-    $result = $adht->fetch($object->typeid);
+	$adht = new AdherentType($db);
+	$result = $adht->fetch($object->typeid);
 }
 
 $permissionnote = $user->rights->adherent->creer; // Used by the include of actions_setnotes.inc.php
@@ -75,44 +75,44 @@ if ($id) {
 
 	dol_banner_tab($object, 'id', $linkback);
 
-    print '<div class="fichecenter">';
+	print '<div class="fichecenter">';
 
-    print '<div class="underbanner clearboth"></div>';
+	print '<div class="underbanner clearboth"></div>';
 	print '<table class="border centpercent tableforfield">';
 
-    // Login
-    if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) {
-        print '<tr><td class="titlefield">'.$langs->trans("Login").' / '.$langs->trans("Id").'</td><td class="valeur">'.$object->login.'&nbsp;</td></tr>';
-    }
+	// Login
+	if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) {
+		print '<tr><td class="titlefield">'.$langs->trans("Login").' / '.$langs->trans("Id").'</td><td class="valeur">'.$object->login.'&nbsp;</td></tr>';
+	}
 
-    // Type
-    print '<tr><td>'.$langs->trans("Type").'</td><td class="valeur">'.$adht->getNomUrl(1)."</td></tr>\n";
+	// Type
+	print '<tr><td>'.$langs->trans("Type").'</td><td class="valeur">'.$adht->getNomUrl(1)."</td></tr>\n";
 
-    // Morphy
-    print '<tr><td class="titlefield">'.$langs->trans("MemberNature").'</td><td class="valeur" >'.$object->getmorphylib().'</td>';
-    /*print '<td rowspan="'.$rowspan.'" class="center" valign="middle" width="25%">';
+	// Morphy
+	print '<tr><td class="titlefield">'.$langs->trans("MemberNature").'</td><td class="valeur" >'.$object->getmorphylib().'</td>';
+	/*print '<td rowspan="'.$rowspan.'" class="center" valign="middle" width="25%">';
     print $form->showphoto('memberphoto',$member);
     print '</td>';*/
-    print '</tr>';
+	print '</tr>';
 
-    // Company
-    print '<tr><td>'.$langs->trans("Company").'</td><td class="valeur">'.$object->company.'</td></tr>';
+	// Company
+	print '<tr><td>'.$langs->trans("Company").'</td><td class="valeur">'.$object->company.'</td></tr>';
 
-    // Civility
-    print '<tr><td>'.$langs->trans("UserTitle").'</td><td class="valeur">'.$object->getCivilityLabel().'&nbsp;</td>';
-    print '</tr>';
+	// Civility
+	print '<tr><td>'.$langs->trans("UserTitle").'</td><td class="valeur">'.$object->getCivilityLabel().'&nbsp;</td>';
+	print '</tr>';
 
-    print "</table>";
+	print "</table>";
 
-    print '</div>';
+	print '</div>';
 
 
-    $cssclass = 'titlefield';
-    $permission = $user->rights->adherent->creer; // Used by the include of notes.tpl.php
-    include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
+	$cssclass = 'titlefield';
+	$permission = $user->rights->adherent->creer; // Used by the include of notes.tpl.php
+	include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
 
 
-    dol_fiche_end();
+	print dol_get_fiche_end();
 }
 
 // End of page
diff --git a/htdocs/adherents/stats/byproperties.php b/htdocs/adherents/stats/byproperties.php
index 0a5bee034c2..73c32c59684 100644
--- a/htdocs/adherents/stats/byproperties.php
+++ b/htdocs/adherents/stats/byproperties.php
@@ -34,8 +34,8 @@ $mode = GETPOST('mode') ?GETPOST('mode') : '';
 
 // Security check
 if ($user->socid > 0) {
-    $action = '';
-    $socid = $user->socid;
+	$action = '';
+	$socid = $user->socid;
 }
 $result = restrictedArea($user, 'adherent', '', '', 'cotisation');
 
@@ -69,7 +69,7 @@ $sql .= " d.morphy as code";
 $sql .= " FROM ".MAIN_DB_PREFIX."adherent as d";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."subscription as s ON s.fk_adherent = d.rowid";
 $sql .= " WHERE d.entity IN (".getEntity('adherent').")";
-$sql .= " AND d.statut != -1";	// Not draft
+$sql .= " AND d.statut != -1"; // Not draft
 $sql .= " GROUP BY d.morphy";
 $foundphy = $foundmor = 0;
 
@@ -100,7 +100,7 @@ $sql .= " d.morphy as code";
 $sql .= " FROM ".MAIN_DB_PREFIX."adherent as d";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."subscription as s ON s.fk_adherent = d.rowid";
 $sql .= " WHERE d.entity IN (".getEntity('adherent').")";
-$sql .= " AND d.statut >= 1";	// Active (not draft=-1, not resiliated=0)
+$sql .= " AND d.statut >= 1"; // Active (not draft=-1, not resiliated=0)
 $sql .= " GROUP BY d.morphy";
 $foundphy = $foundmor = 0;
 
@@ -173,7 +173,7 @@ foreach ($data as $val) {
 print '</table>';
 print '</div>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // End of page
 llxFooter();
diff --git a/htdocs/adherents/stats/geo.php b/htdocs/adherents/stats/geo.php
index 44da065d888..c24cf1fdef4 100644
--- a/htdocs/adherents/stats/geo.php
+++ b/htdocs/adherents/stats/geo.php
@@ -35,8 +35,8 @@ $mode = GETPOST('mode') ?GETPOST('mode') : '';
 
 // Security check
 if ($user->socid > 0) {
-    $action = '';
-    $socid = $user->socid;
+	$action = '';
+	$socid = $user->socid;
 }
 $result = restrictedArea($user, 'adherent', '', '', 'cotisation');
 
@@ -68,129 +68,129 @@ print load_fiche_titre($title, '', 'object_group');
 dol_mkdir($dir);
 
 if ($mode) {
-    // Define sql
-    if ($mode == 'memberbycountry') {
-        $label = $langs->trans("Country");
-        $tab = 'statscountry';
+	// Define sql
+	if ($mode == 'memberbycountry') {
+		$label = $langs->trans("Country");
+		$tab = 'statscountry';
 
-        $data = array();
-        $sql .= "SELECT COUNT(DISTINCT d.rowid) as nb, COUNT(s.rowid) as nbsubscriptions, MAX(d.datevalid) as lastdate, MAX(s.dateadh) as lastsubscriptiondate, c.code, c.label";
-        $sql .= " FROM ".MAIN_DB_PREFIX."adherent as d";
-        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as c on d.country = c.rowid";
-        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."subscription as s ON s.fk_adherent = d.rowid";
-        $sql .= " WHERE d.entity IN (".getEntity('adherent').")";
-        $sql .= " AND d.statut != -1";
-        $sql .= " GROUP BY c.label, c.code";
-        //print $sql;
-    }
+		$data = array();
+		$sql .= "SELECT COUNT(DISTINCT d.rowid) as nb, COUNT(s.rowid) as nbsubscriptions, MAX(d.datevalid) as lastdate, MAX(s.dateadh) as lastsubscriptiondate, c.code, c.label";
+		$sql .= " FROM ".MAIN_DB_PREFIX."adherent as d";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as c on d.country = c.rowid";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."subscription as s ON s.fk_adherent = d.rowid";
+		$sql .= " WHERE d.entity IN (".getEntity('adherent').")";
+		$sql .= " AND d.statut != -1";
+		$sql .= " GROUP BY c.label, c.code";
+		//print $sql;
+	}
 
 	if ($mode == 'memberbystate') {
-        $label = $langs->trans("Country");
-        $label2 = $langs->trans("State");
-        $tab = 'statsstate';
-
-        $data = array();
-        $sql .= "SELECT COUNT(DISTINCT d.rowid) as nb, COUNT(s.rowid) as nbsubscriptions, MAX(d.datevalid) as lastdate, MAX(s.dateadh) as lastsubscriptiondate, co.code, co.label, c.nom as label2"; //
-        $sql .= " FROM ".MAIN_DB_PREFIX."adherent as d";
-        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as c on d.state_id = c.rowid";
-        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_regions as r on c.fk_region = r.code_region";
-        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as co on d.country = co.rowid";
-        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."subscription as s ON s.fk_adherent = d.rowid";
-        $sql .= " WHERE d.entity IN (".getEntity('adherent').")";
-        $sql .= " AND d.statut != -1";
-        $sql .= " GROUP BY co.label, co.code, c.nom";
-        //print $sql;
-    }
-    if ($mode == 'memberbyregion') { //
 		$label = $langs->trans("Country");
-        $label2 = $langs->trans("Region"); //département
-        $tab = 'statsregion'; //onglet
+		$label2 = $langs->trans("State");
+		$tab = 'statsstate';
 
-        $data = array(); //tableau de donnée
-        $sql .= "SELECT COUNT(DISTINCT d.rowid) as nb, COUNT(s.rowid) as nbsubscriptions, MAX(d.datevalid) as lastdate, MAX(s.dateadh) as lastsubscriptiondate, co.code, co.label, r.nom as label2";
-        $sql .= " FROM ".MAIN_DB_PREFIX."adherent as d";
-        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as c on d.state_id = c.rowid";
-        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_regions as r on c.fk_region = r.code_region";
-        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as co on d.country = co.rowid";
-        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."subscription as s ON s.fk_adherent = d.rowid";
-        $sql .= " WHERE d.entity IN (".getEntity('adherent').")";
-        $sql .= " AND d.statut != -1";
-        $sql .= " GROUP BY co.label, co.code, r.nom"; //+
-        //print $sql;
-    }
-    if ($mode == 'memberbytown') {
-        $label = $langs->trans("Country");
-        $label2 = $langs->trans("Town");
-        $tab = 'statstown';
+		$data = array();
+		$sql .= "SELECT COUNT(DISTINCT d.rowid) as nb, COUNT(s.rowid) as nbsubscriptions, MAX(d.datevalid) as lastdate, MAX(s.dateadh) as lastsubscriptiondate, co.code, co.label, c.nom as label2"; //
+		$sql .= " FROM ".MAIN_DB_PREFIX."adherent as d";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as c on d.state_id = c.rowid";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_regions as r on c.fk_region = r.code_region";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as co on d.country = co.rowid";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."subscription as s ON s.fk_adherent = d.rowid";
+		$sql .= " WHERE d.entity IN (".getEntity('adherent').")";
+		$sql .= " AND d.statut != -1";
+		$sql .= " GROUP BY co.label, co.code, c.nom";
+		//print $sql;
+	}
+	if ($mode == 'memberbyregion') { //
+		$label = $langs->trans("Country");
+		$label2 = $langs->trans("Region"); //département
+		$tab = 'statsregion'; //onglet
 
-        $data = array();
-        $sql .= "SELECT COUNT(DISTINCT d.rowid) as nb, COUNT(s.rowid) as nbsubscriptions, MAX(d.datevalid) as lastdate, MAX(s.dateadh) as lastsubscriptiondate, c.code, c.label, d.town as label2";
-        $sql .= " FROM ".MAIN_DB_PREFIX."adherent as d";
-        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as c on d.country = c.rowid";
-        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."subscription as s ON s.fk_adherent = d.rowid";
-        $sql .= " WHERE d.entity IN (".getEntity('adherent').")";
-        $sql .= " AND d.statut != -1";
-        $sql .= " GROUP BY c.label, c.code, d.town";
-        //print $sql;
-    }
+		$data = array(); //tableau de donnée
+		$sql .= "SELECT COUNT(DISTINCT d.rowid) as nb, COUNT(s.rowid) as nbsubscriptions, MAX(d.datevalid) as lastdate, MAX(s.dateadh) as lastsubscriptiondate, co.code, co.label, r.nom as label2";
+		$sql .= " FROM ".MAIN_DB_PREFIX."adherent as d";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as c on d.state_id = c.rowid";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_regions as r on c.fk_region = r.code_region";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as co on d.country = co.rowid";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."subscription as s ON s.fk_adherent = d.rowid";
+		$sql .= " WHERE d.entity IN (".getEntity('adherent').")";
+		$sql .= " AND d.statut != -1";
+		$sql .= " GROUP BY co.label, co.code, r.nom"; //+
+		//print $sql;
+	}
+	if ($mode == 'memberbytown') {
+		$label = $langs->trans("Country");
+		$label2 = $langs->trans("Town");
+		$tab = 'statstown';
 
-    $langsen = new Translate('', $conf);
-    $langsen->setDefaultLang('en_US');
-    $langsen->load("dict");
-    //print $langsen->trans("Country"."FI");exit;
+		$data = array();
+		$sql .= "SELECT COUNT(DISTINCT d.rowid) as nb, COUNT(s.rowid) as nbsubscriptions, MAX(d.datevalid) as lastdate, MAX(s.dateadh) as lastsubscriptiondate, c.code, c.label, d.town as label2";
+		$sql .= " FROM ".MAIN_DB_PREFIX."adherent as d";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as c on d.country = c.rowid";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."subscription as s ON s.fk_adherent = d.rowid";
+		$sql .= " WHERE d.entity IN (".getEntity('adherent').")";
+		$sql .= " AND d.statut != -1";
+		$sql .= " GROUP BY c.label, c.code, d.town";
+		//print $sql;
+	}
 
-    // Define $data array
-    dol_syslog("Count member", LOG_DEBUG);
-    $resql = $db->query($sql);
-    if ($resql) {
-        $num = $db->num_rows($resql);
-        $i = 0;
-        while ($i < $num) {
-            $obj = $db->fetch_object($resql);
-            if ($mode == 'memberbycountry') {
-                $data[] = array('label'=>(($obj->code && $langs->trans("Country".$obj->code) != "Country".$obj->code) ? $langs->trans("Country".$obj->code) : ($obj->label ? $obj->label : $langs->trans("Unknown"))),
-                            'label_en'=>(($obj->code && $langsen->transnoentitiesnoconv("Country".$obj->code) != "Country".$obj->code) ? $langsen->transnoentitiesnoconv("Country".$obj->code) : ($obj->label ? $obj->label : $langs->trans("Unknown"))),
+	$langsen = new Translate('', $conf);
+	$langsen->setDefaultLang('en_US');
+	$langsen->load("dict");
+	//print $langsen->trans("Country"."FI");exit;
+
+	// Define $data array
+	dol_syslog("Count member", LOG_DEBUG);
+	$resql = $db->query($sql);
+	if ($resql) {
+		$num = $db->num_rows($resql);
+		$i = 0;
+		while ($i < $num) {
+			$obj = $db->fetch_object($resql);
+			if ($mode == 'memberbycountry') {
+				$data[] = array('label'=>(($obj->code && $langs->trans("Country".$obj->code) != "Country".$obj->code) ? $langs->trans("Country".$obj->code) : ($obj->label ? $obj->label : $langs->trans("Unknown"))),
+							'label_en'=>(($obj->code && $langsen->transnoentitiesnoconv("Country".$obj->code) != "Country".$obj->code) ? $langsen->transnoentitiesnoconv("Country".$obj->code) : ($obj->label ? $obj->label : $langs->trans("Unknown"))),
 							'code'=>$obj->code,
 							'nb'=>$obj->nb,
 							'lastdate'=>$db->jdate($obj->lastdate),
-                            'lastsubscriptiondate'=>$db->jdate($obj->lastsubscriptiondate)
-                );
-            }
-            if ($mode == 'memberbyregion') { //+
+							'lastsubscriptiondate'=>$db->jdate($obj->lastsubscriptiondate)
+				);
+			}
+			if ($mode == 'memberbyregion') { //+
 				$data[] = array(
-                    'label'=>(($obj->code && $langs->trans("Country".$obj->code) != "Country".$obj->code) ? $langs->trans("Country".$obj->code) : ($obj->label ? $obj->label : $langs->trans("Unknown"))),
-                    'label_en'=>(($obj->code && $langsen->transnoentitiesnoconv("Country".$obj->code) != "Country".$obj->code) ? $langsen->transnoentitiesnoconv("Country".$obj->code) : ($obj->label ? $obj->label : $langs->trans("Unknown"))),
-				    'label2'=>($obj->label2 ? $obj->label2 : $langs->trans("Unknown")),
+					'label'=>(($obj->code && $langs->trans("Country".$obj->code) != "Country".$obj->code) ? $langs->trans("Country".$obj->code) : ($obj->label ? $obj->label : $langs->trans("Unknown"))),
+					'label_en'=>(($obj->code && $langsen->transnoentitiesnoconv("Country".$obj->code) != "Country".$obj->code) ? $langsen->transnoentitiesnoconv("Country".$obj->code) : ($obj->label ? $obj->label : $langs->trans("Unknown"))),
+					'label2'=>($obj->label2 ? $obj->label2 : $langs->trans("Unknown")),
 					'nb'=>$obj->nb,
 					'lastdate'=>$db->jdate($obj->lastdate),
-                    'lastsubscriptiondate'=>$db->jdate($obj->lastsubscriptiondate)
-                );
-	        }
-            if ($mode == 'memberbystate') {
-                $data[] = array('label'=>(($obj->code && $langs->trans("Country".$obj->code) != "Country".$obj->code) ? $langs->trans("Country".$obj->code) : ($obj->label ? $obj->label : $langs->trans("Unknown"))),
-                            'label_en'=>(($obj->code && $langsen->transnoentitiesnoconv("Country".$obj->code) != "Country".$obj->code) ? $langsen->transnoentitiesnoconv("Country".$obj->code) : ($obj->label ? $obj->label : $langs->trans("Unknown"))),
-				            'label2'=>($obj->label2 ? $obj->label2 : $langs->trans("Unknown")),
+					'lastsubscriptiondate'=>$db->jdate($obj->lastsubscriptiondate)
+				);
+			}
+			if ($mode == 'memberbystate') {
+				$data[] = array('label'=>(($obj->code && $langs->trans("Country".$obj->code) != "Country".$obj->code) ? $langs->trans("Country".$obj->code) : ($obj->label ? $obj->label : $langs->trans("Unknown"))),
+							'label_en'=>(($obj->code && $langsen->transnoentitiesnoconv("Country".$obj->code) != "Country".$obj->code) ? $langsen->transnoentitiesnoconv("Country".$obj->code) : ($obj->label ? $obj->label : $langs->trans("Unknown"))),
+							'label2'=>($obj->label2 ? $obj->label2 : $langs->trans("Unknown")),
 							'nb'=>$obj->nb,
 							'lastdate'=>$db->jdate($obj->lastdate),
-                            'lastsubscriptiondate'=>$db->jdate($obj->lastsubscriptiondate)
-                );
-            }
-            if ($mode == 'memberbytown') {
-                $data[] = array('label'=>(($obj->code && $langs->trans("Country".$obj->code) != "Country".$obj->code) ? $langs->trans("Country".$obj->code) : ($obj->label ? $obj->label : $langs->trans("Unknown"))),
-                            'label_en'=>(($obj->code && $langsen->transnoentitiesnoconv("Country".$obj->code) != "Country".$obj->code) ? $langsen->transnoentitiesnoconv("Country".$obj->code) : ($obj->label ? $obj->label : $langs->trans("Unknown"))),
-                            'label2'=>($obj->label2 ? $obj->label2 : $langs->trans("Unknown")),
-                            'nb'=>$obj->nb,
-                            'lastdate'=>$db->jdate($obj->lastdate),
-                            'lastsubscriptiondate'=>$db->jdate($obj->lastsubscriptiondate)
-                );
-            }
+							'lastsubscriptiondate'=>$db->jdate($obj->lastsubscriptiondate)
+				);
+			}
+			if ($mode == 'memberbytown') {
+				$data[] = array('label'=>(($obj->code && $langs->trans("Country".$obj->code) != "Country".$obj->code) ? $langs->trans("Country".$obj->code) : ($obj->label ? $obj->label : $langs->trans("Unknown"))),
+							'label_en'=>(($obj->code && $langsen->transnoentitiesnoconv("Country".$obj->code) != "Country".$obj->code) ? $langsen->transnoentitiesnoconv("Country".$obj->code) : ($obj->label ? $obj->label : $langs->trans("Unknown"))),
+							'label2'=>($obj->label2 ? $obj->label2 : $langs->trans("Unknown")),
+							'nb'=>$obj->nb,
+							'lastdate'=>$db->jdate($obj->lastdate),
+							'lastsubscriptiondate'=>$db->jdate($obj->lastsubscriptiondate)
+				);
+			}
 
-            $i++;
-        }
-        $db->free($resql);
-    } else {
-        dol_print_error($db);
-    }
+			$i++;
+		}
+		$db->free($resql);
+	} else {
+		dol_print_error($db);
+	}
 }
 
 
@@ -201,105 +201,105 @@ print dol_get_fiche_head($head, $tab, $langs->trans("Statistics"), -1, 'user');
 
 // Print title
 if ($mode && !count($data)) {
-    print $langs->trans("NoValidatedMemberYet").'<br>';
-    print '<br>';
+	print $langs->trans("NoValidatedMemberYet").'<br>';
+	print '<br>';
 } else {
-    if ($mode == 'memberbycountry') print '<span class="opacitymedium">'.$langs->trans("MembersByCountryDesc").'</span><br>';
-    elseif ($mode == 'memberbystate') print '<span class="opacitymedium">'.$langs->trans("MembersByStateDesc").'</span><br>';
-    elseif ($mode == 'memberbytown') print '<span class="opacitymedium">'.$langs->trans("MembersByTownDesc").'</span><br>';
-    elseif ($mode == 'memberbyregion') print '<span class="opacitymedium">'.$langs->trans("MembersByRegion").'</span><br>'; //+
-    else {
-    	print '<span class="opacitymedium">'.$langs->trans("MembersStatisticsDesc").'</span><br>';
-        print '<br>';
-        print '<a href="'.$_SERVER["PHP_SELF"].'?mode=memberbycountry">'.$langs->trans("MembersStatisticsByCountries").'</a><br>';
-        print '<br>';
-        print '<a href="'.$_SERVER["PHP_SELF"].'?mode=memberbystate">'.$langs->trans("MembersStatisticsByState").'</a><br>';
-        print '<br>';
-        print '<a href="'.$_SERVER["PHP_SELF"].'?mode=memberbytown">'.$langs->trans("MembersStatisticsByTown").'</a><br>';
-        print '<br>'; //+
+	if ($mode == 'memberbycountry') print '<span class="opacitymedium">'.$langs->trans("MembersByCountryDesc").'</span><br>';
+	elseif ($mode == 'memberbystate') print '<span class="opacitymedium">'.$langs->trans("MembersByStateDesc").'</span><br>';
+	elseif ($mode == 'memberbytown') print '<span class="opacitymedium">'.$langs->trans("MembersByTownDesc").'</span><br>';
+	elseif ($mode == 'memberbyregion') print '<span class="opacitymedium">'.$langs->trans("MembersByRegion").'</span><br>'; //+
+	else {
+		print '<span class="opacitymedium">'.$langs->trans("MembersStatisticsDesc").'</span><br>';
+		print '<br>';
+		print '<a href="'.$_SERVER["PHP_SELF"].'?mode=memberbycountry">'.$langs->trans("MembersStatisticsByCountries").'</a><br>';
+		print '<br>';
+		print '<a href="'.$_SERVER["PHP_SELF"].'?mode=memberbystate">'.$langs->trans("MembersStatisticsByState").'</a><br>';
+		print '<br>';
+		print '<a href="'.$_SERVER["PHP_SELF"].'?mode=memberbytown">'.$langs->trans("MembersStatisticsByTown").'</a><br>';
+		print '<br>'; //+
 		print '<a href="'.$_SERVER["PHP_SELF"].'?mode=memberbyregion">'.$langs->trans("MembersStatisticsByRegion").'</a><br>'; //+
-    }
-    print '<br>';
+	}
+	print '<br>';
 }
 
 
 // Show graphics
 if (count($arrayjs) && $mode == 'memberbycountry') {
-    $color_file = DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/theme_vars.inc.php';
-    if (is_readable($color_file)) include_once $color_file;
+	$color_file = DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/theme_vars.inc.php';
+	if (is_readable($color_file)) include_once $color_file;
 
-    // Assume we've already included the proper headers so just call our script inline
-    // More doc: https://developers.google.com/chart/interactive/docs/gallery/geomap?hl=fr-FR
-    print "\n<script type='text/javascript'>\n";
-    print "google.load('visualization', '1', {'packages': ['geomap']});\n";
-    print "google.setOnLoadCallback(drawMap);\n";
-    print "function drawMap() {\n\tvar data = new google.visualization.DataTable();\n";
+	// Assume we've already included the proper headers so just call our script inline
+	// More doc: https://developers.google.com/chart/interactive/docs/gallery/geomap?hl=fr-FR
+	print "\n<script type='text/javascript'>\n";
+	print "google.load('visualization', '1', {'packages': ['geomap']});\n";
+	print "google.setOnLoadCallback(drawMap);\n";
+	print "function drawMap() {\n\tvar data = new google.visualization.DataTable();\n";
 
-    // Get the total number of rows
-    print "\tdata.addRows(".count($data).");\n";
-    print "\tdata.addColumn('string', 'Country');\n";
-    print "\tdata.addColumn('number', 'Number');\n";
+	// Get the total number of rows
+	print "\tdata.addRows(".count($data).");\n";
+	print "\tdata.addColumn('string', 'Country');\n";
+	print "\tdata.addColumn('number', 'Number');\n";
 
-    // loop and dump
-    $i = 0;
-    foreach ($data as $val) {
-        $valcountry = strtoupper($val['code']); // Should be ISO-3166 code (faster)
-        //$valcountry=ucfirst($val['label_en']);
-        if ($valcountry == 'Great Britain') { $valcountry = 'United Kingdom'; }    // fix case of uk (when we use labels)
-        print "\tdata.setValue(".$i.", 0, \"".$valcountry."\");\n";
-        print "\tdata.setValue(".$i.", 1, ".$val['nb'].");\n";
-        // Google's Geomap only supports up to 400 entries
-        if ($i >= 400) { break; }
-        $i++;
-    }
+	// loop and dump
+	$i = 0;
+	foreach ($data as $val) {
+		$valcountry = strtoupper($val['code']); // Should be ISO-3166 code (faster)
+		//$valcountry=ucfirst($val['label_en']);
+		if ($valcountry == 'Great Britain') { $valcountry = 'United Kingdom'; }    // fix case of uk (when we use labels)
+		print "\tdata.setValue(".$i.", 0, \"".$valcountry."\");\n";
+		print "\tdata.setValue(".$i.", 1, ".$val['nb'].");\n";
+		// Google's Geomap only supports up to 400 entries
+		if ($i >= 400) { break; }
+		$i++;
+	}
 
-    print "\tvar options = {};\n";
-    print "\toptions['dataMode'] = 'regions';\n";
-    print "\toptions['showZoomOut'] = false;\n";
-    //print "\toptions['zoomOutLabel'] = '".dol_escape_js($langs->transnoentitiesnoconv("Numbers"))."';\n";
-    print "\toptions['width'] = ".$graphwidth.";\n";
-    print "\toptions['height'] = ".$graphheight.";\n";
-    print "\toptions['colors'] = [0x".colorArrayToHex($theme_datacolor[1], 'BBBBBB').", 0x".colorArrayToHex($theme_datacolor[0], '444444')."];\n";
-    print "\tvar container = document.getElementById('".$mode."');\n";
-    print "\tvar geomap = new google.visualization.GeoMap(container);\n";
-    print "\tgeomap.draw(data, options);\n";
-    print "};\n";
-    print "</script>\n";
+	print "\tvar options = {};\n";
+	print "\toptions['dataMode'] = 'regions';\n";
+	print "\toptions['showZoomOut'] = false;\n";
+	//print "\toptions['zoomOutLabel'] = '".dol_escape_js($langs->transnoentitiesnoconv("Numbers"))."';\n";
+	print "\toptions['width'] = ".$graphwidth.";\n";
+	print "\toptions['height'] = ".$graphheight.";\n";
+	print "\toptions['colors'] = [0x".colorArrayToHex($theme_datacolor[1], 'BBBBBB').", 0x".colorArrayToHex($theme_datacolor[0], '444444')."];\n";
+	print "\tvar container = document.getElementById('".$mode."');\n";
+	print "\tvar geomap = new google.visualization.GeoMap(container);\n";
+	print "\tgeomap.draw(data, options);\n";
+	print "};\n";
+	print "</script>\n";
 
-    // print the div tag that will contain the map
-    print '<div class="center" id="'.$mode.'"></div>'."\n";
-    print '<br>';
+	// print the div tag that will contain the map
+	print '<div class="center" id="'.$mode.'"></div>'."\n";
+	print '<br>';
 }
 
 if ($mode) {
-    // Print array
+	// Print array
 	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="liste centpercent">';
-    print '<tr class="liste_titre">';
-    print '<td>'.$label.'</td>';
-    if ($label2) print '<td class="center">'.$label2.'</td>';
-    print '<td class="right">'.$langs->trans("NbOfMembers").' <span class="opacitymedium">('.$langs->trans("AllTime").')</span></td>';
-    print '<td class="center">'.$langs->trans("LastMemberDate").'</td>';
-    print '<td class="center">'.$langs->trans("LatestSubscriptionDate").'</td>';
-    print '</tr>';
+	print '<tr class="liste_titre">';
+	print '<td>'.$label.'</td>';
+	if ($label2) print '<td class="center">'.$label2.'</td>';
+	print '<td class="right">'.$langs->trans("NbOfMembers").' <span class="opacitymedium">('.$langs->trans("AllTime").')</span></td>';
+	print '<td class="center">'.$langs->trans("LastMemberDate").'</td>';
+	print '<td class="center">'.$langs->trans("LatestSubscriptionDate").'</td>';
+	print '</tr>';
 
-    foreach ($data as $val) {
-        $year = $val['year'];
-        print '<tr class="oddeven">';
-        print '<td>'.$val['label'].'</td>';
-        if ($label2) print '<td class="center">'.$val['label2'].'</td>';
-        print '<td class="right">'.$val['nb'].'</td>';
-        print '<td class="center">'.dol_print_date($val['lastdate'], 'dayhour').'</td>';
-        print '<td class="center">'.dol_print_date($val['lastsubscriptiondate'], 'dayhour').'</td>';
-        print '</tr>';
-    }
+	foreach ($data as $val) {
+		$year = $val['year'];
+		print '<tr class="oddeven">';
+		print '<td>'.$val['label'].'</td>';
+		if ($label2) print '<td class="center">'.$val['label2'].'</td>';
+		print '<td class="right">'.$val['nb'].'</td>';
+		print '<td class="center">'.dol_print_date($val['lastdate'], 'dayhour').'</td>';
+		print '<td class="center">'.dol_print_date($val['lastsubscriptiondate'], 'dayhour').'</td>';
+		print '</tr>';
+	}
 
-    print '</table>';
-    print '</div>';
+	print '</table>';
+	print '</div>';
 }
 
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // End of page
 llxFooter();
diff --git a/htdocs/adherents/stats/index.php b/htdocs/adherents/stats/index.php
index a3c77e1c64a..6ac4e3dd78a 100644
--- a/htdocs/adherents/stats/index.php
+++ b/htdocs/adherents/stats/index.php
@@ -36,8 +36,8 @@ $socid = GETPOST('socid', 'int'); if ($socid < 0) $socid = 0;
 
 // Security check
 if ($user->socid > 0) {
-    $action = '';
-    $socid = $user->socid;
+	$action = '';
+	$socid = $user->socid;
 }
 $result = restrictedArea($user, 'adherent', '', '', 'cotisation');
 
@@ -79,24 +79,24 @@ $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=memberstats&file=subscripti
 $px1 = new DolGraph();
 $mesg = $px1->isGraphKo();
 if (!$mesg) {
-    $px1->SetData($data);
-    $i = $startyear;
-    while ($i <= $endyear) {
-        $legend[] = $i;
-        $i++;
-    }
-    $px1->SetLegend($legend);
-    $px1->SetMaxValue($px1->GetCeilMaxValue());
-    $px1->SetMinValue(min(0, $px1->GetFloorMinValue()));
-    $px1->SetWidth($WIDTH);
-    $px1->SetHeight($HEIGHT);
-    $px1->SetYLabel($langs->trans("NbOfSubscriptions"));
-    $px1->SetShading(3);
-    $px1->SetHorizTickIncrement(1);
-    $px1->mode = 'depth';
-    $px1->SetTitle($langs->trans("NbOfSubscriptions"));
+	$px1->SetData($data);
+	$i = $startyear;
+	while ($i <= $endyear) {
+		$legend[] = $i;
+		$i++;
+	}
+	$px1->SetLegend($legend);
+	$px1->SetMaxValue($px1->GetCeilMaxValue());
+	$px1->SetMinValue(min(0, $px1->GetFloorMinValue()));
+	$px1->SetWidth($WIDTH);
+	$px1->SetHeight($HEIGHT);
+	$px1->SetYLabel($langs->trans("NbOfSubscriptions"));
+	$px1->SetShading(3);
+	$px1->SetHorizTickIncrement(1);
+	$px1->mode = 'depth';
+	$px1->SetTitle($langs->trans("NbOfSubscriptions"));
 
-    $px1->draw($filenamenb, $fileurlnb);
+	$px1->draw($filenamenb, $fileurlnb);
 }
 
 // Build graphic amount of object
@@ -110,24 +110,24 @@ $fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=memberstats&file=subscr
 $px2 = new DolGraph();
 $mesg = $px2->isGraphKo();
 if (!$mesg) {
-    $px2->SetData($data);
-    $i = $startyear;
-    while ($i <= $endyear) {
-        $legend[] = $i;
-        $i++;
-    }
-    $px2->SetLegend($legend);
-    $px2->SetMaxValue($px2->GetCeilMaxValue());
-    $px2->SetMinValue(min(0, $px2->GetFloorMinValue()));
-    $px2->SetWidth($WIDTH);
-    $px2->SetHeight($HEIGHT);
-    $px2->SetYLabel($langs->trans("AmountOfSubscriptions"));
-    $px2->SetShading(3);
-    $px2->SetHorizTickIncrement(1);
-    $px2->mode = 'depth';
-    $px2->SetTitle($langs->trans("AmountOfSubscriptions"));
+	$px2->SetData($data);
+	$i = $startyear;
+	while ($i <= $endyear) {
+		$legend[] = $i;
+		$i++;
+	}
+	$px2->SetLegend($legend);
+	$px2->SetMaxValue($px2->GetCeilMaxValue());
+	$px2->SetMinValue(min(0, $px2->GetFloorMinValue()));
+	$px2->SetWidth($WIDTH);
+	$px2->SetHeight($HEIGHT);
+	$px2->SetYLabel($langs->trans("AmountOfSubscriptions"));
+	$px2->SetShading(3);
+	$px2->SetHorizTickIncrement(1);
+	$px2->mode = 'depth';
+	$px2->SetTitle($langs->trans("AmountOfSubscriptions"));
 
-    $px2->draw($filenameamount, $fileurlamount);
+	$px2->draw($filenameamount, $fileurlamount);
 }
 
 
@@ -171,31 +171,31 @@ print '</tr>';
 
 $oldyear = 0;
 foreach ($data as $val) {
-    $year = $val['year'];
-    while ($oldyear > $year + 1) {	// If we have empty year
-        $oldyear--;
-        print '<tr class="oddeven" height="24">';
-        print '<td class="center">';
-        //print '<a href="month.php?year='.$oldyear.'&amp;mode='.$mode.'">';
-        print $oldyear;
-        //print '</a>';
-        print '</td>';
-        print '<td class="right">0</td>';
-        print '<td class="right">0</td>';
-        print '<td class="right">0</td>';
-        print '</tr>';
-    }
-    print '<tr class="oddeven" height="24">';
-    print '<td class="center">';
-    //print '<a href="month.php?year='.$year.'">';
-    print $year;
-    //print '</a>';
-    print '</td>';
-    print '<td class="right">'.$val['nb'].'</td>';
-    print '<td class="right">'.price(price2num($val['total'], 'MT'), 1).'</td>';
-    print '<td class="right">'.price(price2num($val['avg'], 'MT'), 1).'</td>';
-    print '</tr>';
-    $oldyear = $year;
+	$year = $val['year'];
+	while ($oldyear > $year + 1) {	// If we have empty year
+		$oldyear--;
+		print '<tr class="oddeven" height="24">';
+		print '<td class="center">';
+		//print '<a href="month.php?year='.$oldyear.'&amp;mode='.$mode.'">';
+		print $oldyear;
+		//print '</a>';
+		print '</td>';
+		print '<td class="right">0</td>';
+		print '<td class="right">0</td>';
+		print '<td class="right">0</td>';
+		print '</tr>';
+	}
+	print '<tr class="oddeven" height="24">';
+	print '<td class="center">';
+	//print '<a href="month.php?year='.$year.'">';
+	print $year;
+	//print '</a>';
+	print '</td>';
+	print '<td class="right">'.$val['nb'].'</td>';
+	print '<td class="right">'.price(price2num($val['total'], 'MT'), 1).'</td>';
+	print '<td class="right">'.price(price2num($val['avg'], 'MT'), 1).'</td>';
+	print '</tr>';
+	$oldyear = $year;
 }
 
 print '</table>';
@@ -208,9 +208,9 @@ print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 // Show graphs
 print '<table class="border centpercent"><tr class="pair nohover"><td class="center">';
 if ($mesg) { print $mesg; } else {
-    print $px1->show();
-    print "<br>\n";
-    print $px2->show();
+	print $px1->show();
+	print "<br>\n";
+	print $px2->show();
 }
 print '</td></tr></table>';
 
@@ -219,7 +219,7 @@ print '</div></div></div>';
 print '<div style="clear:both"></div>';
 
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // End of page
 llxFooter();
diff --git a/htdocs/adherents/subscription.php b/htdocs/adherents/subscription.php
index 9c9589eaec2..748ac19814c 100644
--- a/htdocs/adherents/subscription.php
+++ b/htdocs/adherents/subscription.php
@@ -76,26 +76,26 @@ $defaultdelay = 1;
 $defaultdelayunit = 'y';
 
 if ($rowid) {
-    // Load member
-    $result = $object->fetch($rowid);
+	// Load member
+	$result = $object->fetch($rowid);
 
-    // Define variables to know what current user can do on users
-    $canadduser = ($user->admin || $user->rights->user->user->creer);
-    // Define variables to know what current user can do on properties of user linked to edited member
-    if ($object->user_id) {
-        // $user is the user editing, $object->user_id is the user's id linked to the edited member
-        $caneditfielduser = ((($user->id == $object->user_id) && $user->rights->user->self->creer)
-        || (($user->id != $object->user_id) && $user->rights->user->user->creer));
-        $caneditpassworduser = ((($user->id == $object->user_id) && $user->rights->user->self->password)
-        || (($user->id != $object->user_id) && $user->rights->user->user->password));
-    }
+	// Define variables to know what current user can do on users
+	$canadduser = ($user->admin || $user->rights->user->user->creer);
+	// Define variables to know what current user can do on properties of user linked to edited member
+	if ($object->user_id) {
+		// $user is the user editing, $object->user_id is the user's id linked to the edited member
+		$caneditfielduser = ((($user->id == $object->user_id) && $user->rights->user->self->creer)
+		|| (($user->id != $object->user_id) && $user->rights->user->user->creer));
+		$caneditpassworduser = ((($user->id == $object->user_id) && $user->rights->user->self->password)
+		|| (($user->id != $object->user_id) && $user->rights->user->user->password));
+	}
 }
 
 // Define variables to know what current user can do on members
 $canaddmember = $user->rights->adherent->creer;
 // Define variables to know what current user can do on properties of a member
 if ($rowid) {
-    $caneditfieldmember = $user->rights->adherent->creer;
+	$caneditfieldmember = $user->rights->adherent->creer;
 }
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
@@ -130,242 +130,242 @@ if ($action == 'confirm_create_thirdparty' && $confirm == 'yes' && $user->rights
 }
 
 if ($action == 'setuserid' && ($user->rights->user->self->creer || $user->rights->user->user->creer)) {
-    $error = 0;
-    if (empty($user->rights->user->user->creer)) {    // If can edit only itself user, we can link to itself only
+	$error = 0;
+	if (empty($user->rights->user->user->creer)) {    // If can edit only itself user, we can link to itself only
 		if ($_POST["userid"] != $user->id && $_POST["userid"] != $object->user_id) {
-            $error++;
-            setEventMessages($langs->trans("ErrorUserPermissionAllowsToLinksToItselfOnly"), null, 'errors');
+			$error++;
+			setEventMessages($langs->trans("ErrorUserPermissionAllowsToLinksToItselfOnly"), null, 'errors');
 		}
-    }
+	}
 
-    if (!$error) {
-        if ($_POST["userid"] != $object->user_id) {  // If link differs from currently in database
+	if (!$error) {
+		if ($_POST["userid"] != $object->user_id) {  // If link differs from currently in database
 			$result = $object->setUserId($_POST["userid"]);
-            if ($result < 0) dol_print_error('', $object->error);
-            $_POST['action'] = '';
-            $action = '';
-        }
-    }
+			if ($result < 0) dol_print_error('', $object->error);
+			$_POST['action'] = '';
+			$action = '';
+		}
+	}
 }
 
 if ($action == 'setsocid') {
-    $error = 0;
-    if (!$error) {
-        if (GETPOST('socid', 'int') != $object->fk_soc) {    // If link differs from currently in database
+	$error = 0;
+	if (!$error) {
+		if (GETPOST('socid', 'int') != $object->fk_soc) {    // If link differs from currently in database
 			$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."adherent";
-            $sql .= " WHERE fk_soc = '".GETPOST('socid', 'int')."'";
-            $resql = $db->query($sql);
-            if ($resql) {
-                $obj = $db->fetch_object($resql);
-                if ($obj && $obj->rowid > 0) {
-                    $othermember = new Adherent($db);
-                    $othermember->fetch($obj->rowid);
-                    $thirdparty = new Societe($db);
-                    $thirdparty->fetch(GETPOST('socid', 'int'));
-                    $error++;
-	                setEventMessages($langs->trans("ErrorMemberIsAlreadyLinkedToThisThirdParty", $othermember->getFullName($langs), $othermember->login, $thirdparty->name), null, 'errors');
-                }
-            }
+			$sql .= " WHERE fk_soc = '".GETPOST('socid', 'int')."'";
+			$resql = $db->query($sql);
+			if ($resql) {
+				$obj = $db->fetch_object($resql);
+				if ($obj && $obj->rowid > 0) {
+					$othermember = new Adherent($db);
+					$othermember->fetch($obj->rowid);
+					$thirdparty = new Societe($db);
+					$thirdparty->fetch(GETPOST('socid', 'int'));
+					$error++;
+					setEventMessages($langs->trans("ErrorMemberIsAlreadyLinkedToThisThirdParty", $othermember->getFullName($langs), $othermember->login, $thirdparty->name), null, 'errors');
+				}
+			}
 
-            if (!$error) {
-                $result = $object->setThirdPartyId(GETPOST('socid', 'int'));
-                if ($result < 0) dol_print_error('', $object->error);
-                $_POST['action'] = '';
-                $action = '';
-            }
-        }
-    }
+			if (!$error) {
+				$result = $object->setThirdPartyId(GETPOST('socid', 'int'));
+				if ($result < 0) dol_print_error('', $object->error);
+				$_POST['action'] = '';
+				$action = '';
+			}
+		}
+	}
 }
 
 if ($user->rights->adherent->cotisation->creer && $action == 'subscription' && !$_POST["cancel"]) {
-    $error = 0;
+	$error = 0;
 
-    $langs->load("banks");
+	$langs->load("banks");
 
-    $result = $object->fetch($rowid);
-    $result = $adht->fetch($object->typeid);
+	$result = $object->fetch($rowid);
+	$result = $adht->fetch($object->typeid);
 
-    // Subscription informations
-    $datesubscription = 0;
-    $datesubend = 0;
-    $paymentdate = 0;
-    if ($_POST["reyear"] && $_POST["remonth"] && $_POST["reday"]) {
-        $datesubscription = dol_mktime(0, 0, 0, $_POST["remonth"], $_POST["reday"], $_POST["reyear"]);
-    }
-    if ($_POST["endyear"] && $_POST["endmonth"] && $_POST["endday"]) {
-        $datesubend = dol_mktime(0, 0, 0, $_POST["endmonth"], $_POST["endday"], $_POST["endyear"]);
-    }
-    if ($_POST["paymentyear"] && $_POST["paymentmonth"] && $_POST["paymentday"]) {
-        $paymentdate = dol_mktime(0, 0, 0, $_POST["paymentmonth"], $_POST["paymentday"], $_POST["paymentyear"]);
-    }
-    $amount = price2num(GETPOST("subscription", 'alpha')); // Amount of subscription
-    $label = $_POST["label"];
+	// Subscription informations
+	$datesubscription = 0;
+	$datesubend = 0;
+	$paymentdate = 0;
+	if ($_POST["reyear"] && $_POST["remonth"] && $_POST["reday"]) {
+		$datesubscription = dol_mktime(0, 0, 0, $_POST["remonth"], $_POST["reday"], $_POST["reyear"]);
+	}
+	if ($_POST["endyear"] && $_POST["endmonth"] && $_POST["endday"]) {
+		$datesubend = dol_mktime(0, 0, 0, $_POST["endmonth"], $_POST["endday"], $_POST["endyear"]);
+	}
+	if ($_POST["paymentyear"] && $_POST["paymentmonth"] && $_POST["paymentday"]) {
+		$paymentdate = dol_mktime(0, 0, 0, $_POST["paymentmonth"], $_POST["paymentday"], $_POST["paymentyear"]);
+	}
+	$amount = price2num(GETPOST("subscription", 'alpha')); // Amount of subscription
+	$label = $_POST["label"];
 
-    // Payment informations
-    $accountid = $_POST["accountid"];
-    $operation = $_POST["operation"]; // Payment mode
-    $num_chq = GETPOST("num_chq", "alphanohtml");
-    $emetteur_nom = $_POST["chqemetteur"];
-    $emetteur_banque = $_POST["chqbank"];
-    $option = $_POST["paymentsave"];
-    if (empty($option)) $option = 'none';
-    $sendalsoemail = GETPOST("sendmail", 'alpha');
+	// Payment informations
+	$accountid = $_POST["accountid"];
+	$operation = $_POST["operation"]; // Payment mode
+	$num_chq = GETPOST("num_chq", "alphanohtml");
+	$emetteur_nom = $_POST["chqemetteur"];
+	$emetteur_banque = $_POST["chqbank"];
+	$option = $_POST["paymentsave"];
+	if (empty($option)) $option = 'none';
+	$sendalsoemail = GETPOST("sendmail", 'alpha');
 
-    // Check parameters
-    if (!$datesubscription) {
-        $error++;
-        $langs->load("errors");
-        $errmsg = $langs->trans("ErrorBadDateFormat", $langs->transnoentitiesnoconv("DateSubscription"));
-        setEventMessages($errmsg, null, 'errors');
-        $action = 'addsubscription';
-    }
-    if (GETPOST('end') && !$datesubend) {
-        $error++;
-        $langs->load("errors");
-        $errmsg = $langs->trans("ErrorBadDateFormat", $langs->transnoentitiesnoconv("DateEndSubscription"));
-        setEventMessages($errmsg, null, 'errors');
-        $action = 'addsubscription';
-    }
-    if (!$datesubend) {
-        $datesubend = dol_time_plus_duree(dol_time_plus_duree($datesubscription, $defaultdelay, $defaultdelayunit), -1, 'd');
-    }
-    if (($option == 'bankviainvoice' || $option == 'bankdirect') && !$paymentdate) {
-        $error++;
-        $errmsg = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("DatePayment"));
-        setEventMessages($errmsg, null, 'errors');
-        $action = 'addsubscription';
-    }
+	// Check parameters
+	if (!$datesubscription) {
+		$error++;
+		$langs->load("errors");
+		$errmsg = $langs->trans("ErrorBadDateFormat", $langs->transnoentitiesnoconv("DateSubscription"));
+		setEventMessages($errmsg, null, 'errors');
+		$action = 'addsubscription';
+	}
+	if (GETPOST('end') && !$datesubend) {
+		$error++;
+		$langs->load("errors");
+		$errmsg = $langs->trans("ErrorBadDateFormat", $langs->transnoentitiesnoconv("DateEndSubscription"));
+		setEventMessages($errmsg, null, 'errors');
+		$action = 'addsubscription';
+	}
+	if (!$datesubend) {
+		$datesubend = dol_time_plus_duree(dol_time_plus_duree($datesubscription, $defaultdelay, $defaultdelayunit), -1, 'd');
+	}
+	if (($option == 'bankviainvoice' || $option == 'bankdirect') && !$paymentdate) {
+		$error++;
+		$errmsg = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("DatePayment"));
+		setEventMessages($errmsg, null, 'errors');
+		$action = 'addsubscription';
+	}
 
-    // Check if a payment is mandatory or not
-    if (!$error && $adht->subscription) {	// Member type need subscriptions
+	// Check if a payment is mandatory or not
+	if (!$error && $adht->subscription) {	// Member type need subscriptions
 		if (!is_numeric($amount)) {
-            // If field is '' or not a numeric value
-            $errmsg = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Amount"));
-        	setEventMessages($errmsg, null, 'errors');
-            $error++;
-            $action = 'addsubscription';
+			// If field is '' or not a numeric value
+			$errmsg = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Amount"));
+			setEventMessages($errmsg, null, 'errors');
+			$error++;
+			$action = 'addsubscription';
 		} else {
-            if (!empty($conf->banque->enabled) && $_POST["paymentsave"] != 'none') {
-                if ($_POST["subscription"]) {
-                    if (!$_POST["label"])     $errmsg = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Label"));
-                    if ($_POST["paymentsave"] != 'invoiceonly' && !$_POST["operation"]) $errmsg = $langs->trans("ErrorFieldRequired", $langs->transnoentities("PaymentMode"));
-                    if ($_POST["paymentsave"] != 'invoiceonly' && !($_POST["accountid"] > 0)) $errmsg = $langs->trans("ErrorFieldRequired", $langs->transnoentities("FinancialAccount"));
-                } else {
-                    if ($_POST["accountid"])   $errmsg = $langs->trans("ErrorDoNotProvideAccountsIfNullAmount");
-                }
-                if ($errmsg) {
-                	$error++;
-        			setEventMessages($errmsg, null, 'errors');
-        			$error++;
-                	$action = 'addsubscription';
-                }
-            }
-        }
-    }
+			if (!empty($conf->banque->enabled) && $_POST["paymentsave"] != 'none') {
+				if ($_POST["subscription"]) {
+					if (!$_POST["label"])     $errmsg = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Label"));
+					if ($_POST["paymentsave"] != 'invoiceonly' && !$_POST["operation"]) $errmsg = $langs->trans("ErrorFieldRequired", $langs->transnoentities("PaymentMode"));
+					if ($_POST["paymentsave"] != 'invoiceonly' && !($_POST["accountid"] > 0)) $errmsg = $langs->trans("ErrorFieldRequired", $langs->transnoentities("FinancialAccount"));
+				} else {
+					if ($_POST["accountid"])   $errmsg = $langs->trans("ErrorDoNotProvideAccountsIfNullAmount");
+				}
+				if ($errmsg) {
+					$error++;
+					setEventMessages($errmsg, null, 'errors');
+					$error++;
+					$action = 'addsubscription';
+				}
+			}
+		}
+	}
 
-    // Record the subscription then complementary actions
-    if (!$error && $action == 'subscription') {
-        $db->begin();
+	// Record the subscription then complementary actions
+	if (!$error && $action == 'subscription') {
+		$db->begin();
 
-        // Create subscription
-        $crowid = $object->subscription($datesubscription, $amount, $accountid, $operation, $label, $num_chq, $emetteur_nom, $emetteur_banque, $datesubend);
-        if ($crowid <= 0) {
-            $error++;
-            $errmsg = $object->error;
-	        setEventMessages($object->error, $object->errors, 'errors');
-        }
+		// Create subscription
+		$crowid = $object->subscription($datesubscription, $amount, $accountid, $operation, $label, $num_chq, $emetteur_nom, $emetteur_banque, $datesubend);
+		if ($crowid <= 0) {
+			$error++;
+			$errmsg = $object->error;
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
 
-        if (!$error) {
-        	$result = $object->subscriptionComplementaryActions($crowid, $option, $accountid, $datesubscription, $paymentdate, $operation, $label, $amount, $num_chq, $emetteur_nom, $emetteur_banque);
+		if (!$error) {
+			$result = $object->subscriptionComplementaryActions($crowid, $option, $accountid, $datesubscription, $paymentdate, $operation, $label, $amount, $num_chq, $emetteur_nom, $emetteur_banque);
 			if ($result < 0) {
 				$error++;
 				setEventMessages($object->error, $object->errors, 'errors');
 			} else {
 				// If an invoice was created, it is into $object->invoice
 			}
-        }
+		}
 
-        if (!$error) {
-            $db->commit();
-        } else {
-            $db->rollback();
-            $action = 'addsubscription';
-        }
+		if (!$error) {
+			$db->commit();
+		} else {
+			$db->rollback();
+			$action = 'addsubscription';
+		}
 
-        if (!$error) {
-        	setEventMessages("SubscriptionRecorded", null, 'mesgs');
-        }
+		if (!$error) {
+			setEventMessages("SubscriptionRecorded", null, 'mesgs');
+		}
 
-        // Send email
-        if (!$error) {
-            // Send confirmation Email
-            if ($object->email && $sendalsoemail) {   // $object is 'Adherent'
+		// Send email
+		if (!$error) {
+			// Send confirmation Email
+			if ($object->email && $sendalsoemail) {   // $object is 'Adherent'
 				$subject = '';
-            	$msg = '';
+				$msg = '';
 
-            	// Send subscription email
-            	include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
-            	$formmail = new FormMail($db);
-            	// Set output language
-            	$outputlangs = new Translate('', $conf);
-            	$outputlangs->setDefaultLang(empty($object->thirdparty->default_lang) ? $mysoc->default_lang : $object->thirdparty->default_lang);
-            	// Load traductions files required by page
-            	$outputlangs->loadLangs(array("main", "members"));
+				// Send subscription email
+				include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
+				$formmail = new FormMail($db);
+				// Set output language
+				$outputlangs = new Translate('', $conf);
+				$outputlangs->setDefaultLang(empty($object->thirdparty->default_lang) ? $mysoc->default_lang : $object->thirdparty->default_lang);
+				// Load traductions files required by page
+				$outputlangs->loadLangs(array("main", "members"));
 
-            	// Get email content from template
-            	$arraydefaultmessage = null;
-            	$labeltouse = $conf->global->ADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION;
+				// Get email content from template
+				$arraydefaultmessage = null;
+				$labeltouse = $conf->global->ADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION;
 
-            	if (!empty($labeltouse)) $arraydefaultmessage = $formmail->getEMailTemplate($db, 'member', $user, $outputlangs, 0, 1, $labeltouse);
+				if (!empty($labeltouse)) $arraydefaultmessage = $formmail->getEMailTemplate($db, 'member', $user, $outputlangs, 0, 1, $labeltouse);
 
-            	if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0) {
-            		$subject = $arraydefaultmessage->topic;
-            		$msg     = $arraydefaultmessage->content;
-            	}
+				if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0) {
+					$subject = $arraydefaultmessage->topic;
+					$msg     = $arraydefaultmessage->content;
+				}
 
-            	$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $object);
-            	complete_substitutions_array($substitutionarray, $outputlangs, $object);
-            	$subjecttosend = make_substitutions($subject, $substitutionarray, $outputlangs);
-            	$texttosend = make_substitutions(dol_concatdesc($msg, $adht->getMailOnSubscription()), $substitutionarray, $outputlangs);
+				$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $object);
+				complete_substitutions_array($substitutionarray, $outputlangs, $object);
+				$subjecttosend = make_substitutions($subject, $substitutionarray, $outputlangs);
+				$texttosend = make_substitutions(dol_concatdesc($msg, $adht->getMailOnSubscription()), $substitutionarray, $outputlangs);
 
-                // Attach a file ?
-                $file = '';
-                $listofpaths = array();
-                $listofnames = array();
-                $listofmimes = array();
-                if (is_object($object->invoice)) {
-                	$invoicediroutput = $conf->facture->dir_output;
-                	$fileparams = dol_most_recent_file($invoicediroutput.'/'.$object->invoice->ref, preg_quote($object->invoice->ref, '/').'[^\-]+');
-                	$file = $fileparams['fullname'];
+				// Attach a file ?
+				$file = '';
+				$listofpaths = array();
+				$listofnames = array();
+				$listofmimes = array();
+				if (is_object($object->invoice)) {
+					$invoicediroutput = $conf->facture->dir_output;
+					$fileparams = dol_most_recent_file($invoicediroutput.'/'.$object->invoice->ref, preg_quote($object->invoice->ref, '/').'[^\-]+');
+					$file = $fileparams['fullname'];
 
-                	$listofpaths = array($file);
-                	$listofnames = array(basename($file));
-                	$listofmimes = array(dol_mimetype($file));
-                }
+					$listofpaths = array($file);
+					$listofnames = array(basename($file));
+					$listofmimes = array(dol_mimetype($file));
+				}
 
-                $moreinheader = 'X-Dolibarr-Info: send_an_email by adherents/subscription.php'."\r\n";
+				$moreinheader = 'X-Dolibarr-Info: send_an_email by adherents/subscription.php'."\r\n";
 
-                $result = $object->send_an_email($texttosend, $subjecttosend, $listofpaths, $listofmimes, $listofnames, "", "", 0, -1, '', $moreinheader);
-                if ($result < 0) {
-                	$errmsg = $object->error;
-                	setEventMessages($object->error, $object->errors, 'errors');
-                } else {
-                	setEventMessages($langs->trans("EmailSentToMember", $object->email), null, 'mesgs');
-                }
-            } else {
-            	setEventMessages($langs->trans("NoEmailSentToMember"), null, 'mesgs');
-            }
-        }
+				$result = $object->send_an_email($texttosend, $subjecttosend, $listofpaths, $listofmimes, $listofnames, "", "", 0, -1, '', $moreinheader);
+				if ($result < 0) {
+					$errmsg = $object->error;
+					setEventMessages($object->error, $object->errors, 'errors');
+				} else {
+					setEventMessages($langs->trans("EmailSentToMember", $object->email), null, 'mesgs');
+				}
+			} else {
+				setEventMessages($langs->trans("NoEmailSentToMember"), null, 'mesgs');
+			}
+		}
 
-        // Clean some POST vars
-        if (!$error) {
-            $_POST["subscription"] = '';
-            $_POST["accountid"] = '';
-            $_POST["operation"] = '';
-            $_POST["label"] = '';
-            $_POST["num_chq"] = '';
-        }
-    }
+		// Clean some POST vars
+		if (!$error) {
+			$_POST["subscription"] = '';
+			$_POST["accountid"] = '';
+			$_POST["operation"] = '';
+			$_POST["label"] = '';
+			$_POST["num_chq"] = '';
+		}
+	}
 }
 
 
@@ -393,32 +393,32 @@ if ($optioncss != '')     $param .= '&optioncss='.urlencode($optioncss);
 
 
 if ($rowid > 0) {
-    $res = $object->fetch($rowid);
-    if ($res < 0) { dol_print_error($db, $object->error); exit; }
+	$res = $object->fetch($rowid);
+	if ($res < 0) { dol_print_error($db, $object->error); exit; }
 
-    $adht->fetch($object->typeid);
+	$adht->fetch($object->typeid);
 
-    $head = member_prepare_head($object);
+	$head = member_prepare_head($object);
 
-    $rowspan = 10;
-    if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) $rowspan++;
-    if (!empty($conf->societe->enabled)) $rowspan++;
+	$rowspan = 10;
+	if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) $rowspan++;
+	if (!empty($conf->societe->enabled)) $rowspan++;
 
-    print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    print '<input type="hidden" name="rowid" value="'.$object->id.'">';
+	print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="rowid" value="'.$object->id.'">';
 
-    print dol_get_fiche_head($head, 'subscription', $langs->trans("Member"), -1, 'user');
+	print dol_get_fiche_head($head, 'subscription', $langs->trans("Member"), -1, 'user');
 
-    $linkback = '<a href="'.DOL_URL_ROOT.'/adherents/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+	$linkback = '<a href="'.DOL_URL_ROOT.'/adherents/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-    dol_banner_tab($object, 'rowid', $linkback);
+	dol_banner_tab($object, 'rowid', $linkback);
 
-    print '<div class="fichecenter">';
-    print '<div class="fichehalfleft">';
+	print '<div class="fichecenter">';
+	print '<div class="fichehalfleft">';
 
-    print '<div class="underbanner clearboth"></div>';
-    print '<table class="border centpercent tableforfield">';
+	print '<div class="underbanner clearboth"></div>';
+	print '<table class="border centpercent tableforfield">';
 
 	// Login
 	if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) {
@@ -443,20 +443,20 @@ if ($rowid > 0) {
 	if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) {
 		print '<tr><td>'.$langs->trans("Password").'</td><td>'.preg_replace('/./i', '*', $object->pass);
 		if ((!empty($object->pass) || !empty($object->pass_crypted)) && empty($object->user_id)) {
-		    $langs->load("errors");
-		    $htmltext = $langs->trans("WarningPasswordSetWithNoAccount");
-		    print ' '.$form->textwithpicto('', $htmltext, 1, 'warning');
+			$langs->load("errors");
+			$htmltext = $langs->trans("WarningPasswordSetWithNoAccount");
+			print ' '.$form->textwithpicto('', $htmltext, 1, 'warning');
 		}
 		print '</td></tr>';
 	}
 
-    print '</table>';
+	print '</table>';
 
-    print '</div>';
-    print '<div class="fichehalfright"><div class="ficheaddleft">';
+	print '</div>';
+	print '<div class="fichehalfright"><div class="ficheaddleft">';
 
-    print '<div class="underbanner clearboth"></div>';
-    print '<table class="border tableforfield" width="100%">';
+	print '<div class="underbanner clearboth"></div>';
+	print '<table class="border tableforfield" width="100%">';
 
 	// Birthday
 	print '<tr><td class="titlefield">'.$langs->trans("Birthday").'</td><td class="valeur">'.dol_print_date($object->birth, 'day').'</td></tr>';
@@ -472,25 +472,25 @@ if ($rowid > 0) {
 		print '</td></tr>';
 	}
 
-    // Other attributes
-    $cols = 2;
-    include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
+	// Other attributes
+	$cols = 2;
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
 
 	// Date end subscription
 	print '<tr><td>'.$langs->trans("SubscriptionEndDate").'</td><td class="valeur">';
 	if ($object->datefin) {
-	    print dol_print_date($object->datefin, 'day');
-	    if ($object->hasDelay()) {
-	        print " ".img_warning($langs->trans("Late"));
-	    }
+		print dol_print_date($object->datefin, 'day');
+		if ($object->hasDelay()) {
+			print " ".img_warning($langs->trans("Late"));
+		}
 	} else {
-	    if (!$adht->subscription) {
-	        print $langs->trans("SubscriptionNotRecorded");
-	        if ($object->statut > 0) print " ".img_warning($langs->trans("Late")); // Display a delay picto only if it is not a draft and is not canceled
-	    } else {
-	        print $langs->trans("SubscriptionNotReceived");
-	        if ($object->statut > 0) print " ".img_warning($langs->trans("Late")); // Display a delay picto only if it is not a draft and is not canceled
-	    }
+		if (!$adht->subscription) {
+			print $langs->trans("SubscriptionNotRecorded");
+			if ($object->statut > 0) print " ".img_warning($langs->trans("Late")); // Display a delay picto only if it is not a draft and is not canceled
+		} else {
+			print $langs->trans("SubscriptionNotReceived");
+			if ($object->statut > 0) print " ".img_warning($langs->trans("Late")); // Display a delay picto only if it is not a draft and is not canceled
+		}
 	}
 	print '</td></tr>';
 
@@ -550,100 +550,100 @@ if ($rowid > 0) {
 	}
 	print '</td></tr>';
 
-    print "</table>\n";
+	print "</table>\n";
 
 	print "</div></div></div>\n";
-    print '<div style="clear:both"></div>';
+	print '<div style="clear:both"></div>';
 
-    dol_fiche_end();
+	print dol_get_fiche_end();
 
-    print '</form>';
+	print '</form>';
 
 
-    /*
+	/*
      * Action buttons
      */
 
-    // Button to create a new subscription if member no draft neither resiliated
-    if ($user->rights->adherent->cotisation->creer) {
-        if ($action != 'addsubscription' && $action != 'create_thirdparty') {
-            print '<div class="tabsAction">';
+	// Button to create a new subscription if member no draft neither resiliated
+	if ($user->rights->adherent->cotisation->creer) {
+		if ($action != 'addsubscription' && $action != 'create_thirdparty') {
+			print '<div class="tabsAction">';
 
-            if ($object->statut > 0) print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?rowid='.$rowid.'&action=addsubscription">'.$langs->trans("AddSubscription")."</a></div>";
-            else print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("ValidateBefore")).'">'.$langs->trans("AddSubscription").'</a></div>';
+			if ($object->statut > 0) print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?rowid='.$rowid.'&action=addsubscription">'.$langs->trans("AddSubscription")."</a></div>";
+			else print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("ValidateBefore")).'">'.$langs->trans("AddSubscription").'</a></div>';
 
-            print '</div>';
-        }
-    }
+			print '</div>';
+		}
+	}
 
-    /*
+	/*
      * List of subscriptions
      */
-    if ($action != 'addsubscription' && $action != 'create_thirdparty') {
-        $sql = "SELECT d.rowid, d.firstname, d.lastname, d.societe, d.fk_adherent_type as type,";
-        $sql .= " c.rowid as crowid, c.subscription,";
-        $sql .= " c.datec, c.fk_type as cfk_type,";
-        $sql .= " c.dateadh as dateh,";
-        $sql .= " c.datef,";
-        $sql .= " c.fk_bank,";
-        $sql .= " b.rowid as bid,";
-        $sql .= " ba.rowid as baid, ba.label, ba.bank, ba.ref, ba.account_number, ba.fk_accountancy_journal, ba.number, ba.currency_code";
-        $sql .= " FROM ".MAIN_DB_PREFIX."adherent as d, ".MAIN_DB_PREFIX."subscription as c";
-        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank as b ON c.fk_bank = b.rowid";
-        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank_account as ba ON b.fk_account = ba.rowid";
-        $sql .= " WHERE d.rowid = c.fk_adherent AND d.rowid=".$rowid;
+	if ($action != 'addsubscription' && $action != 'create_thirdparty') {
+		$sql = "SELECT d.rowid, d.firstname, d.lastname, d.societe, d.fk_adherent_type as type,";
+		$sql .= " c.rowid as crowid, c.subscription,";
+		$sql .= " c.datec, c.fk_type as cfk_type,";
+		$sql .= " c.dateadh as dateh,";
+		$sql .= " c.datef,";
+		$sql .= " c.fk_bank,";
+		$sql .= " b.rowid as bid,";
+		$sql .= " ba.rowid as baid, ba.label, ba.bank, ba.ref, ba.account_number, ba.fk_accountancy_journal, ba.number, ba.currency_code";
+		$sql .= " FROM ".MAIN_DB_PREFIX."adherent as d, ".MAIN_DB_PREFIX."subscription as c";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank as b ON c.fk_bank = b.rowid";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank_account as ba ON b.fk_account = ba.rowid";
+		$sql .= " WHERE d.rowid = c.fk_adherent AND d.rowid=".$rowid;
 		$sql .= $db->order($sortfield, $sortorder);
 
-        $result = $db->query($sql);
-        if ($result) {
-            $subscriptionstatic = new Subscription($db);
+		$result = $db->query($sql);
+		if ($result) {
+			$subscriptionstatic = new Subscription($db);
 
-            $num = $db->num_rows($result);
+			$num = $db->num_rows($result);
 
-            print '<table class="noborder centpercent">'."\n";
+			print '<table class="noborder centpercent">'."\n";
 
-            print '<tr class="liste_titre">';
-            print_liste_field_titre('Ref', $_SERVER["PHP_SELF"], 'c.rowid', '', $param, '', $sortfield, $sortorder);
-            print_liste_field_titre('DateCreation', $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'center ');
-            print_liste_field_titre('Type', $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'center ');
-            print_liste_field_titre('DateStart', $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'center ');
-            print_liste_field_titre('DateEnd', $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'center ');
-            print_liste_field_titre('Amount', $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'right ');
-            if (!empty($conf->banque->enabled)) {
-            	print_liste_field_titre('Account', $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'right ');
-            }
-            print "</tr>\n";
+			print '<tr class="liste_titre">';
+			print_liste_field_titre('Ref', $_SERVER["PHP_SELF"], 'c.rowid', '', $param, '', $sortfield, $sortorder);
+			print_liste_field_titre('DateCreation', $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'center ');
+			print_liste_field_titre('Type', $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'center ');
+			print_liste_field_titre('DateStart', $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'center ');
+			print_liste_field_titre('DateEnd', $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'center ');
+			print_liste_field_titre('Amount', $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'right ');
+			if (!empty($conf->banque->enabled)) {
+				print_liste_field_titre('Account', $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'right ');
+			}
+			print "</tr>\n";
 
-            $accountstatic = new Account($db);
-            $adh = new Adherent($db);
-            $adht = new AdherentType($db);
+			$accountstatic = new Account($db);
+			$adh = new Adherent($db);
+			$adht = new AdherentType($db);
 
-            $i = 0;
-            while ($i < $num) {
-                $objp = $db->fetch_object($result);
+			$i = 0;
+			while ($i < $num) {
+				$objp = $db->fetch_object($result);
 
-                $adh->id = $objp->rowid;
-                $adh->typeid = $objp->type;
+				$adh->id = $objp->rowid;
+				$adh->typeid = $objp->type;
 
-                $subscriptionstatic->ref = $objp->crowid;
-                $subscriptionstatic->id = $objp->crowid;
+				$subscriptionstatic->ref = $objp->crowid;
+				$subscriptionstatic->id = $objp->crowid;
 
-                $typeid = $objp->cfk_type;
-                if ($typeid > 0) {
-                    $adht->fetch($typeid);
-                }
+				$typeid = $objp->cfk_type;
+				if ($typeid > 0) {
+					$adht->fetch($typeid);
+				}
 
-                print '<tr class="oddeven">';
-                print '<td>'.$subscriptionstatic->getNomUrl(1).'</td>';
-                print '<td class="center">'.dol_print_date($db->jdate($objp->datec), 'dayhour')."</td>\n";
-                print '<td class="center">';
-                if ($typeid > 0) {
-                    print $adht->getNomUrl(1);
-                }
-                print '</td>';
-                print '<td class="center">'.dol_print_date($db->jdate($objp->dateh), 'day')."</td>\n";
-                print '<td class="center">'.dol_print_date($db->jdate($objp->datef), 'day')."</td>\n";
-                print '<td class="right">'.price($objp->subscription).'</td>';
+				print '<tr class="oddeven">';
+				print '<td>'.$subscriptionstatic->getNomUrl(1).'</td>';
+				print '<td class="center">'.dol_print_date($db->jdate($objp->datec), 'dayhour')."</td>\n";
+				print '<td class="center">';
+				if ($typeid > 0) {
+					print $adht->getNomUrl(1);
+				}
+				print '</td>';
+				print '<td class="center">'.dol_print_date($db->jdate($objp->dateh), 'day')."</td>\n";
+				print '<td class="center">'.dol_print_date($db->jdate($objp->datef), 'day')."</td>\n";
+				print '<td class="right">'.price($objp->subscription).'</td>';
 				if (!empty($conf->banque->enabled)) {
 					print '<td class="right">';
 					if ($objp->bid) {
@@ -660,71 +660,71 @@ if ($rowid > 0) {
 							$accountstatic->accountancy_journal = $accountingjournal->getNomUrl(0, 1, 1, '', 1);
 						}
 
-                        $accountstatic->ref = $objp->ref;
-                        print $accountstatic->getNomUrl(1);
-                    } else {
-                        print '&nbsp;';
-                    }
-                    print '</td>';
-                }
-                print "</tr>";
-                $i++;
-            }
+						$accountstatic->ref = $objp->ref;
+						print $accountstatic->getNomUrl(1);
+					} else {
+						print '&nbsp;';
+					}
+					print '</td>';
+				}
+				print "</tr>";
+				$i++;
+			}
 
-            if (empty($num)) {
-                $colspan = 6;
-                if (!empty($conf->banque->enabled)) $colspan++;
-                print '<tr><td colspan="'.$colspan.'"><span class="opacitymedium">'.$langs->trans("None").'</span></td></tr>';
-            }
+			if (empty($num)) {
+				$colspan = 6;
+				if (!empty($conf->banque->enabled)) $colspan++;
+				print '<tr><td colspan="'.$colspan.'"><span class="opacitymedium">'.$langs->trans("None").'</span></td></tr>';
+			}
 
-            print "</table>";
-        } else {
-            dol_print_error($db);
-        }
-    }
+			print "</table>";
+		} else {
+			dol_print_error($db);
+		}
+	}
 
 
-    if (($action != 'addsubscription' && $action != 'create_thirdparty')) {
-	    // Shon online payment link
-	    $useonlinepayment = (!empty($conf->paypal->enabled) || !empty($conf->stripe->enabled) || !empty($conf->paybox->enabled));
+	if (($action != 'addsubscription' && $action != 'create_thirdparty')) {
+		// Shon online payment link
+		$useonlinepayment = (!empty($conf->paypal->enabled) || !empty($conf->stripe->enabled) || !empty($conf->paybox->enabled));
 
-	    if ($useonlinepayment) {
-	    	print '<br>';
+		if ($useonlinepayment) {
+			print '<br>';
 
-	    	require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
-	    	print showOnlinePaymentUrl('membersubscription', $object->ref);
-	    	print '<br>';
-	    }
-    }
+			require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
+			print showOnlinePaymentUrl('membersubscription', $object->ref);
+			print '<br>';
+		}
+	}
 
-    /*
+	/*
      * Add new subscription form
      */
-    if (($action == 'addsubscription' || $action == 'create_thirdparty') && $user->rights->adherent->cotisation->creer) {
-        print '<br>';
+	if (($action == 'addsubscription' || $action == 'create_thirdparty') && $user->rights->adherent->cotisation->creer) {
+		print '<br>';
 
-        print load_fiche_titre($langs->trans("NewCotisation"));
+		print load_fiche_titre($langs->trans("NewCotisation"));
 
-        // Define default choice for complementary actions
-        $bankdirect = 0; // 1 means option by default is write to bank direct with no invoice
-        $invoiceonly = 0; // 1 means option by default is invoice only
-        $bankviainvoice = 0; // 1 means option by default is write to bank via invoice
-        if (GETPOST('paymentsave')) {
-        	if (GETPOST('paymentsave') == 'bankdirect')     $bankdirect = 1;
-        	if (GETPOST('paymentsave') == 'invoiceonly')    $invoiceonly = 1;
-        	if (GETPOST('paymentsave') == 'bankviainvoice') $bankviainvoice = 1;
-        } else {
-        	if (!empty($conf->global->ADHERENT_BANK_USE) && $conf->global->ADHERENT_BANK_USE == 'bankviainvoice' && !empty($conf->banque->enabled) && !empty($conf->societe->enabled) && !empty($conf->facture->enabled)) $bankviainvoice = 1;
-        	elseif (!empty($conf->global->ADHERENT_BANK_USE) && $conf->global->ADHERENT_BANK_USE == 'bankdirect' && !empty($conf->banque->enabled)) $bankdirect = 1;
-        	elseif (!empty($conf->global->ADHERENT_BANK_USE) && $conf->global->ADHERENT_BANK_USE == 'invoiceonly' && !empty($conf->banque->enabled) && !empty($conf->societe->enabled) && !empty($conf->facture->enabled)) $invoiceonly = 1;
-        }
+		// Define default choice for complementary actions
+		$bankdirect = 0; // 1 means option by default is write to bank direct with no invoice
+		$invoiceonly = 0; // 1 means option by default is invoice only
+		$bankviainvoice = 0; // 1 means option by default is write to bank via invoice
+		if (GETPOST('paymentsave')) {
+			if (GETPOST('paymentsave') == 'bankdirect')     $bankdirect = 1;
+			if (GETPOST('paymentsave') == 'invoiceonly')    $invoiceonly = 1;
+			if (GETPOST('paymentsave') == 'bankviainvoice') $bankviainvoice = 1;
+		} else {
+			if (!empty($conf->global->ADHERENT_BANK_USE) && $conf->global->ADHERENT_BANK_USE == 'bankviainvoice' && !empty($conf->banque->enabled) && !empty($conf->societe->enabled) && !empty($conf->facture->enabled)) $bankviainvoice = 1;
+			elseif (!empty($conf->global->ADHERENT_BANK_USE) && $conf->global->ADHERENT_BANK_USE == 'bankdirect' && !empty($conf->banque->enabled)) $bankdirect = 1;
+			elseif (!empty($conf->global->ADHERENT_BANK_USE) && $conf->global->ADHERENT_BANK_USE == 'invoiceonly' && !empty($conf->banque->enabled) && !empty($conf->societe->enabled) && !empty($conf->facture->enabled)) $invoiceonly = 1;
+		}
 
-        print "\n\n<!-- Form add subscription -->\n";
+		print "\n\n<!-- Form add subscription -->\n";
 
-        if ($conf->use_javascript_ajax) {
-        	//var_dump($bankdirect.'-'.$bankviainvoice.'-'.$invoiceonly.'-'.empty($conf->global->ADHERENT_BANK_USE));
-            print "\n".'<script type="text/javascript" language="javascript">';
-            print '$(document).ready(function () {
+		if ($conf->use_javascript_ajax) {
+			//var_dump($bankdirect.'-'.$bankviainvoice.'-'.$invoiceonly.'-'.empty($conf->global->ADHERENT_BANK_USE));
+			print "\n".'<script type="text/javascript" language="javascript">';
+			print '$(document).ready(function () {
                         $(".bankswitchclass, .bankswitchclass2").'.(($bankdirect || $bankviainvoice) ? 'show()' : 'hide()').';
                         $("#none, #invoiceonly").click(function() {
                             $(".bankswitchclass").hide();
@@ -750,10 +750,10 @@ if ($rowid > 0) {
                             }
                         });
                         ';
-            if (GETPOST('paymentsave')) print '$("#'.GETPOST('paymentsave').'").prop("checked",true);';
-    	    print '});';
-            print '</script>'."\n";
-        }
+			if (GETPOST('paymentsave')) print '$("#'.GETPOST('paymentsave').'").prop("checked",true);';
+			print '});';
+			print '</script>'."\n";
+		}
 
 
 		// Confirm create third party
@@ -778,16 +778,16 @@ if ($rowid > 0) {
 			if (!empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED)) {
 				$tmpcompany = new Societe($db);
 				$tmpcompany->name = $companyname;
-                $tmpcompany->get_codeclient($tmpcompany, 0);
+				$tmpcompany->get_codeclient($tmpcompany, 0);
 				$customercode = $tmpcompany->code_client;
 				$formquestion[] = array(
-                    'label' => $langs->trans("CustomerCode"),
-                    'type' => 'text',
-                    'name' => 'customercode',
-                    'value' => $customercode,
-                    'morecss' => 'minwidth300',
-                    'moreattr' => 'maxlength="128"',
-                );
+					'label' => $langs->trans("CustomerCode"),
+					'type' => 'text',
+					'name' => 'customercode',
+					'value' => $customercode,
+					'morecss' => 'minwidth300',
+					'moreattr' => 'maxlength="128"',
+				);
 			}
 			// @todo Add other extrafields mandatory for thirdparty creation
 
@@ -795,99 +795,99 @@ if ($rowid > 0) {
 		}
 
 
-        print '<form name="subscription" method="POST" action="'.$_SERVER["PHP_SELF"].'">';
-        print '<input type="hidden" name="token" value="'.newToken().'">';
-        print '<input type="hidden" name="action" value="subscription">';
-        print '<input type="hidden" name="rowid" value="'.$rowid.'">';
-        print '<input type="hidden" name="memberlabel" id="memberlabel" value="'.dol_escape_htmltag($object->getFullName($langs)).'">';
-        print '<input type="hidden" name="thirdpartylabel" id="thirdpartylabel" value="'.dol_escape_htmltag($object->company).'">';
+		print '<form name="subscription" method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+		print '<input type="hidden" name="token" value="'.newToken().'">';
+		print '<input type="hidden" name="action" value="subscription">';
+		print '<input type="hidden" name="rowid" value="'.$rowid.'">';
+		print '<input type="hidden" name="memberlabel" id="memberlabel" value="'.dol_escape_htmltag($object->getFullName($langs)).'">';
+		print '<input type="hidden" name="thirdpartylabel" id="thirdpartylabel" value="'.dol_escape_htmltag($object->company).'">';
 
 		print dol_get_fiche_head('');
 
 		print "<table class=\"border\" width=\"100%\">\n";
-        print '<tbody>';
+		print '<tbody>';
 
 		$today = dol_now();
-        $datefrom = 0;
-        $dateto = 0;
-        $paymentdate = -1;
+		$datefrom = 0;
+		$dateto = 0;
+		$paymentdate = -1;
 
-        // Date payment
-        if (GETPOST('paymentyear') && GETPOST('paymentmonth') && GETPOST('paymentday')) {
-            $paymentdate = dol_mktime(0, 0, 0, GETPOST('paymentmonth'), GETPOST('paymentday'), GETPOST('paymentyear'));
-        }
+		// Date payment
+		if (GETPOST('paymentyear') && GETPOST('paymentmonth') && GETPOST('paymentday')) {
+			$paymentdate = dol_mktime(0, 0, 0, GETPOST('paymentmonth'), GETPOST('paymentday'), GETPOST('paymentyear'));
+		}
 
-        print '<tr>';
-        // Date start subscription
-        print '<td class="fieldrequired">'.$langs->trans("DateSubscription").'</td><td>';
-        if (GETPOST('reday')) {
-            $datefrom = dol_mktime(0, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
-        }
-        if (!$datefrom) {
-        	$datefrom = $object->datevalid;
-        	if ($object->datefin > 0) {
-                $datefrom = dol_time_plus_duree($object->datefin, 1, 'd');
-            }
-        }
-        print $form->selectDate($datefrom, '', '', '', '', "subscription", 1, 1);
-        print "</td></tr>";
+		print '<tr>';
+		// Date start subscription
+		print '<td class="fieldrequired">'.$langs->trans("DateSubscription").'</td><td>';
+		if (GETPOST('reday')) {
+			$datefrom = dol_mktime(0, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
+		}
+		if (!$datefrom) {
+			$datefrom = $object->datevalid;
+			if ($object->datefin > 0) {
+				$datefrom = dol_time_plus_duree($object->datefin, 1, 'd');
+			}
+		}
+		print $form->selectDate($datefrom, '', '', '', '', "subscription", 1, 1);
+		print "</td></tr>";
 
-        // Date end subscription
-        if (GETPOST('endday')) {
-            $dateto = dol_mktime(0, 0, 0, GETPOST('endmonth'), GETPOST('endday'), GETPOST('endyear'));
-        }
-        if (!$dateto) {
-            $dateto = -1; // By default, no date is suggested
-        }
-        print '<tr><td>'.$langs->trans("DateEndSubscription").'</td><td>';
-        print $form->selectDate($dateto, 'end', '', '', '', "subscription", 1, 0);
-        print "</td></tr>";
+		// Date end subscription
+		if (GETPOST('endday')) {
+			$dateto = dol_mktime(0, 0, 0, GETPOST('endmonth'), GETPOST('endday'), GETPOST('endyear'));
+		}
+		if (!$dateto) {
+			$dateto = -1; // By default, no date is suggested
+		}
+		print '<tr><td>'.$langs->trans("DateEndSubscription").'</td><td>';
+		print $form->selectDate($dateto, 'end', '', '', '', "subscription", 1, 0);
+		print "</td></tr>";
 
-        if ($adht->subscription) {
-            // Amount
-            print '<tr><td class="fieldrequired">'.$langs->trans("Amount").'</td><td><input type="text" name="subscription" size="6" value="'.GETPOST('subscription').'"> '.$langs->trans("Currency".$conf->currency).'</td></tr>';
+		if ($adht->subscription) {
+			// Amount
+			print '<tr><td class="fieldrequired">'.$langs->trans("Amount").'</td><td><input type="text" name="subscription" size="6" value="'.GETPOST('subscription').'"> '.$langs->trans("Currency".$conf->currency).'</td></tr>';
 
-            // Label
-            print '<tr><td>'.$langs->trans("Label").'</td>';
-            print '<td><input name="label" type="text" size="32" value="';
-            if (empty($conf->global->MEMBER_NO_DEFAULT_LABEL)) print $langs->trans("Subscription").' '.dol_print_date(($datefrom ? $datefrom : time()), "%Y");
-            print '"></td></tr>';
+			// Label
+			print '<tr><td>'.$langs->trans("Label").'</td>';
+			print '<td><input name="label" type="text" size="32" value="';
+			if (empty($conf->global->MEMBER_NO_DEFAULT_LABEL)) print $langs->trans("Subscription").' '.dol_print_date(($datefrom ? $datefrom : time()), "%Y");
+			print '"></td></tr>';
 
-            // Complementary action
-            if ((!empty($conf->banque->enabled) || !empty($conf->facture->enabled)) && empty($conf->global->ADHERENT_SUBSCRIPTION_HIDECOMPLEMENTARYACTIONS)) {
-                $company = new Societe($db);
-                if ($object->fk_soc) {
-                    $result = $company->fetch($object->fk_soc);
-                }
+			// Complementary action
+			if ((!empty($conf->banque->enabled) || !empty($conf->facture->enabled)) && empty($conf->global->ADHERENT_SUBSCRIPTION_HIDECOMPLEMENTARYACTIONS)) {
+				$company = new Societe($db);
+				if ($object->fk_soc) {
+					$result = $company->fetch($object->fk_soc);
+				}
 
-                // Title payments
-                //print '<tr><td colspan="2"><b>'.$langs->trans("Payment").'</b></td></tr>';
+				// Title payments
+				//print '<tr><td colspan="2"><b>'.$langs->trans("Payment").'</b></td></tr>';
 
-                // No more action
-                print '<tr><td class="tdtop fieldrequired">'.$langs->trans('MoreActions');
-                print '</td>';
-                print '<td>';
-                print '<input type="radio" class="moreaction" id="none" name="paymentsave" value="none"'.(empty($bankdirect) && empty($invoiceonly) && empty($bankviainvoice) ? ' checked' : '').'> '.$langs->trans("None").'<br>';
-                // Add entry into bank accoun
-                if (!empty($conf->banque->enabled)) {
-                    print '<input type="radio" class="moreaction" id="bankdirect" name="paymentsave" value="bankdirect"'.(!empty($bankdirect) ? ' checked' : '');
-                    print '> '.$langs->trans("MoreActionBankDirect").'<br>';
-                }
-                // Add invoice with no payments
-                if (!empty($conf->societe->enabled) && !empty($conf->facture->enabled)) {
-                    print '<input type="radio" class="moreaction" id="invoiceonly" name="paymentsave" value="invoiceonly"'.(!empty($invoiceonly) ? ' checked' : '');
-                    //if (empty($object->fk_soc)) print ' disabled';
-                    print '> '.$langs->trans("MoreActionInvoiceOnly");
-                    if ($object->fk_soc) print ' ('.$langs->trans("ThirdParty").': '.$company->getNomUrl(1).')';
-                    else {
-                    	print ' (';
-                    	if (empty($object->fk_soc)) print img_warning($langs->trans("NoThirdPartyAssociatedToMember"));
-                    	print $langs->trans("NoThirdPartyAssociatedToMember");
-                    	print ' - <a href="'.$_SERVER["PHP_SELF"].'?rowid='.$object->id.'&amp;action=create_thirdparty">';
-                    	print $langs->trans("CreateDolibarrThirdParty");
-                    	print '</a>)';
-                    }
-                    if (empty($conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS) || $conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS != 'defaultforfoundationcountry') print '. <span class="opacitymedium">'.$langs->trans("NoVatOnSubscription", 0).'</span>';
+				// No more action
+				print '<tr><td class="tdtop fieldrequired">'.$langs->trans('MoreActions');
+				print '</td>';
+				print '<td>';
+				print '<input type="radio" class="moreaction" id="none" name="paymentsave" value="none"'.(empty($bankdirect) && empty($invoiceonly) && empty($bankviainvoice) ? ' checked' : '').'> '.$langs->trans("None").'<br>';
+				// Add entry into bank accoun
+				if (!empty($conf->banque->enabled)) {
+					print '<input type="radio" class="moreaction" id="bankdirect" name="paymentsave" value="bankdirect"'.(!empty($bankdirect) ? ' checked' : '');
+					print '> '.$langs->trans("MoreActionBankDirect").'<br>';
+				}
+				// Add invoice with no payments
+				if (!empty($conf->societe->enabled) && !empty($conf->facture->enabled)) {
+					print '<input type="radio" class="moreaction" id="invoiceonly" name="paymentsave" value="invoiceonly"'.(!empty($invoiceonly) ? ' checked' : '');
+					//if (empty($object->fk_soc)) print ' disabled';
+					print '> '.$langs->trans("MoreActionInvoiceOnly");
+					if ($object->fk_soc) print ' ('.$langs->trans("ThirdParty").': '.$company->getNomUrl(1).')';
+					else {
+						print ' (';
+						if (empty($object->fk_soc)) print img_warning($langs->trans("NoThirdPartyAssociatedToMember"));
+						print $langs->trans("NoThirdPartyAssociatedToMember");
+						print ' - <a href="'.$_SERVER["PHP_SELF"].'?rowid='.$object->id.'&amp;action=create_thirdparty">';
+						print $langs->trans("CreateDolibarrThirdParty");
+						print '</a>)';
+					}
+					if (empty($conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS) || $conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS != 'defaultforfoundationcountry') print '. <span class="opacitymedium">'.$langs->trans("NoVatOnSubscription", 0).'</span>';
 					if (!empty($conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS) && (!empty($conf->product->enabled) || !empty($conf->service->enabled))) {
 						$prodtmp = new Product($db);
 						$result = $prodtmp->fetch($conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS);
@@ -896,23 +896,23 @@ if ($rowid > 0) {
 						}
 						print '. '.$langs->transnoentitiesnoconv("ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS", $prodtmp->getNomUrl(1)); // must use noentitiesnoconv to avoid to encode html into getNomUrl of product
 					}
-                    print '<br>';
-                }
-                // Add invoice with payments
-                if (!empty($conf->banque->enabled) && !empty($conf->societe->enabled) && !empty($conf->facture->enabled)) {
-                    print '<input type="radio" class="moreaction" id="bankviainvoice" name="paymentsave" value="bankviainvoice"'.(!empty($bankviainvoice) ? ' checked' : '');
-                    //if (empty($object->fk_soc)) print ' disabled';
-                    print '> '.$langs->trans("MoreActionBankViaInvoice");
-                    if ($object->fk_soc) print ' ('.$langs->trans("ThirdParty").': '.$company->getNomUrl(1).')';
-                    else {
-                    	print ' (';
-                    	if (empty($object->fk_soc)) print img_warning($langs->trans("NoThirdPartyAssociatedToMember"));
-                    	print $langs->trans("NoThirdPartyAssociatedToMember");
-                    	print ' - <a href="'.$_SERVER["PHP_SELF"].'?rowid='.$object->id.'&amp;action=create_thirdparty">';
-                    	print $langs->trans("CreateDolibarrThirdParty");
-                    	print '</a>)';
-                    }
-                    if (empty($conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS) || $conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS != 'defaultforfoundationcountry') print '. <span class="opacitymedium">'.$langs->trans("NoVatOnSubscription", 0).'</span>';
+					print '<br>';
+				}
+				// Add invoice with payments
+				if (!empty($conf->banque->enabled) && !empty($conf->societe->enabled) && !empty($conf->facture->enabled)) {
+					print '<input type="radio" class="moreaction" id="bankviainvoice" name="paymentsave" value="bankviainvoice"'.(!empty($bankviainvoice) ? ' checked' : '');
+					//if (empty($object->fk_soc)) print ' disabled';
+					print '> '.$langs->trans("MoreActionBankViaInvoice");
+					if ($object->fk_soc) print ' ('.$langs->trans("ThirdParty").': '.$company->getNomUrl(1).')';
+					else {
+						print ' (';
+						if (empty($object->fk_soc)) print img_warning($langs->trans("NoThirdPartyAssociatedToMember"));
+						print $langs->trans("NoThirdPartyAssociatedToMember");
+						print ' - <a href="'.$_SERVER["PHP_SELF"].'?rowid='.$object->id.'&amp;action=create_thirdparty">';
+						print $langs->trans("CreateDolibarrThirdParty");
+						print '</a>)';
+					}
+					if (empty($conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS) || $conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS != 'defaultforfoundationcountry') print '. <span class="opacitymedium">'.$langs->trans("NoVatOnSubscription", 0).'</span>';
 					if (!empty($conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS) && (!empty($conf->product->enabled) || !empty($conf->service->enabled))) {
 						$prodtmp = new Product($db);
 						$result = $prodtmp->fetch($conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS);
@@ -921,123 +921,123 @@ if ($rowid > 0) {
 						}
 						print '. '.$langs->transnoentitiesnoconv("ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS", $prodtmp->getNomUrl(1)); // must use noentitiesnoconv to avoid to encode html into getNomUrl of product
 					}
-                    print '<br>';
-                }
-                print '</td></tr>';
+					print '<br>';
+				}
+				print '</td></tr>';
 
-                // Bank account
-                print '<tr class="bankswitchclass"><td class="fieldrequired">'.$langs->trans("FinancialAccount").'</td><td>';
-                $form->select_comptes(GETPOST('accountid'), 'accountid', 0, '', 2);
-                print "</td></tr>\n";
+				// Bank account
+				print '<tr class="bankswitchclass"><td class="fieldrequired">'.$langs->trans("FinancialAccount").'</td><td>';
+				$form->select_comptes(GETPOST('accountid'), 'accountid', 0, '', 2);
+				print "</td></tr>\n";
 
-                // Payment mode
-                print '<tr class="bankswitchclass"><td class="fieldrequired">'.$langs->trans("PaymentMode").'</td><td>';
-                $form->select_types_paiements(GETPOST('operation'), 'operation', '', 2);
-                print "</td></tr>\n";
+				// Payment mode
+				print '<tr class="bankswitchclass"><td class="fieldrequired">'.$langs->trans("PaymentMode").'</td><td>';
+				$form->select_types_paiements(GETPOST('operation'), 'operation', '', 2);
+				print "</td></tr>\n";
 
-                // Date of payment
-                print '<tr class="bankswitchclass"><td class="fieldrequired">'.$langs->trans("DatePayment").'</td><td>';
-                print $form->selectDate(isset($paymentdate) ? $paymentdate : -1, 'payment', 0, 0, 1, 'subscription', 1, 1);
-                print "</td></tr>\n";
+				// Date of payment
+				print '<tr class="bankswitchclass"><td class="fieldrequired">'.$langs->trans("DatePayment").'</td><td>';
+				print $form->selectDate(isset($paymentdate) ? $paymentdate : -1, 'payment', 0, 0, 1, 'subscription', 1, 1);
+				print "</td></tr>\n";
 
-                print '<tr class="bankswitchclass2"><td>'.$langs->trans('Numero');
-                print ' <em>('.$langs->trans("ChequeOrTransferNumber").')</em>';
-                print '</td>';
-                print '<td><input id="fieldnum_chq" name="num_chq" type="text" size="8" value="'.(!GETPOST('num_chq') ? '' : GETPOST('num_chq')).'"></td></tr>';
+				print '<tr class="bankswitchclass2"><td>'.$langs->trans('Numero');
+				print ' <em>('.$langs->trans("ChequeOrTransferNumber").')</em>';
+				print '</td>';
+				print '<td><input id="fieldnum_chq" name="num_chq" type="text" size="8" value="'.(!GETPOST('num_chq') ? '' : GETPOST('num_chq')).'"></td></tr>';
 
-                print '<tr class="bankswitchclass2 fieldrequireddyn"><td>'.$langs->trans('CheckTransmitter');
-                print ' <em>('.$langs->trans("ChequeMaker").')</em>';
-                print '</td>';
-                print '<td><input id="fieldchqemetteur" name="chqemetteur" size="32" type="text" value="'.(!GETPOST('chqemetteur') ? '' : GETPOST('chqemetteur')).'"></td></tr>';
+				print '<tr class="bankswitchclass2 fieldrequireddyn"><td>'.$langs->trans('CheckTransmitter');
+				print ' <em>('.$langs->trans("ChequeMaker").')</em>';
+				print '</td>';
+				print '<td><input id="fieldchqemetteur" name="chqemetteur" size="32" type="text" value="'.(!GETPOST('chqemetteur') ? '' : GETPOST('chqemetteur')).'"></td></tr>';
 
-                print '<tr class="bankswitchclass2"><td>'.$langs->trans('Bank');
-                print ' <em>('.$langs->trans("ChequeBank").')</em>';
-                print '</td>';
-                print '<td><input id="chqbank" name="chqbank" size="32" type="text" value="'.(!GETPOST('chqbank') ? '' : GETPOST('chqbank')).'"></td></tr>';
-            }
-        }
+				print '<tr class="bankswitchclass2"><td>'.$langs->trans('Bank');
+				print ' <em>('.$langs->trans("ChequeBank").')</em>';
+				print '</td>';
+				print '<td><input id="chqbank" name="chqbank" size="32" type="text" value="'.(!GETPOST('chqbank') ? '' : GETPOST('chqbank')).'"></td></tr>';
+			}
+		}
 
-        print '<tr><td></td><td></td></tr>';
+		print '<tr><td></td><td></td></tr>';
 
-        print '<tr><td>'.$langs->trans("SendAcknowledgementByMail").'</td>';
-        print '<td>';
-        if (!$object->email) {
-            print $langs->trans("NoEMail");
-        } else {
-            $adht = new AdherentType($db);
-            $adht->fetch($object->typeid);
+		print '<tr><td>'.$langs->trans("SendAcknowledgementByMail").'</td>';
+		print '<td>';
+		if (!$object->email) {
+			print $langs->trans("NoEMail");
+		} else {
+			$adht = new AdherentType($db);
+			$adht->fetch($object->typeid);
 
-            // Send subscription email
-            $subject = '';
-            $msg = '';
+			// Send subscription email
+			$subject = '';
+			$msg = '';
 
-            // Send subscription email
-            include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
-            $formmail = new FormMail($db);
-            // Set output language
-            $outputlangs = new Translate('', $conf);
-            $outputlangs->setDefaultLang(empty($object->thirdparty->default_lang) ? $mysoc->default_lang : $object->thirdparty->default_lang);
-            // Load traductions files required by page
-            $outputlangs->loadLangs(array("main", "members"));
-            // Get email content from template
-            $arraydefaultmessage = null;
-            $labeltouse = $conf->global->ADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION;
+			// Send subscription email
+			include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
+			$formmail = new FormMail($db);
+			// Set output language
+			$outputlangs = new Translate('', $conf);
+			$outputlangs->setDefaultLang(empty($object->thirdparty->default_lang) ? $mysoc->default_lang : $object->thirdparty->default_lang);
+			// Load traductions files required by page
+			$outputlangs->loadLangs(array("main", "members"));
+			// Get email content from template
+			$arraydefaultmessage = null;
+			$labeltouse = $conf->global->ADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION;
 
-            if (!empty($labeltouse)) $arraydefaultmessage = $formmail->getEMailTemplate($db, 'member', $user, $outputlangs, 0, 1, $labeltouse);
+			if (!empty($labeltouse)) $arraydefaultmessage = $formmail->getEMailTemplate($db, 'member', $user, $outputlangs, 0, 1, $labeltouse);
 
-            if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0) {
-            	$subject = $arraydefaultmessage->topic;
-            	$msg     = $arraydefaultmessage->content;
-            }
+			if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0) {
+				$subject = $arraydefaultmessage->topic;
+				$msg     = $arraydefaultmessage->content;
+			}
 
-            $substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $object);
-            complete_substitutions_array($substitutionarray, $outputlangs, $object);
-            $subjecttosend = make_substitutions($subject, $substitutionarray, $outputlangs);
-            $texttosend = make_substitutions(dol_concatdesc($msg, $adht->getMailOnSubscription()), $substitutionarray, $outputlangs);
+			$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $object);
+			complete_substitutions_array($substitutionarray, $outputlangs, $object);
+			$subjecttosend = make_substitutions($subject, $substitutionarray, $outputlangs);
+			$texttosend = make_substitutions(dol_concatdesc($msg, $adht->getMailOnSubscription()), $substitutionarray, $outputlangs);
 
-            $tmp = '<input name="sendmail" type="checkbox"'.(GETPOST('sendmail', 'alpha') ? ' checked' : (!empty($conf->global->ADHERENT_DEFAULT_SENDINFOBYMAIL) ? ' checked' : '')).'>';
-            $helpcontent = '';
-            $helpcontent .= '<b>'.$langs->trans("MailFrom").'</b>: '.$conf->global->ADHERENT_MAIL_FROM.'<br>'."\n";
-            $helpcontent .= '<b>'.$langs->trans("MailRecipient").'</b>: '.$object->email.'<br>'."\n";
-            $helpcontent .= '<b>'.$langs->trans("MailTopic").'</b>:<br>'."\n";
-            if ($subjecttosend) {
-                $helpcontent .= $subjecttosend."\n";
-            } else {
-                $langs->load("errors");
-                $helpcontent .= '<span class="error">'.$langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("Module310Name")).'</span>'."\n";
-            }
-            $helpcontent .= "<br>";
-            $helpcontent .= '<b>'.$langs->trans("MailText").'</b>:<br>';
-            if ($texttosend) {
-                $helpcontent .= dol_htmlentitiesbr($texttosend)."\n";
-            } else {
-                $langs->load("errors");
-                $helpcontent .= '<span class="error">'.$langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("Module310Name")).'</span>'."\n";
-            }
-            print $form->textwithpicto($tmp, $helpcontent, 1, 'help', '', 0, 2, 'helpemailtosend');
-        }
-        print '</td></tr>';
-        print '</tbody>';
-        print '</table>';
+			$tmp = '<input name="sendmail" type="checkbox"'.(GETPOST('sendmail', 'alpha') ? ' checked' : (!empty($conf->global->ADHERENT_DEFAULT_SENDINFOBYMAIL) ? ' checked' : '')).'>';
+			$helpcontent = '';
+			$helpcontent .= '<b>'.$langs->trans("MailFrom").'</b>: '.$conf->global->ADHERENT_MAIL_FROM.'<br>'."\n";
+			$helpcontent .= '<b>'.$langs->trans("MailRecipient").'</b>: '.$object->email.'<br>'."\n";
+			$helpcontent .= '<b>'.$langs->trans("MailTopic").'</b>:<br>'."\n";
+			if ($subjecttosend) {
+				$helpcontent .= $subjecttosend."\n";
+			} else {
+				$langs->load("errors");
+				$helpcontent .= '<span class="error">'.$langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("Module310Name")).'</span>'."\n";
+			}
+			$helpcontent .= "<br>";
+			$helpcontent .= '<b>'.$langs->trans("MailText").'</b>:<br>';
+			if ($texttosend) {
+				$helpcontent .= dol_htmlentitiesbr($texttosend)."\n";
+			} else {
+				$langs->load("errors");
+				$helpcontent .= '<span class="error">'.$langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("Module310Name")).'</span>'."\n";
+			}
+			print $form->textwithpicto($tmp, $helpcontent, 1, 'help', '', 0, 2, 'helpemailtosend');
+		}
+		print '</td></tr>';
+		print '</tbody>';
+		print '</table>';
 
-        dol_fiche_end();
+		print dol_get_fiche_end();
 
-        print '<div class="center">';
-        print '<input type="submit" class="button" name="add" value="'.$langs->trans("AddSubscription").'">';
-        print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-        print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
-        print '</div>';
+		print '<div class="center">';
+		print '<input type="submit" class="button" name="add" value="'.$langs->trans("AddSubscription").'">';
+		print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
+		print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+		print '</div>';
 
-        print '</form>';
+		print '</form>';
 
-        print "\n<!-- End form subscription -->\n\n";
-    }
+		print "\n<!-- End form subscription -->\n\n";
+	}
 
-    //print '</td></tr>';
-    //print '</table>';
+	//print '</td></tr>';
+	//print '</table>';
 } else {
-    $langs->load("errors");
-    print $langs->trans("ErrorRecordNotFound");
+	$langs->load("errors");
+	print $langs->trans("ErrorRecordNotFound");
 }
 
 // End of page
diff --git a/htdocs/adherents/subscription/card.php b/htdocs/adherents/subscription/card.php
index 7dd6f3f0e66..c97c502abaf 100644
--- a/htdocs/adherents/subscription/card.php
+++ b/htdocs/adherents/subscription/card.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2007-2019  Laurent Destailleur     <eldy@users.sourceforge.net>
- * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2020  Frédéric France         <frederic.france@netlogic.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -40,10 +40,13 @@ $object = new Subscription($db);
 $errmsg = '';
 
 $action = GETPOST("action", 'alpha');
-$rowid = GETPOST("rowid", "int") ?GETPOST("rowid", "int") : GETPOST("id", "int");
+$rowid = GETPOST("rowid", "int") ? GETPOST("rowid", "int") : GETPOST("id", "int");
 $typeid = GETPOST("typeid", "int");
 $cancel = GETPOST('cancel', 'alpha');
 $confirm = GETPOST('confirm');
+$note = GETPOST('note', 'alpha');
+$typeid = (int) GETPOST('typeid', 'int');
+$amount = price2num(GETPOST('amount', 'alpha'), 'MT');
 
 if (!$user->rights->adherent->cotisation->lire)
 	 accessforbidden();
@@ -84,7 +87,7 @@ if ($user->rights->adherent->cotisation->creer && $action == 'update' && !$cance
 			} else {
 				$accountline->datev = dol_mktime($_POST['datesubhour'], $_POST['datesubmin'], 0, $_POST['datesubmonth'], $_POST['datesubday'], $_POST['datesubyear']);
 				$accountline->dateo = dol_mktime($_POST['datesubhour'], $_POST['datesubmin'], 0, $_POST['datesubmonth'], $_POST['datesubday'], $_POST['datesubyear']);
-				$accountline->amount = $_POST["amount"];
+				$accountline->amount = $amount;
 				$result = $accountline->update($user);
 				if ($result < 0) {
 					$errmsg = $accountline->error;
@@ -96,9 +99,9 @@ if ($user->rights->adherent->cotisation->creer && $action == 'update' && !$cance
 			// Modify values
 			$object->dateh = dol_mktime($_POST['datesubhour'], $_POST['datesubmin'], 0, $_POST['datesubmonth'], $_POST['datesubday'], $_POST['datesubyear']);
 			$object->datef = dol_mktime($_POST['datesubendhour'], $_POST['datesubendmin'], 0, $_POST['datesubendmonth'], $_POST['datesubendday'], $_POST['datesubendyear']);
-			$object->fk_type = $_POST["typeid"];
-			$object->note = $_POST["note"];
-			$object->amount = $_POST["amount"];
+			$object->fk_type = $typeid;
+			$object->note = $note;
+			$object->amount = $amount;
 			//print 'datef='.$object->datef.' '.$_POST['datesubendday'];
 
 			$result = $object->update($user);
@@ -216,23 +219,21 @@ if ($user->rights->adherent->cotisation->creer && $action == 'edit') {
 	print '<input type="text" class="flat" size="60" name="note" value="'.$object->note.'"></td></tr>';
 
 	// Bank line
-	if (!empty($conf->banque->enabled)) {
-		if ($conf->global->ADHERENT_BANK_USE || $object->fk_bank) {
-			print '<tr><td>'.$langs->trans("BankTransactionLine").'</td><td class="valeur" colspan="2">';
-			if ($object->fk_bank) {
-				$bankline = new AccountLine($db);
-				$result = $bankline->fetch($object->fk_bank);
-				print $bankline->getNomUrl(1, 0, 'showall');
-			} else {
-				print $langs->trans("NoneF");
-			}
-			print '</td></tr>';
+	if (!empty($conf->banque->enabled) && ($conf->global->ADHERENT_BANK_USE || $object->fk_bank)) {
+		print '<tr><td>'.$langs->trans("BankTransactionLine").'</td><td class="valeur" colspan="2">';
+		if ($object->fk_bank) {
+			$bankline = new AccountLine($db);
+			$result = $bankline->fetch($object->fk_bank);
+			print $bankline->getNomUrl(1, 0, 'showall');
+		} else {
+			print $langs->trans("NoneF");
 		}
+		print '</td></tr>';
 	}
 
 	print '</table>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div class="center">';
 	print '<input type="submit" class="button" name="submit" value="'.$langs->trans("Save").'">';
@@ -316,18 +317,16 @@ if ($rowid && $action != 'edit') {
 	print '<tr><td>'.$langs->trans("Label").'</td><td class="valeur">'.$object->note.'</td></tr>';
 
 	// Bank line
-	if (!empty($conf->banque->enabled)) {
-		if ($conf->global->ADHERENT_BANK_USE || $object->fk_bank) {
-			print '<tr><td>'.$langs->trans("BankTransactionLine").'</td><td class="valeur">';
-			if ($object->fk_bank) {
-				$bankline = new AccountLine($db);
-				$result = $bankline->fetch($object->fk_bank);
-				print $bankline->getNomUrl(1, 0, 'showall');
-			} else {
-				print $langs->trans("NoneF");
-			}
-			print '</td></tr>';
+	if (!empty($conf->banque->enabled) && ($conf->global->ADHERENT_BANK_USE || $object->fk_bank)) {
+		print '<tr><td>'.$langs->trans("BankTransactionLine").'</td><td class="valeur">';
+		if ($object->fk_bank) {
+			$bankline = new AccountLine($db);
+			$result = $bankline->fetch($object->fk_bank);
+			print $bankline->getNomUrl(1, 0, 'showall');
+		} else {
+			print $langs->trans("NoneF");
 		}
+		print '</td></tr>';
 	}
 
 	print "</table>\n";
@@ -335,7 +334,7 @@ if ($rowid && $action != 'edit') {
 
 	print '</form>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	/*
      * Barre d'actions
diff --git a/htdocs/adherents/subscription/info.php b/htdocs/adherents/subscription/info.php
index cbc659df766..a7a4a897505 100644
--- a/htdocs/adherents/subscription/info.php
+++ b/htdocs/adherents/subscription/info.php
@@ -72,7 +72,7 @@ print '</td></tr></table>';
 print '</div>';
 
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // End of page
 llxFooter();
diff --git a/htdocs/adherents/subscription/list.php b/htdocs/adherents/subscription/list.php
index 9b5efa214b9..92e495ad93b 100644
--- a/htdocs/adherents/subscription/list.php
+++ b/htdocs/adherents/subscription/list.php
@@ -110,22 +110,22 @@ $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
 if (empty($reshook)) {
-    // Selection of new fields
-    include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
+	// Selection of new fields
+	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
-    // Purge search criteria
-    if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All tests are required to be compatible with all browsers
+	// Purge search criteria
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All tests are required to be compatible with all browsers
 		$search_type = "";
-	    $search_ref = "";
-	    $search_lastname = "";
-	    $search_firstname = "";
-	    $search_login = "";
-	    $search_note = "";
-	    $search_amount = "";
-	    $search_account = "";
-	    $toselect = '';
-	    $search_array_options = array();
-    }
+		$search_ref = "";
+		$search_lastname = "";
+		$search_firstname = "";
+		$search_login = "";
+		$search_note = "";
+		$search_amount = "";
+		$search_account = "";
+		$toselect = '';
+		$search_array_options = array();
+	}
 }
 
 
@@ -153,8 +153,8 @@ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."adherent_extrafields as ef on (d.rowid = e
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank as b ON c.fk_bank=b.rowid";
 $sql .= " WHERE d.entity IN (".getEntity('adherent').")";
 if (isset($date_select) && $date_select != '') {
-    $sql .= " AND c.dateadh >= '".((int) $date_select)."-01-01 00:00:00'";
-    $sql .= " AND c.dateadh < '".((int) $date_select + 1)."-01-01 00:00:00'";
+	$sql .= " AND c.dateadh >= '".((int) $date_select)."-01-01 00:00:00'";
+	$sql .= " AND c.dateadh < '".((int) $date_select + 1)."-01-01 00:00:00'";
 }
 if ($search_ref) {
 	if (is_numeric($search_ref)) $sql .= " AND (c.rowid = ".$db->escape($search_ref).")";
@@ -181,13 +181,13 @@ $sql .= $db->order($sortfield, $sortorder);
 // Count total nb of records with no order and no limits
 $nbtotalofrecords = '';
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
-    $resql = $db->query($sql);
-    if ($resql) $nbtotalofrecords = $db->num_rows($resql);
-    else dol_print_error($db);
-    if (($page * $limit) > $nbtotalofrecords) {	// if total resultset is smaller then paging size (filtering), goto and load page 0
+	$resql = $db->query($sql);
+	if ($resql) $nbtotalofrecords = $db->num_rows($resql);
+	else dol_print_error($db);
+	if (($page * $limit) > $nbtotalofrecords) {	// if total resultset is smaller then paging size (filtering), goto and load page 0
 		$page = 0;
-    	$offset = 0;
-    }
+		$offset = 0;
+	}
 }
 // Add limit
 $sql .= $db->plimit($limit + 1, $offset);
@@ -241,7 +241,7 @@ $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
 $newcardbutton = '';
 if ($user->rights->adherent->cotisation->creer) {
-    $newcardbutton .= dolGetButtonTitle($langs->trans('NewSubscription'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/adherents/list.php?status=-1,1');
+	$newcardbutton .= dolGetButtonTitle($langs->trans('NewSubscription'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/adherents/list.php?status=-1,1');
 }
 
 print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
@@ -409,8 +409,8 @@ while ($i < min($num, $limit)) {
 	$adherent->typeid = $obj->type;
 
 	$typeid = ($obj->fk_type > 0 ? $obj->fk_type : $adherent->typeid);
-    $adht = new AdherentType($db);
-    $adht->fetch($typeid);
+	$adht = new AdherentType($db);
+	$adht->fetch($typeid);
 
 	print '<tr class="oddeven">';
 
@@ -419,14 +419,14 @@ while ($i < min($num, $limit)) {
 		print '<td>'.$subscription->getNomUrl(1).'</td>';
 		if (!$i) $totalarray['nbfield']++;
 	}
-    // Type
-    if (!empty($arrayfields['d.fk_type']['checked'])) {
-        print '<td class="nowraponall">';
-        if ($typeid > 0) {
-        	print $adht->getNomUrl(1);
-        }
-        print '</td>';
-        if (!$i) $totalarray['nbfield']++;
+	// Type
+	if (!empty($arrayfields['d.fk_type']['checked'])) {
+		print '<td class="nowraponall">';
+		if ($typeid > 0) {
+			print $adht->getNomUrl(1);
+		}
+		print '</td>';
+		if (!$i) $totalarray['nbfield']++;
 	}
 
 	// Lastname
diff --git a/htdocs/adherents/tpl/linkedobjectblock.tpl.php b/htdocs/adherents/tpl/linkedobjectblock.tpl.php
index 136c1dab8f4..0414bf20a14 100644
--- a/htdocs/adherents/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/adherents/tpl/linkedobjectblock.tpl.php
@@ -33,12 +33,12 @@ $langs->load("members");
 
 $total = 0;
 foreach ($linkedObjectBlock as $key => $objectlink) {
-    echo '<tr class="oddeven">';
-    echo '<td>'.$langs->trans("Subscription").'</td>';
-    echo '<td>'.$objectlink->getNomUrl(1).'</td>';
-    echo '<td class="center"></td>';
-    echo '<td class="center">'.dol_print_date($objectlink->dateh, 'day').'</td>';
-    echo '<td class="right">';
+	echo '<tr class="oddeven">';
+	echo '<td>'.$langs->trans("Subscription").'</td>';
+	echo '<td>'.$objectlink->getNomUrl(1).'</td>';
+	echo '<td class="center"></td>';
+	echo '<td class="center">'.dol_print_date($objectlink->dateh, 'day').'</td>';
+	echo '<td class="right">';
 	if ($user->rights->adherent->lire) {
 		$total = $total + $objectlink->amount;
 		echo price($objectlink->amount);
@@ -46,7 +46,7 @@ foreach ($linkedObjectBlock as $key => $objectlink) {
 	echo '</td>';
 	echo '<td class="right"></td>';
 	echo '<td class="right"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key.'">'.img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink').'</a></td>';
-    echo '</tr>';
+	echo '</tr>';
 }
 
 echo "<!-- END PHP TEMPLATE -->\n";
diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php
index 3d9dc7ace60..fc1d7ecb1d9 100644
--- a/htdocs/adherents/type.php
+++ b/htdocs/adherents/type.php
@@ -247,7 +247,7 @@ if (!$rowid && $action != 'create' && $action != 'edit') {
 		print '<tr class="liste_titre">';
 		print '<th>'.$langs->trans("Ref").'</th>';
 		print '<th>'.$langs->trans("Label").'</th>';
-		print '<th class="center">'.$langs->trans("MemberNature").'</th>';
+		print '<th class="center">'.$langs->trans("MembersNature").'</th>';
 		print '<th class="center">'.$langs->trans("SubscriptionRequired").'</th>';
 		print '<th class="center">'.$langs->trans("VoteAllowed").'</th>';
 		print '<th class="center">'.$langs->trans("Status").'</th>';
@@ -263,6 +263,7 @@ if (!$rowid && $action != 'create' && $action != 'edit') {
 			$membertype->ref = $objp->rowid;
 			$membertype->label = $objp->rowid;
 			$membertype->status = $objp->status;
+			$membertype->subscription = $objp->subscription;
 
 			print '<tr class="oddeven">';
 			print '<td>';
@@ -271,7 +272,7 @@ if (!$rowid && $action != 'create' && $action != 'edit') {
 			print '</td>';
 			print '<td>'.dol_escape_htmltag($objp->label).'</td>';
 			print '<td class="center">';
-			if ($objp->morphy == 'phy') { print $langs->trans("Physical"); } elseif ($objp->morphy == 'mor') { print $langs->trans("Moral"); } else print $langs->trans("MorPhy");
+			if ($objp->morphy == 'phy') { print $langs->trans("Physical"); } elseif ($objp->morphy == 'mor') { print $langs->trans("Moral"); } else print $langs->trans("MorAndPhy");
 			print '</td>';
 			print '<td class="center">'.yn($objp->subscription).'</td>';
 			print '<td class="center">'.yn($objp->vote).'</td>';
@@ -321,10 +322,10 @@ if ($action == 'create') {
 
 	// Morphy
   	$morphys = array();
-	$morphys[""] = $langs->trans("MorPhy");
-	$morphys["phy"] = $langs->trans("Physical");
+  	$morphys[""] = $langs->trans("MorAndPhy");
+  	$morphys["phy"] = $langs->trans("Physical");
 	$morphys["mor"] = $langs->trans("Moral");
-	print '<tr><td><span>'.$langs->trans("MemberNature").'</span></td><td>';
+	print '<tr><td><span>'.$langs->trans("MembersNature").'</span></td><td>';
 	print $form->selectarray("morphy", $morphys, GETPOSTISSET("morphy") ? GETPOST("morphy", 'aZ09') : 'morphy');
 	print "</td></tr>";
 
@@ -343,12 +344,12 @@ if ($action == 'create') {
 
 	print '<tr><td class="tdtop">'.$langs->trans("Description").'</td><td>';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-	$doleditor = new DolEditor('comment', $object->note, '', 280, 'dolibarr_notes', '', false, true, $conf->fckeditor->enabled, 15, '90%');
+	$doleditor = new DolEditor('comment', $object->note, '', 200, 'dolibarr_notes', '', false, true, $conf->fckeditor->enabled, 15, '90%');
 	$doleditor->Create();
 
 	print '<tr><td class="tdtop">'.$langs->trans("WelcomeEMail").'</td><td>';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-	$doleditor = new DolEditor('mail_valid', $object->mail_valid, '', 280, 'dolibarr_notes', '', false, true, $conf->fckeditor->enabled, 15, '90%');
+	$doleditor = new DolEditor('mail_valid', $object->mail_valid, '', 250, 'dolibarr_notes', '', false, true, $conf->fckeditor->enabled, 15, '90%');
 	$doleditor->Create();
 	print '</td></tr>';
 
@@ -358,7 +359,7 @@ if ($action == 'create') {
 	print '<tbody>';
 	print "</table>\n";
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div class="center">';
 	print '<input type="submit" name="button" class="button" value="'.$langs->trans("Add").'">';
@@ -401,7 +402,7 @@ if ($rowid > 0) {
 		print '<table class="border centpercent">';
 
 		// Morphy
-		print '<tr><td>'.$langs->trans("MemberNature").'</td><td class="valeur" >'.$object->getmorphylib($object->morphy).'</td>';
+		print '<tr><td>'.$langs->trans("MembersNature").'</td><td class="valeur" >'.$object->getmorphylib($object->morphy).'</td>';
 		print '</tr>';
 
 		print '<tr><td class="titlefield">'.$langs->trans("SubscriptionRequired").'</td><td>';
@@ -433,7 +434,7 @@ if ($rowid > 0) {
 		print '</table>';
 		print '</div>';
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 		/*
 		 * Buttons
@@ -614,13 +615,16 @@ if ($rowid > 0) {
 				$adh = new Adherent($db);
 				$adh->lastname = $objp->lastname;
 				$adh->firstname = $objp->firstname;
+				$adh->datefin = $datefin;
+				$adh->need_subscription = $objp->subscription;
+				$adh->statut = $objp->status;
 
 				// Lastname
 				print '<tr class="oddeven">';
 				if ($objp->company != '') {
-					print '<td><a href="card.php?rowid='.$objp->rowid.'">'.img_object($langs->trans("ShowMember"), "user").' '.$adh->getFullName($langs, 0, -1, 20).' / '.dol_trunc($objp->societe, 12).'</a></td>'."\n";
+					print '<td><a href="card.php?rowid='.$objp->rowid.'">'.img_object($langs->trans("ShowMember"), "user", 'class="paddingright"').$adh->getFullName($langs, 0, -1, 20).' / '.dol_trunc($objp->company, 12).'</a></td>'."\n";
 				} else {
-					print '<td><a href="card.php?rowid='.$objp->rowid.'">'.img_object($langs->trans("ShowMember"), "user").' '.$adh->getFullName($langs, 0, -1, 32).'</a></td>'."\n";
+					print '<td><a href="card.php?rowid='.$objp->rowid.'">'.img_object($langs->trans("ShowMember"), "user", 'class="paddingright"').$adh->getFullName($langs, 0, -1, 32).'</a></td>'."\n";
 				}
 
 				// Login
@@ -640,9 +644,9 @@ if ($rowid > 0) {
 				// EMail
 				print "<td>".dol_print_email($objp->email, 0, 0, 1)."</td>\n";
 
-				// Statut
+				// Status
 				print '<td class="nowrap">';
-				print $adh->LibStatut($objp->status, $objp->subscription, $datefin, 2);
+				print $adh->getLibStatut(2);
 				print "</td>";
 
 				// Date end subscription
@@ -668,11 +672,10 @@ if ($rowid > 0) {
 				// Actions
 				print '<td class="center">';
 				if ($user->rights->adherent->creer) {
-					print '<a class="editfielda" href="card.php?rowid='.$objp->rowid.'&action=edit&backtopage='.urlencode($_SERVER["PHP_SELF"].'?rowid='.$object->id).'">'.img_edit().'</a>';
+					print '<a class="editfielda marginleftonly" href="card.php?rowid='.$objp->rowid.'&action=edit&backtopage='.urlencode($_SERVER["PHP_SELF"].'?rowid='.$object->id).'">'.img_edit().'</a>';
 				}
-				print '&nbsp;';
 				if ($user->rights->adherent->supprimer) {
-					print '<a href="card.php?rowid='.$objp->rowid.'&action=resign">'.img_picto($langs->trans("Resiliate"), 'disable.png').'</a>';
+					print '<a class="marginleftonly" href="card.php?rowid='.$objp->rowid.'&action=resign">'.img_picto($langs->trans("Resiliate"), 'disable.png').'</a>';
 				}
 				print "</td>";
 
@@ -723,11 +726,11 @@ if ($rowid > 0) {
 		print '</td></tr>';
 
 		// Morphy
-		$morphys[""] = $langs->trans("MorPhy");
+		$morphys[""] = $langs->trans("MorAndPhy");
 		$morphys["phy"] = $langs->trans("Physical");
 		$morphys["mor"] = $langs->trans("Moral");
-		print '<tr><td><span>'.$langs->trans("MemberNature").'</span></td><td>';
-		print $form->selectarray("morphy", $morphys, GETPOSTISSET("morphy") ? GETPOST("morphy") : $object->morphy);
+		print '<tr><td><span>'.$langs->trans("MembersNature").'</span></td><td>';
+		print $form->selectarray("morphy", $morphys, GETPOSTISSET("morphy") ? GETPOST("morphy", 'aZ09') : $object->morphy);
 		print "</td></tr>";
 
 		print '<tr><td>'.$langs->trans("SubscriptionRequired").'</td><td>';
@@ -759,7 +762,7 @@ if ($rowid > 0) {
 
 		print '</table>';
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 		print '<div class="center">';
 		print '<input type="submit" class="button" value="'.$langs->trans("Save").'">';
diff --git a/htdocs/adherents/type_ldap.php b/htdocs/adherents/type_ldap.php
index f743de5421a..1d37f337a78 100644
--- a/htdocs/adherents/type_ldap.php
+++ b/htdocs/adherents/type_ldap.php
@@ -114,7 +114,7 @@ print '</table>';
 
 print '</div>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 /*
  * Action bar
@@ -123,7 +123,7 @@ dol_fiche_end();
 print '<div class="tabsAction">';
 
 if ($conf->global->LDAP_MEMBER_TYPE_ACTIVE == 1) {
-    print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?rowid='.$object->id.'&action=dolibarr2ldap">'.$langs->trans("ForceSynchronize").'</a>';
+	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?rowid='.$object->id.'&action=dolibarr2ldap">'.$langs->trans("ForceSynchronize").'</a>';
 }
 
 print "</div>\n";
@@ -146,27 +146,27 @@ print '</tr>';
 $ldap = new Ldap();
 $result = $ldap->connect_bind();
 if ($result > 0) {
-    $info = $object->_load_ldap_info();
-    $dn = $object->_load_ldap_dn($info, 1);
-    $search = "(".$object->_load_ldap_dn($info, 2).")";
+	$info = $object->_load_ldap_info();
+	$dn = $object->_load_ldap_dn($info, 1);
+	$search = "(".$object->_load_ldap_dn($info, 2).")";
 
-    $records = $ldap->getAttribute($dn, $search);
+	$records = $ldap->getAttribute($dn, $search);
 
-    //print_r($records);
+	//print_r($records);
 
-    // Show tree
-    if (((!is_numeric($records)) || $records != 0) && (!isset($records['count']) || $records['count'] > 0)) {
-        if (!is_array($records)) {
-            print '<tr class="oddeven"><td colspan="2"><font class="error">'.$langs->trans("ErrorFailedToReadLDAP").'</font></td></tr>';
-        } else {
-            $result = show_ldap_content($records, 0, $records['count'], true);
-        }
-    } else {
-        print '<tr class="oddeven"><td colspan="2">'.$langs->trans("LDAPRecordNotFound").' (dn='.$dn.' - search='.$search.')</td></tr>';
-    }
+	// Show tree
+	if (((!is_numeric($records)) || $records != 0) && (!isset($records['count']) || $records['count'] > 0)) {
+		if (!is_array($records)) {
+			print '<tr class="oddeven"><td colspan="2"><font class="error">'.$langs->trans("ErrorFailedToReadLDAP").'</font></td></tr>';
+		} else {
+			$result = show_ldap_content($records, 0, $records['count'], true);
+		}
+	} else {
+		print '<tr class="oddeven"><td colspan="2">'.$langs->trans("LDAPRecordNotFound").' (dn='.$dn.' - search='.$search.')</td></tr>';
+	}
 
-    $ldap->unbind();
-    $ldap->close();
+	$ldap->unbind();
+	$ldap->close();
 } else {
 	setEventMessages($ldap->error, $ldap->errors, 'errors');
 }
diff --git a/htdocs/adherents/type_translation.php b/htdocs/adherents/type_translation.php
index 971d8411640..3aafef6f216 100644
--- a/htdocs/adherents/type_translation.php
+++ b/htdocs/adherents/type_translation.php
@@ -154,9 +154,9 @@ $titre = $langs->trans("MemberType".$object->type);
 // Calculate $cnt_trans
 $cnt_trans = 0;
 if (!empty($object->multilangs)) {
-    foreach ($object->multilangs as $key => $value) {
-        $cnt_trans++;
-    }
+	foreach ($object->multilangs as $key => $value) {
+		$cnt_trans++;
+	}
 }
 
 
@@ -166,7 +166,7 @@ $linkback = '<a href="'.dol_buildpath('/adherents/type.php', 1).'">'.$langs->tra
 
 dol_banner_tab($object, 'rowid', $linkback);
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 
@@ -179,10 +179,10 @@ dol_fiche_end();
 print "\n<div class=\"tabsAction\">\n";
 
 if ($action == '') {
-    if ($user->rights->produit->creer || $user->rights->service->creer) {
-        print '<a class="butAction" href="'.DOL_URL_ROOT.'/adherents/type_translation.php?action=add&rowid='.$object->id.'">'.$langs->trans("Add").'</a>';
-        if ($cnt_trans > 0) print '<a class="butAction" href="'.DOL_URL_ROOT.'/adherents/type_translation.php?action=edit&rowid='.$object->id.'">'.$langs->trans("Update").'</a>';
-    }
+	if ($user->rights->produit->creer || $user->rights->service->creer) {
+		print '<a class="butAction" href="'.DOL_URL_ROOT.'/adherents/type_translation.php?action=add&rowid='.$object->id.'">'.$langs->trans("Add").'</a>';
+		if ($cnt_trans > 0) print '<a class="butAction" href="'.DOL_URL_ROOT.'/adherents/type_translation.php?action=edit&rowid='.$object->id.'">'.$langs->trans("Update").'</a>';
+	}
 }
 
 print "\n</div>\n";
@@ -262,7 +262,7 @@ if ($action == 'add' && $user->rights->adherent->configurer) {
 
 	print '<table class="border centpercent">';
 	print '<tr><td class="tdtop titlefieldcreate fieldrequired">'.$langs->trans('Language').'</td><td>';
-    print $formadmin->select_language('', 'forcelangprod', 0, $object->multilangs, 1);
+	print $formadmin->select_language('', 'forcelangprod', 0, $object->multilangs, 1);
 	print '</td></tr>';
 	print '<tr><td class="tdtop fieldrequired">'.$langs->trans('Label').'</td><td><input name="libelle" size="40"></td></tr>';
 	print '<tr><td class="tdtop">'.$langs->trans('Description').'</td><td>';
@@ -272,7 +272,7 @@ if ($action == 'add' && $user->rights->adherent->configurer) {
 
 	print '</table>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div class="center">';
 	print '<input type="submit" class="button" value="'.$langs->trans("Save").'">';
diff --git a/htdocs/adherents/vcard.php b/htdocs/adherents/vcard.php
index 6f2a274aed9..dbdbbc687ea 100644
--- a/htdocs/adherents/vcard.php
+++ b/htdocs/adherents/vcard.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2004-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2020		Tobias Sekan		<tobias.sekan@startmail.com>
+ * Copyright (C) 2020		Frédéric France		<frederic.france@netlogic.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -39,8 +40,7 @@ $result = restrictedArea($user, 'adherent', $id, '', '', 'socid', 'rowid', $objc
 
 
 $result = $adherent->fetch($id);
-if ($result <= 0)
-{
+if ($result <= 0) {
 	dol_print_error($adherent->error);
 	exit;
 }
@@ -48,8 +48,7 @@ if ($result <= 0)
 $physicalperson = 1;
 
 $company = new Societe($db);
-if ($adherent->socid)
-{
+if ($adherent->socid) {
 	$result = $company->fetch($adherent->socid);
 }
 
@@ -66,43 +65,41 @@ $v->setPhoneNumber($adherent->phone_pro, "TYPE=WORK;VOICE");
 $v->setPhoneNumber($adherent->phone_mobile, "TYPE=CELL;VOICE");
 $v->setPhoneNumber($adherent->fax, "TYPE=WORK;FAX");
 
-$country = $adherent->country_code ? $adherent->country : '' ;
+$country = $adherent->country_code ? $adherent->country : '';
 
 $v->setAddress("", "", $adherent->address, $adherent->town, $adherent->state, $adherent->zip, $country, "TYPE=WORK;POSTAL");
 $v->setLabel("", "", $adherent->address, $adherent->town, $adherent->state, $adherent->zip, $country, "TYPE=WORK");
 
 $v->setEmail($adherent->email);
-$v->setNote($adherent->note);
+$v->setNote($adherent->note_public);
 $v->setTitle($adherent->poste);
 
 // Data from linked company
-if ($company->id)
-{
+if ($company->id) {
 	$v->setURL($company->url, "TYPE=WORK");
-	if (! $adherent->phone_pro) $v->setPhoneNumber($company->phone, "TYPE=WORK;VOICE");
-	if (! $adherent->fax)       $v->setPhoneNumber($company->fax, "TYPE=WORK;FAX");
-	if (! $adherent->zip)       $v->setAddress("", "", $company->address, $company->town, $company->state, $company->zip, $company->country, "TYPE=WORK;POSTAL");
-
+	if (!$adherent->phone_pro) {
+		$v->setPhoneNumber($company->phone, "TYPE=WORK;VOICE");
+	}
+	if (!$adherent->fax) {
+		$v->setPhoneNumber($company->fax, "TYPE=WORK;FAX");
+	}
+	if (!$adherent->zip) {
+		$v->setAddress("", "", $company->address, $company->town, $company->state, $company->zip, $company->country, "TYPE=WORK;POSTAL");
+	}
 	// when company e-mail is empty, use only adherent e-mail
-	if (empty(trim($company->email)))
-	{
+	if (empty(trim($company->email))) {
 		// was set before, don't set twice
-	}
-	// when adherent e-mail is empty, use only company e-mail
-	elseif (empty(trim($adherent->email)))
-	{
+	} elseif (empty(trim($adherent->email))) {
+		// when adherent e-mail is empty, use only company e-mail
 		$v->setEmail($company->email);
-	}
-	// when e-mail domain of adherent and company are the same, use adherent e-mail at first (and company e-mail at second)
-	elseif (strtolower(end(explode("@", $adherent->email))) == strtolower(end(explode("@", $company->email))))
-	{
+	} elseif (strtolower(end(explode("@", $adherent->email))) == strtolower(end(explode("@", $company->email)))) {
+		// when e-mail domain of adherent and company are the same, use adherent e-mail at first (and company e-mail at second)
 		$v->setEmail($adherent->email);
 
 		// support by Microsoft Outlook (2019 and possible earlier)
 		$v->setEmail($company->email, 'INTERNET');
-	}
-	// when e-mail of adherent and company complete different use company e-mail at first (and adherent e-mail at second)
-	else {
+	} else {
+		// when e-mail of adherent and company complete different use company e-mail at first (and adherent e-mail at second)
 		$v->setEmail($company->email);
 
 		// support by Microsoft Outlook (2019 and possible earlier)
@@ -110,12 +107,16 @@ if ($company->id)
 	}
 
 	// Si adherent lie a un tiers non de type "particulier"
-	if ($adherent->typent_code != 'TE_PRIVATE') $v->setOrg($company->name);
+	if ($company->typent_code != 'TE_PRIVATE') {
+		$v->setOrg($company->name);
+	}
 }
 
 // Personal informations
 $v->setPhoneNumber($adherent->phone_perso, "TYPE=HOME;VOICE");
-if ($adherent->birthday) $v->setBirthday($adherent->birthday);
+if ($adherent->birth) {
+	$v->setBirthday($adherent->birth);
+}
 
 $db->close();
 
@@ -124,7 +125,7 @@ $db->close();
 
 $output = $v->getVCard();
 
-$filename = trim(urldecode($v->getFileName()));      // "Nom prenom.vcf"
+$filename = trim(urldecode($v->getFileName())); // "Nom prenom.vcf"
 $filenameurlencoded = dol_sanitizeFileName(urlencode($filename));
 //$filename = dol_sanitizeFileName($filename);
 
diff --git a/htdocs/admin/agenda.php b/htdocs/admin/agenda.php
index fa459ceb926..1f4236df666 100644
--- a/htdocs/admin/agenda.php
+++ b/htdocs/admin/agenda.php
@@ -29,7 +29,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/agenda.lib.php';
 
 if (!$user->admin)
-    accessforbidden();
+	accessforbidden();
 
 // Load translation files required by the page
 $langs->loadLangs(array('admin', 'other', 'agenda'));
@@ -86,9 +86,9 @@ if (GETPOST('button_search_x', 'alpha') || GETPOST('button_search.x', 'alpha') |
 
 if ($action == "save" && empty($cancel))
 {
-    $i = 0;
+	$i = 0;
 
-    $db->begin();
+	$db->begin();
 
 	foreach ($triggers as $trigger)
 	{
@@ -102,13 +102,13 @@ if ($action == "save" && empty($cancel))
 	}
 
  	if (!$error)
-    {
-        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-        $db->commit();
-    } else {
-        setEventMessages($langs->trans("Error"), null, 'errors');
-        $db->rollback();
-    }
+	{
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+		$db->commit();
+	} else {
+		setEventMessages($langs->trans("Error"), null, 'errors');
+		$db->rollback();
+	}
 }
 
 
@@ -197,7 +197,7 @@ if (!empty($triggers))
 print '</table>';
 print '</div>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '<div class="center">';
 print '<input type="submit" name="save" class="button" value="'.$langs->trans("Save").'">';
diff --git a/htdocs/admin/agenda_extrafields.php b/htdocs/admin/agenda_extrafields.php
index 476bad8ce75..36c7bc3edf8 100644
--- a/htdocs/admin/agenda_extrafields.php
+++ b/htdocs/admin/agenda_extrafields.php
@@ -78,15 +78,15 @@ print dol_get_fiche_head($head, 'attributes', $langs->trans("Agenda"), -1, 'acti
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_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/agenda_extsites.php b/htdocs/admin/agenda_extsites.php
index d29ba6c4830..3cf0d49b960 100644
--- a/htdocs/admin/agenda_extsites.php
+++ b/htdocs/admin/agenda_extsites.php
@@ -54,9 +54,9 @@ $colorlist = array('BECEDD', 'DDBECE', 'BFDDBE', 'F598B4', 'F68654', 'CBF654', '
 
 if ($actionsave)
 {
-    $db->begin();
+	$db->begin();
 
-    $disableext = GETPOST('AGENDA_DISABLE_EXT', 'alpha');
+	$disableext = GETPOST('AGENDA_DISABLE_EXT', 'alpha');
 	$res = dolibarr_set_const($db, 'AGENDA_DISABLE_EXT', $disableext, 'chaine', 0, '', $conf->entity);
 
 	$i = 1; $errorsaved = 0;
@@ -103,14 +103,14 @@ if ($actionsave)
 		$MAXAGENDA = empty($conf->global->AGENDA_EXT_NB) ? 5 : $conf->global->AGENDA_EXT_NB;
 	}
 
-    if (!$error)
-    {
-        $db->commit();
-        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    } else {
-        $db->rollback();
-        if (empty($errorsaved))	setEventMessages($langs->trans("Error"), null, 'errors');
-    }
+	if (!$error)
+	{
+		$db->commit();
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
+		$db->rollback();
+		if (empty($errorsaved))	setEventMessages($langs->trans("Error"), null, 'errors');
+	}
 }
 
 /*
@@ -224,7 +224,7 @@ while ($i <= $MAXAGENDA)
 
 print '</table>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '<div class="center">';
 print '<input type="submit" id="save" name="save" class="button hideifnotset" value="'.$langs->trans("Save").'">';
diff --git a/htdocs/admin/agenda_other.php b/htdocs/admin/agenda_other.php
index e6f0885a6cb..c390796a55b 100644
--- a/htdocs/admin/agenda_other.php
+++ b/htdocs/admin/agenda_other.php
@@ -32,7 +32,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/agenda.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
 
 if (!$user->admin)
-    accessforbidden();
+	accessforbidden();
 
 // Load translation files required by the page
 $langs->loadLangs(array('admin', 'other', 'agenda', 'users'));
@@ -80,49 +80,49 @@ if ($action == 'set')
 	$getDefaultFilter = GETPOST('AGENDA_DEFAULT_FILTER_TYPE');
 	$defaultfilter = (is_array($getDefaultFilter)) ? implode(',', $getDefaultFilter) : $getDefaultFilter;
 	dolibarr_set_const($db, 'AGENDA_USE_EVENT_TYPE_DEFAULT', GETPOST('AGENDA_USE_EVENT_TYPE_DEFAULT'), 'chaine', 0, '', $conf->entity);
-    dolibarr_set_const($db, 'AGENDA_DEFAULT_FILTER_TYPE', $defaultfilter, 'chaine', 0, '', $conf->entity);
-    dolibarr_set_const($db, 'AGENDA_DEFAULT_FILTER_STATUS', GETPOST('AGENDA_DEFAULT_FILTER_STATUS'), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, 'AGENDA_DEFAULT_FILTER_TYPE', $defaultfilter, 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, 'AGENDA_DEFAULT_FILTER_STATUS', GETPOST('AGENDA_DEFAULT_FILTER_STATUS'), 'chaine', 0, '', $conf->entity);
 	dolibarr_set_const($db, 'AGENDA_DEFAULT_VIEW', GETPOST('AGENDA_DEFAULT_VIEW'), 'chaine', 0, '', $conf->entity);
 } elseif ($action == 'specimen')  // For orders
 {
-    $modele = GETPOST('module', 'alpha');
+	$modele = GETPOST('module', 'alpha');
 
-    $commande = new CommandeFournisseur($db);
-    $commande->initAsSpecimen();
-    $commande->thirdparty = $specimenthirdparty;
+	$commande = new CommandeFournisseur($db);
+	$commande->initAsSpecimen();
+	$commande->thirdparty = $specimenthirdparty;
 
-    // Search template files
-    $file = ''; $classname = ''; $filefound = 0;
-    $dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
-    foreach ($dirmodels as $reldir)
-    {
-    	$file = dol_buildpath($reldir."core/modules/action/doc/pdf_".$modele.".modules.php", 0);
-    	if (file_exists($file))
-    	{
-    		$filefound = 1;
-    		$classname = "pdf_".$modele;
-    		break;
-    	}
-    }
+	// Search template files
+	$file = ''; $classname = ''; $filefound = 0;
+	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
+	foreach ($dirmodels as $reldir)
+	{
+		$file = dol_buildpath($reldir."core/modules/action/doc/pdf_".$modele.".modules.php", 0);
+		if (file_exists($file))
+		{
+			$filefound = 1;
+			$classname = "pdf_".$modele;
+			break;
+		}
+	}
 
-    if ($filefound)
-    {
-    	require_once $file;
+	if ($filefound)
+	{
+		require_once $file;
 
-    	$module = new $classname($db, $commande);
+		$module = new $classname($db, $commande);
 
-    	if ($module->write_file($commande, $langs) > 0)
-    	{
-    		header("Location: ".DOL_URL_ROOT."/document.php?modulepart=action&file=SPECIMEN.pdf");
-    		return;
-    	} else {
-    		setEventMessages($module->error, $module->errors, 'errors');
-    		dol_syslog($module->error, LOG_ERR);
-    	}
-    } else {
-    	setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
-    	dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
-    }
+		if ($module->write_file($commande, $langs) > 0)
+		{
+			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=action&file=SPECIMEN.pdf");
+			return;
+		} else {
+			setEventMessages($module->error, $module->errors, 'errors');
+			dol_syslog($module->error, LOG_ERR);
+		}
+	} else {
+		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
+		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
+	}
 }
 
 // Activate a model
@@ -135,7 +135,7 @@ elseif ($action == 'setmodel')
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0)
 	{
-        if ($conf->global->ACTION_EVENT_ADDON_PDF == "$value") dolibarr_del_const($db, 'ACTION_EVENT_ADDON_PDF', $conf->entity);
+		if ($conf->global->ACTION_EVENT_ADDON_PDF == "$value") dolibarr_del_const($db, 'ACTION_EVENT_ADDON_PDF', $conf->entity);
 	}
 }
 
@@ -194,115 +194,115 @@ $sql .= " AND entity = ".$conf->entity;
 $resql = $db->query($sql);
 if ($resql)
 {
-    $i = 0;
-    $num_rows = $db->num_rows($resql);
-    while ($i < $num_rows)
-    {
-        $array = $db->fetch_array($resql);
-        array_push($def, $array[0]);
-        $i++;
-    }
+	$i = 0;
+	$num_rows = $db->num_rows($resql);
+	while ($i < $num_rows)
+	{
+		$array = $db->fetch_array($resql);
+		array_push($def, $array[0]);
+		$i++;
+	}
 } else {
-    dol_print_error($db);
+	dol_print_error($db);
 }
 
 if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
 {
-    print load_fiche_titre($langs->trans("AgendaModelModule"), '', '');
+	print load_fiche_titre($langs->trans("AgendaModelModule"), '', '');
 
-    print '<table class="noborder centpercent">'."\n";
-    print '<tr class="liste_titre">'."\n";
-    print '<td width="100">'.$langs->trans("Name").'</td>'."\n";
-    print '<td>'.$langs->trans("Description").'</td>'."\n";
-    print '<td class="center" width="60">'.$langs->trans("Status").'</td>'."\n";
-    print '<td class="center" width="60">'.$langs->trans("Default").'</td>'."\n";
-    print '<td class="center" width="40">'.$langs->trans("ShortInfo").'</td>';
-    print '<td class="center" width="40">'.$langs->trans("Preview").'</td>';
-    print '</tr>'."\n";
+	print '<table class="noborder centpercent">'."\n";
+	print '<tr class="liste_titre">'."\n";
+	print '<td width="100">'.$langs->trans("Name").'</td>'."\n";
+	print '<td>'.$langs->trans("Description").'</td>'."\n";
+	print '<td class="center" width="60">'.$langs->trans("Status").'</td>'."\n";
+	print '<td class="center" width="60">'.$langs->trans("Default").'</td>'."\n";
+	print '<td class="center" width="40">'.$langs->trans("ShortInfo").'</td>';
+	print '<td class="center" width="40">'.$langs->trans("Preview").'</td>';
+	print '</tr>'."\n";
 
-    clearstatcache();
+	clearstatcache();
 
-    foreach ($dirmodels as $reldir)
-    {
-    	$dir = dol_buildpath($reldir."core/modules/action/doc");
+	foreach ($dirmodels as $reldir)
+	{
+		$dir = dol_buildpath($reldir."core/modules/action/doc");
 
-        if (is_dir($dir))
-        {
-            $handle = opendir($dir);
-            if (is_resource($handle))
-            {
-                while (($file = readdir($handle)) !== false)
-                {
-                    if (preg_match('/\.modules\.php$/i', $file) && preg_match('/^(pdf_|doc_)/', $file))
-                    {
-            			$name = substr($file, 4, dol_strlen($file) - 16);
-            			$classname = substr($file, 0, dol_strlen($file) - 12);
+		if (is_dir($dir))
+		{
+			$handle = opendir($dir);
+			if (is_resource($handle))
+			{
+				while (($file = readdir($handle)) !== false)
+				{
+					if (preg_match('/\.modules\.php$/i', $file) && preg_match('/^(pdf_|doc_)/', $file))
+					{
+						$name = substr($file, 4, dol_strlen($file) - 16);
+						$classname = substr($file, 0, dol_strlen($file) - 12);
 
-            			require_once $dir.'/'.$file;
-            			$module = new $classname($db, new ActionComm($db));
+						require_once $dir.'/'.$file;
+						$module = new $classname($db, new ActionComm($db));
 
-            			print '<tr class="oddeven">'."\n";
-            			print "<td>";
-            			print (empty($module->name) ? $name : $module->name);
-            			print "</td>\n";
-            			print "<td>\n";
-            			require_once $dir.'/'.$file;
-            			$module = new $classname($db, $specimenthirdparty);
-            			if (method_exists($module, 'info'))
-            				print $module->info($langs);
-            			else print $module->description;
-            			print "</td>\n";
+						print '<tr class="oddeven">'."\n";
+						print "<td>";
+						print (empty($module->name) ? $name : $module->name);
+						print "</td>\n";
+						print "<td>\n";
+						require_once $dir.'/'.$file;
+						$module = new $classname($db, $specimenthirdparty);
+						if (method_exists($module, 'info'))
+							print $module->info($langs);
+						else print $module->description;
+						print "</td>\n";
 
-            			// Active
-            			if (in_array($name, $def))
-            			{
-            			    print '<td class="center">'."\n";
-            			    if ($conf->global->ACTION_EVENT_ADDON_PDF != "$name")
-            			    {
-            				    print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=action">';
-            				    print img_picto($langs->trans("Enabled"), 'switch_on');
-            				    print '</a>';
-            			    } else {
-            				    print img_picto($langs->trans("Enabled"), 'switch_on');
-            			    }
-            				print "</td>";
-            			} else {
-            				print '<td class="center">'."\n";
-            				print '<a href="'.$_SERVER["PHP_SELF"].'?action=setmodel&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=action">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
-            				print "</td>";
-            			}
+						// Active
+						if (in_array($name, $def))
+						{
+							print '<td class="center">'."\n";
+							if ($conf->global->ACTION_EVENT_ADDON_PDF != "$name")
+							{
+								print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=action">';
+								print img_picto($langs->trans("Enabled"), 'switch_on');
+								print '</a>';
+							} else {
+								print img_picto($langs->trans("Enabled"), 'switch_on');
+							}
+							print "</td>";
+						} else {
+							print '<td class="center">'."\n";
+							print '<a href="'.$_SERVER["PHP_SELF"].'?action=setmodel&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=action">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+							print "</td>";
+						}
 
-            			// Default
-            			print '<td class="center">';
-            			if ($conf->global->ACTION_EVENT_ADDON_PDF == "$name")
-            			{
-            				print img_picto($langs->trans("Default"), 'on');
-            			} else {
-            				print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=action"" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
-            			}
-            			print '</td>';
+						// Default
+						print '<td class="center">';
+						if ($conf->global->ACTION_EVENT_ADDON_PDF == "$name")
+						{
+							print img_picto($langs->trans("Default"), 'on');
+						} else {
+							print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=action"" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+						}
+						print '</td>';
 
-            			// Info
-            			$htmltooltip = ''.$langs->trans("Name").': '.$module->name;
-            			$htmltooltip .= '<br>'.$langs->trans("Type").': '.($module->type ? $module->type : $langs->trans("Unknown"));
-            			$htmltooltip .= '<br>'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur;
-            			$htmltooltip .= '<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
-            			$htmltooltip .= '<br>'.$langs->trans("Logo").': '.yn($module->option_logo, 1, 1);
-            			print '<td class="center">';
-            			print $form->textwithpicto('', $htmltooltip, 1, 0);
-            			print '</td>';
-            			print '<td class="center">';
-            			print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&amp;module='.$name.'">'.img_object($langs->trans("Preview"), 'order').'</a>';
-            			print '</td>';
+						// Info
+						$htmltooltip = ''.$langs->trans("Name").': '.$module->name;
+						$htmltooltip .= '<br>'.$langs->trans("Type").': '.($module->type ? $module->type : $langs->trans("Unknown"));
+						$htmltooltip .= '<br>'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur;
+						$htmltooltip .= '<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
+						$htmltooltip .= '<br>'.$langs->trans("Logo").': '.yn($module->option_logo, 1, 1);
+						print '<td class="center">';
+						print $form->textwithpicto('', $htmltooltip, 1, 0);
+						print '</td>';
+						print '<td class="center">';
+						print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&amp;module='.$name.'">'.img_object($langs->trans("Preview"), 'order').'</a>';
+						print '</td>';
 
-            			print "</tr>\n";
-                    }
-                }
-                closedir($handle);
-            }
-        }
-    }
-    print '</table><br>';
+						print "</tr>\n";
+					}
+				}
+				closedir($handle);
+			}
+		}
+	}
+	print '</table><br>';
 }
 
 print '<form action="'.$_SERVER["PHP_SELF"].'" name="agenda">';
@@ -343,13 +343,13 @@ print '</td></tr>'."\n";
 
 if (!empty($conf->global->AGENDA_USE_EVENT_TYPE))
 {
-    print '<!-- AGENDA_USE_EVENT_TYPE_DEFAULT -->';
-    print '<tr class="oddeven">'."\n";
-    print '<td>'.$langs->trans("AGENDA_USE_EVENT_TYPE_DEFAULT").'</td>'."\n";
-    print '<td class="center">&nbsp;</td>'."\n";
-    print '<td class="right nowrap">'."\n";
-    $formactions->select_type_actions($conf->global->AGENDA_USE_EVENT_TYPE_DEFAULT, "AGENDA_USE_EVENT_TYPE_DEFAULT", 'systemauto', 0, 1);
-    print '</td></tr>'."\n";
+	print '<!-- AGENDA_USE_EVENT_TYPE_DEFAULT -->';
+	print '<tr class="oddeven">'."\n";
+	print '<td>'.$langs->trans("AGENDA_USE_EVENT_TYPE_DEFAULT").'</td>'."\n";
+	print '<td class="center">&nbsp;</td>'."\n";
+	print '<td class="right nowrap">'."\n";
+	$formactions->select_type_actions($conf->global->AGENDA_USE_EVENT_TYPE_DEFAULT, "AGENDA_USE_EVENT_TYPE_DEFAULT", 'systemauto', 0, 1);
+	print '</td></tr>'."\n";
 }
 
 // AGENDA_DEFAULT_FILTER_TYPE
@@ -359,8 +359,8 @@ print '<td class="center">&nbsp;</td>'."\n";
 print '<td class="right nowrap">'."\n";
 $multiselect = 0;
 if (!empty($conf->global->MAIN_ENABLE_MULTISELECT_TYPE)) {
-    // We use an option here because it adds bugs when used on agenda page "peruser" and "list"
-    $multiselect = (!empty($conf->global->AGENDA_USE_EVENT_TYPE));
+	// We use an option here because it adds bugs when used on agenda page "peruser" and "list"
+	$multiselect = (!empty($conf->global->AGENDA_USE_EVENT_TYPE));
 }
 $formactions->select_type_actions($conf->global->AGENDA_DEFAULT_FILTER_TYPE, "AGENDA_DEFAULT_FILTER_TYPE", '', (empty($conf->global->AGENDA_USE_EVENT_TYPE) ? 1 : -1), 1, $multiselect);
 print '</td></tr>'."\n";
@@ -376,7 +376,7 @@ print '</td></tr>'."\n";
 
 print '</table>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '<div class="center"><input class="button" type="submit" name="save" value="'.dol_escape_htmltag($langs->trans("Save")).'"></div>';
 
diff --git a/htdocs/admin/agenda_reminder.php b/htdocs/admin/agenda_reminder.php
index 0f8b64c48b1..e34536e648a 100644
--- a/htdocs/admin/agenda_reminder.php
+++ b/htdocs/admin/agenda_reminder.php
@@ -27,7 +27,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/agenda.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
 
 if (!$user->admin)
-    accessforbidden();
+	accessforbidden();
 
 // Load translation files required by the page
 $langs->loadLangs(array("admin", "other", "agenda"));
@@ -73,49 +73,49 @@ if (preg_match('/del_([a-z0-9_\-]+)/i', $action, $reg))
 if ($action == 'set')
 {
 	dolibarr_set_const($db, 'AGENDA_USE_EVENT_TYPE_DEFAULT', GETPOST('AGENDA_USE_EVENT_TYPE_DEFAULT'), 'chaine', 0, '', $conf->entity);
-    dolibarr_set_const($db, 'AGENDA_DEFAULT_FILTER_TYPE', GETPOST('AGENDA_DEFAULT_FILTER_TYPE'), 'chaine', 0, '', $conf->entity);
-    dolibarr_set_const($db, 'AGENDA_DEFAULT_FILTER_STATUS', GETPOST('AGENDA_DEFAULT_FILTER_STATUS'), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, 'AGENDA_DEFAULT_FILTER_TYPE', GETPOST('AGENDA_DEFAULT_FILTER_TYPE'), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, 'AGENDA_DEFAULT_FILTER_STATUS', GETPOST('AGENDA_DEFAULT_FILTER_STATUS'), 'chaine', 0, '', $conf->entity);
 	dolibarr_set_const($db, 'AGENDA_DEFAULT_VIEW', GETPOST('AGENDA_DEFAULT_VIEW'), 'chaine', 0, '', $conf->entity);
 } elseif ($action == 'specimen')  // For orders
 {
-    $modele = GETPOST('module', 'alpha');
+	$modele = GETPOST('module', 'alpha');
 
-    $commande = new CommandeFournisseur($db);
-    $commande->initAsSpecimen();
-    $commande->thirdparty = $specimenthirdparty;
+	$commande = new CommandeFournisseur($db);
+	$commande->initAsSpecimen();
+	$commande->thirdparty = $specimenthirdparty;
 
-    // Search template files
-    $file = ''; $classname = ''; $filefound = 0;
-    $dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
-    foreach ($dirmodels as $reldir)
-    {
-    	$file = dol_buildpath($reldir."core/modules/action/doc/pdf_".$modele.".modules.php", 0);
-    	if (file_exists($file))
-    	{
-    		$filefound = 1;
-    		$classname = "pdf_".$modele;
-    		break;
-    	}
-    }
+	// Search template files
+	$file = ''; $classname = ''; $filefound = 0;
+	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
+	foreach ($dirmodels as $reldir)
+	{
+		$file = dol_buildpath($reldir."core/modules/action/doc/pdf_".$modele.".modules.php", 0);
+		if (file_exists($file))
+		{
+			$filefound = 1;
+			$classname = "pdf_".$modele;
+			break;
+		}
+	}
 
-    if ($filefound)
-    {
-    	require_once $file;
+	if ($filefound)
+	{
+		require_once $file;
 
-    	$module = new $classname($db, $commande);
+		$module = new $classname($db, $commande);
 
-    	if ($module->write_file($commande, $langs) > 0)
-    	{
-    		header("Location: ".DOL_URL_ROOT."/document.php?modulepart=action&file=SPECIMEN.pdf");
-    		return;
-    	} else {
-    		setEventMessages($module->error, $module->errors, 'errors');
-    		dol_syslog($module->error, LOG_ERR);
-    	}
-    } else {
-    	setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
-    	dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
-    }
+		if ($module->write_file($commande, $langs) > 0)
+		{
+			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=action&file=SPECIMEN.pdf");
+			return;
+		} else {
+			setEventMessages($module->error, $module->errors, 'errors');
+			dol_syslog($module->error, LOG_ERR);
+		}
+	} else {
+		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
+		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
+	}
 }
 
 // Activate a model
@@ -128,7 +128,7 @@ elseif ($action == 'setmodel')
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0)
 	{
-        if ($conf->global->ACTION_EVENT_ADDON_PDF == "$value") dolibarr_del_const($db, 'ACTION_EVENT_ADDON_PDF', $conf->entity);
+		if ($conf->global->ACTION_EVENT_ADDON_PDF == "$value") dolibarr_del_const($db, 'ACTION_EVENT_ADDON_PDF', $conf->entity);
 	}
 }
 
@@ -200,36 +200,36 @@ if ($conf->global->MAIN_FEATURES_LEVEL == 2)
 // AGENDA REMINDER BROWSER
 if ($conf->global->MAIN_FEATURES_LEVEL == 2)
 {
-    print '<tr class="oddeven">'."\n";
-    print '<td>'.$langs->trans('AGENDA_REMINDER_BROWSER').'</td>'."\n";
-    print '<td class="center">&nbsp;</td>'."\n";
-    print '<td class="right">'."\n";
+	print '<tr class="oddeven">'."\n";
+	print '<td>'.$langs->trans('AGENDA_REMINDER_BROWSER').'</td>'."\n";
+	print '<td class="center">&nbsp;</td>'."\n";
+	print '<td class="right">'."\n";
 
-    if (empty($conf->global->AGENDA_REMINDER_BROWSER)) {
-        print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_AGENDA_REMINDER_BROWSER&amp;token='.newToken().'">'.img_picto($langs->trans('Disabled'), 'switch_off').'</a>';
-        print '</td></tr>'."\n";
-    } else {
-        print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_AGENDA_REMINDER_BROWSER&amp;token='.newToken().'">'.img_picto($langs->trans('Enabled'), 'switch_on').'</a>';
-        print '</td></tr>'."\n";
+	if (empty($conf->global->AGENDA_REMINDER_BROWSER)) {
+		print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_AGENDA_REMINDER_BROWSER&amp;token='.newToken().'">'.img_picto($langs->trans('Disabled'), 'switch_off').'</a>';
+		print '</td></tr>'."\n";
+	} else {
+		print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_AGENDA_REMINDER_BROWSER&amp;token='.newToken().'">'.img_picto($langs->trans('Enabled'), 'switch_on').'</a>';
+		print '</td></tr>'."\n";
 
-        print '<tr class="oddeven">'."\n";
-        print '<td>'.$langs->trans('AGENDA_REMINDER_BROWSER_SOUND').'</td>'."\n";
-        print '<td class="center">&nbsp;</td>'."\n";
-        print '<td class="right">'."\n";
+		print '<tr class="oddeven">'."\n";
+		print '<td>'.$langs->trans('AGENDA_REMINDER_BROWSER_SOUND').'</td>'."\n";
+		print '<td class="center">&nbsp;</td>'."\n";
+		print '<td class="right">'."\n";
 
-        if (empty($conf->global->AGENDA_REMINDER_BROWSER_SOUND)) {
-            print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_AGENDA_REMINDER_BROWSER_SOUND&amp;token='.newToken().'">'.img_picto($langs->trans('Disabled'), 'switch_off').'</a>';
-        } else {
-            print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_AGENDA_REMINDER_BROWSER_SOUND&amp;token='.newToken().'">'.img_picto($langs->trans('Enabled'), 'switch_on').'</a>';
-        }
+		if (empty($conf->global->AGENDA_REMINDER_BROWSER_SOUND)) {
+			print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_AGENDA_REMINDER_BROWSER_SOUND&amp;token='.newToken().'">'.img_picto($langs->trans('Disabled'), 'switch_off').'</a>';
+		} else {
+			print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_AGENDA_REMINDER_BROWSER_SOUND&amp;token='.newToken().'">'.img_picto($langs->trans('Enabled'), 'switch_on').'</a>';
+		}
 
-        print '</td></tr>'."\n";
-    }
+		print '</td></tr>'."\n";
+	}
 }
 
 print '</table>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 //print '<div class="center"><input class="button" type="submit" name="save" value="'.dol_escape_htmltag($langs->trans("Save")).'"></div>';
 
diff --git a/htdocs/admin/agenda_xcal.php b/htdocs/admin/agenda_xcal.php
index 83fc2155236..61116a0f18f 100644
--- a/htdocs/admin/agenda_xcal.php
+++ b/htdocs/admin/agenda_xcal.php
@@ -30,7 +30,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/agenda.lib.php';
 
 
 if (!$user->admin)
-    accessforbidden();
+	accessforbidden();
 
 // Load translation files required by the page
 $langs->loadLangs(array("admin", "other", "agenda"));
@@ -41,23 +41,23 @@ $actionsave = GETPOST('save', 'alpha');
 // Sauvegardes parametres
 if ($actionsave)
 {
-    $i = 0;
+	$i = 0;
 
-    $db->begin();
+	$db->begin();
 
-    $i += dolibarr_set_const($db, 'MAIN_AGENDA_XCAL_EXPORTKEY', trim(GETPOST('MAIN_AGENDA_XCAL_EXPORTKEY', 'alpha')), 'chaine', 0, '', $conf->entity);
-    $i += dolibarr_set_const($db, 'MAIN_AGENDA_EXPORT_PAST_DELAY', trim(GETPOST('MAIN_AGENDA_EXPORT_PAST_DELAY', 'alpha')), 'chaine', 0, '', $conf->entity);
-    $i += dolibarr_set_const($db, 'MAIN_AGENDA_EXPORT_CACHE', trim(GETPOST('MAIN_AGENDA_EXPORT_CACHE', 'alpha')), 'chaine', 0, '', $conf->entity);
-    $i += dolibarr_set_const($db, 'AGENDA_EXPORT_FIX_TZ', trim(GETPOST('AGENDA_EXPORT_FIX_TZ', 'alpha')), 'chaine', 0, '', $conf->entity);
+	$i += dolibarr_set_const($db, 'MAIN_AGENDA_XCAL_EXPORTKEY', trim(GETPOST('MAIN_AGENDA_XCAL_EXPORTKEY', 'alpha')), 'chaine', 0, '', $conf->entity);
+	$i += dolibarr_set_const($db, 'MAIN_AGENDA_EXPORT_PAST_DELAY', trim(GETPOST('MAIN_AGENDA_EXPORT_PAST_DELAY', 'alpha')), 'chaine', 0, '', $conf->entity);
+	$i += dolibarr_set_const($db, 'MAIN_AGENDA_EXPORT_CACHE', trim(GETPOST('MAIN_AGENDA_EXPORT_CACHE', 'alpha')), 'chaine', 0, '', $conf->entity);
+	$i += dolibarr_set_const($db, 'AGENDA_EXPORT_FIX_TZ', trim(GETPOST('AGENDA_EXPORT_FIX_TZ', 'alpha')), 'chaine', 0, '', $conf->entity);
 
-    if ($i >= 4)
-    {
-        $db->commit();
-        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    } else {
-        $db->rollback();
-        setEventMessages($langs->trans("SaveFailed"), null, 'errors');
-    }
+	if ($i >= 4)
+	{
+		$db->commit();
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
+		$db->rollback();
+		setEventMessages($langs->trans("SaveFailed"), null, 'errors');
+	}
 }
 
 
@@ -135,7 +135,7 @@ print "</tr>";
 
 print '</table>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '<div class="center">';
 print "<input type=\"submit\" name=\"save\" class=\"button\" value=\"".$langs->trans("Save")."\">";
@@ -163,7 +163,7 @@ $urlvcal .= $urlwithroot.'/public/agenda/agendaexport.php?format=vcal'.$getentit
 $message .= img_picto('', 'globe').' '.$langs->trans("WebCalUrlForVCalExport", 'vcal', $urlvcal);
 $message .= '<br>';
 $urlical = '<a href="'.$urlwithroot.'/public/agenda/agendaexport.php?format=ical&type=event'.$getentity.'&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY ?urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY) : '...').'" target="_blank">';
-$urlical .=$urlwithroot.'/public/agenda/agendaexport.php?format=ical&type=event'.$getentity.'&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY ?urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY) : 'KEYNOTDEFINED').'</a>';
+$urlical .= $urlwithroot.'/public/agenda/agendaexport.php?format=ical&type=event'.$getentity.'&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY ?urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY) : 'KEYNOTDEFINED').'</a>';
 $message .= img_picto('', 'globe').' '.$langs->trans("WebCalUrlForVCalExport", 'ical/ics', $urlical);
 $message .= '<br>';
 $urlrss = '<a href="'.$urlwithroot.'/public/agenda/agendaexport.php?format=rss'.$getentity.'&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY ?urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY) : '...').'" target="_blank">';
diff --git a/htdocs/admin/bank.php b/htdocs/admin/bank.php
index 71891c9c08d..c8157a40d81 100644
--- a/htdocs/admin/bank.php
+++ b/htdocs/admin/bank.php
@@ -495,7 +495,7 @@ if ($conf->global->BANK_REPORT_LAST_NUM_RELEVE) {
 
 print "</tr>\n";
 print '</table>';
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '<div class="center">';
 print '<input type="submit" id="save" name="save" class="button hideifnotset" value="'.$langs->trans("Save").'">';
diff --git a/htdocs/admin/bank_extrafields.php b/htdocs/admin/bank_extrafields.php
index a554aa4a3cf..aff2b90d897 100644
--- a/htdocs/admin/bank_extrafields.php
+++ b/htdocs/admin/bank_extrafields.php
@@ -75,15 +75,15 @@ print dol_get_fiche_head($head, 'attributes', $langs->trans("BankSetupModule"),
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_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,9 +93,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';
 }
 
 /*
@@ -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/admin/barcode.php b/htdocs/admin/barcode.php
index 529e3289a31..0e7a23ae679 100644
--- a/htdocs/admin/barcode.php
+++ b/htdocs/admin/barcode.php
@@ -44,11 +44,11 @@ include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
 
 if ($action == 'setbarcodeproducton')
 {
-    $barcodenumberingmodule = GETPOST('value', 'alpha');
+	$barcodenumberingmodule = GETPOST('value', 'alpha');
 	$res = dolibarr_set_const($db, "BARCODE_PRODUCT_ADDON_NUM", $barcodenumberingmodule, 'chaine', 0, '', $conf->entity);
 	if ($barcodenumberingmodule == 'mod_barcode_product_standard' && empty($conf->global->BARCODE_STANDARD_PRODUCT_MASK))
 	{
-	    $res = dolibarr_set_const($db, "BARCODE_STANDARD_PRODUCT_MASK", '020{000000000}', 'chaine', 0, '', $conf->entity);
+		$res = dolibarr_set_const($db, "BARCODE_STANDARD_PRODUCT_MASK", '020{000000000}', 'chaine', 0, '', $conf->entity);
 	}
 } elseif ($action == 'setbarcodeproductoff')
 {
@@ -76,45 +76,45 @@ if ($action == 'setcoder')
 	$res = dolibarr_set_const($db, "GENBARCODE_BARCODETYPE_THIRDPARTY", $coder_id, 'chaine', 0, '', $conf->entity);
 
 	if ($res > 0)
-    {
-        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');
+	}
 } elseif ($action == 'updateengine')
 {
-    $sql = "SELECT rowid, coder";
-    $sql .= " FROM ".MAIN_DB_PREFIX."c_barcode_type";
-    $sql .= " WHERE entity = ".$conf->entity;
-    $sql .= " ORDER BY code";
+	$sql = "SELECT rowid, coder";
+	$sql .= " FROM ".MAIN_DB_PREFIX."c_barcode_type";
+	$sql .= " WHERE entity = ".$conf->entity;
+	$sql .= " ORDER BY code";
 
-    $resql = $db->query($sql);
-    if ($resql)
-    {
-	    $num = $db->num_rows($resql);
-	    $i = 0;
+	$resql = $db->query($sql);
+	if ($resql)
+	{
+		$num = $db->num_rows($resql);
+		$i = 0;
 
-	    while ($i < $num)
-	    {
-	        $obj = $db->fetch_object($resql);
+		while ($i < $num)
+		{
+			$obj = $db->fetch_object($resql);
 
-	        if (GETPOST('coder'.$obj->rowid, 'alpha'))
-	        {
-	            $coder = GETPOST('coder'.$obj->rowid, 'alpha');
-	            $code_id = $obj->rowid;
+			if (GETPOST('coder'.$obj->rowid, 'alpha'))
+			{
+				$coder = GETPOST('coder'.$obj->rowid, 'alpha');
+				$code_id = $obj->rowid;
 
-	            $sqlp = "UPDATE ".MAIN_DB_PREFIX."c_barcode_type";
-	            $sqlp .= " SET coder = '".$db->escape($coder)."'";
-	            $sqlp .= " WHERE rowid = ".((int) $code_id);
-	            $sqlp .= " AND entity = ".$conf->entity;
+				$sqlp = "UPDATE ".MAIN_DB_PREFIX."c_barcode_type";
+				$sqlp .= " SET coder = '".$db->escape($coder)."'";
+				$sqlp .= " WHERE rowid = ".((int) $code_id);
+				$sqlp .= " AND entity = ".$conf->entity;
 
-	            $upsql = $db->query($sqlp);
-	            if (!$upsql) dol_print_error($db);
-	        }
+				$upsql = $db->query($sqlp);
+				if (!$upsql) dol_print_error($db);
+			}
 
-	        $i++;
-	    }
-    }
+			$i++;
+		}
+	}
 }
 
 
@@ -142,11 +142,11 @@ $dirbarcode = array_merge(array("/core/modules/barcode/doc/"), $conf->modules_pa
 
 foreach ($dirbarcode as $reldir)
 {
-    $dir = dol_buildpath($reldir);
-    $newdir = dol_osencode($dir);
+	$dir = dol_buildpath($reldir);
+	$newdir = dol_osencode($dir);
 
-    // Check if directory exists (we do not use dol_is_dir to avoid loading files.lib.php)
-    if (!is_dir($newdir)) continue;
+	// Check if directory exists (we do not use dol_is_dir to avoid loading files.lib.php)
+	if (!is_dir($newdir)) continue;
 
 	$handle = @opendir($newdir);
 	if (is_resource($handle))
@@ -190,9 +190,9 @@ print load_fiche_titre($langs->trans("BarcodeEncodeModule"), '', '');
 
 if (empty($conf->use_javascript_ajax))
 {
-    print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST" id="form_engine">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    print '<input type="hidden" name="action" value="updateengine">';
+	print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST" id="form_engine">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="action" value="updateengine">';
 }
 
 print '<table class="noborder centpercent">';
@@ -236,11 +236,11 @@ if ($resql)
 
 			foreach ($dirbarcode as $reldir)
 			{
-			    $dir = dol_buildpath($reldir, 0);
-			    $newdir = dol_osencode($dir);
+				$dir = dol_buildpath($reldir, 0);
+				$newdir = dol_osencode($dir);
 
-			    // Check if directory exists (we do not use dol_is_dir to avoid loading files.lib.php)
-			    if (!is_dir($newdir)) continue;
+				// Check if directory exists (we do not use dol_is_dir to avoid loading files.lib.php)
+				if (!is_dir($newdir)) continue;
 
 				$result = @include_once $newdir.$obj->coder.'.modules.php';
 				if ($result) break;
@@ -254,7 +254,7 @@ if ($resql)
 					if ($module->encodingIsSupported($obj->encoding))
 					{
 						// Build barcode on disk (not used, this is done to make debug easier)
-					    $result = $module->writeBarCode($obj->example, $obj->encoding, 'Y');
+						$result = $module->writeBarCode($obj->example, $obj->encoding, 'Y');
 						// Generate on the fly and output barcode with generator
 						$url = DOL_URL_ROOT.'/viewimage.php?modulepart=barcode&amp;generator='.urlencode($obj->coder).'&amp;code='.urlencode($obj->example).'&amp;encoding='.urlencode($obj->encoding);
 						//print $url;
@@ -282,8 +282,8 @@ print "</table>\n";
 
 if (empty($conf->use_javascript_ajax))
 {
-    print '<div class="center"><input type="submit" class="button" name="save" value="'.$langs->trans("Save").'"></div>';
-    print '</form>';
+	print '<div class="center"><input type="submit" class="button" name="save" value="'.$langs->trans("Save").'"></div>';
+	print '</form>';
 }
 
 print "<br>";
@@ -371,48 +371,48 @@ if ($conf->product->enabled)
 		$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);
+					}
 
-	    			$modBarCode = new $file();
+					$modBarCode = new $file();
 
-	    			print '<tr class="oddeven">';
-	    			print '<td>'.(isset($modBarCode->name) ? $modBarCode->name : $modBarCode->nom)."</td><td>\n";
-	    			print $modBarCode->info($langs);
-	    			print '</td>';
-	    			print '<td class="nowrap">'.$modBarCode->getExample($langs)."</td>\n";
+					print '<tr class="oddeven">';
+					print '<td>'.(isset($modBarCode->name) ? $modBarCode->name : $modBarCode->nom)."</td><td>\n";
+					print $modBarCode->info($langs);
+					print '</td>';
+					print '<td class="nowrap">'.$modBarCode->getExample($langs)."</td>\n";
 
-	    			if ($conf->global->BARCODE_PRODUCT_ADDON_NUM == "$file")
-	    			{
-	    				print '<td class="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setbarcodeproductoff&amp;token='.newToken().'&amp;value='.urlencode($file).'">';
-	    				print img_picto($langs->trans("Activated"), 'switch_on');
-	    				print '</a></td>';
-	    			} else {
-	    				print '<td class="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setbarcodeproducto&amp;token='.newToken().'&amp;value='.urlencode($file).'">';
-	    				print img_picto($langs->trans("Disabled"), 'switch_off');
-	    				print '</a></td>';
-	    			}
-	    			print '<td class="center">';
-	    			$s = $modBarCode->getToolTip($langs, null, -1);
-	    			print $form->textwithpicto('', $s, 1);
-	    			print '</td>';
-	    			print "</tr>\n";
-	    		}
-	    	}
-	    	closedir($handle);
-	    }
+					if ($conf->global->BARCODE_PRODUCT_ADDON_NUM == "$file")
+					{
+						print '<td class="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setbarcodeproductoff&amp;token='.newToken().'&amp;value='.urlencode($file).'">';
+						print img_picto($langs->trans("Activated"), 'switch_on');
+						print '</a></td>';
+					} else {
+						print '<td class="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setbarcodeproducto&amp;token='.newToken().'&amp;value='.urlencode($file).'">';
+						print img_picto($langs->trans("Disabled"), 'switch_off');
+						print '</a></td>';
+					}
+					print '<td class="center">';
+					$s = $modBarCode->getToolTip($langs, null, -1);
+					print $form->textwithpicto('', $s, 1);
+					print '</td>';
+					print "</tr>\n";
+				}
+			}
+			closedir($handle);
+		}
 	}
 	print "</table>\n";
 }
diff --git a/htdocs/admin/bom_extrafields.php b/htdocs/admin/bom_extrafields.php
index a1dd1cde985..f2022229305 100644
--- a/htdocs/admin/bom_extrafields.php
+++ b/htdocs/admin/bom_extrafields.php
@@ -74,15 +74,15 @@ print dol_get_fiche_head($head, 'bom_extrafields', $langs->trans("ExtraFields"),
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_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>";
 }
 
 
@@ -92,9 +92,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';
 }
 
 /*
@@ -102,10 +102,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/chequereceipts.php b/htdocs/admin/chequereceipts.php
index c5cf9b2eee9..4fee30d274e 100644
--- a/htdocs/admin/chequereceipts.php
+++ b/htdocs/admin/chequereceipts.php
@@ -266,7 +266,7 @@ print "<br>";
 
 print '</table>'."\n";
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '</form>';
 
diff --git a/htdocs/admin/clicktodial.php b/htdocs/admin/clicktodial.php
index 5fa7b78ca8b..566d6b845e8 100644
--- a/htdocs/admin/clicktodial.php
+++ b/htdocs/admin/clicktodial.php
@@ -33,7 +33,7 @@ if (!$user->admin) accessforbidden();
 
 $action = GETPOST('action', 'aZ09');
 
-if (! in_array('clicktodial', $conf->modules)) {
+if (!in_array('clicktodial', $conf->modules)) {
 	accessforbidden($langs->trans("WarningModuleNotActive", $langs->transnoentitiesnoconv("Module58Name")));
 }
 
@@ -44,15 +44,15 @@ if (! in_array('clicktodial', $conf->modules)) {
 
 if ($action == 'setvalue' && $user->admin)
 {
-    $result1 = dolibarr_set_const($db, "CLICKTODIAL_USE_TEL_LINK_ON_PHONE_NUMBERS", GETPOST("CLICKTODIAL_USE_TEL_LINK_ON_PHONE_NUMBERS"), 'chaine', 0, '', $conf->entity);
-    $result2 = dolibarr_set_const($db, "CLICKTODIAL_URL", GETPOST("CLICKTODIAL_URL"), 'chaine', 0, '', $conf->entity);
+	$result1 = dolibarr_set_const($db, "CLICKTODIAL_USE_TEL_LINK_ON_PHONE_NUMBERS", GETPOST("CLICKTODIAL_USE_TEL_LINK_ON_PHONE_NUMBERS"), 'chaine', 0, '', $conf->entity);
+	$result2 = dolibarr_set_const($db, "CLICKTODIAL_URL", GETPOST("CLICKTODIAL_URL"), 'chaine', 0, '', $conf->entity);
 
-    if ($result1 >= 0 && $result2 >= 0)
-    {
+	if ($result1 >= 0 && $result2 >= 0)
+	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    } else {
-        setEventMessages($langs->trans("Error"), null, 'errors');
-    }
+	} else {
+		setEventMessages($langs->trans("Error"), null, 'errors');
+	}
 }
 
 
@@ -125,7 +125,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="'.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 3642205e158..98a98a7ec2c 100644
--- a/htdocs/admin/commande_fournisseur_dispatch_extrafields.php
+++ b/htdocs/admin/commande_fournisseur_dispatch_extrafields.php
@@ -83,7 +83,7 @@ print dol_get_fiche_head($head, 'attributeslines_reception', $langs->trans("Rece
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 // Buttons
diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php
index 2eb2c0edad1..2705ede5540 100644
--- a/htdocs/admin/company.php
+++ b/htdocs/admin/company.php
@@ -88,9 +88,9 @@ if (($action == 'update' && !GETPOST("cancel", 'alpha'))
 		dolibarr_del_const($db, "MAIN_INFO_SOCIETE_STATE", $conf->entity);
 	}
 
-    $db->begin();
+	$db->begin();
 
-    dolibarr_set_const($db, "MAIN_INFO_SOCIETE_NOM", GETPOST("nom", 'nohtml'), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_NOM", GETPOST("nom", 'nohtml'), 'chaine', 0, '', $conf->entity);
 	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_ADDRESS", GETPOST("MAIN_INFO_SOCIETE_ADDRESS", 'nohtml'), 'chaine', 0, '', $conf->entity);
 	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_TOWN", GETPOST("MAIN_INFO_SOCIETE_TOWN", 'nohtml'), 'chaine', 0, '', $conf->entity);
 	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_ZIP", GETPOST("MAIN_INFO_SOCIETE_ZIP", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
@@ -141,8 +141,8 @@ if (($action == 'update' && !GETPOST("cancel", 'alpha'))
 						// Create thumbs of logo (Note that PDF use original file and not thumbs)
 						if ($isimage > 0)
 						{
-						    // Create thumbs
-						    //$object->addThumbs($newfile);    // We can't use addThumbs here yet because we need name of generated thumbs to add them into constants. TODO Check if need such constants. We should be able to retrieve value with get...
+							// Create thumbs
+							//$object->addThumbs($newfile);    // We can't use addThumbs here yet because we need name of generated thumbs to add them into constants. TODO Check if need such constants. We should be able to retrieve value with get...
 
 							// Create small thumb, Used on logon for example
 							$imgThumbSmall = vignette($dirforimage.$original_file, $maxwidthsmall, $maxheightsmall, '_small', $quality);
@@ -269,7 +269,7 @@ if ($action == 'addthumb' || $action == 'addthumbsquarred')  // Regenerate thumb
 
 			$reg = array();
 
-		    // Create thumbs
+			// Create thumbs
 			//$object->addThumbs($newfile);    // We can't use addThumbs here yet because we need name of generated thumbs to add them into constants. TODO Check if need such constants. We should be able to retrieve value with get...
 
 			// Create small thumb. Used on logon for example
@@ -777,8 +777,8 @@ if ($mysoc->useLocalTax(2))
 	$tooltiphelp = ($tooltiphelp != "LocalTax2IsUsedExample" ? "<i>".$langs->trans("Example").': '.$langs->transcountry("LocalTax2IsUsedExample", $mysoc->country_code)."</i>\n" : "");
 	if (!isOnlyOneLocalTax(2))
 	{
-	    print '<br><label for="lt2">'.$langs->trans("LTRate").'</label>: ';
-	    $formcompany->select_localtax(2, $conf->global->MAIN_INFO_VALUE_LOCALTAX2, "lt2");
+		print '<br><label for="lt2">'.$langs->trans("LTRate").'</label>: ';
+		$formcompany->select_localtax(2, $conf->global->MAIN_INFO_VALUE_LOCALTAX2, "lt2");
 	}
 	print '<br><label for="clt2">'.$langs->trans("CalcLocaltax").'</label>: ';
 	print $form->selectarray("clt2", $opcions, $conf->global->MAIN_INFO_LOCALTAX_CALC2);
diff --git a/htdocs/admin/compta.php b/htdocs/admin/compta.php
index faf38f44b16..a647d096037 100644
--- a/htdocs/admin/compta.php
+++ b/htdocs/admin/compta.php
@@ -40,14 +40,14 @@ $action = GETPOST('action', 'aZ09');
 
 // Other parameters ACCOUNTING_*
 $list = array(
-    'ACCOUNTING_PRODUCT_BUY_ACCOUNT',
-    'ACCOUNTING_PRODUCT_SOLD_ACCOUNT',
-    'ACCOUNTING_SERVICE_BUY_ACCOUNT',
-    'ACCOUNTING_SERVICE_SOLD_ACCOUNT',
-    'ACCOUNTING_VAT_SOLD_ACCOUNT',
-    'ACCOUNTING_VAT_BUY_ACCOUNT',
-    'ACCOUNTING_ACCOUNT_CUSTOMER',
-    'ACCOUNTING_ACCOUNT_SUPPLIER'
+	'ACCOUNTING_PRODUCT_BUY_ACCOUNT',
+	'ACCOUNTING_PRODUCT_SOLD_ACCOUNT',
+	'ACCOUNTING_SERVICE_BUY_ACCOUNT',
+	'ACCOUNTING_SERVICE_SOLD_ACCOUNT',
+	'ACCOUNTING_VAT_SOLD_ACCOUNT',
+	'ACCOUNTING_VAT_BUY_ACCOUNT',
+	'ACCOUNTING_ACCOUNT_CUSTOMER',
+	'ACCOUNTING_ACCOUNT_SUPPLIER'
 );
 
 /*
@@ -58,52 +58,52 @@ $accounting_mode = empty($conf->global->ACCOUNTING_MODE) ? 'RECETTES-DEPENSES' :
 
 if ($action == 'update')
 {
-    $error = 0;
+	$error = 0;
 
-    $accounting_modes = array(
-        'RECETTES-DEPENSES',
-        'CREANCES-DETTES'
-    );
+	$accounting_modes = array(
+		'RECETTES-DEPENSES',
+		'CREANCES-DETTES'
+	);
 
-    $accounting_mode = GETPOST('accounting_mode', 'alpha');
+	$accounting_mode = GETPOST('accounting_mode', 'alpha');
 
 
-    if (in_array($accounting_mode, $accounting_modes)) {
-        if (!dolibarr_set_const($db, 'ACCOUNTING_MODE', $accounting_mode, 'chaine', 0, '', $conf->entity)) {
-            $error++;
-        }
-    } else {
-        $error++;
-    }
+	if (in_array($accounting_mode, $accounting_modes)) {
+		if (!dolibarr_set_const($db, 'ACCOUNTING_MODE', $accounting_mode, 'chaine', 0, '', $conf->entity)) {
+			$error++;
+		}
+	} else {
+		$error++;
+	}
 
-    foreach ($list as $constname) {
-        $constvalue = GETPOST($constname, 'alpha');
+	foreach ($list as $constname) {
+		$constvalue = GETPOST($constname, 'alpha');
 
-        if (!dolibarr_set_const($db, $constname, $constvalue, 'chaine', 0, '', $conf->entity)) {
-            $error++;
-        }
-    }
+		if (!dolibarr_set_const($db, $constname, $constvalue, 'chaine', 0, '', $conf->entity)) {
+			$error++;
+		}
+	}
 
-    $report_include_varpay = GETPOST('ACCOUNTING_REPORTS_INCLUDE_VARPAY', 'alpha');
-    if (!empty($report_include_varpay))
-        if ($report_include_varpay == 'yes')
-            if (!dolibarr_set_const($db, 'ACCOUNTING_REPORTS_INCLUDE_VARPAY', 1, 'chaine', 0, '', $conf->entity)) $error++;
-        if ($report_include_varpay == 'no')
-            if (!dolibarr_del_const($db, 'ACCOUNTING_REPORTS_INCLUDE_VARPAY', $conf->entity)) $error++;
+	$report_include_varpay = GETPOST('ACCOUNTING_REPORTS_INCLUDE_VARPAY', 'alpha');
+	if (!empty($report_include_varpay))
+		if ($report_include_varpay == 'yes')
+			if (!dolibarr_set_const($db, 'ACCOUNTING_REPORTS_INCLUDE_VARPAY', 1, 'chaine', 0, '', $conf->entity)) $error++;
+		if ($report_include_varpay == 'no')
+			if (!dolibarr_del_const($db, 'ACCOUNTING_REPORTS_INCLUDE_VARPAY', $conf->entity)) $error++;
 
-    $report_include_loan = GETPOST('ACCOUNTING_REPORTS_INCLUDE_LOAN', 'alpha');
-    if (!empty($report_include_loan))
-        if ($report_include_loan == 'yes')
-            if (!dolibarr_set_const($db, 'ACCOUNTING_REPORTS_INCLUDE_LOAN', 1, 'chaine', 0, '', $conf->entity)) $error++;
-        if ($report_include_loan == 'no')
-            if (!dolibarr_del_const($db, 'ACCOUNTING_REPORTS_INCLUDE_LOAN', $conf->entity)) $error++;
+	$report_include_loan = GETPOST('ACCOUNTING_REPORTS_INCLUDE_LOAN', 'alpha');
+	if (!empty($report_include_loan))
+		if ($report_include_loan == 'yes')
+			if (!dolibarr_set_const($db, 'ACCOUNTING_REPORTS_INCLUDE_LOAN', 1, 'chaine', 0, '', $conf->entity)) $error++;
+		if ($report_include_loan == 'no')
+			if (!dolibarr_del_const($db, 'ACCOUNTING_REPORTS_INCLUDE_LOAN', $conf->entity)) $error++;
 
-    if (!$error)
-    {
-        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    } else {
-        setEventMessages($langs->trans("Error"), null, 'errors');
-    }
+	if (!$error)
+	{
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
+		setEventMessages($langs->trans("Error"), null, 'errors');
+	}
 }
 
 /*
diff --git a/htdocs/admin/const.php b/htdocs/admin/const.php
index 4aacdb3cfc2..baf5fae0b34 100644
--- a/htdocs/admin/const.php
+++ b/htdocs/admin/const.php
@@ -155,7 +155,7 @@ llxHeader('', $langs->trans("Setup"), $wikihelp);
 // Add logic to show/hide buttons
 if ($conf->use_javascript_ajax)
 {
-    ?>
+	?>
 <script type="text/javascript">
 jQuery(document).ready(function() {
 	jQuery("#updateconst").hide();
diff --git a/htdocs/admin/contract.php b/htdocs/admin/contract.php
index 6ba10068c4c..d70a9740232 100644
--- a/htdocs/admin/contract.php
+++ b/htdocs/admin/contract.php
@@ -476,7 +476,7 @@ print '</td></tr>'."\n";
 print '<tr class="oddeven">';
 print '<td>'.$langs->trans("HideClosedServiceByDefault").'</td>';
 print '<td width="60" class="right">';
-print $form->selectyesno("activate_hideClosedServiceByDefault", (! empty($conf->global->CONTRACT_HIDE_CLOSED_SERVICES_BY_DEFAULT)?$conf->global->CONTRACT_HIDE_CLOSED_SERVICES_BY_DEFAULT:0), 1);
+print $form->selectyesno("activate_hideClosedServiceByDefault", (!empty($conf->global->CONTRACT_HIDE_CLOSED_SERVICES_BY_DEFAULT) ? $conf->global->CONTRACT_HIDE_CLOSED_SERVICES_BY_DEFAULT : 0), 1);
 print '</td>';
 print '</tr>';
 
@@ -488,7 +488,7 @@ print '</div>';
 
 print '</form>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // End of page
 llxFooter();
diff --git a/htdocs/admin/dav.php b/htdocs/admin/dav.php
index 2dd5af492aa..c47306f975b 100644
--- a/htdocs/admin/dav.php
+++ b/htdocs/admin/dav.php
@@ -29,7 +29,7 @@ require_once DOL_DOCUMENT_ROOT.'/dav/dav.lib.php';
 $langs->loadLangs(array("admin", "other", "agenda"));
 
 if (!$user->admin)
-    accessforbidden();
+	accessforbidden();
 
 // Parameters
 $action = GETPOST('action', 'aZ09');
@@ -39,8 +39,8 @@ $backtopage = GETPOST('backtopage', 'alpha');
 
 $arrayofparameters = array(
 	'DAV_RESTICT_ON_IP'=>array('css'=>'minwidth200', 'enabled'=>1),
-    'DAV_ALLOW_PRIVATE_DIR'=>array('css'=>'minwidth200', 'enabled'=>2),
-    'DAV_ALLOW_PUBLIC_DIR'=>array('css'=>'minwidth200', 'enabled'=>1),
+	'DAV_ALLOW_PRIVATE_DIR'=>array('css'=>'minwidth200', 'enabled'=>2),
+	'DAV_ALLOW_PUBLIC_DIR'=>array('css'=>'minwidth200', 'enabled'=>1),
 	'DAV_ALLOW_ECM_DIR'=>array('css'=>'minwidth200', 'enabled'=>$conf->ecm->enabled)
 );
 
@@ -95,7 +95,7 @@ if ($action == 'edit')
 		print '</td><td>';
 		if ($key == 'DAV_ALLOW_PRIVATE_DIR')
 		{
-		    print $langs->trans("AlwaysActive");
+			print $langs->trans("AlwaysActive");
 		} elseif ($key == 'DAV_ALLOW_PUBLIC_DIR' || $key == 'DAV_ALLOW_ECM_DIR')
 		{
 			print $form->selectyesno($key, $conf->global->$key, 1);
@@ -130,7 +130,7 @@ if ($action == 'edit')
 		print '</td><td>';
 		if ($key == 'DAV_ALLOW_PRIVATE_DIR')
 		{
-		    print $langs->trans("AlwaysActive");
+			print $langs->trans("AlwaysActive");
 		} elseif ($key == 'DAV_ALLOW_PUBLIC_DIR' || $key == 'DAV_ALLOW_ECM_DIR')
 		{
 			print yn($conf->global->$key);
@@ -148,7 +148,7 @@ if ($action == 'edit')
 }
 
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 /*print '<div class="center">';
 print "<input type=\"submit\" name=\"save\" class=\"button\" value=\"".$langs->trans("Save")."\">";
diff --git a/htdocs/admin/debugbar.php b/htdocs/admin/debugbar.php
index 88115195328..840157d47e0 100644
--- a/htdocs/admin/debugbar.php
+++ b/htdocs/admin/debugbar.php
@@ -50,9 +50,9 @@ if ($action == 'set')
 	$result1 = dolibarr_set_const($db, "DEBUGBAR_LOGS_LINES_NUMBER", GETPOST('DEBUGBAR_LOGS_LINES_NUMBER', 'int'), 'chaine', 0, '', 0);
 	$result2 = dolibarr_set_const($db, "DEBUGBAR_USE_LOG_FILE", GETPOST('DEBUGBAR_USE_LOG_FILE', 'int'), 'chaine', 0, '', 0);
 	if ($result1 < 0 || $result2 < 0)
-    {
-        $error++;
-    }
+	{
+		$error++;
+	}
 
 	if (!$error)
 	{
@@ -78,8 +78,8 @@ print load_fiche_titre($langs->trans("DebugBarSetup"), $linkback, 'title_setup')
 
 if (!function_exists('mb_check_encoding'))
 {
-    $langs->load("errors");
-    print info_admin($langs->trans("ErrorPHPNeedModule", 'mbstring'), 0, 0, 'error');
+	$langs->load("errors");
+	print info_admin($langs->trans("ErrorPHPNeedModule", 'mbstring'), 0, 0, 'error');
 }
 
 print '<br>';
diff --git a/htdocs/admin/defaultvalues.php b/htdocs/admin/defaultvalues.php
index 3d2bc3121d3..e3006635b39 100644
--- a/htdocs/admin/defaultvalues.php
+++ b/htdocs/admin/defaultvalues.php
@@ -401,7 +401,7 @@ if ($result)
 print '</table>';
 print '</div>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print "</form>\n";
 
diff --git a/htdocs/admin/delais.php b/htdocs/admin/delais.php
index d6c708c124e..673cc16a02e 100644
--- a/htdocs/admin/delais.php
+++ b/htdocs/admin/delais.php
@@ -51,7 +51,7 @@ $modules = array(
 						'img' => 'projecttask'
 				)
 		),
-        'propal' => array(
+		'propal' => array(
 				array(
 						'code' => 'MAIN_DELAY_PROPALS_TO_CLOSE',
 						'img' => 'propal'
@@ -114,18 +114,18 @@ $modules = array(
 						'code' => 'MAIN_DELAY_EXPENSEREPORTS',
 						'img' => 'trip'
 				),
-    		    /* TODO Enable this
+				/* TODO Enable this
 		        array(
     		        'code' => 'MAIN_DELAY_EXPENSEREPORTS_TO_PAY',
     		        'img' => 'trip'
     		    )*/
 		),
-        'holiday' => array(
-            array(
-                'code' => 'MAIN_DELAY_HOLIDAYS',
-                'img' => 'holiday'
-            ),
-        ),
+		'holiday' => array(
+			array(
+				'code' => 'MAIN_DELAY_HOLIDAYS',
+				'img' => 'holiday'
+			),
+		),
 );
 
 $labelmeteo = array(0=>$langs->trans("No"), 1=>$langs->trans("Yes"), 2=>$langs->trans("OnMobileOnly"));
@@ -169,15 +169,15 @@ if ($action == 'update')
 	foreach ($modules as $module => $delays)
 	{
 		if (!empty($conf->$module->enabled))
-    	{
-    		foreach ($delays as $delay)
-    		{
-    			if (GETPOST($delay['code']) != '')
-    			{
-    				dolibarr_set_const($db, $delay['code'], GETPOST($delay['code']), 'chaine', 0, '', $conf->entity);
-    			}
-    		}
-    	}
+		{
+			foreach ($delays as $delay)
+			{
+				if (GETPOST($delay['code']) != '')
+				{
+					dolibarr_set_const($db, $delay['code'], GETPOST($delay['code']), 'chaine', 0, '', $conf->entity);
+				}
+			}
+		}
 	}
 
 	dolibarr_set_const($db, "MAIN_DISABLE_METEO", $_POST["MAIN_DISABLE_METEO"], 'chaine', 0, '', $conf->entity);
@@ -188,8 +188,8 @@ if ($action == 'update')
 	if (!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) $plus = '_PERCENTAGE';
 	// Update values
 	for ($i = 0; $i < 4; $i++) {
-    	if (isset($_POST['MAIN_METEO'.$plus.'_LEVEL'.$i])) dolibarr_set_const($db, 'MAIN_METEO'.$plus.'_LEVEL'.$i, GETPOST('MAIN_METEO'.$plus.'_LEVEL'.$i, 'int'), 'chaine', 0, '', $conf->entity);
-    }
+		if (isset($_POST['MAIN_METEO'.$plus.'_LEVEL'.$i])) dolibarr_set_const($db, 'MAIN_METEO'.$plus.'_LEVEL'.$i, GETPOST('MAIN_METEO'.$plus.'_LEVEL'.$i, 'int'), 'chaine', 0, '', $conf->entity);
+	}
 }
 
 
@@ -209,31 +209,31 @@ print "<br>\n";
 
 if ($action == 'edit')
 {
-    print '<form method="post" action="'.$_SERVER['PHP_SELF'].'" name="form_index">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    print '<input type="hidden" name="action" value="update">';
+	print '<form method="post" action="'.$_SERVER['PHP_SELF'].'" name="form_index">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="action" value="update">';
 
-    print '<table class="noborder centpercent">';
-    print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("DelaysOfToleranceBeforeWarning").'</td><td class="center" width="120px">'.$langs->trans("Value").'</td></tr>';
+	print '<table class="noborder centpercent">';
+	print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("DelaysOfToleranceBeforeWarning").'</td><td class="center" width="120px">'.$langs->trans("Value").'</td></tr>';
 
-    foreach ($modules as $module => $delays)
-    {
-    	if (!empty($conf->$module->enabled))
-    	{
-    		foreach ($delays as $delay)
-    		{
+	foreach ($modules as $module => $delays)
+	{
+		if (!empty($conf->$module->enabled))
+		{
+			foreach ($delays as $delay)
+			{
 				$value = (!empty($conf->global->{$delay['code']}) ? $conf->global->{$delay['code']}:0);
-    			print '<tr class="oddeven">';
-    			print '<td width="20px">'.img_object('', $delay['img']).'</td>';
-    			print '<td>'.$langs->trans('Delays_'.$delay['code']).'</td><td class="nowraponall">';
-    			print '<input class="right maxwidth75" type="number" name="'.$delay['code'].'" value="'.$value.'"> '.$langs->trans("days").'</td></tr>';
-    		}
-    	}
-    }
+				print '<tr class="oddeven">';
+				print '<td width="20px">'.img_object('', $delay['img']).'</td>';
+				print '<td>'.$langs->trans('Delays_'.$delay['code']).'</td><td class="nowraponall">';
+				print '<input class="right maxwidth75" type="number" name="'.$delay['code'].'" value="'.$value.'"> '.$langs->trans("days").'</td></tr>';
+			}
+		}
+	}
 
-    print '</table>';
+	print '</table>';
 
-    print '<br>';
+	print '<br>';
 
 	// Show if meteo is enabled
 	print '<table class="noborder centpercent">';
@@ -246,29 +246,29 @@ if ($action == 'edit')
 
 	print '</table>';
 } else {
-    /*
+	/*
      * Show parameters
      */
 
 	print '<table class="noborder centpercent">';
-    print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("DelaysOfToleranceBeforeWarning").'</td><td class="center" width="120px">'.$langs->trans("Value").'</td></tr>';
+	print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("DelaysOfToleranceBeforeWarning").'</td><td class="center" width="120px">'.$langs->trans("Value").'</td></tr>';
 
-    foreach ($modules as $module => $delays)
-    {
-    	if (!empty($conf->$module->enabled))
-    	{
-    		foreach ($delays as $delay)
-    		{
-    			$value = (!empty($conf->global->{$delay['code']}) ? $conf->global->{$delay['code']}:0);
-    			print '<tr class="oddeven">';
-    			print '<td width="20px">'.img_object('', $delay['img']).'</td>';
-    			print '<td>'.$langs->trans('Delays_'.$delay['code']).'</td>';
-    			print '<td class="right">'.$value.' '.$langs->trans("days").'</td></tr>';
-    		}
-    	}
-    }
+	foreach ($modules as $module => $delays)
+	{
+		if (!empty($conf->$module->enabled))
+		{
+			foreach ($delays as $delay)
+			{
+				$value = (!empty($conf->global->{$delay['code']}) ? $conf->global->{$delay['code']}:0);
+				print '<tr class="oddeven">';
+				print '<td width="20px">'.img_object('', $delay['img']).'</td>';
+				print '<td>'.$langs->trans('Delays_'.$delay['code']).'</td>';
+				print '<td class="right">'.$value.' '.$langs->trans("days").'</td></tr>';
+			}
+		}
+	}
 
-    print '</table>';
+	print '</table>';
 
 	print '<br>';
 
diff --git a/htdocs/admin/delivery.php b/htdocs/admin/delivery.php
index c05bd985705..d9c1b2ebe17 100644
--- a/htdocs/admin/delivery.php
+++ b/htdocs/admin/delivery.php
@@ -54,113 +54,113 @@ include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
 
 if ($action == 'updateMask')
 {
-    $maskconstdelivery = GETPOST('maskconstdelivery', 'alpha');
-    $maskdelivery = GETPOST('maskdelivery', 'alpha');
-    if ($maskconstdelivery)  $res = dolibarr_set_const($db, $maskconstdelivery, $maskdelivery, 'chaine', 0, '', $conf->entity);
+	$maskconstdelivery = GETPOST('maskconstdelivery', 'alpha');
+	$maskdelivery = GETPOST('maskdelivery', 'alpha');
+	if ($maskconstdelivery)  $res = dolibarr_set_const($db, $maskconstdelivery, $maskdelivery, 'chaine', 0, '', $conf->entity);
 
-    if (!$res > 0) $error++;
+	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');
+	}
 }
 
 if ($action == 'set_DELIVERY_FREE_TEXT')
 {
-    $free = GETPOST('DELIVERY_FREE_TEXT', 'restricthtml'); // No alpha here, we want exact string
-    $res = dolibarr_set_const($db, "DELIVERY_FREE_TEXT", $free, 'chaine', 0, '', $conf->entity);
+	$free = GETPOST('DELIVERY_FREE_TEXT', 'restricthtml'); // No alpha here, we want exact string
+	$res = dolibarr_set_const($db, "DELIVERY_FREE_TEXT", $free, 'chaine', 0, '', $conf->entity);
 
-    if (!$res > 0) $error++;
+	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');
+	}
 }
 
 if ($action == 'specimen')
 {
-    $modele = GETPOST('module', 'alpha');
+	$modele = GETPOST('module', 'alpha');
 
-    $sending = new Delivery($db);
-    $sending->initAsSpecimen();
+	$sending = new Delivery($db);
+	$sending->initAsSpecimen();
 
-    // Search template files
-    $file = ''; $classname = ''; $filefound = 0;
-    $dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
-    foreach ($dirmodels as $reldir)
-    {
-        $file = dol_buildpath($reldir."core/modules/delivery/doc/pdf_".$modele.".modules.php", 0);
-        if (file_exists($file))
-        {
-            $filefound = 1;
-            $classname = "pdf_".$modele;
-            break;
-        }
-    }
+	// Search template files
+	$file = ''; $classname = ''; $filefound = 0;
+	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
+	foreach ($dirmodels as $reldir)
+	{
+		$file = dol_buildpath($reldir."core/modules/delivery/doc/pdf_".$modele.".modules.php", 0);
+		if (file_exists($file))
+		{
+			$filefound = 1;
+			$classname = "pdf_".$modele;
+			break;
+		}
+	}
 
-    if ($filefound)
-    {
-        require_once $file;
+	if ($filefound)
+	{
+		require_once $file;
 
-        $module = new $classname($db);
+		$module = new $classname($db);
 
-        if ($module->write_file($sending, $langs) > 0)
-        {
-            header("Location: ".DOL_URL_ROOT."/document.php?modulepart=delivery&file=SPECIMEN.pdf");
-            return;
-        } else {
-            setEventMessages($module->error, $module->errors, 'errors');
-            dol_syslog($module->error, LOG_ERR);
-        }
-    } else {
+		if ($module->write_file($sending, $langs) > 0)
+		{
+			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=delivery&file=SPECIMEN.pdf");
+			return;
+		} else {
+			setEventMessages($module->error, $module->errors, 'errors');
+			dol_syslog($module->error, LOG_ERR);
+		}
+	} else {
 		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
-        dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
-    }
+		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
+	}
 }
 
 if ($action == 'set')
 {
-    $ret = addDocumentModel($value, $type, $label, $scandir);
+	$ret = addDocumentModel($value, $type, $label, $scandir);
 }
 
 if ($action == 'del')
 {
-    $ret = delDocumentModel($value, $type);
-    if ($ret > 0)
-    {
-        if ($conf->global->DELIVERY_ADDON_PDF == "$value") dolibarr_del_const($db, 'DELIVERY_ADDON_PDF', $conf->entity);
-    }
+	$ret = delDocumentModel($value, $type);
+	if ($ret > 0)
+	{
+		if ($conf->global->DELIVERY_ADDON_PDF == "$value") dolibarr_del_const($db, 'DELIVERY_ADDON_PDF', $conf->entity);
+	}
 }
 
 if ($action == 'setdoc')
 {
-    if (dolibarr_set_const($db, "DELIVERY_ADDON_PDF", $value, 'chaine', 0, '', $conf->entity))
-    {
-        // La constante qui a ete lue en avant du nouveau set
-        // on passe donc par une variable pour avoir un affichage coherent
-        $conf->global->DELIVERY_ADDON_PDF = $value;
-    }
+	if (dolibarr_set_const($db, "DELIVERY_ADDON_PDF", $value, 'chaine', 0, '', $conf->entity))
+	{
+		// La constante qui a ete lue en avant du nouveau set
+		// on passe donc par une variable pour avoir un affichage coherent
+		$conf->global->DELIVERY_ADDON_PDF = $value;
+	}
 
-    // On active le modele
-    $ret = delDocumentModel($value, $type);
-    if ($ret > 0)
-    {
-        $ret = addDocumentModel($value, $type, $label, $scandir);
-    }
+	// On active le modele
+	$ret = delDocumentModel($value, $type);
+	if ($ret > 0)
+	{
+		$ret = addDocumentModel($value, $type, $label, $scandir);
+	}
 }
 
 if ($action == 'setmod')
 {
-    // TODO Verifier si module numerotation choisi peut etre active
-    // par appel methode canBeActivated
+	// TODO Verifier si module numerotation choisi peut etre active
+	// par appel methode canBeActivated
 
-    dolibarr_set_const($db, "DELIVERY_ADDON_NUMBER", $value, 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "DELIVERY_ADDON_NUMBER", $value, 'chaine', 0, '', $conf->entity);
 }
 
 
@@ -199,79 +199,79 @@ clearstatcache();
 
 foreach ($dirmodels as $reldir)
 {
-    $dir = dol_buildpath($reldir."core/modules/delivery/");
+	$dir = dol_buildpath($reldir."core/modules/delivery/");
 
-    if (is_dir($dir))
-    {
-        $handle = opendir($dir);
-        if (is_resource($handle))
-        {
-            while (($file = readdir($handle)) !== false)
-            {
-            	if (preg_match('/^mod_delivery_([a-z0-9_]*)\.php$/', $file)) {
-                    $file = substr($file, 0, dol_strlen($file) - 4);
+	if (is_dir($dir))
+	{
+		$handle = opendir($dir);
+		if (is_resource($handle))
+		{
+			while (($file = readdir($handle)) !== false)
+			{
+				if (preg_match('/^mod_delivery_([a-z0-9_]*)\.php$/', $file)) {
+					$file = substr($file, 0, dol_strlen($file) - 4);
 
-                    require_once $dir.$file.'.php';
+					require_once $dir.$file.'.php';
 
-                    $module = new $file;
+					$module = new $file;
 
 					if ($module->isEnabled())
-                    {
+					{
 						// Show modules according to features level
 						if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
 						if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
 
-                        print '<tr class="oddeven"><td>'.$module->name."</td><td>\n";
-                        print $module->info();
-                        print '</td>';
+						print '<tr class="oddeven"><td>'.$module->name."</td><td>\n";
+						print $module->info();
+						print '</td>';
 
-                        // Show example of numbering module
-                        print '<td class="nowrap">';
-                        $tmp = $module->getExample();
-                        if (preg_match('/^Error/', $tmp)) {
+						// Show example of numbering module
+						print '<td class="nowrap">';
+						$tmp = $module->getExample();
+						if (preg_match('/^Error/', $tmp)) {
 							$langs->load("errors"); print '<div class="error">'.$langs->trans($tmp).'</div>';
 						} elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
-                        else print $tmp;
-                        print '</td>'."\n";
+						else print $tmp;
+						print '</td>'."\n";
 
-                        print '<td class="center">';
-                        if ($conf->global->DELIVERY_ADDON_NUMBER == "$file")
-                        {
-                            print img_picto($langs->trans("Activated"), 'switch_on');
-                        } else {
-                            print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;token='.newToken().'&amp;value='.urlencode($file).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
-                        }
-                        print '</td>';
+						print '<td class="center">';
+						if ($conf->global->DELIVERY_ADDON_NUMBER == "$file")
+						{
+							print img_picto($langs->trans("Activated"), 'switch_on');
+						} else {
+							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;token='.newToken().'&amp;value='.urlencode($file).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+						}
+						print '</td>';
 
-                        $delivery = new Delivery($db);
-                        $delivery->initAsSpecimen();
+						$delivery = new Delivery($db);
+						$delivery->initAsSpecimen();
 
-                        // Info
-                        $htmltooltip = '';
-                        $htmltooltip .= ''.$langs->trans("Version").': <b>'.$module->getVersion().'</b><br>';
-                        $nextval = $module->getNextValue($mysoc, $delivery);
-                        if ("$nextval" != $langs->trans("NotAvailable")) {  // Keep " on nextval
-                            $htmltooltip .= ''.$langs->trans("NextValue").': ';
-                            if ($nextval) {
-                                if (preg_match('/^Error/', $nextval) || $nextval == 'NotConfigured')
-                                    $nextval = $langs->trans($nextval);
-                                $htmltooltip .= $nextval.'<br>';
-                            } else {
-                                $htmltooltip .= $langs->trans($module->error).'<br>';
-                            }
-                        }
+						// Info
+						$htmltooltip = '';
+						$htmltooltip .= ''.$langs->trans("Version").': <b>'.$module->getVersion().'</b><br>';
+						$nextval = $module->getNextValue($mysoc, $delivery);
+						if ("$nextval" != $langs->trans("NotAvailable")) {  // Keep " on nextval
+							$htmltooltip .= ''.$langs->trans("NextValue").': ';
+							if ($nextval) {
+								if (preg_match('/^Error/', $nextval) || $nextval == 'NotConfigured')
+									$nextval = $langs->trans($nextval);
+								$htmltooltip .= $nextval.'<br>';
+							} else {
+								$htmltooltip .= $langs->trans($module->error).'<br>';
+							}
+						}
 
-                        print '<td class="center">';
-                        print $form->textwithpicto('', $htmltooltip, 1, 0);
-                        print '</td>';
+						print '<td class="center">';
+						print $form->textwithpicto('', $htmltooltip, 1, 0);
+						print '</td>';
 
-                        print '</tr>';
-                    }
-                }
-            }
-            closedir($handle);
-        }
-    }
+						print '</tr>';
+					}
+				}
+			}
+			closedir($handle);
+		}
+	}
 }
 
 print '</table>';
@@ -321,14 +321,14 @@ clearstatcache();
 
 foreach ($dirmodels as $reldir)
 {
-    $dir = dol_buildpath($reldir."core/modules/delivery/doc/");
+	$dir = dol_buildpath($reldir."core/modules/delivery/doc/");
 
-    if (is_dir($dir))
-    {
-        $handle = opendir($dir);
-        if (is_resource($handle))
-        {
-        	while (($file = readdir($handle)) !== false)
+	if (is_dir($dir))
+	{
+		$handle = opendir($dir);
+		if (is_resource($handle))
+		{
+			while (($file = readdir($handle)) !== false)
 			{
 				$filelist[] = $file;
 			}
@@ -337,79 +337,79 @@ foreach ($dirmodels as $reldir)
 
 			foreach ($filelist as $file)
 			{
-                if (preg_match('/\.modules\.php$/i', $file) && preg_match('/^(pdf_|doc_)/', $file))
-                {
-                	if (file_exists($dir.'/'.$file))
-                	{
-		    			$name = substr($file, 4, dol_strlen($file) - 16);
-		    			$classname = substr($file, 0, dol_strlen($file) - 12);
+				if (preg_match('/\.modules\.php$/i', $file) && preg_match('/^(pdf_|doc_)/', $file))
+				{
+					if (file_exists($dir.'/'.$file))
+					{
+						$name = substr($file, 4, dol_strlen($file) - 16);
+						$classname = substr($file, 0, dol_strlen($file) - 12);
 
-		    			require_once $dir.'/'.$file;
-		    			$module = new $classname($db);
+						require_once $dir.'/'.$file;
+						$module = new $classname($db);
 
-		    			$modulequalified = 1;
-		    			if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) $modulequalified = 0;
-		    			if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) $modulequalified = 0;
+						$modulequalified = 1;
+						if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) $modulequalified = 0;
+						if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) $modulequalified = 0;
 
-		    			if ($modulequalified)
-		    			{
-		    				print '<tr class="oddeven"><td width="100">';
-		    				print (empty($module->name) ? $name : $module->name);
-		    				print "</td><td>\n";
-		    				if (method_exists($module, 'info')) print $module->info($langs);
-		    				else print $module->description;
-		    				print '</td>';
+						if ($modulequalified)
+						{
+							print '<tr class="oddeven"><td width="100">';
+							print (empty($module->name) ? $name : $module->name);
+							print "</td><td>\n";
+							if (method_exists($module, 'info')) print $module->info($langs);
+							else print $module->description;
+							print '</td>';
 
-		    				// Active
-		    				if (in_array($name, $def))
-		    				{
-		    					print "<td align=\"center\">\n";
-		    					print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">';
-		    					print img_picto($langs->trans("Enabled"), 'switch_on');
-		    					print '</a>';
-		    					print "</td>";
-		    				} else {
-		    					print "<td align=\"center\">\n";
-		    					print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
-		    					print "</td>";
-		    				}
+							// Active
+							if (in_array($name, $def))
+							{
+								print "<td align=\"center\">\n";
+								print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">';
+								print img_picto($langs->trans("Enabled"), 'switch_on');
+								print '</a>';
+								print "</td>";
+							} else {
+								print "<td align=\"center\">\n";
+								print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+								print "</td>";
+							}
 
-		    				// Default
-		    				print "<td align=\"center\">";
-		    				if ($conf->global->DELIVERY_ADDON_PDF == "$name")
-		    				{
-		    					print img_picto($langs->trans("Default"), 'on');
-		    				} else {
-		    					print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
-		    				}
-		    				print '</td>';
+							// Default
+							print "<td align=\"center\">";
+							if ($conf->global->DELIVERY_ADDON_PDF == "$name")
+							{
+								print img_picto($langs->trans("Default"), 'on');
+							} else {
+								print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+							}
+							print '</td>';
 
-		    				// Info
-		    				$htmltooltip = ''.$langs->trans("Type").': '.($module->type ? $module->type : $langs->trans("Unknown"));
-		    				$htmltooltip .= '<br>'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur;
-		    				$htmltooltip .= '<br><br><u>'.$langs->trans("FeaturesSupported").'</u>:';
-		    				$htmltooltip .= '<br>'.$langs->trans("Logo").': '.yn($module->option_logo, 1, 1);
-		    				print '<td class="center">';
-		    				print $form->textwithpicto('', $htmltooltip, 1, 0);
-		    				print '</td>';
+							// Info
+							$htmltooltip = ''.$langs->trans("Type").': '.($module->type ? $module->type : $langs->trans("Unknown"));
+							$htmltooltip .= '<br>'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur;
+							$htmltooltip .= '<br><br><u>'.$langs->trans("FeaturesSupported").'</u>:';
+							$htmltooltip .= '<br>'.$langs->trans("Logo").': '.yn($module->option_logo, 1, 1);
+							print '<td class="center">';
+							print $form->textwithpicto('', $htmltooltip, 1, 0);
+							print '</td>';
 
-		    				// Preview
-		    				print '<td class="center">';
-		    				if ($module->type == 'pdf')
-		    				{
-		    					print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'sending').'</a>';
-		    				} else {
-		    					print img_object($langs->trans("PreviewNotAvailable"), 'generic');
-		    				}
-		    				print '</td>';
+							// Preview
+							print '<td class="center">';
+							if ($module->type == 'pdf')
+							{
+								print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'sending').'</a>';
+							} else {
+								print img_object($langs->trans("PreviewNotAvailable"), 'generic');
+							}
+							print '</td>';
 
-		    				print '</tr>';
-		    			}
-                	}
-                }
-            }
-        }
-    }
+							print '</tr>';
+						}
+					}
+				}
+			}
+		}
+	}
 }
 
 print '</table>';
@@ -440,11 +440,11 @@ print $form->textwithpicto($langs->trans("FreeLegalTextOnDeliveryReceipts"), $la
 $variablename = 'DELIVERY_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/delivery_extrafields.php b/htdocs/admin/delivery_extrafields.php
index 38628fa171b..c0ed636abac 100644
--- a/htdocs/admin/delivery_extrafields.php
+++ b/htdocs/admin/delivery_extrafields.php
@@ -80,7 +80,7 @@ print dol_get_fiche_head($head, 'attributes_receivings', $langs->trans("Receivin
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 // Buttons
diff --git a/htdocs/admin/deliverydet_extrafields.php b/htdocs/admin/deliverydet_extrafields.php
index 50dea86c2a5..322eff2f968 100644
--- a/htdocs/admin/deliverydet_extrafields.php
+++ b/htdocs/admin/deliverydet_extrafields.php
@@ -81,15 +81,15 @@ print dol_get_fiche_head($head, 'attributeslines_receivings', $langs->trans("Rec
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 // Buttons
 if ($action != 'create' && $action != 'edit')
 {
-    print '<div class="tabsAction">';
-    print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
-    print "</div>";
+	print '<div class="tabsAction">';
+	print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
+	print "</div>";
 }
 
 
@@ -102,9 +102,9 @@ if ($action != 'create' && $action != 'edit')
 if ($action == 'create')
 {
 	print '<br><div id="newattrib"></div>';
-    print load_fiche_titre($langs->trans('NewAttribute'));
+	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';
 }
 
 /* ************************************************************************** */
@@ -114,10 +114,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/dict.php b/htdocs/admin/dict.php
index 987d7a256af..43ce69f6e02 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -881,7 +881,7 @@ if (GETPOST('actionadd') || GETPOST('actionmodify'))
 		if (in_array($rowidcol, array('code', 'code_iso'))) {
 			$sql .= " WHERE ".$rowidcol." = '".$db->escape($rowid)."'";
 		} else {
-        	$sql .= " WHERE ".$rowidcol." = ".((int) $rowid);
+			$sql .= " WHERE ".$rowidcol." = ".((int) $rowid);
 		}
 		if (in_array('entity', $listfieldmodify)) $sql .= " AND entity = '".getEntity($tabname[$id])."'";
 
diff --git a/htdocs/admin/dolistore/ajax/image.php b/htdocs/admin/dolistore/ajax/image.php
index 7c25e9d33a5..e2666eb3312 100644
--- a/htdocs/admin/dolistore/ajax/image.php
+++ b/htdocs/admin/dolistore/ajax/image.php
@@ -19,7 +19,7 @@
 
 if (!defined('REQUIRE_JQUERY_BLOCKUI')) define('REQUIRE_JQUERY_BLOCKUI', 1);
 if (!defined('NOTOKENRENEWAL')) {
-    define('NOTOKENRENEWAL', 1);
+	define('NOTOKENRENEWAL', 1);
 }
 
 
diff --git a/htdocs/admin/dolistore/class/PSWebServiceLibrary.class.php b/htdocs/admin/dolistore/class/PSWebServiceLibrary.class.php
index 0227db8d969..00e8672f6d5 100644
--- a/htdocs/admin/dolistore/class/PSWebServiceLibrary.class.php
+++ b/htdocs/admin/dolistore/class/PSWebServiceLibrary.class.php
@@ -68,22 +68,22 @@ class PrestaShopWebservice
 	 * @param string $url Root URL for the shop
 	 * @param string $key Authentification key
 	 * @param mixed $debug Debug mode Activated (true) or deactivated (false)
-	*/
-    public function __construct($url, $key, $debug = true)
-    {
+	 */
+	public function __construct($url, $key, $debug = true)
+	{
 		if (!extension_loaded('curl'))
 		  throw new PrestaShopWebserviceException('Please activate the PHP extension \'curl\' to allow use of PrestaShop webservice library');
 		$this->url = $url;
 		$this->key = $key;
 		$this->debug = $debug;
 		$this->version = 'unknown';
-    }
+	}
 
 	/**
 	 * Take the status code and throw an exception if the server didn't return 200 or 201 code
 	 *
 	 * @param int $status_code Status code of an HTTP return
-     * @return void
+	 * @return void
 	 */
 	protected function checkStatusCode($status_code)
 	{
@@ -275,7 +275,7 @@ class PrestaShopWebservice
 	}
 
 	/**
- 	 * Retrieve (GET) a resource
+	 * Retrieve (GET) a resource
 	 * <p>Unique parameter must take : <br><br>
 	 * 'url' => Full URL for a GET request of Webservice (ex: http://mystore.com/api/customers/1/)<br>
 	 * OR<br>
@@ -332,7 +332,7 @@ class PrestaShopWebservice
 	}
 
 	/**
- 	 * Head method (HEAD) a resource
+	 * Head method (HEAD) a resource
 	 *
 	 * @param 	array 				$options 	Array representing resource for head request.
 	 * @return 	SimpleXMLElement 				status_code, response
diff --git a/htdocs/admin/dolistore/class/dolistore.class.php b/htdocs/admin/dolistore/class/dolistore.class.php
index 1d764a849be..c20f46b0bd5 100644
--- a/htdocs/admin/dolistore/class/dolistore.class.php
+++ b/htdocs/admin/dolistore/class/dolistore.class.php
@@ -19,7 +19,7 @@
 include_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 if (!class_exists('PrestaShopWebservice')) // We keep this because some modules add this lib too into a different path. This is to avoid "Cannot declare class PrestaShopWebservice" errors.
 {
-    include_once DOL_DOCUMENT_ROOT.'/admin/dolistore/class/PSWebServiceLibrary.class.php';
+	include_once DOL_DOCUMENT_ROOT.'/admin/dolistore/class/PSWebServiceLibrary.class.php';
 }
 
 
@@ -28,17 +28,17 @@ if (!class_exists('PrestaShopWebservice')) // We keep this because some modules
  */
 class Dolistore
 {
-    /**
-     * beginning of pagination
-     * @var int
-     */
-    public $start;
+	/**
+	 * beginning of pagination
+	 * @var int
+	 */
+	public $start;
 
-    /**
-     * end of pagination
-     * @var int
-     */
-    public $end;
+	/**
+	 * end of pagination
+	 * @var int
+	 */
+	public $end;
 
 	public $per_page; // pagination: display per page
 	public $categorie; // the current categorie
@@ -79,33 +79,33 @@ class Dolistore
 	 */
 	public function getRemoteCategories()
 	{
-	    global $conf;
+		global $conf;
 
-	    try {
-	        $this->api = new PrestaShopWebservice($conf->global->MAIN_MODULE_DOLISTORE_API_SRV, $conf->global->MAIN_MODULE_DOLISTORE_API_KEY, $this->debug_api);
-	        dol_syslog("Call API with MAIN_MODULE_DOLISTORE_API_SRV = ".$conf->global->MAIN_MODULE_DOLISTORE_API_SRV);
-	        // $conf->global->MAIN_MODULE_DOLISTORE_API_KEY is for the login of basic auth. There is no password as it is public data.
+		try {
+			$this->api = new PrestaShopWebservice($conf->global->MAIN_MODULE_DOLISTORE_API_SRV, $conf->global->MAIN_MODULE_DOLISTORE_API_KEY, $this->debug_api);
+			dol_syslog("Call API with MAIN_MODULE_DOLISTORE_API_SRV = ".$conf->global->MAIN_MODULE_DOLISTORE_API_SRV);
+			// $conf->global->MAIN_MODULE_DOLISTORE_API_KEY is for the login of basic auth. There is no password as it is public data.
 
-	        // Here we set the option array for the Webservice : we want categories resources
-	        $opt              = array();
-	        $opt['resource']  = 'categories';
-	        $opt['display']   = '[id,id_parent,nb_products_recursive,active,is_root_category,name,description]';
-	        $opt['sort']      = 'id_asc';
+			// Here we set the option array for the Webservice : we want categories resources
+			$opt              = array();
+			$opt['resource']  = 'categories';
+			$opt['display']   = '[id,id_parent,nb_products_recursive,active,is_root_category,name,description]';
+			$opt['sort']      = 'id_asc';
 
-	        // Call
-	        dol_syslog("Call API with opt = ".var_export($opt, true));
-	        $xml              = $this->api->get($opt);
-	        $this->categories = $xml->categories->children();
-	    } 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 {
-	            print 'Can not access to '.$conf->global->MAIN_MODULE_DOLISTORE_API_SRV.'<br>';
-	            print $e->getMessage();
-	        }
-	    }
+			// Call
+			dol_syslog("Call API with opt = ".var_export($opt, true));
+			$xml              = $this->api->get($opt);
+			$this->categories = $xml->categories->children();
+		} 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 {
+				print 'Can not access to '.$conf->global->MAIN_MODULE_DOLISTORE_API_SRV.'<br>';
+				print $e->getMessage();
+			}
+		}
 	}
 
 	/**
@@ -153,7 +153,7 @@ class Dolistore
 				}
 				$opt['filter[id]'] = '['.implode('|', $products).']';
 			} elseif ($this->categorie != 0) {   // We filter on category, so we first get list of product id in this category
-			    // $opt2['url'] is set by default to $this->url.'/api/'.$options['resource'];
+				// $opt2['url'] is set by default to $this->url.'/api/'.$options['resource'];
 				$opt2['resource'] = 'categories';
 				$opt2['id']       = $this->categorie;
 
@@ -189,7 +189,7 @@ class Dolistore
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Return tree of Dolistore categories. $this->categories must have been loaded before.
 	 *
@@ -198,7 +198,7 @@ class Dolistore
 	 */
 	public function get_categories($parent = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		if (!isset($this->categories)) die('not possible');
 		if ($parent != 0) {
 			$html = '<ul>';
@@ -235,7 +235,7 @@ class Dolistore
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Return list of product formated for output
 	 *
@@ -243,7 +243,7 @@ class Dolistore
 	 */
 	public function get_products()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs, $conf;
 		$html       = "";
 		$last_month = time() - (30 * 24 * 60 * 60);
@@ -270,7 +270,7 @@ class Dolistore
 
 			// free or pay ?
 			if ($product->price > 0) {
-			    $price = '<h3>'.price(price2num($product->price, 'MT'), 0, $langs, 1, -1, -1, 'EUR').' '.$langs->trans("HT").'</h3>';
+				$price = '<h3>'.price(price2num($product->price, 'MT'), 0, $langs, 1, -1, -1, 'EUR').' '.$langs->trans("HT").'</h3>';
 				$download_link = '<a target="_blank" href="'.$this->shop_url.$product->id.'"><img width="32" src="'.DOL_URL_ROOT.'/admin/dolistore/img/follow.png" /></a>';
 			} else {
 				$price         = '<h3>'.$langs->trans('Free').'</h3>';
@@ -282,12 +282,12 @@ class Dolistore
 			if ($this->version_compare($product->dolibarr_min, DOL_VERSION) <= 0) {
 				if ($this->version_compare($product->dolibarr_max, DOL_VERSION) >= 0) {
 					//compatible
-                    $version = '<span class="compatible">'.$langs->trans('CompatibleUpTo', $product->dolibarr_max,
+					$version = '<span class="compatible">'.$langs->trans('CompatibleUpTo', $product->dolibarr_max,
 						$product->dolibarr_min, $product->dolibarr_max).'</span>';
 					$compatible = '';
 				} else {
 					//never compatible, module expired
-                    $version = '<span class="notcompatible">'.$langs->trans('NotCompatible', DOL_VERSION,
+					$version = '<span class="notcompatible">'.$langs->trans('NotCompatible', DOL_VERSION,
 						$product->dolibarr_min, $product->dolibarr_max).'</span>';
 					$compatible = 'NotCompatible';
 				}
@@ -306,50 +306,50 @@ class Dolistore
                 <td class="margeCote"><h2 class="appTitle">'.$product->name->language[$this->lang - 1]
 						.'<br/><small>'.$version.'</small></h2>
                     <small> '.dol_print_date(dol_stringtotime($product->date_upd), 'dayhour').' - '.$langs->trans('Ref').': '.$product->reference.' - '.$langs->trans('Id').': '.$product->id.'</small><br><br>'.$product->description_short->language[$this->lang - 1].'</td>';
-            // do not load if display none
-            //$html .= '<td style="display:none;" class="long_description">'.$product->description->language[$this->lang - 1].'</td>';
-            $html .= '<td class="margeCote center">'.$price.'</td>';
-            $html .= '<td class="margeCote">'.$download_link.'</td>';
-            $html .= '</tr>';
-        }
-        return $html;
-    }
+			// do not load if display none
+			//$html .= '<td style="display:none;" class="long_description">'.$product->description->language[$this->lang - 1].'</td>';
+			$html .= '<td class="margeCote center">'.$price.'</td>';
+			$html .= '<td class="margeCote">'.$download_link.'</td>';
+			$html .= '</tr>';
+		}
+		return $html;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * get previous link
-     *
-     * @param   string    $text     symbol previous
-     * @return  string              html previous link
-     */
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * get previous link
+	 *
+	 * @param   string    $text     symbol previous
+	 * @return  string              html previous link
+	 */
 	public function get_previous_link($text = '<<')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		return '<a href="'.$this->get_previous_url().'" class="button">'.$text.'</a>';
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * get next link
-     *
-     * @param   string    $text     symbol next
-     * @return  string              html next link
-     */
-    public function get_next_link($text = '>>')
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * get next link
+	 *
+	 * @param   string    $text     symbol next
+	 * @return  string              html next link
+	 */
+	public function get_next_link($text = '>>')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		return '<a href="'.$this->get_next_url().'" class="button">'.$text.'</a>';
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * get previous url
-     *
-     * @return string    previous url
-     */
-    public function get_previous_url()
-    {
-        // phpcs:enable
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * get previous url
+	 *
+	 * @return string    previous url
+	 */
+	public function get_previous_url()
+	{
+		// phpcs:enable
 		$param_array = array();
 		if ($this->start < $this->per_page) {
 			$sub = 0;
@@ -363,17 +363,17 @@ class Dolistore
 		}
 		$param = http_build_query($param_array);
 		return $this->url."&".$param;
-    }
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * get next url
-     *
-     * @return string    next url
-     */
-    public function get_next_url()
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * get next url
+	 *
+	 * @return string    next url
+	 */
+	public function get_next_url()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$param_array = array();
 		if (count($this->products) < $this->per_page) {
 			$add = 0;
@@ -389,17 +389,17 @@ class Dolistore
 		return $this->url."&".$param;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * version compare
-     *
-     * @param   string  $v1     version 1
-     * @param   string  $v2     version 2
-     * @return int              result of compare
-     */
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * version compare
+	 *
+	 * @param   string  $v1     version 1
+	 * @param   string  $v2     version 2
+	 * @return int              result of compare
+	 */
 	public function version_compare($v1, $v2)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$v1       = explode('.', $v1);
 		$v2       = explode('.', $v2);
 		$ret      = 0;
diff --git a/htdocs/admin/ecm_directories_extrafields.php b/htdocs/admin/ecm_directories_extrafields.php
index da1fcdbfae5..3179c01960c 100644
--- a/htdocs/admin/ecm_directories_extrafields.php
+++ b/htdocs/admin/ecm_directories_extrafields.php
@@ -84,7 +84,7 @@ print dol_get_fiche_head($head, 'attributes_ecm_directories', $langs->trans("ECM
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 // Buttons
diff --git a/htdocs/admin/ecm_files_extrafields.php b/htdocs/admin/ecm_files_extrafields.php
index 20c379532b8..9fc297fd37a 100644
--- a/htdocs/admin/ecm_files_extrafields.php
+++ b/htdocs/admin/ecm_files_extrafields.php
@@ -84,7 +84,7 @@ print dol_get_fiche_head($head, 'attributes_ecm_files', $langs->trans("ECM"), -1
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 // Buttons
diff --git a/htdocs/admin/emailcollector_card.php b/htdocs/admin/emailcollector_card.php
index 71b25dde669..7a48883fd55 100644
--- a/htdocs/admin/emailcollector_card.php
+++ b/htdocs/admin/emailcollector_card.php
@@ -261,7 +261,7 @@ if ($action == 'create') {
 
 	print '</table>'."\n";
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div class="center">';
 	print '<input type="submit" class="button" name="add" value="'.dol_escape_htmltag($langs->trans("Create")).'">';
@@ -295,7 +295,7 @@ if (($id || $ref) && $action == 'edit')
 
 	print '</table>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div class="center"><input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
 	print ' &nbsp; <input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
@@ -655,7 +655,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 	print '<div class="clearboth"></div><br>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	// Buttons for actions
 	if ($action != 'presend' && $action != 'editline') {
diff --git a/htdocs/admin/emailcollector_list.php b/htdocs/admin/emailcollector_list.php
index 98dcfd592a2..3674d88a372 100644
--- a/htdocs/admin/emailcollector_list.php
+++ b/htdocs/admin/emailcollector_list.php
@@ -393,7 +393,7 @@ foreach ($object->fields as $key => $val)
 	if (!empty($arrayfields['t.'.$key]['checked']))
 	{
 		print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
-		if (is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
+		if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
 		elseif (strpos($val['type'], 'integer:') === 0) {
 			print $object->showInputField($val, $key, $search[$key], '', '', 'search_', 'maxwidth150', 1);
 		} elseif (!preg_match('/^(date|timestamp)/', $val['type'])) print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
@@ -426,9 +426,9 @@ foreach ($object->fields as $key => $val)
 	elseif (in_array($val['type'], array('timestamp'))) $cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
 	elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID') $cssforfield .= ($cssforfield ? ' ' : '').'right';
 	if (!empty($arrayfields['t.'.$key]['checked']))
-    {
-        print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($cssforfield ? 'class="'.$cssforfield.'"' : ''), $sortfield, $sortorder, ($cssforfield ? $cssforfield.' ' : ''))."\n";
-    }
+	{
+		print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($cssforfield ? 'class="'.$cssforfield.'"' : ''), $sortfield, $sortorder, ($cssforfield ? $cssforfield.' ' : ''))."\n";
+	}
 }
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
@@ -470,26 +470,26 @@ while ($i < ($limit ? min($num, $limit) : $num))
 	{
 		$cssforfield = (empty($val['css']) ? '' : $val['css']);
 		if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) $cssforfield .= ($cssforfield ? ' ' : '').'center';
-	    elseif ($key == 'status') $cssforfield .= ($cssforfield ? ' ' : '').'center';
+		elseif ($key == 'status') $cssforfield .= ($cssforfield ? ' ' : '').'center';
 
-	    if (in_array($val['type'], array('timestamp'))) $cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
-	    elseif ($key == 'ref') $cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+		if (in_array($val['type'], array('timestamp'))) $cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+		elseif ($key == 'ref') $cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
 
-	    if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('rowid', 'status'))) $cssforfield .= ($cssforfield ? ' ' : '').'right';
-	    //if (in_array($key, array('fk_soc', 'fk_user', 'fk_warehouse'))) $cssforfield = 'tdoverflowmax100';
+		if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('rowid', 'status'))) $cssforfield .= ($cssforfield ? ' ' : '').'right';
+		//if (in_array($key, array('fk_soc', 'fk_user', 'fk_warehouse'))) $cssforfield = 'tdoverflowmax100';
 
-	    if (!empty($arrayfields['t.'.$key]['checked']))
-	    {
-	    	print '<td'.($cssforfield ? ' class="'.$cssforfield.'"' : '').'>';
-	    	if ($key == 'status') print $object->getLibStatut(5);
-	    	else print $object->showOutputField($val, $key, $object->$key, '');
-	    	print '</td>';
-	    	if (!$i) $totalarray['nbfield']++;
-	    	if (!empty($val['isameasure']))
-	    	{
-	    		if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 't.'.$key;
-	    		$totalarray['val']['t.'.$key] += $object->$key;
-	    	}
+		if (!empty($arrayfields['t.'.$key]['checked']))
+		{
+			print '<td'.($cssforfield ? ' class="'.$cssforfield.'"' : '').'>';
+			if ($key == 'status') print $object->getLibStatut(5);
+			else print $object->showOutputField($val, $key, $object->$key, '');
+			print '</td>';
+			if (!$i) $totalarray['nbfield']++;
+			if (!empty($val['isameasure']))
+			{
+				if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 't.'.$key;
+				$totalarray['val']['t.'.$key] += $object->$key;
+			}
 		}
 	}
 	// Extra fields
diff --git a/htdocs/admin/events.php b/htdocs/admin/events.php
index 37e19acc13b..b75606f739c 100644
--- a/htdocs/admin/events.php
+++ b/htdocs/admin/events.php
@@ -125,7 +125,7 @@ foreach ($eventstolog as $key => $arr)
 }
 print '</table>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '<div class="center">';
 print "<input type=\"submit\" name=\"save\" class=\"button\" value=\"".$langs->trans("Save")."\">";
diff --git a/htdocs/admin/expedition_extrafields.php b/htdocs/admin/expedition_extrafields.php
index bd46148175a..901caf58c00 100644
--- a/htdocs/admin/expedition_extrafields.php
+++ b/htdocs/admin/expedition_extrafields.php
@@ -80,7 +80,7 @@ print dol_get_fiche_head($head, 'attributes_shipment', $langs->trans("Sendings")
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 // Buttons
diff --git a/htdocs/admin/expeditiondet_extrafields.php b/htdocs/admin/expeditiondet_extrafields.php
index 669b4c56a64..6f917618bf2 100644
--- a/htdocs/admin/expeditiondet_extrafields.php
+++ b/htdocs/admin/expeditiondet_extrafields.php
@@ -81,15 +81,15 @@ print dol_get_fiche_head($head, 'attributeslines_shipment', $langs->trans("Sendi
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 // Buttons
 if ($action != 'create' && $action != 'edit')
 {
-    print '<div class="tabsAction">';
-    print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
-    print "</div>";
+	print '<div class="tabsAction">';
+	print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
+	print "</div>";
 }
 
 
@@ -102,9 +102,9 @@ if ($action != 'create' && $action != 'edit')
 if ($action == 'create')
 {
 	print '<br><div id="newattrib"></div>';
-    print load_fiche_titre($langs->trans('NewAttribute'));
+	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';
 }
 
 /* ************************************************************************** */
@@ -114,10 +114,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.php b/htdocs/admin/expensereport.php
index 2466fbe7cab..3de7ff55c5f 100644
--- a/htdocs/admin/expensereport.php
+++ b/htdocs/admin/expensereport.php
@@ -61,11 +61,11 @@ if ($action == 'updateMask')
 	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');
+	}
 } elseif ($action == 'specimen') // For fiche inter
 {
 	$modele = GETPOST('module', 'alpha');
@@ -80,7 +80,7 @@ if ($action == 'updateMask')
 	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 	foreach ($dirmodels as $reldir)
 	{
-	    $file = dol_buildpath($reldir."core/modules/expensereport/doc/pdf_".$modele.".modules.php", 0);
+		$file = dol_buildpath($reldir."core/modules/expensereport/doc/pdf_".$modele.".modules.php", 0);
 		if (file_exists($file))
 		{
 			$filefound = 1;
@@ -122,7 +122,7 @@ elseif ($action == 'set')
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0)
 	{
-        if ($conf->global->EXPENSEREPORT_ADDON_PDF == "$value") dolibarr_del_const($db, 'EXPENSEREPORT_ADDON_PDF', $conf->entity);
+		if ($conf->global->EXPENSEREPORT_ADDON_PDF == "$value") dolibarr_del_const($db, 'EXPENSEREPORT_ADDON_PDF', $conf->entity);
 	}
 }
 
@@ -150,7 +150,7 @@ elseif ($action == 'setdoc')
 	dolibarr_set_const($db, "EXPENSEREPORT_ADDON", $value, 'chaine', 0, '', $conf->entity);
 } elseif ($action == 'setoptions')
 {
-    $db->begin();
+	$db->begin();
 
 	$freetext = GETPOST('EXPENSEREPORT_FREE_TEXT', 'restricthtml'); // No alpha here, we want exact string
 	$res1 = dolibarr_set_const($db, "EXPENSEREPORT_FREE_TEXT", $freetext, 'chaine', 0, '', $conf->entity);
@@ -161,13 +161,13 @@ elseif ($action == 'setdoc')
 	if (!$res1 > 0 || !$res2 > 0) $error++;
 
  	if (!$error)
-    {
-        $db->commit();
-        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    } else {
-        $db->rollback();
-        setEventMessages($langs->trans("Error"), null, 'errors');
-    }
+	{
+		$db->commit();
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
+		$db->rollback();
+		setEventMessages($langs->trans("Error"), null, 'errors');
+	}
 }
 
 
@@ -235,13 +235,13 @@ foreach ($dirmodels as $reldir)
 						print $module->info();
 						print '</td>';
 
-                        // Show example of numbering model
-                        print '<td class="nowrap">';
-                        $tmp = $module->getExample();
-                        if (preg_match('/^Error/', $tmp)) print '<div class="error">'.$langs->trans($tmp).'</div>';
-                        elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
-                        else print $tmp;
-                        print '</td>'."\n";
+						// Show example of numbering model
+						print '<td class="nowrap">';
+						$tmp = $module->getExample();
+						if (preg_match('/^Error/', $tmp)) print '<div class="error">'.$langs->trans($tmp).'</div>';
+						elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
+						else print $tmp;
+						print '</td>'."\n";
 
 						print '<td class="center">';
 						if ($conf->global->EXPENSEREPORT_ADDON == $file)
@@ -261,16 +261,16 @@ foreach ($dirmodels as $reldir)
 						$htmltooltip = '';
 						$htmltooltip .= ''.$langs->trans("Version").': <b>'.$module->getVersion().'</b><br>';
 						$nextval = $module->getNextValue($exp);
-                        if ("$nextval" != $langs->trans("NotAvailable")) {  // Keep " on nextval
-                            $htmltooltip .= ''.$langs->trans("NextValue").': ';
-                            if ($nextval) {
-                                if (preg_match('/^Error/', $nextval) || $nextval == 'NotConfigured')
-                                    $nextval = $langs->trans($nextval);
-                                $htmltooltip .= $nextval.'<br>';
-                            } else {
-                                $htmltooltip .= $langs->trans($module->error).'<br>';
-                            }
-                        }
+						if ("$nextval" != $langs->trans("NotAvailable")) {  // Keep " on nextval
+							$htmltooltip .= ''.$langs->trans("NextValue").': ';
+							if ($nextval) {
+								if (preg_match('/^Error/', $nextval) || $nextval == 'NotConfigured')
+									$nextval = $langs->trans($nextval);
+								$htmltooltip .= $nextval.'<br>';
+							} else {
+								$htmltooltip .= $langs->trans($module->error).'<br>';
+							}
+						}
 
 						print '<td class="center">';
 						print $form->textwithpicto('', $htmltooltip, 1, 0);
@@ -345,81 +345,81 @@ foreach ($dirmodels as $reldir)
 			foreach ($filelist as $file)
 			{
 				if (preg_match('/\.modules\.php$/i', $file) && preg_match('/^(pdf_|doc_)/', $file))
-		    	{
-		    		if (file_exists($dir.'/'.$file))
-		    		{
-		    			$name = substr($file, 4, dol_strlen($file) - 16);
-		    			$classname = substr($file, 0, dol_strlen($file) - 12);
+				{
+					if (file_exists($dir.'/'.$file))
+					{
+						$name = substr($file, 4, dol_strlen($file) - 16);
+						$classname = substr($file, 0, dol_strlen($file) - 12);
 
-		    			require_once $dir.'/'.$file;
-		    			$module = new $classname($db);
+						require_once $dir.'/'.$file;
+						$module = new $classname($db);
 
-		    			$modulequalified = 1;
-		    			if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) $modulequalified = 0;
-		    			if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) $modulequalified = 0;
+						$modulequalified = 1;
+						if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) $modulequalified = 0;
+						if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) $modulequalified = 0;
 
-		    			if ($modulequalified)
-		    			{
-		    				print '<tr class="oddeven"><td width="100">';
-		    				print (empty($module->name) ? $name : $module->name);
-		    				print "</td><td>\n";
-		    				if (method_exists($module, 'info')) print $module->info($langs);
-		    				else print $module->description;
-		    				print '</td>';
+						if ($modulequalified)
+						{
+							print '<tr class="oddeven"><td width="100">';
+							print (empty($module->name) ? $name : $module->name);
+							print "</td><td>\n";
+							if (method_exists($module, 'info')) print $module->info($langs);
+							else print $module->description;
+							print '</td>';
 
-		    				// Active
-		    				if (in_array($name, $def))
-		    				{
-		    					print '<td class="center">'."\n";
-		    					print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">';
-		    					print img_picto($langs->trans("Enabled"), 'switch_on');
-		    					print '</a>';
-		    					print "</td>";
-		    				} else {
-		    					print '<td class="center">'."\n";
-		    					print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
-		    					print "</td>";
-		    				}
+							// Active
+							if (in_array($name, $def))
+							{
+								print '<td class="center">'."\n";
+								print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">';
+								print img_picto($langs->trans("Enabled"), 'switch_on');
+								print '</a>';
+								print "</td>";
+							} else {
+								print '<td class="center">'."\n";
+								print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+								print "</td>";
+							}
 
-		    				// Default
-		    				print '<td class="center">';
-		    				if ($conf->global->EXPENSEREPORT_ADDON_PDF == "$name")
-		    				{
-		    					print img_picto($langs->trans("Default"), 'on');
-		    				} else {
-		    					print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
-		    				}
-		    				print '</td>';
+							// Default
+							print '<td class="center">';
+							if ($conf->global->EXPENSEREPORT_ADDON_PDF == "$name")
+							{
+								print img_picto($langs->trans("Default"), 'on');
+							} else {
+								print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+							}
+							print '</td>';
 
-		    				// Info
-		    				$htmltooltip = ''.$langs->trans("Name").': '.$module->name;
-		    				$htmltooltip .= '<br>'.$langs->trans("Type").': '.($module->type ? $module->type : $langs->trans("Unknown"));
-		    				$htmltooltip .= '<br>'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur;
-		    				$htmltooltip .= '<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
-		    				$htmltooltip .= '<br>'.$langs->trans("Logo").': '.yn($module->option_logo, 1, 1);
-		    				$htmltooltip .= '<br>'.$langs->trans("PaymentMode").': '.yn($module->option_modereg, 1, 1);
-		    				$htmltooltip .= '<br>'.$langs->trans("PaymentConditions").': '.yn($module->option_condreg, 1, 1);
-		    				$htmltooltip .= '<br>'.$langs->trans("MultiLanguage").': '.yn($module->option_multilang, 1, 1);
-		    				$htmltooltip .= '<br>'.$langs->trans("WatermarkOnDraftOrders").': '.yn($module->option_draft_watermark, 1, 1);
-		    				print '<td class="center">';
-		    				print $form->textwithpicto('', $htmltooltip, -1, 0);
-		    				print '</td>';
+							// Info
+							$htmltooltip = ''.$langs->trans("Name").': '.$module->name;
+							$htmltooltip .= '<br>'.$langs->trans("Type").': '.($module->type ? $module->type : $langs->trans("Unknown"));
+							$htmltooltip .= '<br>'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur;
+							$htmltooltip .= '<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
+							$htmltooltip .= '<br>'.$langs->trans("Logo").': '.yn($module->option_logo, 1, 1);
+							$htmltooltip .= '<br>'.$langs->trans("PaymentMode").': '.yn($module->option_modereg, 1, 1);
+							$htmltooltip .= '<br>'.$langs->trans("PaymentConditions").': '.yn($module->option_condreg, 1, 1);
+							$htmltooltip .= '<br>'.$langs->trans("MultiLanguage").': '.yn($module->option_multilang, 1, 1);
+							$htmltooltip .= '<br>'.$langs->trans("WatermarkOnDraftOrders").': '.yn($module->option_draft_watermark, 1, 1);
+							print '<td class="center">';
+							print $form->textwithpicto('', $htmltooltip, -1, 0);
+							print '</td>';
 
-		    				// Preview
-		    				print '<td class="center">';
-		    				if ($module->type == 'pdf')
-		    				{
-		    					print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'intervention').'</a>';
-		    				} else {
-		    					print img_object($langs->trans("PreviewNotAvailable"), 'generic');
-		    				}
-		    				print '</td>';
+							// Preview
+							print '<td class="center">';
+							if ($module->type == 'pdf')
+							{
+								print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'intervention').'</a>';
+							} else {
+								print img_object($langs->trans("PreviewNotAvailable"), 'generic');
+							}
+							print '</td>';
 
-		    				print '</tr>';
-		    			}
-		    		}
-		    	}
-		    }
+							print '</tr>';
+						}
+					}
+				}
+			}
 		}
 	}
 }
@@ -457,11 +457,11 @@ print $form->textwithpicto($langs->trans("FreeLegalTextOnExpenseReports"), $lang
 $variablename = 'EXPENSEREPORT_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></tr>'."\n";
 
@@ -480,7 +480,7 @@ print '</div>';
 
 print '</form>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // End of page
 llxFooter();
diff --git a/htdocs/admin/expensereport_extrafields.php b/htdocs/admin/expensereport_extrafields.php
index 51b82e64d4f..ac88ec78912 100644
--- a/htdocs/admin/expensereport_extrafields.php
+++ b/htdocs/admin/expensereport_extrafields.php
@@ -74,7 +74,7 @@ print dol_get_fiche_head($head, 'attributes', $langs->trans("ExpenseReports"), -
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 // Buttons
diff --git a/htdocs/admin/expensereport_ik.php b/htdocs/admin/expensereport_ik.php
index f798aaf2c60..2e00d0d8ff9 100644
--- a/htdocs/admin/expensereport_ik.php
+++ b/htdocs/admin/expensereport_ik.php
@@ -180,7 +180,7 @@ foreach ($rangesbycateg as $fk_c_exp_tax_cat => $Tab)
 echo '</table>';
 echo '</form>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // End of page
 llxFooter();
diff --git a/htdocs/admin/expensereport_rules.php b/htdocs/admin/expensereport_rules.php
index 52f690801cc..9a4bf2804b2 100644
--- a/htdocs/admin/expensereport_rules.php
+++ b/htdocs/admin/expensereport_rules.php
@@ -338,7 +338,7 @@ echo '<script type="text/javascript"> $(function() {
 
 }); </script>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // End of page
 llxFooter();
diff --git a/htdocs/admin/export.php b/htdocs/admin/export.php
index bf1a514df90..5dd541b34b5 100644
--- a/htdocs/admin/export.php
+++ b/htdocs/admin/export.php
@@ -103,7 +103,7 @@ print '</table>';
 
 print '</form>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // End of page
 llxFooter();
diff --git a/htdocs/admin/external_rss.php b/htdocs/admin/external_rss.php
index 7f5bcde4b3d..48db3ee4429 100644
--- a/htdocs/admin/external_rss.php
+++ b/htdocs/admin/external_rss.php
@@ -55,31 +55,31 @@ $sql .= " WHERE ".$db->decrypt('name')." LIKE 'EXTERNAL_RSS_URLRSS_%'";
 $result = $db->query($sql); // We can't use SELECT MAX() because EXTERNAL_RSS_URLRSS_10 is lower than EXTERNAL_RSS_URLRSS_9
 if ($result)
 {
-    while ($obj = $db->fetch_object($result))
-    {
-        preg_match('/([0-9]+)$/i', $obj->name, $reg);
-        if ($reg[1] && $reg[1] > $lastexternalrss) $lastexternalrss = $reg[1];
-    }
+	while ($obj = $db->fetch_object($result))
+	{
+		preg_match('/([0-9]+)$/i', $obj->name, $reg);
+		if ($reg[1] && $reg[1] > $lastexternalrss) $lastexternalrss = $reg[1];
+	}
 } else {
-    dol_print_error($db);
+	dol_print_error($db);
 }
 
 if ($action == 'add' || GETPOST("modify"))
 {
-    $external_rss_title = "external_rss_title_".GETPOST("norss", 'int');
-    $external_rss_urlrss = "external_rss_urlrss_".GETPOST("norss", 'int');
+	$external_rss_title = "external_rss_title_".GETPOST("norss", 'int');
+	$external_rss_urlrss = "external_rss_urlrss_".GETPOST("norss", 'int');
 
-    if (!empty($_POST[$external_rss_urlrss]))
-    {
-        $boxlabel = '(ExternalRSSInformations)';
-        //$external_rss_url = "external_rss_url_" . $_POST["norss"];
+	if (!empty($_POST[$external_rss_urlrss]))
+	{
+		$boxlabel = '(ExternalRSSInformations)';
+		//$external_rss_url = "external_rss_url_" . $_POST["norss"];
 
-        $db->begin();
+		$db->begin();
 
 		if ($_POST["modify"])
 		{
 			// Supprime boite box_external_rss de definition des boites
-            /* $sql = "UPDATE ".MAIN_DB_PREFIX."boxes_def";
+			/* $sql = "UPDATE ".MAIN_DB_PREFIX."boxes_def";
 			$sql.= " SET name = '".$db->escape($boxlabel)."'";
 	        $sql.= " WHERE file ='box_external_rss.php' AND note like '".$db->escape($_POST["norss"])." %'";
 
@@ -92,56 +92,56 @@ if ($action == 'add' || GETPOST("modify"))
             */
 		} else {
 			// Ajoute boite box_external_rss dans definition des boites
-	        $sql = "INSERT INTO ".MAIN_DB_PREFIX."boxes_def (file, note)";
+			$sql = "INSERT INTO ".MAIN_DB_PREFIX."boxes_def (file, note)";
 			$sql .= " VALUES ('box_external_rss.php','".$db->escape(GETPOST("norss", 'int').' ('.GETPOST($external_rss_title, 'alpha')).")')";
-	        if (!$db->query($sql))
-	        {
-	        	dol_print_error($db);
-	            $err++;
-	        }
+			if (!$db->query($sql))
+			{
+				dol_print_error($db);
+				$err++;
+			}
 		}
 
 		$result1 = dolibarr_set_const($db, "EXTERNAL_RSS_TITLE_".GETPOST("norss", 'int'), GETPOST($external_rss_title, 'alpha'), 'chaine', 0, '', $conf->entity);
 		if ($result1) $result2 = dolibarr_set_const($db, "EXTERNAL_RSS_URLRSS_".GETPOST("norss", 'int'), GETPOST($external_rss_urlrss, 'alpha'), 'chaine', 0, '', $conf->entity);
 
-        if ($result1 && $result2)
-        {
-            $db->commit();
-            header("Location: ".$_SERVER["PHP_SELF"]);
-            exit;
-        } else {
-            $db->rollback();
-            dol_print_error($db);
-        }
-    }
+		if ($result1 && $result2)
+		{
+			$db->commit();
+			header("Location: ".$_SERVER["PHP_SELF"]);
+			exit;
+		} else {
+			$db->rollback();
+			dol_print_error($db);
+		}
+	}
 }
 
 if ($_POST["delete"])
 {
-    if (GETPOST("norss", 'int'))
-    {
-        $db->begin();
+	if (GETPOST("norss", 'int'))
+	{
+		$db->begin();
 
 		// Supprime boite box_external_rss de definition des boites
-        $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."boxes_def";
-        $sql .= " WHERE file = 'box_external_rss.php' AND note LIKE '".$db->escape(GETPOST("norss", 'int'))." %'";
+		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."boxes_def";
+		$sql .= " WHERE file = 'box_external_rss.php' AND note LIKE '".$db->escape(GETPOST("norss", 'int'))." %'";
 
 		$resql = $db->query($sql);
 		if ($resql)
-        {
+		{
 			$num = $db->num_rows($resql);
 			$i = 0;
 			while ($i < $num)
 			{
 				$obj = $db->fetch_object($resql);
 
-		        $sql = "DELETE FROM ".MAIN_DB_PREFIX."boxes";
-		        $sql .= " WHERE entity = ".$conf->entity;
-		        $sql .= " AND box_id = ".$obj->rowid;
+				$sql = "DELETE FROM ".MAIN_DB_PREFIX."boxes";
+				$sql .= " WHERE entity = ".$conf->entity;
+				$sql .= " AND box_id = ".$obj->rowid;
 				$resql = $db->query($sql);
 
-		        $sql = "DELETE FROM ".MAIN_DB_PREFIX."boxes_def";
-		        $sql .= " WHERE rowid = ".$obj->rowid;
+				$sql = "DELETE FROM ".MAIN_DB_PREFIX."boxes_def";
+				$sql .= " WHERE rowid = ".$obj->rowid;
 				$resql = $db->query($sql);
 
 				if (!$resql)
@@ -159,22 +159,22 @@ if ($_POST["delete"])
 			$db->rollback();
 			dol_print_error($db, "sql=".$sql);
 			exit;
-        }
+		}
 
 
 		$result1 = dolibarr_del_const($db, "EXTERNAL_RSS_TITLE_".GETPOST("norss", 'int'), $conf->entity);
 		if ($result1) $result2 = dolibarr_del_const($db, "EXTERNAL_RSS_URLRSS_".GETPOST("norss", 'int'), $conf->entity);
 
-        if ($result1 && $result2)
-        {
-            $db->commit();
-            header("Location: external_rss.php");
-            exit;
-        } else {
-            $db->rollback();
-            dol_print_error($db);
-        }
-    }
+		if ($result1 && $result2)
+		{
+			$db->commit();
+			header("Location: external_rss.php");
+			exit;
+		} else {
+			$db->rollback();
+			dol_print_error($db);
+		}
+	}
 }
 
 
@@ -242,9 +242,9 @@ if ($resql)
 		$idrss = $reg[1];
 		$keyrsstitle = "EXTERNAL_RSS_TITLE_".$idrss;
 		$keyrssurl = "EXTERNAL_RSS_URLRSS_".$idrss;
-        //print "x".$idrss;
+		//print "x".$idrss;
 
-        $rssparser = new RssParser($db);
+		$rssparser = new RssParser($db);
 		$result = $rssparser->parser($conf->global->$keyrssurl, 5, 300, $conf->externalrss->dir_temp);
 
 		print "<br>";
@@ -255,8 +255,8 @@ if ($resql)
 
 		print '<tr class="liste_titre">';
 		print "<td>".$langs->trans("RSS")." ".($i + 1)."</td>";
-        print '<td class="right">';
-        print '<input type="submit" class="button buttongen" name="modify" value="'.$langs->trans("Modify").'">';
+		print '<td class="right">';
+		print '<input type="submit" class="button buttongen" name="modify" value="'.$langs->trans("Modify").'">';
 		print " &nbsp; ";
 		print '<input type="submit" class="button buttongen" name="delete" value="'.$langs->trans("Delete").'">';
 		print '<input type="hidden" name="norss" value="'.$idrss.'">';
@@ -279,8 +279,8 @@ if ($resql)
 		print '<tr class="oddeven">';
 		print "<td>".$langs->trans("Status")."</td>";
 		print "<td>";
-	    if ($result > 0 && empty($rss->error))
-	    {
+		if ($result > 0 && empty($rss->error))
+		{
 			print '<font class="ok">'.$langs->trans("Online").'</div>';
 		} else {
 			print '<font class="error">'.$langs->trans("Offline");
@@ -292,8 +292,8 @@ if ($resql)
 		print '</tr>'."\n";
 
 		// Logo
-	    if ($result > 0 && empty($rss->error))
-	    {
+		if ($result > 0 && empty($rss->error))
+		{
 			print '<tr class="oddeven">';
 			print "<td>".$langs->trans("Logo")."</td>";
 			print '<td>';
diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php
index ff3953822f4..35dd1002b12 100644
--- a/htdocs/admin/facture.php
+++ b/htdocs/admin/facture.php
@@ -802,7 +802,7 @@ print '</table>';
 print "</div>\n";
 
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // End of page
 llxFooter();
diff --git a/htdocs/admin/facture_situation.php b/htdocs/admin/facture_situation.php
index e4f87bbd4be..31966cdb585 100644
--- a/htdocs/admin/facture_situation.php
+++ b/htdocs/admin/facture_situation.php
@@ -60,8 +60,8 @@ include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
 $dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 
 llxHeader(
-    "", $langs->trans("BillsSetup"),
-    'EN:Invoice_Configuration|FR:Configuration_module_facture|ES:ConfiguracionFactura'
+	"", $langs->trans("BillsSetup"),
+	'EN:Invoice_Configuration|FR:Configuration_module_facture|ES:ConfiguracionFactura'
 );
 
 $form = new Form($db);
@@ -113,10 +113,10 @@ _printInputFormPart($confkey, $langs->trans('AllowedInvoiceForRetainedWarranty')
 _printOnOff('INVOICE_RETAINED_WARRANTY_LIMITED_TO_FINAL_SITUATION', $langs->trans('RetainedwarrantyOnlyForSituationFinal'));
 
 $metas = array(
-    'type' => 'number',
-    'step' => '0.01',
-    'min' => 0,
-    'max' => 100
+	'type' => 'number',
+	'step' => '0.01',
+	'min' => 0,
+	'max' => 100
 );
 _printInputFormPart('INVOICE_SITUATION_DEFAULT_RETAINED_WARRANTY_PERCENT', $langs->trans('RetainedwarrantyDefaultPercent'), '', $metas);
 
@@ -140,7 +140,7 @@ _updateBtn();
 
 print '</form>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // End of page
 llxFooter();
@@ -153,10 +153,10 @@ $db->close();
  */
 function _updateBtn()
 {
-    global $langs;
-    print '<div class="center">';
-    print '<input type="submit" class="button" value="'.$langs->trans("Save").'">';
-    print '</div>';
+	global $langs;
+	print '<div class="center">';
+	print '<input type="submit" class="button" value="'.$langs->trans("Save").'">';
+	print '</div>';
 }
 
 /**
@@ -170,18 +170,18 @@ function _updateBtn()
  */
 function _printOnOff($confkey, $title = false, $desc = '')
 {
-    global $langs;
+	global $langs;
 
-    print '<tr class="oddeven">';
-    print '<td>'.($title ? $title : $langs->trans($confkey));
-    if (!empty($desc)) {
-        print '<br><small>'.$langs->trans($desc).'</small>';
-    }
-    print '</td>';
-    print '<td class="center" width="20">&nbsp;</td>';
-    print '<td class="right" width="300">';
-    print ajax_constantonoff($confkey);
-    print '</td></tr>';
+	print '<tr class="oddeven">';
+	print '<td>'.($title ? $title : $langs->trans($confkey));
+	if (!empty($desc)) {
+		print '<br><small>'.$langs->trans($desc).'</small>';
+	}
+	print '</td>';
+	print '<td class="center" width="20">&nbsp;</td>';
+	print '<td class="right" width="300">';
+	print ajax_constantonoff($confkey);
+	print '</td></tr>';
 }
 
 
@@ -199,53 +199,53 @@ function _printOnOff($confkey, $title = false, $desc = '')
  */
 function _printInputFormPart($confkey, $title = false, $desc = '', $metas = array(), $type = 'input', $help = false)
 {
-    global $langs, $conf, $db, $inputCount;
+	global $langs, $conf, $db, $inputCount;
 
-    $inputCount = empty($inputCount) ? 1 : ($inputCount + 1);
-    $form = new Form($db);
+	$inputCount = empty($inputCount) ? 1 : ($inputCount + 1);
+	$form = new Form($db);
 
-    $defaultMetas = array(
-        'name' => 'value'.$inputCount
-    );
+	$defaultMetas = array(
+		'name' => 'value'.$inputCount
+	);
 
-    if ($type != 'textarea') {
-        $defaultMetas['type']   = 'text';
-        $defaultMetas['value']  = $conf->global->{$confkey};
-    }
+	if ($type != 'textarea') {
+		$defaultMetas['type']   = 'text';
+		$defaultMetas['value']  = $conf->global->{$confkey};
+	}
 
 
-    $metas = array_merge($defaultMetas, $metas);
-    $metascompil = '';
-    foreach ($metas as $key => $values) {
-        $metascompil .= ' '.$key.'="'.$values.'" ';
-    }
+	$metas = array_merge($defaultMetas, $metas);
+	$metascompil = '';
+	foreach ($metas as $key => $values) {
+		$metascompil .= ' '.$key.'="'.$values.'" ';
+	}
 
-    print '<tr class="oddeven">';
-    print '<td>';
+	print '<tr class="oddeven">';
+	print '<td>';
 
-    if (!empty($help)) {
-        print $form->textwithtooltip(($title ? $title : $langs->trans($confkey)), $langs->trans($help), 2, 1, img_help(1, ''));
-    } else {
-        print $title ? $title : $langs->trans($confkey);
-    }
+	if (!empty($help)) {
+		print $form->textwithtooltip(($title ? $title : $langs->trans($confkey)), $langs->trans($help), 2, 1, img_help(1, ''));
+	} else {
+		print $title ? $title : $langs->trans($confkey);
+	}
 
-    if (!empty($desc)) {
-        print '<br><small>'.$langs->trans($desc).'</small>';
-    }
+	if (!empty($desc)) {
+		print '<br><small>'.$langs->trans($desc).'</small>';
+	}
 
-    print '</td>';
-    print '<td class="center" width="20">&nbsp;</td>';
-    print '<td class="right" width="300">';
-    print '<input type="hidden" name="param'.$inputCount.'" value="'.$confkey.'">';
+	print '</td>';
+	print '<td class="center" width="20">&nbsp;</td>';
+	print '<td class="right" width="300">';
+	print '<input type="hidden" name="param'.$inputCount.'" value="'.$confkey.'">';
 
-    print '<input type="hidden" name="action" value="setModuleOptions">';
-    if ($type == 'textarea') {
-        print '<textarea '.$metascompil.'  >'.dol_htmlentities($conf->global->{$confkey}).'</textarea>';
+	print '<input type="hidden" name="action" value="setModuleOptions">';
+	if ($type == 'textarea') {
+		print '<textarea '.$metascompil.'  >'.dol_htmlentities($conf->global->{$confkey}).'</textarea>';
 	} elseif ($type == 'input') {
-        print '<input '.$metascompil.'  />';
-    } else {
+		print '<input '.$metascompil.'  />';
+	} else {
 		// custom
 		print $type;
-    }
-    print '</td></tr>';
+	}
+	print '</td></tr>';
 }
diff --git a/htdocs/admin/fckeditor.php b/htdocs/admin/fckeditor.php
index 4c1e495939a..8f4ea7ec9c4 100644
--- a/htdocs/admin/fckeditor.php
+++ b/htdocs/admin/fckeditor.php
@@ -82,23 +82,23 @@ $picto = array(
 
 foreach ($modules as $const => $desc)
 {
-    if ($action == 'activate_'.strtolower($const))
-    {
-        dolibarr_set_const($db, "FCKEDITOR_ENABLE_".$const, "1", 'chaine', 0, '', $conf->entity);
-        // Si fckeditor est active dans la description produit/service, on l'active dans les formulaires
-        if ($const == 'PRODUCTDESC' && !empty($conf->global->PRODUIT_DESC_IN_FORM))
-        {
-            dolibarr_set_const($db, "FCKEDITOR_ENABLE_DETAILS", "1", 'chaine', 0, '', $conf->entity);
-        }
-        header("Location: ".$_SERVER["PHP_SELF"]);
-        exit;
-    }
-    if ($action == 'disable_'.strtolower($const))
-    {
-        dolibarr_del_const($db, "FCKEDITOR_ENABLE_".$const, $conf->entity);
-        header("Location: ".$_SERVER["PHP_SELF"]);
-        exit;
-    }
+	if ($action == 'activate_'.strtolower($const))
+	{
+		dolibarr_set_const($db, "FCKEDITOR_ENABLE_".$const, "1", 'chaine', 0, '', $conf->entity);
+		// Si fckeditor est active dans la description produit/service, on l'active dans les formulaires
+		if ($const == 'PRODUCTDESC' && !empty($conf->global->PRODUIT_DESC_IN_FORM))
+		{
+			dolibarr_set_const($db, "FCKEDITOR_ENABLE_DETAILS", "1", 'chaine', 0, '', $conf->entity);
+		}
+		header("Location: ".$_SERVER["PHP_SELF"]);
+		exit;
+	}
+	if ($action == 'disable_'.strtolower($const))
+	{
+		dolibarr_del_const($db, "FCKEDITOR_ENABLE_".$const, $conf->entity);
+		header("Location: ".$_SERVER["PHP_SELF"]);
+		exit;
+	}
 }
 
 if (GETPOST('save', 'alpha'))
@@ -115,7 +115,7 @@ if (GETPOST('save', 'alpha'))
 	}
 
 	$fckeditor_test = GETPOST('formtestfield');
-    if (!empty($fckeditor_test)) {
+	if (!empty($fckeditor_test)) {
 		if (!dolibarr_set_const($db, 'FCKEDITOR_TEST', $fckeditor_test, 'chaine', 0, '', $conf->entity)) {
 			$error++;
 		}
@@ -124,11 +124,11 @@ if (GETPOST('save', 'alpha'))
 	}
 
 	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');
+	}
 }
 
 /*
@@ -145,80 +145,79 @@ if (empty($conf->use_javascript_ajax))
 {
 	setEventMessages(array($langs->trans("NotAvailable"), $langs->trans("JavascriptDisabled")), null, 'errors');
 } else {
-    print '<table class="noborder centpercent">';
-    print '<tr class="liste_titre">';
-    print '<td colspan="2">'.$langs->trans("ActivateFCKeditor").'</td>';
-    print '<td class="center" width="100">'.$langs->trans("Action").'</td>';
-    print "</tr>\n";
+	print '<table class="noborder centpercent">';
+	print '<tr class="liste_titre">';
+	print '<td colspan="2">'.$langs->trans("ActivateFCKeditor").'</td>';
+	print '<td class="center" width="100">'.$langs->trans("Action").'</td>';
+	print "</tr>\n";
 
-    // Modules
-    foreach ($modules as $const => $desc)
-    {
-        // Si condition non remplie, on ne propose pas l'option
-        if (!$conditions[$const]) continue;
+	// Modules
+	foreach ($modules as $const => $desc)
+	{
+		// Si condition non remplie, on ne propose pas l'option
+		if (!$conditions[$const]) continue;
 
-        print '<tr class="oddeven">';
-        print '<td width="16">'.img_object("", $picto[$const]).'</td>';
-        print '<td>'.$langs->trans($desc).'</td>';
-        print '<td class="center" width="100">';
-        $constante = 'FCKEDITOR_ENABLE_'.$const;
-        $value = (isset($conf->global->$constante) ? $conf->global->$constante : 0);
-        if ($value == 0)
-        {
-            print '<a href="'.$_SERVER['PHP_SELF'].'?action=activate_'.strtolower($const).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
-        } elseif ($value == 1)
-        {
-            print '<a href="'.$_SERVER['PHP_SELF'].'?action=disable_'.strtolower($const).'">'.img_picto($langs->trans("Enabled"), 'switch_on').'</a>';
-        }
+		print '<tr class="oddeven">';
+		print '<td width="16">'.img_object("", $picto[$const]).'</td>';
+		print '<td>'.$langs->trans($desc).'</td>';
+		print '<td class="center" width="100">';
+		$constante = 'FCKEDITOR_ENABLE_'.$const;
+		$value = (isset($conf->global->$constante) ? $conf->global->$constante : 0);
+		if ($value == 0)
+		{
+			print '<a href="'.$_SERVER['PHP_SELF'].'?action=activate_'.strtolower($const).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+		} elseif ($value == 1)
+		{
+			print '<a href="'.$_SERVER['PHP_SELF'].'?action=disable_'.strtolower($const).'">'.img_picto($langs->trans("Enabled"), 'switch_on').'</a>';
+		}
 
-        print "</td>";
-        print '</tr>';
-    }
+		print "</td>";
+		print '</tr>';
+	}
 
-    print '</table>'."\n";
+	print '</table>'."\n";
 
 	print '<br>'."\n";
 
 	print '<form name="formtest" method="POST" action="'.$_SERVER["PHP_SELF"].'">'."\n";
-    print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
 
 	// Skins
-    show_skin(null, 1);
-    print '<br>'."\n";
+	show_skin(null, 1);
+	print '<br>'."\n";
 
-    $listofmodes = array('dolibarr_mailings', 'dolibarr_notes', 'dolibarr_details', 'dolibarr_readonly', 'Full', 'Full_inline');
-    $linkstomode = '';
-    foreach ($listofmodes as $newmode)
-    {
-        if ($linkstomode) $linkstomode .= ' - ';
-        $linkstomode .= '<a href="'.$_SERVER["PHP_SELF"].'?mode='.$newmode.'">';
-        if ($mode == $newmode) $linkstomode .= '<strong>';
-        $linkstomode .= $newmode;
-        if ($mode == $newmode) $linkstomode .= '</strong>';
-        $linkstomode .= '</a>';
-    }
-    $linkstomode .= '';
+	$listofmodes = array('dolibarr_mailings', 'dolibarr_notes', 'dolibarr_details', 'dolibarr_readonly', 'Full', 'Full_inline');
+	$linkstomode = '';
+	foreach ($listofmodes as $newmode)
+	{
+		if ($linkstomode) $linkstomode .= ' - ';
+		$linkstomode .= '<a href="'.$_SERVER["PHP_SELF"].'?mode='.$newmode.'">';
+		if ($mode == $newmode) $linkstomode .= '<strong>';
+		$linkstomode .= $newmode;
+		if ($mode == $newmode) $linkstomode .= '</strong>';
+		$linkstomode .= '</a>';
+	}
+	$linkstomode .= '';
 	print load_fiche_titre($langs->trans("TestSubmitForm"), $linkstomode, '');
-    print '<input type="hidden" name="mode" value="'.dol_escape_htmltag($mode).'">';
-    if ($mode != 'Full_inline')
-    {
-        $uselocalbrowser = true;
-        $readonly = ($mode == 'dolibarr_readonly' ? 1 : 0);
-        $editor = new DolEditor('formtestfield', isset($conf->global->FCKEDITOR_TEST) ? $conf->global->FCKEDITOR_TEST : 'Test', '', 200, $mode, 'In', true, $uselocalbrowser, 1, 120, 8, $readonly);
-        $editor->Create();
-    } else {
-        print '<div style="border: 1px solid #888;" contenteditable="true">';
-        print $conf->global->FCKEDITOR_TEST;
-        print '</div>';
-    }
-    print '<br><div class="center"><input class="button" type="submit" name="save" value="'.$langs->trans("Save").'"></div>'."\n";
-    print '<div id="divforlog"></div>';
-    print '</form>'."\n";
+	print '<input type="hidden" name="mode" value="'.dol_escape_htmltag($mode).'">';
+	if ($mode != 'Full_inline')
+	{
+		$uselocalbrowser = true;
+		$readonly = ($mode == 'dolibarr_readonly' ? 1 : 0);
+		$editor = new DolEditor('formtestfield', isset($conf->global->FCKEDITOR_TEST) ? $conf->global->FCKEDITOR_TEST : 'Test', '', 200, $mode, 'In', true, $uselocalbrowser, 1, 120, 8, $readonly);
+		$editor->Create();
+	} else {
+		print '<div style="border: 1px solid #888;" contenteditable="true">';
+		print $conf->global->FCKEDITOR_TEST;
+		print '</div>';
+	}
+	print '<br><div class="center"><input class="button" type="submit" name="save" value="'.$langs->trans("Save").'"></div>'."\n";
+	print '<div id="divforlog"></div>';
+	print '</form>'."\n";
 
-    // Add env of ckeditor
-    // This is to show how CKEditor detect browser to understand why editor is disabled or not
-    if (1 == 2)		// Change this to enable output
-    {
+	// Add env of ckeditor
+	// This is to show how CKEditor detect browser to understand why editor is disabled or not. To help debug.
+	/*
 	    print '<br><script language="javascript">
 	    function jsdump(obj, id) {
 		    var out = \'\';
@@ -232,6 +231,7 @@ if (empty($conf->use_javascript_ajax))
 	    jsdump(CKEDITOR.env, "divforlog");
 	    </script>';
     }
+    */
 }
 
 // End of page
diff --git a/htdocs/admin/fichinter.php b/htdocs/admin/fichinter.php
index faeaf84cb70..64660b67365 100644
--- a/htdocs/admin/fichinter.php
+++ b/htdocs/admin/fichinter.php
@@ -61,11 +61,11 @@ if ($action == 'updateMask')
 	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');
+	}
 } elseif ($action == 'specimen') // For fiche inter
 {
 	$modele = GETPOST('module', 'alpha');
@@ -78,7 +78,7 @@ if ($action == 'updateMask')
 	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 	foreach ($dirmodels as $reldir)
 	{
-	    $file = dol_buildpath($reldir."core/modules/fichinter/doc/pdf_".$modele.".modules.php", 0);
+		$file = dol_buildpath($reldir."core/modules/fichinter/doc/pdf_".$modele.".modules.php", 0);
 		if (file_exists($file))
 		{
 			$filefound = 1;
@@ -116,7 +116,7 @@ elseif ($action == 'set')
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0)
 	{
-        if ($conf->global->FICHEINTER_ADDON_PDF == "$value") dolibarr_del_const($db, 'FICHEINTER_ADDON_PDF', $conf->entity);
+		if ($conf->global->FICHEINTER_ADDON_PDF == "$value") dolibarr_del_const($db, 'FICHEINTER_ADDON_PDF', $conf->entity);
 	}
 }
 
@@ -150,11 +150,11 @@ elseif ($action == 'setdoc')
 	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');
+	}
 } elseif ($action == 'set_FICHINTER_DRAFT_WATERMARK')
 {
 	$draft = GETPOST('FICHINTER_DRAFT_WATERMARK', 'alpha');
@@ -163,11 +163,11 @@ elseif ($action == 'setdoc')
 	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');
+	}
 } elseif ($action == 'set_FICHINTER_PRINT_PRODUCTS')
 {
 	$val = GETPOST('FICHINTER_PRINT_PRODUCTS', 'alpha');
@@ -176,14 +176,14 @@ elseif ($action == 'setdoc')
 	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');
+	}
 } elseif ($action == 'set_FICHINTER_USE_SERVICE_DURATION') {
 	$val = GETPOST('FICHINTER_USE_SERVICE_DURATION', 'alpha');
-    $res = dolibarr_set_const($db, "FICHINTER_USE_SERVICE_DURATION", ($val == 'on' ? 1 : 0), 'bool', 0, '', $conf->entity);
+	$res = dolibarr_set_const($db, "FICHINTER_USE_SERVICE_DURATION", ($val == 'on' ? 1 : 0), 'bool', 0, '', $conf->entity);
 
 	if (!$res > 0) {
 		$error++;
@@ -195,31 +195,31 @@ elseif ($action == 'setdoc')
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 } elseif ($action == 'set_FICHINTER_WITHOUT_DURATION') {
-    $val = GETPOST('FICHINTER_WITHOUT_DURATION', 'alpha');
-    $res = dolibarr_set_const($db, "FICHINTER_WITHOUT_DURATION", ($val == 'on' ? 1 : 0), 'bool', 0, '', $conf->entity);
+	$val = GETPOST('FICHINTER_WITHOUT_DURATION', 'alpha');
+	$res = dolibarr_set_const($db, "FICHINTER_WITHOUT_DURATION", ($val == 'on' ? 1 : 0), 'bool', 0, '', $conf->entity);
 
-    if (!$res > 0) {
-        $error++;
-    }
+	if (!$res > 0) {
+		$error++;
+	}
 
-    if (!$error) {
-        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    } else {
-        setEventMessages($langs->trans("Error"), null, 'errors');
-    }
+	if (!$error) {
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
+		setEventMessages($langs->trans("Error"), null, 'errors');
+	}
 } elseif ($action == 'set_FICHINTER_DATE_WITHOUT_HOUR') {
-    $val = GETPOST('FICHINTER_DATE_WITHOUT_HOUR', 'alpha');
-    $res = dolibarr_set_const($db, "FICHINTER_DATE_WITHOUT_HOUR", ($val == 'on' ? 1 : 0), 'bool', 0, '', $conf->entity);
+	$val = GETPOST('FICHINTER_DATE_WITHOUT_HOUR', 'alpha');
+	$res = dolibarr_set_const($db, "FICHINTER_DATE_WITHOUT_HOUR", ($val == 'on' ? 1 : 0), 'bool', 0, '', $conf->entity);
 
-    if (!$res > 0) {
-        $error++;
-    }
+	if (!$res > 0) {
+		$error++;
+	}
 
-    if (!$error) {
-        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    } else {
-        setEventMessages($langs->trans("Error"), null, 'errors');
-    }
+	if (!$error) {
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
+		setEventMessages($langs->trans("Error"), null, 'errors');
+	}
 }
 
 
@@ -288,13 +288,13 @@ foreach ($dirmodels as $reldir)
 						print $module->info();
 						print '</td>';
 
-                        // Show example of numbering model
-                        print '<td class="nowrap">';
-                        $tmp = $module->getExample();
-                        if (preg_match('/^Error/', $tmp)) print '<div class="error">'.$langs->trans($tmp).'</div>';
-                        elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
-                        else print $tmp;
-                        print '</td>'."\n";
+						// Show example of numbering model
+						print '<td class="nowrap">';
+						$tmp = $module->getExample();
+						if (preg_match('/^Error/', $tmp)) print '<div class="error">'.$langs->trans($tmp).'</div>';
+						elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
+						else print $tmp;
+						print '</td>'."\n";
 
 						print '<td class="center">';
 						if ($conf->global->FICHEINTER_ADDON == $classname)
@@ -312,16 +312,16 @@ foreach ($dirmodels as $reldir)
 						$htmltooltip = '';
 						$htmltooltip .= ''.$langs->trans("Version").': <b>'.$module->getVersion().'</b><br>';
 						$nextval = $module->getNextValue($mysoc, $ficheinter);
-                        if ("$nextval" != $langs->trans("NotAvailable")) {   // Keep " on nextval
-                            $htmltooltip .= ''.$langs->trans("NextValue").': ';
-                            if ($nextval) {
-                                if (preg_match('/^Error/', $nextval) || $nextval == 'NotConfigured')
-                                    $nextval = $langs->trans($nextval);
-                                $htmltooltip .= $nextval.'<br>';
-                            } else {
-                                $htmltooltip .= $langs->trans($module->error).'<br>';
-                            }
-                        }
+						if ("$nextval" != $langs->trans("NotAvailable")) {   // Keep " on nextval
+							$htmltooltip .= ''.$langs->trans("NextValue").': ';
+							if ($nextval) {
+								if (preg_match('/^Error/', $nextval) || $nextval == 'NotConfigured')
+									$nextval = $langs->trans($nextval);
+								$htmltooltip .= $nextval.'<br>';
+							} else {
+								$htmltooltip .= $langs->trans($module->error).'<br>';
+							}
+						}
 						print '<td class="center">';
 						print $form->textwithpicto('', $htmltooltip, 1, 0);
 						print '</td>';
@@ -399,83 +399,83 @@ foreach ($dirmodels as $reldir)
 			foreach ($filelist as $file)
 			{
 				if (preg_match('/\.modules\.php$/i', $file) && preg_match('/^(pdf_|doc_)/', $file))
-		    	{
-		    		if (file_exists($dir.'/'.$file))
-		    		{
-		    			$name = substr($file, 4, dol_strlen($file) - 16);
-		    			$classname = substr($file, 0, dol_strlen($file) - 12);
+				{
+					if (file_exists($dir.'/'.$file))
+					{
+						$name = substr($file, 4, dol_strlen($file) - 16);
+						$classname = substr($file, 0, dol_strlen($file) - 12);
 
-		    			require_once $dir.'/'.$file;
-		    			$module = new $classname($db);
+						require_once $dir.'/'.$file;
+						$module = new $classname($db);
 
-		    			$modulequalified = 1;
-		    			if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) $modulequalified = 0;
-		    			if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) $modulequalified = 0;
+						$modulequalified = 1;
+						if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) $modulequalified = 0;
+						if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) $modulequalified = 0;
 
-		    			if ($modulequalified)
-		    			{
-		    				print '<tr class="oddeven"><td width="100">';
-		    				print (empty($module->name) ? $name : $module->name);
-		    				print "</td><td>\n";
-		    				if (method_exists($module, 'info')) print $module->info($langs);
-		    				else print $module->description;
-		    				print '</td>';
+						if ($modulequalified)
+						{
+							print '<tr class="oddeven"><td width="100">';
+							print (empty($module->name) ? $name : $module->name);
+							print "</td><td>\n";
+							if (method_exists($module, 'info')) print $module->info($langs);
+							else print $module->description;
+							print '</td>';
 
-		    				// Active
-		    				if (in_array($name, $def))
-		    				{
-		    					print "<td align=\"center\">\n";
-		    					print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">';
-		    					print img_picto($langs->trans("Enabled"), 'switch_on');
-		    					print '</a>';
-		    					print "</td>";
-		    				} else {
-		    					print "<td align=\"center\">\n";
-		    					print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
-		    					print "</td>";
-		    				}
+							// Active
+							if (in_array($name, $def))
+							{
+								print "<td align=\"center\">\n";
+								print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">';
+								print img_picto($langs->trans("Enabled"), 'switch_on');
+								print '</a>';
+								print "</td>";
+							} else {
+								print "<td align=\"center\">\n";
+								print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+								print "</td>";
+							}
 
-		    				// Default
-		    				print "<td align=\"center\">";
-		    				if ($conf->global->FICHEINTER_ADDON_PDF == "$name")
-		    				{
-		    					print img_picto($langs->trans("Default"), 'on');
-		    				} else {
-		    					print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
-		    				}
-		    				print '</td>';
+							// Default
+							print "<td align=\"center\">";
+							if ($conf->global->FICHEINTER_ADDON_PDF == "$name")
+							{
+								print img_picto($langs->trans("Default"), 'on');
+							} else {
+								print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+							}
+							print '</td>';
 
-		    				// Info
-		    				$htmltooltip = ''.$langs->trans("Name").': '.$module->name;
-		    				$htmltooltip .= '<br>'.$langs->trans("Type").': '.($module->type ? $module->type : $langs->trans("Unknown"));
-		    				$htmltooltip .= '<br>'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur;
-		    				$htmltooltip .= '<br>'.$langs->trans("Path").': '.preg_replace('/^\//', '', $realpath).'/'.$file;
+							// Info
+							$htmltooltip = ''.$langs->trans("Name").': '.$module->name;
+							$htmltooltip .= '<br>'.$langs->trans("Type").': '.($module->type ? $module->type : $langs->trans("Unknown"));
+							$htmltooltip .= '<br>'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur;
+							$htmltooltip .= '<br>'.$langs->trans("Path").': '.preg_replace('/^\//', '', $realpath).'/'.$file;
 
-		    				$htmltooltip .= '<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
-		    				$htmltooltip .= '<br>'.$langs->trans("Logo").': '.yn($module->option_logo, 1, 1);
-		    				$htmltooltip .= '<br>'.$langs->trans("PaymentMode").': '.yn($module->option_modereg, 1, 1);
-		    				$htmltooltip .= '<br>'.$langs->trans("PaymentConditions").': '.yn($module->option_condreg, 1, 1);
-		    				$htmltooltip .= '<br>'.$langs->trans("MultiLanguage").': '.yn($module->option_multilang, 1, 1);
-		    				$htmltooltip .= '<br>'.$langs->trans("WatermarkOnDraftOrders").': '.yn($module->option_draft_watermark, 1, 1);
-		    				print '<td class="center">';
-		    				print $form->textwithpicto('', $htmltooltip, -1, 0);
-		    				print '</td>';
+							$htmltooltip .= '<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
+							$htmltooltip .= '<br>'.$langs->trans("Logo").': '.yn($module->option_logo, 1, 1);
+							$htmltooltip .= '<br>'.$langs->trans("PaymentMode").': '.yn($module->option_modereg, 1, 1);
+							$htmltooltip .= '<br>'.$langs->trans("PaymentConditions").': '.yn($module->option_condreg, 1, 1);
+							$htmltooltip .= '<br>'.$langs->trans("MultiLanguage").': '.yn($module->option_multilang, 1, 1);
+							$htmltooltip .= '<br>'.$langs->trans("WatermarkOnDraftOrders").': '.yn($module->option_draft_watermark, 1, 1);
+							print '<td class="center">';
+							print $form->textwithpicto('', $htmltooltip, -1, 0);
+							print '</td>';
 
-		    				// Preview
-		    				print '<td class="center">';
-		    				if ($module->type == 'pdf')
-		    				{
-		    					print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'intervention').'</a>';
-		    				} else {
-		    					print img_object($langs->trans("PreviewNotAvailable"), 'generic');
-		    				}
-		    				print '</td>';
+							// Preview
+							print '<td class="center">';
+							if ($module->type == 'pdf')
+							{
+								print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'intervention').'</a>';
+							} else {
+								print img_object($langs->trans("PreviewNotAvailable"), 'generic');
+							}
+							print '</td>';
 
-		    				print '</tr>';
-		    			}
-		    		}
-		    	}
-		    }
+							print '</tr>';
+						}
+					}
+				}
+			}
 		}
 	}
 }
@@ -509,11 +509,11 @@ print $form->textwithpicto($langs->trans("FreeLegalTextOnInterventions"), $langs
 $variablename = 'FICHINTER_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/geoipmaxmind.php b/htdocs/admin/geoipmaxmind.php
index 6b8fe0ab3b7..63d15169da2 100644
--- a/htdocs/admin/geoipmaxmind.php
+++ b/htdocs/admin/geoipmaxmind.php
@@ -47,7 +47,7 @@ if ($action == 'set')
 
 	$gimcdf = GETPOST("GEOIPMAXMIND_COUNTRY_DATAFILE");
 
-	if (!$error && $gimcdf && ! preg_match('/\.(dat|mmdb)$/', $gimcdf)) {
+	if (!$error && $gimcdf && !preg_match('/\.(dat|mmdb)$/', $gimcdf)) {
 		setEventMessages($langs->trans("ErrorFileMustHaveFormat", '.dat|.mmdb'), null, 'errors');
 		$error++;
 	}
diff --git a/htdocs/admin/holiday.php b/htdocs/admin/holiday.php
index 87319d7b5dd..44b7034064b 100644
--- a/htdocs/admin/holiday.php
+++ b/htdocs/admin/holiday.php
@@ -282,7 +282,7 @@ print '<br>';
 
 
 if ($conf->global->MAIN_FEATURES_LEVEL < 2) {
-	dol_fiche_end();
+	print dol_get_fiche_end();
 	// End of page
 	llxFooter();
 	$db->close();
@@ -501,7 +501,7 @@ print '</form>';
 
 
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // End of page
 llxFooter();
diff --git a/htdocs/admin/holiday_extrafields.php b/htdocs/admin/holiday_extrafields.php
index 4c7ef209e21..077ad08a12a 100644
--- a/htdocs/admin/holiday_extrafields.php
+++ b/htdocs/admin/holiday_extrafields.php
@@ -74,15 +74,15 @@ print dol_get_fiche_head($head, 'attributes', $langs->trans("Holidays"), -1, 'ho
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_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/ihm.php b/htdocs/admin/ihm.php
index f7db2a8b4e9..4fd8963344d 100644
--- a/htdocs/admin/ihm.php
+++ b/htdocs/admin/ihm.php
@@ -122,7 +122,7 @@ if ($action == 'update')
 	if ($val == '') dolibarr_del_const($db, 'THEME_ELDY_TEXTTITLE', $conf->entity);
 	else dolibarr_set_const($db, 'THEME_ELDY_TEXTTITLE', $val, 'chaine', 0, '', $conf->entity);
 
-	$val=(implode(',', (colorStringToArray(GETPOST('THEME_ELDY_TEXTTITLELINK'), array()))));
+	$val = (implode(',', (colorStringToArray(GETPOST('THEME_ELDY_TEXTTITLELINK'), array()))));
 	if ($val == '') dolibarr_del_const($db, 'THEME_ELDY_TEXTTITLELINK', $conf->entity);
 	else dolibarr_set_const($db, 'THEME_ELDY_TEXTTITLELINK', $val, 'chaine', 0, '', $conf->entity);
 
diff --git a/htdocs/admin/import.php b/htdocs/admin/import.php
index 598bab92c10..e70d8eadbba 100644
--- a/htdocs/admin/import.php
+++ b/htdocs/admin/import.php
@@ -93,7 +93,7 @@ print '</table>';
 
 print '</form>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // End of page
 llxFooter();
diff --git a/htdocs/admin/index.php b/htdocs/admin/index.php
index 1a27d61e55d..44bfd678fb4 100644
--- a/htdocs/admin/index.php
+++ b/htdocs/admin/index.php
@@ -47,24 +47,24 @@ print load_fiche_titre($langs->trans("SetupArea"), '', 'tools');
 
 if (!empty($conf->global->MAIN_MOTD_SETUPPAGE))
 {
-    $conf->global->MAIN_MOTD_SETUPPAGE = preg_replace('/<br(\s[\sa-zA-Z_="]*)?\/?>/i', '<br>', $conf->global->MAIN_MOTD_SETUPPAGE);
-    if (!empty($conf->global->MAIN_MOTD_SETUPPAGE))
-    {
-    	$i = 0;
-    	while (preg_match('/__\(([a-zA-Z|@]+)\)__/i', $conf->global->MAIN_MOTD_SETUPPAGE, $reg) && $i < 100)
-    	{
-    		$tmp = explode('|', $reg[1]);
-    		if (!empty($tmp[1])) $langs->load($tmp[1]);
-    		$conf->global->MAIN_MOTD_SETUPPAGE = preg_replace('/__\('.preg_quote($reg[1]).'\)__/i', $langs->trans($tmp[0]), $conf->global->MAIN_MOTD_SETUPPAGE);
-    		$i++;
-    	}
+	$conf->global->MAIN_MOTD_SETUPPAGE = preg_replace('/<br(\s[\sa-zA-Z_="]*)?\/?>/i', '<br>', $conf->global->MAIN_MOTD_SETUPPAGE);
+	if (!empty($conf->global->MAIN_MOTD_SETUPPAGE))
+	{
+		$i = 0;
+		while (preg_match('/__\(([a-zA-Z|@]+)\)__/i', $conf->global->MAIN_MOTD_SETUPPAGE, $reg) && $i < 100)
+		{
+			$tmp = explode('|', $reg[1]);
+			if (!empty($tmp[1])) $langs->load($tmp[1]);
+			$conf->global->MAIN_MOTD_SETUPPAGE = preg_replace('/__\('.preg_quote($reg[1]).'\)__/i', $langs->trans($tmp[0]), $conf->global->MAIN_MOTD_SETUPPAGE);
+			$i++;
+		}
 
-    	print "\n<!-- Start of welcome text for setup page -->\n";
-        print '<table width="100%" class="notopnoleftnoright"><tr><td>';
-        print dol_htmlentitiesbr($conf->global->MAIN_MOTD_SETUPPAGE);
-        print '</td></tr></table><br>';
-        print "\n<!-- End of welcome text for setup page -->\n";
-    }
+		print "\n<!-- Start of welcome text for setup page -->\n";
+		print '<table width="100%" class="notopnoleftnoright"><tr><td>';
+		print dol_htmlentitiesbr($conf->global->MAIN_MOTD_SETUPPAGE);
+		print '</td></tr></table><br>';
+		print "\n<!-- End of welcome text for setup page -->\n";
+	}
 }
 
 print '<span class="opacitymedium hideonsmartphone">';
@@ -109,7 +109,7 @@ print $hookmanager->resPrint;
 if (empty($reshook))
 {
 	// Show into other
-    print '<span class="opacitymedium">'.$langs->trans("SetupDescription5")."</span><br>";
+	print '<span class="opacitymedium">'.$langs->trans("SetupDescription5")."</span><br>";
 	print "<br>";
 
 	// Show logo
diff --git a/htdocs/admin/ldap.php b/htdocs/admin/ldap.php
index 8bab5c4e968..b8c207644c6 100644
--- a/htdocs/admin/ldap.php
+++ b/htdocs/admin/ldap.php
@@ -251,7 +251,7 @@ print '</td><td>'.$langs->trans('Password').' (ex: secret)</td></tr>';
 
 print '</table>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></div>';
 
diff --git a/htdocs/admin/ldap_contacts.php b/htdocs/admin/ldap_contacts.php
index 8923bb26d20..b29fa00e49e 100644
--- a/htdocs/admin/ldap_contacts.php
+++ b/htdocs/admin/ldap_contacts.php
@@ -246,7 +246,7 @@ print '</table>';
 
 print info_admin($langs->trans("LDAPDescValues"));
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></div>';
 
diff --git a/htdocs/admin/ldap_groups.php b/htdocs/admin/ldap_groups.php
index 9a3aa4c706a..61d2e8b69e9 100644
--- a/htdocs/admin/ldap_groups.php
+++ b/htdocs/admin/ldap_groups.php
@@ -61,19 +61,19 @@ if ($action == 'setvalue' && $user->admin)
 	if (!dolibarr_set_const($db, 'LDAP_GROUP_FIELD_GROUPID', GETPOST("fieldgroupid", 'alphanohtml'), '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_GROUPS', $valkey, 'chaine', 0, '', $conf->entity)) $error++;
+	$valkey = '';
+	$key = GETPOST("key");
+	if ($key) $valkey = $conf->global->$key;
+	if (!dolibarr_set_const($db, 'LDAP_KEY_GROUPS', $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);
+	}
 }
 
 
@@ -180,7 +180,7 @@ print '</table>';
 
 print info_admin($langs->trans("LDAPDescValues"));
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></div>';
 
diff --git a/htdocs/admin/ldap_members.php b/htdocs/admin/ldap_members.php
index 3bcd6c27dbc..214a4f2cb9b 100644
--- a/htdocs/admin/ldap_members.php
+++ b/htdocs/admin/ldap_members.php
@@ -366,7 +366,7 @@ print '</table>';
 
 print info_admin($langs->trans("LDAPDescValues"));
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></div>';
 
diff --git a/htdocs/admin/ldap_members_types.php b/htdocs/admin/ldap_members_types.php
index 3641947d6d1..489e6047f9b 100644
--- a/htdocs/admin/ldap_members_types.php
+++ b/htdocs/admin/ldap_members_types.php
@@ -162,7 +162,7 @@ print '</table>';
 
 print info_admin($langs->trans("LDAPDescValues"));
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></div>';
 
diff --git a/htdocs/admin/ldap_users.php b/htdocs/admin/ldap_users.php
index a46c98645e1..efb34cca413 100644
--- a/htdocs/admin/ldap_users.php
+++ b/htdocs/admin/ldap_users.php
@@ -336,7 +336,7 @@ print '</table>';
 
 print info_admin($langs->trans("LDAPDescValues"));
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></div>';
 
diff --git a/htdocs/admin/limits.php b/htdocs/admin/limits.php
index 89d0c58e4df..ce918583d96 100644
--- a/htdocs/admin/limits.php
+++ b/htdocs/admin/limits.php
@@ -35,8 +35,8 @@ $action = GETPOST('action', 'aZ09');
 $currencycode = GETPOST('currencycode', 'alpha');
 
 if (!empty($conf->multicurrency->enabled) && !empty($conf->global->MULTICURRENCY_USE_LIMIT_BY_CURRENCY)) {
-    // When MULTICURRENCY_USE_LIMIT_BY_CURRENCY is on, we use always a defined currency code instead of '' even for default.
-    $currencycode = (!empty($currencycode) ? $currencycode : $conf->currency);
+	// When MULTICURRENCY_USE_LIMIT_BY_CURRENCY is on, we use always a defined currency code instead of '' even for default.
+	$currencycode = (!empty($currencycode) ? $currencycode : $conf->currency);
 }
 
 $mainmaxdecimalsunit = 'MAIN_MAX_DECIMALS_UNIT'.(!empty($currencycode) ? '_'.$currencycode : '');
@@ -56,41 +56,41 @@ if ($action == 'update')
 	if ($_POST[$mainmaxdecimalsunit] > $MAXDEC
 	|| $_POST[$mainmaxdecimalstot] > $MAXDEC
 	|| $_POST[$mainmaxdecimalsshown] > $MAXDEC)
-    {
-        $error++;
-	    setEventMessages($langs->trans("ErrorDecimalLargerThanAreForbidden", $MAXDEC), null, 'errors');
-    }
+	{
+		$error++;
+		setEventMessages($langs->trans("ErrorDecimalLargerThanAreForbidden", $MAXDEC), null, 'errors');
+	}
 
-    if ($_POST[$mainmaxdecimalsunit].(!empty($currencycode) ? '_'.$currencycode : '') < 0
-    || $_POST[$mainmaxdecimalstot] < 0
-    || $_POST[$mainmaxdecimalsshown] < 0)
-    {
-        $langs->load("errors");
-        $error++;
-	    setEventMessages($langs->trans("ErrorNegativeValueNotAllowed"), null, 'errors');
-    }
+	if ($_POST[$mainmaxdecimalsunit].(!empty($currencycode) ? '_'.$currencycode : '') < 0
+	|| $_POST[$mainmaxdecimalstot] < 0
+	|| $_POST[$mainmaxdecimalsshown] < 0)
+	{
+		$langs->load("errors");
+		$error++;
+		setEventMessages($langs->trans("ErrorNegativeValueNotAllowed"), null, 'errors');
+	}
 
-    if ($valmainroundingruletot)
-    {
-        if ($valmainroundingruletot * pow(10, $valmainmaxdecimalstot) < 1)
-        {
-            $langs->load("errors");
-            $error++;
-	        setEventMessages($langs->trans("ErrorMAIN_ROUNDING_RULE_TOTCanMAIN_MAX_DECIMALS_TOT"), null, 'errors');
-        }
-    }
+	if ($valmainroundingruletot)
+	{
+		if ($valmainroundingruletot * pow(10, $valmainmaxdecimalstot) < 1)
+		{
+			$langs->load("errors");
+			$error++;
+			setEventMessages($langs->trans("ErrorMAIN_ROUNDING_RULE_TOTCanMAIN_MAX_DECIMALS_TOT"), null, 'errors');
+		}
+	}
 
-    if (!$error)
-    {
-        dolibarr_set_const($db, $mainmaxdecimalsunit, $valmainmaxdecimalsunit, 'chaine', 0, '', $conf->entity);
-        dolibarr_set_const($db, $mainmaxdecimalstot, $valmainmaxdecimalstot, 'chaine', 0, '', $conf->entity);
-        dolibarr_set_const($db, $mainmaxdecimalsshown, $valmainmaxdecimalsshown, 'chaine', 0, '', $conf->entity);
+	if (!$error)
+	{
+		dolibarr_set_const($db, $mainmaxdecimalsunit, $valmainmaxdecimalsunit, 'chaine', 0, '', $conf->entity);
+		dolibarr_set_const($db, $mainmaxdecimalstot, $valmainmaxdecimalstot, 'chaine', 0, '', $conf->entity);
+		dolibarr_set_const($db, $mainmaxdecimalsshown, $valmainmaxdecimalsshown, 'chaine', 0, '', $conf->entity);
 
-    	dolibarr_set_const($db, $mainroundingruletot, $valmainroundingruletot, 'chaine', 0, '', $conf->entity);
+		dolibarr_set_const($db, $mainroundingruletot, $valmainroundingruletot, 'chaine', 0, '', $conf->entity);
 
-        header("Location: ".$_SERVER["PHP_SELF"]."?mainmenu=home&leftmenu=setup".(!empty($currencycode) ? '&currencycode='.$currencycode : ''));
-        exit;
-    }
+		header("Location: ".$_SERVER["PHP_SELF"]."?mainmenu=home&leftmenu=setup".(!empty($currencycode) ? '&currencycode='.$currencycode : ''));
+		exit;
+	}
 }
 
 
@@ -134,74 +134,74 @@ print "<br>\n";
 
 if ($action == 'edit')
 {
-    print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    print '<input type="hidden" name="action" value="update">';
-    if (!empty($conf->multicurrency->enabled) && !empty($conf->global->MULTICURRENCY_USE_LIMIT_BY_CURRENCY)) {
-    	print '<input type="hidden" name="currencycode" value="'.$currencycode.'">';
-    }
+	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="action" value="update">';
+	if (!empty($conf->multicurrency->enabled) && !empty($conf->global->MULTICURRENCY_USE_LIMIT_BY_CURRENCY)) {
+		print '<input type="hidden" name="currencycode" value="'.$currencycode.'">';
+	}
 
-    clearstatcache();
+	clearstatcache();
 
-    print '<table class="noborder centpercent">';
-    print '<tr class="liste_titre"><td>'.$langs->trans("Parameters").'</td><td>'.$langs->trans("Value").'</td></tr>';
+	print '<table class="noborder centpercent">';
+	print '<tr class="liste_titre"><td>'.$langs->trans("Parameters").'</td><td>'.$langs->trans("Value").'</td></tr>';
 
-    print '<tr class="oddeven"><td>';
-    print $form->textwithpicto($langs->trans("MAIN_MAX_DECIMALS_UNIT"), $langs->trans("ParameterActiveForNextInputOnly"));
-    print '</td><td><input class="flat" name="'.$mainmaxdecimalsunit.'" size="3" value="'.(isset($conf->global->$mainmaxdecimalsunit) ? $conf->global->$mainmaxdecimalsunit : $conf->global->MAIN_MAX_DECIMALS_UNIT).'"></td></tr>';
+	print '<tr class="oddeven"><td>';
+	print $form->textwithpicto($langs->trans("MAIN_MAX_DECIMALS_UNIT"), $langs->trans("ParameterActiveForNextInputOnly"));
+	print '</td><td><input class="flat" name="'.$mainmaxdecimalsunit.'" size="3" value="'.(isset($conf->global->$mainmaxdecimalsunit) ? $conf->global->$mainmaxdecimalsunit : $conf->global->MAIN_MAX_DECIMALS_UNIT).'"></td></tr>';
 
-    print '<tr class="oddeven"><td>';
-    print $form->textwithpicto($langs->trans("MAIN_MAX_DECIMALS_TOT"), $langs->trans("ParameterActiveForNextInputOnly"));
-    print '</td><td><input class="flat" name="'.$mainmaxdecimalstot.'" size="3" value="'.(isset($conf->global->$mainmaxdecimalstot) ? $conf->global->$mainmaxdecimalstot : $conf->global->MAIN_MAX_DECIMALS_TOT).'"></td></tr>';
+	print '<tr class="oddeven"><td>';
+	print $form->textwithpicto($langs->trans("MAIN_MAX_DECIMALS_TOT"), $langs->trans("ParameterActiveForNextInputOnly"));
+	print '</td><td><input class="flat" name="'.$mainmaxdecimalstot.'" size="3" value="'.(isset($conf->global->$mainmaxdecimalstot) ? $conf->global->$mainmaxdecimalstot : $conf->global->MAIN_MAX_DECIMALS_TOT).'"></td></tr>';
 
-    print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAX_DECIMALS_SHOWN").'</td>';
-    print '<td><input class="flat" name="'.$mainmaxdecimalsshown.'" size="3" value="'.(isset($conf->global->$mainmaxdecimalsshown) ? $conf->global->$mainmaxdecimalsshown : $conf->global->MAIN_MAX_DECIMALS_SHOWN).'"></td></tr>';
+	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAX_DECIMALS_SHOWN").'</td>';
+	print '<td><input class="flat" name="'.$mainmaxdecimalsshown.'" size="3" value="'.(isset($conf->global->$mainmaxdecimalsshown) ? $conf->global->$mainmaxdecimalsshown : $conf->global->MAIN_MAX_DECIMALS_SHOWN).'"></td></tr>';
 
-    print '<tr class="oddeven"><td>';
-    print $form->textwithpicto($langs->trans("MAIN_ROUNDING_RULE_TOT"), $langs->trans("ParameterActiveForNextInputOnly"));
-    print '</td><td><input class="flat" name="'.$mainroundingruletot.'" size="3" value="'.(isset($conf->global->$mainroundingruletot) ? $conf->global->$mainroundingruletot : $conf->global->MAIN_ROUNDING_RULE_TOT).'"></td></tr>';
+	print '<tr class="oddeven"><td>';
+	print $form->textwithpicto($langs->trans("MAIN_ROUNDING_RULE_TOT"), $langs->trans("ParameterActiveForNextInputOnly"));
+	print '</td><td><input class="flat" name="'.$mainroundingruletot.'" size="3" value="'.(isset($conf->global->$mainroundingruletot) ? $conf->global->$mainroundingruletot : $conf->global->MAIN_ROUNDING_RULE_TOT).'"></td></tr>';
 
-    print '</table>';
+	print '</table>';
 
-    print '<br>';
-    print '<div class="center">';
-    print '<input class="button" type="submit" value="'.$langs->trans("Save").'">';
-    print '</div>';
+	print '<br>';
+	print '<div class="center">';
+	print '<input class="button" type="submit" value="'.$langs->trans("Save").'">';
+	print '</div>';
 	print '<br>';
 
-    print '</form>';
-    print '<br>';
+	print '</form>';
+	print '<br>';
 } else {
-    print '<table class="noborder centpercent">';
-    print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
+	print '<table class="noborder centpercent">';
+	print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
 
-    print '<tr class="oddeven"><td>';
-    print $form->textwithpicto($langs->trans("MAIN_MAX_DECIMALS_UNIT"), $langs->trans("ParameterActiveForNextInputOnly"));
-    print '</td><td align="right">'.(isset($conf->global->$mainmaxdecimalsunit) ? $conf->global->$mainmaxdecimalsunit : $conf->global->MAIN_MAX_DECIMALS_UNIT).'</td></tr>';
+	print '<tr class="oddeven"><td>';
+	print $form->textwithpicto($langs->trans("MAIN_MAX_DECIMALS_UNIT"), $langs->trans("ParameterActiveForNextInputOnly"));
+	print '</td><td align="right">'.(isset($conf->global->$mainmaxdecimalsunit) ? $conf->global->$mainmaxdecimalsunit : $conf->global->MAIN_MAX_DECIMALS_UNIT).'</td></tr>';
 
-    print '<tr class="oddeven"><td>';
-    print $form->textwithpicto($langs->trans("MAIN_MAX_DECIMALS_TOT"), $langs->trans("ParameterActiveForNextInputOnly"));
-    print '</td><td align="right">'.(isset($conf->global->$mainmaxdecimalstot) ? $conf->global->$mainmaxdecimalstot : $conf->global->MAIN_MAX_DECIMALS_TOT).'</td></tr>';
+	print '<tr class="oddeven"><td>';
+	print $form->textwithpicto($langs->trans("MAIN_MAX_DECIMALS_TOT"), $langs->trans("ParameterActiveForNextInputOnly"));
+	print '</td><td align="right">'.(isset($conf->global->$mainmaxdecimalstot) ? $conf->global->$mainmaxdecimalstot : $conf->global->MAIN_MAX_DECIMALS_TOT).'</td></tr>';
 
-    print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAX_DECIMALS_SHOWN").'</td>';
-    print '<td align="right">'.(isset($conf->global->$mainmaxdecimalsshown) ? $conf->global->$mainmaxdecimalsshown : $conf->global->MAIN_MAX_DECIMALS_SHOWN).'</td></tr>';
+	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAX_DECIMALS_SHOWN").'</td>';
+	print '<td align="right">'.(isset($conf->global->$mainmaxdecimalsshown) ? $conf->global->$mainmaxdecimalsshown : $conf->global->MAIN_MAX_DECIMALS_SHOWN).'</td></tr>';
 
-    print '<tr class="oddeven"><td>';
-    print $form->textwithpicto($langs->trans("MAIN_ROUNDING_RULE_TOT"), $langs->trans("ParameterActiveForNextInputOnly"));
-    print '</td><td align="right">'.(isset($conf->global->$mainroundingruletot) ? $conf->global->$mainroundingruletot : $conf->global->MAIN_ROUNDING_RULE_TOT).'</td></tr>';
+	print '<tr class="oddeven"><td>';
+	print $form->textwithpicto($langs->trans("MAIN_ROUNDING_RULE_TOT"), $langs->trans("ParameterActiveForNextInputOnly"));
+	print '</td><td align="right">'.(isset($conf->global->$mainroundingruletot) ? $conf->global->$mainroundingruletot : $conf->global->MAIN_ROUNDING_RULE_TOT).'</td></tr>';
 
-    print '</table>';
+	print '</table>';
 
-    print '<div class="tabsAction">';
-    print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit'.(!empty($currencycode) ? '&currencycode='.$currencycode : '').'">'.$langs->trans("Modify").'</a>';
-    print '</div>';
+	print '<div class="tabsAction">';
+	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit'.(!empty($currencycode) ? '&currencycode='.$currencycode : '').'">'.$langs->trans("Modify").'</a>';
+	print '</div>';
 }
 
 if (!empty($conf->multicurrency->enabled) && !empty($conf->global->MULTICURRENCY_USE_LIMIT_BY_CURRENCY))
 {
 	if (!empty($aCurrencies) && count($aCurrencies) > 1)
 	{
-		dol_fiche_end();
+		print dol_get_fiche_end();
 	}
 }
 
@@ -248,59 +248,59 @@ if (empty($mysoc->country_code))
 	$resql = $db->query($sql);
 	if ($resql)
 	{
-	    $num = $db->num_rows($resql);
-	    if ($num)
-	    {
-	        for ($i = 0; $i < $num; $i++)
-	        {
-	            $obj = $db->fetch_object($resql);
-	            $vat_rates[] = array('vat_rate'=>$obj->vat_rate, 'code'=>$obj->vat_code, 'localtax_rate1'=>$obj->localtax_rate1, 'locltax_rate2'=>$obj->localtax_rate2);
-	        }
-	    }
+		$num = $db->num_rows($resql);
+		if ($num)
+		{
+			for ($i = 0; $i < $num; $i++)
+			{
+				$obj = $db->fetch_object($resql);
+				$vat_rates[] = array('vat_rate'=>$obj->vat_rate, 'code'=>$obj->vat_code, 'localtax_rate1'=>$obj->localtax_rate1, 'locltax_rate2'=>$obj->localtax_rate2);
+			}
+		}
 	} else dol_print_error($db);
 
 	if (count($vat_rates))
 	{
-	    foreach ($vat_rates as $vatarray)
-	    {
-	        $vat = $vatarray['vat_rate'];
-	        for ($qty = 1; $qty <= 2; $qty++)
-	        {
-	            $vattxt = $vat.($vatarray['code'] ? ' ('.$vatarray['code'].')' : '');
+		foreach ($vat_rates as $vatarray)
+		{
+			$vat = $vatarray['vat_rate'];
+			for ($qty = 1; $qty <= 2; $qty++)
+			{
+				$vattxt = $vat.($vatarray['code'] ? ' ('.$vatarray['code'].')' : '');
 
-	            $localtax_array = getLocalTaxesFromRate($vattxt, 0, $mysoc, $mysoc);
+				$localtax_array = getLocalTaxesFromRate($vattxt, 0, $mysoc, $mysoc);
 
-	            $s = 10 / 3;
-	            $tmparray = calcul_price_total($qty, price2num($s, 'MU'), 0, $vat, -1, -1, 0, 'HT', 0, 0, $mysoc, $localtax_array);
-	            print '<span class="opacitymedium">'.$langs->trans("UnitPriceOfProduct").":</span> ".price2num($s, 'MU');
-	            print " x ".$langs->trans("Quantity").": ".$qty;
-	            print " - ".$langs->trans("VAT").": ".$vat.'%';
-	            print ($vatarray['code'] ? ' ('.$vatarray['code'].')' : '');
-	            print ' &nbsp; -> &nbsp; <span class="opacitymedium">'.$langs->trans("TotalPriceAfterRounding").":</span> ";
-	            print $tmparray[0].' / '.$tmparray[1].($tmparray[9] ? '+'.$tmparray[9] : '').($tmparray[10] ? '+'.$tmparray[10] : '').' / '.$tmparray[2];
-	            print "<br>\n";
-	        }
-	    }
+				$s = 10 / 3;
+				$tmparray = calcul_price_total($qty, price2num($s, 'MU'), 0, $vat, -1, -1, 0, 'HT', 0, 0, $mysoc, $localtax_array);
+				print '<span class="opacitymedium">'.$langs->trans("UnitPriceOfProduct").":</span> ".price2num($s, 'MU');
+				print " x ".$langs->trans("Quantity").": ".$qty;
+				print " - ".$langs->trans("VAT").": ".$vat.'%';
+				print ($vatarray['code'] ? ' ('.$vatarray['code'].')' : '');
+				print ' &nbsp; -> &nbsp; <span class="opacitymedium">'.$langs->trans("TotalPriceAfterRounding").":</span> ";
+				print $tmparray[0].' / '.$tmparray[1].($tmparray[9] ? '+'.$tmparray[9] : '').($tmparray[10] ? '+'.$tmparray[10] : '').' / '.$tmparray[2];
+				print "<br>\n";
+			}
+		}
 	} else {
-	    // More examples if not specific vat rate found
-	    // This example must be kept for test purpose with current value because value used (2/7, 10/3, and vat 0, 10)
-	    // were calculated to show all possible cases of rounding. If we change this, examples becomes useless or show the same rounding rule.
+		// More examples if not specific vat rate found
+		// This example must be kept for test purpose with current value because value used (2/7, 10/3, and vat 0, 10)
+		// were calculated to show all possible cases of rounding. If we change this, examples becomes useless or show the same rounding rule.
 
-	    $localtax_array = array();
+		$localtax_array = array();
 
-	    $s = 10 / 3; $qty = 1; $vat = 10;
-	    $tmparray = calcul_price_total($qty, price2num($s, 'MU'), 0, $vat, -1, -1, 0, 'HT', 0, 0, $mysoc, $localtax_array);
-	    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; <span class="opacitymedium">'.$langs->trans("TotalPriceAfterRounding").": ".$tmparray[0].' / '.$tmparray[1].' / '.$tmparray[2]."<br>\n";
+		$s = 10 / 3; $qty = 1; $vat = 10;
+		$tmparray = calcul_price_total($qty, price2num($s, 'MU'), 0, $vat, -1, -1, 0, 'HT', 0, 0, $mysoc, $localtax_array);
+		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; <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($qty, price2num($s, 'MU'), 0, $vat, -1, -1, 0, 'HT', 0, 0, $mysoc, $localtax_array);
-	    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; <span class="opacitymedium">'.$langs->trans("TotalPriceAfterRounding").":</span> ".$tmparray[0].' / '.$tmparray[1].' / '.$tmparray[2]."<br>\n";
+		$s = 10 / 3; $qty = 2; $vat = 10;
+		$tmparray = calcul_price_total($qty, price2num($s, 'MU'), 0, $vat, -1, -1, 0, 'HT', 0, 0, $mysoc, $localtax_array);
+		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; <span class="opacitymedium">'.$langs->trans("TotalPriceAfterRounding").":</span> ".$tmparray[0].' / '.$tmparray[1].' / '.$tmparray[2]."<br>\n";
 	}
 }
 
diff --git a/htdocs/admin/loan.php b/htdocs/admin/loan.php
index a138d9d0bf2..ee358300ca4 100644
--- a/htdocs/admin/loan.php
+++ b/htdocs/admin/loan.php
@@ -33,7 +33,7 @@ $langs->loadLangs(array('admin', 'loan'));
 
 // Security check
 if (!$user->admin)
-    accessforbidden();
+	accessforbidden();
 
 $action = GETPOST('action', 'aZ09');
 
@@ -50,22 +50,22 @@ $list = array(
 
 if ($action == 'update')
 {
-    $error = 0;
+	$error = 0;
 
-    foreach ($list as $constname) {
-        $constvalue = GETPOST($constname, 'alpha');
+	foreach ($list as $constname) {
+		$constvalue = GETPOST($constname, 'alpha');
 
-        if (!dolibarr_set_const($db, $constname, $constvalue, 'chaine', 0, '', $conf->entity)) {
-            $error++;
-        }
-    }
+		if (!dolibarr_set_const($db, $constname, $constvalue, 'chaine', 0, '', $conf->entity)) {
+			$error++;
+		}
+	}
 
-    if (!$error)
-    {
-        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    } else {
-        setEventMessages($langs->trans("Error"), null, 'errors');
-    }
+	if (!$error)
+	{
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
+		setEventMessages($langs->trans("Error"), null, 'errors');
+	}
 }
 
 /*
diff --git a/htdocs/admin/mailman.php b/htdocs/admin/mailman.php
index 977d27c0866..8070beab59b 100644
--- a/htdocs/admin/mailman.php
+++ b/htdocs/admin/mailman.php
@@ -63,53 +63,53 @@ if ($action == 'update' || $action == 'add')
 	}
 
  	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');
+	}
 }
 
 // Action activation d'un sous module du module adherent
 if ($action == 'set')
 {
-    $result = dolibarr_set_const($db, $_GET["name"], $_GET["value"], '', 0, '', $conf->entity);
-    if ($result < 0)
-    {
-        dol_print_error($db);
-    }
+	$result = dolibarr_set_const($db, $_GET["name"], $_GET["value"], '', 0, '', $conf->entity);
+	if ($result < 0)
+	{
+		dol_print_error($db);
+	}
 }
 
 // Action desactivation d'un sous module du module adherent
 if ($action == 'unset')
 {
-    $result = dolibarr_del_const($db, $_GET["name"], $conf->entity);
-    if ($result < 0)
-    {
-        dol_print_error($db);
-    }
+	$result = dolibarr_del_const($db, $_GET["name"], $conf->entity);
+	if ($result < 0)
+	{
+		dol_print_error($db);
+	}
 }
 
 if (($action == 'testsubscribe' || $action == 'testunsubscribe') && !empty($conf->global->ADHERENT_USE_MAILMAN))
 {
-    $email = GETPOST($action.'email');
-    if (!isValidEmail($email))
-    {
-        $langs->load("errors");
-        setEventMessages($langs->trans("ErrorBadEMail", $email), null, 'errors');
-    } else {
-        include_once DOL_DOCUMENT_ROOT.'/mailmanspip/class/mailmanspip.class.php';
-        $mailmanspip = new MailmanSpip($db);
+	$email = GETPOST($action.'email');
+	if (!isValidEmail($email))
+	{
+		$langs->load("errors");
+		setEventMessages($langs->trans("ErrorBadEMail", $email), null, 'errors');
+	} else {
+		include_once DOL_DOCUMENT_ROOT.'/mailmanspip/class/mailmanspip.class.php';
+		$mailmanspip = new MailmanSpip($db);
 
-        $object = new stdClass();
-        $object->email = $email;
-        $object->pass = $email;
-        /*$object->element='member';
+		$object = new stdClass();
+		$object->email = $email;
+		$object->pass = $email;
+		/*$object->element='member';
         $object->type='Preferred Partners'; */
 
-        if ($action == 'testsubscribe')
-        {
-            $result = $mailmanspip->add_to_mailman($object);
+		if ($action == 'testsubscribe')
+		{
+			$result = $mailmanspip->add_to_mailman($object);
 			if ($result < 0)
 			{
 				$error++;
@@ -117,19 +117,19 @@ if (($action == 'testsubscribe' || $action == 'testunsubscribe') && !empty($conf
 			} else {
 				setEventMessages($langs->trans("MailmanCreationSuccess"), null);
 			}
-        }
-        if ($action == 'testunsubscribe')
-        {
-            $result = $mailmanspip->del_to_mailman($object);
-            if ($result < 0)
+		}
+		if ($action == 'testunsubscribe')
+		{
+			$result = $mailmanspip->del_to_mailman($object);
+			if ($result < 0)
 			{
 				$error++;
 				setEventMessages($mailmanspip->error, $mailmanspip->errors, 'errors');
 			} else {
 				setEventMessages($langs->trans("MailmanDeletionSuccess"), null);
 			}
-        }
-    }
+		}
+	}
 }
 
 
@@ -149,31 +149,31 @@ $head = mailmanspip_admin_prepare_head();
 
 if (!empty($conf->global->ADHERENT_USE_MAILMAN))
 {
-    print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    print '<input type="hidden" name="action" value="update">';
+	print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="action" value="update">';
 
-    print dol_get_fiche_head($head, 'mailman', $langs->trans("Setup"), -1, 'user');
+	print dol_get_fiche_head($head, 'mailman', $langs->trans("Setup"), -1, 'user');
 
-    //$link=img_picto($langs->trans("Active"),'tick').' ';
-    $link = '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=unset&token='.newToken().'&value=0&name=ADHERENT_USE_MAILMAN">';
-    //$link.=$langs->trans("Disable");
-    $link .= img_picto($langs->trans("Activated"), 'switch_on');
-    $link .= '</a>';
-    // Edition des varibales globales
-    $constantes = array(
-        'ADHERENT_MAILMAN_ADMINPW',
-        'ADHERENT_MAILMAN_URL',
-        'ADHERENT_MAILMAN_UNSUB_URL',
-        'ADHERENT_MAILMAN_LISTS'
-    );
+	//$link=img_picto($langs->trans("Active"),'tick').' ';
+	$link = '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=unset&token='.newToken().'&value=0&name=ADHERENT_USE_MAILMAN">';
+	//$link.=$langs->trans("Disable");
+	$link .= img_picto($langs->trans("Activated"), 'switch_on');
+	$link .= '</a>';
+	// Edition des varibales globales
+	$constantes = array(
+		'ADHERENT_MAILMAN_ADMINPW',
+		'ADHERENT_MAILMAN_URL',
+		'ADHERENT_MAILMAN_UNSUB_URL',
+		'ADHERENT_MAILMAN_LISTS'
+	);
 
-    print load_fiche_titre($langs->trans('MailmanTitle'), $link, '');
+	print load_fiche_titre($langs->trans('MailmanTitle'), $link, '');
 
-    print '<br>';
+	print '<br>';
 
-    // JQuery activity
-    print '<script type="text/javascript">
+	// JQuery activity
+	print '<script type="text/javascript">
     var i1=0;
     var i2=0;
     var i3=0;
@@ -193,48 +193,48 @@ if (!empty($conf->global->ADHERENT_USE_MAILMAN))
 	});
     </script>';
 
-    form_constantes($constantes, 2);
+	form_constantes($constantes, 2);
 
-    print '*'.$langs->trans("FollowingConstantsWillBeSubstituted").'<br>';
-    print '%LISTE%, %MAILMAN_ADMINPW%, %EMAIL% <br>';
+	print '*'.$langs->trans("FollowingConstantsWillBeSubstituted").'<br>';
+	print '%LISTE%, %MAILMAN_ADMINPW%, %EMAIL% <br>';
 
-    dol_fiche_end();
+	print dol_get_fiche_end();
 
-    print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Update").'" name="update"></div>';
+	print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Update").'" name="update"></div>';
 
-    print '</form>';
+	print '</form>';
 } else {
-    print dol_get_fiche_head($head, 'mailman', $langs->trans("Setup"), 0, 'user');
+	print dol_get_fiche_head($head, 'mailman', $langs->trans("Setup"), 0, 'user');
 
-    $link = '<a href="'.$_SERVER["PHP_SELF"].'?action=set&token='.newToken().'&value=1&name=ADHERENT_USE_MAILMAN">';
-    //$link.=img_$langs->trans("Activate")
-    $link .= img_picto($langs->trans("Disabled"), 'switch_off');
-    $link .= '</a>';
-    print load_fiche_titre($langs->trans('MailmanTitle'), $link, '');
+	$link = '<a href="'.$_SERVER["PHP_SELF"].'?action=set&token='.newToken().'&value=1&name=ADHERENT_USE_MAILMAN">';
+	//$link.=img_$langs->trans("Activate")
+	$link .= img_picto($langs->trans("Disabled"), 'switch_off');
+	$link .= '</a>';
+	print load_fiche_titre($langs->trans('MailmanTitle'), $link, '');
 
-    dol_fiche_end();
+	print dol_get_fiche_end();
 }
 
 
 if (!empty($conf->global->ADHERENT_USE_MAILMAN))
 {
-    print '<form action="'.$_SERVER["PHP_SELF"].'">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    print '<input type="hidden" name="action" value="testsubscribe">';
+	print '<form action="'.$_SERVER["PHP_SELF"].'">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="action" value="testsubscribe">';
 
-    print $langs->trans("TestSubscribe").'<br>';
-    print $langs->trans("EMail").' <input type="email" class="flat" name="testsubscribeemail" value="'.GETPOST('testsubscribeemail').'"> <input class="button" type="submit" value="'.$langs->trans("Test").'"><br>';
+	print $langs->trans("TestSubscribe").'<br>';
+	print $langs->trans("EMail").' <input type="email" class="flat" name="testsubscribeemail" value="'.GETPOST('testsubscribeemail').'"> <input class="button" type="submit" value="'.$langs->trans("Test").'"><br>';
 
-    print '</form>';
+	print '</form>';
 
-    print '<form action="'.$_SERVER["PHP_SELF"].'">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    print '<input type="hidden" name="action" value="testunsubscribe">';
+	print '<form action="'.$_SERVER["PHP_SELF"].'">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="action" value="testunsubscribe">';
 
-    print $langs->trans("TestUnSubscribe").'<br>';
-    print $langs->trans("EMail").' <input type="email" class="flat" name="testunsubscribeemail" value="'.GETPOST('testunsubscribeemail').'"> <input class="button" type="submit" value="'.$langs->trans("Test").'"><br>';
+	print $langs->trans("TestUnSubscribe").'<br>';
+	print $langs->trans("EMail").' <input type="email" class="flat" name="testunsubscribeemail" value="'.GETPOST('testunsubscribeemail').'"> <input class="button" type="submit" value="'.$langs->trans("Test").'"><br>';
 
-    print '</form>';
+	print '</form>';
 }
 
 // End of page
diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php
index c3792812210..87796f43997 100644
--- a/htdocs/admin/mails.php
+++ b/htdocs/admin/mails.php
@@ -67,18 +67,18 @@ complete_substitutions_array($substitutionarrayfortest, $langs);
 
 if ($action == 'update' && !$cancel)
 {
-	if (! $error && ! GETPOST("MAIN_MAIL_EMAIL_FROM", 'alphanohtml')) {
+	if (!$error && !GETPOST("MAIN_MAIL_EMAIL_FROM", 'alphanohtml')) {
 		$error++;
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("MAIN_MAIL_EMAIL_FROM")), null, 'errors');
 		$action = 'edit';
 	}
-	if (! $error && ! isValidEmail(GETPOST("MAIN_MAIL_EMAIL_FROM", 'alphanohtml'))) {
+	if (!$error && !isValidEmail(GETPOST("MAIN_MAIL_EMAIL_FROM", 'alphanohtml'))) {
 		$error++;
 		setEventMessages($langs->trans("ErrorBadEMail", GETPOST("MAIN_MAIL_EMAIL_FROM", 'alphanohtml')), null, 'errors');
 		$action = 'edit';
 	}
 
-	if (! $error) {
+	if (!$error) {
 		dolibarr_set_const($db, "MAIN_DISABLE_ALL_MAILS", GETPOST("MAIN_DISABLE_ALL_MAILS", 'int'), 'chaine', 0, '', $conf->entity);
 		dolibarr_set_const($db, "MAIN_MAIL_FORCE_SENDTO", GETPOST("MAIN_MAIL_FORCE_SENDTO", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
 		dolibarr_set_const($db, "MAIN_MAIL_ENABLED_USER_DEST_SELECT", GETPOST("MAIN_MAIL_ENABLED_USER_DEST_SELECT", 'int'), 'chaine', 0, '', $conf->entity);
@@ -188,13 +188,13 @@ if ($action == 'edit')
                             jQuery("#smtp_server_mess").show();
                             jQuery("#smtp_port_mess").show();';
 		} else {
-            print '
+			print '
                             jQuery("#MAIN_MAIL_SMTP_SERVER").prop("disabled", true);
                             jQuery("#MAIN_MAIL_SMTP_PORT").prop("disabled", true);
                             jQuery("#smtp_server_mess").hide();
                             jQuery("#smtp_port_mess").hide();';
-        }
-        print '
+		}
+		print '
                         }
                         if (jQuery("#MAIN_MAIL_SENDMODE").val()==\'smtps\')
                         {
@@ -266,7 +266,7 @@ if ($action == 'edit')
 							jQuery("#MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED").val(0);
                     });
                })';
-        print '</script>'."\n";
+		print '</script>'."\n";
 	}
 
 	print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
@@ -409,8 +409,8 @@ if ($action == 'edit')
 		print '</td></tr>';
 	}
 
-    // TLS
-    print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_EMAIL_TLS").'</td><td>';
+	// TLS
+	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_EMAIL_TLS").'</td><td>';
 	if (!empty($conf->use_javascript_ajax) || (isset($conf->global->MAIN_MAIL_SENDMODE) && in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps', 'swiftmailer'))))
 	{
 		if (function_exists('openssl_open'))
@@ -453,20 +453,20 @@ if ($action == 'edit')
 	} else print yn(0).' ('.$langs->trans("NotSupported").')';
 	print '</td></tr>';
 
-    // DKIM Domain
-    print '<tr class="oddeven dkim"><td>'.$langs->trans("MAIN_MAIL_EMAIL_DKIM_DOMAIN").'</td>';
-    print '<td><input class="flat" id="MAIN_MAIL_EMAIL_DKIM_DOMAIN" name="MAIN_MAIL_EMAIL_DKIM_DOMAIN" size="32" value="'.(!empty($conf->global->MAIN_MAIL_EMAIL_DKIM_DOMAIN) ? $conf->global->MAIN_MAIL_EMAIL_DKIM_DOMAIN : '');
-    print '"></td></tr>';
+	// DKIM Domain
+	print '<tr class="oddeven dkim"><td>'.$langs->trans("MAIN_MAIL_EMAIL_DKIM_DOMAIN").'</td>';
+	print '<td><input class="flat" id="MAIN_MAIL_EMAIL_DKIM_DOMAIN" name="MAIN_MAIL_EMAIL_DKIM_DOMAIN" size="32" value="'.(!empty($conf->global->MAIN_MAIL_EMAIL_DKIM_DOMAIN) ? $conf->global->MAIN_MAIL_EMAIL_DKIM_DOMAIN : '');
+	print '"></td></tr>';
 
-    // DKIM Selector
-    print '<tr class="oddeven dkim"><td>'.$langs->trans("MAIN_MAIL_EMAIL_DKIM_SELECTOR").'</td>';
-    print '<td><input class="flat" id="MAIN_MAIL_EMAIL_DKIM_SELECTOR" name="MAIN_MAIL_EMAIL_DKIM_SELECTOR" size="32" value="'.(!empty($conf->global->MAIN_MAIL_EMAIL_DKIM_SELECTOR) ? $conf->global->MAIN_MAIL_EMAIL_DKIM_SELECTOR : '');
-    print '"></td></tr>';
+	// DKIM Selector
+	print '<tr class="oddeven dkim"><td>'.$langs->trans("MAIN_MAIL_EMAIL_DKIM_SELECTOR").'</td>';
+	print '<td><input class="flat" id="MAIN_MAIL_EMAIL_DKIM_SELECTOR" name="MAIN_MAIL_EMAIL_DKIM_SELECTOR" size="32" value="'.(!empty($conf->global->MAIN_MAIL_EMAIL_DKIM_SELECTOR) ? $conf->global->MAIN_MAIL_EMAIL_DKIM_SELECTOR : '');
+	print '"></td></tr>';
 
-    // DKIM PRIVATE KEY
-    print '<tr class="oddeven dkim"><td>'.$langs->trans("MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY").'</td>';
-    print '<td><textarea id="MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY" name="MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY" rows="15" cols="100">'.(!empty($conf->global->MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY) ? $conf->global->MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY : '').'</textarea>';
-    print '</td></tr>';
+	// DKIM PRIVATE KEY
+	print '<tr class="oddeven dkim"><td>'.$langs->trans("MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY").'</td>';
+	print '<td><textarea id="MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY" name="MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY" rows="15" cols="100">'.(!empty($conf->global->MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY) ? $conf->global->MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY : '').'</textarea>';
+	print '</td></tr>';
 
 	print '</table>';
 
@@ -506,7 +506,7 @@ if ($action == 'edit')
 
 	print '</table>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<br><div class="center">';
 	print '<input class="button" type="submit" name="save" value="'.$langs->trans("Save").'">';
@@ -635,20 +635,20 @@ if ($action == 'edit')
 			} else print yn(0).' ('.$langs->trans("NotSupported").')';
 			print '</td></tr>';
 
-		    // Domain
-		    print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_EMAIL_DKIM_DOMAIN").'</td>';
-		    print '<td>'.$conf->global->MAIN_MAIL_EMAIL_DKIM_DOMAIN;
-		    print '</td></tr>';
+			// Domain
+			print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_EMAIL_DKIM_DOMAIN").'</td>';
+			print '<td>'.$conf->global->MAIN_MAIL_EMAIL_DKIM_DOMAIN;
+			print '</td></tr>';
 
-		    // Selector
-		    print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_EMAIL_DKIM_SELECTOR").'</td>';
-		    print '<td>'.$conf->global->MAIN_MAIL_EMAIL_DKIM_SELECTOR;
-		    print '</td></tr>';
+			// Selector
+			print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_EMAIL_DKIM_SELECTOR").'</td>';
+			print '<td>'.$conf->global->MAIN_MAIL_EMAIL_DKIM_SELECTOR;
+			print '</td></tr>';
 
-		    // PRIVATE KEY
-		    print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY").'</td>';
-		    print '<td>'.$conf->global->MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY;
-		    print '</td></tr>';
+			// PRIVATE KEY
+			print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY").'</td>';
+			print '<td>'.$conf->global->MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY;
+			print '</td></tr>';
 		}
 
 		print '</table>';
@@ -737,7 +737,7 @@ if ($action == 'edit')
 		print '</table>';
 	}
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 
 	// Actions button
@@ -892,7 +892,7 @@ if ($action == 'edit')
 
 		print $formmail->get_form('addfile', 'removefile');
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 		// References
 		print '<span class="opacitymedium">'.$langs->trans("EMailsWillHaveMessageID").': ';
diff --git a/htdocs/admin/mails_emailing.php b/htdocs/admin/mails_emailing.php
index ebc3201dcdf..6a42e14bff6 100644
--- a/htdocs/admin/mails_emailing.php
+++ b/htdocs/admin/mails_emailing.php
@@ -60,7 +60,7 @@ complete_substitutions_array($substitutionarrayfortest, $langs);
 
 if ($action == 'update' && empty($_POST["cancel"]))
 {
-    // Send mode parameters
+	// Send mode parameters
 	dolibarr_set_const($db, "MAIN_MAIL_SENDMODE_EMAILING", GETPOST("MAIN_MAIL_SENDMODE_EMAILING"), 'chaine', 0, '', $conf->entity);
 	dolibarr_set_const($db, "MAIN_MAIL_SMTP_PORT_EMAILING", GETPOST("MAIN_MAIL_SMTP_PORT_EMAILING"), 'chaine', 0, '', $conf->entity);
 	dolibarr_set_const($db, "MAIN_MAIL_SMTP_SERVER_EMAILING", GETPOST("MAIN_MAIL_SMTP_SERVER_EMAILING"), 'chaine', 0, '', $conf->entity);
@@ -382,22 +382,22 @@ if ($action == 'edit')
 	} else print yn(0).' ('.$langs->trans("NotSupported").')';
 	print '</td></tr>';
 
-    print '</table>';
+	print '</table>';
 
-    dol_fiche_end();
+	print dol_get_fiche_end();
 
-    print '<br><div class="center">';
-    print '<input class="button" type="submit" name="save" value="'.$langs->trans("Save").'">';
-    print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-    print '<input class="button" type="submit" name="cancel" value="'.$langs->trans("Cancel").'">';
-    print '</div>';
+	print '<br><div class="center">';
+	print '<input class="button" type="submit" name="save" value="'.$langs->trans("Save").'">';
+	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
+	print '<input class="button" type="submit" name="cancel" value="'.$langs->trans("Cancel").'">';
+	print '</div>';
 
 	print '</form>';
 } else {
-    print dol_get_fiche_head($head, 'common_emailing', '', -1);
+	print dol_get_fiche_head($head, 'common_emailing', '', -1);
 
-    print '<span class="opacitymedium">'.$langs->trans("EMailsDesc")."</span><br>\n";
-    print "<br>\n";
+	print '<span class="opacitymedium">'.$langs->trans("EMailsDesc")."</span><br>\n";
+	print "<br>\n";
 
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre"><td class="titlefieldmiddle">'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
@@ -475,13 +475,13 @@ if ($action == 'edit')
 
 	print '</table>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 
-    if ($conf->global->MAIN_MAIL_SENDMODE_EMAILING == 'mail' && empty($conf->global->MAIN_FIX_FOR_BUGGED_MTA))
-    {
-        print '<br>';
-        /*
+	if ($conf->global->MAIN_MAIL_SENDMODE_EMAILING == 'mail' && empty($conf->global->MAIN_FIX_FOR_BUGGED_MTA))
+	{
+		print '<br>';
+		/*
 	    // Warning 1
     	if ($linuxlike)
     	{
@@ -491,12 +491,12 @@ if ($action == 'edit')
     			print info_admin($langs->trans("SendmailOptionNotComplete"));
     		}
     	}*/
-    	// Warning 2
-   	    print info_admin($langs->trans("SendmailOptionMayHurtBuggedMTA"));
-    }
+		// Warning 2
+   		print info_admin($langs->trans("SendmailOptionMayHurtBuggedMTA"));
+	}
 
 
-    // Buttons for actions
+	// Buttons for actions
 
 	print '<div class="tabsAction">';
 
@@ -527,8 +527,8 @@ if ($action == 'edit')
 
 	if ($conf->global->MAIN_MAIL_SENDMODE_EMAILING == 'mail' && !in_array($action, array('testconnect', 'test', 'testhtml')))
 	{
-        $text = $langs->trans("WarningPHPMail");
-	    print info_admin($text);
+		$text = $langs->trans("WarningPHPMail");
+		print info_admin($text);
 	}
 
 	// Run the test to connect
@@ -556,7 +556,7 @@ if ($action == 'edit')
 	// Show email send test form
 	if ($action == 'test' || $action == 'testhtml')
 	{
-	    print '<div id="formmailbeforetitle" name="formmailbeforetitle"></div>';
+		print '<div id="formmailbeforetitle" name="formmailbeforetitle"></div>';
 		print load_fiche_titre($action == 'testhtml' ? $langs->trans("DoTestSendHTML") : $langs->trans("DoTestSend"));
 
 		print dol_get_fiche_head('');
@@ -592,14 +592,14 @@ if ($action == 'edit')
 		$formmail->param["returnurl"] = $_SERVER["PHP_SELF"];
 
 		// Init list of files
-        if (GETPOST("mode") == 'init')
+		if (GETPOST("mode") == 'init')
 		{
 			$formmail->clear_attached_files();
 		}
 
 		print $formmail->get_form('addfile', 'removefile');
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 	}
 }
 
diff --git a/htdocs/admin/mails_senderprofile_list.php b/htdocs/admin/mails_senderprofile_list.php
index 6f80706276e..488997b5b78 100644
--- a/htdocs/admin/mails_senderprofile_list.php
+++ b/htdocs/admin/mails_senderprofile_list.php
@@ -474,7 +474,7 @@ foreach ($object->fields as $key => $val)
 	if (!empty($arrayfields['t.'.$key]['checked']))
 	{
 		print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
-		if (is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
+		if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
 		elseif (strpos($val['type'], 'integer:') === 0) {
 			print $object->showInputField($val, $key, $search[$key], '', '', 'search_', 'maxwidth150', 1);
 		} elseif (!preg_match('/^(date|timestamp)/', $val['type'])) print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
@@ -645,7 +645,7 @@ if (in_array('builddoc', $arrayofmassactions) && ($nbtotalofrecords === '' || $n
 	print $formfile->showdocuments('massfilesarea_emailsenderprofile', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
 }
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // End of page
 llxFooter();
diff --git a/htdocs/admin/mails_templates.php b/htdocs/admin/mails_templates.php
index 4dfdc413af5..f63af39e985 100644
--- a/htdocs/admin/mails_templates.php
+++ b/htdocs/admin/mails_templates.php
@@ -11,7 +11,7 @@
  * Copyright (C) 2011-2016  Alexandre Spangaro      <aspangaro@open-dsi.fr>
  * Copyright (C) 2015       Ferran Marcet           <fmarcet@2byte.es>
  * Copyright (C) 2016       Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>
- * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2020  Frédéric France         <frederic.france@netlogic.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -139,7 +139,15 @@ if (empty($conf->global->MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES))
 
 
 $tabhelp = array();
-$tabhelp[25] = array('topic'=>$helpsubstit, 'joinfiles'=>$langs->trans('AttachMainDocByDefault'), 'content'=>$helpsubstit, 'content_lines'=>$helpsubstitforlines, 'type_template'=>$langs->trans("TemplateForElement"), 'private'=>$langs->trans("TemplateIsVisibleByOwnerOnly"), 'position'=>$langs->trans("PositionIntoComboList"));
+$tabhelp[25] = array(
+	'topic'=>$helpsubstit,
+	'joinfiles'=>$langs->trans('AttachMainDocByDefault'),
+	'content'=>$helpsubstit,
+	'content_lines'=>$helpsubstitforlines,
+	'type_template'=>$langs->trans("TemplateForElement"),
+	'private'=>$langs->trans("TemplateIsVisibleByOwnerOnly"),
+	'position'=>$langs->trans("PositionIntoComboList")
+);
 
 // List of check for fields (NOT USED YET)
 $tabfieldcheck = array();
@@ -154,22 +162,54 @@ $elementList = array();
 $elementList['all'] = '-- '.dol_escape_htmltag($langs->trans("All")).' --';
 $elementList['none'] = '-- '.dol_escape_htmltag($langs->trans("None")).' --';
 $elementList['user'] = img_picto('', 'user', 'class="paddingright"').dol_escape_htmltag($langs->trans('MailToUser'));
-if ($conf->adherent->enabled && $user->rights->adherent->lire)          $elementList['member'] = img_picto('', 'object_member', 'class="paddingright"').dol_escape_htmltag($langs->trans('MailToMember'));
-if ($conf->recruitment->enabled && $user->rights->recruitment->recruitmentjobposition->read)            $elementList['recruitmentcandidature_send'] = img_picto('', 'recruitmentcandidature', 'class="paddingright"').dol_escape_htmltag($langs->trans('RecruitmentCandidatures'));
-if ($conf->societe->enabled && $user->rights->societe->lire)           $elementList['thirdparty'] = img_picto('', 'company', 'class="paddingright"').dol_escape_htmltag($langs->trans('MailToThirdparty'));
-if ($conf->projet->enabled)            $elementList['project'] = img_picto('', 'project', 'class="paddingright"').dol_escape_htmltag($langs->trans('MailToProject'));
-if ($conf->propal->enabled && $user->rights->propal->lire)     $elementList['propal_send'] = dol_escape_htmltag($langs->trans('MailToSendProposal'));
-if ($conf->commande->enabled && $user->rights->commande->lire) $elementList['order_send'] = dol_escape_htmltag($langs->trans('MailToSendOrder'));
-if ($conf->facture->enabled && $user->rights->facture->lire)   $elementList['facture_send'] = dol_escape_htmltag($langs->trans('MailToSendInvoice'));
-if ($conf->expedition->enabled)        $elementList['shipping_send'] = dol_escape_htmltag($langs->trans('MailToSendShipment'));
-if ($conf->reception->enabled) 		   $elementList['reception_send'] = dol_escape_htmltag($langs->trans('MailToSendReception'));
-if ($conf->ficheinter->enabled)        $elementList['fichinter_send'] = dol_escape_htmltag($langs->trans('MailToSendIntervention'));
-if ($conf->supplier_proposal->enabled) $elementList['supplier_proposal_send'] = dol_escape_htmltag($langs->trans('MailToSendSupplierRequestForQuotation'));
-if (($conf->fournisseur->enabled && $user->rights->fournisseur->commande->lire && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || ($conf->supplier_order->enabled && $user->rights->supplier_order->lire))	$elementList['order_supplier_send'] = dol_escape_htmltag($langs->trans('MailToSendSupplierOrder'));
-if (($conf->fournisseur->enabled && $user->rights->fournisseur->facture->lire && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || ($conf->supplier_invoice->enabled && $user->rights->supplier_invoice->lire))	$elementList['invoice_supplier_send'] = dol_escape_htmltag($langs->trans('MailToSendSupplierInvoice'));
-if ($conf->contrat->enabled && $user->rights->contrat->lire)           $elementList['contract'] = img_picto('', 'contract', 'class="paddingright"').dol_escape_htmltag($langs->trans('MailToSendContract'));
-if ($conf->ticket->enabled && $user->rights->ticket->read)            $elementList['ticket_send'] = img_picto('', 'ticket', 'class="paddingright"').dol_escape_htmltag($langs->trans('MailToTicket'));
-if ($conf->agenda->enabled)            $elementList['actioncomm_send'] = img_picto('', 'action', 'class="paddingright"').dol_escape_htmltag($langs->trans('MailToSendEventPush'));
+if ($conf->adherent->enabled && $user->rights->adherent->lire) {
+	$elementList['member'] = img_picto('', 'object_member', 'class="paddingright"').dol_escape_htmltag($langs->trans('MailToMember'));
+}
+if ($conf->recruitment->enabled && $user->rights->recruitment->recruitmentjobposition->read) {
+	$elementList['recruitmentcandidature_send'] = img_picto('', 'recruitmentcandidature', 'class="paddingright"').dol_escape_htmltag($langs->trans('RecruitmentCandidatures'));
+}
+if ($conf->societe->enabled && $user->rights->societe->lire) {
+	$elementList['thirdparty'] = img_picto('', 'company', 'class="paddingright"').dol_escape_htmltag($langs->trans('MailToThirdparty'));
+}
+if ($conf->projet->enabled) {
+	$elementList['project'] = img_picto('', 'project', 'class="paddingright"').dol_escape_htmltag($langs->trans('MailToProject'));
+}
+if ($conf->propal->enabled && $user->rights->propal->lire) {
+	$elementList['propal_send'] = img_picto('', 'propal', 'class="paddingright"').dol_escape_htmltag($langs->trans('MailToSendProposal'));
+}
+if ($conf->commande->enabled && $user->rights->commande->lire) {
+	$elementList['order_send'] = img_picto('', 'order', 'class="paddingright"').dol_escape_htmltag($langs->trans('MailToSendOrder'));
+}
+if ($conf->facture->enabled && $user->rights->facture->lire) {
+	$elementList['facture_send'] = img_picto('', 'bill', 'class="paddingright"').dol_escape_htmltag($langs->trans('MailToSendInvoice'));
+}
+if ($conf->expedition->enabled) {
+	$elementList['shipping_send'] = img_picto('', 'dolly', 'class="paddingright"').dol_escape_htmltag($langs->trans('MailToSendShipment'));
+}
+if ($conf->reception->enabled) {
+	$elementList['reception_send'] = img_picto('', 'dolly', 'class="paddingright"').dol_escape_htmltag($langs->trans('MailToSendReception'));
+}
+if ($conf->ficheinter->enabled) {
+	$elementList['fichinter_send'] = img_picto('', 'intervention', 'class="paddingright"').dol_escape_htmltag($langs->trans('MailToSendIntervention'));
+}
+if ($conf->supplier_proposal->enabled) {
+	$elementList['supplier_proposal_send'] = img_picto('', 'propal', 'class="paddingright"').dol_escape_htmltag($langs->trans('MailToSendSupplierRequestForQuotation'));
+}
+if (($conf->fournisseur->enabled && $user->rights->fournisseur->commande->lire && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || ($conf->supplier_order->enabled && $user->rights->supplier_order->lire)) {
+	$elementList['order_supplier_send'] = img_picto('', 'order', 'class="paddingright"').dol_escape_htmltag($langs->trans('MailToSendSupplierOrder'));
+}
+if (($conf->fournisseur->enabled && $user->rights->fournisseur->facture->lire && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || ($conf->supplier_invoice->enabled && $user->rights->supplier_invoice->lire)) {
+	$elementList['invoice_supplier_send'] = img_picto('', 'bill', 'class="paddingright"').dol_escape_htmltag($langs->trans('MailToSendSupplierInvoice'));
+}
+if ($conf->contrat->enabled && $user->rights->contrat->lire) {
+	$elementList['contract'] = img_picto('', 'contract', 'class="paddingright"').dol_escape_htmltag($langs->trans('MailToSendContract'));
+}
+if ($conf->ticket->enabled && $user->rights->ticket->read) {
+	$elementList['ticket_send'] = img_picto('', 'ticket', 'class="paddingright"').dol_escape_htmltag($langs->trans('MailToTicket'));
+}
+if ($conf->agenda->enabled) {
+	$elementList['actioncomm_send'] = img_picto('', 'action', 'class="paddingright"').dol_escape_htmltag($langs->trans('MailToSendEventPush'));
+}
 
 $parameters = array('elementList'=>$elementList);
 $reshook = $hookmanager->executeHooks('emailElementlist', $parameters); // Note that $action and $object may have been modified by some hooks
@@ -188,18 +228,22 @@ $id = 25;
  * Actions
  */
 
-if (GETPOST('cancel', 'alpha')) { $action = 'list'; $massaction = ''; }
+if (GETPOST('cancel', 'alpha')) {
+	$action = 'list';
+	$massaction = '';
+}
 if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction = ''; }
 
 $parameters = array();
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 
-if (empty($reshook))
-{
+if (empty($reshook)) {
 	// Purge search criteria
-	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
-	{
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) {
+		// All tests are required to be compatible with all browsers
 		$search_label = '';
 		$search_type_template = '';
 		$search_lang = '';
@@ -210,8 +254,7 @@ if (empty($reshook))
 	}
 
 	// Actions add or modify an entry into a dictionary
-	if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha'))
-	{
+	if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha')) {
 		$listfield = explode(',', str_replace(' ', '', $tabfield[$id]));
 		$listfieldinsert = explode(',', $tabfieldinsert[$id]);
 		$listfieldmodify = explode(',', $tabfieldinsert[$id]);
@@ -219,8 +262,7 @@ if (empty($reshook))
 
 		// Check that all fields are filled
 		$ok = 1;
-		foreach ($listfield as $f => $value)
-		{
+		foreach ($listfield as $f => $value) {
 			// Not mandatory fields
 			if ($value == 'joinfiles') continue;
 			if ($value == 'content') continue;
@@ -274,7 +316,7 @@ if (empty($reshook))
 				if (GETPOST($keycode) == '' && $keycode != 'langcode')      $sql .= "null"; // langcode must be '' if not defined so the unique key that include lang will work
 				elseif (GETPOST($keycode) == '0' && $keycode == 'langcode') $sql .= "''"; // langcode must be '' if not defined so the unique key that include lang will work
 				elseif ($keycode == 'fk_user') {
-					if (! $user->admin) {	// A non admin user can only edit its own template
+					if (!$user->admin) {	// A non admin user can only edit its own template
 						$sql .= " ".((int) $user->id);
 					} else {
 						$sql .= " ".((int) GETPOST($keycode, 'fk_user'));
@@ -333,7 +375,7 @@ if (empty($reshook))
 				if (GETPOST($keycode) == '' || ($keycode != 'langcode' && $keycode != 'position' && $keycode != 'private' && !GETPOST($keycode))) $sql .= "null"; // langcode,... must be '' if not defined so the unique key that include lang will work
 				elseif (GETPOST($keycode) == '0' && $keycode == 'langcode') $sql .= "''"; // langcode must be '' if not defined so the unique key that include lang will work
 				elseif ($keycode == 'fk_user') {
-					if (! $user->admin) {	// A non admin user can only edit its own template
+					if (!$user->admin) {	// A non admin user can only edit its own template
 						$sql .= " ".((int) $user->id);
 					} else {
 						$sql .= " ".((int) GETPOST($keycode, 'fk_user'));
@@ -350,7 +392,7 @@ if (empty($reshook))
 			}
 
 			$sql .= " WHERE ".$rowidcol." = ".((int) $rowid);
-			if (! $user->admin) {	// A non admin user can only edit its own template
+			if (!$user->admin) {	// A non admin user can only edit its own template
 				$sql .= " AND fk_user  = ".$user->id;
 			}
 			//print $sql;exit;
@@ -371,7 +413,7 @@ if (empty($reshook))
 		$rowidcol = "rowid";
 
 		$sql = "DELETE from ".$tabname[$id]." WHERE ".$rowidcol."=".((int) $rowid);
-		if (! $user->admin) {	// A non admin user can only edit its own template
+		if (!$user->admin) {	// A non admin user can only edit its own template
 			$sql .= " AND fk_user  = ".$user->id;
 		}
 		dol_syslog("delete", LOG_DEBUG);
@@ -493,7 +535,7 @@ if ($action == 'view') {
 		if ($fieldlist[$field] == 'type') { $valuetoshow = $langs->trans("Type"); }
 		if ($fieldlist[$field] == 'code') { $valuetoshow = $langs->trans("Code"); }
 		if ($fieldlist[$field] == 'libelle' || $fieldlist[$field] == 'label') { $valuetoshow = $langs->trans("Code"); }
-		if ($fieldlist[$field] == 'type_template') { $valuetoshow = $langs->trans("TypeOfTemplate"); $align="center"; }
+		if ($fieldlist[$field] == 'type_template') { $valuetoshow = $langs->trans("TypeOfTemplate"); $align = "center"; }
 		if ($fieldlist[$field] == 'private') { $align = 'center'; }
 		if ($fieldlist[$field] == 'position') { $align = 'center'; }
 
@@ -662,7 +704,7 @@ if ($resql)
 			print '<td class="liste_titre"><input type="text" name="search_topic" value="'.dol_escape_htmltag($search_topic).'"></td>';
 		} elseif ($value == 'type_template') {
 			print '<td class="liste_titre center">';
-			print $form->selectarray('search_type_template', $elementList, $search_type_template, 1, 0, 0, '', 0, 0, 0, '', 'maxwidth150', 1, '', 0, 1);
+			print $form->selectarray('search_type_template', $elementList, $search_type_template, 1, 0, 0, '', 0, 0, 0, '', 'maxwidth200', 1, '', 0, 1);
 			print '</td>';
 		} elseif (!in_array($value, array('content', 'content_lines'))) {
 			print '<td class="liste_titre"></td>';
@@ -795,13 +837,13 @@ if ($resql)
 
 				print "</tr>\n";
 			} else {
-			    if ($obj->module) {
-			        $tempmodulekey = $obj->module;
-			        if (empty($conf->$tempmodulekey) || empty($conf->$tempmodulekey->enabled)) {
-			            $i++;
-			            continue;
-			        }
-			    }
+				if ($obj->module) {
+					$tempmodulekey = $obj->module;
+					if (empty($conf->$tempmodulekey) || empty($conf->$tempmodulekey->enabled)) {
+						$i++;
+						continue;
+					}
+				}
 				$keyforobj = 'type_template';
 				if (!in_array($obj->$keyforobj, array_keys($elementList)))
 				{
@@ -953,7 +995,7 @@ print '</div>';
 print '</form>';
 
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // End of page
 llxFooter();
@@ -1033,7 +1075,7 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 				print '<input type="hidden" name="type_template" value="'.$obj->{$fieldlist[$field]}.'">';
 				print $obj->{$fieldlist[$field]};
 			} else {
-				print $form->selectarray('type_template', $elementList, (!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:''), 1, 0, 0, '', 0, 0, 0, '', 'maxwidth150', 1, '', 0, 1);
+				print $form->selectarray('type_template', $elementList, (!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:''), 1, 0, 0, '', 0, 0, 0, '', 'maxwidth200', 1, '', 0, 1);
 			}
 			print '</td>';
 		} elseif ($context == 'add' && in_array($fieldlist[$field], array('topic', 'joinfiles', 'content', 'content_lines'))) continue;
diff --git a/htdocs/admin/mails_ticket.php b/htdocs/admin/mails_ticket.php
index 0be41dce273..dda9d0c01a8 100644
--- a/htdocs/admin/mails_ticket.php
+++ b/htdocs/admin/mails_ticket.php
@@ -60,7 +60,7 @@ complete_substitutions_array($substitutionarrayfortest, $langs);
 
 if ($action == 'update' && empty($_POST["cancel"]))
 {
-    // Send mode parameters
+	// Send mode parameters
 	dolibarr_set_const($db, "MAIN_MAIL_SENDMODE_TICKET", GETPOST("MAIN_MAIL_SENDMODE_TICKET"), 'chaine', 0, '', $conf->entity);
 	dolibarr_set_const($db, "MAIN_MAIL_SMTP_PORT_TICKET", GETPOST("MAIN_MAIL_SMTP_PORT_TICKET"), 'chaine', 0, '', $conf->entity);
 	dolibarr_set_const($db, "MAIN_MAIL_SMTP_SERVER_TICKET", GETPOST("MAIN_MAIL_SMTP_SERVER_TICKET"), 'chaine', 0, '', $conf->entity);
@@ -359,22 +359,22 @@ if ($action == 'edit')
 	} else print yn(0).' ('.$langs->trans("NotSupported").')';
 	print '</td></tr>';
 
-    print '</table>';
+	print '</table>';
 
-    dol_fiche_end();
+	print dol_get_fiche_end();
 
-    print '<br><div class="center">';
-    print '<input class="button" type="submit" name="save" value="'.$langs->trans("Save").'">';
-    print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-    print '<input class="button" type="submit" name="cancel" value="'.$langs->trans("Cancel").'">';
-    print '</div>';
+	print '<br><div class="center">';
+	print '<input class="button" type="submit" name="save" value="'.$langs->trans("Save").'">';
+	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
+	print '<input class="button" type="submit" name="cancel" value="'.$langs->trans("Cancel").'">';
+	print '</div>';
 
 	print '</form>';
 } else {
-    print dol_get_fiche_head($head, 'common_ticket', '', -1);
+	print dol_get_fiche_head($head, 'common_ticket', '', -1);
 
-    print '<span class="opacitymedium">'.$langs->trans("EMailsDesc")."</span><br>\n";
-    print "<br>\n";
+	print '<span class="opacitymedium">'.$langs->trans("EMailsDesc")."</span><br>\n";
+	print "<br>\n";
 
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre"><td class="titlefieldmiddle">'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
@@ -441,13 +441,13 @@ if ($action == 'edit')
 
 	print '</table>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 
-    if ($conf->global->MAIN_MAIL_SENDMODE_TICKET == 'mail' && empty($conf->global->MAIN_FIX_FOR_BUGGED_MTA))
-    {
-        print '<br>';
-        /*
+	if ($conf->global->MAIN_MAIL_SENDMODE_TICKET == 'mail' && empty($conf->global->MAIN_FIX_FOR_BUGGED_MTA))
+	{
+		print '<br>';
+		/*
 	    // Warning 1
     	if ($linuxlike)
     	{
@@ -457,12 +457,12 @@ if ($action == 'edit')
     			print info_admin($langs->trans("SendmailOptionNotComplete"));
     		}
     	}*/
-    	// Warning 2
-   	    print info_admin($langs->trans("SendmailOptionMayHurtBuggedMTA"));
-    }
+		// Warning 2
+   		print info_admin($langs->trans("SendmailOptionMayHurtBuggedMTA"));
+	}
 
 
-    // Buttons for actions
+	// Buttons for actions
 
 	print '<div class="tabsAction">';
 
@@ -493,8 +493,8 @@ if ($action == 'edit')
 
 	if ($conf->global->MAIN_MAIL_SENDMODE_TICKET == 'mail' && !in_array($action, array('testconnect', 'test', 'testhtml')))
 	{
-        $text = $langs->trans("WarningPHPMail");
-	    print info_admin($text);
+		$text = $langs->trans("WarningPHPMail");
+		print info_admin($text);
 	}
 
 	// Run the test to connect
@@ -522,7 +522,7 @@ if ($action == 'edit')
 	// Show email send test form
 	if ($action == 'test' || $action == 'testhtml')
 	{
-	    print '<div id="formmailbeforetitle" name="formmailbeforetitle"></div>';
+		print '<div id="formmailbeforetitle" name="formmailbeforetitle"></div>';
 		print load_fiche_titre($action == 'testhtml' ? $langs->trans("DoTestSendHTML") : $langs->trans("DoTestSend"));
 
 		print dol_get_fiche_head('');
@@ -558,14 +558,14 @@ if ($action == 'edit')
 		$formmail->param["returnurl"] = $_SERVER["PHP_SELF"];
 
 		// Init list of files
-        if (GETPOST("mode") == 'init')
+		if (GETPOST("mode") == 'init')
 		{
 			$formmail->clear_attached_files();
 		}
 
 		print $formmail->get_form('addfile', 'removefile');
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 	}
 }
 
diff --git a/htdocs/admin/menus.php b/htdocs/admin/menus.php
index a62385bf2ca..9bdc497c776 100644
--- a/htdocs/admin/menus.php
+++ b/htdocs/admin/menus.php
@@ -206,7 +206,7 @@ print '</tr>';
 
 print '</table>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '<div class="center">';
 print '<input class="button" type="submit" name="save" value="'.$langs->trans("Save").'">';
diff --git a/htdocs/admin/menus/edit.php b/htdocs/admin/menus/edit.php
index f56bf284fc9..70d2f4bcda6 100644
--- a/htdocs/admin/menus/edit.php
+++ b/htdocs/admin/menus/edit.php
@@ -398,7 +398,7 @@ if ($action == 'create')
 
 	print '</table>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div class="center">';
 	print '<input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
@@ -507,7 +507,7 @@ if ($action == 'create')
 
 	print '</table>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	// Bouton
 	print '<div class="center">';
diff --git a/htdocs/admin/menus/index.php b/htdocs/admin/menus/index.php
index f81a80794d3..f55a2a74874 100644
--- a/htdocs/admin/menus/index.php
+++ b/htdocs/admin/menus/index.php
@@ -38,8 +38,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';
 }
 
 $action = GETPOST('action', 'aZ09');
@@ -244,13 +244,13 @@ if ($action == 'delete')
 	$result = $db->query($sql);
 	$obj = $db->fetch_object($result);
 
-    print $form->formconfirm("index.php?menu_handler=".$menu_handler."&menuId=".GETPOST('menuId', 'int'), $langs->trans("DeleteMenu"), $langs->trans("ConfirmDeleteMenu", $obj->title), "confirm_delete");
+	print $form->formconfirm("index.php?menu_handler=".$menu_handler."&menuId=".GETPOST('menuId', 'int'), $langs->trans("DeleteMenu"), $langs->trans("ConfirmDeleteMenu", $obj->title), "confirm_delete");
 }
 
 $newcardbutton = '';
 if ($user->admin)
 {
-    $newcardbutton .= dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/admin/menus/edit.php?menuId=0&action=create&menu_handler='.urlencode($menu_handler).'&backtopage='.urlencode($_SERVER['PHP_SELF']));
+	$newcardbutton .= dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/admin/menus/edit.php?menuId=0&action=create&menu_handler='.urlencode($menu_handler).'&backtopage='.urlencode($_SERVER['PHP_SELF']));
 }
 
 print '<form name="newmenu" class="nocellnopadd" action="'.$_SERVER["PHP_SELF"].'">';
@@ -297,7 +297,7 @@ if ($conf->use_javascript_ajax)
 
 	//il faut d'abord declarer un element racine de l'arbre
 
-    $data[] = array('rowid'=>0, 'fk_menu'=>-1, 'title'=>"racine", 'mainmenu'=>'', 'leftmenu'=>'', 'fk_mainmenu'=>'', 'fk_leftmenu'=>'');
+	$data[] = array('rowid'=>0, 'fk_menu'=>-1, 'title'=>"racine", 'mainmenu'=>'', 'leftmenu'=>'', 'fk_mainmenu'=>'', 'fk_leftmenu'=>'');
 
 	//puis tous les elements enfants
 
@@ -337,16 +337,16 @@ if ($conf->use_javascript_ajax)
 
 			$data[] = array(
 				'rowid'=>$menu['rowid'],
-			    'module'=>$menu['module'],
+				'module'=>$menu['module'],
 				'fk_menu'=>$menu['fk_menu'],
 				'title'=>$titre,
-			    'mainmenu'=>$menu['mainmenu'],
+				'mainmenu'=>$menu['mainmenu'],
 				'leftmenu'=>$menu['leftmenu'],
 				'fk_mainmenu'=>$menu['fk_mainmenu'],
 				'fk_leftmenu'=>$menu['fk_leftmenu'],
-			    'position'=>$menu['position'],
+				'position'=>$menu['position'],
 				'entry'=>$entry,
-			    'buttons'=>$buttons
+				'buttons'=>$buttons
 			);
 			$i++;
 		}
@@ -369,36 +369,36 @@ if ($conf->use_javascript_ajax)
 
 
 	// Process remaining records (records that are not linked to root by any path)
-    $remainingdata = array();
+	$remainingdata = array();
 	foreach ($data as $datar)
 	{
-	    if (empty($datar['rowid']) || $tree_recur_alreadyadded[$datar['rowid']]) continue;
-	    $remainingdata[] = $datar;
+		if (empty($datar['rowid']) || $tree_recur_alreadyadded[$datar['rowid']]) continue;
+		$remainingdata[] = $datar;
 	}
 
 	if (count($remainingdata))
 	{
-    	print '<table class="noborder centpercent">';
+		print '<table class="noborder centpercent">';
 
-    	print '<tr class="liste_titre">';
-    	print '<td>'.$langs->trans("NotTopTreeMenuPersonalized").'</td>';
-    	print '<td class="right"></td>';
-    	print '</tr>';
+		print '<tr class="liste_titre">';
+		print '<td>'.$langs->trans("NotTopTreeMenuPersonalized").'</td>';
+		print '<td class="right"></td>';
+		print '</tr>';
 
-    	print '<tr>';
-    	print '<td colspan="2">';
-    	foreach ($remainingdata as $datar)
-    	{
-            $father = array('rowid'=>$datar['rowid'], 'title'=>"???", 'mainmenu'=>$datar['fk_mainmenu'], 'leftmenu'=>$datar['fk_leftmenu'], 'fk_mainmenu'=>'', 'fk_leftmenu'=>'');
-    	    //print 'Start with rowid='.$datar['rowid'].' mainmenu='.$father ['mainmenu'].' leftmenu='.$father ['leftmenu'].'<br>'."\n";
-    	    tree_recur($data, $father, 0, 'iddivjstree'.$datar['rowid'], 1, 1);
-    	}
+		print '<tr>';
+		print '<td colspan="2">';
+		foreach ($remainingdata as $datar)
+		{
+			$father = array('rowid'=>$datar['rowid'], 'title'=>"???", 'mainmenu'=>$datar['fk_mainmenu'], 'leftmenu'=>$datar['fk_leftmenu'], 'fk_mainmenu'=>'', 'fk_leftmenu'=>'');
+			//print 'Start with rowid='.$datar['rowid'].' mainmenu='.$father ['mainmenu'].' leftmenu='.$father ['leftmenu'].'<br>'."\n";
+			tree_recur($data, $father, 0, 'iddivjstree'.$datar['rowid'], 1, 1);
+		}
 
-    	print '</td>';
+		print '</td>';
 
-    	print '</tr>';
+		print '</tr>';
 
-    	print '</table>';
+		print '</table>';
 	}
 
 	print '</div>';
diff --git a/htdocs/admin/modulehelp.php b/htdocs/admin/modulehelp.php
index 065146489a7..7aa36b843cd 100644
--- a/htdocs/admin/modulehelp.php
+++ b/htdocs/admin/modulehelp.php
@@ -91,106 +91,106 @@ foreach ($modulesdir as $dir)
 		while (($file = readdir($handle)) !== false)
 		{
 			//print "$i ".$file."\n<br>";
-		    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_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)
-		        {
-		        	if (!empty($modNameLoaded[$modName]))
-		        	{
-		        		$mesg = "Error: Module ".$modName." was found twice: Into ".$modNameLoaded[$modName]." and ".$dir.". You probably have an old file on your disk.<br>";
-		        		setEventMessages($mesg, null, 'warnings');
-		        		dol_syslog($mesg, LOG_ERR);
+				if ($modName)
+				{
+					if (!empty($modNameLoaded[$modName]))
+					{
+						$mesg = "Error: Module ".$modName." was found twice: Into ".$modNameLoaded[$modName]." and ".$dir.". You probably have an old file on your disk.<br>";
+						setEventMessages($mesg, null, 'warnings');
+						dol_syslog($mesg, LOG_ERR);
 						continue;
-		        	}
+					}
 
-		            try {
-		                $res = include_once $dir.$file;
-		                if (class_exists($modName))
+					try {
+						$res = include_once $dir.$file;
+						if (class_exists($modName))
 						{
 							try {
-				                $objMod = new $modName($db);
+								$objMod = new $modName($db);
 								$modNameLoaded[$modName] = $dir;
 
-    		    		        if (!$objMod->numero > 0 && $modName != 'modUser')
-    		            		{
-    		         		    	dol_syslog('The module descriptor '.$modName.' must have a numero property', LOG_ERR);
-    		            		}
+								if (!$objMod->numero > 0 && $modName != 'modUser')
+								{
+					 				dol_syslog('The module descriptor '.$modName.' must have a numero property', LOG_ERR);
+								}
 								$j = $objMod->numero;
 
-    							$modulequalified = 1;
+								$modulequalified = 1;
 
-		    					// We discard modules according to features level (PS: if module is activated we always show it)
-		    					$const_name = 'MAIN_MODULE_'.strtoupper(preg_replace('/^mod/i', '', get_class($objMod)));
-		    					if ($objMod->version == 'development' && (empty($conf->global->$const_name) && ($conf->global->MAIN_FEATURES_LEVEL < 2))) $modulequalified = 0;
-		    					if ($objMod->version == 'experimental' && (empty($conf->global->$const_name) && ($conf->global->MAIN_FEATURES_LEVEL < 1))) $modulequalified = 0;
+								// We discard modules according to features level (PS: if module is activated we always show it)
+								$const_name = 'MAIN_MODULE_'.strtoupper(preg_replace('/^mod/i', '', get_class($objMod)));
+								if ($objMod->version == 'development' && (empty($conf->global->$const_name) && ($conf->global->MAIN_FEATURES_LEVEL < 2))) $modulequalified = 0;
+								if ($objMod->version == 'experimental' && (empty($conf->global->$const_name) && ($conf->global->MAIN_FEATURES_LEVEL < 1))) $modulequalified = 0;
 								if (preg_match('/deprecated/', $objMod->version) && (empty($conf->global->$const_name) && ($conf->global->MAIN_FEATURES_LEVEL >= 0))) $modulequalified = 0;
 
-		    					// We discard modules according to property disabled
-		    					//if (! empty($objMod->hidden)) $modulequalified=0;
+								// We discard modules according to property disabled
+								//if (! empty($objMod->hidden)) $modulequalified=0;
 
-		    					if ($modulequalified > 0)
-		    					{
-		    					    $publisher = dol_escape_htmltag($objMod->getPublisher());
-		    					    $external = ($objMod->isCoreOrExternalModule() == 'external');
-		    					    if ($external)
-		    					    {
-		    					        if ($publisher)
-		    					        {
-		    					            $arrayofnatures['external_'.$publisher] = $langs->trans("External").' - '.$publisher;
-		    					        } else {
-		    					            $arrayofnatures['external_'] = $langs->trans("External").' - '.$langs->trans("UnknownPublishers");
-		    					        }
-		    					    }
-		    					    ksort($arrayofnatures);
-		    					}
+								if ($modulequalified > 0)
+								{
+									$publisher = dol_escape_htmltag($objMod->getPublisher());
+									$external = ($objMod->isCoreOrExternalModule() == 'external');
+									if ($external)
+									{
+										if ($publisher)
+										{
+											$arrayofnatures['external_'.$publisher] = $langs->trans("External").' - '.$publisher;
+										} else {
+											$arrayofnatures['external_'] = $langs->trans("External").' - '.$langs->trans("UnknownPublishers");
+										}
+									}
+									ksort($arrayofnatures);
+								}
 
-		    					// Define array $categ with categ with at least one qualified module
-		    					if ($modulequalified > 0)
-		    					{
-		    						$modules[$i] = $objMod;
-		    			            $filename[$i] = $modName;
+								// Define array $categ with categ with at least one qualified module
+								if ($modulequalified > 0)
+								{
+									$modules[$i] = $objMod;
+									$filename[$i] = $modName;
 
-		    			            // Gives the possibility to the module, to provide his own family info and position of this family
-		    			            if (is_array($objMod->familyinfo) && !empty($objMod->familyinfo)) {
-		    			            	if (!is_array($familyinfo)) $familyinfo = array();
-		    			            	$familyinfo = array_merge($familyinfo, $objMod->familyinfo);
-		    			            	$familykey = key($objMod->familyinfo);
-		    			            } else {
-		    			            	$familykey = $objMod->family;
-		    			            }
+									// Gives the possibility to the module, to provide his own family info and position of this family
+									if (is_array($objMod->familyinfo) && !empty($objMod->familyinfo)) {
+										if (!is_array($familyinfo)) $familyinfo = array();
+										$familyinfo = array_merge($familyinfo, $objMod->familyinfo);
+										$familykey = key($objMod->familyinfo);
+									} else {
+										$familykey = $objMod->family;
+									}
 
-		    			            $moduleposition = ($objMod->module_position ? $objMod->module_position : '50');
-		    			            if ($moduleposition == '50' && ($objMod->isCoreOrExternalModule() == 'external'))
-		    			            {
-		    			                $moduleposition = '80'; // External modules at end by default
-		    			            }
+									$moduleposition = ($objMod->module_position ? $objMod->module_position : '50');
+									if ($moduleposition == '50' && ($objMod->isCoreOrExternalModule() == 'external'))
+									{
+										$moduleposition = '80'; // External modules at end by default
+									}
 
-		    			            $orders[$i] = $familyinfo[$familykey]['position']."_".$familykey."_".$moduleposition."_".$j; // Sort by family, then by module position then number
-		    						$dirmod[$i] = $dir;
-		    						//print $i.'-'.$dirmod[$i].'<br>';
-		    			            // Set categ[$i]
-		    						$specialstring = 'unknown';
-		    			            if ($objMod->version == 'development' || $objMod->version == 'experimental') $specialstring = 'expdev';
-		    						if (isset($categ[$specialstring])) $categ[$specialstring]++; // Array of all different modules categories
-		    			            else $categ[$specialstring] = 1;
-		    						$j++;
-		    			            $i++;
-		    					} else dol_syslog("Module ".get_class($objMod)." not qualified");
+									$orders[$i] = $familyinfo[$familykey]['position']."_".$familykey."_".$moduleposition."_".$j; // Sort by family, then by module position then number
+									$dirmod[$i] = $dir;
+									//print $i.'-'.$dirmod[$i].'<br>';
+									// Set categ[$i]
+									$specialstring = 'unknown';
+									if ($objMod->version == 'development' || $objMod->version == 'experimental') $specialstring = 'expdev';
+									if (isset($categ[$specialstring])) $categ[$specialstring]++; // Array of all different modules categories
+									else $categ[$specialstring] = 1;
+									$j++;
+									$i++;
+								} else dol_syslog("Module ".get_class($objMod)." not qualified");
 							} catch (Exception $e)
-		            		{
-		            		     dol_syslog("Failed to load ".$dir.$file." ".$e->getMessage(), LOG_ERR);
-		            		}
+							{
+								 dol_syslog("Failed to load ".$dir.$file." ".$e->getMessage(), LOG_ERR);
+							}
 						} else {
 							print "Warning bad descriptor file : ".$dir.$file." (Class ".$modName." not found into file)<br>";
 						}
 					} catch (Exception $e)
-		            {
-		                 dol_syslog("Failed to load ".$dir.$file." ".$e->getMessage(), LOG_ERR);
-		            }
-		        }
-		    }
+					{
+						 dol_syslog("Failed to load ".$dir.$file." ".$e->getMessage(), LOG_ERR);
+					}
+				}
+			}
 		}
 		closedir($handle);
 	} else {
@@ -208,16 +208,16 @@ unset($objMod);
 $i = 0;
 foreach ($orders as $tmpkey => $tmpvalue)
 {
-    $tmpMod  = $modules[$tmpkey];
-    if ($tmpMod->numero == $id)
-    {
-        $key = $i;
-        $modName = $filename[$tmpkey];
-        $dirofmodule = $dirmod[$tmpkey];
-        $objMod = $tmpMod;
-        break;
-    }
-    $i++;
+	$tmpMod = $modules[$tmpkey];
+	if ($tmpMod->numero == $id)
+	{
+		$key = $i;
+		$modName = $filename[$tmpkey];
+		$dirofmodule = $dirmod[$tmpkey];
+		$objMod = $tmpMod;
+		break;
+	}
+	$i++;
 }
 $value = $orders[$key];
 $tab = explode('_', $value);
@@ -296,7 +296,7 @@ $versiontrans .= $objMod->getVersion(1);
 $imginfo = "info";
 if ($objMod->isCoreOrExternalModule() == 'external')
 {
-    $imginfo = "info_black";
+	$imginfo = "info_black";
 }
 
 // Define text of description of module
@@ -304,138 +304,138 @@ $text = '';
 
 if ($mode == 'desc')
 {
-    if ($moduledesc) $text .= '<br>'.$moduledesc.'<br><br><br>';
+	if ($moduledesc) $text .= '<br>'.$moduledesc.'<br><br><br>';
 
-    $text .= '<span class="opacitymedium">'.$langs->trans("Version").':</span> '.$version;
+	$text .= '<span class="opacitymedium">'.$langs->trans("Version").':</span> '.$version;
 
-    $moduledescriptorfile = get_class($objMod).'.class.php';
-    $text .= '<br><span class="opacitymedium">'.$langs->trans("DescriptorFile").':</span> '.$moduledescriptorfile;
+	$moduledescriptorfile = get_class($objMod).'.class.php';
+	$text .= '<br><span class="opacitymedium">'.$langs->trans("DescriptorFile").':</span> '.$moduledescriptorfile;
 
-    $textexternal = '';
-    if ($objMod->isCoreOrExternalModule() == 'external')
-    {
-        $textexternal .= '<br><span class="opacitymedium">'.$langs->trans("Origin").':</span> '.$langs->trans("ExternalModule").' - '.$langs->trans("InstalledInto", $dirofmodule);
-        if ($objMod->editor_name != 'dolibarr') $textexternal .= '<br><span class="opacitymedium">'.$langs->trans("Publisher").':</span> '.(empty($objMod->editor_name) ? $langs->trans("Unknown") : $objMod->editor_name);
-        $editor_url = $objMod->editor_url;
-        if (!preg_match('/^http/', $editor_url)) $editor_url = 'http://'.$editor_url;
-        if (!empty($objMod->editor_url) && !preg_match('/dolibarr\.org/i', $objMod->editor_url)) $textexternal .= ($objMod->editor_name != 'dolibarr' ? ' - ' : '').img_picto('', 'globe').' <a href="'.$editor_url.'" target="_blank">'.$objMod->editor_url.'</a>';
-        $text .= $textexternal;
-        $text .= '<br>';
-    } else {
-        $text .= '<br><span class="opacitymedium">'.$langs->trans("Origin").':</span> '.$langs->trans("Core").'<br>';
-    }
+	$textexternal = '';
+	if ($objMod->isCoreOrExternalModule() == 'external')
+	{
+		$textexternal .= '<br><span class="opacitymedium">'.$langs->trans("Origin").':</span> '.$langs->trans("ExternalModule").' - '.$langs->trans("InstalledInto", $dirofmodule);
+		if ($objMod->editor_name != 'dolibarr') $textexternal .= '<br><span class="opacitymedium">'.$langs->trans("Publisher").':</span> '.(empty($objMod->editor_name) ? $langs->trans("Unknown") : $objMod->editor_name);
+		$editor_url = $objMod->editor_url;
+		if (!preg_match('/^http/', $editor_url)) $editor_url = 'http://'.$editor_url;
+		if (!empty($objMod->editor_url) && !preg_match('/dolibarr\.org/i', $objMod->editor_url)) $textexternal .= ($objMod->editor_name != 'dolibarr' ? ' - ' : '').img_picto('', 'globe').' <a href="'.$editor_url.'" target="_blank">'.$objMod->editor_url.'</a>';
+		$text .= $textexternal;
+		$text .= '<br>';
+	} else {
+		$text .= '<br><span class="opacitymedium">'.$langs->trans("Origin").':</span> '.$langs->trans("Core").'<br>';
+	}
 
-    $moduledesclong = $objMod->getDescLong();
-    if ($moduledesclong) $text .= '<br><hr><div class="moduledesclong">'.$moduledesclong.'<div>';
+	$moduledesclong = $objMod->getDescLong();
+	if ($moduledesclong) $text .= '<br><hr><div class="moduledesclong">'.$moduledesclong.'<div>';
 }
 
 if ($mode == 'feature')
 {
-    $text .= '<br><strong>'.$langs->trans("DependsOn").':</strong> ';
-    if (count($objMod->depends)) $text .= join(',', $objMod->depends);
+	$text .= '<br><strong>'.$langs->trans("DependsOn").':</strong> ';
+	if (count($objMod->depends)) $text .= join(',', $objMod->depends);
 	else $text .= $langs->trans("None");
-    $text .= '<br><strong>'.$langs->trans("RequiredBy").':</strong> ';
+	$text .= '<br><strong>'.$langs->trans("RequiredBy").':</strong> ';
 	if (count($objMod->requiredby)) $text .= join(',', $objMod->requiredby);
 	else $text .= $langs->trans("None");
 
-    $text .= '<br><br>';
+	$text .= '<br><br>';
 
-    $text .= '<br><strong>'.$langs->trans("AddDataTables").':</strong> ';
+	$text .= '<br><strong>'.$langs->trans("AddDataTables").':</strong> ';
 	$sqlfiles = dol_dir_list(dol_buildpath($moduledir.'/sql/'), 'files', 0, 'llx.*\.sql', array('\.key\.sql', '\.sql\.back'));
-    if (count($sqlfiles) > 0)
-    {
-    	$text .= $langs->trans("Yes").' (';
-    	$i = 0;
-    	foreach ($sqlfiles as $val)
-    	{
-    		$text .= ($i ? ', ' : '').preg_replace('/\.sql$/', '', preg_replace('/llx_/', '', $val['name']));
-    		$i++;
-    	}
-    	$text .= ')';
-    } else $text .= $langs->trans("No");
+	if (count($sqlfiles) > 0)
+	{
+		$text .= $langs->trans("Yes").' (';
+		$i = 0;
+		foreach ($sqlfiles as $val)
+		{
+			$text .= ($i ? ', ' : '').preg_replace('/\.sql$/', '', preg_replace('/llx_/', '', $val['name']));
+			$i++;
+		}
+		$text .= ')';
+	} else $text .= $langs->trans("No");
 
-    $text .= '<br>';
+	$text .= '<br>';
 
-    $text .= '<br><strong>'.$langs->trans("AddDictionaries").':</strong> ';
-    if (isset($objMod->dictionaries) && isset($objMod->dictionaries['tablib']) && is_array($objMod->dictionaries['tablib']) && count($objMod->dictionaries['tablib']))
-    {
-        $i = 0;
-        foreach ($objMod->dictionaries['tablib'] as $val)
-        {
-            $text .= ($i ? ', ' : '').$val;
-            $i++;
-        }
-    } else $text .= $langs->trans("No");
+	$text .= '<br><strong>'.$langs->trans("AddDictionaries").':</strong> ';
+	if (isset($objMod->dictionaries) && isset($objMod->dictionaries['tablib']) && is_array($objMod->dictionaries['tablib']) && count($objMod->dictionaries['tablib']))
+	{
+		$i = 0;
+		foreach ($objMod->dictionaries['tablib'] as $val)
+		{
+			$text .= ($i ? ', ' : '').$val;
+			$i++;
+		}
+	} else $text .= $langs->trans("No");
 
-    $text .= '<br>';
+	$text .= '<br>';
 
-    $text .= '<br><strong>'.$langs->trans("AddData").':</strong> ';
-    $filedata = dol_buildpath($moduledir.'/sql/data.sql');
-    if (dol_is_file($filedata))
-    {
-        $text .= $langs->trans("Yes").' ('.$moduledir.'/sql/data.sql)';
-    } else $text .= $langs->trans("No");
+	$text .= '<br><strong>'.$langs->trans("AddData").':</strong> ';
+	$filedata = dol_buildpath($moduledir.'/sql/data.sql');
+	if (dol_is_file($filedata))
+	{
+		$text .= $langs->trans("Yes").' ('.$moduledir.'/sql/data.sql)';
+	} else $text .= $langs->trans("No");
 
-    $text .= '<br>';
+	$text .= '<br>';
 
-    $text .= '<br><strong>'.$langs->trans("AddRemoveTabs").':</strong> ';
-    if (isset($objMod->tabs) && is_array($objMod->tabs) && count($objMod->tabs))
-    {
-        $i = 0;
-        foreach ($objMod->tabs as $val)
-        {
-        	if (is_array($val)) $val = $val['data'];
-        	if (is_string($val))
-        	{
-            	$tmp = explode(':', $val, 3);
-            	$text .= ($i ? ', ' : '').$tmp[0].':'.$tmp[1];
-           		$i++;
-        	}
-        }
-    } else $text .= $langs->trans("No");
+	$text .= '<br><strong>'.$langs->trans("AddRemoveTabs").':</strong> ';
+	if (isset($objMod->tabs) && is_array($objMod->tabs) && count($objMod->tabs))
+	{
+		$i = 0;
+		foreach ($objMod->tabs as $val)
+		{
+			if (is_array($val)) $val = $val['data'];
+			if (is_string($val))
+			{
+				$tmp = explode(':', $val, 3);
+				$text .= ($i ? ', ' : '').$tmp[0].':'.$tmp[1];
+		   		$i++;
+			}
+		}
+	} else $text .= $langs->trans("No");
 
-    $text .= '<br>';
+	$text .= '<br>';
 
-    $text .= '<br><strong>'.$langs->trans("AddModels").':</strong> ';
-    if (isset($objMod->module_parts) && isset($objMod->module_parts['models']) && $objMod->module_parts['models'])
-    {
-        $text .= $langs->trans("Yes");
-    } else $text .= $langs->trans("No");
+	$text .= '<br><strong>'.$langs->trans("AddModels").':</strong> ';
+	if (isset($objMod->module_parts) && isset($objMod->module_parts['models']) && $objMod->module_parts['models'])
+	{
+		$text .= $langs->trans("Yes");
+	} else $text .= $langs->trans("No");
 
-    $text .= '<br>';
+	$text .= '<br>';
 
-    $text .= '<br><strong>'.$langs->trans("AddSubstitutions").':</strong> ';
-    if (isset($objMod->module_parts) && isset($objMod->module_parts['substitutions']) && $objMod->module_parts['substitutions'])
-    {
-        $text .= $langs->trans("Yes");
-    } else $text .= $langs->trans("No");
+	$text .= '<br><strong>'.$langs->trans("AddSubstitutions").':</strong> ';
+	if (isset($objMod->module_parts) && isset($objMod->module_parts['substitutions']) && $objMod->module_parts['substitutions'])
+	{
+		$text .= $langs->trans("Yes");
+	} else $text .= $langs->trans("No");
 
-    $text .= '<br>';
+	$text .= '<br>';
 
-    $text .= '<br><strong>'.$langs->trans("AddSheduledJobs").':</strong> ';
-    if (isset($objMod->cronjobs) && is_array($objMod->cronjobs) && count($objMod->cronjobs))
-    {
-        $i = 0;
-        foreach ($objMod->cronjobs as $val)
-        {
-            $text .= ($i ? ', ' : '').($val['label']);
-            $i++;
-        }
-    } else $text .= $langs->trans("No");
+	$text .= '<br><strong>'.$langs->trans("AddSheduledJobs").':</strong> ';
+	if (isset($objMod->cronjobs) && is_array($objMod->cronjobs) && count($objMod->cronjobs))
+	{
+		$i = 0;
+		foreach ($objMod->cronjobs as $val)
+		{
+			$text .= ($i ? ', ' : '').($val['label']);
+			$i++;
+		}
+	} else $text .= $langs->trans("No");
 
-    $text .= '<br>';
+	$text .= '<br>';
 
-    $text .= '<br><strong>'.$langs->trans("AddTriggers").':</strong> ';
-    $moreinfoontriggerfile = '';
-    if (isset($objMod->module_parts) && isset($objMod->module_parts['triggers']) && $objMod->module_parts['triggers'])
-    {
-    	$yesno = 'Yes';
-    } else {
-    	$yesno = 'No';
-    }
-    require_once DOL_DOCUMENT_ROOT.'/core/class/interfaces.class.php';
-    $interfaces = new Interfaces($db);
-    $triggers = $interfaces->getTriggersList(array((($objMod->isCoreOrExternalModule() == 'external') ? '/'.$moduledir : '').'/core/triggers'));
+	$text .= '<br><strong>'.$langs->trans("AddTriggers").':</strong> ';
+	$moreinfoontriggerfile = '';
+	if (isset($objMod->module_parts) && isset($objMod->module_parts['triggers']) && $objMod->module_parts['triggers'])
+	{
+		$yesno = 'Yes';
+	} else {
+		$yesno = 'No';
+	}
+	require_once DOL_DOCUMENT_ROOT.'/core/class/interfaces.class.php';
+	$interfaces = new Interfaces($db);
+	$triggers = $interfaces->getTriggersList(array((($objMod->isCoreOrExternalModule() == 'external') ? '/'.$moduledir : '').'/core/triggers'));
 	foreach ($triggers as $triggercursor)
 	{
 		if ($triggercursor['module'] == $moduledir)
@@ -445,116 +445,116 @@ if ($mode == 'feature')
 		}
 	}
 
-    $text .= $langs->trans($yesno).$moreinfoontriggerfile;
+	$text .= $langs->trans($yesno).$moreinfoontriggerfile;
 
-    $text .= '<br>';
+	$text .= '<br>';
 
-    $text .= '<br><strong>'.$langs->trans("AddBoxes").':</strong> ';
-    if (isset($objMod->boxes) && is_array($objMod->boxes) && count($objMod->boxes))
-    {
-        $i = 0;
-        foreach ($objMod->boxes as $val)
-        {
-            $text .= ($i ? ', ' : '').($val['file'] ? $val['file'] : $val[0]);
-            $i++;
-        }
-    } else $text .= $langs->trans("No");
+	$text .= '<br><strong>'.$langs->trans("AddBoxes").':</strong> ';
+	if (isset($objMod->boxes) && is_array($objMod->boxes) && count($objMod->boxes))
+	{
+		$i = 0;
+		foreach ($objMod->boxes as $val)
+		{
+			$text .= ($i ? ', ' : '').($val['file'] ? $val['file'] : $val[0]);
+			$i++;
+		}
+	} else $text .= $langs->trans("No");
 
-    $text .= '<br>';
+	$text .= '<br>';
 
-    $text .= '<br><strong>'.$langs->trans("AddHooks").':</strong> ';
-    if (isset($objMod->module_parts) && is_array($objMod->module_parts['hooks']) && count($objMod->module_parts['hooks']))
-    {
-    	$i = 0;
-        foreach ($objMod->module_parts['hooks'] as $key => $val)
-        {
-        	if ($key === 'entity') continue;
+	$text .= '<br><strong>'.$langs->trans("AddHooks").':</strong> ';
+	if (isset($objMod->module_parts) && is_array($objMod->module_parts['hooks']) && count($objMod->module_parts['hooks']))
+	{
+		$i = 0;
+		foreach ($objMod->module_parts['hooks'] as $key => $val)
+		{
+			if ($key === 'entity') continue;
 
-        	// For special values
-        	if ($key === 'data')
-        	{
-        		if (is_array($val))
-        		{
-        			foreach ($val as $value)
-        			{
-        				$text .= ($i ? ', ' : '').($value);
-        				$i++;
-        			}
+			// For special values
+			if ($key === 'data')
+			{
+				if (is_array($val))
+				{
+					foreach ($val as $value)
+					{
+						$text .= ($i ? ', ' : '').($value);
+						$i++;
+					}
 
-        			continue;
-        		}
-        	}
+					continue;
+				}
+			}
 
-        	$text .= ($i ? ', ' : '').($val);
-        	$i++;
-        }
-    } else $text .= $langs->trans("No");
+			$text .= ($i ? ', ' : '').($val);
+			$i++;
+		}
+	} else $text .= $langs->trans("No");
 
-    $text .= '<br>';
+	$text .= '<br>';
 
-    $text .= '<br><strong>'.$langs->trans("AddPermissions").':</strong> ';
-    if (isset($objMod->rights) && is_array($objMod->rights) && count($objMod->rights))
-    {
-        $i = 0;
-        foreach ($objMod->rights as $val)
-        {
-        	$text .= ($i ? ', ' : '').($val[1]);
-        	$i++;
-        }
-    } else $text .= $langs->trans("No");
+	$text .= '<br><strong>'.$langs->trans("AddPermissions").':</strong> ';
+	if (isset($objMod->rights) && is_array($objMod->rights) && count($objMod->rights))
+	{
+		$i = 0;
+		foreach ($objMod->rights as $val)
+		{
+			$text .= ($i ? ', ' : '').($val[1]);
+			$i++;
+		}
+	} else $text .= $langs->trans("No");
 
-    $text .= '<br>';
+	$text .= '<br>';
 
-    $text .= '<br><strong>'.$langs->trans("AddMenus").':</strong> ';
-    if (isset($objMod->menu) && !empty($objMod->menu)) // objMod can be an array or just an int 1
-    {
-        $text .= $langs->trans("Yes");
-    } else $text .= $langs->trans("No");
+	$text .= '<br><strong>'.$langs->trans("AddMenus").':</strong> ';
+	if (isset($objMod->menu) && !empty($objMod->menu)) // objMod can be an array or just an int 1
+	{
+		$text .= $langs->trans("Yes");
+	} else $text .= $langs->trans("No");
 
-    $text .= '<br>';
+	$text .= '<br>';
 
-    $text .= '<br><strong>'.$langs->trans("AddExportProfiles").':</strong> ';
-    if (isset($objMod->export_label) && is_array($objMod->export_label) && count($objMod->export_label))
-    {
-        $i = 0;
-        foreach ($objMod->export_label as $val)
-        {
-            $text .= ($i ? ', ' : '').($val);
-            $i++;
-        }
-    } else $text .= $langs->trans("No");
+	$text .= '<br><strong>'.$langs->trans("AddExportProfiles").':</strong> ';
+	if (isset($objMod->export_label) && is_array($objMod->export_label) && count($objMod->export_label))
+	{
+		$i = 0;
+		foreach ($objMod->export_label as $val)
+		{
+			$text .= ($i ? ', ' : '').($val);
+			$i++;
+		}
+	} else $text .= $langs->trans("No");
 
-    $text .= '<br>';
+	$text .= '<br>';
 
-    $text .= '<br><strong>'.$langs->trans("AddImportProfiles").':</strong> ';
-    if (isset($objMod->import_label) && is_array($objMod->import_label) && count($objMod->import_label))
-    {
-        $i = 0;
-        foreach ($objMod->import_label as $val)
-        {
-            $text .= ($i ? ', ' : '').($val);
-            $i++;
-        }
-    } else $text .= $langs->trans("No");
+	$text .= '<br><strong>'.$langs->trans("AddImportProfiles").':</strong> ';
+	if (isset($objMod->import_label) && is_array($objMod->import_label) && count($objMod->import_label))
+	{
+		$i = 0;
+		foreach ($objMod->import_label as $val)
+		{
+			$text .= ($i ? ', ' : '').($val);
+			$i++;
+		}
+	} else $text .= $langs->trans("No");
 
-    $text .= '<br>';
+	$text .= '<br>';
 
-    $text .= '<br><strong>'.$langs->trans("AddOtherPagesOrServices").':</strong> ';
-    $text .= $langs->trans("DetectionNotPossible");
+	$text .= '<br><strong>'.$langs->trans("AddOtherPagesOrServices").':</strong> ';
+	$text .= $langs->trans("DetectionNotPossible");
 }
 
 
 if ($mode == 'changelog')
 {
-    $changelog = $objMod->getChangeLog();
-    if ($changelog) $text .= '<div class="moduledesclong">'.$changelog.'<div>';
-    else $text .= '<div class="moduledesclong">'.$langs->trans("NotAvailable").'</div>';
+	$changelog = $objMod->getChangeLog();
+	if ($changelog) $text .= '<div class="moduledesclong">'.$changelog.'<div>';
+	else $text .= '<div class="moduledesclong">'.$langs->trans("NotAvailable").'</div>';
 }
 
 print $text;
 
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '</div>';
 
diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index db4a2d85d8e..e7b7e2cd59b 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -28,7 +28,7 @@
  *  \brief      Page to activate/disable all modules
  */
 
-if (! defined('CSRFCHECK_WITH_TOKEN')) define('CSRFCHECK_WITH_TOKEN', '1');		// Force use of CSRF protection with tokens even for GET
+if (!defined('CSRFCHECK_WITH_TOKEN')) define('CSRFCHECK_WITH_TOKEN', '1'); // Force use of CSRF protection with tokens even for GET
 
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
@@ -281,7 +281,7 @@ if ($action == 'set' && $user->admin)
 
 $form = new Form($db);
 
-//$morejs  = array("/admin/dolistore/js/dolistore.js.php");
+$morejs = array();
 $morecss = array("/admin/dolistore/css/dolistore.css");
 
 // Set dir where external modules are installed
@@ -402,9 +402,9 @@ foreach ($modulesdir as $dir)
 										$arrayofwarningsext[$modName] = $objMod->warnings_activation_ext;
 									}
 
-									$familyposition = $familyinfo[$familykey]['position'];
+									$familyposition = (empty($familyinfo[$familykey]['position']) ? 0 : $familyinfo[$familykey]['position']);
 									$listOfOfficialModuleGroups = array('hr', 'technic', 'interface', 'technic', 'portal', 'financial', 'crm', 'base', 'products', 'srm', 'ecm', 'projects', 'other');
-									if ($external && ! in_array($familykey, $listOfOfficialModuleGroups))
+									if ($external && !in_array($familykey, $listOfOfficialModuleGroups))
 									{
 										// If module is extern and into a custom group (not into an official predefined one), it must appear at end (custom groups should not be before official groups).
 										if (is_numeric($familyposition)) {
@@ -883,7 +883,7 @@ if ($mode == 'common' || $mode == 'commonkanban')
 		}
 	}
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<br>';
 
@@ -916,7 +916,7 @@ if ($mode == 'marketplace')
 	print "</table>\n";
 	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<br>';
 
@@ -1136,7 +1136,7 @@ if ($mode == 'deploy')
 		}
 	}
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 }
 
 if ($mode == 'develop')
@@ -1170,7 +1170,7 @@ if ($mode == 'develop')
 
 	print "</table>\n";
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 }
 
 // End of page
diff --git a/htdocs/admin/mrp_extrafields.php b/htdocs/admin/mrp_extrafields.php
index 4078043c001..2a48713869c 100644
--- a/htdocs/admin/mrp_extrafields.php
+++ b/htdocs/admin/mrp_extrafields.php
@@ -74,15 +74,15 @@ print dol_get_fiche_head($head, 'mrp_extrafields', $langs->trans("ExtraFields"),
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_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>";
 }
 
 
@@ -92,9 +92,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';
 }
 
 /*
@@ -102,10 +102,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/multicurrency.php b/htdocs/admin/multicurrency.php
index 1973ec95909..962adae93aa 100644
--- a/htdocs/admin/multicurrency.php
+++ b/htdocs/admin/multicurrency.php
@@ -34,7 +34,7 @@ $langs->loadLangs(array('admin', 'multicurrency'));
 
 // Access control
 if (!$user->admin) {
-    accessforbidden();
+	accessforbidden();
 }
 
 // Parameters
@@ -52,9 +52,9 @@ if (preg_match('/set_([a-z0-9_\-]+)/i', $action, $reg))
 	$value = GETPOST($code, 'alpha');
 	if (dolibarr_set_const($db, $code, $value, 'chaine', 0, '', $conf->entity) > 0)
 	{
-        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	} else {
-        setEventMessages($langs->trans("Error"), null, 'errors');
+		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 }
 
@@ -63,9 +63,9 @@ if (preg_match('/del_([a-z0-9_\-]+)/i', $action, $reg))
 	$code = $reg[1];
 	if (dolibarr_del_const($db, $code, 0) > 0)
 	{
-        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	} else {
-        setEventMessages($langs->trans("Error"), null, 'errors');
+		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 }
 
@@ -132,17 +132,17 @@ if ($action == 'add_currency')
 	}
 } elseif ($action == 'setapilayer')
 {
-    if (GETPOSTISSET('modify_apilayer'))
-    {
-        dolibarr_set_const($db, 'MULTICURRENCY_APP_ID', GETPOST('MULTICURRENCY_APP_ID', 'alpha'));
-        dolibarr_set_const($db, 'MULTICURRENCY_APP_SOURCE', GETPOST('MULTICURRENCY_APP_SOURCE', 'alpha'));
-        //dolibarr_set_const($db, 'MULTICURRENCY_ALTERNATE_SOURCE', GETPOST('MULTICURRENCY_ALTERNATE_SOURCE', 'alpha'));
-    } else {
-        $result = MultiCurrency::syncRates($conf->global->MULTICURRENCY_APP_ID);
-        if ($result > 0) {
-        	setEventMessages($langs->trans("CurrencyRateSyncSucceed"), null, "mesgs");
-        }
-    }
+	if (GETPOSTISSET('modify_apilayer'))
+	{
+		dolibarr_set_const($db, 'MULTICURRENCY_APP_ID', GETPOST('MULTICURRENCY_APP_ID', 'alpha'));
+		dolibarr_set_const($db, 'MULTICURRENCY_APP_SOURCE', GETPOST('MULTICURRENCY_APP_SOURCE', 'alpha'));
+		//dolibarr_set_const($db, 'MULTICURRENCY_ALTERNATE_SOURCE', GETPOST('MULTICURRENCY_ALTERNATE_SOURCE', 'alpha'));
+	} else {
+		$result = MultiCurrency::syncRates($conf->global->MULTICURRENCY_APP_ID);
+		if ($result > 0) {
+			setEventMessages($langs->trans("CurrencyRateSyncSucceed"), null, "mesgs");
+		}
+	}
 }
 
 
@@ -189,10 +189,10 @@ print '<tr class="oddeven">';
 print '<td>'.$langs->transnoentitiesnoconv("MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE").'</td>';
 print '<td class="center">';
 if ($conf->use_javascript_ajax) {
-    print ajax_constantonoff('MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE');
+	print ajax_constantonoff('MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE');
 } else {
-    $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
-    print $form->selectarray("MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE", $arrval, $conf->global->MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE);
+	$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+	print $form->selectarray("MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE", $arrval, $conf->global->MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE);
 }
 print '</td></tr>';
 
@@ -201,26 +201,26 @@ print '<tr class="oddeven">';
 print '<td>'.$langs->transnoentitiesnoconv("multicurrency_useOriginTx").'</td>';
 print '<td class="center">';
 if ($conf->use_javascript_ajax) {
-    print ajax_constantonoff('MULTICURRENCY_USE_ORIGIN_TX');
+	print ajax_constantonoff('MULTICURRENCY_USE_ORIGIN_TX');
 } else {
-    $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
-    print $form->selectarray("MULTICURRENCY_USE_ORIGIN_TX", $arrval, $conf->global->MULTICURRENCY_USE_ORIGIN_TX);
+	$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+	print $form->selectarray("MULTICURRENCY_USE_ORIGIN_TX", $arrval, $conf->global->MULTICURRENCY_USE_ORIGIN_TX);
 }
 print '</td></tr>';
 
 // Online payment with currency on document. This option should be on by default.
 if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
 {
-    print '<tr class="oddeven">';
-    print '<td>'.$langs->transnoentitiesnoconv("MULTICURRENCY_USE_CURRENCY_ON_DOCUMENT").'</td>';
-    print '<td class="center">';
-    if ($conf->use_javascript_ajax) {
-        print ajax_constantonoff('MULTICURRENCY_USE_CURRENCY_ON_DOCUMENT');
-    } else {
-        $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
-        print $form->selectarray("MULTICURRENCY_USE_CURRENCY_ON_DOCUMENT", $arrval, $conf->global->MULTICURRENCY_USE_CURRENCY_ON_DOCUMENT);
-    }
-    print '</td></tr>';
+	print '<tr class="oddeven">';
+	print '<td>'.$langs->transnoentitiesnoconv("MULTICURRENCY_USE_CURRENCY_ON_DOCUMENT").'</td>';
+	print '<td class="center">';
+	if ($conf->use_javascript_ajax) {
+		print ajax_constantonoff('MULTICURRENCY_USE_CURRENCY_ON_DOCUMENT');
+	} else {
+		$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+		print $form->selectarray("MULTICURRENCY_USE_CURRENCY_ON_DOCUMENT", $arrval, $conf->global->MULTICURRENCY_USE_CURRENCY_ON_DOCUMENT);
+	}
+	print '</td></tr>';
 }
 
 /* TODO uncomment when the functionality will integrated
@@ -258,9 +258,9 @@ print '<br>';
 
 if (!empty($conf->global->MAIN_MULTICURRENCY_ALLOW_SYNCHRONIZATION))
 {
-    print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'" id="form_sync">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    print '<input type="hidden" name="action" value="setapilayer">';
+	print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'" id="form_sync">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="action" value="setapilayer">';
 
 	print '<div class="div-table-responsive-no-min">';
 	print '<table class="noborder centpercent">';
diff --git a/htdocs/admin/notification.php b/htdocs/admin/notification.php
index b484e7acea9..13b1b4b3e55 100644
--- a/htdocs/admin/notification.php
+++ b/htdocs/admin/notification.php
@@ -61,8 +61,8 @@ if ($action == 'settemplates')
 			$triggername = $reg[1];
 			$constvalue = GETPOST($key, 'alpha');
 			$consttype = 'emailtemplate:xxx';
-			$tmparray=explode(':', $constvalue);
-			if (! empty($tmparray[0]) && ! empty($tmparray[1])) {
+			$tmparray = explode(':', $constvalue);
+			if (!empty($tmparray[0]) && !empty($tmparray[1])) {
 				$constvalue = $tmparray[0];
 				$consttype = 'emailtemplate:'.$tmparray[1];
 				//var_dump($constvalue);
@@ -96,19 +96,19 @@ if ($action == 'setvalue' && $user->admin)
 	$db->begin();
 
 	$result = dolibarr_set_const($db, "NOTIFICATION_EMAIL_FROM", GETPOST("email_from", "restricthtml"), 'chaine', 0, '', $conf->entity);
-    if ($result < 0) $error++;
+	if ($result < 0) $error++;
 
 
-    if (!$error)
-    {
-    	$db->commit();
+	if (!$error)
+	{
+		$db->commit();
 
-    	setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    } else {
-    	$db->rollback();
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
+		$db->rollback();
 
-    	setEventMessages($langs->trans("Error"), null, 'errors');
-    }
+		setEventMessages($langs->trans("Error"), null, 'errors');
+	}
 }
 
 
@@ -116,50 +116,50 @@ if ($action == 'setfixednotif' && $user->admin)
 {
 	$db->begin();
 
-    if (!$error && is_array($_POST))
-    {
-    	$reg = array();
-	    foreach ($_POST as $key => $val)
-	    {
-	    	if (!preg_match('/^NOTIF_(.*)_key$/', $key, $reg)) continue;
+	if (!$error && is_array($_POST))
+	{
+		$reg = array();
+		foreach ($_POST as $key => $val)
+		{
+			if (!preg_match('/^NOTIF_(.*)_key$/', $key, $reg)) continue;
 
-	    	$newval = '';
-	    	$newkey = '';
+			$newval = '';
+			$newkey = '';
 
-	    	$shortkey = preg_replace('/_key$/', '', $key);
-    		//print $shortkey.'<br>';
+			$shortkey = preg_replace('/_key$/', '', $key);
+			//print $shortkey.'<br>';
 
-	    	if (preg_match('/^NOTIF_(.*)_old_(.*)_key/', $key, $reg))
-	    	{
+			if (preg_match('/^NOTIF_(.*)_old_(.*)_key/', $key, $reg))
+			{
 				dolibarr_del_const($db, 'NOTIFICATION_FIXEDEMAIL_'.$reg[1].'_THRESHOLD_HIGHER_'.$reg[2], $conf->entity);
 
 				$newkey = 'NOTIFICATION_FIXEDEMAIL_'.$reg[1].'_THRESHOLD_HIGHER_'.((int) GETPOST($shortkey.'_amount'));
 				$newval = GETPOST($shortkey.'_key');
 				//print $newkey.' - '.$newval.'<br>';
-	    	} elseif (preg_match('/^NOTIF_(.*)_new_key/', $key, $reg))
-	    	{
-	    		// Add a new entry
-	    		$newkey = 'NOTIFICATION_FIXEDEMAIL_'.$reg[1].'_THRESHOLD_HIGHER_'.((int) GETPOST($shortkey.'_amount'));
-	    		$newval = GETPOST($shortkey.'_key');
-	    	}
+			} elseif (preg_match('/^NOTIF_(.*)_new_key/', $key, $reg))
+			{
+				// Add a new entry
+				$newkey = 'NOTIFICATION_FIXEDEMAIL_'.$reg[1].'_THRESHOLD_HIGHER_'.((int) GETPOST($shortkey.'_amount'));
+				$newval = GETPOST($shortkey.'_key');
+			}
 
-	    	if ($newkey && $newval)
-	    	{
+			if ($newkey && $newval)
+			{
 				$result = dolibarr_set_const($db, $newkey, $newval, 'chaine', 0, '', $conf->entity);
-	    	}
-	    }
-    }
+			}
+		}
+	}
 
   	if (!$error)
-    {
-    	$db->commit();
+	{
+		$db->commit();
 
-        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    } else {
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
 		$db->rollback();
 
-        setEventMessages($langs->trans("Error"), null, 'errors');
-    }
+		setEventMessages($langs->trans("Error"), null, 'errors');
+	}
 }
 
 
@@ -318,66 +318,66 @@ print "</tr>\n";
 
 foreach ($listofnotifiedevents as $notifiedevent)
 {
-    $label = $langs->trans("Notify_".$notifiedevent['code']); //!=$langs->trans("Notify_".$notifiedevent['code'])?$langs->trans("Notify_".$notifiedevent['code']):$notifiedevent['label'];
+	$label = $langs->trans("Notify_".$notifiedevent['code']); //!=$langs->trans("Notify_".$notifiedevent['code'])?$langs->trans("Notify_".$notifiedevent['code']):$notifiedevent['label'];
 
-    $elementLabel = $langs->trans(ucfirst($notifiedevent['elementtype']));
+	$elementLabel = $langs->trans(ucfirst($notifiedevent['elementtype']));
 	// Special cases
-    if ($notifiedevent['elementtype'] == 'order_supplier') $elementLabel = $langs->trans('SupplierOrder');
-    elseif ($notifiedevent['elementtype'] == 'propal') $elementLabel = $langs->trans('Proposal');
-    elseif ($notifiedevent['elementtype'] == 'facture') $elementLabel = $langs->trans('Bill');
-    elseif ($notifiedevent['elementtype'] == 'commande') $elementLabel = $langs->trans('Order');
+	if ($notifiedevent['elementtype'] == 'order_supplier') $elementLabel = $langs->trans('SupplierOrder');
+	elseif ($notifiedevent['elementtype'] == 'propal') $elementLabel = $langs->trans('Proposal');
+	elseif ($notifiedevent['elementtype'] == 'facture') $elementLabel = $langs->trans('Bill');
+	elseif ($notifiedevent['elementtype'] == 'commande') $elementLabel = $langs->trans('Order');
 	elseif ($notifiedevent['elementtype'] == 'ficheinter') $elementLabel = $langs->trans('Intervention');
 	elseif ($notifiedevent['elementtype'] == 'shipping') $elementLabel = $langs->trans('Shipping');
 	elseif ($notifiedevent['elementtype'] == 'expensereport') $elementLabel = $langs->trans('ExpenseReport');
 
-    print '<tr class="oddeven">';
-    print '<td>'.$elementLabel.'</td>';
-    print '<td>'.$notifiedevent['code'].'</td>';
-    print '<td>'.$label.'</td>';
-    print '<td>';
-    // Notification with threshold
-    foreach ($conf->global as $key => $val)
-    {
+	print '<tr class="oddeven">';
+	print '<td>'.$elementLabel.'</td>';
+	print '<td>'.$notifiedevent['code'].'</td>';
+	print '<td>'.$label.'</td>';
+	print '<td>';
+	// Notification with threshold
+	foreach ($conf->global as $key => $val)
+	{
 		if ($val == '' || !preg_match('/^NOTIFICATION_FIXEDEMAIL_'.$notifiedevent['code'].'_THRESHOLD_HIGHER_(.*)/', $key, $reg)) continue;
 
-	    $param = 'NOTIFICATION_FIXEDEMAIL_'.$notifiedevent['code'].'_THRESHOLD_HIGHER_'.$reg[1];
-    	$value = GETPOST('NOTIF_'.$notifiedevent['code'].'_old_'.$reg[1].'_key') ?GETPOST('NOTIF_'.$notifiedevent['code'].'_old_'.$reg[1].'_key', 'alpha') : $conf->global->$param;
+		$param = 'NOTIFICATION_FIXEDEMAIL_'.$notifiedevent['code'].'_THRESHOLD_HIGHER_'.$reg[1];
+		$value = GETPOST('NOTIF_'.$notifiedevent['code'].'_old_'.$reg[1].'_key') ?GETPOST('NOTIF_'.$notifiedevent['code'].'_old_'.$reg[1].'_key', 'alpha') : $conf->global->$param;
 
-    	$s = '<input type="text" size="32" name="NOTIF_'.$notifiedevent['code'].'_old_'.$reg[1].'_key" value="'.dol_escape_htmltag($value).'">'; // Do not use type="email" here, we must be able to enter a list of email with , separator.
-	    $arrayemail = explode(',', $value);
+		$s = '<input type="text" size="32" name="NOTIF_'.$notifiedevent['code'].'_old_'.$reg[1].'_key" value="'.dol_escape_htmltag($value).'">'; // Do not use type="email" here, we must be able to enter a list of email with , separator.
+		$arrayemail = explode(',', $value);
 		$showwarning = 0;
 		foreach ($arrayemail as $keydet => $valuedet)
 		{
 			$valuedet = trim($valuedet);
 			if (!empty($valuedet) && !isValidEmail($valuedet, 1)) $showwarning++;
 		}
-	    if ((!empty($conf->global->$param)) && $showwarning) $s .= ' '.img_warning($langs->trans("ErrorBadEMail"));
-	    print $form->textwithpicto($s, $langs->trans("YouCanUseCommaSeparatorForSeveralRecipients").'<br>'.$langs->trans("YouCanAlsoUseSupervisorKeyword"), 1, 'help', '', 0, 2);
+		if ((!empty($conf->global->$param)) && $showwarning) $s .= ' '.img_warning($langs->trans("ErrorBadEMail"));
+		print $form->textwithpicto($s, $langs->trans("YouCanUseCommaSeparatorForSeveralRecipients").'<br>'.$langs->trans("YouCanAlsoUseSupervisorKeyword"), 1, 'help', '', 0, 2);
 		print '<br>';
-    }
-    // New entry input fields
-    $s = '<input type="text" size="32" name="NOTIF_'.$notifiedevent['code'].'_new_key" value="">'; // Do not use type="email" here, we must be able to enter a list of email with , separator.
-    print $form->textwithpicto($s, $langs->trans("YouCanUseCommaSeparatorForSeveralRecipients").'<br>'.$langs->trans("YouCanAlsoUseSupervisorKeyword"), 1, 'help', '', 0, 2);
-    print '</td>';
+	}
+	// New entry input fields
+	$s = '<input type="text" size="32" name="NOTIF_'.$notifiedevent['code'].'_new_key" value="">'; // Do not use type="email" here, we must be able to enter a list of email with , separator.
+	print $form->textwithpicto($s, $langs->trans("YouCanUseCommaSeparatorForSeveralRecipients").'<br>'.$langs->trans("YouCanAlsoUseSupervisorKeyword"), 1, 'help', '', 0, 2);
+	print '</td>';
 
-    print '<td>';
-    // Notification with threshold
-    foreach ($conf->global as $key => $val)
-    {
+	print '<td>';
+	// Notification with threshold
+	foreach ($conf->global as $key => $val)
+	{
 		if ($val == '' || !preg_match('/^NOTIFICATION_FIXEDEMAIL_'.$notifiedevent['code'].'_THRESHOLD_HIGHER_(.*)/', $key, $reg)) continue;
 
-    	print $langs->trans("AmountHT").' >= <input type="text" size="4" name="NOTIF_'.$notifiedevent['code'].'_old_'.$reg[1].'_amount" value="'.dol_escape_htmltag($reg[1]).'">';
+		print $langs->trans("AmountHT").' >= <input type="text" size="4" name="NOTIF_'.$notifiedevent['code'].'_old_'.$reg[1].'_amount" value="'.dol_escape_htmltag($reg[1]).'">';
 		print '<br>';
-    }
-    // New entry input fields
+	}
+	// New entry input fields
 	print $langs->trans("AmountHT").' >= <input type="text" size="4" name="NOTIF_'.$notifiedevent['code'].'_new_amount" value="">';
 	print '</td>';
 
-    print '<td>';
+	print '<td>';
 	// TODO Add link to show message content
 
-    print '</td>';
-    print '</tr>';
+	print '</td>';
+	print '</tr>';
 }
 print '</table>';
 
diff --git a/htdocs/admin/oauth.php b/htdocs/admin/oauth.php
index cfd93b195b3..a71e09fad56 100644
--- a/htdocs/admin/oauth.php
+++ b/htdocs/admin/oauth.php
@@ -38,7 +38,7 @@ $langs->loadLangs(array('admin', 'oauth'));
 
 // Security check
 if (!$user->admin)
-    accessforbidden();
+	accessforbidden();
 
 $action = GETPOST('action', 'aZ09');
 
@@ -49,23 +49,23 @@ $action = GETPOST('action', 'aZ09');
 
 if ($action == 'update')
 {
-    $error = 0;
+	$error = 0;
 
-    foreach ($list as $constname) {
-        $constvalue = GETPOST($constname[1], 'alpha');
-        if (!dolibarr_set_const($db, $constname[1], $constvalue, 'chaine', 0, '', $conf->entity))
-            $error++;
-        $constvalue = GETPOST($constname[2], 'alpha');
-        if (!dolibarr_set_const($db, $constname[2], $constvalue, 'chaine', 0, '', $conf->entity))
-            $error++;
-    }
+	foreach ($list as $constname) {
+		$constvalue = GETPOST($constname[1], 'alpha');
+		if (!dolibarr_set_const($db, $constname[1], $constvalue, 'chaine', 0, '', $conf->entity))
+			$error++;
+		$constvalue = GETPOST($constname[2], 'alpha');
+		if (!dolibarr_set_const($db, $constname[2], $constvalue, 'chaine', 0, '', $conf->entity))
+			$error++;
+	}
 
-    if (!$error)
-    {
-        setEventMessages($langs->trans("SetupSaved"), null);
-    } else {
-        setEventMessages($langs->trans("Error"), null, 'errors');
-    }
+	if (!$error)
+	{
+		setEventMessages($langs->trans("SetupSaved"), null);
+	} else {
+		setEventMessages($langs->trans("Error"), null, 'errors');
+	}
 }
 
 /*
@@ -97,51 +97,51 @@ $i = 0;
 // $list is defined into oauth.lib.php
 foreach ($list as $key)
 {
-    $supported = 0;
-    if (in_array($key[0], array_keys($supportedoauth2array))) $supported = 1;
-    if (!$supported) continue; // show only supported
+	$supported = 0;
+	if (in_array($key[0], array_keys($supportedoauth2array))) $supported = 1;
+	if (!$supported) continue; // show only supported
 
-    $i++;
+	$i++;
 
-    print '<tr class="liste_titre'.($i > 1 ? ' liste_titre_add' : '').'">';
-    // Api Name
-    $label = $langs->trans($key[0]);
-    print '<td>'.$label.'</td>';
-    print '<td>';
-    if (!empty($key[3])) print $langs->trans($key[3]);
-    print '</td>';
-    print '</tr>';
+	print '<tr class="liste_titre'.($i > 1 ? ' liste_titre_add' : '').'">';
+	// Api Name
+	$label = $langs->trans($key[0]);
+	print '<td>'.$label.'</td>';
+	print '<td>';
+	if (!empty($key[3])) print $langs->trans($key[3]);
+	print '</td>';
+	print '</tr>';
 
-    if ($supported)
-    {
-        $redirect_uri = $urlwithroot.'/core/modules/oauth/'.$supportedoauth2array[$key[0]].'_oauthcallback.php';
-        print '<tr class="oddeven value">';
-        print '<td>'.$langs->trans("UseTheFollowingUrlAsRedirectURI").'</td>';
-        print '<td><input style="width: 80%" type"text" name="uri'.$key[0].'" value="'.$redirect_uri.'">';
-        print '</td></tr>';
-    } else {
-        print '<tr class="oddeven value">';
-        print '<td>'.$langs->trans("UseTheFollowingUrlAsRedirectURI").'</td>';
-        print '<td>'.$langs->trans("FeatureNotYetSupported").'</td>';
-        print '</td></tr>';
-    }
+	if ($supported)
+	{
+		$redirect_uri = $urlwithroot.'/core/modules/oauth/'.$supportedoauth2array[$key[0]].'_oauthcallback.php';
+		print '<tr class="oddeven value">';
+		print '<td>'.$langs->trans("UseTheFollowingUrlAsRedirectURI").'</td>';
+		print '<td><input style="width: 80%" type"text" name="uri'.$key[0].'" value="'.$redirect_uri.'">';
+		print '</td></tr>';
+	} else {
+		print '<tr class="oddeven value">';
+		print '<td>'.$langs->trans("UseTheFollowingUrlAsRedirectURI").'</td>';
+		print '<td>'.$langs->trans("FeatureNotYetSupported").'</td>';
+		print '</td></tr>';
+	}
 
-    // Api Id
-    print '<tr class="oddeven value">';
-    print '<td><label for="'.$key[1].'">'.$langs->trans($key[1]).'</label></td>';
-    print '<td><input type="text" size="100" id="'.$key[1].'" name="'.$key[1].'" value="'.$conf->global->{$key[1]}.'">';
-    print '</td></tr>';
+	// Api Id
+	print '<tr class="oddeven value">';
+	print '<td><label for="'.$key[1].'">'.$langs->trans($key[1]).'</label></td>';
+	print '<td><input type="text" size="100" id="'.$key[1].'" name="'.$key[1].'" value="'.$conf->global->{$key[1]}.'">';
+	print '</td></tr>';
 
-    // Api Secret
-    print '<tr class="oddeven value">';
-    print '<td><label for="'.$key[2].'">'.$langs->trans($key[2]).'</label></td>';
-    print '<td><input type="password" size="100" id="'.$key[2].'" name="'.$key[2].'" value="'.$conf->global->{$key[2]}.'">';
-    print '</td></tr>';
+	// Api Secret
+	print '<tr class="oddeven value">';
+	print '<td><label for="'.$key[2].'">'.$langs->trans($key[2]).'</label></td>';
+	print '<td><input type="password" size="100" id="'.$key[2].'" name="'.$key[2].'" value="'.$conf->global->{$key[2]}.'">';
+	print '</td></tr>';
 }
 
 print '</table>'."\n";
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '<div class="center"><input type="submit" class="button" value="'.$langs->trans('Modify').'" name="button"></div>';
 
diff --git a/htdocs/admin/oauthlogintokens.php b/htdocs/admin/oauthlogintokens.php
index f0fdeb28760..4fb0bbb7452 100644
--- a/htdocs/admin/oauthlogintokens.php
+++ b/htdocs/admin/oauthlogintokens.php
@@ -156,7 +156,7 @@ if ($mode == 'setup' && $user->admin)
 			// List of keys that will be converted into scopes (from constants 'SCOPE_state_in_uppercase' in file of service).
 			// We pass this param list in to 'state' because we need it before and after the redirect.
 			$shortscope = 'userinfo_email,userinfo_profile,cloud_print';
-			if (!empty($conf->global->OAUTH_GSUITE)){
+			if (!empty($conf->global->OAUTH_GSUITE)) {
 				$shortscope .= ',admin_directory_user';
 			}
 			//$scope.=',gmail_full';
@@ -402,7 +402,7 @@ if ($mode == 'userconf' && $user->admin)
 	print '</table>';
 }
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // End of page
 llxFooter();
diff --git a/htdocs/admin/openinghours.php b/htdocs/admin/openinghours.php
index 9d70fdedff7..7cd803d5e69 100644
--- a/htdocs/admin/openinghours.php
+++ b/htdocs/admin/openinghours.php
@@ -97,37 +97,37 @@ if (empty($action) || $action == 'edit' || $action == 'updateedit')
 	print '</td><td>';
 	print '<input name="monday" id="monday" class="minwidth100" value="'.($conf->global->MAIN_INFO_OPENINGHOURS_MONDAY ? $conf->global->MAIN_INFO_OPENINGHOURS_MONDAY : GETPOST("monday", 'alpha')).'"'.(empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '' : ' autofocus="autofocus"').'></td></tr>'."\n";
 
-    print '<tr class="oddeven"><td>';
-    print $form->textwithpicto($langs->trans("Tuesday"), $langs->trans("OpeningHoursFormatDesc"));
-    print '</td><td>';
-    print '<input name="tuesday" id="tuesday" class="minwidth100" value="'.($conf->global->MAIN_INFO_OPENINGHOURS_TUESDAY ? $conf->global->MAIN_INFO_OPENINGHOURS_TUESDAY : GETPOST("tuesday", 'alpha')).'"></td></tr>'."\n";
+	print '<tr class="oddeven"><td>';
+	print $form->textwithpicto($langs->trans("Tuesday"), $langs->trans("OpeningHoursFormatDesc"));
+	print '</td><td>';
+	print '<input name="tuesday" id="tuesday" class="minwidth100" value="'.($conf->global->MAIN_INFO_OPENINGHOURS_TUESDAY ? $conf->global->MAIN_INFO_OPENINGHOURS_TUESDAY : GETPOST("tuesday", 'alpha')).'"></td></tr>'."\n";
 
-    print '<tr class="oddeven"><td>';
-    print $form->textwithpicto($langs->trans("Wednesday"), $langs->trans("OpeningHoursFormatDesc"));
-    print '</td><td>';
-    print '<input name="wednesday" id="wednesday" class="minwidth100" value="'.($conf->global->MAIN_INFO_OPENINGHOURS_WEDNESDAY ? $conf->global->MAIN_INFO_OPENINGHOURS_WEDNESDAY : GETPOST("wednesday", 'alpha')).'"></td></tr>'."\n";
+	print '<tr class="oddeven"><td>';
+	print $form->textwithpicto($langs->trans("Wednesday"), $langs->trans("OpeningHoursFormatDesc"));
+	print '</td><td>';
+	print '<input name="wednesday" id="wednesday" class="minwidth100" value="'.($conf->global->MAIN_INFO_OPENINGHOURS_WEDNESDAY ? $conf->global->MAIN_INFO_OPENINGHOURS_WEDNESDAY : GETPOST("wednesday", 'alpha')).'"></td></tr>'."\n";
 
-    print '<tr class="oddeven"><td>';
-    print $form->textwithpicto($langs->trans("Thursday"), $langs->trans("OpeningHoursFormatDesc"));
-    print '</td><td>';
-    print '<input name="thursday" id="thursday" class="minwidth100" value="'.($conf->global->MAIN_INFO_OPENINGHOURS_THURSDAY ? $conf->global->MAIN_INFO_OPENINGHOURS_THURSDAY : GETPOST("thursday", 'alpha')).'"></td></tr>'."\n";
+	print '<tr class="oddeven"><td>';
+	print $form->textwithpicto($langs->trans("Thursday"), $langs->trans("OpeningHoursFormatDesc"));
+	print '</td><td>';
+	print '<input name="thursday" id="thursday" class="minwidth100" value="'.($conf->global->MAIN_INFO_OPENINGHOURS_THURSDAY ? $conf->global->MAIN_INFO_OPENINGHOURS_THURSDAY : GETPOST("thursday", 'alpha')).'"></td></tr>'."\n";
 
-    print '<tr class="oddeven"><td>';
-    print $form->textwithpicto($langs->trans("Friday"), $langs->trans("OpeningHoursFormatDesc"));
-    print '</td><td>';
-    print '<input name="friday" id="friday" class="minwidth100" value="'.($conf->global->MAIN_INFO_OPENINGHOURS_FRIDAY ? $conf->global->MAIN_INFO_OPENINGHOURS_FRIDAY : GETPOST("friday", 'alpha')).'"></td></tr>'."\n";
+	print '<tr class="oddeven"><td>';
+	print $form->textwithpicto($langs->trans("Friday"), $langs->trans("OpeningHoursFormatDesc"));
+	print '</td><td>';
+	print '<input name="friday" id="friday" class="minwidth100" value="'.($conf->global->MAIN_INFO_OPENINGHOURS_FRIDAY ? $conf->global->MAIN_INFO_OPENINGHOURS_FRIDAY : GETPOST("friday", 'alpha')).'"></td></tr>'."\n";
 
-    print '<tr class="oddeven"><td>';
-    print $form->textwithpicto($langs->trans("Saturday"), $langs->trans("OpeningHoursFormatDesc"));
-    print '</td><td>';
-    print '<input name="saturday" id="saturday" class="minwidth100" value="'.($conf->global->MAIN_INFO_OPENINGHOURS_SATURDAY ? $conf->global->MAIN_INFO_OPENINGHOURS_SATURDAY : GETPOST("saturday", 'alpha')).'"></td></tr>'."\n";
+	print '<tr class="oddeven"><td>';
+	print $form->textwithpicto($langs->trans("Saturday"), $langs->trans("OpeningHoursFormatDesc"));
+	print '</td><td>';
+	print '<input name="saturday" id="saturday" class="minwidth100" value="'.($conf->global->MAIN_INFO_OPENINGHOURS_SATURDAY ? $conf->global->MAIN_INFO_OPENINGHOURS_SATURDAY : GETPOST("saturday", 'alpha')).'"></td></tr>'."\n";
 
-    print '<tr class="oddeven"><td>';
-    print $form->textwithpicto($langs->trans("Sunday"), $langs->trans("OpeningHoursFormatDesc"));
-    print '</td><td>';
-    print '<input name="sunday" id="sunday" class="minwidth100" value="'.($conf->global->MAIN_INFO_OPENINGHOURS_SUNDAY ? $conf->global->MAIN_INFO_OPENINGHOURS_SUNDAY : GETPOST("sunday", 'alpha')).'"></td></tr>'."\n";
+	print '<tr class="oddeven"><td>';
+	print $form->textwithpicto($langs->trans("Sunday"), $langs->trans("OpeningHoursFormatDesc"));
+	print '</td><td>';
+	print '<input name="sunday" id="sunday" class="minwidth100" value="'.($conf->global->MAIN_INFO_OPENINGHOURS_SUNDAY ? $conf->global->MAIN_INFO_OPENINGHOURS_SUNDAY : GETPOST("sunday", 'alpha')).'"></td></tr>'."\n";
 
-    print '</table>';
+	print '</table>';
 
 	print '<br><div class="center">';
 	print '<input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
diff --git a/htdocs/admin/order_extrafields.php b/htdocs/admin/order_extrafields.php
index 8435e801902..5d5573d4579 100644
--- a/htdocs/admin/order_extrafields.php
+++ b/htdocs/admin/order_extrafields.php
@@ -77,15 +77,15 @@ print dol_get_fiche_head($head, 'attributes', $langs->trans("Orders"), -1, 'orde
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_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>";
 }
 
 
@@ -98,9 +98,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';
 }
 
 /* ************************************************************************** */
@@ -110,10 +110,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/orderdet_extrafields.php b/htdocs/admin/orderdet_extrafields.php
index 3d228baeb57..2f7462a3cf0 100644
--- a/htdocs/admin/orderdet_extrafields.php
+++ b/htdocs/admin/orderdet_extrafields.php
@@ -78,15 +78,15 @@ print dol_get_fiche_head($head, 'attributeslines', $langs->trans("Orders"), -1,
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_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/payment.php b/htdocs/admin/payment.php
index 35e738754bf..d92704c211b 100644
--- a/htdocs/admin/payment.php
+++ b/htdocs/admin/payment.php
@@ -47,23 +47,23 @@ if (empty($conf->global->PAYMENT_ADDON)) $conf->global->PAYMENT_ADDON = 'mod_pay
 
 if ($action == 'updateMask')
 {
-    $maskconstpayment = GETPOST('maskconstpayment', 'alpha');
-    $maskpayment = GETPOST('maskpayment', 'alpha');
-    if ($maskconstpayment) $res = dolibarr_set_const($db, $maskconstpayment, $maskpayment, 'chaine', 0, '', $conf->entity);
+	$maskconstpayment = GETPOST('maskconstpayment', 'alpha');
+	$maskpayment = GETPOST('maskpayment', 'alpha');
+	if ($maskconstpayment) $res = dolibarr_set_const($db, $maskconstpayment, $maskpayment, 'chaine', 0, '', $conf->entity);
 
-    if (!$res > 0) $error++;
+	if (!$res > 0) $error++;
 
-    if (!$error)
-    {
-        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    } else {
-        setEventMessages($langs->trans("Error"), null, 'errors');
-    }
+	if (!$error)
+	{
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
+		setEventMessages($langs->trans("Error"), null, 'errors');
+	}
 }
 
 if ($action == 'setmod')
 {
-    dolibarr_set_const($db, "PAYMENT_ADDON", $value, 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "PAYMENT_ADDON", $value, 'chaine', 0, '', $conf->entity);
 }
 
 if ($action == 'setparams')
@@ -72,8 +72,8 @@ if ($action == 'setparams')
 	$res = dolibarr_set_const($db, "FACTURE_PAYMENTS_ON_DIFFERENT_THIRDPARTIES_BILLS", $freetext, 'chaine', 0, '', $conf->entity);
 	if (!$res > 0) $error++;
 
-    $res = dolibarr_set_const($db, "PAYMENTS_REPORT_GROUP_BY_MOD", GETPOST('PAYMENTS_REPORT_GROUP_BY_MOD', 'int'), 'chaine', 0, '', $conf->entity);
-    if (!$res > 0) $error++;
+	$res = dolibarr_set_const($db, "PAYMENTS_REPORT_GROUP_BY_MOD", GETPOST('PAYMENTS_REPORT_GROUP_BY_MOD', 'int'), 'chaine', 0, '', $conf->entity);
+	if (!$res > 0) $error++;
 
 	if ($error)
 	{
@@ -81,7 +81,7 @@ if ($action == 'setparams')
 	}
 	if (!$error)
 	{
-	    setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	}
 }
 
@@ -123,105 +123,105 @@ clearstatcache();
 
 foreach ($dirmodels as $reldir)
 {
-    $dir = dol_buildpath($reldir."core/modules/payment/");
-    if (is_dir($dir))
-    {
-        $handle = opendir($dir);
-        if (is_resource($handle))
-        {
-            while (($file = readdir($handle)) !== false)
-            {
-                if (!is_dir($dir.$file) || (substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS'))
-                {
-                    $filebis = $file;
-                    $classname = preg_replace('/\.php$/', '', $file);
-                    // For compatibility
-                    if (!is_file($dir.$filebis))
-                    {
-                        $filebis = $file."/".$file.".modules.php";
-                        $classname = "mod_payment_".$file;
-                    }
-                    // Check if there is a filter on country
-                    preg_match('/\-(.*)_(.*)$/', $classname, $reg);
-                    if (!empty($reg[2]) && $reg[2] != strtoupper($mysoc->country_code)) continue;
+	$dir = dol_buildpath($reldir."core/modules/payment/");
+	if (is_dir($dir))
+	{
+		$handle = opendir($dir);
+		if (is_resource($handle))
+		{
+			while (($file = readdir($handle)) !== false)
+			{
+				if (!is_dir($dir.$file) || (substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS'))
+				{
+					$filebis = $file;
+					$classname = preg_replace('/\.php$/', '', $file);
+					// For compatibility
+					if (!is_file($dir.$filebis))
+					{
+						$filebis = $file."/".$file.".modules.php";
+						$classname = "mod_payment_".$file;
+					}
+					// Check if there is a filter on country
+					preg_match('/\-(.*)_(.*)$/', $classname, $reg);
+					if (!empty($reg[2]) && $reg[2] != strtoupper($mysoc->country_code)) continue;
 
-                    $classname = preg_replace('/\-.*$/', '', $classname);
-                    if (!class_exists($classname) && is_readable($dir.$filebis) && (preg_match('/mod_/', $filebis) || preg_match('/mod_/', $classname)) && substr($filebis, dol_strlen($filebis) - 3, 3) == 'php')
-                    {
-                        // Charging the numbering class
-                        require_once $dir.$filebis;
+					$classname = preg_replace('/\-.*$/', '', $classname);
+					if (!class_exists($classname) && is_readable($dir.$filebis) && (preg_match('/mod_/', $filebis) || preg_match('/mod_/', $classname)) && substr($filebis, dol_strlen($filebis) - 3, 3) == 'php')
+					{
+						// Charging the numbering class
+						require_once $dir.$filebis;
 
-                        $module = new $classname($db);
+						$module = new $classname($db);
 
-                        // Show modules according to features level
-                        if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
-                        if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
+						// Show modules according to features level
+						if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
+						if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
 
-                        if ($module->isEnabled())
-                        {
-                            $var = !$var;
-                            print '<tr class="oddeven"><td width="100">';
-                            echo preg_replace('/\-.*$/', '', preg_replace('/mod_payment_/', '', preg_replace('/\.php$/', '', $file)));
-                            print "</td><td>\n";
+						if ($module->isEnabled())
+						{
+							$var = !$var;
+							print '<tr class="oddeven"><td width="100">';
+							echo preg_replace('/\-.*$/', '', preg_replace('/mod_payment_/', '', preg_replace('/\.php$/', '', $file)));
+							print "</td><td>\n";
 
-                            print $module->info();
+							print $module->info();
 
-                            print '</td>';
+							print '</td>';
 
-                            // Show example of numbering module
-                            print '<td class="nowrap">';
-                            $tmp = $module->getExample();
-                            if (preg_match('/^Error/', $tmp)) print '<div class="error">'.$langs->trans($tmp).'</div>';
-                            elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
-                            else print $tmp;
-                            print '</td>'."\n";
+							// Show example of numbering module
+							print '<td class="nowrap">';
+							$tmp = $module->getExample();
+							if (preg_match('/^Error/', $tmp)) print '<div class="error">'.$langs->trans($tmp).'</div>';
+							elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
+							else print $tmp;
+							print '</td>'."\n";
 
-                            print '<td class="center">';
-                            //print "> ".$conf->global->PAYMENT_ADDON." - ".$file;
-                            if ($conf->global->PAYMENT_ADDON == $file || $conf->global->PAYMENT_ADDON.'.php' == $file)
-                            {
-                                print img_picto($langs->trans("Activated"), 'switch_on');
-                            } else {
-                                print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmo&token='.newToken().'&value='.preg_replace('/\.php$/', '', $file).'&scan_dir='.$module->scandir.'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
-                            }
-                            print '</td>';
+							print '<td class="center">';
+							//print "> ".$conf->global->PAYMENT_ADDON." - ".$file;
+							if ($conf->global->PAYMENT_ADDON == $file || $conf->global->PAYMENT_ADDON.'.php' == $file)
+							{
+								print img_picto($langs->trans("Activated"), 'switch_on');
+							} else {
+								print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmo&token='.newToken().'&value='.preg_replace('/\.php$/', '', $file).'&scan_dir='.$module->scandir.'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+							}
+							print '</td>';
 
-                            $payment = new Paiement($db);
-                            $payment->initAsSpecimen();
+							$payment = new Paiement($db);
+							$payment->initAsSpecimen();
 
-                            // Example
-                            $htmltooltip = '';
-                            $htmltooltip .= ''.$langs->trans("Version").': <b>'.$module->getVersion().'</b><br>';
-                            $nextval = $module->getNextValue($mysoc, $payment);
-                            if ("$nextval" != $langs->trans("NotAvailable")) {  // Keep " on nextval
-                                    $htmltooltip .= $langs->trans("NextValue").': ';
-                                if ($nextval) {
-                                    if (preg_match('/^Error/', $nextval) || $nextval == 'NotConfigured')
-                                        $nextval = $langs->trans($nextval);
-                                    $htmltooltip .= $nextval.'<br>';
-                                } else {
-                                    $htmltooltip .= $langs->trans($module->error).'<br>';
-                                }
-                            }
+							// Example
+							$htmltooltip = '';
+							$htmltooltip .= ''.$langs->trans("Version").': <b>'.$module->getVersion().'</b><br>';
+							$nextval = $module->getNextValue($mysoc, $payment);
+							if ("$nextval" != $langs->trans("NotAvailable")) {  // Keep " on nextval
+									$htmltooltip .= $langs->trans("NextValue").': ';
+								if ($nextval) {
+									if (preg_match('/^Error/', $nextval) || $nextval == 'NotConfigured')
+										$nextval = $langs->trans($nextval);
+									$htmltooltip .= $nextval.'<br>';
+								} else {
+									$htmltooltip .= $langs->trans($module->error).'<br>';
+								}
+							}
 
-                            print '<td class="center">';
-                            print $form->textwithpicto('', $htmltooltip, 1, 0);
+							print '<td class="center">';
+							print $form->textwithpicto('', $htmltooltip, 1, 0);
 
-                            if ($conf->global->PAYMENT_ADDON.'.php' == $file)  // If module is the one used, we show existing errors
-                            {
-                                if (!empty($module->error)) dol_htmloutput_mesg($module->error, '', 'error', 1);
-                            }
+							if ($conf->global->PAYMENT_ADDON.'.php' == $file)  // If module is the one used, we show existing errors
+							{
+								if (!empty($module->error)) dol_htmloutput_mesg($module->error, '', 'error', 1);
+							}
 
-                            print '</td>';
+							print '</td>';
 
-                            print "</tr>\n";
-                        }
-                    }
-                }
-            }
-            closedir($handle);
-        }
-    }
+							print "</tr>\n";
+						}
+					}
+				}
+			}
+			closedir($handle);
+		}
+	}
 }
 
 print '</table>';
@@ -262,7 +262,7 @@ print "</td></tr>\n";
 print '</table>';
 print '</div>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '<br>';
 print '<div class="center">';
diff --git a/htdocs/admin/paymentbybanktransfer.php b/htdocs/admin/paymentbybanktransfer.php
index 718e64e6446..6a419d39e53 100644
--- a/htdocs/admin/paymentbybanktransfer.php
+++ b/htdocs/admin/paymentbybanktransfer.php
@@ -361,7 +361,7 @@ foreach ($dirmodels as $reldir)
 */
 
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '<br>';
 
diff --git a/htdocs/admin/pdf.php b/htdocs/admin/pdf.php
index 363edca6c80..75681ad36c0 100644
--- a/htdocs/admin/pdf.php
+++ b/htdocs/admin/pdf.php
@@ -46,7 +46,7 @@ $cancel = GETPOST('cancel', 'alpha');
  */
 
 if ($cancel) {
-    $action = '';
+	$action = '';
 }
 
 if ($action == 'update')
@@ -78,10 +78,10 @@ if ($action == 'update')
 	dolibarr_set_const($db, "MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS", $_POST["MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS"], 'chaine', 0, '', $conf->entity);
 
 
-    dolibarr_set_const($db, "MAIN_PDF_MAIN_HIDE_SECOND_TAX", $_POST["MAIN_PDF_MAIN_HIDE_SECOND_TAX"], 'chaine', 0, '', $conf->entity);
-    dolibarr_set_const($db, "MAIN_PDF_MAIN_HIDE_THIRD_TAX", $_POST["MAIN_PDF_MAIN_HIDE_THIRD_TAX"], 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_PDF_MAIN_HIDE_SECOND_TAX", $_POST["MAIN_PDF_MAIN_HIDE_SECOND_TAX"], 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_PDF_MAIN_HIDE_THIRD_TAX", $_POST["MAIN_PDF_MAIN_HIDE_THIRD_TAX"], 'chaine', 0, '', $conf->entity);
 
-    dolibarr_set_const($db, "PDF_USE_ALSO_LANGUAGE_CODE", GETPOST('PDF_USE_ALSO_LANGUAGE_CODE', 'alpha'), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "PDF_USE_ALSO_LANGUAGE_CODE", GETPOST('PDF_USE_ALSO_LANGUAGE_CODE', 'alpha'), 'chaine', 0, '', $conf->entity);
 
 	setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 
diff --git a/htdocs/admin/perms.php b/htdocs/admin/perms.php
index 41b0cc75ab1..4905f4f2497 100644
--- a/htdocs/admin/perms.php
+++ b/htdocs/admin/perms.php
@@ -44,18 +44,18 @@ $entity = $conf->entity;
 
 if ($action == 'add')
 {
-    $sql = "UPDATE ".MAIN_DB_PREFIX."rights_def SET bydefault=1";
-    $sql .= " WHERE id = ".GETPOST("pid", 'int');
-    $sql .= " AND entity = ".$conf->entity;
-    $db->query($sql);
+	$sql = "UPDATE ".MAIN_DB_PREFIX."rights_def SET bydefault=1";
+	$sql .= " WHERE id = ".GETPOST("pid", 'int');
+	$sql .= " AND entity = ".$conf->entity;
+	$db->query($sql);
 }
 
 if ($action == 'remove')
 {
-    $sql = "UPDATE ".MAIN_DB_PREFIX."rights_def SET bydefault=0";
-    $sql .= " WHERE id = ".GETPOST('pid', 'int');
-    $sql .= " AND entity = ".$conf->entity;
-    $db->query($sql);
+	$sql = "UPDATE ".MAIN_DB_PREFIX."rights_def SET bydefault=0";
+	$sql .= " WHERE id = ".GETPOST('pid', 'int');
+	$sql .= " AND entity = ".$conf->entity;
+	$db->query($sql);
 }
 
 
@@ -145,81 +145,81 @@ $sql .= " ORDER BY r.family_position, r.module_position, r.module, r.id";
 $result = $db->query($sql);
 if ($result)
 {
-    $num = $db->num_rows($result);
-    $i = 0;
-    $oldmod = '';
+	$num = $db->num_rows($result);
+	$i = 0;
+	$oldmod = '';
 
-    while ($i < $num)
-    {
-        $obj = $db->fetch_object($result);
+	while ($i < $num)
+	{
+		$obj = $db->fetch_object($result);
 
-        // If line is for a module that doe snot existe anymore (absent of includes/module), we ignore it
-        if (empty($modules[$obj->module]))
-        {
-            $i++;
-            continue;
-        }
+		// If line is for a module that doe snot existe anymore (absent of includes/module), we ignore it
+		if (empty($modules[$obj->module]))
+		{
+			$i++;
+			continue;
+		}
 
-        // Save field module_position in database if value is still zero
-        if (empty($obj->module_position))
-        {
-        	if (is_object($modules[$obj->module]) && ($modules[$obj->module]->module_position > 0))
-        	{
-        		// TODO Define familyposition
-        		$family = $modules[$obj->module]->family_position;
-        		$familyposition = 0;
-        		$sqlupdate = 'UPDATE '.MAIN_DB_PREFIX."rights_def SET module_position = ".$modules[$obj->module]->module_position.",";
-        		$sqlupdate .= " family_position = ".$familyposition;
-        		$sqlupdate .= " WHERE module_position = 0 AND module = '".$db->escape($obj->module)."'";
-        		$db->query($sqlupdate);
-        	}
-        }
+		// Save field module_position in database if value is still zero
+		if (empty($obj->module_position))
+		{
+			if (is_object($modules[$obj->module]) && ($modules[$obj->module]->module_position > 0))
+			{
+				// TODO Define familyposition
+				$family = $modules[$obj->module]->family_position;
+				$familyposition = 0;
+				$sqlupdate = 'UPDATE '.MAIN_DB_PREFIX."rights_def SET module_position = ".$modules[$obj->module]->module_position.",";
+				$sqlupdate .= " family_position = ".$familyposition;
+				$sqlupdate .= " WHERE module_position = 0 AND module = '".$db->escape($obj->module)."'";
+				$db->query($sqlupdate);
+			}
+		}
 
-        // Check if permission we found is inside a module definition. If not, we discard it.
-        $found = false;
-        foreach ($modules[$obj->module]->rights as $key => $val)
-        {
-        	if ($val[4] == $obj->perms && (empty($val[5]) || $val[5] == $obj->subperms))
-        	{
-        		$found = true;
-        		break;
-        	}
-        }
+		// Check if permission we found is inside a module definition. If not, we discard it.
+		$found = false;
+		foreach ($modules[$obj->module]->rights as $key => $val)
+		{
+			if ($val[4] == $obj->perms && (empty($val[5]) || $val[5] == $obj->subperms))
+			{
+				$found = true;
+				break;
+			}
+		}
 		if (!$found)
 		{
 			$i++;
 			continue;
 		}
 
-        // Break found, it's a new module to catch
+		// Break found, it's a new module to catch
 		if (isset($obj->module) && ($oldmod <> $obj->module))
-        {
-        	$oldmod = $obj->module;
+		{
+			$oldmod = $obj->module;
 
-        	// Break detected, we get objMod
-            $objMod = $modules[$obj->module];
-            $picto = ($objMod->picto ? $objMod->picto : 'generic');
+			// Break detected, we get objMod
+			$objMod = $modules[$obj->module];
+			$picto = ($objMod->picto ? $objMod->picto : 'generic');
 
-            // Show break line
-            print '<tr class="oddeven trforbreak">';
-            print '<td class="maxwidthonsmartphone tdoverflowonsmartphone">';
-            print img_object('', $picto, 'class="pictoobjectwidth paddingright"').' '.$objMod->getName();
-            print '<a name="'.$objMod->getName().'"></a>';
-            print '</td>';
-           	print '<td>&nbsp;</td>';
-            print '<td>&nbsp;</td>';
-            print '<td>&nbsp;</td>';
-            // Permission id
-            if ($user->admin) print '<td class="right"></td>';
-            print '</tr>'."\n";
-        }
+			// Show break line
+			print '<tr class="oddeven trforbreak">';
+			print '<td class="maxwidthonsmartphone tdoverflowonsmartphone">';
+			print img_object('', $picto, 'class="pictoobjectwidth paddingright"').' '.$objMod->getName();
+			print '<a name="'.$objMod->getName().'"></a>';
+			print '</td>';
+		   	print '<td>&nbsp;</td>';
+			print '<td>&nbsp;</td>';
+			print '<td>&nbsp;</td>';
+			// Permission id
+			if ($user->admin) print '<td class="right"></td>';
+			print '</tr>'."\n";
+		}
 
-        $perm_libelle = ($conf->global->MAIN_USE_ADVANCED_PERMS && ($langs->trans("PermissionAdvanced".$obj->id) != ("PermissionAdvanced".$obj->id)) ? $langs->trans("PermissionAdvanced".$obj->id) : (($langs->trans("Permission".$obj->id) != ("Permission".$obj->id)) ? $langs->trans("Permission".$obj->id) : $obj->label));
+		$perm_libelle = ($conf->global->MAIN_USE_ADVANCED_PERMS && ($langs->trans("PermissionAdvanced".$obj->id) != ("PermissionAdvanced".$obj->id)) ? $langs->trans("PermissionAdvanced".$obj->id) : (($langs->trans("Permission".$obj->id) != ("Permission".$obj->id)) ? $langs->trans("Permission".$obj->id) : $obj->label));
 
-        print '<tr class="oddeven">';
+		print '<tr class="oddeven">';
 
-        // Picto and label of module
-        print '<td class="maxwidthonsmartphone tdoverflowonsmartphone">';
+		// Picto and label of module
+		print '<td class="maxwidthonsmartphone tdoverflowonsmartphone">';
 		print '</td>';
 
 		// Tick
@@ -247,20 +247,20 @@ if ($result)
 		}
 
 		// Permission and tick
-        print '<td>'.$perm_libelle.'</td>';
+		print '<td>'.$perm_libelle.'</td>';
 
-        // Permission id
-        if ($user->admin) print '<td class="right"><span class="opacitymedium">'.$obj->id.'</span></td>';
+		// Permission id
+		if ($user->admin) print '<td class="right"><span class="opacitymedium">'.$obj->id.'</span></td>';
 
-        print '</tr>'."\n";
+		print '</tr>'."\n";
 
-        $i++;
-    }
+		$i++;
+	}
 } else dol_print_error($db);
 print '</table>';
 print '</div>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // End of page
 llxFooter();
diff --git a/htdocs/admin/prelevement.php b/htdocs/admin/prelevement.php
index 50d01924364..c16b5c30c47 100644
--- a/htdocs/admin/prelevement.php
+++ b/htdocs/admin/prelevement.php
@@ -368,7 +368,7 @@ foreach ($dirmodels as $reldir)
 */
 
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '<br>';
 
diff --git a/htdocs/admin/propal.php b/htdocs/admin/propal.php
index 5123cec7f08..e75a06a78ad 100644
--- a/htdocs/admin/propal.php
+++ b/htdocs/admin/propal.php
@@ -76,7 +76,7 @@ if ($action == 'updateMask') {
 	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 	foreach ($dirmodels as $reldir)
 	{
-	    $file = dol_buildpath($reldir."core/modules/propale/doc/pdf_".$modele.".modules.php");
+		$file = dol_buildpath($reldir."core/modules/propale/doc/pdf_".$modele.".modules.php");
 		if (file_exists($file))
 		{
 			$filefound = 1;
@@ -154,25 +154,25 @@ if ($action == 'updateMask') {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 } elseif ($action == 'set_BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL') {
-    $res = dolibarr_set_const($db, "BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL", $value, 'chaine', 0, '', $conf->entity);
+	$res = dolibarr_set_const($db, "BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL", $value, 'chaine', 0, '', $conf->entity);
 
-    if (!$res > 0) $error++;
+	if (!$res > 0) $error++;
 
-    if (!$error) {
-        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    } else {
-        setEventMessages($langs->trans("Error"), null, 'errors');
-    }
+	if (!$error) {
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
+		setEventMessages($langs->trans("Error"), null, 'errors');
+	}
 } elseif ($action == 'set') {
 	// Activate a model
 	$ret = addDocumentModel($value, $type, $label, $scandir);
 } elseif ($action == 'del') {
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0) {
-        if ($conf->global->PROPALE_ADDON_PDF == "$value") dolibarr_del_const($db, 'PROPALE_ADDON_PDF', $conf->entity);
+		if ($conf->global->PROPALE_ADDON_PDF == "$value") dolibarr_del_const($db, 'PROPALE_ADDON_PDF', $conf->entity);
 	}
 } elseif ($action == 'setdoc') {
-    if (dolibarr_set_const($db, "PROPALE_ADDON_PDF", $value, 'chaine', 0, '', $conf->entity)) {
+	if (dolibarr_set_const($db, "PROPALE_ADDON_PDF", $value, 'chaine', 0, '', $conf->entity)) {
 		$conf->global->PROPALE_ADDON_PDF = $value;
 	}
 
@@ -253,13 +253,13 @@ foreach ($dirmodels as $reldir)
 						print $module->info();
 						print '</td>';
 
-                        // Show example of numbering module
-                        print '<td class="nowrap">';
-                        $tmp = $module->getExample();
-                        if (preg_match('/^Error/', $tmp)) print '<div class="error">'.$langs->trans($tmp).'</div>';
-                        elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
-                        else print $tmp;
-                        print '</td>'."\n";
+						// Show example of numbering module
+						print '<td class="nowrap">';
+						$tmp = $module->getExample();
+						if (preg_match('/^Error/', $tmp)) print '<div class="error">'.$langs->trans($tmp).'</div>';
+						elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
+						else print $tmp;
+						print '</td>'."\n";
 
 						print '<td class="center">';
 						if ($conf->global->PROPALE_ADDON == "$file")
@@ -280,16 +280,16 @@ foreach ($dirmodels as $reldir)
 						$htmltooltip .= ''.$langs->trans("Version").': <b>'.$module->getVersion().'</b><br>';
 						$propal->type = 0;
 						$nextval = $module->getNextValue($mysoc, $propal);
-                        if ("$nextval" != $langs->trans("NotAvailable")) {  // Keep " on nextval
-                            $htmltooltip .= ''.$langs->trans("NextValue").': ';
-                            if ($nextval) {
-                                if (preg_match('/^Error/', $nextval) || $nextval == 'NotConfigured')
-                                    $nextval = $langs->trans($nextval);
-                                $htmltooltip .= $nextval.'<br>';
-                            } else {
-                                $htmltooltip .= $langs->trans($module->error).'<br>';
-                            }
-                        }
+						if ("$nextval" != $langs->trans("NotAvailable")) {  // Keep " on nextval
+							$htmltooltip .= ''.$langs->trans("NextValue").': ';
+							if ($nextval) {
+								if (preg_match('/^Error/', $nextval) || $nextval == 'NotConfigured')
+									$nextval = $langs->trans($nextval);
+								$htmltooltip .= $nextval.'<br>';
+							} else {
+								$htmltooltip .= $langs->trans($module->error).'<br>';
+							}
+						}
 
 						print '<td class="center">';
 						print $form->textwithpicto('', $htmltooltip, 1, 0);
@@ -348,83 +348,83 @@ clearstatcache();
 
 foreach ($dirmodels as $reldir)
 {
-    foreach (array('', '/doc') as $valdir)
-    {
-    	$realpath = $reldir."core/modules/propale".$valdir;
-    	$dir = dol_buildpath($realpath);
+	foreach (array('', '/doc') as $valdir)
+	{
+		$realpath = $reldir."core/modules/propale".$valdir;
+		$dir = dol_buildpath($realpath);
 
-        if (is_dir($dir))
-        {
-            $handle = opendir($dir);
-            if (is_resource($handle))
-            {
-                while (($file = readdir($handle)) !== false)
-                {
-                    $filelist[] = $file;
-                }
-                closedir($handle);
-                arsort($filelist);
+		if (is_dir($dir))
+		{
+			$handle = opendir($dir);
+			if (is_resource($handle))
+			{
+				while (($file = readdir($handle)) !== false)
+				{
+					$filelist[] = $file;
+				}
+				closedir($handle);
+				arsort($filelist);
 
-                foreach ($filelist as $file)
-                {
-                    if (preg_match('/\.modules\.php$/i', $file) && preg_match('/^(pdf_|doc_)/', $file))
-                    {
-                    	if (file_exists($dir.'/'.$file))
-                    	{
-                    		$name = substr($file, 4, dol_strlen($file) - 16);
-	                        $classname = substr($file, 0, dol_strlen($file) - 12);
+				foreach ($filelist as $file)
+				{
+					if (preg_match('/\.modules\.php$/i', $file) && preg_match('/^(pdf_|doc_)/', $file))
+					{
+						if (file_exists($dir.'/'.$file))
+						{
+							$name = substr($file, 4, dol_strlen($file) - 16);
+							$classname = substr($file, 0, dol_strlen($file) - 12);
 
-	                        require_once $dir.'/'.$file;
-	                        $module = new $classname($db);
+							require_once $dir.'/'.$file;
+							$module = new $classname($db);
 
-	                        $modulequalified = 1;
-	                        if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) $modulequalified = 0;
-	                        if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) $modulequalified = 0;
+							$modulequalified = 1;
+							if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) $modulequalified = 0;
+							if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) $modulequalified = 0;
 
-	                        if ($modulequalified)
-	                        {
-	                            $var = !$var;
-	                            print '<tr class="oddeven"><td width="100">';
-	                            print (empty($module->name) ? $name : $module->name);
-	                            print "</td><td>\n";
-	                            if (method_exists($module, 'info')) print $module->info($langs);
-	                            else print $module->description;
-	                            print '</td>';
+							if ($modulequalified)
+							{
+								$var = !$var;
+								print '<tr class="oddeven"><td width="100">';
+								print (empty($module->name) ? $name : $module->name);
+								print "</td><td>\n";
+								if (method_exists($module, 'info')) print $module->info($langs);
+								else print $module->description;
+								print '</td>';
 
-	                            // Active
-	                            if (in_array($name, $def))
-	                            {
-	                            	print '<td class="center">'."\n";
-	                            	print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&amp;token='.newToken().'&amp;value='.$name.'">';
-	                            	print img_picto($langs->trans("Enabled"), 'switch_on');
-	                            	print '</a>';
-	                            	print '</td>';
-	                            } else {
-	                                print "<td align=\"center\">\n";
-	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
-	                                print "</td>";
-	                            }
+								// Active
+								if (in_array($name, $def))
+								{
+									print '<td class="center">'."\n";
+									print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&amp;token='.newToken().'&amp;value='.$name.'">';
+									print img_picto($langs->trans("Enabled"), 'switch_on');
+									print '</a>';
+									print '</td>';
+								} else {
+									print "<td align=\"center\">\n";
+									print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+									print "</td>";
+								}
 
-	                            // Defaut
-	                            print "<td align=\"center\">";
-	                            if ($conf->global->PROPALE_ADDON_PDF == "$name")
-	                            {
-	                                print img_picto($langs->trans("Default"), 'on');
-	                            } else {
-	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
-	                            }
-	                            print '</td>';
+								// Defaut
+								print "<td align=\"center\">";
+								if ($conf->global->PROPALE_ADDON_PDF == "$name")
+								{
+									print img_picto($langs->trans("Default"), 'on');
+								} else {
+									print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+								}
+								print '</td>';
 
-	                            // Info
-	                            $htmltooltip = $langs->trans("Name").': '.$module->name;
-	                            $htmltooltip .= '<br>'.$langs->trans("Type").': '.($module->type ? $module->type : $langs->trans("Unknown"));
-	                            if ($module->type == 'pdf')
-	                            {
-	                                $htmltooltip .= '<br>'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur;
-	                            }
-	                            $htmltooltip .= '<br>'.$langs->trans("Path").': '.preg_replace('/^\//', '', $realpath).'/'.$file;
+								// Info
+								$htmltooltip = $langs->trans("Name").': '.$module->name;
+								$htmltooltip .= '<br>'.$langs->trans("Type").': '.($module->type ? $module->type : $langs->trans("Unknown"));
+								if ($module->type == 'pdf')
+								{
+									$htmltooltip .= '<br>'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur;
+								}
+								$htmltooltip .= '<br>'.$langs->trans("Path").': '.preg_replace('/^\//', '', $realpath).'/'.$file;
 
-	                            $htmltooltip .= '<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
+								$htmltooltip .= '<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
 								$htmltooltip .= '<br>'.$langs->trans("Logo").': '.yn($module->option_logo, 1, 1);
 								$htmltooltip .= '<br>'.$langs->trans("PaymentMode").': '.yn($module->option_modereg, 1, 1);
 								$htmltooltip .= '<br>'.$langs->trans("PaymentConditions").': '.yn($module->option_condreg, 1, 1);
@@ -434,28 +434,28 @@ foreach ($dirmodels as $reldir)
 								$htmltooltip .= '<br>'.$langs->trans("WatermarkOnDraftProposal").': '.yn($module->option_draft_watermark, 1, 1);
 
 
-	                            print '<td class="center">';
-	                            print $form->textwithpicto('', $htmltooltip, 1, 0);
-	                            print '</td>';
+								print '<td class="center">';
+								print $form->textwithpicto('', $htmltooltip, 1, 0);
+								print '</td>';
 
-	                            // Preview
-	                            print '<td class="center">';
-	                            if ($module->type == 'pdf')
-	                            {
-	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'bill').'</a>';
-	                            } else {
-	                                print img_object($langs->trans("PreviewNotAvailable"), 'generic');
-	                            }
-	                            print '</td>';
+								// Preview
+								print '<td class="center">';
+								if ($module->type == 'pdf')
+								{
+									print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'bill').'</a>';
+								} else {
+									print img_object($langs->trans("PreviewNotAvailable"), 'generic');
+								}
+								print '</td>';
 
-	                            print "</tr>\n";
-	                        }
-                    	}
-                    }
-                }
-            }
-        }
-    }
+								print "</tr>\n";
+							}
+						}
+					}
+				}
+			}
+		}
+	}
 }
 
 print '</table>';
@@ -623,11 +623,11 @@ print $form->textwithpicto($langs->trans("FreeLegalTextOnProposal"), $langs->tra
 $variablename = 'PROPOSAL_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/proxy.php b/htdocs/admin/proxy.php
index a9205cb9e5f..71bd50ef5ce 100644
--- a/htdocs/admin/proxy.php
+++ b/htdocs/admin/proxy.php
@@ -197,7 +197,7 @@ print '</tr>';
 
 print '</table>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '<div class="center">';
 print '<input type="submit" class="button" name="button" value="'.$langs->trans("Modify").'">';
diff --git a/htdocs/admin/receiptprinter.php b/htdocs/admin/receiptprinter.php
index 0e3008c57cd..3f66d04ca01 100644
--- a/htdocs/admin/receiptprinter.php
+++ b/htdocs/admin/receiptprinter.php
@@ -354,7 +354,7 @@ if ($mode == 'config' && $user->admin) {
 
 	print '</table>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '</form>';
 
@@ -460,7 +460,7 @@ if ($mode == 'template' && $user->admin) {
 	}
 	print '</form>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<br>';
 
diff --git a/htdocs/admin/reception_extrafields.php b/htdocs/admin/reception_extrafields.php
index 27f33be8157..605b8cf465e 100644
--- a/htdocs/admin/reception_extrafields.php
+++ b/htdocs/admin/reception_extrafields.php
@@ -83,7 +83,7 @@ print dol_get_fiche_head($head, 'attributes_reception', $langs->trans("Reception
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 // Buttons
diff --git a/htdocs/admin/resource.php b/htdocs/admin/resource.php
index 286e6d15565..ecf72df9b37 100644
--- a/htdocs/admin/resource.php
+++ b/htdocs/admin/resource.php
@@ -142,7 +142,7 @@ print '</form>';
 //RESOURCE_HIDE_ADD_CONTACT_USER
 //RESOURCE_HIDE_ADD_CONTACT_THIPARTY
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // End of page
 llxFooter();
diff --git a/htdocs/admin/resource_extrafields.php b/htdocs/admin/resource_extrafields.php
index d0e2a3e5b0a..219643e8303 100644
--- a/htdocs/admin/resource_extrafields.php
+++ b/htdocs/admin/resource_extrafields.php
@@ -77,15 +77,15 @@ print dol_get_fiche_head($head, 'attributes', $langs->trans("ResourceSingular"),
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_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>";
 }
 
 
@@ -98,9 +98,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';
 }
 
 /* ************************************************************************** */
@@ -110,10 +110,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/security.php b/htdocs/admin/security.php
index db91aae87a1..d9eae8f064e 100644
--- a/htdocs/admin/security.php
+++ b/htdocs/admin/security.php
@@ -53,51 +53,51 @@ if ($action == 'setgeneraterule')
 
 if ($action == 'activate_encrypt')
 {
-    $error = 0;
+	$error = 0;
 
 	$db->begin();
 
-    dolibarr_set_const($db, "DATABASE_PWD_ENCRYPTED", "1", 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "DATABASE_PWD_ENCRYPTED", "1", 'chaine', 0, '', $conf->entity);
 
-    $sql = "SELECT u.rowid, u.pass, u.pass_crypted";
-    $sql .= " FROM ".MAIN_DB_PREFIX."user as u";
-    $sql .= " WHERE u.pass IS NOT NULL AND LENGTH(u.pass) < 32"; // Not a MD5 value
+	$sql = "SELECT u.rowid, u.pass, u.pass_crypted";
+	$sql .= " FROM ".MAIN_DB_PREFIX."user as u";
+	$sql .= " WHERE u.pass IS NOT NULL AND LENGTH(u.pass) < 32"; // Not a MD5 value
 
-    $resql = $db->query($sql);
-    if ($resql)
-    {
-        $numrows = $db->num_rows($resql);
-        $i = 0;
-        while ($i < $numrows)
-        {
-            $obj = $db->fetch_object($resql);
-            if (dol_hash($obj->pass))
-            {
-                $sql = "UPDATE ".MAIN_DB_PREFIX."user";
-                $sql .= " SET pass_crypted = '".dol_hash($obj->pass)."', pass = NULL";
-                $sql .= " WHERE rowid=".$obj->rowid;
-                //print $sql;
+	$resql = $db->query($sql);
+	if ($resql)
+	{
+		$numrows = $db->num_rows($resql);
+		$i = 0;
+		while ($i < $numrows)
+		{
+			$obj = $db->fetch_object($resql);
+			if (dol_hash($obj->pass))
+			{
+				$sql = "UPDATE ".MAIN_DB_PREFIX."user";
+				$sql .= " SET pass_crypted = '".dol_hash($obj->pass)."', pass = NULL";
+				$sql .= " WHERE rowid=".$obj->rowid;
+				//print $sql;
 
-                $resql2 = $db->query($sql);
-                if (!$resql2)
-                {
-                    dol_print_error($db);
-                    $error++;
-                    break;
-                }
+				$resql2 = $db->query($sql);
+				if (!$resql2)
+				{
+					dol_print_error($db);
+					$error++;
+					break;
+				}
 
-                $i++;
-            }
-        }
-    } else dol_print_error($db);
+				$i++;
+			}
+		}
+	} else dol_print_error($db);
 
 	//print $error." ".$sql;
-    //exit;
-    if (!$error)
+	//exit;
+	if (!$error)
 	{
 		$db->commit();
 		header("Location: security.php");
-	    exit;
+		exit;
 	} else {
 		$db->rollback();
 		dol_print_error($db, '');
@@ -109,9 +109,9 @@ if ($action == 'activate_encrypt')
 	if ($allow_disable_encryption)
 	{
 		dolibarr_del_const($db, "DATABASE_PWD_ENCRYPTED", $conf->entity);
-    }
+	}
 	header("Location: security.php");
-    exit;
+	exit;
 }
 
 if ($action == 'activate_encryptdbpassconf')
@@ -119,9 +119,9 @@ if ($action == 'activate_encryptdbpassconf')
 	$result = encodedecode_dbpassconf(1);
 	if ($result > 0)
 	{
-	    sleep(3); // Don't know why but we need to wait file is completely saved before making the reload. Even with flush and clearstatcache, we need to wait.
+		sleep(3); // Don't know why but we need to wait file is completely saved before making the reload. Even with flush and clearstatcache, we need to wait.
 
-	    // database value not required
+		// database value not required
 		//dolibarr_set_const($db, "MAIN_DATABASE_PWD_CONFIG_ENCRYPTED", "1");
 		header("Location: security.php");
 		exit;
@@ -133,7 +133,7 @@ if ($action == 'activate_encryptdbpassconf')
 	$result = encodedecode_dbpassconf(0);
 	if ($result > 0)
 	{
-	    sleep(3); // Don't know why but we need to wait file is completely saved before making the reload. Even with flush and clearstatcache, we need to wait.
+		sleep(3); // Don't know why but we need to wait file is completely saved before making the reload. Even with flush and clearstatcache, we need to wait.
 
 		// database value not required
 		//dolibarr_del_const($db, "MAIN_DATABASE_PWD_CONFIG_ENCRYPTED",$conf->entity);
@@ -158,24 +158,24 @@ if ($action == 'activate_MAIN_SECURITY_DISABLEFORGETPASSLINK')
 
 if ($action == 'updatepattern')
 {
-    $pattern = GETPOST("pattern", "alpha");
-    $explodePattern = explode(';', $pattern);
+	$pattern = GETPOST("pattern", "alpha");
+	$explodePattern = explode(';', $pattern);
 
-    $patternInError = false;
-    if ($explodePattern[0] < 1 || $explodePattern[4] < 0) {
-        $patternInError = true;
-    }
+	$patternInError = false;
+	if ($explodePattern[0] < 1 || $explodePattern[4] < 0) {
+		$patternInError = true;
+	}
 
-    if ($explodePattern[0] < $explodePattern[1] + $explodePattern[2] + $explodePattern[3]) {
-        $patternInError = true;
-    }
+	if ($explodePattern[0] < $explodePattern[1] + $explodePattern[2] + $explodePattern[3]) {
+		$patternInError = true;
+	}
 
-    if (!$patternInError) {
-	    dolibarr_set_const($db, "USER_PASSWORD_PATTERN", $pattern, 'chaine', 0, '', $conf->entity);
-	    setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	    header("Location: security.php");
-	    exit;
-    }
+	if (!$patternInError) {
+		dolibarr_set_const($db, "USER_PASSWORD_PATTERN", $pattern, 'chaine', 0, '', $conf->entity);
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+		header("Location: security.php");
+		exit;
+	}
 }
 
 
@@ -214,20 +214,20 @@ $handle = opendir($dir);
 $i = 1;
 if (is_resource($handle))
 {
-    while (($file = readdir($handle)) !== false)
-    {
-        if (preg_match('/(modGeneratePass[a-z]+)\.class\.php$/i', $file, $reg))
-        {
-            // Charging the numbering class
-            $classname = $reg[1];
-            require_once $dir.'/'.$file;
+	while (($file = readdir($handle)) !== false)
+	{
+		if (preg_match('/(modGeneratePass[a-z]+)\.class\.php$/i', $file, $reg))
+		{
+			// Charging the numbering class
+			$classname = $reg[1];
+			require_once $dir.'/'.$file;
 
-            $obj = new $classname($db, $conf, $langs, $user);
-            $arrayhandler[$obj->id] = $obj;
-    		$i++;
-        }
-    }
-    closedir($handle);
+			$obj = new $classname($db, $conf, $langs, $user);
+			$arrayhandler[$obj->id] = $obj;
+			$i++;
+		}
+	}
+	closedir($handle);
 }
 asort($arrayhandler);
 
@@ -241,33 +241,33 @@ print '</tr>';
 foreach ($arrayhandler as $key => $module)
 {
 	// Show modules according to features level
-    if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
-    if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
+	if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
+	if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
 
 	if ($module->isEnabled())
 	{
-        print '<tr class="oddeven"><td width="100">';
-        print ucfirst($key);
-        print "</td><td>\n";
-        print $module->getDescription().'<br>';
-        print $langs->trans("MinLength").': '.$module->length;
-        print '</td>';
+		print '<tr class="oddeven"><td width="100">';
+		print ucfirst($key);
+		print "</td><td>\n";
+		print $module->getDescription().'<br>';
+		print $langs->trans("MinLength").': '.$module->length;
+		print '</td>';
 
-        // Show example of numbering module
-        print '<td class="nowrap">';
-        $tmp = $module->getExample();
-        if (preg_match('/^Error/', $tmp)) { $langs->load("errors"); print '<div class="error">'.$langs->trans($tmp).'</div>'; } elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
-        else print $tmp;
-        print '</td>'."\n";
+		// Show example of numbering module
+		print '<td class="nowrap">';
+		$tmp = $module->getExample();
+		if (preg_match('/^Error/', $tmp)) { $langs->load("errors"); print '<div class="error">'.$langs->trans($tmp).'</div>'; } elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
+		else print $tmp;
+		print '</td>'."\n";
 
-        print '<td width="100" align="center">';
-        if ($conf->global->USER_PASSWORD_GENERATED == $key)
-        {
-            print img_picto('', 'tick');
-        } else {
-            print '<a href="'.$_SERVER['PHP_SELF'].'?action=setgeneraterule&amp;token='.newToken().'&amp;value='.$key.'">'.$langs->trans("Activate").'</a>';
-        }
-        print "</td></tr>\n";
+		print '<td width="100" align="center">';
+		if ($conf->global->USER_PASSWORD_GENERATED == $key)
+		{
+			print img_picto('', 'tick');
+		} else {
+			print '<a href="'.$_SERVER['PHP_SELF'].'?action=setgeneraterule&amp;token='.newToken().'&amp;value='.$key.'">'.$langs->trans("Activate").'</a>';
+		}
+		print "</td></tr>\n";
 	}
 }
 print '</table>';
@@ -493,14 +493,14 @@ print '<br>';
 
 if (GETPOST('info', 'int') > 0)
 {
-    if (function_exists('password_hash'))
-    {
-        print $langs->trans("Note: The function password_hash exists on your PHP")."<br>\n";
-    } else {
-        print $langs->trans("Note: The function password_hash does not exists on your PHP")."<br>\n";
-    }
-    print 'MAIN_SECURITY_HASH_ALGO = '.$conf->global->MAIN_SECURITY_HASH_ALGO."<br>\n";
-    print 'MAIN_SECURITY_SALT = '.$conf->global->MAIN_SECURITY_SALT."<br>\n";
+	if (function_exists('password_hash'))
+	{
+		print $langs->trans("Note: The function password_hash exists on your PHP")."<br>\n";
+	} else {
+		print $langs->trans("Note: The function password_hash does not exists on your PHP")."<br>\n";
+	}
+	print 'MAIN_SECURITY_HASH_ALGO = '.$conf->global->MAIN_SECURITY_HASH_ALGO."<br>\n";
+	print 'MAIN_SECURITY_SALT = '.$conf->global->MAIN_SECURITY_SALT."<br>\n";
 }
 
 print '</div>';
diff --git a/htdocs/admin/security_file.php b/htdocs/admin/security_file.php
index fba88d768c4..2669e741c6e 100644
--- a/htdocs/admin/security_file.php
+++ b/htdocs/admin/security_file.php
@@ -153,7 +153,7 @@ if (ini_get('safe_mode') && !empty($conf->global->MAIN_ANTIVIRUS_COMMAND))
 		dol_syslog("safe_mode is on, basedir is ".$basedir.", safe_mode_exec_dir is ".ini_get('safe_mode_exec_dir'), LOG_WARNING);
 	}
 }
-print '<input type="text" name="MAIN_ANTIVIRUS_COMMAND" class="minwidth500imp" value="'.(!empty($conf->global->MAIN_ANTIVIRUS_COMMAND) ?dol_escape_htmltag($conf->global->MAIN_ANTIVIRUS_COMMAND) : '').'">';
+print '<input type="text" '.(defined('MAIN_ANTIVIRUS_COMMAND') ? 'disabled' : '').' name="MAIN_ANTIVIRUS_COMMAND" class="minwidth500imp" value="'.(!empty($conf->global->MAIN_ANTIVIRUS_COMMAND) ?dol_escape_htmltag($conf->global->MAIN_ANTIVIRUS_COMMAND) : '').'">';
 if (defined('MAIN_ANTIVIRUS_COMMAND')) {
 	print '<br><span class="opacitymedium">'.$langs->trans("ValueIsForcedBySystem").'</span>';
 }
@@ -177,7 +177,7 @@ print '</tr>';
 print '</table>';
 print '</div>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '<div class="center"><input type="submit" class="button" name="button" value="'.$langs->trans("Modify").'"></div>';
 
diff --git a/htdocs/admin/security_other.php b/htdocs/admin/security_other.php
index ff0ca0006af..5f063dbe2a2 100644
--- a/htdocs/admin/security_other.php
+++ b/htdocs/admin/security_other.php
@@ -121,8 +121,8 @@ if (function_exists("imagecreatefrompng"))
 		}
 	}
 } else {
-    $desc = $form->textwithpicto('', $langs->transnoentities("EnableGDLibraryDesc"), 1, 'warning');
-    print $desc;
+	$desc = $form->textwithpicto('', $langs->transnoentities("EnableGDLibraryDesc"), 1, 'warning');
+	print $desc;
 }
 print '</td></tr>';
 
@@ -184,7 +184,7 @@ print '</tr>';
 
 print '</table>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '<div class="center"><input type="submit" class="button" name="button" value="'.$langs->trans("Modify").'"></div>';
 
diff --git a/htdocs/admin/sms.php b/htdocs/admin/sms.php
index e09304a4921..e34d2ab9b7a 100644
--- a/htdocs/admin/sms.php
+++ b/htdocs/admin/sms.php
@@ -86,32 +86,32 @@ if ($action == 'send' && !$_POST['cancel'])
 	if (!empty($formsms->error))
 	{
 		setEventMessages($formsms->error, $formsms->errors, 'errors');
-	    $action = 'test';
-	    $error++;
+		$action = 'test';
+		$error++;
+	}
+	if (empty($body))
+	{
+		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Message")), null, 'errors');
+		$action = 'test';
+		$error++;
 	}
-    if (empty($body))
-    {
-        setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Message")), null, 'errors');
-        $action = 'test';
-        $error++;
-    }
 	if (empty($smsfrom) || !str_replace('+', '', $smsfrom))
 	{
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("SmsFrom")), null, 'errors');
-        $action = 'test';
+		$action = 'test';
 		$error++;
 	}
 	if (empty($sendto) || !str_replace('+', '', $sendto))
 	{
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("SmsTo")), null, 'errors');
-        $action = 'test';
+		$action = 'test';
 		$error++;
 	}
 	if (!$error)
 	{
 		// Make substitutions into message
-        complete_substitutions_array($substitutionarrayfortest, $langs);
-	    $body = make_substitutions($body, $substitutionarrayfortest);
+		complete_substitutions_array($substitutionarrayfortest, $langs);
+		$body = make_substitutions($body, $substitutionarrayfortest);
 
 		require_once DOL_DOCUMENT_ROOT.'/core/class/CSMSFile.class.php';
 
@@ -180,7 +180,7 @@ if ($action == 'edit')
 	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_SMS_SENDMODE").'</td><td>';
 	if (count($listofmethods)) print $form->selectarray('MAIN_SMS_SENDMODE', $listofmethods, $conf->global->MAIN_SMS_SENDMODE, 1);
 	else print '<font class="error">'.$langs->trans("None").'</font>';
-    print '</td></tr>';
+	print '</td></tr>';
 
 	// From
 	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_SMS_FROM", $langs->transnoentities("Undefined")).'</td>';
@@ -259,9 +259,9 @@ if ($action == 'edit')
 
 	if (count($listofmethods) && !empty($conf->global->MAIN_SMS_SENDMODE))
 	{
-	    print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=test&amp;mode=init">'.$langs->trans("DoTestSend").'</a>';
+		print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=test&amp;mode=init">'.$langs->trans("DoTestSend").'</a>';
 	} else {
-        print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans("DoTestSend").'</a>';
+		print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans("DoTestSend").'</a>';
 	}
 	print '</div>';
 
@@ -298,9 +298,9 @@ if ($action == 'edit')
 		// Cree l'objet formulaire mail
 		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formsms.class.php';
 		$formsms = new FormSms($db);
-        $formsms->fromtype = 'user';
-        $formsms->fromid = $user->id;
-        $formsms->fromsms = (GETPOSTISSET('fromsms') ? $_POST['fromsms'] : ($conf->global->MAIN_MAIL_SMS_FROM ? $conf->global->MAIN_MAIL_SMS_FROM : $user->user_mobile));
+		$formsms->fromtype = 'user';
+		$formsms->fromid = $user->id;
+		$formsms->fromsms = (GETPOSTISSET('fromsms') ? $_POST['fromsms'] : ($conf->global->MAIN_MAIL_SMS_FROM ? $conf->global->MAIN_MAIL_SMS_FROM : $user->user_mobile));
 		$formsms->withfromreadonly = 0;
 		$formsms->withsubstit = 0;
 		$formsms->withfrom = 1;
diff --git a/htdocs/admin/socialnetworks.php b/htdocs/admin/socialnetworks.php
index 3d959b04b83..0ab3a91432b 100644
--- a/htdocs/admin/socialnetworks.php
+++ b/htdocs/admin/socialnetworks.php
@@ -43,26 +43,26 @@ $action = GETPOST('action', 'aZ09');
  */
 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);
+	}
 }
 
 
@@ -96,19 +96,19 @@ print '<br>';
 $arrayofsocialnetworks = array('jabber'=>'Jabber', 'skype'=>'Skype', 'twitter'=>'Twitter', 'facebook'=>'Facebook', 'linkedin'=>'LinkedIn');
 
 foreach ($arrayofsocialnetworks as $snkey => $snlabel) {
-    $consttocheck = 'SOCIALNETWORKS_'.strtoupper($snkey);
-    if ($conf->use_javascript_ajax) {
-        $link = ajax_constantonoff($consttocheck);
-    } else {
-        $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
-        $link = $form->selectarray($consttocheck, $arrval, $conf->global->$consttocheck);
-    }
+	$consttocheck = 'SOCIALNETWORKS_'.strtoupper($snkey);
+	if ($conf->use_javascript_ajax) {
+		$link = ajax_constantonoff($consttocheck);
+	} else {
+		$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+		$link = $form->selectarray($consttocheck, $arrval, $conf->global->$consttocheck);
+	}
 
-    print $langs->trans('EnableFeatureFor', $snlabel).' '.$link.'<br><br>';
+	print $langs->trans('EnableFeatureFor', $snlabel).' '.$link.'<br><br>';
 }
 
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '</form>';
 
diff --git a/htdocs/admin/spip.php b/htdocs/admin/spip.php
index 772d4e32707..2fa111578a9 100644
--- a/htdocs/admin/spip.php
+++ b/htdocs/admin/spip.php
@@ -55,48 +55,48 @@ if ($action == 'update' || $action == 'add')
 	$consttypearray = GETPOST("consttype", 'array');
 	$constnotearray = GETPOST("constnote", 'array');
 
-    // Action mise a jour ou ajout d'une constante
-    if ($action == 'update' || $action == 'add')
-    {
-    	foreach ($constnamearray as $key => $val)
-    	{
-    		$constname = dol_escape_htmltag($constnamearray[$key]);
-    		$constvalue = dol_escape_htmltag($constvaluearray[$key]);
-    		$consttype = dol_escape_htmltag($consttypearray[$key]);
-    		$constnote = dol_escape_htmltag($constnotearray[$key]);
+	// Action mise a jour ou ajout d'une constante
+	if ($action == 'update' || $action == 'add')
+	{
+		foreach ($constnamearray as $key => $val)
+		{
+			$constname = dol_escape_htmltag($constnamearray[$key]);
+			$constvalue = dol_escape_htmltag($constvaluearray[$key]);
+			$consttype = dol_escape_htmltag($consttypearray[$key]);
+			$constnote = dol_escape_htmltag($constnotearray[$key]);
 
-        	$res = dolibarr_set_const($db, $constname, $constvalue, $type[$consttype], 0, $constnote, $conf->entity);
+			$res = dolibarr_set_const($db, $constname, $constvalue, $type[$consttype], 0, $constnote, $conf->entity);
 
-    		if (!$res > 0) $error++;
-    	}
+			if (!$res > 0) $error++;
+		}
 
-     	if (!$error)
-        {
-            setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-        } else {
-            setEventMessages($langs->trans("Error"), null, 'errors');
-        }
-    }
+	 	if (!$error)
+		{
+			setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+		} else {
+			setEventMessages($langs->trans("Error"), null, 'errors');
+		}
+	}
 }
 
 // Action activation d'un sous module du module adherent
 if ($action == 'set')
 {
-    $result = dolibarr_set_const($db, $_GET["name"], $_GET["value"], '', 0, '', $conf->entity);
-    if ($result < 0)
-    {
-        dol_print_error($db);
-    }
+	$result = dolibarr_set_const($db, $_GET["name"], $_GET["value"], '', 0, '', $conf->entity);
+	if ($result < 0)
+	{
+		dol_print_error($db);
+	}
 }
 
 // Action desactivation d'un sous module du module adherent
 if ($action == 'unset')
 {
-    $result = dolibarr_del_const($db, $_GET["name"], $conf->entity);
-    if ($result < 0)
-    {
-        dol_print_error($db);
-    }
+	$result = dolibarr_del_const($db, $_GET["name"], $conf->entity);
+	if ($result < 0)
+	{
+		dol_print_error($db);
+	}
 }
 
 
@@ -128,39 +128,39 @@ if (!empty($conf->global->ADHERENT_USE_SPIP))
 
 	print dol_get_fiche_head($head, 'spip', $langs->trans("Setup"), -1, 'user');
 
-    //$link=img_picto($langs->trans("Active"),'tick').' ';
-    $link = '<a href="'.$_SERVER["PHP_SELF"].'?action=unset&token='.newToken().'&value=0&name=ADHERENT_USE_SPIP">';
-    //$link.=$langs->trans("Disable");
-    $link .= img_picto($langs->trans("Activated"), 'switch_on');
-    $link .= '</a>';
-    // Edition des varibales globales
-    $constantes = array(
-    	'ADHERENT_SPIP_SERVEUR',
-    	'ADHERENT_SPIP_DB',
-    	'ADHERENT_SPIP_USER',
-    	'ADHERENT_SPIP_PASS'
+	//$link=img_picto($langs->trans("Active"),'tick').' ';
+	$link = '<a href="'.$_SERVER["PHP_SELF"].'?action=unset&token='.newToken().'&value=0&name=ADHERENT_USE_SPIP">';
+	//$link.=$langs->trans("Disable");
+	$link .= img_picto($langs->trans("Activated"), 'switch_on');
+	$link .= '</a>';
+	// Edition des varibales globales
+	$constantes = array(
+		'ADHERENT_SPIP_SERVEUR',
+		'ADHERENT_SPIP_DB',
+		'ADHERENT_SPIP_USER',
+		'ADHERENT_SPIP_PASS'
 	);
 
-    print load_fiche_titre($langs->trans('SPIPTitle'), $link, '');
+	print load_fiche_titre($langs->trans('SPIPTitle'), $link, '');
 	print '<br>';
 
 	form_constantes($constantes, 2);
 
-    dol_fiche_end();
+	print dol_get_fiche_end();
 
-    print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Update").'" name="update"></div>';
+	print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Update").'" name="update"></div>';
 
-    print '</form>';
+	print '</form>';
 } else {
-    print dol_get_fiche_head($head, 'spip', $langs->trans("Setup"), 0, 'user');
+	print dol_get_fiche_head($head, 'spip', $langs->trans("Setup"), 0, 'user');
 
-    $link = '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=set&amp;token='.newToken().'&amp;value=1&amp;name=ADHERENT_USE_SPIP">';
-    //$link.=$langs->trans("Activate");
-    $link .= img_picto($langs->trans("Disabled"), 'switch_off');
-    $link .= '</a>';
-    print load_fiche_titre($langs->trans('SPIPTitle'), $link, '');
+	$link = '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=set&amp;token='.newToken().'&amp;value=1&amp;name=ADHERENT_USE_SPIP">';
+	//$link.=$langs->trans("Activate");
+	$link .= img_picto($langs->trans("Disabled"), 'switch_off');
+	$link .= '</a>';
+	print load_fiche_titre($langs->trans('SPIPTitle'), $link, '');
 
-    dol_fiche_end();
+	print dol_get_fiche_end();
 }
 
 // End of page
diff --git a/htdocs/admin/stock.php b/htdocs/admin/stock.php
index e833bd543ed..6fc37f45734 100644
--- a/htdocs/admin/stock.php
+++ b/htdocs/admin/stock.php
@@ -93,7 +93,7 @@ if ($action == 'warehouse')
 {
 	$value = GETPOST('default_warehouse', 'alpha');
 	$res = dolibarr_set_const($db, "MAIN_DEFAULT_WAREHOUSE", $value, 'chaine', 0, '', $conf->entity);
-	if ($value == -1 || empty($value) && !empty($conf->global->MAIN_DEFAULT_WAREHOUSE)){
+	if ($value == -1 || empty($value) && !empty($conf->global->MAIN_DEFAULT_WAREHOUSE)) {
 		$res = dolibarr_del_const($db, "MAIN_DEFAULT_WAREHOUSE", $conf->entity);
 	}
 	if (!$res > 0) $error++;
@@ -668,8 +668,8 @@ print load_fiche_titre($langs->trans("Other"), '', '');
 print '<table class="noborder centpercent">';
 
 print '<tr class="liste_titre">';
-print "<td>".$langs->trans("Other")."</td>\n";
-print '<td class="right">'.$langs->trans("Status").'</td>'."\n";
+print "<td>".$langs->trans("Parameter")."</td>\n";
+print '<td class="right">'.$langs->trans("Value").'</td>'."\n";
 print '</tr>'."\n";
 
 print '<tr class="oddeven">';
@@ -684,7 +684,7 @@ print '<tr class="oddeven">';
 print '<td>'.$langs->trans("UserDefaultWarehouse").'</td>';
 print '<td class="right">';
 if ($conf->use_javascript_ajax) {
-	print ajax_constantonoff('MAIN_DEFAULT_WAREHOUSE_USER', array(), null,  0, 0, 1);
+	print ajax_constantonoff('MAIN_DEFAULT_WAREHOUSE_USER', array(), null, 0, 0, 1);
 } else {
 	$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
 	print $form->selectarray("MAIN_DEFAULT_WAREHOUSE_USER", $arrval, $conf->global->MAIN_DEFAULT_WAREHOUSE_USER);
@@ -692,7 +692,7 @@ if ($conf->use_javascript_ajax) {
 print "</td>\n";
 print "</tr>\n";
 
-if (! empty($conf->global->MAIN_DEFAULT_WAREHOUSE_USER)) {
+if (!empty($conf->global->MAIN_DEFAULT_WAREHOUSE_USER)) {
 	print '<tr class="oddeven">';
 	print '<td>'.$langs->trans("UserWarehouseAutoCreate").'</td>';
 	print '<td class="right">';
diff --git a/htdocs/admin/supplier_invoice.php b/htdocs/admin/supplier_invoice.php
index c248a45f9f9..779f7ab472a 100644
--- a/htdocs/admin/supplier_invoice.php
+++ b/htdocs/admin/supplier_invoice.php
@@ -57,15 +57,15 @@ $specimenthirdparty->initAsSpecimen();
 
 if ($action == 'updateMask')
 {
-    $maskconstinvoice = GETPOST('maskconstinvoice', 'alpha');
+	$maskconstinvoice = GETPOST('maskconstinvoice', 'alpha');
 	$maskconstcredit = GETPOST('maskconstcredit', 'alpha');
-    $maskinvoice = GETPOST('maskinvoice', 'alpha');
+	$maskinvoice = GETPOST('maskinvoice', 'alpha');
 	$maskcredit = GETPOST('maskcredit', 'alpha');
 
-    if ($maskconstinvoice)  $res = dolibarr_set_const($db, $maskconstinvoice, $maskinvoice, 'chaine', 0, '', $conf->entity);
+	if ($maskconstinvoice)  $res = dolibarr_set_const($db, $maskconstinvoice, $maskinvoice, 'chaine', 0, '', $conf->entity);
 	if ($maskconstcredit)  $res = dolibarr_set_const($db, $maskconstcredit, $maskcredit, 'chaine', 0, '', $conf->entity);
 
-    if (!$res > 0) $error++;
+	if (!$res > 0) $error++;
 
 	if (!$error)
 	{
@@ -77,44 +77,44 @@ if ($action == 'updateMask')
 
 if ($action == 'specimen')  // For invoices
 {
-    $modele = GETPOST('module', 'alpha');
+	$modele = GETPOST('module', 'alpha');
 
-    $facture = new FactureFournisseur($db);
-    $facture->initAsSpecimen();
-    $facture->thirdparty = $specimenthirdparty; // Define who should has build the invoice (so the supplier)
+	$facture = new FactureFournisseur($db);
+	$facture->initAsSpecimen();
+	$facture->thirdparty = $specimenthirdparty; // Define who should has build the invoice (so the supplier)
 
-    // Search template files
-    $file = ''; $classname = ''; $filefound = 0;
-    $dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
-    foreach ($dirmodels as $reldir)
-    {
-    	$file = dol_buildpath($reldir."core/modules/supplier_invoice/doc/pdf_".$modele.".modules.php", 0);
-    	if (file_exists($file))
-    	{
-    		$filefound = 1;
-    		$classname = "pdf_".$modele;
-    		break;
-    	}
-    }
+	// Search template files
+	$file = ''; $classname = ''; $filefound = 0;
+	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
+	foreach ($dirmodels as $reldir)
+	{
+		$file = dol_buildpath($reldir."core/modules/supplier_invoice/doc/pdf_".$modele.".modules.php", 0);
+		if (file_exists($file))
+		{
+			$filefound = 1;
+			$classname = "pdf_".$modele;
+			break;
+		}
+	}
 
-    if ($filefound)
-    {
-    	require_once $file;
+	if ($filefound)
+	{
+		require_once $file;
 
-    	$module = new $classname($db, $facture);
+		$module = new $classname($db, $facture);
 
-    	if ($module->write_file($facture, $langs) > 0)
-    	{
-    		header("Location: ".DOL_URL_ROOT."/document.php?modulepart=facture_fournisseur&file=SPECIMEN.pdf");
-    		return;
-    	} else {
-    		setEventMessages($module->error, $module->errors, 'errors');
-    		dol_syslog($module->error, LOG_ERR);
-    	}
-    } else {
-    	setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
-    	dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
-    }
+		if ($module->write_file($facture, $langs) > 0)
+		{
+			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=facture_fournisseur&file=SPECIMEN.pdf");
+			return;
+		} else {
+			setEventMessages($module->error, $module->errors, 'errors');
+			dol_syslog($module->error, LOG_ERR);
+		}
+	} else {
+		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
+		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
+	}
 }
 
 // Activate a model
@@ -126,52 +126,52 @@ elseif ($action == 'set')
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0)
 	{
-        if ($conf->global->INVOICE_SUPPLIER_ADDON_PDF == "$value") dolibarr_del_const($db, 'INVOICE_SUPPLIER_ADDON_PDF', $conf->entity);
+		if ($conf->global->INVOICE_SUPPLIER_ADDON_PDF == "$value") dolibarr_del_const($db, 'INVOICE_SUPPLIER_ADDON_PDF', $conf->entity);
 	}
 }
 
 // Set default model
 elseif ($action == 'setdoc')
 {
-    if (dolibarr_set_const($db, "INVOICE_SUPPLIER_ADDON_PDF", $value, 'chaine', 0, '', $conf->entity))
-    {
-        // La constante qui a ete lue en avant du nouveau set
-        // on passe donc par une variable pour avoir un affichage coherent
-        $conf->global->INVOICE_SUPPLIER_ADDON_PDF = $value;
-    }
+	if (dolibarr_set_const($db, "INVOICE_SUPPLIER_ADDON_PDF", $value, 'chaine', 0, '', $conf->entity))
+	{
+		// La constante qui a ete lue en avant du nouveau set
+		// on passe donc par une variable pour avoir un affichage coherent
+		$conf->global->INVOICE_SUPPLIER_ADDON_PDF = $value;
+	}
 
-    // On active le modele
-    $ret = delDocumentModel($value, $type);
-    if ($ret > 0)
-    {
-        $ret = addDocumentModel($value, $type, $label, $scandir);
-    }
+	// On active le modele
+	$ret = delDocumentModel($value, $type);
+	if ($ret > 0)
+	{
+		$ret = addDocumentModel($value, $type, $label, $scandir);
+	}
 } elseif ($action == 'unsetdoc')
 {
-    dolibarr_del_const($db, "INVOICE_SUPPLIER_ADDON_PDF", $conf->entity);
+	dolibarr_del_const($db, "INVOICE_SUPPLIER_ADDON_PDF", $conf->entity);
 }
 
 if ($action == 'setmod')
 {
-    // TODO Verifier si module numerotation choisi peut etre active
-    // par appel methode canBeActivated
+	// TODO Verifier si module numerotation choisi peut etre active
+	// par appel methode canBeActivated
 
-    dolibarr_set_const($db, "INVOICE_SUPPLIER_ADDON_NUMBER", $value, 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "INVOICE_SUPPLIER_ADDON_NUMBER", $value, 'chaine', 0, '', $conf->entity);
 }
 
 if ($action == 'addcat')
 {
-    $fourn = new Fournisseur($db);
-    $fourn->CreateCategory($user, GETPOST('cat', 'alphanohtml'));
+	$fourn = new Fournisseur($db);
+	$fourn->CreateCategory($user, GETPOST('cat', 'alphanohtml'));
 }
 
 if ($action == 'set_SUPPLIER_INVOICE_FREE_TEXT')
 {
-    $freetext = GETPOST('SUPPLIER_INVOICE_FREE_TEXT', 'restricthtml'); // No alpha here, we want exact string
+	$freetext = GETPOST('SUPPLIER_INVOICE_FREE_TEXT', 'restricthtml'); // No alpha here, we want exact string
 
-    $res = dolibarr_set_const($db, "SUPPLIER_INVOICE_FREE_TEXT", $freetext, 'chaine', 0, '', $conf->entity);
+	$res = dolibarr_set_const($db, "SUPPLIER_INVOICE_FREE_TEXT", $freetext, 'chaine', 0, '', $conf->entity);
 
-    if (!$res > 0) $error++;
+	if (!$res > 0) $error++;
 
 	if (!$error)
 	{
@@ -221,79 +221,79 @@ foreach ($dirmodels as $reldir)
 {
 	$dir = dol_buildpath($reldir."core/modules/supplier_invoice");
 
-    if (is_dir($dir))
-    {
-        $handle = opendir($dir);
-        if (is_resource($handle))
-        {
-            while (($file = readdir($handle)) !== false)
-            {
-                if (substr($file, 0, 24) == 'mod_facture_fournisseur_' && substr($file, dol_strlen($file) - 3, 3) == 'php')
-                {
-                    $file = substr($file, 0, dol_strlen($file) - 4);
+	if (is_dir($dir))
+	{
+		$handle = opendir($dir);
+		if (is_resource($handle))
+		{
+			while (($file = readdir($handle)) !== false)
+			{
+				if (substr($file, 0, 24) == 'mod_facture_fournisseur_' && substr($file, dol_strlen($file) - 3, 3) == 'php')
+				{
+					$file = substr($file, 0, dol_strlen($file) - 4);
 
-                    require_once $dir.'/'.$file.'.php';
+					require_once $dir.'/'.$file.'.php';
 
-                    $module = new $file;
+					$module = new $file;
 
-                    if ($module->isEnabled())
-                    {
-                        // Show modules according to features level
-                        if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
-                        if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
+					if ($module->isEnabled())
+					{
+						// Show modules according to features level
+						if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
+						if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
 
 
-                        print '<tr class="oddeven"><td>'.$module->nom."</td><td>\n";
-                        print $module->info();
-                        print '</td>';
+						print '<tr class="oddeven"><td>'.$module->nom."</td><td>\n";
+						print $module->info();
+						print '</td>';
 
-                        // Show example of numbering model
-                        print '<td class="nowrap">';
-                        $tmp = $module->getExample();
-                        if (preg_match('/^Error/', $tmp)) {
-                            $langs->load("errors"); print '<div class="error">'.$langs->trans($tmp).'</div>';
-                        } elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
-                        else print $tmp;
-                        print '</td>'."\n";
+						// Show example of numbering model
+						print '<td class="nowrap">';
+						$tmp = $module->getExample();
+						if (preg_match('/^Error/', $tmp)) {
+							$langs->load("errors"); print '<div class="error">'.$langs->trans($tmp).'</div>';
+						} elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
+						else print $tmp;
+						print '</td>'."\n";
 
-                        print '<td class="center">';
-                        if ($conf->global->INVOICE_SUPPLIER_ADDON_NUMBER == "$file")
-                        {
-                            print img_picto($langs->trans("Activated"), 'switch_on');
-                        } else {
-                            print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;token='.newToken().'&amp;value='.urlencode($file).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
-                        }
-                        print '</td>';
+						print '<td class="center">';
+						if ($conf->global->INVOICE_SUPPLIER_ADDON_NUMBER == "$file")
+						{
+							print img_picto($langs->trans("Activated"), 'switch_on');
+						} else {
+							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;token='.newToken().'&amp;value='.urlencode($file).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+						}
+						print '</td>';
 
-                        $invoice = new FactureFournisseur($db);
-                        $invoice->initAsSpecimen();
+						$invoice = new FactureFournisseur($db);
+						$invoice->initAsSpecimen();
 
-                        // Info
-                        $htmltooltip = '';
-                        $htmltooltip .= ''.$langs->trans("Version").': <b>'.$module->getVersion().'</b><br>';
-                        $nextval = $module->getNextValue($mysoc, $invoice);
-                        if ("$nextval" != $langs->trans("NotAvailable")) {  // Keep " on nextval
-                            $htmltooltip .= ''.$langs->trans("NextValue").': ';
-                            if ($nextval) {
-                                if (preg_match('/^Error/', $nextval) || $nextval == 'NotConfigured')
-                                    $nextval = $langs->trans($nextval);
-                                $htmltooltip .= $nextval.'<br>';
-                            } else {
-                                $htmltooltip .= $langs->trans($module->error).'<br>';
-                            }
-                        }
+						// Info
+						$htmltooltip = '';
+						$htmltooltip .= ''.$langs->trans("Version").': <b>'.$module->getVersion().'</b><br>';
+						$nextval = $module->getNextValue($mysoc, $invoice);
+						if ("$nextval" != $langs->trans("NotAvailable")) {  // Keep " on nextval
+							$htmltooltip .= ''.$langs->trans("NextValue").': ';
+							if ($nextval) {
+								if (preg_match('/^Error/', $nextval) || $nextval == 'NotConfigured')
+									$nextval = $langs->trans($nextval);
+								$htmltooltip .= $nextval.'<br>';
+							} else {
+								$htmltooltip .= $langs->trans($module->error).'<br>';
+							}
+						}
 
-                        print '<td class="center">';
-                        print $form->textwithpicto('', $htmltooltip, 1, 0);
-                        print '</td>';
+						print '<td class="center">';
+						print $form->textwithpicto('', $htmltooltip, 1, 0);
+						print '</td>';
 
-                        print '</tr>';
-                    }
-                }
-            }
-            closedir($handle);
-        }
-    }
+						print '</tr>';
+					}
+				}
+			}
+			closedir($handle);
+		}
+	}
 }
 
 print '</table><br>';
@@ -318,16 +318,16 @@ $sql .= " AND entity = ".$conf->entity;
 $resql = $db->query($sql);
 if ($resql)
 {
-    $i = 0;
-    $num_rows = $db->num_rows($resql);
-    while ($i < $num_rows)
-    {
-        $array = $db->fetch_array($resql);
-        array_push($def, $array[0]);
-        $i++;
-    }
+	$i = 0;
+	$num_rows = $db->num_rows($resql);
+	while ($i < $num_rows)
+	{
+		$array = $db->fetch_array($resql);
+		array_push($def, $array[0]);
+		$i++;
+	}
 } else {
-    dol_print_error($db);
+	dol_print_error($db);
 }
 
 print '<table class="noborder centpercent">'."\n";
@@ -347,94 +347,94 @@ foreach ($dirmodels as $reldir)
 	$realpath = $reldir."core/modules/supplier_invoice/doc";
 	$dir = dol_buildpath($realpath);
 
-    if (is_dir($dir))
-    {
-        $handle = opendir($dir);
+	if (is_dir($dir))
+	{
+		$handle = opendir($dir);
 
 
-        if (is_resource($handle))
-        {
-            while (($file = readdir($handle)) !== false)
-            {
-                if (preg_match('/\.modules\.php$/i', $file) && preg_match('/^(pdf_|doc_)/', $file))
-                {
-                    $name = substr($file, 4, dol_strlen($file) - 16);
-                    $classname = substr($file, 0, dol_strlen($file) - 12);
+		if (is_resource($handle))
+		{
+			while (($file = readdir($handle)) !== false)
+			{
+				if (preg_match('/\.modules\.php$/i', $file) && preg_match('/^(pdf_|doc_)/', $file))
+				{
+					$name = substr($file, 4, dol_strlen($file) - 16);
+					$classname = substr($file, 0, dol_strlen($file) - 12);
 
-	                require_once $dir.'/'.$file;
-	                $module = new $classname($db, new FactureFournisseur($db));
+					require_once $dir.'/'.$file;
+					$module = new $classname($db, new FactureFournisseur($db));
 
 
-                    print "<tr class=\"oddeven\">\n";
-                    print "<td>";
-	                print (empty($module->name) ? $name : $module->name);
-	                print "</td>\n";
-                    print "<td>\n";
-                    require_once $dir.'/'.$file;
-                    $module = new $classname($db, $specimenthirdparty);
-                    if (method_exists($module, 'info')) print $module->info($langs);
-	                else print $module->description;
+					print "<tr class=\"oddeven\">\n";
+					print "<td>";
+					print (empty($module->name) ? $name : $module->name);
+					print "</td>\n";
+					print "<td>\n";
+					require_once $dir.'/'.$file;
+					$module = new $classname($db, $specimenthirdparty);
+					if (method_exists($module, 'info')) print $module->info($langs);
+					else print $module->description;
 
-                    print "</td>\n";
+					print "</td>\n";
 
-                    // Active
-                    if (in_array($name, $def))
-                    {
-                        print '<td class="center">'."\n";
-                        //if ($conf->global->INVOICE_SUPPLIER_ADDON_PDF != "$name")
-                        //{
-                            // Even if choice is the default value, we allow to disable it: For supplier invoice, we accept to have no doc generation at all
-                            print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=invoice_supplier">';
-                            print img_picto($langs->trans("Enabled"), 'switch_on');
-                            print '</a>';
-                        /*}
+					// Active
+					if (in_array($name, $def))
+					{
+						print '<td class="center">'."\n";
+						//if ($conf->global->INVOICE_SUPPLIER_ADDON_PDF != "$name")
+						//{
+							// Even if choice is the default value, we allow to disable it: For supplier invoice, we accept to have no doc generation at all
+							print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=invoice_supplier">';
+							print img_picto($langs->trans("Enabled"), 'switch_on');
+							print '</a>';
+						/*}
                         else
                         {
                             print img_picto($langs->trans("Enabled"),'switch_on');
                         }*/
-                        print "</td>";
-                    } else {
-                        print '<td class="center">'."\n";
-                        print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=invoice_supplier">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
-                        print "</td>";
-                    }
+						print "</td>";
+					} else {
+						print '<td class="center">'."\n";
+						print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=invoice_supplier">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+						print "</td>";
+					}
 
-                    // Default
-                    print '<td class="center">';
-                    if ($conf->global->INVOICE_SUPPLIER_ADDON_PDF == "$name")
-                    {
-                        //print img_picto($langs->trans("Default"),'on');
-                        // Even if choice is the default value, we allow to disable it: For supplier invoice, we accept to have no doc generation at all
-                        print '<a href="'.$_SERVER["PHP_SELF"].'?action=unsetdoc&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=invoice_supplier"" alt="'.$langs->trans("Disable").'">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
-                    } else {
-                        print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=invoice_supplier"" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
-                    }
-                    print '</td>';
+					// Default
+					print '<td class="center">';
+					if ($conf->global->INVOICE_SUPPLIER_ADDON_PDF == "$name")
+					{
+						//print img_picto($langs->trans("Default"),'on');
+						// Even if choice is the default value, we allow to disable it: For supplier invoice, we accept to have no doc generation at all
+						print '<a href="'.$_SERVER["PHP_SELF"].'?action=unsetdoc&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=invoice_supplier"" alt="'.$langs->trans("Disable").'">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
+					} else {
+						print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=invoice_supplier"" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+					}
+					print '</td>';
 
-                    // Info
-                    $htmltooltip = ''.$langs->trans("Name").': '.$module->name;
-                    $htmltooltip .= '<br>'.$langs->trans("Type").': '.($module->type ? $module->type : $langs->trans("Unknown"));
-                    $htmltooltip .= '<br>'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur;
-                    $htmltooltip .= '<br>'.$langs->trans("Path").': '.preg_replace('/^\//', '', $realpath).'/'.$file;
+					// Info
+					$htmltooltip = ''.$langs->trans("Name").': '.$module->name;
+					$htmltooltip .= '<br>'.$langs->trans("Type").': '.($module->type ? $module->type : $langs->trans("Unknown"));
+					$htmltooltip .= '<br>'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur;
+					$htmltooltip .= '<br>'.$langs->trans("Path").': '.preg_replace('/^\//', '', $realpath).'/'.$file;
 
-                    $htmltooltip .= '<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
-                    $htmltooltip .= '<br>'.$langs->trans("Logo").': '.yn($module->option_logo, 1, 1);
-                    $htmltooltip .= '<br>'.$langs->trans("PaymentMode").': '.yn($module->option_modereg, 1, 1);
-                    $htmltooltip .= '<br>'.$langs->trans("PaymentConditions").': '.yn($module->option_condreg, 1, 1);
-                    print '<td class="center">';
-                    print $form->textwithpicto('', $htmltooltip, 1, 0);
-                    print '</td>';
-                    print '<td class="center">';
-                    print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&amp;module='.$name.'">'.img_object($langs->trans("Preview"), 'order').'</a>';
-                    print '</td>';
+					$htmltooltip .= '<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
+					$htmltooltip .= '<br>'.$langs->trans("Logo").': '.yn($module->option_logo, 1, 1);
+					$htmltooltip .= '<br>'.$langs->trans("PaymentMode").': '.yn($module->option_modereg, 1, 1);
+					$htmltooltip .= '<br>'.$langs->trans("PaymentConditions").': '.yn($module->option_condreg, 1, 1);
+					print '<td class="center">';
+					print $form->textwithpicto('', $htmltooltip, 1, 0);
+					print '</td>';
+					print '<td class="center">';
+					print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&amp;module='.$name.'">'.img_object($langs->trans("Preview"), 'order').'</a>';
+					print '</td>';
 
-                    print "</tr>\n";
-                }
-            }
+					print "</tr>\n";
+				}
+			}
 
-            closedir($handle);
-        }
-    }
+			closedir($handle);
+		}
+	}
 }
 
 print '</table><br>';
@@ -466,11 +466,11 @@ print $form->textwithpicto($langs->trans("FreeLegalTextOnInvoices"), $langs->tra
 $variablename = 'SUPPLIER_INVOICE_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/supplier_order.php b/htdocs/admin/supplier_order.php
index 1999326c07e..60c2c4da56e 100644
--- a/htdocs/admin/supplier_order.php
+++ b/htdocs/admin/supplier_order.php
@@ -58,12 +58,12 @@ include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
 
 if ($action == 'updateMask')
 {
-    $maskconstorder = GETPOST('maskconstorder', 'alpha');
-    $maskvalue = GETPOST('maskorder', 'alpha');
+	$maskconstorder = GETPOST('maskconstorder', 'alpha');
+	$maskvalue = GETPOST('maskorder', 'alpha');
 
-    if ($maskconstorder)  $res = dolibarr_set_const($db, $maskconstorder, $maskvalue, 'chaine', 0, '', $conf->entity);
+	if ($maskconstorder)  $res = dolibarr_set_const($db, $maskconstorder, $maskvalue, 'chaine', 0, '', $conf->entity);
 
-    if (!$res > 0) $error++;
+	if (!$res > 0) $error++;
 
 	if (!$error)
 	{
@@ -73,44 +73,44 @@ if ($action == 'updateMask')
 	}
 } elseif ($action == 'specimen')  // For orders
 {
-    $modele = GETPOST('module', 'alpha');
+	$modele = GETPOST('module', 'alpha');
 
-    $commande = new CommandeFournisseur($db);
-    $commande->initAsSpecimen();
-    $commande->thirdparty = $specimenthirdparty;
+	$commande = new CommandeFournisseur($db);
+	$commande->initAsSpecimen();
+	$commande->thirdparty = $specimenthirdparty;
 
-    // Search template files
-    $file = ''; $classname = ''; $filefound = 0;
-    $dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
-    foreach ($dirmodels as $reldir)
-    {
-    	$file = dol_buildpath($reldir."core/modules/supplier_order/doc/pdf_".$modele.".modules.php", 0);
-    	if (file_exists($file))
-    	{
-    		$filefound = 1;
-    		$classname = "pdf_".$modele;
-    		break;
-    	}
-    }
+	// Search template files
+	$file = ''; $classname = ''; $filefound = 0;
+	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
+	foreach ($dirmodels as $reldir)
+	{
+		$file = dol_buildpath($reldir."core/modules/supplier_order/doc/pdf_".$modele.".modules.php", 0);
+		if (file_exists($file))
+		{
+			$filefound = 1;
+			$classname = "pdf_".$modele;
+			break;
+		}
+	}
 
-    if ($filefound)
-    {
-    	require_once $file;
+	if ($filefound)
+	{
+		require_once $file;
 
-    	$module = new $classname($db, $commande);
+		$module = new $classname($db, $commande);
 
-    	if ($module->write_file($commande, $langs) > 0)
-    	{
-    		header("Location: ".DOL_URL_ROOT."/document.php?modulepart=commande_fournisseur&file=SPECIMEN.pdf");
-    		return;
-    	} else {
-    		setEventMessages($module->error, $module->errors, 'errors');
-    		dol_syslog($module->error, LOG_ERR);
-    	}
-    } else {
-    	setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
-    	dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
-    }
+		if ($module->write_file($commande, $langs) > 0)
+		{
+			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=commande_fournisseur&file=SPECIMEN.pdf");
+			return;
+		} else {
+			setEventMessages($module->error, $module->errors, 'errors');
+			dol_syslog($module->error, LOG_ERR);
+		}
+	} else {
+		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
+		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
+	}
 }
 
 // Activate a model
@@ -122,7 +122,7 @@ elseif ($action == 'set')
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0)
 	{
-        if ($conf->global->COMMANDE_SUPPLIER_ADDON_PDF == "$value") dolibarr_del_const($db, 'COMMANDE_SUPPLIER_ADDON_PDF', $conf->entity);
+		if ($conf->global->COMMANDE_SUPPLIER_ADDON_PDF == "$value") dolibarr_del_const($db, 'COMMANDE_SUPPLIER_ADDON_PDF', $conf->entity);
 	}
 }
 
@@ -144,64 +144,64 @@ elseif ($action == 'setdoc')
 	}
 } elseif ($action == 'setmod')
 {
-    // TODO Verifier si module numerotation choisi peut etre active
-    // par appel methode canBeActivated
+	// TODO Verifier si module numerotation choisi peut etre active
+	// par appel methode canBeActivated
 
-    dolibarr_set_const($db, "COMMANDE_SUPPLIER_ADDON_NUMBER", $value, 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "COMMANDE_SUPPLIER_ADDON_NUMBER", $value, 'chaine', 0, '', $conf->entity);
 } elseif ($action == 'addcat')
 {
-    $fourn = new Fournisseur($db);
-    $fourn->CreateCategory($user, GETPOST('cat', 'alphanohtml'));
+	$fourn = new Fournisseur($db);
+	$fourn->CreateCategory($user, GETPOST('cat', 'alphanohtml'));
 } elseif ($action == 'set_SUPPLIER_ORDER_OTHER')
 {
-    $freetext = GETPOST('SUPPLIER_ORDER_FREE_TEXT', 'restricthtml'); // No alpha here, we want exact string
+	$freetext = GETPOST('SUPPLIER_ORDER_FREE_TEXT', 'restricthtml'); // No alpha here, we want exact string
 	$doubleapproval = GETPOST('SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED', 'alpha');
 	$doubleapproval = price2num($doubleapproval);
 
-    $res1 = dolibarr_set_const($db, "SUPPLIER_ORDER_FREE_TEXT", $freetext, 'chaine', 0, '', $conf->entity);
-    $res2 = dolibarr_set_const($db, "SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED", $doubleapproval, 'chaine', 0, '', $conf->entity);
+	$res1 = dolibarr_set_const($db, "SUPPLIER_ORDER_FREE_TEXT", $freetext, 'chaine', 0, '', $conf->entity);
+	$res2 = dolibarr_set_const($db, "SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED", $doubleapproval, 'chaine', 0, '', $conf->entity);
 
-    // TODO We add/delete permission here until permission can have a condition on a global var
-    include_once DOL_DOCUMENT_ROOT.'/core/modules/modFournisseur.class.php';
-    $newmodule = new modFournisseur($db);
+	// TODO We add/delete permission here until permission can have a condition on a global var
+	include_once DOL_DOCUMENT_ROOT.'/core/modules/modFournisseur.class.php';
+	$newmodule = new modFournisseur($db);
 
-    if ($conf->global->SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED)
-    {
-    	// clear default rights array
-    	$newmodule->rights = array();
-    	// add new right
-    	$r = 0;
-    	$newmodule->rights[$r][0] = 1190;
-    	$newmodule->rights[$r][1] = $langs->trans("Permission1190");
-    	$newmodule->rights[$r][2] = 'w';
-    	$newmodule->rights[$r][3] = 0;
-    	$newmodule->rights[$r][4] = 'commande';
-    	$newmodule->rights[$r][5] = 'approve2';
+	if ($conf->global->SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED)
+	{
+		// clear default rights array
+		$newmodule->rights = array();
+		// add new right
+		$r = 0;
+		$newmodule->rights[$r][0] = 1190;
+		$newmodule->rights[$r][1] = $langs->trans("Permission1190");
+		$newmodule->rights[$r][2] = 'w';
+		$newmodule->rights[$r][3] = 0;
+		$newmodule->rights[$r][4] = 'commande';
+		$newmodule->rights[$r][5] = 'approve2';
 
-    	// Insert
-    	$newmodule->insert_permissions(1);
-    } else {
-    	// Remove all rights with Permission1190
-    	$newmodule->delete_permissions();
+		// Insert
+		$newmodule->insert_permissions(1);
+	} else {
+		// Remove all rights with Permission1190
+		$newmodule->delete_permissions();
 
-    	// Add all right without Permission1190
-    	$newmodule->insert_permissions(1);
-    }
+		// Add all right without Permission1190
+		$newmodule->insert_permissions(1);
+	}
 }
 
 // Activate ask for payment bank
 elseif ($action == 'set_BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER')
 {
-    $res = dolibarr_set_const($db, "BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER", $value, 'chaine', 0, '', $conf->entity);
+	$res = dolibarr_set_const($db, "BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER", $value, 'chaine', 0, '', $conf->entity);
 
-    if (!$res > 0) $error++;
+	if (!$res > 0) $error++;
 
-    if (!$error)
-    {
-        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    } else {
-        setEventMessages($langs->trans("Error"), null, 'errors');
-    }
+	if (!$error)
+	{
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
+		setEventMessages($langs->trans("Error"), null, 'errors');
+	}
 }
 
 
@@ -244,79 +244,79 @@ foreach ($dirmodels as $reldir)
 {
 	$dir = dol_buildpath($reldir."core/modules/supplier_order/");
 
-    if (is_dir($dir))
-    {
-        $handle = opendir($dir);
-        if (is_resource($handle))
-        {
-            while (($file = readdir($handle)) !== false)
-            {
-                if (substr($file, 0, 25) == 'mod_commande_fournisseur_' && substr($file, dol_strlen($file) - 3, 3) == 'php')
-                {
-                    $file = substr($file, 0, dol_strlen($file) - 4);
+	if (is_dir($dir))
+	{
+		$handle = opendir($dir);
+		if (is_resource($handle))
+		{
+			while (($file = readdir($handle)) !== false)
+			{
+				if (substr($file, 0, 25) == 'mod_commande_fournisseur_' && substr($file, dol_strlen($file) - 3, 3) == 'php')
+				{
+					$file = substr($file, 0, dol_strlen($file) - 4);
 
-                    require_once $dir.$file.'.php';
+					require_once $dir.$file.'.php';
 
-                    $module = new $file;
+					$module = new $file;
 
-                    if ($module->isEnabled())
-                    {
-                        // Show modules according to features level
-                        if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
-                        if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
+					if ($module->isEnabled())
+					{
+						// Show modules according to features level
+						if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
+						if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
 
 
-                        print '<tr class="oddeven"><td>'.$module->nom."</td><td>\n";
-                        print $module->info();
-                        print '</td>';
+						print '<tr class="oddeven"><td>'.$module->nom."</td><td>\n";
+						print $module->info();
+						print '</td>';
 
-                        // Show example of numbering module
-                        print '<td class="nowrap">';
-                        $tmp = $module->getExample();
-                        if (preg_match('/^Error/', $tmp)) {
-                            $langs->load("errors"); print '<div class="error">'.$langs->trans($tmp).'</div>';
-                        } elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
-                        else print $tmp;
-                        print '</td>'."\n";
+						// Show example of numbering module
+						print '<td class="nowrap">';
+						$tmp = $module->getExample();
+						if (preg_match('/^Error/', $tmp)) {
+							$langs->load("errors"); print '<div class="error">'.$langs->trans($tmp).'</div>';
+						} elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
+						else print $tmp;
+						print '</td>'."\n";
 
-                        print '<td class="center">';
-                        if ($conf->global->COMMANDE_SUPPLIER_ADDON_NUMBER == "$file")
-                        {
-                            print img_picto($langs->trans("Activated"), 'switch_on');
-                        } else {
-                            print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;token='.newToken().'&amp;value='.urlencode($file).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
-                        }
-                        print '</td>';
+						print '<td class="center">';
+						if ($conf->global->COMMANDE_SUPPLIER_ADDON_NUMBER == "$file")
+						{
+							print img_picto($langs->trans("Activated"), 'switch_on');
+						} else {
+							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;token='.newToken().'&amp;value='.urlencode($file).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+						}
+						print '</td>';
 
-                        $commande = new CommandeFournisseur($db);
-                        $commande->initAsSpecimen();
+						$commande = new CommandeFournisseur($db);
+						$commande->initAsSpecimen();
 
-                        // Info
-                        $htmltooltip = '';
-                        $htmltooltip .= ''.$langs->trans("Version").': <b>'.$module->getVersion().'</b><br>';
-                        $nextval = $module->getNextValue($mysoc, $commande);
-                        if ("$nextval" != $langs->trans("NotAvailable")) {  // Keep " on nextval
-                            $htmltooltip .= ''.$langs->trans("NextValue").': ';
-                            if ($nextval) {
-                                if (preg_match('/^Error/', $nextval) || $nextval == 'NotConfigured')
-                                    $nextval = $langs->trans($nextval);
-                                $htmltooltip .= $nextval.'<br>';
-                            } else {
-                                $htmltooltip .= $langs->trans($module->error).'<br>';
-                            }
-                        }
+						// Info
+						$htmltooltip = '';
+						$htmltooltip .= ''.$langs->trans("Version").': <b>'.$module->getVersion().'</b><br>';
+						$nextval = $module->getNextValue($mysoc, $commande);
+						if ("$nextval" != $langs->trans("NotAvailable")) {  // Keep " on nextval
+							$htmltooltip .= ''.$langs->trans("NextValue").': ';
+							if ($nextval) {
+								if (preg_match('/^Error/', $nextval) || $nextval == 'NotConfigured')
+									$nextval = $langs->trans($nextval);
+								$htmltooltip .= $nextval.'<br>';
+							} else {
+								$htmltooltip .= $langs->trans($module->error).'<br>';
+							}
+						}
 
-                        print '<td class="center">';
-                        print $form->textwithpicto('', $htmltooltip, 1, 0);
-                        print '</td>';
+						print '<td class="center">';
+						print $form->textwithpicto('', $htmltooltip, 1, 0);
+						print '</td>';
 
-                        print '</tr>';
-                    }
-                }
-            }
-            closedir($handle);
-        }
-    }
+						print '</tr>';
+					}
+				}
+			}
+			closedir($handle);
+		}
+	}
 }
 
 print '</table><br>';
@@ -339,16 +339,16 @@ $sql .= " AND entity = ".$conf->entity;
 $resql = $db->query($sql);
 if ($resql)
 {
-    $i = 0;
-    $num_rows = $db->num_rows($resql);
-    while ($i < $num_rows)
-    {
-        $array = $db->fetch_array($resql);
-        array_push($def, $array[0]);
-        $i++;
-    }
+	$i = 0;
+	$num_rows = $db->num_rows($resql);
+	while ($i < $num_rows)
+	{
+		$array = $db->fetch_array($resql);
+		array_push($def, $array[0]);
+		$i++;
+	}
 } else {
-    dol_print_error($db);
+	dol_print_error($db);
 }
 
 print '<table class="noborder centpercent">'."\n";
@@ -368,86 +368,86 @@ foreach ($dirmodels as $reldir)
 	$realpath = $reldir."core/modules/supplier_order/doc";
 	$dir = dol_buildpath($realpath);
 
-    if (is_dir($dir))
-    {
-        $handle = opendir($dir);
-        if (is_resource($handle))
-        {
-            while (($file = readdir($handle)) !== false)
-            {
-                if (preg_match('/\.modules\.php$/i', $file) && preg_match('/^(pdf_|doc_)/', $file))
-                {
-                    $name = substr($file, 4, dol_strlen($file) - 16);
-                    $classname = substr($file, 0, dol_strlen($file) - 12);
+	if (is_dir($dir))
+	{
+		$handle = opendir($dir);
+		if (is_resource($handle))
+		{
+			while (($file = readdir($handle)) !== false)
+			{
+				if (preg_match('/\.modules\.php$/i', $file) && preg_match('/^(pdf_|doc_)/', $file))
+				{
+					$name = substr($file, 4, dol_strlen($file) - 16);
+					$classname = substr($file, 0, dol_strlen($file) - 12);
 
-	                require_once $dir.'/'.$file;
-	                $module = new $classname($db, new CommandeFournisseur($db));
+					require_once $dir.'/'.$file;
+					$module = new $classname($db, new CommandeFournisseur($db));
 
 
-                    print "<tr class=\"oddeven\">\n";
-                    print "<td>";
-	                print (empty($module->name) ? $name : $module->name);
-	                print "</td>\n";
-                    print "<td>\n";
-                    require_once $dir.'/'.$file;
-                    $module = new $classname($db, $specimenthirdparty);
-                    if (method_exists($module, 'info')) print $module->info($langs);
-                    else print $module->description;
-                    print "</td>\n";
+					print "<tr class=\"oddeven\">\n";
+					print "<td>";
+					print (empty($module->name) ? $name : $module->name);
+					print "</td>\n";
+					print "<td>\n";
+					require_once $dir.'/'.$file;
+					$module = new $classname($db, $specimenthirdparty);
+					if (method_exists($module, 'info')) print $module->info($langs);
+					else print $module->description;
+					print "</td>\n";
 
-                    // Active
-                    if (in_array($name, $def))
-                    {
-                        print '<td class="center">'."\n";
-                        if ($conf->global->COMMANDE_SUPPLIER_ADDON_PDF != "$name")
-                        {
-                            print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=order_supplier">';
-                            print img_picto($langs->trans("Enabled"), 'switch_on');
-                            print '</a>';
-                        } else {
-                            print img_picto($langs->trans("Enabled"), 'switch_on');
-                        }
-                        print "</td>";
-                    } else {
-                        print '<td class="center">'."\n";
-                        print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=order_supplier">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
-                        print "</td>";
-                    }
+					// Active
+					if (in_array($name, $def))
+					{
+						print '<td class="center">'."\n";
+						if ($conf->global->COMMANDE_SUPPLIER_ADDON_PDF != "$name")
+						{
+							print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=order_supplier">';
+							print img_picto($langs->trans("Enabled"), 'switch_on');
+							print '</a>';
+						} else {
+							print img_picto($langs->trans("Enabled"), 'switch_on');
+						}
+						print "</td>";
+					} else {
+						print '<td class="center">'."\n";
+						print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=order_supplier">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+						print "</td>";
+					}
 
-                    // Default
-                    print '<td class="center">';
-                    if ($conf->global->COMMANDE_SUPPLIER_ADDON_PDF == "$name")
-                    {
-                        print img_picto($langs->trans("Default"), 'on');
-                    } else {
-                        print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=order_supplier"" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
-                    }
-                    print '</td>';
+					// Default
+					print '<td class="center">';
+					if ($conf->global->COMMANDE_SUPPLIER_ADDON_PDF == "$name")
+					{
+						print img_picto($langs->trans("Default"), 'on');
+					} else {
+						print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=order_supplier"" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+					}
+					print '</td>';
 
-                    // Info
-                    $htmltooltip = ''.$langs->trans("Name").': '.$module->name;
-                    $htmltooltip .= '<br>'.$langs->trans("Type").': '.($module->type ? $module->type : $langs->trans("Unknown"));
-                    $htmltooltip .= '<br>'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur;
-                    $htmltooltip .= '<br>'.$langs->trans("Path").': '.preg_replace('/^\//', '', $realpath).'/'.$file;
+					// Info
+					$htmltooltip = ''.$langs->trans("Name").': '.$module->name;
+					$htmltooltip .= '<br>'.$langs->trans("Type").': '.($module->type ? $module->type : $langs->trans("Unknown"));
+					$htmltooltip .= '<br>'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur;
+					$htmltooltip .= '<br>'.$langs->trans("Path").': '.preg_replace('/^\//', '', $realpath).'/'.$file;
 
-                    $htmltooltip .= '<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
-                    $htmltooltip .= '<br>'.$langs->trans("Logo").': '.yn($module->option_logo, 1, 1);
-                    $htmltooltip .= '<br>'.$langs->trans("PaymentMode").': '.yn($module->option_modereg, 1, 1);
-                    $htmltooltip .= '<br>'.$langs->trans("PaymentConditions").': '.yn($module->option_condreg, 1, 1);
-                    print '<td class="center">';
-                    print $form->textwithpicto('', $htmltooltip, 1, 0);
-                    print '</td>';
-                    print '<td class="center">';
-                    print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&amp;module='.$name.'">'.img_object($langs->trans("Preview"), 'order').'</a>';
-                    print '</td>';
+					$htmltooltip .= '<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
+					$htmltooltip .= '<br>'.$langs->trans("Logo").': '.yn($module->option_logo, 1, 1);
+					$htmltooltip .= '<br>'.$langs->trans("PaymentMode").': '.yn($module->option_modereg, 1, 1);
+					$htmltooltip .= '<br>'.$langs->trans("PaymentConditions").': '.yn($module->option_condreg, 1, 1);
+					print '<td class="center">';
+					print $form->textwithpicto('', $htmltooltip, 1, 0);
+					print '</td>';
+					print '<td class="center">';
+					print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&amp;module='.$name.'">'.img_object($langs->trans("Preview"), 'order').'</a>';
+					print '</td>';
 
-                    print "</tr>\n";
-                }
-            }
+					print "</tr>\n";
+				}
+			}
 
-            closedir($handle);
-        }
-    }
+			closedir($handle);
+		}
+	}
 }
 
 print '</table><br>';
@@ -521,11 +521,11 @@ print $form->textwithpicto($langs->trans("FreeLegalTextOnOrders"), $langs->trans
 $variablename = 'SUPPLIER_ORDER_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/supplier_payment.php b/htdocs/admin/supplier_payment.php
index bda90d0ac74..217b7d7c44a 100644
--- a/htdocs/admin/supplier_payment.php
+++ b/htdocs/admin/supplier_payment.php
@@ -48,21 +48,21 @@ include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
 
 if ($action == 'updateMask')
 {
-    $maskconstsupplierpayment = GETPOST('maskconstsupplierpayment', 'alpha');
-    $masksupplierpayment = GETPOST('masksupplierpayment', 'alpha');
-    if ($maskconstsupplierpayment) $res = dolibarr_set_const($db, $maskconstsupplierpayment, $masksupplierpayment, 'chaine', 0, '', $conf->entity);
+	$maskconstsupplierpayment = GETPOST('maskconstsupplierpayment', 'alpha');
+	$masksupplierpayment = GETPOST('masksupplierpayment', 'alpha');
+	if ($maskconstsupplierpayment) $res = dolibarr_set_const($db, $maskconstsupplierpayment, $masksupplierpayment, 'chaine', 0, '', $conf->entity);
 
-    if (!$res > 0) $error++;
+	if (!$res > 0) $error++;
 
-    if (!$error)
-    {
-        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    } else {
-        setEventMessages($langs->trans("Error"), null, 'errors');
-    }
+	if (!$error)
+	{
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
+		setEventMessages($langs->trans("Error"), null, 'errors');
+	}
 } elseif ($action == 'setmod')
 {
-    dolibarr_set_const($db, "SUPPLIER_PAYMENT_ADDON", $value, 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "SUPPLIER_PAYMENT_ADDON", $value, 'chaine', 0, '', $conf->entity);
 }
 
 // Activate a model
@@ -74,7 +74,7 @@ elseif ($action == 'set')
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0)
 	{
-        if ($conf->global->FACTURE_ADDON_PDF == "$value") dolibarr_del_const($db, 'SUPPLIER_PAYMENT_ADDON_PDF', $conf->entity);
+		if ($conf->global->FACTURE_ADDON_PDF == "$value") dolibarr_del_const($db, 'SUPPLIER_PAYMENT_ADDON_PDF', $conf->entity);
 	}
 }
 
@@ -96,54 +96,54 @@ elseif ($action == 'setdoc')
 	}
 } elseif ($action == 'specimen')
 {
-    $modele = GETPOST('module', 'alpha');
+	$modele = GETPOST('module', 'alpha');
 
-    $paiementFourn = new PaiementFourn($db);
-    $paiementFourn->initAsSpecimen();
+	$paiementFourn = new PaiementFourn($db);
+	$paiementFourn->initAsSpecimen();
 
 	// Search template files
 	$file = ''; $classname = ''; $filefound = 0;
 	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 	foreach ($dirmodels as $reldir)
 	{
-	    $file = dol_buildpath($reldir."core/modules/supplier_payment/doc/pdf_".$modele.".modules.php", 0);
-    	if (file_exists($file))
-    	{
-    		$filefound = 1;
-    		$classname = "pdf_".$modele;
-    		break;
-    	}
-    }
+		$file = dol_buildpath($reldir."core/modules/supplier_payment/doc/pdf_".$modele.".modules.php", 0);
+		if (file_exists($file))
+		{
+			$filefound = 1;
+			$classname = "pdf_".$modele;
+			break;
+		}
+	}
 
-    if ($filefound)
-    {
-    	require_once $file;
+	if ($filefound)
+	{
+		require_once $file;
 
-    	$module = new $classname($db);
+		$module = new $classname($db);
 
-    	if ($module->write_file($paiementFourn, $langs) > 0)
-    	{
-    		header("Location: ".DOL_URL_ROOT."/document.php?modulepart=supplier_payment&file=SPECIMEN.pdf");
-    		return;
-    	} else {
-    		setEventMessages($module->error, $module->errors, 'errors');
-    		dol_syslog($module->error, LOG_ERR);
-    	}
-    } else {
-    	setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
-    	dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
-    }
+		if ($module->write_file($paiementFourn, $langs) > 0)
+		{
+			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=supplier_payment&file=SPECIMEN.pdf");
+			return;
+		} else {
+			setEventMessages($module->error, $module->errors, 'errors');
+			dol_syslog($module->error, LOG_ERR);
+		}
+	} else {
+		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
+		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
+	}
 } elseif ($action == 'setparams')
 {
-       $res = dolibarr_set_const($db, "PAYMENTS_FOURN_REPORT_GROUP_BY_MOD", GETPOST('PAYMENTS_FOURN_REPORT_GROUP_BY_MOD', 'int'), 'chaine', 0, '', $conf->entity);
-       if (!$res > 0) $error++;
+	   $res = dolibarr_set_const($db, "PAYMENTS_FOURN_REPORT_GROUP_BY_MOD", GETPOST('PAYMENTS_FOURN_REPORT_GROUP_BY_MOD', 'int'), 'chaine', 0, '', $conf->entity);
+	   if (!$res > 0) $error++;
 
 	if ($error)
-       {
+	   {
 			setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 	if (!$error)
-       {
+	   {
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	}
 }
@@ -184,16 +184,16 @@ $sql .= " AND entity = ".$conf->entity;
 $resql = $db->query($sql);
 if ($resql)
 {
-    $i = 0;
-    $num_rows = $db->num_rows($resql);
-    while ($i < $num_rows)
-    {
-        $array = $db->fetch_array($resql);
-        array_push($def, $array[0]);
-        $i++;
-    }
+	$i = 0;
+	$num_rows = $db->num_rows($resql);
+	while ($i < $num_rows)
+	{
+		$array = $db->fetch_array($resql);
+		array_push($def, $array[0]);
+		$i++;
+	}
 } else {
-    dol_print_error($db);
+	dol_print_error($db);
 }
 
 print '<table class="noborder centpercent">';
@@ -209,104 +209,104 @@ clearstatcache();
 
 foreach ($dirmodels as $reldir)
 {
-    $dir = dol_buildpath($reldir."core/modules/supplier_payment/");
-    if (is_dir($dir))
-    {
-        $handle = opendir($dir);
-        if (is_resource($handle))
-        {
-            while (($file = readdir($handle)) !== false)
-            {
-                if (!is_dir($dir.$file) || (substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS'))
-                {
-                    $filebis = $file;
-                    $classname = preg_replace('/\.php$/', '', $file);
-                    // For compatibility
-                    if (!is_file($dir.$filebis))
-                    {
-                        $filebis = $file."/".$file.".modules.php";
-                        $classname = "mod_supplier_payment_".$file;
-                    }
-                    // Check if there is a filter on country
-                    preg_match('/\-(.*)_(.*)$/', $classname, $reg);
-                    if (!empty($reg[2]) && $reg[2] != strtoupper($mysoc->country_code)) continue;
+	$dir = dol_buildpath($reldir."core/modules/supplier_payment/");
+	if (is_dir($dir))
+	{
+		$handle = opendir($dir);
+		if (is_resource($handle))
+		{
+			while (($file = readdir($handle)) !== false)
+			{
+				if (!is_dir($dir.$file) || (substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS'))
+				{
+					$filebis = $file;
+					$classname = preg_replace('/\.php$/', '', $file);
+					// For compatibility
+					if (!is_file($dir.$filebis))
+					{
+						$filebis = $file."/".$file.".modules.php";
+						$classname = "mod_supplier_payment_".$file;
+					}
+					// Check if there is a filter on country
+					preg_match('/\-(.*)_(.*)$/', $classname, $reg);
+					if (!empty($reg[2]) && $reg[2] != strtoupper($mysoc->country_code)) continue;
 
-                    $classname = preg_replace('/\-.*$/', '', $classname);
-                    if (!class_exists($classname) && is_readable($dir.$filebis) && (preg_match('/mod_/', $filebis) || preg_match('/mod_/', $classname)) && substr($filebis, dol_strlen($filebis) - 3, 3) == 'php')
-                    {
-                        // Charging the numbering class
-                        require_once $dir.$filebis;
+					$classname = preg_replace('/\-.*$/', '', $classname);
+					if (!class_exists($classname) && is_readable($dir.$filebis) && (preg_match('/mod_/', $filebis) || preg_match('/mod_/', $classname)) && substr($filebis, dol_strlen($filebis) - 3, 3) == 'php')
+					{
+						// Charging the numbering class
+						require_once $dir.$filebis;
 
-                        $module = new $classname($db);
+						$module = new $classname($db);
 
-                        // Show modules according to features level
-                        if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
-                        if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
+						// Show modules according to features level
+						if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
+						if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
 
-                        if ($module->isEnabled())
-                        {
-                            print '<tr class="oddeven"><td width="100">';
-                            echo preg_replace('/\-.*$/', '', preg_replace('/mod_supplier_payment_/', '', preg_replace('/\.php$/', '', $file)));
-                            print "</td><td>\n";
+						if ($module->isEnabled())
+						{
+							print '<tr class="oddeven"><td width="100">';
+							echo preg_replace('/\-.*$/', '', preg_replace('/mod_supplier_payment_/', '', preg_replace('/\.php$/', '', $file)));
+							print "</td><td>\n";
 
-                            print $module->info();
+							print $module->info();
 
-                            print '</td>';
+							print '</td>';
 
-                            // Show example of numbering module
-                            print '<td class="nowrap">';
-                            $tmp = $module->getExample();
-                            if (preg_match('/^Error/', $tmp)) print '<div class="error">'.$langs->trans($tmp).'</div>';
-                            elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
-                            else print $tmp;
-                            print '</td>'."\n";
+							// Show example of numbering module
+							print '<td class="nowrap">';
+							$tmp = $module->getExample();
+							if (preg_match('/^Error/', $tmp)) print '<div class="error">'.$langs->trans($tmp).'</div>';
+							elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
+							else print $tmp;
+							print '</td>'."\n";
 
-                            print '<td class="center">';
-                            //print "> ".$conf->global->SUPPLIER_PAYMENT_ADDON." - ".$file;
-                            if ($conf->global->SUPPLIER_PAYMENT_ADDON == $file || $conf->global->SUPPLIER_PAYMENT_ADDON.'.php' == $file)
-                            {
-                                print img_picto($langs->trans("Activated"), 'switch_on');
-                            } else {
-                                print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&token='.newToken().'&value='.preg_replace('/\.php$/', '', $file).'&scandir='.$module->scandir.'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
-                            }
-                            print '</td>';
+							print '<td class="center">';
+							//print "> ".$conf->global->SUPPLIER_PAYMENT_ADDON." - ".$file;
+							if ($conf->global->SUPPLIER_PAYMENT_ADDON == $file || $conf->global->SUPPLIER_PAYMENT_ADDON.'.php' == $file)
+							{
+								print img_picto($langs->trans("Activated"), 'switch_on');
+							} else {
+								print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&token='.newToken().'&value='.preg_replace('/\.php$/', '', $file).'&scandir='.$module->scandir.'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+							}
+							print '</td>';
 
-                            $payment = new PaiementFourn($db);
-                            $payment->initAsSpecimen();
+							$payment = new PaiementFourn($db);
+							$payment->initAsSpecimen();
 
-                            // Example
-                            $htmltooltip = '';
-                            $htmltooltip .= ''.$langs->trans("Version").': <b>'.$module->getVersion().'</b><br>';
-                            $nextval = $module->getNextValue($mysoc, $payment);
-                            if ("$nextval" != $langs->trans("NotAvailable")) {  // Keep " on nextval
-                                    $htmltooltip .= $langs->trans("NextValue").': ';
-                                if ($nextval) {
-                                    if (preg_match('/^Error/', $nextval) || $nextval == 'NotConfigured')
-                                        $nextval = $langs->trans($nextval);
-                                    $htmltooltip .= $nextval.'<br>';
-                                } else {
-                                    $htmltooltip .= $langs->trans($module->error).'<br>';
-                                }
-                            }
+							// Example
+							$htmltooltip = '';
+							$htmltooltip .= ''.$langs->trans("Version").': <b>'.$module->getVersion().'</b><br>';
+							$nextval = $module->getNextValue($mysoc, $payment);
+							if ("$nextval" != $langs->trans("NotAvailable")) {  // Keep " on nextval
+									$htmltooltip .= $langs->trans("NextValue").': ';
+								if ($nextval) {
+									if (preg_match('/^Error/', $nextval) || $nextval == 'NotConfigured')
+										$nextval = $langs->trans($nextval);
+									$htmltooltip .= $nextval.'<br>';
+								} else {
+									$htmltooltip .= $langs->trans($module->error).'<br>';
+								}
+							}
 
-                            print '<td class="center">';
-                            print $form->textwithpicto('', $htmltooltip, 1, 0);
+							print '<td class="center">';
+							print $form->textwithpicto('', $htmltooltip, 1, 0);
 
-                            if ($conf->global->PAYMENT_ADDON.'.php' == $file)  // If module is the one used, we show existing errors
-                            {
-                                if (!empty($module->error)) dol_htmloutput_mesg($module->error, '', 'error', 1);
-                            }
+							if ($conf->global->PAYMENT_ADDON.'.php' == $file)  // If module is the one used, we show existing errors
+							{
+								if (!empty($module->error)) dol_htmloutput_mesg($module->error, '', 'error', 1);
+							}
 
-                            print '</td>';
+							print '</td>';
 
-                            print "</tr>\n";
-                        }
-                    }
-                }
-            }
-            closedir($handle);
-        }
-    }
+							print "</tr>\n";
+						}
+					}
+				}
+			}
+			closedir($handle);
+		}
+	}
 }
 
 print '</table>';
@@ -335,91 +335,91 @@ foreach ($dirmodels as $reldir)
 	$realpath = $reldir."core/modules/supplier_payment/doc";
 	$dir = dol_buildpath($realpath);
 
-    if (is_dir($dir))
-    {
-        $handle = opendir($dir);
+	if (is_dir($dir))
+	{
+		$handle = opendir($dir);
 
 
-        if (is_resource($handle))
-        {
-            while (($file = readdir($handle)) !== false)
-            {
-                if (preg_match('/\.modules\.php$/i', $file) && preg_match('/^(pdf_|doc_)/', $file))
-                {
-                    $name = substr($file, 4, dol_strlen($file) - 16);
-                    $classname = substr($file, 0, dol_strlen($file) - 12);
+		if (is_resource($handle))
+		{
+			while (($file = readdir($handle)) !== false)
+			{
+				if (preg_match('/\.modules\.php$/i', $file) && preg_match('/^(pdf_|doc_)/', $file))
+				{
+					$name = substr($file, 4, dol_strlen($file) - 16);
+					$classname = substr($file, 0, dol_strlen($file) - 12);
 
-	                require_once $dir.'/'.$file;
-	                $module = new $classname($db, new PaiementFourn($db));
+					require_once $dir.'/'.$file;
+					$module = new $classname($db, new PaiementFourn($db));
 
-                    print "<tr class=\"oddeven\">\n";
-                    print "<td>";
-	                print (empty($module->name) ? $name : $module->name);
-	                print "</td>\n";
-                    print "<td>\n";
-                    require_once $dir.'/'.$file;
-                    $module = new $classname($db, $specimenthirdparty);
-                    if (method_exists($module, 'info')) print $module->info($langs);
-	                else print $module->description;
+					print "<tr class=\"oddeven\">\n";
+					print "<td>";
+					print (empty($module->name) ? $name : $module->name);
+					print "</td>\n";
+					print "<td>\n";
+					require_once $dir.'/'.$file;
+					$module = new $classname($db, $specimenthirdparty);
+					if (method_exists($module, 'info')) print $module->info($langs);
+					else print $module->description;
 
-                    print "</td>\n";
+					print "</td>\n";
 
-                    // Active
-                    if (in_array($name, $def))
-                    {
-                        print '<td class="center">'."\n";
-                        //if ($conf->global->SUPPLIER_PAYMENT_ADDON_PDF != "$name")
-                        //{
-                            // Even if choice is the default value, we allow to disable it: For supplier invoice, we accept to have no doc generation at all
-                            print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&amp;value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=SUPPLIER_PAYMENT">';
-                            print img_picto($langs->trans("Enabled"), 'switch_on');
-                            print '</a>';
-                        /*}
+					// Active
+					if (in_array($name, $def))
+					{
+						print '<td class="center">'."\n";
+						//if ($conf->global->SUPPLIER_PAYMENT_ADDON_PDF != "$name")
+						//{
+							// Even if choice is the default value, we allow to disable it: For supplier invoice, we accept to have no doc generation at all
+							print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&amp;value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=SUPPLIER_PAYMENT">';
+							print img_picto($langs->trans("Enabled"), 'switch_on');
+							print '</a>';
+						/*}
                         else
                         {
                             print img_picto($langs->trans("Enabled"),'switch_on');
                         }*/
-                        print "</td>";
-                    } else {
-                        print '<td class="center">'."\n";
-                        print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;token='.newToken().'&amp;value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=SUPPLIER_PAYMENT">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
-                        print "</td>";
-                    }
+						print "</td>";
+					} else {
+						print '<td class="center">'."\n";
+						print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;token='.newToken().'&amp;value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=SUPPLIER_PAYMENT">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+						print "</td>";
+					}
 
-                    // Default
-                    print '<td class="center">';
-                    if ($conf->global->SUPPLIER_PAYMENT_ADDON_PDF == "$name")
-                    {
-                        //print img_picto($langs->trans("Default"),'on');
-                        // Even if choice is the default value, we allow to disable it: For supplier invoice, we accept to have no doc generation at all
-                        print '<a href="'.$_SERVER["PHP_SELF"].'?action=unsetdoc&amp;token='.newToken().'&amp;value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=SUPPLIER_PAYMENT"" alt="'.$langs->trans("Disable").'">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
-                    } else {
-                        print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;token='.newToken().'&amp;value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=SUPPLIER_PAYMENT"" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
-                    }
-                    print '</td>';
+					// Default
+					print '<td class="center">';
+					if ($conf->global->SUPPLIER_PAYMENT_ADDON_PDF == "$name")
+					{
+						//print img_picto($langs->trans("Default"),'on');
+						// Even if choice is the default value, we allow to disable it: For supplier invoice, we accept to have no doc generation at all
+						print '<a href="'.$_SERVER["PHP_SELF"].'?action=unsetdoc&amp;token='.newToken().'&amp;value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=SUPPLIER_PAYMENT"" alt="'.$langs->trans("Disable").'">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
+					} else {
+						print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;token='.newToken().'&amp;value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=SUPPLIER_PAYMENT"" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+					}
+					print '</td>';
 
-                    // Info
-                    $htmltooltip = ''.$langs->trans("Name").': '.$module->name;
-                    $htmltooltip .= '<br>'.$langs->trans("Type").': '.($module->type ? $module->type : $langs->trans("Unknown"));
-                    $htmltooltip .= '<br>'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur;
-                    $htmltooltip .= '<br>'.$langs->trans("Path").': '.preg_replace('/^\//', '', $realpath).'/'.$file;
+					// Info
+					$htmltooltip = ''.$langs->trans("Name").': '.$module->name;
+					$htmltooltip .= '<br>'.$langs->trans("Type").': '.($module->type ? $module->type : $langs->trans("Unknown"));
+					$htmltooltip .= '<br>'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur;
+					$htmltooltip .= '<br>'.$langs->trans("Path").': '.preg_replace('/^\//', '', $realpath).'/'.$file;
 
-                    $htmltooltip .= '<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
-                    $htmltooltip .= '<br>'.$langs->trans("Logo").': '.yn($module->option_logo, 1, 1);
-                    print '<td class="center">';
-                    print $form->textwithpicto('', $htmltooltip, 1, 0);
-                    print '</td>';
-                    print '<td class="center">';
-                    print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&amp;module='.$name.'">'.img_object($langs->trans("Preview"), 'order').'</a>';
-                    print '</td>';
+					$htmltooltip .= '<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
+					$htmltooltip .= '<br>'.$langs->trans("Logo").': '.yn($module->option_logo, 1, 1);
+					print '<td class="center">';
+					print $form->textwithpicto('', $htmltooltip, 1, 0);
+					print '</td>';
+					print '<td class="center">';
+					print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&amp;module='.$name.'">'.img_object($langs->trans("Preview"), 'order').'</a>';
+					print '</td>';
 
-                    print "</tr>\n";
-                }
-            }
+					print "</tr>\n";
+				}
+			}
 
-            closedir($handle);
-        }
-    }
+			closedir($handle);
+		}
+	}
 }
 
 print '</table>';
@@ -454,7 +454,7 @@ print "</td></tr>\n";
 
 print '</table>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '<br>';
 print '<div class="center">';
diff --git a/htdocs/admin/supplier_proposal.php b/htdocs/admin/supplier_proposal.php
index 3e0708660d3..38a6d9e3ff5 100644
--- a/htdocs/admin/supplier_proposal.php
+++ b/htdocs/admin/supplier_proposal.php
@@ -77,7 +77,7 @@ if ($action == 'specimen')
 	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 	foreach ($dirmodels as $reldir)
 	{
-	    $file = dol_buildpath($reldir."core/modules/supplier_proposal/doc/pdf_".$modele.".modules.php");
+		$file = dol_buildpath($reldir."core/modules/supplier_proposal/doc/pdf_".$modele.".modules.php");
 		if (file_exists($file))
 		{
 			$filefound = 1;
@@ -139,16 +139,16 @@ if ($action == 'set_SUPPLIER_PROPOSAL_FREE_TEXT')
 
 if ($action == 'set_BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL')
 {
-    $res = dolibarr_set_const($db, "BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL", $value, 'chaine', 0, '', $conf->entity);
+	$res = dolibarr_set_const($db, "BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL", $value, 'chaine', 0, '', $conf->entity);
 
-    if (!$res > 0) $error++;
+	if (!$res > 0) $error++;
 
-    if (!$error)
-    {
-        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    } else {
-        setEventMessages($langs->trans("Error"), null, 'errors');
-    }
+	if (!$error)
+	{
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
+		setEventMessages($langs->trans("Error"), null, 'errors');
+	}
 }
 
 // Activate a model
@@ -160,11 +160,11 @@ if ($action == 'set')
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0)
 	{
-        if ($conf->global->SUPPLIER_PROPOSAL_ADDON_PDF == "$value") dolibarr_del_const($db, 'SUPPLIER_PROPOSAL_ADDON_PDF', $conf->entity);
+		if ($conf->global->SUPPLIER_PROPOSAL_ADDON_PDF == "$value") dolibarr_del_const($db, 'SUPPLIER_PROPOSAL_ADDON_PDF', $conf->entity);
 	}
 } elseif ($action == 'setdoc')
 {
-    if (dolibarr_set_const($db, "SUPPLIER_PROPOSAL_ADDON_PDF", $value, 'chaine', 0, '', $conf->entity))
+	if (dolibarr_set_const($db, "SUPPLIER_PROPOSAL_ADDON_PDF", $value, 'chaine', 0, '', $conf->entity))
 	{
 		$conf->global->SUPPLIER_PROPOSAL_ADDON_PDF = $value;
 	}
@@ -248,13 +248,13 @@ foreach ($dirmodels as $reldir)
 						print $module->info();
 						print '</td>';
 
-                        // Show example of numbering module
-                        print '<td class="nowrap">';
-                        $tmp = $module->getExample();
-                        if (preg_match('/^Error/', $tmp)) print '<div class="error">'.$langs->trans($tmp).'</div>';
-                        elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
-                        else print $tmp;
-                        print '</td>'."\n";
+						// Show example of numbering module
+						print '<td class="nowrap">';
+						$tmp = $module->getExample();
+						if (preg_match('/^Error/', $tmp)) print '<div class="error">'.$langs->trans($tmp).'</div>';
+						elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
+						else print $tmp;
+						print '</td>'."\n";
 
 						print '<td class="center">';
 						if ($conf->global->SUPPLIER_PROPOSAL_ADDON == "$file")
@@ -274,16 +274,16 @@ foreach ($dirmodels as $reldir)
 						$htmltooltip = '';
 						$htmltooltip .= ''.$langs->trans("Version").': <b>'.$module->getVersion().'</b><br>';
 						$nextval = $module->getNextValue($mysoc, $supplier_proposal);
-                        if ("$nextval" != $langs->trans("NotAvailable")) {  // Keep " on nextval
-                            $htmltooltip .= ''.$langs->trans("NextValue").': ';
-                            if ($nextval) {
-                                if (preg_match('/^Error/', $nextval) || $nextval == 'NotConfigured')
-                                    $nextval = $langs->trans($nextval);
-                                $htmltooltip .= $nextval.'<br>';
-                            } else {
-                                $htmltooltip .= $langs->trans($module->error).'<br>';
-                            }
-                        }
+						if ("$nextval" != $langs->trans("NotAvailable")) {  // Keep " on nextval
+							$htmltooltip .= ''.$langs->trans("NextValue").': ';
+							if ($nextval) {
+								if (preg_match('/^Error/', $nextval) || $nextval == 'NotConfigured')
+									$nextval = $langs->trans($nextval);
+								$htmltooltip .= $nextval.'<br>';
+							} else {
+								$htmltooltip .= $langs->trans($module->error).'<br>';
+							}
+						}
 
 						print '<td class="center">';
 						print $form->textwithpicto('', $htmltooltip, 1, 0);
@@ -342,82 +342,82 @@ clearstatcache();
 
 foreach ($dirmodels as $reldir)
 {
-    foreach (array('', '/doc') as $valdir)
-    {
-    	$realpath = $reldir."core/modules/supplier_proposal".$valdir;
-    	$dir = dol_buildpath($realpath);
+	foreach (array('', '/doc') as $valdir)
+	{
+		$realpath = $reldir."core/modules/supplier_proposal".$valdir;
+		$dir = dol_buildpath($realpath);
 
-        if (is_dir($dir))
-        {
-            $handle = opendir($dir);
-            if (is_resource($handle))
-            {
-                while (($file = readdir($handle)) !== false)
-                {
-                    $filelist[] = $file;
-                }
-                closedir($handle);
-                arsort($filelist);
+		if (is_dir($dir))
+		{
+			$handle = opendir($dir);
+			if (is_resource($handle))
+			{
+				while (($file = readdir($handle)) !== false)
+				{
+					$filelist[] = $file;
+				}
+				closedir($handle);
+				arsort($filelist);
 
-                foreach ($filelist as $file)
-                {
-                    if (preg_match('/\.modules\.php$/i', $file) && preg_match('/^(pdf_|doc_)/', $file))
-                    {
-                    	if (file_exists($dir.'/'.$file))
-                    	{
-                    		$name = substr($file, 4, dol_strlen($file) - 16);
-	                        $classname = substr($file, 0, dol_strlen($file) - 12);
+				foreach ($filelist as $file)
+				{
+					if (preg_match('/\.modules\.php$/i', $file) && preg_match('/^(pdf_|doc_)/', $file))
+					{
+						if (file_exists($dir.'/'.$file))
+						{
+							$name = substr($file, 4, dol_strlen($file) - 16);
+							$classname = substr($file, 0, dol_strlen($file) - 12);
 
-	                        require_once $dir.'/'.$file;
-	                        $module = new $classname($db);
+							require_once $dir.'/'.$file;
+							$module = new $classname($db);
 
-	                        $modulequalified = 1;
-	                        if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) $modulequalified = 0;
-	                        if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) $modulequalified = 0;
+							$modulequalified = 1;
+							if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) $modulequalified = 0;
+							if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) $modulequalified = 0;
 
-	                        if ($modulequalified)
-	                        {
-	                            print '<tr class="oddeven"><td width="100">';
-	                            print (empty($module->name) ? $name : $module->name);
-	                            print "</td><td>\n";
-	                            if (method_exists($module, 'info')) print $module->info($langs);
-	                            else print $module->description;
-	                            print '</td>';
+							if ($modulequalified)
+							{
+								print '<tr class="oddeven"><td width="100">';
+								print (empty($module->name) ? $name : $module->name);
+								print "</td><td>\n";
+								if (method_exists($module, 'info')) print $module->info($langs);
+								else print $module->description;
+								print '</td>';
 
-	                            // Active
-	                            if (in_array($name, $def))
-	                            {
-	                            	print '<td class="center">'."\n";
-	                            	print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&amp;token='.newToken().'&amp;value='.$name.'">';
-	                            	print img_picto($langs->trans("Enabled"), 'switch_on');
-	                            	print '</a>';
-	                            	print '</td>';
-	                            } else {
-	                                print "<td align=\"center\">\n";
-	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
-	                                print "</td>";
-	                            }
+								// Active
+								if (in_array($name, $def))
+								{
+									print '<td class="center">'."\n";
+									print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&amp;token='.newToken().'&amp;value='.$name.'">';
+									print img_picto($langs->trans("Enabled"), 'switch_on');
+									print '</a>';
+									print '</td>';
+								} else {
+									print "<td align=\"center\">\n";
+									print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+									print "</td>";
+								}
 
-	                            // Defaut
-	                            print "<td align=\"center\">";
-	                            if ($conf->global->SUPPLIER_PROPOSAL_ADDON_PDF == "$name")
-	                            {
-	                                print img_picto($langs->trans("Default"), 'on');
-	                            } else {
-	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
-	                            }
-	                            print '</td>';
+								// Defaut
+								print "<td align=\"center\">";
+								if ($conf->global->SUPPLIER_PROPOSAL_ADDON_PDF == "$name")
+								{
+									print img_picto($langs->trans("Default"), 'on');
+								} else {
+									print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+								}
+								print '</td>';
 
-	                            // Info
-	                            $htmltooltip = ''.$langs->trans("Name").': '.$module->name;
-	                            $htmltooltip .= '<br>'.$langs->trans("Type").': '.($module->type ? $module->type : $langs->trans("Unknown"));
-	                            if ($module->type == 'pdf')
-	                            {
-	                                $htmltooltip .= '<br>'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur;
-	                            }
-	                            $htmltooltip .= '<br>'.$langs->trans("Path").': '.preg_replace('/^\//', '', $realpath).'/'.$file;
+								// Info
+								$htmltooltip = ''.$langs->trans("Name").': '.$module->name;
+								$htmltooltip .= '<br>'.$langs->trans("Type").': '.($module->type ? $module->type : $langs->trans("Unknown"));
+								if ($module->type == 'pdf')
+								{
+									$htmltooltip .= '<br>'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur;
+								}
+								$htmltooltip .= '<br>'.$langs->trans("Path").': '.preg_replace('/^\//', '', $realpath).'/'.$file;
 
-	                            $htmltooltip .= '<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
+								$htmltooltip .= '<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
 								$htmltooltip .= '<br>'.$langs->trans("Logo").': '.yn($module->option_logo, 1, 1);
 								$htmltooltip .= '<br>'.$langs->trans("PaymentMode").': '.yn($module->option_modereg, 1, 1);
 								$htmltooltip .= '<br>'.$langs->trans("PaymentConditions").': '.yn($module->option_condreg, 1, 1);
@@ -427,28 +427,28 @@ foreach ($dirmodels as $reldir)
 								$htmltooltip .= '<br>'.$langs->trans("WatermarkOnDraftProposal").': '.yn($module->option_draft_watermark, 1, 1);
 
 
-	                            print '<td class="center">';
-	                            print $form->textwithpicto('', $htmltooltip, 1, 0);
-	                            print '</td>';
+								print '<td class="center">';
+								print $form->textwithpicto('', $htmltooltip, 1, 0);
+								print '</td>';
 
-	                            // Preview
-	                            print '<td class="center">';
-	                            if ($module->type == 'pdf')
-	                            {
-	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'bill').'</a>';
-	                            } else {
-	                                print img_object($langs->trans("PreviewNotAvailable"), 'generic');
-	                            }
-	                            print '</td>';
+								// Preview
+								print '<td class="center">';
+								if ($module->type == 'pdf')
+								{
+									print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'bill').'</a>';
+								} else {
+									print img_object($langs->trans("PreviewNotAvailable"), 'generic');
+								}
+								print '</td>';
 
-	                            print "</tr>\n";
-	                        }
-                    	}
-                    }
-                }
-            }
-        }
-    }
+								print "</tr>\n";
+							}
+						}
+					}
+				}
+			}
+		}
+	}
 }
 
 print '</table>';
@@ -482,11 +482,11 @@ print $form->textwithpicto($langs->trans("FreeLegalTextOnSupplierProposal"), $la
 $variablename = 'SUPPLIER_PROPOSAL_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").'">';
@@ -508,23 +508,23 @@ print '</form>';
 
 if ($conf->banque->enabled)
 {
-    print '<tr class="oddeven"><td>';
-    print $langs->trans("BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL").'</td><td>&nbsp</td><td class="right">';
-    if (!empty($conf->use_javascript_ajax))
-    {
-        print ajax_constantonoff('BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL');
-    } else {
-        if (empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL))
-        {
-            print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL&amp;token='.newToken().'&amp;value=1">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
-        } else {
-            print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL&amp;token='.newToken().'&amp;value=0">'.img_picto($langs->trans("Enabled"), 'switch_on').'</a>';
-        }
-    }
-    print '</td></tr>';
+	print '<tr class="oddeven"><td>';
+	print $langs->trans("BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL").'</td><td>&nbsp</td><td class="right">';
+	if (!empty($conf->use_javascript_ajax))
+	{
+		print ajax_constantonoff('BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL');
+	} else {
+		if (empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL))
+		{
+			print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL&amp;token='.newToken().'&amp;value=1">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+		} else {
+			print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL&amp;token='.newToken().'&amp;value=0">'.img_picto($langs->trans("Enabled"), 'switch_on').'</a>';
+		}
+	}
+	print '</td></tr>';
 } else {
-    print '<tr class="oddeven"><td>';
-    print $langs->trans("BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL").'</td><td>&nbsp;</td><td align="center">'.$langs->trans('NotAvailable').'</td></tr>';
+	print '<tr class="oddeven"><td>';
+	print $langs->trans("BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL").'</td><td>&nbsp;</td><td align="center">'.$langs->trans('NotAvailable').'</td></tr>';
 }
 
 print '</table>';
diff --git a/htdocs/admin/supplierinvoice_extrafields.php b/htdocs/admin/supplierinvoice_extrafields.php
index 10de9a09735..ca12e4dfaa4 100644
--- a/htdocs/admin/supplierinvoice_extrafields.php
+++ b/htdocs/admin/supplierinvoice_extrafields.php
@@ -78,15 +78,15 @@ print dol_get_fiche_head($head, 'supplierinvoice', $langs->trans("Suppliers"), -
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_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/supplierinvoicedet_extrafields.php b/htdocs/admin/supplierinvoicedet_extrafields.php
index 576e3f7b3b3..ac40ef66e09 100644
--- a/htdocs/admin/supplierinvoicedet_extrafields.php
+++ b/htdocs/admin/supplierinvoicedet_extrafields.php
@@ -80,7 +80,7 @@ print dol_get_fiche_head($head, 'supplierinvoicedet', $langs->trans("Suppliers")
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 // Buttons
diff --git a/htdocs/admin/supplierorder_extrafields.php b/htdocs/admin/supplierorder_extrafields.php
index a35820806fb..c46eebfb037 100644
--- a/htdocs/admin/supplierorder_extrafields.php
+++ b/htdocs/admin/supplierorder_extrafields.php
@@ -78,7 +78,7 @@ print dol_get_fiche_head($head, 'supplierorder', $langs->trans("Suppliers"), -1,
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 // Buttons
diff --git a/htdocs/admin/supplierorderdet_extrafields.php b/htdocs/admin/supplierorderdet_extrafields.php
index 8043c56bcd2..97cf92883f9 100644
--- a/htdocs/admin/supplierorderdet_extrafields.php
+++ b/htdocs/admin/supplierorderdet_extrafields.php
@@ -79,15 +79,15 @@ print dol_get_fiche_head($head, 'supplierorderdet', $langs->trans("Suppliers"),
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_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/admin/syslog.php b/htdocs/admin/syslog.php
index 60de87d2d2e..6d84b4a0e2d 100644
--- a/htdocs/admin/syslog.php
+++ b/htdocs/admin/syslog.php
@@ -109,8 +109,8 @@ if ($action == 'set')
 
 	$activeModules = $newActiveModules;
 
-    dolibarr_del_const($db, 'SYSLOG_HANDLERS', -1); // To be sure ther is not a setup into another entity
-    dolibarr_set_const($db, 'SYSLOG_HANDLERS', json_encode($activeModules), 'chaine', 0, '', 0);
+	dolibarr_del_const($db, 'SYSLOG_HANDLERS', -1); // To be sure ther is not a setup into another entity
+	dolibarr_set_const($db, 'SYSLOG_HANDLERS', json_encode($activeModules), 'chaine', 0, '', 0);
 
 	// Check configuration
 	foreach ($activeModules as $modulename) {
@@ -213,7 +213,7 @@ foreach ($syslogModules as $moduleName)
 	print '<input class="oddeven" type="checkbox" name="SYSLOG_HANDLERS[]" value="'.$moduleName.'" '.(in_array($moduleName, $activeModules) ? 'checked' : '').($moduleactive <= 0 ? 'disabled' : '').'> ';
 	print $module->getName();
 	if ($moduleName == 'mod_syslog_syslog') {
-		if (! $module->isActive()) {
+		if (!$module->isActive()) {
 			$langs->load("errors");
 			print $form->textwithpicto('', $langs->trans("ErrorPHPNeedModule", 'SysLog'));
 		}
@@ -226,22 +226,22 @@ foreach ($syslogModules as $moduleName)
 	{
 		foreach ($setuparray as $option)
 		{
-		    $tmpoption = $option['constant'];
-		    if (!empty($tmpoption))
-		    {
-    			if (isset($_POST[$tmpoption])) $value = $_POST[$tmpoption];
-    			elseif (!empty($conf->global->$tmpoption)) $value = $conf->global->$tmpoption;
-		    } else $value = (isset($option['default']) ? $option['default'] : '');
+			$tmpoption = $option['constant'];
+			if (!empty($tmpoption))
+			{
+				if (isset($_POST[$tmpoption])) $value = $_POST[$tmpoption];
+				elseif (!empty($conf->global->$tmpoption)) $value = $conf->global->$tmpoption;
+			} else $value = (isset($option['default']) ? $option['default'] : '');
 
 			print $option['name'].': <input type="text" class="flat" name="'.$option['constant'].'" value="'.$value.'"'.(isset($option['attr']) ? ' '.$option['attr'] : '').'>';
 			if (!empty($option['example'])) print '<br>'.$langs->trans("Example").': '.$option['example'];
 
 			if ($option['constant'] == 'SYSLOG_FILE' && preg_match('/^DOL_DATA_ROOT\/[^\/]*$/', $value))
 			{
-    			$filelogparam = ' (<a href="'.DOL_URL_ROOT.'/document.php?modulepart=logs&file='.basename($value).'">';
-    			$filelogparam .= $langs->trans('Download');
-    			$filelogparam .= $filelog.'</a>)';
-    			print $filelogparam;
+				$filelogparam = ' (<a href="'.DOL_URL_ROOT.'/document.php?modulepart=logs&file='.basename($value).'">';
+				$filelogparam .= $langs->trans('Download');
+				$filelogparam .= $filelog.'</a>)';
+				print $filelogparam;
 			}
 		}
 	}
diff --git a/htdocs/admin/system/about.php b/htdocs/admin/system/about.php
index bbac6bdfe0c..0668e4612ae 100644
--- a/htdocs/admin/system/about.php
+++ b/htdocs/admin/system/about.php
@@ -83,6 +83,7 @@ print '<li>';
 print '<a target="_blank" href="https://www.dolibarr.org/" rel="external">'.$langs->trans("OfficialWebSite").'</a>';
 print '</li>';
 // Show local site
+/*
 if (preg_match('/^fr_/i', $langs->getDefaultLang()))
 {
 	print '<li>';
@@ -112,7 +113,7 @@ if (preg_match('/^de_/i', $langs->getDefaultLang()))
 	print '<li>';
 	print '<a target="_blank" href="https://www.dolibarr.de/" rel="external">'.$langs->trans("OfficialWebSiteLocal", $langs->transnoentitiesnoconv("Germany")).'</a>';
 	print '</li>';
-}
+}*/
 print '<li>';
 print '<a target="_blank" href="https://wiki.dolibarr.org/" rel="external">'.$langs->trans("OfficialWiki").'</a>';
 print '</li>';
@@ -168,7 +169,7 @@ print $langs->trans("OtherResources").':';
 print '<ul>';
 
 $url = 'https://saas.dolibarr.org'; $title = $langs->trans("OfficialWebHostingService");
-if (preg_match('/^fr_/i', $langs->getDefaultLang())) $url = 'https://wiki.dolibarr.org/index.php/Solutions_de_Cloud';
+if (preg_match('/^fr_/i', $langs->getDefaultLang())) $url = 'https://wiki.dolibarr.org/index.php/Solutions_Cloud_pour_Dolibarr_ERP_CRM';
 if (preg_match('/^es_/i', $langs->getDefaultLang())) $url = 'https://wiki.dolibarr.org/index.php/Soluciones_en_la_Nube';
 print '<li>';
 print '<a target="_blank" href="'.$url.'" rel="external">'.$title.'</a>';
@@ -188,25 +189,25 @@ print '<div class="clearboth"></div>';
 $showpromotemessage = 1;
 if ($showpromotemessage)
 {
-    $tmp = versiondolibarrarray();
-    if (is_numeric($tmp[2]))    // Not alpha, beta or rc
-    {
-        print '<br>';
-        print '<br>';
+	$tmp = versiondolibarrarray();
+	if (is_numeric($tmp[2]))    // Not alpha, beta or rc
+	{
+		print '<br>';
+		print '<br>';
 
-        if ((empty($tmp[2]) && (strpos($tmp[1], '0') === 0)) || (strpos($tmp[2], '0') === 0))
-        {
-            print $langs->trans("TitleExampleForMajorRelease").':<br>';
-            print '<textarea style="width:80%; min-height: 60px">';
-            print $langs->trans("ExampleOfNewsMessageForMajorRelease", DOL_VERSION, DOL_VERSION);
-            print '</textarea>';
-        } else {
-            print $langs->trans("TitleExampleForMaintenanceRelease").':<br>';
-            print '<textarea style="width:80%; min-height: 60px">';
-            print $langs->trans("ExampleOfNewsMessageForMaintenanceRelease", DOL_VERSION, DOL_VERSION);
-            print '</textarea>';
-        }
-    }
+		if ((empty($tmp[2]) && (strpos($tmp[1], '0') === 0)) || (strpos($tmp[2], '0') === 0))
+		{
+			print $langs->trans("TitleExampleForMajorRelease").':<br>';
+			print '<textarea style="width:80%; min-height: 60px">';
+			print $langs->trans("ExampleOfNewsMessageForMajorRelease", DOL_VERSION, DOL_VERSION);
+			print '</textarea>';
+		} else {
+			print $langs->trans("TitleExampleForMaintenanceRelease").':<br>';
+			print '<textarea style="width:80%; min-height: 60px">';
+			print $langs->trans("ExampleOfNewsMessageForMaintenanceRelease", DOL_VERSION, DOL_VERSION);
+			print '</textarea>';
+		}
+	}
 }
 
 // End of page
diff --git a/htdocs/admin/system/database-tables.php b/htdocs/admin/system/database-tables.php
index 683fc3c4f3a..00020845bde 100644
--- a/htdocs/admin/system/database-tables.php
+++ b/htdocs/admin/system/database-tables.php
@@ -119,7 +119,7 @@ if (!$base)
 				print '<td><a href="dbtable.php?table='.$obj->Name.'">'.$obj->Name.'</a></td>';
 				print '<td>'.$obj->Engine.'</td>';
 				if (isset($obj->Engine) && $obj->Engine == "MyISAM") {
-				    print '<td><a class="reposition" href="database-tables.php?action=convert&amp;table='.$obj->Name.'">'.$langs->trans("Convert").' InnoDb</a></td>';
+					print '<td><a class="reposition" href="database-tables.php?action=convert&amp;table='.$obj->Name.'">'.$langs->trans("Convert").' InnoDb</a></td>';
 				} else {
 					print '<td>&nbsp;</td>';
 				}
diff --git a/htdocs/admin/system/database.php b/htdocs/admin/system/database.php
index 6b08fc4fe8f..8681efa08ef 100644
--- a/htdocs/admin/system/database.php
+++ b/htdocs/admin/system/database.php
@@ -77,7 +77,7 @@ if (!count($listofvars) && !count($listofstatus))
 	foreach ($arraylist as $listname)
 	{
 		print '<br>';
-        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 '<td width="300">'.$langs->trans("Parameters").'</td>';
diff --git a/htdocs/admin/system/dolibarr.php b/htdocs/admin/system/dolibarr.php
index 41c8dcbd198..6bae9666ee9 100644
--- a/htdocs/admin/system/dolibarr.php
+++ b/htdocs/admin/system/dolibarr.php
@@ -48,9 +48,13 @@ $version = '0.0';
 
 if ($action == 'getlastversion')
 {
-    $result = getURLContent('https://sourceforge.net/projects/dolibarr/rss');
-    //var_dump($result['content']);
-    $sfurl = simplexml_load_string($result['content']);
+	$result = getURLContent('https://sourceforge.net/projects/dolibarr/rss');
+	//var_dump($result['content']);
+	if (function_exists('simplexml_load_string')) {
+		$sfurl = simplexml_load_string($result['content']);
+	} else {
+		setEventMessages($langs->trans("ErrorPHPDoesNotSupport", "xml"), null, 'errors');
+	}
 }
 
 
@@ -74,43 +78,43 @@ print '<tr class="oddeven"><td>'.$langs->trans("CurrentVersion").' ('.$langs->tr
 // If current version differs from last upgrade
 if (empty($conf->global->MAIN_VERSION_LAST_UPGRADE))
 {
-    // Compare version with last install database version (upgrades never occured)
-    if (DOL_VERSION != $conf->global->MAIN_VERSION_LAST_INSTALL) print ' '.img_warning($langs->trans("RunningUpdateProcessMayBeRequired", DOL_VERSION, $conf->global->MAIN_VERSION_LAST_INSTALL));
+	// Compare version with last install database version (upgrades never occured)
+	if (DOL_VERSION != $conf->global->MAIN_VERSION_LAST_INSTALL) print ' '.img_warning($langs->trans("RunningUpdateProcessMayBeRequired", DOL_VERSION, $conf->global->MAIN_VERSION_LAST_INSTALL));
 } else {
-    // Compare version with last upgrade database version
-    if (DOL_VERSION != $conf->global->MAIN_VERSION_LAST_UPGRADE) print ' '.img_warning($langs->trans("RunningUpdateProcessMayBeRequired", DOL_VERSION, $conf->global->MAIN_VERSION_LAST_UPGRADE));
+	// Compare version with last upgrade database version
+	if (DOL_VERSION != $conf->global->MAIN_VERSION_LAST_UPGRADE) print ' '.img_warning($langs->trans("RunningUpdateProcessMayBeRequired", DOL_VERSION, $conf->global->MAIN_VERSION_LAST_UPGRADE));
 }
 
 if (function_exists('curl_init'))
 {
-    $conf->global->MAIN_USE_RESPONSE_TIMEOUT = 10;
-    print ' &nbsp; &nbsp; - &nbsp; &nbsp; ';
-    if ($action == 'getlastversion')
-    {
-        if ($sfurl)
-        {
-            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++;
-            }
+	$conf->global->MAIN_USE_RESPONSE_TIMEOUT = 10;
+	print ' &nbsp; &nbsp; - &nbsp; &nbsp; ';
+	if ($action == 'getlastversion')
+	{
+		if ($sfurl)
+		{
+			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>';
-        } else {
-            print $langs->trans("LastStableVersion").' : <b>'.$langs->trans("UpdateServerOffline").'</b>';
-        }
-    } else {
-        print $langs->trans("LastStableVersion").' : <a href="'.$_SERVER["PHP_SELF"].'?action=getlastversion" class="butAction">'.$langs->trans("Check").'</a>';
-    }
+			// Show version
+			print $langs->trans("LastStableVersion").' : <b>'.(($version != '0.0') ? $version : $langs->trans("Unknown")).'</b>';
+		} else {
+			print $langs->trans("LastStableVersion").' : <b>'.$langs->trans("UpdateServerOffline").'</b>';
+		}
+	} else {
+		print $langs->trans("LastStableVersion").' : <a href="'.$_SERVER["PHP_SELF"].'?action=getlastversion" class="butAction">'.$langs->trans("Check").'</a>';
+	}
 }
 
 // Now show link to the changelog
@@ -168,7 +172,7 @@ if (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_S
 {
 	$shmoparray = dol_listshmop();
 
-    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 '<td class="titlefield">'.$langs->trans("LanguageFilesCachedIntoShmopSharedMemory").'</td>';
@@ -280,8 +284,8 @@ $configfileparameters = array(
 		'dolibarr_main_document_root'=> $langs->trans("DocumentRootServer"),
 		'?dolibarr_main_document_root_alt' => $langs->trans("DocumentRootServer").' (alt)',
 		'dolibarr_main_data_root' => $langs->trans("DataRootServer"),
-        'dolibarr_main_instance_unique_id' => $langs->trans("InstanceUniqueID"),
-        'separator1' => '',
+		'dolibarr_main_instance_unique_id' => $langs->trans("InstanceUniqueID"),
+		'separator1' => '',
 		'dolibarr_main_db_host' => $langs->trans("DatabaseServer"),
 		'dolibarr_main_db_port' => $langs->trans("DatabasePort"),
 		'dolibarr_main_db_name' => $langs->trans("DatabaseName"),
@@ -293,7 +297,7 @@ $configfileparameters = array(
 		'?dolibarr_main_db_prefix' => $langs->trans("Prefix"),
 		'separator2' => '',
 		'dolibarr_main_authentication' => $langs->trans("AuthenticationMode"),
-        '?multicompany_transverse_mode'=>  $langs->trans("MultiCompanyMode"),
+		'?multicompany_transverse_mode'=>  $langs->trans("MultiCompanyMode"),
 		'separator'=> '',
 		'?dolibarr_main_auth_ldap_login_attribute' => 'dolibarr_main_auth_ldap_login_attribute',
 		'?dolibarr_main_auth_ldap_host' => 'dolibarr_main_auth_ldap_host',
@@ -349,8 +353,8 @@ foreach ($configfileparameters as $key => $value)
 
 		if (preg_match('/^\?/', $key) && empty(${$newkey}))
 		{
-		    if ($newkey != 'multicompany_transverse_mode' || empty($conf->multicompany->enabled))
-                continue; // We discard parameters starting with ?
+			if ($newkey != 'multicompany_transverse_mode' || empty($conf->multicompany->enabled))
+				continue; // We discard parameters starting with ?
 		}
 		if (strpos($newkey, 'separator') !== false && $lastkeyshown == 'separator') continue;
 
@@ -387,14 +391,14 @@ foreach ($configfileparameters as $key => $value)
 					++$i;
 				}
 			} elseif ($newkey == 'dolibarr_main_instance_unique_id') {
-			    //print $conf->file->instance_unique_id;
-			    global $dolibarr_main_cookie_cryptkey;
-			    $valuetoshow = ${$newkey} ? ${$newkey} : $dolibarr_main_cookie_cryptkey; // Use $dolibarr_main_instance_unique_id first then $dolibarr_main_cookie_cryptkey
-			    print $valuetoshow;
-			    if (empty($valuetoshow)) {
-			        print img_warning("EditConfigFileToAddEntry", 'dolibarr_main_instance_unique_id');
-			    }
-			    print ' &nbsp; <span class="opacitymedium">('.$langs->trans("HashForPing").'='.md5('dolibarr'.$valuetoshow).')</span>';
+				//print $conf->file->instance_unique_id;
+				global $dolibarr_main_cookie_cryptkey;
+				$valuetoshow = ${$newkey} ? ${$newkey} : $dolibarr_main_cookie_cryptkey; // Use $dolibarr_main_instance_unique_id first then $dolibarr_main_cookie_cryptkey
+				print $valuetoshow;
+				if (empty($valuetoshow)) {
+					print img_warning("EditConfigFileToAddEntry", 'dolibarr_main_instance_unique_id');
+				}
+				print ' &nbsp; <span class="opacitymedium">('.$langs->trans("HashForPing").'='.md5('dolibarr'.$valuetoshow).')</span>';
 			} elseif ($newkey == 'dolibarr_main_prod') {
 				print ${$newkey};
 
@@ -410,7 +414,7 @@ foreach ($configfileparameters as $key => $value)
 					print img_warning($langs->trans('SwitchThisForABetterSecurity', 0));
 				}
 			} else {
-			    print ${$newkey};
+				print ${$newkey};
 			}
 			if ($newkey == 'dolibarr_main_url_root' && ${$newkey} != DOL_MAIN_URL_ROOT) print ' (currently overwritten by autodetected value: '.DOL_MAIN_URL_ROOT.')';
 			print "</td>";
diff --git a/htdocs/admin/system/filecheck.php b/htdocs/admin/system/filecheck.php
index a3d54104a02..a94a78a9794 100644
--- a/htdocs/admin/system/filecheck.php
+++ b/htdocs/admin/system/filecheck.php
@@ -31,7 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
 $langs->load("admin");
 
 if (!$user->admin)
-    accessforbidden();
+	accessforbidden();
 
 $error = 0;
 
@@ -57,13 +57,13 @@ print '<tr class="oddeven"><td width="300">'.$langs->trans("VersionLastUpgrade")
 print '<tr class="oddeven"><td width="300">'.$langs->trans("VersionProgram").'</td><td>'.DOL_VERSION;
 // If current version differs from last upgrade
 if (empty($conf->global->MAIN_VERSION_LAST_UPGRADE)) {
-    // Compare version with last install database version (upgrades never occured)
-    if (DOL_VERSION != $conf->global->MAIN_VERSION_LAST_INSTALL)
-        print ' '.img_warning($langs->trans("RunningUpdateProcessMayBeRequired", DOL_VERSION, $conf->global->MAIN_VERSION_LAST_INSTALL));
+	// Compare version with last install database version (upgrades never occured)
+	if (DOL_VERSION != $conf->global->MAIN_VERSION_LAST_INSTALL)
+		print ' '.img_warning($langs->trans("RunningUpdateProcessMayBeRequired", DOL_VERSION, $conf->global->MAIN_VERSION_LAST_INSTALL));
 } else {
-    // Compare version with last upgrade database version
-    if (DOL_VERSION != $conf->global->MAIN_VERSION_LAST_UPGRADE)
-        print ' '.img_warning($langs->trans("RunningUpdateProcessMayBeRequired", DOL_VERSION, $conf->global->MAIN_VERSION_LAST_UPGRADE));
+	// Compare version with last upgrade database version
+	if (DOL_VERSION != $conf->global->MAIN_VERSION_LAST_UPGRADE)
+		print ' '.img_warning($langs->trans("RunningUpdateProcessMayBeRequired", DOL_VERSION, $conf->global->MAIN_VERSION_LAST_UPGRADE));
 }
 print '</td></tr>'."\n";
 print '</table>';
@@ -96,24 +96,24 @@ print $langs->trans("MakeIntegrityAnalysisFrom").':<br>';
 print '<!-- for a local check target=local&xmlshortfile=... -->'."\n";
 if (dol_is_file($xmlfile))
 {
-    print '<input type="radio" name="target" value="local"'.((!GETPOST('target') || GETPOST('target') == 'local') ? 'checked="checked"' : '').'"> '.$langs->trans("LocalSignature").' = ';
-    print '<input name="xmlshortfile" class="flat minwidth400" value="'.dol_escape_htmltag($xmlshortfile).'">';
-    print '<br>';
+	print '<input type="radio" name="target" value="local"'.((!GETPOST('target') || GETPOST('target') == 'local') ? 'checked="checked"' : '').'"> '.$langs->trans("LocalSignature").' = ';
+	print '<input name="xmlshortfile" class="flat minwidth400" value="'.dol_escape_htmltag($xmlshortfile).'">';
+	print '<br>';
 } else {
-    print '<input type="radio" name="target" value="local"> '.$langs->trans("LocalSignature").' = ';
-    print '<input name="xmlshortfile" class="flat minwidth400" value="'.dol_escape_htmltag($xmlshortfile).'">';
-    print ' <span class="warning">('.$langs->trans("AvailableOnlyOnPackagedVersions").')</span>';
-    print '<br>';
+	print '<input type="radio" name="target" value="local"> '.$langs->trans("LocalSignature").' = ';
+	print '<input name="xmlshortfile" class="flat minwidth400" value="'.dol_escape_htmltag($xmlshortfile).'">';
+	print ' <span class="warning">('.$langs->trans("AvailableOnlyOnPackagedVersions").')</span>';
+	print '<br>';
 }
 print '<!-- for a remote target=remote&xmlremote=... -->'."\n";
 if ($enableremotecheck)
 {
-    print '<input type="radio" name="target" value="remote"'.(GETPOST('target') == 'remote' ? 'checked="checked"' : '').'> '.$langs->trans("RemoteSignature").' = ';
-    print '<input name="xmlremote" class="flat minwidth400" value="'.dol_escape_htmltag($xmlremote).'"><br>';
+	print '<input type="radio" name="target" value="remote"'.(GETPOST('target') == 'remote' ? 'checked="checked"' : '').'> '.$langs->trans("RemoteSignature").' = ';
+	print '<input name="xmlremote" class="flat minwidth400" value="'.dol_escape_htmltag($xmlremote).'"><br>';
 } else {
-    print '<input type="radio" name="target" value="remote" disabled="disabled"> '.$langs->trans("RemoteSignature").' = '.$xmlremote;
-    if (!GETPOST('xmlremote')) print ' <span class="warning">('.$langs->trans("FeatureAvailableOnlyOnStable").')</span>';
-    print '<br>';
+	print '<input type="radio" name="target" value="remote" disabled="disabled"> '.$langs->trans("RemoteSignature").' = '.$xmlremote;
+	if (!GETPOST('xmlremote')) print ' <span class="warning">('.$langs->trans("FeatureAvailableOnlyOnStable").')</span>';
+	print '<br>';
 }
 print '<br><div class="center"><input type="submit" name="check" class="button" value="'.$langs->trans("Check").'"></div>';
 print '</form>';
@@ -122,275 +122,275 @@ print '<br>';
 
 if (GETPOST('target') == 'local')
 {
-    if (dol_is_file($xmlfile))
-    {
-    	// If file is a zip file (.../filelist-x.y.z.xml.zip), we uncompress it before
-    	if (preg_match('/\.zip$/i', $xmlfile)) {
-    		dol_mkdir($conf->admin->dir_temp);
-    		$xmlfilenew = preg_replace('/\.zip$/i', '', $xmlfile);
-    		$result = dol_uncompress($xmlfile, $conf->admin->dir_temp);
-    		if (empty($result['error'])) {
-    			$xmlfile = $conf->admin->dir_temp.'/'.basename($xmlfilenew);
-    		} else {
-    			print $langs->trans('FailedToUncompressFile').': '.$xmlfile;
-    			$error++;
-    		}
-    	}
-        $xml = simplexml_load_file($xmlfile);
-    } else {
-        print $langs->trans('XmlNotFound').': '.$xmlfile;
-        $error++;
-    }
+	if (dol_is_file($xmlfile))
+	{
+		// If file is a zip file (.../filelist-x.y.z.xml.zip), we uncompress it before
+		if (preg_match('/\.zip$/i', $xmlfile)) {
+			dol_mkdir($conf->admin->dir_temp);
+			$xmlfilenew = preg_replace('/\.zip$/i', '', $xmlfile);
+			$result = dol_uncompress($xmlfile, $conf->admin->dir_temp);
+			if (empty($result['error'])) {
+				$xmlfile = $conf->admin->dir_temp.'/'.basename($xmlfilenew);
+			} else {
+				print $langs->trans('FailedToUncompressFile').': '.$xmlfile;
+				$error++;
+			}
+		}
+		$xml = simplexml_load_file($xmlfile);
+	} else {
+		print $langs->trans('XmlNotFound').': '.$xmlfile;
+		$error++;
+	}
 }
 if (GETPOST('target') == 'remote')
 {
-    $xmlarray = getURLContent($xmlremote);
+	$xmlarray = getURLContent($xmlremote);
 
-    // Return array('content'=>response,'curl_error_no'=>errno,'curl_error_msg'=>errmsg...)
-    if (!$xmlarray['curl_error_no'] && $xmlarray['http_code'] != '404')
-    {
-        $xmlfile = $xmlarray['content'];
-        //print "xmlfilestart".$xmlfile."xmlfileend";
-        $xml = simplexml_load_string($xmlfile);
-    } else {
-        $errormsg = $langs->trans('XmlNotFound').': '.$xmlremote.' - '.$xmlarray['http_code'].' '.$xmlarray['curl_error_no'].' '.$xmlarray['curl_error_msg'];
-        setEventMessages($errormsg, null, 'errors');
-        $error++;
-    }
+	// Return array('content'=>response,'curl_error_no'=>errno,'curl_error_msg'=>errmsg...)
+	if (!$xmlarray['curl_error_no'] && $xmlarray['http_code'] != '400' && $xmlarray['http_code'] != '404')
+	{
+		$xmlfile = $xmlarray['content'];
+		//print "xmlfilestart".$xmlfile."xmlfileend";
+		$xml = simplexml_load_string($xmlfile);
+	} else {
+		$errormsg = $langs->trans('XmlNotFound').': '.$xmlremote.' - '.$xmlarray['http_code'].' '.$xmlarray['curl_error_no'].' '.$xmlarray['curl_error_msg'];
+		setEventMessages($errormsg, null, 'errors');
+		$error++;
+	}
 }
 
 
 if (!$error && $xml)
 {
-    $checksumconcat = array();
-    $file_list = array();
-    $out = '';
+	$checksumconcat = array();
+	$file_list = array();
+	$out = '';
 
-    // Forced constants
-    if (is_object($xml->dolibarr_constants[0]))
-    {
-        $out .= load_fiche_titre($langs->trans("ForcedConstants"));
+	// Forced constants
+	if (is_object($xml->dolibarr_constants[0]))
+	{
+		$out .= load_fiche_titre($langs->trans("ForcedConstants"));
 
 		$out .= '<div class="div-table-responsive-no-min">';
-        $out .= '<table class="noborder">';
-        $out .= '<tr class="liste_titre">';
-        $out .= '<td>#</td>';
-        $out .= '<td>'.$langs->trans("Constant").'</td>';
-        $out .= '<td class="center">'.$langs->trans("ExpectedValue").'</td>';
-        $out .= '<td class="center">'.$langs->trans("Value").'</td>';
-        $out .= '</tr>'."\n";
+		$out .= '<table class="noborder">';
+		$out .= '<tr class="liste_titre">';
+		$out .= '<td>#</td>';
+		$out .= '<td>'.$langs->trans("Constant").'</td>';
+		$out .= '<td class="center">'.$langs->trans("ExpectedValue").'</td>';
+		$out .= '<td class="center">'.$langs->trans("Value").'</td>';
+		$out .= '</tr>'."\n";
 
-        $i = 0;
-        foreach ($xml->dolibarr_constants[0]->constant as $constant)    // $constant is a simpleXMLElement
-        {
-            $constname = $constant['name'];
-            $constvalue = (string) $constant;
-            $constvalue = (empty($constvalue) ? '0' : $constvalue);
-            // Value found
-            $value = '';
-            if ($constname && $conf->global->$constname != '') $value = $conf->global->$constname;
-            $valueforchecksum = (empty($value) ? '0' : $value);
+		$i = 0;
+		foreach ($xml->dolibarr_constants[0]->constant as $constant)    // $constant is a simpleXMLElement
+		{
+			$constname = $constant['name'];
+			$constvalue = (string) $constant;
+			$constvalue = (empty($constvalue) ? '0' : $constvalue);
+			// Value found
+			$value = '';
+			if ($constname && $conf->global->$constname != '') $value = $conf->global->$constname;
+			$valueforchecksum = (empty($value) ? '0' : $value);
 
-            $checksumconcat[] = $valueforchecksum;
+			$checksumconcat[] = $valueforchecksum;
 
-            $i++;
-            $out .= '<tr class="oddeven">';
-            $out .= '<td>'.$i.'</td>'."\n";
-            $out .= '<td>'.dol_escape_htmltag($constname).'</td>'."\n";
-            $out .= '<td class="center">'.dol_escape_htmltag($constvalue).'</td>'."\n";
-            $out .= '<td class="center">'.dol_escape_htmltag($valueforchecksum).'</td>'."\n";
-            $out .= "</tr>\n";
-        }
+			$i++;
+			$out .= '<tr class="oddeven">';
+			$out .= '<td>'.$i.'</td>'."\n";
+			$out .= '<td>'.dol_escape_htmltag($constname).'</td>'."\n";
+			$out .= '<td class="center">'.dol_escape_htmltag($constvalue).'</td>'."\n";
+			$out .= '<td class="center">'.dol_escape_htmltag($valueforchecksum).'</td>'."\n";
+			$out .= "</tr>\n";
+		}
 
-        if ($i == 0)
-        {
-            $out .= '<tr class="oddeven"><td colspan="4" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
-        }
-        $out .= '</table>';
-        $out .= '</div>';
+		if ($i == 0)
+		{
+			$out .= '<tr class="oddeven"><td colspan="4" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
+		}
+		$out .= '</table>';
+		$out .= '</div>';
 
-        $out .= '<br>';
-    }
+		$out .= '<br>';
+	}
 
-    // Scan htdocs
-    if (is_object($xml->dolibarr_htdocs_dir[0]))
-    {
-        //var_dump($xml->dolibarr_htdocs_dir[0]['includecustom']);exit;
-        $includecustom = (empty($xml->dolibarr_htdocs_dir[0]['includecustom']) ? 0 : $xml->dolibarr_htdocs_dir[0]['includecustom']);
+	// Scan htdocs
+	if (is_object($xml->dolibarr_htdocs_dir[0]))
+	{
+		//var_dump($xml->dolibarr_htdocs_dir[0]['includecustom']);exit;
+		$includecustom = (empty($xml->dolibarr_htdocs_dir[0]['includecustom']) ? 0 : $xml->dolibarr_htdocs_dir[0]['includecustom']);
 
-        // Defined qualified files (must be same than into generate_filelist_xml.php)
-        $regextoinclude = '\.(php|php3|php4|php5|phtml|phps|phar|inc|css|scss|html|xml|js|json|tpl|jpg|jpeg|png|gif|ico|sql|lang|txt|yml|md|mp3|mp4|wav|mkv|z|gz|zip|rar|tar|less|svg|eot|woff|woff2|ttf|manifest)$';
-        $regextoexclude = '('.($includecustom ? '' : 'custom|').'documents|conf|install|public\/test|Shared\/PCLZip|nusoap\/lib\/Mail|php\/example|php\/test|geoip\/sample.*\.php|ckeditor\/samples|ckeditor\/adapters)$'; // Exclude dirs
-        $scanfiles = dol_dir_list(DOL_DOCUMENT_ROOT, 'files', 1, $regextoinclude, $regextoexclude);
+		// Defined qualified files (must be same than into generate_filelist_xml.php)
+		$regextoinclude = '\.(php|php3|php4|php5|phtml|phps|phar|inc|css|scss|html|xml|js|json|tpl|jpg|jpeg|png|gif|ico|sql|lang|txt|yml|md|mp3|mp4|wav|mkv|z|gz|zip|rar|tar|less|svg|eot|woff|woff2|ttf|manifest)$';
+		$regextoexclude = '('.($includecustom ? '' : 'custom|').'documents|conf|install|public\/test|Shared\/PCLZip|nusoap\/lib\/Mail|php\/example|php\/test|geoip\/sample.*\.php|ckeditor\/samples|ckeditor\/adapters)$'; // Exclude dirs
+		$scanfiles = dol_dir_list(DOL_DOCUMENT_ROOT, 'files', 1, $regextoinclude, $regextoexclude);
 
-        // Fill file_list with files in signature, new files, modified files
-        $ret = getFilesUpdated($file_list, $xml->dolibarr_htdocs_dir[0], '', DOL_DOCUMENT_ROOT, $checksumconcat); // Fill array $file_list
-        // Complete with list of new files
-        foreach ($scanfiles as $keyfile => $valfile)
-        {
-            $tmprelativefilename = preg_replace('/^'.preg_quote(DOL_DOCUMENT_ROOT, '/').'/', '', $valfile['fullname']);
-            if (!in_array($tmprelativefilename, $file_list['insignature']))
-            {
-                $md5newfile = @md5_file($valfile['fullname']); // Can fails if we don't have permission to open/read file
-                $file_list['added'][] = array('filename'=>$tmprelativefilename, 'md5'=>$md5newfile);
-            }
-        }
+		// Fill file_list with files in signature, new files, modified files
+		$ret = getFilesUpdated($file_list, $xml->dolibarr_htdocs_dir[0], '', DOL_DOCUMENT_ROOT, $checksumconcat); // Fill array $file_list
+		// Complete with list of new files
+		foreach ($scanfiles as $keyfile => $valfile)
+		{
+			$tmprelativefilename = preg_replace('/^'.preg_quote(DOL_DOCUMENT_ROOT, '/').'/', '', $valfile['fullname']);
+			if (!in_array($tmprelativefilename, $file_list['insignature']))
+			{
+				$md5newfile = @md5_file($valfile['fullname']); // Can fails if we don't have permission to open/read file
+				$file_list['added'][] = array('filename'=>$tmprelativefilename, 'md5'=>$md5newfile);
+			}
+		}
 
-        // Files missings
-        $out .= load_fiche_titre($langs->trans("FilesMissing"));
+		// Files missings
+		$out .= load_fiche_titre($langs->trans("FilesMissing"));
 
 		$out .= '<div class="div-table-responsive-no-min">';
-        $out .= '<table class="noborder">';
-        $out .= '<tr class="liste_titre">';
-        $out .= '<td>#</td>';
-        $out .= '<td>'.$langs->trans("Filename").'</td>';
-        $out .= '<td class="right">'.$langs->trans("ExpectedSize").'</td>';
-        $out .= '<td class="center">'.$langs->trans("ExpectedChecksum").'</td>';
-        $out .= '</tr>'."\n";
-        $tmpfilelist = dol_sort_array($file_list['missing'], 'filename');
-        if (is_array($tmpfilelist) && count($tmpfilelist))
-        {
-            $i = 0;
-	        foreach ($tmpfilelist as $file)
-	        {
-	            $i++;
-	            $out .= '<tr class="oddeven">';
-	            $out .= '<td>'.$i.'</td>'."\n";
-	            $out .= '<td>'.dol_escape_htmltag($file['filename']).'</td>'."\n";
-	            $out .= '<td class="right">';
-	            if (!empty($file['expectedsize'])) $out .= dol_print_size($file['expectedsize']);
-	            $out .= '</td>'."\n";
-	            $out .= '<td class="center">'.dol_escape_htmltag($file['expectedmd5']).'</td>'."\n";
-	            $out .= "</tr>\n";
-	        }
-        } else {
-            $out .= '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
-        }
-        $out .= '</table>';
-        $out .= '</div>';
+		$out .= '<table class="noborder">';
+		$out .= '<tr class="liste_titre">';
+		$out .= '<td>#</td>';
+		$out .= '<td>'.$langs->trans("Filename").'</td>';
+		$out .= '<td class="right">'.$langs->trans("ExpectedSize").'</td>';
+		$out .= '<td class="center">'.$langs->trans("ExpectedChecksum").'</td>';
+		$out .= '</tr>'."\n";
+		$tmpfilelist = dol_sort_array($file_list['missing'], 'filename');
+		if (is_array($tmpfilelist) && count($tmpfilelist))
+		{
+			$i = 0;
+			foreach ($tmpfilelist as $file)
+			{
+				$i++;
+				$out .= '<tr class="oddeven">';
+				$out .= '<td>'.$i.'</td>'."\n";
+				$out .= '<td>'.dol_escape_htmltag($file['filename']).'</td>'."\n";
+				$out .= '<td class="right">';
+				if (!empty($file['expectedsize'])) $out .= dol_print_size($file['expectedsize']);
+				$out .= '</td>'."\n";
+				$out .= '<td class="center">'.dol_escape_htmltag($file['expectedmd5']).'</td>'."\n";
+				$out .= "</tr>\n";
+			}
+		} else {
+			$out .= '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
+		}
+		$out .= '</table>';
+		$out .= '</div>';
 
-        $out .= '<br>';
+		$out .= '<br>';
 
-        // Files modified
-        $out .= load_fiche_titre($langs->trans("FilesModified"));
+		// Files modified
+		$out .= load_fiche_titre($langs->trans("FilesModified"));
 
-        $totalsize = 0;
+		$totalsize = 0;
 		$out .= '<div class="div-table-responsive-no-min">';
-        $out .= '<table class="noborder">';
-        $out .= '<tr class="liste_titre">';
-        $out .= '<td>#</td>';
-        $out .= '<td>'.$langs->trans("Filename").'</td>';
-        $out .= '<td class="center">'.$langs->trans("ExpectedChecksum").'</td>';
-        $out .= '<td class="center">'.$langs->trans("CurrentChecksum").'</td>';
-        $out .= '<td class="right">'.$langs->trans("ExpectedSize").'</td>';
-        $out .= '<td class="right">'.$langs->trans("CurrentSize").'</td>';
-        $out .= '<td class="right">'.$langs->trans("DateModification").'</td>';
-        $out .= '</tr>'."\n";
-        $tmpfilelist2 = dol_sort_array($file_list['updated'], 'filename');
-        if (is_array($tmpfilelist2) && count($tmpfilelist2))
-        {
-            $i = 0;
-	        foreach ($tmpfilelist2 as $file)
-	        {
-	            $i++;
-	            $out .= '<tr class="oddeven">';
-	            $out .= '<td>'.$i.'</td>'."\n";
-	            $out .= '<td>'.dol_escape_htmltag($file['filename']).'</td>'."\n";
-	            $out .= '<td class="center">'.dol_escape_htmltag($file['expectedmd5']).'</td>'."\n";
-	            $out .= '<td class="center">'.dol_escape_htmltag($file['md5']).'</td>'."\n";
-	            $out .= '<td class="right">';
-	            if ($file['expectedsize']) $out .= dol_print_size($file['expectedsize']);
-	            $out .= '</td>'."\n";
-	            $size = dol_filesize(DOL_DOCUMENT_ROOT.'/'.$file['filename']);
-	            $totalsize += $size;
-	            $out .= '<td class="right">'.dol_print_size($size).'</td>'."\n";
-	            $out .= '<td class="right">'.dol_print_date(dol_filemtime(DOL_DOCUMENT_ROOT.'/'.$file['filename']), 'dayhour').'</td>'."\n";
-	            $out .= "</tr>\n";
-	        }
-            $out .= '<tr class="liste_total">';
-            $out .= '<td></td>'."\n";
-            $out .= '<td>'.$langs->trans("Total").'</td>'."\n";
-            $out .= '<td class="center"></td>'."\n";
-            $out .= '<td class="center"></td>'."\n";
-            $out .= '<td class="center"></td>'."\n";
-            $out .= '<td class="right">'.dol_print_size($totalsize).'</td>'."\n";
-            $out .= '<td class="right"></td>'."\n";
-            $out .= "</tr>\n";
-        } else {
-            $out .= '<tr class="oddeven"><td colspan="6" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
-        }
-        $out .= '</table>';
-        $out .= '</div>';
+		$out .= '<table class="noborder">';
+		$out .= '<tr class="liste_titre">';
+		$out .= '<td>#</td>';
+		$out .= '<td>'.$langs->trans("Filename").'</td>';
+		$out .= '<td class="center">'.$langs->trans("ExpectedChecksum").'</td>';
+		$out .= '<td class="center">'.$langs->trans("CurrentChecksum").'</td>';
+		$out .= '<td class="right">'.$langs->trans("ExpectedSize").'</td>';
+		$out .= '<td class="right">'.$langs->trans("CurrentSize").'</td>';
+		$out .= '<td class="right">'.$langs->trans("DateModification").'</td>';
+		$out .= '</tr>'."\n";
+		$tmpfilelist2 = dol_sort_array($file_list['updated'], 'filename');
+		if (is_array($tmpfilelist2) && count($tmpfilelist2))
+		{
+			$i = 0;
+			foreach ($tmpfilelist2 as $file)
+			{
+				$i++;
+				$out .= '<tr class="oddeven">';
+				$out .= '<td>'.$i.'</td>'."\n";
+				$out .= '<td>'.dol_escape_htmltag($file['filename']).'</td>'."\n";
+				$out .= '<td class="center">'.dol_escape_htmltag($file['expectedmd5']).'</td>'."\n";
+				$out .= '<td class="center">'.dol_escape_htmltag($file['md5']).'</td>'."\n";
+				$out .= '<td class="right">';
+				if ($file['expectedsize']) $out .= dol_print_size($file['expectedsize']);
+				$out .= '</td>'."\n";
+				$size = dol_filesize(DOL_DOCUMENT_ROOT.'/'.$file['filename']);
+				$totalsize += $size;
+				$out .= '<td class="right">'.dol_print_size($size).'</td>'."\n";
+				$out .= '<td class="right">'.dol_print_date(dol_filemtime(DOL_DOCUMENT_ROOT.'/'.$file['filename']), 'dayhour').'</td>'."\n";
+				$out .= "</tr>\n";
+			}
+			$out .= '<tr class="liste_total">';
+			$out .= '<td></td>'."\n";
+			$out .= '<td>'.$langs->trans("Total").'</td>'."\n";
+			$out .= '<td class="center"></td>'."\n";
+			$out .= '<td class="center"></td>'."\n";
+			$out .= '<td class="center"></td>'."\n";
+			$out .= '<td class="right">'.dol_print_size($totalsize).'</td>'."\n";
+			$out .= '<td class="right"></td>'."\n";
+			$out .= "</tr>\n";
+		} else {
+			$out .= '<tr class="oddeven"><td colspan="6" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
+		}
+		$out .= '</table>';
+		$out .= '</div>';
 
-        $out .= '<br>';
+		$out .= '<br>';
 
-        // Files added
-        $out .= load_fiche_titre($langs->trans("FilesAdded"));
+		// Files added
+		$out .= load_fiche_titre($langs->trans("FilesAdded"));
 
-        $totalsize = 0;
+		$totalsize = 0;
 		$out .= '<div class="div-table-responsive-no-min">';
-        $out .= '<table class="noborder">';
-        $out .= '<tr class="liste_titre">';
-        $out .= '<td>#</td>';
-        $out .= '<td>'.$langs->trans("Filename").'</td>';
-        $out .= '<td class="center">'.$langs->trans("ExpectedChecksum").'</td>';
-        $out .= '<td class="center">'.$langs->trans("CurrentChecksum").'</td>';
-        $out .= '<td class="right">'.$langs->trans("Size").'</td>';
-        $out .= '<td class="right">'.$langs->trans("DateModification").'</td>';
-        $out .= '</tr>'."\n";
-        $tmpfilelist3 = dol_sort_array($file_list['added'], 'filename');
-        if (is_array($tmpfilelist3) && count($tmpfilelist3))
-        {
-            $i = 0;
-            foreach ($tmpfilelist3 as $file)
-            {
-                $i++;
-                $out .= '<tr class="oddeven">';
-                $out .= '<td>'.$i.'</td>'."\n";
-                $out .= '<td>'.dol_escape_htmltag($file['filename']);
-                if (!preg_match('/^win/i', PHP_OS)) {
-                	$htmltext = $langs->trans("YouCanDeleteFileOnServerWith", 'rm '.DOL_DOCUMENT_ROOT.$file['filename']); // The slash is included int file['filename']
-                	$out .= ' '.$form->textwithpicto('', $htmltext, 1, 'help', '', 0, 2, 'helprm'.$i);
-                }
-                $out .= '</td>'."\n";
-                $out .= '<td class="center">'.dol_escape_htmltag($file['expectedmd5']).'</td>'."\n";
-                $out .= '<td class="center">'.dol_escape_htmltag($file['md5']).'</td>'."\n";
-                $size = dol_filesize(DOL_DOCUMENT_ROOT.'/'.$file['filename']);
-                $totalsize += $size;
-                $out .= '<td class="right">'.dol_print_size($size).'</td>'."\n";
-                $out .= '<td class="right">'.dol_print_date(dol_filemtime(DOL_DOCUMENT_ROOT.'/'.$file['filename']), 'dayhour').'</td>'."\n";
-                $out .= "</tr>\n";
-            }
-            $out .= '<tr class="liste_total">';
-            $out .= '<td></td>'."\n";
-            $out .= '<td>'.$langs->trans("Total").'</td>'."\n";
-            $out .= '<td class="center"></td>'."\n";
-            $out .= '<td class="center"></td>'."\n";
-            $out .= '<td class="right">'.dol_print_size($totalsize).'</td>'."\n";
-            $out .= '<td class="right"></td>'."\n";
-            $out .= "</tr>\n";
-        } else {
-            $out .= '<tr class="oddeven"><td colspan="5" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
-        }
-        $out .= '</table>';
-        $out .= '</div>';
+		$out .= '<table class="noborder">';
+		$out .= '<tr class="liste_titre">';
+		$out .= '<td>#</td>';
+		$out .= '<td>'.$langs->trans("Filename").'</td>';
+		$out .= '<td class="center">'.$langs->trans("ExpectedChecksum").'</td>';
+		$out .= '<td class="center">'.$langs->trans("CurrentChecksum").'</td>';
+		$out .= '<td class="right">'.$langs->trans("Size").'</td>';
+		$out .= '<td class="right">'.$langs->trans("DateModification").'</td>';
+		$out .= '</tr>'."\n";
+		$tmpfilelist3 = dol_sort_array($file_list['added'], 'filename');
+		if (is_array($tmpfilelist3) && count($tmpfilelist3))
+		{
+			$i = 0;
+			foreach ($tmpfilelist3 as $file)
+			{
+				$i++;
+				$out .= '<tr class="oddeven">';
+				$out .= '<td>'.$i.'</td>'."\n";
+				$out .= '<td>'.dol_escape_htmltag($file['filename']);
+				if (!preg_match('/^win/i', PHP_OS)) {
+					$htmltext = $langs->trans("YouCanDeleteFileOnServerWith", 'rm '.DOL_DOCUMENT_ROOT.$file['filename']); // The slash is included int file['filename']
+					$out .= ' '.$form->textwithpicto('', $htmltext, 1, 'help', '', 0, 2, 'helprm'.$i);
+				}
+				$out .= '</td>'."\n";
+				$out .= '<td class="center">'.dol_escape_htmltag($file['expectedmd5']).'</td>'."\n";
+				$out .= '<td class="center">'.dol_escape_htmltag($file['md5']).'</td>'."\n";
+				$size = dol_filesize(DOL_DOCUMENT_ROOT.'/'.$file['filename']);
+				$totalsize += $size;
+				$out .= '<td class="right">'.dol_print_size($size).'</td>'."\n";
+				$out .= '<td class="right">'.dol_print_date(dol_filemtime(DOL_DOCUMENT_ROOT.'/'.$file['filename']), 'dayhour').'</td>'."\n";
+				$out .= "</tr>\n";
+			}
+			$out .= '<tr class="liste_total">';
+			$out .= '<td></td>'."\n";
+			$out .= '<td>'.$langs->trans("Total").'</td>'."\n";
+			$out .= '<td class="center"></td>'."\n";
+			$out .= '<td class="center"></td>'."\n";
+			$out .= '<td class="right">'.dol_print_size($totalsize).'</td>'."\n";
+			$out .= '<td class="right"></td>'."\n";
+			$out .= "</tr>\n";
+		} else {
+			$out .= '<tr class="oddeven"><td colspan="5" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
+		}
+		$out .= '</table>';
+		$out .= '</div>';
 
 
-        // Show warning
-        if (empty($tmpfilelist) && empty($tmpfilelist2) && empty($tmpfilelist3))
-        {
-            setEventMessages($langs->trans("FileIntegrityIsStrictlyConformedWithReference"), null, 'mesgs');
-        } else {
-            setEventMessages($langs->trans("FileIntegritySomeFilesWereRemovedOrModified"), null, 'warnings');
-        }
-    } else {
-        print 'Error: Failed to found dolibarr_htdocs_dir into XML file '.$xmlfile;
-        $error++;
-    }
+		// Show warning
+		if (empty($tmpfilelist) && empty($tmpfilelist2) && empty($tmpfilelist3))
+		{
+			setEventMessages($langs->trans("FileIntegrityIsStrictlyConformedWithReference"), null, 'mesgs');
+		} else {
+			setEventMessages($langs->trans("FileIntegritySomeFilesWereRemovedOrModified"), null, 'warnings');
+		}
+	} else {
+		print 'Error: Failed to found dolibarr_htdocs_dir into XML file '.$xmlfile;
+		$error++;
+	}
 
 
-    // Scan scripts
-    /*
+	// Scan scripts
+	/*
     if (is_object($xml->dolibarr_script_dir[0]))
     {
         $file_list = array();
@@ -398,44 +398,44 @@ if (!$error && $xml)
     }*/
 
 
-    asort($checksumconcat); // Sort list of checksum
-    //var_dump($checksumconcat);
-    $checksumget = md5(join(',', $checksumconcat));
-    $checksumtoget = trim((string) $xml->dolibarr_htdocs_dir_checksum);
+	asort($checksumconcat); // Sort list of checksum
+	//var_dump($checksumconcat);
+	$checksumget = md5(join(',', $checksumconcat));
+	$checksumtoget = trim((string) $xml->dolibarr_htdocs_dir_checksum);
 
-    /*var_dump(count($file_list['added']));
+	/*var_dump(count($file_list['added']));
     var_dump($checksumget);
     var_dump($checksumtoget);
     var_dump($checksumget == $checksumtoget);*/
 
-    $outexpectedchecksum = ($checksumtoget ? $checksumtoget : $langs->trans("Unknown"));
-    if ($checksumget == $checksumtoget)
-    {
-    	if (count($file_list['added']))
-    	{
-    		$resultcode = 'warning';
-    		$resultcomment = 'FileIntegrityIsOkButFilesWereAdded';
-    		$outcurrentchecksum = $checksumget.' - <span class="'.$resultcode.'">'.$langs->trans("FileIntegrityIsOkButFilesWereAdded").'</span>';
-    	} else {
-    		$resultcode = 'ok';
-    		$resultcomment = 'Success';
-    		$outcurrentchecksum = '<span class="'.$resultcode.'">'.$checksumget.'</span>';
-    	}
-    } else {
-    	$resultcode = 'error';
-    	$resultcomment = 'Error';
-    	$outcurrentchecksum = '<span class="'.$resultcode.'">'.$checksumget.'</span>';
-    }
+	$outexpectedchecksum = ($checksumtoget ? $checksumtoget : $langs->trans("Unknown"));
+	if ($checksumget == $checksumtoget)
+	{
+		if (count($file_list['added']))
+		{
+			$resultcode = 'warning';
+			$resultcomment = 'FileIntegrityIsOkButFilesWereAdded';
+			$outcurrentchecksum = $checksumget.' - <span class="'.$resultcode.'">'.$langs->trans("FileIntegrityIsOkButFilesWereAdded").'</span>';
+		} else {
+			$resultcode = 'ok';
+			$resultcomment = 'Success';
+			$outcurrentchecksum = '<span class="'.$resultcode.'">'.$checksumget.'</span>';
+		}
+	} else {
+		$resultcode = 'error';
+		$resultcomment = 'Error';
+		$outcurrentchecksum = '<span class="'.$resultcode.'">'.$checksumget.'</span>';
+	}
 
-    print load_fiche_titre($langs->trans("GlobalChecksum")).'<br>';
-    print $langs->trans("ExpectedChecksum").' = '.$outexpectedchecksum.'<br>';
-    print $langs->trans("CurrentChecksum").' = '.$outcurrentchecksum;
+	print load_fiche_titre($langs->trans("GlobalChecksum")).'<br>';
+	print $langs->trans("ExpectedChecksum").' = '.$outexpectedchecksum.'<br>';
+	print $langs->trans("CurrentChecksum").' = '.$outcurrentchecksum;
 
-    print '<br>';
-    print '<br>';
+	print '<br>';
+	print '<br>';
 
-    // Output detail
-    print $out;
+	// Output detail
+	print $out;
 }
 
 // End of page
diff --git a/htdocs/admin/system/index.php b/htdocs/admin/system/index.php
index 06003068bb2..2bbe919c72e 100644
--- a/htdocs/admin/system/index.php
+++ b/htdocs/admin/system/index.php
@@ -94,10 +94,10 @@ if ($db->type == 'pgsql')
 {
 	// Check option standard_conforming_strings is on
 	$paramarray = $db->getServerParametersValues('standard_conforming_strings');
-    //	if ($paramarray['standard_conforming_strings'] != 'on' && $paramarray['standard_conforming_strings'] != 1)
-    //	{
-    //		$langs->load("errors");
-    //	}
+	//	if ($paramarray['standard_conforming_strings'] != 'on' && $paramarray['standard_conforming_strings'] != 1)
+	//	{
+	//		$langs->load("errors");
+	//	}
 }
 print '<br>';
 
diff --git a/htdocs/admin/system/perf.php b/htdocs/admin/system/perf.php
index 7857773924f..6d9e3574789 100644
--- a/htdocs/admin/system/perf.php
+++ b/htdocs/admin/system/perf.php
@@ -62,7 +62,7 @@ print "<br><strong>Web server</strong> - ".$langs->trans("Version").": ".$_SERVE
 print '<br>';
 print '<strong>'.$langs->trans("XDebug").'</strong>: ';
 $test = !function_exists('xdebug_is_enabled');
-if ($test) print img_picto('', 'tick.png').' '.$langs->trans("NotInstalled");
+if ($test) print img_picto('', 'tick.png').' '.$langs->trans("NotInstalled").' - '.$langs->trans("NotSlowedDownByThis");
 else {
 	print img_picto('', 'warning').' '.$langs->trans("ModuleActivated", $langs->transnoentities("XDebug"));
 	print ' - '.$langs->trans("MoreInformation").' <a href="'.DOL_URL_ROOT.'/admin/system/xdebug.php">XDebug admin page</a>';
@@ -73,7 +73,7 @@ print '<br>';
 print '<br>';
 print '<strong>'.$langs->trans("Syslog").'</strong>: ';
 $test = empty($conf->syslog->enabled);
-if ($test) print img_picto('', 'tick.png').' '.$langs->trans("NotInstalled");
+if ($test) print img_picto('', 'tick.png').' '.$langs->trans("NotInstalled").' - '.$langs->trans("NotSlowedDownByThis");
 else {
 	print img_picto('', 'warning').' '.$langs->trans("ModuleActivated", $langs->transnoentities("Syslog"));
 	//print ' '.$langs->trans("MoreInformation").' <a href="'.DOL_URL_ROOT.'/admin/system/xdebug.php'.'">XDebug admin page</a>';
@@ -84,10 +84,10 @@ print '<br>';
 print '<br>';
 print '<strong>'.$langs->trans("DebugBar").'</strong>: ';
 $test = empty($conf->debugbar->enabled);
-if ($test) print img_picto('', 'tick.png').' '.$langs->trans("NotInstalled");
+if ($test) print img_picto('', 'tick.png').' '.$langs->trans("NotInstalled").' - '.$langs->trans("NotSlowedDownByThis");
 else {
 	print img_picto('', 'warning').' '.$langs->trans("ModuleActivated", $langs->transnoentities("DebugBar"));
-    //print ' '.$langs->trans("MoreInformation").' <a href="'.DOL_URL_ROOT.'/admin/system/xdebug.php'.'">XDebug admin page</a>';
+	//print ' '.$langs->trans("MoreInformation").' <a href="'.DOL_URL_ROOT.'/admin/system/xdebug.php'.'">XDebug admin page</a>';
 }
 print '<br>';
 
@@ -431,7 +431,6 @@ print '<br>';
 print '<strong>';
 print $form->textwithpicto($langs->trans("CompressionOfResources"), $langs->trans("CompressionOfResourcesDesc"));
 print '</strong>: ';
-//$tmp=getURLContent(DOL_URL_ROOT.'/index.php','GET');var_dump($tmp);
 print '<br>';
 // on PHP
 print '<div id="httpcompphpok">'.img_picto('', 'tick.png').' '.$langs->trans("FilesOfTypeCompressed", 'php (.php)').'</div>';
diff --git a/htdocs/admin/system/phpinfo.php b/htdocs/admin/system/phpinfo.php
index 9f1766a5d22..11d0dbc49cf 100644
--- a/htdocs/admin/system/phpinfo.php
+++ b/htdocs/admin/system/phpinfo.php
@@ -275,7 +275,7 @@ function getActivatedExtensions()
 
 	// For compatibility with LF (Line Feed)
 	if (empty($configLines) || count($configLines) < 2) {
-	    $configLines = explode("\n", $content);
+		$configLines = explode("\n", $content);
 	}
 
 	$extensions = array();
@@ -428,5 +428,5 @@ function getResultColumn($name, array $activated, array $loaded, array $function
 	$html .= $result ? $langs->trans("PHPSupport".$name) : $langs->trans("ErrorPHPDoesNotSupport".$name);
 	$html .= "</td>";
 
-    return $html;
+	return $html;
 }
diff --git a/htdocs/admin/system/security.php b/htdocs/admin/system/security.php
index 05cf9dd1b8e..2f0978ed266 100644
--- a/htdocs/admin/system/security.php
+++ b/htdocs/admin/system/security.php
@@ -66,43 +66,55 @@ print "<strong>PHP safe_mode</strong> = ".(ini_get('safe_mode') ? ini_get('safe_
 print "<strong>PHP open_basedir</strong> = ".(ini_get('open_basedir') ? ini_get('open_basedir') : yn(0))."<br>\n";
 print '<br>';
 
-print load_fiche_titre($langs->trans("ConfigFile"), '', '');
-
-print '<strong>'.$langs->trans("dolibarr_main_prod").'</strong>: '.$dolibarr_main_prod;
-// dolibarr_main_prod
-
-
-print '<br>';
-print '<br>';
-
-print load_fiche_titre($langs->trans("PermissionsOnFiles"), '', '');
-
-print '<strong>'.$langs->trans("PermissionOnFileInWebRoot").'</strong>: ';
-// TODO
-print 'TODO';
-
-
-print '<br>';
-print '<br>';
-
-
-print load_fiche_titre($langs->trans("Modules"), '', '');
-
 // XDebug
 print '<strong>'.$langs->trans("XDebug").'</strong>: ';
 $test = !function_exists('xdebug_is_enabled');
-if ($test) print img_picto('', 'tick.png').' '.$langs->trans("NotInstalled");
+if ($test) print img_picto('', 'tick.png').' '.$langs->trans("NotInstalled").' - '.$langs->trans("NotRiskOfLeakWithThis");
 else {
 	print img_picto('', 'warning').' '.$langs->trans("ModuleActivatedMayExposeInformation", $langs->transnoentities("XDebug"));
 	print ' - '.$langs->trans("MoreInformation").' <a href="'.DOL_URL_ROOT.'/admin/system/xdebug.php">XDebug admin page</a>';
 }
 print '<br>';
 
-// Module log
 print '<br>';
+print load_fiche_titre($langs->trans("ConfigFile"), '', '');
+
+print '<strong>'.$langs->trans("dolibarr_main_prod").'</strong>: '.$dolibarr_main_prod;
+if (empty($dolibarr_main_prod)) {
+	print ' &nbsp; '.img_picto('', 'warning').' '.$langs->trans("IfYouAreOnAProductionSetThis", 1);
+}
+print '<br>';
+
+print '<strong>'.$langs->trans("dolibarr_nocsrfcheck").'</strong>: '.$dolibarr_nocsrfcheck;
+if (!empty($dolibarr_nocsrfcheck)) {
+	print img_picto('', 'warning').' &nbsp;  '.$langs->trans("IfYouAreOnAProductionSetThis", 0);
+}
+
+print '<br>';
+
+print '<br>';
+print '<br>';
+print load_fiche_titre($langs->trans("Permissions"), '', '');
+
+print '<strong>'.$langs->trans("PermissionsOnFilesInWebRoot").'</strong>: ';
+// TODO Check permission are read only except for custom dir
+print 'TODO';
+print '<br>';
+
+print '<strong>'.$langs->trans("PermissionsOnFile", 'conf.php').'</strong>: ';
+// TODO Check permission on file conf.php (read only for the web user)
+print 'TODO';
+print '<br>';
+
+print '<br>';
+
+print '<br>';
+print load_fiche_titre($langs->trans("DolibarrModules"), '', '');
+
+// Module log
 print '<strong>'.$langs->trans("Syslog").'</strong>: ';
 $test = empty($conf->syslog->enabled);
-if ($test) print img_picto('', 'tick.png').' '.$langs->trans("NotInstalled");
+if ($test) print img_picto('', 'tick.png').' '.$langs->trans("NotInstalled").' - '.$langs->trans("NotRiskOfLeakWithThis");
 else {
 	print img_picto('', 'warning').' '.$langs->trans("ModuleActivatedMayExposeInformation", $langs->transnoentities("Syslog"));
 	//print ' '.$langs->trans("MoreInformation").' <a href="'.DOL_URL_ROOT.'/admin/system/xdebug.php'.'">XDebug admin page</a>';
@@ -110,18 +122,18 @@ else {
 print '<br>';
 
 // Module debugbar
-print '<br>';
 print '<strong>'.$langs->trans("DebugBar").'</strong>: ';
 $test = empty($conf->debugbar->enabled);
-if ($test) print img_picto('', 'tick.png').' '.$langs->trans("NotInstalled");
+if ($test) print img_picto('', 'tick.png').' '.$langs->trans("NotInstalled").' - '.$langs->trans("NotRiskOfLeakWithThis");
 else {
 	print img_picto('', 'error').' '.$langs->trans("ModuleActivatedDoNotUseInProduction", $langs->transnoentities("DebugBar"));
-    //print ' '.$langs->trans("MoreInformation").' <a href="'.DOL_URL_ROOT.'/admin/system/xdebug.php'.'">XDebug admin page</a>';
+	//print ' '.$langs->trans("MoreInformation").' <a href="'.DOL_URL_ROOT.'/admin/system/xdebug.php'.'">XDebug admin page</a>';
 }
 print '<br>';
-print '<br>';
 
-print load_fiche_titre($langs->trans("SecuritySetup"), '', '');
+print '<br>';
+print '<br>';
+print load_fiche_titre($langs->trans("Menu").' '.$langs->trans("SecuritySetup"), '', '');
 
 //print '<strong>'.$langs->trans("PasswordEncryption").'</strong>: ';
 print '<strong>MAIN_SECURITY_HASH_ALGO</strong> = '.$conf->global->MAIN_SECURITY_HASH_ALGO." &nbsp; (Recommanded value: 'password_hash')<br>";
@@ -130,7 +142,13 @@ print '<br>';
 // TODO
 
 print '<strong>'.$langs->trans("AntivirusEnabledOnUpload").'</strong>: ';
-// TODO
+print yn($conf->global->MAIN_ANTIVIRUS_COMMAND ? 1 : 0);
+if (!empty($conf->global->MAIN_ANTIVIRUS_COMMAND)) {
+	print ' &nbsp; - '.$conf->global->MAIN_ANTIVIRUS_COMMAND;
+	if (defined('MAIN_ANTIVIRUS_COMMAND')) {
+		print ' - <span class="opacitymedium">'.$langs->trans("ValueIsForcedBySystem").'</span>';
+	}
+}
 print '<br>';
 
 print '<br>';
diff --git a/htdocs/admin/ticket.php b/htdocs/admin/ticket.php
index 03b590a318c..e8da4a8d736 100644
--- a/htdocs/admin/ticket.php
+++ b/htdocs/admin/ticket.php
@@ -186,7 +186,7 @@ print dol_get_fiche_head($head, 'settings', $langs->trans("Module56000Name"), -1
 
 print '<span class="opacitymedium">'.$langs->trans("TicketSetupDictionaries").'</span> : <a href="'.DOL_URL_ROOT.'/admin/dict.php">'.$langs->trans("ClickHereToGoTo", $langs->transnoentitiesnoconv("DictionarySetup")).'</a><br>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 /*
diff --git a/htdocs/admin/ticket_extrafields.php b/htdocs/admin/ticket_extrafields.php
index ad88e5adbf8..4a50beaa32e 100644
--- a/htdocs/admin/ticket_extrafields.php
+++ b/htdocs/admin/ticket_extrafields.php
@@ -75,7 +75,7 @@ print dol_get_fiche_head($head, 'attributes', $langs->trans("Module56000Name"),
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // Buttons
 if ($action != 'create' && $action != 'edit') {
diff --git a/htdocs/admin/ticket_public.php b/htdocs/admin/ticket_public.php
index 8de245ab8db..121ded4f578 100644
--- a/htdocs/admin/ticket_public.php
+++ b/htdocs/admin/ticket_public.php
@@ -32,7 +32,7 @@ $langs->loadLangs(array("admin", "ticket"));
 
 // Access control
 if (!$user->admin) {
-    accessforbidden();
+	accessforbidden();
 }
 
 // Parameters
@@ -50,62 +50,62 @@ $error = 0;
 
 if ($action == 'setTICKET_ENABLE_PUBLIC_INTERFACE')
 {
-    if (GETPOST('value')) dolibarr_set_const($db, 'TICKET_ENABLE_PUBLIC_INTERFACE', 1, 'chaine', 0, '', $conf->entity);
-    else dolibarr_set_const($db, 'TICKET_ENABLE_PUBLIC_INTERFACE', 0, 'chaine', 0, '', $conf->entity);
+	if (GETPOST('value')) dolibarr_set_const($db, 'TICKET_ENABLE_PUBLIC_INTERFACE', 1, 'chaine', 0, '', $conf->entity);
+	else dolibarr_set_const($db, 'TICKET_ENABLE_PUBLIC_INTERFACE', 0, 'chaine', 0, '', $conf->entity);
 }
 
 if ($action == 'setvar') {
-    include_once DOL_DOCUMENT_ROOT."/core/lib/files.lib.php";
+	include_once DOL_DOCUMENT_ROOT."/core/lib/files.lib.php";
 
-    $topic_interface = GETPOST('TICKET_PUBLIC_INTERFACE_TOPIC', 'nohtml');
-    if (!empty($topic_interface)) {
-    	$res = dolibarr_set_const($db, 'TICKET_PUBLIC_INTERFACE_TOPIC', $topic_interface, 'chaine', 0, '', $conf->entity);
-    } else {
-    	$res = dolibarr_set_const($db, 'TICKET_PUBLIC_INTERFACE_TOPIC', '', 'chaine', 0, '', $conf->entity);
-    }
-    if (!$res > 0) {
-    	$error++;
-    }
+	$topic_interface = GETPOST('TICKET_PUBLIC_INTERFACE_TOPIC', 'nohtml');
+	if (!empty($topic_interface)) {
+		$res = dolibarr_set_const($db, 'TICKET_PUBLIC_INTERFACE_TOPIC', $topic_interface, 'chaine', 0, '', $conf->entity);
+	} else {
+		$res = dolibarr_set_const($db, 'TICKET_PUBLIC_INTERFACE_TOPIC', '', 'chaine', 0, '', $conf->entity);
+	}
+	if (!$res > 0) {
+		$error++;
+	}
 
-    $text_home = GETPOST('TICKET_PUBLIC_TEXT_HOME', 'restricthtml');
-    if (!empty($text_home)) {
-    	$res = dolibarr_set_const($db, 'TICKET_PUBLIC_TEXT_HOME', $text_home, 'chaine', 0, '', $conf->entity);
-    } else {
-    	$res = dolibarr_set_const($db, 'TICKET_PUBLIC_TEXT_HOME', $langs->trans('TicketPublicInterfaceTextHome'), 'chaine', 0, '', $conf->entity);
-    }
-    if (!$res > 0) {
-    	$error++;
-    }
+	$text_home = GETPOST('TICKET_PUBLIC_TEXT_HOME', 'restricthtml');
+	if (!empty($text_home)) {
+		$res = dolibarr_set_const($db, 'TICKET_PUBLIC_TEXT_HOME', $text_home, 'chaine', 0, '', $conf->entity);
+	} else {
+		$res = dolibarr_set_const($db, 'TICKET_PUBLIC_TEXT_HOME', $langs->trans('TicketPublicInterfaceTextHome'), 'chaine', 0, '', $conf->entity);
+	}
+	if (!$res > 0) {
+		$error++;
+	}
 
-    $text_help = GETPOST('TICKET_PUBLIC_TEXT_HELP_MESSAGE', 'restricthtml');
-    if (!empty($text_help)) {
-    	$res = dolibarr_set_const($db, 'TICKET_PUBLIC_TEXT_HELP_MESSAGE', $text_help, 'chaine', 0, '', $conf->entity);
-    } else {
-    	$res = dolibarr_set_const($db, 'TICKET_PUBLIC_TEXT_HELP_MESSAGE', $langs->trans('TicketPublicPleaseBeAccuratelyDescribe'), 'chaine', 0, '', $conf->entity);
-    }
-    if (!$res > 0) {
-    	$error++;
-    }
+	$text_help = GETPOST('TICKET_PUBLIC_TEXT_HELP_MESSAGE', 'restricthtml');
+	if (!empty($text_help)) {
+		$res = dolibarr_set_const($db, 'TICKET_PUBLIC_TEXT_HELP_MESSAGE', $text_help, 'chaine', 0, '', $conf->entity);
+	} else {
+		$res = dolibarr_set_const($db, 'TICKET_PUBLIC_TEXT_HELP_MESSAGE', $langs->trans('TicketPublicPleaseBeAccuratelyDescribe'), 'chaine', 0, '', $conf->entity);
+	}
+	if (!$res > 0) {
+		$error++;
+	}
 
-    $mail_new_ticket = GETPOST('TICKET_MESSAGE_MAIL_NEW', 'restricthtml');
-    if (!empty($mail_new_ticket)) {
-    	$res = dolibarr_set_const($db, 'TICKET_MESSAGE_MAIL_NEW', $mail_new_ticket, 'chaine', 0, '', $conf->entity);
-    } else {
-    	$res = dolibarr_set_const($db, 'TICKET_MESSAGE_MAIL_NEW', $langs->trans('TicketMessageMailNewText'), 'chaine', 0, '', $conf->entity);
-    }
-    if (!$res > 0) {
-    	$error++;
-    }
+	$mail_new_ticket = GETPOST('TICKET_MESSAGE_MAIL_NEW', 'restricthtml');
+	if (!empty($mail_new_ticket)) {
+		$res = dolibarr_set_const($db, 'TICKET_MESSAGE_MAIL_NEW', $mail_new_ticket, 'chaine', 0, '', $conf->entity);
+	} else {
+		$res = dolibarr_set_const($db, 'TICKET_MESSAGE_MAIL_NEW', $langs->trans('TicketMessageMailNewText'), 'chaine', 0, '', $conf->entity);
+	}
+	if (!$res > 0) {
+		$error++;
+	}
 
-    $url_interface = GETPOST('TICKET_URL_PUBLIC_INTERFACE', 'alpha');
-    if (!empty($url_interface)) {
-    	$res = dolibarr_set_const($db, 'TICKET_URL_PUBLIC_INTERFACE', $url_interface, 'chaine', 0, '', $conf->entity);
-    } else {
-    	$res = dolibarr_set_const($db, 'TICKET_URL_PUBLIC_INTERFACE', '', 'chaine', 0, '', $conf->entity);
-    }
-    if (!$res > 0) {
-    	$error++;
-    }
+	$url_interface = GETPOST('TICKET_URL_PUBLIC_INTERFACE', 'alpha');
+	if (!empty($url_interface)) {
+		$res = dolibarr_set_const($db, 'TICKET_URL_PUBLIC_INTERFACE', $url_interface, 'chaine', 0, '', $conf->entity);
+	} else {
+		$res = dolibarr_set_const($db, 'TICKET_URL_PUBLIC_INTERFACE', '', 'chaine', 0, '', $conf->entity);
+	}
+	if (!$res > 0) {
+		$error++;
+	}
 
 	$param_public_notification_new_message_default_email = GETPOST('TICKET_PUBLIC_NOTIFICATION_NEW_MESSAGE_DEFAULT_EMAIL', 'alpha');
 	$res = dolibarr_set_const($db, 'TICKET_PUBLIC_NOTIFICATION_NEW_MESSAGE_DEFAULT_EMAIL', $param_public_notification_new_message_default_email, 'chaine', 0, '', $conf->entity);
@@ -115,38 +115,38 @@ if ($action == 'setvar') {
 }
 
 if ($action == 'setvarother') {
-    $param_enable_public_interface = GETPOST('TICKET_ENABLE_PUBLIC_INTERFACE', 'alpha');
-    $res = dolibarr_set_const($db, 'TICKET_ENABLE_PUBLIC_INTERFACE', $param_enable_public_interface, 'chaine', 0, '', $conf->entity);
-    if (!$res > 0) {
-        $error++;
-    }
+	$param_enable_public_interface = GETPOST('TICKET_ENABLE_PUBLIC_INTERFACE', 'alpha');
+	$res = dolibarr_set_const($db, 'TICKET_ENABLE_PUBLIC_INTERFACE', $param_enable_public_interface, 'chaine', 0, '', $conf->entity);
+	if (!$res > 0) {
+		$error++;
+	}
 
-    $param_must_exists = GETPOST('TICKET_EMAIL_MUST_EXISTS', 'alpha');
-    $res = dolibarr_set_const($db, 'TICKET_EMAIL_MUST_EXISTS', $param_must_exists, 'chaine', 0, '', $conf->entity);
-    if (!$res > 0) {
-        $error++;
-    }
+	$param_must_exists = GETPOST('TICKET_EMAIL_MUST_EXISTS', 'alpha');
+	$res = dolibarr_set_const($db, 'TICKET_EMAIL_MUST_EXISTS', $param_must_exists, 'chaine', 0, '', $conf->entity);
+	if (!$res > 0) {
+		$error++;
+	}
 
-    $param_disable_email = GETPOST('TICKET_DISABLE_CUSTOMER_MAILS', 'alpha');
-    $res = dolibarr_set_const($db, 'TICKET_DISABLE_CUSTOMER_MAILS', $param_disable_email, 'chaine', 0, '', $conf->entity);
-    if (!$res > 0) {
-        $error++;
-    }
+	$param_disable_email = GETPOST('TICKET_DISABLE_CUSTOMER_MAILS', 'alpha');
+	$res = dolibarr_set_const($db, 'TICKET_DISABLE_CUSTOMER_MAILS', $param_disable_email, 'chaine', 0, '', $conf->entity);
+	if (!$res > 0) {
+		$error++;
+	}
 
    	$param_show_module_logo = GETPOST('TICKET_SHOW_COMPANY_LOGO', 'alpha');
    	$res = dolibarr_set_const($db, 'TICKET_SHOW_COMPANY_LOGO', $param_show_module_logo, 'chaine', 0, '', $conf->entity);
    	if (!$res > 0) {
-       	$error++;
+	   	$error++;
    	}
 
-    if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
-    {
-    	$param_notification_also_main_addressemail = GETPOST('TICKET_NOTIFICATION_ALSO_MAIN_ADDRESS', 'alpha');
-	    $res = dolibarr_set_const($db, 'TICKET_NOTIFICATION_ALSO_MAIN_ADDRESS', $param_notification_also_main_addressemail, 'chaine', 0, '', $conf->entity);
-	    if (!$res > 0) {
-	        $error++;
-	    }
-    }
+	if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
+	{
+		$param_notification_also_main_addressemail = GETPOST('TICKET_NOTIFICATION_ALSO_MAIN_ADDRESS', 'alpha');
+		$res = dolibarr_set_const($db, 'TICKET_NOTIFICATION_ALSO_MAIN_ADDRESS', $param_notification_also_main_addressemail, 'chaine', 0, '', $conf->entity);
+		if (!$res > 0) {
+			$error++;
+		}
+	}
 }
 
 
@@ -175,21 +175,21 @@ print dol_get_fiche_head($head, 'public', $langs->trans("Module56000Name"), -1,
 
 print '<span class="opacitymedium">'.$langs->trans("TicketPublicAccess").'</span> : <a class="wordbreak" href="'.dol_buildpath('/public/ticket/index.php', 1).'" target="_blank" >'.dol_buildpath('/public/ticket/index.php', 2).'</a>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 $enabledisablehtml = $langs->trans("TicketsActivatePublicInterface").' ';
 if (empty($conf->global->TICKET_ENABLE_PUBLIC_INTERFACE))
 {
-    // Button off, click to enable
-    $enabledisablehtml .= '<a class="reposition valignmiddle" href="'.$_SERVER["PHP_SELF"].'?action=setTICKET_ENABLE_PUBLIC_INTERFACE&token='.newToken().'&value=1'.$param.'">';
-    $enabledisablehtml .= img_picto($langs->trans("Disabled"), 'switch_off');
-    $enabledisablehtml .= '</a>';
+	// Button off, click to enable
+	$enabledisablehtml .= '<a class="reposition valignmiddle" href="'.$_SERVER["PHP_SELF"].'?action=setTICKET_ENABLE_PUBLIC_INTERFACE&token='.newToken().'&value=1'.$param.'">';
+	$enabledisablehtml .= img_picto($langs->trans("Disabled"), 'switch_off');
+	$enabledisablehtml .= '</a>';
 } else {
-    // Button on, click to disable
-    $enabledisablehtml .= '<a class="reposition valignmiddle" href="'.$_SERVER["PHP_SELF"].'?action=setTICKET_ENABLE_PUBLIC_INTERFACE&token='.newToken().'&value=0'.$param.'">';
-    $enabledisablehtml .= img_picto($langs->trans("Activated"), 'switch_on');
-    $enabledisablehtml .= '</a>';
+	// Button on, click to disable
+	$enabledisablehtml .= '<a class="reposition valignmiddle" href="'.$_SERVER["PHP_SELF"].'?action=setTICKET_ENABLE_PUBLIC_INTERFACE&token='.newToken().'&value=0'.$param.'">';
+	$enabledisablehtml .= img_picto($langs->trans("Activated"), 'switch_on');
+	$enabledisablehtml .= '</a>';
 }
 print $enabledisablehtml;
 print '<input type="hidden" id="TICKET_ENABLE_PUBLIC_INTERFACE" name="TICKET_ENABLE_PUBLIC_INTERFACE" value="'.(empty($conf->global->TICKET_ENABLE_PUBLIC_INTERFACE) ? 0 : 1).'">';
@@ -198,37 +198,37 @@ print '<br><br>';
 
 if (!empty($conf->global->TICKET_ENABLE_PUBLIC_INTERFACE))
 {
-    if (empty($conf->use_javascript_ajax)) {
-        print '<form method="post" action="'.$_SERVER['PHP_SELF'].'" enctype="multipart/form-data" >';
-        print '<input type="hidden" name="token" value="'.newToken().'">';
-        print '<input type="hidden" name="action" value="setvarother">';
-    }
+	if (empty($conf->use_javascript_ajax)) {
+		print '<form method="post" action="'.$_SERVER['PHP_SELF'].'" enctype="multipart/form-data" >';
+		print '<input type="hidden" name="token" value="'.newToken().'">';
+		print '<input type="hidden" name="action" value="setvarother">';
+	}
 
-    print '<div class="div-table-responsive-no-min">';
-    print '<table class="noborder centpercent">';
-    print '<tr class="liste_titre"><td>'.$langs->trans("Parameters").'</td>';
-    print '<td class="left">';
-    print '</td>';
-    print '<td class="center">';
-    print '</td>';
-    print '</tr>';
+	print '<div class="div-table-responsive-no-min">';
+	print '<table class="noborder centpercent">';
+	print '<tr class="liste_titre"><td>'.$langs->trans("Parameters").'</td>';
+	print '<td class="left">';
+	print '</td>';
+	print '<td class="center">';
+	print '</td>';
+	print '</tr>';
 
-    // Check if email exists
-    print '<tr class="oddeven"><td>'.$langs->trans("TicketsEmailMustExist").'</td>';
-    print '<td class="left">';
-    if ($conf->use_javascript_ajax) {
-        print ajax_constantonoff('TICKET_EMAIL_MUST_EXISTS');
-    } else {
-        $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
-        print $form->selectarray("TICKET_EMAIL_MUST_EXISTS", $arrval, $conf->global->TICKET_EMAIL_MUST_EXISTS);
-    }
-    print '</td>';
-    print '<td class="center">';
-    print $form->textwithpicto('', $langs->trans("TicketsEmailMustExistHelp"), 1, 'help');
-    print '</td>';
-    print '</tr>';
+	// Check if email exists
+	print '<tr class="oddeven"><td>'.$langs->trans("TicketsEmailMustExist").'</td>';
+	print '<td class="left">';
+	if ($conf->use_javascript_ajax) {
+		print ajax_constantonoff('TICKET_EMAIL_MUST_EXISTS');
+	} else {
+		$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+		print $form->selectarray("TICKET_EMAIL_MUST_EXISTS", $arrval, $conf->global->TICKET_EMAIL_MUST_EXISTS);
+	}
+	print '</td>';
+	print '<td class="center">';
+	print $form->textwithpicto('', $langs->trans("TicketsEmailMustExistHelp"), 1, 'help');
+	print '</td>';
+	print '</tr>';
 
-    /*if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
+	/*if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
     {
     	// Show logo for module
     	print '<tr class="oddeven"><td>' . $langs->trans("TicketsShowModuleLogo") . '</td>';
@@ -246,145 +246,145 @@ if (!empty($conf->global->TICKET_ENABLE_PUBLIC_INTERFACE))
     	print '</tr>';
     }*/
 
-    // Show logo for company
-    print '<tr class="oddeven"><td>'.$langs->trans("TicketsShowCompanyLogo").'</td>';
-    print '<td class="left">';
-    if ($conf->use_javascript_ajax) {
-    	print ajax_constantonoff('TICKET_SHOW_COMPANY_LOGO');
-    } else {
-    	$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
-    	print $form->selectarray("TICKET_SHOW_COMPANY_LOGO", $arrval, $conf->global->TICKET_SHOW_COMPANY_LOGO);
-    }
-    print '</td>';
-    print '<td class="center">';
-    print $form->textwithpicto('', $langs->trans("TicketsShowCompanyLogoHelp"), 1, 'help');
-    print '</td>';
-    print '</tr>';
+	// Show logo for company
+	print '<tr class="oddeven"><td>'.$langs->trans("TicketsShowCompanyLogo").'</td>';
+	print '<td class="left">';
+	if ($conf->use_javascript_ajax) {
+		print ajax_constantonoff('TICKET_SHOW_COMPANY_LOGO');
+	} else {
+		$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+		print $form->selectarray("TICKET_SHOW_COMPANY_LOGO", $arrval, $conf->global->TICKET_SHOW_COMPANY_LOGO);
+	}
+	print '</td>';
+	print '<td class="center">';
+	print $form->textwithpicto('', $langs->trans("TicketsShowCompanyLogoHelp"), 1, 'help');
+	print '</td>';
+	print '</tr>';
 
-    // Also send to main email address
-    if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
-    {
-    	print '<tr class="oddeven"><td>'.$langs->trans("TicketsEmailAlsoSendToMainAddress").'</td>';
-    	print '<td class="left">';
-    	if ($conf->use_javascript_ajax) {
-    	    print ajax_constantonoff('TICKET_NOTIFICATION_ALSO_MAIN_ADDRESS');
-    	} else {
-    	    $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
-    	    print $form->selectarray("TICKET_NOTIFICATION_ALSO_MAIN_ADDRESS", $arrval, $conf->global->TICKET_NOTIFICATION_ALSO_MAIN_ADDRESS);
-    	}
-    	print '</td>';
-    	print '<td class="center">';
-    	print $form->textwithpicto('', $langs->trans("TicketsEmailAlsoSendToMainAddressHelp"), 1, 'help');
-    	print '</td>';
-    	print '</tr>';
-    }
+	// Also send to main email address
+	if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
+	{
+		print '<tr class="oddeven"><td>'.$langs->trans("TicketsEmailAlsoSendToMainAddress").'</td>';
+		print '<td class="left">';
+		if ($conf->use_javascript_ajax) {
+			print ajax_constantonoff('TICKET_NOTIFICATION_ALSO_MAIN_ADDRESS');
+		} else {
+			$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+			print $form->selectarray("TICKET_NOTIFICATION_ALSO_MAIN_ADDRESS", $arrval, $conf->global->TICKET_NOTIFICATION_ALSO_MAIN_ADDRESS);
+		}
+		print '</td>';
+		print '<td class="center">';
+		print $form->textwithpicto('', $langs->trans("TicketsEmailAlsoSendToMainAddressHelp"), 1, 'help');
+		print '</td>';
+		print '</tr>';
+	}
 
-    if (!$conf->use_javascript_ajax) {
-        print '<tr class="impair"><td colspan="3" align="center"><input type="submit" class="button" value="'.$langs->trans("Save").'"></td>';
-        print '</tr>';
-    }
+	if (!$conf->use_javascript_ajax) {
+		print '<tr class="impair"><td colspan="3" align="center"><input type="submit" class="button" value="'.$langs->trans("Save").'"></td>';
+		print '</tr>';
+	}
 
-    print '</table>';
-    print '</div>';
-    print '<br>';
+	print '</table>';
+	print '</div>';
+	print '<br>';
 
-    if (!$conf->use_javascript_ajax) {
-        print '</form>';
-    }
+	if (!$conf->use_javascript_ajax) {
+		print '</form>';
+	}
 
-    // Admin var of module
-    print load_fiche_titre($langs->trans("TicketParamMail"));
+	// Admin var of module
+	print load_fiche_titre($langs->trans("TicketParamMail"));
 
-    print '<div class="div-table-responsive-no-min">';
-    print '<table class="noborder centpercent">';
+	print '<div class="div-table-responsive-no-min">';
+	print '<table class="noborder centpercent">';
 
-    print '<form method="post" action="'.$_SERVER['PHP_SELF'].'" enctype="multipart/form-data" >';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    print '<input type="hidden" name="action" value="setvar">';
+	print '<form method="post" action="'.$_SERVER['PHP_SELF'].'" enctype="multipart/form-data" >';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="action" value="setvar">';
 
-    print '<tr class="liste_titre">';
-    print '<td colspan="3">'.$langs->trans("Parameter").'</td>';
-    print "</tr>\n";
+	print '<tr class="liste_titre">';
+	print '<td colspan="3">'.$langs->trans("Parameter").'</td>';
+	print "</tr>\n";
 
-    if (empty($conf->global->FCKEDITOR_ENABLE_MAIL)) {
-        print '<tr>';
-        print '<td colspan="3"><div class="info">'.$langs->trans("TicketCkEditorEmailNotActivated").'</div></td>';
-        print "</tr>\n";
-    }
+	if (empty($conf->global->FCKEDITOR_ENABLE_MAIL)) {
+		print '<tr>';
+		print '<td colspan="3"><div class="info">'.$langs->trans("TicketCkEditorEmailNotActivated").'</div></td>';
+		print "</tr>\n";
+	}
 
-    // Interface topic
-    $url_interface = $conf->global->TICKET_PUBLIC_INTERFACE_TOPIC;
-    print '<tr><td>'.$langs->trans("TicketPublicInterfaceTopicLabelAdmin").'</label>';
-    print '</td><td>';
-    print '<input type="text"   name="TICKET_PUBLIC_INTERFACE_TOPIC" value="'.$conf->global->TICKET_PUBLIC_INTERFACE_TOPIC.'" size="40" ></td>';
-    print '</td>';
-    print '<td class="center">';
-    print $form->textwithpicto('', $langs->trans("TicketPublicInterfaceTopicHelp"), 1, 'help');
-    print '</td></tr>';
+	// Interface topic
+	$url_interface = $conf->global->TICKET_PUBLIC_INTERFACE_TOPIC;
+	print '<tr><td>'.$langs->trans("TicketPublicInterfaceTopicLabelAdmin").'</label>';
+	print '</td><td>';
+	print '<input type="text"   name="TICKET_PUBLIC_INTERFACE_TOPIC" value="'.$conf->global->TICKET_PUBLIC_INTERFACE_TOPIC.'" size="40" ></td>';
+	print '</td>';
+	print '<td class="center">';
+	print $form->textwithpicto('', $langs->trans("TicketPublicInterfaceTopicHelp"), 1, 'help');
+	print '</td></tr>';
 
-    // Texte d'accueil homepage
-    $public_text_home = $conf->global->TICKET_PUBLIC_TEXT_HOME ? $conf->global->TICKET_PUBLIC_TEXT_HOME : $langs->trans('TicketPublicInterfaceTextHome');
-    print '<tr><td>'.$langs->trans("TicketPublicInterfaceTextHomeLabelAdmin").'</label>';
-    print '</td><td>';
-    require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-    $doleditor = new DolEditor('TICKET_PUBLIC_TEXT_HOME', $public_text_home, '100%', 180, 'dolibarr_notes', '', false, true, $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_2, 70);
-    $doleditor->Create();
-    print '</td>';
-    print '<td class="center">';
-    print $form->textwithpicto('', $langs->trans("TicketPublicInterfaceTextHomeHelpAdmin"), 1, 'help');
-    print '</td></tr>';
+	// Texte d'accueil homepage
+	$public_text_home = $conf->global->TICKET_PUBLIC_TEXT_HOME ? $conf->global->TICKET_PUBLIC_TEXT_HOME : $langs->trans('TicketPublicInterfaceTextHome');
+	print '<tr><td>'.$langs->trans("TicketPublicInterfaceTextHomeLabelAdmin").'</label>';
+	print '</td><td>';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+	$doleditor = new DolEditor('TICKET_PUBLIC_TEXT_HOME', $public_text_home, '100%', 180, 'dolibarr_notes', '', false, true, $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_2, 70);
+	$doleditor->Create();
+	print '</td>';
+	print '<td class="center">';
+	print $form->textwithpicto('', $langs->trans("TicketPublicInterfaceTextHomeHelpAdmin"), 1, 'help');
+	print '</td></tr>';
 
-    // Texte d'aide à la saisie du message
-    $public_text_help_message = $conf->global->TICKET_PUBLIC_TEXT_HELP_MESSAGE ? $conf->global->TICKET_PUBLIC_TEXT_HELP_MESSAGE : $langs->trans('TicketPublicPleaseBeAccuratelyDescribe');
-    print '<tr><td>'.$langs->trans("TicketPublicInterfaceTextHelpMessageLabelAdmin").'</label>';
-    print '</td><td>';
-    require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-    $doleditor = new DolEditor('TICKET_PUBLIC_TEXT_HELP_MESSAGE', $public_text_help_message, '100%', 180, 'dolibarr_notes', '', false, true, $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_2, 70);
-    $doleditor->Create();
-    print '</td>';
-    print '<td class="center">';
-    print $form->textwithpicto('', $langs->trans("TicketPublicInterfaceTextHelpMessageHelpAdmin"), 1, 'help');
-    print '</td></tr>';
+	// Texte d'aide à la saisie du message
+	$public_text_help_message = $conf->global->TICKET_PUBLIC_TEXT_HELP_MESSAGE ? $conf->global->TICKET_PUBLIC_TEXT_HELP_MESSAGE : $langs->trans('TicketPublicPleaseBeAccuratelyDescribe');
+	print '<tr><td>'.$langs->trans("TicketPublicInterfaceTextHelpMessageLabelAdmin").'</label>';
+	print '</td><td>';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+	$doleditor = new DolEditor('TICKET_PUBLIC_TEXT_HELP_MESSAGE', $public_text_help_message, '100%', 180, 'dolibarr_notes', '', false, true, $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_2, 70);
+	$doleditor->Create();
+	print '</td>';
+	print '<td class="center">';
+	print $form->textwithpicto('', $langs->trans("TicketPublicInterfaceTextHelpMessageHelpAdmin"), 1, 'help');
+	print '</td></tr>';
 
-    // Activate email creation to user
-    print '<tr class="pair"><td>'.$langs->trans("TicketsDisableCustomerEmail").'</td>';
-    print '<td class="left">';
-    if ($conf->use_javascript_ajax) {
-        print ajax_constantonoff('TICKET_DISABLE_CUSTOMER_MAILS');
-    } else {
-        $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
-        print $form->selectarray("TICKET_DISABLE_CUSTOMER_MAILS", $arrval, $conf->global->TICKET_DISABLE_CUSTOMER_MAILS);
-    }
-    print '</td>';
-    print '<td class="center">';
-    print $form->textwithpicto('', $langs->trans("TicketsDisableEmailHelp"), 1, 'help');
-    print '</td>';
-    print '</tr>';
+	// Activate email creation to user
+	print '<tr class="pair"><td>'.$langs->trans("TicketsDisableCustomerEmail").'</td>';
+	print '<td class="left">';
+	if ($conf->use_javascript_ajax) {
+		print ajax_constantonoff('TICKET_DISABLE_CUSTOMER_MAILS');
+	} else {
+		$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+		print $form->selectarray("TICKET_DISABLE_CUSTOMER_MAILS", $arrval, $conf->global->TICKET_DISABLE_CUSTOMER_MAILS);
+	}
+	print '</td>';
+	print '<td class="center">';
+	print $form->textwithpicto('', $langs->trans("TicketsDisableEmailHelp"), 1, 'help');
+	print '</td>';
+	print '</tr>';
 
-    // Texte de création d'un ticket
-    $mail_mesg_new = $conf->global->TICKET_MESSAGE_MAIL_NEW ? $conf->global->TICKET_MESSAGE_MAIL_NEW : $langs->trans('TicketNewEmailBody');
-    print '<tr><td>'.$langs->trans("TicketNewEmailBodyLabel").'</label>';
-    print '</td><td>';
-    require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-    $doleditor = new DolEditor('TICKET_MESSAGE_MAIL_NEW', $mail_mesg_new, '100%', 120, 'dolibarr_mailings', '', false, true, $conf->global->FCKEDITOR_ENABLE_MAIL, ROWS_2, 70);
-    $doleditor->Create();
-    print '</td>';
-    print '<td class="center">';
-    print $form->textwithpicto('', $langs->trans("TicketNewEmailBodyHelp"), 1, 'help');
-    print '</td></tr>';
+	// Texte de création d'un ticket
+	$mail_mesg_new = $conf->global->TICKET_MESSAGE_MAIL_NEW ? $conf->global->TICKET_MESSAGE_MAIL_NEW : $langs->trans('TicketNewEmailBody');
+	print '<tr><td>'.$langs->trans("TicketNewEmailBodyLabel").'</label>';
+	print '</td><td>';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+	$doleditor = new DolEditor('TICKET_MESSAGE_MAIL_NEW', $mail_mesg_new, '100%', 120, 'dolibarr_mailings', '', false, true, $conf->global->FCKEDITOR_ENABLE_MAIL, ROWS_2, 70);
+	$doleditor->Create();
+	print '</td>';
+	print '<td class="center">';
+	print $form->textwithpicto('', $langs->trans("TicketNewEmailBodyHelp"), 1, 'help');
+	print '</td></tr>';
 
-    // Url public interface
-    $url_interface = $conf->global->TICKET_URL_PUBLIC_INTERFACE;
-    print '<tr><td>'.$langs->trans("TicketUrlPublicInterfaceLabelAdmin").'</label>';
-    print '</td><td>';
-    print '<input type="text" class="minwidth500" name="TICKET_URL_PUBLIC_INTERFACE" value="'.$conf->global->TICKET_URL_PUBLIC_INTERFACE.'"></td>';
-    print '</td>';
-    print '<td class="center">';
-    print $form->textwithpicto('', $langs->trans("TicketUrlPublicInterfaceHelpAdmin"), 1, 'help');
-    print '</td></tr>';
+	// Url public interface
+	$url_interface = $conf->global->TICKET_URL_PUBLIC_INTERFACE;
+	print '<tr><td>'.$langs->trans("TicketUrlPublicInterfaceLabelAdmin").'</label>';
+	print '</td><td>';
+	print '<input type="text" class="minwidth500" name="TICKET_URL_PUBLIC_INTERFACE" value="'.$conf->global->TICKET_URL_PUBLIC_INTERFACE.'"></td>';
+	print '</td>';
+	print '<td class="center">';
+	print $form->textwithpicto('', $langs->trans("TicketUrlPublicInterfaceHelpAdmin"), 1, 'help');
+	print '</td></tr>';
 
 	// Activate email notification when a new message is added
-	print '<tr class="pair"><td>' . $langs->trans("TicketsPublicNotificationNewMessage") . '</td>';
+	print '<tr class="pair"><td>'.$langs->trans("TicketsPublicNotificationNewMessage").'</td>';
 	print '<td class="left">';
 	if ($conf->use_javascript_ajax) {
 		print ajax_constantonoff('TICKET_PUBLIC_NOTIFICATION_NEW_MESSAGE_ENABLED');
@@ -399,9 +399,9 @@ if (!empty($conf->global->TICKET_ENABLE_PUBLIC_INTERFACE))
 	print '</tr>';
 
 	// Send notification when a new message is added to a email if a user is not assigned to the ticket
-	print '<tr><td>' . $langs->trans("TicketPublicNotificationNewMessageDefaultEmail") . '</label>';
+	print '<tr><td>'.$langs->trans("TicketPublicNotificationNewMessageDefaultEmail").'</label>';
 	print '</td><td>';
-	print '<input type="text" name="TICKET_PUBLIC_NOTIFICATION_NEW_MESSAGE_DEFAULT_EMAIL" value="' . $conf->global->TICKET_PUBLIC_NOTIFICATION_NEW_MESSAGE_DEFAULT_EMAIL . '" size="40" ></td>';
+	print '<input type="text" name="TICKET_PUBLIC_NOTIFICATION_NEW_MESSAGE_DEFAULT_EMAIL" value="'.$conf->global->TICKET_PUBLIC_NOTIFICATION_NEW_MESSAGE_DEFAULT_EMAIL.'" size="40" ></td>';
 	print '</td>';
 	print '<td align="center">';
 	print $form->textwithpicto('', $langs->trans("TicketPublicNotificationNewMessageDefaultEmailHelp"), 1, 'help');
@@ -410,9 +410,9 @@ if (!empty($conf->global->TICKET_ENABLE_PUBLIC_INTERFACE))
 	print '</table>';
 	print '</div>';
 
-    print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Save").'"></div>';
+	print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Save").'"></div>';
 
-    print '</form>';
+	print '</form>';
 }
 
 // End of page
diff --git a/htdocs/admin/tools/dolibarr_export.php b/htdocs/admin/tools/dolibarr_export.php
index 5e990709d19..4128c0d7075 100644
--- a/htdocs/admin/tools/dolibarr_export.php
+++ b/htdocs/admin/tools/dolibarr_export.php
@@ -243,7 +243,7 @@ if (in_array($type, array('mysql', 'mysqli'))) {
 	print '<label for="checkbox_sql_structure">'.$langs->trans('ExportStructure').'</label>';
 	print '</legend>';
 
-	print '<input type="checkbox" name="drop"'.((! GETPOSTISSET("drop") || GETPOST('drop')) ? ' checked' : '').' id="checkbox_dump_drop" />';
+	print '<input type="checkbox" name="drop"'.((!GETPOSTISSET("drop") || GETPOST('drop')) ? ' checked' : '').' id="checkbox_dump_drop" />';
 	print '<label for="checkbox_dump_drop">'.$langs->trans("AddDropTable").'</label>';
 	print '<br>';
 	print '</fieldset>';
@@ -304,7 +304,7 @@ if (in_array($type, array('mysql', 'mysqli'))) {
 
 	print '<br>';
 	print '<fieldset><legend>'.$langs->trans('ExportStructure').'</legend>';
-	print '<input type="checkbox" name="nobin_drop"'.((! GETPOSTISSET("nobin_drop") || GETPOST('nobin_drop')) ? ' checked' : '').' id="checkbox_dump_drop" />';
+	print '<input type="checkbox" name="nobin_drop"'.((!GETPOSTISSET("nobin_drop") || GETPOST('nobin_drop')) ? ' checked' : '').' id="checkbox_dump_drop" />';
 	print '<label for="checkbox_dump_drop">'.$langs->trans("AddDropTable").'</label>';
 	print '<br>';
 	print '</fieldset>';
diff --git a/htdocs/admin/tools/dolibarr_import.php b/htdocs/admin/tools/dolibarr_import.php
index 224bbc14b56..91fbb81b90e 100644
--- a/htdocs/admin/tools/dolibarr_import.php
+++ b/htdocs/admin/tools/dolibarr_import.php
@@ -58,8 +58,8 @@ jQuery(document).ready(function() {
 		jQuery("#postgresql_options").show();
 	});
 	<?php
-	    if ($label == 'MySQL')      print 'jQuery("#radio_dump_mysql").click();';
-	    if ($label == 'PostgreSQL') print 'jQuery("#radio_dump_postgresql").click();';
+		if ($label == 'MySQL')      print 'jQuery("#radio_dump_mysql").click();';
+		if ($label == 'PostgreSQL') print 'jQuery("#radio_dump_postgresql").click();';
 	?>
 });
 </script>
@@ -97,26 +97,26 @@ print $langs->trans("RestoreDesc3", $dolibarr_main_db_name).'<br><br>';
 <fieldset id="exportoptions">
 	<legend><?php echo $langs->trans("ImportMethod"); ?></legend>
     <?php
-    if (in_array($type, array('mysql', 'mysqli')))
-    {
-        ?>
+	if (in_array($type, array('mysql', 'mysqli')))
+	{
+		?>
     <div class="formelementrow">
         <input type="radio" name="what" value="mysql" id="radio_dump_mysql"<?php echo ($radio_dump == 'mysql_options' ? ' checked' : ''); ?> />
         <label for="radio_dump_mysql">MySQL (mysql)</label>
     </div>
         <?php
-    } elseif (in_array($type, array('pgsql')))
-    {
-        ?>
+	} elseif (in_array($type, array('pgsql')))
+	{
+		?>
     <div class="formelementrow">
         <input type="radio" name="what" value="mysql" id="radio_dump_postgresql"<?php echo ($radio_dump == 'postgresql_options' ? ' checked' : ''); ?> />
         <label for="radio_dump_postgresql">PostgreSQL Restore (pg_restore or psql)</label>
     </div>
         <?php
-    } else {
-        print 'No method available with database '.$label;
-    }
-    ?>
+	} else {
+		print 'No method available with database '.$label;
+	}
+	?>
 </fieldset>
 </div>
 <?php } ?>
@@ -128,8 +128,8 @@ print $langs->trans("RestoreDesc3", $dolibarr_main_db_name).'<br><br>';
 <?php
 if (in_array($type, array('mysql', 'mysqli')))
 {
-    print '<fieldset id="mysql_options">';
-    print '<legend>'.$langs->trans('RestoreMySQL').'</legend>';
+	print '<fieldset id="mysql_options">';
+	print '<legend>'.$langs->trans('RestoreMySQL').'</legend>';
 	print '<div class="formelementrow centpercent">';
 	// Parameteres execution
 	$command = $db->getPathOfRestore();
@@ -152,46 +152,46 @@ if (in_array($type, array('mysql', 'mysqli')))
 	print '<textarea rows="1" id="restorecommand" class="centpercent">'.$langs->trans("ImportMySqlCommand", $command, ($showpass ? $paramclear : $paramcrypted)).'</textarea><br>';
 	print ajax_autoselect('restorecommand');
 
-    if (empty($_GET["showpass"]) && $dolibarr_main_db_pass) {
-        print '<br><a href="'.$_SERVER["PHP_SELF"].'?showpass=1&amp;radio_dump=mysql_options">'.$langs->trans("UnHidePassword").'</a>';
-    }
-    //else print '<br><a href="'.$_SERVER["PHP_SELF"].'?showpass=0&amp;radio_dump=mysql_options">'.$langs->trans("HidePassword").'</a>';
-    print '</div>';
-    print '</fieldset>';
+	if (empty($_GET["showpass"]) && $dolibarr_main_db_pass) {
+		print '<br><a href="'.$_SERVER["PHP_SELF"].'?showpass=1&amp;radio_dump=mysql_options">'.$langs->trans("UnHidePassword").'</a>';
+	}
+	//else print '<br><a href="'.$_SERVER["PHP_SELF"].'?showpass=0&amp;radio_dump=mysql_options">'.$langs->trans("HidePassword").'</a>';
+	print '</div>';
+	print '</fieldset>';
 } elseif (in_array($type, array('pgsql')))
 {
-    print '<fieldset id="postgresql_options">';
-    print '<legend>Restore PostgreSQL</legend>';
-    print '<div class="formelementrow">';
-    // Parameteres execution
-    $command = $db->getPathOfRestore();
-    if (preg_match("/\s/", $command)) $command = $command = escapeshellarg($command); // Use quotes on command
+	print '<fieldset id="postgresql_options">';
+	print '<legend>Restore PostgreSQL</legend>';
+	print '<div class="formelementrow">';
+	// Parameteres execution
+	$command = $db->getPathOfRestore();
+	if (preg_match("/\s/", $command)) $command = $command = escapeshellarg($command); // Use quotes on command
 
-    $param = " -d ".$dolibarr_main_db_name;
-    $param .= " -h ".$dolibarr_main_db_host;
-    if (!empty($dolibarr_main_db_port)) $param .= " -p ".$dolibarr_main_db_port;
-    $param .= " -U ".$dolibarr_main_db_user;
-    $paramcrypted = $param;
-    $paramclear = $param;
-    /*if (! empty($dolibarr_main_db_pass))
+	$param = " -d ".$dolibarr_main_db_name;
+	$param .= " -h ".$dolibarr_main_db_host;
+	if (!empty($dolibarr_main_db_port)) $param .= " -p ".$dolibarr_main_db_port;
+	$param .= " -U ".$dolibarr_main_db_user;
+	$paramcrypted = $param;
+	$paramclear = $param;
+	/*if (! empty($dolibarr_main_db_pass))
     {
         $paramcrypted.=" -p".preg_replace('/./i','*',$dolibarr_main_db_pass);
         $paramclear.=" -p".$dolibarr_main_db_pass;
     }*/
-    $paramcrypted .= " -W";
-    $paramclear .= " -W";
-    // With psql:
-    $paramcrypted .= " -f";
-    $paramclear .= " -f";
+	$paramcrypted .= " -W";
+	$paramclear .= " -W";
+	// With psql:
+	$paramcrypted .= " -f";
+	$paramclear .= " -f";
 
-    echo $langs->trans("ImportPostgreSqlDesc");
-    print '<br>';
-    print '<textarea rows="1" id="restorecommand" class="centpercent">'.$langs->trans("ImportPostgreSqlCommand", $command, ($showpass ? $paramclear : $paramcrypted)).'</textarea><br>';
-    print ajax_autoselect('restorecommand');
-    //if (empty($_GET["showpass"]) && $dolibarr_main_db_pass) print '<br><a href="'.$_SERVER["PHP_SELF"].'?showpass=1&amp;radio_dump=postgresql_options">'.$langs->trans("UnHidePassword").'</a>';
-    //else print '<br><a href="'.$_SERVER["PHP_SELF"].'?showpass=0&amp;radio_dump=mysql_options">'.$langs->trans("HidePassword").'</a>';
-    print '</div>';
-    print '</fieldset>';
+	echo $langs->trans("ImportPostgreSqlDesc");
+	print '<br>';
+	print '<textarea rows="1" id="restorecommand" class="centpercent">'.$langs->trans("ImportPostgreSqlCommand", $command, ($showpass ? $paramclear : $paramcrypted)).'</textarea><br>';
+	print ajax_autoselect('restorecommand');
+	//if (empty($_GET["showpass"]) && $dolibarr_main_db_pass) print '<br><a href="'.$_SERVER["PHP_SELF"].'?showpass=1&amp;radio_dump=postgresql_options">'.$langs->trans("UnHidePassword").'</a>';
+	//else print '<br><a href="'.$_SERVER["PHP_SELF"].'?showpass=0&amp;radio_dump=mysql_options">'.$langs->trans("HidePassword").'</a>';
+	print '</div>';
+	print '</fieldset>';
 }
 
 print '</div>';
diff --git a/htdocs/admin/tools/export.php b/htdocs/admin/tools/export.php
index 7ab26f6f6e0..0c3679c62fa 100644
--- a/htdocs/admin/tools/export.php
+++ b/htdocs/admin/tools/export.php
@@ -49,9 +49,9 @@ if (!$user->admin) accessforbidden();
 
 if ($file && !$what)
 {
-    //print DOL_URL_ROOT.'/dolibarr_export.php';
+	//print DOL_URL_ROOT.'/dolibarr_export.php';
 	header("Location: ".DOL_URL_ROOT.'/admin/tools/dolibarr_export.php?msg='.urlencode($langs->trans("ErrorFieldRequired", $langs->transnoentities("ExportMethod"))).(GETPOST('page_y', 'int') ? '&page_y='.GETPOST('page_y', 'int') : ''));
-    exit;
+	exit;
 }
 
 $errormsg = '';
@@ -83,16 +83,16 @@ $_SESSION["commandbackupresult"] = '';
 $ExecTimeLimit = 600;
 if (!empty($ExecTimeLimit))
 {
-    $err = error_reporting();
-    error_reporting(0); // Disable all errors
-    //error_reporting(E_ALL);
-    @set_time_limit($ExecTimeLimit); // Need more than 240 on Windows 7/64
-    error_reporting($err);
+	$err = error_reporting();
+	error_reporting(0); // Disable all errors
+	//error_reporting(E_ALL);
+	@set_time_limit($ExecTimeLimit); // Need more than 240 on Windows 7/64
+	error_reporting($err);
 }
 $MemoryLimit = 0;
 if (!empty($MemoryLimit))
 {
-    @ini_set('memory_limit', $MemoryLimit);
+	@ini_set('memory_limit', $MemoryLimit);
 }
 
 $form = new Form($db);
@@ -122,51 +122,51 @@ $utils = new Utils($db);
 // MYSQL
 if ($what == 'mysql')
 {
-    $cmddump = GETPOST("mysqldump", 'none'); // Do not sanitize here with 'alpha', will be sanitize later by dol_sanitizePathName and escapeshellarg
-    $cmddump = dol_sanitizePathName($cmddump);
+	$cmddump = GETPOST("mysqldump", 'none'); // Do not sanitize here with 'alpha', will be sanitize later by dol_sanitizePathName and escapeshellarg
+	$cmddump = dol_sanitizePathName($cmddump);
 
-    if (!empty($dolibarr_main_restrict_os_commands))
-    {
-        $arrayofallowedcommand = explode(',', $dolibarr_main_restrict_os_commands);
-        dol_syslog("Command are restricted to ".$dolibarr_main_restrict_os_commands.". We check that one of this command is inside ".$cmddump);
-        $basenamecmddump = basename($cmddump);
-        if (!in_array($basenamecmddump, $arrayofallowedcommand))	// the provided command $cmddump must be an allowed command
-        {
-            $errormsg = $langs->trans('CommandIsNotInsideAllowedCommands');
-        }
-    }
+	if (!empty($dolibarr_main_restrict_os_commands))
+	{
+		$arrayofallowedcommand = explode(',', $dolibarr_main_restrict_os_commands);
+		dol_syslog("Command are restricted to ".$dolibarr_main_restrict_os_commands.". We check that one of this command is inside ".$cmddump);
+		$basenamecmddump = basename($cmddump);
+		if (!in_array($basenamecmddump, $arrayofallowedcommand))	// the provided command $cmddump must be an allowed command
+		{
+			$errormsg = $langs->trans('CommandIsNotInsideAllowedCommands');
+		}
+	}
 
-    if (!$errormsg && $cmddump)
-    {
-        dolibarr_set_const($db, 'SYSTEMTOOLS_MYSQLDUMP', $cmddump, 'chaine', 0, '', $conf->entity);
-    }
+	if (!$errormsg && $cmddump)
+	{
+		dolibarr_set_const($db, 'SYSTEMTOOLS_MYSQLDUMP', $cmddump, 'chaine', 0, '', $conf->entity);
+	}
 
-    if (!$errormsg)
-    {
-        $utils->dumpDatabase(GETPOST('compression', 'alpha'), $what, 0, $file);
-        $errormsg = $utils->error;
-        $_SESSION["commandbackuplastdone"] = $utils->result['commandbackuplastdone'];
-        $_SESSION["commandbackuptorun"] = $utils->result['commandbackuptorun'];
-    }
+	if (!$errormsg)
+	{
+		$utils->dumpDatabase(GETPOST('compression', 'alpha'), $what, 0, $file);
+		$errormsg = $utils->error;
+		$_SESSION["commandbackuplastdone"] = $utils->result['commandbackuplastdone'];
+		$_SESSION["commandbackuptorun"] = $utils->result['commandbackuptorun'];
+	}
 }
 
 // MYSQL NO BIN
 if ($what == 'mysqlnobin')
 {
-    $utils->dumpDatabase(GETPOST('compression', 'alpha'), $what, 0, $file);
+	$utils->dumpDatabase(GETPOST('compression', 'alpha'), $what, 0, $file);
 
-    $errormsg = $utils->error;
-    $_SESSION["commandbackuplastdone"] = $utils->result['commandbackuplastdone'];
-    $_SESSION["commandbackuptorun"] = $utils->result['commandbackuptorun'];
+	$errormsg = $utils->error;
+	$_SESSION["commandbackuplastdone"] = $utils->result['commandbackuplastdone'];
+	$_SESSION["commandbackuptorun"] = $utils->result['commandbackuptorun'];
 }
 
 // POSTGRESQL
 if ($what == 'postgresql')
 {
-    $cmddump = GETPOST("postgresqldump", 'none'); // Do not sanitize here with 'alpha', will be sanitize later by dol_sanitizePathName and escapeshellarg
-    $cmddump = dol_sanitizePathName($cmddump);
+	$cmddump = GETPOST("postgresqldump", 'none'); // Do not sanitize here with 'alpha', will be sanitize later by dol_sanitizePathName and escapeshellarg
+	$cmddump = dol_sanitizePathName($cmddump);
 
-    /* Not required, the command is output on screen but not ran for pgsql
+	/* Not required, the command is output on screen but not ran for pgsql
     if (! empty($dolibarr_main_restrict_os_commands))
     {
     	$arrayofallowedcommand=explode(',', $dolibarr_main_restrict_os_commands);
@@ -178,20 +178,20 @@ if ($what == 'postgresql')
     	}
     } */
 
-    if (!$errormsg && $cmddump)
-    {
-        dolibarr_set_const($db, 'SYSTEMTOOLS_POSTGRESQLDUMP', $cmddump, 'chaine', 0, '', $conf->entity);
-    }
+	if (!$errormsg && $cmddump)
+	{
+		dolibarr_set_const($db, 'SYSTEMTOOLS_POSTGRESQLDUMP', $cmddump, 'chaine', 0, '', $conf->entity);
+	}
 
-    if (!$errormsg)
-    {
-        $utils->dumpDatabase(GETPOST('compression', 'alpha'), $what, 0, $file);
-        $errormsg = $utils->error;
-        $_SESSION["commandbackuplastdone"] = $utils->result['commandbackuplastdone'];
-        $_SESSION["commandbackuptorun"] = $utils->result['commandbackuptorun'];
-    }
+	if (!$errormsg)
+	{
+		$utils->dumpDatabase(GETPOST('compression', 'alpha'), $what, 0, $file);
+		$errormsg = $utils->error;
+		$_SESSION["commandbackuplastdone"] = $utils->result['commandbackuplastdone'];
+		$_SESSION["commandbackuptorun"] = $utils->result['commandbackuptorun'];
+	}
 
-    $what = ''; // Clear to show message to run command
+	$what = ''; // Clear to show message to run command
 }
 
 
@@ -200,20 +200,20 @@ if ($errormsg)
 	setEventMessages($langs->trans("Error")." : ".$errormsg, null, 'errors');
 
 	$resultstring = '';
-    $resultstring .= '<div class="error">'.$langs->trans("Error")." : ".$errormsg.'</div>';
+	$resultstring .= '<div class="error">'.$langs->trans("Error")." : ".$errormsg.'</div>';
 
-    $_SESSION["commandbackupresult"] = $resultstring;
+	$_SESSION["commandbackupresult"] = $resultstring;
 } else {
 	if ($what)
 	{
-        setEventMessages($langs->trans("BackupFileSuccessfullyCreated").'.<br>'.$langs->trans("YouCanDownloadBackupFile"), null, 'mesgs');
+		setEventMessages($langs->trans("BackupFileSuccessfullyCreated").'.<br>'.$langs->trans("YouCanDownloadBackupFile"), null, 'mesgs');
 
-        $resultstring = '<div class="ok">';
-        $resultstring .= $langs->trans("BackupFileSuccessfullyCreated").'.<br>';
-        $resultstring .= $langs->trans("YouCanDownloadBackupFile");
-        $resultstring .= '<div>';
+		$resultstring = '<div class="ok">';
+		$resultstring .= $langs->trans("BackupFileSuccessfullyCreated").'.<br>';
+		$resultstring .= $langs->trans("YouCanDownloadBackupFile");
+		$resultstring .= '<div>';
 
-        $_SESSION["commandbackupresult"] = $resultstring;
+		$_SESSION["commandbackupresult"] = $resultstring;
 	}
 	/*else
 	{
diff --git a/htdocs/admin/tools/export_files.php b/htdocs/admin/tools/export_files.php
index 28eaa2d9d54..590ff276831 100644
--- a/htdocs/admin/tools/export_files.php
+++ b/htdocs/admin/tools/export_files.php
@@ -59,8 +59,8 @@ $errormsg = '';
 
 if ($action == 'delete')
 {
-    $filerelative = dol_sanitizeFileName(GETPOST('urlfile', 'alpha'));
-    $filepath = $conf->admin->dir_output.'/'.$filerelative;
+	$filerelative = dol_sanitizeFileName(GETPOST('urlfile', 'alpha'));
+	$filepath = $conf->admin->dir_output.'/'.$filerelative;
 	$ret = dol_delete_file($filepath, 1);
 	if ($ret) setEventMessages($langs->trans("FileWasRemoved", $filerelative), null, 'mesgs');
 	else setEventMessages($langs->trans("ErrorFailToDeleteFile", $filerelative), null, 'errors');
@@ -76,16 +76,16 @@ if ($action == 'delete')
 $ExecTimeLimit = 1800; // 30mn
 if (!empty($ExecTimeLimit))
 {
-    $err = error_reporting();
-    error_reporting(0); // Disable all errors
-    //error_reporting(E_ALL);
-    @set_time_limit($ExecTimeLimit); // Need more than 240 on Windows 7/64
-    error_reporting($err);
+	$err = error_reporting();
+	error_reporting(0); // Disable all errors
+	//error_reporting(E_ALL);
+	@set_time_limit($ExecTimeLimit); // Need more than 240 on Windows 7/64
+	error_reporting($err);
 }
 $MemoryLimit = 0;
 if (!empty($MemoryLimit))
 {
-    @ini_set('memory_limit', $MemoryLimit);
+	@ini_set('memory_limit', $MemoryLimit);
 }
 
 $form = new Form($db);
@@ -113,54 +113,54 @@ $utils = new Utils($db);
 if ($compression == 'zip')
 {
 	$file .= '.zip';
-    $ret = dol_compress_dir(DOL_DATA_ROOT, $outputdir."/".$file, $compression, '/(\.back|\.old|\.log|[\\\/]temp[\\\/]|documents[\\\/]admin[\\\/]documents[\\\/])/i');
-    if ($ret < 0)
-    {
-    	if ($ret == -2) {
-    		$langs->load("errors");
-    		$errormsg = $langs->trans("ErrNoZipEngine");
-    	} else {
-    		$langs->load("errors");
-    		$errormsg = $langs->trans("ErrorFailedToWriteInDir", $outputdir);
-    	}
-    }
+	$ret = dol_compress_dir(DOL_DATA_ROOT, $outputdir."/".$file, $compression, '/(\.back|\.old|\.log|[\\\/]temp[\\\/]|documents[\\\/]admin[\\\/]documents[\\\/])/i');
+	if ($ret < 0)
+	{
+		if ($ret == -2) {
+			$langs->load("errors");
+			$errormsg = $langs->trans("ErrNoZipEngine");
+		} else {
+			$langs->load("errors");
+			$errormsg = $langs->trans("ErrorFailedToWriteInDir", $outputdir);
+		}
+	}
 } elseif (in_array($compression, array('gz', 'bz')))
 {
 	$userlogin = ($user->login ? $user->login : 'unknown');
 
 	$outputfile = $conf->admin->dir_temp.'/export_files.'.$userlogin.'.out'; // File used with popen method
 
-    $file .= '.tar';
-    // We also exclude '/temp/' dir and 'documents/admin/documents'
-    $cmd = "tar -cf ".$outputdir."/".$file." --exclude-vcs --exclude 'temp' --exclude 'dolibarr.log' --exclude 'dolibarr_*.log' --exclude 'documents/admin/documents' -C ".dirname(DOL_DATA_ROOT)." ".basename(DOL_DATA_ROOT);
+	$file .= '.tar';
+	// We also exclude '/temp/' dir and 'documents/admin/documents'
+	$cmd = "tar -cf ".$outputdir."/".$file." --exclude-vcs --exclude 'temp' --exclude 'dolibarr.log' --exclude 'dolibarr_*.log' --exclude 'documents/admin/documents' -C ".dirname(DOL_DATA_ROOT)." ".basename(DOL_DATA_ROOT);
 
-    $result = $utils->executeCLI($cmd, $outputfile);
+	$result = $utils->executeCLI($cmd, $outputfile);
 
-    $retval = $result['error'];
-    if ($result['result'] || !empty($retval))
-    {
-        $langs->load("errors");
-        dol_syslog("Documents tar retval after exec=".$retval, LOG_ERR);
-        $errormsg = 'Error tar generation return '.$retval;
-    } else {
-        if ($compression == 'gz')
-        {
-            $cmd = "gzip -f ".$outputdir."/".$file;
-        }
-        if ($compression == 'bz')
-        {
-            $cmd = "bzip2 -f ".$outputdir."/".$file;
-        }
+	$retval = $result['error'];
+	if ($result['result'] || !empty($retval))
+	{
+		$langs->load("errors");
+		dol_syslog("Documents tar retval after exec=".$retval, LOG_ERR);
+		$errormsg = 'Error tar generation return '.$retval;
+	} else {
+		if ($compression == 'gz')
+		{
+			$cmd = "gzip -f ".$outputdir."/".$file;
+		}
+		if ($compression == 'bz')
+		{
+			$cmd = "bzip2 -f ".$outputdir."/".$file;
+		}
 
-        $result = $utils->executeCLI($cmd, $outputfile);
+		$result = $utils->executeCLI($cmd, $outputfile);
 
-        $retval = $result['error'];
-        if ($result['result'] || !empty($retval))
-        {
-            $errormsg = 'Error '.$compression.' generation return '.$retval;
-            unlink($outputdir."/".$file);
-        }
-    }
+		$retval = $result['error'];
+		if ($result['result'] || !empty($retval))
+		{
+			$errormsg = 'Error '.$compression.' generation return '.$retval;
+			unlink($outputdir."/".$file);
+		}
+	}
 }
 
 if ($errormsg)
diff --git a/htdocs/admin/tools/listevents.php b/htdocs/admin/tools/listevents.php
index 82111e0716d..00c4bdc36dd 100644
--- a/htdocs/admin/tools/listevents.php
+++ b/htdocs/admin/tools/listevents.php
@@ -76,11 +76,11 @@ $nowarray = dol_getdate($now);
 
 if (empty($date_start)) // We define date_start and date_end
 {
-    $date_start = dol_get_first_day($nowarray['year'], $nowarray['mon'], false);
+	$date_start = dol_get_first_day($nowarray['year'], $nowarray['mon'], false);
 }
 if (empty($date_end))
 {
-    $date_end = dol_mktime(23, 59, 59, $nowarray['mon'], $nowarray['mday'], $nowarray['year']);
+	$date_end = dol_mktime(23, 59, 59, $nowarray['mon'], $nowarray['mday'], $nowarray['year']);
 }
 // Set $date_startmonth...
 $tmp = dol_getdate($date_start);
@@ -104,14 +104,14 @@ $now = dol_now();
 // Purge search criteria
 if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
 {
-    $date_start = -1;
-    $date_end = -1;
-    $search_code = '';
-    $search_ip = '';
-    $search_user = '';
-    $search_desc = '';
-    $search_ua = '';
-    $search_prefix_session = '';
+	$date_start = -1;
+	$date_end = -1;
+	$search_code = '';
+	$search_ip = '';
+	$search_user = '';
+	$search_desc = '';
+	$search_ua = '';
+	$search_prefix_session = '';
 }
 
 // Purge audit events
@@ -144,7 +144,7 @@ if ($action == 'confirm_purge' && $confirm == 'yes' && $user->admin)
 	$result = $securityevent->create($user);
 	if ($result > 0)
 	{
-	    $db->commit();
+		$db->commit();
 		dol_syslog($text, LOG_WARNING);
 	} else {
 		$error++;
@@ -219,16 +219,16 @@ if ($result)
 	if ($date_endday)     $param .= "&date_endday=".urlencode($date_endday);
 	if ($date_endyear)    $param .= "&date_endyear=".urlencode($date_endyear);
 
-    $langs->load('withdrawals');
-    if ($num)
-    {
-        $center = '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?action=purge">'.$langs->trans("Purge").'</a>';
-    }
+	$langs->load('withdrawals');
+	if ($num)
+	{
+		$center = '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?action=purge">'.$langs->trans("Purge").'</a>';
+	}
 
 	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 
-    print_barre_liste($langs->trans("ListOfSecurityEvents"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $center, $num, $nbtotalofrecords, 'setup', 0, '', '', $limit);
+	print_barre_liste($langs->trans("ListOfSecurityEvents"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $center, $num, $nbtotalofrecords, 'setup', 0, '', '', $limit);
 
 	if ($action == 'purge')
 	{
diff --git a/htdocs/admin/tools/listsessions.php b/htdocs/admin/tools/listsessions.php
index aedc41e0b23..d8e0a0383a2 100644
--- a/htdocs/admin/tools/listsessions.php
+++ b/htdocs/admin/tools/listsessions.php
@@ -37,8 +37,8 @@ $confirm = GETPOST('confirm', 'alpha');
 // Security check
 if ($user->socid > 0)
 {
-    $action = '';
-    $socid = $user->socid;
+	$action = '';
+	$socid = $user->socid;
 }
 
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
@@ -192,7 +192,7 @@ if ($savehandler == 'files')
 {
 	if (count($listofsessions))
 	{
-	    print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?action=purge">'.$langs->trans("PurgeSessions").'</a>';
+		print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?action=purge">'.$langs->trans("PurgeSessions").'</a>';
 	}
 }
 
diff --git a/htdocs/admin/tools/purge.php b/htdocs/admin/tools/purge.php
index c41b43b3b48..d450b5aa888 100644
--- a/htdocs/admin/tools/purge.php
+++ b/htdocs/admin/tools/purge.php
@@ -48,16 +48,16 @@ if (!empty($conf->syslog->enabled))
  */
 if ($action == 'purge' && !preg_match('/^confirm/i', $choice) && ($choice != 'allfiles' || $confirm == 'yes'))
 {
-    // Increase limit of time. Works only if we are not in safe mode
-    $ExecTimeLimit = 600;
-    if (!empty($ExecTimeLimit))
-    {
-        $err = error_reporting();
-        error_reporting(0); // Disable all errors
-        //error_reporting(E_ALL);
-        @set_time_limit($ExecTimeLimit); // Need more than 240 on Windows 7/64
-        error_reporting($err);
-    }
+	// Increase limit of time. Works only if we are not in safe mode
+	$ExecTimeLimit = 600;
+	if (!empty($ExecTimeLimit))
+	{
+		$err = error_reporting();
+		error_reporting(0); // Disable all errors
+		//error_reporting(E_ALL);
+		@set_time_limit($ExecTimeLimit); // Need more than 240 on Windows 7/64
+		error_reporting($err);
+	}
 
 	require_once DOL_DOCUMENT_ROOT.'/core/class/utils.class.php';
 	$utils = new Utils($db);
@@ -97,9 +97,9 @@ if (!empty($conf->syslog->enabled))
 	$filelogparam = $filelog;
 	if ($user->admin && preg_match('/^dolibarr.*\.log$/', basename($filelog)))
 	{
-	    $filelogparam = '<a class="wordbreak" href="'.DOL_URL_ROOT.'/document.php?modulepart=logs&file=';
-	    $filelogparam .= basename($filelog);
-	    $filelogparam .= '">'.$filelog.'</a>';
+		$filelogparam = '<a class="wordbreak" href="'.DOL_URL_ROOT.'/document.php?modulepart=logs&file=';
+		$filelogparam .= basename($filelog);
+		$filelogparam .= '">'.$filelog.'</a>';
 	}
 	print '> '.$langs->trans("PurgeDeleteLogFile", $filelogparam);
 	print '<br><br>';
diff --git a/htdocs/admin/tools/update.php b/htdocs/admin/tools/update.php
index 27b53e8266e..f39766818f3 100644
--- a/htdocs/admin/tools/update.php
+++ b/htdocs/admin/tools/update.php
@@ -54,7 +54,7 @@ $version = '0.0';
 
 if ($action == 'getlastversion')
 {
-	$result = getURLContent('http://sourceforge.net/projects/dolibarr/rss');
+	$result = getURLContent('https://sourceforge.net/projects/dolibarr/rss');
 	//var_dump($result['content']);
 	$sfurl = simplexml_load_string($result['content']);
 }
diff --git a/htdocs/admin/translation.php b/htdocs/admin/translation.php
index e6f667a169b..edd5ca95026 100644
--- a/htdocs/admin/translation.php
+++ b/htdocs/admin/translation.php
@@ -547,7 +547,7 @@ if ($mode == 'searchkey')
 	print '</div>';
 }
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print "</form>\n";
 
diff --git a/htdocs/admin/user.php b/htdocs/admin/user.php
index b6fc6f43ae9..a96ea4e16aa 100644
--- a/htdocs/admin/user.php
+++ b/htdocs/admin/user.php
@@ -60,7 +60,7 @@ if ($action == 'set_default')
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0)
 	{
-        if ($conf->global->USER_ADDON_PDF_ODT == "$value") dolibarr_del_const($db, 'USER_ADDON_PDF_ODT', $conf->entity);
+		if ($conf->global->USER_ADDON_PDF_ODT == "$value") dolibarr_del_const($db, 'USER_ADDON_PDF_ODT', $conf->entity);
 	}
 	$res = true;
 }
@@ -84,24 +84,24 @@ elseif ($action == 'setdoc')
 	$res = true;
 } elseif (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);
+	}
 } elseif (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);
+	}
 }
 //Set hide closed customer into combox or select
 elseif ($action == 'sethideinactiveuser')
@@ -225,110 +225,110 @@ clearstatcache();
 
 foreach ($dirmodels as $reldir)
 {
-    foreach (array('', '/doc') as $valdir)
-    {
-    	$dir = dol_buildpath($reldir."core/modules/user".$valdir);
-        if (is_dir($dir))
-        {
-            $handle = opendir($dir);
-            if (is_resource($handle))
-            {
-                while (($file = readdir($handle)) !== false)
-                {
-                    $filelist[] = $file;
-                }
-                closedir($handle);
-                arsort($filelist);
+	foreach (array('', '/doc') as $valdir)
+	{
+		$dir = dol_buildpath($reldir."core/modules/user".$valdir);
+		if (is_dir($dir))
+		{
+			$handle = opendir($dir);
+			if (is_resource($handle))
+			{
+				while (($file = readdir($handle)) !== false)
+				{
+					$filelist[] = $file;
+				}
+				closedir($handle);
+				arsort($filelist);
 
-                foreach ($filelist as $file)
-                {
-                    if (preg_match('/\.modules\.php$/i', $file) && preg_match('/^(pdf_|doc_)/', $file))
-                    {
-                    	if (file_exists($dir.'/'.$file))
-                    	{
-                    		$name = substr($file, 4, dol_strlen($file) - 16);
-	                        $classname = substr($file, 0, dol_strlen($file) - 12);
+				foreach ($filelist as $file)
+				{
+					if (preg_match('/\.modules\.php$/i', $file) && preg_match('/^(pdf_|doc_)/', $file))
+					{
+						if (file_exists($dir.'/'.$file))
+						{
+							$name = substr($file, 4, dol_strlen($file) - 16);
+							$classname = substr($file, 0, dol_strlen($file) - 12);
 
-	                        require_once $dir.'/'.$file;
-	                        $module = new $classname($db);
+							require_once $dir.'/'.$file;
+							$module = new $classname($db);
 
-	                        $modulequalified = 1;
-	                        if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) $modulequalified = 0;
-	                        if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) $modulequalified = 0;
+							$modulequalified = 1;
+							if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) $modulequalified = 0;
+							if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) $modulequalified = 0;
 
-	                        if ($modulequalified)
-	                        {
-	                            print '<tr class="oddeven"><td width="100">';
-	                            print (empty($module->name) ? $name : $module->name);
-	                            print "</td><td>\n";
-	                            if (method_exists($module, 'info')) print $module->info($langs);
-	                            else print $module->description;
-	                            print '</td>';
+							if ($modulequalified)
+							{
+								print '<tr class="oddeven"><td width="100">';
+								print (empty($module->name) ? $name : $module->name);
+								print "</td><td>\n";
+								if (method_exists($module, 'info')) print $module->info($langs);
+								else print $module->description;
+								print '</td>';
 
-	                            // Active
-	                            if (in_array($name, $def))
-	                            {
-	                            	print '<td class="center">'."\n";
-	                            	print '<a href="'.$_SERVER["PHP_SELF"].'?action=del_default&amp;token='.newToken().'&amp;value='.$name.'">';
-	                            	print img_picto($langs->trans("Enabled"), 'switch_on');
-	                            	print '</a>';
-	                            	print '</td>';
-	                            } else {
-	                                print '<td class="center">'."\n";
-	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=set_default&amp;token='.newToken().'&amp;value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
-	                                print "</td>";
-	                            }
+								// Active
+								if (in_array($name, $def))
+								{
+									print '<td class="center">'."\n";
+									print '<a href="'.$_SERVER["PHP_SELF"].'?action=del_default&amp;token='.newToken().'&amp;value='.$name.'">';
+									print img_picto($langs->trans("Enabled"), 'switch_on');
+									print '</a>';
+									print '</td>';
+								} else {
+									print '<td class="center">'."\n";
+									print '<a href="'.$_SERVER["PHP_SELF"].'?action=set_default&amp;token='.newToken().'&amp;value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+									print "</td>";
+								}
 
-	                            // Defaut
-	                            print '<td class="center">';
-	                            if ($conf->global->USER_ADDON_PDF == $name)
-	                            {
-	                                print img_picto($langs->trans("Default"), 'on');
-	                            } else {
-	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;token='.newToken().'&amp;value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
-	                            }
-	                            print '</td>';
+								// Defaut
+								print '<td class="center">';
+								if ($conf->global->USER_ADDON_PDF == $name)
+								{
+									print img_picto($langs->trans("Default"), 'on');
+								} else {
+									print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;token='.newToken().'&amp;value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+								}
+								print '</td>';
 
-	                            // Info
-		    					$htmltooltip = ''.$langs->trans("Name").': '.$module->name;
-					    		$htmltooltip .= '<br>'.$langs->trans("Type").': '.($module->type ? $module->type : $langs->trans("Unknown"));
-			                    if ($module->type == 'pdf')
-			                    {
-			                        $htmltooltip .= '<br>'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur;
-			                    }
-					    		$htmltooltip .= '<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
-					    		$htmltooltip .= '<br>'.$langs->trans("Logo").': '.yn($module->option_logo, 1, 1);
-					    		$htmltooltip .= '<br>'.$langs->trans("MultiLanguage").': '.yn($module->option_multilang, 1, 1);
+								// Info
+								$htmltooltip = ''.$langs->trans("Name").': '.$module->name;
+								$htmltooltip .= '<br>'.$langs->trans("Type").': '.($module->type ? $module->type : $langs->trans("Unknown"));
+								if ($module->type == 'pdf')
+								{
+									$htmltooltip .= '<br>'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur;
+								}
+								$htmltooltip .= '<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
+								$htmltooltip .= '<br>'.$langs->trans("Logo").': '.yn($module->option_logo, 1, 1);
+								$htmltooltip .= '<br>'.$langs->trans("MultiLanguage").': '.yn($module->option_multilang, 1, 1);
 
 
-	                            print '<td class="center">';
-	                            print $form->textwithpicto('', $htmltooltip, 1, 0);
-	                            print '</td>';
+								print '<td class="center">';
+								print $form->textwithpicto('', $htmltooltip, 1, 0);
+								print '</td>';
 
-	                            // Preview
-	                            print '<td class="center">';
-	                            if ($module->type == 'pdf')
-	                            {
-	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'contract').'</a>';
-	                            } else {
-	                                print img_object($langs->trans("PreviewNotAvailable"), 'generic');
-	                            }
-	                            print '</td>';
+								// Preview
+								print '<td class="center">';
+								if ($module->type == 'pdf')
+								{
+									print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'contract').'</a>';
+								} else {
+									print img_object($langs->trans("PreviewNotAvailable"), 'generic');
+								}
+								print '</td>';
 
-	                            print "</tr>\n";
-	                        }
-                    	}
-                    }
-                }
-            }
-        }
-    }
+								print "</tr>\n";
+							}
+						}
+					}
+				}
+			}
+		}
+	}
 }
 
 print '</table>';
 print "<br>";
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // End of page
 llxFooter();
diff --git a/htdocs/admin/usergroup.php b/htdocs/admin/usergroup.php
index e9cdcaf09b6..dd12584b276 100644
--- a/htdocs/admin/usergroup.php
+++ b/htdocs/admin/usergroup.php
@@ -57,7 +57,7 @@ if ($action == 'set_default')
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0)
 	{
-        if ($conf->global->USERGROUP_ADDON_PDF_ODT == "$value") dolibarr_del_const($db, 'USERGROUP_ADDON_PDF_ODT', $conf->entity);
+		if ($conf->global->USERGROUP_ADDON_PDF_ODT == "$value") dolibarr_del_const($db, 'USERGROUP_ADDON_PDF_ODT', $conf->entity);
 	}
 	$res = true;
 }
@@ -81,24 +81,24 @@ elseif ($action == 'setdoc')
 	$res = true;
 } elseif (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);
+	}
 } elseif (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);
+	}
 }
 /*
  * View
@@ -157,110 +157,110 @@ clearstatcache();
 
 foreach ($dirmodels as $reldir)
 {
-    foreach (array('', '/doc') as $valdir)
-    {
-    	$dir = dol_buildpath($reldir."core/modules/usergroup".$valdir);
-        if (is_dir($dir))
-        {
-            $handle = opendir($dir);
-            if (is_resource($handle))
-            {
-                while (($file = readdir($handle)) !== false)
-                {
-                    $filelist[] = $file;
-                }
-                closedir($handle);
-                arsort($filelist);
+	foreach (array('', '/doc') as $valdir)
+	{
+		$dir = dol_buildpath($reldir."core/modules/usergroup".$valdir);
+		if (is_dir($dir))
+		{
+			$handle = opendir($dir);
+			if (is_resource($handle))
+			{
+				while (($file = readdir($handle)) !== false)
+				{
+					$filelist[] = $file;
+				}
+				closedir($handle);
+				arsort($filelist);
 
-                foreach ($filelist as $file)
-                {
-                    if (preg_match('/\.modules\.php$/i', $file) && preg_match('/^(pdf_|doc_)/', $file))
-                    {
-                    	if (file_exists($dir.'/'.$file))
-                    	{
-                    		$name = substr($file, 4, dol_strlen($file) - 16);
-	                        $classname = substr($file, 0, dol_strlen($file) - 12);
+				foreach ($filelist as $file)
+				{
+					if (preg_match('/\.modules\.php$/i', $file) && preg_match('/^(pdf_|doc_)/', $file))
+					{
+						if (file_exists($dir.'/'.$file))
+						{
+							$name = substr($file, 4, dol_strlen($file) - 16);
+							$classname = substr($file, 0, dol_strlen($file) - 12);
 
-	                        require_once $dir.'/'.$file;
-	                        $module = new $classname($db);
+							require_once $dir.'/'.$file;
+							$module = new $classname($db);
 
-	                        $modulequalified = 1;
-	                        if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) $modulequalified = 0;
-	                        if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) $modulequalified = 0;
+							$modulequalified = 1;
+							if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) $modulequalified = 0;
+							if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) $modulequalified = 0;
 
-	                        if ($modulequalified)
-	                        {
-	                            print '<tr class="oddeven"><td width="100">';
-	                            print (empty($module->name) ? $name : $module->name);
-	                            print "</td><td>\n";
-	                            if (method_exists($module, 'info')) print $module->info($langs);
-	                            else print $module->description;
-	                            print '</td>';
+							if ($modulequalified)
+							{
+								print '<tr class="oddeven"><td width="100">';
+								print (empty($module->name) ? $name : $module->name);
+								print "</td><td>\n";
+								if (method_exists($module, 'info')) print $module->info($langs);
+								else print $module->description;
+								print '</td>';
 
-	                            // Active
-	                            if (in_array($name, $def))
-	                            {
-	                            	print '<td class="center">'."\n";
-	                            	print '<a href="'.$_SERVER["PHP_SELF"].'?action=del_default&amp;token='.newToken().'&amp;value='.$name.'">';
-	                            	print img_picto($langs->trans("Enabled"), 'switch_on');
-	                            	print '</a>';
-	                            	print '</td>';
-	                            } else {
-	                                print '<td class="center">'."\n";
-	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=set_default&amp;token='.newToken().'&amp;value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
-	                                print "</td>";
-	                            }
+								// Active
+								if (in_array($name, $def))
+								{
+									print '<td class="center">'."\n";
+									print '<a href="'.$_SERVER["PHP_SELF"].'?action=del_default&amp;token='.newToken().'&amp;value='.$name.'">';
+									print img_picto($langs->trans("Enabled"), 'switch_on');
+									print '</a>';
+									print '</td>';
+								} else {
+									print '<td class="center">'."\n";
+									print '<a href="'.$_SERVER["PHP_SELF"].'?action=set_default&amp;token='.newToken().'&amp;value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+									print "</td>";
+								}
 
-	                            // Defaut
-	                            print '<td class="center">';
-	                            if ($conf->global->USERGROUP_ADDON_PDF == $name)
-	                            {
-	                                print img_picto($langs->trans("Default"), 'on');
-	                            } else {
-	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;token='.newToken().'&amp;value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
-	                            }
-	                            print '</td>';
+								// Defaut
+								print '<td class="center">';
+								if ($conf->global->USERGROUP_ADDON_PDF == $name)
+								{
+									print img_picto($langs->trans("Default"), 'on');
+								} else {
+									print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;token='.newToken().'&amp;value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+								}
+								print '</td>';
 
-	                            // Info
-		    					$htmltooltip = ''.$langs->trans("Name").': '.$module->name;
-					    		$htmltooltip .= '<br>'.$langs->trans("Type").': '.($module->type ? $module->type : $langs->trans("Unknown"));
-			                    if ($module->type == 'pdf')
-			                    {
-			                        $htmltooltip .= '<br>'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur;
-			                    }
-					    		$htmltooltip .= '<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
-					    		$htmltooltip .= '<br>'.$langs->trans("Logo").': '.yn($module->option_logo, 1, 1);
-					    		$htmltooltip .= '<br>'.$langs->trans("MultiLanguage").': '.yn($module->option_multilang, 1, 1);
+								// Info
+								$htmltooltip = ''.$langs->trans("Name").': '.$module->name;
+								$htmltooltip .= '<br>'.$langs->trans("Type").': '.($module->type ? $module->type : $langs->trans("Unknown"));
+								if ($module->type == 'pdf')
+								{
+									$htmltooltip .= '<br>'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur;
+								}
+								$htmltooltip .= '<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
+								$htmltooltip .= '<br>'.$langs->trans("Logo").': '.yn($module->option_logo, 1, 1);
+								$htmltooltip .= '<br>'.$langs->trans("MultiLanguage").': '.yn($module->option_multilang, 1, 1);
 
 
-	                            print '<td class="center">';
-	                            print $form->textwithpicto('', $htmltooltip, 1, 0);
-	                            print '</td>';
+								print '<td class="center">';
+								print $form->textwithpicto('', $htmltooltip, 1, 0);
+								print '</td>';
 
-	                            // Preview
-	                            print '<td class="center">';
-	                            if ($module->type == 'pdf')
-	                            {
-	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'contract').'</a>';
-	                            } else {
-	                                print img_object($langs->trans("PreviewNotAvailable"), 'generic');
-	                            }
-	                            print '</td>';
+								// Preview
+								print '<td class="center">';
+								if ($module->type == 'pdf')
+								{
+									print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'contract').'</a>';
+								} else {
+									print img_object($langs->trans("PreviewNotAvailable"), 'generic');
+								}
+								print '</td>';
 
-	                            print "</tr>\n";
-	                        }
-                    	}
-                    }
-                }
-            }
-        }
-    }
+								print "</tr>\n";
+							}
+						}
+					}
+				}
+			}
+		}
+	}
 }
 
 print '</table>';
 print "<br>";
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // End of page
 llxFooter();
diff --git a/htdocs/admin/website.php b/htdocs/admin/website.php
index 01ef915d137..208caf85666 100644
--- a/htdocs/admin/website.php
+++ b/htdocs/admin/website.php
@@ -621,7 +621,7 @@ if ($id)
 	}
 }
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // End of page
 llxFooter();
diff --git a/htdocs/admin/website_options.php b/htdocs/admin/website_options.php
index 479bbdbe7b9..738fd5bc998 100644
--- a/htdocs/admin/website_options.php
+++ b/htdocs/admin/website_options.php
@@ -140,7 +140,7 @@ if ($action == 'edit')
 }
 
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // End of page
 llxFooter();
diff --git a/htdocs/admin/workflow.php b/htdocs/admin/workflow.php
index a8bcbcf8172..6bd3edca2b8 100644
--- a/htdocs/admin/workflow.php
+++ b/htdocs/admin/workflow.php
@@ -139,7 +139,7 @@ if (!empty($conf->modules_parts['workflow']) && is_array($conf->modules_parts['w
 }
 
 // remove not available workflows (based on activated modules and global defined keys)
-$workflowcodes  = array_filter($workflowcodes, function ($var) {
+$workflowcodes = array_filter($workflowcodes, function ($var) {
 	return $var['enabled']; });
 
 /*
diff --git a/htdocs/api/admin/explorer.php b/htdocs/api/admin/explorer.php
index 22263b8b9ba..835a5485544 100644
--- a/htdocs/api/admin/explorer.php
+++ b/htdocs/api/admin/explorer.php
@@ -43,10 +43,10 @@ $langs->load("admin");
 // Enable and test if module Api is enabled
 if (empty($conf->global->MAIN_MODULE_API))
 {
-    dol_syslog("Call Dolibarr API interfaces with module REST disabled");
-    print $langs->trans("WarningModuleNotActive", 'Api').'.<br><br>';
-    print $langs->trans("ToActivateModule");
-    exit;
+	dol_syslog("Call Dolibarr API interfaces with module REST disabled");
+	print $langs->trans("WarningModuleNotActive", 'Api').'.<br><br>';
+	print $langs->trans("ToActivateModule");
+	exit;
 }
 
 
@@ -61,45 +61,45 @@ $listofapis = array();
 $modulesdir = dolGetModulesDirs();
 foreach ($modulesdir as $dir)
 {
-    /*
+	/*
      * Search available module
      */
-    //dol_syslog("Scan directory ".$dir." for API modules");
+	//dol_syslog("Scan directory ".$dir." for API modules");
 
-    $handle = @opendir(dol_osencode($dir));
-    if (is_resource($handle))
-    {
-        while (($file = readdir($handle)) !== false)
-        {
-            if (is_readable($dir.$file) && preg_match("/^(mod.*)\.class\.php$/i", $file, $reg))
-            {
-                $modulename = $reg[1];
+	$handle = @opendir(dol_osencode($dir));
+	if (is_resource($handle))
+	{
+		while (($file = readdir($handle)) !== false)
+		{
+			if (is_readable($dir.$file) && preg_match("/^(mod.*)\.class\.php$/i", $file, $reg))
+			{
+				$modulename = $reg[1];
 
-                // Defined if module is enabled
-                $enabled = true;
-                $module = $part = $obj = strtolower(preg_replace('/^mod/i', '', $modulename));
-                //if ($part == 'propale') $part='propal';
-                if ($module == 'societe') {
+				// Defined if module is enabled
+				$enabled = true;
+				$module = $part = $obj = strtolower(preg_replace('/^mod/i', '', $modulename));
+				//if ($part == 'propale') $part='propal';
+				if ($module == 'societe') {
 					$obj = 'thirdparty';
 				}
-                if ($module == 'categorie') {
-                    $part = 'categories';
+				if ($module == 'categorie') {
+					$part = 'categories';
 					$obj = 'category';
 				}
-                if ($module == 'facture') {
-                    $part = 'compta/facture';
+				if ($module == 'facture') {
+					$part = 'compta/facture';
 					$obj = 'facture';
 				}
-                if ($module == 'ficheinter') {
-                    $obj = 'fichinter';
-                    $part = 'fichinter';
-                    $module = 'fichinter';
-                }
+				if ($module == 'ficheinter') {
+					$obj = 'fichinter';
+					$part = 'fichinter';
+					$module = 'fichinter';
+				}
 
-                if (empty($conf->$module->enabled)) $enabled = false;
+				if (empty($conf->$module->enabled)) $enabled = false;
 
-                if ($enabled) {
-                    /*
+				if ($enabled) {
+					/*
                      * If exists, load the API class for enable module
                      *
                      * Search files named api_<object>.class.php into /htdocs/<module>/class directory
@@ -107,25 +107,25 @@ foreach ($modulesdir as $dir)
                      * @todo : take care of externals module!
                      * @todo : use getElementProperties() function ?
                      */
-                    $dir_part = DOL_DOCUMENT_ROOT.'/'.$part.'/class/';
+					$dir_part = DOL_DOCUMENT_ROOT.'/'.$part.'/class/';
 
-                    $handle_part = @opendir(dol_osencode($dir_part));
-                    if (is_resource($handle_part))
-                    {
-                        while (($file_searched = readdir($handle_part)) !== false)
-                        {
-                            if (is_readable($dir_part.$file_searched) && preg_match("/^api_(.*)\.class\.php$/i", $file_searched, $reg))
-                            {
-                                $classname = ucwords($reg[1]);
-                                require_once $dir_part.$file_searched;
-                                if (class_exists($classname))
-                                {
-                                    dol_syslog("Found API classname=".$classname." into ".$dir);
-                                    $listofapis[] = $classname;
-                                }
-                            }
+					$handle_part = @opendir(dol_osencode($dir_part));
+					if (is_resource($handle_part))
+					{
+						while (($file_searched = readdir($handle_part)) !== false)
+						{
+							if (is_readable($dir_part.$file_searched) && preg_match("/^api_(.*)\.class\.php$/i", $file_searched, $reg))
+							{
+								$classname = ucwords($reg[1]);
+								require_once $dir_part.$file_searched;
+								if (class_exists($classname))
+								{
+									dol_syslog("Found API classname=".$classname." into ".$dir);
+									$listofapis[] = $classname;
+								}
+							}
 
-                            /*
+							/*
                             if (is_readable($dir_part.$file_searched) && preg_match("/^(api_.*)\.class\.php$/i",$file_searched,$reg))
                             {
                                 $classname=$reg[1];
@@ -150,12 +150,12 @@ foreach ($modulesdir as $dir)
                                 //     //$listofapis[]=array('classname'=>$classname, 'fullpath'=>$file_searched);
                                 // }
                             }*/
-                        }
-                    }
-                }
-            }
-        }
-    }
+						}
+					}
+				}
+			}
+		}
+	}
 }
 
 //var_dump($listofapis);
@@ -188,28 +188,28 @@ $oldclass = '';
 print $langs->trans("ListOfAvailableAPIs").':<br>';
 foreach ($listofapis['v1'] as $key => $val)
 {
-    if ($key == 'login') continue;
-    if ($key == 'index') continue;
+	if ($key == 'login') continue;
+	if ($key == 'index') continue;
 
-    if ($key)
-    {
-        foreach ($val as $method => $val2)
-        {
-            $newclass = $val2['className'];
+	if ($key)
+	{
+		foreach ($val as $method => $val2)
+		{
+			$newclass = $val2['className'];
 
-            if (preg_match('/restler/i', $newclass)) continue;
+			if (preg_match('/restler/i', $newclass)) continue;
 
-            if ($oldclass != $newclass)
-            {
-                print "\n<br>\n".$langs->trans("Class").': '.$newclass.'<br>'."\n";
-                $oldclass = $newclass;
-            }
-            //print $key.' - '.$val['classname'].' - '.$val['fullpath']." - ".DOL_MAIN_URL_ROOT.'/api/index.php/'.strtolower(preg_replace('/Api$/','',$val['classname']))."/xxx<br>\n";
-            $url = $urlwithroot.'/api/index.php/'.$key;
-            $url .= '?api_key=token';
-            print img_picto('', 'globe').' '.$method.' <a href="'.$url.'" target="_blank">'.$url."</a><br>\n";
-        }
-    }
+			if ($oldclass != $newclass)
+			{
+				print "\n<br>\n".$langs->trans("Class").': '.$newclass.'<br>'."\n";
+				$oldclass = $newclass;
+			}
+			//print $key.' - '.$val['classname'].' - '.$val['fullpath']." - ".DOL_MAIN_URL_ROOT.'/api/index.php/'.strtolower(preg_replace('/Api$/','',$val['classname']))."/xxx<br>\n";
+			$url = $urlwithroot.'/api/index.php/'.$key;
+			$url .= '?api_key=token';
+			print img_picto('', 'globe').' '.$method.' <a href="'.$url.'" target="_blank">'.$url."</a><br>\n";
+		}
+	}
 }
 
 print '<br>';
diff --git a/htdocs/api/admin/index.php b/htdocs/api/admin/index.php
index a7eab61211d..18cbff2ca61 100644
--- a/htdocs/api/admin/index.php
+++ b/htdocs/api/admin/index.php
@@ -64,11 +64,11 @@ if ($action == 'setproductionmode')
 			}
 		}
 
-	    if (!$error)
-	    {
-    		header("Location: ".$_SERVER["PHP_SELF"]);
-	   	    exit;
-	    }
+		if (!$error)
+		{
+			header("Location: ".$_SERVER["PHP_SELF"]);
+	   		exit;
+		}
 	} else {
 		dol_print_error($db);
 	}
@@ -112,13 +112,13 @@ print '<td>'.$langs->trans("ApiProductionMode").'</td>';
 $production_mode = (empty($conf->global->API_PRODUCTION_MODE) ?false:true);
 if ($production_mode)
 {
-    print '<td><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setproductionmode&token='.newToken().'&value='.($i + 1).'&status=0">';
-    print img_picto($langs->trans("Activated"), 'switch_on');
-    print '</a></td>';
+	print '<td><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setproductionmode&token='.newToken().'&value='.($i + 1).'&status=0">';
+	print img_picto($langs->trans("Activated"), 'switch_on');
+	print '</a></td>';
 } else {
-    print '<td><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setproductionmode&token='.newToken().'&value='.($i + 1).'&status=1">';
-    print img_picto($langs->trans("Disabled"), 'switch_off');
-    print '</a></td>';
+	print '<td><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setproductionmode&token='.newToken().'&value='.($i + 1).'&status=1">';
+	print img_picto($langs->trans("Disabled"), 'switch_off');
+	print '</a></td>';
 }
 print '<td>&nbsp;</td>';
 print '</tr>';
@@ -157,10 +157,10 @@ print '<br>';
 print '<u>'.$langs->trans("ApiExporerIs").':</u><br>';
 if (dol_is_dir(DOL_DOCUMENT_ROOT.'/includes/restler/framework/Luracast/Restler/explorer'))
 {
-    $url = DOL_MAIN_URL_ROOT.'/api/index.php/explorer';
-    print img_picto('', 'globe').' <a href="'.$url.'" target="_blank">'.$url."</a><br>\n";
+	$url = DOL_MAIN_URL_ROOT.'/api/index.php/explorer';
+	print img_picto('', 'globe').' <a href="'.$url.'" target="_blank">'.$url."</a><br>\n";
 } else {
-    print $langs->trans("NotAvailableWithThisDistribution");
+	print $langs->trans("NotAvailableWithThisDistribution");
 }
 
 llxFooter();
diff --git a/htdocs/api/class/api.class.php b/htdocs/api/class/api.class.php
index 554edbb892e..5834324fa2b 100644
--- a/htdocs/api/class/api.class.php
+++ b/htdocs/api/class/api.class.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2015   Jean-François Ferry     <jfefe@aternatik.fr>
  * Copyright (C) 2016	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2020		Frédéric France		<frederic.france@netlogic.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -29,54 +30,54 @@ require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
 class DolibarrApi
 {
 
-    /**
-     * @var DoliDb        $db Database object
-     */
-    protected $db;
+	/**
+	 * @var DoliDb        $db Database object
+	 */
+	protected $db;
 
-    /**
-     * @var Restler     $r	Restler object
-     */
-    public $r;
+	/**
+	 * @var Restler     $r	Restler object
+	 */
+	public $r;
 
-    /**
-     * Constructor
-     *
-     * @param	DoliDb	$db		        Database handler
-     * @param   string  $cachedir       Cache dir
-     * @param   boolean $refreshCache   Update cache
-     */
-    public function __construct($db, $cachedir = '', $refreshCache = false)
-    {
-        global $conf, $dolibarr_main_url_root;
+	/**
+	 * Constructor
+	 *
+	 * @param	DoliDb	$db		        Database handler
+	 * @param   string  $cachedir       Cache dir
+	 * @param   boolean $refreshCache   Update cache
+	 */
+	public function __construct($db, $cachedir = '', $refreshCache = false)
+	{
+		global $conf, $dolibarr_main_url_root;
 
-        if (empty($cachedir)) $cachedir = $conf->api->dir_temp;
-        Defaults::$cacheDirectory = $cachedir;
+		if (empty($cachedir)) $cachedir = $conf->api->dir_temp;
+		Defaults::$cacheDirectory = $cachedir;
 
-        $this->db = $db;
-        $production_mode = (empty($conf->global->API_PRODUCTION_MODE) ? false : true);
-        $this->r = new Restler($production_mode, $refreshCache);
+		$this->db = $db;
+		$production_mode = (empty($conf->global->API_PRODUCTION_MODE) ? false : true);
+		$this->r = new Restler($production_mode, $refreshCache);
 
-        $urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
-        $urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file
+		$urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
+		$urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file
 
-        $urlwithouturlrootautodetect = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim(DOL_MAIN_URL_ROOT));
-        $urlwithrootautodetect = $urlwithouturlroot.DOL_URL_ROOT; // This is to use local domain autodetected by dolibarr from url
+		$urlwithouturlrootautodetect = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim(DOL_MAIN_URL_ROOT));
+		$urlwithrootautodetect = $urlwithouturlroot.DOL_URL_ROOT; // This is to use local domain autodetected by dolibarr from url
 
-        $this->r->setBaseUrls($urlwithouturlroot, $urlwithouturlrootautodetect);
-        $this->r->setAPIVersion(1);
-        //$this->r->setSupportedFormats('json');
-        //$this->r->setSupportedFormats('jsonFormat');
-    }
+		$this->r->setBaseUrls($urlwithouturlroot, $urlwithouturlrootautodetect);
+		$this->r->setAPIVersion(1);
+		//$this->r->setSupportedFormats('json');
+		//$this->r->setSupportedFormats('jsonFormat');
+	}
 
-    /**
-     * Executed method when API is called without parameter
-     *
-     * Display a short message an return a http code 200
-     *
-     * @return array
-     */
-    /* Disabled, most APIs does not share same signature for method index
+	/**
+	 * Executed method when API is called without parameter
+	 *
+	 * Display a short message an return a http code 200
+	 *
+	 * @return array
+	 */
+	/* Disabled, most APIs does not share same signature for method index
     function index()
     {
         return array(
@@ -87,148 +88,148 @@ class DolibarrApi
         );
     }*/
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
-    /**
-     * Clean sensible object datas
-     *
-     * @param   object  $object	Object to clean
-     * @return	array	Array of cleaned object properties
-     */
-    protected function _cleanObjectDatas($object)
-    {
-        // phpcs:enable
-        // Remove $db object property for object
-        unset($object->db);
-        unset($object->isextrafieldmanaged);
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	/**
+	 * Clean sensible object datas
+	 *
+	 * @param   Object  $object	Object to clean
+	 * @return	Object			Object with cleaned properties
+	 */
+	protected function _cleanObjectDatas($object)
+	{
+		// phpcs:enable
+		// Remove $db object property for object
+		unset($object->db);
+		unset($object->isextrafieldmanaged);
 		unset($object->ismultientitymanaged);
 		unset($object->restrictiononfksoc);
 		unset($object->table_rowid);
 
-        // Remove linkedObjects. We should already have linkedObjectIds that avoid huge responses
-        unset($object->linkedObjects);
+		// Remove linkedObjects. We should already have linkedObjectsIds that avoid huge responses
+		unset($object->linkedObjects);
 
-        unset($object->fields);
-        unset($object->oldline);
+		unset($object->fields);
+		unset($object->oldline);
 
-        unset($object->error);
-        unset($object->errors);
+		unset($object->error);
+		unset($object->errors);
 
-        unset($object->ref_previous);
-        unset($object->ref_next);
-        unset($object->ref_int);
+		unset($object->ref_previous);
+		unset($object->ref_next);
+		unset($object->ref_int);
 
-        unset($object->projet); // Should be fk_project
-        unset($object->project); // Should be fk_project
-        unset($object->author); // Should be fk_user_author
-        unset($object->timespent_old_duration);
-        unset($object->timespent_id);
-        unset($object->timespent_duration);
-        unset($object->timespent_date);
-        unset($object->timespent_datehour);
-        unset($object->timespent_withhour);
-        unset($object->timespent_fk_user);
-        unset($object->timespent_note);
-        unset($object->fk_delivery_address);
+		unset($object->projet); // Should be fk_project
+		unset($object->project); // Should be fk_project
+		unset($object->author); // Should be fk_user_author
+		unset($object->timespent_old_duration);
+		unset($object->timespent_id);
+		unset($object->timespent_duration);
+		unset($object->timespent_date);
+		unset($object->timespent_datehour);
+		unset($object->timespent_withhour);
+		unset($object->timespent_fk_user);
+		unset($object->timespent_note);
+		unset($object->fk_delivery_address);
 
-        unset($object->statuts);
-        unset($object->statuts_short);
-        unset($object->statuts_logo);
-        unset($object->statuts_long);
-        unset($object->labelStatus);
-        unset($object->labelStatusShort);
+		unset($object->statuts);
+		unset($object->statuts_short);
+		unset($object->statuts_logo);
+		unset($object->statuts_long);
+		unset($object->labelStatus);
+		unset($object->labelStatusShort);
 
-        unset($object->stats_propale);
-      	unset($object->stats_commande);
-        unset($object->stats_contrat);
-        unset($object->stats_facture);
-        unset($object->stats_commande_fournisseur);
-        unset($object->stats_reception);
-        unset($object->stats_mrptoconsume);
-        unset($object->stats_mrptoproduce);
+		unset($object->stats_propale);
+	  	unset($object->stats_commande);
+		unset($object->stats_contrat);
+		unset($object->stats_facture);
+		unset($object->stats_commande_fournisseur);
+		unset($object->stats_reception);
+		unset($object->stats_mrptoconsume);
+		unset($object->stats_mrptoproduce);
 
-        unset($object->element);
-        unset($object->fk_element);
-        unset($object->table_element);
-        unset($object->table_element_line);
-        unset($object->class_element_line);
-        unset($object->picto);
+		unset($object->element);
+		unset($object->fk_element);
+		unset($object->table_element);
+		unset($object->table_element_line);
+		unset($object->class_element_line);
+		unset($object->picto);
 
-        unset($object->fieldsforcombobox);
+		unset($object->fieldsforcombobox);
 
-        unset($object->skip_update_total);
-        unset($object->context);
-        unset($object->next_prev_filter);
+		unset($object->skip_update_total);
+		unset($object->context);
+		unset($object->next_prev_filter);
 
-        unset($object->region);
-        unset($object->region_code);
+		unset($object->region);
+		unset($object->region_code);
 
-        unset($object->libelle_statut);
-        unset($object->libelle_paiement);
+		unset($object->libelle_statut);
+		unset($object->libelle_paiement);
 
-        if ($object->table_element != 'ticket') {
-        	unset($object->comments);
-        }
+		if ($object->table_element != 'ticket') {
+			unset($object->comments);
+		}
 
-        // Remove the $oldcopy property because it is not supported by the JSON
-        // encoder. The following error is generated when trying to serialize
-        // it: "Error encoding/decoding JSON: Type is not supported"
-        // Note: Event if this property was correctly handled by the JSON
-        // encoder, it should be ignored because keeping it would let the API
-        // have a very strange behavior: calling PUT and then GET on the same
-        // resource would give different results:
-        // PUT /objects/{id} -> returns object with oldcopy = previous version of the object
-        // GET /objects/{id} -> returns object with oldcopy empty
-        unset($object->oldcopy);
+		// Remove the $oldcopy property because it is not supported by the JSON
+		// encoder. The following error is generated when trying to serialize
+		// it: "Error encoding/decoding JSON: Type is not supported"
+		// Note: Event if this property was correctly handled by the JSON
+		// encoder, it should be ignored because keeping it would let the API
+		// have a very strange behavior: calling PUT and then GET on the same
+		// resource would give different results:
+		// PUT /objects/{id} -> returns object with oldcopy = previous version of the object
+		// GET /objects/{id} -> returns object with oldcopy empty
+		unset($object->oldcopy);
 
-        // If object has lines, remove $db property
-        if (isset($object->lines) && is_array($object->lines) && count($object->lines) > 0) {
-            $nboflines = count($object->lines);
-        	for ($i = 0; $i < $nboflines; $i++)
-            {
-                $this->_cleanObjectDatas($object->lines[$i]);
+		// If object has lines, remove $db property
+		if (isset($object->lines) && is_array($object->lines) && count($object->lines) > 0) {
+			$nboflines = count($object->lines);
+			for ($i = 0; $i < $nboflines; $i++)
+			{
+				$this->_cleanObjectDatas($object->lines[$i]);
 
-                unset($object->lines[$i]->contact);
-                unset($object->lines[$i]->contact_id);
-                unset($object->lines[$i]->country);
-                unset($object->lines[$i]->country_id);
-                unset($object->lines[$i]->country_code);
-                unset($object->lines[$i]->mode_reglement_id);
-                unset($object->lines[$i]->mode_reglement_code);
-                unset($object->lines[$i]->mode_reglement);
-                unset($object->lines[$i]->cond_reglement_id);
-                unset($object->lines[$i]->cond_reglement_code);
-                unset($object->lines[$i]->cond_reglement);
-                unset($object->lines[$i]->fk_delivery_address);
-                unset($object->lines[$i]->fk_projet);
-                unset($object->lines[$i]->fk_project);
-                unset($object->lines[$i]->thirdparty);
-                unset($object->lines[$i]->user);
-                unset($object->lines[$i]->model_pdf);
-                unset($object->lines[$i]->modelpdf);
-                unset($object->lines[$i]->note_public);
-                unset($object->lines[$i]->note_private);
-                unset($object->lines[$i]->fk_incoterms);
-                unset($object->lines[$i]->label_incoterms);
-                unset($object->lines[$i]->location_incoterms);
-                unset($object->lines[$i]->name);
-                unset($object->lines[$i]->lastname);
-                unset($object->lines[$i]->firstname);
-                unset($object->lines[$i]->civility_id);
-                unset($object->lines[$i]->fk_multicurrency);
-                unset($object->lines[$i]->multicurrency_code);
-                unset($object->lines[$i]->shipping_method_id);
-            }
-        }
+				unset($object->lines[$i]->contact);
+				unset($object->lines[$i]->contact_id);
+				unset($object->lines[$i]->country);
+				unset($object->lines[$i]->country_id);
+				unset($object->lines[$i]->country_code);
+				unset($object->lines[$i]->mode_reglement_id);
+				unset($object->lines[$i]->mode_reglement_code);
+				unset($object->lines[$i]->mode_reglement);
+				unset($object->lines[$i]->cond_reglement_id);
+				unset($object->lines[$i]->cond_reglement_code);
+				unset($object->lines[$i]->cond_reglement);
+				unset($object->lines[$i]->fk_delivery_address);
+				unset($object->lines[$i]->fk_projet);
+				unset($object->lines[$i]->fk_project);
+				unset($object->lines[$i]->thirdparty);
+				unset($object->lines[$i]->user);
+				unset($object->lines[$i]->model_pdf);
+				unset($object->lines[$i]->modelpdf);
+				unset($object->lines[$i]->note_public);
+				unset($object->lines[$i]->note_private);
+				unset($object->lines[$i]->fk_incoterms);
+				unset($object->lines[$i]->label_incoterms);
+				unset($object->lines[$i]->location_incoterms);
+				unset($object->lines[$i]->name);
+				unset($object->lines[$i]->lastname);
+				unset($object->lines[$i]->firstname);
+				unset($object->lines[$i]->civility_id);
+				unset($object->lines[$i]->fk_multicurrency);
+				unset($object->lines[$i]->multicurrency_code);
+				unset($object->lines[$i]->shipping_method_id);
+			}
+		}
 
-        if (!empty($object->thirdparty) && is_object($object->thirdparty))
-        {
-        	$this->_cleanObjectDatas($object->thirdparty);
-        }
+		if (!empty($object->thirdparty) && is_object($object->thirdparty))
+		{
+			$this->_cleanObjectDatas($object->thirdparty);
+		}
 
 		return $object;
-    }
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 * Check user access to a resource
 	 *
@@ -240,12 +241,12 @@ class DolibarrApi
 	 * @param string	$feature2		Feature to check, second level of permission (optional). Can be or check with 'level1|level2'.
 	 * @param string	$dbt_keyfield   Field name for socid foreign key if not fk_soc. Not used if objectid is null (optional)
 	 * @param string	$dbt_select     Field name for select if not rowid. Not used if objectid is null (optional)
-     * @return bool
+	 * @return bool
 	 * @throws RestException
 	 */
-    protected static function _checkAccessToResource($resource, $resource_id = 0, $dbtablename = '', $feature2 = '', $dbt_keyfield = 'fk_soc', $dbt_select = 'rowid')
-    {
-        // phpcs:enable
+	protected static function _checkAccessToResource($resource, $resource_id = 0, $dbtablename = '', $feature2 = '', $dbt_keyfield = 'fk_soc', $dbt_select = 'rowid')
+	{
+		// phpcs:enable
 		// Features/modules to check
 		$featuresarray = array($resource);
 		if (preg_match('/&/', $resource)) {
@@ -260,9 +261,9 @@ class DolibarrApi
 		}
 
 		return checkUserAccessToObject(DolibarrApiAccess::$user, $featuresarray, $resource_id, $dbtablename, $feature2, $dbt_keyfield, $dbt_select);
-    }
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 * Return if a $sqlfilters parameter is valid
 	 *
@@ -271,30 +272,30 @@ class DolibarrApi
 	 */
 	protected function _checkFilters($sqlfilters)
 	{
-        // phpcs:enable
-	    //$regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-	    //$tmp=preg_replace_all('/'.$regexstring.'/', '', $sqlfilters);
-	    $tmp = $sqlfilters;
-	    $ok = 0;
-	    $i = 0; $nb = strlen($tmp);
-	    $counter = 0;
-	    while ($i < $nb)
-	    {
-	        if ($tmp[$i] == '(') $counter++;
-	        if ($tmp[$i] == ')') $counter--;
-            if ($counter < 0)
-            {
-	            $error = "Bad sqlfilters=".$sqlfilters;
-	            dol_syslog($error, LOG_WARNING);
-	            return false;
-            }
-            $i++;
-	    }
-	    return true;
+		// phpcs:enable
+		//$regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+		//$tmp=preg_replace_all('/'.$regexstring.'/', '', $sqlfilters);
+		$tmp = $sqlfilters;
+		$ok = 0;
+		$i = 0; $nb = strlen($tmp);
+		$counter = 0;
+		while ($i < $nb)
+		{
+			if ($tmp[$i] == '(') $counter++;
+			if ($tmp[$i] == ')') $counter--;
+			if ($counter < 0)
+			{
+				$error = "Bad sqlfilters=".$sqlfilters;
+				dol_syslog($error, LOG_WARNING);
+				return false;
+			}
+			$i++;
+		}
+		return true;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 * Function to forge a SQL criteria
 	 *
@@ -303,22 +304,22 @@ class DolibarrApi
 	 */
 	protected static function _forge_criteria_callback($matches)
 	{
-        // phpcs:enable
-	    global $db;
+		// phpcs:enable
+		global $db;
 
-	    //dol_syslog("Convert matches ".$matches[1]);
-	    if (empty($matches[1])) return '';
-	    $tmp = explode(':', $matches[1]);
-        if (count($tmp) < 3) return '';
+		//dol_syslog("Convert matches ".$matches[1]);
+		if (empty($matches[1])) return '';
+		$tmp = explode(':', $matches[1]);
+		if (count($tmp) < 3) return '';
 
-	    $tmpescaped = $tmp[2];
-	    $regbis = array();
-	    if (preg_match('/^\'(.*)\'$/', $tmpescaped, $regbis))
-	    {
-	        $tmpescaped = "'".$db->escape($regbis[1])."'";
-	    } else {
-	        $tmpescaped = $db->escape($tmpescaped);
-	    }
-	    return $db->escape($tmp[0]).' '.strtoupper($db->escape($tmp[1]))." ".$tmpescaped;
+		$tmpescaped = $tmp[2];
+		$regbis = array();
+		if (preg_match('/^\'(.*)\'$/', $tmpescaped, $regbis))
+		{
+			$tmpescaped = "'".$db->escape($regbis[1])."'";
+		} else {
+			$tmpescaped = $db->escape($tmpescaped);
+		}
+		return $db->escape($tmp[0]).' '.strtoupper($db->escape($tmp[1]))." ".$tmpescaped;
 	}
 }
diff --git a/htdocs/api/class/api_access.class.php b/htdocs/api/class/api_access.class.php
index 84f7bf303e7..e7b8ac8536b 100644
--- a/htdocs/api/class/api_access.class.php
+++ b/htdocs/api/class/api_access.class.php
@@ -52,7 +52,7 @@ class DolibarrApiAccess implements iAuthenticate
 	/**
 	 * @var string $role		user role
 	 */
-    public static $role = 'user';
+	public static $role = 'user';
 
 	/**
 	 * @var User		$user	Loggued user
@@ -69,7 +69,7 @@ class DolibarrApiAccess implements iAuthenticate
 		$this->db = $db;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName
 	/**
 	 * Check access
 	 *
@@ -80,7 +80,7 @@ class DolibarrApiAccess implements iAuthenticate
 	 */
 	public function __isAllowed()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $db;
 
 		$login = '';
@@ -97,17 +97,17 @@ class DolibarrApiAccess implements iAuthenticate
 		$api_key = '';
 		if (isset($_GET['api_key']))	// For backward compatibility
 		{
-		    // TODO Add option to disable use of api key on url. Return errors if used.
-		    $api_key = $_GET['api_key'];
+			// TODO Add option to disable use of api key on url. Return errors if used.
+			$api_key = $_GET['api_key'];
 		}
 		if (isset($_GET['DOLAPIKEY']))
 		{
-		    // TODO Add option to disable use of api key on url. Return errors if used.
-		    $api_key = $_GET['DOLAPIKEY']; // With GET method
+			// TODO Add option to disable use of api key on url. Return errors if used.
+			$api_key = $_GET['DOLAPIKEY']; // With GET method
 		}
 		if (isset($_SERVER['HTTP_DOLAPIKEY']))         // Param DOLAPIKEY in header can be read with HTTP_DOLAPIKEY
 		{
-		    $api_key = $_SERVER['HTTP_DOLAPIKEY']; // With header method (recommanded)
+			$api_key = $_SERVER['HTTP_DOLAPIKEY']; // With header method (recommanded)
 		}
 
 		if ($api_key)
@@ -149,7 +149,7 @@ class DolibarrApiAccess implements iAuthenticate
 
 			if (!$login)
 			{
-			    throw new RestException(503, 'Error when searching login user from api key');
+				throw new RestException(503, 'Error when searching login user from api key');
 			}
 			$fuser = new User($this->db);
 			$result = $fuser->fetch('', $login, '', 0, (empty($userentity) ? -1 : $conf->entity)); // If user is not entity 0, we search in working entity $conf->entity  (that may have been forced to a different value than user entity)
@@ -161,49 +161,49 @@ class DolibarrApiAccess implements iAuthenticate
 
 			if ($fuser->socid) {
 				static::$role = 'external';
-            }
+			}
 
 			if ($fuser->admin) {
 				static::$role = 'admin';
-            }
-        } else {
-		    throw new RestException(401, "Failed to login to API. No parameter 'HTTP_DOLAPIKEY' on HTTP header (and no parameter DOLAPIKEY in URL).");
+			}
+		} else {
+			throw new RestException(401, "Failed to login to API. No parameter 'HTTP_DOLAPIKEY' on HTTP header (and no parameter DOLAPIKEY in URL).");
 		}
 
-	    $userClass::setCacheIdentifier(static::$role);
-	    Resources::$accessControlFunction = 'DolibarrApiAccess::verifyAccess';
-	    $requirefortest = static::$requires;
-	    if (!is_array($requirefortest)) $requirefortest = explode(',', $requirefortest);
-	    return in_array(static::$role, (array) $requirefortest) || static::$role == 'admin';
+		$userClass::setCacheIdentifier(static::$role);
+		Resources::$accessControlFunction = 'DolibarrApiAccess::verifyAccess';
+		$requirefortest = static::$requires;
+		if (!is_array($requirefortest)) $requirefortest = explode(',', $requirefortest);
+		return in_array(static::$role, (array) $requirefortest) || static::$role == 'admin';
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName
 	/**
 	 * @return string string to be used with WWW-Authenticate header
 	 */
-    public function __getWWWAuthenticateString()
-    {
-        // phpcs:enable
-        return '';
-    }
+	public function __getWWWAuthenticateString()
+	{
+		// phpcs:enable
+		return '';
+	}
 
-    /**
-     * Verify access
-     *
-     * @param   array $m Properties of method
-     *
-     * @access private
-     * @return bool
-     */
-    public static function verifyAccess(array $m)
-    {
-        $requires = isset($m['class']['DolibarrApiAccess']['properties']['requires'])
-                ? $m['class']['DolibarrApiAccess']['properties']['requires']
-                : false;
+	/**
+	 * Verify access
+	 *
+	 * @param   array $m Properties of method
+	 *
+	 * @access private
+	 * @return bool
+	 */
+	public static function verifyAccess(array $m)
+	{
+		$requires = isset($m['class']['DolibarrApiAccess']['properties']['requires'])
+				? $m['class']['DolibarrApiAccess']['properties']['requires']
+				: false;
 
 
-        return $requires
-            ? static::$role == 'admin' || in_array(static::$role, (array) $requires)
-            : true;
-    }
+		return $requires
+			? static::$role == 'admin' || in_array(static::$role, (array) $requires)
+			: true;
+	}
 }
diff --git a/htdocs/api/class/api_documents.class.php b/htdocs/api/class/api_documents.class.php
index 9605f46f219..5fff08b80ab 100644
--- a/htdocs/api/class/api_documents.class.php
+++ b/htdocs/api/class/api_documents.class.php
@@ -409,7 +409,7 @@ class Documents extends DolibarrApi
 
 			$upload_dir = $conf->fournisseur->dir_output."/facture/".get_exdir($object->id, 2, 0, 0, $object, 'invoice_supplier').dol_sanitizeFileName($object->ref);
 		}
-        elseif ($modulepart == 'produit' || $modulepart == 'product')
+		elseif ($modulepart == 'produit' || $modulepart == 'product')
 		{
 			require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 
@@ -419,9 +419,9 @@ class Documents extends DolibarrApi
 
 			$object = new Product($this->db);
 			$result = $object->fetch($id, $ref);
-			if ($result==0) {
+			if ($result == 0) {
 				throw new RestException(404, 'Product not found');
-			} elseif ($result<0) {
+			} elseif ($result < 0) {
 				throw new RestException(500, 'Error while fetching object: '.$object->error);
 			}
 
@@ -474,15 +474,13 @@ class Documents extends DolibarrApi
 			}
 
 			$upload_dir = $conf->categorie->multidir_output[$object->entity].'/'.get_exdir($object->id, 2, 0, 0, $object, 'category').$object->id."/photos/".dol_sanitizeFileName($object->ref);
-		}
-		else
-		{
+		} else {
 			throw new RestException(500, 'Modulepart '.$modulepart.' not implemented yet.');
 		}
 
 		$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
 		if (empty($filearray)) {
-			throw new RestException(404, 'Search for modulepart '.$modulepart.' with Id '.$object->id.(!empty($object->Ref) ? ' or Ref '.$object->ref : '').' does not return any document.');
+			throw new RestException(404, 'Search for modulepart '.$modulepart.' with Id '.$object->id.(!empty($object->ref) ? ' or Ref '.$object->ref : '').' does not return any document.');
 		}
 
 		return $filearray;
@@ -517,7 +515,7 @@ class Documents extends DolibarrApi
 	 * @param   string  $filecontent        File content (string with file content. An empty file will be created if this parameter is not provided)
 	 * @param   string  $fileencoding       File encoding (''=no encoding, 'base64'=Base 64)
 	 * @param   int 	$overwriteifexists  Overwrite file if exists (1 by default)
-     * @return  string
+	 * @return  string
 	 *
 	 * @throws RestException 400
 	 * @throws RestException 401
@@ -616,6 +614,12 @@ class Documents extends DolibarrApi
 				require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 				$object = new Adherent($this->db);
 			}
+			elseif ($modulepart == 'proposal' || $modulepart == 'propal' || $modulepart == 'propale')
+			{
+				$modulepart = 'propale';
+				require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
+				$object = new Propal($this->db);
+			}
 			// TODO Implement additional moduleparts
 			else
 			{
@@ -629,7 +633,7 @@ class Documents extends DolibarrApi
 				if ($result == 0)
 				{
 					throw new RestException(404, "Object with ref '".$ref."' was not found.");
-			    }
+				}
 				elseif ($result < 0)
 				{
 					throw new RestException(500, 'Error while fetching object: '.$object->error);
@@ -678,7 +682,7 @@ class Documents extends DolibarrApi
 
 		if (dol_mkdir($upload_dir) < 0) // needed by products
 		{
-		    throw new RestException(500, 'Error while trying to create directory.');
+			throw new RestException(500, 'Error while trying to create directory.');
 		}
 
 		$destfile = $upload_dir.'/'.$original_file;
@@ -731,63 +735,63 @@ class Documents extends DolibarrApi
 	 */
 	public function delete($modulepart, $original_file)
 	{
-	    global $conf, $langs;
+		global $conf, $langs;
 
-	    if (empty($modulepart)) {
-	        throw new RestException(400, 'bad value for parameter modulepart');
-	    }
-	    if (empty($original_file)) {
-	        throw new RestException(400, 'bad value for parameter original_file');
-	    }
+		if (empty($modulepart)) {
+			throw new RestException(400, 'bad value for parameter modulepart');
+		}
+		if (empty($original_file)) {
+			throw new RestException(400, 'bad value for parameter original_file');
+		}
 
-	    //--- Finds and returns the document
-	    $entity = $conf->entity;
+		//--- Finds and returns the document
+		$entity = $conf->entity;
 
-	    // Special cases that need to use get_exdir to get real dir of object
-	    // If future, all object should use this to define path of documents.
-	    /*
+		// Special cases that need to use get_exdir to get real dir of object
+		// If future, all object should use this to define path of documents.
+		/*
 	    $tmpreldir = '';
 	    if ($modulepart == 'supplier_invoice') {
 	    	$tmpreldir = get_exdir($object->id, 2, 0, 0, $object, 'invoice_supplier');
 	    }
 
 	    $relativefile = $tmpreldir.dol_sanitizeFileName($object->ref); */
-	    $relativefile = $original_file;
+		$relativefile = $original_file;
 
-	    $check_access = dol_check_secure_access_document($modulepart, $relativefile, $entity, DolibarrApiAccess::$user, '', 'read');
-	    $accessallowed = $check_access['accessallowed'];
-	    $sqlprotectagainstexternals = $check_access['sqlprotectagainstexternals'];
-	    $original_file = $check_access['original_file'];
+		$check_access = dol_check_secure_access_document($modulepart, $relativefile, $entity, DolibarrApiAccess::$user, '', 'read');
+		$accessallowed = $check_access['accessallowed'];
+		$sqlprotectagainstexternals = $check_access['sqlprotectagainstexternals'];
+		$original_file = $check_access['original_file'];
 
-	    if (preg_match('/\.\./', $original_file) || preg_match('/[<>|]/', $original_file)) {
-	        throw new RestException(401);
-	    }
-	    if (!$accessallowed) {
-	        throw new RestException(401);
-	    }
+		if (preg_match('/\.\./', $original_file) || preg_match('/[<>|]/', $original_file)) {
+			throw new RestException(401);
+		}
+		if (!$accessallowed) {
+			throw new RestException(401);
+		}
 
-	    $filename = basename($original_file);
-	    $original_file_osencoded = dol_osencode($original_file); // New file name encoded in OS encoding charset
+		$filename = basename($original_file);
+		$original_file_osencoded = dol_osencode($original_file); // New file name encoded in OS encoding charset
 
-	    if (!file_exists($original_file_osencoded))
-	    {
-	        dol_syslog("Try to download not found file ".$original_file_osencoded, LOG_WARNING);
-	        throw new RestException(404, 'File not found');
-	    }
+		if (!file_exists($original_file_osencoded))
+		{
+			dol_syslog("Try to download not found file ".$original_file_osencoded, LOG_WARNING);
+			throw new RestException(404, 'File not found');
+		}
 
-	    if (@unlink($original_file_osencoded)) {
-    	    return array(
-    	        'success' => array(
-    	            'code' => 200,
-    	            'message' => 'Document deleted'
-    	        )
-    	    );
-	    }
+		if (@unlink($original_file_osencoded)) {
+			return array(
+				'success' => array(
+					'code' => 200,
+					'message' => 'Document deleted'
+				)
+			);
+		}
 
-	    throw new RestException(401);
+		throw new RestException(401);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName
 	/**
 	 * Validate fields before create or update object
 	 *
@@ -795,9 +799,9 @@ class Documents extends DolibarrApi
 	 * @return  array
 	 * @throws  RestException
 	 */
-    private function _validate_file($data)
-    {
-        // phpcs:enable
+	private function _validate_file($data)
+	{
+		// phpcs:enable
 		$result = array();
 		foreach (Documents::$DOCUMENT_FIELDS as $field) {
 			if (!isset($data[$field]))
diff --git a/htdocs/api/class/api_login.class.php b/htdocs/api/class/api_login.class.php
index 8627808a679..cb2fdd54d66 100644
--- a/htdocs/api/class/api_login.class.php
+++ b/htdocs/api/class/api_login.class.php
@@ -26,14 +26,14 @@ require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
 class Login
 {
 
-    /**
-     * Constructor of the class
-     */
-    public function __construct()
-    {
-        global $db;
-        $this->db = $db;
-    }
+	/**
+	 * Constructor of the class
+	 */
+	public function __construct()
+	{
+		global $db;
+		$this->db = $db;
+	}
 
 	/**
 	 * Login
@@ -46,21 +46,21 @@ class Login
 	 * @param   string  $password		User password
 	 * @param   string  $entity			Entity (when multicompany module is used). '' means 1=first company.
 	 * @param   int     $reset          Reset token (0=get current token, 1=ask a new token and canceled old token. This means access using current existing API token of user will fails: new token will be required for new access)
-     * @return  array                   Response status and user token
-     *
+	 * @return  array                   Response status and user token
+	 *
 	 * @throws RestException 403
 	 * @throws RestException 500
 	 *
 	 * @url GET /
 	 * @url POST /
 	 */
-    public function index($login, $password, $entity = '', $reset = 0)
-    {
-	    global $conf, $dolibarr_main_authentication, $dolibarr_auto_user;
+	public function index($login, $password, $entity = '', $reset = 0)
+	{
+		global $conf, $dolibarr_main_authentication, $dolibarr_auto_user;
 
-	    // TODO Remove the API login. The token must be generated from backoffice only.
+		// TODO Remove the API login. The token must be generated from backoffice only.
 
-	    // Authentication mode
+		// Authentication mode
 		if (empty($dolibarr_main_authentication)) $dolibarr_main_authentication = 'dolibarr';
 
 		// Authentication mode: forceuser
@@ -108,22 +108,22 @@ class Login
 				throw new RestException(403, 'User need write permission on itself to reset its API token');
 			}
 
-    		// Generate token for user
-    		$token = dol_hash($login.uniqid().$conf->global->MAIN_API_KEY, 1);
+			// Generate token for user
+			$token = dol_hash($login.uniqid().$conf->global->MAIN_API_KEY, 1);
 
-    		// We store API token into database
-    		$sql = "UPDATE ".MAIN_DB_PREFIX."user";
-    		$sql .= " SET api_key = '".$this->db->escape($token)."'";
-    		$sql .= " WHERE login = '".$this->db->escape($login)."'";
+			// We store API token into database
+			$sql = "UPDATE ".MAIN_DB_PREFIX."user";
+			$sql .= " SET api_key = '".$this->db->escape($token)."'";
+			$sql .= " WHERE login = '".$this->db->escape($login)."'";
 
-    		dol_syslog(get_class($this)."::login", LOG_DEBUG); // No log
-    		$result = $this->db->query($sql);
-    		if (!$result)
-    		{
-    			throw new RestException(500, 'Error when updating api_key for user :'.$this->db->lasterror());
-    		}
+			dol_syslog(get_class($this)."::login", LOG_DEBUG); // No log
+			$result = $this->db->query($sql);
+			if (!$result)
+			{
+				throw new RestException(500, 'Error when updating api_key for user :'.$this->db->lasterror());
+			}
 		} else {
-            $token = $tmpuser->api_key;
+			$token = $tmpuser->api_key;
 		}
 
 		//return token
@@ -131,9 +131,9 @@ class Login
 			'success' => array(
 				'code' => 200,
 				'token' => $token,
-			    'entity' => $tmpuser->entity,
-			    'message' => 'Welcome '.$login.($reset ? ' - Token is new' : ' - This is your token (generated by a previous call). You can use it to make any REST API call, or enter it into the DOLAPIKEY field to use the Dolibarr API explorer.')
+				'entity' => $tmpuser->entity,
+				'message' => 'Welcome '.$login.($reset ? ' - Token is new' : ' - This is your token (generated by a previous call). You can use it to make any REST API call, or enter it into the DOLAPIKEY field to use the Dolibarr API explorer.')
 			)
 		);
-    }
+	}
 }
diff --git a/htdocs/api/class/api_setup.class.php b/htdocs/api/class/api_setup.class.php
index 8177fbf7e1e..4516d2e1d45 100644
--- a/htdocs/api/class/api_setup.class.php
+++ b/htdocs/api/class/api_setup.class.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2016	Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2017	Regis Houssin	        <regis.houssin@inodbox.com>
  * Copyright (C) 2017	Neil Orley	            <neil.orley@oeris.fr>
- * Copyright (C) 2018   Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2020   Frédéric France         <frederic.france@netlogic.fr>
  * Copyright (C) 2018-2020   Thibault FOUCART        <support@ptibogxiv.net>
  *
  *
@@ -525,8 +525,8 @@ class Setup extends DolibarrApi
 	/**
 	 * Clean sensible object datas
 	 *
-	 * @param object    $object    Object to clean
-	 * @return array 				Array of cleaned object properties
+	 * @param Object    $object    Object to clean
+	 * @return Object 				Object with cleaned properties
 	 */
 	protected function _cleanObjectDatas($object)
 	{
@@ -1634,7 +1634,7 @@ class Setup extends DolibarrApi
 			$xmlarray = getURLContent($xmlremote);
 
 			// Return array('content'=>response,'curl_error_no'=>errno,'curl_error_msg'=>errmsg...)
-			if (!$xmlarray['curl_error_no'] && $xmlarray['http_code'] != '404')
+			if (!$xmlarray['curl_error_no'] && $xmlarray['http_code'] != '400' && $xmlarray['http_code'] != '404')
 			{
 				$xmlfile = $xmlarray['content'];
 				//print "xmlfilestart".$xmlfile."endxmlfile";
diff --git a/htdocs/api/class/api_status.class.php b/htdocs/api/class/api_status.class.php
index 45c69e318e0..6c80e838f0a 100644
--- a/htdocs/api/class/api_status.class.php
+++ b/htdocs/api/class/api_status.class.php
@@ -26,21 +26,21 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php';
  */
 class Status
 {
-    /**
-     * Get status (Dolibarr version)
-     *
-     * @return array
-     */
-    public function index()
-    {
-        global $conf;
+	/**
+	 * Get status (Dolibarr version)
+	 *
+	 * @return array
+	 */
+	public function index()
+	{
+		global $conf;
 
-        return array(
-            'success' => array(
-                'code' => 200,
-                'dolibarr_version' => DOL_VERSION,
-                'access_locked' => (empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED) ? '0' : $conf->global->MAIN_ONLY_LOGIN_ALLOWED),
-            ),
-        );
-    }
+		return array(
+			'success' => array(
+				'code' => 200,
+				'dolibarr_version' => DOL_VERSION,
+				'access_locked' => (empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED) ? '0' : $conf->global->MAIN_ONLY_LOGIN_ALLOWED),
+			),
+		);
+	}
 }
diff --git a/htdocs/api/index.php b/htdocs/api/index.php
index 1ae504f523a..2fba9fbb554 100644
--- a/htdocs/api/index.php
+++ b/htdocs/api/index.php
@@ -69,22 +69,22 @@ if (!empty($conf->global->MAIN_NGINX_FIX))
 // Enable and test if module Api is enabled
 if (empty($conf->global->MAIN_MODULE_API))
 {
-    $langs->load("admin");
-    dol_syslog("Call Dolibarr API interfaces with module REST disabled");
-    print $langs->trans("WarningModuleNotActive", 'Api').'.<br><br>';
-    print $langs->trans("ToActivateModule");
-    //session_destroy();
-    exit(0);
+	$langs->load("admin");
+	dol_syslog("Call Dolibarr API interfaces with module REST disabled");
+	print $langs->trans("WarningModuleNotActive", 'Api').'.<br><br>';
+	print $langs->trans("ToActivateModule");
+	//session_destroy();
+	exit(0);
 }
 
 // Test if explorer is not disabled
 if (preg_match('/api\/index\.php\/explorer/', $url) && !empty($conf->global->API_EXPLORER_DISABLED))
 {
-    $langs->load("admin");
-    dol_syslog("Call Dolibarr API interfaces with module REST disabled");
-    print $langs->trans("WarningAPIExplorerDisabled").'.<br><br>';
-    //session_destroy();
-    exit(0);
+	$langs->load("admin");
+	dol_syslog("Call Dolibarr API interfaces with module REST disabled");
+	print $langs->trans("WarningAPIExplorerDisabled").'.<br><br>';
+	//session_destroy();
+	exit(0);
 }
 
 
@@ -114,7 +114,7 @@ preg_match('/index\.php\/([^\/]+)(.*)$/', $url, $reg);
 $refreshcache = (empty($conf->global->API_PRODUCTION_DO_NOT_ALWAYS_REFRESH_CACHE) ? true : false);
 if (!empty($reg[1]) && $reg[1] == 'explorer' && ($reg[2] == '/swagger.json' || $reg[2] == '/swagger.json/root' || $reg[2] == '/resources.json' || $reg[2] == '/resources.json/root'))
 {
-    $refreshcache = true;
+	$refreshcache = true;
 }
 
 $api = new DolibarrApi($db, '', $refreshcache);
@@ -150,104 +150,104 @@ if (!empty($conf->global->API_RESTRICT_ON_IP))
 // Call Explorer file for all APIs definitions (this part is slow)
 if (!empty($reg[1]) && $reg[1] == 'explorer' && ($reg[2] == '/swagger.json' || $reg[2] == '/swagger.json/root' || $reg[2] == '/resources.json' || $reg[2] == '/resources.json/root'))
 {
-    // Scan all API files to load them
+	// Scan all API files to load them
 
-    $listofapis = array();
+	$listofapis = array();
 
-    $modulesdir = dolGetModulesDirs();
-    foreach ($modulesdir as $dir)
-    {
-        // Search available module
-        dol_syslog("Scan directory ".$dir." for module descriptor files, then search for API files");
+	$modulesdir = dolGetModulesDirs();
+	foreach ($modulesdir as $dir)
+	{
+		// Search available module
+		dol_syslog("Scan directory ".$dir." for module descriptor files, then search for API files");
 
-        $handle = @opendir(dol_osencode($dir));
-        if (is_resource($handle))
-        {
-            while (($file = readdir($handle)) !== false)
-            {
-            	$regmod = array();
-                if (is_readable($dir.$file) && preg_match("/^mod(.*)\.class\.php$/i", $file, $regmod))
-                {
-                    $module = strtolower($regmod[1]);
-                    $moduledirforclass = getModuleDirForApiClass($module);
-                    $modulenameforenabled = $module;
-                    if ($module == 'propale') { $modulenameforenabled = 'propal'; }
-                    if ($module == 'supplierproposal') { $modulenameforenabled = 'supplier_proposal'; }
-                    if ($module == 'ficheinter') { $modulenameforenabled = 'ficheinter'; }
+		$handle = @opendir(dol_osencode($dir));
+		if (is_resource($handle))
+		{
+			while (($file = readdir($handle)) !== false)
+			{
+				$regmod = array();
+				if (is_readable($dir.$file) && preg_match("/^mod(.*)\.class\.php$/i", $file, $regmod))
+				{
+					$module = strtolower($regmod[1]);
+					$moduledirforclass = getModuleDirForApiClass($module);
+					$modulenameforenabled = $module;
+					if ($module == 'propale') { $modulenameforenabled = 'propal'; }
+					if ($module == 'supplierproposal') { $modulenameforenabled = 'supplier_proposal'; }
+					if ($module == 'ficheinter') { $modulenameforenabled = 'ficheinter'; }
 
-                    dol_syslog("Found module file ".$file." - module=".$module." - modulenameforenabled=".$modulenameforenabled." - moduledirforclass=".$moduledirforclass);
+					dol_syslog("Found module file ".$file." - module=".$module." - modulenameforenabled=".$modulenameforenabled." - moduledirforclass=".$moduledirforclass);
 
-                    // Defined if module is enabled
-                    $enabled = true;
-                    if (empty($conf->$modulenameforenabled->enabled)) $enabled = false;
+					// Defined if module is enabled
+					$enabled = true;
+					if (empty($conf->$modulenameforenabled->enabled)) $enabled = false;
 
-                    if ($enabled)
-                    {
-                        // If exists, load the API class for enable module
-                        // Search files named api_<object>.class.php into /htdocs/<module>/class directory
-                        // @todo : use getElementProperties() function ?
-                        $dir_part = dol_buildpath('/'.$moduledirforclass.'/class/');
+					if ($enabled)
+					{
+						// If exists, load the API class for enable module
+						// Search files named api_<object>.class.php into /htdocs/<module>/class directory
+						// @todo : use getElementProperties() function ?
+						$dir_part = dol_buildpath('/'.$moduledirforclass.'/class/');
 
-                        $handle_part = @opendir(dol_osencode($dir_part));
-                        if (is_resource($handle_part))
-                        {
-                            while (($file_searched = readdir($handle_part)) !== false)
-                            {
-                                if ($file_searched == 'api_access.class.php') continue;
+						$handle_part = @opendir(dol_osencode($dir_part));
+						if (is_resource($handle_part))
+						{
+							while (($file_searched = readdir($handle_part)) !== false)
+							{
+								if ($file_searched == 'api_access.class.php') continue;
 
-                                $regapi = array();
-                                if (is_readable($dir_part.$file_searched) && preg_match("/^api_(.*)\.class\.php$/i", $file_searched, $regapi))
-                                {
-                                    $classname = ucwords($regapi[1]);
-                                    $classname = str_replace('_', '', $classname);
-                                    require_once $dir_part.$file_searched;
-                                    if (class_exists($classname.'Api'))
-                                    {
-                                        //dol_syslog("Found API by index.php: classname=".$classname."Api for module ".$dir." into ".$dir_part.$file_searched);
-                                        $listofapis[strtolower($classname.'Api')] = $classname.'Api';
-                                    } elseif (class_exists($classname))
-                                    {
-                                        //dol_syslog("Found API by index.php: classname=".$classname." for module ".$dir." into ".$dir_part.$file_searched);
-                                        $listofapis[strtolower($classname)] = $classname;
-                                    } else {
-                                        dol_syslog("We found an api_xxx file (".$file_searched.") but class ".$classname." does not exists after loading file", LOG_WARNING);
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
+								$regapi = array();
+								if (is_readable($dir_part.$file_searched) && preg_match("/^api_(.*)\.class\.php$/i", $file_searched, $regapi))
+								{
+									$classname = ucwords($regapi[1]);
+									$classname = str_replace('_', '', $classname);
+									require_once $dir_part.$file_searched;
+									if (class_exists($classname.'Api'))
+									{
+										//dol_syslog("Found API by index.php: classname=".$classname."Api for module ".$dir." into ".$dir_part.$file_searched);
+										$listofapis[strtolower($classname.'Api')] = $classname.'Api';
+									} elseif (class_exists($classname))
+									{
+										//dol_syslog("Found API by index.php: classname=".$classname." for module ".$dir." into ".$dir_part.$file_searched);
+										$listofapis[strtolower($classname)] = $classname;
+									} else {
+										dol_syslog("We found an api_xxx file (".$file_searched.") but class ".$classname." does not exists after loading file", LOG_WARNING);
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+	}
 
-    // Sort the classes before adding them to Restler.
-    // The Restler API Explorer shows the classes in the order they are added and it's a mess if they are not sorted.
-    asort($listofapis);
-    foreach ($listofapis as $apiname => $classname)
-    {
-        $api->r->addAPIClass($classname, $apiname);
-    }
-    //var_dump($api->r);
+	// Sort the classes before adding them to Restler.
+	// The Restler API Explorer shows the classes in the order they are added and it's a mess if they are not sorted.
+	asort($listofapis);
+	foreach ($listofapis as $apiname => $classname)
+	{
+		$api->r->addAPIClass($classname, $apiname);
+	}
+	//var_dump($api->r);
 }
 
 // Call one APIs or one definition of an API
 $regbis = array();
 if (!empty($reg[1]) && ($reg[1] != 'explorer' || ($reg[2] != '/swagger.json' && $reg[2] != '/resources.json' && preg_match('/^\/(swagger|resources)\.json\/(.+)$/', $reg[2], $regbis) && $regbis[2] != 'root')))
 {
-    $moduleobject = $reg[1];
-    if ($moduleobject == 'explorer')  // If we call page to explore details of a service
-    {
-    	$moduleobject = $regbis[2];
-    }
+	$moduleobject = $reg[1];
+	if ($moduleobject == 'explorer')  // If we call page to explore details of a service
+	{
+		$moduleobject = $regbis[2];
+	}
 
-    $moduleobject = strtolower($moduleobject);
-    $moduledirforclass = getModuleDirForApiClass($moduleobject);
+	$moduleobject = strtolower($moduleobject);
+	$moduledirforclass = getModuleDirForApiClass($moduleobject);
 
-    // Load a dedicated API file
-    dol_syslog("Load a dedicated API file moduleobject=".$moduleobject." moduledirforclass=".$moduledirforclass);
+	// Load a dedicated API file
+	dol_syslog("Load a dedicated API file moduleobject=".$moduleobject." moduledirforclass=".$moduledirforclass);
 
-    $tmpmodule = $moduleobject;
+	$tmpmodule = $moduleobject;
 	if ($tmpmodule != 'api')
 		$tmpmodule = preg_replace('/api$/i', '', $tmpmodule);
 	$classfile = str_replace('_', '', $tmpmodule);
@@ -274,7 +274,7 @@ if (!empty($reg[1]) && ($reg[1] != 'explorer' || ($reg[2] != '/swagger.json' &&
 	if ($dir_part_file)
 		$res = include_once $dir_part_file;
 	if (!$res) {
-	    dol_syslog('Failed to make include_once '.$dir_part_file, LOG_WARNING);
+		dol_syslog('Failed to make include_once '.$dir_part_file, LOG_WARNING);
 		print 'API not found (failed to include API file)';
 		header('HTTP/1.1 501 API not found (failed to include API file)');
 		//session_destroy();
diff --git a/htdocs/asset/admin/assets_extrafields.php b/htdocs/asset/admin/assets_extrafields.php
index 393f028f950..3334610b927 100644
--- a/htdocs/asset/admin/assets_extrafields.php
+++ b/htdocs/asset/admin/assets_extrafields.php
@@ -70,7 +70,7 @@ print dol_get_fiche_head($head, 'attributes', $langs->trans("Assets"), -1, 'gene
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 // Buttons
diff --git a/htdocs/asset/admin/assets_type_extrafields.php b/htdocs/asset/admin/assets_type_extrafields.php
index 2b67be78e2b..e17d421437d 100644
--- a/htdocs/asset/admin/assets_type_extrafields.php
+++ b/htdocs/asset/admin/assets_type_extrafields.php
@@ -69,7 +69,7 @@ print dol_get_fiche_head($head, 'attributes_type', $langs->trans("Assets"), -1,
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // Buttons
 if ($action != 'create' && $action != 'edit')
@@ -91,7 +91,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';
 }
 
 /* ************************************************************************** */
@@ -104,7 +104,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/asset/admin/setup.php b/htdocs/asset/admin/setup.php
index 6cda5f6eaa7..6fec16ef0a0 100644
--- a/htdocs/asset/admin/setup.php
+++ b/htdocs/asset/admin/setup.php
@@ -105,7 +105,7 @@ if ($action == 'edit')
 	print '</div>';
 }
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // End of page
 llxFooter();
diff --git a/htdocs/asset/card.php b/htdocs/asset/card.php
index 8b087297b79..0fa78edf9ce 100644
--- a/htdocs/asset/card.php
+++ b/htdocs/asset/card.php
@@ -180,7 +180,7 @@ if ($action == 'create')
 
 	print '</table>'."\n";
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div class="center">';
 	print '<input type="submit" class="button" name="add" value="'.dol_escape_htmltag($langs->trans("Create")).'">';
@@ -218,7 +218,7 @@ if (($id || $ref) && $action == 'edit')
 
 	print '</table>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div class="center"><input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
 	print ' &nbsp; <input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
@@ -297,7 +297,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 	print '<div class="clearboth"></div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 
 	// Buttons for actions
diff --git a/htdocs/asset/class/asset.class.php b/htdocs/asset/class/asset.class.php
index 036f31a99d7..25cac778264 100644
--- a/htdocs/asset/class/asset.class.php
+++ b/htdocs/asset/class/asset.class.php
@@ -113,44 +113,44 @@ class Asset extends CommonObject
 	 */
 	public $entity;
 
-    /**
-     * @var string Asset label
-     */
-    public $label;
+	/**
+	 * @var string Asset label
+	 */
+	public $label;
 
 	public $amount;
 
 	/**
 	 * @var int Thirdparty ID
 	 */
-    public $fk_soc;
+	public $fk_soc;
 
 	/**
 	 * @var string description
 	 */
 	public $description;
 
-	public $note_public;
-	public $note_private;
-
 	/**
-     * @var integer|string date_creation
-     */
+	 * @var integer|string date_creation
+	 */
 	public $date_creation;
 
 
 	public $tms;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_user_creat;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_user_modif;
 
+	/**
+	 * @var string import key
+	 */
 	public $import_key;
 
 	/**
@@ -381,7 +381,7 @@ class Asset extends CommonObject
 		return $this->LibStatut($this->status, $mode);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return the status
 	 *
@@ -391,14 +391,14 @@ class Asset extends CommonObject
 	 */
 	public static function LibStatut($status, $mode = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 
 		$langs->load("contracts");
-        $labelStatus = array();
+		$labelStatus = array();
 		$labelStatus[self::STATUS_DRAFT] = $langs->trans('Disabled');
 		$labelStatus[self::STATUS_VALIDATED] = $langs->trans('Enabled');
-        $labelStatusShort = array();
+		$labelStatusShort = array();
 		$labelStatusShort[self::STATUS_DRAFT] = $langs->trans('Disabled');
 		$labelStatusShort[self::STATUS_VALIDATED] = $langs->trans('Enabled');
 
diff --git a/htdocs/asset/class/asset_type.class.php b/htdocs/asset/class/asset_type.class.php
index db2407a9376..5af5f3d7591 100644
--- a/htdocs/asset/class/asset_type.class.php
+++ b/htdocs/asset/class/asset_type.class.php
@@ -87,7 +87,7 @@ class AssetType extends CommonObject
 	 *
 	 *	@param 		DoliDB		$db		Database handler
 	 */
-    public function __construct($db)
+	public function __construct($db)
 	{
 		$this->db = $db;
 	}
@@ -100,8 +100,8 @@ class AssetType extends CommonObject
 	 *  @param	int			$notrigger		1=do not execute triggers, 0 otherwise
 	 *  @return	int							>0 if OK, < 0 if KO
 	 */
-    public function create($user, $notrigger = 0)
-    {
+	public function create($user, $notrigger = 0)
+	{
 		global $conf;
 
 		$error = 0;
@@ -164,7 +164,7 @@ class AssetType extends CommonObject
 			$this->db->rollback();
 			return -1;
 		}
-    }
+	}
 
 	/**
 	 *  Met a jour en base donnees du type
@@ -173,7 +173,7 @@ class AssetType extends CommonObject
 	 *  @param	int			$notrigger		1=do not execute triggers, 0 otherwise
 	 *  @return	int							>0 if OK, < 0 if KO
 	 */
-    public function update($user, $notrigger = 0)
+	public function update($user, $notrigger = 0)
 	{
 		global $conf, $hookmanager;
 
@@ -299,7 +299,7 @@ class AssetType extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return list of asset's type
 	 *
@@ -307,7 +307,7 @@ class AssetType extends CommonObject
 	 */
 	public function liste_array()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $langs;
 
 		$assettypes = array();
@@ -424,8 +424,8 @@ class AssetType extends CommonObject
 	 *
 	 *  @return	void
 	 */
-    public function initAsSpecimen()
-    {
+	public function initAsSpecimen()
+	{
 		global $conf, $user, $langs;
 
 		// Initialize parameters
@@ -440,15 +440,15 @@ class AssetType extends CommonObject
 		$this->asset = array(
 			$user->id => $user
 		);
-    }
+	}
 
-    /**
-     *     getLibStatut
-     *
-     *     @return string     Return status of a type of asset
-     */
-    public function getLibStatut()
-    {
-        return '';
-    }
+	/**
+	 *     getLibStatut
+	 *
+	 *     @return string     Return status of a type of asset
+	 */
+	public function getLibStatut()
+	{
+		return '';
+	}
 }
diff --git a/htdocs/asset/document.php b/htdocs/asset/document.php
index 021f54a1ad2..4c2e36aed9a 100644
--- a/htdocs/asset/document.php
+++ b/htdocs/asset/document.php
@@ -135,7 +135,7 @@ if ($object->id)
 
 	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	$modulepart = 'asset';
 	//$permission = $user->rights->asset->create;
diff --git a/htdocs/asset/info.php b/htdocs/asset/info.php
index 0cca7015573..d211cf0dbad 100644
--- a/htdocs/asset/info.php
+++ b/htdocs/asset/info.php
@@ -82,7 +82,7 @@ print '</td></tr></table>';
 
 print '</div>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // End of page
 llxFooter();
diff --git a/htdocs/asset/list.php b/htdocs/asset/list.php
index ef3ea4ce975..2a7271fed4a 100644
--- a/htdocs/asset/list.php
+++ b/htdocs/asset/list.php
@@ -386,7 +386,7 @@ foreach ($object->fields as $key => $val)
 	if (!empty($arrayfields['t.'.$key]['checked']))
 	{
 		print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
-		if (is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
+		if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
 		elseif (strpos($val['type'], 'integer:') === 0) {
 			print $object->showInputField($val, $key, $search[$key], '', '', 'search_', 'maxwidth150', 1);
 		} elseif (!preg_match('/^(date|timestamp)/', $val['type'])) print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
diff --git a/htdocs/asset/note.php b/htdocs/asset/note.php
index b1665d7fcc4..514e05bff72 100644
--- a/htdocs/asset/note.php
+++ b/htdocs/asset/note.php
@@ -146,7 +146,7 @@ if ($id > 0 || !empty($ref))
 
 	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 }
 
 // End of page
diff --git a/htdocs/asset/type.php b/htdocs/asset/type.php
index 3c6773f5992..28f2ce59df0 100644
--- a/htdocs/asset/type.php
+++ b/htdocs/asset/type.php
@@ -382,7 +382,7 @@ if ($action == 'create')
 	print '<tbody>';
 	print "</table>\n";
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div class="center">';
 	print '<input type="submit" name="button" class="button" value="'.$langs->trans("Add").'">';
@@ -490,7 +490,7 @@ if ($rowid > 0)
 		print '</table>';
 		print '</div>';
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 		/*
 		 * Buttons
@@ -595,7 +595,7 @@ if ($rowid > 0)
 
 		print '</table>';
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 		print '<div class="center"><input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
 		print ' &nbsp; <input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
diff --git a/htdocs/asterisk/cidlookup.php b/htdocs/asterisk/cidlookup.php
index 87aaeb6d46f..7a3660e350e 100644
--- a/htdocs/asterisk/cidlookup.php
+++ b/htdocs/asterisk/cidlookup.php
@@ -35,8 +35,8 @@ $notfound = $langs->trans("Unknown");
 // Security check
 if (empty($conf->clicktodial->enabled))
 {
-    print "Error: Module Click to dial is not enabled.\n";
-    exit;
+	print "Error: Module Click to dial is not enabled.\n";
+	exit;
 }
 
 // Check parameters
diff --git a/htdocs/asterisk/wrapper.php b/htdocs/asterisk/wrapper.php
index ecc7c4fee6c..0a9ac82ce23 100644
--- a/htdocs/asterisk/wrapper.php
+++ b/htdocs/asterisk/wrapper.php
@@ -44,10 +44,10 @@ if (!defined('NOREQUIREAJAX'))   define('NOREQUIREAJAX', '1');
  */
 function llxHeader()
 {
-    print '<html>'."\n";
-    print '<head>'."\n";
-    print '<title>Asterisk redirection from Dolibarr...</title>'."\n";
-    print '</head>'."\n";
+	print '<html>'."\n";
+	print '<head>'."\n";
+	print '<title>Asterisk redirection from Dolibarr...</title>'."\n";
+	print '</head>'."\n";
 }
 
 /**
@@ -58,7 +58,7 @@ function llxHeader()
  */
 function llxFooter()
 {
-    print "\n".'</html>'."\n";
+	print "\n".'</html>'."\n";
 }
 
 require_once '../main.inc.php';
@@ -69,8 +69,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 // Security check
 if (empty($conf->clicktodial->enabled))
 {
-    accessforbidden();
-    exit;
+	accessforbidden();
+	exit;
 }
 
 
@@ -146,46 +146,46 @@ $number = strtolower($called);
 $pos = strpos($number, "local");
 if (!empty($number))
 {
-    if ($pos === false)
-    {
-        $errno = 0;
-        $errstr = 0;
-        $strCallerId = "Dolibarr call $found <".strtolower($number).">";
-        $oSocket = @fsockopen($strHost, $port, $errno, $errstr, 10);
-        if (!$oSocket)
-        {
-            print '<body>'."\n";
-            $txt = "Failed to execute fsockopen($strHost, $port, \$errno, \$errstr, 10)<br>\n";
-            print $txt;
-            dol_syslog($txt, LOG_ERR);
-            $txt = $errstr." (".$errno.")<br>\n";
-            print $txt;
-            dol_syslog($txt, LOG_ERR);
-            print '</body>'."\n";
-        } else {
-            $txt = "Call Asterisk dialer for caller: ".$caller.", called: ".$called." clicktodiallogin: ".$login;
-            dol_syslog($txt);
-            print '<body onload="javascript:history.go(-1);">'."\n";
-            print '<!-- '.$txt.' -->';
-            fputs($oSocket, "Action: login\r\n");
-            fputs($oSocket, "Events: off\r\n");
-            fputs($oSocket, "Username: $login\r\n");
-            fputs($oSocket, "Secret: $password\r\n\r\n");
-            fputs($oSocket, "Action: originate\r\n");
-            fputs($oSocket, "Channel: ".$channel.$caller."\r\n");
-            fputs($oSocket, "WaitTime: $strWaitTime\r\n");
-            fputs($oSocket, "CallerId: $strCallerId\r\n");
-            fputs($oSocket, "Exten: ".$prefix.$number."\r\n");
-            fputs($oSocket, "Context: $strContext\r\n");
-            fputs($oSocket, "Priority: $strPriority\r\n\r\n");
-            fputs($oSocket, "Action: Logoff\r\n\r\n");
-            sleep(2);
-            fclose($oSocket);
-            print '</body>'."\n";
-        }
-    }
+	if ($pos === false)
+	{
+		$errno = 0;
+		$errstr = 0;
+		$strCallerId = "Dolibarr call $found <".strtolower($number).">";
+		$oSocket = @fsockopen($strHost, $port, $errno, $errstr, 10);
+		if (!$oSocket)
+		{
+			print '<body>'."\n";
+			$txt = "Failed to execute fsockopen($strHost, $port, \$errno, \$errstr, 10)<br>\n";
+			print $txt;
+			dol_syslog($txt, LOG_ERR);
+			$txt = $errstr." (".$errno.")<br>\n";
+			print $txt;
+			dol_syslog($txt, LOG_ERR);
+			print '</body>'."\n";
+		} else {
+			$txt = "Call Asterisk dialer for caller: ".$caller.", called: ".$called." clicktodiallogin: ".$login;
+			dol_syslog($txt);
+			print '<body onload="javascript:history.go(-1);">'."\n";
+			print '<!-- '.$txt.' -->';
+			fputs($oSocket, "Action: login\r\n");
+			fputs($oSocket, "Events: off\r\n");
+			fputs($oSocket, "Username: $login\r\n");
+			fputs($oSocket, "Secret: $password\r\n\r\n");
+			fputs($oSocket, "Action: originate\r\n");
+			fputs($oSocket, "Channel: ".$channel.$caller."\r\n");
+			fputs($oSocket, "WaitTime: $strWaitTime\r\n");
+			fputs($oSocket, "CallerId: $strCallerId\r\n");
+			fputs($oSocket, "Exten: ".$prefix.$number."\r\n");
+			fputs($oSocket, "Context: $strContext\r\n");
+			fputs($oSocket, "Priority: $strPriority\r\n\r\n");
+			fputs($oSocket, "Action: Logoff\r\n\r\n");
+			sleep(2);
+			fclose($oSocket);
+			print '</body>'."\n";
+		}
+	}
 } else {
-    print 'Bad parameters in URL. Must be '.$_SERVER['PHP_SELF'].'?caller=99999&called=99999&login=xxxxx&password=xxxxx';
+	print 'Bad parameters in URL. Must be '.$_SERVER['PHP_SELF'].'?caller=99999&called=99999&login=xxxxx&password=xxxxx';
 }
 
 // End of page
diff --git a/htdocs/barcode/printsheet.php b/htdocs/barcode/printsheet.php
index dabd05bf745..8a513034a4a 100644
--- a/htdocs/barcode/printsheet.php
+++ b/htdocs/barcode/printsheet.php
@@ -148,7 +148,7 @@ if ($action == 'builddoc')
 		$module = new $classname($db);
 		if ($generator != 'tcpdfbarcode')
 		{
-		    // May be phpbarcode
+			// May be phpbarcode
 			$template = 'standardlabel';
 			$is2d = false;
 			if ($module->encodingIsSupported($encoding))
@@ -178,19 +178,19 @@ if ($action == 'builddoc')
 	{
 		// List of values to scan for a replacement
 		$substitutionarray = array(
-		    '%LOGIN%' => $user->login,
-		    '%COMPANY%' => $mysoc->name,
-		    '%ADDRESS%' => $mysoc->address,
-		    '%ZIP%' => $mysoc->zip,
-		    '%TOWN%' => $mysoc->town,
-		    '%COUNTRY%' => $mysoc->country,
-		    '%COUNTRY_CODE%' => $mysoc->country_code,
-		    '%EMAIL%' => $mysoc->email,
-		    '%YEAR%' => $year,
-		    '%MONTH%' => $month,
-		    '%DAY%' => $day,
-		    '%DOL_MAIN_URL_ROOT%' => DOL_MAIN_URL_ROOT,
-		    '%SERVER%' => "http://".$_SERVER["SERVER_NAME"]."/",
+			'%LOGIN%' => $user->login,
+			'%COMPANY%' => $mysoc->name,
+			'%ADDRESS%' => $mysoc->address,
+			'%ZIP%' => $mysoc->zip,
+			'%TOWN%' => $mysoc->town,
+			'%COUNTRY%' => $mysoc->country,
+			'%COUNTRY_CODE%' => $mysoc->country_code,
+			'%EMAIL%' => $mysoc->email,
+			'%YEAR%' => $year,
+			'%MONTH%' => $month,
+			'%DAY%' => $day,
+			'%DOL_MAIN_URL_ROOT%' => DOL_MAIN_URL_ROOT,
+			'%SERVER%' => "http://".$_SERVER["SERVER_NAME"]."/",
 		);
 		complete_substitutions_array($substitutionarray, $langs);
 
@@ -291,8 +291,8 @@ print '</div><div class="tagtd maxwidthonsmartphone" style="overflow: hidden; wh
 $arrayoflabels = array();
 foreach (array_keys($_Avery_Labels) as $codecards)
 {
-    $labeltoshow = $_Avery_Labels[$codecards]['name'];
-    //$labeltoshow.=' ('.$_Avery_Labels[$row['code']]['paper-size'].')';
+	$labeltoshow = $_Avery_Labels[$codecards]['name'];
+	//$labeltoshow.=' ('.$_Avery_Labels[$row['code']]['paper-size'].')';
 	$arrayoflabels[$codecards] = $labeltoshow;
 }
 asort($arrayoflabels);
@@ -378,22 +378,22 @@ print '<br>';
 
 if (!empty($user->rights->produit->lire) || !empty($user->rights->service->lire))
 {
-    print '<input id="fillfromproduct" type="radio" '.((GETPOST("selectorforbarcode") == 'fillfromproduct') ? 'checked ' : '').'name="selectorforbarcode" value="fillfromproduct" class="radiobarcodeselect"> '.$langs->trans("FillBarCodeTypeAndValueFromProduct").' &nbsp; ';
-    print '<br>';
-    print '<div class="showforproductselector">';
-    $form->select_produits(GETPOST('productid', 'int'), 'productid', '', '', 0, -1, 2, '', 0, array(), 0, '1', 0, 'minwidth400imp', 1);
-    print ' &nbsp; <input type="submit" id="submitproduct" name="submitproduct" class="button" value="'.(dol_escape_htmltag($langs->trans("GetBarCode"))).'">';
-    print '</div>';
+	print '<input id="fillfromproduct" type="radio" '.((GETPOST("selectorforbarcode") == 'fillfromproduct') ? 'checked ' : '').'name="selectorforbarcode" value="fillfromproduct" class="radiobarcodeselect"> '.$langs->trans("FillBarCodeTypeAndValueFromProduct").' &nbsp; ';
+	print '<br>';
+	print '<div class="showforproductselector">';
+	$form->select_produits(GETPOST('productid', 'int'), 'productid', '', '', 0, -1, 2, '', 0, array(), 0, '1', 0, 'minwidth400imp', 1);
+	print ' &nbsp; <input type="submit" id="submitproduct" name="submitproduct" class="button" value="'.(dol_escape_htmltag($langs->trans("GetBarCode"))).'">';
+	print '</div>';
 }
 
 if (!empty($user->rights->societe->lire))
 {
-    print '<input id="fillfromthirdparty" type="radio" '.((GETPOST("selectorforbarcode") == 'fillfromthirdparty') ? 'checked ' : '').'name="selectorforbarcode" value="fillfromthirdparty" class="radiobarcodeselect"> '.$langs->trans("FillBarCodeTypeAndValueFromThirdParty").' &nbsp; ';
-    print '<br>';
-    print '<div class="showforthirdpartyselector">';
-    print $form->select_company(GETPOST('socid', 'int'), 'socid', '', 'SelectThirdParty', 0, 0, array(), 0, 'minwidth300');
-    print ' &nbsp; <input type="submit" id="submitthirdparty" name="submitthirdparty" class="button showforthirdpartyselector" value="'.(dol_escape_htmltag($langs->trans("GetBarCode"))).'">';
-    print '</div>';
+	print '<input id="fillfromthirdparty" type="radio" '.((GETPOST("selectorforbarcode") == 'fillfromthirdparty') ? 'checked ' : '').'name="selectorforbarcode" value="fillfromthirdparty" class="radiobarcodeselect"> '.$langs->trans("FillBarCodeTypeAndValueFromThirdParty").' &nbsp; ';
+	print '<br>';
+	print '<div class="showforthirdpartyselector">';
+	print $form->select_company(GETPOST('socid', 'int'), 'socid', '', 'SelectThirdParty', 0, 0, array(), 0, 'minwidth300');
+	print ' &nbsp; <input type="submit" id="submitthirdparty" name="submitthirdparty" class="button showforthirdpartyselector" value="'.(dol_escape_htmltag($langs->trans("GetBarCode"))).'">';
+	print '</div>';
 }
 
 print '<br>';
diff --git a/htdocs/blockedlog/admin/blockedlog.php b/htdocs/blockedlog/admin/blockedlog.php
index 674c5b771d0..b6ce9cda1bc 100644
--- a/htdocs/blockedlog/admin/blockedlog.php
+++ b/htdocs/blockedlog/admin/blockedlog.php
@@ -170,7 +170,7 @@ print '</table>';
 
 if (GETPOST('withtab', 'alpha'))
 {
-	dol_fiche_end();
+	print dol_get_fiche_end();
 }
 
 print '<br><br>';
diff --git a/htdocs/blockedlog/admin/blockedlog_list.php b/htdocs/blockedlog/admin/blockedlog_list.php
index b4e26337c50..67c6c394815 100644
--- a/htdocs/blockedlog/admin/blockedlog_list.php
+++ b/htdocs/blockedlog/admin/blockedlog_list.php
@@ -559,7 +559,7 @@ jQuery(document).ready(function () {
 
 if (!empty($conf->global->BLOCKEDLOG_USE_REMOTE_AUTHORITY) && !empty($conf->global->BLOCKEDLOG_AUTHORITY_URL))
 {
-    ?>
+	?>
 		<script type="text/javascript">
 
 			$.ajax({
@@ -582,7 +582,7 @@ if (!empty($conf->global->BLOCKEDLOG_USE_REMOTE_AUTHORITY) && !empty($conf->glob
 
 if (GETPOST('withtab', 'alpha'))
 {
-	dol_fiche_end();
+	print dol_get_fiche_end();
 }
 
 print '<br><br>';
diff --git a/htdocs/blockedlog/class/authority.class.php b/htdocs/blockedlog/class/authority.class.php
index 69967d503a1..faed3ac7530 100644
--- a/htdocs/blockedlog/class/authority.class.php
+++ b/htdocs/blockedlog/class/authority.class.php
@@ -50,18 +50,18 @@ class BlockedLogAuthority
 	 *
 	 *      @param		DoliDB		$db      Database handler
 	 */
-    public function __construct($db)
-    {
-    	$this->db = $db;
-    }
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
 
 	/**
 	 *	Get the blockchain
 	 *
 	 *	@return     string         			blockchain
 	 */
-    public function getLocalBlockChain()
-    {
+	public function getLocalBlockChain()
+	{
 
 		$block_static = new BlockedLog($this->db);
 
@@ -76,18 +76,18 @@ class BlockedLogAuthority
 		}
 
 		return $this->blockchain;
-    }
+	}
 
 	/**
 	 *	Get hash of the block chain to check
 	 *
 	 *	@return     string         			hash md5 of blockchain
 	 */
-    public function getBlockchainHash()
-    {
+	public function getBlockchainHash()
+	{
 
 		return md5($this->signature.$this->blockchain);
-    }
+	}
 
 	/**
 	 *	Get hash of the block chain to check
@@ -95,23 +95,23 @@ class BlockedLogAuthority
 	 *	@param      string		$hash		hash md5 of blockchain to test
 	 *	@return     boolean
 	 */
-    public function checkBlockchain($hash)
-    {
+	public function checkBlockchain($hash)
+	{
 
 		return ($hash === $this->getBlockchainHash());
-    }
+	}
 
 	/**
 	 *	Add a new block to the chain
 	 *
-     *	@param      string		$block		new block to chain
-     *  @return void
+	 *	@param      string		$block		new block to chain
+	 *  @return void
 	 */
-    public function addBlock($block)
-    {
+	public function addBlock($block)
+	{
 
 		$this->blockchain .= $block;
-    }
+	}
 
 	/**
 	 *	hash already exist into chain ?
@@ -119,8 +119,8 @@ class BlockedLogAuthority
 	 *	@param      string		$block		new block to chain
 	 *	@return     boolean
 	 */
-    public function checkBlock($block)
-    {
+	public function checkBlock($block)
+	{
 
 		if (strlen($block) != 64) return false;
 
@@ -131,7 +131,7 @@ class BlockedLogAuthority
 		} else {
 			return false;
 		}
-    }
+	}
 
 
 	/**
@@ -141,8 +141,8 @@ class BlockedLogAuthority
 	 *	@param      string		$signature		Signature of object to load
 	 *	@return     int         				>0 if OK, <0 if KO, 0 if not found
 	 */
-    public function fetch($id, $signature = '')
-    {
+	public function fetch($id, $signature = '')
+	{
 
 		global $langs;
 
@@ -186,7 +186,7 @@ class BlockedLogAuthority
 			$this->error = $this->db->error();
 			return -1;
 		}
-    }
+	}
 
 	/**
 	 *	Create authority in database.
@@ -194,8 +194,8 @@ class BlockedLogAuthority
 	 *	@param	User	$user      		Object user that create
 	 *	@return	int						<0 if KO, >0 if OK
 	 */
-    public function create($user)
-    {
+	public function create($user)
+	{
 
 		global $conf, $langs, $hookmanager;
 
@@ -236,7 +236,7 @@ class BlockedLogAuthority
 			$this->db->rollback();
 			return -1;
 		}
-    }
+	}
 
 	/**
 	 *	Create authority in database.
@@ -244,8 +244,8 @@ class BlockedLogAuthority
 	 *	@param	User	$user      		Object user that create
 	 *	@return	int						<0 if KO, >0 if OK
 	 */
-    public function update($user)
-    {
+	public function update($user)
+	{
 
 		global $conf, $langs, $hookmanager;
 
@@ -272,15 +272,15 @@ class BlockedLogAuthority
 			$this->db->rollback();
 			return -1;
 		}
-    }
+	}
 
 	/**
 	 *	For cron to sync to authority.
 	 *
 	 *	@return	int						<0 if KO, >0 if OK
 	 */
-    public function syncSignatureWithAuthority()
-    {
+	public function syncSignatureWithAuthority()
+	{
 		global $conf, $langs;
 
 		//TODO create cron task on activation
@@ -311,6 +311,6 @@ class BlockedLogAuthority
 			}
 		}
 
-        return 1;
-    }
+		return 1;
+	}
 }
diff --git a/htdocs/blockedlog/class/blockedlog.class.php b/htdocs/blockedlog/class/blockedlog.class.php
index b8d0304c5eb..633032a7ad9 100644
--- a/htdocs/blockedlog/class/blockedlog.class.php
+++ b/htdocs/blockedlog/class/blockedlog.class.php
@@ -101,8 +101,8 @@ class BlockedLog
 	public $fk_user = 0;
 
 	/**
-     * @var integer|string date_creation
-     */
+	 * @var integer|string date_creation
+	 */
 	public $date_creation;
 
 	/**
@@ -196,7 +196,7 @@ class BlockedLog
 
 	/**
 	 *  Try to retrieve source object (it it still exists)
-     * @return string
+	 * @return string
 	 */
 	public function getObjectLink()
 	{
@@ -301,7 +301,7 @@ class BlockedLog
 
 	/**
 	 *      try to retrieve user author
-     * @return string
+	 * @return string
 	 */
 	public function getUser()
 	{
@@ -377,20 +377,20 @@ class BlockedLog
 		$arrayoffieldstoexclude = array(
 			'table_element', 'fields', 'ref_previous', 'ref_next', 'origin', 'origin_id', 'oldcopy', 'picto', 'error', 'errors', 'model_pdf', 'modelpdf', 'last_main_doc', 'civility_id', 'contact', 'contact_id',
 			'table_element_line', 'ismultientitymanaged', 'isextrafieldmanaged',
-            'linkedObjectsIds',
-            'linkedObjects',
-            'fk_delivery_address',
+			'linkedObjectsIds',
+			'linkedObjects',
+			'fk_delivery_address',
 			'context',
-		    'projet'          // There is already ->fk_project
+			'projet'          // There is already ->fk_project
 		);
 		// Add more fields to exclude depending on object type
 		if ($this->element == 'cashcontrol') {
-            $arrayoffieldstoexclude = array_merge($arrayoffieldstoexclude, array(
-		        'name', 'lastname', 'firstname', 'region', 'region_id', 'region_code', 'state', 'state_id', 'state_code', 'country', 'country_id', 'country_code',
-		        'total_ht', 'total_tva', 'total_ttc', 'total_localtax1', 'total_localtax2',
-		        'barcode_type', 'barcode_type_code', 'barcode_type_label', 'barcode_type_coder', 'mode_reglement_id', 'cond_reglement_id', 'mode_reglement', 'cond_reglement', 'shipping_method_id',
-		        'fk_incoterms', 'label_incoterms', 'location_incoterms', 'lines')
-		    );
+			$arrayoffieldstoexclude = array_merge($arrayoffieldstoexclude, array(
+				'name', 'lastname', 'firstname', 'region', 'region_id', 'region_code', 'state', 'state_id', 'state_code', 'country', 'country_id', 'country_code',
+				'total_ht', 'total_tva', 'total_ttc', 'total_localtax1', 'total_localtax2',
+				'barcode_type', 'barcode_type_code', 'barcode_type_label', 'barcode_type_coder', 'mode_reglement_id', 'cond_reglement_id', 'mode_reglement', 'cond_reglement', 'shipping_method_id',
+				'fk_incoterms', 'label_incoterms', 'location_incoterms', 'lines')
+			);
 		}
 
 		// Add thirdparty info
@@ -559,7 +559,7 @@ class BlockedLog
 					foreach ($tmpobject->thirdparty as $key=>$value)
 					{
 						if (in_array($key, $arrayoffieldstoexclude)) continue; // Discard some properties
-                        if (!in_array($key, array(
+						if (!in_array($key, array(
 						'name', 'name_alias', 'ref_ext', 'address', 'zip', 'town', 'state_code', 'country_code', 'idprof1', 'idprof2', 'idprof3', 'idprof4', 'idprof5', 'idprof6', 'phone', 'fax', 'email', 'barcode',
 						'tva_intra', 'localtax1_assuj', 'localtax1_value', 'localtax2_assuj', 'localtax2_value', 'managers', 'capital', 'typent_code', 'forme_juridique_code', 'code_client', 'code_fournisseur'
 						))) continue; // Discard if not into a dedicated list
@@ -576,7 +576,7 @@ class BlockedLog
 					foreach ($tmpobject as $key=>$value)
 					{
 						if (in_array($key, $arrayoffieldstoexclude)) continue; // Discard some properties
-                        if (!in_array($key, array(
+						if (!in_array($key, array(
 						'ref', 'ref_client', 'ref_supplier', 'date', 'datef', 'type', 'total_ht', 'total_tva', 'total_ttc', 'localtax1', 'localtax2', 'revenuestamp', 'datepointoftax', 'note_public'
 						))) continue; // Discard if not into a dedicated list
 						if (!is_object($value))
@@ -632,8 +632,8 @@ class BlockedLog
 	 *	@param      int		$id       	Id of object to load
 	 *	@return     int         			>0 if OK, <0 if KO, 0 if not found
 	 */
-    public function fetch($id)
-    {
+	public function fetch($id)
+	{
 
 		global $langs;
 
@@ -722,8 +722,8 @@ class BlockedLog
 	 *
 	 *	@return	boolean
 	 */
-    public function setCertified()
-    {
+	public function setCertified()
+	{
 
 		$res = $this->db->query("UPDATE ".MAIN_DB_PREFIX."blockedlog SET certified=1 WHERE rowid=".$this->id);
 		if ($res === false) return false;
@@ -738,8 +738,8 @@ class BlockedLog
 	 *  @param	int		$forcesignature		Force signature (for example '0000000000' when we disabled the module)
 	 *	@return	int							<0 if KO, >0 if OK
 	 */
-    public function create($user, $forcesignature = '')
-    {
+	public function create($user, $forcesignature = '')
+	{
 
 		global $conf, $langs, $hookmanager;
 
@@ -1034,14 +1034,14 @@ class BlockedLog
 	}
 
 
-    /**
-     * Check if module was already used or not for at least one recording.
-     *
-     * @param   int     $ignoresystem       Ignore system events for the test
-     * @return  bool
-     */
-    public function alreadyUsed($ignoresystem = 0)
-    {
+	/**
+	 * Check if module was already used or not for at least one recording.
+	 *
+	 * @param   int     $ignoresystem       Ignore system events for the test
+	 * @return  bool
+	 */
+	public function alreadyUsed($ignoresystem = 0)
+	{
 		global $conf;
 
 		$result = false;
@@ -1061,5 +1061,5 @@ class BlockedLog
 		dol_syslog("Module Blockedlog alreadyUsed with ignoresystem=".$ignoresystem." is ".$result);
 
 		return $result;
-    }
+	}
 }
diff --git a/htdocs/bom/bom_agenda.php b/htdocs/bom/bom_agenda.php
index d5e929796e5..a7cc68d5677 100644
--- a/htdocs/bom/bom_agenda.php
+++ b/htdocs/bom/bom_agenda.php
@@ -43,10 +43,10 @@ $backtopage = GETPOST('backtopage', 'alpha');
 
 if (GETPOST('actioncode', 'array'))
 {
-    $actioncode = GETPOST('actioncode', 'array', 3);
-    if (!count($actioncode)) $actioncode = '0';
+	$actioncode = GETPOST('actioncode', 'array', 3);
+	if (!count($actioncode)) $actioncode = '0';
 } else {
-    $actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT));
+	$actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT));
 }
 $search_agenda_label = GETPOST('search_agenda_label');
 
@@ -90,19 +90,19 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 
 if (empty($reshook))
 {
-    // Cancel
-    if (GETPOST('cancel', 'alpha') && !empty($backtopage))
-    {
-        header("Location: ".$backtopage);
-        exit;
-    }
+	// Cancel
+	if (GETPOST('cancel', 'alpha') && !empty($backtopage))
+	{
+		header("Location: ".$backtopage);
+		exit;
+	}
 
-    // Purge search criteria
-    if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
-    {
-        $actioncode = '';
-        $search_agenda_label = '';
-    }
+	// Purge search criteria
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
+	{
+		$actioncode = '';
+		$search_agenda_label = '';
+	}
 }
 
 
@@ -177,66 +177,66 @@ if ($object->id > 0)
 
 	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>';
 
-    $object->info($object->id);
+	$object->info($object->id);
 	dol_print_object_info($object, 1);
 
 	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 
 
 	// Actions buttons
 
-    $objthirdparty = $object;
-    $objcon = new stdClass();
+	$objthirdparty = $object;
+	$objcon = new stdClass();
 
-    $out = '&origin='.$object->element.'&originid='.$object->id;
-    $permok = $user->rights->agenda->myactions->create;
-    if ((!empty($objthirdparty->id) || !empty($objcon->id)) && $permok)
-    {
-        //$out.='<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create';
-        if (get_class($objthirdparty) == 'Societe') $out .= '&amp;socid='.$objthirdparty->id;
-        $out .= (!empty($objcon->id) ? '&amp;contactid='.$objcon->id : '').'&amp;backtopage=1&amp;percentage=-1';
-    	//$out.=$langs->trans("AddAnAction").' ';
-    	//$out.=img_picto($langs->trans("AddAnAction"),'filenew');
-    	//$out.="</a>";
+	$out = '&origin='.$object->element.'&originid='.$object->id;
+	$permok = $user->rights->agenda->myactions->create;
+	if ((!empty($objthirdparty->id) || !empty($objcon->id)) && $permok)
+	{
+		//$out.='<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create';
+		if (get_class($objthirdparty) == 'Societe') $out .= '&amp;socid='.$objthirdparty->id;
+		$out .= (!empty($objcon->id) ? '&amp;contactid='.$objcon->id : '').'&amp;backtopage=1&amp;percentage=-1';
+		//$out.=$langs->trans("AddAnAction").' ';
+		//$out.=img_picto($langs->trans("AddAnAction"),'filenew');
+		//$out.="</a>";
 	}
 
 
 	print '<div class="tabsAction">';
 
-    if (!empty($conf->agenda->enabled))
-    {
-    	if (!empty($user->rights->agenda->myactions->create) || !empty($user->rights->agenda->allactions->create))
-    	{
-        	print '<a class="butAction" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create'.$out.'">'.$langs->trans("AddAction").'</a>';
-    	} else {
-        	print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans("AddAction").'</a>';
-    	}
-    }
+	if (!empty($conf->agenda->enabled))
+	{
+		if (!empty($user->rights->agenda->myactions->create) || !empty($user->rights->agenda->allactions->create))
+		{
+			print '<a class="butAction" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create'.$out.'">'.$langs->trans("AddAction").'</a>';
+		} else {
+			print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans("AddAction").'</a>';
+		}
+	}
 
-    print '</div>';
+	print '</div>';
 
-    if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read)))
-    {
-    	$param = '&id='.$object->id.'&socid='.$socid;
-        if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
-        if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
+	if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read)))
+	{
+		$param = '&id='.$object->id.'&socid='.$socid;
+		if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
+		if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
 
 
 		//print load_fiche_titre($langs->trans("ActionsOnBom"), '', '');
 
-        // List of all actions
+		// List of all actions
 		$filters = array();
-        $filters['search_agenda_label'] = $search_agenda_label;
+		$filters['search_agenda_label'] = $search_agenda_label;
 
-        // TODO Replace this with same code than into list.php
-        show_actions_done($conf, $langs, $db, $object, null, 0, $actioncode, '', $filters, $sortfield, $sortorder);
-    }
+		// TODO Replace this with same code than into list.php
+		show_actions_done($conf, $langs, $db, $object, null, 0, $actioncode, '', $filters, $sortfield, $sortorder);
+	}
 }
 
 // End of page
diff --git a/htdocs/bom/bom_card.php b/htdocs/bom/bom_card.php
index 37db34f283c..7970911d84d 100644
--- a/htdocs/bom/bom_card.php
+++ b/htdocs/bom/bom_card.php
@@ -275,7 +275,7 @@ if ($action == 'create')
 
 	print '</table>'."\n";
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div class="center">';
 	print '<input type="submit" class="button" name="add" value="'.dol_escape_htmltag($langs->trans("Create")).'">';
@@ -311,7 +311,7 @@ if (($id || $ref) && $action == 'edit')
 
 	print '</table>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div class="center"><input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
 	print ' &nbsp; <input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
@@ -535,7 +535,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 	print '<div class="clearboth"></div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 
 
diff --git a/htdocs/bom/bom_document.php b/htdocs/bom/bom_document.php
index 0f2a88366aa..92423977be8 100644
--- a/htdocs/bom/bom_document.php
+++ b/htdocs/bom/bom_document.php
@@ -115,9 +115,9 @@ if ($object->id)
 
 	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
 
-    print '<div class="fichecenter">';
+	print '<div class="fichecenter">';
 
-    print '<div class="underbanner clearboth"></div>';
+	print '<div class="underbanner clearboth"></div>';
 	print '<table class="border centpercent tableforfield">';
 
 	// Number of files
@@ -130,7 +130,7 @@ if ($object->id)
 
 	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	$modulepart = 'bom';
 	$permission = $user->rights->bom->write;
diff --git a/htdocs/bom/bom_list.php b/htdocs/bom/bom_list.php
index 7687ab250ac..6143f795b1d 100644
--- a/htdocs/bom/bom_list.php
+++ b/htdocs/bom/bom_list.php
@@ -486,7 +486,7 @@ foreach ($object->fields as $key => $val)
 	if (!empty($arrayfields['t.'.$key]['checked']))
 	{
 		print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
-		if (is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
+		if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
 		elseif (strpos($val['type'], 'integer:') === 0) {
 			print $object->showInputField($val, $key, $search[$key], '', '', 'search_', 'maxwidth150', 1);
 		} elseif (!preg_match('/^(date|timestamp)/', $val['type'])) print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
@@ -557,22 +557,22 @@ while ($i < ($limit ? min($num, $limit) : $num))
 	// Store properties in $object
 	$object->setVarsFromFetchObj($obj);
 
-    // Show here line of result
-    print '<tr class="oddeven">';
-    foreach ($object->fields as $key => $val)
-    {
-    	$cssforfield = (empty($val['css']) ? '' : $val['css']);
-    	if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) $cssforfield .= ($cssforfield ? ' ' : '').'center';
-    	elseif ($key == 'status') $cssforfield .= ($cssforfield ? ' ' : '').'center';
+	// Show here line of result
+	print '<tr class="oddeven">';
+	foreach ($object->fields as $key => $val)
+	{
+		$cssforfield = (empty($val['css']) ? '' : $val['css']);
+		if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) $cssforfield .= ($cssforfield ? ' ' : '').'center';
+		elseif ($key == 'status') $cssforfield .= ($cssforfield ? ' ' : '').'center';
 
-    	if (in_array($val['type'], array('timestamp'))) $cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
-    	elseif ($key == 'ref') $cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+		if (in_array($val['type'], array('timestamp'))) $cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+		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 (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']))
-        {
+		if (!empty($arrayfields['t.'.$key]['checked']))
+		{
 			print '<td'.($cssforfield ? ' class="'.$cssforfield.'"' : '').'>';
 			if ($key == 'status') print $object->getLibStatut(5);
 			else print $object->showOutputField($val, $key, $object->$key, '');
@@ -583,8 +583,8 @@ while ($i < ($limit ? min($num, $limit) : $num))
 				if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 't.'.$key;
 				$totalarray['val']['t.'.$key] += $object->$key;
 			}
-        }
-    }
+		}
+	}
 	// Extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 	// Fields from hook
diff --git a/htdocs/bom/bom_note.php b/htdocs/bom/bom_note.php
index e69be248a1d..78b38732f7f 100644
--- a/htdocs/bom/bom_note.php
+++ b/htdocs/bom/bom_note.php
@@ -144,7 +144,7 @@ if ($id > 0 || !empty($ref))
 
 	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 }
 
 // End of page
diff --git a/htdocs/bom/class/api_boms.class.php b/htdocs/bom/class/api_boms.class.php
index b9123b8c226..563cfe35263 100644
--- a/htdocs/bom/class/api_boms.class.php
+++ b/htdocs/bom/class/api_boms.class.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2015   Jean-François Ferry     <jfefe@aternatik.fr>
  * Copyright (C) 2019 Maxime Kohlhaas <maxime@atm-consulting.fr>
+ * Copyright (C) 2020     	Frédéric France		<frederic.france@netlogic.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -35,317 +36,315 @@ require_once DOL_DOCUMENT_ROOT.'/bom/class/bom.class.php';
  */
 class Boms extends DolibarrApi
 {
-    /**
-     * @var BOM $bom {@type BOM}
-     */
-    public $bom;
+	/**
+	 * @var BOM $bom {@type BOM}
+	 */
+	public $bom;
 
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
 		global $db, $conf;
 		$this->db = $db;
-        $this->bom = new BOM($this->db);
-    }
+		$this->bom = new BOM($this->db);
+	}
 
-    /**
-     * Get properties of a bom object
-     *
-     * Return an array with bom informations
-     *
-     * @param 	int 	$id ID of bom
-     * @return 	array|mixed data without useless information
+	/**
+	 * Get properties of a bom object
 	 *
-     * @url	GET {id}
-     * @throws 	RestException
-     */
-    public function get($id)
-    {
+	 * Return an array with bom informations
+	 *
+	 * @param 	int 	$id ID of bom
+	 * @return 	array|mixed data without useless information
+	 *
+	 * @url	GET {id}
+	 * @throws 	RestException
+	 */
+	public function get($id)
+	{
 		if (!DolibarrApiAccess::$user->rights->bom->read) {
 			throw new RestException(401);
 		}
 
-        $result = $this->bom->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'BOM not found');
-        }
+		$result = $this->bom->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'BOM not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('bom', $this->bom->id, 'bom_bom')) {
+		if (!DolibarrApi::_checkAccessToResource('bom', $this->bom->id, 'bom_bom')) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
 		return $this->_cleanObjectDatas($this->bom);
-    }
+	}
 
 
-    /**
-     * List boms
-     *
-     * Get a list of boms
-     *
-     * @param string	       $sortfield	        Sort field
-     * @param string	       $sortorder	        Sort order
-     * @param int		       $limit		        Limit for list
-     * @param int		       $page		        Page number
-     * @param string           $sqlfilters          Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"
-     * @return  array                               Array of order objects
-     *
-     * @throws RestException
-     */
-    public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $sqlfilters = '')
-    {
-        global $db, $conf;
+	/**
+	 * List boms
+	 *
+	 * Get a list of boms
+	 *
+	 * @param string	       $sortfield	        Sort field
+	 * @param string	       $sortorder	        Sort order
+	 * @param int		       $limit		        Limit for list
+	 * @param int		       $page		        Page number
+	 * @param string           $sqlfilters          Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"
+	 * @return  array                               Array of order objects
+	 *
+	 * @throws RestException
+	 */
+	public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $sqlfilters = '')
+	{
+		global $db, $conf;
 
-        $obj_ret = array();
-        $tmpobject = new BOM($this->db);
+		$obj_ret = array();
+		$tmpobject = new BOM($this->db);
 
-        $socid = DolibarrApiAccess::$user->socid ? DolibarrApiAccess::$user->socid : '';
+		$socid = DolibarrApiAccess::$user->socid ? DolibarrApiAccess::$user->socid : '';
 
-        $restrictonsocid = 0; // Set to 1 if there is a field socid in table of object
+		$restrictonsocid = 0; // Set to 1 if there is a field socid in table of object
 
-        // If the internal user must only see his customers, force searching by him
-        $search_sale = 0;
-        if ($restrictonsocid && !DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) $search_sale = DolibarrApiAccess::$user->id;
+		// If the internal user must only see his customers, force searching by him
+		$search_sale = 0;
+		if ($restrictonsocid && !DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) $search_sale = DolibarrApiAccess::$user->id;
 
-        $sql = "SELECT t.rowid";
-        if ($restrictonsocid && (!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
-        $sql .= " FROM ".MAIN_DB_PREFIX.$tmpobject->table_element." as t";
+		$sql = "SELECT t.rowid";
+		if ($restrictonsocid && (!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
+		$sql .= " FROM ".MAIN_DB_PREFIX.$tmpobject->table_element." as t";
 
-        if ($restrictonsocid && (!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
-        $sql .= " WHERE 1 = 1";
+		if ($restrictonsocid && (!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
+		$sql .= " WHERE 1 = 1";
 
-        // Example of use $mode
-        //if ($mode == 1) $sql.= " AND s.client IN (1, 3)";
-        //if ($mode == 2) $sql.= " AND s.client IN (2, 3)";
+		// Example of use $mode
+		//if ($mode == 1) $sql.= " AND s.client IN (1, 3)";
+		//if ($mode == 2) $sql.= " AND s.client IN (2, 3)";
 
-        if ($tmpobject->ismultientitymanaged) $sql .= ' AND t.entity IN ('.getEntity($tmpobject->element).')';
-        if ($restrictonsocid && (!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql .= " AND t.fk_soc = sc.fk_soc";
-        if ($restrictonsocid && $socid) $sql .= " AND t.fk_soc = ".$socid;
-        if ($restrictonsocid && $search_sale > 0) $sql .= " AND t.rowid = sc.fk_soc"; // Join for the needed table to filter by sale
-        // Insert sale filter
-        if ($restrictonsocid && $search_sale > 0)
-        {
-            $sql .= " AND sc.fk_user = ".$search_sale;
-        }
-        if ($sqlfilters)
-        {
-            if (!DolibarrApi::_checkFilters($sqlfilters))
-            {
-                throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
-            }
-	        $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-        }
+		if ($tmpobject->ismultientitymanaged) $sql .= ' AND t.entity IN ('.getEntity($tmpobject->element).')';
+		if ($restrictonsocid && (!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql .= " AND t.fk_soc = sc.fk_soc";
+		if ($restrictonsocid && $socid) $sql .= " AND t.fk_soc = ".$socid;
+		if ($restrictonsocid && $search_sale > 0) $sql .= " AND t.rowid = sc.fk_soc"; // Join for the needed table to filter by sale
+		// Insert sale filter
+		if ($restrictonsocid && $search_sale > 0)
+		{
+			$sql .= " AND sc.fk_user = ".$search_sale;
+		}
+		if ($sqlfilters)
+		{
+			if (!DolibarrApi::_checkFilters($sqlfilters)) {
+				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+			}
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
 
-        $sql .= $this->db->order($sortfield, $sortorder);
-        if ($limit) {
-            if ($page < 0)
-            {
-                $page = 0;
-            }
-            $offset = $limit * $page;
+		$sql .= $this->db->order($sortfield, $sortorder);
+		if ($limit) {
+			if ($page < 0)
+			{
+				$page = 0;
+			}
+			$offset = $limit * $page;
 
-            $sql .= $this->db->plimit($limit + 1, $offset);
-        }
+			$sql .= $this->db->plimit($limit + 1, $offset);
+		}
 
-        $result = $this->db->query($sql);
-        if ($result)
-        {
-        	$num = $this->db->num_rows($result);
-            $i = 0;
-            while ($i < $num)
-            {
-            	$obj = $this->db->fetch_object($result);
-            	$bom_static = new BOM($this->db);
-                if ($bom_static->fetch($obj->rowid)) {
-                    $obj_ret[] = $this->_cleanObjectDatas($bom_static);
-                }
-                $i++;
-            }
-        } else {
-            throw new RestException(503, 'Error when retrieve bom list');
-        }
-        if (!count($obj_ret)) {
-            throw new RestException(404, 'No bom found');
-        }
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+			$num = $this->db->num_rows($result);
+			$i = 0;
+			while ($i < $num)
+			{
+				$obj = $this->db->fetch_object($result);
+				$bom_static = new BOM($this->db);
+				if ($bom_static->fetch($obj->rowid)) {
+					$obj_ret[] = $this->_cleanObjectDatas($bom_static);
+				}
+				$i++;
+			}
+		} else {
+			throw new RestException(503, 'Error when retrieve bom list');
+		}
+		if (!count($obj_ret)) {
+			throw new RestException(404, 'No bom found');
+		}
 		return $obj_ret;
-    }
+	}
 
-    /**
-     * Create bom object
-     *
-     * @param array $request_data   Request datas
-     * @return int  ID of bom
-     */
-    public function post($request_data = null)
-    {
-        if (!DolibarrApiAccess::$user->rights->bom->write) {
-            throw new RestException(401);
-        }
-        // Check mandatory fields
-        $result = $this->_validate($request_data);
+	/**
+	 * Create bom object
+	 *
+	 * @param array $request_data   Request datas
+	 * @return int  ID of bom
+	 */
+	public function post($request_data = null)
+	{
+		if (!DolibarrApiAccess::$user->rights->bom->write) {
+			throw new RestException(401);
+		}
+		// Check mandatory fields
+		$result = $this->_validate($request_data);
 
-        foreach ($request_data as $field => $value) {
-            $this->bom->$field = $value;
-        }
-        if (!$this->bom->create(DolibarrApiAccess::$user)) {
-            throw new RestException(500, "Error creating BOM", array_merge(array($this->bom->error), $this->bom->errors));
-        }
-        return $this->bom->id;
-    }
+		foreach ($request_data as $field => $value) {
+			$this->bom->$field = $value;
+		}
+		if (!$this->bom->create(DolibarrApiAccess::$user)) {
+			throw new RestException(500, "Error creating BOM", array_merge(array($this->bom->error), $this->bom->errors));
+		}
+		return $this->bom->id;
+	}
 
-    /**
-     * Update bom
-     *
-     * @param int   $id             Id of bom to update
-     * @param array $request_data   Datas
-     *
-     * @return int
-     */
-    public function put($id, $request_data = null)
-    {
-        if (!DolibarrApiAccess::$user->rights->bom->write) {
-            throw new RestException(401);
-        }
+	/**
+	 * Update bom
+	 *
+	 * @param int   $id             Id of bom to update
+	 * @param array $request_data   Datas
+	 *
+	 * @return int
+	 */
+	public function put($id, $request_data = null)
+	{
+		if (!DolibarrApiAccess::$user->rights->bom->write) {
+			throw new RestException(401);
+		}
 
-        $result = $this->bom->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'BOM not found');
-        }
+		$result = $this->bom->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'BOM not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('bom', $this->bom->id, 'bom_bom')) {
+		if (!DolibarrApi::_checkAccessToResource('bom', $this->bom->id, 'bom_bom')) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
-        foreach ($request_data as $field => $value) {
-            if ($field == 'id') continue;
-            $this->bom->$field = $value;
-        }
+		foreach ($request_data as $field => $value) {
+			if ($field == 'id') continue;
+			$this->bom->$field = $value;
+		}
 
-        if ($this->bom->update($id, DolibarrApiAccess::$user) > 0)
-        {
-            return $this->get($id);
-        } else {
-            throw new RestException(500, $this->bom->error);
-        }
-    }
+		if ($this->bom->update(DolibarrApiAccess::$user) > 0) {
+			return $this->get($id);
+		} else {
+			throw new RestException(500, $this->bom->error);
+		}
+	}
 
-    /**
-     * Delete bom
-     *
-     * @param   int     $id   BOM ID
-     * @return  array
-     */
-    public function delete($id)
-    {
-    	if (!DolibarrApiAccess::$user->rights->bom->delete) {
+	/**
+	 * Delete bom
+	 *
+	 * @param   int     $id   BOM ID
+	 * @return  array
+	 */
+	public function delete($id)
+	{
+		if (!DolibarrApiAccess::$user->rights->bom->delete) {
 			throw new RestException(401);
 		}
-        $result = $this->bom->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'BOM not found');
-        }
+		$result = $this->bom->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'BOM not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('bom', $this->bom->id, 'bom_bom')) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('bom', $this->bom->id, 'bom_bom')) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
 		if (!$this->bom->delete(DolibarrApiAccess::$user))
-        {
-            throw new RestException(500, 'Error when deleting BOM : '.$this->bom->error);
-        }
+		{
+			throw new RestException(500, 'Error when deleting BOM : '.$this->bom->error);
+		}
 
-        return array(
-            'success' => array(
-                'code' => 200,
-                'message' => 'BOM deleted'
-            )
-        );
-    }
+		return array(
+			'success' => array(
+				'code' => 200,
+				'message' => 'BOM deleted'
+			)
+		);
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
-    /**
-     * Clean sensible object datas
-     *
-     * @param   object  $object     Object to clean
-     * @return  array               Array of cleaned object properties
-     */
-    protected function _cleanObjectDatas($object)
-    {
-        // phpcs:enable
-    	$object = parent::_cleanObjectDatas($object);
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	/**
+	 * Clean sensible object datas
+	 *
+	 * @param   Object  $object     Object to clean
+	 * @return  Object              Object with cleaned properties
+	 */
+	protected function _cleanObjectDatas($object)
+	{
+		// phpcs:enable
+		$object = parent::_cleanObjectDatas($object);
 
-    	unset($object->rowid);
-    	unset($object->canvas);
+		unset($object->rowid);
+		unset($object->canvas);
 
-    	unset($object->name);
-    	unset($object->lastname);
-    	unset($object->firstname);
-    	unset($object->civility_id);
-    	unset($object->statut);
-    	unset($object->state);
-    	unset($object->state_id);
-    	unset($object->state_code);
-    	unset($object->region);
-    	unset($object->region_code);
-    	unset($object->country);
-    	unset($object->country_id);
-    	unset($object->country_code);
-    	unset($object->barcode_type);
-    	unset($object->barcode_type_code);
-    	unset($object->barcode_type_label);
-    	unset($object->barcode_type_coder);
-    	unset($object->total_ht);
-    	unset($object->total_tva);
-    	unset($object->total_localtax1);
-    	unset($object->total_localtax2);
-    	unset($object->total_ttc);
-    	unset($object->fk_account);
-    	unset($object->comments);
-    	unset($object->note);
-    	unset($object->mode_reglement_id);
-    	unset($object->cond_reglement_id);
-    	unset($object->cond_reglement);
-    	unset($object->shipping_method_id);
-    	unset($object->fk_incoterms);
-    	unset($object->label_incoterms);
-    	unset($object->location_incoterms);
+		unset($object->name);
+		unset($object->lastname);
+		unset($object->firstname);
+		unset($object->civility_id);
+		unset($object->statut);
+		unset($object->state);
+		unset($object->state_id);
+		unset($object->state_code);
+		unset($object->region);
+		unset($object->region_code);
+		unset($object->country);
+		unset($object->country_id);
+		unset($object->country_code);
+		unset($object->barcode_type);
+		unset($object->barcode_type_code);
+		unset($object->barcode_type_label);
+		unset($object->barcode_type_coder);
+		unset($object->total_ht);
+		unset($object->total_tva);
+		unset($object->total_localtax1);
+		unset($object->total_localtax2);
+		unset($object->total_ttc);
+		unset($object->fk_account);
+		unset($object->comments);
+		unset($object->note);
+		unset($object->mode_reglement_id);
+		unset($object->cond_reglement_id);
+		unset($object->cond_reglement);
+		unset($object->shipping_method_id);
+		unset($object->fk_incoterms);
+		unset($object->label_incoterms);
+		unset($object->location_incoterms);
 
-    	// If object has lines, remove $db property
-    	if (isset($object->lines) && is_array($object->lines) && count($object->lines) > 0) {
-    		$nboflines = count($object->lines);
-    		for ($i = 0; $i < $nboflines; $i++)
-    		{
-    			$this->_cleanObjectDatas($object->lines[$i]);
+		// If object has lines, remove $db property
+		if (isset($object->lines) && is_array($object->lines) && count($object->lines) > 0) {
+			$nboflines = count($object->lines);
+			for ($i = 0; $i < $nboflines; $i++)
+			{
+				$this->_cleanObjectDatas($object->lines[$i]);
 
-    			unset($object->lines[$i]->lines);
-    			unset($object->lines[$i]->note);
-    		}
-    	}
+				unset($object->lines[$i]->lines);
+				unset($object->lines[$i]->note);
+			}
+		}
 
-    	return $object;
-    }
+		return $object;
+	}
 
-    /**
-     * Validate fields before create or update object
-     *
-     * @param	array		$data   Array of data to validate
-     * @return	array
-     *
-     * @throws	RestException
-     */
-    private function _validate($data)
-    {
-        $myobject = array();
-        foreach ($this->bom->fields as $field => $propfield) {
-            if (in_array($field, array('rowid', 'entity', 'date_creation', 'tms', 'fk_user_creat')) || $propfield['notnull'] != 1) continue; // Not a mandatory field
-            if (!isset($data[$field]))
-                throw new RestException(400, "$field field missing");
-                $myobject[$field] = $data[$field];
-        }
-        return $myobject;
-    }
+	/**
+	 * Validate fields before create or update object
+	 *
+	 * @param	array		$data   Array of data to validate
+	 * @return	array
+	 *
+	 * @throws	RestException
+	 */
+	private function _validate($data)
+	{
+		$myobject = array();
+		foreach ($this->bom->fields as $field => $propfield) {
+			if (in_array($field, array('rowid', 'entity', 'date_creation', 'tms', 'fk_user_creat')) || $propfield['notnull'] != 1) continue; // Not a mandatory field
+			if (!isset($data[$field]))
+				throw new RestException(400, "$field field missing");
+				$myobject[$field] = $data[$field];
+		}
+		return $myobject;
+	}
 }
diff --git a/htdocs/bom/class/bom.class.php b/htdocs/bom/class/bom.class.php
index 4e5d28274a8..9f3679ac44a 100644
--- a/htdocs/bom/class/bom.class.php
+++ b/htdocs/bom/class/bom.class.php
@@ -94,7 +94,7 @@ class BOM extends CommonObject
 		'label' => array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>1, 'visible'=>1, 'position'=>30, 'notnull'=>1, 'searchall'=>1, 'showoncombobox'=>'1', 'autofocusoncreate'=>1),
 		'description' => array('type'=>'text', 'label'=>'Description', 'enabled'=>1, 'visible'=>-1, 'position'=>60, 'notnull'=>-1,),
 		'fk_product' => array('type'=>'integer:Product:product/class/product.class.php:1:(finished IS NULL or finished <> 0)', 'label'=>'Product', 'enabled'=>1, 'visible'=>1, 'position'=>35, 'notnull'=>1, 'index'=>1, 'help'=>'ProductBOMHelp'),
-	    'qty' => array('type'=>'real', 'label'=>'Quantity', 'enabled'=>1, 'visible'=>1, 'default'=>1, 'position'=>55, 'notnull'=>1, 'isameasure'=>'1', 'css'=>'maxwidth75imp'),
+		'qty' => array('type'=>'real', 'label'=>'Quantity', 'enabled'=>1, 'visible'=>1, 'default'=>1, 'position'=>55, 'notnull'=>1, 'isameasure'=>'1', 'css'=>'maxwidth75imp'),
 		//'efficiency' => array('type'=>'real', 'label'=>'ManufacturingEfficiency', 'enabled'=>1, 'visible'=>-1, 'default'=>1, 'position'=>100, 'notnull'=>0, 'css'=>'maxwidth50imp', 'help'=>'ValueOfMeansLossForProductProduced'),
 		'duration' => array('type'=>'duration', 'label'=>'EstimatedDuration', 'enabled'=>1, 'visible'=>-1, 'position'=>101, 'notnull'=>-1, 'css'=>'maxwidth50imp', 'help'=>'EstimatedDurationDesc'),
 		'fk_warehouse' => array('type'=>'integer:Entrepot:product/stock/class/entrepot.class.php:0', 'label'=>'WarehouseForProduction', 'enabled'=>1, 'visible'=>-1, 'position'=>102),
@@ -118,8 +118,8 @@ class BOM extends CommonObject
 	public $note_private;
 
 	/**
-     * @var integer|string date_creation
-     */
+	 * @var integer|string date_creation
+	 */
 	public $date_creation;
 
 
@@ -204,7 +204,7 @@ class BOM extends CommonObject
 		// Translate some data of arrayofkeyval
 		foreach ($this->fields as $key => $val)
 		{
-			if (is_array($val['arrayofkeyval']))
+			if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval']))
 			{
 				foreach ($val['arrayofkeyval'] as $key2 => $val2)
 				{
@@ -238,89 +238,89 @@ class BOM extends CommonObject
 	public function createFromClone(User $user, $fromid)
 	{
 		global $langs, $hookmanager, $extrafields;
-	    $error = 0;
+		$error = 0;
 
-	    dol_syslog(__METHOD__, LOG_DEBUG);
+		dol_syslog(__METHOD__, LOG_DEBUG);
 
-	    $object = new self($this->db);
+		$object = new self($this->db);
 
-	    $this->db->begin();
+		$this->db->begin();
 
-	    // Load source object
-	    $result = $object->fetchCommon($fromid);
-	    if ($result > 0 && !empty($object->table_element_line)) $object->fetchLines();
+		// Load source object
+		$result = $object->fetchCommon($fromid);
+		if ($result > 0 && !empty($object->table_element_line)) $object->fetchLines();
 
-	    // Get lines so they will be clone
-	    //foreach ($object->lines as $line)
-	    //	$line->fetch_optionals();
+		// Get lines so they will be clone
+		//foreach ($object->lines as $line)
+		//	$line->fetch_optionals();
 
-	    // Reset some properties
-	    unset($object->id);
-	    unset($object->fk_user_creat);
-	    unset($object->import_key);
+		// Reset some properties
+		unset($object->id);
+		unset($object->fk_user_creat);
+		unset($object->import_key);
 
-	    // Clear fields
-	    $object->ref = empty($this->fields['ref']['default']) ? $langs->trans("copy_of_").$object->ref : $this->fields['ref']['default'];
-	    $object->label = empty($this->fields['label']['default']) ? $langs->trans("CopyOf")." ".$object->label : $this->fields['label']['default'];
-	    $object->status = self::STATUS_DRAFT;
-	    // ...
-	    // Clear extrafields that are unique
-	    if (is_array($object->array_options) && count($object->array_options) > 0)
-	    {
-	    	$extrafields->fetch_name_optionals_label($object->table_element);
-	    	foreach ($object->array_options as $key => $option)
-	    	{
-	    		$shortkey = preg_replace('/options_/', '', $key);
-	    		if (!empty($extrafields->attributes[$this->element]['unique'][$shortkey]))
-	    		{
-	    			//var_dump($key); var_dump($clonedObj->array_options[$key]); exit;
-	    			unset($object->array_options[$key]);
-	    		}
-	    	}
-	    }
+		// Clear fields
+		$object->ref = empty($this->fields['ref']['default']) ? $langs->trans("copy_of_").$object->ref : $this->fields['ref']['default'];
+		$object->label = empty($this->fields['label']['default']) ? $langs->trans("CopyOf")." ".$object->label : $this->fields['label']['default'];
+		$object->status = self::STATUS_DRAFT;
+		// ...
+		// Clear extrafields that are unique
+		if (is_array($object->array_options) && count($object->array_options) > 0)
+		{
+			$extrafields->fetch_name_optionals_label($object->table_element);
+			foreach ($object->array_options as $key => $option)
+			{
+				$shortkey = preg_replace('/options_/', '', $key);
+				if (!empty($extrafields->attributes[$this->element]['unique'][$shortkey]))
+				{
+					//var_dump($key); var_dump($clonedObj->array_options[$key]); exit;
+					unset($object->array_options[$key]);
+				}
+			}
+		}
 
-	    // Create clone
+		// Create clone
 		$object->context['createfromclone'] = 'createfromclone';
-	    $result = $object->createCommon($user);
-	    if ($result < 0) {
-	        $error++;
-	        $this->error = $object->error;
-	        $this->errors = $object->errors;
-	    }
+		$result = $object->createCommon($user);
+		if ($result < 0) {
+			$error++;
+			$this->error = $object->error;
+			$this->errors = $object->errors;
+		}
 
-	    if (!$error)
-	    {
-	    	// copy internal contacts
-	    	if ($this->copy_linked_contact($object, 'internal') < 0)
-	    	{
-	    		$error++;
-	    	}
-	    }
+		if (!$error)
+		{
+			// copy internal contacts
+			if ($this->copy_linked_contact($object, 'internal') < 0)
+			{
+				$error++;
+			}
+		}
 
-	    if (!$error)
-	    {
-	    	// copy external contacts if same company
-	    	if (property_exists($this, 'socid') && $this->socid == $object->socid)
-	    	{
-	    		if ($this->copy_linked_contact($object, 'external') < 0)
-	    			$error++;
-	    	}
-	    }
+		if (!$error)
+		{
+			// copy external contacts if same company
+			if (property_exists($this, 'socid') && $this->socid == $object->socid)
+			{
+				if ($this->copy_linked_contact($object, 'external') < 0)
+					$error++;
+			}
+		}
 
-	    // If there is lines, create lines too
+		// If there is lines, create lines too
 
 
 
-	    unset($object->context['createfromclone']);
+		unset($object->context['createfromclone']);
 
-	    // End
-	    if (!$error) {
-	        $this->db->commit();
-	        return $object;
-	    } else {
-	        $this->db->rollback();
-	        return -1;
-	    }
+		// End
+		if (!$error) {
+			$this->db->commit();
+			return $object;
+		} else {
+			$this->db->rollback();
+			return -1;
+		}
 	}
 
 	/**
@@ -480,47 +480,47 @@ class BOM extends CommonObject
 	 */
 	public function getNextNumRef($prod)
 	{
-	    global $langs, $conf;
-	    $langs->load("mrp");
+		global $langs, $conf;
+		$langs->load("mrp");
 
-	    if (!empty($conf->global->BOM_ADDON))
-	    {
-	        $mybool = false;
+		if (!empty($conf->global->BOM_ADDON))
+		{
+			$mybool = false;
 
-	        $file = $conf->global->BOM_ADDON.".php";
-	        $classname = $conf->global->BOM_ADDON;
+			$file = $conf->global->BOM_ADDON.".php";
+			$classname = $conf->global->BOM_ADDON;
 
-	        // Include file with class
-	        $dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
-	        foreach ($dirmodels as $reldir)
-	        {
-	            $dir = dol_buildpath($reldir."core/modules/bom/");
+			// Include file with class
+			$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
+			foreach ($dirmodels as $reldir)
+			{
+				$dir = dol_buildpath($reldir."core/modules/bom/");
 
-	            // Load file with numbering class (if found)
-	            $mybool |= @include_once $dir.$file;
-	        }
+				// Load file with numbering class (if found)
+				$mybool |= @include_once $dir.$file;
+			}
 
-	        if ($mybool === false)
-	        {
-	            dol_print_error('', "Failed to include file ".$file);
-	            return '';
-	        }
+			if ($mybool === false)
+			{
+				dol_print_error('', "Failed to include file ".$file);
+				return '';
+			}
 
-	        $obj = new $classname();
-	        $numref = $obj->getNextValue($prod, $this);
+			$obj = new $classname();
+			$numref = $obj->getNextValue($prod, $this);
 
-	        if ($numref != "")
-	        {
-	            return $numref;
-	        } else {
-	            $this->error = $obj->error;
-	            //dol_print_error($this->db,get_class($this)."::getNextNumRef ".$obj->error);
-	            return "";
-	        }
-	    } else {
-	        print $langs->trans("Error")." ".$langs->trans("Error_BOM_ADDON_NotDefined");
-	        return "";
-	    }
+			if ($numref != "")
+			{
+				return $numref;
+			} else {
+				$this->error = $obj->error;
+				//dol_print_error($this->db,get_class($this)."::getNextNumRef ".$obj->error);
+				return "";
+			}
+		} else {
+			print $langs->trans("Error")." ".$langs->trans("Error_BOM_ADDON_NotDefined");
+			return "";
+		}
 	}
 
 	/**
@@ -532,20 +532,20 @@ class BOM extends CommonObject
 	 */
 	public function validate($user, $notrigger = 0)
 	{
-	    global $conf, $langs;
+		global $conf, $langs;
 
-	    require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-	    $error = 0;
+		$error = 0;
 
-	    // Protection
-	    if ($this->status == self::STATUS_VALIDATED)
-	    {
-	        dol_syslog(get_class($this)."::validate action abandonned: already validated", LOG_WARNING);
-	        return 0;
-	    }
+		// Protection
+		if ($this->status == self::STATUS_VALIDATED)
+		{
+			dol_syslog(get_class($this)."::validate action abandonned: already validated", LOG_WARNING);
+			return 0;
+		}
 
-	    /*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->bom->create))
+		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->bom->create))
 	        || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->bom->bom_advance->validate))))
 	    {
 	        $this->error='NotEnoughPermissions';
@@ -553,100 +553,100 @@ class BOM extends CommonObject
 	        return -1;
 	    }*/
 
-	    $now = dol_now();
+		$now = dol_now();
 
-	    $this->db->begin();
+		$this->db->begin();
 
-	    // Define new ref
-	    if (!$error && (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref))) // empty should not happened, but when it occurs, the test save life
-	    {
-	        $this->fetch_product();
-	        $num = $this->getNextNumRef($this->product);
-	    } else {
-	        $num = $this->ref;
-	    }
-	    $this->newref = dol_sanitizeFileName($num);
+		// Define new ref
+		if (!$error && (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref))) // empty should not happened, but when it occurs, the test save life
+		{
+			$this->fetch_product();
+			$num = $this->getNextNumRef($this->product);
+		} else {
+			$num = $this->ref;
+		}
+		$this->newref = dol_sanitizeFileName($num);
 
-	    // Validate
-	    $sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
-	    $sql .= " SET ref = '".$this->db->escape($num)."',";
-	    $sql .= " status = ".self::STATUS_VALIDATED.",";
-	    $sql .= " date_valid='".$this->db->idate($now)."',";
-	    $sql .= " fk_user_valid = ".$user->id;
-	    $sql .= " WHERE rowid = ".$this->id;
+		// Validate
+		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
+		$sql .= " SET ref = '".$this->db->escape($num)."',";
+		$sql .= " status = ".self::STATUS_VALIDATED.",";
+		$sql .= " date_valid='".$this->db->idate($now)."',";
+		$sql .= " fk_user_valid = ".$user->id;
+		$sql .= " WHERE rowid = ".$this->id;
 
-	    dol_syslog(get_class($this)."::validate()", LOG_DEBUG);
-	    $resql = $this->db->query($sql);
-	    if (!$resql)
-	    {
-	        dol_print_error($this->db);
-	        $this->error = $this->db->lasterror();
-	        $error++;
-	    }
+		dol_syslog(get_class($this)."::validate()", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if (!$resql)
+		{
+			dol_print_error($this->db);
+			$this->error = $this->db->lasterror();
+			$error++;
+		}
 
-	    if (!$error && !$notrigger)
-	    {
-	        // Call trigger
-	        $result = $this->call_trigger('BOM_VALIDATE', $user);
-	        if ($result < 0) $error++;
-	        // End call triggers
-	    }
+		if (!$error && !$notrigger)
+		{
+			// Call trigger
+			$result = $this->call_trigger('BOM_VALIDATE', $user);
+			if ($result < 0) $error++;
+			// End call triggers
+		}
 
-	    if (!$error)
-	    {
-	        $this->oldref = $this->ref;
+		if (!$error)
+		{
+			$this->oldref = $this->ref;
 
-	        // Rename directory if dir was a temporary ref
-	        if (preg_match('/^[\(]?PROV/i', $this->ref))
-	        {
-	        	// Now we rename also files into index
-	        	$sql = 'UPDATE '.MAIN_DB_PREFIX."ecm_files set filename = CONCAT('".$this->db->escape($this->newref)."', SUBSTR(filename, ".(strlen($this->ref) + 1).")), filepath = 'bom/".$this->db->escape($this->newref)."'";
-	        	$sql .= " WHERE filename LIKE '".$this->db->escape($this->ref)."%' AND filepath = 'bom/".$this->db->escape($this->ref)."' and entity = ".$conf->entity;
-	        	$resql = $this->db->query($sql);
-	        	if (!$resql) { $error++; $this->error = $this->db->lasterror(); }
+			// Rename directory if dir was a temporary ref
+			if (preg_match('/^[\(]?PROV/i', $this->ref))
+			{
+				// Now we rename also files into index
+				$sql = 'UPDATE '.MAIN_DB_PREFIX."ecm_files set filename = CONCAT('".$this->db->escape($this->newref)."', SUBSTR(filename, ".(strlen($this->ref) + 1).")), filepath = 'bom/".$this->db->escape($this->newref)."'";
+				$sql .= " WHERE filename LIKE '".$this->db->escape($this->ref)."%' AND filepath = 'bom/".$this->db->escape($this->ref)."' and entity = ".$conf->entity;
+				$resql = $this->db->query($sql);
+				if (!$resql) { $error++; $this->error = $this->db->lasterror(); }
 
-	        	// We rename directory ($this->ref = old ref, $num = new ref) in order not to lose the attachments
-	        	$oldref = dol_sanitizeFileName($this->ref);
-	            $newref = dol_sanitizeFileName($num);
-	            $dirsource = $conf->bom->dir_output.'/'.$oldref;
-	            $dirdest = $conf->bom->dir_output.'/'.$newref;
-	            if (!$error && file_exists($dirsource))
-	            {
-	                dol_syslog(get_class($this)."::validate() rename dir ".$dirsource." into ".$dirdest);
+				// We rename directory ($this->ref = old ref, $num = new ref) in order not to lose the attachments
+				$oldref = dol_sanitizeFileName($this->ref);
+				$newref = dol_sanitizeFileName($num);
+				$dirsource = $conf->bom->dir_output.'/'.$oldref;
+				$dirdest = $conf->bom->dir_output.'/'.$newref;
+				if (!$error && file_exists($dirsource))
+				{
+					dol_syslog(get_class($this)."::validate() rename dir ".$dirsource." into ".$dirdest);
 
-	                if (@rename($dirsource, $dirdest))
-	                {
-	                    dol_syslog("Rename ok");
-	                    // Rename docs starting with $oldref with $newref
-	                    $listoffiles = dol_dir_list($conf->bom->dir_output.'/'.$newref, 'files', 1, '^'.preg_quote($oldref, '/'));
-	                    foreach ($listoffiles as $fileentry)
-	                    {
-	                        $dirsource = $fileentry['name'];
-	                        $dirdest = preg_replace('/^'.preg_quote($oldref, '/').'/', $newref, $dirsource);
-	                        $dirsource = $fileentry['path'].'/'.$dirsource;
-	                        $dirdest = $fileentry['path'].'/'.$dirdest;
-	                        @rename($dirsource, $dirdest);
-	                    }
-	                }
-	            }
-	        }
-	    }
+					if (@rename($dirsource, $dirdest))
+					{
+						dol_syslog("Rename ok");
+						// Rename docs starting with $oldref with $newref
+						$listoffiles = dol_dir_list($conf->bom->dir_output.'/'.$newref, 'files', 1, '^'.preg_quote($oldref, '/'));
+						foreach ($listoffiles as $fileentry)
+						{
+							$dirsource = $fileentry['name'];
+							$dirdest = preg_replace('/^'.preg_quote($oldref, '/').'/', $newref, $dirsource);
+							$dirsource = $fileentry['path'].'/'.$dirsource;
+							$dirdest = $fileentry['path'].'/'.$dirdest;
+							@rename($dirsource, $dirdest);
+						}
+					}
+				}
+			}
+		}
 
-	    // Set new ref and current status
-	    if (!$error)
-	    {
-	        $this->ref = $num;
-	        $this->status = self::STATUS_VALIDATED;
-	    }
+		// Set new ref and current status
+		if (!$error)
+		{
+			$this->ref = $num;
+			$this->status = self::STATUS_VALIDATED;
+		}
 
-	    if (!$error)
-	    {
-	        $this->db->commit();
-	        return 1;
-	    } else {
-	        $this->db->rollback();
-	        return -1;
-	    }
+		if (!$error)
+		{
+			$this->db->commit();
+			return 1;
+		} else {
+			$this->db->rollback();
+			return -1;
+		}
 	}
 
 	/**
@@ -730,56 +730,56 @@ class BOM extends CommonObject
 	 *
 	 *	@param	int		$withpicto					Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
 	 *	@param	string	$option						On what the link point to ('nolink', ...)
-     *  @param	int  	$notooltip					1=Disable tooltip
-     *  @param  string  $morecss            		Add more css on link
-     *  @param  int     $save_lastsearch_value    	-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+	 *  @param	int  	$notooltip					1=Disable tooltip
+	 *  @param  string  $morecss            		Add more css on link
+	 *  @param  int     $save_lastsearch_value    	-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
 	 *	@return	string								String with URL
 	 */
 	public function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $morecss = '', $save_lastsearch_value = -1)
 	{
 		global $db, $conf, $langs, $hookmanager;
-        global $dolibarr_main_authentication, $dolibarr_main_demo;
-        global $menumanager;
+		global $dolibarr_main_authentication, $dolibarr_main_demo;
+		global $menumanager;
 
-        if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
+		if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
 
-        $result = '';
+		$result = '';
 
-        $label = img_picto('', $this->picto).' <u>'.$langs->trans("BillOfMaterials").'</u>';
-        $label .= '<br>';
-        $label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref;
-        if (isset($this->status)) {
-        	$label .= '<br><b>'.$langs->trans("Status").":</b> ".$this->getLibStatut(5);
-        }
+		$label = img_picto('', $this->picto).' <u>'.$langs->trans("BillOfMaterials").'</u>';
+		$label .= '<br>';
+		$label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref;
+		if (isset($this->status)) {
+			$label .= '<br><b>'.$langs->trans("Status").":</b> ".$this->getLibStatut(5);
+		}
 
-        $url = dol_buildpath('/bom/bom_card.php', 1).'?id='.$this->id;
+		$url = dol_buildpath('/bom/bom_card.php', 1).'?id='.$this->id;
 
-        if ($option != 'nolink')
-        {
-	        // Add param to save lastsearch_values or not
-	        $add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
-	        if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
-	        if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
-        }
+		if ($option != 'nolink')
+		{
+			// Add param to save lastsearch_values or not
+			$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
+			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
+			if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
+		}
 
-        $linkclose = '';
-        if (empty($notooltip))
-        {
-            if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-            {
-                $label = $langs->trans("ShowBillOfMaterials");
-                $linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
-            }
-            $linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
-            $linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
+		$linkclose = '';
+		if (empty($notooltip))
+		{
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+			{
+				$label = $langs->trans("ShowBillOfMaterials");
+				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
+			}
+			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
+			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
 
-            /*
+			/*
              $hookmanager->initHooks(array('bomdao'));
              $parameters=array('id'=>$this->id);
              $reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
              if ($reshook > 0) $linkclose = $hookmanager->resPrint;
              */
-        } else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+		} else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
 		$linkstart = '<a href="'.$url.'"';
 		$linkstart .= $linkclose.'>';
@@ -812,7 +812,7 @@ class BOM extends CommonObject
 		return $this->LibStatut($this->status, $mode);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return the status
 	 *
@@ -897,20 +897,20 @@ class BOM extends CommonObject
 	 */
 	public function getLinesArray()
 	{
-	    $this->lines = array();
+		$this->lines = array();
 
-	    $objectline = new BOMLine($this->db);
-	    $result = $objectline->fetchAll('ASC', 'position', 0, 0, array('customsql'=>'fk_bom = '.$this->id));
+		$objectline = new BOMLine($this->db);
+		$result = $objectline->fetchAll('ASC', 'position', 0, 0, array('customsql'=>'fk_bom = '.$this->id));
 
-	    if (is_numeric($result))
-	    {
-	        $this->error = $this->error;
-	        $this->errors = $this->errors;
-	        return $result;
-	    } else {
-	        $this->lines = $result;
-	        return $this->lines;
-	    }
+		if (is_numeric($result))
+		{
+			$this->error = $this->error;
+			$this->errors = $this->errors;
+			return $result;
+		} else {
+			$this->lines = $result;
+			return $this->lines;
+		}
 	}
 
 	/**
@@ -954,9 +954,9 @@ class BOM extends CommonObject
 	 */
 	public function initAsSpecimen()
 	{
-	    $this->initAsSpecimenCommon();
-	    $this->ref = 'BOM-123';
-	    $this->date = $this->date_creation;
+		$this->initAsSpecimenCommon();
+		$this->ref = 'BOM-123';
+		$this->date = $this->date_creation;
 	}
 
 
@@ -1005,9 +1005,9 @@ class BOM extends CommonObject
 
 		foreach ($this->lines as &$line) {
 			$tmpproduct = new Product($this->db);
-			$result= $tmpproduct->fetch($line->fk_product);
+			$result = $tmpproduct->fetch($line->fk_product);
 			if ($result < 0) {
-				$this->error=$tmpproduct->error;
+				$this->error = $tmpproduct->error;
 				return -1;
 			}
 			$line->unit_cost = price2num((!empty($tmpproduct->cost_price)) ? $tmpproduct->cost_price : $tmpproduct->pmp);
@@ -1091,8 +1091,8 @@ class BOMLine extends CommonObjectLine
 		'description' => array('type'=>'text', 'label'=>'Description', 'enabled'=>1, 'visible'=>-1, 'position'=>60, 'notnull'=>-1,),
 		'qty' => array('type'=>'double(24,8)', 'label'=>'Quantity', 'enabled'=>1, 'visible'=>1, 'position'=>100, 'notnull'=>1, 'isameasure'=>'1',),
 		'qty_frozen' => array('type'=>'smallint', 'label'=>'QuantityFrozen', 'enabled'=>1, 'visible'=>1, 'default'=>0, 'position'=>105, 'css'=>'maxwidth50imp', 'help'=>'QuantityConsumedInvariable'),
-	    'disable_stock_change' => array('type'=>'smallint', 'label'=>'DisableStockChange', 'enabled'=>1, 'visible'=>1, 'default'=>0, 'position'=>108, 'css'=>'maxwidth50imp', 'help'=>'DisableStockChangeHelp'),
-	    'efficiency' => array('type'=>'double(24,8)', 'label'=>'ManufacturingEfficiency', 'enabled'=>1, 'visible'=>0, 'default'=>1, 'position'=>110, 'notnull'=>1, 'css'=>'maxwidth50imp', 'help'=>'ValueOfEfficiencyConsumedMeans'),
+		'disable_stock_change' => array('type'=>'smallint', 'label'=>'DisableStockChange', 'enabled'=>1, 'visible'=>1, 'default'=>0, 'position'=>108, 'css'=>'maxwidth50imp', 'help'=>'DisableStockChangeHelp'),
+		'efficiency' => array('type'=>'double(24,8)', 'label'=>'ManufacturingEfficiency', 'enabled'=>1, 'visible'=>0, 'default'=>1, 'position'=>110, 'notnull'=>1, 'css'=>'maxwidth50imp', 'help'=>'ValueOfEfficiencyConsumedMeans'),
 		'position' => array('type'=>'integer', 'label'=>'Rank', 'enabled'=>1, 'visible'=>0, 'default'=>0, 'position'=>200, 'notnull'=>1,),
 		'import_key' => array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>-2, 'position'=>1000, 'notnull'=>-1,),
 	);
@@ -1145,7 +1145,7 @@ class BOMLine extends CommonObjectLine
 		// Translate some data of arrayofkeyval
 		foreach ($this->fields as $key => $val)
 		{
-			if (is_array($val['arrayofkeyval']))
+			if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval']))
 			{
 				foreach ($val['arrayofkeyval'] as $key2 => $val2)
 				{
@@ -1287,51 +1287,51 @@ class BOMLine extends CommonObjectLine
 	 *
 	 *	@param	int		$withpicto					Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
 	 *	@param	string	$option						On what the link point to ('nolink', ...)
-     *  @param	int  	$notooltip					1=Disable tooltip
-     *  @param  string  $morecss            		Add more css on link
-     *  @param  int     $save_lastsearch_value    	-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
-     *  @return	string								String with URL
-     */
-    public function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $morecss = '', $save_lastsearch_value = -1)
-    {
-        global $db, $conf, $langs, $hookmanager;
+	 *  @param	int  	$notooltip					1=Disable tooltip
+	 *  @param  string  $morecss            		Add more css on link
+	 *  @param  int     $save_lastsearch_value    	-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+	 *  @return	string								String with URL
+	 */
+	public function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $morecss = '', $save_lastsearch_value = -1)
+	{
+		global $db, $conf, $langs, $hookmanager;
 
-        if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
+		if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
 
-        $result = '';
+		$result = '';
 
-        $label = '<u>'.$langs->trans("BillOfMaterialsLine").'</u>';
-        $label .= '<br>';
-        $label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref;
+		$label = '<u>'.$langs->trans("BillOfMaterialsLine").'</u>';
+		$label .= '<br>';
+		$label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref;
 
-        $url = dol_buildpath('/bom/bomline_card.php', 1).'?id='.$this->id;
+		$url = dol_buildpath('/bom/bomline_card.php', 1).'?id='.$this->id;
 
-        if ($option != 'nolink')
-        {
-	        // Add param to save lastsearch_values or not
-	        $add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
-	        if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
-	        if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
-        }
+		if ($option != 'nolink')
+		{
+			// Add param to save lastsearch_values or not
+			$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
+			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
+			if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
+		}
 
-        $linkclose = '';
-        if (empty($notooltip))
-        {
-            if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-            {
-                $label = $langs->trans("ShowBillOfMaterialsLine");
-                $linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
-            }
-            $linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
-            $linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
+		$linkclose = '';
+		if (empty($notooltip))
+		{
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+			{
+				$label = $langs->trans("ShowBillOfMaterialsLine");
+				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
+			}
+			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
+			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
 
-            /*
+			/*
              $hookmanager->initHooks(array('bomlinedao'));
              $parameters=array('id'=>$this->id);
              $reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
              if ($reshook > 0) $linkclose = $hookmanager->resPrint;
              */
-        } else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+		} else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
 		$linkstart = '<a href="'.$url.'"';
 		$linkstart .= $linkclose.'>';
@@ -1351,7 +1351,7 @@ class BOMLine extends CommonObjectLine
 		else $result .= $hookmanager->resPrint;
 
 		return $result;
-    }
+	}
 
 	/**
 	 *  Return label of the status
@@ -1364,7 +1364,7 @@ class BOMLine extends CommonObjectLine
 		return $this->LibStatut($this->status, $mode);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return the status
 	 *
diff --git a/htdocs/bom/lib/bom.lib.php b/htdocs/bom/lib/bom.lib.php
index e88b1aa32a3..313c7a1a7ff 100644
--- a/htdocs/bom/lib/bom.lib.php
+++ b/htdocs/bom/lib/bom.lib.php
@@ -76,55 +76,55 @@ function bomAdminPrepareHead()
  */
 function bomPrepareHead($object)
 {
-    global $db, $langs, $conf;
+	global $db, $langs, $conf;
 
-    $langs->load("mrp");
+	$langs->load("mrp");
 
-    $h = 0;
-    $head = array();
+	$h = 0;
+	$head = array();
 
-    $head[$h][0] = DOL_URL_ROOT."/bom/bom_card.php?id=".$object->id;
-    $head[$h][1] = $langs->trans("BOM");
-    $head[$h][2] = 'card';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT."/bom/bom_card.php?id=".$object->id;
+	$head[$h][1] = $langs->trans("BOM");
+	$head[$h][2] = 'card';
+	$h++;
 
-    if (isset($object->fields['note_public']) || isset($object->fields['note_private']))
-    {
-        $nbNote = 0;
-        if (!empty($object->note_private)) $nbNote++;
-        if (!empty($object->note_public)) $nbNote++;
-        $head[$h][0] = DOL_URL_ROOT.'/bom/bom_note.php?id='.$object->id;
-        $head[$h][1] = $langs->trans('Notes');
-        if ($nbNote > 0) $head[$h][1] .= (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '<span class="badge marginleftonlyshort">'.$nbNote.'</span>' : '');
-        $head[$h][2] = 'note';
-        $h++;
-    }
+	if (isset($object->fields['note_public']) || isset($object->fields['note_private']))
+	{
+		$nbNote = 0;
+		if (!empty($object->note_private)) $nbNote++;
+		if (!empty($object->note_public)) $nbNote++;
+		$head[$h][0] = DOL_URL_ROOT.'/bom/bom_note.php?id='.$object->id;
+		$head[$h][1] = $langs->trans('Notes');
+		if ($nbNote > 0) $head[$h][1] .= (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '<span class="badge marginleftonlyshort">'.$nbNote.'</span>' : '');
+		$head[$h][2] = 'note';
+		$h++;
+	}
 
-    require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-    require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-    $upload_dir = $conf->bom->dir_output."/bom/".dol_sanitizeFileName($object->ref);
-    $nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
-    $nbLinks = Link::count($db, $object->element, $object->id);
-    $head[$h][0] = DOL_URL_ROOT.'/bom/bom_document.php?id='.$object->id;
-    $head[$h][1] = $langs->trans('Documents');
-    if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>' : '');
-    $head[$h][2] = 'document';
-    $h++;
+	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
+	$upload_dir = $conf->bom->dir_output."/bom/".dol_sanitizeFileName($object->ref);
+	$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
+	$nbLinks = Link::count($db, $object->element, $object->id);
+	$head[$h][0] = DOL_URL_ROOT.'/bom/bom_document.php?id='.$object->id;
+	$head[$h][1] = $langs->trans('Documents');
+	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>' : '');
+	$head[$h][2] = 'document';
+	$h++;
 
-    $head[$h][0] = DOL_URL_ROOT.'/bom/bom_agenda.php?id='.$object->id;
-    $head[$h][1] = $langs->trans("Events");
-    $head[$h][2] = 'agenda';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT.'/bom/bom_agenda.php?id='.$object->id;
+	$head[$h][1] = $langs->trans("Events");
+	$head[$h][2] = 'agenda';
+	$h++;
 
-    // Show more tabs from modules
-    // Entries must be declared in modules descriptor with line
-    //$this->tabs = array(
-    //	'entity:+tabname:Title:@bom:/bom/mypage.php?id=__ID__'
-    //); // to add new tab
-    //$this->tabs = array(
-    //	'entity:-tabname:Title:@bom:/bom/mypage.php?id=__ID__'
-    //); // to remove a tab
-    complete_head_from_modules($conf, $langs, $object, $head, $h, 'bom');
+	// Show more tabs from modules
+	// Entries must be declared in modules descriptor with line
+	//$this->tabs = array(
+	//	'entity:+tabname:Title:@bom:/bom/mypage.php?id=__ID__'
+	//); // to add new tab
+	//$this->tabs = array(
+	//	'entity:-tabname:Title:@bom:/bom/mypage.php?id=__ID__'
+	//); // to remove a tab
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'bom');
 
-    return $head;
+	return $head;
 }
diff --git a/htdocs/bom/tpl/linkedobjectblock.tpl.php b/htdocs/bom/tpl/linkedobjectblock.tpl.php
index 45340577228..3debc7e7d87 100644
--- a/htdocs/bom/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/bom/tpl/linkedobjectblock.tpl.php
@@ -41,41 +41,41 @@ $total = 0;
 $ilink = 0;
 foreach ($linkedObjectBlock as $key => $objectlink)
 {
-    $ilink++;
-    $product_static = new Product($db);
-    $trclass = 'oddeven';
-    if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass .= ' liste_sub_total';
-    echo '<tr class="'.$trclass.'" >';
-    echo '<td class="linkedcol-element" >'.$langs->trans("Bom");
-    if (!empty($showImportButton) && $conf->global->MAIN_ENABLE_IMPORT_LINKED_OBJECT_LINES) {
-        print '<a class="objectlinked_importbtn" href="'.$objectlink->getNomUrl(0, '', 0, 1).'&amp;action=selectlines" data-element="'.$objectlink->element.'" data-id="'.$objectlink->id.'"  > <i class="fa fa-indent"></i> </a';
-    }
-    echo '</td>';
-    echo '<td class="linkedcol-name nowraponall" >'.$objectlink->getNomUrl(1).'</td>';
+	$ilink++;
+	$product_static = new Product($db);
+	$trclass = 'oddeven';
+	if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass .= ' liste_sub_total';
+	echo '<tr class="'.$trclass.'" >';
+	echo '<td class="linkedcol-element" >'.$langs->trans("Bom");
+	if (!empty($showImportButton) && $conf->global->MAIN_ENABLE_IMPORT_LINKED_OBJECT_LINES) {
+		print '<a class="objectlinked_importbtn" href="'.$objectlink->getNomUrl(0, '', 0, 1).'&amp;action=selectlines" data-element="'.$objectlink->element.'" data-id="'.$objectlink->id.'"  > <i class="fa fa-indent"></i> </a';
+	}
+	echo '</td>';
+	echo '<td class="linkedcol-name nowraponall" >'.$objectlink->getNomUrl(1).'</td>';
 
-    echo '<td class="linkedcol-ref" align="center">';
-	$result=$product_static->fetch($objectlink->fk_product);
-	if ($result<0) {
+	echo '<td class="linkedcol-ref" align="center">';
+	$result = $product_static->fetch($objectlink->fk_product);
+	if ($result < 0) {
 		setEventMessage($product_static->error, 'errors');
-	} elseif ($result>0)  {
+	} elseif ($result > 0) {
 		$product_static->getNomUrl(1);
 	}
-    print '</td>';
-    echo '<td class="linkedcol-date" align="center">'.dol_print_date($objectlink->date_creation, 'day').'</td>';
-    echo '<td class="linkedcol-amount right">';
-    if ($user->rights->commande->lire) {
-        $total = $total + $objectlink->total_ht;
-        echo price($objectlink->total_ht);
-    }
-    echo '</td>';
-    echo '<td class="linkedcol-statut right">'.$objectlink->getLibStatut(3).'</td>';
-    echo '<td class="linkedcol-action right">';
-    // For now, shipments must stay linked to order, so link is not deletable
-    if ($object->element != 'shipping') {
-        echo '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key.'">'.img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink').'</a>';
-    }
-    echo '</td>';
-    echo "</tr>\n";
+	print '</td>';
+	echo '<td class="linkedcol-date" align="center">'.dol_print_date($objectlink->date_creation, 'day').'</td>';
+	echo '<td class="linkedcol-amount right">';
+	if ($user->rights->commande->lire) {
+		$total = $total + $objectlink->total_ht;
+		echo price($objectlink->total_ht);
+	}
+	echo '</td>';
+	echo '<td class="linkedcol-statut right">'.$objectlink->getLibStatut(3).'</td>';
+	echo '<td class="linkedcol-action right">';
+	// For now, shipments must stay linked to order, so link is not deletable
+	if ($object->element != 'shipping') {
+		echo '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key.'">'.img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink').'</a>';
+	}
+	echo '</td>';
+	echo "</tr>\n";
 }
 
 echo "<!-- END PHP TEMPLATE -->\n";
diff --git a/htdocs/bom/tpl/objectline_edit.tpl.php b/htdocs/bom/tpl/objectline_edit.tpl.php
index 6954e657db9..bcb00aed5a2 100644
--- a/htdocs/bom/tpl/objectline_edit.tpl.php
+++ b/htdocs/bom/tpl/objectline_edit.tpl.php
@@ -82,8 +82,8 @@ if ($line->fk_product > 0) {
 if (is_object($hookmanager))
 {
 	$fk_parent_line = (GETPOST('fk_parent_line') ? GETPOST('fk_parent_line') : $line->fk_parent_line);
-    $parameters = array('line'=>$line, 'fk_parent_line'=>$fk_parent_line, 'var'=>$var, 'dateSelector'=>$dateSelector, 'seller'=>$seller, 'buyer'=>$buyer);
-    $reshook = $hookmanager->executeHooks('formEditProductOptions', $parameters, $this, $action);
+	$parameters = array('line'=>$line, 'fk_parent_line'=>$fk_parent_line, 'var'=>$var, 'dateSelector'=>$dateSelector, 'seller'=>$seller, 'buyer'=>$buyer);
+	$reshook = $hookmanager->executeHooks('formEditProductOptions', $parameters, $this, $action);
 }
 
 print '</td>';
@@ -110,7 +110,7 @@ print '</td>';
 
 if ($conf->global->PRODUCT_USE_UNITS)
 {
-    $coldisplay++;
+	$coldisplay++;
 	print '<td class="nobottom linecoluseunit left">';
 	// print $form->selectUnits($line->fk_unit, "units");
 	print '</td>';
diff --git a/htdocs/bookmarks/bookmarks.lib.php b/htdocs/bookmarks/bookmarks.lib.php
index 994bf13c031..63a95fed4c0 100644
--- a/htdocs/bookmarks/bookmarks.lib.php
+++ b/htdocs/bookmarks/bookmarks.lib.php
@@ -29,108 +29,108 @@
  */
 function printDropdownBookmarksList()
 {
-    global $conf, $user, $db, $langs;
+	global $conf, $user, $db, $langs;
 
-    require_once DOL_DOCUMENT_ROOT.'/bookmarks/class/bookmark.class.php';
-    require_once DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php';
+	require_once DOL_DOCUMENT_ROOT.'/bookmarks/class/bookmark.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php';
 
-    $langs->load("bookmarks");
+	$langs->load("bookmarks");
 
-    $url = $_SERVER["PHP_SELF"];
+	$url = $_SERVER["PHP_SELF"];
 
-    if (!empty($_SERVER["QUERY_STRING"]))
-    {
-        $url .= (dol_escape_htmltag($_SERVER["QUERY_STRING"]) ? '?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]) : '');
-    } else {
-        global $sortfield, $sortorder;
-        $tmpurl = '';
-        // No urlencode, all param $url will be urlencoded later
-        if ($sortfield) $tmpurl .= ($tmpurl ? '&' : '').'sortfield='.$sortfield;
-        if ($sortorder) $tmpurl .= ($tmpurl ? '&' : '').'sortorder='.$sortorder;
-        if (is_array($_POST))
-        {
-            foreach ($_POST as $key => $val)
-            {
-                if (preg_match('/^search_/', $key) && $val != '') $tmpurl .= ($tmpurl ? '&' : '').$key.'='.$val;
-            }
-        }
-        $url .= ($tmpurl ? '?'.$tmpurl : '');
-    }
+	if (!empty($_SERVER["QUERY_STRING"]))
+	{
+		$url .= (dol_escape_htmltag($_SERVER["QUERY_STRING"]) ? '?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]) : '');
+	} else {
+		global $sortfield, $sortorder;
+		$tmpurl = '';
+		// No urlencode, all param $url will be urlencoded later
+		if ($sortfield) $tmpurl .= ($tmpurl ? '&' : '').'sortfield='.$sortfield;
+		if ($sortorder) $tmpurl .= ($tmpurl ? '&' : '').'sortorder='.$sortorder;
+		if (is_array($_POST))
+		{
+			foreach ($_POST as $key => $val)
+			{
+				if (preg_match('/^search_/', $key) && $val != '') $tmpurl .= ($tmpurl ? '&' : '').$key.'='.$val;
+			}
+		}
+		$url .= ($tmpurl ? '?'.$tmpurl : '');
+	}
 
-    $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=""'.(empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? ' onsubmit="return false"' : '').'>';
-    $searchForm .= '<input type="hidden" name="token" value="'.newToken().'">';
+	$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=""'.(empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? ' onsubmit="return false"' : '').'>';
+	$searchForm .= '<input type="hidden" name="token" value="'.newToken().'">';
 
 
-    // Url to list bookmark
-    $listbtn = '<a class="top-menu-dropdown-link" title="'.$langs->trans('AddThisPageToBookmarks').'" href="'.DOL_URL_ROOT.'/bookmarks/list.php" >';
-    $listbtn .= '<span class="fa fa-list paddingright"></span>'.$langs->trans('Bookmarks').'</a>';
+	// Url to list bookmark
+	$listbtn = '<a class="top-menu-dropdown-link" title="'.$langs->trans('AddThisPageToBookmarks').'" href="'.DOL_URL_ROOT.'/bookmarks/list.php" >';
+	$listbtn .= '<span class="fa fa-list paddingright"></span>'.$langs->trans('Bookmarks').'</a>';
 
-    // Url to go on create new bookmark page
-    $newbtn = '';
-    if (!empty($user->rights->bookmark->creer))
-    {
-        //$urltoadd=DOL_URL_ROOT.'/bookmarks/card.php?action=create&amp;urlsource='.urlencode($url).'&amp;url='.urlencode($url);
-        $urltoadd = DOL_URL_ROOT.'/bookmarks/card.php?action=create&amp;url='.urlencode($url);
-        $newbtn .= '<a class="top-menu-dropdown-link" title="'.$langs->trans('AddThisPageToBookmarks').'" href="'.dol_escape_htmltag($urltoadd).'" >';
-        $newbtn .= img_picto('', 'bookmark', '', false, 0, 0, '', 'paddingright').dol_escape_htmltag($langs->trans('AddThisPageToBookmarks')).'</a>';
-    }
+	// Url to go on create new bookmark page
+	$newbtn = '';
+	if (!empty($user->rights->bookmark->creer))
+	{
+		//$urltoadd=DOL_URL_ROOT.'/bookmarks/card.php?action=create&amp;urlsource='.urlencode($url).'&amp;url='.urlencode($url);
+		$urltoadd = DOL_URL_ROOT.'/bookmarks/card.php?action=create&amp;url='.urlencode($url);
+		$newbtn .= '<a class="top-menu-dropdown-link" title="'.$langs->trans('AddThisPageToBookmarks').'" href="'.dol_escape_htmltag($urltoadd).'" >';
+		$newbtn .= img_picto('', 'bookmark', '', false, 0, 0, '', 'paddingright').dol_escape_htmltag($langs->trans('AddThisPageToBookmarks')).'</a>';
+	}
 
-    // 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)";
-    $sql .= " AND entity IN (".getEntity('bookmarks').")";
-    $sql .= " ORDER BY position";
-    if ($resql = $db->query($sql))
-    {
-    	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'.(strpos($obj->url, 'http') === 0 ? ' bookmark-item-external' : '').'" 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>';
+	// 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)";
+	$sql .= " AND entity IN (".getEntity('bookmarks').")";
+	$sql .= " ORDER BY position";
+	if ($resql = $db->query($sql))
+	{
+		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'.(strpos($obj->url, 'http') === 0 ? ' bookmark-item-external' : '').'" 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);
-    }
+			$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);
+	}
 
-    $searchForm .= '</form>';
+	$searchForm .= '</form>';
 
-    // Generate the return string
-    if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
-    	$html = $searchForm;
+	// Generate the return string
+	if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+		$html = $searchForm;
 
-    	$html .= '<!-- script to open selected choice -->
+		$html .= '<!-- script to open selected choice -->
 				<script>
 	        	$(document).ready(function () {
     			    jQuery("#boxbookmark").change(function() {
@@ -160,22 +160,22 @@ function printDropdownBookmarksList()
 		       		});
     			})
 				</script>';
-    } else {
-    	$html = '
+	} else {
+		$html = '
 	        <!-- search input -->
 	        <div class="dropdown-header bookmark-header">
 	            ' . $searchForm.'
 	        </div>
 	        ';
 
-	    $html .= '
+		$html .= '
 	        <!-- Menu Body -->
 	        <div class="bookmark-body dropdown-body">
 	        '.$bookmarkList.'
 	        </div>
 	        ';
 
-	    $html .= '
+		$html .= '
 	        <!-- Menu Footer-->
 	        <div class="bookmark-footer">
 	                '.$newbtn.$listbtn.'
@@ -183,7 +183,7 @@ function printDropdownBookmarksList()
 	        </div>
 	    ';
 
-	    $html .= '<!-- script to open/close the popup -->
+		$html .= '<!-- script to open/close the popup -->
 				<script>
 	            $( document ).on("keyup", "#top-bookmark-search-input", function () {
 
@@ -200,7 +200,7 @@ function printDropdownBookmarksList()
 	                $("#top-bookmark-search-filter-count").text(count);
 	            });
 			    </script>';
-    }
+	}
 
-    return $html;
+	return $html;
 }
diff --git a/htdocs/bookmarks/card.php b/htdocs/bookmarks/card.php
index 1506dd70269..b8d0949a1f0 100644
--- a/htdocs/bookmarks/card.php
+++ b/htdocs/bookmarks/card.php
@@ -32,7 +32,7 @@ $langs->loadLangs(array('bookmarks', 'other'));
 
 // Security check
 if (!$user->rights->bookmark->lire) {
-    restrictedArea($user, 'bookmarks');
+	restrictedArea($user, 'bookmarks');
 }
 
 $id = GETPOST("id", 'int');
@@ -177,7 +177,7 @@ if ($action == 'create')
 
 	print '</table>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div align="center">';
 	print '<input type="submit" class="button" value="'.$langs->trans("CreateBookmark").'" name="create"> &nbsp; ';
@@ -219,11 +219,11 @@ if ($id > 0 && !preg_match('/^add/i', $action))
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/bookmarks/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-    dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', '', '', 0, '', '', 0);
+	dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', '', '', 0, '', '', 0);
 
-    print '<div class="fichecenter">';
+	print '<div class="fichecenter">';
 
-    print '<div class="underbanner clearboth"></div>';
+	print '<div class="underbanner clearboth"></div>';
 	print '<table class="border centpercent tableforfield">';
 
 	print '<tr><td class="titlefield">';
@@ -295,7 +295,7 @@ if ($id > 0 && !preg_match('/^add/i', $action))
 
 	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	if ($action == 'edit')
 	{
diff --git a/htdocs/bookmarks/class/bookmark.class.php b/htdocs/bookmarks/class/bookmark.class.php
index 5fab4496f6e..7f19b1bd21e 100644
--- a/htdocs/bookmarks/class/bookmark.class.php
+++ b/htdocs/bookmarks/class/bookmark.class.php
@@ -28,217 +28,217 @@
  */
 class Bookmark extends CommonObject
 {
-    /**
+	/**
 	 * @var string ID to identify managed object
 	 */
 	public $element = 'bookmark';
 
-    /**
-     * @var string Name of table without prefix where object is stored
-     */
-    public $table_element = 'bookmark';
+	/**
+	 * @var string Name of table without prefix where object is stored
+	 */
+	public $table_element = 'bookmark';
 
-    /**
+	/**
 	 * 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
 	 * @var int
 	 */
-    public $ismultientitymanaged = 1;
+	public $ismultientitymanaged = 1;
 
-    /**
+	/**
 	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
 	 */
 	public $picto = 'bookmark';
 
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    /**
-     * @var int ID
-     */
-    public $id;
+	/**
+	 * @var int ID
+	 */
+	public $id;
 
-    /**
+	/**
 	 * @var int User ID
 	 */
 	public $fk_user;
 
-    /**
-     * Date creation record (datec)
-     *
-     * @var integer
-     */
-    public $datec;
+	/**
+	 * Date creation record (datec)
+	 *
+	 * @var integer
+	 */
+	public $datec;
 
-    public $url;
+	public $url;
 
-    public $target; // 0=replace, 1=new window
+	public $target; // 0=replace, 1=new window
 
-    public $title;
+	public $title;
 
-    public $position;
+	public $position;
 
-    public $favicon;
+	public $favicon;
 
 
-    /**
+	/**
 	 *	Constructor
 	 *
 	 *  @param		DoliDB		$db      Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-    }
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
 
-    /**
-     *    Directs the bookmark
-     *
-     *    @param    int		$id		Bookmark Id Loader
-     *    @return	int				<0 if KO, >0 if OK
-     */
-    public function fetch($id)
-    {
-        global $conf;
+	/**
+	 *    Directs the bookmark
+	 *
+	 *    @param    int		$id		Bookmark Id Loader
+	 *    @return	int				<0 if KO, >0 if OK
+	 */
+	public function fetch($id)
+	{
+		global $conf;
 
-        $sql = "SELECT rowid, fk_user, dateb as datec, url, target,";
-        $sql .= " title, position, favicon";
-        $sql .= " FROM ".MAIN_DB_PREFIX."bookmark";
-        $sql .= " WHERE rowid = ".$id;
-        $sql .= " AND entity = ".$conf->entity;
+		$sql = "SELECT rowid, fk_user, dateb as datec, url, target,";
+		$sql .= " title, position, favicon";
+		$sql .= " FROM ".MAIN_DB_PREFIX."bookmark";
+		$sql .= " WHERE rowid = ".$id;
+		$sql .= " AND entity = ".$conf->entity;
 
 		dol_syslog("Bookmark::fetch", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            $obj = $this->db->fetch_object($resql);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$obj = $this->db->fetch_object($resql);
 
-            $this->id = $obj->rowid;
-            $this->ref = $obj->rowid;
+			$this->id = $obj->rowid;
+			$this->ref = $obj->rowid;
 
-            $this->fk_user = $obj->fk_user;
-            $this->datec   = $this->db->jdate($obj->datec);
-            $this->url     = $obj->url;
-            $this->target  = $obj->target;
-            $this->title   = $obj->title;
-            $this->position = $obj->position;
-            $this->favicon = $obj->favicon;
+			$this->fk_user = $obj->fk_user;
+			$this->datec   = $this->db->jdate($obj->datec);
+			$this->url     = $obj->url;
+			$this->target  = $obj->target;
+			$this->title   = $obj->title;
+			$this->position = $obj->position;
+			$this->favicon = $obj->favicon;
 
-            $this->db->free($resql);
-            return $this->id;
-        } else {
-            dol_print_error($this->db);
-            return -1;
-        }
-    }
+			$this->db->free($resql);
+			return $this->id;
+		} else {
+			dol_print_error($this->db);
+			return -1;
+		}
+	}
 
-    /**
-     *      Insert bookmark into database
-     *
-     *      @return     int     <0 si ko, rowid du bookmark cree si ok
-     */
-    public function create()
-    {
-        global $conf;
+	/**
+	 *      Insert bookmark into database
+	 *
+	 *      @return     int     <0 si ko, rowid du bookmark cree si ok
+	 */
+	public function create()
+	{
+		global $conf;
 
-    	// Clean parameters
-    	$this->url = trim($this->url);
-    	$this->title = trim($this->title);
+		// Clean parameters
+		$this->url = trim($this->url);
+		$this->title = trim($this->title);
 		if (empty($this->position)) $this->position = 0;
 
 		$now = dol_now();
 
-    	$this->db->begin();
+		$this->db->begin();
 
-        $sql = "INSERT INTO ".MAIN_DB_PREFIX."bookmark (fk_user,dateb,url,target";
-        $sql .= ",title,favicon,position";
-        $sql .= ",entity";
-        $sql .= ") VALUES (";
-        $sql .= ($this->fk_user > 0 ? $this->fk_user : "0").",";
-        $sql .= " '".$this->db->idate($now)."',";
-        $sql .= " '".$this->db->escape($this->url)."', '".$this->db->escape($this->target)."',";
-        $sql .= " '".$this->db->escape($this->title)."', '".$this->db->escape($this->favicon)."', '".$this->db->escape($this->position)."'";
-        $sql .= ", ".$this->db->escape($conf->entity);
-        $sql .= ")";
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."bookmark (fk_user,dateb,url,target";
+		$sql .= ",title,favicon,position";
+		$sql .= ",entity";
+		$sql .= ") VALUES (";
+		$sql .= ($this->fk_user > 0 ? $this->fk_user : "0").",";
+		$sql .= " '".$this->db->idate($now)."',";
+		$sql .= " '".$this->db->escape($this->url)."', '".$this->db->escape($this->target)."',";
+		$sql .= " '".$this->db->escape($this->title)."', '".$this->db->escape($this->favicon)."', '".$this->db->escape($this->position)."'";
+		$sql .= ", ".$this->db->escape($conf->entity);
+		$sql .= ")";
 
-        dol_syslog("Bookmark::create", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            $id = $this->db->last_insert_id(MAIN_DB_PREFIX."bookmark");
-            if ($id > 0)
-            {
-                $this->id = $id;
-                $this->db->commit();
-                return $id;
-            } else {
-                $this->error = $this->db->lasterror();
-                $this->errno = $this->db->lasterrno();
-                $this->db->rollback();
-                return -2;
-            }
-        } else {
-            $this->error = $this->db->lasterror();
-            $this->errno = $this->db->lasterrno();
-            $this->db->rollback();
-            return -1;
-        }
-    }
+		dol_syslog("Bookmark::create", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$id = $this->db->last_insert_id(MAIN_DB_PREFIX."bookmark");
+			if ($id > 0)
+			{
+				$this->id = $id;
+				$this->db->commit();
+				return $id;
+			} else {
+				$this->error = $this->db->lasterror();
+				$this->errno = $this->db->lasterrno();
+				$this->db->rollback();
+				return -2;
+			}
+		} else {
+			$this->error = $this->db->lasterror();
+			$this->errno = $this->db->lasterrno();
+			$this->db->rollback();
+			return -1;
+		}
+	}
 
-    /**
-     *      Update bookmark record
-     *
-     *      @return     int         <0 if KO, > if OK
-     */
-    public function update()
-    {
-    	// Clean parameters
-    	$this->url = trim($this->url);
-    	$this->title = trim($this->title);
+	/**
+	 *      Update bookmark record
+	 *
+	 *      @return     int         <0 if KO, > if OK
+	 */
+	public function update()
+	{
+		// Clean parameters
+		$this->url = trim($this->url);
+		$this->title = trim($this->title);
 		if (empty($this->position)) $this->position = 0;
 
-    	$sql = "UPDATE ".MAIN_DB_PREFIX."bookmark";
-        $sql .= " SET fk_user = ".($this->fk_user > 0 ? $this->fk_user : "0");
-        $sql .= " ,dateb = '".$this->db->idate($this->datec)."'";
-        $sql .= " ,url = '".$this->db->escape($this->url)."'";
-        $sql .= " ,target = '".$this->db->escape($this->target)."'";
-        $sql .= " ,title = '".$this->db->escape($this->title)."'";
-        $sql .= " ,favicon = '".$this->db->escape($this->favicon)."'";
-        $sql .= " ,position = '".$this->db->escape($this->position)."'";
-        $sql .= " WHERE rowid = ".$this->id;
+		$sql = "UPDATE ".MAIN_DB_PREFIX."bookmark";
+		$sql .= " SET fk_user = ".($this->fk_user > 0 ? $this->fk_user : "0");
+		$sql .= " ,dateb = '".$this->db->idate($this->datec)."'";
+		$sql .= " ,url = '".$this->db->escape($this->url)."'";
+		$sql .= " ,target = '".$this->db->escape($this->target)."'";
+		$sql .= " ,title = '".$this->db->escape($this->title)."'";
+		$sql .= " ,favicon = '".$this->db->escape($this->favicon)."'";
+		$sql .= " ,position = '".$this->db->escape($this->position)."'";
+		$sql .= " WHERE rowid = ".$this->id;
 
-        dol_syslog("Bookmark::update", LOG_DEBUG);
-        if ($this->db->query($sql))
-        {
-            return 1;
-        } else {
-            $this->error = $this->db->lasterror();
-            return -1;
-        }
-    }
+		dol_syslog("Bookmark::update", LOG_DEBUG);
+		if ($this->db->query($sql))
+		{
+			return 1;
+		} else {
+			$this->error = $this->db->lasterror();
+			return -1;
+		}
+	}
 
-    /**
-     *      Removes the bookmark
-     *
-     *      @param      int		$id     Id removed bookmark
-     *      @return     int         	<0 si ko, >0 si ok
-     */
-    public function remove($id)
-    {
-        $sql  = "DELETE FROM ".MAIN_DB_PREFIX."bookmark";
-        $sql .= " WHERE rowid = ".$id;
+	/**
+	 *      Removes the bookmark
+	 *
+	 *      @param      int		$id     Id removed bookmark
+	 *      @return     int         	<0 si ko, >0 si ok
+	 */
+	public function remove($id)
+	{
+		$sql  = "DELETE FROM ".MAIN_DB_PREFIX."bookmark";
+		$sql .= " WHERE rowid = ".$id;
 
-        dol_syslog("Bookmark::remove", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            return 1;
-        } else {
-            $this->error = $this->db->lasterror();
-            return -1;
-        }
-    }
+		dol_syslog("Bookmark::remove", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			return 1;
+		} else {
+			$this->error = $this->db->lasterror();
+			return -1;
+		}
+	}
 
 	/**
 	 * Function used to replace a thirdparty id with another one.
@@ -265,7 +265,7 @@ class Bookmark extends CommonObject
 	 */
 	public function getLibStatut($mode)
 	{
-	    return '';
+		return '';
 	}
 
 	/**
diff --git a/htdocs/cashdesk/admin/cashdesk.php b/htdocs/cashdesk/admin/cashdesk.php
index dfd6e99a9ea..93d287ac501 100644
--- a/htdocs/cashdesk/admin/cashdesk.php
+++ b/htdocs/cashdesk/admin/cashdesk.php
@@ -65,13 +65,13 @@ if (GETPOST('action', 'alpha') == 'set')
 	if (!$res > 0) $error++;
 
  	if (!$error)
-    {
-        $db->commit();
-	    setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    } else {
-        $db->rollback();
-	    setEventMessages($langs->trans("Error"), null, 'errors');
-    }
+	{
+		$db->commit();
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
+		$db->rollback();
+		setEventMessages($langs->trans("Error"), null, 'errors');
+	}
 }
 
 /*
@@ -146,13 +146,13 @@ if (!empty($conf->stock->enabled))
 	print '<tr class="oddeven"><td>'.$langs->trans("CashDeskDoNotDecreaseStock").'</td>'; // Force warehouse (this is not a default value)
 	print '<td colspan="2">';
 	if (empty($conf->productbatch->enabled)) {
-	    print $form->selectyesno('CASHDESK_NO_DECREASE_STOCK', $conf->global->CASHDESK_NO_DECREASE_STOCK, 1);
+		print $form->selectyesno('CASHDESK_NO_DECREASE_STOCK', $conf->global->CASHDESK_NO_DECREASE_STOCK, 1);
 	} else {
-	    if (!$conf->global->CASHDESK_NO_DECREASE_STOCK) {
-	        $res = dolibarr_set_const($db, "CASHDESK_NO_DECREASE_STOCK", 1, 'chaine', 0, '', $conf->entity);
-	    }
-	    print $langs->trans("Yes").'<br>';
-	    print '<span class="opacitymedium">'.$langs->trans('StockDecreaseForPointOfSaleDisabledbyBatch').'</span>';
+		if (!$conf->global->CASHDESK_NO_DECREASE_STOCK) {
+			$res = dolibarr_set_const($db, "CASHDESK_NO_DECREASE_STOCK", 1, 'chaine', 0, '', $conf->entity);
+		}
+		print $langs->trans("Yes").'<br>';
+		print '<span class="opacitymedium">'.$langs->trans('StockDecreaseForPointOfSaleDisabledbyBatch').'</span>';
 	}
 	print '</td></tr>';
 
@@ -174,11 +174,11 @@ if (!empty($conf->stock->enabled))
 // Use Dolibarr Receipt Printer
 if (!empty($conf->receiptprinter->enabled))
 {
-    print '<tr class="oddeven"><td>';
-    print $langs->trans("DolibarrReceiptPrinter").' ('.$langs->trans("FeatureNotYetAvailable").')';
-    print '<td colspan="2">';
-    print $form->selectyesno("CASHDESK_DOLIBAR_RECEIPT_PRINTER", $conf->global->CASHDESK_DOLIBAR_RECEIPT_PRINTER, 1);
-    print "</td></tr>\n";
+	print '<tr class="oddeven"><td>';
+	print $langs->trans("DolibarrReceiptPrinter").' ('.$langs->trans("FeatureNotYetAvailable").')';
+	print '<td colspan="2">';
+	print $form->selectyesno("CASHDESK_DOLIBAR_RECEIPT_PRINTER", $conf->global->CASHDESK_DOLIBAR_RECEIPT_PRINTER, 1);
+	print "</td></tr>\n";
 }
 
 print '</table>';
diff --git a/htdocs/cashdesk/affContenu.php b/htdocs/cashdesk/affContenu.php
index 7b513ada33c..72cb99123a4 100644
--- a/htdocs/cashdesk/affContenu.php
+++ b/htdocs/cashdesk/affContenu.php
@@ -34,8 +34,8 @@ if ($_GET['id'] == 'NOUV')
 // Recuperation, s'il existe, de l'objet contenant les infos de la vente en cours ...
 if (isset($_SESSION['serObjFacturation']))
 {
-    $obj_facturation = unserialize($_SESSION['serObjFacturation']);
-    unset($_SESSION['serObjFacturation']);
+	$obj_facturation = unserialize($_SESSION['serObjFacturation']);
+	unset($_SESSION['serObjFacturation']);
 } else {
 	// ... sinon, c'est une nouvelle vente
 	$obj_facturation = new Facturation();
diff --git a/htdocs/cashdesk/class/Auth.class.php b/htdocs/cashdesk/class/Auth.class.php
index cc71d1c20d8..7dbe7ceae3e 100644
--- a/htdocs/cashdesk/class/Auth.class.php
+++ b/htdocs/cashdesk/class/Auth.class.php
@@ -94,45 +94,45 @@ class Auth
 
 		$test = true;
 
-        // Authentication mode
-        if (empty($dolibarr_main_authentication)) $dolibarr_main_authentication = 'http,dolibarr';
-        // Authentication mode: forceuser
-        if ($dolibarr_main_authentication == 'forceuser' && empty($dolibarr_auto_user)) $dolibarr_auto_user = 'auto';
-        // Set authmode
-        $authmode = explode(',', $dolibarr_main_authentication);
+		// Authentication mode
+		if (empty($dolibarr_main_authentication)) $dolibarr_main_authentication = 'http,dolibarr';
+		// Authentication mode: forceuser
+		if ($dolibarr_main_authentication == 'forceuser' && empty($dolibarr_auto_user)) $dolibarr_auto_user = 'auto';
+		// Set authmode
+		$authmode = explode(',', $dolibarr_main_authentication);
 
-        // No authentication mode
-        if (!count($authmode))
-        {
-            $langs->load('main');
-            dol_print_error('', $langs->trans("ErrorConfigParameterNotDefined", 'dolibarr_main_authentication'));
-            exit;
-        }
+		// No authentication mode
+		if (!count($authmode))
+		{
+			$langs->load('main');
+			dol_print_error('', $langs->trans("ErrorConfigParameterNotDefined", 'dolibarr_main_authentication'));
+			exit;
+		}
 
 		$usertotest = $aLogin;
 		$passwordtotest = $aPasswd;
 		$entitytotest = $conf->entity;
 
-        // Validation tests user / password
-        // If ok, the variable will be initialized login
-        // If error, we will put error message in session under the name dol_loginmesg
-        $goontestloop = false;
-        if (isset($_SERVER["REMOTE_USER"]) && in_array('http', $authmode)) $goontestloop = true;
-        if (isset($aLogin) || GETPOST('openid_mode', 'alpha', 1)) $goontestloop = true;
+		// Validation tests user / password
+		// If ok, the variable will be initialized login
+		// If error, we will put error message in session under the name dol_loginmesg
+		$goontestloop = false;
+		if (isset($_SERVER["REMOTE_USER"]) && in_array('http', $authmode)) $goontestloop = true;
+		if (isset($aLogin) || GETPOST('openid_mode', 'alpha', 1)) $goontestloop = true;
 
-        if ($test && $goontestloop)
-        {
-            include_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
+		if ($test && $goontestloop)
+		{
+			include_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
 			$login = checkLoginPassEntity($usertotest, $passwordtotest, $entitytotest, $authmode);
-            if ($login)
-            {
-                $this->login($aLogin);
-                $this->passwd($aPasswd);
-                $ret = 0;
-            } else {
-                $ret = -1;
-            }
-        }
+			if ($login)
+			{
+				$this->login($aLogin);
+				$this->passwd($aPasswd);
+				$ret = 0;
+			} else {
+				$ret = -1;
+			}
+		}
 
 		return $ret;
 	}
diff --git a/htdocs/cashdesk/class/Facturation.class.php b/htdocs/cashdesk/class/Facturation.class.php
index f2223b0b45d..23eafadc7b8 100644
--- a/htdocs/cashdesk/class/Facturation.class.php
+++ b/htdocs/cashdesk/class/Facturation.class.php
@@ -25,553 +25,553 @@ include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
  */
 class Facturation
 {
-    /**
-     * Attributs "volatiles" : reinitialises apres chaque traitement d'un article
-     * <p>Attributs "volatiles" : reinitialises apres chaque traitement d'un article</p>
-     * int $id			=> 'rowid' du produit dans llx_product
-     * string $ref		=> 'ref' du produit dans llx_product
-     * int $qte			=> Quantite pour le produit en cours de traitement
-     * int $stock		=> Stock theorique pour le produit en cours de traitement
-     * int $remise_percent	=> Remise en pourcent sur le produit en cours
-     * int $montant_remise	=> Remise en pourcent sur le produit en cours
-     * int $prix		=> Prix HT du produit en cours
-     * int $tva			=> 'rowid' du taux de tva dans llx_c_tva
-     */
+	/**
+	 * Attributs "volatiles" : reinitialises apres chaque traitement d'un article
+	 * <p>Attributs "volatiles" : reinitialises apres chaque traitement d'un article</p>
+	 * int $id			=> 'rowid' du produit dans llx_product
+	 * string $ref		=> 'ref' du produit dans llx_product
+	 * int $qte			=> Quantite pour le produit en cours de traitement
+	 * int $stock		=> Stock theorique pour le produit en cours de traitement
+	 * int $remise_percent	=> Remise en pourcent sur le produit en cours
+	 * int $montant_remise	=> Remise en pourcent sur le produit en cours
+	 * int $prix		=> Prix HT du produit en cours
+	 * int $tva			=> 'rowid' du taux de tva dans llx_c_tva
+	 */
 
-    /**
+	/**
 	 * @var int ID
 	 */
 	public $id;
 
-    protected $ref;
-    protected $qte;
-    protected $stock;
-    protected $remise_percent;
-    protected $montant_remise;
-    protected $prix;
-    protected $tva;
+	protected $ref;
+	protected $qte;
+	protected $stock;
+	protected $remise_percent;
+	protected $montant_remise;
+	protected $prix;
+	protected $tva;
 
-    /**
-     * Attributs persistants : utilises pour toute la duree de la vente (jusqu'a validation ou annulation)
-     * string $num_facture	=> Numero de la facture (de la forme FAYYMM-XXXX)
-     * string $mode_reglement	=> Mode de reglement (ESP, CB ou CHQ)
-     * int $montant_encaisse	=> Montant encaisse en cas de reglement en especes
-     * int $montant_rendu	=> Monnaie rendue en cas de reglement en especes
-     * int $paiement_le		=> Date de paiement en cas de paiement differe
-     *
-     * int $prix_total_ht	=> Prix total hors taxes
-     * int $montant_tva		=> Montant total de la TVA, tous taux confondus
-     * int $prix_total_ttc	=> Prix total TTC
-     */
-    protected $num_facture;
-    protected $mode_reglement;
-    protected $montant_encaisse;
-    protected $montant_rendu;
-    protected $paiement_le;
+	/**
+	 * Attributs persistants : utilises pour toute la duree de la vente (jusqu'a validation ou annulation)
+	 * string $num_facture	=> Numero de la facture (de la forme FAYYMM-XXXX)
+	 * string $mode_reglement	=> Mode de reglement (ESP, CB ou CHQ)
+	 * int $montant_encaisse	=> Montant encaisse en cas de reglement en especes
+	 * int $montant_rendu	=> Monnaie rendue en cas de reglement en especes
+	 * int $paiement_le		=> Date de paiement en cas de paiement differe
+	 *
+	 * int $prix_total_ht	=> Prix total hors taxes
+	 * int $montant_tva		=> Montant total de la TVA, tous taux confondus
+	 * int $prix_total_ttc	=> Prix total TTC
+	 */
+	protected $num_facture;
+	protected $mode_reglement;
+	protected $montant_encaisse;
+	protected $montant_rendu;
+	protected $paiement_le;
 
-    protected $prix_total_ht;
-    protected $montant_tva;
-    protected $prix_total_ttc;
+	protected $prix_total_ht;
+	protected $montant_tva;
+	protected $prix_total_ttc;
 
 
-    /**
-     *	Constructor
-     */
-    public function __construct()
-    {
-        $this->raz();
-        $this->razPers();
-    }
+	/**
+	 *	Constructor
+	 */
+	public function __construct()
+	{
+		$this->raz();
+		$this->razPers();
+	}
 
 
-    // Data processing methods
+	// Data processing methods
 
 
-    /**
-     *  Add a product into cart
-     *
-     *  @return	void
-     */
-    public function ajoutArticle()
-    {
-        global $conf, $db, $mysoc;
+	/**
+	 *  Add a product into cart
+	 *
+	 *  @return	void
+	 */
+	public function ajoutArticle()
+	{
+		global $conf, $db, $mysoc;
 
-        $thirdpartyid = $_SESSION['CASHDESK_ID_THIRDPARTY'];
+		$thirdpartyid = $_SESSION['CASHDESK_ID_THIRDPARTY'];
 
-        $societe = new Societe($db);
-        $societe->fetch($thirdpartyid);
+		$societe = new Societe($db);
+		$societe->fetch($thirdpartyid);
 
-        $product = new Product($db);
-        $product->fetch($this->id);
+		$product = new Product($db);
+		$product->fetch($this->id);
 
 
-        $vatrowid = $this->tva();
+		$vatrowid = $this->tva();
 
-        $tmp = getTaxesFromId($vatrowid);
-        $txtva = $tmp['rate'].(empty($tmp['code']) ? '' : ' ('.$tmp['code'].')');
-        $vat_npr = $tmp['npr'];
+		$tmp = getTaxesFromId($vatrowid);
+		$txtva = $tmp['rate'].(empty($tmp['code']) ? '' : ' ('.$tmp['code'].')');
+		$vat_npr = $tmp['npr'];
 
-        $localtaxarray = getLocalTaxesFromRate($vatrowid, 0, $societe, $mysoc, 1);
+		$localtaxarray = getLocalTaxesFromRate($vatrowid, 0, $societe, $mysoc, 1);
 
-        // Clean vat code
-        $reg = array();
-        $vat_src_code = '';
-        if (preg_match('/\((.*)\)/', $txtva, $reg))
-        {
-            $vat_src_code = $reg[1];
-            $txtva = preg_replace('/\s*\(.*\)/', '', $txtva); // Remove code into vatrate.
-        }
+		// Clean vat code
+		$reg = array();
+		$vat_src_code = '';
+		if (preg_match('/\((.*)\)/', $txtva, $reg))
+		{
+			$vat_src_code = $reg[1];
+			$txtva = preg_replace('/\s*\(.*\)/', '', $txtva); // Remove code into vatrate.
+		}
 
-        // Define part of HT, VAT, TTC
-        $resultarray = calcul_price_total($this->qte, $this->prix(), $this->remisePercent(), $txtva, -1, -1, 0, 'HT', $vat_npr, $product->type, $mysoc, $localtaxarray);
+		// Define part of HT, VAT, TTC
+		$resultarray = calcul_price_total($this->qte, $this->prix(), $this->remisePercent(), $txtva, -1, -1, 0, 'HT', $vat_npr, $product->type, $mysoc, $localtaxarray);
 
-        // Calculation of total HT without discount
-        $total_ht = $resultarray[0];
-        $total_vat = $resultarray[1];
-        $total_ttc = $resultarray[2];
-        $total_localtax1 = $resultarray[9];
-        $total_localtax2 = $resultarray[10];
+		// Calculation of total HT without discount
+		$total_ht = $resultarray[0];
+		$total_vat = $resultarray[1];
+		$total_ttc = $resultarray[2];
+		$total_localtax1 = $resultarray[9];
+		$total_localtax2 = $resultarray[10];
 
-        // Calculation of the discount amount
-        if ($this->remisePercent())
-        {
-            $remise_percent = $this->remisePercent();
-        } else {
-            $remise_percent = 0;
-        }
-        $montant_remise_ht = ($resultarray[6] - $resultarray[0]);
-        $this->amountDiscount($montant_remise_ht);
+		// Calculation of the discount amount
+		if ($this->remisePercent())
+		{
+			$remise_percent = $this->remisePercent();
+		} else {
+			$remise_percent = 0;
+		}
+		$montant_remise_ht = ($resultarray[6] - $resultarray[0]);
+		$this->amountDiscount($montant_remise_ht);
 
-        $newcartarray = $_SESSION['poscart'];
+		$newcartarray = $_SESSION['poscart'];
 
-        $i = 0;
-        if (!is_null($newcartarray) && !empty($newcartarray)) {
-            $i = count($newcartarray);
-        }
+		$i = 0;
+		if (!is_null($newcartarray) && !empty($newcartarray)) {
+			$i = count($newcartarray);
+		}
 
-        $newcartarray[$i]['id'] = $i;
-        $newcartarray[$i]['ref'] = $product->ref;
-        $newcartarray[$i]['label'] = $product->label;
-        $newcartarray[$i]['price'] = $product->price;
-        $newcartarray[$i]['price_ttc'] = $product->price_ttc;
+		$newcartarray[$i]['id'] = $i;
+		$newcartarray[$i]['ref'] = $product->ref;
+		$newcartarray[$i]['label'] = $product->label;
+		$newcartarray[$i]['price'] = $product->price;
+		$newcartarray[$i]['price_ttc'] = $product->price_ttc;
 
-        if (!empty($conf->global->PRODUIT_MULTIPRICES))
-        {
-            if (isset($product->multiprices[$societe->price_level]))
-            {
-                $newcartarray[$i]['price'] = $product->multiprices[$societe->price_level];
-                $newcartarray[$i]['price_ttc'] = $product->multiprices_ttc[$societe->price_level];
-            }
-        }
+		if (!empty($conf->global->PRODUIT_MULTIPRICES))
+		{
+			if (isset($product->multiprices[$societe->price_level]))
+			{
+				$newcartarray[$i]['price'] = $product->multiprices[$societe->price_level];
+				$newcartarray[$i]['price_ttc'] = $product->multiprices_ttc[$societe->price_level];
+			}
+		}
 
-        $newcartarray[$i]['fk_article'] = $this->id;
-        $newcartarray[$i]['qte'] = $this->qte();
-        $newcartarray[$i]['fk_tva'] = $this->tva(); // Vat rowid
-        $newcartarray[$i]['remise_percent'] = $remise_percent;
-        $newcartarray[$i]['remise'] = price2num($montant_remise_ht);
-        $newcartarray[$i]['total_ht'] = price2num($total_ht, 'MT');
-        $newcartarray[$i]['total_ttc'] = price2num($total_ttc, 'MT');
-        $newcartarray[$i]['total_vat'] = price2num($total_vat, 'MT');
-        $newcartarray[$i]['total_localtax1'] = price2num($total_localtax1, 'MT');
-        $newcartarray[$i]['total_localtax2'] = price2num($total_localtax2, 'MT');
-        $_SESSION['poscart'] = $newcartarray;
+		$newcartarray[$i]['fk_article'] = $this->id;
+		$newcartarray[$i]['qte'] = $this->qte();
+		$newcartarray[$i]['fk_tva'] = $this->tva(); // Vat rowid
+		$newcartarray[$i]['remise_percent'] = $remise_percent;
+		$newcartarray[$i]['remise'] = price2num($montant_remise_ht);
+		$newcartarray[$i]['total_ht'] = price2num($total_ht, 'MT');
+		$newcartarray[$i]['total_ttc'] = price2num($total_ttc, 'MT');
+		$newcartarray[$i]['total_vat'] = price2num($total_vat, 'MT');
+		$newcartarray[$i]['total_localtax1'] = price2num($total_localtax1, 'MT');
+		$newcartarray[$i]['total_localtax2'] = price2num($total_localtax2, 'MT');
+		$_SESSION['poscart'] = $newcartarray;
 
-        $this->raz();
-    }
+		$this->raz();
+	}
 
-    /**
-     *  Remove a product from panel
-     *
-     *  @param  int		$aArticle	Id of line into cart to remove
-     *  @return	void
-     */
-    public function supprArticle($aArticle)
-    {
-        $poscart = $_SESSION['poscart'];
+	/**
+	 *  Remove a product from panel
+	 *
+	 *  @param  int		$aArticle	Id of line into cart to remove
+	 *  @return	void
+	 */
+	public function supprArticle($aArticle)
+	{
+		$poscart = $_SESSION['poscart'];
 
-        $j = 0;
-        $newposcart = array();
-        foreach ($poscart as $key => $val)
-        {
-            if ($poscart[$key]['id'] != $aArticle)
-            {
-                $newposcart[$j] = $poscart[$key];
-                $newposcart[$j]['id'] = $j;
-                $j++;
-            }
-        }
-        unset($poscart);
-        //var_dump($poscart);exit;
-        $_SESSION['poscart'] = $newposcart;
-    }
+		$j = 0;
+		$newposcart = array();
+		foreach ($poscart as $key => $val)
+		{
+			if ($poscart[$key]['id'] != $aArticle)
+			{
+				$newposcart[$j] = $poscart[$key];
+				$newposcart[$j]['id'] = $j;
+				$j++;
+			}
+		}
+		unset($poscart);
+		//var_dump($poscart);exit;
+		$_SESSION['poscart'] = $newposcart;
+	}
 
-    /**
-     * Calculation of total HT, total TTC and VAT amounts
-     *
-     * @return	int		Total
-     */
-    public function calculTotaux()
-    {
-        global $db;
+	/**
+	 * Calculation of total HT, total TTC and VAT amounts
+	 *
+	 * @return	int		Total
+	 */
+	public function calculTotaux()
+	{
+		global $db;
 
-        $total_ht = 0;
-        $total_ttc = 0;
-        $total_vat = 0;
-        $total_localtax1 = 0;
-        $total_localtax2 = 0;
+		$total_ht = 0;
+		$total_ttc = 0;
+		$total_vat = 0;
+		$total_localtax1 = 0;
+		$total_localtax2 = 0;
 
-        $tab = (!empty($_SESSION['poscart']) ? $_SESSION['poscart'] : array());
+		$tab = (!empty($_SESSION['poscart']) ? $_SESSION['poscart'] : array());
 
-        $tab_size = count($tab);
-        for ($i = 0; $i < $tab_size; $i++)
-        {
-            // Total HT
-            $remise = $tab[$i]['remise'];
-            $total_ht += ($tab[$i]['total_ht']);
-            $total_vat += ($tab[$i]['total_vat']);
-            $total_ttc += ($tab[$i]['total_ttc']);
-            $total_localtax1 += ($tab[$i]['total_localtax1']);
-            $total_localtax2 += ($tab[$i]['total_localtax2']);
-        }
+		$tab_size = count($tab);
+		for ($i = 0; $i < $tab_size; $i++)
+		{
+			// Total HT
+			$remise = $tab[$i]['remise'];
+			$total_ht += ($tab[$i]['total_ht']);
+			$total_vat += ($tab[$i]['total_vat']);
+			$total_ttc += ($tab[$i]['total_ttc']);
+			$total_localtax1 += ($tab[$i]['total_localtax1']);
+			$total_localtax2 += ($tab[$i]['total_localtax2']);
+		}
 
-        $this->prix_total_ttc = $total_ttc;
-        $this->prix_total_ht = $total_ht;
-        $this->prix_total_vat = $total_vat;
-        $this->prix_total_localtax1 = $total_localtax1;
-        $this->prix_total_localtax2 = $total_localtax2;
+		$this->prix_total_ttc = $total_ttc;
+		$this->prix_total_ht = $total_ht;
+		$this->prix_total_vat = $total_vat;
+		$this->prix_total_localtax1 = $total_localtax1;
+		$this->prix_total_localtax2 = $total_localtax2;
 
-        $this->montant_tva = $total_ttc - $total_ht;
-        //print 'total: '.$this->prix_total_ttc; exit;
-    }
+		$this->montant_tva = $total_ttc - $total_ht;
+		//print 'total: '.$this->prix_total_ttc; exit;
+	}
 
-    /**
-     * Reset attributes
-     *
-     * @return	void
-     */
-    public function raz()
-    {
-        $this->id('RESET');
-        $this->ref('RESET');
-        $this->qte('RESET');
-        $this->stock('RESET');
-        $this->remisePercent('RESET');
-        $this->amountDiscount('RESET');
-        $this->prix('RESET');
-        $this->tva('RESET');
-    }
+	/**
+	 * Reset attributes
+	 *
+	 * @return	void
+	 */
+	public function raz()
+	{
+		$this->id('RESET');
+		$this->ref('RESET');
+		$this->qte('RESET');
+		$this->stock('RESET');
+		$this->remisePercent('RESET');
+		$this->amountDiscount('RESET');
+		$this->prix('RESET');
+		$this->tva('RESET');
+	}
 
-    /**
-     * Resetting persistent attributes
-     *
-     *  @return	void
-     */
-    private function razPers()
-    {
-        $this->numInvoice('RESET');
-        $this->getSetPaymentMode('RESET');
-        $this->amountCollected('RESET');
-        $this->amountReturned('RESET');
-        $this->paiementLe('RESET');
+	/**
+	 * Resetting persistent attributes
+	 *
+	 *  @return	void
+	 */
+	private function razPers()
+	{
+		$this->numInvoice('RESET');
+		$this->getSetPaymentMode('RESET');
+		$this->amountCollected('RESET');
+		$this->amountReturned('RESET');
+		$this->paiementLe('RESET');
 
-        $this->amountWithoutTax('RESET');
-        $this->amountVat('RESET');
-        $this->amountWithTax('RESET');
-    }
+		$this->amountWithoutTax('RESET');
+		$this->amountVat('RESET');
+		$this->amountWithTax('RESET');
+	}
 
 
-    // Methods for modifying protected attributes
+	// Methods for modifying protected attributes
 
-    /**
-     * Getter for id
-     *
-     * @param	int		$aId	Id
-     * @return  int             Id
-     */
-    public function id($aId = null)
-    {
+	/**
+	 * Getter for id
+	 *
+	 * @param	int		$aId	Id
+	 * @return  int             Id
+	 */
+	public function id($aId = null)
+	{
 
-        if (!$aId)
-        {
-            return $this->id;
-        } elseif ($aId == 'RESET')
-        {
-            $this->id = null;
-        } else {
-            $this->id = $aId;
-        }
-    }
+		if (!$aId)
+		{
+			return $this->id;
+		} elseif ($aId == 'RESET')
+		{
+			$this->id = null;
+		} else {
+			$this->id = $aId;
+		}
+	}
 
-    /**
-     * Getter for ref
-     *
-     * @param	string	$aRef	Ref
-     * @return	string			Ref
-     */
-    public function ref($aRef = null)
-    {
+	/**
+	 * Getter for ref
+	 *
+	 * @param	string	$aRef	Ref
+	 * @return	string			Ref
+	 */
+	public function ref($aRef = null)
+	{
 
-        if (is_null($aRef))
-        {
-            return $this->ref;
-        } elseif ($aRef == 'RESET')
-        {
-            $this->ref = null;
-        } else {
-            $this->ref = $aRef;
-        }
-    }
+		if (is_null($aRef))
+		{
+			return $this->ref;
+		} elseif ($aRef == 'RESET')
+		{
+			$this->ref = null;
+		} else {
+			$this->ref = $aRef;
+		}
+	}
 
-    /**
-     * Getter for qte
-     *
-     * @param	int		$aQte		Qty
-     * @return	int					Qty
-     */
-    public function qte($aQte = null)
-    {
-        if (is_null($aQte))
-        {
-            return $this->qte;
-        } elseif ($aQte == 'RESET')
-        {
-            $this->qte = null;
-        } else {
-            $this->qte = $aQte;
-        }
-    }
+	/**
+	 * Getter for qte
+	 *
+	 * @param	int		$aQte		Qty
+	 * @return	int					Qty
+	 */
+	public function qte($aQte = null)
+	{
+		if (is_null($aQte))
+		{
+			return $this->qte;
+		} elseif ($aQte == 'RESET')
+		{
+			$this->qte = null;
+		} else {
+			$this->qte = $aQte;
+		}
+	}
 
-    /**
-     * Getter for stock
-     *
-     * @param   string	$aStock		Stock
-     * @return	string				Stock
-     */
-    public function stock($aStock = null)
-    {
+	/**
+	 * Getter for stock
+	 *
+	 * @param   string	$aStock		Stock
+	 * @return	string				Stock
+	 */
+	public function stock($aStock = null)
+	{
 
-        if (is_null($aStock))
-        {
-            return $this->stock;
-        } elseif ($aStock == 'RESET')
-        {
-            $this->stock = null;
-        } else {
-            $this->stock = $aStock;
-        }
-    }
+		if (is_null($aStock))
+		{
+			return $this->stock;
+		} elseif ($aStock == 'RESET')
+		{
+			$this->stock = null;
+		} else {
+			$this->stock = $aStock;
+		}
+	}
 
-    /**
-     * Getter for remise_percent
-     *
-     * @param	string	$aRemisePercent		Discount
-     * @return	string						Discount
-     */
-    public function remisePercent($aRemisePercent = null)
-    {
+	/**
+	 * Getter for remise_percent
+	 *
+	 * @param	string	$aRemisePercent		Discount
+	 * @return	string						Discount
+	 */
+	public function remisePercent($aRemisePercent = null)
+	{
 
-        if (is_null($aRemisePercent))
-        {
-            return $this->remise_percent;
-        } elseif ($aRemisePercent == 'RESET')
-        {
-            $this->remise_percent = null;
-        } else {
-            $this->remise_percent = $aRemisePercent;
-        }
-    }
+		if (is_null($aRemisePercent))
+		{
+			return $this->remise_percent;
+		} elseif ($aRemisePercent == 'RESET')
+		{
+			$this->remise_percent = null;
+		} else {
+			$this->remise_percent = $aRemisePercent;
+		}
+	}
 
-    /**
-     * Getter for montant_remise
-     *
-     * @param	int		$aMontantRemise		Amount
-     * @return	string						Amount
-     */
-    public function amountDiscount($aMontantRemise = null)
-    {
+	/**
+	 * Getter for montant_remise
+	 *
+	 * @param	int		$aMontantRemise		Amount
+	 * @return	string						Amount
+	 */
+	public function amountDiscount($aMontantRemise = null)
+	{
 
-        if (is_null($aMontantRemise)) {
-            return $this->montant_remise;
-        } elseif ($aMontantRemise == 'RESET') {
-            $this->montant_remise = null;
-        } else {
-            $this->montant_remise = $aMontantRemise;
-        }
-    }
+		if (is_null($aMontantRemise)) {
+			return $this->montant_remise;
+		} elseif ($aMontantRemise == 'RESET') {
+			$this->montant_remise = null;
+		} else {
+			$this->montant_remise = $aMontantRemise;
+		}
+	}
 
-    /**
-     * Getter for prix
-     *
-     * @param	int		$aPrix		Price
-     * @return	string				Stock
-     */
-    public function prix($aPrix = null)
-    {
+	/**
+	 * Getter for prix
+	 *
+	 * @param	int		$aPrix		Price
+	 * @return	string				Stock
+	 */
+	public function prix($aPrix = null)
+	{
 
-        if (is_null($aPrix)) {
-            return $this->prix;
-        } elseif ($aPrix == 'RESET') {
-            $this->prix = null;
-        } else {
-            $this->prix = $aPrix;
-        }
-    }
+		if (is_null($aPrix)) {
+			return $this->prix;
+		} elseif ($aPrix == 'RESET') {
+			$this->prix = null;
+		} else {
+			$this->prix = $aPrix;
+		}
+	}
 
-    /**
-     * Getter for tva
-     *
-     * @param	int		$aTva		Vat
-     * @return	int					Vat
-     */
-    public function tva($aTva = null)
-    {
-        if (is_null($aTva)) {
-            return $this->tva;
-        } elseif ($aTva == 'RESET') {
-            $this->tva = null;
-        } else {
-            $this->tva = $aTva;
-        }
-    }
+	/**
+	 * Getter for tva
+	 *
+	 * @param	int		$aTva		Vat
+	 * @return	int					Vat
+	 */
+	public function tva($aTva = null)
+	{
+		if (is_null($aTva)) {
+			return $this->tva;
+		} elseif ($aTva == 'RESET') {
+			$this->tva = null;
+		} else {
+			$this->tva = $aTva;
+		}
+	}
 
-    /**
-     * Get num invoice
-     *
-     * @param string	$aNumFacture		Invoice ref
-     * @return	string						Invoice ref
-     */
-    public function numInvoice($aNumFacture = null)
-    {
-        if (is_null($aNumFacture)) {
-            return $this->num_facture;
-        } elseif ($aNumFacture == 'RESET') {
-            $this->num_facture = null;
-        } else {
-            $this->num_facture = $aNumFacture;
-        }
-    }
+	/**
+	 * Get num invoice
+	 *
+	 * @param string	$aNumFacture		Invoice ref
+	 * @return	string						Invoice ref
+	 */
+	public function numInvoice($aNumFacture = null)
+	{
+		if (is_null($aNumFacture)) {
+			return $this->num_facture;
+		} elseif ($aNumFacture == 'RESET') {
+			$this->num_facture = null;
+		} else {
+			$this->num_facture = $aNumFacture;
+		}
+	}
 
-    /**
-     * Get payment mode
-     *
-     * @param	int		$aModeReglement		Payment mode
-     * @return	int							Payment mode
-     */
-    public function getSetPaymentMode($aModeReglement = null)
-    {
+	/**
+	 * Get payment mode
+	 *
+	 * @param	int		$aModeReglement		Payment mode
+	 * @return	int							Payment mode
+	 */
+	public function getSetPaymentMode($aModeReglement = null)
+	{
 
-        if (is_null($aModeReglement)) {
-            return $this->mode_reglement;
-        } elseif ($aModeReglement == 'RESET') {
-            $this->mode_reglement = null;
-        } else {
-            $this->mode_reglement = $aModeReglement;
-        }
-    }
+		if (is_null($aModeReglement)) {
+			return $this->mode_reglement;
+		} elseif ($aModeReglement == 'RESET') {
+			$this->mode_reglement = null;
+		} else {
+			$this->mode_reglement = $aModeReglement;
+		}
+	}
 
-    /**
-     * Get amount
-     *
-     * @param	int		$aMontantEncaisse		Amount
-     * @return	int								Amount
-     */
-    public function amountCollected($aMontantEncaisse = null)
-    {
+	/**
+	 * Get amount
+	 *
+	 * @param	int		$aMontantEncaisse		Amount
+	 * @return	int								Amount
+	 */
+	public function amountCollected($aMontantEncaisse = null)
+	{
 
-        if (is_null($aMontantEncaisse)) {
-            return $this->montant_encaisse;
-        } elseif ($aMontantEncaisse == 'RESET') {
-            $this->montant_encaisse = null;
-        } else {
-            $this->montant_encaisse = $aMontantEncaisse;
-        }
-    }
+		if (is_null($aMontantEncaisse)) {
+			return $this->montant_encaisse;
+		} elseif ($aMontantEncaisse == 'RESET') {
+			$this->montant_encaisse = null;
+		} else {
+			$this->montant_encaisse = $aMontantEncaisse;
+		}
+	}
 
-    /**
-     * Get amount
-     *
-     * @param	int			$aMontantRendu		Amount
-     * @return	int								Amount
-     */
-    public function amountReturned($aMontantRendu = null)
-    {
+	/**
+	 * Get amount
+	 *
+	 * @param	int			$aMontantRendu		Amount
+	 * @return	int								Amount
+	 */
+	public function amountReturned($aMontantRendu = null)
+	{
 
-        if (is_null($aMontantRendu)) {
-            return $this->montant_rendu;
-        } elseif ($aMontantRendu == 'RESET') {
-            $this->montant_rendu = null;
-        } else {
-            $this->montant_rendu = $aMontantRendu;
-        }
-    }
+		if (is_null($aMontantRendu)) {
+			return $this->montant_rendu;
+		} elseif ($aMontantRendu == 'RESET') {
+			$this->montant_rendu = null;
+		} else {
+			$this->montant_rendu = $aMontantRendu;
+		}
+	}
 
-    /**
-     * Get payment date
-     *
-     * @param	integer		$aPaiementLe		Date
-     * @return	integer							Date
-     */
-    public function paiementLe($aPaiementLe = null)
-    {
-        if (is_null($aPaiementLe)) {
-            return $this->paiement_le;
-        } elseif ($aPaiementLe == 'RESET') {
-            $this->paiement_le = null;
-        } else {
-            $this->paiement_le = $aPaiementLe;
-        }
-    }
+	/**
+	 * Get payment date
+	 *
+	 * @param	integer		$aPaiementLe		Date
+	 * @return	integer							Date
+	 */
+	public function paiementLe($aPaiementLe = null)
+	{
+		if (is_null($aPaiementLe)) {
+			return $this->paiement_le;
+		} elseif ($aPaiementLe == 'RESET') {
+			$this->paiement_le = null;
+		} else {
+			$this->paiement_le = $aPaiementLe;
+		}
+	}
 
-    /**
-     * Get total HT
-     *
-     * @param	int		$aTotalHt		Total amount
-     * @return	int						Total amount
-     */
-    public function amountWithoutTax($aTotalHt = null)
-    {
-        if (is_null($aTotalHt)) {
-            return $this->prix_total_ht;
-        } elseif ($aTotalHt == 'RESET') {
-            $this->prix_total_ht = null;
-        } else {
-            $this->prix_total_ht = $aTotalHt;
-        }
-    }
+	/**
+	 * Get total HT
+	 *
+	 * @param	int		$aTotalHt		Total amount
+	 * @return	int						Total amount
+	 */
+	public function amountWithoutTax($aTotalHt = null)
+	{
+		if (is_null($aTotalHt)) {
+			return $this->prix_total_ht;
+		} elseif ($aTotalHt == 'RESET') {
+			$this->prix_total_ht = null;
+		} else {
+			$this->prix_total_ht = $aTotalHt;
+		}
+	}
 
-    /**
-     * Get amount vat
-     *
-     * @param	int		$aMontantTva	Amount vat
-     * @return	int						Amount vat
-     */
-    public function amountVat($aMontantTva = null)
-    {
-        if (is_null($aMontantTva)) {
-            return $this->montant_tva;
-        } elseif ($aMontantTva == 'RESET') {
-            $this->montant_tva = null;
-        } else {
-            $this->montant_tva = $aMontantTva;
-        }
-    }
+	/**
+	 * Get amount vat
+	 *
+	 * @param	int		$aMontantTva	Amount vat
+	 * @return	int						Amount vat
+	 */
+	public function amountVat($aMontantTva = null)
+	{
+		if (is_null($aMontantTva)) {
+			return $this->montant_tva;
+		} elseif ($aMontantTva == 'RESET') {
+			$this->montant_tva = null;
+		} else {
+			$this->montant_tva = $aMontantTva;
+		}
+	}
 
-    /**
-     * Get total TTC
-     *
-     * @param	int		$aTotalTtc		Amount ttc
-     * @return	int						Amount ttc
-     */
-    public function amountWithTax($aTotalTtc = null)
-    {
-        if (is_null($aTotalTtc))
-        {
-            return $this->prix_total_ttc;
-        } elseif ($aTotalTtc == 'RESET')
-        {
-            $this->prix_total_ttc = null;
-        } else {
-            $this->prix_total_ttc = $aTotalTtc;
-        }
-    }
+	/**
+	 * Get total TTC
+	 *
+	 * @param	int		$aTotalTtc		Amount ttc
+	 * @return	int						Amount ttc
+	 */
+	public function amountWithTax($aTotalTtc = null)
+	{
+		if (is_null($aTotalTtc))
+		{
+			return $this->prix_total_ttc;
+		} elseif ($aTotalTtc == 'RESET')
+		{
+			$this->prix_total_ttc = null;
+		} else {
+			$this->prix_total_ttc = $aTotalTtc;
+		}
+	}
 }
diff --git a/htdocs/cashdesk/facturation_verif.php b/htdocs/cashdesk/facturation_verif.php
index 16b4bfec017..76ad8571118 100644
--- a/htdocs/cashdesk/facturation_verif.php
+++ b/htdocs/cashdesk/facturation_verif.php
@@ -67,15 +67,15 @@ switch ($action)
 					{
 						$ret[$key] = $value;
 					}
-                    // Here $ret['tva_tx'] is vat rate of product but we want to not use the one into table but found by function
+					// Here $ret['tva_tx'] is vat rate of product but we want to not use the one into table but found by function
 
 					$productid = $ret['rowid'];
 					$product = new Product($db);
-                    $product->fetch($productid);
-                    $prod = $product;
+					$product->fetch($productid);
+					$prod = $product;
 
 					$thirdpartyid = $_SESSION['CASHDESK_ID_THIRDPARTY'];
-                    $societe = new Societe($db);
+					$societe = new Societe($db);
 					$societe->fetch($thirdpartyid);
 
 					// Update if prices fields are defined
@@ -91,39 +91,39 @@ switch ($action)
 					// multiprix
 					if (!empty($conf->global->PRODUIT_MULTIPRICES) && !empty($societe->price_level))
 					{
-					    $pu_ht = $prod->multiprices[$societe->price_level];
-					    $pu_ttc = $prod->multiprices_ttc[$societe->price_level];
-					    $price_min = $prod->multiprices_min[$societe->price_level];
-					    $price_base_type = $prod->multiprices_base_type[$societe->price_level];
-					    if (!empty($conf->global->PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL))  // using this option is a bug. kept for backward compatibility
-					    {
-					        if (isset($prod->multiprices_tva_tx[$societe->price_level])) $tva_tx = $prod->multiprices_tva_tx[$societe->price_level];
-					        if (isset($prod->multiprices_recuperableonly[$societe->price_level])) $tva_npr = $prod->multiprices_recuperableonly[$societe->price_level];
-					    }
+						$pu_ht = $prod->multiprices[$societe->price_level];
+						$pu_ttc = $prod->multiprices_ttc[$societe->price_level];
+						$price_min = $prod->multiprices_min[$societe->price_level];
+						$price_base_type = $prod->multiprices_base_type[$societe->price_level];
+						if (!empty($conf->global->PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL))  // using this option is a bug. kept for backward compatibility
+						{
+							if (isset($prod->multiprices_tva_tx[$societe->price_level])) $tva_tx = $prod->multiprices_tva_tx[$societe->price_level];
+							if (isset($prod->multiprices_recuperableonly[$societe->price_level])) $tva_npr = $prod->multiprices_recuperableonly[$societe->price_level];
+						}
 					} elseif (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 					{
-					    require_once DOL_DOCUMENT_ROOT.'/product/class/productcustomerprice.class.php';
+						require_once DOL_DOCUMENT_ROOT.'/product/class/productcustomerprice.class.php';
 
-					    $prodcustprice = new Productcustomerprice($db);
+						$prodcustprice = new Productcustomerprice($db);
 
-					    $filter = array('t.fk_product' => $prod->id, 't.fk_soc' => $societe->id);
+						$filter = array('t.fk_product' => $prod->id, 't.fk_soc' => $societe->id);
 
-					    $result = $prodcustprice->fetch_all('', '', 0, 0, $filter);
-					    if ($result >= 0)
-					    {
-					        if (count($prodcustprice->lines) > 0)
-					        {
-					            $pu_ht = price($prodcustprice->lines[0]->price);
-					            $pu_ttc = price($prodcustprice->lines[0]->price_ttc);
-					            $price_base_type = $prodcustprice->lines[0]->price_base_type;
-					            $tva_tx = $prodcustprice->lines[0]->tva_tx;
-					            if ($prodcustprice->lines[0]->default_vat_code && !preg_match('/\(.*\)/', $tva_tx)) $tva_tx .= ' ('.$prodcustprice->lines[0]->default_vat_code.')';
-					            $tva_npr = $prodcustprice->lines[0]->recuperableonly;
-					            if (empty($tva_tx)) $tva_npr = 0;
-					        }
-					    } else {
-					        setEventMessages($prodcustprice->error, $prodcustprice->errors, 'errors');
-					    }
+						$result = $prodcustprice->fetch_all('', '', 0, 0, $filter);
+						if ($result >= 0)
+						{
+							if (count($prodcustprice->lines) > 0)
+							{
+								$pu_ht = price($prodcustprice->lines[0]->price);
+								$pu_ttc = price($prodcustprice->lines[0]->price_ttc);
+								$price_base_type = $prodcustprice->lines[0]->price_base_type;
+								$tva_tx = $prodcustprice->lines[0]->tva_tx;
+								if ($prodcustprice->lines[0]->default_vat_code && !preg_match('/\(.*\)/', $tva_tx)) $tva_tx .= ' ('.$prodcustprice->lines[0]->default_vat_code.')';
+								$tva_npr = $prodcustprice->lines[0]->recuperableonly;
+								if (empty($tva_tx)) $tva_npr = 0;
+							}
+						} else {
+							setEventMessages($prodcustprice->error, $prodcustprice->errors, 'errors');
+						}
 					}
 
 					$tmpvat = price2num(preg_replace('/\s*\(.*\)/', '', $tva_tx));
@@ -131,17 +131,17 @@ switch ($action)
 
 					// if price ht is forced (ie: calculated by margin rate and cost price). TODO Why this ?
 					if (!empty($price_ht)) {
-					    $pu_ht = price2num($price_ht, 'MU');
-					    $pu_ttc = price2num($pu_ht * (1 + ($tmpvat / 100)), 'MU');
+						$pu_ht = price2num($price_ht, 'MU');
+						$pu_ttc = price2num($pu_ht * (1 + ($tmpvat / 100)), 'MU');
 					}
 					// On reevalue prix selon taux tva car taux tva transaction peut etre different
 					// de ceux du produit par defaut (par exemple si pays different entre vendeur et acheteur).
 					elseif ($tmpvat != $tmpprodvat) {
-					    if ($price_base_type != 'HT') {
-					        $pu_ht = price2num($pu_ttc / (1 + ($tmpvat / 100)), 'MU');
-					    } else {
-					        $pu_ttc = price2num($pu_ht * (1 + ($tmpvat / 100)), 'MU');
-					    }
+						if ($price_base_type != 'HT') {
+							$pu_ht = price2num($pu_ttc / (1 + ($tmpvat / 100)), 'MU');
+						} else {
+							$pu_ttc = price2num($pu_ht * (1 + ($tmpvat / 100)), 'MU');
+						}
 					}
 
 					$obj_facturation->id($ret['rowid']);
@@ -187,17 +187,17 @@ switch ($action)
 		$newthirdpartyid = GETPOST('CASHDESK_ID_THIRDPARTY', 'int');
 		if ($newthirdpartyid > 0)
 		{
-		    $_SESSION["CASHDESK_ID_THIRDPARTY"] = $newthirdpartyid;
+			$_SESSION["CASHDESK_ID_THIRDPARTY"] = $newthirdpartyid;
 		}
 
 		$redirection = DOL_URL_ROOT.'/cashdesk/affIndex.php?menutpl=facturation';
-        break;
+		break;
 
 	case 'ajout_article':	// We have clicked on button "Add product"
 
 		if (!empty($obj_facturation->id))	// A product was previously selected and stored in session, so we can add it
 		{
-		    dol_syslog("facturation_verif save vat ".$_POST['selTva']);
+			dol_syslog("facturation_verif save vat ".$_POST['selTva']);
 			$obj_facturation->qte($_POST['txtQte']);
 			$obj_facturation->tva($_POST['selTva']); // id of vat. Saved so we can use it for next product
 			$obj_facturation->remisePercent($_POST['txtRemise']);
diff --git a/htdocs/cashdesk/index_verif.php b/htdocs/cashdesk/index_verif.php
index e8366e981cc..45ce3857068 100644
--- a/htdocs/cashdesk/index_verif.php
+++ b/htdocs/cashdesk/index_verif.php
@@ -51,9 +51,9 @@ if (empty($username))
 // Check third party id
 if (!($thirdpartyid > 0))
 {
-    $retour = $langs->trans("ErrorFieldRequired", $langs->transnoentities("CashDeskThirdPartyForSell"));
-    header('Location: '.DOL_URL_ROOT.'/cashdesk/index.php?err='.urlencode($retour).'&user='.$username.'&socid='.$thirdpartyid.'&warehouseid='.$warehouseid.'&bankid_cash='.$bankid_cash.'&bankid_cheque='.$bankid_cheque.'&bankid_cb='.$bankid_cb);
-    exit;
+	$retour = $langs->trans("ErrorFieldRequired", $langs->transnoentities("CashDeskThirdPartyForSell"));
+	header('Location: '.DOL_URL_ROOT.'/cashdesk/index.php?err='.urlencode($retour).'&user='.$username.'&socid='.$thirdpartyid.'&warehouseid='.$warehouseid.'&bankid_cash='.$bankid_cash.'&bankid_cheque='.$bankid_cheque.'&bankid_cb='.$bankid_cb);
+	exit;
 }
 
 // If we setup stock module to ask movement on invoices, we must not allow access if required setup not finished.
@@ -107,12 +107,12 @@ if ($retour >= 0)
 		$_SESSION['lastname'] = $tab['lastname'];
 		$_SESSION['firstname'] = $tab['firstname'];
 		$_SESSION['CASHDESK_ID_THIRDPARTY'] = ($thirdpartyid > 0 ? $thirdpartyid : '');
-        $_SESSION['CASHDESK_ID_WAREHOUSE'] = ($warehouseid > 0 ? $warehouseid : '');
+		$_SESSION['CASHDESK_ID_WAREHOUSE'] = ($warehouseid > 0 ? $warehouseid : '');
 
-        $_SESSION['CASHDESK_ID_BANKACCOUNT_CASH'] = ($bankid_cash > 0 ? $bankid_cash : '');
-        $_SESSION['CASHDESK_ID_BANKACCOUNT_CHEQUE'] = ($bankid_cheque > 0 ? $bankid_cheque : '');
-        $_SESSION['CASHDESK_ID_BANKACCOUNT_CB'] = ($bankid_cb > 0 ? $bankid_cb : '');
-        //var_dump($_SESSION);exit;
+		$_SESSION['CASHDESK_ID_BANKACCOUNT_CASH'] = ($bankid_cash > 0 ? $bankid_cash : '');
+		$_SESSION['CASHDESK_ID_BANKACCOUNT_CHEQUE'] = ($bankid_cheque > 0 ? $bankid_cheque : '');
+		$_SESSION['CASHDESK_ID_BANKACCOUNT_CB'] = ($bankid_cb > 0 ? $bankid_cb : '');
+		//var_dump($_SESSION);exit;
 
 		header('Location: '.DOL_URL_ROOT.'/cashdesk/affIndex.php?menutpl=facturation&id=NOUV');
 		exit;
@@ -121,7 +121,7 @@ if ($retour >= 0)
 	}
 } else {
 	// Load translation files required by the page
-    $langs->loadLangs(array("other", "errors"));
+	$langs->loadLangs(array("other", "errors"));
 	$retour = $langs->trans("ErrorBadLoginPassword");
 	header('Location: '.DOL_URL_ROOT.'/cashdesk/index.php?err='.urlencode($retour).'&user='.$username.'&socid='.$thirdpartyid.'&warehouseid='.$warehouseid);
 	exit;
diff --git a/htdocs/cashdesk/tpl/facturation1.tpl.php b/htdocs/cashdesk/tpl/facturation1.tpl.php
index d9d12c5d84e..d48fc544eb0 100644
--- a/htdocs/cashdesk/tpl/facturation1.tpl.php
+++ b/htdocs/cashdesk/tpl/facturation1.tpl.php
@@ -118,7 +118,7 @@ for ($i = 0; $i < $nbtoshow; $i++)
 					$buyer = new Societe($db);
 					if ($_SESSION["CASHDESK_ID_THIRDPARTY"] > 0) $buyer->fetch($_SESSION["CASHDESK_ID_THIRDPARTY"]);
 					echo $form->load_tva('selTva', (GETPOSTISSET("selTva") ? GETPOST("selTva", 'alpha', 2) : $vatrate), $mysoc, $buyer, 0, 0, '', false, -1);
-			    ?>
+				?>
                 </td>
 				<td></td>
 			</tr>
diff --git a/htdocs/cashdesk/tpl/liste_articles.tpl.php b/htdocs/cashdesk/tpl/liste_articles.tpl.php
index bd73954f6a0..e3c3c285966 100644
--- a/htdocs/cashdesk/tpl/liste_articles.tpl.php
+++ b/htdocs/cashdesk/tpl/liste_articles.tpl.php
@@ -50,22 +50,22 @@ $tab = (!empty($_SESSION['poscart']) ? $_SESSION['poscart'] : array());
 $tab_size = count($tab);
 if ($tab_size <= 0) print '<div class="center">'.$langs->trans("NoArticle").'</div><br>';
 else {
-    for ($i = 0; $i < $tab_size; $i++)
-    {
-        echo ('<div class="cadre_article">'."\n");
-        echo ('<p><a href="facturation_verif.php?action=suppr_article&suppr_id='.$tab[$i]['id'].'" title="'.$langs->trans("DeleteArticle").'">'.$tab[$i]['ref'].' - '.$tab[$i]['label'].'</a></p>'."\n");
+	for ($i = 0; $i < $tab_size; $i++)
+	{
+		echo ('<div class="cadre_article">'."\n");
+		echo ('<p><a href="facturation_verif.php?action=suppr_article&suppr_id='.$tab[$i]['id'].'" title="'.$langs->trans("DeleteArticle").'">'.$tab[$i]['ref'].' - '.$tab[$i]['label'].'</a></p>'."\n");
 
-        if ($tab[$i]['remise_percent'] > 0) {
-            $remise_percent = ' -'.$tab[$i]['remise_percent'].'%';
-        } else {
-            $remise_percent = '';
-        }
+		if ($tab[$i]['remise_percent'] > 0) {
+			$remise_percent = ' -'.$tab[$i]['remise_percent'].'%';
+		} else {
+			$remise_percent = '';
+		}
 
-        $remise = $tab[$i]['remise'];
+		$remise = $tab[$i]['remise'];
 
-        echo ('<p>'.$tab[$i]['qte'].' x '.price2num($tab[$i]['price'], 'MT').$remise_percent.' = '.price(price2num($tab[$i]['total_ht'], 'MT'), 0, $langs, 0, 0, -1, $conf->currency).' '.$langs->trans("HT").' ('.price(price2num($tab[$i]['total_ttc'], 'MT'), 0, $langs, 0, 0, -1, $conf->currency).' '.$langs->trans("TTC").')</p>'."\n");
-        echo ('</div>'."\n");
-    }
+		echo ('<p>'.$tab[$i]['qte'].' x '.price2num($tab[$i]['price'], 'MT').$remise_percent.' = '.price(price2num($tab[$i]['total_ht'], 'MT'), 0, $langs, 0, 0, -1, $conf->currency).' '.$langs->trans("HT").' ('.price(price2num($tab[$i]['total_ttc'], 'MT'), 0, $langs, 0, 0, -1, $conf->currency).' '.$langs->trans("TTC").')</p>'."\n");
+		echo ('</div>'."\n");
+	}
 }
 
 echo ('<p class="cadre_prix_total">'.$langs->trans("Total").' : '.price(price2num($total_ttc, 'MT'), 0, $langs, 0, 0, -1, $conf->currency).'<br></p>'."\n");
diff --git a/htdocs/cashdesk/tpl/ticket.tpl.php b/htdocs/cashdesk/tpl/ticket.tpl.php
index b5994456252..101ea687e7b 100644
--- a/htdocs/cashdesk/tpl/ticket.tpl.php
+++ b/htdocs/cashdesk/tpl/ticket.tpl.php
@@ -55,11 +55,11 @@ $object->fetch($facid);
         </p>
 
         <p class="date_heure"><?php
-        // Recuperation et affichage de la date et de l'heure
-        $now = dol_now();
-        print dol_print_date($now, 'dayhourtext').'<br>';
-        print $object->ref;
-        ?></p>
+		// Recuperation et affichage de la date et de l'heure
+		$now = dol_now();
+		print dol_print_date($now, 'dayhourtext').'<br>';
+		print $object->ref;
+		?></p>
     </div>
 </div>
 
@@ -78,14 +78,14 @@ $object->fetch($facid);
     <tbody>
     <?php
 
-    $tab = array();
-    $tab = $_SESSION['poscart'];
+	$tab = array();
+	$tab = $_SESSION['poscart'];
 
-    $tab_size = count($tab);
-    for ($i = 0; $i < $tab_size; $i++)
-    {
-        $remise = $tab[$i]['remise'];
-        ?>
+	$tab_size = count($tab);
+	for ($i = 0; $i < $tab_size; $i++)
+	{
+		$remise = $tab[$i]['remise'];
+		?>
     <tr>
         <td><?php echo $tab[$i]['ref']; ?></td>
         <td><?php echo $tab[$i]['label']; ?></td>
@@ -94,8 +94,8 @@ $object->fetch($facid);
         <td class="total"><?php echo price(price2num($tab[$i]['total_ht'], 'MT'), 0, $langs, 0, 0, -1, $conf->currency); ?></td>
     </tr>
         <?php
-    }
-    ?>
+	}
+	?>
     </tbody>
 </table>
 
diff --git a/htdocs/cashdesk/validation_ticket.php b/htdocs/cashdesk/validation_ticket.php
index 7e4e101c9b8..28ad91dc4e7 100644
--- a/htdocs/cashdesk/validation_ticket.php
+++ b/htdocs/cashdesk/validation_ticket.php
@@ -35,7 +35,7 @@ $parameters = array();
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $obj_facturation);
 if (empty($reshook))
 {
-    require 'tpl/ticket.tpl.php';
+	require 'tpl/ticket.tpl.php';
 }
 
 
diff --git a/htdocs/cashdesk/validation_verif.php b/htdocs/cashdesk/validation_verif.php
index d57aaa251ce..9468c395756 100644
--- a/htdocs/cashdesk/validation_verif.php
+++ b/htdocs/cashdesk/validation_verif.php
@@ -39,11 +39,11 @@ $bankaccountid = GETPOST('cashdeskbank');
 switch ($action)
 {
 	default:
-	    $redirection = DOL_URL_ROOT.'/cashdesk/affIndex.php?menutpl=validation';
+		$redirection = DOL_URL_ROOT.'/cashdesk/affIndex.php?menutpl=validation';
 		break;
 
 	case 'validate_sell':
-	    $thirdpartyid = $_SESSION['CASHDESK_ID_THIRDPARTY'];
+		$thirdpartyid = $_SESSION['CASHDESK_ID_THIRDPARTY'];
 
 		$company = new Societe($db);
 		$company->fetch($thirdpartyid);
@@ -97,9 +97,9 @@ switch ($action)
 
 			$obj_facturation->amountReturned($encaisse - $total);
 		} else {
-		    //$txtDatePaiement=$_POST['txtDatePaiement'];
-		    $datePaiement = dol_mktime(0, 0, 0, $_POST['txtDatePaiementmonth'], $_POST['txtDatePaiementday'], $_POST['txtDatePaiementyear']);
-		    $txtDatePaiement = dol_print_date($datePaiement, 'dayrfc');
+			//$txtDatePaiement=$_POST['txtDatePaiement'];
+			$datePaiement = dol_mktime(0, 0, 0, $_POST['txtDatePaiementmonth'], $_POST['txtDatePaiementday'], $_POST['txtDatePaiementyear']);
+			$txtDatePaiement = dol_print_date($datePaiement, 'dayrfc');
 			$obj_facturation->paiementLe($txtDatePaiement);
 		}
 
@@ -252,12 +252,12 @@ switch ($action)
 				}
 			} else {
 				setEventMessages($invoice->error, $invoice->errors, 'errors');
-			    $error++;
+				$error++;
 			}
 
 			$id = $invoice->id;
 		} else {
-		    $resultcreate = $invoice->create($user, 0, 0);
+			$resultcreate = $invoice->create($user, 0, 0);
 			if ($resultcreate > 0)
 			{
 				$warehouseidtodecrease = (isset($_SESSION["CASHDESK_ID_WAREHOUSE"]) ? $_SESSION["CASHDESK_ID_WAREHOUSE"] : 0);
@@ -282,8 +282,8 @@ switch ($action)
 							if ($invoice->type == $invoice::TYPE_CREDIT_NOTE) $result = $mouvP->reception($user, $invoice->lines[$i]->fk_product, $warehouseidtodecrease, $invoice->lines[$i]->qty, $invoice->lines[$i]->subprice, $langs->trans("InvoiceValidatedInDolibarrFromPos", $invoice->newref));
 							else $result = $mouvP->livraison($user, $invoice->lines[$i]->fk_product, $warehouseidtodecrease, $invoice->lines[$i]->qty, $invoice->lines[$i]->subprice, $langs->trans("InvoiceValidatedInDolibarrFromPos", $invoice->newref));
 							if ($result < 0) {
-							    setEventMessages($mouvP->error, $mouvP->errors, 'errors');
-							    $error++;
+								setEventMessages($mouvP->error, $mouvP->errors, 'errors');
+								$error++;
 							}
 						}
 					}
@@ -303,33 +303,33 @@ switch ($action)
 				$paiement_id = $payment->create($user);
 				if ($paiement_id > 0)
 				{
-                    if (!$error)
-                    {
-                        $result = $payment->addPaymentToBank($user, 'payment', '(CustomerInvoicePayment)', $bankaccountid, '', '');
-                        if (!$result > 0)
-                        {
-                            $errmsg = $paiement->error;
-                            $error++;
-                        }
-                    }
+					if (!$error)
+					{
+						$result = $payment->addPaymentToBank($user, 'payment', '(CustomerInvoicePayment)', $bankaccountid, '', '');
+						if (!$result > 0)
+						{
+							$errmsg = $paiement->error;
+							$error++;
+						}
+					}
 
-                    if (!$error)
-                    {
-                    	if ($invoice->total_ttc == $obj_facturation->amountWithTax()
-                    		&& $obj_facturation->getSetPaymentMode() != 'DIFF')
-                    	{
-                    		// We set status to payed
-                    		$result = $invoice->set_paid($user);
-                  			//print 'set paid';exit;
-                    	}
-                    }
+					if (!$error)
+					{
+						if ($invoice->total_ttc == $obj_facturation->amountWithTax()
+							&& $obj_facturation->getSetPaymentMode() != 'DIFF')
+						{
+							// We set status to payed
+							$result = $invoice->set_paid($user);
+				  			//print 'set paid';exit;
+						}
+					}
 				} else {
-				    setEventMessages($invoice->error, $invoice->errors, 'errors');
-				    $error++;
+					setEventMessages($invoice->error, $invoice->errors, 'errors');
+					$error++;
 				}
 			} else {
 				setEventMessages($invoice->error, $invoice->errors, 'errors');
-			    $error++;
+				$error++;
 			}
 		}
 
diff --git a/htdocs/categories/admin/categorie.php b/htdocs/categories/admin/categorie.php
index f9127914059..693a3e53a2a 100644
--- a/htdocs/categories/admin/categorie.php
+++ b/htdocs/categories/admin/categorie.php
@@ -42,26 +42,26 @@ $action = GETPOST('action', 'aZ09');
 $reg = array();
 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 {
-        setEventMessages($db->lasterror(), null, 'errors');
-    }
+	$code = $reg[1];
+	if (dolibarr_set_const($db, $code, 1, 'chaine', 0, '', $conf->entity) > 0)
+	{
+		header("Location: ".$_SERVER["PHP_SELF"]);
+		exit;
+	} else {
+		setEventMessages($db->lasterror(), null, 'errors');
+	}
 }
 
 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 {
-         setEventMessages($db->lasterror(), null, 'errors');
-    }
+	$code = $reg[1];
+	if (dolibarr_del_const($db, $code, $conf->entity) > 0)
+	{
+		header("Location: ".$_SERVER["PHP_SELF"]);
+		exit;
+	} else {
+		 setEventMessages($db->lasterror(), null, 'errors');
+	}
 }
 
 
diff --git a/htdocs/categories/admin/categorie_extrafields.php b/htdocs/categories/admin/categorie_extrafields.php
index 404d35d6065..ff6a4ca7881 100644
--- a/htdocs/categories/admin/categorie_extrafields.php
+++ b/htdocs/categories/admin/categorie_extrafields.php
@@ -72,15 +72,15 @@ print dol_get_fiche_head($head, 'attributes_categories', $langs->trans("Categori
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_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,9 +93,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';
 }
 
 /* ************************************************************************** */
@@ -105,10 +105,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/categories/card.php b/htdocs/categories/card.php
index 8949ba25ef4..590ffe83cf1 100644
--- a/htdocs/categories/card.php
+++ b/htdocs/categories/card.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2007		Patrick Raguin		<patrick.raguin@gmail.com>
  * Copyright (C) 2013		Florian Henry		<florian.henry@open-concept.pro>
  * Copyright (C) 2015       Raphaël Doursenaud  <rdoursenaud@gpcsolutions.fr>
+ * Copyright (C) 2020       Frédéric France     <frederic.france@netlogic.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -35,26 +36,24 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 $langs->load("categories");
 
 // Security check
-$socid = GETPOST('socid', 'int');
+$socid = (int) GETPOST('socid', 'int');
 if (!$user->rights->categorie->lire) accessforbidden();
 
 $action		= GETPOST('action', 'alpha');
 $cancel		= GETPOST('cancel', 'alpha');
 $origin		= GETPOST('origin', 'alpha');
-$catorigin = GETPOST('catorigin', 'int');
-$type = GETPOST('type', 'alpha');
+$catorigin  = (int) GETPOST('catorigin', 'int');
+$type       = GETPOST('type', 'aZ09');
 $urlfrom	= GETPOST('urlfrom', 'alpha');
 $backtopage = GETPOST('backtopage', 'alpha');
 
-$socid = GETPOST('socid', 'int');
-$label = GETPOST('label');
-$description = GETPOST('description');
-$color = GETPOST('color');
-$visible = GETPOST('visible');
-$parent = GETPOST('parent');
+$label = (string) GETPOST('label', 'alphanohtml');
+$description = (string) GETPOST('description', 'restricthtml');
+$color = preg_replace('/[^0-9a-f#]/i', '', (string) GETPOST('color', 'alphanohtml'));
+$visible = (int) GETPOST('visible', 'int');
+$parent = (int) GETPOST('parent', 'int');
 
-if ($origin)
-{
+if ($origin) {
 	if ($type == Categorie::TYPE_PRODUCT)     $idProdOrigin     = $origin;
 	if ($type == Categorie::TYPE_SUPPLIER)    $idSupplierOrigin = $origin;
 	if ($type == Categorie::TYPE_CUSTOMER)    $idCompanyOrigin  = $origin;
@@ -73,6 +72,8 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 // Initialize technical object to manage hooks. Note that conf->hooks_modules contains array array
 $hookmanager->initHooks(array('categorycard'));
 
+$error = 0;
+
 
 /*
  *	Actions
@@ -88,32 +89,25 @@ if ($action == 'add' && $user->rights->categorie->creer)
 		{
 			header("Location: ".$urlfrom);
 			exit;
-		} elseif ($backtopage)
-		{
+		} elseif ($backtopage) {
 			header("Location: ".$backtopage);
 			exit;
-		} elseif ($idProdOrigin)
-		{
+		} elseif ($idProdOrigin) {
 			header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idProdOrigin.'&type='.$type);
 			exit;
-		} elseif ($idCompanyOrigin)
-		{
+		} elseif ($idCompanyOrigin) {
 			header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idCompanyOrigin.'&type='.$type);
 			exit;
-		} elseif ($idSupplierOrigin)
-		{
+		} elseif ($idSupplierOrigin) {
 			header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idSupplierOrigin.'&type='.$type);
 			exit;
-		} elseif ($idMemberOrigin)
-		{
+		} elseif ($idMemberOrigin) {
 			header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idMemberOrigin.'&type='.$type);
 			exit;
-		} elseif ($idContactOrigin)
-		{
+		} elseif ($idContactOrigin) {
 			header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idContactOrigin.'&type='.$type);
 			exit;
-		} elseif ($idProjectOrigin)
-		{
+		} elseif ($idProjectOrigin) {
 			header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idProjectOrigin.'&type='.$type);
 			exit;
 		} else {
@@ -127,7 +121,7 @@ if ($action == 'add' && $user->rights->categorie->creer)
 	$object->label			= $label;
 	$object->color			= $color;
 	$object->description = dol_htmlcleanlastbr($description);
-	$object->socid			= ($socid ? $socid : 'null');
+	$object->socid			= ($socid > 0 ? $socid : 0);
 	$object->visible = $visible;
 	$object->type = $type;
 
@@ -262,7 +256,7 @@ if ($user->rights->categorie->creer)
 
 		$parameters = array();
 		$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-        print $hookmanager->resPrint;
+		print $hookmanager->resPrint;
 		if (empty($reshook))
 		{
 			print $object->showOptionals($extrafields, 'edit', $parameters);
@@ -270,7 +264,7 @@ if ($user->rights->categorie->creer)
 
 		print '</table>';
 
-		dol_fiche_end('');
+		print dol_get_fiche_end('');
 
 		print '<div class="center">';
 		print '<input type="submit" class="button" value="'.$langs->trans("CreateThisCat").'" name="creation" />';
diff --git a/htdocs/categories/class/api_categories.class.php b/htdocs/categories/class/api_categories.class.php
index 5f0a28340f9..e182a91d32a 100644
--- a/htdocs/categories/class/api_categories.class.php
+++ b/htdocs/categories/class/api_categories.class.php
@@ -658,7 +658,7 @@ class Categories extends DolibarrApi
 	 * Clean sensible object datas
 	 *
 	 * @param   Categorie  $object    Object to clean
-	 * @return    array    Array of cleaned object properties
+	 * @return  Object     Object with cleaned properties
 	 */
 	protected function _cleanObjectDatas($object)
 	{
diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
index 8d9b96976cd..3aca92708a7 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -424,17 +424,17 @@ class Categorie extends CommonObject
 		$sql .= " fk_user_creat";
 		$sql .= ") VALUES (";
 		$sql .= (int) $this->fk_parent.",";
-		$sql .= "'".$this->db->escape($this->label)."',";
-		$sql .= "'".$this->db->escape($this->description)."',";
-		$sql .= "'".$this->db->escape($this->color)."',";
+		$sql .= "'".$this->db->escape($this->label)."', ";
+		$sql .= "'".$this->db->escape($this->description)."', ";
+		$sql .= "'".$this->db->escape($this->color)."', ";
 		if (!empty($conf->global->CATEGORY_ASSIGNED_TO_A_CUSTOMER)) {
-			$sql .= ($this->socid != -1 ? $this->socid : 'null').",";
+			$sql .= ($this->socid > 0 ? $this->socid : 'null').", ";
 		}
-		$sql .= "'".$this->db->escape($this->visible)."',";
-		$sql .= $this->db->escape($type).",";
-		$sql .= (!empty($this->import_key) ? "'".$this->db->escape($this->import_key)."'" : 'null').",";
-		$sql .= (!empty($this->ref_ext) ? "'".$this->db->escape($this->ref_ext)."'" : 'null').",";
-		$sql .= (int) $conf->entity.",";
+		$sql .= "'".$this->db->escape($this->visible)."', ";
+		$sql .= $this->db->escape($type).", ";
+		$sql .= (!empty($this->import_key) ? "'".$this->db->escape($this->import_key)."'" : 'null').", ";
+		$sql .= (!empty($this->ref_ext) ? "'".$this->db->escape($this->ref_ext)."'" : 'null').", ";
+		$sql .= (int) $conf->entity.", ";
 		$sql .= "'".$this->db->idate($now)."', ";
 		$sql .= (int) $user->id;
 		$sql .= ")";
@@ -516,7 +516,7 @@ class Categorie extends CommonObject
 		$sql .= " ref_ext = '".$this->db->escape($this->ref_ext)."',";
 		$sql .= " color = '".$this->db->escape($this->color)."'";
 		if (!empty($conf->global->CATEGORY_ASSIGNED_TO_A_CUSTOMER)) {
-			$sql .= ", fk_soc = ".($this->socid != -1 ? $this->socid : 'null');
+			$sql .= ", fk_soc = ".($this->socid > 0 ? $this->socid : 'null');
 		}
 		$sql .= ", visible = ".(int) $this->visible;
 		$sql .= ", fk_parent = ".(int) $this->fk_parent;
@@ -1415,11 +1415,12 @@ class Categorie extends CommonObject
 
 		if (is_numeric($type)) $type = Categorie::$MAP_ID_TO_CODE[$type];
 
-		if ($type === Categorie::TYPE_BANK_LINE) {   // TODO Remove this with standard category code
-			// Load bank groups
+		if ($type === Categorie::TYPE_BANK_LINE) {   // TODO Remove this with standard category code after migration of llx_bank_categ into llx_categorie
+			// Load bank categories
 			$sql = "SELECT c.label, c.rowid";
 			$sql .= " FROM ".MAIN_DB_PREFIX."bank_class as a, ".MAIN_DB_PREFIX."bank_categ as c";
 			$sql .= " WHERE a.lineid=".$id." AND a.fk_categ = c.rowid";
+			$sql .= " AND c.entity IN (".getEntity('category').")";
 			$sql .= " ORDER BY c.label";
 
 			$res = $this->db->query($sql);
@@ -1550,7 +1551,7 @@ class Categorie extends CommonObject
 			if (colorIsLight($this->color)) $forced_color = 'categtextblack';
 		}
 
-		$link = '<a href="'.DOL_URL_ROOT.'/categories/viewcat.php?id='.$this->id.'&type='.$this->type.$moreparam.'&backtopage='.urlencode($_SERVER['PHP_SELF'].($moreparam?'?'.$moreparam:'')).'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip '.$forced_color.'">';
+		$link = '<a href="'.DOL_URL_ROOT.'/categories/viewcat.php?id='.$this->id.'&type='.$this->type.$moreparam.'&backtopage='.urlencode($_SERVER['PHP_SELF'].($moreparam ? '?'.$moreparam : '')).'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip '.$forced_color.'">';
 		$linkend = '</a>';
 
 		$picto = 'category';
diff --git a/htdocs/categories/edit.php b/htdocs/categories/edit.php
index 9f7aebf7fec..a27295fcd84 100644
--- a/htdocs/categories/edit.php
+++ b/htdocs/categories/edit.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2006-2016 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2007      Patrick Raguin	  	<patrick.raguin@gmail.com>
+ * Copyright (C) 2020      Frédéric France		<frederic.france@netlogic.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -39,10 +40,10 @@ $action = (GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'edit');
 $confirm = GETPOST('confirm');
 $cancel = GETPOST('cancel', 'alpha');
 
-$socid = GETPOST('socid', 'int');
-$label = GETPOST('label', 'alphanohtml');
-$description = GETPOST('description', 'restricthtml');
-$color = preg_replace('/[^0-9a-f#]/i', '', GETPOST('color', 'alphanohtml'));
+$socid = (int) GETPOST('socid', 'int');
+$label = (string) GETPOST('label', 'alphanohtml');
+$description = (string) GETPOST('description', 'restricthtml');
+$color = preg_replace('/[^0-9a-f#]/i', '', (string) GETPOST('color', 'alphanohtml'));
 $visible = (int) GETPOST('visible', 'int');
 $parent = (int) GETPOST('parent', 'int');
 
@@ -56,7 +57,7 @@ $result = restrictedArea($user, 'categorie', $id, '&category');
 
 $object = new Categorie($db);
 if ($id > 0) {
-    $result = $object->fetch($id);
+	$result = $object->fetch($id);
 }
 
 $extrafields = new ExtraFields($db);
@@ -65,29 +66,31 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 // Initialize technical object to manage hooks. Note that conf->hooks_modules contains array array
 $hookmanager->initHooks(array('categorycard'));
 
+$error = 0;
+
 
 /*
  * Actions
  */
 
 if ($cancel) {
-    header('Location: '.DOL_URL_ROOT.'/categories/viewcat.php?id='.$object->id.'&type='.$type);
-    exit;
+	header('Location: '.DOL_URL_ROOT.'/categories/viewcat.php?id='.$object->id.'&type='.$type);
+	exit;
 }
 
 // Action mise a jour d'une categorie
 if ($action == 'update' && $user->rights->categorie->creer) {
-    $object->oldcopy = dol_clone($object);
+	$object->oldcopy = dol_clone($object);
 	$object->label          = $label;
 	$object->description    = dol_htmlcleanlastbr($description);
 	$object->color          = $color;
-	$object->socid          = ($socid ? $socid : 'null');
+	$object->socid          = ($socid > 0 ? $socid : 0);
 	$object->visible        = $visible;
-    $object->fk_parent = $parent != -1 ? $parent : 0;
+	$object->fk_parent = $parent != -1 ? $parent : 0;
 
 
 	if (empty($object->label)) {
-	    $error++;
+		$error++;
 		$action = 'edit';
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Label")), null, 'errors');
 	}
@@ -170,7 +173,7 @@ if (empty($reshook)) {
 print '</table>';
 
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 print '<div class="center"><input type="submit" class="button" name"submit" value="'.$langs->trans("Modify").'"> &nbsp; <input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'"></div>';
diff --git a/htdocs/categories/info.php b/htdocs/categories/info.php
index 0011b4c1f5f..f64f3be8f9e 100644
--- a/htdocs/categories/info.php
+++ b/htdocs/categories/info.php
@@ -44,8 +44,8 @@ $result = restrictedArea($user, 'categorie', $id, '&category');
 
 $object = new Categorie($db);
 if (!$object->fetch($id) > 0) {
-    dol_print_error($db);
-    exit;
+	dol_print_error($db);
+	exit;
 }
 $type = $object->type;
 if (is_numeric($type)) $type = Categorie::$MAP_ID_TO_CODE[$type]; // For backward compatibility
@@ -72,7 +72,7 @@ $object->ref = $object->label;
 $morehtmlref = '<br><div class="refidno"><a href="'.DOL_URL_ROOT.'/categories/index.php?leftmenu=cat&type='.$type.'">'.$langs->trans("Root").'</a> >> ';
 $ways = $object->print_all_ways(" &gt;&gt; ", '', 1);
 foreach ($ways as $way) {
-    $morehtmlref .= $way."<br>\n";
+	$morehtmlref .= $way."<br>\n";
 }
 $morehtmlref .= '</div>';
 
@@ -95,7 +95,7 @@ print '</table>';
 
 print '</div>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // End of page
 llxFooter();
diff --git a/htdocs/categories/photos.php b/htdocs/categories/photos.php
index 0c7c35da1fe..73c7664f6c2 100644
--- a/htdocs/categories/photos.php
+++ b/htdocs/categories/photos.php
@@ -161,7 +161,7 @@ if ($object->id)
 	print "</table>\n";
 	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 
 
diff --git a/htdocs/categories/traduction.php b/htdocs/categories/traduction.php
index c690cfcab84..660dbf9317d 100644
--- a/htdocs/categories/traduction.php
+++ b/htdocs/categories/traduction.php
@@ -223,7 +223,7 @@ print '</td></tr>';
 print '</table>';
 print '</div>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 
diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php
index 1985e756d45..8c1eccfa846 100644
--- a/htdocs/categories/viewcat.php
+++ b/htdocs/categories/viewcat.php
@@ -126,19 +126,19 @@ if ($id > 0 && $removeelem > 0)
 		$tmpobject = new Contact($db);
 		$result = $tmpobject->fetch($removeelem);
 		$elementtype = 'contact';
-    } elseif ($type == Categorie::TYPE_ACCOUNT && $user->rights->banque->configurer)
-    {
-        require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
-        $tmpobject = new Account($db);
-        $result = $tmpobject->fetch($removeelem);
-        $elementtype = 'account';
-    } elseif ($type == Categorie::TYPE_PROJECT && $user->rights->projet->creer)
-    {
-        require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
-        $tmpobject = new Project($db);
-        $result = $tmpobject->fetch($removeelem);
-        $elementtype = 'project';
-    } elseif ($type == Categorie::TYPE_USER && $user->rights->user->user->creer)
+	} elseif ($type == Categorie::TYPE_ACCOUNT && $user->rights->banque->configurer)
+	{
+		require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+		$tmpobject = new Account($db);
+		$result = $tmpobject->fetch($removeelem);
+		$elementtype = 'account';
+	} elseif ($type == Categorie::TYPE_PROJECT && $user->rights->projet->creer)
+	{
+		require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+		$tmpobject = new Project($db);
+		$result = $tmpobject->fetch($removeelem);
+		$elementtype = 'project';
+	} elseif ($type == Categorie::TYPE_USER && $user->rights->user->user->creer)
 	{
 		require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
 		$tmpobject = new User($db);
@@ -162,9 +162,9 @@ if ($user->rights->categorie->supprimer && $action == 'confirm_delete' && $confi
 }
 
 if ($elemid && $action == 'addintocategory' &&
-    (($type == Categorie::TYPE_PRODUCT && ($user->rights->produit->creer || $user->rights->service->creer)) ||
-     ($type == Categorie::TYPE_CUSTOMER && $user->rights->societe->creer) ||
-     ($type == Categorie::TYPE_SUPPLIER && $user->rights->societe->creer)
+	(($type == Categorie::TYPE_PRODUCT && ($user->rights->produit->creer || $user->rights->service->creer)) ||
+	 ($type == Categorie::TYPE_CUSTOMER && $user->rights->societe->creer) ||
+	 ($type == Categorie::TYPE_SUPPLIER && $user->rights->societe->creer)
    ))
 {
 	if ($type == Categorie::TYPE_PRODUCT)
@@ -227,7 +227,7 @@ $morehtmlref = '<br><div class="refidno"><a href="'.DOL_URL_ROOT.'/categories/in
 $ways = $object->print_all_ways(" &gt;&gt; ", '', 1);
 foreach ($ways as $way)
 {
-    $morehtmlref .= $way."<br>\n";
+	$morehtmlref .= $way."<br>\n";
 }
 $morehtmlref .= '</div>';
 
@@ -267,7 +267,7 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
 print '</table>';
 print '</div>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 /*
@@ -278,13 +278,13 @@ print "<div class='tabsAction'>\n";
 
 if ($user->rights->categorie->creer)
 {
-	$socid = ($object->socid ? "&amp;socid=".$object->socid : "");
-	print "<a class='butAction' href='edit.php?id=".$object->id.$socid."&amp;type=".$type."'>".$langs->trans("Modify")."</a>";
+	$socid = ($object->socid ? "&socid=".$object->socid : "");
+	print '<a class="butAction" href="edit.php?id='.$object->id.$socid.'&type='.$type.'">'.$langs->trans("Modify").'</a>';
 }
 
 if ($user->rights->categorie->supprimer)
 {
-	print "<a class='butActionDelete' href='".DOL_URL_ROOT."/categories/viewcat.php?action=delete&amp;token='.newToken().'&amp;id=".$object->id."&amp;type=".$type."'>".$langs->trans("Delete")."</a>";
+    print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?action=delete&token='.newToken().'&id='.$object->id.'&type='.$type.'">'.$langs->trans("Delete").'</a>';
 }
 
 print "</div>";
@@ -801,61 +801,61 @@ if ($type == Categorie::TYPE_CONTACT)
 // List of bank accounts
 if ($type == Categorie::TYPE_ACCOUNT)
 {
-    require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 
-    $permission = $user->rights->banque->creer;
+	$permission = $user->rights->banque->creer;
 
-    $accounts = $object->getObjectsInCateg($type, 0, $limit, $offset);
-    if ($accounts < 0)
-    {
-        dol_print_error($db, $object->error, $object->errors);
-    } else {
-    	print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
-    	print '<input type="hidden" name="token" value="'.newToken().'">';
-    	print '<input type="hidden" name="typeid" value="'.$typeid.'">';
-    	print '<input type="hidden" name="type" value="'.$typeid.'">';
-    	print '<input type="hidden" name="id" value="'.$object->id.'">';
-    	print '<input type="hidden" name="action" value="list">';
+	$accounts = $object->getObjectsInCateg($type, 0, $limit, $offset);
+	if ($accounts < 0)
+	{
+		dol_print_error($db, $object->error, $object->errors);
+	} else {
+		print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
+		print '<input type="hidden" name="token" value="'.newToken().'">';
+		print '<input type="hidden" name="typeid" value="'.$typeid.'">';
+		print '<input type="hidden" name="type" value="'.$typeid.'">';
+		print '<input type="hidden" name="id" value="'.$object->id.'">';
+		print '<input type="hidden" name="action" value="list">';
 
-    	print '<br>';
-    	$param = '&limit='.$limit.'&id='.$id.'&type='.$type; $num = count($accounts); $nbtotalofrecords = ''; $newcardbutton = '';
-    	print_barre_liste($langs->trans("Account"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'bank_account', 0, $newcardbutton, '', $limit);
+		print '<br>';
+		$param = '&limit='.$limit.'&id='.$id.'&type='.$type; $num = count($accounts); $nbtotalofrecords = ''; $newcardbutton = '';
+		print_barre_liste($langs->trans("Account"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'bank_account', 0, $newcardbutton, '', $limit);
 
-    	print "<table class='noborder' width='100%'>\n";
-        print '<tr class="liste_titre"><td colspan="4">'.$langs->trans("Ref").'</td></tr>'."\n";
+		print "<table class='noborder' width='100%'>\n";
+		print '<tr class="liste_titre"><td colspan="4">'.$langs->trans("Ref").'</td></tr>'."\n";
 
-        if (count($accounts) > 0)
-        {
-        	$i = 0;
-            foreach ($accounts as $key => $account)
-            {
-            	$i++;
-            	if ($i > $limit) break;
+		if (count($accounts) > 0)
+		{
+			$i = 0;
+			foreach ($accounts as $key => $account)
+			{
+				$i++;
+				if ($i > $limit) break;
 
-                print "\t".'<tr class="oddeven">'."\n";
-                print '<td class="nowrap" valign="top">';
-                print $account->getNomUrl(1, 0);
-                print "</td>\n";
-                print '<td class="tdtop">'.$account->bank."</td>\n";
-                print '<td class="tdtop">'.$account->number."</td>\n";
-                // Link to delete from category
-                print '<td class="right">';
-                if ($permission)
-                {
-                    print "<a href= '".$_SERVER['PHP_SELF']."?".(empty($socid) ? 'id' : 'socid')."=".$object->id."&amp;type=".$typeid."&amp;removeelem=".$account->id."'>";
-                    print $langs->trans("DeleteFromCat");
-                    print img_picto($langs->trans("DeleteFromCat"), 'unlink', '', false, 0, 0, '', 'paddingleft');
-                    print "</a>";
-                }
-                print "</tr>\n";
-            }
-        } else {
-            print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("ThisCategoryHasNoItems").'</td></tr>';
-        }
-        print "</table>\n";
+				print "\t".'<tr class="oddeven">'."\n";
+				print '<td class="nowrap" valign="top">';
+				print $account->getNomUrl(1, 0);
+				print "</td>\n";
+				print '<td class="tdtop">'.$account->bank."</td>\n";
+				print '<td class="tdtop">'.$account->number."</td>\n";
+				// Link to delete from category
+				print '<td class="right">';
+				if ($permission)
+				{
+					print "<a href= '".$_SERVER['PHP_SELF']."?".(empty($socid) ? 'id' : 'socid')."=".$object->id."&amp;type=".$typeid."&amp;removeelem=".$account->id."'>";
+					print $langs->trans("DeleteFromCat");
+					print img_picto($langs->trans("DeleteFromCat"), 'unlink', '', false, 0, 0, '', 'paddingleft');
+					print "</a>";
+				}
+				print "</tr>\n";
+			}
+		} else {
+			print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("ThisCategoryHasNoItems").'</td></tr>';
+		}
+		print "</table>\n";
 
-        print '</form>'."\n";
-    }
+		print '</form>'."\n";
+	}
 }
 
 // List of Project
diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index 7e9e63895aa..0b1eba637d4 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -96,14 +96,14 @@ $formactions = new FormActions($db);
 
 // Load object
 if ($id > 0 && $action != 'add') {
-    $ret = $object->fetch($id);
-    if ($ret > 0) {
-        $ret = $object->fetch_optionals();
-        $ret1 = $object->fetch_userassigned();
-    }
-    if ($ret < 0 || $ret1 < 0) {
-        dol_print_error('', $object->error);
-    }
+	$ret = $object->fetch($id);
+	if ($ret > 0) {
+		$ret = $object->fetch_optionals();
+		$ret1 = $object->fetch_userassigned();
+	}
+	if ($ret < 0 || $ret1 < 0) {
+		dol_print_error('', $object->error);
+	}
 }
 
 // fetch optionals attributes and labels
@@ -172,10 +172,10 @@ if (empty($reshook) && (GETPOST('addassignedtouser') || GETPOST('updateassignedt
 
 // Link to a project
 if (empty($reshook) && $action == 'classin' && ($user->rights->agenda->allactions->create ||
-    (($object->authorid == $user->id || $object->userownerid == $user->id) && $user->rights->agenda->myactions->create)))
+	(($object->authorid == $user->id || $object->userownerid == $user->id) && $user->rights->agenda->myactions->create)))
 {
-    //$object->fetch($id);
-    $object->setProject(GETPOST('projectid', 'int'));
+	//$object->fetch($id);
+	$object->setProject(GETPOST('projectid', 'int'));
 }
 
 // Action clone object
@@ -187,10 +187,10 @@ if (empty($reshook) && $action == 'confirm_clone' && $confirm == 'yes')
 	} else {
 		if ($id > 0) {
 			//$object->fetch($id);
-            if (!empty($object->socpeopleassigned)) {
-                reset($object->socpeopleassigned);
-                $object->contact_id = key($object->socpeopleassigned);
-            }
+			if (!empty($object->socpeopleassigned)) {
+				reset($object->socpeopleassigned);
+				$object->contact_id = key($object->socpeopleassigned);
+			}
 			$result = $object->createFromClone($user, GETPOST('socid', 'int'));
 			if ($result > 0) {
 				header("Location: ".$_SERVER['PHP_SELF'].'?id='.$result);
@@ -208,13 +208,13 @@ if (empty($reshook) && $action == 'add')
 {
 	$error = 0;
 
-    if (empty($backtopage))
-    {
-        if ($socid > 0) $backtopage = DOL_URL_ROOT.'/societe/agenda.php?socid='.$socid;
-        else $backtopage = DOL_URL_ROOT.'/comm/action/index.php';
-    }
+	if (empty($backtopage))
+	{
+		if ($socid > 0) $backtopage = DOL_URL_ROOT.'/societe/agenda.php?socid='.$socid;
+		else $backtopage = DOL_URL_ROOT.'/comm/action/index.php';
+	}
 
-    if (!empty($socpeopleassigned[0]))
+	if (!empty($socpeopleassigned[0]))
 	{
 		$result = $contact->fetch($socpeopleassigned[0]);
 	}
@@ -225,9 +225,9 @@ if (empty($reshook) && $action == 'add')
 		exit;
 	}
 
-    $percentage = in_array(GETPOST('status'), array(-1, 100)) ?GETPOST('status') : (in_array(GETPOST('complete'), array(-1, 100)) ?GETPOST('complete') : GETPOST("percentage")); // If status is -1 or 100, percentage is not defined and we must use status
+	$percentage = in_array(GETPOST('status'), array(-1, 100)) ?GETPOST('status') : (in_array(GETPOST('complete'), array(-1, 100)) ?GETPOST('complete') : GETPOST("percentage")); // If status is -1 or 100, percentage is not defined and we must use status
 
-    // Clean parameters
+	// Clean parameters
 	$datep = dol_mktime($fulldayevent ? '00' : GETPOST("aphour", 'int'), $fulldayevent ? '00' : GETPOST("apmin", 'int'), $fulldayevent ? '00' : GETPOST("apsec", 'int'), GETPOST("apmonth", 'int'), GETPOST("apday", 'int'), GETPOST("apyear", 'int'));
 	$datef = dol_mktime($fulldayevent ? '23' : GETPOST("p2hour", 'int'), $fulldayevent ? '59' : GETPOST("p2min", 'int'), $fulldayevent ? '59' : GETPOST("apsec", 'int'), GETPOST("p2month", 'int'), GETPOST("p2day", 'int'), GETPOST("p2year", 'int'));
 
@@ -284,13 +284,13 @@ if (empty($reshook) && $action == 'add')
 
 		$taskid = GETPOST('taskid', 'int');
 		if (!empty($taskid)) {
-		    $taskProject = new Task($db);
-		    if ($taskProject->fetch($taskid) > 0) {
-		        $object->fk_project = $taskProject->fk_project;
-		    }
+			$taskProject = new Task($db);
+			if ($taskProject->fetch($taskid) > 0) {
+				$object->fk_project = $taskProject->fk_project;
+			}
 
-		    $object->fk_element = $taskid;
-		    $object->elementtype = 'task';
+			$object->fk_element = $taskid;
+			$object->elementtype = 'task';
 		}
 
 		$object->datep = $datep;
@@ -390,26 +390,26 @@ if (empty($reshook) && $action == 'add')
 				if ($user->id != $object->userownerid) $moreparam = "filtert=-1"; // We force to remove filter so created record is visible when going back to per user view.
 
 				// Create reminders
-                if ($addreminder == 'on'){
-                    $actionCommReminder = new ActionCommReminder($db);
+				if ($addreminder == 'on') {
+					$actionCommReminder = new ActionCommReminder($db);
 
-                    $dateremind = dol_time_plus_duree($datep, -$offsetvalue, $offsetunit);
+					$dateremind = dol_time_plus_duree($datep, -$offsetvalue, $offsetunit);
 
-                    $actionCommReminder->dateremind = $dateremind;
-                    $actionCommReminder->typeremind = $remindertype;
-                    $actionCommReminder->offsetunit = $offsetunit;
-                    $actionCommReminder->offsetvalue = $offsetvalue;
-                    $actionCommReminder->status = $actionCommReminder::STATUS_TODO;
-                    $actionCommReminder->fk_actioncomm = $object->id;
-                    if ($remindertype == 'email') $actionCommReminder->fk_email_template = $modelmail;
+					$actionCommReminder->dateremind = $dateremind;
+					$actionCommReminder->typeremind = $remindertype;
+					$actionCommReminder->offsetunit = $offsetunit;
+					$actionCommReminder->offsetvalue = $offsetvalue;
+					$actionCommReminder->status = $actionCommReminder::STATUS_TODO;
+					$actionCommReminder->fk_actioncomm = $object->id;
+					if ($remindertype == 'email') $actionCommReminder->fk_email_template = $modelmail;
 
-                    // the notification must be created for every user assigned to the event
+					// the notification must be created for every user assigned to the event
 					foreach ($object->userassigned as $userassigned)
 					{
 						$actionCommReminder->fk_user = $userassigned['id'];
 						$res = $actionCommReminder->create($user);
 
-						if ($res <= 0){
+						if ($res <= 0) {
 							// If error
 							$db->rollback();
 							$langs->load("errors");
@@ -419,13 +419,13 @@ if (empty($reshook) && $action == 'add')
 							break;
 						}
 					}
-                }
+				}
 
-                if ($error) {
-                	$db->rollback();
-                } else {
+				if ($error) {
+					$db->rollback();
+				} else {
 					$db->commit();
-                }
+				}
 
 				if (!empty($backtopage))
 				{
@@ -461,14 +461,14 @@ if (empty($reshook) && $action == 'update')
 {
 	if (empty($cancel))
 	{
-        $fulldayevent = GETPOST('fullday');
-        $aphour = GETPOST('aphour');
-        $apmin = GETPOST('apmin');
-        $p2hour = GETPOST('p2hour');
-        $p2min = GETPOST('p2min');
+		$fulldayevent = GETPOST('fullday');
+		$aphour = GETPOST('aphour');
+		$apmin = GETPOST('apmin');
+		$p2hour = GETPOST('p2hour');
+		$p2min = GETPOST('p2min');
 		$percentage = in_array(GETPOST('status'), array(-1, 100)) ?GETPOST('status') : (in_array(GETPOST('complete'), array(-1, 100)) ?GETPOST('complete') : GETPOST("percentage")); // If status is -1 or 100, percentage is not defined and we must use status
 
-	    // Clean parameters
+		// Clean parameters
 		if ($aphour == -1) $aphour = '0';
 		if ($apmin == -1) $apmin = '0';
 		if ($p2hour == -1) $p2hour = '0';
@@ -488,17 +488,17 @@ if (empty($reshook) && $action == 'update')
 		$object->datef       = $datef;
 		$object->percentage  = $percentage;
 		$object->priority    = GETPOST("priority", "int");
-        $object->fulldayevent = GETPOST("fullday") ? 1 : 0;
-        $object->location    = GETPOST('location', "alphanohtml");
+		$object->fulldayevent = GETPOST("fullday") ? 1 : 0;
+		$object->location    = GETPOST('location', "alphanohtml");
 		$object->socid       = GETPOST("socid", "int");
 		$socpeopleassigned   = GETPOST("socpeopleassigned", 'array');
 		$object->socpeopleassigned = array();
 		foreach ($socpeopleassigned as $cid) $object->socpeopleassigned[$cid] = array('id' => $cid);
-		$object->contact_id   = GETPOST("contactid", 'int');
-        if (empty($object->contact_id) && !empty($object->socpeopleassigned)) {
-            reset($object->socpeopleassigned);
-            $object->contact_id = key($object->socpeopleassigned);
-        }
+		$object->contact_id = GETPOST("contactid", 'int');
+		if (empty($object->contact_id) && !empty($object->socpeopleassigned)) {
+			reset($object->socpeopleassigned);
+			$object->contact_id = key($object->socpeopleassigned);
+		}
 		$object->fk_project  = GETPOST("projectid", 'int');
 		$object->note_private = trim(GETPOST("note", "restricthtml"));
 		$object->fk_element	 = GETPOST("fk_element", "int");
@@ -564,64 +564,64 @@ if (empty($reshook) && $action == 'update')
 		$ret = $extrafields->setOptionalsFromPost(null, $object);
 		if ($ret < 0) $error++;
 
-        if (!$error) {
-            // check if an event resource is already in use
-            if (!empty($conf->global->RESOURCE_USED_IN_EVENT_CHECK) && $object->element == 'action') {
-                $eventDateStart = $object->datep;
-                $eventDateEnd = $object->datef;
+		if (!$error) {
+			// check if an event resource is already in use
+			if (!empty($conf->global->RESOURCE_USED_IN_EVENT_CHECK) && $object->element == 'action') {
+				$eventDateStart = $object->datep;
+				$eventDateEnd = $object->datef;
 
-                $sql  = "SELECT er.rowid, r.ref as r_ref, ac.id as ac_id, ac.label as ac_label";
-                $sql .= " FROM ".MAIN_DB_PREFIX."element_resources as er";
-                $sql .= " INNER JOIN ".MAIN_DB_PREFIX."resource as r ON r.rowid = er.resource_id AND er.resource_type = 'dolresource'";
-                $sql .= " INNER JOIN ".MAIN_DB_PREFIX."actioncomm as ac ON ac.id = er.element_id AND er.element_type = '".$db->escape($object->element)."'";
-                $sql .= " WHERE ac.id != ".$object->id;
-                $sql .= " AND er.resource_id IN (";
-                $sql .= " SELECT resource_id FROM ".MAIN_DB_PREFIX."element_resources";
-                $sql .= " WHERE element_id = ".$object->id;
-                $sql .= " AND element_type = '".$db->escape($object->element)."'";
-                $sql .= " AND busy = 1";
-                $sql .= ")";
-                $sql .= " AND er.busy = 1";
-                $sql .= " AND (";
+				$sql  = "SELECT er.rowid, r.ref as r_ref, ac.id as ac_id, ac.label as ac_label";
+				$sql .= " FROM ".MAIN_DB_PREFIX."element_resources as er";
+				$sql .= " INNER JOIN ".MAIN_DB_PREFIX."resource as r ON r.rowid = er.resource_id AND er.resource_type = 'dolresource'";
+				$sql .= " INNER JOIN ".MAIN_DB_PREFIX."actioncomm as ac ON ac.id = er.element_id AND er.element_type = '".$db->escape($object->element)."'";
+				$sql .= " WHERE ac.id != ".$object->id;
+				$sql .= " AND er.resource_id IN (";
+				$sql .= " SELECT resource_id FROM ".MAIN_DB_PREFIX."element_resources";
+				$sql .= " WHERE element_id = ".$object->id;
+				$sql .= " AND element_type = '".$db->escape($object->element)."'";
+				$sql .= " AND busy = 1";
+				$sql .= ")";
+				$sql .= " AND er.busy = 1";
+				$sql .= " AND (";
 
-                // event date start between ac.datep and ac.datep2 (if datep2 is null we consider there is no end)
-                $sql .= " (ac.datep <= '".$db->idate($eventDateStart)."' AND (ac.datep2 IS NULL OR ac.datep2 >= '".$db->idate($eventDateStart)."'))";
-                // event date end between ac.datep and ac.datep2
-                if (!empty($eventDateEnd)) {
-                    $sql .= " OR (ac.datep <= '".$db->idate($eventDateEnd)."' AND (ac.datep2 >= '".$db->idate($eventDateEnd)."'))";
-                }
-                // event date start before ac.datep and event date end after ac.datep2
-                $sql .= " OR (";
-                $sql .= "ac.datep >= '".$db->idate($eventDateStart)."'";
-                if (!empty($eventDateEnd)) {
-                    $sql .= " AND (ac.datep2 IS NOT NULL AND ac.datep2 <= '".$db->idate($eventDateEnd)."')";
-                }
-                $sql .= ")";
+				// event date start between ac.datep and ac.datep2 (if datep2 is null we consider there is no end)
+				$sql .= " (ac.datep <= '".$db->idate($eventDateStart)."' AND (ac.datep2 IS NULL OR ac.datep2 >= '".$db->idate($eventDateStart)."'))";
+				// event date end between ac.datep and ac.datep2
+				if (!empty($eventDateEnd)) {
+					$sql .= " OR (ac.datep <= '".$db->idate($eventDateEnd)."' AND (ac.datep2 >= '".$db->idate($eventDateEnd)."'))";
+				}
+				// event date start before ac.datep and event date end after ac.datep2
+				$sql .= " OR (";
+				$sql .= "ac.datep >= '".$db->idate($eventDateStart)."'";
+				if (!empty($eventDateEnd)) {
+					$sql .= " AND (ac.datep2 IS NOT NULL AND ac.datep2 <= '".$db->idate($eventDateEnd)."')";
+				}
+				$sql .= ")";
 
-                $sql .= ")";
-                $resql = $db->query($sql);
-                if (!$resql) {
-                    $error++;
-                    $object->error = $db->lasterror();
-                    $object->errors[] = $object->error;
-                } else {
-                    if ($db->num_rows($resql) > 0) {
-                        // already in use
-                        $error++;
-                        $object->error = $langs->trans('ErrorResourcesAlreadyInUse').' : ';
-                        while ($obj = $db->fetch_object($resql)) {
-                            $object->error .= '<br> - '.$langs->trans('ErrorResourceUseInEvent', $obj->r_ref, $obj->ac_label.' ['.$obj->ac_id.']');
-                        }
-                        $object->errors[] = $object->error;
-                    }
-                    $db->free($resql);
-                }
+				$sql .= ")";
+				$resql = $db->query($sql);
+				if (!$resql) {
+					$error++;
+					$object->error = $db->lasterror();
+					$object->errors[] = $object->error;
+				} else {
+					if ($db->num_rows($resql) > 0) {
+						// already in use
+						$error++;
+						$object->error = $langs->trans('ErrorResourcesAlreadyInUse').' : ';
+						while ($obj = $db->fetch_object($resql)) {
+							$object->error .= '<br> - '.$langs->trans('ErrorResourceUseInEvent', $obj->r_ref, $obj->ac_label.' ['.$obj->ac_id.']');
+						}
+						$object->errors[] = $object->error;
+					}
+					$db->free($resql);
+				}
 
-                if ($error) {
-                    setEventMessages($object->error, $object->errors, 'errors');
-                }
-            }
-        }
+				if ($error) {
+					setEventMessages($object->error, $object->errors, 'errors');
+				}
+			}
+		}
 
 		if (!$error)
 		{
@@ -646,7 +646,7 @@ if (empty($reshook) && $action == 'update')
 				}
 
 				//Create reminders
-				if ($addreminder == 'on' && $object->datep > dol_now()){
+				if ($addreminder == 'on' && $object->datep > dol_now()) {
 					$actionCommReminder = new ActionCommReminder($db);
 
 					$dateremind = dol_time_plus_duree($datep, -$offsetvalue, $offsetunit);
@@ -665,7 +665,7 @@ if (empty($reshook) && $action == 'update')
 						$actionCommReminder->fk_user = $userassigned['id'];
 						$res = $actionCommReminder->create($user);
 
-						if ($res <= 0){
+						if ($res <= 0) {
 							// If error
 							$langs->load("errors");
 							$error = $langs->trans('ErrorReminderActionCommCreation');
@@ -689,12 +689,12 @@ if (empty($reshook) && $action == 'update')
 
 	if (!$error)
 	{
-        if (!empty($backtopage))
-        {
-        	unset($_SESSION['assignedtouser']);
-            header("Location: ".$backtopage);
-            exit;
-        }
+		if (!empty($backtopage))
+		{
+			unset($_SESSION['assignedtouser']);
+			header("Location: ".$backtopage);
+			exit;
+		}
 	}
 }
 
@@ -704,9 +704,9 @@ if (empty($reshook) && $action == 'update')
 if (empty($reshook) && $action == 'confirm_delete' && GETPOST("confirm") == 'yes')
 {
 	$object->fetch($id);
-    $object->fetch_optionals();
-    $object->fetch_userassigned();
-    $object->oldcopy = clone $object;
+	$object->fetch_optionals();
+	$object->fetch_userassigned();
+	$object->oldcopy = clone $object;
 
 	if ($user->rights->agenda->myactions->delete
 		|| $user->rights->agenda->allactions->delete)
@@ -729,112 +729,112 @@ if (empty($reshook) && $action == 'confirm_delete' && GETPOST("confirm") == 'yes
  */
 if (empty($reshook) && GETPOST('actionmove', 'alpha') == 'mupdate')
 {
-    $error = 0;
+	$error = 0;
 
-    $shour = dol_print_date($object->datep, "%H");
-    $smin = dol_print_date($object->datep, "%M");
+	$shour = dol_print_date($object->datep, "%H");
+	$smin = dol_print_date($object->datep, "%M");
 
-    $newdate = GETPOST('newdate', 'alpha');
-    if (empty($newdate) || strpos($newdate, 'dayevent_') != 0)
-    {
-        header("Location: ".$backtopage);
-        exit;
-    }
+	$newdate = GETPOST('newdate', 'alpha');
+	if (empty($newdate) || strpos($newdate, 'dayevent_') != 0)
+	{
+		header("Location: ".$backtopage);
+		exit;
+	}
 
-    $datep = dol_mktime($shour, $smin, 0, substr($newdate, 13, 2), substr($newdate, 15, 2), substr($newdate, 9, 4));
-    if ($datep != $object->datep)
-    {
-        if (!empty($object->datef))
-        {
-            $object->datef += $datep - $object->datep;
-        }
-        $object->datep = $datep;
+	$datep = dol_mktime($shour, $smin, 0, substr($newdate, 13, 2), substr($newdate, 15, 2), substr($newdate, 9, 4));
+	if ($datep != $object->datep)
+	{
+		if (!empty($object->datef))
+		{
+			$object->datef += $datep - $object->datep;
+		}
+		$object->datep = $datep;
 
-        if (!$error) {
-            // check if an event resource is already in use
-            if (!empty($conf->global->RESOURCE_USED_IN_EVENT_CHECK) && $object->element == 'action') {
-                $eventDateStart = $object->datep;
-                $eventDateEnd = $object->datef;
+		if (!$error) {
+			// check if an event resource is already in use
+			if (!empty($conf->global->RESOURCE_USED_IN_EVENT_CHECK) && $object->element == 'action') {
+				$eventDateStart = $object->datep;
+				$eventDateEnd = $object->datef;
 
-                $sql  = "SELECT er.rowid, r.ref as r_ref, ac.id as ac_id, ac.label as ac_label";
-                $sql .= " FROM ".MAIN_DB_PREFIX."element_resources as er";
-                $sql .= " INNER JOIN ".MAIN_DB_PREFIX."resource as r ON r.rowid = er.resource_id AND er.resource_type = 'dolresource'";
-                $sql .= " INNER JOIN ".MAIN_DB_PREFIX."actioncomm as ac ON ac.id = er.element_id AND er.element_type = '".$db->escape($object->element)."'";
-                $sql .= " WHERE ac.id != ".$object->id;
-                $sql .= " AND er.resource_id IN (";
-                $sql .= " SELECT resource_id FROM ".MAIN_DB_PREFIX."element_resources";
-                $sql .= " WHERE element_id = ".$object->id;
-                $sql .= " AND element_type = '".$db->escape($object->element)."'";
-                $sql .= " AND busy = 1";
-                $sql .= ")";
-                $sql .= " AND er.busy = 1";
-                $sql .= " AND (";
+				$sql  = "SELECT er.rowid, r.ref as r_ref, ac.id as ac_id, ac.label as ac_label";
+				$sql .= " FROM ".MAIN_DB_PREFIX."element_resources as er";
+				$sql .= " INNER JOIN ".MAIN_DB_PREFIX."resource as r ON r.rowid = er.resource_id AND er.resource_type = 'dolresource'";
+				$sql .= " INNER JOIN ".MAIN_DB_PREFIX."actioncomm as ac ON ac.id = er.element_id AND er.element_type = '".$db->escape($object->element)."'";
+				$sql .= " WHERE ac.id != ".$object->id;
+				$sql .= " AND er.resource_id IN (";
+				$sql .= " SELECT resource_id FROM ".MAIN_DB_PREFIX."element_resources";
+				$sql .= " WHERE element_id = ".$object->id;
+				$sql .= " AND element_type = '".$db->escape($object->element)."'";
+				$sql .= " AND busy = 1";
+				$sql .= ")";
+				$sql .= " AND er.busy = 1";
+				$sql .= " AND (";
 
-                // event date start between ac.datep and ac.datep2 (if datep2 is null we consider there is no end)
-                $sql .= " (ac.datep <= '".$db->idate($eventDateStart)."' AND (ac.datep2 IS NULL OR ac.datep2 >= '".$db->idate($eventDateStart)."'))";
-                // event date end between ac.datep and ac.datep2
-                if (!empty($eventDateEnd)) {
-                    $sql .= " OR (ac.datep <= '".$db->idate($eventDateEnd)."' AND (ac.datep2 >= '".$db->idate($eventDateEnd)."'))";
-                }
-                // event date start before ac.datep and event date end after ac.datep2
-                $sql .= " OR (";
-                $sql .= "ac.datep >= '".$db->idate($eventDateStart)."'";
-                if (!empty($eventDateEnd)) {
-                    $sql .= " AND (ac.datep2 IS NOT NULL AND ac.datep2 <= '".$db->idate($eventDateEnd)."')";
-                }
-                $sql .= ")";
+				// event date start between ac.datep and ac.datep2 (if datep2 is null we consider there is no end)
+				$sql .= " (ac.datep <= '".$db->idate($eventDateStart)."' AND (ac.datep2 IS NULL OR ac.datep2 >= '".$db->idate($eventDateStart)."'))";
+				// event date end between ac.datep and ac.datep2
+				if (!empty($eventDateEnd)) {
+					$sql .= " OR (ac.datep <= '".$db->idate($eventDateEnd)."' AND (ac.datep2 >= '".$db->idate($eventDateEnd)."'))";
+				}
+				// event date start before ac.datep and event date end after ac.datep2
+				$sql .= " OR (";
+				$sql .= "ac.datep >= '".$db->idate($eventDateStart)."'";
+				if (!empty($eventDateEnd)) {
+					$sql .= " AND (ac.datep2 IS NOT NULL AND ac.datep2 <= '".$db->idate($eventDateEnd)."')";
+				}
+				$sql .= ")";
 
-                $sql .= ")";
-                $resql = $db->query($sql);
-                if (!$resql) {
-                    $error++;
-                    $object->error = $db->lasterror();
-                    $object->errors[] = $object->error;
-                } else {
-                    if ($db->num_rows($resql) > 0) {
-                        // already in use
-                        $error++;
-                        $object->error = $langs->trans('ErrorResourcesAlreadyInUse').' : ';
-                        while ($obj = $db->fetch_object($resql)) {
-                            $object->error .= '<br> - '.$langs->trans('ErrorResourceUseInEvent', $obj->r_ref, $obj->ac_label.' ['.$obj->ac_id.']');
-                        }
-                        $object->errors[] = $object->error;
-                    }
-                    $db->free($resql);
-                }
+				$sql .= ")";
+				$resql = $db->query($sql);
+				if (!$resql) {
+					$error++;
+					$object->error = $db->lasterror();
+					$object->errors[] = $object->error;
+				} else {
+					if ($db->num_rows($resql) > 0) {
+						// already in use
+						$error++;
+						$object->error = $langs->trans('ErrorResourcesAlreadyInUse').' : ';
+						while ($obj = $db->fetch_object($resql)) {
+							$object->error .= '<br> - '.$langs->trans('ErrorResourceUseInEvent', $obj->r_ref, $obj->ac_label.' ['.$obj->ac_id.']');
+						}
+						$object->errors[] = $object->error;
+					}
+					$db->free($resql);
+				}
 
-                if ($error) {
-                    setEventMessages($object->error, $object->errors, 'errors');
-                }
-            }
-        }
+				if ($error) {
+					setEventMessages($object->error, $object->errors, 'errors');
+				}
+			}
+		}
 
-        if (!$error) {
-            $db->begin();
-            $result = $object->update($user);
-            if ($result < 0) {
-                $error++;
-                setEventMessages($object->error, $object->errors, 'errors');
-                $db->rollback();
-            } else {
-                $db->commit();
-            }
-        }
-    }
-    if (!empty($backtopage))
-    {
-        header("Location: ".$backtopage);
-        exit;
-    } else {
-        $action = '';
-    }
+		if (!$error) {
+			$db->begin();
+			$result = $object->update($user);
+			if ($result < 0) {
+				$error++;
+				setEventMessages($object->error, $object->errors, 'errors');
+				$db->rollback();
+			} else {
+				$db->commit();
+			}
+		}
+	}
+	if (!empty($backtopage))
+	{
+		header("Location: ".$backtopage);
+		exit;
+	} else {
+		$action = '';
+	}
 }
 
 // Actions to delete doc
 $upload_dir = $conf->agenda->dir_output.'/'.dol_sanitizeFileName($object->ref);
 $permissiontoadd = ($user->rights->agenda->allactions->create || (($object->authorid == $user->id || $object->userownerid == $user->id) && $user->rights->agenda->myactions->read));
 if (empty($reshook)) {
-    include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
+	include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
 }
 
 
@@ -869,10 +869,10 @@ if ($action == 'create')
 
 	dol_set_focus("#label");
 
-    if (!empty($conf->use_javascript_ajax))
-    {
-        print "\n".'<script type="text/javascript">';
-        print '$(document).ready(function () {
+	if (!empty($conf->use_javascript_ajax))
+	{
+		print "\n".'<script type="text/javascript">';
+		print '$(document).ready(function () {
         			function setdatefields()
 	            	{
 	            		if ($("#fullday:checked").val() == null) {
@@ -922,8 +922,8 @@ if ($action == 'create')
                     else $("#dateend").removeClass("fieldrequired");
                     setdatefields();
                })';
-        print '</script>'."\n";
-    }
+		print '</script>'."\n";
+	}
 
 	print '<form name="formaction" action="'.$_SERVER['PHP_SELF'].'" method="POST">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -951,39 +951,39 @@ if ($action == 'create')
 	// Title
 	print '<tr><td'.(empty($conf->global->AGENDA_USE_EVENT_TYPE) ? ' class="fieldrequired titlefieldcreate"' : '').'>'.$langs->trans("Label").'</td><td><input type="text" id="label" name="label" class="soixantepercent" value="'.GETPOST('label').'"></td></tr>';
 
-    // Full day
-    print '<tr><td>'.$langs->trans("EventOnFullDay").'</td><td><input type="checkbox" id="fullday" name="fullday" '.(GETPOST('fullday') ? ' checked' : '').'></td></tr>';
+	// Full day
+	print '<tr><td>'.$langs->trans("EventOnFullDay").'</td><td><input type="checkbox" id="fullday" name="fullday" '.(GETPOST('fullday') ? ' checked' : '').'></td></tr>';
 
-    $datep = ($datep ? $datep : $object->datep);
-    if (GETPOST('datep', 'int', 1)) $datep = dol_stringtotime(GETPOST('datep', 'int', 1), 0);
-    $datef = ($datef ? $datef : $object->datef);
-    if (GETPOST('datef', 'int', 1)) $datef = dol_stringtotime(GETPOST('datef', 'int', 1), 0);
-    if (empty($datef) && !empty($datep))
-    {
-    	if (GETPOST("actioncode", 'aZ09') == 'AC_RDV' || empty($conf->global->AGENDA_USE_EVENT_TYPE_DEFAULT)) {
-    		$datef = dol_time_plus_duree($datep, (empty($conf->global->AGENDA_AUTOSET_END_DATE_WITH_DELTA_HOURS) ? 1 : $conf->global->AGENDA_AUTOSET_END_DATE_WITH_DELTA_HOURS), 'h');
-    	}
-    }
+	$datep = ($datep ? $datep : $object->datep);
+	if (GETPOST('datep', 'int', 1)) $datep = dol_stringtotime(GETPOST('datep', 'int', 1), 0);
+	$datef = ($datef ? $datef : $object->datef);
+	if (GETPOST('datef', 'int', 1)) $datef = dol_stringtotime(GETPOST('datef', 'int', 1), 0);
+	if (empty($datef) && !empty($datep))
+	{
+		if (GETPOST("actioncode", 'aZ09') == 'AC_RDV' || empty($conf->global->AGENDA_USE_EVENT_TYPE_DEFAULT)) {
+			$datef = dol_time_plus_duree($datep, (empty($conf->global->AGENDA_AUTOSET_END_DATE_WITH_DELTA_HOURS) ? 1 : $conf->global->AGENDA_AUTOSET_END_DATE_WITH_DELTA_HOURS), 'h');
+		}
+	}
 
-    // Date start
+	// Date start
 	print '<tr><td class="nowrap">';
 	print '<span class="fieldrequired">'.$langs->trans("DateActionStart").'</span>';
 	print ' - ';
 	print '<span id="dateend"'.(GETPOST("actioncode", 'aZ09') == 'AC_RDV' ? ' class="fieldrequired"' : '').'>'.$langs->trans("DateActionEnd").'</span>';
 	print '</td><td>';
 	if (GETPOST("afaire") == 1) {
-        print $form->selectDate($datep, 'ap', 1, 1, 0, "action", 1, 2, 0, 'fulldaystart');	// Empty value not allowed for start date and hours if "todo"
-    } else {
-        print $form->selectDate($datep, 'ap', 1, 1, 1, "action", 1, 2, 0, 'fulldaystart');
-    }
-    print ' <span class="hideonsmartphone">&nbsp; &nbsp; - &nbsp; &nbsp;</span> ';
+		print $form->selectDate($datep, 'ap', 1, 1, 0, "action", 1, 2, 0, 'fulldaystart'); // Empty value not allowed for start date and hours if "todo"
+	} else {
+		print $form->selectDate($datep, 'ap', 1, 1, 1, "action", 1, 2, 0, 'fulldaystart');
+	}
+	print ' <span class="hideonsmartphone">&nbsp; &nbsp; - &nbsp; &nbsp;</span> ';
 	//print ' - ';
-    if (GETPOST("afaire") == 1) {
-    	print $form->selectDate($datef, 'p2', 1, 1, 1, "action", 1, 0, 0, 'fulldayend');
-    } else {
-    	print $form->selectDate($datef, 'p2', 1, 1, 1, "action", 1, 0, 0, 'fulldayend');
-    }
-    print '</td></tr>';
+	if (GETPOST("afaire") == 1) {
+		print $form->selectDate($datef, 'p2', 1, 1, 1, "action", 1, 0, 0, 'fulldayend');
+	} else {
+		print $form->selectDate($datef, 'p2', 1, 1, 1, "action", 1, 0, 0, 'fulldayend');
+	}
+	print '</td></tr>';
 
 	// Date end
 	/*print '<tr><td>';
@@ -997,7 +997,7 @@ if ($action == 'create')
     }
 	print '</td></tr>';*/
 
-    // Dev in progress
+	// Dev in progress
 	$userepeatevent = ($conf->global->MAIN_FEATURES_LEVEL == 2 ? 1 : 0);
 	if ($userepeatevent)
 	{
@@ -1061,11 +1061,11 @@ if ($action == 'create')
 	$formactions->form_select_status_action('formaction', $percent, 1, 'complete', 0, 0, 'maxwidth200');
 	print '</td></tr>';
 
-    // Location
-    if (empty($conf->global->AGENDA_DISABLE_LOCATION))
-    {
+	// Location
+	if (empty($conf->global->AGENDA_DISABLE_LOCATION))
+	{
 		print '<tr><td>'.$langs->trans("Location").'</td><td><input type="text" name="location" class="minwidth300 maxwidth150onsmartphone" value="'.(GETPOST('location') ? GETPOST('location') : $object->location).'"></td></tr>';
-    }
+	}
 
 	// Assigned to
 	print '<tr><td class="tdtop nowrap">'.$langs->trans("ActionAffectedTo").'</td><td>';
@@ -1206,24 +1206,24 @@ if ($action == 'create')
 	}
 
 	// Priority
-	if (! empty($conf->global->AGENDA_SUPPORT_PRIORITY_IN_EVENTS)) {
+	if (!empty($conf->global->AGENDA_SUPPORT_PRIORITY_IN_EVENTS)) {
 		print '<tr><td class="titlefieldcreate nowrap">'.$langs->trans("Priority").'</td><td colspan="3">';
 		print '<input type="text" name="priority" value="'.(GETPOSTISSET('priority') ? GETPOST('priority', 'int') : ($object->priority ? $object->priority : '')).'" size="5">';
 		print '</td></tr>';
 	}
 
-    // Description
-    print '<tr><td class="tdtop">'.$langs->trans("Description").'</td><td>';
-    require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-    $doleditor = new DolEditor('note', (GETPOSTISSET('note') ? GETPOST('note', 'restricthtml') : $object->note_private), '', 120, 'dolibarr_notes', 'In', true, true, $conf->fckeditor->enabled, ROWS_4, '90%');
-    $doleditor->Create();
-    print '</td></tr>';
+	// Description
+	print '<tr><td class="tdtop">'.$langs->trans("Description").'</td><td>';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+	$doleditor = new DolEditor('note', (GETPOSTISSET('note') ? GETPOST('note', 'restricthtml') : $object->note_private), '', 120, 'dolibarr_notes', 'In', true, true, $conf->fckeditor->enabled, ROWS_4, '90%');
+	$doleditor->Create();
+	print '</td></tr>';
 
-    // Other attributes
-    $parameters = array();
-    $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-    print $hookmanager->resPrint;
-    if (empty($reshook))
+	// Other attributes
+	$parameters = array();
+	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+	print $hookmanager->resPrint;
+	if (empty($reshook))
 	{
 		print $object->showOptionals($extrafields, 'edit', $parameters);
 	}
@@ -1231,46 +1231,46 @@ if ($action == 'create')
 	print '</table>';
 
 
-    if ($conf->global->AGENDA_REMINDER_EMAIL || $conf->global->AGENDA_REMINDER_BROWSER)
-    {
-        //checkbox create reminder
-        print '<hr>';
-    	print '<br>';
-        print '<label for="addreminder">'.$langs->trans("AddReminder").'</label> <input type="checkbox" id="addreminder" name="addreminder"><br><br>';
+	if ($conf->global->AGENDA_REMINDER_EMAIL || $conf->global->AGENDA_REMINDER_BROWSER)
+	{
+		//checkbox create reminder
+		print '<hr>';
+		print '<br>';
+		print '<label for="addreminder">'.$langs->trans("AddReminder").'</label> <input type="checkbox" id="addreminder" name="addreminder"><br><br>';
 
-        print '<div class="reminderparameters" style="display: none;">';
+		print '<div class="reminderparameters" style="display: none;">';
 
-        //print '<hr>';
-        //print load_fiche_titre($langs->trans("AddReminder"), '', '');
+		//print '<hr>';
+		//print load_fiche_titre($langs->trans("AddReminder"), '', '');
 
-        print '<table class="border centpercent">';
+		print '<table class="border centpercent">';
 
-        //Reminder
-        print '<tr><td class="titlefieldcreate nowrap">'.$langs->trans("ReminderTime").'</td><td colspan="3">';
-        print '<input type="number" name="offsetvalue" value="10" size="5">';
-        print '</td></tr>';
+		//Reminder
+		print '<tr><td class="titlefieldcreate nowrap">'.$langs->trans("ReminderTime").'</td><td colspan="3">';
+		print '<input type="number" name="offsetvalue" value="10" size="5">';
+		print '</td></tr>';
 
-        //Time Type
-        print '<tr><td class="titlefieldcreate nowrap">'.$langs->trans("TimeType").'</td><td colspan="3">';
-        print $form->selectTypeDuration('offsetunit', 'i');
-        print '</td></tr>';
+		//Time Type
+		print '<tr><td class="titlefieldcreate nowrap">'.$langs->trans("TimeType").'</td><td colspan="3">';
+		print $form->selectTypeDuration('offsetunit', 'i');
+		print '</td></tr>';
 
-        //Reminder Type
-        print '<tr><td class="titlefieldcreate nowrap">'.$langs->trans("ReminderType").'</td><td colspan="3">';
-        print $form->selectarray('selectremindertype', $TRemindTypes);
-        print '</td></tr>';
+		//Reminder Type
+		print '<tr><td class="titlefieldcreate nowrap">'.$langs->trans("ReminderType").'</td><td colspan="3">';
+		print $form->selectarray('selectremindertype', $TRemindTypes);
+		print '</td></tr>';
 
-        //Mail Model
-        print '<tr><td class="titlefieldcreate nowrap">'.$langs->trans("EMailTemplates").'</td><td colspan="3">';
-        print $form->selectModelMail('actioncommsend', 'actioncomm_send', 1);
-        print '</td></tr>';
+		//Mail Model
+		print '<tr><td class="titlefieldcreate nowrap">'.$langs->trans("EMailTemplates").'</td><td colspan="3">';
+		print $form->selectModelMail('actioncommsend', 'actioncomm_send', 1);
+		print '</td></tr>';
 
 
-        print '</table>';
-        print '</div>';
+		print '</table>';
+		print '</div>';
 
-        print "\n".'<script type="text/javascript">';
-        print '$(document).ready(function () {
+		print "\n".'<script type="text/javascript">';
+		print '$(document).ready(function () {
 	            		$("#addreminder").click(function(){
 	            		    if (this.checked) {
 	            		      $(".reminderparameters").show();
@@ -1288,10 +1288,10 @@ if ($action == 'create')
 	            		    };
 	            		});
                    })';
-        print '</script>'."\n";
-    }
+		print '</script>'."\n";
+	}
 
-    dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div class="center">';
 	print '<input type="submit" class="button" name="save" value="'.$langs->trans("Add").'">';
@@ -1327,7 +1327,7 @@ if ($id > 0)
 
 	if ($listUserAssignedUpdated || $donotclearsession)
 	{
-        $percentage = in_array(GETPOST('status'), array(-1, 100)) ?GETPOST('status') : (in_array(GETPOST('complete'), array(-1, 100)) ?GETPOST('complete') : GETPOST("percentage")); // If status is -1 or 100, percentage is not defined and we must use status
+		$percentage = in_array(GETPOST('status'), array(-1, 100)) ?GETPOST('status') : (in_array(GETPOST('complete'), array(-1, 100)) ?GETPOST('complete') : GETPOST("percentage")); // If status is -1 or 100, percentage is not defined and we must use status
 
 		$datep = dol_mktime($fulldayevent ? '00' : $aphour, $fulldayevent ? '00' : $apmin, 0, $_POST["apmonth"], $_POST["apday"], $_POST["apyear"]);
 		$datef = dol_mktime($fulldayevent ? '23' : $p2hour, $fulldayevent ? '59' : $p2min, $fulldayevent ? '59' : '0', $_POST["p2month"], $_POST["p2day"], $_POST["p2year"]);
@@ -1338,7 +1338,7 @@ if ($id > 0)
 		$object->datef       = $datef;
 		$object->percentage  = $percentage;
 		$object->priority    = GETPOST("priority", "alphanohtml");
-        $object->fulldayevent = GETPOST("fullday") ? 1 : 0;
+		$object->fulldayevent = GETPOST("fullday") ? 1 : 0;
 		$object->location    = GETPOST('location', "alpanohtml");
 		$object->socid       = GETPOST("socid", "int");
 		$socpeopleassigned   = GETPOST("socpeopleassigned", 'array');
@@ -1376,10 +1376,10 @@ if ($id > 0)
 
 	if ($action == 'edit')
 	{
-	    if (!empty($conf->use_javascript_ajax))
-        {
-            print "\n".'<script type="text/javascript">';
-            print '$(document).ready(function () {
+		if (!empty($conf->use_javascript_ajax))
+		{
+			print "\n".'<script type="text/javascript">';
+			print '$(document).ready(function () {
 	            		function setdatefields()
 	            		{
 	            			if ($("#fullday:checked").val() == null) {
@@ -1399,8 +1399,8 @@ if ($id > 0)
 	            			setdatefields();
 	            		});
                    })';
-            print '</script>'."\n";
-        }
+			print '</script>'."\n";
+		}
 
 		print '<form name="formaction" action="'.$_SERVER['PHP_SELF'].'" method="POST">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -1420,42 +1420,42 @@ if ($id > 0)
 		// Type of event
 		if (!empty($conf->global->AGENDA_USE_EVENT_TYPE))
 		{
-		    print '<tr><td class="fieldrequired">'.$langs->trans("Type").'</td><td colspan="3">';
-		    if ($object->type_code != 'AC_OTH_AUTO')
-		    {
-		    	$formactions->select_type_actions(GETPOST("actioncode", 'aZ09') ?GETPOST("actioncode", 'aZ09') : $object->type_code, "actioncode", "systemauto");
-		    } else {
-                print '<input type="hidden" name="actioncode" value="'.$object->type_code.'">'.$langs->trans("Action".$object->type_code);
-		    }
+			print '<tr><td class="fieldrequired">'.$langs->trans("Type").'</td><td colspan="3">';
+			if ($object->type_code != 'AC_OTH_AUTO')
+			{
+				$formactions->select_type_actions(GETPOST("actioncode", 'aZ09') ?GETPOST("actioncode", 'aZ09') : $object->type_code, "actioncode", "systemauto");
+			} else {
+				print '<input type="hidden" name="actioncode" value="'.$object->type_code.'">'.$langs->trans("Action".$object->type_code);
+			}
 			print '</td></tr>';
 		}
 
 		// Title
 		print '<tr><td class="fieldrequired">'.$langs->trans("Title").'</td><td colspan="3"><input type="text" name="label" class="soixantepercent" value="'.$object->label.'"></td></tr>';
 
-        // Full day event
-        print '<tr><td>'.$langs->trans("EventOnFullDay").'</td><td colspan="3"><input type="checkbox" id="fullday" name="fullday" '.($object->fulldayevent ? ' checked' : '').'></td></tr>';
+		// Full day event
+		print '<tr><td>'.$langs->trans("EventOnFullDay").'</td><td colspan="3"><input type="checkbox" id="fullday" name="fullday" '.($object->fulldayevent ? ' checked' : '').'></td></tr>';
 
 		// Date start
 		print '<tr><td class="nowrap"><span class="fieldrequired">'.$langs->trans("DateActionStart").' - '.$langs->trans("DateActionEnd").'</span></td><td colspan="3">';
 		if (GETPOST("afaire") == 1) {
-            print $form->selectDate($datep ? $datep : $object->datep, 'ap', 1, 1, 0, "action", 1, 1, 0, 'fulldaystart');
-        } elseif (GETPOST("afaire") == 2) {
-            print $form->selectDate($datep ? $datep : $object->datep, 'ap', 1, 1, 1, "action", 1, 1, 0, 'fulldaystart');
-        } else {
-            print $form->selectDate($datep ? $datep : $object->datep, 'ap', 1, 1, 1, "action", 1, 1, 0, 'fulldaystart');
-        }
-        print ' - ';
+			print $form->selectDate($datep ? $datep : $object->datep, 'ap', 1, 1, 0, "action", 1, 1, 0, 'fulldaystart');
+		} elseif (GETPOST("afaire") == 2) {
+			print $form->selectDate($datep ? $datep : $object->datep, 'ap', 1, 1, 1, "action", 1, 1, 0, 'fulldaystart');
+		} else {
+			print $form->selectDate($datep ? $datep : $object->datep, 'ap', 1, 1, 1, "action", 1, 1, 0, 'fulldaystart');
+		}
+		print ' - ';
 		if (GETPOST("afaire") == 1) {
-            print $form->selectDate($datef ? $datef : $object->datef, 'p2', 1, 1, 1, "action", 1, 1, 0, 'fulldayend');
-        } elseif (GETPOST("afaire") == 2) {
-            print $form->selectDate($datef ? $datef : $object->datef, 'p2', 1, 1, 1, "action", 1, 1, 0, 'fulldayend');
-        } else {
-            print $form->selectDate($datef ? $datef : $object->datef, 'p2', 1, 1, 1, "action", 1, 1, 0, 'fulldayend');
-        }
+			print $form->selectDate($datef ? $datef : $object->datef, 'p2', 1, 1, 1, "action", 1, 1, 0, 'fulldayend');
+		} elseif (GETPOST("afaire") == 2) {
+			print $form->selectDate($datef ? $datef : $object->datef, 'p2', 1, 1, 1, "action", 1, 1, 0, 'fulldayend');
+		} else {
+			print $form->selectDate($datef ? $datef : $object->datef, 'p2', 1, 1, 1, "action", 1, 1, 0, 'fulldayend');
+		}
 		print '</td></tr>';
 
-        // Dev in progress
+		// Dev in progress
 		$userepeatevent = ($conf->global->MAIN_FEATURES_LEVEL == 2 ? 1 : 0);
 		if ($userepeatevent)
 		{
@@ -1512,50 +1512,50 @@ if ($id > 0)
 		$formactions->form_select_status_action('formaction', $percent, 1, 'complete', 0, 0, 'maxwidth200');
 		print '</td></tr>';
 
-        // Location
-	    if (empty($conf->global->AGENDA_DISABLE_LOCATION))
-	    {
+		// Location
+		if (empty($conf->global->AGENDA_DISABLE_LOCATION))
+		{
 			print '<tr><td>'.$langs->trans("Location").'</td><td colspan="3"><input type="text" name="location" class="soixantepercent" value="'.$object->location.'"></td></tr>';
-	    }
+		}
 
 		// Assigned to
-	    $listofuserid = array(); // User assigned
-	    if (empty($donotclearsession))
-	    {
-	    	if ($object->userownerid > 0)
-	    	{
-	    		$listofuserid[$object->userownerid] = array(
-	    			'id'=>$object->userownerid,
-	    			'type'=>'user',
-	    			//'transparency'=>$object->userassigned[$user->id]['transparency'],
-	    			'transparency'=>$object->transparency, // Force transparency on ownerfrom event
-	    			'answer_status'=>$object->userassigned[$object->userownerid]['answer_status'],
-	    			'mandatory'=>$object->userassigned[$object->userownerid]['mandatory']
-	    		);
-	    	}
-	    	if (!empty($object->userassigned))	// Now concat assigned users
-	    	{
-	    		// Restore array with key with same value than param 'id'
-	    		$tmplist1 = $object->userassigned;
-	    		foreach ($tmplist1 as $key => $val)
-	    		{
-	    			if ($val['id'] && $val['id'] != $object->userownerid)
-	    			{
-	    				$listofuserid[$val['id']] = $val;
-	    			}
-	    		}
-	    	}
-	    	$_SESSION['assignedtouser'] = json_encode($listofuserid);
-	    } else {
-	    	if (!empty($_SESSION['assignedtouser']))
-	    	{
-	    		$listofuserid = json_decode($_SESSION['assignedtouser'], true);
-	    	}
-	    }
-	    $listofcontactid = $object->socpeopleassigned; // Contact assigned
-	    $listofotherid = $object->otherassigned; // Other undefined email (not used yet)
+		$listofuserid = array(); // User assigned
+		if (empty($donotclearsession))
+		{
+			if ($object->userownerid > 0)
+			{
+				$listofuserid[$object->userownerid] = array(
+					'id'=>$object->userownerid,
+					'type'=>'user',
+					//'transparency'=>$object->userassigned[$user->id]['transparency'],
+					'transparency'=>$object->transparency, // Force transparency on ownerfrom event
+					'answer_status'=>$object->userassigned[$object->userownerid]['answer_status'],
+					'mandatory'=>$object->userassigned[$object->userownerid]['mandatory']
+				);
+			}
+			if (!empty($object->userassigned))	// Now concat assigned users
+			{
+				// Restore array with key with same value than param 'id'
+				$tmplist1 = $object->userassigned;
+				foreach ($tmplist1 as $key => $val)
+				{
+					if ($val['id'] && $val['id'] != $object->userownerid)
+					{
+						$listofuserid[$val['id']] = $val;
+					}
+				}
+			}
+			$_SESSION['assignedtouser'] = json_encode($listofuserid);
+		} else {
+			if (!empty($_SESSION['assignedtouser']))
+			{
+				$listofuserid = json_decode($_SESSION['assignedtouser'], true);
+			}
+		}
+		$listofcontactid = $object->socpeopleassigned; // Contact assigned
+		$listofotherid = $object->otherassigned; // Other undefined email (not used yet)
 
-	    print '<tr><td class="tdtop nowrap fieldrequired">'.$langs->trans("ActionAssignedTo").'</td><td colspan="3">';
+		print '<tr><td class="tdtop nowrap fieldrequired">'.$langs->trans("ActionAssignedTo").'</td><td colspan="3">';
 		print '<div class="assignedtouser">';
 		print $form->select_dolusers_forevent(($action == 'create' ? 'add' : 'update'), 'assignedtouser', 1, '', 0, '', '', 0, 0, 0, 'AND u.statut != 0', 1, $listofuserid, $listofcontactid, $listofotherid);
 		print '</div>';
@@ -1575,7 +1575,7 @@ if ($id > 0)
 			print '</td></tr>';
 		}
 		// Tags-Categories
-        if ($conf->categorie->enabled) {
+		if ($conf->categorie->enabled) {
 			print '<tr><td>'.$langs->trans("Categories").'</td><td colspan="3">';
 			$cate_arbo = $form->select_all_categories(Categorie::TYPE_ACTIONCOMM, '', 'parent', 64, 0, 1);
 			$c = new Categorie($db);
@@ -1635,7 +1635,7 @@ if ($id > 0)
 		}
 
 		// Priority
-		if (! empty($conf->global->AGENDA_SUPPORT_PRIORITY_IN_EVENTS)) {
+		if (!empty($conf->global->AGENDA_SUPPORT_PRIORITY_IN_EVENTS)) {
 			print '<tr><td class="titlefieldcreate nowrap">'.$langs->trans("Priority").'</td><td>';
 			print '<input type="text" name="priority" value="'.($object->priority ? $object->priority : '').'" size="5">';
 			print '</td></tr>';
@@ -1645,19 +1645,19 @@ if ($id > 0)
 		if (!empty($object->fk_element) && !empty($object->elementtype))
 		{
 			include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-            print '<tr>';
+			print '<tr>';
 			print '<td>'.$langs->trans("LinkedObject").'</td>';
 
 			if ($object->elementtype == 'task' && !empty($conf->projet->enabled))
 			{
-			    print '<td id="project-task-input-container" >';
+				print '<td id="project-task-input-container" >';
 
 				$urloption = '?action=create&donotclearsession=1'; // we use create not edit for more flexibility
-			    $url = DOL_URL_ROOT.'/comm/action/card.php'.$urloption;
+				$url = DOL_URL_ROOT.'/comm/action/card.php'.$urloption;
 
-			    // update task list
-			    print "\n".'<script type="text/javascript" >';
-			    print '$(document).ready(function () {
+				// update task list
+				print "\n".'<script type="text/javascript" >';
+				print '$(document).ready(function () {
 	               $("#projectid").change(function () {
                         var url = "'.$url.'&projectid="+$("#projectid").val();
                         $.get(url, function(data) {
@@ -1666,36 +1666,36 @@ if ($id > 0)
                         })
                   });
                })';
-			    print '</script>'."\n";
+				print '</script>'."\n";
 
-			    $formproject->selectTasks((!empty($societe->id) ? $societe->id : -1), $object->fk_element, 'fk_element', 24, 0, 0, 1, 0, 0, 'maxwidth500', $object->fk_project);
-			    print '<input type="hidden" name="elementtype" value="'.$object->elementtype.'">';
+				$formproject->selectTasks((!empty($societe->id) ? $societe->id : -1), $object->fk_element, 'fk_element', 24, 0, 0, 1, 0, 0, 'maxwidth500', $object->fk_project);
+				print '<input type="hidden" name="elementtype" value="'.$object->elementtype.'">';
 
-			    print '</td>';
+				print '</td>';
 			} else {
-			    print '<td>';
-			    print dolGetElementUrl($object->fk_element, $object->elementtype, 1);
-			    print '<input type="hidden" name="fk_element" value="'.$object->fk_element.'">';
-			    print '<input type="hidden" name="elementtype" value="'.$object->elementtype.'">';
-			    print '</td>';
+				print '<td>';
+				print dolGetElementUrl($object->fk_element, $object->elementtype, 1);
+				print '<input type="hidden" name="fk_element" value="'.$object->fk_element.'">';
+				print '<input type="hidden" name="elementtype" value="'.$object->elementtype.'">';
+				print '</td>';
 			}
 
 			print '</tr>';
 		}
 
-        // Description
-        print '<tr><td class="tdtop">'.$langs->trans("Description").'</td><td>';
-        // Editeur wysiwyg
-        require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-        $doleditor = new DolEditor('note', $object->note_private, '', 200, 'dolibarr_notes', 'In', true, true, $conf->fckeditor->enabled, ROWS_5, '90%');
-        $doleditor->Create();
-        print '</td></tr>';
+		// Description
+		print '<tr><td class="tdtop">'.$langs->trans("Description").'</td><td>';
+		// Editeur wysiwyg
+		require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+		$doleditor = new DolEditor('note', $object->note_private, '', 200, 'dolibarr_notes', 'In', true, true, $conf->fckeditor->enabled, ROWS_5, '90%');
+		$doleditor->Create();
+		print '</td></tr>';
 
-        // Other attributes
-        $parameters = array();
-        $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-        print $hookmanager->resPrint;
-        if (empty($reshook))
+		// Other attributes
+		$parameters = array();
+		$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+		print $hookmanager->resPrint;
+		if (empty($reshook))
 		{
 			print $object->showOptionals($extrafields, 'edit', $parameters);
 		}
@@ -1782,7 +1782,7 @@ if ($id > 0)
 			print '</script>'."\n";
 		}
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 		print '<div class="center">';
 		print '<input type="submit" class="button" name="edit" value="'.$langs->trans("Save").'">';
@@ -1832,46 +1832,46 @@ if ($id > 0)
 		// Project
 		if (!empty($conf->projet->enabled))
 		{
-		    $langs->load("projects");
-		    //$morehtmlref.='<br>'.$langs->trans('Project') . ' ';
-		    $morehtmlref .= $langs->trans('Project').' ';
-    		if ($user->rights->agenda->allactions->create ||
-	       	    (($object->authorid == $user->id || $object->userownerid == $user->id) && $user->rights->agenda->myactions->create))
-		    {
-		        if ($action != 'classify') {
+			$langs->load("projects");
+			//$morehtmlref.='<br>'.$langs->trans('Project') . ' ';
+			$morehtmlref .= $langs->trans('Project').' ';
+			if ($user->rights->agenda->allactions->create ||
+		   		(($object->authorid == $user->id || $object->userownerid == $user->id) && $user->rights->agenda->myactions->create))
+			{
+				if ($action != 'classify') {
 					$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
-                }
-                if ($action == 'classify') {
-                    //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-                    $morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-                    $morehtmlref .= '<input type="hidden" name="action" value="classin">';
-                    $morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
-                    $morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-                    $morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-                    $morehtmlref .= '</form>';
-                } else {
-                    $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-                }
-		    } else {
-		        if (!empty($object->fk_project)) {
-		            $proj = new Project($db);
-		            $proj->fetch($object->fk_project);
-		            $morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
-		            $morehtmlref .= $proj->ref;
-		            $morehtmlref .= '</a>';
-		            if ($proj->title) $morehtmlref .= ' - '.$proj->title;
-		        } else {
-		            $morehtmlref .= '';
-		        }
-		    }
+				}
+				if ($action == 'classify') {
+					//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+					$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+					$morehtmlref .= '<input type="hidden" name="action" value="classin">';
+					$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
+					$morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+					$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+					$morehtmlref .= '</form>';
+				} else {
+					$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+				}
+			} else {
+				if (!empty($object->fk_project)) {
+					$proj = new Project($db);
+					$proj->fetch($object->fk_project);
+					$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
+					$morehtmlref .= $proj->ref;
+					$morehtmlref .= '</a>';
+					if ($proj->title) $morehtmlref .= ' - '.$proj->title;
+				} else {
+					$morehtmlref .= '';
+				}
+			}
 		}
 		$morehtmlref .= '</div>';
 
 
 		dol_banner_tab($object, 'id', $linkback, ($user->socid ? 0 : 1), 'id', 'ref', $morehtmlref);
 
-	    print '<div class="fichecenter">';
-	    print '<div class="fichehalfleft">';
+		print '<div class="fichecenter">';
+		print '<div class="fichehalfleft">';
 
 		print '<div class="underbanner clearboth"></div>';
 
@@ -1884,8 +1884,8 @@ if ($id > 0)
 			print '<tr><td class="titlefield">'.$langs->trans("Type").'</td><td>'.$langs->trans($object->type).'</td></tr>';
 		}
 
-        // Full day event
-        print '<tr><td class="titlefield">'.$langs->trans("EventOnFullDay").'</td><td>'.yn($object->fulldayevent, 3).'</td></tr>';
+		// Full day event
+		print '<tr><td class="titlefield">'.$langs->trans("EventOnFullDay").'</td><td>'.yn($object->fulldayevent, 3).'</td></tr>';
 
 		$rowspan = 4;
 		if (empty($conf->global->AGENDA_DISABLE_LOCATION)) $rowspan++;
@@ -1900,19 +1900,19 @@ if ($id > 0)
 
 		// Date end
 		print '<tr><td>'.$langs->trans("DateActionEnd").'</td><td>';
-        if (!$object->fulldayevent) print dol_print_date($object->datef, 'dayhour');
+		if (!$object->fulldayevent) print dol_print_date($object->datef, 'dayhour');
 		else print dol_print_date($object->datef, 'day');
 		if ($object->percentage > 0 && $object->percentage < 100 && $object->datef && $object->datef < ($now - $delay_warning)) print img_warning($langs->trans("Late"));
 		print '</td></tr>';
 
-        // Location
-	    if (empty($conf->global->AGENDA_DISABLE_LOCATION))
-    	{
+		// Location
+		if (empty($conf->global->AGENDA_DISABLE_LOCATION))
+		{
 			print '<tr><td>'.$langs->trans("Location").'</td><td>'.$object->location.'</td></tr>';
-    	}
+		}
 
 		// Assigned to
-    	print '<tr><td class="nowrap">'.$langs->trans("ActionAssignedTo").'</td><td>';
+		print '<tr><td class="nowrap">'.$langs->trans("ActionAssignedTo").'</td><td>';
 		$listofuserid = array();
 		if (empty($donotclearsession))
 		{
@@ -1988,8 +1988,8 @@ if ($id > 0)
 
 		if ($conf->societe->enabled)
 		{
-		    // Related company
-		    print '<tr><td class="titlefield">'.$langs->trans("ActionOnCompany").'</td><td>'.($object->thirdparty->id ? $object->thirdparty->getNomUrl(1) : ('<span class="opacitymedium">'.$langs->trans("None").'</span>'));
+			// Related company
+			print '<tr><td class="titlefield">'.$langs->trans("ActionOnCompany").'</td><td>'.($object->thirdparty->id ? $object->thirdparty->getNomUrl(1) : ('<span class="opacitymedium">'.$langs->trans("None").'</span>'));
 			if (is_object($object->thirdparty) && $object->thirdparty->id > 0 && $object->type_code == 'AC_TEL')
 			{
 				if ($object->thirdparty->fetch($object->thirdparty->id))
@@ -2051,43 +2051,43 @@ if ($id > 0)
 		print dol_string_onlythesehtmltags(dol_htmlentitiesbr($object->note_private));
 		print '</td></tr>';
 
-        // Other attributes
-        include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
+		// Other attributes
+		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
 
-        // Reminders
-        if ($conf->global->AGENDA_REMINDER_EMAIL || $conf->global->AGENDA_REMINDER_BROWSER)
-        {
-        	$filtreuserid = $user->id;
-        	if ($user->rights->agenda->allactions->read) $filtreuserid = 0;
-        	$object->loadReminders('', $filteruserid, false);
+		// Reminders
+		if ($conf->global->AGENDA_REMINDER_EMAIL || $conf->global->AGENDA_REMINDER_BROWSER)
+		{
+			$filtreuserid = $user->id;
+			if ($user->rights->agenda->allactions->read) $filtreuserid = 0;
+			$object->loadReminders('', $filteruserid, false);
 
-        	print '<tr><td class="titlefieldcreate nowrap">'.$langs->trans("Reminders").'</td><td>';
+			print '<tr><td class="titlefieldcreate nowrap">'.$langs->trans("Reminders").'</td><td>';
 
-        	if (count($object->reminders) > 0) {
-        		$tmpuserstatic = new User($db);
+			if (count($object->reminders) > 0) {
+				$tmpuserstatic = new User($db);
 
-        		foreach ($object->reminders as $actioncommreminderid => $actioncommreminder) {
-        			print $TRemindTypes[$actioncommreminder->typeremind];
-        			if ($actioncommreminder->fk_user > 0) {
-        				$tmpuserstatic->fetch($actioncommreminder->fk_user);
-        				print ' ('.$tmpuserstatic->getNomUrl(0, '', 0, 0, 16).')';
-        			}
-        			print ' - '.$actioncommreminder->offsetvalue.' '.$TDurationTypes[$actioncommreminder->offsetunit];
-        			if ($actioncommreminder->status == $actioncommreminder::STATUS_TODO) {
-        				print ' - <span class="opacitymedium">';
-        				print $langs->trans("NotSent");
-        				print ' </span>';
-        			} elseif ($actioncommreminder->status == $actioncommreminder::STATUS_DONE) {
-        				print ' - <span class="opacitymedium">';
-        				print $langs->trans("Done");
-        				print ' </span>';
-        			}
-        			print '<br>';
-        		}
-        	}
+				foreach ($object->reminders as $actioncommreminderid => $actioncommreminder) {
+					print $TRemindTypes[$actioncommreminder->typeremind];
+					if ($actioncommreminder->fk_user > 0) {
+						$tmpuserstatic->fetch($actioncommreminder->fk_user);
+						print ' ('.$tmpuserstatic->getNomUrl(0, '', 0, 0, 16).')';
+					}
+					print ' - '.$actioncommreminder->offsetvalue.' '.$TDurationTypes[$actioncommreminder->offsetunit];
+					if ($actioncommreminder->status == $actioncommreminder::STATUS_TODO) {
+						print ' - <span class="opacitymedium">';
+						print $langs->trans("NotSent");
+						print ' </span>';
+					} elseif ($actioncommreminder->status == $actioncommreminder::STATUS_DONE) {
+						print ' - <span class="opacitymedium">';
+						print $langs->trans("Done");
+						print ' </span>';
+					}
+					print '<br>';
+				}
+			}
 
-        	print '</td></tr>';
-        }
+			print '</td></tr>';
+		}
 
 		print '</table>';
 
@@ -2095,7 +2095,7 @@ if ($id > 0)
 		print '</div>';
 		print '<div class="clearboth"></div>';
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 	}
 
 
@@ -2144,26 +2144,26 @@ if ($id > 0)
 		if (empty($conf->global->AGENDA_DISABLE_BUILDDOC))
 		{
 			print '<div style="clear:both;"></div><div class="fichecenter"><div class="fichehalfleft">';
-            print '<a name="builddoc"></a>'; // ancre
+			print '<a name="builddoc"></a>'; // ancre
 
-            /*
+			/*
              * Documents generes
              */
 
-            $filedir = $conf->agenda->multidir_output[$conf->entity].'/'.$object->id;
-            $urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
+			$filedir = $conf->agenda->multidir_output[$conf->entity].'/'.$object->id;
+			$urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
 
-            $genallowed = $user->rights->agenda->myactions->read;
-	        $delallowed = $user->rights->agenda->myactions->create;
+			$genallowed = $user->rights->agenda->myactions->read;
+			$delallowed = $user->rights->agenda->myactions->create;
 
 
-            print $formfile->showdocuments('actions', $object->id, $filedir, $urlsource, $genallowed, $delallowed, '', 0, 0, 0, 0, 0, '', '', '', $object->default_lang);
+			print $formfile->showdocuments('actions', $object->id, $filedir, $urlsource, $genallowed, $delallowed, '', 0, 0, 0, 0, 0, '', '', '', $object->default_lang);
 
 			print '</div><div class="fichehalfright"><div class="ficheaddleft">';
 
 
 			print '</div></div></div>';
-	    }
+		}
 	}
 }
 
diff --git a/htdocs/comm/action/class/actioncommreminder.class.php b/htdocs/comm/action/class/actioncommreminder.class.php
index 16384edfcde..09c9a25ca1a 100644
--- a/htdocs/comm/action/class/actioncommreminder.class.php
+++ b/htdocs/comm/action/class/actioncommreminder.class.php
@@ -77,8 +77,8 @@ class ActionCommReminder extends CommonObject
 	 */
 	public $fields = array(
 		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'visible'=>-1, 'enabled'=>1, 'position'=>1, 'notnull'=>1, 'index'=>1, 'comment'=>"Id",),
-        'entity' => array('type'=>'integer', 'label'=>'Entity', 'visible'=>0, 'enabled'=>1, 'position'=>20, 'notnull'=>1, 'index'=>1,),
-        'dateremind' => array('type'=>'datetime', 'label'=>'DateRemind', 'visible'=>1, 'enabled'=>1, 'position'=>60, 'notnull'=>1, 'index'=>1,),
+		'entity' => array('type'=>'integer', 'label'=>'Entity', 'visible'=>0, 'enabled'=>1, 'position'=>20, 'notnull'=>1, 'index'=>1,),
+		'dateremind' => array('type'=>'datetime', 'label'=>'DateRemind', 'visible'=>1, 'enabled'=>1, 'position'=>60, 'notnull'=>1, 'index'=>1,),
 		'typeremind' => array('type'=>'varchar(32)', 'label'=>'TypeRemind', 'visible'=>-1, 'enabled'=>1, 'position'=>55, 'notnull'=>1, 'comment'=>"email, browser, sms",),
 		'fk_user' => array('type'=>'integer', 'label'=>'User', 'visible'=>-1, 'enabled'=>1, 'position'=>65, 'notnull'=>1, 'index'=>1,),
 		'offsetvalue' => array('type'=>'integer', 'label'=>'OffsetValue', 'visible'=>1, 'enabled'=>1, 'position'=>56, 'notnull'=>1,),
@@ -93,10 +93,10 @@ class ActionCommReminder extends CommonObject
 	 */
 	public $rowid;
 
-    /**
-     * @var int Entity
-     */
-    public $entity;
+	/**
+	 * @var int Entity
+	 */
+	public $entity;
 
 	public $dateremind;
 	public $typeremind;
@@ -204,7 +204,7 @@ class ActionCommReminder extends CommonObject
 		return $this->LibStatut($this->status, $mode);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return the status
 	 *
@@ -214,7 +214,7 @@ class ActionCommReminder extends CommonObject
 	 */
 	public static function LibStatut($status, $mode = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 
 		if ($mode == 0 || $mode == 1)
diff --git a/htdocs/comm/action/class/api_agendaevents.class.php b/htdocs/comm/action/class/api_agendaevents.class.php
index 473c87e22a0..ca551c51e50 100644
--- a/htdocs/comm/action/class/api_agendaevents.class.php
+++ b/htdocs/comm/action/class/api_agendaevents.class.php
@@ -29,361 +29,361 @@
 class AgendaEvents extends DolibarrApi
 {
 
-    /**
-     * @var array   $FIELDS     Mandatory fields, checked when create and update object
-     */
-    static $FIELDS = array(
-    );
+	/**
+	 * @var array   $FIELDS     Mandatory fields, checked when create and update object
+	 */
+	static $FIELDS = array(
+	);
 
-    /**
-     * @var ActionComm $actioncomm {@type ActionComm}
-     */
-    public $actioncomm;
+	/**
+	 * @var ActionComm $actioncomm {@type ActionComm}
+	 */
+	public $actioncomm;
 
 
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-        global $db, $conf;
-        $this->db = $db;
-        $this->actioncomm = new ActionComm($this->db);
-    }
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		global $db, $conf;
+		$this->db = $db;
+		$this->actioncomm = new ActionComm($this->db);
+	}
 
-    /**
-     * Get properties of a Agenda Events object
-     *
-     * Return an array with Agenda Events informations
-     *
-     * @param       int         $id         ID of Agenda Events
-     * @return 	    array|mixed             Data without useless information
-     *
-     * @throws 	RestException
-     */
-    public function get($id)
-    {
-        if (!DolibarrApiAccess::$user->rights->agenda->myactions->read) {
-            throw new RestException(401, "Insufficient rights to read an event");
-        }
-        if ($id == 0) {
-            $result = $this->actioncomm->initAsSpecimen();
-        } else {
-            $result = $this->actioncomm->fetch($id);
-            if ($result) {
-                $this->actioncomm->fetch_optionals();
-                $this->actioncomm->fetchObjectLinked();
-            }
-        }
-        if (!$result) {
-            throw new RestException(404, 'Agenda Events not found');
-        }
+	/**
+	 * Get properties of a Agenda Events object
+	 *
+	 * Return an array with Agenda Events informations
+	 *
+	 * @param       int         $id         ID of Agenda Events
+	 * @return 	    array|mixed             Data without useless information
+	 *
+	 * @throws 	RestException
+	 */
+	public function get($id)
+	{
+		if (!DolibarrApiAccess::$user->rights->agenda->myactions->read) {
+			throw new RestException(401, "Insufficient rights to read an event");
+		}
+		if ($id == 0) {
+			$result = $this->actioncomm->initAsSpecimen();
+		} else {
+			$result = $this->actioncomm->fetch($id);
+			if ($result) {
+				$this->actioncomm->fetch_optionals();
+				$this->actioncomm->fetchObjectLinked();
+			}
+		}
+		if (!$result) {
+			throw new RestException(404, 'Agenda Events not found');
+		}
 
-        if (!DolibarrApiAccess::$user->rights->agenda->allactions->read && $this->actioncomm->userownerid != DolibarrApiAccess::$user->id) {
-            throw new RestException(401, "Insufficient rights to read event for owner id ".$request_data['userownerid'].' Your id is '.DolibarrApiAccess::$user->id);
-        }
+		if (!DolibarrApiAccess::$user->rights->agenda->allactions->read && $this->actioncomm->userownerid != DolibarrApiAccess::$user->id) {
+			throw new RestException(401, "Insufficient rights to read event for owner id ".$request_data['userownerid'].' Your id is '.DolibarrApiAccess::$user->id);
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('agenda', $this->actioncomm->id, 'actioncomm', '', 'fk_soc', 'id')) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
-        return $this->_cleanObjectDatas($this->actioncomm);
-    }
+		if (!DolibarrApi::_checkAccessToResource('agenda', $this->actioncomm->id, 'actioncomm', '', 'fk_soc', 'id')) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+		return $this->_cleanObjectDatas($this->actioncomm);
+	}
 
-    /**
-     * List Agenda Events
-     *
-     * Get a list of Agenda Events
-     *
-     * @param string	$sortfield	Sort field
-     * @param string	$sortorder	Sort order
-     * @param int		$limit		Limit for list
-     * @param int		$page		Page number
-     * @param string   	$user_ids   User ids filter field (owners of event). Example: '1' or '1,2,3'          {@pattern /^[0-9,]*$/i}
-     * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.label:like:'%dol%') and (t.datec:<:'20160101')"
-     * @return  array               Array of Agenda Events objects
-     */
-    public function index($sortfield = "t.id", $sortorder = 'ASC', $limit = 100, $page = 0, $user_ids = 0, $sqlfilters = '')
-    {
-        global $db, $conf;
+	/**
+	 * List Agenda Events
+	 *
+	 * Get a list of Agenda Events
+	 *
+	 * @param string	$sortfield	Sort field
+	 * @param string	$sortorder	Sort order
+	 * @param int		$limit		Limit for list
+	 * @param int		$page		Page number
+	 * @param string   	$user_ids   User ids filter field (owners of event). Example: '1' or '1,2,3'          {@pattern /^[0-9,]*$/i}
+	 * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.label:like:'%dol%') and (t.datec:<:'20160101')"
+	 * @return  array               Array of Agenda Events objects
+	 */
+	public function index($sortfield = "t.id", $sortorder = 'ASC', $limit = 100, $page = 0, $user_ids = 0, $sqlfilters = '')
+	{
+		global $db, $conf;
 
-        $obj_ret = array();
+		$obj_ret = array();
 
-        if (!DolibarrApiAccess::$user->rights->agenda->myactions->read) {
-            throw new RestException(401, "Insufficient rights to read events");
-        }
+		if (!DolibarrApiAccess::$user->rights->agenda->myactions->read) {
+			throw new RestException(401, "Insufficient rights to read events");
+		}
 
-        // case of external user
-        $socid = 0;
-        if (!empty(DolibarrApiAccess::$user->socid)) $socid = DolibarrApiAccess::$user->socid;
+		// case of external user
+		$socid = 0;
+		if (!empty(DolibarrApiAccess::$user->socid)) $socid = DolibarrApiAccess::$user->socid;
 
-        // If the internal user must only see his customers, force searching by him
-        $search_sale = 0;
-        if (!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) $search_sale = DolibarrApiAccess::$user->id;
-        if (empty($conf->societe->enabled)) $search_sale = 0; // If module thirdparty not enabled, sale representative is something that does not exists
+		// If the internal user must only see his customers, force searching by him
+		$search_sale = 0;
+		if (!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) $search_sale = DolibarrApiAccess::$user->id;
+		if (empty($conf->societe->enabled)) $search_sale = 0; // If module thirdparty not enabled, sale representative is something that does not exists
 
-        $sql = "SELECT t.id as rowid";
-        if (!empty($conf->societe->enabled))
-            if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
-        $sql .= " FROM ".MAIN_DB_PREFIX."actioncomm as t";
-        if (!empty($conf->societe->enabled))
-            if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
-        $sql .= ' WHERE t.entity IN ('.getEntity('agenda').')';
-        if (!empty($conf->societe->enabled))
-            if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql .= " AND t.fk_soc = sc.fk_soc";
-        if ($user_ids) $sql .= " AND t.fk_user_action IN (".$user_ids.")";
-        if ($socid > 0) $sql .= " AND t.fk_soc = ".$socid;
-        // Insert sale filter
-        if ($search_sale > 0)
-        {
-            $sql .= " AND sc.fk_user = ".$search_sale;
-        }
-        // Add sql filters
-        if ($sqlfilters)
-        {
-            if (!DolibarrApi::_checkFilters($sqlfilters))
-            {
-                throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
-            }
-            $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-        }
+		$sql = "SELECT t.id as rowid";
+		if (!empty($conf->societe->enabled))
+			if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
+		$sql .= " FROM ".MAIN_DB_PREFIX."actioncomm as t";
+		if (!empty($conf->societe->enabled))
+			if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
+		$sql .= ' WHERE t.entity IN ('.getEntity('agenda').')';
+		if (!empty($conf->societe->enabled))
+			if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql .= " AND t.fk_soc = sc.fk_soc";
+		if ($user_ids) $sql .= " AND t.fk_user_action IN (".$user_ids.")";
+		if ($socid > 0) $sql .= " AND t.fk_soc = ".$socid;
+		// Insert sale filter
+		if ($search_sale > 0)
+		{
+			$sql .= " AND sc.fk_user = ".$search_sale;
+		}
+		// Add sql filters
+		if ($sqlfilters)
+		{
+			if (!DolibarrApi::_checkFilters($sqlfilters))
+			{
+				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+			}
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
 
-        $sql .= $this->db->order($sortfield, $sortorder);
-        if ($limit) {
-            if ($page < 0)
-            {
-                $page = 0;
-            }
-            $offset = $limit * $page;
+		$sql .= $this->db->order($sortfield, $sortorder);
+		if ($limit) {
+			if ($page < 0)
+			{
+				$page = 0;
+			}
+			$offset = $limit * $page;
 
-            $sql .= $this->db->plimit($limit + 1, $offset);
-        }
+			$sql .= $this->db->plimit($limit + 1, $offset);
+		}
 
-        $result = $this->db->query($sql);
+		$result = $this->db->query($sql);
 
-        if ($result)
-        {
-            $i = 0;
-            $num = $this->db->num_rows($result);
-            $min = min($num, ($limit <= 0 ? $num : $limit));
-            while ($i < $min)
-            {
-            	$obj = $this->db->fetch_object($result);
-            	$actioncomm_static = new ActionComm($this->db);
-                if ($actioncomm_static->fetch($obj->rowid)) {
-                    $obj_ret[] = $this->_cleanObjectDatas($actioncomm_static);
-                }
-                $i++;
-            }
-        } else {
-        	throw new RestException(503, 'Error when retrieve Agenda Event list : '.$this->db->lasterror());
-        }
-        if (!count($obj_ret)) {
-            throw new RestException(404, 'No Agenda Event found');
-        }
-        return $obj_ret;
-    }
+		if ($result)
+		{
+			$i = 0;
+			$num = $this->db->num_rows($result);
+			$min = min($num, ($limit <= 0 ? $num : $limit));
+			while ($i < $min)
+			{
+				$obj = $this->db->fetch_object($result);
+				$actioncomm_static = new ActionComm($this->db);
+				if ($actioncomm_static->fetch($obj->rowid)) {
+					$obj_ret[] = $this->_cleanObjectDatas($actioncomm_static);
+				}
+				$i++;
+			}
+		} else {
+			throw new RestException(503, 'Error when retrieve Agenda Event list : '.$this->db->lasterror());
+		}
+		if (!count($obj_ret)) {
+			throw new RestException(404, 'No Agenda Event found');
+		}
+		return $obj_ret;
+	}
 
-    /**
-     * Create Agenda Event object
-     *
-     * @param   array   $request_data   Request data
-     * @return  int                     ID of Agenda Event
-     */
-    public function post($request_data = null)
-    {
-        if (!DolibarrApiAccess::$user->rights->agenda->myactions->create) {
-            throw new RestException(401, "Insufficient rights to create your Agenda Event");
-        }
-        if (!DolibarrApiAccess::$user->rights->agenda->allactions->create && DolibarrApiAccess::$user->id != $request_data['userownerid']) {
-            throw new RestException(401, "Insufficient rights to create an Agenda Event for owner id ".$request_data['userownerid'].' Your id is '.DolibarrApiAccess::$user->id);
-        }
+	/**
+	 * Create Agenda Event object
+	 *
+	 * @param   array   $request_data   Request data
+	 * @return  int                     ID of Agenda Event
+	 */
+	public function post($request_data = null)
+	{
+		if (!DolibarrApiAccess::$user->rights->agenda->myactions->create) {
+			throw new RestException(401, "Insufficient rights to create your Agenda Event");
+		}
+		if (!DolibarrApiAccess::$user->rights->agenda->allactions->create && DolibarrApiAccess::$user->id != $request_data['userownerid']) {
+			throw new RestException(401, "Insufficient rights to create an Agenda Event for owner id ".$request_data['userownerid'].' Your id is '.DolibarrApiAccess::$user->id);
+		}
 
-        // Check mandatory fields
-        $result = $this->_validate($request_data);
+		// Check mandatory fields
+		$result = $this->_validate($request_data);
 
-        foreach ($request_data as $field => $value) {
-            $this->actioncomm->$field = $value;
-        }
-        /*if (isset($request_data["lines"])) {
+		foreach ($request_data as $field => $value) {
+			$this->actioncomm->$field = $value;
+		}
+		/*if (isset($request_data["lines"])) {
           $lines = array();
           foreach ($request_data["lines"] as $line) {
             array_push($lines, (object) $line);
           }
           $this->expensereport->lines = $lines;
         }*/
-        if ($this->actioncomm->create(DolibarrApiAccess::$user) < 0) {
-            throw new RestException(500, "Error creating event", array_merge(array($this->actioncomm->error), $this->actioncomm->errors));
-        }
+		if ($this->actioncomm->create(DolibarrApiAccess::$user) < 0) {
+			throw new RestException(500, "Error creating event", array_merge(array($this->actioncomm->error), $this->actioncomm->errors));
+		}
 
-        return $this->actioncomm->id;
-    }
+		return $this->actioncomm->id;
+	}
 
 
-    /**
-     * Update Agenda Event general fields
-     *
-     * @param int   $id             Id of Agenda Event to update
-     * @param array $request_data   Datas
-     *
-     * @return int
-     */
-    public function put($id, $request_data = null)
-    {
-        if (!DolibarrApiAccess::$user->rights->agenda->myactions->create) {
-            throw new RestException(401, "Insufficient rights to create your Agenda Event");
-        }
-        if (!DolibarrApiAccess::$user->rights->agenda->allactions->create && DolibarrApiAccess::$user->id != $request_data['userownerid']) {
-            throw new RestException(401, "Insufficient rights to create an Agenda Event for owner id ".$request_data['userownerid'].' Your id is '.DolibarrApiAccess::$user->id);
-        }
+	/**
+	 * Update Agenda Event general fields
+	 *
+	 * @param int   $id             Id of Agenda Event to update
+	 * @param array $request_data   Datas
+	 *
+	 * @return int
+	 */
+	public function put($id, $request_data = null)
+	{
+		if (!DolibarrApiAccess::$user->rights->agenda->myactions->create) {
+			throw new RestException(401, "Insufficient rights to create your Agenda Event");
+		}
+		if (!DolibarrApiAccess::$user->rights->agenda->allactions->create && DolibarrApiAccess::$user->id != $request_data['userownerid']) {
+			throw new RestException(401, "Insufficient rights to create an Agenda Event for owner id ".$request_data['userownerid'].' Your id is '.DolibarrApiAccess::$user->id);
+		}
 
-        $result = $this->actioncomm->fetch($id);
-        if ($result) {
-            $this->actioncomm->fetch_optionals();
-            $this->actioncomm->fetch_userassigned();
-            $this->actioncomm->oldcopy = clone $this->actioncomm;
-        }
-        if (!$result) {
-            throw new RestException(404, 'actioncomm not found');
-        }
+		$result = $this->actioncomm->fetch($id);
+		if ($result) {
+			$this->actioncomm->fetch_optionals();
+			$this->actioncomm->fetch_userassigned();
+			$this->actioncomm->oldcopy = clone $this->actioncomm;
+		}
+		if (!$result) {
+			throw new RestException(404, 'actioncomm not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('actioncomm', $this->actioncomm->id, 'actioncomm', '', 'fk_soc', 'id')) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
-        foreach ($request_data as $field => $value) {
-            if ($field == 'id') continue;
-            $this->actioncomm->$field = $value;
-        }
+		if (!DolibarrApi::_checkAccessToResource('actioncomm', $this->actioncomm->id, 'actioncomm', '', 'fk_soc', 'id')) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+		foreach ($request_data as $field => $value) {
+			if ($field == 'id') continue;
+			$this->actioncomm->$field = $value;
+		}
 
-        if ($this->actioncomm->update(DolibarrApiAccess::$user, 1) > 0)
-            return $this->get($id);
+		if ($this->actioncomm->update(DolibarrApiAccess::$user, 1) > 0)
+			return $this->get($id);
 
-        return false;
-    }
+		return false;
+	}
 
-    /**
-     * Delete Agenda Event
-     *
-     * @param   int     $id         Agenda Event ID
-     *
-     * @return  array
-     */
-    public function delete($id)
-    {
-        if (!DolibarrApiAccess::$user->rights->agenda->myactions->delete) {
-            throw new RestException(401, "Insufficient rights to delete your Agenda Event");
-        }
+	/**
+	 * Delete Agenda Event
+	 *
+	 * @param   int     $id         Agenda Event ID
+	 *
+	 * @return  array
+	 */
+	public function delete($id)
+	{
+		if (!DolibarrApiAccess::$user->rights->agenda->myactions->delete) {
+			throw new RestException(401, "Insufficient rights to delete your Agenda Event");
+		}
 
-        $result = $this->actioncomm->fetch($id);
-        if ($result) {
-            $this->actioncomm->fetch_optionals();
-            $this->actioncomm->fetch_userassigned();
-            $this->actioncomm->oldcopy = clone $this->actioncomm;
-        }
+		$result = $this->actioncomm->fetch($id);
+		if ($result) {
+			$this->actioncomm->fetch_optionals();
+			$this->actioncomm->fetch_userassigned();
+			$this->actioncomm->oldcopy = clone $this->actioncomm;
+		}
 
-        if (!DolibarrApiAccess::$user->rights->agenda->allactions->delete && DolibarrApiAccess::$user->id != $this->actioncomm->userownerid) {
-            throw new RestException(401, "Insufficient rights to delete an Agenda Event of owner id ".$request_data['userownerid'].' Your id is '.DolibarrApiAccess::$user->id);
-        }
+		if (!DolibarrApiAccess::$user->rights->agenda->allactions->delete && DolibarrApiAccess::$user->id != $this->actioncomm->userownerid) {
+			throw new RestException(401, "Insufficient rights to delete an Agenda Event of owner id ".$request_data['userownerid'].' Your id is '.DolibarrApiAccess::$user->id);
+		}
 
-        if (!$result) {
-            throw new RestException(404, 'Agenda Event not found');
-        }
+		if (!$result) {
+			throw new RestException(404, 'Agenda Event not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('actioncomm', $this->actioncomm->id, 'actioncomm', '', 'fk_soc', 'id')) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('actioncomm', $this->actioncomm->id, 'actioncomm', '', 'fk_soc', 'id')) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        if (!$this->actioncomm->delete(DolibarrApiAccess::$user)) {
-            throw new RestException(500, 'Error when delete Agenda Event : '.$this->actioncomm->error);
-        }
+		if (!$this->actioncomm->delete(DolibarrApiAccess::$user)) {
+			throw new RestException(500, 'Error when delete Agenda Event : '.$this->actioncomm->error);
+		}
 
-        return array(
-            'success' => array(
-                'code' => 200,
-                'message' => 'Agenda Event deleted'
-            )
-        );
-    }
+		return array(
+			'success' => array(
+				'code' => 200,
+				'message' => 'Agenda Event deleted'
+			)
+		);
+	}
 
-    /**
-     * Validate fields before create or update object
-     *
-     * @param   array           $data   Array with data to verify
-     * @return  array
-     * @throws  RestException
-     */
-    private function _validate($data)
-    {
-        $event = array();
-        foreach (AgendaEvents::$FIELDS as $field) {
-            if (!isset($data[$field]))
-                throw new RestException(400, "$field field missing");
-            $event[$field] = $data[$field];
-        }
-        return $event;
-    }
+	/**
+	 * Validate fields before create or update object
+	 *
+	 * @param   array           $data   Array with data to verify
+	 * @return  array
+	 * @throws  RestException
+	 */
+	private function _validate($data)
+	{
+		$event = array();
+		foreach (AgendaEvents::$FIELDS as $field) {
+			if (!isset($data[$field]))
+				throw new RestException(400, "$field field missing");
+			$event[$field] = $data[$field];
+		}
+		return $event;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
-    /**
-     * Clean sensible object datas
-     *
-     * @param	object	$object		Object to clean
-     * @return	array				Array of cleaned object properties
-     */
-    protected function _cleanObjectDatas($object)
-    {
-        // phpcs:enable
-        $object = parent::_cleanObjectDatas($object);
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	/**
+	 * Clean sensible object datas
+	 *
+	 * @param   Object  $object     Object to clean
+	 * @return  Object              Object with cleaned properties
+	 */
+	protected function _cleanObjectDatas($object)
+	{
+		// phpcs:enable
+		$object = parent::_cleanObjectDatas($object);
 
-        unset($object->note); // alreaydy into note_private
-        unset($object->usermod);
-        unset($object->libelle);
-        unset($object->context);
-        unset($object->canvas);
-        unset($object->contact);
-        unset($object->contact_id);
-        unset($object->thirdparty);
-        unset($object->user);
-        unset($object->origin);
-        unset($object->origin_id);
-        unset($object->ref_ext);
-        unset($object->statut);
-        unset($object->state_code);
-        unset($object->state_id);
-        unset($object->state);
-        unset($object->region);
-        unset($object->region_code);
-        unset($object->country);
-        unset($object->country_id);
-        unset($object->country_code);
-        unset($object->barcode_type);
-        unset($object->barcode_type_code);
-        unset($object->barcode_type_label);
-        unset($object->barcode_type_coder);
-        unset($object->mode_reglement_id);
-        unset($object->cond_reglement_id);
-        unset($object->cond_reglement);
-        unset($object->fk_delivery_address);
-        unset($object->shipping_method_id);
-        unset($object->fk_account);
-        unset($object->total_ht);
-        unset($object->total_tva);
-        unset($object->total_localtax1);
-        unset($object->total_localtax2);
-        unset($object->total_ttc);
-        unset($object->fk_incoterms);
-        unset($object->label_incoterms);
-        unset($object->location_incoterms);
-        unset($object->name);
-        unset($object->lastname);
-        unset($object->firstname);
-        unset($object->civility_id);
-        unset($object->contact);
-        unset($object->societe);
+		unset($object->note); // alreaydy into note_private
+		unset($object->usermod);
+		unset($object->libelle);
+		unset($object->context);
+		unset($object->canvas);
+		unset($object->contact);
+		unset($object->contact_id);
+		unset($object->thirdparty);
+		unset($object->user);
+		unset($object->origin);
+		unset($object->origin_id);
+		unset($object->ref_ext);
+		unset($object->statut);
+		unset($object->state_code);
+		unset($object->state_id);
+		unset($object->state);
+		unset($object->region);
+		unset($object->region_code);
+		unset($object->country);
+		unset($object->country_id);
+		unset($object->country_code);
+		unset($object->barcode_type);
+		unset($object->barcode_type_code);
+		unset($object->barcode_type_label);
+		unset($object->barcode_type_coder);
+		unset($object->mode_reglement_id);
+		unset($object->cond_reglement_id);
+		unset($object->cond_reglement);
+		unset($object->fk_delivery_address);
+		unset($object->shipping_method_id);
+		unset($object->fk_account);
+		unset($object->total_ht);
+		unset($object->total_tva);
+		unset($object->total_localtax1);
+		unset($object->total_localtax2);
+		unset($object->total_ttc);
+		unset($object->fk_incoterms);
+		unset($object->label_incoterms);
+		unset($object->location_incoterms);
+		unset($object->name);
+		unset($object->lastname);
+		unset($object->firstname);
+		unset($object->civility_id);
+		unset($object->contact);
+		unset($object->societe);
 
-        unset($object->actions);
-        unset($object->lines);
+		unset($object->actions);
+		unset($object->lines);
 
-        return $object;
-    }
+		return $object;
+	}
 }
diff --git a/htdocs/comm/action/class/cactioncomm.class.php b/htdocs/comm/action/class/cactioncomm.class.php
index 6e86a556a1a..01afdb8a49c 100644
--- a/htdocs/comm/action/class/cactioncomm.class.php
+++ b/htdocs/comm/action/class/cactioncomm.class.php
@@ -28,201 +28,201 @@
  */
 class CActionComm
 {
-    /**
-     * @var string Error code (or message)
-     */
-    public $error = '';
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error = '';
 
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    /**
-     * @var int ID
-     */
-    public $id;
+	/**
+	 * @var int ID
+	 */
+	public $id;
 
-    public $code;
-    public $type;
-    public $libelle; // deprecated
+	public $code;
+	public $type;
+	public $libelle; // deprecated
 
-    /**
-     * @var string Type of agenda event label
-     */
-    public $label;
+	/**
+	 * @var string Type of agenda event label
+	 */
+	public $label;
 
-    public $active;
-    public $color;
+	public $active;
+	public $color;
 
-    /**
-     * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
-     */
-    public $picto;
+	/**
+	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+	 */
+	public $picto;
 
-    public $type_actions = array();
+	public $type_actions = array();
 
 
-    /**
-     *  Constructor
-     *
-     *  @param	DoliDB		$db		Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-    }
+	/**
+	 *  Constructor
+	 *
+	 *  @param	DoliDB		$db		Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
 
-    /**
-     *  Load action type from database
-     *
-     *  @param  int     $id     id or code of action type to read
-     *  @return int             1=ok, 0=not found, -1=error
-     */
-    public function fetch($id)
-    {
-        $sql = "SELECT id, code, type, libelle as label, color, active, picto";
-        $sql .= " FROM ".MAIN_DB_PREFIX."c_actioncomm";
-        if (is_numeric($id)) $sql .= " WHERE id=".$id;
-        else $sql .= " WHERE code='".$this->db->escape($id)."'";
+	/**
+	 *  Load action type from database
+	 *
+	 *  @param  int     $id     id or code of action type to read
+	 *  @return int             1=ok, 0=not found, -1=error
+	 */
+	public function fetch($id)
+	{
+		$sql = "SELECT id, code, type, libelle as label, color, active, picto";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_actioncomm";
+		if (is_numeric($id)) $sql .= " WHERE id=".$id;
+		else $sql .= " WHERE code='".$this->db->escape($id)."'";
 
-        dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            if ($this->db->num_rows($resql))
-            {
-                $obj = $this->db->fetch_object($resql);
+		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			if ($this->db->num_rows($resql))
+			{
+				$obj = $this->db->fetch_object($resql);
 
-                $this->id      = $obj->id;
-                $this->code    = $obj->code;
-                $this->type    = $obj->type;
-                $this->libelle = $obj->label; // deprecated
-                $this->label   = $obj->label;
-                $this->active  = $obj->active;
-                $this->color   = $obj->color;
+				$this->id      = $obj->id;
+				$this->code    = $obj->code;
+				$this->type    = $obj->type;
+				$this->libelle = $obj->label; // deprecated
+				$this->label   = $obj->label;
+				$this->active  = $obj->active;
+				$this->color   = $obj->color;
 
-                $this->db->free($resql);
-                return 1;
-            } else {
-                $this->db->free($resql);
-                return 0;
-            }
-        } else {
-            $this->error = $this->db->error();
-            return -1;
-        }
-    }
+				$this->db->free($resql);
+				return 1;
+			} else {
+				$this->db->free($resql);
+				return 0;
+			}
+		} else {
+			$this->error = $this->db->error();
+			return -1;
+		}
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Return list of event types: array(id=>label) or array(code=>label)
-     *
-     *  @param  string|int  $active         1 or 0 to filter on event state active or not ('' by default = no filter)
-     *  @param  string      $idorcode       'id' or 'code'
-     *  @param  string      $excludetype    Type to exclude ('system' or 'systemauto')
-     *  @param  int         $onlyautoornot  1=Group all type AC_XXX into 1 line AC_MANUAL. 0=Keep details of type, -1=Keep details and add a combined line "All manual"
-     *  @param  string      $morefilter     Add more SQL filter
-     *  @param  int         $shortlabel     1=Get short label instead of long label
-     *  @return mixed                       Array of all event types if OK, <0 if KO. Key of array is id or code depending on parameter $idorcode.
-     */
-    public function liste_array($active = '', $idorcode = 'id', $excludetype = '', $onlyautoornot = 0, $morefilter = '', $shortlabel = 0)
-    {
-        // phpcs:enable
-        global $langs, $conf;
-        $langs->load("commercial");
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Return list of event types: array(id=>label) or array(code=>label)
+	 *
+	 *  @param  string|int  $active         1 or 0 to filter on event state active or not ('' by default = no filter)
+	 *  @param  string      $idorcode       'id' or 'code'
+	 *  @param  string      $excludetype    Type to exclude ('system' or 'systemauto')
+	 *  @param  int         $onlyautoornot  1=Group all type AC_XXX into 1 line AC_MANUAL. 0=Keep details of type, -1=Keep details and add a combined line "All manual"
+	 *  @param  string      $morefilter     Add more SQL filter
+	 *  @param  int         $shortlabel     1=Get short label instead of long label
+	 *  @return mixed                       Array of all event types if OK, <0 if KO. Key of array is id or code depending on parameter $idorcode.
+	 */
+	public function liste_array($active = '', $idorcode = 'id', $excludetype = '', $onlyautoornot = 0, $morefilter = '', $shortlabel = 0)
+	{
+		// phpcs:enable
+		global $langs, $conf;
+		$langs->load("commercial");
 
-        $repid = array();
-        $repcode = array();
+		$repid = array();
+		$repcode = array();
 
-        $sql = "SELECT id, code, libelle as label, module, type, color, picto";
-        $sql .= " FROM ".MAIN_DB_PREFIX."c_actioncomm";
-        $sql .= " WHERE 1=1";
-        if ($active != '') $sql .= " AND active=".$active;
-        if (!empty($excludetype)) $sql .= " AND type <> '".$this->db->escape($excludetype)."'";
-        if ($morefilter) $sql .= " AND ".$morefilter;
-        $sql .= " ORDER BY module, position, type";
+		$sql = "SELECT id, code, libelle as label, module, type, color, picto";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_actioncomm";
+		$sql .= " WHERE 1=1";
+		if ($active != '') $sql .= " AND active=".$active;
+		if (!empty($excludetype)) $sql .= " AND type <> '".$this->db->escape($excludetype)."'";
+		if ($morefilter) $sql .= " AND ".$morefilter;
+		$sql .= " ORDER BY module, position, type";
 
-        dol_syslog(get_class($this)."::liste_array", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            $nump = $this->db->num_rows($resql);
-            if ($nump)
-            {
-                $i = 0;
-                while ($i < $nump)
-                {
-                    $obj = $this->db->fetch_object($resql);
+		dol_syslog(get_class($this)."::liste_array", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$nump = $this->db->num_rows($resql);
+			if ($nump)
+			{
+				$i = 0;
+				while ($i < $nump)
+				{
+					$obj = $this->db->fetch_object($resql);
 
-                    $qualified = 1;
+					$qualified = 1;
 
-                    // $obj->type can be system, systemauto, module, moduleauto, xxx, xxxauto
-                    if ($qualified && $onlyautoornot > 0 && preg_match('/^system/', $obj->type) && !preg_match('/^AC_OTH/', $obj->code)) $qualified = 0; // We discard detailed system events. We keep only the 2 generic lines (AC_OTH and AC_OTH_AUTO)
+					// $obj->type can be system, systemauto, module, moduleauto, xxx, xxxauto
+					if ($qualified && $onlyautoornot > 0 && preg_match('/^system/', $obj->type) && !preg_match('/^AC_OTH/', $obj->code)) $qualified = 0; // We discard detailed system events. We keep only the 2 generic lines (AC_OTH and AC_OTH_AUTO)
 
-                    if ($qualified && $obj->module)
-                    {
-                        if ($obj->module == 'invoice' && !$conf->facture->enabled)	$qualified=0;
-                        if ($obj->module == 'order'   && !$conf->commande->enabled) $qualified=0;
-                        if ($obj->module == 'propal'  && !$conf->propal->enabled)	  $qualified=0;
-                        if ($obj->module == 'invoice_supplier' && ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || ! $conf->supplier_invoice->enabled))	$qualified=0;
-                        if ($obj->module == 'order_supplier'   && ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || ! $conf->supplier_order->enabled))	$qualified=0;
-                        if ($obj->module == 'shipping' && !$conf->expedition->enabled)	 $qualified=0;
-                    }
+					if ($qualified && $obj->module)
+					{
+						if ($obj->module == 'invoice' && !$conf->facture->enabled)	$qualified = 0;
+						if ($obj->module == 'order' && !$conf->commande->enabled) $qualified = 0;
+						if ($obj->module == 'propal' && !$conf->propal->enabled)	  $qualified = 0;
+						if ($obj->module == 'invoice_supplier' && ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || !$conf->supplier_invoice->enabled))	$qualified = 0;
+						if ($obj->module == 'order_supplier' && ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || !$conf->supplier_order->enabled))	$qualified = 0;
+						if ($obj->module == 'shipping' && !$conf->expedition->enabled)	 $qualified = 0;
+					}
 
-                    if ($qualified)
-                    {
-                        $keyfortrans = '';
-                    	$transcode = '';
-                    	$code = $obj->code;
-                    	if ($onlyautoornot > 0 && $code == 'AC_OTH') $code = 'AC_MANUAL';
-                    	if ($onlyautoornot > 0 && $code == 'AC_OTH_AUTO') $code = 'AC_AUTO';
-                    	if ($shortlabel)
-                    	{
-                    		$keyfortrans = "Action".$code.'Short';
-                    		$transcode = $langs->trans($keyfortrans);
-                    	}
-                    	if (empty($keyfortrans) || $keyfortrans == $transcode)
-                    	{
-                    		$keyfortrans = "Action".$code;
-                    		$transcode = $langs->trans($keyfortrans);
-                    	}
-                    	$label = (($transcode != $keyfortrans) ? $transcode : $langs->trans($obj->label));
-                        if ($onlyautoornot == -1 && !empty($conf->global->AGENDA_USE_EVENT_TYPE) && !preg_match('/auto/i', $code))
-                        {
-                            $label = '&nbsp; '.$label;
-                            $repid[-99] = $langs->trans("ActionAC_MANUAL");
-                            $repcode['AC_NON_AUTO'] = $langs->trans("ActionAC_MANUAL");
-                        }
-                    	$repid[$obj->id] = $label;
-                    	$repcode[$obj->code] = $label;
-                        if ($onlyautoornot > 0 && preg_match('/^module/', $obj->type) && $obj->module) $repcode[$obj->code] .= ' ('.$langs->trans("Module").': '.$obj->module.')';
-                    }
-                    $i++;
-                }
-            }
-            if ($idorcode == 'id') $this->liste_array = $repid;
-            if ($idorcode == 'code') $this->liste_array = $repcode;
-            return $this->liste_array;
-        } else {
-            $this->error = $this->db->lasterror();
-            return -1;
-        }
-    }
+					if ($qualified)
+					{
+						$keyfortrans = '';
+						$transcode = '';
+						$code = $obj->code;
+						if ($onlyautoornot > 0 && $code == 'AC_OTH') $code = 'AC_MANUAL';
+						if ($onlyautoornot > 0 && $code == 'AC_OTH_AUTO') $code = 'AC_AUTO';
+						if ($shortlabel)
+						{
+							$keyfortrans = "Action".$code.'Short';
+							$transcode = $langs->trans($keyfortrans);
+						}
+						if (empty($keyfortrans) || $keyfortrans == $transcode)
+						{
+							$keyfortrans = "Action".$code;
+							$transcode = $langs->trans($keyfortrans);
+						}
+						$label = (($transcode != $keyfortrans) ? $transcode : $langs->trans($obj->label));
+						if ($onlyautoornot == -1 && !empty($conf->global->AGENDA_USE_EVENT_TYPE) && !preg_match('/auto/i', $code))
+						{
+							$label = '&nbsp; '.$label;
+							$repid[-99] = $langs->trans("ActionAC_MANUAL");
+							$repcode['AC_NON_AUTO'] = $langs->trans("ActionAC_MANUAL");
+						}
+						$repid[$obj->id] = $label;
+						$repcode[$obj->code] = $label;
+						if ($onlyautoornot > 0 && preg_match('/^module/', $obj->type) && $obj->module) $repcode[$obj->code] .= ' ('.$langs->trans("Module").': '.$obj->module.')';
+					}
+					$i++;
+				}
+			}
+			if ($idorcode == 'id') $this->liste_array = $repid;
+			if ($idorcode == 'code') $this->liste_array = $repcode;
+			return $this->liste_array;
+		} else {
+			$this->error = $this->db->lasterror();
+			return -1;
+		}
+	}
 
 
-    /**
-     *  Return name of action type as a label translated
-     *
-     *	@param	int		$withpicto		0=No picto, 1=Include picto into link, 2=Picto only
-     *  @return string			      	Label of action type
-     */
-    public function getNomUrl($withpicto = 0)
-    {
-        global $langs;
+	/**
+	 *  Return name of action type as a label translated
+	 *
+	 *	@param	int		$withpicto		0=No picto, 1=Include picto into link, 2=Picto only
+	 *  @return string			      	Label of action type
+	 */
+	public function getNomUrl($withpicto = 0)
+	{
+		global $langs;
 
-        // Check if translation available
-        $transcode = $langs->trans("Action".$this->code);
-        if ($transcode != "Action".$this->code) return $transcode;
-    }
+		// Check if translation available
+		$transcode = $langs->trans("Action".$this->code);
+		if ($transcode != "Action".$this->code) return $transcode;
+	}
 }
diff --git a/htdocs/comm/action/class/ical.class.php b/htdocs/comm/action/class/ical.class.php
index b806dde94f9..4789e49f44a 100644
--- a/htdocs/comm/action/class/ical.class.php
+++ b/htdocs/comm/action/class/ical.class.php
@@ -32,144 +32,144 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/xcal.lib.php';
  */
 class ICal
 {
-    // Text in file
-    public $file_text;
-    public $cal; // Array to save iCalendar parse data
-    public $event_count; // Number of Events
-    public $todo_count; // Number of Todos
-    public $freebusy_count; // Number of Freebusy
-    public $last_key; //Help variable save last key (multiline string)
+	// Text in file
+	public $file_text;
+	public $cal; // Array to save iCalendar parse data
+	public $event_count; // Number of Events
+	public $todo_count; // Number of Todos
+	public $freebusy_count; // Number of Freebusy
+	public $last_key; //Help variable save last key (multiline string)
 
 
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-    }
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Read text file, icalender text file
-     *
-     *  @param  string  $file       File
-     *  @return string
-     */
-    public function read_file($file)
-    {
-        // phpcs:enable
-        $this->file = $file;
-        $file_text = '';
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Read text file, icalender text file
+	 *
+	 *  @param  string  $file       File
+	 *  @return string
+	 */
+	public function read_file($file)
+	{
+		// phpcs:enable
+		$this->file = $file;
+		$file_text = '';
 
-        $tmparray = file($file);
-        if (is_array($tmparray))
-        {
-            $file_text = join("", $tmparray); //load file
-            $file_text = preg_replace("/[\r\n]{1,} /", "", $file_text);
-        }
-        return $file_text; // return all text
-    }
+		$tmparray = file($file);
+		if (is_array($tmparray))
+		{
+			$file_text = join("", $tmparray); //load file
+			$file_text = preg_replace("/[\r\n]{1,} /", "", $file_text);
+		}
+		return $file_text; // return all text
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * Returns the number of calendar events
-     *
-     * @return int
-     */
-    public function get_event_count()
-    {
-        // phpcs:enable
-        return $this->event_count;
-    }
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Returns the number of calendar events
+	 *
+	 * @return int
+	 */
+	public function get_event_count()
+	{
+		// phpcs:enable
+		return $this->event_count;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * Returns the number of to do
-     *
-     * @return int
-     */
-    public function get_todo_count()
-    {
-        // phpcs:enable
-        return $this->todo_count;
-    }
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Returns the number of to do
+	 *
+	 * @return int
+	 */
+	public function get_todo_count()
+	{
+		// phpcs:enable
+		return $this->todo_count;
+	}
 
-    /**
-     * Translate Calendar
-     *
-     * @param	string 	$uri	Url
-     * @return	array|string
-     */
-    public function parse($uri)
-    {
-        $this->cal = array(); // new empty array
+	/**
+	 * Translate Calendar
+	 *
+	 * @param	string 	$uri	Url
+	 * @return	array|string
+	 */
+	public function parse($uri)
+	{
+		$this->cal = array(); // new empty array
 
-        $this->event_count = -1;
+		$this->event_count = -1;
 
-        // read FILE text
-        $this->file_text = $this->read_file($uri);
+		// read FILE text
+		$this->file_text = $this->read_file($uri);
 
-        $this->file_text = preg_split("[\n]", $this->file_text);
+		$this->file_text = preg_split("[\n]", $this->file_text);
 
-        // is this text vcalendar standard text ? on line 1 is BEGIN:VCALENDAR
-        if (!stristr($this->file_text[0], 'BEGIN:VCALENDAR')) return 'error not VCALENDAR';
+		// is this text vcalendar standard text ? on line 1 is BEGIN:VCALENDAR
+		if (!stristr($this->file_text[0], 'BEGIN:VCALENDAR')) return 'error not VCALENDAR';
 
-        $insidealarm = 0;
-        $tmpkey = ''; $tmpvalue = ''; $type = '';
-        foreach ($this->file_text as $text)
-        {
-            $text = trim($text); // trim one line
-            if (!empty($text))
-            {
-                // get Key and Value VCALENDAR:Begin -> Key = VCALENDAR, Value = begin
-                list($key, $value) = $this->retun_key_value($text);
-                //var_dump($text.' -> '.$key.' - '.$value);
+		$insidealarm = 0;
+		$tmpkey = ''; $tmpvalue = ''; $type = '';
+		foreach ($this->file_text as $text)
+		{
+			$text = trim($text); // trim one line
+			if (!empty($text))
+			{
+				// get Key and Value VCALENDAR:Begin -> Key = VCALENDAR, Value = begin
+				list($key, $value) = $this->retun_key_value($text);
+				//var_dump($text.' -> '.$key.' - '.$value);
 
-                switch ($text) // search special string
-                {
-                    case "BEGIN:VTODO":
-                        $this->todo_count = $this->todo_count + 1; // new to do begin
-                        $type = "VTODO";
-                        break;
+				switch ($text) // search special string
+				{
+					case "BEGIN:VTODO":
+						$this->todo_count = $this->todo_count + 1; // new to do begin
+						$type = "VTODO";
+						break;
 
-                    case "BEGIN:VEVENT":
-                        $this->event_count = $this->event_count + 1; // new event begin
-                        $type = "VEVENT";
-                        break;
+					case "BEGIN:VEVENT":
+						$this->event_count = $this->event_count + 1; // new event begin
+						$type = "VEVENT";
+						break;
 
-                    case "BEGIN:VFREEBUSY":
-                        $this->freebusy_count = $this->freebusy_count + 1; // new event begin
-                        $type = "VFREEBUSY";
-                        break;
+					case "BEGIN:VFREEBUSY":
+						$this->freebusy_count = $this->freebusy_count + 1; // new event begin
+						$type = "VFREEBUSY";
+						break;
 
-                    case "BEGIN:VCALENDAR": // all other special string
-                    case "BEGIN:DAYLIGHT":
-                    case "BEGIN:VTIMEZONE":
-                    case "BEGIN:STANDARD":
-                        $type = $value; // save array under value key
-                        break;
+					case "BEGIN:VCALENDAR": // all other special string
+					case "BEGIN:DAYLIGHT":
+					case "BEGIN:VTIMEZONE":
+					case "BEGIN:STANDARD":
+						$type = $value; // save array under value key
+						break;
 
-                    case "END:VTODO": // end special text - goto VCALENDAR key
-                    case "END:VEVENT":
-                    case "END:VFREEBUSY":
+					case "END:VTODO": // end special text - goto VCALENDAR key
+					case "END:VEVENT":
+					case "END:VFREEBUSY":
 
-                    case "END:VCALENDAR":
-                    case "END:DAYLIGHT":
-                    case "END:VTIMEZONE":
-                    case "END:STANDARD":
-                        $type = "VCALENDAR";
-                        break;
+					case "END:VCALENDAR":
+					case "END:DAYLIGHT":
+					case "END:VTIMEZONE":
+					case "END:STANDARD":
+						$type = "VCALENDAR";
+						break;
 
-                    // Manage VALARM that are inside a VEVENT to avoid fields of VALARM to overwrites fields of VEVENT
-                    case "BEGIN:VALARM":
-                        $insidealarm = 1;
-                        break;
-                    case "END:VALARM":
-                        $insidealarm = 0;
-                        break;
+					// Manage VALARM that are inside a VEVENT to avoid fields of VALARM to overwrites fields of VEVENT
+					case "BEGIN:VALARM":
+						$insidealarm = 1;
+						break;
+					case "END:VALARM":
+						$insidealarm = 0;
+						break;
 
-                    default: // no special string (SUMMARY, DESCRIPTION, ...)
-                    	if ($tmpvalue)
+					default: // no special string (SUMMARY, DESCRIPTION, ...)
+						if ($tmpvalue)
 						{
 							$tmpvalue .= $text;
 							if (!preg_match('/=$/', $text))	// No more lines
@@ -180,96 +180,96 @@ class ICal
 								$tmpvalue = '';
 							}
 						} elseif (preg_match('/^ENCODING=QUOTED-PRINTABLE:/i', $value))
-                    	{
-                    		if (preg_match('/=$/', $value))
-                    		{
-                    			$tmpkey = $key;
-                    			$tmpvalue = $tmpvalue.preg_replace('/=$/', "", $value); // We must wait to have next line to have complete message
-                    		} else {
-                    			$value = quotedPrintDecode(preg_replace('/^ENCODING=QUOTED-PRINTABLE:/i', '', $tmpvalue.$value));
-                    		}
-                    	}                    	//$value=quotedPrintDecode($tmpvalue.$value);
-                    	if (!$insidealarm && !$tmpkey) $this->add_to_array($type, $key, $value); // add to array
-                        break;
-                }
-            }
-        }
+						{
+							if (preg_match('/=$/', $value))
+							{
+								$tmpkey = $key;
+								$tmpvalue = $tmpvalue.preg_replace('/=$/', "", $value); // We must wait to have next line to have complete message
+							} else {
+								$value = quotedPrintDecode(preg_replace('/^ENCODING=QUOTED-PRINTABLE:/i', '', $tmpvalue.$value));
+							}
+						}                    	//$value=quotedPrintDecode($tmpvalue.$value);
+						if (!$insidealarm && !$tmpkey) $this->add_to_array($type, $key, $value); // add to array
+						break;
+				}
+			}
+		}
 
-        //var_dump($this->cal);
-        return $this->cal;
-    }
+		//var_dump($this->cal);
+		return $this->cal;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * Add to $this->ical array one value and key.
-     *
-     * @param 	string 	$type		Type ('VTODO', 'VEVENT', 'VFREEBUSY', 'VCALENDAR'...)
-     * @param 	string 	$key		Key	('DTSTART', ...). Note: Field is never 'DTSTART;TZID=...' because ';...' was before removed and added as another property
-     * @param 	string 	$value		Value
-     * @return	void
-     */
-    public function add_to_array($type, $key, $value)
-    {
-        // phpcs:enable
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Add to $this->ical array one value and key.
+	 *
+	 * @param 	string 	$type		Type ('VTODO', 'VEVENT', 'VFREEBUSY', 'VCALENDAR'...)
+	 * @param 	string 	$key		Key	('DTSTART', ...). Note: Field is never 'DTSTART;TZID=...' because ';...' was before removed and added as another property
+	 * @param 	string 	$value		Value
+	 * @return	void
+	 */
+	public function add_to_array($type, $key, $value)
+	{
+		// phpcs:enable
 
-        //print 'type='.$type.' key='.$key.' value='.$value.'<br>'."\n";
+		//print 'type='.$type.' key='.$key.' value='.$value.'<br>'."\n";
 
-        if (empty($key))
-        {
-            $key = $this->last_key;
-            switch ($type)
-            {
-                case 'VEVENT': $value = $this->cal[$type][$this->event_count][$key].$value; break;
-                case 'VFREEBUSY': $value = $this->cal[$type][$this->freebusy_count][$key].$value; break;
-                case 'VTODO': $value = $this->cal[$type][$this->todo_count][$key].$value; break;
-            }
-        }
+		if (empty($key))
+		{
+			$key = $this->last_key;
+			switch ($type)
+			{
+				case 'VEVENT': $value = $this->cal[$type][$this->event_count][$key].$value; break;
+				case 'VFREEBUSY': $value = $this->cal[$type][$this->freebusy_count][$key].$value; break;
+				case 'VTODO': $value = $this->cal[$type][$this->todo_count][$key].$value; break;
+			}
+		}
 
-        if (($key == "DTSTAMP") || ($key == "LAST-MODIFIED") || ($key == "CREATED")) $value = $this->ical_date_to_unix($value);
-        //if ($key == "RRULE" ) $value = $this->ical_rrule($value);
+		if (($key == "DTSTAMP") || ($key == "LAST-MODIFIED") || ($key == "CREATED")) $value = $this->ical_date_to_unix($value);
+		//if ($key == "RRULE" ) $value = $this->ical_rrule($value);
 
-        if (stristr($key, "DTSTART") || stristr($key, "DTEND") || stristr($key, "DTSTART;VALUE=DATE") || stristr($key, "DTEND;VALUE=DATE"))
-        {
-        	if (stristr($key, "DTSTART;VALUE=DATE") || stristr($key, "DTEND;VALUE=DATE"))
-        	{
-        		list($key, $value) = array($key, $value);
-        	} else {
-        		list($key, $value) = $this->ical_dt_date($key, $value);
-        	}
-        }
+		if (stristr($key, "DTSTART") || stristr($key, "DTEND") || stristr($key, "DTSTART;VALUE=DATE") || stristr($key, "DTEND;VALUE=DATE"))
+		{
+			if (stristr($key, "DTSTART;VALUE=DATE") || stristr($key, "DTEND;VALUE=DATE"))
+			{
+				list($key, $value) = array($key, $value);
+			} else {
+				list($key, $value) = $this->ical_dt_date($key, $value);
+			}
+		}
 
-        switch ($type)
-        {
-            case "VTODO":
-                $this->cal[$type][$this->todo_count][$key] = $value;
-                break;
+		switch ($type)
+		{
+			case "VTODO":
+				$this->cal[$type][$this->todo_count][$key] = $value;
+				break;
 
-            case "VEVENT":
-                $this->cal[$type][$this->event_count][$key] = $value;
-                break;
+			case "VEVENT":
+				$this->cal[$type][$this->event_count][$key] = $value;
+				break;
 
-            case "VFREEBUSY":
-                $this->cal[$type][$this->freebusy_count][$key] = $value;
-                break;
+			case "VFREEBUSY":
+				$this->cal[$type][$this->freebusy_count][$key] = $value;
+				break;
 
-            default:
-                $this->cal[$type][$key] = $value;
-                break;
-        }
-        $this->last_key = $key;
-    }
+			default:
+				$this->cal[$type][$key] = $value;
+				break;
+		}
+		$this->last_key = $key;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * Parse text "XXXX:value text some with : " and return array($key = "XXXX", $value="value");
-     *
-     * @param 	string 	$text	Text
-     * @return 	array
-     */
-    public function retun_key_value($text)
-    {
-        // phpcs:enable
-        /*
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Parse text "XXXX:value text some with : " and return array($key = "XXXX", $value="value");
+	 *
+	 * @param 	string 	$text	Text
+	 * @return 	array
+	 */
+	public function retun_key_value($text)
+	{
+		// phpcs:enable
+		/*
         preg_match("/([^:]+)[:]([\w\W]+)/", $text, $matches);
 
         if (empty($matches))
@@ -281,173 +281,173 @@ class ICal
             $matches = array_splice($matches, 1, 2);
             return $matches;
         }*/
-        return explode(':', $text, 2);
-    }
+		return explode(':', $text, 2);
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * Parse RRULE  return array
-     *
-     * @param 	string 	$value	string
-     * @return 	array
-     */
-    public function ical_rrule($value)
-    {
-        // phpcs:enable
-        $result = array();
-        $rrule = explode(';', $value);
-        foreach ($rrule as $line)
-        {
-            $rcontent = explode('=', $line);
-            $result[$rcontent[0]] = $rcontent[1];
-        }
-        return $result;
-    }
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Parse RRULE  return array
+	 *
+	 * @param 	string 	$value	string
+	 * @return 	array
+	 */
+	public function ical_rrule($value)
+	{
+		// phpcs:enable
+		$result = array();
+		$rrule = explode(';', $value);
+		foreach ($rrule as $line)
+		{
+			$rcontent = explode('=', $line);
+			$result[$rcontent[0]] = $rcontent[1];
+		}
+		return $result;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * Return Unix time from ical date time fomrat (YYYYMMDD[T]HHMMSS[Z] or YYYYMMDD[T]HHMMSS)
-     *
-     * @param 	string		$ical_date		String date
-     * @return 	int
-     */
-    public function ical_date_to_unix($ical_date)
-    {
-        // phpcs:enable
-        $ical_date = str_replace('T', '', $ical_date);
-        $ical_date = str_replace('Z', '', $ical_date);
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Return Unix time from ical date time fomrat (YYYYMMDD[T]HHMMSS[Z] or YYYYMMDD[T]HHMMSS)
+	 *
+	 * @param 	string		$ical_date		String date
+	 * @return 	int
+	 */
+	public function ical_date_to_unix($ical_date)
+	{
+		// phpcs:enable
+		$ical_date = str_replace('T', '', $ical_date);
+		$ical_date = str_replace('Z', '', $ical_date);
 
-        $ntime = 0;
-        // TIME LIMITED EVENT
-        if (preg_match('/([0-9]{4})([0-9]{2})([0-9]{2})([0-9]{0,2})([0-9]{0,2})([0-9]{0,2})/', $ical_date, $date))
-            $ntime = dol_mktime($date[4], $date[5], $date[6], $date[2], $date[3], $date[1], true);
+		$ntime = 0;
+		// TIME LIMITED EVENT
+		if (preg_match('/([0-9]{4})([0-9]{2})([0-9]{2})([0-9]{0,2})([0-9]{0,2})([0-9]{0,2})/', $ical_date, $date))
+			$ntime = dol_mktime($date[4], $date[5], $date[6], $date[2], $date[3], $date[1], true);
 
-        //if (empty($date[4])) print 'Error bad date: '.$ical_date.' - date1='.$date[1];
-        //print dol_print_date($ntime,'dayhour');exit;
-        return $ntime; // ntime is a GTM time
-    }
+		//if (empty($date[4])) print 'Error bad date: '.$ical_date.' - date1='.$date[1];
+		//print dol_print_date($ntime,'dayhour');exit;
+		return $ntime; // ntime is a GTM time
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * Return unix date from iCal date format
-     *
-     * @param 	string 		$key			Key
-     * @param 	string 		$value			Value
-     * @return 	array
-     */
-    public function ical_dt_date($key, $value)
-    {
-        // phpcs:enable
-        $return_value = array();
-        $value = $this->ical_date_to_unix($value);
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Return unix date from iCal date format
+	 *
+	 * @param 	string 		$key			Key
+	 * @param 	string 		$value			Value
+	 * @return 	array
+	 */
+	public function ical_dt_date($key, $value)
+	{
+		// phpcs:enable
+		$return_value = array();
+		$value = $this->ical_date_to_unix($value);
 
-        // Analyse TZID
-        $temp = explode(";", $key);
+		// Analyse TZID
+		$temp = explode(";", $key);
 
-        if (empty($temp[1])) // not TZID
-        {
-            $value = str_replace('T', '', $value);
-            return array($key, $value);
-        }
+		if (empty($temp[1])) // not TZID
+		{
+			$value = str_replace('T', '', $value);
+			return array($key, $value);
+		}
 
-        $key = $temp[0];
-        $temp = explode("=", $temp[1]);
-        $return_value[$temp[0]] = $temp[1];
-        $return_value['unixtime'] = $value;
+		$key = $temp[0];
+		$temp = explode("=", $temp[1]);
+		$return_value[$temp[0]] = $temp[1];
+		$return_value['unixtime'] = $value;
 
-        return array($key, $return_value);
-    }
+		return array($key, $return_value);
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * Return sorted eventlist as array or false if calendar is empty
-     *
-     * @return array|false
-     */
-    public function get_sort_event_list()
-    {
-        // phpcs:enable
-        $temp = $this->get_event_list();
-        if (!empty($temp))
-        {
-            usort($temp, array(&$this, "ical_dtstart_compare"));
-            return $temp;
-        } else {
-            return false;
-        }
-    }
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Return sorted eventlist as array or false if calendar is empty
+	 *
+	 * @return array|false
+	 */
+	public function get_sort_event_list()
+	{
+		// phpcs:enable
+		$temp = $this->get_event_list();
+		if (!empty($temp))
+		{
+			usort($temp, array(&$this, "ical_dtstart_compare"));
+			return $temp;
+		} else {
+			return false;
+		}
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * Compare two unix timestamp
-     *
-     * @param 	array 	$a		Operand a
-     * @param 	array 	$b		Operand b
-     * @return 	integer
-     */
-    public function ical_dtstart_compare($a, $b)
-    {
-        // phpcs:enable
-        return strnatcasecmp($a['DTSTART']['unixtime'], $b['DTSTART']['unixtime']);
-    }
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Compare two unix timestamp
+	 *
+	 * @param 	array 	$a		Operand a
+	 * @param 	array 	$b		Operand b
+	 * @return 	integer
+	 */
+	public function ical_dtstart_compare($a, $b)
+	{
+		// phpcs:enable
+		return strnatcasecmp($a['DTSTART']['unixtime'], $b['DTSTART']['unixtime']);
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * Return eventlist array (not sorted eventlist array)
-     *
-     * @return array
-     */
-    public function get_event_list()
-    {
-        // phpcs:enable
-        return (!empty($this->cal['VEVENT']) ? $this->cal['VEVENT'] : '');
-    }
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Return eventlist array (not sorted eventlist array)
+	 *
+	 * @return array
+	 */
+	public function get_event_list()
+	{
+		// phpcs:enable
+		return (!empty($this->cal['VEVENT']) ? $this->cal['VEVENT'] : '');
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * Return eventlist array (not sort eventlist array)
-     *
-     * @return array
-     */
-    public function get_freebusy_list()
-    {
-        // phpcs:enable
-        return $this->cal['VFREEBUSY'];
-    }
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Return eventlist array (not sort eventlist array)
+	 *
+	 * @return array
+	 */
+	public function get_freebusy_list()
+	{
+		// phpcs:enable
+		return $this->cal['VFREEBUSY'];
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * Return to do array (not sorted todo array)
-     *
-     * @return array
-     */
-    public function get_todo_list()
-    {
-        // phpcs:enable
-        return $this->cal['VTODO'];
-    }
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Return to do array (not sorted todo array)
+	 *
+	 * @return array
+	 */
+	public function get_todo_list()
+	{
+		// phpcs:enable
+		return $this->cal['VTODO'];
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * Return base calendar data
-     *
-     * @return array
-     */
-    public function get_calender_data()
-    {
-        // phpcs:enable
-        return $this->cal['VCALENDAR'];
-    }
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Return base calendar data
+	 *
+	 * @return array
+	 */
+	public function get_calender_data()
+	{
+		// phpcs:enable
+		return $this->cal['VCALENDAR'];
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * Return array with all data
-     *
-     * @return array
-     */
-    public function get_all_data()
-    {
-        // phpcs:enable
-        return $this->cal;
-    }
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Return array with all data
+	 *
+	 * @return array
+	 */
+	public function get_all_data()
+	{
+		// phpcs:enable
+		return $this->cal;
+	}
 }
diff --git a/htdocs/comm/action/document.php b/htdocs/comm/action/document.php
index 0c3ff22801a..613ac76380e 100644
--- a/htdocs/comm/action/document.php
+++ b/htdocs/comm/action/document.php
@@ -254,7 +254,7 @@ if ($object->id > 0)
 
 	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 
 	$modulepart = 'actions';
diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index 65123586e89..313aaa0e2e4 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -417,7 +417,7 @@ print '<input type="hidden" name="token" value="'.newToken().'">';
 
 //print dol_get_fiche_head($head, $tabactive, $langs->trans('Agenda'), 0, 'action');
 //print_actions_filter($form, $canedit, $status, $year, $month, $day, $showbirthday, 0, $filtert, 0, $pid, $socid, $action, $listofextcals, $actioncode, $usergroup, '', $resourceid);
-//dol_fiche_end();
+//print dol_get_fiche_end();
 
 $viewmode = '';
 $viewmode .= '<a class="btnTitle reposition" href="'.DOL_URL_ROOT.'/comm/action/list.php?action=show_list&restore_lastsearch_values=1">';
@@ -1265,7 +1265,7 @@ if (empty($action) || $action == 'show_month')      // View by month
 				/* Show days before the beginning of the current month (previous month)  */
 				$style = 'cal_other_month cal_past';
 				if ($iter_day == 6) $style .= ' cal_other_month_right';
-				echo '  <td class="'.$style.' nowrap" width="14%" valign="top">';
+				echo '  <td class="'.$style.' nowrap tdtop" width="14%">';
 				show_day_events($db, $max_day_in_prev_month + $tmpday, $prev_month, $prev_year, $month, $style, $eventarray, $maxprint, $maxnbofchar, $newparam);
 				echo "  </td>\n";
 			} elseif ($tmpday <= $max_day_in_month) {
@@ -1278,14 +1278,14 @@ if (empty($action) || $action == 'show_month')      // View by month
 				if ($today) $style = 'cal_today';
 				if ($curtime < $todaytms) $style .= ' cal_past';
 				//var_dump($todayarray['mday']."==".$tmpday." && ".$todayarray['mon']."==".$month." && ".$todayarray['year']."==".$year.' -> '.$style);
-				echo '  <td class="'.$style.' nowrap" width="14%" valign="top">';
+				echo '  <td class="'.$style.' nowrap tdtop" width="14%">';
 				show_day_events($db, $tmpday, $month, $year, $month, $style, $eventarray, $maxprint, $maxnbofchar, $newparam);
-				echo "  </td>\n";
+				echo "</td>\n";
 			} else {
 				/* Show days after the current month (next month) */
 				$style = 'cal_other_month';
 				if ($iter_day == 6) $style .= ' cal_other_month_right';
-				echo '  <td class="'.$style.' nowrap" width="14%" valign="top">';
+				echo '  <td class="'.$style.' nowrap tdtop" width="14%">';
 				show_day_events($db, $tmpday - $max_day_in_month, $next_month, $next_year, $month, $style, $eventarray, $maxprint, $maxnbofchar, $newparam);
 				echo "</td>\n";
 			}
@@ -1477,28 +1477,30 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
 
 	print "\n";
 
-	// Line with title of day
 	$curtime = dol_mktime(0, 0, 0, $month, $day, $year);
-	print '<div id="dayevent_'.$dateint.'" class="dayevent tagtable centpercent nobordernopadding">'."\n";
+	$urltoshow = DOL_URL_ROOT.'/comm/action/index.php?action=show_day&day='.str_pad($day, 2, "0", STR_PAD_LEFT).'&month='.str_pad($month, 2, "0", STR_PAD_LEFT).'&year='.$year.$newparam;
+	$urltocreate = '';
+	if ($user->rights->agenda->myactions->create || $user->rights->agenda->allactions->create)
+	{
+		$newparam .= '&month='.str_pad($month, 2, "0", STR_PAD_LEFT).'&year='.$year;
+		$hourminsec = '100000';
+		$urltocreate = DOL_URL_ROOT.'/comm/action/card.php?action=create&datep='.sprintf("%04d%02d%02d", $year, $month, $day).$hourminsec.'&backtopage='.urlencode($_SERVER["PHP_SELF"].($newparam ? '?'.$newparam : ''));
+	}
+
+	// Line with title of day
+	print '<div id="dayevent_'.$dateint.'" class="cursorpointer dayevent tagtable centpercent nobordernopadding" onclick="window.location=\''.$urltocreate.'\';">'."\n";
 
 	if ($nonew <= 0)
 	{
-		print '<div class="tagtr"><div class="nowrap float">';
-		print '<a class="dayevent-aday" style="color: #666" href="'.DOL_URL_ROOT.'/comm/action/index.php?';
-		print 'action=show_day&day='.str_pad($day, 2, "0", STR_PAD_LEFT).'&month='.str_pad($month, 2, "0", STR_PAD_LEFT).'&year='.$year;
-		print $newparam;
-		print '">';
+		print '<div class="tagtr"><div class="nowrap tagtd">';
+		print '<a class="dayevent-aday" style="color: #666" href="'.$urltoshow.'">';
 		if ($showinfo) print dol_print_date($curtime, 'daytextshort');
 		else print dol_print_date($curtime, '%d');
 		print '</a>';
-		print '</div><div class="floatright nowrap">';
+		print '</div><div class="nowrap tagtd right">';
 		if ($user->rights->agenda->myactions->create || $user->rights->agenda->allactions->create)
 		{
-			$newparam .= '&month='.str_pad($month, 2, "0", STR_PAD_LEFT).'&year='.$year;
-
-			//$param='month='.$monthshown.'&year='.$year;
-			$hourminsec = '100000';
-			print '<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&datep='.sprintf("%04d%02d%02d", $year, $month, $day).$hourminsec.'&backtopage='.urlencode($_SERVER["PHP_SELF"].($newparam ? '?'.$newparam : '')).'">';
+			print '<a class="cursoradd" href="'.$urltocreate.'">'; // Explicit link, usefull for nojs interfaces
 			print img_picto($langs->trans("NewAction"), 'edit_add.png');
 			print '</a>';
 		}
@@ -1838,7 +1840,9 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
 			break;
 		}
 	}
-	if (!$i) print '&nbsp;';
+	if (!$i) {	// No events
+		print '&nbsp;';
+	}
 
 	if (!empty($conf->global->MAIN_JS_SWITCH_AGENDA) && $i > $maxprint && $maxprint)
 	{
diff --git a/htdocs/comm/action/info.php b/htdocs/comm/action/info.php
index 813e3240b7a..40787abb8c3 100644
--- a/htdocs/comm/action/info.php
+++ b/htdocs/comm/action/info.php
@@ -29,8 +29,8 @@ require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/comm/action/class/cactioncomm.class.php';
 require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
 if (!empty($conf->projet->enabled)) {
-    require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
-    require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 }
 
 // Load translation files required by the page
@@ -41,8 +41,8 @@ $id = GETPOST('id', 'int');
 // Security check
 if ($user->socid > 0)
 {
-    $action = '';
-    $socid = $user->socid;
+	$action = '';
+	$socid = $user->socid;
 }
 
 $result = restrictedArea($user, 'agenda', $id, 'actioncomm&societe', 'myactions|allactions', 'fk_soc', 'id');
@@ -86,19 +86,19 @@ $morehtmlref = '<div class="refidno">';
 // 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>';
 
@@ -112,7 +112,7 @@ print '<table width="100%"><tr><td>';
 dol_print_object_info($object);
 print '</td></tr></table>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // End of page
 llxFooter();
diff --git a/htdocs/comm/action/list.php b/htdocs/comm/action/list.php
index ed96a3a2d4f..a9e365534f3 100644
--- a/htdocs/comm/action/list.php
+++ b/htdocs/comm/action/list.php
@@ -57,10 +57,10 @@ $confirm = GETPOST('confirm', 'alpha');
 // Set actioncode (this code must be same for setting actioncode into peruser, listacton and index)
 if (GETPOST('search_actioncode', 'array'))
 {
-    $actioncode = GETPOST('search_actioncode', 'array', 3);
-    if (!count($actioncode)) $actioncode = '0';
+	$actioncode = GETPOST('search_actioncode', 'array', 3);
+	if (!count($actioncode)) $actioncode = '0';
 } else {
-    $actioncode = GETPOST("search_actioncode", "alpha", 3) ?GETPOST("search_actioncode", "alpha", 3) : (GETPOST("search_actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE));
+	$actioncode = GETPOST("search_actioncode", "alpha", 3) ?GETPOST("search_actioncode", "alpha", 3) : (GETPOST("search_actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE));
 }
 if ($actioncode == '' && empty($actioncodearray)) $actioncode = (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE);
 $search_id = GETPOST('search_id', 'alpha');
@@ -166,13 +166,13 @@ if (GETPOST('cancel', 'alpha'))
 if (GETPOST("viewcal") || GETPOST("viewweek") || GETPOST("viewday"))
 {
 	$param = '';
-    if (is_array($_POST))
-    {
-    	foreach ($_POST as $key => $val)
-    	{
-    		$param .= '&'.$key.'='.urlencode($val);
-    	}
-    }
+	if (is_array($_POST))
+	{
+		foreach ($_POST as $key => $val)
+		{
+			$param .= '&'.$key.'='.urlencode($val);
+		}
+	}
 	//print $param;
 	header("Location: ".DOL_URL_ROOT.'/comm/action/index.php?'.$param);
 	exit;
@@ -187,15 +187,15 @@ include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 // Purge search criteria
 if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
 {
-    //$actioncode='';
-    $search_id = '';
+	//$actioncode='';
+	$search_id = '';
 	$search_title = '';
-    $search_note = '';
-    $datestart = '';
-    $dateend = '';
-    $search_status = '';
+	$search_note = '';
+	$datestart = '';
+	$dateend = '';
+	$search_status = '';
 	$toselect = '';
-    $search_array_options = array();
+	$search_array_options = array();
 }
 
 if (empty($reshook) && !empty($massaction))
@@ -341,26 +341,26 @@ $sql .= ' AND a.entity IN ('.getEntity('agenda').')';
 // Condition on actioncode
 if (!empty($actioncode))
 {
-    if (empty($conf->global->AGENDA_USE_EVENT_TYPE))
-    {
-        if ($actioncode == 'AC_NON_AUTO') $sql .= " AND c.type != 'systemauto'";
-        elseif ($actioncode == 'AC_ALL_AUTO') $sql .= " AND c.type = 'systemauto'";
-        else {
-            if ($actioncode == 'AC_OTH') $sql .= " AND c.type != 'systemauto'";
-            if ($actioncode == 'AC_OTH_AUTO') $sql .= " AND c.type = 'systemauto'";
-        }
-    } else {
-        if ($actioncode == 'AC_NON_AUTO') $sql .= " AND c.type != 'systemauto'";
-        elseif ($actioncode == 'AC_ALL_AUTO') $sql .= " AND c.type = 'systemauto'";
-        else {
-            if (is_array($actioncode))
-            {
-                $sql .= " AND c.code IN ('".implode("','", $actioncode)."')";
-            } else {
-                $sql .= " AND c.code IN ('".implode("','", explode(',', $actioncode))."')";
-            }
-        }
-    }
+	if (empty($conf->global->AGENDA_USE_EVENT_TYPE))
+	{
+		if ($actioncode == 'AC_NON_AUTO') $sql .= " AND c.type != 'systemauto'";
+		elseif ($actioncode == 'AC_ALL_AUTO') $sql .= " AND c.type = 'systemauto'";
+		else {
+			if ($actioncode == 'AC_OTH') $sql .= " AND c.type != 'systemauto'";
+			if ($actioncode == 'AC_OTH_AUTO') $sql .= " AND c.type = 'systemauto'";
+		}
+	} else {
+		if ($actioncode == 'AC_NON_AUTO') $sql .= " AND c.type != 'systemauto'";
+		elseif ($actioncode == 'AC_ALL_AUTO') $sql .= " AND c.type = 'systemauto'";
+		else {
+			if (is_array($actioncode))
+			{
+				$sql .= " AND c.code IN ('".implode("','", $actioncode)."')";
+			} else {
+				$sql .= " AND c.code IN ('".implode("','", explode(',', $actioncode))."')";
+			}
+		}
+	}
 }
 if ($resourceid > 0) $sql .= " AND r.element_type = 'action' AND r.element_id = a.id AND r.resource_id = ".$db->escape($resourceid);
 if ($pid) $sql .= " AND a.fk_project=".$db->escape($pid);
@@ -381,10 +381,10 @@ if ($search_note) $sql .= natural_search('a.note', $search_note);
 // We must filter on assignement table
 if ($filtert > 0 || $usergroup > 0)
 {
-    $sql .= " AND (";
-    if ($filtert > 0) $sql .= "(ar.fk_element = ".$filtert." OR (ar.fk_element IS NULL AND a.fk_user_action=".$filtert."))"; // The OR is for backward compatibility
-    if ($usergroup > 0) $sql .= ($filtert > 0 ? " OR " : "")." ugu.fk_usergroup = ".$usergroup;
-    $sql .= ")";
+	$sql .= " AND (";
+	if ($filtert > 0) $sql .= "(ar.fk_element = ".$filtert." OR (ar.fk_element IS NULL AND a.fk_user_action=".$filtert."))"; // The OR is for backward compatibility
+	if ($usergroup > 0) $sql .= ($filtert > 0 ? " OR " : "")." ugu.fk_usergroup = ".$usergroup;
+	$sql .= ")";
 }
 
 // The second or of next test is to take event with no end date (we suppose duration is 1 hour in such case)
@@ -405,13 +405,13 @@ $sql .= $db->order($sortfield, $sortorder);
 $nbtotalofrecords = '';
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
-    $result = $db->query($sql);
-    $nbtotalofrecords = $db->num_rows($result);
-    if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
-    {
-    	$page = 0;
-    	$offset = 0;
-    }
+	$result = $db->query($sql);
+	$nbtotalofrecords = $db->num_rows($result);
+	if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+	{
+		$page = 0;
+		$offset = 0;
+	}
 }
 
 $sql .= $db->plimit($limit + 1, $offset);
@@ -452,13 +452,13 @@ if ($resql)
 	if ($showbirthday)    $nav .= '<input type="hidden" name="search_showbirthday" value="1">';
 	print $nav;
 
-    //print dol_get_fiche_head($head, $tabactive, $langs->trans('Agenda'), 0, 'action');
-    //print_actions_filter($form, $canedit, $search_status, $year, $month, $day, $showbirthday, 0, $filtert, 0, $pid, $socid, $action, -1, $actioncode, $usergroup, '', $resourceid);
-    //dol_fiche_end();
+	//print dol_get_fiche_head($head, $tabactive, $langs->trans('Agenda'), 0, 'action');
+	//print_actions_filter($form, $canedit, $search_status, $year, $month, $day, $showbirthday, 0, $filtert, 0, $pid, $socid, $action, -1, $actioncode, $usergroup, '', $resourceid);
+	//print dol_get_fiche_end();
 
-    // Add link to show birthdays
-    $link = '';
-    /*
+	// Add link to show birthdays
+	$link = '';
+	/*
     if (empty($conf->use_javascript_ajax))
     {
         $newparam=$param;   // newparam is for birthday links
@@ -473,49 +473,49 @@ if ($resql)
     }
     */
 
-    $s = $newtitle;
+	$s = $newtitle;
 
 	// Calendars from hooks
-    $parameters = array(); $object = null;
+	$parameters = array(); $object = null;
 	$reshook = $hookmanager->executeHooks('addCalendarChoice', $parameters, $object, $action);
-    if (empty($reshook))
-    {
-		$s .= $hookmanager->resPrint;
-    } elseif ($reshook > 1)
+	if (empty($reshook))
 	{
-    	$s = $hookmanager->resPrint;
-    }
+		$s .= $hookmanager->resPrint;
+	} elseif ($reshook > 1)
+	{
+		$s = $hookmanager->resPrint;
+	}
 
-    $viewmode = '';
-    $viewmode .= '<a class="btnTitle btnTitleSelected reposition" href="'.DOL_URL_ROOT.'/comm/action/list.php?action=show_list&restore_lastsearch_values=1">';
-    //$viewmode .= '<span class="fa paddingleft imgforviewmode valignmiddle btnTitle-icon">';
-    $viewmode .= img_picto($langs->trans("List"), 'object_list-alt', 'class="pictoactionview block"');
-    //$viewmode .= '</span>';
-    $viewmode .= '<span class="valignmiddle text-plus-circle btnTitle-label hideonsmartphone">'.$langs->trans("ViewList").'</span></a>';
+	$viewmode = '';
+	$viewmode .= '<a class="btnTitle btnTitleSelected reposition" href="'.DOL_URL_ROOT.'/comm/action/list.php?action=show_list&restore_lastsearch_values=1">';
+	//$viewmode .= '<span class="fa paddingleft imgforviewmode valignmiddle btnTitle-icon">';
+	$viewmode .= img_picto($langs->trans("List"), 'object_list-alt', 'class="pictoactionview block"');
+	//$viewmode .= '</span>';
+	$viewmode .= '<span class="valignmiddle text-plus-circle btnTitle-label hideonsmartphone">'.$langs->trans("ViewList").'</span></a>';
 
-    $viewmode .= '<a class="btnTitle reposition" href="'.DOL_URL_ROOT.'/comm/action/index.php?action=show_month&year='.dol_print_date($object->datep, '%Y').'&month='.dol_print_date($object->datep, '%m').'&day='.dol_print_date($object->datep, '%d').'">';
-    //$viewmode .= '<span class="fa paddingleft imgforviewmode valignmiddle btnTitle-icon">';
-    $viewmode .= img_picto($langs->trans("ViewCal"), 'object_calendar', 'class="pictoactionview block"');
-    //$viewmode .= '</span>';
-    $viewmode .= '<span class="valignmiddle text-plus-circle btnTitle-label hideonsmartphone">'.$langs->trans("ViewCal").'</span></a>';
+	$viewmode .= '<a class="btnTitle reposition" href="'.DOL_URL_ROOT.'/comm/action/index.php?action=show_month&year='.dol_print_date($object->datep, '%Y').'&month='.dol_print_date($object->datep, '%m').'&day='.dol_print_date($object->datep, '%d').'">';
+	//$viewmode .= '<span class="fa paddingleft imgforviewmode valignmiddle btnTitle-icon">';
+	$viewmode .= img_picto($langs->trans("ViewCal"), 'object_calendar', 'class="pictoactionview block"');
+	//$viewmode .= '</span>';
+	$viewmode .= '<span class="valignmiddle text-plus-circle btnTitle-label hideonsmartphone">'.$langs->trans("ViewCal").'</span></a>';
 
-    $viewmode .= '<a class="btnTitle reposition" href="'.DOL_URL_ROOT.'/comm/action/index.php?action=show_week&year='.dol_print_date($object->datep, '%Y').'&month='.dol_print_date($object->datep, '%m').'&day='.dol_print_date($object->datep, '%d').'">';
-    //$viewmode .= '<span class="fa paddingleft imgforviewmode valignmiddle btnTitle-icon">';
-    $viewmode .= img_picto($langs->trans("ViewWeek"), 'object_calendarweek', 'class="pictoactionview block"');
-    //$viewmode .= '</span>';
-    $viewmode .= '<span class="valignmiddle text-plus-circle btnTitle-label hideonsmartphone">'.$langs->trans("ViewWeek").'</span></a>';
+	$viewmode .= '<a class="btnTitle reposition" href="'.DOL_URL_ROOT.'/comm/action/index.php?action=show_week&year='.dol_print_date($object->datep, '%Y').'&month='.dol_print_date($object->datep, '%m').'&day='.dol_print_date($object->datep, '%d').'">';
+	//$viewmode .= '<span class="fa paddingleft imgforviewmode valignmiddle btnTitle-icon">';
+	$viewmode .= img_picto($langs->trans("ViewWeek"), 'object_calendarweek', 'class="pictoactionview block"');
+	//$viewmode .= '</span>';
+	$viewmode .= '<span class="valignmiddle text-plus-circle btnTitle-label hideonsmartphone">'.$langs->trans("ViewWeek").'</span></a>';
 
-    $viewmode .= '<a class="btnTitle reposition" href="'.DOL_URL_ROOT.'/comm/action/index.php?action=show_day&year='.dol_print_date($object->datep, '%Y').'&month='.dol_print_date($object->datep, '%m').'&day='.dol_print_date($object->datep, '%d').'">';
-    //$viewmode .= '<span class="fa paddingleft imgforviewmode valignmiddle btnTitle-icon">';
-    $viewmode .= img_picto($langs->trans("ViewDay"), 'object_calendarday', 'class="pictoactionview block"');
-    //$viewmode .= '</span>';
-    $viewmode .= '<span class="valignmiddle text-plus-circle btnTitle-label hideonsmartphone">'.$langs->trans("ViewDay").'</span></a>';
+	$viewmode .= '<a class="btnTitle reposition" href="'.DOL_URL_ROOT.'/comm/action/index.php?action=show_day&year='.dol_print_date($object->datep, '%Y').'&month='.dol_print_date($object->datep, '%m').'&day='.dol_print_date($object->datep, '%d').'">';
+	//$viewmode .= '<span class="fa paddingleft imgforviewmode valignmiddle btnTitle-icon">';
+	$viewmode .= img_picto($langs->trans("ViewDay"), 'object_calendarday', 'class="pictoactionview block"');
+	//$viewmode .= '</span>';
+	$viewmode .= '<span class="valignmiddle text-plus-circle btnTitle-label hideonsmartphone">'.$langs->trans("ViewDay").'</span></a>';
 
-    $viewmode .= '<a class="btnTitle reposition marginrightonly" href="'.DOL_URL_ROOT.'/comm/action/peruser.php?action=show_peruser&year='.dol_print_date($object->datep, '%Y').'&month='.dol_print_date($object->datep, '%m').'&day='.dol_print_date($object->datep, '%d').'">';
-    //$viewmode .= '<span class="fa paddingleft imgforviewmode valignmiddle btnTitle-icon">';
-    $viewmode .= img_picto($langs->trans("ViewPerUser"), 'object_calendarperuser', 'class="pictoactionview block"');
-    //$viewmode .= '</span>';
-    $viewmode .= '<span class="valignmiddle text-plus-circle btnTitle-label hideonsmartphone">'.$langs->trans("ViewPerUser").'</span></a>';
+	$viewmode .= '<a class="btnTitle reposition marginrightonly" href="'.DOL_URL_ROOT.'/comm/action/peruser.php?action=show_peruser&year='.dol_print_date($object->datep, '%Y').'&month='.dol_print_date($object->datep, '%m').'&day='.dol_print_date($object->datep, '%d').'">';
+	//$viewmode .= '<span class="fa paddingleft imgforviewmode valignmiddle btnTitle-icon">';
+	$viewmode .= img_picto($langs->trans("ViewPerUser"), 'object_calendarperuser', 'class="pictoactionview block"');
+	//$viewmode .= '</span>';
+	$viewmode .= '<span class="valignmiddle text-plus-circle btnTitle-label hideonsmartphone">'.$langs->trans("ViewPerUser").'</span></a>';
 
 	$viewmode .= '<span class="marginrightonly"></span>';
 
@@ -538,21 +538,21 @@ if ($resql)
 
 	print $s;
 
-    include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
+	include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
-    $moreforfilter = '';
+	$moreforfilter = '';
 
 	$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 	$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
 	if ($massactionbutton) $selectedfields .= $form->showCheckAddButtons('checkforselect', 1);
-    $i = 0;
+	$i = 0;
 
-    print '<div class="liste_titre liste_titre_bydiv centpercent">';
-    print_actions_filter($form, $canedit, $search_status, $year, $month, $day, $showbirthday, 0, $filtert, 0, $pid, $socid, $action, -1, $actioncode, $usergroup, '', $resourceid);
-    print '</div>';
+	print '<div class="liste_titre liste_titre_bydiv centpercent">';
+	print_actions_filter($form, $canedit, $search_status, $year, $month, $day, $showbirthday, 0, $filtert, 0, $pid, $socid, $action, -1, $actioncode, $usergroup, '', $resourceid);
+	print '</div>';
 
-    print '<div class="div-table-responsive">';
-    print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
+	print '<div class="div-table-responsive">';
+	print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 	print '<tr class="liste_titre_filter">';
 	if (!empty($arrayfields['a.id']['checked']))		print '<td class="liste_titre"><input type="text" class="maxwidth50" name="search_id" value="'.$search_id.'"></td>';
@@ -571,8 +571,8 @@ if ($resql)
 		print '</td>';
 	}
 	if (!empty($arrayfields['s.nom']['checked'])) {
-        print '<td class="liste_titre"></td>';
-    }
+		print '<td class="liste_titre"></td>';
+	}
 	if (!empty($arrayfields['a.fk_contact']['checked']))	print '<td class="liste_titre"></td>';
 	if (!empty($arrayfields['a.fk_element']['checked']))	print '<td class="liste_titre"></td>';
 
@@ -588,10 +588,10 @@ if ($resql)
 	if (!empty($arrayfields['a.tms']['checked']))		print '<td class="liste_titre"></td>';
 	if (!empty($arrayfields['a.percent']['checked'])) {
 		print '<td class="liste_titre center">';
-        $formactions->form_select_status_action('formaction', $search_status, 1, 'search_status', 1, 2, 'minwidth100imp maxwidth125');
-    	print ajax_combobox('selectsearch_status');
-    	print '</td>';
-    }
+		$formactions->form_select_status_action('formaction', $search_status, 1, 'search_status', 1, 2, 'minwidth100imp maxwidth125');
+		print ajax_combobox('selectsearch_status');
+		print '</td>';
+	}
 	// Action column
 	print '<td class="liste_titre" align="middle">';
 	$searchpicto = $form->showFilterButtons();
@@ -610,10 +610,10 @@ if ($resql)
 	if (!empty($arrayfields['a.datep2']['checked']))	  print_liste_field_titre($arrayfields['a.datep2']['label'], $_SERVER["PHP_SELF"], "a.datep2", $param, '', 'align="center"', $sortfield, $sortorder);
 	if (!empty($arrayfields['s.nom']['checked']))	      print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER["PHP_SELF"], "s.nom", $param, "", "", $sortfield, $sortorder);
 	if (!empty($arrayfields['a.fk_contact']['checked'])) print_liste_field_titre($arrayfields['a.fk_contact']['label'], $_SERVER["PHP_SELF"], "", $param, "", "", $sortfield, $sortorder);
-    if (!empty($arrayfields['a.fk_element']['checked'])) print_liste_field_titre($arrayfields['a.fk_element']['label'], $_SERVER["PHP_SELF"], "", $param, "", "", $sortfield, $sortorder);
+	if (!empty($arrayfields['a.fk_element']['checked'])) print_liste_field_titre($arrayfields['a.fk_element']['label'], $_SERVER["PHP_SELF"], "", $param, "", "", $sortfield, $sortorder);
 
 	// Extra fields
-    include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 
 	// Hook fields
 	$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
@@ -634,18 +634,18 @@ if ($resql)
 	require_once DOL_DOCUMENT_ROOT.'/comm/action/class/cactioncomm.class.php';
 	$caction = new CActionComm($db);
 	$arraylist = $caction->liste_array(1, 'code', '', (empty($conf->global->AGENDA_USE_EVENT_TYPE) ? 1 : 0), '', 1);
-    $contactListCache = array();
+	$contactListCache = array();
 
 	while ($i < min($num, $limit))
 	{
 		$obj = $db->fetch_object($resql);
 
-        // Discard auto action if option is on
-        if (!empty($conf->global->AGENDA_ALWAYS_HIDE_AUTO) && $obj->type_code == 'AC_OTH_AUTO')
-        {
-        	$i++;
-        	continue;
-        }
+		// Discard auto action if option is on
+		if (!empty($conf->global->AGENDA_ALWAYS_HIDE_AUTO) && $obj->type_code == 'AC_OTH_AUTO')
+		{
+			$i++;
+			continue;
+		}
 
 		$actionstatic->id = $obj->id;
 		$actionstatic->ref = $obj->id;
@@ -771,29 +771,29 @@ if ($resql)
 		if (!empty($arrayfields['a.fk_contact']['checked'])) {
 			print '<td class="tdoverflowmax100">';
 
-            if (!empty($actionstatic->socpeopleassigned))
-            {
-                $contactList = array();
-                foreach ($actionstatic->socpeopleassigned as $socpeopleassigned)
-                {
-                    if (!isset($contactListCache[$socpeopleassigned['id']]))
-                    {
-                        // if no cache found we fetch it
-                        $contact = new Contact($db);
-                        if ($contact->fetch($socpeopleassigned['id']) > 0)
-                        {
-                            $contactListCache[$socpeopleassigned['id']] = $contact->getNomUrl(1, '', 0);
-                            $contactList[] = $contact->getNomUrl(1, '', 0);
-                        }
-                    } else {
-                        // use cache
-                        $contactList[] = $contactListCache[$socpeopleassigned['id']];
-                    }
-                }
-                if (!empty($contactList)) {
-                    print implode(', ', $contactList);
-                }
-            } elseif ($obj->fk_contact > 0) //keep for retrocompatibility with faraway event
+			if (!empty($actionstatic->socpeopleassigned))
+			{
+				$contactList = array();
+				foreach ($actionstatic->socpeopleassigned as $socpeopleassigned)
+				{
+					if (!isset($contactListCache[$socpeopleassigned['id']]))
+					{
+						// if no cache found we fetch it
+						$contact = new Contact($db);
+						if ($contact->fetch($socpeopleassigned['id']) > 0)
+						{
+							$contactListCache[$socpeopleassigned['id']] = $contact->getNomUrl(1, '', 0);
+							$contactList[] = $contact->getNomUrl(1, '', 0);
+						}
+					} else {
+						// use cache
+						$contactList[] = $contactListCache[$socpeopleassigned['id']];
+					}
+				}
+				if (!empty($contactList)) {
+					print implode(', ', $contactList);
+				}
+			} elseif ($obj->fk_contact > 0) //keep for retrocompatibility with faraway event
 			{
 				$contactstatic->id = $obj->fk_contact;
 				$contactstatic->email = $obj->email;
@@ -812,15 +812,15 @@ if ($resql)
 
 		// Linked object
 		if (!empty($arrayfields['a.fk_element']['checked'])) {
-            print '<td class="tdoverflowmax150">';
-            //var_dump($obj->fkelement.' '.$obj->elementtype);
-            if ($obj->fk_element > 0 && !empty($obj->elementtype)) {
-                include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-                print dolGetElementUrl($obj->fk_element, $obj->elementtype, 1);
-            } else {
-                print "&nbsp;";
-            }
-            print '</td>';
+			print '<td class="tdoverflowmax150">';
+			//var_dump($obj->fkelement.' '.$obj->elementtype);
+			if ($obj->fk_element > 0 && !empty($obj->elementtype)) {
+				include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+				print dolGetElementUrl($obj->fk_element, $obj->elementtype, 1);
+			} else {
+				print "&nbsp;";
+			}
+			print '</td>';
 		}
 
 		// Extra fields
@@ -858,7 +858,7 @@ if ($resql)
 		$i++;
 	}
 	print "</table>";
-    print '</div>';
+	print '</div>';
 	print '</form>';
 
 	$db->free($resql);
diff --git a/htdocs/comm/action/pertype.php b/htdocs/comm/action/pertype.php
index f0c1a0d1951..4f292047700 100644
--- a/htdocs/comm/action/pertype.php
+++ b/htdocs/comm/action/pertype.php
@@ -74,7 +74,7 @@ if (!$user->rights->agenda->myactions->read) accessforbidden();
 if (!$user->rights->agenda->allactions->read) $canedit = 0;
 if (!$user->rights->agenda->allactions->read || $filter == 'mine')  // If no permission to see all, we show only affected to me
 {
-    $filtert = $user->id;
+	$filtert = $user->id;
 }
 
 //$action=GETPOST('action','alpha');
@@ -92,10 +92,10 @@ $optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always ''
 // Set actioncode (this code must be same for setting actioncode into peruser, listacton and index)
 if (GETPOST('search_actioncode', 'array'))
 {
-    $actioncode = GETPOST('search_actioncode', 'array', 3);
-    if (!count($actioncode)) $actioncode = '0';
+	$actioncode = GETPOST('search_actioncode', 'array', 3);
+	if (!count($actioncode)) $actioncode = '0';
 } else {
-    $actioncode = GETPOST("search_actioncode", "alpha", 3) ?GETPOST("search_actioncode", "alpha", 3) : (GETPOST("search_actioncode", "alpha") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE));
+	$actioncode = GETPOST("search_actioncode", "alpha", 3) ?GETPOST("search_actioncode", "alpha", 3) : (GETPOST("search_actioncode", "alpha") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE));
 }
 if ($actioncode == '' && empty($actioncodearray)) $actioncode = (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE);
 
@@ -126,16 +126,16 @@ if ($status == '' && !isset($_GET['status']) && !isset($_POST['status'])) $statu
 if (empty($action) && !isset($_GET['action']) && !isset($_POST['action'])) $action = (empty($conf->global->AGENDA_DEFAULT_VIEW) ? 'show_month' : $conf->global->AGENDA_DEFAULT_VIEW);
 
 if (GETPOST('viewcal', 'alpha') && $action != 'show_day' && $action != 'show_week' && $action != 'show_peruser') {
-    $action = 'show_month'; $day = '';
+	$action = 'show_month'; $day = '';
 }                                                   // View by month
 if (GETPOST('viewweek', 'alpha') || $action == 'show_week') {
-    $action = 'show_week'; $week = ($week ? $week : date("W")); $day = ($day ? $day : date("d"));
+	$action = 'show_week'; $week = ($week ? $week : date("W")); $day = ($day ? $day : date("d"));
 }  // View by week
 if (GETPOST('viewday', 'alpha') || $action == 'show_day') {
-    $action = 'show_day'; $day = ($day ? $day : date("d"));
+	$action = 'show_day'; $day = ($day ? $day : date("d"));
 }                                  // View by day
 if (GETPOST('viewyear', 'alpha') || $action == 'show_year') {
-    $action = 'show_year';
+	$action = 'show_year';
 }                                  // View by year
 
 // Load translation files required by the page
@@ -151,13 +151,13 @@ $hookmanager->initHooks(array('agenda'));
 
 if ($action == 'delete_action')
 {
-    $event = new ActionComm($db);
-    $event->fetch($actionid);
-    $event->fetch_optionals();
-    $event->fetch_userassigned();
-    $event->oldcopy = clone $event;
+	$event = new ActionComm($db);
+	$event->fetch($actionid);
+	$event->fetch_optionals();
+	$event->fetch_userassigned();
+	$event->oldcopy = clone $event;
 
-    $result = $event->delete();
+	$result = $event->delete();
 }
 
 
@@ -317,8 +317,8 @@ if ($conf->use_javascript_ajax)
 	$s .= 'jQuery(".family_birthday").toggle();'."\n";
 	if ($action == "show_week" || $action == "show_month" || empty($action))
 	{
-    	$s .= 'jQuery( "td.sortable" ).sortable({connectWith: ".sortable",placeholder: "ui-state-highlight",items: "div:not(.unsortable)", receive: function( event, ui ) {';
-    	$s .= 'var frm=jQuery("#move_event");frm.attr("action",ui.item.find("a.cal_event").attr("href")).children("#newdate").val(jQuery(event.target).closest("div").attr("id"));frm.submit();}});'."\n";
+		$s .= 'jQuery( "td.sortable" ).sortable({connectWith: ".sortable",placeholder: "ui-state-highlight",items: "div:not(.unsortable)", receive: function( event, ui ) {';
+		$s .= 'var frm=jQuery("#move_event");frm.attr("action",ui.item.find("a.cal_event").attr("href")).children("#newdate").val(jQuery(event.target).closest("div").attr("id"));frm.submit();}});'."\n";
 	}
   	$s .= '});'."\n";
 	$s .= '</script>'."\n";
@@ -345,15 +345,15 @@ if ($conf->use_javascript_ajax)
 		//$s.='<div class="nowrap float"><input type="checkbox" id="check_birthday" name="check_birthday"> '.$langs->trans("AgendaShowBirthdayEvents").' &nbsp; </div>';
 
 		// Calendars from hooks
-	    $parameters = array(); $object = null;
+		$parameters = array(); $object = null;
 		$reshook = $hookmanager->executeHooks('addCalendarChoice', $parameters, $object, $action);
-	    if (empty($reshook))
-	    {
-			$s .= $hookmanager->resPrint;
-	    } elseif ($reshook > 1)
+		if (empty($reshook))
 		{
-	    	$s = $hookmanager->resPrint;
-	    }
+			$s .= $hookmanager->resPrint;
+		} elseif ($reshook > 1)
+		{
+			$s = $hookmanager->resPrint;
+		}
 	}
 }
 
@@ -451,26 +451,26 @@ $sql .= ' AND a.entity IN ('.getEntity('agenda').')';
 // Condition on actioncode
 if (!empty($actioncode))
 {
-    if (empty($conf->global->AGENDA_USE_EVENT_TYPE))
-    {
-        if ($actioncode == 'AC_NON_AUTO') $sql .= " AND ca.type != 'systemauto'";
-        elseif ($actioncode == 'AC_ALL_AUTO') $sql .= " AND ca.type = 'systemauto'";
-        else {
-            if ($actioncode == 'AC_OTH') $sql .= " AND ca.type != 'systemauto'";
-            if ($actioncode == 'AC_OTH_AUTO') $sql .= " AND ca.type = 'systemauto'";
-        }
-    } else {
-        if ($actioncode == 'AC_NON_AUTO') $sql .= " AND ca.type != 'systemauto'";
-        elseif ($actioncode == 'AC_ALL_AUTO') $sql .= " AND ca.type = 'systemauto'";
-        else {
-        	if (is_array($actioncode))
-        	{
-        		$sql .= " AND ca.code IN ('".implode("','", $actioncode)."')";
-        	} else {
-        		$sql .= " AND ca.code IN ('".implode("','", explode(',', $actioncode))."')";
-        	}
-        }
-    }
+	if (empty($conf->global->AGENDA_USE_EVENT_TYPE))
+	{
+		if ($actioncode == 'AC_NON_AUTO') $sql .= " AND ca.type != 'systemauto'";
+		elseif ($actioncode == 'AC_ALL_AUTO') $sql .= " AND ca.type = 'systemauto'";
+		else {
+			if ($actioncode == 'AC_OTH') $sql .= " AND ca.type != 'systemauto'";
+			if ($actioncode == 'AC_OTH_AUTO') $sql .= " AND ca.type = 'systemauto'";
+		}
+	} else {
+		if ($actioncode == 'AC_NON_AUTO') $sql .= " AND ca.type != 'systemauto'";
+		elseif ($actioncode == 'AC_ALL_AUTO') $sql .= " AND ca.type = 'systemauto'";
+		else {
+			if (is_array($actioncode))
+			{
+				$sql .= " AND ca.code IN ('".implode("','", $actioncode)."')";
+			} else {
+				$sql .= " AND ca.code IN ('".implode("','", explode(',', $actioncode))."')";
+			}
+		}
+	}
 }
 if ($resourceid > 0) $sql .= " AND r.element_type = 'action' AND r.element_id = a.id AND r.resource_id = ".$db->escape($resourceid);
 if ($pid) $sql .= " AND a.fk_project=".$db->escape($pid);
@@ -480,28 +480,28 @@ if ($socid > 0) $sql .= ' AND a.fk_soc = '.$socid;
 if ($filtert > 0 || $usergroup > 0) $sql .= " AND ar.fk_actioncomm = a.id AND ar.element_type='user'";
 if ($action == 'show_day')
 {
-    $sql .= " AND (";
-    $sql .= " (a.datep BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $month, $day, $year))."'";
-    $sql .= " AND '".$db->idate(dol_mktime(23, 59, 59, $month, $day, $year))."')";
-    $sql .= " OR ";
-    $sql .= " (a.datep2 BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $month, $day, $year))."'";
-    $sql .= " AND '".$db->idate(dol_mktime(23, 59, 59, $month, $day, $year))."')";
-    $sql .= " OR ";
-    $sql .= " (a.datep < '".$db->idate(dol_mktime(0, 0, 0, $month, $day, $year))."'";
-    $sql .= " AND a.datep2 > '".$db->idate(dol_mktime(23, 59, 59, $month, $day, $year))."')";
-    $sql .= ')';
+	$sql .= " AND (";
+	$sql .= " (a.datep BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $month, $day, $year))."'";
+	$sql .= " AND '".$db->idate(dol_mktime(23, 59, 59, $month, $day, $year))."')";
+	$sql .= " OR ";
+	$sql .= " (a.datep2 BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $month, $day, $year))."'";
+	$sql .= " AND '".$db->idate(dol_mktime(23, 59, 59, $month, $day, $year))."')";
+	$sql .= " OR ";
+	$sql .= " (a.datep < '".$db->idate(dol_mktime(0, 0, 0, $month, $day, $year))."'";
+	$sql .= " AND a.datep2 > '".$db->idate(dol_mktime(23, 59, 59, $month, $day, $year))."')";
+	$sql .= ')';
 } else {
-    // To limit array
-    $sql .= " AND (";
-    $sql .= " (a.datep BETWEEN '".$db->idate(dol_mktime(0, 0, 0, 1, 1, $year) - (60 * 60 * 24 * 7))."'"; // Start 7 days before
-    $sql .= " AND '".$db->idate(dol_mktime(23, 59, 59, 12, 31, $year) + (60 * 60 * 24 * 7))."')"; // End 7 days after
-    $sql .= " OR ";
-    $sql .= " (a.datep2 BETWEEN '".$db->idate(dol_mktime(0, 0, 0, 1, 1, $year) - (60 * 60 * 24 * 7))."'";
-    $sql .= " AND '".$db->idate(dol_mktime(23, 59, 59, 12, 31, $year) + (60 * 60 * 24 * 7))."')";
-    $sql .= " OR ";
-    $sql .= " (a.datep < '".$db->idate(dol_mktime(0, 0, 0, 12, 1, $year) - (60 * 60 * 24 * 7))."'";
-    $sql .= " AND a.datep2 > '".$db->idate(dol_mktime(23, 59, 59, 12, 31, $year) + (60 * 60 * 24 * 7))."')";
-    $sql .= ')';
+	// To limit array
+	$sql .= " AND (";
+	$sql .= " (a.datep BETWEEN '".$db->idate(dol_mktime(0, 0, 0, 1, 1, $year) - (60 * 60 * 24 * 7))."'"; // Start 7 days before
+	$sql .= " AND '".$db->idate(dol_mktime(23, 59, 59, 12, 31, $year) + (60 * 60 * 24 * 7))."')"; // End 7 days after
+	$sql .= " OR ";
+	$sql .= " (a.datep2 BETWEEN '".$db->idate(dol_mktime(0, 0, 0, 1, 1, $year) - (60 * 60 * 24 * 7))."'";
+	$sql .= " AND '".$db->idate(dol_mktime(23, 59, 59, 12, 31, $year) + (60 * 60 * 24 * 7))."')";
+	$sql .= " OR ";
+	$sql .= " (a.datep < '".$db->idate(dol_mktime(0, 0, 0, 12, 1, $year) - (60 * 60 * 24 * 7))."'";
+	$sql .= " AND a.datep2 > '".$db->idate(dol_mktime(23, 59, 59, 12, 31, $year) + (60 * 60 * 24 * 7))."')";
+	$sql .= ')';
 }
 if ($type) $sql .= " AND ca.id = ".$type;
 if ($status == '0') { $sql .= " AND a.percent = 0"; }
@@ -512,10 +512,10 @@ if ($status == 'todo') { $sql .= " AND (a.percent >= 0 AND a.percent < 100)"; }
 // We must filter on assignement table
 if ($filtert > 0 || $usergroup > 0)
 {
-    $sql .= " AND (";
-    if ($filtert > 0) $sql .= "ar.fk_element = ".$filtert;
-    if ($usergroup > 0) $sql .= ($filtert > 0 ? " OR " : "")." ugu.fk_usergroup = ".$usergroup;
-    $sql .= ")";
+	$sql .= " AND (";
+	if ($filtert > 0) $sql .= "ar.fk_element = ".$filtert;
+	if ($usergroup > 0) $sql .= ($filtert > 0 ? " OR " : "")." ugu.fk_usergroup = ".$usergroup;
+	$sql .= ")";
 }
 // Sort on date
 $sql .= ' ORDER BY fk_user_action, datep'; //fk_user_action
@@ -525,104 +525,104 @@ dol_syslog("comm/action/pertype.php", LOG_DEBUG);
 $resql = $db->query($sql);
 if ($resql)
 {
-    $num = $db->num_rows($resql);
-    $i = 0;
-    while ($i < $num)
-    {
-        $obj = $db->fetch_object($resql);
+	$num = $db->num_rows($resql);
+	$i = 0;
+	while ($i < $num)
+	{
+		$obj = $db->fetch_object($resql);
 
-        // Discard auto action if option is on
-        if (!empty($conf->global->AGENDA_ALWAYS_HIDE_AUTO) && $obj->code == 'AC_OTH_AUTO')
-        {
-        	$i++;
-        	continue;
-        }
+		// Discard auto action if option is on
+		if (!empty($conf->global->AGENDA_ALWAYS_HIDE_AUTO) && $obj->code == 'AC_OTH_AUTO')
+		{
+			$i++;
+			continue;
+		}
 
-        $datep = $db->jdate($obj->datep);
-        $datep2 = $db->jdate($obj->datep2);
+		$datep = $db->jdate($obj->datep);
+		$datep2 = $db->jdate($obj->datep2);
 
-        // Create a new object action
-        $event = new ActionComm($db);
-        $event->id = $obj->id;
-        $event->datep = $datep; // datep and datef are GMT date
-        $event->datef = $datep2;
-        $event->type_code = $obj->code;
-        $event->type_color = $obj->color;
-        $event->label = $obj->label;
-        $event->percentage = $obj->percent;
-        $event->authorid = $obj->fk_user_author; // user id of creator
-        $event->userownerid = $obj->fk_user_action; // user id of owner
-        $event->priority = $obj->priority;
-        $event->fulldayevent = $obj->fulldayevent;
-        $event->location = $obj->location;
-        $event->transparency = $obj->transparency;
+		// Create a new object action
+		$event = new ActionComm($db);
+		$event->id = $obj->id;
+		$event->datep = $datep; // datep and datef are GMT date
+		$event->datef = $datep2;
+		$event->type_code = $obj->code;
+		$event->type_color = $obj->color;
+		$event->label = $obj->label;
+		$event->percentage = $obj->percent;
+		$event->authorid = $obj->fk_user_author; // user id of creator
+		$event->userownerid = $obj->fk_user_action; // user id of owner
+		$event->priority = $obj->priority;
+		$event->fulldayevent = $obj->fulldayevent;
+		$event->location = $obj->location;
+		$event->transparency = $obj->transparency;
 
-        $event->fk_project = $obj->fk_project;
+		$event->fk_project = $obj->fk_project;
 
-        $event->socid = $obj->fk_soc;
-        $event->contact_id = $obj->fk_contact;
+		$event->socid = $obj->fk_soc;
+		$event->contact_id = $obj->fk_contact;
 
-        $event->fk_element = $obj->fk_element;
-        $event->elementtype = $obj->elementtype;
+		$event->fk_element = $obj->fk_element;
+		$event->elementtype = $obj->elementtype;
 
-        // Defined date_start_in_calendar and date_end_in_calendar property
-        // They are date start and end of action but modified to not be outside calendar view.
-        if ($event->percentage <= 0)
-        {
-        	$event->date_start_in_calendar = $datep;
-        	if ($datep2 != '' && $datep2 >= $datep) $event->date_end_in_calendar = $datep2;
-        	else $event->date_end_in_calendar = $datep;
-        } else {
-        	$event->date_start_in_calendar = $datep;
-        	if ($datep2 != '' && $datep2 >= $datep) $event->date_end_in_calendar = $datep2;
-        	else $event->date_end_in_calendar = $datep;
-        }
-        // Define ponctual property
-        if ($event->date_start_in_calendar == $event->date_end_in_calendar)
-        {
-            $event->ponctuel = 1;
-        }
+		// Defined date_start_in_calendar and date_end_in_calendar property
+		// They are date start and end of action but modified to not be outside calendar view.
+		if ($event->percentage <= 0)
+		{
+			$event->date_start_in_calendar = $datep;
+			if ($datep2 != '' && $datep2 >= $datep) $event->date_end_in_calendar = $datep2;
+			else $event->date_end_in_calendar = $datep;
+		} else {
+			$event->date_start_in_calendar = $datep;
+			if ($datep2 != '' && $datep2 >= $datep) $event->date_end_in_calendar = $datep2;
+			else $event->date_end_in_calendar = $datep;
+		}
+		// Define ponctual property
+		if ($event->date_start_in_calendar == $event->date_end_in_calendar)
+		{
+			$event->ponctuel = 1;
+		}
 
-        // Check values
-        if ($event->date_end_in_calendar < $firstdaytoshow ||
-        $event->date_start_in_calendar >= $lastdaytoshow)
-        {
-            // This record is out of visible range
-        	unset($event);
-        } else {
+		// Check values
+		if ($event->date_end_in_calendar < $firstdaytoshow ||
+		$event->date_start_in_calendar >= $lastdaytoshow)
+		{
+			// This record is out of visible range
+			unset($event);
+		} else {
 			//print $i.' - '.dol_print_date($this->date_start_in_calendar, 'dayhour').' - '.dol_print_date($this->date_end_in_calendar, 'dayhour').'<br>'."\n";
 			$event->fetch_userassigned(); // This load $event->userassigned
 
 			if ($event->date_start_in_calendar < $firstdaytoshow) $event->date_start_in_calendar = $firstdaytoshow;
-            if ($event->date_end_in_calendar >= $lastdaytoshow) $event->date_end_in_calendar = ($lastdaytoshow - 1);
+			if ($event->date_end_in_calendar >= $lastdaytoshow) $event->date_end_in_calendar = ($lastdaytoshow - 1);
 
-            // Add an entry in actionarray for each day
-            $daycursor = $event->date_start_in_calendar;
-            $annee = date('Y', $daycursor);
-            $mois = date('m', $daycursor);
-            $jour = date('d', $daycursor);
+			// Add an entry in actionarray for each day
+			$daycursor = $event->date_start_in_calendar;
+			$annee = date('Y', $daycursor);
+			$mois = date('m', $daycursor);
+			$jour = date('d', $daycursor);
 
-            // Loop on each day covered by action to prepare an index to show on calendar
-            $loop = true; $j = 0;
-            $daykey = dol_mktime(0, 0, 0, $mois, $jour, $annee);
-            do {
-                //if ($event->id==408) print 'daykey='.$daykey.' '.$event->datep.' '.$event->datef.'<br>';
+			// Loop on each day covered by action to prepare an index to show on calendar
+			$loop = true; $j = 0;
+			$daykey = dol_mktime(0, 0, 0, $mois, $jour, $annee);
+			do {
+				//if ($event->id==408) print 'daykey='.$daykey.' '.$event->datep.' '.$event->datef.'<br>';
 
-                $eventarray[$daykey][] = $event;
-                $j++;
+				$eventarray[$daykey][] = $event;
+				$j++;
 
-                $daykey += 60 * 60 * 24;
-                if ($daykey > $event->date_end_in_calendar) $loop = false;
-            } while ($loop);
+				$daykey += 60 * 60 * 24;
+				if ($daykey > $event->date_end_in_calendar) $loop = false;
+			} while ($loop);
 
-            //print 'Event '.$i.' id='.$event->id.' (start='.dol_print_date($event->datep).'-end='.dol_print_date($event->datef);
-            //print ' startincalendar='.dol_print_date($event->date_start_in_calendar).'-endincalendar='.dol_print_date($event->date_end_in_calendar).') was added in '.$j.' different index key of array<br>';
-        }
-        $i++;
-    }
-    $db->free($resql);
+			//print 'Event '.$i.' id='.$event->id.' (start='.dol_print_date($event->datep).'-end='.dol_print_date($event->datef);
+			//print ' startincalendar='.dol_print_date($event->date_start_in_calendar).'-endincalendar='.dol_print_date($event->date_end_in_calendar).') was added in '.$j.' different index key of array<br>';
+		}
+		$i++;
+	}
+	$db->free($resql);
 } else {
-    dol_print_error($db);
+	dol_print_error($db);
 }
 
 $maxnbofchar = 18;
@@ -634,7 +634,7 @@ $cacheusers = array();
 $color_file = DOL_DOCUMENT_ROOT."/theme/".$conf->theme."/theme_vars.inc.php";
 if (is_readable($color_file))
 {
-    include_once $color_file;
+	include_once $color_file;
 }
 if (!is_array($theme_datacolor)) $theme_datacolor = array(array(120, 130, 150), array(200, 160, 180), array(190, 190, 220));
 
@@ -722,7 +722,7 @@ foreach ($typeofevents as $typeofevent)
 			continue;
 		}
 
-        // Show days of the current week
+		// Show days of the current week
 		$curtime = dol_time_plus_duree($firstdaytoshow, $iter_day, 'd');
 		$tmparray = dol_getdate($curtime, 'fast');
 		$tmpday = $tmparray['mday'];
@@ -946,15 +946,15 @@ function show_day_events_pertype($username, $day, $month, $year, $monthshown, $s
 							$busy = $event->transparency;
 							$cases1[$h][$event->id]['busy'] = $busy;
 							$cases1[$h][$event->id]['string'] = dol_print_date($event->date_start_in_calendar, 'dayhour');
-		                    if ($event->date_end_in_calendar && $event->date_end_in_calendar != $event->date_start_in_calendar)
-			        		{
-				        		$tmpa = dol_getdate($event->date_start_in_calendar, true);
-				        		$tmpb = dol_getdate($event->date_end_in_calendar, true);
-				        		if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year']) $cases1[$h][$event->id]['string'] .= '-'.dol_print_date($event->date_end_in_calendar, 'hour');
-				        		else $cases1[$h][$event->id]['string'] .= '-'.dol_print_date($event->date_end_in_calendar, 'dayhour');
-			        		}
-			        		if ($event->label) $cases1[$h][$event->id]['string'] .= ' - '.$event->label;
-			        		$cases1[$h][$event->id]['typecode'] = $event->type_code;
+							if ($event->date_end_in_calendar && $event->date_end_in_calendar != $event->date_start_in_calendar)
+							{
+								$tmpa = dol_getdate($event->date_start_in_calendar, true);
+								$tmpb = dol_getdate($event->date_end_in_calendar, true);
+								if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year']) $cases1[$h][$event->id]['string'] .= '-'.dol_print_date($event->date_end_in_calendar, 'hour');
+								else $cases1[$h][$event->id]['string'] .= '-'.dol_print_date($event->date_end_in_calendar, 'dayhour');
+							}
+							if ($event->label) $cases1[$h][$event->id]['string'] .= ' - '.$event->label;
+							$cases1[$h][$event->id]['typecode'] = $event->type_code;
 							$cases1[$h][$event->id]['color'] = $color;
 							if ($event->fk_project > 0)
 							{
@@ -993,13 +993,13 @@ function show_day_events_pertype($username, $day, $month, $year, $monthshown, $s
 							$cases2[$h][$event->id]['busy'] = $busy;
 							$cases2[$h][$event->id]['string'] = dol_print_date($event->date_start_in_calendar, 'dayhour');
 							if ($event->date_end_in_calendar && $event->date_end_in_calendar != $event->date_start_in_calendar)
-			        		{
-				        		$tmpa = dol_getdate($event->date_start_in_calendar, true);
-				        		$tmpb = dol_getdate($event->date_end_in_calendar, true);
-				        		if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year']) $cases2[$h][$event->id]['string'] .= '-'.dol_print_date($event->date_end_in_calendar, 'hour');
-				        		else $cases2[$h][$event->id]['string'] .= '-'.dol_print_date($event->date_end_in_calendar, 'dayhour');
-			        		}
-			        		if ($event->label) $cases2[$h][$event->id]['string'] .= ' - '.$event->label;
+							{
+								$tmpa = dol_getdate($event->date_start_in_calendar, true);
+								$tmpb = dol_getdate($event->date_end_in_calendar, true);
+								if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year']) $cases2[$h][$event->id]['string'] .= '-'.dol_print_date($event->date_end_in_calendar, 'hour');
+								else $cases2[$h][$event->id]['string'] .= '-'.dol_print_date($event->date_end_in_calendar, 'dayhour');
+							}
+							if ($event->label) $cases2[$h][$event->id]['string'] .= ' - '.$event->label;
 							$cases2[$h][$event->id]['typecode'] = $event->type_code;
 							$cases2[$h][$event->id]['color'] = $color;
 							if ($event->fk_project > 0)
diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php
index 899925b16f6..8983dbff7f6 100644
--- a/htdocs/comm/action/peruser.php
+++ b/htdocs/comm/action/peruser.php
@@ -74,7 +74,7 @@ if (!$user->rights->agenda->myactions->read) accessforbidden();
 if (!$user->rights->agenda->allactions->read) $canedit = 0;
 if (!$user->rights->agenda->allactions->read || $filter == 'mine')  // If no permission to see all, we show only affected to me
 {
-    $filtert = $user->id;
+	$filtert = $user->id;
 }
 
 //$action=GETPOST('action','alpha');
@@ -92,10 +92,10 @@ $optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always ''
 // Set actioncode (this code must be same for setting actioncode into peruser, listacton and index)
 if (GETPOST('search_actioncode', 'array'))
 {
-    $actioncode = GETPOST('search_actioncode', 'array', 3);
-    if (!count($actioncode)) $actioncode = '0';
+	$actioncode = GETPOST('search_actioncode', 'array', 3);
+	if (!count($actioncode)) $actioncode = '0';
 } else {
-    $actioncode = GETPOST("search_actioncode", "alpha", 3) ?GETPOST("search_actioncode", "alpha", 3) : (GETPOST("search_actioncode", "alpha") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE));
+	$actioncode = GETPOST("search_actioncode", "alpha", 3) ?GETPOST("search_actioncode", "alpha", 3) : (GETPOST("search_actioncode", "alpha") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE));
 }
 if ($actioncode == '' && empty($actioncodearray)) $actioncode = (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE);
 
@@ -129,13 +129,13 @@ if ($status == '' && !isset($_GET['status']) && !isset($_POST['status'])) $statu
 if (empty($action) && !isset($_GET['action']) && !isset($_POST['action'])) $action = (empty($conf->global->AGENDA_DEFAULT_VIEW) ? 'show_month' : $conf->global->AGENDA_DEFAULT_VIEW);
 
 if (GETPOST('viewcal', 'alpha') && $action != 'show_day' && $action != 'show_week' && $action != 'show_peruser') {
-    $action = 'show_month'; $day = '';
+	$action = 'show_month'; $day = '';
 }                                                   // View by month
 if (GETPOST('viewweek', 'alpha') || $action == 'show_week') {
-    $action = 'show_week'; $week = ($week ? $week : date("W")); $day = ($day ? $day : date("d"));
+	$action = 'show_week'; $week = ($week ? $week : date("W")); $day = ($day ? $day : date("d"));
 }  // View by week
 if (GETPOST('viewday', 'alpha') || $action == 'show_day') {
-    $action = 'show_day'; $day = ($day ? $day : date("d"));
+	$action = 'show_day'; $day = ($day ? $day : date("d"));
 }                                  // View by day
 
 // Load translation files required by the page
@@ -151,13 +151,13 @@ $hookmanager->initHooks(array('agenda'));
 
 if ($action == 'delete_action')
 {
-    $event = new ActionComm($db);
-    $event->fetch($actionid);
-    $event->fetch_optionals();
-    $event->fetch_userassigned();
-    $event->oldcopy = clone $event;
+	$event = new ActionComm($db);
+	$event->fetch($actionid);
+	$event->fetch_optionals();
+	$event->fetch_userassigned();
+	$event->oldcopy = clone $event;
 
-    $result = $event->delete();
+	$result = $event->delete();
 }
 
 
@@ -323,8 +323,8 @@ if ($conf->use_javascript_ajax)
 	$s .= 'jQuery(".family_birthday").toggle();'."\n";
 	if ($action == "show_week" || $action == "show_month" || empty($action))
 	{
-    	$s .= 'jQuery( "td.sortable" ).sortable({connectWith: ".sortable",placeholder: "ui-state-highlight",items: "div:not(.unsortable)", receive: function( event, ui ) {';
-    	$s .= 'var frm=jQuery("#move_event");frm.attr("action",ui.item.find("a.cal_event").attr("href")).children("#newdate").val(jQuery(event.target).closest("div").attr("id"));frm.submit();}});'."\n";
+		$s .= 'jQuery( "td.sortable" ).sortable({connectWith: ".sortable",placeholder: "ui-state-highlight",items: "div:not(.unsortable)", receive: function( event, ui ) {';
+		$s .= 'var frm=jQuery("#move_event");frm.attr("action",ui.item.find("a.cal_event").attr("href")).children("#newdate").val(jQuery(event.target).closest("div").attr("id"));frm.submit();}});'."\n";
 	}
   	$s .= '});'."\n";
 	$s .= '</script>'."\n";
@@ -351,15 +351,15 @@ if ($conf->use_javascript_ajax)
 		//$s.='<div class="nowrap float"><input type="checkbox" id="check_birthday" name="check_birthday"> '.$langs->trans("AgendaShowBirthdayEvents").' &nbsp; </div>';
 
 		// Calendars from hooks
-	    $parameters = array(); $object = null;
+		$parameters = array(); $object = null;
 		$reshook = $hookmanager->executeHooks('addCalendarChoice', $parameters, $object, $action);
-	    if (empty($reshook))
-	    {
-			$s .= $hookmanager->resPrint;
-	    } elseif ($reshook > 1)
+		if (empty($reshook))
 		{
-	    	$s = $hookmanager->resPrint;
-	    }
+			$s .= $hookmanager->resPrint;
+		} elseif ($reshook > 1)
+		{
+			$s = $hookmanager->resPrint;
+		}
 	}
 }
 
@@ -408,7 +408,7 @@ if ($user->rights->agenda->myactions->create || $user->rights->agenda->allaction
 
 	//$param='month='.$monthshown.'&year='.$year;
 	$hourminsec = '100000';
-    $newcardbutton .= dolGetButtonTitle($langs->trans("AddAction"), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/comm/action/card.php?action=create&datep='.sprintf("%04d%02d%02d", $tmpforcreatebutton['year'], $tmpforcreatebutton['mon'], $tmpforcreatebutton['mday']).$hourminsec.'&backtopage='.urlencode($_SERVER["PHP_SELF"].($newparam ? '?'.$newparam : '')));
+	$newcardbutton .= dolGetButtonTitle($langs->trans("AddAction"), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/comm/action/card.php?action=create&datep='.sprintf("%04d%02d%02d", $tmpforcreatebutton['year'], $tmpforcreatebutton['mon'], $tmpforcreatebutton['mday']).$hourminsec.'&backtopage='.urlencode($_SERVER["PHP_SELF"].($newparam ? '?'.$newparam : '')));
 }
 
 print_barre_liste($langs->trans("Agenda"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, -1, 'object_action', 0, $nav.'<span class="marginleftonly"></span>'.$newcardbutton, '', $limit, 1, 0, 1, $viewmode);
@@ -457,26 +457,26 @@ $sql .= ' AND a.entity IN ('.getEntity('agenda').')';
 // Condition on actioncode
 if (!empty($actioncode))
 {
-    if (empty($conf->global->AGENDA_USE_EVENT_TYPE))
-    {
-        if ($actioncode == 'AC_NON_AUTO') $sql .= " AND ca.type != 'systemauto'";
-        elseif ($actioncode == 'AC_ALL_AUTO') $sql .= " AND ca.type = 'systemauto'";
-        else {
-            if ($actioncode == 'AC_OTH') $sql .= " AND ca.type != 'systemauto'";
-            if ($actioncode == 'AC_OTH_AUTO') $sql .= " AND ca.type = 'systemauto'";
-        }
-    } else {
-        if ($actioncode == 'AC_NON_AUTO') $sql .= " AND ca.type != 'systemauto'";
-        elseif ($actioncode == 'AC_ALL_AUTO') $sql .= " AND ca.type = 'systemauto'";
-        else {
-            if (is_array($actioncode))
-            {
-  	        	$sql .= " AND ca.code IN ('".implode("','", $actioncode)."')";
-            } else {
-  	        	$sql .= " AND ca.code IN ('".implode("','", explode(',', $actioncode))."')";
-            }
-        }
-    }
+	if (empty($conf->global->AGENDA_USE_EVENT_TYPE))
+	{
+		if ($actioncode == 'AC_NON_AUTO') $sql .= " AND ca.type != 'systemauto'";
+		elseif ($actioncode == 'AC_ALL_AUTO') $sql .= " AND ca.type = 'systemauto'";
+		else {
+			if ($actioncode == 'AC_OTH') $sql .= " AND ca.type != 'systemauto'";
+			if ($actioncode == 'AC_OTH_AUTO') $sql .= " AND ca.type = 'systemauto'";
+		}
+	} else {
+		if ($actioncode == 'AC_NON_AUTO') $sql .= " AND ca.type != 'systemauto'";
+		elseif ($actioncode == 'AC_ALL_AUTO') $sql .= " AND ca.type = 'systemauto'";
+		else {
+			if (is_array($actioncode))
+			{
+  				$sql .= " AND ca.code IN ('".implode("','", $actioncode)."')";
+			} else {
+  				$sql .= " AND ca.code IN ('".implode("','", explode(',', $actioncode))."')";
+			}
+		}
+	}
 }
 if ($resourceid > 0) $sql .= " AND r.element_type = 'action' AND r.element_id = a.id AND r.resource_id = ".$db->escape($resourceid);
 if ($pid) $sql .= " AND a.fk_project=".$db->escape($pid);
@@ -486,28 +486,28 @@ if ($socid > 0) $sql .= ' AND a.fk_soc = '.$socid;
 if ($filtert > 0 || $usergroup > 0) $sql .= " AND ar.fk_actioncomm = a.id AND ar.element_type='user'";
 if ($action == 'show_day')
 {
-    $sql .= " AND (";
-    $sql .= " (a.datep BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $month, $day, $year))."'";
-    $sql .= " AND '".$db->idate(dol_mktime(23, 59, 59, $month, $day, $year))."')";
-    $sql .= " OR ";
-    $sql .= " (a.datep2 BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $month, $day, $year))."'";
-    $sql .= " AND '".$db->idate(dol_mktime(23, 59, 59, $month, $day, $year))."')";
-    $sql .= " OR ";
-    $sql .= " (a.datep < '".$db->idate(dol_mktime(0, 0, 0, $month, $day, $year))."'";
-    $sql .= " AND a.datep2 > '".$db->idate(dol_mktime(23, 59, 59, $month, $day, $year))."')";
-    $sql .= ')';
+	$sql .= " AND (";
+	$sql .= " (a.datep BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $month, $day, $year))."'";
+	$sql .= " AND '".$db->idate(dol_mktime(23, 59, 59, $month, $day, $year))."')";
+	$sql .= " OR ";
+	$sql .= " (a.datep2 BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $month, $day, $year))."'";
+	$sql .= " AND '".$db->idate(dol_mktime(23, 59, 59, $month, $day, $year))."')";
+	$sql .= " OR ";
+	$sql .= " (a.datep < '".$db->idate(dol_mktime(0, 0, 0, $month, $day, $year))."'";
+	$sql .= " AND a.datep2 > '".$db->idate(dol_mktime(23, 59, 59, $month, $day, $year))."')";
+	$sql .= ')';
 } else {
-    // To limit array
-    $sql .= " AND (";
-    $sql .= " (a.datep BETWEEN '".$db->idate($firstdaytoshow - (60 * 60 * 24 * 2))."'"; // Start 2 day before $firstdaytoshow
-    $sql .= " AND '".$db->idate($lastdaytoshow + (60 * 60 * 24 * 2))."')"; // End 2 day after $lastdaytoshow
-    $sql .= " OR ";
-    $sql .= " (a.datep2 BETWEEN '".$db->idate($firstdaytoshow - (60 * 60 * 24 * 2))."'";
-    $sql .= " AND '".$db->idate($lastdaytoshow + (60 * 60 * 24 * 2))."')";
-    $sql .= " OR ";
-    $sql .= " (a.datep < '".$db->idate($firstdaytoshow - (60 * 60 * 24 * 2))."'";
-    $sql .= " AND a.datep2 > '".$db->idate($lastdaytoshow + (60 * 60 * 24 * 2))."')";
-    $sql .= ')';
+	// To limit array
+	$sql .= " AND (";
+	$sql .= " (a.datep BETWEEN '".$db->idate($firstdaytoshow - (60 * 60 * 24 * 2))."'"; // Start 2 day before $firstdaytoshow
+	$sql .= " AND '".$db->idate($lastdaytoshow + (60 * 60 * 24 * 2))."')"; // End 2 day after $lastdaytoshow
+	$sql .= " OR ";
+	$sql .= " (a.datep2 BETWEEN '".$db->idate($firstdaytoshow - (60 * 60 * 24 * 2))."'";
+	$sql .= " AND '".$db->idate($lastdaytoshow + (60 * 60 * 24 * 2))."')";
+	$sql .= " OR ";
+	$sql .= " (a.datep < '".$db->idate($firstdaytoshow - (60 * 60 * 24 * 2))."'";
+	$sql .= " AND a.datep2 > '".$db->idate($lastdaytoshow + (60 * 60 * 24 * 2))."')";
+	$sql .= ')';
 }
 if ($type) $sql .= " AND ca.id = ".$type;
 if ($status == '0') { $sql .= " AND a.percent = 0"; }
@@ -518,10 +518,10 @@ if ($status == 'todo') { $sql .= " AND (a.percent >= 0 AND a.percent < 100)"; }
 // We must filter on assignement table
 if ($filtert > 0 || $usergroup > 0)
 {
-    $sql .= " AND (";
-    if ($filtert > 0) $sql .= "ar.fk_element = ".$filtert;
-    if ($usergroup > 0) $sql .= ($filtert > 0 ? " OR " : "")." ugu.fk_usergroup = ".$usergroup;
-    $sql .= ")";
+	$sql .= " AND (";
+	if ($filtert > 0) $sql .= "ar.fk_element = ".$filtert;
+	if ($usergroup > 0) $sql .= ($filtert > 0 ? " OR " : "")." ugu.fk_usergroup = ".$usergroup;
+	$sql .= ")";
 }
 // Sort on date
 $sql .= ' ORDER BY fk_user_action, datep'; //fk_user_action
@@ -531,105 +531,105 @@ dol_syslog("comm/action/peruser.php", LOG_DEBUG);
 $resql = $db->query($sql);
 if ($resql)
 {
-    $num = $db->num_rows($resql);
+	$num = $db->num_rows($resql);
 
-    $i = 0;
-    while ($i < $num)
-    {
-        $obj = $db->fetch_object($resql);
+	$i = 0;
+	while ($i < $num)
+	{
+		$obj = $db->fetch_object($resql);
 
-        // Discard auto action if option is on
-        if (!empty($conf->global->AGENDA_ALWAYS_HIDE_AUTO) && $obj->code == 'AC_OTH_AUTO')
-        {
-        	$i++;
-        	continue;
-        }
+		// Discard auto action if option is on
+		if (!empty($conf->global->AGENDA_ALWAYS_HIDE_AUTO) && $obj->code == 'AC_OTH_AUTO')
+		{
+			$i++;
+			continue;
+		}
 
-        $datep = $db->jdate($obj->datep);
-        $datep2 = $db->jdate($obj->datep2);
+		$datep = $db->jdate($obj->datep);
+		$datep2 = $db->jdate($obj->datep2);
 
-        // Create a new object action
-        $event = new ActionComm($db);
-        $event->id = $obj->id;
-        $event->datep = $datep; // datep and datef are GMT date
-        $event->datef = $datep2;
-        $event->type_code = $obj->code;
-        $event->type_color = $obj->color;
-        $event->label = $obj->label;
-        $event->percentage = $obj->percent;
-        $event->authorid = $obj->fk_user_author; // user id of creator
-        $event->userownerid = $obj->fk_user_action; // user id of owner
-        $event->priority = $obj->priority;
-        $event->fulldayevent = $obj->fulldayevent;
-        $event->location = $obj->location;
-        $event->transparency = $obj->transparency;
+		// Create a new object action
+		$event = new ActionComm($db);
+		$event->id = $obj->id;
+		$event->datep = $datep; // datep and datef are GMT date
+		$event->datef = $datep2;
+		$event->type_code = $obj->code;
+		$event->type_color = $obj->color;
+		$event->label = $obj->label;
+		$event->percentage = $obj->percent;
+		$event->authorid = $obj->fk_user_author; // user id of creator
+		$event->userownerid = $obj->fk_user_action; // user id of owner
+		$event->priority = $obj->priority;
+		$event->fulldayevent = $obj->fulldayevent;
+		$event->location = $obj->location;
+		$event->transparency = $obj->transparency;
 
-        $event->fk_project = $obj->fk_project;
+		$event->fk_project = $obj->fk_project;
 
-        $event->socid = $obj->fk_soc;
-        $event->contact_id = $obj->fk_contact;
+		$event->socid = $obj->fk_soc;
+		$event->contact_id = $obj->fk_contact;
 
-        $event->fk_element = $obj->fk_element;
-        $event->elementtype = $obj->elementtype;
+		$event->fk_element = $obj->fk_element;
+		$event->elementtype = $obj->elementtype;
 
-        // Defined date_start_in_calendar and date_end_in_calendar property
-        // They are date start and end of action but modified to not be outside calendar view.
-        if ($event->percentage <= 0)
-        {
-            $event->date_start_in_calendar = $datep;
-            if ($datep2 != '' && $datep2 >= $datep) $event->date_end_in_calendar = $datep2;
-            else $event->date_end_in_calendar = $datep;
-        } else {
-            $event->date_start_in_calendar = $datep;
-            if ($datep2 != '' && $datep2 >= $datep) $event->date_end_in_calendar = $datep2;
-            else $event->date_end_in_calendar = $datep;
-        }
-        // Define ponctual property
-        if ($event->date_start_in_calendar == $event->date_end_in_calendar)
-        {
-            $event->ponctuel = 1;
-        }
+		// Defined date_start_in_calendar and date_end_in_calendar property
+		// They are date start and end of action but modified to not be outside calendar view.
+		if ($event->percentage <= 0)
+		{
+			$event->date_start_in_calendar = $datep;
+			if ($datep2 != '' && $datep2 >= $datep) $event->date_end_in_calendar = $datep2;
+			else $event->date_end_in_calendar = $datep;
+		} else {
+			$event->date_start_in_calendar = $datep;
+			if ($datep2 != '' && $datep2 >= $datep) $event->date_end_in_calendar = $datep2;
+			else $event->date_end_in_calendar = $datep;
+		}
+		// Define ponctual property
+		if ($event->date_start_in_calendar == $event->date_end_in_calendar)
+		{
+			$event->ponctuel = 1;
+		}
 
-        // Check values
-        if ($event->date_end_in_calendar < $firstdaytoshow ||
-        $event->date_start_in_calendar >= $lastdaytoshow)
-        {
-            // This record is out of visible range
-            unset($event);
-        } else {
+		// Check values
+		if ($event->date_end_in_calendar < $firstdaytoshow ||
+		$event->date_start_in_calendar >= $lastdaytoshow)
+		{
+			// This record is out of visible range
+			unset($event);
+		} else {
 			//print $i.' - '.dol_print_date($this->date_start_in_calendar, 'dayhour').' - '.dol_print_date($this->date_end_in_calendar, 'dayhour').'<br>'."\n";
-        	$event->fetch_userassigned(); // This load $event->userassigned
+			$event->fetch_userassigned(); // This load $event->userassigned
 
 			if ($event->date_start_in_calendar < $firstdaytoshow) $event->date_start_in_calendar = $firstdaytoshow;
-            if ($event->date_end_in_calendar >= $lastdaytoshow) $event->date_end_in_calendar = ($lastdaytoshow - 1);
+			if ($event->date_end_in_calendar >= $lastdaytoshow) $event->date_end_in_calendar = ($lastdaytoshow - 1);
 
-            // Add an entry in actionarray for each day
-            $daycursor = $event->date_start_in_calendar;
-            $annee = date('Y', $daycursor);
-            $mois = date('m', $daycursor);
-            $jour = date('d', $daycursor);
+			// Add an entry in actionarray for each day
+			$daycursor = $event->date_start_in_calendar;
+			$annee = date('Y', $daycursor);
+			$mois = date('m', $daycursor);
+			$jour = date('d', $daycursor);
 
-            // Loop on each day covered by action to prepare an index to show on calendar
-            $loop = true; $j = 0;
-            $daykey = dol_mktime(0, 0, 0, $mois, $jour, $annee);
-            do {
-                //if ($event->id==408) print 'daykey='.$daykey.' '.$event->datep.' '.$event->datef.'<br>';
+			// Loop on each day covered by action to prepare an index to show on calendar
+			$loop = true; $j = 0;
+			$daykey = dol_mktime(0, 0, 0, $mois, $jour, $annee);
+			do {
+				//if ($event->id==408) print 'daykey='.$daykey.' '.$event->datep.' '.$event->datef.'<br>';
 
-                $eventarray[$daykey][] = $event;
-                $j++;
+				$eventarray[$daykey][] = $event;
+				$j++;
 
-                $daykey += 60 * 60 * 24;
-                if ($daykey > $event->date_end_in_calendar) $loop = false;
-            } while ($loop);
+				$daykey += 60 * 60 * 24;
+				if ($daykey > $event->date_end_in_calendar) $loop = false;
+			} while ($loop);
 
-            //print 'Event '.$i.' id='.$event->id.' (start='.dol_print_date($event->datep).'-end='.dol_print_date($event->datef);
-            //print ' startincalendar='.dol_print_date($event->date_start_in_calendar).'-endincalendar='.dol_print_date($event->date_end_in_calendar).') was added in '.$j.' different index key of array<br>';
-        }
-        $i++;
-    }
-    $db->free($resql);
+			//print 'Event '.$i.' id='.$event->id.' (start='.dol_print_date($event->datep).'-end='.dol_print_date($event->datef);
+			//print ' startincalendar='.dol_print_date($event->date_start_in_calendar).'-endincalendar='.dol_print_date($event->date_end_in_calendar).') was added in '.$j.' different index key of array<br>';
+		}
+		$i++;
+	}
+	$db->free($resql);
 } else {
-    dol_print_error($db);
+	dol_print_error($db);
 }
 
 $maxnbofchar = 18;
@@ -641,7 +641,7 @@ $cacheusers = array();
 $color_file = DOL_DOCUMENT_ROOT."/theme/".$conf->theme."/theme_vars.inc.php";
 if (is_readable($color_file))
 {
-    include_once $color_file;
+	include_once $color_file;
 }
 if (!is_array($theme_datacolor)) $theme_datacolor = array(array(120, 130, 150), array(200, 160, 180), array(190, 190, 220));
 
@@ -750,15 +750,15 @@ while ($currentdaytoshow < $lastdaytoshow) {
 	{
 		foreach ($eventarray as $daykey => $notused)
 		{
-		    // Get all assigned users for each event
-		    foreach ($eventarray[$daykey] as $index => $event)
-		    {
-			    $event->fetch_userassigned();
+			// Get all assigned users for each event
+			foreach ($eventarray[$daykey] as $index => $event)
+			{
+				$event->fetch_userassigned();
 				$listofuserid = $event->userassigned;
 				foreach ($listofuserid as $userid => $tmp) {
 				   	if (!in_array($userid, $usernamesid)) $usernamesid[$userid] = $userid;
 				}
-		    }
+			}
 		}
 	} else {
 		/* Use this list to have for all users */
@@ -770,17 +770,17 @@ while ($currentdaytoshow < $lastdaytoshow) {
 		//print $sql;
 		$resql = $db->query($sql);
 		if ($resql) {
-		    $num = $db->num_rows($resql);
-		    $i = 0;
-		    if ($num)
-		    {
-		        while ($i < $num)
-		        {
-		            $obj = $db->fetch_object($resql);
+			$num = $db->num_rows($resql);
+			$i = 0;
+			if ($num)
+			{
+				while ($i < $num)
+				{
+					$obj = $db->fetch_object($resql);
 					$usernamesid[$obj->rowid] = $obj->rowid;
 					$i++;
-		        }
-		    }
+				}
+			}
 		} else dol_print_error($db);
 	}
 	//var_dump($usernamesid);
@@ -846,7 +846,7 @@ while ($currentdaytoshow < $lastdaytoshow) {
 				continue;
 			}
 
-	        // Show days of the current week
+			// Show days of the current week
 			$curtime = dol_time_plus_duree($currentdaytoshow, $iter_day, 'd');
 			$tmparray = dol_getdate($curtime, 'fast');
 			$tmpday = $tmparray['mday'];
@@ -1102,13 +1102,13 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
 							$busy = $event->transparency;
 							$cases1[$h][$event->id]['busy'] = $busy;
 							$cases1[$h][$event->id]['string'] = dol_print_date($event->date_start_in_calendar, 'dayhour');
-		                    if ($event->date_end_in_calendar && $event->date_end_in_calendar != $event->date_start_in_calendar)
-			        		{
-				        		$tmpa = dol_getdate($event->date_start_in_calendar, true);
-				        		$tmpb = dol_getdate($event->date_end_in_calendar, true);
-				        		if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year']) $cases1[$h][$event->id]['string'] .= '-'.dol_print_date($event->date_end_in_calendar, 'hour');
-				        		else $cases1[$h][$event->id]['string'] .= '-'.dol_print_date($event->date_end_in_calendar, 'dayhour');
-			        		}
+							if ($event->date_end_in_calendar && $event->date_end_in_calendar != $event->date_start_in_calendar)
+							{
+								$tmpa = dol_getdate($event->date_start_in_calendar, true);
+								$tmpb = dol_getdate($event->date_end_in_calendar, true);
+								if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year']) $cases1[$h][$event->id]['string'] .= '-'.dol_print_date($event->date_end_in_calendar, 'hour');
+								else $cases1[$h][$event->id]['string'] .= '-'.dol_print_date($event->date_end_in_calendar, 'dayhour');
+							}
 							if ($event->label) $cases1[$h][$event->id]['string'] .= ' - '.$event->label;
 							$cases1[$h][$event->id]['typecode'] = $event->type_code;
 							$cases1[$h][$event->id]['color'] = $color;
@@ -1149,12 +1149,12 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
 							$cases2[$h][$event->id]['busy'] = $busy;
 							$cases2[$h][$event->id]['string'] = dol_print_date($event->date_start_in_calendar, 'dayhour');
 							if ($event->date_end_in_calendar && $event->date_end_in_calendar != $event->date_start_in_calendar)
-			        		{
-				        		$tmpa = dol_getdate($event->date_start_in_calendar, true);
-				        		$tmpb = dol_getdate($event->date_end_in_calendar, true);
-				        		if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year']) $cases2[$h][$event->id]['string'] .= '-'.dol_print_date($event->date_end_in_calendar, 'hour');
-				        		else $cases2[$h][$event->id]['string'] .= '-'.dol_print_date($event->date_end_in_calendar, 'dayhour');
-			        		}
+							{
+								$tmpa = dol_getdate($event->date_start_in_calendar, true);
+								$tmpb = dol_getdate($event->date_end_in_calendar, true);
+								if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year']) $cases2[$h][$event->id]['string'] .= '-'.dol_print_date($event->date_end_in_calendar, 'hour');
+								else $cases2[$h][$event->id]['string'] .= '-'.dol_print_date($event->date_end_in_calendar, 'dayhour');
+							}
 							if ($event->label) $cases2[$h][$event->id]['string'] .= ' - '.$event->label;
 							$cases2[$h][$event->id]['typecode'] = $event->type_code;
 							$cases2[$h][$event->id]['color'] = $color;
@@ -1241,7 +1241,7 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
 		}
 
 		$ids1 = '';
-        $ids2 = '';
+		$ids2 = '';
 		if (is_array($cases1[$h]) && count($cases1[$h]) && array_keys($cases1[$h])) $ids1 = join(',', array_keys($cases1[$h]));
 		if (is_array($cases2[$h]) && count($cases2[$h]) && array_keys($cases2[$h])) $ids2 = join(',', array_keys($cases2[$h]));
 
diff --git a/htdocs/comm/action/rapport/index.php b/htdocs/comm/action/rapport/index.php
index fbb49772d3e..3534d3d8996 100644
--- a/htdocs/comm/action/rapport/index.php
+++ b/htdocs/comm/action/rapport/index.php
@@ -91,13 +91,13 @@ $sql .= " ORDER BY year DESC, month DESC, df DESC";
 $nbtotalofrecords = '';
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
-    $result = $db->query($sql);
-    $nbtotalofrecords = $db->num_rows($result);
-    if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
-    {
-    	$page = 0;
-    	$offset = 0;
-    }
+	$result = $db->query($sql);
+	$nbtotalofrecords = $db->num_rows($result);
+	if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+	{
+		$page = 0;
+		$offset = 0;
+	}
 }
 
 $sql .= $db->plimit($limit + 1, $offset);
@@ -113,7 +113,7 @@ if ($resql)
 	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
 
 	print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
-    if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+	if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 	print '<input type="hidden" name="action" value="list">';
@@ -125,10 +125,10 @@ if ($resql)
 	$moreforfilter = '';
 
 	$i = 0;
-    print '<div class="div-table-responsive">';
-    print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
+	print '<div class="div-table-responsive">';
+	print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
-    print '<tr class="liste_titre">';
+	print '<tr class="liste_titre">';
 	print '<td>'.$langs->trans("Period").'</td>';
 	print '<td class="center">'.$langs->trans("EventsNb").'</td>';
 	print '<td class="center">'.$langs->trans("Action").'</td>';
diff --git a/htdocs/comm/admin/propal_extrafields.php b/htdocs/comm/admin/propal_extrafields.php
index f926afb56a9..84af27bb7b9 100644
--- a/htdocs/comm/admin/propal_extrafields.php
+++ b/htdocs/comm/admin/propal_extrafields.php
@@ -72,15 +72,15 @@ print dol_get_fiche_head($head, 'attributes', $langs->trans("Proposals"), -1, 'p
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_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>";
 }
 
 
@@ -92,10 +92,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';
 }
 
 /* ************************************************************************** */
@@ -105,10 +105,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/admin/propaldet_extrafields.php b/htdocs/comm/admin/propaldet_extrafields.php
index aa6dac82910..fa12fe9b555 100644
--- a/htdocs/comm/admin/propaldet_extrafields.php
+++ b/htdocs/comm/admin/propaldet_extrafields.php
@@ -79,7 +79,7 @@ print dol_get_fiche_head($head, 'attributeslines', $langs->trans("Proposals"), -
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 // Buttons
diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index 63a6a24aeaa..624526a9a5d 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -487,26 +487,26 @@ if ($object->id > 0)
 		print '</tr>';
 	}
 
-    if (! empty($conf->intracommreport->enabled))
-    {
-        // Transport mode by default
-        print '<tr><td class="nowrap">';
-        print '<table class="centpercent nobordernopadding"><tr><td class="nowrap">';
-        print $langs->trans('IntracommReportTransportMode');
-        print '<td>';
-        if (($action != 'edittransportmode') && $user->rights->societe->creer) print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=edittransportmode&amp;socid='.$object->id.'">'.img_edit($langs->trans('SetMode'), 1).'</a></td>';
-        print '</tr></table>';
-        print '</td><td>';
-        if ($action == 'edittransportmode')
-        {
-            $form->formSelectTransportMode($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->fk_transport_mode, 'fk_transport_mode', 1);
-        }
-        else {
-            $form->formSelectTransportMode($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->fk_transport_mode, 'none');
-        }
-        print "</td>";
-        print '</tr>';
-    }
+	if (!empty($conf->intracommreport->enabled))
+	{
+		// Transport mode by default
+		print '<tr><td class="nowrap">';
+		print '<table class="centpercent nobordernopadding"><tr><td class="nowrap">';
+		print $langs->trans('IntracommReportTransportMode');
+		print '<td>';
+		if (($action != 'edittransportmode') && $user->rights->societe->creer) print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=edittransportmode&amp;socid='.$object->id.'">'.img_edit($langs->trans('SetMode'), 1).'</a></td>';
+		print '</tr></table>';
+		print '</td><td>';
+		if ($action == 'edittransportmode')
+		{
+			$form->formSelectTransportMode($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->fk_transport_mode, 'fk_transport_mode', 1);
+		}
+		else {
+			$form->formSelectTransportMode($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->fk_transport_mode, 'none');
+		}
+		print "</td>";
+		print '</tr>';
+	}
 
 	// Categories
 	if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire)) {
@@ -675,15 +675,15 @@ if ($object->id > 0)
 		if ($outstandingOpened != $outstandingOpenedLate && !empty($outstandingOpenedLate)) {
 			$warn = '';
 			if ($object->outstanding_limit != '' && $object->outstanding_limit < $outstandingOpenedLate) {
-				$warn = ' ' . img_warning($langs->trans("OutstandingBillReached"));
+				$warn = ' '.img_warning($langs->trans("OutstandingBillReached"));
 			}
 			$text = $langs->trans("CurrentOutstandingBillLate");
-			$link = DOL_URL_ROOT . '/compta/recap-compta.php?socid=' . $object->id;
+			$link = DOL_URL_ROOT.'/compta/recap-compta.php?socid='.$object->id;
 			$icon = 'bill';
-			if ($link) $boxstat .= '<a href="' . $link . '" class="boxstatsindicator thumbstat nobold nounderline">';
-			$boxstat .= '<div class="boxstats" title="' . dol_escape_htmltag($text) . '">';
-			$boxstat .= '<span class="boxstatstext">' . img_object("", $icon) . ' <span>' . $text . '</span></span><br>';
-			$boxstat .= '<span class="boxstatsindicator' . ($outstandingOpenedLate > 0 ? ' amountremaintopay' : '') . '">'.price($outstandingOpenedLate, 1, $langs, 1, -1, -1, $conf->currency) . $warn . '</span>';
+			if ($link) $boxstat .= '<a href="'.$link.'" class="boxstatsindicator thumbstat nobold nounderline">';
+			$boxstat .= '<div class="boxstats" title="'.dol_escape_htmltag($text).'">';
+			$boxstat .= '<span class="boxstatstext">'.img_object("", $icon).' <span>'.$text.'</span></span><br>';
+			$boxstat .= '<span class="boxstatsindicator'.($outstandingOpenedLate > 0 ? ' amountremaintopay' : '').'">'.price($outstandingOpenedLate, 1, $langs, 1, -1, -1, $conf->currency).$warn.'</span>';
 			$boxstat .= '</div>';
 			if ($link) $boxstat .= '</a>';
 		}
@@ -973,7 +973,7 @@ if ($object->id > 0)
 				$late = '';
 				foreach ($contrat->lines as $line) {
 					if ($contrat->statut == Contrat::STATUS_VALIDATED && $line->statut == ContratLigne::STATUS_OPEN) {
-						if (((!empty($line->date_fin_validite)?$line->date_fin_validite:0) + $conf->contrat->services->expires->warning_delay) < $now) $late = img_warning($langs->trans("Late"));
+						if (((!empty($line->date_fin_validite) ? $line->date_fin_validite : 0) + $conf->contrat->services->expires->warning_delay) < $now) $late = img_warning($langs->trans("Late"));
 					}
 				}
 
@@ -1256,7 +1256,7 @@ if ($object->id > 0)
 	print '</div></div></div>';
 	print '<div style="clear:both"></div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 
 	/*
diff --git a/htdocs/comm/contact.php b/htdocs/comm/contact.php
index 1038afa923f..9c4e1437ced 100644
--- a/htdocs/comm/contact.php
+++ b/htdocs/comm/contact.php
@@ -59,13 +59,13 @@ llxHeader('', $langs->trans("Contacts"));
 
 if ($type == "c" || $type == "p")
 {
-    $label = $langs->trans("Customers");
-    $urlfiche = "card.php";
+	$label = $langs->trans("Customers");
+	$urlfiche = "card.php";
 }
 if ($type == "f")
 {
-    $label = $langs->trans("Suppliers");
-    $urlfiche = "card.php";
+	$label = $langs->trans("Suppliers");
+	$urlfiche = "card.php";
 }
 
 /*
@@ -88,29 +88,29 @@ if ($socid) $sql .= " AND s.rowid = ".$socid;
 
 if (dol_strlen($stcomm))
 {
-    $sql .= " AND s.fk_stcomm=".$db->escape($stcomm);
+	$sql .= " AND s.fk_stcomm=".$db->escape($stcomm);
 }
 
 if (!empty($search_lastname))
 {
-    $sql .= " AND p.name LIKE '%".$db->escape($search_lastname)."%'";
+	$sql .= " AND p.name LIKE '%".$db->escape($search_lastname)."%'";
 }
 
 if (!empty($search_firstname))
 {
-    $sql .= " AND p.firstname LIKE '%".$db->escape($search_firstname)."%'";
+	$sql .= " AND p.firstname LIKE '%".$db->escape($search_firstname)."%'";
 }
 
 if (!empty($search_company))
 {
-    $sql .= " AND s.nom LIKE '%".$db->escape($search_company)."%'";
+	$sql .= " AND s.nom LIKE '%".$db->escape($search_company)."%'";
 }
 
 if (!empty($contactname)) // acces a partir du module de recherche
 {
-    $sql .= " AND (p.name LIKE '%".$db->escape($contactname)."%' OR lower(p.firstname) LIKE '%".$db->escape($contactname)."%') ";
-    $sortfield = "p.name";
-    $sortorder = "ASC";
+	$sql .= " AND (p.name LIKE '%".$db->escape($contactname)."%' OR lower(p.firstname) LIKE '%".$db->escape($contactname)."%') ";
+	$sortfield = "p.name";
+	$sortorder = "ASC";
 }
 
 $sql .= $db->order($sortfield, $sortorder);
@@ -171,7 +171,7 @@ if ($resql)
 
 	$db->free($resql);
 } else {
-    dol_print_error($db);
+	dol_print_error($db);
 }
 
 // End of page
diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php
index b305858bd93..8ce38ba4ea3 100644
--- a/htdocs/comm/index.php
+++ b/htdocs/comm/index.php
@@ -137,10 +137,10 @@ if (!empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS)) {
  * Draft customer proposals
  */
 if (!empty($conf->propal->enabled) && $user->rights->propal->lire) {
-	$sql = "SELECT p.rowid, p.ref, p.ref_client, p.total_ht, p.tva as total_tva, p.total as total_ttc";
-	$sql .= ", s.rowid as socid, s.nom as name, s.client, s.canvas, s.code_client, s.email, s.entity, s.code_compta";
-	$sql .= " FROM ".MAIN_DB_PREFIX."propal as p";
-	$sql .= ", ".MAIN_DB_PREFIX."societe as s";
+	$sql = "SELECT p.rowid, p.ref, p.ref_client, p.total_ht, p.tva as total_tva, p.total as total_ttc, p.fk_statut as status,";
+	$sql .= " s.rowid as socid, s.nom as name, s.client, s.canvas, s.code_client, s.email, s.entity, s.code_compta";
+	$sql .= " FROM ".MAIN_DB_PREFIX."propal as p,";
+	$sql .= " ".MAIN_DB_PREFIX."societe as s";
 	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	$sql .= " WHERE p.entity IN (".getEntity($propalstatic->element).")";
 	$sql .= " AND p.fk_soc = s.rowid";
@@ -167,6 +167,7 @@ if (!empty($conf->propal->enabled) && $user->rights->propal->lire) {
 				$propalstatic->total_ht = $obj->total_ht;
 				$propalstatic->total_tva = $obj->total_tva;
 				$propalstatic->total_ttc = $obj->total_ttc;
+				$propalstatic->statut = $obj->status;
 
 				$companystatic->id = $obj->socid;
 				$companystatic->name = $obj->name;
@@ -203,10 +204,10 @@ if (!empty($conf->propal->enabled) && $user->rights->propal->lire) {
  * Draft supplier proposals
  */
 if (!empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposal->lire) {
-	$sql = "SELECT p.rowid, p.ref, p.total_ht, p.tva as total_tva, p.total as total_ttc";
-	$sql .= ", s.rowid as socid, s.nom as name, s.client, s.canvas, s.code_client, s.code_fournisseur, s.entity, s.email";
-	$sql .= " FROM ".MAIN_DB_PREFIX."supplier_proposal as p";
-	$sql .= ", ".MAIN_DB_PREFIX."societe as s";
+	$sql = "SELECT p.rowid, p.ref, p.total_ht, p.tva as total_tva, p.total as total_ttc, p.fk_statut as status,";
+	$sql .= " s.rowid as socid, s.nom as name, s.client, s.canvas, s.code_client, s.code_fournisseur, s.entity, s.email";
+	$sql .= " FROM ".MAIN_DB_PREFIX."supplier_proposal as p,";
+	$sql .= " ".MAIN_DB_PREFIX."societe as s";
 	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	$sql .= " WHERE p.entity IN (".getEntity($supplierproposalstatic->element).")";
 	$sql .= " AND p.fk_statut = ".SupplierProposal::STATUS_DRAFT;
@@ -232,6 +233,7 @@ if (!empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposa
 				$supplierproposalstatic->total_ht = $obj->total_ht;
 				$supplierproposalstatic->total_tva = $obj->total_tva;
 				$supplierproposalstatic->total_ttc = $obj->total_ttc;
+				$supplierproposalstatic->statut	 = $obj->status;
 
 				$companystatic->id = $obj->socid;
 				$companystatic->name = $obj->name;
@@ -267,10 +269,10 @@ if (!empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposa
  * Draft customer orders
  */
 if (!empty($conf->commande->enabled) && $user->rights->commande->lire) {
-	$sql = "SELECT c.rowid, c.ref, c.ref_client, c.total_ht, c.tva as total_tva, c.total_ttc";
-	$sql .= ", s.rowid as socid, s.nom as name, s.client, s.canvas, s.code_client, s.email, s.entity, s.code_compta";
-	$sql .= " FROM ".MAIN_DB_PREFIX."commande as c";
-	$sql .= ", ".MAIN_DB_PREFIX."societe as s";
+	$sql = "SELECT c.rowid, c.ref, c.ref_client, c.total_ht, c.tva as total_tva, c.total_ttc, c.fk_statut as status,";
+	$sql .= " s.rowid as socid, s.nom as name, s.client, s.canvas, s.code_client, s.email, s.entity, s.code_compta";
+	$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.entity IN (".getEntity($orderstatic->element).")";
 	$sql .= " AND c.fk_statut = ".Commande::STATUS_DRAFT;
@@ -297,6 +299,7 @@ if (!empty($conf->commande->enabled) && $user->rights->commande->lire) {
 				$orderstatic->total_ht = $obj->total_ht;
 				$orderstatic->total_tva = $obj->total_tva;
 				$orderstatic->total_ttc = $obj->total_ttc;
+				$orderstatic->statut = $obj->status;
 
 				$companystatic->id = $obj->socid;
 				$companystatic->name = $obj->name;
@@ -329,13 +332,13 @@ if (!empty($conf->commande->enabled) && $user->rights->commande->lire) {
 
 
 /*
- * Draft suppliers orders
+ * Draft purchase orders
  */
 if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled)) && $user->rights->fournisseur->commande->lire) {
-	$sql = "SELECT cf.rowid, cf.ref, cf.ref_supplier, cf.total_ttc";
-	$sql .= ", s.rowid as socid, s.nom as name, s.client, s.canvas, s.code_client, s.code_fournisseur, s.entity, s.email";
-	$sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as cf";
-	$sql .= ", ".MAIN_DB_PREFIX."societe as s";
+	$sql = "SELECT cf.rowid, cf.ref, cf.ref_supplier, cf.total_ttc, cf.fk_statut as status,";
+	$sql .= " s.rowid as socid, s.nom as name, s.client, s.canvas, s.code_client, s.code_fournisseur, s.entity, s.email";
+	$sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as cf,";
+	$sql .= " ".MAIN_DB_PREFIX."societe as s";
 	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	$sql .= " WHERE cf.entity IN (".getEntity($supplierorderstatic->element).")";
 	$sql .= " AND cf.fk_statut = ".CommandeFournisseur::STATUS_DRAFT;
@@ -362,6 +365,7 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU
 				$supplierorderstatic->total_ht = $obj->total_ht;
 				$supplierorderstatic->total_tva = $obj->total_tva;
 				$supplierorderstatic->total_ttc = $obj->total_ttc;
+				$supplierorderstatic->statut = $obj->status;
 
 				$companystatic->id = $obj->socid;
 				$companystatic->name = $obj->name;
diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index 812dea03f43..8697d9dffb2 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -103,7 +103,7 @@ if (empty($reshook))
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
-	    $action = '';
+		$action = '';
 	}
 
 	// Action send emailing for everybody
@@ -188,18 +188,18 @@ if (empty($reshook))
 						// Make substitutions on topic and body. From (AA=YY;BB=CC;...) we keep YY, CC, ...
 						$other = explode(';', $obj->other);
 						$tmpfield = explode('=', $other[0], 2); $other1 = (isset($tmpfield[1]) ? $tmpfield[1] : $tmpfield[0]);
-	                    $tmpfield = explode('=', $other[1], 2); $other2 = (isset($tmpfield[1]) ? $tmpfield[1] : $tmpfield[0]);
-	                    $tmpfield = explode('=', $other[2], 2); $other3 = (isset($tmpfield[1]) ? $tmpfield[1] : $tmpfield[0]);
-	                    $tmpfield = explode('=', $other[3], 2); $other4 = (isset($tmpfield[1]) ? $tmpfield[1] : $tmpfield[0]);
-	                    $tmpfield = explode('=', $other[4], 2); $other5 = (isset($tmpfield[1]) ? $tmpfield[1] : $tmpfield[0]);
+						$tmpfield = explode('=', $other[1], 2); $other2 = (isset($tmpfield[1]) ? $tmpfield[1] : $tmpfield[0]);
+						$tmpfield = explode('=', $other[2], 2); $other3 = (isset($tmpfield[1]) ? $tmpfield[1] : $tmpfield[0]);
+						$tmpfield = explode('=', $other[3], 2); $other4 = (isset($tmpfield[1]) ? $tmpfield[1] : $tmpfield[0]);
+						$tmpfield = explode('=', $other[4], 2); $other5 = (isset($tmpfield[1]) ? $tmpfield[1] : $tmpfield[0]);
 
-	                    $signature = ((!empty($user->signature) && empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN)) ? $user->signature : '');
+						$signature = ((!empty($user->signature) && empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN)) ? $user->signature : '');
 
-	                    $targetobject = null; // Not defined with mass emailing
-	                    $parameters = array('mode'=>'emailing');
-	                    $substitutionarray = getCommonSubstitutionArray($langs, 0, array('object', 'objectamount'), $targetobject); // Note: On mass emailing, this is null because be don't know object
+						$targetobject = null; // Not defined with mass emailing
+						$parameters = array('mode'=>'emailing');
+						$substitutionarray = getCommonSubstitutionArray($langs, 0, array('object', 'objectamount'), $targetobject); // Note: On mass emailing, this is null because be don't know object
 
-	                    // Array of possible substitutions (See also file mailing-send.php that should manage same substitutions)
+						// Array of possible substitutions (See also file mailing-send.php that should manage same substitutions)
 						$substitutionarray['__ID__'] = $obj->source_id;
 						$substitutionarray['__EMAIL__'] = $obj->email;
 						$substitutionarray['__LASTNAME__'] = $obj->lastname;
@@ -253,7 +253,7 @@ if (empty($reshook))
 						}
 						//$substitutionisok=true;
 
-	                    complete_substitutions_array($substitutionarray, $langs);
+						complete_substitutions_array($substitutionarray, $langs);
 						$newsubject = make_substitutions($subject, $substitutionarray);
 						$newmessage = make_substitutions($message, $substitutionarray);
 
@@ -319,7 +319,7 @@ if (empty($reshook))
 										dol_print_error($db);
 									}
 
-								    //Update status communication of contact prospect
+									//Update status communication of contact prospect
 									$sql = "UPDATE ".MAIN_DB_PREFIX."societe SET fk_stcomm=2 WHERE rowid IN (SELECT sc.fk_soc FROM ".MAIN_DB_PREFIX."socpeople AS sc INNER JOIN ".MAIN_DB_PREFIX."mailing_cibles AS mc ON mc.rowid=".$obj->rowid." AND mc.source_type = 'contact' AND mc.source_id = sc.rowid)";
 									dol_syslog("card.php: set prospect contact status", LOG_DEBUG);
 
@@ -331,13 +331,13 @@ if (empty($reshook))
 								}
 							}
 
-						    if (!empty($conf->global->MAILING_DELAY))
-						    {
-						    	dol_syslog("Wait a delay of MAILING_DELAY=".$conf->global->MAILING_DELAY);
-                            	sleep($conf->global->MAILING_DELAY);
-                        	}
+							if (!empty($conf->global->MAILING_DELAY))
+							{
+								dol_syslog("Wait a delay of MAILING_DELAY=".$conf->global->MAILING_DELAY);
+								sleep($conf->global->MAILING_DELAY);
+							}
 
-                        	//test if CHECK READ change statut prospect contact
+							//test if CHECK READ change statut prospect contact
 						} else {
 							// Mail failed
 							$nbko++;
@@ -417,7 +417,7 @@ if (empty($reshook))
 			$object->substitutionarrayfortest['__MAILTOEMAIL__'] = '<a href="mailto:'.$object->sendto.'">'.$object->sendto.'</a>';
 
 			// Subject and message substitutions
-	        complete_substitutions_array($object->substitutionarrayfortest, $langs);
+			complete_substitutions_array($object->substitutionarrayfortest, $langs);
 			$tmpsujet = make_substitutions($object->sujet, $object->substitutionarrayfortest);
 			$tmpbody = make_substitutions($object->body, $object->substitutionarrayfortest);
 
@@ -426,11 +426,11 @@ if (empty($reshook))
 			$arr_name = array();
 			$arr_css  = array();
 
-	        // Add CSS
-	        if (!empty($object->bgcolor)) $arr_css['bgcolor'] = (preg_match('/^#/', $object->bgcolor) ? '' : '#').$object->bgcolor;
-	        if (!empty($object->bgimage)) $arr_css['bgimage'] = $object->bgimage;
+			// Add CSS
+			if (!empty($object->bgcolor)) $arr_css['bgcolor'] = (preg_match('/^#/', $object->bgcolor) ? '' : '#').$object->bgcolor;
+			if (!empty($object->bgimage)) $arr_css['bgimage'] = $object->bgimage;
 
-	        // Attached files
+			// Attached files
 			$listofpaths = dol_dir_list($upload_dir, 'all', 0, '', '', 'name', SORT_ASC, 0);
 			if (count($listofpaths))
 			{
@@ -462,9 +462,9 @@ if (empty($reshook))
 	{
 		$mesgs = array();
 
-		$object->email_from     = GETPOST("from", "none");			// Must allow 'name <email>'
-		$object->email_replyto  = GETPOST("replyto", "none");		// Must allow 'name <email>'
-		$object->email_errorsto = GETPOST("errorsto", "none");		// Must allow 'name <email>'
+		$object->email_from     = GETPOST("from", "none"); // Must allow 'name <email>'
+		$object->email_replyto  = GETPOST("replyto", "none"); // Must allow 'name <email>'
+		$object->email_errorsto = GETPOST("errorsto", "none"); // Must allow 'name <email>'
 		$object->title          = GETPOST("title");
 		$object->sujet          = GETPOST("sujet");
 		$object->body           = GETPOST("bodyemail", 'restricthtml');
@@ -501,10 +501,10 @@ if (empty($reshook))
 		$upload_dir = $conf->mailing->dir_output."/".get_exdir($object->id, 2, 0, 1, $object, 'mailing');
 
 		if ($action == 'settitle') $object->title = trim(GETPOST('title', 'alpha'));
-		elseif ($action == 'setemail_from') $object->email_from = trim(GETPOST('email_from', 'none'));				// Must allow 'name <email>'
-		elseif ($action == 'setemail_replyto') $object->email_replyto = trim(GETPOST('email_replyto', 'none'));		// Must allow 'name <email>'
-		elseif ($action == 'setemail_errorsto') $object->email_errorsto = trim(GETPOST('email_errorsto', 'none'));	// Must allow 'name <email>'
-        elseif ($action == 'settitle' && empty($object->title)) {
+		elseif ($action == 'setemail_from') $object->email_from = trim(GETPOST('email_from', 'none')); // Must allow 'name <email>'
+		elseif ($action == 'setemail_replyto') $object->email_replyto = trim(GETPOST('email_replyto', 'none')); // Must allow 'name <email>'
+		elseif ($action == 'setemail_errorsto') $object->email_errorsto = trim(GETPOST('email_errorsto', 'none')); // Must allow 'name <email>'
+		elseif ($action == 'settitle' && empty($object->title)) {
 			$mesg = $langs->trans("ErrorFieldRequired", $langs->transnoentities("MailTitle"));
 		} elseif ($action == 'setfrom' && empty($object->email_from)) {
 			$mesg = $langs->trans("ErrorFieldRequired", $langs->transnoentities("MailFrom"));
@@ -533,8 +533,8 @@ if (empty($reshook))
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-	    // Set tmp user directory
-	    dol_add_file_process($upload_dir, 0, 0);
+		// Set tmp user directory
+		dol_add_file_process($upload_dir, 0, 0);
 
 		$action = "edit";
 	}
@@ -546,7 +546,7 @@ if (empty($reshook))
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-	    dol_remove_file_process($_POST['removedfile'], 0, 0); // We really delete file linked to mailing
+		dol_remove_file_process($_POST['removedfile'], 0, 0); // We really delete file linked to mailing
 
 		$action = "edit";
 	}
@@ -611,14 +611,14 @@ if (empty($reshook))
 		if ($object->id > 0)
 		{
 			$result = $object->setStatut(0);
-            if ($result > 0)
-            {
-    			//setEventMessages($langs->trans("MailingSuccessfullyValidated"), null, 'mesgs');
-    			header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
-    			exit;
-            } else {
-                setEventMessages($object->error, $object->errors, 'errors');
-            }
+			if ($result > 0)
+			{
+				//setEventMessages($langs->trans("MailingSuccessfullyValidated"), null, 'mesgs');
+				header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+				exit;
+			} else {
+				setEventMessages($object->error, $object->errors, 'errors');
+			}
 		} else {
 			dol_print_error($db);
 		}
@@ -717,7 +717,7 @@ if ($action == 'create')
 	// Other attributes
 	$parameters = array();
 	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-    print $hookmanager->resPrint;
+	print $hookmanager->resPrint;
 	if (empty($reshook))
 	{
 		print $object->showOptionals($extrafields, 'edit');
@@ -741,7 +741,7 @@ if ($action == 'create')
 	$doleditor->Create();
 	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("CreateMailing").'"></div>';
 
@@ -782,7 +782,7 @@ if ($action == 'create')
 			 */
 			if ($action == 'sendall')
 			{
-                // Define message to recommand from command line
+				// Define message to recommand from command line
 				$sendingmode = $conf->global->EMAILING_MAIL_SENDMODE;
 				if (empty($sendingmode)) $sendingmode = $conf->global->MAIN_MAIL_SENDMODE;
 				if (empty($sendingmode)) $sendingmode = 'mail'; // If not defined, we use php mail function
@@ -802,29 +802,29 @@ if ($action == 'create')
 					$_GET["action"] = '';
 				} elseif ($conf->global->MAILING_LIMIT_SENDBYWEB < 0)
 				{
-				    if (!empty($conf->global->MAILING_LIMIT_WARNING_PHPMAIL) && $sendingmode == 'mail') setEventMessages($langs->transnoentitiesnoconv($conf->global->MAILING_LIMIT_WARNING_PHPMAIL), null, 'warnings');
-				    if (!empty($conf->global->MAILING_LIMIT_WARNING_NOPHPMAIL) && $sendingmode != 'mail') setEventMessages($langs->transnoentitiesnoconv($conf->global->MAILING_LIMIT_WARNING_NOPHPMAIL), null, 'warnings');
+					if (!empty($conf->global->MAILING_LIMIT_WARNING_PHPMAIL) && $sendingmode == 'mail') setEventMessages($langs->transnoentitiesnoconv($conf->global->MAILING_LIMIT_WARNING_PHPMAIL), null, 'warnings');
+					if (!empty($conf->global->MAILING_LIMIT_WARNING_NOPHPMAIL) && $sendingmode != 'mail') setEventMessages($langs->transnoentitiesnoconv($conf->global->MAILING_LIMIT_WARNING_NOPHPMAIL), null, 'warnings');
 
 					// The feature is forbidden from GUI, we show just message to use from command line.
-				    setEventMessages($langs->trans("MailingNeedCommand"), null, 'warnings');
+					setEventMessages($langs->trans("MailingNeedCommand"), null, 'warnings');
 					setEventMessages('<textarea cols="60" rows="'.ROWS_1.'" wrap="soft">php ./scripts/emailings/mailing-send.php '.$object->id.'</textarea>', null, 'warnings');
 					if ($conf->file->mailing_limit_sendbyweb != '-1')  // MAILING_LIMIT_SENDBYWEB was set to -1 in database, but it is allowed ot increase it.
 					{
-					    setEventMessages($langs->trans("MailingNeedCommand2"), null, 'warnings'); // You can send online with constant...
+						setEventMessages($langs->trans("MailingNeedCommand2"), null, 'warnings'); // You can send online with constant...
 					}
 					$_GET["action"] = '';
 				} else {
-				    if (!empty($conf->global->MAILING_LIMIT_WARNING_PHPMAIL) && $sendingmode == 'mail') setEventMessages($langs->transnoentitiesnoconv($conf->global->MAILING_LIMIT_WARNING_PHPMAIL), null, 'warnings');
-				    if (!empty($conf->global->MAILING_LIMIT_WARNING_NOPHPMAIL) && $sendingmode != 'mail') setEventMessages($langs->transnoentitiesnoconv($conf->global->MAILING_LIMIT_WARNING_NOPHPMAIL), null, 'warnings');
+					if (!empty($conf->global->MAILING_LIMIT_WARNING_PHPMAIL) && $sendingmode == 'mail') setEventMessages($langs->transnoentitiesnoconv($conf->global->MAILING_LIMIT_WARNING_PHPMAIL), null, 'warnings');
+					if (!empty($conf->global->MAILING_LIMIT_WARNING_NOPHPMAIL) && $sendingmode != 'mail') setEventMessages($langs->transnoentitiesnoconv($conf->global->MAILING_LIMIT_WARNING_NOPHPMAIL), null, 'warnings');
 
-				    $text = '';
-				    if ($conf->global->MAILING_LIMIT_SENDBYCLI >= 0)
-                    {
-                    	$text .= $langs->trans("MailingNeedCommand");
-                    	$text .= '<br><textarea cols="60" rows="'.ROWS_2.'" wrap="soft">php ./scripts/emailings/mailing-send.php '.$object->id.' '.$user->login.'</textarea>';
-                    	$text .= '<br><br>';
-                    }
-				    $text .= $langs->trans('ConfirmSendingEmailing').'<br>';
+					$text = '';
+					if ($conf->global->MAILING_LIMIT_SENDBYCLI >= 0)
+					{
+						$text .= $langs->trans("MailingNeedCommand");
+						$text .= '<br><textarea cols="60" rows="'.ROWS_2.'" wrap="soft">php ./scripts/emailings/mailing-send.php '.$object->id.' '.$user->login.'</textarea>';
+						$text .= '<br><br>';
+					}
+					$text .= $langs->trans('ConfirmSendingEmailing').'<br>';
 					$text .= $langs->trans('LimitSendingEmailing', $conf->global->MAILING_LIMIT_SENDBYWEB);
 					print $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id, $langs->trans('SendMailing'), $text, 'sendallconfirmed', $formquestion, '', 1, 330, 600);
 				}
@@ -896,23 +896,23 @@ if ($action == 'create')
 			$nbemail = ($object->nbemail ? $object->nbemail : 0);
 			if (is_numeric($nbemail))
 			{
-			    $text = '';
-			    if ((!empty($conf->global->MAILING_LIMIT_SENDBYWEB) && $conf->global->MAILING_LIMIT_SENDBYWEB < $nbemail) && ($object->statut == 1 || ($object->statut == 2 && $nbtry < $nbemail)))
-			    {
-    				if ($conf->global->MAILING_LIMIT_SENDBYWEB > 0)
-    				{
-    					$text .= $langs->trans('LimitSendingEmailing', $conf->global->MAILING_LIMIT_SENDBYWEB);
-    				} else {
-    					$text .= $langs->trans('SendingFromWebInterfaceIsNotAllowed');
-    				}
-			    }
-			    if (empty($nbemail)) $nbemail .= ' '.img_warning('').' <font class="warning">'.$langs->trans("NoTargetYet").'</font>';
+				$text = '';
+				if ((!empty($conf->global->MAILING_LIMIT_SENDBYWEB) && $conf->global->MAILING_LIMIT_SENDBYWEB < $nbemail) && ($object->statut == 1 || ($object->statut == 2 && $nbtry < $nbemail)))
+				{
+					if ($conf->global->MAILING_LIMIT_SENDBYWEB > 0)
+					{
+						$text .= $langs->trans('LimitSendingEmailing', $conf->global->MAILING_LIMIT_SENDBYWEB);
+					} else {
+						$text .= $langs->trans('SendingFromWebInterfaceIsNotAllowed');
+					}
+				}
+				if (empty($nbemail)) $nbemail .= ' '.img_warning('').' <font class="warning">'.$langs->trans("NoTargetYet").'</font>';
 				if ($text)
-    			{
-    			    print $form->textwithpicto($nbemail, $text, 1, 'warning');
-    			} else {
-    				print $nbemail;
-    			}
+				{
+					print $form->textwithpicto($nbemail, $text, 1, 'warning');
+				} else {
+					print $nbemail;
+				}
 			}
 			print '</td></tr>';
 
@@ -923,7 +923,7 @@ if ($action == 'create')
 
 			print "</div>";
 
-			dol_fiche_end();
+			print dol_get_fiche_end();
 
 
 			// Clone confirmation
@@ -1030,12 +1030,12 @@ if ($action == 'create')
 			// Display of the TEST form
 			if ($action == 'test')
 			{
-			    print '<div id="formmailbeforetitle" name="formmailbeforetitle"></div>';
-			    print load_fiche_titre($langs->trans("TestMailing"));
+				print '<div id="formmailbeforetitle" name="formmailbeforetitle"></div>';
+				print load_fiche_titre($langs->trans("TestMailing"));
 
-			    print dol_get_fiche_head(null, '', '', -1);
+				print dol_get_fiche_head(null, '', '', -1);
 
-			    // Create mail form object
+				// Create mail form object
 				include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
 				$formmail = new FormMail($db);
 				$formmail->fromname = $object->email_from;
@@ -1064,7 +1064,7 @@ if ($action == 'create')
 
 				print '<br>';
 
-				dol_fiche_end();
+				print dol_get_fiche_end();
 
 				print dol_set_focus('#sendto');
 			}
@@ -1103,14 +1103,14 @@ if ($action == 'create')
 			}
 			print '</td></tr>';
 
-            // Background color
-            /*print '<tr><td width="15%">'.$langs->trans("BackgroundColorByDefault").'</td><td colspan="3">';
+			// Background color
+			/*print '<tr><td width="15%">'.$langs->trans("BackgroundColorByDefault").'</td><td colspan="3">';
             print $htmlother->selectColor($object->bgcolor,'bgcolor','',0);
             print '</td></tr>';*/
 
 			print '</table>';
 
-		    // Message
+			// Message
 			print '<div style="padding-top: 10px; background: '.($object->bgcolor ? (preg_match('/^#/', $object->bgcolor) ? '' : '#').$object->bgcolor : 'white').'">';
 			if (empty($object->bgcolor) || strtolower($object->bgcolor) == 'ffffff')	// CKEditor does not apply the color of the div into its content area
 			{
@@ -1122,7 +1122,7 @@ if ($action == 'create')
 			} else print dol_htmlentitiesbr($object->body);
 			print '</div>';
 
-			dol_fiche_end();
+			print dol_get_fiche_end();
 		} else {
 			/*
 			 * Edition mode mailing (CKeditor or HTML source)
@@ -1186,7 +1186,7 @@ if ($action == 'create')
 			// Other attributes
 			$parameters = array();
 			$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-            print $hookmanager->resPrint;
+			print $hookmanager->resPrint;
 			if (empty($reshook))
 			{
 				print $object->showOptionals($extrafields, 'edit', $parameters);
@@ -1195,7 +1195,7 @@ if ($action == 'create')
 			print '</table>';
 			print '</div>';
 
-			dol_fiche_end();
+			print dol_get_fiche_end();
 
 
 
@@ -1261,7 +1261,7 @@ if ($action == 'create')
 			print $out;
 			print '</td></tr>';
 
-		    // Background color
+			// Background color
 			print '<tr><td>'.$langs->trans("BackgroundColorByDefault").'</td><td colspan="3">';
 			print $htmlother->selectColor($object->bgcolor, 'bgcolor', '', 0);
 			print '</td></tr>';
@@ -1289,7 +1289,7 @@ if ($action == 'create')
 			print '</div>';
 
 
-			dol_fiche_end();
+			print dol_get_fiche_end();
 
 			print '<div class="center">';
 			print '<input type="submit" class="button buttonforacesave" value="'.$langs->trans("Save").'" name="save">';
diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php
index 2b59550cf2b..0d621dfa186 100644
--- a/htdocs/comm/mailing/cibles.php
+++ b/htdocs/comm/mailing/cibles.php
@@ -78,13 +78,13 @@ if ($action == 'add')
 
 	foreach ($modulesdir as $dir)
 	{
-	    // Load modules attributes in arrays (name, numero, orders) from dir directory
-	    //print $dir."\n<br>";
-	    dol_syslog("Scan directory ".$dir." for modules");
+		// Load modules attributes in arrays (name, numero, orders) from dir directory
+		//print $dir."\n<br>";
+		dol_syslog("Scan directory ".$dir." for modules");
 
-	    // Loading Class
-	    $file = $dir."/".$module.".modules.php";
-	    $classname = "mailing_".$module;
+		// Loading Class
+		$file = $dir."/".$module.".modules.php";
+		$classname = "mailing_".$module;
 
 		if (file_exists($file))
 		{
@@ -305,7 +305,7 @@ if ($object->fetch($id) >= 0)
 
 	print "</div>";
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<br>';
 
@@ -337,12 +337,12 @@ if ($object->fetch($id) >= 0)
 
 		foreach ($modulesdir as $dir)
 		{
-		    $modulenames = array();
+			$modulenames = array();
 
-		    // Load modules attributes in arrays (name, numero, orders) from dir directory
-		    //print $dir."\n<br>";
-		    dol_syslog("Scan directory ".$dir." for modules");
-		    $handle = @opendir($dir);
+			// Load modules attributes in arrays (name, numero, orders) from dir directory
+			//print $dir."\n<br>";
+			dol_syslog("Scan directory ".$dir." for modules");
+			$handle = @opendir($dir);
 			if (is_resource($handle))
 			{
 				while (($file = readdir($handle)) !== false)
@@ -396,7 +396,7 @@ if ($object->fetch($id) >= 0)
 						print '<form '.$bctag[$var].' name="'.$modulename.'" action="'.$_SERVER['PHP_SELF'].'?action=add&id='.$object->id.'&module='.$modulename.'" method="POST" enctype="multipart/form-data">';
 						print '<input type="hidden" name="token" value="'.newToken().'">';
 					} else {
-					    print '<div '.$bctag[$var].'>';
+						print '<div '.$bctag[$var].'>';
 					}
 
 					print '<div class="tagtd">';
@@ -425,14 +425,14 @@ if ($object->fetch($id) >= 0)
 					print '<div class="tagtd left">';
 					if ($allowaddtarget)
 					{
-    					try {
-    						$filter = $obj->formFilter();
-    					} catch (Exception $e)
-    					{
-    						dol_syslog($e->getMessage(), LOG_ERR);
-    					}
-    					if ($filter) print $filter;
-    					else print $langs->trans("None");
+						try {
+							$filter = $obj->formFilter();
+						} catch (Exception $e)
+						{
+							dol_syslog($e->getMessage(), LOG_ERR);
+						}
+						if ($filter) print $filter;
+						else print $langs->trans("None");
 					}
 					print '</div>';
 
@@ -441,7 +441,7 @@ if ($object->fetch($id) >= 0)
 					{
 						print '<input type="submit" class="button" name="button_'.$modulename.'" value="'.$langs->trans("Add").'">';
 					} else {
-					    print '<input type="submit" class="button disabled" disabled="disabled" name="button_'.$modulename.'" value="'.$langs->trans("Add").'">';
+						print '<input type="submit" class="button disabled" disabled="disabled" name="button_'.$modulename.'" value="'.$langs->trans("Add").'">';
 						//print $langs->trans("MailNoChangePossible");
 						print "&nbsp;";
 					}
@@ -474,13 +474,13 @@ if ($object->fetch($id) >= 0)
 	$nbtotalofrecords = '';
 	if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 	{
-	    $result = $db->query($sql);
-	    $nbtotalofrecords = $db->num_rows($result);
-	    if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
-	    {
-	    	$page = 0;
-	    	$offset = 0;
-	    }
+		$result = $db->query($sql);
+		$nbtotalofrecords = $db->num_rows($result);
+		if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+		{
+			$page = 0;
+			$offset = 0;
+		}
 	}
 
 	//$nbtotalofrecords=$object->nbemail;     // nbemail is a denormalized field storing nb of targets
@@ -503,7 +503,7 @@ if ($object->fetch($id) >= 0)
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 		print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-        print '<input type="hidden" name="page" value="'.$page.'">';
+		print '<input type="hidden" name="page" value="'.$page.'">';
 		print '<input type="hidden" name="id" value="'.$object->id.'">';
 
 		$morehtmlcenter = '';
@@ -521,7 +521,7 @@ if ($object->fetch($id) >= 0)
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 		print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-        print '<input type="hidden" name="page" value="'.$page.'">';
+		print '<input type="hidden" name="page" value="'.$page.'">';
 		print '<input type="hidden" name="id" value="'.$object->id.'">';
 		print '<input type="hidden" name="limit" value="'.$limit.'">';
 
@@ -611,30 +611,30 @@ if ($object->fetch($id) >= 0)
 				print '<td>'.$obj->firstname.'</td>';
 				print '<td>'.$obj->other.'</td>';
 				print '<td class="center">';
-                if (empty($obj->source_id) || empty($obj->source_type))
-                {
-                    print empty($obj->source_url) ? '' : $obj->source_url; // For backward compatibility
-                } else {
-                    if ($obj->source_type == 'member')
-                    {
+				if (empty($obj->source_id) || empty($obj->source_type))
+				{
+					print empty($obj->source_url) ? '' : $obj->source_url; // For backward compatibility
+				} else {
+					if ($obj->source_type == 'member')
+					{
 						$objectstaticmember->fetch($obj->source_id);
-                        print $objectstaticmember->getNomUrl(1);
-                    } elseif ($obj->source_type == 'user')
-                    {
+						print $objectstaticmember->getNomUrl(1);
+					} elseif ($obj->source_type == 'user')
+					{
 						$objectstaticuser->fetch($obj->source_id);
-                        print $objectstaticuser->getNomUrl(1);
-                    } elseif ($obj->source_type == 'thirdparty')
-                    {
+						print $objectstaticuser->getNomUrl(1);
+					} elseif ($obj->source_type == 'thirdparty')
+					{
 						$objectstaticcompany->fetch($obj->source_id);
-                        print $objectstaticcompany->getNomUrl(1);
-                    } elseif ($obj->source_type == 'contact')
-                    {
-                    	$objectstaticcontact->fetch($obj->source_id);
-                    	print $objectstaticcontact->getNomUrl(1);
-                    } else {
-                        print $obj->source_url;
-                    }
-                }
+						print $objectstaticcompany->getNomUrl(1);
+					} elseif ($obj->source_type == 'contact')
+					{
+						$objectstaticcontact->fetch($obj->source_id);
+						print $objectstaticcontact->getNomUrl(1);
+					} else {
+						print $obj->source_url;
+					}
+				}
 				print '</td>';
 
 				// Date last update
@@ -680,9 +680,9 @@ if ($object->fetch($id) >= 0)
 		} else {
 			if ($object->statut < 2)
 			{
-			    print '<tr><td colspan="9" class="opacitymedium">';
-    			print $langs->trans("NoTargetYet");
-    			print '</td></tr>';
+				print '<tr><td colspan="9" class="opacitymedium">';
+				print $langs->trans("NoTargetYet");
+				print '</td></tr>';
 			}
 		}
 		print "</table><br>";
diff --git a/htdocs/comm/mailing/class/advtargetemailing.class.php b/htdocs/comm/mailing/class/advtargetemailing.class.php
index b5e115d8463..447b970f39e 100644
--- a/htdocs/comm/mailing/class/advtargetemailing.class.php
+++ b/htdocs/comm/mailing/class/advtargetemailing.class.php
@@ -28,10 +28,10 @@
  */
 class AdvanceTargetingMailing extends CommonObject
 {
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
 	/**
 	 * @var string Error code (or message)
@@ -58,20 +58,20 @@ class AdvanceTargetingMailing extends CommonObject
 	 */
 	public $id;
 
-    public $name;
-    public $entity;
-    public $fk_element;
-    public $type_element;
-    public $filtervalue;
-    public $fk_user_author;
-    public $datec = '';
-    public $fk_user_mod;
-    public $tms = '';
+	public $name;
+	public $entity;
+	public $fk_element;
+	public $type_element;
+	public $filtervalue;
+	public $fk_user_author;
+	public $datec = '';
+	public $fk_user_mod;
+	public $tms = '';
 
-    public $select_target_type = array();
-    public $type_statuscommprospect = array();
-    public $thirdparty_lines;
-    public $contact_lines;
+	public $select_target_type = array();
+	public $type_statuscommprospect = array();
+	public $thirdparty_lines;
+	public $contact_lines;
 
 
 	/**
@@ -79,7 +79,7 @@ class AdvanceTargetingMailing extends CommonObject
 	 *
 	 *  @param  DoliDb		$db		Database handler
 	 */
-    public function __construct($db)
+	public function __construct($db)
 	{
 		global $langs;
 		$langs->load('customers');
@@ -108,7 +108,7 @@ class AdvanceTargetingMailing extends CommonObject
 	 *  @param  int		$notrigger   0=launch triggers after, 1=disable triggers
 	 *  @return int      		   	 <0 if KO, Id of created object if OK
 	 */
-    public function create($user, $notrigger = 0)
+	public function create($user, $notrigger = 0)
 	{
 		global $conf, $langs;
 		$error = 0;
@@ -177,7 +177,7 @@ class AdvanceTargetingMailing extends CommonObject
 	 *  @param	int		$id    Id object
 	 *  @return int          	<0 if KO, >0 if OK
 	 */
-    public function fetch($id)
+	public function fetch($id)
 	{
 		global $langs;
 		$sql = "SELECT";
@@ -226,16 +226,16 @@ class AdvanceTargetingMailing extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Load object in memory from the database
 	 *
 	 *  @param	int		$id    Id object
 	 *  @return int          	<0 if KO, >0 if OK
 	 */
-    public function fetch_by_mailing($id = 0)
+	public function fetch_by_mailing($id = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 		$sql = "SELECT";
 		$sql .= " t.rowid,";
@@ -290,7 +290,7 @@ class AdvanceTargetingMailing extends CommonObject
 
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Load object in memory from the database
 	 *
@@ -298,9 +298,9 @@ class AdvanceTargetingMailing extends CommonObject
 	 *  @param	string	$type_element	Type target
 	 *  @return int          			<0 if KO, >0 if OK
 	 */
-    public function fetch_by_element($id = 0, $type_element = 'mailing')
+	public function fetch_by_element($id = 0, $type_element = 'mailing')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 		$sql = "SELECT";
 		$sql .= " t.rowid,";
@@ -359,7 +359,7 @@ class AdvanceTargetingMailing extends CommonObject
 	 *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
 	 *  @return int     		   	 <0 if KO, >0 if OK
 	 */
-    public function update($user, $notrigger = 0)
+	public function update($user, $notrigger = 0)
 	{
 		global $conf, $langs;
 		$error = 0;
@@ -389,9 +389,9 @@ class AdvanceTargetingMailing extends CommonObject
 		dol_syslog(get_class($this)."::update sql=".$sql, LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if (!$resql) {
-            $error++;
-            $this->errors[] = "Error ".$this->db->lasterror();
-        }
+			$error++;
+			$this->errors[] = "Error ".$this->db->lasterror();
+		}
 
 		// Commit or rollback
 		if ($error)
@@ -416,7 +416,7 @@ class AdvanceTargetingMailing extends CommonObject
 	 *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
 	 *  @return	int					 <0 if KO, >0 if OK
 	 */
-    public function delete($user, $notrigger = 0)
+	public function delete($user, $notrigger = 0)
 	{
 		global $conf, $langs;
 		$error = 0;
@@ -457,7 +457,7 @@ class AdvanceTargetingMailing extends CommonObject
 	 * 	@param		array		$arrayquery		All element to Query
 	 * 	@return		int			<0 if KO, >0 if OK
 	 */
-    public function savequery($user, $arrayquery)
+	public function savequery($user, $arrayquery)
 	{
 		global $langs, $conf;
 
@@ -477,16 +477,16 @@ class AdvanceTargetingMailing extends CommonObject
 
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Load object in memory from database
 	 *
 	 * 	@param		array		$arrayquery	All element to Query
 	 * 	@return		int			<0 if KO, >0 if OK
 	 */
-    public function query_thirdparty($arrayquery)
+	public function query_thirdparty($arrayquery)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs, $conf, $extrafields;
 
 		$sql = "SELECT";
@@ -625,7 +625,7 @@ class AdvanceTargetingMailing extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Load object in memory from database
 	 *
@@ -633,9 +633,9 @@ class AdvanceTargetingMailing extends CommonObject
 	 * 	@param		int			$withThirdpartyFilter	add contact with tridparty filter
 	 * 	@return		int			<0 if KO, >0 if OK
 	 */
-    public function query_contact($arrayquery, $withThirdpartyFilter = 0)
+	public function query_contact($arrayquery, $withThirdpartyFilter = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs, $conf;
 
 		$sql = "SELECT";
@@ -878,8 +878,8 @@ class AdvanceTargetingMailing extends CommonObject
 	 *  									For exemple  jean;joe;jim%%;!jimo;!jima%> will target all jean, joe, start with jim but not jimo and not everythnig taht start by jima
 	 * 	@return		string		Sql to use for the where condition
 	 */
-    public function transformToSQL($column_to_test, $criteria)
-    {
+	public function transformToSQL($column_to_test, $criteria)
+	{
 		$return_sql_criteria = '(';
 
 		//This is a multiple value test
diff --git a/htdocs/comm/mailing/class/html.formadvtargetemailing.class.php b/htdocs/comm/mailing/class/html.formadvtargetemailing.class.php
index 53fafb0ce61..9d230404cba 100644
--- a/htdocs/comm/mailing/class/html.formadvtargetemailing.class.php
+++ b/htdocs/comm/mailing/class/html.formadvtargetemailing.class.php
@@ -28,9 +28,9 @@
 class FormAdvTargetEmailing extends Form
 {
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
 	/**
 	 * @var string Error code (or message)
@@ -42,12 +42,12 @@ class FormAdvTargetEmailing extends Form
 	 *
 	 * @param DoliDB $db handler
 	 */
-    public function __construct($db)
-    {
-        global $langs;
+	public function __construct($db)
+	{
+		global $langs;
 
-        $this->db = $db;
-    }
+		$this->db = $db;
+	}
 
 	/**
 	 * Affiche un champs select contenant une liste
@@ -56,8 +56,8 @@ class FormAdvTargetEmailing extends Form
 	 * @param string $htmlname select field
 	 * @return string select field
 	 */
-    public function multiselectProspectionStatus($selected_array = array(), $htmlname = 'cust_prospect_status')
-    {
+	public function multiselectProspectionStatus($selected_array = array(), $htmlname = 'cust_prospect_status')
+	{
 		global $conf, $langs;
 		$options_array = array();
 
@@ -84,7 +84,7 @@ class FormAdvTargetEmailing extends Form
 			dol_print_error($this->db);
 		}
 		return $this->advMultiselectarray($htmlname, $options_array, $selected_array);
-    }
+	}
 
 	/**
 	 * Return combo list of activated countries, into language of user
@@ -93,8 +93,8 @@ class FormAdvTargetEmailing extends Form
 	 * @param array $selected_array or Code or Label of preselected country
 	 * @return string HTML string with select
 	 */
-    public function multiselectCountry($htmlname = 'country_id', $selected_array = array())
-    {
+	public function multiselectCountry($htmlname = 'country_id', $selected_array = array())
+	{
 		global $conf, $langs;
 
 		$langs->load("dict");
@@ -142,7 +142,7 @@ class FormAdvTargetEmailing extends Form
 		}
 
 		return $this->advMultiselectarray($htmlname, $options_array, $selected_array);
-    }
+	}
 
 	/**
 	 * Return select list for categories (to use in form search selectors)
@@ -152,14 +152,14 @@ class FormAdvTargetEmailing extends Form
 	 * @param User $user User action
 	 * @return string combo list code
 	 */
-    public function multiselectselectSalesRepresentatives($htmlname, $selected_array, $user)
-    {
+	public function multiselectselectSalesRepresentatives($htmlname, $selected_array, $user)
+	{
 
 		global $conf;
 
 		$options_array = array();
 
-        $sql_usr = '';
+		$sql_usr = '';
 		$sql_usr .= "SELECT DISTINCT u2.rowid, u2.lastname as name, u2.firstname, u2.login";
 		$sql_usr .= " FROM ".MAIN_DB_PREFIX."user as u2, ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		$sql_usr .= " WHERE u2.entity IN (0,".$conf->entity.")";
@@ -183,7 +183,7 @@ class FormAdvTargetEmailing extends Form
 		}
 
 		return $this->advMultiselectarray($htmlname, $options_array, $selected_array);
-    }
+	}
 
 	/**
 	 * Return select list for categories (to use in form search selectors)
@@ -192,8 +192,8 @@ class FormAdvTargetEmailing extends Form
 	 * @param array $selected_array selected array
 	 * @return string combo list code
 	 */
-    public function multiselectselectLanguage($htmlname = '', $selected_array = array())
-    {
+	public function multiselectselectLanguage($htmlname = '', $selected_array = array())
+	{
 
 		global $conf, $langs;
 
@@ -208,7 +208,7 @@ class FormAdvTargetEmailing extends Form
 		}
 		asort($options_array);
 		return $this->advMultiselectarray($htmlname, $options_array, $selected_array);
-    }
+	}
 
 	/**
 	 * Return multiselect list of entities for extrafeild type sellist
@@ -330,14 +330,14 @@ class FormAdvTargetEmailing extends Form
 	 * @param int $showempty show empty
 	 * @return string HTML combo
 	 */
-    public function advMultiselectarray($htmlname, $options_array = array(), $selected_array = array(), $showempty = 0)
-    {
+	public function advMultiselectarray($htmlname, $options_array = array(), $selected_array = array(), $showempty = 0)
+	{
 		global $conf, $langs;
 
 		$form = new Form($this->db);
 		$return = $form->multiselectarray($htmlname, $options_array, $selected_array, 0, 0, '', 0, 295);
 		return $return;
-    }
+	}
 
 	/**
 	 * Return a combo list to select emailing target selector
@@ -349,8 +349,8 @@ class FormAdvTargetEmailing extends Form
 	 * @param	string		$morecss		More CSS
 	 * @return	string 						HTML combo
 	 */
-    public function selectAdvtargetemailingTemplate($htmlname = 'template_id', $selected = 0, $showempty = 0, $type_element = 'mailing', $morecss = '')
-    {
+	public function selectAdvtargetemailingTemplate($htmlname = 'template_id', $selected = 0, $showempty = 0, $type_element = 'mailing', $morecss = '')
+	{
 		global $conf, $user, $langs;
 
 		$out = '';
@@ -390,5 +390,5 @@ class FormAdvTargetEmailing extends Form
 		}
 		$this->db->free($resql);
 		return $out;
-    }
+	}
 }
diff --git a/htdocs/comm/mailing/class/mailing.class.php b/htdocs/comm/mailing/class/mailing.class.php
index a4088975bd2..48c00c697a1 100644
--- a/htdocs/comm/mailing/class/mailing.class.php
+++ b/htdocs/comm/mailing/class/mailing.class.php
@@ -68,8 +68,8 @@ class Mailing extends CommonObject
 	public $user_valid;
 
 	/**
-     * @var integer|string date_creation
-     */
+	 * @var integer|string date_creation
+	 */
 	public $date_creat;
 
 
@@ -81,13 +81,13 @@ class Mailing extends CommonObject
 	public $statuts = array();
 
 
-    /**
-     *  Constructor
-     *
-     *  @param      DoliDb      $db      Database handler
-     */
-    public function __construct($db)
-    {
+	/**
+	 *  Constructor
+	 *
+	 *  @param      DoliDb      $db      Database handler
+	 */
+	public function __construct($db)
+	{
 		$this->db = $db;
 
 		// List of language codes for status
@@ -101,7 +101,7 @@ class Mailing extends CommonObject
 		$this->statut_dest[1] = 'MailingStatusSent';
 		$this->statut_dest[2] = 'MailingStatusRead';
 		$this->statut_dest[3] = 'MailingStatusReadAndUnsubscribe'; // Read but ask to not be contacted anymore
-    }
+	}
 
 	/**
 	 *  Create an EMailing
@@ -224,8 +224,8 @@ class Mailing extends CommonObject
 				$this->title = $obj->title;
 
 				$this->sujet = $obj->sujet;
-				if (!empty($conf->global->FCKEDITOR_ENABLE_MAILING) && dol_textishtml(dol_html_entity_decode($obj->body, ENT_COMPAT|ENT_HTML5))) {
-					$this->body = dol_html_entity_decode($obj->body, ENT_COMPAT|ENT_HTML5);
+				if (!empty($conf->global->FCKEDITOR_ENABLE_MAILING) && dol_textishtml(dol_html_entity_decode($obj->body, ENT_COMPAT | ENT_HTML5))) {
+					$this->body = dol_html_entity_decode($obj->body, ENT_COMPAT | ENT_HTML5);
 				} else {
 					$this->body = $obj->body;
 				}
@@ -427,7 +427,7 @@ class Mailing extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Delete targets emailing
 	 *
@@ -435,7 +435,7 @@ class Mailing extends CommonObject
 	 */
 	public function delete_targets()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."mailing_cibles";
 		$sql .= " WHERE fk_mailing = ".$this->id;
 
@@ -451,7 +451,7 @@ class Mailing extends CommonObject
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Change status of each recipient
 	 *
@@ -460,7 +460,7 @@ class Mailing extends CommonObject
 	 */
 	public function reset_targets_status($user)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$sql = "UPDATE ".MAIN_DB_PREFIX."mailing_cibles";
 		$sql .= " SET statut = 0";
 		$sql .= " WHERE fk_mailing = ".$this->id;
@@ -485,26 +485,26 @@ class Mailing extends CommonObject
 	 */
 	public function countNbOfTargets($mode)
 	{
-	    $sql = "SELECT COUNT(rowid) as nb FROM ".MAIN_DB_PREFIX."mailing_cibles";
-	    $sql .= " WHERE fk_mailing = ".$this->id;
-	    if ($mode == 'alreadysent') $sql .= " AND statut <> 0";
-	    elseif ($mode == 'alreadysentok') $sql .= " AND statut > 0";
-	    elseif ($mode == 'alreadysentko') $sql .= " AND statut = -1";
-	    else {
-	        $this->error = 'BadValueForParameterMode';
-	        return -2;
-	    }
+		$sql = "SELECT COUNT(rowid) as nb FROM ".MAIN_DB_PREFIX."mailing_cibles";
+		$sql .= " WHERE fk_mailing = ".$this->id;
+		if ($mode == 'alreadysent') $sql .= " AND statut <> 0";
+		elseif ($mode == 'alreadysentok') $sql .= " AND statut > 0";
+		elseif ($mode == 'alreadysentko') $sql .= " AND statut = -1";
+		else {
+			$this->error = 'BadValueForParameterMode';
+			return -2;
+		}
 
-	    $resql = $this->db->query($sql);
-	    if ($resql)
-	    {
-	        $obj = $this->db->fetch_object($resql);
-	        if ($obj) return $obj->nb;
-	    } else {
-	        $this->error = $this->db->lasterror();
-	        return -1;
-	    }
-	    return 0;
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$obj = $this->db->fetch_object($resql);
+			if ($obj) return $obj->nb;
+		} else {
+			$this->error = $this->db->lasterror();
+			return -1;
+		}
+		return 0;
 	}
 
 
@@ -593,7 +593,7 @@ class Mailing extends CommonObject
 		return $this->LibStatut($this->statut, $mode);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Renvoi le libelle d'un statut donne
 	 *
@@ -603,7 +603,7 @@ class Mailing extends CommonObject
 	 */
 	public function LibStatut($status, $mode = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 		$langs->load("mailing");
 
diff --git a/htdocs/comm/mailing/index.php b/htdocs/comm/mailing/index.php
index ddcdaabf14e..8c1e392ed68 100644
--- a/htdocs/comm/mailing/index.php
+++ b/htdocs/comm/mailing/index.php
@@ -57,19 +57,19 @@ 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
 //{
-    // Recherche emails
-    print '<form method="post" action="'.DOL_URL_ROOT.'/comm/mailing/list.php">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    print '<div class="div-table-responsive-no-min">';
-    print '<table class="noborder nohover centpercent">';
-    print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("SearchAMailing").'</td></tr>';
-    print '<tr class="oddeven"><td class="nowrap">';
-    print $langs->trans("Ref").':</td><td><input type="text" class="flat inputsearch" name="sref"></td>';
-    print '<td rowspan="2"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
-    print '<tr class="oddeven"><td class="nowrap">';
-    print $langs->trans("Other").':</td><td><input type="text" class="flat inputsearch" name="sall"></td>';
+	// Recherche emails
+	print '<form method="post" action="'.DOL_URL_ROOT.'/comm/mailing/list.php">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<div class="div-table-responsive-no-min">';
+	print '<table class="noborder nohover centpercent">';
+	print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("SearchAMailing").'</td></tr>';
+	print '<tr class="oddeven"><td class="nowrap">';
+	print $langs->trans("Ref").':</td><td><input type="text" class="flat inputsearch" name="sref"></td>';
+	print '<td rowspan="2"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
+	print '<tr class="oddeven"><td class="nowrap">';
+	print $langs->trans("Other").':</td><td><input type="text" class="flat inputsearch" name="sall"></td>';
 
-    print "</table></div></form><br>\n";
+	print "</table></div></form><br>\n";
 //}
 
 
@@ -82,63 +82,63 @@ $handle = opendir($dir);
 
 if (is_resource($handle))
 {
-    while (($file = readdir($handle)) !== false)
-    {
-        if (substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS')
-        {
-            if (preg_match("/(.*)\.(.*)\.(.*)/i", $file, $reg))
-            {
-                $modulename = $reg[1];
-       			if ($modulename == 'example') continue;
+	while (($file = readdir($handle)) !== false)
+	{
+		if (substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS')
+		{
+			if (preg_match("/(.*)\.(.*)\.(.*)/i", $file, $reg))
+			{
+				$modulename = $reg[1];
+	   			if ($modulename == 'example') continue;
 
-                // Loading Class
-                $file = $dir."/".$modulename.".modules.php";
-                $classname = "mailing_".$modulename;
-                require_once $file;
-                $mailmodule = new $classname($db);
+				// Loading Class
+				$file = $dir."/".$modulename.".modules.php";
+				$classname = "mailing_".$modulename;
+				require_once $file;
+				$mailmodule = new $classname($db);
 
-                $qualified = 1;
-                foreach ($mailmodule->require_module as $key)
-                {
-                    if (!$conf->$key->enabled || (!$user->admin && $mailmodule->require_admin))
-                    {
-                        $qualified = 0;
-                        //print "Les pr�requis d'activation du module mailing ne sont pas respect�s. Il ne sera pas actif";
-                        break;
-                    }
-                }
+				$qualified = 1;
+				foreach ($mailmodule->require_module as $key)
+				{
+					if (!$conf->$key->enabled || (!$user->admin && $mailmodule->require_admin))
+					{
+						$qualified = 0;
+						//print "Les pr�requis d'activation du module mailing ne sont pas respect�s. Il ne sera pas actif";
+						break;
+					}
+				}
 
-                // Si le module mailing est qualifi�
-                if ($qualified)
-                {
-                    foreach ($mailmodule->getSqlArrayForStats() as $sql)
-                    {
-                        print '<tr class="oddeven">';
+				// Si le module mailing est qualifi�
+				if ($qualified)
+				{
+					foreach ($mailmodule->getSqlArrayForStats() as $sql)
+					{
+						print '<tr class="oddeven">';
 
-                        $result = $db->query($sql);
-                        if ($result) {
-                            $num = $db->num_rows($result);
+						$result = $db->query($sql);
+						if ($result) {
+							$num = $db->num_rows($result);
 
-                            $i = 0;
+							$i = 0;
 
-                            while ($i < $num)
-                            {
-                                $obj = $db->fetch_object($result);
-                                print '<td>'.img_object('', $mailmodule->picto).' '.$obj->label.'</td><td class="right">'.$obj->nb.'<td>';
-                                $i++;
-                            }
+							while ($i < $num)
+							{
+								$obj = $db->fetch_object($result);
+								print '<td>'.img_object('', $mailmodule->picto).' '.$obj->label.'</td><td class="right">'.$obj->nb.'<td>';
+								$i++;
+							}
 
-                            $db->free($result);
-                        } else {
-                            dol_print_error($db);
-                        }
-                        print '</tr>';
-                    }
-                }
-            }
-        }
-    }
-    closedir($handle);
+							$db->free($result);
+						} else {
+							dol_print_error($db);
+						}
+						print '</tr>';
+					}
+				}
+			}
+		}
+	}
+	closedir($handle);
 }
 
 
@@ -160,42 +160,42 @@ $sql .= " ORDER BY m.date_creat DESC";
 $sql .= " LIMIT ".$limit;
 $result = $db->query($sql);
 if ($result) {
-    print '<div class="div-table-responsive-no-min">';
-    print '<table class="noborder centpercent">';
-    print '<tr class="liste_titre">';
-    print '<td colspan="2">'.$langs->trans("LastMailings", $limit).'</td>';
-    print '<td class="center">'.$langs->trans("DateCreation").'</td>';
-    print '<td class="center">'.$langs->trans("NbOfEMails").'</td>';
-    print '<td class="right"><a href="'.DOL_URL_ROOT.'/comm/mailing/list.php">'.$langs->trans("AllEMailings").'</a></td></tr>';
+	print '<div class="div-table-responsive-no-min">';
+	print '<table class="noborder centpercent">';
+	print '<tr class="liste_titre">';
+	print '<td colspan="2">'.$langs->trans("LastMailings", $limit).'</td>';
+	print '<td class="center">'.$langs->trans("DateCreation").'</td>';
+	print '<td class="center">'.$langs->trans("NbOfEMails").'</td>';
+	print '<td class="right"><a href="'.DOL_URL_ROOT.'/comm/mailing/list.php">'.$langs->trans("AllEMailings").'</a></td></tr>';
 
-    $num = $db->num_rows($result);
-    if ($num > 0)
-    {
-        $i = 0;
+	$num = $db->num_rows($result);
+	if ($num > 0)
+	{
+		$i = 0;
 
-        while ($i < $num)
-	    {
-	        $obj = $db->fetch_object($result);
+		while ($i < $num)
+		{
+			$obj = $db->fetch_object($result);
 			$mailstatic = new Mailing($db);
 			$mailstatic->id = $obj->rowid;
 			$mailstatic->ref = $obj->rowid;
 
-	        print '<tr class="oddeven">';
-	        print '<td class="nowrap">'.$mailstatic->getNomUrl(1).'</td>';
-	        print '<td>'.dol_trunc($obj->title, 38).'</td>';
-	        print '<td class="center">'.dol_print_date($db->jdate($obj->date_creat), 'day').'</td>';
-	        print '<td class="center">'.($obj->nbemail ? $obj->nbemail : "0").'</td>';
-	        print '<td class="right">'.$mailstatic->LibStatut($obj->statut, 5).'</td>';
-            print '</tr>';
-	        $i++;
-	    }
-    } else {
-        print '<tr><td class="opacitymedium">'.$langs->trans("None").'</td></tr>';
-    }
-    print "</table></div><br>";
-    $db->free($result);
+			print '<tr class="oddeven">';
+			print '<td class="nowrap">'.$mailstatic->getNomUrl(1).'</td>';
+			print '<td>'.dol_trunc($obj->title, 38).'</td>';
+			print '<td class="center">'.dol_print_date($db->jdate($obj->date_creat), 'day').'</td>';
+			print '<td class="center">'.($obj->nbemail ? $obj->nbemail : "0").'</td>';
+			print '<td class="right">'.$mailstatic->LibStatut($obj->statut, 5).'</td>';
+			print '</tr>';
+			$i++;
+		}
+	} else {
+		print '<tr><td class="opacitymedium">'.$langs->trans("None").'</td></tr>';
+	}
+	print "</table></div><br>";
+	$db->free($result);
 } else {
-    dol_print_error($db);
+	dol_print_error($db);
 }
 
 
@@ -204,12 +204,12 @@ print '</div></div></div>';
 
 
 if ($langs->file_exists("html/spam.html", 0)) {
-    print "<br><br><br><br>".$langs->trans("Note")."<br>";
-    print '<div style="padding: 4px; background: #FAFAFA; border: 1px solid #BBBBBB;" >';
-    dol_print_file($langs, "html/spam.html", 0);
-    print '</div>';
+	print "<br><br><br><br>".$langs->trans("Note")."<br>";
+	print '<div style="padding: 4px; background: #FAFAFA; border: 1px solid #BBBBBB;" >';
+	dol_print_file($langs, "html/spam.html", 0);
+	print '</div>';
 
-    print '<br>';
+	print '<br>';
 }
 
 $parameters = array('user' => $user);
diff --git a/htdocs/comm/mailing/info.php b/htdocs/comm/mailing/info.php
index 05ae0885ba8..199a5caad8b 100644
--- a/htdocs/comm/mailing/info.php
+++ b/htdocs/comm/mailing/info.php
@@ -81,7 +81,7 @@ if ($object->fetch($id) >= 0)
 	//print '</td></tr></table>';
 
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 }
 
 // End of page
diff --git a/htdocs/comm/mailing/list.php b/htdocs/comm/mailing/list.php
index 525064942a6..9da825e262e 100644
--- a/htdocs/comm/mailing/list.php
+++ b/htdocs/comm/mailing/list.php
@@ -60,7 +60,7 @@ $search_array_options = $extrafields->getOptionalsFromPost($object->table_elemen
 
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array(
-    'm.titre'=>'Ref',
+	'm.titre'=>'Ref',
 );
 
 
@@ -169,7 +169,7 @@ if ($resql)
 	$newcardbutton = '';
 	if ($user->rights->mailing->creer)
 	{
-        $newcardbutton .= dolGetButtonTitle($langs->trans('NewMailing'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/comm/mailing/card.php?action=create');
+		$newcardbutton .= dolGetButtonTitle($langs->trans('NewMailing'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/comm/mailing/card.php?action=create');
 	}
 
 	$i = 0;
@@ -190,8 +190,8 @@ if ($resql)
 
 	$moreforfilter = '';
 
-    print '<div class="div-table-responsive">';
-    print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
+	print '<div class="div-table-responsive">';
+	print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 	print '<tr class="liste_titre_filter">';
 	print '<td class="liste_titre">';
diff --git a/htdocs/comm/multiprix.php b/htdocs/comm/multiprix.php
index 6bd1fe715e3..bd4c16f89ca 100644
--- a/htdocs/comm/multiprix.php
+++ b/htdocs/comm/multiprix.php
@@ -105,7 +105,7 @@ if ($_socid > 0)
 
 	print "</table>";
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div align="center"><input type="submit" class="button" value="'.$langs->trans("Save").'"></div>';
 
diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 1f813b6c6ad..9977910518b 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -166,7 +166,7 @@ if (empty($reshook))
 			if ($object->id > 0) {
 				if (!empty($conf->global->PROPAL_CLONE_DATE_DELIVERY)) {
 					//Get difference between old and new delivery date and change lines according to difference
-                    $date_delivery = dol_mktime(12, 0, 0,
+					$date_delivery = dol_mktime(12, 0, 0,
 						GETPOST('date_deliverymonth', 'int'),
 						GETPOST('date_deliveryday', 'int'),
 						GETPOST('date_deliveryyear', 'int')
@@ -174,7 +174,7 @@ if (empty($reshook))
 					if (!empty($object->date_livraison) && !empty($date_delivery))
 					{
 						//Attempt to get the date without possible hour rounding errors
-                        $old_date_delivery = dol_mktime(12, 0, 0,
+						$old_date_delivery = dol_mktime(12, 0, 0,
 							dol_print_date($object->date_livraison, '%m'),
 							dol_print_date($object->date_livraison, '%d'),
 							dol_print_date($object->date_livraison, '%Y')
@@ -666,82 +666,82 @@ if (empty($reshook))
 		}
 	} // add lines from objectlinked
 	elseif ($action == 'import_lines_from_object'
-	    && $user->rights->propal->creer
-	    && $object->statut == Propal::STATUS_DRAFT
-	    )
+		&& $user->rights->propal->creer
+		&& $object->statut == Propal::STATUS_DRAFT
+		)
 	{
-	    $fromElement = GETPOST('fromelement');
-	    $fromElementid = GETPOST('fromelementid');
-	    $importLines = GETPOST('line_checkbox');
+		$fromElement = GETPOST('fromelement');
+		$fromElementid = GETPOST('fromelementid');
+		$importLines = GETPOST('line_checkbox');
 
-	    if (!empty($importLines) && is_array($importLines) && !empty($fromElement) && ctype_alpha($fromElement) && !empty($fromElementid))
-	    {
-	        if ($fromElement == 'commande')
-	        {
-	            dol_include_once('/'.$fromElement.'/class/'.$fromElement.'.class.php');
-	            $lineClassName = 'OrderLine';
-	        } elseif ($fromElement == 'propal')
-	        {
-	            dol_include_once('/comm/'.$fromElement.'/class/'.$fromElement.'.class.php');
-	            $lineClassName = 'PropaleLigne';
-	        }
-	        $nextRang = count($object->lines) + 1;
-	        $importCount = 0;
-	        $error = 0;
-	        foreach ($importLines as $lineId)
-	        {
-	            $lineId = intval($lineId);
-	            $originLine = new $lineClassName($db);
-	            if (intval($fromElementid) > 0 && $originLine->fetch($lineId) > 0)
-	            {
-	                $originLine->fetch_optionals();
-	                $desc = $originLine->desc;
-	                $pu_ht = $originLine->subprice;
-	                $qty = $originLine->qty;
-	                $txtva = $originLine->tva_tx;
-	                $txlocaltax1 = $originLine->localtax1_tx;
-	                $txlocaltax2 = $originLine->localtax2_tx;
-	                $fk_product = $originLine->fk_product;
-	                $remise_percent = $originLine->remise_percent;
-	                $date_start = $originLine->date_start;
-	                $date_end = $originLine->date_end;
-	                $ventil = 0;
-	                $info_bits = $originLine->info_bits;
-	                $fk_remise_except = $originLine->fk_remise_except;
-	                $price_base_type = 'HT';
-	                $pu_ttc = 0;
-	                $type = $originLine->product_type;
-	                $rang = $nextRang++;
-	                $special_code = $originLine->special_code;
-	                $origin = $originLine->element;
-	                $origin_id = $originLine->id;
-	                $fk_parent_line = 0;
-	                $fk_fournprice = $originLine->fk_fournprice;
-	                $pa_ht = $originLine->pa_ht;
-	                $label = $originLine->label;
-	                $array_options = $originLine->array_options;
-	                $situation_percent = 100;
-	                $fk_prev_id = '';
-	                $fk_unit = $originLine->fk_unit;
-	                $pu_ht_devise = $originLine->multicurrency_subprice;
+		if (!empty($importLines) && is_array($importLines) && !empty($fromElement) && ctype_alpha($fromElement) && !empty($fromElementid))
+		{
+			if ($fromElement == 'commande')
+			{
+				dol_include_once('/'.$fromElement.'/class/'.$fromElement.'.class.php');
+				$lineClassName = 'OrderLine';
+			} elseif ($fromElement == 'propal')
+			{
+				dol_include_once('/comm/'.$fromElement.'/class/'.$fromElement.'.class.php');
+				$lineClassName = 'PropaleLigne';
+			}
+			$nextRang = count($object->lines) + 1;
+			$importCount = 0;
+			$error = 0;
+			foreach ($importLines as $lineId)
+			{
+				$lineId = intval($lineId);
+				$originLine = new $lineClassName($db);
+				if (intval($fromElementid) > 0 && $originLine->fetch($lineId) > 0)
+				{
+					$originLine->fetch_optionals();
+					$desc = $originLine->desc;
+					$pu_ht = $originLine->subprice;
+					$qty = $originLine->qty;
+					$txtva = $originLine->tva_tx;
+					$txlocaltax1 = $originLine->localtax1_tx;
+					$txlocaltax2 = $originLine->localtax2_tx;
+					$fk_product = $originLine->fk_product;
+					$remise_percent = $originLine->remise_percent;
+					$date_start = $originLine->date_start;
+					$date_end = $originLine->date_end;
+					$ventil = 0;
+					$info_bits = $originLine->info_bits;
+					$fk_remise_except = $originLine->fk_remise_except;
+					$price_base_type = 'HT';
+					$pu_ttc = 0;
+					$type = $originLine->product_type;
+					$rang = $nextRang++;
+					$special_code = $originLine->special_code;
+					$origin = $originLine->element;
+					$origin_id = $originLine->id;
+					$fk_parent_line = 0;
+					$fk_fournprice = $originLine->fk_fournprice;
+					$pa_ht = $originLine->pa_ht;
+					$label = $originLine->label;
+					$array_options = $originLine->array_options;
+					$situation_percent = 100;
+					$fk_prev_id = '';
+					$fk_unit = $originLine->fk_unit;
+					$pu_ht_devise = $originLine->multicurrency_subprice;
 
-	                $res = $object->addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1, $txlocaltax2, $fk_product, $remise_percent, $price_base_type, $pu_ttc, $info_bits, $type, $rang, $special_code, $fk_parent_line, $fk_fournprice, $pa_ht, $label, $date_start, $date_end, $array_options, $fk_unit, $origin, $origin_id, $pu_ht_devise, $fk_remise_except);
+					$res = $object->addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1, $txlocaltax2, $fk_product, $remise_percent, $price_base_type, $pu_ttc, $info_bits, $type, $rang, $special_code, $fk_parent_line, $fk_fournprice, $pa_ht, $label, $date_start, $date_end, $array_options, $fk_unit, $origin, $origin_id, $pu_ht_devise, $fk_remise_except);
 
-	                if ($res > 0) {
-	                    $importCount++;
-	                } else {
-	                    $error++;
-	                }
-	            } else {
-	                $error++;
-	            }
-	        }
+					if ($res > 0) {
+						$importCount++;
+					} else {
+						$error++;
+					}
+				} else {
+					$error++;
+				}
+			}
 
-	        if ($error)
-	        {
-	            setEventMessages($langs->trans('ErrorsOnXLines', $error), null, 'errors');
-	        }
-	    }
+			if ($error)
+			{
+				setEventMessages($langs->trans('ErrorsOnXLines', $error), null, 'errors');
+			}
+		}
 	}
 
 	include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
@@ -806,7 +806,7 @@ if (empty($reshook))
 			$tva_tx = '';
 		}
 
-		$qty = GETPOST('qty'.$predef);
+		$qty = price2num(GETPOST('qty'.$predef), 'MS');
 		$remise_percent = GETPOST('remise_percent'.$predef);
 		if (empty($remise_percent)) $remise_percent = 0;
 
@@ -890,8 +890,8 @@ if (empty($reshook))
 					$price_base_type = $prod->multiprices_base_type[$object->thirdparty->price_level];
 					if (!empty($conf->global->PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL))  // using this option is a bug. kept for backward compatibility
 					{
-					    if (isset($prod->multiprices_tva_tx[$object->thirdparty->price_level])) $tva_tx = $prod->multiprices_tva_tx[$object->thirdparty->price_level];
-					    if (isset($prod->multiprices_recuperableonly[$object->thirdparty->price_level])) $tva_npr = $prod->multiprices_recuperableonly[$object->thirdparty->price_level];
+						if (isset($prod->multiprices_tva_tx[$object->thirdparty->price_level])) $tva_tx = $prod->multiprices_tva_tx[$object->thirdparty->price_level];
+						if (isset($prod->multiprices_recuperableonly[$object->thirdparty->price_level])) $tva_npr = $prod->multiprices_recuperableonly[$object->thirdparty->price_level];
 					}
 				} // If price per customer
 				elseif (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
@@ -1229,7 +1229,10 @@ if (empty($reshook))
 					}
 				}
 			}
-			$result = $object->updateline(GETPOST('lineid'), $pu_ht, GETPOST('qty'), GETPOST('remise_percent'), $vat_rate, $localtax1_rate, $localtax2_rate, $description, 'HT', $info_bits, $special_code, GETPOST('fk_parent_line'), 0, $fournprice, $buyingprice, $label, $type, $date_start, $date_end, $array_options, $_POST["units"], $pu_ht_devise);
+
+			$qty = price2num(GETPOST('qty'), 'MS');
+
+			$result = $object->updateline(GETPOST('lineid', 'int'), $pu_ht, $qty, GETPOST('remise_percent'), $vat_rate, $localtax1_rate, $localtax2_rate, $description, 'HT', $info_bits, $special_code, GETPOST('fk_parent_line'), 0, $fournprice, $buyingprice, $label, $type, $date_start, $date_end, $array_options, $_POST["units"], $pu_ht_devise);
 
 			if ($result >= 0) {
 				$db->commit();
@@ -1283,8 +1286,8 @@ if (empty($reshook))
 		header('Location: '.$_SERVER['PHP_SELF'].'?id='.$object->id); // Pour reaffichage de la fiche en cours d'edition
 		exit();
 	} elseif ($action == 'classin' && $usercancreate) {
-        // Set project
-        $object->setProject(GETPOST('projectid', 'int'));
+		// Set project
+		$object->setProject(GETPOST('projectid', 'int'));
 	} // Delivery time
 	elseif ($action == 'setavailability' && $usercancreate) {
 		$result = $object->set_availability($user, GETPOST('availability_id', 'int'));
@@ -1508,11 +1511,12 @@ if ($action == 'create')
 		print '<td>';
 		print $form->select_company('', 'socid', '(s.client = 1 OR s.client = 2 OR s.client = 3) AND status=1', 'SelectThirdParty', 0, 0, null, 0, 'minwidth300 maxwidth500');
 		// reload page to retrieve customer informations
-		if (!empty($conf->global->RELOAD_PAGE_ON_CUSTOMER_CHANGE))
+		if (empty($conf->global->RELOAD_PAGE_ON_CUSTOMER_CHANGE_DISABLED))
 		{
 			print '<script type="text/javascript">
 			$(document).ready(function() {
 				$("#socid").change(function() {
+					console.log("We have changed the company - Reload page");
 					var socid = $(this).val();
 					// reload page
 					window.location.href = "'.$_SERVER["PHP_SELF"].'?action=create&socid="+socid+"&ref_client="+$("input[name=ref_client]").val();
@@ -1527,7 +1531,7 @@ if ($action == 'create')
 
 	if ($socid > 0)
 	{
-        // Contacts (ask contact only if thirdparty already defined).
+		// Contacts (ask contact only if thirdparty already defined).
 		print "<tr><td>".$langs->trans("DefaultContact").'</td><td>';
 		$form->select_contacts($soc->id, $contactid, 'contactid', 1, $srccontactslist);
 		print '</td></tr>';
@@ -1715,9 +1719,9 @@ if ($action == 'create')
 
 		if (!empty($conf->multicurrency->enabled))
 		{
-		    print '<tr><td>'.$langs->trans('MulticurrencyAmountHT').'</td><td>'.price($objectsrc->multicurrency_total_ht).'</td></tr>';
-		    print '<tr><td>'.$langs->trans('MulticurrencyAmountVAT').'</td><td>'.price($objectsrc->multicurrency_total_tva)."</td></tr>";
-		    print '<tr><td>'.$langs->trans('MulticurrencyAmountTTC').'</td><td>'.price($objectsrc->multicurrency_total_ttc)."</td></tr>";
+			print '<tr><td>'.$langs->trans('MulticurrencyAmountHT').'</td><td>'.price($objectsrc->multicurrency_total_ht).'</td></tr>';
+			print '<tr><td>'.$langs->trans('MulticurrencyAmountVAT').'</td><td>'.price($objectsrc->multicurrency_total_tva)."</td></tr>";
+			print '<tr><td>'.$langs->trans('MulticurrencyAmountTTC').'</td><td>'.price($objectsrc->multicurrency_total_ttc)."</td></tr>";
 		}
 	}
 
@@ -1771,7 +1775,7 @@ if ($action == 'create')
 		print '</table>';
 	}
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	$langs->load("bills");
 	print '<div class="center">';
@@ -1829,7 +1833,7 @@ if ($action == 'create')
 	{
 		//Form to close proposal (signed or not)
 		$formquestion = array(
-			array('type' => 'select', 'name' => 'statut', 'label' => '<span class="fieldrequired">'.$langs->trans("CloseAs").'</span>', 'values' => array(2=>$object->LibStatut($object::STATUS_SIGNED), 3=>$object->LibStatut($object::STATUS_NOTSIGNED))),
+			array('type' => 'select', 'name' => 'statut', 'label' => '<span class="fieldrequired">'.$langs->trans("CloseAs").'</span>', 'values' => array($object::STATUS_SIGNED => $object->LibStatut($object::STATUS_SIGNED), $object::STATUS_NOTSIGNED => $object->LibStatut($object::STATUS_NOTSIGNED))),
 			array('type' => 'text', 'name' => 'note_private', 'label' => $langs->trans("Note"), 'value' => '')				// Field to complete private note (not replace)
 		);
 
@@ -2205,21 +2209,21 @@ if ($action == 'create')
 		print '</tr>';
 	}
 
-    $tmparray = $object->getTotalWeightVolume();
-    $totalWeight = $tmparray['weight'];
-    $totalVolume = $tmparray['volume'];
-    if ($totalWeight) {
-        print '<tr><td>'.$langs->trans("CalculatedWeight").'</td>';
-        print '<td>';
-        print showDimensionInBestUnit($totalWeight, 0, "weight", $langs, isset($conf->global->MAIN_WEIGHT_DEFAULT_ROUND) ? $conf->global->MAIN_WEIGHT_DEFAULT_ROUND : -1, isset($conf->global->MAIN_WEIGHT_DEFAULT_UNIT) ? $conf->global->MAIN_WEIGHT_DEFAULT_UNIT : 'no');
-        print '</td></tr>';
-    }
-    if ($totalVolume) {
-        print '<tr><td>'.$langs->trans("CalculatedVolume").'</td>';
-        print '<td>';
-        print showDimensionInBestUnit($totalVolume, 0, "volume", $langs, isset($conf->global->MAIN_VOLUME_DEFAULT_ROUND) ? $conf->global->MAIN_VOLUME_DEFAULT_ROUND : -1, isset($conf->global->MAIN_VOLUME_DEFAULT_UNIT) ? $conf->global->MAIN_VOLUME_DEFAULT_UNIT : 'no');
-        print '</td></tr>';
-    }
+	$tmparray = $object->getTotalWeightVolume();
+	$totalWeight = $tmparray['weight'];
+	$totalVolume = $tmparray['volume'];
+	if ($totalWeight) {
+		print '<tr><td>'.$langs->trans("CalculatedWeight").'</td>';
+		print '<td>';
+		print showDimensionInBestUnit($totalWeight, 0, "weight", $langs, isset($conf->global->MAIN_WEIGHT_DEFAULT_ROUND) ? $conf->global->MAIN_WEIGHT_DEFAULT_ROUND : -1, isset($conf->global->MAIN_WEIGHT_DEFAULT_UNIT) ? $conf->global->MAIN_WEIGHT_DEFAULT_UNIT : 'no');
+		print '</td></tr>';
+	}
+	if ($totalVolume) {
+		print '<tr><td>'.$langs->trans("CalculatedVolume").'</td>';
+		print '<td>';
+		print showDimensionInBestUnit($totalVolume, 0, "volume", $langs, isset($conf->global->MAIN_VOLUME_DEFAULT_ROUND) ? $conf->global->MAIN_VOLUME_DEFAULT_ROUND : -1, isset($conf->global->MAIN_VOLUME_DEFAULT_UNIT) ? $conf->global->MAIN_VOLUME_DEFAULT_UNIT : 'no');
+		print '</td></tr>';
+	}
 
 	// Incoterms
 	if (!empty($conf->incoterm->enabled))
@@ -2351,7 +2355,7 @@ if ($action == 'create')
 	print '<div class="div-table-responsive-no-min">';
 	if (!empty($object->lines) || ($object->statut == Propal::STATUS_DRAFT && $usercancreate && $action != 'selectlines' && $action != 'editline'))
 	{
-	    print '<table id="tablelines" class="noborder noshadow" width="100%">';
+		print '<table id="tablelines" class="noborder noshadow" width="100%">';
 	}
 
 	if (!empty($object->lines))
@@ -2376,13 +2380,13 @@ if ($action == 'create')
 
 	if (!empty($object->lines) || ($object->statut == Propal::STATUS_DRAFT && $usercancreate && $action != 'selectlines' && $action != 'editline'))
 	{
-	    print '</table>';
+		print '</table>';
 	}
 	print '</div>';
 
 	print "</form>\n";
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 
 	/*
@@ -2532,7 +2536,7 @@ if ($action == 'create')
 		$compatibleImportElementsList = false;
 		if ($user->rights->propal->creer && $object->statut == Propal::STATUS_DRAFT)
 		{
-		    $compatibleImportElementsList = array('commande', 'propal'); // import from linked elements
+			$compatibleImportElementsList = array('commande', 'propal'); // import from linked elements
 		}
 		$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem, $compatibleImportElementsList);
 
diff --git a/htdocs/comm/propal/class/api_proposals.class.php b/htdocs/comm/propal/class/api_proposals.class.php
index f2275d59021..fd2cb3d371c 100644
--- a/htdocs/comm/propal/class/api_proposals.class.php
+++ b/htdocs/comm/propal/class/api_proposals.class.php
@@ -846,8 +846,8 @@ class Proposals extends DolibarrApi
 	/**
 	 * Clean sensible object datas
 	 *
-	 * @param   object  $object    Object to clean
-	 * @return    array    Array of cleaned object properties
+	 * @param   Object  $object     Object to clean
+	 * @return  Object              Object with cleaned properties
 	 */
 	protected function _cleanObjectDatas($object)
 	{
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 7496f98a394..d784ff8d834 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -13,7 +13,7 @@
  * Copyright (C) 2013      Florian Henry		  	<florian.henry@open-concept.pro>
  * Copyright (C) 2014-2015 Marcos García            <marcosgdf@gmail.com>
  * Copyright (C) 2018      Nicolas ZABOURI			<info@inovea-conseil.com>
- * Copyright (C) 2018-2019 Frédéric France          <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2020 Frédéric France          <frederic.france@netlogic.fr>
  * Copyright (C) 2018      Ferran Marcet         	<fmarcet@2byte.es>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -124,9 +124,9 @@ class Propal extends CommonObject
 	 */
 	public $datec;
 
-    /**
-     * @var integer|string $date_creation;
-     */
+	/**
+	 * @var integer|string $date_creation;
+	 */
 	public $date_creation;
 
 	/**
@@ -136,13 +136,13 @@ class Propal extends CommonObject
 	public $datev;
 
 	/**
-     * @var integer|string $date_validation;
-     */
+	 * @var integer|string $date_validation;
+	 */
 	public $date_validation;
 
 	/**
-     * @var integer|string date of the quote;
-     */
+	 * @var integer|string date of the quote;
+	 */
 	public $date;
 
 	/**
@@ -186,9 +186,9 @@ class Propal extends CommonObject
 	public $remise_absolue = 0;
 
 	/**
-     * @var int ID
-     * @deprecated
-     */
+	 * @var int ID
+	 * @deprecated
+	 */
 	public $fk_address;
 
 	public $address_type;
@@ -214,12 +214,10 @@ class Propal extends CommonObject
 	public $labelStatus = array();
 	public $labelStatusShort = array();
 
-	public $specimen;
-
 	// Multicurrency
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_multicurrency;
 
 	public $multicurrency_code;
@@ -342,7 +340,7 @@ class Propal extends CommonObject
 	 *	@param      int		$socid		Id third party
 	 *	@param      int		$propalid   Id proposal
 	 */
-    public function __construct($db, $socid = 0, $propalid = 0)
+	public function __construct($db, $socid = 0, $propalid = 0)
 	{
 		global $conf, $langs;
 
@@ -357,7 +355,7 @@ class Propal extends CommonObject
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Add line into array products
 	 *  $this->thirdparty should be loaded
@@ -370,9 +368,9 @@ class Propal extends CommonObject
 	 *	TODO	Replace calls to this function by generation objet Ligne
 	 *			inserted into table $this->products
 	 */
-    public function add_product($idproduct, $qty, $remise_percent = 0)
+	public function add_product($idproduct, $qty, $remise_percent = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $mysoc;
 
 		if (!$qty) $qty = 1;
@@ -417,16 +415,16 @@ class Propal extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Adding line of fixed discount in the proposal in DB
 	 *
 	 *	@param     int		$idremise			Id of fixed discount
 	 *  @return    int          				>0 if OK, <0 if KO
 	 */
-    public function insert_discount($idremise)
+	public function insert_discount($idremise)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
@@ -493,43 +491,43 @@ class Propal extends CommonObject
 		}
 	}
 
-    /**
-     *    	Add a proposal line into database (linked to product/service or not)
-     *      The parameters are already supposed to be appropriate and with final values to the call
-     *      of this method. Also, for the VAT rate, it must have already been defined
-     *      by whose calling the method get_default_tva (societe_vendeuse, societe_acheteuse, '' product)
-     *      and desc must already have the right value (it's up to the caller to manage multilanguage)
-     *
-     * 		@param    	string		$desc				Description of line
-     * 		@param    	float		$pu_ht				Unit price
-     * 		@param    	float		$qty             	Quantity
-     * 		@param    	float		$txtva           	Force Vat rate, -1 for auto (Can contain the vat_src_code too with syntax '9.9 (CODE)')
-     * 		@param		float		$txlocaltax1		Local tax 1 rate (deprecated, use instead txtva with code inside)
-     *  	@param		float		$txlocaltax2		Local tax 2 rate (deprecated, use instead txtva with code inside)
-     *		@param    	int			$fk_product      	Product/Service ID predefined
-     * 		@param    	float		$remise_percent  	Pourcentage de remise de la ligne
-     * 		@param    	string		$price_base_type	HT or TTC
-     * 		@param    	float		$pu_ttc             Prix unitaire TTC
-     * 		@param    	int			$info_bits			Bits for type of lines
-     *      @param      int			$type               Type of line (0=product, 1=service). Not used if fk_product is defined, the type of product is used.
-     *      @param      int			$rang               Position of line
-     *      @param		int			$special_code		Special code (also used by externals modules!)
-     *      @param		int			$fk_parent_line		Id of parent line
-     *      @param		int			$fk_fournprice		Id supplier price
-     *      @param		int			$pa_ht				Buying price without tax
-     *      @param		string		$label				???
-     *		@param      int			$date_start       	Start date of the line
-     *		@param      int			$date_end         	End date of the line
-     *      @param		array		$array_options		extrafields array
-     * 		@param 		string		$fk_unit 			Code of the unit to use. Null to use the default one
-     *      @param		string		$origin				Depend on global conf MAIN_CREATEFROM_KEEP_LINE_ORIGIN_INFORMATION can be 'orderdet', 'propaldet'..., else 'order','propal,'....
-     *      @param		int			$origin_id			Depend on global conf MAIN_CREATEFROM_KEEP_LINE_ORIGIN_INFORMATION can be Id of origin object (aka line id), else object id
-     * 		@param		double		$pu_ht_devise		Unit price in currency
-     * 		@param		int    		$fk_remise_except	Id discount if line is from a discount
-     *    	@return    	int         	    			>0 if OK, <0 if KO
-     *    	@see       	add_product()
-     */
-    public function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1 = 0.0, $txlocaltax2 = 0.0, $fk_product = 0, $remise_percent = 0.0, $price_base_type = 'HT', $pu_ttc = 0.0, $info_bits = 0, $type = 0, $rang = -1, $special_code = 0, $fk_parent_line = 0, $fk_fournprice = 0, $pa_ht = 0, $label = '', $date_start = '', $date_end = '', $array_options = 0, $fk_unit = null, $origin = '', $origin_id = 0, $pu_ht_devise = 0, $fk_remise_except = 0)
+	/**
+	 *    	Add a proposal line into database (linked to product/service or not)
+	 *      The parameters are already supposed to be appropriate and with final values to the call
+	 *      of this method. Also, for the VAT rate, it must have already been defined
+	 *      by whose calling the method get_default_tva (societe_vendeuse, societe_acheteuse, '' product)
+	 *      and desc must already have the right value (it's up to the caller to manage multilanguage)
+	 *
+	 * 		@param    	string		$desc				Description of line
+	 * 		@param    	float		$pu_ht				Unit price
+	 * 		@param    	float		$qty             	Quantity
+	 * 		@param    	float		$txtva           	Force Vat rate, -1 for auto (Can contain the vat_src_code too with syntax '9.9 (CODE)')
+	 * 		@param		float		$txlocaltax1		Local tax 1 rate (deprecated, use instead txtva with code inside)
+	 *  	@param		float		$txlocaltax2		Local tax 2 rate (deprecated, use instead txtva with code inside)
+	 *		@param    	int			$fk_product      	Product/Service ID predefined
+	 * 		@param    	float		$remise_percent  	Pourcentage de remise de la ligne
+	 * 		@param    	string		$price_base_type	HT or TTC
+	 * 		@param    	float		$pu_ttc             Prix unitaire TTC
+	 * 		@param    	int			$info_bits			Bits for type of lines
+	 *      @param      int			$type               Type of line (0=product, 1=service). Not used if fk_product is defined, the type of product is used.
+	 *      @param      int			$rang               Position of line
+	 *      @param		int			$special_code		Special code (also used by externals modules!)
+	 *      @param		int			$fk_parent_line		Id of parent line
+	 *      @param		int			$fk_fournprice		Id supplier price
+	 *      @param		int			$pa_ht				Buying price without tax
+	 *      @param		string		$label				???
+	 *		@param      int			$date_start       	Start date of the line
+	 *		@param      int			$date_end         	End date of the line
+	 *      @param		array		$array_options		extrafields array
+	 * 		@param 		string		$fk_unit 			Code of the unit to use. Null to use the default one
+	 *      @param		string		$origin				Depend on global conf MAIN_CREATEFROM_KEEP_LINE_ORIGIN_INFORMATION can be 'orderdet', 'propaldet'..., else 'order','propal,'....
+	 *      @param		int			$origin_id			Depend on global conf MAIN_CREATEFROM_KEEP_LINE_ORIGIN_INFORMATION can be Id of origin object (aka line id), else object id
+	 * 		@param		double		$pu_ht_devise		Unit price in currency
+	 * 		@param		int    		$fk_remise_except	Id discount if line is from a discount
+	 *    	@return    	int         	    			>0 if OK, <0 if KO
+	 *    	@see       	add_product()
+	 */
+	public function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1 = 0.0, $txlocaltax2 = 0.0, $fk_product = 0, $remise_percent = 0.0, $price_base_type = 'HT', $pu_ttc = 0.0, $info_bits = 0, $type = 0, $rang = -1, $special_code = 0, $fk_parent_line = 0, $fk_fournprice = 0, $pa_ht = 0, $label = '', $date_start = '', $date_end = '', $array_options = 0, $fk_unit = null, $origin = '', $origin_id = 0, $pu_ht_devise = 0, $fk_remise_except = 0)
 	{
 		global $mysoc, $conf, $langs;
 
@@ -706,27 +704,27 @@ class Propal extends CommonObject
 				// Reorder if child line
 				if (!empty($fk_parent_line)) $this->line_order(true, 'DESC');
 
-                // Mise a jour informations denormalisees au niveau de la propale meme
-                $result = $this->update_price(1, 'auto', 0, $mysoc); // This method is designed to add line from user input so total calculation must be done using 'auto' mode.
-                if ($result > 0)
-                {
-                    $this->db->commit();
-                    return $this->line->id;
-                } else {
-                    $this->error = $this->db->error();
-                    $this->db->rollback();
-                    return -1;
-                }
-            } else {
-                $this->error = $this->line->error;
-                $this->db->rollback();
-                return -2;
-            }
-        } else {
+				// Mise a jour informations denormalisees au niveau de la propale meme
+				$result = $this->update_price(1, 'auto', 0, $mysoc); // This method is designed to add line from user input so total calculation must be done using 'auto' mode.
+				if ($result > 0)
+				{
+					$this->db->commit();
+					return $this->line->id;
+				} else {
+					$this->error = $this->db->error();
+					$this->db->rollback();
+					return -1;
+				}
+			} else {
+				$this->error = $this->line->error;
+				$this->db->rollback();
+				return -2;
+			}
+		} else {
 			dol_syslog(get_class($this)."::addline status of proposal must be Draft to allow use of ->addline()", LOG_ERR);
 			return -3;
 		}
-    }
+	}
 
 
 	/**
@@ -757,11 +755,11 @@ class Propal extends CommonObject
 	 * 	@param		int			$notrigger			disable line update trigger
 	 *  @return     int     		        		0 if OK, <0 if KO
 	 */
-    public function updateline($rowid, $pu, $qty, $remise_percent, $txtva, $txlocaltax1 = 0.0, $txlocaltax2 = 0.0, $desc = '', $price_base_type = 'HT', $info_bits = 0, $special_code = 0, $fk_parent_line = 0, $skip_update_total = 0, $fk_fournprice = 0, $pa_ht = 0, $label = '', $type = 0, $date_start = '', $date_end = '', $array_options = 0, $fk_unit = null, $pu_ht_devise = 0, $notrigger = 0)
+	public function updateline($rowid, $pu, $qty, $remise_percent, $txtva, $txlocaltax1 = 0.0, $txlocaltax2 = 0.0, $desc = '', $price_base_type = 'HT', $info_bits = 0, $special_code = 0, $fk_parent_line = 0, $skip_update_total = 0, $fk_fournprice = 0, $pa_ht = 0, $label = '', $type = 0, $date_start = '', $date_end = '', $array_options = 0, $fk_unit = null, $pu_ht_devise = 0, $notrigger = 0)
 	{
 		global $mysoc, $langs;
 
-        dol_syslog(get_class($this)."::updateLine rowid=$rowid, pu=$pu, qty=$qty, remise_percent=$remise_percent,
+		dol_syslog(get_class($this)."::updateLine rowid=$rowid, pu=$pu, qty=$qty, remise_percent=$remise_percent,
         txtva=$txtva, desc=$desc, price_base_type=$price_base_type, info_bits=$info_bits, special_code=$special_code, fk_parent_line=$fk_parent_line, pa_ht=$pa_ht, type=$type, date_start=$date_start, date_end=$date_end");
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
 
@@ -778,11 +776,11 @@ class Propal extends CommonObject
 		if (!empty($qty) && $special_code == 3) $special_code = 0; // Remove option tag
 		if (empty($type)) $type = 0;
 
-        if ($date_start && $date_end && $date_start > $date_end) {
-            $langs->load("errors");
-            $this->error = $langs->trans('ErrorStartDateGreaterEnd');
-            return -1;
-        }
+		if ($date_start && $date_end && $date_start > $date_end) {
+			$langs->load("errors");
+			$this->error = $langs->trans('ErrorStartDateGreaterEnd');
+			return -1;
+		}
 
 		if ($this->statut == self::STATUS_DRAFT)
 		{
@@ -926,7 +924,7 @@ class Propal extends CommonObject
 	 *  @param		int		$lineid			Id of line to delete
 	 *  @return     int         			>0 if OK, <0 if KO
 	 */
-    public function deleteline($lineid)
+	public function deleteline($lineid)
 	{
 		global $user;
 
@@ -964,7 +962,7 @@ class Propal extends CommonObject
 	 * 	@param		int		$notrigger	1=Does not execute triggers, 0= execute triggers
 	 *  @return     int     			<0 if KO, >=0 if OK
 	 */
-    public function create($user, $notrigger = 0)
+	public function create($user, $notrigger = 0)
 	{
 		global $conf, $hookmanager;
 		$error = 0;
@@ -1102,62 +1100,62 @@ class Propal extends CommonObject
 				$resql = $this->db->query($sql);
 				if (!$resql) $error++;
 
-                if (!empty($this->linkedObjectsIds) && empty($this->linked_objects))	// To use new linkedObjectsIds instead of old linked_objects
-                {
-                	$this->linked_objects = $this->linkedObjectsIds; // TODO Replace linked_objects with linkedObjectsIds
-                }
+				if (!empty($this->linkedObjectsIds) && empty($this->linked_objects))	// To use new linkedObjectsIds instead of old linked_objects
+				{
+					$this->linked_objects = $this->linkedObjectsIds; // TODO Replace linked_objects with linkedObjectsIds
+				}
 
-                // Add object linked
-                if (!$error && $this->id && is_array($this->linked_objects) && !empty($this->linked_objects))
-                {
-                	foreach ($this->linked_objects as $origin => $tmp_origin_id)
-                	{
-                		if (is_array($tmp_origin_id))       // New behaviour, if linked_object can have several links per type, so is something like array('contract'=>array(id1, id2, ...))
-                		{
-                			foreach ($tmp_origin_id as $origin_id)
-                			{
-                				$ret = $this->add_object_linked($origin, $origin_id);
-                				if (!$ret)
-                				{
-                					$this->error = $this->db->lasterror();
-                					$error++;
-                				}
-                			}
-                		} else // Old behaviour, if linked_object has only one link per type, so is something like array('contract'=>id1))
-                		{
-                			$origin_id = $tmp_origin_id;
-                			$ret = $this->add_object_linked($origin, $origin_id);
-                			if (!$ret)
-                			{
-                				$this->error = $this->db->lasterror();
-                				$error++;
-                			}
-                		}
-                	}
-                }
+				// Add object linked
+				if (!$error && $this->id && is_array($this->linked_objects) && !empty($this->linked_objects))
+				{
+					foreach ($this->linked_objects as $origin => $tmp_origin_id)
+					{
+						if (is_array($tmp_origin_id))       // New behaviour, if linked_object can have several links per type, so is something like array('contract'=>array(id1, id2, ...))
+						{
+							foreach ($tmp_origin_id as $origin_id)
+							{
+								$ret = $this->add_object_linked($origin, $origin_id);
+								if (!$ret)
+								{
+									$this->error = $this->db->lasterror();
+									$error++;
+								}
+							}
+						} else // Old behaviour, if linked_object has only one link per type, so is something like array('contract'=>id1))
+						{
+							$origin_id = $tmp_origin_id;
+							$ret = $this->add_object_linked($origin, $origin_id);
+							if (!$ret)
+							{
+								$this->error = $this->db->lasterror();
+								$error++;
+							}
+						}
+					}
+				}
 
-                /*
+				/*
                  *  Insertion du detail des produits dans la base
                  *  Insert products detail in database
                  */
-                if (!$error)
-                {
-                    $fk_parent_line = 0;
-                    $num = count($this->lines);
+				if (!$error)
+				{
+					$fk_parent_line = 0;
+					$num = count($this->lines);
 
 					for ($i = 0; $i < $num; $i++)
 					{
-                        if (!is_object($this->lines[$i]))	// If this->lines is not array of objects, coming from REST API
-                        {   // Convert into object this->lines[$i].
-                            $line = (object) $this->lines[$i];
-                        } else {
-                            $line = $this->lines[$i];
-                        }
+						if (!is_object($this->lines[$i]))	// If this->lines is not array of objects, coming from REST API
+						{   // Convert into object this->lines[$i].
+							$line = (object) $this->lines[$i];
+						} else {
+							$line = $this->lines[$i];
+						}
 						// Reset fk_parent_line for line that are not child lines or special product
 						if (($line->product_type != 9 && empty($line->fk_parent_line)) || $line->product_type == 9) {
 							$fk_parent_line = 0;
 						}
-                        // Complete vat rate with code
+						// Complete vat rate with code
 						$vatrate = $line->tva_tx;
 						if ($line->vat_src_code && !preg_match('/\(.*\)/', $vatrate)) $vatrate .= ' ('.$line->vat_src_code.')';
 
@@ -1273,7 +1271,7 @@ class Propal extends CommonObject
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Insert into DB a proposal object completely defined by its data members (ex, results from copy).
 	 *
@@ -1281,9 +1279,9 @@ class Propal extends CommonObject
 	 *	@return    	int				Id of the new object if ok, <0 if ko
 	 *	@see       	create()
 	 */
-    public function create_from($user)
+	public function create_from($user)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		// i love this function because $this->products is not used in create function...
 		$this->products = $this->lines;
 
@@ -1324,10 +1322,10 @@ class Propal extends CommonObject
 		{
 			if ($objsoc->fetch($socid) > 0)
 			{
-			    $object->socid = $objsoc->id;
-			    $object->cond_reglement_id	= (!empty($objsoc->cond_reglement_id) ? $objsoc->cond_reglement_id : 0);
-			    $object->mode_reglement_id	= (!empty($objsoc->mode_reglement_id) ? $objsoc->mode_reglement_id : 0);
-			    $object->fk_delivery_address = '';
+				$object->socid = $objsoc->id;
+				$object->cond_reglement_id	= (!empty($objsoc->cond_reglement_id) ? $objsoc->cond_reglement_id : 0);
+				$object->mode_reglement_id	= (!empty($objsoc->mode_reglement_id) ? $objsoc->mode_reglement_id : 0);
+				$object->fk_delivery_address = '';
 
 				/*if (!empty($conf->projet->enabled))
                 {
@@ -1339,7 +1337,7 @@ class Propal extends CommonObject
     					$clonedObj->fk_project = '';
     				}
                 }*/
-			    $object->fk_project = ''; // A cloned proposal is set by default to no project.
+				$object->fk_project = ''; // A cloned proposal is set by default to no project.
 			}
 
 			// reset ref_client
@@ -1347,12 +1345,12 @@ class Propal extends CommonObject
 
 			// TODO Change product price if multi-prices
 		} else {
-		    $objsoc->fetch($object->socid);
+			$objsoc->fetch($object->socid);
 		}
 
 		$object->id = 0;
 		$object->ref = '';
-		$object->entity = (! empty($forceentity) ? $forceentity : $object->entity);
+		$object->entity = (!empty($forceentity) ? $forceentity : $object->entity);
 		$object->statut = self::STATUS_DRAFT;
 
 		// Clear fields
@@ -1372,18 +1370,18 @@ class Propal extends CommonObject
 		$result = $object->create($user);
 		if ($result < 0)
 		{
-		    $this->error = $object->error;
-		    $this->errors = array_merge($this->errors, $object->errors);
-		    $error++;
+			$this->error = $object->error;
+			$this->errors = array_merge($this->errors, $object->errors);
+			$error++;
 		}
 
 		if (!$error)
 		{
 			// copy internal contacts
-		    if ($object->copy_linked_contact($this, 'internal') < 0)
-		    {
+			if ($object->copy_linked_contact($this, 'internal') < 0)
+			{
 				$error++;
-		    }
+			}
 		}
 
 		if (!$error)
@@ -1391,7 +1389,7 @@ class Propal extends CommonObject
 			// copy external contacts if same company
 			if ($this->socid == $object->socid)
 			{
-			    if ($object->copy_linked_contact($this, 'external') < 0)
+				if ($object->copy_linked_contact($this, 'external') < 0)
 					$error++;
 			}
 		}
@@ -1429,7 +1427,7 @@ class Propal extends CommonObject
 	 *	@param		string		$ref_ext	Ref ext of proposal
 	 *	@return     int         			>0 if OK, <0 if KO
 	 */
-    public function fetch($rowid, $ref = '', $ref_ext = '')
+	public function fetch($rowid, $ref = '', $ref_ext = '')
 	{
 		$sql = "SELECT p.rowid, p.ref, p.entity, p.remise, p.remise_percent, p.remise_absolue, p.fk_soc";
 		$sql .= ", p.total, p.tva, p.localtax1, p.localtax2, p.total_ht";
@@ -1501,14 +1499,14 @@ class Propal extends CommonObject
 				$this->project = null; // Clear if another value was already set by fetch_projet
 
 				$this->model_pdf            = $obj->model_pdf;
-				$this->modelpdf             = $obj->model_pdf;	// deprecated
+				$this->modelpdf             = $obj->model_pdf; // deprecated
 				$this->last_main_doc = $obj->last_main_doc;
 				$this->note                 = $obj->note_private; // TODO deprecated
 				$this->note_private         = $obj->note_private;
 				$this->note_public          = $obj->note_public;
 
 				$this->status               = (int) $obj->fk_statut;
-				$this->statut               = $this->status;		// deprecated
+				$this->statut               = $this->status; // deprecated
 				$this->statut_libelle       = $obj->statut_label;
 
 				$this->datec                = $this->db->jdate($obj->datec); // TODO deprecated
@@ -1595,7 +1593,7 @@ class Propal extends CommonObject
 	 *      @param      int		$notrigger	    0=launch triggers after, 1=disable triggers
 	 *      @return     int      			   	<0 if KO, >0 if OK
 	 */
-    public function update(User $user, $notrigger = 0)
+	public function update(User $user, $notrigger = 0)
 	{
 		global $conf;
 
@@ -1684,7 +1682,7 @@ class Propal extends CommonObject
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Load array lines
 	 *
@@ -1696,7 +1694,7 @@ class Propal extends CommonObject
 	public function fetch_lines($only_product = 0, $loadalsotranslation = 0)
 	{
 		global $langs, $conf;
-        // phpcs:enable
+		// phpcs:enable
 		$this->lines = array();
 
 		$sql = 'SELECT d.rowid, d.fk_propal, d.fk_parent_line, d.label as custom_label, d.description, d.price, d.vat_src_code, d.tva_tx, d.localtax1_tx, d.localtax2_tx, d.localtax1_type, d.localtax2_type, d.qty, d.fk_remise_except, d.remise_percent, d.subprice, d.fk_product,';
@@ -1790,11 +1788,11 @@ class Propal extends CommonObject
 				$line->fetch_optionals();
 
 				// multilangs
-        		if (!empty($conf->global->MAIN_MULTILANGS) && !empty($objp->fk_product) && !empty($loadalsotranslation)) {
-                    $line = new Product($this->db);
-                    $line->fetch($objp->fk_product);
-                    $line->getMultiLangs();
-        		}
+				if (!empty($conf->global->MAIN_MULTILANGS) && !empty($objp->fk_product) && !empty($loadalsotranslation)) {
+					$line = new Product($this->db);
+					$line->fetch($objp->fk_product);
+					$line->getMultiLangs();
+				}
 
 				$this->lines[$i] = $line;
 				//dol_syslog("1 ".$line->fk_product);
@@ -1818,7 +1816,7 @@ class Propal extends CommonObject
 	 *  @param	int		$notrigger	1=Does not execute triggers, 0=execute triggers
 	 *  @return int         		<0 if KO, 0=Nothing done, >=0 if OK
 	 */
-    public function valid($user, $notrigger = 0)
+	public function valid($user, $notrigger = 0)
 	{
 		global $conf;
 
@@ -1933,7 +1931,7 @@ class Propal extends CommonObject
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Define proposal date
 	 *
@@ -1942,9 +1940,9 @@ class Propal extends CommonObject
 	 *  @param  int			$notrigger	1=Does not execute triggers, 0= execute triggers
 	 *  @return	int         			<0 if KO, >0 if OK
 	 */
-    public function set_date($user, $date, $notrigger = 0)
+	public function set_date($user, $date, $notrigger = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		if (empty($date))
 		{
 			$this->error = 'ErrorBadParameter';
@@ -2000,7 +1998,7 @@ class Propal extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Define end validity date
 	 *
@@ -2009,9 +2007,9 @@ class Propal extends CommonObject
 	 *  @param  	int		$notrigger			1=Does not execute triggers, 0= execute triggers
 	 *	@return     int         				<0 if KO, >0 if OK
 	 */
-    public function set_echeance($user, $date_fin_validite, $notrigger = 0)
+	public function set_echeance($user, $date_fin_validite, $notrigger = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		if (!empty($user->rights->propal->creer))
 		{
 			$error = 0;
@@ -2076,7 +2074,7 @@ class Propal extends CommonObject
 		return $this->setDeliveryDate($user, $delivery_date, $notrigger);
 	}
 
-    /**
+	/**
 	 *	Set delivery date
 	 *
 	 *	@param      User 	$user        		Object user that modify
@@ -2084,7 +2082,7 @@ class Propal extends CommonObject
 	 *  @param  	int		$notrigger			1=Does not execute triggers, 0= execute triggers
 	 *	@return     int         				<0 if ko, >0 if ok
 	 */
-    public function setDeliveryDate($user, $delivery_date, $notrigger = 0)
+	public function setDeliveryDate($user, $delivery_date, $notrigger = 0)
 	{
 		if (!empty($user->rights->propal->creer))
 		{
@@ -2134,7 +2132,7 @@ class Propal extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Set delivery
 	 *
@@ -2143,9 +2141,9 @@ class Propal extends CommonObject
 	 *  @param  	int		$notrigger		1=Does not execute triggers, 0= execute triggers
 	 *  @return     int           			<0 if KO, >0 if OK
 	 */
-    public function set_availability($user, $id, $notrigger = 0)
+	public function set_availability($user, $id, $notrigger = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		if (!empty($user->rights->propal->creer) && $this->statut >= self::STATUS_DRAFT)
 		{
 			$error = 0;
@@ -2201,7 +2199,7 @@ class Propal extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Set source of demand
 	 *
@@ -2210,9 +2208,9 @@ class Propal extends CommonObject
 	 *  @param  	int		$notrigger	1=Does not execute triggers, 0= execute triggers
 	 *  @return     int           		<0 if KO, >0 if OK
 	 */
-    public function set_demand_reason($user, $id, $notrigger = 0)
+	public function set_demand_reason($user, $id, $notrigger = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		if (!empty($user->rights->propal->creer) && $this->statut >= self::STATUS_DRAFT)
 		{
 			$error = 0;
@@ -2270,7 +2268,7 @@ class Propal extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Set customer reference number
 	 *
@@ -2279,9 +2277,9 @@ class Propal extends CommonObject
 	 *  @param  	int		$notrigger		1=Does not execute triggers, 0= execute triggers
 	 *  @return     int						<0 if ko, >0 if ok
 	 */
-    public function set_ref_client($user, $ref_client, $notrigger = 0)
+	public function set_ref_client($user, $ref_client, $notrigger = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		if (!empty($user->rights->propal->creer))
 		{
 			$error = 0;
@@ -2331,7 +2329,7 @@ class Propal extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Set an overall discount on the proposal
 	 *
@@ -2340,9 +2338,9 @@ class Propal extends CommonObject
 	 *  @param  	int		$notrigger	1=Does not execute triggers, 0= execute triggers
 	 *	@return     int         		<0 if ko, >0 if ok
 	 */
-    public function set_remise_percent($user, $remise, $notrigger = 0)
+	public function set_remise_percent($user, $remise, $notrigger = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$remise = trim($remise) ?trim($remise) : 0;
 
 		if (!empty($user->rights->propal->creer))
@@ -2396,7 +2394,7 @@ class Propal extends CommonObject
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Set an absolute overall discount on the proposal
 	 *
@@ -2405,9 +2403,9 @@ class Propal extends CommonObject
 	 *  @param  	int		$notrigger	1=Does not execute triggers, 0= execute triggers
 	 *	@return     int         		<0 if ko, >0 if ok
 	 */
-    public function set_remise_absolue($user, $remise, $notrigger = 0)
+	public function set_remise_absolue($user, $remise, $notrigger = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$remise = trim($remise) ?trim($remise) : 0;
 
 		if (!empty($user->rights->propal->creer))
@@ -2472,7 +2470,7 @@ class Propal extends CommonObject
 	 *  @param		int		$notrigger	1=Does not execute triggers, 0= execute triggers
 	 *	@return     int         		<0 if KO, >0 if OK
 	 */
-    public function reopen($user, $statut, $note = '', $notrigger = 0)
+	public function reopen($user, $statut, $note = '', $notrigger = 0)
 	{
 
 		$this->statut = $statut;
@@ -2531,7 +2529,7 @@ class Propal extends CommonObject
 	 *  @param		int		$notrigger	1=Does not execute triggers, 0=Execute triggers
 	 *	@return     int         		<0 if KO, >0 if OK
 	 */
-    public function cloture($user, $status, $note = "", $notrigger = 0)
+	public function cloture($user, $status, $note = "", $notrigger = 0)
 	{
 		global $langs, $conf;
 
@@ -2630,7 +2628,7 @@ class Propal extends CommonObject
 	 *  @param		int		$notrigger	1=Does not execute triggers, 0= execute triggers
 	 *	@return     int     			<0 si ko, >0 si ok
 	 */
-    public function classifyBilled(User $user, $notrigger = 0)
+	public function classifyBilled(User $user, $notrigger = 0)
 	{
 		$error = 0;
 
@@ -2676,7 +2674,7 @@ class Propal extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Set draft status
 	 *
@@ -2684,15 +2682,15 @@ class Propal extends CommonObject
 	 *  @param		int		$notrigger	1=Does not execute triggers, 0= execute triggers
 	 *	@return		int					<0 if KO, >0 if OK
 	 */
-    public function setDraft($user, $notrigger = 0)
+	public function setDraft($user, $notrigger = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$error = 0;
 
 		// Protection
 		if ($this->statut <= self::STATUS_DRAFT)
 		{
-		    return 0;
+			return 0;
 		}
 
 		dol_syslog(get_class($this)."::setDraft", LOG_DEBUG);
@@ -2725,10 +2723,10 @@ class Propal extends CommonObject
 
 		if (!$error)
 		{
-		    $this->statut = self::STATUS_DRAFT;
-		    $this->brouillon = 1;
+			$this->statut = self::STATUS_DRAFT;
+			$this->brouillon = 1;
 
-		    $this->db->commit();
+			$this->db->commit();
 			return 1;
 		} else {
 			foreach ($this->errors as $errmsg)
@@ -2742,7 +2740,7 @@ class Propal extends CommonObject
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *    Return list of proposal (eventually filtered on user) into an array
 	 *
@@ -2756,9 +2754,9 @@ class Propal extends CommonObject
 	 *    @param    string	$sortorder			Sort order
 	 *    @return	int		       				-1 if KO, array with result if OK
 	 */
-    public function liste_array($shortlist = 0, $draft = 0, $notcurrentuser = 0, $socid = 0, $limit = 0, $offset = 0, $sortfield = 'p.datep', $sortorder = 'DESC')
+	public function liste_array($shortlist = 0, $draft = 0, $notcurrentuser = 0, $socid = 0, $limit = 0, $offset = 0, $sortfield = 'p.datep', $sortorder = 'DESC')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $user;
 
 		$ga = array();
@@ -2820,21 +2818,21 @@ class Propal extends CommonObject
 	 *
 	 *	@return	array		Array of invoices
 	 */
-    public function getInvoiceArrayList()
+	public function getInvoiceArrayList()
 	{
 		return $this->InvoiceArrayList($this->id);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Returns an array with id and ref of related invoices
 	 *
 	 *	@param		int		$id			Id propal
 	 *	@return		array				Array of invoices id
 	 */
-    public function InvoiceArrayList($id)
+	public function InvoiceArrayList($id)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$ga = array();
 		$linkedInvoices = array();
 
@@ -2914,7 +2912,7 @@ class Propal extends CommonObject
 	 *	@param	int		$notrigger		1=Does not execute triggers, 0= execute triggers
 	 *	@return	int						1 if ok, otherwise if error
 	 */
-    public function delete($user, $notrigger = 0)
+	public function delete($user, $notrigger = 0)
 	{
 		global $conf;
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
@@ -2933,9 +2931,9 @@ class Propal extends CommonObject
 
 		if (!$error)
 		{
-            $main = MAIN_DB_PREFIX.'propaldet';
-            $ef = $main."_extrafields";
-            $sqlef = "DELETE FROM $ef WHERE fk_object IN (SELECT rowid FROM $main WHERE fk_propal = ".$this->id.")";
+			$main = MAIN_DB_PREFIX.'propaldet';
+			$ef = $main."_extrafields";
+			$sqlef = "DELETE FROM $ef WHERE fk_object IN (SELECT rowid FROM $main WHERE fk_propal = ".$this->id.")";
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."propaldet WHERE fk_propal = ".$this->id;
 			if ($this->db->query($sqlef) && $this->db->query($sql))
 			{
@@ -3033,7 +3031,7 @@ class Propal extends CommonObject
 	 *  @return int                  	>0 if OK, <0 if KO
 	 *  @deprecated  use set_availability
 	 */
-    public function availability($availability_id, $notrigger = 0)
+	public function availability($availability_id, $notrigger = 0)
 	{
 		global $user;
 
@@ -3091,7 +3089,7 @@ class Propal extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Change source demand
 	 *
@@ -3100,9 +3098,9 @@ class Propal extends CommonObject
 	 *	@return int						>0 si ok, <0 si ko
 	 *	@deprecated use set_demand_reason
 	 */
-    public function demand_reason($demand_reason_id, $notrigger = 0)
+	public function demand_reason($demand_reason_id, $notrigger = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $user;
 
 		if ($this->statut >= self::STATUS_DRAFT)
@@ -3166,7 +3164,7 @@ class Propal extends CommonObject
 	 * 	@param	int		$id		Proposal id
 	 *  @return	void
 	 */
-    public function info($id)
+	public function info($id)
 	{
 		$sql = "SELECT c.rowid, ";
 		$sql .= " c.datec, c.date_valid as datev, c.date_cloture as dateo,";
@@ -3219,12 +3217,12 @@ class Propal extends CommonObject
 	 *    	@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
 	 *    	@return     string		Label
 	 */
-    public function getLibStatut($mode = 0)
+	public function getLibStatut($mode = 0)
 	{
 		return $this->LibStatut($this->statut, $mode);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *    	Return label of a status (draft, validated, ...)
 	 *
@@ -3232,9 +3230,9 @@ class Propal extends CommonObject
 	 *    	@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
 	 *    	@return     string		Label
 	 */
-    public function LibStatut($status, $mode = 1)
+	public function LibStatut($status, $mode = 1)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 		// Init/load array of translation of status
@@ -3265,7 +3263,7 @@ class Propal extends CommonObject
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *      Load indicators for dashboard (this->nbtodo and this->nbtodolate)
 	 *
@@ -3273,9 +3271,9 @@ class Propal extends CommonObject
 	 *      @param          int		$mode   "opened" for proposal to close, "signed" for proposal to invoice
 	 *      @return WorkboardResponse|int <0 if KO, WorkboardResponse if OK
 	 */
-    public function load_board($user, $mode)
+	public function load_board($user, $mode)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $langs;
 
 		$clause = " WHERE";
@@ -3356,7 +3354,7 @@ class Propal extends CommonObject
 	 *
 	 *  @return	void
 	 */
-    public function initAsSpecimen()
+	public function initAsSpecimen()
 	{
 		global $conf, $langs;
 
@@ -3433,7 +3431,7 @@ class Propal extends CommonObject
 			{
 				$prodid = mt_rand(1, $num_prods);
 				$line->fk_product = $prodids[$prodid];
-		        $line->product_ref = 'SPECIMEN';
+				$line->product_ref = 'SPECIMEN';
 			}
 
 			$this->lines[$xnbp] = $line;
@@ -3446,15 +3444,15 @@ class Propal extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *      Charge indicateurs this->nb de tableau de bord
 	 *
 	 *      @return     int         <0 if ko, >0 if ok
 	 */
-    public function load_state_board()
+	public function load_state_board()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $user;
 
 		$this->nb = array();
@@ -3496,7 +3494,7 @@ class Propal extends CommonObject
 	 *  @param	Societe		$soc  	Object thirdparty
 	 *  @return string      		Reference libre pour la propale
 	 */
-    public function getNextNumRef($soc)
+	public function getNextNumRef($soc)
 	{
 		global $conf, $langs;
 		$langs->load("propal");
@@ -3551,10 +3549,10 @@ class Propal extends CommonObject
 	 *	@param      string	$get_params    	          Parametres added to url
 	 *  @param	    int   	$notooltip		          1=Disable tooltip
 	 *  @param      int     $save_lastsearch_value    -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
-     *  @param      int     $addlinktonotes           -1=Disable, 0=Just add label show notes, 1=Add private note (only internal user), 2=Add public note (internal or external user), 3=Add private (internal user) and public note (internal and external user)
+	 *  @param      int     $addlinktonotes           -1=Disable, 0=Just add label show notes, 1=Add private note (only internal user), 2=Add public note (internal or external user), 3=Add private (internal user) and public note (internal and external user)
 	 *	@return     string          		          String with URL
 	 */
-    public function getNomUrl($withpicto = 0, $option = '', $get_params = '', $notooltip = 0, $save_lastsearch_value = -1, $addlinktonotes = -1)
+	public function getNomUrl($withpicto = 0, $option = '', $get_params = '', $notooltip = 0, $save_lastsearch_value = -1, $addlinktonotes = -1)
 	{
 		global $langs, $conf, $user;
 
@@ -3566,7 +3564,10 @@ class Propal extends CommonObject
 
 		if ($user->rights->propal->lire)
 		{
-			$label = img_picto('', $this->picto).' <u>'.$langs->trans("Proposal").'</u>';
+			$label = img_picto('', $this->picto).' <u class="paddingrightonly">'.$langs->trans("Proposal").'</u>';
+			if (isset($this->statut)) {
+				$label .= ' '.$this->getLibStatut(5);
+			}
 			if (!empty($this->ref))
 				$label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
 			if (!empty($this->ref_client))
@@ -3577,10 +3578,6 @@ class Propal extends CommonObject
 				$label .= '<br><b>'.$langs->trans('VAT').':</b> '.price($this->total_tva, 0, $langs, 0, -1, -1, $conf->currency);
 			if (!empty($this->total_ttc))
 				$label .= '<br><b>'.$langs->trans('AmountTTC').':</b> '.price($this->total_ttc, 0, $langs, 0, -1, -1, $conf->currency);
-			if (isset($this->statut)) {
-				$label .= '<br><b>'.$langs->trans("Status").":</b> ".$this->getLibStatut(5);
-			}
-
 
 			if ($option == '') {
 				$url = DOL_URL_ROOT.'/comm/propal/card.php?id='.$this->id.$get_params;
@@ -3622,45 +3619,45 @@ class Propal extends CommonObject
 		if ($withpicto != 2) $result .= $this->ref;
 		$result .= $linkend;
 
-        if ($addlinktonotes >= 0) {
-            $txttoshow = '';
+		if ($addlinktonotes >= 0) {
+			$txttoshow = '';
 
-            if ($addlinktonotes == 0) {
-                if (!empty($this->note_private) || !empty($this->note_public)) {
-                    $txttoshow = $langs->trans('ViewPrivateNote');
-                }
-            } elseif ($addlinktonotes == 1) {
-                if (!empty($this->note_private)) {
-                    $txttoshow .= ($user->socid > 0 ? '' : dol_string_nohtmltag($this->note_private, 1));
-                }
-            } elseif ($addlinktonotes == 2) {
-                if (!empty($this->note_public)) {
-                    $txttoshow .= dol_string_nohtmltag($this->note_public, 1);
-                }
-            } elseif ($addlinktonotes == 3) {
-                if ($user->socid > 0) {
-                    if (!empty($this->note_public)) {
-                        $txttoshow .= dol_string_nohtmltag($this->note_public, 1);
-                    }
-                } else {
-                    if (!empty($this->note_public)) {
-                        $txttoshow .= dol_string_nohtmltag($this->note_public, 1);
-                    }
-                    if (!empty($this->note_private)) {
-                        if (!empty($txttoshow)) $txttoshow .= '<br><br>';
-                        $txttoshow .= dol_string_nohtmltag($this->note_private, 1);
-                    }
-                }
-            }
+			if ($addlinktonotes == 0) {
+				if (!empty($this->note_private) || !empty($this->note_public)) {
+					$txttoshow = $langs->trans('ViewPrivateNote');
+				}
+			} elseif ($addlinktonotes == 1) {
+				if (!empty($this->note_private)) {
+					$txttoshow .= ($user->socid > 0 ? '' : dol_string_nohtmltag($this->note_private, 1));
+				}
+			} elseif ($addlinktonotes == 2) {
+				if (!empty($this->note_public)) {
+					$txttoshow .= dol_string_nohtmltag($this->note_public, 1);
+				}
+			} elseif ($addlinktonotes == 3) {
+				if ($user->socid > 0) {
+					if (!empty($this->note_public)) {
+						$txttoshow .= dol_string_nohtmltag($this->note_public, 1);
+					}
+				} else {
+					if (!empty($this->note_public)) {
+						$txttoshow .= dol_string_nohtmltag($this->note_public, 1);
+					}
+					if (!empty($this->note_private)) {
+						if (!empty($txttoshow)) $txttoshow .= '<br><br>';
+						$txttoshow .= dol_string_nohtmltag($this->note_private, 1);
+					}
+				}
+			}
 
-            if ($txttoshow) {
-                $result .= ' <span class="note inline-block">';
-                $result .= '<a href="'.DOL_URL_ROOT.'/comm/propal/note.php?id='.$this->id.'" class="classfortooltip" title="'.dol_escape_htmltag($txttoshow).'">';
-                $result .= img_picto('', 'note');
-                $result .= '</a>';
-                $result .= '</span>';
-            }
-        }
+			if ($txttoshow) {
+				$result .= ' <span class="note inline-block">';
+				$result .= '<a href="'.DOL_URL_ROOT.'/comm/propal/note.php?id='.$this->id.'" class="classfortooltip" title="'.dol_escape_htmltag($txttoshow).'">';
+				$result .= img_picto('', 'note');
+				$result .= '</a>';
+				$result .= '</span>';
+			}
+		}
 
 		return $result;
 	}
@@ -3670,7 +3667,7 @@ class Propal extends CommonObject
 	 *
 	 * 	@return int		>0 if OK, <0 if KO
 	 */
-    public function getLinesArray()
+	public function getLinesArray()
 	{
 		return $this->fetch_lines();
 	}
@@ -3683,7 +3680,7 @@ class Propal extends CommonObject
 	 *  @param      int			$hidedetails    Hide details of lines
 	 *  @param      int			$hidedesc       Hide description
 	 *  @param      int			$hideref        Hide ref
-         *  @param   null|array  $moreparams     Array to provide more information
+	 *  @param   null|array  $moreparams     Array to provide more information
 	 * 	@return     int         				0 if KO, 1 if OK
 	 */
 	public function generateDocument($modele, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0, $moreparams = null)
@@ -3742,68 +3739,68 @@ class PropaleLigne extends CommonObjectLine
 	 */
 	public $table_element = 'propaldet';
 
-    public $oldline;
+	public $oldline;
 
 	// From llx_propaldet
-    public $fk_propal;
-    public $fk_parent_line;
-    public $desc; // Description ligne
-    public $fk_product; // Id produit predefini
+	public $fk_propal;
+	public $fk_parent_line;
+	public $desc; // Description ligne
+	public $fk_product; // Id produit predefini
 	/**
 	 * @deprecated
 	 * @see $product_type
 	 */
-    public $fk_product_type;
+	public $fk_product_type;
 	/**
 	 * Product type.
 	 * @var int
 	 * @see Product::TYPE_PRODUCT, Product::TYPE_SERVICE
 	 */
-    public $product_type = Product::TYPE_PRODUCT;
+	public $product_type = Product::TYPE_PRODUCT;
 
-    public $qty;
-    public $tva_tx;
-    public $subprice;
-    public $remise_percent;
-    public $fk_remise_except;
+	public $qty;
+	public $tva_tx;
+	public $subprice;
+	public $remise_percent;
+	public $fk_remise_except;
 
-    public $rang = 0;
+	public $rang = 0;
 
-    public $fk_fournprice;
-    public $pa_ht;
-    public $marge_tx;
-    public $marque_tx;
+	public $fk_fournprice;
+	public $pa_ht;
+	public $marge_tx;
+	public $marque_tx;
 
-    public $special_code; // Tag for special lines (exlusive tags)
+	public $special_code; // Tag for special lines (exlusive tags)
 	// 1: frais de port
 	// 2: ecotaxe
 	// 3: option line (when qty = 0)
 
-    public $info_bits = 0; // Some other info:
+	public $info_bits = 0; // Some other info:
 	// Bit 0: 	0 si TVA normal - 1 si TVA NPR
 	// Bit 1:	0 ligne normale - 1 si ligne de remise fixe
 
-    public $total_ht; // Total HT  de la ligne toute quantite et incluant la remise ligne
-    public $total_tva; // Total TVA  de la ligne toute quantite et incluant la remise ligne
-    public $total_ttc; // Total TTC de la ligne toute quantite et incluant la remise ligne
+	public $total_ht; // Total HT  de la ligne toute quantite et incluant la remise ligne
+	public $total_tva; // Total TVA  de la ligne toute quantite et incluant la remise ligne
+	public $total_ttc; // Total TTC de la ligne toute quantite et incluant la remise ligne
 
 	/**
 	 * @deprecated
 	 * @see $remise_percent, $fk_remise_except
 	 */
-    public $remise;
+	public $remise;
 	/**
 	 * @deprecated
 	 * @see $subprice
 	 */
-    public $price;
+	public $price;
 
 	// From llx_product
 	/**
 	 * @deprecated
 	 * @see $product_ref
 	 */
-    public $ref;
+	public $ref;
 	/**
 	 * Product reference
 	 * @var string
@@ -3813,7 +3810,7 @@ class PropaleLigne extends CommonObjectLine
 	 * @deprecated
 	 * @see $product_label
 	 */
-    public $libelle;
+	public $libelle;
 	/**
 	 *  Product label
 	 * @var string
@@ -3825,32 +3822,32 @@ class PropaleLigne extends CommonObjectLine
 	 */
 	public $product_desc;
 
-    public $localtax1_tx; // Local tax 1
-    public $localtax2_tx; // Local tax 2
-    public $localtax1_type; // Local tax 1 type
-    public $localtax2_type; // Local tax 2 type
-    public $total_localtax1; // Line total local tax 1
-    public $total_localtax2; // Line total local tax 2
+	public $localtax1_tx; // Local tax 1
+	public $localtax2_tx; // Local tax 2
+	public $localtax1_type; // Local tax 1 type
+	public $localtax2_type; // Local tax 2 type
+	public $total_localtax1; // Line total local tax 1
+	public $total_localtax2; // Line total local tax 2
 
-    public $date_start;
-    public $date_end;
+	public $date_start;
+	public $date_end;
 
-    public $skip_update_total; // Skip update price total for special lines
+	public $skip_update_total; // Skip update price total for special lines
 
 	// Multicurrency
-    public $fk_multicurrency;
-    public $multicurrency_code;
-    public $multicurrency_subprice;
-    public $multicurrency_total_ht;
-    public $multicurrency_total_tva;
-    public $multicurrency_total_ttc;
+	public $fk_multicurrency;
+	public $multicurrency_code;
+	public $multicurrency_subprice;
+	public $multicurrency_total_ht;
+	public $multicurrency_total_tva;
+	public $multicurrency_total_ttc;
 
 	/**
 	 * 	Class line Contructor
 	 *
 	 * 	@param	DoliDB	$db	Database handler
 	 */
-    public function __construct($db)
+	public function __construct($db)
 	{
 		$this->db = $db;
 	}
@@ -3861,7 +3858,7 @@ class PropaleLigne extends CommonObjectLine
 	 *	@param	int		$rowid		Propal line id
 	 *	@return	int					<0 if KO, >0 if OK
 	 */
-    public function fetch($rowid)
+	public function fetch($rowid)
 	{
 		$sql = 'SELECT pd.rowid, pd.fk_propal, pd.fk_parent_line, pd.fk_product, pd.label as custom_label, pd.description, pd.price, pd.qty, pd.vat_src_code, pd.tva_tx,';
 		$sql .= ' pd.remise, pd.remise_percent, pd.fk_remise_except, pd.subprice,';
@@ -3951,7 +3948,7 @@ class PropaleLigne extends CommonObjectLine
 	 *	@param		int		$notrigger		1=Does not execute triggers, 0= execute triggers
 	 *	@return		int						<0 if KO, >0 if OK
 	 */
-    public function insert($notrigger = 0)
+	public function insert($notrigger = 0)
 	{
 		global $conf, $user;
 
@@ -3983,7 +3980,7 @@ class PropaleLigne extends CommonObjectLine
 		if (empty($this->multicurrency_total_tva)) $this->multicurrency_total_tva = 0;
 		if (empty($this->multicurrency_total_ttc)) $this->multicurrency_total_ttc = 0;
 
-	    // if buy price not defined, define buyprice as configured in margin admin
+		// if buy price not defined, define buyprice as configured in margin admin
 		if ($this->pa_ht == 0 && $pa_ht_isemptystring)
 		{
 			if (($result = $this->defineBuyPrice($this->subprice, $this->remise_percent, $this->fk_product)) < 0)
@@ -4090,7 +4087,7 @@ class PropaleLigne extends CommonObjectLine
 	 *	@param 	int		$notrigger	1=Does not execute triggers, 0= execute triggers
 	 *	@return	 int  				<0 if ko, >0 if ok
 	 */
-    public function delete(User $user, $notrigger = 0)
+	public function delete(User $user, $notrigger = 0)
 	{
 		global $conf;
 
@@ -4141,7 +4138,7 @@ class PropaleLigne extends CommonObjectLine
 	 *	@param 	int		$notrigger	1=Does not execute triggers, 0= execute triggers
 	 *	@return	int					<0 if ko, >0 if ok
 	 */
-    public function update($notrigger = 0)
+	public function update($notrigger = 0)
 	{
 		global $conf, $user;
 
@@ -4149,7 +4146,7 @@ class PropaleLigne extends CommonObjectLine
 
 		$pa_ht_isemptystring = (empty($this->pa_ht) && $this->pa_ht == ''); // If true, we can use a default value. If this->pa_ht = '0', we must use '0'.
 
-		if (empty($this->id) && ! empty($this->rowid)) $this->id = $this->rowid;
+		if (empty($this->id) && !empty($this->rowid)) $this->id = $this->rowid;
 
 		// Clean parameters
 		if (empty($this->tva_tx)) $this->tva_tx = 0;
@@ -4260,16 +4257,16 @@ class PropaleLigne extends CommonObjectLine
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Update DB line fields total_xxx
 	 *	Used by migration
 	 *
 	 *	@return		int		<0 if KO, >0 if OK
 	 */
-    public function update_total()
+	public function update_total()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$this->db->begin();
 
 		// Mise a jour ligne en base
diff --git a/htdocs/comm/propal/class/propalestats.class.php b/htdocs/comm/propal/class/propalestats.class.php
index 8f71447ab0b..ca95be53fc1 100644
--- a/htdocs/comm/propal/class/propalestats.class.php
+++ b/htdocs/comm/propal/class/propalestats.class.php
@@ -36,18 +36,18 @@ include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
  */
 class PropaleStats extends Stats
 {
-    /**
+	/**
 	 * @var string Name of table without prefix where object is stored
 	 */
 	public $table_element;
 
-    public $socid;
-    public $userid;
+	public $socid;
+	public $userid;
 
-    public $from;
-    public $field;
-    public $where;
-    public $join;
+	public $from;
+	public $field;
+	public $where;
+	public $join;
 
 
 	/**
@@ -55,65 +55,65 @@ class PropaleStats extends Stats
 	 *
 	 * @param 	DoliDB	$db		    Database handler
 	 * @param 	int		$socid	    Id third party for filter. This value must be forced during the new to external user company if user is an external user.
-     * @param   int		$userid     Id user for filter (creation user)
+	 * @param   int		$userid     Id user for filter (creation user)
 	 * @param 	string	$mode	    Option ('customer', 'supplier')
-     * @param	int		$typentid   Id typent of thirdpary for filter
-     * @param	int		$categid    Id category of thirdpary for filter
+	 * @param	int		$typentid   Id typent of thirdpary for filter
+	 * @param	int		$categid    Id category of thirdpary for filter
 	 */
-    public function __construct($db, $socid = 0, $userid = 0, $mode = 'customer', $typentid = 0, $categid = 0)
+	public function __construct($db, $socid = 0, $userid = 0, $mode = 'customer', $typentid = 0, $categid = 0)
 	{
 		global $user, $conf;
 
 		$this->db = $db;
-        $this->socid = ($socid > 0 ? $socid : 0);
-        $this->userid = $userid;
-        $this->join = '';
+		$this->socid = ($socid > 0 ? $socid : 0);
+		$this->userid = $userid;
+		$this->join = '';
 
-        if ($mode == 'customer')
-        {
-    		$object = new Propal($this->db);
+		if ($mode == 'customer')
+		{
+			$object = new Propal($this->db);
 
-    		$this->from = MAIN_DB_PREFIX.$object->table_element." as p";
-    		$this->from_line = MAIN_DB_PREFIX.$object->table_element_line." as tl";
-    		$this->field_date = 'p.datep';
-    		$this->field = 'total_ht';
-    		$this->field_line = 'total_ht';
+			$this->from = MAIN_DB_PREFIX.$object->table_element." as p";
+			$this->from_line = MAIN_DB_PREFIX.$object->table_element_line." as tl";
+			$this->field_date = 'p.datep';
+			$this->field = 'total_ht';
+			$this->field_line = 'total_ht';
 
-    		//$this->where .= " p.fk_statut > 0";
-        }
-        if ($mode == 'supplier')
-        {
-    		$object = new SupplierProposal($this->db);
+			//$this->where .= " p.fk_statut > 0";
+		}
+		if ($mode == 'supplier')
+		{
+			$object = new SupplierProposal($this->db);
 
-    		$this->from = MAIN_DB_PREFIX.$object->table_element." as p";
-    		$this->from_line = MAIN_DB_PREFIX.$object->table_element_line." as tl";
-    		$this->field_date = 'p.date_valid';
-    		$this->field = 'total_ht';
-    		$this->field_line = 'total_ht';
+			$this->from = MAIN_DB_PREFIX.$object->table_element." as p";
+			$this->from_line = MAIN_DB_PREFIX.$object->table_element_line." as tl";
+			$this->field_date = 'p.date_valid';
+			$this->field = 'total_ht';
+			$this->field_line = 'total_ht';
 
-    		//$this->where .= " p.fk_statut > 0"; // Validated, accepted, refused and closed
-        }
+			//$this->where .= " p.fk_statut > 0"; // Validated, accepted, refused and closed
+		}
 		//$this->where.= " AND p.fk_soc = s.rowid AND p.entity = ".$conf->entity;
-        $this->where .= ($this->where ? ' AND ' : '')."p.entity IN (".getEntity('propal').")";
+		$this->where .= ($this->where ? ' AND ' : '')."p.entity IN (".getEntity('propal').")";
 		if (!$user->rights->societe->client->voir && !$this->socid) $this->where .= " AND p.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
 		if ($this->socid)
 		{
 			$this->where .= " AND p.fk_soc = ".$this->socid;
 		}
-        if ($this->userid > 0) $this->where .= ' AND fk_user_author = '.$this->userid;
+		if ($this->userid > 0) $this->where .= ' AND fk_user_author = '.$this->userid;
 
-        if ($typentid)
-        {
-            $this->join .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s ON s.rowid = p.fk_soc';
-            $this->where .= ' AND s.fk_typent = '.$typentid;
-        }
+		if ($typentid)
+		{
+			$this->join .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s ON s.rowid = p.fk_soc';
+			$this->where .= ' AND s.fk_typent = '.$typentid;
+		}
 
-        if ($categid)
-        {
-            $this->join .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie_societe as cs ON cs.fk_soc = p.fk_soc';
-            $this->join .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie as c ON c.rowid = cs.fk_categorie';
-            $this->where .= ' AND c.rowid = '.$categid;
-        }
+		if ($categid)
+		{
+			$this->join .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie_societe as cs ON cs.fk_soc = p.fk_soc';
+			$this->join .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie as c ON c.rowid = cs.fk_categorie';
+			$this->where .= ' AND c.rowid = '.$categid;
+		}
 	}
 
 
@@ -121,21 +121,21 @@ class PropaleStats extends Stats
 	 * Return propals number by month for a year
 	 *
 	 * @param	int		$year		Year to scan
-     *	@param	int		$format		0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
+	 *	@param	int		$format		0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
 	 * @return	array				Array with number by month
 	 */
-    public function getNbByMonth($year, $format = 0)
+	public function getNbByMonth($year, $format = 0)
 	{
 		global $user;
 
 		$sql = "SELECT date_format(".$this->field_date.",'%m') as dm, COUNT(*) as nb";
 		$sql .= " FROM ".$this->from;
 		if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-        $sql .= $this->join;
+		$sql .= $this->join;
 		$sql .= " WHERE ".$this->field_date." BETWEEN '".$this->db->idate(dol_get_first_day($year))."' AND '".$this->db->idate(dol_get_last_day($year))."'";
 		$sql .= " AND ".$this->where;
 		$sql .= " GROUP BY dm";
-        $sql .= $this->db->order('dm', 'DESC');
+		$sql .= $this->db->order('dm', 'DESC');
 
 		$res = $this->_getNbByMonth($year, $sql, $format);
 		return $res;
@@ -147,17 +147,17 @@ class PropaleStats extends Stats
 	 * @return	array	Array with number by year
 	 *
 	 */
-    public function getNbByYear()
+	public function getNbByYear()
 	{
 		global $user;
 
 		$sql = "SELECT date_format(".$this->field_date.",'%Y') as dm, COUNT(*) as nb, SUM(c.".$this->field.")";
 		$sql .= " FROM ".$this->from;
 		if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-        $sql .= $this->join;
+		$sql .= $this->join;
 		$sql .= " WHERE ".$this->where;
 		$sql .= " GROUP BY dm";
-        $sql .= $this->db->order('dm', 'DESC');
+		$sql .= $this->db->order('dm', 'DESC');
 
 		return $this->_getNbByYear($sql);
 	}
@@ -166,21 +166,21 @@ class PropaleStats extends Stats
 	 * Return the propals amount by month for a year
 	 *
 	 * @param	int		$year		Year to scan
-     * @param	int		$format		0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
+	 * @param	int		$format		0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
 	 * @return	array				Array with amount by month
 	 */
-    public function getAmountByMonth($year, $format)
+	public function getAmountByMonth($year, $format)
 	{
 		global $user;
 
 		$sql = "SELECT date_format(".$this->field_date.",'%m') as dm, SUM(p.".$this->field.")";
 		$sql .= " FROM ".$this->from;
 		if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-        $sql .= $this->join;
+		$sql .= $this->join;
 		$sql .= " WHERE ".$this->field_date." BETWEEN '".$this->db->idate(dol_get_first_day($year))."' AND '".$this->db->idate(dol_get_last_day($year))."'";
 		$sql .= " AND ".$this->where;
 		$sql .= " GROUP BY dm";
-        $sql .= $this->db->order('dm', 'DESC');
+		$sql .= $this->db->order('dm', 'DESC');
 
 		$res = $this->_getAmountByMonth($year, $sql, $format);
 		return $res;
@@ -192,18 +192,18 @@ class PropaleStats extends Stats
 	 * @param	int		$year	year for stats
 	 * @return	array			array with number by month
 	 */
-    public function getAverageByMonth($year)
+	public function getAverageByMonth($year)
 	{
 		global $user;
 
 		$sql = "SELECT date_format(".$this->field_date.",'%m') as dm, AVG(p.".$this->field.")";
 		$sql .= " FROM ".$this->from;
 		if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-        $sql .= $this->join;
+		$sql .= $this->join;
 		$sql .= " WHERE ".$this->field_date." BETWEEN '".$this->db->idate(dol_get_first_day($year))."' AND '".$this->db->idate(dol_get_last_day($year))."'";
 		$sql .= " AND ".$this->where;
 		$sql .= " GROUP BY dm";
-        $sql .= $this->db->order('dm', 'DESC');
+		$sql .= $this->db->order('dm', 'DESC');
 
 		return $this->_getAverageByMonth($year, $sql);
 	}
@@ -213,17 +213,17 @@ class PropaleStats extends Stats
 	 *
 	 *	@return	array	Array of values
 	 */
-    public function getAllByYear()
+	public function getAllByYear()
 	{
 		global $user;
 
 		$sql = "SELECT date_format(".$this->field_date.",'%Y') as year, COUNT(*) as nb, SUM(".$this->field.") as total, AVG(".$this->field.") as avg";
 		$sql .= " FROM ".$this->from;
 		if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-        $sql .= $this->join;
+		$sql .= $this->join;
 		$sql .= " WHERE ".$this->where;
 		$sql .= " GROUP BY year";
-        $sql .= $this->db->order('year', 'DESC');
+		$sql .= $this->db->order('year', 'DESC');
 
 		return $this->_getAllByYear($sql);
 	}
@@ -234,23 +234,23 @@ class PropaleStats extends Stats
 	 *	Return nb, amount of predefined product for year
 	 *
 	 *	@param	int		$year			Year to scan
-     *  @param 	int     $limit      	Limit
+	 *  @param 	int     $limit      	Limit
 	 *	@return	array					Array of values
 	 */
-    public function getAllByProduct($year, $limit = 10)
+	public function getAllByProduct($year, $limit = 10)
 	{
 		global $user;
 
 		$sql = "SELECT product.ref, COUNT(product.ref) as nb, SUM(tl.".$this->field_line.") as total, AVG(tl.".$this->field_line.") as avg";
 		$sql .= " FROM ".$this->from.", ".$this->from_line.", ".MAIN_DB_PREFIX."product as product";
 		if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-        $sql .= $this->join;
+		$sql .= $this->join;
 		$sql .= " WHERE ".$this->where;
 		$sql .= " AND p.rowid = tl.fk_propal AND tl.fk_product = product.rowid";
-    	$sql .= " AND ".$this->field_date." BETWEEN '".$this->db->idate(dol_get_first_day($year, 1, false))."' AND '".$this->db->idate(dol_get_last_day($year, 12, false))."'";
+		$sql .= " AND ".$this->field_date." BETWEEN '".$this->db->idate(dol_get_first_day($year, 1, false))."' AND '".$this->db->idate(dol_get_last_day($year, 12, false))."'";
 		$sql .= " GROUP BY product.ref";
-        $sql .= $this->db->order('nb', 'DESC');
-        //$sql.= $this->db->plimit(20);
+		$sql .= $this->db->order('nb', 'DESC');
+		//$sql.= $this->db->plimit(20);
 
 		return $this->_getAllByProduct($sql, $limit);
 	}
diff --git a/htdocs/comm/propal/contact.php b/htdocs/comm/propal/contact.php
index 7d1cd05c706..4d70b11cdfe 100644
--- a/htdocs/comm/propal/contact.php
+++ b/htdocs/comm/propal/contact.php
@@ -76,11 +76,11 @@ if (!$error)
 
 if ($action == 'addcontact' && $user->rights->propale->creer)
 {
-    if ($object->id > 0)
-    {
-    	$contactid = (GETPOST('userid', 'int') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int'));
+	if ($object->id > 0)
+	{
+		$contactid = (GETPOST('userid', 'int') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int'));
   		$result = $object->add_contact($contactid, $_POST["type"], $_POST["source"]);
-    }
+	}
 
 	if ($result >= 0)
 	{
@@ -100,7 +100,7 @@ elseif ($action == 'swapstatut' && $user->rights->propale->creer)
 {
 	if ($object->id > 0)
 	{
-	    $result = $object->swapContactStatus(GETPOST('ligne'));
+		$result = $object->swapContactStatus(GETPOST('ligne'));
 	}
 } // Deletes a contact
 elseif ($action == 'deletecontact' && $user->rights->propale->creer)
@@ -135,7 +135,7 @@ $formother = new FormOther($db);
 
 if ($object->id > 0)
 {
-    $head = propal_prepare_head($object);
+	$head = propal_prepare_head($object);
 	print dol_get_fiche_head($head, 'contact', $langs->trans("Proposal"), -1, 'propal');
 
 
@@ -153,42 +153,42 @@ if ($object->id > 0)
 	// Project
 	if (!empty($conf->projet->enabled))
 	{
-	    $langs->load("projects");
-	    $morehtmlref .= '<br>'.$langs->trans('Project').' ';
-	    if ($user->rights->propal->creer)
-	    {
-            if ($action != 'classify') {
-                //$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a>';
-                $morehtmlref .= ' : ';
-            }
-            if ($action == 'classify') {
-                //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-                $morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-                $morehtmlref .= '<input type="hidden" name="action" value="classin">';
-                $morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
-                $morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-                $morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-                $morehtmlref .= '</form>';
-            } else {
-                $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-            }
-	    } else {
-	        if (!empty($object->fk_project)) {
-	            $proj = new Project($db);
-	            $proj->fetch($object->fk_project);
-	            $morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
-	            $morehtmlref .= $proj->ref;
-	            $morehtmlref .= '</a>';
-	        } else {
-	            $morehtmlref .= '';
-	        }
-	    }
+		$langs->load("projects");
+		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
+		if ($user->rights->propal->creer)
+		{
+			if ($action != 'classify') {
+				//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a>';
+				$morehtmlref .= ' : ';
+			}
+			if ($action == 'classify') {
+				//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+				$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+				$morehtmlref .= '<input type="hidden" name="action" value="classin">';
+				$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
+				$morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+				$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+				$morehtmlref .= '</form>';
+			} else {
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+			}
+		} else {
+			if (!empty($object->fk_project)) {
+				$proj = new Project($db);
+				$proj->fetch($object->fk_project);
+				$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
+				$morehtmlref .= $proj->ref;
+				$morehtmlref .= '</a>';
+			} else {
+				$morehtmlref .= '';
+			}
+		}
 	}
 	$morehtmlref .= '</div>';
 
 	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '', 0, '', '', 1);
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 
 	// Contacts lines (modules that overwrite templates must declare this into descriptor)
diff --git a/htdocs/comm/propal/document.php b/htdocs/comm/propal/document.php
index f1eef2164a0..fbe7fdbec5c 100644
--- a/htdocs/comm/propal/document.php
+++ b/htdocs/comm/propal/document.php
@@ -78,9 +78,9 @@ $object->fetch($id, $ref);
 
 if ($object->id > 0)
 {
-    $object->fetch_thirdparty();
-    $upload_dir = $conf->propal->multidir_output[$object->entity].'/'.dol_sanitizeFileName($object->ref);
-    include_once DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
+	$object->fetch_thirdparty();
+	$upload_dir = $conf->propal->multidir_output[$object->entity].'/'.dol_sanitizeFileName($object->ref);
+	include_once DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
 }
 
 
@@ -122,36 +122,36 @@ if ($object->id > 0)
 	// Project
 	if (!empty($conf->projet->enabled))
 	{
-	    $langs->load("projects");
-	    $morehtmlref .= '<br>'.$langs->trans('Project').' ';
-	    if ($user->rights->propal->creer)
-	    {
-	        if ($action != 'classify') {
-	        	//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a>';
+		$langs->load("projects");
+		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
+		if ($user->rights->propal->creer)
+		{
+			if ($action != 'classify') {
+				//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a>';
 				$morehtmlref .= ' : ';
-            }
-            if ($action == 'classify') {
-                //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-                $morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-                $morehtmlref .= '<input type="hidden" name="action" value="classin">';
-                $morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
-                $morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-                $morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-                $morehtmlref .= '</form>';
-            } else {
-                $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-            }
-	    } else {
-	        if (!empty($object->fk_project)) {
-	            $proj = new Project($db);
-	            $proj->fetch($object->fk_project);
-	            $morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
-	            $morehtmlref .= $proj->ref;
-	            $morehtmlref .= '</a>';
-	        } else {
-	            $morehtmlref .= '';
-	        }
-	    }
+			}
+			if ($action == 'classify') {
+				//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+				$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+				$morehtmlref .= '<input type="hidden" name="action" value="classin">';
+				$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
+				$morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+				$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+				$morehtmlref .= '</form>';
+			} else {
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+			}
+		} else {
+			if (!empty($object->fk_project)) {
+				$proj = new Project($db);
+				$proj->fetch($object->fk_project);
+				$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
+				$morehtmlref .= $proj->ref;
+				$morehtmlref .= '</a>';
+			} else {
+				$morehtmlref .= '';
+			}
+		}
 	}
 	$morehtmlref .= '</div>';
 
@@ -172,7 +172,7 @@ if ($object->id > 0)
 	print '</div>';
 
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	$modulepart = 'propal';
 	$permission = $user->rights->propal->creer;
diff --git a/htdocs/comm/propal/index.php b/htdocs/comm/propal/index.php
index 692f561867a..b51f138b0e5 100644
--- a/htdocs/comm/propal/index.php
+++ b/htdocs/comm/propal/index.php
@@ -154,7 +154,7 @@ if ($resql)
 		}
 	}
 
-	if ($conf->use_javascript_ajax)	{
+	if ($conf->use_javascript_ajax) {
 		print '<tr>';
 		print '<td align="center" colspan="2">';
 
diff --git a/htdocs/comm/propal/info.php b/htdocs/comm/propal/info.php
index fd9595f3579..cf63d919f62 100644
--- a/htdocs/comm/propal/info.php
+++ b/htdocs/comm/propal/info.php
@@ -46,8 +46,8 @@ $result = restrictedArea($user, 'propal', $id);
 $object = new Propal($db);
 if (!$object->fetch($id, $ref) > 0)
 {
-    dol_print_error($db);
-    exit;
+	dol_print_error($db);
+	exit;
 }
 
 
@@ -82,36 +82,36 @@ $morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->ge
 // Project
 if (!empty($conf->projet->enabled))
 {
-    $langs->load("projects");
-    $morehtmlref .= '<br>'.$langs->trans('Project').' ';
-    if ($user->rights->propal->creer)
-    {
-        if ($action != 'classify') {
-            //$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a>';
-            $morehtmlref .= ' : ';
-        }
-        if ($action == 'classify') {
-            //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-            $morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-            $morehtmlref .= '<input type="hidden" name="action" value="classin">';
-            $morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
-            $morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-            $morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-            $morehtmlref .= '</form>';
-        } else {
-            $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-        }
-    } else {
-        if (!empty($object->fk_project)) {
-            $proj = new Project($db);
-            $proj->fetch($object->fk_project);
-            $morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
-            $morehtmlref .= $proj->ref;
-            $morehtmlref .= '</a>';
-        } else {
-            $morehtmlref .= '';
-        }
-    }
+	$langs->load("projects");
+	$morehtmlref .= '<br>'.$langs->trans('Project').' ';
+	if ($user->rights->propal->creer)
+	{
+		if ($action != 'classify') {
+			//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a>';
+			$morehtmlref .= ' : ';
+		}
+		if ($action == 'classify') {
+			//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+			$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+			$morehtmlref .= '<input type="hidden" name="action" value="classin">';
+			$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
+			$morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+			$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+			$morehtmlref .= '</form>';
+		} else {
+			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+		}
+	} else {
+		if (!empty($object->fk_project)) {
+			$proj = new Project($db);
+			$proj->fetch($object->fk_project);
+			$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
+			$morehtmlref .= $proj->ref;
+			$morehtmlref .= '</a>';
+		} else {
+			$morehtmlref .= '';
+		}
+	}
 }
 $morehtmlref .= '</div>';
 
@@ -126,7 +126,7 @@ dol_print_object_info($object);
 
 print '</div>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // End of page
 llxFooter();
diff --git a/htdocs/comm/propal/note.php b/htdocs/comm/propal/note.php
index 1435d7f7f30..06be1179fb1 100644
--- a/htdocs/comm/propal/note.php
+++ b/htdocs/comm/propal/note.php
@@ -75,7 +75,7 @@ if ($id > 0 || !empty($ref))
 	{
 		if ($object->fetch_thirdparty() > 0)
 		{
-		    $head = propal_prepare_head($object);
+			$head = propal_prepare_head($object);
 			print dol_get_fiche_head($head, 'note', $langs->trans('Proposal'), -1, 'propal');
 
 			$cssclass = 'titlefield';
@@ -97,36 +97,36 @@ if ($id > 0 || !empty($ref))
 			// Project
 			if (!empty($conf->projet->enabled))
 			{
-			    $langs->load("projects");
-			    $morehtmlref .= '<br>'.$langs->trans('Project').' ';
-			    if ($user->rights->propal->creer)
-			    {
-			        if ($action != 'classify') {
-			        	//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a>';
+				$langs->load("projects");
+				$morehtmlref .= '<br>'.$langs->trans('Project').' ';
+				if ($user->rights->propal->creer)
+				{
+					if ($action != 'classify') {
+						//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a>';
 						$morehtmlref .= ' : ';
 					}
-		            if ($action == 'classify') {
-		                //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-		                $morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-		                $morehtmlref .= '<input type="hidden" name="action" value="classin">';
-		                $morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
-		                $morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-		                $morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-		                $morehtmlref .= '</form>';
-		            } else {
-		                $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-		            }
-			    } else {
-			        if (!empty($object->fk_project)) {
-			            $proj = new Project($db);
-			            $proj->fetch($object->fk_project);
-			            $morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
-			            $morehtmlref .= $proj->ref;
-			            $morehtmlref .= '</a>';
-			        } else {
-			            $morehtmlref .= '';
-			        }
-			    }
+					if ($action == 'classify') {
+						//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+						$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+						$morehtmlref .= '<input type="hidden" name="action" value="classin">';
+						$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
+						$morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+						$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+						$morehtmlref .= '</form>';
+					} else {
+						$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+					}
+				} else {
+					if (!empty($object->fk_project)) {
+						$proj = new Project($db);
+						$proj->fetch($object->fk_project);
+						$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
+						$morehtmlref .= $proj->ref;
+						$morehtmlref .= '</a>';
+					} else {
+						$morehtmlref .= '';
+					}
+				}
 			}
 			$morehtmlref .= '</div>';
 
@@ -140,7 +140,7 @@ if ($id > 0 || !empty($ref))
 
 			print '</div>';
 
-			dol_fiche_end();
+			print dol_get_fiche_end();
 		}
 	}
 }
diff --git a/htdocs/comm/propal/stats/index.php b/htdocs/comm/propal/stats/index.php
index fe847f6ff64..8b9c6b34dee 100644
--- a/htdocs/comm/propal/stats/index.php
+++ b/htdocs/comm/propal/stats/index.php
@@ -50,8 +50,8 @@ $socid = GETPOST('socid', 'int');
 // Security check
 if ($user->socid > 0)
 {
-    $action = '';
-    $socid = $user->socid;
+	$action = '';
+	$socid = $user->socid;
 }
 
 $nowyear = strftime("%Y", dol_now());
@@ -77,19 +77,19 @@ $langs->loadLangs(array('propal', 'other', 'companies'));
 
 if ($mode == 'customer')
 {
-    $picto = 'propal';
-    $title = $langs->trans("ProposalsStatistics");
-    $dir = $conf->propale->dir_temp;
-    $cat_type = Categorie::TYPE_CUSTOMER;
-    $cat_label = $langs->trans("Category").' '.lcfirst($langs->trans("Customer"));
+	$picto = 'propal';
+	$title = $langs->trans("ProposalsStatistics");
+	$dir = $conf->propale->dir_temp;
+	$cat_type = Categorie::TYPE_CUSTOMER;
+	$cat_label = $langs->trans("Category").' '.lcfirst($langs->trans("Customer"));
 }
 if ($mode == 'supplier')
 {
 	$picto = 'supplier_proposal';
-    $title = $langs->trans("ProposalsStatisticsSuppliers");
-    $dir = $conf->supplier_proposal->dir_temp;
-    $cat_type = Categorie::TYPE_SUPPLIER;
-    $cat_label = $langs->trans("Category").' '.lcfirst($langs->trans("Supplier"));
+	$title = $langs->trans("ProposalsStatisticsSuppliers");
+	$dir = $conf->supplier_proposal->dir_temp;
+	$cat_type = Categorie::TYPE_SUPPLIER;
+	$cat_label = $langs->trans("Category").' '.lcfirst($langs->trans("Supplier"));
 }
 
 llxHeader('', $title);
@@ -110,36 +110,36 @@ $data = $stats->getNbByMonthWithPrevYear($endyear, $startyear);
 
 if (!$user->rights->societe->client->voir || $user->socid)
 {
-    $filenamenb = $dir.'/proposalsnbinyear-'.$user->id.'-'.$year.'.png';
-    $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=propalstats&file=proposalsnbinyear-'.$user->id.'-'.$year.'.png';
+	$filenamenb = $dir.'/proposalsnbinyear-'.$user->id.'-'.$year.'.png';
+	$fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=propalstats&file=proposalsnbinyear-'.$user->id.'-'.$year.'.png';
 } else {
-    $filenamenb = $dir.'/proposalsnbinyear-'.$year.'.png';
-    $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=propalstats&file=proposalsnbinyear-'.$year.'.png';
+	$filenamenb = $dir.'/proposalsnbinyear-'.$year.'.png';
+	$fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=propalstats&file=proposalsnbinyear-'.$year.'.png';
 }
 
 $px1 = new DolGraph();
 $mesg = $px1->isGraphKo();
 if (!$mesg)
 {
-    $px1->SetData($data);
-    $i = $startyear; $legend = array();
-    while ($i <= $endyear)
-    {
-        $legend[] = $i;
-        $i++;
-    }
-    $px1->SetLegend($legend);
-    $px1->SetMaxValue($px1->GetCeilMaxValue());
-    $px1->SetMinValue(min(0, $px1->GetFloorMinValue()));
-    $px1->SetWidth($WIDTH);
-    $px1->SetHeight($HEIGHT);
-    $px1->SetYLabel($langs->trans("NbOfProposals"));
-    $px1->SetShading(3);
-    $px1->SetHorizTickIncrement(1);
-    $px1->mode = 'depth';
-    $px1->SetTitle($langs->trans("NumberOfProposalsByMonth"));
+	$px1->SetData($data);
+	$i = $startyear; $legend = array();
+	while ($i <= $endyear)
+	{
+		$legend[] = $i;
+		$i++;
+	}
+	$px1->SetLegend($legend);
+	$px1->SetMaxValue($px1->GetCeilMaxValue());
+	$px1->SetMinValue(min(0, $px1->GetFloorMinValue()));
+	$px1->SetWidth($WIDTH);
+	$px1->SetHeight($HEIGHT);
+	$px1->SetYLabel($langs->trans("NbOfProposals"));
+	$px1->SetShading(3);
+	$px1->SetHorizTickIncrement(1);
+	$px1->mode = 'depth';
+	$px1->SetTitle($langs->trans("NumberOfProposalsByMonth"));
 
-    $px1->draw($filenamenb, $fileurlnb);
+	$px1->draw($filenamenb, $fileurlnb);
 }
 
 // Build graphic amount of object
@@ -148,36 +148,36 @@ $data = $stats->getAmountByMonthWithPrevYear($endyear, $startyear, 0);
 
 if (!$user->rights->societe->client->voir || $user->socid)
 {
-    $filenameamount = $dir.'/proposalsamountinyear-'.$user->id.'-'.$year.'.png';
-    $fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=propalstats&file=proposalsamountinyear-'.$user->id.'-'.$year.'.png';
+	$filenameamount = $dir.'/proposalsamountinyear-'.$user->id.'-'.$year.'.png';
+	$fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=propalstats&file=proposalsamountinyear-'.$user->id.'-'.$year.'.png';
 } else {
-    $filenameamount = $dir.'/proposalsamountinyear-'.$year.'.png';
-    $fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=propalstats&file=proposalsamountinyear-'.$year.'.png';
+	$filenameamount = $dir.'/proposalsamountinyear-'.$year.'.png';
+	$fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=propalstats&file=proposalsamountinyear-'.$year.'.png';
 }
 
 $px2 = new DolGraph();
 $mesg = $px2->isGraphKo();
 if (!$mesg)
 {
-    $px2->SetData($data);
-    $i = $startyear; $legend = array();
-    while ($i <= $endyear)
-    {
-        $legend[] = $i;
-        $i++;
-    }
-    $px2->SetLegend($legend);
-    $px2->SetMaxValue($px2->GetCeilMaxValue());
-    $px2->SetMinValue(min(0, $px2->GetFloorMinValue()));
-    $px2->SetWidth($WIDTH);
-    $px2->SetHeight($HEIGHT);
-    $px2->SetYLabel($langs->trans("AmountOfProposals"));
-    $px2->SetShading(3);
-    $px2->SetHorizTickIncrement(1);
-    $px2->mode = 'depth';
-    $px2->SetTitle($langs->trans("AmountOfProposalsByMonthHT"));
+	$px2->SetData($data);
+	$i = $startyear; $legend = array();
+	while ($i <= $endyear)
+	{
+		$legend[] = $i;
+		$i++;
+	}
+	$px2->SetLegend($legend);
+	$px2->SetMaxValue($px2->GetCeilMaxValue());
+	$px2->SetMinValue(min(0, $px2->GetFloorMinValue()));
+	$px2->SetWidth($WIDTH);
+	$px2->SetHeight($HEIGHT);
+	$px2->SetYLabel($langs->trans("AmountOfProposals"));
+	$px2->SetShading(3);
+	$px2->SetHorizTickIncrement(1);
+	$px2->mode = 'depth';
+	$px2->SetTitle($langs->trans("AmountOfProposalsByMonthHT"));
 
-    $px2->draw($filenameamount, $fileurlamount);
+	$px2->draw($filenameamount, $fileurlamount);
 }
 
 $data = $stats->getAverageByMonthWithPrevYear($endyear, $startyear);
@@ -185,38 +185,38 @@ $data = $stats->getAverageByMonthWithPrevYear($endyear, $startyear);
 $fileurl_avg = '';
 if (!$user->rights->societe->client->voir || $user->socid)
 {
-    $filename_avg = $dir.'/ordersaverage-'.$user->id.'-'.$year.'.png';
-    if ($mode == 'customer') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersaverage-'.$user->id.'-'.$year.'.png';
-    if ($mode == 'supplier') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersaverage-'.$user->id.'-'.$year.'.png';
+	$filename_avg = $dir.'/ordersaverage-'.$user->id.'-'.$year.'.png';
+	if ($mode == 'customer') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersaverage-'.$user->id.'-'.$year.'.png';
+	if ($mode == 'supplier') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersaverage-'.$user->id.'-'.$year.'.png';
 } else {
-    $filename_avg = $dir.'/ordersaverage-'.$year.'.png';
-    if ($mode == 'customer') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersaverage-'.$year.'.png';
-    if ($mode == 'supplier') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersaverage-'.$year.'.png';
+	$filename_avg = $dir.'/ordersaverage-'.$year.'.png';
+	if ($mode == 'customer') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersaverage-'.$year.'.png';
+	if ($mode == 'supplier') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersaverage-'.$year.'.png';
 }
 
 $px3 = new DolGraph();
 $mesg = $px3->isGraphKo();
 if (!$mesg)
 {
-    $px3->SetData($data);
-    $i = $startyear; $legend = array();
-    while ($i <= $endyear)
-    {
-        $legend[] = $i;
-        $i++;
-    }
-    $px3->SetLegend($legend);
-    $px3->SetYLabel($langs->trans("AmountAverage"));
-    $px3->SetMaxValue($px3->GetCeilMaxValue());
-    $px3->SetMinValue($px3->GetFloorMinValue());
-    $px3->SetWidth($WIDTH);
-    $px3->SetHeight($HEIGHT);
-    $px3->SetShading(3);
-    $px3->SetHorizTickIncrement(1);
-    $px3->mode = 'depth';
-    $px3->SetTitle($langs->trans("AmountAverage"));
+	$px3->SetData($data);
+	$i = $startyear; $legend = array();
+	while ($i <= $endyear)
+	{
+		$legend[] = $i;
+		$i++;
+	}
+	$px3->SetLegend($legend);
+	$px3->SetYLabel($langs->trans("AmountAverage"));
+	$px3->SetMaxValue($px3->GetCeilMaxValue());
+	$px3->SetMinValue($px3->GetFloorMinValue());
+	$px3->SetWidth($WIDTH);
+	$px3->SetHeight($HEIGHT);
+	$px3->SetShading(3);
+	$px3->SetHorizTickIncrement(1);
+	$px3->mode = 'depth';
+	$px3->SetTitle($langs->trans("AmountAverage"));
 
-    $px3->draw($filename_avg, $fileurl_avg);
+	$px3->draw($filename_avg, $fileurl_avg);
 }
 
 
@@ -260,23 +260,23 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
 	$filter = 's.client IN (1,2,3)';
 	print $form->select_company($socid, 'socid', $filter, 1, 0, 0, array(), 0, '', 'style="width: 95%"');
 	print '</td></tr>';
-    // ThirdParty Type
-    print '<tr><td>'.$langs->trans("ThirdPartyType").'</td><td>';
-    $sortparam_typent = (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT); // NONE means we keep sort of original array, so we sort on position. ASC, means next function will sort on label.
-    print $form->selectarray("typent_id", $formcompany->typent_array(0), $typent_id, 0, 0, 0, '', 0, 0, 0, $sortparam_typent);
-    if ($user->admin) print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
-    print '</td></tr>';
-    // Category
-    print '<tr><td>'.$cat_label.'</td><td>';
-    print $formother->select_categories($cat_type, $categ_id, 'categ_id', true);
-    print '</td></tr>';
+	// ThirdParty Type
+	print '<tr><td>'.$langs->trans("ThirdPartyType").'</td><td>';
+	$sortparam_typent = (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT); // NONE means we keep sort of original array, so we sort on position. ASC, means next function will sort on label.
+	print $form->selectarray("typent_id", $formcompany->typent_array(0), $typent_id, 0, 0, 0, '', 0, 0, 0, $sortparam_typent);
+	if ($user->admin) print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+	print '</td></tr>';
+	// Category
+	print '<tr><td>'.$cat_label.'</td><td>';
+	print $formother->select_categories($cat_type, $categ_id, 'categ_id', true);
+	print '</td></tr>';
 	// User
 	print '<tr><td class="left">'.$langs->trans("CreatedBy").'</td><td class="left">';
 	print $form->select_dolusers($userid, 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
 	print '</td></tr>';
 	// Status
 	print '<tr><td class="left">'.$langs->trans("Status").'</td><td class="left">';
-    $formpropal->selectProposalStatus(($object_status != '' ? $object_status : -1), 0, 0, 1, $mode, 'object_status');
+	$formpropal->selectProposalStatus(($object_status != '' ? $object_status : -1), 0, 0, 1, $mode, 'object_status');
 	print '</td></tr>';
 	// Year
 	print '<tr><td class="left">'.$langs->trans("Year").'</td><td class="left">';
@@ -306,31 +306,31 @@ print '</tr>';
 $oldyear = 0;
 foreach ($data as $val)
 {
-    $year = $val['year'];
-    while (!empty($year) && $oldyear > $year + 1)
-    {	// If we have empty year
-        $oldyear--;
+	$year = $val['year'];
+	while (!empty($year) && $oldyear > $year + 1)
+	{	// If we have empty year
+		$oldyear--;
 
-        print '<tr class="oddeven" height="24">';
-        print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$oldyear.'&amp;mode='.$mode.($socid > 0 ? '&socid='.$socid : '').($userid > 0 ? '&userid='.$userid : '').'">'.$oldyear.'</a></td>';
-        print '<td class="right">0</td>';
-        print '<td class="right"></td>';
-        print '<td class="right">0</td>';
-        print '<td class="right"></td>';
-        print '<td class="right">0</td>';
-        print '<td class="right"></td>';
-        print '</tr>';
-    }
-    print '<tr class="oddeven" height="24">';
-    print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$year.($socid > 0 ? '&socid='.$socid : '').($userid > 0 ? '&userid='.$userid : '').'">'.$year.'</a></td>';
-    print '<td class="right">'.$val['nb'].'</td>';
+		print '<tr class="oddeven" height="24">';
+		print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$oldyear.'&amp;mode='.$mode.($socid > 0 ? '&socid='.$socid : '').($userid > 0 ? '&userid='.$userid : '').'">'.$oldyear.'</a></td>';
+		print '<td class="right">0</td>';
+		print '<td class="right"></td>';
+		print '<td class="right">0</td>';
+		print '<td class="right"></td>';
+		print '<td class="right">0</td>';
+		print '<td class="right"></td>';
+		print '</tr>';
+	}
+	print '<tr class="oddeven" height="24">';
+	print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$year.($socid > 0 ? '&socid='.$socid : '').($userid > 0 ? '&userid='.$userid : '').'">'.$year.'</a></td>';
+	print '<td class="right">'.$val['nb'].'</td>';
 	print '<td class="right" style="'.(($val['nb_diff'] >= 0) ? 'color: green;' : 'color: red;').'">'.round($val['nb_diff']).'</td>';
-    print '<td class="right">'.price(price2num($val['total'], 'MT'), 1).'</td>';
+	print '<td class="right">'.price(price2num($val['total'], 'MT'), 1).'</td>';
 	print '<td class="right" style="'.(($val['total_diff'] >= 0) ? 'color: green;' : 'color: red;').'">'.round($val['total_diff']).'</td>';
-    print '<td class="right">'.price(price2num($val['avg'], 'MT'), 1).'</td>';
+	print '<td class="right">'.price(price2num($val['avg'], 'MT'), 1).'</td>';
 	print '<td class="right" style="'.(($val['avg_diff'] >= 0) ? 'color: green;' : 'color: red;').'">'.round($val['avg_diff']).'</td>';
-    print '</tr>';
-    $oldyear = $year;
+	print '</tr>';
+	$oldyear = $year;
 }
 
 print '</table>';
@@ -342,11 +342,11 @@ print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 // Show graphs
 print '<table class="border centpercent"><tr class="pair nohover"><td align="center">';
 if ($mesg) { print $mesg; } else {
-    print $px1->show();
-    print "<br>\n";
-    print $px2->show();
-    print "<br>\n";
-    print $px3->show();
+	print $px1->show();
+	print "<br>\n";
+	print $px2->show();
+	print "<br>\n";
+	print $px3->show();
 }
 print '</td></tr></table>';
 
@@ -355,7 +355,7 @@ print '</div></div></div>';
 print '<div style="clear:both"></div>';
 
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // End of page
 llxFooter();
diff --git a/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php b/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php
index 160ae657ce9..300b35cc868 100644
--- a/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php
@@ -25,8 +25,8 @@
 
 // Protection to avoid direct call of template
 if (empty($conf) || !is_object($conf)) {
-    print "Error, template page can't be called as URL";
-    exit;
+	print "Error, template page can't be called as URL";
+	exit;
 }
 
 
@@ -46,42 +46,42 @@ $total = 0;
 $ilink = 0;
 foreach ($linkedObjectBlock as $key => $objectlink)
 {
-    $ilink++;
+	$ilink++;
 
-    $trclass = 'oddeven';
-    if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass .= ' liste_sub_total';
-    print '<tr class="'.$trclass.'"  data-element="'.$objectlink->element.'"  data-id="'.$objectlink->id.'" >';
-    print '<td class="linkedcol-element" >'.$langs->trans("Proposal");
-    if (!empty($showImportButton) && $conf->global->MAIN_ENABLE_IMPORT_LINKED_OBJECT_LINES)
-    {
-        $url = DOL_URL_ROOT.'/comm/propal/card.php?id='.$objectlink->id;
-        print '<a class="objectlinked_importbtn" href="'.$url.'&amp;action=selectlines"  data-element="'.$objectlink->element.'"  data-id="'.$objectlink->id.'"  > <i class="fa fa-indent"></i> </a>';
-    }
-    print '</td>';
-    print '<td class="linkedcol-name nowraponall" >'.$objectlink->getNomUrl(1).'</td>';
-    print '<td class="linkedcol-ref" >'.$objectlink->ref_client.'</td>';
-    print '<td class="linkedcol-date center">'.dol_print_date($objectlink->date, 'day').'</td>';
-    print '<td class="linkedcol-amount right">';
-    if ($user->rights->propale->lire) {
-    	$total = $total + $objectlink->total_ht;
-    	echo price($objectlink->total_ht);
+	$trclass = 'oddeven';
+	if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass .= ' liste_sub_total';
+	print '<tr class="'.$trclass.'"  data-element="'.$objectlink->element.'"  data-id="'.$objectlink->id.'" >';
+	print '<td class="linkedcol-element" >'.$langs->trans("Proposal");
+	if (!empty($showImportButton) && $conf->global->MAIN_ENABLE_IMPORT_LINKED_OBJECT_LINES)
+	{
+		$url = DOL_URL_ROOT.'/comm/propal/card.php?id='.$objectlink->id;
+		print '<a class="objectlinked_importbtn" href="'.$url.'&amp;action=selectlines"  data-element="'.$objectlink->element.'"  data-id="'.$objectlink->id.'"  > <i class="fa fa-indent"></i> </a>';
 	}
-    print '</td>';
-    print '<td class="linkedcol-statut right">'.$objectlink->getLibStatut(3).'</td>';
-    print '<td class="linkedcol-action right"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key.'">'.img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink').'</a></td>';
-    print "</tr>\n";
+	print '</td>';
+	print '<td class="linkedcol-name nowraponall" >'.$objectlink->getNomUrl(1).'</td>';
+	print '<td class="linkedcol-ref" >'.$objectlink->ref_client.'</td>';
+	print '<td class="linkedcol-date center">'.dol_print_date($objectlink->date, 'day').'</td>';
+	print '<td class="linkedcol-amount right">';
+	if ($user->rights->propale->lire) {
+		$total = $total + $objectlink->total_ht;
+		echo price($objectlink->total_ht);
+	}
+	print '</td>';
+	print '<td class="linkedcol-statut right">'.$objectlink->getLibStatut(3).'</td>';
+	print '<td class="linkedcol-action right"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key.'">'.img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink').'</a></td>';
+	print "</tr>\n";
 }
 if (count($linkedObjectBlock) > 1)
 {
-    print '<tr class="liste_total '.(empty($noMoreLinkedObjectBlockAfter) ? 'liste_sub_total' : '').'">';
-    print '<td>'.$langs->trans("Total").'</td>';
-    print '<td></td>';
-    print '<td class="center"></td>';
-    print '<td class="center"></td>';
-    print '<td class="right">'.price($total).'</td>';
-    print '<td class="right"></td>';
-    print '<td class="right"></td>';
-    print "</tr>\n";
+	print '<tr class="liste_total '.(empty($noMoreLinkedObjectBlockAfter) ? 'liste_sub_total' : '').'">';
+	print '<td>'.$langs->trans("Total").'</td>';
+	print '<td></td>';
+	print '<td class="center"></td>';
+	print '<td class="center"></td>';
+	print '<td class="right">'.price($total).'</td>';
+	print '<td class="right"></td>';
+	print '<td class="right"></td>';
+	print "</tr>\n";
 }
 
 print "<!-- END PHP TEMPLATE -->\n";
diff --git a/htdocs/comm/prospect/index.php b/htdocs/comm/prospect/index.php
index d99b3509b26..7ae61362f09 100644
--- a/htdocs/comm/prospect/index.php
+++ b/htdocs/comm/prospect/index.php
@@ -206,11 +206,11 @@ if (!empty($conf->propal->enabled) && $user->rights->propale->lire)
 				print img_object($langs->trans("ShowPropal"), "propal").' '.$obj->ref.'</a></td>';
 
 				print "<td>";
-                $companystatic->id = $obj->socid;
-                $companystatic->name = $obj->name;
-                $companystatic->client = $obj->client;
-                $companystatic->canvas = $obj->canvas;
-                print $companystatic->getNomUrl(1, '', 44);
+				$companystatic->id = $obj->socid;
+				$companystatic->name = $obj->name;
+				$companystatic->client = $obj->client;
+				$companystatic->canvas = $obj->canvas;
+				print $companystatic->getNomUrl(1, '', 44);
 				print "</td>\n";
 				print "<td align=\"right\">";
 				print dol_print_date($db->jdate($obj->dp), 'day')."</td>\n";
@@ -257,11 +257,11 @@ if ($resql)
 			$obj = $db->fetch_object($resql);
 
 			print '<tr class="oddeven"><td width="12%">';
-            $companystatic->id = $obj->socid;
-            $companystatic->name = $obj->name;
-            $companystatic->client = $obj->client;
-            $companystatic->canvas = $obj->canvas;
-            print $companystatic->getNomUrl(1, 'prospect', 44);
+			$companystatic->id = $obj->socid;
+			$companystatic->name = $obj->name;
+			$companystatic->client = $obj->client;
+			$companystatic->canvas = $obj->canvas;
+			print $companystatic->getNomUrl(1, 'prospect', 44);
 			print '</td></tr>';
 			$i++;
 		}
diff --git a/htdocs/comm/prospect/recap-prospect.php b/htdocs/comm/prospect/recap-prospect.php
index 6302b7680ab..1acf2cbf218 100644
--- a/htdocs/comm/prospect/recap-prospect.php
+++ b/htdocs/comm/prospect/recap-prospect.php
@@ -34,8 +34,8 @@ if (!empty($conf->facture->enabled)) $langs->load("bills");
 $socid = $_GET["socid"];
 if ($user->socid > 0)
 {
-    $action = '';
-    $socid = $user->socid;
+	$action = '';
+	$socid = $user->socid;
 }
 
 
@@ -48,38 +48,38 @@ llxHeader();
 
 if ($socid > 0)
 {
-    $societe = new Societe($db);
-    $societe->fetch($socid);
+	$societe = new Societe($db);
+	$societe->fetch($socid);
 
-    /*
+	/*
      * Affichage onglets
      */
 	$head = societe_prepare_head($societe);
 
-    print dol_get_fiche_head($head, 'prospect', $langs->trans("ThirdParty"), 0, 'company');
+	print dol_get_fiche_head($head, 'prospect', $langs->trans("ThirdParty"), 0, 'company');
 
 
-    print "<table width=\"100%\">\n";
-    print '<tr><td valign="top" width="50%">';
+	print "<table width=\"100%\">\n";
+	print '<tr><td valign="top" width="50%">';
 
-    print '<table class="border centpercent">';
+	print '<table class="border centpercent">';
 
-    // Name
-    print '<tr><td width="20%">'.$langs->trans("Thirdpary").'</td><td width="80%" colspan="3">'.$societe->getNomUrl(1).'</td></tr>';
+	// Name
+	print '<tr><td width="20%">'.$langs->trans("Thirdpary").'</td><td width="80%" colspan="3">'.$societe->getNomUrl(1).'</td></tr>';
 
 	// Prefix
-    if (!empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
-    {
-        print '<tr><td>'.$langs->trans("Prefix").'</td><td colspan="3">';
-        print ($societe->prefix_comm ? $societe->prefix_comm : '&nbsp;');
-        print '</td></tr>';
-    }
+	if (!empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
+	{
+		print '<tr><td>'.$langs->trans("Prefix").'</td><td colspan="3">';
+		print ($societe->prefix_comm ? $societe->prefix_comm : '&nbsp;');
+		print '</td></tr>';
+	}
 
-    print "</table>";
+	print "</table>";
 
-    print "</td></tr></table>\n";
+	print "</td></tr></table>\n";
 
-    print '</div>';
+	print '</div>';
 
 
 	print $langs->trans("FeatureNotYetAvailable");
diff --git a/htdocs/comm/recap-client.php b/htdocs/comm/recap-client.php
index 9ac8062c156..254305a9443 100644
--- a/htdocs/comm/recap-client.php
+++ b/htdocs/comm/recap-client.php
@@ -34,8 +34,8 @@ if (!empty($conf->facture->enabled)) $langs->load("bills");
 $socid = $_GET["socid"];
 if ($user->socid > 0)
 {
-    $action = '';
-    $socid = $user->socid;
+	$action = '';
+	$socid = $user->socid;
 }
 
 
@@ -48,38 +48,38 @@ llxHeader();
 
 if ($socid > 0)
 {
-    $societe = new Societe($db);
-    $societe->fetch($socid);
+	$societe = new Societe($db);
+	$societe->fetch($socid);
 
-    /*
+	/*
      * Affichage onglets
      */
 	$head = societe_prepare_head($societe);
 
-    print dol_get_fiche_head($head, 'customer', $langs->trans("ThirdParty"), 0, 'company');
+	print dol_get_fiche_head($head, 'customer', $langs->trans("ThirdParty"), 0, 'company');
 
 
-    print "<table width=\"100%\">\n";
-    print '<tr><td valign="top" width="50%">';
+	print "<table width=\"100%\">\n";
+	print '<tr><td valign="top" width="50%">';
 
-    print '<table class="border centpercent">';
+	print '<table class="border centpercent">';
 
-    // Name
-    print '<tr><td width="20%">'.$langs->trans("ThirdParty").'</td><td width="80%" colspan="3">'.$societe->getNomUrl(1).'</td></tr>';
+	// Name
+	print '<tr><td width="20%">'.$langs->trans("ThirdParty").'</td><td width="80%" colspan="3">'.$societe->getNomUrl(1).'</td></tr>';
 
-    // Prefix
-    if (!empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
-    {
-        print '<tr><td>'.$langs->trans("Prefix").'</td><td colspan="3">';
-        print ($societe->prefix_comm ? $societe->prefix_comm : '&nbsp;');
-        print '</td></tr>';
-    }
+	// Prefix
+	if (!empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
+	{
+		print '<tr><td>'.$langs->trans("Prefix").'</td><td colspan="3">';
+		print ($societe->prefix_comm ? $societe->prefix_comm : '&nbsp;');
+		print '</td></tr>';
+	}
 
-    print "</table>";
+	print "</table>";
 
-    print "</td></tr></table>\n";
+	print "</td></tr></table>\n";
 
-    print '</div>';
+	print '</div>';
 
 
 	print $langs->trans("FeatureNotYetAvailable");
diff --git a/htdocs/comm/remise.php b/htdocs/comm/remise.php
index 753e22a5ce8..34ac6229ac1 100644
--- a/htdocs/comm/remise.php
+++ b/htdocs/comm/remise.php
@@ -47,8 +47,8 @@ $backtopage = GETPOST('backtopage', 'alpha');
 
 if (GETPOST('cancel', 'alpha') && !empty($backtopage))
 {
-     header("Location: ".$backtopage);
-     exit;
+	 header("Location: ".$backtopage);
+	 exit;
 }
 
 if (GETPOST('action', 'aZ09') == 'setremise')
@@ -66,14 +66,14 @@ if (GETPOST('action', 'aZ09') == 'setremise')
 
 	if ($result > 0)
 	{
-	    if (!empty($backtopage))
-	    {
-    		header("Location: ".$backtopage);
-    		exit;
-	    } else {
-    		header("Location: remise.php?id=".$_GET["id"]);
-    		exit;
-	    }
+		if (!empty($backtopage))
+		{
+			header("Location: ".$backtopage);
+			exit;
+		} else {
+			header("Location: remise.php?id=".$_GET["id"]);
+			exit;
+		}
 	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
@@ -108,28 +108,28 @@ if ($socid > 0)
 	print '<form method="POST" action="remise.php?id='.$object->id.'">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="setremise">';
-    print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
+	print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
 
 	print dol_get_fiche_head($head, 'relativediscount', $langs->trans("ThirdParty"), -1, 'company');
 
-    dol_banner_tab($object, 'socid', '', ($user->socid ? 0 : 1), 'rowid', 'nom');
+	dol_banner_tab($object, 'socid', '', ($user->socid ? 0 : 1), 'rowid', 'nom');
 
-    print '<div class="fichecenter">';
+	print '<div class="fichecenter">';
 
-    print '<div class="underbanner clearboth"></div>';
+	print '<div class="underbanner clearboth"></div>';
 
-    if (!$isCustomer && !$isSupplier) {
-    	print '<p class="opacitymedium">'.$langs->trans('ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts').'</p>';
+	if (!$isCustomer && !$isSupplier) {
+		print '<p class="opacitymedium">'.$langs->trans('ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts').'</p>';
 
-    	dol_fiche_end();
+		print dol_get_fiche_end();
 
-    	print '</form>';
+		print '</form>';
 
-    	// End of page
-        llxFooter();
-        $db->close();
-    	exit;
-    }
+		// End of page
+		llxFooter();
+		$db->close();
+		exit;
+	}
 
 	print '<table class="border centpercent">';
 
@@ -172,7 +172,7 @@ if ($socid > 0)
 			print '<input type="radio" name="discount_type" id="discount_type_0" checked value="0"/> <label for="discount_type_0">'.$langs->trans('Customer').'</label>';
 		}
 		if ($isSupplier) {
-		    print ' <input type="radio" name="discount_type" id="discount_type_1"'.($isCustomer ? '' : ' checked').' value="1"/> <label for="discount_type_1">'.$langs->trans('Supplier').'</label>';
+			print ' <input type="radio" name="discount_type" id="discount_type_1"'.($isCustomer ? '' : ' checked').' value="1"/> <label for="discount_type_1">'.$langs->trans('Supplier').'</label>';
 		}
 		print '</td></tr>';
 	}
@@ -189,15 +189,15 @@ if ($socid > 0)
 
 	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div class="center">';
 	print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
-    if (!empty($backtopage))
-    {
-        print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-	    print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
-    }
+	if (!empty($backtopage))
+	{
+		print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
+		print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+	}
 	print '</div>';
 
 	print "</form>";
@@ -234,22 +234,22 @@ if ($socid > 0)
 			print '<td class="center">'.$langs->trans("User").'</td>';
 			print '</tr>';
 			$num = $db->num_rows($resql);
-	        if ($num > 0)
-	        {
-			    $i = 0;
-	            while ($i < $num)
-	    		{
-	    			$obj = $db->fetch_object($resql);
-	    			print '<tr class="oddeven">';
-	    			print '<td>'.dol_print_date($db->jdate($obj->dc), "dayhour").'</td>';
-	    			print '<td class="center">'.price2num($obj->remise_percent).'%</td>';
-	    			print '<td class="left">'.$obj->note.'</td>';
-	    			print '<td align="center"><a href="'.DOL_URL_ROOT.'/user/card.php?id='.$obj->user_id.'">'.img_object($langs->trans("ShowUser"), 'user').' '.$obj->login.'</a></td>';
-	    			print '</tr>';
-	    			$i++;
-	    		}
+			if ($num > 0)
+			{
+				$i = 0;
+				while ($i < $num)
+				{
+					$obj = $db->fetch_object($resql);
+					print '<tr class="oddeven">';
+					print '<td>'.dol_print_date($db->jdate($obj->dc), "dayhour").'</td>';
+					print '<td class="center">'.price2num($obj->remise_percent).'%</td>';
+					print '<td class="left">'.$obj->note.'</td>';
+					print '<td align="center"><a href="'.DOL_URL_ROOT.'/user/card.php?id='.$obj->user_id.'">'.img_object($langs->trans("ShowUser"), 'user').' '.$obj->login.'</a></td>';
+					print '</tr>';
+					$i++;
+				}
 			} else {
-			    print '<tr><td colspan="8" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
+				print '<tr><td colspan="8" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
 			}
 			$db->free($resql);
 			print "</table>";
diff --git a/htdocs/comm/remx.php b/htdocs/comm/remx.php
index 1ee05562bf7..98aa79161fb 100644
--- a/htdocs/comm/remx.php
+++ b/htdocs/comm/remx.php
@@ -52,8 +52,8 @@ if ($user->socid > 0)
 
 if (GETPOST('cancel', 'alpha') && !empty($backtopage))
 {
-     header("Location: ".$backtopage);
-     exit;
+	 header("Location: ".$backtopage);
+	 exit;
 }
 
 if ($action == 'confirm_split' && GETPOST("confirm", "alpha") == 'yes')
@@ -138,8 +138,8 @@ if ($action == 'confirm_split' && GETPOST("confirm", "alpha") == 'yes')
 
 		$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
-        $discount->fk_invoice_supplier_source = 0;
+		// 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
+		$discount->fk_invoice_supplier_source = 0;
 		$res = $discount->delete($user);
 		$newid1 = $newdiscount1->create($user);
 		$newid2 = $newdiscount2->create($user);
@@ -181,13 +181,13 @@ if ($action == 'setremise' && $user->rights->societe->creer)
 
 			if ($discountid > 0)
 			{
-			    if (!empty($backtopage))
-			    {
-			        header("Location: ".$backtopage.'&discountid='.$discountid);
-			        exit;
-			    } else {
-				    header("Location: remx.php?id=".$id);
-				    exit;
+				if (!empty($backtopage))
+				{
+					header("Location: ".$backtopage.'&discountid='.$discountid);
+					exit;
+				} else {
+					header("Location: remx.php?id=".$id);
+					exit;
 				}
 			} else {
 				$error++;
@@ -248,27 +248,27 @@ if ($socid > 0)
 	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="setremise">';
-    print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
+	print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
 
 	print dol_get_fiche_head($head, 'absolutediscount', $langs->trans("ThirdParty"), -1, 'company');
 
-    dol_banner_tab($object, 'socid', '', ($user->socid ? 0 : 1), 'rowid', 'nom');
+	dol_banner_tab($object, 'socid', '', ($user->socid ? 0 : 1), 'rowid', 'nom');
 
-    print '<div class="fichecenter">';
+	print '<div class="fichecenter">';
 
-    print '<div class="underbanner clearboth"></div>';
+	print '<div class="underbanner clearboth"></div>';
 
-    if (!$isCustomer && !$isSupplier) {
-    	print '<p class="opacitymedium">'.$langs->trans('ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts').'</p>';
+	if (!$isCustomer && !$isSupplier) {
+		print '<p class="opacitymedium">'.$langs->trans('ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts').'</p>';
 
-    	dol_fiche_end();
+		print dol_get_fiche_end();
 
-    	print '</form>';
+		print '</form>';
 
-    	llxFooter();
-    	$db->close();
-    	exit;
-    }
+		llxFooter();
+		$db->close();
+		exit;
+	}
 
 
 	print '<table class="border centpercent tableforfield borderbottom">';
@@ -298,7 +298,7 @@ if ($socid > 0)
 		if (!empty($user->fk_soc))    // No need to show this for external users
 		{
 			print '<tr><td>'.$langs->trans("CustomerAbsoluteDiscountMy").'</td>';
-	    	print '<td>'.$remise_user.'&nbsp;'.$langs->trans("Currency".$conf->currency).' '.$langs->trans("HT").'</td></tr>';
+			print '<td>'.$remise_user.'&nbsp;'.$langs->trans("Currency".$conf->currency).' '.$langs->trans("HT").'</td></tr>';
 		}
 	}
 
@@ -336,61 +336,61 @@ if ($socid > 0)
 
 	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 
 	if ($user->rights->societe->creer)
 	{
-    	print '<br>';
+		print '<br>';
 
-    	print load_fiche_titre($langs->trans("NewGlobalDiscount"), '', '');
+		print load_fiche_titre($langs->trans("NewGlobalDiscount"), '', '');
 
 
-    	if ($isCustomer && !$isSupplier) {
-    		print '<input type="hidden" name="discount_type" value="0" />';
-    	}
+		if ($isCustomer && !$isSupplier) {
+			print '<input type="hidden" name="discount_type" value="0" />';
+		}
 
-    	if (!$isCustomer && $isSupplier) {
-    		print '<input type="hidden" name="discount_type" value="1" />';
-    	}
+		if (!$isCustomer && $isSupplier) {
+			print '<input type="hidden" name="discount_type" value="1" />';
+		}
 
-    	print dol_get_fiche_head();
+		print dol_get_fiche_head();
 
-    	print '<table class="border centpercent">';
+		print '<table class="border centpercent">';
 		if ($isCustomer && $isSupplier) {
 			print '<tr><td class="titlefield fieldrequired">'.$langs->trans('DiscountType').'</td>';
 			print '<td><input type="radio" name="discount_type" id="discount_type_0" checked="checked" value="0"/> <label for="discount_type_0">'.$langs->trans('Customer').'</label>';
 			print ' &nbsp; <input type="radio" name="discount_type" id="discount_type_1" value="1"/> <label for="discount_type_1">'.$langs->trans('Supplier').'</label>';
 			print '</td></tr>';
 		}
-    	print '<tr><td class="titlefield fieldrequired">'.$langs->trans("AmountHT").'</td>';
-    	print '<td><input type="text" size="5" name="amount_ht" value="'.price2num(GETPOST("amount_ht")).'">';
-    	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', 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', 'alphanohtml').'"></td></tr>';
+		print '<tr><td class="titlefield fieldrequired">'.$langs->trans("AmountHT").'</td>';
+		print '<td><input type="text" size="5" name="amount_ht" value="'.price2num(GETPOST("amount_ht")).'">';
+		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', 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', 'alphanohtml').'"></td></tr>';
 
-    	print "</table>";
+		print "</table>";
 
-    	dol_fiche_end();
+		print dol_get_fiche_end();
 	}
 
 	if ($user->rights->societe->creer)
 	{
-        print '<div class="center">';
-    	print '<input type="submit" class="button" name="submit" value="'.$langs->trans("AddGlobalDiscount").'">';
-        if (!empty($backtopage))
-        {
-            print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-    	    print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
-        }
-    	print '</div>';
-    }
+		print '<div class="center">';
+		print '<input type="submit" class="button" name="submit" value="'.$langs->trans("AddGlobalDiscount").'">';
+		if (!empty($backtopage))
+		{
+			print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
+			print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+		}
+		print '</div>';
+	}
 
-    print '</form>';
+	print '</form>';
 
 
 	print '<br>';
@@ -441,13 +441,13 @@ if ($socid > 0)
 			print '<td class="right">'.$langs->trans("AmountHT").'</td>';
 			if (!empty($conf->multicurrency->enabled))
 			{
-                print '<td class="right">'.$langs->trans("MulticurrencyAmountHT").'</td>';
+				print '<td class="right">'.$langs->trans("MulticurrencyAmountHT").'</td>';
 			}
 			print '<td class="right">'.$langs->trans("VATRate").'</td>';
 			print '<td class="right">'.$langs->trans("AmountTTC").'</td>';
 			if (!empty($conf->multicurrency->enabled))
 			{
-			    print '<td class="right">'.$langs->trans("MulticurrencyAmountTTC").'</td>';
+				print '<td class="right">'.$langs->trans("MulticurrencyAmountTTC").'</td>';
 			}
 			print '<td width="100" class="center">'.$langs->trans("DiscountOfferedBy").'</td>';
 			print '<td width="50">&nbsp;</td>';
@@ -459,76 +459,76 @@ if ($socid > 0)
 			$num = $db->num_rows($resql);
 			if ($num > 0)
 			{
-	    		while ($i < $num)
-	    		{
-	    			$obj = $db->fetch_object($resql);
+				while ($i < $num)
+				{
+					$obj = $db->fetch_object($resql);
 
-	    			print '<tr class="oddeven">';
-	    			print '<td>'.dol_print_date($db->jdate($obj->dc), 'dayhour').'</td>';
-	    			if (preg_match('/\(CREDIT_NOTE\)/', $obj->description))
-	    			{
-	    				print '<td class="minwidth100">';
-	    				$facturestatic->id = $obj->fk_facture_source;
-	    				$facturestatic->ref = $obj->ref;
-	    				$facturestatic->type = $obj->type;
-	    				print preg_replace('/\(CREDIT_NOTE\)/', $langs->trans("CreditNote"), $obj->description).' '.$facturestatic->getNomURl(1);
-	    				print '</td>';
-	    			} elseif (preg_match('/\(DEPOSIT\)/', $obj->description))
-	    			{
-	    				print '<td class="minwidth100">';
-	    				$facturestatic->id = $obj->fk_facture_source;
-	    				$facturestatic->ref = $obj->ref;
-	    				$facturestatic->type = $obj->type;
-	    				print preg_replace('/\(DEPOSIT\)/', $langs->trans("InvoiceDeposit"), $obj->description).' '.$facturestatic->getNomURl(1);
-	    				print '</td>';
-	    			} elseif (preg_match('/\(EXCESS RECEIVED\)/', $obj->description))
-	    			{
-	    				print '<td class="minwidth100">';
-	    				$facturestatic->id = $obj->fk_facture_source;
-	    				$facturestatic->ref = $obj->ref;
-	    				$facturestatic->type = $obj->type;
-	    				print preg_replace('/\(EXCESS RECEIVED\)/', $langs->trans("ExcessReceived"), $obj->description).' '.$facturestatic->getNomURl(1);
-	    				print '</td>';
-	    			} else {
-	    				print '<td class="minwidth100">';
-	    				print $obj->description;
-	    				print '</td>';
-	    			}
-	    			print '<td class="nowrap">'.$langs->trans("NotConsumed").'</td>';
-	    			print '<td class="right">'.price($obj->amount_ht).'</td>';
-	    			if (!empty($conf->multicurrency->enabled))
-	    			{
-	    			    print '<td class="right">'.price($obj->multicurrency_amount_ht).'</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))
-	    			{
-	    			    print '<td class="right">'.price($obj->multicurrency_amount_ttc).'</td>';
-	    			}
-	    			print '<td class="center">';
-	    			print '<a href="'.DOL_URL_ROOT.'/user/card.php?id='.$obj->user_id.'">'.img_object($langs->trans("ShowUser"), 'user').' '.$obj->login.'</a>';
-	    			print '</td>';
-	    			if ($user->rights->societe->creer || $user->rights->facture->creer)
-	    			{
-	    				print '<td class="center nowrap">';
-	    				print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=split&remid='.$obj->rowid.($backtopage ? '&backtopage='.urlencode($backtopage) : '').'">'.img_split($langs->trans("SplitDiscount")).'</a>';
-	    				print '<a class="reposition marginleftonly" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=remove&remid='.$obj->rowid.($backtopage ? '&backtopage='.urlencode($backtopage) : '').'">'.img_delete($langs->trans("RemoveDiscount")).'</a>';
-	    				print '</td>';
-	    			} else print '<td>&nbsp;</td>';
-	    			print '</tr>';
+					print '<tr class="oddeven">';
+					print '<td>'.dol_print_date($db->jdate($obj->dc), 'dayhour').'</td>';
+					if (preg_match('/\(CREDIT_NOTE\)/', $obj->description))
+					{
+						print '<td class="minwidth100">';
+						$facturestatic->id = $obj->fk_facture_source;
+						$facturestatic->ref = $obj->ref;
+						$facturestatic->type = $obj->type;
+						print preg_replace('/\(CREDIT_NOTE\)/', $langs->trans("CreditNote"), $obj->description).' '.$facturestatic->getNomURl(1);
+						print '</td>';
+					} elseif (preg_match('/\(DEPOSIT\)/', $obj->description))
+					{
+						print '<td class="minwidth100">';
+						$facturestatic->id = $obj->fk_facture_source;
+						$facturestatic->ref = $obj->ref;
+						$facturestatic->type = $obj->type;
+						print preg_replace('/\(DEPOSIT\)/', $langs->trans("InvoiceDeposit"), $obj->description).' '.$facturestatic->getNomURl(1);
+						print '</td>';
+					} elseif (preg_match('/\(EXCESS RECEIVED\)/', $obj->description))
+					{
+						print '<td class="minwidth100">';
+						$facturestatic->id = $obj->fk_facture_source;
+						$facturestatic->ref = $obj->ref;
+						$facturestatic->type = $obj->type;
+						print preg_replace('/\(EXCESS RECEIVED\)/', $langs->trans("ExcessReceived"), $obj->description).' '.$facturestatic->getNomURl(1);
+						print '</td>';
+					} else {
+						print '<td class="minwidth100">';
+						print $obj->description;
+						print '</td>';
+					}
+					print '<td class="nowrap">'.$langs->trans("NotConsumed").'</td>';
+					print '<td class="right">'.price($obj->amount_ht).'</td>';
+					if (!empty($conf->multicurrency->enabled))
+					{
+						print '<td class="right">'.price($obj->multicurrency_amount_ht).'</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))
+					{
+						print '<td class="right">'.price($obj->multicurrency_amount_ttc).'</td>';
+					}
+					print '<td class="center">';
+					print '<a href="'.DOL_URL_ROOT.'/user/card.php?id='.$obj->user_id.'">'.img_object($langs->trans("ShowUser"), 'user').' '.$obj->login.'</a>';
+					print '</td>';
+					if ($user->rights->societe->creer || $user->rights->facture->creer)
+					{
+						print '<td class="center nowrap">';
+						print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=split&remid='.$obj->rowid.($backtopage ? '&backtopage='.urlencode($backtopage) : '').'">'.img_split($langs->trans("SplitDiscount")).'</a>';
+						print '<a class="reposition marginleftonly" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=remove&remid='.$obj->rowid.($backtopage ? '&backtopage='.urlencode($backtopage) : '').'">'.img_delete($langs->trans("RemoveDiscount")).'</a>';
+						print '</td>';
+					} else print '<td>&nbsp;</td>';
+					print '</tr>';
 
-	    			if ($_GET["action"] == 'split' && GETPOST('remid') == $obj->rowid)
-	    			{
-	    				$showconfirminfo['rowid'] = $obj->rowid;
-	    				$showconfirminfo['amount_ttc'] = $obj->amount_ttc;
-	    			}
-	    			$i++;
-	    		}
+					if ($_GET["action"] == 'split' && GETPOST('remid') == $obj->rowid)
+					{
+						$showconfirminfo['rowid'] = $obj->rowid;
+						$showconfirminfo['amount_ttc'] = $obj->amount_ttc;
+					}
+					$i++;
+				}
 			} else {
 				$colspan = 8;
 				if (!empty($conf->multicurrency->enabled)) $colspan += 2;
-			    print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
+				print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
 			}
 			$db->free($resql);
 			print "</table>";
@@ -589,13 +589,13 @@ if ($socid > 0)
 			print '<td class="right">'.$langs->trans("AmountHT").'</td>';
 			if (!empty($conf->multicurrency->enabled))
 			{
-			    print '<td class="right">'.$langs->trans("MulticurrencyAmountHT").'</td>';
+				print '<td class="right">'.$langs->trans("MulticurrencyAmountHT").'</td>';
 			}
 			print '<td class="right">'.$langs->trans("VATRate").'</td>';
 			print '<td class="right">'.$langs->trans("AmountTTC").'</td>';
 			if (!empty($conf->multicurrency->enabled))
 			{
-			    print '<td class="right">'.$langs->trans("MulticurrencyAmountTTC").'</td>';
+				print '<td class="right">'.$langs->trans("MulticurrencyAmountTTC").'</td>';
 			}
 			print '<td width="100" class="center">'.$langs->trans("DiscountOfferedBy").'</td>';
 			print '<td width="50">&nbsp;</td>';
@@ -646,13 +646,13 @@ if ($socid > 0)
 					print '<td class="right">'.price($obj->amount_ht).'</td>';
 					if (!empty($conf->multicurrency->enabled))
 					{
-					    print '<td class="right">'.price($obj->multicurrency_amount_ht).'</td>';
+						print '<td class="right">'.price($obj->multicurrency_amount_ht).'</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))
 					{
-					    print '<td class="right">'.price($obj->multicurrency_amount_ttc).'</td>';
+						print '<td class="right">'.price($obj->multicurrency_amount_ttc).'</td>';
 					}
 					print '<td class="center">';
 					print '<a href="'.DOL_URL_ROOT.'/user/card.php?id='.$obj->user_id.'">'.img_object($langs->trans("ShowUser"), 'user').' '.$obj->login.'</a>';
@@ -770,13 +770,13 @@ if ($socid > 0)
 			print '<td class="right">'.$langs->trans("AmountHT").'</td>';
 			if (!empty($conf->multicurrency->enabled))
 			{
-			    print '<td class="right">'.$langs->trans("MulticurrencyAmountHT").'</td>';
+				print '<td class="right">'.$langs->trans("MulticurrencyAmountHT").'</td>';
 			}
 			print '<td class="right">'.$langs->trans("VATRate").'</td>';
 			print '<td class="right">'.$langs->trans("AmountTTC").'</td>';
 			if (!empty($conf->multicurrency->enabled))
 			{
-			    print '<td class="right">'.$langs->trans("MulticurrencyAmountTTC").'</td>';
+				print '<td class="right">'.$langs->trans("MulticurrencyAmountTTC").'</td>';
 			}
 			print '<td width="100" class="center">'.$langs->trans("Author").'</td>';
 			print '<td width="50">&nbsp;</td>';
@@ -787,12 +787,12 @@ if ($socid > 0)
 			$num = $db->num_rows($resql);
 			if ($num > 0)
 			{
-	    		for ($i = 0; $i < $num; $i++)
-	    		{
-	    			$sqlobj = $db->fetch_object($resql);
-	    			$tab_sqlobj[] = $sqlobj;
-	    			$tab_sqlobjOrder[] = $db->jdate($sqlobj->dc);
-	    		}
+				for ($i = 0; $i < $num; $i++)
+				{
+					$sqlobj = $db->fetch_object($resql);
+					$tab_sqlobj[] = $sqlobj;
+					$tab_sqlobjOrder[] = $db->jdate($sqlobj->dc);
+				}
 			}
 			$db->free($resql);
 
@@ -809,69 +809,69 @@ if ($socid > 0)
 			$num = count($tab_sqlobj);
 			if ($num > 0)
 			{
-			    $i = 0;
-	    		while ($i < $num)
-	    		{
-	    			$obj = array_shift($tab_sqlobj);
-	    			print '<tr class="oddeven">';
-	    			print '<td>'.dol_print_date($db->jdate($obj->dc), 'dayhour').'</td>';
-	    			if (preg_match('/\(CREDIT_NOTE\)/', $obj->description))
-	    			{
-	    				print '<td class="minwidth100">';
-	    				$facturestatic->id = $obj->fk_facture_source;
-	    				$facturestatic->ref = $obj->invoice_source_ref;
-	    				$facturestatic->type = $obj->type;
-	    				print preg_replace('/\(CREDIT_NOTE\)/', $langs->trans("CreditNote"), $obj->description).' '.$facturestatic->getNomURl(1);
-	    				print '</td>';
-	    			} elseif (preg_match('/\(DEPOSIT\)/', $obj->description))
-	    			{
-	    				print '<td class="minwidth100">';
-	    				$facturestatic->id = $obj->fk_facture_source;
-	    				$facturestatic->ref = $obj->invoice_source_ref;
-	    				$facturestatic->type = $obj->type;
-	    				print preg_replace('/\(DEPOSIT\)/', $langs->trans("InvoiceDeposit"), $obj->description).' '.$facturestatic->getNomURl(1);
-	    				print '</td>';
-	    			} elseif (preg_match('/\(EXCESS RECEIVED\)/', $obj->description))
-	    			{
-	    				print '<td class="minwidth100">';
-	    				$facturestatic->id = $obj->fk_facture_source;
-	    				$facturestatic->ref = $obj->invoice_source_ref;
-	    				$facturestatic->type = $obj->type;
-	    				print preg_replace('/\(EXCESS RECEIVED\)/', $langs->trans("Invoice"), $obj->description).' '.$facturestatic->getNomURl(1);
-	    				print '</td>';
-	    			} else {
-	    				print '<td class="minwidth100">';
-	    				print $obj->description;
-	    				print '</td>';
-	    			}
-	    			print '<td class="left nowrap">';
-	    			if ($obj->invoiceid)
-	    			{
-	    				print '<a href="'.DOL_URL_ROOT.'/compta/facture/card.php?facid='.$obj->invoiceid.'">'.img_object($langs->trans("ShowBill"), 'bill').' '.$obj->ref.'</a>';
-	    			}
-	    			print '</td>';
-	    			print '<td class="right">'.price($obj->amount_ht).'</td>';
-	    			if (!empty($conf->multicurrency->enabled))
-	    			{
-	    			    print '<td class="right">'.price($obj->multicurrency_amount_ht).'</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))
-	    			{
-	    			    print '<td class="right">'.price($obj->multicurrency_amount_ttc).'</td>';
-	    			}
-	    			print '<td class="center">';
-	    			print '<a href="'.DOL_URL_ROOT.'/user/card.php?id='.$obj->user_id.'">'.img_object($langs->trans("ShowUser"), 'user').' '.$obj->login.'</a>';
-	    			print '</td>';
-	    			print '<td>&nbsp;</td>';
-	    			print '</tr>';
-	    			$i++;
-	    		}
+				$i = 0;
+				while ($i < $num)
+				{
+					$obj = array_shift($tab_sqlobj);
+					print '<tr class="oddeven">';
+					print '<td>'.dol_print_date($db->jdate($obj->dc), 'dayhour').'</td>';
+					if (preg_match('/\(CREDIT_NOTE\)/', $obj->description))
+					{
+						print '<td class="minwidth100">';
+						$facturestatic->id = $obj->fk_facture_source;
+						$facturestatic->ref = $obj->invoice_source_ref;
+						$facturestatic->type = $obj->type;
+						print preg_replace('/\(CREDIT_NOTE\)/', $langs->trans("CreditNote"), $obj->description).' '.$facturestatic->getNomURl(1);
+						print '</td>';
+					} elseif (preg_match('/\(DEPOSIT\)/', $obj->description))
+					{
+						print '<td class="minwidth100">';
+						$facturestatic->id = $obj->fk_facture_source;
+						$facturestatic->ref = $obj->invoice_source_ref;
+						$facturestatic->type = $obj->type;
+						print preg_replace('/\(DEPOSIT\)/', $langs->trans("InvoiceDeposit"), $obj->description).' '.$facturestatic->getNomURl(1);
+						print '</td>';
+					} elseif (preg_match('/\(EXCESS RECEIVED\)/', $obj->description))
+					{
+						print '<td class="minwidth100">';
+						$facturestatic->id = $obj->fk_facture_source;
+						$facturestatic->ref = $obj->invoice_source_ref;
+						$facturestatic->type = $obj->type;
+						print preg_replace('/\(EXCESS RECEIVED\)/', $langs->trans("Invoice"), $obj->description).' '.$facturestatic->getNomURl(1);
+						print '</td>';
+					} else {
+						print '<td class="minwidth100">';
+						print $obj->description;
+						print '</td>';
+					}
+					print '<td class="left nowrap">';
+					if ($obj->invoiceid)
+					{
+						print '<a href="'.DOL_URL_ROOT.'/compta/facture/card.php?facid='.$obj->invoiceid.'">'.img_object($langs->trans("ShowBill"), 'bill').' '.$obj->ref.'</a>';
+					}
+					print '</td>';
+					print '<td class="right">'.price($obj->amount_ht).'</td>';
+					if (!empty($conf->multicurrency->enabled))
+					{
+						print '<td class="right">'.price($obj->multicurrency_amount_ht).'</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))
+					{
+						print '<td class="right">'.price($obj->multicurrency_amount_ttc).'</td>';
+					}
+					print '<td class="center">';
+					print '<a href="'.DOL_URL_ROOT.'/user/card.php?id='.$obj->user_id.'">'.img_object($langs->trans("ShowUser"), 'user').' '.$obj->login.'</a>';
+					print '</td>';
+					print '<td>&nbsp;</td>';
+					print '</tr>';
+					$i++;
+				}
 			} else {
 				$colspan = 8;
 				if (!empty($conf->multicurrency->enabled)) $colspan += 2;
-			    print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
+				print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
 			}
 
 			print "</table>";
@@ -940,13 +940,13 @@ if ($socid > 0)
 			print '<td class="right">'.$langs->trans("AmountHT").'</td>';
 			if (!empty($conf->multicurrency->enabled))
 			{
-			    print '<td class="right">'.$langs->trans("MulticurrencyAmountHT").'</td>';
+				print '<td class="right">'.$langs->trans("MulticurrencyAmountHT").'</td>';
 			}
 			print '<td class="right">'.$langs->trans("VATRate").'</td>';
 			print '<td class="right">'.$langs->trans("AmountTTC").'</td>';
 			if (!empty($conf->multicurrency->enabled))
 			{
-			    print '<td class="right">'.$langs->trans("MulticurrencyAmountTTC").'</td>';
+				print '<td class="right">'.$langs->trans("MulticurrencyAmountTTC").'</td>';
 			}
 			print '<td width="100" class="center">'.$langs->trans("Author").'</td>';
 			print '<td width="50">&nbsp;</td>';
@@ -1022,13 +1022,13 @@ if ($socid > 0)
 					print '<td class="right">'.price($obj->amount_ht).'</td>';
 					if (!empty($conf->multicurrency->enabled))
 					{
-					    print '<td class="right">'.price($obj->multicurrency_amount_ht).'</td>';
+						print '<td class="right">'.price($obj->multicurrency_amount_ht).'</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))
 					{
-					    print '<td class="right">'.price($obj->multicurrency_amount_ttc).'</td>';
+						print '<td class="right">'.price($obj->multicurrency_amount_ttc).'</td>';
 					}
 					print '<td class="center">';
 					print '<a href="'.DOL_URL_ROOT.'/user/card.php?id='.$obj->user_id.'">'.img_object($langs->trans("ShowUser"), 'user').' '.$obj->login.'</a>';
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 795a120cee6..69d85a25e7c 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -242,7 +242,7 @@ if (empty($reshook))
 	{
 		$datecommande = dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
 		$datelivraison = dol_mktime(12, 0, 0, GETPOST('liv_month'), GETPOST('liv_day'), GETPOST('liv_year'));
-        $selectedLines = GETPOST('toselect', 'array');
+		$selectedLines = GETPOST('toselect', 'array');
 
 		if ($datecommande == '') {
 			setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentities('Date')), null, 'errors');
@@ -349,7 +349,7 @@ if (empty($reshook))
 
 							for ($i = 0; $i < $num; $i++)
 							{
-                                if (!in_array($lines[$i]->id, $selectedLines)) continue; // Skip unselected lines
+								if (!in_array($lines[$i]->id, $selectedLines)) continue; // Skip unselected lines
 
 								$label = (!empty($lines[$i]->label) ? $lines[$i]->label : '');
 								$desc = (!empty($lines[$i]->desc) ? $lines[$i]->desc : '');
@@ -537,14 +537,14 @@ if (empty($reshook))
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	} elseif ($action == 'setdate_livraison' && $usercancreate) {
-	    // print "x ".$_POST['liv_month'].", ".$_POST['liv_day'].", ".$_POST['liv_year'];
-	    $datedelivery = dol_mktime(GETPOST('liv_hour', 'int'), GETPOST('liv_min', 'int'), 0, GETPOST('liv_month', 'int'), GETPOST('liv_day', 'int'), GETPOST('liv_year', 'int'));
+		// print "x ".$_POST['liv_month'].", ".$_POST['liv_day'].", ".$_POST['liv_year'];
+		$datedelivery = dol_mktime(GETPOST('liv_hour', 'int'), GETPOST('liv_min', 'int'), 0, GETPOST('liv_month', 'int'), GETPOST('liv_day', 'int'), GETPOST('liv_year', 'int'));
 
-	    $object->fetch($id);
-	    $result = $object->setDeliveryDate($user, $datedelivery);
-	    if ($result < 0) {
-	        setEventMessages($object->error, $object->errors, 'errors');
-	    }
+		$object->fetch($id);
+		$result = $object->setDeliveryDate($user, $datedelivery);
+		if ($result < 0) {
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
 	} elseif ($action == 'setmode' && $usercancreate) {
 		$result = $object->setPaymentMethods(GETPOST('mode_reglement_id', 'int'));
 		if ($result < 0)
@@ -738,8 +738,8 @@ if (empty($reshook))
 					$price_base_type = $prod->multiprices_base_type[$object->thirdparty->price_level];
 					if (!empty($conf->global->PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL))  // using this option is a bug. kept for backward compatibility
 					{
-					    if (isset($prod->multiprices_tva_tx[$object->thirdparty->price_level])) $tva_tx = $prod->multiprices_tva_tx[$object->thirdparty->price_level];
-					    if (isset($prod->multiprices_recuperableonly[$object->thirdparty->price_level])) $tva_npr = $prod->multiprices_recuperableonly[$object->thirdparty->price_level];
+						if (isset($prod->multiprices_tva_tx[$object->thirdparty->price_level])) $tva_tx = $prod->multiprices_tva_tx[$object->thirdparty->price_level];
+						if (isset($prod->multiprices_recuperableonly[$object->thirdparty->price_level])) $tva_npr = $prod->multiprices_recuperableonly[$object->thirdparty->price_level];
 					}
 				}
 				// If price per customer
@@ -1284,82 +1284,82 @@ if (empty($reshook))
 
 	// add lines from objectlinked
 	if ($action == 'import_lines_from_object'
-	    && $usercancreate
-	    && $object->statut == Commande::STATUS_DRAFT
+		&& $usercancreate
+		&& $object->statut == Commande::STATUS_DRAFT
 	  )
 	{
-	    $fromElement = GETPOST('fromelement');
-	    $fromElementid = GETPOST('fromelementid');
-	    $importLines = GETPOST('line_checkbox');
+		$fromElement = GETPOST('fromelement');
+		$fromElementid = GETPOST('fromelementid');
+		$importLines = GETPOST('line_checkbox');
 
-	    if (!empty($importLines) && is_array($importLines) && !empty($fromElement) && ctype_alpha($fromElement) && !empty($fromElementid))
-	    {
-	        if ($fromElement == 'commande')
-	        {
-	            dol_include_once('/'.$fromElement.'/class/'.$fromElement.'.class.php');
-	            $lineClassName = 'OrderLine';
-	        } elseif ($fromElement == 'propal')
-	        {
-	            dol_include_once('/comm/'.$fromElement.'/class/'.$fromElement.'.class.php');
-	            $lineClassName = 'PropaleLigne';
-	        }
-	        $nextRang = count($object->lines) + 1;
-	        $importCount = 0;
-	        $error = 0;
-	        foreach ($importLines as $lineId)
-	        {
-	            $lineId = intval($lineId);
-	            $originLine = new $lineClassName($db);
-	            if (intval($fromElementid) > 0 && $originLine->fetch($lineId) > 0)
-	            {
-	                $originLine->fetch_optionals();
-	                $desc = $originLine->desc;
-	                $pu_ht = $originLine->subprice;
-	                $qty = $originLine->qty;
-	                $txtva = $originLine->tva_tx;
-	                $txlocaltax1 = $originLine->localtax1_tx;
-	                $txlocaltax2 = $originLine->localtax2_tx;
-	                $fk_product = $originLine->fk_product;
-	                $remise_percent = $originLine->remise_percent;
-	                $date_start = $originLine->date_start;
-	                $date_end = $originLine->date_end;
-	                $ventil = 0;
-	                $info_bits = $originLine->info_bits;
-	                $fk_remise_except = $originLine->fk_remise_except;
-	                $price_base_type = 'HT';
-	                $pu_ttc = 0;
-	                $type = $originLine->product_type;
-	                $rang = $nextRang++;
-	                $special_code = $originLine->special_code;
-	                $origin = $originLine->element;
-	                $origin_id = $originLine->id;
-	                $fk_parent_line = 0;
-	                $fk_fournprice = $originLine->fk_fournprice;
-	                $pa_ht = $originLine->pa_ht;
-	                $label = $originLine->label;
-	                $array_options = $originLine->array_options;
-	                $situation_percent = 100;
-	                $fk_prev_id = '';
-	                $fk_unit = $originLine->fk_unit;
-	                $pu_ht_devise = $originLine->multicurrency_subprice;
+		if (!empty($importLines) && is_array($importLines) && !empty($fromElement) && ctype_alpha($fromElement) && !empty($fromElementid))
+		{
+			if ($fromElement == 'commande')
+			{
+				dol_include_once('/'.$fromElement.'/class/'.$fromElement.'.class.php');
+				$lineClassName = 'OrderLine';
+			} elseif ($fromElement == 'propal')
+			{
+				dol_include_once('/comm/'.$fromElement.'/class/'.$fromElement.'.class.php');
+				$lineClassName = 'PropaleLigne';
+			}
+			$nextRang = count($object->lines) + 1;
+			$importCount = 0;
+			$error = 0;
+			foreach ($importLines as $lineId)
+			{
+				$lineId = intval($lineId);
+				$originLine = new $lineClassName($db);
+				if (intval($fromElementid) > 0 && $originLine->fetch($lineId) > 0)
+				{
+					$originLine->fetch_optionals();
+					$desc = $originLine->desc;
+					$pu_ht = $originLine->subprice;
+					$qty = $originLine->qty;
+					$txtva = $originLine->tva_tx;
+					$txlocaltax1 = $originLine->localtax1_tx;
+					$txlocaltax2 = $originLine->localtax2_tx;
+					$fk_product = $originLine->fk_product;
+					$remise_percent = $originLine->remise_percent;
+					$date_start = $originLine->date_start;
+					$date_end = $originLine->date_end;
+					$ventil = 0;
+					$info_bits = $originLine->info_bits;
+					$fk_remise_except = $originLine->fk_remise_except;
+					$price_base_type = 'HT';
+					$pu_ttc = 0;
+					$type = $originLine->product_type;
+					$rang = $nextRang++;
+					$special_code = $originLine->special_code;
+					$origin = $originLine->element;
+					$origin_id = $originLine->id;
+					$fk_parent_line = 0;
+					$fk_fournprice = $originLine->fk_fournprice;
+					$pa_ht = $originLine->pa_ht;
+					$label = $originLine->label;
+					$array_options = $originLine->array_options;
+					$situation_percent = 100;
+					$fk_prev_id = '';
+					$fk_unit = $originLine->fk_unit;
+					$pu_ht_devise = $originLine->multicurrency_subprice;
 
-	                $res = $object->addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1, $txlocaltax2, $fk_product, $remise_percent, $info_bits, $fk_remise_except, $price_base_type, $pu_ttc, $date_start, $date_end, $type, $rang, $special_code, $fk_parent_line, $fk_fournprice, $pa_ht, $label, $array_options, $fk_unit, $origin, $origin_id, $pu_ht_devise);
+					$res = $object->addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1, $txlocaltax2, $fk_product, $remise_percent, $info_bits, $fk_remise_except, $price_base_type, $pu_ttc, $date_start, $date_end, $type, $rang, $special_code, $fk_parent_line, $fk_fournprice, $pa_ht, $label, $array_options, $fk_unit, $origin, $origin_id, $pu_ht_devise);
 
-	                if ($res > 0) {
-	                    $importCount++;
-	                } else {
-	                    $error++;
-	                }
-	            } else {
-	                $error++;
-	            }
-	        }
+					if ($res > 0) {
+						$importCount++;
+					} else {
+						$error++;
+					}
+				} else {
+					$error++;
+				}
+			}
 
-	        if ($error)
-	        {
-	            setEventMessages($langs->trans('ErrorsOnXLines', $error), null, 'errors');
-	        }
-	    }
+			if ($error)
+			{
+				setEventMessages($langs->trans('ErrorsOnXLines', $error), null, 'errors');
+			}
+		}
 	}
 
 	// Actions when printing a doc from card
@@ -1582,11 +1582,12 @@ if ($action == 'create' && $usercancreate)
 		print '<td>';
 		print $form->select_company('', 'socid', '(s.client = 1 OR s.client = 2 OR s.client = 3)', 'SelectThirdParty', 0, 0, null, 0, 'minwidth300');
 		// reload page to retrieve customer informations
-		if (!empty($conf->global->RELOAD_PAGE_ON_CUSTOMER_CHANGE))
+		if (empty($conf->global->RELOAD_PAGE_ON_CUSTOMER_CHANGE_DISABLED))
 		{
 			print '<script type="text/javascript">
 			$(document).ready(function() {
 				$("#socid").change(function() {
+					console.log("We have changed the company - Reload page");
 					var socid = $(this).val();
 					// reload page
 					window.location.href = "'.$_SERVER["PHP_SELF"].'?action=create&socid="+socid+"&ref_client="+$("input[name=ref_client]").val();
@@ -1828,7 +1829,7 @@ if ($action == 'create' && $usercancreate)
 
 	print '</table>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	// Button "Create Draft"
 	print '<div class="center">';
@@ -1849,7 +1850,7 @@ if ($action == 'create' && $usercancreate)
 		print '</table>';
 	}
 
-    print '</form>';
+	print '</form>';
 } else {
 	// Mode view
 	$now = dol_now();
@@ -2474,7 +2475,7 @@ if ($action == 'create' && $usercancreate)
 
 		print "</form>\n";
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 		/*
 		 * Buttons for actions
@@ -2635,9 +2636,9 @@ if ($action == 'create' && $usercancreate)
 
 			$compatibleImportElementsList = false;
 			if ($usercancreate
-			    && $object->statut == Commande::STATUS_DRAFT)
+				&& $object->statut == Commande::STATUS_DRAFT)
 			{
-			    $compatibleImportElementsList = array('commande', 'propal'); // import from linked elements
+				$compatibleImportElementsList = array('commande', 'propal'); // import from linked elements
 			}
 			$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem, $compatibleImportElementsList);
 
diff --git a/htdocs/commande/class/api_orders.class.php b/htdocs/commande/class/api_orders.class.php
index b9fbe8a6c1d..71a26eea698 100644
--- a/htdocs/commande/class/api_orders.class.php
+++ b/htdocs/commande/class/api_orders.class.php
@@ -950,8 +950,8 @@ class Orders extends DolibarrApi
 	/**
 	 * Clean sensible object datas
 	 *
-	 * @param   object  $object    Object to clean
-	 * @return    array    Array of cleaned object properties
+	 * @param   Object  $object     Object to clean
+	 * @return  Object              Object with cleaned properties
 	 */
 	protected function _cleanObjectDatas($object)
 	{
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index d4f44913a17..a01b6dfb924 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -478,7 +478,7 @@ class Commande extends CommonOrder
 		$sql .= " fk_user_valid = ".$user->id;
 		$sql .= " WHERE rowid = ".$this->id;
 
-		dol_syslog(get_class($this)."::valid()", LOG_DEBUG);
+		dol_syslog(get_class($this)."::valid", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if (!$resql)
 		{
@@ -544,7 +544,7 @@ class Commande extends CommonOrder
 				$dirdest = $conf->commande->multidir_output[$this->entity].'/'.$newref;
 				if (!$error && file_exists($dirsource))
 				{
-					dol_syslog(get_class($this)."::valid() rename dir ".$dirsource." into ".$dirdest);
+					dol_syslog(get_class($this)."::valid rename dir ".$dirsource." into ".$dirdest);
 
 					if (@rename($dirsource, $dirdest))
 					{
@@ -1357,7 +1357,7 @@ class Commande extends CommonOrder
 		$this->shipping_method_id   = $object->shipping_method_id;
 		$this->warehouse_id         = $object->warehouse_id;
 		$this->fk_delivery_address  = $object->fk_delivery_address;
-		$this->contact_id            = $object->contact_id;
+		$this->contact_id = $object->contact_id;
 		$this->ref_client           = $object->ref_client;
 
 		if (empty($conf->global->MAIN_DISABLE_PROPAGATE_NOTES_FROM_ORIGIN))
@@ -1848,7 +1848,7 @@ class Commande extends CommonOrder
 				$this->note_private = $obj->note_private;
 				$this->note_public = $obj->note_public;
 				$this->model_pdf = $obj->model_pdf;
-				$this->modelpdf = $obj->model_pdf;	// deprecated
+				$this->modelpdf = $obj->model_pdf; // deprecated
 				$this->last_main_doc = $obj->last_main_doc;
 				$this->mode_reglement_id	= $obj->fk_mode_reglement;
 				$this->mode_reglement_code	= $obj->mode_reglement_code;
@@ -3634,7 +3634,10 @@ class Commande extends CommonOrder
 		$label = '';
 
 		if ($user->rights->commande->lire) {
-			$label = img_picto('', $this->picto).' <u>'.$langs->trans("Order").'</u>';
+			$label = img_picto('', $this->picto).' <u class="paddingrightonly">'.$langs->trans("Order").'</u>';
+			if (isset($this->statut)) {
+				$label .= ' '.$this->getLibStatut(5);
+			}
 			$label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
 			$label .= '<br><b>'.$langs->trans('RefCustomer').':</b> '.($this->ref_customer ? $this->ref_customer : $this->ref_client);
 			if (!empty($this->total_ht)) {
@@ -3646,9 +3649,6 @@ class Commande extends CommonOrder
 			if (!empty($this->total_ttc)) {
 				$label .= '<br><b>'.$langs->trans('AmountTTC').':</b> '.price($this->total_ttc, 0, $langs, 0, -1, -1, $conf->currency);
 			}
-			if (isset($this->statut)) {
-				$label .= '<br><b>'.$langs->trans("Status").":</b> ".$this->getLibStatut(5);
-			}
 		}
 
 		$linkclose = '';
diff --git a/htdocs/commande/class/commandestats.class.php b/htdocs/commande/class/commandestats.class.php
index c9dc5eaffa8..57f8147cd57 100644
--- a/htdocs/commande/class/commandestats.class.php
+++ b/htdocs/commande/class/commandestats.class.php
@@ -35,18 +35,18 @@ include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
  */
 class CommandeStats extends Stats
 {
-    /**
-     * @var string Name of table without prefix where object is stored
-     */
-    public $table_element;
+	/**
+	 * @var string Name of table without prefix where object is stored
+	 */
+	public $table_element;
 
-    public $socid;
-    public $userid;
+	public $socid;
+	public $userid;
 
-    public $from;
-    public $field;
-    public $where;
-    public $join;
+	public $from;
+	public $field;
+	public $where;
+	public $join;
 
 
 	/**
@@ -56,8 +56,8 @@ class CommandeStats extends Stats
 	 * @param 	int		$socid	    Id third party for filter. This value must be forced during the new to external user company if user is an external user.
 	 * @param 	string	$mode	    Option ('customer', 'supplier')
 	 * @param   int		$userid     Id user for filter (creation user)
-     * @param	int		$typentid   Id typent of thirdpary for filter
-     * @param	int		$categid    Id category of thirdpary for filter
+	 * @param	int		$typentid   Id typent of thirdpary for filter
+	 * @param	int		$categid    Id category of thirdpary for filter
 	 */
 	public function __construct($db, $socid, $mode, $userid = 0, $typentid = 0, $categid = 0)
 	{
@@ -66,9 +66,9 @@ class CommandeStats extends Stats
 		$this->db = $db;
 
 		$this->socid = ($socid > 0 ? $socid : 0);
-        $this->userid = $userid;
+		$this->userid = $userid;
 		$this->cachefilesuffix = $mode;
-        $this->join = '';
+		$this->join = '';
 
 		if ($mode == 'customer')
 		{
@@ -88,34 +88,34 @@ class CommandeStats extends Stats
 			//$this->where .= " c.fk_statut > 2"; // Only approved & ordered
 		}
 		//$this->where.= " AND c.fk_soc = s.rowid AND c.entity = ".$conf->entity;
-		$this->where .= ($this->where ? ' AND ' : ''). 'c.entity IN ('.getEntity('commande').')';
+		$this->where .= ($this->where ? ' AND ' : '').'c.entity IN ('.getEntity('commande').')';
 
 		if (!$user->rights->societe->client->voir && !$this->socid) $this->where .= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
 		if ($this->socid)
 		{
 			$this->where .= " AND c.fk_soc = ".$this->socid;
 		}
-        if ($this->userid > 0) $this->where .= ' AND c.fk_user_author = '.$this->userid;
+		if ($this->userid > 0) $this->where .= ' AND c.fk_user_author = '.$this->userid;
 
-        if ($typentid)
-        {
-            $this->join .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s ON s.rowid = c.fk_soc';
-            $this->where .= ' AND s.fk_typent = '.$typentid;
-        }
+		if ($typentid)
+		{
+			$this->join .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s ON s.rowid = c.fk_soc';
+			$this->where .= ' AND s.fk_typent = '.$typentid;
+		}
 
-        if ($categid)
-        {
-            $this->join .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie_societe as cats ON cats.fk_soc = c.fk_soc';
-            $this->join .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie as cat ON cat.rowid = cats.fk_categorie';
-            $this->where .= ' AND cat.rowid = '.$categid;
-        }
+		if ($categid)
+		{
+			$this->join .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie_societe as cats ON cats.fk_soc = c.fk_soc';
+			$this->join .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie as cat ON cat.rowid = cats.fk_categorie';
+			$this->where .= ' AND cat.rowid = '.$categid;
+		}
 	}
 
 	/**
 	 * Return orders number by month for a year
 	 *
 	 * @param	int		$year		Year to scan
-     *	@param	int		$format		0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
+	 *	@param	int		$format		0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
 	 * @return	array				Array with number by month
 	 */
 	public function getNbByMonth($year, $format = 0)
@@ -125,11 +125,11 @@ class CommandeStats extends Stats
 		$sql = "SELECT date_format(c.date_commande,'%m') as dm, COUNT(*) as nb";
 		$sql .= " FROM ".$this->from;
 		if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-        $sql .= $this->join;
+		$sql .= $this->join;
 		$sql .= " WHERE c.date_commande BETWEEN '".$this->db->idate(dol_get_first_day($year))."' AND '".$this->db->idate(dol_get_last_day($year))."'";
 		$sql .= " AND ".$this->where;
 		$sql .= " GROUP BY dm";
-        $sql .= $this->db->order('dm', 'DESC');
+		$sql .= $this->db->order('dm', 'DESC');
 
 		$res = $this->_getNbByMonth($year, $sql, $format);
 		return $res;
@@ -148,10 +148,10 @@ class CommandeStats extends Stats
 		$sql = "SELECT date_format(c.date_commande,'%Y') as dm, COUNT(*) as nb, SUM(c.".$this->field.")";
 		$sql .= " FROM ".$this->from;
 		if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-        $sql .= $this->join;
+		$sql .= $this->join;
 		$sql .= " WHERE ".$this->where;
 		$sql .= " GROUP BY dm";
-        $sql .= $this->db->order('dm', 'DESC');
+		$sql .= $this->db->order('dm', 'DESC');
 
 		return $this->_getNbByYear($sql);
 	}
@@ -160,7 +160,7 @@ class CommandeStats extends Stats
 	 * Return the orders amount by month for a year
 	 *
 	 * @param	int		$year		Year to scan
-     * @param	int		$format		0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
+	 * @param	int		$format		0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
 	 * @return	array				Array with amount by month
 	 */
 	public function getAmountByMonth($year, $format = 0)
@@ -170,11 +170,11 @@ class CommandeStats extends Stats
 		$sql = "SELECT date_format(c.date_commande,'%m') as dm, SUM(c.".$this->field.")";
 		$sql .= " FROM ".$this->from;
 		if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-        $sql .= $this->join;
+		$sql .= $this->join;
 		$sql .= " WHERE c.date_commande BETWEEN '".$this->db->idate(dol_get_first_day($year))."' AND '".$this->db->idate(dol_get_last_day($year))."'";
 		$sql .= " AND ".$this->where;
 		$sql .= " GROUP BY dm";
-        $sql .= $this->db->order('dm', 'DESC');
+		$sql .= $this->db->order('dm', 'DESC');
 
 		$res = $this->_getAmountByMonth($year, $sql, $format);
 		return $res;
@@ -193,11 +193,11 @@ class CommandeStats extends Stats
 		$sql = "SELECT date_format(c.date_commande,'%m') as dm, AVG(c.".$this->field.")";
 		$sql .= " FROM ".$this->from;
 		if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-        $sql .= $this->join;
+		$sql .= $this->join;
 		$sql .= " WHERE c.date_commande BETWEEN '".$this->db->idate(dol_get_first_day($year))."' AND '".$this->db->idate(dol_get_last_day($year))."'";
 		$sql .= " AND ".$this->where;
 		$sql .= " GROUP BY dm";
-        $sql .= $this->db->order('dm', 'DESC');
+		$sql .= $this->db->order('dm', 'DESC');
 
 		return $this->_getAverageByMonth($year, $sql);
 	}
@@ -214,10 +214,10 @@ class CommandeStats extends Stats
 		$sql = "SELECT date_format(c.date_commande,'%Y') as year, COUNT(*) as nb, SUM(c.".$this->field.") as total, AVG(".$this->field.") as avg";
 		$sql .= " FROM ".$this->from;
 		if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-        $sql .= $this->join;
+		$sql .= $this->join;
 		$sql .= " WHERE ".$this->where;
 		$sql .= " GROUP BY year";
-        $sql .= $this->db->order('year', 'DESC');
+		$sql .= $this->db->order('year', 'DESC');
 
 		return $this->_getAllByYear($sql);
 	}
@@ -226,7 +226,7 @@ class CommandeStats extends Stats
 	 *	Return nb, amount of predefined product for year
 	 *
 	 *	@param	int		$year			Year to scan
-     *  @param  int     $limit      	Limit
+	 *  @param  int     $limit      	Limit
 	 *	@return	array					Array of values
 	 */
 	public function getAllByProduct($year, $limit = 10)
@@ -236,14 +236,14 @@ class CommandeStats extends Stats
 		$sql = "SELECT product.ref, COUNT(product.ref) as nb, SUM(tl.".$this->field_line.") as total, AVG(tl.".$this->field_line.") as avg";
 		$sql .= " FROM ".$this->from.", ".$this->from_line.", ".MAIN_DB_PREFIX."product as product";
 		if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-        $sql .= $this->join;
+		$sql .= $this->join;
 		$sql .= " WHERE ".$this->where;
 		$sql .= " AND c.rowid = tl.fk_commande AND tl.fk_product = product.rowid";
-    	$sql .= " AND c.date_commande BETWEEN '".$this->db->idate(dol_get_first_day($year, 1, false))."' AND '".$this->db->idate(dol_get_last_day($year, 12, false))."'";
+		$sql .= " AND c.date_commande BETWEEN '".$this->db->idate(dol_get_first_day($year, 1, false))."' AND '".$this->db->idate(dol_get_last_day($year, 12, false))."'";
 		$sql .= " GROUP BY product.ref";
-        $sql .= $this->db->order('nb', 'DESC');
-        //$sql.= $this->db->plimit(20);
+		$sql .= $this->db->order('nb', 'DESC');
+		//$sql.= $this->db->plimit(20);
 
-        return $this->_getAllByProduct($sql, $limit);
+		return $this->_getAllByProduct($sql, $limit);
 	}
 }
diff --git a/htdocs/commande/contact.php b/htdocs/commande/contact.php
index 51b94d82d23..a3c31d4cf7b 100644
--- a/htdocs/commande/contact.php
+++ b/htdocs/commande/contact.php
@@ -53,11 +53,11 @@ if ($action == 'addcontact' && $user->rights->commande->creer)
 {
 	$result = $object->fetch($id);
 
-    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, $_POST["type"], $_POST["source"]);
-    }
+	}
 
 	if ($result >= 0)
 	{
@@ -79,7 +79,7 @@ elseif ($action == 'swapstatut' && $user->rights->commande->creer)
 {
 	if ($object->fetch($id))
 	{
-	    $result = $object->swapContactStatus(GETPOST('ligne'));
+		$result = $object->swapContactStatus(GETPOST('ligne'));
 	} else {
 		dol_print_error($db);
 	}
@@ -133,7 +133,7 @@ if ($id > 0 || !empty($ref))
 
 	if ($object->fetch($id, $ref) > 0)
 	{
-	    $object->fetch_thirdparty();
+		$object->fetch_thirdparty();
 
 		$head = commande_prepare_head($object);
 		print dol_get_fiche_head($head, 'contact', $langs->trans("CustomerOrder"), -1, 'order');
@@ -150,45 +150,45 @@ if ($id > 0 || !empty($ref))
 		$morehtmlref .= $form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
 		// Thirdparty
 		$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
-	    // Project
-	    if (!empty($conf->projet->enabled))
-	    {
-	        $langs->load("projects");
-	        $morehtmlref .= '<br>'.$langs->trans('Project').' ';
-	        if ($user->rights->commande->creer)
-	        {
-	            if ($action != 'classify') {
-	            	//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+		// Project
+		if (!empty($conf->projet->enabled))
+		{
+			$langs->load("projects");
+			$morehtmlref .= '<br>'.$langs->trans('Project').' ';
+			if ($user->rights->commande->creer)
+			{
+				if ($action != 'classify') {
+					//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
 					$morehtmlref .= ' : ';
-                }
-	            if ($action == 'classify') {
-	                //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-	                $morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-	                $morehtmlref .= '<input type="hidden" name="action" value="classin">';
-	                $morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
-	                $morehtmlref .= $formproject->select_projects($object->thirdparty->id, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-	                $morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-	                $morehtmlref .= '</form>';
-	            } else {
-	                $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->thirdparty->id, $object->fk_project, 'none', 0, 0, 0, 1);
-	            }
-	        } else {
-	            if (!empty($object->fk_project)) {
-	                $proj = new Project($db);
-	                $proj->fetch($object->fk_project);
-	                $morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
-	                $morehtmlref .= $proj->ref;
-	                $morehtmlref .= '</a>';
-	            } else {
-	                $morehtmlref .= '';
-	            }
-	        }
-	    }
+				}
+				if ($action == 'classify') {
+					//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+					$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+					$morehtmlref .= '<input type="hidden" name="action" value="classin">';
+					$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
+					$morehtmlref .= $formproject->select_projects($object->thirdparty->id, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+					$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+					$morehtmlref .= '</form>';
+				} else {
+					$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->thirdparty->id, $object->fk_project, 'none', 0, 0, 0, 1);
+				}
+			} else {
+				if (!empty($object->fk_project)) {
+					$proj = new Project($db);
+					$proj->fetch($object->fk_project);
+					$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
+					$morehtmlref .= $proj->ref;
+					$morehtmlref .= '</a>';
+				} else {
+					$morehtmlref .= '';
+				}
+			}
+		}
 		$morehtmlref .= '</div>';
 
 		dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '', 0, '', '', 1);
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 		print '<br>';
 
@@ -196,8 +196,8 @@ if ($id > 0 || !empty($ref))
 		$dirtpls = array_merge($conf->modules_parts['tpl'], array('/core/tpl'));
 		foreach ($dirtpls as $reldir)
 		{
-		    $res = @include dol_buildpath($reldir.'/contacts.tpl.php');
-		    if ($res) break;
+			$res = @include dol_buildpath($reldir.'/contacts.tpl.php');
+			if ($res) break;
 		}
 	} else {
 		// Contact not found
diff --git a/htdocs/commande/document.php b/htdocs/commande/document.php
index 20f49195e10..f95f61b6025 100644
--- a/htdocs/commande/document.php
+++ b/htdocs/commande/document.php
@@ -107,7 +107,7 @@ if ($id > 0 || !empty($ref))
 		$totalsize = 0;
 		foreach ($filearray as $key => $file)
 		{
-		    $totalsize += $file['size'];
+			$totalsize += $file['size'];
 		}
 
 		// Order card
@@ -124,36 +124,36 @@ if ($id > 0 || !empty($ref))
 		// Project
 		if (!empty($conf->projet->enabled))
 		{
-		    $langs->load("projects");
-		    $morehtmlref .= '<br>'.$langs->trans('Project').' ';
-		    if ($user->rights->commande->creer)
-		    {
-		        if ($action != 'classify') {
-		        	//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+			$langs->load("projects");
+			$morehtmlref .= '<br>'.$langs->trans('Project').' ';
+			if ($user->rights->commande->creer)
+			{
+				if ($action != 'classify') {
+					//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
 					$morehtmlref .= ' : ';
 				}
-	            if ($action == 'classify') {
-	                //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-	                $morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-	                $morehtmlref .= '<input type="hidden" name="action" value="classin">';
-	                $morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
-	                $morehtmlref .= $formproject->select_projects($object->thirdparty->id, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-	                $morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-	                $morehtmlref .= '</form>';
-	            } else {
-	                $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->thirdparty->id, $object->fk_project, 'none', 0, 0, 0, 1);
-	            }
-		    } else {
-		        if (!empty($object->fk_project)) {
-		            $proj = new Project($db);
-		            $proj->fetch($object->fk_project);
-		            $morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
-		            $morehtmlref .= $proj->ref;
-		            $morehtmlref .= '</a>';
-		        } else {
-		            $morehtmlref .= '';
-		        }
-		    }
+				if ($action == 'classify') {
+					//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+					$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+					$morehtmlref .= '<input type="hidden" name="action" value="classin">';
+					$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
+					$morehtmlref .= $formproject->select_projects($object->thirdparty->id, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+					$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+					$morehtmlref .= '</form>';
+				} else {
+					$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->thirdparty->id, $object->fk_project, 'none', 0, 0, 0, 1);
+				}
+			} else {
+				if (!empty($object->fk_project)) {
+					$proj = new Project($db);
+					$proj->fetch($object->fk_project);
+					$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
+					$morehtmlref .= $proj->ref;
+					$morehtmlref .= '</a>';
+				} else {
+					$morehtmlref .= '';
+				}
+			}
 		}
 		$morehtmlref .= '</div>';
 
@@ -175,7 +175,7 @@ if ($id > 0 || !empty($ref))
 
 		print "</div>\n";
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 		$modulepart = 'commande';
 		$permission = $user->rights->commande->creer;
diff --git a/htdocs/commande/index.php b/htdocs/commande/index.php
index 96476caeeed..4a18f96ddde 100644
--- a/htdocs/commande/index.php
+++ b/htdocs/commande/index.php
@@ -71,15 +71,15 @@ 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
-    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">';
-    print '<table class="noborder nohover centpercent">';
-    print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
-    print '<tr class="oddeven"><td>';
-    print $langs->trans("CustomerOrder").':</td><td><input type="text" class="flat" name="sall" size=18></td><td><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
-    print "</table></div></form><br>\n";
+	// Search customer orders
+	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">';
+	print '<table class="noborder nohover centpercent">';
+	print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
+	print '<tr class="oddeven"><td>';
+	print $langs->trans("CustomerOrder").':</td><td><input type="text" class="flat" name="sall" size=18></td><td><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
+	print "</table></div></form><br>\n";
 }
 
 
@@ -100,81 +100,81 @@ $sql .= " GROUP BY c.fk_statut";
 $resql = $db->query($sql);
 if ($resql)
 {
-    $num = $db->num_rows($resql);
-    $i = 0;
+	$num = $db->num_rows($resql);
+	$i = 0;
 
-    $total = 0;
-    $totalinprocess = 0;
-    $dataseries = array();
-    $colorseries = array();
-    $vals = array();
-    // -1=Canceled, 0=Draft, 1=Validated, 2=Accepted/On process, 3=Closed (Sent/Received, billed or not)
-    while ($i < $num)
-    {
-        $row = $db->fetch_row($resql);
-        if ($row)
-        {
-            //if ($row[1]!=-1 && ($row[1]!=3 || $row[2]!=1))
-            {
-                if (!isset($vals[$row[1]])) $vals[$row[1]] = 0;
-                $vals[$row[1]] += $row[0];
-                $totalinprocess += $row[0];
-            }
-            $total += $row[0];
-        }
-        $i++;
-    }
-    $db->free($resql);
+	$total = 0;
+	$totalinprocess = 0;
+	$dataseries = array();
+	$colorseries = array();
+	$vals = array();
+	// -1=Canceled, 0=Draft, 1=Validated, 2=Accepted/On process, 3=Closed (Sent/Received, billed or not)
+	while ($i < $num)
+	{
+		$row = $db->fetch_row($resql);
+		if ($row)
+		{
+			//if ($row[1]!=-1 && ($row[1]!=3 || $row[2]!=1))
+			{
+				if (!isset($vals[$row[1]])) $vals[$row[1]] = 0;
+				$vals[$row[1]] += $row[0];
+				$totalinprocess += $row[0];
+			}
+			$total += $row[0];
+		}
+		$i++;
+	}
+	$db->free($resql);
 
-    include_once DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/theme_vars.inc.php';
+	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, 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;
+	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, 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)
-    {
-        print '<tr class="impair"><td align="center" colspan="2">';
+		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)
+	{
+		print '<tr class="impair"><td align="center" colspan="2">';
 
-        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);
+		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);
 
-        print '</td></tr>';
-    }
+		print '</td></tr>';
+	}
 
-    //if ($totalinprocess != $total)
-    print '<tr class="liste_total"><td>'.$langs->trans("Total").'</td><td class="right">'.$total.'</td></tr>';
-    print "</table></div><br>";
+	//if ($totalinprocess != $total)
+	print '<tr class="liste_total"><td>'.$langs->trans("Total").'</td><td class="right">'.$total.'</td></tr>';
+	print "</table></div><br>";
 } else {
-    dol_print_error($db);
+	dol_print_error($db);
 }
 
 
@@ -184,9 +184,9 @@ if ($resql)
 if (!empty($conf->commande->enabled))
 {
 	$sql = "SELECT c.rowid, c.ref, s.nom as name, s.rowid as socid";
-    $sql .= ", s.client";
-    $sql .= ", s.code_client";
-    $sql .= ", s.canvas";
+	$sql .= ", s.client";
+	$sql .= ", s.code_client";
+	$sql .= ", s.canvas";
 	$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";
@@ -199,7 +199,7 @@ if (!empty($conf->commande->enabled))
 	$resql = $db->query($sql);
 	if ($resql)
 	{
-        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="2">'.$langs->trans("DraftOrders").'</th></tr>';
@@ -212,8 +212,8 @@ if (!empty($conf->commande->enabled))
 			{
 				$obj = $db->fetch_object($resql);
 
-                $commandestatic->id = $obj->rowid;
-                $commandestatic->ref = $obj->ref;
+				$commandestatic->id = $obj->rowid;
+				$commandestatic->ref = $obj->ref;
 
 				$companystatic->id = $obj->socid;
 				$companystatic->name = $obj->name;
@@ -224,10 +224,10 @@ if (!empty($conf->commande->enabled))
 				print '<tr class="oddeven">';
 				print '<td class="nowrap">';
 				print $commandestatic->getNomUrl(1);
-                print "</td>";
-                print '<td class="nowrap">';
+				print "</td>";
+				print '<td class="nowrap">';
 				print $companystatic->getNomUrl(1, 'company', 16);
-                print '</td></tr>';
+				print '</td></tr>';
 				$i++;
 			}
 		} else {
@@ -266,7 +266,7 @@ $sql .= $db->plimit($max, 0);
 $resql = $db->query($sql);
 if ($resql)
 {
-    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="4">'.$langs->trans("LastModifiedOrders", $max).'</th></tr>';
@@ -310,8 +310,8 @@ if ($resql)
 			print '</td>';
 
 			print '<td class="nowrap">';
-            print $companystatic->getNomUrl(1, 'company', 16);
-            print '</td>';
+			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, 3).'</td>';
 			print '</tr>';
@@ -329,9 +329,9 @@ $max = 10;
 if (!empty($conf->commande->enabled))
 {
 	$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";
+	$sql .= ", s.client";
+	$sql .= ", s.code_client";
+	$sql .= ", s.canvas";
 	$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";
@@ -347,7 +347,7 @@ if (!empty($conf->commande->enabled))
 	{
 		$num = $db->num_rows($resql);
 
-        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="4">'.$langs->trans("OrdersToProcess").' <a href="'.DOL_URL_ROOT.'/commande/list.php?search_status='.Commande::STATUS_VALIDATED.'"><span class="badge">'.$num.'</span></a></th></tr>';
@@ -389,10 +389,10 @@ if (!empty($conf->commande->enabled))
 				print '</td>';
 
 				print '<td class="nowrap">';
-                print $companystatic->getNomUrl(1, 'company', 24);
-                print '</td>';
+				print $companystatic->getNomUrl(1, 'company', 24);
+				print '</td>';
 
-                print '<td class="right">'.dol_print_date($db->jdate($obj->date), 'day').'</td>'."\n";
+				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>';
 
@@ -414,9 +414,9 @@ if (!empty($conf->commande->enabled))
 if (!empty($conf->commande->enabled))
 {
 	$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";
+	$sql .= ", s.client";
+	$sql .= ", s.code_client";
+	$sql .= ", s.canvas";
 	$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";
@@ -432,7 +432,7 @@ if (!empty($conf->commande->enabled))
 	{
 		$num = $db->num_rows($resql);
 
-        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="4">'.$langs->trans("OnProcessOrders").' <a href="'.DOL_URL_ROOT.'/commande/list.php?search_status='.Commande::STATUS_ACCEPTED.'"><span class="badge">'.$num.'</span></a></th></tr>';
diff --git a/htdocs/commande/info.php b/htdocs/commande/info.php
index 9001a3ffb51..117afab2398 100644
--- a/htdocs/commande/info.php
+++ b/htdocs/commande/info.php
@@ -48,8 +48,8 @@ $result = restrictedArea($user, 'commande', $comid, '');
 $object = new Commande($db);
 if (!$object->fetch($id, $ref) > 0)
 {
-    dol_print_error($db);
-    exit;
+	dol_print_error($db);
+	exit;
 }
 
 
@@ -80,36 +80,36 @@ $morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->ge
 // Project
 if (!empty($conf->projet->enabled))
 {
-    $langs->load("projects");
-    $morehtmlref .= '<br>'.$langs->trans('Project').' ';
-    if ($user->rights->commande->creer)
-    {
-        if ($action != 'classify') {
-            //$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
-            $morehtmlref .= ' : ';
-        }
-        if ($action == 'classify') {
-            //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-            $morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-            $morehtmlref .= '<input type="hidden" name="action" value="classin">';
-            $morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
-            $morehtmlref .= $formproject->select_projects($object->thirdparty->id, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-            $morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-            $morehtmlref .= '</form>';
-        } else {
-            $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->thirdparty->id, $object->fk_project, 'none', 0, 0, 0, 1);
-        }
-    } else {
-        if (!empty($object->fk_project)) {
-            $proj = new Project($db);
-            $proj->fetch($object->fk_project);
-            $morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
-            $morehtmlref .= $proj->ref;
-            $morehtmlref .= '</a>';
-        } else {
-            $morehtmlref .= '';
-        }
-    }
+	$langs->load("projects");
+	$morehtmlref .= '<br>'.$langs->trans('Project').' ';
+	if ($user->rights->commande->creer)
+	{
+		if ($action != 'classify') {
+			//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+			$morehtmlref .= ' : ';
+		}
+		if ($action == 'classify') {
+			//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+			$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+			$morehtmlref .= '<input type="hidden" name="action" value="classin">';
+			$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
+			$morehtmlref .= $formproject->select_projects($object->thirdparty->id, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+			$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+			$morehtmlref .= '</form>';
+		} else {
+			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->thirdparty->id, $object->fk_project, 'none', 0, 0, 0, 1);
+		}
+	} else {
+		if (!empty($object->fk_project)) {
+			$proj = new Project($db);
+			$proj->fetch($object->fk_project);
+			$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
+			$morehtmlref .= $proj->ref;
+			$morehtmlref .= '</a>';
+		} else {
+			$morehtmlref .= '';
+		}
+	}
 }
 $morehtmlref .= '</div>';
 
@@ -127,7 +127,7 @@ print '</td></tr></table>';
 
 print '</div>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // End of page
 llxFooter();
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index cb9e06a5549..e9c379c9327 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -140,9 +140,9 @@ $checkedtypetiers = 0;
 $arrayfields = array(
 	'c.ref'=>array('label'=>"Ref", 'checked'=>1),
 	'c.ref_client'=>array('label'=>"RefCustomerOrder", 'checked'=>1),
-    'p.ref'=>array('label'=>"ProjectRef", 'checked'=>1, 'enabled'=>(empty($conf->projet->enabled) ? 0 : 1)),
-    'p.title'=>array('label'=>"ProjectLabel", 'checked'=>0, 'enabled'=>(empty($conf->projet->enabled) ? 0 : 1)),
-    's.nom'=>array('label'=>"ThirdParty", 'checked'=>1),
+	'p.ref'=>array('label'=>"ProjectRef", 'checked'=>1, 'enabled'=>(empty($conf->projet->enabled) ? 0 : 1)),
+	'p.title'=>array('label'=>"ProjectLabel", 'checked'=>0, 'enabled'=>(empty($conf->projet->enabled) ? 0 : 1)),
+	's.nom'=>array('label'=>"ThirdParty", 'checked'=>1),
 	's.town'=>array('label'=>"Town", 'checked'=>1),
 	's.zip'=>array('label'=>"Zip", 'checked'=>1),
 	'state.nom'=>array('label'=>"StateShort", 'checked'=>0),
@@ -161,7 +161,7 @@ $arrayfields = array(
 	'u.login'=>array('label'=>"Author", 'checked'=>1, 'position'=>10),
 	'c.datec'=>array('label'=>"DateCreation", 'checked'=>0, 'position'=>500),
 	'c.tms'=>array('label'=>"DateModificationShort", 'checked'=>0, 'position'=>500),
-    'c.date_cloture'=>array('label'=>"DateClosing", 'checked'=>0, 'position'=>500),
+	'c.date_cloture'=>array('label'=>"DateClosing", 'checked'=>0, 'position'=>500),
 	'c.note_public'=>array('label'=>'NotePublic', 'checked'=>0, 'position'=>510, 'enabled'=>(empty($conf->global->MAIN_LIST_ALLOW_PUBLIC_NOTES))),
 	'c.note_private'=>array('label'=>'NotePrivate', 'checked'=>0, 'position'=>511, 'enabled'=>(empty($conf->global->MAIN_LIST_ALLOW_PRIVATE_NOTES))),
 	'c.fk_statut'=>array('label'=>"Status", 'checked'=>1, 'position'=>1000),
@@ -488,7 +488,7 @@ if ($resql)
 		'generate_doc'=>$langs->trans("ReGeneratePDF"),
 		'builddoc'=>$langs->trans("PDFMerge"),
 		'cancelorders'=>$langs->trans("Cancel"),
-	    'presend'=>$langs->trans("SendByMail"),
+		'presend'=>$langs->trans("SendByMail"),
 	);
 	if ($user->rights->facture->creer) $arrayofmassactions['createbills'] = $langs->trans("CreateInvoiceForThisCustomer");
 	if ($user->rights->commande->supprimer) $arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
@@ -670,7 +670,7 @@ if ($resql)
 	// Project title
 	if (!empty($arrayfields['p.title']['checked']))
 	{
-	    print '<td class="liste_titre"><input type="text" class="flat" size="6" name="search_project" value="'.dol_escape_htmltag($search_project).'"></td>';
+		print '<td class="liste_titre"><input type="text" class="flat" size="6" name="search_project" value="'.dol_escape_htmltag($search_project).'"></td>';
 	}
 	// Thirpdarty
 	if (!empty($arrayfields['s.nom']['checked']))
@@ -923,13 +923,13 @@ if ($resql)
 		$text_warning = '';
 		$nbprod = 0;
 
-        $companystatic->id = $obj->socid;
+		$companystatic->id = $obj->socid;
 		$companystatic->code_client = $obj->code_client;
 		$companystatic->name = $obj->name;
 		$companystatic->client = $obj->client;
 		$companystatic->email = $obj->email;
 		if (!isset($getNomUrl_cache[$obj->socid])) {
-		    $getNomUrl_cache[$obj->socid] = $companystatic->getNomUrl(1, 'customer');
+			$getNomUrl_cache[$obj->socid] = $companystatic->getNomUrl(1, 'customer');
 		}
 
 		$generic_commande->id = $obj->rowid;
@@ -1087,7 +1087,7 @@ if ($resql)
 			print '<td class="nowrap">';
 			if ($obj->project_id > 0)
 			{
-			    print $projectstatic->getNomUrl(1);
+				print $projectstatic->getNomUrl(1);
 			}
 			print '</td>';
 			if (!$i) $totalarray['nbfield']++;
@@ -1096,13 +1096,13 @@ if ($resql)
 		// Project label
 		if (!empty($arrayfields['p.title']['checked']))
 		{
-		    print '<td class="nowrap">';
-		    if ($obj->project_id > 0)
-		    {
-		        print $projectstatic->title;
-		    }
-		    print '</td>';
-		    if (!$i) $totalarray['nbfield']++;
+			print '<td class="nowrap">';
+			if ($obj->project_id > 0)
+			{
+				print $projectstatic->title;
+			}
+			print '</td>';
+			if (!$i) $totalarray['nbfield']++;
 		}
 
 		// Third party
diff --git a/htdocs/commande/note.php b/htdocs/commande/note.php
index 9542e432d7e..0cf0da709da 100644
--- a/htdocs/commande/note.php
+++ b/htdocs/commande/note.php
@@ -93,36 +93,36 @@ if ($id > 0 || !empty($ref))
 	// Project
 	if (!empty($conf->projet->enabled))
 	{
-	    $langs->load("projects");
-	    $morehtmlref .= '<br>'.$langs->trans('Project').' ';
-	    if ($user->rights->commande->creer)
-	    {
-	        if ($action != 'classify') {
-	            //$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+		$langs->load("projects");
+		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
+		if ($user->rights->commande->creer)
+		{
+			if ($action != 'classify') {
+				//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
 				$morehtmlref .= ' : ';
-            }
-            if ($action == 'classify') {
-                //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-                $morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-                $morehtmlref .= '<input type="hidden" name="action" value="classin">';
-                $morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
-                $morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-                $morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-                $morehtmlref .= '</form>';
-            } else {
-                $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-            }
-	    } else {
-	        if (!empty($object->fk_project)) {
-	            $proj = new Project($db);
-	            $proj->fetch($object->fk_project);
-	            $morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
-	            $morehtmlref .= $proj->ref;
-	            $morehtmlref .= '</a>';
-	        } else {
-	            $morehtmlref .= '';
-	        }
-	    }
+			}
+			if ($action == 'classify') {
+				//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+				$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+				$morehtmlref .= '<input type="hidden" name="action" value="classin">';
+				$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
+				$morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+				$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+				$morehtmlref .= '</form>';
+			} else {
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+			}
+		} else {
+			if (!empty($object->fk_project)) {
+				$proj = new Project($db);
+				$proj->fetch($object->fk_project);
+				$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
+				$morehtmlref .= $proj->ref;
+				$morehtmlref .= '</a>';
+			} else {
+				$morehtmlref .= '';
+			}
+		}
 	}
 	$morehtmlref .= '</div>';
 
@@ -139,7 +139,7 @@ if ($id > 0 || !empty($ref))
 
 	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 }
 
 
diff --git a/htdocs/commande/stats/index.php b/htdocs/commande/stats/index.php
index 13657c61553..54846a32852 100644
--- a/htdocs/commande/stats/index.php
+++ b/htdocs/commande/stats/index.php
@@ -51,8 +51,8 @@ $socid = GETPOST('socid', 'int');
 // Security check
 if ($user->socid > 0)
 {
-    $action = '';
-    $socid = $user->socid;
+	$action = '';
+	$socid = $user->socid;
 }
 
 $nowyear = strftime("%Y", dol_now());
@@ -81,8 +81,8 @@ $dir = $conf->commande->dir_temp;
 if ($mode == 'supplier')
 {
 	$picto = 'supplier_order';
-    $title = $langs->trans("OrdersStatisticsSuppliers");
-    $dir = $conf->fournisseur->commande->dir_temp;
+	$title = $langs->trans("OrdersStatisticsSuppliers");
+	$dir = $conf->fournisseur->commande->dir_temp;
 }
 
 llxHeader('', $title);
@@ -111,38 +111,38 @@ $data = $stats->getNbByMonthWithPrevYear($endyear, $startyear);
 
 if (!$user->rights->societe->client->voir || $user->socid)
 {
-    $filenamenb = $dir.'/ordersnbinyear-'.$user->id.'-'.$year.'.png';
-    if ($mode == 'customer') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersnbinyear-'.$user->id.'-'.$year.'.png';
-    if ($mode == 'supplier') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersnbinyear-'.$user->id.'-'.$year.'.png';
+	$filenamenb = $dir.'/ordersnbinyear-'.$user->id.'-'.$year.'.png';
+	if ($mode == 'customer') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersnbinyear-'.$user->id.'-'.$year.'.png';
+	if ($mode == 'supplier') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersnbinyear-'.$user->id.'-'.$year.'.png';
 } else {
-    $filenamenb = $dir.'/ordersnbinyear-'.$year.'.png';
-    if ($mode == 'customer') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersnbinyear-'.$year.'.png';
-    if ($mode == 'supplier') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersnbinyear-'.$year.'.png';
+	$filenamenb = $dir.'/ordersnbinyear-'.$year.'.png';
+	if ($mode == 'customer') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersnbinyear-'.$year.'.png';
+	if ($mode == 'supplier') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersnbinyear-'.$year.'.png';
 }
 
 $px1 = new DolGraph();
 $mesg = $px1->isGraphKo();
 if (!$mesg)
 {
-    $px1->SetData($data);
-    $i = $startyear; $legend = array();
-    while ($i <= $endyear)
-    {
-        $legend[] = $i;
-        $i++;
-    }
-    $px1->SetLegend($legend);
-    $px1->SetMaxValue($px1->GetCeilMaxValue());
-    $px1->SetMinValue(min(0, $px1->GetFloorMinValue()));
-    $px1->SetWidth($WIDTH);
-    $px1->SetHeight($HEIGHT);
-    $px1->SetYLabel($langs->trans("NbOfOrder"));
-    $px1->SetShading(3);
-    $px1->SetHorizTickIncrement(1);
-    $px1->mode = 'depth';
-    $px1->SetTitle($langs->trans("NumberOfOrdersByMonth"));
+	$px1->SetData($data);
+	$i = $startyear; $legend = array();
+	while ($i <= $endyear)
+	{
+		$legend[] = $i;
+		$i++;
+	}
+	$px1->SetLegend($legend);
+	$px1->SetMaxValue($px1->GetCeilMaxValue());
+	$px1->SetMinValue(min(0, $px1->GetFloorMinValue()));
+	$px1->SetWidth($WIDTH);
+	$px1->SetHeight($HEIGHT);
+	$px1->SetYLabel($langs->trans("NbOfOrder"));
+	$px1->SetShading(3);
+	$px1->SetHorizTickIncrement(1);
+	$px1->mode = 'depth';
+	$px1->SetTitle($langs->trans("NumberOfOrdersByMonth"));
 
-    $px1->draw($filenamenb, $fileurlnb);
+	$px1->draw($filenamenb, $fileurlnb);
 }
 
 // Build graphic amount of object
@@ -152,38 +152,38 @@ $data = $stats->getAmountByMonthWithPrevYear($endyear, $startyear);
 
 if (!$user->rights->societe->client->voir || $user->socid)
 {
-    $filenameamount = $dir.'/ordersamountinyear-'.$user->id.'-'.$year.'.png';
-    if ($mode == 'customer') $fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersamountinyear-'.$user->id.'-'.$year.'.png';
-    if ($mode == 'supplier') $fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersamountinyear-'.$user->id.'-'.$year.'.png';
+	$filenameamount = $dir.'/ordersamountinyear-'.$user->id.'-'.$year.'.png';
+	if ($mode == 'customer') $fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersamountinyear-'.$user->id.'-'.$year.'.png';
+	if ($mode == 'supplier') $fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersamountinyear-'.$user->id.'-'.$year.'.png';
 } else {
-    $filenameamount = $dir.'/ordersamountinyear-'.$year.'.png';
-    if ($mode == 'customer') $fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersamountinyear-'.$year.'.png';
-    if ($mode == 'supplier') $fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersamountinyear-'.$year.'.png';
+	$filenameamount = $dir.'/ordersamountinyear-'.$year.'.png';
+	if ($mode == 'customer') $fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersamountinyear-'.$year.'.png';
+	if ($mode == 'supplier') $fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersamountinyear-'.$year.'.png';
 }
 
 $px2 = new DolGraph();
 $mesg = $px2->isGraphKo();
 if (!$mesg)
 {
-    $px2->SetData($data);
-    $i = $startyear; $legend = array();
-    while ($i <= $endyear)
-    {
-        $legend[] = $i;
-        $i++;
-    }
-    $px2->SetLegend($legend);
-    $px2->SetMaxValue($px2->GetCeilMaxValue());
-    $px2->SetMinValue(min(0, $px2->GetFloorMinValue()));
-    $px2->SetWidth($WIDTH);
-    $px2->SetHeight($HEIGHT);
-    $px2->SetYLabel($langs->trans("AmountOfOrders"));
-    $px2->SetShading(3);
-    $px2->SetHorizTickIncrement(1);
-    $px2->mode = 'depth';
-    $px2->SetTitle($langs->trans("AmountOfOrdersByMonthHT"));
+	$px2->SetData($data);
+	$i = $startyear; $legend = array();
+	while ($i <= $endyear)
+	{
+		$legend[] = $i;
+		$i++;
+	}
+	$px2->SetLegend($legend);
+	$px2->SetMaxValue($px2->GetCeilMaxValue());
+	$px2->SetMinValue(min(0, $px2->GetFloorMinValue()));
+	$px2->SetWidth($WIDTH);
+	$px2->SetHeight($HEIGHT);
+	$px2->SetYLabel($langs->trans("AmountOfOrders"));
+	$px2->SetShading(3);
+	$px2->SetHorizTickIncrement(1);
+	$px2->mode = 'depth';
+	$px2->SetTitle($langs->trans("AmountOfOrdersByMonthHT"));
 
-    $px2->draw($filenameamount, $fileurlamount);
+	$px2->draw($filenameamount, $fileurlamount);
 }
 
 
@@ -191,38 +191,38 @@ $data = $stats->getAverageByMonthWithPrevYear($endyear, $startyear);
 
 if (!$user->rights->societe->client->voir || $user->socid)
 {
-    $filename_avg = $dir.'/ordersaverage-'.$user->id.'-'.$year.'.png';
-    if ($mode == 'customer') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersaverage-'.$user->id.'-'.$year.'.png';
-    if ($mode == 'supplier') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersaverage-'.$user->id.'-'.$year.'.png';
+	$filename_avg = $dir.'/ordersaverage-'.$user->id.'-'.$year.'.png';
+	if ($mode == 'customer') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersaverage-'.$user->id.'-'.$year.'.png';
+	if ($mode == 'supplier') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersaverage-'.$user->id.'-'.$year.'.png';
 } else {
-    $filename_avg = $dir.'/ordersaverage-'.$year.'.png';
-    if ($mode == 'customer') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersaverage-'.$year.'.png';
-    if ($mode == 'supplier') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersaverage-'.$year.'.png';
+	$filename_avg = $dir.'/ordersaverage-'.$year.'.png';
+	if ($mode == 'customer') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersaverage-'.$year.'.png';
+	if ($mode == 'supplier') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersaverage-'.$year.'.png';
 }
 
 $px3 = new DolGraph();
 $mesg = $px3->isGraphKo();
 if (!$mesg)
 {
-    $px3->SetData($data);
-    $i = $startyear; $legend = array();
-    while ($i <= $endyear)
-    {
-        $legend[] = $i;
-        $i++;
-    }
-    $px3->SetLegend($legend);
-    $px3->SetYLabel($langs->trans("AmountAverage"));
-    $px3->SetMaxValue($px3->GetCeilMaxValue());
-    $px3->SetMinValue($px3->GetFloorMinValue());
-    $px3->SetWidth($WIDTH);
-    $px3->SetHeight($HEIGHT);
-    $px3->SetShading(3);
-    $px3->SetHorizTickIncrement(1);
-    $px3->mode = 'depth';
-    $px3->SetTitle($langs->trans("AmountAverage"));
+	$px3->SetData($data);
+	$i = $startyear; $legend = array();
+	while ($i <= $endyear)
+	{
+		$legend[] = $i;
+		$i++;
+	}
+	$px3->SetLegend($legend);
+	$px3->SetYLabel($langs->trans("AmountAverage"));
+	$px3->SetMaxValue($px3->GetCeilMaxValue());
+	$px3->SetMinValue($px3->GetFloorMinValue());
+	$px3->SetWidth($WIDTH);
+	$px3->SetHeight($HEIGHT);
+	$px3->SetShading(3);
+	$px3->SetHorizTickIncrement(1);
+	$px3->mode = 'depth';
+	$px3->SetTitle($langs->trans("AmountAverage"));
 
-    $px3->draw($filename_avg, $fileurl_avg);
+	$px3->draw($filename_avg, $fileurl_avg);
 }
 
 
@@ -277,13 +277,13 @@ print '</td></tr>';
 // Category
 if ($mode == 'customer')
 {
-    $cat_type = Categorie::TYPE_CUSTOMER;
-    $cat_label = $langs->trans("Category").' '.lcfirst($langs->trans("Customer"));
+	$cat_type = Categorie::TYPE_CUSTOMER;
+	$cat_label = $langs->trans("Category").' '.lcfirst($langs->trans("Customer"));
 }
 if ($mode == 'supplier')
 {
-    $cat_type = Categorie::TYPE_SUPPLIER;
-    $cat_label = $langs->trans("Supplier").' '.lcfirst($langs->trans("Customer"));
+	$cat_type = Categorie::TYPE_SUPPLIER;
+	$cat_label = $langs->trans("Supplier").' '.lcfirst($langs->trans("Customer"));
 }
 print '<tr><td>'.$cat_label.'</td><td>';
 print $formother->select_categories($cat_type, $categ_id, 'categ_id', true);
@@ -295,18 +295,18 @@ print $form->select_dolusers($userid, 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0
 print '<tr><td class="left">'.$langs->trans("Status").'</td><td class="left">';
 if ($mode == 'customer')
 {
-    $liststatus = array(
-        Commande::STATUS_DRAFT=>$langs->trans("StatusOrderDraft"),
-        Commande::STATUS_VALIDATED=>$langs->trans("StatusOrderValidated"),
-        Commande::STATUS_SHIPMENTONPROCESS=>$langs->trans("StatusOrderSent"),
-        Commande::STATUS_CLOSED=>$langs->trans("StatusOrderDelivered"),
-        Commande::STATUS_CANCELED=>$langs->trans("StatusOrderCanceled")
-    );
-    print $form->selectarray('object_status', $liststatus, GETPOST('object_status', 'int'), -4);
+	$liststatus = array(
+		Commande::STATUS_DRAFT=>$langs->trans("StatusOrderDraft"),
+		Commande::STATUS_VALIDATED=>$langs->trans("StatusOrderValidated"),
+		Commande::STATUS_SHIPMENTONPROCESS=>$langs->trans("StatusOrderSent"),
+		Commande::STATUS_CLOSED=>$langs->trans("StatusOrderDelivered"),
+		Commande::STATUS_CANCELED=>$langs->trans("StatusOrderCanceled")
+	);
+	print $form->selectarray('object_status', $liststatus, GETPOST('object_status', 'int'), -4);
 }
 if ($mode == 'supplier')
 {
-    $formorder->selectSupplierOrderStatus((strstr($object_status, ',') ?-1 : $object_status), 0, 'object_status');
+	$formorder->selectSupplierOrderStatus((strstr($object_status, ',') ?-1 : $object_status), 0, 'object_status');
 }
 print '</td></tr>';
 // Year
@@ -376,11 +376,11 @@ print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 // Show graphs
 print '<table class="border centpercent"><tr class="pair nohover"><td align="center">';
 if ($mesg) { print $mesg; } else {
-    print $px1->show();
-    print "<br>\n";
-    print $px2->show();
-    print "<br>\n";
-    print $px3->show();
+	print $px1->show();
+	print "<br>\n";
+	print $px2->show();
+	print "<br>\n";
+	print $px3->show();
 }
 print '</td></tr></table>';
 
@@ -388,7 +388,7 @@ print '</td></tr></table>';
 print '</div></div></div>';
 print '<div style="clear:both"></div>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // End of page
 llxFooter();
diff --git a/htdocs/commande/tpl/linkedobjectblock.tpl.php b/htdocs/commande/tpl/linkedobjectblock.tpl.php
index a593e10adf4..a9c01386bf7 100644
--- a/htdocs/commande/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/commande/tpl/linkedobjectblock.tpl.php
@@ -40,44 +40,44 @@ $total = 0;
 $ilink = 0;
 foreach ($linkedObjectBlock as $key => $objectlink)
 {
-    $ilink++;
+	$ilink++;
 
-    $trclass = 'oddeven';
-    if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass .= ' liste_sub_total';
-    echo '<tr class="'.$trclass.'" >';
-    echo '<td class="linkedcol-element" >'.$langs->trans("CustomerOrder");
-    if (!empty($showImportButton) && $conf->global->MAIN_ENABLE_IMPORT_LINKED_OBJECT_LINES) {
-        print '<a class="objectlinked_importbtn" href="'.$objectlink->getNomUrl(0, '', 0, 1).'&amp;action=selectlines" data-element="'.$objectlink->element.'" data-id="'.$objectlink->id.'"  > <i class="fa fa-indent"></i> </a';
-    }
-    echo '</td>';
-    echo '<td class="linkedcol-name nowraponall" >'.$objectlink->getNomUrl(1).'</td>';
-    echo '<td class="linkedcol-ref" align="center">'.$objectlink->ref_client.'</td>';
-    echo '<td class="linkedcol-date" align="center">'.dol_print_date($objectlink->date, 'day').'</td>';
-    echo '<td class="linkedcol-amount right">';
-    if ($user->rights->commande->lire) {
-        $total = $total + $objectlink->total_ht;
-        echo price($objectlink->total_ht);
-    }
-    echo '</td>';
-    echo '<td class="linkedcol-statut right">'.$objectlink->getLibStatut(3).'</td>';
-    echo '<td class="linkedcol-action right">';
-    // For now, shipments must stay linked to order, so link is not deletable
-    if ($object->element != 'shipping') {
-        echo '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key.'">'.img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink').'</a>';
-    }
-    echo '</td>';
-    echo "</tr>\n";
+	$trclass = 'oddeven';
+	if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass .= ' liste_sub_total';
+	echo '<tr class="'.$trclass.'" >';
+	echo '<td class="linkedcol-element" >'.$langs->trans("CustomerOrder");
+	if (!empty($showImportButton) && $conf->global->MAIN_ENABLE_IMPORT_LINKED_OBJECT_LINES) {
+		print '<a class="objectlinked_importbtn" href="'.$objectlink->getNomUrl(0, '', 0, 1).'&amp;action=selectlines" data-element="'.$objectlink->element.'" data-id="'.$objectlink->id.'"  > <i class="fa fa-indent"></i> </a';
+	}
+	echo '</td>';
+	echo '<td class="linkedcol-name nowraponall" >'.$objectlink->getNomUrl(1).'</td>';
+	echo '<td class="linkedcol-ref" align="center">'.$objectlink->ref_client.'</td>';
+	echo '<td class="linkedcol-date" align="center">'.dol_print_date($objectlink->date, 'day').'</td>';
+	echo '<td class="linkedcol-amount right">';
+	if ($user->rights->commande->lire) {
+		$total = $total + $objectlink->total_ht;
+		echo price($objectlink->total_ht);
+	}
+	echo '</td>';
+	echo '<td class="linkedcol-statut right">'.$objectlink->getLibStatut(3).'</td>';
+	echo '<td class="linkedcol-action right">';
+	// For now, shipments must stay linked to order, so link is not deletable
+	if ($object->element != 'shipping') {
+		echo '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key.'">'.img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink').'</a>';
+	}
+	echo '</td>';
+	echo "</tr>\n";
 }
 if (count($linkedObjectBlock) > 1) {
-    echo '<tr class="liste_total '.(empty($noMoreLinkedObjectBlockAfter) ? 'liste_sub_total' : '').'">';
-    echo '<td>'.$langs->trans("Total").'</td>';
-    echo '<td></td>';
-    echo '<td class="center"></td>';
-    echo '<td class="center"></td>';
-    echo '<td class="right">'.price($total).'</td>';
-    echo '<td class="right"></td>';
-    echo '<td class="right"></td>';
-    echo "</tr>\n";
+	echo '<tr class="liste_total '.(empty($noMoreLinkedObjectBlockAfter) ? 'liste_sub_total' : '').'">';
+	echo '<td>'.$langs->trans("Total").'</td>';
+	echo '<td></td>';
+	echo '<td class="center"></td>';
+	echo '<td class="center"></td>';
+	echo '<td class="right">'.price($total).'</td>';
+	echo '<td class="right"></td>';
+	echo '<td class="right"></td>';
+	echo "</tr>\n";
 }
 
 echo "<!-- END PHP TEMPLATE -->\n";
diff --git a/htdocs/compta/accounting-files.php b/htdocs/compta/accounting-files.php
index 221299fe8b7..ddc1beb1768 100644
--- a/htdocs/compta/accounting-files.php
+++ b/htdocs/compta/accounting-files.php
@@ -19,10 +19,10 @@
  */
 
  /**
- *  \file       htdocs/compta/accounting-files.php
- *  \ingroup    compta
- *  \brief      Page to show portoflio and files of a thirdparty and download it
- */
+  *  \file       htdocs/compta/accounting-files.php
+  *  \ingroup    compta
+  *  \brief      Page to show portoflio and files of a thirdparty and download it
+  */
 
 if ((array_key_exists('action', $_GET) && $_GET['action'] == 'dl') || (array_key_exists('action', $_POST) && $_POST['action'] == 'dl')) {	// To not replace token when downloading file
 	if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1');
@@ -79,8 +79,8 @@ if (!$sortorder) $sortorder = "DESC";
 
 
 $arrayfields = array(
-    'type'=>array('label'=>"Type", 'checked'=>1),
-    'date'=>array('label'=>"Date", 'checked'=>1),
+	'type'=>array('label'=>"Type", 'checked'=>1),
+	'date'=>array('label'=>"Date", 'checked'=>1),
 	'date_due'=>array('label'=>"DateDue", 'checked'=>1),
 	'ref'=>array('label'=>"Ref", 'checked'=>1),
 	'documents'=>array('label'=>"Documents", 'checked'=>1),
@@ -93,10 +93,10 @@ $arrayfields = array(
 
 // Security check
 if (empty($conf->comptabilite->enabled) && empty($conf->accounting->enabled)) {
-    accessforbidden();
+	accessforbidden();
 }
 if ($user->socid > 0) {
-    accessforbidden();
+	accessforbidden();
 }
 
 // Define $arrayofentities if multientity is set.
@@ -150,242 +150,242 @@ if (($action == 'searchfiles' || $action == 'dl')) {
 		if (GETPOST('selectinvoices')) {
 			if (!empty($sql)) $sql .= " UNION ALL";
 			$sql .= "SELECT t.rowid as id, t.entity, t.ref, t.paye as paid, t.total as total_ht, t.total_ttc, t.tva as total_vat, t.multicurrency_code as currency, t.fk_soc, t.datef as date, t.date_lim_reglement as date_due, 'Invoice' as item, s.nom as thirdparty_name, s.code_client as thirdparty_code, c.code as country_code, s.tva_intra as vatnum, ".PAY_CREDIT." as sens";
-		    $sql .= " FROM ".MAIN_DB_PREFIX."facture as t LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = t.fk_soc LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON c.rowid = s.fk_pays";
-		    $sql .= " WHERE datef between ".$wheretail;
-		    $sql .= " AND t.entity IN (".($entity == 1 ? '0,1' : $entity).')';
-		    $sql .= " AND t.fk_statut <> ".Facture::STATUS_DRAFT;
+			$sql .= " FROM ".MAIN_DB_PREFIX."facture as t LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = t.fk_soc LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON c.rowid = s.fk_pays";
+			$sql .= " WHERE datef between ".$wheretail;
+			$sql .= " AND t.entity IN (".($entity == 1 ? '0,1' : $entity).')';
+			$sql .= " AND t.fk_statut <> ".Facture::STATUS_DRAFT;
 		}
-	    // Vendor invoices
+		// Vendor invoices
 		if (GETPOST('selectsupplierinvoices')) {
 			if (!empty($sql)) $sql .= " UNION ALL";
 			$sql .= " SELECT t.rowid as id, t.entity, t.ref, t.paye as paid, t.total_ht, t.total_ttc, t.total_tva as total_vat, t.multicurrency_code as currency, t.fk_soc, t.datef as date, t.date_lim_reglement as date_due, 'SupplierInvoice' as item, s.nom as thirdparty_name, s.code_fournisseur as thirdparty_code, c.code as country_code, s.tva_intra as vatnum, ".PAY_DEBIT." as sens";
-		    $sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as t LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = t.fk_soc LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON c.rowid = s.fk_pays";
-		    $sql .= " WHERE datef between ".$wheretail;
-		    $sql .= " AND t.entity IN (".($entity == 1 ? '0,1' : $entity).')';
-		    $sql .= " AND t.fk_statut <> ".FactureFournisseur::STATUS_DRAFT;
+			$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as t LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = t.fk_soc LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON c.rowid = s.fk_pays";
+			$sql .= " WHERE datef between ".$wheretail;
+			$sql .= " AND t.entity IN (".($entity == 1 ? '0,1' : $entity).')';
+			$sql .= " AND t.fk_statut <> ".FactureFournisseur::STATUS_DRAFT;
 		}
-	    // Expense reports
+		// Expense reports
 		if (GETPOST('selectexpensereports')) {
 			if (!empty($sql)) $sql .= " UNION ALL";
 			$sql .= " SELECT t.rowid as id, t.entity, t.ref, t.paid, t.total_ht, t.total_ttc, t.total_tva as total_vat, t.multicurrency_code as currency, t.fk_user_author as fk_soc, t.date_fin as date, t.date_fin as date_due, 'ExpenseReport' as item, CONCAT(CONCAT(u.lastname, ' '), u.firstname) as thirdparty_name, '' as thirdparty_code, c.code as country_code, '' as vatnum, ".PAY_DEBIT." as sens";
-		    $sql .= " FROM ".MAIN_DB_PREFIX."expensereport as t LEFT JOIN ".MAIN_DB_PREFIX."user as u ON u.rowid = t.fk_user_author LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON c.rowid = u.fk_country";
-		    $sql .= " WHERE date_fin between  ".$wheretail;
-		    $sql .= " AND t.entity IN (".($entity == 1 ? '0,1' : $entity).')';
-		    $sql .= " AND t.fk_statut <> ".ExpenseReport::STATUS_DRAFT;
+			$sql .= " FROM ".MAIN_DB_PREFIX."expensereport as t LEFT JOIN ".MAIN_DB_PREFIX."user as u ON u.rowid = t.fk_user_author LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON c.rowid = u.fk_country";
+			$sql .= " WHERE date_fin between  ".$wheretail;
+			$sql .= " AND t.entity IN (".($entity == 1 ? '0,1' : $entity).')';
+			$sql .= " AND t.fk_statut <> ".ExpenseReport::STATUS_DRAFT;
 		}
-	    // Donations
+		// Donations
 		if (GETPOST('selectdonations')) {
 			if (!empty($sql)) $sql .= " UNION ALL";
 			$sql .= " SELECT t.rowid as id, t.entity, t.ref, paid, amount as total_ht, amount as total_ttc, 0 as total_vat, '".$db->escape($conf->currency)."' as currency, 0 as fk_soc, t.datedon as date, t.datedon as date_due, 'Donation' as item, t.societe as thirdparty_name, '' as thirdparty_code, c.code as country_code, '' as vatnum, ".PAY_CREDIT." as sens";
-		    $sql .= " FROM ".MAIN_DB_PREFIX."don as t LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON c.rowid = t.fk_country";
-		    $sql .= " WHERE datedon between ".$wheretail;
-		    $sql .= " AND t.entity IN (".($entity == 1 ? '0,1' : $entity).')';
-		    $sql .= " AND t.fk_statut <> ".Don::STATUS_DRAFT;
+			$sql .= " FROM ".MAIN_DB_PREFIX."don as t LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON c.rowid = t.fk_country";
+			$sql .= " WHERE datedon between ".$wheretail;
+			$sql .= " AND t.entity IN (".($entity == 1 ? '0,1' : $entity).')';
+			$sql .= " AND t.fk_statut <> ".Don::STATUS_DRAFT;
 		}
-	    // Payments of salaries
+		// Payments of salaries
 		if (GETPOST('selectpaymentsofsalaries')) {
 			if (!empty($sql)) $sql .= " UNION ALL";
 			$sql .= " SELECT t.rowid as id, t.entity, t.label as ref, 1 as paid, amount as total_ht, amount as total_ttc, 0 as total_vat, '".$db->escape($conf->currency)."' as currency, t.fk_user as fk_soc, t.datep as date, t.dateep as date_due, 'SalaryPayment' as item, CONCAT(CONCAT(u.lastname, ' '), u.firstname)  as thirdparty_name, '' as thirdparty_code, c.code as country_code, '' as vatnum, ".PAY_DEBIT." as sens";
-		    $sql .= " FROM ".MAIN_DB_PREFIX."payment_salary as t LEFT JOIN ".MAIN_DB_PREFIX."user as u ON u.rowid = t.fk_user LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON c.rowid = u.fk_country";
-		    $sql .= " WHERE datep between ".$wheretail;
-		    $sql .= " AND t.entity IN (".($entity == 1 ? '0,1' : $entity).')';
-		    //$sql.=" AND fk_statut <> ".PaymentSalary::STATUS_DRAFT;
+			$sql .= " FROM ".MAIN_DB_PREFIX."payment_salary as t LEFT JOIN ".MAIN_DB_PREFIX."user as u ON u.rowid = t.fk_user LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON c.rowid = u.fk_country";
+			$sql .= " WHERE datep between ".$wheretail;
+			$sql .= " AND t.entity IN (".($entity == 1 ? '0,1' : $entity).')';
+			//$sql.=" AND fk_statut <> ".PaymentSalary::STATUS_DRAFT;
 		}
-	    // Social contributions
+		// Social contributions
 		if (GETPOST('selectsocialcontributions')) {
 			if (!empty($sql)) $sql .= " UNION ALL";
 			$sql .= " SELECT t.rowid as id, t.entity, t.libelle as ref, t.paye as paid, t.amount as total_ht, t.amount as total_ttc, 0 as total_vat, '".$db->escape($conf->currency)."' as currency, 0 as fk_soc, t.date_ech as date, t.periode as date_due, 'SocialContributions' as item, '' as thirdparty_name, '' as thirdparty_code, '' as country_code, '' as vatnum, ".PAY_DEBIT." as sens";
-		    $sql .= " FROM ".MAIN_DB_PREFIX."chargesociales as t";
-		    $sql .= " WHERE t.date_ech between ".$wheretail;
-		    $sql .= " AND t.entity IN (".($entity == 1 ? '0,1' : $entity).')';
-		    //$sql.=" AND fk_statut <> ".ChargeSociales::STATUS_DRAFT;
+			$sql .= " FROM ".MAIN_DB_PREFIX."chargesociales as t";
+			$sql .= " WHERE t.date_ech between ".$wheretail;
+			$sql .= " AND t.entity IN (".($entity == 1 ? '0,1' : $entity).')';
+			//$sql.=" AND fk_statut <> ".ChargeSociales::STATUS_DRAFT;
 		}
-	    // Various payments
+		// Various payments
 		if (GETPOST('selectvariouspayment')) {
 			if (!empty($sql)) $sql .= " UNION ALL";
 			$sql .= " SELECT t.rowid as id, t.entity, t.ref, 1 as paid, t.amount as total_ht, t.amount as total_ttc, 0 as total_vat, '".$db->escape($conf->currency)."' as currency, 0 as fk_soc, t.datep as date, t.datep as date_due, 'VariousPayment' as item, '' as thirdparty_name, '' as thirdparty_code, '' as country_code, '' as vatnum, sens";
-		    $sql .= " FROM ".MAIN_DB_PREFIX."payment_various as t";
-		    $sql .= " WHERE datep between ".$wheretail;
-		    $sql .= " AND t.entity IN (".($entity == 1 ? '0,1' : $entity).')';
+			$sql .= " FROM ".MAIN_DB_PREFIX."payment_various as t";
+			$sql .= " WHERE datep between ".$wheretail;
+			$sql .= " AND t.entity IN (".($entity == 1 ? '0,1' : $entity).')';
 		}
-        // Loan payments
+		// Loan payments
 		if (GETPOST('selectloanspayment')) {
 			if (!empty($sql)) $sql .= " UNION ALL";
 			$sql .= " SELECT t.rowid as id, l.entity, l.label as ref, 1 as paid, (t.amount_capital+t.amount_insurance+t.amount_interest) as total_ht, (t.amount_capital+t.amount_insurance+t.amount_interest) as total_ttc, 0 as total_vat, '".$db->escape($conf->currency)."' as currency, 0 as fk_soc, t.datep as date, t.datep as date_due, 'LoanPayment' as item, '' as thirdparty_name, '' as thirdparty_code, '' as country_code, '' as vatnum, ".PAY_DEBIT." as sens";
-		    $sql .= " FROM ".MAIN_DB_PREFIX."payment_loan as t LEFT JOIN ".MAIN_DB_PREFIX."loan as l ON l.rowid = t.fk_loan";
-		    $sql .= " WHERE datep between ".$wheretail;
-		    $sql .= " AND l.entity IN (".($entity == 1 ? '0,1' : $entity).')';
+			$sql .= " FROM ".MAIN_DB_PREFIX."payment_loan as t LEFT JOIN ".MAIN_DB_PREFIX."loan as l ON l.rowid = t.fk_loan";
+			$sql .= " WHERE datep between ".$wheretail;
+			$sql .= " AND l.entity IN (".($entity == 1 ? '0,1' : $entity).')';
 		}
 
 		if ($sql) {
-		    $sql .= $db->order($sortfield, $sortorder);
+			$sql .= $db->order($sortfield, $sortorder);
 			//print $sql;
 
-		    $resd = $db->query($sql);
-		    $files = array();
-		    $link = '';
+			$resd = $db->query($sql);
+			$files = array();
+			$link = '';
 
-		    if ($resd)
-		    {
-		        $numd = $db->num_rows($resd);
+			if ($resd)
+			{
+				$numd = $db->num_rows($resd);
 
-		        $tmpinvoice = new Facture($db);
-		        $tmpinvoicesupplier = new FactureFournisseur($db);
-		        $tmpdonation = new Don($db);
+				$tmpinvoice = new Facture($db);
+				$tmpinvoicesupplier = new FactureFournisseur($db);
+				$tmpdonation = new Don($db);
 
-		        $upload_dir = '';
-		        $i = 0;
-		        while ($i < $numd)
-		        {
-		            $objd = $db->fetch_object($resd);
+				$upload_dir = '';
+				$i = 0;
+				while ($i < $numd)
+				{
+					$objd = $db->fetch_object($resd);
 
-		            switch ($objd->item)
-		            {
-		                case "Invoice":
-		                	$subdir = '';
-		                	$subdir .= ($subdir ? '/' : '').dol_sanitizeFileName($objd->ref);
-		                	$upload_dir = $conf->facture->dir_output.'/'.$subdir;
-		                	$link = "document.php?modulepart=facture&file=".str_replace('/', '%2F', $subdir).'%2F';
-                            $modulepart = "facture";
-		                	break;
-		                case "SupplierInvoice":
-		                	$tmpinvoicesupplier->fetch($objd->id);
-		                	$subdir = get_exdir($tmpinvoicesupplier->id, 2, 0, 1, $tmpinvoicesupplier, 'invoice_supplier'); // TODO Use first file
-		                	$subdir .= ($subdir ? '/' : '').dol_sanitizeFileName($objd->ref);
-		                	$upload_dir = $conf->fournisseur->facture->dir_output.'/'.$subdir;
-		                	$link = "document.php?modulepart=facture_fournisseur&file=".str_replace('/', '%2F', $subdir).'%2F';
-                            $modulepart = "facture_fournisseur";
-		                	break;
-		                case "ExpenseReport":
-		                	$subdir = '';
-		                	$subdir .= ($subdir ? '/' : '').dol_sanitizeFileName($objd->ref);
-		                	$upload_dir = $conf->expensereport->dir_output.'/'.$subdir;
-		                	$link = "document.php?modulepart=expensereport&file=".str_replace('/', '%2F', $subdir).'%2F';
-                            $modulepart = "expensereport";
-		                	break;
-		                case "SalaryPayment":
-		                	$subdir = '';
-		                	$subdir .= ($subdir ? '/' : '').dol_sanitizeFileName($objd->id);
-		                	$upload_dir = $conf->salaries->dir_output.'/'.$subdir;
-		                	$link = "document.php?modulepart=salaries&file=".str_replace('/', '%2F', $subdir).'%2F';
-                            $modulepart = "salaries";
-		                	break;
-		                case "Donation":
-		                	$tmpdonation->fetch($objp->id);
-		                	$subdir = get_exdir(0, 0, 0, 0, $tmpdonation, 'donation');
-		                	$subdir .= ($subdir ? '/' : '').dol_sanitizeFileName($objd->id);
-		                	$upload_dir = $conf->don->dir_output.'/'.$subdir;
-		                	$link = "document.php?modulepart=don&file=".str_replace('/', '%2F', $subdir).'%2F';
-                            $modulepart = "don";
-		                	break;
-		                case "SocialContributions":
-		                	$subdir = '';
-		                	$subdir .= ($subdir ? '/' : '').dol_sanitizeFileName($objd->id);
-		                	$upload_dir = $conf->tax->dir_output.'/'.$subdir;
-		                	$link = "document.php?modulepart=tax&file=".str_replace('/', '%2F', $subdir).'%2F';
-                            $modulepart = "tax";
-		                	break;
-		                case "VariousPayment":
-		                	$subdir = '';
-		                	$subdir .= ($subdir ? '/' : '').dol_sanitizeFileName($objd->id);
-		                	$upload_dir = $conf->bank->dir_output.'/'.$subdir;
-                            $link = "document.php?modulepart=banque&file=".str_replace('/', '%2F', $subdir).'%2F';
-                            $modulepart = "banque";
-		                	break;
-		                case "LoanPayment":
-                            // Loan payment has no linked file
-		                	$subdir = '';
-		                	$upload_dir = $conf->loan->dir_output.'/'.$subdir;
-                            $link = "";
-                            $modulepart = "";
-		                	break;
-		                default:
-		                    $subdir = '';
-		                    $upload_dir = '';
-		                    $link = '';
-		                    break;
-		            }
+					switch ($objd->item)
+					{
+						case "Invoice":
+							$subdir = '';
+							$subdir .= ($subdir ? '/' : '').dol_sanitizeFileName($objd->ref);
+							$upload_dir = $conf->facture->dir_output.'/'.$subdir;
+							$link = "document.php?modulepart=facture&file=".str_replace('/', '%2F', $subdir).'%2F';
+							$modulepart = "facture";
+							break;
+						case "SupplierInvoice":
+							$tmpinvoicesupplier->fetch($objd->id);
+							$subdir = get_exdir($tmpinvoicesupplier->id, 2, 0, 1, $tmpinvoicesupplier, 'invoice_supplier'); // TODO Use first file
+							$subdir .= ($subdir ? '/' : '').dol_sanitizeFileName($objd->ref);
+							$upload_dir = $conf->fournisseur->facture->dir_output.'/'.$subdir;
+							$link = "document.php?modulepart=facture_fournisseur&file=".str_replace('/', '%2F', $subdir).'%2F';
+							$modulepart = "facture_fournisseur";
+							break;
+						case "ExpenseReport":
+							$subdir = '';
+							$subdir .= ($subdir ? '/' : '').dol_sanitizeFileName($objd->ref);
+							$upload_dir = $conf->expensereport->dir_output.'/'.$subdir;
+							$link = "document.php?modulepart=expensereport&file=".str_replace('/', '%2F', $subdir).'%2F';
+							$modulepart = "expensereport";
+							break;
+						case "SalaryPayment":
+							$subdir = '';
+							$subdir .= ($subdir ? '/' : '').dol_sanitizeFileName($objd->id);
+							$upload_dir = $conf->salaries->dir_output.'/'.$subdir;
+							$link = "document.php?modulepart=salaries&file=".str_replace('/', '%2F', $subdir).'%2F';
+							$modulepart = "salaries";
+							break;
+						case "Donation":
+							$tmpdonation->fetch($objp->id);
+							$subdir = get_exdir(0, 0, 0, 0, $tmpdonation, 'donation');
+							$subdir .= ($subdir ? '/' : '').dol_sanitizeFileName($objd->id);
+							$upload_dir = $conf->don->dir_output.'/'.$subdir;
+							$link = "document.php?modulepart=don&file=".str_replace('/', '%2F', $subdir).'%2F';
+							$modulepart = "don";
+							break;
+						case "SocialContributions":
+							$subdir = '';
+							$subdir .= ($subdir ? '/' : '').dol_sanitizeFileName($objd->id);
+							$upload_dir = $conf->tax->dir_output.'/'.$subdir;
+							$link = "document.php?modulepart=tax&file=".str_replace('/', '%2F', $subdir).'%2F';
+							$modulepart = "tax";
+							break;
+						case "VariousPayment":
+							$subdir = '';
+							$subdir .= ($subdir ? '/' : '').dol_sanitizeFileName($objd->id);
+							$upload_dir = $conf->bank->dir_output.'/'.$subdir;
+							$link = "document.php?modulepart=banque&file=".str_replace('/', '%2F', $subdir).'%2F';
+							$modulepart = "banque";
+							break;
+						case "LoanPayment":
+							// Loan payment has no linked file
+							$subdir = '';
+							$upload_dir = $conf->loan->dir_output.'/'.$subdir;
+							$link = "";
+							$modulepart = "";
+							break;
+						default:
+							$subdir = '';
+							$upload_dir = '';
+							$link = '';
+							break;
+					}
 
-		            if (!empty($upload_dir))
-		            {
-		                $result = true;
+					if (!empty($upload_dir))
+					{
+						$result = true;
 
-		                $files = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', '', SORT_ASC, 1);
-		                //var_dump($upload_dir);
-		                //var_dump($files);
-		                if (count($files) < 1)
-		                {
-		                	$nofile = array();
-		                	$nofile['id'] = $objd->id;
-		                	$nofile['entity'] = $objd->entity;
-		                	$nofile['date'] = $db->idate($objd->date);
-		                	$nofile['date_due'] = $db->idate($objd->date_due);
-		                	$nofile['paid'] = $objd->paid;
-		                    $nofile['amount_ht'] = $objd->total_ht;
-		                    $nofile['amount_ttc'] = $objd->total_ttc;
-		                    $nofile['amount_vat'] = $objd->total_vat;
-		                    $nofile['ref'] = ($objd->ref ? $objd->ref : $objd->id);
-		                    $nofile['fk'] = $objd->fk_soc;
-		                    $nofile['item'] = $objd->item;
-		                    $nofile['thirdparty_name'] = $objd->thirdparty_name;
-		                    $nofile['thirdparty_code'] = $objd->thirdparty_code;
-		                    $nofile['country_code'] = $objd->country_code;
-		                    $nofile['vatnum'] = $objd->vatnum;
-		                    $nofile['sens'] = $objd->sens;
+						$files = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', '', SORT_ASC, 1);
+						//var_dump($upload_dir);
+						//var_dump($files);
+						if (count($files) < 1)
+						{
+							$nofile = array();
+							$nofile['id'] = $objd->id;
+							$nofile['entity'] = $objd->entity;
+							$nofile['date'] = $db->idate($objd->date);
+							$nofile['date_due'] = $db->idate($objd->date_due);
+							$nofile['paid'] = $objd->paid;
+							$nofile['amount_ht'] = $objd->total_ht;
+							$nofile['amount_ttc'] = $objd->total_ttc;
+							$nofile['amount_vat'] = $objd->total_vat;
+							$nofile['ref'] = ($objd->ref ? $objd->ref : $objd->id);
+							$nofile['fk'] = $objd->fk_soc;
+							$nofile['item'] = $objd->item;
+							$nofile['thirdparty_name'] = $objd->thirdparty_name;
+							$nofile['thirdparty_code'] = $objd->thirdparty_code;
+							$nofile['country_code'] = $objd->country_code;
+							$nofile['vatnum'] = $objd->vatnum;
+							$nofile['sens'] = $objd->sens;
 
-		                    $filesarray[$nofile['item'].'_'.$nofile['id']] = $nofile;
-		                } else {
-		                    foreach ($files as $key => $file)
-		                    {
-		                    	$file['id'] = $objd->id;
-		                    	$file['entity'] = $objd->entity;
-		                    	$file['date'] = $db->idate($objd->date);
-		                    	$file['date_due'] = $db->idate($objd->date_due);
-		                    	$file['paid'] = $objd->paid;
-		                        $file['amount_ht'] = $objd->total_ht;
-		                        $file['amount_ttc'] = $objd->total_ttc;
-		                        $file['amount_vat'] = $objd->total_vat;
-		                        $file['ref'] = ($objd->ref ? $objd->ref : $objd->id);
-		                        $file['fk'] = $objd->fk_soc;
-		                        $file['item'] = $objd->item;
-		                        $file['thirdparty_name'] = $objd->thirdparty_name;
-		                        $file['thirdparty_code'] = $objd->thirdparty_code;
-		                        $file['country_code'] = $objd->country_code;
-		                        $file['vatnum'] = $objd->vatnum;
-                                $file['sens'] = $objd->sens;
+							$filesarray[$nofile['item'].'_'.$nofile['id']] = $nofile;
+						} else {
+							foreach ($files as $key => $file)
+							{
+								$file['id'] = $objd->id;
+								$file['entity'] = $objd->entity;
+								$file['date'] = $db->idate($objd->date);
+								$file['date_due'] = $db->idate($objd->date_due);
+								$file['paid'] = $objd->paid;
+								$file['amount_ht'] = $objd->total_ht;
+								$file['amount_ttc'] = $objd->total_ttc;
+								$file['amount_vat'] = $objd->total_vat;
+								$file['ref'] = ($objd->ref ? $objd->ref : $objd->id);
+								$file['fk'] = $objd->fk_soc;
+								$file['item'] = $objd->item;
+								$file['thirdparty_name'] = $objd->thirdparty_name;
+								$file['thirdparty_code'] = $objd->thirdparty_code;
+								$file['country_code'] = $objd->country_code;
+								$file['vatnum'] = $objd->vatnum;
+								$file['sens'] = $objd->sens;
 
-		                        // Save record into array (only the first time it is found)
-		                        if (empty($filesarray[$file['item'].'_'.$file['id']])) {
-		                        	$filesarray[$file['item'].'_'.$file['id']] = $file;
-		                        }
+								// Save record into array (only the first time it is found)
+								if (empty($filesarray[$file['item'].'_'.$file['id']])) {
+									$filesarray[$file['item'].'_'.$file['id']] = $file;
+								}
 
-		                        // Add or concat file
-		                        if (empty($filesarray[$file['item'].'_'.$file['id']]['files'])) {
-		                        	$filesarray[$file['item'].'_'.$file['id']]['files'] = array();
-		                        }
-                                $filesarray[$file['item'].'_'.$file['id']]['files'][] = array(
-                                    'link' => $link.urlencode($file['name']),
-                                    'name'=>$file['name'],
-                                    'ref'=>$file['ref'],
-                                    'fullname' => $file['fullname'],
-                                    'relpath' => '/'.$file['name'],
-                                    'relpathnamelang' => $langs->trans($file['item']).'/'.$file['name'],
-                                    'modulepart' => $modulepart,
-                                    'subdir' => $subdir,
-                                );
-		                        //var_dump($file['item'].'_'.$file['id']);
-		                        //var_dump($filesarray[$file['item'].'_'.$file['id']]['files']);
-		                    }
-		                }
-		            }
+								// Add or concat file
+								if (empty($filesarray[$file['item'].'_'.$file['id']]['files'])) {
+									$filesarray[$file['item'].'_'.$file['id']]['files'] = array();
+								}
+								$filesarray[$file['item'].'_'.$file['id']]['files'][] = array(
+									'link' => $link.urlencode($file['name']),
+									'name'=>$file['name'],
+									'ref'=>$file['ref'],
+									'fullname' => $file['fullname'],
+									'relpath' => '/'.$file['name'],
+									'relpathnamelang' => $langs->trans($file['item']).'/'.$file['name'],
+									'modulepart' => $modulepart,
+									'subdir' => $subdir,
+								);
+								//var_dump($file['item'].'_'.$file['id']);
+								//var_dump($filesarray[$file['item'].'_'.$file['id']]['files']);
+							}
+						}
+					}
 
-		            $i++;
-		        }
-		    } else {
-		        dol_print_error($db);
-		    }
+					$i++;
+				}
+			} else {
+				dol_print_error($db);
+			}
 
-		    $db->free($resd);
+			$db->free($resd);
 		} else {
 			setEventMessages($langs->trans("ErrorSelectAtLeastOne"), null, 'errors');
 			$error++;
@@ -414,81 +414,81 @@ if ($result && $action == "dl" && !$error)
 		exit;
 	}
 
-    dol_mkdir($dirfortmpfile);
+	dol_mkdir($dirfortmpfile);
 
-    $log = $langs->transnoentitiesnoconv("Type");
-    if (!empty($conf->multicompany->enabled) && is_object($mc))
-    {
-    	$log .= ','.$langs->transnoentitiesnoconv("Entity");
-    }
-    $log .= ','.$langs->transnoentitiesnoconv("Date");
-    $log .= ','.$langs->transnoentitiesnoconv("DateDue");
-    $log .= ','.$langs->transnoentitiesnoconv("Ref");
-    $log .= ','.$langs->transnoentitiesnoconv("TotalHT");
-    $log .= ','.$langs->transnoentitiesnoconv("TotalTTC");
-    $log .= ','.$langs->transnoentitiesnoconv("TotalVAT");
-    $log .= ','.$langs->transnoentitiesnoconv("Paid");
-    $log .= ','.$langs->transnoentitiesnoconv("Document");
-    $log .= ','.$langs->transnoentitiesnoconv("ItemID");
-    $log .= ','.$langs->transnoentitiesnoconv("ThirdParty");
-    $log .= ','.$langs->transnoentitiesnoconv("Code");
-    $log .= ','.$langs->transnoentitiesnoconv("Country");
-    $log .= ','.$langs->transnoentitiesnoconv("VATIntra");
-    $log .= ','.$langs->transnoentitiesnoconv("Sens")."\n";
-    $zipname = $dirfortmpfile.'/'.dol_print_date($date_start, 'dayrfc')."-".dol_print_date($date_stop, 'dayrfc').'_export.zip';
+	$log = $langs->transnoentitiesnoconv("Type");
+	if (!empty($conf->multicompany->enabled) && is_object($mc))
+	{
+		$log .= ','.$langs->transnoentitiesnoconv("Entity");
+	}
+	$log .= ','.$langs->transnoentitiesnoconv("Date");
+	$log .= ','.$langs->transnoentitiesnoconv("DateDue");
+	$log .= ','.$langs->transnoentitiesnoconv("Ref");
+	$log .= ','.$langs->transnoentitiesnoconv("TotalHT");
+	$log .= ','.$langs->transnoentitiesnoconv("TotalTTC");
+	$log .= ','.$langs->transnoentitiesnoconv("TotalVAT");
+	$log .= ','.$langs->transnoentitiesnoconv("Paid");
+	$log .= ','.$langs->transnoentitiesnoconv("Document");
+	$log .= ','.$langs->transnoentitiesnoconv("ItemID");
+	$log .= ','.$langs->transnoentitiesnoconv("ThirdParty");
+	$log .= ','.$langs->transnoentitiesnoconv("Code");
+	$log .= ','.$langs->transnoentitiesnoconv("Country");
+	$log .= ','.$langs->transnoentitiesnoconv("VATIntra");
+	$log .= ','.$langs->transnoentitiesnoconv("Sens")."\n";
+	$zipname = $dirfortmpfile.'/'.dol_print_date($date_start, 'dayrfc')."-".dol_print_date($date_stop, 'dayrfc').'_export.zip';
 
-    dol_delete_file($zipname);
+	dol_delete_file($zipname);
 
-    $zip = new ZipArchive;
-    $res = $zip->open($zipname, ZipArchive::OVERWRITE | ZipArchive::CREATE);
-    if ($res)
-    {
-        foreach ($filesarray as $key => $file)
-        {
-            if (!empty($file['files'])) {
-                foreach ($file['files'] as $filecursor) {
-                    if (file_exists($filecursor["fullname"])) {
-                        $zip->addFile($filecursor["fullname"], $filecursor["relpathnamelang"]);
-                    }
-                }
-            }
+	$zip = new ZipArchive;
+	$res = $zip->open($zipname, ZipArchive::OVERWRITE | ZipArchive::CREATE);
+	if ($res)
+	{
+		foreach ($filesarray as $key => $file)
+		{
+			if (!empty($file['files'])) {
+				foreach ($file['files'] as $filecursor) {
+					if (file_exists($filecursor["fullname"])) {
+						$zip->addFile($filecursor["fullname"], $filecursor["relpathnamelang"]);
+					}
+				}
+			}
 
-            $log .= '"'.$langs->trans($file['item']).'"';
-            if (!empty($conf->multicompany->enabled) && is_object($mc))
-            {
-            	$log .= ',"'.(empty($arrayofentities[$file['entity']]) ? $file['entity'] : $arrayofentities[$file['entity']]).'"';
-            }
-            $log .= ','.dol_print_date($file['date'], 'dayrfc');
-            $log .= ','.dol_print_date($file['date_due'], 'dayrfc');
-            $log .= ',"'.$file['ref'].'"';
-            $log .= ','.$file['amount_ht'];
-            $log .= ','.$file['amount_ttc'];
-            $log .= ','.$file['amount_vat'];
-            $log .= ','.$file['paid'];
-            $log .= ',"'.$file["name"].'"';
-            $log .= ','.$file['fk'];
-            $log .= ',"'.$file['thirdparty_name'].'"';
-            $log .= ',"'.$file['thirdparty_code'].'"';
-            $log .= ',"'.$file['country_code'].'"';
-            $log .= ',"'.$file['vatnum'].'"';
-            $log .= ',"'.$file['sens'].'"';
-            $log .= "\n";
-        }
-        $zip->addFromString('transactions.csv', $log);
-        $zip->close();
+			$log .= '"'.$langs->trans($file['item']).'"';
+			if (!empty($conf->multicompany->enabled) && is_object($mc))
+			{
+				$log .= ',"'.(empty($arrayofentities[$file['entity']]) ? $file['entity'] : $arrayofentities[$file['entity']]).'"';
+			}
+			$log .= ','.dol_print_date($file['date'], 'dayrfc');
+			$log .= ','.dol_print_date($file['date_due'], 'dayrfc');
+			$log .= ',"'.$file['ref'].'"';
+			$log .= ','.$file['amount_ht'];
+			$log .= ','.$file['amount_ttc'];
+			$log .= ','.$file['amount_vat'];
+			$log .= ','.$file['paid'];
+			$log .= ',"'.$file["name"].'"';
+			$log .= ','.$file['fk'];
+			$log .= ',"'.$file['thirdparty_name'].'"';
+			$log .= ',"'.$file['thirdparty_code'].'"';
+			$log .= ',"'.$file['country_code'].'"';
+			$log .= ',"'.$file['vatnum'].'"';
+			$log .= ',"'.$file['sens'].'"';
+			$log .= "\n";
+		}
+		$zip->addFromString('transactions.csv', $log);
+		$zip->close();
 
-        ///Then download the zipped file.
-        header('Content-Type: application/zip');
-        header('Content-disposition: attachment; filename='.basename($zipname));
-        header('Content-Length: '.filesize($zipname));
-        readfile($zipname);
+		///Then download the zipped file.
+		header('Content-Type: application/zip');
+		header('Content-disposition: attachment; filename='.basename($zipname));
+		header('Content-Length: '.filesize($zipname));
+		readfile($zipname);
 
-        dol_delete_file($zipname);
+		dol_delete_file($zipname);
 
-        exit();
-    } else {
-    	setEventMessages($langs->trans("FailedToOpenFile", $zipname), null, 'errors');
-    }
+		exit();
+	} else {
+		setEventMessages($langs->trans("FailedToOpenFile", $zipname), null, 'errors');
+	}
 }
 
 
@@ -567,226 +567,226 @@ print '<input class="button" type="submit" name="search" value="'.$langs->trans(
 
 print '</form>'."\n";
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 if (!empty($date_start) && !empty($date_stop))
 {
-    $param = 'action=searchfiles';
-    $param .= '&date_startday='.GETPOST('date_startday', 'int');
-    $param .= '&date_startmonth='.GETPOST('date_startmonth', 'int');
-    $param .= '&date_startyear='.GETPOST('date_startyear', 'int');
-    $param .= '&date_stopday='.GETPOST('date_stopday', 'int');
-    $param .= '&date_stopmonth='.GETPOST('date_stopmonth', 'int');
-    $param .= '&date_stopyear='.GETPOST('date_stopyear', 'int');
-    foreach ($listofchoices as $choice => $val) {
-    	$param .= '&'.$choice.'='.(GETPOST($choice, 'int') ? 1 : 0);
-    }
-    print '<form name="dl" action="'.$_SERVER["PHP_SELF"].'?action=dl" method="POST">'."\n";
-    print '<input type="hidden" name="token" value="'.currentToken().'">';
+	$param = 'action=searchfiles';
+	$param .= '&date_startday='.GETPOST('date_startday', 'int');
+	$param .= '&date_startmonth='.GETPOST('date_startmonth', 'int');
+	$param .= '&date_startyear='.GETPOST('date_startyear', 'int');
+	$param .= '&date_stopday='.GETPOST('date_stopday', 'int');
+	$param .= '&date_stopmonth='.GETPOST('date_stopmonth', 'int');
+	$param .= '&date_stopyear='.GETPOST('date_stopyear', 'int');
+	foreach ($listofchoices as $choice => $val) {
+		$param .= '&'.$choice.'='.(GETPOST($choice, 'int') ? 1 : 0);
+	}
+	print '<form name="dl" action="'.$_SERVER["PHP_SELF"].'?action=dl" method="POST">'."\n";
+	print '<input type="hidden" name="token" value="'.currentToken().'">';
 
-    echo dol_print_date($date_start, 'day')." - ".dol_print_date($date_stop, 'day');
+	echo dol_print_date($date_start, 'day')." - ".dol_print_date($date_stop, 'day');
 
-    print '<input type="hidden" name="date_start" value="'.dol_print_date($date_start, 'dayxcard').'" />';
-    print '<input type="hidden" name="date_stop"  value="'.dol_print_date($date_stop, 'dayxcard').'" />';
-    foreach ($listofchoices as $choice => $val) {
-    	print '<input type="hidden" name="'.$choice.'" value="'.GETPOST($choice).'">';
-    }
+	print '<input type="hidden" name="date_start" value="'.dol_print_date($date_start, 'dayxcard').'" />';
+	print '<input type="hidden" name="date_stop"  value="'.dol_print_date($date_stop, 'dayxcard').'" />';
+	foreach ($listofchoices as $choice => $val) {
+		print '<input type="hidden" name="'.$choice.'" value="'.GETPOST($choice).'">';
+	}
 
-    print '<input class="butAction butDownload" type="submit" value="'.$langs->trans("Download").'" />';
-    print '</form>'."\n";
+	print '<input class="butAction butDownload" type="submit" value="'.$langs->trans("Download").'" />';
+	print '</form>'."\n";
 
-    print '<br>';
+	print '<br>';
 
-    print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
-    print '<table class="noborder centpercent">';
-    print '<tr class="liste_titre">';
-    print_liste_field_titre($arrayfields['type']['label'], $_SERVER["PHP_SELF"], "item", "", $param, '', $sortfield, $sortorder, 'nowrap ');
-    print_liste_field_titre($arrayfields['date']['label'], $_SERVER["PHP_SELF"], "date", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
-    print_liste_field_titre($arrayfields['date_due']['label'], $_SERVER["PHP_SELF"], "date_due", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
-    print_liste_field_titre($arrayfields['ref']['label'], $_SERVER["PHP_SELF"], "", "", $param, '', $sortfield, $sortorder, 'nowraponall ');
-    print '<td>'.$langs->trans("Document").'</td>';
-    print '<td>'.$langs->trans("Paid").'</td>';
-    print '<td align="right">'.$langs->trans("TotalHT").($conf->multicurrency->enabled ? ' ('.$conf->currency.')' : '').'</td>';
-    print '<td align="right">'.$langs->trans("TotalTTC").($conf->multicurrency->enabled ? ' ('.$conf->currency.')' : '').'</td>';
-    print '<td align="right">'.$langs->trans("TotalVAT").($conf->multicurrency->enabled ? ' ('.$conf->currency.')' : '').'</td>';
+	print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+	print '<table class="noborder centpercent">';
+	print '<tr class="liste_titre">';
+	print_liste_field_titre($arrayfields['type']['label'], $_SERVER["PHP_SELF"], "item", "", $param, '', $sortfield, $sortorder, 'nowrap ');
+	print_liste_field_titre($arrayfields['date']['label'], $_SERVER["PHP_SELF"], "date", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+	print_liste_field_titre($arrayfields['date_due']['label'], $_SERVER["PHP_SELF"], "date_due", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+	print_liste_field_titre($arrayfields['ref']['label'], $_SERVER["PHP_SELF"], "", "", $param, '', $sortfield, $sortorder, 'nowraponall ');
+	print '<td>'.$langs->trans("Document").'</td>';
+	print '<td>'.$langs->trans("Paid").'</td>';
+	print '<td align="right">'.$langs->trans("TotalHT").($conf->multicurrency->enabled ? ' ('.$conf->currency.')' : '').'</td>';
+	print '<td align="right">'.$langs->trans("TotalTTC").($conf->multicurrency->enabled ? ' ('.$conf->currency.')' : '').'</td>';
+	print '<td align="right">'.$langs->trans("TotalVAT").($conf->multicurrency->enabled ? ' ('.$conf->currency.')' : '').'</td>';
 	print '<td>'.$langs->trans("ThirdParty").'</td>';
 	print '<td class="center">'.$langs->trans("Code").'</td>';
 	print '<td class="center">'.$langs->trans("Country").'</td>';
-    print '<td class="center">'.$langs->trans("VATIntra").'</td>';
-    if ($conf->multicurrency->enabled) print '<td class="center">'.$langs->trans("Currency").'</td>';
-    print '</tr>';
-    if ($result)
-    {
-        $TData = dol_sort_array($filesarray, $sortfield, $sortorder);
+	print '<td class="center">'.$langs->trans("VATIntra").'</td>';
+	if ($conf->multicurrency->enabled) print '<td class="center">'.$langs->trans("Currency").'</td>';
+	print '</tr>';
+	if ($result)
+	{
+		$TData = dol_sort_array($filesarray, $sortfield, $sortorder);
 
-        if (empty($TData))
-        {
-            print '<tr class="oddeven"><td colspan="7">'.$langs->trans("NoItem").'</td>';
-            if (! empty($conf->multicurrency->enabled)) {
-            	print '<td></td>';
-            }
-            print '</tr>';
-        } else {
-            // Sort array by date ASC to calculate balance
+		if (empty($TData))
+		{
+			print '<tr class="oddeven"><td colspan="7">'.$langs->trans("NoItem").'</td>';
+			if (!empty($conf->multicurrency->enabled)) {
+				print '<td></td>';
+			}
+			print '</tr>';
+		} else {
+			// Sort array by date ASC to calculate balance
 
-            $totalET_debit = 0;
-            $totalIT_debit = 0;
-            $totalVAT_debit = 0;
-            $totalET_credit = 0;
-            $totalIT_credit = 0;
-            $totalVAT_credit = 0;
+			$totalET_debit = 0;
+			$totalIT_debit = 0;
+			$totalVAT_debit = 0;
+			$totalET_credit = 0;
+			$totalIT_credit = 0;
+			$totalVAT_credit = 0;
 
-            // Display array
-            foreach ($TData as $data)
-            {
-                $html_class = '';
-                //if (!empty($data['fk_facture'])) $html_class = 'facid-'.$data['fk_facture'];
-                //elseif (!empty($data['fk_paiement'])) $html_class = 'payid-'.$data['fk_paiement'];
-                print '<tr class="oddeven '.$html_class.'">';
+			// Display array
+			foreach ($TData as $data)
+			{
+				$html_class = '';
+				//if (!empty($data['fk_facture'])) $html_class = 'facid-'.$data['fk_facture'];
+				//elseif (!empty($data['fk_paiement'])) $html_class = 'payid-'.$data['fk_paiement'];
+				print '<tr class="oddeven '.$html_class.'">';
 
-                // Type
-                print '<td>'.$langs->trans($data['item']).'</td>';
+				// Type
+				print '<td>'.$langs->trans($data['item']).'</td>';
 
-                // Date
-                print '<td class="center">';
-                print dol_print_date($data['date'], 'day');
-                print "</td>\n";
+				// Date
+				print '<td class="center">';
+				print dol_print_date($data['date'], 'day');
+				print "</td>\n";
 
-                // Date due
-                print '<td class="center">';
-                print dol_print_date($data['date_due'], 'day');
-                print "</td>\n";
+				// Date due
+				print '<td class="center">';
+				print dol_print_date($data['date_due'], 'day');
+				print "</td>\n";
 
-                // Ref
-                print '<td class="nowraponall">';
+				// Ref
+				print '<td class="nowraponall">';
 
 				if ($data['item'] == 'Invoice') {
 					$invoice->id = $data['id'];
-                	$invoice->ref = $data['ref'];
-                	$invoice->total_ht = $data['amount_ht'];
-                	$invoice->total_ttc = $data['amount_ttc'];
-                	$invoice->total_tva = $data['amount_vat'];
-                	$invoice->multicurrency_code = $data['currency'];
-                	print $invoice->getNomUrl(1, '', 0, 0, '', 0, 0, 0);
+					$invoice->ref = $data['ref'];
+					$invoice->total_ht = $data['amount_ht'];
+					$invoice->total_ttc = $data['amount_ttc'];
+					$invoice->total_tva = $data['amount_vat'];
+					$invoice->multicurrency_code = $data['currency'];
+					print $invoice->getNomUrl(1, '', 0, 0, '', 0, 0, 0);
 				} elseif ($data['item'] == 'SupplierInvoice') {
-                	$supplier_invoice->id = $data['id'];
-                	$supplier_invoice->ref = $data['ref'];
-                	$supplier_invoice->total_ht = $data['amount_ht'];
-                	$supplier_invoice->total_ttc = $data['amount_ttc'];
-                	$supplier_invoice->total_tva = $data['amount_vat'];
-                	$supplier_invoice->multicurrency_code = $data['currency'];
-                	print $supplier_invoice->getNomUrl(1, '', 0, 0, '', 0, 0, 0);
+					$supplier_invoice->id = $data['id'];
+					$supplier_invoice->ref = $data['ref'];
+					$supplier_invoice->total_ht = $data['amount_ht'];
+					$supplier_invoice->total_ttc = $data['amount_ttc'];
+					$supplier_invoice->total_tva = $data['amount_vat'];
+					$supplier_invoice->multicurrency_code = $data['currency'];
+					print $supplier_invoice->getNomUrl(1, '', 0, 0, '', 0, 0, 0);
 				} elseif ($data['item'] == 'ExpenseReport') {
-                    $expensereport->id = $data['id'];
-                	$expensereport->ref = $data['ref'];
-                	print $expensereport->getNomUrl(1, 0, 0, '', 0, 0);
+					$expensereport->id = $data['id'];
+					$expensereport->ref = $data['ref'];
+					print $expensereport->getNomUrl(1, 0, 0, '', 0, 0);
 				} elseif ($data['item'] == 'SalaryPayment') {
-                    $salary_payment->id = $data['id'];
-                	$salary_payment->ref = $data['ref'];
-                	print $salary_payment->getNomUrl(1, '', 0, '', 0);
+					$salary_payment->id = $data['id'];
+					$salary_payment->ref = $data['ref'];
+					print $salary_payment->getNomUrl(1, '', 0, '', 0);
 				} elseif ($data['item'] == 'Donation') {
-                    $don->id = $data['id'];
-                	$don->ref = $data['ref'];
-                	print $don->getNomUrl(1, 0, '', 0);
+					$don->id = $data['id'];
+					$don->ref = $data['ref'];
+					print $don->getNomUrl(1, 0, '', 0);
 				} elseif ($data['item'] == 'SocialContributions') {
-                    $charge_sociales->id = $data['id'];
-                	$charge_sociales->ref = $data['ref'];
-                	print $charge_sociales->getNomUrl(1, 0, 0, 0, 0);
+					$charge_sociales->id = $data['id'];
+					$charge_sociales->ref = $data['ref'];
+					print $charge_sociales->getNomUrl(1, 0, 0, 0, 0);
 				} elseif ($data['item'] == 'VariousPayment') {
-                    $various_payment->id = $data['id'];
-                	$various_payment->ref = $data['ref'];
-                	print $various_payment->getNomUrl(1, '', 0, 0);
+					$various_payment->id = $data['id'];
+					$various_payment->ref = $data['ref'];
+					print $various_payment->getNomUrl(1, '', 0, 0);
 				} elseif ($data['item'] == 'LoanPayment') {
-                    $payment_loan->id = $data['id'];
-                	$payment_loan->ref = $data['ref'];
-                	print $payment_loan->getNomUrl(1, 0, 0, '', 0);
+					$payment_loan->id = $data['id'];
+					$payment_loan->ref = $data['ref'];
+					print $payment_loan->getNomUrl(1, 0, 0, '', 0);
 				} else {
-                	print $data['ref'];
+					print $data['ref'];
 				}
-                print '</td>';
+				print '</td>';
 
-                // File link
-                print '<td>';
-                if (!empty($data['files']))
-                {
-                	foreach ($data['files'] as $id=>$filecursor) {
-                        print '<a href='.DOL_URL_ROOT.'/'.$filecursor['link'].' target="_blank">'.($filecursor['name'] ? $filecursor['name'] : $filecursor['ref']).'</a>&nbsp;'.$formfile->showPreview($filecursor, $filecursor['modulepart'], $filecursor['subdir'].'/'.$filecursor['name']).'<br>';
-                	}
-                }
-                print "</td>\n";
+				// File link
+				print '<td>';
+				if (!empty($data['files']))
+				{
+					foreach ($data['files'] as $id=>$filecursor) {
+						print '<a href='.DOL_URL_ROOT.'/'.$filecursor['link'].' target="_blank">'.($filecursor['name'] ? $filecursor['name'] : $filecursor['ref']).'</a>&nbsp;'.$formfile->showPreview($filecursor, $filecursor['modulepart'], $filecursor['subdir'].'/'.$filecursor['name']).'<br>';
+					}
+				}
+				print "</td>\n";
 
-                // Paid
-                print '<td aling="left">'.$data['paid'].'</td>';
+				// Paid
+				print '<td aling="left">'.$data['paid'].'</td>';
 
-                // Total ET
-                print '<td align="right">'.price($data['sens'] ? $data['amount_ht'] : -$data['amount_ht'])."</td>\n";
-                // Total IT
-                print '<td align="right">'.price($data['sens'] ? $data['amount_ttc'] : -$data['amount_ttc'])."</td>\n";
-                // Total VAT
-                print '<td align="right">'.price($data['sens'] ? $data['amount_vat'] : -$data['amount_vat'])."</td>\n";
+				// Total ET
+				print '<td align="right">'.price($data['sens'] ? $data['amount_ht'] : -$data['amount_ht'])."</td>\n";
+				// Total IT
+				print '<td align="right">'.price($data['sens'] ? $data['amount_ttc'] : -$data['amount_ttc'])."</td>\n";
+				// Total VAT
+				print '<td align="right">'.price($data['sens'] ? $data['amount_vat'] : -$data['amount_vat'])."</td>\n";
 
-                print '<td class="tdoverflowmax150" title="'.$data['thirdparty_name'].'">'.$data['thirdparty_name']."</td>\n";
+				print '<td class="tdoverflowmax150" title="'.$data['thirdparty_name'].'">'.$data['thirdparty_name']."</td>\n";
 
-                print '<td class="center">'.$data['thirdparty_code']."</td>\n";
+				print '<td class="center">'.$data['thirdparty_code']."</td>\n";
 
-                print '<td class="center">'.$data['country_code']."</td>\n";
+				print '<td class="center">'.$data['country_code']."</td>\n";
 
-                print '<td align="right">'.$data['vatnum']."</td>\n";
+				print '<td align="right">'.$data['vatnum']."</td>\n";
 
-                if ($data['sens']) {
-                    $totalET_credit += $data['amount_ht'];
-                    $totalIT_credit += $data['amount_ttc'];
-                    $totalVAT_credit += $data['amount_vat'];
-                } else {
-                    $totalET_debit -= $data['amount_ht'];
-                    $totalIT_debit -= $data['amount_ttc'];
-                    $totalVAT_debit -= $data['amount_vat'];
-                }
+				if ($data['sens']) {
+					$totalET_credit += $data['amount_ht'];
+					$totalIT_credit += $data['amount_ttc'];
+					$totalVAT_credit += $data['amount_vat'];
+				} else {
+					$totalET_debit -= $data['amount_ht'];
+					$totalIT_debit -= $data['amount_ttc'];
+					$totalVAT_debit -= $data['amount_vat'];
+				}
 
-                if (! empty($conf->multicurrency->enabled)) {
-                	print '<td class="center">'.$data['currency']."</td>\n";
-                }
+				if (!empty($conf->multicurrency->enabled)) {
+					print '<td class="center">'.$data['currency']."</td>\n";
+				}
 
-                print "</tr>\n";
-            }
+				print "</tr>\n";
+			}
 
-            // Total credits
-            print '<tr class="liste_total">';
-            print '<td colspan="6" class="right">'.$langs->trans('Total').' '.$langs->trans('Income').'</td>';
-            print '<td align="right">'.price(price2num($totalET_credit, 'MT')).'</td>';
-            print '<td align="right">'.price(price2num($totalIT_credit, 'MT')).'</td>';
-            print '<td align="right">'.price(price2num($totalVAT_credit, 'MT')).'</td>';
-            print '<td colspan="4"></td>';
-            if (! empty($conf->multicurrency->enabled)) {
-            	print '<td></td>';
-            }
-            print "</tr>\n";
-            // Total debits
-            print '<tr class="liste_total">';
-            print '<td colspan="6" class="right">'.$langs->trans('Total').' '.$langs->trans('Outcome').'</td>';
-            print '<td align="right">'.price(price2num($totalET_debit, 'MT')).'</td>';
-            print '<td align="right">'.price(price2num($totalIT_debit, 'MT')).'</td>';
-            print '<td align="right">'.price(price2num($totalVAT_debit, 'MT')).'</td>';
-            print '<td colspan="4"></td>';
-            if (! empty($conf->multicurrency->enabled)) {
-            	print '<td></td>';
-            }
-            print "</tr>\n";
-            // Balance
-            print '<tr class="liste_total">';
-            print '<td colspan="6" class="right">'.$langs->trans('Total').'</td>';
-            print '<td align="right">'.price(price2num($totalET_credit + $totalET_debit, 'MT')).'</td>';
-            print '<td align="right">'.price(price2num($totalIT_credit + $totalIT_debit, 'MT')).'</td>';
-            print '<td align="right">'.price(price2num($totalVAT_credit + $totalVAT_debit, 'MT')).'</td>';
-            print '<td colspan="4"></td>';
-            if (! empty($conf->multicurrency->enabled)) {
-            	print '<td></td>';
-            }
-            print "</tr>\n";
-        }
-    }
-    print "</table>";
-    print '</div>';
+			// Total credits
+			print '<tr class="liste_total">';
+			print '<td colspan="6" class="right">'.$langs->trans('Total').' '.$langs->trans('Income').'</td>';
+			print '<td align="right">'.price(price2num($totalET_credit, 'MT')).'</td>';
+			print '<td align="right">'.price(price2num($totalIT_credit, 'MT')).'</td>';
+			print '<td align="right">'.price(price2num($totalVAT_credit, 'MT')).'</td>';
+			print '<td colspan="4"></td>';
+			if (!empty($conf->multicurrency->enabled)) {
+				print '<td></td>';
+			}
+			print "</tr>\n";
+			// Total debits
+			print '<tr class="liste_total">';
+			print '<td colspan="6" class="right">'.$langs->trans('Total').' '.$langs->trans('Outcome').'</td>';
+			print '<td align="right">'.price(price2num($totalET_debit, 'MT')).'</td>';
+			print '<td align="right">'.price(price2num($totalIT_debit, 'MT')).'</td>';
+			print '<td align="right">'.price(price2num($totalVAT_debit, 'MT')).'</td>';
+			print '<td colspan="4"></td>';
+			if (!empty($conf->multicurrency->enabled)) {
+				print '<td></td>';
+			}
+			print "</tr>\n";
+			// Balance
+			print '<tr class="liste_total">';
+			print '<td colspan="6" class="right">'.$langs->trans('Total').'</td>';
+			print '<td align="right">'.price(price2num($totalET_credit + $totalET_debit, 'MT')).'</td>';
+			print '<td align="right">'.price(price2num($totalIT_credit + $totalIT_debit, 'MT')).'</td>';
+			print '<td align="right">'.price(price2num($totalVAT_credit + $totalVAT_debit, 'MT')).'</td>';
+			print '<td colspan="4"></td>';
+			if (!empty($conf->multicurrency->enabled)) {
+				print '<td></td>';
+			}
+			print "</tr>\n";
+		}
+	}
+	print "</table>";
+	print '</div>';
 }
 
 
diff --git a/htdocs/compta/bank/account_statement_document.php b/htdocs/compta/bank/account_statement_document.php
index dcbe6fefc26..fd7c6b1d292 100644
--- a/htdocs/compta/bank/account_statement_document.php
+++ b/htdocs/compta/bank/account_statement_document.php
@@ -182,7 +182,7 @@ if ($id > 0 || !empty($ref)) {
 
 		print '</div>';
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 
 		$modulepart = 'bank';
diff --git a/htdocs/compta/bank/annuel.php b/htdocs/compta/bank/annuel.php
index 6db4714db3d..a0650e9ffa4 100644
--- a/htdocs/compta/bank/annuel.php
+++ b/htdocs/compta/bank/annuel.php
@@ -148,25 +148,25 @@ $linkback = '<a href="'.DOL_URL_ROOT.'/compta/bank/list.php?restore_lastsearch_v
 
 if (!empty($id))
 {
-    if (!preg_match('/,/', $id))
-    {
-        dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '', 0, '', '', 1);
-    } else {
-        $bankaccount = new Account($db);
-        $listid = explode(',', $id);
-        foreach ($listid as $key => $aId)
-        {
-            $bankaccount->fetch($aId);
-            $bankaccount->label = $bankaccount->ref;
-            print $bankaccount->getNomUrl(1);
-            if ($key < (count($listid) - 1)) print ', ';
-        }
-    }
+	if (!preg_match('/,/', $id))
+	{
+		dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '', 0, '', '', 1);
+	} else {
+		$bankaccount = new Account($db);
+		$listid = explode(',', $id);
+		foreach ($listid as $key => $aId)
+		{
+			$bankaccount->fetch($aId);
+			$bankaccount->label = $bankaccount->ref;
+			print $bankaccount->getNomUrl(1);
+			if ($key < (count($listid) - 1)) print ', ';
+		}
+	}
 } else {
 	print $langs->trans("AllAccounts");
 }
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 // Affiche tableau
diff --git a/htdocs/compta/bank/bankentries_list.php b/htdocs/compta/bank/bankentries_list.php
index e4bed6376f1..437516df50b 100644
--- a/htdocs/compta/bank/bankentries_list.php
+++ b/htdocs/compta/bank/bankentries_list.php
@@ -42,11 +42,13 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
 require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/paymentsocialcontribution.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php';
 require_once DOL_DOCUMENT_ROOT.'/salaries/class/paymentsalary.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/paymentvarious.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/bonprelevement.class.php';
 require_once DOL_DOCUMENT_ROOT.'/don/class/don.class.php';
+require_once DOL_DOCUMENT_ROOT.'/don/class/paymentdonation.class.php';
 require_once DOL_DOCUMENT_ROOT.'/expensereport/class/paymentexpensereport.class.php';
 require_once DOL_DOCUMENT_ROOT.'/loan/class/loan.class.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/paiementfourn.class.php';
@@ -369,12 +371,14 @@ $userstatic = new User($db);
 $chargestatic = new ChargeSociales($db);
 $loanstatic = new Loan($db);
 $memberstatic = new Adherent($db);
+$donstatic = new Don($db);
 $paymentstatic = new Paiement($db);
 $paymentsupplierstatic = new PaiementFourn($db);
+$paymentscstatic = new PaymentSocialContribution($db);
 $paymentvatstatic = new TVA($db);
 $paymentsalstatic = new PaymentSalary($db);
+$paymentdonationstatic = new PaymentDonation($db);
 $paymentvariousstatic = new PaymentVarious($db);
-$donstatic = new Don($db);
 $paymentexpensereportstatic = new PaymentExpenseReport($db);
 $bankstatic = new Account($db);
 $banklinestatic = new AccountLine($db);
@@ -436,7 +440,7 @@ if ($id > 0 || !empty($ref))
 
 	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '', 0, '', '', 1);
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 
 	/*
@@ -1199,10 +1203,10 @@ if ($resql)
 					print ' '.$paymentsupplierstatic->getNomUrl(2);
 				} elseif ($links[$key]['type'] == 'payment_sc')
 				{
-					print '<a href="'.DOL_URL_ROOT.'/compta/payment_sc/card.php?id='.$links[$key]['url_id'].'">';
-					print ' '.img_object($langs->trans('ShowPayment'), 'payment').' ';
-					//print $langs->trans("SocialContributionPayment");
-					print '</a>';
+					$paymentscstatic->id = $links[$key]['url_id'];
+					$paymentscstatic->ref = $links[$key]['url_id'];
+					$paymentscstatic->label = $links[$key]['label'];
+					print ' '.$paymentscstatic->getNomUrl(2);
 				} elseif ($links[$key]['type'] == 'payment_vat')
 				{
 					$paymentvatstatic->id = $links[$key]['url_id'];
@@ -1212,6 +1216,7 @@ if ($resql)
 				{
 					$paymentsalstatic->id = $links[$key]['url_id'];
 					$paymentsalstatic->ref = $links[$key]['url_id'];
+					$paymentsalstatic->label = $links[$key]['label'];
 					print ' '.$paymentsalstatic->getNomUrl(2);
 				} elseif ($links[$key]['type'] == 'payment_loan')
 				{
@@ -1220,9 +1225,9 @@ if ($resql)
 					print '</a>';
 				} elseif ($links[$key]['type'] == 'payment_donation')
 				{
-					print '<a href="'.DOL_URL_ROOT.'/don/payment/card.php?id='.$links[$key]['url_id'].'">';
-					print ' '.img_object($langs->trans('ShowPayment'), 'payment').' ';
-					print '</a>';
+					$paymentdonationstatic->id = $links[$key]['url_id'];
+					$paymentdonationstatic->ref = $links[$key]['url_id'];
+					print ' '.$paymentdonationstatic->getNomUrl(2);
 				} elseif ($links[$key]['type'] == 'payment_expensereport')
 				{
 					$paymentexpensereportstatic->id = $links[$key]['url_id'];
diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php
index 7bddd7915cb..8b086516351 100644
--- a/htdocs/compta/bank/card.php
+++ b/htdocs/compta/bank/card.php
@@ -544,7 +544,7 @@ if ($action == 'create')
 
 	print '</table>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div class="center">';
 	print '<input type="submit" class="button" value="'.$langs->trans("CreateAccount").'">';
@@ -752,7 +752,7 @@ if ($action == 'create')
 
 		print '<div class="clearboth"></div>';
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 		/*
 		 * Barre d'actions
@@ -1028,7 +1028,7 @@ if ($action == 'create')
 			print '</table>';
 		}
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 		print '<div class="center">';
 		print '<input value="'.$langs->trans("Modify").'" type="submit" class="button">';
diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index 9e40a39c676..6944f7aeb51 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -173,8 +173,8 @@ class Account extends CommonObject
 	public $account_number;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_accountancy_journal;
 
 	/**
@@ -305,7 +305,7 @@ class Account extends CommonObject
 	 *
 	 *  @param	DoliDB		$db		Database handler
 	 */
-    public function __construct(DoliDB $db)
+	public function __construct(DoliDB $db)
 	{
 		global $langs;
 
@@ -358,7 +358,7 @@ class Account extends CommonObject
 	 *
 	 *  @return     int         1 if need to be concialiated, < 0 otherwise.
 	 */
-    public function canBeConciliated()
+	public function canBeConciliated()
 	{
 		global $conf;
 
@@ -369,7 +369,7 @@ class Account extends CommonObject
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *      Add a link between bank line record and its source
 	 *
@@ -380,9 +380,9 @@ class Account extends CommonObject
 	 *      @param  string	$type       Type of link ('payment', 'company', 'member', ...)
 	 *      @return int         		<0 if KO, id line if OK
 	 */
-    public function add_url_line($line_id, $url_id, $url, $label, $type)
+	public function add_url_line($line_id, $url_id, $url, $label, $type)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."bank_url (";
 		$sql .= "fk_bank";
 		$sql .= ", url_id";
@@ -408,7 +408,7 @@ class Account extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * 		TODO Move this into AccountLine
 	 *      Return array with links from llx_bank_url
@@ -418,9 +418,9 @@ class Account extends CommonObject
 	 *      @param  string      $type       To search using type
 	 *      @return array|int               Array of links array('url'=>, 'url_id'=>, 'label'=>, 'type'=> 'fk_bank'=> ) or -1 on error
 	 */
-    public function get_url($fk_bank = '', $url_id = '', $type = '')
+	public function get_url($fk_bank = '', $url_id = '', $type = '')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$lines = array();
 
 		// Check parameters
@@ -481,7 +481,7 @@ class Account extends CommonObject
 	 *  @param	int			$datev			Date value
 	 *  @return	int							Rowid of added entry, <0 if KO
 	 */
-    public function addline($date, $oper, $label, $amount, $num_chq, $categorie, User $user, $emetteur = '', $banque = '', $accountancycode = '', $datev = null)
+	public function addline($date, $oper, $label, $amount, $num_chq, $categorie, User $user, $emetteur = '', $banque = '', $accountancycode = '', $datev = null)
 	{
 		// Deprecation warning
 		if (is_numeric($oper)) {
@@ -589,7 +589,7 @@ class Account extends CommonObject
 	 *  @param  int     $notrigger  1=Disable triggers
 	 *  @return int        			< 0 if KO, > 0 if OK
 	 */
-    public function create(User $user, $notrigger = 0)
+	public function create(User $user, $notrigger = 0)
 	{
 		global $langs, $conf, $hookmanager;
 
@@ -747,7 +747,7 @@ class Account extends CommonObject
 	 *      @param  int     $notrigger  1=Disable triggers
 	 *		@return	int					<0 if KO, >0 if OK
 	 */
-    public function update(User $user, $notrigger = 0)
+	public function update(User $user, $notrigger = 0)
 	{
 		global $langs, $conf, $hookmanager;
 
@@ -842,16 +842,16 @@ class Account extends CommonObject
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Update BBAN (RIB) account fields
 	 *
 	 *  @param	User	$user       Object user making update
 	 *	@return	int					<0 if KO, >0 if OK
 	 */
-    public function update_bban(User $user = null)
+	public function update_bban(User $user = null)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $langs;
 
 		// Clean parameters
@@ -907,7 +907,7 @@ class Account extends CommonObject
 	 *      @param  string	$ref     	Ref of bank account to get
 	 *      @return	int					<0 if KO, >0 if OK
 	 */
-    public function fetch($id, $ref = '')
+	public function fetch($id, $ref = '')
 	{
 		global $conf;
 
@@ -925,11 +925,11 @@ class Account extends CommonObject
 		$sql .= " ba.datec as date_creation, ba.tms as date_update,";
 		$sql .= ' c.code as country_code, c.label as country,';
 		$sql .= ' d.code_departement as state_code, d.nom as state';
-        $sql .= ' , aj.code as accountancy_journal';
+		$sql .= ' , aj.code as accountancy_journal';
 		$sql .= " FROM ".MAIN_DB_PREFIX."bank_account as ba";
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as c ON ba.fk_pays = c.rowid';
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_departements as d ON ba.state_id = d.rowid';
-        $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'accounting_journal as aj ON aj.rowid=ba.fk_accountancy_journal';
+		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'accounting_journal as aj ON aj.rowid=ba.fk_accountancy_journal';
 		$sql .= " WHERE ba.entity IN (".getEntity($this->element).")";
 		if ($id)  $sql .= " AND ba.rowid  = ".$id;
 		if ($ref) $sql .= " AND ba.ref = '".$this->db->escape($ref)."'";
@@ -1007,10 +1007,10 @@ class Account extends CommonObject
 	 * Existing categories are left untouch.
 	 *
 	 * @param int[]|int $categories Category or categories IDs
-     * @return void
+	 * @return void
 	 */
-    public function setCategories($categories)
-    {
+	public function setCategories($categories)
+	{
 		// Handle single category
 		if (!is_array($categories)) {
 			$categories = array($categories);
@@ -1051,7 +1051,7 @@ class Account extends CommonObject
 	 *	@param	User	$user	User deleting
 	 *  @return int             <0 if KO, >0 if OK
 	 */
-    public function delete(User $user = null)
+	public function delete(User $user = null)
 	{
 		global $conf;
 
@@ -1115,12 +1115,12 @@ class Account extends CommonObject
 	 *  @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
 	 *  @return     string        		    Label
 	 */
-    public function getLibStatut($mode = 0)
+	public function getLibStatut($mode = 0)
 	{
 		return $this->LibStatut($this->clos, $mode);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return label of given object status
 	 *
@@ -1128,9 +1128,9 @@ class Account extends CommonObject
 	 *  @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
 	 *  @return  string        			    Label
 	 */
-    public function LibStatut($status, $mode = 0)
+	public function LibStatut($status, $mode = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 		$langs->load('banks');
 
@@ -1148,15 +1148,15 @@ class Account extends CommonObject
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *    Renvoi si un compte peut etre supprimer ou non (sans mouvements)
 	 *
 	 *    @return     boolean     vrai si peut etre supprime, faux sinon
 	 */
-    public function can_be_deleted()
+	public function can_be_deleted()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$can_be_deleted = false;
 
 		$sql = "SELECT COUNT(rowid) as nb";
@@ -1179,7 +1179,7 @@ class Account extends CommonObject
 	 *
 	 *   @return	string		Error string
 	 */
-    public function error()
+	public function error()
 	{
 		return $this->error;
 	}
@@ -1190,7 +1190,7 @@ class Account extends CommonObject
 	 * 	@param	int		$option		1=Exclude future operation date (this is to exclude input made in advance and have real account sold)
 	 *	@return	int					Current sold (value date <= today)
 	 */
-    public function solde($option = 0)
+	public function solde($option = 0)
 	{
 		$solde = 0;
 
@@ -1216,7 +1216,7 @@ class Account extends CommonObject
 		return price2num($solde, 'MU');
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *      Load indicators for dashboard (this->nbtodo and this->nbtodolate)
 	 *
@@ -1224,9 +1224,9 @@ class Account extends CommonObject
 	 *		@param	int		$filteraccountid	To get info for a particular account id
 	 *      @return WorkboardResponse|int 		<0 if KO, WorkboardResponse if OK
 	 */
-    public function load_board(User $user, $filteraccountid = 0)
+	public function load_board(User $user, $filteraccountid = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $langs;
 
 		if ($user->socid) return -1; // protection pour eviter appel par utilisateur externe
@@ -1272,15 +1272,15 @@ class Account extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *      Charge indicateurs this->nb de tableau de bord
 	 *		@param		int			$filteraccountid	To get info for a particular account id
 	 *      @return     int         <0 if ko, >0 if ok
 	 */
-    public function load_state_board($filteraccountid = 0)
+	public function load_state_board($filteraccountid = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $user;
 
 		if ($user->socid) return -1; // protection pour eviter appel par utilisateur externe
@@ -1348,10 +1348,10 @@ class Account extends CommonObject
 	 *  @param  string	$mode           			''=Link to card, 'transactions'=Link to transactions card
 	 *  @param  string  $option         			''=Show ref, 'reflabel'=Show ref+label
 	 *  @param  int     $save_lastsearch_value    	-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
-     *  @param	int  	$notooltip		 			1=Disable tooltip
+	 *  @param	int  	$notooltip		 			1=Disable tooltip
 	 *	@return	string								Chaine avec URL
 	 */
-    public function getNomUrl($withpicto = 0, $mode = '', $option = '', $save_lastsearch_value = -1, $notooltip = 0)
+	public function getNomUrl($withpicto = 0, $mode = '', $option = '', $save_lastsearch_value = -1, $notooltip = 0)
 	{
 		global $conf, $langs, $user;
 
@@ -1401,10 +1401,10 @@ class Account extends CommonObject
 		$linkstart = '<a href="'.$url.$linkclose;
 		$linkend = '</a>';
 
-        if ($option == 'nolink') {
-            $linkstart = '';
-            $linkend = '';
-        }
+		if ($option == 'nolink') {
+			$linkstart = '';
+			$linkend = '';
+		}
 
 		$result .= $linkstart;
 		if ($withpicto) $result .= img_object(($notooltip ? '' : $label), $this->picto, ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
@@ -1423,7 +1423,7 @@ class Account extends CommonObject
 	 *
 	 *     @return     int         1 if correct, <=0 if wrong
 	 */
-    public function verif()
+	public function verif()
 	{
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
 
@@ -1455,7 +1455,7 @@ class Account extends CommonObject
 	 *
 	 *	@return		string		country code
 	 */
-    public function getCountryCode()
+	public function getCountryCode()
 	{
 		global $mysoc;
 
@@ -1493,7 +1493,7 @@ class Account extends CommonObject
 	 *                         1=Need 2 fields for bank code: Bank, Desk (France, Spain, ...) + Account number and key
 	 *                         2=Need 1 field for bank code:  Bank only (Sort code for Great Britain, BSB for Australia) + Account number
 	 */
-    public function useDetailedBBAN()
+	public function useDetailedBBAN()
 	{
 		$country_code = $this->getCountryCode();
 
@@ -1507,7 +1507,7 @@ class Account extends CommonObject
 	 *
 	 * @return		int        1 = mandatory / 0 = Not mandatory
 	 */
-    public function needIBAN()
+	public function needIBAN()
 	{
 		$country_code = $this->getCountryCode();
 
@@ -1557,7 +1557,7 @@ class Account extends CommonObject
 	 *	@param  int		$id		Id of object to load
 	 *	@return	void
 	 */
-    public function info($id)
+	public function info($id)
 	{
 	}
 
@@ -1640,7 +1640,7 @@ class Account extends CommonObject
 				//Replace the old AccountNumber key with the new BankAccountNumber key
 				$fieldlists = explode(
 					' ',
-                    preg_replace('/ ?[^Bank]AccountNumber ?/', 'BankAccountNumber', $conf->global->BANK_SHOW_ORDER_OPTION)
+					preg_replace('/ ?[^Bank]AccountNumber ?/', 'BankAccountNumber', $conf->global->BANK_SHOW_ORDER_OPTION)
 				);
 			}
 		}
@@ -1656,7 +1656,7 @@ class Account extends CommonObject
 	 *
 	 *  @return	void
 	 */
-    public function initAsSpecimen()
+	public function initAsSpecimen()
 	{
 		$this->specimen        = 1;
 		$this->ref             = 'MBA';
@@ -1688,10 +1688,10 @@ class AccountLine extends CommonObject
 	 */
 	public $error = '';
 
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
 	/**
 	 * @var string ID to identify managed object
@@ -1713,54 +1713,54 @@ class AccountLine extends CommonObject
 	 */
 	public $id;
 
-    /**
-     * @var string Ref
-     */
-    public $ref;
+	/**
+	 * @var string Ref
+	 */
+	public $ref;
 
 	/**
-     * Date creation record (datec)
-     *
-     * @var integer
-     */
-    public $datec;
+	 * Date creation record (datec)
+	 *
+	 * @var integer
+	 */
+	public $datec;
 
-    /**
-     * Date (dateo)
-     *
-     * @var integer
-     */
+	/**
+	 * Date (dateo)
+	 *
+	 * @var integer
+	 */
 	public $dateo;
 
 	/**
-     * Date value (datev)
-     *
-     * @var integer
-     */
+	 * Date value (datev)
+	 *
+	 * @var integer
+	 */
 	public $datev;
 
 	public $amount;
 
-    /**
-     * @var string bank transaction lines label
-     */
-    public $label;
+	/**
+	 * @var string bank transaction lines label
+	 */
+	public $label;
 
-    public $note;
+	public $note;
 
-    /**
-     * @var int ID
-     */
+	/**
+	 * @var int ID
+	 */
 	public $fk_user_author;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_user_rappro;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_type;
 
 	public $rappro; // Is it conciliated
@@ -1769,13 +1769,13 @@ class AccountLine extends CommonObject
 	public $bank_chq; // Bank of cheque
 
 	/**
-     * @var int ID of cheque receipt
-     */
+	 * @var int ID of cheque receipt
+	 */
 	public $fk_bordereau;
 
 	/**
-     * @var int ID of bank account
-     */
+	 * @var int ID of bank account
+	 */
 	public $fk_account;
 
 	/**
@@ -1783,7 +1783,7 @@ class AccountLine extends CommonObject
 	 */
 	public $bank_account_label;
 
-    /**
+	/**
 	 * @var string		Name of check issuer
 	 */
 	public $emetteur;
@@ -1793,7 +1793,7 @@ class AccountLine extends CommonObject
 	 *
 	 *  @param	DoliDB	$db		Database handler
 	 */
-    public function __construct(DoliDB $db)
+	public function __construct(DoliDB $db)
 	{
 		$this->db = $db;
 	}
@@ -1806,7 +1806,7 @@ class AccountLine extends CommonObject
 	 *  @param      string	$num     	External num to load (ex: num of transaction for paypal fee)
 	 *	@return		int					<0 if KO, 0 if OK but not found, >0 if OK and found
 	 */
-    public function fetch($rowid, $ref = '', $num = '')
+	public function fetch($rowid, $ref = '', $num = '')
 	{
 		global $conf;
 
@@ -1926,9 +1926,9 @@ class AccountLine extends CommonObject
 	 *		@param	User	$user	User object that delete
 	 *      @return	int 			<0 if KO, >0 if OK
 	 */
-    public function delete(User $user = null)
+	public function delete(User $user = null)
 	{
-    	global $conf;
+		global $conf;
 
 		$nbko = 0;
 
@@ -1988,16 +1988,16 @@ class AccountLine extends CommonObject
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *      Delete bank line records
 	 *
 	 *		@param	User	$user	User object that delete
 	 *      @return	int 			<0 if KO, >0 if OK
 	 */
-    public function delete_urls(User $user = null)
+	public function delete_urls(User $user = null)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$nbko = 0;
 
 		if ($this->rappro)
@@ -2032,7 +2032,7 @@ class AccountLine extends CommonObject
 	 *		@param 	int		$notrigger		0=Disable all triggers
 	 *		@return	int						<0 if KO, >0 if OK
 	 */
-    public function update(User $user, $notrigger = 0)
+	public function update(User $user, $notrigger = 0)
 	{
 		$this->db->begin();
 
@@ -2056,7 +2056,7 @@ class AccountLine extends CommonObject
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Update conciliation field
 	 *
@@ -2065,9 +2065,9 @@ class AccountLine extends CommonObject
 	 *	@param	int		$conciliated	1=Set transaction to conciliated, 0=Keep transaction non conciliated
 	 *	@return	int						<0 if KO, >0 if OK
 	 */
-    public function update_conciliation(User $user, $cat, $conciliated = 1)
+	public function update_conciliation(User $user, $cat, $conciliated = 1)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $langs;
 
 		$this->db->begin();
@@ -2119,7 +2119,7 @@ class AccountLine extends CommonObject
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * 	Increase/decrease value date of a rowid
 	 *
@@ -2127,9 +2127,9 @@ class AccountLine extends CommonObject
 	 *	@param	int		$sign		1 or -1
 	 *	@return	int					>0 if OK, 0 if KO
 	 */
-    public function datev_change($rowid, $sign = 1)
+	public function datev_change($rowid, $sign = 1)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$sql = "SELECT datev FROM ".MAIN_DB_PREFIX."bank WHERE rowid = ".$rowid;
 		$resql = $this->db->query($sql);
 		if ($resql)
@@ -2156,34 +2156,34 @@ class AccountLine extends CommonObject
 		return 0;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * 	Increase value date of a rowid
 	 *
 	 *	@param	int		$id		Id of line to change
 	 *	@return	int				>0 if OK, 0 if KO
 	 */
-    public function datev_next($id)
+	public function datev_next($id)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		return $this->datev_change($id, 1);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * 	Decrease value date of a rowid
 	 *
 	 *	@param	int		$id		Id of line to change
 	 *	@return	int				>0 if OK, 0 if KO
 	 */
-    public function datev_previous($id)
+	public function datev_previous($id)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		return $this->datev_change($id, -1);
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * 	Increase/decrease operation date of a rowid
 	 *
@@ -2191,9 +2191,9 @@ class AccountLine extends CommonObject
 	 *	@param	int		$sign		1 or -1
 	 *	@return	int					>0 if OK, 0 if KO
 	 */
-    public function dateo_change($rowid, $sign = 1)
+	public function dateo_change($rowid, $sign = 1)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$sql = "SELECT dateo FROM ".MAIN_DB_PREFIX."bank WHERE rowid = ".$rowid;
 		$resql = $this->db->query($sql);
 		if ($resql)
@@ -2220,29 +2220,29 @@ class AccountLine extends CommonObject
 		return 0;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * 	Increase operation date of a rowid
 	 *
 	 *	@param	int		$id		Id of line to change
 	 *	@return	int				>0 if OK, 0 if KO
 	 */
-    public function dateo_next($id)
+	public function dateo_next($id)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		return $this->dateo_change($id, 1);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * 	Decrease operation date of a rowid
 	 *
 	 *	@param	int		$id		Id of line to change
 	 *	@return	int				>0 if OK, 0 if KO
 	 */
-    public function dateo_previous($id)
+	public function dateo_previous($id)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		return $this->dateo_change($id, -1);
 	}
 
@@ -2253,7 +2253,7 @@ class AccountLine extends CommonObject
 	 *	@param  int		$id		Id of object to load
 	 *	@return	void
 	 */
-    public function info($id)
+	public function info($id)
 	{
 		$sql = 'SELECT b.rowid, b.datec, b.tms as datem,';
 		$sql .= ' b.fk_user_author, b.fk_user_rappro';
@@ -2301,7 +2301,7 @@ class AccountLine extends CommonObject
 	 * 		@param	int     $notooltip		1=Disable tooltip
 	 *		@return	string					Chaine avec URL
 	 */
-    public function getNomUrl($withpicto = 0, $maxlen = 0, $option = '', $notooltip = 0)
+	public function getNomUrl($withpicto = 0, $maxlen = 0, $option = '', $notooltip = 0)
 	{
 		global $langs;
 
@@ -2358,12 +2358,12 @@ class AccountLine extends CommonObject
 	 *    @param	int		$mode       0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long
 	 *    @return   string        		Libelle
 	 */
-    public function getLibStatut($mode = 0)
+	public function getLibStatut($mode = 0)
 	{
 		return $this->LibStatut($this->status, $mode);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Renvoi le libelle d'un statut donne
 	 *
@@ -2371,9 +2371,9 @@ class AccountLine extends CommonObject
 	 *  @param	int		$mode           0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
 	 *  @return	string          		Libelle du statut
 	 */
-    public function LibStatut($status, $mode = 0)
+	public function LibStatut($status, $mode = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 		//$langs->load('companies');
 		/*
diff --git a/htdocs/compta/bank/class/api_bankaccounts.class.php b/htdocs/compta/bank/class/api_bankaccounts.class.php
index 3293f746033..35104e5ed25 100644
--- a/htdocs/compta/bank/class/api_bankaccounts.class.php
+++ b/htdocs/compta/bank/class/api_bankaccounts.class.php
@@ -30,407 +30,407 @@ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 class BankAccounts extends DolibarrApi
 {
 
-    /**
-     * array $FIELDS Mandatory fields, checked when creating an object
-     */
-    static $FIELDS = array(
-        'ref',
-        'label',
-        'type',
-        'currency_code',
-        'country_id'
-    );
+	/**
+	 * array $FIELDS Mandatory fields, checked when creating an object
+	 */
+	static $FIELDS = array(
+		'ref',
+		'label',
+		'type',
+		'currency_code',
+		'country_id'
+	);
 
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-        global $db;
-        $this->db = $db;
-    }
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		global $db;
+		$this->db = $db;
+	}
 
-    /**
-     * Get the list of accounts.
-     *
-     * @param string    $sortfield  Sort field
-     * @param string    $sortorder  Sort order
-     * @param int       $limit      Limit for list
-     * @param int       $page       Page number
+	/**
+	 * Get the list of accounts.
+	 *
+	 * @param string    $sortfield  Sort field
+	 * @param string    $sortorder  Sort order
+	 * @param int       $limit      Limit for list
+	 * @param int       $page       Page number
 	 * @param  int    	$category   Use this param to filter list by category
-     * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.import_key:<:'20160101')"
-     * @return array                List of account objects
-     *
-     * @throws RestException
-     */
-    public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $category = 0, $sqlfilters = '')
-    {
-        $list = array();
-
-        if (!DolibarrApiAccess::$user->rights->banque->lire) {
-            throw new RestException(401);
-        }
-
-        $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."bank_account as t";
-    	if ($category > 0) {
-            $sql .= ", ".MAIN_DB_PREFIX."categorie_account as c";
-		}
-        $sql .= ' WHERE t.entity IN ('.getEntity('bank_account').')';
-    	// Select accounts of given category
-    	if ($category > 0) {
-            $sql .= " AND c.fk_categorie = ".$this->db->escape($category)." AND c.fk_account = t.rowid ";
-		}
-        // Add sql filters
-        if ($sqlfilters)
-        {
-            if (!DolibarrApi::_checkFilters($sqlfilters))
-            {
-                throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
-            }
-            $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-        }
-
-        $sql .= $this->db->order($sortfield, $sortorder);
-        if ($limit) {
-            if ($page < 0)
-            {
-                $page = 0;
-            }
-            $offset = $limit * $page;
-
-            $sql .= $this->db->plimit($limit + 1, $offset);
-        }
-
-        dol_syslog("API Rest request");
-        $result = $this->db->query($sql);
-
-        if ($result) {
-            $num = $this->db->num_rows($result);
-            $min = min($num, ($limit <= 0 ? $num : $limit));
-            for ($i = 0; $i < $min; $i++) {
-                $obj = $this->db->fetch_object($result);
-                $account = new Account($this->db);
-                if ($account->fetch($obj->rowid) > 0) {
-                    $list[] = $this->_cleanObjectDatas($account);
-                }
-            }
-        } else {
-            throw new RestException(503, 'Error when retrieving list of accounts: '.$this->db->lasterror());
-        }
-
-        return $list;
-    }
-
-    /**
-     * Get account by ID.
-     *
-     * @param int    $id    ID of account
-     * @return array Account object
-     *
-     * @throws RestException
-     */
-    public function get($id)
-    {
-        if (!DolibarrApiAccess::$user->rights->banque->lire) {
-            throw new RestException(401);
-        }
-
-        $account = new Account($this->db);
-        $result = $account->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'account not found');
-        }
-
-        return $this->_cleanObjectDatas($account);
-    }
-
-    /**
-     * Create account object
-     *
-     * @param array $request_data    Request data
-     * @return int ID of account
-     */
-    public function post($request_data = null)
-    {
-        if (!DolibarrApiAccess::$user->rights->banque->configurer) {
-            throw new RestException(401);
-        }
-        // Check mandatory fields
-        $result = $this->_validate($request_data);
-
-        $account = new Account($this->db);
-        foreach ($request_data as $field => $value) {
-            $account->$field = $value;
-        }
-        // Date of the initial balance (required to create an account).
-        $account->date_solde = time();
-        // courant and type are the same thing but the one used when
-        // creating an account is courant
-        $account->courant = $account->type;
-
-        if ($account->create(DolibarrApiAccess::$user) < 0) {
-            throw new RestException(500, 'Error creating bank account', array_merge(array($account->error), $account->errors));
-        }
-        return $account->id;
-    }
-
-    /**
-     * Create an internal wire transfer between two bank accounts
-     *
-     * @param int     $bankaccount_from_id  BankAccount ID to use as the source of the internal wire transfer		{@from body}{@required true}
-     * @param int     $bankaccount_to_id    BankAccount ID to use as the destination of the internal wire transfer  {@from body}{@required true}
-     * @param string  $date					Date of the internal wire transfer (UNIX timestamp)						{@from body}{@required true}{@type timestamp}
-     * @param string  $description			Description of the internal wire transfer								{@from body}{@required true}
-     * @param float	  $amount				Amount to transfer from the source to the destination BankAccount		{@from body}{@required true}
-     * @param float	  $amount_to			Amount to transfer to the destination BankAccount (only when accounts does not share the same currency)		{@from body}{@required false}
-     *
-     * @url POST    /transfer
-     *
-     * @return array
-     *
-     * @status 201
-     *
-     * @throws RestException 401 Unauthorized: User does not have permission to configure bank accounts
-	 * @throws RestException 404 Not Found: Either the source or the destination bankaccount for the provided id does not exist
-     * @throws RestException 422 Unprocessable Entity: Refer to detailed exception message for the cause
-	 * @throws RestException 500 Internal Server Error: Error(s) returned by the RDBMS
-     */
-    public function transfer($bankaccount_from_id = 0, $bankaccount_to_id = 0, $date = null, $description = "", $amount = 0.0, $amount_to = 0.0)
-    {
-        if (!DolibarrApiAccess::$user->rights->banque->configurer) {
-            throw new RestException(401);
-        }
-
-        if ($bankaccount_from_id === $bankaccount_to_id) {
-            throw new RestException(422, 'bankaccount_from_id and bankaccount_to_id must be different !');
-        }
-
-        require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
-
-        $accountfrom = new Account($this->db);
-        $resultAccountFrom = $accountfrom->fetch($bankaccount_from_id);
-
-        if ($resultAccountFrom === 0) {
-            throw new RestException(404, 'The BankAccount for bankaccount_from_id provided does not exist.');
-        }
-
-        $accountto = new Account($this->db);
-        $resultAccountTo = $accountto->fetch($bankaccount_to_id);
-
-        if ($resultAccountTo === 0) {
-            throw new RestException(404, 'The BankAccount for bankaccount_to_id provided does not exist.');
-        }
-
-        if ($accountto->currency_code == $accountfrom->currency_code)
-        {
-            $amount_to = $amount;
-        } else {
-            if (!$amount_to || empty($amount_to))
-            {
-                throw new RestException(422, 'You must provide amount_to value since bankaccount_from and bankaccount_to does not share the same currency.');
-            }
-        }
-
-        $this->db->begin();
-
-        $error = 0;
-        $bank_line_id_from = 0;
-        $bank_line_id_to = 0;
-        $result = 0;
-        $user = DolibarrApiAccess::$user;
-
-        // By default, electronic transfert from bank to bank
-        $typefrom = 'PRE';
-        $typeto = 'VIR';
-
-        if ($accountto->courant == Account::TYPE_CASH || $accountfrom->courant == Account::TYPE_CASH)
-        {
-            // This is transfer of change
-            $typefrom = 'LIQ';
-            $typeto = 'LIQ';
-        }
-
-        /**
-         * Creating bank line records
-         */
-
-        if (!$error) {
-            $bank_line_id_from = $accountfrom->addline($date, $typefrom, $description, -1 * price2num($amount), '', '', $user);
-        }
-        if (!($bank_line_id_from > 0)) {
-            $error++;
-        }
-
-        if (!$error) {
-            $bank_line_id_to = $accountto->addline($date, $typeto, $description, price2num($amount_to), '', '', $user);
-        }
-        if (!($bank_line_id_to > 0)) {
-            $error++;
-        }
-
-        /**
-         * Creating links between bank line record and its source
-         */
-
-        $url = DOL_URL_ROOT.'/compta/bank/line.php?rowid=';
-        $label = '(banktransfert)';
-        $type = 'banktransfert';
-
-        if (!$error) {
-            $result = $accountfrom->add_url_line($bank_line_id_from, $bank_line_id_to, $url, $label, $type);
-        }
-        if (!($result > 0)) {
-            $error++;
-        }
-
-        if (!$error) {
-            $result = $accountto->add_url_line($bank_line_id_to, $bank_line_id_from, $url, $label, $type);
-        }
-        if (!($result > 0)) {
-            $error++;
-        }
-
-        if (!$error)
-        {
-            $this->db->commit();
-
-            return array(
-                'success' => array(
-                    'code' => 201,
-                    'message' => 'Internal wire transfer created successfully.'
-                )
-            );
-        } else {
-            $this->db->rollback();
-            throw new RestException(500, $accountfrom->error.' '.$accountto->error);
-        }
-    }
-
-    /**
-     * Update account
-     *
-     * @param int    $id              ID of account
-     * @param array  $request_data    data
-     * @return int
-     */
-    public function put($id, $request_data = null)
-    {
-        if (!DolibarrApiAccess::$user->rights->banque->configurer) {
-            throw new RestException(401);
-        }
-
-        $account = new Account($this->db);
-        $result = $account->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'account not found');
-        }
-
-        foreach ($request_data as $field => $value) {
-            if ($field == 'id') continue;
-            $account->$field = $value;
-        }
-
-        if ($account->update(DolibarrApiAccess::$user) > 0)
-        {
-            return $this->get($id);
-        } else {
-            throw new RestException(500, $account->error);
-        }
-    }
-
-    /**
-     * Delete account
-     *
-     * @param int    $id    ID of account
-     * @return array
-     */
-    public function delete($id)
-    {
-        if (!DolibarrApiAccess::$user->rights->banque->configurer) {
-            throw new RestException(401);
-        }
-        $account = new Account($this->db);
-        $result = $account->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'account not found');
-        }
-
-        if ($account->delete(DolibarrApiAccess::$user) < 0) {
-            throw new RestException(401, 'error when deleting account');
-        }
-
-        return array(
-            'success' => array(
-                'code' => 200,
-                'message' => 'account deleted'
-            )
-        );
-    }
-
-    /**
-     * Validate fields before creating an object
-     *
-     * @param array|null    $data    Data to validate
-     * @return array
-     *
-     * @throws RestException
-     */
-    private function _validate($data)
-    {
-        $account = array();
-        foreach (BankAccounts::$FIELDS as $field) {
-            if (!isset($data[$field]))
-                throw new RestException(400, "$field field missing");
-            $account[$field] = $data[$field];
-        }
-        return $account;
-    }
-
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
-    /**
-     * Clean sensible object datas
-     *
-     * @param object    $object    Object to clean
-     * @return array Array of cleaned object properties
-     */
-    protected function _cleanObjectDatas($object)
-    {
-        // phpcs:enable
-        $object = parent::_cleanObjectDatas($object);
-
-        unset($object->rowid);
-
-        return $object;
-    }
-
-    /**
-     * Get the list of lines of the account.
-     *
-     * @param int $id ID of account
-     * @return array Array of AccountLine objects
-     *
-     * @throws RestException
-     *
-     * @url GET {id}/lines
 	 * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.import_key:<:'20160101')"
-     */
-    public function getLines($id, $sqlfilters = '')
-    {
-        $list = array();
+	 * @return array                List of account objects
+	 *
+	 * @throws RestException
+	 */
+	public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $category = 0, $sqlfilters = '')
+	{
+		$list = array();
 
-        if (!DolibarrApiAccess::$user->rights->banque->lire) {
-            throw new RestException(401);
-        }
+		if (!DolibarrApiAccess::$user->rights->banque->lire) {
+			throw new RestException(401);
+		}
 
-        $account = new Account($this->db);
-        $result = $account->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'account not found');
-        }
+		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."bank_account as t";
+		if ($category > 0) {
+			$sql .= ", ".MAIN_DB_PREFIX."categorie_account as c";
+		}
+		$sql .= ' WHERE t.entity IN ('.getEntity('bank_account').')';
+		// Select accounts of given category
+		if ($category > 0) {
+			$sql .= " AND c.fk_categorie = ".$this->db->escape($category)." AND c.fk_account = t.rowid ";
+		}
+		// Add sql filters
+		if ($sqlfilters)
+		{
+			if (!DolibarrApi::_checkFilters($sqlfilters))
+			{
+				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+			}
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
 
-        $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."bank ";
-        $sql .= " WHERE fk_account = ".$id;
+		$sql .= $this->db->order($sortfield, $sortorder);
+		if ($limit) {
+			if ($page < 0)
+			{
+				$page = 0;
+			}
+			$offset = $limit * $page;
+
+			$sql .= $this->db->plimit($limit + 1, $offset);
+		}
+
+		dol_syslog("API Rest request");
+		$result = $this->db->query($sql);
+
+		if ($result) {
+			$num = $this->db->num_rows($result);
+			$min = min($num, ($limit <= 0 ? $num : $limit));
+			for ($i = 0; $i < $min; $i++) {
+				$obj = $this->db->fetch_object($result);
+				$account = new Account($this->db);
+				if ($account->fetch($obj->rowid) > 0) {
+					$list[] = $this->_cleanObjectDatas($account);
+				}
+			}
+		} else {
+			throw new RestException(503, 'Error when retrieving list of accounts: '.$this->db->lasterror());
+		}
+
+		return $list;
+	}
+
+	/**
+	 * Get account by ID.
+	 *
+	 * @param int    $id    ID of account
+	 * @return array Account object
+	 *
+	 * @throws RestException
+	 */
+	public function get($id)
+	{
+		if (!DolibarrApiAccess::$user->rights->banque->lire) {
+			throw new RestException(401);
+		}
+
+		$account = new Account($this->db);
+		$result = $account->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'account not found');
+		}
+
+		return $this->_cleanObjectDatas($account);
+	}
+
+	/**
+	 * Create account object
+	 *
+	 * @param array $request_data    Request data
+	 * @return int ID of account
+	 */
+	public function post($request_data = null)
+	{
+		if (!DolibarrApiAccess::$user->rights->banque->configurer) {
+			throw new RestException(401);
+		}
+		// Check mandatory fields
+		$result = $this->_validate($request_data);
+
+		$account = new Account($this->db);
+		foreach ($request_data as $field => $value) {
+			$account->$field = $value;
+		}
+		// Date of the initial balance (required to create an account).
+		$account->date_solde = time();
+		// courant and type are the same thing but the one used when
+		// creating an account is courant
+		$account->courant = $account->type;
+
+		if ($account->create(DolibarrApiAccess::$user) < 0) {
+			throw new RestException(500, 'Error creating bank account', array_merge(array($account->error), $account->errors));
+		}
+		return $account->id;
+	}
+
+	/**
+	 * Create an internal wire transfer between two bank accounts
+	 *
+	 * @param int     $bankaccount_from_id  BankAccount ID to use as the source of the internal wire transfer		{@from body}{@required true}
+	 * @param int     $bankaccount_to_id    BankAccount ID to use as the destination of the internal wire transfer  {@from body}{@required true}
+	 * @param string  $date					Date of the internal wire transfer (UNIX timestamp)						{@from body}{@required true}{@type timestamp}
+	 * @param string  $description			Description of the internal wire transfer								{@from body}{@required true}
+	 * @param float	  $amount				Amount to transfer from the source to the destination BankAccount		{@from body}{@required true}
+	 * @param float	  $amount_to			Amount to transfer to the destination BankAccount (only when accounts does not share the same currency)		{@from body}{@required false}
+	 *
+	 * @url POST    /transfer
+	 *
+	 * @return array
+	 *
+	 * @status 201
+	 *
+	 * @throws RestException 401 Unauthorized: User does not have permission to configure bank accounts
+	 * @throws RestException 404 Not Found: Either the source or the destination bankaccount for the provided id does not exist
+	 * @throws RestException 422 Unprocessable Entity: Refer to detailed exception message for the cause
+	 * @throws RestException 500 Internal Server Error: Error(s) returned by the RDBMS
+	 */
+	public function transfer($bankaccount_from_id = 0, $bankaccount_to_id = 0, $date = null, $description = "", $amount = 0.0, $amount_to = 0.0)
+	{
+		if (!DolibarrApiAccess::$user->rights->banque->configurer) {
+			throw new RestException(401);
+		}
+
+		if ($bankaccount_from_id === $bankaccount_to_id) {
+			throw new RestException(422, 'bankaccount_from_id and bankaccount_to_id must be different !');
+		}
+
+		require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+
+		$accountfrom = new Account($this->db);
+		$resultAccountFrom = $accountfrom->fetch($bankaccount_from_id);
+
+		if ($resultAccountFrom === 0) {
+			throw new RestException(404, 'The BankAccount for bankaccount_from_id provided does not exist.');
+		}
+
+		$accountto = new Account($this->db);
+		$resultAccountTo = $accountto->fetch($bankaccount_to_id);
+
+		if ($resultAccountTo === 0) {
+			throw new RestException(404, 'The BankAccount for bankaccount_to_id provided does not exist.');
+		}
+
+		if ($accountto->currency_code == $accountfrom->currency_code)
+		{
+			$amount_to = $amount;
+		} else {
+			if (!$amount_to || empty($amount_to))
+			{
+				throw new RestException(422, 'You must provide amount_to value since bankaccount_from and bankaccount_to does not share the same currency.');
+			}
+		}
+
+		$this->db->begin();
+
+		$error = 0;
+		$bank_line_id_from = 0;
+		$bank_line_id_to = 0;
+		$result = 0;
+		$user = DolibarrApiAccess::$user;
+
+		// By default, electronic transfert from bank to bank
+		$typefrom = 'PRE';
+		$typeto = 'VIR';
+
+		if ($accountto->courant == Account::TYPE_CASH || $accountfrom->courant == Account::TYPE_CASH)
+		{
+			// This is transfer of change
+			$typefrom = 'LIQ';
+			$typeto = 'LIQ';
+		}
+
+		/**
+		 * Creating bank line records
+		 */
+
+		if (!$error) {
+			$bank_line_id_from = $accountfrom->addline($date, $typefrom, $description, -1 * price2num($amount), '', '', $user);
+		}
+		if (!($bank_line_id_from > 0)) {
+			$error++;
+		}
+
+		if (!$error) {
+			$bank_line_id_to = $accountto->addline($date, $typeto, $description, price2num($amount_to), '', '', $user);
+		}
+		if (!($bank_line_id_to > 0)) {
+			$error++;
+		}
+
+		/**
+		 * Creating links between bank line record and its source
+		 */
+
+		$url = DOL_URL_ROOT.'/compta/bank/line.php?rowid=';
+		$label = '(banktransfert)';
+		$type = 'banktransfert';
+
+		if (!$error) {
+			$result = $accountfrom->add_url_line($bank_line_id_from, $bank_line_id_to, $url, $label, $type);
+		}
+		if (!($result > 0)) {
+			$error++;
+		}
+
+		if (!$error) {
+			$result = $accountto->add_url_line($bank_line_id_to, $bank_line_id_from, $url, $label, $type);
+		}
+		if (!($result > 0)) {
+			$error++;
+		}
+
+		if (!$error)
+		{
+			$this->db->commit();
+
+			return array(
+				'success' => array(
+					'code' => 201,
+					'message' => 'Internal wire transfer created successfully.'
+				)
+			);
+		} else {
+			$this->db->rollback();
+			throw new RestException(500, $accountfrom->error.' '.$accountto->error);
+		}
+	}
+
+	/**
+	 * Update account
+	 *
+	 * @param int    $id              ID of account
+	 * @param array  $request_data    data
+	 * @return int
+	 */
+	public function put($id, $request_data = null)
+	{
+		if (!DolibarrApiAccess::$user->rights->banque->configurer) {
+			throw new RestException(401);
+		}
+
+		$account = new Account($this->db);
+		$result = $account->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'account not found');
+		}
+
+		foreach ($request_data as $field => $value) {
+			if ($field == 'id') continue;
+			$account->$field = $value;
+		}
+
+		if ($account->update(DolibarrApiAccess::$user) > 0)
+		{
+			return $this->get($id);
+		} else {
+			throw new RestException(500, $account->error);
+		}
+	}
+
+	/**
+	 * Delete account
+	 *
+	 * @param int    $id    ID of account
+	 * @return array
+	 */
+	public function delete($id)
+	{
+		if (!DolibarrApiAccess::$user->rights->banque->configurer) {
+			throw new RestException(401);
+		}
+		$account = new Account($this->db);
+		$result = $account->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'account not found');
+		}
+
+		if ($account->delete(DolibarrApiAccess::$user) < 0) {
+			throw new RestException(401, 'error when deleting account');
+		}
+
+		return array(
+			'success' => array(
+				'code' => 200,
+				'message' => 'account deleted'
+			)
+		);
+	}
+
+	/**
+	 * Validate fields before creating an object
+	 *
+	 * @param array|null    $data    Data to validate
+	 * @return array
+	 *
+	 * @throws RestException
+	 */
+	private function _validate($data)
+	{
+		$account = array();
+		foreach (BankAccounts::$FIELDS as $field) {
+			if (!isset($data[$field]))
+				throw new RestException(400, "$field field missing");
+			$account[$field] = $data[$field];
+		}
+		return $account;
+	}
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	/**
+	 * Clean sensible object datas
+	 *
+	 * @param   Object  $object     Object to clean
+	 * @return  Object              Object with cleaned properties
+	 */
+	protected function _cleanObjectDatas($object)
+	{
+		// phpcs:enable
+		$object = parent::_cleanObjectDatas($object);
+
+		unset($object->rowid);
+
+		return $object;
+	}
+
+	/**
+	 * Get the list of lines of the account.
+	 *
+	 * @param int $id ID of account
+	 * @return array Array of AccountLine objects
+	 *
+	 * @throws RestException
+	 *
+	 * @url GET {id}/lines
+	 * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.import_key:<:'20160101')"
+	 */
+	public function getLines($id, $sqlfilters = '')
+	{
+		$list = array();
+
+		if (!DolibarrApiAccess::$user->rights->banque->lire) {
+			throw new RestException(401);
+		}
+
+		$account = new Account($this->db);
+		$result = $account->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'account not found');
+		}
+
+		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."bank ";
+		$sql .= " WHERE fk_account = ".$id;
 
 		// Add sql filters
 		if ($sqlfilters)
@@ -443,105 +443,105 @@ class BankAccounts extends DolibarrApi
 			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
-        $sql .= " ORDER BY rowid";
+		$sql .= " ORDER BY rowid";
 
-        $result = $this->db->query($sql);
+		$result = $this->db->query($sql);
 
-        if ($result) {
-            $num = $this->db->num_rows($result);
-            for ($i = 0; $i < $num; $i++) {
-                $obj = $this->db->fetch_object($result);
-                $accountLine = new AccountLine($this->db);
-                if ($accountLine->fetch($obj->rowid) > 0) {
-                    $list[] = $this->_cleanObjectDatas($accountLine);
-                }
-            }
-        } else {
-            throw new RestException(503, 'Error when retrieving list of account lines: '.$accountLine->error);
-        }
+		if ($result) {
+			$num = $this->db->num_rows($result);
+			for ($i = 0; $i < $num; $i++) {
+				$obj = $this->db->fetch_object($result);
+				$accountLine = new AccountLine($this->db);
+				if ($accountLine->fetch($obj->rowid) > 0) {
+					$list[] = $this->_cleanObjectDatas($accountLine);
+				}
+			}
+		} else {
+			throw new RestException(503, 'Error when retrieving list of account lines: '.$accountLine->error);
+		}
 
-        return $list;
-    }
+		return $list;
+	}
 
-    /**
-     * Add a line to an account
-     *
-     * @param int    $id            ID of account
-     * @param int    $date          Payment date (timestamp) {@from body} {@type timestamp}
-     * @param string $type          Payment mode (TYP,VIR,PRE,LIQ,VAD,CB,CHQ...) {@from body}
-     * @param string $label         Label {@from body}
-     * @param float  $amount        Amount (may be 0) {@from body}
-     * @param int    $category      Category
-     * @param string $cheque_number Cheque numberl {@from body}
-     * @param string $cheque_writer Name of cheque writer {@from body}
-     * @param string $cheque_bank   Bank of cheque writer {@from body}
-     * @return int  ID of line
-     *
-     * @url POST {id}/lines
-     */
-    public function addLine($id, $date, $type, $label, $amount, $category = 0, $cheque_number = '', $cheque_writer = '', $cheque_bank = '')
-    {
-        if (!DolibarrApiAccess::$user->rights->banque->modifier) {
-            throw new RestException(401);
-        }
+	/**
+	 * Add a line to an account
+	 *
+	 * @param int    $id            ID of account
+	 * @param int    $date          Payment date (timestamp) {@from body} {@type timestamp}
+	 * @param string $type          Payment mode (TYP,VIR,PRE,LIQ,VAD,CB,CHQ...) {@from body}
+	 * @param string $label         Label {@from body}
+	 * @param float  $amount        Amount (may be 0) {@from body}
+	 * @param int    $category      Category
+	 * @param string $cheque_number Cheque numberl {@from body}
+	 * @param string $cheque_writer Name of cheque writer {@from body}
+	 * @param string $cheque_bank   Bank of cheque writer {@from body}
+	 * @return int  ID of line
+	 *
+	 * @url POST {id}/lines
+	 */
+	public function addLine($id, $date, $type, $label, $amount, $category = 0, $cheque_number = '', $cheque_writer = '', $cheque_bank = '')
+	{
+		if (!DolibarrApiAccess::$user->rights->banque->modifier) {
+			throw new RestException(401);
+		}
 
-        $account = new Account($this->db);
-        $result = $account->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'account not found');
-        }
+		$account = new Account($this->db);
+		$result = $account->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'account not found');
+		}
 
-        $result = $account->addline(
-            $date,
-            $type,
-            $label,
-            $amount,
-            $cheque_number,
-            $category,
-            DolibarrApiAccess::$user,
-            $cheque_writer, $cheque_bank
-        );
-        if ($result < 0) {
-            throw new RestException(503, 'Error when adding line to account: '.$account->error);
-        }
-        return $result;
-    }
+		$result = $account->addline(
+			$date,
+			$type,
+			$label,
+			$amount,
+			$cheque_number,
+			$category,
+			DolibarrApiAccess::$user,
+			$cheque_writer, $cheque_bank
+		);
+		if ($result < 0) {
+			throw new RestException(503, 'Error when adding line to account: '.$account->error);
+		}
+		return $result;
+	}
 
-    /**
-     * Add a link to an account line
-     *
-     * @param int    $id    		ID of account
-     * @param int    $line_id       ID of account line
-     * @param int    $url_id        ID to set in the URL {@from body}
-     * @param string $url           URL of the link {@from body}
-     * @param string $label         Label {@from body}
-     * @param string $type          Type of link ('payment', 'company', 'member', ...) {@from body}
-     * @return int  ID of link
-     *
-     * @url POST {id}/lines/{line_id}/links
-     */
-    public function addLink($id, $line_id, $url_id, $url, $label, $type)
-    {
-        if (!DolibarrApiAccess::$user->rights->banque->modifier) {
-            throw new RestException(401);
-        }
+	/**
+	 * Add a link to an account line
+	 *
+	 * @param int    $id    		ID of account
+	 * @param int    $line_id       ID of account line
+	 * @param int    $url_id        ID to set in the URL {@from body}
+	 * @param string $url           URL of the link {@from body}
+	 * @param string $label         Label {@from body}
+	 * @param string $type          Type of link ('payment', 'company', 'member', ...) {@from body}
+	 * @return int  ID of link
+	 *
+	 * @url POST {id}/lines/{line_id}/links
+	 */
+	public function addLink($id, $line_id, $url_id, $url, $label, $type)
+	{
+		if (!DolibarrApiAccess::$user->rights->banque->modifier) {
+			throw new RestException(401);
+		}
 
-        $account = new Account($this->db);
-        $result = $account->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'account not found');
-        }
+		$account = new Account($this->db);
+		$result = $account->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'account not found');
+		}
 
-        $accountLine = new AccountLine($this->db);
-        $result = $accountLine->fetch($line_id);
-        if (!$result) {
-            throw new RestException(404, 'account line not found');
-        }
+		$accountLine = new AccountLine($this->db);
+		$result = $accountLine->fetch($line_id);
+		if (!$result) {
+			throw new RestException(404, 'account line not found');
+		}
 
-        $result = $account->add_url_line($line_id, $url_id, $url, $label, $type);
-        if ($result < 0) {
-            throw new RestException(503, 'Error when adding link to account line: '.$account->error);
-        }
-        return $result;
-    }
+		$result = $account->add_url_line($line_id, $url_id, $url, $label, $type);
+		if ($result < 0) {
+			throw new RestException(503, 'Error when adding link to account line: '.$account->error);
+		}
+		return $result;
+	}
 }
diff --git a/htdocs/compta/bank/class/bankcateg.class.php b/htdocs/compta/bank/class/bankcateg.class.php
index c7e86e51cfb..99a941b074d 100644
--- a/htdocs/compta/bank/class/bankcateg.class.php
+++ b/htdocs/compta/bank/class/bankcateg.class.php
@@ -30,20 +30,20 @@ class BankCateg // extends CommonObject
 {
 	//public $element='bank_categ';			//!< Id that identify managed objects
 	//public $table_element='bank_categ';	//!< Name of table without prefix where object is stored
-    /**
+	/**
 	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
 	 */
 	public $picto = 'generic';
 
 	/**
-     * @var int ID
-     */
-    public $id;
+	 * @var int ID
+	 */
+	public $id;
 
 	/**
-     * @var string bank categories label
-     */
-    public $label;
+	 * @var string bank categories label
+	 */
+	public $label;
 
 
 	/**
@@ -213,46 +213,46 @@ class BankCateg // extends CommonObject
 		// Delete link between tag and bank account
 		if (!$error)
 		{
-		    $sql = "DELETE FROM ".MAIN_DB_PREFIX."categorie_account";
-    		$sql .= " WHERE fk_categorie = ".$this->id;
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX."categorie_account";
+			$sql .= " WHERE fk_categorie = ".$this->id;
 
-    		$resql = $this->db->query($sql);
-    		if (!$resql)
-    		{
-    		    $error++;
-    		    $this->errors[] = "Error ".$this->db->lasterror();
-    		}
+			$resql = $this->db->query($sql);
+			if (!$resql)
+			{
+				$error++;
+				$this->errors[] = "Error ".$this->db->lasterror();
+			}
 		}
 
 		// Delete link between tag and bank lines
 		if (!$error)
 		{
-		    $sql = "DELETE FROM ".MAIN_DB_PREFIX."bank_class";
-		    $sql .= " WHERE fk_categ = ".$this->id;
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX."bank_class";
+			$sql .= " WHERE fk_categ = ".$this->id;
 
-		    $resql = $this->db->query($sql);
-		    if (!$resql)
-		    {
-		        $error++;
-		        $this->errors[] = "Error ".$this->db->lasterror();
-		    }
+			$resql = $this->db->query($sql);
+			if (!$resql)
+			{
+				$error++;
+				$this->errors[] = "Error ".$this->db->lasterror();
+			}
 		}
 
 		// Delete bank categ
 		if (!$error)
 		{
-    		$sql = "DELETE FROM ".MAIN_DB_PREFIX."bank_categ";
-    		$sql .= " WHERE rowid=".$this->id;
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX."bank_categ";
+			$sql .= " WHERE rowid=".$this->id;
 
-    		$resql = $this->db->query($sql);
-    		if (!$resql)
-    		{
-    			$error++;
-    			$this->errors[] = "Error ".$this->db->lasterror();
-    		}
+			$resql = $this->db->query($sql);
+			if (!$resql)
+			{
+				$error++;
+				$this->errors[] = "Error ".$this->db->lasterror();
+			}
 		}
 
-    	// Commit or rollback
+		// Commit or rollback
 		if ($error) {
 			foreach ($this->errors as $errmsg) {
 				dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
diff --git a/htdocs/compta/bank/class/paymentvarious.class.php b/htdocs/compta/bank/class/paymentvarious.class.php
index 157a7096eb8..668417c0ee2 100644
--- a/htdocs/compta/bank/class/paymentvarious.class.php
+++ b/htdocs/compta/bank/class/paymentvarious.class.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2017-2019  Alexandre Spangaro      <aspangaro@open-dsi.fr>
- * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2020  Frédéric France         <frederic.france@netlogic.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -63,35 +63,41 @@ class PaymentVarious extends CommonObject
 	public $amount;
 	public $type_payment;
 	public $num_payment;
-    public $category_transaction;
+	public $category_transaction;
 
 	/**
-     * @var string various payments label
-     */
-    public $label;
+	 * @var string various payments label
+	 */
+	public $label;
 
+	/**
+	 * @var string accountancy code
+	 */
 	public $accountancy_code;
 
-    public $subledger_account;
+	/**
+	 * @var string subledger account
+	 */
+	public $subledger_account;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_project;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_bank;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_user_author;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_user_modif;
 
 
@@ -121,6 +127,9 @@ class PaymentVarious extends CommonObject
 	 */
 
 	// BEGIN MODULEBUILDER PROPERTIES
+	/**
+	 * @var array fields definition
+	 */
 	public $fields = array(
 		// TODO: fill this array
 	);
@@ -131,7 +140,7 @@ class PaymentVarious extends CommonObject
 	 *
 	 *  @param		DoliDB		$db      Database handler
 	 */
-    public function __construct($db)
+	public function __construct($db)
 	{
 		$this->db = $db;
 		$this->element = 'payment_various';
@@ -145,7 +154,7 @@ class PaymentVarious extends CommonObject
 	 * @param   int		$notrigger      0=no, 1=yes (no update trigger)
 	 * @return  int         			<0 if KO, >0 if OK
 	 */
-    public function update($user = null, $notrigger = 0)
+	public function update($user = null, $notrigger = 0)
 	{
 		global $conf, $langs;
 
@@ -173,7 +182,7 @@ class PaymentVarious extends CommonObject
 		$sql .= " label='".$this->db->escape($this->label)."',";
 		$sql .= " note='".$this->db->escape($this->note)."',";
 		$sql .= " accountancy_code='".$this->db->escape($this->accountancy_code)."',";
-        $sql .= " subledger_account='".$this->db->escape($this->subledger_account)."',";
+		$sql .= " subledger_account='".$this->db->escape($this->subledger_account)."',";
 		$sql .= " fk_projet='".$this->db->escape($this->fk_project)."',";
 		$sql .= " fk_bank=".($this->fk_bank > 0 ? $this->fk_bank : "null").",";
 		$sql .= " fk_user_author=".(int) $this->fk_user_author.",";
@@ -182,22 +191,19 @@ class PaymentVarious extends CommonObject
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if (!$resql)
-		{
+		if (!$resql) {
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
 
-		if (!$notrigger)
-		{
+		if (!$notrigger) {
 			// Call trigger
 			$result = $this->call_trigger('PAYMENT_VARIOUS_MODIFY', $user);
 			if ($result < 0) $error++;
 			// End call triggers
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$this->db->commit();
 			return 1;
 		} else {
@@ -214,7 +220,7 @@ class PaymentVarious extends CommonObject
 	 *  @param  User	$user       User that load
 	 *  @return int         		<0 if KO, >0 if OK
 	 */
-    public function fetch($id, $user = null)
+	public function fetch($id, $user = null)
 	{
 		global $langs;
 		$sql = "SELECT";
@@ -286,7 +292,7 @@ class PaymentVarious extends CommonObject
 	 *	@param	User	$user       User that delete
 	 *	@return	int					<0 if KO, >0 if OK
 	 */
-    public function delete($user)
+	public function delete($user)
 	{
 		global $conf, $langs;
 
@@ -303,8 +309,7 @@ class PaymentVarious extends CommonObject
 
 		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if (!$resql)
-		{
+		if (!$resql) {
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
@@ -320,7 +325,7 @@ class PaymentVarious extends CommonObject
 	 *
 	 *  @return	void
 	 */
-    public function initAsSpecimen()
+	public function initAsSpecimen()
 	{
 		$this->id = 0;
 
@@ -331,7 +336,7 @@ class PaymentVarious extends CommonObject
 		$this->amount = '';
 		$this->label = '';
 		$this->accountancy_code = '';
-        $this->subledger_account = '';
+		$this->subledger_account = '';
 		$this->note = '';
 		$this->fk_bank = '';
 		$this->fk_user_author = '';
@@ -348,8 +353,7 @@ class PaymentVarious extends CommonObject
 		$newamount = price2num($this->amount, 'MT');
 
 		// Validation of parameters
-		if (!($newamount) > 0 || empty($this->datep))
-		{
+		if (!($newamount) > 0 || empty($this->datep)) {
 			return false;
 		}
 
@@ -362,7 +366,7 @@ class PaymentVarious extends CommonObject
 	 *  @param   User   $user   User that create
 	 *  @return  int            <0 if KO, >0 if OK
 	 */
-    public function create($user)
+	public function create($user)
 	{
 		global $conf, $langs;
 
@@ -460,13 +464,13 @@ class PaymentVarious extends CommonObject
 					$sign = 1;
 					if ($this->sens == '0') $sign = -1;
 
-                    $bank_line_id = $acc->addline(
+					$bank_line_id = $acc->addline(
 						$this->datep,
 						$this->type_payment,
 						$this->label,
 						$sign * abs($this->amount),
 						$this->num_payment,
-                        ($this->category_transaction > 0 ? $this->category_transaction : 0),
+						($this->category_transaction > 0 ? $this->category_transaction : 0),
 						$user,
 						'',
 						'',
@@ -476,8 +480,7 @@ class PaymentVarious extends CommonObject
 
 					// Update fk_bank into llx_paiement.
 					// So we know the payment which has generate the banking ecriture
-					if ($bank_line_id > 0)
-					{
+					if ($bank_line_id > 0) {
 						$this->update_fk_bank($bank_line_id);
 					} else {
 						$this->error = $acc->error;
@@ -525,16 +528,16 @@ class PaymentVarious extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Update link between payment various and line generate into llx_bank
 	 *
 	 *  @param  int     $id_bank    Id bank account
 	 *	@return int                 <0 if KO, >0 if OK
 	 */
-    public function update_fk_bank($id_bank)
+	public function update_fk_bank($id_bank)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.'payment_various SET fk_bank = '.$id_bank;
 		$sql .= ' WHERE rowid = '.$this->id;
 		$result = $this->db->query($sql);
@@ -554,12 +557,12 @@ class PaymentVarious extends CommonObject
 	 * @param	int		$mode   	0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto
 	 * @return  string   		   	Libelle
 	 */
-    public function getLibStatut($mode = 0)
+	public function getLibStatut($mode = 0)
 	{
 		return $this->LibStatut($this->statut, $mode);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Renvoi le libelle d'un statut donne
 	 *
@@ -567,34 +570,28 @@ class PaymentVarious extends CommonObject
 	 *  @param  int		$mode       0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto
 	 *  @return string      		Libelle
 	 */
-    public function LibStatut($status, $mode = 0)
+	public function LibStatut($status, $mode = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 
-		if ($mode == 0)
-		{
+		if ($mode == 0) {
 			return $langs->trans($this->statuts[$status]);
-		} elseif ($mode == 1)
-		{
+		} elseif ($mode == 1) {
 			return $langs->trans($this->statuts_short[$status]);
-		} elseif ($mode == 2)
-		{
+		} elseif ($mode == 2) {
 			if ($status == 0) return img_picto($langs->trans($this->statuts_short[$status]), 'statut0').' '.$langs->trans($this->statuts_short[$status]);
 			elseif ($status == 1) return img_picto($langs->trans($this->statuts_short[$status]), 'statut4').' '.$langs->trans($this->statuts_short[$status]);
 			elseif ($status == 2) return img_picto($langs->trans($this->statuts_short[$status]), 'statut6').' '.$langs->trans($this->statuts_short[$status]);
-		} elseif ($mode == 3)
-		{
+		} elseif ($mode == 3) {
 			if ($status == 0 && !empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]), 'statut0');
 			elseif ($status == 1 && !empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]), 'statut4');
 			elseif ($status == 2 && !empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]), 'statut6');
-		} elseif ($mode == 4)
-		{
+		} elseif ($mode == 4) {
 			if ($status == 0 && !empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]), 'statut0').' '.$langs->trans($this->statuts[$status]);
 			elseif ($status == 1 && !empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]), 'statut4').' '.$langs->trans($this->statuts[$status]);
 			elseif ($status == 2 && !empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]), 'statut6').' '.$langs->trans($this->statuts[$status]);
-		} elseif ($mode == 5)
-		{
+		} elseif ($mode == 5) {
 			if ($status == 0 && !empty($this->statuts_short[$status])) return $langs->trans($this->statuts_short[$status]).' '.img_picto($langs->trans($this->statuts_short[$status]), 'statut0');
 			elseif ($status == 1 && !empty($this->statuts_short[$status])) return $langs->trans($this->statuts_short[$status]).' '.img_picto($langs->trans($this->statuts_short[$status]), 'statut4');
 			elseif ($status == 2 && !empty($this->statuts_short[$status])) return $langs->trans($this->statuts_short[$status]).' '.img_picto($langs->trans($this->statuts_short[$status]), 'statut6');
@@ -608,10 +605,11 @@ class PaymentVarious extends CommonObject
 	 *	@param  int		$withpicto					0=No picto, 1=Include picto into link, 2=Only picto
 	 *	@param  string	$option						link option
 	 *  @param  int     $save_lastsearch_value	 	-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
-     *  @param	int  	$notooltip		 			1=Disable tooltip
+	 *  @param	int  	$notooltip		 			1=Disable tooltip
+	 *  @param	string  $morecss                    morecss string
 	 *	@return string								String with URL
 	 */
-    public function getNomUrl($withpicto = 0, $option = '', $save_lastsearch_value = -1, $notooltip = 0)
+	public function getNomUrl($withpicto = 0, $option = '', $save_lastsearch_value = -1, $notooltip = 0, $morecss = '')
 	{
 		global $db, $conf, $langs, $hookmanager;
 		global $langs;
@@ -679,8 +677,8 @@ class PaymentVarious extends CommonObject
 	 * @param  int      $id      Id of record
 	 * @return void
 	 */
-    public function info($id)
-    {
+	public function info($id)
+	{
 		$sql = 'SELECT v.rowid, v.datec, v.fk_user_author';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'payment_various as v';
 		$sql .= ' WHERE v.rowid = '.$id;
diff --git a/htdocs/compta/bank/document.php b/htdocs/compta/bank/document.php
index 1369a629d2f..c67c0496727 100644
--- a/htdocs/compta/bank/document.php
+++ b/htdocs/compta/bank/document.php
@@ -41,11 +41,11 @@ $confirm = GETPOST('confirm', 'alpha');
 
 // Security check
 if ($user->socid) {
-    $action = '';
-    $socid = $user->socid;
+	$action = '';
+	$socid = $user->socid;
 }
 if ($user->socid)
-    $socid = $user->socid;
+	$socid = $user->socid;
 
 // Get parameters
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
@@ -57,9 +57,9 @@ $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 if (!$sortorder)
-    $sortorder = "ASC";
+	$sortorder = "ASC";
 if (!$sortfield)
-    $sortfield = "name";
+	$sortfield = "name";
 
 $object = new Account($db);
 if ($id > 0 || !empty($ref)) $object->fetch($id, $ref);
@@ -73,8 +73,8 @@ $result = restrictedArea($user, 'banque', $object->id, 'bank_account', '', '');
 
 if ($object->id > 0)
 {
-    $object->fetch_thirdparty();
-    $upload_dir = $conf->bank->dir_output."/".dol_sanitizeFileName($object->ref);
+	$object->fetch_thirdparty();
+	$upload_dir = $conf->bank->dir_output."/".dol_sanitizeFileName($object->ref);
 }
 
 include_once DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
@@ -91,52 +91,52 @@ llxHeader('', $title, $helpurl);
 $form = new Form($db);
 
 if ($id > 0 || !empty($ref)) {
-    if ($object->fetch($id, $ref)) {
-        $upload_dir = $conf->bank->dir_output.'/'.$object->ref;
+	if ($object->fetch($id, $ref)) {
+		$upload_dir = $conf->bank->dir_output.'/'.$object->ref;
 
-        // Onglets
-        $head = bank_prepare_head($object);
-        print dol_get_fiche_head($head, 'document', $langs->trans("FinancialAccount"), -1, 'account');
+		// Onglets
+		$head = bank_prepare_head($object);
+		print dol_get_fiche_head($head, 'document', $langs->trans("FinancialAccount"), -1, 'account');
 
 
-        // Build file list
-        $filearray = dol_dir_list($upload_dir, "files", 0, '', '\.meta$', $sortfield, (strtolower($sortorder) == 'desc' ? SORT_DESC : SORT_ASC), 1);
-        $totalsize = 0;
-        foreach ($filearray as $key => $file) {
-            $totalsize += $file['size'];
-        }
+		// Build file list
+		$filearray = dol_dir_list($upload_dir, "files", 0, '', '\.meta$', $sortfield, (strtolower($sortorder) == 'desc' ? SORT_DESC : SORT_ASC), 1);
+		$totalsize = 0;
+		foreach ($filearray as $key => $file) {
+			$totalsize += $file['size'];
+		}
 
-        $morehtmlref = '';
+		$morehtmlref = '';
 
-        $linkback = '<a href="'.DOL_URL_ROOT.'/compta/bank/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+		$linkback = '<a href="'.DOL_URL_ROOT.'/compta/bank/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-        dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+		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>';
 
-        print '<table class="border tableforfield centpercent">';
-        print '<tr><td class="titlefield">'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
-        print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.dol_print_size($totalsize, 1, 1).'</td></tr>';
-        print "</table>\n";
+		print '<table class="border tableforfield centpercent">';
+		print '<tr><td class="titlefield">'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
+		print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.dol_print_size($totalsize, 1, 1).'</td></tr>';
+		print "</table>\n";
 
-        print '</div>';
+		print '</div>';
 
-        dol_fiche_end();
+		print dol_get_fiche_end();
 
 
-        $modulepart = 'bank';
-        $permission = $user->rights->banque->modifier;
-        $permtoedit = $user->rights->banque->modifier;
-        $param = '&id='.$object->id;
-        include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
-    } else {
-        dol_print_error($db);
-    }
+		$modulepart = 'bank';
+		$permission = $user->rights->banque->modifier;
+		$permtoedit = $user->rights->banque->modifier;
+		$param = '&id='.$object->id;
+		include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
+	} else {
+		dol_print_error($db);
+	}
 } else {
-    Header('Location: index.php');
-    exit;
+	Header('Location: index.php');
+	exit;
 }
 
 // End of page
diff --git a/htdocs/compta/bank/graph.php b/htdocs/compta/bank/graph.php
index 496988ba74a..f141abc8e87 100644
--- a/htdocs/compta/bank/graph.php
+++ b/htdocs/compta/bank/graph.php
@@ -741,14 +741,14 @@ if ($account)
 		if ($_GET["option"] != 'all')
 		{
 			$morehtml = '<a href="'.$_SERVER["PHP_SELF"].'?account='.$account.'&option=all'.$moreparam.'">'.$langs->trans("ShowAllAccounts").'</a>';
-    		dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', '', $moreparam, 0, '', '', 1);
+			dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', '', $moreparam, 0, '', '', 1);
 		} else {
 			$morehtml = '<a href="'.$_SERVER["PHP_SELF"].'?account='.$account.$moreparam.'">'.$langs->trans("BackToAccount").'</a>';
 			print $langs->trans("AllAccounts");
 			//print $morehtml;
 		}
 	} else {
-	    $bankaccount = new Account($db);
+		$bankaccount = new Account($db);
 		$listid = explode(',', $account);
 		foreach ($listid as $key => $id)
 		{
@@ -762,7 +762,7 @@ if ($account)
 	print $langs->trans("AllAccounts");
 }
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 print '<table class="notopnoleftnoright" width="100%">';
diff --git a/htdocs/compta/bank/line.php b/htdocs/compta/bank/line.php
index eab2c1ad182..dd14ebf4e54 100644
--- a/htdocs/compta/bank/line.php
+++ b/htdocs/compta/bank/line.php
@@ -65,30 +65,30 @@ if (!$user->rights->banque->lire && !$user->rights->banque->consolidate) accessf
 
 if ($cancel)
 {
-    if ($backtopage)
-    {
-        header("Location: ".$backtopage);
-        exit;
-    }
+	if ($backtopage)
+	{
+		header("Location: ".$backtopage);
+		exit;
+	}
 }
 
 
 if ($user->rights->banque->consolidate && $action == 'donext')
 {
-    $al = new AccountLine($db);
-    $al->dateo_next($_GET["rowid"]);
+	$al = new AccountLine($db);
+	$al->dateo_next($_GET["rowid"]);
 } elseif ($user->rights->banque->consolidate && $action == 'doprev')
 {
-    $al = new AccountLine($db);
-    $al->dateo_previous($_GET["rowid"]);
+	$al = new AccountLine($db);
+	$al->dateo_previous($_GET["rowid"]);
 } elseif ($user->rights->banque->consolidate && $action == 'dvnext')
 {
-    $al = new AccountLine($db);
-    $al->datev_next($_GET["rowid"]);
+	$al = new AccountLine($db);
+	$al->datev_next($_GET["rowid"]);
 } elseif ($user->rights->banque->consolidate && $action == 'dvprev')
 {
-    $al = new AccountLine($db);
-    $al->datev_previous($_GET["rowid"]);
+	$al = new AccountLine($db);
+	$al->datev_previous($_GET["rowid"]);
 }
 
 if ($action == 'confirm_delete_categ' && $confirm == "yes" && $user->rights->banque->modifier)
@@ -96,10 +96,10 @@ if ($action == 'confirm_delete_categ' && $confirm == "yes" && $user->rights->ban
 	$cat1 = GETPOST("cat1", 'int');
 	if (!empty($rowid) && !empty($cat1)) {
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."bank_class WHERE lineid = ".$rowid." AND fk_categ = ".$cat1;
-    	if (!$db->query($sql))
-    	{
-        	dol_print_error($db);
-    	}
+		if (!$db->query($sql))
+		{
+			dol_print_error($db);
+		}
 	} else {
 		setEventMessages($langs->trans("MissingIds"), null, 'errors');
 	}
@@ -157,31 +157,31 @@ if ($user->rights->banque->modifier && $action == "update")
 		$result = $db->query($sql);
 		if (!$result)
 		{
-		    $error++;
+			$error++;
 		}
 
 		if (!$error)
 		{
-            $arrayofcategs = GETPOST('custcats', 'array');
-    		$sql = "DELETE FROM ".MAIN_DB_PREFIX."bank_class WHERE lineid = ".$rowid;
-    		if (!$db->query($sql))
-    		{
-    		    $error++;
-    		    dol_print_error($db);
-    		}
-    		if (count($arrayofcategs))
-    		{
-        		foreach ($arrayofcategs as $val)
-        		{
-            		$sql = "INSERT INTO ".MAIN_DB_PREFIX."bank_class (lineid, fk_categ) VALUES (".$rowid.", ".$val.")";
-            		if (!$db->query($sql))
-            		{
-            		    $error++;
-            		    dol_print_error($db);
-            		}
-        		}
-        		// $arrayselected will be loaded after in page output
-    		}
+			$arrayofcategs = GETPOST('custcats', 'array');
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX."bank_class WHERE lineid = ".$rowid;
+			if (!$db->query($sql))
+			{
+				$error++;
+				dol_print_error($db);
+			}
+			if (count($arrayofcategs))
+			{
+				foreach ($arrayofcategs as $val)
+				{
+					$sql = "INSERT INTO ".MAIN_DB_PREFIX."bank_class (lineid, fk_categ) VALUES (".$rowid.", ".$val.")";
+					if (!$db->query($sql))
+					{
+						$error++;
+						dol_print_error($db);
+					}
+				}
+				// $arrayselected will be loaded after in page output
+			}
 		}
 
 		if (!$error)
@@ -198,37 +198,37 @@ if ($user->rights->banque->modifier && $action == "update")
 // Reconcile
 if ($user->rights->banque->consolidate && ($action == 'num_releve' || $action == 'setreconcile'))
 {
-    $num_rel = trim($_POST["num_rel"]);
-    $rappro = $_POST['reconciled'] ? 1 : 0;
+	$num_rel = trim($_POST["num_rel"]);
+	$rappro = $_POST['reconciled'] ? 1 : 0;
 
-    // Check parameters
-    if ($rappro && empty($num_rel))
-    {
-	    setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("AccountStatement")), null, 'errors');
-        $error++;
-    }
+	// Check parameters
+	if ($rappro && empty($num_rel))
+	{
+		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("AccountStatement")), null, 'errors');
+		$error++;
+	}
 
-    if (!$error)
-    {
-        $db->begin();
+	if (!$error)
+	{
+		$db->begin();
 
-        $sql = "UPDATE ".MAIN_DB_PREFIX."bank";
-        $sql .= " SET num_releve=".($num_rel ? "'".$db->escape($num_rel)."'" : "null");
-        if (empty($num_rel)) $sql .= ", rappro = 0";
-        else $sql .= ", rappro = ".$rappro;
-        $sql .= " WHERE rowid = ".$rowid;
+		$sql = "UPDATE ".MAIN_DB_PREFIX."bank";
+		$sql .= " SET num_releve=".($num_rel ? "'".$db->escape($num_rel)."'" : "null");
+		if (empty($num_rel)) $sql .= ", rappro = 0";
+		else $sql .= ", rappro = ".$rappro;
+		$sql .= " WHERE rowid = ".$rowid;
 
-        dol_syslog("line.php", LOG_DEBUG);
-        $result = $db->query($sql);
-        if ($result)
-        {
-	        setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
-            $db->commit();
-        } else {
-            $db->rollback();
-            dol_print_error($db);
-        }
-    }
+		dol_syslog("line.php", LOG_DEBUG);
+		$result = $db->query($sql);
+		if ($result)
+		{
+			setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
+			$db->commit();
+		} else {
+			$db->rollback();
+			dol_print_error($db);
+		}
+	}
 }
 
 
@@ -244,7 +244,7 @@ llxHeader('', $langs->trans("BankTransaction"));
 $c = new Categorie($db);
 $cats = $c->containing($rowid, Categorie::TYPE_BANK_LINE);
 foreach ($cats as $cat) {
-    $arrayselected[] = $cat->id;
+	$arrayselected[] = $cat->id;
 }
 
 $head = bankline_prepare_head($rowid);
@@ -259,385 +259,385 @@ $sql .= " ORDER BY dateo ASC";
 $result = $db->query($sql);
 if ($result)
 {
-    $i = 0; $total = 0;
-    if ($db->num_rows($result))
-    {
-        $objp = $db->fetch_object($result);
+	$i = 0; $total = 0;
+	if ($db->num_rows($result))
+	{
+		$objp = $db->fetch_object($result);
 
-        $total = $total + $objp->amount;
+		$total = $total + $objp->amount;
 
-        $acct = new Account($db);
-        $acct->fetch($objp->fk_account);
-        $account = $acct->id;
+		$acct = new Account($db);
+		$acct->fetch($objp->fk_account);
+		$account = $acct->id;
 
-        $bankline = new AccountLine($db);
-        $bankline->fetch($rowid, $ref);
+		$bankline = new AccountLine($db);
+		$bankline->fetch($rowid, $ref);
 
-        $links = $acct->get_url($rowid);
-        $bankline->load_previous_next_ref('', 'rowid');
+		$links = $acct->get_url($rowid);
+		$bankline->load_previous_next_ref('', 'rowid');
 
-        // Confirmations
-        if ($action == 'delete_categ')
-        {
-            print $form->formconfirm($_SERVER['PHP_SELF']."?rowid=".$rowid."&cat1=".GETPOST("fk_categ")."&orig_account=".$orig_account, $langs->trans("RemoveFromRubrique"), $langs->trans("RemoveFromRubriqueConfirm"), "confirm_delete_categ", '', 'yes', 1);
-        }
+		// Confirmations
+		if ($action == 'delete_categ')
+		{
+			print $form->formconfirm($_SERVER['PHP_SELF']."?rowid=".$rowid."&cat1=".GETPOST("fk_categ")."&orig_account=".$orig_account, $langs->trans("RemoveFromRubrique"), $langs->trans("RemoveFromRubriqueConfirm"), "confirm_delete_categ", '', 'yes', 1);
+		}
 
-        print '<form name="update" method="POST" action="'.$_SERVER['PHP_SELF'].'?rowid='.$rowid.'">';
-        print '<input type="hidden" name="token" value="'.newToken().'">';
-        print '<input type="hidden" name="action" value="update">';
-        print '<input type="hidden" name="orig_account" value="'.$orig_account.'">';
-        print '<input type="hidden" name="id" value="'.$acct->id.'">';
+		print '<form name="update" method="POST" action="'.$_SERVER['PHP_SELF'].'?rowid='.$rowid.'">';
+		print '<input type="hidden" name="token" value="'.newToken().'">';
+		print '<input type="hidden" name="action" value="update">';
+		print '<input type="hidden" name="orig_account" value="'.$orig_account.'">';
+		print '<input type="hidden" name="id" value="'.$acct->id.'">';
 
-        print dol_get_fiche_head($head, 'bankline', $langs->trans('LineRecord'), 0, 'accountline', 0);
+		print dol_get_fiche_head($head, 'bankline', $langs->trans('LineRecord'), 0, 'accountline', 0);
 
-        $linkback = '<a href="'.DOL_URL_ROOT.'/compta/bank/bankentries_list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+		$linkback = '<a href="'.DOL_URL_ROOT.'/compta/bank/bankentries_list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
 
-        dol_banner_tab($bankline, 'rowid', $linkback);
+		dol_banner_tab($bankline, 'rowid', $linkback);
 
 		print '<div class="fichecenter2">';
 
-        print '<div class="underbanner clearboth"></div>';
-        print '<table class="border centpercent tableforfield">';
+		print '<div class="underbanner clearboth"></div>';
+		print '<table class="border centpercent tableforfield">';
 
-        $i++;
+		$i++;
 
-        // Bank account
-        print '<tr><td class="titlefield">'.$langs->trans("Account").'</td>';
-        print '<td>';
-        if (!$objp->rappro && !$bankline->getVentilExportCompta())
-        {
-        	$form->select_comptes($acct->id, 'accountid', 0, '', 0);
-        } else {
-        	print $acct->getNomUrl(1, 'transactions', 'reflabel');
-        }
-        print '</td>';
-        print '</tr>';
+		// Bank account
+		print '<tr><td class="titlefield">'.$langs->trans("Account").'</td>';
+		print '<td>';
+		if (!$objp->rappro && !$bankline->getVentilExportCompta())
+		{
+			$form->select_comptes($acct->id, 'accountid', 0, '', 0);
+		} else {
+			print $acct->getNomUrl(1, 'transactions', 'reflabel');
+		}
+		print '</td>';
+		print '</tr>';
 
-        // Show links of bank transactions
-        if (count($links))
-        {
-            print '<tr><td class="tdtop">'.$langs->trans("Links").'</td>';
-            print '<td>';
-            foreach ($links as $key=>$val)
-            {
-                if ($key) print '<br>';
-                if ($links[$key]['type'] == 'payment') {
-                    require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
-                    $paymenttmp = new Paiement($db);
-                    $paymenttmp->fetch($links[$key]['url_id']);
-                    $paymenttmp->ref = $langs->trans("Payment").' '.$paymenttmp->ref;
-                    /*print '<a href="'.DOL_URL_ROOT.'/compta/paiement/card.php?id='.$links[$key]['url_id'].'">';
+		// Show links of bank transactions
+		if (count($links))
+		{
+			print '<tr><td class="tdtop">'.$langs->trans("Links").'</td>';
+			print '<td>';
+			foreach ($links as $key=>$val)
+			{
+				if ($key) print '<br>';
+				if ($links[$key]['type'] == 'payment') {
+					require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
+					$paymenttmp = new Paiement($db);
+					$paymenttmp->fetch($links[$key]['url_id']);
+					$paymenttmp->ref = $langs->trans("Payment").' '.$paymenttmp->ref;
+					/*print '<a href="'.DOL_URL_ROOT.'/compta/paiement/card.php?id='.$links[$key]['url_id'].'">';
                     print img_object($langs->trans('Payment'),'payment').' ';
                     print $langs->trans("Payment");
                     print '</a>';*/
-                    print $paymenttmp->getNomUrl(1);
-                } elseif ($links[$key]['type'] == 'payment_supplier') {
-                    require_once DOL_DOCUMENT_ROOT.'/fourn/class/paiementfourn.class.php';
-                    $paymenttmp = new PaiementFourn($db);
-                    $paymenttmp->fetch($links[$key]['url_id']);
-                    $paymenttmp->ref = $langs->trans("Payment").' '.$paymenttmp->ref;
-                    /*print '<a href="'.DOL_URL_ROOT.'/fourn/paiement/card.php?id='.$links[$key]['url_id'].'">';
+					print $paymenttmp->getNomUrl(1);
+				} elseif ($links[$key]['type'] == 'payment_supplier') {
+					require_once DOL_DOCUMENT_ROOT.'/fourn/class/paiementfourn.class.php';
+					$paymenttmp = new PaiementFourn($db);
+					$paymenttmp->fetch($links[$key]['url_id']);
+					$paymenttmp->ref = $langs->trans("Payment").' '.$paymenttmp->ref;
+					/*print '<a href="'.DOL_URL_ROOT.'/fourn/paiement/card.php?id='.$links[$key]['url_id'].'">';
                     print img_object($langs->trans('Payment'),'payment').' ';
                     print $langs->trans("Payment");
                     print '</a>';*/
-                    print $paymenttmp->getNomUrl(1);
-                } elseif ($links[$key]['type'] == 'company') {
-                    $societe = new Societe($db);
-                    $societe->fetch($links[$key]['url_id']);
-                    print $societe->getNomUrl(1);
-                } elseif ($links[$key]['type'] == 'sc') {
-                    print '<a href="'.DOL_URL_ROOT.'/compta/sociales/card.php?id='.$links[$key]['url_id'].'">';
-                    print img_object($langs->trans('SocialContribution'), 'bill').' ';
-                    print $langs->trans("SocialContribution").($links[$key]['label'] ? ' - '.$links[$key]['label'] : '');
-                    print '</a>';
-                } elseif ($links[$key]['type'] == 'payment_sc') {
-                    print '<a href="'.DOL_URL_ROOT.'/compta/payment_sc/card.php?id='.$links[$key]['url_id'].'">';
-                    print img_object($langs->trans('Payment'), 'payment').' ';
-                    print $langs->trans("SocialContributionPayment");
-                    print '</a>';
-                } elseif ($links[$key]['type'] == 'payment_vat') {
-                    print '<a href="'.DOL_URL_ROOT.'/compta/tva/card.php?id='.$links[$key]['url_id'].'">';
-                    print img_object($langs->trans('VAT'), 'payment').' ';
-                    print $langs->trans("VATPayment");
-                    print '</a>';
-                } elseif ($links[$key]['type'] == 'payment_salary') {
-                    print '<a href="'.DOL_URL_ROOT.'/salaries/card.php?id='.$links[$key]['url_id'].'">';
-                    print img_object($langs->trans('PaymentSalary'), 'payment').' ';
-                    print $langs->trans("SalaryPayment");
-                    print '</a>';
-                } elseif ($links[$key]['type'] == 'payment_loan') {
-                    print '<a href="'.DOL_URL_ROOT.'/loan/payment/card.php?id='.$links[$key]['url_id'].'">';
-                    print img_object($langs->trans('LoanPayment'), 'payment').' ';
-                    print $langs->trans("PaymentLoan");
-                    print '</a>';
-                } elseif ($links[$key]['type'] == 'loan') {
-                    print '<a href="'.DOL_URL_ROOT.'/loan/card.php?id='.$links[$key]['url_id'].'">';
-                    print img_object($langs->trans('Loan'), 'bill').' ';
-                    print $langs->trans("Loan");
-                    print '</a>';
-                } elseif ($links[$key]['type'] == 'member') {
-                    print '<a href="'.DOL_URL_ROOT.'/adherents/card.php?rowid='.$links[$key]['url_id'].'">';
-                    print img_object($langs->trans('Member'), 'user').' ';
-                    print $links[$key]['label'];
-                    print '</a>';
-                } elseif ($links[$key]['type'] == 'payment_donation') {
-                    print '<a href="'.DOL_URL_ROOT.'/don/payment/card.php?id='.$links[$key]['url_id'].'">';
-                    print img_object($langs->trans('Donation'), 'payment').' ';
-                    print $langs->trans("DonationPayment");
-                    print '</a>';
-                } elseif ($links[$key]['type'] == 'banktransfert') {
-                    print '<a href="'.DOL_URL_ROOT.'/compta/bank/line.php?rowid='.$links[$key]['url_id'].'">';
-                    print img_object($langs->trans('Transaction'), 'payment').' ';
-                    print $langs->trans("TransactionOnTheOtherAccount");
-                    print '</a>';
-                } elseif ($links[$key]['type'] == 'user') {
-                    print '<a href="'.DOL_URL_ROOT.'/user/card.php?id='.$links[$key]['url_id'].'">';
-                    print img_object($langs->trans('User'), 'user').' ';
-                    print $langs->trans("User");
-                    print '</a>';
-                } elseif ($links[$key]['type'] == 'payment_various') {
-                    print '<a href="'.DOL_URL_ROOT.'/compta/bank/various_payment/card.php?id='.$links[$key]['url_id'].'">';
-                    print img_object($langs->trans('VariousPayment'), 'payment').' ';
-                    print $langs->trans("VariousPayment");
-                    print '</a>';
-                } else {
-                    print '<a href="'.$links[$key]['url'].$links[$key]['url_id'].'">';
-                    print img_object('', 'generic').' ';
-                    print $links[$key]['label'];
-                    print '</a>';
-                }
-            }
-            print '</td></tr>';
-        }
+					print $paymenttmp->getNomUrl(1);
+				} elseif ($links[$key]['type'] == 'company') {
+					$societe = new Societe($db);
+					$societe->fetch($links[$key]['url_id']);
+					print $societe->getNomUrl(1);
+				} elseif ($links[$key]['type'] == 'sc') {
+					print '<a href="'.DOL_URL_ROOT.'/compta/sociales/card.php?id='.$links[$key]['url_id'].'">';
+					print img_object($langs->trans('SocialContribution'), 'bill').' ';
+					print $langs->trans("SocialContribution").($links[$key]['label'] ? ' - '.$links[$key]['label'] : '');
+					print '</a>';
+				} elseif ($links[$key]['type'] == 'payment_sc') {
+					print '<a href="'.DOL_URL_ROOT.'/compta/payment_sc/card.php?id='.$links[$key]['url_id'].'">';
+					print img_object($langs->trans('Payment'), 'payment').' ';
+					print $langs->trans("SocialContributionPayment");
+					print '</a>';
+				} elseif ($links[$key]['type'] == 'payment_vat') {
+					print '<a href="'.DOL_URL_ROOT.'/compta/tva/card.php?id='.$links[$key]['url_id'].'">';
+					print img_object($langs->trans('VAT'), 'payment').' ';
+					print $langs->trans("VATPayment");
+					print '</a>';
+				} elseif ($links[$key]['type'] == 'payment_salary') {
+					print '<a href="'.DOL_URL_ROOT.'/salaries/card.php?id='.$links[$key]['url_id'].'">';
+					print img_object($langs->trans('PaymentSalary'), 'payment').' ';
+					print $langs->trans("SalaryPayment");
+					print '</a>';
+				} elseif ($links[$key]['type'] == 'payment_loan') {
+					print '<a href="'.DOL_URL_ROOT.'/loan/payment/card.php?id='.$links[$key]['url_id'].'">';
+					print img_object($langs->trans('LoanPayment'), 'payment').' ';
+					print $langs->trans("PaymentLoan");
+					print '</a>';
+				} elseif ($links[$key]['type'] == 'loan') {
+					print '<a href="'.DOL_URL_ROOT.'/loan/card.php?id='.$links[$key]['url_id'].'">';
+					print img_object($langs->trans('Loan'), 'bill').' ';
+					print $langs->trans("Loan");
+					print '</a>';
+				} elseif ($links[$key]['type'] == 'member') {
+					print '<a href="'.DOL_URL_ROOT.'/adherents/card.php?rowid='.$links[$key]['url_id'].'">';
+					print img_object($langs->trans('Member'), 'user').' ';
+					print $links[$key]['label'];
+					print '</a>';
+				} elseif ($links[$key]['type'] == 'payment_donation') {
+					print '<a href="'.DOL_URL_ROOT.'/don/payment/card.php?id='.$links[$key]['url_id'].'">';
+					print img_object($langs->trans('Donation'), 'payment').' ';
+					print $langs->trans("DonationPayment");
+					print '</a>';
+				} elseif ($links[$key]['type'] == 'banktransfert') {
+					print '<a href="'.DOL_URL_ROOT.'/compta/bank/line.php?rowid='.$links[$key]['url_id'].'">';
+					print img_object($langs->trans('Transaction'), 'payment').' ';
+					print $langs->trans("TransactionOnTheOtherAccount");
+					print '</a>';
+				} elseif ($links[$key]['type'] == 'user') {
+					print '<a href="'.DOL_URL_ROOT.'/user/card.php?id='.$links[$key]['url_id'].'">';
+					print img_object($langs->trans('User'), 'user').' ';
+					print $langs->trans("User");
+					print '</a>';
+				} elseif ($links[$key]['type'] == 'payment_various') {
+					print '<a href="'.DOL_URL_ROOT.'/compta/bank/various_payment/card.php?id='.$links[$key]['url_id'].'">';
+					print img_object($langs->trans('VariousPayment'), 'payment').' ';
+					print $langs->trans("VariousPayment");
+					print '</a>';
+				} else {
+					print '<a href="'.$links[$key]['url'].$links[$key]['url_id'].'">';
+					print img_object('', 'generic').' ';
+					print $links[$key]['label'];
+					print '</a>';
+				}
+			}
+			print '</td></tr>';
+		}
 
-        //$user->rights->banque->modifier=false;
-        //$user->rights->banque->consolidate=true;
+		//$user->rights->banque->modifier=false;
+		//$user->rights->banque->consolidate=true;
 
-        // Type of payment / Number
-        print "<tr><td>".$langs->trans("Type")." / ".$langs->trans("Numero");
-        print ' <em>('.$langs->trans("ChequeOrTransferNumber").')</em>';
-        print "</td>";
-        if ($user->rights->banque->modifier || $user->rights->banque->consolidate)
-        {
-            print '<td>';
-            $form->select_types_paiements($objp->fk_type, "value", '', 2);
-            print '<input type="text" class="flat" name="num_chq" value="'.(empty($objp->num_chq) ? '' : $objp->num_chq).'">';
-            if ($objp->receiptid)
-            {
-                include_once DOL_DOCUMENT_ROOT.'/compta/paiement/cheque/class/remisecheque.class.php';
-                $receipt = new RemiseCheque($db);
-                $receipt->fetch($objp->receiptid);
-                print ' &nbsp; &nbsp; '.$langs->trans("CheckReceipt").': '.$receipt->getNomUrl(2);
-            }
-            print '</td>';
-        } else {
-            print '<td>'.$objp->fk_type.' '.$objp->num_chq.'</td>';
-        }
-        print "</tr>";
+		// Type of payment / Number
+		print "<tr><td>".$langs->trans("Type")." / ".$langs->trans("Numero");
+		print ' <em>('.$langs->trans("ChequeOrTransferNumber").')</em>';
+		print "</td>";
+		if ($user->rights->banque->modifier || $user->rights->banque->consolidate)
+		{
+			print '<td>';
+			$form->select_types_paiements($objp->fk_type, "value", '', 2);
+			print '<input type="text" class="flat" name="num_chq" value="'.(empty($objp->num_chq) ? '' : $objp->num_chq).'">';
+			if ($objp->receiptid)
+			{
+				include_once DOL_DOCUMENT_ROOT.'/compta/paiement/cheque/class/remisecheque.class.php';
+				$receipt = new RemiseCheque($db);
+				$receipt->fetch($objp->receiptid);
+				print ' &nbsp; &nbsp; '.$langs->trans("CheckReceipt").': '.$receipt->getNomUrl(2);
+			}
+			print '</td>';
+		} else {
+			print '<td>'.$objp->fk_type.' '.$objp->num_chq.'</td>';
+		}
+		print "</tr>";
 
-        // Transmitter
-        print "<tr><td>".$langs->trans("CheckTransmitter");
-        print ' <em>('.$langs->trans("ChequeMaker").')</em>';
-        print "</td>";
-        if ($user->rights->banque->modifier || $user->rights->banque->consolidate)
-        {
-            print '<td>';
-            print '<input type="text" class="flat minwidth200" name="emetteur" value="'.(empty($objp->emetteur) ? '' : stripslashes($objp->emetteur)).'">';
-            print '</td>';
-        } else {
-            print '<td>'.$objp->emetteur.'</td>';
-        }
-        print "</tr>";
+		// Transmitter
+		print "<tr><td>".$langs->trans("CheckTransmitter");
+		print ' <em>('.$langs->trans("ChequeMaker").')</em>';
+		print "</td>";
+		if ($user->rights->banque->modifier || $user->rights->banque->consolidate)
+		{
+			print '<td>';
+			print '<input type="text" class="flat minwidth200" name="emetteur" value="'.(empty($objp->emetteur) ? '' : stripslashes($objp->emetteur)).'">';
+			print '</td>';
+		} else {
+			print '<td>'.$objp->emetteur.'</td>';
+		}
+		print "</tr>";
 
-        // Bank of cheque
-        print "<tr><td>".$langs->trans("Bank");
-        print ' <em>('.$langs->trans("ChequeBank").')</em>';
-        print "</td>";
-        if ($user->rights->banque->modifier || $user->rights->banque->consolidate)
-        {
-        	print '<td>';
-        	print '<input type="text" class="flat minwidth200" name="banque" value="'.(empty($objp->banque) ? '' : $objp->banque).'">';
-        	print '</td>';
-        } else {
-        	print '<td>'.$objp->banque.'</td>';
-        }
-        print "</tr>";
+		// Bank of cheque
+		print "<tr><td>".$langs->trans("Bank");
+		print ' <em>('.$langs->trans("ChequeBank").')</em>';
+		print "</td>";
+		if ($user->rights->banque->modifier || $user->rights->banque->consolidate)
+		{
+			print '<td>';
+			print '<input type="text" class="flat minwidth200" name="banque" value="'.(empty($objp->banque) ? '' : $objp->banque).'">';
+			print '</td>';
+		} else {
+			print '<td>'.$objp->banque.'</td>';
+		}
+		print "</tr>";
 
-        // Date ope
-        print '<tr><td>'.$langs->trans("DateOperation").'</td>';
-        if ($user->rights->banque->modifier || $user->rights->banque->consolidate)
-        {
-            print '<td>';
-            print $form->selectDate($db->jdate($objp->do), 'dateo', '', '', '', 'update', 1, 0, $objp->rappro);
-            if (!$objp->rappro)
-            {
-                print ' &nbsp; ';
-                print '<a href="'.$_SERVER['PHP_SELF'].'?action=doprev&amp;id='.$id.'&amp;rowid='.$objp->rowid.'">';
-                print img_edit_remove()."</a> ";
-                print '<a href="'.$_SERVER['PHP_SELF'].'?action=donext&amp;id='.$id.'&amp;rowid='.$objp->rowid.'">';
-                print img_edit_add()."</a>";
-            }
-            print '</td>';
-        } else {
-            print '<td>';
-            print dol_print_date($db->jdate($objp->do), "day");
-            print '</td>';
-        }
-        print '</tr>';
+		// Date ope
+		print '<tr><td>'.$langs->trans("DateOperation").'</td>';
+		if ($user->rights->banque->modifier || $user->rights->banque->consolidate)
+		{
+			print '<td>';
+			print $form->selectDate($db->jdate($objp->do), 'dateo', '', '', '', 'update', 1, 0, $objp->rappro);
+			if (!$objp->rappro)
+			{
+				print ' &nbsp; ';
+				print '<a href="'.$_SERVER['PHP_SELF'].'?action=doprev&amp;id='.$id.'&amp;rowid='.$objp->rowid.'">';
+				print img_edit_remove()."</a> ";
+				print '<a href="'.$_SERVER['PHP_SELF'].'?action=donext&amp;id='.$id.'&amp;rowid='.$objp->rowid.'">';
+				print img_edit_add()."</a>";
+			}
+			print '</td>';
+		} else {
+			print '<td>';
+			print dol_print_date($db->jdate($objp->do), "day");
+			print '</td>';
+		}
+		print '</tr>';
 
-        // Value date
-        print "<tr><td>".$langs->trans("DateValue")."</td>";
-        if ($user->rights->banque->modifier || $user->rights->banque->consolidate)
-        {
-            print '<td>';
-            print $form->selectDate($db->jdate($objp->dv), 'datev', '', '', '', 'update', 1, 0, $objp->rappro);
-            if (!$objp->rappro)
-            {
-                print ' &nbsp; ';
-                print '<a href="'.$_SERVER['PHP_SELF'].'?action=dvprev&amp;id='.$id.'&amp;rowid='.$objp->rowid.'">';
-                print img_edit_remove()."</a> ";
-                print '<a href="'.$_SERVER['PHP_SELF'].'?action=dvnext&amp;id='.$id.'&amp;rowid='.$objp->rowid.'">';
-                print img_edit_add()."</a>";
-            }
-            print '</td>';
-        } else {
-            print '<td>';
-            print dol_print_date($db->jdate($objp->dv), "day");
-            print '</td>';
-        }
-        print "</tr>";
+		// Value date
+		print "<tr><td>".$langs->trans("DateValue")."</td>";
+		if ($user->rights->banque->modifier || $user->rights->banque->consolidate)
+		{
+			print '<td>';
+			print $form->selectDate($db->jdate($objp->dv), 'datev', '', '', '', 'update', 1, 0, $objp->rappro);
+			if (!$objp->rappro)
+			{
+				print ' &nbsp; ';
+				print '<a href="'.$_SERVER['PHP_SELF'].'?action=dvprev&amp;id='.$id.'&amp;rowid='.$objp->rowid.'">';
+				print img_edit_remove()."</a> ";
+				print '<a href="'.$_SERVER['PHP_SELF'].'?action=dvnext&amp;id='.$id.'&amp;rowid='.$objp->rowid.'">';
+				print img_edit_add()."</a>";
+			}
+			print '</td>';
+		} else {
+			print '<td>';
+			print dol_print_date($db->jdate($objp->dv), "day");
+			print '</td>';
+		}
+		print "</tr>";
 
-        // Description
-        print "<tr><td>".$langs->trans("Label")."</td>";
-        if ($user->rights->banque->modifier || $user->rights->banque->consolidate)
-        {
-            print '<td>';
-            print '<input name="label" class="flat minwidth300" '.($objp->rappro ? ' disabled' : '').' value="';
-            if (preg_match('/^\((.*)\)$/i', $objp->label, $reg))
-            {
-                // Label generique car entre parentheses. On l'affiche en le traduisant
-                print $langs->trans($reg[1]);
-            } else {
-                print $objp->label;
-            }
-            print '">';
-            print '</td>';
-        } else {
-            print '<td>';
-            if (preg_match('/^\((.*)\)$/i', $objp->label, $reg))
-            {
-                // Label generique car entre parentheses. On l'affiche en le traduisant
-                print $langs->trans($reg[1]);
-            } else {
-                print $objp->label;
-            }
-            print '</td>';
-        }
-        print '</tr>';
+		// Description
+		print "<tr><td>".$langs->trans("Label")."</td>";
+		if ($user->rights->banque->modifier || $user->rights->banque->consolidate)
+		{
+			print '<td>';
+			print '<input name="label" class="flat minwidth300" '.($objp->rappro ? ' disabled' : '').' value="';
+			if (preg_match('/^\((.*)\)$/i', $objp->label, $reg))
+			{
+				// Label generique car entre parentheses. On l'affiche en le traduisant
+				print $langs->trans($reg[1]);
+			} else {
+				print $objp->label;
+			}
+			print '">';
+			print '</td>';
+		} else {
+			print '<td>';
+			if (preg_match('/^\((.*)\)$/i', $objp->label, $reg))
+			{
+				// Label generique car entre parentheses. On l'affiche en le traduisant
+				print $langs->trans($reg[1]);
+			} else {
+				print $objp->label;
+			}
+			print '</td>';
+		}
+		print '</tr>';
 
-        // Amount
-        print "<tr><td>".$langs->trans("Amount")."</td>";
-        if ($user->rights->banque->modifier)
-        {
-            print '<td>';
-            print '<input name="amount" class="flat maxwidth100" '.($objp->rappro ? ' disabled' : '').' value="'.price($objp->amount).'"> '.$langs->trans("Currency".$acct->currency_code);
-            print '</td>';
-        } else {
-            print '<td>';
-            print price($objp->amount);
-            print '</td>';
-        }
-        print "</tr>";
+		// Amount
+		print "<tr><td>".$langs->trans("Amount")."</td>";
+		if ($user->rights->banque->modifier)
+		{
+			print '<td>';
+			print '<input name="amount" class="flat maxwidth100" '.($objp->rappro ? ' disabled' : '').' value="'.price($objp->amount).'"> '.$langs->trans("Currency".$acct->currency_code);
+			print '</td>';
+		} else {
+			print '<td>';
+			print price($objp->amount);
+			print '</td>';
+		}
+		print "</tr>";
 
-        // Categories
-        if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire))
-        {
-            $langs->load('categories');
+		// Categories
+		if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire))
+		{
+			$langs->load('categories');
 
-            // Bank line
-            print '<tr><td class="toptd">'.$form->editfieldkey('RubriquesTransactions', 'custcats', '', $object, 0).'</td><td>';
-            $cate_arbo = $form->select_all_categories(Categorie::TYPE_BANK_LINE, null, 'parent', null, null, 1);
-            print $form->multiselectarray('custcats', $cate_arbo, $arrayselected, null, null, null, null, "90%");
-            print "</td></tr>";
-        }
+			// Bank line
+			print '<tr><td class="toptd">'.$form->editfieldkey('RubriquesTransactions', 'custcats', '', $object, 0).'</td><td>';
+			$cate_arbo = $form->select_all_categories(Categorie::TYPE_BANK_LINE, null, 'parent', null, null, 1);
+			print $form->multiselectarray('custcats', $cate_arbo, $arrayselected, null, null, null, null, "90%");
+			print "</td></tr>";
+		}
 
-        print "</table>";
+		print "</table>";
 
-        print '</div>';
+		print '</div>';
 
-        dol_fiche_end();
+		print dol_get_fiche_end();
 
 
-        print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Update").'"></div><br>';
+		print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Update").'"></div><br>';
 
-        print "</form>";
+		print "</form>";
 
 
 
-        // Releve rappro
-        if ($acct->canBeConciliated() > 0)  // Si compte rapprochable
-        {
-            print load_fiche_titre($langs->trans("Reconciliation"), '', 'bank_account');
-            print '<hr>'."\n";
+		// Releve rappro
+		if ($acct->canBeConciliated() > 0)  // Si compte rapprochable
+		{
+			print load_fiche_titre($langs->trans("Reconciliation"), '', 'bank_account');
+			print '<hr>'."\n";
 
-            print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'?rowid='.$objp->rowid.'">';
-            print '<input type="hidden" name="token" value="'.newToken().'">';
-            print '<input type="hidden" name="action" value="setreconcile">';
-            print '<input type="hidden" name="orig_account" value="'.$orig_account.'">';
-            print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
+			print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'?rowid='.$objp->rowid.'">';
+			print '<input type="hidden" name="token" value="'.newToken().'">';
+			print '<input type="hidden" name="action" value="setreconcile">';
+			print '<input type="hidden" name="orig_account" value="'.$orig_account.'">';
+			print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
 
-            print '<div class="fichecenter">';
+			print '<div class="fichecenter">';
 
-            print '<table class="border centpercent">';
+			print '<table class="border centpercent">';
 
-            print '<tr><td class="titlefield">'.$langs->trans("Conciliation")."</td>";
-            if ($user->rights->banque->consolidate)
-            {
-                print '<td>';
-                if ($objp->rappro)
-                {
-                    print $langs->trans("AccountStatement").' <input name="num_rel_bis" class="flat" value="'.$objp->num_releve.'"'.($objp->rappro ? ' disabled' : '').'>';
-                    print '<input name="num_rel" type="hidden" value="'.$objp->num_releve.'">';
-                } else {
-                    print $langs->trans("AccountStatement").' <input name="num_rel" class="flat" value="'.$objp->num_releve.'"'.($objp->rappro ? ' disabled' : '').'>';
-                }
-                if ($objp->num_releve) print ' &nbsp; (<a href="'.DOL_URL_ROOT.'/compta/bank/releve.php?num='.$objp->num_releve.'&account='.$acct->id.'">'.$langs->trans("AccountStatement").' '.$objp->num_releve.')</a>';
-                print '</td>';
-            } else {
-                print '<td>'.$objp->num_releve.'&nbsp;</td>';
-            }
-            print '</tr>';
+			print '<tr><td class="titlefield">'.$langs->trans("Conciliation")."</td>";
+			if ($user->rights->banque->consolidate)
+			{
+				print '<td>';
+				if ($objp->rappro)
+				{
+					print $langs->trans("AccountStatement").' <input name="num_rel_bis" class="flat" value="'.$objp->num_releve.'"'.($objp->rappro ? ' disabled' : '').'>';
+					print '<input name="num_rel" type="hidden" value="'.$objp->num_releve.'">';
+				} else {
+					print $langs->trans("AccountStatement").' <input name="num_rel" class="flat" value="'.$objp->num_releve.'"'.($objp->rappro ? ' disabled' : '').'>';
+				}
+				if ($objp->num_releve) print ' &nbsp; (<a href="'.DOL_URL_ROOT.'/compta/bank/releve.php?num='.$objp->num_releve.'&account='.$acct->id.'">'.$langs->trans("AccountStatement").' '.$objp->num_releve.')</a>';
+				print '</td>';
+			} else {
+				print '<td>'.$objp->num_releve.'&nbsp;</td>';
+			}
+			print '</tr>';
 
-            print "<tr><td>".$langs->trans("BankLineConciliated")."</td>";
-            if ($user->rights->banque->consolidate)
-            {
-                print '<td>';
-                print '<input type="checkbox" name="reconciled" class="flat" '.(isset($_POST["reconciled"]) ? ($_POST["reconciled"] ? ' checked="checked"' : '') : ($objp->rappro ? ' checked="checked"' : '')).'">';
-                print '</td>';
-            } else {
-                print '<td>'.yn($objp->rappro).'</td>';
-            }
-            print '</tr>';
-            print '</table>';
+			print "<tr><td>".$langs->trans("BankLineConciliated")."</td>";
+			if ($user->rights->banque->consolidate)
+			{
+				print '<td>';
+				print '<input type="checkbox" name="reconciled" class="flat" '.(isset($_POST["reconciled"]) ? ($_POST["reconciled"] ? ' checked="checked"' : '') : ($objp->rappro ? ' checked="checked"' : '')).'">';
+				print '</td>';
+			} else {
+				print '<td>'.yn($objp->rappro).'</td>';
+			}
+			print '</tr>';
+			print '</table>';
 
-            print '</div>';
+			print '</div>';
 
-            print '<div class="center">';
+			print '<div class="center">';
 
-            print '<input type="submit" class="button" value="'.$langs->trans("Update").'">';
-            if ($backtopage)
-            {
-                print ' &nbsp; ';
-                print '<input type="submit" name="cancel" class="button" value="'.$langs->trans("Cancel").'">';
-            }
-            print '</div>';
+			print '<input type="submit" class="button" value="'.$langs->trans("Update").'">';
+			if ($backtopage)
+			{
+				print ' &nbsp; ';
+				print '<input type="submit" name="cancel" class="button" value="'.$langs->trans("Cancel").'">';
+			}
+			print '</div>';
 
 			print '</form>';
-        }
-    }
+		}
+	}
 
-    $db->free($result);
+	$db->free($result);
 } else dol_print_error($db);
 
 // End of page
diff --git a/htdocs/compta/bank/list.php b/htdocs/compta/bank/list.php
index 4e3653d2ea4..22bd08da1ba 100644
--- a/htdocs/compta/bank/list.php
+++ b/htdocs/compta/bank/list.php
@@ -86,24 +86,24 @@ $search_array_options = $extrafields->getOptionalsFromPost($object->table_elemen
 
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array(
-    'b.ref'=>'Ref',
-    'b.label'=>'Label',
+	'b.ref'=>'Ref',
+	'b.label'=>'Label',
 );
 
 $checkedtypetiers = 0;
 $arrayfields = array(
-    'b.ref'=>array('label'=>$langs->trans("BankAccounts"), 'checked'=>1),
-    'accountype'=>array('label'=>$langs->trans("Type"), 'checked'=>1),
-    'b.label'=>array('label'=>$langs->trans("Label"), 'checked'=>1),
-    'b.number'=>array('label'=>$langs->trans("AccountIdShort"), 'checked'=>1),
-    'b.account_number'=>array('label'=>$langs->trans("AccountAccounting"), 'checked'=>(!empty($conf->accounting->enabled) || !empty($conf->accounting->enabled))),
-    'b.fk_accountancy_journal'=>array('label'=>$langs->trans("AccountancyJournal"), 'checked'=>(!empty($conf->accounting->enabled) || !empty($conf->accounting->enabled))),
-    'toreconcile'=>array('label'=>$langs->trans("TransactionsToConciliate"), 'checked'=>1),
-    'b.currency_code'=>array('label'=>$langs->trans("Currency"), 'checked'=>0),
+	'b.ref'=>array('label'=>$langs->trans("BankAccounts"), 'checked'=>1),
+	'accountype'=>array('label'=>$langs->trans("Type"), 'checked'=>1),
+	'b.label'=>array('label'=>$langs->trans("Label"), 'checked'=>1),
+	'b.number'=>array('label'=>$langs->trans("AccountIdShort"), 'checked'=>1),
+	'b.account_number'=>array('label'=>$langs->trans("AccountAccounting"), 'checked'=>(!empty($conf->accounting->enabled) || !empty($conf->accounting->enabled))),
+	'b.fk_accountancy_journal'=>array('label'=>$langs->trans("AccountancyJournal"), 'checked'=>(!empty($conf->accounting->enabled) || !empty($conf->accounting->enabled))),
+	'toreconcile'=>array('label'=>$langs->trans("TransactionsToConciliate"), 'checked'=>1),
+	'b.currency_code'=>array('label'=>$langs->trans("Currency"), 'checked'=>0),
 	'b.datec'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0, 'position'=>500),
-    'b.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500),
-    'b.clos'=>array('label'=>$langs->trans("Status"), 'checked'=>1, 'position'=>1000),
-    'balance'=>array('label'=>$langs->trans("Balance"), 'checked'=>1, 'position'=>1010),
+	'b.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500),
+	'b.clos'=>array('label'=>$langs->trans("Status"), 'checked'=>1, 'position'=>1000),
+	'balance'=>array('label'=>$langs->trans("Balance"), 'checked'=>1, 'position'=>1010),
 );
 // Extra fields
 if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0)
@@ -134,10 +134,10 @@ include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 // Purge search criteria
 if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
 {
-    $search_ref = '';
-    $search_label = '';
-    $search_number = '';
-    $search_status = '';
+	$search_ref = '';
+	$search_label = '';
+	$search_number = '';
+	$search_status = '';
 }
 
 
@@ -194,8 +194,8 @@ $sql .= $db->order($sortfield, $sortorder);
 $nbtotalofrecords = '';
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
-    $result = $db->query($sql);
-    $nbtotalofrecords = $db->num_rows($result);
+	$result = $db->query($sql);
+	$nbtotalofrecords = $db->num_rows($result);
 }
 
 $sql .= $db->plimit($limit + 1, $offset);
@@ -203,15 +203,15 @@ $sql .= $db->plimit($limit + 1, $offset);
 $resql = $db->query($sql);
 if ($resql)
 {
-    $num = $db->num_rows($resql);
-    $i = 0;
-    while ($i < $num)
-    {
-        $objp = $db->fetch_object($resql);
-        $accounts[$objp->rowid] = $objp->courant;
-        $i++;
-    }
-    $db->free($resql);
+	$num = $db->num_rows($resql);
+	$i = 0;
+	while ($i < $num)
+	{
+		$objp = $db->fetch_object($resql);
+		$accounts[$objp->rowid] = $objp->courant;
+		$i++;
+	}
+	$db->free($resql);
 } else dol_print_error($db);
 
 
@@ -267,8 +267,8 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
 if ($sall)
 {
-    foreach ($fieldstosearchall as $key => $val) $fieldstosearchall[$key] = $langs->trans($val);
-    print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall).join(', ', $fieldstosearchall).'</div>';
+	foreach ($fieldstosearchall as $key => $val) $fieldstosearchall[$key] = $langs->trans($val);
+	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall).join(', ', $fieldstosearchall).'</div>';
 }
 
 $moreforfilter = '';
@@ -302,53 +302,53 @@ print '<tr class="liste_titre_filter">';
 // Ref
 if (!empty($arrayfields['b.ref']['checked']))
 {
-    print '<td class="liste_titre">';
-    print '<input class="flat" size="6" type="text" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
-    print '</td>';
+	print '<td class="liste_titre">';
+	print '<input class="flat" size="6" type="text" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
+	print '</td>';
 }
 // Label
 if (!empty($arrayfields['b.label']['checked']))
 {
-    print '<td class="liste_titre">';
-    print '<input class="flat" size="6" type="text" name="search_label" value="'.dol_escape_htmltag($search_label).'">';
-    print '</td>';
+	print '<td class="liste_titre">';
+	print '<input class="flat" size="6" type="text" name="search_label" value="'.dol_escape_htmltag($search_label).'">';
+	print '</td>';
 }
 // Account type
 if (!empty($arrayfields['accountype']['checked']))
 {
-    print '<td class="liste_titre">';
-    print '</td>';
+	print '<td class="liste_titre">';
+	print '</td>';
 }
 // Bank number
 if (!empty($arrayfields['b.number']['checked']))
 {
-    print '<td class="liste_titre">';
-    print '<input class="flat" size="6" type="text" name="search_number" value="'.dol_escape_htmltag($search_number).'">';
-    print '</td>';
+	print '<td class="liste_titre">';
+	print '<input class="flat" size="6" type="text" name="search_number" value="'.dol_escape_htmltag($search_number).'">';
+	print '</td>';
 }
 // Account number
 if (!empty($arrayfields['b.account_number']['checked']))
 {
-    print '<td class="liste_titre">';
-    print '</td>';
+	print '<td class="liste_titre">';
+	print '</td>';
 }
 // Accountancy journal
 if (!empty($arrayfields['b.fk_accountancy_journal']['checked']))
 {
-    print '<td class="liste_titre">';
-    print '</td>';
+	print '<td class="liste_titre">';
+	print '</td>';
 }
 // Transactions to reconcile
 if (!empty($arrayfields['toreconcile']['checked']))
 {
-    print '<td class="liste_titre">';
-    print '</td>';
+	print '<td class="liste_titre">';
+	print '</td>';
 }
 // Currency
 if (!empty($arrayfields['b.currency_code']['checked']))
 {
-    print '<td class="liste_titre">';
-    print '</td>';
+	print '<td class="liste_titre">';
+	print '</td>';
 }
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
@@ -360,30 +360,30 @@ print $hookmanager->resPrint;
 // Date creation
 if (!empty($arrayfields['b.datec']['checked']))
 {
-    print '<td class="liste_titre">';
-    print '</td>';
+	print '<td class="liste_titre">';
+	print '</td>';
 }
 // Date modification
 if (!empty($arrayfields['b.tms']['checked']))
 {
-    print '<td class="liste_titre">';
-    print '</td>';
+	print '<td class="liste_titre">';
+	print '</td>';
 }
 // Status
 if (!empty($arrayfields['b.clos']['checked']))
 {
-    print '<td class="liste_titre center">';
-    $array = array(
-        'opened'=>$langs->trans("Opened"),
-        'closed'=>$langs->trans("Closed")
-    );
-    print $form->selectarray("search_status", $array, $search_status, 1, 0, 0, '', 0, 0, 0, '', '', 1);
-    print '</td>';
+	print '<td class="liste_titre center">';
+	$array = array(
+		'opened'=>$langs->trans("Opened"),
+		'closed'=>$langs->trans("Closed")
+	);
+	print $form->selectarray("search_status", $array, $search_status, 1, 0, 0, '', 0, 0, 0, '', '', 1);
+	print '</td>';
 }
 // Balance
 if (!empty($arrayfields['balance']['checked']))
 {
-    print '<td class="liste_titre"></td>';
+	print '<td class="liste_titre"></td>';
 }
 // Action column
 print '<td class="liste_titre valignmiddle">';
@@ -422,7 +422,7 @@ foreach ($accounts as $key=>$type)
 {
 	if ($i >= $limit) break;
 
-    $found++;
+	$found++;
 
 	$result = $objecttmp->fetch($key);
 
@@ -439,163 +439,163 @@ foreach ($accounts as $key=>$type)
 
 	print '<tr class="oddeven">';
 
-    // Ref
-    if (!empty($arrayfields['b.ref']['checked']))
-    {
-        print '<td class="nowrap">'.$objecttmp->getNomUrl(1).'</td>';
-	    if (!$i) $totalarray['nbfield']++;
-    }
+	// Ref
+	if (!empty($arrayfields['b.ref']['checked']))
+	{
+		print '<td class="nowrap">'.$objecttmp->getNomUrl(1).'</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
 
-    // Label
-    if (!empty($arrayfields['b.label']['checked']))
-    {
+	// Label
+	if (!empty($arrayfields['b.label']['checked']))
+	{
 		print '<td>'.$objecttmp->label.'</td>';
-        if (!$i) $totalarray['nbfield']++;
-    }
+		if (!$i) $totalarray['nbfield']++;
+	}
 
-    // Account type
-    if (!empty($arrayfields['accountype']['checked']))
-    {
-        print '<td>';
+	// Account type
+	if (!empty($arrayfields['accountype']['checked']))
+	{
+		print '<td>';
 		print $objecttmp->type_lib[$objecttmp->type];
 		print '</td>';
-        if (!$i) $totalarray['nbfield']++;
-    }
-
-    // Number
-    if (!empty($arrayfields['b.number']['checked']))
-    {
-        print '<td>'.$objecttmp->number.'</td>';
-	    if (!$i) $totalarray['nbfield']++;
-    }
-
-    // Account number
-    if (!empty($arrayfields['b.account_number']['checked']))
-    {
-    	print '<td>';
-    	if (!empty($conf->accounting->enabled) && !empty($objecttmp->account_number))
-    	{
-    		$accountingaccount = new AccountingAccount($db);
-    		$accountingaccount->fetch('', $objecttmp->account_number, 1);
-    		print $accountingaccount->getNomUrl(0, 1, 1, '', 1);
-    	} else {
-    		print $objecttmp->account_number;
-    	}
-    	print '</td>';
-	    if (!$i) $totalarray['nbfield']++;
-    }
-
-    // Accountancy journal
-    if (!empty($arrayfields['b.fk_accountancy_journal']['checked']))
-    {
-    	print '<td>';
-    	if (!empty($conf->accounting->enabled) && !empty($objecttmp->fk_accountancy_journal))
-    	{
-    		$accountingjournal = new AccountingJournal($db);
-    		$accountingjournal->fetch($objecttmp->fk_accountancy_journal);
-    		print $accountingjournal->getNomUrl(0, 1, 1, '', 1);
-    	} else {
-    		print '';
-    	}
-    	print '</td>';
 		if (!$i) $totalarray['nbfield']++;
-    }
+	}
 
-    // Currency
-    if (!empty($arrayfields['b.currency_code']['checked']))
-    {
-    	print '<td class="center">';
+	// Number
+	if (!empty($arrayfields['b.number']['checked']))
+	{
+		print '<td>'.$objecttmp->number.'</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
+
+	// Account number
+	if (!empty($arrayfields['b.account_number']['checked']))
+	{
+		print '<td>';
+		if (!empty($conf->accounting->enabled) && !empty($objecttmp->account_number))
+		{
+			$accountingaccount = new AccountingAccount($db);
+			$accountingaccount->fetch('', $objecttmp->account_number, 1);
+			print $accountingaccount->getNomUrl(0, 1, 1, '', 1);
+		} else {
+			print $objecttmp->account_number;
+		}
+		print '</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
+
+	// Accountancy journal
+	if (!empty($arrayfields['b.fk_accountancy_journal']['checked']))
+	{
+		print '<td>';
+		if (!empty($conf->accounting->enabled) && !empty($objecttmp->fk_accountancy_journal))
+		{
+			$accountingjournal = new AccountingJournal($db);
+			$accountingjournal->fetch($objecttmp->fk_accountancy_journal);
+			print $accountingjournal->getNomUrl(0, 1, 1, '', 1);
+		} else {
+			print '';
+		}
+		print '</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
+
+	// Currency
+	if (!empty($arrayfields['b.currency_code']['checked']))
+	{
+		print '<td class="center">';
    		print $objecttmp->currency_code;
-    	print '</td>';
-    	if (!$i) $totalarray['nbfield']++;
-    }
+		print '</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
 
-    // Transactions to reconcile
-    if (!empty($arrayfields['toreconcile']['checked']))
-    {
-    	print '<td class="center">';
+	// Transactions to reconcile
+	if (!empty($arrayfields['toreconcile']['checked']))
+	{
+		print '<td class="center">';
 
-    	$conciliate = $objecttmp->canBeConciliated();
-    	if ($conciliate == -2) print '<span class="opacitymedium">'.$langs->trans("CashAccount").'</span>';
-    	elseif ($conciliate == -3) print '<span class="opacitymedium">'.$langs->trans("Closed").'</span>';
-    	elseif (empty($objecttmp->rappro)) {
-    		print '<span class="opacitymedium">'.$langs->trans("ConciliationDisabled").'</span>';
-    	} else {
-    		$result = $objecttmp->load_board($user, $objecttmp->id);
-    		if ($result < 0) {
-    			setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
-    		} else {
-    			print '<a href="'.DOL_URL_ROOT.'/compta/bank/bankentries_list.php?id='.$objecttmp->id.'&search_conciliated=0">';
-    			print '<span class="badge badge-info classfortooltip" title="'.dol_htmlentities($langs->trans("TransactionsToConciliate")).'">';
-    			print $result->nbtodo;
-    			print '</span>';
+		$conciliate = $objecttmp->canBeConciliated();
+		if ($conciliate == -2) print '<span class="opacitymedium">'.$langs->trans("CashAccount").'</span>';
+		elseif ($conciliate == -3) print '<span class="opacitymedium">'.$langs->trans("Closed").'</span>';
+		elseif (empty($objecttmp->rappro)) {
+			print '<span class="opacitymedium">'.$langs->trans("ConciliationDisabled").'</span>';
+		} else {
+			$result = $objecttmp->load_board($user, $objecttmp->id);
+			if ($result < 0) {
+				setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
+			} else {
+				print '<a href="'.DOL_URL_ROOT.'/compta/bank/bankentries_list.php?id='.$objecttmp->id.'&search_conciliated=0">';
+				print '<span class="badge badge-info classfortooltip" title="'.dol_htmlentities($langs->trans("TransactionsToConciliate")).'">';
+				print $result->nbtodo;
+				print '</span>';
 				print '</a>';
-    			if ($result->nbtodolate) {
-    				print '<span title="'.dol_htmlentities($langs->trans("Late")).'" class="classfortooltip badge badge-danger marginleftonlyshort">';
-    				print '<i class="fa fa-exclamation-triangle"></i> '.$result->nbtodolate;
-    				print '</span>';
-    			}
-    		}
-    	}
+				if ($result->nbtodolate) {
+					print '<span title="'.dol_htmlentities($langs->trans("Late")).'" class="classfortooltip badge badge-danger marginleftonlyshort">';
+					print '<i class="fa fa-exclamation-triangle"></i> '.$result->nbtodolate;
+					print '</span>';
+				}
+			}
+		}
 
-    	print '</td>';
-	    if (!$i) $totalarray['nbfield']++;
-    }
+		print '</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
 
-    // Extra fields
+	// Extra fields
 	if (is_array($objecttmp->array_options)) {
 		$obj = new stdClass();
 		foreach ($objecttmp->array_options as $k => $v) {
 			$obj->$k = $v;
 		}
 	}
-    include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
-    // Fields from hook
-    $parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
-    $reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $objecttmp); // Note that $action and $objecttmpect may have been modified by hook
-    print $hookmanager->resPrint;
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
+	// Fields from hook
+	$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
+	$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $objecttmp); // Note that $action and $objecttmpect may have been modified by hook
+	print $hookmanager->resPrint;
 	// Date creation
-    if (!empty($arrayfields['b.datec']['checked']))
-    {
-        print '<td class="center">';
-        print dol_print_date($objecttmp->date_creation, 'dayhour');
-        print '</td>';
-	    if (!$i) $totalarray['nbfield']++;
-    }
-    // Date modification
-    if (!empty($arrayfields['b.tms']['checked']))
-    {
-        print '<td class="center">';
-        print dol_print_date($objecttmp->date_update, 'dayhour');
-        print '</td>';
-	    if (!$i) $totalarray['nbfield']++;
-    }
+	if (!empty($arrayfields['b.datec']['checked']))
+	{
+		print '<td class="center">';
+		print dol_print_date($objecttmp->date_creation, 'dayhour');
+		print '</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
+	// Date modification
+	if (!empty($arrayfields['b.tms']['checked']))
+	{
+		print '<td class="center">';
+		print dol_print_date($objecttmp->date_update, 'dayhour');
+		print '</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
 
-    // Status
-    if (!empty($arrayfields['b.clos']['checked']))
-    {
+	// Status
+	if (!empty($arrayfields['b.clos']['checked']))
+	{
 		print '<td class="center">'.$objecttmp->getLibStatut(5).'</td>';
-	    if (!$i) $totalarray['nbfield']++;
-    }
+		if (!$i) $totalarray['nbfield']++;
+	}
 
-    // Balance
-    if (!empty($arrayfields['balance']['checked']))
-    {
+	// Balance
+	if (!empty($arrayfields['balance']['checked']))
+	{
 		print '<td class="nowraponall right">';
 		print '<a href="'.DOL_URL_ROOT.'/compta/bank/bankentries_list.php?id='.$objecttmp->id.'">'.price($solde, 0, $langs, 0, -1, -1, $objecttmp->currency_code).'</a>';
 		print '</td>';
 		if (!$i) $totalarray['nbfield']++;
 		if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'balance';
 		$totalarray['val']['balance'] += $solde;
-    }
+	}
 
 	// Action column
 	print '<td class="nowrap center">';
 	if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
 	{
-	    $selected = 0;
-	    if (in_array($objecttmp->id, $arrayofselected)) $selected = 1;
-	    print '<input id="cb'.$objecttmp->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$objecttmp->id.'"'.($selected ? ' checked="checked"' : '').'>';
+		$selected = 0;
+		if (in_array($objecttmp->id, $arrayofselected)) $selected = 1;
+		print '<input id="cb'.$objecttmp->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$objecttmp->id.'"'.($selected ? ' checked="checked"' : '').'>';
 	}
 	print '</td>';
 	if (!$i) $totalarray['nbfield']++;
@@ -610,9 +610,9 @@ foreach ($accounts as $key=>$type)
 // If no record found
 if (!$found)
 {
-    $colspan = 1;
-    foreach ($arrayfields as $key => $val) { if (!empty($val['checked'])) $colspan++; }
-    print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoRecordFound").'</td></tr>';
+	$colspan = 1;
+	foreach ($arrayfields as $key => $val) { if (!empty($val['checked'])) $colspan++; }
+	print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoRecordFound").'</td></tr>';
 }
 
 // Show total line
diff --git a/htdocs/compta/bank/releve.php b/htdocs/compta/bank/releve.php
index 137712d5cec..92dd2de75f4 100644
--- a/htdocs/compta/bank/releve.php
+++ b/htdocs/compta/bank/releve.php
@@ -93,8 +93,8 @@ if (!$sortfield) $sortfield = "s.nom";
 $object = new Account($db);
 if ($id > 0 || !empty($ref))
 {
-    $result = $object->fetch($id, $ref);
-    $account = $object->id; // Force the search field on id of account
+	$result = $object->fetch($id, $ref);
+	$account = $object->id; // Force the search field on id of account
 }
 
 
@@ -251,7 +251,7 @@ if (empty($numref))
 
 		dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '', 0, '', '', 1);
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 
 		print '<div class="tabsAction">';
@@ -371,15 +371,15 @@ if (empty($numref))
 	$morehtmlright .= '<li class="pagination"><a class="paginationnext" href="'.$_SERVER["PHP_SELF"].'?rel=next&amp;num='.$numref.'&amp;ve='.$ve.'&amp;account='.$object->id.'"><i class="fa fa-chevron-right" title="'.dol_escape_htmltag($langs->trans("Next")).'"></i></a></li>';
 	$morehtmlright .= '</ul></div>';
 
-    $title = $langs->trans("AccountStatement").' '.$numref.' - '.$langs->trans("BankAccount").' '.$object->getNomUrl(1, 'receipts');
-    print load_fiche_titre($title, $morehtmlright, '');
+	$title = $langs->trans("AccountStatement").' '.$numref.' - '.$langs->trans("BankAccount").' '.$object->getNomUrl(1, 'receipts');
+	print load_fiche_titre($title, $morehtmlright, '');
 	//print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, 0, $nbtotalofrecords, 'bank_account', 0, '', '', 0, 1);
 
 	print "<form method=\"post\" action=\"releve.php\">";
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="add">';
 
-    print '<div class="div-table-responsive">';
+	print '<div class="div-table-responsive">';
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre">';
 	print '<td class="center">'.$langs->trans("DateOperationShort").'</td>';
@@ -407,7 +407,7 @@ if (empty($numref))
 	}
 
 	// Recherche les ecritures pour le releve
-    $sql = $sqlrequestforbankline;
+	$sql = $sqlrequestforbankline;
 
 	$result = $db->query($sql);
 	if ($result)
@@ -441,17 +441,17 @@ if (empty($numref))
 			print "</td>\n";
 
 			// Type and num
-            if ($objp->fk_type == 'SOLD') {
-                $type_label = '&nbsp;';
-            } else {
-                $type_label = ($langs->trans("PaymentTypeShort".$objp->fk_type) != "PaymentTypeShort".$objp->fk_type) ? $langs->trans("PaymentTypeShort".$objp->fk_type) : $objp->fk_type;
-            }
-            $link = '';
-            if ($objp->fk_bordereau > 0) {
-                $remisestatic->id = $objp->fk_bordereau;
-                $remisestatic->ref = $objp->ref;
-                $link = ' '.$remisestatic->getNomUrl(1);
-            }
+			if ($objp->fk_type == 'SOLD') {
+				$type_label = '&nbsp;';
+			} else {
+				$type_label = ($langs->trans("PaymentTypeShort".$objp->fk_type) != "PaymentTypeShort".$objp->fk_type) ? $langs->trans("PaymentTypeShort".$objp->fk_type) : $objp->fk_type;
+			}
+			$link = '';
+			if ($objp->fk_bordereau > 0) {
+				$remisestatic->id = $objp->fk_bordereau;
+				$remisestatic->ref = $objp->ref;
+				$link = ' '.$remisestatic->getNomUrl(1);
+			}
 			print '<td class="nowrap">'.$type_label.' '.($objp->num_chq ? $objp->num_chq : '').$link.'</td>';
 
 			// Description
@@ -548,9 +548,9 @@ if (empty($numref))
 						print ')';
 					}
 				} elseif ($links[$key]['type'] == 'company') {
-                    $societestatic->id = $links[$key]['url_id'];
-                    $societestatic->name = $links[$key]['label'];
-                    print $societestatic->getNomUrl(1, 'company', 24);
+					$societestatic->id = $links[$key]['url_id'];
+					$societestatic->name = $links[$key]['label'];
+					print $societestatic->getNomUrl(1, 'company', 24);
 					$newline = 0;
 				} elseif ($links[$key]['type'] == 'member') {
 					print '<a href="'.DOL_URL_ROOT.'/adherents/card.php?rowid='.$links[$key]['url_id'].'">';
diff --git a/htdocs/compta/bank/transfer.php b/htdocs/compta/bank/transfer.php
index 70903f9120f..7e1b7fd0567 100644
--- a/htdocs/compta/bank/transfer.php
+++ b/htdocs/compta/bank/transfer.php
@@ -118,9 +118,9 @@ if ($action == 'add')
 			if (!$error) $bank_line_id_to = $accountto->addline($dateo, $typeto, $label, $amountto, '', '', $user);
 			if (!($bank_line_id_to > 0)) $error++;
 
-		    if (!$error) $result = $accountfrom->add_url_line($bank_line_id_from, $bank_line_id_to, DOL_URL_ROOT.'/compta/bank/line.php?rowid=', '(banktransfert)', 'banktransfert');
+			if (!$error) $result = $accountfrom->add_url_line($bank_line_id_from, $bank_line_id_to, DOL_URL_ROOT.'/compta/bank/line.php?rowid=', '(banktransfert)', 'banktransfert');
 			if (!($result > 0)) $error++;
-		    if (!$error) $result = $accountto->add_url_line($bank_line_id_to, $bank_line_id_from, DOL_URL_ROOT.'/compta/bank/line.php?rowid=', '(banktransfert)', 'banktransfert');
+			if (!$error) $result = $accountto->add_url_line($bank_line_id_to, $bank_line_id_from, DOL_URL_ROOT.'/compta/bank/line.php?rowid=', '(banktransfert)', 'banktransfert');
 			if (!($result > 0)) $error++;
 
 			if (!$error)
@@ -133,7 +133,7 @@ if ($action == 'add')
 				$db->rollback();
 			}
 		} else {
-		    $error++;
+			$error++;
 			setEventMessages($langs->trans("ErrorFromToAccountsMustDiffers"), null, 'errors');
 		}
 	}
diff --git a/htdocs/compta/bank/treso.php b/htdocs/compta/bank/treso.php
index f59723436d2..6d811233b7a 100644
--- a/htdocs/compta/bank/treso.php
+++ b/htdocs/compta/bank/treso.php
@@ -96,17 +96,17 @@ if ($_REQUEST["account"] || $_REQUEST["ref"])
 
 	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '', 0, '', '', 1);
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
-    print '<br>';
+	print '<br>';
 
 	$solde = $object->solde(0);
 	if ($conf->global->MULTICOMPANY_INVOICE_SHARING_ENABLED)$colspan = 6;
 	else $colspan = 5;
 
 	// Show next coming entries
-    print '<div class="div-table-responsive">';
-    print '<table class="noborder centpercent">';
+	print '<div class="div-table-responsive">';
+	print '<table class="noborder centpercent">';
 
 	// Ligne de titre tableau des ecritures
 	print '<tr class="liste_titre">';
@@ -277,13 +277,13 @@ if ($_REQUEST["account"] || $_REQUEST["ref"])
 			// We discard lines with a remainder to pay to 0
 			if (price2num($total_ttc) != 0)
 			{
-    			// Show line
-    			print '<tr class="oddeven">';
-    			print '<td>';
-    			if ($obj->dlr) print dol_print_date($db->jdate($obj->dlr), "day");
-    			else print $langs->trans("NotDefined");
-    			print "</td>";
-    			print "<td>".$ref."</td>";
+				// Show line
+				print '<tr class="oddeven">';
+				print '<td>';
+				if ($obj->dlr) print dol_print_date($db->jdate($obj->dlr), "day");
+				else print $langs->trans("NotDefined");
+				print "</td>";
+				print "<td>".$ref."</td>";
 				if ($conf->global->MULTICOMPANY_INVOICE_SHARING_ENABLED) {
 					if ($obj->family == 'invoice') {
 						$mc->getInfo($obj->entity);
@@ -292,11 +292,11 @@ if ($_REQUEST["account"] || $_REQUEST["ref"])
 						print "<td></td>";
 					}
 				}
-    			print "<td>".$refcomp."</td>";
-    			if ($obj->total_ttc < 0) { print '<td class="nowrap right">'.price(abs($total_ttc))."</td><td>&nbsp;</td>"; };
-    			if ($obj->total_ttc >= 0) { print '<td>&nbsp;</td><td class="nowrap right">'.price($total_ttc)."</td>"; };
-    			print '<td class="nowrap right">'.price($solde).'</td>';
-    			print "</tr>";
+				print "<td>".$refcomp."</td>";
+				if ($obj->total_ttc < 0) { print '<td class="nowrap right">'.price(abs($total_ttc))."</td><td>&nbsp;</td>"; };
+				if ($obj->total_ttc >= 0) { print '<td>&nbsp;</td><td class="nowrap right">'.price($total_ttc)."</td>"; };
+				print '<td class="nowrap right">'.price($solde).'</td>';
+				print "</tr>";
 			}
 
 			$i++;
@@ -310,7 +310,7 @@ if ($_REQUEST["account"] || $_REQUEST["ref"])
 	$reshook = $hookmanager->executeHooks('printObjectLine', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 	if (empty($reshook)) {
 		print $hookmanager->resPrint;
-        $solde = isset($hookmanager->resArray['solde']) ? $hookmanager->resArray['solde'] : $solde;
+		$solde = isset($hookmanager->resArray['solde']) ? $hookmanager->resArray['solde'] : $solde;
 	}
 
 	// solde
@@ -320,7 +320,7 @@ if ($_REQUEST["account"] || $_REQUEST["ref"])
 	print '</tr>';
 
 	print "</table>";
-    print "</div>";
+	print "</div>";
 } else {
 	print $langs->trans("ErrorBankAccountNotFound");
 }
diff --git a/htdocs/compta/bank/various_payment/card.php b/htdocs/compta/bank/various_payment/card.php
index 7218a191d1c..c1b5b1a06b0 100644
--- a/htdocs/compta/bank/various_payment/card.php
+++ b/htdocs/compta/bank/various_payment/card.php
@@ -52,8 +52,12 @@ $sens = GETPOST("sens", "int");
 $amount = price2num(GETPOST("amount", "alpha"));
 $paymenttype = GETPOST("paymenttype", "int");
 $accountancy_code = GETPOST("accountancy_code", "alpha");
-$subledger_account = GETPOST("subledger_account", "alpha");
 $projectid = (GETPOST('projectid', 'int') ? GETPOST('projectid', 'int') : GETPOST('fk_project', 'int'));
+if (!empty($conf->accounting->enabled) && !empty($conf->global->ACCOUNTANCY_COMBO_FOR_AUX)) {
+	$subledger_account = GETPOST("subledger_account", "alpha") > 0 ? GETPOST("subledger_account", "alpha") : '';
+} else {
+	$subledger_account = GETPOST("subledger_account", "alpha");
+}
 
 // Security check
 $socid = GETPOST("socid", "int");
@@ -116,7 +120,7 @@ if (empty($reshook))
 		$object->category_transaction = GETPOST("category_transaction", 'alpha');
 
 		$object->accountancy_code = GETPOST("accountancy_code") > 0 ? GETPOST("accountancy_code", "alpha") : "";
-        $object->subledger_account = GETPOST("subledger_account") > 0 ? GETPOST("subledger_account", "alpha") : "";
+		$object->subledger_account = $subledger_account;
 
 		$object->sens = GETPOST('sens');
 		$object->fk_project = GETPOST('fk_project', 'int');
@@ -212,9 +216,11 @@ if (empty($reshook))
 	}
 
 	if ($action == 'setsubledger_account') {
+		$db->begin();
+
 		$result = $object->fetch($id);
 
-		$object->subledger_account = (GETPOST("subledger_account") > 0 ? GETPOST("subledger_account", "alpha") : "");
+		$object->subledger_account = $subledger_account;
 
 		$res = $object->update($user);
 		if ($res > 0) {
@@ -313,7 +319,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/bankcateg.class.php';
 $bankcateg = new BankCateg($db);
 
 foreach ($bankcateg->fetchAll() as $bankcategory) {
-    $options[$bankcategory->id] = $bankcategory->label;
+	$options[$bankcategory->id] = $bankcategory->label;
 }
 
 /* ************************************************************************** */
@@ -355,8 +361,8 @@ if ($action == 'create')
 	// Sens
 	print '<tr><td>';
 	print $form->editfieldkey('Sens', 'sens', '', $object, 0, 'string', '', 1).'</td><td>';
-    $sensarray = array('0' => $langs->trans("Debit"), '1' => $langs->trans("Credit"));
-    print $form->selectarray('sens', $sensarray, $sens);
+	$sensarray = array('0' => $langs->trans("Debit"), '1' => $langs->trans("Credit"));
+	print $form->selectarray('sens', $sensarray, $sens);
 	print '</td></tr>';
 
 	// Amount
@@ -390,42 +396,42 @@ if ($action == 'create')
 		print '<td><input name="num_payment" class="maxwidth150onsmartphone" id="num_payment" type="text" value="'.GETPOST("num_payment").'"></td></tr>'."\n";
 	}
 
-    // Project
-    if (!empty($conf->projet->enabled))
-    {
-        $formproject = new FormProjets($db);
+	// Project
+	if (!empty($conf->projet->enabled))
+	{
+		$formproject = new FormProjets($db);
 
-        // Associated project
-        $langs->load("projects");
+		// Associated project
+		$langs->load("projects");
 
-        print '<tr><td>'.$langs->trans("Project").'</td><td>';
+		print '<tr><td>'.$langs->trans("Project").'</td><td>';
 
-        $numproject = $formproject->select_projects(-1, $projectid, 'fk_project', 0, 0, 1, 1);
+		$numproject = $formproject->select_projects(-1, $projectid, 'fk_project', 0, 0, 1, 1);
 
-        print '</td></tr>';
-    }
+		print '</td></tr>';
+	}
 
-    // Other attributes
-    $parameters = array();
-    $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-    print $hookmanager->resPrint;
+	// Other attributes
+	$parameters = array();
+	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+	print $hookmanager->resPrint;
 
-    // Category
-    if (is_array($options) && count($options) && $conf->categorie->enabled)
-    {
-    	print '<tr><td>'.$langs->trans("RubriquesTransactions").'</td><td>';
-    	print Form::selectarray('category_transaction', $options, GETPOST('category_transaction'), 1);
-    	print '</td></tr>';
-    }
+	// Category
+	if (is_array($options) && count($options) && $conf->categorie->enabled)
+	{
+		print '<tr><td>'.$langs->trans("RubriquesTransactions").'</td><td>';
+		print Form::selectarray('category_transaction', $options, GETPOST('category_transaction'), 1);
+		print '</td></tr>';
+	}
 
 	// Accountancy account
 	if (!empty($conf->accounting->enabled))
 	{
 		// TODO Remove the fieldrequired and allow instead to edit a various payment to enter accounting code
 		print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans("AccountAccounting").'</td>';
-        print '<td>';
+		print '<td>';
 		print $formaccounting->select_account($accountancy_code, 'accountancy_code', 1, null, 1, 1);
-        print '</td></tr>';
+		print '</td></tr>';
 	} else // For external software
 	{
 		print '<tr><td class="titlefieldcreate">'.$langs->trans("AccountAccounting").'</td>';
@@ -433,28 +439,28 @@ if ($action == 'create')
 		print '</td></tr>';
 	}
 
-    // Subledger account
-    if (!empty($conf->accounting->enabled))
-    {
-        print '<tr><td>'.$langs->trans("SubledgerAccount").'</td>';
-        print '<td>';
-        if (!empty($conf->global->ACCOUNTANCY_COMBO_FOR_AUX))
-        {
-            print $formaccounting->select_auxaccount($subledger_account, 'subledger_account', 1, '');
-        } else {
-            print '<input type="text" class="maxwidth200 maxwidthonsmartphone" name="subledger_account" value="'.$subledger_account.'">';
-        }
-        print '</td></tr>';
-    } else // For external software
-    {
-        print '<tr><td>'.$langs->trans("SubledgerAccount").'</td>';
-        print '<td><input class="minwidth100 maxwidthonsmartphone" name="subledger_account" value="'.$subledger_account.'">';
-        print '</td></tr>';
-    }
+	// Subledger account
+	if (!empty($conf->accounting->enabled))
+	{
+		print '<tr><td>'.$langs->trans("SubledgerAccount").'aaaa</td>';
+		print '<td>';
+		if (!empty($conf->global->ACCOUNTANCY_COMBO_FOR_AUX))
+		{
+			print $formaccounting->select_auxaccount($subledger_account, 'subledger_account', 1, '');
+		} else {
+			print '<input type="text" class="maxwidth200 maxwidthonsmartphone" name="subledger_account" value="'.$subledger_account.'">';
+		}
+		print '</td></tr>';
+	} else // For external software
+	{
+		print '<tr><td>'.$langs->trans("SubledgerAccount").'</td>';
+		print '<td><input class="minwidth100 maxwidthonsmartphone" name="subledger_account" value="'.$subledger_account.'">';
+		print '</td></tr>';
+	}
 
 	print '</table>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div class="center">';
 	print '<input type="submit" class="button" value="'.$langs->trans("Save").'">';
@@ -570,12 +576,12 @@ if ($id)
 	}
 	print '</td></tr>';
 
-    // Subledger account
-    print '<tr><td class="nowrap">';
-    print $form->editfieldkey('SubledgerAccount', 'subledger_account', $object->subledger_account, $object, (!$alreadyaccounted && $user->rights->banque->modifier), 'string', '', 0);
-    print '</td><td>';
-    print $form->editfieldval('SubledgerAccount', 'subledger_account', $object->subledger_account, $object, (!$alreadyaccounted && $user->rights->banque->modifier), 'string', '', 0);
-    print '</td></tr>';
+	// Subledger account
+	print '<tr><td class="nowrap">';
+	print $form->editfieldkey('SubledgerAccount', 'subledger_account', $object->subledger_account, $object, (!$alreadyaccounted && $user->rights->banque->modifier), 'string', '', 0);
+	print '</td><td>';
+	print $form->editfieldval('SubledgerAccount', 'subledger_account', $object->subledger_account, $object, (!$alreadyaccounted && $user->rights->banque->modifier), 'string', '', 0);
+	print '</td></tr>';
 
 	if (!empty($conf->banque->enabled))
 	{
@@ -603,7 +609,7 @@ if ($id)
 
 	print '<div class="clearboth"></div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 
 	/*
diff --git a/htdocs/compta/bank/various_payment/document.php b/htdocs/compta/bank/various_payment/document.php
index 32351e5fe3b..14187bf51e3 100644
--- a/htdocs/compta/bank/various_payment/document.php
+++ b/htdocs/compta/bank/various_payment/document.php
@@ -143,7 +143,7 @@ if ($object->id)
 
 	print '<div class="clearboth"></div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	$modulepart = 'banque';
 	$permission = $user->rights->banque->modifier;
diff --git a/htdocs/compta/bank/various_payment/list.php b/htdocs/compta/bank/various_payment/list.php
index 2fb2c56fc46..48da6483152 100644
--- a/htdocs/compta/bank/various_payment/list.php
+++ b/htdocs/compta/bank/various_payment/list.php
@@ -67,7 +67,7 @@ $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 if (!$sortfield) $sortfield = "v.datep,v.rowid";
-if (!$sortorder) $sortorder = "DESC";
+if (!$sortorder) $sortorder = "DESC,DESC";
 
 $filtre = GETPOST("filtre", 'alpha');
 
diff --git a/htdocs/compta/cashcontrol/cashcontrol_card.php b/htdocs/compta/cashcontrol/cashcontrol_card.php
index 4b61b446045..546805e3aaa 100644
--- a/htdocs/compta/cashcontrol/cashcontrol_card.php
+++ b/htdocs/compta/cashcontrol/cashcontrol_card.php
@@ -59,7 +59,7 @@ $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'thi
 
 if ($contextpage == 'takepos')
 {
-    $_GET['optioncss'] = 'print';
+	$_GET['optioncss'] = 'print';
 }
 
 // Security check
@@ -164,8 +164,8 @@ if ($action == "start")
 		$object->month_close = GETPOST('closemonth', 'int');
 		$object->year_close = GETPOST('closeyear', 'int');
 
-	    $object->opening = price2num(GETPOST('opening', 'alpha'));
-	    $object->posmodule = GETPOST('posmodule', 'alpha');
+		$object->opening = price2num(GETPOST('opening', 'alpha'));
+		$object->posmodule = GETPOST('posmodule', 'alpha');
 		$object->posnumber = GETPOST('posnumber', 'alpha');
 
 		$db->begin();
@@ -226,32 +226,32 @@ if ($action == "valid")	// validate = close
 		</script>";
 		exit;
 	}
-    $action = "view";
+	$action = "view";
 }
 
 // Action to delete
 if ($action == 'confirm_delete' && !empty($permissiontodelete))
 {
-    $object->fetch($id);
+	$object->fetch($id);
 
-    if (!($object->id > 0))
-    {
-        dol_print_error('', 'Error, object must be fetched before being deleted');
-        exit;
-    }
+	if (!($object->id > 0))
+	{
+		dol_print_error('', 'Error, object must be fetched before being deleted');
+		exit;
+	}
 
-    $result = $object->delete($user);
-    //var_dump($result);
-    if ($result > 0)
-    {
-        // Delete OK
-        setEventMessages("RecordDeleted", null, 'mesgs');
-        header("Location: ".$backurlforlist);
-        exit;
-    } else {
-        if (!empty($object->errors)) setEventMessages(null, $object->errors, 'errors');
-        else setEventMessages($object->error, null, 'errors');
-    }
+	$result = $object->delete($user);
+	//var_dump($result);
+	if ($result > 0)
+	{
+		// Delete OK
+		setEventMessages("RecordDeleted", null, 'mesgs');
+		header("Location: ".$backurlforlist);
+		exit;
+	} else {
+		if (!empty($object->errors)) setEventMessages(null, $object->errors, 'errors');
+		else setEventMessages($object->error, null, 'errors');
+	}
 }
 
 
@@ -307,22 +307,22 @@ if ($action == "create" || $action == "start" || $action == 'close')
 
 			if ($bankid > 0)
 			{
-    			$sql = "SELECT SUM(amount) as total FROM ".MAIN_DB_PREFIX."bank";
-    			$sql .= " WHERE fk_account = ".$bankid;
-    			if ($syear && !$smonth)              $sql .= " AND dateo < '".$db->idate(dol_get_first_day($syear, 1))."'";
-    			elseif ($syear && $smonth && !$sday) $sql .= " AND dateo < '".$db->idate(dol_get_first_day($syear, $smonth))."'";
-    			elseif ($syear && $smonth && $sday)  $sql .= " AND dateo < '".$db->idate(dol_mktime(0, 0, 0, $smonth, $sday, $syear))."'";
-    			else dol_print_error('', 'Year not defined');
+				$sql = "SELECT SUM(amount) as total FROM ".MAIN_DB_PREFIX."bank";
+				$sql .= " WHERE fk_account = ".$bankid;
+				if ($syear && !$smonth)              $sql .= " AND dateo < '".$db->idate(dol_get_first_day($syear, 1))."'";
+				elseif ($syear && $smonth && !$sday) $sql .= " AND dateo < '".$db->idate(dol_get_first_day($syear, $smonth))."'";
+				elseif ($syear && $smonth && $sday)  $sql .= " AND dateo < '".$db->idate(dol_mktime(0, 0, 0, $smonth, $sday, $syear))."'";
+				else dol_print_error('', 'Year not defined');
 
-    			$resql = $db->query($sql);
-    			if ($resql)
-    			{
-    				$obj = $db->fetch_object($resql);
-    				if ($obj) $initialbalanceforterminal[$terminalid][$key] = $obj->total;
-    			} else dol_print_error($db);
+				$resql = $db->query($sql);
+				if ($resql)
+				{
+					$obj = $db->fetch_object($resql);
+					if ($obj) $initialbalanceforterminal[$terminalid][$key] = $obj->total;
+				} else dol_print_error($db);
 			} else {
 				setEventMessages($langs->trans("SetupOfTerminalNotComplete", $terminaltouse), null, 'errors');
-			    $error++;
+				$error++;
 			}
 		}
 
@@ -370,50 +370,50 @@ 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="'.newToken().'">';
+		print '<input type="hidden" name="token" value="'.newToken().'">';
 		if ($contextpage == 'takepos') print '<input type="hidden" name="contextpage" value="takepos">';
-	    if ($action == 'start' && GETPOST('posnumber', 'int') != '' && GETPOST('posnumber', 'int') != '' && GETPOST('posnumber', 'int') != '-1')
-	    {
-		    print '<input type="hidden" name="action" value="add">';
-	    } elseif ($action == 'close')
-	    {
-	    	print '<input type="hidden" name="action" value="valid">';
+		if ($action == 'start' && GETPOST('posnumber', 'int') != '' && GETPOST('posnumber', 'int') != '' && GETPOST('posnumber', 'int') != '-1')
+		{
+			print '<input type="hidden" name="action" value="add">';
+		} elseif ($action == 'close')
+		{
+			print '<input type="hidden" name="action" value="valid">';
 			print '<input type="hidden" name="id" value="'.$id.'">';
-	    } else {
-	    	print '<input type="hidden" name="action" value="start">';
-	    }
+		} else {
+			print '<input type="hidden" name="action" value="start">';
+		}
 
-	    print '<div class="div-table-responsive-no-min">';
-	    print '<table class="noborder centpercent">';
-	    print '<tr class="liste_titre">';
-	    print '<td>'.$langs->trans("Module").'</td>';
-	    print '<td>'.$langs->trans("Terminal").'</td>';
-	    print '<td>'.$langs->trans("Year").'</td>';
-	    print '<td>'.$langs->trans("Month").'</td>';
-	    print '<td>'.$langs->trans("Day").'</td>';
-	    print '<td></td>';
-	    print "</tr>\n";
+		print '<div class="div-table-responsive-no-min">';
+		print '<table class="noborder centpercent">';
+		print '<tr class="liste_titre">';
+		print '<td>'.$langs->trans("Module").'</td>';
+		print '<td>'.$langs->trans("Terminal").'</td>';
+		print '<td>'.$langs->trans("Year").'</td>';
+		print '<td>'.$langs->trans("Month").'</td>';
+		print '<td>'.$langs->trans("Day").'</td>';
+		print '<td></td>';
+		print "</tr>\n";
 
 		$disabled = 0;
 		$prefix = 'close';
 
-	    print '<tr class="oddeven">';
-	    print '<td>'.$form->selectarray('posmodule', $arrayofposavailable, GETPOST('posmodule', 'alpha'), (count($arrayofposavailable) > 1 ? 1 : 0)).'</td>';
-	    print '<td>';
+		print '<tr class="oddeven">';
+		print '<td>'.$form->selectarray('posmodule', $arrayofposavailable, GETPOST('posmodule', 'alpha'), (count($arrayofposavailable) > 1 ? 1 : 0)).'</td>';
+		print '<td>';
 
-	    $array = array();
-	    $numterminals = max(1, $conf->global->TAKEPOS_NUM_TERMINALS);
-	    for ($i = 1; $i <= $numterminals; $i++) {
-	    	$array[$i] = $i;
-	    }
-	    $selectedposnumber = 0; $showempty = 1;
-	    if ($conf->global->TAKEPOS_NUM_TERMINALS == '1')
-	    {
-	        $selectedposnumber = 1; $showempty = 0;
-	    }
-	    print $form->selectarray('posnumber', $array, GETPOSTISSET('posnumber') ?GETPOST('posnumber', 'int') : $selectedposnumber, $showempty);
-	    //print '<input name="posnumber" type="text" class="maxwidth50" value="'.(GETPOSTISSET('posnumber')?GETPOST('posnumber', 'alpha'):'0').'">';
-	    print '</td>';
+		$array = array();
+		$numterminals = max(1, $conf->global->TAKEPOS_NUM_TERMINALS);
+		for ($i = 1; $i <= $numterminals; $i++) {
+			$array[$i] = $i;
+		}
+		$selectedposnumber = 0; $showempty = 1;
+		if ($conf->global->TAKEPOS_NUM_TERMINALS == '1')
+		{
+			$selectedposnumber = 1; $showempty = 0;
+		}
+		print $form->selectarray('posnumber', $array, GETPOSTISSET('posnumber') ?GETPOST('posnumber', 'int') : $selectedposnumber, $showempty);
+		//print '<input name="posnumber" type="text" class="maxwidth50" value="'.(GETPOSTISSET('posnumber')?GETPOST('posnumber', 'alpha'):'0').'">';
+		print '</td>';
 		// Year
 		print '<td>';
 		$retstring = '<select'.($disabled ? ' disabled' : '').' class="flat valignmiddle maxwidth75imp" id="'.$prefix.'year" name="'.$prefix.'year">';
@@ -577,36 +577,36 @@ if ($action == "create" || $action == "start" || $action == 'close')
 			print '</div>';
 		}
 
-	    print '</form>';
+		print '</form>';
 	}
 }
 
 if (empty($action) || $action == "view" || $action == "close")
 {
-    $result = $object->fetch($id);
+	$result = $object->fetch($id);
 
-    llxHeader('', $langs->trans("CashControl"));
+	llxHeader('', $langs->trans("CashControl"));
 
-    if ($result <= 0) {
-    	print $langs->trans("ErrorRecordNotFound");
-    } else {
-    	$head = array();
-    	$head[0][0] = DOL_URL_ROOT.'/compta/cashcontrol/cashcontrol_card.php?id='.$object->id;
-    	$head[0][1] = $langs->trans("CashControl");
-    	$head[0][2] = 'cashcontrol';
+	if ($result <= 0) {
+		print $langs->trans("ErrorRecordNotFound");
+	} else {
+		$head = array();
+		$head[0][0] = DOL_URL_ROOT.'/compta/cashcontrol/cashcontrol_card.php?id='.$object->id;
+		$head[0][1] = $langs->trans("CashControl");
+		$head[0][2] = 'cashcontrol';
 
-	    print dol_get_fiche_head($head, 'cashcontrol', $langs->trans("CashControl"), -1, 'account');
+		print dol_get_fiche_head($head, 'cashcontrol', $langs->trans("CashControl"), -1, 'account');
 
-    	$linkback = '<a href="'.DOL_URL_ROOT.'/compta/cashcontrol/cashcontrol_list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+		$linkback = '<a href="'.DOL_URL_ROOT.'/compta/cashcontrol/cashcontrol_list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-	    $morehtmlref = '<div class="refidno">';
-	    $morehtmlref .= '</div>';
+		$morehtmlref = '<div class="refidno">';
+		$morehtmlref .= '</div>';
 
 
-	    dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'rowid', $morehtmlref);
+		dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'rowid', $morehtmlref);
 
-	    print '<div class="fichecenter">';
-	    print '<div class="fichehalfleft">';
+		print '<div class="fichecenter">';
+		print '<div class="fichehalfleft">';
 		print '<div class="underbanner clearboth"></div>';
 		print '<table class="border tableforfield" width="100%">';
 
@@ -633,36 +633,36 @@ if (empty($action) || $action == "view" || $action == "close")
 		print '</td></tr>';
 
 		print '</table>';
-	    print '</div>';
+		print '</div>';
 
-	    print '<div class="fichehalfright"><div class="ficheaddleft">';
+		print '<div class="fichehalfright"><div class="ficheaddleft">';
 		print '<div class="underbanner clearboth"></div>';
-	    print '<table class="border tableforfield" width="100%">';
+		print '<table class="border tableforfield" width="100%">';
 
-	    print '<tr><td class="titlefield nowrap">';
-	    print $langs->trans("DateCreationShort");
-	    print '</td><td>';
-	    print dol_print_date($object->date_creation, 'dayhour');
-	    print '</td></tr>';
+		print '<tr><td class="titlefield nowrap">';
+		print $langs->trans("DateCreationShort");
+		print '</td><td>';
+		print dol_print_date($object->date_creation, 'dayhour');
+		print '</td></tr>';
 
-	    print '<tr><td valign="middle">'.$langs->trans("InitialBankBalance").' - '.$langs->trans("Cash").'</td><td>';
-	    print price($object->opening, 0, $langs, 1, -1, -1, $conf->currency);
-	    print "</td></tr>";
-	    foreach ($arrayofpaymentmode as $key => $val)
-	    {
-	        print '<tr><td valign="middle">'.$langs->trans($val).'</td><td>';
-	    	print price($object->$key, 0, $langs, 1, -1, -1, $conf->currency);
-	    	print "</td></tr>";
-	    }
+		print '<tr><td valign="middle">'.$langs->trans("InitialBankBalance").' - '.$langs->trans("Cash").'</td><td>';
+		print price($object->opening, 0, $langs, 1, -1, -1, $conf->currency);
+		print "</td></tr>";
+		foreach ($arrayofpaymentmode as $key => $val)
+		{
+			print '<tr><td valign="middle">'.$langs->trans($val).'</td><td>';
+			print price($object->$key, 0, $langs, 1, -1, -1, $conf->currency);
+			print "</td></tr>";
+		}
 
 		print "</table>\n";
-	    print '</div>';
-	    print '</div></div>';
-	    print '<div style="clear:both"></div>';
+		print '</div>';
+		print '</div></div>';
+		print '<div style="clear:both"></div>';
 
-	    dol_fiche_end();
+		print dol_get_fiche_end();
 
-	    if ($action != 'close') {
+		if ($action != 'close') {
 			print '<div class="tabsAction">';
 
 			print '<div class="inline-block divButAction"><a target="_blank" class="butAction" href="report.php?id='.$id.'">'.$langs->trans('PrintTicket').'</a></div>';
@@ -679,22 +679,22 @@ if (empty($action) || $action == "view" || $action == "close")
 			print '</div>';
 
 			if ($contextpage != 'takepos') 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="'.newToken().'">';
+		} else {
+			print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'" name="formclose">';
+			print '<input type="hidden" name="token" value="'.newToken().'">';
 			if ($contextpage == 'takepos') print '<input type="hidden" name="contextpage" value="takepos">';
-	    	if ($action == 'start' && GETPOST('posnumber', 'int') != '' && GETPOST('posnumber', 'int') != '' && GETPOST('posnumber', 'int') != '-1')
-	    	{
-	    		print '<input type="hidden" name="action" value="add">';
-	    	} elseif ($action == 'close')
-	    	{
-	    		print '<input type="hidden" name="action" value="valid">';
-	    		print '<input type="hidden" name="id" value="'.$id.'">';
-	    	} else {
-	    		print '<input type="hidden" name="action" value="start">';
-	    	}
+			if ($action == 'start' && GETPOST('posnumber', 'int') != '' && GETPOST('posnumber', 'int') != '' && GETPOST('posnumber', 'int') != '-1')
+			{
+				print '<input type="hidden" name="action" value="add">';
+			} elseif ($action == 'close')
+			{
+				print '<input type="hidden" name="action" value="valid">';
+				print '<input type="hidden" name="id" value="'.$id.'">';
+			} else {
+				print '<input type="hidden" name="action" value="start">';
+			}
 
-	    	/*
+			/*
 	    	print '<div class="div-table-responsive-no-min">';
 	    	print '<table class="noborder centpercent">';
 	    	print '<tr class="liste_titre">';
@@ -745,127 +745,127 @@ if (empty($action) || $action == "view" || $action == "close")
 	    	print '</div>';
 	    	*/
 
-	    	// Table to see/enter balance
-	    	if (($action == 'start' && GETPOST('posnumber') != '' && GETPOST('posnumber') != '' && GETPOST('posnumber') != '-1') || $action == 'close')
-	    	{
-	    		$posmodule = $object->posmodule;
-	    		$terminalid = $object->posnumber;
+			// Table to see/enter balance
+			if (($action == 'start' && GETPOST('posnumber') != '' && GETPOST('posnumber') != '' && GETPOST('posnumber') != '-1') || $action == 'close')
+			{
+				$posmodule = $object->posmodule;
+				$terminalid = $object->posnumber;
 
-	    		print '<br>';
+				print '<br>';
 
-	    		print '<div class="div-table-responsive-no-min">';
-	    		print '<table class="noborder centpercent">';
+				print '<div class="div-table-responsive-no-min">';
+				print '<table class="noborder centpercent">';
 
-	    		print '<tr class="liste_titre">';
-	    		print '<td></td>';
-	    		print '<td class="center">'.$langs->trans("InitialBankBalance");
-	    		//print '<br>'.$langs->trans("TheoricalAmount").'<br>'.$langs->trans("RealAmount");
-	    		print '</td>';
+				print '<tr class="liste_titre">';
+				print '<td></td>';
+				print '<td class="center">'.$langs->trans("InitialBankBalance");
+				//print '<br>'.$langs->trans("TheoricalAmount").'<br>'.$langs->trans("RealAmount");
+				print '</td>';
 
-	    		print '<td align="center" class="hide0" colspan="'.count($arrayofpaymentmode).'">';
-	    		print $langs->trans("AmountAtEndOfPeriod");
-	    		print '</td>';
-	    		print '<td></td>';
-	    		print '</tr>';
+				print '<td align="center" class="hide0" colspan="'.count($arrayofpaymentmode).'">';
+				print $langs->trans("AmountAtEndOfPeriod");
+				print '</td>';
+				print '<td></td>';
+				print '</tr>';
 
-	    		print '<tr class="liste_titre">';
-	    		print '<td></td>';
-	    		print '<td class="center">'.$langs->trans("Cash");
-	    		//print '<br>'.$langs->trans("TheoricalAmount").'<br>'.$langs->trans("RealAmount");
-	    		print '</td>';
-	    		$i = 0;
-	    		foreach ($arrayofpaymentmode as $key => $val)
-	    		{
-	    			print '<td align="center"'.($i == 0 ? ' class="hide0"' : '').'>'.$langs->trans($val);
-	    			//print '<br>'.$langs->trans("TheoricalAmount").'<br>'.$langs->trans("RealAmount");
-	    			print '</td>';
-	    			$i++;
-	    		}
-	    		print '<td></td>';
-	    		print '</tr>';
+				print '<tr class="liste_titre">';
+				print '<td></td>';
+				print '<td class="center">'.$langs->trans("Cash");
+				//print '<br>'.$langs->trans("TheoricalAmount").'<br>'.$langs->trans("RealAmount");
+				print '</td>';
+				$i = 0;
+				foreach ($arrayofpaymentmode as $key => $val)
+				{
+					print '<td align="center"'.($i == 0 ? ' class="hide0"' : '').'>'.$langs->trans($val);
+					//print '<br>'.$langs->trans("TheoricalAmount").'<br>'.$langs->trans("RealAmount");
+					print '</td>';
+					$i++;
+				}
+				print '<td></td>';
+				print '</tr>';
 
-	    		print '<tr>';
-	    		// Initial amount
-	    		print '<td>'.$langs->trans("NbOfInvoices").'</td>';
-	    		print '<td class="center">';
-	    		print '</td>';
-	    		// Amount per payment type
-	    		$i = 0;
-	    		foreach ($arrayofpaymentmode as $key => $val)
-	    		{
-	    			print '<td align="center"'.($i == 0 ? ' class="hide0"' : '').'>';
-	    			print $theoricalnbofinvoiceforterminal[$terminalid][$key];
-	    			print '</td>';
-	    			$i++;
-	    		}
-	    		// Save
-	    		print '<td align="center"></td>';
-	    		print '</tr>';
+				print '<tr>';
+				// Initial amount
+				print '<td>'.$langs->trans("NbOfInvoices").'</td>';
+				print '<td class="center">';
+				print '</td>';
+				// Amount per payment type
+				$i = 0;
+				foreach ($arrayofpaymentmode as $key => $val)
+				{
+					print '<td align="center"'.($i == 0 ? ' class="hide0"' : '').'>';
+					print $theoricalnbofinvoiceforterminal[$terminalid][$key];
+					print '</td>';
+					$i++;
+				}
+				// Save
+				print '<td align="center"></td>';
+				print '</tr>';
 
-	    		print '<tr>';
-	    		// Initial amount
-	    		print '<td>'.$langs->trans("TheoricalAmount").'</td>';
-	    		print '<td class="center">';
-	    		print price($initialbalanceforterminal[$terminalid]['cash']).'<br>';
-	    		print '</td>';
-	    		// Amount per payment type
-	    		$i = 0;
-	    		foreach ($arrayofpaymentmode as $key => $val)
-	    		{
-	    			print '<td align="center"'.($i == 0 ? ' class="hide0"' : '').'>';
-	    			if ($key == 'cash') {
-	    				$deltaforcash = ($object->opening - $initialbalanceforterminal[$terminalid]['cash']);
-	    				print price($theoricalamountforterminal[$terminalid][$key] + $deltaforcash).'<br>';
-	    			} else {
-	    				print price($theoricalamountforterminal[$terminalid][$key]).'<br>';
-	    			}
-	    			print '</td>';
-	    			$i++;
-	    		}
-	    		// Save
-	    		print '<td align="center"></td>';
-	    		print '</tr>';
+				print '<tr>';
+				// Initial amount
+				print '<td>'.$langs->trans("TheoricalAmount").'</td>';
+				print '<td class="center">';
+				print price($initialbalanceforterminal[$terminalid]['cash']).'<br>';
+				print '</td>';
+				// Amount per payment type
+				$i = 0;
+				foreach ($arrayofpaymentmode as $key => $val)
+				{
+					print '<td align="center"'.($i == 0 ? ' class="hide0"' : '').'>';
+					if ($key == 'cash') {
+						$deltaforcash = ($object->opening - $initialbalanceforterminal[$terminalid]['cash']);
+						print price($theoricalamountforterminal[$terminalid][$key] + $deltaforcash).'<br>';
+					} else {
+						print price($theoricalamountforterminal[$terminalid][$key]).'<br>';
+					}
+					print '</td>';
+					$i++;
+				}
+				// Save
+				print '<td align="center"></td>';
+				print '</tr>';
 
-	    		print '<tr>';
-	    		print '<td>'.$langs->trans("RealAmount").'</td>';
-	    		// Initial amount
-	    		print '<td class="center">';
-	    		print '<input ';
-	    		if ($action == 'close') print 'disabled '; // To close cash user can't set opening cash
-	    		print 'name="opening" type="text" class="maxwidth100 center" value="';
-	    		if ($action == 'close')
-	    		{
-	    			$object->fetch($id);
-	    			print $object->opening;
-	    		} else print (GETPOSTISSET('opening') ?price2num(GETPOST('opening', 'alpha')) : price($initialbalanceforterminal[$terminalid]['cash']));
-	    		print '">';
-	    		print '</td>';
-	    		// Amount per payment type
-	    		$i = 0;
-	    		foreach ($arrayofpaymentmode as $key => $val)
-	    		{
-	    			print '<td align="center"'.($i == 0 ? ' class="hide0"' : '').'>';
-	    			print '<input ';
-	    			if ($action == 'start') print 'disabled '; // To start cash user only can set opening cash
-	    			print 'name="'.$key.'_amount" type="text"'.($key == 'cash' ? ' autofocus' : '').' class="maxwidth100 center" value="'.GETPOST($key.'_amount', 'alpha').'">';
-	    			print '</td>';
-	    			$i++;
-	    		}
-	    		// Save
-	    		print '<td class="center">';
-	    		print '<input type="submit" name="cancel" class="button" value="'.$langs->trans("Cancel").'">';
-	    		if ($action == 'start') print '<input type="submit" name="add" class="button" value="'.$langs->trans("Save").'">';
-	    		elseif ($action == 'close') print '<input type="submit" name="valid" class="button" value="'.$langs->trans("Close").'">';
-	    		print '</td>';
-	    		print '</tr>';
+				print '<tr>';
+				print '<td>'.$langs->trans("RealAmount").'</td>';
+				// Initial amount
+				print '<td class="center">';
+				print '<input ';
+				if ($action == 'close') print 'disabled '; // To close cash user can't set opening cash
+				print 'name="opening" type="text" class="maxwidth100 center" value="';
+				if ($action == 'close')
+				{
+					$object->fetch($id);
+					print $object->opening;
+				} else print (GETPOSTISSET('opening') ?price2num(GETPOST('opening', 'alpha')) : price($initialbalanceforterminal[$terminalid]['cash']));
+				print '">';
+				print '</td>';
+				// Amount per payment type
+				$i = 0;
+				foreach ($arrayofpaymentmode as $key => $val)
+				{
+					print '<td align="center"'.($i == 0 ? ' class="hide0"' : '').'>';
+					print '<input ';
+					if ($action == 'start') print 'disabled '; // To start cash user only can set opening cash
+					print 'name="'.$key.'_amount" type="text"'.($key == 'cash' ? ' autofocus' : '').' class="maxwidth100 center" value="'.GETPOST($key.'_amount', 'alpha').'">';
+					print '</td>';
+					$i++;
+				}
+				// Save
+				print '<td class="center">';
+				print '<input type="submit" name="cancel" class="button" value="'.$langs->trans("Cancel").'">';
+				if ($action == 'start') print '<input type="submit" name="add" class="button" value="'.$langs->trans("Save").'">';
+				elseif ($action == 'close') print '<input type="submit" name="valid" class="button" value="'.$langs->trans("Close").'">';
+				print '</td>';
+				print '</tr>';
 
-	    		print '</table>';
-	    		print '</div>';
-	    	}
+				print '</table>';
+				print '</div>';
+			}
 
-	    	print '</form>';
-	    }
-    }
+			print '</form>';
+		}
+	}
 }
 
 // End of page
diff --git a/htdocs/compta/cashcontrol/cashcontrol_list.php b/htdocs/compta/cashcontrol/cashcontrol_list.php
index b41e46aff76..55ad8914a9e 100644
--- a/htdocs/compta/cashcontrol/cashcontrol_list.php
+++ b/htdocs/compta/cashcontrol/cashcontrol_list.php
@@ -390,7 +390,7 @@ foreach ($object->fields as $key => $val)
 	if (!empty($arrayfields['t.'.$key]['checked']))
 	{
 		print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
-		if (is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
+		if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
 		else print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
 		print '</td>';
 	}
diff --git a/htdocs/compta/cashcontrol/class/cashcontrol.class.php b/htdocs/compta/cashcontrol/class/cashcontrol.class.php
index 0f60be3c3a8..842322f7f20 100644
--- a/htdocs/compta/cashcontrol/class/cashcontrol.class.php
+++ b/htdocs/compta/cashcontrol/class/cashcontrol.class.php
@@ -19,7 +19,7 @@
  */
 
 /**
- * \file       cashcontrol/class/cashcontrol.class.php
+ * \file       htdocs/compta/cashcontrol/class/cashcontrol.class.php
  * \ingroup    cashdesk|takepos
  * \brief      This file is CRUD class file (Create/Read/Update/Delete) for cash fence table
  */
@@ -66,8 +66,8 @@ class CashControl extends CommonObject
 	'cash' =>array('type'=>'price', 'label'=>'Cash', 'enabled'=>1, 'visible'=>1, 'position'=>30),
 	'cheque' =>array('type'=>'price', 'label'=>'Cheque', 'enabled'=>1, 'visible'=>1, 'position'=>33),
 	'card' =>array('type'=>'price', 'label'=>'CreditCard', 'enabled'=>1, 'visible'=>1, 'position'=>36),
-    'year_close' =>array('type'=>'integer', 'label'=>'Year close', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'position'=>50, 'css'=>'center'),
-    'month_close' =>array('type'=>'integer', 'label'=>'Month close', 'enabled'=>1, 'visible'=>1, 'position'=>55, 'css'=>'center'),
+	'year_close' =>array('type'=>'integer', 'label'=>'Year close', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'position'=>50, 'css'=>'center'),
+	'month_close' =>array('type'=>'integer', 'label'=>'Month close', 'enabled'=>1, 'visible'=>1, 'position'=>55, 'css'=>'center'),
 	'day_close' =>array('type'=>'integer', 'label'=>'Day close', 'enabled'=>1, 'visible'=>1, 'position'=>60, 'css'=>'center'),
 	'date_valid' =>array('type'=>'datetime', 'label'=>'DateValidation', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>490),
 	'date_creation' =>array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>500),
@@ -76,6 +76,9 @@ class CashControl extends CommonObject
 	'status' => array('type'=>'integer', 'label'=>'Status', 'enabled'=>1, 'visible'=>1, 'position'=>1000, 'notnull'=>1, 'index'=>1, 'arrayofkeyval'=>array('0'=>'Brouillon', '1'=>'Validated')),
 	);
 
+	/**
+	 * @var int Object Id
+	 */
 	public $id;
 	public $opening;
 	public $status;
@@ -94,8 +97,8 @@ class CashControl extends CommonObject
 	public $date_valid;
 
 	/**
-     * @var integer|string date_creation
-     */
+	 * @var integer|string date_creation
+	 */
 	public $date_creation;
 
 	/**
@@ -286,7 +289,7 @@ class CashControl extends CommonObject
 	public function fetch($id, $ref = null)
 	{
 		$result = $this->fetchCommon($id, $ref);
-		if ($result > 0 && !empty($this->table_element_line)) $this->fetchLines();
+		//if ($result > 0 && !empty($this->table_element_line)) $this->fetchLines();
 		return $result;
 	}
 
@@ -311,8 +314,8 @@ class CashControl extends CommonObject
 	 */
 	public function delete(User $user, $notrigger = false)
 	{
-	    return $this->deleteCommon($user, $notrigger);
-	    //return $this->deleteCommon($user, $notrigger, 1);
+		return $this->deleteCommon($user, $notrigger);
+		//return $this->deleteCommon($user, $notrigger, 1);
 	}
 
 	/**
@@ -357,10 +360,10 @@ class CashControl extends CommonObject
 	 *  Return clicable link of object (with eventually picto)
 	 *
 	 *  @param  int     $withpicto                  Add picto into link
-     *  @param  string  $option                     On what the link point to ('nolink', ...)
-     *  @param  int     $notooltip                  1=Disable tooltip
-     *  @param  string  $morecss                    Add more css on link
-     *  @param  int     $save_lastsearch_value      -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+	 *  @param  string  $option                     On what the link point to ('nolink', ...)
+	 *  @param  int     $notooltip                  1=Disable tooltip
+	 *  @param  string  $morecss                    Add more css on link
+	 *  @param  int     $save_lastsearch_value      -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
 	 *  @return string                              String with URL
 	 */
 	public function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $morecss = '', $save_lastsearch_value = -1)
@@ -381,24 +384,24 @@ class CashControl extends CommonObject
 
 		if ($option != 'nolink')
 		{
-		    // Add param to save lastsearch_values or not
-		    $add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
-		    if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
-		    if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
+			// Add param to save lastsearch_values or not
+			$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
+			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
+			if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
 		}
 
 		$linkclose = '';
 		if (empty($notooltip))
 		{
-		    if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-		    {
-		        $label = $langs->trans("ShowMyObject");
-		        $linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
-		    }
-		    $linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
-		    $linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+			{
+				$label = $langs->trans("ShowMyObject");
+				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
+			}
+			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
+			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
 
-		    /*
+			/*
 		     $hookmanager->initHooks(array('myobjectdao'));
 		     $parameters=array('id'=>$this->id);
 		     $reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
@@ -420,8 +423,10 @@ class CashControl extends CommonObject
 		$hookmanager->initHooks(array('cashfencedao'));
 		$parameters = array('id'=>$this->id, 'getnomurl'=>$result);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-		if ($reshook > 0) { $result = $hookmanager->resPrint;
-		} else { $result .= $hookmanager->resPrint;
+		if ($reshook > 0) {
+			$result = $hookmanager->resPrint;
+		} else {
+			$result .= $hookmanager->resPrint;
 		}
 
 		return $result;
diff --git a/htdocs/compta/cashcontrol/report.php b/htdocs/compta/cashcontrol/report.php
index 5df55ab7849..515067900e3 100644
--- a/htdocs/compta/cashcontrol/report.php
+++ b/htdocs/compta/cashcontrol/report.php
@@ -29,8 +29,8 @@
  *	\brief      List of bank transactions
  */
 
-if (!defined('NOREQUIREMENU')) define('NOREQUIREMENU','1');				// If there is no need to load and show top and left menu
-if (!defined('NOBROWSERNOTIF')) define('NOBROWSERNOTIF', '1');			// Disable browser notification
+if (!defined('NOREQUIREMENU')) define('NOREQUIREMENU', '1'); // If there is no need to load and show top and left menu
+if (!defined('NOBROWSERNOTIF')) define('NOBROWSERNOTIF', '1'); // Disable browser notification
 
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/cashcontrol/class/cashcontrol.class.php';
@@ -52,13 +52,13 @@ $sortorder = 'ASC';
 $sortfield = 'b.datev,b.dateo,b.rowid';
 
 $arrayfields = array(
-    'b.rowid'=>array('label'=>$langs->trans("Ref"), 'checked'=>1),
-    'b.dateo'=>array('label'=>$langs->trans("DateOperationShort"), 'checked'=>1),
-    'b.num_chq'=>array('label'=>$langs->trans("Number"), 'checked'=>1),
-    'ba.ref'=>array('label'=>$langs->trans("BankAccount"), 'checked'=>1),
-    'cp.code'=>array('label'=>$langs->trans("PaymentMode"), 'checked'=>1),
+	'b.rowid'=>array('label'=>$langs->trans("Ref"), 'checked'=>1),
+	'b.dateo'=>array('label'=>$langs->trans("DateOperationShort"), 'checked'=>1),
+	'b.num_chq'=>array('label'=>$langs->trans("Number"), 'checked'=>1),
+	'ba.ref'=>array('label'=>$langs->trans("BankAccount"), 'checked'=>1),
+	'cp.code'=>array('label'=>$langs->trans("PaymentMode"), 'checked'=>1),
 	'b.debit'=>array('label'=>$langs->trans("Debit"), 'checked'=>1, 'position'=>600),
-    'b.credit'=>array('label'=>$langs->trans("Credit"), 'checked'=>1, 'position'=>605),
+	'b.credit'=>array('label'=>$langs->trans("Credit"), 'checked'=>1, 'position'=>605),
 );
 
 $syear  = $cashcontrol->year_close;
@@ -125,8 +125,7 @@ elseif ($syear && $smonth && $sday)   $sql .= " AND datef BETWEEN '".$db->idate(
 else dol_print_error('', 'Year not defined');
 
 $resql = $db->query($sql);
-if ($resql)
-{
+if ($resql) {
 	$num = $db->num_rows($resql);
 	$i = 0;
 
@@ -142,10 +141,10 @@ if ($resql)
 	print $langs->trans("InitialBankBalance").' - '.$langs->trans("Cash")." : ".price($cashcontrol->opening);
 	print "</h2></div>";
 
-    print '<div class="div-table-responsive">';
-    print '<table class="tagtable liste">'."\n";
+	print '<div class="div-table-responsive">';
+	print '<table class="tagtable liste">'."\n";
 
-    $param = '';
+	$param = '';
 
 	// Fields title
 	print '<tr class="liste_titre">';
@@ -163,26 +162,24 @@ if ($resql)
 	$sign = 1;
 	$cash = $bank = $cheque = $other = 0;
 
-    $totalarray = array();
-    $cachebankaccount = array();
-    $amountpertype = array();
-    while ($i < $num)
-    {
-        $objp = $db->fetch_object($resql);
+	$totalarray = array();
+	$cachebankaccount = array();
+	$amountpertype = array();
+	while ($i < $num) {
+		$objp = $db->fetch_object($resql);
 
-        if (empty($cachebankaccount[$objp->bankid]))
-        {
-            $bankaccounttmp = new Account($db);
-            $bankaccounttmp->fetch($objp->bankid);
-            $cachebankaccount[$objp->bankid] = $bankaccounttmp;
-            $bankaccount = $bankaccounttmp;
-        } else {
-            $bankaccount = $cachebankaccount[$objp->bankid];
-        }
+		if (empty($cachebankaccount[$objp->bankid])) {
+			$bankaccounttmp = new Account($db);
+			$bankaccounttmp->fetch($objp->bankid);
+			$cachebankaccount[$objp->bankid] = $bankaccounttmp;
+			$bankaccount = $bankaccounttmp;
+		} else {
+			$bankaccount = $cachebankaccount[$objp->bankid];
+		}
 
-        $invoicetmp->fetch($objp->facid);
+		$invoicetmp->fetch($objp->facid);
 
-        /*if ($first == "yes")
+		/*if ($first == "yes")
 		{
 			print '<tr class="oddeven">';
 			print '<td>'.$langs->trans("InitialBankBalance").' - '.$langs->trans("Cash").'</td>';
@@ -194,19 +191,19 @@ if ($resql)
 		print '<tr class="oddeven">';
 
 		// Ref
-        print '<td class="nowrap left">';
-        print $invoicetmp->getNomUrl(1);
-        print '</td>';
-        if (!$i) $totalarray['nbfield']++;
+		print '<td class="nowrap left">';
+		print $invoicetmp->getNomUrl(1);
+		print '</td>';
+		if (!$i) $totalarray['nbfield']++;
 
-        // Date ope
-    	print '<td class="nowrap left">';
-    	print '<span id="dateoperation_'.$objp->rowid.'">'.dol_print_date($db->jdate($objp->do), "day")."</span>";
-    	print "</td>\n";
-        if (!$i) $totalarray['nbfield']++;
+		// Date ope
+		print '<td class="nowrap left">';
+		print '<span id="dateoperation_'.$objp->rowid.'">'.dol_print_date($db->jdate($objp->do), "day")."</span>";
+		print "</td>\n";
+		if (!$i) $totalarray['nbfield']++;
 
-    	// Bank account
-        print '<td class="nowrap right">';
+		// Bank account
+		print '<td class="nowrap right">';
 		print $bankaccount->getNomUrl(1);
 		if ($cashcontrol->posmodule == "takepos") {
 			$var1 = 'CASHDESK_ID_BANKACCOUNT_CASH'.$cashcontrol->posnumber;
@@ -224,38 +221,36 @@ if ($resql)
 			else $other += $objp->amount;
 		}
 		print "</td>\n";
-        if (!$i) $totalarray['nbfield']++;
+		if (!$i) $totalarray['nbfield']++;
 
-        // Type
-        print '<td class="right">';
-       	print $objp->code;
-       	if (empty($amountpertype[$objp->code])) $amountpertype[$objp->code] = 0;
-        print "</td>\n";
-        if (!$i) $totalarray['nbfield']++;
+		// Type
+		print '<td class="right">';
+	   	print $objp->code;
+	   	if (empty($amountpertype[$objp->code])) $amountpertype[$objp->code] = 0;
+		print "</td>\n";
+		if (!$i) $totalarray['nbfield']++;
 
-        // Debit
-    	print '<td class="right">';
-    	if ($objp->amount < 0)
-    	{
-    	    print price($objp->amount * -1);
-    	    $totalarray['val']['totaldebfield'] += $objp->amount;
-    	    $amountpertype[$objp->code] += $objp->amount;
-    	}
-    	print "</td>\n";
-    	if (!$i) $totalarray['nbfield']++;
-    	if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'totaldebfield';
+		// Debit
+		print '<td class="right">';
+		if ($objp->amount < 0) {
+			print price($objp->amount * -1);
+			$totalarray['val']['totaldebfield'] += $objp->amount;
+			$amountpertype[$objp->code] += $objp->amount;
+		}
+		print "</td>\n";
+		if (!$i) $totalarray['nbfield']++;
+		if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'totaldebfield';
 
-    	// Credit
-    	print '<td class="right">';
-    	if ($objp->amount > 0)
-    	{
+		// Credit
+		print '<td class="right">';
+		if ($objp->amount > 0) {
 			print price($objp->amount);
-    	    $totalarray['val']['totalcredfield'] += $objp->amount;
-    	    $amountpertype[$objp->code] -= $objp->amount;
-    	}
-    	print "</td>\n";
-    	if (!$i) $totalarray['nbfield']++;
-    	if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'totalcredfield';
+			$totalarray['val']['totalcredfield'] += $objp->amount;
+			$amountpertype[$objp->code] -= $objp->amount;
+		}
+		print "</td>\n";
+		if (!$i) $totalarray['nbfield']++;
+		if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'totalcredfield';
 
 		print "</tr>";
 
@@ -309,7 +304,7 @@ if ($resql)
 
 	print "</div>";
 
-    print '</form>';
+	print '</form>';
 
 	$db->free($resql);
 } else {
diff --git a/htdocs/compta/charges/index.php b/htdocs/compta/charges/index.php
index dae7ca358ac..3588dced3f4 100644
--- a/htdocs/compta/charges/index.php
+++ b/htdocs/compta/charges/index.php
@@ -51,7 +51,7 @@ $result = restrictedArea($user, 'tax|salaries', '', '', 'charges|');
 $mode = GETPOST("mode", 'alpha');
 $year = GETPOST("year", 'int');
 $filtre = GETPOST("filtre", 'alpha');
-if (!$year && $mode != 'sconly') { $year = date("Y", time()); }
+if (!$year) { $year = date("Y", time()); }
 
 $search_account = GETPOST('search_account', 'int');
 
@@ -80,12 +80,10 @@ $accountstatic = new Account($db);
 llxHeader('', $langs->trans("SpecialExpensesArea"));
 
 $title = $langs->trans("SpecialExpensesArea");
-if ($mode == 'sconly') $title = $langs->trans("SocialContributionsPayments");
 
 $param = '';
 if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
 if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
-if ($mode == 'sconly') $param = '&mode=sconly';
 if ($sortfield) $param .= '&sortfield='.$sortfield;
 if ($sortorder) $param .= '&sortorder='.$sortorder;
 
@@ -101,30 +99,18 @@ print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 print '<input type="hidden" name="page" value="'.$page.'">';
 print '<input type="hidden" name="mode" value="'.$mode.'">';
 
-$nav = '';
-if ($mode != 'sconly')
-{
-    $nav = ($year ? '<a href="index.php?year='.($year - 1).$param.'">'.img_previous($langs->trans("Previous"), 'class="valignbottom"')."</a> ".$langs->trans("Year").' '.$year.' <a href="index.php?year='.($year + 1).$param.'">'.img_next($langs->trans("Next"), 'class="valignbottom"')."</a>" : "");
-    print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $totalnboflines, 'object_payment', 0, $nav, '', $limit, 1);
-} else {
-    print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $totalnboflines, 'object_payment', 0, $nav, '', $limit, 0);
-}
+$nav = ($year ? '<a href="index.php?year='.($year - 1).$param.'">'.img_previous($langs->trans("Previous"), 'class="valignbottom"')."</a> ".$langs->trans("Year").' '.$year.' <a href="index.php?year='.($year + 1).$param.'">'.img_next($langs->trans("Next"), 'class="valignbottom"')."</a>" : "");
+print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $totalnboflines, 'object_payment', 0, $nav, '', $limit, 1);
 
 if ($year) $param .= '&year='.$year;
 
-if ($mode != 'sconly')
-{
-	print '<span class="opacitymedium">'.$langs->trans("DescTaxAndDividendsArea").'</span><br>';
-	print "<br>";
-}
+print '<span class="opacitymedium">'.$langs->trans("DescTaxAndDividendsArea").'</span><br>';
+print "<br>";
 
 if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
 {
 	// Social contributions only
-	if ($mode != 'sconly')
-	{
-		print load_fiche_titre($langs->trans("SocialContributionsPayments").($year ? ' ('.$langs->trans("Year").' '.$year.')' : ''), '', '');
-	}
+	print load_fiche_titre($langs->trans("SocialContributionsPayments").($year ? ' ('.$langs->trans("Year").' '.$year.')' : ''), '', '');
 
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre">';
@@ -135,7 +121,7 @@ if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
 	print_liste_field_titre("RefPayment", $_SERVER["PHP_SELF"], "pc.rowid", "", $param, '', $sortfield, $sortorder);
 	print_liste_field_titre("DatePayment", $_SERVER["PHP_SELF"], "pc.datep", "", $param, 'align="center"', $sortfield, $sortorder);
 	print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "pct.code", "", $param, '', $sortfield, $sortorder);
-    if (!empty($conf->banque->enabled)) print_liste_field_titre("Account", $_SERVER["PHP_SELF"], "ba.label", "", $param, "", $sortfield, $sortorder);
+	if (!empty($conf->banque->enabled)) print_liste_field_titre("Account", $_SERVER["PHP_SELF"], "ba.label", "", $param, "", $sortfield, $sortorder);
 	print_liste_field_titre("PayedByThisPayment", $_SERVER["PHP_SELF"], "pc.amount", "", $param, 'class="right"', $sortfield, $sortorder);
 	print "</tr>\n";
 
@@ -200,27 +186,27 @@ if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
 			print '<td>'.$payment_sc_static->getNomUrl(1)."</td>\n";
 			// Date payment
 			print '<td class="center">'.dol_print_date($db->jdate($obj->datep), 'day').'</td>';
-	        // Type payment
-    	    print '<td>';
-    	    if ($obj->payment_code) print $langs->trans("PaymentTypeShort".$obj->payment_code).' ';
-    	    print $obj->num_payment.'</td>';
+			// Type payment
+			print '<td>';
+			if ($obj->payment_code) print $langs->trans("PaymentTypeShort".$obj->payment_code).' ';
+			print $obj->num_payment.'</td>';
 			// Account
-	    	if (!empty($conf->banque->enabled))
-		    {
-		        print '<td>';
-		        if ($obj->fk_bank > 0)
-		        {
-		        	//$accountstatic->fetch($obj->fk_bank);
-		            $accountstatic->id = $obj->bid;
-		            $accountstatic->ref = $obj->bref;
-		            $accountstatic->number = $obj->bnumber;
-		            $accountstatic->accountancy_number = $obj->account_number;
-		            $accountstatic->accountancy_journal = $obj->accountancy_journal;
-		            $accountstatic->label = $obj->blabel;
-		            print $accountstatic->getNomUrl(1);
-		        } else print '&nbsp;';
-		        print '</td>';
-		    }
+			if (!empty($conf->banque->enabled))
+			{
+				print '<td>';
+				if ($obj->fk_bank > 0)
+				{
+					//$accountstatic->fetch($obj->fk_bank);
+					$accountstatic->id = $obj->bid;
+					$accountstatic->ref = $obj->bref;
+					$accountstatic->number = $obj->bnumber;
+					$accountstatic->accountancy_number = $obj->account_number;
+					$accountstatic->accountancy_journal = $obj->accountancy_journal;
+					$accountstatic->label = $obj->blabel;
+					print $accountstatic->getNomUrl(1);
+				} else print '&nbsp;';
+				print '</td>';
+			}
 			// Paid
 			print '<td class="right">';
 			if ($obj->totalpaye) print price($obj->totalpaye);
@@ -232,13 +218,13 @@ if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
 			$totalpaye = $totalpaye + $obj->totalpaye;
 			$i++;
 		}
-	    print '<tr class="liste_total"><td colspan="3" class="liste_total">'.$langs->trans("Total").'</td>';
-	    print '<td class="liste_total right"></td>'; // A total here has no sense
-	    print '<td align="center" class="liste_total">&nbsp;</td>';
-	    print '<td align="center" class="liste_total">&nbsp;</td>';
-	    print '<td align="center" class="liste_total">&nbsp;</td>';
-        if (!empty($conf->banque->enabled)) print '<td></td>';
-	    print '<td class="liste_total right">'.price($totalpaye)."</td>";
+		print '<tr class="liste_total"><td colspan="3" class="liste_total">'.$langs->trans("Total").'</td>';
+		print '<td class="liste_total right"></td>'; // A total here has no sense
+		print '<td align="center" class="liste_total">&nbsp;</td>';
+		print '<td align="center" class="liste_total">&nbsp;</td>';
+		print '<td align="center" class="liste_total">&nbsp;</td>';
+		if (!empty($conf->banque->enabled)) print '<td></td>';
+		print '<td class="liste_total right">'.price($totalpaye)."</td>";
 		print "</tr>";
 	} else {
 		dol_print_error($db);
@@ -249,113 +235,110 @@ if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
 // VAT
 if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
 {
-	if (!$mode || $mode != 'sconly')
+	print "<br>";
+
+	$tva = new Tva($db);
+
+	print load_fiche_titre($langs->trans("VATPayments").($year ? ' ('.$langs->trans("Year").' '.$year.')' : ''), '', '');
+
+	$sql = "SELECT pv.rowid, pv.amount, pv.label, pv.datev as dm, pv.fk_bank,";
+	$sql .= " pct.code as payment_code,";
+	$sql .= " ba.rowid as bid, ba.ref as bref, ba.number as bnumber, ba.account_number, ba.fk_accountancy_journal, ba.label as blabel";
+	$sql .= " FROM ".MAIN_DB_PREFIX."tva as pv";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank as b ON pv.fk_bank = b.rowid";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank_account as ba ON b.fk_account = ba.rowid";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as pct ON pv.fk_typepayment = pct.id";
+	$sql .= " WHERE pv.entity IN (".getEntity("tax").")";
+	if ($year > 0)
 	{
-		print "<br>";
+		// Si period renseignee on l'utilise comme critere de date, sinon on prend date echeance,
+		// ceci afin d'etre compatible avec les cas ou la periode n'etait pas obligatoire
+		$sql .= " AND pv.datev between '".$db->idate(dol_get_first_day($year, 1, false))."' AND '".$db->idate(dol_get_last_day($year, 12, false))."'";
+	}
+	if (preg_match('/^pv\./', $sortfield)) $sql .= $db->order($sortfield, $sortorder);
 
-		$tva = new Tva($db);
-
-		print load_fiche_titre($langs->trans("VATPayments").($year ? ' ('.$langs->trans("Year").' '.$year.')' : ''), '', '');
-
-		$sql = "SELECT pv.rowid, pv.amount, pv.label, pv.datev as dm, pv.fk_bank,";
-		$sql .= " pct.code as payment_code,";
-		$sql .= " ba.rowid as bid, ba.ref as bref, ba.number as bnumber, ba.account_number, ba.fk_accountancy_journal, ba.label as blabel";
-		$sql .= " FROM ".MAIN_DB_PREFIX."tva as pv";
-		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank as b ON pv.fk_bank = b.rowid";
-		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank_account as ba ON b.fk_account = ba.rowid";
-		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as pct ON pv.fk_typepayment = pct.id";
-		$sql .= " WHERE pv.entity IN (".getEntity("tax").")";
-		if ($year > 0)
+	$result = $db->query($sql);
+	if ($result)
+	{
+		$num = $db->num_rows($result);
+		$i = 0;
+		$total = 0;
+		print '<table class="noborder centpercent">';
+		print '<tr class="liste_titre">';
+		print_liste_field_titre("PeriodEndDate", $_SERVER["PHP_SELF"], "pv.datev", "", $param, 'width="140px"', $sortfield, $sortorder);
+		print_liste_field_titre("Label", $_SERVER["PHP_SELF"], "pv.label", "", $param, '', $sortfield, $sortorder);
+		print_liste_field_titre("ExpectedToPay", $_SERVER["PHP_SELF"], "pv.amount", "", $param, 'class="right"', $sortfield, $sortorder);
+		print_liste_field_titre("RefPayment", $_SERVER["PHP_SELF"], "pv.rowid", "", $param, '', $sortfield, $sortorder);
+		print_liste_field_titre("DatePayment", $_SERVER["PHP_SELF"], "pv.datev", "", $param, 'align="center"', $sortfield, $sortorder);
+		print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "pct.code", "", $param, '', $sortfield, $sortorder);
+		if (!empty($conf->banque->enabled)) print_liste_field_titre("Account", $_SERVER["PHP_SELF"], "ba.label", "", $param, "", $sortfield, $sortorder);
+		print_liste_field_titre("PayedByThisPayment", $_SERVER["PHP_SELF"], "pv.amount", "", $param, 'class="right"', $sortfield, $sortorder);
+		print "</tr>\n";
+		$var = 1;
+		while ($i < $num)
 		{
-			// Si period renseignee on l'utilise comme critere de date, sinon on prend date echeance,
-			// ceci afin d'etre compatible avec les cas ou la periode n'etait pas obligatoire
-			$sql .= " AND pv.datev between '".$db->idate(dol_get_first_day($year, 1, false))."' AND '".$db->idate(dol_get_last_day($year, 12, false))."'";
+			$obj = $db->fetch_object($result);
+
+			$total = $total + $obj->amount;
+
+
+			print '<tr class="oddeven">';
+			print '<td class="left">'.dol_print_date($db->jdate($obj->dm), 'day').'</td>'."\n";
+
+			print "<td>".$obj->label."</td>\n";
+
+			print '<td class="right">'.price($obj->amount)."</td>";
+
+			// Ref payment
+			$tva_static->id = $obj->rowid;
+			$tva_static->ref = $obj->rowid;
+			print '<td class="left">'.$tva_static->getNomUrl(1)."</td>\n";
+
+			// Date
+			print '<td class="center">'.dol_print_date($db->jdate($obj->dm), 'day')."</td>\n";
+
+			// Type payment
+			print '<td>';
+			if ($obj->payment_code) print $langs->trans("PaymentTypeShort".$obj->payment_code).' ';
+			print $obj->num_payment.'</td>';
+
+			// Account
+			if (!empty($conf->banque->enabled))
+			{
+				print '<td>';
+				if ($obj->fk_bank > 0)
+				{
+					//$accountstatic->fetch($obj->fk_bank);
+					$accountstatic->id = $obj->bid;
+					$accountstatic->ref = $obj->bref;
+					$accountstatic->number = $obj->bnumber;
+					$accountstatic->accountancy_number = $obj->account_number;
+					$accountstatic->accountancy_journal = $obj->accountancy_journal;
+					$accountstatic->label = $obj->blabel;
+					print $accountstatic->getNomUrl(1);
+				} else print '&nbsp;';
+				print '</td>';
+			}
+
+			// Paid
+			print '<td class="right">'.price($obj->amount)."</td>";
+			print "</tr>\n";
+
+			$i++;
 		}
-		if (preg_match('/^pv\./', $sortfield)) $sql .= $db->order($sortfield, $sortorder);
+		print '<tr class="liste_total"><td colspan="2">'.$langs->trans("Total").'</td>';
+		print '<td class="right">'.price($total).'</td>';
+		print '<td>&nbsp;</td>';
+		print '<td>&nbsp;</td>';
+		print '<td>&nbsp;</td>';
+		print '<td>&nbsp;</td>';
+		print '<td class="right">'.price($total)."</td>";
+		print "</tr>";
 
-		$result = $db->query($sql);
-		if ($result)
-		{
-		    $num = $db->num_rows($result);
-		    $i = 0;
-		    $total = 0;
-		    print '<table class="noborder centpercent">';
-		    print '<tr class="liste_titre">';
-			print_liste_field_titre("PeriodEndDate", $_SERVER["PHP_SELF"], "pv.datev", "", $param, 'width="140px"', $sortfield, $sortorder);
-			print_liste_field_titre("Label", $_SERVER["PHP_SELF"], "pv.label", "", $param, '', $sortfield, $sortorder);
-			print_liste_field_titre("ExpectedToPay", $_SERVER["PHP_SELF"], "pv.amount", "", $param, 'class="right"', $sortfield, $sortorder);
-			print_liste_field_titre("RefPayment", $_SERVER["PHP_SELF"], "pv.rowid", "", $param, '', $sortfield, $sortorder);
-			print_liste_field_titre("DatePayment", $_SERVER["PHP_SELF"], "pv.datev", "", $param, 'align="center"', $sortfield, $sortorder);
-			print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "pct.code", "", $param, '', $sortfield, $sortorder);
-			if (!empty($conf->banque->enabled)) print_liste_field_titre("Account", $_SERVER["PHP_SELF"], "ba.label", "", $param, "", $sortfield, $sortorder);
-			print_liste_field_titre("PayedByThisPayment", $_SERVER["PHP_SELF"], "pv.amount", "", $param, 'class="right"', $sortfield, $sortorder);
-		    print "</tr>\n";
-		    $var = 1;
-		    while ($i < $num)
-		    {
-		        $obj = $db->fetch_object($result);
-
-		        $total = $total + $obj->amount;
-
-
-		        print '<tr class="oddeven">';
-		        print '<td class="left">'.dol_print_date($db->jdate($obj->dm), 'day').'</td>'."\n";
-
-		        print "<td>".$obj->label."</td>\n";
-
-		        print '<td class="right">'.price($obj->amount)."</td>";
-
-		        // Ref payment
-				$tva_static->id = $obj->rowid;
-				$tva_static->ref = $obj->rowid;
-		        print '<td class="left">'.$tva_static->getNomUrl(1)."</td>\n";
-
-		        // Date
-		        print '<td class="center">'.dol_print_date($db->jdate($obj->dm), 'day')."</td>\n";
-
-		        // Type payment
-	    	    print '<td>';
-	    	    if ($obj->payment_code) print $langs->trans("PaymentTypeShort".$obj->payment_code).' ';
-	    	    print $obj->num_payment.'</td>';
-
-		    	// Account
-		    	if (!empty($conf->banque->enabled))
-			    {
-			        print '<td>';
-			        if ($obj->fk_bank > 0)
-			        {
-			        	//$accountstatic->fetch($obj->fk_bank);
-			            $accountstatic->id = $obj->bid;
-			            $accountstatic->ref = $obj->bref;
-			            $accountstatic->number = $obj->bnumber;
-			            $accountstatic->accountancy_number = $obj->account_number;
-			            $accountstatic->accountancy_journal = $obj->accountancy_journal;
-			            $accountstatic->label = $obj->blabel;
-			            print $accountstatic->getNomUrl(1);
-			        } else print '&nbsp;';
-			        print '</td>';
-			    }
-
-	    	    // Paid
-		    	print '<td class="right">'.price($obj->amount)."</td>";
-		        print "</tr>\n";
-
-		        $i++;
-		    }
-		    print '<tr class="liste_total"><td colspan="2">'.$langs->trans("Total").'</td>';
-		    print '<td class="right">'.price($total).'</td>';
-		    print '<td>&nbsp;</td>';
-		    print '<td>&nbsp;</td>';
-		    print '<td>&nbsp;</td>';
-		    print '<td>&nbsp;</td>';
-		    print '<td class="right">'.price($total)."</td>";
-		    print "</tr>";
-
-		    print "</table>";
-		    $db->free($result);
-		} else {
-		    dol_print_error($db);
-		}
+		print "</table>";
+		$db->free($result);
+	} else {
+		dol_print_error($db);
 	}
 }
 
@@ -379,73 +362,77 @@ if ($mysoc->localtax1_assuj == "1" && $mysoc->localtax2_assuj == "1")
 
 while ($j < $numlt)
 {
-	if (!$mode || $mode != 'sconly')
+	print "<br>";
+
+	$tva = new Tva($db);
+
+	print load_fiche_titre($langs->transcountry(($j == 1 ? "LT1Payments" : "LT2Payments"), $mysoc->country_code).($year ? ' ('.$langs->trans("Year").' '.$year.')' : ''), '', '');
+
+
+	$sql = "SELECT pv.rowid, pv.amount, pv.label, pv.datev as dm, pv.datep as dp";
+	$sql .= " FROM ".MAIN_DB_PREFIX."localtax as pv";
+	$sql .= " WHERE pv.entity = ".$conf->entity." AND localtaxtype = ".$j;
+	if ($year > 0)
 	{
-		print "<br>";
+		// Si period renseignee on l'utilise comme critere de date, sinon on prend date echeance,
+		// ceci afin d'etre compatible avec les cas ou la periode n'etait pas obligatoire
+		$sql .= " AND pv.datev between '".$db->idate(dol_get_first_day($year, 1, false))."' AND '".$db->idate(dol_get_last_day($year, 12, false))."'";
+	}
+	if (preg_match('/^pv/', $sortfield)) $sql .= $db->order($sortfield, $sortorder);
 
-		$tva = new Tva($db);
+	$result = $db->query($sql);
+	if ($result)
+	{
+		$num = $db->num_rows($result);
+		$i = 0;
+		$total = 0;
+		print '<table class="noborder centpercent">';
+		print '<tr class="liste_titre">';
+		print_liste_field_titre("PeriodEndDate", $_SERVER["PHP_SELF"], "pv.datev", "", $param, 'width="120"', $sortfield, $sortorder);
+		print_liste_field_titre("Label", $_SERVER["PHP_SELF"], "pv.label", "", $param, '', $sortfield, $sortorder);
+		print_liste_field_titre("ExpectedToPay", $_SERVER["PHP_SELF"], "pv.amount", "", $param, 'class="right"', $sortfield, $sortorder);
+		print_liste_field_titre("RefPayment", $_SERVER["PHP_SELF"], "pv.rowid", "", $param, '', $sortfield, $sortorder);
+		print_liste_field_titre("DatePayment", $_SERVER["PHP_SELF"], "pv.datep", "", $param, 'align="center"', $sortfield, $sortorder);
+		print_liste_field_titre("PayedByThisPayment", $_SERVER["PHP_SELF"], "pv.amount", "", $param, 'class="right"', $sortfield, $sortorder);
+		print "</tr>\n";
 
-		print load_fiche_titre($langs->transcountry(($j == 1 ? "LT1Payments" : "LT2Payments"), $mysoc->country_code).($year ? ' ('.$langs->trans("Year").' '.$year.')' : ''), '', '');
-
-
-		$sql = "SELECT pv.rowid, pv.amount, pv.label, pv.datev as dm, pv.datep as dp";
-		$sql .= " FROM ".MAIN_DB_PREFIX."localtax as pv";
-		$sql .= " WHERE pv.entity = ".$conf->entity." AND localtaxtype = ".$j;
-		if ($year > 0)
+		while ($i < $num)
 		{
-			// Si period renseignee on l'utilise comme critere de date, sinon on prend date echeance,
-			// ceci afin d'etre compatible avec les cas ou la periode n'etait pas obligatoire
-			$sql .= " AND pv.datev between '".$db->idate(dol_get_first_day($year, 1, false))."' AND '".$db->idate(dol_get_last_day($year, 12, false))."'";
-		}
-		if (preg_match('/^pv/', $sortfield)) $sql .= $db->order($sortfield, $sortorder);
+			$obj = $db->fetch_object($result);
 
-		$result = $db->query($sql);
-		if ($result)
-		{
-			$num = $db->num_rows($result);
-			$i = 0;
-			$total = 0;
-			print '<table class="noborder centpercent">';
-			print '<tr class="liste_titre">';
-			print_liste_field_titre("PeriodEndDate", $_SERVER["PHP_SELF"], "pv.datev", "", $param, 'width="120"', $sortfield, $sortorder);
-			print_liste_field_titre("Label", $_SERVER["PHP_SELF"], "pv.label", "", $param, '', $sortfield, $sortorder);
-			print_liste_field_titre("RefPayment", $_SERVER["PHP_SELF"], "pv.rowid", "", $param, '', $sortfield, $sortorder);
-			print_liste_field_titre("DatePayment", $_SERVER["PHP_SELF"], "pv.datep", "", $param, 'align="center"', $sortfield, $sortorder);
-			print_liste_field_titre("PayedByThisPayment", $_SERVER["PHP_SELF"], "pv.amount", "", $param, 'class="right"', $sortfield, $sortorder);
+			$total = $total + $obj->amount;
+
+			print '<tr class="oddeven">';
+			print '<td class="left">'.dol_print_date($db->jdate($obj->dm), 'day').'</td>'."\n";
+
+			print "<td>".$obj->label."</td>\n";
+
+			print '<td class="right">'.price($obj->amount)."</td>";
+
+			// Ref payment
+			$tva_static->id = $obj->rowid;
+			$tva_static->ref = $obj->rowid;
+			print '<td class="left">'.$tva_static->getNomUrl(1)."</td>\n";
+
+			print '<td class="center">'.dol_print_date($db->jdate($obj->dp), 'day')."</td>\n";
+			print '<td class="right">'.price($obj->amount)."</td>";
 			print "</tr>\n";
 
-			while ($i < $num)
-			{
-				$obj = $db->fetch_object($result);
-
-				$total = $total + $obj->amount;
-
-				print '<tr class="oddeven">';
-				print '<td class="left">'.dol_print_date($db->jdate($obj->dm), 'day').'</td>'."\n";
-
-				print "<td>".$obj->label."</td>\n";
-
-				// Ref payment
-				$tva_static->id = $obj->rowid;
-				$tva_static->ref = $obj->rowid;
-				print '<td class="left">'.$tva_static->getNomUrl(1)."</td>\n";
-
-				print '<td class="center">'.dol_print_date($db->jdate($obj->dp), 'day')."</td>\n";
-				print '<td class="right">'.price($obj->amount)."</td>";
-				print "</tr>\n";
-
-				$i++;
-			}
-			print '<tr class="liste_total"><td class="right" colspan="4">'.$langs->trans("Total").'</td>';
-			print '<td class="right">'.price($total)."</td>";
-			print "</tr>";
-
-			print "</table>";
-			$db->free($result);
-		} else {
-			dol_print_error($db);
+			$i++;
 		}
+		print '<tr class="liste_total"><td class="right" colspan="2">'.$langs->trans("Total").'</td>';
+		print '<td class="right">'.price($total)."</td>";
+		print '<td align="center">&nbsp;</td>';
+		print '<td align="center">&nbsp;</td>';
+		print '<td class="right">'.price($total)."</td>";
+		print "</tr>";
+
+		print "</table>";
+		$db->free($result);
+	} else {
+		dol_print_error($db);
 	}
+
 	$j++;
 }
 
@@ -454,8 +441,6 @@ while ($j < $numlt)
 /*
 if (!empty($conf->salaries->enabled) && !empty($user->rights->salaries->read))
 {
-    if (!$mode || $mode != 'sconly')
-    {
         $sal = new PaymentSalary($db);
 
         print "<br>";
@@ -557,7 +542,6 @@ if (!empty($conf->salaries->enabled) && !empty($user->rights->salaries->read))
         } else {
             dol_print_error($db);
         }
-    }
 }
 */
 
diff --git a/htdocs/compta/deplacement/class/deplacement.class.php b/htdocs/compta/deplacement/class/deplacement.class.php
index 69baf710b95..1a1fd42d21b 100644
--- a/htdocs/compta/deplacement/class/deplacement.class.php
+++ b/htdocs/compta/deplacement/class/deplacement.class.php
@@ -59,22 +59,22 @@ class Deplacement extends CommonObject
 	public $ismultientitymanaged = 0;
 
 	/**
-     * Date creation record (datec)
-     *
-     * @var integer
-     */
-    public $datec;
+	 * Date creation record (datec)
+	 *
+	 * @var integer
+	 */
+	public $datec;
 
-    /**
-     * Date (dated)
-     *
-     * @var integer
-     */
+	/**
+	 * Date (dated)
+	 *
+	 * @var integer
+	 */
 	public $dated;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_user_author;
 
 	/**
@@ -82,20 +82,20 @@ class Deplacement extends CommonObject
 	 */
 	public $fk_user;
 
-    /**
-     * @var string km value formatted
-     */
-    public $km;
+	/**
+	 * @var string km value formatted
+	 */
+	public $km;
 
-    /**
-     * @var int Thirdparty id
-     */
+	/**
+	 * @var int Thirdparty id
+	 */
 	public $socid;
 
-    /**
-     * @var int Status 0=draft, 1=validated, 2=Refunded
-     */
-    public $statut;
+	/**
+	 * @var int Status 0=draft, 1=validated, 2=Refunded
+	 */
+	public $statut;
 	public $extraparams = array();
 
 	public $statuts = array();
@@ -116,7 +116,7 @@ class Deplacement extends CommonObject
 	 */
 	const STATUS_REFUNDED = 2;
 
-    /**
+	/**
 	 * Constructor
 	 *
 	 * @param	DoliDB		$db		Database handler
@@ -125,8 +125,8 @@ class Deplacement extends CommonObject
 	{
 		$this->db = $db;
 
-        $this->statuts_short = array(0 => 'Draft', 1 => 'Validated', 2 => 'Refunded');
-        $this->statuts = array(0 => 'Draft', 1 => 'Validated', 2 => 'Refunded');
+		$this->statuts_short = array(0 => 'Draft', 1 => 'Validated', 2 => 'Refunded');
+		$this->statuts = array(0 => 'Draft', 1 => 'Validated', 2 => 'Refunded');
 	}
 
 	/**
@@ -152,9 +152,9 @@ class Deplacement extends CommonObject
 			return -1;
 		}
 
-        $now = dol_now();
+		$now = dol_now();
 
-        $this->db->begin();
+		$this->db->begin();
 
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."deplacement (";
 		$sql .= "datec";
@@ -185,14 +185,14 @@ class Deplacement extends CommonObject
 		{
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."deplacement");
 
-            // Call trigger
-            $result = $this->call_trigger('DEPLACEMENT_CREATE', $user);
-            if ($result < 0)
-            {
-            	$this->db->rollback();
-            	return -2;
-            }
-            // End call triggers
+			// Call trigger
+			$result = $this->call_trigger('DEPLACEMENT_CREATE', $user);
+			if ($result < 0)
+			{
+				$this->db->rollback();
+				return -2;
+			}
+			// End call triggers
 
 			$result = $this->update($user);
 			if ($result > 0)
@@ -226,12 +226,12 @@ class Deplacement extends CommonObject
 
 		// Check parameters
 		if (!is_numeric($this->km)) $this->km = 0;
-        if (empty($this->date))
-        {
-            $this->error = 'ErrorBadParameter';
-            return -1;
-        }
-        if (empty($this->type) || $this->type < 0)
+		if (empty($this->date))
+		{
+			$this->error = 'ErrorBadParameter';
+			return -1;
+		}
+		if (empty($this->type) || $this->type < 0)
 		{
 			$this->error = 'ErrorBadParameter';
 			return -1;
@@ -270,7 +270,7 @@ class Deplacement extends CommonObject
 		}
 	}
 
-    /**
+	/**
 	 * Load an object from database
 	 *
 	 * @param	int		$id		Id of record to load
@@ -312,7 +312,7 @@ class Deplacement extends CommonObject
 		}
 	}
 
-    /**
+	/**
 	 *	Delete record
 	 *
 	 *	@param	int		$id		Id of record to delete
@@ -349,7 +349,7 @@ class Deplacement extends CommonObject
 		return $this->LibStatut($this->statut, $mode);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Renvoi le libelle d'un statut donne
 	 *
@@ -359,7 +359,7 @@ class Deplacement extends CommonObject
 	 */
 	public function LibStatut($status, $mode = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 
 		if ($mode == 0)
@@ -402,15 +402,15 @@ class Deplacement extends CommonObject
 		global $langs;
 
 		$result = '';
-        $label = $langs->trans("Show").': '.$this->ref;
+		$label = $langs->trans("Show").': '.$this->ref;
 
-        $link = '<a href="'.DOL_URL_ROOT.'/compta/deplacement/card.php?id='.$this->id.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
+		$link = '<a href="'.DOL_URL_ROOT.'/compta/deplacement/card.php?id='.$this->id.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
 		$linkend = '</a>';
 
 		$picto = 'trip';
 
 
-        if ($withpicto) $result .= ($link.img_object($label, $picto, 'class="classfortooltip"').$linkend);
+		if ($withpicto) $result .= ($link.img_object($label, $picto, 'class="classfortooltip"').$linkend);
 		if ($withpicto && $withpicto != 2) $result .= ' ';
 		if ($withpicto != 2) $result .= $link.$this->ref.$linkend;
 		return $result;
@@ -425,31 +425,31 @@ class Deplacement extends CommonObject
 	 */
 	public function listOfTypes($active = 1)
 	{
-	    global $langs;
+		global $langs;
 
-	    $ret = array();
+		$ret = array();
 
-        $sql = "SELECT id, code, label";
-        $sql .= " FROM ".MAIN_DB_PREFIX."c_type_fees";
-        $sql .= " WHERE active = ".$active;
+		$sql = "SELECT id, code, label";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_type_fees";
+		$sql .= " WHERE active = ".$active;
 
-        dol_syslog(get_class($this)."::listOfTypes", LOG_DEBUG);
-        $result = $this->db->query($sql);
-        if ($result)
-        {
-            $num = $this->db->num_rows($result);
-            $i = 0;
-            while ($i < $num)
-            {
-                $obj = $this->db->fetch_object($result);
-                $ret[$obj->code] = (($langs->trans($obj->code) != $obj->code) ? $langs->trans($obj->code) : $obj->label);
-                $i++;
-            }
-        } else {
-        	dol_print_error($this->db);
-        }
+		dol_syslog(get_class($this)."::listOfTypes", LOG_DEBUG);
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+			$num = $this->db->num_rows($result);
+			$i = 0;
+			while ($i < $num)
+			{
+				$obj = $this->db->fetch_object($result);
+				$ret[$obj->code] = (($langs->trans($obj->code) != $obj->code) ? $langs->trans($obj->code) : $obj->label);
+				$i++;
+			}
+		} else {
+			dol_print_error($this->db);
+		}
 
-        return $ret;
+		return $ret;
 	}
 
 	/**
diff --git a/htdocs/compta/deplacement/class/deplacementstats.class.php b/htdocs/compta/deplacement/class/deplacementstats.class.php
index 953ee78a3d6..d6ad82a4cbe 100644
--- a/htdocs/compta/deplacement/class/deplacementstats.class.php
+++ b/htdocs/compta/deplacement/class/deplacementstats.class.php
@@ -30,24 +30,24 @@ include_once DOL_DOCUMENT_ROOT.'/compta/deplacement/class/deplacement.class.php'
  */
 class DeplacementStats extends Stats
 {
-    /**
-     * @var string Name of table without prefix where object is stored
-     */
-    public $table_element;
+	/**
+	 * @var string Name of table without prefix where object is stored
+	 */
+	public $table_element;
 
-    public $socid;
-    public $userid;
+	public $socid;
+	public $userid;
 
-    public $from;
-    public $field;
-    public $where;
+	public $from;
+	public $field;
+	public $where;
 
 	/**
 	 * Constructor
 	 *
 	 * @param 	DoliDB		$db		   Database handler
 	 * @param 	int			$socid	   Id third party
-     * @param   mixed		$userid    Id user for filter or array of user ids
+	 * @param   mixed		$userid    Id user for filter or array of user ids
 	 * @return 	void
 	 */
 	public function __construct($db, $socid = 0, $userid = 0)
@@ -55,8 +55,8 @@ class DeplacementStats extends Stats
 		global $conf;
 
 		$this->db = $db;
-        $this->socid = $socid;
-        $this->userid = $userid;
+		$this->socid = $socid;
+		$this->userid = $userid;
 
 		$object = new Deplacement($this->db);
 		$this->from = MAIN_DB_PREFIX.$object->table_element;
@@ -69,7 +69,7 @@ class DeplacementStats extends Stats
 			$this->where .= " AND fk_soc = ".$this->socid;
 		}
 		if (is_array($this->userid) && count($this->userid) > 0) $this->where .= ' AND fk_user IN ('.join(',', $this->userid).')';
-        elseif ($this->userid > 0) $this->where .= ' AND fk_user = '.$this->userid;
+		elseif ($this->userid > 0) $this->where .= ' AND fk_user = '.$this->userid;
 	}
 
 
@@ -93,7 +93,7 @@ class DeplacementStats extends Stats
 	 * 	Renvoie le nombre de facture par mois pour une annee donnee
 	 *
 	 *	@param	string	$year	Year to scan
-     *	@param	int		$format		0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
+	 *	@param	int		$format		0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
 	 *	@return	array			Array of values
 	 */
 	public function getNbByMonth($year, $format = 0)
@@ -103,7 +103,7 @@ class DeplacementStats extends Stats
 		$sql .= " WHERE YEAR(dated) = ".$year;
 		$sql .= " AND ".$this->where;
 		$sql .= " GROUP BY dm";
-        $sql .= $this->db->order('dm', 'DESC');
+		$sql .= $this->db->order('dm', 'DESC');
 
 		$res = $this->_getNbByMonth($year, $sql, $format);
 		//var_dump($res);print '<br>';
@@ -115,7 +115,7 @@ class DeplacementStats extends Stats
 	 * 	Renvoie le montant de facture par mois pour une annee donnee
 	 *
 	 *	@param	int		$year		Year to scan
-     *	@param	int		$format		0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
+	 *	@param	int		$format		0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
 	 *	@return	array				Array of values
 	 */
 	public function getAmountByMonth($year, $format = 0)
@@ -145,7 +145,7 @@ class DeplacementStats extends Stats
 		$sql .= " WHERE date_format(dated,'%Y') = '".$this->db->escape($year)."'";
 		$sql .= " AND ".$this->where;
 		$sql .= " GROUP BY dm";
-        $sql .= $this->db->order('dm', 'DESC');
+		$sql .= $this->db->order('dm', 'DESC');
 
 		return $this->_getAverageByMonth($year, $sql);
 	}
@@ -155,14 +155,14 @@ class DeplacementStats extends Stats
 	 *
 	 *	@return	array				Array of values
 	 */
-    public function getAllByYear()
-    {
-        $sql = "SELECT date_format(dated,'%Y') as year, count(*) as nb, sum(".$this->field.") as total, avg(".$this->field.") as avg";
-        $sql .= " FROM ".$this->from;
-        $sql .= " WHERE ".$this->where;
-        $sql .= " GROUP BY year";
-        $sql .= $this->db->order('year', 'DESC');
+	public function getAllByYear()
+	{
+		$sql = "SELECT date_format(dated,'%Y') as year, count(*) as nb, sum(".$this->field.") as total, avg(".$this->field.") as avg";
+		$sql .= " FROM ".$this->from;
+		$sql .= " WHERE ".$this->where;
+		$sql .= " GROUP BY year";
+		$sql .= $this->db->order('year', 'DESC');
 
-        return $this->_getAllByYear($sql);
-    }
+		return $this->_getAllByYear($sql);
+	}
 }
diff --git a/htdocs/compta/deplacement/document.php b/htdocs/compta/deplacement/document.php
index 4768e082431..86d0dd383f1 100644
--- a/htdocs/compta/deplacement/document.php
+++ b/htdocs/compta/deplacement/document.php
@@ -101,9 +101,9 @@ if ($object->id)
 	}
 
 
-    print '<table class="border tableforfield centpercent">';
+	print '<table class="border tableforfield centpercent">';
 
-    $linkback = '<a href="'.DOL_URL_ROOT.'/compta/deplacement/list.php'.(!empty($socid) ? '?socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
+	$linkback = '<a href="'.DOL_URL_ROOT.'/compta/deplacement/list.php'.(!empty($socid) ? '?socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
 	// Ref
 	print '<tr><td width="30%">'.$langs->trans("Ref").'</td><td>';
@@ -113,16 +113,16 @@ if ($object->id)
 	// Societe
 	//print "<tr><td>".$langs->trans("Company")."</td><td>".$object->client->getNomUrl(1)."</td></tr>";
 
-    print '<tr><td>'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
-    print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.dol_print_size($totalsize, 1, 1).'</td></tr>';
-    print '</table>';
+	print '<tr><td>'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
+	print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.dol_print_size($totalsize, 1, 1).'</td></tr>';
+	print '</table>';
 
-    print '</div>';
+	print '</div>';
 
-    $modulepart = 'deplacement';
-    $permission = $user->rights->deplacement->creer;
-    $param = '&id='.$object->id;
-    include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
+	$modulepart = 'deplacement';
+	$permission = $user->rights->deplacement->creer;
+	$param = '&id='.$object->id;
+	include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
 } else {
 	print $langs->trans("ErrorUnknown");
 }
diff --git a/htdocs/compta/deplacement/index.php b/htdocs/compta/deplacement/index.php
index 0cea847f9ce..bcebeb128d0 100644
--- a/htdocs/compta/deplacement/index.php
+++ b/htdocs/compta/deplacement/index.php
@@ -74,20 +74,20 @@ $sql .= " ORDER BY d.type";
 $result = $db->query($sql);
 if ($result)
 {
-    $num = $db->num_rows($result);
-    $i = 0;
-    while ($i < $num)
-    {
-        $objp = $db->fetch_object($result);
+	$num = $db->num_rows($result);
+	$i = 0;
+	while ($i < $num)
+	{
+		$objp = $db->fetch_object($result);
 
-        $somme[$objp->type] = $objp->km;
-        $nb[$objp->type] = $objp->nb;
-        $totalnb += $objp->nb;
-        $i++;
-    }
-    $db->free($result);
+		$somme[$objp->type] = $objp->km;
+		$nb[$objp->type] = $objp->nb;
+		$totalnb += $objp->nb;
+		$i++;
+	}
+	$db->free($result);
 } else {
-    dol_print_error($db);
+	dol_print_error($db);
 }
 
 
@@ -106,24 +106,24 @@ print "</tr>\n";
 $listoftype = $tripandexpense_static->listOfTypes();
 foreach ($listoftype as $code => $label)
 {
-    $dataseries[] = array($label, (isset($nb[$code]) ? (int) $nb[$code] : 0));
+	$dataseries[] = array($label, (isset($nb[$code]) ? (int) $nb[$code] : 0));
 }
 
 if ($conf->use_javascript_ajax)
 {
-    print '<tr><td align="center" colspan="4">';
+	print '<tr><td align="center" colspan="4">';
 
-    include_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
-    $dolgraph = new DolGraph();
-    $dolgraph->SetData($dataseries);
-    $dolgraph->setShowLegend(2);
-    $dolgraph->setShowPercent(1);
-    $dolgraph->SetType(array('pie'));
-    $dolgraph->setHeight('200');
-    $dolgraph->draw('idgraphstatus');
-    print $dolgraph->show($totalnb ? 0 : 1);
+	include_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
+	$dolgraph = new DolGraph();
+	$dolgraph->SetData($dataseries);
+	$dolgraph->setShowLegend(2);
+	$dolgraph->setShowPercent(1);
+	$dolgraph->SetType(array('pie'));
+	$dolgraph->setHeight('200');
+	$dolgraph->draw('idgraphstatus');
+	print $dolgraph->show($totalnb ? 0 : 1);
 
-    print '</td></tr>';
+	print '</td></tr>';
 }
 
 print '<tr class="liste_total">';
@@ -156,46 +156,46 @@ $sql .= $db->plimit($max, 0);
 $result = $db->query($sql);
 if ($result)
 {
-    $var = false;
-    $num = $db->num_rows($result);
+	$var = false;
+	$num = $db->num_rows($result);
 
-    $i = 0;
+	$i = 0;
 
-    print '<table class="noborder centpercent">';
-    print '<tr class="liste_titre">';
-    print '<td colspan="2">'.$langs->trans("BoxTitleLastModifiedExpenses", min($max, $num)).'</td>';
-    print '<td class="right">'.$langs->trans("FeesKilometersOrAmout").'</td>';
-    print '<td class="right">'.$langs->trans("DateModificationShort").'</td>';
-    print '<td width="16">&nbsp;</td>';
-    print '</tr>';
-    if ($num)
-    {
-        $total_ttc = $totalam = $total = 0;
+	print '<table class="noborder centpercent">';
+	print '<tr class="liste_titre">';
+	print '<td colspan="2">'.$langs->trans("BoxTitleLastModifiedExpenses", min($max, $num)).'</td>';
+	print '<td class="right">'.$langs->trans("FeesKilometersOrAmout").'</td>';
+	print '<td class="right">'.$langs->trans("DateModificationShort").'</td>';
+	print '<td width="16">&nbsp;</td>';
+	print '</tr>';
+	if ($num)
+	{
+		$total_ttc = $totalam = $total = 0;
 
-        $deplacementstatic = new Deplacement($db);
-        $userstatic = new User($db);
-        while ($i < $num && $i < $max)
-        {
-            $obj = $db->fetch_object($result);
-            $deplacementstatic->ref = $obj->rowid;
-            $deplacementstatic->id = $obj->rowid;
-            $userstatic->id = $obj->uid;
-            $userstatic->lastname = $obj->lastname;
-            $userstatic->firstname = $obj->firstname;
-            print '<tr class="oddeven">';
-            print '<td>'.$deplacementstatic->getNomUrl(1).'</td>';
-            print '<td>'.$userstatic->getNomUrl(1).'</td>';
-            print '<td class="right">'.$obj->km.'</td>';
-            print '<td class="right">'.dol_print_date($db->jdate($obj->dm), 'day').'</td>';
-            print '<td>'.$deplacementstatic->LibStatut($obj->fk_statut, 3).'</td>';
-            print '</tr>';
+		$deplacementstatic = new Deplacement($db);
+		$userstatic = new User($db);
+		while ($i < $num && $i < $max)
+		{
+			$obj = $db->fetch_object($result);
+			$deplacementstatic->ref = $obj->rowid;
+			$deplacementstatic->id = $obj->rowid;
+			$userstatic->id = $obj->uid;
+			$userstatic->lastname = $obj->lastname;
+			$userstatic->firstname = $obj->firstname;
+			print '<tr class="oddeven">';
+			print '<td>'.$deplacementstatic->getNomUrl(1).'</td>';
+			print '<td>'.$userstatic->getNomUrl(1).'</td>';
+			print '<td class="right">'.$obj->km.'</td>';
+			print '<td class="right">'.dol_print_date($db->jdate($obj->dm), 'day').'</td>';
+			print '<td>'.$deplacementstatic->LibStatut($obj->fk_statut, 3).'</td>';
+			print '</tr>';
 
-            $i++;
-        }
-    } else {
-        print '<tr class="oddeven"><td colspan="2" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
-    }
-    print '</table><br>';
+			$i++;
+		}
+	} else {
+		print '<tr class="oddeven"><td colspan="2" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
+	}
+	print '</table><br>';
 } else dol_print_error($db);
 
 
diff --git a/htdocs/compta/deplacement/info.php b/htdocs/compta/deplacement/info.php
index 08c3ca768ee..586eac52ee7 100644
--- a/htdocs/compta/deplacement/info.php
+++ b/htdocs/compta/deplacement/info.php
@@ -52,11 +52,11 @@ if ($id)
 
 	print dol_get_fiche_head($head, 'info', $langs->trans("TripCard"), 0, 'trip');
 
-    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/compta/deplacement/list.php b/htdocs/compta/deplacement/list.php
index 78c1f32556d..df18b09e2b4 100644
--- a/htdocs/compta/deplacement/list.php
+++ b/htdocs/compta/deplacement/list.php
@@ -99,11 +99,11 @@ if ($socid) $sql .= " AND s.rowid = ".$socid;
 if ($search_ref)		$sql .= " AND d.rowid=".$search_ref;
 if ($search_name)
 {
-    $sql .= natural_search('u.lastname', $search_name);
+	$sql .= natural_search('u.lastname', $search_name);
 }
 if ($search_company)
 {
-    $sql .= natural_search('s.nom', $search_company);
+	$sql .= natural_search('s.nom', $search_company);
 }
 $sql .= dolSqlDateFilter("d.dated", $day, $month, $year);
 
@@ -114,90 +114,90 @@ $sql .= $db->plimit($limit + 1, $offset);
 $resql = $db->query($sql);
 if ($resql)
 {
-    $num = $db->num_rows($resql);
+	$num = $db->num_rows($resql);
 
-    print_barre_liste($langs->trans("ListOfFees"), $page, $_SERVER["PHP_SELF"], "&socid=$socid", $sortfield, $sortorder, '', $num);
+	print_barre_liste($langs->trans("ListOfFees"), $page, $_SERVER["PHP_SELF"], "&socid=$socid", $sortfield, $sortorder, '', $num);
 
-    $i = 0;
-    print '<form method="get" action="'.$_SERVER["PHP_SELF"].'">'."\n";
-    print '<table class="noborder centpercent">';
-    print "<tr class=\"liste_titre\">";
-    print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "d.rowid", "", "&socid=$socid", '', $sortfield, $sortorder);
-    print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "d.type", "", "&socid=$socid", '', $sortfield, $sortorder);
-    print_liste_field_titre("Date", $_SERVER["PHP_SELF"], "d.dated", "", "&socid=$socid", 'align="center"', $sortfield, $sortorder);
-    print_liste_field_titre("Person", $_SERVER["PHP_SELF"], "u.lastname", "", "&socid=$socid", '', $sortfield, $sortorder);
-    print_liste_field_titre("Company", $_SERVER["PHP_SELF"], "s.nom", "", "&socid=$socid", '', $sortfield, $sortorder);
-    print_liste_field_titre("FeesKilometersOrAmout", $_SERVER["PHP_SELF"], "d.km", "", "&socid=$socid", 'class="right"', $sortfield, $sortorder);
-    print_liste_field_titre('');
-    print "</tr>\n";
+	$i = 0;
+	print '<form method="get" action="'.$_SERVER["PHP_SELF"].'">'."\n";
+	print '<table class="noborder centpercent">';
+	print "<tr class=\"liste_titre\">";
+	print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "d.rowid", "", "&socid=$socid", '', $sortfield, $sortorder);
+	print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "d.type", "", "&socid=$socid", '', $sortfield, $sortorder);
+	print_liste_field_titre("Date", $_SERVER["PHP_SELF"], "d.dated", "", "&socid=$socid", 'align="center"', $sortfield, $sortorder);
+	print_liste_field_titre("Person", $_SERVER["PHP_SELF"], "u.lastname", "", "&socid=$socid", '', $sortfield, $sortorder);
+	print_liste_field_titre("Company", $_SERVER["PHP_SELF"], "s.nom", "", "&socid=$socid", '', $sortfield, $sortorder);
+	print_liste_field_titre("FeesKilometersOrAmout", $_SERVER["PHP_SELF"], "d.km", "", "&socid=$socid", 'class="right"', $sortfield, $sortorder);
+	print_liste_field_titre('');
+	print "</tr>\n";
 
-    // Filters lines
-    print '<tr class="liste_titre">';
-    print '<td class="liste_titre">';
-    print '<input class="flat" size="4" type="text" name="search_ref" value="'.$search_ref.'">';
-    print '</td>';
-    print '<td class="liste_titre">';
-    print '&nbsp;';
-    print '</td>';
-    print '<td class="liste_titre" align="center">';
-    if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="day" value="'.$day.'">';
-    print '<input class="flat" type="text" size="1" maxlength="2" name="month" value="'.$month.'">';
-    $formother->select_year($year ? $year : -1, 'year', 1, 20, 5);
-    print '</td>';
-    print '<td class="liste_titre">';
-    print '<input class="flat" size="10" type="text" name="search_name" value="'.$search_name.'">';
-    print '</td>';
-    print '<td class="liste_titre">';
-    print '<input class="flat" size="10" type="text" name="search_company" value="'.$search_company.'">';
-    print '</td>';
-    print '<td class="liste_titre right">';
-    // print '<input class="flat" size="10" type="text" name="search_amount" value="'.$search_amount.'">';
-    print '</td>';
-    print '<td class="liste_titre maxwidthsearch">';
-    $searchpicto = $form->showFilterAndCheckAddButtons(0);
-    print $searchpicto;
-    print '</td>';
-    print "</tr>\n";
+	// Filters lines
+	print '<tr class="liste_titre">';
+	print '<td class="liste_titre">';
+	print '<input class="flat" size="4" type="text" name="search_ref" value="'.$search_ref.'">';
+	print '</td>';
+	print '<td class="liste_titre">';
+	print '&nbsp;';
+	print '</td>';
+	print '<td class="liste_titre" align="center">';
+	if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="day" value="'.$day.'">';
+	print '<input class="flat" type="text" size="1" maxlength="2" name="month" value="'.$month.'">';
+	$formother->select_year($year ? $year : -1, 'year', 1, 20, 5);
+	print '</td>';
+	print '<td class="liste_titre">';
+	print '<input class="flat" size="10" type="text" name="search_name" value="'.$search_name.'">';
+	print '</td>';
+	print '<td class="liste_titre">';
+	print '<input class="flat" size="10" type="text" name="search_company" value="'.$search_company.'">';
+	print '</td>';
+	print '<td class="liste_titre right">';
+	// print '<input class="flat" size="10" type="text" name="search_amount" value="'.$search_amount.'">';
+	print '</td>';
+	print '<td class="liste_titre maxwidthsearch">';
+	$searchpicto = $form->showFilterAndCheckAddButtons(0);
+	print $searchpicto;
+	print '</td>';
+	print "</tr>\n";
 
-    while ($i < min($num, $limit))
-    {
-        $obj = $db->fetch_object($resql);
+	while ($i < min($num, $limit))
+	{
+		$obj = $db->fetch_object($resql);
 
-        $soc = new Societe($db);
-        if ($obj->socid) $soc->fetch($obj->socid);
+		$soc = new Societe($db);
+		if ($obj->socid) $soc->fetch($obj->socid);
 
-        print '<tr class="oddeven">';
-        // Id
-        print '<td><a href="card.php?id='.$obj->rowid.'">'.img_object($langs->trans("ShowTrip"), "trip").' '.$obj->rowid.'</a></td>';
-        // Type
-        print '<td>'.$langs->trans($obj->type).'</td>';
-        // Date
-        print '<td class="center">'.dol_print_date($db->jdate($obj->dd), 'day').'</td>';
-        // User
-        print '<td>';
-        $userstatic->id = $obj->fk_user;
-        $userstatic->lastname = $obj->lastname;
-        $userstatic->firstname = $obj->firstname;
-        print $userstatic->getNomUrl(1);
-        print '</td>';
+		print '<tr class="oddeven">';
+		// Id
+		print '<td><a href="card.php?id='.$obj->rowid.'">'.img_object($langs->trans("ShowTrip"), "trip").' '.$obj->rowid.'</a></td>';
+		// Type
+		print '<td>'.$langs->trans($obj->type).'</td>';
+		// Date
+		print '<td class="center">'.dol_print_date($db->jdate($obj->dd), 'day').'</td>';
+		// User
+		print '<td>';
+		$userstatic->id = $obj->fk_user;
+		$userstatic->lastname = $obj->lastname;
+		$userstatic->firstname = $obj->firstname;
+		print $userstatic->getNomUrl(1);
+		print '</td>';
 
-        if ($obj->socid) print '<td>'.$soc->getNomUrl(1).'</td>';
-        else print '<td>&nbsp;</td>';
+		if ($obj->socid) print '<td>'.$soc->getNomUrl(1).'</td>';
+		else print '<td>&nbsp;</td>';
 
-        print '<td class="right">'.$obj->km.'</td>';
+		print '<td class="right">'.$obj->km.'</td>';
 
-        $tripandexpense_static->statut = $obj->fk_statut;
-        print '<td class="right">'.$tripandexpense_static->getLibStatut(5).'</td>';
-        print "</tr>\n";
+		$tripandexpense_static->statut = $obj->fk_statut;
+		print '<td class="right">'.$tripandexpense_static->getLibStatut(5).'</td>';
+		print "</tr>\n";
 
-        $i++;
-    }
+		$i++;
+	}
 
-    print "</table>";
-    print "</form>\n";
-    $db->free($resql);
+	print "</table>";
+	print "</form>\n";
+	$db->free($resql);
 } else {
-    dol_print_error($db);
+	dol_print_error($db);
 }
 
 // End of page
diff --git a/htdocs/compta/deplacement/stats/index.php b/htdocs/compta/deplacement/stats/index.php
index b17c3f4f9a4..389c8d9408f 100644
--- a/htdocs/compta/deplacement/stats/index.php
+++ b/htdocs/compta/deplacement/stats/index.php
@@ -164,38 +164,38 @@ $data = $stats->getAverageByMonthWithPrevYear($endyear, $startyear);
 
 if (!$user->rights->societe->client->voir || $user->socid)
 {
-    $filename_avg = $dir.'/ordersaverage-'.$user->id.'-'.$year.'.png';
-    if ($mode == 'customer') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersaverage-'.$user->id.'-'.$year.'.png';
-    if ($mode == 'supplier') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersaverage-'.$user->id.'-'.$year.'.png';
+	$filename_avg = $dir.'/ordersaverage-'.$user->id.'-'.$year.'.png';
+	if ($mode == 'customer') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersaverage-'.$user->id.'-'.$year.'.png';
+	if ($mode == 'supplier') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersaverage-'.$user->id.'-'.$year.'.png';
 } else {
-    $filename_avg = $dir.'/ordersaverage-'.$year.'.png';
-    if ($mode == 'customer') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersaverage-'.$year.'.png';
-    if ($mode == 'supplier') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersaverage-'.$year.'.png';
+	$filename_avg = $dir.'/ordersaverage-'.$year.'.png';
+	if ($mode == 'customer') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersaverage-'.$year.'.png';
+	if ($mode == 'supplier') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersaverage-'.$year.'.png';
 }
 
 $px3 = new DolGraph();
 $mesg = $px3->isGraphKo();
 if (!$mesg)
 {
-    $px3->SetData($data);
-    $i = $startyear; $legend = array();
-    while ($i <= $endyear)
-    {
-        $legend[] = $i;
-        $i++;
-    }
-    $px3->SetLegend($legend);
-    $px3->SetYLabel($langs->trans("AmountAverage"));
-    $px3->SetMaxValue($px3->GetCeilMaxValue());
-    $px3->SetMinValue($px3->GetFloorMinValue());
-    $px3->SetWidth($WIDTH);
-    $px3->SetHeight($HEIGHT);
-    $px3->SetShading(3);
-    $px3->SetHorizTickIncrement(1);
-    $px3->mode = 'depth';
-    $px3->SetTitle($langs->trans("AmountAverage"));
+	$px3->SetData($data);
+	$i = $startyear; $legend = array();
+	while ($i <= $endyear)
+	{
+		$legend[] = $i;
+		$i++;
+	}
+	$px3->SetLegend($legend);
+	$px3->SetYLabel($langs->trans("AmountAverage"));
+	$px3->SetMaxValue($px3->GetCeilMaxValue());
+	$px3->SetMinValue($px3->GetFloorMinValue());
+	$px3->SetWidth($WIDTH);
+	$px3->SetHeight($HEIGHT);
+	$px3->SetShading(3);
+	$px3->SetHorizTickIncrement(1);
+	$px3->mode = 'depth';
+	$px3->SetTitle($langs->trans("AmountAverage"));
 
-    $px3->draw($filename_avg, $fileurl_avg);
+	$px3->draw($filename_avg, $fileurl_avg);
 }
 
 
@@ -203,7 +203,7 @@ if (!$mesg)
 $data = $stats->getAllByYear();
 $arrayyears = array();
 foreach ($data as $val) {
-    $arrayyears[$val['year']] = $val['year'];
+	$arrayyears[$val['year']] = $val['year'];
 }
 if (!count($arrayyears)) $arrayyears[$nowyear] = $nowyear;
 
@@ -293,11 +293,11 @@ print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 // Show graphs
 print '<table class="border centpercent"><tr class="pair nohover"><td align="center">';
 if ($mesg) { print $mesg; } else {
-    print $px1->show();
+	print $px1->show();
 	print "<br>\n";
 	print $px2->show();
-    print "<br>\n";
-    print $px3->show();
+	print "<br>\n";
+	print $px3->show();
 }
 print '</td></tr></table>';
 
@@ -306,7 +306,7 @@ print '</div></div></div>';
 print '<div style="clear:both"></div>';
 
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // End of page
 llxFooter();
diff --git a/htdocs/compta/facture/admin/facture_cust_extrafields.php b/htdocs/compta/facture/admin/facture_cust_extrafields.php
index 16327c8b348..0e971954d56 100644
--- a/htdocs/compta/facture/admin/facture_cust_extrafields.php
+++ b/htdocs/compta/facture/admin/facture_cust_extrafields.php
@@ -73,15 +73,15 @@ print dol_get_fiche_head($head, 'attributes', $langs->trans("Invoices"), -1, 'in
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_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>";
 }
 
 
@@ -94,9 +94,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';
 }
 
 /*
@@ -109,9 +109,9 @@ if ($action == 'edit' && !empty($attrname))
 	$langs->load("members");
 
 	print "<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';
 }
 
 // End of page
diff --git a/htdocs/compta/facture/admin/facture_rec_cust_extrafields.php b/htdocs/compta/facture/admin/facture_rec_cust_extrafields.php
index 50a7fd18586..dbc395e5d65 100644
--- a/htdocs/compta/facture/admin/facture_rec_cust_extrafields.php
+++ b/htdocs/compta/facture/admin/facture_rec_cust_extrafields.php
@@ -74,15 +74,15 @@ print dol_get_fiche_head($head, 'attributesrec', $langs->trans("Invoices"), -1,
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_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';
 }
 
 /*
@@ -110,9 +110,9 @@ if ($action == 'edit' && !empty($attrname))
 	$langs->load("members");
 
 	print "<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';
 }
 
 // End of page
diff --git a/htdocs/compta/facture/admin/facturedet_cust_extrafields.php b/htdocs/compta/facture/admin/facturedet_cust_extrafields.php
index 2b9e37e43c6..c07eb3ac2aa 100644
--- a/htdocs/compta/facture/admin/facturedet_cust_extrafields.php
+++ b/htdocs/compta/facture/admin/facturedet_cust_extrafields.php
@@ -74,15 +74,15 @@ print dol_get_fiche_head($head, 'attributeslines', $langs->trans("Invoices"), -1
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_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/compta/facture/admin/facturedet_rec_cust_extrafields.php b/htdocs/compta/facture/admin/facturedet_rec_cust_extrafields.php
index 58fd39e33fe..772a3aa680c 100644
--- a/htdocs/compta/facture/admin/facturedet_rec_cust_extrafields.php
+++ b/htdocs/compta/facture/admin/facturedet_rec_cust_extrafields.php
@@ -74,15 +74,15 @@ print dol_get_fiche_head($head, 'attributeslinesrec', $langs->trans("Invoices"),
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_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/compta/facture/card-rec.php b/htdocs/compta/facture/card-rec.php
index 4a9a0a197b3..0197c7e4f70 100644
--- a/htdocs/compta/facture/card-rec.php
+++ b/htdocs/compta/facture/card-rec.php
@@ -191,15 +191,15 @@ if (empty($reshook))
 			$object->titre = GETPOST('title', 'nohtml'); // deprecated
 			$object->title = GETPOST('title', 'nohtml');
 			$object->note_private = GETPOST('note_private', 'restricthtml');
-            $object->note_public = GETPOST('note_public', 'restricthtml');
-            $object->model_pdf = GETPOST('modelpdf', 'alpha');
+			$object->note_public = GETPOST('note_public', 'restricthtml');
+			$object->model_pdf = GETPOST('modelpdf', 'alpha');
 			$object->usenewprice = GETPOST('usenewprice', 'alpha');
 
 			$object->frequency = $frequency;
 			$object->unit_frequency = GETPOST('unit_frequency', 'alpha');
 			$object->nb_gen_max = $nb_gen_max;
 			$object->auto_validate = GETPOST('auto_validate', 'int');
-            $object->generate_pdf = GETPOST('generate_pdf', 'int');
+			$object->generate_pdf = GETPOST('generate_pdf', 'int');
 			$object->fk_project = $projectid;
 
 			$date_next_execution = dol_mktime($rehour, $remin, 0, $remonth, $reday, $reyear);
@@ -315,7 +315,7 @@ if (empty($reshook))
 	elseif ($action == 'setauto_validate' && $user->rights->facture->creer)
 	{
 		$object->setAutoValidate(GETPOST('auto_validate', 'int'));
-    } // Set generate pdf
+	} // Set generate pdf
 	elseif ($action == 'setgenerate_pdf' && $user->rights->facture->creer)
 	{
 		$object->setGeneratepdf(GETPOST('generate_pdf', 'int'));
@@ -957,7 +957,7 @@ if ($action == 'create')
 
 		// Title
 		print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans("Title").'</td><td>';
-		print '<input class="flat quatrevingtpercent" type="text" name="titre" value="'.$_POST["titre"].'">';
+		print '<input class="flat quatrevingtpercent" type="text" name="titre" value="'.dol_escape_htmltag(GETPOST("titre", 'alphanohtml')).'">';
 		print '</td></tr>';
 
 		// Third party
@@ -1047,16 +1047,16 @@ if ($action == 'create')
 			print "</td></tr>";
 		}
 
-        // Model pdf
-        print "<tr><td>".$langs->trans('Model')."</td><td>";
-        include_once DOL_DOCUMENT_ROOT.'/core/modules/facture/modules_facture.php';
-        $list = ModelePDFFactures::liste_modeles($db);
-        print $form->selectarray('modelpdf', $list, $conf->global->FACTURE_ADDON_PDF);
-        print "</td></tr>";
+		// Model pdf
+		print "<tr><td>".$langs->trans('Model')."</td><td>";
+		include_once DOL_DOCUMENT_ROOT.'/core/modules/facture/modules_facture.php';
+		$list = ModelePDFFactures::liste_modeles($db);
+		print $form->selectarray('modelpdf', $list, $conf->global->FACTURE_ADDON_PDF);
+		print "</td></tr>";
 
 		print "</table>";
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 
 		// Autogeneration
@@ -1102,7 +1102,7 @@ if ($action == 'create')
 
 		print "</table>";
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 
 		$title = $langs->trans("ProductsAndServices");
@@ -1327,7 +1327,7 @@ if ($action == 'create')
 				print '</td>';
 				if ($usercancreate && $action != 'editmulticurrencyrate' && !empty($object->brouillon) && $object->multicurrency_code && $object->multicurrency_code != $conf->currency) {
 					print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editmulticurrencyrate&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1).'</a></td>';
-                }
+				}
 				print '</tr></table>';
 				print '</td><td>';
 				if ($action == 'editmulticurrencyrate' || $action == 'actualizemulticurrencyrate') {
@@ -1409,30 +1409,30 @@ if ($action == 'create')
 		print "</td>";
 		print '</tr>';
 
-        // Model pdf
-        print '<tr><td class="nowrap">';
-        print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
-        print $langs->trans('Model');
-        print '<td>';
-        if (($action != 'editmodelpdf') && $user->rights->facture->creer && $object->statut == FactureRec::STATUS_DRAFT)
-            print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editmodelpdf&amp;id='.$object->id.'">'.img_edit($langs->trans('SetModel'), 1).'</a></td>';
-        print '</tr></table>';
-        print '</td><td>';
-        if ($action == 'editmodelpdf')
-        {
-            include_once DOL_DOCUMENT_ROOT.'/core/modules/facture/modules_facture.php';
-            $list = array();
-            $models = ModelePDFFactures::liste_modeles($db);
-            foreach ($models as $k => $model) {
-                $list[] = str_replace(':', '|', $k).':'.$model;
-            }
-            $select = 'select;'.implode(',', $list);
-            print $form->editfieldval($langs->trans("Model"), 'modelpdf', $object->model_pdf, $object, $user->rights->facture->creer, $select);
-        } else {
-            print $object->model_pdf;
-        }
-        print "</td>";
-        print '</tr>';
+		// Model pdf
+		print '<tr><td class="nowrap">';
+		print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
+		print $langs->trans('Model');
+		print '<td>';
+		if (($action != 'editmodelpdf') && $user->rights->facture->creer && $object->statut == FactureRec::STATUS_DRAFT)
+			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editmodelpdf&amp;id='.$object->id.'">'.img_edit($langs->trans('SetModel'), 1).'</a></td>';
+		print '</tr></table>';
+		print '</td><td>';
+		if ($action == 'editmodelpdf')
+		{
+			include_once DOL_DOCUMENT_ROOT.'/core/modules/facture/modules_facture.php';
+			$list = array();
+			$models = ModelePDFFactures::liste_modeles($db);
+			foreach ($models as $k => $model) {
+				$list[] = str_replace(':', '|', $k).':'.$model;
+			}
+			$select = 'select;'.implode(',', $list);
+			print $form->editfieldval($langs->trans("Model"), 'modelpdf', $object->model_pdf, $object, $user->rights->facture->creer, $select);
+		} else {
+			print $object->model_pdf;
+		}
+		print "</td>";
+		print '</tr>';
 
 		// Other attributes
 		$cols = 2;
@@ -1641,7 +1641,7 @@ if ($action == 'create')
 
 		print "</form>\n";
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 
 		/**
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 401a2fdd37a..c2cc6de851f 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -175,19 +175,19 @@ if (empty($reshook))
 	// Action clone object
 	if ($action == 'confirm_clone' && $confirm == 'yes' && $permissiontoadd)
 	{
-	    $objectutil = dol_clone($object, 1); // To avoid to denaturate loaded object when setting some properties for clone. We use native clone to keep this->db valid.
+		$objectutil = dol_clone($object, 1); // To avoid to denaturate loaded object when setting some properties for clone. We use native clone to keep this->db valid.
 
-	    $objectutil->date = dol_mktime(12, 0, 0, GETPOST('newdatemonth', 'int'), GETPOST('newdateday', 'int'), GETPOST('newdateyear', 'int'));
-	    $objectutil->socid = $socid;
-	    $result = $objectutil->createFromClone($user, $id);
-	    if ($result > 0) {
-       		header("Location: ".$_SERVER['PHP_SELF'].'?facid='.$result);
-       		exit();
-       	} else {
-       	    $langs->load("errors");
-       		setEventMessages($object->error, $object->errors, 'errors');
-       		$action = '';
-        }
+		$objectutil->date = dol_mktime(12, 0, 0, GETPOST('newdatemonth', 'int'), GETPOST('newdateday', 'int'), GETPOST('newdateyear', 'int'));
+		$objectutil->socid = $socid;
+		$result = $objectutil->createFromClone($user, $id);
+		if ($result > 0) {
+	   		header("Location: ".$_SERVER['PHP_SELF'].'?facid='.$result);
+	   		exit();
+	   	} else {
+	   		$langs->load("errors");
+	   		setEventMessages($object->error, $object->errors, 'errors');
+	   		$action = '';
+		}
 	} // Change status of invoice
 	elseif ($action == 'reopen' && $usercancreate) {
 		$result = $object->fetch($id);
@@ -352,29 +352,29 @@ if (empty($reshook))
 			dol_print_error($db, $object->error);
 	} elseif ($action == 'setretainedwarrantyconditions' && $user->rights->facture->creer)
 	{
-	    $object->fetch($id);
-	    $object->retained_warranty_fk_cond_reglement = 0; // To clean property
-	    $result = $object->setRetainedWarrantyPaymentTerms(GETPOST('retained_warranty_fk_cond_reglement', 'int'));
-	    if ($result < 0) dol_print_error($db, $object->error);
+		$object->fetch($id);
+		$object->retained_warranty_fk_cond_reglement = 0; // To clean property
+		$result = $object->setRetainedWarrantyPaymentTerms(GETPOST('retained_warranty_fk_cond_reglement', 'int'));
+		if ($result < 0) dol_print_error($db, $object->error);
 
-	    $old_rw_date_lim_reglement = $object->retained_warranty_date_limit;
-	    $new_rw_date_lim_reglement = $object->calculate_date_lim_reglement($object->retained_warranty_fk_cond_reglement);
-	    if ($new_rw_date_lim_reglement > $old_rw_date_lim_reglement) $object->retained_warranty_date_limit = $new_rw_date_lim_reglement;
-	    if ($object->retained_warranty_date_limit < $object->date) $object->retained_warranty_date_limit = $object->date;
-	    $result = $object->update($user);
-	    if ($result < 0) dol_print_error($db, $object->error);
+		$old_rw_date_lim_reglement = $object->retained_warranty_date_limit;
+		$new_rw_date_lim_reglement = $object->calculate_date_lim_reglement($object->retained_warranty_fk_cond_reglement);
+		if ($new_rw_date_lim_reglement > $old_rw_date_lim_reglement) $object->retained_warranty_date_limit = $new_rw_date_lim_reglement;
+		if ($object->retained_warranty_date_limit < $object->date) $object->retained_warranty_date_limit = $object->date;
+		$result = $object->update($user);
+		if ($result < 0) dol_print_error($db, $object->error);
 	} elseif ($action == 'setretainedwarranty' && $user->rights->facture->creer)
 	{
-	    $object->fetch($id);
-	    $result = $object->setRetainedWarranty(GETPOST('retained_warranty', 'float'));
-	    if ($result < 0)
-	        dol_print_error($db, $object->error);
+		$object->fetch($id);
+		$result = $object->setRetainedWarranty(GETPOST('retained_warranty', 'float'));
+		if ($result < 0)
+			dol_print_error($db, $object->error);
 	} elseif ($action == 'setretainedwarrantydatelimit' && $user->rights->facture->creer)
 	{
-	    $object->fetch($id);
-	    $result = $object->setRetainedWarrantyDateLimit(GETPOST('retained_warranty_date_limit', 'float'));
-	    if ($result < 0)
-	        dol_print_error($db, $object->error);
+		$object->fetch($id);
+		$result = $object->setRetainedWarrantyDateLimit(GETPOST('retained_warranty_date_limit', 'float'));
+		if ($result < 0)
+			dol_print_error($db, $object->error);
 	} // Multicurrency Code
 	elseif ($action == 'setmulticurrencycode' && $usercancreate) {
 		$result = $object->setMulticurrencyCode(GETPOST('multicurrency_code', 'alpha'));
@@ -419,22 +419,22 @@ if (empty($reshook))
 
 		$db->begin();
 
-		if (! $error) {
+		if (!$error) {
 			$result = $object->setPaymentTerms(GETPOST('cond_reglement_id', 'int'));
 			if ($result < 0) {
-			    $error++;
+				$error++;
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
 
-		if (! $error) {
+		if (!$error) {
 			$old_date_lim_reglement = $object->date_lim_reglement;
 			$new_date_lim_reglement = $object->calculate_date_lim_reglement();
 			if ($new_date_lim_reglement > $old_date_lim_reglement) $object->date_lim_reglement = $new_date_lim_reglement;
 			if ($object->date_lim_reglement < $object->date) $object->date_lim_reglement = $object->date;
 			$result = $object->update($user);
 			if ($result < 0) {
-			    $error++;
+				$error++;
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
@@ -664,6 +664,7 @@ if (empty($reshook))
 						$outputlangs->load('products');
 					}
 					$model = $object->model_pdf;
+
 					$ret = $object->fetch($id); // Reload to get new records
 
 					$result = $object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
@@ -875,16 +876,16 @@ if (empty($reshook))
 
 				// Total credit note and deposit
 				$total_creditnote_and_deposit = 0;
-                $sql = "SELECT re.rowid, re.amount_ht, re.amount_tva, re.amount_ttc,";
-                $sql .= " re.description, re.fk_facture_source";
-                $sql .= " FROM ".MAIN_DB_PREFIX."societe_remise_except as re";
-                $sql .= " WHERE fk_facture = ".$object->id;
-                $resql = $db->query($sql);
-                if (!empty($resql)) {
-                    while ($obj = $db->fetch_object($resql)) {
-                        $total_creditnote_and_deposit += $obj->amount_ttc;
-                    }
-                } else dol_print_error($db);
+				$sql = "SELECT re.rowid, re.amount_ht, re.amount_tva, re.amount_ttc,";
+				$sql .= " re.description, re.fk_facture_source";
+				$sql .= " FROM ".MAIN_DB_PREFIX."societe_remise_except as re";
+				$sql .= " WHERE fk_facture = ".$object->id;
+				$resql = $db->query($sql);
+				if (!empty($resql)) {
+					while ($obj = $db->fetch_object($resql)) {
+						$total_creditnote_and_deposit += $obj->amount_ttc;
+					}
+				} else dol_print_error($db);
 
 				$discount->amount_ht = $discount->amount_ttc = $total_paiements + $total_creditnote_and_deposit - $object->total_ttc;
 				$discount->amount_tva = 0;
@@ -1086,12 +1087,12 @@ if (empty($reshook))
 				$facture_source = new Facture($db); // fetch origin object
 				if ($facture_source->fetch($object->fk_facture_source) > 0)
 				{
-				    if ($facture_source->type == Facture::TYPE_SITUATION)
-				    {
-				        $object->situation_counter = $facture_source->situation_counter;
-				        $object->situation_cycle_ref = $facture_source->situation_cycle_ref;
-				        $facture_source->fetchPreviousNextSituationInvoice();
-				    }
+					if ($facture_source->type == Facture::TYPE_SITUATION)
+					{
+						$object->situation_counter = $facture_source->situation_counter;
+						$object->situation_cycle_ref = $facture_source->situation_cycle_ref;
+						$facture_source->fetchPreviousNextSituationInvoice();
+					}
 				}
 				$id = $object->create($user);
 
@@ -1122,84 +1123,84 @@ if (empty($reshook))
 
 							if ($facture_source->type == Facture::TYPE_SITUATION)
 							{
-							    $source_fk_prev_id = $line->fk_prev_id; // temporary storing situation invoice fk_prev_id
-							    $line->fk_prev_id  = $line->id; // The new line of the new credit note we are creating must be linked to the situation invoice line it is created from
+								$source_fk_prev_id = $line->fk_prev_id; // temporary storing situation invoice fk_prev_id
+								$line->fk_prev_id  = $line->id; // The new line of the new credit note we are creating must be linked to the situation invoice line it is created from
 
-							    if (!empty($facture_source->tab_previous_situation_invoice))
-							    {
-							        // search the last standard invoice in cycle and the possible credit note between this last and facture_source
-							    	// TODO Move this out of loop of $facture_source->lines
-							    	$tab_jumped_credit_notes = array();
-							    	$lineIndex = count($facture_source->tab_previous_situation_invoice) - 1;
-							        $searchPreviousInvoice = true;
-							        while ($searchPreviousInvoice)
-							        {
-							            if ($facture_source->tab_previous_situation_invoice[$lineIndex]->type == Facture::TYPE_SITUATION || $lineIndex < 1)
-							            {
-							                $searchPreviousInvoice = false; // find, exit;
-							                break;
-							            } else {
-							            	if ($facture_source->tab_previous_situation_invoice[$lineIndex]->type == Facture::TYPE_CREDIT_NOTE) {
-							            		$tab_jumped_credit_notes[$lineIndex] = $facture_source->tab_previous_situation_invoice[$lineIndex]->id;
-							            	}
-							                $lineIndex--; // go to previous invoice in cycle
-							            }
-							        }
+								if (!empty($facture_source->tab_previous_situation_invoice))
+								{
+									// search the last standard invoice in cycle and the possible credit note between this last and facture_source
+									// TODO Move this out of loop of $facture_source->lines
+									$tab_jumped_credit_notes = array();
+									$lineIndex = count($facture_source->tab_previous_situation_invoice) - 1;
+									$searchPreviousInvoice = true;
+									while ($searchPreviousInvoice)
+									{
+										if ($facture_source->tab_previous_situation_invoice[$lineIndex]->type == Facture::TYPE_SITUATION || $lineIndex < 1)
+										{
+											$searchPreviousInvoice = false; // find, exit;
+											break;
+										} else {
+											if ($facture_source->tab_previous_situation_invoice[$lineIndex]->type == Facture::TYPE_CREDIT_NOTE) {
+												$tab_jumped_credit_notes[$lineIndex] = $facture_source->tab_previous_situation_invoice[$lineIndex]->id;
+											}
+											$lineIndex--; // go to previous invoice in cycle
+										}
+									}
 
-							        $maxPrevSituationPercent = 0;
-							        foreach ($facture_source->tab_previous_situation_invoice[$lineIndex]->lines as $prevLine)
-							        {
-							            if ($prevLine->id == $source_fk_prev_id)
-							            {
-							                $maxPrevSituationPercent = max($maxPrevSituationPercent, $prevLine->situation_percent);
+									$maxPrevSituationPercent = 0;
+									foreach ($facture_source->tab_previous_situation_invoice[$lineIndex]->lines as $prevLine)
+									{
+										if ($prevLine->id == $source_fk_prev_id)
+										{
+											$maxPrevSituationPercent = max($maxPrevSituationPercent, $prevLine->situation_percent);
 
-							                //$line->subprice  = $line->subprice - $prevLine->subprice;
-							                $line->total_ht  = $line->total_ht - $prevLine->total_ht;
-							                $line->total_tva = $line->total_tva - $prevLine->total_tva;
-							                $line->total_ttc = $line->total_ttc - $prevLine->total_ttc;
-							                $line->total_localtax1 = $line->total_localtax1 - $prevLine->total_localtax1;
-							                $line->total_localtax2 = $line->total_localtax2 - $prevLine->total_localtax2;
+											//$line->subprice  = $line->subprice - $prevLine->subprice;
+											$line->total_ht  = $line->total_ht - $prevLine->total_ht;
+											$line->total_tva = $line->total_tva - $prevLine->total_tva;
+											$line->total_ttc = $line->total_ttc - $prevLine->total_ttc;
+											$line->total_localtax1 = $line->total_localtax1 - $prevLine->total_localtax1;
+											$line->total_localtax2 = $line->total_localtax2 - $prevLine->total_localtax2;
 
-							                $line->multicurrency_subprice  = $line->multicurrency_subprice - $prevLine->multicurrency_subprice;
-							                $line->multicurrency_total_ht  = $line->multicurrency_total_ht - $prevLine->multicurrency_total_ht;
-							                $line->multicurrency_total_tva = $line->multicurrency_total_tva - $prevLine->multicurrency_total_tva;
-							                $line->multicurrency_total_ttc = $line->multicurrency_total_ttc - $prevLine->multicurrency_total_ttc;
-							            }
-							        }
+											$line->multicurrency_subprice  = $line->multicurrency_subprice - $prevLine->multicurrency_subprice;
+											$line->multicurrency_total_ht  = $line->multicurrency_total_ht - $prevLine->multicurrency_total_ht;
+											$line->multicurrency_total_tva = $line->multicurrency_total_tva - $prevLine->multicurrency_total_tva;
+											$line->multicurrency_total_ttc = $line->multicurrency_total_ttc - $prevLine->multicurrency_total_ttc;
+										}
+									}
 
-							        // prorata
-							        $line->situation_percent = $maxPrevSituationPercent - $line->situation_percent;
+									// prorata
+									$line->situation_percent = $maxPrevSituationPercent - $line->situation_percent;
 
-							        //print 'New line based on invoice id '.$facture_source->tab_previous_situation_invoice[$lineIndex]->id.' fk_prev_id='.$source_fk_prev_id.' will be fk_prev_id='.$line->fk_prev_id.' '.$line->total_ht.' '.$line->situation_percent.'<br>';
+									//print 'New line based on invoice id '.$facture_source->tab_previous_situation_invoice[$lineIndex]->id.' fk_prev_id='.$source_fk_prev_id.' will be fk_prev_id='.$line->fk_prev_id.' '.$line->total_ht.' '.$line->situation_percent.'<br>';
 
-							        // If there is some credit note between last situation invoice and invoice used for credit note generation (note: credit notes are stored as delta)
-							        $maxPrevSituationPercent = 0;
-							        foreach ($tab_jumped_credit_notes as $index => $creditnoteid) {
-							        	foreach ($facture_source->tab_previous_situation_invoice[$index]->lines as $prevLine)
-							        	{
-							        		if ($prevLine->fk_prev_id == $source_fk_prev_id)
-							        		{
-							        			$maxPrevSituationPercent = $prevLine->situation_percent;
+									// If there is some credit note between last situation invoice and invoice used for credit note generation (note: credit notes are stored as delta)
+									$maxPrevSituationPercent = 0;
+									foreach ($tab_jumped_credit_notes as $index => $creditnoteid) {
+										foreach ($facture_source->tab_previous_situation_invoice[$index]->lines as $prevLine)
+										{
+											if ($prevLine->fk_prev_id == $source_fk_prev_id)
+											{
+												$maxPrevSituationPercent = $prevLine->situation_percent;
 
-							        			$line->total_ht  -= $prevLine->total_ht;
-							        			$line->total_tva -= $prevLine->total_tva;
-							        			$line->total_ttc -= $prevLine->total_ttc;
-							        			$line->total_localtax1 -= $prevLine->total_localtax1;
-							        			$line->total_localtax2 -= $prevLine->total_localtax2;
+												$line->total_ht  -= $prevLine->total_ht;
+												$line->total_tva -= $prevLine->total_tva;
+												$line->total_ttc -= $prevLine->total_ttc;
+												$line->total_localtax1 -= $prevLine->total_localtax1;
+												$line->total_localtax2 -= $prevLine->total_localtax2;
 
-							        			$line->multicurrency_subprice  -= $prevLine->multicurrency_subprice;
-							        			$line->multicurrency_total_ht  -= $prevLine->multicurrency_total_ht;
-							        			$line->multicurrency_total_tva -= $prevLine->multicurrency_total_tva;
-							        			$line->multicurrency_total_ttc -= $prevLine->multicurrency_total_ttc;
-							        		}
-							        	}
-							        }
+												$line->multicurrency_subprice  -= $prevLine->multicurrency_subprice;
+												$line->multicurrency_total_ht  -= $prevLine->multicurrency_total_ht;
+												$line->multicurrency_total_tva -= $prevLine->multicurrency_total_tva;
+												$line->multicurrency_total_ttc -= $prevLine->multicurrency_total_ttc;
+											}
+										}
+									}
 
-							        // prorata
-							        $line->situation_percent += $maxPrevSituationPercent;
+									// prorata
+									$line->situation_percent += $maxPrevSituationPercent;
 
-							        //print 'New line based on invoice id '.$facture_source->tab_previous_situation_invoice[$lineIndex]->id.' fk_prev_id='.$source_fk_prev_id.' will be fk_prev_id='.$line->fk_prev_id.' '.$line->total_ht.' '.$line->situation_percent.'<br>';
-							    }
+									//print 'New line based on invoice id '.$facture_source->tab_previous_situation_invoice[$lineIndex]->id.' fk_prev_id='.$source_fk_prev_id.' will be fk_prev_id='.$line->fk_prev_id.' '.$line->total_ht.' '.$line->situation_percent.'<br>';
+								}
 							}
 
 							$line->fk_facture = $object->id;
@@ -1282,7 +1283,7 @@ if (empty($reshook))
 				$object->note_public = trim(GETPOST('note_public', 'restricthtml'));
 				$object->note_private    = trim(GETPOST('note_private', 'restricthtml'));
 				$object->ref_client      = GETPOST('ref_client');
-				$object->model_pdf        = GETPOST('model');
+				$object->model_pdf = GETPOST('model');
 				$object->fk_project = GETPOST('projectid', 'int');
 				$object->cond_reglement_id	= (GETPOST('type') == 3 ? 1 : GETPOST('cond_reglement_id'));
 				$object->mode_reglement_id	= GETPOST('mode_reglement_id', 'int');
@@ -1361,11 +1362,11 @@ if (empty($reshook))
 					$object->retained_warranty_fk_cond_reglement = 0;
 				}
 
-			    $retained_warranty_date_limit = GETPOST('retained_warranty_date_limit');
-			    if (!empty($retained_warranty_date_limit) && $db->jdate($retained_warranty_date_limit)) {
-			        $object->retained_warranty_date_limit = $db->jdate($retained_warranty_date_limit);
-			    }
-			    $object->retained_warranty_date_limit = !empty($object->retained_warranty_date_limit) ? $object->retained_warranty_date_limit : $object->calculate_date_lim_reglement($object->retained_warranty_fk_cond_reglement);
+				$retained_warranty_date_limit = GETPOST('retained_warranty_date_limit');
+				if (!empty($retained_warranty_date_limit) && $db->jdate($retained_warranty_date_limit)) {
+					$object->retained_warranty_date_limit = $db->jdate($retained_warranty_date_limit);
+				}
+				$object->retained_warranty_date_limit = !empty($object->retained_warranty_date_limit) ? $object->retained_warranty_date_limit : $object->calculate_date_lim_reglement($object->retained_warranty_fk_cond_reglement);
 
 				$object->fetch_thirdparty();
 
@@ -1647,7 +1648,7 @@ if (empty($reshook))
 										$localtax1_tx = get_localtax($tva_tx, 1, $object->thirdparty);
 										$localtax2_tx = get_localtax($tva_tx, 2, $object->thirdparty);
 
-                                        $result = $object->addline(
+										$result = $object->addline(
 											$desc, $lines[$i]->subprice, $lines[$i]->qty, $tva_tx, $localtax1_tx, $localtax2_tx, $lines[$i]->fk_product,
 											$lines[$i]->remise_percent, $date_start, $date_end, 0, $lines[$i]->info_bits, $lines[$i]->fk_remise_except,
 											'HT', 0, $product_type, $lines[$i]->rang, $lines[$i]->special_code, $object->origin, $lines[$i]->rowid,
@@ -1737,7 +1738,7 @@ if (empty($reshook))
 			if (empty($datefacture)) {
 				$error++;
 				$mesg = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Date"));
-                setEventMessages($mesg, null, 'errors');
+				setEventMessages($mesg, null, 'errors');
 			}
 
 			$date_pointoftax = dol_mktime(12, 0, 0, $_POST['date_pointoftaxmonth'], $_POST['date_pointoftaxday'], $_POST['date_pointoftaxyear']);
@@ -1745,8 +1746,8 @@ if (empty($reshook))
 			if (!($_POST['situations'] > 0)) {
 				$error++;
 				$mesg = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("InvoiceSituation"));
-                setEventMessages($mesg, null, 'errors');
-                $action = 'create';
+				setEventMessages($mesg, null, 'errors');
+				$action = 'create';
 			}
 
 			if (!$error) {
@@ -1764,23 +1765,23 @@ if (empty($reshook))
 					// retained warranty
 					if (!empty($conf->global->INVOICE_USE_RETAINED_WARRANTY))
 					{
-					    $retained_warranty = GETPOST('retained_warranty', 'int');
-					    if (price2num($retained_warranty) > 0)
-					    {
-					        $object->retained_warranty = price2num($retained_warranty);
-					    }
+						$retained_warranty = GETPOST('retained_warranty', 'int');
+						if (price2num($retained_warranty) > 0)
+						{
+							$object->retained_warranty = price2num($retained_warranty);
+						}
 
-					    if (GETPOST('retained_warranty_fk_cond_reglement', 'int') > 0)
-					    {
-                			$object->retained_warranty_fk_cond_reglement = GETPOST('retained_warranty_fk_cond_reglement', 'int');
-					    }
+						if (GETPOST('retained_warranty_fk_cond_reglement', 'int') > 0)
+						{
+							$object->retained_warranty_fk_cond_reglement = GETPOST('retained_warranty_fk_cond_reglement', 'int');
+						}
 
-				        $retained_warranty_date_limit = GETPOST('retained_warranty_date_limit');
-				        if (!empty($retained_warranty_date_limit) && $db->jdate($retained_warranty_date_limit)) {
-				            $object->retained_warranty_date_limit = $db->jdate($retained_warranty_date_limit);
-				        }
-					    $object->retained_warranty_date_limit = !empty($object->retained_warranty_date_limit) ? $object->retained_warranty_date_limit : $object->calculate_date_lim_reglement($object->retained_warranty_fk_cond_reglement);
-                	}
+						$retained_warranty_date_limit = GETPOST('retained_warranty_date_limit');
+						if (!empty($retained_warranty_date_limit) && $db->jdate($retained_warranty_date_limit)) {
+							$object->retained_warranty_date_limit = $db->jdate($retained_warranty_date_limit);
+						}
+						$object->retained_warranty_date_limit = !empty($object->retained_warranty_date_limit) ? $object->retained_warranty_date_limit : $object->calculate_date_lim_reglement($object->retained_warranty_fk_cond_reglement);
+					}
 
 					foreach ($object->lines as $i => &$line)
 					{
@@ -1804,16 +1805,16 @@ if (empty($reshook))
 						// Si fk_remise_except defini on vérifie si la réduction à déjà été appliquée
 						if ($line->fk_remise_except)
 						{
-						    $discount = new DiscountAbsolute($line->db);
-						    $result = $discount->fetch($line->fk_remise_except);
-						    if ($result > 0)
-						    {
-						        // Check if discount not already affected to another invoice
-						        if ($discount->fk_facture_line > 0)
-						        {
-						            $line->fk_remise_except = 0;
-						        }
-						    }
+							$discount = new DiscountAbsolute($line->db);
+							$result = $discount->fetch($line->fk_remise_except);
+							if ($result > 0)
+							{
+								// Check if discount not already affected to another invoice
+								if ($discount->fk_facture_line > 0)
+								{
+									$line->fk_remise_except = 0;
+								}
+							}
 						}
 					}
 				}
@@ -2263,20 +2264,20 @@ if (empty($reshook))
 
 		if ($object->type == Facture::TYPE_CREDIT_NOTE && $object->situation_cycle_ref > 0)
 		{
-		    // in case of situation credit note
-		    if (GETPOST('progress') >= 0)
-		    {
-		        $mesg = $langs->trans("CantBeNullOrPositive");
-		        setEventMessages($mesg, null, 'warnings');
-		        $error++;
-		        $result = -1;
-		    } elseif (GETPOST('progress') < $line->situation_percent) // TODO : use a modified $line->get_prev_progress($object->id) result
-		    {
-		        $mesg = $langs->trans("CantBeLessThanMinPercent");
-		        setEventMessages($mesg, null, 'warnings');
-		        $error++;
-		        $result = -1;
-		    }
+			// in case of situation credit note
+			if (GETPOST('progress') >= 0)
+			{
+				$mesg = $langs->trans("CantBeNullOrPositive");
+				setEventMessages($mesg, null, 'warnings');
+				$error++;
+				$result = -1;
+			} elseif (GETPOST('progress') < $line->situation_percent) // TODO : use a modified $line->get_prev_progress($object->id) result
+			{
+				$mesg = $langs->trans("CantBeLessThanMinPercent");
+				setEventMessages($mesg, null, 'warnings');
+				$error++;
+				$result = -1;
+			}
 		} elseif (GETPOST('progress') < $percent)
 		{
 			$mesg = '<div class="warning">'.$langs->trans("CantBeLessThanMinPercent").'</div>';
@@ -2422,13 +2423,13 @@ if (empty($reshook))
 		if (!$object->fetch($id) > 0) dol_print_error($db);
 		if (GETPOST('all_progress') != "")
 		{
-            $all_progress = GETPOST('all_progress', 'int');
+			$all_progress = GETPOST('all_progress', 'int');
 			foreach ($object->lines as $line)
 			{
 				$percent = $line->get_prev_progress($object->id);
 				if (floatval($all_progress) < floatval($percent)) {
-                    $mesg = $langs->trans("Line").' '.$i.' : '.$langs->trans("CantBeLessThanMinPercent");
-                    setEventMessages($mesg, null, 'warnings');
+					$mesg = $langs->trans("Line").' '.$i.' : '.$langs->trans("CantBeLessThanMinPercent");
+					setEventMessages($mesg, null, 'warnings');
 					$result = -1;
 				} else $object->update_percent($line, $_POST['all_progress']);
 			}
@@ -2439,192 +2440,192 @@ if (empty($reshook))
 	} // Outing situation invoice from cycle
 	elseif ($action == 'confirm_situationout' && $confirm == 'yes' && $usercancreate)
 	{
-	    $object->fetch($id, '', '', '', true);
+		$object->fetch($id, '', '', '', true);
 
-	    if ($object->statut == Facture::STATUS_VALIDATED
-	        && $object->type == Facture::TYPE_SITUATION
-	        && $usercancreate
-	        && !$objectidnext
-	        && $object->is_last_in_cycle()
-	    	&& $usercanunvalidate
-	        )
-	    {
-	        $outingError = 0;
-	        $newCycle = $object->newCycle(); // we need to keep the "situation behavior" so we place it on a new situation cycle
-	        if ($newCycle > 1)
-	        {
-	            // Search credit notes
-	            $lastCycle = $object->situation_cycle_ref;
-	            $lastSituationCounter = $object->situation_counter;
-	            $linkedCreditNotesList = array();
+		if ($object->statut == Facture::STATUS_VALIDATED
+			&& $object->type == Facture::TYPE_SITUATION
+			&& $usercancreate
+			&& !$objectidnext
+			&& $object->is_last_in_cycle()
+			&& $usercanunvalidate
+			)
+		{
+			$outingError = 0;
+			$newCycle = $object->newCycle(); // we need to keep the "situation behavior" so we place it on a new situation cycle
+			if ($newCycle > 1)
+			{
+				// Search credit notes
+				$lastCycle = $object->situation_cycle_ref;
+				$lastSituationCounter = $object->situation_counter;
+				$linkedCreditNotesList = array();
 
-                if (count($object->tab_next_situation_invoice) > 0) {
-                    foreach ($object->tab_next_situation_invoice as $next_invoice) {
-                        if ($next_invoice->type == Facture::TYPE_CREDIT_NOTE
-                            && $next_invoice->situation_counter == $object->situation_counter
-                            && $next_invoice->fk_facture_source == $object->id
-                          )
-                        {
-                            $linkedCreditNotesList[] = $next_invoice->id;
-                        }
-                    }
-                }
+				if (count($object->tab_next_situation_invoice) > 0) {
+					foreach ($object->tab_next_situation_invoice as $next_invoice) {
+						if ($next_invoice->type == Facture::TYPE_CREDIT_NOTE
+							&& $next_invoice->situation_counter == $object->situation_counter
+							&& $next_invoice->fk_facture_source == $object->id
+						  )
+						{
+							$linkedCreditNotesList[] = $next_invoice->id;
+						}
+					}
+				}
 
-	            $object->situation_cycle_ref = $newCycle;
-	            $object->situation_counter = 1;
-	            $object->situation_final = 0;
-	            if ($object->update($user) > 0)
-	            {
-	                $errors = 0;
-	                if (count($linkedCreditNotesList) > 0)
-	                {
-	                    // now, credit note must follow
-	                    $sql = 'UPDATE '.MAIN_DB_PREFIX.'facture ';
-	                    $sql .= ' SET situation_cycle_ref='.$newCycle;
-	                    $sql .= ' , situation_final=0';
-	                    $sql .= ' , situation_counter='.$object->situation_counter;
-	                    $sql .= ' WHERE rowid IN ('.implode(',', $linkedCreditNotesList).')';
+				$object->situation_cycle_ref = $newCycle;
+				$object->situation_counter = 1;
+				$object->situation_final = 0;
+				if ($object->update($user) > 0)
+				{
+					$errors = 0;
+					if (count($linkedCreditNotesList) > 0)
+					{
+						// now, credit note must follow
+						$sql = 'UPDATE '.MAIN_DB_PREFIX.'facture ';
+						$sql .= ' SET situation_cycle_ref='.$newCycle;
+						$sql .= ' , situation_final=0';
+						$sql .= ' , situation_counter='.$object->situation_counter;
+						$sql .= ' WHERE rowid IN ('.implode(',', $linkedCreditNotesList).')';
 
-	                    $resql = $db->query($sql);
-	                    if (!$resql) $errors++;
+						$resql = $db->query($sql);
+						if (!$resql) $errors++;
 
-	                    // Change each progression persent on each lines
-	                    foreach ($object->lines as $line)
-	                    {
-	                        // no traitement for special product
-	                        if ($line->product_type == 9)  continue;
+						// Change each progression persent on each lines
+						foreach ($object->lines as $line)
+						{
+							// no traitement for special product
+							if ($line->product_type == 9)  continue;
 
 
-	                        if (!empty($object->tab_previous_situation_invoice))
-	                        {
-                                // search the last invoice in cycle
-	                            $lineIndex = count($object->tab_previous_situation_invoice) - 1;
-                                $searchPreviousInvoice = true;
-                                while ($searchPreviousInvoice)
-                                {
-                                    if ($object->tab_previous_situation_invoice[$lineIndex]->type == Facture::TYPE_SITUATION || $lineIndex < 1)
-                                    {
-                                        $searchPreviousInvoice = false; // find, exit;
-                                        break;
-                                    } else {
-                                        $lineIndex--; // go to previous invoice in cycle
-                                    }
-                                }
+							if (!empty($object->tab_previous_situation_invoice))
+							{
+								// search the last invoice in cycle
+								$lineIndex = count($object->tab_previous_situation_invoice) - 1;
+								$searchPreviousInvoice = true;
+								while ($searchPreviousInvoice)
+								{
+									if ($object->tab_previous_situation_invoice[$lineIndex]->type == Facture::TYPE_SITUATION || $lineIndex < 1)
+									{
+										$searchPreviousInvoice = false; // find, exit;
+										break;
+									} else {
+										$lineIndex--; // go to previous invoice in cycle
+									}
+								}
 
 
-                                $maxPrevSituationPercent = 0;
-                                foreach ($object->tab_previous_situation_invoice[$lineIndex]->lines as $prevLine)
-                                {
-                                    if ($prevLine->id == $line->fk_prev_id)
-                                    {
-                                        $maxPrevSituationPercent = max($maxPrevSituationPercent, $prevLine->situation_percent);
-                                    }
-                                }
+								$maxPrevSituationPercent = 0;
+								foreach ($object->tab_previous_situation_invoice[$lineIndex]->lines as $prevLine)
+								{
+									if ($prevLine->id == $line->fk_prev_id)
+									{
+										$maxPrevSituationPercent = max($maxPrevSituationPercent, $prevLine->situation_percent);
+									}
+								}
 
 
-                                $line->situation_percent = $line->situation_percent - $maxPrevSituationPercent;
+								$line->situation_percent = $line->situation_percent - $maxPrevSituationPercent;
 
-                                if ($line->update() < 0) $errors++;
-	                        }
-	                    }
-	                }
+								if ($line->update() < 0) $errors++;
+							}
+						}
+					}
 
-                    if (!$errors)
-                    {
-                        setEventMessages($langs->trans('Updated'), '', 'mesgs');
-                        header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
-                    } else {
-                        setEventMessages($langs->trans('ErrorOutingSituationInvoiceCreditNote'), array(), 'errors');
-                    }
-	            } else {
-	                setEventMessages($langs->trans('ErrorOutingSituationInvoiceOnUpdate'), array(), 'errors');
-	            }
-	        } else {
-	            setEventMessages($langs->trans('ErrorFindNextSituationInvoice'), array(), 'errors');
-	        }
-	    }
+					if (!$errors)
+					{
+						setEventMessages($langs->trans('Updated'), '', 'mesgs');
+						header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
+					} else {
+						setEventMessages($langs->trans('ErrorOutingSituationInvoiceCreditNote'), array(), 'errors');
+					}
+				} else {
+					setEventMessages($langs->trans('ErrorOutingSituationInvoiceOnUpdate'), array(), 'errors');
+				}
+			} else {
+				setEventMessages($langs->trans('ErrorFindNextSituationInvoice'), array(), 'errors');
+			}
+		}
 	} // add lines from objectlinked
 	elseif ($action == 'import_lines_from_object'
-	    && $usercancreate
-	    && $object->statut == Facture::STATUS_DRAFT
-	    && ($object->type == Facture::TYPE_STANDARD || $object->type == Facture::TYPE_REPLACEMENT || $object->type == Facture::TYPE_DEPOSIT || $object->type == Facture::TYPE_PROFORMA || $object->type == Facture::TYPE_SITUATION))
+		&& $usercancreate
+		&& $object->statut == Facture::STATUS_DRAFT
+		&& ($object->type == Facture::TYPE_STANDARD || $object->type == Facture::TYPE_REPLACEMENT || $object->type == Facture::TYPE_DEPOSIT || $object->type == Facture::TYPE_PROFORMA || $object->type == Facture::TYPE_SITUATION))
 	{
-	    $fromElement = GETPOST('fromelement');
-	    $fromElementid = GETPOST('fromelementid');
-	    $importLines = GETPOST('line_checkbox');
+		$fromElement = GETPOST('fromelement');
+		$fromElementid = GETPOST('fromelementid');
+		$importLines = GETPOST('line_checkbox');
 
-	    if (!empty($importLines) && is_array($importLines) && !empty($fromElement) && ctype_alpha($fromElement) && !empty($fromElementid))
-	    {
-	        if ($fromElement == 'commande')
-	        {
-	            dol_include_once('/'.$fromElement.'/class/'.$fromElement.'.class.php');
-	            $lineClassName = 'OrderLine';
-	        } elseif ($fromElement == 'propal')
-	        {
-	            dol_include_once('/comm/'.$fromElement.'/class/'.$fromElement.'.class.php');
-	            $lineClassName = 'PropaleLigne';
-	        }
-	        $nextRang = count($object->lines) + 1;
-	        $importCount = 0;
-	        $error = 0;
-	        foreach ($importLines as $lineId)
-	        {
-	            $lineId = intval($lineId);
-                $originLine = new $lineClassName($db);
-                if (intval($fromElementid) > 0 && $originLine->fetch($lineId) > 0)
-                {
-                    $originLine->fetch_optionals();
-                    $desc = $originLine->desc;
-                    $pu_ht = $originLine->subprice;
-                    $qty = $originLine->qty;
-                    $txtva = $originLine->tva_tx;
-                    $txlocaltax1 = $originLine->localtax1_tx;
-                    $txlocaltax2 = $originLine->localtax2_tx;
-                    $fk_product = $originLine->fk_product;
-                    $remise_percent = $originLine->remise_percent;
-                    $date_start = $originLine->date_start;
-                    $date_end = $originLine->date_end;
-                    $ventil = 0;
-                    $info_bits = $originLine->info_bits;
-                    $fk_remise_except = $originLine->fk_remise_except;
-                    $price_base_type = 'HT';
-                    $pu_ttc = 0;
-                    $type = $originLine->product_type;
-                    $rang = $nextRang++;
-                    $special_code = $originLine->special_code;
-                    $origin = $originLine->element;
-                    $origin_id = $originLine->id;
-                    $fk_parent_line = 0;
-                    $fk_fournprice = $originLine->fk_fournprice;
-                    $pa_ht = $originLine->pa_ht;
-                    $label = $originLine->label;
-                    $array_options = $originLine->array_options;
-                    if ($object->type == Facture::TYPE_SITUATION) {
-                        $situation_percent = 0;
-                    } else {
-                        $situation_percent = 100;
-                    }
-                    $fk_prev_id = '';
-                    $fk_unit = $originLine->fk_unit;
-                    $pu_ht_devise = $originLine->multicurrency_subprice;
+		if (!empty($importLines) && is_array($importLines) && !empty($fromElement) && ctype_alpha($fromElement) && !empty($fromElementid))
+		{
+			if ($fromElement == 'commande')
+			{
+				dol_include_once('/'.$fromElement.'/class/'.$fromElement.'.class.php');
+				$lineClassName = 'OrderLine';
+			} elseif ($fromElement == 'propal')
+			{
+				dol_include_once('/comm/'.$fromElement.'/class/'.$fromElement.'.class.php');
+				$lineClassName = 'PropaleLigne';
+			}
+			$nextRang = count($object->lines) + 1;
+			$importCount = 0;
+			$error = 0;
+			foreach ($importLines as $lineId)
+			{
+				$lineId = intval($lineId);
+				$originLine = new $lineClassName($db);
+				if (intval($fromElementid) > 0 && $originLine->fetch($lineId) > 0)
+				{
+					$originLine->fetch_optionals();
+					$desc = $originLine->desc;
+					$pu_ht = $originLine->subprice;
+					$qty = $originLine->qty;
+					$txtva = $originLine->tva_tx;
+					$txlocaltax1 = $originLine->localtax1_tx;
+					$txlocaltax2 = $originLine->localtax2_tx;
+					$fk_product = $originLine->fk_product;
+					$remise_percent = $originLine->remise_percent;
+					$date_start = $originLine->date_start;
+					$date_end = $originLine->date_end;
+					$ventil = 0;
+					$info_bits = $originLine->info_bits;
+					$fk_remise_except = $originLine->fk_remise_except;
+					$price_base_type = 'HT';
+					$pu_ttc = 0;
+					$type = $originLine->product_type;
+					$rang = $nextRang++;
+					$special_code = $originLine->special_code;
+					$origin = $originLine->element;
+					$origin_id = $originLine->id;
+					$fk_parent_line = 0;
+					$fk_fournprice = $originLine->fk_fournprice;
+					$pa_ht = $originLine->pa_ht;
+					$label = $originLine->label;
+					$array_options = $originLine->array_options;
+					if ($object->type == Facture::TYPE_SITUATION) {
+						$situation_percent = 0;
+					} else {
+						$situation_percent = 100;
+					}
+					$fk_prev_id = '';
+					$fk_unit = $originLine->fk_unit;
+					$pu_ht_devise = $originLine->multicurrency_subprice;
 
-                    $res = $object->addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1, $txlocaltax2, $fk_product, $remise_percent, $date_start, $date_end, $ventil, $info_bits, $fk_remise_except, $price_base_type, $pu_ttc, $type, $rang, $special_code, $origin, $origin_id, $fk_parent_line, $fk_fournprice, $pa_ht, $label, $array_options, $situation_percent, $fk_prev_id, $fk_unit, $pu_ht_devise);
+					$res = $object->addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1, $txlocaltax2, $fk_product, $remise_percent, $date_start, $date_end, $ventil, $info_bits, $fk_remise_except, $price_base_type, $pu_ttc, $type, $rang, $special_code, $origin, $origin_id, $fk_parent_line, $fk_fournprice, $pa_ht, $label, $array_options, $situation_percent, $fk_prev_id, $fk_unit, $pu_ht_devise);
 
-                    if ($res > 0) {
-                        $importCount++;
-                    } else {
-                        $error++;
-                    }
-                } else {
-                    $error++;
-                }
-	        }
+					if ($res > 0) {
+						$importCount++;
+					} else {
+						$error++;
+					}
+				} else {
+					$error++;
+				}
+			}
 
-	        if ($error)
-	        {
-	            setEventMessages($langs->trans('ErrorsOnXLines', $error), null, 'errors');
-	        }
-	    }
+			if ($error)
+			{
+				setEventMessages($langs->trans('ErrorsOnXLines', $error), null, 'errors');
+			}
+		}
 	}
 
 	// Actions when printing a doc from card
@@ -2885,18 +2886,20 @@ if ($action == 'create')
 		$text .= ' '.$langs->trans("ToCreateARecurringInvoiceGene", $langs->transnoentitiesnoconv("MenuFinancial"), $langs->transnoentitiesnoconv("BillsCustomers"), $langs->transnoentitiesnoconv("ListOfTemplates"));
 		if (empty($conf->global->INVOICE_DISABLE_AUTOMATIC_RECURRING_INVOICE))
 		{
-		    $text .= ' '.$langs->trans("ToCreateARecurringInvoiceGeneAuto", $langs->transnoentitiesnoconv('Module2300Name'));
+			$text .= ' '.$langs->trans("ToCreateARecurringInvoiceGeneAuto", $langs->transnoentitiesnoconv('Module2300Name'));
 		}
 		print info_admin($text, 0, 0, 0).'<br>';
 	}
 
-	print '<form name="add" action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+	print '<form name="add" action="'.$_SERVER["PHP_SELF"].'" method="POST" id="formtocreate" name="formtocreate">';
 	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">';
 	print '<input name="ref_client" type="hidden" value="'.$ref_client.'">';
-	print '<input name="ref_int" type="hidden" value="'.$ref_int.'">';
+	print '<input name="force_cond_reglement_id" type="hidden" value="0">';
+	print '<input name="force_mode_reglement_id" type="hidden" value="0">';
+	print '<input name="force_fk_account" type="hidden" value="0">';
 	print '<input type="hidden" name="origin" value="'.$origin.'">';
 	print '<input type="hidden" name="originid" value="'.$originid.'">';
 	print '<input type="hidden" name="originentity" value="'.GETPOST('originentity').'">';
@@ -2941,15 +2944,24 @@ if ($action == 'create')
 		print '<tr><td class="fieldrequired">'.$langs->trans('Customer').'</td>';
 		print '<td colspan="2">';
 		print $form->select_company($soc->id, 'socid', '((s.client = 1 OR s.client = 3) AND s.status=1)', 'SelectThirdParty', 0, 0, null, 0, 'minwidth300');
-		// Option to reload page to retrieve customer informations. Note, this clear other input
-		if (!empty($conf->global->RELOAD_PAGE_ON_CUSTOMER_CHANGE))
+		// Option to reload page to retrieve customer informations.
+		if (empty($conf->global->RELOAD_PAGE_ON_CUSTOMER_CHANGE_DISABLED))
 		{
 			print '<script type="text/javascript">
 			$(document).ready(function() {
 				$("#socid").change(function() {
+					/*
+					console.log("Submit page");
+					$(\'input[name="action"]\').val(\'create\');
+					$(\'input[name="force_cond_reglement_id"]\').val(\'1\');
+					$(\'input[name="force_mode_reglement_id"]\').val(\'1\');
+					$(\'input[name="force_fk_account"]\').val(\'1\');
+					$("#formtocreate").submit(); */
+
+   					// For company change, we must reuse data of comany, not input already done, so we call a GET with action=create, not a POST submit.
+					console.log("We have changed the company - Reload page");
 					var socid = $(this).val();
 			        var fac_rec = $(\'#fac_rec\').val();
-					// reload page
         			window.location.href = "'.$_SERVER["PHP_SELF"].'?action=create&socid="+socid+"&fac_rec="+fac_rec;
 				});
 			});
@@ -3006,15 +3018,15 @@ if ($action == 'create')
 				}
 				print '</select>';
 				// Option to reload page to retrieve customer informations. Note, this clear other input
-				if (!empty($conf->global->RELOAD_PAGE_ON_TEMPLATE_CHANGE))
+				if (empty($conf->global->RELOAD_PAGE_ON_TEMPLATE_CHANGE_DISABLED))
 				{
 					print '<script type="text/javascript">
         			$(document).ready(function() {
         				$("#fac_rec").change(function() {
-							console.log("We changed the template invoice");
+							console.log("We have changed the template invoice - Reload page");
         					var fac_rec = $(this).val();
         			        var socid = $(\'#socid\').val();
-        					// reload page
+        					// For template invoice change, we must reuse data of template, not input already done, so we call a GET with action=create, not a POST submit.
         					window.location.href = "'.$_SERVER["PHP_SELF"].'?action=create&socid="+socid+"&fac_rec="+fac_rec;
         				});
         			});
@@ -3161,26 +3173,26 @@ if ($action == 'create')
 			print '</div></div>';
 		}
 	} else {
-	    if (!empty($conf->global->INVOICE_USE_SITUATION))
-	    {
-    	    print '<div class="tagtr listofinvoicetype"><div class="tagtd listofinvoicetype">';
-    	    $tmp = '<input type="radio" name="type" id="radio_situation" value="0" disabled> ';
-    	    $text = '<label>'.$tmp.$langs->trans("InvoiceFirstSituationAsk").'</label> ';
-    	    $text .= '<span class="opacitymedium">('.$langs->trans("YouMustCreateInvoiceFromThird").')</span> ';
-    	    $desc = $form->textwithpicto($text, $langs->transnoentities("InvoiceFirstSituationDesc"), 1, 'help', '', 0, 3);
-    	    print $desc;
-    	    print '</div></div>';
+		if (!empty($conf->global->INVOICE_USE_SITUATION))
+		{
+			print '<div class="tagtr listofinvoicetype"><div class="tagtd listofinvoicetype">';
+			$tmp = '<input type="radio" name="type" id="radio_situation" value="0" disabled> ';
+			$text = '<label>'.$tmp.$langs->trans("InvoiceFirstSituationAsk").'</label> ';
+			$text .= '<span class="opacitymedium">('.$langs->trans("YouMustCreateInvoiceFromThird").')</span> ';
+			$desc = $form->textwithpicto($text, $langs->transnoentities("InvoiceFirstSituationDesc"), 1, 'help', '', 0, 3);
+			print $desc;
+			print '</div></div>';
 
-    	    print '<div class="tagtr listofinvoicetype"><div class="tagtd listofinvoicetype">';
-    	    $tmp = '<input type="radio" name="type" id="radio_situation" value="0" disabled> ';
-    	    $text = '<label>'.$tmp.$langs->trans("InvoiceSituationAsk").'</label> ';
-    	    $text .= '<span class="opacitymedium">('.$langs->trans("YouMustCreateInvoiceFromThird").')</span> ';
-    	    $desc = $form->textwithpicto($text, $langs->transnoentities("InvoiceFirstSituationDesc"), 1, 'help', '', 0, 3);
-    	    print $desc;
-    	    print '</div></div>';
-	    }
+			print '<div class="tagtr listofinvoicetype"><div class="tagtd listofinvoicetype">';
+			$tmp = '<input type="radio" name="type" id="radio_situation" value="0" disabled> ';
+			$text = '<label>'.$tmp.$langs->trans("InvoiceSituationAsk").'</label> ';
+			$text .= '<span class="opacitymedium">('.$langs->trans("YouMustCreateInvoiceFromThird").')</span> ';
+			$desc = $form->textwithpicto($text, $langs->transnoentities("InvoiceFirstSituationDesc"), 1, 'help', '', 0, 3);
+			print $desc;
+			print '</div></div>';
+		}
 
-	    print '<div class="tagtr listofinvoicetype"><div class="tagtd listofinvoicetype">';
+		print '<div class="tagtr listofinvoicetype"><div class="tagtd listofinvoicetype">';
 		$tmp = '<input type="radio" name="type" id="radio_replacement" value="0" disabled> ';
 		$text = '<label>'.$tmp.$langs->trans("InvoiceReplacement").'</label> ';
 		$text .= '<span class="opacitymedium">('.$langs->trans("YouMustCreateInvoiceFromThird").')</span> ';
@@ -3263,8 +3275,8 @@ if ($action == 'create')
 				print '<br>&nbsp;&nbsp;&nbsp; <input type="checkbox" name="invoiceAvoirWithPaymentRestAmount" id="invoiceAvoirWithPaymentRestAmount" value="1" onclick="$(\'#credit_note_options input[type=checkbox]\').not(this).prop(\'checked\', false);" '.(GETPOST('invoiceAvoirWithPaymentRestAmount', 'int') > 0 ? 'checked' : '').' /> <label for="invoiceAvoirWithPaymentRestAmount">'.$langs->trans('invoiceAvoirWithPaymentRestAmount')."</label>";
 				print '</div>';
 
-    			print '</div></div>';
-    		}
+				print '</div></div>';
+			}
 		} else {
 			print '<div class="tagtr listofinvoicetype"><div class="tagtd listofinvoicetype">';
 			if (empty($conf->global->INVOICE_CREDIT_NOTE_STANDALONE)) $tmp = '<input type="radio" name="type" id="radio_creditnote" value="0" disabled> ';
@@ -3291,17 +3303,17 @@ if ($action == 'create')
 
 	if (!empty($conf->global->INVOICE_USE_DEFAULT_DOCUMENT)) // Hidden conf
 	{
-    	// Add auto select default document model
-    	$listtType = array(Facture::TYPE_STANDARD, Facture::TYPE_REPLACEMENT, Facture::TYPE_CREDIT_NOTE, Facture::TYPE_DEPOSIT, Facture::TYPE_SITUATION);
-    	$jsListType = '';
-    	foreach ($listtType as $type)
-    	{
-    	    $thisTypeConfName = 'FACTURE_ADDON_PDF_'.$type;
-    	    $curent = !empty($conf->global->{$thisTypeConfName}) ? $conf->global->{$thisTypeConfName}:$conf->global->FACTURE_ADDON_PDF;
-    	    $jsListType .= (!empty($jsListType) ? ',' : '').'"'.$type.'":"'.$curent.'"';
-    	}
+		// Add auto select default document model
+		$listtType = array(Facture::TYPE_STANDARD, Facture::TYPE_REPLACEMENT, Facture::TYPE_CREDIT_NOTE, Facture::TYPE_DEPOSIT, Facture::TYPE_SITUATION);
+		$jsListType = '';
+		foreach ($listtType as $type)
+		{
+			$thisTypeConfName = 'FACTURE_ADDON_PDF_'.$type;
+			$curent = !empty($conf->global->{$thisTypeConfName}) ? $conf->global->{$thisTypeConfName}:$conf->global->FACTURE_ADDON_PDF;
+			$jsListType .= (!empty($jsListType) ? ',' : '').'"'.$type.'":"'.$curent.'"';
+		}
 
-    	print '<script type="text/javascript" language="javascript">
+		print '<script type="text/javascript" language="javascript">
         		$(document).ready(function() {
                     var listType = {'.$jsListType.'};
         			$("[name=\'type\'").change(function() {
@@ -3478,10 +3490,10 @@ if ($action == 'create')
 	$liste = ModelePDFFactures::liste_modeles($db);
 	if (!empty($conf->global->INVOICE_USE_DEFAULT_DOCUMENT)) {
 		// Hidden conf
-	    $paramkey = 'FACTURE_ADDON_PDF_'.$object->type;
-	    $curent = !empty($conf->global->$paramkey) ? $conf->global->$paramkey : $conf->global->FACTURE_ADDON_PDF;
+		$paramkey = 'FACTURE_ADDON_PDF_'.$object->type;
+		$curent = !empty($conf->global->$paramkey) ? $conf->global->$paramkey : $conf->global->FACTURE_ADDON_PDF;
 	} else {
-	    $curent = $conf->global->FACTURE_ADDON_PDF;
+		$curent = $conf->global->FACTURE_ADDON_PDF;
 	}
 	print $form->selectarray('model', $liste, $curent);
 	print "</td></tr>";
@@ -3618,7 +3630,7 @@ if ($action == 'create')
 
 	print "</table>\n";
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	// Button "Create Draft"
 	print '<div class="center">';
@@ -3761,18 +3773,18 @@ if ($action == 'create')
 
 	// Confirmation to remove invoice from cycle
 	if ($action == 'situationout') {
-	    $text = $langs->trans('ConfirmRemoveSituationFromCycle', $object->ref);
-	    $label = $langs->trans("ConfirmOuting");
-	    $formquestion = array();
-	    // remove situation from cycle
-	    if ($object->statut == Facture::STATUS_VALIDATED
-	        && $usercancreate
-	        && !$objectidnext
-	        && $object->is_last_in_cycle()
-	    	&& $usercanunvalidate
-	        )
-	    {
-	        $formconfirm = $form->formconfirm($_SERVER['PHP_SELF'].'?facid='.$object->id, $label, $text, 'confirm_situationout', $formquestion, "yes", 1);
+		$text = $langs->trans('ConfirmRemoveSituationFromCycle', $object->ref);
+		$label = $langs->trans("ConfirmOuting");
+		$formquestion = array();
+		// remove situation from cycle
+		if ($object->statut == Facture::STATUS_VALIDATED
+			&& $usercancreate
+			&& !$objectidnext
+			&& $object->is_last_in_cycle()
+			&& $usercanunvalidate
+			)
+		{
+			$formconfirm = $form->formconfirm($_SERVER['PHP_SELF'].'?facid='.$object->id, $label, $text, 'confirm_situationout', $formquestion, "yes", 1);
 		}
 	}
 
@@ -3973,7 +3985,7 @@ if ($action == 'create')
 		// Create an array for form
 		$formquestion = array(
 			array('type' => 'other', 'name' => 'socid', 'label' => $langs->trans("SelectThirdParty"), 'value' => $form->select_company($object->socid, 'socid', '(s.client=1 OR s.client=2 OR s.client=3)', 1)),
-		    array('type' => 'date', 'name' => 'newdate', 'label' => $langs->trans("Date"), 'value' => dol_now())
+			array('type' => 'date', 'name' => 'newdate', 'label' => $langs->trans("Date"), 'value' => dol_now())
 		);
 		// Ask confirmatio to clone
 		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?facid='.$object->id, $langs->trans('ToClone'), $langs->trans('ConfirmCloneInvoice', $object->ref), 'confirm_clone', $formquestion, 'yes', 1, 250);
@@ -4324,7 +4336,7 @@ if ($action == 'create')
 
 
 	if (!empty($object->retained_warranty) || !empty($conf->global->INVOICE_USE_RETAINED_WARRANTY)) {
-        $displayWarranty = true;
+		$displayWarranty = true;
 		if (!in_array($object->type, $retainedWarrantyInvoiceAvailableType) && empty($object->retained_warranty)) {
 			$displayWarranty = false;
 		}
@@ -4336,90 +4348,90 @@ if ($action == 'create')
 			print $langs->trans('RetainedWarranty');
 			print '</td>';
 			if ($action != 'editretainedwarranty' && $user->rights->facture->creer) {
-			    print '<td align="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editretainedwarranty&amp;facid='.$object->id.'">'.img_edit($langs->trans('setretainedwarranty'), 1).'</a></td>';
+				print '<td align="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editretainedwarranty&amp;facid='.$object->id.'">'.img_edit($langs->trans('setretainedwarranty'), 1).'</a></td>';
 			}
 
-		    print '</tr></table>';
-		    print '</td><td>';
-		    if ($action == 'editretainedwarranty')
-		    {
-		        print '<form  id="retained-warranty-form"  method="POST" action="'.$_SERVER['PHP_SELF'].'?facid='.$object->id.'">';
-		        print '<input type="hidden" name="action" value="setretainedwarranty">';
-		        print '<input type="hidden" name="token" value="'.newToken().'">';
-		        print '<input name="retained_warranty" type="number" step="0.01" min="0" max="100" value="'.$object->retained_warranty.'" >';
-		        print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-		        print '</form>';
-		    } else {
-		        print price($object->retained_warranty).'%';
-		    }
-		    print '</td></tr>';
+			print '</tr></table>';
+			print '</td><td>';
+			if ($action == 'editretainedwarranty')
+			{
+				print '<form  id="retained-warranty-form"  method="POST" action="'.$_SERVER['PHP_SELF'].'?facid='.$object->id.'">';
+				print '<input type="hidden" name="action" value="setretainedwarranty">';
+				print '<input type="hidden" name="token" value="'.newToken().'">';
+				print '<input name="retained_warranty" type="number" step="0.01" min="0" max="100" value="'.$object->retained_warranty.'" >';
+				print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+				print '</form>';
+			} else {
+				print price($object->retained_warranty).'%';
+			}
+			print '</td></tr>';
 
-		    // Retained warranty payment term
-		    print '<tr class="retained-warranty-lines"  ><td>';
-		    print '<table id="retained-warranty-cond-reglement-table"  class="nobordernopadding" width="100%"><tr><td>';
-		    print $langs->trans('PaymentConditionsShortRetainedWarranty');
-		    print '</td>';
-		    if ($action != 'editretainedwarrantypaymentterms' && $user->rights->facture->creer) {
-		        print '<td align="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editretainedwarrantypaymentterms&amp;facid='.$object->id.'">'.img_edit($langs->trans('setPaymentConditionsShortRetainedWarranty'), 1).'</a></td>';
-		    }
+			// Retained warranty payment term
+			print '<tr class="retained-warranty-lines"  ><td>';
+			print '<table id="retained-warranty-cond-reglement-table"  class="nobordernopadding" width="100%"><tr><td>';
+			print $langs->trans('PaymentConditionsShortRetainedWarranty');
+			print '</td>';
+			if ($action != 'editretainedwarrantypaymentterms' && $user->rights->facture->creer) {
+				print '<td align="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editretainedwarrantypaymentterms&amp;facid='.$object->id.'">'.img_edit($langs->trans('setPaymentConditionsShortRetainedWarranty'), 1).'</a></td>';
+			}
 
-		    print '</tr></table>';
-		    print '</td><td>';
-		    $defaultDate = !empty($object->retained_warranty_date_limit) ? $object->retained_warranty_date_limit : strtotime('-1 years', $object->date_lim_reglement);
-		    if ($object->date > $defaultDate) {
-		        $defaultDate = $object->date;
-		    }
+			print '</tr></table>';
+			print '</td><td>';
+			$defaultDate = !empty($object->retained_warranty_date_limit) ? $object->retained_warranty_date_limit : strtotime('-1 years', $object->date_lim_reglement);
+			if ($object->date > $defaultDate) {
+				$defaultDate = $object->date;
+			}
 
-		    if ($action == 'editretainedwarrantypaymentterms')
-		    {
-		        //date('Y-m-d',$object->date_lim_reglement)
-		        print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'?facid='.$object->id.'">';
-		        print '<input type="hidden" name="action" value="setretainedwarrantyconditions">';
-		        print '<input type="hidden" name="token" value="'.newToken().'">';
-		        $retained_warranty_fk_cond_reglement = GETPOST('retained_warranty_fk_cond_reglement', 'int');
-		        $retained_warranty_fk_cond_reglement = !empty($retained_warranty_fk_cond_reglement) ? $retained_warranty_fk_cond_reglement : $object->retained_warranty_fk_cond_reglement;
-		        $retained_warranty_fk_cond_reglement = !empty($retained_warranty_fk_cond_reglement) ? $retained_warranty_fk_cond_reglement : $conf->global->INVOICE_SITUATION_DEFAULT_RETAINED_WARRANTY_COND_ID;
-		        $form->select_conditions_paiements($retained_warranty_fk_cond_reglement, 'retained_warranty_fk_cond_reglement', -1, 1);
-		        print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-		        print '</form>';
-		    } else {
-		        $form->form_conditions_reglement($_SERVER['PHP_SELF'].'?facid='.$object->id, $object->retained_warranty_fk_cond_reglement, 'none');
-		        if (!$displayWarranty) {
-		            print img_picto($langs->trans('RetainedWarrantyNeed100Percent'), 'warning.png', 'class="pictowarning valignmiddle" ');
-		        }
-		    }
-		    print '</td></tr>';
+			if ($action == 'editretainedwarrantypaymentterms')
+			{
+				//date('Y-m-d',$object->date_lim_reglement)
+				print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'?facid='.$object->id.'">';
+				print '<input type="hidden" name="action" value="setretainedwarrantyconditions">';
+				print '<input type="hidden" name="token" value="'.newToken().'">';
+				$retained_warranty_fk_cond_reglement = GETPOST('retained_warranty_fk_cond_reglement', 'int');
+				$retained_warranty_fk_cond_reglement = !empty($retained_warranty_fk_cond_reglement) ? $retained_warranty_fk_cond_reglement : $object->retained_warranty_fk_cond_reglement;
+				$retained_warranty_fk_cond_reglement = !empty($retained_warranty_fk_cond_reglement) ? $retained_warranty_fk_cond_reglement : $conf->global->INVOICE_SITUATION_DEFAULT_RETAINED_WARRANTY_COND_ID;
+				$form->select_conditions_paiements($retained_warranty_fk_cond_reglement, 'retained_warranty_fk_cond_reglement', -1, 1);
+				print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+				print '</form>';
+			} else {
+				$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?facid='.$object->id, $object->retained_warranty_fk_cond_reglement, 'none');
+				if (!$displayWarranty) {
+					print img_picto($langs->trans('RetainedWarrantyNeed100Percent'), 'warning.png', 'class="pictowarning valignmiddle" ');
+				}
+			}
+			print '</td></tr>';
 
-            // Retained Warranty payment date limit
-            print '<tr class="retained-warranty-lines"  ><td>';
-            print '<table id="retained-warranty-date-limit-table"  class="nobordernopadding" width="100%"><tr><td>';
-            print $langs->trans('RetainedWarrantyDateLimit');
-            print '</td>';
-            if ($action != 'editretainedwarrantydatelimit' && $user->rights->facture->creer) {
-                print '<td align="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editretainedwarrantydatelimit&amp;facid='.$object->id.'">'.img_edit($langs->trans('setretainedwarrantyDateLimit'), 1).'</a></td>';
-            }
+			// Retained Warranty payment date limit
+			print '<tr class="retained-warranty-lines"  ><td>';
+			print '<table id="retained-warranty-date-limit-table"  class="nobordernopadding" width="100%"><tr><td>';
+			print $langs->trans('RetainedWarrantyDateLimit');
+			print '</td>';
+			if ($action != 'editretainedwarrantydatelimit' && $user->rights->facture->creer) {
+				print '<td align="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editretainedwarrantydatelimit&amp;facid='.$object->id.'">'.img_edit($langs->trans('setretainedwarrantyDateLimit'), 1).'</a></td>';
+			}
 
-            print '</tr></table>';
-            print '</td><td>';
-            $defaultDate = !empty($object->retained_warranty_date_limit) ? $object->retained_warranty_date_limit : strtotime('-1 years', $object->date_lim_reglement);
-            if ($object->date > $defaultDate) {
-                $defaultDate = $object->date;
-            }
+			print '</tr></table>';
+			print '</td><td>';
+			$defaultDate = !empty($object->retained_warranty_date_limit) ? $object->retained_warranty_date_limit : strtotime('-1 years', $object->date_lim_reglement);
+			if ($object->date > $defaultDate) {
+				$defaultDate = $object->date;
+			}
 
-            if ($action == 'editretainedwarrantydatelimit')
-            {
-                //date('Y-m-d',$object->date_lim_reglement)
-                print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'?facid='.$object->id.'">';
-                print '<input type="hidden" name="action" value="setretainedwarrantydatelimit">';
-                print '<input type="hidden" name="token" value="'.newToken().'">';
-                print '<input name="retained_warranty_date_limit" type="date" step="1" min="'.dol_print_date($object->date, '%Y-%m-%d').'" value="'.dol_print_date($defaultDate, '%Y-%m-%d').'" >';
-                print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-                print '</form>';
-            } else {
-                print dol_print_date($object->retained_warranty_date_limit, 'day');
-            }
-            print '</td></tr>';
-        }
+			if ($action == 'editretainedwarrantydatelimit')
+			{
+				//date('Y-m-d',$object->date_lim_reglement)
+				print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'?facid='.$object->id.'">';
+				print '<input type="hidden" name="action" value="setretainedwarrantydatelimit">';
+				print '<input type="hidden" name="token" value="'.newToken().'">';
+				print '<input name="retained_warranty_date_limit" type="date" step="1" min="'.dol_print_date($object->date, '%Y-%m-%d').'" value="'.dol_print_date($defaultDate, '%Y-%m-%d').'" >';
+				print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+				print '</form>';
+			} else {
+				print dol_print_date($object->retained_warranty_date_limit, 'day');
+			}
+			print '</td></tr>';
+		}
 	}
 
 
@@ -4438,7 +4450,7 @@ if ($action == 'create')
 
 	$sign = 1;
 	if (!empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE_SCREEN) && $object->type == $object::TYPE_CREDIT_NOTE) {
-		$sign = -1;	// We invert sign for output
+		$sign = -1; // We invert sign for output
 	}
 
 	if (!empty($conf->multicurrency->enabled) && ($object->multicurrency_code != $conf->currency))
@@ -4561,84 +4573,84 @@ if ($action == 'create')
 	// List of previous situation invoices
 	if (($object->situation_cycle_ref > 0) && !empty($conf->global->INVOICE_USE_SITUATION))
 	{
-	    print '<table class="noborder situationstable" width="100%">';
+		print '<table class="noborder situationstable" width="100%">';
 
 
-	    print '<tr class="liste_titre">';
-	    print '<td>'.$langs->trans('ListOfSituationInvoices').'</td>';
-	    print '<td></td>';
-	    print '<td class="center">'.$langs->trans('Situation').'</td>';
-	    if (!empty($conf->banque->enabled)) print '<td class="right"></td>';
-	    print '<td class="right">'.$langs->trans('AmountHT').'</td>';
-	    print '<td class="right">'.$langs->trans('AmountTTC').'</td>';
-	    print '<td width="18">&nbsp;</td>';
-	    print '</tr>';
+		print '<tr class="liste_titre">';
+		print '<td>'.$langs->trans('ListOfSituationInvoices').'</td>';
+		print '<td></td>';
+		print '<td class="center">'.$langs->trans('Situation').'</td>';
+		if (!empty($conf->banque->enabled)) print '<td class="right"></td>';
+		print '<td class="right">'.$langs->trans('AmountHT').'</td>';
+		print '<td class="right">'.$langs->trans('AmountTTC').'</td>';
+		print '<td width="18">&nbsp;</td>';
+		print '</tr>';
 
 
-	    $total_prev_ht = $total_prev_ttc = 0;
-	    $total_global_ht = $total_global_ttc = 0;
+		$total_prev_ht = $total_prev_ttc = 0;
+		$total_global_ht = $total_global_ttc = 0;
 
-	    if (count($object->tab_previous_situation_invoice) > 0) {
-	        // List of previous invoices
+		if (count($object->tab_previous_situation_invoice) > 0) {
+			// List of previous invoices
 
-	        $current_situation_counter = array();
-	        foreach ($object->tab_previous_situation_invoice as $prev_invoice) {
-	            $tmptotalpaidforthisinvoice = $prev_invoice->getSommePaiement();
-	            $total_prev_ht += $prev_invoice->total_ht;
-	            $total_prev_ttc += $prev_invoice->total_ttc;
-	            $current_situation_counter[] = (($prev_invoice->type == Facture::TYPE_CREDIT_NOTE) ?-1 : 1) * $prev_invoice->situation_counter;
-	            print '<tr class="oddeven">';
-	            print '<td>'.$prev_invoice->getNomUrl(1).'</td>';
-	            print '<td></td>';
-	            print '<td align="center" >'.(($prev_invoice->type == Facture::TYPE_CREDIT_NOTE) ? $langs->trans('situationInvoiceShortcode_AS') : $langs->trans('situationInvoiceShortcode_S')).$prev_invoice->situation_counter.'</td>';
-	            if (!empty($conf->banque->enabled)) print '<td class="right"></td>';
-	            print '<td class="right">'.price($prev_invoice->total_ht).'</td>';
-	            print '<td class="right">'.price($prev_invoice->total_ttc).'</td>';
-	            print '<td class="right">'.$prev_invoice->getLibStatut(3, $tmptotalpaidforthisinvoice).'</td>';
-	            print '</tr>';
-	        }
-	    }
+			$current_situation_counter = array();
+			foreach ($object->tab_previous_situation_invoice as $prev_invoice) {
+				$tmptotalpaidforthisinvoice = $prev_invoice->getSommePaiement();
+				$total_prev_ht += $prev_invoice->total_ht;
+				$total_prev_ttc += $prev_invoice->total_ttc;
+				$current_situation_counter[] = (($prev_invoice->type == Facture::TYPE_CREDIT_NOTE) ?-1 : 1) * $prev_invoice->situation_counter;
+				print '<tr class="oddeven">';
+				print '<td>'.$prev_invoice->getNomUrl(1).'</td>';
+				print '<td></td>';
+				print '<td align="center" >'.(($prev_invoice->type == Facture::TYPE_CREDIT_NOTE) ? $langs->trans('situationInvoiceShortcode_AS') : $langs->trans('situationInvoiceShortcode_S')).$prev_invoice->situation_counter.'</td>';
+				if (!empty($conf->banque->enabled)) print '<td class="right"></td>';
+				print '<td class="right">'.price($prev_invoice->total_ht).'</td>';
+				print '<td class="right">'.price($prev_invoice->total_ttc).'</td>';
+				print '<td class="right">'.$prev_invoice->getLibStatut(3, $tmptotalpaidforthisinvoice).'</td>';
+				print '</tr>';
+			}
+		}
 
 
-	    $total_global_ht += $total_prev_ht;
-	    $total_global_ttc += $total_prev_ttc;
-	    $total_global_ht += $object->total_ht;
-	    $total_global_ttc += $object->total_ttc;
-	    $current_situation_counter[] = (($object->type == Facture::TYPE_CREDIT_NOTE) ?-1 : 1) * $object->situation_counter;
-	    print '<tr class="oddeven">';
-	    print '<td>'.$object->getNomUrl(1).'</td>';
-	    print '<td></td>';
-	    print '<td class="center">'.(($object->type == Facture::TYPE_CREDIT_NOTE) ? $langs->trans('situationInvoiceShortcode_AS') : $langs->trans('situationInvoiceShortcode_S')).$object->situation_counter.'</td>';
-	    if (!empty($conf->banque->enabled)) print '<td class="right"></td>';
-	    print '<td class="right">'.price($object->total_ht).'</td>';
-	    print '<td class="right">'.price($object->total_ttc).'</td>';
-	    print '<td class="right">'.$object->getLibStatut(3, $object->getSommePaiement()).'</td>';
-	    print '</tr>';
+		$total_global_ht += $total_prev_ht;
+		$total_global_ttc += $total_prev_ttc;
+		$total_global_ht += $object->total_ht;
+		$total_global_ttc += $object->total_ttc;
+		$current_situation_counter[] = (($object->type == Facture::TYPE_CREDIT_NOTE) ?-1 : 1) * $object->situation_counter;
+		print '<tr class="oddeven">';
+		print '<td>'.$object->getNomUrl(1).'</td>';
+		print '<td></td>';
+		print '<td class="center">'.(($object->type == Facture::TYPE_CREDIT_NOTE) ? $langs->trans('situationInvoiceShortcode_AS') : $langs->trans('situationInvoiceShortcode_S')).$object->situation_counter.'</td>';
+		if (!empty($conf->banque->enabled)) print '<td class="right"></td>';
+		print '<td class="right">'.price($object->total_ht).'</td>';
+		print '<td class="right">'.price($object->total_ttc).'</td>';
+		print '<td class="right">'.$object->getLibStatut(3, $object->getSommePaiement()).'</td>';
+		print '</tr>';
 
 
-	    print '<tr class="oddeven">';
-	    print '<td colspan="2" class="left"><b>'.$langs->trans('CurrentSituationTotal').'</b></td>';
-	    print '<td>';
-	    $i = 0;
-	    foreach ($current_situation_counter as $sit)
-	    {
-	        $curSign = $sit > 0 ? '+' : '-';
-	        $curType = $sit > 0 ? $langs->trans('situationInvoiceShortcode_S') : $langs->trans('situationInvoiceShortcode_AS');
-	        if ($i > 0) print ' '.$curSign.' ';
-	        print $curType.abs($sit);
-	        $i++;
-	    }
-	    print '</td>';
-	    if (!empty($conf->banque->enabled)) print '<td></td>';
-	    print '<td class="right"><b>'.price($total_global_ht).'</b></td>';
-	    print '<td class="right"><b>'.price($total_global_ttc).'</b></td>';
-	    print '<td width="18">&nbsp;</td>';
-	    print '</tr>';
+		print '<tr class="oddeven">';
+		print '<td colspan="2" class="left"><b>'.$langs->trans('CurrentSituationTotal').'</b></td>';
+		print '<td>';
+		$i = 0;
+		foreach ($current_situation_counter as $sit)
+		{
+			$curSign = $sit > 0 ? '+' : '-';
+			$curType = $sit > 0 ? $langs->trans('situationInvoiceShortcode_S') : $langs->trans('situationInvoiceShortcode_AS');
+			if ($i > 0) print ' '.$curSign.' ';
+			print $curType.abs($sit);
+			$i++;
+		}
+		print '</td>';
+		if (!empty($conf->banque->enabled)) print '<td></td>';
+		print '<td class="right"><b>'.price($total_global_ht).'</b></td>';
+		print '<td class="right"><b>'.price($total_global_ttc).'</b></td>';
+		print '<td width="18">&nbsp;</td>';
+		print '</tr>';
 
 
-	    if (count($object->tab_next_situation_invoice) > 0) {
-	        // List of next invoices
-	        /*print '<tr class="liste_titre">';
+		if (count($object->tab_next_situation_invoice) > 0) {
+			// List of next invoices
+			/*print '<tr class="liste_titre">';
 	         print '<td>' . $langs->trans('ListOfNextSituationInvoices') . '</td>';
 	         print '<td></td>';
 	         print '<td></td>';
@@ -4648,37 +4660,37 @@ if ($action == 'create')
 	         print '<td width="18">&nbsp;</td>';
 	         print '</tr>';*/
 
-	        $total_next_ht = $total_next_ttc = 0;
+			$total_next_ht = $total_next_ttc = 0;
 
-	        foreach ($object->tab_next_situation_invoice as $next_invoice) {
-	            $totalpaye = $next_invoice->getSommePaiement();
-	            $total_next_ht += $next_invoice->total_ht;
-	            $total_next_ttc += $next_invoice->total_ttc;
+			foreach ($object->tab_next_situation_invoice as $next_invoice) {
+				$totalpaye = $next_invoice->getSommePaiement();
+				$total_next_ht += $next_invoice->total_ht;
+				$total_next_ttc += $next_invoice->total_ttc;
 
-	            print '<tr class="oddeven">';
-	            print '<td>'.$next_invoice->getNomUrl(1).'</td>';
-	            print '<td></td>';
-	            print '<td class="center">'.(($next_invoice->type == Facture::TYPE_CREDIT_NOTE) ? $langs->trans('situationInvoiceShortcode_AS') : $langs->trans('situationInvoiceShortcode_S')).$next_invoice->situation_counter.'</td>';
-	            if (!empty($conf->banque->enabled)) print '<td class="right"></td>';
-	            print '<td class="right">'.price($next_invoice->total_ht).'</td>';
-	            print '<td class="right">'.price($next_invoice->total_ttc).'</td>';
-	            print '<td class="right">'.$next_invoice->getLibStatut(3, $totalpaye).'</td>';
-	            print '</tr>';
-	        }
+				print '<tr class="oddeven">';
+				print '<td>'.$next_invoice->getNomUrl(1).'</td>';
+				print '<td></td>';
+				print '<td class="center">'.(($next_invoice->type == Facture::TYPE_CREDIT_NOTE) ? $langs->trans('situationInvoiceShortcode_AS') : $langs->trans('situationInvoiceShortcode_S')).$next_invoice->situation_counter.'</td>';
+				if (!empty($conf->banque->enabled)) print '<td class="right"></td>';
+				print '<td class="right">'.price($next_invoice->total_ht).'</td>';
+				print '<td class="right">'.price($next_invoice->total_ttc).'</td>';
+				print '<td class="right">'.$next_invoice->getLibStatut(3, $totalpaye).'</td>';
+				print '</tr>';
+			}
 
-	        $total_global_ht += $total_next_ht;
-	        $total_global_ttc += $total_next_ttc;
+			$total_global_ht += $total_next_ht;
+			$total_global_ttc += $total_next_ttc;
 
-	        print '<tr class="oddeven">';
-	        print '<td colspan="3" class="right"></td>';
-	        if (!empty($conf->banque->enabled)) print '<td class="right"></td>';
-	        print '<td class="right"><b>'.price($total_global_ht).'</b></td>';
-	        print '<td class="right"><b>'.price($total_global_ttc).'</b></td>';
-	        print '<td width="18">&nbsp;</td>';
-	        print '</tr>';
-	    }
+			print '<tr class="oddeven">';
+			print '<td colspan="3" class="right"></td>';
+			if (!empty($conf->banque->enabled)) print '<td class="right"></td>';
+			print '<td class="right"><b>'.price($total_global_ht).'</b></td>';
+			print '<td class="right"><b>'.price($total_global_ttc).'</b></td>';
+			print '<td width="18">&nbsp;</td>';
+			print '</tr>';
+		}
 
-	    print '</table>';
+		print '</table>';
 	}
 
 	$sign = 1;
@@ -4867,31 +4879,31 @@ if ($action == 'create')
 		print '<tr><td colspan="'.$nbcols.'" class="right">';
 		print $langs->trans('RemainderToPay');
 		if ($resteapayeraffiche < 0)
-		    print ' ('.$langs->trans('ExcessReceived').')';
+			print ' ('.$langs->trans('ExcessReceived').')';
 		print ' :</td>';
 		print '<td class="right'.($resteapayeraffiche ? ' amountremaintopay' : (' '.$cssforamountpaymentcomplete)).'">'.price($resteapayeraffiche).'</td>';
 		print '<td class="nowrap">&nbsp;</td></tr>';
 
 		// Retained warranty : usualy use on construction industry
 		if (!empty($object->situation_final) && !empty($object->retained_warranty) && $displayWarranty) {
-		    // Billed - retained warranty
-		    if ($object->type == Facture::TYPE_SITUATION)
-		    {
-		        $retainedWarranty = $total_global_ttc * $object->retained_warranty / 100;
-		    } else {
-		        // Because one day retained warranty could be used on standard invoices
-		        $retainedWarranty = $object->total_ttc * $object->retained_warranty / 100;
-		    }
+			// Billed - retained warranty
+			if ($object->type == Facture::TYPE_SITUATION)
+			{
+				$retainedWarranty = $total_global_ttc * $object->retained_warranty / 100;
+			} else {
+				// Because one day retained warranty could be used on standard invoices
+				$retainedWarranty = $object->total_ttc * $object->retained_warranty / 100;
+			}
 
-		    $billedWithRetainedWarranty = $object->total_ttc - $retainedWarranty;
+			$billedWithRetainedWarranty = $object->total_ttc - $retainedWarranty;
 
-		    print '<tr><td colspan="'.$nbcols.'" align="right">'.$langs->trans("ToPayOn", dol_print_date($object->date_lim_reglement, 'day')).' :</td><td align="right">'.price($billedWithRetainedWarranty).'</td><td>&nbsp;</td></tr>';
+			print '<tr><td colspan="'.$nbcols.'" align="right">'.$langs->trans("ToPayOn", dol_print_date($object->date_lim_reglement, 'day')).' :</td><td align="right">'.price($billedWithRetainedWarranty).'</td><td>&nbsp;</td></tr>';
 
-		    // retained warranty
-		    print '<tr><td colspan="'.$nbcols.'" align="right">';
-		    print $langs->trans("RetainedWarranty").' ('.$object->retained_warranty.'%)';
-		    print !empty($object->retained_warranty_date_limit) ? ' '.$langs->trans("ToPayOn", dol_print_date($object->retained_warranty_date_limit, 'day')) : '';
-		    print ' :</td><td align="right">'.price($retainedWarranty).'</td><td>&nbsp;</td></tr>';
+			// retained warranty
+			print '<tr><td colspan="'.$nbcols.'" align="right">';
+			print $langs->trans("RetainedWarranty").' ('.$object->retained_warranty.'%)';
+			print !empty($object->retained_warranty_date_limit) ? ' '.$langs->trans("ToPayOn", dol_print_date($object->retained_warranty_date_limit, 'day')) : '';
+			print ' :</td><td align="right">'.price($retainedWarranty).'</td><td>&nbsp;</td></tr>';
 		}
 	} else // Credit note
 	{
@@ -4954,7 +4966,7 @@ if ($action == 'create')
 	{
 		if ($object->situation_cycle_ref && $object->statut == 0)
 		{
-		    print '<!-- Area to change globally the situation percent -->'."\n";
+			print '<!-- Area to change globally the situation percent -->'."\n";
 			print '<div class="div-table-responsive">';
 
 			print '<form name="updatealllines" id="updatealllines" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'#updatealllines" method="POST">';
@@ -4978,7 +4990,7 @@ if ($action == 'create')
 			print '<tr class="nodrag nodrop">';
 			// Adds a line numbering column
 			if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) {
-			    print '<td align="center" width="5">&nbsp;</td>';
+				print '<td align="center" width="5">&nbsp;</td>';
 			}
 			print '<td>&nbsp;</td>';
 			print '<td class="nowrap right"><input type="text" size="1" value="" name="all_progress">%</td>';
@@ -5015,7 +5027,7 @@ if ($action == 'create')
 	// Form to add new line
 	if ($object->statut == 0 && $usercancreate && $action != 'valid' && $action != 'editline')
 	{
-	    if ($action != 'editline' && $action != 'selectlines')
+		if ($action != 'editline' && $action != 'selectlines')
 		{
 			// Add free products/services
 			$object->formAddObjectLine(1, $mysoc, $soc);
@@ -5030,7 +5042,7 @@ if ($action == 'create')
 
 	print "</form>\n";
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 
 	// Actions buttons
@@ -5081,7 +5093,7 @@ if ($action == 'create')
 				&& ($object->statut == Facture::STATUS_CLOSED || $object->statut == Facture::STATUS_ABANDONED || ($object->statut == 1 && $object->paye == 1))   // Condition ($object->statut == 1 && $object->paye == 1) should not happened but can be found due to corrupted data
 				&& ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $usercancreate) || $usercanreopen))				// A paid invoice (partially or completely)
 			{
-			    if ($object->close_code != 'replaced' || (!$objectidnext)) 				// Not replaced by another invoice or replaced but the replacement invoice has been deleted
+				if ($object->close_code != 'replaced' || (!$objectidnext)) 				// Not replaced by another invoice or replaced but the replacement invoice has been deleted
 				{
 					print '<a class="butAction'.($conf->use_javascript_ajax ? ' reposition' : '').'" href="'.$_SERVER['PHP_SELF'].'?facid='.$object->id.'&amp;action=reopen">'.$langs->trans('ReOpen').'</a>';
 				} else {
@@ -5134,9 +5146,9 @@ if ($action == 'create')
 			// POS Ticket
 			if (!empty($conf->takepos->enabled) && $object->module_source == 'takepos')
 			{
-			    $langs->load("cashdesk");
-			    $receipt_url = DOL_URL_ROOT."/takepos/receipt.php";
-			    print '<a target="_blank" class="butAction" href="'.$receipt_url.'?facid='.$object->id.'">'.$langs->trans('POSTicket').'</a>';
+				$langs->load("cashdesk");
+				$receipt_url = DOL_URL_ROOT."/takepos/receipt.php";
+				print '<a target="_blank" class="butAction" href="'.$receipt_url.'?facid='.$object->id.'">'.$langs->trans('POSTicket').'</a>';
 			}
 
 			// Create payment
@@ -5224,19 +5236,19 @@ if ($action == 'create')
 			// For situation invoice with excess received
 			if ($object->statut > Facture::STATUS_DRAFT
 				&& $object->type == Facture::TYPE_SITUATION
-			    && ($object->total_ttc - $totalpaye - $totalcreditnotes - $totaldeposits) > 0
-			    && $usercancreate
-			    && !$objectidnext
-			    && $object->is_last_in_cycle()
-			    && $conf->global->INVOICE_USE_SITUATION_CREDIT_NOTE
-			    )
+				&& ($object->total_ttc - $totalpaye - $totalcreditnotes - $totaldeposits) > 0
+				&& $usercancreate
+				&& !$objectidnext
+				&& $object->is_last_in_cycle()
+				&& $conf->global->INVOICE_USE_SITUATION_CREDIT_NOTE
+				)
 			{
 				if ($usercanunvalidate)
-			    {
-			        print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?socid='.$object->socid.'&amp;fac_avoir='.$object->id.'&amp;invoiceAvoirWithLines=1&amp;action=create&amp;type=2'.($object->fk_project > 0 ? '&amp;projectid='.$object->fk_project : '').'">'.$langs->trans("CreateCreditNote").'</a>';
-			    } else {
-			        print '<span class="butActionRefused classfortooltip" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans("CreateCreditNote").'</span>';
-			    }
+				{
+					print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?socid='.$object->socid.'&amp;fac_avoir='.$object->id.'&amp;invoiceAvoirWithLines=1&amp;action=create&amp;type=2'.($object->fk_project > 0 ? '&amp;projectid='.$object->fk_project : '').'">'.$langs->trans("CreateCreditNote").'</a>';
+				} else {
+					print '<span class="butActionRefused classfortooltip" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans("CreateCreditNote").'</span>';
+				}
 			}
 
 			// Clone
@@ -5256,20 +5268,20 @@ if ($action == 'create')
 
 			// Remove situation from cycle
 			if ($object->statut > Facture::STATUS_DRAFT
-			    && $object->type == Facture::TYPE_SITUATION
-			    && $usercancreate
-			    && !$objectidnext
-			    && $object->situation_counter > 1
-			    && $object->is_last_in_cycle()
+				&& $object->type == Facture::TYPE_SITUATION
+				&& $usercancreate
+				&& !$objectidnext
+				&& $object->situation_counter > 1
+				&& $object->is_last_in_cycle()
 				&& $usercanunvalidate
-			    )
+				)
 			{
-			    if (($object->total_ttc - $totalcreditnotes) == 0)
-			    {
-			        print '<a id="butSituationOut" class="butAction" href="'.$_SERVER['PHP_SELF'].'?facid='.$object->id.'&amp;action=situationout">'.$langs->trans("RemoveSituationFromCycle").'</a>';
-			    } else {
-			        print '<a id="butSituationOutRefused" class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("DisabledBecauseNotEnouthCreditNote").'" >'.$langs->trans("RemoveSituationFromCycle").'</a>';
-			    }
+				if (($object->total_ttc - $totalcreditnotes) == 0)
+				{
+					print '<a id="butSituationOut" class="butAction" href="'.$_SERVER['PHP_SELF'].'?facid='.$object->id.'&amp;action=situationout">'.$langs->trans("RemoveSituationFromCycle").'</a>';
+				} else {
+					print '<a id="butSituationOutRefused" class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("DisabledBecauseNotEnouthCreditNote").'" >'.$langs->trans("RemoveSituationFromCycle").'</a>';
+				}
 			}
 
 			// Create next situation invoice
@@ -5340,10 +5352,10 @@ if ($action == 'create')
 
 		$compatibleImportElementsList = false;
 		if ($usercancreate
-		    && $object->statut == Facture::STATUS_DRAFT
-		    && ($object->type == Facture::TYPE_STANDARD || $object->type == Facture::TYPE_REPLACEMENT || $object->type == Facture::TYPE_DEPOSIT || $object->type == Facture::TYPE_PROFORMA || $object->type == Facture::TYPE_SITUATION))
+			&& $object->statut == Facture::STATUS_DRAFT
+			&& ($object->type == Facture::TYPE_STANDARD || $object->type == Facture::TYPE_REPLACEMENT || $object->type == Facture::TYPE_DEPOSIT || $object->type == Facture::TYPE_PROFORMA || $object->type == Facture::TYPE_SITUATION))
 		{
-		    $compatibleImportElementsList = array('commande', 'propal'); // import from linked elements
+			$compatibleImportElementsList = array('commande', 'propal'); // import from linked elements
 		}
 		$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem, $compatibleImportElementsList);
 
diff --git a/htdocs/compta/facture/class/api_invoices.class.php b/htdocs/compta/facture/class/api_invoices.class.php
index 85ad01ab7a6..19a5c8c287b 100644
--- a/htdocs/compta/facture/class/api_invoices.class.php
+++ b/htdocs/compta/facture/class/api_invoices.class.php
@@ -482,1202 +482,1202 @@ class Invoices extends DolibarrApi
 	 * @url	DELETE {id}/contact/{contactid}/{type}
 	 *
 	 * @return array
-  	 *
-     * @throws RestException 401
-     * @throws RestException 404
-     * @throws RestException 500
+	 *
+	 * @throws RestException 401
+	 * @throws RestException 404
+	 * @throws RestException 500
 	 */
-    public function deleteContact($id, $contactid, $type)
-    {
-        if (!DolibarrApiAccess::$user->rights->facture->creer) {
-            throw new RestException(401);
-        }
+	public function deleteContact($id, $contactid, $type)
+	{
+		if (!DolibarrApiAccess::$user->rights->facture->creer) {
+			throw new RestException(401);
+		}
 
-        $result = $this->invoice->fetch($id);
+		$result = $this->invoice->fetch($id);
 
 		if (!$result) {
 			throw new RestException(404, 'Invoice not found');
 		}
 
-        if (!DolibarrApi::_checkAccessToResource('invoice', $this->invoice->id)) {
+		if (!DolibarrApi::_checkAccessToResource('invoice', $this->invoice->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
-        $contacts = $this->invoice->liste_contact();
+		$contacts = $this->invoice->liste_contact();
 
 		foreach ($contacts as $contact) {
 			if ($contact['id'] == $contactid && $contact['code'] == $type) {
-		        $result = $this->invoice->delete_contact($contact['rowid']);
+				$result = $this->invoice->delete_contact($contact['rowid']);
 
-		        if (!$result) {
-                    throw new RestException(500, 'Error when deleted the contact');
-                }
-		    }
+				if (!$result) {
+					throw new RestException(500, 'Error when deleted the contact');
+				}
+			}
 		}
 
-        return $this->_cleanObjectDatas($this->invoice);
-    }
+		return $this->_cleanObjectDatas($this->invoice);
+	}
 
-    /**
-     * Deletes a line of a given invoice
-     *
-     * @param int   $id             Id of invoice
-     * @param int   $lineid 		Id of the line to delete
-     *
-     * @url     DELETE {id}/lines/{lineid}
-     *
-     * @return array
-     *
-     * @throws RestException 400
-     * @throws RestException 401
-     * @throws RestException 404
-     * @throws RestException 405
-     */
-    public function deleteLine($id, $lineid)
-    {
+	/**
+	 * Deletes a line of a given invoice
+	 *
+	 * @param int   $id             Id of invoice
+	 * @param int   $lineid 		Id of the line to delete
+	 *
+	 * @url     DELETE {id}/lines/{lineid}
+	 *
+	 * @return array
+	 *
+	 * @throws RestException 400
+	 * @throws RestException 401
+	 * @throws RestException 404
+	 * @throws RestException 405
+	 */
+	public function deleteLine($id, $lineid)
+	{
 
-    	if (!DolibarrApiAccess::$user->rights->facture->creer) {
-    		throw new RestException(401);
-    	}
-    	if (empty($lineid)) {
-    		throw new RestException(400, 'Line ID is mandatory');
-    	}
+		if (!DolibarrApiAccess::$user->rights->facture->creer) {
+			throw new RestException(401);
+		}
+		if (empty($lineid)) {
+			throw new RestException(400, 'Line ID is mandatory');
+		}
 
-    	if (!DolibarrApi::_checkAccessToResource('facture', $id)) {
-    		throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-    	}
+		if (!DolibarrApi::_checkAccessToResource('facture', $id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-    	$result = $this->invoice->fetch($id);
-    	if (!$result) {
-    		throw new RestException(404, 'Invoice not found');
-    	}
+		$result = $this->invoice->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Invoice not found');
+		}
 
-    	// TODO Check the lineid $lineid is a line of ojbect
+		// TODO Check the lineid $lineid is a line of ojbect
 
-    	$updateRes = $this->invoice->deleteline($lineid);
-    	if ($updateRes > 0) {
-    		return $this->get($id);
-    	} else {
-    		throw new RestException(405, $this->invoice->error);
-    	}
-    }
+		$updateRes = $this->invoice->deleteline($lineid);
+		if ($updateRes > 0) {
+			return $this->get($id);
+		} else {
+			throw new RestException(405, $this->invoice->error);
+		}
+	}
 
-    /**
-     * Update invoice
-     *
-     * @param int   $id             Id of invoice to update
-     * @param array $request_data   Datas
-     * @return int
-     */
-    public function put($id, $request_data = null)
-    {
-        if (!DolibarrApiAccess::$user->rights->facture->creer) {
+	/**
+	 * Update invoice
+	 *
+	 * @param int   $id             Id of invoice to update
+	 * @param array $request_data   Datas
+	 * @return int
+	 */
+	public function put($id, $request_data = null)
+	{
+		if (!DolibarrApiAccess::$user->rights->facture->creer) {
 			throw new RestException(401);
 		}
 
-        $result = $this->invoice->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Invoice not found');
-        }
+		$result = $this->invoice->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Invoice not found');
+		}
 
 		if (!DolibarrApi::_checkAccessToResource('facture', $this->invoice->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
-        foreach ($request_data as $field => $value) {
-            if ($field == 'id') continue;
-            $this->invoice->$field = $value;
-        }
+		foreach ($request_data as $field => $value) {
+			if ($field == 'id') continue;
+			$this->invoice->$field = $value;
+		}
 
-        // update bank account
-        if (!empty($this->invoice->fk_account))
-        {
-            if ($this->invoice->setBankAccount($this->invoice->fk_account) == 0) {
-                throw new RestException(400, $this->invoice->error);
-            }
-        }
+		// update bank account
+		if (!empty($this->invoice->fk_account))
+		{
+			if ($this->invoice->setBankAccount($this->invoice->fk_account) == 0) {
+				throw new RestException(400, $this->invoice->error);
+			}
+		}
 
-        if ($this->invoice->update(DolibarrApiAccess::$user))
-            return $this->get($id);
+		if ($this->invoice->update(DolibarrApiAccess::$user))
+			return $this->get($id);
 
-        return false;
-    }
+		return false;
+	}
 
-    /**
-     * Delete invoice
-     *
-     * @param int   $id 	Invoice ID
-     * @return array
-     */
-    public function delete($id)
-    {
-        if (!DolibarrApiAccess::$user->rights->facture->supprimer) {
+	/**
+	 * Delete invoice
+	 *
+	 * @param int   $id 	Invoice ID
+	 * @return array
+	 */
+	public function delete($id)
+	{
+		if (!DolibarrApiAccess::$user->rights->facture->supprimer) {
 			throw new RestException(401);
 		}
-        $result = $this->invoice->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Invoice not found');
-        }
+		$result = $this->invoice->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Invoice not found');
+		}
 
 		if (!DolibarrApi::_checkAccessToResource('facture', $this->invoice->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
 		$result = $this->invoice->delete(DolibarrApiAccess::$user);
-        if ($result < 0)
-        {
-            throw new RestException(500);
-        }
+		if ($result < 0)
+		{
+			throw new RestException(500);
+		}
 
-        return array(
-            'success' => array(
-                'code' => 200,
-                'message' => 'Invoice deleted'
-            )
-        );
-    }
+		return array(
+			'success' => array(
+				'code' => 200,
+				'message' => 'Invoice deleted'
+			)
+		);
+	}
 
-    /**
-     * Add a line to a given invoice
-     *
-     * Exemple of POST query :
-     * {
-     *     "desc": "Desc", "subprice": "1.00000000", "qty": "1", "tva_tx": "20.000", "localtax1_tx": "0.000", "localtax2_tx": "0.000",
-     *     "fk_product": "1", "remise_percent": "0", "date_start": "", "date_end": "", "fk_code_ventilation": 0,  "info_bits": "0",
-     *     "fk_remise_except": null,  "product_type": "1", "rang": "-1", "special_code": "0", "fk_parent_line": null, "fk_fournprice": null,
-     *     "pa_ht": "0.00000000", "label": "", "array_options": [], "situation_percent": "100", "fk_prev_id": null, "fk_unit": null
-     * }
-     *
-     * @param int   $id             Id of invoice
-     * @param array $request_data   InvoiceLine data
-     *
-     * @url     POST {id}/lines
-     *
-     * @return int
-     *
-     * @throws RestException 304
-     * @throws RestException 401
-     * @throws RestException 404
-     * @throws RestException 400
-     */
-    public function postLine($id, $request_data = null)
-    {
-        if (!DolibarrApiAccess::$user->rights->facture->creer) {
-            throw new RestException(401);
-        }
+	/**
+	 * Add a line to a given invoice
+	 *
+	 * Exemple of POST query :
+	 * {
+	 *     "desc": "Desc", "subprice": "1.00000000", "qty": "1", "tva_tx": "20.000", "localtax1_tx": "0.000", "localtax2_tx": "0.000",
+	 *     "fk_product": "1", "remise_percent": "0", "date_start": "", "date_end": "", "fk_code_ventilation": 0,  "info_bits": "0",
+	 *     "fk_remise_except": null,  "product_type": "1", "rang": "-1", "special_code": "0", "fk_parent_line": null, "fk_fournprice": null,
+	 *     "pa_ht": "0.00000000", "label": "", "array_options": [], "situation_percent": "100", "fk_prev_id": null, "fk_unit": null
+	 * }
+	 *
+	 * @param int   $id             Id of invoice
+	 * @param array $request_data   InvoiceLine data
+	 *
+	 * @url     POST {id}/lines
+	 *
+	 * @return int
+	 *
+	 * @throws RestException 304
+	 * @throws RestException 401
+	 * @throws RestException 404
+	 * @throws RestException 400
+	 */
+	public function postLine($id, $request_data = null)
+	{
+		if (!DolibarrApiAccess::$user->rights->facture->creer) {
+			throw new RestException(401);
+		}
 
-        $result = $this->invoice->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Invoice not found');
-        }
+		$result = $this->invoice->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Invoice not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('facture', $this->invoice->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('facture', $this->invoice->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        $request_data = (object) $request_data;
+		$request_data = (object) $request_data;
 
-        // Reset fk_parent_line for no child products and special product
-        if (($request_data->product_type != 9 && empty($request_data->fk_parent_line)) || $request_data->product_type == 9) {
-            $request_data->fk_parent_line = 0;
-        }
+		// Reset fk_parent_line for no child products and special product
+		if (($request_data->product_type != 9 && empty($request_data->fk_parent_line)) || $request_data->product_type == 9) {
+			$request_data->fk_parent_line = 0;
+		}
 
-        // calculate pa_ht
-        $marginInfos = getMarginInfos($request_data->subprice, $request_data->remise_percent, $request_data->tva_tx, $request_data->localtax1_tx, $request_data->localtax2_tx, $request_data->fk_fournprice, $request_data->pa_ht);
-        $pa_ht = $marginInfos[0];
+		// calculate pa_ht
+		$marginInfos = getMarginInfos($request_data->subprice, $request_data->remise_percent, $request_data->tva_tx, $request_data->localtax1_tx, $request_data->localtax2_tx, $request_data->fk_fournprice, $request_data->pa_ht);
+		$pa_ht = $marginInfos[0];
 
-        $updateRes = $this->invoice->addline(
-            $request_data->desc,
-            $request_data->subprice,
-            $request_data->qty,
-            $request_data->tva_tx,
-            $request_data->localtax1_tx,
-            $request_data->localtax2_tx,
-            $request_data->fk_product,
-            $request_data->remise_percent,
-            $request_data->date_start,
-            $request_data->date_end,
-            $request_data->fk_code_ventilation,
-            $request_data->info_bits,
-            $request_data->fk_remise_except,
-            'HT',
-            0,
-            $request_data->product_type,
-            $request_data->rang,
-            $request_data->special_code,
-            $request_data->origin,
-            $request_data->origin_id,
-            $request_data->fk_parent_line,
-            empty($request_data->fk_fournprice) ?null:$request_data->fk_fournprice,
-            $pa_ht,
-            $request_data->label,
-            $request_data->array_options,
-            $request_data->situation_percent,
-            $request_data->fk_prev_id,
-            $request_data->fk_unit,
-            0,
-            $request_data->ref_ext
-        );
+		$updateRes = $this->invoice->addline(
+			$request_data->desc,
+			$request_data->subprice,
+			$request_data->qty,
+			$request_data->tva_tx,
+			$request_data->localtax1_tx,
+			$request_data->localtax2_tx,
+			$request_data->fk_product,
+			$request_data->remise_percent,
+			$request_data->date_start,
+			$request_data->date_end,
+			$request_data->fk_code_ventilation,
+			$request_data->info_bits,
+			$request_data->fk_remise_except,
+			'HT',
+			0,
+			$request_data->product_type,
+			$request_data->rang,
+			$request_data->special_code,
+			$request_data->origin,
+			$request_data->origin_id,
+			$request_data->fk_parent_line,
+			empty($request_data->fk_fournprice) ?null:$request_data->fk_fournprice,
+			$pa_ht,
+			$request_data->label,
+			$request_data->array_options,
+			$request_data->situation_percent,
+			$request_data->fk_prev_id,
+			$request_data->fk_unit,
+			0,
+			$request_data->ref_ext
+		);
 
-        if ($updateRes < 0) {
-            throw new RestException(400, 'Unable to insert the new line. Check your inputs. '.$this->invoice->error);
-        }
+		if ($updateRes < 0) {
+			throw new RestException(400, 'Unable to insert the new line. Check your inputs. '.$this->invoice->error);
+		}
 
-        return $updateRes;
-    }
+		return $updateRes;
+	}
 
-    /**
-     * Adds a contact to an invoice
-     *
-     * @param   int 	$id             	Order ID
-     * @param   int 	$fk_socpeople       	Id of thirdparty contact (if source = 'external') or id of user (if souce = 'internal') to link
-     * @param   string 	$type_contact           Type of contact (code). Must a code found into table llx_c_type_contact. For example: BILLING
-     * @param   string  $source             	external=Contact extern (llx_socpeople), internal=Contact intern (llx_user)
-     * @param   int     $notrigger              Disable all triggers
-     *
-     * @url POST    {id}/contacts
-     *
-     * @return  array
-     *
-     * @throws RestException 304
-     * @throws RestException 401
-     * @throws RestException 404
-     * @throws RestException 500
-     *
-     */
-    public function addContact($id, $fk_socpeople, $type_contact, $source, $notrigger = 0)
-    {
-        if (!DolibarrApiAccess::$user->rights->facture->creer) {
-            throw new RestException(401);
-        }
-        $result = $this->invoice->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Invoice not found');
-        }
+	/**
+	 * Adds a contact to an invoice
+	 *
+	 * @param   int 	$id             	Order ID
+	 * @param   int 	$fk_socpeople       	Id of thirdparty contact (if source = 'external') or id of user (if souce = 'internal') to link
+	 * @param   string 	$type_contact           Type of contact (code). Must a code found into table llx_c_type_contact. For example: BILLING
+	 * @param   string  $source             	external=Contact extern (llx_socpeople), internal=Contact intern (llx_user)
+	 * @param   int     $notrigger              Disable all triggers
+	 *
+	 * @url POST    {id}/contacts
+	 *
+	 * @return  array
+	 *
+	 * @throws RestException 304
+	 * @throws RestException 401
+	 * @throws RestException 404
+	 * @throws RestException 500
+	 *
+	 */
+	public function addContact($id, $fk_socpeople, $type_contact, $source, $notrigger = 0)
+	{
+		if (!DolibarrApiAccess::$user->rights->facture->creer) {
+			throw new RestException(401);
+		}
+		$result = $this->invoice->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Invoice not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('facture', $this->invoice->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('facture', $this->invoice->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        $result = $this->invoice->add_contact($fk_socpeople, $type_contact, $source, $notrigger);
-        if ($result < 0) {
-            throw new RestException(500, 'Error : '.$this->invoice->error);
-        }
+		$result = $this->invoice->add_contact($fk_socpeople, $type_contact, $source, $notrigger);
+		if ($result < 0) {
+			throw new RestException(500, 'Error : '.$this->invoice->error);
+		}
 
-        $result = $this->invoice->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Invoice not found');
-        }
+		$result = $this->invoice->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Invoice not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('facture', $this->invoice->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('facture', $this->invoice->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        return $this->_cleanObjectDatas($this->invoice);
-    }
+		return $this->_cleanObjectDatas($this->invoice);
+	}
 
 
 
-    /**
-     * Sets an invoice as draft
-     *
-     * @param   int $id             Order ID
-     * @param   int $idwarehouse    Warehouse ID
-     *
-     * @url POST    {id}/settodraft
-     *
-     * @return  array
-     *
-     * @throws RestException 304
-     * @throws RestException 401
-     * @throws RestException 404
-     * @throws RestException 500
-     *
-     */
-    public function settodraft($id, $idwarehouse = -1)
-    {
-        if (!DolibarrApiAccess::$user->rights->facture->creer) {
-            throw new RestException(401);
-        }
-        $result = $this->invoice->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Invoice not found');
-        }
+	/**
+	 * Sets an invoice as draft
+	 *
+	 * @param   int $id             Order ID
+	 * @param   int $idwarehouse    Warehouse ID
+	 *
+	 * @url POST    {id}/settodraft
+	 *
+	 * @return  array
+	 *
+	 * @throws RestException 304
+	 * @throws RestException 401
+	 * @throws RestException 404
+	 * @throws RestException 500
+	 *
+	 */
+	public function settodraft($id, $idwarehouse = -1)
+	{
+		if (!DolibarrApiAccess::$user->rights->facture->creer) {
+			throw new RestException(401);
+		}
+		$result = $this->invoice->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Invoice not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('facture', $this->invoice->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('facture', $this->invoice->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        $result = $this->invoice->setDraft(DolibarrApiAccess::$user, $idwarehouse);
-        if ($result == 0) {
-            throw new RestException(304, 'Nothing done.');
-        }
-        if ($result < 0) {
-            throw new RestException(500, 'Error : '.$this->invoice->error);
-        }
+		$result = $this->invoice->setDraft(DolibarrApiAccess::$user, $idwarehouse);
+		if ($result == 0) {
+			throw new RestException(304, 'Nothing done.');
+		}
+		if ($result < 0) {
+			throw new RestException(500, 'Error : '.$this->invoice->error);
+		}
 
-        $result = $this->invoice->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Invoice not found');
-        }
+		$result = $this->invoice->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Invoice not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('facture', $this->invoice->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('facture', $this->invoice->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        return $this->_cleanObjectDatas($this->invoice);
-    }
+		return $this->_cleanObjectDatas($this->invoice);
+	}
 
 
-    /**
-     * Validate an invoice
-     *
+	/**
+	 * Validate an invoice
+	 *
 	 * If you get a bad value for param notrigger check that ou provide this in body
-     * {
-     *   "idwarehouse": 0,
-     *   "notrigger": 0
-     * }
-     *
-     * @param   int $id             Invoice ID
-     * @param   int $idwarehouse    Warehouse ID
-     * @param   int $notrigger      1=Does not execute triggers, 0= execute triggers
-     *
-     * @url POST    {id}/validate
-     *
-     * @return  array
-     */
-    public function validate($id, $idwarehouse = 0, $notrigger = 0)
-    {
-    	if (!DolibarrApiAccess::$user->rights->facture->creer) {
-    		throw new RestException(401);
-    	}
-    	$result = $this->invoice->fetch($id);
-    	if (!$result) {
-    		throw new RestException(404, 'Invoice not found');
-    	}
+	 * {
+	 *   "idwarehouse": 0,
+	 *   "notrigger": 0
+	 * }
+	 *
+	 * @param   int $id             Invoice ID
+	 * @param   int $idwarehouse    Warehouse ID
+	 * @param   int $notrigger      1=Does not execute triggers, 0= execute triggers
+	 *
+	 * @url POST    {id}/validate
+	 *
+	 * @return  array
+	 */
+	public function validate($id, $idwarehouse = 0, $notrigger = 0)
+	{
+		if (!DolibarrApiAccess::$user->rights->facture->creer) {
+			throw new RestException(401);
+		}
+		$result = $this->invoice->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Invoice not found');
+		}
 
-    	if (!DolibarrApi::_checkAccessToResource('facture', $this->invoice->id)) {
-    		throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-    	}
+		if (!DolibarrApi::_checkAccessToResource('facture', $this->invoice->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-    	$result = $this->invoice->validate(DolibarrApiAccess::$user, '', $idwarehouse, $notrigger);
-    	if ($result == 0) {
-    		throw new RestException(304, 'Error nothing done. May be object is already validated');
-    	}
-    	if ($result < 0) {
-    		throw new RestException(500, 'Error when validating Invoice: '.$this->invoice->error);
-    	}
+		$result = $this->invoice->validate(DolibarrApiAccess::$user, '', $idwarehouse, $notrigger);
+		if ($result == 0) {
+			throw new RestException(304, 'Error nothing done. May be object is already validated');
+		}
+		if ($result < 0) {
+			throw new RestException(500, 'Error when validating Invoice: '.$this->invoice->error);
+		}
 
-        $result = $this->invoice->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Invoice not found');
-        }
+		$result = $this->invoice->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Invoice not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('facture', $this->invoice->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('facture', $this->invoice->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        return $this->_cleanObjectDatas($this->invoice);
-    }
+		return $this->_cleanObjectDatas($this->invoice);
+	}
 
-    /**
-     * Sets an invoice as paid
-     *
-     * @param   int 	$id            Order ID
-     * @param   string 	$close_code    Code filled if we classify to 'Paid completely' when payment is not complete (for escompte for example)
-     * @param   string 	$close_note    Comment defined if we classify to 'Paid' when payment is not complete (for escompte for example)
-     *
-     * @url POST    {id}/settopaid
-     *
-     * @return  array 	An invoice object
-     *
-     * @throws RestException 304
-     * @throws RestException 401
-     * @throws RestException 404
-     * @throws RestException 500
-     */
-    public function settopaid($id, $close_code = '', $close_note = '')
-    {
-        if (!DolibarrApiAccess::$user->rights->facture->creer) {
-            throw new RestException(401);
-        }
-        $result = $this->invoice->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Invoice not found');
-        }
+	/**
+	 * Sets an invoice as paid
+	 *
+	 * @param   int 	$id            Order ID
+	 * @param   string 	$close_code    Code filled if we classify to 'Paid completely' when payment is not complete (for escompte for example)
+	 * @param   string 	$close_note    Comment defined if we classify to 'Paid' when payment is not complete (for escompte for example)
+	 *
+	 * @url POST    {id}/settopaid
+	 *
+	 * @return  array 	An invoice object
+	 *
+	 * @throws RestException 304
+	 * @throws RestException 401
+	 * @throws RestException 404
+	 * @throws RestException 500
+	 */
+	public function settopaid($id, $close_code = '', $close_note = '')
+	{
+		if (!DolibarrApiAccess::$user->rights->facture->creer) {
+			throw new RestException(401);
+		}
+		$result = $this->invoice->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Invoice not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('facture', $this->invoice->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('facture', $this->invoice->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        $result = $this->invoice->set_paid(DolibarrApiAccess::$user, $close_code, $close_note);
-        if ($result == 0) {
-            throw new RestException(304, 'Error nothing done. May be object is already validated');
-        }
-        if ($result < 0) {
-            throw new RestException(500, 'Error : '.$this->invoice->error);
-        }
+		$result = $this->invoice->set_paid(DolibarrApiAccess::$user, $close_code, $close_note);
+		if ($result == 0) {
+			throw new RestException(304, 'Error nothing done. May be object is already validated');
+		}
+		if ($result < 0) {
+			throw new RestException(500, 'Error : '.$this->invoice->error);
+		}
 
 
-        $result = $this->invoice->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Invoice not found');
-        }
+		$result = $this->invoice->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Invoice not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('facture', $this->invoice->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('facture', $this->invoice->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        return $this->_cleanObjectDatas($this->invoice);
-    }
+		return $this->_cleanObjectDatas($this->invoice);
+	}
 
 
-    /**
-     * Sets an invoice as unpaid
-     *
-     * @param   int     $id            Order ID
-     *
-     * @url POST    {id}/settounpaid
-     *
-     * @return  array   An invoice object
-     *
-     * @throws RestException 304
-     * @throws RestException 401
-     * @throws RestException 404
-     * @throws RestException 500
-     */
-    public function settounpaid($id)
-    {
-        if (!DolibarrApiAccess::$user->rights->facture->creer) {
-            throw new RestException(401);
-        }
-        $result = $this->invoice->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Invoice not found');
-        }
+	/**
+	 * Sets an invoice as unpaid
+	 *
+	 * @param   int     $id            Order ID
+	 *
+	 * @url POST    {id}/settounpaid
+	 *
+	 * @return  array   An invoice object
+	 *
+	 * @throws RestException 304
+	 * @throws RestException 401
+	 * @throws RestException 404
+	 * @throws RestException 500
+	 */
+	public function settounpaid($id)
+	{
+		if (!DolibarrApiAccess::$user->rights->facture->creer) {
+			throw new RestException(401);
+		}
+		$result = $this->invoice->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Invoice not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('facture', $this->invoice->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('facture', $this->invoice->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        $result = $this->invoice->set_unpaid(DolibarrApiAccess::$user);
-        if ($result == 0) {
-            throw new RestException(304, 'Nothing done');
-        }
-        if ($result < 0) {
-            throw new RestException(500, 'Error : '.$this->invoice->error);
-        }
+		$result = $this->invoice->set_unpaid(DolibarrApiAccess::$user);
+		if ($result == 0) {
+			throw new RestException(304, 'Nothing done');
+		}
+		if ($result < 0) {
+			throw new RestException(500, 'Error : '.$this->invoice->error);
+		}
 
 
-        $result = $this->invoice->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Invoice not found');
-        }
+		$result = $this->invoice->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Invoice not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('facture', $this->invoice->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('facture', $this->invoice->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        return $this->_cleanObjectDatas($this->invoice);
-    }
+		return $this->_cleanObjectDatas($this->invoice);
+	}
 
-    /**
-     * Get discount from invoice
-     *
-     * @param int   $id             Id of invoice
-     *
-     * @url	GET {id}/discount
-     *
-     * @return mixed
-     */
-    public function getDiscount($id)
-    {
-        require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
-
-    	if (!DolibarrApiAccess::$user->rights->facture->lire) {
-    		throw new RestException(401);
-    	}
-
-    	$result = $this->invoice->fetch($id);
-    	if (!$result) {
-    		throw new RestException(404, 'Invoice not found');
-    	}
-
-    	if (!DolibarrApi::_checkAccessToResource('facture', $this->invoice->id)) {
-    		throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
-
-        $discountcheck = new DiscountAbsolute($this->db);
-        $result = $discountcheck->fetch(0, $this->invoice->id);
-
-        if ($result == 0){
-            throw new RestException(404, 'Discount not found');
-        }
-        if ($result < 0){
-            throw new RestException(500, $discountcheck->error);
-        }
-
-        return parent::_cleanObjectDatas($discountcheck);
-    }
-
-    /**
-     * Create a discount (credit available) for a credit note or a deposit.
-     *
-     * @param   int 	$id            Invoice ID
-     * @url POST    {id}/markAsCreditAvailable
-     *
-     * @return  array 	An invoice object
-     *
-     * @throws RestException 304
-     * @throws RestException 401
-     * @throws RestException 404
-     * @throws RestException 500
-     */
-    public function markAsCreditAvailable($id)
-    {
+	/**
+	 * Get discount from invoice
+	 *
+	 * @param int   $id             Id of invoice
+	 *
+	 * @url	GET {id}/discount
+	 *
+	 * @return mixed
+	 */
+	public function getDiscount($id)
+	{
 		require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
 
-        if (!DolibarrApiAccess::$user->rights->facture->creer) {
-            throw new RestException(401);
-        }
+		if (!DolibarrApiAccess::$user->rights->facture->lire) {
+			throw new RestException(401);
+		}
 
-        $result = $this->invoice->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Invoice not found');
-        }
+		$result = $this->invoice->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Invoice not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('facture', $this->invoice->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('facture', $this->invoice->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        if ($this->invoice->paye) {
-            throw new RestException(500, 'Alreay payed');
-        }
+		$discountcheck = new DiscountAbsolute($this->db);
+		$result = $discountcheck->fetch(0, $this->invoice->id);
 
-        $this->invoice->fetch($id);
-        $this->invoice->fetch_thirdparty();
+		if ($result == 0) {
+			throw new RestException(404, 'Discount not found');
+		}
+		if ($result < 0) {
+			throw new RestException(500, $discountcheck->error);
+		}
 
-        // Check if there is already a discount (protection to avoid duplicate creation when resubmit post)
-        $discountcheck = new DiscountAbsolute($this->db);
-        $result = $discountcheck->fetch(0, $this->invoice->id);
+		return parent::_cleanObjectDatas($discountcheck);
+	}
 
-        $canconvert = 0;
-        if ($this->invoice->type == Facture::TYPE_DEPOSIT && empty($discountcheck->id)) $canconvert = 1; // we can convert deposit into discount if deposit is payed (completely, partially or not at all) and not already converted (see real condition into condition used to show button converttoreduc)
-        if (($this->invoice->type == Facture::TYPE_CREDIT_NOTE || $this->invoice->type == Facture::TYPE_STANDARD) && $this->invoice->paye == 0 && empty($discountcheck->id)) $canconvert = 1; // we can convert credit note into discount if credit note is not payed back and not already converted and amount of payment is 0 (see real condition into condition used to show button converttoreduc)
-        if ($canconvert)
-        {
-            $this->db->begin();
-
-            $amount_ht = $amount_tva = $amount_ttc = array();
-            $multicurrency_amount_ht = $multicurrency_amount_tva = $multicurrency_amount_ttc = array();
-
-            // Loop on each vat rate
-            $i = 0;
-            foreach ($this->invoice->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;
-                    $i++;
-                }
-            }
-
-            // Insert one discount by VAT rate category
-            $discount = new DiscountAbsolute($this->db);
-            if ($this->invoice->type == Facture::TYPE_CREDIT_NOTE) {
-                $discount->description = '(CREDIT_NOTE)';
-            } elseif ($this->invoice->type == Facture::TYPE_DEPOSIT) {
-                $discount->description = '(DEPOSIT)';
-            } elseif ($this->invoice->type == Facture::TYPE_STANDARD || $this->invoice->type == Facture::TYPE_REPLACEMENT || $this->invoice->type == Facture::TYPE_SITUATION) {
-                $discount->description = '(EXCESS RECEIVED)';
-            } else {
-                throw new RestException(500, 'Cant convert to reduc an Invoice of this type');
-            }
-
-            $discount->fk_soc = $this->invoice->socid;
-            $discount->fk_facture_source = $this->invoice->id;
-
-            $error = 0;
-
-            if ($this->invoice->type == Facture::TYPE_STANDARD || $this->invoice->type == Facture::TYPE_REPLACEMENT || $this->invoice->type == Facture::TYPE_SITUATION)
-            {
-                // If we're on a standard invoice, we have to get excess received to create a discount in TTC without VAT
-
-                // Total payments
-                $sql = 'SELECT SUM(pf.amount) as total_payments';
-                $sql .= ' FROM '.MAIN_DB_PREFIX.'paiement_facture as pf, '.MAIN_DB_PREFIX.'paiement as p';
-                $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as c ON p.fk_paiement = c.id';
-                $sql .= ' WHERE pf.fk_facture = '.$this->invoice->id;
-                $sql .= ' AND pf.fk_paiement = p.rowid';
-                $sql .= ' AND p.entity IN ('.getEntity('invoice').')';
-                $resql = $this->db->query($sql);
-                if (!$resql) dol_print_error($this->db);
-
-                $res = $this->db->fetch_object($resql);
-                $total_payments = $res->total_payments;
-
-                // Total credit note and deposit
-                $total_creditnote_and_deposit = 0;
-                $sql = "SELECT re.rowid, re.amount_ht, re.amount_tva, re.amount_ttc,";
-                $sql .= " re.description, re.fk_facture_source";
-                $sql .= " FROM ".MAIN_DB_PREFIX."societe_remise_except as re";
-                $sql .= " WHERE fk_facture = ".$this->invoice->id;
-                $resql = $this->db->query($sql);
-                if (!empty($resql)) {
-                    while ($obj = $this->db->fetch_object($resql)) $total_creditnote_and_deposit += $obj->amount_ttc;
-                } else dol_print_error($this->db);
-
-                $discount->amount_ht = $discount->amount_ttc = $total_payments + $total_creditnote_and_deposit - $this->invoice->total_ttc;
-                $discount->amount_tva = 0;
-                $discount->tva_tx = 0;
-
-                $result = $discount->create(DolibarrApiAccess::$user);
-                if ($result < 0)
-                {
-                    $error++;
-                }
-            }
-            if ($this->invoice->type == Facture::TYPE_CREDIT_NOTE || $this->invoice->type == Facture::TYPE_DEPOSIT)
-            {
-                foreach ($amount_ht as $tva_tx => $xxx)
-                {
-                    $discount->amount_ht = abs($amount_ht[$tva_tx]);
-                    $discount->amount_tva = abs($amount_tva[$tva_tx]);
-                    $discount->amount_ttc = abs($amount_ttc[$tva_tx]);
-                    $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]);
-                    $discount->tva_tx = abs($tva_tx);
-
-                    $result = $discount->create(DolibarrApiAccess::$user);
-                    if ($result < 0)
-                    {
-                        $error++;
-                        break;
-                    }
-                }
-            }
-
-            if (empty($error))
-            {
-                if ($this->invoice->type != Facture::TYPE_DEPOSIT) {
-                    // Classe facture
-                    $result = $this->invoice->set_paid(DolibarrApiAccess::$user);
-                    if ($result >= 0)
-                    {
-                        $this->db->commit();
-                    } else {
-                        $this->db->rollback();
-                        throw new RestException(500, 'Could not set paid');
-                    }
-                } else {
-                    $this->db->commit();
-                }
-            } else {
-                $this->db->rollback();
-                throw new RestException(500, 'Discount creation error');
-            }
-        }
-
-        return $this->_cleanObjectDatas($this->invoice);
-    }
-
-     /**
-     * Add a discount line into an invoice (as an invoice line) using an existing absolute discount
-     *
-     * Note that this consume the discount.
-     *
-     * @param int   $id             Id of invoice
-     * @param int   $discountid     Id of discount
-     *
-     * @url     POST {id}/usediscount/{discountid}
-     *
-     * @return int
+	/**
+	 * Create a discount (credit available) for a credit note or a deposit.
 	 *
-     * @throws RestException 400
-     * @throws RestException 401
-     * @throws RestException 404
-     * @throws RestException 405
-     */
-    public function useDiscount($id, $discountid)
-    {
-
-        if (!DolibarrApiAccess::$user->rights->facture->creer) {
-            throw new RestException(401);
-        }
-        if (empty($id)) {
-            throw new RestException(400, 'Invoice ID is mandatory');
-        }
-        if (empty($discountid)) {
-            throw new RestException(400, 'Discount ID is mandatory');
-        }
-
-        if (!DolibarrApi::_checkAccessToResource('facture', $id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
-
-        $result = $this->invoice->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Invoice not found');
-        }
-
-        $result = $this->invoice->insert_discount($discountid);
-        if ($result < 0) {
-            throw new RestException(405, $this->invoice->error);
-        }
-
-        return $result;
-    }
-
-     /**
-     * Add an available credit note discount to payments of an existing invoice.
-     *
-     *  Note that this consume the credit note.
-     *
-     * @param int   $id            Id of invoice
-     * @param int   $discountid    Id of a discount coming from a credit note
-     *
-     * @url     POST {id}/usecreditnote/{discountid}
-     *
-     * @return int
-     *
-     * @throws RestException 400
-     * @throws RestException 401
-     * @throws RestException 404
-     * @throws RestException 405
-     */
-    public function useCreditNote($id, $discountid)
-    {
-
-        require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
-
-        if (!DolibarrApiAccess::$user->rights->facture->creer) {
-            throw new RestException(401);
-        }
-        if (empty($id)) {
-            throw new RestException(400, 'Invoice ID is mandatory');
-        }
-        if (empty($discountid)) {
-            throw new RestException(400, 'Credit ID is mandatory');
-        }
-
-        if (!DolibarrApi::_checkAccessToResource('facture', $id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
-        $discount = new DiscountAbsolute($this->db);
-        $result = $discount->fetch($discountid);
-        if (!$result) {
-            throw new RestException(404, 'Credit not found');
-        }
-
-        $result = $discount->link_to_invoice(0, $id);
-        if ($result < 0) {
-            throw new RestException(405, $discount->error);
-        }
-
-        return $result;
-    }
-
-    /**
-     * Get list of payments of a given invoice
-     *
-     * @param int   $id             Id of invoice
-     *
-     * @url     GET {id}/payments
-     *
-     * @return array
+	 * @param   int 	$id            Invoice ID
+	 * @url POST    {id}/markAsCreditAvailable
 	 *
-     * @throws RestException 400
-     * @throws RestException 401
-     * @throws RestException 404
-     * @throws RestException 405
-     */
-    public function getPayments($id)
-    {
-
-        if (!DolibarrApiAccess::$user->rights->facture->lire) {
-            throw new RestException(401);
-        }
-        if (empty($id)) {
-            throw new RestException(400, 'Invoice ID is mandatory');
-        }
-
-        if (!DolibarrApi::_checkAccessToResource('facture', $id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
-
-        $result = $this->invoice->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Invoice not found');
-        }
-
-        $result = $this->invoice->getListOfPayments();
-        if ($result < 0) {
-            throw new RestException(405, $this->invoice->error);
-        }
-
-        return $result;
-    }
-
-
-    /**
-     * Add payment line to a specific invoice with the remain to pay as amount.
-     *
-     * @param int     $id                               Id of invoice
-     * @param string  $datepaye           {@from body}  Payment date        {@type timestamp}
-     * @param int     $paymentid          {@from body}  Payment mode Id {@min 1}
-     * @param string  $closepaidinvoices  {@from body}  Close paid invoices {@choice yes,no}
-     * @param int     $accountid          {@from body}  Account Id {@min 1}
-     * @param string  $num_payment        {@from body}  Payment number (optional)
-     * @param string  $comment            {@from body}  Note private (optional)
-     * @param string  $chqemetteur        {@from body}  Payment issuer (mandatory if paymentcode = 'CHQ')
-     * @param string  $chqbank            {@from body}  Issuer bank name (optional)
-     *
-     * @url     POST {id}/payments
-     *
-     * @return int  Payment ID
+	 * @return  array 	An invoice object
 	 *
-     * @throws RestException 400
-     * @throws RestException 401
-     * @throws RestException 404
-     */
-    public function addPayment($id, $datepaye, $paymentid, $closepaidinvoices, $accountid, $num_payment = '', $comment = '', $chqemetteur = '', $chqbank = '')
-    {
-        global $conf;
+	 * @throws RestException 304
+	 * @throws RestException 401
+	 * @throws RestException 404
+	 * @throws RestException 500
+	 */
+	public function markAsCreditAvailable($id)
+	{
+		require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
 
-    	require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
+		if (!DolibarrApiAccess::$user->rights->facture->creer) {
+			throw new RestException(401);
+		}
 
-    	if (!DolibarrApiAccess::$user->rights->facture->creer) {
-    		throw new RestException(403);
-    	}
-    	if (empty($id)) {
-    		throw new RestException(400, 'Invoice ID is mandatory');
-    	}
+		$result = $this->invoice->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Invoice not found');
+		}
 
-    	if (!DolibarrApi::_checkAccessToResource('facture', $id)) {
-    		throw new RestException(403, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-    	}
+		if (!DolibarrApi::_checkAccessToResource('facture', $this->invoice->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-    	if (!empty($conf->banque->enabled)) {
-    		if (empty($accountid)) {
-    			throw new RestException(400, 'Account ID is mandatory');
-    		}
-    	}
+		if ($this->invoice->paye) {
+			throw new RestException(500, 'Alreay payed');
+		}
 
-    	if (empty($paymentid)) {
-    		throw new RestException(400, 'Payment ID or Payment Code is mandatory');
-    	}
+		$this->invoice->fetch($id);
+		$this->invoice->fetch_thirdparty();
+
+		// Check if there is already a discount (protection to avoid duplicate creation when resubmit post)
+		$discountcheck = new DiscountAbsolute($this->db);
+		$result = $discountcheck->fetch(0, $this->invoice->id);
+
+		$canconvert = 0;
+		if ($this->invoice->type == Facture::TYPE_DEPOSIT && empty($discountcheck->id)) $canconvert = 1; // we can convert deposit into discount if deposit is payed (completely, partially or not at all) and not already converted (see real condition into condition used to show button converttoreduc)
+		if (($this->invoice->type == Facture::TYPE_CREDIT_NOTE || $this->invoice->type == Facture::TYPE_STANDARD) && $this->invoice->paye == 0 && empty($discountcheck->id)) $canconvert = 1; // we can convert credit note into discount if credit note is not payed back and not already converted and amount of payment is 0 (see real condition into condition used to show button converttoreduc)
+		if ($canconvert)
+		{
+			$this->db->begin();
+
+			$amount_ht = $amount_tva = $amount_ttc = array();
+			$multicurrency_amount_ht = $multicurrency_amount_tva = $multicurrency_amount_ttc = array();
+
+			// Loop on each vat rate
+			$i = 0;
+			foreach ($this->invoice->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;
+					$i++;
+				}
+			}
+
+			// Insert one discount by VAT rate category
+			$discount = new DiscountAbsolute($this->db);
+			if ($this->invoice->type == Facture::TYPE_CREDIT_NOTE) {
+				$discount->description = '(CREDIT_NOTE)';
+			} elseif ($this->invoice->type == Facture::TYPE_DEPOSIT) {
+				$discount->description = '(DEPOSIT)';
+			} elseif ($this->invoice->type == Facture::TYPE_STANDARD || $this->invoice->type == Facture::TYPE_REPLACEMENT || $this->invoice->type == Facture::TYPE_SITUATION) {
+				$discount->description = '(EXCESS RECEIVED)';
+			} else {
+				throw new RestException(500, 'Cant convert to reduc an Invoice of this type');
+			}
+
+			$discount->fk_soc = $this->invoice->socid;
+			$discount->fk_facture_source = $this->invoice->id;
+
+			$error = 0;
+
+			if ($this->invoice->type == Facture::TYPE_STANDARD || $this->invoice->type == Facture::TYPE_REPLACEMENT || $this->invoice->type == Facture::TYPE_SITUATION)
+			{
+				// If we're on a standard invoice, we have to get excess received to create a discount in TTC without VAT
+
+				// Total payments
+				$sql = 'SELECT SUM(pf.amount) as total_payments';
+				$sql .= ' FROM '.MAIN_DB_PREFIX.'paiement_facture as pf, '.MAIN_DB_PREFIX.'paiement as p';
+				$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as c ON p.fk_paiement = c.id';
+				$sql .= ' WHERE pf.fk_facture = '.$this->invoice->id;
+				$sql .= ' AND pf.fk_paiement = p.rowid';
+				$sql .= ' AND p.entity IN ('.getEntity('invoice').')';
+				$resql = $this->db->query($sql);
+				if (!$resql) dol_print_error($this->db);
+
+				$res = $this->db->fetch_object($resql);
+				$total_payments = $res->total_payments;
+
+				// Total credit note and deposit
+				$total_creditnote_and_deposit = 0;
+				$sql = "SELECT re.rowid, re.amount_ht, re.amount_tva, re.amount_ttc,";
+				$sql .= " re.description, re.fk_facture_source";
+				$sql .= " FROM ".MAIN_DB_PREFIX."societe_remise_except as re";
+				$sql .= " WHERE fk_facture = ".$this->invoice->id;
+				$resql = $this->db->query($sql);
+				if (!empty($resql)) {
+					while ($obj = $this->db->fetch_object($resql)) $total_creditnote_and_deposit += $obj->amount_ttc;
+				} else dol_print_error($this->db);
+
+				$discount->amount_ht = $discount->amount_ttc = $total_payments + $total_creditnote_and_deposit - $this->invoice->total_ttc;
+				$discount->amount_tva = 0;
+				$discount->tva_tx = 0;
+
+				$result = $discount->create(DolibarrApiAccess::$user);
+				if ($result < 0)
+				{
+					$error++;
+				}
+			}
+			if ($this->invoice->type == Facture::TYPE_CREDIT_NOTE || $this->invoice->type == Facture::TYPE_DEPOSIT)
+			{
+				foreach ($amount_ht as $tva_tx => $xxx)
+				{
+					$discount->amount_ht = abs($amount_ht[$tva_tx]);
+					$discount->amount_tva = abs($amount_tva[$tva_tx]);
+					$discount->amount_ttc = abs($amount_ttc[$tva_tx]);
+					$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]);
+					$discount->tva_tx = abs($tva_tx);
+
+					$result = $discount->create(DolibarrApiAccess::$user);
+					if ($result < 0)
+					{
+						$error++;
+						break;
+					}
+				}
+			}
+
+			if (empty($error))
+			{
+				if ($this->invoice->type != Facture::TYPE_DEPOSIT) {
+					// Classe facture
+					$result = $this->invoice->set_paid(DolibarrApiAccess::$user);
+					if ($result >= 0)
+					{
+						$this->db->commit();
+					} else {
+						$this->db->rollback();
+						throw new RestException(500, 'Could not set paid');
+					}
+				} else {
+					$this->db->commit();
+				}
+			} else {
+				$this->db->rollback();
+				throw new RestException(500, 'Discount creation error');
+			}
+		}
+
+		return $this->_cleanObjectDatas($this->invoice);
+	}
+
+	 /**
+	  * Add a discount line into an invoice (as an invoice line) using an existing absolute discount
+	  *
+	  * Note that this consume the discount.
+	  *
+	  * @param int   $id             Id of invoice
+	  * @param int   $discountid     Id of discount
+	  *
+	  * @url     POST {id}/usediscount/{discountid}
+	  *
+	  * @return int
+	  *
+	  * @throws RestException 400
+	  * @throws RestException 401
+	  * @throws RestException 404
+	  * @throws RestException 405
+	  */
+	public function useDiscount($id, $discountid)
+	{
+
+		if (!DolibarrApiAccess::$user->rights->facture->creer) {
+			throw new RestException(401);
+		}
+		if (empty($id)) {
+			throw new RestException(400, 'Invoice ID is mandatory');
+		}
+		if (empty($discountid)) {
+			throw new RestException(400, 'Discount ID is mandatory');
+		}
+
+		if (!DolibarrApi::_checkAccessToResource('facture', $id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+
+		$result = $this->invoice->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Invoice not found');
+		}
+
+		$result = $this->invoice->insert_discount($discountid);
+		if ($result < 0) {
+			throw new RestException(405, $this->invoice->error);
+		}
+
+		return $result;
+	}
+
+	 /**
+	  * Add an available credit note discount to payments of an existing invoice.
+	  *
+	  *  Note that this consume the credit note.
+	  *
+	  * @param int   $id            Id of invoice
+	  * @param int   $discountid    Id of a discount coming from a credit note
+	  *
+	  * @url     POST {id}/usecreditnote/{discountid}
+	  *
+	  * @return int
+	  *
+	  * @throws RestException 400
+	  * @throws RestException 401
+	  * @throws RestException 404
+	  * @throws RestException 405
+	  */
+	public function useCreditNote($id, $discountid)
+	{
+
+		require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
+
+		if (!DolibarrApiAccess::$user->rights->facture->creer) {
+			throw new RestException(401);
+		}
+		if (empty($id)) {
+			throw new RestException(400, 'Invoice ID is mandatory');
+		}
+		if (empty($discountid)) {
+			throw new RestException(400, 'Credit ID is mandatory');
+		}
+
+		if (!DolibarrApi::_checkAccessToResource('facture', $id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+		$discount = new DiscountAbsolute($this->db);
+		$result = $discount->fetch($discountid);
+		if (!$result) {
+			throw new RestException(404, 'Credit not found');
+		}
+
+		$result = $discount->link_to_invoice(0, $id);
+		if ($result < 0) {
+			throw new RestException(405, $discount->error);
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Get list of payments of a given invoice
+	 *
+	 * @param int   $id             Id of invoice
+	 *
+	 * @url     GET {id}/payments
+	 *
+	 * @return array
+	 *
+	 * @throws RestException 400
+	 * @throws RestException 401
+	 * @throws RestException 404
+	 * @throws RestException 405
+	 */
+	public function getPayments($id)
+	{
+
+		if (!DolibarrApiAccess::$user->rights->facture->lire) {
+			throw new RestException(401);
+		}
+		if (empty($id)) {
+			throw new RestException(400, 'Invoice ID is mandatory');
+		}
+
+		if (!DolibarrApi::_checkAccessToResource('facture', $id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+
+		$result = $this->invoice->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Invoice not found');
+		}
+
+		$result = $this->invoice->getListOfPayments();
+		if ($result < 0) {
+			throw new RestException(405, $this->invoice->error);
+		}
+
+		return $result;
+	}
 
 
-    	$result = $this->invoice->fetch($id);
-    	if (!$result) {
-    		throw new RestException(404, 'Invoice not found');
-    	}
+	/**
+	 * Add payment line to a specific invoice with the remain to pay as amount.
+	 *
+	 * @param int     $id                               Id of invoice
+	 * @param string  $datepaye           {@from body}  Payment date        {@type timestamp}
+	 * @param int     $paymentid          {@from body}  Payment mode Id {@min 1}
+	 * @param string  $closepaidinvoices  {@from body}  Close paid invoices {@choice yes,no}
+	 * @param int     $accountid          {@from body}  Account Id {@min 1}
+	 * @param string  $num_payment        {@from body}  Payment number (optional)
+	 * @param string  $comment            {@from body}  Note private (optional)
+	 * @param string  $chqemetteur        {@from body}  Payment issuer (mandatory if paymentcode = 'CHQ')
+	 * @param string  $chqbank            {@from body}  Issuer bank name (optional)
+	 *
+	 * @url     POST {id}/payments
+	 *
+	 * @return int  Payment ID
+	 *
+	 * @throws RestException 400
+	 * @throws RestException 401
+	 * @throws RestException 404
+	 */
+	public function addPayment($id, $datepaye, $paymentid, $closepaidinvoices, $accountid, $num_payment = '', $comment = '', $chqemetteur = '', $chqbank = '')
+	{
+		global $conf;
 
-    	// Calculate amount to pay
-    	$totalpaye = $this->invoice->getSommePaiement();
-    	$totalcreditnotes = $this->invoice->getSumCreditNotesUsed();
-    	$totaldeposits = $this->invoice->getSumDepositsUsed();
-    	$resteapayer = price2num($this->invoice->total_ttc - $totalpaye - $totalcreditnotes - $totaldeposits, 'MT');
+		require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
 
-    	$this->db->begin();
+		if (!DolibarrApiAccess::$user->rights->facture->creer) {
+			throw new RestException(403);
+		}
+		if (empty($id)) {
+			throw new RestException(400, 'Invoice ID is mandatory');
+		}
 
-    	$amounts = array();
-    	$multicurrency_amounts = array();
+		if (!DolibarrApi::_checkAccessToResource('facture', $id)) {
+			throw new RestException(403, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-    	// Clean parameters amount if payment is for a credit note
-    	if ($this->invoice->type == Facture::TYPE_CREDIT_NOTE) {
-    		$resteapayer = price2num($resteapayer, 'MT');
-    		$amounts[$id] = -$resteapayer;
-    		// Multicurrency
-    		$newvalue = price2num($this->invoice->multicurrency_total_ttc, 'MT');
-    		$multicurrency_amounts[$id] = -$newvalue;
-    	} else {
-    		$resteapayer = price2num($resteapayer, 'MT');
-    		$amounts[$id] = $resteapayer;
-    		// Multicurrency
-    		$newvalue = price2num($this->invoice->multicurrency_total_ttc, 'MT');
-    		$multicurrency_amounts[$id] = $newvalue;
-    	}
+		if (!empty($conf->banque->enabled)) {
+			if (empty($accountid)) {
+				throw new RestException(400, 'Account ID is mandatory');
+			}
+		}
+
+		if (empty($paymentid)) {
+			throw new RestException(400, 'Payment ID or Payment Code is mandatory');
+		}
 
 
-    	// Creation of payment line
-    	$paymentobj = new Paiement($this->db);
-    	$paymentobj->datepaye     = $datepaye;
-    	$paymentobj->amounts      = $amounts; // Array with all payments dispatching with invoice id
-    	$paymentobj->multicurrency_amounts = $multicurrency_amounts; // Array with all payments dispatching
-    	$paymentobj->paiementid = $paymentid;
-    	$paymentobj->paiementcode = dol_getIdFromCode($this->db, $paymentid, 'c_paiement', 'id', 'code', 1);
-    	$paymentobj->num_payment = $num_payment;
-    	$paymentobj->note_private = $comment;
+		$result = $this->invoice->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Invoice not found');
+		}
 
-    	$payment_id = $paymentobj->create(DolibarrApiAccess::$user, ($closepaidinvoices == 'yes' ? 1 : 0)); // This include closing invoices
-    	if ($payment_id < 0)
-    	{
-    		$this->db->rollback();
-    		throw new RestException(400, 'Payment error : '.$paymentobj->error);
-    	}
+		// Calculate amount to pay
+		$totalpaye = $this->invoice->getSommePaiement();
+		$totalcreditnotes = $this->invoice->getSumCreditNotesUsed();
+		$totaldeposits = $this->invoice->getSumDepositsUsed();
+		$resteapayer = price2num($this->invoice->total_ttc - $totalpaye - $totalcreditnotes - $totaldeposits, 'MT');
 
-    	if (!empty($conf->banque->enabled)) {
-    		$label = '(CustomerInvoicePayment)';
+		$this->db->begin();
 
-    		if ($paymentobj->paiementcode == 'CHQ' && empty($chqemetteur)) {
-    			throw new RestException(400, 'Emetteur is mandatory when payment code is '.$paymentobj->paiementcode);
-    		}
-    		if ($this->invoice->type == Facture::TYPE_CREDIT_NOTE) $label = '(CustomerInvoicePaymentBack)'; // Refund of a credit note
-    		$result = $paymentobj->addPaymentToBank(DolibarrApiAccess::$user, 'payment', $label, $accountid, $chqemetteur, $chqbank);
-    		if ($result < 0)
-    		{
-    			$this->db->rollback();
-    			throw new RestException(400, 'Add payment to bank error : '.$paymentobj->error);
-    		}
-    	}
+		$amounts = array();
+		$multicurrency_amounts = array();
 
-    	$this->db->commit();
+		// Clean parameters amount if payment is for a credit note
+		if ($this->invoice->type == Facture::TYPE_CREDIT_NOTE) {
+			$resteapayer = price2num($resteapayer, 'MT');
+			$amounts[$id] = -$resteapayer;
+			// Multicurrency
+			$newvalue = price2num($this->invoice->multicurrency_total_ttc, 'MT');
+			$multicurrency_amounts[$id] = -$newvalue;
+		} else {
+			$resteapayer = price2num($resteapayer, 'MT');
+			$amounts[$id] = $resteapayer;
+			// Multicurrency
+			$newvalue = price2num($this->invoice->multicurrency_total_ttc, 'MT');
+			$multicurrency_amounts[$id] = $newvalue;
+		}
 
-    	return $payment_id;
-    }
 
-    /**
-     * Add a payment to pay partially or completely one or several invoices.
-     * Warning: Take care that all invoices are owned by the same customer.
-     * Example of value for parameter arrayofamounts: {"1": {"amount": "99.99", "multicurrency_amount": ""}, "2": {"amount": "", "multicurrency_amount": "10"}}
-     *
-     * @param array   $arrayofamounts     {@from body}  Array with id of invoices with amount to pay for each invoice
-     * @param string  $datepaye           {@from body}  Payment date        {@type timestamp}
-     * @param int     $paymentid           {@from body}  Payment mode Id {@min 1}
-     * @param string  $closepaidinvoices   {@from body}  Close paid invoices {@choice yes,no}
-     * @param int     $accountid           {@from body}  Account Id {@min 1}
-     * @param string  $num_payment         {@from body}  Payment number (optional)
-     * @param string  $comment             {@from body}  Note private (optional)
-     * @param string  $chqemetteur         {@from body}  Payment issuer (mandatory if paiementcode = 'CHQ')
-     * @param string  $chqbank             {@from body}  Issuer bank name (optional)
-     * @param string  $ref_ext             {@from body}  External reference (optional)
-     * @param bool    $accepthigherpayment {@from body}  Accept higher payments that it remains to be paid (optional)
-     *
-     * @url     POST /paymentsdistributed
-     *
-     * @return int  Payment ID
-     * @throws RestException 400
-     * @throws RestException 401
-     * @throws RestException 403
-     * @throws RestException 404
-     */
-    public function addPaymentDistributed($arrayofamounts, $datepaye, $paymentid, $closepaidinvoices, $accountid, $num_payment = '', $comment = '', $chqemetteur = '', $chqbank = '', $ref_ext = '', $accepthigherpayment = false)
-    {
-        global $conf;
+		// Creation of payment line
+		$paymentobj = new Paiement($this->db);
+		$paymentobj->datepaye     = $datepaye;
+		$paymentobj->amounts      = $amounts; // Array with all payments dispatching with invoice id
+		$paymentobj->multicurrency_amounts = $multicurrency_amounts; // Array with all payments dispatching
+		$paymentobj->paiementid = $paymentid;
+		$paymentobj->paiementcode = dol_getIdFromCode($this->db, $paymentid, 'c_paiement', 'id', 'code', 1);
+		$paymentobj->num_payment = $num_payment;
+		$paymentobj->note_private = $comment;
 
-        require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
+		$payment_id = $paymentobj->create(DolibarrApiAccess::$user, ($closepaidinvoices == 'yes' ? 1 : 0)); // This include closing invoices
+		if ($payment_id < 0)
+		{
+			$this->db->rollback();
+			throw new RestException(400, 'Payment error : '.$paymentobj->error);
+		}
 
-        if (!DolibarrApiAccess::$user->rights->facture->creer) {
-            throw new RestException(403);
-        }
-        foreach ($arrayofamounts as $id => $amount) {
-        	if (empty($id)) {
-        		throw new RestException(400, 'Invoice ID is mandatory. Fill the invoice id and amount into arrayofamounts parameter. For example: {"1": "99.99", "2": "10"}');
-        	}
-        	if (!DolibarrApi::_checkAccessToResource('facture', $id)) {
-        		throw new RestException(403, 'Access not allowed on invoice ID '.$id.' for login '.DolibarrApiAccess::$user->login);
-        	}
-        }
+		if (!empty($conf->banque->enabled)) {
+			$label = '(CustomerInvoicePayment)';
 
-        if (!empty($conf->banque->enabled)) {
-        	if (empty($accountid)) {
-        		throw new RestException(400, 'Account ID is mandatory');
-        	}
-        }
-        if (empty($paymentid)) {
-        	throw new RestException(400, 'Payment ID or Payment Code is mandatory');
-        }
+			if ($paymentobj->paiementcode == 'CHQ' && empty($chqemetteur)) {
+				throw new RestException(400, 'Emetteur is mandatory when payment code is '.$paymentobj->paiementcode);
+			}
+			if ($this->invoice->type == Facture::TYPE_CREDIT_NOTE) $label = '(CustomerInvoicePaymentBack)'; // Refund of a credit note
+			$result = $paymentobj->addPaymentToBank(DolibarrApiAccess::$user, 'payment', $label, $accountid, $chqemetteur, $chqbank);
+			if ($result < 0)
+			{
+				$this->db->rollback();
+				throw new RestException(400, 'Add payment to bank error : '.$paymentobj->error);
+			}
+		}
 
-        $this->db->begin();
+		$this->db->commit();
 
-        $amounts = array();
-        $multicurrency_amounts = array();
+		return $payment_id;
+	}
 
-        // Loop on each invoice to pay
-        foreach ($arrayofamounts as $id => $amountarray)
-        {
-        	$result = $this->invoice->fetch($id);
-        	if (!$result) {
-        		$this->db->rollback();
-        		throw new RestException(404, 'Invoice ID '.$id.' not found');
-        	}
+	/**
+	 * Add a payment to pay partially or completely one or several invoices.
+	 * Warning: Take care that all invoices are owned by the same customer.
+	 * Example of value for parameter arrayofamounts: {"1": {"amount": "99.99", "multicurrency_amount": ""}, "2": {"amount": "", "multicurrency_amount": "10"}}
+	 *
+	 * @param array   $arrayofamounts     {@from body}  Array with id of invoices with amount to pay for each invoice
+	 * @param string  $datepaye           {@from body}  Payment date        {@type timestamp}
+	 * @param int     $paymentid           {@from body}  Payment mode Id {@min 1}
+	 * @param string  $closepaidinvoices   {@from body}  Close paid invoices {@choice yes,no}
+	 * @param int     $accountid           {@from body}  Account Id {@min 1}
+	 * @param string  $num_payment         {@from body}  Payment number (optional)
+	 * @param string  $comment             {@from body}  Note private (optional)
+	 * @param string  $chqemetteur         {@from body}  Payment issuer (mandatory if paiementcode = 'CHQ')
+	 * @param string  $chqbank             {@from body}  Issuer bank name (optional)
+	 * @param string  $ref_ext             {@from body}  External reference (optional)
+	 * @param bool    $accepthigherpayment {@from body}  Accept higher payments that it remains to be paid (optional)
+	 *
+	 * @url     POST /paymentsdistributed
+	 *
+	 * @return int  Payment ID
+	 * @throws RestException 400
+	 * @throws RestException 401
+	 * @throws RestException 403
+	 * @throws RestException 404
+	 */
+	public function addPaymentDistributed($arrayofamounts, $datepaye, $paymentid, $closepaidinvoices, $accountid, $num_payment = '', $comment = '', $chqemetteur = '', $chqbank = '', $ref_ext = '', $accepthigherpayment = false)
+	{
+		global $conf;
 
-        	if (($amountarray["amount"] == "remain" || $amountarray["amount"] > 0) && ($amountarray["multicurrency_amount"] == "remain" || $amountarray["multicurrency_amount"] > 0)) {
-        	    $this->db->rollback();
-        	    throw new RestException(400, 'Payment in both currency '.$id.' ( amount: '.$amountarray["amount"].', multicurrency_amount: '.$amountarray["multicurrency_amount"].')');
-        	}
+		require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
 
-        	$is_multicurrency = 0;
-        	$total_ttc = $this->invoice->total_ttc;
+		if (!DolibarrApiAccess::$user->rights->facture->creer) {
+			throw new RestException(403);
+		}
+		foreach ($arrayofamounts as $id => $amount) {
+			if (empty($id)) {
+				throw new RestException(400, 'Invoice ID is mandatory. Fill the invoice id and amount into arrayofamounts parameter. For example: {"1": "99.99", "2": "10"}');
+			}
+			if (!DolibarrApi::_checkAccessToResource('facture', $id)) {
+				throw new RestException(403, 'Access not allowed on invoice ID '.$id.' for login '.DolibarrApiAccess::$user->login);
+			}
+		}
 
-        	if ($amountarray["multicurrency_amount"] > 0 || $amountarray["multicurrency_amount"] == "remain") {
-        	    $is_multicurrency = 1;
-        	    $total_ttc = $this->invoice->multicurrency_total_ttc;
-        	}
+		if (!empty($conf->banque->enabled)) {
+			if (empty($accountid)) {
+				throw new RestException(400, 'Account ID is mandatory');
+			}
+		}
+		if (empty($paymentid)) {
+			throw new RestException(400, 'Payment ID or Payment Code is mandatory');
+		}
 
-        	// Calculate amount to pay
-        	$totalpaye = $this->invoice->getSommePaiement($is_multicurrency);
-        	$totalcreditnotes = $this->invoice->getSumCreditNotesUsed($is_multicurrency);
-        	$totaldeposits = $this->invoice->getSumDepositsUsed($is_multicurrency);
-        	$remainstopay = $amount = price2num($total_ttc - $totalpaye - $totalcreditnotes - $totaldeposits, 'MT');
+		$this->db->begin();
 
-        	if (!$is_multicurrency && $amountarray["amount"] != 'remain')
-        	{
-        	    $amount = price2num($amountarray["amount"], 'MT');
-        	}
+		$amounts = array();
+		$multicurrency_amounts = array();
 
-        	if ($is_multicurrency && $amountarray["multicurrency_amount"] != 'remain')
-        	{
-        	    $amount = price2num($amountarray["multicurrency_amount"], 'MT');
-        	}
+		// Loop on each invoice to pay
+		foreach ($arrayofamounts as $id => $amountarray)
+		{
+			$result = $this->invoice->fetch($id);
+			if (!$result) {
+				$this->db->rollback();
+				throw new RestException(404, 'Invoice ID '.$id.' not found');
+			}
+
+			if (($amountarray["amount"] == "remain" || $amountarray["amount"] > 0) && ($amountarray["multicurrency_amount"] == "remain" || $amountarray["multicurrency_amount"] > 0)) {
+				$this->db->rollback();
+				throw new RestException(400, 'Payment in both currency '.$id.' ( amount: '.$amountarray["amount"].', multicurrency_amount: '.$amountarray["multicurrency_amount"].')');
+			}
+
+			$is_multicurrency = 0;
+			$total_ttc = $this->invoice->total_ttc;
+
+			if ($amountarray["multicurrency_amount"] > 0 || $amountarray["multicurrency_amount"] == "remain") {
+				$is_multicurrency = 1;
+				$total_ttc = $this->invoice->multicurrency_total_ttc;
+			}
+
+			// Calculate amount to pay
+			$totalpaye = $this->invoice->getSommePaiement($is_multicurrency);
+			$totalcreditnotes = $this->invoice->getSumCreditNotesUsed($is_multicurrency);
+			$totaldeposits = $this->invoice->getSumDepositsUsed($is_multicurrency);
+			$remainstopay = $amount = price2num($total_ttc - $totalpaye - $totalcreditnotes - $totaldeposits, 'MT');
+
+			if (!$is_multicurrency && $amountarray["amount"] != 'remain')
+			{
+				$amount = price2num($amountarray["amount"], 'MT');
+			}
+
+			if ($is_multicurrency && $amountarray["multicurrency_amount"] != 'remain')
+			{
+				$amount = price2num($amountarray["multicurrency_amount"], 'MT');
+			}
 
 			if ($amount > $remainstopay && !$accepthigherpayment) {
 				$this->db->rollback();
-        		throw new RestException(400, 'Payment amount on invoice ID '.$id.' ('.$amount.') is higher than remain to pay ('.$remainstopay.')');
+				throw new RestException(400, 'Payment amount on invoice ID '.$id.' ('.$amount.') is higher than remain to pay ('.$remainstopay.')');
 			}
 
-        	if ($this->invoice->type == Facture::TYPE_CREDIT_NOTE) {
-        	    $amount = -$amount;
-        	}
+			if ($this->invoice->type == Facture::TYPE_CREDIT_NOTE) {
+				$amount = -$amount;
+			}
 
-            if ($is_multicurrency) {
-                $amounts[$id] = null;
-                // Multicurrency
-                $multicurrency_amounts[$id] = $amount;
-            } else {
-                $amounts[$id] = $amount;
-                // Multicurrency
-                $multicurrency_amounts[$id] = null;
-            }
-        }
+			if ($is_multicurrency) {
+				$amounts[$id] = null;
+				// Multicurrency
+				$multicurrency_amounts[$id] = $amount;
+			} else {
+				$amounts[$id] = $amount;
+				// Multicurrency
+				$multicurrency_amounts[$id] = null;
+			}
+		}
 
-        // Creation of payment line
-        $paymentobj = new Paiement($this->db);
-        $paymentobj->datepaye     = $datepaye;
-        $paymentobj->amounts      = $amounts; // Array with all payments dispatching with invoice id
-        $paymentobj->multicurrency_amounts = $multicurrency_amounts; // Array with all payments dispatching
-        $paymentobj->paiementid   = $paymentid;
-        $paymentobj->paiementcode = dol_getIdFromCode($this->db, $paymentid, 'c_paiement', 'id', 'code', 1);
-        $paymentobj->num_payment  = $num_payment;
-        $paymentobj->note_private = $comment;
-        $paymentobj->ref_ext      = $ref_ext;
-        $payment_id = $paymentobj->create(DolibarrApiAccess::$user, ($closepaidinvoices == 'yes' ? 1 : 0)); // This include closing invoices
-        if ($payment_id < 0)
-        {
-            $this->db->rollback();
-            throw new RestException(400, 'Payment error : '.$paymentobj->error);
-        }
-        if (!empty($conf->banque->enabled)) {
-            $label = '(CustomerInvoicePayment)';
-            if ($paymentobj->paiementcode == 'CHQ' && empty($chqemetteur)) {
-                  throw new RestException(400, 'Emetteur is mandatory when payment code is '.$paymentobj->paiementcode);
-            }
-            if ($this->invoice->type == Facture::TYPE_CREDIT_NOTE) $label = '(CustomerInvoicePaymentBack)'; // Refund of a credit note
-            $result = $paymentobj->addPaymentToBank(DolibarrApiAccess::$user, 'payment', $label, $accountid, $chqemetteur, $chqbank);
-            if ($result < 0)
-            {
-                $this->db->rollback();
-                throw new RestException(400, 'Add payment to bank error : '.$paymentobj->error);
-            }
-        }
+		// Creation of payment line
+		$paymentobj = new Paiement($this->db);
+		$paymentobj->datepaye     = $datepaye;
+		$paymentobj->amounts      = $amounts; // Array with all payments dispatching with invoice id
+		$paymentobj->multicurrency_amounts = $multicurrency_amounts; // Array with all payments dispatching
+		$paymentobj->paiementid   = $paymentid;
+		$paymentobj->paiementcode = dol_getIdFromCode($this->db, $paymentid, 'c_paiement', 'id', 'code', 1);
+		$paymentobj->num_payment  = $num_payment;
+		$paymentobj->note_private = $comment;
+		$paymentobj->ref_ext      = $ref_ext;
+		$payment_id = $paymentobj->create(DolibarrApiAccess::$user, ($closepaidinvoices == 'yes' ? 1 : 0)); // This include closing invoices
+		if ($payment_id < 0)
+		{
+			$this->db->rollback();
+			throw new RestException(400, 'Payment error : '.$paymentobj->error);
+		}
+		if (!empty($conf->banque->enabled)) {
+			$label = '(CustomerInvoicePayment)';
+			if ($paymentobj->paiementcode == 'CHQ' && empty($chqemetteur)) {
+				  throw new RestException(400, 'Emetteur is mandatory when payment code is '.$paymentobj->paiementcode);
+			}
+			if ($this->invoice->type == Facture::TYPE_CREDIT_NOTE) $label = '(CustomerInvoicePaymentBack)'; // Refund of a credit note
+			$result = $paymentobj->addPaymentToBank(DolibarrApiAccess::$user, 'payment', $label, $accountid, $chqemetteur, $chqbank);
+			if ($result < 0)
+			{
+				$this->db->rollback();
+				throw new RestException(400, 'Add payment to bank error : '.$paymentobj->error);
+			}
+		}
 
-        $this->db->commit();
+		$this->db->commit();
 
-        return $payment_id;
-    }
+		return $payment_id;
+	}
 
-    /**
-     * Update a payment
-     *
-     * @param int       $id             Id of payment
-     * @param string    $num_payment    Payment number
-     *
-     * @url     PUT payments/{id}
-     *
-     * @return array
+	/**
+	 * Update a payment
+	 *
+	 * @param int       $id             Id of payment
+	 * @param string    $num_payment    Payment number
+	 *
+	 * @url     PUT payments/{id}
+	 *
+	 * @return array
 	 * @throws RestException 400 Bad parameters
 	 * @throws RestException 401 Not allowed
 	 * @throws RestException 404 Not found
-     */
-    public function putPayment($id, $num_payment = '')
-    {
-        require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
+	 */
+	public function putPayment($id, $num_payment = '')
+	{
+		require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
 
-        if (!DolibarrApiAccess::$user->rights->facture->creer) {
-            throw new RestException(401);
-        }
-        if (empty($id)) {
-            throw new RestException(400, 'Payment ID is mandatory');
-        }
+		if (!DolibarrApiAccess::$user->rights->facture->creer) {
+			throw new RestException(401);
+		}
+		if (empty($id)) {
+			throw new RestException(400, 'Payment ID is mandatory');
+		}
 
-        $paymentobj = new Paiement($this->db);
-        $result = $paymentobj->fetch($id);
+		$paymentobj = new Paiement($this->db);
+		$result = $paymentobj->fetch($id);
 
-        if (!$result) {
-            throw new RestException(404, 'Payment not found');
-        }
+		if (!$result) {
+			throw new RestException(404, 'Payment not found');
+		}
 
-        if (!empty($num_payment)) {
-            $result = $paymentobj->update_num($num_payment);
-            if ($result < 0) {
-                throw new RestException(500, 'Error when updating the payment num');
-            }
-        }
+		if (!empty($num_payment)) {
+			$result = $paymentobj->update_num($num_payment);
+			if ($result < 0) {
+				throw new RestException(500, 'Error when updating the payment num');
+			}
+		}
 
-        return [
-            'success' => [
-                'code' => 200,
-                'message' => 'Payment updated'
-            ]
-        ];
-    }
+		return [
+			'success' => [
+				'code' => 200,
+				'message' => 'Payment updated'
+			]
+		];
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
-    /**
-     * Clean sensible object datas
-     *
-     * @param   object  $object    Object to clean
-     * @return    array    Array of cleaned object properties
-     */
-    protected function _cleanObjectDatas($object)
-    {
-        // phpcs:enable
-        $object = parent::_cleanObjectDatas($object);
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	/**
+	 * Clean sensible object datas
+	 *
+	 * @param   Object  $object     Object to clean
+	 * @return  Object              Object with cleaned properties
+	 */
+	protected function _cleanObjectDatas($object)
+	{
+		// phpcs:enable
+		$object = parent::_cleanObjectDatas($object);
 
-        unset($object->note);
-        unset($object->address);
-        unset($object->barcode_type);
-        unset($object->barcode_type_code);
-        unset($object->barcode_type_label);
-        unset($object->barcode_type_coder);
+		unset($object->note);
+		unset($object->address);
+		unset($object->barcode_type);
+		unset($object->barcode_type_code);
+		unset($object->barcode_type_label);
+		unset($object->barcode_type_coder);
 
-        return $object;
-    }
+		return $object;
+	}
 
-    /**
-     * Validate fields before create or update object
-     *
-     * @param array|null    $data       Datas to validate
-     * @return array
-     *
-     * @throws RestException
-     */
-    private function _validate($data)
-    {
-        $invoice = array();
-        foreach (Invoices::$FIELDS as $field) {
-            if (!isset($data[$field])) {
-                throw new RestException(400, "$field field missing");
-            }
-            $invoice[$field] = $data[$field];
-        }
-        return $invoice;
-    }
+	/**
+	 * Validate fields before create or update object
+	 *
+	 * @param array|null    $data       Datas to validate
+	 * @return array
+	 *
+	 * @throws RestException
+	 */
+	private function _validate($data)
+	{
+		$invoice = array();
+		foreach (Invoices::$FIELDS as $field) {
+			if (!isset($data[$field])) {
+				throw new RestException(400, "$field field missing");
+			}
+			$invoice[$field] = $data[$field];
+		}
+		return $invoice;
+	}
 }
diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php
index 8aeaa2a9fe8..5771ead70f1 100644
--- a/htdocs/compta/facture/class/facture-rec.class.php
+++ b/htdocs/compta/facture/class/facture-rec.class.php
@@ -97,7 +97,7 @@ class FactureRec extends CommonInvoice
 	 */
 	public $frequency;
 
-    /**
+	/**
 	 * @var string Unit frequency
 	 */
 	public $unit_frequency;
@@ -317,46 +317,46 @@ class FactureRec extends CommonInvoice
 					$tva_tx = $facsrc->lines[$i]->tva_tx;
 					if (!empty($facsrc->lines[$i]->vat_src_code) && !preg_match('/\(/', $tva_tx)) $tva_tx .= ' ('.$facsrc->lines[$i]->vat_src_code.')';
 
-                    $result_insert = $this->addline(
-                        $facsrc->lines[$i]->desc,
-                        $facsrc->lines[$i]->subprice,
-                        $facsrc->lines[$i]->qty,
+					$result_insert = $this->addline(
+						$facsrc->lines[$i]->desc,
+						$facsrc->lines[$i]->subprice,
+						$facsrc->lines[$i]->qty,
 						$tva_tx,
-                        $facsrc->lines[$i]->localtax1_tx,
-                        $facsrc->lines[$i]->localtax2_tx,
-                        $facsrc->lines[$i]->fk_product,
-                        $facsrc->lines[$i]->remise_percent,
-                        'HT',
+						$facsrc->lines[$i]->localtax1_tx,
+						$facsrc->lines[$i]->localtax2_tx,
+						$facsrc->lines[$i]->fk_product,
+						$facsrc->lines[$i]->remise_percent,
+						'HT',
 						$facsrc->lines[$i]->info_bits,
-                        '',
-                        0,
-                        $facsrc->lines[$i]->product_type,
-                        $facsrc->lines[$i]->rang,
-                        $facsrc->lines[$i]->special_code,
-                    	$facsrc->lines[$i]->label,
+						'',
+						0,
+						$facsrc->lines[$i]->product_type,
+						$facsrc->lines[$i]->rang,
+						$facsrc->lines[$i]->special_code,
+						$facsrc->lines[$i]->label,
 						$facsrc->lines[$i]->fk_unit,
 						$facsrc->lines[$i]->multicurrency_subprice
-                    );
+					);
 
 					if ($result_insert < 0)
 					{
 						$error++;
 					} else {
-					    $objectline = new FactureLigneRec($this->db);
-					    if ($objectline->fetch($result_insert))
-					    {
-					        // Extrafields
-					        if (method_exists($facsrc->lines[$i], 'fetch_optionals')) {
-					            $facsrc->lines[$i]->fetch_optionals($facsrc->lines[$i]->rowid);
-					            $objectline->array_options = $facsrc->lines[$i]->array_options;
-					        }
+						$objectline = new FactureLigneRec($this->db);
+						if ($objectline->fetch($result_insert))
+						{
+							// Extrafields
+							if (method_exists($facsrc->lines[$i], 'fetch_optionals')) {
+								$facsrc->lines[$i]->fetch_optionals($facsrc->lines[$i]->rowid);
+								$objectline->array_options = $facsrc->lines[$i]->array_options;
+							}
 
-					        $result = $objectline->insertExtraFields();
-					        if ($result < 0)
-					        {
-					            $error++;
-					        }
-					    }
+							$result = $objectline->insertExtraFields();
+							if ($result < 0)
+							{
+								$error++;
+							}
+						}
 					}
 				}
 
@@ -370,27 +370,27 @@ class FactureRec extends CommonInvoice
 				{
 					foreach ($this->linked_objects as $origin => $tmp_origin_id)
 					{
-					    if (is_array($tmp_origin_id))       // New behaviour, if linked_object can have several links per type, so is something like array('contract'=>array(id1, id2, ...))
-					    {
-					        foreach ($tmp_origin_id as $origin_id)
-					        {
-					            $ret = $this->add_object_linked($origin, $origin_id);
-					            if (!$ret)
-					            {
-					                $this->error = $this->db->lasterror();
-					                $error++;
-					            }
-					        }
-					    } else // Old behaviour, if linked_object has only one link per type, so is something like array('contract'=>id1))
-					    {
-					        $origin_id = $tmp_origin_id;
-	    					$ret = $this->add_object_linked($origin, $origin_id);
-	    					if (!$ret)
-	    					{
-	    						$this->error = $this->db->lasterror();
-	    						$error++;
-	    					}
-					    }
+						if (is_array($tmp_origin_id))       // New behaviour, if linked_object can have several links per type, so is something like array('contract'=>array(id1, id2, ...))
+						{
+							foreach ($tmp_origin_id as $origin_id)
+							{
+								$ret = $this->add_object_linked($origin, $origin_id);
+								if (!$ret)
+								{
+									$this->error = $this->db->lasterror();
+									$error++;
+								}
+							}
+						} else // Old behaviour, if linked_object has only one link per type, so is something like array('contract'=>id1))
+						{
+							$origin_id = $tmp_origin_id;
+							$ret = $this->add_object_linked($origin, $origin_id);
+							if (!$ret)
+							{
+								$this->error = $this->db->lasterror();
+								$error++;
+							}
+						}
 					}
 				}
 
@@ -422,7 +422,7 @@ class FactureRec extends CommonInvoice
 					return $this->id;
 				}
 			} else {
-			    $this->error = $this->db->lasterror();
+				$this->error = $this->db->lasterror();
 				$this->db->rollback();
 				return -2;
 			}
@@ -442,46 +442,46 @@ class FactureRec extends CommonInvoice
 	 */
 	public function update(User $user, $notrigger = 0)
 	{
-	    global $conf;
+		global $conf;
 
-        $error = 0;
+		$error = 0;
 
-	    $sql = "UPDATE ".MAIN_DB_PREFIX."facture_rec SET";
-	    $sql .= " fk_soc = ".$this->fk_soc;
-        // TODO Add missing fields
-	    $sql .= " WHERE rowid = ".$this->id;
+		$sql = "UPDATE ".MAIN_DB_PREFIX."facture_rec SET";
+		$sql .= " fk_soc = ".$this->fk_soc;
+		// TODO Add missing fields
+		$sql .= " WHERE rowid = ".$this->id;
 
-	    dol_syslog(get_class($this)."::update", LOG_DEBUG);
-	    $resql = $this->db->query($sql);
-	    if ($resql)
-	    {
-	        if (!$error)
-	        {
-	            $result = $this->insertExtraFields();
-	            if ($result < 0)
-	            {
-	                $error++;
-	            }
-	        }
+		dol_syslog(get_class($this)."::update", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			if (!$error)
+			{
+				$result = $this->insertExtraFields();
+				if ($result < 0)
+				{
+					$error++;
+				}
+			}
 
-	        if (!$error && !$notrigger)
-	        {
-	            // Call trigger
-	            $result = $this->call_trigger('BILLREC_UPDATE', $user);
-	            if ($result < 0)
-	            {
-	                $this->db->rollback();
-	                return -2;
-	            }
-	            // End call triggers
-	        }
-	        $this->db->commit();
-	        return 1;
-	    } else {
-	        $this->error = $this->db->lasterror();
-	        $this->db->rollback();
-	        return -2;
-	    }
+			if (!$error && !$notrigger)
+			{
+				// Call trigger
+				$result = $this->call_trigger('BILLREC_UPDATE', $user);
+				if ($result < 0)
+				{
+					$this->db->rollback();
+					return -2;
+				}
+				// End call triggers
+			}
+			$this->db->commit();
+			return 1;
+		} else {
+			$this->error = $this->db->lasterror();
+			$this->db->rollback();
+			return -2;
+		}
 	}
 
 	/**
@@ -498,13 +498,13 @@ class FactureRec extends CommonInvoice
 		$sql .= ', f.remise_percent, f.remise_absolue, f.remise';
 		$sql .= ', f.date_lim_reglement as dlr';
 		$sql .= ', f.note_private, f.note_public, f.fk_user_author';
-        $sql .= ', f.modelpdf';
+		$sql .= ', f.modelpdf';
 		$sql .= ', f.fk_mode_reglement, f.fk_cond_reglement, f.fk_projet as fk_project';
 		$sql .= ', f.fk_account';
 		$sql .= ', f.frequency, f.unit_frequency, f.date_when, f.date_last_gen, f.nb_gen_done, f.nb_gen_max, f.usenewprice, f.auto_validate';
-        $sql .= ', f.generate_pdf';
-        $sql .= ", f.fk_multicurrency, f.multicurrency_code, f.multicurrency_tx, f.multicurrency_total_ht, f.multicurrency_total_tva, f.multicurrency_total_ttc";
-        $sql .= ', p.code as mode_reglement_code, p.libelle as mode_reglement_libelle';
+		$sql .= ', f.generate_pdf';
+		$sql .= ", f.fk_multicurrency, f.multicurrency_code, f.multicurrency_tx, f.multicurrency_total_ht, f.multicurrency_total_tva, f.multicurrency_total_ttc";
+		$sql .= ', p.code as mode_reglement_code, p.libelle as mode_reglement_libelle';
 		$sql .= ', c.code as cond_reglement_code, c.libelle as cond_reglement_libelle, c.libelle_facture as cond_reglement_libelle_doc';
 		//$sql.= ', el.fk_source';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'facture_rec as f';
@@ -618,21 +618,21 @@ class FactureRec extends CommonInvoice
 	 */
 	public function getLinesArray()
 	{
-	    return $this->fetch_lines();
+		return $this->fetch_lines();
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Get lines of template invoices into this->lines
 	 *
 	 *  @return     int         1 if OK, < 0 if KO
-     */
+	 */
 	public function fetch_lines()
 	{
 		global $extrafields;
 
-        // phpcs:enable
+		// phpcs:enable
 		$this->lines = array();
 
 		// Retrieve all extrafield for line
@@ -710,7 +710,7 @@ class FactureRec extends CommonInvoice
 				$line->rang = $objp->rang;
 				$line->special_code = $objp->special_code;
 				$line->fk_unit = $objp->fk_unit;
-                $line->fk_contract_line = $objp->fk_contract_line;
+				$line->fk_contract_line = $objp->fk_contract_line;
 
 				// Ne plus utiliser
 				$line->price            = $objp->price;
@@ -750,17 +750,17 @@ class FactureRec extends CommonInvoice
 	 */
 	public function delete(User $user, $notrigger = 0, $idwarehouse = -1)
 	{
-	    $rowid = $this->id;
+		$rowid = $this->id;
 
-	    dol_syslog(get_class($this)."::delete rowid=".$rowid, LOG_DEBUG);
+		dol_syslog(get_class($this)."::delete rowid=".$rowid, LOG_DEBUG);
 
-        $error = 0;
+		$error = 0;
 		$this->db->begin();
 
 		$main = MAIN_DB_PREFIX.'facturedet_rec';
-        $ef = $main."_extrafields";
-        $sqlef = "DELETE FROM $ef WHERE fk_object IN (SELECT rowid FROM $main WHERE fk_facture = $rowid)";
-        dol_syslog($sqlef);
+		$ef = $main."_extrafields";
+		$sqlef = "DELETE FROM $ef WHERE fk_object IN (SELECT rowid FROM $main WHERE fk_facture = $rowid)";
+		dol_syslog($sqlef);
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."facturedet_rec WHERE fk_facture = ".$rowid;
 		dol_syslog($sql);
 		if ($this->db->query($sqlef) && $this->db->query($sql))
@@ -773,8 +773,8 @@ class FactureRec extends CommonInvoice
 				$res = $this->deleteObjectLinked();
 				if ($res < 0) $error = -3;
 				// Delete extrafields
-                $res = $this->deleteExtraFields();
-                if ($res < 0) $error = -4;
+				$res = $this->deleteExtraFields();
+				if ($res < 0) $error = -4;
 			} else {
 				$this->error = $this->db->lasterror();
 				$error = -1;
@@ -786,11 +786,11 @@ class FactureRec extends CommonInvoice
 
 		if (!$error)
 		{
-		    $this->db->commit();
-		    return 1;
+			$this->db->commit();
+			return 1;
 		} else {
-	        $this->db->rollback();
-	        return $error;
+			$this->db->rollback();
+			return $error;
 		}
 	}
 
@@ -798,33 +798,33 @@ class FactureRec extends CommonInvoice
 	/**
 	 * 	Add a line to invoice
 	 *
-     *	@param    	string		$desc            	Description de la ligne
-     *	@param    	double		$pu_ht              Prix unitaire HT (> 0 even for credit note)
-     *	@param    	double		$qty             	Quantite
-     *	@param    	double		$txtva           	Taux de tva force, sinon -1
+	 *	@param    	string		$desc            	Description de la ligne
+	 *	@param    	double		$pu_ht              Prix unitaire HT (> 0 even for credit note)
+	 *	@param    	double		$qty             	Quantite
+	 *	@param    	double		$txtva           	Taux de tva force, sinon -1
 	 * 	@param		double		$txlocaltax1		Local tax 1 rate (deprecated)
 	 *  @param		double		$txlocaltax2		Local tax 2 rate (deprecated)
-     *	@param    	int			$fk_product      	Product/Service ID predefined
-     *	@param    	double		$remise_percent  	Percentage discount of the line
-     *	@param		string		$price_base_type	HT or TTC
-     *	@param    	int			$info_bits			VAT npr or not ?
-     *	@param    	int			$fk_remise_except	Id remise
-     *	@param    	double		$pu_ttc             Prix unitaire TTC (> 0 even for credit note)
-     *	@param		int			$type				Type of line (0=product, 1=service)
-     *	@param      int			$rang               Position of line
-     *	@param		int			$special_code		Special code
-     *	@param		string		$label				Label of the line
-     *	@param		string		$fk_unit			Unit
+	 *	@param    	int			$fk_product      	Product/Service ID predefined
+	 *	@param    	double		$remise_percent  	Percentage discount of the line
+	 *	@param		string		$price_base_type	HT or TTC
+	 *	@param    	int			$info_bits			VAT npr or not ?
+	 *	@param    	int			$fk_remise_except	Id remise
+	 *	@param    	double		$pu_ttc             Prix unitaire TTC (> 0 even for credit note)
+	 *	@param		int			$type				Type of line (0=product, 1=service)
+	 *	@param      int			$rang               Position of line
+	 *	@param		int			$special_code		Special code
+	 *	@param		string		$label				Label of the line
+	 *	@param		string		$fk_unit			Unit
 	 * 	@param		double		$pu_ht_devise		Unit price in currency
 	 *  @param		int			$date_start_fill	1=Flag to fill start date when generating invoice
 	 *  @param		int			$date_end_fill		1=Flag to fill end date when generating invoice
 	 * 	@param		int			$fk_fournprice		Supplier price id (to calculate margin) or ''
 	 * 	@param		int			$pa_ht				Buying price of line (to calculate margin) or ''
-     *	@return    	int             				<0 if KO, Id of line if OK
+	 *	@return    	int             				<0 if KO, Id of line if OK
 	 */
 	public function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1 = 0, $txlocaltax2 = 0, $fk_product = 0, $remise_percent = 0, $price_base_type = 'HT', $info_bits = 0, $fk_remise_except = '', $pu_ttc = 0, $type = 0, $rang = -1, $special_code = 0, $label = '', $fk_unit = null, $pu_ht_devise = 0, $date_start_fill = 0, $date_end_fill = 0, $fk_fournprice = null, $pa_ht = 0)
 	{
-	    global $mysoc;
+		global $mysoc;
 
 		$facid = $this->id;
 
@@ -1008,131 +1008,131 @@ class FactureRec extends CommonInvoice
 	 */
 	public function updateline($rowid, $desc, $pu_ht, $qty, $txtva, $txlocaltax1 = 0, $txlocaltax2 = 0, $fk_product = 0, $remise_percent = 0, $price_base_type = 'HT', $info_bits = 0, $fk_remise_except = '', $pu_ttc = 0, $type = 0, $rang = -1, $special_code = 0, $label = '', $fk_unit = null, $pu_ht_devise = 0, $notrigger = 0, $date_start_fill = 0, $date_end_fill = 0, $fk_fournprice = null, $pa_ht = 0)
 	{
-	    global $mysoc;
+		global $mysoc;
 
-	    $facid = $this->id;
+		$facid = $this->id;
 
-	    dol_syslog(get_class($this)."::updateline facid=".$facid." rowid=$rowid, desc=$desc, pu_ht=$pu_ht, qty=$qty, txtva=$txtva, txlocaltax1=$txlocaltax1, txlocaltax2=$txlocaltax2, fk_product=$fk_product, remise_percent=$remise_percent, info_bits=$info_bits, fk_remise_except=$fk_remise_except, price_base_type=$price_base_type, pu_ttc=$pu_ttc, type=$type, fk_unit=$fk_unit, pu_ht_devise=$pu_ht_devise", LOG_DEBUG);
-	    include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
+		dol_syslog(get_class($this)."::updateline facid=".$facid." rowid=$rowid, desc=$desc, pu_ht=$pu_ht, qty=$qty, txtva=$txtva, txlocaltax1=$txlocaltax1, txlocaltax2=$txlocaltax2, fk_product=$fk_product, remise_percent=$remise_percent, info_bits=$info_bits, fk_remise_except=$fk_remise_except, price_base_type=$price_base_type, pu_ttc=$pu_ttc, type=$type, fk_unit=$fk_unit, pu_ht_devise=$pu_ht_devise", LOG_DEBUG);
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
 
-	    // Clean parameters
-	    if (empty($remise_percent)) $remise_percent = 0;
+		// Clean parameters
+		if (empty($remise_percent)) $remise_percent = 0;
 
-	    // Check parameters
-	    if ($type < 0) return -1;
+		// Check parameters
+		if ($type < 0) return -1;
 
-	    if ($this->brouillon)
-	    {
-	        // Clean parameters
-	        $remise_percent = price2num($remise_percent);
-	        $qty = price2num($qty);
-	        if (empty($info_bits)) $info_bits = 0;
-	        $pu_ht          = price2num($pu_ht);
-	        $pu_ttc         = price2num($pu_ttc);
-	        $pu_ht_devise = price2num($pu_ht_devise);
-	        $txtva = price2num($txtva);
-		    $txlocaltax1	= price2num($txlocaltax1);
-		    $txlocaltax2	= price2num($txlocaltax2);
-		    if (empty($txlocaltax1)) $txlocaltax1 = 0;
-		    if (empty($txlocaltax2)) $txlocaltax2 = 0;
+		if ($this->brouillon)
+		{
+			// Clean parameters
+			$remise_percent = price2num($remise_percent);
+			$qty = price2num($qty);
+			if (empty($info_bits)) $info_bits = 0;
+			$pu_ht          = price2num($pu_ht);
+			$pu_ttc         = price2num($pu_ttc);
+			$pu_ht_devise = price2num($pu_ht_devise);
+			$txtva = price2num($txtva);
+			$txlocaltax1	= price2num($txlocaltax1);
+			$txlocaltax2	= price2num($txlocaltax2);
+			if (empty($txlocaltax1)) $txlocaltax1 = 0;
+			if (empty($txlocaltax2)) $txlocaltax2 = 0;
 
-		    if (empty($this->multicurrency_subprice)) $this->multicurrency_subprice = 0;
-		    if (empty($this->multicurrency_total_ht)) $this->multicurrency_total_ht = 0;
-		    if (empty($this->multicurrency_total_tva)) $this->multicurrency_total_tva = 0;
-		    if (empty($this->multicurrency_total_ttc)) $this->multicurrency_total_ttc = 0;
+			if (empty($this->multicurrency_subprice)) $this->multicurrency_subprice = 0;
+			if (empty($this->multicurrency_total_ht)) $this->multicurrency_total_ht = 0;
+			if (empty($this->multicurrency_total_tva)) $this->multicurrency_total_tva = 0;
+			if (empty($this->multicurrency_total_ttc)) $this->multicurrency_total_ttc = 0;
 
-	        if ($price_base_type == 'HT')
-	        {
-	            $pu = $pu_ht;
-	        } else {
-	            $pu = $pu_ttc;
-	        }
+			if ($price_base_type == 'HT')
+			{
+				$pu = $pu_ht;
+			} else {
+				$pu = $pu_ttc;
+			}
 
-	        // Calculate total with, without tax and tax from qty, pu, remise_percent and txtva
-	        // TRES IMPORTANT: C'est au moment de l'insertion ligne qu'on doit stocker
-	        // la part ht, tva et ttc, et ce au niveau de la ligne qui a son propre taux tva.
+			// Calculate total with, without tax and tax from qty, pu, remise_percent and txtva
+			// TRES IMPORTANT: C'est au moment de l'insertion ligne qu'on doit stocker
+			// la part ht, tva et ttc, et ce au niveau de la ligne qui a son propre taux tva.
 
-	        $localtaxes_type = getLocalTaxesFromRate($txtva, 0, $this->thirdparty, $mysoc);
+			$localtaxes_type = getLocalTaxesFromRate($txtva, 0, $this->thirdparty, $mysoc);
 
-	        // Clean vat code
-	        $vat_src_code = '';
-	        if (preg_match('/\((.*)\)/', $txtva, $reg))
-	        {
-	        	$vat_src_code = $reg[1];
-	        	$txtva = preg_replace('/\s*\(.*\)/', '', $txtva); // Remove code into vatrate.
-	        }
+			// Clean vat code
+			$vat_src_code = '';
+			if (preg_match('/\((.*)\)/', $txtva, $reg))
+			{
+				$vat_src_code = $reg[1];
+				$txtva = preg_replace('/\s*\(.*\)/', '', $txtva); // Remove code into vatrate.
+			}
 
-	        $tabprice = calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $type, $mysoc, $localtaxes_type, 100, $this->multicurrency_tx, $pu_ht_devise);
+			$tabprice = calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $type, $mysoc, $localtaxes_type, 100, $this->multicurrency_tx, $pu_ht_devise);
 
-	        $total_ht  = $tabprice[0];
-	        $total_tva = $tabprice[1];
-	        $total_ttc = $tabprice[2];
-		    $total_localtax1 = $tabprice[9];
-		    $total_localtax2 = $tabprice[10];
-		    $pu_ht  = $tabprice[3];
-		    $pu_tva = $tabprice[4];
-		    $pu_ttc = $tabprice[5];
+			$total_ht  = $tabprice[0];
+			$total_tva = $tabprice[1];
+			$total_ttc = $tabprice[2];
+			$total_localtax1 = $tabprice[9];
+			$total_localtax2 = $tabprice[10];
+			$pu_ht  = $tabprice[3];
+			$pu_tva = $tabprice[4];
+			$pu_ttc = $tabprice[5];
 
-		    // MultiCurrency
-		    $multicurrency_total_ht  = $tabprice[16];
-		    $multicurrency_total_tva = $tabprice[17];
-		    $multicurrency_total_ttc = $tabprice[18];
-		    $pu_ht_devise = $tabprice[19];
+			// MultiCurrency
+			$multicurrency_total_ht  = $tabprice[16];
+			$multicurrency_total_tva = $tabprice[17];
+			$multicurrency_total_ttc = $tabprice[18];
+			$pu_ht_devise = $tabprice[19];
 
-	        $product_type = $type;
-	        if ($fk_product)
-	        {
-	            $product = new Product($this->db);
-	            $result = $product->fetch($fk_product);
-	            $product_type = $product->type;
-	        }
+			$product_type = $type;
+			if ($fk_product)
+			{
+				$product = new Product($this->db);
+				$result = $product->fetch($fk_product);
+				$product_type = $product->type;
+			}
 
-	        $sql = "UPDATE ".MAIN_DB_PREFIX."facturedet_rec SET ";
-	        $sql .= "fk_facture = ".((int) $facid);
-	        $sql .= ", label=".(!empty($label) ? "'".$this->db->escape($label)."'" : "null");
-	        $sql .= ", description='".$this->db->escape($desc)."'";
-	        $sql .= ", price=".price2num($pu_ht);
-	        $sql .= ", qty=".price2num($qty);
-	        $sql .= ", tva_tx=".price2num($txtva);
-	        $sql .= ", vat_src_code='".$this->db->escape($vat_src_code)."'";
-		    $sql .= ", localtax1_tx=".$txlocaltax1;
-		    $sql .= ", localtax1_type='".$this->db->escape($localtaxes_type[0])."'";
-		    $sql .= ", localtax2_tx=".$txlocaltax2;
-		    $sql .= ", localtax2_type='".$this->db->escape($localtaxes_type[2])."'";
-		    $sql .= ", fk_product=".(!empty($fk_product) ? "'".$this->db->escape($fk_product)."'" : "null");
-	        $sql .= ", product_type=".$product_type;
-	        $sql .= ", remise_percent='".price2num($remise_percent)."'";
-	        $sql .= ", subprice='".price2num($pu_ht)."'";
-	        $sql .= ", total_ht='".price2num($total_ht)."'";
-	        $sql .= ", total_tva='".price2num($total_tva)."'";
-	        $sql .= ", total_localtax1='".price2num($total_localtax1)."'";
-	        $sql .= ", total_localtax2='".price2num($total_localtax2)."'";
-	        $sql .= ", total_ttc='".price2num($total_ttc)."'";
-	        $sql .= ", date_start_fill=".((int) $date_start_fill);
-	        $sql .= ", date_end_fill=".((int) $date_end_fill);
-	        $sql .= ", fk_product_fournisseur_price=".($fk_fournprice > 0 ? $fk_fournprice : 'null');
-	        $sql .= ", buy_price_ht=".($pa_ht ? price2num($pa_ht) : 0);
-	        $sql .= ", info_bits=".$info_bits;
-	        $sql .= ", rang=".$rang;
-	        $sql .= ", special_code=".$special_code;
-	        $sql .= ", fk_unit=".($fk_unit ? "'".$this->db->escape($fk_unit)."'" : "null");
-	        $sql .= ', multicurrency_subprice = '.$pu_ht_devise;
-	        $sql .= ', multicurrency_total_ht = '.$multicurrency_total_ht;
-	        $sql .= ', multicurrency_total_tva = '.$multicurrency_total_tva;
-	        $sql .= ', multicurrency_total_ttc = '.$multicurrency_total_ttc;
-	        $sql .= " WHERE rowid = ".$rowid;
+			$sql = "UPDATE ".MAIN_DB_PREFIX."facturedet_rec SET ";
+			$sql .= "fk_facture = ".((int) $facid);
+			$sql .= ", label=".(!empty($label) ? "'".$this->db->escape($label)."'" : "null");
+			$sql .= ", description='".$this->db->escape($desc)."'";
+			$sql .= ", price=".price2num($pu_ht);
+			$sql .= ", qty=".price2num($qty);
+			$sql .= ", tva_tx=".price2num($txtva);
+			$sql .= ", vat_src_code='".$this->db->escape($vat_src_code)."'";
+			$sql .= ", localtax1_tx=".$txlocaltax1;
+			$sql .= ", localtax1_type='".$this->db->escape($localtaxes_type[0])."'";
+			$sql .= ", localtax2_tx=".$txlocaltax2;
+			$sql .= ", localtax2_type='".$this->db->escape($localtaxes_type[2])."'";
+			$sql .= ", fk_product=".(!empty($fk_product) ? "'".$this->db->escape($fk_product)."'" : "null");
+			$sql .= ", product_type=".$product_type;
+			$sql .= ", remise_percent='".price2num($remise_percent)."'";
+			$sql .= ", subprice='".price2num($pu_ht)."'";
+			$sql .= ", total_ht='".price2num($total_ht)."'";
+			$sql .= ", total_tva='".price2num($total_tva)."'";
+			$sql .= ", total_localtax1='".price2num($total_localtax1)."'";
+			$sql .= ", total_localtax2='".price2num($total_localtax2)."'";
+			$sql .= ", total_ttc='".price2num($total_ttc)."'";
+			$sql .= ", date_start_fill=".((int) $date_start_fill);
+			$sql .= ", date_end_fill=".((int) $date_end_fill);
+			$sql .= ", fk_product_fournisseur_price=".($fk_fournprice > 0 ? $fk_fournprice : 'null');
+			$sql .= ", buy_price_ht=".($pa_ht ? price2num($pa_ht) : 0);
+			$sql .= ", info_bits=".$info_bits;
+			$sql .= ", rang=".$rang;
+			$sql .= ", special_code=".$special_code;
+			$sql .= ", fk_unit=".($fk_unit ? "'".$this->db->escape($fk_unit)."'" : "null");
+			$sql .= ', multicurrency_subprice = '.$pu_ht_devise;
+			$sql .= ', multicurrency_total_ht = '.$multicurrency_total_ht;
+			$sql .= ', multicurrency_total_tva = '.$multicurrency_total_tva;
+			$sql .= ', multicurrency_total_ttc = '.$multicurrency_total_ttc;
+			$sql .= " WHERE rowid = ".$rowid;
 
-	        dol_syslog(get_class($this)."::updateline", LOG_DEBUG);
-	        if ($this->db->query($sql))
-	        {
-	            $this->id = $facid;
-	            $this->update_price();
-	            return 1;
-	        } else {
-	            $this->error = $this->db->lasterror();
-	            return -1;
-	        }
-	    }
+			dol_syslog(get_class($this)."::updateline", LOG_DEBUG);
+			if ($this->db->query($sql))
+			{
+				$this->id = $facid;
+				$this->update_price();
+				return 1;
+			} else {
+				$this->error = $this->db->lasterror();
+				return -1;
+			}
+		}
 	}
 
 
@@ -1328,8 +1328,8 @@ class FactureRec extends CommonInvoice
 	 * @param  int		$max             			Maxlength of ref
 	 * @param  int		$short           			1=Return just URL
 	 * @param  string   $moretitle       			Add more text to title tooltip
-     * @param	int  	$notooltip		 			1=Disable tooltip
-     * @param  int		$save_lastsearch_value    	-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+	 * @param	int  	$notooltip		 			1=Disable tooltip
+	 * @param  int		$save_lastsearch_value    	-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
 	 * @return string 			         			String with URL
 	 */
 	public function getNomUrl($withpicto = 0, $option = '', $max = 0, $short = 0, $moretitle = '', $notooltip = '', $save_lastsearch_value = -1)
@@ -1356,17 +1356,17 @@ class FactureRec extends CommonInvoice
 			}
 		}
 
-        $url = DOL_URL_ROOT.'/compta/facture/card-rec.php?facid='.$this->id;
+		$url = DOL_URL_ROOT.'/compta/facture/card-rec.php?facid='.$this->id;
 
-        if ($short) return $url;
+		if ($short) return $url;
 
-        if ($option != 'nolink')
-        {
-        	// Add param to save lastsearch_values or not
-        	$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
-        	if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
-        	if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
-        }
+		if ($option != 'nolink')
+		{
+			// Add param to save lastsearch_values or not
+			$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
+			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
+			if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
+		}
 
 		$linkstart = '<a href="'.$url.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
 		$linkend = '</a>';
@@ -1391,7 +1391,7 @@ class FactureRec extends CommonInvoice
 		return $this->LibStatut($this->frequency ? 1 : 0, $this->suspended, $mode, $alreadypaid, empty($this->type) ? 0 : $this->type);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Return label of a status
 	 *
@@ -1404,7 +1404,7 @@ class FactureRec extends CommonInvoice
 	 */
 	public function LibStatut($recur, $status, $mode = 0, $alreadypaid = -1, $type = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 		$langs->load('bills');
 
@@ -1553,7 +1553,7 @@ class FactureRec extends CommonInvoice
 		$arraynow = dol_getdate($now);
 		$nownotime = dol_mktime(0, 0, 0, $arraynow['mon'], $arraynow['mday'], $arraynow['year']);
 
-        // Load array of products prodids
+		// Load array of products prodids
 		$num_prods = 0;
 		$prodids = array();
 
@@ -1690,190 +1690,190 @@ class FactureRec extends CommonInvoice
 	}
 
 	/**
-     *	Update frequency and unit
-     *
-     *	@param     	int		$frequency		value of frequency
-     *	@param     	string	$unit 			unit of frequency  (d, m, y)
-     *	@return		int						<0 if KO, >0 if OK
-     */
-    public function setFrequencyAndUnit($frequency, $unit)
-    {
-        if (!$this->table_element) {
-            dol_syslog(get_class($this)."::setFrequencyAndUnit was called on objet with property table_element not defined", LOG_ERR);
-            return -1;
-        }
-
-        if (!empty($frequency) && empty($unit)) {
-            dol_syslog(get_class($this)."::setFrequencyAndUnit was called on objet with params frequency defined but unit not defined", LOG_ERR);
-            return -2;
-        }
-
-        $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
-        $sql .= ' SET frequency = '.($frequency ? $this->db->escape($frequency) : 'null');
-        if (!empty($unit)) {
-        	$sql .= ', unit_frequency = \''.$this->db->escape($unit).'\'';
+	 *	Update frequency and unit
+	 *
+	 *	@param     	int		$frequency		value of frequency
+	 *	@param     	string	$unit 			unit of frequency  (d, m, y)
+	 *	@return		int						<0 if KO, >0 if OK
+	 */
+	public function setFrequencyAndUnit($frequency, $unit)
+	{
+		if (!$this->table_element) {
+			dol_syslog(get_class($this)."::setFrequencyAndUnit was called on objet with property table_element not defined", LOG_ERR);
+			return -1;
 		}
-        $sql .= ' WHERE rowid = '.$this->id;
 
-        dol_syslog(get_class($this)."::setFrequencyAndUnit", LOG_DEBUG);
-        if ($this->db->query($sql)) {
-            $this->frequency = $frequency;
-            if (!empty($unit)) $this->unit_frequency = $unit;
-            return 1;
-        } else {
-            dol_print_error($this->db);
-            return -1;
-        }
-    }
+		if (!empty($frequency) && empty($unit)) {
+			dol_syslog(get_class($this)."::setFrequencyAndUnit was called on objet with params frequency defined but unit not defined", LOG_ERR);
+			return -2;
+		}
+
+		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
+		$sql .= ' SET frequency = '.($frequency ? $this->db->escape($frequency) : 'null');
+		if (!empty($unit)) {
+			$sql .= ', unit_frequency = \''.$this->db->escape($unit).'\'';
+		}
+		$sql .= ' WHERE rowid = '.$this->id;
+
+		dol_syslog(get_class($this)."::setFrequencyAndUnit", LOG_DEBUG);
+		if ($this->db->query($sql)) {
+			$this->frequency = $frequency;
+			if (!empty($unit)) $this->unit_frequency = $unit;
+			return 1;
+		} else {
+			dol_print_error($this->db);
+			return -1;
+		}
+	}
 
 	/**
-     *	Update the next date of execution
-     *
-     *	@param     	datetime	$date					date of execution
-     *	@param     	int			$increment_nb_gen_done	0 do nothing more, >0 increment nb_gen_done
-     *	@return		int									<0 if KO, >0 if OK
-     */
-    public function setNextDate($date, $increment_nb_gen_done = 0)
-    {
-        if (!$this->table_element)
-        {
-            dol_syslog(get_class($this)."::setNextDate was called on objet with property table_element not defined", LOG_ERR);
-            return -1;
-        }
-        $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
-        $sql .= " SET date_when = ".($date ? "'".$this->db->idate($date)."'" : "null");
-        if ($increment_nb_gen_done > 0) $sql .= ', nb_gen_done = nb_gen_done + 1';
-        $sql .= ' WHERE rowid = '.$this->id;
+	 *	Update the next date of execution
+	 *
+	 *	@param     	datetime	$date					date of execution
+	 *	@param     	int			$increment_nb_gen_done	0 do nothing more, >0 increment nb_gen_done
+	 *	@return		int									<0 if KO, >0 if OK
+	 */
+	public function setNextDate($date, $increment_nb_gen_done = 0)
+	{
+		if (!$this->table_element)
+		{
+			dol_syslog(get_class($this)."::setNextDate was called on objet with property table_element not defined", LOG_ERR);
+			return -1;
+		}
+		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
+		$sql .= " SET date_when = ".($date ? "'".$this->db->idate($date)."'" : "null");
+		if ($increment_nb_gen_done > 0) $sql .= ', nb_gen_done = nb_gen_done + 1';
+		$sql .= ' WHERE rowid = '.$this->id;
 
-        dol_syslog(get_class($this)."::setNextDate", LOG_DEBUG);
-        if ($this->db->query($sql))
-        {
-            $this->date_when = $date;
-            if ($increment_nb_gen_done > 0) $this->nb_gen_done++;
-            return 1;
-        } else {
-            dol_print_error($this->db);
-            return -1;
-        }
-    }
+		dol_syslog(get_class($this)."::setNextDate", LOG_DEBUG);
+		if ($this->db->query($sql))
+		{
+			$this->date_when = $date;
+			if ($increment_nb_gen_done > 0) $this->nb_gen_done++;
+			return 1;
+		} else {
+			dol_print_error($this->db);
+			return -1;
+		}
+	}
 
 	/**
-     *	Update the maximum period
-     *
-     *	@param     	int		$nb		number of maximum period
-     *	@return		int				<0 if KO, >0 if OK
-     */
-    public function setMaxPeriod($nb)
-    {
-        if (!$this->table_element)
-        {
-            dol_syslog(get_class($this)."::setMaxPeriod was called on objet with property table_element not defined", LOG_ERR);
-            return -1;
-        }
+	 *	Update the maximum period
+	 *
+	 *	@param     	int		$nb		number of maximum period
+	 *	@return		int				<0 if KO, >0 if OK
+	 */
+	public function setMaxPeriod($nb)
+	{
+		if (!$this->table_element)
+		{
+			dol_syslog(get_class($this)."::setMaxPeriod was called on objet with property table_element not defined", LOG_ERR);
+			return -1;
+		}
 
-        if (empty($nb)) $nb = 0;
+		if (empty($nb)) $nb = 0;
 
-        $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
-        $sql .= ' SET nb_gen_max = '.$nb;
-        $sql .= ' WHERE rowid = '.$this->id;
+		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
+		$sql .= ' SET nb_gen_max = '.$nb;
+		$sql .= ' WHERE rowid = '.$this->id;
 
-        dol_syslog(get_class($this)."::setMaxPeriod", LOG_DEBUG);
-        if ($this->db->query($sql))
-        {
-            $this->nb_gen_max = $nb;
-            return 1;
-        } else {
-            dol_print_error($this->db);
-            return -1;
-        }
-    }
+		dol_syslog(get_class($this)."::setMaxPeriod", LOG_DEBUG);
+		if ($this->db->query($sql))
+		{
+			$this->nb_gen_max = $nb;
+			return 1;
+		} else {
+			dol_print_error($this->db);
+			return -1;
+		}
+	}
 
 	/**
-     *	Update the auto validate flag of invoice
-     *
-     *	@param     	int		$validate		0 to create in draft, 1 to create and validate invoice
-     *	@return		int						<0 if KO, >0 if OK
-     */
-    public function setAutoValidate($validate)
-    {
-        if (!$this->table_element)
-        {
-            dol_syslog(get_class($this)."::setAutoValidate was called on objet with property table_element not defined", LOG_ERR);
-            return -1;
-        }
+	 *	Update the auto validate flag of invoice
+	 *
+	 *	@param     	int		$validate		0 to create in draft, 1 to create and validate invoice
+	 *	@return		int						<0 if KO, >0 if OK
+	 */
+	public function setAutoValidate($validate)
+	{
+		if (!$this->table_element)
+		{
+			dol_syslog(get_class($this)."::setAutoValidate was called on objet with property table_element not defined", LOG_ERR);
+			return -1;
+		}
 
-        $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
-        $sql .= ' SET auto_validate = '.$validate;
-        $sql .= ' WHERE rowid = '.$this->id;
+		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
+		$sql .= ' SET auto_validate = '.$validate;
+		$sql .= ' WHERE rowid = '.$this->id;
 
-        dol_syslog(get_class($this)."::setAutoValidate", LOG_DEBUG);
-        if ($this->db->query($sql))
-        {
-            $this->auto_validate = $validate;
-            return 1;
-        } else {
-            dol_print_error($this->db);
-            return -1;
-        }
-    }
+		dol_syslog(get_class($this)."::setAutoValidate", LOG_DEBUG);
+		if ($this->db->query($sql))
+		{
+			$this->auto_validate = $validate;
+			return 1;
+		} else {
+			dol_print_error($this->db);
+			return -1;
+		}
+	}
 
-    /**
-     *	Update the auto generate documents
-     *
-     *	@param     	int		$validate		0 no document, 1 to generate document
-     *	@return		int						<0 if KO, >0 if OK
-     */
-    public function setGeneratePdf($validate)
-    {
-        if (!$this->table_element)
-        {
-            dol_syslog(get_class($this)."::setGeneratePdf was called on objet with property table_element not defined", LOG_ERR);
-            return -1;
-        }
+	/**
+	 *	Update the auto generate documents
+	 *
+	 *	@param     	int		$validate		0 no document, 1 to generate document
+	 *	@return		int						<0 if KO, >0 if OK
+	 */
+	public function setGeneratePdf($validate)
+	{
+		if (!$this->table_element)
+		{
+			dol_syslog(get_class($this)."::setGeneratePdf was called on objet with property table_element not defined", LOG_ERR);
+			return -1;
+		}
 
-        $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
-        $sql .= ' SET generate_pdf = '.$validate;
-        $sql .= ' WHERE rowid = '.$this->id;
+		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
+		$sql .= ' SET generate_pdf = '.$validate;
+		$sql .= ' WHERE rowid = '.$this->id;
 
-        dol_syslog(get_class($this)."::setGeneratePdf", LOG_DEBUG);
-        if ($this->db->query($sql))
-        {
-            $this->generate_pdf = $validate;
-            return 1;
-        } else {
-            dol_print_error($this->db);
-            return -1;
-        }
-    }
+		dol_syslog(get_class($this)."::setGeneratePdf", LOG_DEBUG);
+		if ($this->db->query($sql))
+		{
+			$this->generate_pdf = $validate;
+			return 1;
+		} else {
+			dol_print_error($this->db);
+			return -1;
+		}
+	}
 
-    /**
-     *  Update the model for documents
-     *
-     *  @param     	string		$model		model of document generator
-     *  @return		int						<0 if KO, >0 if OK
-     */
-    public function setModelPdf($model)
-    {
-        if (!$this->table_element)
-        {
-            dol_syslog(get_class($this)."::setModelPdf was called on objet with property table_element not defined", LOG_ERR);
-            return -1;
-        }
+	/**
+	 *  Update the model for documents
+	 *
+	 *  @param     	string		$model		model of document generator
+	 *  @return		int						<0 if KO, >0 if OK
+	 */
+	public function setModelPdf($model)
+	{
+		if (!$this->table_element)
+		{
+			dol_syslog(get_class($this)."::setModelPdf was called on objet with property table_element not defined", LOG_ERR);
+			return -1;
+		}
 
-        $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
-        $sql .= ' SET modelpdf = "'.$model.'"';
-        $sql .= ' WHERE rowid = '.$this->id;
+		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
+		$sql .= ' SET modelpdf = "'.$model.'"';
+		$sql .= ' WHERE rowid = '.$this->id;
 
-        dol_syslog(get_class($this)."::setModelPdf", LOG_DEBUG);
-        if ($this->db->query($sql))
-        {
-            $this->modelpdf = $model;
-            return 1;
-        } else {
-            dol_print_error($this->db);
-            return -1;
-        }
-    }
+		dol_syslog(get_class($this)."::setModelPdf", LOG_DEBUG);
+		if ($this->db->query($sql))
+		{
+			$this->modelpdf = $model;
+			return 1;
+		} else {
+			dol_print_error($this->db);
+			return -1;
+		}
+	}
 }
 
 
@@ -1898,206 +1898,206 @@ class FactureLigneRec extends CommonInvoiceLine
 	public $date_end_fill;
 
 
-    /**
-     * 	Delete line in database
-     *
-     *  @param		User	$user		Object user
-     *  @param		int		$notrigger	Disable triggers
-     *	@return		int					<0 if KO, >0 if OK
-     */
-    public function delete(User $user, $notrigger = false)
-    {
-    	$error = 0;
+	/**
+	 * 	Delete line in database
+	 *
+	 *  @param		User	$user		Object user
+	 *  @param		int		$notrigger	Disable triggers
+	 *	@return		int					<0 if KO, >0 if OK
+	 */
+	public function delete(User $user, $notrigger = false)
+	{
+		$error = 0;
 
-	    $this->db->begin();
+		$this->db->begin();
 
-	    if (!$error) {
-	        if (!$notrigger) {
-	            // Call triggers
-	            $result = $this->call_trigger('LINEBILLREC_DELETE', $user);
-	            if ($result < 0) { $error++; } // Do also here what you must do to rollback action if trigger fail
-	            // End call triggers
-	        }
-	    }
+		if (!$error) {
+			if (!$notrigger) {
+				// Call triggers
+				$result = $this->call_trigger('LINEBILLREC_DELETE', $user);
+				if ($result < 0) { $error++; } // Do also here what you must do to rollback action if trigger fail
+				// End call triggers
+			}
+		}
 
 		if (!$error)
-        {
-            $result = $this->deleteExtraFields();
-            if ($result < 0) {
-                $error++;
-            }
-        }
-
-	    if (!$error)
-	    {
-    		$sql = 'DELETE FROM '.MAIN_DB_PREFIX.$this->table_element.' WHERE rowid='.$this->id;
-
-    		$res = $this->db->query($sql);
-    		if ($res === false) {
-    		    $error++;
-    		    $this->errors[] = $this->db->lasterror();
-    		}
-	    }
-
-    	// Commit or rollback
-		if ($error) {
-		    $this->db->rollback();
-		    return -1;
-		} else {
-		    $this->db->commit();
-		    return 1;
+		{
+			$result = $this->deleteExtraFields();
+			if ($result < 0) {
+				$error++;
+			}
 		}
-    }
+
+		if (!$error)
+		{
+			$sql = 'DELETE FROM '.MAIN_DB_PREFIX.$this->table_element.' WHERE rowid='.$this->id;
+
+			$res = $this->db->query($sql);
+			if ($res === false) {
+				$error++;
+				$this->errors[] = $this->db->lasterror();
+			}
+		}
+
+		// Commit or rollback
+		if ($error) {
+			$this->db->rollback();
+			return -1;
+		} else {
+			$this->db->commit();
+			return 1;
+		}
+	}
 
 
-    /**
-     *	Get line of template invoice
-     *
-     *	@param		int 	$rowid		Id of invoice
-     *	@return     int         		1 if OK, < 0 if KO
-     */
-    public function fetch($rowid)
-    {
-    	$sql = 'SELECT l.rowid, l.fk_facture ,l.fk_product, l.product_type, l.label as custom_label, l.description, l.product_type, l.price, l.qty, l.vat_src_code, l.tva_tx,';
-    	$sql .= ' l.localtax1_tx, l.localtax2_tx, l.localtax1_type, l.localtax2_type, l.remise, l.remise_percent, l.subprice,';
-    	$sql .= ' l.date_start_fill, l.date_end_fill, l.info_bits, l.total_ht, l.total_tva, l.total_ttc,';
-    	$sql .= ' l.rang, l.special_code,';
-    	$sql .= ' l.fk_unit, l.fk_contract_line,';
-    	$sql .= ' p.ref as product_ref, p.fk_product_type as fk_product_type, p.label as product_label, p.description as product_desc';
-    	$sql .= ' FROM '.MAIN_DB_PREFIX.'facturedet_rec as l';
-    	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON l.fk_product = p.rowid';
-    	$sql .= ' WHERE l.rowid = '.$rowid;
-    	$sql .= ' ORDER BY l.rang';
+	/**
+	 *	Get line of template invoice
+	 *
+	 *	@param		int 	$rowid		Id of invoice
+	 *	@return     int         		1 if OK, < 0 if KO
+	 */
+	public function fetch($rowid)
+	{
+		$sql = 'SELECT l.rowid, l.fk_facture ,l.fk_product, l.product_type, l.label as custom_label, l.description, l.product_type, l.price, l.qty, l.vat_src_code, l.tva_tx,';
+		$sql .= ' l.localtax1_tx, l.localtax2_tx, l.localtax1_type, l.localtax2_type, l.remise, l.remise_percent, l.subprice,';
+		$sql .= ' l.date_start_fill, l.date_end_fill, l.info_bits, l.total_ht, l.total_tva, l.total_ttc,';
+		$sql .= ' l.rang, l.special_code,';
+		$sql .= ' l.fk_unit, l.fk_contract_line,';
+		$sql .= ' p.ref as product_ref, p.fk_product_type as fk_product_type, p.label as product_label, p.description as product_desc';
+		$sql .= ' FROM '.MAIN_DB_PREFIX.'facturedet_rec as l';
+		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON l.fk_product = p.rowid';
+		$sql .= ' WHERE l.rowid = '.$rowid;
+		$sql .= ' ORDER BY l.rang';
 
-    	dol_syslog('FactureRec::fetch', LOG_DEBUG);
-    	$result = $this->db->query($sql);
-    	if ($result)
-    	{
-    		$objp = $this->db->fetch_object($result);
+		dol_syslog('FactureRec::fetch', LOG_DEBUG);
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+			$objp = $this->db->fetch_object($result);
 
-    		$this->id = $objp->rowid;
-    		$this->label            = $objp->custom_label; // Label line
-    		$this->desc             = $objp->description; // Description line
-    		$this->description      = $objp->description; // Description line
-    		$this->product_type     = $objp->product_type; // Type of line
-    		$this->ref              = $objp->product_ref; // Ref product
-    		$this->product_ref      = $objp->product_ref; // Ref product
-    		$this->libelle          = $objp->product_label; // deprecated
-    		$this->product_label = $objp->product_label; // Label product
-    		$this->product_desc     = $objp->product_desc; // Description product
-    		$this->fk_product_type  = $objp->fk_product_type; // Type of product
-    		$this->qty              = $objp->qty;
-    		$this->price = $objp->price;
-    		$this->subprice         = $objp->subprice;
-    		$this->fk_facture = $objp->fk_facture;
-    		$this->vat_src_code     = $objp->vat_src_code;
-    		$this->tva_tx           = $objp->tva_tx;
-    		$this->localtax1_tx     = $objp->localtax1_tx;
-    		$this->localtax2_tx     = $objp->localtax2_tx;
-    		$this->localtax1_type   = $objp->localtax1_type;
-    		$this->localtax2_type   = $objp->localtax2_type;
-    		$this->remise_percent   = $objp->remise_percent;
-    		$this->fk_remise_except = $objp->fk_remise_except;
-    		$this->fk_product       = $objp->fk_product;
-    		$this->date_start_fill  = $objp->date_start_fill;
-    		$this->date_end_fill    = $objp->date_end_fill;
-    		$this->info_bits        = $objp->info_bits;
-    		$this->total_ht         = $objp->total_ht;
-    		$this->total_tva        = $objp->total_tva;
-    		$this->total_ttc        = $objp->total_ttc;
-    		$this->code_ventilation = $objp->fk_code_ventilation;
-    		$this->rang = $objp->rang;
-    		$this->special_code = $objp->special_code;
-    		$this->fk_unit          = $objp->fk_unit;
-    		$this->fk_contract_line = $objp->fk_contract_line;
+			$this->id = $objp->rowid;
+			$this->label            = $objp->custom_label; // Label line
+			$this->desc             = $objp->description; // Description line
+			$this->description      = $objp->description; // Description line
+			$this->product_type     = $objp->product_type; // Type of line
+			$this->ref              = $objp->product_ref; // Ref product
+			$this->product_ref      = $objp->product_ref; // Ref product
+			$this->libelle          = $objp->product_label; // deprecated
+			$this->product_label = $objp->product_label; // Label product
+			$this->product_desc     = $objp->product_desc; // Description product
+			$this->fk_product_type  = $objp->fk_product_type; // Type of product
+			$this->qty              = $objp->qty;
+			$this->price = $objp->price;
+			$this->subprice         = $objp->subprice;
+			$this->fk_facture = $objp->fk_facture;
+			$this->vat_src_code     = $objp->vat_src_code;
+			$this->tva_tx           = $objp->tva_tx;
+			$this->localtax1_tx     = $objp->localtax1_tx;
+			$this->localtax2_tx     = $objp->localtax2_tx;
+			$this->localtax1_type   = $objp->localtax1_type;
+			$this->localtax2_type   = $objp->localtax2_type;
+			$this->remise_percent   = $objp->remise_percent;
+			$this->fk_remise_except = $objp->fk_remise_except;
+			$this->fk_product       = $objp->fk_product;
+			$this->date_start_fill  = $objp->date_start_fill;
+			$this->date_end_fill    = $objp->date_end_fill;
+			$this->info_bits        = $objp->info_bits;
+			$this->total_ht         = $objp->total_ht;
+			$this->total_tva        = $objp->total_tva;
+			$this->total_ttc        = $objp->total_ttc;
+			$this->code_ventilation = $objp->fk_code_ventilation;
+			$this->rang = $objp->rang;
+			$this->special_code = $objp->special_code;
+			$this->fk_unit          = $objp->fk_unit;
+			$this->fk_contract_line = $objp->fk_contract_line;
 
 
-    		$this->db->free($result);
-    		return 1;
-    	} else {
-    		$this->error = $this->db->lasterror();
-    		return -3;
-    	}
-    }
+			$this->db->free($result);
+			return 1;
+		} else {
+			$this->error = $this->db->lasterror();
+			return -3;
+		}
+	}
 
 
-    /**
-     * 	Update a line to invoice_rec.
-     *
-     *  @param		User	$user					User
-     *  @param		int		$notrigger				No trigger
-     *	@return    	int             				<0 if KO, Id of line if OK
-     */
-    public function update(User $user, $notrigger = 0)
-    {
-    	global $conf;
+	/**
+	 * 	Update a line to invoice_rec.
+	 *
+	 *  @param		User	$user					User
+	 *  @param		int		$notrigger				No trigger
+	 *	@return    	int             				<0 if KO, Id of line if OK
+	 */
+	public function update(User $user, $notrigger = 0)
+	{
+		global $conf;
 
-    	$error = 0;
+		$error = 0;
 
-    	include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
 
-    	$sql = "UPDATE ".MAIN_DB_PREFIX."facturedet_rec SET";
-    	$sql .= " fk_facture = ".$this->fk_facture;
-    	$sql .= ", label=".(!empty($this->label) ? "'".$this->db->escape($this->label)."'" : "null");
-    	$sql .= ", description='".$this->db->escape($this->desc)."'";
-    	$sql .= ", price=".price2num($this->price);
-    	$sql .= ", qty=".price2num($this->qty);
-    	$sql .= ", tva_tx=".price2num($this->tva_tx);
-    	$sql .= ", vat_src_code='".$this->db->escape($this->vat_src_code)."'";
-    	$sql .= ", localtax1_tx=".price2num($this->localtax1_tx);
-    	$sql .= ", localtax1_type='".$this->db->escape($this->localtax1_type)."'";
-    	$sql .= ", localtax2_tx=".price2num($this->localtax2_tx);
-    	$sql .= ", localtax2_type='".$this->db->escape($this->localtax2_type)."'";
-    	$sql .= ", fk_product=".($this->fk_product > 0 ? $this->fk_product : "null");
-    	$sql .= ", product_type=".$this->product_type;
-    	$sql .= ", remise_percent='".price2num($this->remise_percent)."'";
-    	$sql .= ", subprice='".price2num($this->subprice)."'";
-    	$sql .= ", info_bits='".price2num($this->info_bits)."'";
-    	$sql .= ", date_start_fill=".(int) $this->date_start_fill;
-    	$sql .= ", date_end_fill=".(int) $this->date_end_fill;
-    	if (empty($this->skip_update_total)) {
-    		$sql .= ", total_ht=".price2num($this->total_ht);
-	    	$sql .= ", total_tva=".price2num($this->total_tva);
-	    	$sql .= ", total_localtax1=".price2num($this->total_localtax1);
-	    	$sql .= ", total_localtax2=".price2num($this->total_localtax2);
-	    	$sql .= ", total_ttc=".price2num($this->total_ttc);
-    	}
-    	$sql .= ", rang=".$this->rang;
-    	$sql .= ", special_code=".$this->special_code;
-    	$sql .= ", fk_unit=".($this->fk_unit ? "'".$this->db->escape($this->fk_unit)."'" : "null");
-    	$sql .= ", fk_contract_line=".($this->fk_contract_line ? $this->fk_contract_line : "null");
-    	$sql .= " WHERE rowid = ".$this->id;
+		$sql = "UPDATE ".MAIN_DB_PREFIX."facturedet_rec SET";
+		$sql .= " fk_facture = ".$this->fk_facture;
+		$sql .= ", label=".(!empty($this->label) ? "'".$this->db->escape($this->label)."'" : "null");
+		$sql .= ", description='".$this->db->escape($this->desc)."'";
+		$sql .= ", price=".price2num($this->price);
+		$sql .= ", qty=".price2num($this->qty);
+		$sql .= ", tva_tx=".price2num($this->tva_tx);
+		$sql .= ", vat_src_code='".$this->db->escape($this->vat_src_code)."'";
+		$sql .= ", localtax1_tx=".price2num($this->localtax1_tx);
+		$sql .= ", localtax1_type='".$this->db->escape($this->localtax1_type)."'";
+		$sql .= ", localtax2_tx=".price2num($this->localtax2_tx);
+		$sql .= ", localtax2_type='".$this->db->escape($this->localtax2_type)."'";
+		$sql .= ", fk_product=".($this->fk_product > 0 ? $this->fk_product : "null");
+		$sql .= ", product_type=".$this->product_type;
+		$sql .= ", remise_percent='".price2num($this->remise_percent)."'";
+		$sql .= ", subprice='".price2num($this->subprice)."'";
+		$sql .= ", info_bits='".price2num($this->info_bits)."'";
+		$sql .= ", date_start_fill=".(int) $this->date_start_fill;
+		$sql .= ", date_end_fill=".(int) $this->date_end_fill;
+		if (empty($this->skip_update_total)) {
+			$sql .= ", total_ht=".price2num($this->total_ht);
+			$sql .= ", total_tva=".price2num($this->total_tva);
+			$sql .= ", total_localtax1=".price2num($this->total_localtax1);
+			$sql .= ", total_localtax2=".price2num($this->total_localtax2);
+			$sql .= ", total_ttc=".price2num($this->total_ttc);
+		}
+		$sql .= ", rang=".$this->rang;
+		$sql .= ", special_code=".$this->special_code;
+		$sql .= ", fk_unit=".($this->fk_unit ? "'".$this->db->escape($this->fk_unit)."'" : "null");
+		$sql .= ", fk_contract_line=".($this->fk_contract_line ? $this->fk_contract_line : "null");
+		$sql .= " WHERE rowid = ".$this->id;
 
-    	dol_syslog(get_class($this)."::updateline", LOG_DEBUG);
-    	$resql = $this->db->query($sql);
-        if ($resql)
-        {
-    		if (!$error)
-    		{
-    			$result = $this->insertExtraFields();
-    			if ($result < 0)
-    			{
-    				$error++;
-    			}
-    		}
+		dol_syslog(get_class($this)."::updateline", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			if (!$error)
+			{
+				$result = $this->insertExtraFields();
+				if ($result < 0)
+				{
+					$error++;
+				}
+			}
 
-    		if (!$error && !$notrigger)
-    		{
-    			// Call trigger
-    			$result = $this->call_trigger('LINEBILLREC_UPDATE', $user);
-    			if ($result < 0)
-    			{
-    				$this->db->rollback();
-    				return -2;
-    			}
-    			// End call triggers
-    		}
-            $this->db->commit();
-            return 1;
-        } else {
-            $this->error = $this->db->lasterror();
-            $this->db->rollback();
-            return -2;
-        }
-    }
+			if (!$error && !$notrigger)
+			{
+				// Call trigger
+				$result = $this->call_trigger('LINEBILLREC_UPDATE', $user);
+				if ($result < 0)
+				{
+					$this->db->rollback();
+					return -2;
+				}
+				// End call triggers
+			}
+			$this->db->commit();
+			return 1;
+		} else {
+			$this->error = $this->db->lasterror();
+			$this->db->rollback();
+			return -2;
+		}
+	}
 }
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 16309d31658..797a2a58ddb 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -95,6 +95,9 @@ class Facture extends CommonInvoice
 	 */
 	protected $table_ref_field = 'ref';
 
+	/**
+	 * @var int thirdparty ID
+	 */
 	public $socid;
 
 	public $author;
@@ -111,6 +114,10 @@ class Facture extends CommonInvoice
 
 	public $date; // Date invoice
 	public $datem;
+
+	/**
+	 * @var string customer ref
+	 */
 	public $ref_client;
 
 	/**
@@ -169,7 +176,6 @@ class Facture extends CommonInvoice
 
 	public $line;
 	public $extraparams = array();
-	public $specimen;
 
 	public $fac_rec;
 
@@ -1411,11 +1417,14 @@ class Facture extends CommonInvoice
 		$label = '';
 
 		if ($user->rights->facture->lire) {
-			$label = img_picto('', $this->picto).' <u>'.$langs->trans("Invoice").'</u>';
-			if ($this->type == self::TYPE_REPLACEMENT) $label = '<u>'.$langs->transnoentitiesnoconv("ReplacementInvoice").'</u>';
-			if ($this->type == self::TYPE_CREDIT_NOTE) $label = '<u>'.$langs->transnoentitiesnoconv("CreditNote").'</u>';
-			if ($this->type == self::TYPE_DEPOSIT)     $label = '<u>'.$langs->transnoentitiesnoconv("Deposit").'</u>';
-			if ($this->type == self::TYPE_SITUATION)   $label = '<u>'.$langs->transnoentitiesnoconv("InvoiceSituation").'</u>';
+			$label = img_picto('', $this->picto).' <u class="paddingrightonly">'.$langs->trans("Invoice").'</u>';
+			if ($this->type == self::TYPE_REPLACEMENT) $label = '<u class="paddingrightonly">'.$langs->transnoentitiesnoconv("ReplacementInvoice").'</u>';
+			if ($this->type == self::TYPE_CREDIT_NOTE) $label = '<u class="paddingrightonly">'.$langs->transnoentitiesnoconv("CreditNote").'</u>';
+			if ($this->type == self::TYPE_DEPOSIT)     $label = '<u class="paddingrightonly">'.$langs->transnoentitiesnoconv("Deposit").'</u>';
+			if ($this->type == self::TYPE_SITUATION)   $label = '<u class="paddingrightonly">'.$langs->transnoentitiesnoconv("InvoiceSituation").'</u>';
+			if (isset($this->statut) && isset($this->alreadypaid)) {
+				$label .= ' '.$this->getLibStatut(5, $this->alreadypaid);
+			}
 			if (!empty($this->ref))
 				$label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
 			if (!empty($this->ref_client))
@@ -1433,9 +1442,6 @@ class Facture extends CommonInvoice
 			if (!empty($this->total_ttc))
 				$label .= '<br><b>'.$langs->trans('AmountTTC').':</b> '.price($this->total_ttc, 0, $langs, 0, -1, -1, $conf->currency);
 			if ($moretitle) $label .= ' - '.$moretitle;
-			if (isset($this->statut) && isset($this->alreadypaid)) {
-				$label .= '<br><b>'.$langs->trans("Status").":</b> ".$this->getLibStatut(5, $this->alreadypaid);
-			}
 		}
 
 		$linkclose = ($target ? ' target="'.$target.'"' : '');
@@ -1547,7 +1553,6 @@ class Facture extends CommonInvoice
 				$this->ref = $obj->ref;
 				$this->ref_client = $obj->ref_client;
 				$this->ref_ext				= $obj->ref_ext;
-				$this->ref_int				= $obj->ref_int;
 				$this->type					= $obj->type;
 				$this->date					= $this->db->jdate($obj->df);
 				$this->date_pointoftax		= $this->db->jdate($obj->date_pointoftax);
@@ -1591,7 +1596,7 @@ class Facture extends CommonInvoice
 				$this->user_author			= $obj->fk_user_author;
 				$this->user_valid = $obj->fk_user_valid;
 				$this->model_pdf = $obj->model_pdf;
-				$this->modelpdf = $obj->model_pdf;				// deprecated
+				$this->modelpdf = $obj->model_pdf; // deprecated
 				$this->last_main_doc = $obj->last_main_doc;
 				$this->situation_cycle_ref  = $obj->situation_cycle_ref;
 				$this->situation_counter    = $obj->situation_counter;
@@ -2481,7 +2486,7 @@ class Facture extends CommonInvoice
 		$this->db->begin();
 
 		// Check parameters
-		if ($this->type == self::TYPE_REPLACEMENT)		// si facture de remplacement
+		if ($this->type == self::TYPE_REPLACEMENT)		// if this is a replacement invoice
 		{
 			// Controle que facture source connue
 			if ($this->fk_facture_source <= 0)
@@ -2491,7 +2496,7 @@ class Facture extends CommonInvoice
 				return -10;
 			}
 
-			// Charge la facture source a remplacer
+			// Load source invoice that has been replaced
 			$facreplaced = new Facture($this->db);
 			$result = $facreplaced->fetch($this->fk_facture_source);
 			if ($result <= 0)
@@ -2501,7 +2506,7 @@ class Facture extends CommonInvoice
 				return -11;
 			}
 
-			// Controle que facture source non deja remplacee par une autre
+			// Check that source invoice not already replaced by another one.
 			$idreplacement = $facreplaced->getIdReplacingInvoice('validated');
 			if ($idreplacement && $idreplacement != $this->id)
 			{
@@ -4313,15 +4318,14 @@ class Facture extends CommonInvoice
 	 *  @param  int			$hidedetails    Hide details of lines
 	 *  @param  int			$hidedesc       Hide description
 	 *  @param  int			$hideref        Hide ref
-	 *  @param   null|array  $moreparams     Array to provide more information
+	 *  @param  null|array  $moreparams     Array to provide more information
 	 *	@return int        					<0 if KO, >0 if OK
 	 */
 	public function generateDocument($modele, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0, $moreparams = null)
 	{
 		global $conf, $langs;
 
-		$langs->load("bills");
-		$outputlangs->load("products");
+		$outputlangs->loadLangs(array("bills", "products"));
 
 		if (!dol_strlen($modele))
 		{
@@ -4854,11 +4858,11 @@ class FactureLigne extends CommonInvoiceLine
 
 			$this->ref = $objp->product_ref; // deprecated
 
-			$this->product_ref          = $objp->product_ref;
+			$this->product_ref = $objp->product_ref;
 			$this->product_label		= $objp->product_label;
 			$this->product_desc			= $objp->product_desc;
 
-			$this->fk_unit				= $objp->fk_unit;
+			$this->fk_unit = $objp->fk_unit;
 			$this->fk_user_modif		= $objp->fk_user_modif;
 			$this->fk_user_author = $objp->fk_user_author;
 
diff --git a/htdocs/compta/facture/class/facturestats.class.php b/htdocs/compta/facture/class/facturestats.class.php
index 6b95c939e2a..e6c4a5a9c22 100644
--- a/htdocs/compta/facture/class/facturestats.class.php
+++ b/htdocs/compta/facture/class/facturestats.class.php
@@ -33,39 +33,39 @@ include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
  */
 class FactureStats extends Stats
 {
-    public $socid;
-    public $userid;
+	public $socid;
+	public $userid;
 
-    /**
+	/**
 	 * @var string Name of table without prefix where object is stored
 	 */
 	public $table_element;
 
-    public $from;
-    public $field;
-    public $where;
-    public $join;
+	public $from;
+	public $field;
+	public $where;
+	public $join;
 
 
 	/**
-     * 	Constructor
-     *
+	 * 	Constructor
+	 *
 	 * 	@param	DoliDB		$db			Database handler
 	 * 	@param 	int			$socid		Id third party for filter. This value must be forced during the new to external user company if user is an external user.
 	 * 	@param 	string		$mode	   	Option ('customer', 'supplier')
-     * 	@param	int			$userid    	Id user for filter (creation user)
-     * 	@param	int			$typentid   Id typent of thirdpary for filter
-     * 	@param	int			$categid    Id category of thirdpary for filter
+	 * 	@param	int			$userid    	Id user for filter (creation user)
+	 * 	@param	int			$typentid   Id typent of thirdpary for filter
+	 * 	@param	int			$categid    Id category of thirdpary for filter
 	 */
 	public function __construct($db, $socid, $mode, $userid = 0, $typentid = 0, $categid = 0)
 	{
 		global $user, $conf;
 
 		$this->db = $db;
-        $this->socid = ($socid > 0 ? $socid : 0);
-        $this->userid = $userid;
+		$this->socid = ($socid > 0 ? $socid : 0);
+		$this->userid = $userid;
 		$this->cachefilesuffix = $mode;
-        $this->join = '';
+		$this->join = '';
 
 		if ($mode == 'customer')
 		{
@@ -93,22 +93,22 @@ class FactureStats extends Stats
 		{
 			$this->where .= " AND f.fk_soc = ".$this->socid;
 		}
-        if ($this->userid > 0) $this->where .= ' AND f.fk_user_author = '.$this->userid;
+		if ($this->userid > 0) $this->where .= ' AND f.fk_user_author = '.$this->userid;
 		if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $this->where .= " AND f.type IN (0,1,2,5)";
 		else $this->where .= " AND f.type IN (0,1,2,3,5)";
 
-        if ($typentid)
-        {
-            $this->join .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s ON s.rowid = f.fk_soc';
-            $this->where .= ' AND s.fk_typent = '.$typentid;
-        }
+		if ($typentid)
+		{
+			$this->join .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s ON s.rowid = f.fk_soc';
+			$this->where .= ' AND s.fk_typent = '.$typentid;
+		}
 
-        if ($categid)
-        {
-            $this->join .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie_societe as cs ON cs.fk_soc = f.fk_soc';
-            $this->join .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie as c ON c.rowid = cs.fk_categorie';
-            $this->where .= ' AND c.rowid = '.$categid;
-        }
+		if ($categid)
+		{
+			$this->join .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie_societe as cs ON cs.fk_soc = f.fk_soc';
+			$this->join .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie as c ON c.rowid = cs.fk_categorie';
+			$this->where .= ' AND c.rowid = '.$categid;
+		}
 	}
 
 
@@ -116,7 +116,7 @@ class FactureStats extends Stats
 	 * 	Return orders number by month for a year
 	 *
 	 *	@param	int		$year		Year to scan
-     *	@param	int		$format		0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
+	 *	@param	int		$format		0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
 	 *	@return	array				Array of values
 	 */
 	public function getNbByMonth($year, $format = 0)
@@ -126,11 +126,11 @@ class FactureStats extends Stats
 		$sql = "SELECT date_format(f.datef,'%m') as dm, COUNT(*) as nb";
 		$sql .= " FROM ".$this->from;
 		if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-        $sql .= $this->join;
+		$sql .= $this->join;
 		$sql .= " WHERE f.datef BETWEEN '".$this->db->idate(dol_get_first_day($year))."' AND '".$this->db->idate(dol_get_last_day($year))."'";
 		$sql .= " AND ".$this->where;
 		$sql .= " GROUP BY dm";
-        $sql .= $this->db->order('dm', 'DESC');
+		$sql .= $this->db->order('dm', 'DESC');
 
 		$res = $this->_getNbByMonth($year, $sql, $format);
 		//var_dump($res);print '<br>';
@@ -150,10 +150,10 @@ class FactureStats extends Stats
 		$sql = "SELECT date_format(f.datef,'%Y') as dm, COUNT(*), SUM(c.".$this->field.")";
 		$sql .= " FROM ".$this->from;
 		if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-        $sql .= $this->join;
+		$sql .= $this->join;
 		$sql .= " WHERE ".$this->where;
 		$sql .= " GROUP BY dm";
-        $sql .= $this->db->order('dm', 'DESC');
+		$sql .= $this->db->order('dm', 'DESC');
 
 		return $this->_getNbByYear($sql);
 	}
@@ -163,7 +163,7 @@ class FactureStats extends Stats
 	 * 	Return the invoices amount by month for a year
 	 *
 	 *	@param	int		$year		Year to scan
-     *	@param	int		$format		0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
+	 *	@param	int		$format		0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
 	 *	@return	array				Array with amount by month
 	 */
 	public function getAmountByMonth($year, $format = 0)
@@ -173,11 +173,11 @@ class FactureStats extends Stats
 		$sql = "SELECT date_format(datef,'%m') as dm, SUM(f.".$this->field.")";
 		$sql .= " FROM ".$this->from;
 		if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-        $sql .= $this->join;
+		$sql .= $this->join;
 		$sql .= " WHERE f.datef BETWEEN '".$this->db->idate(dol_get_first_day($year))."' AND '".$this->db->idate(dol_get_last_day($year))."'";
 		$sql .= " AND ".$this->where;
-        $sql .= " GROUP BY dm";
-        $sql .= $this->db->order('dm', 'DESC');
+		$sql .= " GROUP BY dm";
+		$sql .= $this->db->order('dm', 'DESC');
 
 		$res = $this->_getAmountByMonth($year, $sql, $format);
 		//var_dump($res);print '<br>';
@@ -197,11 +197,11 @@ class FactureStats extends Stats
 		$sql = "SELECT date_format(datef,'%m') as dm, AVG(f.".$this->field.")";
 		$sql .= " FROM ".$this->from;
 		if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-        $sql .= $this->join;
-        $sql .= " WHERE f.datef BETWEEN '".$this->db->idate(dol_get_first_day($year))."' AND '".$this->db->idate(dol_get_last_day($year))."'";
+		$sql .= $this->join;
+		$sql .= " WHERE f.datef BETWEEN '".$this->db->idate(dol_get_first_day($year))."' AND '".$this->db->idate(dol_get_last_day($year))."'";
 		$sql .= " AND ".$this->where;
-        $sql .= " GROUP BY dm";
-        $sql .= $this->db->order('dm', 'DESC');
+		$sql .= " GROUP BY dm";
+		$sql .= $this->db->order('dm', 'DESC');
 
 		return $this->_getAverageByMonth($year, $sql);
 	}
@@ -218,10 +218,10 @@ class FactureStats extends Stats
 		$sql = "SELECT date_format(datef,'%Y') as year, COUNT(*) as nb, SUM(f.".$this->field.") as total, AVG(f.".$this->field.") as avg";
 		$sql .= " FROM ".$this->from;
 		if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-        $sql .= $this->join;
+		$sql .= $this->join;
 		$sql .= " WHERE ".$this->where;
 		$sql .= " GROUP BY year";
-        $sql .= $this->db->order('year', 'DESC');
+		$sql .= $this->db->order('year', 'DESC');
 
 		return $this->_getAllByYear($sql);
 	}
@@ -230,7 +230,7 @@ class FactureStats extends Stats
 	 *	Return nb, amount of predefined product for year
 	 *
 	 *	@param	int		$year		Year to scan
-     *  @param  int     $limit      Limit
+	 *  @param  int     $limit      Limit
 	 *	@return	array				Array of values
 	 */
 	public function getAllByProduct($year, $limit = 10)
@@ -240,14 +240,14 @@ class FactureStats extends Stats
 		$sql = "SELECT product.ref, COUNT(product.ref) as nb, SUM(tl.".$this->field_line.") as total, AVG(tl.".$this->field_line.") as avg";
 		$sql .= " FROM ".$this->from.", ".$this->from_line.", ".MAIN_DB_PREFIX."product as product";
 		if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-        $sql .= $this->join;
+		$sql .= $this->join;
 		$sql .= " WHERE ".$this->where;
 		$sql .= " AND f.rowid = tl.fk_facture AND tl.fk_product = product.rowid";
-    	$sql .= " AND f.datef BETWEEN '".$this->db->idate(dol_get_first_day($year, 1, false))."' AND '".$this->db->idate(dol_get_last_day($year, 12, false))."'";
+		$sql .= " AND f.datef BETWEEN '".$this->db->idate(dol_get_first_day($year, 1, false))."' AND '".$this->db->idate(dol_get_last_day($year, 12, false))."'";
 		$sql .= " GROUP BY product.ref";
-        $sql .= $this->db->order('nb', 'DESC');
-        //$sql.= $this->db->plimit(20);
+		$sql .= $this->db->order('nb', 'DESC');
+		//$sql.= $this->db->plimit(20);
 
-        return $this->_getAllByProduct($sql, $limit);
+		return $this->_getAllByProduct($sql, $limit);
 	}
 }
diff --git a/htdocs/compta/facture/class/paymentterm.class.php b/htdocs/compta/facture/class/paymentterm.class.php
index 9888bd23d13..97297582081 100644
--- a/htdocs/compta/facture/class/paymentterm.class.php
+++ b/htdocs/compta/facture/class/paymentterm.class.php
@@ -28,9 +28,9 @@
 class PaymentTerm // extends CommonObject
 {
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
 	/**
 	 * @var string Error code (or message)
@@ -46,7 +46,7 @@ class PaymentTerm // extends CommonObject
 	//public  $table_element='c_payment_term';	//!< Name of table without prefix where object is stored
 	public $context = array();
 
-    /**
+	/**
 	 * @var int ID
 	 */
 	public $id;
@@ -63,27 +63,27 @@ class PaymentTerm // extends CommonObject
 
 
 
-    /**
-     * 	Constructor
-     *
+	/**
+	 * 	Constructor
+	 *
 	 * 	@param	DoliDB		$db			Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-    }
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
 
 
-    /**
-     *      Create in database
-     *
-     *      @param      User	$user        	User that create
-     *      @param      int		$notrigger	    0=launch triggers after, 1=disable triggers
-     *      @return     int       			  	<0 if KO, Id of created object if OK
-     */
-    public function create($user, $notrigger = 0)
-    {
-    	global $conf, $langs;
+	/**
+	 *      Create in database
+	 *
+	 *      @param      User	$user        	User that create
+	 *      @param      int		$notrigger	    0=launch triggers after, 1=disable triggers
+	 *      @return     int       			  	<0 if KO, Id of created object if OK
+	 */
+	public function create($user, $notrigger = 0)
+	{
+		global $conf, $langs;
 		$error = 0;
 
 		// Clean parameters
@@ -101,7 +101,7 @@ class PaymentTerm // extends CommonObject
 		// Check parameters
 		// Put here code to add control on parameters values
 
-        // Insert request
+		// Insert request
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."c_payment_term(";
 		$sql .= "entity,";
 		$sql .= "code,";
@@ -112,7 +112,7 @@ class PaymentTerm // extends CommonObject
 		$sql .= "type_cdr,";
 		$sql .= "nbjour,";
 		$sql .= "decalage";
-        $sql .= ") VALUES (";
+		$sql .= ") VALUES (";
 		$sql .= " ".(!isset($this->entity) ?getEntity('c_payment_term') : "'".$this->db->escape($this->entity)."'").",";
 		$sql .= " ".(!isset($this->code) ? 'NULL' : "'".$this->db->escape($this->code)."'").",";
 		$sql .= " ".(!isset($this->sortorder) ? 'NULL' : "'".$this->db->escape($this->sortorder)."'").",";
@@ -127,41 +127,41 @@ class PaymentTerm // extends CommonObject
 		$this->db->begin();
 
 	   	dol_syslog(get_class($this)."::create", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-    	if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+		$resql = $this->db->query($sql);
+		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
 		if (!$error)
-        {
-            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."c_payment_term");
-        }
+		{
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."c_payment_term");
+		}
 
-        // Commit or rollback
-        if ($error)
+		// Commit or rollback
+		if ($error)
 		{
 			foreach ($this->errors as $errmsg)
 			{
-	            dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
-	            $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
+				dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
 			return -1 * $error;
 		} else {
 			$this->db->commit();
-            return $this->id;
+			return $this->id;
 		}
-    }
+	}
 
 
-    /**
-     *    Load object in memory from database
-     *
-     *    @param      int		$id     Id object
-     *    @return     int         		<0 if KO, >0 if OK
-     */
-    public function fetch($id)
-    {
-    	global $langs;
-        $sql = "SELECT";
+	/**
+	 *    Load object in memory from database
+	 *
+	 *    @param      int		$id     Id object
+	 *    @return     int         		<0 if KO, >0 if OK
+	 */
+	public function fetch($id)
+	{
+		global $langs;
+		$sql = "SELECT";
 		$sql .= " t.rowid,";
 		$sql .= " t.entity,";
 
@@ -175,18 +175,18 @@ class PaymentTerm // extends CommonObject
 		$sql .= " t.decalage";
 
 
-        $sql .= " FROM ".MAIN_DB_PREFIX."c_payment_term as t";
-        $sql .= " WHERE t.rowid = ".$id;
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_payment_term as t";
+		$sql .= " WHERE t.rowid = ".$id;
 
-    	dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            if ($this->db->num_rows($resql))
-            {
-                $obj = $this->db->fetch_object($resql);
+		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			if ($this->db->num_rows($resql))
+			{
+				$obj = $this->db->fetch_object($resql);
 
-                $this->id = $obj->rowid;
+				$this->id = $obj->rowid;
 
 				$this->code = $obj->code;
 				$this->sortorder = $obj->sortorder;
@@ -196,22 +196,22 @@ class PaymentTerm // extends CommonObject
 				$this->type_cdr = $obj->type_cdr;
 				$this->nbjour = $obj->nbjour;
 				$this->decalage = $obj->decalage;
-            }
-            $this->db->free($resql);
+			}
+			$this->db->free($resql);
 
-            return 1;
-        } else {
-      	    $this->error = "Error ".$this->db->lasterror();
-            return -1;
-        }
-    }
+			return 1;
+		} else {
+	  		$this->error = "Error ".$this->db->lasterror();
+			return -1;
+		}
+	}
 
 
-    /**
-     *    Return id of default payment term
-     *
-     *    @return     int         <0 if KO, >0 if OK
-     */
+	/**
+	 *    Return id of default payment term
+	 *
+	 *    @return     int         <0 if KO, >0 if OK
+	 */
 	public function getDefaultId()
 	{
 		global $langs;
@@ -243,12 +243,12 @@ class PaymentTerm // extends CommonObject
 
 
 	/**
-     *  Update database
-     *
-     *  @param      User	$user        	User that modify
-     *  @param      int		$notrigger	    0=launch triggers after, 1=disable triggers
-     *  @return     int       			  	<0 if KO, >0 if OK
-     */
+	 *  Update database
+	 *
+	 *  @param      User	$user        	User that modify
+	 *  @param      int		$notrigger	    0=launch triggers after, 1=disable triggers
+	 *  @return     int       			  	<0 if KO, >0 if OK
+	 */
 	public function update($user = null, $notrigger = 0)
 	{
 		global $conf, $langs;
@@ -325,15 +325,15 @@ class PaymentTerm // extends CommonObject
 
 		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-    	if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
-        // Commit or rollback
+		// Commit or rollback
 		if ($error)
 		{
 			foreach ($this->errors as $errmsg)
 			{
-	            dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
-	            $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
+				dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
 			return -1 * $error;
@@ -393,15 +393,15 @@ class PaymentTerm // extends CommonObject
 	}
 
 
-    /**
-     *  Initialise an instance with random values.
-     *  Used to build previews or test instances.
-     *	id must be 0 if object instance is a specimen.
-     *
-     *  @return	void
-     */
-    public function initAsSpecimen()
-    {
+	/**
+	 *  Initialise an instance with random values.
+	 *  Used to build previews or test instances.
+	 *	id must be 0 if object instance is a specimen.
+	 *
+	 *  @return	void
+	 */
+	public function initAsSpecimen()
+	{
 		$this->id = 0;
 
 		$this->code = '';
diff --git a/htdocs/compta/facture/contact.php b/htdocs/compta/facture/contact.php
index f50f6b85a55..57532174db7 100644
--- a/htdocs/compta/facture/contact.php
+++ b/htdocs/compta/facture/contact.php
@@ -59,11 +59,11 @@ if ($action == 'addcontact' && $user->rights->facture->creer)
 {
 	$result = $object->fetch($id);
 
-    if ($result > 0 && $id > 0)
-    {
-    	$contactid = (GETPOST('userid') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int'));
+	if ($result > 0 && $id > 0)
+	{
+		$contactid = (GETPOST('userid') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int'));
   		$result = $object->add_contact($contactid, $_POST["type"], $_POST["source"]);
-    }
+	}
 
 	if ($result >= 0)
 	{
@@ -83,7 +83,7 @@ elseif ($action == 'swapstatut' && $user->rights->facture->creer)
 {
 	if ($object->fetch($id))
 	{
-	    $result = $object->swapContactStatus(GETPOST('ligne'));
+		$result = $object->swapContactStatus(GETPOST('ligne'));
 	} else {
 		dol_print_error($db);
 	}
@@ -148,36 +148,36 @@ if ($id > 0 || !empty($ref))
 		// Project
 		if (!empty($conf->projet->enabled))
 		{
-		    $langs->load("projects");
-		    $morehtmlref .= '<br>'.$langs->trans('Project').' ';
-		    if ($user->rights->facture->creer)
-		    {
-		        if ($action != 'classify') {
-		        	//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+			$langs->load("projects");
+			$morehtmlref .= '<br>'.$langs->trans('Project').' ';
+			if ($user->rights->facture->creer)
+			{
+				if ($action != 'classify') {
+					//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
 					$morehtmlref .= ' : ';
-                }
-	        	if ($action == 'classify') {
-	                //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-	                $morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-	                $morehtmlref .= '<input type="hidden" name="action" value="classin">';
-	                $morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
-	                $morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-	                $morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-	                $morehtmlref .= '</form>';
-	            } else {
-	                $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-	            }
-		    } else {
-		        if (!empty($object->fk_project)) {
-		            $proj = new Project($db);
-		            $proj->fetch($object->fk_project);
-		            $morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
-		            $morehtmlref .= $proj->ref;
-		            $morehtmlref .= '</a>';
-		        } else {
-		            $morehtmlref .= '';
-		        }
-		    }
+				}
+				if ($action == 'classify') {
+					//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+					$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+					$morehtmlref .= '<input type="hidden" name="action" value="classin">';
+					$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
+					$morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+					$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+					$morehtmlref .= '</form>';
+				} else {
+					$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+				}
+			} else {
+				if (!empty($object->fk_project)) {
+					$proj = new Project($db);
+					$proj->fetch($object->fk_project);
+					$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
+					$morehtmlref .= $proj->ref;
+					$morehtmlref .= '</a>';
+				} else {
+					$morehtmlref .= '';
+				}
+			}
 		}
 		$morehtmlref .= '</div>';
 
@@ -185,7 +185,7 @@ if ($id > 0 || !empty($ref))
 
 		dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '', 0, '', '', 1);
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 		print '<br>';
 
@@ -193,8 +193,8 @@ if ($id > 0 || !empty($ref))
 		$dirtpls = array_merge($conf->modules_parts['tpl'], array('/core/tpl'));
 		foreach ($dirtpls as $reldir)
 		{
-		    $res = @include dol_buildpath($reldir.'/contacts.tpl.php');
-		    if ($res) break;
+			$res = @include dol_buildpath($reldir.'/contacts.tpl.php');
+			if ($res) break;
 		}
 	} else {
 		// Record not found
diff --git a/htdocs/compta/facture/document.php b/htdocs/compta/facture/document.php
index 548fefab0fa..3922228c4fa 100644
--- a/htdocs/compta/facture/document.php
+++ b/htdocs/compta/facture/document.php
@@ -103,7 +103,7 @@ if ($id > 0 || !empty($ref))
 		$head = facture_prepare_head($object);
 		print dol_get_fiche_head($head, 'documents', $langs->trans('InvoiceCustomer'), -1, 'bill');
 
-    	$totalpaye = $object->getSommePaiement();
+		$totalpaye = $object->getSommePaiement();
 
 		// Build file list
 		$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
@@ -114,54 +114,54 @@ if ($id > 0 || !empty($ref))
 		}
 
 
-	    // Invoice content
+		// Invoice content
 
-	    $linkback = '<a href="'.DOL_URL_ROOT.'/compta/facture/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
+		$linkback = '<a href="'.DOL_URL_ROOT.'/compta/facture/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
-	    $morehtmlref = '<div class="refidno">';
-	    // Ref customer
-	    $morehtmlref .= $form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
-	    $morehtmlref .= $form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
-	    // Thirdparty
-	    $morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1, 'customer');
-	    // Project
-	    if (!empty($conf->projet->enabled))
-	    {
-	    	$langs->load("projects");
-	    	$morehtmlref .= '<br>'.$langs->trans('Project').' ';
-	    	if ($user->rights->facture->creer)
-	    	{
-	    		if ($action != 'classify')
-	    			//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
-	    			$morehtmlref .= ' : ';
-	    		if ($action == 'classify') {
-	    			//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-	    			$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-	    			$morehtmlref .= '<input type="hidden" name="action" value="classin">';
-	    			$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
-	    			$morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-	    			$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-	    			$morehtmlref .= '</form>';
-	    		} else {
-	    			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-	    		}
-	    	} else {
-	    		if (!empty($object->fk_project)) {
-	    			$proj = new Project($db);
-	    			$proj->fetch($object->fk_project);
-	    			$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
-	    			$morehtmlref .= $proj->ref;
-	    			$morehtmlref .= '</a>';
-	    		} else {
-	    			$morehtmlref .= '';
-	    		}
-	    	}
-	    }
-	    $morehtmlref .= '</div>';
+		$morehtmlref = '<div class="refidno">';
+		// Ref customer
+		$morehtmlref .= $form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
+		$morehtmlref .= $form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
+		// Thirdparty
+		$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1, 'customer');
+		// Project
+		if (!empty($conf->projet->enabled))
+		{
+			$langs->load("projects");
+			$morehtmlref .= '<br>'.$langs->trans('Project').' ';
+			if ($user->rights->facture->creer)
+			{
+				if ($action != 'classify')
+					//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+					$morehtmlref .= ' : ';
+				if ($action == 'classify') {
+					//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+					$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+					$morehtmlref .= '<input type="hidden" name="action" value="classin">';
+					$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
+					$morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+					$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+					$morehtmlref .= '</form>';
+				} else {
+					$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+				}
+			} else {
+				if (!empty($object->fk_project)) {
+					$proj = new Project($db);
+					$proj->fetch($object->fk_project);
+					$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
+					$morehtmlref .= $proj->ref;
+					$morehtmlref .= '</a>';
+				} else {
+					$morehtmlref .= '';
+				}
+			}
+		}
+		$morehtmlref .= '</div>';
 
-	    $object->totalpaye = $totalpaye; // To give a chance to dol_banner_tab to use already paid amount to show correct status
+		$object->totalpaye = $totalpaye; // To give a chance to dol_banner_tab to use already paid amount to show correct status
 
-	    dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '', 0);
+		dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '', 0);
 
 		print '<div class="fichecenter">';
 		print '<div class="underbanner clearboth"></div>';
@@ -174,7 +174,7 @@ if ($id > 0 || !empty($ref))
 
 		print "</div>\n";
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 		$modulepart = 'facture';
 		$permission = $user->rights->facture->creer;
diff --git a/htdocs/compta/facture/index.php b/htdocs/compta/facture/index.php
index fb044280a21..eb73132c69f 100644
--- a/htdocs/compta/facture/index.php
+++ b/htdocs/compta/facture/index.php
@@ -41,9 +41,9 @@ if (isset($user->socid) && $user->socid > 0)
 }
 
 // Maximum elements of the tables
-$maxDraftCount		= empty($conf->global->MAIN_MAXLIST_OVERLOAD) ? 500 : $conf->global->MAIN_MAXLIST_OVERLOAD;
-$maxLatestEditCount	= 5;
-$maxOpenCount		= empty($conf->global->MAIN_MAXLIST_OVERLOAD) ? 500 : $conf->global->MAIN_MAXLIST_OVERLOAD;
+$maxDraftCount = empty($conf->global->MAIN_MAXLIST_OVERLOAD) ? 500 : $conf->global->MAIN_MAXLIST_OVERLOAD;
+$maxLatestEditCount = 5;
+$maxOpenCount = empty($conf->global->MAIN_MAXLIST_OVERLOAD) ? 500 : $conf->global->MAIN_MAXLIST_OVERLOAD;
 
 /*
 * View
@@ -263,21 +263,21 @@ function getDraftTable($maxCount = 500, $socid = 0)
 		return $result;
 	}
 
-	$objectstatic	= new Facture($db);
-	$companystatic	= new Societe($db);
-	$nbofloop		= min($num, $maxCount);
-	$total			= 0;
-	$i				= 0;
+	$objectstatic = new Facture($db);
+	$companystatic = new Societe($db);
+	$nbofloop = min($num, $maxCount);
+	$total = 0;
+	$i = 0;
 
 	while ($i < $nbofloop)
 	{
 		$obj = $db->fetch_object($resql);
 
-		$objectstatic->id	= $obj->rowid;
-		$objectstatic->ref	= $obj->ref;
+		$objectstatic->id = $obj->rowid;
+		$objectstatic->ref = $obj->ref;
 
-		$companystatic->id		= $obj->socid;
-		$companystatic->name	= $obj->socname;
+		$companystatic->id = $obj->socid;
+		$companystatic->name = $obj->socname;
 		$companystatic->client	= $obj->client;
 		$companystatic->canvas	= $obj->canvas;
 
@@ -344,9 +344,9 @@ function getLatestEditTable($maxCount = 5, $socid = 0)
 	$result = '<div class="div-table-responsive-no-min">';
 	$result .= '<table class="noborder centpercent">';
 
-	$result .=  '<tr class="liste_titre">';
-	$result .=  '<td colspan="4">'.$langs->trans("LastCustomersBills", $maxCount).'</td>';
-	$result .=  '</tr>';
+	$result .= '<tr class="liste_titre">';
+	$result .= '<td colspan="4">'.$langs->trans("LastCustomersBills", $maxCount).'</td>';
+	$result .= '</tr>';
 
 	if ($num < 1)
 	{
@@ -355,47 +355,47 @@ function getLatestEditTable($maxCount = 5, $socid = 0)
 		return $result;
 	}
 
-	$formfile		= new FormFile($db);
-	$objectstatic	= new Facture($db);
-	$companystatic	= new Societe($db);
-	$i				= 0;
+	$formfile = new FormFile($db);
+	$objectstatic = new Facture($db);
+	$companystatic = new Societe($db);
+	$i = 0;
 
 	while ($i < $num)
 	{
 		$obj = $db->fetch_object($resql);
 
-		$objectstatic->id		= $obj->rowid;
-		$objectstatic->ref		= $obj->ref;
-		$objectstatic->paye		= $obj->paye;
-		$objectstatic->statut	= $obj->status;
+		$objectstatic->id = $obj->rowid;
+		$objectstatic->ref = $obj->ref;
+		$objectstatic->paye = $obj->paye;
+		$objectstatic->statut = $obj->status;
 
-		$companystatic->id		= $obj->socid;
-		$companystatic->name	= $obj->socname;
+		$companystatic->id = $obj->socid;
+		$companystatic->name = $obj->socname;
 		$companystatic->client	= $obj->client;
 		$companystatic->canvas	= $obj->canvas;
 
 		$filename = dol_sanitizeFileName($obj->ref);
 		$filedir = $conf->propal->multidir_output[$obj->entity].'/'.$filename;
 
-		$result .=  '<tr width="20%" class="nowrap">';
+		$result .= '<tr width="20%" class="nowrap">';
 
-		$result .=  '<td class="oddeven">';
-		$result .=  '<table class="nobordernopadding">';
-		$result .=  '<tr class="nocellnopadd">';
+		$result .= '<td class="oddeven">';
+		$result .= '<table class="nobordernopadding">';
+		$result .= '<tr class="nocellnopadd">';
 
-		$result .=  '<td width="96" class="nobordernopadding nowrap">'.$objectstatic->getNomUrl(1).'</td>';
-		$result .=  '<td width="16" class="nobordernopadding nowrap">&nbsp;</td>';
-		$result .=  '<td width="16" class="nobordernopadding right">'.$formfile->getDocumentsLink($objectstatic->element, $filename, $filedir).'</td>';
+		$result .= '<td width="96" class="nobordernopadding nowrap">'.$objectstatic->getNomUrl(1).'</td>';
+		$result .= '<td width="16" class="nobordernopadding nowrap">&nbsp;</td>';
+		$result .= '<td width="16" class="nobordernopadding right">'.$formfile->getDocumentsLink($objectstatic->element, $filename, $filedir).'</td>';
 
-		$result .=  '</tr>';
-		$result .=  '</table>';
-		$result .=  '</td>';
+		$result .= '</tr>';
+		$result .= '</table>';
+		$result .= '</td>';
 
-		$result .=  '<td>'.$companystatic->getNomUrl(1, 'customer').'</td>';
-		$result .=  '<td>'.dol_print_date($db->jdate($obj->datec), 'day').'</td>';
-		$result .=  '<td class="right">'.$objectstatic->getLibStatut(5).'</td>';
+		$result .= '<td>'.$companystatic->getNomUrl(1, 'customer').'</td>';
+		$result .= '<td>'.dol_print_date($db->jdate($obj->datec), 'day').'</td>';
+		$result .= '<td class="right">'.$objectstatic->getLibStatut(5).'</td>';
 
-		$result .=  '</tr>';
+		$result .= '</tr>';
 
 		$i++;
 	}
@@ -457,23 +457,23 @@ function getOpenTable($maxCount = 500, $socid = 0)
 		return $result;
 	}
 
-	$objectstatic	= new Facture($db);
-	$companystatic	= new Societe($db);
+	$objectstatic = new Facture($db);
+	$companystatic = new Societe($db);
 	$formfile		= new FormFile($db);
 	$nbofloop		= min($num, $maxCount);
-	$now			= dol_now();
-	$total			= 0;
-	$i				= 0;
+	$now = dol_now();
+	$total = 0;
+	$i = 0;
 
 	while ($i < $nbofloop)
 	{
 		$obj = $db->fetch_object($resql);
 
-		$objectstatic->id= $obj->id;
-		$objectstatic->ref	= $obj->ref;
+		$objectstatic->id = $obj->id;
+		$objectstatic->ref = $obj->ref;
 
-		$companystatic->id		= $obj->socid;
-		$companystatic->name	= $obj->socname;
+		$companystatic->id = $obj->socid;
+		$companystatic->name = $obj->socname;
 		$companystatic->client	= $obj->client;
 		$companystatic->canvas	= $obj->canvas;
 
diff --git a/htdocs/compta/facture/info.php b/htdocs/compta/facture/info.php
index a7af3893883..f26f4ea0255 100644
--- a/htdocs/compta/facture/info.php
+++ b/htdocs/compta/facture/info.php
@@ -120,7 +120,7 @@ print '</td></tr></table>';
 
 print '</div>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // End of page
 llxFooter();
diff --git a/htdocs/compta/facture/invoicetemplate_list.php b/htdocs/compta/facture/invoicetemplate_list.php
index 16d163c4fe6..c0abc5a6028 100644
--- a/htdocs/compta/facture/invoicetemplate_list.php
+++ b/htdocs/compta/facture/invoicetemplate_list.php
@@ -154,9 +154,9 @@ if ($socid > 0) {
 
 
 if ($socid > 0) {
-        $tmpthirdparty = new Societe($db);
-        $res = $tmpthirdparty->fetch($socid);
-        if ($res > 0) $search_societe = $tmpthirdparty->name;
+		$tmpthirdparty = new Societe($db);
+		$res = $tmpthirdparty->fetch($socid);
+		if ($res > 0) $search_societe = $tmpthirdparty->name;
 }
 
 /*
@@ -529,68 +529,68 @@ if ($resql)
 
 			if (!empty($arrayfields['f.titre']['checked']))
 			{
-			    print '<td class="nowrap tdoverflowmax200">';
-			    print $invoicerectmp->getNomUrl(1);
-			    print "</a>";
-			    print "</td>\n";
-			    if (!$i) $totalarray['nbfield']++;
+				print '<td class="nowrap tdoverflowmax200">';
+				print $invoicerectmp->getNomUrl(1);
+				print "</a>";
+				print "</td>\n";
+				if (!$i) $totalarray['nbfield']++;
 			}
 			if (!empty($arrayfields['s.nom']['checked']))
 			{
-			    print '<td class="tdoverflowmax200">'.$companystatic->getNomUrl(1, 'customer').'</td>';
-			    if (!$i) $totalarray['nbfield']++;
+				print '<td class="tdoverflowmax200">'.$companystatic->getNomUrl(1, 'customer').'</td>';
+				if (!$i) $totalarray['nbfield']++;
 			}
 			if (!empty($arrayfields['f.total']['checked']))
 			{
-			    print '<td class="nowrap right">'.price($objp->total).'</td>'."\n";
-			    if (!$i) $totalarray['nbfield']++;
-			    if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'f.total';
-			    $totalarray['val']['f.total'] += $objp->total;
+				print '<td class="nowrap right">'.price($objp->total).'</td>'."\n";
+				if (!$i) $totalarray['nbfield']++;
+				if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'f.total';
+				$totalarray['val']['f.total'] += $objp->total;
 			}
 			if (!empty($arrayfields['f.tva']['checked']))
 			{
-			    print '<td class="nowrap right">'.price($objp->total_vat).'</td>'."\n";
-			    if (!$i) $totalarray['nbfield']++;
-			    if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'f.tva';
-			    $totalarray['val']['f.tva'] += $objp->total_vat;
+				print '<td class="nowrap right">'.price($objp->total_vat).'</td>'."\n";
+				if (!$i) $totalarray['nbfield']++;
+				if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'f.tva';
+				$totalarray['val']['f.tva'] += $objp->total_vat;
 			}
 			if (!empty($arrayfields['f.total_ttc']['checked']))
 			{
-			    print '<td class="nowrap right">'.price($objp->total_ttc).'</td>'."\n";
-			    if (!$i) $totalarray['nbfield']++;
-			    if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'f.total_ttc';
-			    $totalarray['val']['f.total_ttc'] += $objp->total_ttc;
+				print '<td class="nowrap right">'.price($objp->total_ttc).'</td>'."\n";
+				if (!$i) $totalarray['nbfield']++;
+				if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'f.total_ttc';
+				$totalarray['val']['f.total_ttc'] += $objp->total_ttc;
 			}
 			// Payment term
 			if (!empty($arrayfields['f.fk_cond_reglement']['checked']))
 			{
-			    print '<td class="right">';
-			    $form->form_conditions_reglement('', $objp->fk_cond_reglement, 'none');
-			    print '</td>'."\n";
-			    if (!$i) $totalarray['nbfield']++;
+				print '<td class="right">';
+				$form->form_conditions_reglement('', $objp->fk_cond_reglement, 'none');
+				print '</td>'."\n";
+				if (!$i) $totalarray['nbfield']++;
 			}
 			// Payment mode
 			if (!empty($arrayfields['f.fk_mode_reglement']['checked']))
 			{
-			    print '<td class="right">';
-			    $form->form_modes_reglement('', $objp->fk_mode_reglement, 'none');
-			    print '</td>'."\n";
-			    if (!$i) $totalarray['nbfield']++;
+				print '<td class="right">';
+				$form->form_modes_reglement('', $objp->fk_mode_reglement, 'none');
+				print '</td>'."\n";
+				if (!$i) $totalarray['nbfield']++;
 			}
 			if (!empty($arrayfields['recurring']['checked']))
 			{
-			    print '<td class="center">'.yn($objp->frequency ? 1 : 0).'</td>';
-			    if (!$i) $totalarray['nbfield']++;
+				print '<td class="center">'.yn($objp->frequency ? 1 : 0).'</td>';
+				if (!$i) $totalarray['nbfield']++;
 			}
 			if (!empty($arrayfields['f.frequency']['checked']))
 			{
-			    print '<td class="center">'.($objp->frequency > 0 ? $objp->frequency : '').'</td>';
-			    if (!$i) $totalarray['nbfield']++;
+				print '<td class="center">'.($objp->frequency > 0 ? $objp->frequency : '').'</td>';
+				if (!$i) $totalarray['nbfield']++;
 			}
 			if (!empty($arrayfields['f.unit_frequency']['checked']))
 			{
-			    print '<td class="center">'.($objp->frequency > 0 ? $objp->unit_frequency : '').'</td>';
-			    if (!$i) $totalarray['nbfield']++;
+				print '<td class="center">'.($objp->frequency > 0 ? $objp->unit_frequency : '').'</td>';
+				if (!$i) $totalarray['nbfield']++;
 			}
 			if (!empty($arrayfields['f.nb_gen_done']['checked']))
 			{
@@ -602,10 +602,10 @@ if ($resql)
 			// Date last generation
 			if (!empty($arrayfields['f.date_last_gen']['checked']))
 			{
-			    print '<td class="center">';
-			    print ($objp->frequency > 0 ? dol_print_date($db->jdate($objp->date_last_gen), 'day') : '<span class="opacitymedium">'.$langs->trans('NA').'</span>');
-			    print '</td>';
-			    if (!$i) $totalarray['nbfield']++;
+				print '<td class="center">';
+				print ($objp->frequency > 0 ? dol_print_date($db->jdate($objp->date_last_gen), 'day') : '<span class="opacitymedium">'.$langs->trans('NA').'</span>');
+				print '</td>';
+				if (!$i) $totalarray['nbfield']++;
 			}
 			// Date next generation
 			if (!empty($arrayfields['f.date_when']['checked']))
@@ -625,17 +625,17 @@ if ($resql)
 			}
 			if (!empty($arrayfields['f.datec']['checked']))
 			{
-			    print '<td class="center">';
-			    print dol_print_date($db->jdate($objp->datec), 'dayhour');
-			    print '</td>';
-			    if (!$i) $totalarray['nbfield']++;
+				print '<td class="center">';
+				print dol_print_date($db->jdate($objp->datec), 'dayhour');
+				print '</td>';
+				if (!$i) $totalarray['nbfield']++;
 			}
 			if (!empty($arrayfields['f.tms']['checked']))
 			{
-			    print '<td class="center">';
-			    print dol_print_date($db->jdate($objp->tms), 'dayhour');
-			    print '</td>';
-			    if (!$i) $totalarray['nbfield']++;
+				print '<td class="center">';
+				print dol_print_date($db->jdate($objp->tms), 'dayhour');
+				print '</td>';
+				if (!$i) $totalarray['nbfield']++;
 			}
 
 			$obj = $objp;
@@ -647,10 +647,10 @@ if ($resql)
 			print $hookmanager->resPrint;
 			// Status
 			if (!empty($arrayfields['status']['checked'])) {
-			    print '<td class="center">';
-			    print $invoicerectmp->getLibStatut(3, 0);
-			    print '</td>';
-			    if (!$i) $totalarray['nbfield']++;
+				print '<td class="center">';
+				print $invoicerectmp->getLibStatut(3, 0);
+				print '</td>';
+				if (!$i) $totalarray['nbfield']++;
 			}
 			// Action column
 			print '<td class="center">';
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index ba902c4b773..b96728885d9 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -73,7 +73,7 @@ $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'inv
 
 if ($contextpage == 'poslist')
 {
-    $_GET['optioncss'] = 'print';
+	$_GET['optioncss'] = 'print';
 }
 
 $lineid = GETPOST('lineid', 'int');
@@ -206,10 +206,10 @@ $arrayfields = array(
 	'f.multicurrency_total_ttc'=>array('label'=>'MulticurrencyAmountTTC', 'checked'=>0, 'enabled'=>(empty($conf->multicurrency->enabled) ? 0 : 1), 'position'=>200),
 	'multicurrency_dynamount_payed'=>array('label'=>'MulticurrencyAlreadyPaid', 'checked'=>0, 'enabled'=>(empty($conf->multicurrency->enabled) ? 0 : 1), 'position'=>210),
 	'multicurrency_rtp'=>array('label'=>'MulticurrencyRemainderToPay', 'checked'=>0, 'enabled'=>(empty($conf->multicurrency->enabled) ? 0 : 1), 'position'=>220), // Not enabled by default because slow
-	'total_pa' => array('label' => ($conf->global->MARGIN_TYPE == '1' ? 'BuyingPrice' : 'CostPrice'), 'checked' => 0, 'position' => 300, 'enabled' => (empty($conf->margin->enabled) || !$user->rights->margins->liretous?0:1)),
-	'total_margin' => array('label' => 'Margin', 'checked' => 0, 'position' => 301, 'enabled' => (empty($conf->margin->enabled) || !$user->rights->margins->liretous?0:1)),
-	'total_margin_rate' => array('label' => 'MarginRate', 'checked' => 0, 'position' => 302, 'enabled' => (empty($conf->margin->enabled) || !$user->rights->margins->liretous || empty($conf->global->DISPLAY_MARGIN_RATES)?0:1)),
-	'total_mark_rate' => array('label' => 'MarkRate', 'checked' => 0, 'position' => 303, 'enabled' => (empty($conf->margin->enabled) || !$user->rights->margins->liretous || empty($conf->global->DISPLAY_MARK_RATES)?0:1)),
+	'total_pa' => array('label' => ($conf->global->MARGIN_TYPE == '1' ? 'BuyingPrice' : 'CostPrice'), 'checked' => 0, 'position' => 300, 'enabled' => (empty($conf->margin->enabled) || !$user->rights->margins->liretous ? 0 : 1)),
+	'total_margin' => array('label' => 'Margin', 'checked' => 0, 'position' => 301, 'enabled' => (empty($conf->margin->enabled) || !$user->rights->margins->liretous ? 0 : 1)),
+	'total_margin_rate' => array('label' => 'MarginRate', 'checked' => 0, 'position' => 302, 'enabled' => (empty($conf->margin->enabled) || !$user->rights->margins->liretous || empty($conf->global->DISPLAY_MARGIN_RATES) ? 0 : 1)),
+	'total_mark_rate' => array('label' => 'MarkRate', 'checked' => 0, 'position' => 303, 'enabled' => (empty($conf->margin->enabled) || !$user->rights->margins->liretous || empty($conf->global->DISPLAY_MARK_RATES) ? 0 : 1)),
 	'f.datec'=>array('label'=>"DateCreation", 'checked'=>0, 'position'=>500),
 	'f.tms'=>array('label'=>"DateModificationShort", 'checked'=>0, 'position'=>500),
 	'f.note_public'=>array('label'=>'NotePublic', 'checked'=>0, 'position'=>510, 'enabled'=>(empty($conf->global->MAIN_LIST_ALLOW_PUBLIC_NOTES))),
@@ -306,8 +306,8 @@ if (empty($reshook))
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }
 
-if ($massaction == 'makepayment'){
-	$arrayofselected=is_array($toselect)?$toselect:array();
+if ($massaction == 'makepayment') {
+	$arrayofselected = is_array($toselect) ? $toselect : array();
 
 	$loc = dol_buildpath('/compta/paiement.php', 2).'?action=create&facids='.implode(',', $arrayofselected);
 
@@ -674,16 +674,16 @@ if ($resql)
 		//'makepayment'=>$langs->trans("InvoicePaymentsLimits"),   TODO Blank page when using this
 	);
 	if ($conf->prelevement->enabled) {
-        	$langs->load("withdrawals");
-        	$arrayofmassactions['withdrawrequest'] = $langs->trans("MakeWithdrawRequest");
+			$langs->load("withdrawals");
+			$arrayofmassactions['withdrawrequest'] = $langs->trans("MakeWithdrawRequest");
 	}
 	if ($user->rights->facture->supprimer) {
 		if (!empty($conf->global->INVOICE_CAN_REMOVE_DRAFT_ONLY)) {
-        	$arrayofmassactions['predeletedraft'] = $langs->trans("Deletedraft");
+			$arrayofmassactions['predeletedraft'] = $langs->trans("Deletedraft");
 		} elseif (!empty($conf->global->INVOICE_CAN_ALWAYS_BE_REMOVED)) {	// mass deletion never possible on invoices on such situation
-            $arrayofmassactions['predelete'] = $langs->trans("Delete");
-        }
-    }
+			$arrayofmassactions['predelete'] = $langs->trans("Delete");
+		}
+	}
 	if (in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
 	$massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
@@ -863,7 +863,7 @@ if ($resql)
 	// Project label
 	if (!empty($arrayfields['p.title']['checked']))
 	{
-	    print '<td class="liste_titre"><input class="flat maxwidth50imp" type="text" name="search_project" value="'.$search_project.'"></td>';
+		print '<td class="liste_titre"><input class="flat maxwidth50imp" type="text" name="search_project" value="'.$search_project.'"></td>';
 	}
 	// Thirdparty
 	if (!empty($arrayfields['s.nom']['checked']))
@@ -967,8 +967,8 @@ if ($resql)
 	}
 	if (!empty($arrayfields['f.retained_warranty']['checked']))
 	{
-	    print '<td class="liste_titre" align="right">';
-	    print '</td>';
+		print '<td class="liste_titre" align="right">';
+		print '</td>';
 	}
 	if (!empty($arrayfields['dynamount_payed']['checked']))
 	{
@@ -1170,9 +1170,9 @@ if ($resql)
 			$facturestatic->ref = $obj->ref;
 			$facturestatic->ref_client = $obj->ref_client;
 			$facturestatic->type = $obj->type;
-            $facturestatic->total_ht = $obj->total_ht;
-            $facturestatic->total_tva = $obj->total_vat;
-            $facturestatic->total_ttc = $obj->total_ttc;
+			$facturestatic->total_ht = $obj->total_ht;
+			$facturestatic->total_tva = $obj->total_vat;
+			$facturestatic->total_ttc = $obj->total_ttc;
 			$facturestatic->multicurrency_code = $obj->multicurrency_code;
 			$facturestatic->multicurrency_tx = $obj->multicurrency_tx;
 			$facturestatic->multicurrency_total_ht = $obj->multicurrency_total_ht;
@@ -1181,23 +1181,23 @@ if ($resql)
 			$facturestatic->statut = $obj->fk_statut;
 			$facturestatic->close_code = $obj->close_code;
 			$facturestatic->total_ttc = $obj->total_ttc;
-            $facturestatic->paye = $obj->paye;
-            $facturestatic->fk_soc = $obj->fk_soc;
+			$facturestatic->paye = $obj->paye;
+			$facturestatic->fk_soc = $obj->fk_soc;
 
-            $facturestatic->date = $db->jdate($obj->df);
-            $facturestatic->date_valid = $db->jdate($obj->date_valid);
-            $facturestatic->date_lim_reglement = $db->jdate($obj->datelimite);
+			$facturestatic->date = $db->jdate($obj->df);
+			$facturestatic->date_valid = $db->jdate($obj->date_valid);
+			$facturestatic->date_lim_reglement = $db->jdate($obj->datelimite);
 
-            $facturestatic->note_public = $obj->note_public;
+			$facturestatic->note_public = $obj->note_public;
 			$facturestatic->note_private = $obj->note_private;
 			if ($conf->global->INVOICE_USE_SITUATION && $conf->global->INVOICE_USE_RETAINED_WARRANTY)
 			{
-			     $facturestatic->retained_warranty = $obj->retained_warranty;
-			     $facturestatic->retained_warranty_date_limit = $obj->retained_warranty_date_limit;
-			     $facturestatic->situation_final = $obj->retained_warranty_date_limit;
-			     $facturestatic->situation_final = $obj->retained_warranty_date_limit;
-			     $facturestatic->situation_cycle_ref = $obj->situation_cycle_ref;
-			     $facturestatic->situation_counter = $obj->situation_counter;
+				 $facturestatic->retained_warranty = $obj->retained_warranty;
+				 $facturestatic->retained_warranty_date_limit = $obj->retained_warranty_date_limit;
+				 $facturestatic->situation_final = $obj->retained_warranty_date_limit;
+				 $facturestatic->situation_final = $obj->retained_warranty_date_limit;
+				 $facturestatic->situation_cycle_ref = $obj->situation_cycle_ref;
+				 $facturestatic->situation_counter = $obj->situation_counter;
 			}
 			$thirdpartystatic->id = $obj->socid;
 			$thirdpartystatic->name = $obj->name;
@@ -1246,19 +1246,19 @@ if ($resql)
 				$marginInfo = $formmargin->getMarginInfosArray($facturestatic);
 			}
 
-            print '<tr class="oddeven"';
-            if ($contextpage == 'poslist')
-            {
-                print ' onclick="parent.$(\'#poslines\').load(\'invoice.php?action=history&placeid='.$obj->id.'\', function() {parent.$.colorbox.close();});"';
-            }
-            print '>';
+			print '<tr class="oddeven"';
+			if ($contextpage == 'poslist')
+			{
+				print ' onclick="parent.$(\'#poslines\').load(\'invoice.php?action=history&placeid='.$obj->id.'\', function() {parent.$.colorbox.close();});"';
+			}
+			print '>';
 
-            // No
-            if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER_IN_LIST)) {
-            	print '<td>'.(($offset * $limit) + $i).'</td>';
-            }
+			// No
+			if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER_IN_LIST)) {
+				print '<td>'.(($offset * $limit) + $i).'</td>';
+			}
 
-            // Ref
+			// Ref
 			if (!empty($arrayfields['f.ref']['checked']))
 			{
 				print '<td class="nowraponall">';
@@ -1266,12 +1266,12 @@ if ($resql)
 				print '<table class="nobordernopadding"><tr class="nocellnopadd">';
 
 				print '<td class="nobordernopadding nowraponall">';
-                if ($contextpage == 'poslist')
-                {
-                    print $obj->ref;
-                } else {
-                    print $facturestatic->getNomUrl(1, '', 200, 0, '', 0, 1);
-                }
+				if ($contextpage == 'poslist')
+				{
+					print $obj->ref;
+				} else {
+					print $facturestatic->getNomUrl(1, '', 200, 0, '', 0, 1);
+				}
 
 				$filename = dol_sanitizeFileName($obj->ref);
 				$filedir = $conf->facture->dir_output.'/'.dol_sanitizeFileName($obj->ref);
@@ -1327,7 +1327,7 @@ if ($resql)
 				print '<td align="center" class="nowraponall">'.dol_print_date($datelimit, 'day');
 				if ($facturestatic->hasDelay())
 				{
-				    print img_warning($langs->trans('Alert').' - '.$langs->trans('Late'));
+					print img_warning($langs->trans('Alert').' - '.$langs->trans('Late'));
 				}
 				print '</td>';
 				if (!$i) $totalarray['nbfield']++;
@@ -1348,24 +1348,24 @@ if ($resql)
 			// Project title
 			if (!empty($arrayfields['p.title']['checked']))
 			{
-			    print '<td class="nowraponall">';
-			    if ($obj->project_id > 0)
-			    {
-			        print $projectstatic->title;
-			    }
-			    print '</td>';
-			    if (!$i) $totalarray['nbfield']++;
+				print '<td class="nowraponall">';
+				if ($obj->project_id > 0)
+				{
+					print $projectstatic->title;
+				}
+				print '</td>';
+				if (!$i) $totalarray['nbfield']++;
 			}
 
 			// Third party
 			if (!empty($arrayfields['s.nom']['checked']))
 			{
 				print '<td class="tdoverflowmax200">';
-		        if ($contextpage == 'poslist')
+				if ($contextpage == 'poslist')
 				{
-				    print $thirdpartystatic->name;
+					print $thirdpartystatic->name;
 				} else {
-				    print $thirdpartystatic->getNomUrl(1, 'customer');
+					print $thirdpartystatic->getNomUrl(1, 'customer');
 				}
 				print '</td>';
 				if (!$i) $totalarray['nbfield']++;
@@ -1511,7 +1511,7 @@ if ($resql)
 
 			if (!empty($arrayfields['f.retained_warranty']['checked']))
 			{
-			    print '<td align="right">'.(!empty($obj->retained_warranty) ?price($obj->retained_warranty).'%' : '&nbsp;').'</td>';
+				print '<td align="right">'.(!empty($obj->retained_warranty) ?price($obj->retained_warranty).'%' : '&nbsp;').'</td>';
 			}
 
 			if (!empty($arrayfields['dynamount_payed']['checked']))
@@ -1585,25 +1585,25 @@ if ($resql)
 			// Total buying or cost price
 			if (!empty($arrayfields['total_pa']['checked']))
 			{
-				print '<td class="right nowrap">' . price($marginInfo['pa_total']) . '</td>';
+				print '<td class="right nowrap">'.price($marginInfo['pa_total']).'</td>';
 				if (!$i) $totalarray['nbfield']++;
 			}
 			// Total margin
 			if (!empty($arrayfields['total_margin']['checked']))
 			{
-				print '<td class="right nowrap">' . price($marginInfo['total_margin']) . '</td>';
+				print '<td class="right nowrap">'.price($marginInfo['total_margin']).'</td>';
 				if (!$i) $totalarray['nbfield']++;
 			}
 			// Total margin rate
 			if (!empty($arrayfields['total_margin_rate']['checked']))
 			{
-				print '<td class="right nowrap">' . (($marginInfo['total_margin_rate'] == '')?'':price($marginInfo['total_margin_rate'], null, null, null, null, 2).'%') . '</td>';
+				print '<td class="right nowrap">'.(($marginInfo['total_margin_rate'] == '') ? '' : price($marginInfo['total_margin_rate'], null, null, null, null, 2).'%').'</td>';
 				if (!$i) $totalarray['nbfield']++;
 			}
 			// total mark rate
 			if (!empty($arrayfields['total_mark_rate']['checked']))
 			{
-				print '<td class="right nowrap">' . (($marginInfo['total_mark_rate'] == '')?'':price($marginInfo['total_mark_rate'], null, null, null, null, 2).'%') . '</td>';
+				print '<td class="right nowrap">'.(($marginInfo['total_mark_rate'] == '') ? '' : price($marginInfo['total_mark_rate'], null, null, null, null, 2).'%').'</td>';
 				if (!$i) $totalarray['nbfield']++;
 			}
 
diff --git a/htdocs/compta/facture/note.php b/htdocs/compta/facture/note.php
index 76c6833c07b..aa3bd40c591 100644
--- a/htdocs/compta/facture/note.php
+++ b/htdocs/compta/facture/note.php
@@ -77,69 +77,69 @@ if ($id > 0 || !empty($ref))
 
 	$object->fetch_thirdparty();
 
-    $head = facture_prepare_head($object);
+	$head = facture_prepare_head($object);
 
-    $totalpaye = $object->getSommePaiement();
+	$totalpaye = $object->getSommePaiement();
 
-    print dol_get_fiche_head($head, 'note', $langs->trans("InvoiceCustomer"), -1, 'bill');
+	print dol_get_fiche_head($head, 'note', $langs->trans("InvoiceCustomer"), -1, 'bill');
 
-    // Invoice content
+	// Invoice content
 
-    $linkback = '<a href="'.DOL_URL_ROOT.'/compta/facture/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
+	$linkback = '<a href="'.DOL_URL_ROOT.'/compta/facture/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
-    $morehtmlref = '<div class="refidno">';
-    // Ref customer
-    $morehtmlref .= $form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
-    $morehtmlref .= $form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
-    // Thirdparty
-    $morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1, 'customer');
-    // Project
-    if (!empty($conf->projet->enabled))
-    {
-    	$langs->load("projects");
-    	$morehtmlref .= '<br>'.$langs->trans('Project').' ';
-    	if ($user->rights->facture->creer)
-    	{
-    		if ($action != 'classify')
-    			//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
-    			$morehtmlref .= ' : ';
-    		if ($action == 'classify') {
-    			//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-    			$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-    			$morehtmlref .= '<input type="hidden" name="action" value="classin">';
-    			$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
-    			$morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-    			$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-    			$morehtmlref .= '</form>';
-    		} else {
-    			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-    		}
-    	} else {
-    		if (!empty($object->fk_project)) {
-    			$proj = new Project($db);
-    			$proj->fetch($object->fk_project);
-    			$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
-    			$morehtmlref .= $proj->ref;
-    			$morehtmlref .= '</a>';
-    		} else {
-    			$morehtmlref .= '';
-    		}
-    	}
-    }
-    $morehtmlref .= '</div>';
+	$morehtmlref = '<div class="refidno">';
+	// Ref customer
+	$morehtmlref .= $form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
+	$morehtmlref .= $form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
+	// Thirdparty
+	$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1, 'customer');
+	// Project
+	if (!empty($conf->projet->enabled))
+	{
+		$langs->load("projects");
+		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
+		if ($user->rights->facture->creer)
+		{
+			if ($action != 'classify')
+				//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+				$morehtmlref .= ' : ';
+			if ($action == 'classify') {
+				//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+				$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+				$morehtmlref .= '<input type="hidden" name="action" value="classin">';
+				$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
+				$morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+				$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+				$morehtmlref .= '</form>';
+			} else {
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+			}
+		} else {
+			if (!empty($object->fk_project)) {
+				$proj = new Project($db);
+				$proj->fetch($object->fk_project);
+				$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
+				$morehtmlref .= $proj->ref;
+				$morehtmlref .= '</a>';
+			} else {
+				$morehtmlref .= '';
+			}
+		}
+	}
+	$morehtmlref .= '</div>';
 
-    $object->totalpaye = $totalpaye; // To give a chance to dol_banner_tab to use already paid amount to show correct status
+	$object->totalpaye = $totalpaye; // To give a chance to dol_banner_tab to use already paid amount to show correct status
 
-    dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '', 0);
+	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '', 0);
 
 	print '<div class="fichecenter">';
 	print '<div class="underbanner clearboth"></div>';
 
 
 	$cssclass = "titlefield";
-    include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
+	include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 }
 
 // End of page
diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php
index 2f44b0b2437..f6a00f606ba 100644
--- a/htdocs/compta/facture/prelevement.php
+++ b/htdocs/compta/facture/prelevement.php
@@ -88,45 +88,45 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 
 if (empty($reshook))
 {
-    if ($action == "new")
-    {
-        if ($object->id > 0)
-        {
-            $db->begin();
+	if ($action == "new")
+	{
+		if ($object->id > 0)
+		{
+			$db->begin();
 
-            $newtype = $type;
-            $sourcetype = 'facture';
-            if ($type == 'bank-transfer') {
-            	$sourcetype = 'supplier_invoice';
-            	$newtype = 'bank-transfer';
-            }
+			$newtype = $type;
+			$sourcetype = 'facture';
+			if ($type == 'bank-transfer') {
+				$sourcetype = 'supplier_invoice';
+				$newtype = 'bank-transfer';
+			}
 
-            $result = $object->demande_prelevement($user, price2num(GETPOST('withdraw_request_amount', 'alpha')), $newtype, $sourcetype);
-            if ($result > 0)
-            {
-                $db->commit();
+			$result = $object->demande_prelevement($user, price2num(GETPOST('withdraw_request_amount', 'alpha')), $newtype, $sourcetype);
+			if ($result > 0)
+			{
+				$db->commit();
 
-                setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
-            } else {
-                $db->rollback();
-                setEventMessages($object->error, $object->errors, 'errors');
-            }
-        }
-        $action = '';
-    }
+				setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
+			} else {
+				$db->rollback();
+				setEventMessages($object->error, $object->errors, 'errors');
+			}
+		}
+		$action = '';
+	}
 
-    if ($action == "delete")
-    {
-    	if ($object->id > 0)
-        {
-            $result = $object->demande_prelevement_delete($user, GETPOST('did', 'int'));
-            if ($result == 0)
-            {
-                header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id.'&type='.$type);
-                exit;
-            }
-        }
-    }
+	if ($action == "delete")
+	{
+		if ($object->id > 0)
+		{
+			$result = $object->demande_prelevement_delete($user, GETPOST('did', 'int'));
+			if ($result == 0)
+			{
+				header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id.'&type='.$type);
+				exit;
+			}
+		}
+	}
 }
 
 
@@ -241,37 +241,37 @@ if ($object->id > 0)
 	// Project
 	if (!empty($conf->projet->enabled))
 	{
-	    $langs->load("projects");
-	    $morehtmlref .= '<br>'.$langs->trans('Project').' ';
-	    if ($user->rights->facture->creer)
-	    {
-	        if ($action != 'classify') {
-	        	//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+		$langs->load("projects");
+		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
+		if ($user->rights->facture->creer)
+		{
+			if ($action != 'classify') {
+				//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
 				$morehtmlref .= ' : ';
 			}
-        	if ($action == 'classify') {
-                //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-                $morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-                $morehtmlref .= '<input type="hidden" name="action" value="classin">';
-                $morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
-                $morehtmlref .= '<input type="hidden" name="type" value="'.$type.'">';
-                $morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-                $morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-                $morehtmlref .= '</form>';
-            } else {
-                $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-            }
-	    } else {
-	        if (!empty($object->fk_project)) {
-	            $proj = new Project($db);
-	            $proj->fetch($object->fk_project);
-	            $morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
-	            $morehtmlref .= $proj->ref;
-	            $morehtmlref .= '</a>';
-	        } else {
-	            $morehtmlref .= '';
-	        }
-	    }
+			if ($action == 'classify') {
+				//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+				$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+				$morehtmlref .= '<input type="hidden" name="action" value="classin">';
+				$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
+				$morehtmlref .= '<input type="hidden" name="type" value="'.$type.'">';
+				$morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+				$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+				$morehtmlref .= '</form>';
+			} else {
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+			}
+		} else {
+			if (!empty($object->fk_project)) {
+				$proj = new Project($db);
+				$proj->fetch($object->fk_project);
+				$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
+				$morehtmlref .= $proj->ref;
+				$morehtmlref .= '</a>';
+			} else {
+				$morehtmlref .= '';
+			}
+		}
 	}
 	$morehtmlref .= '</div>';
 
@@ -462,14 +462,14 @@ if ($object->id > 0)
 	print $langs->trans('BankAccount');
 	print '<td>';
 	if (($action != 'editbankaccount') && $user->rights->commande->creer && !empty($object->brouillon))
-	    print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editbankaccount&amp;id='.$object->id.'">'.img_edit($langs->trans('SetBankAccount'), 1).'</a></td>';
+		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editbankaccount&amp;id='.$object->id.'">'.img_edit($langs->trans('SetBankAccount'), 1).'</a></td>';
 	print '</tr></table>';
 	print '</td><td colspan="3">';
 	if ($action == 'editbankaccount')
 	{
-	    $form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'fk_account', 1);
+		$form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'fk_account', 1);
 	} else {
-	    $form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'none');
+		$form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'none');
 	}
 	print "</td>";
 	print '</tr>';
@@ -503,20 +503,20 @@ if ($object->id > 0)
 
 	if (!empty($conf->multicurrency->enabled) && ($object->multicurrency_code != $conf->currency))
 	{
-	    // Multicurrency Amount HT
-	    print '<tr><td class="titlefieldmiddle">'.$form->editfieldkey('MulticurrencyAmountHT', 'multicurrency_total_ht', '', $object, 0).'</td>';
-	    print '<td class="nowrap">'.price($object->multicurrency_total_ht, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).'</td>';
-	    print '</tr>';
+		// Multicurrency Amount HT
+		print '<tr><td class="titlefieldmiddle">'.$form->editfieldkey('MulticurrencyAmountHT', 'multicurrency_total_ht', '', $object, 0).'</td>';
+		print '<td class="nowrap">'.price($object->multicurrency_total_ht, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).'</td>';
+		print '</tr>';
 
-	    // Multicurrency Amount VAT
-	    print '<tr><td>'.$form->editfieldkey('MulticurrencyAmountVAT', 'multicurrency_total_tva', '', $object, 0).'</td>';
-	    print '<td class="nowrap">'.price($object->multicurrency_total_tva, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).'</td>';
-	    print '</tr>';
+		// Multicurrency Amount VAT
+		print '<tr><td>'.$form->editfieldkey('MulticurrencyAmountVAT', 'multicurrency_total_tva', '', $object, 0).'</td>';
+		print '<td class="nowrap">'.price($object->multicurrency_total_tva, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).'</td>';
+		print '</tr>';
 
-	    // Multicurrency Amount TTC
-	    print '<tr><td>'.$form->editfieldkey('MulticurrencyAmountTTC', 'multicurrency_total_ttc', '', $object, 0).'</td>';
-	    print '<td class="nowrap">'.price($object->multicurrency_total_ttc, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).'</td>';
-	    print '</tr>';
+		// Multicurrency Amount TTC
+		print '<tr><td>'.$form->editfieldkey('MulticurrencyAmountTTC', 'multicurrency_total_ttc', '', $object, 0).'</td>';
+		print '<td class="nowrap">'.price($object->multicurrency_total_ttc, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).'</td>';
+		print '</tr>';
 	}
 
 	// Amount
@@ -530,39 +530,39 @@ if ($object->id > 0)
 	// Amount Local Taxes
 	if (($mysoc->localtax1_assuj == "1" && $mysoc->useLocalTax(1)) || $object->total_localtax1 != 0) 	// Localtax1
 	{
-	    print '<tr><td>'.$langs->transcountry("AmountLT1", $mysoc->country_code).'</td>';
-	    print '<td class="nowrap">'.price($object->total_localtax1, 1, '', 1, - 1, - 1, $conf->currency).'</td></tr>';
+		print '<tr><td>'.$langs->transcountry("AmountLT1", $mysoc->country_code).'</td>';
+		print '<td class="nowrap">'.price($object->total_localtax1, 1, '', 1, - 1, - 1, $conf->currency).'</td></tr>';
 	}
 	if (($mysoc->localtax2_assuj == "1" && $mysoc->useLocalTax(2)) || $object->total_localtax2 != 0) 	// Localtax2
 	{
-	    print '<tr><td>'.$langs->transcountry("AmountLT2", $mysoc->country_code).'</td>';
-	    print '<td class=nowrap">'.price($object->total_localtax2, 1, '', 1, - 1, - 1, $conf->currency).'</td></tr>';
+		print '<tr><td>'.$langs->transcountry("AmountLT2", $mysoc->country_code).'</td>';
+		print '<td class=nowrap">'.price($object->total_localtax2, 1, '', 1, - 1, - 1, $conf->currency).'</td></tr>';
 	}
 
 	// Revenue stamp
 	if ($selleruserevenustamp) 	// Test company use revenue stamp
 	{
-	    print '<tr><td>';
-	    print '<table class="nobordernopadding" width="100%"><tr><td>';
-	    print $langs->trans('RevenueStamp');
-	    print '</td>';
-	    if ($action != 'editrevenuestamp' && !empty($object->brouillon) && $user->rights->facture->creer)
-	    {
-	        print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editrevenuestamp&amp;facid='.$object->id.'">'.img_edit($langs->trans('SetRevenuStamp'), 1).'</a></td>';
-	    }
-        print '</tr></table>';
-        print '</td><td>';
-       	print price($object->revenuestamp, 1, '', 1, - 1, - 1, $conf->currency);
-        print '</td></tr>';
+		print '<tr><td>';
+		print '<table class="nobordernopadding" width="100%"><tr><td>';
+		print $langs->trans('RevenueStamp');
+		print '</td>';
+		if ($action != 'editrevenuestamp' && !empty($object->brouillon) && $user->rights->facture->creer)
+		{
+			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editrevenuestamp&amp;facid='.$object->id.'">'.img_edit($langs->trans('SetRevenuStamp'), 1).'</a></td>';
+		}
+		print '</tr></table>';
+		print '</td><td>';
+	   	print price($object->revenuestamp, 1, '', 1, - 1, - 1, $conf->currency);
+		print '</td></tr>';
 	}
 
 	// Total with tax
 	print '<tr><td>'.$langs->trans('AmountTTC').'</td><td class="nowrap">'.price($object->total_ttc, 1, '', 1, - 1, - 1, $conf->currency).'</td></tr>';
 
-    $resteapayer = price2num($object->total_ttc - $totalpaye - $totalcreditnotes - $totaldeposits, 'MT');
+	$resteapayer = price2num($object->total_ttc - $totalpaye - $totalcreditnotes - $totaldeposits, 'MT');
 
-    // TODO Replace this by an include with same code to show already done payment visible in invoice card
-    print '<tr><td>'.$langs->trans('RemainderToPay').'</td><td class="nowrap">'.price($resteapayer, 1, '', 1, - 1, - 1, $conf->currency).'</td></tr>';
+	// TODO Replace this by an include with same code to show already done payment visible in invoice card
+	print '<tr><td>'.$langs->trans('RemainderToPay').'</td><td class="nowrap">'.price($resteapayer, 1, '', 1, - 1, - 1, $conf->currency).'</td></tr>';
 
 	print '</table>';
 
@@ -573,7 +573,7 @@ if ($object->id > 0)
 	print '<div class="clearboth"></div>';
 
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 
 	$numopen = 0; $pending = 0; $numclosed = 0;
@@ -639,27 +639,27 @@ if ($object->id > 0)
 	// Add a transfer request
 	if ($object->statut > $object::STATUS_DRAFT && $object->paye == 0 && $num == 0)
 	{
-	    if ($resteapayer > 0)
-	    {
-    		if ($user->rights->prelevement->bons->creer)
-    		{
-    			$remaintopaylesspendingdebit = $resteapayer - $pending;
+		if ($resteapayer > 0)
+		{
+			if ($user->rights->prelevement->bons->creer)
+			{
+				$remaintopaylesspendingdebit = $resteapayer - $pending;
 
-    			print '<form method="POST" action="">';
-    			print '<input type="hidden" name="token" value="'.newToken().'" />';
-    			print '<input type="hidden" name="id" value="'.$object->id.'" />';
-    			print '<input type="hidden" name="type" value="'.$type.'" />';
-    			print '<input type="hidden" name="action" value="new" />';
-    			print '<label for="withdraw_request_amount">'.$langs->trans('BankTransferAmount').' </label>';
-    			print '<input type="text" id="withdraw_request_amount" name="withdraw_request_amount" value="'.$remaintopaylesspendingdebit.'" size="9" />';
-    			print '<input type="submit" class="butAction" value="'.$buttonlabel.'" />';
-    			print '</form>';
-    		} else {
-    			print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$buttonlabel.'</a>';
-    		}
-	    } else {
-        	print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("AmountMustBePositive")).'">'.$buttonlabel.'</a>';
-        }
+				print '<form method="POST" action="">';
+				print '<input type="hidden" name="token" value="'.newToken().'" />';
+				print '<input type="hidden" name="id" value="'.$object->id.'" />';
+				print '<input type="hidden" name="type" value="'.$type.'" />';
+				print '<input type="hidden" name="action" value="new" />';
+				print '<label for="withdraw_request_amount">'.$langs->trans('BankTransferAmount').' </label>';
+				print '<input type="text" id="withdraw_request_amount" name="withdraw_request_amount" value="'.$remaintopaylesspendingdebit.'" size="9" />';
+				print '<input type="submit" class="butAction" value="'.$buttonlabel.'" />';
+				print '</form>';
+			} else {
+				print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$buttonlabel.'</a>';
+			}
+		} else {
+			print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("AmountMustBePositive")).'">'.$buttonlabel.'</a>';
+		}
 	} else {
 		if ($num == 0)
 		{
diff --git a/htdocs/compta/facture/stats/index.php b/htdocs/compta/facture/stats/index.php
index afbe4528b14..9cbd826b4a1 100644
--- a/htdocs/compta/facture/stats/index.php
+++ b/htdocs/compta/facture/stats/index.php
@@ -54,14 +54,14 @@ $custcats = GETPOST('custcats', 'array');
 // Security check
 if ($user->socid > 0)
 {
-    $action = '';
-    $socid = $user->socid;
+	$action = '';
+	$socid = $user->socid;
 }
 
 $nowyear = strftime("%Y", dol_now());
 $year = GETPOST('year') > 0 ?GETPOST('year') : $nowyear;
-if (!empty($conf->global->INVOICE_STATS_GRAPHS_SHOW_2_YEARS)) $startyear=$year-2;
-else $startyear=$year-1;
+if (!empty($conf->global->INVOICE_STATS_GRAPHS_SHOW_2_YEARS)) $startyear = $year - 2;
+else $startyear = $year - 1;
 $endyear = $year;
 
 
@@ -95,10 +95,10 @@ $stats = new FactureStats($db, $socid, $mode, ($userid > 0 ? $userid : 0), ($typ
 if ($mode == 'customer')
 {
 	if ($object_status != '' && $object_status >= 0) $stats->where .= ' AND f.fk_statut IN ('.$db->sanitize($db->escape($object_status)).')';
-    if (is_array($custcats) && !empty($custcats)) {
-        $stats->from .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie_societe as cat ON (f.fk_soc = cat.fk_soc)';
-        $stats->where .= ' AND cat.fk_categorie IN ('.implode(',', $custcats).')';
-    }
+	if (is_array($custcats) && !empty($custcats)) {
+		$stats->from .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie_societe as cat ON (f.fk_soc = cat.fk_soc)';
+		$stats->where .= ' AND cat.fk_categorie IN ('.implode(',', $custcats).')';
+	}
 }
 if ($mode == 'supplier')
 {
@@ -177,38 +177,38 @@ $data = $stats->getAverageByMonthWithPrevYear($endyear, $startyear);
 
 if (!$user->rights->societe->client->voir || $user->socid)
 {
-    $filename_avg = $dir.'/ordersaverage-'.$user->id.'-'.$year.'.png';
-    if ($mode == 'customer') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersaverage-'.$user->id.'-'.$year.'.png';
-    if ($mode == 'supplier') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersaverage-'.$user->id.'-'.$year.'.png';
+	$filename_avg = $dir.'/ordersaverage-'.$user->id.'-'.$year.'.png';
+	if ($mode == 'customer') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersaverage-'.$user->id.'-'.$year.'.png';
+	if ($mode == 'supplier') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersaverage-'.$user->id.'-'.$year.'.png';
 } else {
-    $filename_avg = $dir.'/ordersaverage-'.$year.'.png';
-    if ($mode == 'customer') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersaverage-'.$year.'.png';
-    if ($mode == 'supplier') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersaverage-'.$year.'.png';
+	$filename_avg = $dir.'/ordersaverage-'.$year.'.png';
+	if ($mode == 'customer') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersaverage-'.$year.'.png';
+	if ($mode == 'supplier') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersaverage-'.$year.'.png';
 }
 
 $px3 = new DolGraph();
 $mesg = $px3->isGraphKo();
 if (!$mesg)
 {
-    $px3->SetData($data);
-    $i = $startyear; $legend = array();
-    while ($i <= $endyear)
-    {
-        $legend[] = $i;
-        $i++;
-    }
-    $px3->SetLegend($legend);
-    $px3->SetYLabel($langs->trans("AmountAverage"));
-    $px3->SetMaxValue($px3->GetCeilMaxValue());
-    $px3->SetMinValue($px3->GetFloorMinValue());
-    $px3->SetWidth($WIDTH);
-    $px3->SetHeight($HEIGHT);
-    $px3->SetShading(3);
-    $px3->SetHorizTickIncrement(1);
-    $px3->mode = 'depth';
-    $px3->SetTitle($langs->trans("AmountAverage"));
+	$px3->SetData($data);
+	$i = $startyear; $legend = array();
+	while ($i <= $endyear)
+	{
+		$legend[] = $i;
+		$i++;
+	}
+	$px3->SetLegend($legend);
+	$px3->SetYLabel($langs->trans("AmountAverage"));
+	$px3->SetMaxValue($px3->GetCeilMaxValue());
+	$px3->SetMinValue($px3->GetFloorMinValue());
+	$px3->SetWidth($WIDTH);
+	$px3->SetHeight($HEIGHT);
+	$px3->SetShading(3);
+	$px3->SetHorizTickIncrement(1);
+	$px3->mode = 'depth';
+	$px3->SetTitle($langs->trans("AmountAverage"));
 
-    $px3->draw($filename_avg, $fileurl_avg);
+	$px3->draw($filename_avg, $fileurl_avg);
 }
 
 
@@ -216,7 +216,7 @@ if (!$mesg)
 $data = $stats->getAllByYear();
 $arrayyears = array();
 foreach ($data as $val) {
-    $arrayyears[$val['year']] = $val['year'];
+	$arrayyears[$val['year']] = $val['year'];
 }
 if (!count($arrayyears)) $arrayyears[$nowyear] = $nowyear;
 
@@ -269,16 +269,16 @@ if ($user->admin) print ' '.info_admin($langs->trans("YouCanChangeValuesForThisL
 print '</td></tr>';
 
 // Category
-if (! empty($conf->category->enabled)) {
+if (!empty($conf->category->enabled)) {
 	if ($mode == 'customer')
 	{
-	    $cat_type = Categorie::TYPE_CUSTOMER;
-	    $cat_label = $langs->trans("Category").' '.lcfirst($langs->trans("Customer"));
+		$cat_type = Categorie::TYPE_CUSTOMER;
+		$cat_label = $langs->trans("Category").' '.lcfirst($langs->trans("Customer"));
 	}
 	if ($mode == 'supplier')
 	{
-	    $cat_type = Categorie::TYPE_SUPPLIER;
-	    $cat_label = $langs->trans("Category").' '.lcfirst($langs->trans("Supplier"));
+		$cat_type = Categorie::TYPE_SUPPLIER;
+		$cat_label = $langs->trans("Category").' '.lcfirst($langs->trans("Supplier"));
 	}
 	print '<tr><td>'.$cat_label.'</td><td>';
 	$cate_arbo = $form->select_all_categories(Categorie::TYPE_CUSTOMER, null, 'parent', null, null, 1);
@@ -295,13 +295,13 @@ print '</td></tr>';
 print '<tr><td class="left">'.$langs->trans("Status").'</td><td class="left">';
 if ($mode == 'customer')
 {
-    $liststatus = array('0'=>$langs->trans("BillStatusDraft"), '1'=>$langs->trans("BillStatusNotPaid"), '2'=>$langs->trans("BillStatusPaid"), '1,2'=>$langs->trans("BillStatusNotPaid").' / '.$langs->trans("BillStatusPaid"), '3'=>$langs->trans("BillStatusCanceled"));
-    print $form->selectarray('object_status', $liststatus, $object_status, 1);
+	$liststatus = array('0'=>$langs->trans("BillStatusDraft"), '1'=>$langs->trans("BillStatusNotPaid"), '2'=>$langs->trans("BillStatusPaid"), '1,2'=>$langs->trans("BillStatusNotPaid").' / '.$langs->trans("BillStatusPaid"), '3'=>$langs->trans("BillStatusCanceled"));
+	print $form->selectarray('object_status', $liststatus, $object_status, 1);
 }
 if ($mode == 'supplier')
 {
-    $liststatus = array('0'=>$langs->trans("BillStatusDraft"), '1'=>$langs->trans("BillStatusNotPaid"), '2'=>$langs->trans("BillStatusPaid"));
-    print $form->selectarray('object_status', $liststatus, $object_status, 1);
+	$liststatus = array('0'=>$langs->trans("BillStatusDraft"), '1'=>$langs->trans("BillStatusNotPaid"), '2'=>$langs->trans("BillStatusPaid"));
+	print $form->selectarray('object_status', $liststatus, $object_status, 1);
 }
 print '</td></tr>';
 // Year
@@ -371,8 +371,8 @@ if ($mesg) { print $mesg; } else {
 	print $px1->show();
 	print "<br>\n";
 	print $px2->show();
-    print "<br>\n";
-    print $px3->show();
+	print "<br>\n";
+	print $px3->show();
 }
 print '</td></tr></table>';
 
@@ -381,7 +381,7 @@ print '</div></div></div>';
 print '<div style="clear:both"></div>';
 
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // End of page
 llxFooter();
diff --git a/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php b/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
index ef35c03eb54..92745a276e1 100644
--- a/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
@@ -40,10 +40,10 @@ $total = 0;
 $ilink = 0;
 foreach ($linkedObjectBlock as $key => $objectlink)
 {
-    $ilink++;
+	$ilink++;
 
-    $trclass = 'oddeven';
-    if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass .= ' liste_sub_total';
+	$trclass = 'oddeven';
+	if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass .= ' liste_sub_total';
 	print '<tr class="'.$trclass.'" data-element="'.$objectlink->element.'"  data-id="'.$objectlink->id.'" >';
 	print '<td class="linkedcol-element">';
 	switch ($objectlink->type) {
@@ -67,37 +67,37 @@ foreach ($linkedObjectBlock as $key => $objectlink)
 			break;
 	}
 	print '</td>';
-    print '<td class="linkedcol-name nowraponall">'.$objectlink->getNomUrl(1).'</td>';
-    print '<td class="linkedcol-ref left">'.$objectlink->ref_client.'</td>';
-    print '<td class="linkedcol-date center">'.dol_print_date($objectlink->date, 'day').'</td>';
-    print '<td class="linkedcol-amount right">';
-    if ($user->rights->facture->lire) {
-    	$sign = 1;
-    	if ($object->type == Facture::TYPE_CREDIT_NOTE) $sign = -1;
-    	if ($objectlink->statut != 3) {
+	print '<td class="linkedcol-name nowraponall">'.$objectlink->getNomUrl(1).'</td>';
+	print '<td class="linkedcol-ref left">'.$objectlink->ref_client.'</td>';
+	print '<td class="linkedcol-date center">'.dol_print_date($objectlink->date, 'day').'</td>';
+	print '<td class="linkedcol-amount right">';
+	if ($user->rights->facture->lire) {
+		$sign = 1;
+		if ($object->type == Facture::TYPE_CREDIT_NOTE) $sign = -1;
+		if ($objectlink->statut != 3) {
 			// If not abandonned
-    		$total = $total + $sign * $objectlink->total_ht;
-    		echo price($objectlink->total_ht);
-    	} else {
-    		echo '<strike>'.price($objectlink->total_ht).'</strike>';
-    	}
+			$total = $total + $sign * $objectlink->total_ht;
+			echo price($objectlink->total_ht);
+		} else {
+			echo '<strike>'.price($objectlink->total_ht).'</strike>';
+		}
 	}
-    print '</td>';
-    print '<td class="linkedcol-statut right">'.$objectlink->getLibStatut(3).'</td>';
-    print '<td class="linkedcol-action right"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key.'">'.img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink').'</a></td>';
-    print "</tr>\n";
+	print '</td>';
+	print '<td class="linkedcol-statut right">'.$objectlink->getLibStatut(3).'</td>';
+	print '<td class="linkedcol-action right"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key.'">'.img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink').'</a></td>';
+	print "</tr>\n";
 }
 if (count($linkedObjectBlock) > 1)
 {
-    print '<tr class="liste_total '.(empty($noMoreLinkedObjectBlockAfter) ? 'liste_sub_total' : '').'">';
-    print '<td>'.$langs->trans("Total").'</td>';
-    print '<td></td>';
-    print '<td class="center"></td>';
-    print '<td class="center"></td>';
-    print '<td class="right">'.price($total).'</td>';
-    print '<td class="right"></td>';
-    print '<td class="right"></td>';
-    print '</tr>';
+	print '<tr class="liste_total '.(empty($noMoreLinkedObjectBlockAfter) ? 'liste_sub_total' : '').'">';
+	print '<td>'.$langs->trans("Total").'</td>';
+	print '<td></td>';
+	print '<td class="center"></td>';
+	print '<td class="center"></td>';
+	print '<td class="right">'.price($total).'</td>';
+	print '<td class="right"></td>';
+	print '<td class="right"></td>';
+	print '</tr>';
 }
 
 print "<!-- END PHP TEMPLATE -->\n";
diff --git a/htdocs/compta/facture/tpl/linkedobjectblockForRec.tpl.php b/htdocs/compta/facture/tpl/linkedobjectblockForRec.tpl.php
index 4e5a63e3a8a..1c8473637f3 100644
--- a/htdocs/compta/facture/tpl/linkedobjectblockForRec.tpl.php
+++ b/htdocs/compta/facture/tpl/linkedobjectblockForRec.tpl.php
@@ -40,10 +40,10 @@ $total = 0;
 $ilink = 0;
 foreach ($linkedObjectBlock as $key => $objectlink)
 {
-    $ilink++;
+	$ilink++;
 
-    $trclass = 'oddeven';
-    if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass .= ' liste_sub_total';
+	$trclass = 'oddeven';
+	if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass .= ' liste_sub_total';
 	?>
 <tr class="<?php echo $trclass; ?>" >
     <td class="linkedcol-element"><?php echo $langs->trans("RepeatableInvoice"); ?></td>
diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php
index 31352ee1bc9..c37f36dd4e5 100644
--- a/htdocs/compta/index.php
+++ b/htdocs/compta/index.php
@@ -94,43 +94,43 @@ 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 invoices
-    if (!empty($conf->facture->enabled) && $user->rights->facture->lire)
-    {
-    	$listofsearchfields['search_invoice'] = array('text'=>'CustomerInvoice');
-    }
-    // Search supplier invoices
-    if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) && $user->rights->fournisseur->lire)
-    {
-    	$listofsearchfields['search_supplier_invoice'] = array('text'=>'SupplierInvoice');
-    }
-    if (!empty($conf->don->enabled) && $user->rights->don->lire)
-    {
-    	$langs->load("donations");
-    	$listofsearchfields['search_donation'] = array('text'=>'Donation');
-    }
+	// Search customer invoices
+	if (!empty($conf->facture->enabled) && $user->rights->facture->lire)
+	{
+		$listofsearchfields['search_invoice'] = array('text'=>'CustomerInvoice');
+	}
+	// Search supplier invoices
+	if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) && $user->rights->fournisseur->lire)
+	{
+		$listofsearchfields['search_supplier_invoice'] = array('text'=>'SupplierInvoice');
+	}
+	if (!empty($conf->don->enabled) && $user->rights->don->lire)
+	{
+		$langs->load("donations");
+		$listofsearchfields['search_donation'] = array('text'=>'Donation');
+	}
 
-    if (count($listofsearchfields))
-    {
-    	print '<form method="post" action="'.DOL_URL_ROOT.'/core/search.php">';
-    	print '<input type="hidden" name="token" value="'.newToken().'">';
+	if (count($listofsearchfields))
+	{
+		print '<form method="post" action="'.DOL_URL_ROOT.'/core/search.php">';
+		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<div class="div-table-responsive-no-min">';
-    	print '<table class="noborder nohover centpercent">';
-    	$i = 0;
-    	foreach ($listofsearchfields as $key => $value)
-    	{
-    		if ($i == 0) print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
-    		print '<tr '.$bc[false].'>';
-    		print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label></td><td><input type="text" class="flat inputsearch" name="'.$key.'" id="'.$key.'"></td>';
-    		if ($i == 0) print '<td rowspan="'.count($listofsearchfields).'"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
-    		print '</tr>';
-    		$i++;
-    	}
-    	print '</table>';
-        print '</div>';
-    	print '</form>';
-    	print '<br>';
-    }
+		print '<table class="noborder nohover centpercent">';
+		$i = 0;
+		foreach ($listofsearchfields as $key => $value)
+		{
+			if ($i == 0) print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
+			print '<tr '.$bc[false].'>';
+			print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label></td><td><input type="text" class="flat inputsearch" name="'.$key.'" id="'.$key.'"></td>';
+			if ($i == 0) print '<td rowspan="'.count($listofsearchfields).'"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
+			print '</tr>';
+			$i++;
+		}
+		print '</table>';
+		print '</div>';
+		print '</form>';
+		print '<br>';
+	}
 }
 
 
@@ -139,12 +139,12 @@ if (!empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is useles
  */
 if (!empty($conf->facture->enabled) && $user->rights->facture->lire)
 {
-    $sql = "SELECT f.rowid, f.ref, f.datef as date, f.total as total_ht, f.tva as total_tva, f.total_ttc, f.ref_client";
-    $sql .= ", f.type";
-    $sql .= ", s.nom as name";
-    $sql .= ", s.rowid as socid, s.email";
-    $sql .= ", s.code_client, s.code_compta, s.code_fournisseur, s.code_compta_fournisseur";
-    $sql .= ", cc.rowid as country_id, cc.code as country_code";
+	$sql = "SELECT f.rowid, f.ref, f.datef as date, f.total as total_ht, f.tva as total_tva, f.total_ttc, f.ref_client";
+	$sql .= ", f.type";
+	$sql .= ", s.nom as name";
+	$sql .= ", s.rowid as socid, s.email";
+	$sql .= ", s.code_client, s.code_compta, s.code_fournisseur, s.code_compta_fournisseur";
+	$sql .= ", cc.rowid as country_id, cc.code as country_code";
 	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user ";
 	$sql .= " FROM ".MAIN_DB_PREFIX."facture as f, ".MAIN_DB_PREFIX."societe as s LEFT JOIN ".MAIN_DB_PREFIX."c_country as cc ON cc.rowid = s.fk_pays";
 	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@@ -163,7 +163,7 @@ if (!empty($conf->facture->enabled) && $user->rights->facture->lire)
 
 	$sql .= " GROUP BY f.rowid, f.ref, f.datef, f.total, f.tva, f.total_ttc, f.ref_client, f.type, ";
 	$sql .= "s.email, s.nom, s.rowid, s.code_client, s.code_compta, s.code_fournisseur, s.code_compta_fournisseur";
-    $sql .= ", cc.rowid, cc.code";
+	$sql .= ", cc.rowid, cc.code";
 
 	// Add Group from hooks
 	$parameters = array();
@@ -250,10 +250,10 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU
 {
 	$sql = "SELECT f.ref, f.rowid, f.total_ht, f.total_tva, f.total_ttc, f.type, f.ref_supplier";
 	$sql .= ", s.nom as name";
-    $sql .= ", s.rowid as socid, s.email";
-    $sql .= ", s.code_fournisseur, s.code_compta_fournisseur";
-    $sql .= ", cc.rowid as country_id, cc.code as country_code";
-    $sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f, ".MAIN_DB_PREFIX."societe as s LEFT JOIN ".MAIN_DB_PREFIX."c_country as cc ON cc.rowid = s.fk_pays";
+	$sql .= ", s.rowid as socid, s.email";
+	$sql .= ", s.code_fournisseur, s.code_compta_fournisseur";
+	$sql .= ", cc.rowid as country_id, cc.code as country_code";
+	$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f, ".MAIN_DB_PREFIX."societe as s LEFT JOIN ".MAIN_DB_PREFIX."c_country as cc ON cc.rowid = s.fk_pays";
 	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	$sql .= " WHERE s.rowid = f.fk_soc AND f.fk_statut = ".FactureFournisseur::STATUS_DRAFT;
 	$sql .= " AND f.entity IN (".getEntity('invoice').')';
@@ -348,10 +348,10 @@ if (!empty($conf->facture->enabled) && $user->rights->facture->lire)
 	$sql = "SELECT f.rowid, f.ref, f.fk_statut, f.type, f.total as total_ht, f.tva as total_tva, f.total_ttc, f.paye, f.tms";
 	$sql .= ", f.date_lim_reglement as datelimite";
 	$sql .= ", s.nom as name";
-    $sql .= ", s.rowid as socid";
-    $sql .= ", s.code_client, s.code_compta, s.email";
-    $sql .= ", cc.rowid as country_id, cc.code as country_code";
-    $sql .= ", sum(pf.amount) as am";
+	$sql .= ", s.rowid as socid";
+	$sql .= ", s.code_client, s.code_compta, s.email";
+	$sql .= ", cc.rowid as country_id, cc.code as country_code";
+	$sql .= ", sum(pf.amount) as am";
 	$sql .= " FROM ".MAIN_DB_PREFIX."societe as s LEFT JOIN ".MAIN_DB_PREFIX."c_country as cc ON cc.rowid = s.fk_pays, ".MAIN_DB_PREFIX."facture as f";
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf on f.rowid=pf.fk_facture";
 	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@@ -377,7 +377,7 @@ if (!empty($conf->facture->enabled) && $user->rights->facture->lire)
 		$i = 0;
 		$othernb = 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"><th colspan="2">'.$langs->trans("BoxTitleLastCustomerBills", $max).'</th>';
 		if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print '<th class="right">'.$langs->trans("AmountHT").'</th>';
@@ -442,7 +442,7 @@ if (!empty($conf->facture->enabled) && $user->rights->facture->lire)
 
 				print '</td>';
 				print '<td class="left">';
-                print $thirdpartystatic->getNomUrl(1, 'customer', 44);
+				print $thirdpartystatic->getNomUrl(1, 'customer', 44);
 				print '</td>';
 				if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print '<td class="nowrap right">'.price($obj->total_ht).'</td>';
 				print '<td class="nowrap right">'.price($obj->total_ttc).'</td>';
@@ -486,8 +486,8 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU
 
 	$sql = "SELECT ff.rowid, ff.ref, ff.fk_statut, ff.libelle, ff.total_ht, ff.total_tva, ff.total_ttc, ff.tms, ff.paye";
 	$sql .= ", s.nom as name";
-    $sql .= ", s.rowid as socid";
-    $sql .= ", s.code_fournisseur, s.code_compta_fournisseur, s.email";
+	$sql .= ", s.rowid as socid";
+	$sql .= ", s.code_fournisseur, s.code_compta_fournisseur, s.email";
 	$sql .= ", SUM(pf.amount) as am";
 	$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture_fourn as ff";
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."paiementfourn_facturefourn as pf on ff.rowid=pf.fk_facturefourn";
@@ -511,7 +511,7 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU
 	{
 		$num = $db->num_rows($resql);
 
-        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"><th colspan="2">'.$langs->trans("BoxTitleLastSupplierBills", $max).'</th>';
 		if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print '<th class="right">'.$langs->trans("AmountHT").'</th>';
@@ -598,7 +598,7 @@ if (!empty($conf->don->enabled) && $user->rights->don->lire)
 	include_once DOL_DOCUMENT_ROOT.'/don/class/don.class.php';
 
 	$langs->load("boxes");
-    $donationstatic = new Don($db);
+	$donationstatic = new Don($db);
 
 	$sql = "SELECT d.rowid, d.lastname, d.firstname, d.societe, d.datedon as date, d.tms as dm, d.amount, d.fk_statut";
 	$sql .= " FROM ".MAIN_DB_PREFIX."don as d";
@@ -619,14 +619,14 @@ if (!empty($conf->don->enabled) && $user->rights->don->lire)
 		$i = 0;
 		$othernb = 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>'.$langs->trans("BoxTitleLastModifiedDonations", $max).'</th>';
-        print '<th></th>';
-        print '<th class="right">'.$langs->trans("AmountTTC").'</th>';
-        print '<th class="right">'.$langs->trans("DateModificationShort").'</th>';
-        print '<th width="16">&nbsp;</th>';
+		print '<th></th>';
+		print '<th class="right">'.$langs->trans("AmountTTC").'</th>';
+		print '<th class="right">'.$langs->trans("DateModificationShort").'</th>';
+		print '<th width="16">&nbsp;</th>';
 		print '</tr>';
 		if ($num)
 		{
@@ -657,7 +657,7 @@ if (!empty($conf->don->enabled) && $user->rights->don->lire)
 				print '<td>'.$label.'</td>';
 				print '<td class="nowrap right">'.price($objp->amount).'</td>';
 				print '<td class="right">'.dol_print_date($db->jdate($objp->dm), 'day').'</td>';
-                print '<td>'.$donationstatic->LibStatut($objp->fk_statut, 3).'</td>';
+				print '<td>'.$donationstatic->LibStatut($objp->fk_statut, 3).'</td>';
 				print '</tr>';
 
 				$i++;
@@ -706,7 +706,7 @@ if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
 		{
 			$num = $db->num_rows($resql);
 
-            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>'.$langs->trans("ContributionsToPay").($num ? ' <a href="'.DOL_URL_ROOT.'/compta/sociales/list.php?status=0"><span class="badge">'.$num.'</span></a>' : '').'</th>';
@@ -784,8 +784,8 @@ if (!empty($conf->facture->enabled) && !empty($conf->commande->enabled) && $user
 
 	$sql = "SELECT sum(f.total) as tot_fht, sum(f.total_ttc) as tot_fttc";
 	$sql .= ", s.nom as name, s.email";
-    $sql .= ", s.rowid as socid";
-    $sql .= ", s.code_client, s.code_compta";
+	$sql .= ", s.rowid as socid";
+	$sql .= ", s.code_client, s.code_compta";
 	$sql .= ", c.rowid, c.ref, c.facture, c.fk_statut, c.total_ht, c.tva as total_tva, c.total_ttc,";
 	$sql .= " cc.rowid as country_id, cc.code as country_code";
 	$sql .= " FROM ".MAIN_DB_PREFIX."societe as s LEFT JOIN ".MAIN_DB_PREFIX."c_country as cc ON cc.rowid = s.fk_pays";
@@ -816,7 +816,7 @@ if (!empty($conf->facture->enabled) && !empty($conf->commande->enabled) && $user
 			$i = 0;
 			$othernb = 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\">";
@@ -881,7 +881,7 @@ if (!empty($conf->facture->enabled) && !empty($conf->commande->enabled) && $user
 				print '</td>';
 
 				print '<td class="nowrap tdoverflowmax100">';
-                print $societestatic->getNomUrl(1, 'customer');
+				print $societestatic->getNomUrl(1, 'customer');
 				print '</td>';
 				if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print '<td class="right">'.price($obj->total_ht).'</td>';
 				print '<td class="nowrap right">'.price($obj->total_ttc).'</td>';
@@ -927,10 +927,10 @@ if (!empty($conf->facture->enabled) && $user->rights->facture->lire)
 	$sql = "SELECT f.rowid, f.ref, f.fk_statut, f.datef, f.type, f.total as total_ht, f.tva as total_tva, f.total_ttc, f.paye, f.tms";
 	$sql .= ", f.date_lim_reglement as datelimite";
 	$sql .= ", s.nom as name";
-    $sql .= ", s.rowid as socid, s.email";
-    $sql .= ", s.code_client, s.code_compta";
-    $sql .= ", cc.rowid as country_id, cc.code as country_code";
-    $sql .= ", sum(pf.amount) as am";
+	$sql .= ", s.rowid as socid, s.email";
+	$sql .= ", s.code_client, s.code_compta";
+	$sql .= ", cc.rowid as country_id, cc.code as country_code";
+	$sql .= ", sum(pf.amount) as am";
 	$sql .= " FROM ".MAIN_DB_PREFIX."societe as s LEFT JOIN ".MAIN_DB_PREFIX."c_country as cc ON cc.rowid = s.fk_pays,".MAIN_DB_PREFIX."facture as f";
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf on f.rowid=pf.fk_facture";
 	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@@ -1083,9 +1083,9 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU
 	$sql = "SELECT ff.rowid, ff.ref, ff.fk_statut, ff.type, ff.libelle as label, ff.total_ht, ff.total_tva, ff.total_ttc, ff.paye";
 	$sql .= ", ff.date_lim_reglement";
 	$sql .= ", s.nom as name";
-    $sql .= ", s.rowid as socid, s.email";
-    $sql .= ", s.code_client, s.code_compta";
-    $sql .= ", s.code_fournisseur, s.code_compta_fournisseur";
+	$sql .= ", s.rowid as socid, s.email";
+	$sql .= ", s.code_client, s.code_compta";
+	$sql .= ", s.code_fournisseur, s.code_compta_fournisseur";
 	$sql .= ", sum(pf.amount) as am";
 	$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture_fourn as ff";
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."paiementfourn_facturefourn as pf on ff.rowid=pf.fk_facturefourn";
@@ -1214,7 +1214,7 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU
 $resql = 0;
 if ($resql)
 {
-    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"><thcolspan="2">'.$langs->trans("TasksToDo").'</th>';
 	print "</tr>\n";
diff --git a/htdocs/compta/journal/purchasesjournal.php b/htdocs/compta/journal/purchasesjournal.php
index d754760dd57..45ffae7c1ff 100644
--- a/htdocs/compta/journal/purchasesjournal.php
+++ b/htdocs/compta/journal/purchasesjournal.php
@@ -81,8 +81,8 @@ $date_end = dol_mktime(23, 59, 59, $date_endmonth, $date_endday, $date_endyear);
 
 if (empty($date_start) || empty($date_end)) // We define date_start and date_end
 {
-    $date_start = dol_get_first_day($pastmonthyear, $pastmonth, false);
-    $date_end = dol_get_last_day($pastmonthyear, $pastmonth, false);
+	$date_start = dol_get_first_day($pastmonthyear, $pastmonth, false);
+	$date_end = dol_get_last_day($pastmonthyear, $pastmonth, false);
 }
 
 $name = $langs->trans("PurchasesJournal");
@@ -236,7 +236,7 @@ foreach ($tabfac as $key => $val)
 				if (isset($line['inv']))
 				{
 					print '<td class="right">'.($mt < 0 ?price(-$mt) : '')."</td>";
-	    			print '<td class="right">'.($mt >= 0 ?price($mt) : '')."</td>";
+					print '<td class="right">'.($mt >= 0 ?price($mt) : '')."</td>";
 				} else {
 					print '<td class="right">'.($mt >= 0 ?price($mt) : '')."</td>";
 					print '<td class="right">'.($mt < 0 ?price(-$mt) : '')."</td>";
diff --git a/htdocs/compta/journal/sellsjournal.php b/htdocs/compta/journal/sellsjournal.php
index 62e8c77a133..ea6222dc63f 100644
--- a/htdocs/compta/journal/sellsjournal.php
+++ b/htdocs/compta/journal/sellsjournal.php
@@ -143,10 +143,10 @@ if ($result)
    	$resligne = array();
    	while ($i < $num)
    	{
-   	    $obj = $db->fetch_object($result);
-   	    // les variables
-   	    $cptcli = (($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER != "") ? $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER : $langs->trans("CodeNotDef"));
-   	    $compta_soc = (!empty($obj->code_compta) ? $obj->code_compta : $cptcli);
+   		$obj = $db->fetch_object($result);
+   		// les variables
+   		$cptcli = (($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER != "") ? $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER : $langs->trans("CodeNotDef"));
+   		$compta_soc = (!empty($obj->code_compta) ? $obj->code_compta : $cptcli);
 		$compta_prod = $obj->accountancy_code_sell;
 		if (empty($compta_prod))
 		{
@@ -170,14 +170,14 @@ if ($result)
 			if ($obj->situation_percent == 0) {
 				$situation_ratio = 0;
 			} else {
-		        $prev_progress = $line->get_prev_progress($obj->rowid); // id on invoice
-			    $situation_ratio = ($obj->situation_percent - $prev_progress) / $obj->situation_percent;
+				$prev_progress = $line->get_prev_progress($obj->rowid); // id on invoice
+				$situation_ratio = ($obj->situation_percent - $prev_progress) / $obj->situation_percent;
 			}
 		} else {
 			$situation_ratio = 1;
 		}
 
-    	//la ligne facture
+		//la ligne facture
    		$tabfac[$obj->rowid]["date"] = $obj->datef;
    		$tabfac[$obj->rowid]["ref"] = $obj->ref;
    		$tabfac[$obj->rowid]["type"] = $obj->type;
@@ -195,7 +195,7 @@ if ($result)
    		$i++;
    	}
 } else {
-    dol_print_error($db);
+	dol_print_error($db);
 }
 
 
@@ -268,7 +268,7 @@ foreach ($tabfac as $key => $val)
 					print '<td class="right">'.($mt < 0 ?price(-$mt) : '')."</td>";
 				} else {
 					print '<td class="right">'.($mt < 0 ?price(-$mt) : '')."</td>";
-	    			print '<td class="right">'.($mt >= 0 ?price($mt) : '')."</td>";
+					print '<td class="right">'.($mt >= 0 ?price($mt) : '')."</td>";
 				}
 
 				print "</tr>";
diff --git a/htdocs/compta/localtax/card.php b/htdocs/compta/localtax/card.php
index b787878f31d..078625ca1a1 100644
--- a/htdocs/compta/localtax/card.php
+++ b/htdocs/compta/localtax/card.php
@@ -61,44 +61,44 @@ if ($_POST["cancel"] == $langs->trans("Cancel") && !$id)
 
 if ($action == 'add' && $_POST["cancel"] <> $langs->trans("Cancel"))
 {
-    $db->begin();
+	$db->begin();
 
-    $datev = dol_mktime(12, 0, 0, $_POST["datevmonth"], $_POST["datevday"], $_POST["datevyear"]);
-    $datep = dol_mktime(12, 0, 0, $_POST["datepmonth"], $_POST["datepday"], $_POST["datepyear"]);
+	$datev = dol_mktime(12, 0, 0, $_POST["datevmonth"], $_POST["datevday"], $_POST["datevyear"]);
+	$datep = dol_mktime(12, 0, 0, $_POST["datepmonth"], $_POST["datepday"], $_POST["datepyear"]);
 
-    $object->accountid = GETPOST("accountid");
-    $object->paymenttype = GETPOST("paiementtype");
-    $object->datev = $datev;
-    $object->datep = $datep;
-    $object->amount = price2num(GETPOST("amount"));
+	$object->accountid = GETPOST("accountid");
+	$object->paymenttype = GETPOST("paiementtype");
+	$object->datev = $datev;
+	$object->datep = $datep;
+	$object->amount = price2num(GETPOST("amount"));
 	$object->label = GETPOST("label");
 	$object->ltt = $lttype;
 
-    $ret = $object->addPayment($user);
-    if ($ret > 0)
-    {
-        $db->commit();
-        header("Location: list.php?localTaxType=".$lttype);
-        exit;
-    } else {
-        $db->rollback();
-        setEventMessages($object->error, $object->errors, 'errors');
-        $_GET["action"] = "create";
-    }
+	$ret = $object->addPayment($user);
+	if ($ret > 0)
+	{
+		$db->commit();
+		header("Location: list.php?localTaxType=".$lttype);
+		exit;
+	} else {
+		$db->rollback();
+		setEventMessages($object->error, $object->errors, 'errors');
+		$_GET["action"] = "create";
+	}
 }
 
 //delete payment of localtax
 if ($action == 'delete')
 {
-    $result = $object->fetch($id);
+	$result = $object->fetch($id);
 
 	if ($object->rappro == 0)
 	{
-	    $db->begin();
+		$db->begin();
 
-	    $ret = $object->delete($user);
-	    if ($ret > 0)
-	    {
+		$ret = $object->delete($user);
+		if ($ret > 0)
+		{
 			if ($object->fk_bank)
 			{
 				$accountline = new AccountLine($db);
@@ -116,13 +116,13 @@ if ($action == 'delete')
 				$db->rollback();
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
-	    } else {
-	        $db->rollback();
-	        setEventMessages($object->error, $object->errors, 'errors');
-	    }
+		} else {
+			$db->rollback();
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
 	} else {
-        $mesg = 'Error try do delete a line linked to a conciliated bank transaction';
-        setEventMessages($mesg, null, 'errors');
+		$mesg = 'Error try do delete a line linked to a conciliated bank transaction';
+		setEventMessages($mesg, null, 'errors');
 	}
 }
 
@@ -149,25 +149,25 @@ llxHeader("", $title, $helpurl);
 
 if ($action == 'create')
 {
-    print load_fiche_titre($langs->transcountry($lttype == 2 ? "newLT2Payment" : "newLT1Payment", $mysoc->country_code));
+	print load_fiche_titre($langs->transcountry($lttype == 2 ? "newLT2Payment" : "newLT1Payment", $mysoc->country_code));
 
-    print '<form name="add" action="'.$_SERVER["PHP_SELF"].'" name="formlocaltax" method="post">'."\n";
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    print '<input type="hidden" name="localTaxType" value="'.$lttype.'">';
-    print '<input type="hidden" name="action" value="add">';
+	print '<form name="add" action="'.$_SERVER["PHP_SELF"].'" name="formlocaltax" method="post">'."\n";
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="localTaxType" value="'.$lttype.'">';
+	print '<input type="hidden" name="action" value="add">';
 
-    print dol_get_fiche_head();
+	print dol_get_fiche_head();
 
-    print '<table class="border centpercent">';
+	print '<table class="border centpercent">';
 
-    print "<tr>";
-    print '<td class="titlefieldcreate fieldrequired">'.$langs->trans("DatePayment").'</td><td>';
-    print $form->selectDate($datep, "datep", '', '', '', 'add', 1, 1);
-    print '</td></tr>';
+	print "<tr>";
+	print '<td class="titlefieldcreate fieldrequired">'.$langs->trans("DatePayment").'</td><td>';
+	print $form->selectDate($datep, "datep", '', '', '', 'add', 1, 1);
+	print '</td></tr>';
 
-    print '<tr><td class="fieldrequired">'.$form->textwithpicto($langs->trans("PeriodEndDate"), $langs->trans("LastDayTaxIsRelatedTo")).'</td><td>';
-    print $form->selectDate($datev, "datev", '', '', '', 'add', 1, 1);
-    print '</td></tr>';
+	print '<tr><td class="fieldrequired">'.$form->textwithpicto($langs->trans("PeriodEndDate"), $langs->trans("LastDayTaxIsRelatedTo")).'</td><td>';
+	print $form->selectDate($datev, "datev", '', '', '', 'add', 1, 1);
+	print '</td></tr>';
 
 	// Label
 	print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td><input name="label" class="minwidth200" value="'.($_POST["label"] ?GETPOST("label", '', 2) : $langs->transcountry(($lttype == 2 ? "LT2Payment" : "LT1Payment"), $mysoc->country_code)).'"></td></tr>';
@@ -175,38 +175,38 @@ if ($action == 'create')
 	// Amount
 	print '<tr><td class="fieldrequired">'.$langs->trans("Amount").'</td><td><input name="amount" size="10" value="'.GETPOST("amount").'"></td></tr>';
 
-    if (!empty($conf->banque->enabled))
-    {
+	if (!empty($conf->banque->enabled))
+	{
 		print '<tr><td class="fieldrequired">'.$langs->trans("Account").'</td><td>';
-        $form->select_comptes($_POST["accountid"], "accountid", 0, "courant=1", 2); // Affiche liste des comptes courant
-        print '</td></tr>';
+		$form->select_comptes($_POST["accountid"], "accountid", 0, "courant=1", 2); // Affiche liste des comptes courant
+		print '</td></tr>';
 
-	    print '<tr><td class="fieldrequired">'.$langs->trans("PaymentMode").'</td><td>';
-	    $form->select_types_paiements(GETPOST("paiementtype"), "paiementtype");
-	    print "</td>\n";
-	    print "</tr>";
+		print '<tr><td class="fieldrequired">'.$langs->trans("PaymentMode").'</td><td>';
+		$form->select_types_paiements(GETPOST("paiementtype"), "paiementtype");
+		print "</td>\n";
+		print "</tr>";
 
 		// Number
 		print '<tr><td>'.$langs->trans('Numero');
 		print ' <em>('.$langs->trans("ChequeOrTransferNumber").')</em>';
 		print '<td><input name="num_payment" type="text" value="'.GETPOST("num_payment").'"></td></tr>'."\n";
-    }
-    // Other attributes
-    $parameters = array();
-    $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-    print $hookmanager->resPrint;
+	}
+	// Other attributes
+	$parameters = array();
+	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+	print $hookmanager->resPrint;
 
-    print '</table>';
+	print '</table>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div class="center">';
 	print '<input type="submit" class="button" value="'.$langs->trans("Save").'">';
 	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-    print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+	print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
 	print '</div>';
 
-    print '</form>';
+	print '</form>';
 }
 
 
@@ -251,27 +251,27 @@ if ($id)
 		if ($object->fk_account > 0)
 		{
  		   	$bankline = new AccountLine($db);
-    		$bankline->fetch($object->fk_bank);
+			$bankline->fetch($object->fk_bank);
 
-	    	print '<tr>';
-	    	print '<td>'.$langs->trans('BankTransactionLine').'</td>';
+			print '<tr>';
+			print '<td>'.$langs->trans('BankTransactionLine').'</td>';
 			print '<td>';
 			print $bankline->getNomUrl(1, 0, 'showall');
-	    	print '</td>';
-	    	print '</tr>';
+			print '</td>';
+			print '</tr>';
 		}
 	}
 
-    // Other attributes
-    $parameters = array();
-    $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-    print $hookmanager->resPrint;
+	// Other attributes
+	$parameters = array();
+	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+	print $hookmanager->resPrint;
 
-    print '</table>';
+	print '</table>';
 
-    print '</div>';
+	print '</div>';
 
-    dol_fiche_end();
+	print dol_get_fiche_end();
 
 
 	/*
diff --git a/htdocs/compta/localtax/class/localtax.class.php b/htdocs/compta/localtax/class/localtax.class.php
index 1dfeb0b8930..b14c567a01d 100644
--- a/htdocs/compta/localtax/class/localtax.class.php
+++ b/htdocs/compta/localtax/class/localtax.class.php
@@ -50,45 +50,45 @@ class Localtax extends CommonObject
 	public $amount;
 
 	/**
-     * @var string local tax
-     */
-    public $label;
+	 * @var string local tax
+	 */
+	public $label;
 
-    /**
-     * @var int ID
-     */
+	/**
+	 * @var int ID
+	 */
 	public $fk_bank;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_user_creat;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_user_modif;
 
-    /**
+	/**
 	 *	Constructor
 	 *
 	 *  @param		DoliDB		$db      Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-    }
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
 
 
-    /**
-     *  Create in database
-     *
-     *  @param      User	$user       User that create
-     *  @return     int      			<0 if KO, >0 if OK
-     */
-    public function create($user)
-    {
-    	global $conf, $langs;
+	/**
+	 *  Create in database
+	 *
+	 *  @param      User	$user       User that create
+	 *  @return     int      			<0 if KO, >0 if OK
+	 */
+	public function create($user)
+	{
+		global $conf, $langs;
 
 		$error = 0;
 
@@ -97,7 +97,7 @@ class Localtax extends CommonObject
 		$this->label = trim($this->label);
 		$this->note = trim($this->note);
 
-        // Insert request
+		// Insert request
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."localtax(";
 		$sql .= "localtaxtype,";
 		$sql .= "tms,";
@@ -109,8 +109,8 @@ class Localtax extends CommonObject
 		$sql .= "fk_bank,";
 		$sql .= "fk_user_creat,";
 		$sql .= "fk_user_modif";
-        $sql .= ") VALUES (";
-        $sql .= " ".$this->ltt.",";
+		$sql .= ") VALUES (";
+		$sql .= " ".$this->ltt.",";
 		$sql .= " '".$this->db->idate($this->tms)."',";
 		$sql .= " '".$this->db->idate($this->datep)."',";
 		$sql .= " '".$this->db->idate($this->datev)."',";
@@ -123,41 +123,41 @@ class Localtax extends CommonObject
 		$sql .= ")";
 
 	   	dol_syslog(get_class($this)."::create", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."localtax");
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."localtax");
 
-            // Call trigger
-            $result = $this->call_trigger('LOCALTAX_CREATE', $user);
-            if ($result < 0) $error++;
-            // End call triggers
+			// Call trigger
+			$result = $this->call_trigger('LOCALTAX_CREATE', $user);
+			if ($result < 0) $error++;
+			// End call triggers
 
-            if (!$error)
-            {
-            	$this->db->commit();
-            	return $this->id;
-            } else {
+			if (!$error)
+			{
+				$this->db->commit();
+				return $this->id;
+			} else {
 				$this->db->rollback();
 				return -1;
-            }
-        } else {
-            $this->error = "Error ".$this->db->lasterror();
-            $this->db->rollback();
-            return -1;
-        }
-    }
+			}
+		} else {
+			$this->error = "Error ".$this->db->lasterror();
+			$this->db->rollback();
+			return -1;
+		}
+	}
 
-    /**
-     *	Update database
-     *
-     *	@param		User	$user        	User that modify
-     *	@param		int		$notrigger		0=no, 1=yes (no update trigger)
-     *	@return		int						<0 if KO, >0 if OK
-     */
-    public function update(User $user, $notrigger = 0)
-    {
-    	global $conf, $langs;
+	/**
+	 *	Update database
+	 *
+	 *	@param		User	$user        	User that modify
+	 *	@param		int		$notrigger		0=no, 1=yes (no update trigger)
+	 *	@return		int						<0 if KO, >0 if OK
+	 */
+	public function update(User $user, $notrigger = 0)
+	{
+		global $conf, $langs;
 
 		$error = 0;
 
@@ -182,43 +182,43 @@ class Localtax extends CommonObject
 		$sql .= " fk_user_modif=".(int) $this->fk_user_modif;
 		$sql .= " WHERE rowid=".$this->id;
 
-        dol_syslog(get_class($this)."::update", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if (!$resql)
-        {
-            $this->error = "Error ".$this->db->lasterror();
-            $error++;
-        }
+		dol_syslog(get_class($this)."::update", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if (!$resql)
+		{
+			$this->error = "Error ".$this->db->lasterror();
+			$error++;
+		}
 
 		if (!$error && !$notrigger)
 		{
-            // Call trigger
-            $result = $this->call_trigger('LOCALTAX_MODIFY', $user);
-            if ($result < 0) $error++;
-            // End call triggers
-    	}
+			// Call trigger
+			$result = $this->call_trigger('LOCALTAX_MODIFY', $user);
+			if ($result < 0) $error++;
+			// End call triggers
+		}
 
-    	if (!$error)
-    	{
-    		$this->db->commit();
-    		return 1;
-    	} else {
-    		$this->db->rollback();
-    		return -1;
-    	}
-    }
+		if (!$error)
+		{
+			$this->db->commit();
+			return 1;
+		} else {
+			$this->db->rollback();
+			return -1;
+		}
+	}
 
 
-    /**
-     *	Load object in memory from database
-     *
-     *	@param		int		$id		Object id
-     *	@return		int				<0 if KO, >0 if OK
-     */
-    public function fetch($id)
-    {
-    	global $langs;
-        $sql = "SELECT";
+	/**
+	 *	Load object in memory from database
+	 *
+	 *	@param		int		$id		Object id
+	 *	@return		int				<0 if KO, >0 if OK
+	 */
+	public function fetch($id)
+	{
+		global $langs;
+		$sql = "SELECT";
 		$sql .= " t.rowid,";
 		$sql .= " t.localtaxtype,";
 		$sql .= " t.tms,";
@@ -233,21 +233,21 @@ class Localtax extends CommonObject
 		$sql .= " b.fk_account,";
 		$sql .= " b.fk_type,";
 		$sql .= " b.rappro";
-        $sql .= " FROM ".MAIN_DB_PREFIX."localtax as t";
+		$sql .= " FROM ".MAIN_DB_PREFIX."localtax as t";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank as b ON t.fk_bank = b.rowid";
-        $sql .= " WHERE t.rowid = ".$id;
+		$sql .= " WHERE t.rowid = ".$id;
 
-    	dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            if ($this->db->num_rows($resql))
-            {
-                $obj = $this->db->fetch_object($resql);
+		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			if ($this->db->num_rows($resql))
+			{
+				$obj = $this->db->fetch_object($resql);
 
-                $this->id    = $obj->rowid;
-                $this->ref   = $obj->rowid;
-                $this->ltt   = $obj->localtaxtype;
+				$this->id    = $obj->rowid;
+				$this->ref   = $obj->rowid;
+				$this->ltt   = $obj->localtaxtype;
 				$this->tms   = $this->db->jdate($obj->tms);
 				$this->datep = $this->db->jdate($obj->datep);
 				$this->datev = $this->db->jdate($obj->datev);
@@ -260,15 +260,15 @@ class Localtax extends CommonObject
 				$this->fk_account = $obj->fk_account;
 				$this->fk_type = $obj->fk_type;
 				$this->rappro  = $obj->rappro;
-            }
-            $this->db->free($resql);
+			}
+			$this->db->free($resql);
 
-            return 1;
-        } else {
-      	    $this->error = "Error ".$this->db->lasterror();
-            return -1;
-        }
-    }
+			return 1;
+		} else {
+	  		$this->error = "Error ".$this->db->lasterror();
+			return -1;
+		}
+	}
 
 
 	/**
@@ -308,7 +308,7 @@ class Localtax extends CommonObject
 	 */
 	public function initAsSpecimen()
 	{
-	    global $user;
+		global $user;
 
 		$this->id = 0;
 
@@ -325,221 +325,221 @@ class Localtax extends CommonObject
 	}
 
 
-    /**
-     *	Hum la fonction s'appelle 'Solde' elle doit a mon avis calcluer le solde de localtax, non ?
-     *
-     *	@param	int		$year		Year
-     *	@return	int					???
-     */
-    public function solde($year = 0)
-    {
-        $reglee = $this->localtax_sum_reglee($year);
+	/**
+	 *	Hum la fonction s'appelle 'Solde' elle doit a mon avis calcluer le solde de localtax, non ?
+	 *
+	 *	@param	int		$year		Year
+	 *	@return	int					???
+	 */
+	public function solde($year = 0)
+	{
+		$reglee = $this->localtax_sum_reglee($year);
 
-        $payee = $this->localtax_sum_payee($year);
-        $collectee = $this->localtax_sum_collectee($year);
+		$payee = $this->localtax_sum_payee($year);
+		$collectee = $this->localtax_sum_collectee($year);
 
-        $solde = $reglee - ($collectee - $payee);
+		$solde = $reglee - ($collectee - $payee);
 
-        return $solde;
-    }
+		return $solde;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *	Total de la localtax des factures emises par la societe.
-     *
-     *	@param	int		$year		Year
-     *	@return	int					???
-     */
-    public function localtax_sum_collectee($year = 0)
-    {
-        // phpcs:enable
-        $sql = "SELECT sum(f.localtax) as amount";
-        $sql .= " FROM ".MAIN_DB_PREFIX."facture as f WHERE f.paye = 1";
-        if ($year)
-        {
-            $sql .= " AND f.datef >= '$year-01-01' AND f.datef <= '$year-12-31' ";
-        }
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *	Total de la localtax des factures emises par la societe.
+	 *
+	 *	@param	int		$year		Year
+	 *	@return	int					???
+	 */
+	public function localtax_sum_collectee($year = 0)
+	{
+		// phpcs:enable
+		$sql = "SELECT sum(f.localtax) as amount";
+		$sql .= " FROM ".MAIN_DB_PREFIX."facture as f WHERE f.paye = 1";
+		if ($year)
+		{
+			$sql .= " AND f.datef >= '$year-01-01' AND f.datef <= '$year-12-31' ";
+		}
 
-        $result = $this->db->query($sql);
-        if ($result)
-        {
-            if ($this->db->num_rows($result))
-            {
-                $obj = $this->db->fetch_object($result);
-            	$ret = $obj->amount;
-                $this->db->free($result);
-                return $ret;
-            } else {
-            	$this->db->free($result);
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+			if ($this->db->num_rows($result))
+			{
+				$obj = $this->db->fetch_object($result);
+				$ret = $obj->amount;
+				$this->db->free($result);
+				return $ret;
+			} else {
+				$this->db->free($result);
 				return 0;
-            }
-        } else {
-            print $this->db->lasterror();
-            return -1;
-        }
-    }
+			}
+		} else {
+			print $this->db->lasterror();
+			return -1;
+		}
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *	localtax payed
-     *
-     *	@param	int		$year		Year
-     *	@return	int					???
-     */
-    public function localtax_sum_payee($year = 0)
-    {
-        // phpcs:enable
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *	localtax payed
+	 *
+	 *	@param	int		$year		Year
+	 *	@return	int					???
+	 */
+	public function localtax_sum_payee($year = 0)
+	{
+		// phpcs:enable
 
-        $sql = "SELECT sum(f.total_localtax) as total_localtax";
-        $sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f";
-        if ($year)
-        {
-            $sql .= " WHERE f.datef >= '$year-01-01' AND f.datef <= '$year-12-31' ";
-        }
+		$sql = "SELECT sum(f.total_localtax) as total_localtax";
+		$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f";
+		if ($year)
+		{
+			$sql .= " WHERE f.datef >= '$year-01-01' AND f.datef <= '$year-12-31' ";
+		}
 
-        $result = $this->db->query($sql);
-        if ($result)
-        {
-            if ($this->db->num_rows($result))
-            {
-                $obj = $this->db->fetch_object($result);
-            	$ret = $obj->total_localtax;
-                $this->db->free($result);
-                return $ret;
-            } else {
-            	$this->db->free($result);
-            	return 0;
-            }
-        } else {
-            print $this->db->lasterror();
-            return -1;
-        }
-    }
-
-
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *	localtax payed
-     *  Total de la localtax payed
-     *
-     *	@param	int		$year		Year
-     *	@return	int					???
-     */
-    public function localtax_sum_reglee($year = 0)
-    {
-        // phpcs:enable
-
-        $sql = "SELECT sum(f.amount) as amount";
-        $sql .= " FROM ".MAIN_DB_PREFIX."localtax as f";
-        if ($year)
-        {
-            $sql .= " WHERE f.datev >= '$year-01-01' AND f.datev <= '$year-12-31' ";
-        }
-
-        $result = $this->db->query($sql);
-        if ($result)
-        {
-            if ($this->db->num_rows($result))
-            {
-                $obj = $this->db->fetch_object($result);
-                $ret = $obj->amount;
-            	$this->db->free($result);
-                return $ret;
-            } else {
-            	$this->db->free($result);
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+			if ($this->db->num_rows($result))
+			{
+				$obj = $this->db->fetch_object($result);
+				$ret = $obj->total_localtax;
+				$this->db->free($result);
+				return $ret;
+			} else {
+				$this->db->free($result);
 				return 0;
-            }
-        } else {
-            print $this->db->lasterror();
-            return -1;
-        }
-    }
+			}
+		} else {
+			print $this->db->lasterror();
+			return -1;
+		}
+	}
 
 
-    /**
-     *	Add a payment of localtax
-     *
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *	localtax payed
+	 *  Total de la localtax payed
+	 *
+	 *	@param	int		$year		Year
+	 *	@return	int					???
+	 */
+	public function localtax_sum_reglee($year = 0)
+	{
+		// phpcs:enable
+
+		$sql = "SELECT sum(f.amount) as amount";
+		$sql .= " FROM ".MAIN_DB_PREFIX."localtax as f";
+		if ($year)
+		{
+			$sql .= " WHERE f.datev >= '$year-01-01' AND f.datev <= '$year-12-31' ";
+		}
+
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+			if ($this->db->num_rows($result))
+			{
+				$obj = $this->db->fetch_object($result);
+				$ret = $obj->amount;
+				$this->db->free($result);
+				return $ret;
+			} else {
+				$this->db->free($result);
+				return 0;
+			}
+		} else {
+			print $this->db->lasterror();
+			return -1;
+		}
+	}
+
+
+	/**
+	 *	Add a payment of localtax
+	 *
 	 *	@param		User	$user		Object user that insert
 	 *	@return		int					<0 if KO, rowid in localtax table if OK
-     */
-    public function addPayment($user)
-    {
-        global $conf, $langs;
+	 */
+	public function addPayment($user)
+	{
+		global $conf, $langs;
 
-        $this->db->begin();
+		$this->db->begin();
 
-        // Check parameters
-        $this->amount = price2num($this->amount);
+		// Check parameters
+		$this->amount = price2num($this->amount);
 		if (!$this->label)
 		{
 			$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Label"));
 			return -3;
 		}
-        if ($this->amount <= 0)
-        {
-            $this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Amount"));
-            return -4;
-        }
-        if (!empty($conf->banque->enabled) && (empty($this->accountid) || $this->accountid <= 0))
-        {
-            $this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Account"));
-            return -5;
-        }
-        if (!empty($conf->banque->enabled) && (empty($this->paymenttype) || $this->paymenttype <= 0))
-        {
-            $this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("PaymentMode"));
-            return -5;
-        }
+		if ($this->amount <= 0)
+		{
+			$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Amount"));
+			return -4;
+		}
+		if (!empty($conf->banque->enabled) && (empty($this->accountid) || $this->accountid <= 0))
+		{
+			$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Account"));
+			return -5;
+		}
+		if (!empty($conf->banque->enabled) && (empty($this->paymenttype) || $this->paymenttype <= 0))
+		{
+			$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("PaymentMode"));
+			return -5;
+		}
 
-        // Insertion dans table des paiement localtax
-        $sql = "INSERT INTO ".MAIN_DB_PREFIX."localtax (localtaxtype, datep, datev, amount";
-        if ($this->note)  $sql .= ", note";
-        if ($this->label) $sql .= ", label";
-        $sql .= ", fk_user_creat, fk_bank";
+		// Insertion dans table des paiement localtax
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."localtax (localtaxtype, datep, datev, amount";
+		if ($this->note)  $sql .= ", note";
+		if ($this->label) $sql .= ", label";
+		$sql .= ", fk_user_creat, fk_bank";
 		$sql .= ") ";
-        $sql .= " VALUES (".$this->ltt.", '".$this->db->idate($this->datep)."',";
-        $sql .= "'".$this->db->idate($this->datev)."',".$this->amount;
-        if ($this->note)  $sql .= ", '".$this->db->escape($this->note)."'";
-        if ($this->label) $sql .= ", '".$this->db->escape($this->label)."'";
-        $sql .= ", ".((int) $user->id).", NULL";
-        $sql .= ")";
+		$sql .= " VALUES (".$this->ltt.", '".$this->db->idate($this->datep)."',";
+		$sql .= "'".$this->db->idate($this->datev)."',".$this->amount;
+		if ($this->note)  $sql .= ", '".$this->db->escape($this->note)."'";
+		if ($this->label) $sql .= ", '".$this->db->escape($this->label)."'";
+		$sql .= ", ".((int) $user->id).", NULL";
+		$sql .= ")";
 
 		dol_syslog(get_class($this)."::addPayment", LOG_DEBUG);
-        $result = $this->db->query($sql);
-        if ($result)
-        {
-            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."localtax"); // TODO devrait s'appeler paiementlocaltax
-            if ($this->id > 0)
-            {
-                $ok = 1;
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."localtax"); // TODO devrait s'appeler paiementlocaltax
+			if ($this->id > 0)
+			{
+				$ok = 1;
 				if (!empty($conf->banque->enabled))
-                {
-                    // Insertion dans llx_bank
-                    require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+				{
+					// Insertion dans llx_bank
+					require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 
-                    $acc = new Account($this->db);
+					$acc = new Account($this->db);
 					$result = $acc->fetch($this->accountid);
 					if ($result <= 0) dol_print_error($this->db);
 
-                    $bank_line_id = $acc->addline($this->datep, $this->paymenttype, $this->label, -abs($this->amount), '', '', $user);
+					$bank_line_id = $acc->addline($this->datep, $this->paymenttype, $this->label, -abs($this->amount), '', '', $user);
 
-                    // Mise a jour fk_bank dans llx_localtax. On connait ainsi la ligne de localtax qui a g�n�r� l'�criture bancaire
-                    if ($bank_line_id > 0)
+					// Mise a jour fk_bank dans llx_localtax. On connait ainsi la ligne de localtax qui a g�n�r� l'�criture bancaire
+					if ($bank_line_id > 0)
 					{
-                        $this->update_fk_bank($bank_line_id);
-                    } else {
+						$this->update_fk_bank($bank_line_id);
+					} else {
 						$this->error = $acc->error;
 						$ok = 0;
 					}
 
-                    // Mise a jour liens
-                    $result = $acc->add_url_line($bank_line_id, $this->id, DOL_URL_ROOT.'/compta/localtax/card.php?id=', "(VATPayment)", "payment_vat");
-                    if ($result < 0)
-                    {
-                    	$this->error = $acc->error;
-                    	$ok = 0;
-                    }
-	            }
+					// Mise a jour liens
+					$result = $acc->add_url_line($bank_line_id, $this->id, DOL_URL_ROOT.'/compta/localtax/card.php?id=', "(VATPayment)", "payment_vat");
+					if ($result < 0)
+					{
+						$this->error = $acc->error;
+						$ok = 0;
+					}
+				}
 
 				if ($ok)
 				{
@@ -549,28 +549,28 @@ class Localtax extends CommonObject
 					$this->db->rollback();
 					return -3;
 				}
-            } else {
-                $this->error = $this->db->lasterror();
-                $this->db->rollback();
-                return -2;
-            }
-        } else {
-            $this->error = $this->db->lasterror();
-            $this->db->rollback();
-            return -1;
-        }
-    }
+			} else {
+				$this->error = $this->db->lasterror();
+				$this->db->rollback();
+				return -2;
+			}
+		} else {
+			$this->error = $this->db->lasterror();
+			$this->db->rollback();
+			return -1;
+		}
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *	Update the link betwen localtax payment and the line into llx_bank
-     *
-     *	@param		int		$id		Id bank account
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *	Update the link betwen localtax payment and the line into llx_bank
+	 *
+	 *	@param		int		$id		Id bank account
 	 *	@return		int				<0 if KO, >0 if OK
-     */
+	 */
 	public function update_fk_bank($id)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.'localtax SET fk_bank = '.$id;
 		$sql .= ' WHERE rowid = '.$this->id;
 		$result = $this->db->query($sql);
@@ -597,12 +597,12 @@ class Localtax extends CommonObject
 		$result = '';
 		$label = $langs->trans("ShowVatPayment").': '.$this->ref;
 
-        $link = '<a href="'.DOL_URL_ROOT.'/compta/localtax/card.php?id='.$this->id.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
+		$link = '<a href="'.DOL_URL_ROOT.'/compta/localtax/card.php?id='.$this->id.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
 		$linkend = '</a>';
 
 		$picto = 'payment';
 
-        if ($withpicto) $result .= ($link.img_object($label, $picto, 'class="classfortooltip"').$linkend);
+		if ($withpicto) $result .= ($link.img_object($label, $picto, 'class="classfortooltip"').$linkend);
 		if ($withpicto && $withpicto != 2) $result .= ' ';
 		if ($withpicto != 2) $result .= $link.$this->ref.$linkend;
 		return $result;
@@ -619,7 +619,7 @@ class Localtax extends CommonObject
 		return $this->LibStatut($this->statut, $mode);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Renvoi le libelle d'un statut donne
 	 *
@@ -627,11 +627,11 @@ class Localtax extends CommonObject
 	 * @param   int		$mode       0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
 	 * @return	string              Libelle du statut
 	 */
-    public function LibStatut($status, $mode = 0)
-    {
-        // phpcs:enable
-        global $langs; // TODO Renvoyer le libelle anglais et faire traduction a affichage
+	public function LibStatut($status, $mode = 0)
+	{
+		// phpcs:enable
+		global $langs; // TODO Renvoyer le libelle anglais et faire traduction a affichage
 
-        return '';
-    }
+		return '';
+	}
 }
diff --git a/htdocs/compta/localtax/clients.php b/htdocs/compta/localtax/clients.php
index 1b1ad5351d3..fe605c2224d 100644
--- a/htdocs/compta/localtax/clients.php
+++ b/htdocs/compta/localtax/clients.php
@@ -50,8 +50,8 @@ $date_end = dol_mktime(23, 59, 59, GETPOST("date_endmonth"), GETPOST("date_endda
 // Quarter
 if (empty($date_start) || empty($date_end)) // We define date_start and date_end
 {
-    $q = GETPOST("q");
-    if (empty($q))
+	$q = GETPOST("q");
+	if (empty($q))
 	{
 		if (GETPOST("month")) { $date_start = dol_get_first_day($year_start, GETPOST("month"), false); $date_end = dol_get_last_day($year_start, GETPOST("month"), false); } else {
 			$date_start = dol_get_first_day($year_start, empty($conf->global->SOCIETE_FISCAL_MONTH_START) ? 1 : $conf->global->SOCIETE_FISCAL_MONTH_START, false);
@@ -119,12 +119,12 @@ $calc = $conf->global->MAIN_INFO_LOCALTAX_CALC.$local;
 // Affiche en-tete du rapport
 if ($calc == 0 || $calc == 1)	// Calculate on invoice for goods and services
 {
-    $calcmode = $calc == 0 ? $langs->trans("CalcModeLT".$local) : $langs->trans("CalcModeLT".$local."Rec");
-    $calcmode .= ' <span class="opacitymedium">('.$langs->trans("TaxModuleSetupToModifyRulesLT", DOL_URL_ROOT.'/admin/company.php').')</span>';
-    $period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
-    if (!empty($conf->global->MAIN_MODULE_COMPTABILITE)) $description .= '<br>'.$langs->trans("WarningDepositsNotIncluded");
-    $description .= $fsearch;
-    $description .= ' <span class="opacitymedium">('.$langs->trans("TaxModuleSetupToModifyRulesLT", DOL_URL_ROOT.'/admin/company.php').')</span>';
+	$calcmode = $calc == 0 ? $langs->trans("CalcModeLT".$local) : $langs->trans("CalcModeLT".$local."Rec");
+	$calcmode .= ' <span class="opacitymedium">('.$langs->trans("TaxModuleSetupToModifyRulesLT", DOL_URL_ROOT.'/admin/company.php').')</span>';
+	$period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
+	if (!empty($conf->global->MAIN_MODULE_COMPTABILITE)) $description .= '<br>'.$langs->trans("WarningDepositsNotIncluded");
+	$description .= $fsearch;
+	$description .= ' <span class="opacitymedium">('.$langs->trans("TaxModuleSetupToModifyRulesLT", DOL_URL_ROOT.'/admin/company.php').')</span>';
 	$builddate = dol_now();
 
 	$elementcust = $langs->trans("CustomersInvoices");
@@ -136,13 +136,13 @@ if ($calc == 0 || $calc == 1)	// Calculate on invoice for goods and services
 }
 if ($calc == 2) 	// Invoice for goods, payment for services
 {
-    $calcmode = $langs->trans("CalcModeLT2Debt");
-    $calcmode .= ' <span class="opacitymedium">('.$langs->trans("TaxModuleSetupToModifyRulesLT", DOL_URL_ROOT.'/admin/company.php').')</span>';
-    $period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
-    if (!empty($conf->global->MAIN_MODULE_COMPTABILITE)) $description .= '<br>'.$langs->trans("WarningDepositsNotIncluded");
-    $description .= $fsearch;
-    $description .= '<span class="opacitymedium">('.$langs->trans("TaxModuleSetupToModifyRulesLT", DOL_URL_ROOT.'/admin/company.php').')</span>';
-    $builddate = dol_now();
+	$calcmode = $langs->trans("CalcModeLT2Debt");
+	$calcmode .= ' <span class="opacitymedium">('.$langs->trans("TaxModuleSetupToModifyRulesLT", DOL_URL_ROOT.'/admin/company.php').')</span>';
+	$period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
+	if (!empty($conf->global->MAIN_MODULE_COMPTABILITE)) $description .= '<br>'.$langs->trans("WarningDepositsNotIncluded");
+	$description .= $fsearch;
+	$description .= '<span class="opacitymedium">('.$langs->trans("TaxModuleSetupToModifyRulesLT", DOL_URL_ROOT.'/admin/company.php').')</span>';
+	$builddate = dol_now();
 
 	$elementcust = $langs->trans("CustomersInvoices");
 	$productcust = $langs->trans("Description");
@@ -213,16 +213,16 @@ if ($calc == 0 || $calc == 2)
 				print '<td class="nowrap">'.$intra.'</td>';
 				print '<td class="nowrap right">'.price($coll->amount).'</td>';
 				print '<td class="nowrap right">'.price($local == 1 ? $coll->localtax1 : $coll->localtax2).'</td>';
-	            $totalamount = $totalamount + $coll->amount;
+				$totalamount = $totalamount + $coll->amount;
 				$total = $total + ($local == 1 ? $coll->localtax1 : $coll->localtax2);
 				print "</tr>\n";
 				$i++;
 			}
 		}
-	    $x_coll_sum = $total;
+		$x_coll_sum = $total;
 
 		print '<tr class="liste_total"><td class="right" colspan="3">'.$langs->trans("Total").':</td>';
-	    print '<td class="nowrap right">'.price($totalamount).'</td>';
+		print '<td class="nowrap right">'.price($totalamount).'</td>';
 		print '<td class="nowrap right">'.price($total).'</td>';
 		print '</tr>';
 	} else {
@@ -280,16 +280,16 @@ if ($calc == 0 || $calc == 1) {
 				print '<td class="nowrap">'.$intra."</td>";
 				print '<td class="nowrap right">'.price($coll->amount).'</td>';
 				print '<td class="nowrap right">'.price($local == 1 ? $coll->localtax1 : $coll->localtax2).'</td>';
-	            $totalamount = $totalamount + $coll->amount;
+				$totalamount = $totalamount + $coll->amount;
 				$total = $total + ($local == 1 ? $coll->localtax1 : $coll->localtax2);
 				print "</tr>\n";
 				$i++;
 			}
 		}
-	    $x_paye_sum = $total;
+		$x_paye_sum = $total;
 
 		print '<tr class="liste_total"><td class="right" colspan="3">'.$langs->trans("Total").':</td>';
-	    print '<td class="nowrap right">'.price($totalamount).'</td>';
+		print '<td class="nowrap right">'.price($totalamount).'</td>';
 		print '<td class="nowrap right">'.price($total).'</td>';
 		print '</tr>';
 	} else {
diff --git a/htdocs/compta/localtax/index.php b/htdocs/compta/localtax/index.php
index e8bcc89821b..7d48d6e1f2d 100644
--- a/htdocs/compta/localtax/index.php
+++ b/htdocs/compta/localtax/index.php
@@ -86,99 +86,99 @@ $result = restrictedArea($user, 'tax', '', '', 'charges');
  */
 function pt($db, $sql, $date)
 {
-    global $conf, $bc, $langs;
+	global $conf, $bc, $langs;
 
-    $result = $db->query($sql);
-    if ($result) {
-        $num = $db->num_rows($result);
-        $i = 0;
-        $total = 0;
-        print '<table class="noborder centpercent">';
+	$result = $db->query($sql);
+	if ($result) {
+		$num = $db->num_rows($result);
+		$i = 0;
+		$total = 0;
+		print '<table class="noborder centpercent">';
 
-        print '<tr class="liste_titre">';
-        print '<td class="nowrap">'.$date.'</td>';
-        print '<td class="right">'.$langs->trans("ClaimedForThisPeriod").'</td>';
-        print '<td class="right">'.$langs->trans("PaidDuringThisPeriod").'</td>';
-        print "</tr>\n";
+		print '<tr class="liste_titre">';
+		print '<td class="nowrap">'.$date.'</td>';
+		print '<td class="right">'.$langs->trans("ClaimedForThisPeriod").'</td>';
+		print '<td class="right">'.$langs->trans("PaidDuringThisPeriod").'</td>';
+		print "</tr>\n";
 
-        $totalclaimed = 0;
-        $totalpaid = 0;
-        $amountclaimed = 0;
-        $amountpaid = 0;
-        $previousmonth = '';
-        $previousmode = '';
-        $mode = '';
+		$totalclaimed = 0;
+		$totalpaid = 0;
+		$amountclaimed = 0;
+		$amountpaid = 0;
+		$previousmonth = '';
+		$previousmode = '';
+		$mode = '';
 
-        while ($i < $num) {
-            $obj = $db->fetch_object($result);
-            $mode = $obj->mode;
+		while ($i < $num) {
+			$obj = $db->fetch_object($result);
+			$mode = $obj->mode;
 
-            //print $obj->dm.' '.$obj->mode.' '.$previousmonth.' '.$previousmode;
-            if ($obj->mode == 'claimed' && !empty($previousmode))
-            {
-            	print '<tr class="oddeven">';
-            	print '<td class="nowrap">'.$previousmonth."</td>\n";
-            	print '<td class="nowrap right">'.price($amountclaimed)."</td>\n";
-            	print '<td class="nowrap right">'.price($amountpaid)."</td>\n";
-            	print "</tr>\n";
+			//print $obj->dm.' '.$obj->mode.' '.$previousmonth.' '.$previousmode;
+			if ($obj->mode == 'claimed' && !empty($previousmode))
+			{
+				print '<tr class="oddeven">';
+				print '<td class="nowrap">'.$previousmonth."</td>\n";
+				print '<td class="nowrap right">'.price($amountclaimed)."</td>\n";
+				print '<td class="nowrap right">'.price($amountpaid)."</td>\n";
+				print "</tr>\n";
 
-            	$amountclaimed = 0;
-            	$amountpaid = 0;
-            }
+				$amountclaimed = 0;
+				$amountpaid = 0;
+			}
 
-            if ($obj->mode == 'claimed')
-            {
-            	$amountclaimed = $obj->mm;
-            	$totalclaimed = $totalclaimed + $amountclaimed;
-            }
-            if ($obj->mode == 'paid')
-            {
-            	$amountpaid = $obj->mm;
-            	$totalpaid = $totalpaid + $amountpaid;
-            }
+			if ($obj->mode == 'claimed')
+			{
+				$amountclaimed = $obj->mm;
+				$totalclaimed = $totalclaimed + $amountclaimed;
+			}
+			if ($obj->mode == 'paid')
+			{
+				$amountpaid = $obj->mm;
+				$totalpaid = $totalpaid + $amountpaid;
+			}
 
-            if ($obj->mode == 'paid')
-            {
-            	print '<tr class="oddeven">';
-            	print '<td class="nowrap">'.$obj->dm."</td>\n";
-            	print '<td class="nowrap right">'.price($amountclaimed)."</td>\n";
-            	print '<td class="nowrap right">'.price($amountpaid)."</td>\n";
-            	print "</tr>\n";
-            	$amountclaimed = 0;
-            	$amountpaid = 0;
-            	$previousmode = '';
-            	$previousmonth = '';
-            } else {
-            	$previousmode = $obj->mode;
-            	$previousmonth = $obj->dm;
-            }
+			if ($obj->mode == 'paid')
+			{
+				print '<tr class="oddeven">';
+				print '<td class="nowrap">'.$obj->dm."</td>\n";
+				print '<td class="nowrap right">'.price($amountclaimed)."</td>\n";
+				print '<td class="nowrap right">'.price($amountpaid)."</td>\n";
+				print "</tr>\n";
+				$amountclaimed = 0;
+				$amountpaid = 0;
+				$previousmode = '';
+				$previousmonth = '';
+			} else {
+				$previousmode = $obj->mode;
+				$previousmonth = $obj->dm;
+			}
 
-            $i++;
-        }
+			$i++;
+		}
 
-        if ($mode == 'claimed' && !empty($previousmode))
-        {
-        	print '<tr class="oddeven">';
-        	print '<td class="nowrap">'.$previousmonth."</td>\n";
-        	print '<td class="nowrap right">'.price($amountclaimed)."</td>\n";
-        	print '<td class="nowrap right">'.price($amountpaid)."</td>\n";
-        	print "</tr>\n";
+		if ($mode == 'claimed' && !empty($previousmode))
+		{
+			print '<tr class="oddeven">';
+			print '<td class="nowrap">'.$previousmonth."</td>\n";
+			print '<td class="nowrap right">'.price($amountclaimed)."</td>\n";
+			print '<td class="nowrap right">'.price($amountpaid)."</td>\n";
+			print "</tr>\n";
 
-        	$amountclaimed = 0;
-        	$amountpaid = 0;
-        }
+			$amountclaimed = 0;
+			$amountpaid = 0;
+		}
 
-        print '<tr class="liste_total">';
-        print '<td class="right">'.$langs->trans("Total").'</td>';
-        print '<td class="nowrap right">'.price($totalclaimed).'</td>';
-        print '<td class="nowrap right">'.price($totalpaid).'</td>';
-        print "</tr>";
+		print '<tr class="liste_total">';
+		print '<td class="right">'.$langs->trans("Total").'</td>';
+		print '<td class="nowrap right">'.price($totalclaimed).'</td>';
+		print '<td class="nowrap right">'.price($totalpaid).'</td>';
+		print "</tr>";
 
-        print "</table>";
-        $db->free($result);
-    } else {
-        dol_print_error($db);
-    }
+		print "</table>";
+		$db->free($result);
+	} else {
+		dol_print_error($db);
+	}
 }
 
 if (empty($localTaxType))
@@ -259,14 +259,14 @@ print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
 print '<td width="30%">'.$langs->trans("Year")." ".$y."</td>";
 if ($CalcLT == 0) {
-    print '<td class="right">'.$langs->transcountry($LTCustomer, $mysoc->country_code).'</td>';
-    print '<td class="right">'.$langs->transcountry($LTSupplier, $mysoc->country_code).'</td>';
+	print '<td class="right">'.$langs->transcountry($LTCustomer, $mysoc->country_code).'</td>';
+	print '<td class="right">'.$langs->transcountry($LTSupplier, $mysoc->country_code).'</td>';
 }
 if ($CalcLT == 1) {
-    print '<td class="right">'.$langs->transcountry($LTSupplier, $mysoc->country_code).'</td><td></td>';
+	print '<td class="right">'.$langs->transcountry($LTSupplier, $mysoc->country_code).'</td><td></td>';
 }
 if ($CalcLT == 2) {
-    print '<td class="right">'.$langs->transcountry($LTCustomer, $mysoc->country_code).'</td><td></td>';
+	print '<td class="right">'.$langs->transcountry($LTCustomer, $mysoc->country_code).'</td><td></td>';
 }
 print '<td class="right">'.$langs->trans("TotalToPay").'</td>';
 print "<td>&nbsp;</td>\n";
@@ -414,144 +414,144 @@ while ((($y < $yend) || ($y == $yend && $m <= $mend)) && $mcursor < 1000)	// $mc
 	}
 	//now we have an array (x_both) indexed by rates for coll and paye
 
-    $action = "tva";
-    $object = array(&$x_coll, &$x_paye, &$x_both);
-    $parameters["mode"] = $modetax;
-    $parameters["year"] = $y;
-    $parameters["month"] = $m;
-    $parameters["type"] = 'localtax'.$localTaxType;
+	$action = "tva";
+	$object = array(&$x_coll, &$x_paye, &$x_both);
+	$parameters["mode"] = $modetax;
+	$parameters["year"] = $y;
+	$parameters["month"] = $m;
+	$parameters["type"] = 'localtax'.$localTaxType;
 
-    // Initialize technical object to manage hooks of expenses. Note that conf->hooks_modules contains array array
-    $hookmanager->initHooks(array('externalbalance'));
-    $reshook = $hookmanager->executeHooks('addVatLine', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+	// Initialize technical object to manage hooks of expenses. Note that conf->hooks_modules contains array array
+	$hookmanager->initHooks(array('externalbalance'));
+	$reshook = $hookmanager->executeHooks('addVatLine', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 
-    if (!is_array($x_coll) && $coll_listbuy == -1)
-    {
-        $langs->load("errors");
-        print '<tr><td colspan="5">'.$langs->trans("ErrorNoAccountancyModuleLoaded").'</td></tr>';
-        break;
-    }
-    if (!is_array($x_paye) && $coll_listbuy == -2)
-    {
-        print '<tr><td colspan="5">'.$langs->trans("FeatureNotYetAvailable").'</td></tr>';
-        break;
-    }
+	if (!is_array($x_coll) && $coll_listbuy == -1)
+	{
+		$langs->load("errors");
+		print '<tr><td colspan="5">'.$langs->trans("ErrorNoAccountancyModuleLoaded").'</td></tr>';
+		break;
+	}
+	if (!is_array($x_paye) && $coll_listbuy == -2)
+	{
+		print '<tr><td colspan="5">'.$langs->trans("FeatureNotYetAvailable").'</td></tr>';
+		break;
+	}
 
 
-    print '<tr class="oddeven">';
-    print '<td class="nowrap"><a href="'.DOL_URL_ROOT.'/compta/localtax/quadri_detail.php?leftmenu=tax_vat&month='.$m.'&year='.$y.'">'.dol_print_date(dol_mktime(0, 0, 0, $m, 1, $y), "%b %Y").'</a></td>';
+	print '<tr class="oddeven">';
+	print '<td class="nowrap"><a href="'.DOL_URL_ROOT.'/compta/localtax/quadri_detail.php?leftmenu=tax_vat&month='.$m.'&year='.$y.'">'.dol_print_date(dol_mktime(0, 0, 0, $m, 1, $y), "%b %Y").'</a></td>';
 
-    $x_coll_sum = 0;
-    foreach (array_keys($x_coll) as $rate)
-    {
-    	$subtot_coll_total_ht = 0;
-    	$subtot_coll_vat = 0;
+	$x_coll_sum = 0;
+	foreach (array_keys($x_coll) as $rate)
+	{
+		$subtot_coll_total_ht = 0;
+		$subtot_coll_vat = 0;
 
-    	foreach ($x_both[$rate]['coll']['detail'] as $index => $fields)
-    	{
-    		// Payment
-    		$ratiopaymentinvoice = 1;
-    		if ($modetax != 1)
-    		{
-    			// Define type
-    			// We MUST use dtype (type in line). We can use something else, only if dtype is really unknown.
-    			$type = (isset($fields['dtype']) ? $fields['dtype'] : $fields['ptype']);
-    			// Try to enhance type detection using date_start and date_end for free lines where type
-    			// was not saved.
-    			if (!empty($fields['ddate_start'])) {
-    				$type = 1;
-    			}
-    			if (!empty($fields['ddate_end'])) {
-    				$type = 1;
-    			}
+		foreach ($x_both[$rate]['coll']['detail'] as $index => $fields)
+		{
+			// Payment
+			$ratiopaymentinvoice = 1;
+			if ($modetax != 1)
+			{
+				// Define type
+				// We MUST use dtype (type in line). We can use something else, only if dtype is really unknown.
+				$type = (isset($fields['dtype']) ? $fields['dtype'] : $fields['ptype']);
+				// Try to enhance type detection using date_start and date_end for free lines where type
+				// was not saved.
+				if (!empty($fields['ddate_start'])) {
+					$type = 1;
+				}
+				if (!empty($fields['ddate_end'])) {
+					$type = 1;
+				}
 
-    			if (($type == 0 && $conf->global->TAX_MODE_SELL_PRODUCT == 'invoice')
-    				|| ($type == 1 && $conf->global->TAX_MODE_SELL_SERVICE == 'invoice'))
-    			{
-    				//print $langs->trans("NA");
-    			} else {
-    				if (isset($fields['payment_amount']) && price2num($fields['ftotal_ttc'])) {
-    					$ratiopaymentinvoice = ($fields['payment_amount'] / $fields['ftotal_ttc']);
-    				}
-    			}
-    		}
-    		//var_dump('type='.$type.' '.$fields['totalht'].' '.$ratiopaymentinvoice);
-    		$temp_ht = $fields['totalht'] * $ratiopaymentinvoice;
-    		$temp_vat = $fields['localtax'.$localTaxType] * $ratiopaymentinvoice;
-    		$subtot_coll_total_ht += $temp_ht;
-    		$subtot_coll_vat      += $temp_vat;
-    		$x_coll_sum           += $temp_vat;
-    	}
-    }
-    print '<td class="nowrap right">'.price(price2num($x_coll_sum, 'MT')).'</td>';
+				if (($type == 0 && $conf->global->TAX_MODE_SELL_PRODUCT == 'invoice')
+					|| ($type == 1 && $conf->global->TAX_MODE_SELL_SERVICE == 'invoice'))
+				{
+					//print $langs->trans("NA");
+				} else {
+					if (isset($fields['payment_amount']) && price2num($fields['ftotal_ttc'])) {
+						$ratiopaymentinvoice = ($fields['payment_amount'] / $fields['ftotal_ttc']);
+					}
+				}
+			}
+			//var_dump('type='.$type.' '.$fields['totalht'].' '.$ratiopaymentinvoice);
+			$temp_ht = $fields['totalht'] * $ratiopaymentinvoice;
+			$temp_vat = $fields['localtax'.$localTaxType] * $ratiopaymentinvoice;
+			$subtot_coll_total_ht += $temp_ht;
+			$subtot_coll_vat      += $temp_vat;
+			$x_coll_sum           += $temp_vat;
+		}
+	}
+	print '<td class="nowrap right">'.price(price2num($x_coll_sum, 'MT')).'</td>';
 
-    $x_paye_sum = 0;
-    foreach (array_keys($x_paye) as $rate)
-    {
-    	$subtot_paye_total_ht = 0;
-    	$subtot_paye_vat = 0;
+	$x_paye_sum = 0;
+	foreach (array_keys($x_paye) as $rate)
+	{
+		$subtot_paye_total_ht = 0;
+		$subtot_paye_vat = 0;
 
-    	foreach ($x_both[$rate]['paye']['detail'] as $index => $fields)
-    	{
-    		// Payment
-    		$ratiopaymentinvoice = 1;
-    		if ($modetax != 1)
-    		{
-    			// Define type
-    			// We MUST use dtype (type in line). We can use something else, only if dtype is really unknown.
-    			$type = (isset($fields['dtype']) ? $fields['dtype'] : $fields['ptype']);
-    			// Try to enhance type detection using date_start and date_end for free lines where type
-    			// was not saved.
-    			if (!empty($fields['ddate_start'])) {
-    				$type = 1;
-    			}
-    			if (!empty($fields['ddate_end'])) {
-    				$type = 1;
-    			}
+		foreach ($x_both[$rate]['paye']['detail'] as $index => $fields)
+		{
+			// Payment
+			$ratiopaymentinvoice = 1;
+			if ($modetax != 1)
+			{
+				// Define type
+				// We MUST use dtype (type in line). We can use something else, only if dtype is really unknown.
+				$type = (isset($fields['dtype']) ? $fields['dtype'] : $fields['ptype']);
+				// Try to enhance type detection using date_start and date_end for free lines where type
+				// was not saved.
+				if (!empty($fields['ddate_start'])) {
+					$type = 1;
+				}
+				if (!empty($fields['ddate_end'])) {
+					$type = 1;
+				}
 
-    			if (($type == 0 && $conf->global->TAX_MODE_SELL_PRODUCT == 'invoice')
-    				|| ($type == 1 && $conf->global->TAX_MODE_SELL_SERVICE == 'invoice'))
-    			{
-    				//print $langs->trans("NA");
-    			} else {
-    				if (isset($fields['payment_amount']) && price2num($fields['ftotal_ttc'])) {
-    					$ratiopaymentinvoice = ($fields['payment_amount'] / $fields['ftotal_ttc']);
-    				}
-    			}
-    		}
-    		//var_dump('type='.$type.' '.$fields['totalht'].' '.$ratiopaymentinvoice);
-    		$temp_ht = $fields['totalht'] * $ratiopaymentinvoice;
-    		$temp_vat = $fields['localtax'.$localTaxType] * $ratiopaymentinvoice;
-    		$subtot_paye_total_ht += $temp_ht;
-    		$subtot_paye_vat      += $temp_vat;
-    		$x_paye_sum           += $temp_vat;
-    	}
-    }
-    print '<td class="nowrap right">'.price(price2num($x_paye_sum, 'MT')).'</td>';
+				if (($type == 0 && $conf->global->TAX_MODE_SELL_PRODUCT == 'invoice')
+					|| ($type == 1 && $conf->global->TAX_MODE_SELL_SERVICE == 'invoice'))
+				{
+					//print $langs->trans("NA");
+				} else {
+					if (isset($fields['payment_amount']) && price2num($fields['ftotal_ttc'])) {
+						$ratiopaymentinvoice = ($fields['payment_amount'] / $fields['ftotal_ttc']);
+					}
+				}
+			}
+			//var_dump('type='.$type.' '.$fields['totalht'].' '.$ratiopaymentinvoice);
+			$temp_ht = $fields['totalht'] * $ratiopaymentinvoice;
+			$temp_vat = $fields['localtax'.$localTaxType] * $ratiopaymentinvoice;
+			$subtot_paye_total_ht += $temp_ht;
+			$subtot_paye_vat      += $temp_vat;
+			$x_paye_sum           += $temp_vat;
+		}
+	}
+	print '<td class="nowrap right">'.price(price2num($x_paye_sum, 'MT')).'</td>';
 
-    $subtotalcoll = $subtotalcoll + $x_coll_sum;
-    $subtotalpaye = $subtotalpaye + $x_paye_sum;
+	$subtotalcoll = $subtotalcoll + $x_coll_sum;
+	$subtotalpaye = $subtotalpaye + $x_paye_sum;
 
-    $diff = $x_coll_sum - $x_paye_sum;
-    $total = $total + $diff;
-    $subtotal = price2num($subtotal + $diff, 'MT');
+	$diff = $x_coll_sum - $x_paye_sum;
+	$total = $total + $diff;
+	$subtotal = price2num($subtotal + $diff, 'MT');
 
-    print '<td class="nowrap right">'.price(price2num($diff, 'MT')).'</td>'."\n";
-    print "<td>&nbsp;</td>\n";
-    print "</tr>\n";
+	print '<td class="nowrap right">'.price(price2num($diff, 'MT')).'</td>'."\n";
+	print "<td>&nbsp;</td>\n";
+	print "</tr>\n";
 
-    $i++; $m++;
-    if ($i > 2)
-    {
-    	print '<tr class="liste_total">';
-    	print '<td class="right"><a href="quadri_detail.php?leftmenu=tax_vat&q='.round($m / 3).'&year='.$y.'">'.$langs->trans("SubTotal").'</a>:</td>';
-    	print '<td class="nowrap right">'.price(price2num($subtotalcoll, 'MT')).'</td>';
-    	print '<td class="nowrap right">'.price(price2num($subtotalpaye, 'MT')).'</td>';
-    	print '<td class="nowrap right">'.price(price2num($subtotal, 'MT')).'</td>';
-    	print '<td>&nbsp;</td></tr>';
-    	$i = 0;
-    	$subtotalcoll = 0; $subtotalpaye = 0; $subtotal = 0;
-    }
+	$i++; $m++;
+	if ($i > 2)
+	{
+		print '<tr class="liste_total">';
+		print '<td class="right"><a href="quadri_detail.php?leftmenu=tax_vat&q='.round($m / 3).'&year='.$y.'">'.$langs->trans("SubTotal").'</a>:</td>';
+		print '<td class="nowrap right">'.price(price2num($subtotalcoll, 'MT')).'</td>';
+		print '<td class="nowrap right">'.price(price2num($subtotalpaye, 'MT')).'</td>';
+		print '<td class="nowrap right">'.price(price2num($subtotal, 'MT')).'</td>';
+		print '<td>&nbsp;</td></tr>';
+		$i = 0;
+		$subtotalcoll = 0; $subtotalpaye = 0; $subtotal = 0;
+	}
 }
 print '<tr class="liste_total"><td class="right" colspan="3">'.$langs->trans("TotalToPay").':</td><td class="nowrap right">'.price(price2num($total, 'MT')).'</td>';
 print "<td>&nbsp;</td>\n";
diff --git a/htdocs/compta/localtax/list.php b/htdocs/compta/localtax/list.php
index 2702a962281..4d7e2bf0e54 100644
--- a/htdocs/compta/localtax/list.php
+++ b/htdocs/compta/localtax/list.php
@@ -56,45 +56,45 @@ $sql .= " ORDER BY datev DESC";
 $result = $db->query($sql);
 if ($result)
 {
-    $num = $db->num_rows($result);
-    $i = 0;
-    $total = 0;
+	$num = $db->num_rows($result);
+	$i = 0;
+	$total = 0;
 
-    print '<table class="noborder centpercent">';
-    print '<tr class="liste_titre">';
-    print '<td class="nowrap" align="left">'.$langs->trans("Ref").'</td>';
-    print "<td>".$langs->trans("Label")."</td>";
-    print "<td>".$langs->trans("PeriodEndDate")."</td>";
-    print '<td class="nowrap" align="left">'.$langs->trans("DatePayment").'</td>';
-    print "<td align=\"right\">".$langs->trans("PayedByThisPayment")."</td>";
-    print "</tr>\n";
-    $var = 1;
-    while ($i < $num)
-    {
-        $obj = $db->fetch_object($result);
+	print '<table class="noborder centpercent">';
+	print '<tr class="liste_titre">';
+	print '<td class="nowrap" align="left">'.$langs->trans("Ref").'</td>';
+	print "<td>".$langs->trans("Label")."</td>";
+	print "<td>".$langs->trans("PeriodEndDate")."</td>";
+	print '<td class="nowrap" align="left">'.$langs->trans("DatePayment").'</td>';
+	print "<td align=\"right\">".$langs->trans("PayedByThisPayment")."</td>";
+	print "</tr>\n";
+	$var = 1;
+	while ($i < $num)
+	{
+		$obj = $db->fetch_object($result);
 
-        print '<tr class="oddeven">';
+		print '<tr class="oddeven">';
 
 		$localtax_static->id = $obj->rowid;
 		$localtax_static->ref = $obj->rowid;
 		print "<td>".$localtax_static->getNomUrl(1)."</td>\n";
-        print "<td>".dol_trunc($obj->label, 40)."</td>\n";
-        print '<td class="left">'.dol_print_date($db->jdate($obj->datev), 'day')."</td>\n";
-        print '<td class="left">'.dol_print_date($db->jdate($obj->datep), 'day')."</td>\n";
-        $total = $total + $obj->amount;
+		print "<td>".dol_trunc($obj->label, 40)."</td>\n";
+		print '<td class="left">'.dol_print_date($db->jdate($obj->datev), 'day')."</td>\n";
+		print '<td class="left">'.dol_print_date($db->jdate($obj->datep), 'day')."</td>\n";
+		$total = $total + $obj->amount;
 
-        print "<td align=\"right\">".price($obj->amount)."</td>";
-        print "</tr>\n";
+		print "<td align=\"right\">".price($obj->amount)."</td>";
+		print "</tr>\n";
 
-        $i++;
-    }
-    print '<tr class="liste_total"><td colspan="4">'.$langs->trans("Total").'</td>';
-    print '<td class="right">'.price($total).'</td></tr>';
+		$i++;
+	}
+	print '<tr class="liste_total"><td colspan="4">'.$langs->trans("Total").'</td>';
+	print '<td class="right">'.price($total).'</td></tr>';
 
-    print "</table>";
-    $db->free($result);
+	print "</table>";
+	$db->free($result);
 } else {
-    dol_print_error($db);
+	dol_print_error($db);
 }
 
 // End of page
diff --git a/htdocs/compta/localtax/quadri_detail.php b/htdocs/compta/localtax/quadri_detail.php
index ebb66778df7..2b0415800ac 100644
--- a/htdocs/compta/localtax/quadri_detail.php
+++ b/htdocs/compta/localtax/quadri_detail.php
@@ -142,16 +142,16 @@ $prevquarter = $q;
 if ($prevquarter > 1) {
 	$prevquarter--;
 } else {
-    $prevquarter = 4;
-    $prevyear--;
+	$prevquarter = 4;
+	$prevyear--;
 }
 $nextyear = $year_start;
 $nextquarter = $q;
 if ($nextquarter < 4) {
 	$nextquarter++;
 } else {
-    $nextquarter = 1;
-    $nextyear++;
+	$nextquarter = 1;
+	$nextyear++;
 }
 $description .= $fsearch;
 $builddate = dol_now();
@@ -370,12 +370,12 @@ if (!is_array($x_coll) || !is_array($x_paye))
 					} else {
 						if ($type) $text = img_object($langs->trans('Service'), 'service');
 						else $text = img_object($langs->trans('Product'), 'product');
-			            if (preg_match('/^\((.*)\)$/', $fields['descr'], $reg))
-			            {
-			                if ($reg[1] == 'DEPOSIT') $fields['descr'] = $langs->transnoentitiesnoconv('Deposit');
-			                elseif ($reg[1] == 'CREDIT_NOTE') $fields['descr'] = $langs->transnoentitiesnoconv('CreditNote');
-			                else $fields['descr'] = $langs->transnoentitiesnoconv($reg[1]);
-			            }
+						if (preg_match('/^\((.*)\)$/', $fields['descr'], $reg))
+						{
+							if ($reg[1] == 'DEPOSIT') $fields['descr'] = $langs->transnoentitiesnoconv('Deposit');
+							elseif ($reg[1] == 'CREDIT_NOTE') $fields['descr'] = $langs->transnoentitiesnoconv('CreditNote');
+							else $fields['descr'] = $langs->transnoentitiesnoconv($reg[1]);
+						}
 						print $text.' '.dol_trunc(dol_string_nohtmltag($fields['descr']), 16);
 
 						// Show range
@@ -438,36 +438,36 @@ if (!is_array($x_coll) || !is_array($x_paye))
 			}
 		}
 
-	    // Total customers for this vat rate
-	    print '<tr class="liste_total">';
-	    print '<td></td>';
-	    print '<td class="right">'.$langs->trans("Total").':</td>';
-	    if ($modetax != 1)
-	    {
-	        print '<td class="nowrap right">&nbsp;</td>';
-	        print '<td class="right">&nbsp;</td>';
-	    }
-	    print '<td class="right">'.price(price2num($subtot_coll_total_ht, 'MT')).'</td>';
-	    print '<td class="nowrap right">'.price(price2num($subtot_coll_vat, 'MT')).'</td>';
-	    print '</tr>';
+		// Total customers for this vat rate
+		print '<tr class="liste_total">';
+		print '<td></td>';
+		print '<td class="right">'.$langs->trans("Total").':</td>';
+		if ($modetax != 1)
+		{
+			print '<td class="nowrap right">&nbsp;</td>';
+			print '<td class="right">&nbsp;</td>';
+		}
+		print '<td class="right">'.price(price2num($subtot_coll_total_ht, 'MT')).'</td>';
+		print '<td class="nowrap right">'.price(price2num($subtot_coll_vat, 'MT')).'</td>';
+		print '</tr>';
 	}
 
-    if (count($x_coll) == 0)   // Show a total ine if nothing shown
-    {
-        print '<tr class="liste_total">';
-        print '<td>&nbsp;</td>';
-        print '<td class="right">'.$langs->trans("Total").':</td>';
-        if ($modetax == 0)
-        {
-            print '<td class="nowrap right">&nbsp;</td>';
-            print '<td class="right">&nbsp;</td>';
-        }
-        print '<td class="right">'.price(price2num(0, 'MT')).'</td>';
-        print '<td class="nowrap right">'.price(price2num(0, 'MT')).'</td>';
-        print '</tr>';
-    }
+	if (count($x_coll) == 0)   // Show a total ine if nothing shown
+	{
+		print '<tr class="liste_total">';
+		print '<td>&nbsp;</td>';
+		print '<td class="right">'.$langs->trans("Total").':</td>';
+		if ($modetax == 0)
+		{
+			print '<td class="nowrap right">&nbsp;</td>';
+			print '<td class="right">&nbsp;</td>';
+		}
+		print '<td class="right">'.price(price2num(0, 'MT')).'</td>';
+		print '<td class="nowrap right">'.price(price2num(0, 'MT')).'</td>';
+		print '</tr>';
+	}
 
-    // Blank line
+	// Blank line
 	print '<tr><td colspan="'.($span + 1).'">&nbsp;</td></tr>';
 	//print '</table>';
 	$diff = $x_coll_sum;
@@ -592,18 +592,18 @@ if (!is_array($x_coll) || !is_array($x_paye))
 			}
 		}
 
-	    // Total suppliers for this vat rate
-	    print '<tr class="liste_total">';
-	    print '<td>&nbsp;</td>';
-	    print '<td class="right">'.$langs->trans("Total").':</td>';
-	    if ($modetax != 1)
-	    {
-	        print '<td class="nowrap right">&nbsp;</td>';
-	        print '<td class="right">&nbsp;</td>';
-	    }
-	    print '<td class="right">'.price(price2num($subtot_paye_total_ht, 'MT')).'</td>';
-	    print '<td class="nowrap right">'.price(price2num($subtot_paye_vat, 'MT')).'</td>';
-	    print '</tr>';
+		// Total suppliers for this vat rate
+		print '<tr class="liste_total">';
+		print '<td>&nbsp;</td>';
+		print '<td class="right">'.$langs->trans("Total").':</td>';
+		if ($modetax != 1)
+		{
+			print '<td class="nowrap right">&nbsp;</td>';
+			print '<td class="right">&nbsp;</td>';
+		}
+		print '<td class="right">'.price(price2num($subtot_paye_total_ht, 'MT')).'</td>';
+		print '<td class="nowrap right">'.price(price2num($subtot_paye_vat, 'MT')).'</td>';
+		print '</tr>';
 	}
 
 	if (count($x_paye) == 0) {  // Show a total line if nothing shown
@@ -620,7 +620,7 @@ if (!is_array($x_coll) || !is_array($x_paye))
 	}
 
 	// Total to pay
-    $diff = $x_coll_sum - $x_paye_sum;
+	$diff = $x_coll_sum - $x_paye_sum;
 	print '<tr class="liste_total">';
 	print '<td class="liste_total" colspan="'.$span.'">'.$langs->trans("TotalToPay").($q ? ', '.$langs->trans("Quadri").' '.$q : '').'</td>';
 	print '<td class="liste_total nowrap right"><b>'.price(price2num($diff, 'MT'))."</b></td>\n";
diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php
index 21e9fba85bc..a03fd03ffef 100644
--- a/htdocs/compta/paiement.php
+++ b/htdocs/compta/paiement.php
@@ -61,7 +61,7 @@ $multicurrency_amountsresttopay = array();
 // Security check
 if ($user->socid > 0)
 {
-    $socid = $user->socid;
+	$socid = $user->socid;
 }
 
 $object = new Facture($db);
@@ -90,111 +90,111 @@ if (empty($reshook))
 {
 	if ($action == 'add_paiement' || ($action == 'confirm_paiement' && $confirm == 'yes'))
 	{
-	    $error = 0;
+		$error = 0;
 
-	    $datepaye = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
-	    $paiement_id = 0;
-	    $totalpayment = 0;
+		$datepaye = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
+		$paiement_id = 0;
+		$totalpayment = 0;
 		$multicurrency_totalpayment = 0;
-	    $atleastonepaymentnotnull = 0;
+		$atleastonepaymentnotnull = 0;
 		$formquestion = array();
 		$i = 0;
 
-	    // Generate payment array and check if there is payment higher than invoice and payment date before invoice date
-	    $tmpinvoice = new Facture($db);
-	    foreach ($_POST as $key => $value)
-	    {
+		// Generate payment array and check if there is payment higher than invoice and payment date before invoice date
+		$tmpinvoice = new Facture($db);
+		foreach ($_POST as $key => $value)
+		{
 			if (substr($key, 0, 7) == 'amount_' && GETPOST($key) != '')
-	        {
-	            $cursorfacid = substr($key, 7);
-	            $amounts[$cursorfacid] = price2num(GETPOST($key));
-	            $totalpayment = $totalpayment + $amounts[$cursorfacid];
-	            if (!empty($amounts[$cursorfacid])) $atleastonepaymentnotnull++;
-	            $result = $tmpinvoice->fetch($cursorfacid);
-	            if ($result <= 0) dol_print_error($db);
-	            $amountsresttopay[$cursorfacid] = price2num($tmpinvoice->total_ttc - $tmpinvoice->getSommePaiement());
-	            if ($amounts[$cursorfacid])
-	            {
-		            // Check amount
-		            if ($amounts[$cursorfacid] && (abs($amounts[$cursorfacid]) > abs($amountsresttopay[$cursorfacid])))
-		            {
-		                $addwarning = 1;
-		                $formquestion['text'] = img_warning($langs->trans("PaymentHigherThanReminderToPay")).' '.$langs->trans("HelpPaymentHigherThanReminderToPay");
-		            }
-		            // Check date
-		            if ($datepaye && ($datepaye < $tmpinvoice->date))
-		            {
-		            	$langs->load("errors");
-		                //$error++;
-		                setEventMessages($langs->transnoentities("WarningPaymentDateLowerThanInvoiceDate", dol_print_date($datepaye, 'day'), dol_print_date($tmpinvoice->date, 'day'), $tmpinvoice->ref), null, 'warnings');
-		            }
-	            }
+			{
+				$cursorfacid = substr($key, 7);
+				$amounts[$cursorfacid] = price2num(GETPOST($key));
+				$totalpayment = $totalpayment + $amounts[$cursorfacid];
+				if (!empty($amounts[$cursorfacid])) $atleastonepaymentnotnull++;
+				$result = $tmpinvoice->fetch($cursorfacid);
+				if ($result <= 0) dol_print_error($db);
+				$amountsresttopay[$cursorfacid] = price2num($tmpinvoice->total_ttc - $tmpinvoice->getSommePaiement());
+				if ($amounts[$cursorfacid])
+				{
+					// Check amount
+					if ($amounts[$cursorfacid] && (abs($amounts[$cursorfacid]) > abs($amountsresttopay[$cursorfacid])))
+					{
+						$addwarning = 1;
+						$formquestion['text'] = img_warning($langs->trans("PaymentHigherThanReminderToPay")).' '.$langs->trans("HelpPaymentHigherThanReminderToPay");
+					}
+					// Check date
+					if ($datepaye && ($datepaye < $tmpinvoice->date))
+					{
+						$langs->load("errors");
+						//$error++;
+						setEventMessages($langs->transnoentities("WarningPaymentDateLowerThanInvoiceDate", dol_print_date($datepaye, 'day'), dol_print_date($tmpinvoice->date, 'day'), $tmpinvoice->ref), null, 'warnings');
+					}
+				}
 
-	            $formquestion[$i++] = array('type' => 'hidden', 'name' => $key, 'value' => $_POST[$key]);
-	        } elseif (substr($key, 0, 21) == 'multicurrency_amount_')
+				$formquestion[$i++] = array('type' => 'hidden', 'name' => $key, 'value' => $_POST[$key]);
+			} elseif (substr($key, 0, 21) == 'multicurrency_amount_')
 			{
 				$cursorfacid = substr($key, 21);
-	            $multicurrency_amounts[$cursorfacid] = price2num(GETPOST($key));
-	            $multicurrency_totalpayment += $multicurrency_amounts[$cursorfacid];
-	            if (!empty($multicurrency_amounts[$cursorfacid])) $atleastonepaymentnotnull++;
-	            $result = $tmpinvoice->fetch($cursorfacid);
-	            if ($result <= 0) dol_print_error($db);
-	            $multicurrency_amountsresttopay[$cursorfacid] = price2num($tmpinvoice->multicurrency_total_ttc - $tmpinvoice->getSommePaiement(1));
-	            if ($multicurrency_amounts[$cursorfacid])
-	            {
-		            // Check amount
-		            if ($multicurrency_amounts[$cursorfacid] && (abs($multicurrency_amounts[$cursorfacid]) > abs($multicurrency_amountsresttopay[$cursorfacid])))
-		            {
-		                $addwarning = 1;
-		                $formquestion['text'] = img_warning($langs->trans("PaymentHigherThanReminderToPay")).' '.$langs->trans("HelpPaymentHigherThanReminderToPay");
-		            }
-		            // Check date
-		            if ($datepaye && ($datepaye < $tmpinvoice->date))
-		            {
-		            	$langs->load("errors");
-		                //$error++;
-		                setEventMessages($langs->transnoentities("WarningPaymentDateLowerThanInvoiceDate", dol_print_date($datepaye, 'day'), dol_print_date($tmpinvoice->date, 'day'), $tmpinvoice->ref), null, 'warnings');
-		            }
-	            }
+				$multicurrency_amounts[$cursorfacid] = price2num(GETPOST($key));
+				$multicurrency_totalpayment += $multicurrency_amounts[$cursorfacid];
+				if (!empty($multicurrency_amounts[$cursorfacid])) $atleastonepaymentnotnull++;
+				$result = $tmpinvoice->fetch($cursorfacid);
+				if ($result <= 0) dol_print_error($db);
+				$multicurrency_amountsresttopay[$cursorfacid] = price2num($tmpinvoice->multicurrency_total_ttc - $tmpinvoice->getSommePaiement(1));
+				if ($multicurrency_amounts[$cursorfacid])
+				{
+					// Check amount
+					if ($multicurrency_amounts[$cursorfacid] && (abs($multicurrency_amounts[$cursorfacid]) > abs($multicurrency_amountsresttopay[$cursorfacid])))
+					{
+						$addwarning = 1;
+						$formquestion['text'] = img_warning($langs->trans("PaymentHigherThanReminderToPay")).' '.$langs->trans("HelpPaymentHigherThanReminderToPay");
+					}
+					// Check date
+					if ($datepaye && ($datepaye < $tmpinvoice->date))
+					{
+						$langs->load("errors");
+						//$error++;
+						setEventMessages($langs->transnoentities("WarningPaymentDateLowerThanInvoiceDate", dol_print_date($datepaye, 'day'), dol_print_date($tmpinvoice->date, 'day'), $tmpinvoice->ref), null, 'warnings');
+					}
+				}
 
-	            $formquestion[$i++] = array('type' => 'hidden', 'name' => $key, 'value' => GETPOST($key, 'int'));
+				$formquestion[$i++] = array('type' => 'hidden', 'name' => $key, 'value' => GETPOST($key, 'int'));
 			}
-	    }
+		}
 
-	    // Check parameters
-	    if (!GETPOST('paiementcode'))
-	    {
-	        setEventMessages($langs->transnoentities('ErrorFieldRequired', $langs->transnoentities('PaymentMode')), null, 'errors');
-	        $error++;
-	    }
+		// Check parameters
+		if (!GETPOST('paiementcode'))
+		{
+			setEventMessages($langs->transnoentities('ErrorFieldRequired', $langs->transnoentities('PaymentMode')), null, 'errors');
+			$error++;
+		}
 
-	    if (!empty($conf->banque->enabled))
-	    {
-	        // If bank module is on, account is required to enter a payment
-	        if (GETPOST('accountid') <= 0)
-	        {
-	            setEventMessages($langs->transnoentities('ErrorFieldRequired', $langs->transnoentities('AccountToCredit')), null, 'errors');
-	            $error++;
-	        }
-	    }
+		if (!empty($conf->banque->enabled))
+		{
+			// If bank module is on, account is required to enter a payment
+			if (GETPOST('accountid') <= 0)
+			{
+				setEventMessages($langs->transnoentities('ErrorFieldRequired', $langs->transnoentities('AccountToCredit')), null, 'errors');
+				$error++;
+			}
+		}
 
-	    if (empty($totalpayment) && empty($multicurrency_totalpayment) && empty($atleastonepaymentnotnull))
-	    {
-	        setEventMessages($langs->transnoentities('ErrorFieldRequired', $langs->trans('PaymentAmount')), null, 'errors');
-	        $error++;
-	    }
+		if (empty($totalpayment) && empty($multicurrency_totalpayment) && empty($atleastonepaymentnotnull))
+		{
+			setEventMessages($langs->transnoentities('ErrorFieldRequired', $langs->trans('PaymentAmount')), null, 'errors');
+			$error++;
+		}
 
-	    if (empty($datepaye))
-	    {
-	        setEventMessages($langs->transnoentities('ErrorFieldRequired', $langs->transnoentities('Date')), null, 'errors');
-	        $error++;
-	    }
+		if (empty($datepaye))
+		{
+			setEventMessages($langs->transnoentities('ErrorFieldRequired', $langs->transnoentities('Date')), null, 'errors');
+			$error++;
+		}
 
 		// Check if payments in both currency
 		if ($totalpayment > 0 && $multicurrency_totalpayment > 0)
 		{
 			setEventMessages($langs->transnoentities('ErrorPaymentInBothCurrency'), null, 'errors');
-	        $error++;
+			$error++;
 		}
 	}
 
@@ -203,11 +203,11 @@ if (empty($reshook))
 	 */
 	if ($action == 'add_paiement')
 	{
-	    if ($error)
-	    {
-	        $action = 'create';
-	    }
-	    // The next of this action is displayed at the page's bottom.
+		if ($error)
+		{
+			$action = 'create';
+		}
+		// The next of this action is displayed at the page's bottom.
 	}
 
 	/*
@@ -215,103 +215,103 @@ if (empty($reshook))
 	 */
 	if ($action == 'confirm_paiement' && $confirm == 'yes')
 	{
-	    $error = 0;
+		$error = 0;
 
-	    $datepaye = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
+		$datepaye = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
 
-	    $db->begin();
+		$db->begin();
 
-	    $thirdparty = new Societe($db);
-	    if ($socid > 0) $thirdparty->fetch($socid);
+		$thirdparty = new Societe($db);
+		if ($socid > 0) $thirdparty->fetch($socid);
 
-	    // Clean parameters amount if payment is for a credit note
-	    foreach ($amounts as $key => $value)	// How payment is dispatched
-	    {
-	        $tmpinvoice = new Facture($db);
-	        $tmpinvoice->fetch($key);
-	        if ($tmpinvoice->type == Facture::TYPE_CREDIT_NOTE)
-	        {
-	            $newvalue = price2num($value, 'MT');
-	            $amounts[$key] = - abs($newvalue);
-	        }
-	    }
+		// Clean parameters amount if payment is for a credit note
+		foreach ($amounts as $key => $value)	// How payment is dispatched
+		{
+			$tmpinvoice = new Facture($db);
+			$tmpinvoice->fetch($key);
+			if ($tmpinvoice->type == Facture::TYPE_CREDIT_NOTE)
+			{
+				$newvalue = price2num($value, 'MT');
+				$amounts[$key] = - abs($newvalue);
+			}
+		}
 
-	    foreach ($multicurrency_amounts as $key => $value)	// How payment is dispatched
-	    {
-	        $tmpinvoice = new Facture($db);
-	        $tmpinvoice->fetch($key);
-	        if ($tmpinvoice->type == Facture::TYPE_CREDIT_NOTE)
-	        {
-	            $newvalue = price2num($value, 'MT');
-	            $multicurrency_amounts[$key] = - abs($newvalue);
-	        }
-	    }
+		foreach ($multicurrency_amounts as $key => $value)	// How payment is dispatched
+		{
+			$tmpinvoice = new Facture($db);
+			$tmpinvoice->fetch($key);
+			if ($tmpinvoice->type == Facture::TYPE_CREDIT_NOTE)
+			{
+				$newvalue = price2num($value, 'MT');
+				$multicurrency_amounts[$key] = - abs($newvalue);
+			}
+		}
 
-	    if (!empty($conf->banque->enabled))
-	    {
-	    	// If the bank module is active, an account is required to input a payment
-	    	if (GETPOST('accountid', 'int') <= 0)
-	    	{
-	    		setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentities('AccountToCredit')), null, 'errors');
-	    		$error++;
-	    	}
-	    }
+		if (!empty($conf->banque->enabled))
+		{
+			// If the bank module is active, an account is required to input a payment
+			if (GETPOST('accountid', 'int') <= 0)
+			{
+				setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentities('AccountToCredit')), null, 'errors');
+				$error++;
+			}
+		}
 
-	    // Creation of payment line
-	    $paiement = new Paiement($db);
-	    $paiement->datepaye     = $datepaye;
-	    $paiement->amounts      = $amounts; // Array with all payments dispatching with invoice id
-	    $paiement->multicurrency_amounts = $multicurrency_amounts; // Array with all payments dispatching
-	    $paiement->paiementid   = dol_getIdFromCode($db, GETPOST('paiementcode'), 'c_paiement', 'code', 'id', 1);
-	    $paiement->num_payment  = GETPOST('num_paiement', 'alpha');
-	    $paiement->note_private = GETPOST('comment', 'alpha');
+		// Creation of payment line
+		$paiement = new Paiement($db);
+		$paiement->datepaye     = $datepaye;
+		$paiement->amounts      = $amounts; // Array with all payments dispatching with invoice id
+		$paiement->multicurrency_amounts = $multicurrency_amounts; // Array with all payments dispatching
+		$paiement->paiementid   = dol_getIdFromCode($db, GETPOST('paiementcode'), 'c_paiement', 'code', 'id', 1);
+		$paiement->num_payment  = GETPOST('num_paiement', 'alpha');
+		$paiement->note_private = GETPOST('comment', 'alpha');
 
-	    if (!$error)
-	    {
-	        // Create payment and update this->multicurrency_amounts if this->amounts filled or
-	        // this->amounts if this->multicurrency_amounts filled.
-	        $paiement_id = $paiement->create($user, (GETPOST('closepaidinvoices') == 'on' ? 1 : 0), $thirdparty); // This include closing invoices and regenerating documents
-	    	if ($paiement_id < 0)
-	        {
-	            setEventMessages($paiement->error, $paiement->errors, 'errors');
-	            $error++;
-	        }
-	    }
+		if (!$error)
+		{
+			// Create payment and update this->multicurrency_amounts if this->amounts filled or
+			// this->amounts if this->multicurrency_amounts filled.
+			$paiement_id = $paiement->create($user, (GETPOST('closepaidinvoices') == 'on' ? 1 : 0), $thirdparty); // This include closing invoices and regenerating documents
+			if ($paiement_id < 0)
+			{
+				setEventMessages($paiement->error, $paiement->errors, 'errors');
+				$error++;
+			}
+		}
 
-	    if (!$error)
-	    {
-	    	$label = '(CustomerInvoicePayment)';
-	    	if (GETPOST('type') == Facture::TYPE_CREDIT_NOTE) $label = '(CustomerInvoicePaymentBack)'; // Refund of a credit note
-	        $result = $paiement->addPaymentToBank($user, 'payment', $label, GETPOST('accountid'), GETPOST('chqemetteur'), GETPOST('chqbank'));
-	        if ($result < 0)
-	        {
-	            setEventMessages($paiement->error, $paiement->errors, 'errors');
-	            $error++;
-	        }
-	    }
+		if (!$error)
+		{
+			$label = '(CustomerInvoicePayment)';
+			if (GETPOST('type') == Facture::TYPE_CREDIT_NOTE) $label = '(CustomerInvoicePaymentBack)'; // Refund of a credit note
+			$result = $paiement->addPaymentToBank($user, 'payment', $label, GETPOST('accountid'), GETPOST('chqemetteur'), GETPOST('chqbank'));
+			if ($result < 0)
+			{
+				setEventMessages($paiement->error, $paiement->errors, 'errors');
+				$error++;
+			}
+		}
 
-	    if (!$error)
-	    {
-	        $db->commit();
+		if (!$error)
+		{
+			$db->commit();
 
-	        // If payment dispatching on more than one invoice, we stay on summary page, otherwise jump on invoice card
-	        $invoiceid = 0;
-	        foreach ($paiement->amounts as $key => $amount)
-	        {
-	            $facid = $key;
-	            if (is_numeric($amount) && $amount <> 0)
-	            {
-	                if ($invoiceid != 0) $invoiceid = -1; // There is more than one invoice payed by this payment
-	                else $invoiceid = $facid;
-	            }
-	        }
-	        if ($invoiceid > 0) $loc = DOL_URL_ROOT.'/compta/facture/card.php?facid='.$invoiceid;
-	        else $loc = DOL_URL_ROOT.'/compta/paiement/card.php?id='.$paiement_id;
-	        header('Location: '.$loc);
-	        exit;
-	    } else {
-	        $db->rollback();
-	    }
+			// If payment dispatching on more than one invoice, we stay on summary page, otherwise jump on invoice card
+			$invoiceid = 0;
+			foreach ($paiement->amounts as $key => $amount)
+			{
+				$facid = $key;
+				if (is_numeric($amount) && $amount <> 0)
+				{
+					if ($invoiceid != 0) $invoiceid = -1; // There is more than one invoice payed by this payment
+					else $invoiceid = $facid;
+				}
+			}
+			if ($invoiceid > 0) $loc = DOL_URL_ROOT.'/compta/facture/card.php?facid='.$invoiceid;
+			else $loc = DOL_URL_ROOT.'/compta/paiement/card.php?id='.$paiement_id;
+			header('Location: '.$loc);
+			exit;
+		} else {
+			$db->rollback();
+		}
 	}
 }
 
@@ -473,73 +473,73 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 
 		print '<table class="border centpercent">';
 
-        // Third party
-        print '<tr><td class="titlefieldcreate"><span class="fieldrequired">'.$langs->trans('Company').'</span></td><td>'.$facture->thirdparty->getNomUrl(4)."</td></tr>\n";
+		// Third party
+		print '<tr><td class="titlefieldcreate"><span class="fieldrequired">'.$langs->trans('Company').'</span></td><td>'.$facture->thirdparty->getNomUrl(4)."</td></tr>\n";
 
-        // Date payment
-        print '<tr><td><span class="fieldrequired">'.$langs->trans('Date').'</span></td><td>';
-        $datepayment = dol_mktime(12, 0, 0, $_POST['remonth'], $_POST['reday'], $_POST['reyear']);
-        $datepayment = ($datepayment == '' ? (empty($conf->global->MAIN_AUTOFILL_DATE) ?-1 : '') : $datepayment);
-        print $form->selectDate($datepayment, '', '', '', 0, "add_paiement", 1, 1, 0, '', '', $facture->date);
-        print '</td></tr>';
+		// Date payment
+		print '<tr><td><span class="fieldrequired">'.$langs->trans('Date').'</span></td><td>';
+		$datepayment = dol_mktime(12, 0, 0, $_POST['remonth'], $_POST['reday'], $_POST['reyear']);
+		$datepayment = ($datepayment == '' ? (empty($conf->global->MAIN_AUTOFILL_DATE) ?-1 : '') : $datepayment);
+		print $form->selectDate($datepayment, '', '', '', 0, "add_paiement", 1, 1, 0, '', '', $facture->date);
+		print '</td></tr>';
 
-        // Payment mode
-        print '<tr><td><span class="fieldrequired">'.$langs->trans('PaymentMode').'</span></td><td>';
-        $form->select_types_paiements((GETPOST('paiementcode') ?GETPOST('paiementcode') : $facture->mode_reglement_code), 'paiementcode', '', 2);
-        print "</td>\n";
-        print '</tr>';
+		// Payment mode
+		print '<tr><td><span class="fieldrequired">'.$langs->trans('PaymentMode').'</span></td><td>';
+		$form->select_types_paiements((GETPOST('paiementcode') ?GETPOST('paiementcode') : $facture->mode_reglement_code), 'paiementcode', '', 2);
+		print "</td>\n";
+		print '</tr>';
 
-        // Bank account
-        print '<tr>';
-        if (!empty($conf->banque->enabled))
-        {
-            if ($facture->type != 2) print '<td><span class="fieldrequired">'.$langs->trans('AccountToCredit').'</span></td>';
-            if ($facture->type == 2) print '<td><span class="fieldrequired">'.$langs->trans('AccountToDebit').'</span></td>';
-            print '<td>';
-            $form->select_comptes($accountid, 'accountid', 0, '', 2);
-            print '</td>';
-        } else {
-            print '<td>&nbsp;</td>';
-        }
-        print "</tr>\n";
+		// Bank account
+		print '<tr>';
+		if (!empty($conf->banque->enabled))
+		{
+			if ($facture->type != 2) print '<td><span class="fieldrequired">'.$langs->trans('AccountToCredit').'</span></td>';
+			if ($facture->type == 2) print '<td><span class="fieldrequired">'.$langs->trans('AccountToDebit').'</span></td>';
+			print '<td>';
+			$form->select_comptes($accountid, 'accountid', 0, '', 2);
+			print '</td>';
+		} else {
+			print '<td>&nbsp;</td>';
+		}
+		print "</tr>\n";
 
-        // Bank check number
-        print '<tr><td>'.$langs->trans('Numero');
-        print ' <em>('.$langs->trans("ChequeOrTransferNumber").')</em>';
-        print '</td>';
-        print '<td><input name="num_paiement" type="text" value="'.$paymentnum.'"></td></tr>';
+		// Bank check number
+		print '<tr><td>'.$langs->trans('Numero');
+		print ' <em>('.$langs->trans("ChequeOrTransferNumber").')</em>';
+		print '</td>';
+		print '<td><input name="num_paiement" type="text" value="'.$paymentnum.'"></td></tr>';
 
-        // Check transmitter
-        print '<tr><td class="'.(GETPOST('paiementcode') == 'CHQ' ? 'fieldrequired ' : '').'fieldrequireddyn">'.$langs->trans('CheckTransmitter');
-        print ' <em>('.$langs->trans("ChequeMaker").')</em>';
-        print '</td>';
-        print '<td><input id="fieldchqemetteur" name="chqemetteur" size="30" type="text" value="'.GETPOST('chqemetteur', 'alphanohtml').'"></td></tr>';
+		// Check transmitter
+		print '<tr><td class="'.(GETPOST('paiementcode') == 'CHQ' ? 'fieldrequired ' : '').'fieldrequireddyn">'.$langs->trans('CheckTransmitter');
+		print ' <em>('.$langs->trans("ChequeMaker").')</em>';
+		print '</td>';
+		print '<td><input id="fieldchqemetteur" name="chqemetteur" size="30" type="text" value="'.GETPOST('chqemetteur', 'alphanohtml').'"></td></tr>';
 
-        // Bank name
-        print '<tr><td>'.$langs->trans('Bank');
-        print ' <em>('.$langs->trans("ChequeBank").')</em>';
-        print '</td>';
-        print '<td><input name="chqbank" size="30" type="text" value="'.GETPOST('chqbank', 'alphanohtml').'"></td></tr>';
+		// Bank name
+		print '<tr><td>'.$langs->trans('Bank');
+		print ' <em>('.$langs->trans("ChequeBank").')</em>';
+		print '</td>';
+		print '<td><input name="chqbank" size="30" type="text" value="'.GETPOST('chqbank', 'alphanohtml').'"></td></tr>';
 
 		// Comments
 		print '<tr><td>'.$langs->trans('Comments').'</td>';
 		print '<td class="tdtop">';
 		print '<textarea name="comment" wrap="soft" class="quatrevingtpercent" rows="'.ROWS_3.'">'.GETPOST('comment', 'restricthtml').'</textarea></td></tr>';
 
-        print '</table>';
+		print '</table>';
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 
-        /*
+		/*
          * List of unpaid invoices
          */
 
-        $sql = 'SELECT f.rowid as facid, f.ref, f.total_ttc, f.multicurrency_code, f.multicurrency_total_ttc, f.type,';
-        $sql .= ' f.datef as df, f.fk_soc as socid, f.date_lim_reglement as dlr';
-        $sql .= ' FROM '.MAIN_DB_PREFIX.'facture as f';
+		$sql = 'SELECT f.rowid as facid, f.ref, f.total_ttc, f.multicurrency_code, f.multicurrency_total_ttc, f.type,';
+		$sql .= ' f.datef as df, f.fk_soc as socid, f.date_lim_reglement as dlr';
+		$sql .= ' FROM '.MAIN_DB_PREFIX.'facture as f';
 		$sql .= ' WHERE f.entity IN ('.getEntity('facture').')';
-        $sql .= ' AND (f.fk_soc = '.$facture->socid;
+		$sql .= ' AND (f.fk_soc = '.$facture->socid;
 		// Can pay invoices of all child of parent company
 		if (!empty($conf->global->FACTURE_PAYMENTS_ON_DIFFERENT_THIRDPARTIES_BILLS) && !empty($facture->thirdparty->parent)) {
 			$sql .= ' OR f.fk_soc IN (SELECT rowid FROM '.MAIN_DB_PREFIX.'societe WHERE parent = '.$facture->thirdparty->parent.')';
@@ -548,23 +548,23 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 		if (!empty($conf->global->FACTURE_PAYMENTS_ON_SUBSIDIARY_COMPANIES)) {
 			$sql .= ' OR f.fk_soc IN (SELECT rowid FROM '.MAIN_DB_PREFIX.'societe WHERE parent = '.$facture->thirdparty->id.')';
 		}
-        $sql .= ') AND f.paye = 0';
-        $sql .= ' AND f.fk_statut = 1'; // Statut=0 => not validated, Statut=2 => canceled
-        if ($facture->type != Facture::TYPE_CREDIT_NOTE)
-        {
-            $sql .= ' AND type IN (0,1,3,5)'; // Standard invoice, replacement, deposit, situation
-        } else {
-            $sql .= ' AND type = 2'; // If paying back a credit note, we show all credit notes
-        }
-        // Sort invoices by date and serial number: the older one comes first
-        $sql .= ' ORDER BY f.datef ASC, f.ref ASC';
+		$sql .= ') AND f.paye = 0';
+		$sql .= ' AND f.fk_statut = 1'; // Statut=0 => not validated, Statut=2 => canceled
+		if ($facture->type != Facture::TYPE_CREDIT_NOTE)
+		{
+			$sql .= ' AND type IN (0,1,3,5)'; // Standard invoice, replacement, deposit, situation
+		} else {
+			$sql .= ' AND type = 2'; // If paying back a credit note, we show all credit notes
+		}
+		// Sort invoices by date and serial number: the older one comes first
+		$sql .= ' ORDER BY f.datef ASC, f.ref ASC';
 
-        $resql = $db->query($sql);
-        if ($resql)
-        {
-            $num = $db->num_rows($resql);
-            if ($num > 0)
-            {
+		$resql = $db->query($sql);
+		if ($resql)
+		{
+			$num = $db->num_rows($resql);
+			if ($num > 0)
+			{
 				$arraytitle = $langs->trans('Invoice');
 				if ($facture->type == 2) $arraytitle = $langs->trans("CreditNotes");
 				$alreadypayedlabel = $langs->trans('Received');
@@ -574,55 +574,55 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 				$multicurrencyremaindertopay = $langs->trans('MulticurrencyRemainderToTake');
 				if ($facture->type == 2) { $remaindertopay = $langs->trans("RemainderToPayBack"); $multicurrencyremaindertopay = $langs->trans("MulticurrencyRemainderToPayBack"); }
 
-                $i = 0;
-                //print '<tr><td colspan="3">';
-                print '<br>';
-                print '<table class="noborder centpercent">';
+				$i = 0;
+				//print '<tr><td colspan="3">';
+				print '<br>';
+				print '<table class="noborder centpercent">';
 
-                print '<tr class="liste_titre">';
-                print '<td>'.$arraytitle.'</td>';
-                print '<td class="center">'.$langs->trans('Date').'</td>';
-                print '<td class="center">'.$langs->trans('DateMaxPayment').'</td>';
-                if (!empty($conf->multicurrency->enabled)) {
-                	print '<td>'.$langs->trans('Currency').'</td>';
-                	print '<td class="right">'.$langs->trans('MulticurrencyAmountTTC').'</td>';
-                	print '<td class="right">'.$multicurrencyalreadypayedlabel.'</td>';
-                	print '<td class="right">'.$multicurrencyremaindertopay.'</td>';
-                	print '<td class="right">'.$langs->trans('MulticurrencyPaymentAmount').'</td>';
-                }
-                print '<td class="right">'.$langs->trans('AmountTTC').'</td>';
-                print '<td class="right">'.$alreadypayedlabel.'</td>';
-                print '<td class="right">'.$remaindertopay.'</td>';
-                print '<td class="right">'.$langs->trans('PaymentAmount').'</td>';
+				print '<tr class="liste_titre">';
+				print '<td>'.$arraytitle.'</td>';
+				print '<td class="center">'.$langs->trans('Date').'</td>';
+				print '<td class="center">'.$langs->trans('DateMaxPayment').'</td>';
+				if (!empty($conf->multicurrency->enabled)) {
+					print '<td>'.$langs->trans('Currency').'</td>';
+					print '<td class="right">'.$langs->trans('MulticurrencyAmountTTC').'</td>';
+					print '<td class="right">'.$multicurrencyalreadypayedlabel.'</td>';
+					print '<td class="right">'.$multicurrencyremaindertopay.'</td>';
+					print '<td class="right">'.$langs->trans('MulticurrencyPaymentAmount').'</td>';
+				}
+				print '<td class="right">'.$langs->trans('AmountTTC').'</td>';
+				print '<td class="right">'.$alreadypayedlabel.'</td>';
+				print '<td class="right">'.$remaindertopay.'</td>';
+				print '<td class="right">'.$langs->trans('PaymentAmount').'</td>';
 
-                $parameters = array();
-                $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $facture, $action); // Note that $action and $object may have been modified by hook
+				$parameters = array();
+				$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $facture, $action); // Note that $action and $object may have been modified by hook
 
-                print '<td align="right">&nbsp;</td>';
-                print "</tr>\n";
+				print '<td align="right">&nbsp;</td>';
+				print "</tr>\n";
 
-                $total = 0;
-                $totalrecu = 0;
-                $totalrecucreditnote = 0;
-                $totalrecudeposits = 0;
+				$total = 0;
+				$totalrecu = 0;
+				$totalrecucreditnote = 0;
+				$totalrecudeposits = 0;
 
-                while ($i < $num)
-                {
-                    $objp = $db->fetch_object($resql);
+				while ($i < $num)
+				{
+					$objp = $db->fetch_object($resql);
 
-                    $sign = 1;
-                    if ($facture->type == Facture::TYPE_CREDIT_NOTE) $sign = -1;
+					$sign = 1;
+					if ($facture->type == Facture::TYPE_CREDIT_NOTE) $sign = -1;
 
 					$soc = new Societe($db);
 					$soc->fetch($objp->socid);
 
-                    $invoice = new Facture($db);
-                    $invoice->fetch($objp->facid);
-                    $paiement = $invoice->getSommePaiement();
-                    $creditnotes = $invoice->getSumCreditNotesUsed();
-                    $deposits = $invoice->getSumDepositsUsed();
-                    $alreadypayed = price2num($paiement + $creditnotes + $deposits, 'MT');
-                    $remaintopay = price2num($invoice->total_ttc - $paiement - $creditnotes - $deposits, 'MT');
+					$invoice = new Facture($db);
+					$invoice->fetch($objp->facid);
+					$paiement = $invoice->getSommePaiement();
+					$creditnotes = $invoice->getSumCreditNotesUsed();
+					$deposits = $invoice->getSumDepositsUsed();
+					$alreadypayed = price2num($paiement + $creditnotes + $deposits, 'MT');
+					$remaintopay = price2num($invoice->total_ttc - $paiement - $creditnotes - $deposits, 'MT');
 
 					// Multicurrency Price
 					if (!empty($conf->multicurrency->enabled)) {
@@ -630,209 +630,209 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 						$multicurrency_creditnotes = $invoice->getSumCreditNotesUsed(1);
 						$multicurrency_deposits = $invoice->getSumDepositsUsed(1);
 						$multicurrency_alreadypayed = price2num($multicurrency_payment + $multicurrency_creditnotes + $multicurrency_deposits, 'MT');
-	                    $multicurrency_remaintopay = price2num($invoice->multicurrency_total_ttc - $multicurrency_payment - $multicurrency_creditnotes - $multicurrency_deposits, 'MT');
+						$multicurrency_remaintopay = price2num($invoice->multicurrency_total_ttc - $multicurrency_payment - $multicurrency_creditnotes - $multicurrency_deposits, 'MT');
 					}
 
 
 					print '<tr class="oddeven'.(($invoice->id == $facid) ? ' highlight' : '').'">';
 
 					print '<td class="nowraponall">';
-                    print $invoice->getNomUrl(1, '');
-                    if ($objp->socid != $facture->thirdparty->id) print ' - '.$soc->getNomUrl(1).' ';
-                    print "</td>\n";
+					print $invoice->getNomUrl(1, '');
+					if ($objp->socid != $facture->thirdparty->id) print ' - '.$soc->getNomUrl(1).' ';
+					print "</td>\n";
 
-                    // Date
-                   	print '<td class="center">'.dol_print_date($db->jdate($objp->df), 'day')."</td>\n";
+					// Date
+				   	print '<td class="center">'.dol_print_date($db->jdate($objp->df), 'day')."</td>\n";
 
-                    // Due date
-                    if ($objp->dlr > 0)
-                    {
-                        print '<td class="nowraponall center">';
-                        print dol_print_date($db->jdate($objp->dlr), 'day');
+					// Due date
+					if ($objp->dlr > 0)
+					{
+						print '<td class="nowraponall center">';
+						print dol_print_date($db->jdate($objp->dlr), 'day');
 
-                        if ($invoice->hasDelay())
-                        {
-                            print img_warning($langs->trans('Late'));
-                        }
+						if ($invoice->hasDelay())
+						{
+							print img_warning($langs->trans('Late'));
+						}
 
-                        print '</td>';
-                    } else {
-                        print '<td align="center"></td>';
-                    }
+						print '</td>';
+					} else {
+						print '<td align="center"></td>';
+					}
 
-                    // Currency
-                    if (!empty($conf->multicurrency->enabled)) print '<td class="center">'.$objp->multicurrency_code."</td>\n";
+					// Currency
+					if (!empty($conf->multicurrency->enabled)) print '<td class="center">'.$objp->multicurrency_code."</td>\n";
 
 					// Multicurrency Price
 					if (!empty($conf->multicurrency->enabled))
 					{
-					    print '<td class="right">';
-					    if ($objp->multicurrency_code && $objp->multicurrency_code != $conf->currency) print price($sign * $objp->multicurrency_total_ttc);
-					    print '</td>';
+						print '<td class="right">';
+						if ($objp->multicurrency_code && $objp->multicurrency_code != $conf->currency) print price($sign * $objp->multicurrency_total_ttc);
+						print '</td>';
 
-                    	// Multicurrency Price
+						// Multicurrency Price
 						print '<td class="right">';
 						if ($objp->multicurrency_code && $objp->multicurrency_code != $conf->currency)
 						{
-						    print price($sign * $multicurrency_payment);
-    		                if ($multicurrency_creditnotes) print '+'.price($multicurrency_creditnotes);
-    		                if ($multicurrency_deposits) print '+'.price($multicurrency_deposits);
+							print price($sign * $multicurrency_payment);
+							if ($multicurrency_creditnotes) print '+'.price($multicurrency_creditnotes);
+							if ($multicurrency_deposits) print '+'.price($multicurrency_deposits);
 						}
-		                print '</td>';
+						print '</td>';
 
-    					// Multicurrency remain to pay
-    				    print '<td class="right">';
-    				    if ($objp->multicurrency_code && $objp->multicurrency_code != $conf->currency) print price($sign * $multicurrency_remaintopay);
-    				    print '</td>';
+						// Multicurrency remain to pay
+						print '<td class="right">';
+						if ($objp->multicurrency_code && $objp->multicurrency_code != $conf->currency) print price($sign * $multicurrency_remaintopay);
+						print '</td>';
 
-    				    print '<td class="right nowraponall">';
+						print '<td class="right nowraponall">';
 
-    				    // Add remind multicurrency amount
-    				    $namef = 'multicurrency_amount_'.$objp->facid;
-    				    $nameRemain = 'multicurrency_remain_'.$objp->facid;
+						// Add remind multicurrency amount
+						$namef = 'multicurrency_amount_'.$objp->facid;
+						$nameRemain = 'multicurrency_remain_'.$objp->facid;
 
-    				    if ($objp->multicurrency_code && $objp->multicurrency_code != $conf->currency)
-    				    {
-    				    	if ($action != 'add_paiement')
-    				    	{
-    				    		if (!empty($conf->use_javascript_ajax))
-    				    			print img_picto("Auto fill", 'rightarrow', "class='AutoFillAmout' data-rowname='".$namef."' data-value='".($sign * $multicurrency_remaintopay)."'");
-   				    			print '<input type="text" class="maxwidth75 multicurrency_amount" name="'.$namef.'" value="'.$_POST[$namef].'">';
-   				    			print '<input type="hidden" class="multicurrency_remain" name="'.$nameRemain.'" value="'.$multicurrency_remaintopay.'">';
-    				    	} else {
-    				    		print '<input type="text" class="maxwidth75" name="'.$namef.'_disabled" value="'.$_POST[$namef].'" disabled>';
-    				    		print '<input type="hidden" name="'.$namef.'" value="'.$_POST[$namef].'">';
-    				    	}
-    				    }
-    				    print "</td>";
+						if ($objp->multicurrency_code && $objp->multicurrency_code != $conf->currency)
+						{
+							if ($action != 'add_paiement')
+							{
+								if (!empty($conf->use_javascript_ajax))
+									print img_picto("Auto fill", 'rightarrow', "class='AutoFillAmout' data-rowname='".$namef."' data-value='".($sign * $multicurrency_remaintopay)."'");
+   								print '<input type="text" class="maxwidth75 multicurrency_amount" name="'.$namef.'" value="'.$_POST[$namef].'">';
+   								print '<input type="hidden" class="multicurrency_remain" name="'.$nameRemain.'" value="'.$multicurrency_remaintopay.'">';
+							} else {
+								print '<input type="text" class="maxwidth75" name="'.$namef.'_disabled" value="'.$_POST[$namef].'" disabled>';
+								print '<input type="hidden" name="'.$namef.'" value="'.$_POST[$namef].'">';
+							}
+						}
+						print "</td>";
 					}
 
 					// Price
-                    print '<td class="right">'.price($sign * $objp->total_ttc).'</td>';
+					print '<td class="right">'.price($sign * $objp->total_ttc).'</td>';
 
-                    // Received or paid back
-                    print '<td class="right">'.price($sign * $paiement);
-                    if ($creditnotes) print '+'.price($creditnotes);
-                    if ($deposits) print '+'.price($deposits);
-                    print '</td>';
+					// Received or paid back
+					print '<td class="right">'.price($sign * $paiement);
+					if ($creditnotes) print '+'.price($creditnotes);
+					if ($deposits) print '+'.price($deposits);
+					print '</td>';
 
-                    // Remain to take or to pay back
-                    print '<td class="right">'.price($sign * $remaintopay).'</td>';
-                    //$test= price(price2num($objp->total_ttc - $paiement - $creditnotes - $deposits));
+					// Remain to take or to pay back
+					print '<td class="right">'.price($sign * $remaintopay).'</td>';
+					//$test= price(price2num($objp->total_ttc - $paiement - $creditnotes - $deposits));
 
-                    // Amount
-                    print '<td class="right nowraponall">';
+					// Amount
+					print '<td class="right nowraponall">';
 
-                    // Add remind amount
-                    $namef = 'amount_'.$objp->facid;
-                    $nameRemain = 'remain_'.$objp->facid;
+					// Add remind amount
+					$namef = 'amount_'.$objp->facid;
+					$nameRemain = 'remain_'.$objp->facid;
 
-                    if ($action != 'add_paiement')
-                    {
-                        if (!empty($conf->use_javascript_ajax))
+					if ($action != 'add_paiement')
+					{
+						if (!empty($conf->use_javascript_ajax))
 							print img_picto("Auto fill", 'rightarrow', "class='AutoFillAmout' data-rowname='".$namef."' data-value='".($sign * $remaintopay)."'");
-                        print '<input type="text" class="maxwidth75 amount" name="'.$namef.'" value="'.dol_escape_htmltag(GETPOST($namef)).'">';
-                        print '<input type="hidden" class="remain" name="'.$nameRemain.'" value="'.$remaintopay.'">';
-                    } else {
-                        print '<input type="text" class="maxwidth75" name="'.$namef.'_disabled" value="'.dol_escape_htmltag(GETPOST($namef)).'" disabled>';
-                        print '<input type="hidden" name="'.$namef.'" value="'.dol_escape_htmltag(GETPOST($namef)).'">';
-                    }
-                    print "</td>";
+						print '<input type="text" class="maxwidth75 amount" name="'.$namef.'" value="'.dol_escape_htmltag(GETPOST($namef)).'">';
+						print '<input type="hidden" class="remain" name="'.$nameRemain.'" value="'.$remaintopay.'">';
+					} else {
+						print '<input type="text" class="maxwidth75" name="'.$namef.'_disabled" value="'.dol_escape_htmltag(GETPOST($namef)).'" disabled>';
+						print '<input type="hidden" name="'.$namef.'" value="'.dol_escape_htmltag(GETPOST($namef)).'">';
+					}
+					print "</td>";
 
-                    $parameters = array();
-                    $reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $objp, $action); // Note that $action and $object may have been modified by hook
+					$parameters = array();
+					$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $objp, $action); // Note that $action and $object may have been modified by hook
 
-                    // Warning
-                    print '<td align="center" width="16">';
-                    //print "xx".$amounts[$invoice->id]."-".$amountsresttopay[$invoice->id]."<br>";
-                    if ($amounts[$invoice->id] && (abs($amounts[$invoice->id]) > abs($amountsresttopay[$invoice->id]))
-                    	|| $multicurrency_amounts[$invoice->id] && (abs($multicurrency_amounts[$invoice->id]) > abs($multicurrency_amountsresttopay[$invoice->id])))
-                    {
-                        print ' '.img_warning($langs->trans("PaymentHigherThanReminderToPay"));
-                    }
-                    print '</td>';
+					// Warning
+					print '<td align="center" width="16">';
+					//print "xx".$amounts[$invoice->id]."-".$amountsresttopay[$invoice->id]."<br>";
+					if ($amounts[$invoice->id] && (abs($amounts[$invoice->id]) > abs($amountsresttopay[$invoice->id]))
+						|| $multicurrency_amounts[$invoice->id] && (abs($multicurrency_amounts[$invoice->id]) > abs($multicurrency_amountsresttopay[$invoice->id])))
+					{
+						print ' '.img_warning($langs->trans("PaymentHigherThanReminderToPay"));
+					}
+					print '</td>';
 
-                    print "</tr>\n";
+					print "</tr>\n";
 
-                    $total += $objp->total;
-                    $total_ttc += $objp->total_ttc;
-                    $totalrecu += $paiement;
-                    $totalrecucreditnote += $creditnotes;
-                    $totalrecudeposits += $deposits;
-                    $i++;
-                }
+					$total += $objp->total;
+					$total_ttc += $objp->total_ttc;
+					$totalrecu += $paiement;
+					$totalrecucreditnote += $creditnotes;
+					$totalrecudeposits += $deposits;
+					$i++;
+				}
 
-                if ($i > 1)
-                {
-                    // Print total
-                    print '<tr class="liste_total">';
-                    print '<td colspan="3" class="left">'.$langs->trans('TotalTTC').'</td>';
-                    if (!empty($conf->multicurrency->enabled)) {
-                    	print '<td></td>';
-                    	print '<td></td>';
-                    	print '<td></td>';
-                    	print '<td></td>';
-                    	print '<td class="right" id="multicurrency_result" style="font-weight: bold;"></td>';
-                    }
+				if ($i > 1)
+				{
+					// Print total
+					print '<tr class="liste_total">';
+					print '<td colspan="3" class="left">'.$langs->trans('TotalTTC').'</td>';
+					if (!empty($conf->multicurrency->enabled)) {
+						print '<td></td>';
+						print '<td></td>';
+						print '<td></td>';
+						print '<td></td>';
+						print '<td class="right" id="multicurrency_result" style="font-weight: bold;"></td>';
+					}
 					print '<td class="right"><b>'.price($sign * $total_ttc).'</b></td>';
-                    print '<td class="right"><b>'.price($sign * $totalrecu);
-                    if ($totalrecucreditnote) print '+'.price($totalrecucreditnote);
-                    if ($totalrecudeposits) print '+'.price($totalrecudeposits);
-                    print '</b></td>';
-                    print '<td class="right"><b>'.price($sign * price2num($total_ttc - $totalrecu - $totalrecucreditnote - $totalrecudeposits, 'MT')).'</b></td>';
-                    print '<td class="right" id="result" style="font-weight: bold;"></td>'; // Autofilled
-                    print '<td align="center">&nbsp;</td>';
-                    print "</tr>\n";
-                }
-                print "</table>";
-                //print "</td></tr>\n";
-            }
-            $db->free($resql);
-        } else {
-            dol_print_error($db);
-        }
+					print '<td class="right"><b>'.price($sign * $totalrecu);
+					if ($totalrecucreditnote) print '+'.price($totalrecucreditnote);
+					if ($totalrecudeposits) print '+'.price($totalrecudeposits);
+					print '</b></td>';
+					print '<td class="right"><b>'.price($sign * price2num($total_ttc - $totalrecu - $totalrecucreditnote - $totalrecudeposits, 'MT')).'</b></td>';
+					print '<td class="right" id="result" style="font-weight: bold;"></td>'; // Autofilled
+					print '<td align="center">&nbsp;</td>';
+					print "</tr>\n";
+				}
+				print "</table>";
+				//print "</td></tr>\n";
+			}
+			$db->free($resql);
+		} else {
+			dol_print_error($db);
+		}
 
 
-        // Save button
-        if ($action != 'add_paiement')
-        {
-        	$checkboxlabel = $langs->trans("ClosePaidInvoicesAutomatically");
-        	if ($facture->type == Facture::TYPE_CREDIT_NOTE) $checkboxlabel = $langs->trans("ClosePaidCreditNotesAutomatically");
-        	$buttontitle = $langs->trans('ToMakePayment');
-        	if ($facture->type == Facture::TYPE_CREDIT_NOTE) $buttontitle = $langs->trans('ToMakePaymentBack');
+		// Save button
+		if ($action != 'add_paiement')
+		{
+			$checkboxlabel = $langs->trans("ClosePaidInvoicesAutomatically");
+			if ($facture->type == Facture::TYPE_CREDIT_NOTE) $checkboxlabel = $langs->trans("ClosePaidCreditNotesAutomatically");
+			$buttontitle = $langs->trans('ToMakePayment');
+			if ($facture->type == Facture::TYPE_CREDIT_NOTE) $buttontitle = $langs->trans('ToMakePaymentBack');
 
-        	print '<br><div class="center">';
-        	print '<input type="checkbox" checked name="closepaidinvoices"> '.$checkboxlabel;
-            /*if (! empty($conf->prelevement->enabled))
+			print '<br><div class="center">';
+			print '<input type="checkbox" checked name="closepaidinvoices"> '.$checkboxlabel;
+			/*if (! empty($conf->prelevement->enabled))
             {
                 $langs->load("withdrawals");
                 if (! empty($conf->global->WITHDRAW_DISABLE_AUTOCREATE_ONPAYMENTS)) print '<br>'.$langs->trans("IfInvoiceNeedOnWithdrawPaymentWontBeClosed");
             }*/
-            print '<br><input type="submit" class="button" value="'.dol_escape_htmltag($buttontitle).'"><br><br>';
-            print '</div>';
-        }
+			print '<br><input type="submit" class="button" value="'.dol_escape_htmltag($buttontitle).'"><br><br>';
+			print '</div>';
+		}
 
-        // Form to confirm payment
-        if ($action == 'add_paiement')
-        {
-            $preselectedchoice = $addwarning ? 'no' : 'yes';
+		// Form to confirm payment
+		if ($action == 'add_paiement')
+		{
+			$preselectedchoice = $addwarning ? 'no' : 'yes';
 
-            print '<br>';
-            if (!empty($totalpayment)) $text = $langs->trans('ConfirmCustomerPayment', $totalpayment, $langs->trans("Currency".$conf->currency));
+			print '<br>';
+			if (!empty($totalpayment)) $text = $langs->trans('ConfirmCustomerPayment', $totalpayment, $langs->trans("Currency".$conf->currency));
 			if (!empty($multicurrency_totalpayment))
 			{
 				$text .= '<br>'.$langs->trans('ConfirmCustomerPayment', $multicurrency_totalpayment, $langs->trans("paymentInInvoiceCurrency"));
 			}
-            if (GETPOST('closepaidinvoices'))
-            {
-                $text .= '<br>'.$langs->trans("AllCompletelyPayedInvoiceWillBeClosed");
-                print '<input type="hidden" name="closepaidinvoices" value="'.GETPOST('closepaidinvoices').'">';
-            }
-            print $form->formconfirm($_SERVER['PHP_SELF'].'?facid='.$facture->id.'&socid='.$facture->socid.'&type='.$facture->type, $langs->trans('ReceivedCustomersPayments'), $text, 'confirm_paiement', $formquestion, $preselectedchoice);
-        }
+			if (GETPOST('closepaidinvoices'))
+			{
+				$text .= '<br>'.$langs->trans("AllCompletelyPayedInvoiceWillBeClosed");
+				print '<input type="hidden" name="closepaidinvoices" value="'.GETPOST('closepaidinvoices').'">';
+			}
+			print $form->formconfirm($_SERVER['PHP_SELF'].'?facid='.$facture->id.'&socid='.$facture->socid.'&type='.$facture->type, $langs->trans('ReceivedCustomersPayments'), $text, 'confirm_paiement', $formquestion, $preselectedchoice);
+		}
 
-        print "</form>\n";
-    }
+		print "</form>\n";
+	}
 }
 
 
@@ -841,62 +841,62 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
  */
 if (!GETPOST('action', 'aZ09'))
 {
-    if (empty($page) || $page == -1) $page = 0;
-    $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-    $offset = $limit * $page;
+	if (empty($page) || $page == -1) $page = 0;
+	$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+	$offset = $limit * $page;
 
-    if (!$sortorder) $sortorder = 'DESC';
-    if (!$sortfield) $sortfield = 'p.datep';
+	if (!$sortorder) $sortorder = 'DESC';
+	if (!$sortfield) $sortfield = 'p.datep';
 
-    $sql = 'SELECT p.datep as dp, p.amount, f.total_ttc as fa_amount, f.ref';
-    $sql .= ', f.rowid as facid, c.libelle as paiement_type, p.num_paiement as num_payment';
-    $sql .= ' FROM '.MAIN_DB_PREFIX.'paiement as p LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as c ON p.fk_paiement = c.id';
-    $sql .= ', '.MAIN_DB_PREFIX.'facture as f';
-    $sql .= ' WHERE p.fk_facture = f.rowid';
-    $sql .= ' AND f.entity IN ('.getEntity('invoice').')';
-    if ($socid)
-    {
-        $sql .= ' AND f.fk_soc = '.$socid;
-    }
+	$sql = 'SELECT p.datep as dp, p.amount, f.total_ttc as fa_amount, f.ref';
+	$sql .= ', f.rowid as facid, c.libelle as paiement_type, p.num_paiement as num_payment';
+	$sql .= ' FROM '.MAIN_DB_PREFIX.'paiement as p LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as c ON p.fk_paiement = c.id';
+	$sql .= ', '.MAIN_DB_PREFIX.'facture as f';
+	$sql .= ' WHERE p.fk_facture = f.rowid';
+	$sql .= ' AND f.entity IN ('.getEntity('invoice').')';
+	if ($socid)
+	{
+		$sql .= ' AND f.fk_soc = '.$socid;
+	}
 
-    $sql .= ' ORDER BY '.$sortfield.' '.$sortorder;
-    $sql .= $db->plimit($limit + 1, $offset);
-    $resql = $db->query($sql);
+	$sql .= ' ORDER BY '.$sortfield.' '.$sortorder;
+	$sql .= $db->plimit($limit + 1, $offset);
+	$resql = $db->query($sql);
 
-    if ($resql)
-    {
-        $num = $db->num_rows($resql);
-        $i = 0;
+	if ($resql)
+	{
+		$num = $db->num_rows($resql);
+		$i = 0;
 
-        print_barre_liste($langs->trans('Payments'), $page, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', $num);
-        print '<table class="noborder centpercent">';
-        print '<tr class="liste_titre">';
-        print_liste_field_titre('Invoice', $_SERVER["PHP_SELF"], 'f.ref', '', '', '', $sortfield, $sortorder);
-        print_liste_field_titre('Date', $_SERVER["PHP_SELF"], 'p.datep', '', '', '', $sortfield, $sortorder);
-        print_liste_field_titre('Type', $_SERVER["PHP_SELF"], 'c.libelle', '', '', '', $sortfield, $sortorder);
-        print_liste_field_titre('Amount', $_SERVER["PHP_SELF"], 'p.amount', '', '', '', $sortfield, $sortorder, 'right ');
+		print_barre_liste($langs->trans('Payments'), $page, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', $num);
+		print '<table class="noborder centpercent">';
+		print '<tr class="liste_titre">';
+		print_liste_field_titre('Invoice', $_SERVER["PHP_SELF"], 'f.ref', '', '', '', $sortfield, $sortorder);
+		print_liste_field_titre('Date', $_SERVER["PHP_SELF"], 'p.datep', '', '', '', $sortfield, $sortorder);
+		print_liste_field_titre('Type', $_SERVER["PHP_SELF"], 'c.libelle', '', '', '', $sortfield, $sortorder);
+		print_liste_field_titre('Amount', $_SERVER["PHP_SELF"], 'p.amount', '', '', '', $sortfield, $sortorder, 'right ');
 		print_liste_field_titre('', $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'maxwidthsearch ');
-        print "</tr>\n";
+		print "</tr>\n";
 
-        while ($i < min($num, $limit))
-        {
-            $objp = $db->fetch_object($resql);
+		while ($i < min($num, $limit))
+		{
+			$objp = $db->fetch_object($resql);
 
-            print '<tr class="oddeven">';
-            print '<td><a href="'.DOL_URL_ROOT.'/compta/facture/card.php?facid='.$objp->facid.'">'.$objp->ref."</a></td>\n";
-            print '<td>'.dol_print_date($db->jdate($objp->dp))."</td>\n";
-            print '<td>'.$objp->paiement_type.' '.$objp->num_payment."</td>\n";
-            print '<td class="right">'.price($objp->amount).'</td>';
-            print '<td>&nbsp;</td>';
-            print '</tr>';
+			print '<tr class="oddeven">';
+			print '<td><a href="'.DOL_URL_ROOT.'/compta/facture/card.php?facid='.$objp->facid.'">'.$objp->ref."</a></td>\n";
+			print '<td>'.dol_print_date($db->jdate($objp->dp))."</td>\n";
+			print '<td>'.$objp->paiement_type.' '.$objp->num_payment."</td>\n";
+			print '<td class="right">'.price($objp->amount).'</td>';
+			print '<td>&nbsp;</td>';
+			print '</tr>';
 
-            $parameters = array();
-            $reshook = $hookmanager->executeHooks('printObjectLine', $parameters, $objp, $action); // Note that $action and $object may have been modified by hook
+			$parameters = array();
+			$reshook = $hookmanager->executeHooks('printObjectLine', $parameters, $objp, $action); // Note that $action and $object may have been modified by hook
 
-            $i++;
-        }
-        print '</table>';
-    }
+			$i++;
+		}
+		print '</table>';
+	}
 }
 
 llxFooter();
diff --git a/htdocs/compta/paiement/card.php b/htdocs/compta/paiement/card.php
index 9d0758b48bf..9d452ef52b3 100644
--- a/htdocs/compta/paiement/card.php
+++ b/htdocs/compta/paiement/card.php
@@ -57,18 +57,18 @@ $object = new Paiement($db);
 
 if ($action == 'setnote' && $user->rights->facture->paiement)
 {
-    $db->begin();
+	$db->begin();
 
-    $object->fetch($id);
-    $result = $object->update_note(GETPOST('note', 'restricthtml'));
-    if ($result > 0)
-    {
-        $db->commit();
-        $action = '';
-    } else {
-	    setEventMessages($object->error, $object->errors, 'errors');
-        $db->rollback();
-    }
+	$object->fetch($id);
+	$result = $object->update_note(GETPOST('note', 'restricthtml'));
+	if ($result > 0)
+	{
+		$db->commit();
+		$action = '';
+	} else {
+		setEventMessages($object->error, $object->errors, 'errors');
+		$db->rollback();
+	}
 }
 
 if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->facture->paiement)
@@ -79,20 +79,20 @@ if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->facture->
 	$result = $object->delete();
 	if ($result > 0)
 	{
-        $db->commit();
+		$db->commit();
 
-        if ($backtopage)
-        {
-        	header("Location: ".$backtopage);
-        	exit;
-        } else {
-        	header("Location: list.php");
-        	exit;
-        }
+		if ($backtopage)
+		{
+			header("Location: ".$backtopage);
+			exit;
+		} else {
+			header("Location: list.php");
+			exit;
+		}
 	} else {
-	    $langs->load("errors");
+		$langs->load("errors");
 		setEventMessages($object->error, $object->errors, 'errors');
-        $db->rollback();
+		$db->rollback();
 	}
 }
 
@@ -100,7 +100,7 @@ if ($action == 'confirm_validate' && $confirm == 'yes' && $user->rights->facture
 {
 	$db->begin();
 
-    $object->fetch($id);
+	$object->fetch($id);
 	if ($object->validate($user) > 0)
 	{
 		$db->commit();
@@ -126,7 +126,7 @@ if ($action == 'confirm_validate' && $confirm == 'yes' && $user->rights->facture
 		header('Location: '.$_SERVER['PHP_SELF'].'?id='.$object->id);
 		exit;
 	} else {
-	    $langs->load("errors");
+		$langs->load("errors");
 		setEventMessages($object->error, $object->errors, 'errors');
 		$db->rollback();
 	}
@@ -135,7 +135,7 @@ if ($action == 'confirm_validate' && $confirm == 'yes' && $user->rights->facture
 if ($action == 'setnum_paiement' && !empty($_POST['num_paiement']))
 {
 	$object->fetch($id);
-    $res = $object->update_num($_POST['num_paiement']);
+	$res = $object->update_num($_POST['num_paiement']);
 	if ($res === 0)
 	{
 		setEventMessages($langs->trans('PaymentNumberUpdateSucceeded'), null, 'mesgs');
@@ -299,7 +299,7 @@ print '</table>';
 
 print '</div>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 /*
@@ -332,9 +332,9 @@ if ($resql)
 	print '<td>'.$langs->trans('Company').'</td>';
 	if (!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_INVOICE_SHARING_ENABLED)) print '<td>'.$langs->trans('Entity').'</td>';
 	print '<td class="right">'.$langs->trans('ExpectedToPay').'</td>';
-    print '<td class="right">'.$langs->trans('PayedByThisPayment').'</td>';
-    print '<td class="right">'.$langs->trans('RemainderToPay').'</td>';
-    print '<td class="right">'.$langs->trans('Status').'</td>';
+	print '<td class="right">'.$langs->trans('PayedByThisPayment').'</td>';
+	print '<td class="right">'.$langs->trans('RemainderToPay').'</td>';
+	print '<td class="right">'.$langs->trans('Status').'</td>';
 	print "</tr>\n";
 
 	if ($num > 0)
@@ -356,7 +356,7 @@ if ($resql)
 
 			print '<tr class="oddeven">';
 
-            // Invoice
+			// Invoice
 			print '<td>';
 			print $invoice->getNomUrl(1);
 			print "</td>\n";
@@ -376,11 +376,11 @@ if ($resql)
 			// Expected to pay
 			print '<td class="right">'.price($objp->total_ttc).'</td>';
 
-            // Amount payed
-            print '<td class="right">'.price($objp->amount).'</td>';
+			// Amount payed
+			print '<td class="right">'.price($objp->amount).'</td>';
 
-            // Remain to pay
-            print '<td class="right">'.price($remaintopay).'</td>';
+			// Remain to pay
+			print '<td class="right">'.price($remaintopay).'</td>';
 
 			// Status
 			print '<td class="right">'.$invoice->getLibStatut(5, $alreadypayed).'</td>';
diff --git a/htdocs/compta/paiement/cheque/card.php b/htdocs/compta/paiement/cheque/card.php
index 21b7ac83f58..4b93cb4cca3 100644
--- a/htdocs/compta/paiement/cheque/card.php
+++ b/htdocs/compta/paiement/cheque/card.php
@@ -68,37 +68,37 @@ $object = new RemiseCheque($db);
 
 if ($action == 'setdate' && $user->rights->banque->cheque)
 {
-    $result = $object->fetch(GETPOST('id', 'int'));
-    if ($result > 0)
-    {
-        //print "x ".$_POST['liv_month'].", ".$_POST['liv_day'].", ".$_POST['liv_year'];
-        $date = dol_mktime(0, 0, 0, $_POST['datecreate_month'], $_POST['datecreate_day'], $_POST['datecreate_year']);
+	$result = $object->fetch(GETPOST('id', 'int'));
+	if ($result > 0)
+	{
+		//print "x ".$_POST['liv_month'].", ".$_POST['liv_day'].", ".$_POST['liv_year'];
+		$date = dol_mktime(0, 0, 0, $_POST['datecreate_month'], $_POST['datecreate_day'], $_POST['datecreate_year']);
 
-        $result = $object->set_date($user, $date);
-        if ($result < 0)
-        {
+		$result = $object->set_date($user, $date);
+		if ($result < 0)
+		{
 			setEventMessages($object->error, $object->errors, 'errors');
-        }
-    } else {
-        setEventMessages($object->error, $object->errors, 'errors');
-    }
+		}
+	} else {
+		setEventMessages($object->error, $object->errors, 'errors');
+	}
 }
 
 if ($action == 'setrefext' && $user->rights->banque->cheque)
 {
-    $result = $object->fetch(GETPOST('id', 'int'));
-    if ($result > 0)
-    {
-        $ref_ext = GETPOST('ref_ext');
+	$result = $object->fetch(GETPOST('id', 'int'));
+	if ($result > 0)
+	{
+		$ref_ext = GETPOST('ref_ext');
 
-        $result = $object->setValueFrom('ref_ext', $ref_ext, '', null, 'text', '', $user, 'CHECKDEPOSIT_MODIFY');
-        if ($result < 0)
-        {
-            setEventMessages($object->error, $object->errors, 'errors');
-        }
-    } else {
-        setEventMessages($object->error, $object->errors, 'errors');
-    }
+		$result = $object->setValueFrom('ref_ext', $ref_ext, '', null, 'text', '', $user, 'CHECKDEPOSIT_MODIFY');
+		if ($result < 0)
+		{
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
+	} else {
+		setEventMessages($object->error, $object->errors, 'errors');
+	}
 }
 
 if ($action == 'setref' && $user->rights->banque->cheque)
@@ -125,30 +125,30 @@ if ($action == 'create' && $_POST["accountid"] > 0 && $user->rights->banque->che
 		$result = $object->create($user, $_POST["accountid"], 0, $_POST['toRemise']);
 		if ($result > 0)
 		{
-	        if ($object->statut == 1)     // If statut is validated, we build doc
-	        {
-	            $object->fetch($object->id); // To force to reload all properties in correct property name
-	    	    // Define output language
-	    	    $outputlangs = $langs;
-	            $newlang = '';
-	            if ($conf->global->MAIN_MULTILANGS && empty($newlang) && !empty($_REQUEST['lang_id'])) $newlang = $_REQUEST['lang_id'];
-	            //if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
-	            if (!empty($newlang))
-	            {
-	                $outputlangs = new Translate("", $conf);
-	                $outputlangs->setDefaultLang($newlang);
-	            }
-	            $result = $object->generatePdf($_POST["model"], $outputlangs);
-	        }
+			if ($object->statut == 1)     // If statut is validated, we build doc
+			{
+				$object->fetch($object->id); // To force to reload all properties in correct property name
+				// Define output language
+				$outputlangs = $langs;
+				$newlang = '';
+				if ($conf->global->MAIN_MULTILANGS && empty($newlang) && !empty($_REQUEST['lang_id'])) $newlang = $_REQUEST['lang_id'];
+				//if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
+				if (!empty($newlang))
+				{
+					$outputlangs = new Translate("", $conf);
+					$outputlangs->setDefaultLang($newlang);
+				}
+				$result = $object->generatePdf($_POST["model"], $outputlangs);
+			}
 
-       		header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id);
-        	exit;
+	   		header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id);
+			exit;
 		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	} else {
 		setEventMessages($langs->trans("ErrorSelectAtLeastOne"), null, 'mesgs');
-	    $action = 'new';
+		$action = 'new';
 	}
 }
 
@@ -184,19 +184,19 @@ if ($action == 'confirm_validate' && $confirm == 'yes' && $user->rights->banque-
 	$result = $object->validate($user);
 	if ($result >= 0)
 	{
-        // Define output language
-        $outputlangs = $langs;
-        $newlang = '';
-        if ($conf->global->MAIN_MULTILANGS && empty($newlang) && !empty($_REQUEST['lang_id'])) $newlang = $_REQUEST['lang_id'];
-        //if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
-        if (!empty($newlang))
-        {
-            $outputlangs = new Translate("", $conf);
-            $outputlangs->setDefaultLang($newlang);
-        }
-        $result = $object->generatePdf(GETPOST('model'), $outputlangs);
+		// Define output language
+		$outputlangs = $langs;
+		$newlang = '';
+		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && !empty($_REQUEST['lang_id'])) $newlang = $_REQUEST['lang_id'];
+		//if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
+		if (!empty($newlang))
+		{
+			$outputlangs = new Translate("", $conf);
+			$outputlangs->setDefaultLang($newlang);
+		}
+		$result = $object->generatePdf(GETPOST('model'), $outputlangs);
 
-        header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id);
+		header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id);
 		exit;
 	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
@@ -229,15 +229,15 @@ if ($action == 'builddoc' && $user->rights->banque->cheque)
 	// Save last template used to generate document
 	//if (GETPOST('model')) $object->setDocModel($user, GETPOST('model','alpha'));
 
-    $outputlangs = $langs;
-    $newlang = '';
-    if ($conf->global->MAIN_MULTILANGS && empty($newlang) && !empty($_REQUEST['lang_id'])) $newlang = $_REQUEST['lang_id'];
-    //if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
-    if (!empty($newlang))
-    {
-        $outputlangs = new Translate("", $conf);
-        $outputlangs->setDefaultLang($newlang);
-    }
+	$outputlangs = $langs;
+	$newlang = '';
+	if ($conf->global->MAIN_MULTILANGS && empty($newlang) && !empty($_REQUEST['lang_id'])) $newlang = $_REQUEST['lang_id'];
+	//if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
+	if (!empty($newlang))
+	{
+		$outputlangs = new Translate("", $conf);
+		$outputlangs->setDefaultLang($newlang);
+	}
 	$result = $object->generatePdf($_POST["model"], $outputlangs);
 	if ($result <= 0)
 	{
@@ -270,8 +270,8 @@ elseif ($action == 'remove_file' && $user->rights->banque->cheque)
 
 if (GETPOST('removefilter'))
 {
-    $filterdate = '';
-    $filteraccountid = 0;
+	$filterdate = '';
+	$filteraccountid = 0;
 }
 
 $title = $langs->trans("Cheques")." - ".$langs->trans("Card");
@@ -365,22 +365,22 @@ if ($action == 'new')
 	print '<tr><td class="titlefieldcreate">'.$langs->trans("DateChequeReceived").'</td><td>';
 	print $form->selectDate($filterdate, 'fd', 0, 0, 1, '', 1, 1);
 	print '</td></tr>';
-    print '<tr><td>'.$langs->trans("BankAccount").'</td><td>';
-    $form->select_comptes($filteraccountid, 'accountid', 0, 'courant <> 2', 1);
-    print '</td></tr>';
+	print '<tr><td>'.$langs->trans("BankAccount").'</td><td>';
+	$form->select_comptes($filteraccountid, 'accountid', 0, 'courant <> 2', 1);
+	print '</td></tr>';
 	print '</table>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
-    print '<div class="center">';
+	print '<div class="center">';
 	print '<input type="submit" class="button" name="filter" value="'.dol_escape_htmltag($langs->trans("ToFilter")).'">';
-    if ($filterdate || $filteraccountid > 0)
-    {
-    	print ' &nbsp; ';
-    	print '<input type="submit" class="button" name="removefilter" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
-    }
+	if ($filterdate || $filteraccountid > 0)
+	{
+		print ' &nbsp; ';
+		print '<input type="submit" class="button" name="removefilter" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
+	}
 	print '</div>';
-    print '</form>';
+	print '</form>';
 	print '<br>';
 
 	$sql = "SELECT ba.rowid as bid, b.datec as datec, b.dateo as date, b.rowid as transactionid, ";
@@ -394,7 +394,7 @@ if ($action == 'new')
 	$sql .= " AND b.fk_bordereau = 0";
 	$sql .= " AND b.amount > 0";
 	if ($filterdate)          $sql .= " AND b.dateo = '".$db->idate($filterdate)."'";
-    if ($filteraccountid > 0) $sql .= " AND ba.rowid = ".((int) $filteraccountid);
+	if ($filteraccountid > 0) $sql .= " AND ba.rowid = ".((int) $filteraccountid);
 	$sql .= $db->order("b.dateo,b.rowid", "ASC");
 
 	$resql = $db->query($sql);
@@ -423,7 +423,7 @@ if ($action == 'new')
 
 	foreach ($accounts as $bid => $account_label)
 	{
-        print '
+		print '
         <script language="javascript" type="text/javascript">
         jQuery(document).ready(function()
         {
@@ -446,8 +446,8 @@ if ($action == 'new')
 		print '<input type="hidden" name="accountid" value="'.$bid.'">';
 
 		$moreforfilter = '';
-        print '<div class="div-table-responsive-no-min">';
-        print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
+		print '<div class="div-table-responsive-no-min">';
+		print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 		print '<tr class="liste_titre">';
 		print '<td>'.$langs->trans("DateChequeReceived").'</td>'."\n";
@@ -511,7 +511,7 @@ if ($action == 'new')
 			}
 		}
 		print "</table>";
-        print '</div>';
+		print '</div>';
 
 		print '<div class="tabsAction">';
 		if ($user->rights->banque->cheque)
@@ -543,23 +543,23 @@ if ($action == 'new')
 
 	print '<tr><td class="titlefield">';
 
-    print '<table class="nobordernopadding" width="100%"><tr><td>';
-    print $langs->trans('Date');
-    print '</td>';
-    if ($action != 'editdate') print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editdate&amp;id='.$object->id.'">'.img_edit($langs->trans('SetDate'), 1).'</a></td>';
-    print '</tr></table>';
-    print '</td><td colspan="2">';
-    if ($action == 'editdate')
-    {
-        print '<form name="setdate" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
-        print '<input type="hidden" name="token" value="'.newToken().'">';
-        print '<input type="hidden" name="action" value="setdate">';
-        print $form->selectDate($object->date_bordereau, 'datecreate_', '', '', '', "setdate");
-        print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
-        print '</form>';
-    } else {
-        print $object->date_bordereau ? dol_print_date($object->date_bordereau, 'day') : '&nbsp;';
-    }
+	print '<table class="nobordernopadding" width="100%"><tr><td>';
+	print $langs->trans('Date');
+	print '</td>';
+	if ($action != 'editdate') print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editdate&amp;id='.$object->id.'">'.img_edit($langs->trans('SetDate'), 1).'</a></td>';
+	print '</tr></table>';
+	print '</td><td colspan="2">';
+	if ($action == 'editdate')
+	{
+		print '<form name="setdate" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
+		print '<input type="hidden" name="token" value="'.newToken().'">';
+		print '<input type="hidden" name="action" value="setdate">';
+		print $form->selectDate($object->date_bordereau, 'datecreate_', '', '', '', "setdate");
+		print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
+		print '</form>';
+	} else {
+		print $object->date_bordereau ? dol_print_date($object->date_bordereau, 'day') : '&nbsp;';
+	}
 
 	print '</td>';
 	print '</tr>';
@@ -631,7 +631,7 @@ if ($action == 'new')
 	{
 		$num = $db->num_rows($resql);
 
-	    print '<div class="div-table-responsive">';
+		print '<div class="div-table-responsive">';
 		print '<table class="noborder centpercent">';
 
 		$param = "&amp;id=".$object->id;
@@ -649,60 +649,60 @@ if ($action == 'new')
 		print "</tr>\n";
 
 		$i = 1;
-        if ($num > 0)
-        {
-    		while ($objp = $db->fetch_object($resql))
-    		{
-    			print '<tr class="oddeven">';
-    			print '<td class="center">'.$i.'</td>';
-    			print '<td class="center">'.dol_print_date($db->jdate($objp->date), 'day').'</td>'; // Operation date
-    			print '<td class="center">'.($objp->num_chq ? $objp->num_chq : '&nbsp;').'</td>';
-    			print '<td>'.dol_trunc($objp->emetteur, 24).'</td>';
-    			print '<td>'.dol_trunc($objp->banque, 24).'</td>';
-    			print '<td class="right">'.price($objp->amount).'</td>';
-    			// Link to payment
-    			print '<td class="center">';
-    			$paymentstatic->id = $objp->pid;
-    			$paymentstatic->ref = $objp->pref;
-    			if ($paymentstatic->id) {
-    				print $paymentstatic->getNomUrl(1);
-    			} else {
-    				print '&nbsp;';
-    			}
-    			print '</td>';
-    			// Link to bank transaction
-    			print '<td class="center">';
-    			$accountlinestatic->rowid = $objp->rowid;
-    			if ($accountlinestatic->rowid) {
-    				print $accountlinestatic->getNomUrl(1);
-    			} else {
-    				print '&nbsp;';
-    			}
-    			print '</td>';
-    			// Action button
-    			print '<td class="right">';
-    			if ($object->statut == 0)
-    			{
-    				print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=remove&amp;lineid='.$objp->rowid.'">'.img_delete().'</a>';
-    			}
-       			if ($object->statut == 1 && $objp->statut != 2)
-       			{
-       				print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=reject_check&amp;lineid='.$objp->rowid.'">'.img_picto($langs->trans("RejectCheck"), 'disable').'</a>';
-       			}
-    			if ($objp->statut == 2)
-    			{
-    				print ' &nbsp; '.img_picto($langs->trans('CheckRejected'), 'statut8').'</a>';
-    			}
-    		    print '</td>';
-    			print '</tr>';
+		if ($num > 0)
+		{
+			while ($objp = $db->fetch_object($resql))
+			{
+				print '<tr class="oddeven">';
+				print '<td class="center">'.$i.'</td>';
+				print '<td class="center">'.dol_print_date($db->jdate($objp->date), 'day').'</td>'; // Operation date
+				print '<td class="center">'.($objp->num_chq ? $objp->num_chq : '&nbsp;').'</td>';
+				print '<td>'.dol_trunc($objp->emetteur, 24).'</td>';
+				print '<td>'.dol_trunc($objp->banque, 24).'</td>';
+				print '<td class="right">'.price($objp->amount).'</td>';
+				// Link to payment
+				print '<td class="center">';
+				$paymentstatic->id = $objp->pid;
+				$paymentstatic->ref = $objp->pref;
+				if ($paymentstatic->id) {
+					print $paymentstatic->getNomUrl(1);
+				} else {
+					print '&nbsp;';
+				}
+				print '</td>';
+				// Link to bank transaction
+				print '<td class="center">';
+				$accountlinestatic->rowid = $objp->rowid;
+				if ($accountlinestatic->rowid) {
+					print $accountlinestatic->getNomUrl(1);
+				} else {
+					print '&nbsp;';
+				}
+				print '</td>';
+				// Action button
+				print '<td class="right">';
+				if ($object->statut == 0)
+				{
+					print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=remove&amp;lineid='.$objp->rowid.'">'.img_delete().'</a>';
+				}
+	   			if ($object->statut == 1 && $objp->statut != 2)
+	   			{
+	   				print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=reject_check&amp;lineid='.$objp->rowid.'">'.img_picto($langs->trans("RejectCheck"), 'disable').'</a>';
+	   			}
+				if ($objp->statut == 2)
+				{
+					print ' &nbsp; '.img_picto($langs->trans('CheckRejected'), 'statut8').'</a>';
+				}
+				print '</td>';
+				print '</tr>';
 
-    			$i++;
-    		}
-        } else {
-            print '<td colspan="8" class="opacitymedium">';
-            print $langs->trans("None");
-            print '</td>';
-        }
+				$i++;
+			}
+		} else {
+			print '<td colspan="8" class="opacitymedium">';
+			print $langs->trans("None");
+			print '</td>';
+		}
 
 		print "</table>";
 
@@ -719,7 +719,7 @@ if ($action == 'new')
 		dol_print_error($db);
 	}
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 }
 
 
diff --git a/htdocs/compta/paiement/cheque/class/remisecheque.class.php b/htdocs/compta/paiement/cheque/class/remisecheque.class.php
index cc882b5f1ee..4e22d8f141a 100644
--- a/htdocs/compta/paiement/cheque/class/remisecheque.class.php
+++ b/htdocs/compta/paiement/cheque/class/remisecheque.class.php
@@ -74,12 +74,12 @@ class RemiseCheque extends CommonObject
 	 *
 	 *  @param		DoliDB		$db      Database handler
 	 */
-    public function __construct($db)
-    {
+	public function __construct($db)
+	{
 		$this->db = $db;
 		$this->next_id = 0;
 		$this->previous_id = 0;
-    }
+	}
 
 	/**
 	 *	Load record
@@ -88,8 +88,8 @@ class RemiseCheque extends CommonObject
 	 *	@param 	string	$ref		 	Ref record
 	 * 	@return	int						<0 if KO, > 0 if OK
 	 */
-    public function fetch($id, $ref = '')
-    {
+	public function fetch($id, $ref = '')
+	{
 		global $conf;
 
 		$sql = "SELECT bc.rowid, bc.datec, bc.fk_user_author, bc.fk_bank_account, bc.amount, bc.ref, bc.statut, bc.nbcheque, bc.ref_ext";
@@ -128,10 +128,10 @@ class RemiseCheque extends CommonObject
 
 			return 1;
 		} else {
-		    $this->error = $this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			return -1;
 		}
-    }
+	}
 
 	/**
 	 *	Create a receipt to send cheques
@@ -142,8 +142,8 @@ class RemiseCheque extends CommonObject
 	 *  @param	array	$toRemise		array with cheques to remise
 	 *	@return	int						<0 if KO, >0 if OK
 	 */
-    public function create($user, $account_id, $limit, $toRemise)
-    {
+	public function create($user, $account_id, $limit, $toRemise)
+	{
 		global $conf;
 
 		$this->errno = 0;
@@ -269,22 +269,22 @@ class RemiseCheque extends CommonObject
 			$this->errno = $this->db->lasterrno();
 		}
 
-	    if (!$this->errno && !empty($conf->global->MAIN_DISABLEDRAFTSTATUS))
-        {
-            $res = $this->validate($user);
-            //if ($res < 0) $error++;
-        }
+		if (!$this->errno && !empty($conf->global->MAIN_DISABLEDRAFTSTATUS))
+		{
+			$res = $this->validate($user);
+			//if ($res < 0) $error++;
+		}
 
-        if (!$this->errno)
-        {
-            $this->db->commit();
-            dol_syslog("RemiseCheque::Create end", LOG_DEBUG);
-            return $this->id;
-        } else {
-            $this->db->rollback();
-            dol_syslog("RemiseCheque::Create end", LOG_DEBUG);
-            return $this->errno;
-        }
+		if (!$this->errno)
+		{
+			$this->db->commit();
+			dol_syslog("RemiseCheque::Create end", LOG_DEBUG);
+			return $this->id;
+		} else {
+			$this->db->rollback();
+			dol_syslog("RemiseCheque::Create end", LOG_DEBUG);
+			return $this->errno;
+		}
 	}
 
 	/**
@@ -293,8 +293,8 @@ class RemiseCheque extends CommonObject
 	 *	@param  User	$user 		Utilisateur qui effectue l'operation
 	 *	@return	int
 	 */
-    public function delete($user = '')
-    {
+	public function delete($user = '')
+	{
 		global $conf;
 
 		$this->errno = 0;
@@ -315,15 +315,15 @@ class RemiseCheque extends CommonObject
 			}
 
 			if ($this->errno === 0) {
-			    $sql = "UPDATE ".MAIN_DB_PREFIX."bank";
-			    $sql .= " SET fk_bordereau = 0";
-			    $sql .= " WHERE fk_bordereau = ".$this->id;
+				$sql = "UPDATE ".MAIN_DB_PREFIX."bank";
+				$sql .= " SET fk_bordereau = 0";
+				$sql .= " WHERE fk_bordereau = ".$this->id;
 
-			    $resql = $this->db->query($sql);
-			    if (!$resql)
-			    {
-			        $this->errno = -1028;
-				    dol_syslog("RemiseCheque::Delete ERREUR UPDATE ($this->errno)");
+				$resql = $this->db->query($sql);
+				if (!$resql)
+				{
+					$this->errno = -1028;
+					dol_syslog("RemiseCheque::Delete ERREUR UPDATE ($this->errno)");
 				}
 			}
 		}
@@ -345,8 +345,8 @@ class RemiseCheque extends CommonObject
 	 *  @param	User	$user 		User
 	 *  @return int      			<0 if KO, >0 if OK
 	 */
-    public function validate($user)
-    {
+	public function validate($user)
+	{
 		global $langs, $conf;
 
 		$this->errno = 0;
@@ -371,7 +371,7 @@ class RemiseCheque extends CommonObject
 
 				if ($num == 1)
 				{
-				    $this->ref = $numref;
+					$this->ref = $numref;
 					$this->statut = 1;
 				} else {
 					$this->errno = -1029;
@@ -391,7 +391,7 @@ class RemiseCheque extends CommonObject
 		} else {
 			$this->db->rollback();
 			dol_syslog("RemiseCheque::Validate ".$this->errno, LOG_ERR);
-            return $this->errno;
+			return $this->errno;
 		}
 	}
 
@@ -402,8 +402,8 @@ class RemiseCheque extends CommonObject
 	 *      @param     string		$mode		'next' for next value or 'last' for last value
 	 *      @return    string					free ref or last ref
 	 */
-    public function getNextNumRef($mode = 'next')
-    {
+	public function getNextNumRef($mode = 'next')
+	{
 		global $conf, $db, $langs, $mysoc;
 		$langs->load("bills");
 
@@ -475,19 +475,19 @@ class RemiseCheque extends CommonObject
 			print $langs->trans("Error")." ".$langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("Bank"));
 			return "";
 		}
-    }
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *      Load indicators for dashboard (this->nbtodo and this->nbtodolate)
 	 *
 	 *      @param      User	$user       Objet user
 	 *      @return WorkboardResponse|int <0 if KO, WorkboardResponse if OK
 	 */
-    public function load_board($user)
-    {
-        // phpcs:enable
+	public function load_board($user)
+	{
+		// phpcs:enable
 		global $conf, $langs;
 
 		if ($user->socid) return -1; // protection pour eviter appel par utilisateur externe
@@ -529,18 +529,18 @@ class RemiseCheque extends CommonObject
 			$this->error = $this->db->error();
 			return -1;
 		}
-    }
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *      Charge indicateurs this->nb de tableau de bord
 	 *
 	 *      @return     int         <0 if ko, >0 if ok
 	 */
-    public function load_state_board()
-    {
-        // phpcs:enable
+	public function load_state_board()
+	{
+		// phpcs:enable
 		global $user;
 
 		if ($user->socid) return -1; // protection pour eviter appel par utilisateur externe
@@ -567,7 +567,7 @@ class RemiseCheque extends CommonObject
 			$this->error = $this->db->error();
 			return -1;
 		}
-    }
+	}
 
 
 	/**
@@ -577,8 +577,8 @@ class RemiseCheque extends CommonObject
 	 *	@param 	Translate	$outputlangs	Object langs
 	 * 	@return int        					<0 if KO, >0 if OK
 	 */
-    public function generatePdf($model, $outputlangs)
-    {
+	public function generatePdf($model, $outputlangs)
+	{
 		global $langs, $conf;
 
 		if (empty($model)) $model = 'blochet';
@@ -650,15 +650,15 @@ class RemiseCheque extends CommonObject
 			$this->error = $langs->trans("ErrorFileDoesNotExists", $dir.$file);
 			return -1;
 		}
-    }
+	}
 
 	/**
 	 *	Mets a jour le montant total
 	 *
 	 *	@return 	int		0 en cas de succes
 	 */
-    public function updateAmount()
-    {
+	public function updateAmount()
+	{
 		global $conf;
 
 		$this->errno = 0;
@@ -707,7 +707,7 @@ class RemiseCheque extends CommonObject
 		}
 
 		return $this->errno;
-    }
+	}
 
 	/**
 	 *	Insere la remise en base
@@ -715,8 +715,8 @@ class RemiseCheque extends CommonObject
 	 *	@param	int		$account_id 		Compte bancaire concerne
 	 * 	@return	int
 	 */
-    public function removeCheck($account_id)
-    {
+	public function removeCheck($account_id)
+	{
 		$this->errno = 0;
 
 		if ($this->id > 0)
@@ -736,7 +736,7 @@ class RemiseCheque extends CommonObject
 			}
 		}
 		return 0;
-    }
+	}
 
 	/**
 	 *	Check return management
@@ -746,8 +746,8 @@ class RemiseCheque extends CommonObject
 	 *	@param	integer	$rejection_date    Date to use on the negative payment
 	 * 	@return	int                        Id of negative payment line created
 	 */
-    public function rejectCheck($bank_id, $rejection_date)
-    {
+	public function rejectCheck($bank_id, $rejection_date)
+	{
 		global $db, $user;
 
 		$payment = new Paiement($db);
@@ -796,29 +796,29 @@ class RemiseCheque extends CommonObject
 			$result = $rejectedPayment->create($user);
 			if ($result > 0)
 			{
-                // We created a negative payment, we also add the line as bank transaction
-			    $result = $rejectedPayment->addPaymentToBank($user, 'payment', '(CheckRejected)', $bankaccount, '', '');
+				// We created a negative payment, we also add the line as bank transaction
+				$result = $rejectedPayment->addPaymentToBank($user, 'payment', '(CheckRejected)', $bankaccount, '', '');
 				if ($result > 0)
 				{
-				    $result = $payment->reject();
+					$result = $payment->reject();
 					if ($result > 0)
 					{
-    					$this->db->commit();
-    					return $rejectedPayment->id;
+						$this->db->commit();
+						return $rejectedPayment->id;
 					} else {
-                        $this->db->rollback();
-					    return -1;
+						$this->db->rollback();
+						return -1;
 					}
 				} else {
-				    $this->error = $rejectedPayment->error;
-				    $this->errors = $rejectedPayment->errors;
-				    $this->db->rollback();
+					$this->error = $rejectedPayment->error;
+					$this->errors = $rejectedPayment->errors;
+					$this->db->rollback();
 					return -1;
 				}
 			} else {
 				$this->error = $rejectedPayment->error;
 				$this->errors = $rejectedPayment->errors;
-			    $this->db->rollback();
+				$this->db->rollback();
 				return -1;
 			}
 		} else {
@@ -828,15 +828,15 @@ class RemiseCheque extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Charge les proprietes ref_previous et ref_next
 	 *
 	 *  @return     int   <0 if KO, 0 if OK
 	 */
-    public function load_previous_next_id()
-    {
-        // phpcs:enable
+	public function load_previous_next_id()
+	{
+		// phpcs:enable
 		global $conf;
 
 		$this->errno = 0;
@@ -871,39 +871,39 @@ class RemiseCheque extends CommonObject
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *      Set the creation date
-     *
-     *      @param	User		$user           Object user
-     *      @param  int   $date           Date creation
-     *      @return int                 		<0 if KO, >0 if OK
-     */
-    public function set_date($user, $date)
-    {
-        // phpcs:enable
-        if ($user->rights->banque->cheque)
-        {
-            $sql = "UPDATE ".MAIN_DB_PREFIX."bordereau_cheque";
-            $sql .= " SET date_bordereau = ".($date ? "'".$this->db->idate($date)."'" : 'null');
-            $sql .= " WHERE rowid = ".$this->id;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *      Set the creation date
+	 *
+	 *      @param	User		$user           Object user
+	 *      @param  int   $date           Date creation
+	 *      @return int                 		<0 if KO, >0 if OK
+	 */
+	public function set_date($user, $date)
+	{
+		// phpcs:enable
+		if ($user->rights->banque->cheque)
+		{
+			$sql = "UPDATE ".MAIN_DB_PREFIX."bordereau_cheque";
+			$sql .= " SET date_bordereau = ".($date ? "'".$this->db->idate($date)."'" : 'null');
+			$sql .= " WHERE rowid = ".$this->id;
 
-            dol_syslog("RemiseCheque::set_date", LOG_DEBUG);
-            $resql = $this->db->query($sql);
-            if ($resql)
-            {
-                $this->date_bordereau = $date;
-                return 1;
-            } else {
-                $this->error = $this->db->error();
-                return -1;
-            }
-        } else {
-            return -2;
-        }
-    }
+			dol_syslog("RemiseCheque::set_date", LOG_DEBUG);
+			$resql = $this->db->query($sql);
+			if ($resql)
+			{
+				$this->date_bordereau = $date;
+				return 1;
+			} else {
+				$this->error = $this->db->error();
+				return -1;
+			}
+		} else {
+			return -2;
+		}
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *      Set the ref of bordereau
 	 *
@@ -911,9 +911,9 @@ class RemiseCheque extends CommonObject
 	 *      @param  int   $ref         ref of bordereau
 	 *      @return int                 		<0 if KO, >0 if OK
 	 */
-    public function set_number($user, $ref)
-    {
-        // phpcs:enable
+	public function set_number($user, $ref)
+	{
+		// phpcs:enable
 		if ($user->rights->banque->cheque)
 		{
 			$sql = "UPDATE ".MAIN_DB_PREFIX."bordereau_cheque";
@@ -942,8 +942,8 @@ class RemiseCheque extends CommonObject
 	 *	@param	string		$option		''=Create a specimen invoice with lines, 'nolines'=No lines
 	 *  @return	void
 	 */
-    public function initAsSpecimen($option = '')
-    {
+	public function initAsSpecimen($option = '')
+	{
 		global $user, $langs, $conf;
 
 		$now = dol_now();
@@ -955,20 +955,20 @@ class RemiseCheque extends CommonObject
 		$this->ref = 'SPECIMEN';
 		$this->specimen = 1;
 		$this->date_bordereau = $nownotime;
-    }
+	}
 
 	/**
 	 *	Return clicable name (with picto eventually)
 	 *
 	 *	@param	int		$withpicto					0=No picto, 1=Include picto into link, 2=Only picto
 	 *	@param	string	$option						Sur quoi pointe le lien
-     *  @param	int  	$notooltip					1=Disable tooltip
-     *  @param  string  $morecss            		Add more css on link
-     *  @param  int     $save_lastsearch_value    	-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+	 *  @param	int  	$notooltip					1=Disable tooltip
+	 *  @param  string  $morecss            		Add more css on link
+	 *  @param  int     $save_lastsearch_value    	-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
 	 *	@return	string								Chaine avec URL
 	 */
-    public function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $morecss = '', $save_lastsearch_value = -1)
-    {
+	public function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $morecss = '', $save_lastsearch_value = -1)
+	{
 		global $conf, $langs;
 
 		$result = '';
@@ -977,27 +977,27 @@ class RemiseCheque extends CommonObject
 		$label .= '<br>';
 		$label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref;
 
-        $url = DOL_URL_ROOT.'/compta/paiement/cheque/card.php?id='.$this->id;
+		$url = DOL_URL_ROOT.'/compta/paiement/cheque/card.php?id='.$this->id;
 
-        if ($option != 'nolink')
-        {
-        	// Add param to save lastsearch_values or not
-        	$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
-        	if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
-        	if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
-        }
+		if ($option != 'nolink')
+		{
+			// Add param to save lastsearch_values or not
+			$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
+			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
+			if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
+		}
 
-        $linkclose = '';
-        if (empty($notooltip))
-        {
-        	if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-        	{
-        		$label = $langs->trans("ShowCheckReceipt");
-        		$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
-        	}
-        	$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
-        	$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
-        } else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+		$linkclose = '';
+		if (empty($notooltip))
+		{
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+			{
+				$label = $langs->trans("ShowCheckReceipt");
+				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
+			}
+			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
+			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
+		} else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
 		$linkstart = '<a href="'.$url.'"';
 		$linkstart .= $linkclose.'>';
@@ -1009,7 +1009,7 @@ class RemiseCheque extends CommonObject
 		$result .= $linkend;
 
 		return $result;
-    }
+	}
 
 	/**
 	 *  Retourne le libelle du statut d'une facture (brouillon, validee, abandonnee, payee)
@@ -1017,12 +1017,12 @@ class RemiseCheque extends CommonObject
 	 *  @param	int		$mode       0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
 	 *  @return string				Libelle
 	 */
-    public function getLibStatut($mode = 0)
-    {
-        return $this->LibStatut($this->statut, $mode);
-    }
+	public function getLibStatut($mode = 0)
+	{
+		return $this->LibStatut($this->statut, $mode);
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return label of a status
 	 *
@@ -1030,22 +1030,22 @@ class RemiseCheque extends CommonObject
 	 *  @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
 	 *  @return string      		Libelle du statut
 	 */
-    public function LibStatut($status, $mode = 0)
-    {
-    	// phpcs:enable
-    	if (empty($this->labelStatus) || empty($this->labelStatusShort))
-    	{
-    		global $langs;
-    		$langs->load('compta');
-    		$this->labelStatus[self::STATUS_DRAFT] = $langs->trans('ToValidate');
-    		$this->labelStatus[self::STATUS_VALIDATED] = $langs->trans('Validated');
-    		$this->labelStatusShort[self::STATUS_DRAFT] = $langs->trans('ToValidate');
-    		$this->labelStatusShort[self::STATUS_VALIDATED] = $langs->trans('Validated');
-    	}
+	public function LibStatut($status, $mode = 0)
+	{
+		// phpcs:enable
+		if (empty($this->labelStatus) || empty($this->labelStatusShort))
+		{
+			global $langs;
+			$langs->load('compta');
+			$this->labelStatus[self::STATUS_DRAFT] = $langs->trans('ToValidate');
+			$this->labelStatus[self::STATUS_VALIDATED] = $langs->trans('Validated');
+			$this->labelStatusShort[self::STATUS_DRAFT] = $langs->trans('ToValidate');
+			$this->labelStatusShort[self::STATUS_VALIDATED] = $langs->trans('Validated');
+		}
 
-    	$statusType = 'status'.$status;
-    	if ($status == self::STATUS_VALIDATED) $statusType = 'status4';
+		$statusType = 'status'.$status;
+		if ($status == self::STATUS_VALIDATED) $statusType = 'status4';
 
-    	return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode);
-    }
+		return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode);
+	}
 }
diff --git a/htdocs/compta/paiement/cheque/index.php b/htdocs/compta/paiement/cheque/index.php
index 5e71ff5c50c..9de75a6e0c5 100644
--- a/htdocs/compta/paiement/cheque/index.php
+++ b/htdocs/compta/paiement/cheque/index.php
@@ -67,17 +67,17 @@ print '<th colspan="2">'.$langs->trans("BankChecks")."</th>\n";
 print "</tr>\n";
 
 if ($resql) {
-    if ($row = $db->fetch_row($resql)) {
-        $num = $row[0];
-    }
-    print '<tr class="oddeven">';
-    print '<td>'.$langs->trans("BankChecksToReceipt").'</td>';
-    print '<td class="right">';
-    print '<a href="'.DOL_URL_ROOT.'/compta/paiement/cheque/card.php?leftmenu=customers_bills_checks&action=new">'.$num.'</a>';
-    print '</td></tr>';
-    print "</table>\n";
+	if ($row = $db->fetch_row($resql)) {
+		$num = $row[0];
+	}
+	print '<tr class="oddeven">';
+	print '<td>'.$langs->trans("BankChecksToReceipt").'</td>';
+	print '<td class="right">';
+	print '<a href="'.DOL_URL_ROOT.'/compta/paiement/cheque/card.php?leftmenu=customers_bills_checks&action=new">'.$num.'</a>';
+	print '</td></tr>';
+	print "</table>\n";
 } else {
-    dol_print_error($db);
+	dol_print_error($db);
 }
 
 
@@ -112,9 +112,9 @@ if ($resql)
 
 	while ($objp = $db->fetch_object($resql))
 	{
-        $checkdepositstatic->id = $objp->rowid;
-        $checkdepositstatic->ref = ($objp->ref ? $objp->ref : $objp->rowid);
-	    $checkdepositstatic->statut = $objp->statut;
+		$checkdepositstatic->id = $objp->rowid;
+		$checkdepositstatic->ref = ($objp->ref ? $objp->ref : $objp->rowid);
+		$checkdepositstatic->statut = $objp->statut;
 
 		$accountstatic->id = $objp->bid;
 		$accountstatic->ref = $objp->bref;
@@ -141,7 +141,7 @@ if ($resql)
 
 	$db->free($resql);
 } else {
-    dol_print_error($db);
+	dol_print_error($db);
 }
 
 
diff --git a/htdocs/compta/paiement/cheque/list.php b/htdocs/compta/paiement/cheque/list.php
index 3bb45c4e312..39a87653cba 100644
--- a/htdocs/compta/paiement/cheque/list.php
+++ b/htdocs/compta/paiement/cheque/list.php
@@ -69,11 +69,11 @@ $accountstatic = new Account($db);
 // If click on purge search criteria ?
 if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
 {
-    $search_ref = '';
-    $search_amount = '';
-    $search_account = '';
-    $year = '';
-    $month = '';
+	$search_ref = '';
+	$search_amount = '';
+	$search_account = '';
+	$year = '';
+	$month = '';
 }
 
 
@@ -121,7 +121,7 @@ if ($resql)
 	$num = $db->num_rows($resql);
 	$i = 0;
 	$param = '';
-    if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
+	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
 	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
 
 	$url = DOL_URL_ROOT.'/compta/paiement/cheque/card.php?action=new';
@@ -141,34 +141,34 @@ if ($resql)
 
 	$moreforfilter = '';
 
-    print '<div class="div-table-responsive">';
-    print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
+	print '<div class="div-table-responsive">';
+	print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 	// Fields title search
 	print '<tr class="liste_titre">';
 	print '<td class="liste_titre" align="left">';
 	print '<input class="flat" type="text" size="4" name="search_ref" value="'.$search_ref.'">';
-    print '</td>';
+	print '</td>';
 	print '<td class="liste_titre" align="center">';
-    if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="day" value="'.$day.'">';
-    print '<input class="flat" type="text" size="1" maxlength="2" name="month" value="'.$month.'">';
-    $formother->select_year($year ? $year : -1, 'year', 1, 20, 5);
-    print '</td>';
-    print '<td class="liste_titre">';
-    $form->select_comptes($search_account, 'search_account', 0, '', 1);
-    print '</td>';
+	if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="day" value="'.$day.'">';
+	print '<input class="flat" type="text" size="1" maxlength="2" name="month" value="'.$month.'">';
+	$formother->select_year($year ? $year : -1, 'year', 1, 20, 5);
+	print '</td>';
+	print '<td class="liste_titre">';
+	$form->select_comptes($search_account, 'search_account', 0, '', 1);
+	print '</td>';
 	print '<td class="liste_titre">&nbsp;</td>';
 	print '<td class="liste_titre right">';
 	print '<input class="flat maxwidth50" type="text" name="search_amount" value="'.$search_amount.'">';
 	print '</td>';
 	print '<td class="liste_titre"></td>';
-    print '<td class="liste_titre maxwidthsearch">';
-    $searchpicto = $form->showFilterAndCheckAddButtons(0);
-    print $searchpicto;
-    print '</td>';
-    print "</tr>\n";
+	print '<td class="liste_titre maxwidthsearch">';
+	$searchpicto = $form->showFilterAndCheckAddButtons(0);
+	print $searchpicto;
+	print '</td>';
+	print "</tr>\n";
 
-    print '<tr class="liste_titre">';
+	print '<tr class="liste_titre">';
 	print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "bc.ref", "", $param, "", $sortfield, $sortorder);
 	print_liste_field_titre("DateCreation", $_SERVER["PHP_SELF"], "dp", "", $param, 'align="center"', $sortfield, $sortorder);
 	print_liste_field_titre("Account", $_SERVER["PHP_SELF"], "ba.label", "", $param, "", $sortfield, $sortorder);
@@ -178,52 +178,52 @@ if ($resql)
 	print_liste_field_titre('');
 	print "</tr>\n";
 
-    if ($num > 0)
-    {
-    	while ($i < min($num, $limit))
-    	{
-    		$objp = $db->fetch_object($resql);
+	if ($num > 0)
+	{
+		while ($i < min($num, $limit))
+		{
+			$objp = $db->fetch_object($resql);
 
-    		print '<tr class="oddeven">';
+			print '<tr class="oddeven">';
 
-    		// Num ref cheque
-    		print '<td>';
-    		$checkdepositstatic->id = $objp->rowid;
-    		$checkdepositstatic->ref = ($objp->ref ? $objp->ref : $objp->rowid);
-    		$checkdepositstatic->statut = $objp->statut;
-    		print $checkdepositstatic->getNomUrl(1);
-    		print '</td>';
+			// Num ref cheque
+			print '<td>';
+			$checkdepositstatic->id = $objp->rowid;
+			$checkdepositstatic->ref = ($objp->ref ? $objp->ref : $objp->rowid);
+			$checkdepositstatic->statut = $objp->statut;
+			print $checkdepositstatic->getNomUrl(1);
+			print '</td>';
 
-    		// Date
-    		print '<td class="center">'.dol_print_date($db->jdate($objp->dp), 'day').'</td>'; // TODO Use date hour
+			// Date
+			print '<td class="center">'.dol_print_date($db->jdate($objp->dp), 'day').'</td>'; // TODO Use date hour
 
-    		// Bank
-    		print '<td>';
-    		if ($objp->bid) print '<a href="'.DOL_URL_ROOT.'/compta/bank/bankentries_list.php?account='.$objp->bid.'">'.img_object($langs->trans("ShowAccount"), 'account').' '.$objp->label.'</a>';
-    		else print '&nbsp;';
-    		print '</td>';
+			// Bank
+			print '<td>';
+			if ($objp->bid) print '<a href="'.DOL_URL_ROOT.'/compta/bank/bankentries_list.php?account='.$objp->bid.'">'.img_object($langs->trans("ShowAccount"), 'account').' '.$objp->label.'</a>';
+			else print '&nbsp;';
+			print '</td>';
 
-    		// Number of cheques
-    		print '<td class="right">'.$objp->nbcheque.'</td>';
+			// Number of cheques
+			print '<td class="right">'.$objp->nbcheque.'</td>';
 
-    		// Amount
-    		print '<td class="right">'.price($objp->amount).'</td>';
+			// Amount
+			print '<td class="right">'.price($objp->amount).'</td>';
 
-    		// Statut
-    		print '<td class="right">';
-    		print $checkdepositstatic->LibStatut($objp->statut, 5);
-    		print '</td>';
+			// Statut
+			print '<td class="right">';
+			print $checkdepositstatic->LibStatut($objp->statut, 5);
+			print '</td>';
 
-    		print '<td></td>';
+			print '<td></td>';
 
-            print "</tr>\n";
-    		$i++;
-    	}
-    } else {
+			print "</tr>\n";
+			$i++;
+		}
+	} else {
    		print '<tr class="oddeven">';
    		print '<td colspan="7" class="opacitymedium">'.$langs->trans("None")."</td>";
    		print '</tr>';
-    }
+	}
 	print "</table>";
 	print "</div>";
 	print "</form>\n";
diff --git a/htdocs/compta/paiement/class/paiement.class.php b/htdocs/compta/paiement/class/paiement.class.php
index dbef7158782..863e841f716 100644
--- a/htdocs/compta/paiement/class/paiement.class.php
+++ b/htdocs/compta/paiement/class/paiement.class.php
@@ -39,17 +39,17 @@ require_once DOL_DOCUMENT_ROOT.'/multicurrency/class/multicurrency.class.php';
  */
 class Paiement extends CommonObject
 {
-    /**
+	/**
 	 * @var string ID to identify managed object
 	 */
 	public $element = 'payment';
 
-    /**
+	/**
 	 * @var string Name of table without prefix where object is stored
 	 */
 	public $table_element = 'paiement';
 
-    /**
+	/**
 	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
 	 */
 	public $picto = 'payment';
@@ -61,7 +61,7 @@ class Paiement extends CommonObject
 	 * @deprecated
 	 * @see $amount, $amounts
 	 */
-    public $total;
+	public $total;
 
 	/**
 	 * @deprecated
@@ -69,77 +69,77 @@ class Paiement extends CommonObject
 	 */
 	public $montant;
 
-	public $amount;                        // Total amount of payment (in the main currency)
-	public $multicurrency_amount;          // Total amount of payment (in the currency of the bank account)
-	public $amounts = array();               // array: invoice ID => amount for that invoice (in the main currency)>
+	public $amount; // Total amount of payment (in the main currency)
+	public $multicurrency_amount; // Total amount of payment (in the currency of the bank account)
+	public $amounts = array(); // array: invoice ID => amount for that invoice (in the main currency)>
 	public $multicurrency_amounts = array(); // array: invoice ID => amount for that invoice (in the invoice's currency)>
 
-	public $pos_change = 0;	// Excess received in TakePOS cash payment
+	public $pos_change = 0; // Excess received in TakePOS cash payment
 
 	public $author;
 	public $paiementid; // Type of payment. Id saved into fields fk_paiement on llx_paiement
 	public $paiementcode; // Code of payment.
 
-    /**
-     * @var string type libelle
-     */
-    public $type_label;
+	/**
+	 * @var string type libelle
+	 */
+	public $type_label;
 
-    /**
-     * @var string type code
-     */
-    public $type_code;
+	/**
+	 * @var string type code
+	 */
+	public $type_code;
 
-    /**
-     * @var string Numero du CHQ, VIR, etc...
-     * @deprecated
-     * @see $num_payment
-     */
-    public $num_paiement;
+	/**
+	 * @var string Numero du CHQ, VIR, etc...
+	 * @deprecated
+	 * @see $num_payment
+	 */
+	public $num_paiement;
 
-    /**
-     * @var string Numero du CHQ, VIR, etc...
-     */
-    public $num_payment;
+	/**
+	 * @var string Numero du CHQ, VIR, etc...
+	 */
+	public $num_payment;
 
-    /**
-     * @var string Id of external payment mode
-     */
-    public $ext_payment_id;
+	/**
+	 * @var string Id of external payment mode
+	 */
+	public $ext_payment_id;
 
-    /**
-     * @var string Name of external payment mode
-     */
-    public $ext_payment_site;
+	/**
+	 * @var string Name of external payment mode
+	 */
+	public $ext_payment_site;
 
-    /**
-     * @var int bank account id of payment
-     * @deprecated
-     * @see $fk_account
-     */
-    public $bank_account;
+	/**
+	 * @var int bank account id of payment
+	 * @deprecated
+	 * @see $fk_account
+	 */
+	public $bank_account;
 
-    /**
-     * @var int bank account id of payment
-     */
-    public $fk_account;
+	/**
+	 * @var int bank account id of payment
+	 */
+	public $fk_account;
 
-    /**
-     * @var int id of payment line in bank account
-     */
-    public $bank_line;
+	/**
+	 * @var int id of payment line in bank account
+	 */
+	public $bank_line;
 
 	// fk_paiement dans llx_paiement est l'id du type de paiement (7 pour CHQ, ...)
-    // fk_paiement dans llx_paiement_facture est le rowid du paiement
-    /**
-     * @var int payment id
-     */
-    public $fk_paiement; // Type of payment
+	// fk_paiement dans llx_paiement_facture est le rowid du paiement
+	/**
+	 * @var int payment id
+	 */
+	public $fk_paiement; // Type of payment
 
-    /**
-     * @var string payment external reference
-     */
-    public $ref_ext;
+	/**
+	 * @var string payment external reference
+	 */
+	public $ref_ext;
 
 	/**
 	 *	Constructor
@@ -195,8 +195,8 @@ class Paiement extends CommonObject
 				$this->type_label = $obj->type_label;
 				$this->type_code      = $obj->type_code;
 				$this->statut         = $obj->statut;
-                $this->ext_payment_id = $obj->ext_payment_id;
-                $this->ext_payment_site = $obj->ext_payment_site;
+				$this->ext_payment_id = $obj->ext_payment_id;
+				$this->ext_payment_site = $obj->ext_payment_site;
 
 				$this->bank_account   = $obj->fk_account; // deprecated
 				$this->fk_account     = $obj->fk_account;
@@ -224,7 +224,7 @@ class Paiement extends CommonObject
 	 *  @param  Societe   $thirdparty           Thirdparty
 	 *  @return int                 			id of created payment, < 0 if error
 	 */
-    public function create($user, $closepaidinvoices = 0, $thirdparty = null)
+	public function create($user, $closepaidinvoices = 0, $thirdparty = null)
 	{
 		global $conf, $langs;
 
@@ -233,10 +233,10 @@ class Paiement extends CommonObject
 
 		$now = dol_now();
 
-        // Clean parameters
-        $totalamount = 0;
+		// Clean parameters
+		$totalamount = 0;
 		$totalamount_converted = 0;
-        $atleastonepaymentnotnull = 0;
+		$atleastonepaymentnotnull = 0;
 
 		if ($way == 'dolibarr')
 		{
@@ -263,16 +263,16 @@ class Paiement extends CommonObject
 		$totalamount_converted = price2num($totalamount_converted);
 
 		// Check parameters
-        if (empty($totalamount) && empty($atleastonepaymentnotnull))	 // We accept negative amounts for withdraw reject but not empty arrays
-        {
-        	$this->errors[] = 'TotalAmountEmpty';
-        	$this->error = 'TotalAmountEmpty';
-        	return -1;
-        }
+		if (empty($totalamount) && empty($atleastonepaymentnotnull))	 // We accept negative amounts for withdraw reject but not empty arrays
+		{
+			$this->errors[] = 'TotalAmountEmpty';
+			$this->error = 'TotalAmountEmpty';
+			return -1;
+		}
 
-        dol_syslog(get_class($this)."::create insert paiement", LOG_DEBUG);
+		dol_syslog(get_class($this)."::create insert paiement", LOG_DEBUG);
 
-        $this->db->begin();
+		$this->db->begin();
 
 		$this->ref = $this->getNextNumRef(is_object($thirdparty) ? $thirdparty : '');
 
@@ -319,17 +319,17 @@ class Paiement extends CommonObject
 						$invoice->fetch($facid);
 
 						// If we want to closed payed invoices
-					    if ($closepaidinvoices)
-					    {
-                            $paiement = $invoice->getSommePaiement();
-                            $creditnotes = $invoice->getSumCreditNotesUsed();
-                            $deposits = $invoice->getSumDepositsUsed();
-                            $alreadypayed = price2num($paiement + $creditnotes + $deposits, 'MT');
-                            $remaintopay = price2num($invoice->total_ttc - $paiement - $creditnotes - $deposits, 'MT');
+						if ($closepaidinvoices)
+						{
+							$paiement = $invoice->getSommePaiement();
+							$creditnotes = $invoice->getSumCreditNotesUsed();
+							$deposits = $invoice->getSumDepositsUsed();
+							$alreadypayed = price2num($paiement + $creditnotes + $deposits, 'MT');
+							$remaintopay = price2num($invoice->total_ttc - $paiement - $creditnotes - $deposits, 'MT');
 
 							//var_dump($invoice->total_ttc.' - '.$paiement.' -'.$creditnotes.' - '.$deposits.' - '.$remaintopay);exit;
 
-                            //Invoice types that are eligible for changing status to paid
+							//Invoice types that are eligible for changing status to paid
 							$affected_types = array(
 								Facture::TYPE_STANDARD,
 								Facture::TYPE_REPLACEMENT,
@@ -338,15 +338,15 @@ class Paiement extends CommonObject
 								Facture::TYPE_SITUATION
 							);
 
-                            if (!in_array($invoice->type, $affected_types)) dol_syslog("Invoice ".$facid." is not a standard, nor replacement invoice, nor credit note, nor deposit invoice, nor situation invoice. We do nothing more.");
-                            elseif ($remaintopay) dol_syslog("Remain to pay for invoice ".$facid." not null. We do nothing more.");
-                            //else if ($mustwait) dol_syslog("There is ".$mustwait." differed payment to process, we do nothing more.");
-                            else {
-                                // If invoice is a down payment, we also convert down payment to discount
-                                if ($invoice->type == Facture::TYPE_DEPOSIT)
-                                {
-			                        $amount_ht = $amount_tva = $amount_ttc = array();
-			                        $multicurrency_amount_ht = $multicurrency_amount_tva = $multicurrency_amount_ttc = array();
+							if (!in_array($invoice->type, $affected_types)) dol_syslog("Invoice ".$facid." is not a standard, nor replacement invoice, nor credit note, nor deposit invoice, nor situation invoice. We do nothing more.");
+							elseif ($remaintopay) dol_syslog("Remain to pay for invoice ".$facid." not null. We do nothing more.");
+							//else if ($mustwait) dol_syslog("There is ".$mustwait." differed payment to process, we do nothing more.");
+							else {
+								// If invoice is a down payment, we also convert down payment to discount
+								if ($invoice->type == Facture::TYPE_DEPOSIT)
+								{
+									$amount_ht = $amount_tva = $amount_ttc = array();
+									$multicurrency_amount_ht = $multicurrency_amount_tva = $multicurrency_amount_ttc = array();
 
 									// Insert one discount by VAT rate category
 									$discount = new DiscountAbsolute($this->db);
@@ -387,48 +387,48 @@ class Paiement extends CommonObject
 										}
 									}
 
-                                    if ($error)
-                                    {
-                                        setEventMessages($discount->error, $discount->errors, 'errors');
-                                        $error++;
-                                    }
-                                }
+									if ($error)
+									{
+										setEventMessages($discount->error, $discount->errors, 'errors');
+										$error++;
+									}
+								}
 
-                                // Set invoice to paid
-                                if (!$error)
-                                {
-                                    $result = $invoice->set_paid($user, '', '');
-                                    if ($result < 0)
-                                    {
-                                        $this->error = $invoice->error;
-                                        $error++;
-                                    }
-                                }
-                            }
-					    }
+								// Set invoice to paid
+								if (!$error)
+								{
+									$result = $invoice->set_paid($user, '', '');
+									if ($result < 0)
+									{
+										$this->error = $invoice->error;
+										$error++;
+									}
+								}
+							}
+						}
 
-					    // Regenerate documents of invoices
-                        if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
-                        {
-                        	dol_syslog(get_class($this).'::create Regenerate the document after inserting payment for thirdparty default_lang='.(is_object($invoice->thirdparty) ? $invoice->thirdparty->default_lang : 'null'), LOG_DEBUG);
+						// Regenerate documents of invoices
+						if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
+						{
+							dol_syslog(get_class($this).'::create Regenerate the document after inserting payment for thirdparty default_lang='.(is_object($invoice->thirdparty) ? $invoice->thirdparty->default_lang : 'null'), LOG_DEBUG);
 
-                            $newlang = '';
-                            $outputlangs = $langs;
-                            if ($conf->global->MAIN_MULTILANGS && empty($newlang)) {
-                            	$invoice->fetch_thirdparty();
-                            	$newlang = $invoice->thirdparty->default_lang;
-                            }
-                            if (!empty($newlang)) {
-                            	$outputlangs = new Translate("", $conf);
-                            	$outputlangs->setDefaultLang($newlang);
-                            }
-                            $ret = $invoice->fetch($facid); // Reload to get new records
-                            $result = $invoice->generateDocument($invoice->modelpdf, $outputlangs);
-                            if ($result < 0) {
-                            	setEventMessages($invoice->error, $invoice->errors, 'errors');
-                            	$error++;
-                            }
-                        }
+							$newlang = '';
+							$outputlangs = $langs;
+							if ($conf->global->MAIN_MULTILANGS && empty($newlang)) {
+								$invoice->fetch_thirdparty();
+								$newlang = $invoice->thirdparty->default_lang;
+							}
+							if (!empty($newlang)) {
+								$outputlangs = new Translate("", $conf);
+								$outputlangs->setDefaultLang($newlang);
+							}
+							$ret = $invoice->fetch($facid); // Reload to get new records
+							$result = $invoice->generateDocument($invoice->modelpdf, $outputlangs);
+							if ($result < 0) {
+								setEventMessages($invoice->error, $invoice->errors, 'errors');
+								$error++;
+							}
+						}
 					} else {
 						$this->error = $this->db->lasterror();
 						$error++;
@@ -452,9 +452,9 @@ class Paiement extends CommonObject
 
 		if (!$error)
 		{
-		    $this->amount = $total;
-		    $this->total = $total; // deprecated
-		    $this->multicurrency_amount = $mtotal;
+			$this->amount = $total;
+			$this->total = $total; // deprecated
+			$this->multicurrency_amount = $mtotal;
 			$this->db->commit();
 			return $this->id;
 		} else {
@@ -472,7 +472,7 @@ class Paiement extends CommonObject
 	 *  @param	int		$notrigger		No trigger
 	 *  @return int     				<0 si ko, >0 si ok
 	 */
-    public function delete($notrigger = 0)
+	public function delete($notrigger = 0)
 	{
 		global $conf, $user, $langs;
 
@@ -503,21 +503,21 @@ class Paiement extends CommonObject
 		{
 			$accline = new AccountLine($this->db);
 
-			$result=$accline->fetch($bank_line_id);
+			$result = $accline->fetch($bank_line_id);
 			if ($result == 0) {
-				$accline->id = $accline->rowid = $bank_line_id;    // If not found, we set artificially rowid to allow delete of llx_bank_url
+				$accline->id = $accline->rowid = $bank_line_id; // If not found, we set artificially rowid to allow delete of llx_bank_url
 			}
 
-            // Delete bank account url lines linked to payment
+			// Delete bank account url lines linked to payment
 			$result = $accline->delete_urls($user);
-            if ($result < 0)
-            {
-                $this->error = $accline->error;
+			if ($result < 0)
+			{
+				$this->error = $accline->error;
 				$this->db->rollback();
 				return -3;
-            }
+			}
 
-            // Delete bank account lines linked to payment
+			// Delete bank account lines linked to payment
 			$result = $accline->delete($user);
 			if ($result < 0)
 			{
@@ -533,10 +533,10 @@ class Paiement extends CommonObject
 			$result = $this->call_trigger('PAYMENT_CUSTOMER_DELETE', $user);
 			if ($result < 0)
 			{
-			    $this->db->rollback();
-			    return -1;
-            }
-            // End call triggers
+				$this->db->rollback();
+				return -1;
+			}
+			// End call triggers
 		}
 
 		// Delete payment (into paiement_facture and paiement)
@@ -548,7 +548,7 @@ class Paiement extends CommonObject
 		{
 			$sql = 'DELETE FROM '.MAIN_DB_PREFIX.'paiement';
 			$sql .= ' WHERE rowid = '.$this->id;
-		    dol_syslog($sql);
+			dol_syslog($sql);
 			$result = $this->db->query($sql);
 			if (!$result)
 			{
@@ -567,144 +567,144 @@ class Paiement extends CommonObject
 	}
 
 
-    /**
-     *      Add a record into bank for payment + links between this bank record and sources of payment.
-     *      All payment properties (this->amount, this->amounts, ...) must have been set first like after a call to create().
-     *
-     *      @param	User	$user               Object of user making payment
-     *      @param  string	$mode               'payment', 'payment_supplier'
-     *      @param  string	$label              Label to use in bank record. Note: If label is '(WithdrawalPayment)', a third entry 'widthdraw' is added into bank_url.
-     *      @param  int		$accountid          Id of bank account to do link with
-     *      @param  string	$emetteur_nom       Name of transmitter
-     *      @param  string	$emetteur_banque    Name of bank
-     *      @param	int		$notrigger			No trigger
-     *      @return int                 		<0 if KO, bank_line_id if OK
-     */
-    public function addPaymentToBank($user, $mode, $label, $accountid, $emetteur_nom, $emetteur_banque, $notrigger = 0)
-    {
-        global $conf, $langs, $user;
+	/**
+	 *      Add a record into bank for payment + links between this bank record and sources of payment.
+	 *      All payment properties (this->amount, this->amounts, ...) must have been set first like after a call to create().
+	 *
+	 *      @param	User	$user               Object of user making payment
+	 *      @param  string	$mode               'payment', 'payment_supplier'
+	 *      @param  string	$label              Label to use in bank record. Note: If label is '(WithdrawalPayment)', a third entry 'widthdraw' is added into bank_url.
+	 *      @param  int		$accountid          Id of bank account to do link with
+	 *      @param  string	$emetteur_nom       Name of transmitter
+	 *      @param  string	$emetteur_banque    Name of bank
+	 *      @param	int		$notrigger			No trigger
+	 *      @return int                 		<0 if KO, bank_line_id if OK
+	 */
+	public function addPaymentToBank($user, $mode, $label, $accountid, $emetteur_nom, $emetteur_banque, $notrigger = 0)
+	{
+		global $conf, $langs, $user;
 
-        $error = 0;
-        $bank_line_id = 0;
+		$error = 0;
+		$bank_line_id = 0;
 
-        if (!empty($conf->banque->enabled))
-        {
-        	if ($accountid <= 0)
-        	{
-        		$this->error = 'Bad value for parameter accountid='.$accountid;
-        		dol_syslog(get_class($this).'::addPaymentToBank '.$this->error, LOG_ERR);
-        		return -1;
-        	}
+		if (!empty($conf->banque->enabled))
+		{
+			if ($accountid <= 0)
+			{
+				$this->error = 'Bad value for parameter accountid='.$accountid;
+				dol_syslog(get_class($this).'::addPaymentToBank '.$this->error, LOG_ERR);
+				return -1;
+			}
 
-        	$this->db->begin();
+			$this->db->begin();
 
-        	$this->fk_account = $accountid;
+			$this->fk_account = $accountid;
 
-        	include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+			include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 
-            dol_syslog("$user->id, $mode, $label, $this->fk_account, $emetteur_nom, $emetteur_banque");
+			dol_syslog("$user->id, $mode, $label, $this->fk_account, $emetteur_nom, $emetteur_banque");
 
-            $acc = new Account($this->db);
-            $result = $acc->fetch($this->fk_account);
+			$acc = new Account($this->db);
+			$result = $acc->fetch($this->fk_account);
 
 			$totalamount = $this->amount;
-            if (empty($totalamount)) $totalamount = $this->total; // For backward compatibility
+			if (empty($totalamount)) $totalamount = $this->total; // For backward compatibility
 
-            // if dolibarr currency != bank currency then we received an amount in customer currency (currently I don't manage the case : my currency is USD, the customer currency is EUR and he paid me in GBP. Seems no sense for me)
-            if (!empty($conf->multicurrency->enabled) && $conf->currency != $acc->currency_code) $totalamount = $this->multicurrency_amount;
+			// if dolibarr currency != bank currency then we received an amount in customer currency (currently I don't manage the case : my currency is USD, the customer currency is EUR and he paid me in GBP. Seems no sense for me)
+			if (!empty($conf->multicurrency->enabled) && $conf->currency != $acc->currency_code) $totalamount = $this->multicurrency_amount;
 
-            if ($mode == 'payment_supplier') $totalamount = -$totalamount;
+			if ($mode == 'payment_supplier') $totalamount = -$totalamount;
 
-            // Insert payment into llx_bank
-            $bank_line_id = $acc->addline(
-                $this->datepaye,
-                $this->paiementid, // Payment mode id or code ("CHQ or VIR for example")
-                $label,
-                $totalamount, // Sign must be positive when we receive money (customer payment), negative when you give money (supplier invoice or credit note)
-                $this->num_payment,
-                '',
-                $user,
-                $emetteur_nom,
-                $emetteur_banque
-            );
+			// Insert payment into llx_bank
+			$bank_line_id = $acc->addline(
+				$this->datepaye,
+				$this->paiementid, // Payment mode id or code ("CHQ or VIR for example")
+				$label,
+				$totalamount, // Sign must be positive when we receive money (customer payment), negative when you give money (supplier invoice or credit note)
+				$this->num_payment,
+				'',
+				$user,
+				$emetteur_nom,
+				$emetteur_banque
+			);
 
-            // Mise a jour fk_bank dans llx_paiement
-            // On connait ainsi le paiement qui a genere l'ecriture bancaire
-            if ($bank_line_id > 0)
-            {
-                $result = $this->update_fk_bank($bank_line_id);
-                if ($result <= 0)
-                {
-                    $error++;
-                    dol_print_error($this->db);
-                }
+			// Mise a jour fk_bank dans llx_paiement
+			// On connait ainsi le paiement qui a genere l'ecriture bancaire
+			if ($bank_line_id > 0)
+			{
+				$result = $this->update_fk_bank($bank_line_id);
+				if ($result <= 0)
+				{
+					$error++;
+					dol_print_error($this->db);
+				}
 
-                // Add link 'payment', 'payment_supplier' in bank_url between payment and bank transaction
-                if (!$error)
-                {
-                    $url = '';
-                    if ($mode == 'payment') $url = DOL_URL_ROOT.'/compta/paiement/card.php?id=';
-                    if ($mode == 'payment_supplier') $url = DOL_URL_ROOT.'/fourn/paiement/card.php?id=';
-                    if ($url)
-                    {
-                        $result = $acc->add_url_line($bank_line_id, $this->id, $url, '(paiement)', $mode);
-                        if ($result <= 0)
-                        {
-                            $error++;
-                            dol_print_error($this->db);
-                        }
-                    }
-                }
+				// Add link 'payment', 'payment_supplier' in bank_url between payment and bank transaction
+				if (!$error)
+				{
+					$url = '';
+					if ($mode == 'payment') $url = DOL_URL_ROOT.'/compta/paiement/card.php?id=';
+					if ($mode == 'payment_supplier') $url = DOL_URL_ROOT.'/fourn/paiement/card.php?id=';
+					if ($url)
+					{
+						$result = $acc->add_url_line($bank_line_id, $this->id, $url, '(paiement)', $mode);
+						if ($result <= 0)
+						{
+							$error++;
+							dol_print_error($this->db);
+						}
+					}
+				}
 
-                // Add link 'company' in bank_url between invoice and bank transaction (for each invoice concerned by payment)
-                //if (! $error && $label != '(WithdrawalPayment)')
-                if (!$error)
-                {
-                    $linkaddedforthirdparty = array();
-                    foreach ($this->amounts as $key => $value)  // We should have invoices always for same third party but we loop in case of.
-                    {
-                        if ($mode == 'payment')
-                        {
-                            $fac = new Facture($this->db);
-                            $fac->fetch($key);
-                            $fac->fetch_thirdparty();
-                            if (!in_array($fac->thirdparty->id, $linkaddedforthirdparty)) // Not yet done for this thirdparty
-                            {
-                                $result = $acc->add_url_line(
-                                    $bank_line_id,
-                                    $fac->thirdparty->id,
-                                    DOL_URL_ROOT.'/comm/card.php?socid=',
-                                    $fac->thirdparty->name,
-                                    'company'
-                                );
-                                if ($result <= 0) dol_syslog(get_class($this).'::addPaymentToBank '.$this->db->lasterror());
-                                $linkaddedforthirdparty[$fac->thirdparty->id] = $fac->thirdparty->id; // Mark as done for this thirdparty
-                            }
-                        }
-                        if ($mode == 'payment_supplier')
-                        {
-                            $fac = new FactureFournisseur($this->db);
-                            $fac->fetch($key);
-                            $fac->fetch_thirdparty();
-                            if (!in_array($fac->thirdparty->id, $linkaddedforthirdparty)) // Not yet done for this thirdparty
-                            {
-                                $result = $acc->add_url_line(
-                                    $bank_line_id,
-                                    $fac->thirdparty->id,
-                                    DOL_URL_ROOT.'/fourn/card.php?socid=',
-                                    $fac->thirdparty->name,
-                                    'company'
-                                );
-                                if ($result <= 0) dol_syslog(get_class($this).'::addPaymentToBank '.$this->db->lasterror());
-                                $linkaddedforthirdparty[$fac->thirdparty->id] = $fac->thirdparty->id; // Mark as done for this thirdparty
-                            }
-                        }
-                    }
-                }
+				// Add link 'company' in bank_url between invoice and bank transaction (for each invoice concerned by payment)
+				//if (! $error && $label != '(WithdrawalPayment)')
+				if (!$error)
+				{
+					$linkaddedforthirdparty = array();
+					foreach ($this->amounts as $key => $value)  // We should have invoices always for same third party but we loop in case of.
+					{
+						if ($mode == 'payment')
+						{
+							$fac = new Facture($this->db);
+							$fac->fetch($key);
+							$fac->fetch_thirdparty();
+							if (!in_array($fac->thirdparty->id, $linkaddedforthirdparty)) // Not yet done for this thirdparty
+							{
+								$result = $acc->add_url_line(
+									$bank_line_id,
+									$fac->thirdparty->id,
+									DOL_URL_ROOT.'/comm/card.php?socid=',
+									$fac->thirdparty->name,
+									'company'
+								);
+								if ($result <= 0) dol_syslog(get_class($this).'::addPaymentToBank '.$this->db->lasterror());
+								$linkaddedforthirdparty[$fac->thirdparty->id] = $fac->thirdparty->id; // Mark as done for this thirdparty
+							}
+						}
+						if ($mode == 'payment_supplier')
+						{
+							$fac = new FactureFournisseur($this->db);
+							$fac->fetch($key);
+							$fac->fetch_thirdparty();
+							if (!in_array($fac->thirdparty->id, $linkaddedforthirdparty)) // Not yet done for this thirdparty
+							{
+								$result = $acc->add_url_line(
+									$bank_line_id,
+									$fac->thirdparty->id,
+									DOL_URL_ROOT.'/fourn/card.php?socid=',
+									$fac->thirdparty->name,
+									'company'
+								);
+								if ($result <= 0) dol_syslog(get_class($this).'::addPaymentToBank '.$this->db->lasterror());
+								$linkaddedforthirdparty[$fac->thirdparty->id] = $fac->thirdparty->id; // Mark as done for this thirdparty
+							}
+						}
+					}
+				}
 
 				// Add link 'WithdrawalPayment' in bank_url
 				if (!$error && $label == '(WithdrawalPayment)') {
-                    $result = $acc->add_url_line(
+					$result = $acc->add_url_line(
 						$bank_line_id,
 						$this->id_prelevement,
 						DOL_URL_ROOT.'/compta/prelevement/card.php?id=',
@@ -713,45 +713,45 @@ class Paiement extends CommonObject
 					);
 				}
 
-	            if (!$error && !$notrigger)
+				if (!$error && !$notrigger)
 				{
 					// Appel des triggers
 					$result = $this->call_trigger('PAYMENT_ADD_TO_BANK', $user);
-				    if ($result < 0) { $error++; }
-				    // Fin appel triggers
+					if ($result < 0) { $error++; }
+					// Fin appel triggers
 				}
-            } else {
-                $this->error = $acc->error;
-                $error++;
-            }
+			} else {
+				$this->error = $acc->error;
+				$error++;
+			}
 
-            if (!$error)
-            {
-            	$this->db->commit();
-            } else {
-            	$this->db->rollback();
-            }
-        }
+			if (!$error)
+			{
+				$this->db->commit();
+			} else {
+				$this->db->rollback();
+			}
+		}
 
-        if (!$error)
-        {
-            return $bank_line_id;
-        } else {
-            return -1;
-        }
-    }
+		if (!$error)
+		{
+			return $bank_line_id;
+		} else {
+			return -1;
+		}
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *      Mise a jour du lien entre le paiement et la ligne generee dans llx_bank
 	 *
 	 *      @param	int		$id_bank    Id compte bancaire
 	 *      @return	int					<0 if KO, >0 if OK
 	 */
-    public function update_fk_bank($id_bank)
+	public function update_fk_bank($id_bank)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element.' set fk_bank = '.$id_bank;
 		$sql .= ' WHERE rowid = '.$this->id;
 
@@ -761,123 +761,123 @@ class Paiement extends CommonObject
 		{
 			return 1;
 		} else {
-            $this->error = $this->db->lasterror();
-            dol_syslog(get_class($this).'::update_fk_bank '.$this->error);
+			$this->error = $this->db->lasterror();
+			dol_syslog(get_class($this).'::update_fk_bank '.$this->error);
 			return -1;
 		}
-    }
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *	Updates the payment date
-     *
-     *  @param	int	$date   New date
-     *  @return int					<0 if KO, 0 if OK
-     */
-    public function update_date($date)
-    {
-        // phpcs:enable
-        $error = 0;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *	Updates the payment date
+	 *
+	 *  @param	int	$date   New date
+	 *  @return int					<0 if KO, 0 if OK
+	 */
+	public function update_date($date)
+	{
+		// phpcs:enable
+		$error = 0;
 
-        if (!empty($date) && $this->statut != 1)
-        {
-            $this->db->begin();
+		if (!empty($date) && $this->statut != 1)
+		{
+			$this->db->begin();
 
-            dol_syslog(get_class($this)."::update_date with date = ".$date, LOG_DEBUG);
+			dol_syslog(get_class($this)."::update_date with date = ".$date, LOG_DEBUG);
 
-            $sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
-            $sql .= " SET datep = '".$this->db->idate($date)."'";
-            $sql .= " WHERE rowid = ".$this->id;
+			$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
+			$sql .= " SET datep = '".$this->db->idate($date)."'";
+			$sql .= " WHERE rowid = ".$this->id;
 
-            $result = $this->db->query($sql);
-            if (!$result)
-            {
-                $error++;
-                $this->error = 'Error -1 '.$this->db->error();
-            }
+			$result = $this->db->query($sql);
+			if (!$result)
+			{
+				$error++;
+				$this->error = 'Error -1 '.$this->db->error();
+			}
 
-            $type = $this->element;
+			$type = $this->element;
 
-            $sql = "UPDATE ".MAIN_DB_PREFIX.'bank';
-            $sql .= " SET dateo = '".$this->db->idate($date)."', datev = '".$this->db->idate($date)."'";
-            $sql .= " WHERE rowid IN (SELECT fk_bank FROM ".MAIN_DB_PREFIX."bank_url WHERE type = '".$this->db->escape($type)."' AND url_id = ".$this->id.")";
-            $sql .= " AND rappro = 0";
+			$sql = "UPDATE ".MAIN_DB_PREFIX.'bank';
+			$sql .= " SET dateo = '".$this->db->idate($date)."', datev = '".$this->db->idate($date)."'";
+			$sql .= " WHERE rowid IN (SELECT fk_bank FROM ".MAIN_DB_PREFIX."bank_url WHERE type = '".$this->db->escape($type)."' AND url_id = ".$this->id.")";
+			$sql .= " AND rappro = 0";
 
-            $result = $this->db->query($sql);
-            if (!$result)
-            {
-                $error++;
-                $this->error = 'Error -1 '.$this->db->error();
-            }
+			$result = $this->db->query($sql);
+			if (!$result)
+			{
+				$error++;
+				$this->error = 'Error -1 '.$this->db->error();
+			}
 
-            if (!$error)
-            {
-            }
+			if (!$error)
+			{
+			}
 
-            if (!$error)
-            {
-                $this->datepaye = $date;
-                $this->date = $date;
+			if (!$error)
+			{
+				$this->datepaye = $date;
+				$this->date = $date;
 
-                $this->db->commit();
-                return 0;
-            } else {
-                $this->db->rollback();
-                return -2;
-            }
-        }
-        return -1; //no date given or already validated
-    }
+				$this->db->commit();
+				return 0;
+			} else {
+				$this->db->rollback();
+				return -2;
+			}
+		}
+		return -1; //no date given or already validated
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Updates the payment number
-     *
-     *  @param	string	$num		New num
-     *  @return int					<0 if KO, 0 if OK
-     */
-    public function update_num($num)
-    {
-        // phpcs:enable
-        if (!empty($num) && $this->statut != 1) {
-            $sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
-            $sql .= " SET num_paiement = '".$this->db->escape($num)."'";
-            $sql .= " WHERE rowid = ".$this->id;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Updates the payment number
+	 *
+	 *  @param	string	$num		New num
+	 *  @return int					<0 if KO, 0 if OK
+	 */
+	public function update_num($num)
+	{
+		// phpcs:enable
+		if (!empty($num) && $this->statut != 1) {
+			$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
+			$sql .= " SET num_paiement = '".$this->db->escape($num)."'";
+			$sql .= " WHERE rowid = ".$this->id;
 
-            dol_syslog(get_class($this)."::update_num", LOG_DEBUG);
-            $result = $this->db->query($sql);
-            if ($result)
-            {
-            	$this->num_payment = $this->db->escape($num);
-                return 0;
-            } else {
-                $this->error = 'Error -1 '.$this->db->error();
-                return -2;
-            }
-        }
-        return -1; //no num given or already validated
-    }
+			dol_syslog(get_class($this)."::update_num", LOG_DEBUG);
+			$result = $this->db->query($sql);
+			if ($result)
+			{
+				$this->num_payment = $this->db->escape($num);
+				return 0;
+			} else {
+				$this->error = 'Error -1 '.$this->db->error();
+				return -2;
+			}
+		}
+		return -1; //no num given or already validated
+	}
 
-    /**
-     *    Validate payment
-     *
-     *	  @param	User	$user		User making validation
-     *    @return   int     			<0 if KO, >0 if OK
-     *    @deprecated
-     */
-    public function valide(User $user = null)
-    {
-    	return $this->validate($user);
-    }
+	/**
+	 *    Validate payment
+	 *
+	 *	  @param	User	$user		User making validation
+	 *    @return   int     			<0 if KO, >0 if OK
+	 *    @deprecated
+	 */
+	public function valide(User $user = null)
+	{
+		return $this->validate($user);
+	}
 
-    /**
+	/**
 	 *    Validate payment
 	 *
 	 *	  @param	User	$user		User making validation
 	 *    @return   int     			<0 if KO, >0 if OK
 	 */
-    public function validate(User $user = null)
-    {
+	public function validate(User $user = null)
+	{
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element.' SET statut = 1 WHERE rowid = '.$this->id;
 
 		dol_syslog(get_class($this).'::valide', LOG_DEBUG);
@@ -890,7 +890,7 @@ class Paiement extends CommonObject
 			dol_syslog(get_class($this).'::valide '.$this->error);
 			return -1;
 		}
-    }
+	}
 
 	/**
 	 *    Reject payment
@@ -898,8 +898,8 @@ class Paiement extends CommonObject
 	 *	  @param	User	$user		User making reject
 	 *    @return   int     			<0 if KO, >0 if OK
 	 */
-    public function reject(User $user = null)
-    {
+	public function reject(User $user = null)
+	{
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element.' SET statut = 2 WHERE rowid = '.$this->id;
 
 		dol_syslog(get_class($this).'::reject', LOG_DEBUG);
@@ -912,7 +912,7 @@ class Paiement extends CommonObject
 			dol_syslog(get_class($this).'::reject '.$this->error);
 			return -1;
 		}
-    }
+	}
 
 	/**
 	 *    Information sur l'objet
@@ -920,8 +920,8 @@ class Paiement extends CommonObject
 	 *    @param   int     $id      id du paiement dont il faut afficher les infos
 	 *    @return  void
 	 */
-    public function info($id)
-    {
+	public function info($id)
+	{
 		$sql = 'SELECT p.rowid, p.datec, p.fk_user_creat, p.fk_user_modif, p.tms';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'paiement as p';
 		$sql .= ' WHERE p.rowid = '.$id;
@@ -954,7 +954,7 @@ class Paiement extends CommonObject
 		} else {
 			dol_print_error($this->db);
 		}
-    }
+	}
 
 	/**
 	 *  Return list of invoices the payment is related to.
@@ -962,8 +962,8 @@ class Paiement extends CommonObject
 	 *  @param	string		$filter         Filter
 	 *  @return int|array					<0 if KO or array of invoice id
 	 */
-    public function getBillsArray($filter = '')
-    {
+	public function getBillsArray($filter = '')
+	{
 		$sql = 'SELECT pf.fk_facture';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'paiement_facture as pf, '.MAIN_DB_PREFIX.'facture as f'; // We keep link on invoice to allow use of some filters on invoice
 		$sql .= ' WHERE pf.fk_facture = f.rowid AND pf.fk_paiement = '.$this->id;
@@ -988,39 +988,39 @@ class Paiement extends CommonObject
 			dol_syslog(get_class($this).'::getBillsArray Error '.$this->error.' -', LOG_DEBUG);
 			return -1;
 		}
-    }
+	}
 
-    /**
-     *  Return list of amounts of payments.
-     *
-     *  @return int|array					Array of amount of payments
-     */
-    public function getAmountsArray()
-    {
-    	$sql = 'SELECT pf.fk_facture, pf.amount';
-    	$sql .= ' FROM '.MAIN_DB_PREFIX.'paiement_facture as pf';
-    	$sql .= ' WHERE pf.fk_paiement = '.$this->id;
-    	$resql = $this->db->query($sql);
-    	if ($resql)
-    	{
-    		$i = 0;
-    		$num = $this->db->num_rows($resql);
-    		$amounts = array();
+	/**
+	 *  Return list of amounts of payments.
+	 *
+	 *  @return int|array					Array of amount of payments
+	 */
+	public function getAmountsArray()
+	{
+		$sql = 'SELECT pf.fk_facture, pf.amount';
+		$sql .= ' FROM '.MAIN_DB_PREFIX.'paiement_facture as pf';
+		$sql .= ' WHERE pf.fk_paiement = '.$this->id;
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$i = 0;
+			$num = $this->db->num_rows($resql);
+			$amounts = array();
 
-    		while ($i < $num)
-    		{
-    			$obj = $this->db->fetch_object($resql);
-    			$amounts[$obj->fk_facture] = $obj->amount;
-    			$i++;
-    		}
+			while ($i < $num)
+			{
+				$obj = $this->db->fetch_object($resql);
+				$amounts[$obj->fk_facture] = $obj->amount;
+				$i++;
+			}
 
-    		return $amounts;
-    	} else {
-    		$this->error = $this->db->error();
-    		dol_syslog(get_class($this).'::getAmountsArray Error '.$this->error.' -', LOG_DEBUG);
-    		return -1;
-    	}
-    }
+			return $amounts;
+		} else {
+			$this->error = $this->db->error();
+			dol_syslog(get_class($this).'::getAmountsArray Error '.$this->error.' -', LOG_DEBUG);
+			return -1;
+		}
+	}
 
 	/**
 	 *      Return next reference of customer invoice not already used (or last reference)
@@ -1030,7 +1030,7 @@ class Paiement extends CommonObject
 	 *      @param     string		$mode		'next' for next value or 'last' for last value
 	 *      @return    string					free ref or last ref
 	 */
-    public function getNextNumRef($soc, $mode = 'next')
+	public function getNextNumRef($soc, $mode = 'next')
 	{
 		global $conf, $db, $langs;
 		$langs->load("bills");
@@ -1110,7 +1110,7 @@ class Paiement extends CommonObject
 	 *
 	 * 	@return 	string 	'dolibarr' if standard comportment or paid in main currency, 'customer' if payment received from multicurrency inputs
 	 */
-    public function getWay()
+	public function getWay()
 	{
 		global $conf;
 
@@ -1138,7 +1138,7 @@ class Paiement extends CommonObject
 	 *	@param	string		$option		''=Create a specimen invoice with lines, 'nolines'=No lines
 	 *  @return	void
 	 */
-    public function initAsSpecimen($option = '')
+	public function initAsSpecimen($option = '')
 	{
 		global $user, $langs, $conf;
 
@@ -1161,50 +1161,50 @@ class Paiement extends CommonObject
 	 *	@param	int		$withpicto		0=No picto, 1=Include picto into link, 2=Only picto
 	 *	@param	string	$option			Sur quoi pointe le lien
 	 *  @param  string  $mode           'withlistofinvoices'=Include list of invoices into tooltip
-     *  @param	int  	$notooltip		1=Disable tooltip
+	 *  @param	int  	$notooltip		1=Disable tooltip
 	 *	@return	string					Chaine avec URL
 	 */
-    public function getNomUrl($withpicto = 0, $option = '', $mode = 'withlistofinvoices', $notooltip = 0)
+	public function getNomUrl($withpicto = 0, $option = '', $mode = 'withlistofinvoices', $notooltip = 0)
 	{
 		global $conf, $langs;
 
 		if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
 
 		$result = '';
-        $label = img_picto('', $this->picto).' <u>'.$langs->trans("Payment").'</u><br>';
-        $label .= '<strong>'.$langs->trans("Ref").':</strong> '.$this->ref;
-        if ($this->datepaye ? $this->datepaye : $this->date) $label .= '<br><strong>'.$langs->trans("Date").':</strong> '.dol_print_date($this->datepaye ? $this->datepaye : $this->date, 'dayhour');
-        if ($mode == 'withlistofinvoices')
-        {
-            $arraybill = $this->getBillsArray();
-            if (is_array($arraybill) && count($arraybill) > 0)
-            {
-            	include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-            	$facturestatic = new Facture($this->db);
-            	foreach ($arraybill as $billid)
-            	{
-            		$facturestatic->fetch($billid);
-            		$label .= '<br> '.$facturestatic->getNomUrl(1, '', 0, 0, '', 1).' '.$facturestatic->getLibStatut(2, 1);
-            	}
-            }
-        }
+		$label = img_picto('', $this->picto).' <u>'.$langs->trans("Payment").'</u><br>';
+		$label .= '<strong>'.$langs->trans("Ref").':</strong> '.$this->ref;
+		if ($this->datepaye ? $this->datepaye : $this->date) $label .= '<br><strong>'.$langs->trans("Date").':</strong> '.dol_print_date($this->datepaye ? $this->datepaye : $this->date, 'dayhour');
+		if ($mode == 'withlistofinvoices')
+		{
+			$arraybill = $this->getBillsArray();
+			if (is_array($arraybill) && count($arraybill) > 0)
+			{
+				include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+				$facturestatic = new Facture($this->db);
+				foreach ($arraybill as $billid)
+				{
+					$facturestatic->fetch($billid);
+					$label .= '<br> '.$facturestatic->getNomUrl(1, '', 0, 0, '', 1).' '.$facturestatic->getLibStatut(2, 1);
+				}
+			}
+		}
 
-        $linkclose = '';
-        if (empty($notooltip))
-        {
-        	if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-        	{
-        		$label = $langs->trans("ShowMyObject");
-        		$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
-        	}
-        	$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
-        	$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
-        } else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+		$linkclose = '';
+		if (empty($notooltip))
+		{
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+			{
+				$label = $langs->trans("ShowMyObject");
+				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
+			}
+			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
+			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
+		} else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
-        $url = DOL_URL_ROOT.'/compta/paiement/card.php?id='.$this->id;
+		$url = DOL_URL_ROOT.'/compta/paiement/card.php?id='.$this->id;
 
-        $linkstart = '<a href="'.$url.'"';
-        $linkstart .= $linkclose.'>';
+		$linkstart = '<a href="'.$url.'"';
+		$linkstart .= $linkclose.'>';
 		$linkend = '</a>';
 
 		$result .= $linkstart;
@@ -1221,12 +1221,12 @@ class Paiement extends CommonObject
 	 * @param	int		$mode       0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
 	 * @return  string				Libelle
 	 */
-    public function getLibStatut($mode = 0)
+	public function getLibStatut($mode = 0)
 	{
 		return $this->LibStatut($this->statut, $mode);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Renvoi le libelle d'un statut donne
 	 *
@@ -1234,9 +1234,9 @@ class Paiement extends CommonObject
 	 * @param   int		$mode       0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
 	 * @return	string  		    Libelle du statut
 	 */
-    public function LibStatut($status, $mode = 0)
+	public function LibStatut($status, $mode = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs; // TODO Renvoyer le libelle anglais et faire traduction a affichage
 
 		$langs->load('compta');
@@ -1278,16 +1278,16 @@ class Paiement extends CommonObject
 		return '';
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Load the third party of object, from id into this->thirdparty
 	 *
 	 *	@param		int		$force_thirdparty_id	Force thirdparty id
 	 *	@return		int								<0 if KO, >0 if OK
 	 */
-    public function fetch_thirdparty($force_thirdparty_id = 0)
+	public function fetch_thirdparty($force_thirdparty_id = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 
 		if (empty($force_thirdparty_id))
diff --git a/htdocs/compta/paiement/info.php b/htdocs/compta/paiement/info.php
index a1640f08496..208d74a316f 100644
--- a/htdocs/compta/paiement/info.php
+++ b/htdocs/compta/paiement/info.php
@@ -74,7 +74,7 @@ print '</td></tr></table>';
 
 print '</div>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // End of page
 llxFooter();
diff --git a/htdocs/compta/paiement/list.php b/htdocs/compta/paiement/list.php
index f3ea57ea084..e1f6fb38dbc 100644
--- a/htdocs/compta/paiement/list.php
+++ b/htdocs/compta/paiement/list.php
@@ -48,29 +48,29 @@ $langs->loadLangs(array('bills', 'banks', 'compta', 'companies'));
 $action				= GETPOST('action', 'alpha');
 $massaction			= GETPOST('massaction', 'alpha');
 $confirm			= GETPOST('confirm', 'alpha');
-$optioncss			= GETPOST('optioncss', 'alpha');
+$optioncss = GETPOST('optioncss', 'alpha');
 $contextpage		= GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'paymentlist';
 
 $facid				= GETPOST('facid', 'int');
 $socid				= GETPOST('socid', 'int');
-$userid				= GETPOST('userid', 'int');
-$day				= GETPOST('day', 'int');
+$userid = GETPOST('userid', 'int');
+$day = GETPOST('day', 'int');
 $month				= GETPOST('month', 'int');
-$year				= GETPOST('year', 'int');
+$year = GETPOST('year', 'int');
 
-$search_ref			= GETPOST("search_ref", "alpha");
+$search_ref = GETPOST("search_ref", "alpha");
 $search_company		= GETPOST("search_company", 'alpha');
 $search_paymenttype	= GETPOST("search_paymenttype");
 $search_account		= GETPOST("search_account", "int");
 $search_payment_num	= GETPOST('search_payment_num', 'alpha');
-$search_amount		= GETPOST("search_amount", 'alpha'); // alpha because we must be able to search on "< x"
+$search_amount = GETPOST("search_amount", 'alpha'); // alpha because we must be able to search on "< x"
 
-$limit				= GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield			= GETPOST("sortfield", 'alpha');
 $sortorder			= GETPOST("sortorder", 'alpha');
-$page				= GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 
-if (empty($page) || $page == -1) $page = 0;      // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1) $page = 0; // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
@@ -78,7 +78,7 @@ $pagenext = $page + 1;
 if (!$sortorder) $sortorder = "DESC";
 if (!$sortfield) $sortfield = "p.ref";
 
-$search_all = trim(GETPOSTISSET("search_all") ? GETPOSTISSET("search_all", 'alpha') : GETPOST('sall'));
+$search_all = trim(GETPOSTISSET("search_all") ? GETPOST("search_all", 'alpha') : GETPOST('sall'));
 
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array(
@@ -89,15 +89,15 @@ $fieldstosearchall = array(
 );
 
 $arrayfields = array(
-	'p.ref'				=> array('label'=>"RefPayment",				'checked'=>1, 'position'=>10),
-	'p.datep'			=> array('label'=>"Date",					'checked'=>1, 'position'=>20),
-	's.nom'				=> array('label'=>"ThirdParty",				'checked'=>1, 'position'=>30),
-	'c.libelle'			=> array('label'=>"Type",					'checked'=>1, 'position'=>40),
-	'transaction'		=> array('label'=>"BankTransactionLine",	'checked'=>1, 'position'=>50, 'enabled'=>(!empty($conf->banque->enabled))),
-	'ba.label'			=> array('label'=>"Account",				'checked'=>1, 'position'=>60, 'enabled'=>(!empty($conf->banque->enabled))),
-	'p.num_paiement'	=> array('label'=>"Numero",					'checked'=>1, 'position'=>70, 'tooltip'=>"ChequeOrTransferNumber"),
-	'p.amount'			=> array('label'=>"Amount",					'checked'=>1, 'position'=>80),
-	'p.statut'			=> array('label'=>"Status",					'checked'=>1, 'position'=>90, 'enabled'=>(!empty($conf->global->BILL_ADD_PAYMENT_VALIDATION))),
+	'p.ref'				=> array('label'=>"RefPayment", 'checked'=>1, 'position'=>10),
+	'p.datep'			=> array('label'=>"Date", 'checked'=>1, 'position'=>20),
+	's.nom'				=> array('label'=>"ThirdParty", 'checked'=>1, 'position'=>30),
+	'c.libelle'			=> array('label'=>"Type", 'checked'=>1, 'position'=>40),
+	'transaction'		=> array('label'=>"BankTransactionLine", 'checked'=>1, 'position'=>50, 'enabled'=>(!empty($conf->banque->enabled))),
+	'ba.label'			=> array('label'=>"Account", 'checked'=>1, 'position'=>60, 'enabled'=>(!empty($conf->banque->enabled))),
+	'p.num_paiement'	=> array('label'=>"Numero", 'checked'=>1, 'position'=>70, 'tooltip'=>"ChequeOrTransferNumber"),
+	'p.amount'			=> array('label'=>"Amount", 'checked'=>1, 'position'=>80),
+	'p.statut'			=> array('label'=>"Status", 'checked'=>1, 'position'=>90, 'enabled'=>(!empty($conf->global->BILL_ADD_PAYMENT_VALIDATION))),
 );
 $arrayfields = dol_sort_array($arrayfields, 'position');
 
diff --git a/htdocs/compta/paiement/rapport.php b/htdocs/compta/paiement/rapport.php
index 9d3bae3140d..47bb2ad2582 100644
--- a/htdocs/compta/paiement/rapport.php
+++ b/htdocs/compta/paiement/rapport.php
@@ -38,8 +38,8 @@ $action = GETPOST('action', 'aZ09');
 $socid = 0;
 if ($user->socid > 0)
 {
-    $action = '';
-    $socid = $user->socid;
+	$action = '';
+	$socid = $user->socid;
 }
 
 $dir = $conf->facture->dir_output.'/payments';
@@ -55,27 +55,27 @@ if (!$year) { $year = date("Y"); }
 
 if ($action == 'builddoc')
 {
-    $rap = new pdf_paiement($db);
+	$rap = new pdf_paiement($db);
 
-    $outputlangs = $langs;
-    if (GETPOST('lang_id', 'aZ09'))
-    {
-        $outputlangs = new Translate("", $conf);
-        $outputlangs->setDefaultLang(GETPOST('lang_id', 'aZ09'));
-    }
+	$outputlangs = $langs;
+	if (GETPOST('lang_id', 'aZ09'))
+	{
+		$outputlangs = new Translate("", $conf);
+		$outputlangs->setDefaultLang(GETPOST('lang_id', 'aZ09'));
+	}
 
-    // We save charset_output to restore it because write_file can change it if needed for
-    // output format that does not support UTF8.
-    $sav_charset_output = $outputlangs->charset_output;
-    if ($rap->write_file($dir, $_POST["remonth"], $_POST["reyear"], $outputlangs) > 0)
-    {
-        $outputlangs->charset_output = $sav_charset_output;
-    } else {
-        $outputlangs->charset_output = $sav_charset_output;
-        dol_print_error($db, $obj->error);
-    }
+	// We save charset_output to restore it because write_file can change it if needed for
+	// output format that does not support UTF8.
+	$sav_charset_output = $outputlangs->charset_output;
+	if ($rap->write_file($dir, $_POST["remonth"], $_POST["reyear"], $outputlangs) > 0)
+	{
+		$outputlangs->charset_output = $sav_charset_output;
+	} else {
+		$outputlangs->charset_output = $sav_charset_output;
+		dol_print_error($db, $obj->error);
+	}
 
-    $year = $_POST["reyear"];
+	$year = $_POST["reyear"];
 }
 
 
@@ -113,59 +113,59 @@ $linkforyear = array();
 $found = 0;
 if (is_dir($dir))
 {
-    $handle = opendir($dir);
-    if (is_resource($handle))
-    {
-        while (($file = readdir($handle)) !== false)
-        {
-            if (is_dir($dir.'/'.$file) && !preg_match('/^\./', $file) && is_numeric($file))
-            {
-                $found = 1;
-                $linkforyear[] = $file;
-            }
-        }
-    }
+	$handle = opendir($dir);
+	if (is_resource($handle))
+	{
+		while (($file = readdir($handle)) !== false)
+		{
+			if (is_dir($dir.'/'.$file) && !preg_match('/^\./', $file) && is_numeric($file))
+			{
+				$found = 1;
+				$linkforyear[] = $file;
+			}
+		}
+	}
 }
 asort($linkforyear);
 foreach ($linkforyear as $cursoryear)
 {
-    print '<a href="'.$_SERVER["PHP_SELF"].'?year='.$cursoryear.'">'.$cursoryear.'</a> &nbsp;';
+	print '<a href="'.$_SERVER["PHP_SELF"].'?year='.$cursoryear.'">'.$cursoryear.'</a> &nbsp;';
 }
 
 if ($year)
 {
-    if (is_dir($dir.'/'.$year))
-    {
-        $handle = opendir($dir.'/'.$year);
+	if (is_dir($dir.'/'.$year))
+	{
+		$handle = opendir($dir.'/'.$year);
 
-        if ($found) print '<br>';
-        print '<br>';
-        print '<table width="100%" class="noborder">';
-        print '<tr class="liste_titre">';
-        print '<td>'.$langs->trans("Reporting").'</td>';
-        print '<td class="right">'.$langs->trans("Size").'</td>';
-        print '<td class="right">'.$langs->trans("Date").'</td>';
-        print '</tr>';
+		if ($found) print '<br>';
+		print '<br>';
+		print '<table width="100%" class="noborder">';
+		print '<tr class="liste_titre">';
+		print '<td>'.$langs->trans("Reporting").'</td>';
+		print '<td class="right">'.$langs->trans("Size").'</td>';
+		print '<td class="right">'.$langs->trans("Date").'</td>';
+		print '</tr>';
 
-        if (is_resource($handle))
-        {
-            while (($file = readdir($handle)) !== false)
-            {
-                if (preg_match('/^payment/i', $file))
-                {
-                    $tfile = $dir.'/'.$year.'/'.$file;
-                    $relativepath = $year.'/'.$file;
-                    print '<tr class="oddeven">';
-                    print '<td><a data-ajax="false" href="'.DOL_URL_ROOT.'/document.php?modulepart=facture_paiement&amp;file='.urlencode($relativepath).'">'.img_pdf().' '.$file.'</a>'.$formfile->showPreview($file, 'facture_paiement', $relativepath, 0).'</td>';
-                    print '<td class="right">'.dol_print_size(dol_filesize($tfile)).'</td>';
-                    print '<td class="right">'.dol_print_date(dol_filemtime($tfile), "dayhour").'</td>';
-                    print '</tr>';
-                }
-            }
-            closedir($handle);
-        }
-        print '</table>';
-    }
+		if (is_resource($handle))
+		{
+			while (($file = readdir($handle)) !== false)
+			{
+				if (preg_match('/^payment/i', $file))
+				{
+					$tfile = $dir.'/'.$year.'/'.$file;
+					$relativepath = $year.'/'.$file;
+					print '<tr class="oddeven">';
+					print '<td><a data-ajax="false" href="'.DOL_URL_ROOT.'/document.php?modulepart=facture_paiement&amp;file='.urlencode($relativepath).'">'.img_pdf().' '.$file.'</a>'.$formfile->showPreview($file, 'facture_paiement', $relativepath, 0).'</td>';
+					print '<td class="right">'.dol_print_size(dol_filesize($tfile)).'</td>';
+					print '<td class="right">'.dol_print_date(dol_filemtime($tfile), "dayhour").'</td>';
+					print '</tr>';
+				}
+			}
+			closedir($handle);
+		}
+		print '</table>';
+	}
 }
 
 // End of page
diff --git a/htdocs/compta/paiement/tovalidate.php b/htdocs/compta/paiement/tovalidate.php
index 00e9a0c4074..f6582a4ffb4 100644
--- a/htdocs/compta/paiement/tovalidate.php
+++ b/htdocs/compta/paiement/tovalidate.php
@@ -34,8 +34,8 @@ if (!$user->rights->facture->lire)
 $socid = 0;
 if ($user->socid > 0)
 {
-    $action = '';
-    $socid = $user->socid;
+	$action = '';
+	$socid = $user->socid;
 }
 
 
@@ -68,13 +68,13 @@ $sql .= ", c.libelle as paiement_type, p.num_paiement as num_payment";
 $sql .= " FROM ".MAIN_DB_PREFIX."paiement as p LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as c ON p.fk_paiement = c.id";
 if ($socid)
 {
-    $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON p.rowid = pf.fk_paiement";
-    $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."facture as f ON pf.fk_facture = f.rowid";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON p.rowid = pf.fk_paiement";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."facture as f ON pf.fk_facture = f.rowid";
 }
 $sql .= " WHERE p.entity IN (".getEntity('invoice').')';
 if ($socid)
 {
-    $sql .= " AND f.fk_soc = ".$socid;
+	$sql .= " AND f.fk_soc = ".$socid;
 }
 $sql .= " AND p.statut = 0";
 
@@ -84,13 +84,13 @@ $sql .= $db->order($sortfield, $sortorder);
 $nbtotalofrecords = '';
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
-    $result = $db->query($sql);
-    $nbtotalofrecords = $db->num_rows($result);
-    if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
-    {
-    	$page = 0;
-    	$offset = 0;
-    }
+	$result = $db->query($sql);
+	$nbtotalofrecords = $db->num_rows($result);
+	if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+	{
+		$page = 0;
+		$offset = 0;
+	}
 }
 
 $sql .= $db->plimit($limit + 1, $offset);
@@ -98,43 +98,43 @@ $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;
 
-    print_barre_liste($langs->trans("ReceivedCustomersPaymentsToValid"), $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, '', $num);
+	print_barre_liste($langs->trans("ReceivedCustomersPaymentsToValid"), $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, '', $num);
 
-    print '<table class="noborder centpercent">';
-    print '<tr class="liste_titre">';
-    print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "p.rowid", "", "", 'width="60"', $sortfield, $sortorder);
-    print_liste_field_titre("Date", $_SERVER["PHP_SELF"], "dp", "", "", 'width="80" align="center"', $sortfield, $sortorder);
-    print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "c.libelle", "", "", "", $sortfield, $sortorder);
-    print_liste_field_titre("AmountTTC", $_SERVER["PHP_SELF"], "c.libelle", "", "", 'class="right"', $sortfield, $sortorder);
-    print_liste_field_titre('');
-    print "</tr>\n";
+	print '<table class="noborder centpercent">';
+	print '<tr class="liste_titre">';
+	print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "p.rowid", "", "", 'width="60"', $sortfield, $sortorder);
+	print_liste_field_titre("Date", $_SERVER["PHP_SELF"], "dp", "", "", 'width="80" align="center"', $sortfield, $sortorder);
+	print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "c.libelle", "", "", "", $sortfield, $sortorder);
+	print_liste_field_titre("AmountTTC", $_SERVER["PHP_SELF"], "c.libelle", "", "", 'class="right"', $sortfield, $sortorder);
+	print_liste_field_titre('');
+	print "</tr>\n";
 
-    while ($i < min($num, $limit))
-    {
-        $objp = $db->fetch_object($resql);
+	while ($i < min($num, $limit))
+	{
+		$objp = $db->fetch_object($resql);
 
-        print '<tr class="oddeven">';
-        print '<td><a href="'.DOL_URL_ROOT.'/compta/paiement/card.php?id='.$objp->rowid.'">'.img_object($langs->trans("ShowPayment"), "payment").' '.$objp->rowid.'</a></td>';
-        print '<td width="80" align="center">'.dol_print_date($db->jdate($objp->dp), 'day')."</td>\n";
-        print "<td>$objp->paiement_type $objp->num_payment</td>\n";
-        print '<td class="right">'.price($objp->amount).'</td>';
-        print '<td class="center">';
+		print '<tr class="oddeven">';
+		print '<td><a href="'.DOL_URL_ROOT.'/compta/paiement/card.php?id='.$objp->rowid.'">'.img_object($langs->trans("ShowPayment"), "payment").' '.$objp->rowid.'</a></td>';
+		print '<td width="80" align="center">'.dol_print_date($db->jdate($objp->dp), 'day')."</td>\n";
+		print "<td>$objp->paiement_type $objp->num_payment</td>\n";
+		print '<td class="right">'.price($objp->amount).'</td>';
+		print '<td class="center">';
 
-        if ($objp->statut == 0)
-        {
-            print '<a href="card.php?id='.$objp->rowid.'&amp;action=valide">'.$langs->trans("PaymentStatusToValidShort").'</a>';
-        } else {
-            print "-";
-        }
+		if ($objp->statut == 0)
+		{
+			print '<a href="card.php?id='.$objp->rowid.'&amp;action=valide">'.$langs->trans("PaymentStatusToValidShort").'</a>';
+		} else {
+			print "-";
+		}
 
-        print '</td>';
-        print "</tr>";
-        $i++;
-    }
-    print "</table>";
+		print '</td>';
+		print "</tr>";
+		$i++;
+	}
+	print "</table>";
 }
 
 // End of page
diff --git a/htdocs/compta/paiement_charge.php b/htdocs/compta/paiement_charge.php
index 17970037b4a..f091c214cd8 100644
--- a/htdocs/compta/paiement_charge.php
+++ b/htdocs/compta/paiement_charge.php
@@ -65,20 +65,20 @@ if ($action == 'add_payment' || ($action == 'confirm_paiement' && $confirm == 'y
 	{
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("PaymentMode")), null, 'errors');
 		$error++;
-        $action = 'create';
+		$action = 'create';
 	}
 	if ($datepaye == '')
 	{
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Date")), null, 'errors');
 		$error++;
-        $action = 'create';
+		$action = 'create';
+	}
+	if (!empty($conf->banque->enabled) && !($_POST["accountid"] > 0))
+	{
+		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("AccountToCredit")), null, 'errors');
+		$error++;
+		$action = 'create';
 	}
-    if (!empty($conf->banque->enabled) && !($_POST["accountid"] > 0))
-    {
-        setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("AccountToCredit")), null, 'errors');
-        $error++;
-        $action = 'create';
-    }
 
 	if (!$error)
 	{
@@ -94,59 +94,59 @@ if ($action == 'add_payment' || ($action == 'confirm_paiement' && $confirm == 'y
 			}
 		}
 
-        if (count($amounts) <= 0)
-        {
-            $error++;
-            setEventMessages($langs->trans("ErrorNoPaymentDefined"), null, 'errors');
-            $action = 'create';
-        }
+		if (count($amounts) <= 0)
+		{
+			$error++;
+			setEventMessages($langs->trans("ErrorNoPaymentDefined"), null, 'errors');
+			$action = 'create';
+		}
 
-        if (!$error)
-        {
-    		$db->begin();
+		if (!$error)
+		{
+			$db->begin();
 
-    		// Create a line of payments
-    		$paiement = new PaymentSocialContribution($db);
-    		$paiement->chid         = $chid;
-    		$paiement->datepaye     = $datepaye;
-    		$paiement->amounts      = $amounts; // Amount list
-    		$paiement->paiementtype = GETPOST("paiementtype", 'alphanohtml');
-    		$paiement->num_payment  = GETPOST("num_payment", 'alphanohtml');
-    		$paiement->note         = GETPOST("note", 'restricthtml');
-    		$paiement->note_private = GETPOST("note", 'restricthtml');
+			// Create a line of payments
+			$paiement = new PaymentSocialContribution($db);
+			$paiement->chid         = $chid;
+			$paiement->datepaye     = $datepaye;
+			$paiement->amounts      = $amounts; // Amount list
+			$paiement->paiementtype = GETPOST("paiementtype", 'alphanohtml');
+			$paiement->num_payment  = GETPOST("num_payment", 'alphanohtml');
+			$paiement->note         = GETPOST("note", 'restricthtml');
+			$paiement->note_private = GETPOST("note", 'restricthtml');
 
-    		if (!$error)
-    		{
-    		    $paymentid = $paiement->create($user, (GETPOST('closepaidcontrib') == 'on' ? 1 : 0));
-                if ($paymentid < 0)
-                {
-                	$error++;
-                	setEventMessages($paiement->error, null, 'errors');
-                	$action = 'create';
-                }
-    		}
+			if (!$error)
+			{
+				$paymentid = $paiement->create($user, (GETPOST('closepaidcontrib') == 'on' ? 1 : 0));
+				if ($paymentid < 0)
+				{
+					$error++;
+					setEventMessages($paiement->error, null, 'errors');
+					$action = 'create';
+				}
+			}
 
-            if (!$error)
-            {
-                $result = $paiement->addPaymentToBank($user, 'payment_sc', '(SocialContributionPayment)', GETPOST('accountid', 'int'), '', '');
-                if (!($result > 0))
-                {
-                	$error++;
-                	setEventMessages($paiement->error, null, 'errors');
-                	$action = 'create';
-                }
-            }
+			if (!$error)
+			{
+				$result = $paiement->addPaymentToBank($user, 'payment_sc', '(SocialContributionPayment)', GETPOST('accountid', 'int'), '', '');
+				if (!($result > 0))
+				{
+					$error++;
+					setEventMessages($paiement->error, null, 'errors');
+					$action = 'create';
+				}
+			}
 
-    	    if (!$error)
-            {
-                $db->commit();
-                $loc = DOL_URL_ROOT.'/compta/sociales/card.php?id='.$chid;
-                header('Location: '.$loc);
-                exit;
-            } else {
-                $db->rollback();
-            }
-        }
+			if (!$error)
+			{
+				$db->commit();
+				$loc = DOL_URL_ROOT.'/compta/sociales/card.php?id='.$chid;
+				header('Location: '.$loc);
+				exit;
+			} else {
+				$db->rollback();
+			}
+		}
 	}
 }
 
@@ -164,8 +164,8 @@ $form = new Form($db);
 if ($action == 'create')
 {
 	$charge->fetch($chid);
-    $charge->accountid = $charge->fk_account ? $charge->fk_account : $charge->accountid;
-    $charge->paiementtype = $charge->mode_reglement_id ? $charge->mode_reglement_id : $charge->paiementtype;
+	$charge->accountid = $charge->fk_account ? $charge->fk_account : $charge->accountid;
+	$charge->paiementtype = $charge->mode_reglement_id ? $charge->mode_reglement_id : $charge->paiementtype;
 
 	$total = $charge->amount;
 	if (!empty($conf->use_javascript_ajax))
@@ -252,7 +252,7 @@ if ($action == 'create')
 
 	print '</table>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	/*
  	 * Other unpaid charges
diff --git a/htdocs/compta/payment_sc/card.php b/htdocs/compta/payment_sc/card.php
index 6dfa4e3be7a..11c8512a265 100644
--- a/htdocs/compta/payment_sc/card.php
+++ b/htdocs/compta/payment_sc/card.php
@@ -20,9 +20,9 @@
 
 /**
  *	    \file       htdocs/compta/payment_sc/card.php
- *		\ingroup    facture
- *		\brief      Onglet payment of a social contribution
- *		\remarks	Fichier presque identique a fournisseur/paiement/card.php
+ *		\ingroup    tax
+ *		\brief      Tab with payment of a social contribution
+ *		\remarks	File similar to fourn/paiement/card.php
  */
 
 require '../../main.inc.php';
@@ -38,7 +38,7 @@ $langs->loadLangs(array('bills', 'banks', 'companies'));
 // Security check
 $id = GETPOST("id", 'int');
 $action = GETPOST('action', 'aZ09');
-$confirm = GETPOST('confirm');
+$confirm = GETPOST('confirm', 'aZ09');
 if ($user->socid) $socid = $user->socid;
 // TODO ajouter regle pour restreindre acces paiement
 //$result = restrictedArea($user, 'facture', $id,'');
@@ -63,12 +63,12 @@ if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->tax->char
 	$result = $object->delete($user);
 	if ($result > 0)
 	{
-        $db->commit();
-        header("Location: ".DOL_URL_ROOT."/compta/sociales/payments.php?mode=sconly");
-        exit;
+		$db->commit();
+		header("Location: ".DOL_URL_ROOT."/compta/sociales/payments.php");
+		exit;
 	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
-        $db->rollback();
+		$db->rollback();
 	}
 }
 
@@ -140,25 +140,25 @@ print '<tr><td>'.$langs->trans('Note').'</td><td colspan="3">'.nl2br($object->no
 // Bank account
 if (!empty($conf->banque->enabled))
 {
-    if ($object->bank_account)
-    {
-    	$bankline = new AccountLine($db);
-    	$bankline->fetch($object->bank_line);
+	if ($object->bank_account)
+	{
+		$bankline = new AccountLine($db);
+		$bankline->fetch($object->bank_line);
 
-    	print '<tr>';
-    	print '<td>'.$langs->trans('BankTransactionLine').'</td>';
+		print '<tr>';
+		print '<td>'.$langs->trans('BankTransactionLine').'</td>';
 		print '<td colspan="3">';
 		print $bankline->getNomUrl(1, 0, 'showall');
-    	print '</td>';
-    	print '</tr>';
-    }
+		print '</td>';
+		print '</tr>';
+	}
 }
 
 print '</table>';
 
 print '</div>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 /*
@@ -183,7 +183,7 @@ if ($resql)
 	print '<br><table class="noborder centpercent">';
 	print '<tr class="liste_titre">';
 	print '<td>'.$langs->trans('SocialContribution').'</td>';
-    print '<td>'.$langs->trans('Type').'</td>';
+	print '<td>'.$langs->trans('Type').'</td>';
 	print '<td>'.$langs->trans('Label').'</td>';
 	print '<td class="right">'.$langs->trans('ExpectedToPay').'</td>';
 	print '<td class="center">'.$langs->trans('Status').'</td>';
@@ -203,10 +203,10 @@ if ($resql)
 			print $socialcontrib->getNomUrl(1);
 			print "</td>\n";
 			// Type
-            print '<td>';
-            print $socialcontrib->type_label;
-            /*print $socialcontrib->type;*/
-            print "</td>\n";
+			print '<td>';
+			print $socialcontrib->type_label;
+			/*print $socialcontrib->type;*/
+			print "</td>\n";
 			// Label
 			print '<td>'.$objp->label.'</td>';
 			// Expected to pay
diff --git a/htdocs/compta/paymentbybanktransfer/index.php b/htdocs/compta/paymentbybanktransfer/index.php
index e2477d86544..78425398017 100644
--- a/htdocs/compta/paymentbybanktransfer/index.php
+++ b/htdocs/compta/paymentbybanktransfer/index.php
@@ -115,59 +115,59 @@ if ($socid) $sql .= " AND f.fk_soc = ".$socid;
 $resql = $db->query($sql);
 if ($resql)
 {
-    $num = $db->num_rows($resql);
-    $i = 0;
+	$num = $db->num_rows($resql);
+	$i = 0;
 
-    print '<div class="div-table-responsive-no-min">';
-    print '<table class="noborder centpercent">';
-    print '<tr class="liste_titre">';
-    print '<th colspan="5">'.$langs->trans("SupplierInvoiceWaitingWithdraw").' ('.$num.')</th></tr>';
-    if ($num)
-    {
-        while ($i < $num && $i < 20)
-        {
-            $obj = $db->fetch_object($resql);
+	print '<div class="div-table-responsive-no-min">';
+	print '<table class="noborder centpercent">';
+	print '<tr class="liste_titre">';
+	print '<th colspan="5">'.$langs->trans("SupplierInvoiceWaitingWithdraw").' ('.$num.')</th></tr>';
+	if ($num)
+	{
+		while ($i < $num && $i < 20)
+		{
+			$obj = $db->fetch_object($resql);
 
-            $invoicestatic->id = $obj->rowid;
-            $invoicestatic->ref = $obj->ref;
-            $invoicestatic->statut = $obj->fk_statut;
-            $invoicestatic->paye = $obj->paye;
-            $invoicestatic->type = $obj->type;
-            $alreadypayed = $invoicestatic->getSommePaiement();
+			$invoicestatic->id = $obj->rowid;
+			$invoicestatic->ref = $obj->ref;
+			$invoicestatic->statut = $obj->fk_statut;
+			$invoicestatic->paye = $obj->paye;
+			$invoicestatic->type = $obj->type;
+			$alreadypayed = $invoicestatic->getSommePaiement();
 
-            $thirdpartystatic->id = $obj->socid;
-            $thirdpartystatic->name = $obj->name;
-            $thirdpartystatic->email = $obj->email;
-            $thirdpartystatic->tva_intra = $obj->tva_intra;
+			$thirdpartystatic->id = $obj->socid;
+			$thirdpartystatic->name = $obj->name;
+			$thirdpartystatic->email = $obj->email;
+			$thirdpartystatic->tva_intra = $obj->tva_intra;
 
-            print '<tr class="oddeven"><td>';
-            print $invoicestatic->getNomUrl(1, 'withdraw');
-            print '</td>';
+			print '<tr class="oddeven"><td>';
+			print $invoicestatic->getNomUrl(1, 'withdraw');
+			print '</td>';
 
-            print '<td>';
-            print $thirdpartystatic->getNomUrl(1, 'supplier');
-            print '</td>';
+			print '<td>';
+			print $thirdpartystatic->getNomUrl(1, 'supplier');
+			print '</td>';
 
-            print '<td class="right">';
-            print price($obj->amount);
-            print '</td>';
+			print '<td class="right">';
+			print price($obj->amount);
+			print '</td>';
 
-            print '<td class="right">';
-            print dol_print_date($db->jdate($obj->date_demande), 'day');
-            print '</td>';
+			print '<td class="right">';
+			print dol_print_date($db->jdate($obj->date_demande), 'day');
+			print '</td>';
 
-            print '<td class="right">';
-            print $invoicestatic->getLibStatut(3, $alreadypayed);
-            print '</td>';
-            print '</tr>';
-            $i++;
-        }
-    } else {
-        print '<tr class="oddeven"><td colspan="5" class="opacitymedium">'.$langs->trans("NoSupplierInvoiceToWithdraw", $langs->transnoentitiesnoconv("BankTransfer")).'</td></tr>';
-    }
-    print "</table></div><br>";
+			print '<td class="right">';
+			print $invoicestatic->getLibStatut(3, $alreadypayed);
+			print '</td>';
+			print '</tr>';
+			$i++;
+		}
+	} else {
+		print '<tr class="oddeven"><td colspan="5" class="opacitymedium">'.$langs->trans("NoSupplierInvoiceToWithdraw", $langs->transnoentitiesnoconv("BankTransfer")).'</td></tr>';
+	}
+	print "</table></div><br>";
 } else {
-    dol_print_error($db);
+	dol_print_error($db);
 }
 
 
@@ -188,47 +188,47 @@ $sql .= $db->plimit($limit);
 $result = $db->query($sql);
 if ($result)
 {
-    $num = $db->num_rows($result);
-    $i = 0;
+	$num = $db->num_rows($result);
+	$i = 0;
 
-    print"\n<!-- debut table -->\n";
-    print '<div class="div-table-responsive-no-min">';
-    print '<table class="noborder centpercent">';
-    print '<tr class="liste_titre">';
-    print '<th>'.$langs->trans("LatestBankTransferReceipts", $limit).'</th>';
-    print '<th>'.$langs->trans("Date").'</th>';
-    print '<th class="right">'.$langs->trans("Amount").'</th>';
-    print '<th class="right">'.$langs->trans("Status").'</th>';
-    print '</tr>';
+	print"\n<!-- debut table -->\n";
+	print '<div class="div-table-responsive-no-min">';
+	print '<table class="noborder centpercent">';
+	print '<tr class="liste_titre">';
+	print '<th>'.$langs->trans("LatestBankTransferReceipts", $limit).'</th>';
+	print '<th>'.$langs->trans("Date").'</th>';
+	print '<th class="right">'.$langs->trans("Amount").'</th>';
+	print '<th class="right">'.$langs->trans("Status").'</th>';
+	print '</tr>';
 
-    if ($num > 0) {
-	    while ($i < min($num, $limit))
-	    {
-	        $obj = $db->fetch_object($result);
+	if ($num > 0) {
+		while ($i < min($num, $limit))
+		{
+			$obj = $db->fetch_object($result);
 
-	        print '<tr class="oddeven">';
+			print '<tr class="oddeven">';
 
-	        print "<td>";
-	        $bprev->id = $obj->rowid;
-	        $bprev->ref = $obj->ref;
-	        $bprev->statut = $obj->statut;
-	        print $bprev->getNomUrl(1);
-	        print "</td>\n";
-	        print '<td>'.dol_print_date($db->jdate($obj->datec), "dayhour")."</td>\n";
-	        print '<td class="right">'.price($obj->amount)."</td>\n";
-	        print '<td class="right">'.$bprev->getLibStatut(3)."</td>\n";
+			print "<td>";
+			$bprev->id = $obj->rowid;
+			$bprev->ref = $obj->ref;
+			$bprev->statut = $obj->statut;
+			print $bprev->getNomUrl(1);
+			print "</td>\n";
+			print '<td>'.dol_print_date($db->jdate($obj->datec), "dayhour")."</td>\n";
+			print '<td class="right">'.price($obj->amount)."</td>\n";
+			print '<td class="right">'.$bprev->getLibStatut(3)."</td>\n";
 
-	        print "</tr>\n";
-	        $i++;
-	    }
-    } else {
-    	print '<tr><td class="opacitymedium" colspan="4">'.$langs->trans("None").'</td></tr>';
-    }
+			print "</tr>\n";
+			$i++;
+		}
+	} else {
+		print '<tr><td class="opacitymedium" colspan="4">'.$langs->trans("None").'</td></tr>';
+	}
 
-    print "</table></div><br>";
-    $db->free($result);
+	print "</table></div><br>";
+	$db->free($result);
 } else {
-    dol_print_error($db);
+	dol_print_error($db);
 }
 
 
diff --git a/htdocs/compta/prelevement/card.php b/htdocs/compta/prelevement/card.php
index 69968503a5d..5d87303236a 100644
--- a/htdocs/compta/prelevement/card.php
+++ b/htdocs/compta/prelevement/card.php
@@ -250,7 +250,7 @@ if ($id > 0 || $ref)
 
 	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 
 	$formconfirm = '';
diff --git a/htdocs/compta/prelevement/class/ligneprelevement.class.php b/htdocs/compta/prelevement/class/ligneprelevement.class.php
index a645d2bb078..e3b0833f925 100644
--- a/htdocs/compta/prelevement/class/ligneprelevement.class.php
+++ b/htdocs/compta/prelevement/class/ligneprelevement.class.php
@@ -37,9 +37,9 @@ class LignePrelevement
 	public $id;
 
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
 	public $statuts = array();
 
@@ -111,7 +111,7 @@ class LignePrelevement
 		return $error;
 	}
 
-    /**
+	/**
 	 *    Return status label of object
 	 *
 	 *    @param	int		$mode       0=Label, 1=Picto + label, 2=Picto, 3=Label + Picto
@@ -122,7 +122,7 @@ class LignePrelevement
 		return $this->LibStatut($this->statut, $mode);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *    Return status label for a status
 	 *
@@ -132,7 +132,7 @@ class LignePrelevement
 	 */
 	public function LibStatut($status, $mode = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 
 		if ($mode == 0)
diff --git a/htdocs/compta/prelevement/class/rejetprelevement.class.php b/htdocs/compta/prelevement/class/rejetprelevement.class.php
index 3f95d18e38b..8b7d21d221f 100644
--- a/htdocs/compta/prelevement/class/rejetprelevement.class.php
+++ b/htdocs/compta/prelevement/class/rejetprelevement.class.php
@@ -35,11 +35,11 @@ class RejetPrelevement
 	public $id;
 
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $type; //prelevement or bank transfer
+	public $type; //prelevement or bank transfer
 
 
 	/**
@@ -61,16 +61,16 @@ class RejetPrelevement
 		$this->facturer = array();
 
 		$this->motifs[0] = ""; //$langs->trans("StatusMotif0");
-    	$this->motifs[1] = $langs->trans("StatusMotif1");
-    	$this->motifs[2] = $langs->trans("StatusMotif2");
-    	$this->motifs[3] = $langs->trans("StatusMotif3");
-    	$this->motifs[4] = $langs->trans("StatusMotif4");
-    	$this->motifs[5] = $langs->trans("StatusMotif5");
-    	$this->motifs[6] = $langs->trans("StatusMotif6");
-    	$this->motifs[7] = $langs->trans("StatusMotif7");
-    	$this->motifs[8] = $langs->trans("StatusMotif8");
+		$this->motifs[1] = $langs->trans("StatusMotif1");
+		$this->motifs[2] = $langs->trans("StatusMotif2");
+		$this->motifs[3] = $langs->trans("StatusMotif3");
+		$this->motifs[4] = $langs->trans("StatusMotif4");
+		$this->motifs[5] = $langs->trans("StatusMotif5");
+		$this->motifs[6] = $langs->trans("StatusMotif6");
+		$this->motifs[7] = $langs->trans("StatusMotif7");
+		$this->motifs[8] = $langs->trans("StatusMotif8");
 
-    	$this->facturer[0] = $langs->trans("NoInvoiceRefused");
+		$this->facturer[0] = $langs->trans("NoInvoiceRefused");
 		$this->facturer[1] = $langs->trans("InvoiceRefused");
 	}
 
@@ -159,13 +159,13 @@ class RejetPrelevement
 			 * PHP installs sends only the part integer negative
 			*/
 
-			$pai->amounts[$facs[$i][0]] = price2num($facs[$i][1] * ($this->type == 'bank-transfer' ? 1:  -1));
+			$pai->amounts[$facs[$i][0]] = price2num($facs[$i][1] * ($this->type == 'bank-transfer' ? 1 : -1));
 			$pai->datepaye = $date_rejet;
 			$pai->paiementid = 3; // type of payment: withdrawal
 			$pai->num_payment = $fac->ref;
 
 			if ($pai->create($this->user) < 0) {
-                // we call with no_commit
+				// we call with no_commit
 				$error++;
 				dol_syslog("RejetPrelevement::Create Error creation payment invoice ".$facs[$i][0]);
 			} else {
@@ -201,7 +201,7 @@ class RejetPrelevement
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Send email to all users that has asked the withdraw request
 	 *
@@ -210,7 +210,7 @@ class RejetPrelevement
 	 */
 	private function _send_email($fac)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 
 		$userid = 0;
@@ -218,7 +218,7 @@ class RejetPrelevement
 		$sql = "SELECT fk_user_demande";
 		$sql .= " FROM ".MAIN_DB_PREFIX."prelevement_facture_demande as pfd";
 		$sql .= " WHERE pfd.fk_prelevement_bons = ".$this->bon_id;
-		$sql .= " AND pfd.fk_facture".($this->type == 'bank-transfer' ? '_fourn=': '=').$fac->id;
+		$sql .= " AND pfd.fk_facture".($this->type == 'bank-transfer' ? '_fourn=' : '=').$fac->id;
 
 		$resql = $this->db->query($sql);
 		if ($resql)
@@ -306,8 +306,8 @@ class RejetPrelevement
 				{
 					$row = $this->db->fetch_row($resql);
 					if (!$amounts) {
-                        $arr[$i] = $row[0];
-                    } else {
+						$arr[$i] = $row[0];
+					} else {
 						$arr[$i] = array(
 							$row[0],
 							$row[1]
diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php
index b68fd5d983b..e93b2a7472d 100644
--- a/htdocs/compta/prelevement/create.php
+++ b/htdocs/compta/prelevement/create.php
@@ -271,7 +271,7 @@ if (empty($conf->global->WITHDRAWAL_ALLOW_ANY_INVOICE_STATUS))
 	$sql .= " AND f.fk_statut = ".Facture::STATUS_VALIDATED;
 }
 //$sql .= " AND pfd.amount > 0";
-$sql .= " AND f.total_ttc > 0";		// Avoid credit notes
+$sql .= " AND f.total_ttc > 0"; // Avoid credit notes
 $sql .= " AND pfd.traite = 0";
 $sql .= " AND pfd.ext_payment_id IS NULL";
 if ($type == 'bank-transfer') {
diff --git a/htdocs/compta/prelevement/factures.php b/htdocs/compta/prelevement/factures.php
index b1a15a766f6..1f8ecdaeced 100644
--- a/htdocs/compta/prelevement/factures.php
+++ b/htdocs/compta/prelevement/factures.php
@@ -150,7 +150,7 @@ if ($id > 0 || $ref)
 
 		print '</div>';
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 	} else {
 	  	dol_print_error($db);
 	}
diff --git a/htdocs/compta/prelevement/fiche-rejet.php b/htdocs/compta/prelevement/fiche-rejet.php
index 9135616d915..fb1a9451aed 100644
--- a/htdocs/compta/prelevement/fiche-rejet.php
+++ b/htdocs/compta/prelevement/fiche-rejet.php
@@ -144,7 +144,7 @@ if ($prev_id > 0 || $ref)
 
 		print '</div>';
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 	} else {
 	  	dol_print_error($db);
 	}
diff --git a/htdocs/compta/prelevement/fiche-stat.php b/htdocs/compta/prelevement/fiche-stat.php
index 151e53e4a59..81e854ef5a0 100644
--- a/htdocs/compta/prelevement/fiche-stat.php
+++ b/htdocs/compta/prelevement/fiche-stat.php
@@ -143,7 +143,7 @@ if ($prev_id > 0 || $ref)
 
 		print '</div>';
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 	} else {
 		dol_print_error($db);
 	}
diff --git a/htdocs/compta/prelevement/index.php b/htdocs/compta/prelevement/index.php
index 4104249df5c..2ce24d20d90 100644
--- a/htdocs/compta/prelevement/index.php
+++ b/htdocs/compta/prelevement/index.php
@@ -115,58 +115,58 @@ if ($socid) $sql .= " AND f.fk_soc = ".$socid;
 $resql = $db->query($sql);
 if ($resql)
 {
-    $num = $db->num_rows($resql);
-    $i = 0;
+	$num = $db->num_rows($resql);
+	$i = 0;
 
-    print '<div class="div-table-responsive-no-min">';
-    print '<table class="noborder centpercent">';
-    print '<tr class="liste_titre">';
-    print '<th colspan="5">'.$langs->trans("InvoiceWaitingWithdraw").' ('.$num.')</th></tr>';
-    if ($num)
-    {
-        while ($i < $num && $i < 20)
-        {
-            $obj = $db->fetch_object($resql);
+	print '<div class="div-table-responsive-no-min">';
+	print '<table class="noborder centpercent">';
+	print '<tr class="liste_titre">';
+	print '<th colspan="5">'.$langs->trans("InvoiceWaitingWithdraw").' ('.$num.')</th></tr>';
+	if ($num)
+	{
+		while ($i < $num && $i < 20)
+		{
+			$obj = $db->fetch_object($resql);
 
-            $invoicestatic->id = $obj->rowid;
-            $invoicestatic->ref = $obj->ref;
-            $invoicestatic->statut = $obj->fk_statut;
-            $invoicestatic->paye = $obj->paye;
-            $invoicestatic->type = $obj->type;
-            $alreadypayed = $invoicestatic->getSommePaiement();
+			$invoicestatic->id = $obj->rowid;
+			$invoicestatic->ref = $obj->ref;
+			$invoicestatic->statut = $obj->fk_statut;
+			$invoicestatic->paye = $obj->paye;
+			$invoicestatic->type = $obj->type;
+			$alreadypayed = $invoicestatic->getSommePaiement();
 
-            $thirdpartystatic->id = $obj->socid;
-            $thirdpartystatic->name = $obj->name;
-            $thirdpartystatic->email = $obj->email;
+			$thirdpartystatic->id = $obj->socid;
+			$thirdpartystatic->name = $obj->name;
+			$thirdpartystatic->email = $obj->email;
 
-            print '<tr class="oddeven"><td>';
-            print $invoicestatic->getNomUrl(1, 'withdraw');
-            print '</td>';
+			print '<tr class="oddeven"><td>';
+			print $invoicestatic->getNomUrl(1, 'withdraw');
+			print '</td>';
 
-            print '<td>';
-            print $thirdpartystatic->getNomUrl(1, 'customer');
-            print '</td>';
+			print '<td>';
+			print $thirdpartystatic->getNomUrl(1, 'customer');
+			print '</td>';
 
-            print '<td class="right">';
-            print price($obj->amount);
-            print '</td>';
+			print '<td class="right">';
+			print price($obj->amount);
+			print '</td>';
 
-            print '<td class="right">';
-            print dol_print_date($db->jdate($obj->date_demande), 'day');
-            print '</td>';
+			print '<td class="right">';
+			print dol_print_date($db->jdate($obj->date_demande), 'day');
+			print '</td>';
 
-            print '<td class="right">';
-            print $invoicestatic->getLibStatut(3, $alreadypayed);
-            print '</td>';
-            print '</tr>';
-            $i++;
-        }
-    } else {
-        print '<tr class="oddeven"><td colspan="5" class="opacitymedium">'.$langs->trans("NoInvoiceToWithdraw", $langs->transnoentitiesnoconv("StandingOrders")).'</td></tr>';
-    }
-    print "</table></div><br>";
+			print '<td class="right">';
+			print $invoicestatic->getLibStatut(3, $alreadypayed);
+			print '</td>';
+			print '</tr>';
+			$i++;
+		}
+	} else {
+		print '<tr class="oddeven"><td colspan="5" class="opacitymedium">'.$langs->trans("NoInvoiceToWithdraw", $langs->transnoentitiesnoconv("StandingOrders")).'</td></tr>';
+	}
+	print "</table></div><br>";
 } else {
-    dol_print_error($db);
+	dol_print_error($db);
 }
 
 
@@ -181,55 +181,55 @@ $limit = 5;
 $sql = "SELECT p.rowid, p.ref, p.amount, p.datec, p.statut";
 $sql .= " FROM ".MAIN_DB_PREFIX."prelevement_bons as p";
 $sql .= " WHERE p.type = 'debit-order'";
-$sql .= " AND entity IN (" . getEntity('prelevement') . ")";
+$sql .= " AND entity IN (".getEntity('prelevement').")";
 $sql .= " ORDER BY datec DESC";
 $sql .= $db->plimit($limit);
 
 $result = $db->query($sql);
 if ($result)
 {
-    $num = $db->num_rows($result);
-    $i = 0;
+	$num = $db->num_rows($result);
+	$i = 0;
 
-    print"\n<!-- debut table -->\n";
-    print '<div class="div-table-responsive-no-min">';
-    print '<table class="noborder centpercent">';
-    print '<tr class="liste_titre">';
-    print '<th>'.$langs->trans("LastWithdrawalReceipt", $limit).'</th>';
-    print '<th>'.$langs->trans("Date").'</th>';
-    print '<th class="right">'.$langs->trans("Amount").'</th>';
-    print '<th class="right">'.$langs->trans("Status").'</th>';
-    print '</tr>';
+	print"\n<!-- debut table -->\n";
+	print '<div class="div-table-responsive-no-min">';
+	print '<table class="noborder centpercent">';
+	print '<tr class="liste_titre">';
+	print '<th>'.$langs->trans("LastWithdrawalReceipt", $limit).'</th>';
+	print '<th>'.$langs->trans("Date").'</th>';
+	print '<th class="right">'.$langs->trans("Amount").'</th>';
+	print '<th class="right">'.$langs->trans("Status").'</th>';
+	print '</tr>';
 
-    if ($num > 0) {
-    	while ($i < min($num, $limit))
-	    {
-	        $obj = $db->fetch_object($result);
+	if ($num > 0) {
+		while ($i < min($num, $limit))
+		{
+			$obj = $db->fetch_object($result);
 
 
-	        print '<tr class="oddeven">';
+			print '<tr class="oddeven">';
 
-	        print "<td>";
-	        $bprev->id = $obj->rowid;
-	        $bprev->ref = $obj->ref;
-	        $bprev->statut = $obj->statut;
-	        print $bprev->getNomUrl(1);
-	        print "</td>\n";
-	        print '<td>'.dol_print_date($db->jdate($obj->datec), "dayhour")."</td>\n";
-	        print '<td class="right">'.price($obj->amount)."</td>\n";
-	        print '<td class="right">'.$bprev->getLibStatut(3)."</td>\n";
+			print "<td>";
+			$bprev->id = $obj->rowid;
+			$bprev->ref = $obj->ref;
+			$bprev->statut = $obj->statut;
+			print $bprev->getNomUrl(1);
+			print "</td>\n";
+			print '<td>'.dol_print_date($db->jdate($obj->datec), "dayhour")."</td>\n";
+			print '<td class="right">'.price($obj->amount)."</td>\n";
+			print '<td class="right">'.$bprev->getLibStatut(3)."</td>\n";
 
-	        print "</tr>\n";
-	        $i++;
-	    }
-    } else {
-    	print '<tr><td class="opacitymedium" colspan="4">'.$langs->trans("None").'</td></tr>';
-    }
+			print "</tr>\n";
+			$i++;
+		}
+	} else {
+		print '<tr><td class="opacitymedium" colspan="4">'.$langs->trans("None").'</td></tr>';
+	}
 
-    print "</table></div><br>";
-    $db->free($result);
+	print "</table></div><br>";
+	$db->free($result);
 } else {
-    dol_print_error($db);
+	dol_print_error($db);
 }
 
 
diff --git a/htdocs/compta/prelevement/line.php b/htdocs/compta/prelevement/line.php
index 71f39f6c98d..ccb60486c76 100644
--- a/htdocs/compta/prelevement/line.php
+++ b/htdocs/compta/prelevement/line.php
@@ -179,7 +179,7 @@ if ($id)
 		}
 
 		print '</table>';
-		dol_fiche_end();
+		print dol_get_fiche_end();
 	} else {
 		dol_print_error($db);
 	}
diff --git a/htdocs/compta/prelevement/list.php b/htdocs/compta/prelevement/list.php
index 36aa4bb8e5c..f171857963c 100644
--- a/htdocs/compta/prelevement/list.php
+++ b/htdocs/compta/prelevement/list.php
@@ -44,12 +44,12 @@ $optioncss  = GETPOST('optioncss', 'aZ'); // Option for the css output (always '
 
 // Security check
 $socid = GETPOST('socid', 'int');
-if ($user->socid) $socid=$user->socid;
+if ($user->socid) $socid = $user->socid;
 $result = restrictedArea($user, 'prelevement', '', '', 'bons');
 
 $type = GETPOST('type', 'aZ09');
 
-$limit = GETPOST('limit', 'int')?GETPOST('limit', 'int'):$conf->liste_limit;
+$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -82,7 +82,7 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
 	$search_line = "";
 	$search_bon = "";
 	$search_code = "";
-    $search_company = "";
+	$search_company = "";
 	$statut = "";
 }
 
@@ -133,13 +133,13 @@ $sql .= $db->order($sortfield, $sortorder);
 $nbtotalofrecords = '';
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
-    $result = $db->query($sql);
-    $nbtotalofrecords = $db->num_rows($result);
-    if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
-    {
-    	$page = 0;
-    	$offset = 0;
-    }
+	$result = $db->query($sql);
+	$nbtotalofrecords = $db->num_rows($result);
+	if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+	{
+		$page = 0;
+		$offset = 0;
+	}
 }
 
 $sql .= $db->plimit($limit + 1, $offset);
@@ -147,124 +147,124 @@ $sql .= $db->plimit($limit + 1, $offset);
 $result = $db->query($sql);
 if ($result)
 {
-    $num = $db->num_rows($result);
-    $i = 0;
+	$num = $db->num_rows($result);
+	$i = 0;
 
-    $param = "&amp;statut=".urlencode($statut);
-    $param .= "&amp;search_bon=".urlencode($search_bon);
+	$param = "&amp;statut=".urlencode($statut);
+	$param .= "&amp;search_bon=".urlencode($search_bon);
 	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
 
-    print"\n<!-- debut table -->\n";
-    print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">'."\n";
-    if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
-    print '<input type="hidden" name="action" value="list">';
-    print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
-    print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-    print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
+	print"\n<!-- debut table -->\n";
+	print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">'."\n";
+	if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
+	print '<input type="hidden" name="action" value="list">';
+	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+	print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
-    $title = $langs->trans("WithdrawalsLines");
-    if ($type == 'bank-transfer') {
-    	$title = $langs->trans("CreditTransferLines");
-    }
+	$title = $langs->trans("WithdrawalsLines");
+	if ($type == 'bank-transfer') {
+		$title = $langs->trans("CreditTransferLines");
+	}
 	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'generic', 0, '', '', $limit, 0, 0, 1);
 
 	$moreforfilter = '';
 
-    print '<div class="div-table-responsive">';
-    print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
+	print '<div class="div-table-responsive">';
+	print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
-    print '<tr class="liste_titre">';
-    print '<td class="liste_titre"><input type="text" class="flat" name="search_line" value="'.dol_escape_htmltag($search_line).'" size="6"></td>';
-    print '<td class="liste_titre"><input type="text" class="flat" name="search_bon" value="'.dol_escape_htmltag($search_bon).'" size="6"></td>';
-    print '<td class="liste_titre">&nbsp;</td>';
-    print '<td class="liste_titre"><input type="text" class="flat" name="search_company" value="'.dol_escape_htmltag($search_company).'" size="6"></td>';
-    print '<td class="liste_titre" align="center"><input type="text" class="flat" name="search_code" value="'.dol_escape_htmltag($search_code).'" size="6"></td>';
-    print '<td class="liste_titre">&nbsp;</td>';
-    print '<td class="liste_titre">&nbsp;</td>';
-    print '<td class="liste_titre maxwidthsearch">';
-    $searchpicto = $form->showFilterButtons();
-    print $searchpicto;
-    print '</td>';
-    print '</tr>';
+	print '<tr class="liste_titre">';
+	print '<td class="liste_titre"><input type="text" class="flat" name="search_line" value="'.dol_escape_htmltag($search_line).'" size="6"></td>';
+	print '<td class="liste_titre"><input type="text" class="flat" name="search_bon" value="'.dol_escape_htmltag($search_bon).'" size="6"></td>';
+	print '<td class="liste_titre">&nbsp;</td>';
+	print '<td class="liste_titre"><input type="text" class="flat" name="search_company" value="'.dol_escape_htmltag($search_company).'" size="6"></td>';
+	print '<td class="liste_titre" align="center"><input type="text" class="flat" name="search_code" value="'.dol_escape_htmltag($search_code).'" size="6"></td>';
+	print '<td class="liste_titre">&nbsp;</td>';
+	print '<td class="liste_titre">&nbsp;</td>';
+	print '<td class="liste_titre maxwidthsearch">';
+	$searchpicto = $form->showFilterButtons();
+	print $searchpicto;
+	print '</td>';
+	print '</tr>';
 
-    $columntitle= "WithdrawalsReceipts";
-    if ($type == 'bank-transfer') {
-    	$columntitle= "BankTransferReceipts";
-    }
+	$columntitle = "WithdrawalsReceipts";
+	if ($type == 'bank-transfer') {
+		$columntitle = "BankTransferReceipts";
+	}
 
-    print '<tr class="liste_titre">';
-    print_liste_field_titre($columntitle, $_SERVER["PHP_SELF"], "p.ref", '', $param, '', $sortfield, $sortorder);
-    print_liste_field_titre("Line", $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder);
-    print_liste_field_titre("Bill", $_SERVER["PHP_SELF"], "f.ref", '', $param, '', $sortfield, $sortorder);
-    print_liste_field_titre("Company", $_SERVER["PHP_SELF"], "s.nom", '', $param, '', $sortfield, $sortorder);
-    print_liste_field_titre("CustomerCode", $_SERVER["PHP_SELF"], "s.code_client", '', $param, '', $sortfield, $sortorder, 'center ');
-    print_liste_field_titre("Date", $_SERVER["PHP_SELF"], "p.datec", "", $param, '', $sortfield, $sortorder, 'center ');
-    print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], "pl.amount", "", $param, '', $sortfield, $sortorder, 'right ');
-    print_liste_field_titre('');
+	print '<tr class="liste_titre">';
+	print_liste_field_titre($columntitle, $_SERVER["PHP_SELF"], "p.ref", '', $param, '', $sortfield, $sortorder);
+	print_liste_field_titre("Line", $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder);
+	print_liste_field_titre("Bill", $_SERVER["PHP_SELF"], "f.ref", '', $param, '', $sortfield, $sortorder);
+	print_liste_field_titre("Company", $_SERVER["PHP_SELF"], "s.nom", '', $param, '', $sortfield, $sortorder);
+	print_liste_field_titre("CustomerCode", $_SERVER["PHP_SELF"], "s.code_client", '', $param, '', $sortfield, $sortorder, 'center ');
+	print_liste_field_titre("Date", $_SERVER["PHP_SELF"], "p.datec", "", $param, '', $sortfield, $sortorder, 'center ');
+	print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], "pl.amount", "", $param, '', $sortfield, $sortorder, 'right ');
+	print_liste_field_titre('');
 	print "</tr>\n";
 
 	if ($num) {
-	    while ($i < min($num, $limit))
-	    {
-	        $obj = $db->fetch_object($result);
+		while ($i < min($num, $limit))
+		{
+			$obj = $db->fetch_object($result);
 
-	        $bon->id = $obj->rowid;
-	        $bon->ref = $obj->ref;
-	        $bon->statut = $obj->status;
+			$bon->id = $obj->rowid;
+			$bon->ref = $obj->ref;
+			$bon->statut = $obj->status;
 
-	        $company->id = $obj->socid;
-	        $company->name = $obj->name;
-	        $company->email = $obj->email;
-	        $company->code_client = $obj->code_client;
+			$company->id = $obj->socid;
+			$company->name = $obj->name;
+			$company->email = $obj->email;
+			$company->code_client = $obj->code_client;
 
-	        print '<tr class="oddeven">';
+			print '<tr class="oddeven">';
 
-	        print '<td>';
-	        print $bon->getNomUrl(1);
-	        print "</td>\n";
-
-	        print '<td>';
-	        print $line->LibStatut($obj->statut_ligne, 2);
-	        print "&nbsp;";
-	        print '<a href="'.DOL_URL_ROOT.'/compta/prelevement/line.php?id='.$obj->rowid_ligne.'">';
-	        print substr('000000'.$obj->rowid_ligne, -6);
-	        print '</a></td>';
-
-	        print '<td>';
-	        print '<a href="'.DOL_URL_ROOT.'/compta/facture/card.php?facid='.$obj->facid.'">';
-	        print img_object($langs->trans("ShowBill"), "bill");
-	        print '&nbsp;<a href="'.DOL_URL_ROOT.'/compta/facture/card.php?facid='.$obj->facid.'">'.$obj->invoiceref."</a></td>\n";
-	        print '</a>';
-	        print '</td>';
-
-	        print '<td>';
-	        print $company->getNomUrl(1);
+			print '<td>';
+			print $bon->getNomUrl(1);
 			print "</td>\n";
 
-	        print '<td align="center"><a href="card.php?id='.$obj->rowid.'">'.$obj->code_client."</a></td>\n";
+			print '<td>';
+			print $line->LibStatut($obj->statut_ligne, 2);
+			print "&nbsp;";
+			print '<a href="'.DOL_URL_ROOT.'/compta/prelevement/line.php?id='.$obj->rowid_ligne.'">';
+			print substr('000000'.$obj->rowid_ligne, -6);
+			print '</a></td>';
 
-	        print '<td class="center">'.dol_print_date($db->jdate($obj->datec), 'day')."</td>\n";
+			print '<td>';
+			print '<a href="'.DOL_URL_ROOT.'/compta/facture/card.php?facid='.$obj->facid.'">';
+			print img_object($langs->trans("ShowBill"), "bill");
+			print '&nbsp;<a href="'.DOL_URL_ROOT.'/compta/facture/card.php?facid='.$obj->facid.'">'.$obj->invoiceref."</a></td>\n";
+			print '</a>';
+			print '</td>';
 
-	        print '<td class="right">'.price($obj->amount)."</td>\n";
+			print '<td>';
+			print $company->getNomUrl(1);
+			print "</td>\n";
 
-	        print '<td>&nbsp;</td>';
+			print '<td align="center"><a href="card.php?id='.$obj->rowid.'">'.$obj->code_client."</a></td>\n";
 
-	        print "</tr>\n";
-	        $i++;
-	    }
+			print '<td class="center">'.dol_print_date($db->jdate($obj->datec), 'day')."</td>\n";
+
+			print '<td class="right">'.price($obj->amount)."</td>\n";
+
+			print '<td>&nbsp;</td>';
+
+			print "</tr>\n";
+			$i++;
+		}
 	} else {
 		print '<tr><td class="opacitymedium" colspan="8">'.$langs->trans("None").'</td></tr>';
 	}
-    print "</table>";
-    print '</div>';
+	print "</table>";
+	print '</div>';
 
-    print '</form>';
+	print '</form>';
 
-    $db->free($result);
+	$db->free($result);
 } else {
-    dol_print_error($db);
+	dol_print_error($db);
 }
 
 // End of page
diff --git a/htdocs/compta/prelevement/orders_list.php b/htdocs/compta/prelevement/orders_list.php
index d4f16eab7f6..7b37238982b 100644
--- a/htdocs/compta/prelevement/orders_list.php
+++ b/htdocs/compta/prelevement/orders_list.php
@@ -71,8 +71,8 @@ if ($type == 'bank-transfer') {
 
 if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
 {
-    $search_ref = "";
-    $search_amount = "";
+	$search_ref = "";
+	$search_amount = "";
 }
 
 
@@ -99,13 +99,13 @@ $sql .= $db->order($sortfield, $sortorder);
 $nbtotalofrecords = '';
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
-    $result = $db->query($sql);
-    $nbtotalofrecords = $db->num_rows($result);
-    if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
-    {
-        $page = 0;
-        $offset = 0;
-    }
+	$result = $db->query($sql);
+	$nbtotalofrecords = $db->num_rows($result);
+	if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+	{
+		$page = 0;
+		$offset = 0;
+	}
 }
 
 $sql .= $db->plimit($limit + 1, $offset);
@@ -113,109 +113,109 @@ $sql .= $db->plimit($limit + 1, $offset);
 $result = $db->query($sql);
 if ($result)
 {
-    $num = $db->num_rows($result);
-    $i = 0;
+	$num = $db->num_rows($result);
+	$i = 0;
 
-    $param = '';
-    if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
-    if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
-    $param .= "&statut=".urlencode($statut);
+	$param = '';
+	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
+	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
+	$param .= "&statut=".urlencode($statut);
 
-    $selectedfields = '';
+	$selectedfields = '';
 
-    $newcardbutton = '';
-    if ($usercancreate)
-    {
-        $newcardbutton .= dolGetButtonTitle($langs->trans('NewStandingOrder'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/compta/prelevement/create.php');
-    }
+	$newcardbutton = '';
+	if ($usercancreate)
+	{
+		$newcardbutton .= dolGetButtonTitle($langs->trans('NewStandingOrder'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/compta/prelevement/create.php');
+	}
 
-    // Lines of title fields
-    print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
-    if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
-    print '<input type="hidden" name="action" value="list">';
-    print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
-    print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-    print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
+	// Lines of title fields
+	print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
+	if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
+	print '<input type="hidden" name="action" value="list">';
+	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+	print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
-    $titlekey = "WithdrawalsReceipts";
-    $title = $langs->trans("WithdrawalsReceipts");
-    if ($type == 'bank-transfer') {
-    	$titlekey = "BankTransferReceipts";
-    	$title = $langs->trans("BankTransferReceipts");
-    }
+	$titlekey = "WithdrawalsReceipts";
+	$title = $langs->trans("WithdrawalsReceipts");
+	if ($type == 'bank-transfer') {
+		$titlekey = "BankTransferReceipts";
+		$title = $langs->trans("BankTransferReceipts");
+	}
 
-    print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'generic', 0, $newcardbutton, '', $limit, 0, 0, 1);
+	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'generic', 0, $newcardbutton, '', $limit, 0, 0, 1);
 
-    $moreforfilter = '';
+	$moreforfilter = '';
 
-    print '<div class="div-table-responsive">';
-    print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
+	print '<div class="div-table-responsive">';
+	print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
-    print '<tr class="liste_titre">';
-    print '<td class="liste_titre"><input type="text" class="flat maxwidth100" name="search_ref" value="'.dol_escape_htmltag($search_ref).'"></td>';
-    print '<td class="liste_titre">&nbsp;</td>';
-    print '<td class="liste_titre right"><input type="text" class="flat maxwidth100" name="search_amount" value="'.dol_escape_htmltag($search_amount).'"></td>';
-    print '<td class="liste_titre">&nbsp;</td>';
-    print '<td class="liste_titre maxwidthsearch">';
-    $searchpicto = $form->showFilterButtons();
-    print $searchpicto;
-    print '</td>';
-    print '</tr>';
+	print '<tr class="liste_titre">';
+	print '<td class="liste_titre"><input type="text" class="flat maxwidth100" name="search_ref" value="'.dol_escape_htmltag($search_ref).'"></td>';
+	print '<td class="liste_titre">&nbsp;</td>';
+	print '<td class="liste_titre right"><input type="text" class="flat maxwidth100" name="search_amount" value="'.dol_escape_htmltag($search_amount).'"></td>';
+	print '<td class="liste_titre">&nbsp;</td>';
+	print '<td class="liste_titre maxwidthsearch">';
+	$searchpicto = $form->showFilterButtons();
+	print $searchpicto;
+	print '</td>';
+	print '</tr>';
 
-    print '<tr class="liste_titre">';
-    print_liste_field_titre($titlekey, $_SERVER["PHP_SELF"], "p.ref", '', $param, '', $sortfield, $sortorder);
-    print_liste_field_titre("Date", $_SERVER["PHP_SELF"], "p.datec", "", $param, '', $sortfield, $sortorder, 'center ');
-    print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], "p.amount", "", $param, '', $sortfield, $sortorder, 'right ');
-    print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "", "", $param, '', $sortfield, $sortorder, 'right ');
-    print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder, 'maxwidthsearch center ')."\n";
-    print "</tr>\n";
+	print '<tr class="liste_titre">';
+	print_liste_field_titre($titlekey, $_SERVER["PHP_SELF"], "p.ref", '', $param, '', $sortfield, $sortorder);
+	print_liste_field_titre("Date", $_SERVER["PHP_SELF"], "p.datec", "", $param, '', $sortfield, $sortorder, 'center ');
+	print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], "p.amount", "", $param, '', $sortfield, $sortorder, 'right ');
+	print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "", "", $param, '', $sortfield, $sortorder, 'right ');
+	print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder, 'maxwidthsearch center ')."\n";
+	print "</tr>\n";
 
-    $directdebitorder = new BonPrelevement($db);
+	$directdebitorder = new BonPrelevement($db);
 
-    if ($num) {
-	    while ($i < min($num, $limit))
-	    {
-	        $obj = $db->fetch_object($result);
+	if ($num) {
+		while ($i < min($num, $limit))
+		{
+			$obj = $db->fetch_object($result);
 
-	        $directdebitorder->id = $obj->rowid;
-	        $directdebitorder->ref = $obj->ref;
-	        $directdebitorder->datec = $obj->datec;
-	        $directdebitorder->amount = $obj->amount;
-	        $directdebitorder->statut = $obj->statut;
+			$directdebitorder->id = $obj->rowid;
+			$directdebitorder->ref = $obj->ref;
+			$directdebitorder->datec = $obj->datec;
+			$directdebitorder->amount = $obj->amount;
+			$directdebitorder->statut = $obj->statut;
 
-	        print '<tr class="oddeven">';
+			print '<tr class="oddeven">';
 
-	        print '<td>';
-	        print $directdebitorder->getNomUrl(1);
-	        print "</td>\n";
+			print '<td>';
+			print $directdebitorder->getNomUrl(1);
+			print "</td>\n";
 
-	        print '<td class="center">'.dol_print_date($db->jdate($obj->datec), 'day')."</td>\n";
+			print '<td class="center">'.dol_print_date($db->jdate($obj->datec), 'day')."</td>\n";
 
-	        print '<td class="right">'.price($obj->amount)."</td>\n";
+			print '<td class="right">'.price($obj->amount)."</td>\n";
 
-	        print '<td class="right">';
-	        print $bon->LibStatut($obj->statut, 3);
-	        print '</td>';
+			print '<td class="right">';
+			print $bon->LibStatut($obj->statut, 3);
+			print '</td>';
 
-	        print '<td class="right"></td>'."\n";
+			print '<td class="right"></td>'."\n";
 
-	        print "</tr>\n";
-	        $i++;
-	    }
-    } else {
-    	print '<tr><td class="opacitymedium" colspan="5">'.$langs->trans("None").'</td></tr>';
-    }
+			print "</tr>\n";
+			$i++;
+		}
+	} else {
+		print '<tr><td class="opacitymedium" colspan="5">'.$langs->trans("None").'</td></tr>';
+	}
 
-    print "</table>";
-    print '</div>';
+	print "</table>";
+	print '</div>';
 
-    print '</form>';
+	print '</form>';
 
-    $db->free($result);
+	$db->free($result);
 } else {
-    dol_print_error($db);
+	dol_print_error($db);
 }
 
 // End of page
diff --git a/htdocs/compta/recap-compta.php b/htdocs/compta/recap-compta.php
index 8e8521e4026..397db077515 100644
--- a/htdocs/compta/recap-compta.php
+++ b/htdocs/compta/recap-compta.php
@@ -58,8 +58,8 @@ if (!$sortorder) $sortorder = "DESC";
 
 
 $arrayfields = array(
-    'f.datef'=>array('label'=>"Date", 'checked'=>1),
-    //...
+	'f.datef'=>array('label'=>"Date", 'checked'=>1),
+	//...
 );
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
@@ -90,14 +90,14 @@ llxHeader('', $title, $help_url);
 
 if ($id > 0)
 {
-    $param = '';
-    if ($id > 0) $param .= '&socid='.$id;
+	$param = '';
+	if ($id > 0) $param .= '&socid='.$id;
 
-    $head = societe_prepare_head($object);
+	$head = societe_prepare_head($object);
 
 	print dol_get_fiche_head($head, 'customer', $langs->trans("ThirdParty"), 0, 'company');
 	dol_banner_tab($object, 'socid', '', ($user->socid ? 0 : 1), 'rowid', 'nom', '', '', 0, '', '', 1);
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	if (!empty($conf->facture->enabled) && $user->rights->facture->lire)
 	{
@@ -106,7 +106,7 @@ if ($id > 0)
 
 		print '<table class="noborder tagtable liste centpercent">';
 		print '<tr class="liste_titre">';
-        if (!empty($arrayfields['f.datef']['checked']))  print_liste_field_titre($arrayfields['f.datef']['label'], $_SERVER["PHP_SELF"], "f.datef", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
+		if (!empty($arrayfields['f.datef']['checked']))  print_liste_field_titre($arrayfields['f.datef']['label'], $_SERVER["PHP_SELF"], "f.datef", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
 		print '<td>'.$langs->trans("Element").'</td>';
 		print '<td>'.$langs->trans("Status").'</td>';
 		print '<td class="right">'.$langs->trans("Debit").'</td>';
diff --git a/htdocs/compta/resultat/clientfourn.php b/htdocs/compta/resultat/clientfourn.php
index 671921506d5..9b505a20a43 100644
--- a/htdocs/compta/resultat/clientfourn.php
+++ b/htdocs/compta/resultat/clientfourn.php
@@ -69,13 +69,13 @@ if (!$sortorder) $sortorder = 'ASC';
 // Date range
 $year = GETPOST('year', 'int');
 if (empty($year)) {
-    $year_current = strftime("%Y", dol_now());
-    $month_current = strftime("%m", dol_now());
-    $year_start = $year_current;
+	$year_current = strftime("%Y", dol_now());
+	$month_current = strftime("%m", dol_now());
+	$year_start = $year_current;
 } else {
-    $year_current = $year;
-    $month_current = strftime("%m", dol_now());
-    $year_start = $year;
+	$year_current = $year;
+	$month_current = strftime("%m", dol_now());
+	$year_start = $year;
 }
 $date_start = dol_mktime(0, 0, 0, $date_startmonth, $date_startday, $date_startyear);
 $date_end = dol_mktime(23, 59, 59, $date_endmonth, $date_endday, $date_endyear);
@@ -83,29 +83,29 @@ $date_end = dol_mktime(23, 59, 59, $date_endmonth, $date_endday, $date_endyear);
 // We define date_start and date_end
 if (empty($date_start) || empty($date_end)) // We define date_start and date_end
 {
-    $q = GETPOST("q") ?GETPOST("q") : 0;
-    if ($q == 0)
-    {
-        // We define date_start and date_end
-        $year_end = $year_start;
-        $month_start = GETPOST("month") ?GETPOST("month") : ($conf->global->SOCIETE_FISCAL_MONTH_START ? ($conf->global->SOCIETE_FISCAL_MONTH_START) : 1);
-        if (!GETPOST('month'))
-        {
-            if (!GETPOST("year") && $month_start > $month_current)
-            {
-                $year_start--;
-                $year_end--;
-            }
-            $month_end = $month_start - 1;
-            if ($month_end < 1) $month_end = 12;
-            else $year_end++;
-        } else $month_end = $month_start;
-        $date_start = dol_get_first_day($year_start, $month_start, false); $date_end = dol_get_last_day($year_end, $month_end, false);
-    }
-    if ($q == 1) { $date_start = dol_get_first_day($year_start, 1, false); $date_end = dol_get_last_day($year_start, 3, false); }
-    if ($q == 2) { $date_start = dol_get_first_day($year_start, 4, false); $date_end = dol_get_last_day($year_start, 6, false); }
-    if ($q == 3) { $date_start = dol_get_first_day($year_start, 7, false); $date_end = dol_get_last_day($year_start, 9, false); }
-    if ($q == 4) { $date_start = dol_get_first_day($year_start, 10, false); $date_end = dol_get_last_day($year_start, 12, false); }
+	$q = GETPOST("q") ?GETPOST("q") : 0;
+	if ($q == 0)
+	{
+		// We define date_start and date_end
+		$year_end = $year_start;
+		$month_start = GETPOST("month") ?GETPOST("month") : ($conf->global->SOCIETE_FISCAL_MONTH_START ? ($conf->global->SOCIETE_FISCAL_MONTH_START) : 1);
+		if (!GETPOST('month'))
+		{
+			if (!GETPOST("year") && $month_start > $month_current)
+			{
+				$year_start--;
+				$year_end--;
+			}
+			$month_end = $month_start - 1;
+			if ($month_end < 1) $month_end = 12;
+			else $year_end++;
+		} else $month_end = $month_start;
+		$date_start = dol_get_first_day($year_start, $month_start, false); $date_end = dol_get_last_day($year_end, $month_end, false);
+	}
+	if ($q == 1) { $date_start = dol_get_first_day($year_start, 1, false); $date_end = dol_get_last_day($year_start, 3, false); }
+	if ($q == 2) { $date_start = dol_get_first_day($year_start, 4, false); $date_end = dol_get_last_day($year_start, 6, false); }
+	if ($q == 3) { $date_start = dol_get_first_day($year_start, 7, false); $date_end = dol_get_last_day($year_start, 9, false); }
+	if ($q == 4) { $date_start = dol_get_first_day($year_start, 10, false); $date_end = dol_get_last_day($year_start, 12, false); }
 }
 
 // $date_start and $date_end are defined. We force $year_start and $nbofyear
@@ -144,31 +144,31 @@ if ($modecompta == "CREANCES-DETTES")
 {
 	$name = $langs->trans("ReportInOut").', '.$langs->trans("ByPredefinedAccountGroups");
 	$calcmode = $langs->trans("CalcModeDebt");
-    $calcmode .= '<br>('.$langs->trans("SeeReportInInputOutputMode", '<a href="'.$_SERVER["PHP_SELF"].'?date_startyear='.$tmps['year'].'&date_startmonth='.$tmps['mon'].'&date_startday='.$tmps['mday'].'&date_endyear='.$tmpe['year'].'&date_endmonth='.$tmpe['mon'].'&date_endday='.$tmpe['mday'].'&modecompta=RECETTES-DEPENSES">', '</a>').')';
-    if (!empty($conf->accounting->enabled)) $calcmode .= '<br>('.$langs->trans("SeeReportInBookkeepingMode", '<a href="'.$_SERVER["PHP_SELF"].'?date_startyear='.$tmps['year'].'&date_startmonth='.$tmps['mon'].'&date_startday='.$tmps['mday'].'&date_endyear='.$tmpe['year'].'&date_endmonth='.$tmpe['mon'].'&date_endday='.$tmpe['mday'].'&modecompta=BOOKKEEPING">', '</a>').')';
-    $period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
+	$calcmode .= '<br>('.$langs->trans("SeeReportInInputOutputMode", '<a href="'.$_SERVER["PHP_SELF"].'?date_startyear='.$tmps['year'].'&date_startmonth='.$tmps['mon'].'&date_startday='.$tmps['mday'].'&date_endyear='.$tmpe['year'].'&date_endmonth='.$tmpe['mon'].'&date_endday='.$tmpe['mday'].'&modecompta=RECETTES-DEPENSES">', '</a>').')';
+	if (!empty($conf->accounting->enabled)) $calcmode .= '<br>('.$langs->trans("SeeReportInBookkeepingMode", '<a href="'.$_SERVER["PHP_SELF"].'?date_startyear='.$tmps['year'].'&date_startmonth='.$tmps['mon'].'&date_startday='.$tmps['mday'].'&date_endyear='.$tmpe['year'].'&date_endmonth='.$tmpe['mon'].'&date_endday='.$tmpe['mday'].'&modecompta=BOOKKEEPING">', '</a>').')';
+	$period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
 	$periodlink = ($year_start ? "<a href='".$_SERVER["PHP_SELF"]."?year=".($tmps['year'] - 1)."&modecompta=".$modecompta."'>".img_previous()."</a> <a href='".$_SERVER["PHP_SELF"]."?year=".($tmps['year'] + 1)."&modecompta=".$modecompta."'>".img_next()."</a>" : "");
-    $description = $langs->trans("RulesResultDue");
+	$description = $langs->trans("RulesResultDue");
 	if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $description .= $langs->trans("DepositsAreNotIncluded");
 	else $description .= $langs->trans("DepositsAreIncluded");
-    $builddate = dol_now();
-    //$exportlink=$langs->trans("NotYetAvailable");
+	$builddate = dol_now();
+	//$exportlink=$langs->trans("NotYetAvailable");
 } elseif ($modecompta == "RECETTES-DEPENSES")
 {
 	$name = $langs->trans("ReportInOut").', '.$langs->trans("ByPredefinedAccountGroups");
 	$calcmode = $langs->trans("CalcModeEngagement");
-    $calcmode .= '<br>('.$langs->trans("SeeReportInDueDebtMode", '<a href="'.$_SERVER["PHP_SELF"].'?date_startyear='.$tmps['year'].'&date_startmonth='.$tmps['mon'].'&date_startday='.$tmps['mday'].'&date_endyear='.$tmpe['year'].'&date_endmonth='.$tmpe['mon'].'&date_endday='.$tmpe['mday'].'&modecompta=CREANCES-DETTES">', '</a>').')';
-    if (!empty($conf->accounting->enabled)) $calcmode .= '<br>('.$langs->trans("SeeReportInBookkeepingMode", '<a href="'.$_SERVER["PHP_SELF"].'?date_startyear='.$tmps['year'].'&date_startmonth='.$tmps['mon'].'&date_startday='.$tmps['mday'].'&date_endyear='.$tmpe['year'].'&date_endmonth='.$tmpe['mon'].'&date_endday='.$tmpe['mday'].'&modecompta=BOOKKEEPING">', '</a>').')';
-    $period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
-    $periodlink = ($year_start ? "<a href='".$_SERVER["PHP_SELF"]."?year=".($tmps['year'] - 1)."&modecompta=".$modecompta."'>".img_previous()."</a> <a href='".$_SERVER["PHP_SELF"]."?year=".($tmps['year'] + 1)."&modecompta=".$modecompta."'>".img_next()."</a>" : "");
-    $description = $langs->trans("RulesResultInOut");
-    $builddate = dol_now();
-    //$exportlink=$langs->trans("NotYetAvailable");
+	$calcmode .= '<br>('.$langs->trans("SeeReportInDueDebtMode", '<a href="'.$_SERVER["PHP_SELF"].'?date_startyear='.$tmps['year'].'&date_startmonth='.$tmps['mon'].'&date_startday='.$tmps['mday'].'&date_endyear='.$tmpe['year'].'&date_endmonth='.$tmpe['mon'].'&date_endday='.$tmpe['mday'].'&modecompta=CREANCES-DETTES">', '</a>').')';
+	if (!empty($conf->accounting->enabled)) $calcmode .= '<br>('.$langs->trans("SeeReportInBookkeepingMode", '<a href="'.$_SERVER["PHP_SELF"].'?date_startyear='.$tmps['year'].'&date_startmonth='.$tmps['mon'].'&date_startday='.$tmps['mday'].'&date_endyear='.$tmpe['year'].'&date_endmonth='.$tmpe['mon'].'&date_endday='.$tmpe['mday'].'&modecompta=BOOKKEEPING">', '</a>').')';
+	$period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
+	$periodlink = ($year_start ? "<a href='".$_SERVER["PHP_SELF"]."?year=".($tmps['year'] - 1)."&modecompta=".$modecompta."'>".img_previous()."</a> <a href='".$_SERVER["PHP_SELF"]."?year=".($tmps['year'] + 1)."&modecompta=".$modecompta."'>".img_next()."</a>" : "");
+	$description = $langs->trans("RulesResultInOut");
+	$builddate = dol_now();
+	//$exportlink=$langs->trans("NotYetAvailable");
 } elseif ($modecompta == "BOOKKEEPING")
 {
 	$name = $langs->trans("ReportInOut").', '.$langs->trans("ByPredefinedAccountGroups");
 	$calcmode = $langs->trans("CalcModeBookkeeping");
-    $calcmode .= '<br>('.$langs->trans("SeeReportInInputOutputMode", '<a href="'.$_SERVER["PHP_SELF"].'?date_startyear='.$tmps['year'].'&date_startmonth='.$tmps['mon'].'&date_startday='.$tmps['mday'].'&date_endyear='.$tmpe['year'].'&date_endmonth='.$tmpe['mon'].'&date_endday='.$tmpe['mday'].'&modecompta=RECETTES-DEPENSES">', '</a>').')';
+	$calcmode .= '<br>('.$langs->trans("SeeReportInInputOutputMode", '<a href="'.$_SERVER["PHP_SELF"].'?date_startyear='.$tmps['year'].'&date_startmonth='.$tmps['mon'].'&date_startday='.$tmps['mday'].'&date_endyear='.$tmpe['year'].'&date_endmonth='.$tmpe['mon'].'&date_endday='.$tmpe['mday'].'&modecompta=RECETTES-DEPENSES">', '</a>').')';
 	$calcmode .= '<br>('.$langs->trans("SeeReportInDueDebtMode", '<a href="'.$_SERVER["PHP_SELF"].'?date_startyear='.$tmps['year'].'&date_startmonth='.$tmps['mon'].'&date_startday='.$tmps['mday'].'&date_endyear='.$tmpe['year'].'&date_endmonth='.$tmpe['mon'].'&date_endday='.$tmpe['mday'].'&modecompta=CREANCES-DETTES">', '</a>').')';
 	$period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
 	$arraylist = array('no'=>$langs->trans("No"), 'yes'=>$langs->trans("AccountWithNonZeroValues"), 'all'=>$langs->trans("All"));
@@ -186,7 +186,7 @@ report_header($name, '', $period, $periodlink, $description, $builddate, $export
 
 if (!empty($conf->accounting->enabled) && $modecompta != 'BOOKKEEPING')
 {
-    print info_admin($langs->trans("WarningReportNotReliable"), 0, 0, 1);
+	print info_admin($langs->trans("WarningReportNotReliable"), 0, 0, 1);
 }
 
 // Show report array
@@ -319,32 +319,32 @@ if ($modecompta == 'BOOKKEEPING')
 
 	if ($modecompta == 'CREANCES-DETTES')
 	{
-	    $sql = "SELECT s.nom as name, s.rowid as socid, sum(f.total) as amount_ht, sum(f.total_ttc) as amount_ttc";
-	    $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
-	    $sql .= ", ".MAIN_DB_PREFIX."facture as f";
-	    $sql .= " WHERE f.fk_soc = s.rowid";
-	    $sql .= " AND f.fk_statut IN (1,2)";
-	    if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS))
-	    	$sql .= " AND f.type IN (0,1,2,5)";
+		$sql = "SELECT s.nom as name, s.rowid as socid, sum(f.total) as amount_ht, sum(f.total_ttc) as amount_ttc";
+		$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+		$sql .= ", ".MAIN_DB_PREFIX."facture as f";
+		$sql .= " WHERE f.fk_soc = s.rowid";
+		$sql .= " AND f.fk_statut IN (1,2)";
+		if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS))
+			$sql .= " AND f.type IN (0,1,2,5)";
 		else $sql .= " AND f.type IN (0,1,2,3,5)";
-	    if (!empty($date_start) && !empty($date_end))
-	    	$sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
+		if (!empty($date_start) && !empty($date_end))
+			$sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
 	} elseif ($modecompta == 'RECETTES-DEPENSES')
 	{
 		/*
 	     * Liste des paiements (les anciens paiements ne sont pas vus par cette requete car, sur les
 	     * vieilles versions, ils n'etaient pas lies via paiement_facture. On les ajoute plus loin)
 	     */
-	    $sql = "SELECT s.nom as name, s.rowid as socid, sum(pf.amount) as amount_ttc";
-	    $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
-	    $sql .= ", ".MAIN_DB_PREFIX."facture as f";
-	    $sql .= ", ".MAIN_DB_PREFIX."paiement_facture as pf";
-	    $sql .= ", ".MAIN_DB_PREFIX."paiement as p";
-	    $sql .= " WHERE p.rowid = pf.fk_paiement";
-	    $sql .= " AND pf.fk_facture = f.rowid";
-	    $sql .= " AND f.fk_soc = s.rowid";
-	    if (!empty($date_start) && !empty($date_end))
-	    	$sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
+		$sql = "SELECT s.nom as name, s.rowid as socid, sum(pf.amount) as amount_ttc";
+		$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+		$sql .= ", ".MAIN_DB_PREFIX."facture as f";
+		$sql .= ", ".MAIN_DB_PREFIX."paiement_facture as pf";
+		$sql .= ", ".MAIN_DB_PREFIX."paiement as p";
+		$sql .= " WHERE p.rowid = pf.fk_paiement";
+		$sql .= " AND pf.fk_facture = f.rowid";
+		$sql .= " AND f.fk_soc = s.rowid";
+		if (!empty($date_start) && !empty($date_end))
+			$sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
 	}
 	$sql .= " AND f.entity IN (".getEntity('invoice').")";
 	if ($socid) $sql .= " AND f.fk_soc = ".$socid;
@@ -354,82 +354,82 @@ if ($modecompta == 'BOOKKEEPING')
 	dol_syslog("get customer invoices", LOG_DEBUG);
 	$result = $db->query($sql);
 	if ($result) {
-	    $num = $db->num_rows($result);
-	    $i = 0;
-	    while ($i < $num)
-	    {
-	        $objp = $db->fetch_object($result);
+		$num = $db->num_rows($result);
+		$i = 0;
+		while ($i < $num)
+		{
+			$objp = $db->fetch_object($result);
 
-	        print '<tr class="oddeven"><td>&nbsp;</td>';
-	        print "<td>".$langs->trans("Bills").' <a href="'.DOL_URL_ROOT.'/compta/facture/list.php?socid='.$objp->socid.'">'.$objp->name."</td>\n";
+			print '<tr class="oddeven"><td>&nbsp;</td>';
+			print "<td>".$langs->trans("Bills").' <a href="'.DOL_URL_ROOT.'/compta/facture/list.php?socid='.$objp->socid.'">'.$objp->name."</td>\n";
 
-	        if ($modecompta == 'CREANCES-DETTES')
-	        	print '<td class="right">'.price($objp->amount_ht)."</td>\n";
-	        print '<td class="right">'.price($objp->amount_ttc)."</td>\n";
+			if ($modecompta == 'CREANCES-DETTES')
+				print '<td class="right">'.price($objp->amount_ht)."</td>\n";
+			print '<td class="right">'.price($objp->amount_ttc)."</td>\n";
 
-	        $total_ht += (isset($objp->amount_ht) ? $objp->amount_ht : 0);
-	        $total_ttc += $objp->amount_ttc;
-	        print "</tr>\n";
-	        $i++;
-	    }
-	    $db->free($result);
+			$total_ht += (isset($objp->amount_ht) ? $objp->amount_ht : 0);
+			$total_ttc += $objp->amount_ttc;
+			print "</tr>\n";
+			$i++;
+		}
+		$db->free($result);
 	} else {
-	    dol_print_error($db);
+		dol_print_error($db);
 	}
 
 	// On ajoute les paiements clients anciennes version, non lie par paiement_facture
 	if ($modecompta == 'RECETTES-DEPENSES')
 	{
-	    $sql = "SELECT 'Autres' as name, '0' as idp, sum(p.amount) as amount_ttc";
-	    $sql .= " FROM ".MAIN_DB_PREFIX."bank as b";
-	    $sql .= ", ".MAIN_DB_PREFIX."bank_account as ba";
-	    $sql .= ", ".MAIN_DB_PREFIX."paiement as p";
-	    $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON p.rowid = pf.fk_paiement";
-	    $sql .= " WHERE pf.rowid IS NULL";
-	    $sql .= " AND p.fk_bank = b.rowid";
-	    $sql .= " AND b.fk_account = ba.rowid";
-	    $sql .= " AND ba.entity IN (".getEntity('bank_account').")";
-	    if (!empty($date_start) && !empty($date_end))
-	    	$sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
-	    $sql .= " GROUP BY name, idp";
-	    $sql .= " ORDER BY name";
+		$sql = "SELECT 'Autres' as name, '0' as idp, sum(p.amount) as amount_ttc";
+		$sql .= " FROM ".MAIN_DB_PREFIX."bank as b";
+		$sql .= ", ".MAIN_DB_PREFIX."bank_account as ba";
+		$sql .= ", ".MAIN_DB_PREFIX."paiement as p";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON p.rowid = pf.fk_paiement";
+		$sql .= " WHERE pf.rowid IS NULL";
+		$sql .= " AND p.fk_bank = b.rowid";
+		$sql .= " AND b.fk_account = ba.rowid";
+		$sql .= " AND ba.entity IN (".getEntity('bank_account').")";
+		if (!empty($date_start) && !empty($date_end))
+			$sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
+		$sql .= " GROUP BY name, idp";
+		$sql .= " ORDER BY name";
 
-	    dol_syslog("get old customer payments not linked to invoices", LOG_DEBUG);
-	    $result = $db->query($sql);
-	    if ($result) {
-	        $num = $db->num_rows($result);
-	        $i = 0;
-	        if ($num) {
-	            while ($i < $num)
-	            {
-	                $objp = $db->fetch_object($result);
+		dol_syslog("get old customer payments not linked to invoices", LOG_DEBUG);
+		$result = $db->query($sql);
+		if ($result) {
+			$num = $db->num_rows($result);
+			$i = 0;
+			if ($num) {
+				while ($i < $num)
+				{
+					$objp = $db->fetch_object($result);
 
 
-	                print '<tr class="oddeven"><td>&nbsp;</td>';
-	                print "<td>".$langs->trans("Bills")." ".$langs->trans("Other")." (".$langs->trans("PaymentsNotLinkedToInvoice").")\n";
+					print '<tr class="oddeven"><td>&nbsp;</td>';
+					print "<td>".$langs->trans("Bills")." ".$langs->trans("Other")." (".$langs->trans("PaymentsNotLinkedToInvoice").")\n";
 
-	                if ($modecompta == 'CREANCES-DETTES')
-	                	print '<td class="right">'.price($objp->amount_ht)."</td>\n";
-	                print '<td class="right">'.price($objp->amount_ttc)."</td>\n";
+					if ($modecompta == 'CREANCES-DETTES')
+						print '<td class="right">'.price($objp->amount_ht)."</td>\n";
+					print '<td class="right">'.price($objp->amount_ttc)."</td>\n";
 
-	                $total_ht += (isset($objp->amount_ht) ? $objp->amount_ht : 0);
-	                $total_ttc += $objp->amount_ttc;
+					$total_ht += (isset($objp->amount_ht) ? $objp->amount_ht : 0);
+					$total_ttc += $objp->amount_ttc;
 
-	                print "</tr>\n";
-	                $i++;
-	            }
-	        }
-	        $db->free($result);
-	    } else {
-	        dol_print_error($db);
-	    }
+					print "</tr>\n";
+					$i++;
+				}
+			}
+			$db->free($result);
+		} else {
+			dol_print_error($db);
+		}
 	}
 
 	if ($total_ttc == 0)
 	{
-	    print '<tr class="oddeven"><td>&nbsp;</td>';
-	    print '<td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td>';
-	    print '</tr>';
+		print '<tr class="oddeven"><td>&nbsp;</td>';
+		print '<td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td>';
+		print '</tr>';
 	}
 
 	print '<tr class="liste_total">';
@@ -444,28 +444,28 @@ if ($modecompta == 'BOOKKEEPING')
 	 */
 	if ($modecompta == 'CREANCES-DETTES')
 	{
-	    $sql = "SELECT s.nom as name, s.rowid as socid, sum(f.total_ht) as amount_ht, sum(f.total_ttc) as amount_ttc";
-	    $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
-	    $sql .= ", ".MAIN_DB_PREFIX."facture_fourn as f";
-	    $sql .= " WHERE f.fk_soc = s.rowid";
-	    $sql .= " AND f.fk_statut IN (1,2)";
-	    if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS))
-	    	$sql .= " AND f.type IN (0,1,2)";
+		$sql = "SELECT s.nom as name, s.rowid as socid, sum(f.total_ht) as amount_ht, sum(f.total_ttc) as amount_ttc";
+		$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+		$sql .= ", ".MAIN_DB_PREFIX."facture_fourn as f";
+		$sql .= " WHERE f.fk_soc = s.rowid";
+		$sql .= " AND f.fk_statut IN (1,2)";
+		if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS))
+			$sql .= " AND f.type IN (0,1,2)";
 		else $sql .= " AND f.type IN (0,1,2,3)";
-	    if (!empty($date_start) && !empty($date_end))
-	    	$sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
+		if (!empty($date_start) && !empty($date_end))
+			$sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
 	} elseif ($modecompta == 'RECETTES-DEPENSES')
 	{
-	    $sql = "SELECT s.nom as name, s.rowid as socid, sum(pf.amount) as amount_ttc";
-	    $sql .= " FROM ".MAIN_DB_PREFIX."paiementfourn as p";
-	    $sql .= ", ".MAIN_DB_PREFIX."paiementfourn_facturefourn as pf";
-	    $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."facture_fourn as f";
-	    $sql .= " ON pf.fk_facturefourn = f.rowid";
-	    $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s";
-	    $sql .= " ON f.fk_soc = s.rowid";
-	    $sql .= " WHERE p.rowid = pf.fk_paiementfourn ";
-	    if (!empty($date_start) && !empty($date_end))
-	    	$sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
+		$sql = "SELECT s.nom as name, s.rowid as socid, sum(pf.amount) as amount_ttc";
+		$sql .= " FROM ".MAIN_DB_PREFIX."paiementfourn as p";
+		$sql .= ", ".MAIN_DB_PREFIX."paiementfourn_facturefourn as pf";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."facture_fourn as f";
+		$sql .= " ON pf.fk_facturefourn = f.rowid";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s";
+		$sql .= " ON f.fk_soc = s.rowid";
+		$sql .= " WHERE p.rowid = pf.fk_paiementfourn ";
+		if (!empty($date_start) && !empty($date_end))
+			$sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
 	}
 
 	$sql .= " AND f.entity = ".$conf->entity;
@@ -480,38 +480,38 @@ if ($modecompta == 'BOOKKEEPING')
 	dol_syslog("get suppliers invoices", LOG_DEBUG);
 	$result = $db->query($sql);
 	if ($result) {
-	    $num = $db->num_rows($result);
-	    $i = 0;
-	    if ($num > 0)
-	    {
-	        while ($i < $num)
-	        {
-	            $objp = $db->fetch_object($result);
+		$num = $db->num_rows($result);
+		$i = 0;
+		if ($num > 0)
+		{
+			while ($i < $num)
+			{
+				$objp = $db->fetch_object($result);
 
-	            print '<tr class="oddeven"><td>&nbsp;</td>';
-	            print "<td>".$langs->trans("Bills")." <a href=\"".DOL_URL_ROOT."/fourn/facture/list.php?socid=".$objp->socid."\">".$objp->name."</a></td>\n";
+				print '<tr class="oddeven"><td>&nbsp;</td>';
+				print "<td>".$langs->trans("Bills")." <a href=\"".DOL_URL_ROOT."/fourn/facture/list.php?socid=".$objp->socid."\">".$objp->name."</a></td>\n";
 
-	            if ($modecompta == 'CREANCES-DETTES')
-	            	print '<td class="right">'.price(-$objp->amount_ht)."</td>\n";
-	            print '<td class="right">'.price(-$objp->amount_ttc)."</td>\n";
+				if ($modecompta == 'CREANCES-DETTES')
+					print '<td class="right">'.price(-$objp->amount_ht)."</td>\n";
+				print '<td class="right">'.price(-$objp->amount_ttc)."</td>\n";
 
-	            $total_ht -= (isset($objp->amount_ht) ? $objp->amount_ht : 0);
-	            $total_ttc -= $objp->amount_ttc;
-	            $subtotal_ht += (isset($objp->amount_ht) ? $objp->amount_ht : 0);
-	            $subtotal_ttc += $objp->amount_ttc;
+				$total_ht -= (isset($objp->amount_ht) ? $objp->amount_ht : 0);
+				$total_ttc -= $objp->amount_ttc;
+				$subtotal_ht += (isset($objp->amount_ht) ? $objp->amount_ht : 0);
+				$subtotal_ttc += $objp->amount_ttc;
 
-	            print "</tr>\n";
-	            $i++;
-	        }
-	    } else {
-	        print '<tr class="oddeven"><td>&nbsp;</td>';
-	        print '<td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td>';
-	        print '</tr>';
-	    }
+				print "</tr>\n";
+				$i++;
+			}
+		} else {
+			print '<tr class="oddeven"><td>&nbsp;</td>';
+			print '<td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td>';
+			print '</tr>';
+		}
 
-	    $db->free($result);
+		$db->free($result);
 	} else {
-	    dol_print_error($db);
+		dol_print_error($db);
 	}
 	print '<tr class="liste_total">';
 	if ($modecompta == 'CREANCES-DETTES')
@@ -529,24 +529,24 @@ if ($modecompta == 'BOOKKEEPING')
 
 	if ($modecompta == 'CREANCES-DETTES')
 	{
-	    $sql = "SELECT c.id, c.libelle as label, sum(cs.amount) as amount";
-	    $sql .= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c";
-	    $sql .= ", ".MAIN_DB_PREFIX."chargesociales as cs";
-	    $sql .= " WHERE cs.fk_type = c.id";
-	    $sql .= " AND c.deductible = 0";
-	    if (!empty($date_start) && !empty($date_end))
-	    	$sql .= " AND cs.date_ech >= '".$db->idate($date_start)."' AND cs.date_ech <= '".$db->idate($date_end)."'";
+		$sql = "SELECT c.id, c.libelle as label, sum(cs.amount) as amount";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c";
+		$sql .= ", ".MAIN_DB_PREFIX."chargesociales as cs";
+		$sql .= " WHERE cs.fk_type = c.id";
+		$sql .= " AND c.deductible = 0";
+		if (!empty($date_start) && !empty($date_end))
+			$sql .= " AND cs.date_ech >= '".$db->idate($date_start)."' AND cs.date_ech <= '".$db->idate($date_end)."'";
 	} elseif ($modecompta == 'RECETTES-DEPENSES')
 	{
-	    $sql = "SELECT c.id, c.libelle as label, sum(p.amount) as amount";
-	    $sql .= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c";
-	    $sql .= ", ".MAIN_DB_PREFIX."chargesociales as cs";
-	    $sql .= ", ".MAIN_DB_PREFIX."paiementcharge as p";
-	    $sql .= " WHERE p.fk_charge = cs.rowid";
-	    $sql .= " AND cs.fk_type = c.id";
-	    $sql .= " AND c.deductible = 0";
-	    if (!empty($date_start) && !empty($date_end))
-	    	$sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
+		$sql = "SELECT c.id, c.libelle as label, sum(p.amount) as amount";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c";
+		$sql .= ", ".MAIN_DB_PREFIX."chargesociales as cs";
+		$sql .= ", ".MAIN_DB_PREFIX."paiementcharge as p";
+		$sql .= " WHERE p.fk_charge = cs.rowid";
+		$sql .= " AND cs.fk_type = c.id";
+		$sql .= " AND c.deductible = 0";
+		if (!empty($date_start) && !empty($date_end))
+			$sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
 	}
 	$sql .= " AND cs.entity = ".$conf->entity;
 	$sql .= " GROUP BY c.libelle, c.id";
@@ -563,30 +563,30 @@ if ($modecompta == 'BOOKKEEPING')
 	$subtotal_ttc = 0;
 	if ($result) {
 		$num = $db->num_rows($result);
-	    $i = 0;
-	    if ($num) {
-	        while ($i < $num) {
-	            $obj = $db->fetch_object($result);
+		$i = 0;
+		if ($num) {
+			while ($i < $num) {
+				$obj = $db->fetch_object($result);
 
-	            $total_ht -= $obj->amount;
-	            $total_ttc -= $obj->amount;
-	            $subtotal_ht += $obj->amount;
-	            $subtotal_ttc += $obj->amount;
+				$total_ht -= $obj->amount;
+				$total_ttc -= $obj->amount;
+				$subtotal_ht += $obj->amount;
+				$subtotal_ttc += $obj->amount;
 
-	            print '<tr class="oddeven"><td>&nbsp;</td>';
-	            print '<td>'.$obj->label.'</td>';
-	            if ($modecompta == 'CREANCES-DETTES') print '<td class="right">'.price(-$obj->amount).'</td>';
-	            print '<td class="right">'.price(-$obj->amount).'</td>';
-	            print '</tr>';
-	            $i++;
-	        }
-	    } else {
-	        print '<tr class="oddeven"><td>&nbsp;</td>';
-	        print '<td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td>';
-	        print '</tr>';
-	    }
+				print '<tr class="oddeven"><td>&nbsp;</td>';
+				print '<td>'.$obj->label.'</td>';
+				if ($modecompta == 'CREANCES-DETTES') print '<td class="right">'.price(-$obj->amount).'</td>';
+				print '<td class="right">'.price(-$obj->amount).'</td>';
+				print '</tr>';
+				$i++;
+			}
+		} else {
+			print '<tr class="oddeven"><td>&nbsp;</td>';
+			print '<td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td>';
+			print '</tr>';
+		}
 	} else {
-	    dol_print_error($db);
+		dol_print_error($db);
 	}
 	print '<tr class="liste_total">';
 	if ($modecompta == 'CREANCES-DETTES')
@@ -603,26 +603,26 @@ if ($modecompta == 'BOOKKEEPING')
 
 	if ($modecompta == 'CREANCES-DETTES')
 	{
-	    $sql = "SELECT c.id, c.libelle as label, sum(cs.amount) as amount";
-	    $sql .= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c";
-	    $sql .= ", ".MAIN_DB_PREFIX."chargesociales as cs";
-	    $sql .= " WHERE cs.fk_type = c.id";
-	    $sql .= " AND c.deductible = 1";
-	    if (!empty($date_start) && !empty($date_end))
-	    	$sql .= " AND cs.date_ech >= '".$db->idate($date_start)."' AND cs.date_ech <= '".$db->idate($date_end)."'";
-	    $sql .= " AND cs.entity = ".$conf->entity;
+		$sql = "SELECT c.id, c.libelle as label, sum(cs.amount) as amount";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c";
+		$sql .= ", ".MAIN_DB_PREFIX."chargesociales as cs";
+		$sql .= " WHERE cs.fk_type = c.id";
+		$sql .= " AND c.deductible = 1";
+		if (!empty($date_start) && !empty($date_end))
+			$sql .= " AND cs.date_ech >= '".$db->idate($date_start)."' AND cs.date_ech <= '".$db->idate($date_end)."'";
+		$sql .= " AND cs.entity = ".$conf->entity;
 	} elseif ($modecompta == 'RECETTES-DEPENSES')
 	{
-	    $sql = "SELECT c.id, c.libelle as label, sum(p.amount) as amount";
-	    $sql .= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c";
-	    $sql .= ", ".MAIN_DB_PREFIX."chargesociales as cs";
-	    $sql .= ", ".MAIN_DB_PREFIX."paiementcharge as p";
-	    $sql .= " WHERE p.fk_charge = cs.rowid";
-	    $sql .= " AND cs.fk_type = c.id";
-	    $sql .= " AND c.deductible = 1";
-	    if (!empty($date_start) && !empty($date_end))
-	    	$sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
-	    $sql .= " AND cs.entity = ".$conf->entity;
+		$sql = "SELECT c.id, c.libelle as label, sum(p.amount) as amount";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c";
+		$sql .= ", ".MAIN_DB_PREFIX."chargesociales as cs";
+		$sql .= ", ".MAIN_DB_PREFIX."paiementcharge as p";
+		$sql .= " WHERE p.fk_charge = cs.rowid";
+		$sql .= " AND cs.fk_type = c.id";
+		$sql .= " AND c.deductible = 1";
+		if (!empty($date_start) && !empty($date_end))
+			$sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
+		$sql .= " AND cs.entity = ".$conf->entity;
 	}
 	$sql .= " GROUP BY c.libelle, c.id";
 	$newsortfield = $sortfield;
@@ -636,32 +636,32 @@ if ($modecompta == 'BOOKKEEPING')
 	$subtotal_ht = 0;
 	$subtotal_ttc = 0;
 	if ($result) {
-	    $num = $db->num_rows($result);
-	    $i = 0;
-	    if ($num) {
-	        while ($i < $num) {
-	            $obj = $db->fetch_object($result);
+		$num = $db->num_rows($result);
+		$i = 0;
+		if ($num) {
+			while ($i < $num) {
+				$obj = $db->fetch_object($result);
 
-	            $total_ht -= $obj->amount;
-	            $total_ttc -= $obj->amount;
-	            $subtotal_ht += $obj->amount;
-	            $subtotal_ttc += $obj->amount;
+				$total_ht -= $obj->amount;
+				$total_ttc -= $obj->amount;
+				$subtotal_ht += $obj->amount;
+				$subtotal_ttc += $obj->amount;
 
-	            print '<tr class="oddeven"><td>&nbsp;</td>';
-	            print '<td>'.$obj->label.'</td>';
-	            if ($modecompta == 'CREANCES-DETTES')
-	            	print '<td class="right">'.price(-$obj->amount).'</td>';
-	            print '<td class="right">'.price(-$obj->amount).'</td>';
-	            print '</tr>';
-	            $i++;
-	        }
-	    } else {
-	        print '<tr class="oddeven"><td>&nbsp;</td>';
-	        print '<td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td>';
-	        print '</tr>';
-	    }
+				print '<tr class="oddeven"><td>&nbsp;</td>';
+				print '<td>'.$obj->label.'</td>';
+				if ($modecompta == 'CREANCES-DETTES')
+					print '<td class="right">'.price(-$obj->amount).'</td>';
+				print '<td class="right">'.price(-$obj->amount).'</td>';
+				print '</tr>';
+				$i++;
+			}
+		} else {
+			print '<tr class="oddeven"><td>&nbsp;</td>';
+			print '<td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td>';
+			print '</tr>';
+		}
 	} else {
-	    dol_print_error($db);
+		dol_print_error($db);
 	}
 	print '<tr class="liste_total">';
 	if ($modecompta == 'CREANCES-DETTES')
@@ -671,20 +671,20 @@ if ($modecompta == 'BOOKKEEPING')
 
 	if ($mysoc->tva_assuj == 'franchise')	// Non assujetti
 	{
-	    // Total
-	    print '<tr>';
-	    print '<td colspan="4">&nbsp;</td>';
-	    print '</tr>';
+		// Total
+		print '<tr>';
+		print '<td colspan="4">&nbsp;</td>';
+		print '</tr>';
 
-	    print '<tr class="liste_total"><td class="left" colspan="2">'.$langs->trans("Profit").'</td>';
-	    if ($modecompta == 'CREANCES-DETTES')
-	    	print '<td class="border right">'.price($total_ht).'</td>';
-	    print '<td class="right">'.price($total_ttc).'</td>';
-	    print '</tr>';
+		print '<tr class="liste_total"><td class="left" colspan="2">'.$langs->trans("Profit").'</td>';
+		if ($modecompta == 'CREANCES-DETTES')
+			print '<td class="border right">'.price($total_ht).'</td>';
+		print '<td class="right">'.price($total_ttc).'</td>';
+		print '</tr>';
 
-	    print '<tr>';
-	    print '<td colspan="4">&nbsp;</td>';
-	    print '</tr>';
+		print '<tr>';
+		print '<td colspan="4">&nbsp;</td>';
+		print '</tr>';
 	}
 
 
@@ -699,9 +699,9 @@ if ($modecompta == 'BOOKKEEPING')
 	 	if ($modecompta == 'CREANCES-DETTES' || $modecompta == 'RECETTES-DEPENSES')
 		{
 			if ($modecompta == 'CREANCES-DETTES') {
-			    $column = 'p.datev';
+				$column = 'p.datev';
 			} else {
-			    $column = 'p.datep';
+				$column = 'p.datep';
 			}
 
 			$sql = "SELECT u.rowid, u.firstname, u.lastname, p.fk_user, p.label as label, date_format($column,'%Y-%m') as dm, sum(p.amount) as amount";
@@ -713,9 +713,9 @@ if ($modecompta == 'BOOKKEEPING')
 
 			$sql .= " GROUP BY u.rowid, u.firstname, u.lastname, p.fk_user, p.label, dm";
 			$newsortfield = $sortfield;
-		    if ($newsortfield == 's.nom, s.rowid') $newsortfield = 'u.firstname, u.lastname';
-		    if ($newsortfield == 'amount_ht') $newsortfield = 'amount';
-		    if ($newsortfield == 'amount_ttc') $newsortfield = 'amount';
+			if ($newsortfield == 's.nom, s.rowid') $newsortfield = 'u.firstname, u.lastname';
+			if ($newsortfield == 'amount_ht') $newsortfield = 'amount';
+			if ($newsortfield == 'amount_ttc') $newsortfield = 'amount';
 			$sql .= $db->order($newsortfield, $sortorder);
 		}
 
@@ -725,35 +725,35 @@ if ($modecompta == 'BOOKKEEPING')
 		$subtotal_ttc = 0;
 		if ($result)
 		{
-		    $num = $db->num_rows($result);
-		    $i = 0;
-		    if ($num)
-		    {
-		        while ($i < $num)
-		        {
-		            $obj = $db->fetch_object($result);
+			$num = $db->num_rows($result);
+			$i = 0;
+			if ($num)
+			{
+				while ($i < $num)
+				{
+					$obj = $db->fetch_object($result);
 
-		            $total_ht -= $obj->amount;
-		            $total_ttc -= $obj->amount;
-		            $subtotal_ht += $obj->amount;
-		            $subtotal_ttc += $obj->amount;
+					$total_ht -= $obj->amount;
+					$total_ttc -= $obj->amount;
+					$subtotal_ht += $obj->amount;
+					$subtotal_ttc += $obj->amount;
 
-		            print '<tr class="oddeven"><td>&nbsp;</td>';
+					print '<tr class="oddeven"><td>&nbsp;</td>';
 
-		            print "<td>".$langs->trans("Salary")." <a href=\"".DOL_URL_ROOT."/salaries/list.php?filtre=s.fk_user=".$obj->fk_user."\">".$obj->firstname." ".$obj->lastname."</a></td>\n";
+					print "<td>".$langs->trans("Salary")." <a href=\"".DOL_URL_ROOT."/salaries/list.php?filtre=s.fk_user=".$obj->fk_user."\">".$obj->firstname." ".$obj->lastname."</a></td>\n";
 
-		            if ($modecompta == 'CREANCES-DETTES') print '<td class="right">'.price(-$obj->amount).'</td>';
-		            print '<td class="right">'.price(-$obj->amount).'</td>';
-		            print '</tr>';
-		            $i++;
-		        }
-		    } else {
-		        print '<tr class="oddeven"><td>&nbsp;</td>';
-		        print '<td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td>';
-		        print '</tr>';
-		    }
+					if ($modecompta == 'CREANCES-DETTES') print '<td class="right">'.price(-$obj->amount).'</td>';
+					print '<td class="right">'.price(-$obj->amount).'</td>';
+					print '</tr>';
+					$i++;
+				}
+			} else {
+				print '<tr class="oddeven"><td>&nbsp;</td>';
+				print '<td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td>';
+				print '</tr>';
+			}
 		} else {
-		    dol_print_error($db);
+			dol_print_error($db);
 		}
 		print '<tr class="liste_total">';
 		if ($modecompta == 'CREANCES-DETTES')
@@ -798,9 +798,9 @@ if ($modecompta == 'BOOKKEEPING')
 			}
 
 			$sql .= " GROUP BY u.rowid, p.rowid, p.ref, u.firstname, u.lastname, dm";
-		    $newsortfield = $sortfield;
-		    if ($newsortfield == 's.nom, s.rowid') $newsortfield = 'p.ref';
-		    $sql .= $db->order($newsortfield, $sortorder);
+			$newsortfield = $sortfield;
+			if ($newsortfield == 's.nom, s.rowid') $newsortfield = 'p.ref';
+			$sql .= $db->order($newsortfield, $sortorder);
 		}
 
 		print '<tr class="trforbreak"><td colspan="4">'.$langs->trans("ExpenseReport").'</td></tr>';
@@ -855,27 +855,27 @@ if ($modecompta == 'BOOKKEEPING')
 		{
 			if ($modecompta == 'CREANCES-DETTES')
 			{
-		    	$sql = "SELECT p.societe as name, p.firstname, p.lastname, date_format(p.datedon,'%Y-%m') as dm, sum(p.amount) as amount";
-		    	$sql .= " FROM ".MAIN_DB_PREFIX."don as p";
-		    	$sql .= " WHERE p.entity IN (".getEntity('donation').")";
-		    	$sql .= " AND fk_statut in (1,2)";
+				$sql = "SELECT p.societe as name, p.firstname, p.lastname, date_format(p.datedon,'%Y-%m') as dm, sum(p.amount) as amount";
+				$sql .= " FROM ".MAIN_DB_PREFIX."don as p";
+				$sql .= " WHERE p.entity IN (".getEntity('donation').")";
+				$sql .= " AND fk_statut in (1,2)";
 			} else {
-			    $sql = "SELECT p.societe as nom, p.firstname, p.lastname, date_format(p.datedon,'%Y-%m') as dm, sum(p.amount) as amount";
-			    $sql .= " FROM ".MAIN_DB_PREFIX."don as p";
-			    $sql .= " INNER JOIN ".MAIN_DB_PREFIX."payment_donation as pe ON pe.fk_donation = p.rowid";
-			    $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as c ON pe.fk_typepayment = c.id";
-			    $sql .= " WHERE p.entity IN (".getEntity('donation').")";
-			    $sql .= " AND fk_statut >= 2";
+				$sql = "SELECT p.societe as nom, p.firstname, p.lastname, date_format(p.datedon,'%Y-%m') as dm, sum(p.amount) as amount";
+				$sql .= " FROM ".MAIN_DB_PREFIX."don as p";
+				$sql .= " INNER JOIN ".MAIN_DB_PREFIX."payment_donation as pe ON pe.fk_donation = p.rowid";
+				$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as c ON pe.fk_typepayment = c.id";
+				$sql .= " WHERE p.entity IN (".getEntity('donation').")";
+				$sql .= " AND fk_statut >= 2";
 			}
 			if (!empty($date_start) && !empty($date_end))
 				$sql .= " AND p.datedon >= '".$db->idate($date_start)."' AND p.datedon <= '".$db->idate($date_end)."'";
 		}
 		$sql .= " GROUP BY p.societe, p.firstname, p.lastname, dm";
-	    $newsortfield = $sortfield;
-	    if ($newsortfield == 's.nom, s.rowid') $newsortfield = 'p.societe, p.firstname, p.lastname, dm';
-	    if ($newsortfield == 'amount_ht') $newsortfield = 'amount';
-	    if ($newsortfield == 'amount_ttc') $newsortfield = 'amount';
-	    $sql .= $db->order($newsortfield, $sortorder);
+		$newsortfield = $sortfield;
+		if ($newsortfield == 's.nom, s.rowid') $newsortfield = 'p.societe, p.firstname, p.lastname, dm';
+		if ($newsortfield == 'amount_ht') $newsortfield = 'amount';
+		if ($newsortfield == 'amount_ttc') $newsortfield = 'amount';
+		$sql .= $db->order($newsortfield, $sortorder);
 
 		dol_syslog("get dunning");
 		$result = $db->query($sql);
@@ -920,113 +920,113 @@ if ($modecompta == 'BOOKKEEPING')
 		print '</tr>';
 	}
 
-    /*
+	/*
      * Various Payments
      */
 
-    if (!empty($conf->global->ACCOUNTING_REPORTS_INCLUDE_VARPAY) && !empty($conf->banque->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecompta == "RECETTES-DEPENSES"))
-    {
-        $subtotal_ht = 0;
-        $subtotal_ttc = 0;
+	if (!empty($conf->global->ACCOUNTING_REPORTS_INCLUDE_VARPAY) && !empty($conf->banque->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecompta == "RECETTES-DEPENSES"))
+	{
+		$subtotal_ht = 0;
+		$subtotal_ttc = 0;
 
-        print '<tr class="trforbreak"><td colspan="4">'.$langs->trans("VariousPayment").'</td></tr>';
+		print '<tr class="trforbreak"><td colspan="4">'.$langs->trans("VariousPayment").'</td></tr>';
 
-        // Debit
-        $sql = "SELECT SUM(p.amount) AS amount FROM ".MAIN_DB_PREFIX."payment_various as p";
-        $sql .= ' WHERE 1 = 1';
-        if (!empty($date_start) && !empty($date_end))
-            $sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
-        $sql .= ' GROUP BY p.sens';
-        $sql .= ' ORDER BY p.sens';
+		// Debit
+		$sql = "SELECT SUM(p.amount) AS amount FROM ".MAIN_DB_PREFIX."payment_various as p";
+		$sql .= ' WHERE 1 = 1';
+		if (!empty($date_start) && !empty($date_end))
+			$sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
+		$sql .= ' GROUP BY p.sens';
+		$sql .= ' ORDER BY p.sens';
 
-        dol_syslog('get various payments', LOG_DEBUG);
-        $result = $db->query($sql);
-        if ($result)
-        {
-            // Debit
-            $obj = $db->fetch_object($result);
-            if (isset($obj->amount))
-            {
-                $subtotal_ht += -$obj->amount;
-                $subtotal_ttc += -$obj->amount;
-            }
-            print '<tr class="oddeven"><td>&nbsp;</td>';
-            print "<td>".$langs->trans("Debit")."</td>\n";
-            if ($modecompta == 'CREANCES-DETTES') print '<td class="right">'.price(-$obj->amount).'</td>';
-            print '<td class="right">'.price(-$obj->amount)."</td>\n";
-            print "</tr>\n";
+		dol_syslog('get various payments', LOG_DEBUG);
+		$result = $db->query($sql);
+		if ($result)
+		{
+			// Debit
+			$obj = $db->fetch_object($result);
+			if (isset($obj->amount))
+			{
+				$subtotal_ht += -$obj->amount;
+				$subtotal_ttc += -$obj->amount;
+			}
+			print '<tr class="oddeven"><td>&nbsp;</td>';
+			print "<td>".$langs->trans("Debit")."</td>\n";
+			if ($modecompta == 'CREANCES-DETTES') print '<td class="right">'.price(-$obj->amount).'</td>';
+			print '<td class="right">'.price(-$obj->amount)."</td>\n";
+			print "</tr>\n";
 
-            // Credit
-            $obj = $db->fetch_object($result);
-            if (isset($obj->amount))
-            {
-                $subtotal_ht += $obj->amount;
-                $subtotal_ttc += $obj->amount;
-            }
-            print '<tr class="oddeven"><td>&nbsp;</td>';
-            print "<td>".$langs->trans("Credit")."</td>\n";
-            if ($modecompta == 'CREANCES-DETTES') print '<td class="right">'.price($obj->amount).'</td>';
-            print '<td class="right">'.price($obj->amount)."</td>\n";
-            print "</tr>\n";
+			// Credit
+			$obj = $db->fetch_object($result);
+			if (isset($obj->amount))
+			{
+				$subtotal_ht += $obj->amount;
+				$subtotal_ttc += $obj->amount;
+			}
+			print '<tr class="oddeven"><td>&nbsp;</td>';
+			print "<td>".$langs->trans("Credit")."</td>\n";
+			if ($modecompta == 'CREANCES-DETTES') print '<td class="right">'.price($obj->amount).'</td>';
+			print '<td class="right">'.price($obj->amount)."</td>\n";
+			print "</tr>\n";
 
-            // Total
-            $total_ht += $subtotal_ht;
-            $total_ttc += $subtotal_ttc;
-            print '<tr class="liste_total">';
-            if ($modecompta == 'CREANCES-DETTES')
-                print '<td colspan="3" class="right">'.price($subtotal_ht).'</td>';
-            print '<td colspan="3" class="right">'.price($subtotal_ttc).'</td>';
-            print '</tr>';
-        } else dol_print_error($db);
-    }
+			// Total
+			$total_ht += $subtotal_ht;
+			$total_ttc += $subtotal_ttc;
+			print '<tr class="liste_total">';
+			if ($modecompta == 'CREANCES-DETTES')
+				print '<td colspan="3" class="right">'.price($subtotal_ht).'</td>';
+			print '<td colspan="3" class="right">'.price($subtotal_ttc).'</td>';
+			print '</tr>';
+		} else dol_print_error($db);
+	}
 
-    /*
+	/*
      * Payement Loan
      */
 
-    if (!empty($conf->global->ACCOUNTING_REPORTS_INCLUDE_LOAN) && !empty($conf->loan->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecompta == "RECETTES-DEPENSES"))
-    {
-        $subtotal_ht = 0;
-        $subtotal_ttc = 0;
+	if (!empty($conf->global->ACCOUNTING_REPORTS_INCLUDE_LOAN) && !empty($conf->loan->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecompta == "RECETTES-DEPENSES"))
+	{
+		$subtotal_ht = 0;
+		$subtotal_ttc = 0;
 
-        print '<tr class="trforbreak"><td colspan="4">'.$langs->trans("PaymentLoan").'</td></tr>';
+		print '<tr class="trforbreak"><td colspan="4">'.$langs->trans("PaymentLoan").'</td></tr>';
 
-        $sql = 'SELECT l.rowid as id, l.label AS label, SUM(p.amount_capital + p.amount_insurance + p.amount_interest) as amount FROM '.MAIN_DB_PREFIX.'payment_loan as p';
-        $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'loan AS l ON l.rowid = p.fk_loan';
-        $sql .= ' WHERE 1 = 1';
-        if (!empty($date_start) && !empty($date_end))
-            $sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
-        $sql .= ' GROUP BY p.fk_loan';
-        $sql .= ' ORDER BY p.fk_loan';
+		$sql = 'SELECT l.rowid as id, l.label AS label, SUM(p.amount_capital + p.amount_insurance + p.amount_interest) as amount FROM '.MAIN_DB_PREFIX.'payment_loan as p';
+		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'loan AS l ON l.rowid = p.fk_loan';
+		$sql .= ' WHERE 1 = 1';
+		if (!empty($date_start) && !empty($date_end))
+			$sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
+		$sql .= ' GROUP BY p.fk_loan';
+		$sql .= ' ORDER BY p.fk_loan';
 
-        dol_syslog('get loan payments', LOG_DEBUG);
-        $result = $db->query($sql);
-        if ($result)
-        {
-            require_once DOL_DOCUMENT_ROOT.'/loan/class/loan.class.php';
-            $loan_static = new Loan($db);
-            while ($obj = $db->fetch_object($result))
-            {
-                $loan_static->id = $obj->id;
-                $loan_static->ref = $obj->id;
-                $loan_static->label = $obj->label;
-                print '<tr class="oddeven"><td>&nbsp;</td>';
-                print "<td>".$loan_static->getNomUrl(1).' - '.$obj->label."</td>\n";
-                if ($modecompta == 'CREANCES-DETTES') print '<td class="right">'.price(-$obj->amount).'</td>';
-                print '<td class="right">'.price(-$obj->amount)."</td>\n";
-                print "</tr>\n";
-                $subtotal_ht -= $obj->amount;
-                $subtotal_ttc -= $obj->amount;
-            }
-            $total_ht += $subtotal_ht;
-            $total_ttc += $subtotal_ttc;
-            print '<tr class="liste_total">';
-            if ($modecompta == 'CREANCES-DETTES')
-                print '<td colspan="3" class="right">'.price($subtotal_ht).'</td>';
-            print '<td colspan="3" class="right">'.price($subtotal_ttc).'</td>';
-            print '</tr>';
-        } else dol_print_error($db);
-    }
+		dol_syslog('get loan payments', LOG_DEBUG);
+		$result = $db->query($sql);
+		if ($result)
+		{
+			require_once DOL_DOCUMENT_ROOT.'/loan/class/loan.class.php';
+			$loan_static = new Loan($db);
+			while ($obj = $db->fetch_object($result))
+			{
+				$loan_static->id = $obj->id;
+				$loan_static->ref = $obj->id;
+				$loan_static->label = $obj->label;
+				print '<tr class="oddeven"><td>&nbsp;</td>';
+				print "<td>".$loan_static->getNomUrl(1).' - '.$obj->label."</td>\n";
+				if ($modecompta == 'CREANCES-DETTES') print '<td class="right">'.price(-$obj->amount).'</td>';
+				print '<td class="right">'.price(-$obj->amount)."</td>\n";
+				print "</tr>\n";
+				$subtotal_ht -= $obj->amount;
+				$subtotal_ttc -= $obj->amount;
+			}
+			$total_ht += $subtotal_ht;
+			$total_ttc += $subtotal_ttc;
+			print '<tr class="liste_total">';
+			if ($modecompta == 'CREANCES-DETTES')
+				print '<td colspan="3" class="right">'.price($subtotal_ht).'</td>';
+			print '<td colspan="3" class="right">'.price($subtotal_ttc).'</td>';
+			print '</tr>';
+		} else dol_print_error($db);
+	}
 
 	/*
 	 * VAT
@@ -1040,198 +1040,198 @@ if ($modecompta == 'BOOKKEEPING')
 	{
 		if ($modecompta == 'CREANCES-DETTES')
 		{
-		    // TVA a payer
-		    $amount = 0;
-		    $sql = "SELECT date_format(f.datef,'%Y-%m') as dm, sum(f.tva) as amount";
-		    $sql .= " FROM ".MAIN_DB_PREFIX."facture as f";
-		    $sql .= " WHERE f.fk_statut IN (1,2)";
-		    if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS))
-		    	$sql .= " AND f.type IN (0,1,2,5)";
+			// TVA a payer
+			$amount = 0;
+			$sql = "SELECT date_format(f.datef,'%Y-%m') as dm, sum(f.tva) as amount";
+			$sql .= " FROM ".MAIN_DB_PREFIX."facture as f";
+			$sql .= " WHERE f.fk_statut IN (1,2)";
+			if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS))
+				$sql .= " AND f.type IN (0,1,2,5)";
 			else $sql .= " AND f.type IN (0,1,2,3,5)";
-		    if (!empty($date_start) && !empty($date_end))
-		    	$sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
-		    $sql .= " AND f.entity IN (".getEntity('invoice').")";
-		    $sql .= " GROUP BY dm";
-		    $newsortfield = $sortfield;
-		    if ($newsortfield == 's.nom, s.rowid') $newsortfield = 'dm';
-		    if ($newsortfield == 'amount_ht') $newsortfield = 'amount';
-		    if ($newsortfield == 'amount_ttc') $newsortfield = 'amount';
-		    $sql .= $db->order($newsortfield, $sortorder);
+			if (!empty($date_start) && !empty($date_end))
+				$sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
+			$sql .= " AND f.entity IN (".getEntity('invoice').")";
+			$sql .= " GROUP BY dm";
+			$newsortfield = $sortfield;
+			if ($newsortfield == 's.nom, s.rowid') $newsortfield = 'dm';
+			if ($newsortfield == 'amount_ht') $newsortfield = 'amount';
+			if ($newsortfield == 'amount_ttc') $newsortfield = 'amount';
+			$sql .= $db->order($newsortfield, $sortorder);
 
-		    dol_syslog("get vat to pay", LOG_DEBUG);
-		    $result = $db->query($sql);
-		    if ($result)
-		    {
-		        $num = $db->num_rows($result);
-		        $i = 0;
-		        if ($num)
-		        {
-		            while ($i < $num)
-		            {
-		                $obj = $db->fetch_object($result);
+			dol_syslog("get vat to pay", LOG_DEBUG);
+			$result = $db->query($sql);
+			if ($result)
+			{
+				$num = $db->num_rows($result);
+				$i = 0;
+				if ($num)
+				{
+					while ($i < $num)
+					{
+						$obj = $db->fetch_object($result);
 
-		                $amount -= $obj->amount;
-		                //$total_ht -= $obj->amount;
-		                $total_ttc -= $obj->amount;
-		                //$subtotal_ht -= $obj->amount;
-		                $subtotal_ttc -= $obj->amount;
-		                $i++;
-		            }
-		        }
-		    } else {
-		        dol_print_error($db);
-		    }
-		    print '<tr class="oddeven"><td>&nbsp;</td>';
-		    print "<td>".$langs->trans("VATToPay")."</td>\n";
-		    print '<td class="right">&nbsp;</td>'."\n";
-		    print '<td class="right">'.price($amount)."</td>\n";
-		    print "</tr>\n";
+						$amount -= $obj->amount;
+						//$total_ht -= $obj->amount;
+						$total_ttc -= $obj->amount;
+						//$subtotal_ht -= $obj->amount;
+						$subtotal_ttc -= $obj->amount;
+						$i++;
+					}
+				}
+			} else {
+				dol_print_error($db);
+			}
+			print '<tr class="oddeven"><td>&nbsp;</td>';
+			print "<td>".$langs->trans("VATToPay")."</td>\n";
+			print '<td class="right">&nbsp;</td>'."\n";
+			print '<td class="right">'.price($amount)."</td>\n";
+			print "</tr>\n";
 
-		    // TVA a recuperer
-		    $amount = 0;
-		    $sql = "SELECT date_format(f.datef,'%Y-%m') as dm, sum(f.total_tva) as amount";
-		    $sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f";
-		    $sql .= " WHERE f.fk_statut IN (1,2)";
-		    if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS))
-		    	$sql .= " AND f.type IN (0,1,2)";
+			// TVA a recuperer
+			$amount = 0;
+			$sql = "SELECT date_format(f.datef,'%Y-%m') as dm, sum(f.total_tva) as amount";
+			$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f";
+			$sql .= " WHERE f.fk_statut IN (1,2)";
+			if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS))
+				$sql .= " AND f.type IN (0,1,2)";
 			else $sql .= " AND f.type IN (0,1,2,3)";
-		    if (!empty($date_start) && !empty($date_end))
-		    	$sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
-		    $sql .= " AND f.entity = ".$conf->entity;
-		    $sql .= " GROUP BY dm";
-		    $newsortfield = $sortfield;
-		    if ($newsortfield == 's.nom, s.rowid') $newsortfield = 'dm';
-		    if ($newsortfield == 'amount_ht') $newsortfield = 'amount';
-		    if ($newsortfield == 'amount_ttc') $newsortfield = 'amount';
-		    $sql .= $db->order($newsortfield, $sortorder);
+			if (!empty($date_start) && !empty($date_end))
+				$sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
+			$sql .= " AND f.entity = ".$conf->entity;
+			$sql .= " GROUP BY dm";
+			$newsortfield = $sortfield;
+			if ($newsortfield == 's.nom, s.rowid') $newsortfield = 'dm';
+			if ($newsortfield == 'amount_ht') $newsortfield = 'amount';
+			if ($newsortfield == 'amount_ttc') $newsortfield = 'amount';
+			$sql .= $db->order($newsortfield, $sortorder);
 
-		    dol_syslog("get vat received back", LOG_DEBUG);
-		    $result = $db->query($sql);
-		    if ($result)
-		    {
-		        $num = $db->num_rows($result);
-		        $i = 0;
-		        if ($num)
-		        {
-		            while ($i < $num)
-		            {
-		                $obj = $db->fetch_object($result);
+			dol_syslog("get vat received back", LOG_DEBUG);
+			$result = $db->query($sql);
+			if ($result)
+			{
+				$num = $db->num_rows($result);
+				$i = 0;
+				if ($num)
+				{
+					while ($i < $num)
+					{
+						$obj = $db->fetch_object($result);
 
-		                $amount += $obj->amount;
-		                //$total_ht += $obj->amount;
-		                $total_ttc += $obj->amount;
-		                //$subtotal_ht += $obj->amount;
-		                $subtotal_ttc += $obj->amount;
+						$amount += $obj->amount;
+						//$total_ht += $obj->amount;
+						$total_ttc += $obj->amount;
+						//$subtotal_ht += $obj->amount;
+						$subtotal_ttc += $obj->amount;
 
-		                $i++;
-		            }
-		        }
-		    } else {
-		        dol_print_error($db);
-		    }
-		    print '<tr class="oddeven"><td>&nbsp;</td>';
-		    print '<td>'.$langs->trans("VATToCollect")."</td>\n";
-		    print '<td class="right">&nbsp;</td>'."\n";
-		    print '<td class="right">'.price($amount)."</td>\n";
-		    print "</tr>\n";
+						$i++;
+					}
+				}
+			} else {
+				dol_print_error($db);
+			}
+			print '<tr class="oddeven"><td>&nbsp;</td>';
+			print '<td>'.$langs->trans("VATToCollect")."</td>\n";
+			print '<td class="right">&nbsp;</td>'."\n";
+			print '<td class="right">'.price($amount)."</td>\n";
+			print "</tr>\n";
 		} else {
-		    // VAT really already paid
-		    $amount = 0;
-		    $sql = "SELECT date_format(t.datev,'%Y-%m') as dm, sum(t.amount) as amount";
-		    $sql .= " FROM ".MAIN_DB_PREFIX."tva as t";
-		    $sql .= " WHERE amount > 0";
-		    if (!empty($date_start) && !empty($date_end))
-		    	$sql .= " AND t.datev >= '".$db->idate($date_start)."' AND t.datev <= '".$db->idate($date_end)."'";
-		    $sql .= " AND t.entity = ".$conf->entity;
-		    $sql .= " GROUP BY dm";
-		    $newsortfield = $sortfield;
-		    if ($newsortfield == 's.nom, s.rowid') $newsortfield = 'dm';
-		    if ($newsortfield == 'amount_ht') $newsortfield = 'amount';
-		    if ($newsortfield == 'amount_ttc') $newsortfield = 'amount';
-		    $sql .= $db->order($newsortfield, $sortorder);
+			// VAT really already paid
+			$amount = 0;
+			$sql = "SELECT date_format(t.datev,'%Y-%m') as dm, sum(t.amount) as amount";
+			$sql .= " FROM ".MAIN_DB_PREFIX."tva as t";
+			$sql .= " WHERE amount > 0";
+			if (!empty($date_start) && !empty($date_end))
+				$sql .= " AND t.datev >= '".$db->idate($date_start)."' AND t.datev <= '".$db->idate($date_end)."'";
+			$sql .= " AND t.entity = ".$conf->entity;
+			$sql .= " GROUP BY dm";
+			$newsortfield = $sortfield;
+			if ($newsortfield == 's.nom, s.rowid') $newsortfield = 'dm';
+			if ($newsortfield == 'amount_ht') $newsortfield = 'amount';
+			if ($newsortfield == 'amount_ttc') $newsortfield = 'amount';
+			$sql .= $db->order($newsortfield, $sortorder);
 
-		    dol_syslog("get vat really paid", LOG_DEBUG);
-		    $result = $db->query($sql);
-		    if ($result) {
-		        $num = $db->num_rows($result);
-		        $i = 0;
-		        if ($num) {
-		            while ($i < $num) {
-		                $obj = $db->fetch_object($result);
+			dol_syslog("get vat really paid", LOG_DEBUG);
+			$result = $db->query($sql);
+			if ($result) {
+				$num = $db->num_rows($result);
+				$i = 0;
+				if ($num) {
+					while ($i < $num) {
+						$obj = $db->fetch_object($result);
 
-		                $amount -= $obj->amount;
-		                $total_ht -= $obj->amount;
-		                $total_ttc -= $obj->amount;
-		                $subtotal_ht -= $obj->amount;
-		                $subtotal_ttc -= $obj->amount;
+						$amount -= $obj->amount;
+						$total_ht -= $obj->amount;
+						$total_ttc -= $obj->amount;
+						$subtotal_ht -= $obj->amount;
+						$subtotal_ttc -= $obj->amount;
 
-		                $i++;
-		            }
-		        }
-		        $db->free($result);
-		    } else {
-		        dol_print_error($db);
-		    }
-		    print '<tr class="oddeven"><td>&nbsp;</td>';
-		    print "<td>".$langs->trans("VATPaid")."</td>\n";
-		    if ($modecompta == 'CREANCES-DETTES')
-		    	print '<td <class="right">'.price($amount)."</td>\n";
-		    print '<td class="right">'.price($amount)."</td>\n";
-		    print "</tr>\n";
+						$i++;
+					}
+				}
+				$db->free($result);
+			} else {
+				dol_print_error($db);
+			}
+			print '<tr class="oddeven"><td>&nbsp;</td>';
+			print "<td>".$langs->trans("VATPaid")."</td>\n";
+			if ($modecompta == 'CREANCES-DETTES')
+				print '<td <class="right">'.price($amount)."</td>\n";
+			print '<td class="right">'.price($amount)."</td>\n";
+			print "</tr>\n";
 
-		    // VAT really received
-		    $amount = 0;
-		    $sql = "SELECT date_format(t.datev,'%Y-%m') as dm, sum(t.amount) as amount";
-		    $sql .= " FROM ".MAIN_DB_PREFIX."tva as t";
-		    $sql .= " WHERE amount < 0";
-		    if (!empty($date_start) && !empty($date_end))
-		    	$sql .= " AND t.datev >= '".$db->idate($date_start)."' AND t.datev <= '".$db->idate($date_end)."'";
-		    $sql .= " AND t.entity = ".$conf->entity;
-		    $sql .= " GROUP BY dm";
-		    $newsortfield = $sortfield;
-		    if ($newsortfield == 's.nom, s.rowid') $newsortfield = 'dm';
-		    if ($newsortfield == 'amount_ht') $newsortfield = 'amount';
-		    if ($newsortfield == 'amount_ttc') $newsortfield = 'amount';
-		    $sql .= $db->order($newsortfield, $sortorder);
+			// VAT really received
+			$amount = 0;
+			$sql = "SELECT date_format(t.datev,'%Y-%m') as dm, sum(t.amount) as amount";
+			$sql .= " FROM ".MAIN_DB_PREFIX."tva as t";
+			$sql .= " WHERE amount < 0";
+			if (!empty($date_start) && !empty($date_end))
+				$sql .= " AND t.datev >= '".$db->idate($date_start)."' AND t.datev <= '".$db->idate($date_end)."'";
+			$sql .= " AND t.entity = ".$conf->entity;
+			$sql .= " GROUP BY dm";
+			$newsortfield = $sortfield;
+			if ($newsortfield == 's.nom, s.rowid') $newsortfield = 'dm';
+			if ($newsortfield == 'amount_ht') $newsortfield = 'amount';
+			if ($newsortfield == 'amount_ttc') $newsortfield = 'amount';
+			$sql .= $db->order($newsortfield, $sortorder);
 
-		    dol_syslog("get vat really received back", LOG_DEBUG);
-		    $result = $db->query($sql);
-		    if ($result) {
-		        $num = $db->num_rows($result);
-		        $i = 0;
-		        if ($num) {
-		            while ($i < $num) {
-		                $obj = $db->fetch_object($result);
+			dol_syslog("get vat really received back", LOG_DEBUG);
+			$result = $db->query($sql);
+			if ($result) {
+				$num = $db->num_rows($result);
+				$i = 0;
+				if ($num) {
+					while ($i < $num) {
+						$obj = $db->fetch_object($result);
 
-		                $amount += -$obj->amount;
-		                $total_ht += -$obj->amount;
-		                $total_ttc += -$obj->amount;
-		                $subtotal_ht += -$obj->amount;
-		                $subtotal_ttc += -$obj->amount;
+						$amount += -$obj->amount;
+						$total_ht += -$obj->amount;
+						$total_ttc += -$obj->amount;
+						$subtotal_ht += -$obj->amount;
+						$subtotal_ttc += -$obj->amount;
 
-		                $i++;
-		            }
-		        }
-		        $db->free($result);
-		    } else {
-		        dol_print_error($db);
-		    }
-		    print '<tr class="oddeven"><td>&nbsp;</td>';
-		    print "<td>".$langs->trans("VATCollected")."</td>\n";
-		    if ($modecompta == 'CREANCES-DETTES')
-		    	print '<td class="right">'.price($amount)."</td>\n";
-		    print '<td class="right">'.price($amount)."</td>\n";
-		    print "</tr>\n";
+						$i++;
+					}
+				}
+				$db->free($result);
+			} else {
+				dol_print_error($db);
+			}
+			print '<tr class="oddeven"><td>&nbsp;</td>';
+			print "<td>".$langs->trans("VATCollected")."</td>\n";
+			if ($modecompta == 'CREANCES-DETTES')
+				print '<td class="right">'.price($amount)."</td>\n";
+			print '<td class="right">'.price($amount)."</td>\n";
+			print "</tr>\n";
 		}
 	}
 
 	if ($mysoc->tva_assuj != 'franchise')	// Assujetti
 	{
-	    print '<tr class="liste_total">';
-	    if ($modecompta == 'CREANCES-DETTES')
-	    	print '<td colspan="3" class="right">&nbsp;</td>';
-	    print '<td colspan="3" class="right">'.price(price2num($subtotal_ttc, 'MT')).'</td>';
-	    print '</tr>';
+		print '<tr class="liste_total">';
+		if ($modecompta == 'CREANCES-DETTES')
+			print '<td colspan="3" class="right">&nbsp;</td>';
+		print '<td colspan="3" class="right">'.price(price2num($subtotal_ttc, 'MT')).'</td>';
+		print '</tr>';
 	}
 }
 
@@ -1248,16 +1248,16 @@ print $hookmanager->resPrint;
 
 if ($mysoc->tva_assuj != 'franchise')	// Assujetti
 {
-    // Total
-    print '<tr>';
-    print '<td colspan="4">&nbsp;</td>';
-    print '</tr>';
+	// Total
+	print '<tr>';
+	print '<td colspan="4">&nbsp;</td>';
+	print '</tr>';
 
-    print '<tr class="liste_total"><td class="left" colspan="2">'.$langs->trans("Profit").'</td>';
-    if ($modecompta == 'CREANCES-DETTES')
-    	print '<td class="liste_total right">'.price(price2num($total_ht, 'MT')).'</td>';
-    print '<td class="liste_total right">'.price(price2num($total_ttc, 'MT')).'</td>';
-    print '</tr>';
+	print '<tr class="liste_total"><td class="left" colspan="2">'.$langs->trans("Profit").'</td>';
+	if ($modecompta == 'CREANCES-DETTES')
+		print '<td class="liste_total right">'.price(price2num($total_ht, 'MT')).'</td>';
+	print '<td class="liste_total right">'.price(price2num($total_ttc, 'MT')).'</td>';
+	print '</tr>';
 }
 
 print "</table>";
diff --git a/htdocs/compta/resultat/index.php b/htdocs/compta/resultat/index.php
index 754c84350af..15ec1526260 100644
--- a/htdocs/compta/resultat/index.php
+++ b/htdocs/compta/resultat/index.php
@@ -164,7 +164,7 @@ report_header($name, '', $period, $periodlink, $description, $builddate, $export
 
 if (!empty($conf->accounting->enabled) && $modecompta != 'BOOKKEEPING')
 {
-    print info_admin($langs->trans("WarningReportNotReliable"), 0, 0, 1);
+	print info_admin($langs->trans("WarningReportNotReliable"), 0, 0, 1);
 }
 
 
@@ -186,8 +186,8 @@ if (!empty($conf->facture->enabled) && ($modecompta == 'CREANCES-DETTES' || $mod
 		$sql .= " AND f.fk_statut IN (1,2)";
 		if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql .= " AND f.type IN (0,1,2,5)";
 		else $sql .= " AND f.type IN (0,1,2,3,5)";
-	    if (!empty($date_start) && !empty($date_end))
-	    	$sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
+		if (!empty($date_start) && !empty($date_end))
+			$sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
 	} elseif ($modecompta == "RECETTES-DEPENSES")
 	{
 		/*
@@ -200,8 +200,8 @@ if (!empty($conf->facture->enabled) && ($modecompta == 'CREANCES-DETTES' || $mod
 		$sql .= ", ".MAIN_DB_PREFIX."paiement as p";
 		$sql .= " WHERE p.rowid = pf.fk_paiement";
 		$sql .= " AND pf.fk_facture = f.rowid";
-	    if (!empty($date_start) && !empty($date_end))
-	    	$sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
+		if (!empty($date_start) && !empty($date_end))
+			$sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
 	}
 
 	$sql .= " AND f.entity IN (".getEntity('invoice').")";
@@ -246,8 +246,8 @@ if (!empty($conf->facture->enabled) && ($modecompta == 'CREANCES-DETTES' || $mod
 		$sql .= " AND p.fk_bank = b.rowid";
 		$sql .= " AND b.fk_account = ba.rowid";
 		$sql .= " AND ba.entity IN (".getEntity('bank_account').")";
-    	if (!empty($date_start) && !empty($date_end))
-    		$sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
+		if (!empty($date_start) && !empty($date_end))
+			$sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
 		$sql .= " GROUP BY dm";
 		$sql .= " ORDER BY dm";
 
@@ -296,8 +296,8 @@ if (!empty($conf->facture->enabled) && ($modecompta == 'CREANCES-DETTES' || $mod
 		$sql .= " WHERE f.fk_statut IN (1,2)";
 		if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql .= " AND f.type IN (0,1,2)";
 		else $sql .= " AND f.type IN (0,1,2,3)";
-    	if (!empty($date_start) && !empty($date_end))
-    		$sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
+		if (!empty($date_start) && !empty($date_end))
+			$sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
 	} elseif ($modecompta == "RECETTES-DEPENSES")
 	{
 		$sql = "SELECT sum(pf.amount) as amount_ttc, date_format(p.datep,'%Y-%m') as dm";
@@ -306,8 +306,8 @@ if (!empty($conf->facture->enabled) && ($modecompta == 'CREANCES-DETTES' || $mod
 		$sql .= ", ".MAIN_DB_PREFIX."paiementfourn_facturefourn as pf";
 		$sql .= " WHERE f.rowid = pf.fk_facturefourn";
 		$sql .= " AND p.rowid = pf.fk_paiementfourn";
-    	if (!empty($date_start) && !empty($date_end))
-    		$sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
+		if (!empty($date_start) && !empty($date_end))
+			$sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
 	}
 
 	$sql .= " AND f.entity = ".$conf->entity;
@@ -360,8 +360,8 @@ if (!empty($conf->tax->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecom
 		if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql .= " AND f.type IN (0,1,2,5)";
 		else $sql .= " AND f.type IN (0,1,2,3,5)";
 		$sql .= " AND f.entity IN (".getEntity('invoice').")";
-    	if (!empty($date_start) && !empty($date_end))
-    		$sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
+		if (!empty($date_start) && !empty($date_end))
+			$sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
 		$sql .= " GROUP BY dm";
 
 		dol_syslog("get vat to pay", LOG_DEBUG);
@@ -392,8 +392,8 @@ if (!empty($conf->tax->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecom
 		if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql .= " AND f.type IN (0,1,2)";
 		else $sql .= " AND f.type IN (0,1,2,3)";
 		$sql .= " AND f.entity = ".$conf->entity;
-    	if (!empty($date_start) && !empty($date_end))
-    		$sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
+		if (!empty($date_start) && !empty($date_end))
+			$sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
 		$sql .= " GROUP BY dm";
 
 		dol_syslog("get vat to receive back", LOG_DEBUG);
@@ -424,8 +424,8 @@ if (!empty($conf->tax->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecom
 		$sql .= " FROM ".MAIN_DB_PREFIX."tva as t";
 		$sql .= " WHERE amount > 0";
 		$sql .= " AND t.entity = ".$conf->entity;
-    	if (!empty($date_start) && !empty($date_end))
-    		$sql .= " AND t.datev >= '".$db->idate($date_start)."' AND t.datev <= '".$db->idate($date_end)."'";
+		if (!empty($date_start) && !empty($date_end))
+			$sql .= " AND t.datev >= '".$db->idate($date_start)."' AND t.datev <= '".$db->idate($date_end)."'";
 		$sql .= " GROUP BY dm";
 
 		dol_syslog("get vat really paid", LOG_DEBUG);
@@ -454,8 +454,8 @@ if (!empty($conf->tax->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecom
 		$sql .= " FROM ".MAIN_DB_PREFIX."tva as t";
 		$sql .= " WHERE amount < 0";
 		$sql .= " AND t.entity = ".$conf->entity;
-    	if (!empty($date_start) && !empty($date_end))
-    		$sql .= " AND t.datev >= '".$db->idate($date_start)."' AND t.datev <= '".$db->idate($date_end)."'";
+		if (!empty($date_start) && !empty($date_end))
+			$sql .= " AND t.datev >= '".$db->idate($date_start)."' AND t.datev <= '".$db->idate($date_end)."'";
 		$sql .= " GROUP BY dm";
 
 		dol_syslog("get vat really received back", LOG_DEBUG);
@@ -499,8 +499,8 @@ if (!empty($conf->tax->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecom
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c";
 		$sql .= ", ".MAIN_DB_PREFIX."chargesociales as cs";
 		$sql .= " WHERE cs.fk_type = c.id";
-    	if (!empty($date_start) && !empty($date_end))
-    		$sql .= " AND cs.date_ech >= '".$db->idate($date_start)."' AND cs.date_ech <= '".$db->idate($date_end)."'";
+		if (!empty($date_start) && !empty($date_end))
+			$sql .= " AND cs.date_ech >= '".$db->idate($date_start)."' AND cs.date_ech <= '".$db->idate($date_end)."'";
 	} elseif ($modecompta == "RECETTES-DEPENSES")
 	{
 		$sql = "SELECT c.libelle as nom, date_format(p.datep,'%Y-%m') as dm, sum(p.amount) as amount";
@@ -509,8 +509,8 @@ if (!empty($conf->tax->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecom
 		$sql .= ", ".MAIN_DB_PREFIX."paiementcharge as p";
 		$sql .= " WHERE p.fk_charge = cs.rowid";
 		$sql .= " AND cs.fk_type = c.id";
-    	if (!empty($date_start) && !empty($date_end))
-    		$sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
+		if (!empty($date_start) && !empty($date_end))
+			$sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
 	}
 
 	$sql .= " AND cs.entity = ".$conf->entity;
@@ -656,54 +656,54 @@ if (!empty($conf->expensereport->enabled) && ($modecompta == 'CREANCES-DETTES' |
 
 if (!empty($conf->don->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecompta == "RECETTES-DEPENSES"))
 {
-    $subtotal_ht = 0;
-    $subtotal_ttc = 0;
+	$subtotal_ht = 0;
+	$subtotal_ttc = 0;
 
-    if ($modecompta == 'CREANCES-DETTES') {
-        $sql = "SELECT p.societe as nom, p.firstname, p.lastname, date_format(p.datedon,'%Y-%m') as dm, sum(p.amount) as amount";
-        $sql .= " FROM ".MAIN_DB_PREFIX."don as p";
-        $sql .= " WHERE p.entity IN (".getEntity('donation').")";
-        $sql .= " AND fk_statut in (1,2)";
+	if ($modecompta == 'CREANCES-DETTES') {
+		$sql = "SELECT p.societe as nom, p.firstname, p.lastname, date_format(p.datedon,'%Y-%m') as dm, sum(p.amount) as amount";
+		$sql .= " FROM ".MAIN_DB_PREFIX."don as p";
+		$sql .= " WHERE p.entity IN (".getEntity('donation').")";
+		$sql .= " AND fk_statut in (1,2)";
 		if (!empty($date_start) && !empty($date_end))
 			$sql .= " AND p.datedon >= '".$db->idate($date_start)."' AND p.datedon <= '".$db->idate($date_end)."'";
-    } elseif ($modecompta == 'RECETTES-DEPENSES') {
-        $sql = "SELECT p.societe as nom, p.firstname, p.lastname, date_format(pe.datep,'%Y-%m') as dm, sum(p.amount) as amount";
-        $sql .= " FROM ".MAIN_DB_PREFIX."don as p";
+	} elseif ($modecompta == 'RECETTES-DEPENSES') {
+		$sql = "SELECT p.societe as nom, p.firstname, p.lastname, date_format(pe.datep,'%Y-%m') as dm, sum(p.amount) as amount";
+		$sql .= " FROM ".MAIN_DB_PREFIX."don as p";
 		$sql .= " INNER JOIN ".MAIN_DB_PREFIX."payment_donation as pe ON pe.fk_donation = p.rowid";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as c ON pe.fk_typepayment = c.id";
 		$sql .= " WHERE p.entity IN (".getEntity('donation').")";
-   	    $sql .= " AND fk_statut >= 2";
-        if (!empty($date_start) && !empty($date_end)) {
-            $sql .= " AND pe.datep >= '".$db->idate($date_start)."' AND pe.datep <= '".$db->idate($date_end)."'";
-        }
-    }
+   		$sql .= " AND fk_statut >= 2";
+		if (!empty($date_start) && !empty($date_end)) {
+			$sql .= " AND pe.datep >= '".$db->idate($date_start)."' AND pe.datep <= '".$db->idate($date_end)."'";
+		}
+	}
 
-    $sql .= " GROUP BY p.societe, p.firstname, p.lastname, dm";
+	$sql .= " GROUP BY p.societe, p.firstname, p.lastname, dm";
 
-    dol_syslog("get donation payments");
-    $result = $db->query($sql);
-    if ($result)
-    {
-    	$num = $db->num_rows($result);
-    	$i = 0;
-    	if ($num)
-    	{
-    		while ($i < $num)
-    		{
-    			$obj = $db->fetch_object($result);
+	dol_syslog("get donation payments");
+	$result = $db->query($sql);
+	if ($result)
+	{
+		$num = $db->num_rows($result);
+		$i = 0;
+		if ($num)
+		{
+			while ($i < $num)
+			{
+				$obj = $db->fetch_object($result);
 
-    			if (!isset($encaiss[$obj->dm])) $encaiss[$obj->dm] = 0;
-    			$encaiss[$obj->dm] += $obj->amount;
+				if (!isset($encaiss[$obj->dm])) $encaiss[$obj->dm] = 0;
+				$encaiss[$obj->dm] += $obj->amount;
 
-    			if (!isset($encaiss_ttc[$obj->dm])) $encaiss_ttc[$obj->dm] = 0;
-    			$encaiss_ttc[$obj->dm] += $obj->amount;
+				if (!isset($encaiss_ttc[$obj->dm])) $encaiss_ttc[$obj->dm] = 0;
+				$encaiss_ttc[$obj->dm] += $obj->amount;
 
-    			$i++;
-    		}
-    	}
-    } else {
-    	dol_print_error($db);
-    }
+				$i++;
+			}
+		}
+	} else {
+		dol_print_error($db);
+	}
 } elseif ($modecompta == 'BOOKKEEPING') {
 	// Nothing from this table
 }
@@ -714,61 +714,61 @@ if (!empty($conf->don->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecom
 
 if (!empty($conf->global->ACCOUNTING_REPORTS_INCLUDE_VARPAY) && !empty($conf->banque->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecompta == "RECETTES-DEPENSES"))
 {
-    // decaiss
+	// decaiss
 
-    $sql = "SELECT date_format(p.datep, '%Y-%m') AS dm, SUM(p.amount) AS amount FROM ".MAIN_DB_PREFIX."payment_various as p";
-    $sql .= ' WHERE p.sens = 0';
-    if (!empty($date_start) && !empty($date_end))
-        $sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
-    $sql .= ' GROUP BY dm';
+	$sql = "SELECT date_format(p.datep, '%Y-%m') AS dm, SUM(p.amount) AS amount FROM ".MAIN_DB_PREFIX."payment_various as p";
+	$sql .= ' WHERE p.sens = 0';
+	if (!empty($date_start) && !empty($date_end))
+		$sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
+	$sql .= ' GROUP BY dm';
 
-    dol_syslog("get various payments");
-    $result = $db->query($sql);
-    if ($result)
-    {
-    	$num = $db->num_rows($result);
-    	$i = 0;
-    	if ($num)
-    	{
-    		while ($i < $num)
-    		{
-    			$obj = $db->fetch_object($result);
-    			if (!isset($decaiss_ttc[$obj->dm])) $decaiss_ttc[$obj->dm] = 0;
-                if (isset($obj->amount)) $decaiss_ttc[$obj->dm] += $obj->amount;
-    			$i++;
-    		}
-    	}
-    } else {
-    	dol_print_error($db);
-    }
+	dol_syslog("get various payments");
+	$result = $db->query($sql);
+	if ($result)
+	{
+		$num = $db->num_rows($result);
+		$i = 0;
+		if ($num)
+		{
+			while ($i < $num)
+			{
+				$obj = $db->fetch_object($result);
+				if (!isset($decaiss_ttc[$obj->dm])) $decaiss_ttc[$obj->dm] = 0;
+				if (isset($obj->amount)) $decaiss_ttc[$obj->dm] += $obj->amount;
+				$i++;
+			}
+		}
+	} else {
+		dol_print_error($db);
+	}
 
-    // encaiss
+	// encaiss
 
-    $sql = "SELECT date_format(p.datep, '%Y-%m') AS dm, SUM(p.amount) AS amount FROM ".MAIN_DB_PREFIX."payment_various AS p";
-    $sql .= ' WHERE p.sens = 1';
-    if (!empty($date_start) && !empty($date_end))
-        $sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
-    $sql .= ' GROUP BY dm';
+	$sql = "SELECT date_format(p.datep, '%Y-%m') AS dm, SUM(p.amount) AS amount FROM ".MAIN_DB_PREFIX."payment_various AS p";
+	$sql .= ' WHERE p.sens = 1';
+	if (!empty($date_start) && !empty($date_end))
+		$sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
+	$sql .= ' GROUP BY dm';
 
-    dol_syslog("get various payments");
-    $result = $db->query($sql);
-    if ($result)
-    {
-    	$num = $db->num_rows($result);
-    	$i = 0;
-    	if ($num)
-    	{
-    		while ($i < $num)
-    		{
-    			$obj = $db->fetch_object($result);
-    			if (!isset($encaiss_ttc[$obj->dm])) $encaiss_ttc[$obj->dm] = 0;
-                if (isset($obj->amount)) $encaiss_ttc[$obj->dm] += $obj->amount;
-    			$i++;
-    		}
-    	}
-    } else {
-    	dol_print_error($db);
-    }
+	dol_syslog("get various payments");
+	$result = $db->query($sql);
+	if ($result)
+	{
+		$num = $db->num_rows($result);
+		$i = 0;
+		if ($num)
+		{
+			while ($i < $num)
+			{
+				$obj = $db->fetch_object($result);
+				if (!isset($encaiss_ttc[$obj->dm])) $encaiss_ttc[$obj->dm] = 0;
+				if (isset($obj->amount)) $encaiss_ttc[$obj->dm] += $obj->amount;
+				$i++;
+			}
+		}
+	} else {
+		dol_print_error($db);
+	}
 }
 // Useless with BOOKKEEPING
 //elseif ($modecompta == 'BOOKKEEPING') {
@@ -780,31 +780,31 @@ if (!empty($conf->global->ACCOUNTING_REPORTS_INCLUDE_VARPAY) && !empty($conf->ba
 
 if (!empty($conf->global->ACCOUNTING_REPORTS_INCLUDE_LOAN) && !empty($conf->loan->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecompta == "RECETTES-DEPENSES"))
 {
-    $sql = "SELECT date_format(p.datep, '%Y-%m') AS dm, SUM(p.amount_capital + p.amount_insurance + p.amount_interest) AS amount FROM ".MAIN_DB_PREFIX."payment_loan AS p";
-    $sql .= ' WHERE 1 = 1';
-    if (!empty($date_start) && !empty($date_end))
-        $sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
-    $sql .= ' GROUP BY dm';
+	$sql = "SELECT date_format(p.datep, '%Y-%m') AS dm, SUM(p.amount_capital + p.amount_insurance + p.amount_interest) AS amount FROM ".MAIN_DB_PREFIX."payment_loan AS p";
+	$sql .= ' WHERE 1 = 1';
+	if (!empty($date_start) && !empty($date_end))
+		$sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
+	$sql .= ' GROUP BY dm';
 
-    dol_syslog("get loan payments");
-    $result = $db->query($sql);
-    if ($result)
-    {
-    	$num = $db->num_rows($result);
-    	$i = 0;
-    	if ($num)
-    	{
-    		while ($i < $num)
-    		{
-    			$obj = $db->fetch_object($result);
-    			if (!isset($decaiss_ttc[$obj->dm])) $decaiss_ttc[$obj->dm] = 0;
-                if (isset($obj->amount)) $decaiss_ttc[$obj->dm] += $obj->amount;
-    			$i++;
-    		}
-    	}
-    } else {
-    	dol_print_error($db);
-    }
+	dol_syslog("get loan payments");
+	$result = $db->query($sql);
+	if ($result)
+	{
+		$num = $db->num_rows($result);
+		$i = 0;
+		if ($num)
+		{
+			while ($i < $num)
+			{
+				$obj = $db->fetch_object($result);
+				if (!isset($decaiss_ttc[$obj->dm])) $decaiss_ttc[$obj->dm] = 0;
+				if (isset($obj->amount)) $decaiss_ttc[$obj->dm] += $obj->amount;
+				$i++;
+			}
+		}
+	} else {
+		dol_print_error($db);
+	}
 }
 // Useless with BOOKKEEPING
 //elseif ($modecompta == 'BOOKKEEPING') {
diff --git a/htdocs/compta/resultat/result.php b/htdocs/compta/resultat/result.php
index 48cb8b1154e..2a69f590449 100644
--- a/htdocs/compta/resultat/result.php
+++ b/htdocs/compta/resultat/result.php
@@ -213,7 +213,7 @@ report_header($name, '', $period, $periodlink, $description, $builddate, $export
 
 if (!empty($conf->accounting->enabled) && $modecompta != 'BOOKKEEPING')
 {
-    print info_admin($langs->trans("WarningReportNotReliable"), 0, 0, 1);
+	print info_admin($langs->trans("WarningReportNotReliable"), 0, 0, 1);
 }
 
 
@@ -286,9 +286,9 @@ if ($modecompta == 'CREANCES-DETTES')
 		setEventMessages(null, $AccCat->errors, 'errors');
 	} elseif (is_array($cats) && count($cats) > 0) {
 		foreach ($cats as $cat) {
-            // Loop on each group
+			// Loop on each group
 			if (!empty($cat['category_type'])) {
-                // category calculed
+				// category calculed
 				// When we enter here, $sommes was filled by group of accounts
 
 				$formula = $cat['formula'];
diff --git a/htdocs/compta/sociales/card.php b/htdocs/compta/sociales/card.php
index 98131687cb1..a4c27855a30 100644
--- a/htdocs/compta/sociales/card.php
+++ b/htdocs/compta/sociales/card.php
@@ -30,8 +30,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php'
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formsocialcontrib.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/tax.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-if (!empty($conf->projet->enabled))
-{
+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';
 }
@@ -124,8 +123,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes')
 {
 	$object->fetch($id);
 	$result = $object->delete($user);
-	if ($result > 0)
-	{
+	if ($result > 0) {
 		header("Location: list.php");
 		exit;
 	} else {
@@ -137,7 +135,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes')
 // Add social contribution
 if ($action == 'add' && $user->rights->tax->charges->creer)
 {
-	$amount = price2num(GETPOST('amount'));
+	$amount = price2num(GETPOST('amount'), 'MT');
 
 	if (!$dateech)
 	{
@@ -155,23 +153,21 @@ if ($action == 'add' && $user->rights->tax->charges->creer)
 	{
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Amount")), null, 'errors');
 		$action = 'create';
-	} elseif (!is_numeric($amount))
-	{
+	} elseif (!is_numeric($amount)) {
 		setEventMessages($langs->trans("ErrorFieldMustBeANumeric", $langs->transnoentities("Amount")), null, 'errors');
 		$action = 'create';
 	} else {
 		$object->type = $actioncode;
 		$object->label = GETPOST('label', 'alpha');
 		$object->date_ech = $dateech;
-		$object->periode			= $dateperiod;
-		$object->amount				= $amount;
-		$object->mode_reglement_id = GETPOST('mode_reglement_id');
-		$object->fk_account			= GETPOST('fk_account', 'int');
-		$object->fk_project			= GETPOST('fk_project');
+		$object->periode = $dateperiod;
+		$object->amount = $amount;
+		$object->mode_reglement_id = (int) GETPOST('mode_reglement_id', 'int');
+		$object->fk_account = (int) GETPOST('fk_account', 'int');
+		$object->fk_project = (int) GETPOST('fk_project', 'int');
 
 		$id = $object->create($user);
-		if ($id <= 0)
-		{
+		if ($id <= 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
 			$action = 'create';
 		}
@@ -181,7 +177,7 @@ if ($action == 'add' && $user->rights->tax->charges->creer)
 
 if ($action == 'update' && !$_POST["cancel"] && $user->rights->tax->charges->creer)
 {
-	$amount = price2num(GETPOST('amount'));
+	$amount = price2num(GETPOST('amount'), 'MT');
 
 	if (!$dateech)
 	{
@@ -203,12 +199,11 @@ if ($action == 'update' && !$_POST["cancel"] && $user->rights->tax->charges->cre
 		$result = $object->fetch($id);
 
 		$object->date_ech = $dateech;
-		$object->periode	= $dateperiod;
-		$object->amount		= price2num($amount);
+		$object->periode = $dateperiod;
+		$object->amount = $amount;
 
 		$result = $object->update($user);
-		if ($result <= 0)
-		{
+		if ($result <= 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
@@ -376,7 +371,7 @@ if ($action == 'create')
 
 	print '</table>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div class="center">';
 	print '<input type="submit" class="button" value="'.$langs->trans("Add").'">';
@@ -585,8 +580,8 @@ if ($id > 0)
 		$sql .= " c.code as type_code,c.libelle as paiement_type,";
 		$sql .= ' ba.rowid as baid, ba.ref as baref, ba.label, ba.number as banumber, ba.account_number, ba.currency_code as bacurrency_code, ba.fk_accountancy_journal';
 		$sql .= " FROM ".MAIN_DB_PREFIX."paiementcharge as p";
-    	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank as b ON p.fk_bank = b.rowid';
-    	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank_account as ba ON b.fk_account = ba.rowid';
+		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank as b ON p.fk_bank = b.rowid';
+		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank_account as ba ON b.fk_account = ba.rowid';
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as c ON p.fk_typepaiement = c.id";
 		$sql .= ", ".MAIN_DB_PREFIX."chargesociales as cs";
 		$sql .= " WHERE p.fk_charge = ".$id;
@@ -609,9 +604,9 @@ if ($id > 0)
 			print '<td>'.$langs->trans("RefPayment").'</td>';
 			print '<td>'.$langs->trans("Date").'</td>';
 			print '<td>'.$langs->trans("Type").'</td>';
-		    if (!empty($conf->banque->enabled)) {
-        		print '<td class="liste_titre right">'.$langs->trans('BankAccount').'</td>';
-    		}
+			if (!empty($conf->banque->enabled)) {
+				print '<td class="liste_titre right">'.$langs->trans('BankAccount').'</td>';
+			}
 			print '<td class="right">'.$langs->trans("Amount").'</td>';
 			print '</tr>';
 
@@ -681,7 +676,7 @@ if ($id > 0)
 
 		print '<div class="clearboth"></div>';
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 		if ($action == 'edit')
 		{
diff --git a/htdocs/compta/sociales/class/cchargesociales.class.php b/htdocs/compta/sociales/class/cchargesociales.class.php
index cc66b56aabd..ab61446c62e 100644
--- a/htdocs/compta/sociales/class/cchargesociales.class.php
+++ b/htdocs/compta/sociales/class/cchargesociales.class.php
@@ -50,8 +50,8 @@ class Cchargesociales
 	public $code;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_pays;
 
 	public $module;
@@ -82,18 +82,18 @@ class Cchargesociales
 
 		$error = 0;
 
-        // Clean parameters
-        $this->trimParameters(
-            array(
-                'libelle',
-                'deductible',
-                'active',
-                'code',
-                'fk_pays',
-                'module',
-                'accountancy_code',
-            )
-        );
+		// Clean parameters
+		$this->trimParameters(
+			array(
+				'libelle',
+				'deductible',
+				'active',
+				'code',
+				'fk_pays',
+				'module',
+				'accountancy_code',
+			)
+		);
 
 		// Check parameters
 		// Put here code to add control on parameters values
@@ -233,17 +233,17 @@ class Cchargesociales
 
 		// Clean parameters
 
-        $this->trimParameters(
-            array(
-                'libelle',
-                'deductible',
-                'active',
-                'code',
-                'fk_pays',
-                'module',
-                'accountancy_code',
-            )
-        );
+		$this->trimParameters(
+			array(
+				'libelle',
+				'deductible',
+				'active',
+				'code',
+				'fk_pays',
+				'module',
+				'accountancy_code',
+			)
+		);
 
 
 		// Check parameters
@@ -398,34 +398,34 @@ class Cchargesociales
 	 *
 	 *	@param	int		$withpicto			Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
 	 *	@param	string	$option				On what the link point to
-     *  @param	integer	$notooltip			1=Disable tooltip
-     *  @param	int		$maxlen				Max length of visible user name
-     *  @param  string  $morecss            Add more css on link
+	 *  @param	integer	$notooltip			1=Disable tooltip
+	 *  @param	int		$maxlen				Max length of visible user name
+	 *  @param  string  $morecss            Add more css on link
 	 *	@return	string						String with URL
 	 */
 	public function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $maxlen = 24, $morecss = '')
 	{
 		global $langs, $conf, $db;
-        global $dolibarr_main_authentication, $dolibarr_main_demo;
-        global $menumanager;
+		global $dolibarr_main_authentication, $dolibarr_main_demo;
+		global $menumanager;
 
 
-        $result = '';
-        $companylink = '';
+		$result = '';
+		$companylink = '';
 
-        $label = '<u>'.$langs->trans("MyModule").'</u>';
-        $label .= '<div width="100%">';
-        $label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref;
+		$label = '<u>'.$langs->trans("MyModule").'</u>';
+		$label .= '<div width="100%">';
+		$label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref;
 
-        $link = '<a href="'.DOL_URL_ROOT.'/tax/card.php?id='.$this->id.'"';
-        $link .= ($notooltip ? '' : ' title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip'.($morecss ? ' '.$morecss : '').'"');
-        $link .= '>';
+		$link = '<a href="'.DOL_URL_ROOT.'/tax/card.php?id='.$this->id.'"';
+		$link .= ($notooltip ? '' : ' title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip'.($morecss ? ' '.$morecss : '').'"');
+		$link .= '>';
 		$linkend = '</a>';
 
-        if ($withpicto)
-        {
-            $result .= ($link.img_object(($notooltip ? '' : $label), 'label', ($notooltip ? '' : 'class="classfortooltip"'), 0, 0, $notooltip ? 0 : 1).$linkend);
-            if ($withpicto != 2) $result .= ' ';
+		if ($withpicto)
+		{
+			$result .= ($link.img_object(($notooltip ? '' : $label), 'label', ($notooltip ? '' : 'class="classfortooltip"'), 0, 0, $notooltip ? 0 : 1).$linkend);
+			if ($withpicto != 2) $result .= ' ';
 		}
 		$result .= $link.$this->ref.$linkend;
 		return $result;
@@ -442,7 +442,7 @@ class Cchargesociales
 		return $this->LibStatut($this->status, $mode);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Renvoi le libelle d'un status donne
 	 *
@@ -452,7 +452,7 @@ class Cchargesociales
 	 */
 	public function LibStatut($status, $mode = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 
 		if ($mode == 0)
@@ -502,19 +502,19 @@ class Cchargesociales
 		$this->accountancy_code = '';
 	}
 
-    /**
-     * Trim object parameters
-     * @param string[] $parameters array of parameters to trim
-     *
-     * @return void
-     */
-    private function trimParameters($parameters)
-    {
-        if (!is_array($parameters)) return;
-        foreach ($parameters as $parameter) {
-            if (isset($this->$parameter)) {
-                $this->$parameter = trim($this->$parameter);
-            }
-        }
-    }
+	/**
+	 * Trim object parameters
+	 * @param string[] $parameters array of parameters to trim
+	 *
+	 * @return void
+	 */
+	private function trimParameters($parameters)
+	{
+		if (!is_array($parameters)) return;
+		foreach ($parameters as $parameter) {
+			if (isset($this->$parameter)) {
+				$this->$parameter = trim($this->$parameter);
+			}
+		}
+	}
 }
diff --git a/htdocs/compta/sociales/class/chargesociales.class.php b/htdocs/compta/sociales/class/chargesociales.class.php
index 11b225d0896..6e018e0bb84 100644
--- a/htdocs/compta/sociales/class/chargesociales.class.php
+++ b/htdocs/compta/sociales/class/chargesociales.class.php
@@ -32,79 +32,79 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
  */
 class ChargeSociales extends CommonObject
 {
-    /**
+	/**
 	 * @var string ID to identify managed object
 	 */
 	public $element = 'chargesociales';
 
-    public $table = 'chargesociales';
+	public $table = 'chargesociales';
 
-    /**
+	/**
 	 * @var string Name of table without prefix where object is stored
 	 */
 	public $table_element = 'chargesociales';
 
-    /**
-     * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
-     */
-    public $picto = 'bill';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected $table_ref_field = 'ref';
-
-    /**
-     * @var integer|string $date_ech
-     */
-    public $date_ech;
-
-
-    public $label;
-    public $type;
-    public $type_label;
-    public $amount;
-    public $paye;
-    public $periode;
-
-    /**
-     * @var integer|string date_creation
-     */
-    public $date_creation;
-
-    /**
-     * @var integer|string $date_modification
-     */
-    public $date_modification;
-
-    /**
-     * @var integer|string $date_validation
-     */
-    public $date_validation;
-
-    /**
-     * @deprecated Use label instead
-     */
-    public $lib;
-
-    /**
-     * @var int account ID
-     */
-    public $fk_account;
+	/**
+	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+	 */
+	public $picto = 'bill';
 
 	/**
-     * @var int account ID (identical to fk_account)
-     */
-    public $accountid;
+	 * {@inheritdoc}
+	 */
+	protected $table_ref_field = 'ref';
 
-    /**
-     * @var int payment type (identical to mode_reglement_id in commonobject class)
-     */
-    public $paiementtype;
+	/**
+	 * @var integer|string $date_ech
+	 */
+	public $date_ech;
 
-    /**
-     * @var int ID
-     */
+
+	public $label;
+	public $type;
+	public $type_label;
+	public $amount;
+	public $paye;
+	public $periode;
+
+	/**
+	 * @var integer|string date_creation
+	 */
+	public $date_creation;
+
+	/**
+	 * @var integer|string $date_modification
+	 */
+	public $date_modification;
+
+	/**
+	 * @var integer|string $date_validation
+	 */
+	public $date_validation;
+
+	/**
+	 * @deprecated Use label instead
+	 */
+	public $lib;
+
+	/**
+	 * @var int account ID
+	 */
+	public $fk_account;
+
+	/**
+	 * @var int account ID (identical to fk_account)
+	 */
+	public $accountid;
+
+	/**
+	 * @var int payment type (identical to mode_reglement_id in commonobject class)
+	 */
+	public $paiementtype;
+
+	/**
+	 * @var int ID
+	 */
 	public $fk_project;
 
 
@@ -112,73 +112,73 @@ class ChargeSociales extends CommonObject
 	const STATUS_PAID = 1;
 
 
-    /**
-     * Constructor
-     *
-     * @param	DoliDB		$db		Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-    }
+	/**
+	 * Constructor
+	 *
+	 * @param	DoliDB		$db		Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
 
-    /**
-     *  Retrouve et charge une charge sociale
-     *
-     *  @param	int     $id		Id
-     *  @param	string  $ref	Ref
-     *  @return	int <0 KO >0 OK
-     */
-    public function fetch($id, $ref = '')
-    {
-        $sql = "SELECT cs.rowid, cs.date_ech";
-        $sql .= ", cs.libelle as label, cs.fk_type, cs.amount, cs.fk_projet as fk_project, cs.paye, cs.periode, cs.import_key";
-        $sql .= ", cs.fk_account, cs.fk_mode_reglement";
-        $sql .= ", c.libelle";
-        $sql .= ', p.code as mode_reglement_code, p.libelle as mode_reglement_libelle';
-        $sql .= " FROM ".MAIN_DB_PREFIX."chargesociales as cs";
-        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_chargesociales as c ON cs.fk_type = c.id";
-        $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as p ON cs.fk_mode_reglement = p.id';
-        $sql .= ' WHERE cs.entity IN ('.getEntity('tax').')';
-        if ($ref) $sql .= " AND cs.rowid = ".$ref;
-        else $sql .= " AND cs.rowid = ".$id;
+	/**
+	 *  Retrouve et charge une charge sociale
+	 *
+	 *  @param	int     $id		Id
+	 *  @param	string  $ref	Ref
+	 *  @return	int <0 KO >0 OK
+	 */
+	public function fetch($id, $ref = '')
+	{
+		$sql = "SELECT cs.rowid, cs.date_ech";
+		$sql .= ", cs.libelle as label, cs.fk_type, cs.amount, cs.fk_projet as fk_project, cs.paye, cs.periode, cs.import_key";
+		$sql .= ", cs.fk_account, cs.fk_mode_reglement";
+		$sql .= ", c.libelle";
+		$sql .= ', p.code as mode_reglement_code, p.libelle as mode_reglement_libelle';
+		$sql .= " FROM ".MAIN_DB_PREFIX."chargesociales as cs";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_chargesociales as c ON cs.fk_type = c.id";
+		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as p ON cs.fk_mode_reglement = p.id';
+		$sql .= ' WHERE cs.entity IN ('.getEntity('tax').')';
+		if ($ref) $sql .= " AND cs.rowid = ".$ref;
+		else $sql .= " AND cs.rowid = ".$id;
 
-        dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            if ($this->db->num_rows($resql))
-            {
-                $obj = $this->db->fetch_object($resql);
+		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			if ($this->db->num_rows($resql))
+			{
+				$obj = $this->db->fetch_object($resql);
 
-                $this->id = $obj->rowid;
-                $this->ref					= $obj->rowid;
-                $this->date_ech = $this->db->jdate($obj->date_ech);
-                $this->lib					= $obj->label;
-                $this->label				= $obj->label;
-                $this->type					= $obj->fk_type;
-                $this->type_label			= $obj->libelle;
-                $this->fk_account			= $obj->fk_account;
-                $this->mode_reglement_id = $obj->fk_mode_reglement;
-                $this->mode_reglement_code = $obj->mode_reglement_code;
-                $this->mode_reglement = $obj->mode_reglement_libelle;
-                $this->amount = $obj->amount;
+				$this->id = $obj->rowid;
+				$this->ref					= $obj->rowid;
+				$this->date_ech = $this->db->jdate($obj->date_ech);
+				$this->lib					= $obj->label;
+				$this->label				= $obj->label;
+				$this->type					= $obj->fk_type;
+				$this->type_label			= $obj->libelle;
+				$this->fk_account			= $obj->fk_account;
+				$this->mode_reglement_id = $obj->fk_mode_reglement;
+				$this->mode_reglement_code = $obj->mode_reglement_code;
+				$this->mode_reglement = $obj->mode_reglement_libelle;
+				$this->amount = $obj->amount;
 				$this->fk_project = $obj->fk_project;
-                $this->paye = $obj->paye;
-                $this->periode = $this->db->jdate($obj->periode);
-                $this->import_key = $this->import_key;
+				$this->paye = $obj->paye;
+				$this->periode = $this->db->jdate($obj->periode);
+				$this->import_key = $this->import_key;
 
-                $this->db->free($resql);
+				$this->db->free($resql);
 
-                return 1;
-            } else {
-                return 0;
-            }
-        } else {
-            $this->error = $this->db->lasterror();
-            return -1;
-        }
-    }
+				return 1;
+			} else {
+				return 0;
+			}
+		} else {
+			$this->error = $this->db->lasterror();
+			return -1;
+		}
+	}
 
 	/**
 	 * Check if a social contribution can be created into database
@@ -189,59 +189,59 @@ class ChargeSociales extends CommonObject
 	{
 		$newamount = price2num($this->amount, 'MT');
 
-        // Validation parametres
-        if (!$newamount > 0 || empty($this->date_ech) || empty($this->periode))
-        {
-            return false;
-        }
+		// Validation parametres
+		if (!$newamount > 0 || empty($this->date_ech) || empty($this->periode))
+		{
+			return false;
+		}
 
 
 		return true;
 	}
 
-    /**
-     *      Create a social contribution into database
-     *
-     *      @param	User	$user   User making creation
-     *      @return int     		<0 if KO, id if OK
-     */
-    public function create($user)
-    {
-    	global $conf;
+	/**
+	 *      Create a social contribution into database
+	 *
+	 *      @param	User	$user   User making creation
+	 *      @return int     		<0 if KO, id if OK
+	 */
+	public function create($user)
+	{
+		global $conf;
 		$error = 0;
 
-        $now = dol_now();
+		$now = dol_now();
 
-        // Nettoyage parametres
-        $newamount = price2num($this->amount, 'MT');
+		// Nettoyage parametres
+		$newamount = price2num($this->amount, 'MT');
 
 		if (!$this->check()) {
 			 $this->error = "ErrorBadParameter";
 			 return -2;
 		}
 
-        $this->db->begin();
+		$this->db->begin();
 
-        $sql = "INSERT INTO ".MAIN_DB_PREFIX."chargesociales (fk_type, fk_account, fk_mode_reglement, libelle, date_ech, periode, amount, fk_projet, entity, fk_user_author, date_creation)";
-        $sql .= " VALUES (".$this->type;
-        $sql .= ", ".($this->fk_account > 0 ? $this->fk_account : 'NULL');
-        $sql .= ", ".($this->mode_reglement_id > 0 ? $this->mode_reglement_id : "NULL");
-        $sql .= ", '".$this->db->escape($this->label ? $this->label : $this->lib)."'";
-        $sql .= ", '".$this->db->idate($this->date_ech)."'";
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."chargesociales (fk_type, fk_account, fk_mode_reglement, libelle, date_ech, periode, amount, fk_projet, entity, fk_user_author, date_creation)";
+		$sql .= " VALUES (".$this->type;
+		$sql .= ", ".($this->fk_account > 0 ? $this->fk_account : 'NULL');
+		$sql .= ", ".($this->mode_reglement_id > 0 ? $this->mode_reglement_id : "NULL");
+		$sql .= ", '".$this->db->escape($this->label ? $this->label : $this->lib)."'";
+		$sql .= ", '".$this->db->idate($this->date_ech)."'";
 		$sql .= ", '".$this->db->idate($this->periode)."'";
-        $sql .= ", '".price2num($newamount)."'";
+		$sql .= ", '".price2num($newamount)."'";
 		$sql .= ", ".($this->fk_project > 0 ? $this->fk_project : 'NULL');
-        $sql .= ", ".$conf->entity;
-        $sql .= ", ".$user->id;
-        $sql .= ", '".$this->db->idate($now)."'";
-        $sql .= ")";
+		$sql .= ", ".$conf->entity;
+		$sql .= ", ".$user->id;
+		$sql .= ", '".$this->db->idate($now)."'";
+		$sql .= ")";
 
-        dol_syslog(get_class($this)."::create", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if ($resql) {
-            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."chargesociales");
+		dol_syslog(get_class($this)."::create", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."chargesociales");
 
-            //dol_syslog("ChargesSociales::create this->id=".$this->id);
+			//dol_syslog("ChargesSociales::create this->id=".$this->id);
 			$result = $this->call_trigger('SOCIALCONTRIBUTION_CREATE', $user);
 			if ($result < 0) $error++;
 
@@ -252,429 +252,429 @@ class ChargeSociales extends CommonObject
 				$this->db->rollback();
 				return -1 * $error;
 			}
-        } else {
-            $this->error = $this->db->error();
-            $this->db->rollback();
-            return -1;
-        }
-    }
+		} else {
+			$this->error = $this->db->error();
+			$this->db->rollback();
+			return -1;
+		}
+	}
 
 
-    /**
-     *      Delete a social contribution
-     *
-     *      @param		User    $user   Object user making delete
-     *      @return     		int 	<0 if KO, >0 if OK
-     */
-    public function delete($user)
-    {
-        $error = 0;
+	/**
+	 *      Delete a social contribution
+	 *
+	 *      @param		User    $user   Object user making delete
+	 *      @return     		int 	<0 if KO, >0 if OK
+	 */
+	public function delete($user)
+	{
+		$error = 0;
 
-        $this->db->begin();
+		$this->db->begin();
 
-        // Get bank transaction lines for this social contributions
-        include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
-        $account = new Account($this->db);
-        $lines_url = $account->get_url('', $this->id, 'sc');
+		// Get bank transaction lines for this social contributions
+		include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+		$account = new Account($this->db);
+		$lines_url = $account->get_url('', $this->id, 'sc');
 
-        // Delete bank urls
-        foreach ($lines_url as $line_url)
-        {
-            if (!$error)
-            {
-                $accountline = new AccountLine($this->db);
-                $accountline->fetch($line_url['fk_bank']);
-                $result = $accountline->delete_urls($user);
-                if ($result < 0)
-                {
-                    $error++;
-                }
-            }
-        }
+		// Delete bank urls
+		foreach ($lines_url as $line_url)
+		{
+			if (!$error)
+			{
+				$accountline = new AccountLine($this->db);
+				$accountline->fetch($line_url['fk_bank']);
+				$result = $accountline->delete_urls($user);
+				if ($result < 0)
+				{
+					$error++;
+				}
+			}
+		}
 
-        // Delete payments
-        if (!$error)
-        {
-            $sql = "DELETE FROM ".MAIN_DB_PREFIX."paiementcharge WHERE fk_charge=".$this->id;
-            dol_syslog(get_class($this)."::delete", LOG_DEBUG);
-            $resql = $this->db->query($sql);
-            if (!$resql)
-            {
-                $error++;
-                $this->error = $this->db->lasterror();
-            }
-        }
+		// Delete payments
+		if (!$error)
+		{
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX."paiementcharge WHERE fk_charge=".$this->id;
+			dol_syslog(get_class($this)."::delete", LOG_DEBUG);
+			$resql = $this->db->query($sql);
+			if (!$resql)
+			{
+				$error++;
+				$this->error = $this->db->lasterror();
+			}
+		}
 
-        if (!$error)
-        {
-            $sql = "DELETE FROM ".MAIN_DB_PREFIX."chargesociales WHERE rowid=".$this->id;
-            dol_syslog(get_class($this)."::delete", LOG_DEBUG);
-            $resql = $this->db->query($sql);
-            if (!$resql)
-            {
-                $error++;
-                $this->error = $this->db->lasterror();
-            }
-        }
+		if (!$error)
+		{
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX."chargesociales WHERE rowid=".$this->id;
+			dol_syslog(get_class($this)."::delete", LOG_DEBUG);
+			$resql = $this->db->query($sql);
+			if (!$resql)
+			{
+				$error++;
+				$this->error = $this->db->lasterror();
+			}
+		}
 
-        if (!$error)
-        {
-            $this->db->commit();
-            return 1;
-        } else {
-            $this->db->rollback();
-            return -1;
-        }
-    }
+		if (!$error)
+		{
+			$this->db->commit();
+			return 1;
+		} else {
+			$this->db->rollback();
+			return -1;
+		}
+	}
 
 
-    /**
-     *      Update social or fiscal contribution
-     *
-     *      @param	User	$user           User that modify
-     *      @param  int		$notrigger	    0=launch triggers after, 1=disable triggers
-     *      @return int     		        <0 if KO, >0 if OK
-     */
-    public function update($user, $notrigger = 0)
-    {
-        $error = 0;
-        $this->db->begin();
+	/**
+	 *      Update social or fiscal contribution
+	 *
+	 *      @param	User	$user           User that modify
+	 *      @param  int		$notrigger	    0=launch triggers after, 1=disable triggers
+	 *      @return int     		        <0 if KO, >0 if OK
+	 */
+	public function update($user, $notrigger = 0)
+	{
+		$error = 0;
+		$this->db->begin();
 
-        $sql = "UPDATE ".MAIN_DB_PREFIX."chargesociales";
-        $sql .= " SET libelle='".$this->db->escape($this->label ? $this->label : $this->lib)."'";
-        $sql .= ", date_ech='".$this->db->idate($this->date_ech)."'";
-        $sql .= ", periode='".$this->db->idate($this->periode)."'";
-        $sql .= ", amount='".price2num($this->amount, 'MT')."'";
-        $sql .= ", fk_projet=".($this->fk_project > 0 ? $this->db->escape($this->fk_project) : "NULL");
-        $sql .= ", fk_user_modif=".$user->id;
-        $sql .= " WHERE rowid=".$this->id;
+		$sql = "UPDATE ".MAIN_DB_PREFIX."chargesociales";
+		$sql .= " SET libelle='".$this->db->escape($this->label ? $this->label : $this->lib)."'";
+		$sql .= ", date_ech='".$this->db->idate($this->date_ech)."'";
+		$sql .= ", periode='".$this->db->idate($this->periode)."'";
+		$sql .= ", amount='".price2num($this->amount, 'MT')."'";
+		$sql .= ", fk_projet=".($this->fk_project > 0 ? $this->db->escape($this->fk_project) : "NULL");
+		$sql .= ", fk_user_modif=".$user->id;
+		$sql .= " WHERE rowid=".$this->id;
 
-        dol_syslog(get_class($this)."::update", LOG_DEBUG);
-        $resql = $this->db->query($sql);
+		dol_syslog(get_class($this)."::update", LOG_DEBUG);
+		$resql = $this->db->query($sql);
 
-        if (!$resql) {
-            $error++; $this->errors[] = "Error ".$this->db->lasterror();
-        }
+		if (!$resql) {
+			$error++; $this->errors[] = "Error ".$this->db->lasterror();
+		}
 
-        if (!$error)
-        {
-            if (!$notrigger)
-            {
-                // Call trigger
-                $result = $this->call_trigger('SOCIALCHARGES_MODIFY', $user);
-                if ($result < 0) $error++;
-                // End call triggers
-            }
-        }
+		if (!$error)
+		{
+			if (!$notrigger)
+			{
+				// Call trigger
+				$result = $this->call_trigger('SOCIALCHARGES_MODIFY', $user);
+				if ($result < 0) $error++;
+				// End call triggers
+			}
+		}
 
-        // Commit or rollback
-        if ($error)
-        {
-            foreach ($this->errors as $errmsg)
-            {
-                dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
-                $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
-            }
-            $this->db->rollback();
-            return -1 * $error;
-        } else {
-            $this->db->commit();
-            return 1;
-        }
-    }
+		// Commit or rollback
+		if ($error)
+		{
+			foreach ($this->errors as $errmsg)
+			{
+				dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
+			}
+			$this->db->rollback();
+			return -1 * $error;
+		} else {
+			$this->db->commit();
+			return 1;
+		}
+	}
 
-    /**
-     * Calculate amount remaining to pay by year
-     *
-     * @param   int     $year       Year
-     * @return  number
-     */
-    public function solde($year = 0)
-    {
-    	global $conf;
+	/**
+	 * Calculate amount remaining to pay by year
+	 *
+	 * @param   int     $year       Year
+	 * @return  number
+	 */
+	public function solde($year = 0)
+	{
+		global $conf;
 
-        $sql = "SELECT SUM(f.amount) as amount";
-        $sql .= " FROM ".MAIN_DB_PREFIX."chargesociales as f";
-        $sql .= " WHERE f.entity = ".$conf->entity;
-        $sql .= " AND paye = 0";
+		$sql = "SELECT SUM(f.amount) as amount";
+		$sql .= " FROM ".MAIN_DB_PREFIX."chargesociales as f";
+		$sql .= " WHERE f.entity = ".$conf->entity;
+		$sql .= " AND paye = 0";
 
-        if ($year) {
-            $sql .= " AND f.datev >= '".((int) $year)."-01-01' AND f.datev <= '".((int) $year)."-12-31' ";
-        }
+		if ($year) {
+			$sql .= " AND f.datev >= '".((int) $year)."-01-01' AND f.datev <= '".((int) $year)."-12-31' ";
+		}
 
-        $result = $this->db->query($sql);
-        if ($result)
-        {
-            if ($this->db->num_rows($result))
-            {
-                $obj = $this->db->fetch_object($result);
-                $this->db->free($result);
-                return $obj->amount;
-            } else {
-                return 0;
-            }
-        } else {
-            print $this->db->error();
-            return -1;
-        }
-    }
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+			if ($this->db->num_rows($result))
+			{
+				$obj = $this->db->fetch_object($result);
+				$this->db->free($result);
+				return $obj->amount;
+			} else {
+				return 0;
+			}
+		} else {
+			print $this->db->error();
+			return -1;
+		}
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *    Tag social contribution as payed completely
-     *
-     *    @param    User    $user       Object user making change
-     *    @return   int					<0 if KO, >0 if OK
-     */
-    public function set_paid($user)
-    {
-        // phpcs:enable
-        $sql = "UPDATE ".MAIN_DB_PREFIX."chargesociales SET";
-        $sql .= " paye = 1";
-        $sql .= " WHERE rowid = ".$this->id;
-        $return = $this->db->query($sql);
-        if ($return) return 1;
-        else return -1;
-    }
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *    Tag social contribution as payed completely
+	 *
+	 *    @param    User    $user       Object user making change
+	 *    @return   int					<0 if KO, >0 if OK
+	 */
+	public function set_paid($user)
+	{
+		// phpcs:enable
+		$sql = "UPDATE ".MAIN_DB_PREFIX."chargesociales SET";
+		$sql .= " paye = 1";
+		$sql .= " WHERE rowid = ".$this->id;
+		$return = $this->db->query($sql);
+		if ($return) return 1;
+		else return -1;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *    Remove tag payed on social contribution
-     *
-     *    @param	User	$user       Object user making change
-     *    @return	int					<0 if KO, >0 if OK
-     */
-    public function set_unpaid($user)
-    {
-        // phpcs:enable
-        $sql = "UPDATE ".MAIN_DB_PREFIX."chargesociales SET";
-        $sql .= " paye = 0";
-        $sql .= " WHERE rowid = ".$this->id;
-        $return = $this->db->query($sql);
-        if ($return) return 1;
-        else return -1;
-    }
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *    Remove tag payed on social contribution
+	 *
+	 *    @param	User	$user       Object user making change
+	 *    @return	int					<0 if KO, >0 if OK
+	 */
+	public function set_unpaid($user)
+	{
+		// phpcs:enable
+		$sql = "UPDATE ".MAIN_DB_PREFIX."chargesociales SET";
+		$sql .= " paye = 0";
+		$sql .= " WHERE rowid = ".$this->id;
+		$return = $this->db->query($sql);
+		if ($return) return 1;
+		else return -1;
+	}
 
-    /**
-     *  Retourne le libelle du statut d'une charge (impaye, payee)
-     *
-     *  @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
+	/**
+	 *  Retourne le libelle du statut d'une charge (impaye, payee)
+	 *
+	 *  @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  double	$alreadypaid	0=No payment already done, >0=Some payments were already done (we recommand to put here amount payed if you have it, 1 otherwise)
-     *  @return	string        			Label
-     */
-    public function getLibStatut($mode = 0, $alreadypaid = -1)
-    {
-        return $this->LibStatut($this->paye, $mode, $alreadypaid);
-    }
+	 *  @return	string        			Label
+	 */
+	public function getLibStatut($mode = 0, $alreadypaid = -1)
+	{
+		return $this->LibStatut($this->paye, $mode, $alreadypaid);
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Renvoi le libelle d'un statut donne
-     *
-     *  @param	int		$status        	Id status
-     *  @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
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Renvoi le libelle d'un statut donne
+	 *
+	 *  @param	int		$status        	Id status
+	 *  @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  double	$alreadypaid	0=No payment already done, >0=Some payments were already done (we recommand to put here amount payed if you have it, 1 otherwise)
-     *  @return string        			Label
-     */
-    public function LibStatut($status, $mode = 0, $alreadypaid = -1)
-    {
-        // phpcs:enable
-        global $langs;
+	 *  @return string        			Label
+	 */
+	public function LibStatut($status, $mode = 0, $alreadypaid = -1)
+	{
+		// phpcs:enable
+		global $langs;
 
-        // Load translation files required by the page
-        $langs->loadLangs(array("customers", "bills"));
+		// Load translation files required by the page
+		$langs->loadLangs(array("customers", "bills"));
 
-        // We reinit status array to force to redefine them because label may change according to properties values.
-        $this->labelStatus = array();
-        $this->labelStatusShort = array();
+		// We reinit status array to force to redefine them because label may change according to properties values.
+		$this->labelStatus = array();
+		$this->labelStatusShort = array();
 
-        if (empty($this->labelStatus) || empty($this->labelStatusShort))
-        {
-        	global $langs;
-        	//$langs->load("mymodule");
-        	$this->labelStatus[self::STATUS_UNPAID] = $langs->trans('Unpaid');
-        	$this->labelStatus[self::STATUS_PAID] = $langs->trans('Paid');
-        	if ($status == self::STATUS_UNPAID && $alreadypaid > 0) $this->labelStatus[self::STATUS_UNPAID] = $langs->trans("BillStatusStarted");
-        	$this->labelStatusShort[self::STATUS_UNPAID] = $langs->trans('Unpaid');
-        	$this->labelStatusShort[self::STATUS_PAID] = $langs->trans('Paid');
-        	if ($status == self::STATUS_UNPAID && $alreadypaid > 0) $this->labelStatusShort[self::STATUS_UNPAID] = $langs->trans("BillStatusStarted");
-        }
+		if (empty($this->labelStatus) || empty($this->labelStatusShort))
+		{
+			global $langs;
+			//$langs->load("mymodule");
+			$this->labelStatus[self::STATUS_UNPAID] = $langs->trans('Unpaid');
+			$this->labelStatus[self::STATUS_PAID] = $langs->trans('Paid');
+			if ($status == self::STATUS_UNPAID && $alreadypaid > 0) $this->labelStatus[self::STATUS_UNPAID] = $langs->trans("BillStatusStarted");
+			$this->labelStatusShort[self::STATUS_UNPAID] = $langs->trans('Unpaid');
+			$this->labelStatusShort[self::STATUS_PAID] = $langs->trans('Paid');
+			if ($status == self::STATUS_UNPAID && $alreadypaid > 0) $this->labelStatusShort[self::STATUS_UNPAID] = $langs->trans("BillStatusStarted");
+		}
 
-        $statusType = 'status1';
-        if ($status == 0 && $alreadypaid > 0) $statusType = 'status3';
-        if ($status == 1) $statusType = 'status6';
+		$statusType = 'status1';
+		if ($status == 0 && $alreadypaid > 0) $statusType = 'status3';
+		if ($status == 1) $statusType = 'status6';
 
-        return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode);
-    }
+		return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode);
+	}
 
 
-    /**
+	/**
 	 *  Return a link to the object card (with optionaly the picto)
 	 *
 	 *	@param	int		$withpicto					Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
-     * 	@param	int		$maxlen						Max length of label
-     *  @param	int  	$notooltip					1=Disable tooltip
+	 * 	@param	int		$maxlen						Max length of label
+	 *  @param	int  	$notooltip					1=Disable tooltip
 	 *  @param  int		$short           			1=Return just URL
-     *  @param  int     $save_lastsearch_value		-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
-     *	@return	string								String with link
-     */
-    public function getNomUrl($withpicto = 0, $maxlen = 0, $notooltip = 0, $short = 0, $save_lastsearch_value = -1)
-    {
-    	global $langs, $conf, $user, $form;
+	 *  @param  int     $save_lastsearch_value		-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+	 *	@return	string								String with link
+	 */
+	public function getNomUrl($withpicto = 0, $maxlen = 0, $notooltip = 0, $short = 0, $save_lastsearch_value = -1)
+	{
+		global $langs, $conf, $user, $form;
 
-        if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
+		if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
 
-        $result = '';
+		$result = '';
 
-        $url = DOL_URL_ROOT.'/compta/sociales/card.php?id='.$this->id;
+		$url = DOL_URL_ROOT.'/compta/sociales/card.php?id='.$this->id;
 
-        if ($short) return $url;
+		if ($short) return $url;
 
-        if ($option !== 'nolink')
-        {
-        	// Add param to save lastsearch_values or not
-        	$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
-        	if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
-        	if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
-        }
+		if ($option !== 'nolink')
+		{
+			// Add param to save lastsearch_values or not
+			$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
+			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
+			if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
+		}
 
 
-        if (empty($this->ref)) $this->ref = $this->label;
+		if (empty($this->ref)) $this->ref = $this->label;
 
-        $label = '<u>'.$langs->trans("SocialContribution").'</u>';
-        if (!empty($this->ref))
-        	$label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
-        if (!empty($this->label))
-        	$label .= '<br><b>'.$langs->trans('Label').':</b> '.$this->label;
-        if (!empty($this->type_label))
-        	$label .= '<br><b>'.$langs->trans('Type').':</b> '.$this->type_label;
+		$label = '<u>'.$langs->trans("SocialContribution").'</u>';
+		if (!empty($this->ref))
+			$label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
+		if (!empty($this->label))
+			$label .= '<br><b>'.$langs->trans('Label').':</b> '.$this->label;
+		if (!empty($this->type_label))
+			$label .= '<br><b>'.$langs->trans('Type').':</b> '.$this->type_label;
 
-        $linkclose = '';
-        if (empty($notooltip) && $user->rights->facture->lire)
-        {
-        	if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-        	{
-        		$label = $langs->trans("SocialContribution");
-        		$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
-        	}
-        	$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
-        	$linkclose .= ' class="classfortooltip"';
-        }
+		$linkclose = '';
+		if (empty($notooltip) && $user->rights->facture->lire)
+		{
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+			{
+				$label = $langs->trans("SocialContribution");
+				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
+			}
+			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
+			$linkclose .= ' class="classfortooltip"';
+		}
 
-        $linkstart = '<a href="'.$url.'"';
-        $linkstart .= $linkclose.'>';
-        $linkend = '</a>';
+		$linkstart = '<a href="'.$url.'"';
+		$linkstart .= $linkclose.'>';
+		$linkend = '</a>';
 
-        $result .= $linkstart;
-        if ($withpicto) $result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
-        if ($withpicto != 2) $result .= ($maxlen ?dol_trunc($this->ref, $maxlen) : $this->ref);
-        $result .= $linkend;
+		$result .= $linkstart;
+		if ($withpicto) $result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+		if ($withpicto != 2) $result .= ($maxlen ?dol_trunc($this->ref, $maxlen) : $this->ref);
+		$result .= $linkend;
 
-        return $result;
-    }
+		return $result;
+	}
 
-    /**
-     * 	Return amount of payments already done
-     *
-     *	@return		int		Amount of payment already done, <0 if KO
-     */
-    public function getSommePaiement()
-    {
-        $table = 'paiementcharge';
-        $field = 'fk_charge';
+	/**
+	 * 	Return amount of payments already done
+	 *
+	 *	@return		int		Amount of payment already done, <0 if KO
+	 */
+	public function getSommePaiement()
+	{
+		$table = 'paiementcharge';
+		$field = 'fk_charge';
 
-        $sql = 'SELECT sum(amount) as amount';
-        $sql .= ' FROM '.MAIN_DB_PREFIX.$table;
-        $sql .= ' WHERE '.$field.' = '.$this->id;
+		$sql = 'SELECT sum(amount) as amount';
+		$sql .= ' FROM '.MAIN_DB_PREFIX.$table;
+		$sql .= ' WHERE '.$field.' = '.$this->id;
 
-        dol_syslog(get_class($this)."::getSommePaiement", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if ($resql) {
-            $amount = 0;
+		dol_syslog(get_class($this)."::getSommePaiement", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			$amount = 0;
 
-            $obj = $this->db->fetch_object($resql);
-            if ($obj) $amount = $obj->amount ? $obj->amount : 0;
+			$obj = $this->db->fetch_object($resql);
+			if ($obj) $amount = $obj->amount ? $obj->amount : 0;
 
-            $this->db->free($resql);
-            return $amount;
-        } else {
-            return -1;
-        }
-    }
+			$this->db->free($resql);
+			return $amount;
+		} else {
+			return -1;
+		}
+	}
 
-    /**
-     * 	Charge les informations d'ordre info dans l'objet entrepot
-     *
-     *  @param	int		$id     Id of social contribution
-     *  @return	int				<0 if KO, >0 if OK
-     */
-    public function info($id)
-    {
-        $sql = "SELECT e.rowid, e.tms as datem, e.date_creation as datec, e.date_valid as datev, e.import_key,";
-        $sql .= " e.fk_user_author, e.fk_user_modif, e.fk_user_valid";
+	/**
+	 * 	Charge les informations d'ordre info dans l'objet entrepot
+	 *
+	 *  @param	int		$id     Id of social contribution
+	 *  @return	int				<0 if KO, >0 if OK
+	 */
+	public function info($id)
+	{
+		$sql = "SELECT e.rowid, e.tms as datem, e.date_creation as datec, e.date_valid as datev, e.import_key,";
+		$sql .= " e.fk_user_author, e.fk_user_modif, e.fk_user_valid";
 		$sql .= " FROM ".MAIN_DB_PREFIX."chargesociales as e";
-        $sql .= " WHERE e.rowid = ".$id;
+		$sql .= " WHERE e.rowid = ".$id;
 
-        dol_syslog(get_class($this)."::info", LOG_DEBUG);
-        $result = $this->db->query($sql);
-        if ($result)
-        {
-            if ($this->db->num_rows($result))
-            {
-                $obj = $this->db->fetch_object($result);
+		dol_syslog(get_class($this)."::info", LOG_DEBUG);
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+			if ($this->db->num_rows($result))
+			{
+				$obj = $this->db->fetch_object($result);
 
-                $this->id = $obj->rowid;
+				$this->id = $obj->rowid;
 
-                if ($obj->fk_user_author) {
-                    $cuser = new User($this->db);
-                    $cuser->fetch($obj->fk_user_author);
-                    $this->user_creation = $cuser;
-                }
+				if ($obj->fk_user_author) {
+					$cuser = new User($this->db);
+					$cuser->fetch($obj->fk_user_author);
+					$this->user_creation = $cuser;
+				}
 
-                if ($obj->fk_user_modif) {
-                    $muser = new User($this->db);
-                    $muser->fetch($obj->fk_user_modif);
-                    $this->user_modification = $muser;
-                }
+				if ($obj->fk_user_modif) {
+					$muser = new User($this->db);
+					$muser->fetch($obj->fk_user_modif);
+					$this->user_modification = $muser;
+				}
 
-                if ($obj->fk_user_valid) {
-                    $vuser = new User($this->db);
-                    $vuser->fetch($obj->fk_user_valid);
-                    $this->user_validation = $vuser;
-                }
+				if ($obj->fk_user_valid) {
+					$vuser = new User($this->db);
+					$vuser->fetch($obj->fk_user_valid);
+					$this->user_validation = $vuser;
+				}
 
-                $this->date_creation     = $this->db->jdate($obj->datec);
-                $this->date_modification = $this->db->jdate($obj->datem);
-                $this->date_validation   = $this->db->jdate($obj->datev);
-                $this->import_key        = $obj->import_key;
-            }
+				$this->date_creation     = $this->db->jdate($obj->datec);
+				$this->date_modification = $this->db->jdate($obj->datem);
+				$this->date_validation   = $this->db->jdate($obj->datev);
+				$this->import_key        = $obj->import_key;
+			}
 
-            $this->db->free($result);
-        } else {
-            dol_print_error($this->db);
-        }
-    }
+			$this->db->free($result);
+		} else {
+			dol_print_error($this->db);
+		}
+	}
 
-    /**
-     *  Initialise an instance with random values.
-     *  Used to build previews or test instances.
-     *	id must be 0 if object instance is a specimen.
-     *
-     *  @return	void
-     */
-    public function initAsSpecimen()
-    {
-        // Initialize parameters
-        $this->id = 0;
-        $this->ref = 'SPECIMEN';
-        $this->specimen = 1;
-        $this->paye = 0;
-        $this->date = dol_now();
-        $this->date_ech = $this->date + 3600 * 24 * 30;
-        $this->periode = $this->date + 3600 * 24 * 30;
-        $this->amount = 100;
-        $this->label = 'Social contribution label';
-        $this->type = 1;
-        $this->type_label = 'Type of social contribution';
-    }
+	/**
+	 *  Initialise an instance with random values.
+	 *  Used to build previews or test instances.
+	 *	id must be 0 if object instance is a specimen.
+	 *
+	 *  @return	void
+	 */
+	public function initAsSpecimen()
+	{
+		// Initialize parameters
+		$this->id = 0;
+		$this->ref = 'SPECIMEN';
+		$this->specimen = 1;
+		$this->paye = 0;
+		$this->date = dol_now();
+		$this->date_ech = $this->date + 3600 * 24 * 30;
+		$this->periode = $this->date + 3600 * 24 * 30;
+		$this->amount = 100;
+		$this->label = 'Social contribution label';
+		$this->type = 1;
+		$this->type_label = 'Type of social contribution';
+	}
 }
diff --git a/htdocs/compta/sociales/class/paymentsocialcontribution.class.php b/htdocs/compta/sociales/class/paymentsocialcontribution.class.php
index 62b02860f08..6f3074262a2 100644
--- a/htdocs/compta/sociales/class/paymentsocialcontribution.class.php
+++ b/htdocs/compta/sociales/class/paymentsocialcontribution.class.php
@@ -47,8 +47,8 @@ class PaymentSocialContribution extends CommonObject
 	public $picto = 'payment';
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_charge;
 
 	public $datec = '';
@@ -61,12 +61,12 @@ class PaymentSocialContribution extends CommonObject
 	 */
 	public $total;
 
-    public $amount; // Total amount of payment
-    public $amounts = array(); // Array of amounts
+	public $amount; // Total amount of payment
+	public $amounts = array(); // Array of amounts
 
-    /**
-     * @var int ID
-     */
+	/**
+	 * @var int ID
+	 */
 	public $fk_typepaiement;
 
 	/**
@@ -81,18 +81,18 @@ class PaymentSocialContribution extends CommonObject
 	public $num_payment;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_bank;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_user_creat;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_user_modif;
 
 	/**
@@ -107,8 +107,8 @@ class PaymentSocialContribution extends CommonObject
 
 	/**
 	 *  Create payment of social contribution into database.
-     *  Use this->amounts to have list of lines for the payment
-     *
+	 *  Use this->amounts to have list of lines for the payment
+	 *
 	 *  @param      User	$user   				User making payment
 	 *	@param		int		$closepaidcontrib   	1=Also close payed contributions to paid, 0=Do nothing more
 	 *  @return     int     						<0 if KO, id of payment if OK
@@ -119,7 +119,7 @@ class PaymentSocialContribution extends CommonObject
 
 		$error = 0;
 
-        $now = dol_now();
+		$now = dol_now();
 
 		dol_syslog(get_class($this)."::create", LOG_DEBUG);
 
@@ -140,17 +140,17 @@ class PaymentSocialContribution extends CommonObject
 		if (isset($this->fk_user_creat)) $this->fk_user_creat = (int) $this->fk_user_creat;
 		if (isset($this->fk_user_modif)) $this->fk_user_modif = (int) $this->fk_user_modif;
 
-        $totalamount = 0;
-        foreach ($this->amounts as $key => $value)  // How payment is dispatch
-        {
-            $newvalue = price2num($value, 'MT');
-            $this->amounts[$key] = $newvalue;
-            $totalamount += $newvalue;
-        }
-        $totalamount = price2num($totalamount);
+		$totalamount = 0;
+		foreach ($this->amounts as $key => $value)  // How payment is dispatch
+		{
+			$newvalue = price2num($value, 'MT');
+			$this->amounts[$key] = $newvalue;
+			$totalamount += $newvalue;
+		}
+		$totalamount = price2num($totalamount);
 
-        // Check parameters
-        if ($totalamount == 0) return -1; // On accepte les montants negatifs pour les rejets de prelevement mais pas null
+		// Check parameters
+		if ($totalamount == 0) return -1; // On accepte les montants negatifs pour les rejets de prelevement mais pas null
 
 
 		$this->db->begin();
@@ -207,9 +207,9 @@ class PaymentSocialContribution extends CommonObject
 
 		if ($totalamount != 0 && !$error)
 		{
-		    $this->amount = $totalamount;
-            $this->total = $totalamount; // deprecated
-		    $this->db->commit();
+			$this->amount = $totalamount;
+			$this->total = $totalamount; // deprecated
+			$this->db->commit();
 			return $this->id;
 		} else {
 			$this->error = $this->db->error();
@@ -371,16 +371,16 @@ class PaymentSocialContribution extends CommonObject
 
 		$this->db->begin();
 
-	    if ($this->bank_line > 0)
-        {
-        	$accline = new AccountLine($this->db);
+		if ($this->bank_line > 0)
+		{
+			$accline = new AccountLine($this->db);
 			$accline->fetch($this->bank_line);
 			$result = $accline->delete();
 			if ($result < 0) {
 				$this->errors[] = $accline->error;
 				$error++;
 			}
-        }
+		}
 
 		if (!$error)
 		{
@@ -459,11 +459,11 @@ class PaymentSocialContribution extends CommonObject
 
 
 	/**
-     *  Initialise an instance with random values.
-     *  Used to build previews or test instances.
-     *	id must be 0 if object instance is a specimen.
-     *
-     *  @return	void
+	 *  Initialise an instance with random values.
+	 *  Used to build previews or test instances.
+	 *	id must be 0 if object instance is a specimen.
+	 *
+	 *  @return	void
 	 */
 	public function initAsSpecimen()
 	{
@@ -484,102 +484,102 @@ class PaymentSocialContribution extends CommonObject
 	}
 
 
-    /**
-     *      Add record into bank for payment with links between this bank record and invoices of payment.
-     *      All payment properties must have been set first like after a call to create().
-     *
-     *      @param	User	$user               Object of user making payment
-     *      @param  string	$mode               'payment_sc'
-     *      @param  string	$label              Label to use in bank record
-     *      @param  int		$accountid          Id of bank account to do link with
-     *      @param  string	$emetteur_nom       Name of transmitter
-     *      @param  string	$emetteur_banque    Name of bank
-     *      @return int                 		<0 if KO, >0 if OK
-     */
-    public function addPaymentToBank($user, $mode, $label, $accountid, $emetteur_nom, $emetteur_banque)
-    {
-        global $conf;
+	/**
+	 *      Add record into bank for payment with links between this bank record and invoices of payment.
+	 *      All payment properties must have been set first like after a call to create().
+	 *
+	 *      @param	User	$user               Object of user making payment
+	 *      @param  string	$mode               'payment_sc'
+	 *      @param  string	$label              Label to use in bank record
+	 *      @param  int		$accountid          Id of bank account to do link with
+	 *      @param  string	$emetteur_nom       Name of transmitter
+	 *      @param  string	$emetteur_banque    Name of bank
+	 *      @return int                 		<0 if KO, >0 if OK
+	 */
+	public function addPaymentToBank($user, $mode, $label, $accountid, $emetteur_nom, $emetteur_banque)
+	{
+		global $conf;
 
 		// Clean data
-        $this->num_payment = trim($this->num_payment);
+		$this->num_payment = trim($this->num_payment);
 
-        $error = 0;
+		$error = 0;
 
-        if (!empty($conf->banque->enabled))
-        {
-            include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+		if (!empty($conf->banque->enabled))
+		{
+			include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 
-            $acc = new Account($this->db);
-            $acc->fetch($accountid);
+			$acc = new Account($this->db);
+			$acc->fetch($accountid);
 
-            $total = $this->total;
-            if ($mode == 'payment_sc') $total = -$total;
+			$total = $this->total;
+			if ($mode == 'payment_sc') $total = -$total;
 
-            // Insert payment into llx_bank
-            $bank_line_id = $acc->addline(
-                $this->datepaye,
-                $this->paiementtype, // Payment mode id or code ("CHQ or VIR for example")
-                $label,
-                $total,
-                $this->num_payment,
-                '',
-                $user,
-                $emetteur_nom,
-                $emetteur_banque
-            );
+			// Insert payment into llx_bank
+			$bank_line_id = $acc->addline(
+				$this->datepaye,
+				$this->paiementtype, // Payment mode id or code ("CHQ or VIR for example")
+				$label,
+				$total,
+				$this->num_payment,
+				'',
+				$user,
+				$emetteur_nom,
+				$emetteur_banque
+			);
 
-            // Mise a jour fk_bank dans llx_paiement.
-            // On connait ainsi le paiement qui a genere l'ecriture bancaire
-            if ($bank_line_id > 0)
-            {
-                $result = $this->update_fk_bank($bank_line_id);
-                if ($result <= 0)
-                {
-                    $error++;
-                    dol_print_error($this->db);
-                }
+			// Mise a jour fk_bank dans llx_paiement.
+			// On connait ainsi le paiement qui a genere l'ecriture bancaire
+			if ($bank_line_id > 0)
+			{
+				$result = $this->update_fk_bank($bank_line_id);
+				if ($result <= 0)
+				{
+					$error++;
+					dol_print_error($this->db);
+				}
 
-                // Add link 'payment', 'payment_supplier', 'payment_sc' in bank_url between payment and bank transaction
-                $url = '';
-                if ($mode == 'payment_sc') $url = DOL_URL_ROOT.'/compta/payment_sc/card.php?id=';
-                if ($url)
-                {
-                    $result = $acc->add_url_line($bank_line_id, $this->id, $url, '(paiement)', $mode);
-                    if ($result <= 0)
-                    {
-                        $error++;
-                        dol_print_error($this->db);
-                    }
-                }
+				// Add link 'payment', 'payment_supplier', 'payment_sc' in bank_url between payment and bank transaction
+				$url = '';
+				if ($mode == 'payment_sc') $url = DOL_URL_ROOT.'/compta/payment_sc/card.php?id=';
+				if ($url)
+				{
+					$result = $acc->add_url_line($bank_line_id, $this->id, $url, '(paiement)', $mode);
+					if ($result <= 0)
+					{
+						$error++;
+						dol_print_error($this->db);
+					}
+				}
 
-                // Add link 'company' in bank_url between invoice and bank transaction (for each invoice concerned by payment)
-                $linkaddedforthirdparty = array();
-                foreach ($this->amounts as $key => $value)
-                {
-                    if ($mode == 'payment_sc')
-                    {
-                        $socialcontrib = new ChargeSociales($this->db);
-                        $socialcontrib->fetch($key);
-                        $result = $acc->add_url_line($bank_line_id, $socialcontrib->id, DOL_URL_ROOT.'/compta/charges.php?id=', $socialcontrib->type_label.(($socialcontrib->lib && $socialcontrib->lib != $socialcontrib->type_label) ? ' ('.$socialcontrib->lib.')' : ''), 'sc');
-                        if ($result <= 0) dol_print_error($this->db);
-                    }
-                }
-            } else {
-                $this->error = $acc->error;
-                $error++;
-            }
-        }
+				// Add link 'company' in bank_url between invoice and bank transaction (for each invoice concerned by payment)
+				$linkaddedforthirdparty = array();
+				foreach ($this->amounts as $key => $value)
+				{
+					if ($mode == 'payment_sc')
+					{
+						$socialcontrib = new ChargeSociales($this->db);
+						$socialcontrib->fetch($key);
+						$result = $acc->add_url_line($bank_line_id, $socialcontrib->id, DOL_URL_ROOT.'/compta/charges.php?id=', $socialcontrib->type_label.(($socialcontrib->lib && $socialcontrib->lib != $socialcontrib->type_label) ? ' ('.$socialcontrib->lib.')' : ''), 'sc');
+						if ($result <= 0) dol_print_error($this->db);
+					}
+				}
+			} else {
+				$this->error = $acc->error;
+				$error++;
+			}
+		}
 
-        if (!$error)
-        {
-            return 1;
-        } else {
-            return -1;
-        }
-    }
+		if (!$error)
+		{
+			return 1;
+		} else {
+			return -1;
+		}
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Mise a jour du lien entre le paiement de  charge et la ligne dans llx_bank generee
 	 *
@@ -588,7 +588,7 @@ class PaymentSocialContribution extends CommonObject
 	 */
 	public function update_fk_bank($id_bank)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$sql = "UPDATE ".MAIN_DB_PREFIX."paiementcharge SET fk_bank = ".$id_bank." WHERE rowid = ".$this->id;
 
 		dol_syslog(get_class($this)."::update_fk_bank", LOG_DEBUG);
@@ -614,7 +614,7 @@ class PaymentSocialContribution extends CommonObject
 		return $this->LibStatut($this->statut, $mode);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Renvoi le libelle d'un statut donne
 	 *
@@ -624,7 +624,7 @@ class PaymentSocialContribution extends CommonObject
 	 */
 	public function LibStatut($status, $mode = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs; // TODO Renvoyer le libelle anglais et faire traduction a affichage
 
 		$langs->load('compta');
@@ -680,17 +680,31 @@ class PaymentSocialContribution extends CommonObject
 		$result = '';
 
 		if (empty($this->ref)) $this->ref = $this->lib;
-        $label = $langs->trans("Payment").': '.$this->ref;
 
-        if (!empty($this->id)) {
-            $link = '<a href="'.DOL_URL_ROOT.'/compta/payment_sc/card.php?id='.$this->id.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
-            $linkend = '</a>';
+		$label = img_picto('', $this->picto).' <u>'.$langs->trans("SocialContributionPayment").'</u>';
+		$label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
+		if (!empty($this->label)) {
+			$labeltoshow = $this->label;
+			$reg = array();
+			if (preg_match('/^\((.*)\)$/i', $this->label, $reg))
+			{
+				// Label generique car entre parentheses. On l'affiche en le traduisant
+				if ($reg[1] == 'paiement') $reg[1] = 'Payment';
+				$labeltoshow = $langs->trans($reg[1]);
+			}
+			$label .= '<br><b>'.$langs->trans('Label').':</b> '.$labeltoshow;
+		}
+		if ($this->date) $label .= '<br><b>'.$langs->trans('Date').':</b> '.dol_print_date($this->date, 'day');
 
-            if ($withpicto) $result .= ($link.img_object($label, 'payment', 'class="classfortooltip"').$linkend.' ');
-            if ($withpicto && $withpicto != 2) $result .= ' ';
-            if ($withpicto != 2) $result .= $link.($maxlen ?dol_trunc($this->ref, $maxlen) : $this->ref).$linkend;
-        }
+		if (!empty($this->id)) {
+			$link = '<a href="'.DOL_URL_ROOT.'/compta/payment_sc/card.php?id='.$this->id.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
+			$linkend = '</a>';
 
-        return $result;
-    }
+			if ($withpicto) $result .= ($link.img_object($label, 'payment', 'class="classfortooltip"').$linkend.' ');
+			if ($withpicto && $withpicto != 2) $result .= ' ';
+			if ($withpicto != 2) $result .= $link.($maxlen ?dol_trunc($this->ref, $maxlen) : $this->ref).$linkend;
+		}
+
+		return $result;
+	}
 }
diff --git a/htdocs/compta/sociales/document.php b/htdocs/compta/sociales/document.php
index dd07afd416f..dbb01060a4d 100644
--- a/htdocs/compta/sociales/document.php
+++ b/htdocs/compta/sociales/document.php
@@ -35,8 +35,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/tax.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.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
@@ -57,7 +57,7 @@ $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
-    $page = 0;
+	$page = 0;
 }
 $offset = $limit * $page;
 $pageprev = $page - 1;
@@ -81,10 +81,10 @@ require_once DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
 
 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');
 }
 
 
@@ -103,28 +103,28 @@ if ($object->id)
 {
 	$alreadypayed = $object->getSommePaiement();
 
-    $head = tax_prepare_head($object);
+	$head = tax_prepare_head($object);
 
-    print dol_get_fiche_head($head, 'documents', $langs->trans("SocialContribution"), -1, 'bill');
+	print dol_get_fiche_head($head, 'documents', $langs->trans("SocialContribution"), -1, 'bill');
 
 	$morehtmlref = '<div class="refidno">';
 	// Label of social contribution
 	$morehtmlref .= $form->editfieldkey("Label", 'lib', $object->label, $object, $user->rights->tax->charges->creer, 'string', '', 0, 1);
 	$morehtmlref .= $form->editfieldval("Label", 'lib', $object->label, $object, $user->rights->tax->charges->creer, 'string', '', null, null, '', 1);
-    // Project
+	// 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>';
 
@@ -137,34 +137,34 @@ if ($object->id)
 	print '<div class="fichecenter">';
 	print '<div class="underbanner clearboth"></div>';
 
-    // Build file list
-    $filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
-    $totalsize = 0;
-    foreach ($filearray as $key => $file)
-    {
-        $totalsize += $file['size'];
-    }
+	// Build file list
+	$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
+	$totalsize = 0;
+	foreach ($filearray as $key => $file)
+	{
+		$totalsize += $file['size'];
+	}
 
 
-    print '<table class="border tableforfield centpercent">';
+	print '<table class="border tableforfield centpercent">';
 
-    print '<tr><td class="titlefield">'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
-    print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.dol_print_size($totalsize, 1, 1).'</td></tr>';
-    print '</table>';
+	print '<tr><td class="titlefield">'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
+	print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.dol_print_size($totalsize, 1, 1).'</td></tr>';
+	print '</table>';
 
-    print '</div>';
+	print '</div>';
 
-    print '<div class="clearboth"></div>';
+	print '<div class="clearboth"></div>';
 
-    dol_fiche_end();
+	print dol_get_fiche_end();
 
-    $modulepart = 'tax';
-    $permission = $user->rights->tax->charges->creer;
-    $permtoedit = $user->rights->fournisseur->facture->creer;
-    $param = '&id='.$object->id;
-    include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
+	$modulepart = 'tax';
+	$permission = $user->rights->tax->charges->creer;
+	$permtoedit = $user->rights->fournisseur->facture->creer;
+	$param = '&id='.$object->id;
+	include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
 } else {
-    print $langs->trans("ErrorUnknown");
+	print $langs->trans("ErrorUnknown");
 }
 
 // End of page
diff --git a/htdocs/compta/sociales/list.php b/htdocs/compta/sociales/list.php
index 03c103769a3..746a8480453 100644
--- a/htdocs/compta/sociales/list.php
+++ b/htdocs/compta/sociales/list.php
@@ -45,25 +45,25 @@ $langs->loadLangs(array('compta', 'banks', 'bills'));
 $action				= GETPOST('action', 'aZ09');
 $massaction			= GETPOST('massaction', 'alpha');
 $confirm			= GETPOST('confirm', 'alpha');
-$optioncss			= GETPOST('optioncss', 'alpha');
+$optioncss = GETPOST('optioncss', 'alpha');
 $contextpage		= GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'sclist';
 
 $search_ref			= GETPOST('search_ref', 'int');
-$search_label		= GETPOST('search_label', 'alpha');
+$search_label = GETPOST('search_label', 'alpha');
 $search_amount		= GETPOST('search_amount', 'alpha');
 $search_status		= GETPOST('search_status', 'int');
 $search_day_lim		= GETPOST('search_day_lim', 'int');
-$search_month_lim	= GETPOST('search_month_lim', 'int');
+$search_month_lim = GETPOST('search_month_lim', 'int');
 $search_year_lim	= GETPOST('search_year_lim', 'int');
-$search_project_ref	= GETPOST('search_project_ref', 'alpha');
+$search_project_ref = GETPOST('search_project_ref', 'alpha');
 $search_project		= GETPOST('search_project', 'alpha');
 
-$limit				= GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield			= GETPOST("sortfield", 'alpha');
 $sortorder			= GETPOST("sortorder", 'alpha');
-$page				= GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 
-if (empty($page) || $page == -1) $page = 0;				// If $page is not defined, or '' or -1
+if (empty($page) || $page == -1) $page = 0; // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
@@ -88,14 +88,14 @@ if (!GETPOSTISSET('search_typeid'))
 }
 
 $arrayfields = array(
-	'cs.rowid'		=>array('label'=>"Ref",				'checked'=>1, 'position'=>10),
-	'cs.libelle'	=>array('label'=>"Label",			'checked'=>1, 'position'=>20),
-	'cs.fk_type'	=>array('label'=>"Type",			'checked'=>1, 'position'=>30),
-	'p.ref'			=>array('label'=>"ProjectRef",		'checked'=>1, 'position'=>40, 'enable'=>(!empty($conf->projet->enabled))),
-	'cs.date_ech'	=>array('label'=>"Date",			'checked'=>1, 'position'=>50),
-	'cs.periode'	=>array('label'=>"PeriodEndDate",	'checked'=>1, 'position'=>60),
-	'cs.amount'		=>array('label'=>"Amount",			'checked'=>1, 'position'=>70),
-	'cs.paye'		=>array('label'=>"Status",			'checked'=>1, 'position'=>80),
+	'cs.rowid'		=>array('label'=>"Ref", 'checked'=>1, 'position'=>10),
+	'cs.libelle'	=>array('label'=>"Label", 'checked'=>1, 'position'=>20),
+	'cs.fk_type'	=>array('label'=>"Type", 'checked'=>1, 'position'=>30),
+	'p.ref'			=>array('label'=>"ProjectRef", 'checked'=>1, 'position'=>40, 'enable'=>(!empty($conf->projet->enabled))),
+	'cs.date_ech'	=>array('label'=>"Date", 'checked'=>1, 'position'=>50),
+	'cs.periode'	=>array('label'=>"PeriodEndDate", 'checked'=>1, 'position'=>60),
+	'cs.amount'		=>array('label'=>"Amount", 'checked'=>1, 'position'=>70),
+	'cs.paye'		=>array('label'=>"Status", 'checked'=>1, 'position'=>80),
 );
 $arrayfields = dol_sort_array($arrayfields, 'position');
 
diff --git a/htdocs/compta/sociales/payments.php b/htdocs/compta/sociales/payments.php
index fc1f66d5e2c..c8eea77e546 100644
--- a/htdocs/compta/sociales/payments.php
+++ b/htdocs/compta/sociales/payments.php
@@ -1,10 +1,11 @@
 <?php
 /* Copyright (C) 2001-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2016 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2010 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2011-2016 Alexandre Spangaro   <aspangaro@open-dsi.fr>
- * Copyright (C) 2011-2014 Juanjo Menent	    <jmenent@2byte.es>
+ * Copyright (C) 2011-2014 Juanjo Menent	<jmenent@2byte.es>
  * Copyright (C) 2015      Jean-François Ferry	<jfefe@aternatik.fr>
+ * Copyright (C) 2019      Nicolas ZABOURI      <info@inovea-conseil.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
@@ -21,7 +22,7 @@
  */
 
 /**
- *      \file       htdocs/compta/sociales/payments.php
+ *      \file       htdocs/compta/charges/index.php
  *      \ingroup    compta
  *		\brief      Page to list payments of special expenses
  */
@@ -32,6 +33,13 @@ require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php'
 require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/paymentsocialcontribution.class.php';
 require_once DOL_DOCUMENT_ROOT.'/salaries/class/paymentsalary.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+
+
+$hookmanager = new HookManager($db);
+
+// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array
+$hookmanager->initHooks(array('specialexpensesindex'));
 
 // Load translation files required by the page
 $langs->loadLangs(array('compta', 'bills'));
@@ -40,10 +48,10 @@ $langs->loadLangs(array('compta', 'bills'));
 if ($user->socid) $socid = $user->socid;
 $result = restrictedArea($user, 'tax|salaries', '', '', 'charges|');
 
-$mode = GETPOST("mode", 'alpha');
 $year = GETPOST("year", 'int');
 $filtre = GETPOST("filtre", 'alpha');
-if (!$year && $mode != 'sconly') { $year = date("Y", time()); }
+
+$search_account = GETPOST('search_account', 'int');
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
@@ -53,7 +61,7 @@ if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined,
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortfield) $sortfield = "pc.datep";
+if (!$sortfield) $sortfield = "cs.date_ech";
 if (!$sortorder) $sortorder = "DESC";
 
 
@@ -65,19 +73,20 @@ $tva_static = new Tva($db);
 $socialcontrib = new ChargeSociales($db);
 $payment_sc_static = new PaymentSocialContribution($db);
 $sal_static = new PaymentSalary($db);
+$accountstatic = new Account($db);
 
 llxHeader('', $langs->trans("SpecialExpensesArea"));
 
-$title = $langs->trans("SpecialExpensesArea");
-if ($mode == 'sconly') $title = $langs->trans("SocialContributionsPayments");
+$title = $langs->trans("SocialContributionsPayments");
 
 $param = '';
 if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
 if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
-if ($mode == 'sconly') $param = '&mode=sconly';
 if ($sortfield) $param .= '&sortfield='.$sortfield;
 if ($sortorder) $param .= '&sortorder='.$sortorder;
 
+$totalnboflines = 0;
+$num = 0;
 
 print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
 if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
@@ -88,52 +97,39 @@ print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 print '<input type="hidden" name="page" value="'.$page.'">';
 print '<input type="hidden" name="mode" value="'.$mode.'">';
 
-if ($mode != 'sconly')
-{
-    $center = ($year ? '<a href="list.php?year='.($year - 1).$param.'">'.img_previous($langs->trans("Previous"), 'class="valignbottom"')."</a> ".$langs->trans("Year").' '.$year.' <a href="list.php?year='.($year + 1).$param.'">'.img_next($langs->trans("Next"), 'class="valignbottom"')."</a>" : "");
-    print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $center, $num, $totalnboflines, 'title_accountancy', 0, '', '', $limit, 1);
-} else {
-    print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $center, $num, $totalnboflines, 'title_accountancy', 0, '', '', $limit);
-}
+$nav = '';
+print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $totalnboflines, 'object_payment', 0, $nav, '', $limit, 0);
 
 if ($year) $param .= '&year='.$year;
 
-if ($mode != 'sconly')
-{
-	print $langs->trans("DescTaxAndDividendsArea").'<br>';
-	print "<br>";
-}
-
 if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
 {
-	// Social contributions only
-	if ($mode != 'sconly')
-	{
-		print load_fiche_titre($langs->trans("SocialContributionsPayments").($year ? ' ('.$langs->trans("Year").' '.$year.')' : ''), '', '');
-	}
-
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre">';
+	print_liste_field_titre("PeriodEndDate", $_SERVER["PHP_SELF"], "cs.date_ech", "", $param, 'width="140px"', $sortfield, $sortorder);
+	print_liste_field_titre("Label", $_SERVER["PHP_SELF"], "c.libelle", "", $param, '', $sortfield, $sortorder);
+	print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "cs.fk_type", "", $param, '', $sortfield, $sortorder);
+	print_liste_field_titre("ExpectedToPay", $_SERVER["PHP_SELF"], "cs.amount", "", $param, 'class="right"', $sortfield, $sortorder);
 	print_liste_field_titre("RefPayment", $_SERVER["PHP_SELF"], "pc.rowid", "", $param, '', $sortfield, $sortorder);
 	print_liste_field_titre("DatePayment", $_SERVER["PHP_SELF"], "pc.datep", "", $param, 'align="center"', $sortfield, $sortorder);
 	print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "pct.code", "", $param, '', $sortfield, $sortorder);
-	print_liste_field_titre("LabelContrib", $_SERVER["PHP_SELF"], "c.libelle", "", $param, '', $sortfield, $sortorder);
-	print_liste_field_titre("TypeContrib", $_SERVER["PHP_SELF"], "cs.fk_type", "", $param, '', $sortfield, $sortorder);
-	print_liste_field_titre("PeriodEndDate", $_SERVER["PHP_SELF"], "cs.date_ech", "", $param, 'width="140px"', $sortfield, $sortorder);
-	print_liste_field_titre("ExpectedToPay", $_SERVER["PHP_SELF"], "cs.amount", "", $param, 'class="right"', $sortfield, $sortorder);
+	if (!empty($conf->banque->enabled)) print_liste_field_titre("Account", $_SERVER["PHP_SELF"], "ba.label", "", $param, "", $sortfield, $sortorder);
 	print_liste_field_titre("PayedByThisPayment", $_SERVER["PHP_SELF"], "pc.amount", "", $param, 'class="right"', $sortfield, $sortorder);
 	print "</tr>\n";
 
-	$sql = "SELECT c.id, c.libelle as type_label,";
-	$sql .= " cs.rowid, cs.libelle as label, cs.fk_type as type, cs.periode, cs.date_ech, cs.amount as total,";
-	$sql .= " pc.rowid as pid, pc.datep, pc.amount as totalpaye, pc.num_paiement as num_payment,";
-	$sql .= " pct.code as payment_code";
+	$sql = "SELECT c.id, c.libelle as label,";
+	$sql .= " cs.rowid, cs.libelle, cs.fk_type as type, cs.periode, cs.date_ech, cs.amount as total,";
+	$sql .= " pc.rowid as pid, pc.datep, pc.amount as totalpaye, pc.num_paiement as num_payment, pc.fk_bank,";
+	$sql .= " pct.code as payment_code,";
+	$sql .= " ba.rowid as bid, ba.ref as bref, ba.number as bnumber, ba.account_number, ba.fk_accountancy_journal, ba.label as blabel";
 	$sql .= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c,";
-	$sql .= " ".MAIN_DB_PREFIX."chargesociales as cs,";
-	$sql .= " ".MAIN_DB_PREFIX."paiementcharge as pc";
+	$sql .= " ".MAIN_DB_PREFIX."chargesociales as cs";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."paiementcharge as pc ON pc.fk_charge = cs.rowid";
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as pct ON pc.fk_typepaiement = pct.id";
-	$sql .= " WHERE cs.fk_type = c.id AND pc.fk_charge = cs.rowid";
-	$sql .= " AND cs.entity = ".$conf->entity;
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank as b ON pc.fk_bank = b.rowid";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank_account as ba ON b.fk_account = ba.rowid";
+	$sql .= " WHERE cs.fk_type = c.id";
+	$sql .= " AND cs.entity IN (".getEntity("tax").")";
 	if ($year > 0)
 	{
 		$sql .= " AND (";
@@ -147,7 +143,7 @@ if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
 	//$sql.= $db->plimit($limit+1,$offset);
 	//print $sql;
 
-	dol_syslog("compta/sociales/payments.php: select payment", LOG_DEBUG);
+	dol_syslog("compta/charges/index.php: select payment", LOG_DEBUG);
 	$resql = $db->query($sql);
 	if ($resql)
 	{
@@ -160,34 +156,49 @@ if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
 		while ($i < min($num, $limit))
 		{
 			$obj = $db->fetch_object($resql);
-
-			$payment_sc_static->id = $obj->pid;
-			$payment_sc_static->ref = $obj->pid;
-
 			print '<tr class="oddeven">';
-			// Ref payment
-			print '<td>'.$payment_sc_static->getNomUrl(1)."</td>\n";
-			// Date payment
-			print '<td class="center">'.dol_print_date($db->jdate($obj->datep), 'day').'</td>';
-	        // Type payment
-    	    print '<td>';
-    	    if ($obj->payment_code) print $langs->trans("PaymentTypeShort".$obj->payment_code).' ';
-    	    print $obj->num_payment.'</td>';
-			// Label
-			print '<td>';
-			$socialcontrib->id = $obj->rowid;
-			$socialcontrib->ref = $obj->rowid;
-			$socialcontrib->label = $obj->label;
-			print $socialcontrib->getNomUrl(1, '20');
-			print '</td>';
-			// Type
-			print '<td><a href="../sociales/list.php?filtre=cs.fk_type:'.$obj->type.'">'.$obj->type_label.'</a></td>';
 			// Date
 			$date = $obj->periode;
 			if (empty($date)) $date = $obj->date_ech;
 			print '<td>'.dol_print_date($date, 'day').'</td>';
+			// Label
+			print '<td>';
+			$socialcontrib->id = $obj->rowid;
+			$socialcontrib->ref = $obj->label;
+			$socialcontrib->label = $obj->label;
+			print $socialcontrib->getNomUrl(1, '20');
+			print '</td>';
+			// Type
+			print '<td><a href="../sociales/list.php?filtre=cs.fk_type:'.$obj->type.'">'.$obj->label.'</a></td>';
 			// Expected to pay
 			print '<td class="right">'.price($obj->total).'</td>';
+			// Ref payment
+			$payment_sc_static->id = $obj->pid;
+			$payment_sc_static->ref = $obj->pid;
+			print '<td>'.$payment_sc_static->getNomUrl(1)."</td>\n";
+			// Date payment
+			print '<td class="center">'.dol_print_date($db->jdate($obj->datep), 'day').'</td>';
+			// Type payment
+			print '<td>';
+			if ($obj->payment_code) print $langs->trans("PaymentTypeShort".$obj->payment_code).' ';
+			print $obj->num_payment.'</td>';
+			// Account
+			if (!empty($conf->banque->enabled))
+			{
+				print '<td>';
+				if ($obj->fk_bank > 0)
+				{
+					//$accountstatic->fetch($obj->fk_bank);
+					$accountstatic->id = $obj->bid;
+					$accountstatic->ref = $obj->bref;
+					$accountstatic->number = $obj->bnumber;
+					$accountstatic->accountancy_number = $obj->account_number;
+					$accountstatic->accountancy_journal = $obj->accountancy_journal;
+					$accountstatic->label = $obj->blabel;
+					print $accountstatic->getNomUrl(1);
+				} else print '&nbsp;';
+				print '</td>';
+			}
 			// Paid
 			print '<td class="right">';
 			if ($obj->totalpaye) print price($obj->totalpaye);
@@ -199,12 +210,13 @@ if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
 			$totalpaye = $totalpaye + $obj->totalpaye;
 			$i++;
 		}
-	    print '<tr class="liste_total"><td colspan="3" class="liste_total">'.$langs->trans("Total").'</td>';
-	    print '<td class="liste_total right"></td>'; // A total here has no sense
-	    print '<td align="center" class="liste_total">&nbsp;</td>';
-	    print '<td align="center" class="liste_total">&nbsp;</td>';
-	    print '<td align="center" class="liste_total">&nbsp;</td>';
-	    print '<td class="liste_total right">'.price($totalpaye)."</td>";
+		print '<tr class="liste_total"><td colspan="3" class="liste_total">'.$langs->trans("Total").'</td>';
+		print '<td class="liste_total right"></td>'; // A total here has no sense
+		print '<td align="center" class="liste_total">&nbsp;</td>';
+		print '<td align="center" class="liste_total">&nbsp;</td>';
+		print '<td align="center" class="liste_total">&nbsp;</td>';
+		if (!empty($conf->banque->enabled)) print '<td></td>';
+		print '<td class="liste_total right">'.price($totalpaye)."</td>";
 		print "</tr>";
 	} else {
 		dol_print_error($db);
@@ -212,262 +224,11 @@ if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
 	print '</table>';
 }
 
-// VAT
-if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
-{
-	if (!$mode || $mode != 'sconly')
-	{
-		print "<br>";
-
-		$tva = new Tva($db);
-
-		print load_fiche_titre($langs->trans("VATPayments").($year ? ' ('.$langs->trans("Year").' '.$year.')' : ''), '', '');
-
-		$sql = "SELECT pv.rowid, pv.amount, pv.label, pv.datev as dm";
-		$sql .= " FROM ".MAIN_DB_PREFIX."tva as pv";
-		$sql .= " WHERE pv.entity = ".$conf->entity;
-		if ($year > 0)
-		{
-			// Si period renseignee on l'utilise comme critere de date, sinon on prend date echeance,
-			// ceci afin d'etre compatible avec les cas ou la periode n'etait pas obligatoire
-			$sql .= " AND pv.datev between '".$db->idate(dol_get_first_day($year, 1, false))."' AND '".$db->idate(dol_get_last_day($year, 12, false))."'";
-		}
-		if (preg_match('/^pv\./', $sortfield)) $sql .= $db->order($sortfield, $sortorder);
-
-		$result = $db->query($sql);
-		if ($result)
-		{
-		    $num = $db->num_rows($result);
-		    $i = 0;
-		    $total = 0;
-		    print '<table class="noborder centpercent">';
-		    print '<tr class="liste_titre">';
-			print_liste_field_titre("PeriodEndDate", $_SERVER["PHP_SELF"], "pv.datev", "", $param, 'width="140px"', $sortfield, $sortorder);
-			print_liste_field_titre("Label", $_SERVER["PHP_SELF"], "pv.label", "", $param, '', $sortfield, $sortorder);
-			print_liste_field_titre("ExpectedToPay", $_SERVER["PHP_SELF"], "pv.amount", "", $param, 'class="right"', $sortfield, $sortorder);
-			print_liste_field_titre("RefPayment", $_SERVER["PHP_SELF"], "pv.rowid", "", $param, '', $sortfield, $sortorder);
-			print_liste_field_titre("DatePayment", $_SERVER["PHP_SELF"], "pv.datev", "", $param, 'align="center"', $sortfield, $sortorder);
-			print_liste_field_titre("PayedByThisPayment", $_SERVER["PHP_SELF"], "pv.amount", "", $param, 'class="right"', $sortfield, $sortorder);
-		    print "</tr>\n";
-
-		    while ($i < $num)
-		    {
-		        $obj = $db->fetch_object($result);
-
-		        $total = $total + $obj->amount;
-
-		        print '<tr class="oddeven">';
-		        print '<td class="left">'.dol_print_date($db->jdate($obj->dm), 'day').'</td>'."\n";
-
-		        print "<td>".$obj->label."</td>\n";
-
-		        print '<td class="right">'.price($obj->amount)."</td>";
-
-		        // Ref payment
-				$tva_static->id = $obj->rowid;
-				$tva_static->ref = $obj->rowid;
-		        print '<td class="left">'.$tva_static->getNomUrl(1)."</td>\n";
-
-		        print '<td class="center">'.dol_print_date($db->jdate($obj->dm), 'day')."</td>\n";
-		        print '<td class="right">'.price($obj->amount)."</td>";
-		        print "</tr>\n";
-
-		        $i++;
-		    }
-		    print '<tr class="liste_total"><td colspan="2">'.$langs->trans("Total").'</td>';
-		    print '<td class="right">'.price($total).'</td>';
-		    print '<td align="center">&nbsp;</td>';
-		    print '<td align="center">&nbsp;</td>';
-		    print '<td class="right">'.price($total)."</td>";
-		    print "</tr>";
-
-		    print "</table>";
-		    $db->free($result);
-		} else {
-		    dol_print_error($db);
-		}
-	}
-}
-
-// Localtax
-if ($mysoc->localtax1_assuj == "1" && $mysoc->localtax2_assuj == "1")
-{
-	$j = 1;
-	$numlt = 3;
-} elseif ($mysoc->localtax1_assuj == "1")
-{
-	$j = 1;
-	$numlt = 2;
-} elseif ($mysoc->localtax2_assuj == "1")
-{
-	$j = 2;
-	$numlt = 3;
-} else {
-	$j = 0;
-	$numlt = 0;
-}
-
-while ($j < $numlt)
-{
-	if (!$mode || $mode != 'sconly')
-	{
-		print "<br>";
-
-		$tva = new Tva($db);
-
-		print load_fiche_titre($langs->transcountry(($j == 1 ? "LT1Payments" : "LT2Payments"), $mysoc->country_code).($year ? ' ('.$langs->trans("Year").' '.$year.')' : ''), '', '');
-
-
-		$sql = "SELECT pv.rowid, pv.amount, pv.label, pv.datev as dm, pv.datep as dp";
-		$sql .= " FROM ".MAIN_DB_PREFIX."localtax as pv";
-		$sql .= " WHERE pv.entity = ".$conf->entity." AND localtaxtype = ".$j;
-		if ($year > 0)
-		{
-			// Si period renseignee on l'utilise comme critere de date, sinon on prend date echeance,
-			// ceci afin d'etre compatible avec les cas ou la periode n'etait pas obligatoire
-			$sql .= " AND pv.datev between '".$db->idate(dol_get_first_day($year, 1, false))."' AND '".$db->idate(dol_get_last_day($year, 12, false))."'";
-		}
-		if (preg_match('/^pv/', $sortfield)) $sql .= $db->order($sortfield, $sortorder);
-
-		$result = $db->query($sql);
-		if ($result)
-		{
-			$num = $db->num_rows($result);
-			$i = 0;
-			$total = 0;
-			print '<table class="noborder centpercent">';
-			print '<tr class="liste_titre">';
-			print_liste_field_titre("PeriodEndDate", $_SERVER["PHP_SELF"], "pv.datev", "", $param, 'width="120"', $sortfield, $sortorder);
-			print_liste_field_titre("Label", $_SERVER["PHP_SELF"], "pv.label", "", $param, '', $sortfield, $sortorder);
-			print_liste_field_titre("ExpectedToPay", $_SERVER["PHP_SELF"], "pv.amount", "", $param, 'class="right"', $sortfield, $sortorder);
-			print_liste_field_titre("RefPayment", $_SERVER["PHP_SELF"], "pv.rowid", "", $param, '', $sortfield, $sortorder);
-			print_liste_field_titre("DatePayment", $_SERVER["PHP_SELF"], "pv.datep", "", $param, 'align="center"', $sortfield, $sortorder);
-			print_liste_field_titre("PayedByThisPayment", $_SERVER["PHP_SELF"], "pv.amount", "", $param, 'class="right"', $sortfield, $sortorder);
-			print "</tr>\n";
-
-			while ($i < $num)
-			{
-				$obj = $db->fetch_object($result);
-
-				$total = $total + $obj->amount;
-
-				print '<tr class="oddeven">';
-				print '<td class="left">'.dol_print_date($db->jdate($obj->dm), 'day').'</td>'."\n";
-
-				print "<td>".$obj->label."</td>\n";
-
-				print '<td class="right">'.price($obj->amount)."</td>";
-
-				// Ref payment
-				$tva_static->id = $obj->rowid;
-				$tva_static->ref = $obj->rowid;
-				print '<td class="left">'.$tva_static->getNomUrl(1)."</td>\n";
-
-				print '<td class="center">'.dol_print_date($db->jdate($obj->dp), 'day')."</td>\n";
-				print '<td class="right">'.price($obj->amount)."</td>";
-				print "</tr>\n";
-
-				$i++;
-			}
-			print '<tr class="liste_total"><td class="right" colspan="2">'.$langs->trans("Total").'</td>';
-			print '<td class="right">'.price($total)."</td>";
-			print '<td align="center">&nbsp;</td>';
-			print '<td align="center">&nbsp;</td>';
-			print '<td class="right">'.price($total)."</td>";
-			print "</tr>";
-
-			print "</table>";
-			$db->free($result);
-		} else {
-			dol_print_error($db);
-		}
-	}
-	$j++;
-}
-
-
-// Payment Salary
-if (!empty($conf->salaries->enabled) && !empty($user->rights->salaries->read))
-{
-    if (!$mode || $mode != 'sconly')
-    {
-        $sal = new PaymentSalary($db);
-
-        print "<br>";
-
-        print load_fiche_titre($langs->trans("SalariesPayments").($year ? ' ('.$langs->trans("Year").' '.$year.')' : ''), '', '');
-
-        $sql = "SELECT s.rowid, s.amount, s.label, s.datep as datep, s.datev as datev, s.datesp, s.dateep, s.salary, u.salary as current_salary";
-        $sql .= " FROM ".MAIN_DB_PREFIX."payment_salary as s, ".MAIN_DB_PREFIX."user as u";
-        $sql .= " WHERE s.entity IN (".getEntity('user').")";
-        $sql .= " AND u.rowid = s.fk_user";
-        if ($year > 0)
-        {
-            $sql .= " AND (s.datesp between '".$db->idate(dol_get_first_day($year, 1, false))."' AND '".$db->idate(dol_get_last_day($year, 12, false))."'";
-            $sql .= " OR s.dateep between '".$db->idate(dol_get_first_day($year, 1, false))."' AND '".$db->idate(dol_get_last_day($year, 12, false))."')";
-        }
-        if (preg_match('/^s\./', $sortfield)) $sql .= $db->order($sortfield, $sortorder);
-
-        $result = $db->query($sql);
-        if ($result)
-        {
-            $num = $db->num_rows($result);
-            $i = 0;
-            $total = 0;
-            print '<table class="noborder centpercent">';
-            print '<tr class="liste_titre">';
-            print_liste_field_titre("PeriodEndDate", $_SERVER["PHP_SELF"], "s.dateep", "", $param, 'width="140px"', $sortfield, $sortorder);
-            print_liste_field_titre("Label", $_SERVER["PHP_SELF"], "s.label", "", $param, '', $sortfield, $sortorder);
-            print_liste_field_titre("ExpectedToPay", $_SERVER["PHP_SELF"], "s.amount", "", $param, 'class="right"', $sortfield, $sortorder);
-            print_liste_field_titre("RefPayment", $_SERVER["PHP_SELF"], "s.rowid", "", $param, '', $sortfield, $sortorder);
-            print_liste_field_titre("DatePayment", $_SERVER["PHP_SELF"], "s.datep", "", $param, 'align="center"', $sortfield, $sortorder);
-            print_liste_field_titre("PayedByThisPayment", $_SERVER["PHP_SELF"], "s.amount", "", $param, 'class="right"', $sortfield, $sortorder);
-            print "</tr>\n";
-
-            while ($i < $num)
-            {
-                $obj = $db->fetch_object($result);
-
-                $total = $total + $obj->amount;
-
-                print '<tr class="oddeven">';
-
-                print '<td class="left">'.dol_print_date($db->jdate($obj->dateep), 'day').'</td>'."\n";
-
-                print "<td>".$obj->label."</td>\n";
-
-                print '<td class="right">'.($obj->salary ?price($obj->salary) : '')."</td>";
-
-                // Ref payment
-                $sal_static->id = $obj->rowid;
-                $sal_static->ref = $obj->rowid;
-                print '<td class="left">'.$sal_static->getNomUrl(1)."</td>\n";
-
-                print '<td class="center">'.dol_print_date($db->jdate($obj->datep), 'day')."</td>\n";
-                print '<td class="right">'.price($obj->amount)."</td>";
-                print "</tr>\n";
-
-                $i++;
-            }
-            print '<tr class="liste_total"><td colspan="2">'.$langs->trans("Total").'</td>';
-            print '<td class="right"></td>'; // A total here has no sense
-            print '<td align="center">&nbsp;</td>';
-            print '<td align="center">&nbsp;</td>';
-            print '<td class="right">'.price($total)."</td>";
-            print "</tr>";
-
-            print "</table>";
-            $db->free($result);
-
-            print "<br>";
-        } else {
-            dol_print_error($db);
-        }
-    }
-}
-
 print '</form>';
 
+$parameters = array('user' => $user);
+$reshook = $hookmanager->executeHooks('dashboardSpecialBills', $parameters, $object); // Note that $action and $object may have been modified by hook
+
 // End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/compta/stats/cabyprodserv.php b/htdocs/compta/stats/cabyprodserv.php
index 78ae1ff3592..485a6088338 100644
--- a/htdocs/compta/stats/cabyprodserv.php
+++ b/htdocs/compta/stats/cabyprodserv.php
@@ -226,8 +226,8 @@ if ($modecompta == 'CREANCES-DETTES')
 	$sql .= " SUM(l.total_ht) as amount, SUM(l.total_ttc) as amount_ttc,";
 	$sql .= " SUM(CASE WHEN f.type = 2 THEN -l.qty ELSE l.qty END) as qty";
 	$sql .= " FROM ".MAIN_DB_PREFIX."facture as f";
-    if ($selected_soc > 0) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as soc ON (soc.rowid = f.fk_soc)";
-    $sql .= ",".MAIN_DB_PREFIX."facturedet as l";
+	if ($selected_soc > 0) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as soc ON (soc.rowid = f.fk_soc)";
+	$sql .= ",".MAIN_DB_PREFIX."facturedet as l";
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON l.fk_product = p.rowid";
 	if ($selected_cat === -2) {	// Without any category
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."categorie_product as cp ON p.rowid = cp.fk_product";
@@ -252,24 +252,24 @@ if ($modecompta == 'CREANCES-DETTES')
 	if ($selected_cat === -2) {	// Without any category
 		$sql .= " AND cp.fk_product is null";
 	} elseif ($selected_cat) {	// Into a specific category
-        if ($subcat) {
-            $TListOfCats = $categorie->get_full_arbo('product', $selected_cat, 1);
+		if ($subcat) {
+			$TListOfCats = $categorie->get_full_arbo('product', $selected_cat, 1);
 
-            $listofcatsql = "";
-            foreach ($TListOfCats as $key => $cat)
-            {
-                if ($key !== 0) $listofcatsql .= ",";
-                $listofcatsql .= $cat['rowid'];
-            }
-        }
+			$listofcatsql = "";
+			foreach ($TListOfCats as $key => $cat)
+			{
+				if ($key !== 0) $listofcatsql .= ",";
+				$listofcatsql .= $cat['rowid'];
+			}
+		}
 
-        $sql.= " AND (p.rowid IN ";
-        $sql .= " (SELECT fk_product FROM ".MAIN_DB_PREFIX."categorie_product cp WHERE ";
-        if ($subcat) $sql .= "cp.fk_categorie IN (". $listofcatsql.")";
-        else $sql.="cp.fk_categorie = ".$selected_cat;
-        $sql.= "))";
+		$sql .= " AND (p.rowid IN ";
+		$sql .= " (SELECT fk_product FROM ".MAIN_DB_PREFIX."categorie_product cp WHERE ";
+		if ($subcat) $sql .= "cp.fk_categorie IN (".$listofcatsql.")";
+		else $sql .= "cp.fk_categorie = ".$selected_cat;
+		$sql .= "))";
 	}
-    if ($selected_soc > 0) $sql .= " AND soc.rowid=".$selected_soc;
+	if ($selected_soc > 0) $sql .= " AND soc.rowid=".$selected_soc;
 	$sql .= " AND f.entity IN (".getEntity('invoice').")";
 	$sql .= " GROUP BY p.rowid, p.ref, p.label, p.fk_product_type";
 	$sql .= $db->order($sortfield, $sortorder);
@@ -305,10 +305,10 @@ if ($modecompta == 'CREANCES-DETTES')
 		print '<input type="hidden" name="'.$key.'" value="'.$value.'">';
 	}
 
-    $moreforfilter = '';
+	$moreforfilter = '';
 
-    print '<div class="div-table-responsive">';
-    print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
+	print '<div class="div-table-responsive">';
+	print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 	// Category filter
 	print '<tr class="liste_titre">';
@@ -321,17 +321,17 @@ if ($modecompta == 'CREANCES-DETTES')
 		print ' checked';
 	}
 	print '>';
-    // type filter (produit/service)
-    print ' ';
-    print $langs->trans("Type").': ';
-    $form->select_type_of_lines(isset($selected_type) ? $selected_type : -1, 'search_type', 1, 1, 1);
+	// type filter (produit/service)
+	print ' ';
+	print $langs->trans("Type").': ';
+	$form->select_type_of_lines(isset($selected_type) ? $selected_type : -1, 'search_type', 1, 1, 1);
 
-    //select thirdparty
-    print '</br>';
-    print $langs->trans("ThirdParty").': '.$form->select_thirdparty_list($selected_soc, 'search_soc', '', 1);
-    print '</td>';
+	//select thirdparty
+	print '</br>';
+	print $langs->trans("ThirdParty").': '.$form->select_thirdparty_list($selected_soc, 'search_soc', '', 1);
+	print '</td>';
 
-    print '<td colspan="5" class="right">';
+	print '<td colspan="5" class="right">';
 	print '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"), 'search.png', '', '', 1).'"  value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
 	print '</td></tr>';
 
diff --git a/htdocs/compta/stats/cabyuser.php b/htdocs/compta/stats/cabyuser.php
index 33e69c3cf4c..2e46e306030 100644
--- a/htdocs/compta/stats/cabyuser.php
+++ b/htdocs/compta/stats/cabyuser.php
@@ -59,9 +59,9 @@ $date_endmonth = GETPOST("date_endmonth");
 $date_endday = GETPOST("date_endday");
 if (empty($year))
 {
-    $year_current = strftime("%Y", dol_now());
-    $month_current = strftime("%m", dol_now());
-    $year_start = $year_current;
+	$year_current = strftime("%Y", dol_now());
+	$month_current = strftime("%m", dol_now());
+	$year_start = $year_current;
 } else {
 	$year_current = $year;
 	$month_current = strftime("%m", dol_now());
@@ -130,7 +130,7 @@ $headerparams = array_merge($commonparams, $headerparams);
 $tableparams = array_merge($commonparams, $tableparams);
 
 foreach ($allparams as $key => $value) {
-    $paramslink .= '&'.$key.'='.$value;
+	$paramslink .= '&'.$key.'='.$value;
 }
 
 /*
@@ -147,23 +147,23 @@ if ($modecompta == "BOOKKEEPINGCOLLECTED") $modecompta = "RECETTES-DEPENSES";
 
 // Show report header
 if ($modecompta == "CREANCES-DETTES") {
-    $name = $langs->trans("Turnover").', '.$langs->trans("ByUserAuthorOfInvoice");
-    $calcmode = $langs->trans("CalcModeDebt");
-    //$calcmode.='<br>('.$langs->trans("SeeReportInInputOutputMode",'<a href="'.$_SERVER["PHP_SELF"].'?year='.$year_start.'&modecompta=RECETTES-DEPENSES">','</a>').')';
-    $description = $langs->trans("RulesCADue");
+	$name = $langs->trans("Turnover").', '.$langs->trans("ByUserAuthorOfInvoice");
+	$calcmode = $langs->trans("CalcModeDebt");
+	//$calcmode.='<br>('.$langs->trans("SeeReportInInputOutputMode",'<a href="'.$_SERVER["PHP_SELF"].'?year='.$year_start.'&modecompta=RECETTES-DEPENSES">','</a>').')';
+	$description = $langs->trans("RulesCADue");
 	if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $description .= $langs->trans("DepositsAreNotIncluded");
 	else $description .= $langs->trans("DepositsAreIncluded");
-    $builddate = dol_now();
-    //$exportlink=$langs->trans("NotYetAvailable");
+	$builddate = dol_now();
+	//$exportlink=$langs->trans("NotYetAvailable");
 } elseif ($modecompta == "RECETTES-DEPENSES")
 {
 	$name = $langs->trans("TurnoverCollected").', '.$langs->trans("ByUserAuthorOfInvoice");
 	$calcmode = $langs->trans("CalcModeEngagement");
 	//$calcmode.='<br>('.$langs->trans("SeeReportInDueDebtMode",'<a href="'.$_SERVER["PHP_SELF"].'?year='.$year_start.'&modecompta=CREANCES-DETTES">','</a>').')';
-    $description = $langs->trans("RulesCAIn");
+	$description = $langs->trans("RulesCAIn");
 	$description .= $langs->trans("DepositsAreIncluded");
-    $builddate = dol_now();
-    //$exportlink=$langs->trans("NotYetAvailable");
+	$builddate = dol_now();
+	//$exportlink=$langs->trans("NotYetAvailable");
 } elseif ($modecompta == "BOOKKEEPING")
 {
 	// TODO
@@ -182,7 +182,7 @@ report_header($name, $namelink, $period, $periodlink, $description, $builddate,
 
 if (!empty($conf->accounting->enabled) && $modecompta != 'BOOKKEEPING')
 {
-    print info_admin($langs->trans("WarningReportNotReliable"), 0, 0, 1);
+	print info_admin($langs->trans("WarningReportNotReliable"), 0, 0, 1);
 }
 
 
@@ -194,25 +194,25 @@ print '<input type="hidden" name="token" value="'.newToken().'">'."\n";
 // Extra parameters management
 foreach ($headerparams as $key => $value)
 {
-     print '<input type="hidden" name="'.$key.'" value="'.$value.'">';
+	 print '<input type="hidden" name="'.$key.'" value="'.$value.'">';
 }
 
 $catotal = 0;
 if ($modecompta == 'CREANCES-DETTES') {
-    $sql = "SELECT u.rowid as rowid, u.lastname as name, u.firstname as firstname, sum(f.total) as amount, sum(f.total_ttc) as amount_ttc";
-    $sql .= " FROM ".MAIN_DB_PREFIX."user as u";
-    $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."facture as f ON f.fk_user_author = u.rowid";
-    $sql .= " WHERE f.fk_statut in (1,2)";
+	$sql = "SELECT u.rowid as rowid, u.lastname as name, u.firstname as firstname, sum(f.total) as amount, sum(f.total_ttc) as amount_ttc";
+	$sql .= " FROM ".MAIN_DB_PREFIX."user as u";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."facture as f ON f.fk_user_author = u.rowid";
+	$sql .= " WHERE f.fk_statut in (1,2)";
 	if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
-	    $sql .= " AND f.type IN (0,1,2,5)";
-    } else {
-	    $sql .= " AND f.type IN (0,1,2,3,5)";
+		$sql .= " AND f.type IN (0,1,2,5)";
+	} else {
+		$sql .= " AND f.type IN (0,1,2,3,5)";
 	}
 	if ($date_start && $date_end) {
-	    $sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
+		$sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
 	}
 } else {
-    /*
+	/*
      * Liste des paiements (les anciens paiements ne sont pas vus par cette requete car, sur les
      * vieilles versions, ils n'etaient pas lies via paiement_facture. On les ajoute plus loin)
      */
@@ -223,7 +223,7 @@ if ($modecompta == 'CREANCES-DETTES') {
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."paiement as p ON p.rowid = pf.fk_paiement";
 	$sql .= " WHERE 1=1";
 	if ($date_start && $date_end) {
-	    $sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
+		$sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
 	}
 }
 $sql .= " AND f.entity IN (".getEntity('invoice').")";
@@ -231,54 +231,57 @@ if ($socid) $sql .= " AND f.fk_soc = ".$socid;
 $sql .= " GROUP BY u.rowid, u.lastname, u.firstname";
 $sql .= " ORDER BY u.rowid";
 
+$amount = array();
+
+dol_syslog("cabyuser", LOG_DEBUG);
 $result = $db->query($sql);
 if ($result) {
-    $num = $db->num_rows($result);
-    $i = 0;
-    while ($i < $num) {
-         $obj = $db->fetch_object($result);
-        $amount_ht[$obj->rowid] = $obj->amount;
-        $amount[$obj->rowid] = $obj->amount_ttc;
-        $name[$obj->rowid] = $obj->name.' '.$obj->firstname;
-        $catotal_ht += $obj->amount;
-        $catotal += $obj->amount_ttc;
-        $i++;
-    }
+	$num = $db->num_rows($result);
+	$i = 0;
+	while ($i < $num) {
+		 $obj = $db->fetch_object($result);
+		$amount_ht[$obj->rowid] = $obj->amount;
+		$amount[$obj->rowid] = $obj->amount_ttc;
+		$name[$obj->rowid] = $obj->name.' '.$obj->firstname;
+		$catotal_ht += $obj->amount;
+		$catotal += $obj->amount_ttc;
+		$i++;
+	}
 } else {
-    dol_print_error($db);
+	dol_print_error($db);
 }
 
 // Adding old-version payments, non-bound by "paiement_facture" then without User
 if ($modecompta != 'CREANCES-DETTES') {
-    $sql = "SELECT -1 as rowidx, '' as name, '' as firstname, sum(DISTINCT p.amount) as amount_ttc";
-    $sql .= " FROM ".MAIN_DB_PREFIX."bank as b";
-    $sql .= ", ".MAIN_DB_PREFIX."bank_account as ba";
-    $sql .= ", ".MAIN_DB_PREFIX."paiement as p";
-    $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON p.rowid = pf.fk_paiement";
-    $sql .= " WHERE pf.rowid IS NULL";
-    $sql .= " AND p.fk_bank = b.rowid";
-    $sql .= " AND b.fk_account = ba.rowid";
-    $sql .= " AND ba.entity IN (".getEntity('bank_account').")";
+	$sql = "SELECT -1 as rowidx, '' as name, '' as firstname, sum(DISTINCT p.amount) as amount_ttc";
+	$sql .= " FROM ".MAIN_DB_PREFIX."bank as b";
+	$sql .= ", ".MAIN_DB_PREFIX."bank_account as ba";
+	$sql .= ", ".MAIN_DB_PREFIX."paiement as p";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON p.rowid = pf.fk_paiement";
+	$sql .= " WHERE pf.rowid IS NULL";
+	$sql .= " AND p.fk_bank = b.rowid";
+	$sql .= " AND b.fk_account = ba.rowid";
+	$sql .= " AND ba.entity IN (".getEntity('bank_account').")";
 	if ($date_start && $date_end) {
-	    $sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
+		$sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
 	}
-    $sql .= " GROUP BY rowidx, name, firstname";
-    $sql .= " ORDER BY rowidx";
+	$sql .= " GROUP BY rowidx, name, firstname";
+	$sql .= " ORDER BY rowidx";
 
-    $result = $db->query($sql);
-    if ($result) {
-        $num = $db->num_rows($result);
-        $i = 0;
-        while ($i < $num) {
-            $obj = $db->fetch_object($result);
-            $amount[$obj->rowidx] = $obj->amount_ttc;
-            $name[$obj->rowidx] = $obj->name.' '.$obj->firstname;
-            $catotal += $obj->amount_ttc;
-            $i++;
-        }
-    } else {
-        dol_print_error($db);
-    }
+	$result = $db->query($sql);
+	if ($result) {
+		$num = $db->num_rows($result);
+		$i = 0;
+		while ($i < $num) {
+			$obj = $db->fetch_object($result);
+			$amount[$obj->rowidx] = $obj->amount_ttc;
+			$name[$obj->rowidx] = $obj->name.' '.$obj->firstname;
+			$catotal += $obj->amount_ttc;
+			$i++;
+		}
+	} else {
+		dol_print_error($db);
+	}
 }
 
 $moreforfilter = '';
@@ -298,15 +301,15 @@ print_liste_field_titre(
 	$sortorder
 );
 if ($modecompta == 'CREANCES-DETTES') {
-    print_liste_field_titre(
-           $langs->trans('AmountHT'),
-           $_SERVER["PHP_SELF"],
-           "amount_ht",
-           "",
-           $paramslink,
-           'class="right"',
-           $sortfield,
-           $sortorder
+	print_liste_field_titre(
+		   $langs->trans('AmountHT'),
+		   $_SERVER["PHP_SELF"],
+		   "amount_ht",
+		   "",
+		   $paramslink,
+		   'class="right"',
+		   $sortfield,
+		   $sortorder
 	);
 } else {
 	print_liste_field_titre('');
@@ -341,129 +344,129 @@ print_liste_field_titre(
 print "</tr>\n";
 
 if (count($amount)) {
-    $arrayforsort = $name;
+	$arrayforsort = $name;
 
-    // We define arrayforsort
-    if ($sortfield == 'name' && $sortorder == 'asc') {
-        asort($name);
-        $arrayforsort = $name;
-    }
-    if ($sortfield == 'name' && $sortorder == 'desc') {
-        arsort($name);
-        $arrayforsort = $name;
-    }
-    if ($sortfield == 'amount_ht' && $sortorder == 'asc') {
-        asort($amount_ht);
-        $arrayforsort = $amount_ht;
-    }
-    if ($sortfield == 'amount_ht' && $sortorder == 'desc') {
-        arsort($amount_ht);
-        $arrayforsort = $amount_ht;
-    }
-    if ($sortfield == 'amount_ttc' && $sortorder == 'asc') {
-        asort($amount);
-        $arrayforsort = $amount;
-    }
-    if ($sortfield == 'amount_ttc' && $sortorder == 'desc') {
-        arsort($amount);
-        $arrayforsort = $amount;
-    }
+	// We define arrayforsort
+	if ($sortfield == 'name' && $sortorder == 'asc') {
+		asort($name);
+		$arrayforsort = $name;
+	}
+	if ($sortfield == 'name' && $sortorder == 'desc') {
+		arsort($name);
+		$arrayforsort = $name;
+	}
+	if ($sortfield == 'amount_ht' && $sortorder == 'asc') {
+		asort($amount_ht);
+		$arrayforsort = $amount_ht;
+	}
+	if ($sortfield == 'amount_ht' && $sortorder == 'desc') {
+		arsort($amount_ht);
+		$arrayforsort = $amount_ht;
+	}
+	if ($sortfield == 'amount_ttc' && $sortorder == 'asc') {
+		asort($amount);
+		$arrayforsort = $amount;
+	}
+	if ($sortfield == 'amount_ttc' && $sortorder == 'desc') {
+		arsort($amount);
+		$arrayforsort = $amount;
+	}
 
-    $i = 0;
+	$i = 0;
 
-    foreach ($arrayforsort as $key => $value) {
-        print '<tr class="oddeven">';
+	foreach ($arrayforsort as $key => $value) {
+		print '<tr class="oddeven">';
 
-        // Third party
-        $fullname = $name[$key];
-        if ($key >= 0) {
-            $linkname = '<a href="'.DOL_URL_ROOT.'/user/card.php?id='.$key.'">'.img_object($langs->trans("ShowUser"), 'user').' '.$fullname.'</a>';
-        } else {
-            $linkname = $langs->trans("PaymentsNotLinkedToUser");
-        }
-        print "<td>".$linkname."</td>\n";
+		// Third party
+		$fullname = $name[$key];
+		if ($key >= 0) {
+			$linkname = '<a href="'.DOL_URL_ROOT.'/user/card.php?id='.$key.'">'.img_object($langs->trans("ShowUser"), 'user').' '.$fullname.'</a>';
+		} else {
+			$linkname = $langs->trans("PaymentsNotLinkedToUser");
+		}
+		print "<td>".$linkname."</td>\n";
 
-        // Amount w/o VAT
-        print '<td class="right">';
-        if ($modecompta == 'RECETTES-DEPENSES') {
-            if ($key > 0) {
-                //print '<a href="'.DOL_URL_ROOT.'/compta/paiement/list.php?userid='.$key.'">';
-            } else {
-                //print '<a href="'.DOL_URL_ROOT.'/compta/paiement/list.php?userid=-1">';
-            }
-        } elseif ($modecompta == 'CREANCES-DETTES') {
-            if ($key > 0) {
-                print '<a href="'.DOL_URL_ROOT.'/compta/facture/list.php?userid='.$key.'">';
-            } else {
-                //print '<a href="#">';
-            }
-            print price($amount_ht[$key]);
-            if ($key > 0) print '</a>';
-        }
-        print '</td>';
+		// Amount w/o VAT
+		print '<td class="right">';
+		if ($modecompta == 'RECETTES-DEPENSES') {
+			if ($key > 0) {
+				//print '<a href="'.DOL_URL_ROOT.'/compta/paiement/list.php?userid='.$key.'">';
+			} else {
+				//print '<a href="'.DOL_URL_ROOT.'/compta/paiement/list.php?userid=-1">';
+			}
+		} elseif ($modecompta == 'CREANCES-DETTES') {
+			if ($key > 0) {
+				print '<a href="'.DOL_URL_ROOT.'/compta/facture/list.php?userid='.$key.'">';
+			} else {
+				//print '<a href="#">';
+			}
+			print price($amount_ht[$key]);
+			if ($key > 0) print '</a>';
+		}
+		print '</td>';
 
-        // Amount with VAT
-        print '<td class="right">';
-        if ($modecompta == 'RECETTES-DEPENSES') {
-            if ($key > 0) {
-                //print '<a href="'.DOL_URL_ROOT.'/compta/paiement/list.php?userid='.$key.'">';
-            } else {
-                //print '<a href="'.DOL_URL_ROOT.'/compta/paiement/list.php?userid=-1">';
-            }
-        } elseif ($modecompta == 'CREANCES-DETTES') {
-            if ($key > 0) {
-                print '<a href="'.DOL_URL_ROOT.'/compta/facture/list.php?userid='.$key.'">';
-            } else {
-                //print '<a href="#">';
-            }
-        }
-        print price($amount[$key]);
-        if ($modecompta == 'RECETTES-DEPENSES') {
-        	if ($key > 0) {
-        		//print '</a>';
-        	} else {
-        		//print '</a>';
-        	}
-        } elseif ($modecompta == 'CREANCES-DETTES') {
-        	if ($key > 0) {
-        		print '</a>';
-        	}
-        }
-        print '</td>';
+		// Amount with VAT
+		print '<td class="right">';
+		if ($modecompta == 'RECETTES-DEPENSES') {
+			if ($key > 0) {
+				//print '<a href="'.DOL_URL_ROOT.'/compta/paiement/list.php?userid='.$key.'">';
+			} else {
+				//print '<a href="'.DOL_URL_ROOT.'/compta/paiement/list.php?userid=-1">';
+			}
+		} elseif ($modecompta == 'CREANCES-DETTES') {
+			if ($key > 0) {
+				print '<a href="'.DOL_URL_ROOT.'/compta/facture/list.php?userid='.$key.'">';
+			} else {
+				//print '<a href="#">';
+			}
+		}
+		print price($amount[$key]);
+		if ($modecompta == 'RECETTES-DEPENSES') {
+			if ($key > 0) {
+				//print '</a>';
+			} else {
+				//print '</a>';
+			}
+		} elseif ($modecompta == 'CREANCES-DETTES') {
+			if ($key > 0) {
+				print '</a>';
+			}
+		}
+		print '</td>';
 
-        // Percent
-        print '<td class="right">'.($catotal > 0 ? round(100 * $amount[$key] / $catotal, 2).'%' : '&nbsp;').'</td>';
+		// Percent
+		print '<td class="right">'.($catotal > 0 ? round(100 * $amount[$key] / $catotal, 2).'%' : '&nbsp;').'</td>';
 
-        // Other stats
-        print '<td class="center">';
-        if (!empty($conf->propal->enabled) && $key > 0) {
-            print '&nbsp;<a href="'.DOL_URL_ROOT.'/comm/propal/stats/index.php?userid='.$key.'">'.img_picto($langs->trans("ProposalStats"), "stats").'</a>&nbsp;';
-        }
-        if (!empty($conf->commande->enabled) && $key > 0) {
-            print '&nbsp;<a href="'.DOL_URL_ROOT.'/commande/stats/index.php?userid='.$key.'">'.img_picto($langs->trans("OrderStats"), "stats").'</a>&nbsp;';
-        }
-        if (!empty($conf->facture->enabled) && $key > 0) {
-            print '&nbsp;<a href="'.DOL_URL_ROOT.'/compta/facture/stats/index.php?userid='.$key.'">'.img_picto($langs->trans("InvoiceStats"), "stats").'</a>&nbsp;';
-        }
-        print '</td>';
-        print "</tr>\n";
-        $i++;
-    }
+		// Other stats
+		print '<td class="center">';
+		if (!empty($conf->propal->enabled) && $key > 0) {
+			print '&nbsp;<a href="'.DOL_URL_ROOT.'/comm/propal/stats/index.php?userid='.$key.'">'.img_picto($langs->trans("ProposalStats"), "stats").'</a>&nbsp;';
+		}
+		if (!empty($conf->commande->enabled) && $key > 0) {
+			print '&nbsp;<a href="'.DOL_URL_ROOT.'/commande/stats/index.php?userid='.$key.'">'.img_picto($langs->trans("OrderStats"), "stats").'</a>&nbsp;';
+		}
+		if (!empty($conf->facture->enabled) && $key > 0) {
+			print '&nbsp;<a href="'.DOL_URL_ROOT.'/compta/facture/stats/index.php?userid='.$key.'">'.img_picto($langs->trans("InvoiceStats"), "stats").'</a>&nbsp;';
+		}
+		print '</td>';
+		print "</tr>\n";
+		$i++;
+	}
 
-    // Total
-    print '<tr class="liste_total">';
-    print '<td>'.$langs->trans("Total").'</td>';
-    if ($modecompta != 'CREANCES-DETTES') {
-        print '<td></td>';
-    } else {
-        print '<td class="right">'.price($catotal_ht).'</td>';
-    }
-    print '<td class="right">'.price($catotal).'</td>';
-    print '<td>&nbsp;</td>';
-    print '<td>&nbsp;</td>';
-    print '</tr>';
+	// Total
+	print '<tr class="liste_total">';
+	print '<td>'.$langs->trans("Total").'</td>';
+	if ($modecompta != 'CREANCES-DETTES') {
+		print '<td></td>';
+	} else {
+		print '<td class="right">'.price($catotal_ht).'</td>';
+	}
+	print '<td class="right">'.price($catotal).'</td>';
+	print '<td>&nbsp;</td>';
+	print '<td>&nbsp;</td>';
+	print '</tr>';
 
-    $db->free($result);
+	$db->free($result);
 }
 
 print "</table>";
diff --git a/htdocs/compta/stats/casoc.php b/htdocs/compta/stats/casoc.php
index a02d87a8392..8fa06046076 100644
--- a/htdocs/compta/stats/casoc.php
+++ b/htdocs/compta/stats/casoc.php
@@ -53,7 +53,7 @@ $socid = GETPOST('socid', 'int');
 $selected_cat = (int) GETPOST('search_categ', 'int');
 $subcat = false;
 if (GETPOST('subcat', 'alpha') === 'yes') {
-    $subcat = true;
+	$subcat = true;
 }
 
 // Security check
@@ -155,7 +155,7 @@ $headerparams = array_merge($commonparams, $headerparams);
 $tableparams = array_merge($commonparams, $tableparams);
 
 foreach ($allparams as $key => $value) {
-    $paramslink .= '&'.$key.'='.$value;
+	$paramslink .= '&'.$key.'='.$value;
 }
 
 
@@ -206,7 +206,7 @@ report_header($name, $namelink, $period, $periodlink, $description, $builddate,
 
 if (!empty($conf->accounting->enabled) && $modecompta != 'BOOKKEEPING')
 {
-    print info_admin($langs->trans("WarningReportNotReliable"), 0, 0, 1);
+	print info_admin($langs->trans("WarningReportNotReliable"), 0, 0, 1);
 }
 
 
@@ -220,28 +220,28 @@ if ($modecompta == 'CREANCES-DETTES') {
 	$sql .= " FROM ".MAIN_DB_PREFIX."facture as f, ".MAIN_DB_PREFIX."societe as s";
 	if ($selected_cat === -2)	// Without any category
 	{
-	    $sql .= " LEFT OUTER JOIN ".MAIN_DB_PREFIX."categorie_societe as cs ON s.rowid = cs.fk_soc";
+		$sql .= " LEFT OUTER JOIN ".MAIN_DB_PREFIX."categorie_societe as cs ON s.rowid = cs.fk_soc";
 	} elseif ($selected_cat) 	// Into a specific category
 	{
-	    $sql .= ", ".MAIN_DB_PREFIX."categorie as c, ".MAIN_DB_PREFIX."categorie_societe as cs";
+		$sql .= ", ".MAIN_DB_PREFIX."categorie as c, ".MAIN_DB_PREFIX."categorie_societe as cs";
 	}
 	$sql .= " WHERE f.fk_statut in (1,2)";
 	if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
-	    $sql .= " AND f.type IN (0,1,2,5)";
+		$sql .= " AND f.type IN (0,1,2,5)";
 	} else {
-	    $sql .= " AND f.type IN (0,1,2,3,5)";
+		$sql .= " AND f.type IN (0,1,2,3,5)";
 	}
 	$sql .= " AND f.fk_soc = s.rowid";
 	if ($date_start && $date_end) {
-	    $sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
+		$sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
 	}
 	if ($selected_cat === -2)	// Without any category
 	{
-	    $sql .= " AND cs.fk_soc is null";
+		$sql .= " AND cs.fk_soc is null";
 	} elseif ($selected_cat) {	// Into a specific category
-	    $sql .= " AND (c.rowid = ".$db->escape($selected_cat);
-	    if ($subcat) $sql .= " OR c.fk_parent = ".$db->escape($selected_cat);
-	    $sql .= ")";
+		$sql .= " AND (c.rowid = ".$db->escape($selected_cat);
+		if ($subcat) $sql .= " OR c.fk_parent = ".$db->escape($selected_cat);
+		$sql .= ")";
 		$sql .= " AND cs.fk_categorie = c.rowid AND cs.fk_soc = s.rowid";
 	}
 } else {
@@ -256,24 +256,24 @@ if ($modecompta == 'CREANCES-DETTES') {
 	$sql .= ", ".MAIN_DB_PREFIX."societe as s";
 	if ($selected_cat === -2)	// Without any category
 	{
-	    $sql .= " LEFT OUTER JOIN ".MAIN_DB_PREFIX."categorie_societe as cs ON s.rowid = cs.fk_soc";
+		$sql .= " LEFT OUTER JOIN ".MAIN_DB_PREFIX."categorie_societe as cs ON s.rowid = cs.fk_soc";
 	} elseif ($selected_cat) 	// Into a specific category
 	{
-	    $sql .= ", ".MAIN_DB_PREFIX."categorie as c, ".MAIN_DB_PREFIX."categorie_societe as cs";
+		$sql .= ", ".MAIN_DB_PREFIX."categorie as c, ".MAIN_DB_PREFIX."categorie_societe as cs";
 	}
 	$sql .= " WHERE p.rowid = pf.fk_paiement";
 	$sql .= " AND pf.fk_facture = f.rowid";
 	$sql .= " AND f.fk_soc = s.rowid";
 	if ($date_start && $date_end) {
-	    $sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
+		$sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
 	}
 	if ($selected_cat === -2)	// Without any category
 	{
-	    $sql .= " AND cs.fk_soc is null";
+		$sql .= " AND cs.fk_soc is null";
 	} elseif ($selected_cat) {	// Into a specific category
-	    $sql .= " AND (c.rowid = ".$selected_cat;
-	    if ($subcat) $sql .= " OR c.fk_parent = ".$selected_cat;
-	    $sql .= ")";
+		$sql .= " AND (c.rowid = ".$selected_cat;
+		if ($subcat) $sql .= " OR c.fk_parent = ".$selected_cat;
+		$sql .= ")";
 		$sql .= " AND cs.fk_categorie = c.rowid AND cs.fk_soc = s.rowid";
 	}
 }
@@ -287,6 +287,8 @@ $sql .= " GROUP BY s.rowid, s.nom, s.zip, s.town, s.fk_pays";
 $sql .= " ORDER BY s.rowid";
 //echo $sql;
 
+$amount = array();
+
 dol_syslog("casoc", LOG_DEBUG);
 $result = $db->query($sql);
 if ($result) {
@@ -294,15 +296,15 @@ if ($result) {
 	$i = 0;
 	while ($i < $num) {
 		$obj = $db->fetch_object($result);
-	        $amount_ht[$obj->socid] = $obj->amount;
-	        $amount[$obj->socid] = $obj->amount_ttc;
-	        $name[$obj->socid] = $obj->name.' '.$obj->firstname;
+			$amount_ht[$obj->socid] = $obj->amount;
+			$amount[$obj->socid] = $obj->amount_ttc;
+			$name[$obj->socid] = $obj->name.' '.$obj->firstname;
 			$address_zip[$obj->socid] = $obj->zip;
 			$address_town[$obj->socid] = $obj->town;
 			$address_pays[$obj->socid] = getCountry($obj->fk_pays);
-	        $catotal_ht += $obj->amount;
-	        $catotal += $obj->amount_ttc;
-	        $i++;
+			$catotal_ht += $obj->amount;
+			$catotal += $obj->amount_ttc;
+			$i++;
 	}
 } else {
 	dol_print_error($db);
@@ -350,7 +352,7 @@ print '<input type="hidden" name="token" value="'.newToken().'">'."\n";
 // Extra parameters management
 foreach ($headerparams as $key => $value)
 {
-     print '<input type="hidden" name="'.$key.'" value="'.$value.'">';
+	 print '<input type="hidden" name="'.$key.'" value="'.$value.'">';
 }
 
 $moreforfilter = '';
@@ -366,7 +368,7 @@ print ' ';
 print $langs->trans("SubCats").'? ';
 print '<input type="checkbox" name="subcat" value="yes"';
 if ($subcat) {
-    print ' checked';
+	print ' checked';
 }
 print'></td>';
 print '<td colspan="7" class="right">';
@@ -433,18 +435,18 @@ print_liste_field_titre(
 	$sortfield, $sortorder
 	);
 if ($modecompta == 'CREANCES-DETTES') {
-    print_liste_field_titre(
-           $langs->trans('AmountHT'),
-           $_SERVER["PHP_SELF"],
-           "amount_ht",
-           "",
-           $paramslink,
-           'class="right"',
-           $sortfield,
-           $sortorder
-    );
+	print_liste_field_titre(
+		   $langs->trans('AmountHT'),
+		   $_SERVER["PHP_SELF"],
+		   "amount_ht",
+		   "",
+		   $paramslink,
+		   'class="right"',
+		   $sortfield,
+		   $sortorder
+	);
 } else {
-    print_liste_field_titre('');
+	print_liste_field_titre('');
 }
 print_liste_field_titre(
 	$langs->trans("AmountTTC"),
@@ -489,12 +491,12 @@ if (count($amount)) {
 		$arrayforsort = $name;
 	}
 	if ($sortfield == 'amount_ht' && $sortorder == 'asc') {
-	    asort($amount_ht);
-	    $arrayforsort = $amount_ht;
+		asort($amount_ht);
+		$arrayforsort = $amount_ht;
 	}
 	if ($sortfield == 'amount_ht' && $sortorder == 'desc') {
-	    arsort($amount_ht);
-	    $arrayforsort = $amount_ht;
+		arsort($amount_ht);
+		$arrayforsort = $amount_ht;
 	}
 	if ($sortfield == 'amount_ttc' && $sortorder == 'asc') {
 		asort($amount);
@@ -535,10 +537,10 @@ if (count($amount)) {
 		// Third party
 		$fullname = $name[$key];
 		if ($key > 0) {
-		    $thirdparty_static->id = $key;
-		    $thirdparty_static->name = $fullname;
-		    $thirdparty_static->client = 1;
-		    $linkname = $thirdparty_static->getNomUrl(1, 'customer');
+			$thirdparty_static->id = $key;
+			$thirdparty_static->name = $fullname;
+			$thirdparty_static->client = 1;
+			$linkname = $thirdparty_static->getNomUrl(1, 'customer');
 		} else {
 			$linkname = $langs->trans("PaymentsNotLinkedToInvoice");
 		}
@@ -559,35 +561,35 @@ if (count($amount)) {
 		// Amount w/o VAT
 		print '<td class="right">';
 		if ($modecompta != 'CREANCES-DETTES') {
-            if ($key > 0) {
-                print '<a href="'.DOL_URL_ROOT.'/compta/paiement/list.php?socid='.$key.'">';
-		    } else {
-                print '<a href="'.DOL_URL_ROOT.'/compta/paiement/list.php?socid=-1">';
-            }
+			if ($key > 0) {
+				print '<a href="'.DOL_URL_ROOT.'/compta/paiement/list.php?socid='.$key.'">';
+			} else {
+				print '<a href="'.DOL_URL_ROOT.'/compta/paiement/list.php?socid=-1">';
+			}
 		} else {
-		    if ($key > 0) {
-                print '<a href="'.DOL_URL_ROOT.'/compta/facture/list.php?socid='.$key.'">';
-		    } else {
-                print '<a href="#">';
-		    }
-            print price($amount_ht[$key]);
+			if ($key > 0) {
+				print '<a href="'.DOL_URL_ROOT.'/compta/facture/list.php?socid='.$key.'">';
+			} else {
+				print '<a href="#">';
+			}
+			print price($amount_ht[$key]);
 		}
 		print '</td>';
 
 		// Amount with VAT
 		print '<td class="right">';
 		if ($modecompta != 'CREANCES-DETTES') {
-            if ($key > 0) {
-                print '<a href="'.DOL_URL_ROOT.'/compta/paiement/list.php?socid='.$key.'">';
-		    } else {
-                print '<a href="'.DOL_URL_ROOT.'/compta/paiement/list.php?orphelins=1">';
-		    }
+			if ($key > 0) {
+				print '<a href="'.DOL_URL_ROOT.'/compta/paiement/list.php?socid='.$key.'">';
+			} else {
+				print '<a href="'.DOL_URL_ROOT.'/compta/paiement/list.php?orphelins=1">';
+			}
 		} else {
-            if ($key > 0) {
-                print '<a href="'.DOL_URL_ROOT.'/compta/facture/list.php?socid='.$key.'">';
-		    } else {
-                print '<a href="#">';
-		    }
+			if ($key > 0) {
+				print '<a href="'.DOL_URL_ROOT.'/compta/facture/list.php?socid='.$key.'">';
+			} else {
+				print '<a href="#">';
+			}
 		}
 		print price($amount[$key]);
 		print '</a>';
@@ -596,21 +598,21 @@ if (count($amount)) {
 		// Percent;
 		print '<td class="right">'.($catotal > 0 ? round(100 * $amount[$key] / $catotal, 2).'%' : '&nbsp;').'</td>';
 
-        // Other stats
-        print '<td class="center">';
-        if (!empty($conf->propal->enabled) && $key > 0) {
-            print '&nbsp;<a href="'.DOL_URL_ROOT.'/comm/propal/stats/index.php?socid='.$key.'">'.img_picto($langs->trans("ProposalStats"), "stats").'</a>&nbsp;';
-        }
-        if (!empty($conf->commande->enabled) && $key > 0) {
-            print '&nbsp;<a href="'.DOL_URL_ROOT.'/commande/stats/index.php?socid='.$key.'">'.img_picto($langs->trans("OrderStats"), "stats").'</a>&nbsp;';
-        }
-        if (!empty($conf->facture->enabled) && $key > 0) {
-            print '&nbsp;<a href="'.DOL_URL_ROOT.'/compta/facture/stats/index.php?socid='.$key.'">'.img_picto($langs->trans("InvoiceStats"), "stats").'</a>&nbsp;';
-        }
-        print '</td>';
-        print "</tr>\n";
-        $i++;
-    }
+		// Other stats
+		print '<td class="center">';
+		if (!empty($conf->propal->enabled) && $key > 0) {
+			print '&nbsp;<a href="'.DOL_URL_ROOT.'/comm/propal/stats/index.php?socid='.$key.'">'.img_picto($langs->trans("ProposalStats"), "stats").'</a>&nbsp;';
+		}
+		if (!empty($conf->commande->enabled) && $key > 0) {
+			print '&nbsp;<a href="'.DOL_URL_ROOT.'/commande/stats/index.php?socid='.$key.'">'.img_picto($langs->trans("OrderStats"), "stats").'</a>&nbsp;';
+		}
+		if (!empty($conf->facture->enabled) && $key > 0) {
+			print '&nbsp;<a href="'.DOL_URL_ROOT.'/compta/facture/stats/index.php?socid='.$key.'">'.img_picto($langs->trans("InvoiceStats"), "stats").'</a>&nbsp;';
+		}
+		print '</td>';
+		print "</tr>\n";
+		$i++;
+	}
 
 	// Total
 	print '<tr class="liste_total">';
@@ -619,9 +621,9 @@ if (count($amount)) {
 	print '<td>&nbsp;</td>';
 	print '<td>&nbsp;</td>';
 	if ($modecompta != 'CREANCES-DETTES') {
-	    print '<td></td>';
+		print '<td></td>';
 	} else {
-	    print '<td class="right">'.price($catotal_ht).'</td>';
+		print '<td class="right">'.price($catotal_ht).'</td>';
 	}
 	print '<td class="right">'.price($catotal).'</td>';
 	print '<td>&nbsp;</td>';
diff --git a/htdocs/compta/stats/index.php b/htdocs/compta/stats/index.php
index 796ce2cc6a6..49c0ff19d70 100644
--- a/htdocs/compta/stats/index.php
+++ b/htdocs/compta/stats/index.php
@@ -157,7 +157,7 @@ report_header($name, $namelink, $period, $periodlink, $description, $builddate,
 
 if (!empty($conf->accounting->enabled) && $modecompta != 'BOOKKEEPING')
 {
-    print info_admin($langs->trans("WarningReportNotReliable"), 0, 0, 1);
+	print info_admin($langs->trans("WarningReportNotReliable"), 0, 0, 1);
 }
 
 
@@ -271,9 +271,9 @@ for ($annee = $year_start; $annee <= $year_end; $annee++)
 	else print '<td align="center" width="10%" colspan="2" class="borderrightlight">';
 	if ($modecompta != 'BOOKKEEPING') print '<a href="casoc.php?year='.$annee.'">';
 	print $annee;
-    if ($conf->global->SOCIETE_FISCAL_MONTH_START > 1) print '-'.($annee + 1);
-    if ($modecompta != 'BOOKKEEPING') print '</a>';
-    print '</td>';
+	if ($conf->global->SOCIETE_FISCAL_MONTH_START > 1) print '-'.($annee + 1);
+	if ($modecompta != 'BOOKKEEPING') print '</a>';
+	print '</td>';
 	if ($annee != $year_end) print '<td width="15">&nbsp;</td>';
 }
 print '</tr>';
diff --git a/htdocs/compta/stats/supplier_turnover.php b/htdocs/compta/stats/supplier_turnover.php
index c257d5d1f73..f98518ae7ee 100644
--- a/htdocs/compta/stats/supplier_turnover.php
+++ b/htdocs/compta/stats/supplier_turnover.php
@@ -150,7 +150,7 @@ report_header($name, $namelink, $period, $periodlink, $description, $builddate,
 
 if (!empty($conf->accounting->enabled) && $modecompta != 'BOOKKEEPING')
 {
-    print info_admin($langs->trans("WarningReportNotReliable"), 0, 0, 1);
+	print info_admin($langs->trans("WarningReportNotReliable"), 0, 0, 1);
 }
 
 
@@ -223,9 +223,9 @@ for ($annee = $year_start; $annee <= $year_end; $annee++)
 	else print '<td align="center" width="10%" colspan="2" class="borderrightlight">';
 	if ($modecompta != 'BOOKKEEPING') print '<a href="supplier_turnover_by_thirdparty.php?year='.$annee.($modecompta ? '&modecompta='.$modecompta : '').'">';
 	print $annee;
-    if ($conf->global->SOCIETE_FISCAL_MONTH_START > 1) print '-'.($annee + 1);
-    if ($modecompta != 'BOOKKEEPING') print '</a>';
-    print '</td>';
+	if ($conf->global->SOCIETE_FISCAL_MONTH_START > 1) print '-'.($annee + 1);
+	if ($modecompta != 'BOOKKEEPING') print '</a>';
+	print '</td>';
 	if ($annee != $year_end) print '<td width="15">&nbsp;</td>';
 }
 print '</tr>';
diff --git a/htdocs/compta/stats/supplier_turnover_by_prodserv.php b/htdocs/compta/stats/supplier_turnover_by_prodserv.php
index 83a3cb70a00..18e03d05f8f 100644
--- a/htdocs/compta/stats/supplier_turnover_by_prodserv.php
+++ b/htdocs/compta/stats/supplier_turnover_by_prodserv.php
@@ -213,8 +213,8 @@ if ($modecompta == 'CREANCES-DETTES')
 	$sql .= " SUM(l.total_ht) as amount, SUM(l.total_ttc) as amount_ttc,";
 	$sql .= " SUM(CASE WHEN f.type = 2 THEN -l.qty ELSE l.qty END) as qty";
 	$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f";
-    if ($selected_soc > 0) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as soc ON (soc.rowid = f.fk_soc)";
-    $sql .= ",".MAIN_DB_PREFIX."facture_fourn_det as l";
+	if ($selected_soc > 0) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as soc ON (soc.rowid = f.fk_soc)";
+	$sql .= ",".MAIN_DB_PREFIX."facture_fourn_det as l";
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON l.fk_product = p.rowid";
 	if ($selected_cat === -2)	// Without any category
 	{
@@ -243,7 +243,7 @@ if ($modecompta == 'CREANCES-DETTES')
 		$sql .= ")";
 		$sql .= " AND cp.fk_categorie = c.rowid AND cp.fk_product = p.rowid";
 	}
-    if ($selected_soc > 0) $sql .= " AND soc.rowid=".$selected_soc;
+	if ($selected_soc > 0) $sql .= " AND soc.rowid=".$selected_soc;
 	$sql .= " AND f.entity IN (".getEntity('supplier_invoice').")";
 	$sql .= " GROUP BY p.rowid, p.ref, p.label, p.fk_product_type";
 	$sql .= $db->order($sortfield, $sortorder);
@@ -279,10 +279,10 @@ if ($modecompta == 'CREANCES-DETTES')
 		print '<input type="hidden" name="'.$key.'" value="'.$value.'">';
 	}
 
-    $moreforfilter = '';
+	$moreforfilter = '';
 
-    print '<div class="div-table-responsive">';
-    print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
+	print '<div class="div-table-responsive">';
+	print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 	// Category filter
 	print '<tr class="liste_titre">';
@@ -295,17 +295,17 @@ if ($modecompta == 'CREANCES-DETTES')
 		print ' checked';
 	}
 	print '>';
-    // type filter (produit/service)
-    print ' ';
-    print $langs->trans("Type").': ';
-    $form->select_type_of_lines(isset($selected_type) ? $selected_type : -1, 'search_type', 1, 1, 1);
+	// type filter (produit/service)
+	print ' ';
+	print $langs->trans("Type").': ';
+	$form->select_type_of_lines(isset($selected_type) ? $selected_type : -1, 'search_type', 1, 1, 1);
 
-    //select thirdparty
-    print '</br>';
-    print $langs->trans("ThirdParty").': '.$form->select_thirdparty_list($selected_soc, 'search_soc', '', 1);
-    print '</td>';
+	//select thirdparty
+	print '</br>';
+	print $langs->trans("ThirdParty").': '.$form->select_thirdparty_list($selected_soc, 'search_soc', '', 1);
+	print '</td>';
 
-    print '<td colspan="5" class="right">';
+	print '<td colspan="5" class="right">';
 	print '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"), 'search.png', '', '', 1).'"  value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
 	print '</td></tr>';
 
diff --git a/htdocs/compta/stats/supplier_turnover_by_thirdparty.php b/htdocs/compta/stats/supplier_turnover_by_thirdparty.php
index 7a624284cdf..a7f68644f7b 100644
--- a/htdocs/compta/stats/supplier_turnover_by_thirdparty.php
+++ b/htdocs/compta/stats/supplier_turnover_by_thirdparty.php
@@ -47,7 +47,7 @@ $socid = GETPOST('socid', 'int');
 $selected_cat = (int) GETPOST('search_categ', 'int');
 $subcat = false;
 if (GETPOST('subcat', 'alpha') === 'yes') {
-    $subcat = true;
+	$subcat = true;
 }
 
 // Hook
@@ -149,7 +149,7 @@ $headerparams = array_merge($commonparams, $headerparams);
 $tableparams = array_merge($commonparams, $tableparams);
 
 foreach ($allparams as $key => $value) {
-    $paramslink .= '&'.$key.'='.$value;
+	$paramslink .= '&'.$key.'='.$value;
 }
 
 
@@ -197,7 +197,7 @@ report_header($name, '', $period, $periodlink, $description, $builddate, $export
 
 if (!empty($conf->accounting->enabled) && $modecompta != 'BOOKKEEPING')
 {
-    print info_admin($langs->trans("WarningReportNotReliable"), 0, 0, 1);
+	print info_admin($langs->trans("WarningReportNotReliable"), 0, 0, 1);
 }
 
 // Show Array
@@ -212,24 +212,24 @@ if ($modecompta == 'CREANCES-DETTES') {
 	$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f, ".MAIN_DB_PREFIX."societe as s";
 	if ($selected_cat === -2)	// Without any category
 	{
-	    $sql .= " LEFT OUTER JOIN ".MAIN_DB_PREFIX."categorie_societe as cs ON s.rowid = cs.fk_soc";
+		$sql .= " LEFT OUTER JOIN ".MAIN_DB_PREFIX."categorie_societe as cs ON s.rowid = cs.fk_soc";
 	} elseif ($selected_cat) 	// Into a specific category
 	{
-	    $sql .= ", ".MAIN_DB_PREFIX."categorie as c, ".MAIN_DB_PREFIX."categorie_societe as cs";
+		$sql .= ", ".MAIN_DB_PREFIX."categorie as c, ".MAIN_DB_PREFIX."categorie_societe as cs";
 	}
 	$sql .= " WHERE f.fk_statut in (1,2)";
 	$sql .= " AND f.type IN (0,2)";
 	$sql .= " AND f.fk_soc = s.rowid";
 	if ($date_start && $date_end) {
-	    $sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
+		$sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
 	}
 	if ($selected_cat === -2)	// Without any category
 	{
-	    $sql .= " AND cs.fk_soc is null";
+		$sql .= " AND cs.fk_soc is null";
 	} elseif ($selected_cat) {	// Into a specific category
-	    $sql .= " AND (c.rowid = ".$db->escape($selected_cat);
-	    if ($subcat) $sql .= " OR c.fk_parent = ".$db->escape($selected_cat);
-	    $sql .= ")";
+		$sql .= " AND (c.rowid = ".$db->escape($selected_cat);
+		if ($subcat) $sql .= " OR c.fk_parent = ".$db->escape($selected_cat);
+		$sql .= ")";
 		$sql .= " AND cs.fk_categorie = c.rowid AND cs.fk_soc = s.rowid";
 	}
 } else {
@@ -240,24 +240,24 @@ if ($modecompta == 'CREANCES-DETTES') {
 	$sql .= ", ".MAIN_DB_PREFIX."societe as s";
 	if ($selected_cat === -2)	// Without any category
 	{
-	    $sql .= " LEFT OUTER JOIN ".MAIN_DB_PREFIX."categorie_societe as cs ON s.rowid = cs.fk_soc";
+		$sql .= " LEFT OUTER JOIN ".MAIN_DB_PREFIX."categorie_societe as cs ON s.rowid = cs.fk_soc";
 	} elseif ($selected_cat) 	// Into a specific category
 	{
-	    $sql .= ", ".MAIN_DB_PREFIX."categorie as c, ".MAIN_DB_PREFIX."categorie_societe as cs";
+		$sql .= ", ".MAIN_DB_PREFIX."categorie as c, ".MAIN_DB_PREFIX."categorie_societe as cs";
 	}
 	$sql .= " WHERE p.rowid = pf.fk_paiementfourn";
 	$sql .= " AND pf.fk_facturefourn = f.rowid";
 	$sql .= " AND f.fk_soc = s.rowid";
 	if ($date_start && $date_end) {
-	    $sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
+		$sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
 	}
 	if ($selected_cat === -2)	// Without any category
 	{
-	    $sql .= " AND cs.fk_soc is null";
+		$sql .= " AND cs.fk_soc is null";
 	} elseif ($selected_cat) {	// Into a specific category
-	    $sql .= " AND (c.rowid = ".$selected_cat;
-	    if ($subcat) $sql .= " OR c.fk_parent = ".$selected_cat;
-	    $sql .= ")";
+		$sql .= " AND (c.rowid = ".$selected_cat;
+		if ($subcat) $sql .= " OR c.fk_parent = ".$selected_cat;
+		$sql .= ")";
 		$sql .= " AND cs.fk_categorie = c.rowid AND cs.fk_soc = s.rowid";
 	}
 }
@@ -278,15 +278,15 @@ if ($result) {
 	$i = 0;
 	while ($i < $num) {
 		$obj = $db->fetch_object($result);
-	        $amount_ht[$obj->socid] = $obj->amount;
-	        $amount[$obj->socid] = $obj->amount_ttc;
-	        $name[$obj->socid] = $obj->name.' '.$obj->firstname;
+			$amount_ht[$obj->socid] = $obj->amount;
+			$amount[$obj->socid] = $obj->amount_ttc;
+			$name[$obj->socid] = $obj->name.' '.$obj->firstname;
 			$address_zip[$obj->socid] = $obj->zip;
 			$address_town[$obj->socid] = $obj->town;
 			$address_pays[$obj->socid] = getCountry($obj->fk_pays);
-	        $catotal_ht += $obj->amount;
-	        $catotal += $obj->amount_ttc;
-	        $i++;
+			$catotal_ht += $obj->amount;
+			$catotal += $obj->amount_ttc;
+			$i++;
 	}
 } else {
 	dol_print_error($db);
@@ -299,7 +299,7 @@ print '<input type="hidden" name="token" value="'.newToken().'">'."\n";
 // Extra parameters management
 foreach ($headerparams as $key => $value)
 {
-     print '<input type="hidden" name="'.$key.'" value="'.$value.'">';
+	 print '<input type="hidden" name="'.$key.'" value="'.$value.'">';
 }
 
 $moreforfilter = '';
@@ -315,7 +315,7 @@ print ' ';
 print $langs->trans("SubCats").'? ';
 print '<input type="checkbox" name="subcat" value="yes"';
 if ($subcat) {
-    print ' checked';
+	print ' checked';
 }
 print'></td>';
 print '<td colspan="7" class="right">';
@@ -382,18 +382,18 @@ print_liste_field_titre(
 	$sortfield, $sortorder
 	);
 if ($modecompta == 'CREANCES-DETTES') {
-    print_liste_field_titre(
-           $langs->trans('AmountHT'),
-           $_SERVER["PHP_SELF"],
-           "amount_ht",
-           "",
-           $paramslink,
-           'class="right"',
-           $sortfield,
-           $sortorder
-    );
+	print_liste_field_titre(
+		   $langs->trans('AmountHT'),
+		   $_SERVER["PHP_SELF"],
+		   "amount_ht",
+		   "",
+		   $paramslink,
+		   'class="right"',
+		   $sortfield,
+		   $sortorder
+	);
 } else {
-    print_liste_field_titre('');
+	print_liste_field_titre('');
 }
 print_liste_field_titre(
 	$langs->trans("AmountTTC"),
@@ -438,12 +438,12 @@ if (count($amount)) {
 		$arrayforsort = $name;
 	}
 	if ($sortfield == 'amount_ht' && $sortorder == 'asc') {
-	    asort($amount_ht);
-	    $arrayforsort = $amount_ht;
+		asort($amount_ht);
+		$arrayforsort = $amount_ht;
 	}
 	if ($sortfield == 'amount_ht' && $sortorder == 'desc') {
-	    arsort($amount_ht);
-	    $arrayforsort = $amount_ht;
+		arsort($amount_ht);
+		$arrayforsort = $amount_ht;
 	}
 	if ($sortfield == 'amount_ttc' && $sortorder == 'asc') {
 		asort($amount);
@@ -484,10 +484,10 @@ if (count($amount)) {
 		// Third party
 		$fullname = $name[$key];
 		if ($key > 0) {
-		    $thirdparty_static->id = $key;
-		    $thirdparty_static->name = $fullname;
-		    $thirdparty_static->client = 1;
-		    $linkname = $thirdparty_static->getNomUrl(1, 'supplier');
+			$thirdparty_static->id = $key;
+			$thirdparty_static->name = $fullname;
+			$thirdparty_static->client = 1;
+			$linkname = $thirdparty_static->getNomUrl(1, 'supplier');
 		} else {
 			$linkname = $langs->trans("PaymentsNotLinkedToInvoice");
 		}
@@ -508,35 +508,35 @@ if (count($amount)) {
 		// Amount w/o VAT
 		print '<td class="right">';
 		if ($modecompta != 'CREANCES-DETTES') {
-            if ($key > 0) {
-                print '<a href="'.DOL_URL_ROOT.'/fourn/facture/paiement/list.php?socid='.$key.'">';
-		    } else {
-                print '<a href="'.DOL_URL_ROOT.'/fourn/facture/paiement/list.php?socid=-1">';
-            }
+			if ($key > 0) {
+				print '<a href="'.DOL_URL_ROOT.'/fourn/facture/paiement/list.php?socid='.$key.'">';
+			} else {
+				print '<a href="'.DOL_URL_ROOT.'/fourn/facture/paiement/list.php?socid=-1">';
+			}
 		} else {
-		    if ($key > 0) {
-                print '<a href="'.DOL_URL_ROOT.'/fourn/facture/list.php?socid='.$key.'">';
-		    } else {
-                print '<a href="#">';
-		    }
-            print price($amount_ht[$key]);
+			if ($key > 0) {
+				print '<a href="'.DOL_URL_ROOT.'/fourn/facture/list.php?socid='.$key.'">';
+			} else {
+				print '<a href="#">';
+			}
+			print price($amount_ht[$key]);
 		}
 		print '</td>';
 
 		// Amount with VAT
 		print '<td class="right">';
 		if ($modecompta != 'CREANCES-DETTES') {
-            if ($key > 0) {
-                print '<a href="'.DOL_URL_ROOT.'/fourn/facture/paiement/list.php?socid='.$key.'">';
-		    } else {
-                print '<a href="'.DOL_URL_ROOT.'/fourn/facture/paiement/list.php?orphelins=1">';
-		    }
+			if ($key > 0) {
+				print '<a href="'.DOL_URL_ROOT.'/fourn/facture/paiement/list.php?socid='.$key.'">';
+			} else {
+				print '<a href="'.DOL_URL_ROOT.'/fourn/facture/paiement/list.php?orphelins=1">';
+			}
 		} else {
-            if ($key > 0) {
-                print '<a href="'.DOL_URL_ROOT.'/fourn/facture/list.php?socid='.$key.'">';
-		    } else {
-                print '<a href="#">';
-		    }
+			if ($key > 0) {
+				print '<a href="'.DOL_URL_ROOT.'/fourn/facture/list.php?socid='.$key.'">';
+			} else {
+				print '<a href="#">';
+			}
 		}
 		print price($amount[$key]);
 		print '</a>';
@@ -545,21 +545,21 @@ if (count($amount)) {
 		// Percent;
 		print '<td class="right">'.($catotal > 0 ? round(100 * $amount[$key] / $catotal, 2).'%' : '&nbsp;').'</td>';
 
-        // Other stats
-        print '<td class="center">';
-        if (!empty($conf->supplier_proposal->enabled) && $key > 0) {
-            print '&nbsp;<a href="'.DOL_URL_ROOT.'/comm/propal/stats/index.php?socid='.$key.'">'.img_picto($langs->trans("ProposalStats"), "stats").'</a>&nbsp;';
-        }
-        if (!empty($conf->fournisseur->enabled) && $key > 0) {
-            print '&nbsp;<a href="'.DOL_URL_ROOT.'/commande/stats/index.php?mode=supplier&socid='.$key.'">'.img_picto($langs->trans("OrderStats"), "stats").'</a>&nbsp;';
-        }
-        if (!empty($conf->fournisseur->enabled) && $key > 0) {
-            print '&nbsp;<a href="'.DOL_URL_ROOT.'/compta/facture/stats/index.php?mode=supplier&socid='.$key.'">'.img_picto($langs->trans("InvoiceStats"), "stats").'</a>&nbsp;';
-        }
-        print '</td>';
-        print "</tr>\n";
-        $i++;
-    }
+		// Other stats
+		print '<td class="center">';
+		if (!empty($conf->supplier_proposal->enabled) && $key > 0) {
+			print '&nbsp;<a href="'.DOL_URL_ROOT.'/comm/propal/stats/index.php?socid='.$key.'">'.img_picto($langs->trans("ProposalStats"), "stats").'</a>&nbsp;';
+		}
+		if (!empty($conf->fournisseur->enabled) && $key > 0) {
+			print '&nbsp;<a href="'.DOL_URL_ROOT.'/commande/stats/index.php?mode=supplier&socid='.$key.'">'.img_picto($langs->trans("OrderStats"), "stats").'</a>&nbsp;';
+		}
+		if (!empty($conf->fournisseur->enabled) && $key > 0) {
+			print '&nbsp;<a href="'.DOL_URL_ROOT.'/compta/facture/stats/index.php?mode=supplier&socid='.$key.'">'.img_picto($langs->trans("InvoiceStats"), "stats").'</a>&nbsp;';
+		}
+		print '</td>';
+		print "</tr>\n";
+		$i++;
+	}
 
 	// Total
 	print '<tr class="liste_total">';
@@ -568,9 +568,9 @@ if (count($amount)) {
 	print '<td>&nbsp;</td>';
 	print '<td>&nbsp;</td>';
 	if ($modecompta != 'CREANCES-DETTES') {
-	    print '<td></td>';
+		print '<td></td>';
 	} else {
-	    print '<td class="right">'.price($catotal_ht).'</td>';
+		print '<td class="right">'.price($catotal_ht).'</td>';
 	}
 	print '<td class="right">'.price($catotal).'</td>';
 	print '<td>&nbsp;</td>';
diff --git a/htdocs/compta/tva/card.php b/htdocs/compta/tva/card.php
index 1f20bcd28e3..52543e9953d 100644
--- a/htdocs/compta/tva/card.php
+++ b/htdocs/compta/tva/card.php
@@ -73,30 +73,30 @@ if ($action == 'setlib' && $user->rights->tax->charges->creer)
 
 if ($action == 'setdatev' && $user->rights->tax->charges->creer)
 {
-    $object->fetch($id);
-    $object->datev = $datev;
-    $result = $object->update($user);
-    if ($result < 0) dol_print_error($db, $object->error);
+	$object->fetch($id);
+	$object->datev = $datev;
+	$result = $object->update($user);
+	if ($result < 0) dol_print_error($db, $object->error);
 
-    $action = '';
+	$action = '';
 }
 
 if ($action == 'add' && $_POST["cancel"] <> $langs->trans("Cancel"))
 {
-    $error = 0;
+	$error = 0;
 
-    $object->accountid = GETPOST("accountid", 'int');
-    $object->type_payment = GETPOST("type_payment", 'alphanohtml');
+	$object->accountid = GETPOST("accountid", 'int');
+	$object->type_payment = GETPOST("type_payment", 'alphanohtml');
 	$object->num_payment = GETPOST("num_payment", 'alphanohtml');
 
 	$object->datev = $datev;
-    $object->datep = $datep;
+	$object->datep = $datep;
 
 	$amount = price2num(GETPOST("amount", 'alpha'));
 	if ($refund == 1) {
 		$amount = -$amount;
 	}
-    $object->amount = $amount;
+	$object->amount = $amount;
 	$object->label = GETPOST("label", 'alpha');
 	$object->note_private = GETPOST("note", 'restricthtml');
 
@@ -125,7 +125,7 @@ if ($action == 'add' && $_POST["cancel"] <> $langs->trans("Cancel"))
 	{
 		$db->begin();
 
-    	$ret = $object->addPayment($user);
+		$ret = $object->addPayment($user);
 		if ($ret > 0)
 		{
 			$db->commit();
@@ -143,15 +143,15 @@ if ($action == 'add' && $_POST["cancel"] <> $langs->trans("Cancel"))
 
 if ($action == 'delete')
 {
-    $result = $object->fetch($id);
+	$result = $object->fetch($id);
 
 	if ($object->rappro == 0)
 	{
-	    $db->begin();
+		$db->begin();
 
-	    $ret = $object->delete($user);
-	    if ($ret > 0)
-	    {
+		$ret = $object->delete($user);
+		if ($ret > 0)
+		{
 			if ($object->fk_bank)
 			{
 				$accountline = new AccountLine($db);
@@ -169,10 +169,10 @@ if ($action == 'delete')
 				$db->rollback();
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
-	    } else {
-	        $db->rollback();
-	        setEventMessages($object->error, $object->errors, 'errors');
-	    }
+		} else {
+			$db->rollback();
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
 	} else {
 		$mesg = 'Error try do delete a line linked to a conciliated bank transaction';
 		setEventMessages($mesg, null, 'errors');
@@ -207,9 +207,9 @@ if ($action == 'create')
 	print load_fiche_titre($langs->trans("VAT").' - '.$langs->trans("New"));
 
 	if (!empty($conf->use_javascript_ajax))
-    {
-        print "\n".'<script type="text/javascript" language="javascript">';
-        print '$(document).ready(function () {
+	{
+		print "\n".'<script type="text/javascript" language="javascript">';
+		print '$(document).ready(function () {
                 $("#radiopayment").click(function() {
                     $("#label").val($(this).data("label"));
 
@@ -222,40 +222,40 @@ if ($action == 'create')
 		print '</script>'."\n";
 	}
 
-    print '<form name="add" action="'.$_SERVER["PHP_SELF"].'" name="formvat" method="post">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    print '<input type="hidden" name="action" value="add">';
+	print '<form name="add" action="'.$_SERVER["PHP_SELF"].'" name="formvat" method="post">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="action" value="add">';
 
-    print '<div id="selectmethod">';
-    print '<div class="hideonsmartphone float">';
-    print $langs->trans("Type").':&nbsp;&nbsp;&nbsp;';
-    print '</div>';
-    print '<label for="radiopayment">';
-    print '<input type="radio" id="radiopayment" data-label="'.$langs->trans('VATPayment').'" class="flat" name="refund" value="0"'.($refund ? '' : ' checked="checked"').'>';
-    print '&nbsp;';
-    print $langs->trans("Payment");
-    print '</label>';
-    print '&nbsp;&nbsp;&nbsp;';
-    print '<label for="radiorefund">';
-    print '<input type="radio" id="radiorefund" data-label="'.$langs->trans('VATRefund').'" class="flat" name="refund" value="1"'.($refund ? ' checked="checked"' : '').'>';
-    print '&nbsp;';
-    print $langs->trans("PaymentBack");
-    print '</label>';
-    print '</div>';
-    print "<br>\n";
+	print '<div id="selectmethod">';
+	print '<div class="hideonsmartphone float">';
+	print $langs->trans("Type").':&nbsp;&nbsp;&nbsp;';
+	print '</div>';
+	print '<label for="radiopayment">';
+	print '<input type="radio" id="radiopayment" data-label="'.$langs->trans('VATPayment').'" class="flat" name="refund" value="0"'.($refund ? '' : ' checked="checked"').'>';
+	print '&nbsp;';
+	print $langs->trans("Payment");
+	print '</label>';
+	print '&nbsp;&nbsp;&nbsp;';
+	print '<label for="radiorefund">';
+	print '<input type="radio" id="radiorefund" data-label="'.$langs->trans('VATRefund').'" class="flat" name="refund" value="1"'.($refund ? ' checked="checked"' : '').'>';
+	print '&nbsp;';
+	print $langs->trans("PaymentBack");
+	print '</label>';
+	print '</div>';
+	print "<br>\n";
 
-    print dol_get_fiche_head();
+	print dol_get_fiche_head();
 
-    print '<table class="border centpercent">';
+	print '<table class="border centpercent">';
 
-    print "<tr>";
-    print '<td class="titlefieldcreate fieldrequired">'.$langs->trans("DatePayment").'</td><td>';
-    print $form->selectDate($datep, "datep", '', '', '', 'add', 1, 1);
-    print '</td></tr>';
+	print "<tr>";
+	print '<td class="titlefieldcreate fieldrequired">'.$langs->trans("DatePayment").'</td><td>';
+	print $form->selectDate($datep, "datep", '', '', '', 'add', 1, 1);
+	print '</td></tr>';
 
-    print '<tr><td class="fieldrequired">'.$form->textwithpicto($langs->trans("PeriodEndDate"), $langs->trans("LastDayTaxIsRelatedTo")).'</td><td>';
-    print $form->selectDate((GETPOST("datevmonth", 'int') ? $datev : -1), "datev", '', '', '', 'add', 1, 1);
-    print '</td></tr>';
+	print '<tr><td class="fieldrequired">'.$form->textwithpicto($langs->trans("PeriodEndDate"), $langs->trans("LastDayTaxIsRelatedTo")).'</td><td>';
+	print $form->selectDate((GETPOST("datevmonth", 'int') ? $datev : -1), "datev", '', '', '', 'add', 1, 1);
+	print '</td></tr>';
 
 	// Label
 	if ($refund == 1) {
@@ -268,14 +268,14 @@ if ($action == 'create')
 	// Amount
 	print '<tr><td class="fieldrequired">'.$langs->trans("Amount").'</td><td><input name="amount" size="10" value="'.GETPOST("amount", "alpha").'"></td></tr>';
 
-    if (!empty($conf->banque->enabled))
-    {
+	if (!empty($conf->banque->enabled))
+	{
 		print '<tr><td class="fieldrequired">'.$langs->trans("BankAccount").'</td><td>';
 		$form->select_comptes(GETPOST("accountid", 'int'), "accountid", 0, "courant=1", 2); // List of bank account available
-        print '</td></tr>';
-    }
+		print '</td></tr>';
+	}
 
-    // Type payment
+	// Type payment
 	print '<tr><td class="fieldrequired">'.$langs->trans("PaymentMode").'</td><td>';
 	$form->select_types_paiements(GETPOST("type_payment"), "type_payment");
 	print "</td>\n";
@@ -286,22 +286,22 @@ if ($action == 'create')
 	print ' <em>('.$langs->trans("ChequeOrTransferNumber").')</em>';
 	print '<td><input name="num_payment" type="text" value="'.GETPOST("num_payment").'"></td></tr>'."\n";
 
-    // Other attributes
-    $parameters = array();
-    $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-    print $hookmanager->resPrint;
+	// Other attributes
+	$parameters = array();
+	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+	print $hookmanager->resPrint;
 
-    print '</table>';
+	print '</table>';
 
-    dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div class="center">';
 	print '<input type="submit" class="button" value="'.$langs->trans("Save").'">';
 	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-    print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+	print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
 	print '</div>';
 
-    print '</form>';
+	print '</form>';
 }
 
 // View mode
@@ -369,7 +369,7 @@ if ($id)
 
 	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	/*
 	 * Action buttons
diff --git a/htdocs/compta/tva/class/tva.class.php b/htdocs/compta/tva/class/tva.class.php
index 5f661609e52..b767e78294d 100644
--- a/htdocs/compta/tva/class/tva.class.php
+++ b/htdocs/compta/tva/class/tva.class.php
@@ -56,45 +56,45 @@ class Tva extends CommonObject
 	public $num_payment;
 
 	/**
-     * @var string label
-     */
-    public $label;
+	 * @var string label
+	 */
+	public $label;
 
-    /**
-     * @var int ID
-     */
+	/**
+	 * @var int ID
+	 */
 	public $fk_bank;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_user_creat;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_user_modif;
 
-    /**
+	/**
 	 *	Constructor
 	 *
 	 *  @param		DoliDB		$db      Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-    }
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
 
 
-    /**
-     *  Create in database
-     *
-     *  @param      User	$user       User that create
-     *  @return     int      			<0 if KO, >0 if OK
-     */
-    public function create($user)
-    {
-    	global $conf, $langs;
+	/**
+	 *  Create in database
+	 *
+	 *  @param      User	$user       User that create
+	 *  @return     int      			<0 if KO, >0 if OK
+	 */
+	public function create($user)
+	{
+		global $conf, $langs;
 
 		$error = 0;
 		$now = dol_now();
@@ -123,7 +123,7 @@ class Tva extends CommonObject
 		$sql .= "fk_bank,";
 		$sql .= "fk_user_creat,";
 		$sql .= "fk_user_modif";
-        $sql .= ") VALUES (";
+		$sql .= ") VALUES (";
 		$sql .= " '".$this->db->idate($now)."',";
 		$sql .= " '".$this->db->idate($this->datep)."',";
 		$sql .= " '".$this->db->idate($this->datev)."',";
@@ -136,41 +136,41 @@ class Tva extends CommonObject
 		$sql .= ")";
 
 	   	dol_syslog(get_class($this)."::create", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."tva");
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."tva");
 
-            // Call trigger
-            $result = $this->call_trigger('TVA_CREATE', $user);
-            if ($result < 0) $error++;
-            // End call triggers
+			// Call trigger
+			$result = $this->call_trigger('TVA_CREATE', $user);
+			if ($result < 0) $error++;
+			// End call triggers
 
-            if (!$error)
-            {
-            	$this->db->commit();
-            	return $this->id;
-            } else {
+			if (!$error)
+			{
+				$this->db->commit();
+				return $this->id;
+			} else {
 				$this->db->rollback();
 				return -1;
-            }
-        } else {
+			}
+		} else {
 			$this->error = "Error ".$this->db->lasterror();
 			$this->db->rollback();
 			return -1;
-        }
-    }
+		}
+	}
 
-    /**
-     * Update database
-     *
-     * @param   User	$user        	User that modify
-     * @param	int		$notrigger	    0=no, 1=yes (no update trigger)
-     * @return  int         			<0 if KO, >0 if OK
-     */
-    public function update($user, $notrigger = 0)
-    {
-    	global $conf, $langs;
+	/**
+	 * Update database
+	 *
+	 * @param   User	$user        	User that modify
+	 * @param	int		$notrigger	    0=no, 1=yes (no update trigger)
+	 * @return  int         			<0 if KO, >0 if OK
+	 */
+	public function update($user, $notrigger = 0)
+	{
+		global $conf, $langs;
 
 		$error = 0;
 
@@ -188,7 +188,7 @@ class Tva extends CommonObject
 		$this->db->begin();
 
 		// Update request
-        $sql = "UPDATE ".MAIN_DB_PREFIX."tva SET";
+		$sql = "UPDATE ".MAIN_DB_PREFIX."tva SET";
 		$sql .= " tms='".$this->db->idate($this->tms)."',";
 		$sql .= " datep='".$this->db->idate($this->datep)."',";
 		$sql .= " datev='".$this->db->idate($this->datev)."',";
@@ -198,46 +198,46 @@ class Tva extends CommonObject
 		$sql .= " fk_bank=".$this->fk_bank.",";
 		$sql .= " fk_user_creat=".$this->fk_user_creat.",";
 		$sql .= " fk_user_modif=".($this->fk_user_modif > 0 ? $this->fk_user_modif : $user->id)."";
-        $sql .= " WHERE rowid=".$this->id;
+		$sql .= " WHERE rowid=".$this->id;
 
-        dol_syslog(get_class($this)."::update", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if (!$resql)
-        {
-            $this->error = "Error ".$this->db->lasterror();
-            $error++;
-        }
+		dol_syslog(get_class($this)."::update", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if (!$resql)
+		{
+			$this->error = "Error ".$this->db->lasterror();
+			$error++;
+		}
 
 		if (!$error && !$notrigger)
 		{
-            // Call trigger
-            $result = $this->call_trigger('TVA_MODIFY', $user);
-            if ($result < 0) $error++;
-            // End call triggers
-    	}
+			// Call trigger
+			$result = $this->call_trigger('TVA_MODIFY', $user);
+			if ($result < 0) $error++;
+			// End call triggers
+		}
 
-        if (!$error)
-    	{
-    		$this->db->commit();
-    		return 1;
-    	} else {
-    		$this->db->rollback();
-    		return -1;
-    	}
-    }
+		if (!$error)
+		{
+			$this->db->commit();
+			return 1;
+		} else {
+			$this->db->rollback();
+			return -1;
+		}
+	}
 
 
-    /**
-     *  Load object in memory from database
-     *
-     *  @param	int		$id         id object
-     *  @param  User	$user       User that load
-     *  @return int         		<0 if KO, >0 if OK
-     */
-    public function fetch($id, $user = null)
-    {
-    	global $langs;
-        $sql = "SELECT";
+	/**
+	 *  Load object in memory from database
+	 *
+	 *  @param	int		$id         id object
+	 *  @param  User	$user       User that load
+	 *  @return int         		<0 if KO, >0 if OK
+	 */
+	public function fetch($id, $user = null)
+	{
+		global $langs;
+		$sql = "SELECT";
 		$sql .= " t.rowid,";
 
 		$sql .= " t.tms,";
@@ -255,20 +255,20 @@ class Tva extends CommonObject
 		$sql .= " b.fk_type,";
 		$sql .= " b.rappro";
 
-        $sql .= " FROM ".MAIN_DB_PREFIX."tva as t";
+		$sql .= " FROM ".MAIN_DB_PREFIX."tva as t";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank as b ON t.fk_bank = b.rowid";
-        $sql .= " WHERE t.rowid = ".$id;
+		$sql .= " WHERE t.rowid = ".$id;
 
-    	dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            if ($this->db->num_rows($resql))
-            {
-                $obj = $this->db->fetch_object($resql);
+		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			if ($this->db->num_rows($resql))
+			{
+				$obj = $this->db->fetch_object($resql);
 
-                $this->id    = $obj->rowid;
-                $this->ref   = $obj->rowid;
+				$this->id    = $obj->rowid;
+				$this->ref   = $obj->rowid;
 				$this->tms   = $this->db->jdate($obj->tms);
 				$this->datep = $this->db->jdate($obj->datep);
 				$this->datev = $this->db->jdate($obj->datev);
@@ -283,23 +283,23 @@ class Tva extends CommonObject
 				$this->fk_account = $obj->fk_account;
 				$this->fk_type = $obj->fk_type;
 				$this->rappro  = $obj->rappro;
-            }
-            $this->db->free($resql);
+			}
+			$this->db->free($resql);
 
-            return 1;
-        } else {
-      	    $this->error = "Error ".$this->db->lasterror();
-            return -1;
-        }
-    }
+			return 1;
+		} else {
+	  		$this->error = "Error ".$this->db->lasterror();
+			return -1;
+		}
+	}
 
 
  	/**
-	 *  Delete object in database
-	 *
-     *	@param	User	$user       User that delete
-	 *	@return	int					<0 if KO, >0 if OK
-	 */
+ 	 *  Delete object in database
+ 	 *
+ 	 *	@param	User	$user       User that delete
+ 	 *	@return	int					<0 if KO, >0 if OK
+ 	 */
 	public function delete($user)
 	{
 		global $conf, $langs;
@@ -328,11 +328,11 @@ class Tva extends CommonObject
 
 
 	/**
-     *  Initialise an instance with random values.
-     *  Used to build previews or test instances.
-     *	id must be 0 if object instance is a specimen.
-     *
-     *  @return	void
+	 *  Initialise an instance with random values.
+	 *  Used to build previews or test instances.
+	 *	id must be 0 if object instance is a specimen.
+	 *
+	 *  @return	void
 	 */
 	public function initAsSpecimen()
 	{
@@ -350,154 +350,154 @@ class Tva extends CommonObject
 	}
 
 
-    /**
-     *  Balance of VAT
-     *
-     *	@param	int		$year		Year
-     *	@return	double				Amount
-     */
-    public function solde($year = 0)
-    {
+	/**
+	 *  Balance of VAT
+	 *
+	 *	@param	int		$year		Year
+	 *	@return	double				Amount
+	 */
+	public function solde($year = 0)
+	{
 
-        $reglee = $this->tva_sum_reglee($year);
+		$reglee = $this->tva_sum_reglee($year);
 
-        $payee = $this->tva_sum_payee($year);
-        $collectee = $this->tva_sum_collectee($year);
+		$payee = $this->tva_sum_payee($year);
+		$collectee = $this->tva_sum_collectee($year);
 
-        $solde = $reglee - ($collectee - $payee);
+		$solde = $reglee - ($collectee - $payee);
 
-        return $solde;
-    }
+		return $solde;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * 	Total of the VAT from invoices emitted by the thirdparty.
-     *
-     *	@param	int		$year		Year
-     *  @return	double				Amount
-     */
-    public function tva_sum_collectee($year = 0)
-    {
-        // phpcs:enable
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * 	Total of the VAT from invoices emitted by the thirdparty.
+	 *
+	 *	@param	int		$year		Year
+	 *  @return	double				Amount
+	 */
+	public function tva_sum_collectee($year = 0)
+	{
+		// phpcs:enable
 
-        $sql = "SELECT sum(f.tva) as amount";
-        $sql .= " FROM ".MAIN_DB_PREFIX."facture as f WHERE f.paye = 1";
-        if ($year)
-        {
-        	$sql .= " AND f.datef >= '".$this->db->escape($year)."-01-01' AND f.datef <= '".$this->db->escape($year)."-12-31' ";
-        }
+		$sql = "SELECT sum(f.tva) as amount";
+		$sql .= " FROM ".MAIN_DB_PREFIX."facture as f WHERE f.paye = 1";
+		if ($year)
+		{
+			$sql .= " AND f.datef >= '".$this->db->escape($year)."-01-01' AND f.datef <= '".$this->db->escape($year)."-12-31' ";
+		}
 
-        $result = $this->db->query($sql);
-        if ($result)
-        {
-            if ($this->db->num_rows($result))
-            {
-                $obj = $this->db->fetch_object($result);
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+			if ($this->db->num_rows($result))
+			{
+				$obj = $this->db->fetch_object($result);
 				$ret = $obj->amount;
-                $this->db->free($result);
-                return $ret;
-            } else {
-                $this->db->free($result);
+				$this->db->free($result);
+				return $ret;
+			} else {
+				$this->db->free($result);
 				return 0;
-            }
-        } else {
-            print $this->db->lasterror();
-            return -1;
-        }
-    }
+			}
+		} else {
+			print $this->db->lasterror();
+			return -1;
+		}
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * 	VAT payed
-     *
-     *	@param	int		$year		Year
-     *	@return	double				Amount
-     */
-    public function tva_sum_payee($year = 0)
-    {
-        // phpcs:enable
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * 	VAT payed
+	 *
+	 *	@param	int		$year		Year
+	 *	@return	double				Amount
+	 */
+	public function tva_sum_payee($year = 0)
+	{
+		// phpcs:enable
 
-        $sql = "SELECT sum(f.total_tva) as total_tva";
-        $sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f";
-        if ($year)
-        {
-        	$sql .= " WHERE f.datef >= '".$this->db->escape($year)."-01-01' AND f.datef <= '".$this->db->escape($year)."-12-31' ";
-        }
+		$sql = "SELECT sum(f.total_tva) as total_tva";
+		$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f";
+		if ($year)
+		{
+			$sql .= " WHERE f.datef >= '".$this->db->escape($year)."-01-01' AND f.datef <= '".$this->db->escape($year)."-12-31' ";
+		}
 
-        $result = $this->db->query($sql);
-        if ($result)
-        {
-            if ($this->db->num_rows($result))
-            {
-                $obj = $this->db->fetch_object($result);
-                $ret = $obj->total_tva;
-            	$this->db->free($result);
-                return $ret;
-            } else {
-            	$this->db->free($result);
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+			if ($this->db->num_rows($result))
+			{
+				$obj = $this->db->fetch_object($result);
+				$ret = $obj->total_tva;
+				$this->db->free($result);
+				return $ret;
+			} else {
+				$this->db->free($result);
 				return 0;
-            }
-        } else {
-            print $this->db->lasterror();
-            return -1;
-        }
-    }
+			}
+		} else {
+			print $this->db->lasterror();
+			return -1;
+		}
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * 	Total of the VAT payed
-     *
-     *	@param	int		$year		Year
-     *	@return	double				Amount
-     */
-    public function tva_sum_reglee($year = 0)
-    {
-        // phpcs:enable
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * 	Total of the VAT payed
+	 *
+	 *	@param	int		$year		Year
+	 *	@return	double				Amount
+	 */
+	public function tva_sum_reglee($year = 0)
+	{
+		// phpcs:enable
 
-        $sql = "SELECT sum(f.amount) as amount";
-        $sql .= " FROM ".MAIN_DB_PREFIX."tva as f";
+		$sql = "SELECT sum(f.amount) as amount";
+		$sql .= " FROM ".MAIN_DB_PREFIX."tva as f";
 
-        if ($year)
-        {
-        	$sql .= " WHERE f.datev >= '".$this->db->escape($year)."-01-01' AND f.datev <= '".$this->db->escape($year)."-12-31' ";
-        }
+		if ($year)
+		{
+			$sql .= " WHERE f.datev >= '".$this->db->escape($year)."-01-01' AND f.datev <= '".$this->db->escape($year)."-12-31' ";
+		}
 
-        $result = $this->db->query($sql);
-        if ($result)
-        {
-            if ($this->db->num_rows($result))
-            {
-                $obj = $this->db->fetch_object($result);
-                $ret = $obj->amount;
-            	$this->db->free($result);
-                return $ret;
-            } else {
-            	$this->db->free($result);
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+			if ($this->db->num_rows($result))
+			{
+				$obj = $this->db->fetch_object($result);
+				$ret = $obj->amount;
+				$this->db->free($result);
+				return $ret;
+			} else {
+				$this->db->free($result);
 				return 0;
-            }
-        } else {
-            print $this->db->lasterror();
-            return -1;
-        }
-    }
+			}
+		} else {
+			print $this->db->lasterror();
+			return -1;
+		}
+	}
 
 
-    /**
-     *  Create in database
-     *
+	/**
+	 *  Create in database
+	 *
 	 *	@param	User	$user		Object user that insert
 	 *	@return	int					<0 if KO, rowid in tva table if OK
-     */
-    public function addPayment($user)
-    {
-        global $conf, $langs;
+	 */
+	public function addPayment($user)
+	{
+		global $conf, $langs;
 
-        $this->db->begin();
+		$this->db->begin();
 
-        // Clean parameters
-        $this->amount = price2num(trim($this->amount));
-        $this->label = trim($this->label);
+		// Clean parameters
+		$this->amount = price2num(trim($this->amount));
+		$this->label = trim($this->label);
 		$this->note = trim($this->note);
 		$this->num_payment = trim($this->num_payment);
 		$this->fk_bank = (int) $this->fk_bank;
@@ -505,81 +505,81 @@ class Tva extends CommonObject
 		$this->fk_user_modif = (int) $this->fk_user_modif;
 		if (empty($this->datec)) $this->datec = dol_now();
 
-        // Check parameters
+		// Check parameters
 		if (!$this->label)
 		{
 			$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Label"));
 			return -3;
 		}
-        if ($this->amount == '')
-        {
-            $this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Amount"));
-            return -4;
-        }
-        if (!empty($conf->banque->enabled) && (empty($this->accountid) || $this->accountid <= 0))
-        {
-            $this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Account"));
-            return -5;
-        }
-        if (!empty($conf->banque->enabled) && (empty($this->type_payment) || $this->type_payment <= 0))
-        {
-            $this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("PaymentMode"));
-            return -5;
-        }
+		if ($this->amount == '')
+		{
+			$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Amount"));
+			return -4;
+		}
+		if (!empty($conf->banque->enabled) && (empty($this->accountid) || $this->accountid <= 0))
+		{
+			$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Account"));
+			return -5;
+		}
+		if (!empty($conf->banque->enabled) && (empty($this->type_payment) || $this->type_payment <= 0))
+		{
+			$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("PaymentMode"));
+			return -5;
+		}
 
-        // Insert into llx_tva
-        $sql = "INSERT INTO ".MAIN_DB_PREFIX."tva (";
-        $sql .= "datec";
-        $sql .= ", datep";
-        $sql .= ", datev";
+		// Insert into llx_tva
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."tva (";
+		$sql .= "datec";
+		$sql .= ", datep";
+		$sql .= ", datev";
 		$sql .= ", amount";
 		$sql .= ", fk_typepayment";
 		$sql .= ", num_payment";
 		if ($this->note)  $sql .= ", note";
-        if ($this->label) $sql .= ", label";
-        $sql .= ", fk_user_creat";
+		if ($this->label) $sql .= ", label";
+		$sql .= ", fk_user_creat";
 		$sql .= ", fk_bank";
 		$sql .= ", entity";
 		$sql .= ") ";
-        $sql .= " VALUES (";
-        $sql .= " '".$this->db->idate($this->datec)."'";
-        $sql .= ", '".$this->db->idate($this->datep)."'";
-        $sql .= ", '".$this->db->idate($this->datev)."'";
+		$sql .= " VALUES (";
+		$sql .= " '".$this->db->idate($this->datec)."'";
+		$sql .= ", '".$this->db->idate($this->datep)."'";
+		$sql .= ", '".$this->db->idate($this->datev)."'";
 		$sql .= ", ".$this->amount;
-        $sql .= ", '".$this->db->escape($this->type_payment)."'";
+		$sql .= ", '".$this->db->escape($this->type_payment)."'";
 		$sql .= ", '".$this->db->escape($this->num_payment)."'";
 		if ($this->note)  $sql .= ", '".$this->db->escape($this->note)."'";
-        if ($this->label) $sql .= ", '".$this->db->escape($this->label)."'";
-        $sql .= ", '".$this->db->escape($user->id)."'";
+		if ($this->label) $sql .= ", '".$this->db->escape($this->label)."'";
+		$sql .= ", '".$this->db->escape($user->id)."'";
 		$sql .= ", NULL";
 		$sql .= ", ".$conf->entity;
-        $sql .= ")";
+		$sql .= ")";
 
 		dol_syslog(get_class($this)."::addPayment", LOG_DEBUG);
-        $result = $this->db->query($sql);
-        if ($result)
-        {
-            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."tva"); // TODO should be called 'payment_vat'
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."tva"); // TODO should be called 'payment_vat'
 
-            // Call trigger
-            //XXX: Should be done just befor commit no ?
-            $result = $this->call_trigger('TVA_ADDPAYMENT', $user);
-            if ($result < 0)
-            {
-            	$this->id = 0;
-            	$ok = 0;
-            }
-            // End call triggers
+			// Call trigger
+			//XXX: Should be done just befor commit no ?
+			$result = $this->call_trigger('TVA_ADDPAYMENT', $user);
+			if ($result < 0)
+			{
+				$this->id = 0;
+				$ok = 0;
+			}
+			// End call triggers
 
-            if ($this->id > 0)
-            {
-                $ok = 1;
+			if ($this->id > 0)
+			{
+				$ok = 1;
 				if (!empty($conf->banque->enabled) && !empty($this->amount))
-                {
-                    // Insert into llx_bank
-                    require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+				{
+					// Insert into llx_bank
+					require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 
-                    $acc = new Account($this->db);
+					$acc = new Account($this->db);
 					$result = $acc->fetch($this->accountid);
 					if ($result <= 0) dol_print_error($this->db);
 
@@ -589,23 +589,23 @@ class Tva extends CommonObject
 						$bank_line_id = $acc->addline($this->datep, $this->type_payment, $this->label, abs($this->amount), $this->num_payment, '', $user);
 					}
 
-                    // Update fk_bank into llx_tva. So we know vat line used to generate bank transaction
-                    if ($bank_line_id > 0)
+					// Update fk_bank into llx_tva. So we know vat line used to generate bank transaction
+					if ($bank_line_id > 0)
 					{
-                        $this->update_fk_bank($bank_line_id);
-                    } else {
+						$this->update_fk_bank($bank_line_id);
+					} else {
 						$this->error = $acc->error;
 						$ok = 0;
 					}
 
-                    // Update links
-                    $result = $acc->add_url_line($bank_line_id, $this->id, DOL_URL_ROOT.'/compta/tva/card.php?id=', "(VATPayment)", "payment_vat");
-                    if ($result < 0)
-                    {
-                    	$this->error = $acc->error;
-                    	$ok = 0;
-                    }
-	            }
+					// Update links
+					$result = $acc->add_url_line($bank_line_id, $this->id, DOL_URL_ROOT.'/compta/tva/card.php?id=', "(VATPayment)", "payment_vat");
+					if ($result < 0)
+					{
+						$this->error = $acc->error;
+						$ok = 0;
+					}
+				}
 
 				if ($ok)
 				{
@@ -615,27 +615,27 @@ class Tva extends CommonObject
 					$this->db->rollback();
 					return -3;
 				}
-            } else {
-                $this->db->rollback();
-                return -2;
-            }
-        } else {
-            $this->error = $this->db->error();
-            $this->db->rollback();
-            return -1;
-        }
-    }
+			} else {
+				$this->db->rollback();
+				return -2;
+			}
+		} else {
+			$this->error = $this->db->error();
+			$this->db->rollback();
+			return -1;
+		}
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
 	 *  Update link between payment tva and line generate into llx_bank
-     *
-     *  @param	int		$id_bank    Id bank account
+	 *
+	 *  @param	int		$id_bank    Id bank account
 	 *	@return	int					<0 if KO, >0 if OK
-     */
+	 */
 	public function update_fk_bank($id_bank)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.'tva SET fk_bank = '.(int) $id_bank;
 		$sql .= ' WHERE rowid = '.(int) $this->id;
 		$result = $this->db->query($sql);
@@ -653,8 +653,8 @@ class Tva extends CommonObject
 	 *
 	 *	@param	int		$withpicto		0=No picto, 1=Include picto into link, 2=Only picto
 	 *	@param	string	$option			link option
-     *  @param	int  	$notooltip		1=Disable tooltip
-     *  @param	string	$morecss			More CSS
+	 *  @param	int  	$notooltip		1=Disable tooltip
+	 *  @param	string	$morecss			More CSS
 	 *	@return	string					Chaine with URL
 	 */
 	public function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $morecss = '')
@@ -669,23 +669,23 @@ class Tva extends CommonObject
 		$label .= '<br>';
 		$label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref;
 
-        $url = DOL_URL_ROOT.'/compta/tva/card.php?id='.$this->id;
+		$url = DOL_URL_ROOT.'/compta/tva/card.php?id='.$this->id;
 
-        $linkclose = '';
-        if (empty($notooltip))
-        {
-        	if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-        	{
-        		$label = $langs->trans("ShowMyObject");
-        		$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
-        	}
-        	$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
-        	$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
-        } else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+		$linkclose = '';
+		if (empty($notooltip))
+		{
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+			{
+				$label = $langs->trans("ShowMyObject");
+				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
+			}
+			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
+			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
+		} else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
-        $linkstart = '<a href="'.$url.'"';
-        $linkstart .= $linkclose.'>';
-        $linkend = '</a>';
+		$linkstart = '<a href="'.$url.'"';
+		$linkstart .= $linkclose.'>';
+		$linkend = '</a>';
 
 		$picto = 'payment';
 
@@ -698,34 +698,34 @@ class Tva extends CommonObject
 	}
 
 	/**
-     * 	Return amount of payments already done
-     *
-     *	@return		int		Amount of payment already done, <0 if KO
-     */
-    public function getSommePaiement()
-    {
-        $table = 'paiementcharge';
-        $field = 'fk_charge';
+	 * 	Return amount of payments already done
+	 *
+	 *	@return		int		Amount of payment already done, <0 if KO
+	 */
+	public function getSommePaiement()
+	{
+		$table = 'paiementcharge';
+		$field = 'fk_charge';
 
-        $sql = 'SELECT sum(amount) as amount';
-        $sql .= ' FROM '.MAIN_DB_PREFIX.$table;
-        $sql .= ' WHERE '.$field.' = '.$this->id;
+		$sql = 'SELECT sum(amount) as amount';
+		$sql .= ' FROM '.MAIN_DB_PREFIX.$table;
+		$sql .= ' WHERE '.$field.' = '.$this->id;
 
-        dol_syslog(get_class($this)."::getSommePaiement", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            $amount = 0;
+		dol_syslog(get_class($this)."::getSommePaiement", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$amount = 0;
 
-            $obj = $this->db->fetch_object($resql);
-            if ($obj) $amount = $obj->amount ? $obj->amount : 0;
+			$obj = $this->db->fetch_object($resql);
+			if ($obj) $amount = $obj->amount ? $obj->amount : 0;
 
-            $this->db->free($resql);
-            return $amount;
-        } else {
-            return -1;
-        }
-    }
+			$this->db->free($resql);
+			return $amount;
+		} else {
+			return -1;
+		}
+	}
 
 	/**
 	 *	Informations of vat payment object
@@ -780,10 +780,10 @@ class Tva extends CommonObject
 	 */
 	public function getLibStatut($mode = 0)
 	{
-	    return $this->LibStatut($this->statut, $mode);
+		return $this->LibStatut($this->statut, $mode);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Renvoi le libelle d'un statut donne
 	 *
@@ -791,11 +791,11 @@ class Tva extends CommonObject
 	 * @param   int		$mode       0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
 	 * @return	string  		    Libelle du statut
 	 */
-    public function LibStatut($status, $mode = 0)
-    {
-        // phpcs:enable
-        global $langs; // TODO Renvoyer le libelle anglais et faire traduction a affichage
+	public function LibStatut($status, $mode = 0)
+	{
+		// phpcs:enable
+		global $langs; // TODO Renvoyer le libelle anglais et faire traduction a affichage
 
-        return '';
-    }
+		return '';
+	}
 }
diff --git a/htdocs/compta/tva/clients.php b/htdocs/compta/tva/clients.php
index a91d637c39d..d4acecf063d 100644
--- a/htdocs/compta/tva/clients.php
+++ b/htdocs/compta/tva/clients.php
@@ -53,10 +53,10 @@ $year = GETPOST("year", "int");
 if (empty($year))
 {
 	$year_current = $current_date['year'];
-    $year_start = $year_current;
+	$year_start = $year_current;
 } else {
-    $year_current = $year;
-    $year_start = $year;
+	$year_current = $year;
+	$year_start = $year;
 }
 $date_start = dol_mktime(0, 0, 0, GETPOST("date_startmonth"), GETPOST("date_startday"), GETPOST("date_startyear"));
 $date_end = dol_mktime(23, 59, 59, GETPOST("date_endmonth"), GETPOST("date_endday"), GETPOST("date_endyear"));
@@ -64,35 +64,35 @@ $date_end = dol_mktime(23, 59, 59, GETPOST("date_endmonth"), GETPOST("date_endda
 if (empty($date_start) || empty($date_end)) // We define date_start and date_end
 {
 	$q = GETPOST("q", "int");
-    if (empty($q))
-    {
-        if (GETPOST("month", 'int')) { $date_start = dol_get_first_day($year_start, GETPOST("month", 'int'), false); $date_end = dol_get_last_day($year_start, GETPOST("month", 'int'), false); } else {
-            if (empty($conf->global->MAIN_INFO_VAT_RETURN) || $conf->global->MAIN_INFO_VAT_RETURN == 2) { // quaterly vat, we take last past complete quarter
-            	$date_start = dol_time_plus_duree(dol_get_first_day($year_start, $current_date['mon'], false), -3 - (($current_date['mon'] - $conf->global->SOCIETE_FISCAL_MONTH_START) % 3), 'm');
-            	$date_end = dol_time_plus_duree($date_start, 3, 'm') - 1;
-            } elseif ($conf->global->MAIN_INFO_VAT_RETURN == 3) { // yearly vat
-            	if ($current_date['mon'] < $conf->global->SOCIETE_FISCAL_MONTH_START) {
-            		if (($conf->global->SOCIETE_FISCAL_MONTH_START - $current_date['mon']) > 6) {	// If period started from less than 6 years, we show past year
-            			$year_start--;
-            		}
-            	} else {
-            		if (($current_date['mon'] - $conf->global->SOCIETE_FISCAL_MONTH_START) < 6) {	// If perdio started from less than 6 years, we show past year
-            			$year_start--;
-            		}
-            	}
-            	$date_start = dol_get_first_day($year_start, $conf->global->SOCIETE_FISCAL_MONTH_START, false);
-            	$date_end = dol_time_plus_duree($date_start, 1, 'y') - 1;
-            } elseif ($conf->global->MAIN_INFO_VAT_RETURN == 1) {	// monthly vat, we take last past complete month
-            	$date_start = dol_time_plus_duree(dol_get_first_day($year_start, $current_date['mon'], false), -1, 'm');
-            	$date_end = dol_time_plus_duree($date_start, 1, 'm') - 1;
-            }
-        }
-    } else {
-        if ($q == 1) { $date_start = dol_get_first_day($year_start, 1, false); $date_end = dol_get_last_day($year_start, 3, false); }
-        if ($q == 2) { $date_start = dol_get_first_day($year_start, 4, false); $date_end = dol_get_last_day($year_start, 6, false); }
-        if ($q == 3) { $date_start = dol_get_first_day($year_start, 7, false); $date_end = dol_get_last_day($year_start, 9, false); }
-        if ($q == 4) { $date_start = dol_get_first_day($year_start, 10, false); $date_end = dol_get_last_day($year_start, 12, false); }
-    }
+	if (empty($q))
+	{
+		if (GETPOST("month", 'int')) { $date_start = dol_get_first_day($year_start, GETPOST("month", 'int'), false); $date_end = dol_get_last_day($year_start, GETPOST("month", 'int'), false); } else {
+			if (empty($conf->global->MAIN_INFO_VAT_RETURN) || $conf->global->MAIN_INFO_VAT_RETURN == 2) { // quaterly vat, we take last past complete quarter
+				$date_start = dol_time_plus_duree(dol_get_first_day($year_start, $current_date['mon'], false), -3 - (($current_date['mon'] - $conf->global->SOCIETE_FISCAL_MONTH_START) % 3), 'm');
+				$date_end = dol_time_plus_duree($date_start, 3, 'm') - 1;
+			} elseif ($conf->global->MAIN_INFO_VAT_RETURN == 3) { // yearly vat
+				if ($current_date['mon'] < $conf->global->SOCIETE_FISCAL_MONTH_START) {
+					if (($conf->global->SOCIETE_FISCAL_MONTH_START - $current_date['mon']) > 6) {	// If period started from less than 6 years, we show past year
+						$year_start--;
+					}
+				} else {
+					if (($current_date['mon'] - $conf->global->SOCIETE_FISCAL_MONTH_START) < 6) {	// If perdio started from less than 6 years, we show past year
+						$year_start--;
+					}
+				}
+				$date_start = dol_get_first_day($year_start, $conf->global->SOCIETE_FISCAL_MONTH_START, false);
+				$date_end = dol_time_plus_duree($date_start, 1, 'y') - 1;
+			} elseif ($conf->global->MAIN_INFO_VAT_RETURN == 1) {	// monthly vat, we take last past complete month
+				$date_start = dol_time_plus_duree(dol_get_first_day($year_start, $current_date['mon'], false), -1, 'm');
+				$date_end = dol_time_plus_duree($date_start, 1, 'm') - 1;
+			}
+		}
+	} else {
+		if ($q == 1) { $date_start = dol_get_first_day($year_start, 1, false); $date_end = dol_get_last_day($year_start, 3, false); }
+		if ($q == 2) { $date_start = dol_get_first_day($year_start, 4, false); $date_end = dol_get_last_day($year_start, 6, false); }
+		if ($q == 3) { $date_start = dol_get_first_day($year_start, 7, false); $date_end = dol_get_last_day($year_start, 9, false); }
+		if ($q == 4) { $date_start = dol_get_first_day($year_start, 10, false); $date_end = dol_get_last_day($year_start, 12, false); }
+	}
 }
 
 $min = price2num(GETPOST("min", "alpha"));
@@ -130,12 +130,12 @@ $morequerystring = '';
 $listofparams = array('date_startmonth', 'date_startyear', 'date_startday', 'date_endmonth', 'date_endyear', 'date_endday');
 foreach ($listofparams as $param)
 {
-    if (GETPOST($param) != '') $morequerystring .= ($morequerystring ? '&' : '').$param.'='.GETPOST($param);
+	if (GETPOST($param) != '') $morequerystring .= ($morequerystring ? '&' : '').$param.'='.GETPOST($param);
 }
 
 $special_report = false;
 if (isset($_REQUEST['extra_report']) && $_REQUEST['extra_report'] == 1) {
-    $special_report = true;
+	$special_report = true;
 }
 
 llxHeader('', $langs->trans("VATReport"), '', '', 0, 0, '', '', $morequerystring);
@@ -158,18 +158,18 @@ $period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.
 $prevyear = $year_start;
 $prevquarter = $q;
 if ($prevquarter > 1) {
-    $prevquarter--;
+	$prevquarter--;
 } else {
-    $prevquarter = 4;
-    $prevyear--;
+	$prevquarter = 4;
+	$prevyear--;
 }
 $nextyear = $year_start;
 $nextquarter = $q;
 if ($nextquarter < 4) {
-    $nextquarter++;
+	$nextquarter++;
 } else {
-    $nextquarter = 1;
-    $nextyear++;
+	$nextquarter = 1;
+	$nextyear++;
 }
 $builddate = dol_now();
 
@@ -178,7 +178,7 @@ if ($conf->global->TAX_MODE_SELL_PRODUCT == 'payment') $description .= $langs->t
 if ($conf->global->TAX_MODE_SELL_SERVICE == 'invoice') $description .= '<br>'.$langs->trans("RulesVATDueServices");
 if ($conf->global->TAX_MODE_SELL_SERVICE == 'payment') $description .= '<br>'.$langs->trans("RulesVATInServices");
 if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
-    $description .= '<br>'.$langs->trans("DepositsAreNotIncluded");
+	$description .= '<br>'.$langs->trans("DepositsAreNotIncluded");
 }
 if (!empty($conf->global->MAIN_MODULE_ACCOUNTING)) $description .= '<br>'.$langs->trans("ThisIsAnEstimatedValue");
 
@@ -186,15 +186,15 @@ if (!empty($conf->global->MAIN_MODULE_ACCOUNTING)) $description .= '<br>'.$langs
 $description .= ($description ? '<br>' : '').$fsearch;
 if (!empty($conf->global->TAX_REPORT_EXTRA_REPORT))
 {
-    $description .= '<br>';
-    $description .= '<input type="radio" name="extra_report" value="0" '.($special_report ? '' : 'checked="checked"').'> ';
-    $description .= $langs->trans('SimpleReport');
-    $description .= '</input>';
-    $description .= '<br>';
-    $description .= '<input type="radio" name="extra_report" value="1" '.($special_report ? 'checked="checked"' : '').'> ';
-    $description .= $langs->trans('AddExtraReport');
-    $description .= '</input>';
-    $description .= '<br>';
+	$description .= '<br>';
+	$description .= '<input type="radio" name="extra_report" value="0" '.($special_report ? '' : 'checked="checked"').'> ';
+	$description .= $langs->trans('SimpleReport');
+	$description .= '</input>';
+	$description .= '<br>';
+	$description .= '<input type="radio" name="extra_report" value="1" '.($special_report ? 'checked="checked"' : '').'> ';
+	$description .= $langs->trans('AddExtraReport');
+	$description .= '</input>';
+	$description .= '<br>';
 }
 
 $elementcust = $langs->trans("CustomersInvoices");
@@ -202,13 +202,13 @@ $productcust = $langs->trans("Description");
 $namerate = $langs->trans("VATRate");
 $amountcust = $langs->trans("AmountHT");
 if ($mysoc->tva_assuj) {
-    $vatcust .= ' ('.$langs->trans("StatusToPay").')';
+	$vatcust .= ' ('.$langs->trans("StatusToPay").')';
 }
 $elementsup = $langs->trans("SuppliersInvoices");
 $productsup = $langs->trans("Description");
 $amountsup = $langs->trans("AmountHT");
 if ($mysoc->tva_assuj) {
-    $vatsup .= ' ('.$langs->trans("ToGetBack").')';
+	$vatsup .= ' ('.$langs->trans("ToGetBack").')';
 }
 report_header($name, '', $period, $periodlink, $description, $builddate, $exportlink, array(), $calcmode);
 
@@ -231,529 +231,529 @@ $x_paye = tax_by_thirdparty('vat', $db, 0, $date_start, $date_end, $modetax, 'bu
 
 if (!is_array($x_coll) || !is_array($x_paye))
 {
-    $langs->load("errors");
-    if ($x_coll == -1) {
-        print '<tr><td colspan="'.$columns.'">'.$langs->trans("ErrorNoAccountancyModuleLoaded").'</td></tr>';
-    } elseif ($x_coll == -2) {
-        print '<tr><td colspan="'.$columns.'">'.$langs->trans("FeatureNotYetAvailable").'</td></tr>';
-    } else {
-        print '<tr><td colspan="'.$columns.'">'.$langs->trans("Error").'</td></tr>';
-    }
+	$langs->load("errors");
+	if ($x_coll == -1) {
+		print '<tr><td colspan="'.$columns.'">'.$langs->trans("ErrorNoAccountancyModuleLoaded").'</td></tr>';
+	} elseif ($x_coll == -2) {
+		print '<tr><td colspan="'.$columns.'">'.$langs->trans("FeatureNotYetAvailable").'</td></tr>';
+	} else {
+		print '<tr><td colspan="'.$columns.'">'.$langs->trans("Error").'</td></tr>';
+	}
 } else {
-    $x_both = array();
-    //now, from these two arrays, get another array with one rate per line
-    foreach (array_keys($x_coll) as $my_coll_thirdpartyid)
-    {
-        $x_both[$my_coll_thirdpartyid]['coll']['totalht'] = $x_coll[$my_coll_thirdpartyid]['totalht'];
-        $x_both[$my_coll_thirdpartyid]['coll']['vat'] = $x_coll[$my_coll_thirdpartyid]['vat'];
-        $x_both[$my_coll_thirdpartyid]['paye']['totalht'] = 0;
-        $x_both[$my_coll_thirdpartyid]['paye']['vat'] = 0;
-        $x_both[$my_coll_thirdpartyid]['coll']['links'] = '';
-        $x_both[$my_coll_thirdpartyid]['coll']['detail'] = array();
-        foreach ($x_coll[$my_coll_thirdpartyid]['facid'] as $id=>$dummy) {
-            $invoice_customer->id = $x_coll[$my_coll_thirdpartyid]['facid'][$id];
-            $invoice_customer->ref = $x_coll[$my_coll_thirdpartyid]['facnum'][$id];
-            $invoice_customer->type = $x_coll[$my_coll_thirdpartyid]['type'][$id];
-            $company_static->fetch($x_coll[$my_coll_thirdpartyid]['company_id'][$id]);
-            $x_both[$my_coll_thirdpartyid]['coll']['detail'][] = array(
-                'id'        =>$x_coll[$my_coll_thirdpartyid]['facid'][$id],
-                'descr'     =>$x_coll[$my_coll_thirdpartyid]['descr'][$id],
-                'pid'       =>$x_coll[$my_coll_thirdpartyid]['pid'][$id],
-                'pref'      =>$x_coll[$my_coll_thirdpartyid]['pref'][$id],
-                'ptype'     =>$x_coll[$my_coll_thirdpartyid]['ptype'][$id],
-                'payment_id'=>$x_coll[$my_coll_thirdpartyid]['payment_id'][$id],
-                'payment_amount'=>$x_coll[$my_coll_thirdpartyid]['payment_amount'][$id],
-                'ftotal_ttc'=>$x_coll[$my_coll_thirdpartyid]['ftotal_ttc'][$id],
-                'dtotal_ttc'=>$x_coll[$my_coll_thirdpartyid]['dtotal_ttc'][$id],
-                'dtype'     =>$x_coll[$my_coll_thirdpartyid]['dtype'][$id],
-                'drate'     =>$x_coll[$my_coll_thirdpartyid]['drate'][$id],
-                'datef'     =>$x_coll[$my_coll_thirdpartyid]['datef'][$id],
-                'datep'     =>$x_coll[$my_coll_thirdpartyid]['datep'][$id],
-                'company_link'=>$company_static->getNomUrl(1, '', 20),
-                'ddate_start'=>$x_coll[$my_coll_thirdpartyid]['ddate_start'][$id],
-                'ddate_end'  =>$x_coll[$my_coll_thirdpartyid]['ddate_end'][$id],
-                'totalht'   =>$x_coll[$my_coll_thirdpartyid]['totalht_list'][$id],
-                'vat'       =>$x_coll[$my_coll_thirdpartyid]['vat_list'][$id],
-                'link'      =>$invoice_customer->getNomUrl(1, '', 12)
-            );
-        }
-    }
-    // tva paid
-    foreach (array_keys($x_paye) as $my_paye_thirdpartyid) {
-        $x_both[$my_paye_thirdpartyid]['paye']['totalht'] = $x_paye[$my_paye_thirdpartyid]['totalht'];
-        $x_both[$my_paye_thirdpartyid]['paye']['vat'] = $x_paye[$my_paye_thirdpartyid]['vat'];
-        if (!isset($x_both[$my_paye_thirdpartyid]['coll']['totalht'])) {
-            $x_both[$my_paye_thirdpartyid]['coll']['totalht'] = 0;
-            $x_both[$my_paye_thirdpartyid]['coll']['vat'] = 0;
-        }
-        $x_both[$my_paye_thirdpartyid]['paye']['links'] = '';
-        $x_both[$my_paye_thirdpartyid]['paye']['detail'] = array();
+	$x_both = array();
+	//now, from these two arrays, get another array with one rate per line
+	foreach (array_keys($x_coll) as $my_coll_thirdpartyid)
+	{
+		$x_both[$my_coll_thirdpartyid]['coll']['totalht'] = $x_coll[$my_coll_thirdpartyid]['totalht'];
+		$x_both[$my_coll_thirdpartyid]['coll']['vat'] = $x_coll[$my_coll_thirdpartyid]['vat'];
+		$x_both[$my_coll_thirdpartyid]['paye']['totalht'] = 0;
+		$x_both[$my_coll_thirdpartyid]['paye']['vat'] = 0;
+		$x_both[$my_coll_thirdpartyid]['coll']['links'] = '';
+		$x_both[$my_coll_thirdpartyid]['coll']['detail'] = array();
+		foreach ($x_coll[$my_coll_thirdpartyid]['facid'] as $id=>$dummy) {
+			$invoice_customer->id = $x_coll[$my_coll_thirdpartyid]['facid'][$id];
+			$invoice_customer->ref = $x_coll[$my_coll_thirdpartyid]['facnum'][$id];
+			$invoice_customer->type = $x_coll[$my_coll_thirdpartyid]['type'][$id];
+			$company_static->fetch($x_coll[$my_coll_thirdpartyid]['company_id'][$id]);
+			$x_both[$my_coll_thirdpartyid]['coll']['detail'][] = array(
+				'id'        =>$x_coll[$my_coll_thirdpartyid]['facid'][$id],
+				'descr'     =>$x_coll[$my_coll_thirdpartyid]['descr'][$id],
+				'pid'       =>$x_coll[$my_coll_thirdpartyid]['pid'][$id],
+				'pref'      =>$x_coll[$my_coll_thirdpartyid]['pref'][$id],
+				'ptype'     =>$x_coll[$my_coll_thirdpartyid]['ptype'][$id],
+				'payment_id'=>$x_coll[$my_coll_thirdpartyid]['payment_id'][$id],
+				'payment_amount'=>$x_coll[$my_coll_thirdpartyid]['payment_amount'][$id],
+				'ftotal_ttc'=>$x_coll[$my_coll_thirdpartyid]['ftotal_ttc'][$id],
+				'dtotal_ttc'=>$x_coll[$my_coll_thirdpartyid]['dtotal_ttc'][$id],
+				'dtype'     =>$x_coll[$my_coll_thirdpartyid]['dtype'][$id],
+				'drate'     =>$x_coll[$my_coll_thirdpartyid]['drate'][$id],
+				'datef'     =>$x_coll[$my_coll_thirdpartyid]['datef'][$id],
+				'datep'     =>$x_coll[$my_coll_thirdpartyid]['datep'][$id],
+				'company_link'=>$company_static->getNomUrl(1, '', 20),
+				'ddate_start'=>$x_coll[$my_coll_thirdpartyid]['ddate_start'][$id],
+				'ddate_end'  =>$x_coll[$my_coll_thirdpartyid]['ddate_end'][$id],
+				'totalht'   =>$x_coll[$my_coll_thirdpartyid]['totalht_list'][$id],
+				'vat'       =>$x_coll[$my_coll_thirdpartyid]['vat_list'][$id],
+				'link'      =>$invoice_customer->getNomUrl(1, '', 12)
+			);
+		}
+	}
+	// tva paid
+	foreach (array_keys($x_paye) as $my_paye_thirdpartyid) {
+		$x_both[$my_paye_thirdpartyid]['paye']['totalht'] = $x_paye[$my_paye_thirdpartyid]['totalht'];
+		$x_both[$my_paye_thirdpartyid]['paye']['vat'] = $x_paye[$my_paye_thirdpartyid]['vat'];
+		if (!isset($x_both[$my_paye_thirdpartyid]['coll']['totalht'])) {
+			$x_both[$my_paye_thirdpartyid]['coll']['totalht'] = 0;
+			$x_both[$my_paye_thirdpartyid]['coll']['vat'] = 0;
+		}
+		$x_both[$my_paye_thirdpartyid]['paye']['links'] = '';
+		$x_both[$my_paye_thirdpartyid]['paye']['detail'] = array();
 
-        foreach ($x_paye[$my_paye_thirdpartyid]['facid'] as $id=>$dummy)
-        {
-            // ExpenseReport
-            if ($x_paye[$my_paye_thirdpartyid]['ptype'][$id] == 'ExpenseReportPayment')
-            {
-                $expensereport->id = $x_paye[$my_paye_thirdpartyid]['facid'][$id];
-                $expensereport->ref = $x_paye[$my_paye_thirdpartyid]['facnum'][$id];
-                $expensereport->type = $x_paye[$my_paye_thirdpartyid]['type'][$id];
+		foreach ($x_paye[$my_paye_thirdpartyid]['facid'] as $id=>$dummy)
+		{
+			// ExpenseReport
+			if ($x_paye[$my_paye_thirdpartyid]['ptype'][$id] == 'ExpenseReportPayment')
+			{
+				$expensereport->id = $x_paye[$my_paye_thirdpartyid]['facid'][$id];
+				$expensereport->ref = $x_paye[$my_paye_thirdpartyid]['facnum'][$id];
+				$expensereport->type = $x_paye[$my_paye_thirdpartyid]['type'][$id];
 
-                $x_both[$my_paye_thirdpartyid]['paye']['detail'][] = array(
-                    'id'				=>$x_paye[$my_paye_thirdpartyid]['facid'][$id],
-                    'descr'				=>$x_paye[$my_paye_thirdpartyid]['descr'][$id],
-                    'pid'				=>$x_paye[$my_paye_thirdpartyid]['pid'][$id],
-                    'pref'				=>$x_paye[$my_paye_thirdpartyid]['pref'][$id],
-                    'ptype'				=>$x_paye[$my_paye_thirdpartyid]['ptype'][$id],
-                    'payment_id'		=>$x_paye[$my_paye_thirdpartyid]['payment_id'][$id],
-                    'payment_amount'	=>$x_paye[$my_paye_thirdpartyid]['payment_amount'][$id],
-                    'ftotal_ttc'		=>price2num($x_paye[$my_paye_thirdpartyid]['ftotal_ttc'][$id]),
-                    'dtotal_ttc'		=>price2num($x_paye[$my_paye_thirdpartyid]['dtotal_ttc'][$id]),
-                    'dtype'				=>$x_paye[$my_paye_thirdpartyid]['dtype'][$id],
-                    'drate'             =>$x_paye[$my_coll_thirdpartyid]['drate'][$id],
-                    'ddate_start'		=>$x_paye[$my_paye_thirdpartyid]['ddate_start'][$id],
-                    'ddate_end'			=>$x_paye[$my_paye_thirdpartyid]['ddate_end'][$id],
-                    'totalht'			=>price2num($x_paye[$my_paye_thirdpartyid]['totalht_list'][$id]),
-                    'vat'				=>$x_paye[$my_paye_thirdpartyid]['vat_list'][$id],
-                    'link'				=>$expensereport->getNomUrl(1)
-                );
-            } else {
-                $invoice_supplier->id = $x_paye[$my_paye_thirdpartyid]['facid'][$id];
-                $invoice_supplier->ref = $x_paye[$my_paye_thirdpartyid]['facnum'][$id];
-                $invoice_supplier->type = $x_paye[$my_paye_thirdpartyid]['type'][$id];
-                $company_static->fetch($x_paye[$my_paye_thirdpartyid]['company_id'][$id]);
-                $x_both[$my_paye_thirdpartyid]['paye']['detail'][] = array(
-                    'id'        =>$x_paye[$my_paye_thirdpartyid]['facid'][$id],
-                    'descr'     =>$x_paye[$my_paye_thirdpartyid]['descr'][$id],
-                    'pid'       =>$x_paye[$my_paye_thirdpartyid]['pid'][$id],
-                    'pref'      =>$x_paye[$my_paye_thirdpartyid]['pref'][$id],
-                    'ptype'     =>$x_paye[$my_paye_thirdpartyid]['ptype'][$id],
-                    'payment_id'=>$x_paye[$my_paye_thirdpartyid]['payment_id'][$id],
-                    'payment_amount'=>$x_paye[$my_paye_thirdpartyid]['payment_amount'][$id],
-                    'ftotal_ttc'=>price2num($x_paye[$my_paye_thirdpartyid]['ftotal_ttc'][$id]),
-                    'dtotal_ttc'=>price2num($x_paye[$my_paye_thirdpartyid]['dtotal_ttc'][$id]),
-                    'dtype'     =>$x_paye[$my_paye_thirdpartyid]['dtype'][$id],
-                    'drate'     =>$x_paye[$my_coll_thirdpartyid]['drate'][$id],
-                    'datef'     =>$x_paye[$my_paye_thirdpartyid]['datef'][$id],
-                    'datep'     =>$x_paye[$my_paye_thirdpartyid]['datep'][$id],
-                    'company_link'=>$company_static->getNomUrl(1, '', 20),
-                    'ddate_start'=>$x_paye[$my_paye_thirdpartyid]['ddate_start'][$id],
-                    'ddate_end'  =>$x_paye[$my_paye_thirdpartyid]['ddate_end'][$id],
-                    'totalht'   =>price2num($x_paye[$my_paye_thirdpartyid]['totalht_list'][$id]),
-                    'vat'       =>$x_paye[$my_paye_thirdpartyid]['vat_list'][$id],
-                    'link'      =>$invoice_supplier->getNomUrl(1, '', 12)
-                );
-            }
-        }
-    }
-    //now we have an array (x_both) indexed by rates for coll and paye
+				$x_both[$my_paye_thirdpartyid]['paye']['detail'][] = array(
+					'id'				=>$x_paye[$my_paye_thirdpartyid]['facid'][$id],
+					'descr'				=>$x_paye[$my_paye_thirdpartyid]['descr'][$id],
+					'pid'				=>$x_paye[$my_paye_thirdpartyid]['pid'][$id],
+					'pref'				=>$x_paye[$my_paye_thirdpartyid]['pref'][$id],
+					'ptype'				=>$x_paye[$my_paye_thirdpartyid]['ptype'][$id],
+					'payment_id'		=>$x_paye[$my_paye_thirdpartyid]['payment_id'][$id],
+					'payment_amount'	=>$x_paye[$my_paye_thirdpartyid]['payment_amount'][$id],
+					'ftotal_ttc'		=>price2num($x_paye[$my_paye_thirdpartyid]['ftotal_ttc'][$id]),
+					'dtotal_ttc'		=>price2num($x_paye[$my_paye_thirdpartyid]['dtotal_ttc'][$id]),
+					'dtype'				=>$x_paye[$my_paye_thirdpartyid]['dtype'][$id],
+					'drate'             =>$x_paye[$my_coll_thirdpartyid]['drate'][$id],
+					'ddate_start'		=>$x_paye[$my_paye_thirdpartyid]['ddate_start'][$id],
+					'ddate_end'			=>$x_paye[$my_paye_thirdpartyid]['ddate_end'][$id],
+					'totalht'			=>price2num($x_paye[$my_paye_thirdpartyid]['totalht_list'][$id]),
+					'vat'				=>$x_paye[$my_paye_thirdpartyid]['vat_list'][$id],
+					'link'				=>$expensereport->getNomUrl(1)
+				);
+			} else {
+				$invoice_supplier->id = $x_paye[$my_paye_thirdpartyid]['facid'][$id];
+				$invoice_supplier->ref = $x_paye[$my_paye_thirdpartyid]['facnum'][$id];
+				$invoice_supplier->type = $x_paye[$my_paye_thirdpartyid]['type'][$id];
+				$company_static->fetch($x_paye[$my_paye_thirdpartyid]['company_id'][$id]);
+				$x_both[$my_paye_thirdpartyid]['paye']['detail'][] = array(
+					'id'        =>$x_paye[$my_paye_thirdpartyid]['facid'][$id],
+					'descr'     =>$x_paye[$my_paye_thirdpartyid]['descr'][$id],
+					'pid'       =>$x_paye[$my_paye_thirdpartyid]['pid'][$id],
+					'pref'      =>$x_paye[$my_paye_thirdpartyid]['pref'][$id],
+					'ptype'     =>$x_paye[$my_paye_thirdpartyid]['ptype'][$id],
+					'payment_id'=>$x_paye[$my_paye_thirdpartyid]['payment_id'][$id],
+					'payment_amount'=>$x_paye[$my_paye_thirdpartyid]['payment_amount'][$id],
+					'ftotal_ttc'=>price2num($x_paye[$my_paye_thirdpartyid]['ftotal_ttc'][$id]),
+					'dtotal_ttc'=>price2num($x_paye[$my_paye_thirdpartyid]['dtotal_ttc'][$id]),
+					'dtype'     =>$x_paye[$my_paye_thirdpartyid]['dtype'][$id],
+					'drate'     =>$x_paye[$my_coll_thirdpartyid]['drate'][$id],
+					'datef'     =>$x_paye[$my_paye_thirdpartyid]['datef'][$id],
+					'datep'     =>$x_paye[$my_paye_thirdpartyid]['datep'][$id],
+					'company_link'=>$company_static->getNomUrl(1, '', 20),
+					'ddate_start'=>$x_paye[$my_paye_thirdpartyid]['ddate_start'][$id],
+					'ddate_end'  =>$x_paye[$my_paye_thirdpartyid]['ddate_end'][$id],
+					'totalht'   =>price2num($x_paye[$my_paye_thirdpartyid]['totalht_list'][$id]),
+					'vat'       =>$x_paye[$my_paye_thirdpartyid]['vat_list'][$id],
+					'link'      =>$invoice_supplier->getNomUrl(1, '', 12)
+				);
+			}
+		}
+	}
+	//now we have an array (x_both) indexed by rates for coll and paye
 
 
-    //print table headers for this quadri - incomes first
+	//print table headers for this quadri - incomes first
 
-    $x_coll_sum = 0;
-    $x_coll_ht = 0;
-    $x_paye_sum = 0;
-    $x_paye_ht = 0;
+	$x_coll_sum = 0;
+	$x_coll_ht = 0;
+	$x_paye_sum = 0;
+	$x_paye_ht = 0;
 
-    $span = $columns;
-    if ($modetax != 1) $span += 2;
+	$span = $columns;
+	if ($modetax != 1) $span += 2;
 
-    //print '<tr><td colspan="'.($span+1).'">'..')</td></tr>';
+	//print '<tr><td colspan="'.($span+1).'">'..')</td></tr>';
 
-    // Customers invoices
-    print '<tr class="liste_titre">';
-    print '<td class="left">'.$elementcust.'</td>';
-    print '<td class="left">'.$langs->trans("DateInvoice").'</td>';
-    if ($conf->global->TAX_MODE_SELL_PRODUCT == 'payment' || $conf->global->TAX_MODE_SELL_SERVICE == 'payment') print '<td class="left">'.$langs->trans("DatePayment").'</td>';
-    else print '<td></td>';
-    print '<td class="right">'.$namerate.'</td>';
-    print '<td class="left">'.$productcust.'</td>';
-    if ($modetax != 1)
-    {
-        print '<td class="right">'.$amountcust.'</td>';
-        print '<td class="right">'.$langs->trans("Payment").' ('.$langs->trans("PercentOfInvoice").')</td>';
-    }
-    print '<td class="right">'.$langs->trans("AmountHTVATRealReceived").'</td>';
-    print '<td class="right">'.$vatcust.'</td>';
-    print '</tr>';
+	// Customers invoices
+	print '<tr class="liste_titre">';
+	print '<td class="left">'.$elementcust.'</td>';
+	print '<td class="left">'.$langs->trans("DateInvoice").'</td>';
+	if ($conf->global->TAX_MODE_SELL_PRODUCT == 'payment' || $conf->global->TAX_MODE_SELL_SERVICE == 'payment') print '<td class="left">'.$langs->trans("DatePayment").'</td>';
+	else print '<td></td>';
+	print '<td class="right">'.$namerate.'</td>';
+	print '<td class="left">'.$productcust.'</td>';
+	if ($modetax != 1)
+	{
+		print '<td class="right">'.$amountcust.'</td>';
+		print '<td class="right">'.$langs->trans("Payment").' ('.$langs->trans("PercentOfInvoice").')</td>';
+	}
+	print '<td class="right">'.$langs->trans("AmountHTVATRealReceived").'</td>';
+	print '<td class="right">'.$vatcust.'</td>';
+	print '</tr>';
 
-    $action = "tvadetail";
-    $parameters["mode"] = $modetax;
-    $parameters["start"] = $date_start;
-    $parameters["end"] = $date_end;
-    $parameters["type"] = 'vat';
+	$action = "tvadetail";
+	$parameters["mode"] = $modetax;
+	$parameters["start"] = $date_start;
+	$parameters["end"] = $date_end;
+	$parameters["type"] = 'vat';
 
-    $object = array(&$x_coll, &$x_paye, &$x_both);
-    // Initialize technical object to manage hooks of expenses. Note that conf->hooks_modules contains array array
-    $hookmanager->initHooks(array('externalbalance'));
-    $reshook = $hookmanager->executeHooks('addVatLine', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+	$object = array(&$x_coll, &$x_paye, &$x_both);
+	// Initialize technical object to manage hooks of expenses. Note that conf->hooks_modules contains array array
+	$hookmanager->initHooks(array('externalbalance'));
+	$reshook = $hookmanager->executeHooks('addVatLine', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 
-    foreach (array_keys($x_coll) as $thirdparty_id) {
-        $subtot_coll_total_ht = 0;
-        $subtot_coll_vat = 0;
+	foreach (array_keys($x_coll) as $thirdparty_id) {
+		$subtot_coll_total_ht = 0;
+		$subtot_coll_vat = 0;
 
-        if ($min == 0 || ($min > 0 && $x_both[$thirdparty_id]['coll']['totalht'] > $min))
-        {
-            if (is_array($x_both[$thirdparty_id]['coll']['detail']))
-            {
-                // VAT Rate
-                print "<tr>";
-                print '<td class="tax_rate">';
-                if (is_numeric($thirdparty_id)) {
-                    $company_static->fetch($thirdparty_id);
-                    print $langs->trans("ThirdParty").': '.$company_static->getNomUrl(1);
-                } else {
-                    $tmpid = preg_replace('/userid_/', '', $thirdparty_id);
-                    $user_static->fetch($tmpid);
-                    print $langs->trans("User").': '.$user_static->getNomUrl(1);
-                }
-                print '</td><td colspan="'.($span + 1).'"></td>';
-                print '</tr>'."\n";
+		if ($min == 0 || ($min > 0 && $x_both[$thirdparty_id]['coll']['totalht'] > $min))
+		{
+			if (is_array($x_both[$thirdparty_id]['coll']['detail']))
+			{
+				// VAT Rate
+				print "<tr>";
+				print '<td class="tax_rate">';
+				if (is_numeric($thirdparty_id)) {
+					$company_static->fetch($thirdparty_id);
+					print $langs->trans("ThirdParty").': '.$company_static->getNomUrl(1);
+				} else {
+					$tmpid = preg_replace('/userid_/', '', $thirdparty_id);
+					$user_static->fetch($tmpid);
+					print $langs->trans("User").': '.$user_static->getNomUrl(1);
+				}
+				print '</td><td colspan="'.($span + 1).'"></td>';
+				print '</tr>'."\n";
 
-                foreach ($x_both[$thirdparty_id]['coll']['detail'] as $index => $fields) {
-                    // Define type
-                    // We MUST use dtype (type in line). We can use something else, only if dtype is really unknown.
-                    $type = (isset($fields['dtype']) ? $fields['dtype'] : $fields['ptype']);
-                    // Try to enhance type detection using date_start and date_end for free lines where type
-                    // was not saved.
-                    if (!empty($fields['ddate_start'])) {
-                        $type = 1;
-                    }
-                    if (!empty($fields['ddate_end'])) {
-                        $type = 1;
-                    }
+				foreach ($x_both[$thirdparty_id]['coll']['detail'] as $index => $fields) {
+					// Define type
+					// We MUST use dtype (type in line). We can use something else, only if dtype is really unknown.
+					$type = (isset($fields['dtype']) ? $fields['dtype'] : $fields['ptype']);
+					// Try to enhance type detection using date_start and date_end for free lines where type
+					// was not saved.
+					if (!empty($fields['ddate_start'])) {
+						$type = 1;
+					}
+					if (!empty($fields['ddate_end'])) {
+						$type = 1;
+					}
 
-                    print '<tr class="oddeven">';
+					print '<tr class="oddeven">';
 
-                    // Ref
-                    print '<td class="nowrap left">'.$fields['link'].'</td>';
+					// Ref
+					print '<td class="nowrap left">'.$fields['link'].'</td>';
 
-                    // Invoice date
-                    print '<td class="left">'.dol_print_date($fields['datef'], 'day').'</td>';
+					// Invoice date
+					print '<td class="left">'.dol_print_date($fields['datef'], 'day').'</td>';
 
-                    // Payment date
-                    if ($conf->global->TAX_MODE_SELL_PRODUCT == 'payment' || $conf->global->TAX_MODE_SELL_SERVICE == 'payment') {
-                        print '<td class="left">'.dol_print_date($fields['datep'], 'day').'</td>';
-                    } else {
-                        print '<td></td>';
-                    }
+					// Payment date
+					if ($conf->global->TAX_MODE_SELL_PRODUCT == 'payment' || $conf->global->TAX_MODE_SELL_SERVICE == 'payment') {
+						print '<td class="left">'.dol_print_date($fields['datep'], 'day').'</td>';
+					} else {
+						print '<td></td>';
+					}
 
-                    // Rate
-                    print '<td class="right">'.$fields['drate'].'</td>';
+					// Rate
+					print '<td class="right">'.$fields['drate'].'</td>';
 
-                    // Description
-                    print '<td class="left">';
-                    if ($fields['pid']) {
-                        $product_static->id = $fields['pid'];
-                        $product_static->ref = $fields['pref'];
-                        $product_static->type = $fields['dtype']; // We force with the type of line to have type how line is registered
-                        print $product_static->getNomUrl(1);
-                        if (dol_string_nohtmltag($fields['descr'])) {
-                            print ' - '.dol_trunc(dol_string_nohtmltag($fields['descr']), 24);
-                        }
-                    } else {
-                        if ($type) {
-                            $text = img_object($langs->trans('Service'), 'service');
-                        } else {
-                            $text = img_object($langs->trans('Product'), 'product');
-                        }
-                        if (preg_match('/^\((.*)\)$/', $fields['descr'], $reg)) {
-                            if ($reg[1] == 'DEPOSIT') {
-                                $fields['descr'] = $langs->transnoentitiesnoconv('Deposit');
-                            } elseif ($reg[1] == 'CREDIT_NOTE') {
-                                $fields['descr'] = $langs->transnoentitiesnoconv('CreditNote');
-                            } else {
-                                $fields['descr'] = $langs->transnoentitiesnoconv($reg[1]);
-                            }
-                        }
-                        print $text.' '.dol_trunc(dol_string_nohtmltag($fields['descr']), 24);
+					// Description
+					print '<td class="left">';
+					if ($fields['pid']) {
+						$product_static->id = $fields['pid'];
+						$product_static->ref = $fields['pref'];
+						$product_static->type = $fields['dtype']; // We force with the type of line to have type how line is registered
+						print $product_static->getNomUrl(1);
+						if (dol_string_nohtmltag($fields['descr'])) {
+							print ' - '.dol_trunc(dol_string_nohtmltag($fields['descr']), 24);
+						}
+					} else {
+						if ($type) {
+							$text = img_object($langs->trans('Service'), 'service');
+						} else {
+							$text = img_object($langs->trans('Product'), 'product');
+						}
+						if (preg_match('/^\((.*)\)$/', $fields['descr'], $reg)) {
+							if ($reg[1] == 'DEPOSIT') {
+								$fields['descr'] = $langs->transnoentitiesnoconv('Deposit');
+							} elseif ($reg[1] == 'CREDIT_NOTE') {
+								$fields['descr'] = $langs->transnoentitiesnoconv('CreditNote');
+							} else {
+								$fields['descr'] = $langs->transnoentitiesnoconv($reg[1]);
+							}
+						}
+						print $text.' '.dol_trunc(dol_string_nohtmltag($fields['descr']), 24);
 
-                        // Show range
-                        print_date_range($fields['ddate_start'], $fields['ddate_end']);
-                    }
-                    print '</td>';
+						// Show range
+						print_date_range($fields['ddate_start'], $fields['ddate_end']);
+					}
+					print '</td>';
 
-                    // Total HT
-                    if ($modetax != 1) {
-                        print '<td class="nowrap right">';
-                        print price($fields['totalht']);
-                        if (price2num($fields['ftotal_ttc'])) {
-                            //print $fields['dtotal_ttc']."/".$fields['ftotal_ttc']." - ";
-                            $ratiolineinvoice = ($fields['dtotal_ttc'] / $fields['ftotal_ttc']);
-                            //print ' ('.round($ratiolineinvoice*100,2).'%)';
-                        }
-                        print '</td>';
-                    }
+					// Total HT
+					if ($modetax != 1) {
+						print '<td class="nowrap right">';
+						print price($fields['totalht']);
+						if (price2num($fields['ftotal_ttc'])) {
+							//print $fields['dtotal_ttc']."/".$fields['ftotal_ttc']." - ";
+							$ratiolineinvoice = ($fields['dtotal_ttc'] / $fields['ftotal_ttc']);
+							//print ' ('.round($ratiolineinvoice*100,2).'%)';
+						}
+						print '</td>';
+					}
 
-                    // Payment
-                    $ratiopaymentinvoice = 1;
-                    if ($modetax != 1) {
-                        print '<td class="nowrap right">';
-                        //print $fields['totalht']."-".$fields['payment_amount']."-".$fields['ftotal_ttc'];
-                        if ($fields['payment_amount'] && $fields['ftotal_ttc']) {
-                            $payment_static->id = $fields['payment_id'];
-                            print $payment_static->getNomUrl(2);
-                        }
-                        if (($type == 0 && $conf->global->TAX_MODE_SELL_PRODUCT == 'invoice')
-                            || ($type == 1 && $conf->global->TAX_MODE_SELL_SERVICE == 'invoice')) {
-                                print $langs->trans("NA");
-                        } else {
-                            if (isset($fields['payment_amount']) && price2num($fields['ftotal_ttc'])) {
-                                $ratiopaymentinvoice = ($fields['payment_amount'] / $fields['ftotal_ttc']);
-                            }
-                            print price(price2num($fields['payment_amount'], 'MT'));
-                            if (isset($fields['payment_amount'])) {
-                                print ' ('.round($ratiopaymentinvoice * 100, 2).'%)';
-                            }
-                        }
-                        print '</td>';
-                    }
+					// Payment
+					$ratiopaymentinvoice = 1;
+					if ($modetax != 1) {
+						print '<td class="nowrap right">';
+						//print $fields['totalht']."-".$fields['payment_amount']."-".$fields['ftotal_ttc'];
+						if ($fields['payment_amount'] && $fields['ftotal_ttc']) {
+							$payment_static->id = $fields['payment_id'];
+							print $payment_static->getNomUrl(2);
+						}
+						if (($type == 0 && $conf->global->TAX_MODE_SELL_PRODUCT == 'invoice')
+							|| ($type == 1 && $conf->global->TAX_MODE_SELL_SERVICE == 'invoice')) {
+								print $langs->trans("NA");
+						} else {
+							if (isset($fields['payment_amount']) && price2num($fields['ftotal_ttc'])) {
+								$ratiopaymentinvoice = ($fields['payment_amount'] / $fields['ftotal_ttc']);
+							}
+							print price(price2num($fields['payment_amount'], 'MT'));
+							if (isset($fields['payment_amount'])) {
+								print ' ('.round($ratiopaymentinvoice * 100, 2).'%)';
+							}
+						}
+						print '</td>';
+					}
 
-                    // Total collected
-                    print '<td class="nowrap right">';
-                    $temp_ht = $fields['totalht'] * $ratiopaymentinvoice;
-                    print price(price2num($temp_ht, 'MT'), 1);
-                    print '</td>';
+					// Total collected
+					print '<td class="nowrap right">';
+					$temp_ht = $fields['totalht'] * $ratiopaymentinvoice;
+					print price(price2num($temp_ht, 'MT'), 1);
+					print '</td>';
 
-                    // VAT
-                    print '<td class="nowrap right">';
-                    $temp_vat = $fields['vat'] * $ratiopaymentinvoice;
-                    print price(price2num($temp_vat, 'MT'), 1);
-                    //print price($fields['vat']);
-                    print '</td>';
-                    print '</tr>';
+					// VAT
+					print '<td class="nowrap right">';
+					$temp_vat = $fields['vat'] * $ratiopaymentinvoice;
+					print price(price2num($temp_vat, 'MT'), 1);
+					//print price($fields['vat']);
+					print '</td>';
+					print '</tr>';
 
-                    $subtot_coll_total_ht += $temp_ht;
-                    $subtot_coll_vat += $temp_vat;
-                    $x_coll_sum += $temp_vat;
-                }
-            }
-            // Total customers for this vat rate
-            print '<tr class="liste_total">';
-            print '<td colspan="4"></td>';
-            print '<td class="right">'.$langs->trans("Total").':</td>';
-            if ($modetax != 1) {
-                print '<td class="nowrap right">&nbsp;</td>';
-                print '<td class="right">&nbsp;</td>';
-            }
-            print '<td class="right">'.price(price2num($subtot_coll_total_ht, 'MT')).'</td>';
-            print '<td class="nowrap right">'.price(price2num($subtot_coll_vat, 'MT')).'</td>';
-            print '</tr>';
-        }
-    }
+					$subtot_coll_total_ht += $temp_ht;
+					$subtot_coll_vat += $temp_vat;
+					$x_coll_sum += $temp_vat;
+				}
+			}
+			// Total customers for this vat rate
+			print '<tr class="liste_total">';
+			print '<td colspan="4"></td>';
+			print '<td class="right">'.$langs->trans("Total").':</td>';
+			if ($modetax != 1) {
+				print '<td class="nowrap right">&nbsp;</td>';
+				print '<td class="right">&nbsp;</td>';
+			}
+			print '<td class="right">'.price(price2num($subtot_coll_total_ht, 'MT')).'</td>';
+			print '<td class="nowrap right">'.price(price2num($subtot_coll_vat, 'MT')).'</td>';
+			print '</tr>';
+		}
+	}
 
-    if (count($x_coll) == 0)   // Show a total ine if nothing shown
-    {
-        print '<tr class="liste_total">';
-        print '<td colspan="4"></td>';
-        print '<td class="right">'.$langs->trans("Total").':</td>';
-        if ($modetax != 1) {
-            print '<td class="nowrap right">&nbsp;</td>';
-            print '<td class="right">&nbsp;</td>';
-        }
-        print '<td class="right">'.price(price2num(0, 'MT')).'</td>';
-        print '<td class="nowrap right">'.price(price2num(0, 'MT')).'</td>';
-        print '</tr>';
-    }
+	if (count($x_coll) == 0)   // Show a total ine if nothing shown
+	{
+		print '<tr class="liste_total">';
+		print '<td colspan="4"></td>';
+		print '<td class="right">'.$langs->trans("Total").':</td>';
+		if ($modetax != 1) {
+			print '<td class="nowrap right">&nbsp;</td>';
+			print '<td class="right">&nbsp;</td>';
+		}
+		print '<td class="right">'.price(price2num(0, 'MT')).'</td>';
+		print '<td class="nowrap right">'.price(price2num(0, 'MT')).'</td>';
+		print '</tr>';
+	}
 
-    // Blank line
-    print '<tr><td colspan="'.($span + 1).'">&nbsp;</td></tr>';
+	// Blank line
+	print '<tr><td colspan="'.($span + 1).'">&nbsp;</td></tr>';
 
-    // Print table headers for this quadri - expenses now
-    print '<tr class="liste_titre liste_titre_topborder">';
-    print '<td class="left">'.$elementsup.'</td>';
-    print '<td class="left">'.$langs->trans("DateInvoice").'</td>';
-    if ($conf->global->TAX_MODE_BUY_PRODUCT == 'payment' || $conf->global->TAX_MODE_BUY_SERVICE == 'payment') print '<td class="left">'.$langs->trans("DatePayment").'</td>';
-    else print '<td></td>';
-    print '<td class="left">'.$namesup.'</td>';
-    print '<td class="left">'.$productsup.'</td>';
-    if ($modetax != 1) {
-        print '<td class="right">'.$amountsup.'</td>';
-        print '<td class="right">'.$langs->trans("Payment").' ('.$langs->trans("PercentOfInvoice").')</td>';
-    }
-    print '<td class="right">'.$langs->trans("AmountHTVATRealPaid").'</td>';
-    print '<td class="right">'.$vatsup.'</td>';
-    print '</tr>'."\n";
+	// Print table headers for this quadri - expenses now
+	print '<tr class="liste_titre liste_titre_topborder">';
+	print '<td class="left">'.$elementsup.'</td>';
+	print '<td class="left">'.$langs->trans("DateInvoice").'</td>';
+	if ($conf->global->TAX_MODE_BUY_PRODUCT == 'payment' || $conf->global->TAX_MODE_BUY_SERVICE == 'payment') print '<td class="left">'.$langs->trans("DatePayment").'</td>';
+	else print '<td></td>';
+	print '<td class="left">'.$namesup.'</td>';
+	print '<td class="left">'.$productsup.'</td>';
+	if ($modetax != 1) {
+		print '<td class="right">'.$amountsup.'</td>';
+		print '<td class="right">'.$langs->trans("Payment").' ('.$langs->trans("PercentOfInvoice").')</td>';
+	}
+	print '<td class="right">'.$langs->trans("AmountHTVATRealPaid").'</td>';
+	print '<td class="right">'.$vatsup.'</td>';
+	print '</tr>'."\n";
 
-    foreach (array_keys($x_paye) as $thirdparty_id)
-    {
-        $subtot_paye_total_ht = 0;
-        $subtot_paye_vat = 0;
+	foreach (array_keys($x_paye) as $thirdparty_id)
+	{
+		$subtot_paye_total_ht = 0;
+		$subtot_paye_vat = 0;
 
-        if ($min == 0 || ($min > 0 && $x_both[$thirdparty_id]['paye']['totalht'] > $min)) {
-            if (is_array($x_both[$thirdparty_id]['paye']['detail'])) {
-                print "<tr>";
-                print '<td class="tax_rate">';
-                if (is_numeric($thirdparty_id)) {
-                    $company_static->fetch($thirdparty_id);
-                    print $langs->trans("ThirdParty").': '.$company_static->getNomUrl(1);
-                } else {
-                    $tmpid = preg_replace('/userid_/', '', $thirdparty_id);
-                    $user_static->fetch($tmpid);
-                    print $langs->trans("User").': '.$user_static->getNomUrl(1);
-                }
-                print '<td colspan="'.($span + 1).'"></td>';
-                print '</tr>'."\n";
+		if ($min == 0 || ($min > 0 && $x_both[$thirdparty_id]['paye']['totalht'] > $min)) {
+			if (is_array($x_both[$thirdparty_id]['paye']['detail'])) {
+				print "<tr>";
+				print '<td class="tax_rate">';
+				if (is_numeric($thirdparty_id)) {
+					$company_static->fetch($thirdparty_id);
+					print $langs->trans("ThirdParty").': '.$company_static->getNomUrl(1);
+				} else {
+					$tmpid = preg_replace('/userid_/', '', $thirdparty_id);
+					$user_static->fetch($tmpid);
+					print $langs->trans("User").': '.$user_static->getNomUrl(1);
+				}
+				print '<td colspan="'.($span + 1).'"></td>';
+				print '</tr>'."\n";
 
-                foreach ($x_both[$thirdparty_id]['paye']['detail'] as $index => $fields) {
-                    // Define type
-                    // We MUST use dtype (type in line). We can use something else, only if dtype is really unknown.
-                    $type = (isset($fields['dtype']) ? $fields['dtype'] : $fields['ptype']);
-                    // Try to enhance type detection using date_start and date_end for free lines where type
-                    // was not saved.
-                    if (!empty($fields['ddate_start'])) {
-                        $type = 1;
-                    }
-                    if (!empty($fields['ddate_end'])) {
-                        $type = 1;
-                    }
+				foreach ($x_both[$thirdparty_id]['paye']['detail'] as $index => $fields) {
+					// Define type
+					// We MUST use dtype (type in line). We can use something else, only if dtype is really unknown.
+					$type = (isset($fields['dtype']) ? $fields['dtype'] : $fields['ptype']);
+					// Try to enhance type detection using date_start and date_end for free lines where type
+					// was not saved.
+					if (!empty($fields['ddate_start'])) {
+						$type = 1;
+					}
+					if (!empty($fields['ddate_end'])) {
+						$type = 1;
+					}
 
 
-                    print '<tr class="oddeven">';
+					print '<tr class="oddeven">';
 
-                    // Ref
-                    print '<td class="nowrap left">'.$fields['link'].'</td>';
+					// Ref
+					print '<td class="nowrap left">'.$fields['link'].'</td>';
 
-                    // Invoice date
-                    print '<td class="left">'.dol_print_date($fields['datef'], 'day').'</td>';
+					// Invoice date
+					print '<td class="left">'.dol_print_date($fields['datef'], 'day').'</td>';
 
-                    // Payment date
-                    if ($conf->global->TAX_MODE_BUY_PRODUCT == 'payment' || $conf->global->TAX_MODE_BUY_SERVICE == 'payment') {
-                        print '<td class="left">'.dol_print_date($fields['datep'], 'day').'</td>';
-                    } else {
-                        print '<td></td>';
-                    }
+					// Payment date
+					if ($conf->global->TAX_MODE_BUY_PRODUCT == 'payment' || $conf->global->TAX_MODE_BUY_SERVICE == 'payment') {
+						print '<td class="left">'.dol_print_date($fields['datep'], 'day').'</td>';
+					} else {
+						print '<td></td>';
+					}
 
-                    // Company name
-                    print '<td class="left">'.$fields['company_link'].'</td>';
+					// Company name
+					print '<td class="left">'.$fields['company_link'].'</td>';
 
-                    // Description
-                    print '<td class="left">';
-                    if ($fields['pid']) {
-                        $product_static->id = $fields['pid'];
-                        $product_static->ref = $fields['pref'];
-                        $product_static->type = $fields['dtype']; // We force with the type of line to have type how line is registered
-                        print $product_static->getNomUrl(1);
-                        if (dol_string_nohtmltag($fields['descr'])) {
-                            print ' - '.dol_trunc(dol_string_nohtmltag($fields['descr']), 24);
-                        }
-                    } else {
-                        if ($type) {
-                            $text = img_object($langs->trans('Service'), 'service');
-                        } else {
-                            $text = img_object($langs->trans('Product'), 'product');
-                        }
-                        if (preg_match('/^\((.*)\)$/', $fields['descr'], $reg)) {
-                            if ($reg[1] == 'DEPOSIT') {
-                                $fields['descr'] = $langs->transnoentitiesnoconv('Deposit');
-                            } elseif ($reg[1] == 'CREDIT_NOTE') {
-                                $fields['descr'] = $langs->transnoentitiesnoconv('CreditNote');
-                            } else {
-                                $fields['descr'] = $langs->transnoentitiesnoconv($reg[1]);
-                            }
-                        }
-                        print $text.' '.dol_trunc(dol_string_nohtmltag($fields['descr']), 24);
+					// Description
+					print '<td class="left">';
+					if ($fields['pid']) {
+						$product_static->id = $fields['pid'];
+						$product_static->ref = $fields['pref'];
+						$product_static->type = $fields['dtype']; // We force with the type of line to have type how line is registered
+						print $product_static->getNomUrl(1);
+						if (dol_string_nohtmltag($fields['descr'])) {
+							print ' - '.dol_trunc(dol_string_nohtmltag($fields['descr']), 24);
+						}
+					} else {
+						if ($type) {
+							$text = img_object($langs->trans('Service'), 'service');
+						} else {
+							$text = img_object($langs->trans('Product'), 'product');
+						}
+						if (preg_match('/^\((.*)\)$/', $fields['descr'], $reg)) {
+							if ($reg[1] == 'DEPOSIT') {
+								$fields['descr'] = $langs->transnoentitiesnoconv('Deposit');
+							} elseif ($reg[1] == 'CREDIT_NOTE') {
+								$fields['descr'] = $langs->transnoentitiesnoconv('CreditNote');
+							} else {
+								$fields['descr'] = $langs->transnoentitiesnoconv($reg[1]);
+							}
+						}
+						print $text.' '.dol_trunc(dol_string_nohtmltag($fields['descr']), 24);
 
-                        // Show range
-                        print_date_range($fields['ddate_start'], $fields['ddate_end']);
-                    }
-                    print '</td>';
+						// Show range
+						print_date_range($fields['ddate_start'], $fields['ddate_end']);
+					}
+					print '</td>';
 
-                    // Total HT
-                    if ($modetax != 1) {
-                        print '<td class="nowrap right">';
-                        print price($fields['totalht']);
-                        if (price2num($fields['ftotal_ttc'])) {
-                            //print $fields['dtotal_ttc']."/".$fields['ftotal_ttc']." - ";
-                            $ratiolineinvoice = ($fields['dtotal_ttc'] / $fields['ftotal_ttc']);
-                            //print ' ('.round($ratiolineinvoice*100,2).'%)';
-                        }
-                        print '</td>';
-                    }
+					// Total HT
+					if ($modetax != 1) {
+						print '<td class="nowrap right">';
+						print price($fields['totalht']);
+						if (price2num($fields['ftotal_ttc'])) {
+							//print $fields['dtotal_ttc']."/".$fields['ftotal_ttc']." - ";
+							$ratiolineinvoice = ($fields['dtotal_ttc'] / $fields['ftotal_ttc']);
+							//print ' ('.round($ratiolineinvoice*100,2).'%)';
+						}
+						print '</td>';
+					}
 
-                    // Payment
-                    $ratiopaymentinvoice = 1;
-                    if ($modetax != 1)
-                    {
-                        print '<td class="nowrap right">';
-                        if ($fields['payment_amount'] && $fields['ftotal_ttc'])
-                        {
-                            $paymentfourn_static->id = $fields['payment_id'];
-                            print $paymentfourn_static->getNomUrl(2);
-                        }
+					// Payment
+					$ratiopaymentinvoice = 1;
+					if ($modetax != 1)
+					{
+						print '<td class="nowrap right">';
+						if ($fields['payment_amount'] && $fields['ftotal_ttc'])
+						{
+							$paymentfourn_static->id = $fields['payment_id'];
+							print $paymentfourn_static->getNomUrl(2);
+						}
 
-                        if (($type == 0 && $conf->global->TAX_MODE_BUY_PRODUCT == 'invoice')
-                            || ($type == 1 && $conf->global->TAX_MODE_BUY_SERVICE == 'invoice'))
-                        {
-                            print $langs->trans("NA");
-                        } else {
-                            if (isset($fields['payment_amount']) && $fields['ftotal_ttc']) {
-                                $ratiopaymentinvoice = ($fields['payment_amount'] / $fields['ftotal_ttc']);
-                            }
-                            print price(price2num($fields['payment_amount'], 'MT'));
-                            if (isset($fields['payment_amount'])) {
-                                print ' ('.round($ratiopaymentinvoice * 100, 2).'%)';
-                            }
-                        }
-                        print '</td>';
-                    }
+						if (($type == 0 && $conf->global->TAX_MODE_BUY_PRODUCT == 'invoice')
+							|| ($type == 1 && $conf->global->TAX_MODE_BUY_SERVICE == 'invoice'))
+						{
+							print $langs->trans("NA");
+						} else {
+							if (isset($fields['payment_amount']) && $fields['ftotal_ttc']) {
+								$ratiopaymentinvoice = ($fields['payment_amount'] / $fields['ftotal_ttc']);
+							}
+							print price(price2num($fields['payment_amount'], 'MT'));
+							if (isset($fields['payment_amount'])) {
+								print ' ('.round($ratiopaymentinvoice * 100, 2).'%)';
+							}
+						}
+						print '</td>';
+					}
 
-                    // VAT paid
-                    print '<td class="nowrap right">';
-                    $temp_ht = $fields['totalht'] * $ratiopaymentinvoice;
-                    print price(price2num($temp_ht, 'MT'), 1);
-                    print '</td>';
+					// VAT paid
+					print '<td class="nowrap right">';
+					$temp_ht = $fields['totalht'] * $ratiopaymentinvoice;
+					print price(price2num($temp_ht, 'MT'), 1);
+					print '</td>';
 
-                    // VAT
-                    print '<td class="nowrap right">';
-                    $temp_vat = $fields['vat'] * $ratiopaymentinvoice;
-                    print price(price2num($temp_vat, 'MT'), 1);
-                    //print price($fields['vat']);
-                    print '</td>';
-                    print '</tr>';
+					// VAT
+					print '<td class="nowrap right">';
+					$temp_vat = $fields['vat'] * $ratiopaymentinvoice;
+					print price(price2num($temp_vat, 'MT'), 1);
+					//print price($fields['vat']);
+					print '</td>';
+					print '</tr>';
 
-                    $subtot_paye_total_ht += $temp_ht;
-                    $subtot_paye_vat += $temp_vat;
-                    $x_paye_sum += $temp_vat;
-                }
-            }
-            // Total suppliers for this vat rate
-            print '<tr class="liste_total">';
-            print '<td colspan="4"></td>';
-            print '<td class="right">'.$langs->trans("Total").':</td>';
-            if ($modetax != 1) {
-                print '<td class="nowrap right">&nbsp;</td>';
-                print '<td class="right">&nbsp;</td>';
-            }
-            print '<td class="right">'.price(price2num($subtot_paye_total_ht, 'MT')).'</td>';
-            print '<td class="nowrap right">'.price(price2num($subtot_paye_vat, 'MT')).'</td>';
-            print '</tr>';
-        }
-    }
+					$subtot_paye_total_ht += $temp_ht;
+					$subtot_paye_vat += $temp_vat;
+					$x_paye_sum += $temp_vat;
+				}
+			}
+			// Total suppliers for this vat rate
+			print '<tr class="liste_total">';
+			print '<td colspan="4"></td>';
+			print '<td class="right">'.$langs->trans("Total").':</td>';
+			if ($modetax != 1) {
+				print '<td class="nowrap right">&nbsp;</td>';
+				print '<td class="right">&nbsp;</td>';
+			}
+			print '<td class="right">'.price(price2num($subtot_paye_total_ht, 'MT')).'</td>';
+			print '<td class="nowrap right">'.price(price2num($subtot_paye_vat, 'MT')).'</td>';
+			print '</tr>';
+		}
+	}
 
-    if (count($x_paye) == 0) {  // Show a total line if nothing shown
-        print '<tr class="liste_total">';
-        print '<td colspan="4"></td>';
-        print '<td class="right">'.$langs->trans("Total").':</td>';
-        if ($modetax != 1) {
-            print '<td class="nowrap right">&nbsp;</td>';
-            print '<td class="right">&nbsp;</td>';
-        }
-        print '<td class="right">'.price(price2num(0, 'MT')).'</td>';
-        print '<td class="nowrap right">'.price(price2num(0, 'MT')).'</td>';
-        print '</tr>';
-    }
+	if (count($x_paye) == 0) {  // Show a total line if nothing shown
+		print '<tr class="liste_total">';
+		print '<td colspan="4"></td>';
+		print '<td class="right">'.$langs->trans("Total").':</td>';
+		if ($modetax != 1) {
+			print '<td class="nowrap right">&nbsp;</td>';
+			print '<td class="right">&nbsp;</td>';
+		}
+		print '<td class="right">'.price(price2num(0, 'MT')).'</td>';
+		print '<td class="nowrap right">'.price(price2num(0, 'MT')).'</td>';
+		print '</tr>';
+	}
 
-    // Total to pay
-    print '<tr><td colspan="'.($span+2).'"></td></tr>';
+	// Total to pay
+	print '<tr><td colspan="'.($span + 2).'"></td></tr>';
 
-    $diff = $x_coll_sum - $x_paye_sum;
-    print '<tr class="liste_total">';
-    print '<td class="liste_total" colspan="'.($span+1).'">'.$langs->trans("TotalToPay").($q ? ', '.$langs->trans("Quadri").' '.$q : '').'</td>';
-    print '<td class="liste_total nowrap right"><b>'.price(price2num($diff, 'MT'))."</b></td>\n";
-    print "</tr>\n";
+	$diff = $x_coll_sum - $x_paye_sum;
+	print '<tr class="liste_total">';
+	print '<td class="liste_total" colspan="'.($span + 1).'">'.$langs->trans("TotalToPay").($q ? ', '.$langs->trans("Quadri").' '.$q : '').'</td>';
+	print '<td class="liste_total nowrap right"><b>'.price(price2num($diff, 'MT'))."</b></td>\n";
+	print "</tr>\n";
 
-    $i++;
+	$i++;
 }
 
 print '</table>';
diff --git a/htdocs/compta/tva/document.php b/htdocs/compta/tva/document.php
index 8d097e6aad5..e310e61fcb8 100644
--- a/htdocs/compta/tva/document.php
+++ b/htdocs/compta/tva/document.php
@@ -36,8 +36,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/vat.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 if (!empty($conf->projet->enabled))
 {
-    require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
-    require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 }
 
 // Load translation files required by the page
@@ -58,7 +58,7 @@ $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
-    $page = 0;
+	$page = 0;
 }
 $offset = $limit * $page;
 $pageprev = $page - 1;
@@ -82,10 +82,10 @@ include_once DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
 
 if ($action == 'setlib' && $user->rights->tax->charges->creer)
 {
-    $object->fetch($id);
-    $result = $object->setValueFrom('label', GETPOST('lib', 'alpha'), '', '', 'text', '', $user, 'TAX_MODIFY');
-    if ($result < 0)
-        setEventMessages($object->error, $object->errors, 'errors');
+	$object->fetch($id);
+	$result = $object->setValueFrom('label', GETPOST('lib', 'alpha'), '', '', 'text', '', $user, 'TAX_MODIFY');
+	if ($result < 0)
+		setEventMessages($object->error, $object->errors, 'errors');
 }
 
 
@@ -104,9 +104,9 @@ if ($object->id)
 {
 	$alreadypayed = $object->getSommePaiement();
 
-    $head = vat_prepare_head($object);
+	$head = vat_prepare_head($object);
 
-    print dol_get_fiche_head($head, 'documents', $langs->trans("VATPayment"), -1, 'payment');
+	print dol_get_fiche_head($head, 'documents', $langs->trans("VATPayment"), -1, 'payment');
 
 	$morehtmlref = '<div class="refidno">';
 	// Label of social contribution
@@ -123,33 +123,33 @@ if ($object->id)
 	print '<div class="fichecenter">';
 	print '<div class="underbanner clearboth"></div>';
 
-    // Build file list
-    $filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
-    $totalsize = 0;
-    foreach ($filearray as $key => $file)
-    {
-        $totalsize += $file['size'];
-    }
+	// Build file list
+	$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
+	$totalsize = 0;
+	foreach ($filearray as $key => $file)
+	{
+		$totalsize += $file['size'];
+	}
 
 
-    print '<table class="border tableforfield centpercent">';
+	print '<table class="border tableforfield centpercent">';
 
-    print '<tr><td class="titlefield">'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
-    print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.dol_print_size($totalsize, 1, 1).'</td></tr>';
-    print '</table>';
+	print '<tr><td class="titlefield">'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
+	print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.dol_print_size($totalsize, 1, 1).'</td></tr>';
+	print '</table>';
 
-    print '</div>';
+	print '</div>';
 
-    print '<div class="clearboth"></div>';
+	print '<div class="clearboth"></div>';
 
-    dol_fiche_end();
+	print dol_get_fiche_end();
 
-    $permission = $user->rights->tax->charges->creer;
-    $permtoedit = $user->rights->fournisseur->facture->creer;
-    $param = '&id='.$object->id;
-    include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
+	$permission = $user->rights->tax->charges->creer;
+	$permtoedit = $user->rights->fournisseur->facture->creer;
+	$param = '&id='.$object->id;
+	include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
 } else {
-    print $langs->trans("ErrorUnknown");
+	print $langs->trans("ErrorUnknown");
 }
 
 
diff --git a/htdocs/compta/tva/index.php b/htdocs/compta/tva/index.php
index a4fd1293b4d..4a16d996ab8 100644
--- a/htdocs/compta/tva/index.php
+++ b/htdocs/compta/tva/index.php
@@ -108,100 +108,100 @@ $result = restrictedArea($user, 'tax', '', '', 'charges');
  */
 function pt($db, $sql, $date)
 {
-    global $conf, $bc, $langs;
+	global $conf, $bc, $langs;
 
-    $result = $db->query($sql);
-    if ($result) {
-        $num = $db->num_rows($result);
-        $i = 0;
-        $total = 0;
-        print '<table class="noborder centpercent">';
+	$result = $db->query($sql);
+	if ($result) {
+		$num = $db->num_rows($result);
+		$i = 0;
+		$total = 0;
+		print '<table class="noborder centpercent">';
 
-        print '<tr class="liste_titre">';
-        print '<td class="nowrap">'.$date.'</td>';
-        print '<td class="right">'.$langs->trans("ClaimedForThisPeriod").'</td>';
-        print '<td class="right">'.$langs->trans("PaidDuringThisPeriod").'</td>';
-        print "</tr>\n";
+		print '<tr class="liste_titre">';
+		print '<td class="nowrap">'.$date.'</td>';
+		print '<td class="right">'.$langs->trans("ClaimedForThisPeriod").'</td>';
+		print '<td class="right">'.$langs->trans("PaidDuringThisPeriod").'</td>';
+		print "</tr>\n";
 
-        $totalclaimed = 0;
-        $totalpaid = 0;
-        $amountclaimed = 0;
-        $amountpaid = 0;
-        $previousmonth = '';
-        $previousmode = '';
-        $mode = '';
+		$totalclaimed = 0;
+		$totalpaid = 0;
+		$amountclaimed = 0;
+		$amountpaid = 0;
+		$previousmonth = '';
+		$previousmode = '';
+		$mode = '';
 
-        while ($i < $num) {
-            $obj = $db->fetch_object($result);
-            $mode = $obj->mode;
+		while ($i < $num) {
+			$obj = $db->fetch_object($result);
+			$mode = $obj->mode;
 
-            //print $obj->dm.' '.$obj->mode.' '.$previousmonth.' '.$previousmode;
-            if ($obj->mode == 'claimed' && !empty($previousmode))
-            {
-            	print '<tr class="oddeven">';
-            	print '<td class="nowrap">'.$previousmonth."</td>\n";
-            	print '<td class="nowrap right">'.price($amountclaimed)."</td>\n";
-            	print '<td class="nowrap right">'.price($amountpaid)."</td>\n";
-            	print "</tr>\n";
+			//print $obj->dm.' '.$obj->mode.' '.$previousmonth.' '.$previousmode;
+			if ($obj->mode == 'claimed' && !empty($previousmode))
+			{
+				print '<tr class="oddeven">';
+				print '<td class="nowrap">'.$previousmonth."</td>\n";
+				print '<td class="nowrap right">'.price($amountclaimed)."</td>\n";
+				print '<td class="nowrap right">'.price($amountpaid)."</td>\n";
+				print "</tr>\n";
 
-            	$amountclaimed = 0;
-            	$amountpaid = 0;
-            }
+				$amountclaimed = 0;
+				$amountpaid = 0;
+			}
 
-            if ($obj->mode == 'claimed')
-            {
-            	$amountclaimed = $obj->mm;
-            	$totalclaimed = $totalclaimed + $amountclaimed;
-            }
-            if ($obj->mode == 'paid')
-            {
-            	$amountpaid = $obj->mm;
-            	$totalpaid = $totalpaid + $amountpaid;
-            }
+			if ($obj->mode == 'claimed')
+			{
+				$amountclaimed = $obj->mm;
+				$totalclaimed = $totalclaimed + $amountclaimed;
+			}
+			if ($obj->mode == 'paid')
+			{
+				$amountpaid = $obj->mm;
+				$totalpaid = $totalpaid + $amountpaid;
+			}
 
-            if ($obj->mode == 'paid')
-            {
-            	print '<tr class="oddeven">';
-            	print '<td class="nowrap">'.$obj->dm."</td>\n";
-            	print '<td class="nowrap right">'.price($amountclaimed)."</td>\n";
-            	print '<td class="nowrap right">'.price($amountpaid)."</td>\n";
-            	print "</tr>\n";
-            	$amountclaimed = 0;
-            	$amountpaid = 0;
-            	$previousmode = '';
-            	$previousmonth = '';
-            } else {
-            	$previousmode = $obj->mode;
-            	$previousmonth = $obj->dm;
-            }
+			if ($obj->mode == 'paid')
+			{
+				print '<tr class="oddeven">';
+				print '<td class="nowrap">'.$obj->dm."</td>\n";
+				print '<td class="nowrap right">'.price($amountclaimed)."</td>\n";
+				print '<td class="nowrap right">'.price($amountpaid)."</td>\n";
+				print "</tr>\n";
+				$amountclaimed = 0;
+				$amountpaid = 0;
+				$previousmode = '';
+				$previousmonth = '';
+			} else {
+				$previousmode = $obj->mode;
+				$previousmonth = $obj->dm;
+			}
 
-            $i++;
-        }
+			$i++;
+		}
 
-        if ($mode == 'claimed' && !empty($previousmode))
-        {
-        	print '<tr class="oddeven">';
-        	print '<td class="nowrap">'.$previousmonth."</td>\n";
-        	print '<td class="nowrap right">'.price($amountclaimed)."</td>\n";
-        	print '<td class="nowrap right">'.price($amountpaid)."</td>\n";
-        	print "</tr>\n";
+		if ($mode == 'claimed' && !empty($previousmode))
+		{
+			print '<tr class="oddeven">';
+			print '<td class="nowrap">'.$previousmonth."</td>\n";
+			print '<td class="nowrap right">'.price($amountclaimed)."</td>\n";
+			print '<td class="nowrap right">'.price($amountpaid)."</td>\n";
+			print "</tr>\n";
 
-        	$amountclaimed = 0;
-        	$amountpaid = 0;
-        }
+			$amountclaimed = 0;
+			$amountpaid = 0;
+		}
 
-        print '<tr class="liste_total">';
-        print '<td class="right">'.$langs->trans("Total").'</td>';
-        print '<td class="nowrap right">'.price($totalclaimed).'</td>';
-        print '<td class="nowrap right">'.price($totalpaid).'</td>';
-        print "</tr>";
+		print '<tr class="liste_total">';
+		print '<td class="right">'.$langs->trans("Total").'</td>';
+		print '<td class="nowrap right">'.price($totalclaimed).'</td>';
+		print '<td class="nowrap right">'.price($totalpaid).'</td>';
+		print "</tr>";
 
-        print "</table>";
+		print "</table>";
 
-        $db->free($result);
-    } else {
-        dol_print_error($db);
-    }
+		$db->free($result);
+	} else {
+		dol_print_error($db);
+	}
 }
 
 
@@ -392,144 +392,144 @@ while ((($y < $yend) || ($y == $yend && $m <= $mend)) && $mcursor < 1000)	// $mc
 	}
 	//now we have an array (x_both) indexed by rates for coll and paye
 
-    $action = "tva";
-    $object = array(&$x_coll, &$x_paye, &$x_both);
-    $parameters["mode"] = $modetax;
-    $parameters["year"] = $y;
-    $parameters["month"] = $m;
-    $parameters["type"] = 'vat';
+	$action = "tva";
+	$object = array(&$x_coll, &$x_paye, &$x_both);
+	$parameters["mode"] = $modetax;
+	$parameters["year"] = $y;
+	$parameters["month"] = $m;
+	$parameters["type"] = 'vat';
 
-    // Initialize technical object to manage hooks of expenses. Note that conf->hooks_modules contains array array
-    $hookmanager->initHooks(array('externalbalance'));
-    $reshook = $hookmanager->executeHooks('addVatLine', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+	// Initialize technical object to manage hooks of expenses. Note that conf->hooks_modules contains array array
+	$hookmanager->initHooks(array('externalbalance'));
+	$reshook = $hookmanager->executeHooks('addVatLine', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 
-    if (!is_array($x_coll) && $coll_listbuy == -1)
-    {
-        $langs->load("errors");
-        print '<tr><td colspan="5">'.$langs->trans("ErrorNoAccountancyModuleLoaded").'</td></tr>';
-        break;
-    }
-    if (!is_array($x_paye) && $coll_listbuy == -2)
-    {
-        print '<tr><td colspan="5">'.$langs->trans("FeatureNotYetAvailable").'</td></tr>';
-        break;
-    }
+	if (!is_array($x_coll) && $coll_listbuy == -1)
+	{
+		$langs->load("errors");
+		print '<tr><td colspan="5">'.$langs->trans("ErrorNoAccountancyModuleLoaded").'</td></tr>';
+		break;
+	}
+	if (!is_array($x_paye) && $coll_listbuy == -2)
+	{
+		print '<tr><td colspan="5">'.$langs->trans("FeatureNotYetAvailable").'</td></tr>';
+		break;
+	}
 
 
-    print '<tr class="oddeven">';
-    print '<td class="nowrap"><a href="'.DOL_URL_ROOT.'/compta/tva/quadri_detail.php?leftmenu=tax_vat&month='.$m.'&year='.$y.'">'.dol_print_date(dol_mktime(0, 0, 0, $m, 1, $y), "%b %Y").'</a></td>';
+	print '<tr class="oddeven">';
+	print '<td class="nowrap"><a href="'.DOL_URL_ROOT.'/compta/tva/quadri_detail.php?leftmenu=tax_vat&month='.$m.'&year='.$y.'">'.dol_print_date(dol_mktime(0, 0, 0, $m, 1, $y), "%b %Y").'</a></td>';
 
-    $x_coll_sum = 0;
-    foreach (array_keys($x_coll) as $rate)
-    {
-    	$subtot_coll_total_ht = 0;
-    	$subtot_coll_vat = 0;
+	$x_coll_sum = 0;
+	foreach (array_keys($x_coll) as $rate)
+	{
+		$subtot_coll_total_ht = 0;
+		$subtot_coll_vat = 0;
 
-    	foreach ($x_both[$rate]['coll']['detail'] as $index => $fields)
-	    {
-	    	// Payment
-	    	$ratiopaymentinvoice = 1;
-	    	if ($modetax != 1)
-	    	{
-	    		// Define type
-	    		// We MUST use dtype (type in line). We can use something else, only if dtype is really unknown.
-	    		$type = (isset($fields['dtype']) ? $fields['dtype'] : $fields['ptype']);
-	    		// Try to enhance type detection using date_start and date_end for free lines where type
-	    		// was not saved.
-	    		if (!empty($fields['ddate_start'])) {
-	    			$type = 1;
-	    		}
-	    		if (!empty($fields['ddate_end'])) {
-	    			$type = 1;
-	    		}
+		foreach ($x_both[$rate]['coll']['detail'] as $index => $fields)
+		{
+			// Payment
+			$ratiopaymentinvoice = 1;
+			if ($modetax != 1)
+			{
+				// Define type
+				// We MUST use dtype (type in line). We can use something else, only if dtype is really unknown.
+				$type = (isset($fields['dtype']) ? $fields['dtype'] : $fields['ptype']);
+				// Try to enhance type detection using date_start and date_end for free lines where type
+				// was not saved.
+				if (!empty($fields['ddate_start'])) {
+					$type = 1;
+				}
+				if (!empty($fields['ddate_end'])) {
+					$type = 1;
+				}
 
-	    		if (($type == 0 && $conf->global->TAX_MODE_SELL_PRODUCT == 'invoice')
-	    			|| ($type == 1 && $conf->global->TAX_MODE_SELL_SERVICE == 'invoice'))
-	    		{
-	    			//print $langs->trans("NA");
-	    		} else {
-	    			if (isset($fields['payment_amount']) && price2num($fields['ftotal_ttc'])) {
-	    				$ratiopaymentinvoice = ($fields['payment_amount'] / $fields['ftotal_ttc']);
-	    			}
-	    		}
-	    	}
-	    	//var_dump('type='.$type.' '.$fields['totalht'].' '.$ratiopaymentinvoice);
-	    	$temp_ht = $fields['totalht'] * $ratiopaymentinvoice;
-	    	$temp_vat = $fields['vat'] * $ratiopaymentinvoice;
-	    	$subtot_coll_total_ht += $temp_ht;
-	    	$subtot_coll_vat      += $temp_vat;
-	    	$x_coll_sum           += $temp_vat;
-	    }
-    }
-    print '<td class="nowrap right">'.price(price2num($x_coll_sum, 'MT')).'</td>';
+				if (($type == 0 && $conf->global->TAX_MODE_SELL_PRODUCT == 'invoice')
+					|| ($type == 1 && $conf->global->TAX_MODE_SELL_SERVICE == 'invoice'))
+				{
+					//print $langs->trans("NA");
+				} else {
+					if (isset($fields['payment_amount']) && price2num($fields['ftotal_ttc'])) {
+						$ratiopaymentinvoice = ($fields['payment_amount'] / $fields['ftotal_ttc']);
+					}
+				}
+			}
+			//var_dump('type='.$type.' '.$fields['totalht'].' '.$ratiopaymentinvoice);
+			$temp_ht = $fields['totalht'] * $ratiopaymentinvoice;
+			$temp_vat = $fields['vat'] * $ratiopaymentinvoice;
+			$subtot_coll_total_ht += $temp_ht;
+			$subtot_coll_vat      += $temp_vat;
+			$x_coll_sum           += $temp_vat;
+		}
+	}
+	print '<td class="nowrap right">'.price(price2num($x_coll_sum, 'MT')).'</td>';
 
-    $x_paye_sum = 0;
-    foreach (array_keys($x_paye) as $rate)
-    {
-    	$subtot_paye_total_ht = 0;
-    	$subtot_paye_vat = 0;
+	$x_paye_sum = 0;
+	foreach (array_keys($x_paye) as $rate)
+	{
+		$subtot_paye_total_ht = 0;
+		$subtot_paye_vat = 0;
 
-	    foreach ($x_both[$rate]['paye']['detail'] as $index => $fields)
-	    {
-	    	// Payment
-	    	$ratiopaymentinvoice = 1;
-	    	if ($modetax != 1)
-	    	{
-	    		// Define type
-	    		// We MUST use dtype (type in line). We can use something else, only if dtype is really unknown.
-	    		$type = (isset($fields['dtype']) ? $fields['dtype'] : $fields['ptype']);
-	    		// Try to enhance type detection using date_start and date_end for free lines where type
-	    		// was not saved.
-	    		if (!empty($fields['ddate_start'])) {
-	    			$type = 1;
-	    		}
-	    		if (!empty($fields['ddate_end'])) {
-	    			$type = 1;
-	    		}
+		foreach ($x_both[$rate]['paye']['detail'] as $index => $fields)
+		{
+			// Payment
+			$ratiopaymentinvoice = 1;
+			if ($modetax != 1)
+			{
+				// Define type
+				// We MUST use dtype (type in line). We can use something else, only if dtype is really unknown.
+				$type = (isset($fields['dtype']) ? $fields['dtype'] : $fields['ptype']);
+				// Try to enhance type detection using date_start and date_end for free lines where type
+				// was not saved.
+				if (!empty($fields['ddate_start'])) {
+					$type = 1;
+				}
+				if (!empty($fields['ddate_end'])) {
+					$type = 1;
+				}
 
-	    		if (($type == 0 && $conf->global->TAX_MODE_SELL_PRODUCT == 'invoice')
-	    			|| ($type == 1 && $conf->global->TAX_MODE_SELL_SERVICE == 'invoice'))
-	    		{
-	    			//print $langs->trans("NA");
-	    		} else {
-	    			if (isset($fields['payment_amount']) && price2num($fields['ftotal_ttc'])) {
-	    				$ratiopaymentinvoice = ($fields['payment_amount'] / $fields['ftotal_ttc']);
-	    			}
-	    		}
-	    	}
-	    	//var_dump('type='.$type.' '.$fields['totalht'].' '.$ratiopaymentinvoice);
-	    	$temp_ht = $fields['totalht'] * $ratiopaymentinvoice;
-	    	$temp_vat = $fields['vat'] * $ratiopaymentinvoice;
-	    	$subtot_paye_total_ht += $temp_ht;
-	    	$subtot_paye_vat      += $temp_vat;
-	    	$x_paye_sum           += $temp_vat;
-	    }
-    }
-    print '<td class="nowrap right">'.price(price2num($x_paye_sum, 'MT')).'</td>';
+				if (($type == 0 && $conf->global->TAX_MODE_SELL_PRODUCT == 'invoice')
+					|| ($type == 1 && $conf->global->TAX_MODE_SELL_SERVICE == 'invoice'))
+				{
+					//print $langs->trans("NA");
+				} else {
+					if (isset($fields['payment_amount']) && price2num($fields['ftotal_ttc'])) {
+						$ratiopaymentinvoice = ($fields['payment_amount'] / $fields['ftotal_ttc']);
+					}
+				}
+			}
+			//var_dump('type='.$type.' '.$fields['totalht'].' '.$ratiopaymentinvoice);
+			$temp_ht = $fields['totalht'] * $ratiopaymentinvoice;
+			$temp_vat = $fields['vat'] * $ratiopaymentinvoice;
+			$subtot_paye_total_ht += $temp_ht;
+			$subtot_paye_vat      += $temp_vat;
+			$x_paye_sum           += $temp_vat;
+		}
+	}
+	print '<td class="nowrap right">'.price(price2num($x_paye_sum, 'MT')).'</td>';
 
-    $subtotalcoll = $subtotalcoll + $x_coll_sum;
-    $subtotalpaye = $subtotalpaye + $x_paye_sum;
+	$subtotalcoll = $subtotalcoll + $x_coll_sum;
+	$subtotalpaye = $subtotalpaye + $x_paye_sum;
 
-    $diff = $x_coll_sum - $x_paye_sum;
-    $total = $total + $diff;
-    $subtotal = price2num($subtotal + $diff, 'MT');
+	$diff = $x_coll_sum - $x_paye_sum;
+	$total = $total + $diff;
+	$subtotal = price2num($subtotal + $diff, 'MT');
 
-    print '<td class="nowrap right">'.price(price2num($diff, 'MT')).'</td>'."\n";
-    print "<td>&nbsp;</td>\n";
-    print "</tr>\n";
+	print '<td class="nowrap right">'.price(price2num($diff, 'MT')).'</td>'."\n";
+	print "<td>&nbsp;</td>\n";
+	print "</tr>\n";
 
-    $i++; $m++;
-    if ($i > 2)
-    {
-        print '<tr class="liste_total">';
-        print '<td class="right"><a href="quadri_detail.php?leftmenu=tax_vat&q='.round($m / 3).'&year='.$y.'">'.$langs->trans("SubTotal").'</a>:</td>';
-        print '<td class="nowrap right">'.price(price2num($subtotalcoll, 'MT')).'</td>';
-        print '<td class="nowrap right">'.price(price2num($subtotalpaye, 'MT')).'</td>';
-        print '<td class="nowrap right">'.price(price2num($subtotal, 'MT')).'</td>';
-        print '<td>&nbsp;</td></tr>';
-        $i = 0;
-        $subtotalcoll = 0; $subtotalpaye = 0; $subtotal = 0;
-    }
+	$i++; $m++;
+	if ($i > 2)
+	{
+		print '<tr class="liste_total">';
+		print '<td class="right"><a href="quadri_detail.php?leftmenu=tax_vat&q='.round($m / 3).'&year='.$y.'">'.$langs->trans("SubTotal").'</a>:</td>';
+		print '<td class="nowrap right">'.price(price2num($subtotalcoll, 'MT')).'</td>';
+		print '<td class="nowrap right">'.price(price2num($subtotalpaye, 'MT')).'</td>';
+		print '<td class="nowrap right">'.price(price2num($subtotal, 'MT')).'</td>';
+		print '<td>&nbsp;</td></tr>';
+		$i = 0;
+		$subtotalcoll = 0; $subtotalpaye = 0; $subtotal = 0;
+	}
 }
 print '<tr class="liste_total"><td class="right" colspan="3">'.$langs->trans("TotalToPay").':</td><td class="nowrap right">'.price(price2num($total, 'MT')).'</td>';
 print "<td>&nbsp;</td>\n";
@@ -578,37 +578,37 @@ if (!empty($conf->global->MAIN_FEATURES_LEVEL))
      * Recap
      */
 
-    print load_fiche_titre($langs->trans("VATBalance"), '', ''); // need to add translation
+	print load_fiche_titre($langs->trans("VATBalance"), '', ''); // need to add translation
 
-    $sql1 = "SELECT SUM(amount) as mm";
-    $sql1 .= " FROM ".MAIN_DB_PREFIX."tva as f";
-    $sql1 .= " WHERE f.entity = ".$conf->entity;
-    $sql1 .= " AND f.datev >= '".$db->idate($date_start)."'";
-    $sql1 .= " AND f.datev <= '".$db->idate($date_end)."'";
+	$sql1 = "SELECT SUM(amount) as mm";
+	$sql1 .= " FROM ".MAIN_DB_PREFIX."tva as f";
+	$sql1 .= " WHERE f.entity = ".$conf->entity;
+	$sql1 .= " AND f.datev >= '".$db->idate($date_start)."'";
+	$sql1 .= " AND f.datev <= '".$db->idate($date_end)."'";
 
-    $result = $db->query($sql1);
-    if ($result) {
-        $obj = $db->fetch_object($result);
-        print '<table class="noborder centpercent">';
+	$result = $db->query($sql1);
+	if ($result) {
+		$obj = $db->fetch_object($result);
+		print '<table class="noborder centpercent">';
 
-        print "<tr>";
-        print '<td class="right">'.$langs->trans("VATDue").'</td>';
-        print '<td class="nowrap right">'.price(price2num($total, 'MT')).'</td>';
-        print "</tr>\n";
+		print "<tr>";
+		print '<td class="right">'.$langs->trans("VATDue").'</td>';
+		print '<td class="nowrap right">'.price(price2num($total, 'MT')).'</td>';
+		print "</tr>\n";
 
-        print "<tr>";
-        print '<td class="right">'.$langs->trans("VATPaid").'</td>';
-        print '<td class="nowrap right">'.price(price2num($obj->mm, 'MT'))."</td>\n";
-        print "</tr>\n";
+		print "<tr>";
+		print '<td class="right">'.$langs->trans("VATPaid").'</td>';
+		print '<td class="nowrap right">'.price(price2num($obj->mm, 'MT'))."</td>\n";
+		print "</tr>\n";
 
-        $restopay = $total - $obj->mm;
-        print "<tr>";
-        print '<td class="right">'.$langs->trans("RemainToPay").'</td>';
-        print '<td class="nowrap right">'.price(price2num($restopay, 'MT')).'</td>';
-        print "</tr>\n";
+		$restopay = $total - $obj->mm;
+		print "<tr>";
+		print '<td class="right">'.$langs->trans("RemainToPay").'</td>';
+		print '<td class="nowrap right">'.price(price2num($restopay, 'MT')).'</td>';
+		print "</tr>\n";
 
-        print '</table>';
-    }
+		print '</table>';
+	}
 }
 
 print '</div></div>';
diff --git a/htdocs/compta/tva/info.php b/htdocs/compta/tva/info.php
index 71ff7b14844..ddabf6e2b49 100644
--- a/htdocs/compta/tva/info.php
+++ b/htdocs/compta/tva/info.php
@@ -89,7 +89,7 @@ print '</td></tr></table>';
 
 print '</div>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 llxFooter();
 
diff --git a/htdocs/compta/tva/list.php b/htdocs/compta/tva/list.php
index 554143e7a7e..a142518279f 100644
--- a/htdocs/compta/tva/list.php
+++ b/htdocs/compta/tva/list.php
@@ -44,26 +44,26 @@ $langs->loadLangs(array('compta', 'bills'));
 $action						= GETPOST('action', 'alpha');
 $massaction					= GETPOST('massaction', 'alpha');
 $confirm					= GETPOST('confirm', 'alpha');
-$optioncss					= GETPOST('optioncss', 'alpha');
+$optioncss = GETPOST('optioncss', 'alpha');
 $contextpage				= GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'salestaxeslist';
 
 $search_ref					= GETPOST('search_ref', 'alpha');
-$search_label				= GETPOST('search_label', 'alpha');
-$search_dateend_start		= dol_mktime(0, 0, 0, GETPOST('search_dateend_startmonth', 'int'), GETPOST('search_dateend_startday', 'int'), GETPOST('search_dateend_startyear', 'int'));
-$search_dateend_end			= dol_mktime(23, 59, 59, GETPOST('search_dateend_endmonth', 'int'), GETPOST('search_dateend_endday', 'int'), GETPOST('search_dateend_endyear', 'int'));
-$search_datepayment_start	= dol_mktime(0, 0, 0, GETPOST('search_datepayment_startmonth', 'int'), GETPOST('search_datepayment_startday', 'int'), GETPOST('search_datepayment_startyear', 'int'));
-$search_datepayment_end		= dol_mktime(23, 59, 59, GETPOST('search_datepayment_endmonth', 'int'), GETPOST('search_datepayment_endday', 'int'), GETPOST('search_datepayment_endyear', 'int'));
-$search_type				= GETPOST('search_type', 'int');
-$search_cheque				= GETPOST('search_cheque', 'alpha');
+$search_label = GETPOST('search_label', 'alpha');
+$search_dateend_start = dol_mktime(0, 0, 0, GETPOST('search_dateend_startmonth', 'int'), GETPOST('search_dateend_startday', 'int'), GETPOST('search_dateend_startyear', 'int'));
+$search_dateend_end = dol_mktime(23, 59, 59, GETPOST('search_dateend_endmonth', 'int'), GETPOST('search_dateend_endday', 'int'), GETPOST('search_dateend_endyear', 'int'));
+$search_datepayment_start = dol_mktime(0, 0, 0, GETPOST('search_datepayment_startmonth', 'int'), GETPOST('search_datepayment_startday', 'int'), GETPOST('search_datepayment_startyear', 'int'));
+$search_datepayment_end = dol_mktime(23, 59, 59, GETPOST('search_datepayment_endmonth', 'int'), GETPOST('search_datepayment_endday', 'int'), GETPOST('search_datepayment_endyear', 'int'));
+$search_type = GETPOST('search_type', 'int');
+$search_cheque = GETPOST('search_cheque', 'alpha');
 $search_account				= GETPOST('search_account', 'int');
 $search_amount 				= GETPOST('search_amount', 'alpha');
 
-$limit						= GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield					= GETPOST('sortfield', 'alpha');
 $sortorder					= GETPOST('sortorder', 'alpha');
-$page						= GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST('page', 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST('page', 'int');
 
-if (empty($page) || $page == -1) $page = 0;		// If $page is not defined, or '' or -1
+if (empty($page) || $page == -1) $page = 0; // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
@@ -357,13 +357,13 @@ while ($i < min($num, $limit)) {
 	}
 
 	// Label
-	if (!empty($arrayfields['t.label']['checked']))	{
+	if (!empty($arrayfields['t.label']['checked'])) {
 		print '<td>'.dol_trunc($obj->label, 40).'</td>';
 		if (!$i) $totalarray['nbfield']++;
 	}
 
 	// Date end period
-	if (!empty($arrayfields['t.datev']['checked']))	{
+	if (!empty($arrayfields['t.datev']['checked'])) {
 		print '<td class="center">'.dol_print_date($db->jdate($obj->datev), 'day').'</td>';
 		if (!$i) $totalarray['nbfield']++;
 	}
diff --git a/htdocs/compta/tva/quadri_detail.php b/htdocs/compta/tva/quadri_detail.php
index 8fb4c32bf72..ba12b08b3b0 100644
--- a/htdocs/compta/tva/quadri_detail.php
+++ b/htdocs/compta/tva/quadri_detail.php
@@ -159,16 +159,16 @@ $prevyear = $year_start; $prevquarter = $q;
 if ($prevquarter > 1) {
 	$prevquarter--;
 } else {
-    $prevquarter = 4;
-    $prevyear--;
+	$prevquarter = 4;
+	$prevyear--;
 }
 $nextyear = $year_start;
 $nextquarter = $q;
 if ($nextquarter < 4) {
 	$nextquarter++;
 } else {
-    $nextquarter = 1;
-    $nextyear++;
+	$nextquarter = 1;
+	$nextyear++;
 }
 $description .= $fsearch;
 $builddate = dol_now();
diff --git a/htdocs/contact/agenda.php b/htdocs/contact/agenda.php
index 1d42d638bc8..2aeb2e4e2a1 100644
--- a/htdocs/contact/agenda.php
+++ b/htdocs/contact/agenda.php
@@ -67,17 +67,17 @@ $objcanvas = null;
 $canvas = (!empty($object->canvas) ? $object->canvas : GETPOST("canvas"));
 if (!empty($canvas))
 {
-    require_once DOL_DOCUMENT_ROOT.'/core/class/canvas.class.php';
-    $objcanvas = new Canvas($db, $action);
-    $objcanvas->getCanvas('contact', 'contactcard', $canvas);
+	require_once DOL_DOCUMENT_ROOT.'/core/class/canvas.class.php';
+	$objcanvas = new Canvas($db, $action);
+	$objcanvas->getCanvas('contact', 'contactcard', $canvas);
 }
 
 if (GETPOST('actioncode', 'array'))
 {
-    $actioncode = GETPOST('actioncode', 'array', 3);
-    if (!count($actioncode)) $actioncode = '0';
+	$actioncode = GETPOST('actioncode', 'array', 3);
+	if (!count($actioncode)) $actioncode = '0';
 } else {
-    $actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT));
+	$actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT));
 }
 $search_agenda_label = GETPOST('search_agenda_label');
 
@@ -110,19 +110,19 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 
 if (empty($reshook))
 {
-    // Cancel
-    if (GETPOST('cancel', 'alpha') && !empty($backtopage))
-    {
-        header("Location: ".$backtopage);
-        exit;
-    }
+	// Cancel
+	if (GETPOST('cancel', 'alpha') && !empty($backtopage))
+	{
+		header("Location: ".$backtopage);
+		exit;
+	}
 
-    // Purge search criteria
-    if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All test are required to be compatible with all browsers
-    {
-        $actioncode = '';
-        $search_agenda_label = '';
-    }
+	// Purge search criteria
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All test are required to be compatible with all browsers
+	{
+		$actioncode = '';
+		$search_agenda_label = '';
+	}
 }
 
 
@@ -140,138 +140,138 @@ llxHeader('', $title, $help_url);
 
 if ($socid > 0)
 {
-    $objsoc = new Societe($db);
-    $objsoc->fetch($socid);
+	$objsoc = new Societe($db);
+	$objsoc->fetch($socid);
 }
 
 if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 {
-    // -----------------------------------------
-    // When used with CANVAS
-    // -----------------------------------------
-    if (empty($object->error) && $id)
+	// -----------------------------------------
+	// When used with CANVAS
+	// -----------------------------------------
+	if (empty($object->error) && $id)
  	{
  		$object = new Contact($db);
  		$result = $object->fetch($id);
 		if ($result <= 0) dol_print_error('', $object->error);
  	}
    	$objcanvas->assign_values($action, $object->id, $object->ref); // Set value for templates
-    $objcanvas->display_canvas($action); // Show template
+	$objcanvas->display_canvas($action); // Show template
 } else {
-    // -----------------------------------------
-    // When used in standard mode
-    // -----------------------------------------
+	// -----------------------------------------
+	// When used in standard mode
+	// -----------------------------------------
 
-    // Confirm deleting contact
-    if ($user->rights->societe->contact->supprimer)
-    {
-        if ($action == 'delete')
-        {
-            print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$id.($backtopage ? '&backtopage='.$backtopage : ''), $langs->trans("DeleteContact"), $langs->trans("ConfirmDeleteContact"), "confirm_delete", '', 0, 1);
-        }
-    }
+	// Confirm deleting contact
+	if ($user->rights->societe->contact->supprimer)
+	{
+		if ($action == 'delete')
+		{
+			print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$id.($backtopage ? '&backtopage='.$backtopage : ''), $langs->trans("DeleteContact"), $langs->trans("ConfirmDeleteContact"), "confirm_delete", '', 0, 1);
+		}
+	}
 
-    /*
+	/*
      * Onglets
      */
-    $head = array();
-    if ($id > 0)
-    {
-        // Si edition contact deja existant
-        $object = new Contact($db);
-        $res = $object->fetch($id, $user);
-        if ($res < 0) { dol_print_error($db, $object->error); exit; }
-        $res = $object->fetch_optionals();
-        if ($res < 0) { dol_print_error($db, $object->error); exit; }
+	$head = array();
+	if ($id > 0)
+	{
+		// Si edition contact deja existant
+		$object = new Contact($db);
+		$res = $object->fetch($id, $user);
+		if ($res < 0) { dol_print_error($db, $object->error); exit; }
+		$res = $object->fetch_optionals();
+		if ($res < 0) { dol_print_error($db, $object->error); exit; }
 
-        // Show tabs
-        $head = contact_prepare_head($object);
+		// Show tabs
+		$head = contact_prepare_head($object);
 
-        $title = (!empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("Contacts") : $langs->trans("ContactsAddresses"));
-    }
+		$title = (!empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("Contacts") : $langs->trans("ContactsAddresses"));
+	}
 
-    if (!empty($id) && $action != 'edit' && $action != 'create')
-    {
-        $objsoc = new Societe($db);
+	if (!empty($id) && $action != 'edit' && $action != 'create')
+	{
+		$objsoc = new Societe($db);
 
-        /*
+		/*
          * Fiche en mode visualisation
          */
 
-        dol_htmloutput_errors($error, $errors);
+		dol_htmloutput_errors($error, $errors);
 
-        print dol_get_fiche_head($head, 'agenda', $title, -1, 'contact');
+		print dol_get_fiche_head($head, 'agenda', $title, -1, 'contact');
 
-        $linkback = '<a href="'.DOL_URL_ROOT.'/contact/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+		$linkback = '<a href="'.DOL_URL_ROOT.'/contact/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-        $morehtmlref = '<div class="refidno">';
-        if (empty($conf->global->SOCIETE_DISABLE_CONTACTS))
-        {
-            $objsoc = new Societe($db);
-            $objsoc->fetch($object->socid);
-            // Thirdparty
-            $morehtmlref .= $langs->trans('ThirdParty').' : ';
-            if ($objsoc->id > 0) $morehtmlref .= $objsoc->getNomUrl(1);
-            else $morehtmlref .= $langs->trans("ContactNotLinkedToCompany");
-        }
-        $morehtmlref .= '</div>';
+		$morehtmlref = '<div class="refidno">';
+		if (empty($conf->global->SOCIETE_DISABLE_CONTACTS))
+		{
+			$objsoc = new Societe($db);
+			$objsoc->fetch($object->socid);
+			// Thirdparty
+			$morehtmlref .= $langs->trans('ThirdParty').' : ';
+			if ($objsoc->id > 0) $morehtmlref .= $objsoc->getNomUrl(1);
+			else $morehtmlref .= $langs->trans("ContactNotLinkedToCompany");
+		}
+		$morehtmlref .= '</div>';
 
-        dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref);
+		dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref);
 
-        print '<div class="fichecenter">';
+		print '<div class="fichecenter">';
 
-        print '<div class="underbanner clearboth"></div>';
+		print '<div class="underbanner clearboth"></div>';
 
-        $object->info($id);
-        dol_print_object_info($object, 1);
+		$object->info($id);
+		dol_print_object_info($object, 1);
 
-        print '</div>';
+		print '</div>';
 
-        dol_fiche_end();
+		print dol_get_fiche_end();
 
 
-    	// Actions buttons
+		// Actions buttons
 
-        $objcon = $object;
-        $object->fetch_thirdparty();
-        $objthirdparty = $object->thirdparty;
+		$objcon = $object;
+		$object->fetch_thirdparty();
+		$objthirdparty = $object->thirdparty;
 
-        $out = '';
-        $permok = $user->rights->agenda->myactions->create;
-        if ((!empty($objthirdparty->id) || !empty($objcon->id)) && $permok)
-        {
+		$out = '';
+		$permok = $user->rights->agenda->myactions->create;
+		if ((!empty($objthirdparty->id) || !empty($objcon->id)) && $permok)
+		{
 			if (is_object($objthirdparty) && get_class($objthirdparty) == 'Societe') $out .= '&amp;originid='.$objthirdparty->id.($objthirdparty->id > 0 ? '&amp;socid='.$objthirdparty->id : '');
 			$out .= (!empty($objcon->id) ? '&amp;contactid='.$objcon->id : '').'&amp;origin=contact&amp;originid='.$object->id.'&amp;percentage=-1&amp;backtopage='.urlencode($_SERVER['PHP_SELF'].($objcon->id > 0 ? '?id='.$objcon->id : ''));
 			$out .= '&amp;datep='.urlencode(dol_print_date(dol_now(), 'dayhourlog'));
-    	}
+		}
 
-    	$newcardbutton = '';
-    	if (!empty($conf->agenda->enabled))
-    	{
-    		if (!empty($user->rights->agenda->myactions->create) || !empty($user->rights->agenda->allactions->create))
-    		{
-                $newcardbutton .= dolGetButtonTitle($langs->trans('AddAction'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/comm/action/card.php?action=create'.$out);
-    		}
-    	}
+		$newcardbutton = '';
+		if (!empty($conf->agenda->enabled))
+		{
+			if (!empty($user->rights->agenda->myactions->create) || !empty($user->rights->agenda->allactions->create))
+			{
+				$newcardbutton .= dolGetButtonTitle($langs->trans('AddAction'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/comm/action/card.php?action=create'.$out);
+			}
+		}
 
-        if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read)))
-       	{
-       		print '<br>';
+		if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read)))
+	   	{
+	   		print '<br>';
 
-            $param = '&id='.$id;
-            if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
-            if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
+			$param = '&id='.$id;
+			if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
+			if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
 
-            print load_fiche_titre($langs->trans("ActionsOnContact"), $newcardbutton, '');
-            //print_barre_liste($langs->trans("ActionsOnCompany"), 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, $morehtmlcenter, 0, -1, '', '', '', '', 0, 1, 1);
+			print load_fiche_titre($langs->trans("ActionsOnContact"), $newcardbutton, '');
+			//print_barre_liste($langs->trans("ActionsOnCompany"), 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, $morehtmlcenter, 0, -1, '', '', '', '', 0, 1, 1);
 
-            // List of all actions
-    		$filters = array();
-        	$filters['search_agenda_label'] = $search_agenda_label;
+			// List of all actions
+			$filters = array();
+			$filters['search_agenda_label'] = $search_agenda_label;
 
-            show_actions_done($conf, $langs, $db, $objthirdparty, $object, 0, $actioncode, '', $filters, $sortfield, $sortorder);
-        }
-    }
+			show_actions_done($conf, $langs, $db, $objthirdparty, $object, 0, $actioncode, '', $filters, $sortfield, $sortorder);
+		}
+	}
 }
 
 
diff --git a/htdocs/contact/canvas/actions_contactcard_common.class.php b/htdocs/contact/canvas/actions_contactcard_common.class.php
index 415d9e47790..f6f6fa0b45e 100644
--- a/htdocs/contact/canvas/actions_contactcard_common.class.php
+++ b/htdocs/contact/canvas/actions_contactcard_common.class.php
@@ -27,15 +27,15 @@
  */
 abstract class ActionsContactCardCommon
 {
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $dirmodule;
-    public $targetmodule;
-    public $canvas;
-    public $card;
+	public $dirmodule;
+	public $targetmodule;
+	public $canvas;
+	public $card;
 
 	//! Template container
 	public $tpl = array();
@@ -55,14 +55,14 @@ abstract class ActionsContactCardCommon
 
 
 	/**
-     *  Get object
+	 *  Get object
 	 *
-     *  @param	int		$id		Object id
-     *  @return	object			Object loaded
-     */
-    public function getObject($id)
-    {
-    	/*$ret = $this->getInstanceDao();
+	 *  @param	int		$id		Object id
+	 *  @return	object			Object loaded
+	 */
+	public function getObject($id)
+	{
+		/*$ret = $this->getInstanceDao();
 
     	if (is_object($this->object) && method_exists($this->object,'fetch'))
     	{
@@ -70,39 +70,39 @@ abstract class ActionsContactCardCommon
     	}
     	else
     	{*/
-    		$object = new Contact($this->db);
-    		if (!empty($id)) $object->fetch($id);
-            $this->object = $object;
-    	//}
-    }
+			$object = new Contact($this->db);
+			if (!empty($id)) $object->fetch($id);
+			$this->object = $object;
+		//}
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Set content of ->tpl array, to use into template
-     *
-     *  @param	string		$action    Type of action
-     *  @param	int			$id			Id
-     *  @return	string					HTML output
-     */
-    public function assign_values(&$action, $id)
-    {
-        // phpcs:enable
-        global $conf, $langs, $user, $canvas;
-        global $form, $formcompany, $objsoc;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Set content of ->tpl array, to use into template
+	 *
+	 *  @param	string		$action    Type of action
+	 *  @param	int			$id			Id
+	 *  @return	string					HTML output
+	 */
+	public function assign_values(&$action, $id)
+	{
+		// phpcs:enable
+		global $conf, $langs, $user, $canvas;
+		global $form, $formcompany, $objsoc;
 
-        if ($action == 'add' || $action == 'update') $this->assign_post();
+		if ($action == 'add' || $action == 'update') $this->assign_post();
 
-        foreach ($this->object as $key => $value)
-        {
-            $this->tpl[$key] = $value;
-        }
+		foreach ($this->object as $key => $value)
+		{
+			$this->tpl[$key] = $value;
+		}
 
-        $this->tpl['error'] = $this->error;
-        $this->tpl['errors'] = $this->errors;
+		$this->tpl['error'] = $this->error;
+		$this->tpl['errors'] = $this->errors;
 
-        if ($action == 'create' || $action == 'edit')
-        {
-        	if ($conf->use_javascript_ajax)
+		if ($action == 'create' || $action == 'edit')
+		{
+			if ($conf->use_javascript_ajax)
 			{
 				$this->tpl['ajax_selectcountry'] = "\n".'<script type="text/javascript" language="javascript">
 				jQuery(document).ready(function () {
@@ -115,201 +115,201 @@ abstract class ActionsContactCardCommon
 				</script>'."\n";
 			}
 
-        	if (is_object($objsoc) && $objsoc->id > 0)
-        	{
-        		$this->tpl['company'] = $objsoc->getNomUrl(1);
-        		$this->tpl['company_id'] = $objsoc->id;
-        	} else {
-        		$this->tpl['company'] = $form->select_company($this->object->socid, 'socid', '', 1);
-        	}
+			if (is_object($objsoc) && $objsoc->id > 0)
+			{
+				$this->tpl['company'] = $objsoc->getNomUrl(1);
+				$this->tpl['company_id'] = $objsoc->id;
+			} else {
+				$this->tpl['company'] = $form->select_company($this->object->socid, 'socid', '', 1);
+			}
 
-        	// Civility
-        	$this->tpl['select_civility'] = $formcompany->select_civility($this->object->civility_id);
+			// Civility
+			$this->tpl['select_civility'] = $formcompany->select_civility($this->object->civility_id);
 
-        	// Predefined with third party
-        	if ((isset($objsoc->typent_code) && $objsoc->typent_code == 'TE_PRIVATE') || !empty($conf->global->CONTACT_USE_COMPANY_ADDRESS))
-        	{
-        		if (dol_strlen(trim($this->object->address)) == 0) $this->tpl['address'] = $objsoc->address;
-        		if (dol_strlen(trim($this->object->zip)) == 0) $this->object->zip = $objsoc->zip;
-        		if (dol_strlen(trim($this->object->town)) == 0) $this->object->town = $objsoc->town;
-        		if (dol_strlen(trim($this->object->phone_pro)) == 0) $this->object->phone_pro = $objsoc->phone;
-        		if (dol_strlen(trim($this->object->fax)) == 0) $this->object->fax = $objsoc->fax;
-        		if (dol_strlen(trim($this->object->email)) == 0) $this->object->email = $objsoc->email;
-        	}
+			// Predefined with third party
+			if ((isset($objsoc->typent_code) && $objsoc->typent_code == 'TE_PRIVATE') || !empty($conf->global->CONTACT_USE_COMPANY_ADDRESS))
+			{
+				if (dol_strlen(trim($this->object->address)) == 0) $this->tpl['address'] = $objsoc->address;
+				if (dol_strlen(trim($this->object->zip)) == 0) $this->object->zip = $objsoc->zip;
+				if (dol_strlen(trim($this->object->town)) == 0) $this->object->town = $objsoc->town;
+				if (dol_strlen(trim($this->object->phone_pro)) == 0) $this->object->phone_pro = $objsoc->phone;
+				if (dol_strlen(trim($this->object->fax)) == 0) $this->object->fax = $objsoc->fax;
+				if (dol_strlen(trim($this->object->email)) == 0) $this->object->email = $objsoc->email;
+			}
 
-            // Zip
-            $this->tpl['select_zip'] = $formcompany->select_ziptown($this->object->zip, 'zipcode', array('town', 'selectcountry_id', 'state_id'), 6);
+			// Zip
+			$this->tpl['select_zip'] = $formcompany->select_ziptown($this->object->zip, 'zipcode', array('town', 'selectcountry_id', 'state_id'), 6);
 
-            // Town
-            $this->tpl['select_town'] = $formcompany->select_ziptown($this->object->town, 'town', array('zipcode', 'selectcountry_id', 'state_id'));
+			// Town
+			$this->tpl['select_town'] = $formcompany->select_ziptown($this->object->town, 'town', array('zipcode', 'selectcountry_id', 'state_id'));
 
-            if (dol_strlen(trim($this->object->country_id)) == 0) $this->object->country_id = $objsoc->country_id;
+			if (dol_strlen(trim($this->object->country_id)) == 0) $this->object->country_id = $objsoc->country_id;
 
-            // Country
-            $this->tpl['select_country'] = $form->select_country($this->object->country_id, 'country_id');
-            $countrynotdefined = $langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("SeeAbove").')';
+			// Country
+			$this->tpl['select_country'] = $form->select_country($this->object->country_id, 'country_id');
+			$countrynotdefined = $langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("SeeAbove").')';
 
-            if ($user->admin) $this->tpl['info_admin'] = info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+			if ($user->admin) $this->tpl['info_admin'] = info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 
-            // State
-            if ($this->object->country_id) $this->tpl['select_state'] = $formcompany->select_state($this->object->state_id, $this->object->country_code);
-            else $this->tpl['select_state'] = $countrynotdefined;
+			// State
+			if ($this->object->country_id) $this->tpl['select_state'] = $formcompany->select_state($this->object->state_id, $this->object->country_code);
+			else $this->tpl['select_state'] = $countrynotdefined;
 
-            // Public or private
-            $selectarray = array('0'=>$langs->trans("ContactPublic"), '1'=>$langs->trans("ContactPrivate"));
-            $this->tpl['select_visibility'] = $form->selectarray('priv', $selectarray, $this->object->priv, 0);
-        }
+			// Public or private
+			$selectarray = array('0'=>$langs->trans("ContactPublic"), '1'=>$langs->trans("ContactPrivate"));
+			$this->tpl['select_visibility'] = $form->selectarray('priv', $selectarray, $this->object->priv, 0);
+		}
 
-        if ($action == 'view' || $action == 'edit' || $action == 'delete')
-        {
-        	// Emailing
-        	if (!empty($conf->mailing->enabled))
+		if ($action == 'view' || $action == 'edit' || $action == 'delete')
+		{
+			// Emailing
+			if (!empty($conf->mailing->enabled))
 			{
 				$langs->load("mails");
 				$this->tpl['nb_emailing'] = $this->object->getNbOfEMailings();
 			}
 
-        	// Linked element
-        	$this->tpl['contact_element'] = array();
-        	$i = 0;
+			// Linked element
+			$this->tpl['contact_element'] = array();
+			$i = 0;
 
-        	$this->object->load_ref_elements();
+			$this->object->load_ref_elements();
 
-        	if (!empty($conf->commande->enabled))
-        	{
-        		$this->tpl['contact_element'][$i]['linked_element_label'] = $langs->trans("ContactForOrders");
-        		$this->tpl['contact_element'][$i]['linked_element_value'] = $this->object->ref_commande ? $this->object->ref_commande : $langs->trans("NoContactForAnyOrder");
-        		$i++;
-        	}
-        	if (!empty($conf->propal->enabled))
-        	{
-        		$this->tpl['contact_element'][$i]['linked_element_label'] = $langs->trans("ContactForProposals");
-        		$this->tpl['contact_element'][$i]['linked_element_value'] = $this->object->ref_propal ? $this->object->ref_propal : $langs->trans("NoContactForAnyProposal");
-        		$i++;
-        	}
-        	if (!empty($conf->contrat->enabled))
-        	{
-        		$this->tpl['contact_element'][$i]['linked_element_label'] = $langs->trans("ContactForContracts");
-        		$this->tpl['contact_element'][$i]['linked_element_value'] = $this->object->ref_contrat ? $this->object->ref_contrat : $langs->trans("NoContactForAnyContract");
-        		$i++;
-        	}
-        	if (!empty($conf->facture->enabled))
-        	{
-        		$this->tpl['contact_element'][$i]['linked_element_label'] = $langs->trans("ContactForInvoices");
-        		$this->tpl['contact_element'][$i]['linked_element_value'] = $this->object->ref_facturation ? $this->object->ref_facturation : $langs->trans("NoContactForAnyInvoice");
-        		$i++;
-        	}
+			if (!empty($conf->commande->enabled))
+			{
+				$this->tpl['contact_element'][$i]['linked_element_label'] = $langs->trans("ContactForOrders");
+				$this->tpl['contact_element'][$i]['linked_element_value'] = $this->object->ref_commande ? $this->object->ref_commande : $langs->trans("NoContactForAnyOrder");
+				$i++;
+			}
+			if (!empty($conf->propal->enabled))
+			{
+				$this->tpl['contact_element'][$i]['linked_element_label'] = $langs->trans("ContactForProposals");
+				$this->tpl['contact_element'][$i]['linked_element_value'] = $this->object->ref_propal ? $this->object->ref_propal : $langs->trans("NoContactForAnyProposal");
+				$i++;
+			}
+			if (!empty($conf->contrat->enabled))
+			{
+				$this->tpl['contact_element'][$i]['linked_element_label'] = $langs->trans("ContactForContracts");
+				$this->tpl['contact_element'][$i]['linked_element_value'] = $this->object->ref_contrat ? $this->object->ref_contrat : $langs->trans("NoContactForAnyContract");
+				$i++;
+			}
+			if (!empty($conf->facture->enabled))
+			{
+				$this->tpl['contact_element'][$i]['linked_element_label'] = $langs->trans("ContactForInvoices");
+				$this->tpl['contact_element'][$i]['linked_element_value'] = $this->object->ref_facturation ? $this->object->ref_facturation : $langs->trans("NoContactForAnyInvoice");
+				$i++;
+			}
 
-        	// Dolibarr user
-        	if ($this->object->user_id)
+			// Dolibarr user
+			if ($this->object->user_id)
 			{
 				$dolibarr_user = new User($this->db);
 				$result = $dolibarr_user->fetch($this->object->user_id);
 				$this->tpl['dolibarr_user'] = $dolibarr_user->getLoginUrl(1);
 			} else $this->tpl['dolibarr_user'] = $langs->trans("NoDolibarrAccess");
-        }
+		}
 
-        if ($action == 'view' || $action == 'delete')
-        {
-        	$this->tpl['showrefnav'] = $form->showrefnav($this->object, 'id');
+		if ($action == 'view' || $action == 'delete')
+		{
+			$this->tpl['showrefnav'] = $form->showrefnav($this->object, 'id');
 
-        	if ($this->object->socid > 0)
-        	{
-        		$objsoc = new Societe($this->db);
+			if ($this->object->socid > 0)
+			{
+				$objsoc = new Societe($this->db);
 
-        		$objsoc->fetch($this->object->socid);
-        		$this->tpl['company'] = $objsoc->getNomUrl(1);
-        	} else {
-        		$this->tpl['company'] = $langs->trans("ContactNotLinkedToCompany");
-        	}
+				$objsoc->fetch($this->object->socid);
+				$this->tpl['company'] = $objsoc->getNomUrl(1);
+			} else {
+				$this->tpl['company'] = $langs->trans("ContactNotLinkedToCompany");
+			}
 
-        	$this->tpl['civility'] = $this->object->getCivilityLabel();
+			$this->tpl['civility'] = $this->object->getCivilityLabel();
 
-            $this->tpl['address'] = dol_nl2br($this->object->address);
+			$this->tpl['address'] = dol_nl2br($this->object->address);
 
-            $this->tpl['zip'] = ($this->object->zip ? $this->object->zip.'&nbsp;' : '');
+			$this->tpl['zip'] = ($this->object->zip ? $this->object->zip.'&nbsp;' : '');
 
-            $img = picto_from_langcode($this->object->country_code);
-            $this->tpl['country'] = ($img ? $img.' ' : '').$this->object->country;
+			$img = picto_from_langcode($this->object->country_code);
+			$this->tpl['country'] = ($img ? $img.' ' : '').$this->object->country;
 
-            $this->tpl['phone_pro'] = dol_print_phone($this->object->phone_pro, $this->object->country_code, 0, $this->object->id, 'AC_TEL');
-            $this->tpl['phone_perso'] = dol_print_phone($this->object->phone_perso, $this->object->country_code, 0, $this->object->id, 'AC_TEL');
-            $this->tpl['phone_mobile'] = dol_print_phone($this->object->phone_mobile, $this->object->country_code, 0, $this->object->id, 'AC_TEL');
-            $this->tpl['fax'] = dol_print_phone($this->object->fax, $this->object->country_code, 0, $this->object->id, 'AC_FAX');
-            $this->tpl['email'] = dol_print_email($this->object->email, 0, $this->object->id, 'AC_EMAIL');
+			$this->tpl['phone_pro'] = dol_print_phone($this->object->phone_pro, $this->object->country_code, 0, $this->object->id, 'AC_TEL');
+			$this->tpl['phone_perso'] = dol_print_phone($this->object->phone_perso, $this->object->country_code, 0, $this->object->id, 'AC_TEL');
+			$this->tpl['phone_mobile'] = dol_print_phone($this->object->phone_mobile, $this->object->country_code, 0, $this->object->id, 'AC_TEL');
+			$this->tpl['fax'] = dol_print_phone($this->object->fax, $this->object->country_code, 0, $this->object->id, 'AC_FAX');
+			$this->tpl['email'] = dol_print_email($this->object->email, 0, $this->object->id, 'AC_EMAIL');
 
-            $this->tpl['visibility'] = $this->object->LibPubPriv($this->object->priv);
+			$this->tpl['visibility'] = $this->object->LibPubPriv($this->object->priv);
 
-            $this->tpl['note'] = nl2br($this->object->note);
-        }
+			$this->tpl['note'] = nl2br($this->object->note);
+		}
 
-        if ($action == 'create_user')
-        {
-        	// Full firstname and lastname separated with a dot : firstname.lastname
-        	include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-            require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
-        	$login = dol_buildlogin($this->object->lastname, $this->object->firstname);
+		if ($action == 'create_user')
+		{
+			// Full firstname and lastname separated with a dot : firstname.lastname
+			include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+			require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
+			$login = dol_buildlogin($this->object->lastname, $this->object->firstname);
 
-       		$generated_password = getRandomPassword(false);
-        	$password = $generated_password;
+	   		$generated_password = getRandomPassword(false);
+			$password = $generated_password;
 
-        	// Create a form array
-        	$formquestion = array(
-        	array('label' => $langs->trans("LoginToCreate"), 'type' => 'text', 'name' => 'login', 'value' => $login),
-        	array('label' => $langs->trans("Password"), 'type' => 'text', 'name' => 'password', 'value' => $password));
+			// Create a form array
+			$formquestion = array(
+			array('label' => $langs->trans("LoginToCreate"), 'type' => 'text', 'name' => 'login', 'value' => $login),
+			array('label' => $langs->trans("Password"), 'type' => 'text', 'name' => 'password', 'value' => $password));
 
-        	$this->tpl['action_create_user'] = $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$this->object->id, $langs->trans("CreateDolibarrLogin"), $langs->trans("ConfirmCreateContact"), "confirm_create_user", $formquestion, 'no');
-        }
-    }
+			$this->tpl['action_create_user'] = $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$this->object->id, $langs->trans("CreateDolibarrLogin"), $langs->trans("ConfirmCreateContact"), "confirm_create_user", $formquestion, 'no');
+		}
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Assign POST values into object
-     *
-     *  @return		string					HTML output
-     */
-    private function assign_post()
-    {
-        // phpcs:enable
-        global $langs, $mysoc;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Assign POST values into object
+	 *
+	 *  @return		string					HTML output
+	 */
+	private function assign_post()
+	{
+		// phpcs:enable
+		global $langs, $mysoc;
 
-        $this->object->old_name = $_POST["old_name"];
-        $this->object->old_firstname = $_POST["old_firstname"];
+		$this->object->old_name = $_POST["old_name"];
+		$this->object->old_firstname = $_POST["old_firstname"];
 
-        $this->object->socid = $_POST["socid"];
-        $this->object->lastname			= $_POST["name"];
-        $this->object->firstname		= $_POST["firstname"];
-        $this->object->civility_id = $_POST["civility_id"];
-        $this->object->poste			= $_POST["poste"];
-        $this->object->address = $_POST["address"];
-        $this->object->zip = $_POST["zipcode"];
-        $this->object->town				= $_POST["town"];
-        $this->object->country_id = $_POST["country_id"] ? $_POST["country_id"] : $mysoc->country_id;
-        $this->object->state_id = $_POST["state_id"];
-        $this->object->phone_pro = $_POST["phone_pro"];
-        $this->object->phone_perso = $_POST["phone_perso"];
-        $this->object->phone_mobile = $_POST["phone_mobile"];
-        $this->object->fax = $_POST["fax"];
-        $this->object->email			= $_POST["email"];
-        $this->object->jabberid = $_POST["jabberid"];
-        $this->object->priv				= $_POST["priv"];
-        $this->object->note				= $_POST["note"];
-        $this->object->canvas = $_POST["canvas"];
+		$this->object->socid = $_POST["socid"];
+		$this->object->lastname			= $_POST["name"];
+		$this->object->firstname		= $_POST["firstname"];
+		$this->object->civility_id = $_POST["civility_id"];
+		$this->object->poste			= $_POST["poste"];
+		$this->object->address = $_POST["address"];
+		$this->object->zip = $_POST["zipcode"];
+		$this->object->town				= $_POST["town"];
+		$this->object->country_id = $_POST["country_id"] ? $_POST["country_id"] : $mysoc->country_id;
+		$this->object->state_id = $_POST["state_id"];
+		$this->object->phone_pro = $_POST["phone_pro"];
+		$this->object->phone_perso = $_POST["phone_perso"];
+		$this->object->phone_mobile = $_POST["phone_mobile"];
+		$this->object->fax = $_POST["fax"];
+		$this->object->email			= $_POST["email"];
+		$this->object->jabberid = $_POST["jabberid"];
+		$this->object->priv				= $_POST["priv"];
+		$this->object->note				= $_POST["note"];
+		$this->object->canvas = $_POST["canvas"];
 
-        // We set country_id, and country_code label of the chosen country
-        if ($this->object->country_id)
-        {
-            $sql = "SELECT code, label FROM ".MAIN_DB_PREFIX."c_country WHERE rowid = ".$this->object->country_id;
-            $resql = $this->db->query($sql);
-            if ($resql)
-            {
-                $obj = $this->db->fetch_object($resql);
-            } else {
-                dol_print_error($this->db);
-            }
-            $this->object->country_id = $langs->trans("Country".$obj->code) ? $langs->trans("Country".$obj->code) : $obj->label;
-            $this->object->country_code = $obj->code;
-            $this->object->country = $langs->trans("Country".$obj->code) ? $langs->trans("Country".$obj->code) : $obj->label;
-        }
-    }
+		// We set country_id, and country_code label of the chosen country
+		if ($this->object->country_id)
+		{
+			$sql = "SELECT code, label FROM ".MAIN_DB_PREFIX."c_country WHERE rowid = ".$this->object->country_id;
+			$resql = $this->db->query($sql);
+			if ($resql)
+			{
+				$obj = $this->db->fetch_object($resql);
+			} else {
+				dol_print_error($this->db);
+			}
+			$this->object->country_id = $langs->trans("Country".$obj->code) ? $langs->trans("Country".$obj->code) : $obj->label;
+			$this->object->country_code = $obj->code;
+			$this->object->country = $langs->trans("Country".$obj->code) ? $langs->trans("Country".$obj->code) : $obj->label;
+		}
+	}
 }
diff --git a/htdocs/contact/canvas/default/actions_contactcard_default.class.php b/htdocs/contact/canvas/default/actions_contactcard_default.class.php
index 099c973b0a4..d399584b48d 100644
--- a/htdocs/contact/canvas/default/actions_contactcard_default.class.php
+++ b/htdocs/contact/canvas/default/actions_contactcard_default.class.php
@@ -29,22 +29,22 @@ include_once DOL_DOCUMENT_ROOT.'/contact/canvas/actions_contactcard_common.class
  */
 class ActionsContactCardDefault extends ActionsContactCardCommon
 {
-    /**
-     *  Constructor
-     *
-     *	@param	DoliDB	$db				Handler acces base de donnees
-     *	@param	string	$dirmodule		Name of directory of module
-     *	@param	string	$targetmodule	Name of directory of module where canvas is stored
-     *	@param	string	$canvas			Name of canvas
-     *	@param	string	$card			Name of tab (sub-canvas)
-     */
-    public function __construct($db, $dirmodule, $targetmodule, $canvas, $card)
-    {
-        $this->db               = $db;
-        $this->dirmodule = $dirmodule;
-        $this->targetmodule     = $targetmodule;
-        $this->canvas           = $canvas;
-        $this->card             = $card;
+	/**
+	 *  Constructor
+	 *
+	 *	@param	DoliDB	$db				Handler acces base de donnees
+	 *	@param	string	$dirmodule		Name of directory of module
+	 *	@param	string	$targetmodule	Name of directory of module where canvas is stored
+	 *	@param	string	$canvas			Name of canvas
+	 *	@param	string	$card			Name of tab (sub-canvas)
+	 */
+	public function __construct($db, $dirmodule, $targetmodule, $canvas, $card)
+	{
+		$this->db               = $db;
+		$this->dirmodule = $dirmodule;
+		$this->targetmodule     = $targetmodule;
+		$this->canvas           = $canvas;
+		$this->card             = $card;
 	}
 
 	/**
@@ -66,7 +66,7 @@ class ActionsContactCardDefault extends ActionsContactCardCommon
 		return $out;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Assign custom values for canvas
 	 *
@@ -76,50 +76,50 @@ class ActionsContactCardDefault extends ActionsContactCardCommon
 	 */
 	public function assign_values(&$action, $id)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $limit, $offset, $sortfield, $sortorder;
 		global $conf, $db, $langs, $user;
 		global $form;
 
 		$ret = $this->getObject($id);
 
-        parent::assign_values($action, $id);
+		parent::assign_values($action, $id);
 
-        $this->tpl['title'] = $this->getTitle($action);
-        $this->tpl['error'] = $this->error;
-        $this->tpl['errors'] = $this->errors;
+		$this->tpl['title'] = $this->getTitle($action);
+		$this->tpl['error'] = $this->error;
+		$this->tpl['errors'] = $this->errors;
 
 		if ($action == 'view')
 		{
-            // Card header
-            $head = contact_prepare_head($this->object);
-            $title = $this->getTitle($action);
+			// Card header
+			$head = contact_prepare_head($this->object);
+			$title = $this->getTitle($action);
 
-		    $this->tpl['showhead'] = dol_get_fiche_head($head, 'card', $title, 0, 'contact');
-		    $this->tpl['showend'] = dol_get_fiche_end();
+			$this->tpl['showhead'] = dol_get_fiche_head($head, 'card', $title, 0, 'contact');
+			$this->tpl['showend'] = dol_get_fiche_end();
 
-        	$objsoc = new Societe($db);
-            $objsoc->fetch($this->object->socid);
+			$objsoc = new Societe($db);
+			$objsoc->fetch($this->object->socid);
 
-            $this->tpl['actionstodo'] = show_actions_todo($conf, $langs, $db, $objsoc, $this->object, 1);
+			$this->tpl['actionstodo'] = show_actions_todo($conf, $langs, $db, $objsoc, $this->object, 1);
 
-            $this->tpl['actionsdone'] = show_actions_done($conf, $langs, $db, $objsoc, $this->object, 1);
+			$this->tpl['actionsdone'] = show_actions_done($conf, $langs, $db, $objsoc, $this->object, 1);
 		} else {
 			// Confirm delete contact
-        	if ($action == 'delete' && $user->rights->societe->contact->supprimer)
-        	{
-        		$this->tpl['action_delete'] = $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$this->object->id, $langs->trans("DeleteContact"), $langs->trans("ConfirmDeleteContact"), "confirm_delete", '', 0, 1);
-        	}
+			if ($action == 'delete' && $user->rights->societe->contact->supprimer)
+			{
+				$this->tpl['action_delete'] = $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$this->object->id, $langs->trans("DeleteContact"), $langs->trans("ConfirmDeleteContact"), "confirm_delete", '', 0, 1);
+			}
 		}
 
 		if ($action == 'list')
 		{
-	        $this->LoadListDatas($limit, $offset, $sortfield, $sortorder);
+			$this->LoadListDatas($limit, $offset, $sortfield, $sortorder);
 		}
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * 	Fetch datas list and save into ->list_datas
 	 *
@@ -129,13 +129,13 @@ class ActionsContactCardDefault extends ActionsContactCardCommon
 	 *  @param	string	$sortorder	Sort order ('ASC' or 'DESC')
 	 *  @return	void
 	 */
-    public function LoadListDatas($limit, $offset, $sortfield, $sortorder)
-    {
-        // phpcs:enable
-        global $conf, $langs;
+	public function LoadListDatas($limit, $offset, $sortfield, $sortorder)
+	{
+		// phpcs:enable
+		global $conf, $langs;
 
-        //$this->getFieldList();
+		//$this->getFieldList();
 
-        $this->list_datas = array();
-    }
+		$this->list_datas = array();
+	}
 }
diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php
index 746d2222c39..956c78c1679 100644
--- a/htdocs/contact/card.php
+++ b/htdocs/contact/card.php
@@ -873,7 +873,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 
 			print "</table>";
 
-			dol_fiche_end();
+			print dol_get_fiche_end();
 
 			print '<div class="center">';
 			print '<input type="submit" class="button" name="add" value="'.$langs->trans("Add").'">';
@@ -1237,7 +1237,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 
 			print '</table>';
 
-			dol_fiche_end();
+			print dol_get_fiche_end();
 
 			print '<div class="center">';
 			print '<input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
@@ -1249,14 +1249,14 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		}
 	}
 
-    // Select mail models is same action as presend
-    if (GETPOST('modelselected', 'alpha')) {
-        $action = 'presend';
-    }
+	// Select mail models is same action as presend
+	if (GETPOST('modelselected', 'alpha')) {
+		$action = 'presend';
+	}
 
-    if (!empty($id) && $action != 'edit' && $action != 'create')
-    {
-        $objsoc = new Societe($db);
+	if (!empty($id) && $action != 'edit' && $action != 'create')
+	{
+		$objsoc = new Societe($db);
 
 		// View mode
 
@@ -1482,7 +1482,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		print '</div></div></div>';
 		print '<div style="clear:both"></div>';
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 		// Barre d'actions
 		print '<div class="tabsAction">';
diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php
index ab6e3c732c9..1f1012fb726 100644
--- a/htdocs/contact/class/contact.class.php
+++ b/htdocs/contact/class/contact.class.php
@@ -142,63 +142,63 @@ class Contact extends CommonObject
 	public $state_code; // Code of department
 	public $state; // Label of department
 
-    public $poste; // Position
+	public $poste; // Position
 
 	public $socid; // fk_soc
 	public $statut; // 0=inactif, 1=actif
 
 	public $code;
 
-    /**
-     * Email
-     * @var string
-     */
+	/**
+	 * Email
+	 * @var string
+	 */
 	public $email;
 
-    /**
-     * Unsuscribe all : 1 = contact has globaly unsubscribe of all mass emailings
+	/**
+	 * Unsuscribe all : 1 = contact has globaly unsubscribe of all mass emailings
 	 * @var int
-     */
+	 */
 	public $no_email;
 
-    /**
-     * @var array array of socialnetworks
-     */
-    public $socialnetworks;
+	/**
+	 * @var array array of socialnetworks
+	 */
+	public $socialnetworks;
 
-    /**
-     * Skype username
-     * @var string
-     * @deprecated
-     */
+	/**
+	 * Skype username
+	 * @var string
+	 * @deprecated
+	 */
 	public $skype;
 
 	/**
-     * Twitter username
-     * @var string
-     * @deprecated
-     */
+	 * Twitter username
+	 * @var string
+	 * @deprecated
+	 */
 	public $twitter;
 
 	 /**
-     * Facebook username
-     * @var string
-     * @deprecated
-     */
+	  * Facebook username
+	  * @var string
+	  * @deprecated
+	  */
 	public $facebook;
 
 	 /**
-     * Linkedin username
-     * @var string
-     * @deprecated
-     */
-    public $linkedin;
+	  * Linkedin username
+	  * @var string
+	  * @deprecated
+	  */
+	public $linkedin;
 
-    /**
-     * Jabber username
-     * @var string
-     * @deprecated
-     */
+	/**
+	 * Jabber username
+	 * @var string
+	 * @deprecated
+	 */
 	public $jabberid;
 
 	public $photo;
@@ -227,10 +227,10 @@ class Contact extends CommonObject
 	// END MODULEBUILDER PROPERTIES
 
 
-    /**
-     * Old copy
-     * @var Contact
-     */
+	/**
+	 * Old copy
+	 * @var Contact
+	 */
 	public $oldcopy; // To contains a clone of this when we need to save old properties of object
 
 	public $roles = array();
@@ -281,7 +281,7 @@ class Contact extends CommonObject
 		{
 			foreach($this->fields as $key => $val)
 			{
-				if (is_array($val['arrayofkeyval']))
+				if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval']))
 				{
 					foreach($val['arrayofkeyval'] as $key2 => $val2)
 					{
@@ -292,7 +292,7 @@ class Contact extends CommonObject
 		}*/
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Load indicators into this->nb for board
 	 *
@@ -300,7 +300,7 @@ class Contact extends CommonObject
 	 */
 	public function load_state_board()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $user;
 
 		$this->nb = array();
@@ -310,14 +310,14 @@ class Contact extends CommonObject
 		$sql .= " FROM ".MAIN_DB_PREFIX."socpeople as sp";
 		if (!$user->rights->societe->client->voir && !$user->socid)
 		{
-		    $sql .= ", ".MAIN_DB_PREFIX."societe as s";
-		    $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+			$sql .= ", ".MAIN_DB_PREFIX."societe as s";
+			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 			$sql .= " WHERE sp.fk_soc = s.rowid AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
 			$clause = "AND";
 		}
 		$sql .= ' '.$clause.' sp.entity IN ('.getEntity($this->element).')';
 		$sql .= " AND (sp.priv='0' OR (sp.priv='1' AND sp.fk_user_creat=".$user->id."))";
-        if ($user->socid > 0) $sql .= " AND sp.fk_soc = ".$user->socid;
+		if ($user->socid > 0) $sql .= " AND sp.fk_soc = ".$user->socid;
 
 		$resql = $this->db->query($sql);
 		if ($resql)
@@ -352,11 +352,9 @@ class Contact extends CommonObject
 
 		// Clean parameters
 		$this->lastname = $this->lastname ?trim($this->lastname) : trim($this->name);
-        $this->firstname = trim($this->firstname);
-        if (!empty($conf->global->MAIN_FIRST_TO_UPPER)) $this->lastname = ucwords(strtolower($this->lastname));
-		if (!empty($conf->global->MAIN_ALL_TO_UPPER)) $this->lastname = strtoupper($this->lastname);
-        if (!empty($conf->global->MAIN_FIRST_TO_UPPER)) $this->firstname = ucwords(strtolower($this->firstname));
-        if (empty($this->socid)) $this->socid = 0;
+		$this->firstname = trim($this->firstname);
+		$this->setUpperOrLowerCase();
+		if (empty($this->socid)) $this->socid = 0;
 		if (empty($this->priv)) $this->priv = 0;
 		if (empty($this->statut)) $this->statut = 0; // This is to convert '' into '0' to avoid bad sql request
 
@@ -365,11 +363,11 @@ class Contact extends CommonObject
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."socpeople (";
 		$sql .= " datec";
 		$sql .= ", fk_soc";
-        $sql .= ", lastname";
-        $sql .= ", firstname";
-        $sql .= ", fk_user_creat";
+		$sql .= ", lastname";
+		$sql .= ", firstname";
+		$sql .= ", fk_user_creat";
 		$sql .= ", priv";
-		$sql.= ", fk_stcommcontact";
+		$sql .= ", fk_stcommcontact";
 		$sql .= ", statut";
 		$sql .= ", canvas";
 		$sql .= ", entity";
@@ -380,15 +378,15 @@ class Contact extends CommonObject
 		if ($this->socid > 0) $sql .= " ".$this->db->escape($this->socid).",";
 		else $sql .= "null,";
 		$sql .= "'".$this->db->escape($this->lastname)."',";
-        $sql .= "'".$this->db->escape($this->firstname)."',";
-        $sql .= " ".($user->id > 0 ? "'".$this->db->escape($user->id)."'" : "null").",";
+		$sql .= "'".$this->db->escape($this->firstname)."',";
+		$sql .= " ".($user->id > 0 ? "'".$this->db->escape($user->id)."'" : "null").",";
 		$sql .= " ".$this->db->escape($this->priv).",";
-		$sql.= " 0,";
+		$sql .= " 0,";
 		$sql .= " ".$this->db->escape($this->statut).",";
-        $sql .= " ".(!empty($this->canvas) ? "'".$this->db->escape($this->canvas)."'" : "null").",";
-        $sql .= " ".$this->db->escape($this->entity).",";
-        $sql .= "'".$this->db->escape($this->ref_ext)."',";
-        $sql .= " ".(!empty($this->import_key) ? "'".$this->db->escape($this->import_key)."'" : "null");
+		$sql .= " ".(!empty($this->canvas) ? "'".$this->db->escape($this->canvas)."'" : "null").",";
+		$sql .= " ".$this->db->escape($this->entity).",";
+		$sql .= "'".$this->db->escape($this->ref_ext)."',";
+		$sql .= " ".(!empty($this->import_key) ? "'".$this->db->escape($this->import_key)."'" : "null");
 		$sql .= ")";
 
 		dol_syslog(get_class($this)."::create", LOG_DEBUG);
@@ -399,41 +397,41 @@ class Contact extends CommonObject
 
 			if (!$error)
 			{
-                $result = $this->update($this->id, $user, 1, 'add'); // This include updateRoles(), ...
-                if ($result < 0)
-                {
-                    $error++;
-				    $this->error = $this->db->lasterror();
-                }
+				$result = $this->update($this->id, $user, 1, 'add'); // This include updateRoles(), ...
+				if ($result < 0)
+				{
+					$error++;
+					$this->error = $this->db->lasterror();
+				}
 			}
 
 			if (!$error)
-            {
-                $result = $this->update_perso($this->id, $user, 1); // TODO Remove function update_perso, should be same than update
-                if ($result < 0)
-                {
-                    $error++;
-                    $this->error = $this->db->lasterror();
-                }
-            }
+			{
+				$result = $this->update_perso($this->id, $user, 1); // TODO Remove function update_perso, should be same than update
+				if ($result < 0)
+				{
+					$error++;
+					$this->error = $this->db->lasterror();
+				}
+			}
 
-            if (!$error)
-            {
-                // Call trigger
-                $result = $this->call_trigger('CONTACT_CREATE', $user);
-                if ($result < 0) { $error++; }
-                // End call triggers
-            }
+			if (!$error)
+			{
+				// Call trigger
+				$result = $this->call_trigger('CONTACT_CREATE', $user);
+				if ($result < 0) { $error++; }
+				// End call triggers
+			}
 
-            if (!$error)
-            {
-                $this->db->commit();
-                return $this->id;
-            } else {
-                $this->db->rollback();
-                dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
-                return -2;
-            }
+			if (!$error)
+			{
+				$this->db->commit();
+				return $this->id;
+			} else {
+				$this->db->rollback();
+				dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
+				return -2;
+			}
 		} else {
 			$this->error = $this->db->lasterror();
 
@@ -464,10 +462,6 @@ class Contact extends CommonObject
 		$this->entity = ((isset($this->entity) && is_numeric($this->entity)) ? $this->entity : $conf->entity);
 
 		// Clean parameters
-		if (!empty($conf->global->MAIN_FIRST_TO_UPPER)) $this->lastname = ucwords(strtolower($this->lastname));
-		if (!empty($conf->global->MAIN_ALL_TO_UPPER)) $this->lastname = strtoupper($this->lastname);
-        if (!empty($conf->global->MAIN_FIRST_TO_UPPER)) $this->firstname = ucwords(strtolower($this->firstname));
-
 		$this->lastname = trim($this->lastname) ?trim($this->lastname) : trim($this->lastname);
 		$this->firstname = trim($this->firstname);
 		$this->email = trim($this->email);
@@ -478,8 +472,9 @@ class Contact extends CommonObject
 		$this->skype = trim($this->skype);
 		$this->photo = trim($this->photo);
 		$this->fax = trim($this->fax);
-		$this->zip = (empty($this->zip) ? '' : $this->zip);
-		$this->town = (empty($this->town) ? '' : $this->town);
+		$this->zip = (empty($this->zip) ? '' : trim($this->zip));
+		$this->town = (empty($this->town) ? '' : trim($this->town));
+		$this->setUpperOrLowerCase();
 		$this->country_id = ($this->country_id > 0 ? $this->country_id : $this->country_id);
 		if (empty($this->statut)) $this->statut = 0;
 		if (empty($this->civility_code) && !is_numeric($this->civility_id)) $this->civility_code = $this->civility_id; // For backward compatibility
@@ -499,7 +494,7 @@ class Contact extends CommonObject
 		$sql .= ", poste='".$this->db->escape($this->poste)."'";
 		$sql .= ", fax='".$this->db->escape($this->fax)."'";
 		$sql .= ", email='".$this->db->escape($this->email)."'";
-        $sql .= ", socialnetworks = '".$this->db->escape(json_encode($this->socialnetworks))."'";
+		$sql .= ", socialnetworks = '".$this->db->escape(json_encode($this->socialnetworks))."'";
 		$sql .= ", photo='".$this->db->escape($this->photo)."'";
 		$sql .= ", birthday=".($this->birthday ? "'".$this->db->idate($this->birthday)."'" : "null");
 		$sql .= ", note_private = ".(isset($this->note_private) ? "'".$this->db->escape($this->note_private)."'" : "null");
@@ -523,22 +518,22 @@ class Contact extends CommonObject
 		$result = $this->db->query($sql);
 		if ($result)
 		{
-		    unset($this->country_code);
-		    unset($this->country);
-		    unset($this->state_code);
-		    unset($this->state);
+			unset($this->country_code);
+			unset($this->country);
+			unset($this->state_code);
+			unset($this->state);
 
-		    $action = 'update';
+			$action = 'update';
 
-		    // Actions on extra fields
-		    if (!$error)
-		    {
-		    	$result = $this->insertExtraFields();
-		    	if ($result < 0)
-		    	{
-		    		$error++;
-		    	}
-		    }
+			// Actions on extra fields
+			if (!$error)
+			{
+				$result = $this->insertExtraFields();
+				if ($result < 0)
+				{
+					$error++;
+				}
+			}
 
 			if (!$error) {
 				$result = $this->updateRoles();
@@ -645,14 +640,14 @@ class Contact extends CommonObject
 			}
 		} else {
 			$this->error = $this->db->lasterror().' sql='.$sql;
-            $this->db->rollback();
+			$this->db->rollback();
 			return -1;
 		}
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 *	Retourne chaine DN complete dans l'annuaire LDAP pour l'objet
 	 *
@@ -664,7 +659,7 @@ class Contact extends CommonObject
 	 */
 	public function _load_ldap_dn($info, $mode = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 		$dn = '';
 		if ($mode == 0) $dn = $conf->global->LDAP_KEY_CONTACTS."=".$info[$conf->global->LDAP_KEY_CONTACTS].",".$conf->global->LDAP_CONTACT_DN;
@@ -674,8 +669,8 @@ class Contact extends CommonObject
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 *	Initialise tableau info (tableau des attributs LDAP)
 	 *
@@ -683,12 +678,12 @@ class Contact extends CommonObject
 	 */
 	public function _load_ldap_info()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $langs;
 
-        $info = array();
+		$info = array();
 
-        // Object classes
+		// Object classes
 		$info["objectclass"] = explode(',', $conf->global->LDAP_CONTACT_OBJECT_CLASS);
 
 		$this->fullname = $this->getFullName($langs);
@@ -717,8 +712,8 @@ class Contact extends CommonObject
 		if ($this->phone_perso && !empty($conf->global->LDAP_CONTACT_FIELD_HOMEPHONE)) $info[$conf->global->LDAP_CONTACT_FIELD_HOMEPHONE] = $this->phone_perso;
 		if ($this->phone_mobile && !empty($conf->global->LDAP_CONTACT_FIELD_MOBILE)) $info[$conf->global->LDAP_CONTACT_FIELD_MOBILE] = $this->phone_mobile;
 		if ($this->fax && !empty($conf->global->LDAP_CONTACT_FIELD_FAX))	    $info[$conf->global->LDAP_CONTACT_FIELD_FAX] = $this->fax;
-        if ($this->skype && !empty($conf->global->LDAP_CONTACT_FIELD_SKYPE))	    $info[$conf->global->LDAP_CONTACT_FIELD_SKYPE] = $this->skype;
-        if ($this->note_private && !empty($conf->global->LDAP_CONTACT_FIELD_DESCRIPTION)) $info[$conf->global->LDAP_CONTACT_FIELD_DESCRIPTION] = dol_string_nohtmltag($this->note_private, 2);
+		if ($this->skype && !empty($conf->global->LDAP_CONTACT_FIELD_SKYPE))	    $info[$conf->global->LDAP_CONTACT_FIELD_SKYPE] = $this->skype;
+		if ($this->note_private && !empty($conf->global->LDAP_CONTACT_FIELD_DESCRIPTION)) $info[$conf->global->LDAP_CONTACT_FIELD_DESCRIPTION] = dol_string_nohtmltag($this->note_private, 2);
 		if ($this->email && !empty($conf->global->LDAP_CONTACT_FIELD_MAIL))     $info[$conf->global->LDAP_CONTACT_FIELD_MAIL] = $this->email;
 
 		if ($conf->global->LDAP_SERVER_TYPE == 'egroupware')
@@ -750,22 +745,22 @@ class Contact extends CommonObject
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Update field alert birthday
 	 *
 	 *  @param      int			$id         Id of contact
 	 *  @param      User		$user		User asking to change alert or birthday
 	 *  @param      int		    $notrigger	0=no, 1=yes
-     *  @return     int         			<0 if KO, >=0 if OK
+	 *  @return     int         			<0 if KO, >=0 if OK
 	 */
 	public function update_perso($id, $user = null, $notrigger = 0)
 	{
-        // phpcs:enable
-	    $error = 0;
-	    $result = false;
+		// phpcs:enable
+		$error = 0;
+		$result = false;
 
-	    $this->db->begin();
+		$this->db->begin();
 
 		// Mis a jour contact
 		$sql = "UPDATE ".MAIN_DB_PREFIX."socpeople SET";
@@ -796,8 +791,8 @@ class Contact extends CommonObject
 				$result = $this->db->query($sql);
 				if (!$result)
 				{
-                    $error++;
-                    $this->error = $this->db->lasterror();
+					$error++;
+					$this->error = $this->db->lasterror();
 				}
 			} else {
 				$result = true;
@@ -808,27 +803,27 @@ class Contact extends CommonObject
 			$result = $this->db->query($sql);
 			if (!$result)
 			{
-                $error++;
-                $this->error = $this->db->lasterror();
+				$error++;
+				$this->error = $this->db->lasterror();
 			}
 		}
 
 		if (!$error && !$notrigger)
 		{
-		    // Call trigger
-		    $result = $this->call_trigger('CONTACT_MODIFY', $user);
-		    if ($result < 0) { $error++; }
-		    // End call triggers
+			// Call trigger
+			$result = $this->call_trigger('CONTACT_MODIFY', $user);
+			if ($result < 0) { $error++; }
+			// End call triggers
 		}
 
 		if (!$error)
 		{
-		    $this->db->commit();
-		    return 1;
+			$this->db->commit();
+			return 1;
 		} else {
-		    dol_syslog(get_class($this)."::update Error ".$this->error, LOG_ERR);
-		    $this->db->rollback();
-		    return -$error;
+			dol_syslog(get_class($this)."::update Error ".$this->error, LOG_ERR);
+			$this->db->rollback();
+			return -$error;
 		}
 	}
 
@@ -838,9 +833,9 @@ class Contact extends CommonObject
 	 *
 	 *  @param      int		$id         	Id of contact
 	 *  @param      User	$user       	Load also alerts of this user (subscribing to alerts) that want alerts about this contact
-     *  @param      string  $ref_ext    	External reference, not given by Dolibarr
-     *  @param		string	$email			Email
-     *  @param		int		$loadalsoroles	Load also roles
+	 *  @param      string  $ref_ext    	External reference, not given by Dolibarr
+	 *  @param		string	$email			Email
+	 *  @param		int		$loadalsoroles	Load also roles
 	 *  @return     int     		    	>0 if OK, <0 if KO or if two records found for same ref or idprof, 0 if not found.
 	 */
 	public function fetch($id, $user = null, $ref_ext = '', $email = '', $loadalsoroles = 0)
@@ -864,9 +859,9 @@ class Contact extends CommonObject
 		$sql .= " c.birthday,";
 		$sql .= " c.poste, c.phone, c.phone_perso, c.phone_mobile, c.fax, c.email,";
 		$sql .= " c.socialnetworks,";
-        $sql .= " c.photo,";
+		$sql .= " c.photo,";
 		$sql .= " c.priv, c.note_private, c.note_public, c.default_lang, c.canvas,";
-		$sql.= " c.fk_prospectcontactlevel, c.fk_stcommcontact, st.libelle as stcomm, st.picto as stcomm_picto,";
+		$sql .= " c.fk_prospectcontactlevel, c.fk_stcommcontact, st.libelle as stcomm, st.picto as stcomm_picto,";
 		$sql .= " c.import_key,";
 		$sql .= " c.datec as date_creation, c.tms as date_modification,";
 		$sql .= " co.label as country, co.code as country_code,";
@@ -878,7 +873,7 @@ class Contact extends CommonObject
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as d ON c.fk_departement = d.rowid";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as u ON c.rowid = u.fk_socpeople";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON c.fk_soc = s.rowid";
-		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_stcommcontact as st ON c.fk_stcommcontact = st.id';
+		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_stcommcontact as st ON c.fk_stcommcontact = st.id';
 		if ($id) $sql .= " WHERE c.rowid = ".((int) $id);
 		else {
 			$sql .= " WHERE c.entity IN (".getEntity($this->element).")";
@@ -912,7 +907,7 @@ class Contact extends CommonObject
 				$this->civility_code    = $obj->civility_code;
 				$this->civility	        = $obj->civility_code ? ($langs->trans("Civility".$obj->civility_code) != ("Civility".$obj->civility_code) ? $langs->trans("Civility".$obj->civility_code) : $obj->civility_code) : '';
 
-                $this->lastname = $obj->lastname;
+				$this->lastname = $obj->lastname;
 				$this->firstname = $obj->firstname;
 				$this->address = $obj->address;
 				$this->zip = $obj->zip;
@@ -936,11 +931,11 @@ class Contact extends CommonObject
 
 				$this->fk_prospectlevel = $obj->fk_prospectcontactlevel;
 
-				$transcode=$langs->trans('StatusProspect'.$obj->fk_stcommcontact);
-				$libelle=($transcode!='StatusProspect'.$obj->fk_stcommcontact?$transcode:$obj->stcomm);
-				$this->stcomm_id = $obj->fk_stcommcontact;  // id statut commercial
-				$this->statut_commercial = $libelle;    	// libelle statut commercial
-				$this->stcomm_picto = $obj->stcomm_picto; 	// Picto statut commercial
+				$transcode = $langs->trans('StatusProspect'.$obj->fk_stcommcontact);
+				$libelle = ($transcode != 'StatusProspect'.$obj->fk_stcommcontact ? $transcode : $obj->stcomm);
+				$this->stcomm_id = $obj->fk_stcommcontact; // id statut commercial
+				$this->statut_commercial = $libelle; // libelle statut commercial
+				$this->stcomm_picto = $obj->stcomm_picto; // Picto statut commercial
 
 				$this->phone_pro = trim($obj->phone);
 				$this->fax = trim($obj->fax);
@@ -1054,7 +1049,7 @@ class Contact extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Load number of elements the contact is used as a link for
 	 *  ref_facturation
@@ -1062,11 +1057,11 @@ class Contact extends CommonObject
 	 *  ref_commande (for order and/or shipments)
 	 *  ref_propale
 	 *
-     *  @return     int             					<0 if KO, >=0 if OK
+	 *  @return     int             					<0 if KO, >=0 if OK
 	 */
 	public function load_ref_elements()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		// Compte les elements pour lesquels il est contact
 		$sql = "SELECT tc.element, count(ec.rowid) as nb";
 		$sql .= " FROM ".MAIN_DB_PREFIX."element_contact as ec, ".MAIN_DB_PREFIX."c_type_contact as tc";
@@ -1192,18 +1187,18 @@ class Contact extends CommonObject
 		}
 
 		// Removed extrafields
-        if (!$error) {
-            // For avoid conflicts if trigger used
+		if (!$error) {
+			// For avoid conflicts if trigger used
 			$result = $this->deleteExtraFields();
 			if ($result < 0) $error++;
 		}
 
 		if (!$error && !$notrigger)
 		{
-            // Call trigger
-            $result = $this->call_trigger('CONTACT_DELETE', $user);
-            if ($result < 0) { $error++; }
-            // End call triggers
+			// Call trigger
+			$result = $this->call_trigger('CONTACT_DELETE', $user);
+			if ($result < 0) { $error++; }
+			// End call triggers
 		}
 
 		if (!$error)
@@ -1296,7 +1291,7 @@ class Contact extends CommonObject
 	 *	@param		string		$option						Where the link point to
 	 *	@param		int			$maxlen						Max length of
 	 *  @param		string		$moreparam					Add more param into URL
-     *  @param      int     	$save_lastsearch_value		-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+	 *  @param      int     	$save_lastsearch_value		-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
 	 *	@param		int			$notooltip					1=Disable tooltip
 	 *	@return		string									String with URL
 	 */
@@ -1314,40 +1309,40 @@ class Contact extends CommonObject
 		}
 
 		$label .= img_picto('', $this->picto).' <u>'.$langs->trans("Contact").'</u>';
-        $label .= '<br><b>'.$langs->trans("Name").':</b> '.$this->getFullName($langs);
-        //if ($this->civility_id) $label.= '<br><b>' . $langs->trans("Civility") . ':</b> '.$this->civility_id;		// TODO Translate cibilty_id code
-        if (!empty($this->poste)) $label .= '<br><b>'.$langs->trans("Poste").':</b> '.$this->poste;
-        $label .= '<br><b>'.$langs->trans("EMail").':</b> '.$this->email;
-        $phonelist = array();
-        if ($this->phone_pro) $phonelist[] = dol_print_phone($this->phone_pro, $this->country_code, $this->id, 0, '', '&nbsp;', 'phone');
-        if ($this->phone_mobile) $phonelist[] = dol_print_phone($this->phone_mobile, $this->country_code, $this->id, 0, '', '&nbsp;', 'mobile');
-        if ($this->phone_perso) $phonelist[] = dol_print_phone($this->phone_perso, $this->country_code, $this->id, 0, '', '&nbsp;', 'phone');
-        $label .= '<br><b>'.$langs->trans("Phone").':</b> '.implode('&nbsp;', $phonelist);
-        $label .= '<br><b>'.$langs->trans("Address").':</b> '.dol_format_address($this, 1, ' ', $langs);
+		$label .= '<br><b>'.$langs->trans("Name").':</b> '.$this->getFullName($langs);
+		//if ($this->civility_id) $label.= '<br><b>' . $langs->trans("Civility") . ':</b> '.$this->civility_id;		// TODO Translate cibilty_id code
+		if (!empty($this->poste)) $label .= '<br><b>'.$langs->trans("Poste").':</b> '.$this->poste;
+		$label .= '<br><b>'.$langs->trans("EMail").':</b> '.$this->email;
+		$phonelist = array();
+		if ($this->phone_pro) $phonelist[] = dol_print_phone($this->phone_pro, $this->country_code, $this->id, 0, '', '&nbsp;', 'phone');
+		if ($this->phone_mobile) $phonelist[] = dol_print_phone($this->phone_mobile, $this->country_code, $this->id, 0, '', '&nbsp;', 'mobile');
+		if ($this->phone_perso) $phonelist[] = dol_print_phone($this->phone_perso, $this->country_code, $this->id, 0, '', '&nbsp;', 'phone');
+		$label .= '<br><b>'.$langs->trans("Phone").':</b> '.implode('&nbsp;', $phonelist);
+		$label .= '<br><b>'.$langs->trans("Address").':</b> '.dol_format_address($this, 1, ' ', $langs);
 
-        $url = DOL_URL_ROOT.'/contact/card.php?id='.$this->id;
+		$url = DOL_URL_ROOT.'/contact/card.php?id='.$this->id;
 
-        if ($option !== 'nolink')
-        {
-        	// Add param to save lastsearch_values or not
-        	$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
-        	if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
-        	if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
-        }
+		if ($option !== 'nolink')
+		{
+			// Add param to save lastsearch_values or not
+			$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
+			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
+			if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
+		}
 
-        $url .= $moreparam;
+		$url .= $moreparam;
 
-        $linkclose = "";
+		$linkclose = "";
 		if (empty($notooltip)) {
-	    	if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-    	    {
-        	    $label = $langs->trans("ShowContact");
-            	$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
-        	}
-	       	$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
-    	   	$linkclose .= ' class="classfortooltip"';
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+			{
+				$label = $langs->trans("ShowContact");
+				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
+			}
+		   	$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
+		   	$linkclose .= ' class="classfortooltip"';
 
-    	   	/*
+		   	/*
     	   	 $hookmanager->initHooks(array('contactdao'));
     	   	 $parameters=array('id'=>$this->id);
     	   	 $reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
@@ -1407,7 +1402,7 @@ class Contact extends CommonObject
 		return $this->LibStatut($this->statut, $mode);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Renvoi le libelle d'un statut donne
 	 *
@@ -1417,7 +1412,7 @@ class Contact extends CommonObject
 	 */
 	public function LibStatut($status, $mode)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 
 		$labelStatus = array(
@@ -1443,7 +1438,7 @@ class Contact extends CommonObject
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Return translated label of Public or Private
 	 *
@@ -1452,7 +1447,7 @@ class Contact extends CommonObject
 	 */
 	public function LibPubPriv($status)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 		if ($status == '1') return $langs->trans('ContactPrivate');
 		else return $langs->trans('ContactPublic');
@@ -1460,11 +1455,11 @@ class Contact extends CommonObject
 
 
 	/**
-     *  Initialise an instance with random values.
-     *  Used to build previews or test instances.
-     *	id must be 0 if object instance is a specimen.
-     *
-     *  @return	int >0 if ok
+	 *  Initialise an instance with random values.
+	 *  Used to build previews or test instances.
+	 *	id must be 0 if object instance is a specimen.
+	 *
+	 *  @return	int >0 if ok
 	 */
 	public function initAsSpecimen()
 	{
@@ -1533,10 +1528,10 @@ class Contact extends CommonObject
 		dol_syslog(get_class($this)."::setstatus", LOG_DEBUG);
 		if ($result)
 		{
-            // Call trigger
-            $result = $this->call_trigger('CONTACT_ENABLEDISABLE', $user);
-            if ($result < 0) { $error++; }
-            // End call triggers
+			// Call trigger
+			$result = $this->call_trigger('CONTACT_ENABLEDISABLE', $user);
+			if ($result < 0) { $error++; }
+			// End call triggers
 		}
 
 		if ($error)
@@ -1557,7 +1552,7 @@ class Contact extends CommonObject
 	 * Existing categories are left untouch.
 	 *
 	 * @param int[]|int $categories Category or categories IDs
-     * @return void
+	 * @return void
 	 */
 	public function setCategories($categories)
 	{
@@ -1770,15 +1765,15 @@ class Contact extends CommonObject
 	{
 		global $langs;
 
-		$sql = "SELECT id, code, libelle as label, picto FROM " . MAIN_DB_PREFIX . "c_stcommcontact";
-		if ($active >= 0) $sql .= " WHERE active = " . $active;
+		$sql = "SELECT id, code, libelle as label, picto FROM ".MAIN_DB_PREFIX."c_stcommcontact";
+		if ($active >= 0) $sql .= " WHERE active = ".$active;
 		$resql = $this->db->query($sql);
 		$num = $this->db->num_rows($resql);
 		$i = 0;
 		while ($i < $num)
 		{
 			$obj = $this->db->fetch_object($resql);
-			$this->cacheprospectstatus[$obj->id] = array('id' => $obj->id, 'code' => $obj->code, 'label' => ($langs->trans("ST_" . strtoupper($obj->code)) == "ST_" . strtoupper($obj->code)) ? $obj->label : $langs->trans("ST_" . strtoupper($obj->code)), 'picto' => $obj->picto);
+			$this->cacheprospectstatus[$obj->id] = array('id' => $obj->id, 'code' => $obj->code, 'label' => ($langs->trans("ST_".strtoupper($obj->code)) == "ST_".strtoupper($obj->code)) ? $obj->label : $langs->trans("ST_".strtoupper($obj->code)), 'picto' => $obj->picto);
 			$i++;
 		}
 		return 1;
@@ -1804,9 +1799,9 @@ class Contact extends CommonObject
 	{
 		global $langs;
 
-		$lib = $langs->trans("ProspectLevel" . $fk_prospectlevel);
+		$lib = $langs->trans("ProspectLevel".$fk_prospectlevel);
 		// If lib not found in language file, we get label from cache/databse
-		if ($lib == $langs->trans("ProspectLevel" . $fk_prospectlevel))
+		if ($lib == $langs->trans("ProspectLevel".$fk_prospectlevel))
 		{
 			$lib = $langs->getLabelFromKey($this->db, $fk_prospectlevel, 'c_prospectlevel', 'code', 'label');
 		}
@@ -1858,13 +1853,13 @@ class Contact extends CommonObject
 
 		if ($mode == 2)
 		{
-			if ($statut == '-1' || $statut == 'ST_NO') return img_action($langs->trans("StatusProspect-1"), -1, $picto) . ' ' . $langs->trans("StatusProspect-1");
-			elseif ($statut == '0' || $statut == 'ST_NEVER') return img_action($langs->trans("StatusProspect0"), 0, $picto) . ' ' . $langs->trans("StatusProspect0");
-			elseif ($statut == '1' || $statut == 'ST_TODO') return img_action($langs->trans("StatusProspect1"), 1, $picto) . ' ' . $langs->trans("StatusProspect1");
-			elseif ($statut == '2' || $statut == 'ST_PEND') return img_action($langs->trans("StatusProspect2"), 2, $picto) . ' ' . $langs->trans("StatusProspect2");
-			elseif ($statut == '3' || $statut == 'ST_DONE') return img_action($langs->trans("StatusProspect3"), 3, $picto) . ' ' . $langs->trans("StatusProspect3");
+			if ($statut == '-1' || $statut == 'ST_NO') return img_action($langs->trans("StatusProspect-1"), -1, $picto).' '.$langs->trans("StatusProspect-1");
+			elseif ($statut == '0' || $statut == 'ST_NEVER') return img_action($langs->trans("StatusProspect0"), 0, $picto).' '.$langs->trans("StatusProspect0");
+			elseif ($statut == '1' || $statut == 'ST_TODO') return img_action($langs->trans("StatusProspect1"), 1, $picto).' '.$langs->trans("StatusProspect1");
+			elseif ($statut == '2' || $statut == 'ST_PEND') return img_action($langs->trans("StatusProspect2"), 2, $picto).' '.$langs->trans("StatusProspect2");
+			elseif ($statut == '3' || $statut == 'ST_DONE') return img_action($langs->trans("StatusProspect3"), 3, $picto).' '.$langs->trans("StatusProspect3");
 			else {
-				return img_action(($langs->trans("StatusProspect" . $statut) != "StatusProspect" . $statut) ? $langs->trans("StatusProspect" . $statut) : $label, 0, $picto) . ' ' . (($langs->trans("StatusProspect" . $statut) != "StatusProspect" . $statut) ? $langs->trans("StatusProspect" . $statut) : $label);
+				return img_action(($langs->trans("StatusProspect".$statut) != "StatusProspect".$statut) ? $langs->trans("StatusProspect".$statut) : $label, 0, $picto).' '.(($langs->trans("StatusProspect".$statut) != "StatusProspect".$statut) ? $langs->trans("StatusProspect".$statut) : $label);
 			}
 		}
 		if ($mode == 3)
@@ -1875,18 +1870,18 @@ class Contact extends CommonObject
 			elseif ($statut == '2' || $statut == 'ST_PEND') return img_action($langs->trans("StatusProspect2"), 2, $picto);
 			elseif ($statut == '3' || $statut == 'ST_DONE') return img_action($langs->trans("StatusProspect3"), 3, $picto);
 			else {
-				return img_action(($langs->trans("StatusProspect" . $statut) != "StatusProspect" . $statut) ? $langs->trans("StatusProspect" . $statut) : $label, 0, $picto);
+				return img_action(($langs->trans("StatusProspect".$statut) != "StatusProspect".$statut) ? $langs->trans("StatusProspect".$statut) : $label, 0, $picto);
 			}
 		}
 		if ($mode == 4)
 		{
-			if ($statut == '-1' || $statut == 'ST_NO') return img_action($langs->trans("StatusProspect-1"), -1, $picto) . ' ' . $langs->trans("StatusProspect-1");
-			elseif ($statut == '0' || $statut == 'ST_NEVER') return img_action($langs->trans("StatusProspect0"), 0, $picto) . ' ' . $langs->trans("StatusProspect0");
-			elseif ($statut == '1' || $statut == 'ST_TODO') return img_action($langs->trans("StatusProspect1"), 1, $picto) . ' ' . $langs->trans("StatusProspect1");
-			elseif ($statut == '2' || $statut == 'ST_PEND') return img_action($langs->trans("StatusProspect2"), 2, $picto) . ' ' . $langs->trans("StatusProspect2");
-			elseif ($statut == '3' || $statut == 'ST_DONE') return img_action($langs->trans("StatusProspect3"), 3, $picto) . ' ' . $langs->trans("StatusProspect3");
+			if ($statut == '-1' || $statut == 'ST_NO') return img_action($langs->trans("StatusProspect-1"), -1, $picto).' '.$langs->trans("StatusProspect-1");
+			elseif ($statut == '0' || $statut == 'ST_NEVER') return img_action($langs->trans("StatusProspect0"), 0, $picto).' '.$langs->trans("StatusProspect0");
+			elseif ($statut == '1' || $statut == 'ST_TODO') return img_action($langs->trans("StatusProspect1"), 1, $picto).' '.$langs->trans("StatusProspect1");
+			elseif ($statut == '2' || $statut == 'ST_PEND') return img_action($langs->trans("StatusProspect2"), 2, $picto).' '.$langs->trans("StatusProspect2");
+			elseif ($statut == '3' || $statut == 'ST_DONE') return img_action($langs->trans("StatusProspect3"), 3, $picto).' '.$langs->trans("StatusProspect3");
 			else {
-				return img_action(($langs->trans("StatusProspect" . $statut) != "StatusProspect" . $statut) ? $langs->trans("StatusProspect" . $statut) : $label, 0, $picto) . ' ' . (($langs->trans("StatusProspect" . $statut) != "StatusProspect" . $statut) ? $langs->trans("StatusProspect" . $statut) : $label);
+				return img_action(($langs->trans("StatusProspect".$statut) != "StatusProspect".$statut) ? $langs->trans("StatusProspect".$statut) : $label, 0, $picto).' '.(($langs->trans("StatusProspect".$statut) != "StatusProspect".$statut) ? $langs->trans("StatusProspect".$statut) : $label);
 			}
 		}
 
diff --git a/htdocs/contact/consumption.php b/htdocs/contact/consumption.php
index f2eb1e4cfaf..da00374cc2a 100644
--- a/htdocs/contact/consumption.php
+++ b/htdocs/contact/consumption.php
@@ -62,10 +62,10 @@ $year = GETPOST('year', 'int');
 // Clean up on purge search criteria ?
 if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // Both test are required to be compatible with all browsers
 {
-    $sref = '';
-    $sprod_fulldescr = '';
-    $year = '';
-    $month = '';
+	$sref = '';
+	$sprod_fulldescr = '';
+	$year = '';
+	$month = '';
 }
 // Customer or supplier selected in drop box
 $thirdTypeSelect = GETPOST("third_select_id");
@@ -113,11 +113,11 @@ $linkback = '<a href="'.DOL_URL_ROOT.'/contact/list.php?restore_lastsearch_value
 $morehtmlref = '<div class="refidno">';
 if (empty($conf->global->SOCIETE_DISABLE_CONTACTS))
 {
-    $objsoc->fetch($socid);
-    // Thirdparty
-    $morehtmlref .= $langs->trans('ThirdParty').' : ';
-    if ($objsoc->id > 0) $morehtmlref .= $objsoc->getNomUrl(1, 'contact');
-    else $morehtmlref .= $langs->trans("ContactNotLinkedToCompany");
+	$objsoc->fetch($socid);
+	// Thirdparty
+	$morehtmlref .= $langs->trans('ThirdParty').' : ';
+	if ($objsoc->id > 0) $morehtmlref .= $objsoc->getNomUrl(1, 'contact');
+	else $morehtmlref .= $langs->trans("ContactNotLinkedToCompany");
 }
 $morehtmlref .= '</div>';
 
@@ -148,7 +148,7 @@ if ($object->thirdparty->fournisseur)
 {
 	$thirdTypeArray['supplier'] = $langs->trans("supplier");
 	if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_invoice->enabled)) && $user->rights->fournisseur->facture->lire) $elementTypeArray['supplier_invoice'] = $langs->transnoentitiesnoconv('SuppliersInvoices');
-	if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled)) && $user->rights->fournisseur->commande->lire) $elementTypeArray['supplier_order']=  $langs->transnoentitiesnoconv('SuppliersOrders');
+	if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled)) && $user->rights->fournisseur->commande->lire) $elementTypeArray['supplier_order'] = $langs->transnoentitiesnoconv('SuppliersOrders');
 
 	// There no contact type for supplier proposals
 	// if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) && $user->rights->supplier_proposal->lire) $elementTypeArray['supplier_proposal']=$langs->transnoentitiesnoconv('SupplierProposals');
@@ -158,7 +158,7 @@ print '</table>';
 
 print '</div>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 print '<br>';
 
 
@@ -172,9 +172,9 @@ if ($type_element == 'fichinter')
 	$documentstatic = new Fichinter($db);
 	$sql_select = 'SELECT f.rowid as doc_id, f.ref as doc_number, \'1\' as doc_type, f.datec as dateprint, f.fk_statut as status, tc.libelle as type_contact_label, ';
 	$tables_from = MAIN_DB_PREFIX.'fichinterdet d';
-    $tables_from .= ' LEFT JOIN '.MAIN_DB_PREFIX.'fichinter as f ON d.fk_fichinter=f.rowid';
-    $tables_from .= ' INNER JOIN '.MAIN_DB_PREFIX.'element_contact ec ON ec.element_id=f.rowid AND ec.fk_socpeople='.$object->id;
-    $tables_from .= ' INNER JOIN '.MAIN_DB_PREFIX."c_type_contact tc ON (ec.fk_c_type_contact=tc.rowid and tc.element='fichinter' and tc.source='external' and tc.active=1)";
+	$tables_from .= ' LEFT JOIN '.MAIN_DB_PREFIX.'fichinter as f ON d.fk_fichinter=f.rowid';
+	$tables_from .= ' INNER JOIN '.MAIN_DB_PREFIX.'element_contact ec ON ec.element_id=f.rowid AND ec.fk_socpeople='.$object->id;
+	$tables_from .= ' INNER JOIN '.MAIN_DB_PREFIX."c_type_contact tc ON (ec.fk_c_type_contact=tc.rowid and tc.element='fichinter' and tc.source='external' and tc.active=1)";
 	$where = ' WHERE f.entity IN ('.getEntity('ficheinter').')';
 	$dateprint = 'f.datec';
 	$doc_number = 'f.ref';
@@ -184,10 +184,10 @@ if ($type_element == 'fichinter')
 	$documentstatic = new Facture($db);
 	$sql_select = 'SELECT f.rowid as doc_id, f.ref as doc_number, f.type as doc_type, f.datef as dateprint, f.fk_statut as status, f.paye as paid, tc.libelle as type_contact_label, ';
 	$tables_from = MAIN_DB_PREFIX.'facturedet d';
-    $tables_from .= ' LEFT JOIN '.MAIN_DB_PREFIX.'facture as f ON d.fk_facture=f.rowid';
-    $tables_from .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product p ON d.fk_product=p.rowid';
-    $tables_from .= ' INNER JOIN '.MAIN_DB_PREFIX.'element_contact ec ON ec.element_id=f.rowid AND ec.fk_socpeople='.$object->id;
-    $tables_from .= ' INNER JOIN '.MAIN_DB_PREFIX."c_type_contact tc ON (ec.fk_c_type_contact=tc.rowid and tc.element='facture' and tc.source='external' and tc.active=1)";
+	$tables_from .= ' LEFT JOIN '.MAIN_DB_PREFIX.'facture as f ON d.fk_facture=f.rowid';
+	$tables_from .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product p ON d.fk_product=p.rowid';
+	$tables_from .= ' INNER JOIN '.MAIN_DB_PREFIX.'element_contact ec ON ec.element_id=f.rowid AND ec.fk_socpeople='.$object->id;
+	$tables_from .= ' INNER JOIN '.MAIN_DB_PREFIX."c_type_contact tc ON (ec.fk_c_type_contact=tc.rowid and tc.element='facture' and tc.source='external' and tc.active=1)";
 	$where = " WHERE f.entity IN (".getEntity('invoice').")";
 	$dateprint = 'f.datef';
 	$doc_number = 'f.ref';
@@ -198,10 +198,10 @@ if ($type_element == 'fichinter')
 	$documentstatic = new Propal($db);
 	$sql_select = 'SELECT c.rowid as doc_id, c.ref as doc_number, \'1\' as doc_type, c.datep as dateprint, c.fk_statut as status, tc.libelle as type_contact_label, ';
 	$tables_from = MAIN_DB_PREFIX.'propaldet d';
-    $tables_from .= ' LEFT JOIN '.MAIN_DB_PREFIX.'propal as c ON d.fk_propal=c.rowid';
-    $tables_from .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product p ON d.fk_product=p.rowid';
-    $tables_from .= ' INNER JOIN '.MAIN_DB_PREFIX.'element_contact ec ON ec.element_id=c.rowid AND ec.fk_socpeople='.$object->id;
-    $tables_from .= ' INNER JOIN '.MAIN_DB_PREFIX."c_type_contact tc ON (ec.fk_c_type_contact=tc.rowid and tc.element='propal' and tc.source='external' and tc.active=1)";
+	$tables_from .= ' LEFT JOIN '.MAIN_DB_PREFIX.'propal as c ON d.fk_propal=c.rowid';
+	$tables_from .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product p ON d.fk_product=p.rowid';
+	$tables_from .= ' INNER JOIN '.MAIN_DB_PREFIX.'element_contact ec ON ec.element_id=c.rowid AND ec.fk_socpeople='.$object->id;
+	$tables_from .= ' INNER JOIN '.MAIN_DB_PREFIX."c_type_contact tc ON (ec.fk_c_type_contact=tc.rowid and tc.element='propal' and tc.source='external' and tc.active=1)";
 	$where = ' WHERE c.entity IN ('.getEntity('propal').')';
 	$datePrint = 'c.datep';
 	$doc_number = 'c.ref';
@@ -212,10 +212,10 @@ if ($type_element == 'fichinter')
 	$documentstatic = new Commande($db);
 	$sql_select = 'SELECT c.rowid as doc_id, c.ref as doc_number, \'1\' as doc_type, c.date_commande as dateprint, c.fk_statut as status, tc.libelle as type_contact_label, ';
 	$tables_from = MAIN_DB_PREFIX.'commandedet d';
-    $tables_from .= ' LEFT JOIN '.MAIN_DB_PREFIX.'commande as c ON d.fk_commande=c.rowid';
-    $tables_from .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product p ON d.fk_product=p.rowid';
-    $tables_from .= ' INNER JOIN '.MAIN_DB_PREFIX.'element_contact ec ON ec.element_id=c.rowid AND ec.fk_socpeople='.$object->id;
-    $tables_from .= ' INNER JOIN '.MAIN_DB_PREFIX."c_type_contact tc ON (ec.fk_c_type_contact=tc.rowid and tc.element='commande' and tc.source='external' and tc.active=1)";
+	$tables_from .= ' LEFT JOIN '.MAIN_DB_PREFIX.'commande as c ON d.fk_commande=c.rowid';
+	$tables_from .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product p ON d.fk_product=p.rowid';
+	$tables_from .= ' INNER JOIN '.MAIN_DB_PREFIX.'element_contact ec ON ec.element_id=c.rowid AND ec.fk_socpeople='.$object->id;
+	$tables_from .= ' INNER JOIN '.MAIN_DB_PREFIX."c_type_contact tc ON (ec.fk_c_type_contact=tc.rowid and tc.element='commande' and tc.source='external' and tc.active=1)";
 	$where = ' WHERE c.entity IN ('.getEntity('order').')';
 	$dateprint = 'c.date_commande';
 	$doc_number = 'c.ref';
@@ -226,10 +226,10 @@ if ($type_element == 'fichinter')
 	$documentstatic = new FactureFournisseur($db);
 	$sql_select = 'SELECT f.rowid as doc_id, f.ref as doc_number, \'1\' as doc_type, f.datef as dateprint, f.fk_statut as status, f.paye as paid, tc.libelle as type_contact_label, ';
 	$tables_from = MAIN_DB_PREFIX.'facture_fourn_det d';
-    $tables_from .= ' LEFT JOIN '.MAIN_DB_PREFIX.'facture_fourn as f ON d.fk_facture_fourn=f.rowid';
-    $tables_from .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product p ON d.fk_product=p.rowid';
-    $tables_from .= ' INNER JOIN '.MAIN_DB_PREFIX.'element_contact ec ON ec.element_id=f.rowid AND ec.fk_socpeople='.$object->id;
-    $tables_from .= ' INNER JOIN '.MAIN_DB_PREFIX."c_type_contact tc ON (ec.fk_c_type_contact=tc.rowid and tc.element='invoice_supplier' and tc.source='external' and tc.active=1)";
+	$tables_from .= ' LEFT JOIN '.MAIN_DB_PREFIX.'facture_fourn as f ON d.fk_facture_fourn=f.rowid';
+	$tables_from .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product p ON d.fk_product=p.rowid';
+	$tables_from .= ' INNER JOIN '.MAIN_DB_PREFIX.'element_contact ec ON ec.element_id=f.rowid AND ec.fk_socpeople='.$object->id;
+	$tables_from .= ' INNER JOIN '.MAIN_DB_PREFIX."c_type_contact tc ON (ec.fk_c_type_contact=tc.rowid and tc.element='invoice_supplier' and tc.source='external' and tc.active=1)";
 	$where = ' WHERE f.entity IN ('.getEntity($documentstatic->element).')';
 	$dateprint = 'f.datef';
 	$doc_number = 'f.ref';
@@ -254,10 +254,10 @@ elseif ($type_element == 'supplier_order')
 	$documentstatic = new CommandeFournisseur($db);
 	$sql_select = 'SELECT c.rowid as doc_id, c.ref as doc_number, \'1\' as doc_type, c.date_valid as dateprint, c.fk_statut as status, tc.libelle as type_contact_label, ';
 	$tables_from = MAIN_DB_PREFIX.'commande_fournisseurdet d';
-    $tables_from .= ' LEFT JOIN '.MAIN_DB_PREFIX.'commande_fournisseur as c ON d.fk_commande=c.rowid';
-    $tables_from .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product p ON d.fk_product=p.rowid';
-    $tables_from .= ' INNER JOIN '.MAIN_DB_PREFIX.'element_contact ec ON ec.element_id=c.rowid AND ec.fk_socpeople='.$object->id;
-    $tables_from .= ' INNER JOIN '.MAIN_DB_PREFIX."c_type_contact tc ON (ec.fk_c_type_contact=tc.rowid and tc.element='order_supplier' and tc.source='external' and tc.active=1)";
+	$tables_from .= ' LEFT JOIN '.MAIN_DB_PREFIX.'commande_fournisseur as c ON d.fk_commande=c.rowid';
+	$tables_from .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product p ON d.fk_product=p.rowid';
+	$tables_from .= ' INNER JOIN '.MAIN_DB_PREFIX.'element_contact ec ON ec.element_id=c.rowid AND ec.fk_socpeople='.$object->id;
+	$tables_from .= ' INNER JOIN '.MAIN_DB_PREFIX."c_type_contact tc ON (ec.fk_c_type_contact=tc.rowid and tc.element='order_supplier' and tc.source='external' and tc.active=1)";
 	$where = ' WHERE c.entity IN ('.getEntity($documentstatic->element).')';
 	$dateprint = 'c.date_valid';
 	$doc_number = 'c.ref';
@@ -269,10 +269,10 @@ elseif ($type_element == 'supplier_order')
 	$documentstaticline = new ContratLigne($db);
 	$sql_select = 'SELECT c.rowid as doc_id, c.ref as doc_number, \'1\' as doc_type, c.date_contrat as dateprint, d.statut as status, tc.libelle as type_contact_label, ';
 	$tables_from = MAIN_DB_PREFIX.'contratdet d';
-    $tables_from .= ' LEFT JOIN '.MAIN_DB_PREFIX.'contrat as c ON d.fk_contrat=c.rowid';
-    $tables_from .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product p ON d.fk_product=p.rowid';
-    $tables_from .= ' INNER JOIN '.MAIN_DB_PREFIX.'element_contact ec ON ec.element_id=c.rowid AND ec.fk_socpeople='.$object->id;
-    $tables_from .= ' INNER JOIN '.MAIN_DB_PREFIX."c_type_contact tc ON (ec.fk_c_type_contact=tc.rowid and tc.element='contrat' and tc.source='external' and tc.active=1)";
+	$tables_from .= ' LEFT JOIN '.MAIN_DB_PREFIX.'contrat as c ON d.fk_contrat=c.rowid';
+	$tables_from .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product p ON d.fk_product=p.rowid';
+	$tables_from .= ' INNER JOIN '.MAIN_DB_PREFIX.'element_contact ec ON ec.element_id=c.rowid AND ec.fk_socpeople='.$object->id;
+	$tables_from .= ' INNER JOIN '.MAIN_DB_PREFIX."c_type_contact tc ON (ec.fk_c_type_contact=tc.rowid and tc.element='contrat' and tc.source='external' and tc.active=1)";
 	$where = ' WHERE c.entity IN ('.getEntity('contrat').')';
 	$dateprint = 'c.date_valid';
 	$doc_number = 'c.ref';
@@ -293,16 +293,16 @@ if (!empty($sql_select))
 	$sql .= " ";
 	if ($type_element != 'fichinter') $sql .= ", p.ref as prod_ref, p.label as product_label";
 	$sql .= " FROM "/*.MAIN_DB_PREFIX."societe as s, "*/.$tables_from;
-    // if ($type_element != 'fichinter') $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON d.fk_product = p.rowid ';
+	// if ($type_element != 'fichinter') $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON d.fk_product = p.rowid ';
 	$sql .= $where;
 	$sql .= dolSqlDateFilter($dateprint, 0, $month, $year);
 	if ($sref) $sql .= " AND ".$doc_number." LIKE '%".$db->escape($sref)."%'";
 	if ($sprod_fulldescr)
 	{
-	    $sql .= " AND (d.description LIKE '%".$db->escape($sprod_fulldescr)."%'";
-	    if (GETPOST('type_element') != 'fichinter') $sql .= " OR p.ref LIKE '%".$db->escape($sprod_fulldescr)."%'";
-	    if (GETPOST('type_element') != 'fichinter') $sql .= " OR p.label LIKE '%".$db->escape($sprod_fulldescr)."%'";
-	    $sql .= ")";
+		$sql .= " AND (d.description LIKE '%".$db->escape($sprod_fulldescr)."%'";
+		if (GETPOST('type_element') != 'fichinter') $sql .= " OR p.ref LIKE '%".$db->escape($sprod_fulldescr)."%'";
+		if (GETPOST('type_element') != 'fichinter') $sql .= " OR p.label LIKE '%".$db->escape($sprod_fulldescr)."%'";
+		$sql .= ")";
 	}
 	$sql .= $db->order($sortfield, $sortorder);
 	$resql = $db->query($sql);
@@ -314,8 +314,8 @@ if (!empty($sql_select))
 $disabled = 0;
 $showempty = 2;
 if (empty($elementTypeArray) && !$object->thirdparty->client && !$object->thirdparty->fournisseur) {
-    $showempty = $langs->trans("ThirdpartyNotCustomerNotSupplierSoNoRef");
-    $disabled = 1;
+	$showempty = $langs->trans("ThirdpartyNotCustomerNotSupplierSoNoRef");
+	$disabled = 1;
 }
 
 // Define type of elements
@@ -340,7 +340,7 @@ if ($sql_select)
 	$num = $db->num_rows($resql);
 
 	$param = "&socid=".urlencode($socid)."&type_element=".urlencode($type_element);
-    if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
+	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
 	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
 	if ($sprod_fulldescr) $param .= "&sprod_fulldescr=".urlencode($sprod_fulldescr);
 	if ($sref) $param .= "&sref=".urlencode($sref);
@@ -348,48 +348,48 @@ if ($sql_select)
 	if ($year) $param .= "&year=".urlencode($year);
 	if ($optioncss != '') $param .= '&optioncss='.urlencode($optioncss);
 
-    print_barre_liste($langs->trans('ProductsIntoElements').' '.$typeElementString.' '.$button, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $totalnboflines, '', 0, '', '', $limit);
+	print_barre_liste($langs->trans('ProductsIntoElements').' '.$typeElementString.' '.$button, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $totalnboflines, '', 0, '', '', $limit);
 
-    print '<div class="div-table-responsive-no-min">';
-    print '<table class="liste centpercent">'."\n";
+	print '<div class="div-table-responsive-no-min">';
+	print '<table class="liste centpercent">'."\n";
 
-    // Filters
-    print '<tr class="liste_titre">';
-    print '<td class="liste_titre left">';
-    print '<input class="flat" type="text" name="sref" size="8" value="'.$sref.'">';
-    print '</td>';
-    print '<td class="liste_titre nowrap center">'; // date
-    print $formother->select_month($month ? $month : -1, 'month', 1, 0, 'valignmiddle');
-    $formother->select_year($year ? $year : -1, 'year', 1, 20, 1);
-    print '</td>';
-    print '<td class="liste_titre center">';
-    print '</td>';
-    print '<td class="liste_titre left">';
-    print '<input class="flat" type="text" name="sprod_fulldescr" size="15" value="'.dol_escape_htmltag($sprod_fulldescr).'">';
-    print '</td>';
-    print '<td class="liste_titre center">'; // TODO: Add filters !
-    print '</td>';
-    print '<td class="liste_titre center">';
-    print '</td>';
-    print '<td class="liste_titre center">';
-    print '</td>';
-    print '<td class="liste_titre maxwidthsearch">';
-    $searchpicto = $form->showFilterAndCheckAddButtons(0);
-    print $searchpicto;
-    print '</td>';
-    print '</tr>';
+	// Filters
+	print '<tr class="liste_titre">';
+	print '<td class="liste_titre left">';
+	print '<input class="flat" type="text" name="sref" size="8" value="'.$sref.'">';
+	print '</td>';
+	print '<td class="liste_titre nowrap center">'; // date
+	print $formother->select_month($month ? $month : -1, 'month', 1, 0, 'valignmiddle');
+	$formother->select_year($year ? $year : -1, 'year', 1, 20, 1);
+	print '</td>';
+	print '<td class="liste_titre center">';
+	print '</td>';
+	print '<td class="liste_titre left">';
+	print '<input class="flat" type="text" name="sprod_fulldescr" size="15" value="'.dol_escape_htmltag($sprod_fulldescr).'">';
+	print '</td>';
+	print '<td class="liste_titre center">'; // TODO: Add filters !
+	print '</td>';
+	print '<td class="liste_titre center">';
+	print '</td>';
+	print '<td class="liste_titre center">';
+	print '</td>';
+	print '<td class="liste_titre maxwidthsearch">';
+	$searchpicto = $form->showFilterAndCheckAddButtons(0);
+	print $searchpicto;
+	print '</td>';
+	print '</tr>';
 
-    // Titles with sort buttons
-    print '<tr class="liste_titre">';
-    print_liste_field_titre('Ref', $_SERVER['PHP_SELF'], 'doc_number', '', $param, '', $sortfield, $sortorder, 'left ');
-    print_liste_field_titre('Date', $_SERVER['PHP_SELF'], 'dateprint', '', $param, 'width="150"', $sortfield, $sortorder, 'center ');
-    print_liste_field_titre('Status', $_SERVER['PHP_SELF'], 'fk_statut', '', $param, '', $sortfield, $sortorder, 'center ');
-    print_liste_field_titre('Product', $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder, 'left ');
-    print_liste_field_titre('ContactType', $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder, 'left ');
-    print_liste_field_titre('Quantity', $_SERVER['PHP_SELF'], 'prod_qty', '', $param, '', $sortfield, $sortorder, 'right ');
-    print_liste_field_titre('TotalHT', $_SERVER['PHP_SELF'], 'total_ht', '', $param, '', $sortfield, $sortorder, 'right ');
-    print_liste_field_titre('UnitPrice', $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder, 'right ');
-    print "</tr>\n";
+	// Titles with sort buttons
+	print '<tr class="liste_titre">';
+	print_liste_field_titre('Ref', $_SERVER['PHP_SELF'], 'doc_number', '', $param, '', $sortfield, $sortorder, 'left ');
+	print_liste_field_titre('Date', $_SERVER['PHP_SELF'], 'dateprint', '', $param, 'width="150"', $sortfield, $sortorder, 'center ');
+	print_liste_field_titre('Status', $_SERVER['PHP_SELF'], 'fk_statut', '', $param, '', $sortfield, $sortorder, 'center ');
+	print_liste_field_titre('Product', $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder, 'left ');
+	print_liste_field_titre('ContactType', $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder, 'left ');
+	print_liste_field_titre('Quantity', $_SERVER['PHP_SELF'], 'prod_qty', '', $param, '', $sortfield, $sortorder, 'right ');
+	print_liste_field_titre('TotalHT', $_SERVER['PHP_SELF'], 'total_ht', '', $param, '', $sortfield, $sortorder, 'right ');
+	print_liste_field_titre('UnitPrice', $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder, 'right ');
+	print "</tr>\n";
 
 
 	$i = 0;
@@ -478,7 +478,7 @@ if ($sql_select)
 			elseif ($objp->description == '(EXCESS PAID)') $txt = $langs->trans("ExcessPaid");
 			//else $txt=$langs->trans("Discount");
 			print $txt;
-            print '</a>';
+			print '</a>';
 			if ($objp->description)
 			{
 				if ($objp->description == '(CREDIT_NOTE)' && $objp->fk_remise_except > 0)
@@ -576,7 +576,7 @@ if ($sql_select)
 	print '<tr class="liste_total">';
 	print '<td>'.$langs->trans('Total').'</td>';
 	print '<td colspan="3"></td>';
-    print '<td></td>';
+	print '<td></td>';
 	print '<td class="right">'.$total_qty.'</td>';
 	print '<td class="right">'.price($total_ht).'</td>';
 	print '<td class="right">'.price($total_ht / (empty($total_qty) ? 1 : $total_qty)).'</td>';
@@ -588,25 +588,25 @@ if ($sql_select)
 	}
 	$db->free($resql);
 } elseif (empty($type_element) || $type_element == -1) {
-    print_barre_liste($langs->trans('ProductsIntoElements').' '.$typeElementString.' '.$button, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, '', '');
+	print_barre_liste($langs->trans('ProductsIntoElements').' '.$typeElementString.' '.$button, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, '', '');
 
-    print '<table class="liste centpercent">'."\n";
-    // Titles with sort buttons
-    print '<tr class="liste_titre">';
-    print_liste_field_titre('Ref', $_SERVER['PHP_SELF'], 'doc_number', '', $param, '', $sortfield, $sortorder, 'left ');
-    print_liste_field_titre('Date', $_SERVER['PHP_SELF'], 'dateprint', '', $param, 'width="150"', $sortfield, $sortorder, 'center ');
-    print_liste_field_titre('Status', $_SERVER['PHP_SELF'], 'fk_status', '', $param, '', $sortfield, $sortorder, 'center ');
-    print_liste_field_titre('Product', $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder, 'left ');
-    print_liste_field_titre('Quantity', $_SERVER['PHP_SELF'], 'prod_qty', '', $param, '', $sortfield, $sortorder, 'right ');
-    print "</tr>\n";
+	print '<table class="liste centpercent">'."\n";
+	// Titles with sort buttons
+	print '<tr class="liste_titre">';
+	print_liste_field_titre('Ref', $_SERVER['PHP_SELF'], 'doc_number', '', $param, '', $sortfield, $sortorder, 'left ');
+	print_liste_field_titre('Date', $_SERVER['PHP_SELF'], 'dateprint', '', $param, 'width="150"', $sortfield, $sortorder, 'center ');
+	print_liste_field_titre('Status', $_SERVER['PHP_SELF'], 'fk_status', '', $param, '', $sortfield, $sortorder, 'center ');
+	print_liste_field_titre('Product', $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder, 'left ');
+	print_liste_field_titre('Quantity', $_SERVER['PHP_SELF'], 'prod_qty', '', $param, '', $sortfield, $sortorder, 'right ');
+	print "</tr>\n";
 
 	print '<tr class="oddeven"><td class="opacitymedium" colspan="5">'.$langs->trans("SelectElementAndClick", $langs->transnoentitiesnoconv("Search")).'</td></tr>';
 
 	print "</table>";
 } else {
-    print_barre_liste($langs->trans('ProductsIntoElements').' '.$typeElementString.' '.$button, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, '', '');
+	print_barre_liste($langs->trans('ProductsIntoElements').' '.$typeElementString.' '.$button, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, '', '');
 
-    print '<table class="liste centpercent">'."\n";
+	print '<table class="liste centpercent">'."\n";
 
 	print '<tr class="oddeven"><td class="opacitymedium" colspan="5">'.$langs->trans("FeatureNotYetAvailable").'</td></tr>';
 
diff --git a/htdocs/contact/document.php b/htdocs/contact/document.php
index d2979081189..2065ab772e6 100644
--- a/htdocs/contact/document.php
+++ b/htdocs/contact/document.php
@@ -45,9 +45,9 @@ $objcanvas = null;
 $canvas = (!empty($object->canvas) ? $object->canvas : GETPOST("canvas"));
 if (!empty($canvas))
 {
-    require_once DOL_DOCUMENT_ROOT.'/core/class/canvas.class.php';
-    $objcanvas = new Canvas($db, $action);
-    $objcanvas->getCanvas('contact', 'contactcard', $canvas);
+	require_once DOL_DOCUMENT_ROOT.'/core/class/canvas.class.php';
+	$objcanvas = new Canvas($db, $action);
+	$objcanvas->getCanvas('contact', 'contactcard', $canvas);
 }
 
 // Security check
@@ -96,43 +96,43 @@ llxHeader('', $title, $helpurl);
 
 if ($object->id)
 {
-    $head = contact_prepare_head($object);
+	$head = contact_prepare_head($object);
 	$title = (!empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("Contacts") : $langs->trans("ContactsAddresses"));
 
-    print dol_get_fiche_head($head, 'documents', $title, -1, 'contact');
+	print dol_get_fiche_head($head, 'documents', $title, -1, 'contact');
 
 
-    // Build file list
-    $filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
-    $totalsize = 0;
-    foreach ($filearray as $key => $file)
-    {
-        $totalsize += $file['size'];
-    }
+	// Build file list
+	$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
+	$totalsize = 0;
+	foreach ($filearray as $key => $file)
+	{
+		$totalsize += $file['size'];
+	}
 
-    $linkback = '<a href="'.DOL_URL_ROOT.'/contact/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+	$linkback = '<a href="'.DOL_URL_ROOT.'/contact/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-    $morehtmlref = '<div class="refidno">';
-    if (empty($conf->global->SOCIETE_DISABLE_CONTACTS))
-    {
-        $objsoc = new Societe($db);
-        $objsoc->fetch($object->socid);
-        // Thirdparty
-        $morehtmlref .= $langs->trans('ThirdParty').' : ';
-        if ($objsoc->id > 0) $morehtmlref .= $objsoc->getNomUrl(1);
-        else $morehtmlref .= $langs->trans("ContactNotLinkedToCompany");
-    }
-    $morehtmlref .= '</div>';
+	$morehtmlref = '<div class="refidno">';
+	if (empty($conf->global->SOCIETE_DISABLE_CONTACTS))
+	{
+		$objsoc = new Societe($db);
+		$objsoc->fetch($object->socid);
+		// Thirdparty
+		$morehtmlref .= $langs->trans('ThirdParty').' : ';
+		if ($objsoc->id > 0) $morehtmlref .= $objsoc->getNomUrl(1);
+		else $morehtmlref .= $langs->trans("ContactNotLinkedToCompany");
+	}
+	$morehtmlref .= '</div>';
 
-    dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref);
+	dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref);
 
-    print '<div class="fichecenter">';
+	print '<div class="fichecenter">';
 
-    print '<div class="underbanner clearboth"></div>';
-    print '<table class="border tableforfield centpercent">';
+	print '<div class="underbanner clearboth"></div>';
+	print '<table class="border tableforfield centpercent">';
 
-    // Company
-    /*
+	// Company
+	/*
     if (empty($conf->global->SOCIETE_DISABLE_CONTACTS))
     {
     	if ($object->socid > 0)
@@ -151,26 +151,26 @@ if ($object->id)
     	}
     }*/
 
-    // Civility
-    print '<tr><td class="titlefield">'.$langs->trans("UserTitle").'</td><td colspan="3">';
-    print $object->getCivilityLabel();
-    print '</td></tr>';
+	// Civility
+	print '<tr><td class="titlefield">'.$langs->trans("UserTitle").'</td><td colspan="3">';
+	print $object->getCivilityLabel();
+	print '</td></tr>';
 
-    print '<tr><td>'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
-    print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.dol_print_size($totalsize, 1, 1).'</td></tr>';
-    print '</table>';
+	print '<tr><td>'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
+	print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.dol_print_size($totalsize, 1, 1).'</td></tr>';
+	print '</table>';
 
-    print '</div>';
+	print '</div>';
 
-    dol_fiche_end();
+	print dol_get_fiche_end();
 
-    $modulepart = 'contact';
-    $permission = $user->rights->societe->contact->creer;
-    $permtoedit = $user->rights->societe->contact->creer;
-    $param = '&id='.$object->id;
-    include DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
+	$modulepart = 'contact';
+	$permission = $user->rights->societe->contact->creer;
+	$permtoedit = $user->rights->societe->contact->creer;
+	$param = '&id='.$object->id;
+	include DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
 } else {
-    print $langs->trans("ErrorUnknown");
+	print $langs->trans("ErrorUnknown");
 }
 
 
diff --git a/htdocs/contact/info.php b/htdocs/contact/info.php
index fbe56cb9587..c39c20d3d25 100644
--- a/htdocs/contact/info.php
+++ b/htdocs/contact/info.php
@@ -77,7 +77,7 @@ if ($id > 0)
 
 	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 }
 
 llxFooter();
diff --git a/htdocs/contact/ldap.php b/htdocs/contact/ldap.php
index 2a24d7ab518..78934c5857e 100644
--- a/htdocs/contact/ldap.php
+++ b/htdocs/contact/ldap.php
@@ -130,7 +130,7 @@ print '</table>';
 
 print '</div>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 /*
@@ -174,7 +174,7 @@ if ($result > 0)
 	//var_dump($records);
 
 	// Show tree
-    if (((!is_numeric($records)) || $records != 0) && (!isset($records['count']) || $records['count'] > 0))
+	if (((!is_numeric($records)) || $records != 0) && (!isset($records['count']) || $records['count'] > 0))
 	{
 		if (!is_array($records))
 		{
diff --git a/htdocs/contact/note.php b/htdocs/contact/note.php
index 2e2eefb2995..ae32ef5c95e 100644
--- a/htdocs/contact/note.php
+++ b/htdocs/contact/note.php
@@ -67,46 +67,46 @@ llxHeader('', $title, $help_url);
 
 if ($id > 0)
 {
-    /*
+	/*
      * Affichage onglets
      */
-    if (!empty($conf->notification->enabled)) $langs->load("mails");
+	if (!empty($conf->notification->enabled)) $langs->load("mails");
 
-    $head = contact_prepare_head($object);
+	$head = contact_prepare_head($object);
 
-    print dol_get_fiche_head($head, 'note', $title, -1, 'contact');
+	print dol_get_fiche_head($head, 'note', $title, -1, 'contact');
 
-    $linkback = '<a href="'.DOL_URL_ROOT.'/contact/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+	$linkback = '<a href="'.DOL_URL_ROOT.'/contact/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-    $morehtmlref = '<div class="refidno">';
-    if (empty($conf->global->SOCIETE_DISABLE_CONTACTS))
-    {
-        $objsoc = new Societe($db);
-        $objsoc->fetch($object->socid);
-        // Thirdparty
-        $morehtmlref .= $langs->trans('ThirdParty').' : ';
-        if ($objsoc->id > 0) $morehtmlref .= $objsoc->getNomUrl(1);
-        else $morehtmlref .= $langs->trans("ContactNotLinkedToCompany");
-    }
-    $morehtmlref .= '</div>';
+	$morehtmlref = '<div class="refidno">';
+	if (empty($conf->global->SOCIETE_DISABLE_CONTACTS))
+	{
+		$objsoc = new Societe($db);
+		$objsoc->fetch($object->socid);
+		// Thirdparty
+		$morehtmlref .= $langs->trans('ThirdParty').' : ';
+		if ($objsoc->id > 0) $morehtmlref .= $objsoc->getNomUrl(1);
+		else $morehtmlref .= $langs->trans("ContactNotLinkedToCompany");
+	}
+	$morehtmlref .= '</div>';
 
-    dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref);
+	dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref);
 
-    $cssclass = 'titlefield';
-    //if ($action == 'editnote_public') $cssclass='titlefieldcreate';
-    //if ($action == 'editnote_private') $cssclass='titlefieldcreate';
+	$cssclass = 'titlefield';
+	//if ($action == 'editnote_public') $cssclass='titlefieldcreate';
+	//if ($action == 'editnote_private') $cssclass='titlefieldcreate';
 
-    print '<div class="fichecenter">';
-    print '<div class="underbanner clearboth"></div>';
+	print '<div class="fichecenter">';
+	print '<div class="underbanner clearboth"></div>';
 
 	print '<table class="border centpercent tableforfield">';
 
-    // Civility
-    print '<tr><td class="'.$cssclass.'">'.$langs->trans("UserTitle").'</td><td>';
-    print $object->getCivilityLabel();
-    print '</td></tr>';
+	// Civility
+	print '<tr><td class="'.$cssclass.'">'.$langs->trans("UserTitle").'</td><td>';
+	print $object->getCivilityLabel();
+	print '</td></tr>';
 
-    print "</table>";
+	print "</table>";
 
 
 	$cssclass = "titlefield";
@@ -114,7 +114,7 @@ if ($id > 0)
 
 	print '</div>';
 
-    dol_fiche_end();
+	print dol_get_fiche_end();
 }
 
 llxFooter();
diff --git a/htdocs/contact/perso.php b/htdocs/contact/perso.php
index 8df4dca28d4..d8d7b709736 100644
--- a/htdocs/contact/perso.php
+++ b/htdocs/contact/perso.php
@@ -66,7 +66,7 @@ if ($action == 'update' && !$_POST["cancel"] && $user->rights->societe->contact-
 		if ($file_OK)
 		{
 			require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-            require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
+			require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
 			if (GETPOST('deletephoto'))
 			{
 				$fileimg = $conf->societe->dir_output.'/contact/'.get_exdir($object->id, 0, 0, 1, $object, 'contact').'/photos/'.$object->photo;
@@ -86,8 +86,8 @@ if ($action == 'update' && !$_POST["cancel"] && $user->rights->societe->contact-
 					{
 						setEventMessages($langs->trans("ErrorFailedToSaveFile"), null, 'errors');
 					} else {
-					    // Create thumbs
-					    $object->addThumbs($newfile);
+						// Create thumbs
+						$object->addThumbs($newfile);
 					}
 				}
 			} else {
@@ -130,119 +130,119 @@ $head = contact_prepare_head($object);
 
 if ($action == 'edit')
 {
-    /*
+	/*
 	 * Fiche en mode edition
 	 */
 
-    print '<form name="perso" method="POST" enctype="multipart/form-data" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    print '<input type="hidden" name="action" value="update">';
-    print '<input type="hidden" name="id" value="'.$object->id.'">';
+	print '<form name="perso" method="POST" enctype="multipart/form-data" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="action" value="update">';
+	print '<input type="hidden" name="id" value="'.$object->id.'">';
 
-    print dol_get_fiche_head($head, 'perso', $title, 0, 'contact');
+	print dol_get_fiche_head($head, 'perso', $title, 0, 'contact');
 
-    print '<table class="border centpercent">';
+	print '<table class="border centpercent">';
 
-    // Ref
-    print '<tr><td class="titlefieldcreate">'.$langs->trans("Ref").'</td><td colspan="3">';
-    print $object->id;
-    print '</td>';
+	// Ref
+	print '<tr><td class="titlefieldcreate">'.$langs->trans("Ref").'</td><td colspan="3">';
+	print $object->id;
+	print '</td>';
 
-    // Photo
-    print '<td class="center hideonsmartphone valignmiddle" rowspan="6">';
-    print $form->showphoto('contact', $object)."\n";
-    if ($object->photo) print "<br>\n";
+	// Photo
+	print '<td class="center hideonsmartphone valignmiddle" rowspan="6">';
+	print $form->showphoto('contact', $object)."\n";
+	if ($object->photo) print "<br>\n";
 
-    print '<table class="nobordernopadding">';
+	print '<table class="nobordernopadding">';
 
-    if ($object->photo) print '<tr><td class="center"><input type="checkbox" class="flat photodelete" name="deletephoto" id="photodelete"> '.$langs->trans("Delete").'<br><br></td></tr>';
-    print '<tr><td>'.$langs->trans("PhotoFile").'</td></tr>';
-    print '<tr><td><input type="file" class="flat" name="photo" id="photoinput"></td></tr>';
-    print '</table>';
+	if ($object->photo) print '<tr><td class="center"><input type="checkbox" class="flat photodelete" name="deletephoto" id="photodelete"> '.$langs->trans("Delete").'<br><br></td></tr>';
+	print '<tr><td>'.$langs->trans("PhotoFile").'</td></tr>';
+	print '<tr><td><input type="file" class="flat" name="photo" id="photoinput"></td></tr>';
+	print '</table>';
 
-    print '</td></tr>';
+	print '</td></tr>';
 
-    // Name
-    print '<tr><td>'.$langs->trans("Lastname").' / '.$langs->trans("Label").'</td><td colspan="3">'.$object->lastname.'</td></tr>';
-    print '<tr><td>'.$langs->trans("Firstname").'</td><td colspan="3">'.$object->firstname.'</td>';
+	// Name
+	print '<tr><td>'.$langs->trans("Lastname").' / '.$langs->trans("Label").'</td><td colspan="3">'.$object->lastname.'</td></tr>';
+	print '<tr><td>'.$langs->trans("Firstname").'</td><td colspan="3">'.$object->firstname.'</td>';
 
-    // Company
-    if (empty($conf->global->SOCIETE_DISABLE_CONTACTS))
-    {
-        if ($object->socid > 0)
-        {
-            $objsoc = new Societe($db);
-            $objsoc->fetch($object->socid);
+	// Company
+	if (empty($conf->global->SOCIETE_DISABLE_CONTACTS))
+	{
+		if ($object->socid > 0)
+		{
+			$objsoc = new Societe($db);
+			$objsoc->fetch($object->socid);
 
-            print '<tr><td>'.$langs->trans("ThirdParty").'</td><td colspan="3">'.$objsoc->getNomUrl(1).'</td>';
-        } else {
-            print '<tr><td>'.$langs->trans("ThirdParty").'</td><td colspan="3">';
-            print $langs->trans("ContactNotLinkedToCompany");
-            print '</td></tr>';
-        }
-    }
+			print '<tr><td>'.$langs->trans("ThirdParty").'</td><td colspan="3">'.$objsoc->getNomUrl(1).'</td>';
+		} else {
+			print '<tr><td>'.$langs->trans("ThirdParty").'</td><td colspan="3">';
+			print $langs->trans("ContactNotLinkedToCompany");
+			print '</td></tr>';
+		}
+	}
 
-    // Civility
-    print '<tr><td>'.$langs->trans("UserTitle").'</td><td colspan="3">';
-    print $object->getCivilityLabel();
-    print '</td></tr>';
+	// Civility
+	print '<tr><td>'.$langs->trans("UserTitle").'</td><td colspan="3">';
+	print $object->getCivilityLabel();
+	print '</td></tr>';
 
-    // Date To Birth
-    print '<tr><td>'.$langs->trans("DateOfBirth").'</td><td>';
-    $form = new Form($db);
-    print $form->selectDate($object->birthday, 'birthday', 0, 0, 1, "perso", 1, 0);
-    print '</td>';
+	// Date To Birth
+	print '<tr><td>'.$langs->trans("DateOfBirth").'</td><td>';
+	$form = new Form($db);
+	print $form->selectDate($object->birthday, 'birthday', 0, 0, 1, "perso", 1, 0);
+	print '</td>';
 
-    print '<td colspan="2">'.$langs->trans("Alert").': ';
-    if (!empty($object->birthday_alert))
-    {
-        print '<input type="checkbox" name="birthday_alert" checked></td>';
-    } else {
-        print '<input type="checkbox" name="birthday_alert"></td>';
-    }
-    print '</tr>';
+	print '<td colspan="2">'.$langs->trans("Alert").': ';
+	if (!empty($object->birthday_alert))
+	{
+		print '<input type="checkbox" name="birthday_alert" checked></td>';
+	} else {
+		print '<input type="checkbox" name="birthday_alert"></td>';
+	}
+	print '</tr>';
 
-    print "</table>";
+	print "</table>";
 
-    dol_fiche_end();
+	print dol_get_fiche_end();
 
-    print '<div class="center">';
-    print '<input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
-    print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-    print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
-    print '</div>';
+	print '<div class="center">';
+	print '<input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
+	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
+	print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+	print '</div>';
 
-    print "</form>";
+	print "</form>";
 } else {
-    // View mode
+	// View mode
 
-    print dol_get_fiche_head($head, 'perso', $title, -1, 'contact');
+	print dol_get_fiche_head($head, 'perso', $title, -1, 'contact');
 
-    $linkback = '<a href="'.DOL_URL_ROOT.'/contact/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+	$linkback = '<a href="'.DOL_URL_ROOT.'/contact/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-    $morehtmlref = '<div class="refidno">';
-    if (empty($conf->global->SOCIETE_DISABLE_CONTACTS))
-    {
-        $objsoc = new Societe($db);
-        $objsoc->fetch($object->socid);
-        // Thirdparty
-        $morehtmlref .= $langs->trans('ThirdParty').' : ';
-        if ($objsoc->id > 0) $morehtmlref .= $objsoc->getNomUrl(1);
-        else $morehtmlref .= $langs->trans("ContactNotLinkedToCompany");
-    }
-    $morehtmlref .= '</div>';
+	$morehtmlref = '<div class="refidno">';
+	if (empty($conf->global->SOCIETE_DISABLE_CONTACTS))
+	{
+		$objsoc = new Societe($db);
+		$objsoc->fetch($object->socid);
+		// Thirdparty
+		$morehtmlref .= $langs->trans('ThirdParty').' : ';
+		if ($objsoc->id > 0) $morehtmlref .= $objsoc->getNomUrl(1);
+		else $morehtmlref .= $langs->trans("ContactNotLinkedToCompany");
+	}
+	$morehtmlref .= '</div>';
 
 
-    dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref);
+	dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref);
 
 
-    print '<div class="fichecenter">';
+	print '<div class="fichecenter">';
 
-    print '<div class="underbanner clearboth"></div>';
-    print '<table class="border centpercent tableforfield">';
+	print '<div class="underbanner clearboth"></div>';
+	print '<table class="border centpercent tableforfield">';
 
-    // Company
-    /*
+	// Company
+	/*
     if (empty($conf->global->SOCIETE_DISABLE_CONTACTS))
     {
         if ($object->socid > 0)
@@ -261,59 +261,59 @@ if ($action == 'edit')
         }
     }*/
 
-    // Civility
-    print '<tr><td class="titlefield">'.$langs->trans("UserTitle").'</td><td colspan="3">';
-    print $object->getCivilityLabel();
-    print '</td></tr>';
+	// Civility
+	print '<tr><td class="titlefield">'.$langs->trans("UserTitle").'</td><td colspan="3">';
+	print $object->getCivilityLabel();
+	print '</td></tr>';
 
-    // Date To Birth
-    print '<tr>';
-    if (!empty($object->birthday))
-    {
-        include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+	// Date To Birth
+	print '<tr>';
+	if (!empty($object->birthday))
+	{
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 
-        print '<td>'.$langs->trans("DateOfBirth").'</td><td colspan="3">'.dol_print_date($object->birthday, "day");
+		print '<td>'.$langs->trans("DateOfBirth").'</td><td colspan="3">'.dol_print_date($object->birthday, "day");
 
-        print ' &nbsp; ';
-        //var_dump($birthdatearray);
-        $ageyear = convertSecondToTime($now - $object->birthday, 'year') - 1970;
-        $agemonth = convertSecondToTime($now - $object->birthday, 'month') - 1;
-        if ($ageyear >= 2) print '('.$ageyear.' '.$langs->trans("DurationYears").')';
-        elseif ($agemonth >= 2) print '('.$agemonth.' '.$langs->trans("DurationMonths").')';
-        else print '('.$agemonth.' '.$langs->trans("DurationMonth").')';
+		print ' &nbsp; ';
+		//var_dump($birthdatearray);
+		$ageyear = convertSecondToTime($now - $object->birthday, 'year') - 1970;
+		$agemonth = convertSecondToTime($now - $object->birthday, 'month') - 1;
+		if ($ageyear >= 2) print '('.$ageyear.' '.$langs->trans("DurationYears").')';
+		elseif ($agemonth >= 2) print '('.$agemonth.' '.$langs->trans("DurationMonths").')';
+		else print '('.$agemonth.' '.$langs->trans("DurationMonth").')';
 
 
-        print ' &nbsp; - &nbsp; ';
-        if ($object->birthday_alert) print $langs->trans("BirthdayAlertOn");
-        else print $langs->trans("BirthdayAlertOff");
-        print '</td>';
-    } else {
-        print '<td>'.$langs->trans("DateOfBirth").'</td><td colspan="3"></td>';
-    }
-    print "</tr>";
+		print ' &nbsp; - &nbsp; ';
+		if ($object->birthday_alert) print $langs->trans("BirthdayAlertOn");
+		else print $langs->trans("BirthdayAlertOff");
+		print '</td>';
+	} else {
+		print '<td>'.$langs->trans("DateOfBirth").'</td><td colspan="3"></td>';
+	}
+	print "</tr>";
 
-    print "</table>";
+	print "</table>";
 
-    print '</div>';
+	print '</div>';
 
-    dol_fiche_end();
+	print dol_get_fiche_end();
 }
 
 
 if ($action != 'edit')
 {
-    // Barre d'actions
-    if ($user->socid == 0)
-    {
-        print '<div class="tabsAction">';
+	// Barre d'actions
+	if ($user->socid == 0)
+	{
+		print '<div class="tabsAction">';
 
-        if ($user->rights->societe->contact->creer)
-        {
-            print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=edit">'.$langs->trans('Modify').'</a>';
-        }
+		if ($user->rights->societe->contact->creer)
+		{
+			print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=edit">'.$langs->trans('Modify').'</a>';
+		}
 
-        print "</div>";
-    }
+		print "</div>";
+	}
 }
 
 
diff --git a/htdocs/contact/vcard.php b/htdocs/contact/vcard.php
index ee325317033..05426db19a6 100644
--- a/htdocs/contact/vcard.php
+++ b/htdocs/contact/vcard.php
@@ -66,7 +66,7 @@ $v->setPhoneNumber($contact->phone_pro, "TYPE=WORK;VOICE");
 $v->setPhoneNumber($contact->phone_mobile, "TYPE=CELL;VOICE");
 $v->setPhoneNumber($contact->fax, "TYPE=WORK;FAX");
 
-$country = $contact->country_code ? $contact->country : '' ;
+$country = $contact->country_code ? $contact->country : '';
 
 $v->setAddress("", "", $contact->address, $contact->town, $contact->state, $contact->zip, $country, "TYPE=WORK;POSTAL");
 $v->setLabel("", "", $contact->address, $contact->town, $contact->state, $contact->zip, $country, "TYPE=WORK");
@@ -79,9 +79,9 @@ $v->setTitle($contact->poste);
 if ($company->id)
 {
 	$v->setURL($company->url, "TYPE=WORK");
-	if (! $contact->phone_pro) $v->setPhoneNumber($company->phone, "TYPE=WORK;VOICE");
-	if (! $contact->fax)       $v->setPhoneNumber($company->fax, "TYPE=WORK;FAX");
-	if (! $contact->zip)       $v->setAddress("", "", $company->address, $company->town, $company->state, $company->zip, $company->country, "TYPE=WORK;POSTAL");
+	if (!$contact->phone_pro) $v->setPhoneNumber($company->phone, "TYPE=WORK;VOICE");
+	if (!$contact->fax)       $v->setPhoneNumber($company->fax, "TYPE=WORK;FAX");
+	if (!$contact->zip)       $v->setAddress("", "", $company->address, $company->town, $company->state, $company->zip, $company->country, "TYPE=WORK;POSTAL");
 
 	// when company e-mail is empty, use only contact e-mail
 	if (empty(trim($company->email)))
@@ -124,7 +124,7 @@ $db->close();
 
 $output = $v->getVCard();
 
-$filename = trim(urldecode($v->getFileName()));      // "Nom prenom.vcf"
+$filename = trim(urldecode($v->getFileName())); // "Nom prenom.vcf"
 $filenameurlencoded = dol_sanitizeFileName(urlencode($filename));
 //$filename = dol_sanitizeFileName($filename);
 
diff --git a/htdocs/contrat/admin/contract_extrafields.php b/htdocs/contrat/admin/contract_extrafields.php
index b221aa55398..8571856362a 100644
--- a/htdocs/contrat/admin/contract_extrafields.php
+++ b/htdocs/contrat/admin/contract_extrafields.php
@@ -74,7 +74,7 @@ print dol_get_fiche_head($head, 'attributes', $langs->trans("Contracts"), -1, 'c
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 // Buttons
diff --git a/htdocs/contrat/admin/contractdet_extrafields.php b/htdocs/contrat/admin/contractdet_extrafields.php
index fba9843eea0..4b3f03ffedf 100644
--- a/htdocs/contrat/admin/contractdet_extrafields.php
+++ b/htdocs/contrat/admin/contractdet_extrafields.php
@@ -74,7 +74,7 @@ print dol_get_fiche_head($head, 'attributeslines', $langs->trans("Contracts"), -
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 // Buttons
diff --git a/htdocs/contrat/agenda.php b/htdocs/contrat/agenda.php
index 48238496721..f88b470215c 100644
--- a/htdocs/contrat/agenda.php
+++ b/htdocs/contrat/agenda.php
@@ -204,7 +204,7 @@ if ($id > 0)
 
 	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 
 
diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index 64b3275379a..f152ff5cc69 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -409,13 +409,13 @@ if (empty($reshook))
 			$error++;
 		}
 
-	    $date_start = dol_mktime(GETPOST('date_start'.$predef.'hour'), GETPOST('date_start'.$predef.'min'), GETPOST('date_start'.$predef.'sec'), GETPOST('date_start'.$predef.'month'), GETPOST('date_start'.$predef.'day'), GETPOST('date_start'.$predef.'year'));
-	    $date_end = dol_mktime(GETPOST('date_end'.$predef.'hour'), GETPOST('date_end'.$predef.'min'), GETPOST('date_end'.$predef.'sec'), GETPOST('date_end'.$predef.'month'), GETPOST('date_end'.$predef.'day'), GETPOST('date_end'.$predef.'year'));
-	    if (!empty($date_start) && !empty($date_end) && $date_start > $date_end)
-	    {
-		    setEventMessages($langs->trans("Error").': '.$langs->trans("DateStartPlanned").' > '.$langs->trans("DateEndPlanned"), null, 'errors');
-		    $error++;
-	    }
+		$date_start = dol_mktime(GETPOST('date_start'.$predef.'hour'), GETPOST('date_start'.$predef.'min'), GETPOST('date_start'.$predef.'sec'), GETPOST('date_start'.$predef.'month'), GETPOST('date_start'.$predef.'day'), GETPOST('date_start'.$predef.'year'));
+		$date_end = dol_mktime(GETPOST('date_end'.$predef.'hour'), GETPOST('date_end'.$predef.'min'), GETPOST('date_end'.$predef.'sec'), GETPOST('date_end'.$predef.'month'), GETPOST('date_end'.$predef.'day'), GETPOST('date_end'.$predef.'year'));
+		if (!empty($date_start) && !empty($date_end) && $date_start > $date_end)
+		{
+			setEventMessages($langs->trans("Error").': '.$langs->trans("DateStartPlanned").' > '.$langs->trans("DateEndPlanned"), null, 'errors');
+			$error++;
+		}
 
 		// Extrafields
 		$extralabelsline = $extrafields->fetch_name_optionals_label($object->table_element_line);
@@ -684,9 +684,9 @@ if (empty($reshook))
 			$objectline->pa_ht = $pa_ht;
 
 			if ($fk_unit > 0) {
-			    $objectline->fk_unit = GETPOST('unit');
+				$objectline->fk_unit = GETPOST('unit');
 			} else {
-			    $objectline->fk_unit = null;
+				$objectline->fk_unit = null;
 			}
 
 			// Extrafields
@@ -877,11 +877,11 @@ if (empty($reshook))
 
 			$old_ref = $object->ref;
 
-	        $result = $object->setValueFrom('ref', GETPOST('ref', 'alpha'), '', null, 'text', '', $user, 'CONTRACT_MODIFY');
-	        if ($result < 0) {
-	            setEventMessages($object->error, $object->errors, 'errors');
-	            $action = 'editref';
-	        } else {
+			$result = $object->setValueFrom('ref', GETPOST('ref', 'alpha'), '', null, 'text', '', $user, 'CONTRACT_MODIFY');
+			if ($result < 0) {
+				setEventMessages($object->error, $object->errors, 'errors');
+				$action = 'editref';
+			} else {
 				require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 				$old_filedir = $conf->contrat->dir_output.'/'.dol_sanitizeFileName($old_ref);
 				$new_filedir = $conf->contrat->dir_output.'/'.dol_sanitizeFileName($object->ref);
@@ -896,13 +896,13 @@ if (empty($reshook))
 					}
 				}
 
-	            header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
-	            exit;
-	        }
-	    } else {
-	        header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
-	        exit;
-	    }
+				header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+				exit;
+			}
+		} else {
+			header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
+			exit;
+		}
 	} elseif ($action == 'setdate_contrat')
 	{
 		$cancelbutton = GETPOST('cancel', 'alpha');
@@ -1197,7 +1197,7 @@ if ($action == 'create')
 
 	print "</table>\n";
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div class="center">';
 	print '<input type="submit" class="button" value="'.$langs->trans("Create").'">';
@@ -1233,8 +1233,8 @@ if ($action == 'create')
 
 		$result = $object->fetch_lines(); // This also init $this->nbofserviceswait, $this->nbofservicesopened, $this->nbofservicesexpired=, $this->nbofservicesclosed
 		if ($result < 0) {
-            dol_print_error($db, $object->error);
-        }
+			dol_print_error($db, $object->error);
+		}
 
 		$nbofservices = count($object->lines);
 
@@ -1249,55 +1249,55 @@ if ($action == 'create')
 
 		$head = contract_prepare_head($object);
 
-        $hselected = 0;
-        $formconfirm = '';
+		$hselected = 0;
+		$formconfirm = '';
 
-        print dol_get_fiche_head($head, $hselected, $langs->trans("Contract"), -1, 'contract');
+		print dol_get_fiche_head($head, $hselected, $langs->trans("Contract"), -1, 'contract');
 
 
-        if ($action == 'delete') {
-            //Confirmation de la suppression du contrat
-            $formconfirm = $form->formconfirm($_SERVER['PHP_SELF']."?id=".$object->id, $langs->trans("DeleteAContract"), $langs->trans("ConfirmDeleteAContract"), "confirm_delete", '', 0, 1);
-        } elseif ($action == 'valid') {
-            //Confirmation de la validation
-            $ref = substr($object->ref, 1, 4);
-            if ($ref == 'PROV' && !empty($modCodeContract->code_auto)) {
-                $numref = $object->getNextNumRef($object->thirdparty);
-            } else {
-                $numref = $object->ref;
-            }
-            $text = $langs->trans('ConfirmValidateContract', $numref);
-            $formconfirm = $form->formconfirm($_SERVER['PHP_SELF']."?id=".$object->id, $langs->trans("ValidateAContract"), $text, "confirm_valid", '', 0, 1);
-        } elseif ($action == 'close') {
-            // Confirmation de la fermeture
-            $formconfirm = $form->formconfirm($_SERVER['PHP_SELF']."?id=".$object->id, $langs->trans("CloseAContract"), $langs->trans("ConfirmCloseContract"), "confirm_close", '', 0, 1);
-        } elseif ($action == 'activate') {
-            $formconfirm = $form->formconfirm($_SERVER['PHP_SELF']."?id=".$object->id, $langs->trans("ActivateAllOnContract"), $langs->trans("ConfirmActivateAllOnContract"), "confirm_activate", '', 0, 1);
-        } elseif ($action == 'clone') {
-            // Clone confirmation
-            $formquestion = array(array('type' => 'other', 'name' => 'socid', 'label' => $langs->trans("SelectThirdParty"), 'value' => $form->select_company(GETPOST('socid', 'int'), 'socid', '(s.client=1 OR s.client=2 OR s.client=3)')));
-            $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToClone'), $langs->trans('ConfirmCloneContract', $object->ref), 'confirm_clone', $formquestion, 'yes', 1);
-        }
+		if ($action == 'delete') {
+			//Confirmation de la suppression du contrat
+			$formconfirm = $form->formconfirm($_SERVER['PHP_SELF']."?id=".$object->id, $langs->trans("DeleteAContract"), $langs->trans("ConfirmDeleteAContract"), "confirm_delete", '', 0, 1);
+		} elseif ($action == 'valid') {
+			//Confirmation de la validation
+			$ref = substr($object->ref, 1, 4);
+			if ($ref == 'PROV' && !empty($modCodeContract->code_auto)) {
+				$numref = $object->getNextNumRef($object->thirdparty);
+			} else {
+				$numref = $object->ref;
+			}
+			$text = $langs->trans('ConfirmValidateContract', $numref);
+			$formconfirm = $form->formconfirm($_SERVER['PHP_SELF']."?id=".$object->id, $langs->trans("ValidateAContract"), $text, "confirm_valid", '', 0, 1);
+		} elseif ($action == 'close') {
+			// Confirmation de la fermeture
+			$formconfirm = $form->formconfirm($_SERVER['PHP_SELF']."?id=".$object->id, $langs->trans("CloseAContract"), $langs->trans("ConfirmCloseContract"), "confirm_close", '', 0, 1);
+		} elseif ($action == 'activate') {
+			$formconfirm = $form->formconfirm($_SERVER['PHP_SELF']."?id=".$object->id, $langs->trans("ActivateAllOnContract"), $langs->trans("ConfirmActivateAllOnContract"), "confirm_activate", '', 0, 1);
+		} elseif ($action == 'clone') {
+			// Clone confirmation
+			$formquestion = array(array('type' => 'other', 'name' => 'socid', 'label' => $langs->trans("SelectThirdParty"), 'value' => $form->select_company(GETPOST('socid', 'int'), 'socid', '(s.client=1 OR s.client=2 OR s.client=3)')));
+			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToClone'), $langs->trans('ConfirmCloneContract', $object->ref), 'confirm_clone', $formquestion, 'yes', 1);
+		}
 
 
-        // Call Hook formConfirm
-        $parameters = array(
-        	'formConfirm' => $formconfirm,
-            'id' => $id,
-            //'lineid' => $lineid,
-        );
-        // Note that $action and $object may have been modified by hook
-        $reshook = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action);
-        if (empty($reshook)) {
-            $formconfirm .= $hookmanager->resPrint;
-        } elseif ($reshook > 0) {
-            $formconfirm = $hookmanager->resPrint;
-        }
+		// Call Hook formConfirm
+		$parameters = array(
+			'formConfirm' => $formconfirm,
+			'id' => $id,
+			//'lineid' => $lineid,
+		);
+		// Note that $action and $object may have been modified by hook
+		$reshook = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action);
+		if (empty($reshook)) {
+			$formconfirm .= $hookmanager->resPrint;
+		} elseif ($reshook > 0) {
+			$formconfirm = $hookmanager->resPrint;
+		}
 
-        // Print form confirm
-        print $formconfirm;
+		// Print form confirm
+		print $formconfirm;
 
-        /*
+		/*
          *   Contrat
          */
 		if (!empty($object->brouillon) && $user->rights->contrat->creer)
@@ -1488,8 +1488,8 @@ if ($action == 'create')
 				// Line in view mode
 				if ($action != 'editline' || GETPOST('rowid') != $objp->rowid)
 				{
-				    $moreparam = '';
-				    if (! empty($conf->global->CONTRACT_HIDE_CLOSED_SERVICES_BY_DEFAULT) && $objp->statut == ContratLigne::STATUS_CLOSED && $action != 'showclosedlines') $moreparam = 'style="display: none;"';
+					$moreparam = '';
+					if (!empty($conf->global->CONTRACT_HIDE_CLOSED_SERVICES_BY_DEFAULT) && $objp->statut == ContratLigne::STATUS_CLOSED && $action != 'showclosedlines') $moreparam = 'style="display: none;"';
 					print '<tr class="tdtop oddeven" '.$moreparam.'>';
 					// Label
 					if ($objp->fk_product > 0)
@@ -1622,7 +1622,7 @@ if ($action == 'create')
 						$line = new ContratLigne($db);
 						$line->id = $objp->rowid;
 						$line->fetch_optionals();
-						print $line->showOptionals($extrafields, 'view', array('class'=>'oddeven','style'=>$moreparam, 'colspan'=>$colspan), '', '', 1);
+						print $line->showOptionals($extrafields, 'view', array('class'=>'oddeven', 'style'=>$moreparam, 'colspan'=>$colspan), '', '', 1);
 					}
 				}
 				// Line in mode update
@@ -1733,8 +1733,8 @@ if ($action == 'create')
 
 			if ($object->statut > 0)
 			{
-                $moreparam = '';
-                if (! empty($conf->global->CONTRACT_HIDE_CLOSED_SERVICES_BY_DEFAULT) && $object->lines[$cursorline-1]->statut == ContratLigne::STATUS_CLOSED && $action != 'showclosedlines') $moreparam = 'style="display: none;"';
+				$moreparam = '';
+				if (!empty($conf->global->CONTRACT_HIDE_CLOSED_SERVICES_BY_DEFAULT) && $object->lines[$cursorline - 1]->statut == ContratLigne::STATUS_CLOSED && $action != 'showclosedlines') $moreparam = 'style="display: none;"';
 				print '<tr class="oddeven" '.$moreparam.'>';
 				print '<td class="tdhrthin" colspan="'.($conf->margin->enabled ? 7 : 6).'"><hr class="opacitymedium tdhrthin"></td>';
 				print "</tr>\n";
@@ -1850,12 +1850,12 @@ if ($action == 'create')
 				// Si active et en cours
 				if ($objp->date_debut_reelle && !$objp->date_fin_reelle) {
 					print $langs->trans("DateStartReal").': ';
-                    print dol_print_date($db->jdate($objp->date_debut_reelle), 'day');
+					print dol_print_date($db->jdate($objp->date_debut_reelle), 'day');
 				}
 				// Si desactive
 				if ($objp->date_debut_reelle && $objp->date_fin_reelle) {
 					print $langs->trans("DateStartReal").': ';
-                    print dol_print_date($db->jdate($objp->date_debut_reelle), 'day');
+					print dol_print_date($db->jdate($objp->date_debut_reelle), 'day');
 					print ' &nbsp;-&nbsp; ';
 					print $langs->trans("DateEndReal").': ';
 					print dol_print_date($db->jdate($objp->date_fin_reelle), 'day');
@@ -2015,7 +2015,7 @@ if ($action == 'create')
 			print '</form>';
 		}
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 
 		/*
@@ -2092,16 +2092,16 @@ if ($action == 'create')
 					//}
 				}
 
-                if (! empty($conf->global->CONTRACT_HIDE_CLOSED_SERVICES_BY_DEFAULT) && $object->nbofservicesclosed > 0)
-                {
-                    if ($action == 'showclosedlines') print '<div class="inline-block divButAction"><a class="butAction" id="btnhideclosedlines" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=hideclosedlines">'.$langs->trans("HideClosedServices").'</a></div>';
-                    else print '<div class="inline-block divButAction"><a class="butAction" id="btnshowclosedlines" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=showclosedlines">'.$langs->trans("ShowClosedServices").'</a></div>';
-                }
+				if (!empty($conf->global->CONTRACT_HIDE_CLOSED_SERVICES_BY_DEFAULT) && $object->nbofservicesclosed > 0)
+				{
+					if ($action == 'showclosedlines') print '<div class="inline-block divButAction"><a class="butAction" id="btnhideclosedlines" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=hideclosedlines">'.$langs->trans("HideClosedServices").'</a></div>';
+					else print '<div class="inline-block divButAction"><a class="butAction" id="btnshowclosedlines" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=showclosedlines">'.$langs->trans("ShowClosedServices").'</a></div>';
+				}
 
-                // Clone
-                if ($user->rights->contrat->creer) {
-                	print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;socid='.$object->socid.'&amp;action=clone&amp;object='.$object->element.'">'.$langs->trans("ToClone").'</a></div>';
-                }
+				// Clone
+				if ($user->rights->contrat->creer) {
+					print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;socid='.$object->socid.'&amp;action=clone&amp;object='.$object->element.'">'.$langs->trans("ToClone").'</a></div>';
+				}
 
 				// On peut supprimer entite si
 				// - Droit de creer + mode brouillon (erreur creation)
diff --git a/htdocs/contrat/class/api_contracts.class.php b/htdocs/contrat/class/api_contracts.class.php
index b5a9bd91cf4..20604f25798 100644
--- a/htdocs/contrat/class/api_contracts.class.php
+++ b/htdocs/contrat/class/api_contracts.class.php
@@ -1,7 +1,7 @@
 <?php
-/* Copyright (C) 2015   Jean-François Ferry     <jfefe@aternatik.fr>
- * Copyright (C) 2016	Laurent Destailleur		<eldy@users.sourceforge.net>
- * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
+/* Copyright (C) 2015   	Jean-François Ferry     <jfefe@aternatik.fr>
+ * Copyright (C) 2016		Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2018-2020  Frédéric France         <frederic.france@netlogic.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -30,647 +30,647 @@
 class Contracts extends DolibarrApi
 {
 
-    /**
-     * @var array   $FIELDS     Mandatory fields, checked when create and update object
-     */
-    static $FIELDS = array(
-        'socid',
-        'date_contrat',
-        'commercial_signature_id',
-        'commercial_suivi_id'
-    );
+	/**
+	 * @var array   $FIELDS     Mandatory fields, checked when create and update object
+	 */
+	static $FIELDS = array(
+		'socid',
+		'date_contrat',
+		'commercial_signature_id',
+		'commercial_suivi_id'
+	);
 
-    /**
-     * @var Contrat $contract {@type Contrat}
-     */
-    public $contract;
+	/**
+	 * @var Contrat $contract {@type Contrat}
+	 */
+	public $contract;
 
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-        global $db, $conf;
-        $this->db = $db;
-        $this->contract = new Contrat($this->db);
-    }
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		global $db, $conf;
+		$this->db = $db;
+		$this->contract = new Contrat($this->db);
+	}
 
-    /**
-     * Get properties of a contract object
-     *
-     * Return an array with contract informations
-     *
-     * @param       int         $id         ID of contract
-     * @return 	array|mixed data without useless information
-     *
-     * @throws 	RestException
-     */
-    public function get($id)
-    {
-        if (!DolibarrApiAccess::$user->rights->contrat->lire) {
-            throw new RestException(401);
-        }
+	/**
+	 * Get properties of a contract object
+	 *
+	 * Return an array with contract informations
+	 *
+	 * @param       int         $id         ID of contract
+	 * @return 	array|mixed data without useless information
+	 *
+	 * @throws 	RestException
+	 */
+	public function get($id)
+	{
+		if (!DolibarrApiAccess::$user->rights->contrat->lire) {
+			throw new RestException(401);
+		}
 
-        $result = $this->contract->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Contract not found');
-        }
+		$result = $this->contract->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Contract not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('contrat', $this->contract->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('contrat', $this->contract->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        $this->contract->fetchObjectLinked();
-        return $this->_cleanObjectDatas($this->contract);
-    }
+		$this->contract->fetchObjectLinked();
+		return $this->_cleanObjectDatas($this->contract);
+	}
 
 
 
-    /**
-     * List contracts
-     *
-     * Get a list of contracts
-     *
-     * @param string	       $sortfield	        Sort field
-     * @param string	       $sortorder	        Sort order
-     * @param int		       $limit		        Limit for list
-     * @param int		       $page		        Page number
-     * @param string   	       $thirdparty_ids	    Thirdparty ids to filter contracts of (example '1' or '1,2,3') {@pattern /^[0-9,]*$/i}
-     * @param string           $sqlfilters          Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"
-     * @return  array                               Array of contract objects
-     *
-     * @throws RestException 404 Not found
-     * @throws RestException 503 Error
-     */
-    public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $thirdparty_ids = '', $sqlfilters = '')
-    {
-        global $db, $conf;
+	/**
+	 * List contracts
+	 *
+	 * Get a list of contracts
+	 *
+	 * @param string	       $sortfield	        Sort field
+	 * @param string	       $sortorder	        Sort order
+	 * @param int		       $limit		        Limit for list
+	 * @param int		       $page		        Page number
+	 * @param string   	       $thirdparty_ids	    Thirdparty ids to filter contracts of (example '1' or '1,2,3') {@pattern /^[0-9,]*$/i}
+	 * @param string           $sqlfilters          Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"
+	 * @return  array                               Array of contract objects
+	 *
+	 * @throws RestException 404 Not found
+	 * @throws RestException 503 Error
+	 */
+	public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $thirdparty_ids = '', $sqlfilters = '')
+	{
+		global $db, $conf;
 
-        $obj_ret = array();
+		$obj_ret = array();
 
-        // case of external user, $thirdparty_ids param is ignored and replaced by user's socid
-        $socids = DolibarrApiAccess::$user->socid ? DolibarrApiAccess::$user->socid : $thirdparty_ids;
+		// case of external user, $thirdparty_ids param is ignored and replaced by user's socid
+		$socids = DolibarrApiAccess::$user->socid ? DolibarrApiAccess::$user->socid : $thirdparty_ids;
 
-        // If the internal user must only see his customers, force searching by him
-        $search_sale = 0;
-        if (!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) $search_sale = DolibarrApiAccess::$user->id;
+		// If the internal user must only see his customers, force searching by him
+		$search_sale = 0;
+		if (!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) $search_sale = DolibarrApiAccess::$user->id;
 
-        $sql = "SELECT t.rowid";
-        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
-        $sql .= " FROM ".MAIN_DB_PREFIX."contrat as t";
+		$sql = "SELECT t.rowid";
+		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
+		$sql .= " FROM ".MAIN_DB_PREFIX."contrat as t";
 
-        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
+		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
 
-        $sql .= ' WHERE t.entity IN ('.getEntity('contrat').')';
-        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= " AND t.fk_soc = sc.fk_soc";
-        if ($socids) $sql .= " AND t.fk_soc IN (".$socids.")";
-        if ($search_sale > 0) $sql .= " AND t.rowid = sc.fk_soc"; // Join for the needed table to filter by sale
-        // Insert sale filter
-        if ($search_sale > 0)
-        {
-            $sql .= " AND sc.fk_user = ".$search_sale;
-        }
-        // Add sql filters
-        if ($sqlfilters)
-        {
-            if (!DolibarrApi::_checkFilters($sqlfilters))
-            {
-                throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
-            }
-            $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-        }
+		$sql .= ' WHERE t.entity IN ('.getEntity('contrat').')';
+		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= " AND t.fk_soc = sc.fk_soc";
+		if ($socids) $sql .= " AND t.fk_soc IN (".$socids.")";
+		if ($search_sale > 0) $sql .= " AND t.rowid = sc.fk_soc"; // Join for the needed table to filter by sale
+		// Insert sale filter
+		if ($search_sale > 0)
+		{
+			$sql .= " AND sc.fk_user = ".$search_sale;
+		}
+		// Add sql filters
+		if ($sqlfilters)
+		{
+			if (!DolibarrApi::_checkFilters($sqlfilters))
+			{
+				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+			}
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
 
-        $sql .= $this->db->order($sortfield, $sortorder);
-        if ($limit) {
-            if ($page < 0)
-            {
-                $page = 0;
-            }
-            $offset = $limit * $page;
+		$sql .= $this->db->order($sortfield, $sortorder);
+		if ($limit) {
+			if ($page < 0)
+			{
+				$page = 0;
+			}
+			$offset = $limit * $page;
 
-            $sql .= $this->db->plimit($limit + 1, $offset);
-        }
+			$sql .= $this->db->plimit($limit + 1, $offset);
+		}
 
-        dol_syslog("API Rest request");
-        $result = $this->db->query($sql);
+		dol_syslog("API Rest request");
+		$result = $this->db->query($sql);
 
-        if ($result)
-        {
-        	$num = $this->db->num_rows($result);
-            $min = min($num, ($limit <= 0 ? $num : $limit));
-            $i = 0;
-            while ($i < $min)
-            {
-            	$obj = $this->db->fetch_object($result);
-            	$contrat_static = new Contrat($this->db);
-                if ($contrat_static->fetch($obj->rowid)) {
-                    $obj_ret[] = $this->_cleanObjectDatas($contrat_static);
-                }
-                $i++;
-            }
-        } else {
-        	throw new RestException(503, 'Error when retrieve contrat list : '.$this->db->lasterror());
-        }
-        if (!count($obj_ret)) {
-            throw new RestException(404, 'No contract found');
-        }
-        return $obj_ret;
-    }
+		if ($result)
+		{
+			$num = $this->db->num_rows($result);
+			$min = min($num, ($limit <= 0 ? $num : $limit));
+			$i = 0;
+			while ($i < $min)
+			{
+				$obj = $this->db->fetch_object($result);
+				$contrat_static = new Contrat($this->db);
+				if ($contrat_static->fetch($obj->rowid)) {
+					$obj_ret[] = $this->_cleanObjectDatas($contrat_static);
+				}
+				$i++;
+			}
+		} else {
+			throw new RestException(503, 'Error when retrieve contrat list : '.$this->db->lasterror());
+		}
+		if (!count($obj_ret)) {
+			throw new RestException(404, 'No contract found');
+		}
+		return $obj_ret;
+	}
 
-    /**
-     * Create contract object
-     *
-     * @param   array   $request_data   Request data
-     * @return  int     ID of contrat
-     */
-    public function post($request_data = null)
-    {
-        if (!DolibarrApiAccess::$user->rights->contrat->creer) {
-            throw new RestException(401, "Insufficient rights");
-        }
-        // Check mandatory fields
-        $result = $this->_validate($request_data);
+	/**
+	 * Create contract object
+	 *
+	 * @param   array   $request_data   Request data
+	 * @return  int     ID of contrat
+	 */
+	public function post($request_data = null)
+	{
+		if (!DolibarrApiAccess::$user->rights->contrat->creer) {
+			throw new RestException(401, "Insufficient rights");
+		}
+		// Check mandatory fields
+		$result = $this->_validate($request_data);
 
-        foreach ($request_data as $field => $value) {
-            $this->contract->$field = $value;
-        }
-        /*if (isset($request_data["lines"])) {
+		foreach ($request_data as $field => $value) {
+			$this->contract->$field = $value;
+		}
+		/*if (isset($request_data["lines"])) {
           $lines = array();
           foreach ($request_data["lines"] as $line) {
             array_push($lines, (object) $line);
           }
           $this->contract->lines = $lines;
         }*/
-        if ($this->contract->create(DolibarrApiAccess::$user) < 0) {
-            throw new RestException(500, "Error creating contract", array_merge(array($this->contract->error), $this->contract->errors));
-        }
+		if ($this->contract->create(DolibarrApiAccess::$user) < 0) {
+			throw new RestException(500, "Error creating contract", array_merge(array($this->contract->error), $this->contract->errors));
+		}
 
-        return $this->contract->id;
-    }
+		return $this->contract->id;
+	}
 
-    /**
-     * Get lines of a contract
-     *
-     * @param int   $id             Id of contract
-     *
-     * @url	GET {id}/lines
-     *
-     * @return array
-     */
-    public function getLines($id)
-    {
-        if (!DolibarrApiAccess::$user->rights->contrat->lire) {
-            throw new RestException(401);
-        }
+	/**
+	 * Get lines of a contract
+	 *
+	 * @param int   $id             Id of contract
+	 *
+	 * @url	GET {id}/lines
+	 *
+	 * @return array
+	 */
+	public function getLines($id)
+	{
+		if (!DolibarrApiAccess::$user->rights->contrat->lire) {
+			throw new RestException(401);
+		}
 
-        $result = $this->contract->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Contract not found');
-        }
+		$result = $this->contract->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Contract not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('contrat', $this->contract->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
-        $this->contract->getLinesArray();
-        $result = array();
-        foreach ($this->contract->lines as $line) {
-            array_push($result, $this->_cleanObjectDatas($line));
-        }
-        return $result;
-    }
+		if (!DolibarrApi::_checkAccessToResource('contrat', $this->contract->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+		$this->contract->getLinesArray();
+		$result = array();
+		foreach ($this->contract->lines as $line) {
+			array_push($result, $this->_cleanObjectDatas($line));
+		}
+		return $result;
+	}
 
-    /**
-     * Add a line to given contract
-     *
-     * @param int   $id             Id of contrat to update
-     * @param array $request_data   Contractline data
-     *
-     * @url	POST {id}/lines
-     *
-     * @return int|bool
-     */
-    public function postLine($id, $request_data = null)
-    {
-        if (!DolibarrApiAccess::$user->rights->contrat->creer) {
-            throw new RestException(401);
-        }
+	/**
+	 * Add a line to given contract
+	 *
+	 * @param int   $id             Id of contrat to update
+	 * @param array $request_data   Contractline data
+	 *
+	 * @url	POST {id}/lines
+	 *
+	 * @return int|bool
+	 */
+	public function postLine($id, $request_data = null)
+	{
+		if (!DolibarrApiAccess::$user->rights->contrat->creer) {
+			throw new RestException(401);
+		}
 
-        $result = $this->contract->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Contract not found');
-        }
+		$result = $this->contract->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Contract not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('contrat', $this->contract->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
-        $request_data = (object) $request_data;
-        $updateRes = $this->contract->addline(
-            $request_data->desc,
-            $request_data->subprice,
-            $request_data->qty,
-            $request_data->tva_tx,
-            $request_data->localtax1_tx,
-            $request_data->localtax2_tx,
-            $request_data->fk_product,
-            $request_data->remise_percent,
-            $request_data->date_start, // date_start = date planned start, date ouverture = date_start_real
-            $request_data->date_end, // date_end = date planned end, date_cloture = date_end_real
-            $request_data->HT,
-            $request_data->subprice_excl_tax,
-            $request_data->info_bits,
-            $request_data->fk_fournprice,
-            $request_data->pa_ht,
-            $request_data->array_options,
-            $request_data->fk_unit,
-            $request_data->rang
-        );
+		if (!DolibarrApi::_checkAccessToResource('contrat', $this->contract->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+		$request_data = (object) $request_data;
+		$updateRes = $this->contract->addline(
+			$request_data->desc,
+			$request_data->subprice,
+			$request_data->qty,
+			$request_data->tva_tx,
+			$request_data->localtax1_tx,
+			$request_data->localtax2_tx,
+			$request_data->fk_product,
+			$request_data->remise_percent,
+			$request_data->date_start, // date_start = date planned start, date ouverture = date_start_real
+			$request_data->date_end, // date_end = date planned end, date_cloture = date_end_real
+			$request_data->HT,
+			$request_data->subprice_excl_tax,
+			$request_data->info_bits,
+			$request_data->fk_fournprice,
+			$request_data->pa_ht,
+			$request_data->array_options,
+			$request_data->fk_unit,
+			$request_data->rang
+		);
 
-        if ($updateRes > 0) {
-            return $updateRes;
-        }
-        return false;
-    }
+		if ($updateRes > 0) {
+			return $updateRes;
+		}
+		return false;
+	}
 
-    /**
-     * Update a line to given contract
-     *
-     * @param int   $id             Id of contrat to update
-     * @param int   $lineid         Id of line to update
-     * @param array $request_data   Contractline data
-     *
-     * @url	PUT {id}/lines/{lineid}
-     *
-     * @return array|bool
-     */
-    public function putLine($id, $lineid, $request_data = null)
-    {
-        if (!DolibarrApiAccess::$user->rights->contrat->creer) {
-            throw new RestException(401);
-        }
+	/**
+	 * Update a line to given contract
+	 *
+	 * @param int   $id             Id of contrat to update
+	 * @param int   $lineid         Id of line to update
+	 * @param array $request_data   Contractline data
+	 *
+	 * @url	PUT {id}/lines/{lineid}
+	 *
+	 * @return array|bool
+	 */
+	public function putLine($id, $lineid, $request_data = null)
+	{
+		if (!DolibarrApiAccess::$user->rights->contrat->creer) {
+			throw new RestException(401);
+		}
 
-        $result = $this->contract->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Contrat not found');
-        }
+		$result = $this->contract->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Contrat not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('contrat', $this->contract->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('contrat', $this->contract->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        $request_data = (object) $request_data;
+		$request_data = (object) $request_data;
 
-        $updateRes = $this->contract->updateline(
-            $lineid,
-            $request_data->desc,
-            $request_data->subprice,
-            $request_data->qty,
-            $request_data->remise_percent,
-            $request_data->date_ouveture_prevue,
-            $request_data->date_fin_validite,
-            $request_data->tva_tx,
-            $request_data->localtax1_tx,
-            $request_data->localtax2_tx,
-            $request_data->date_ouverture,
-            $request_data->date_cloture,
-            'HT',
-            $request_data->info_bits,
-            $request_data->fk_fourn_price,
-            $request_data->pa_ht,
-            $request_data->array_options,
-            $request_data->fk_unit
-        );
+		$updateRes = $this->contract->updateline(
+			$lineid,
+			$request_data->desc,
+			$request_data->subprice,
+			$request_data->qty,
+			$request_data->remise_percent,
+			$request_data->date_ouveture_prevue,
+			$request_data->date_fin_validite,
+			$request_data->tva_tx,
+			$request_data->localtax1_tx,
+			$request_data->localtax2_tx,
+			$request_data->date_ouverture,
+			$request_data->date_cloture,
+			'HT',
+			$request_data->info_bits,
+			$request_data->fk_fourn_price,
+			$request_data->pa_ht,
+			$request_data->array_options,
+			$request_data->fk_unit
+		);
 
-        if ($updateRes > 0) {
-            $result = $this->get($id);
-            unset($result->line);
-            return $this->_cleanObjectDatas($result);
-        }
+		if ($updateRes > 0) {
+			$result = $this->get($id);
+			unset($result->line);
+			return $this->_cleanObjectDatas($result);
+		}
 
-        return false;
-    }
+		return false;
+	}
 
-    /**
-     * Activate a service line of a given contract
-     *
-     * @param int   	$id             Id of contract to activate
-     * @param int   	$lineid         Id of line to activate
-     * @param string  	$datestart		{@from body}  Date start        {@type timestamp}
-     * @param string    $dateend		{@from body}  Date end          {@type timestamp}
-     * @param string    $comment  		{@from body}  Comment
-     *
-     * @url	PUT {id}/lines/{lineid}/activate
-     *
-     * @return array|bool
-     */
-    public function activateLine($id, $lineid, $datestart, $dateend = null, $comment = null)
-    {
-        if (!DolibarrApiAccess::$user->rights->contrat->creer) {
-            throw new RestException(401);
-        }
+	/**
+	 * Activate a service line of a given contract
+	 *
+	 * @param int   	$id             Id of contract to activate
+	 * @param int   	$lineid         Id of line to activate
+	 * @param string  	$datestart		{@from body}  Date start        {@type timestamp}
+	 * @param string    $dateend		{@from body}  Date end          {@type timestamp}
+	 * @param string    $comment  		{@from body}  Comment
+	 *
+	 * @url	PUT {id}/lines/{lineid}/activate
+	 *
+	 * @return array|bool
+	 */
+	public function activateLine($id, $lineid, $datestart, $dateend = null, $comment = null)
+	{
+		if (!DolibarrApiAccess::$user->rights->contrat->creer) {
+			throw new RestException(401);
+		}
 
-        $result = $this->contract->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Contrat not found');
-        }
+		$result = $this->contract->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Contrat not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('contrat', $this->contract->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('contrat', $this->contract->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        $updateRes = $this->contract->active_line(DolibarrApiAccess::$user, $lineid, $datestart, $dateend, $comment);
+		$updateRes = $this->contract->active_line(DolibarrApiAccess::$user, $lineid, $datestart, $dateend, $comment);
 
-        if ($updateRes > 0) {
-            $result = $this->get($id);
-            unset($result->line);
-            return $this->_cleanObjectDatas($result);
-        }
+		if ($updateRes > 0) {
+			$result = $this->get($id);
+			unset($result->line);
+			return $this->_cleanObjectDatas($result);
+		}
 
-        return false;
-    }
+		return false;
+	}
 
-    /**
-     * Unactivate a service line of a given contract
-     *
-     * @param int   	$id             Id of contract to activate
-     * @param int   	$lineid         Id of line to activate
-     * @param string  	$datestart		{@from body}  Date start        {@type timestamp}
-     * @param string    $comment  		{@from body}  Comment
-     *
-     * @url	PUT {id}/lines/{lineid}/unactivate
-     *
-     * @return array|bool
-     */
-    public function unactivateLine($id, $lineid, $datestart, $comment = null)
-    {
-        if (!DolibarrApiAccess::$user->rights->contrat->creer) {
-            throw new RestException(401);
-        }
+	/**
+	 * Unactivate a service line of a given contract
+	 *
+	 * @param int   	$id             Id of contract to activate
+	 * @param int   	$lineid         Id of line to activate
+	 * @param string  	$datestart		{@from body}  Date start        {@type timestamp}
+	 * @param string    $comment  		{@from body}  Comment
+	 *
+	 * @url	PUT {id}/lines/{lineid}/unactivate
+	 *
+	 * @return array|bool
+	 */
+	public function unactivateLine($id, $lineid, $datestart, $comment = null)
+	{
+		if (!DolibarrApiAccess::$user->rights->contrat->creer) {
+			throw new RestException(401);
+		}
 
-        $result = $this->contract->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Contrat not found');
-        }
+		$result = $this->contract->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Contrat not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('contrat', $this->contract->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('contrat', $this->contract->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        $request_data = (object) $request_data;
+		// $request_data = (object) $request_data;
 
-        $updateRes = $this->contract->close_line(DolibarrApiAccess::$user, $lineid, $datestart, $comment);
+		$updateRes = $this->contract->close_line(DolibarrApiAccess::$user, $lineid, $datestart, $comment);
 
-        if ($updateRes > 0) {
-            $result = $this->get($id);
-            unset($result->line);
-            return $this->_cleanObjectDatas($result);
-        }
+		if ($updateRes > 0) {
+			$result = $this->get($id);
+			unset($result->line);
+			return $this->_cleanObjectDatas($result);
+		}
 
-        return false;
-    }
+		return false;
+	}
 
-    /**
-     * Delete a line to given contract
-     *
-     *
-     * @param int   $id             Id of contract to update
-     * @param int   $lineid         Id of line to delete
-     *
-     * @url	DELETE {id}/lines/{lineid}
-     *
-     * @return array|mixed
-     *
-     * @throws RestException 401
-     * @throws RestException 404
-     */
-    public function deleteLine($id, $lineid)
-    {
-        if (!DolibarrApiAccess::$user->rights->contrat->creer) {
-            throw new RestException(401);
-        }
+	/**
+	 * Delete a line to given contract
+	 *
+	 *
+	 * @param int   $id             Id of contract to update
+	 * @param int   $lineid         Id of line to delete
+	 *
+	 * @url	DELETE {id}/lines/{lineid}
+	 *
+	 * @return array|mixed
+	 *
+	 * @throws RestException 401
+	 * @throws RestException 404
+	 */
+	public function deleteLine($id, $lineid)
+	{
+		if (!DolibarrApiAccess::$user->rights->contrat->creer) {
+			throw new RestException(401);
+		}
 
-        $result = $this->contract->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Contrat not found');
-        }
+		$result = $this->contract->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Contrat not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('contrat', $this->contract->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('contrat', $this->contract->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        // TODO Check the lineid $lineid is a line of object
+		// TODO Check the lineid $lineid is a line of object
 
-        $updateRes = $this->contract->deleteline($lineid, DolibarrApiAccess::$user);
-        if ($updateRes > 0) {
-            return $this->get($id);
-        } else {
-              throw new RestException(405, $this->contract->error);
-        }
-    }
+		$updateRes = $this->contract->deleteline($lineid, DolibarrApiAccess::$user);
+		if ($updateRes > 0) {
+			return $this->get($id);
+		} else {
+			  throw new RestException(405, $this->contract->error);
+		}
+	}
 
-    /**
-     * Update contract general fields (won't touch lines of contract)
-     *
-     * @param int   $id             Id of contract to update
-     * @param array $request_data   Datas
-     *
-     * @return array|mixed
-     */
-    public function put($id, $request_data = null)
-    {
-        if (!DolibarrApiAccess::$user->rights->contrat->creer) {
-            throw new RestException(401);
-        }
+	/**
+	 * Update contract general fields (won't touch lines of contract)
+	 *
+	 * @param int   $id             Id of contract to update
+	 * @param array $request_data   Datas
+	 *
+	 * @return array|mixed
+	 */
+	public function put($id, $request_data = null)
+	{
+		if (!DolibarrApiAccess::$user->rights->contrat->creer) {
+			throw new RestException(401);
+		}
 
-        $result = $this->contract->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Contrat not found');
-        }
+		$result = $this->contract->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Contrat not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('contrat', $this->contract->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
-        foreach ($request_data as $field => $value) {
-            if ($field == 'id') continue;
-            $this->contract->$field = $value;
-        }
+		if (!DolibarrApi::_checkAccessToResource('contrat', $this->contract->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+		foreach ($request_data as $field => $value) {
+			if ($field == 'id') continue;
+			$this->contract->$field = $value;
+		}
 
-        if ($this->contract->update(DolibarrApiAccess::$user) > 0) {
-            return $this->get($id);
-        } else {
-            throw new RestException(500, $this->contract->error);
-        }
-    }
+		if ($this->contract->update(DolibarrApiAccess::$user) > 0) {
+			return $this->get($id);
+		} else {
+			throw new RestException(500, $this->contract->error);
+		}
+	}
 
-    /**
-     * Delete contract
-     *
-     * @param   int     $id         Contract ID
-     *
-     * @return  array
-     */
-    public function delete($id)
-    {
-        if (!DolibarrApiAccess::$user->rights->contrat->supprimer) {
-            throw new RestException(401);
-        }
-        $result = $this->contract->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Contract not found');
-        }
+	/**
+	 * Delete contract
+	 *
+	 * @param   int     $id         Contract ID
+	 *
+	 * @return  array
+	 */
+	public function delete($id)
+	{
+		if (!DolibarrApiAccess::$user->rights->contrat->supprimer) {
+			throw new RestException(401);
+		}
+		$result = $this->contract->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Contract not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('contrat', $this->contract->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('contrat', $this->contract->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        if (!$this->contract->delete(DolibarrApiAccess::$user)) {
-            throw new RestException(500, 'Error when delete contract : '.$this->contract->error);
-        }
+		if (!$this->contract->delete(DolibarrApiAccess::$user)) {
+			throw new RestException(500, 'Error when delete contract : '.$this->contract->error);
+		}
 
-        return array(
-            'success' => array(
-                'code' => 200,
-                'message' => 'Contract deleted'
-            )
-        );
-    }
+		return array(
+			'success' => array(
+				'code' => 200,
+				'message' => 'Contract deleted'
+			)
+		);
+	}
 
-    /**
-     * Validate a contract
-     *
-     * @param   int $id             Contract ID
-     * @param   int $notrigger      1=Does not execute triggers, 0= execute triggers
-     *
-     * @url POST    {id}/validate
-     *
-     * @return  array
-     * FIXME An error 403 is returned if the request has an empty body.
-     * Error message: "Forbidden: Content type `text/plain` is not supported."
-     * Workaround: send this in the body
-     * {
-     *   "notrigger": 0
-     * }
-     */
-    public function validate($id, $notrigger = 0)
-    {
-        if (!DolibarrApiAccess::$user->rights->contrat->creer) {
-            throw new RestException(401);
-        }
-        $result = $this->contract->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Contract not found');
-        }
+	/**
+	 * Validate a contract
+	 *
+	 * @param   int $id             Contract ID
+	 * @param   int $notrigger      1=Does not execute triggers, 0= execute triggers
+	 *
+	 * @url POST    {id}/validate
+	 *
+	 * @return  array
+	 * FIXME An error 403 is returned if the request has an empty body.
+	 * Error message: "Forbidden: Content type `text/plain` is not supported."
+	 * Workaround: send this in the body
+	 * {
+	 *   "notrigger": 0
+	 * }
+	 */
+	public function validate($id, $notrigger = 0)
+	{
+		if (!DolibarrApiAccess::$user->rights->contrat->creer) {
+			throw new RestException(401);
+		}
+		$result = $this->contract->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Contract not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('contrat', $this->contract->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('contrat', $this->contract->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        $result = $this->contract->validate(DolibarrApiAccess::$user, '', $notrigger);
-        if ($result == 0) {
-            throw new RestException(304, 'Error nothing done. May be object is already validated');
-        }
-        if ($result < 0) {
-            throw new RestException(500, 'Error when validating Contract: '.$this->contract->error);
-        }
+		$result = $this->contract->validate(DolibarrApiAccess::$user, '', $notrigger);
+		if ($result == 0) {
+			throw new RestException(304, 'Error nothing done. May be object is already validated');
+		}
+		if ($result < 0) {
+			throw new RestException(500, 'Error when validating Contract: '.$this->contract->error);
+		}
 
-        return array(
-            'success' => array(
-                'code' => 200,
-                'message' => 'Contract validated (Ref='.$this->contract->ref.')'
-            )
-        );
-    }
+		return array(
+			'success' => array(
+				'code' => 200,
+				'message' => 'Contract validated (Ref='.$this->contract->ref.')'
+			)
+		);
+	}
 
-    /**
-     * Close all services of a contract
-     *
-     * @param   int $id             Contract ID
-     * @param   int $notrigger      1=Does not execute triggers, 0= execute triggers
-     *
-     * @url POST    {id}/close
-     *
-     * @return  array
-     * FIXME An error 403 is returned if the request has an empty body.
-     * Error message: "Forbidden: Content type `text/plain` is not supported."
-     * Workaround: send this in the body
-     * {
-     *   "notrigger": 0
-     * }
-     */
-    public function close($id, $notrigger = 0)
-    {
-        if (!DolibarrApiAccess::$user->rights->contrat->creer) {
-            throw new RestException(401);
-        }
-        $result = $this->contract->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Contract not found');
-        }
+	/**
+	 * Close all services of a contract
+	 *
+	 * @param   int $id             Contract ID
+	 * @param   int $notrigger      1=Does not execute triggers, 0= execute triggers
+	 *
+	 * @url POST    {id}/close
+	 *
+	 * @return  array
+	 * FIXME An error 403 is returned if the request has an empty body.
+	 * Error message: "Forbidden: Content type `text/plain` is not supported."
+	 * Workaround: send this in the body
+	 * {
+	 *   "notrigger": 0
+	 * }
+	 */
+	public function close($id, $notrigger = 0)
+	{
+		if (!DolibarrApiAccess::$user->rights->contrat->creer) {
+			throw new RestException(401);
+		}
+		$result = $this->contract->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Contract not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('contrat', $this->contract->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('contrat', $this->contract->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        $result = $this->contract->closeAll(DolibarrApiAccess::$user, $notrigger);
-        if ($result == 0) {
-            throw new RestException(304, 'Error nothing done. May be object is already close');
-        }
-        if ($result < 0) {
-            throw new RestException(500, 'Error when closing Contract: '.$this->contract->error);
-        }
+		$result = $this->contract->closeAll(DolibarrApiAccess::$user, $notrigger);
+		if ($result == 0) {
+			throw new RestException(304, 'Error nothing done. May be object is already close');
+		}
+		if ($result < 0) {
+			throw new RestException(500, 'Error when closing Contract: '.$this->contract->error);
+		}
 
-        return array(
-            'success' => array(
-                'code' => 200,
-                'message' => 'Contract closed (Ref='.$this->contract->ref.'). All services were closed.'
-            )
-        );
-    }
+		return array(
+			'success' => array(
+				'code' => 200,
+				'message' => 'Contract closed (Ref='.$this->contract->ref.'). All services were closed.'
+			)
+		);
+	}
 
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
-    /**
-     * Clean sensible object datas
-     *
-     * @param   object  $object    Object to clean
-     * @return    array    Array of cleaned object properties
-     */
-    protected function _cleanObjectDatas($object)
-    {
-        // phpcs:enable
-        $object = parent::_cleanObjectDatas($object);
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	/**
+	 * Clean sensible object datas
+	 *
+	 * @param   Object  $object     Object to clean
+	 * @return  Object              Object with cleaned properties
+	 */
+	protected function _cleanObjectDatas($object)
+	{
+		// phpcs:enable
+		$object = parent::_cleanObjectDatas($object);
 
-        unset($object->address);
+		unset($object->address);
 
-        unset($object->date_ouverture_prevue);
-        unset($object->date_ouverture);
-        unset($object->date_fin_validite);
-        unset($object->date_cloture);
-        unset($object->date_debut_prevue);
-        unset($object->date_debut_reel);
-        unset($object->date_fin_prevue);
-        unset($object->date_fin_reel);
-        unset($object->civility_id);
+		unset($object->date_ouverture_prevue);
+		unset($object->date_ouverture);
+		unset($object->date_fin_validite);
+		unset($object->date_cloture);
+		unset($object->date_debut_prevue);
+		unset($object->date_debut_reel);
+		unset($object->date_fin_prevue);
+		unset($object->date_fin_reel);
+		unset($object->civility_id);
 
-        return $object;
-    }
+		return $object;
+	}
 
-    /**
-     * Validate fields before create or update object
-     *
-     * @param   array           $data   Array with data to verify
-     * @return  array
-     * @throws  RestException
-     */
-    private function _validate($data)
-    {
-        $contrat = array();
-        foreach (Contracts::$FIELDS as $field) {
-            if (!isset($data[$field]))
-                throw new RestException(400, "$field field missing");
-            $contrat[$field] = $data[$field];
-        }
-        return $contrat;
-    }
+	/**
+	 * Validate fields before create or update object
+	 *
+	 * @param   array           $data   Array with data to verify
+	 * @return  array
+	 * @throws  RestException
+	 */
+	private function _validate($data)
+	{
+		$contrat = array();
+		foreach (Contracts::$FIELDS as $field) {
+			if (!isset($data[$field]))
+				throw new RestException(400, "$field field missing");
+			$contrat[$field] = $data[$field];
+		}
+		return $contrat;
+	}
 }
diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index 14f5c2d0d42..145ff92cdb4 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -62,27 +62,27 @@ class Contrat extends CommonObject
 	 */
 	public $fk_element = 'fk_contrat';
 
-    /**
+	/**
 	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
 	 */
 	public $picto = 'contract';
 
-    /**
-     * 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
-     * @var int
-     */
-    public $ismultientitymanaged = 1;
+	/**
+	 * 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
+	 * @var int
+	 */
+	public $ismultientitymanaged = 1;
 
-    /**
-     * @var int  Does object support extrafields ? 0=No, 1=Yes
-     */
-    public $isextrafieldmanaged = 1;
+	/**
+	 * @var int  Does object support extrafields ? 0=No, 1=Yes
+	 */
+	public $isextrafieldmanaged = 1;
 
-    /**
-     * 0=Default, 1=View may be restricted to sales representative only if no permission to see all or to company of external user if external user
-     * @var integer
-     */
-    public $restrictiononfksoc = 1;
+	/**
+	 * 0=Default, 1=View may be restricted to sales representative only if no permission to see all or to company of external user if external user
+	 * @var integer
+	 */
+	public $restrictiononfksoc = 1;
 
 	/**
 	 * {@inheritdoc}
@@ -101,11 +101,11 @@ class Contrat extends CommonObject
 	 */
 	public $ref_supplier;
 
-    /**
-     * Entity of the contract
-     * @var int
-     */
-    public $entity;
+	/**
+	 * Entity of the contract
+	 * @var int
+	 */
+	public $entity;
 
 	/**
 	 * Client id linked to the contract
@@ -310,7 +310,7 @@ class Contrat extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Activate a contract line
 	 *
@@ -323,7 +323,7 @@ class Contrat extends CommonObject
 	 */
 	public function active_line($user, $line_id, $date, $date_end = '', $comment = '')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$result = $this->lines[$this->lines_id_index_mapper[$line_id]]->active_line($user, $date, $date_end, $comment);
 		if ($result < 0)
 		{
@@ -334,7 +334,7 @@ class Contrat extends CommonObject
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Close a contract line
 	 *
@@ -346,7 +346,7 @@ class Contrat extends CommonObject
 	 */
 	public function close_line($user, $line_id, $date_end, $comment = '')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$result = $this->lines[$this->lines_id_index_mapper[$line_id]]->close_line($user, $date_end, $comment);
 		if ($result < 0)
 		{
@@ -362,8 +362,8 @@ class Contrat extends CommonObject
 	 *
 	 *  @param	User		$user      		Object User making action
 	 *  @param	int|string	$date_start		Date start (now if empty)
-     *  @param	int			$notrigger		1=Does not execute triggers, 0=Execute triggers
-     *  @param	string		$comment		Comment
+	 *  @param	int			$notrigger		1=Does not execute triggers, 0=Execute triggers
+	 *  @param	string		$comment		Comment
 	 *	@return	int							<0 if KO, >0 if OK
 	 *  @see ()
 	 */
@@ -416,8 +416,8 @@ class Contrat extends CommonObject
 	 * Close all lines of a contract
 	 *
 	 * @param	User		$user      		Object User making action
-     * @param	int			$notrigger		1=Does not execute triggers, 0=Execute triggers
-     * @param	string		$comment		Comment
+	 * @param	int			$notrigger		1=Does not execute triggers, 0=Execute triggers
+	 * @param	string		$comment		Comment
 	 * @return	int							<0 if KO, >0 if OK
 	 * @see activateAll()
 	 */
@@ -436,7 +436,7 @@ class Contrat extends CommonObject
 		{
 			// Close lines not already closed
 			if ($contratline->statut != ContratLigne::STATUS_CLOSED)
-	        {
+			{
 				$contratline->date_cloture = $now;
 				$contratline->fk_user_cloture = $user->id;
 				$contratline->statut = ContratLigne::STATUS_CLOSED;
@@ -448,7 +448,7 @@ class Contrat extends CommonObject
 					$this->errors = $contratline->errors;
 					break;
 				}
-	        }
+			}
 		}
 
 		if (!$error && $this->statut == 0)
@@ -457,14 +457,14 @@ class Contrat extends CommonObject
 			if ($result < 0) $error++;
 		}
 
-        if (!$error)
-        {
-            $this->db->commit();
-            return 1;
-        } else {
-            $this->db->rollback();
-            return -1;
-        }
+		if (!$error)
+		{
+			$this->db->commit();
+			return 1;
+		} else {
+			$this->db->rollback();
+			return -1;
+		}
 	}
 
 	/**
@@ -472,7 +472,7 @@ class Contrat extends CommonObject
 	 *
 	 * @param	User	$user      		Objet User
 	 * @param   string	$force_number	Reference to force on contract (not implemented yet)
-     * @param	int		$notrigger		1=Does not execute triggers, 0= execute triggers
+	 * @param	int		$notrigger		1=Does not execute triggers, 0= execute triggers
 	 * @return	int						<0 if KO, >0 if OK
 	 */
 	public function validate(User $user, $force_number = '', $notrigger = 0)
@@ -506,7 +506,7 @@ class Contrat extends CommonObject
 		} else {
 			$num = $this->ref;
 		}
-        $this->newref = dol_sanitizeFileName($num);
+		$this->newref = dol_sanitizeFileName($num);
 
 		if ($num)
 		{
@@ -526,15 +526,15 @@ class Contrat extends CommonObject
 			// Trigger calls
 			if (!$error && !$notrigger)
 			{
-                // Call trigger
-                $result = $this->call_trigger('CONTRACT_VALIDATE', $user);
-                if ($result < 0) { $error++; }
-                // End call triggers
+				// Call trigger
+				$result = $this->call_trigger('CONTRACT_VALIDATE', $user);
+				if ($result < 0) { $error++; }
+				// End call triggers
 			}
 
 			if (!$error)
 			{
-            	$this->oldref = $this->ref;
+				$this->oldref = $this->ref;
 
 				// Rename directory if dir was a temporary ref
 				if (preg_match('/^[\(]?PROV/i', $this->ref))
@@ -557,16 +557,16 @@ class Contrat extends CommonObject
 						if (@rename($dirsource, $dirdest))
 						{
 							dol_syslog("Rename ok");
-						    // Rename docs starting with $oldref with $newref
-            				$listoffiles = dol_dir_list($conf->contract->dir_output.'/'.$newref, 'files', 1, '^'.preg_quote($oldref, '/'));
-            				foreach ($listoffiles as $fileentry)
-            				{
-            					$dirsource = $fileentry['name'];
-            					$dirdest = preg_replace('/^'.preg_quote($oldref, '/').'/', $newref, $dirsource);
-            					$dirsource = $fileentry['path'].'/'.$dirsource;
-            					$dirdest = $fileentry['path'].'/'.$dirdest;
-            					@rename($dirsource, $dirdest);
-            				}
+							// Rename docs starting with $oldref with $newref
+							$listoffiles = dol_dir_list($conf->contract->dir_output.'/'.$newref, 'files', 1, '^'.preg_quote($oldref, '/'));
+							foreach ($listoffiles as $fileentry)
+							{
+								$dirsource = $fileentry['name'];
+								$dirdest = preg_replace('/^'.preg_quote($oldref, '/').'/', $newref, $dirsource);
+								$dirsource = $fileentry['path'].'/'.$dirsource;
+								$dirdest = $fileentry['path'].'/'.$dirdest;
+								@rename($dirsource, $dirdest);
+							}
 						}
 					}
 				}
@@ -598,7 +598,7 @@ class Contrat extends CommonObject
 	 * Unvalidate a contract
 	 *
 	 * @param	User	$user      		Object User
-     * @param	int		$notrigger		1=Does not execute triggers, 0=execute triggers
+	 * @param	int		$notrigger		1=Does not execute triggers, 0=execute triggers
 	 * @return	int						<0 if KO, >0 if OK
 	 */
 	public function reopen($user, $notrigger = 0)
@@ -671,7 +671,7 @@ class Contrat extends CommonObject
 		$sql = "SELECT rowid, statut, ref, fk_soc,";
 		$sql .= " ref_supplier, ref_customer,";
 		$sql .= " ref_ext,";
-        $sql .= " entity,";
+		$sql .= " entity,";
 		$sql .= " date_contrat as datecontrat,";
 		$sql .= " fk_user_author,";
 		$sql .= " fk_projet as fk_project,";
@@ -713,7 +713,7 @@ class Contrat extends CommonObject
 					$this->ref_customer = $obj->ref_customer;
 					$this->ref_supplier = $obj->ref_supplier;
 					$this->ref_ext = $obj->ref_ext;
-	                $this->entity = $obj->entity;
+					$this->entity = $obj->entity;
 					$this->statut = $obj->statut;
 
 					$this->date_contrat = $this->db->jdate($obj->datecontrat);
@@ -765,7 +765,7 @@ class Contrat extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Load lines array into this->lines.
 	 *  This set also nbofserviceswait, nbofservicesopened, nbofservicesexpired and nbofservicesclosed
@@ -801,7 +801,7 @@ class Contrat extends CommonObject
 		$extrafields->fetch_name_optionals_label($line->table_element, true);
 
 		$this->lines = array();
-        $pos = 0;
+		$pos = 0;
 
 		// Selects contract lines related to a product
 		$sql = "SELECT p.label as product_label, p.description as product_desc, p.ref as product_ref, p.fk_product_type as product_type,";
@@ -858,7 +858,7 @@ class Contrat extends CommonObject
 				$line->total_ttc		= $objp->total_ttc;
 				$line->fk_product = (($objp->fk_product > 0) ? $objp->fk_product : 0);
 				$line->info_bits		= $objp->info_bits;
-				$line->type				= $objp->type;
+				$line->type = $objp->type;
 
 				$line->fk_fournprice = $objp->fk_fournprice;
 				$marginInfos = getMarginInfos($objp->subprice, $objp->remise_percent, $objp->tva_tx, $objp->localtax1_tx, $objp->localtax2_tx, $line->fk_fournprice, $objp->pa_ht);
@@ -871,8 +871,8 @@ class Contrat extends CommonObject
 
 				$line->ref = $objp->product_ref; // deprecated
 				$line->product_ref = $objp->product_ref; // Product Ref
-				$line->product_type		= $objp->product_type;  // Product Type
-				$line->product_desc		= $objp->product_desc;  // Product Description
+				$line->product_type		= $objp->product_type; // Product Type
+				$line->product_desc		= $objp->product_desc; // Product Description
 				$line->product_label	= $objp->product_label; // Product Label
 
 				$line->description = $objp->description;
@@ -896,11 +896,11 @@ class Contrat extends CommonObject
 				$line->fetch_optionals();
 
 				// multilangs
-        		if (!empty($conf->global->MAIN_MULTILANGS) && !empty($objp->fk_product) && !empty($loadalsotranslation)) {
-                    $line = new Product($this->db);
-                    $line->fetch($objp->fk_product);
-                    $line->getMultiLangs();
-        		}
+				if (!empty($conf->global->MAIN_MULTILANGS) && !empty($objp->fk_product) && !empty($loadalsotranslation)) {
+					$line = new Product($this->db);
+					$line->fetch($objp->fk_product);
+					$line->getMultiLangs();
+				}
 
 				$this->lines[$pos] = $line;
 				$this->lines_id_index_mapper[$line->id] = $pos;
@@ -914,8 +914,8 @@ class Contrat extends CommonObject
 				if ($line->statut == ContratLigne::STATUS_CLOSED) $this->nbofservicesclosed++;
 
 				$total_ttc += $objp->total_ttc; // TODO Not saved into database
-                $total_vat += $objp->total_tva;
-                $total_ht += $objp->total_ht;
+				$total_vat += $objp->total_tva;
+				$total_ht += $objp->total_ht;
 
 				$i++;
 				$pos++;
@@ -927,9 +927,9 @@ class Contrat extends CommonObject
 		}
 
 		$this->nbofservices = count($this->lines);
-        $this->total_ttc = price2num($total_ttc); // TODO For the moment value is false as value is not stored in database for line linked to products
-        $this->total_vat = price2num($total_vat); // TODO For the moment value is false as value is not stored in database for line linked to products
-        $this->total_ht = price2num($total_ht); // TODO For the moment value is false as value is not stored in database for line linked to products
+		$this->total_ttc = price2num($total_ttc); // TODO For the moment value is false as value is not stored in database for line linked to products
+		$this->total_tva = price2num($total_vat); // TODO For the moment value is false as value is not stored in database for line linked to products
+		$this->total_ht = price2num($total_ht); // TODO For the moment value is false as value is not stored in database for line linked to products
 
 		return $this->lines;
 	}
@@ -1027,15 +1027,15 @@ class Contrat extends CommonObject
 			// Insert business contacts ('SALESREPSIGN','contrat')
 			if (!$error)
 			{
-    			$result = $this->add_contact($this->commercial_signature_id, 'SALESREPSIGN', 'internal');
-    			if ($result < 0) $error++;
+				$result = $this->add_contact($this->commercial_signature_id, 'SALESREPSIGN', 'internal');
+				if ($result < 0) $error++;
 			}
 
 			// Insert business contacts ('SALESREPFOLL','contrat')
 			if (!$error)
 			{
-                $result = $this->add_contact($this->commercial_suivi_id, 'SALESREPFOLL', 'internal');
-			    if ($result < 0) $error++;
+				$result = $this->add_contact($this->commercial_suivi_id, 'SALESREPFOLL', 'internal');
+				if ($result < 0) $error++;
 			}
 
 			if (!$error)
@@ -1046,78 +1046,78 @@ class Contrat extends CommonObject
 				}
 
 				// Add object linked
-    			if (!$error && $this->id && is_array($this->linked_objects) && !empty($this->linked_objects))
-    			{
-    			    foreach ($this->linked_objects as $origin => $tmp_origin_id)
-    			    {
-    			        if (is_array($tmp_origin_id))       // New behaviour, if linked_object can have several links per type, so is something like array('contract'=>array(id1, id2, ...))
-    			        {
-    			            foreach ($tmp_origin_id as $origin_id)
-    			            {
-    			                $ret = $this->add_object_linked($origin, $origin_id);
-    			                if (!$ret)
-    			                {
-    			                    $this->error = $this->db->lasterror();
-    			                    $error++;
-    			                }
-    			            }
-    			        } else // Old behaviour, if linked_object has only one link per type, so is something like array('contract'=>id1))
-    			        {
-    			            $origin_id = $tmp_origin_id;
-    			            $ret = $this->add_object_linked($origin, $origin_id);
-    			            if (!$ret)
-    			            {
-    			                $this->error = $this->db->lasterror();
-    			                $error++;
-    			            }
-    			        }
-    			    }
-    			}
+				if (!$error && $this->id && is_array($this->linked_objects) && !empty($this->linked_objects))
+				{
+					foreach ($this->linked_objects as $origin => $tmp_origin_id)
+					{
+						if (is_array($tmp_origin_id))       // New behaviour, if linked_object can have several links per type, so is something like array('contract'=>array(id1, id2, ...))
+						{
+							foreach ($tmp_origin_id as $origin_id)
+							{
+								$ret = $this->add_object_linked($origin, $origin_id);
+								if (!$ret)
+								{
+									$this->error = $this->db->lasterror();
+									$error++;
+								}
+							}
+						} else // Old behaviour, if linked_object has only one link per type, so is something like array('contract'=>id1))
+						{
+							$origin_id = $tmp_origin_id;
+							$ret = $this->add_object_linked($origin, $origin_id);
+							if (!$ret)
+							{
+								$this->error = $this->db->lasterror();
+								$error++;
+							}
+						}
+					}
+				}
 
-    			if (!$error && $this->id && !empty($conf->global->MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN) && !empty($this->origin) && !empty($this->origin_id))   // Get contact from origin object
-    			{
-    			    $originforcontact = $this->origin;
-    			    $originidforcontact = $this->origin_id;
-    			    if ($originforcontact == 'shipping')     // shipment and order share the same contacts. If creating from shipment we take data of order
-    			    {
-    			        require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
-    			        $exp = new Expedition($this->db);
-    			        $exp->fetch($this->origin_id);
-    			        $exp->fetchObjectLinked();
-    			        if (count($exp->linkedObjectsIds['commande']) > 0)
-    			        {
-    			            foreach ($exp->linkedObjectsIds['commande'] as $key => $value)
-    			            {
-    			                $originforcontact = 'commande';
-    			                $originidforcontact = $value->id;
-    			                break; // We take first one
-    			            }
-    			        }
-    			    }
+				if (!$error && $this->id && !empty($conf->global->MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN) && !empty($this->origin) && !empty($this->origin_id))   // Get contact from origin object
+				{
+					$originforcontact = $this->origin;
+					$originidforcontact = $this->origin_id;
+					if ($originforcontact == 'shipping')     // shipment and order share the same contacts. If creating from shipment we take data of order
+					{
+						require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
+						$exp = new Expedition($this->db);
+						$exp->fetch($this->origin_id);
+						$exp->fetchObjectLinked();
+						if (count($exp->linkedObjectsIds['commande']) > 0)
+						{
+							foreach ($exp->linkedObjectsIds['commande'] as $key => $value)
+							{
+								$originforcontact = 'commande';
+								$originidforcontact = $value->id;
+								break; // We take first one
+							}
+						}
+					}
 
-    			    $sqlcontact = "SELECT ctc.code, ctc.source, ec.fk_socpeople FROM ".MAIN_DB_PREFIX."element_contact as ec, ".MAIN_DB_PREFIX."c_type_contact as ctc";
-    			    $sqlcontact .= " WHERE element_id = ".$originidforcontact." AND ec.fk_c_type_contact = ctc.rowid AND ctc.element = '".$this->db->escape($originforcontact)."'";
+					$sqlcontact = "SELECT ctc.code, ctc.source, ec.fk_socpeople FROM ".MAIN_DB_PREFIX."element_contact as ec, ".MAIN_DB_PREFIX."c_type_contact as ctc";
+					$sqlcontact .= " WHERE element_id = ".$originidforcontact." AND ec.fk_c_type_contact = ctc.rowid AND ctc.element = '".$this->db->escape($originforcontact)."'";
 
-    			    $resqlcontact = $this->db->query($sqlcontact);
-    			    if ($resqlcontact)
-    			    {
-    			        while ($objcontact = $this->db->fetch_object($resqlcontact))
-    			        {
-    			            if ($objcontact->source == 'internal' && in_array($objcontact->code, array('SALESREPSIGN', 'SALESREPFOLL'))) continue; // ignore this, already forced previously
+					$resqlcontact = $this->db->query($sqlcontact);
+					if ($resqlcontact)
+					{
+						while ($objcontact = $this->db->fetch_object($resqlcontact))
+						{
+							if ($objcontact->source == 'internal' && in_array($objcontact->code, array('SALESREPSIGN', 'SALESREPFOLL'))) continue; // ignore this, already forced previously
 
-    			            //print $objcontact->code.'-'.$objcontact->source.'-'.$objcontact->fk_socpeople."\n";
-    			            $this->add_contact($objcontact->fk_socpeople, $objcontact->code, $objcontact->source); // May failed because of duplicate key or because code of contact type does not exists for new object
-    			        }
-    			    } else dol_print_error($resqlcontact);
-    			}
+							//print $objcontact->code.'-'.$objcontact->source.'-'.$objcontact->fk_socpeople."\n";
+							$this->add_contact($objcontact->fk_socpeople, $objcontact->code, $objcontact->source); // May failed because of duplicate key or because code of contact type does not exists for new object
+						}
+					} else dol_print_error($resqlcontact);
+				}
 			}
 
 			if (!$error)
 			{
-                // Call trigger
-                $result = $this->call_trigger('CONTRACT_CREATE', $user);
-                if ($result < 0) { $error++; }
-                // End call triggers
+				// Call trigger
+				$result = $this->call_trigger('CONTRACT_CREATE', $user);
+				if ($result < 0) { $error++; }
+				// End call triggers
 
 				if (!$error)
 				{
@@ -1158,10 +1158,10 @@ class Contrat extends CommonObject
 
 		$this->db->begin();
 
-	    // Call trigger
-	    $result = $this->call_trigger('CONTRACT_DELETE', $user);
-	    if ($result < 0) { $error++; }
-	    // End call triggers
+		// Call trigger
+		$result = $this->call_trigger('CONTRACT_DELETE', $user);
+		if ($result < 0) { $error++; }
+		// End call triggers
 
 		if (!$error)
 		{
@@ -1224,8 +1224,8 @@ class Contrat extends CommonObject
 			}
 		}
 
-		if (!$error)
-                {
+		// Delete lines
+		if (!$error) {
 				// Delete contratdet extrafields
 				$main = MAIN_DB_PREFIX.'contratdet';
 				$ef = $main."_extrafields";
@@ -1255,9 +1255,21 @@ class Contrat extends CommonObject
 			}
 		}
 
+		// Delete llx_ecm_files
+		if (!$error) {
+			$sql = 'DELETE FROM '.MAIN_DB_PREFIX."ecm_files WHERE src_object_type = '".$this->db->escape($this->table_element.(empty($this->module) ? '' : '@'.$this->module))."' AND src_object_id = ".$this->id;
+			$resql = $this->db->query($sql);
+			if (!$resql)
+			{
+				$this->error = $this->db->lasterror();
+				$this->errors[] = $this->error;
+				$error++;
+			}
+		}
+
+		// Delete contract
 		if (!$error)
 		{
-			// Delete contrat
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."contrat";
 			$sql .= " WHERE rowid=".$this->id;
 
@@ -1346,7 +1358,7 @@ class Contrat extends CommonObject
 		// Put here code to add a control on parameters values
 
 		// Update request
-    	$sql = "UPDATE ".MAIN_DB_PREFIX."contrat SET";
+		$sql = "UPDATE ".MAIN_DB_PREFIX."contrat SET";
 		$sql .= " ref=".(isset($this->ref) ? "'".$this->db->escape($this->ref)."'" : "null").",";
 		$sql .= " ref_customer=".(isset($this->ref_customer) ? "'".$this->db->escape($this->ref_customer)."'" : "null").",";
 		$sql .= " ref_supplier=".(isset($this->ref_supplier) ? "'".$this->db->escape($this->ref_supplier)."'" : "null").",";
@@ -1468,7 +1480,7 @@ class Contrat extends CommonObject
 			if (empty($pu_ttc)) $pu_ttc = 0;
 			if (empty($txtva) || !is_numeric($txtva)) $txtva = 0;
 			if (empty($txlocaltax1) || !is_numeric($txlocaltax1)) $txlocaltax1 = 0;
-            if (empty($txlocaltax2) || !is_numeric($txlocaltax2)) $txlocaltax2 = 0;
+			if (empty($txlocaltax2) || !is_numeric($txlocaltax2)) $txlocaltax2 = 0;
 
 			if ($price_base_type == 'HT')
 			{
@@ -1515,7 +1527,7 @@ class Contrat extends CommonObject
 				$price = $pu_ht - $remise;
 			}
 
-		    if (empty($pa_ht)) $pa_ht = 0;
+			if (empty($pa_ht)) $pa_ht = 0;
 
 
 			// if buy price not defined, define buyprice as configured in margin admin
@@ -1582,13 +1594,13 @@ class Contrat extends CommonObject
 				}
 
 				if (empty($error)) {
-				    // Call trigger
-				    $result = $this->call_trigger('LINECONTRACT_INSERT', $user);
-				    if ($result < 0)
-				    {
-				    	$error++;
-				    }
-				    // End call triggers
+					// Call trigger
+					$result = $this->call_trigger('LINECONTRACT_INSERT', $user);
+					if ($result < 0)
+					{
+						$error++;
+					}
+					// End call triggers
 				}
 
 				if ($error)
@@ -1694,11 +1706,11 @@ class Contrat extends CommonObject
 		$price = price2num(round($pu, 2));
 		if (dol_strlen($remise_percent) > 0)
 		{
-		    $remise = round(($pu * $remise_percent / 100), 2);
-		    $price = $pu - $remise;
+			$remise = round(($pu * $remise_percent / 100), 2);
+			$price = $pu - $remise;
 		}
 
-	    if (empty($pa_ht)) $pa_ht = 0;
+		if (empty($pa_ht)) $pa_ht = 0;
 
 		// if buy price not defined, define buyprice as configured in margin admin
 		if ($this->pa_ht == 0)
@@ -1763,14 +1775,14 @@ class Contrat extends CommonObject
 				}
 
 				if (empty($error)) {
-			        // Call trigger
-			        $result = $this->call_trigger('LINECONTRACT_UPDATE', $user);
-			        if ($result < 0)
-			        {
-			            $this->db->rollback();
-			            return -3;
-			        }
-			        // End call triggers
+					// Call trigger
+					$result = $this->call_trigger('LINECONTRACT_UPDATE', $user);
+					if ($result < 0)
+					{
+						$this->db->rollback();
+						return -3;
+					}
+					// End call triggers
 
 					$this->db->commit();
 					return 1;
@@ -1803,14 +1815,14 @@ class Contrat extends CommonObject
 
 		if ($this->statut >= 0)
 		{
-		    // Call trigger
-		    $result = $this->call_trigger('LINECONTRACT_DELETE', $user);
-		    if ($result < 0) return -1;
-		    // End call triggers
+			// Call trigger
+			$result = $this->call_trigger('LINECONTRACT_DELETE', $user);
+			if ($result < 0) return -1;
+			// End call triggers
 
-		    $this->db->begin();
+			$this->db->begin();
 
-		    $sql = "DELETE FROM ".MAIN_DB_PREFIX.$this->table_element_line;
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX.$this->table_element_line;
 			$sql .= " WHERE rowid=".$idline;
 
 			dol_syslog(get_class($this)."::deleteline", LOG_DEBUG);
@@ -1848,7 +1860,7 @@ class Contrat extends CommonObject
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Update statut of contract according to services
 	 *
@@ -1858,7 +1870,7 @@ class Contrat extends CommonObject
 	 */
 	public function update_statut($user)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		dol_syslog(__METHOD__." is deprecated", LOG_WARNING);
 
 		// If draft, we keep it (should not happen)
@@ -1867,11 +1879,11 @@ class Contrat extends CommonObject
 		// Load $this->lines array
 		//		$this->fetch_lines();
 
-        //		$newstatut=1;
-        //		foreach($this->lines as $key => $contractline)
-        //		{
-        //			//			if ($contractline)         // Loop on each service
-        //		}
+		//		$newstatut=1;
+		//		foreach($this->lines as $key => $contractline)
+		//		{
+		//			//			if ($contractline)         // Loop on each service
+		//		}
 
 		return 1;
 	}
@@ -1888,7 +1900,7 @@ class Contrat extends CommonObject
 		return $this->LibStatut($this->statut, $mode);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Renvoi label of a given contrat status
 	 *
@@ -1898,7 +1910,7 @@ class Contrat extends CommonObject
 	 */
 	public function LibStatut($status, $mode)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 
 		if (empty($this->labelStatus) || empty($this->labelStatusShort))
@@ -1947,11 +1959,11 @@ class Contrat extends CommonObject
 	 *
 	 *	@param	int		$withpicto					0=No picto, 1=Include picto into link, 2=Only picto
 	 *	@param	int		$maxlength					Max length of ref
-     *  @param	int     $notooltip					1=Disable tooltip
-     *  @param  int     $save_lastsearch_value		-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+	 *  @param	int     $notooltip					1=Disable tooltip
+	 *  @param  int     $save_lastsearch_value		-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
 	 *	@return	string								Chaine avec URL
 	 */
-    public function getNomUrl($withpicto = 0, $maxlength = 0, $notooltip = 0, $save_lastsearch_value = -1)
+	public function getNomUrl($withpicto = 0, $maxlength = 0, $notooltip = 0, $save_lastsearch_value = -1)
 	{
 		global $conf, $langs, $user, $hookmanager;
 
@@ -1967,35 +1979,39 @@ class Contrat extends CommonObject
 			if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
 		//}
 
-        $label = '';
+		$label = '';
 
-        if ($user->rights->contrat->lire) {
-        	$label = img_picto('', $this->picto).' <u>'.$langs->trans("Contract").'</u>';
-            $label .= '<br><b>'.$langs->trans('Ref').':</b> '.($this->ref ? $this->ref : $this->id);
-            $label .= '<br><b>'.$langs->trans('RefCustomer').':</b> '.($this->ref_customer ? $this->ref_customer : $this->ref_client);
-            $label .= '<br><b>'.$langs->trans('RefSupplier').':</b> '.$this->ref_supplier;
-            if (!empty($this->total_ht)) {
-                $label .= '<br><b>'.$langs->trans('AmountHT').':</b> '.price($this->total_ht, 0, $langs, 0, -1, -1, $conf->currency);
-            }
-            if (!empty($this->total_tva)) {
-                $label .= '<br><b>'.$langs->trans('VAT').':</b> '.price($this->total_tva, 0, $langs, 0, -1, -1, $conf->currency);
-            }
-            if (!empty($this->total_ttc)) {
-                $label .= '<br><b>'.$langs->trans('AmountTTC').':</b> '.price($this->total_ttc, 0, $langs, 0, -1, -1, $conf->currency);
-            }
-        }
+		if ($user->rights->contrat->lire) {
+			$label = img_picto('', $this->picto).' <u class="paddingrightonly">'.$langs->trans("Contract").'</u>';
+			/* Status of a contract is status of all services, so disabled
+			if (isset($this->statut)) {
+				$label .= ' '.$this->getLibStatut(5);
+			}*/
+			$label .= '<br><b>'.$langs->trans('Ref').':</b> '.($this->ref ? $this->ref : $this->id);
+			$label .= '<br><b>'.$langs->trans('RefCustomer').':</b> '.($this->ref_customer ? $this->ref_customer : $this->ref_client);
+			$label .= '<br><b>'.$langs->trans('RefSupplier').':</b> '.$this->ref_supplier;
+			if (!empty($this->total_ht)) {
+				$label .= '<br><b>'.$langs->trans('AmountHT').':</b> '.price($this->total_ht, 0, $langs, 0, -1, -1, $conf->currency);
+			}
+			if (!empty($this->total_tva)) {
+				$label .= '<br><b>'.$langs->trans('VAT').':</b> '.price($this->total_tva, 0, $langs, 0, -1, -1, $conf->currency);
+			}
+			if (!empty($this->total_ttc)) {
+				$label .= '<br><b>'.$langs->trans('AmountTTC').':</b> '.price($this->total_ttc, 0, $langs, 0, -1, -1, $conf->currency);
+			}
+		}
 
-        $linkclose = '';
-        if (empty($notooltip) && $user->rights->contrat->lire)
-        {
-            if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-            {
-                $label = $langs->trans("ShowOrder");
-                $linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
-            }
-            $linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
-            $linkclose .= ' class="classfortooltip"';
-        }
+		$linkclose = '';
+		if (empty($notooltip) && $user->rights->contrat->lire)
+		{
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+			{
+				$label = $langs->trans("ShowOrder");
+				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
+			}
+			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
+			$linkclose .= ' class="classfortooltip"';
+		}
 
 		$linkstart = '<a href="'.$url.'"';
 		$linkstart .= $linkclose.'>';
@@ -2059,7 +2075,7 @@ class Contrat extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return list of line rowid
 	 *
@@ -2068,7 +2084,7 @@ class Contrat extends CommonObject
 	 */
 	public function array_detail($status = -1)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$tab = array();
 
 		$sql = "SELECT cd.rowid";
@@ -2132,17 +2148,17 @@ class Contrat extends CommonObject
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-     *      Load indicators for dashboard (this->nbtodo and this->nbtodolate)
-     *
-     *      @param	User	$user           Objet user
-     *      @param  string	$mode           "inactive" pour services a activer, "expired" pour services expires
-     *      @return WorkboardResponse|int <0 if KO, WorkboardResponse if OK
+	 *      Load indicators for dashboard (this->nbtodo and this->nbtodolate)
+	 *
+	 *      @param	User	$user           Objet user
+	 *      @param  string	$mode           "inactive" pour services a activer, "expired" pour services expires
+	 *      @return WorkboardResponse|int <0 if KO, WorkboardResponse if OK
 	 */
-    public function load_board($user, $mode)
+	public function load_board($user, $mode)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $langs;
 
 		$this->from = " FROM ".MAIN_DB_PREFIX."contrat as c";
@@ -2167,13 +2183,13 @@ class Contrat extends CommonObject
 			$sql .= " AND cd.date_fin_validite < '".$this->db->idate(dol_now())."'";
 		} elseif ($mode == 'active')
 		{
-		    $sql = "SELECT cd.rowid, cd.date_fin_validite as datefin";
-		    $sql .= $this->from;
-		    $sql .= " WHERE c.statut = 1";
-		    $sql .= " AND c.rowid = cd.fk_contrat";
-		    $sql .= " AND cd.statut = 4";
-		    //$datetouse = dol_now();
-		    //$sql.= " AND cd.date_fin_validite < '".$this->db->idate($datetouse)."'";
+			$sql = "SELECT cd.rowid, cd.date_fin_validite as datefin";
+			$sql .= $this->from;
+			$sql .= " WHERE c.statut = 1";
+			$sql .= " AND c.rowid = cd.fk_contrat";
+			$sql .= " AND cd.statut = 4";
+			//$datetouse = dol_now();
+			//$sql.= " AND cd.date_fin_validite < '".$this->db->idate($datetouse)."'";
 		}
 		$sql .= " AND c.fk_soc = s.rowid";
 		$sql .= " AND c.entity = ".$conf->entity;
@@ -2192,10 +2208,10 @@ class Contrat extends CommonObject
 				$labelShort = $langs->trans("BoardNotActivatedServicesShort");
 				$url = DOL_URL_ROOT.'/contrat/services_list.php?mainmenu=commercial&leftmenu=contracts&mode=0&sortfield=cd.date_fin_validite&sortorder=asc';
 			} elseif ($mode == 'expired') {
-			    $warning_delay = $conf->contrat->services->expires->warning_delay;
-			    $url = DOL_URL_ROOT.'/contrat/services_list.php?mainmenu=commercial&leftmenu=contracts&mode=4&filter=expired&sortfield=cd.date_fin_validite&sortorder=asc';
-			    $label = $langs->trans("BoardExpiredServices");
-			    $labelShort = $langs->trans("BoardExpiredServicesShort");
+				$warning_delay = $conf->contrat->services->expires->warning_delay;
+				$url = DOL_URL_ROOT.'/contrat/services_list.php?mainmenu=commercial&leftmenu=contracts&mode=4&filter=expired&sortfield=cd.date_fin_validite&sortorder=asc';
+				$label = $langs->trans("BoardExpiredServices");
+				$labelShort = $langs->trans("BoardExpiredServicesShort");
 			} else {
 				$warning_delay = $conf->contrat->services->expires->warning_delay;
 				$url = DOL_URL_ROOT.'/contrat/services_list.php?mainmenu=commercial&leftmenu=contracts&mode=4&sortfield=cd.date_fin_validite&sortorder=asc';
@@ -2229,7 +2245,7 @@ class Contrat extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *   Charge indicateurs this->nb de tableau de bord
 	 *
@@ -2237,7 +2253,7 @@ class Contrat extends CommonObject
 	 */
 	public function load_state_board()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $user;
 
 		$this->nb = array();
@@ -2261,7 +2277,7 @@ class Contrat extends CommonObject
 			{
 				$this->nb["contracts"] = $obj->nb;
 			}
-            $this->db->free($resql);
+			$this->db->free($resql);
 			return 1;
 		} else {
 			dol_print_error($this->db);
@@ -2295,17 +2311,17 @@ class Contrat extends CommonObject
 
 
 	/**
-     *  Initialise an instance with random values.
-     *  Used to build previews or test instances.
-     *	id must be 0 if object instance is a specimen.
-     *
-     *  @return	void
-     */
-    public function initAsSpecimen()
-    {
+	 *  Initialise an instance with random values.
+	 *  Used to build previews or test instances.
+	 *	id must be 0 if object instance is a specimen.
+	 *
+	 *  @return	void
+	 */
+	public function initAsSpecimen()
+	{
 		global $user, $langs, $conf;
 
-        // Load array of products prodids
+		// Load array of products prodids
 		$num_prods = 0;
 		$prodids = array();
 		$sql = "SELECT rowid";
@@ -2362,10 +2378,10 @@ class Contrat extends CommonObject
 			$line->date_end = dol_now() + 500000;
 			$line->date_end_real = dol_now() - 100000;
 			if ($num_prods > 0)
-            {
+			{
 				$prodid = mt_rand(1, $num_prods);
 				$line->fk_product = $prodids[$prodid];
-            }
+			}
 			$this->lines[$xnbp] = $line;
 			$xnbp++;
 		}
@@ -2390,7 +2406,7 @@ class Contrat extends CommonObject
 	 *  @param      int			$hidedetails    Hide details of lines
 	 *  @param      int			$hidedesc       Hide description
 	 *  @param      int			$hideref        Hide ref
-         *  @param   null|array  $moreparams     Array to provide more information
+	 *  @param   null|array  $moreparams     Array to provide more information
 	 * 	@return     int         				0 if KO, 1 if OK
 	 */
 	public function generateDocument($modele, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0, $moreparams = null)
@@ -2440,8 +2456,8 @@ class Contrat extends CommonObject
 	 * @param   int     $notrigger	  1=Does not execute triggers, 0= execute triggers
 	 * @return  int                   New id of clone
 	 */
-    public function createFromClone(User $user, $socid = 0, $notrigger = 0)
-    {
+	public function createFromClone(User $user, $socid = 0, $notrigger = 0)
+	{
 		global $db, $langs, $conf, $hookmanager, $extrafields;
 
 		dol_include_once('/projet/class/project.class.php');
@@ -2452,7 +2468,7 @@ class Contrat extends CommonObject
 
 		// Load dest object
 		$clonedObj = clone $this;
-        $clonedObj->socid = $socid;
+		$clonedObj->socid = $socid;
 
 		$this->db->begin();
 
@@ -2503,13 +2519,13 @@ class Contrat extends CommonObject
 			$this->error = $clonedObj->error;
 			$this->errors[] = $clonedObj->error;
 		} else {
-            // copy external contacts if same company
-            if ($this->socid == $clonedObj->socid) {
-                if ($clonedObj->copy_linked_contact($this, 'external') < 0) {
-                    $error++;
-                }
-            }
-        }
+			// copy external contacts if same company
+			if ($this->socid == $clonedObj->socid) {
+				if ($clonedObj->copy_linked_contact($this, 'external') < 0) {
+					$error++;
+				}
+			}
+		}
 
 		if (!$error) {
 			foreach ($this->lines as $line) {
@@ -2555,12 +2571,12 @@ class Contrat extends CommonObject
  */
 class ContratLigne extends CommonObjectLine
 {
-    /**
+	/**
 	 * @var string ID to identify managed object
 	 */
 	public $element = 'contratdet';
 
-    /**
+	/**
 	 * @var string Name of table without prefix where object is stored
 	 */
 	public $table_element = 'contratdet';
@@ -2578,13 +2594,13 @@ class ContratLigne extends CommonObjectLine
 	public $tms;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_contrat;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_product;
 
 	public $statut; // 0 inactive, 4 active, 5 closed
@@ -2607,7 +2623,7 @@ class ContratLigne extends CommonObjectLine
 	 */
 	public $description;
 
-	public $product_type;			// 0 for product, 1 for service
+	public $product_type; // 0 for product, 1 for service
 	public $product_ref;
 	public $product_label;
 
@@ -2632,8 +2648,8 @@ class ContratLigne extends CommonObjectLine
 	public $remise;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_remise_except;
 
 	public $subprice; // Unit price HT
@@ -2654,8 +2670,8 @@ class ContratLigne extends CommonObjectLine
 	public $total_ttc;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_fournprice;
 
 	public $pa_ht;
@@ -2663,18 +2679,18 @@ class ContratLigne extends CommonObjectLine
 	public $info_bits;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_user_author;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_user_ouverture;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_user_cloture;
 
 	public $commentaire;
@@ -2686,9 +2702,9 @@ class ContratLigne extends CommonObjectLine
 
 
 	/**
-     *  Constructor
-     *
-     *  @param      DoliDb		$db      Database handler
+	 *  Constructor
+	 *
+	 *  @param      DoliDb		$db      Database handler
 	 */
 	public function __construct($db)
 	{
@@ -2707,7 +2723,7 @@ class ContratLigne extends CommonObjectLine
 		return $this->LibStatut($this->statut, $mode, ((!empty($this->date_fin_validite)) ? ($this->date_fin_validite < dol_now() ? 1 : 0) : -1));
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return label of a contract line status
 	 *
@@ -2719,26 +2735,26 @@ class ContratLigne extends CommonObjectLine
 	 */
 	public static function LibStatut($status, $mode, $expired = -1, $moreatt = '')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 		$langs->load("contracts");
 
-        if ($status == self::STATUS_INITIAL) {
-            $labelStatus = $langs->trans("ServiceStatusInitial");
-            $labelStatusShort = $langs->trans("ServiceStatusInitial");
-        } elseif ($status == self::STATUS_OPEN && $expired == -1) {
-            $labelStatus = $langs->trans("ServiceStatusRunning");
-            $labelStatusShort = $langs->trans("ServiceStatusRunning");
-        } elseif ($status == self::STATUS_OPEN && $expired == 0) {
-            $labelStatus = $langs->trans("ServiceStatusNotLate");
-            $labelStatusShort = $langs->trans("ServiceStatusNotLateShort");
-        } elseif ($status == self::STATUS_OPEN && $expired == 1) {
-            $labelStatus = $langs->trans("ServiceStatusLate");
-            $labelStatusShort = $langs->trans("ServiceStatusLateShort");
-        } elseif ($status == self::STATUS_CLOSED) {
-            $labelStatus = $langs->trans("ServiceStatusClosed");
-            $labelStatusShort = $langs->trans("ServiceStatusClosed");
-        }
+		if ($status == self::STATUS_INITIAL) {
+			$labelStatus = $langs->trans("ServiceStatusInitial");
+			$labelStatusShort = $langs->trans("ServiceStatusInitial");
+		} elseif ($status == self::STATUS_OPEN && $expired == -1) {
+			$labelStatus = $langs->trans("ServiceStatusRunning");
+			$labelStatusShort = $langs->trans("ServiceStatusRunning");
+		} elseif ($status == self::STATUS_OPEN && $expired == 0) {
+			$labelStatus = $langs->trans("ServiceStatusNotLate");
+			$labelStatusShort = $langs->trans("ServiceStatusNotLateShort");
+		} elseif ($status == self::STATUS_OPEN && $expired == 1) {
+			$labelStatus = $langs->trans("ServiceStatusLate");
+			$labelStatusShort = $langs->trans("ServiceStatusLateShort");
+		} elseif ($status == self::STATUS_CLOSED) {
+			$labelStatus = $langs->trans("ServiceStatusClosed");
+			$labelStatusShort = $langs->trans("ServiceStatusClosed");
+		}
 
 		$statusType = 'status'.$status;
 		if ($status == self::STATUS_OPEN && $expired == 1) $statusType = 'status1';
@@ -2758,22 +2774,22 @@ class ContratLigne extends CommonObjectLine
 	 *  @param	int		$withpicto		0=No picto, 1=Include picto into link, 2=Only picto
 	 *  @param	int		$maxlength		Max length
 	 *  @return	string					Chaine avec URL
- 	 */
-    public function getNomUrl($withpicto = 0, $maxlength = 0)
+	 */
+	public function getNomUrl($withpicto = 0, $maxlength = 0)
 	{
 		global $langs;
 
 		$result = '';
-        $label = $langs->trans("ShowContractOfService").': '.$this->label;
-        if (empty($label)) $label = $this->description;
+		$label = $langs->trans("ShowContractOfService").': '.$this->label;
+		if (empty($label)) $label = $this->description;
 
-        $link = '<a href="'.DOL_URL_ROOT.'/contrat/card.php?id='.$this->fk_contrat.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
+		$link = '<a href="'.DOL_URL_ROOT.'/contrat/card.php?id='.$this->fk_contrat.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
 		$linkend = '</a>';
 
 		$picto = 'service';
 		if ($this->type == 0) $picto = 'product';
 
-        if ($withpicto) $result .= ($link.img_object($label, $picto, 'class="classfortooltip"').$linkend);
+		if ($withpicto) $result .= ($link.img_object($label, $picto, 'class="classfortooltip"').$linkend);
 		if ($withpicto && $withpicto != 2) $result .= ' ';
 		if ($withpicto != 2) $result .= $link.($this->product_ref ? $this->product_ref.' ' : '').($this->label ? $this->label : $this->description).$linkend;
 		return $result;
@@ -2786,7 +2802,7 @@ class ContratLigne extends CommonObjectLine
 	 *  @param	string	$ref		Ref of contract line
 	 *  @return int         		<0 if KO, >0 if OK
 	 */
-    public function fetch($id, $ref = '')
+	public function fetch($id, $ref = '')
 	{
 		// Check parameters
 		if (empty($id) && empty($ref)) return -1;
@@ -2981,7 +2997,7 @@ class ContratLigne extends CommonObjectLine
 		$this->total_localtax1 = $tabprice[9];
 		$this->total_localtax2 = $tabprice[10];
 
-	    if (empty($this->pa_ht)) $this->pa_ht = 0;
+		if (empty($this->pa_ht)) $this->pa_ht = 0;
 
 		// if buy price not defined, define buyprice as configured in margin admin
 		if ($this->pa_ht == 0)
@@ -2999,7 +3015,7 @@ class ContratLigne extends CommonObjectLine
 
 		$this->oldcopy = new ContratLigne($this->db);
 		$this->oldcopy->fetch($this->id);
-        $this->oldcopy->fetch_optionals();
+		$this->oldcopy->fetch_optionals();
 
 		// Update request
 		$sql = "UPDATE ".MAIN_DB_PREFIX."contratdet SET";
@@ -3087,18 +3103,18 @@ class ContratLigne extends CommonObjectLine
 		}
 
 		if (!$error && !$notrigger) {
-	        // Call trigger
-	        $result = $this->call_trigger('LINECONTRACT_UPDATE', $user);
-	        if ($result < 0) {
-                $error++;
-                $this->db->rollback();
-            }
-	        // End call triggers
+			// Call trigger
+			$result = $this->call_trigger('LINECONTRACT_UPDATE', $user);
+			if ($result < 0) {
+				$error++;
+				$this->db->rollback();
+			}
+			// End call triggers
 		}
 
 		if (!$error)
 		{
-        	$this->db->commit();
+			$this->db->commit();
 			return 1;
 		} else {
 			$this->db->rollback();
@@ -3108,7 +3124,7 @@ class ContratLigne extends CommonObjectLine
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *      Mise a jour en base des champs total_xxx de ligne
 	 *		Used by migration process
@@ -3117,7 +3133,7 @@ class ContratLigne extends CommonObjectLine
 	 */
 	public function update_total()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$this->db->begin();
 
 		// Mise a jour ligne en base
@@ -3224,7 +3240,7 @@ class ContratLigne extends CommonObjectLine
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Activate a contract line
 	 *
@@ -3236,7 +3252,7 @@ class ContratLigne extends CommonObjectLine
 	 */
 	public function active_line($user, $date, $date_end = '', $comment = '')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs, $conf;
 
 		$error = 0;
@@ -3281,19 +3297,19 @@ class ContratLigne extends CommonObjectLine
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Close a contract line
 	 *
 	 * @param    User 	$user 			Objet User who close contract
 	 * @param  	 int 	$date_end 		Date end
 	 * @param    string $comment 		A comment typed by user
-     * @param    int	$notrigger		1=Does not execute triggers, 0=Execute triggers
+	 * @param    int	$notrigger		1=Does not execute triggers, 0=Execute triggers
 	 * @return int                    	<0 if KO, >0 if OK
 	 */
 	public function close_line($user, $date_end, $comment = '', $notrigger = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs, $conf;
 
 		// Update object
diff --git a/htdocs/contrat/contact.php b/htdocs/contrat/contact.php
index 32c3dd67ada..24b0ff54bf6 100644
--- a/htdocs/contrat/contact.php
+++ b/htdocs/contrat/contact.php
@@ -60,11 +60,11 @@ if ($action == 'addcontact' && $user->rights->contrat->creer)
 {
 	$result = $object->fetch($id);
 
-    if ($result > 0 && $id > 0)
-    {
-    	$contactid = (GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid'));
+	if ($result > 0 && $id > 0)
+	{
+		$contactid = (GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid'));
   		$result = $object->add_contact($contactid, $_POST["type"], $_POST["source"]);
-    }
+	}
 
 	if ($result >= 0)
 	{
@@ -87,7 +87,7 @@ if ($action == 'swapstatut' && $user->rights->contrat->creer)
 {
 	if ($object->fetch($id))
 	{
-	    $result = $object->swapContactStatus(GETPOST('ligne'));
+		$result = $object->swapContactStatus(GETPOST('ligne'));
 	} else {
 		dol_print_error($db, $object->error);
 	}
@@ -130,7 +130,7 @@ if ($id > 0 || !empty($ref))
 	{
 		$object->fetch_thirdparty();
 
-	    $head = contract_prepare_head($object);
+		$head = contract_prepare_head($object);
 
 		$hselected = 1;
 
@@ -138,13 +138,13 @@ if ($id > 0 || !empty($ref))
 
 		// Contract card
 
-        $linkback = '<a href="'.DOL_URL_ROOT.'/contrat/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
+		$linkback = '<a href="'.DOL_URL_ROOT.'/contrat/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
 
-        $morehtmlref = '';
-        //if (! empty($modCodeContract->code_auto)) {
-            $morehtmlref .= $object->ref;
-        /*} else {
+		$morehtmlref = '';
+		//if (! empty($modCodeContract->code_auto)) {
+			$morehtmlref .= $object->ref;
+		/*} else {
             $morehtmlref.=$form->editfieldkey("",'ref',$object->ref,0,'string','',0,3);
             $morehtmlref.=$form->editfieldval("",'ref',$object->ref,0,'string','',0,2);
         }*/
@@ -158,67 +158,67 @@ if ($id > 0 || !empty($ref))
 		$morehtmlref .= $form->editfieldkey("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', 0, 1);
 		$morehtmlref .= $form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', null, null, '', 1, 'getFormatedSupplierRef');
 		// Thirdparty
-	    $morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
-        // Project
-        if (!empty($conf->projet->enabled)) {
-            $langs->load("projects");
-            $morehtmlref .= '<br>'.$langs->trans('Project').' ';
-            if ($user->rights->contrat->creer) {
-                if ($action != 'classify') {
-                	//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
-                    $morehtmlref .= ' : ';
-                }
-                if ($action == 'classify') {
-	                //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-	                $morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-	                $morehtmlref .= '<input type="hidden" name="action" value="classin">';
-	                $morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
-	                $morehtmlref .= $formproject->select_projects($object->thirdparty->id, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-	                $morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-	                $morehtmlref .= '</form>';
-	            } else {
-	                $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->thirdparty->id, $object->fk_project, 'none', 0, 0, 0, 1);
-	            }
-	        } else {
-	            if (!empty($object->fk_project)) {
-	                $proj = new Project($db);
-	                $proj->fetch($object->fk_project);
-	                $morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
-	                $morehtmlref .= $proj->ref;
-	                $morehtmlref .= '</a>';
-	            } else {
-	                $morehtmlref .= '';
-	            }
-	        }
-	    }
-	    $morehtmlref .= '</div>';
+		$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
+		// Project
+		if (!empty($conf->projet->enabled)) {
+			$langs->load("projects");
+			$morehtmlref .= '<br>'.$langs->trans('Project').' ';
+			if ($user->rights->contrat->creer) {
+				if ($action != 'classify') {
+					//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+					$morehtmlref .= ' : ';
+				}
+				if ($action == 'classify') {
+					//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+					$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+					$morehtmlref .= '<input type="hidden" name="action" value="classin">';
+					$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
+					$morehtmlref .= $formproject->select_projects($object->thirdparty->id, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+					$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+					$morehtmlref .= '</form>';
+				} else {
+					$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->thirdparty->id, $object->fk_project, 'none', 0, 0, 0, 1);
+				}
+			} else {
+				if (!empty($object->fk_project)) {
+					$proj = new Project($db);
+					$proj->fetch($object->fk_project);
+					$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
+					$morehtmlref .= $proj->ref;
+					$morehtmlref .= '</a>';
+				} else {
+					$morehtmlref .= '';
+				}
+			}
+		}
+		$morehtmlref .= '</div>';
 
 
-	    dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'none', $morehtmlref);
+		dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'none', $morehtmlref);
 
 
-	    print '<div class="fichecenter">';
-	    print '<div class="underbanner clearboth"></div>';
+		print '<div class="fichecenter">';
+		print '<div class="underbanner clearboth"></div>';
 
 		print '<table class="border tableforfield" width="100%">';
 
 
-        // Ligne info remises tiers
-        print '<tr><td class="titlefield">'.$langs->trans('Discount').'</td><td colspan="3">';
-        if ($object->thirdparty->remise_percent) {
-            print $langs->trans("CompanyHasRelativeDiscount", $object->thirdparty->remise_percent);
-        } else {
-            print $langs->trans("CompanyHasNoRelativeDiscount");
-        }
-        $absolute_discount = $object->thirdparty->getAvailableDiscounts();
-        print '. ';
-        if ($absolute_discount) print $langs->trans("CompanyHasAbsoluteDiscount", price($absolute_discount), $langs->trans("Currency".$conf->currency));
-        else print $langs->trans("CompanyHasNoAbsoluteDiscount");
-        print '.';
-        print '</td></tr>';
+		// Ligne info remises tiers
+		print '<tr><td class="titlefield">'.$langs->trans('Discount').'</td><td colspan="3">';
+		if ($object->thirdparty->remise_percent) {
+			print $langs->trans("CompanyHasRelativeDiscount", $object->thirdparty->remise_percent);
+		} else {
+			print $langs->trans("CompanyHasNoRelativeDiscount");
+		}
+		$absolute_discount = $object->thirdparty->getAvailableDiscounts();
+		print '. ';
+		if ($absolute_discount) print $langs->trans("CompanyHasAbsoluteDiscount", price($absolute_discount), $langs->trans("Currency".$conf->currency));
+		else print $langs->trans("CompanyHasNoAbsoluteDiscount");
+		print '.';
+		print '</td></tr>';
 
-        // Date
-        print '<tr>';
+		// Date
+		print '<tr>';
 		print '<td class="titlefield">';
 		print $form->editfieldkey("Date", 'date_contrat', $object->date_contrat, $object, 0);
 		print '</td><td>';
@@ -230,7 +230,7 @@ if ($id > 0 || !empty($ref))
 
 		print '</div>';
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 		print '<br>';
 
diff --git a/htdocs/contrat/document.php b/htdocs/contrat/document.php
index fb7291c5d6b..b68da3170ed 100644
--- a/htdocs/contrat/document.php
+++ b/htdocs/contrat/document.php
@@ -179,20 +179,20 @@ if ($object->id)
 	print '<div class="fichecenter">';
 	print '<div class="underbanner clearboth"></div>';
 
-    print '<table class="border tableforfield centpercent">';
-    print '<tr><td class="titlefield">'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
-    print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.dol_print_size($totalsize, 1, 1).'</td></tr>';
-    print '</table>';
+	print '<table class="border tableforfield centpercent">';
+	print '<tr><td class="titlefield">'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
+	print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.dol_print_size($totalsize, 1, 1).'</td></tr>';
+	print '</table>';
 
-    print '</div>';
+	print '</div>';
 
-    dol_fiche_end();
+	print dol_get_fiche_end();
 
-    $modulepart = 'contract';
-    $permission = $user->rights->contrat->creer;
-    $permtoedit = $user->rights->contrat->creer;
-    $param = '&id='.$object->id;
-    include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
+	$modulepart = 'contract';
+	$permission = $user->rights->contrat->creer;
+	$permtoedit = $user->rights->contrat->creer;
+	$param = '&id='.$object->id;
+	include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
 } else {
 	print $langs->trans("ErrorUnknown");
 }
diff --git a/htdocs/contrat/index.php b/htdocs/contrat/index.php
index 7fe88d03c3d..5ea558c9689 100644
--- a/htdocs/contrat/index.php
+++ b/htdocs/contrat/index.php
@@ -80,21 +80,21 @@ 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 contract
-    if (!empty($conf->contrat->enabled))
-    {
-    	print '<form method="post" action="'.DOL_URL_ROOT.'/contrat/list.php">';
-    	print '<input type="hidden" name="token" value="'.newToken().'">';
+	// Search contract
+	if (!empty($conf->contrat->enabled))
+	{
+		print '<form method="post" action="'.DOL_URL_ROOT.'/contrat/list.php">';
+		print '<input type="hidden" name="token" value="'.newToken().'">';
 
 		print '<div class="div-table-responsive-no-min">';
-    	print '<table class="noborder nohover centpercent">';
-    	print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
-    	print '<tr class="oddeven">';
-    	print '<td class="nowrap">'.$langs->trans("Contract").':</td><td><input type="text" class="flat" name="sall" size="18"></td>';
-    	print '<td><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
-    	print "</table></div></form>\n";
-    	print "<br>";
-    }
+		print '<table class="noborder nohover centpercent">';
+		print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
+		print '<tr class="oddeven">';
+		print '<td class="nowrap">'.$langs->trans("Contract").':</td><td><input type="text" class="flat" name="sall" size="18"></td>';
+		print '<td><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
+		print "</table></div></form>\n";
+		print "<br>";
+	}
 }
 
 
@@ -131,11 +131,11 @@ if ($resql)
 		{
 			$nb[$obj->status] = $obj->nb;
 			if ($obj->status != 5)
-            {
-            	$vals[$obj->status] = $obj->nb;
-            	$totalinprocess += $obj->nb;
-            }
-            $total += $obj->nb;
+			{
+				$vals[$obj->status] = $obj->nb;
+				$totalinprocess += $obj->nb;
+			}
+			$total += $obj->nb;
 		}
 		$i++;
 	}
@@ -159,24 +159,24 @@ if ($resql)
 {
 	$num = $db->num_rows($resql);
 
-    // 0 inactive, 4 active, 5 closed
-    $i = 0;
-    while ($i < $num)
-    {
-        $obj = $db->fetch_object($resql);
-        if ($obj)
-        {
-        	$nb[$obj->status.true] = $obj->nb;
-            if ($obj->status != 5)
-            {
-            	$vals[$obj->status.true] = $obj->nb;
-            	$totalinprocess += $obj->nb;
-            }
-            $total += $obj->nb;
-        }
-        $i++;
-    }
-    $db->free($resql);
+	// 0 inactive, 4 active, 5 closed
+	$i = 0;
+	while ($i < $num)
+	{
+		$obj = $db->fetch_object($resql);
+		if ($obj)
+		{
+			$nb[$obj->status.true] = $obj->nb;
+			if ($obj->status != 5)
+			{
+				$vals[$obj->status.true] = $obj->nb;
+				$totalinprocess += $obj->nb;
+			}
+			$total += $obj->nb;
+		}
+		$i++;
+	}
+	$db->free($resql);
 } else {
 	dol_print_error($db);
 }
@@ -191,51 +191,51 @@ print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Statistics").' -
 $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;
+	$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">';
-        print '<td>'.$staticcontratligne->LibStatut($status, 0, ($bool ? 1 : 0)).'</td>';
-        print '<td class="right"><a href="services_list.php?mode='.$status.($bool ? '&filter=expired' : '').'">'.($nb[$status.$bool] ? $nb[$status.$bool] : 0).' '.$staticcontratligne->LibStatut($status, 3, ($bool ? 1 : 0)).'</a></td>';
-        print "</tr>\n";
-    }
-    if ($status == 4 && !$bool) $bool = true;
-    else $bool = false;
+	if (empty($conf->use_javascript_ajax))
+	{
+		print '<tr class="oddeven">';
+		print '<td>'.$staticcontratligne->LibStatut($status, 0, ($bool ? 1 : 0)).'</td>';
+		print '<td class="right"><a href="services_list.php?mode='.$status.($bool ? '&filter=expired' : '').'">'.($nb[$status.$bool] ? $nb[$status.$bool] : 0).' '.$staticcontratligne->LibStatut($status, 3, ($bool ? 1 : 0)).'</a></td>';
+		print "</tr>\n";
+	}
+	if ($status == 4 && !$bool) $bool = true;
+	else $bool = false;
 }
 if (!empty($conf->use_javascript_ajax))
 {
-    print '<tr class="impair"><td class="center" colspan="2">';
+	print '<tr class="impair"><td class="center" colspan="2">';
 
-    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);
+	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);
 
-    print '</td></tr>';
+	print '</td></tr>';
 }
 $listofstatus = array(0, 4, 4, 5); $bool = false;
 foreach ($listofstatus as $status)
 {
-    if (empty($conf->use_javascript_ajax))
-    {
-    	print '<tr class="oddeven">';
-    	print '<td>'.$staticcontratligne->LibStatut($status, 0, ($bool ? 1 : 0)).'</td>';
-    	print '<td class="right"><a href="services_list.php?mode='.$status.($bool ? '&filter=expired' : '').'">'.($nb[$status.$bool] ? $nb[$status.$bool] : 0).' '.$staticcontratligne->LibStatut($status, 3, ($bool ? 1 : 0)).'</a></td>';
-    	if ($status == 4 && !$bool) $bool = true;
-    	else $bool = false;
-        print "</tr>\n";
-    }
+	if (empty($conf->use_javascript_ajax))
+	{
+		print '<tr class="oddeven">';
+		print '<td>'.$staticcontratligne->LibStatut($status, 0, ($bool ? 1 : 0)).'</td>';
+		print '<td class="right"><a href="services_list.php?mode='.$status.($bool ? '&filter=expired' : '').'">'.($nb[$status.$bool] ? $nb[$status.$bool] : 0).' '.$staticcontratligne->LibStatut($status, 3, ($bool ? 1 : 0)).'</a></td>';
+		if ($status == 4 && !$bool) $bool = true;
+		else $bool = false;
+		print "</tr>\n";
+	}
 }
 //if ($totalinprocess != $total)
 //print '<tr class="liste_total"><td>'.$langs->trans("Total").' ('.$langs->trans("ServicesRunning").')</td><td class="right">'.$totalinprocess.'</td></tr>';
@@ -424,15 +424,15 @@ if ($resql)
 		print '<td>';
 		if ($obj->fk_product > 0)
 		{
-    		$productstatic->id = $obj->fk_product;
-            $productstatic->type = $obj->ptype;
-            $productstatic->ref = $obj->pref;
+			$productstatic->id = $obj->fk_product;
+			$productstatic->type = $obj->ptype;
+			$productstatic->ref = $obj->pref;
 			$productstatic->entity = $obj->pentity;
-            print $productstatic->getNomUrl(1, '', 20);
+			print $productstatic->getNomUrl(1, '', 20);
 		} else {
-		    print '<a href="'.DOL_URL_ROOT.'/contrat/card.php?id='.$obj->fk_contrat.'">'.img_object($langs->trans("ShowService"), "service");
-            if ($obj->label) print ' '.dol_trunc($obj->label, 20).'</a>';
-            else print '</a> '.dol_trunc($obj->note, 20);
+			print '<a href="'.DOL_URL_ROOT.'/contrat/card.php?id='.$obj->fk_contrat.'">'.img_object($langs->trans("ShowService"), "service");
+			if ($obj->label) print ' '.dol_trunc($obj->label, 20).'</a>';
+			else print '</a> '.dol_trunc($obj->note, 20);
 		}
 		print '</td>';
 		print '<td>';
@@ -500,17 +500,17 @@ if ($resql)
 		print '<td class="nowrap">';
 		if ($obj->fk_product > 0)
 		{
-    		$productstatic->id = $obj->fk_product;
-            $productstatic->type = $obj->ptype;
-            $productstatic->ref = $obj->pref;
+			$productstatic->id = $obj->fk_product;
+			$productstatic->type = $obj->ptype;
+			$productstatic->ref = $obj->pref;
 			$productstatic->entity = $obj->pentity;
-            print $productstatic->getNomUrl(1, '', 20);
+			print $productstatic->getNomUrl(1, '', 20);
 		} else {
-		    print '<a href="'.DOL_URL_ROOT.'/contrat/card.php?id='.$obj->fk_contrat.'">'.img_object($langs->trans("ShowService"), "service");
-            if ($obj->label) print ' '.dol_trunc($obj->label, 20).'</a>';
-            else print '</a> '.dol_trunc($obj->note, 20);
+			print '<a href="'.DOL_URL_ROOT.'/contrat/card.php?id='.$obj->fk_contrat.'">'.img_object($langs->trans("ShowService"), "service");
+			if ($obj->label) print ' '.dol_trunc($obj->label, 20).'</a>';
+			else print '</a> '.dol_trunc($obj->note, 20);
 		}
-        print '</td>';
+		print '</td>';
 		print '<td>';
 		$staticcompany->id = $obj->fk_soc;
 		$staticcompany->name = $obj->name;
@@ -576,15 +576,15 @@ if ($resql)
 		print '<td class="nowrap">';
 		if ($obj->fk_product > 0)
 		{
-    		$productstatic->id = $obj->fk_product;
-            $productstatic->type = $obj->ptype;
-            $productstatic->ref = $obj->pref;
+			$productstatic->id = $obj->fk_product;
+			$productstatic->type = $obj->ptype;
+			$productstatic->ref = $obj->pref;
 			$productstatic->entity = $obj->pentity;
-            print $productstatic->getNomUrl(1, '', 20);
+			print $productstatic->getNomUrl(1, '', 20);
 		} else {
-		    print '<a href="'.DOL_URL_ROOT.'/contrat/card.php?id='.$obj->fk_contrat.'">'.img_object($langs->trans("ShowService"), "service");
-            if ($obj->label) print ' '.dol_trunc($obj->label, 20).'</a>';
-            else print '</a> '.dol_trunc($obj->note, 20);
+			print '<a href="'.DOL_URL_ROOT.'/contrat/card.php?id='.$obj->fk_contrat.'">'.img_object($langs->trans("ShowService"), "service");
+			if ($obj->label) print ' '.dol_trunc($obj->label, 20).'</a>';
+			else print '</a> '.dol_trunc($obj->note, 20);
 		}
 		print '</td>';
 		print '<td>';
diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php
index 04329a63145..18b47b7102a 100644
--- a/htdocs/contrat/list.php
+++ b/htdocs/contrat/list.php
@@ -363,7 +363,7 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 $arrayofmassactions = array(
 	'generate_doc'=>$langs->trans("ReGeneratePDF"),
 	'builddoc'=>$langs->trans("PDFMerge"),
-    'presend'=>$langs->trans("SendByMail"),
+	'presend'=>$langs->trans("SendByMail"),
 );
 if ($user->rights->contrat->supprimer) $arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
 if (in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
@@ -579,13 +579,13 @@ $parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$
 $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 if (!empty($arrayfields['c.datec']['checked'])) {
-    print_liste_field_titre($arrayfields['c.datec']['label'], $_SERVER["PHP_SELF"], "c.datec", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+	print_liste_field_titre($arrayfields['c.datec']['label'], $_SERVER["PHP_SELF"], "c.datec", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
 }
 if (!empty($arrayfields['c.tms']['checked'])) {
-    print_liste_field_titre($arrayfields['c.tms']['label'], $_SERVER["PHP_SELF"], "c.tms", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+	print_liste_field_titre($arrayfields['c.tms']['label'], $_SERVER["PHP_SELF"], "c.tms", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
 }
 if (!empty($arrayfields['lower_planned_end_date']['checked'])) {
-    print_liste_field_titre($arrayfields['lower_planned_end_date']['label'], $_SERVER["PHP_SELF"], "lower_planned_end_date", "", $param, '', $sortfield, $sortorder, 'center ');
+	print_liste_field_titre($arrayfields['lower_planned_end_date']['label'], $_SERVER["PHP_SELF"], "lower_planned_end_date", "", $param, '', $sortfield, $sortorder, 'center ');
 }
 if (!empty($arrayfields['status']['checked'])) {
 	print_liste_field_titre($staticcontratligne->LibStatut(0, 3, -1, 'class="nochangebackground"'), '', '', '', '', 'width="16"');
@@ -634,7 +634,7 @@ while ($i < min($num, $limit))
 
 	if (!empty($arrayfields['c.ref_customer']['checked']))
 	{
-	    print '<td>'.$contracttmp->getFormatedCustomerRef($obj->ref_customer).'</td>';
+		print '<td>'.$contracttmp->getFormatedCustomerRef($obj->ref_customer).'</td>';
 	}
 	if (!empty($arrayfields['c.ref_supplier']['checked']))
 	{
diff --git a/htdocs/contrat/note.php b/htdocs/contrat/note.php
index d2f7a7e71fa..c9000c4fb0d 100644
--- a/htdocs/contrat/note.php
+++ b/htdocs/contrat/note.php
@@ -72,101 +72,101 @@ $form = new Form($db);
 
 if ($id > 0 || !empty($ref))
 {
-    $object->fetch_thirdparty();
+	$object->fetch_thirdparty();
 
-    $head = contract_prepare_head($object);
+	$head = contract_prepare_head($object);
 
-    $hselected = 2;
+	$hselected = 2;
 
-    print dol_get_fiche_head($head, 'note', $langs->trans("Contract"), -1, 'contract');
+	print dol_get_fiche_head($head, 'note', $langs->trans("Contract"), -1, 'contract');
 
-    // Contract card
+	// Contract card
 
-    $linkback = '<a href="'.DOL_URL_ROOT.'/contrat/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
+	$linkback = '<a href="'.DOL_URL_ROOT.'/contrat/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
 
-    $morehtmlref = '';
-    //if (! empty($modCodeContract->code_auto)) {
-    $morehtmlref .= $object->ref;
-    /*} else {
+	$morehtmlref = '';
+	//if (! empty($modCodeContract->code_auto)) {
+	$morehtmlref .= $object->ref;
+	/*} else {
      $morehtmlref.=$form->editfieldkey("",'ref',$object->ref,0,'string','',0,3);
     $morehtmlref.=$form->editfieldval("",'ref',$object->ref,0,'string','',0,2);
     }*/
 
-    $morehtmlref .= '<div class="refidno">';
-    // Ref customer
-    $morehtmlref .= $form->editfieldkey("RefCustomer", 'ref_customer', $object->ref_customer, $object, 0, 'string', '', 0, 1);
-    $morehtmlref .= $form->editfieldval("RefCustomer", 'ref_customer', $object->ref_customer, $object, 0, 'string', '', null, null, '', 1, 'getFormatedCustomerRef');
-    // Ref supplier
-    $morehtmlref .= '<br>';
-    $morehtmlref .= $form->editfieldkey("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', 0, 1);
-    $morehtmlref .= $form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', null, null, '', 1, 'getFormatedSupplierRef');
-    // Thirdparty
-    $morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
-    // Project
-    if (!empty($conf->projet->enabled))
-    {
-    	$langs->load("projects");
-    	$morehtmlref .= '<br>'.$langs->trans('Project').' ';
-    	if ($user->rights->contrat->creer)
-    	{
-    		if ($action != 'classify')
-    			//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
-    			$morehtmlref .= ' : ';
-    		if ($action == 'classify') {
-    			//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-    			$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-    			$morehtmlref .= '<input type="hidden" name="action" value="classin">';
-    			$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
-    			$morehtmlref .= $formproject->select_projects($object->thirdparty->id, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-    			$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-    			$morehtmlref .= '</form>';
-    		} else {
-    			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->thirdparty->id, $object->fk_project, 'none', 0, 0, 0, 1);
-    		}
-    	} else {
-    		if (!empty($object->fk_project)) {
-    			$proj = new Project($db);
-    			$proj->fetch($object->fk_project);
-    			$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
-    			$morehtmlref .= $proj->ref;
-    			$morehtmlref .= '</a>';
-    		} else {
-    			$morehtmlref .= '';
-    		}
-    	}
-    }
-    $morehtmlref .= '</div>';
+	$morehtmlref .= '<div class="refidno">';
+	// Ref customer
+	$morehtmlref .= $form->editfieldkey("RefCustomer", 'ref_customer', $object->ref_customer, $object, 0, 'string', '', 0, 1);
+	$morehtmlref .= $form->editfieldval("RefCustomer", 'ref_customer', $object->ref_customer, $object, 0, 'string', '', null, null, '', 1, 'getFormatedCustomerRef');
+	// Ref supplier
+	$morehtmlref .= '<br>';
+	$morehtmlref .= $form->editfieldkey("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', 0, 1);
+	$morehtmlref .= $form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', null, null, '', 1, 'getFormatedSupplierRef');
+	// Thirdparty
+	$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
+	// Project
+	if (!empty($conf->projet->enabled))
+	{
+		$langs->load("projects");
+		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
+		if ($user->rights->contrat->creer)
+		{
+			if ($action != 'classify')
+				//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+				$morehtmlref .= ' : ';
+			if ($action == 'classify') {
+				//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+				$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+				$morehtmlref .= '<input type="hidden" name="action" value="classin">';
+				$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
+				$morehtmlref .= $formproject->select_projects($object->thirdparty->id, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+				$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+				$morehtmlref .= '</form>';
+			} else {
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->thirdparty->id, $object->fk_project, 'none', 0, 0, 0, 1);
+			}
+		} else {
+			if (!empty($object->fk_project)) {
+				$proj = new Project($db);
+				$proj->fetch($object->fk_project);
+				$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
+				$morehtmlref .= $proj->ref;
+				$morehtmlref .= '</a>';
+			} else {
+				$morehtmlref .= '';
+			}
+		}
+	}
+	$morehtmlref .= '</div>';
 
 
-    dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'none', $morehtmlref);
+	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'none', $morehtmlref);
 
 
-    print '<div class="fichecenter">';
-    print '<div class="underbanner clearboth"></div>';
+	print '<div class="fichecenter">';
+	print '<div class="underbanner clearboth"></div>';
 
-    print '<table class="border centpercent tableforfield">';
+	print '<table class="border centpercent tableforfield">';
 
 
-    // Ligne info remises tiers
-    print '<tr><td class="titlefield">'.$langs->trans('Discount').'</td><td colspan="3">';
-    if ($object->thirdparty->remise_percent) print $langs->trans("CompanyHasRelativeDiscount", $object->thirdparty->remise_percent);
-    else print $langs->trans("CompanyHasNoRelativeDiscount");
-    $absolute_discount = $object->thirdparty->getAvailableDiscounts();
-    print '. ';
-    if ($absolute_discount) print $langs->trans("CompanyHasAbsoluteDiscount", price($absolute_discount), $langs->trans("Currency".$conf->currency));
-    else print $langs->trans("CompanyHasNoAbsoluteDiscount");
-    print '.';
-    print '</td></tr>';
+	// Ligne info remises tiers
+	print '<tr><td class="titlefield">'.$langs->trans('Discount').'</td><td colspan="3">';
+	if ($object->thirdparty->remise_percent) print $langs->trans("CompanyHasRelativeDiscount", $object->thirdparty->remise_percent);
+	else print $langs->trans("CompanyHasNoRelativeDiscount");
+	$absolute_discount = $object->thirdparty->getAvailableDiscounts();
+	print '. ';
+	if ($absolute_discount) print $langs->trans("CompanyHasAbsoluteDiscount", price($absolute_discount), $langs->trans("Currency".$conf->currency));
+	else print $langs->trans("CompanyHasNoAbsoluteDiscount");
+	print '.';
+	print '</td></tr>';
 
-    // Date
-    print '<tr>';
-    print '<td class="titlefield">';
-    print $form->editfieldkey("Date", 'date_contrat', $object->date_contrat, $object, 0);
-    print '</td><td>';
-    print $form->editfieldval("Date", 'date_contrat', $object->date_contrat, $object, 0, 'datehourpicker');
-    print '</td>';
-    print '</tr>';
+	// Date
+	print '<tr>';
+	print '<td class="titlefield">';
+	print $form->editfieldkey("Date", 'date_contrat', $object->date_contrat, $object, 0);
+	print '</td><td>';
+	print $form->editfieldval("Date", 'date_contrat', $object->date_contrat, $object, 0, 'datehourpicker');
+	print '</td>';
+	print '</tr>';
 
 	print "</table>";
 
@@ -176,7 +176,7 @@ if ($id > 0 || !empty($ref))
 
 	include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 }
 
 
diff --git a/htdocs/contrat/services_list.php b/htdocs/contrat/services_list.php
index 7279ab98781..67b605d657f 100644
--- a/htdocs/contrat/services_list.php
+++ b/htdocs/contrat/services_list.php
@@ -245,30 +245,30 @@ if ($search_contract) $sql .= " AND c.ref LIKE '%".$db->escape($search_contract)
 if ($search_service)  $sql .= " AND (p.ref LIKE '%".$db->escape($search_service)."%' OR p.description LIKE '%".$db->escape($search_service)."%' OR cd.description LIKE '%".$db->escape($search_service)."%')";
 if ($socid > 0)       $sql .= " AND s.rowid = ".$socid;
 
-$filter_dateouvertureprevue_start=dol_mktime(0, 0, 0, $opouvertureprevuemonth, $opouvertureprevueday, $opouvertureprevueyear);
-$filter_dateouvertureprevue_end=dol_mktime(23, 59, 59, $opouvertureprevuemonth, $opouvertureprevueday, $opouvertureprevueyear);
+$filter_dateouvertureprevue_start = dol_mktime(0, 0, 0, $opouvertureprevuemonth, $opouvertureprevueday, $opouvertureprevueyear);
+$filter_dateouvertureprevue_end = dol_mktime(23, 59, 59, $opouvertureprevuemonth, $opouvertureprevueday, $opouvertureprevueyear);
 if ($filter_dateouvertureprevue_start != '' && $filter_opouvertureprevue == -1) $filter_opouvertureprevue = ' BETWEEN ';
 
-$filter_date1_start =dol_mktime(0, 0, 0, $op1month, $op1day, $op1year);
-$filter_date1_end =dol_mktime(23, 59, 59, $op1month, $op1day, $op1year);
+$filter_date1_start = dol_mktime(0, 0, 0, $op1month, $op1day, $op1year);
+$filter_date1_end = dol_mktime(23, 59, 59, $op1month, $op1day, $op1year);
 if ($filter_date1_start != '' && $filter_op1 == -1) $filter_op1 = ' BETWEEN ';
 
-$filter_date2_start=dol_mktime(0, 0, 0, $op2month, $op2day, $op2year);
-$filter_date2_end=dol_mktime(23, 59, 59, $op2month, $op2day, $op2year);
+$filter_date2_start = dol_mktime(0, 0, 0, $op2month, $op2day, $op2year);
+$filter_date2_end = dol_mktime(23, 59, 59, $op2month, $op2day, $op2year);
 if ($filter_date2_start != '' && $filter_op2 == -1) $filter_op2 = ' BETWEEN ';
 
-$filter_datecloture_start=dol_mktime(0, 0, 0, $opcloturemonth, $opclotureday, $opclotureyear);
-$filter_datecloture_end=dol_mktime(23, 59, 59, $opcloturemonth, $opclotureday, $opclotureyear);
+$filter_datecloture_start = dol_mktime(0, 0, 0, $opcloturemonth, $opclotureday, $opclotureyear);
+$filter_datecloture_end = dol_mktime(23, 59, 59, $opcloturemonth, $opclotureday, $opclotureyear);
 if ($filter_datecloture_start != '' && $filter_opcloture == -1) $filter_opcloture = ' BETWEEN ';
 
-if (! empty($filter_opouvertureprevue) && $filter_opouvertureprevue != -1 && $filter_opouvertureprevue != ' BETWEEN ' && $filter_dateouvertureprevue_start != '') $sql.= " AND cd.date_ouverture_prevue ".$filter_opouvertureprevue." '".$db->idate($filter_dateouvertureprevue_start)."'";
-if (! empty($filter_opouvertureprevue) && $filter_opouvertureprevue == ' BETWEEN ') $sql.= " AND '".$db->idate($filter_dateouvertureprevue_end)."'";
-if (! empty($filter_op1) && $filter_op1 != -1 && $filter_op1 != ' BETWEEN ' && $filter_date1_start != '') $sql.= " AND cd.date_ouverture ".$filter_op1." '".$db->idate($filter_date1_start)."'";
-if (! empty($filter_op1) && $filter_op1==' BETWEEN ')  $sql.= " AND '".$db->idate($filter_date1_end)."'";
-if (! empty($filter_op2) && $filter_op2 != -1 && $filter_op2 != ' BETWEEN ' && $filter_date2_start != '') $sql.= " AND cd.date_fin_validite ".$filter_op2." '".$db->idate($filter_date2_start)."'";
-if (! empty($filter_op2) && $filter_op2==' BETWEEN ')  $sql.= " AND '".$db->idate($filter_date2_end)."'";
-if (! empty($filter_opcloture) && $filter_opcloture != ' BETWEEN ' && $filter_opcloture != -1 && $filter_datecloture_start != '') $sql.= " AND cd.date_cloture ".$filter_opcloture." '".$db->idate($filter_datecloture_start)."'";
-if (! empty($filter_opcloture) && $filter_opcloture==' BETWEEN ')  $sql.= " AND '".$db->idate($filter_datecloture_end)."'";
+if (!empty($filter_opouvertureprevue) && $filter_opouvertureprevue != -1 && $filter_opouvertureprevue != ' BETWEEN ' && $filter_dateouvertureprevue_start != '') $sql .= " AND cd.date_ouverture_prevue ".$filter_opouvertureprevue." '".$db->idate($filter_dateouvertureprevue_start)."'";
+if (!empty($filter_opouvertureprevue) && $filter_opouvertureprevue == ' BETWEEN ') $sql .= " AND '".$db->idate($filter_dateouvertureprevue_end)."'";
+if (!empty($filter_op1) && $filter_op1 != -1 && $filter_op1 != ' BETWEEN ' && $filter_date1_start != '') $sql .= " AND cd.date_ouverture ".$filter_op1." '".$db->idate($filter_date1_start)."'";
+if (!empty($filter_op1) && $filter_op1 == ' BETWEEN ')  $sql .= " AND '".$db->idate($filter_date1_end)."'";
+if (!empty($filter_op2) && $filter_op2 != -1 && $filter_op2 != ' BETWEEN ' && $filter_date2_start != '') $sql .= " AND cd.date_fin_validite ".$filter_op2." '".$db->idate($filter_date2_start)."'";
+if (!empty($filter_op2) && $filter_op2 == ' BETWEEN ')  $sql .= " AND '".$db->idate($filter_date2_end)."'";
+if (!empty($filter_opcloture) && $filter_opcloture != ' BETWEEN ' && $filter_opcloture != -1 && $filter_datecloture_start != '') $sql .= " AND cd.date_cloture ".$filter_opcloture." '".$db->idate($filter_datecloture_start)."'";
+if (!empty($filter_opcloture) && $filter_opcloture == ' BETWEEN ')  $sql .= " AND '".$db->idate($filter_datecloture_end)."'";
 // Add where from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
 $sql .= $db->order($sortfield, $sortorder);
@@ -581,7 +581,7 @@ while ($i < min($num, $limit))
 		print '<td class="nowraponall">';
 		print $contractstatic->getNomUrl(1, 16);
 		print '</td>';
-        if (!$i) $totalarray['nbfield']++;
+		if (!$i) $totalarray['nbfield']++;
 	}
 	// Service
 	if (!empty($arrayfields['p.description']['checked']))
@@ -601,7 +601,7 @@ while ($i < min($num, $limit))
 			if ($obj->type == 1) print img_object($obj->description, 'service').' '.dol_trunc($obj->description, 24);
 		}
 		print '</td>';
-        if (!$i) $totalarray['nbfield']++;
+		if (!$i) $totalarray['nbfield']++;
 	}
 
 	if (!empty($arrayfields['cd.qty']['checked']))
@@ -609,39 +609,39 @@ while ($i < min($num, $limit))
 		print '<td>';
 		print $obj->qty;
 		print '</td>';
-        if (!$i) $totalarray['nbfield']++;
+		if (!$i) $totalarray['nbfield']++;
 	}
 	if (!empty($arrayfields['cd.total_ht']['checked']))
 	{
 		print '<td class="right">';
 		print price($obj->total_ht);
 		print '</td>';
-        if (!$i) $totalarray['nbfield']++;
-        if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'cd.total_ht';
-        $totalarray['val']['cd.total_ht'] += $obj->total_ht;
-    }
+		if (!$i) $totalarray['nbfield']++;
+		if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'cd.total_ht';
+		$totalarray['val']['cd.total_ht'] += $obj->total_ht;
+	}
 	if (!empty($arrayfields['cd.total_tva']['checked']))
 	{
 		print '<td class="right">';
 		print price($obj->total_tva);
 		print '</td>';
-        if (!$i) $totalarray['nbfield']++;
-        if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'cd.total_tva';
-        $totalarray['val']['cd.total_tva'] += $obj->total_tva;
-    }
+		if (!$i) $totalarray['nbfield']++;
+		if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'cd.total_tva';
+		$totalarray['val']['cd.total_tva'] += $obj->total_tva;
+	}
 	if (!empty($arrayfields['cd.tva_tx']['checked']))
 	{
 		print '<td class="right">';
 		print price2num($obj->tva_tx).'%';
 		print '</td>';
-        if (!$i) $totalarray['nbfield']++;
+		if (!$i) $totalarray['nbfield']++;
 	}
 	if (!empty($arrayfields['cd.subprice']['checked']))
 	{
 		print '<td class="right">';
 		print price($obj->subprice);
 		print '</td>';
-        if (!$i) $totalarray['nbfield']++;
+		if (!$i) $totalarray['nbfield']++;
 	}
 
 
@@ -651,7 +651,7 @@ while ($i < min($num, $limit))
 		print '<td>';
 		print $companystatic->getNomUrl(1, 'customer', 28);
 		print '</td>';
-        if (!$i) $totalarray['nbfield']++;
+		if (!$i) $totalarray['nbfield']++;
 	}
 
 	// Start date
@@ -663,12 +663,12 @@ while ($i < min($num, $limit))
 		print ' '.img_picto($langs->trans("Late"), "warning");
 		else print '&nbsp;&nbsp;&nbsp;&nbsp;';
 		print '</td>';
-        if (!$i) $totalarray['nbfield']++;
+		if (!$i) $totalarray['nbfield']++;
 	}
 	if (!empty($arrayfields['cd.date_ouverture']['checked']))
 	{
 		print '<td class="center">'.($obj->date_ouverture ?dol_print_date($db->jdate($obj->date_ouverture), 'dayhour') : '&nbsp;').'</td>';
-        if (!$i) $totalarray['nbfield']++;
+		if (!$i) $totalarray['nbfield']++;
 	}
 	// End date
 	if (!empty($arrayfields['cd.date_fin_validite']['checked']))
@@ -681,13 +681,13 @@ while ($i < min($num, $limit))
 			print img_warning($textlate);
 		} else print '&nbsp;&nbsp;&nbsp;&nbsp;';
 		print '</td>';
-        if (!$i) $totalarray['nbfield']++;
+		if (!$i) $totalarray['nbfield']++;
 	}
 	// Close date (real end date)
 	if (!empty($arrayfields['cd.date_cloture']['checked']))
 	{
 		print '<td class="center">'.dol_print_date($db->jdate($obj->date_cloture), 'dayhour').'</td>';
-        if (!$i) $totalarray['nbfield']++;
+		if (!$i) $totalarray['nbfield']++;
 	}
 
 	// Extra fields
@@ -715,16 +715,16 @@ while ($i < min($num, $limit))
 	// Status
 	if (!empty($arrayfields['status']['checked']))
 	{
-	    print '<td class="right">';
-	    if ($obj->cstatut == 0)
-	    {
+		print '<td class="right">';
+		if ($obj->cstatut == 0)
+		{
 			// If contract is draft, we say line is also draft
-		    print $contractstatic->LibStatut(0, 5);
-	    } else {
-		    print $staticcontratligne->LibStatut($obj->statut, 5, ($obj->date_fin_validite && $db->jdate($obj->date_fin_validite) < $now) ? 1 : 0);
-	    }
-	    print '</td>';
-        if (!$i) $totalarray['nbfield']++;
+			print $contractstatic->LibStatut(0, 5);
+		} else {
+			print $staticcontratligne->LibStatut($obj->statut, 5, ($obj->date_fin_validite && $db->jdate($obj->date_fin_validite) < $now) ? 1 : 0);
+		}
+		print '</td>';
+		if (!$i) $totalarray['nbfield']++;
 	}
 	// Action column
 	print '<td class="nowrap center">';
diff --git a/htdocs/contrat/tpl/linkedobjectblock.tpl.php b/htdocs/contrat/tpl/linkedobjectblock.tpl.php
index 57b885f24d2..339f51db22c 100644
--- a/htdocs/contrat/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/contrat/tpl/linkedobjectblock.tpl.php
@@ -39,10 +39,10 @@ $langs->load("contracts");
 $total = 0; $ilink = 0;
 foreach ($linkedObjectBlock as $key => $objectlink)
 {
-    $ilink++;
+	$ilink++;
 
-    $trclass = 'oddeven';
-    if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass .= ' liste_sub_total';
+	$trclass = 'oddeven';
+	if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass .= ' liste_sub_total';
 	?>
 <tr class="<?php echo $trclass; ?>">
     <td><?php echo $langs->trans("Contract"); ?></td>
@@ -58,7 +58,7 @@ foreach ($linkedObjectBlock as $key => $objectlink)
 		$totalcontrat = 0;
 		foreach ($objectlink->lines as $linecontrat) {
 			$totalcontrat = $totalcontrat + $linecontrat->total_ht;
-		    $total = $total + $linecontrat->total_ht;
+			$total = $total + $linecontrat->total_ht;
 		}
 		echo price($totalcontrat);
 	} ?></td>
diff --git a/htdocs/core/actions_addupdatedelete.inc.php b/htdocs/core/actions_addupdatedelete.inc.php
index 45f0fb8613e..80228628c61 100644
--- a/htdocs/core/actions_addupdatedelete.inc.php
+++ b/htdocs/core/actions_addupdatedelete.inc.php
@@ -310,6 +310,7 @@ if ($action == 'confirm_validate' && $confirm == 'yes' && $permissiontoadd)
 					$outputlangs->setDefaultLang($newlang);
 				}
 				$model = $object->model_pdf;
+
 				$ret = $object->fetch($id); // Reload to get new records
 
 				$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
diff --git a/htdocs/core/actions_builddoc.inc.php b/htdocs/core/actions_builddoc.inc.php
index 20bd19625cc..4ae83829fa4 100644
--- a/htdocs/core/actions_builddoc.inc.php
+++ b/htdocs/core/actions_builddoc.inc.php
@@ -34,102 +34,102 @@ if (!empty($permissioncreate) && empty($permissiontoadd)) $permissiontoadd = $pe
 // Build doc
 if ($action == 'builddoc' && $permissiontoadd)
 {
-    if (is_numeric(GETPOST('model', 'alpha')))
-    {
-        $error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Model"));
-    } else {
+	if (is_numeric(GETPOST('model', 'alpha')))
+	{
+		$error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Model"));
+	} else {
    		// Reload to get all modified line records and be ready for hooks
-        $ret = $object->fetch($id);
-        $ret = $object->fetch_thirdparty();
-        /*if (empty($object->id) || ! $object->id > 0)
+		$ret = $object->fetch($id);
+		$ret = $object->fetch_thirdparty();
+		/*if (empty($object->id) || ! $object->id > 0)
         {
             dol_print_error('Object must have been loaded by a fetch');
             exit;
         }*/
 
-        // Save last template used to generate document
-    	if (GETPOST('model', 'alpha'))
-    	{
-    	    $object->setDocModel($user, GETPOST('model', 'alpha'));
-    	}
+		// Save last template used to generate document
+		if (GETPOST('model', 'alpha'))
+		{
+			$object->setDocModel($user, GETPOST('model', 'alpha'));
+		}
 
-        // Special case to force bank account
-        //if (property_exists($object, 'fk_bank'))
-        //{
-        if (GETPOST('fk_bank', 'int')) {
-            // this field may come from an external module
-            $object->fk_bank = GETPOST('fk_bank', 'int');
-        } elseif (!empty($object->fk_account)) {
-            $object->fk_bank = $object->fk_account;
-        }
-        //}
+		// Special case to force bank account
+		//if (property_exists($object, 'fk_bank'))
+		//{
+		if (GETPOST('fk_bank', 'int')) {
+			// this field may come from an external module
+			$object->fk_bank = GETPOST('fk_bank', 'int');
+		} elseif (!empty($object->fk_account)) {
+			$object->fk_bank = $object->fk_account;
+		}
+		//}
 
-        $outputlangs = $langs;
-        $newlang = '';
+		$outputlangs = $langs;
+		$newlang = '';
 
-        if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) $newlang = GETPOST('lang_id', 'aZ09');
-        if ($conf->global->MAIN_MULTILANGS && empty($newlang) && isset($object->thirdparty->default_lang)) $newlang = $object->thirdparty->default_lang; // for proposal, order, invoice, ...
-        if ($conf->global->MAIN_MULTILANGS && empty($newlang) && isset($object->default_lang)) $newlang = $object->default_lang; // for thirdparty
-        if (!empty($newlang))
-        {
-            $outputlangs = new Translate("", $conf);
-            $outputlangs->setDefaultLang($newlang);
-        }
+		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) $newlang = GETPOST('lang_id', 'aZ09');
+		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && isset($object->thirdparty->default_lang)) $newlang = $object->thirdparty->default_lang; // for proposal, order, invoice, ...
+		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && isset($object->default_lang)) $newlang = $object->default_lang; // for thirdparty
+		if (!empty($newlang))
+		{
+			$outputlangs = new Translate("", $conf);
+			$outputlangs->setDefaultLang($newlang);
+		}
 
-        // To be sure vars is defined
-        if (empty($hidedetails)) $hidedetails = 0;
-        if (empty($hidedesc)) $hidedesc = 0;
-        if (empty($hideref)) $hideref = 0;
-        if (empty($moreparams)) $moreparams = null;
+		// To be sure vars is defined
+		if (empty($hidedetails)) $hidedetails = 0;
+		if (empty($hidedesc)) $hidedesc = 0;
+		if (empty($hideref)) $hideref = 0;
+		if (empty($moreparams)) $moreparams = null;
 
-        $result = $object->generateDocument($object->model_pdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
-        if ($result <= 0)
-        {
-            setEventMessages($object->error, $object->errors, 'errors');
-            $action = '';
-        } else {
-        	if (empty($donotredirect))	// This is set when include is done by bulk action "Bill Orders"
-        	{
-	            setEventMessages($langs->trans("FileGenerated"), null);
+		$result = $object->generateDocument($object->model_pdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
+		if ($result <= 0)
+		{
+			setEventMessages($object->error, $object->errors, 'errors');
+			$action = '';
+		} else {
+			if (empty($donotredirect))	// This is set when include is done by bulk action "Bill Orders"
+			{
+				setEventMessages($langs->trans("FileGenerated"), null);
 
-	            $urltoredirect = $_SERVER['REQUEST_URI'];
-	            $urltoredirect = preg_replace('/#builddoc$/', '', $urltoredirect);
-	            $urltoredirect = preg_replace('/action=builddoc&?/', '', $urltoredirect); // To avoid infinite loop
+				$urltoredirect = $_SERVER['REQUEST_URI'];
+				$urltoredirect = preg_replace('/#builddoc$/', '', $urltoredirect);
+				$urltoredirect = preg_replace('/action=builddoc&?/', '', $urltoredirect); // To avoid infinite loop
 
-	            header('Location: '.$urltoredirect.'#builddoc');
-	            exit;
-        	}
-        }
-    }
+				header('Location: '.$urltoredirect.'#builddoc');
+				exit;
+			}
+		}
+	}
 }
 
 // Delete file in doc form
 if ($action == 'remove_file' && $permissiontoadd)
 {
 	if (!empty($upload_dir)) {
-	    require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-	    if (empty($object->id) || !$object->id > 0)
-	    {
-	        // Reload to get all modified line records and be ready for hooks
-	        $ret = $object->fetch($id);
-	        $ret = $object->fetch_thirdparty();
-	    }
+		if (empty($object->id) || !$object->id > 0)
+		{
+			// Reload to get all modified line records and be ready for hooks
+			$ret = $object->fetch($id);
+			$ret = $object->fetch_thirdparty();
+		}
 
-	    $langs->load("other");
-	    $filetodelete = GETPOST('file', 'alpha');
-	    $file = $upload_dir.'/'.$filetodelete;
-	    $ret = dol_delete_file($file, 0, 0, 0, $object);
-	    if ($ret) setEventMessages($langs->trans("FileWasRemoved", $filetodelete), null, 'mesgs');
-	    else setEventMessages($langs->trans("ErrorFailToDeleteFile", $filetodelete), null, 'errors');
+		$langs->load("other");
+		$filetodelete = GETPOST('file', 'alpha');
+		$file = $upload_dir.'/'.$filetodelete;
+		$ret = dol_delete_file($file, 0, 0, 0, $object);
+		if ($ret) setEventMessages($langs->trans("FileWasRemoved", $filetodelete), null, 'mesgs');
+		else setEventMessages($langs->trans("ErrorFailToDeleteFile", $filetodelete), null, 'errors');
 
-	    // Make a redirect to avoid to keep the remove_file into the url that create side effects
-	    $urltoredirect = $_SERVER['REQUEST_URI'];
-	    $urltoredirect = preg_replace('/#builddoc$/', '', $urltoredirect);
-	    $urltoredirect = preg_replace('/action=remove_file&?/', '', $urltoredirect);
+		// Make a redirect to avoid to keep the remove_file into the url that create side effects
+		$urltoredirect = $_SERVER['REQUEST_URI'];
+		$urltoredirect = preg_replace('/#builddoc$/', '', $urltoredirect);
+		$urltoredirect = preg_replace('/action=remove_file&?/', '', $urltoredirect);
 
-	    header('Location: '.$urltoredirect);
-	    exit;
+		header('Location: '.$urltoredirect);
+		exit;
 	} else {
 		setEventMessages('BugFoundVarUploaddirnotDefined', null, 'errors');
 	}
diff --git a/htdocs/core/actions_changeselectedfields.inc.php b/htdocs/core/actions_changeselectedfields.inc.php
index f4e7f01d234..4daf53891cf 100644
--- a/htdocs/core/actions_changeselectedfields.inc.php
+++ b/htdocs/core/actions_changeselectedfields.inc.php
@@ -30,17 +30,17 @@
 // Save selection
 if (GETPOST('formfilteraction', 'alphanohtml') == 'listafterchangingselectedfields')
 {
-    $tabparam = array();
+	$tabparam = array();
 
-    $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
+	$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 
-    if (GETPOST("selectedfields")) $tabparam["MAIN_SELECTEDFIELDS_".$varpage] = GETPOST("selectedfields");
-    else $tabparam["MAIN_SELECTEDFIELDS_".$varpage] = '';
+	if (GETPOST("selectedfields")) $tabparam["MAIN_SELECTEDFIELDS_".$varpage] = GETPOST("selectedfields");
+	else $tabparam["MAIN_SELECTEDFIELDS_".$varpage] = '';
 
-    include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+	include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
-    $result = dol_set_user_param($db, $conf, $user, $tabparam);
+	$result = dol_set_user_param($db, $conf, $user, $tabparam);
 
-    //$action='list';
-    //var_dump($tabparam);exit;
+	//$action='list';
+	//var_dump($tabparam);exit;
 }
diff --git a/htdocs/core/actions_comments.inc.php b/htdocs/core/actions_comments.inc.php
index 079f207b4a4..f590adee197 100644
--- a/htdocs/core/actions_comments.inc.php
+++ b/htdocs/core/actions_comments.inc.php
@@ -57,19 +57,19 @@ if ($action == 'addcomment')
 }
 if ($action === 'updatecomment')
 {
-    if ($comment->fetch($idcomment) >= 0)
-    {
-        $comment->description = GETPOST('comment_description', 'restricthtml');
-        if ($comment->update($user) > 0)
-        {
-            setEventMessages($langs->trans("CommentAdded"), null, 'mesgs');
-            header('Location: '.$varpage.'?id='.$id.($withproject ? '&withproject=1#comment' : ''));
-            exit;
-        } else {
-            setEventMessages($comment->error, $comment->errors, 'errors');
-            $action = '';
-        }
-    }
+	if ($comment->fetch($idcomment) >= 0)
+	{
+		$comment->description = GETPOST('comment_description', 'restricthtml');
+		if ($comment->update($user) > 0)
+		{
+			setEventMessages($langs->trans("CommentAdded"), null, 'mesgs');
+			header('Location: '.$varpage.'?id='.$id.($withproject ? '&withproject=1#comment' : ''));
+			exit;
+		} else {
+			setEventMessages($comment->error, $comment->errors, 'errors');
+			$action = '';
+		}
+	}
 }
 if ($action == 'deletecomment')
 {
diff --git a/htdocs/core/actions_extrafields.inc.php b/htdocs/core/actions_extrafields.inc.php
index 46a6a31c202..c8c4f4db5d0 100644
--- a/htdocs/core/actions_extrafields.inc.php
+++ b/htdocs/core/actions_extrafields.inc.php
@@ -42,7 +42,7 @@ if ($action == 'add')
 {
 	if ($_POST["button"] != $langs->trans("Cancel"))
 	{
-	    // Check values
+		// Check values
 		if (!$type)
 		{
 			$error++;
@@ -52,156 +52,156 @@ if ($action == 'add')
 		}
 		if ($type == 'varchar' && $extrasize <= 0)
 		{
-		    $error++;
-		    $langs->load("errors");
-		    $mesg[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Size"));
-		    $action = 'edit';
+			$error++;
+			$langs->load("errors");
+			$mesg[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Size"));
+			$action = 'edit';
+		}
+		if ($type == 'varchar' && $extrasize > $maxsizestring)
+		{
+			$error++;
+			$langs->load("errors");
+			$mesg[] = $langs->trans("ErrorSizeTooLongForVarcharType", $maxsizestring);
+			$action = 'create';
+		}
+		if ($type == 'int' && $extrasize > $maxsizeint)
+		{
+			$error++;
+			$langs->load("errors");
+			$mesg[] = $langs->trans("ErrorSizeTooLongForIntType", $maxsizeint);
+			$action = 'create';
+		}
+		if ($type == 'select' && !$param)
+		{
+			$error++;
+			$langs->load("errors");
+			$mesg[] = $langs->trans("ErrorNoValueForSelectType");
+			$action = 'create';
+		}
+		if ($type == 'sellist' && !$param)
+		{
+			$error++;
+			$langs->load("errors");
+			$mesg[] = $langs->trans("ErrorNoValueForSelectListType");
+			$action = 'create';
+		}
+		if ($type == 'checkbox' && !$param)
+		{
+			$error++;
+			$langs->load("errors");
+			$mesg[] = $langs->trans("ErrorNoValueForCheckBoxType");
+			$action = 'create';
+		}
+		if ($type == 'link' && !$param)
+		{
+			$error++;
+			$langs->load("errors");
+			$mesg[] = $langs->trans("ErrorNoValueForLinkType");
+			$action = 'create';
+		}
+		if ($type == 'radio' && !$param)
+		{
+			$error++;
+			$langs->load("errors");
+			$mesg[] = $langs->trans("ErrorNoValueForRadioType");
+			$action = 'create';
+		}
+		if ((($type == 'radio') || ($type == 'checkbox')) && $param)
+		{
+			// Construct array for parameter (value of select list)
+			$parameters = $param;
+			$parameters_array = explode("\r\n", $parameters);
+			foreach ($parameters_array as $param_ligne)
+			{
+				if (!empty($param_ligne)) {
+					if (preg_match_all('/,/', $param_ligne, $matches))
+					{
+						if (count($matches[0]) > 1) {
+							$error++;
+							$langs->load("errors");
+							$mesg[] = $langs->trans("ErrorBadFormatValueList", $param_ligne);
+							$action = 'create';
+						}
+					} else {
+						$error++;
+						$langs->load("errors");
+						$mesg[] = $langs->trans("ErrorBadFormatValueList", $param_ligne);
+						$action = 'create';
+					}
+				}
+			}
 		}
-        if ($type == 'varchar' && $extrasize > $maxsizestring)
-        {
-            $error++;
-            $langs->load("errors");
-            $mesg[] = $langs->trans("ErrorSizeTooLongForVarcharType", $maxsizestring);
-            $action = 'create';
-        }
-        if ($type == 'int' && $extrasize > $maxsizeint)
-        {
-            $error++;
-            $langs->load("errors");
-            $mesg[] = $langs->trans("ErrorSizeTooLongForIntType", $maxsizeint);
-            $action = 'create';
-        }
-        if ($type == 'select' && !$param)
-        {
-        	$error++;
-        	$langs->load("errors");
-        	$mesg[] = $langs->trans("ErrorNoValueForSelectType");
-        	$action = 'create';
-        }
-        if ($type == 'sellist' && !$param)
-        {
-        	$error++;
-        	$langs->load("errors");
-        	$mesg[] = $langs->trans("ErrorNoValueForSelectListType");
-        	$action = 'create';
-        }
-        if ($type == 'checkbox' && !$param)
-        {
-        	$error++;
-        	$langs->load("errors");
-        	$mesg[] = $langs->trans("ErrorNoValueForCheckBoxType");
-        	$action = 'create';
-        }
-        if ($type == 'link' && !$param)
-        {
-        	$error++;
-        	$langs->load("errors");
-        	$mesg[] = $langs->trans("ErrorNoValueForLinkType");
-        	$action = 'create';
-        }
-        if ($type == 'radio' && !$param)
-        {
-        	$error++;
-        	$langs->load("errors");
-        	$mesg[] = $langs->trans("ErrorNoValueForRadioType");
-        	$action = 'create';
-        }
-        if ((($type == 'radio') || ($type == 'checkbox')) && $param)
-        {
-        	// Construct array for parameter (value of select list)
-    		$parameters = $param;
-    		$parameters_array = explode("\r\n", $parameters);
-    		foreach ($parameters_array as $param_ligne)
-    		{
-    			if (!empty($param_ligne)) {
-	    			if (preg_match_all('/,/', $param_ligne, $matches))
-	    			{
-	    				if (count($matches[0]) > 1) {
-	    					$error++;
-	    					$langs->load("errors");
-	    					$mesg[] = $langs->trans("ErrorBadFormatValueList", $param_ligne);
-	    					$action = 'create';
-	    				}
-	    			} else {
-	    				$error++;
-	    				$langs->load("errors");
-	    				$mesg[] = $langs->trans("ErrorBadFormatValueList", $param_ligne);
-	    				$action = 'create';
-	    			}
-    			}
-    		}
-        }
 
-	    if (!$error)
-	    {
-    		// attrname must be alphabetical and lower case only
-    		if (isset($_POST["attrname"]) && preg_match("/^[a-z0-9-_]+$/", $_POST['attrname']) && !is_numeric($_POST["attrname"]))
-    		{
-    			// Construct array for parameter (value of select list)
-        		$default_value = GETPOST('default_value', 'alpha');
-    			$parameters = $param;
-    			$parameters_array = explode("\r\n", $parameters);
-    			//In sellist we have only one line and it can have come to do SQL expression
-    			if ($type == 'sellist') {
-    				foreach ($parameters_array as $param_ligne)
-    				{
-    					$params['options'] = array($parameters=>null);
-    				}
-    			} else {
-    				//Esle it's separated key/value and coma list
-    				foreach ($parameters_array as $param_ligne)
-    				{
-    					list($key, $value) = explode(',', $param_ligne);
-    					$params['options'][$key] = $value;
-    				}
-    			}
+		if (!$error)
+		{
+			// attrname must be alphabetical and lower case only
+			if (isset($_POST["attrname"]) && preg_match("/^[a-z0-9-_]+$/", $_POST['attrname']) && !is_numeric($_POST["attrname"]))
+			{
+				// Construct array for parameter (value of select list)
+				$default_value = GETPOST('default_value', 'alpha');
+				$parameters = $param;
+				$parameters_array = explode("\r\n", $parameters);
+				//In sellist we have only one line and it can have come to do SQL expression
+				if ($type == 'sellist') {
+					foreach ($parameters_array as $param_ligne)
+					{
+						$params['options'] = array($parameters=>null);
+					}
+				} else {
+					//Esle it's separated key/value and coma list
+					foreach ($parameters_array as $param_ligne)
+					{
+						list($key, $value) = explode(',', $param_ligne);
+						$params['options'][$key] = $value;
+					}
+				}
 
-    			// Visibility: -1=not visible by default in list, 1=visible, 0=hidden
-    			$visibility = GETPOST('list', 'alpha');
+				// Visibility: -1=not visible by default in list, 1=visible, 0=hidden
+				$visibility = GETPOST('list', 'alpha');
 				if ($type == 'separate') $visibility = 3;
 
-                $result = $extrafields->addExtraField(
-                	GETPOST('attrname', 'alpha'),
-                	GETPOST('label', 'alpha'),
-                	$type,
-                	GETPOST('pos', 'int'),
-                	$extrasize,
-                	$elementtype,
-                	(GETPOST('unique', 'alpha') ? 1 : 0),
-                	(GETPOST('required', 'alpha') ? 1 : 0),
-                	$default_value,
-                	$params,
-                	(GETPOST('alwayseditable', 'alpha') ? 1 : 0),
-                	(GETPOST('perms', 'alpha') ?GETPOST('perms', 'alpha') : ''),
-                	$visibility,
+				$result = $extrafields->addExtraField(
+					GETPOST('attrname', 'alpha'),
+					GETPOST('label', 'alpha'),
+					$type,
+					GETPOST('pos', 'int'),
+					$extrasize,
+					$elementtype,
+					(GETPOST('unique', 'alpha') ? 1 : 0),
+					(GETPOST('required', 'alpha') ? 1 : 0),
+					$default_value,
+					$params,
+					(GETPOST('alwayseditable', 'alpha') ? 1 : 0),
+					(GETPOST('perms', 'alpha') ?GETPOST('perms', 'alpha') : ''),
+					$visibility,
 					GETPOST('help', 'alpha'),
-                    GETPOST('computed_value', 'alpha'),
-                	(GETPOST('entitycurrentorall', 'alpha') ? 0 : ''),
-                    GETPOST('langfile', 'alpha'),
-                    1,
-                    (GETPOST('totalizable', 'alpha') ? 1 : 0),
-                    GETPOST('printable', 'alpha')
-                );
-    			if ($result > 0)
-    			{
-    				setEventMessages($langs->trans('SetupSaved'), null, 'mesgs');
-    				header("Location: ".$_SERVER["PHP_SELF"]);
-    				exit;
-    			} else {
-                    $error++;
-    			    $mesg = $extrafields->error;
-                    setEventMessages($mesg, null, 'errors');
-    			}
-    		} else {
-                $error++;
-    		    $langs->load("errors");
-    			$mesg = $langs->trans("ErrorFieldCanNotContainSpecialNorUpperCharacters", $langs->transnoentities("AttributeCode"));
-    			setEventMessages($mesg, null, 'errors');
-    			$action = 'create';
-    		}
-	    } else {
-	    	setEventMessages($mesg, null, 'errors');
-	    }
+					GETPOST('computed_value', 'alpha'),
+					(GETPOST('entitycurrentorall', 'alpha') ? 0 : ''),
+					GETPOST('langfile', 'alpha'),
+					1,
+					(GETPOST('totalizable', 'alpha') ? 1 : 0),
+					GETPOST('printable', 'alpha')
+				);
+				if ($result > 0)
+				{
+					setEventMessages($langs->trans('SetupSaved'), null, 'mesgs');
+					header("Location: ".$_SERVER["PHP_SELF"]);
+					exit;
+				} else {
+					$error++;
+					$mesg = $extrafields->error;
+					setEventMessages($mesg, null, 'errors');
+				}
+			} else {
+				$error++;
+				$langs->load("errors");
+				$mesg = $langs->trans("ErrorFieldCanNotContainSpecialNorUpperCharacters", $langs->transnoentities("AttributeCode"));
+				setEventMessages($mesg, null, 'errors');
+				$action = 'create';
+			}
+		} else {
+			setEventMessages($mesg, null, 'errors');
+		}
 	}
 }
 
@@ -210,7 +210,7 @@ if ($action == 'update')
 {
 	if ($_POST["button"] != $langs->trans("Cancel"))
 	{
-        // Check values
+		// Check values
 		if (!$type)
 		{
 			$error++;
@@ -220,147 +220,147 @@ if ($action == 'update')
 		}
 		if ($type == 'varchar' && $extrasize <= 0)
 		{
-		    $error++;
-		    $langs->load("errors");
-		    $mesg[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Size"));
-		    $action = 'edit';
+			$error++;
+			$langs->load("errors");
+			$mesg[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Size"));
+			$action = 'edit';
 		}
 		if ($type == 'varchar' && $extrasize > $maxsizestring)
-        {
-            $error++;
-            $langs->load("errors");
-            $mesg[] = $langs->trans("ErrorSizeTooLongForVarcharType", $maxsizestring);
-            $action = 'edit';
-        }
-        if ($type == 'int' && $extrasize > $maxsizeint)
-        {
-            $error++;
-            $langs->load("errors");
-            $mesg[] = $langs->trans("ErrorSizeTooLongForIntType", $maxsizeint);
-            $action = 'edit';
-        }
-        if ($type == 'select' && !$param)
-        {
-        	$error++;
-        	$langs->load("errors");
-        	$mesg[] = $langs->trans("ErrorNoValueForSelectType");
-        	$action = 'edit';
-        }
-        if ($type == 'sellist' && !$param)
-        {
-        	$error++;
-        	$langs->load("errors");
-        	$mesg[] = $langs->trans("ErrorNoValueForSelectListType");
-        	$action = 'edit';
-        }
-        if ($type == 'checkbox' && !$param)
-        {
-        	$error++;
-        	$langs->load("errors");
-        	$mesg[] = $langs->trans("ErrorNoValueForCheckBoxType");
-        	$action = 'edit';
-        }
-        if ($type == 'radio' && !$param)
-        {
-        	$error++;
-        	$langs->load("errors");
-        	$mesg[] = $langs->trans("ErrorNoValueForRadioType");
-        	$action = 'edit';
-        }
-        if ((($type == 'radio') || ($type == 'checkbox')) && $param)
-        {
-        	// Construct array for parameter (value of select list)
-        	$parameters = $param;
-        	$parameters_array = explode("\r\n", $parameters);
-        	foreach ($parameters_array as $param_ligne)
-        	{
-        		if (!empty($param_ligne)) {
-	        		if (preg_match_all('/,/', $param_ligne, $matches))
-	        		{
-	        			if (count($matches[0]) > 1) {
-	        				$error++;
-	        				$langs->load("errors");
-	        				$mesg[] = $langs->trans("ErrorBadFormatValueList", $param_ligne);
-	        				$action = 'edit';
-	        			}
-	        		} else {
-	        			$error++;
-	        			$langs->load("errors");
-	        			$mesg[] = $langs->trans("ErrorBadFormatValueList", $param_ligne);
-	        			$action = 'edit';
-	        		}
-        		}
-        	}
-        }
+		{
+			$error++;
+			$langs->load("errors");
+			$mesg[] = $langs->trans("ErrorSizeTooLongForVarcharType", $maxsizestring);
+			$action = 'edit';
+		}
+		if ($type == 'int' && $extrasize > $maxsizeint)
+		{
+			$error++;
+			$langs->load("errors");
+			$mesg[] = $langs->trans("ErrorSizeTooLongForIntType", $maxsizeint);
+			$action = 'edit';
+		}
+		if ($type == 'select' && !$param)
+		{
+			$error++;
+			$langs->load("errors");
+			$mesg[] = $langs->trans("ErrorNoValueForSelectType");
+			$action = 'edit';
+		}
+		if ($type == 'sellist' && !$param)
+		{
+			$error++;
+			$langs->load("errors");
+			$mesg[] = $langs->trans("ErrorNoValueForSelectListType");
+			$action = 'edit';
+		}
+		if ($type == 'checkbox' && !$param)
+		{
+			$error++;
+			$langs->load("errors");
+			$mesg[] = $langs->trans("ErrorNoValueForCheckBoxType");
+			$action = 'edit';
+		}
+		if ($type == 'radio' && !$param)
+		{
+			$error++;
+			$langs->load("errors");
+			$mesg[] = $langs->trans("ErrorNoValueForRadioType");
+			$action = 'edit';
+		}
+		if ((($type == 'radio') || ($type == 'checkbox')) && $param)
+		{
+			// Construct array for parameter (value of select list)
+			$parameters = $param;
+			$parameters_array = explode("\r\n", $parameters);
+			foreach ($parameters_array as $param_ligne)
+			{
+				if (!empty($param_ligne)) {
+					if (preg_match_all('/,/', $param_ligne, $matches))
+					{
+						if (count($matches[0]) > 1) {
+							$error++;
+							$langs->load("errors");
+							$mesg[] = $langs->trans("ErrorBadFormatValueList", $param_ligne);
+							$action = 'edit';
+						}
+					} else {
+						$error++;
+						$langs->load("errors");
+						$mesg[] = $langs->trans("ErrorBadFormatValueList", $param_ligne);
+						$action = 'edit';
+					}
+				}
+			}
+		}
 
-	    if (!$error)
-	    {
-            if (isset($_POST["attrname"]) && preg_match("/^\w[a-zA-Z0-9-_]*$/", $_POST['attrname']))
-    		{
-    			$pos = GETPOST('pos', 'int');
-    			// Construct array for parameter (value of select list)
-    			$parameters = $param;
-    			$parameters_array = explode("\r\n", $parameters);
-    			//In sellist we have only one line and it can have come to do SQL expression
-    			if ($type == 'sellist') {
-    				foreach ($parameters_array as $param_ligne)
-    				{
-    					$params['options'] = array($parameters=>null);
-    				}
-    			} else {
-    				//Esle it's separated key/value and coma list
-    				foreach ($parameters_array as $param_ligne)
-    				{
-    					list($key, $value) = explode(',', $param_ligne);
-    					$params['options'][$key] = $value;
-    				}
-    			}
+		if (!$error)
+		{
+			if (isset($_POST["attrname"]) && preg_match("/^\w[a-zA-Z0-9-_]*$/", $_POST['attrname']))
+			{
+				$pos = GETPOST('pos', 'int');
+				// Construct array for parameter (value of select list)
+				$parameters = $param;
+				$parameters_array = explode("\r\n", $parameters);
+				//In sellist we have only one line and it can have come to do SQL expression
+				if ($type == 'sellist') {
+					foreach ($parameters_array as $param_ligne)
+					{
+						$params['options'] = array($parameters=>null);
+					}
+				} else {
+					//Esle it's separated key/value and coma list
+					foreach ($parameters_array as $param_ligne)
+					{
+						list($key, $value) = explode(',', $param_ligne);
+						$params['options'][$key] = $value;
+					}
+				}
 
-    			// Visibility: -1=not visible by default in list, 1=visible, 0=hidden
-    			$visibility = GETPOST('list', 'alpha');
-    			if ($type == 'separate') $visibility = 3;
+				// Visibility: -1=not visible by default in list, 1=visible, 0=hidden
+				$visibility = GETPOST('list', 'alpha');
+				if ($type == 'separate') $visibility = 3;
 
-                $result = $extrafields->update(
-    				GETPOST('attrname', 'alpha'),
-    				GETPOST('label', 'alpha'),
-    				$type,
-    				$extrasize,
-    				$elementtype,
-    				(GETPOST('unique', 'alpha') ? 1 : 0),
-    				(GETPOST('required', 'alpha') ? 1 : 0),
-    				$pos,
-    				$params,
-    				(GETPOST('alwayseditable', 'alpha') ? 1 : 0),
-    				(GETPOST('perms', 'alpha') ?GETPOST('perms', 'alpha') : ''),
-                	$visibility,
+				$result = $extrafields->update(
+					GETPOST('attrname', 'alpha'),
+					GETPOST('label', 'alpha'),
+					$type,
+					$extrasize,
+					$elementtype,
+					(GETPOST('unique', 'alpha') ? 1 : 0),
+					(GETPOST('required', 'alpha') ? 1 : 0),
+					$pos,
+					$params,
+					(GETPOST('alwayseditable', 'alpha') ? 1 : 0),
+					(GETPOST('perms', 'alpha') ?GETPOST('perms', 'alpha') : ''),
+					$visibility,
 					GETPOST('help', 'alpha'),
-    			    GETPOST('default_value', 'alpha'),
-    				GETPOST('computed_value', 'alpha'),
-    				(GETPOST('entitycurrentorall', 'alpha') ? 0 : ''),
-                    GETPOST('langfile'),
-                    1,
-                    (GETPOST('totalizable', 'alpha') ? 1 : 0),
-                    GETPOST('printable', 'alpha')
-    			);
-    			if ($result > 0)
-    			{
-    				setEventMessages($langs->trans('SetupSaved'), null, 'mesgs');
-    				header("Location: ".$_SERVER["PHP_SELF"]);
-    				exit;
-    			} else {
-                    $error++;
-    			    $mesg = $extrafields->error;
-    			    setEventMessages($mesg, null, 'errors');
-    			}
-    		} else {
-    		    $error++;
-    			$langs->load("errors");
-    			$mesg = $langs->trans("ErrorFieldCanNotContainSpecialCharacters", $langs->transnoentities("AttributeCode"));
-    			setEventMessages($mesg, null, 'errors');
-    		}
-	    } else {
-	    	setEventMessages($mesg, null, 'errors');
-	    }
+					GETPOST('default_value', 'alpha'),
+					GETPOST('computed_value', 'alpha'),
+					(GETPOST('entitycurrentorall', 'alpha') ? 0 : ''),
+					GETPOST('langfile'),
+					1,
+					(GETPOST('totalizable', 'alpha') ? 1 : 0),
+					GETPOST('printable', 'alpha')
+				);
+				if ($result > 0)
+				{
+					setEventMessages($langs->trans('SetupSaved'), null, 'mesgs');
+					header("Location: ".$_SERVER["PHP_SELF"]);
+					exit;
+				} else {
+					$error++;
+					$mesg = $extrafields->error;
+					setEventMessages($mesg, null, 'errors');
+				}
+			} else {
+				$error++;
+				$langs->load("errors");
+				$mesg = $langs->trans("ErrorFieldCanNotContainSpecialCharacters", $langs->transnoentities("AttributeCode"));
+				setEventMessages($mesg, null, 'errors');
+			}
+		} else {
+			setEventMessages($mesg, null, 'errors');
+		}
 	}
 }
 
@@ -369,14 +369,14 @@ if ($action == 'delete')
 {
 	if (isset($_GET["attrname"]) && preg_match("/^\w[a-zA-Z0-9-_]*$/", $_GET["attrname"]))
 	{
-        $result = $extrafields->delete($_GET["attrname"], $elementtype);
-        if ($result >= 0)
-        {
-            header("Location: ".$_SERVER["PHP_SELF"]);
-            exit;
-        } else $mesg = $extrafields->error;
+		$result = $extrafields->delete($_GET["attrname"], $elementtype);
+		if ($result >= 0)
+		{
+			header("Location: ".$_SERVER["PHP_SELF"]);
+			exit;
+		} else $mesg = $extrafields->error;
 	} else {
-	    $error++;
+		$error++;
 		$langs->load("errors");
 		$mesg = $langs->trans("ErrorFieldCanNotContainSpecialCharacters", $langs->transnoentities("AttributeCode"));
 	}
diff --git a/htdocs/core/actions_fetchobject.inc.php b/htdocs/core/actions_fetchobject.inc.php
index d4cdbb66a21..c881b335f18 100644
--- a/htdocs/core/actions_fetchobject.inc.php
+++ b/htdocs/core/actions_fetchobject.inc.php
@@ -34,20 +34,20 @@ if (($id > 0 || (!empty($ref) && !in_array($action, array('create', 'createtask'
 	{
 		$ret = $object->fetch($id, $ref);
 		if ($ret > 0)
-	    {
-	        $object->fetch_thirdparty();
-	        $id = $object->id;
-	    } else {
-	    	if (empty($object->error) && !count($object->errors))
-	    	{
-	    		if ($ret < 0)	// if $ret == 0, it means not found.
-	    		{
-	    			setEventMessages('Fetch on object (type '.get_class($object).') return an error without filling $object->error nor $object->errors', null, 'errors');
-	    		}
-	    	} else {
-	    		setEventMessages($object->error, $object->errors, 'errors');
-	    	}
-        	$action = '';
-	    }
+		{
+			$object->fetch_thirdparty();
+			$id = $object->id;
+		} else {
+			if (empty($object->error) && !count($object->errors))
+			{
+				if ($ret < 0)	// if $ret == 0, it means not found.
+				{
+					setEventMessages('Fetch on object (type '.get_class($object).') return an error without filling $object->error nor $object->errors', null, 'errors');
+				}
+			} else {
+				setEventMessages($object->error, $object->errors, 'errors');
+			}
+			$action = '';
+		}
 	}
 }
diff --git a/htdocs/core/actions_linkedfiles.inc.php b/htdocs/core/actions_linkedfiles.inc.php
index 75633c75585..b0671bbf555 100644
--- a/htdocs/core/actions_linkedfiles.inc.php
+++ b/htdocs/core/actions_linkedfiles.inc.php
@@ -29,7 +29,7 @@
 // Submit file/link
 if (GETPOST('sendit', 'alpha') && !empty($conf->global->MAIN_UPLOAD_DOC))
 {
-    if (!empty($_FILES))
+	if (!empty($_FILES))
 	{
 		if (is_array($_FILES['userfile']['tmp_name'])) $userfiles = $_FILES['userfile']['tmp_name'];
 		else $userfiles = array($_FILES['userfile']['tmp_name']);
@@ -65,112 +65,112 @@ if (GETPOST('sendit', 'alpha') && !empty($conf->global->MAIN_UPLOAD_DOC))
 	}
 } elseif (GETPOST('linkit', 'restricthtml') && !empty($conf->global->MAIN_UPLOAD_DOC))
 {
-    $link = GETPOST('link', 'alpha');
-    if ($link)
-    {
-        if (substr($link, 0, 7) != 'http://' && substr($link, 0, 8) != 'https://' && substr($link, 0, 7) != 'file://') {
-            $link = 'http://'.$link;
-        }
-        dol_add_file_process($upload_dir, 0, 1, 'userfile', null, $link, '', 0);
-    }
+	$link = GETPOST('link', 'alpha');
+	if ($link)
+	{
+		if (substr($link, 0, 7) != 'http://' && substr($link, 0, 8) != 'https://' && substr($link, 0, 7) != 'file://') {
+			$link = 'http://'.$link;
+		}
+		dol_add_file_process($upload_dir, 0, 1, 'userfile', null, $link, '', 0);
+	}
 }
 
 
 // Delete file/link
 if ($action == 'confirm_deletefile' && $confirm == 'yes')
 {
-    $urlfile = GETPOST('urlfile', 'alpha', 0, null, null, 1); // Do not use urldecode here ($_GET and $_REQUEST are already decoded by PHP).
-    if (GETPOST('section', 'alpha')) {
-        // For a delete from the ECM module, upload_dir is ECM root dir and urlfile contains relative path from upload_dir
-        $file = $upload_dir.(preg_match('/\/$/', $upload_dir) ? '' : '/').$urlfile;
-    } else // For a delete from the file manager into another module, or from documents pages, upload_dir contains already path to file from module dir, so we clean path into urlfile.
+	$urlfile = GETPOST('urlfile', 'alpha', 0, null, null, 1); // Do not use urldecode here ($_GET and $_REQUEST are already decoded by PHP).
+	if (GETPOST('section', 'alpha')) {
+		// For a delete from the ECM module, upload_dir is ECM root dir and urlfile contains relative path from upload_dir
+		$file = $upload_dir.(preg_match('/\/$/', $upload_dir) ? '' : '/').$urlfile;
+	} else // For a delete from the file manager into another module, or from documents pages, upload_dir contains already path to file from module dir, so we clean path into urlfile.
 	{
-       	$urlfile = basename($urlfile);
-       	$file = $upload_dir.(preg_match('/\/$/', $upload_dir) ? '' : '/').$urlfile;
+	   	$urlfile = basename($urlfile);
+	   	$file = $upload_dir.(preg_match('/\/$/', $upload_dir) ? '' : '/').$urlfile;
 		if (!empty($upload_dirold)) $fileold = $upload_dirold."/".$urlfile;
 	}
-    $linkid = GETPOST('linkid', 'int');
+	$linkid = GETPOST('linkid', 'int');
 
-    if ($urlfile) {
-        // delete of a file
-	    $dir = dirname($file).'/'; // Chemin du dossier contenant l'image d'origine
-        $dirthumb = $dir.'/thumbs/'; // Chemin du dossier contenant la vignette (if file is an image)
+	if ($urlfile) {
+		// delete of a file
+		$dir = dirname($file).'/'; // Chemin du dossier contenant l'image d'origine
+		$dirthumb = $dir.'/thumbs/'; // Chemin du dossier contenant la vignette (if file is an image)
 
-        $ret = dol_delete_file($file, 0, 0, 0, (is_object($object) ? $object : null));
-        if (!empty($fileold)) dol_delete_file($fileold, 0, 0, 0, (is_object($object) ? $object : null)); // Delete file using old path
+		$ret = dol_delete_file($file, 0, 0, 0, (is_object($object) ? $object : null));
+		if (!empty($fileold)) dol_delete_file($fileold, 0, 0, 0, (is_object($object) ? $object : null)); // Delete file using old path
 
-        // Si elle existe, on efface la vignette
-        if (preg_match('/(\.jpg|\.jpeg|\.bmp|\.gif|\.png|\.tiff)$/i', $file, $regs))
-        {
-	        $photo_vignette = basename(preg_replace('/'.$regs[0].'/i', '', $file).'_small'.$regs[0]);
-	        if (file_exists(dol_osencode($dirthumb.$photo_vignette)))
-	        {
-		        dol_delete_file($dirthumb.$photo_vignette);
-	        }
+		// If it exists, remove thumb.
+		$regs = array();
+		if (preg_match('/(\.jpg|\.jpeg|\.bmp|\.gif|\.png|\.tiff)$/i', $file, $regs))
+		{
+			$photo_vignette = basename(preg_replace('/'.$regs[0].'/i', '', $file).'_small'.$regs[0]);
+			if (file_exists(dol_osencode($dirthumb.$photo_vignette)))
+			{
+				dol_delete_file($dirthumb.$photo_vignette);
+			}
 
-	        $photo_vignette = basename(preg_replace('/'.$regs[0].'/i', '', $file).'_mini'.$regs[0]);
-	        if (file_exists(dol_osencode($dirthumb.$photo_vignette)))
-	        {
-		        dol_delete_file($dirthumb.$photo_vignette);
-	        }
-        }
+			$photo_vignette = basename(preg_replace('/'.$regs[0].'/i', '', $file).'_mini'.$regs[0]);
+			if (file_exists(dol_osencode($dirthumb.$photo_vignette)))
+			{
+				dol_delete_file($dirthumb.$photo_vignette);
+			}
+		}
 
-        if ($ret) {
-            setEventMessages($langs->trans("FileWasRemoved", $urlfile), null, 'mesgs');
-        } else {
-            setEventMessages($langs->trans("ErrorFailToDeleteFile", $urlfile), null, 'errors');
-        }
-    } elseif ($linkid)	// delete of external link
-    {
-        require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-        $link = new Link($db);
-        $link->fetch($linkid);
-        $res = $link->delete($user);
+		if ($ret) {
+			setEventMessages($langs->trans("FileWasRemoved", $urlfile), null, 'mesgs');
+		} else {
+			setEventMessages($langs->trans("ErrorFailToDeleteFile", $urlfile), null, 'errors');
+		}
+	} elseif ($linkid) {	// delete of external link
+		require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
+		$link = new Link($db);
+		$link->fetch($linkid);
+		$res = $link->delete($user);
 
-        $langs->load('link');
-        if ($res > 0) {
-            setEventMessages($langs->trans("LinkRemoved", $link->label), null, 'mesgs');
-        } else {
-            if (count($link->errors)) {
-                setEventMessages('', $link->errors, 'errors');
-            } else {
-                setEventMessages($langs->trans("ErrorFailedToDeleteLink", $link->label), null, 'errors');
-            }
-        }
-    }
+		$langs->load('link');
+		if ($res > 0) {
+			setEventMessages($langs->trans("LinkRemoved", $link->label), null, 'mesgs');
+		} else {
+			if (count($link->errors)) {
+				setEventMessages('', $link->errors, 'errors');
+			} else {
+				setEventMessages($langs->trans("ErrorFailedToDeleteLink", $link->label), null, 'errors');
+			}
+		}
+	}
 
-    if (is_object($object) && $object->id > 0) {
-        if ($backtopage) {
-        	header('Location: '.$backtopage);
-            exit;
-        } else {
-        	$tmpurl = $_SERVER["PHP_SELF"].'?id='.$object->id.(GETPOST('section_dir', 'alpha') ? '&section_dir='.urlencode(GETPOST('section_dir', 'alpha')) : '').(!empty($withproject) ? '&withproject=1' : '');
-        	header('Location: '.$tmpurl);
-            exit;
-        }
-    }
+	if (is_object($object) && $object->id > 0) {
+		if ($backtopage) {
+			header('Location: '.$backtopage);
+			exit;
+		} else {
+			$tmpurl = $_SERVER["PHP_SELF"].'?id='.$object->id.(GETPOST('section_dir', 'alpha') ? '&section_dir='.urlencode(GETPOST('section_dir', 'alpha')) : '').(!empty($withproject) ? '&withproject=1' : '');
+			header('Location: '.$tmpurl);
+			exit;
+		}
+	}
 } elseif ($action == 'confirm_updateline' && GETPOST('save', 'alpha') && GETPOST('link', 'alpha'))
 {
-    require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-    $langs->load('link');
-    $link = new Link($db);
-    $f = $link->fetch(GETPOST('linkid', 'int'));
-    if ($f)
-    {
-        $link->url = GETPOST('link', 'alpha');
-        if (substr($link->url, 0, 7) != 'http://' && substr($link->url, 0, 8) != 'https://' && substr($link->url, 0, 7) != 'file://')
-        {
-            $link->url = 'http://'.$link->url;
-        }
-        $link->label = GETPOST('label', 'alphanohtml');
-        $res = $link->update($user);
-        if (!$res)
-        {
-            setEventMessages($langs->trans("ErrorFailedToUpdateLink", $link->label), null, 'mesgs');
-        }
-    } else {
-        //error fetching
-    }
+	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
+	$langs->load('link');
+	$link = new Link($db);
+	$f = $link->fetch(GETPOST('linkid', 'int'));
+	if ($f)
+	{
+		$link->url = GETPOST('link', 'alpha');
+		if (substr($link->url, 0, 7) != 'http://' && substr($link->url, 0, 8) != 'https://' && substr($link->url, 0, 7) != 'file://')
+		{
+			$link->url = 'http://'.$link->url;
+		}
+		$link->label = GETPOST('label', 'alphanohtml');
+		$res = $link->update($user);
+		if (!$res)
+		{
+			setEventMessages($langs->trans("ErrorFailedToUpdateLink", $link->label), null, 'mesgs');
+		}
+	} else {
+		//error fetching
+	}
 } elseif ($action == 'renamefile' && GETPOST('renamefilesave', 'alpha'))
 {
 	// For documents pages, upload_dir contains already path to file from module dir, so we clean path into urlfile.
@@ -179,97 +179,101 @@ if ($action == 'confirm_deletefile' && $confirm == 'yes')
 		$filenamefrom = dol_sanitizeFileName(GETPOST('renamefilefrom', 'alpha'), '_', 0); // Do not remove accents
 		$filenameto = dol_sanitizeFileName(GETPOST('renamefileto', 'alpha'), '_', 0); // Do not remove accents
 
-        if ($filenamefrom != $filenameto)
-        {
-	        // Security:
-	        // Disallow file with some extensions. We rename them.
-	        // Because if we put the documents directory into a directory inside web root (very bad), this allows to execute on demand arbitrary code.
-	        if (isAFileWithExecutableContent($filenameto) && empty($conf->global->MAIN_DOCUMENT_IS_OUTSIDE_WEBROOT_SO_NOEXE_NOT_REQUIRED))
-	        {
-	        	// $upload_dir ends with a slash, so be must be sure the medias dir to compare to ends with slash too.
-	        	$publicmediasdirwithslash = $conf->medias->multidir_output[$conf->entity];
-	        	if (! preg_match('/\/$/', $publicmediasdirwithslash)) $publicmediasdirwithslash.='/';
+		// We apply dol_string_nohtmltag also to clean file names (this remove duplicate spaces) because
+		// this function is also applied when we upload and when we make try to download file (by the GETPOST(filename, 'alphanohtml') call).
+		$filenameto = dol_string_nohtmltag($filenameto);
 
-	        	if (strpos($upload_dir, $publicmediasdirwithslash) !== 0) {	// We never add .noexe on files into media directory
-		            $filenameto .= '.noexe';
-	        	}
-	        }
+		if ($filenamefrom != $filenameto)
+		{
+			// Security:
+			// Disallow file with some extensions. We rename them.
+			// Because if we put the documents directory into a directory inside web root (very bad), this allows to execute on demand arbitrary code.
+			if (isAFileWithExecutableContent($filenameto) && empty($conf->global->MAIN_DOCUMENT_IS_OUTSIDE_WEBROOT_SO_NOEXE_NOT_REQUIRED))
+			{
+				// $upload_dir ends with a slash, so be must be sure the medias dir to compare to ends with slash too.
+				$publicmediasdirwithslash = $conf->medias->multidir_output[$conf->entity];
+				if (!preg_match('/\/$/', $publicmediasdirwithslash)) $publicmediasdirwithslash .= '/';
 
-	        if ($filenamefrom && $filenameto)
-	        {
-	            $srcpath = $upload_dir.'/'.$filenamefrom;
-	            $destpath = $upload_dir.'/'.$filenameto;
+				if (strpos($upload_dir, $publicmediasdirwithslash) !== 0) {	// We never add .noexe on files into media directory
+					$filenameto .= '.noexe';
+				}
+			}
 
-	            $reshook = $hookmanager->initHooks(array('actionlinkedfiles'));
-	            $parameters = array('filenamefrom' => $filenamefrom, 'filenameto' => $filenameto, 'upload_dir' => $upload_dir);
-	            $reshook = $hookmanager->executeHooks('renameUploadedFile', $parameters, $object);
+			if ($filenamefrom && $filenameto)
+			{
+				$srcpath = $upload_dir.'/'.$filenamefrom;
+				$destpath = $upload_dir.'/'.$filenameto;
 
-	            if (empty($reshook))
-	            {
-	            	if (preg_match('/^\./', $filenameto)) {
-	            		$langs->load("errors"); // lang must be loaded because we can't rely on loading during output, we need var substitution to be done now.
-	            		setEventMessages($langs->trans("ErrorFilenameCantStartWithDot", $filenameto), null, 'errors');
-	            	} elseif (!file_exists($destpath)) {
-	            		$result = dol_move($srcpath, $destpath);
-			            if ($result)
-			            {
-			            	// Define if we have to generate thumbs or not
-			            	$generatethumbs = 1;
-			            	// When we rename a file from the file manager in ecm, we must not regenerate thumbs (not a problem, we do pass here)
-			            	// When we rename a file from the website module, we must not regenerate thumbs (module = medias in such a case)
-			            	// but when we rename from a tab "Documents", we must regenerate thumbs
-			            	if (GETPOST('modulepart') == 'medias') $generatethumbs = 0;
+				$reshook = $hookmanager->initHooks(array('actionlinkedfiles'));
+				$parameters = array('filenamefrom' => $filenamefrom, 'filenameto' => $filenameto, 'upload_dir' => $upload_dir);
+				$reshook = $hookmanager->executeHooks('renameUploadedFile', $parameters, $object);
 
-			            	if ($generatethumbs)
-			            	{
-			            		if ($object->id)
-				            	{
-				                	$object->addThumbs($destpath);
-				            	}
+				if (empty($reshook))
+				{
+					if (preg_match('/^\./', $filenameto)) {
+						$langs->load("errors"); // lang must be loaded because we can't rely on loading during output, we need var substitution to be done now.
+						setEventMessages($langs->trans("ErrorFilenameCantStartWithDot", $filenameto), null, 'errors');
+					} elseif (!file_exists($destpath)) {
+						$result = dol_move($srcpath, $destpath);
+						if ($result)
+						{
+							// Define if we have to generate thumbs or not
+							$generatethumbs = 1;
+							// When we rename a file from the file manager in ecm, we must not regenerate thumbs (not a problem, we do pass here)
+							// When we rename a file from the website module, we must not regenerate thumbs (module = medias in such a case)
+							// but when we rename from a tab "Documents", we must regenerate thumbs
+							if (GETPOST('modulepart') == 'medias') $generatethumbs = 0;
 
-				                // TODO Add revert function of addThumbs to remove thumbs with old name
-				                //$object->delThumbs($srcpath);
-			            	}
+							if ($generatethumbs)
+							{
+								if ($object->id)
+								{
+									$object->addThumbs($destpath);
+								}
 
-			                setEventMessages($langs->trans("FileRenamed"), null);
-			            } else {
-			                $langs->load("errors"); // lang must be loaded because we can't rely on loading during output, we need var substitution to be done now.
-			                setEventMessages($langs->trans("ErrorFailToRenameFile", $filenamefrom, $filenameto), null, 'errors');
-			            }
-	            	} else {
-	            		$langs->load("errors"); // lang must be loaded because we can't rely on loading during output, we need var substitution to be done now.
-	            		setEventMessages($langs->trans("ErrorDestinationAlreadyExists", $filenameto), null, 'errors');
-	            	}
-	            }
-	        }
-        }
-    }
+								// TODO Add revert function of addThumbs to remove thumbs with old name
+								//$object->delThumbs($srcpath);
+							}
 
-    // Update properties in ECM table
-    if (GETPOST('ecmfileid', 'int') > 0)
-    {
-    	$shareenabled = GETPOST('shareenabled', 'alpha');
+							setEventMessages($langs->trans("FileRenamed"), null);
+						} else {
+							$langs->load("errors"); // lang must be loaded because we can't rely on loading during output, we need var substitution to be done now.
+							setEventMessages($langs->trans("ErrorFailToRenameFile", $filenamefrom, $filenameto), null, 'errors');
+						}
+					} else {
+						$langs->load("errors"); // lang must be loaded because we can't rely on loading during output, we need var substitution to be done now.
+						setEventMessages($langs->trans("ErrorDestinationAlreadyExists", $filenameto), null, 'errors');
+					}
+				}
+			}
+		}
+	}
 
-    	include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
-	    $ecmfile = new EcmFiles($db);
-	    $result = $ecmfile->fetch(GETPOST('ecmfileid', 'int'));
-	    if ($result > 0)
-	    {
-	    	if ($shareenabled)
-		    {
-		    	if (empty($ecmfile->share))
-		    	{
-		    		require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
-		    		$ecmfile->share = getRandomPassword(true);
-		    	}
-		    } else {
-		    	$ecmfile->share = '';
-		    }
-		    $result = $ecmfile->update($user);
-		    if ($result < 0)
-		    {
-		    	setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
-		    }
-	    }
-    }
+	// Update properties in ECM table
+	if (GETPOST('ecmfileid', 'int') > 0)
+	{
+		$shareenabled = GETPOST('shareenabled', 'alpha');
+
+		include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
+		$ecmfile = new EcmFiles($db);
+		$result = $ecmfile->fetch(GETPOST('ecmfileid', 'int'));
+		if ($result > 0)
+		{
+			if ($shareenabled)
+			{
+				if (empty($ecmfile->share))
+				{
+					require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
+					$ecmfile->share = getRandomPassword(true);
+				}
+			} else {
+				$ecmfile->share = '';
+			}
+			$result = $ecmfile->update($user);
+			if ($result < 0)
+			{
+				setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
+			}
+		}
+	}
 }
diff --git a/htdocs/core/actions_massactions.inc.php b/htdocs/core/actions_massactions.inc.php
index c2f0a314445..356eb36a04b 100644
--- a/htdocs/core/actions_massactions.inc.php
+++ b/htdocs/core/actions_massactions.inc.php
@@ -114,11 +114,11 @@ if (!$error && $massaction == 'confirm_presend')
 					}
 				}
 
-                $listofobjectthirdparties[$thirdpartyid] = $thirdpartyid;
-                $listofobjectref[$thirdpartyid][$toselectid] = $objecttmp;
-            }
-        }
-    }
+				$listofobjectthirdparties[$thirdpartyid] = $thirdpartyid;
+				$listofobjectref[$thirdpartyid][$toselectid] = $objecttmp;
+			}
+		}
+	}
 
 	// Check mandatory parameters
 	if (GETPOST('fromtype', 'alpha') === 'user' && empty($user->email))
@@ -261,9 +261,9 @@ if (!$error && $massaction == 'confirm_presend')
 						$sendto = $fuser->email;
 					} elseif ($objectobj->element == 'holiday')
 					{
-					    $fuser = new User($db);
-					    $fuser->fetch($objectobj->fk_user);
-					    $sendto = $fuser->email;
+						$fuser = new User($db);
+						$fuser->fetch($objectobj->fk_user);
+						$sendto = $fuser->email;
 					} elseif ($objectobj->element == 'facture' && !empty($listofobjectcontacts[$objectid]))
 					{
 						$emails_to_sends = array();
@@ -396,7 +396,7 @@ if (!$error && $massaction == 'confirm_presend')
 					$looparray = $listofqualifiedobj;
 					foreach ($looparray as $key => $objecttmp)
 					{
-					    $looparray[$key]->thirdparty = $thirdparty; // Force thirdparty on object
+						$looparray[$key]->thirdparty = $thirdparty; // Force thirdparty on object
 					}
 				} else {
 					$objectforloop = new $objectclass($db);
@@ -404,9 +404,9 @@ if (!$error && $massaction == 'confirm_presend')
 					$looparray[0] = $objectforloop;
 				}
 				//var_dump($looparray);exit;
-                dol_syslog("We have set an array of ".count($looparray)." emails to send. oneemailperrecipient=".$oneemailperrecipient);
-                //var_dump($oneemailperrecipient); var_dump($listofqualifiedobj); var_dump($listofqualifiedref);
-                foreach ($looparray as $objectid => $objecttmp)		// $objecttmp is a real object or an empty object if we choose to send one email per thirdparty instead of one per object
+				dol_syslog("We have set an array of ".count($looparray)." emails to send. oneemailperrecipient=".$oneemailperrecipient);
+				//var_dump($oneemailperrecipient); var_dump($listofqualifiedobj); var_dump($listofqualifiedref);
+				foreach ($looparray as $objectid => $objecttmp)		// $objecttmp is a real object or an empty object if we choose to send one email per thirdparty instead of one per object
 				{
 					// Make substitution in email content
 					if (!empty($conf->projet->enabled) && method_exists($objecttmp, 'fetch_projet') && is_null($objecttmp->project))
@@ -430,10 +430,10 @@ if (!$error && $massaction == 'confirm_presend')
 
 					complete_substitutions_array($substitutionarray, $langs, $objecttmp, $parameters);
 
-                    $subjectreplaced = make_substitutions($subject, $substitutionarray);
-                    $messagereplaced = make_substitutions($message, $substitutionarray);
+					$subjectreplaced = make_substitutions($subject, $substitutionarray);
+					$messagereplaced = make_substitutions($message, $substitutionarray);
 
-                    $attachedfiles = array('paths'=>array(), 'names'=>array(), 'mimes'=>array());
+					$attachedfiles = array('paths'=>array(), 'names'=>array(), 'mimes'=>array());
 					if ($oneemailperrecipient)
 					{
 						// if "one email per recipient" is check we must collate $attachedfiles by thirdparty
@@ -461,20 +461,20 @@ if (!$error && $massaction == 'confirm_presend')
 					// Define the trackid when emails sent from the mass action
 					if ($oneemailperrecipient)
 					{
-					    $trackid = 'thi'.$thirdparty->id;
-					    if ($objecttmp->element == 'expensereport') $trackid = 'use'.$thirdparty->id;
-					    if ($objecttmp->element == 'holiday') $trackid = 'use'.$thirdparty->id;
+						$trackid = 'thi'.$thirdparty->id;
+						if ($objecttmp->element == 'expensereport') $trackid = 'use'.$thirdparty->id;
+						if ($objecttmp->element == 'holiday') $trackid = 'use'.$thirdparty->id;
 					} else {
-					    $trackid = strtolower(get_class($objecttmp));
-					    if (get_class($objecttmp) == 'Contrat')  $trackid = 'con';
-					    if (get_class($objecttmp) == 'Propal')   $trackid = 'pro';
-					    if (get_class($objecttmp) == 'Commande') $trackid = 'ord';
-					    if (get_class($objecttmp) == 'Facture')  $trackid = 'inv';
-					    if (get_class($objecttmp) == 'Supplier_Proposal')   $trackid = 'spr';
-					    if (get_class($objecttmp) == 'CommandeFournisseur') $trackid = 'sor';
-					    if (get_class($objecttmp) == 'FactureFournisseur')  $trackid = 'sin';
+						$trackid = strtolower(get_class($objecttmp));
+						if (get_class($objecttmp) == 'Contrat')  $trackid = 'con';
+						if (get_class($objecttmp) == 'Propal')   $trackid = 'pro';
+						if (get_class($objecttmp) == 'Commande') $trackid = 'ord';
+						if (get_class($objecttmp) == 'Facture')  $trackid = 'inv';
+						if (get_class($objecttmp) == 'Supplier_Proposal')   $trackid = 'spr';
+						if (get_class($objecttmp) == 'CommandeFournisseur') $trackid = 'sor';
+						if (get_class($objecttmp) == 'FactureFournisseur')  $trackid = 'sin';
 
-					    $trackid .= $objecttmp->id;
+						$trackid .= $objecttmp->id;
 					}
 					//var_dump($filepath);
 					//var_dump($trackid);exit;
@@ -483,8 +483,8 @@ if (!$error && $massaction == 'confirm_presend')
 					if (empty($sendcontext)) $sendcontext = 'standard';
 
 					// Send mail (substitutionarray must be done just before this)
-                    require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
-                    $mailfile = new CMailFile($subjectreplaced, $sendto, $from, $messagereplaced, $filepath, $mimetype, $filename, $sendtocc, $sendtobcc, $deliveryreceipt, -1, '', '', $trackid, '', $sendcontext);
+					require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
+					$mailfile = new CMailFile($subjectreplaced, $sendto, $from, $messagereplaced, $filepath, $mimetype, $filename, $sendtocc, $sendtobcc, $deliveryreceipt, -1, '', '', $trackid, '', $sendcontext);
 					if ($mailfile->error)
 					{
 						$resaction .= '<div class="error">'.$mailfile->error.'</div>';
@@ -497,11 +497,11 @@ if (!$error && $massaction == 'confirm_presend')
 							$error = 0;
 
 							// Insert logs into agenda
-                            foreach ($listofqualifiedobj as $objid2 => $objectobj2)
+							foreach ($listofqualifiedobj as $objid2 => $objectobj2)
 							{
-                                if ((!$oneemailperrecipient) && $objid2 != $objectid) continue; // We discard this pass to avoid duplicate with other pass in looparray at higher level
+								if ((!$oneemailperrecipient) && $objid2 != $objectid) continue; // We discard this pass to avoid duplicate with other pass in looparray at higher level
 
-                                dol_syslog("Try to insert email event into agenda for objid=".$objid2." => objectobj=".get_class($objectobj2));
+								dol_syslog("Try to insert email event into agenda for objid=".$objid2." => objectobj=".get_class($objectobj2));
 
 								/*if ($objectclass == 'Propale') $actiontypecode='AC_PROP';
 	                            if ($objectclass == 'Commande') $actiontypecode='AC_COM';
@@ -514,18 +514,18 @@ if (!$error && $massaction == 'confirm_presend')
 								if ($message)
 								{
 									if ($sendtocc) $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('Bcc').": ".$sendtocc);
-                                    $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('MailTopic').": ".$subjectreplaced);
+									$actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('MailTopic').": ".$subjectreplaced);
 									$actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('TextUsedInTheMessageBody').":");
-                                    $actionmsg = dol_concatdesc($actionmsg, $messagereplaced);
+									$actionmsg = dol_concatdesc($actionmsg, $messagereplaced);
 								}
 								$actionmsg2 = '';
 
-                                // Initialisation donnees
-                                $objectobj2->sendtoid = (empty($contactidtosend) ? 0 : $contactidtosend);
-                                $objectobj2->actionmsg = $actionmsg; // Long text
-                                $objectobj2->actionmsg2		= $actionmsg2; // Short text
-                                $objectobj2->fk_element		= $objid2;
-                                $objectobj2->elementtype	= $objectobj2->element;
+								// Initialisation donnees
+								$objectobj2->sendtoid = (empty($contactidtosend) ? 0 : $contactidtosend);
+								$objectobj2->actionmsg = $actionmsg; // Long text
+								$objectobj2->actionmsg2		= $actionmsg2; // Short text
+								$objectobj2->fk_element		= $objid2;
+								$objectobj2->elementtype	= $objectobj2->element;
 
 								$triggername = strtoupper(get_class($objectobj2)).'_SENTBYMAIL';
 								if ($triggername == 'SOCIETE_SENTBYMAIL')    $triggername = 'COMPANY_SENTBYMAIL';
@@ -619,13 +619,13 @@ if ($massaction == 'confirm_createbills')   // Create bills from orders
 			$objecttmp->cond_reglement_id	= $cmd->cond_reglement_id;
 			$objecttmp->mode_reglement_id	= $cmd->mode_reglement_id;
 			$objecttmp->fk_project = $cmd->fk_project;
-            $objecttmp->multicurrency_code = $cmd->multicurrency_code;
-            if (empty($createbills_onebythird)) $objecttmp->ref_client = $cmd->ref_client;
+			$objecttmp->multicurrency_code = $cmd->multicurrency_code;
+			if (empty($createbills_onebythird)) $objecttmp->ref_client = $cmd->ref_client;
 
-            $datefacture = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
-            if (empty($datefacture))
+			$datefacture = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
+			if (empty($datefacture))
 			{
-			    $datefacture = dol_now();
+				$datefacture = dol_now();
 			}
 
 			$objecttmp->date = $datefacture;
@@ -676,7 +676,7 @@ if ($massaction == 'confirm_createbills')   // Create bills from orders
 					// If we build one invoice for several order, we must put the invoice of order on the line
 					if (!empty($createbills_onebythird))
 					{
-					    $desc = dol_concatdesc($desc, $langs->trans("Order").' '.$cmd->ref.' - '.dol_print_date($cmd->date, 'day'));
+						$desc = dol_concatdesc($desc, $langs->trans("Order").' '.$cmd->ref.' - '.dol_print_date($cmd->date, 'day'));
 					}
 
 					if ($lines[$i]->subprice < 0)
@@ -807,7 +807,7 @@ if ($massaction == 'confirm_createbills')   // Create bills from orders
 
 			// Call action to build doc
 			$savobject = $object;
-      			$object = $objecttmp;
+	  			$object = $objecttmp;
 			include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
 			$object = $savobject;
 		}
@@ -818,7 +818,7 @@ if ($massaction == 'confirm_createbills')   // Create bills from orders
 	if (!$error)
 	{
 		$db->commit();
-        setEventMessages($langs->trans('BillCreated', $nb_bills_created), null, 'mesgs');
+		setEventMessages($langs->trans('BillCreated', $nb_bills_created), null, 'mesgs');
 
 		// Make a redirect to avoid to bill twice if we make a refresh or back
 		$param = '';
@@ -1063,7 +1063,7 @@ if (!$error && $massaction == "builddoc" && $permissiontoread && !GETPOST('butto
 			$langs->load("exports");
 			setEventMessages($langs->trans('FileSuccessfullyBuilt', $filename.'_'.dol_print_date($now, 'dayhourlog')), null, 'mesgs');
 		} else {
-            setEventMessages($langs->trans('NoPDFAvailableForDocGenAmongChecked'), null, 'errors');
+			setEventMessages($langs->trans('NoPDFAvailableForDocGenAmongChecked'), null, 'errors');
 		}
 	}
 }
@@ -1143,34 +1143,34 @@ if (!$error && $massaction == 'validate' && $permissiontoadd)
 
 // Closed records
 if (!$error && $massaction == 'closed' && $objectclass == "Propal" && $permissiontoclose) {
-    $db->begin();
+	$db->begin();
 
-    $objecttmp = new $objectclass($db);
-    $nbok = 0;
-    foreach ($toselect as $toselectid) {
-        $result = $objecttmp->fetch($toselectid);
-        if ($result > 0) {
-            $result = $objecttmp->cloture($user, 3);
-            if ($result <= 0) {
-                setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
-                $error++;
-                break;
-            } else $nbok++;
-        } else {
-            setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
-            $error++;
-            break;
-        }
-    }
+	$objecttmp = new $objectclass($db);
+	$nbok = 0;
+	foreach ($toselect as $toselectid) {
+		$result = $objecttmp->fetch($toselectid);
+		if ($result > 0) {
+			$result = $objecttmp->cloture($user, 3);
+			if ($result <= 0) {
+				setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
+				$error++;
+				break;
+			} else $nbok++;
+		} else {
+			setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
+			$error++;
+			break;
+		}
+	}
 
-    if (!$error) {
-        if ($nbok > 1)
-            setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
-        else setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
-        $db->commit();
-    } else {
-        $db->rollback();
-    }
+	if (!$error) {
+		if ($nbok > 1)
+			setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
+		else setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
+		$db->commit();
+	} else {
+		$db->rollback();
+	}
 }
 
 //var_dump($_POST);var_dump($massaction);exit;
@@ -1213,9 +1213,9 @@ if (!$error && ($massaction == 'delete' || ($action == 'delete' && $confirm == '
 
 			if ($result <= 0)
 			{
-			    setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
-			    $error++;
-			    break;
+				setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
+				$error++;
+				break;
 			} else $nbok++;
 		} else {
 			setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
@@ -1239,56 +1239,56 @@ if (!$error && ($massaction == 'delete' || ($action == 'delete' && $confirm == '
 // @todo : propose model selection
 if (!$error && $massaction == 'generate_doc' && $permissiontoread)
 {
-    $db->begin();
+	$db->begin();
 
-    $objecttmp = new $objectclass($db);
-    $nbok = 0;
-    foreach ($toselect as $toselectid)
-    {
-        $result = $objecttmp->fetch($toselectid);
-        if ($result > 0)
-        {
-            $outputlangs = $langs;
-            $newlang = '';
+	$objecttmp = new $objectclass($db);
+	$nbok = 0;
+	foreach ($toselect as $toselectid)
+	{
+		$result = $objecttmp->fetch($toselectid);
+		if ($result > 0)
+		{
+			$outputlangs = $langs;
+			$newlang = '';
 
-            if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) $newlang = GETPOST('lang_id', 'aZ09');
-            if ($conf->global->MAIN_MULTILANGS && empty($newlang) && isset($objecttmp->thirdparty->default_lang)) $newlang = $objecttmp->thirdparty->default_lang; // for proposal, order, invoice, ...
-            if ($conf->global->MAIN_MULTILANGS && empty($newlang) && isset($objecttmp->default_lang)) $newlang = $objecttmp->default_lang; // for thirdparty
-            if (!empty($newlang))
-            {
-                $outputlangs = new Translate("", $conf);
-                $outputlangs->setDefaultLang($newlang);
-            }
+			if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) $newlang = GETPOST('lang_id', 'aZ09');
+			if ($conf->global->MAIN_MULTILANGS && empty($newlang) && isset($objecttmp->thirdparty->default_lang)) $newlang = $objecttmp->thirdparty->default_lang; // for proposal, order, invoice, ...
+			if ($conf->global->MAIN_MULTILANGS && empty($newlang) && isset($objecttmp->default_lang)) $newlang = $objecttmp->default_lang; // for thirdparty
+			if (!empty($newlang))
+			{
+				$outputlangs = new Translate("", $conf);
+				$outputlangs->setDefaultLang($newlang);
+			}
 
-            // To be sure vars is defined
-            if (empty($hidedetails)) $hidedetails = 0;
-            if (empty($hidedesc)) $hidedesc = 0;
-            if (empty($hideref)) $hideref = 0;
-            if (empty($moreparams)) $moreparams = null;
+			// To be sure vars is defined
+			if (empty($hidedetails)) $hidedetails = 0;
+			if (empty($hidedesc)) $hidedesc = 0;
+			if (empty($hideref)) $hideref = 0;
+			if (empty($moreparams)) $moreparams = null;
 
-            $result = $objecttmp->generateDocument($objecttmp->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
+			$result = $objecttmp->generateDocument($objecttmp->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
 
-            if ($result <= 0)
-            {
-                setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
-                $error++;
-                break;
-            } else $nbok++;
-        } else {
-            setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
-            $error++;
-            break;
-        }
-    }
+			if ($result <= 0)
+			{
+				setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
+				$error++;
+				break;
+			} else $nbok++;
+		} else {
+			setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
+			$error++;
+			break;
+		}
+	}
 
-    if (!$error)
-    {
-        if ($nbok > 1) setEventMessages($langs->trans("RecordsGenerated", $nbok), null, 'mesgs');
-        else setEventMessages($langs->trans("RecordGenerated", $nbok), null, 'mesgs');
-        $db->commit();
-    } else {
-        $db->rollback();
-    }
+	if (!$error)
+	{
+		if ($nbok > 1) setEventMessages($langs->trans("RecordsGenerated", $nbok), null, 'mesgs');
+		else setEventMessages($langs->trans("RecordGenerated", $nbok), null, 'mesgs');
+		$db->commit();
+	} else {
+		$db->rollback();
+	}
 }
 
 $parameters['toselect'] = $toselect;
diff --git a/htdocs/core/actions_printing.inc.php b/htdocs/core/actions_printing.inc.php
index 3137c93a9c5..3838e6963ab 100644
--- a/htdocs/core/actions_printing.inc.php
+++ b/htdocs/core/actions_printing.inc.php
@@ -33,7 +33,7 @@ if ($action == 'print_file' && $user->rights->printing->read) {
 	require_once DOL_DOCUMENT_ROOT.'/core/modules/printing/modules_printing.php';
 	$objectprint = new PrintingDriver($db);
 	$list = $objectprint->listDrivers($db, 10);
-    $dirmodels = array_merge(array('/core/modules/printing/'), (array) $conf->modules_parts['printing']);
+	$dirmodels = array_merge(array('/core/modules/printing/'), (array) $conf->modules_parts['printing']);
 	if (!empty($list)) {
 		$errorprint = 0;
 		$printerfound = 0;
diff --git a/htdocs/core/actions_sendmails.inc.php b/htdocs/core/actions_sendmails.inc.php
index f3c72257670..0be919de0dd 100644
--- a/htdocs/core/actions_sendmails.inc.php
+++ b/htdocs/core/actions_sendmails.inc.php
@@ -477,7 +477,7 @@ if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST
 						$mesg .= $langs->transnoentities('ErrorFailedToSendMail', dol_escape_htmltag($from), dol_escape_htmltag($sendto));
 						$mesg .= '<br>'.$mailfile->error;
 					} else {
-						$mesg .= $langs->transnoentities('ErrorFailedToSendMail', dol_escape_htmltag($from), dol_escape_htmltag($sendto));;
+						$mesg .= $langs->transnoentities('ErrorFailedToSendMail', dol_escape_htmltag($from), dol_escape_htmltag($sendto));
 						if (!empty($conf->global->MAIN_DISABLE_ALL_MAILS)) {
 							$mesg .= '<br>Feature is disabled by option MAIN_DISABLE_ALL_MAILS';
 						} else {
diff --git a/htdocs/core/actions_setmoduleoptions.inc.php b/htdocs/core/actions_setmoduleoptions.inc.php
index 05be4a31d18..1cc9a55deb2 100644
--- a/htdocs/core/actions_setmoduleoptions.inc.php
+++ b/htdocs/core/actions_setmoduleoptions.inc.php
@@ -38,11 +38,11 @@ if ($action == 'update' && is_array($arrayofparameters))
 		if (GETPOSTISSET($key))
 		{
 			$result = dolibarr_set_const($db, $key, GETPOST($key, 'alpha'), 'chaine', 0, '', $conf->entity);
-		    if ($result < 0)
-		    {
-			    $ok = false;
-			    break;
-		    }
+			if ($result < 0)
+			{
+				$ok = false;
+				break;
+			}
 		}
 	}
 
@@ -59,58 +59,58 @@ if ($action == 'update' && is_array($arrayofparameters))
 // Define constants for submodules that contains parameters (forms with param1, param2, ... and value1, value2, ...)
 if ($action == 'setModuleOptions')
 {
-    $db->begin();
+	$db->begin();
 
-    // Process common param fields
-    if (is_array($_POST))
-    {
-        foreach ($_POST as $key => $val)
-        {
-        	$reg = array();
-            if (preg_match('/^param(\d*)$/', $key, $reg))    // Works for POST['param'], POST['param1'], POST['param2'], ...
-            {
-                $param = GETPOST("param".$reg[1], 'alpha');
-                $value = GETPOST("value".$reg[1], 'alpha');
-                if ($param)
-                {
-                    $res = dolibarr_set_const($db, $param, $value, 'chaine', 0, '', $conf->entity);
-                    if (!$res > 0) $error++;
-                }
-            }
-        }
-    }
+	// Process common param fields
+	if (is_array($_POST))
+	{
+		foreach ($_POST as $key => $val)
+		{
+			$reg = array();
+			if (preg_match('/^param(\d*)$/', $key, $reg))    // Works for POST['param'], POST['param1'], POST['param2'], ...
+			{
+				$param = GETPOST("param".$reg[1], 'alpha');
+				$value = GETPOST("value".$reg[1], 'alpha');
+				if ($param)
+				{
+					$res = dolibarr_set_const($db, $param, $value, 'chaine', 0, '', $conf->entity);
+					if (!$res > 0) $error++;
+				}
+			}
+		}
+	}
 
-    // Process upload fields
-    if (GETPOST('upload', 'alpha') && GETPOST('keyforuploaddir', 'aZ09'))
-    {
-        include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-        $keyforuploaddir = GETPOST('keyforuploaddir', 'aZ09');
-        $listofdir = explode(',', preg_replace('/[\r\n]+/', ',', trim($conf->global->$keyforuploaddir)));
-        foreach ($listofdir as $key=>$tmpdir)
-        {
-            $tmpdir = trim($tmpdir);
-            $tmpdir = preg_replace('/DOL_DATA_ROOT/', DOL_DATA_ROOT, $tmpdir);
-            if (!$tmpdir) {
-                unset($listofdir[$key]); continue;
-            }
-            if (!is_dir($tmpdir)) $texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
-            else {
-                $upload_dir = $tmpdir;
-            }
-        }
-        if ($upload_dir)
-        {
-            $result = dol_add_file_process($upload_dir, 0, 1, 'uploadfile', '');
-            if ($result <= 0) $error++;
-        }
-    }
+	// Process upload fields
+	if (GETPOST('upload', 'alpha') && GETPOST('keyforuploaddir', 'aZ09'))
+	{
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+		$keyforuploaddir = GETPOST('keyforuploaddir', 'aZ09');
+		$listofdir = explode(',', preg_replace('/[\r\n]+/', ',', trim($conf->global->$keyforuploaddir)));
+		foreach ($listofdir as $key=>$tmpdir)
+		{
+			$tmpdir = trim($tmpdir);
+			$tmpdir = preg_replace('/DOL_DATA_ROOT/', DOL_DATA_ROOT, $tmpdir);
+			if (!$tmpdir) {
+				unset($listofdir[$key]); continue;
+			}
+			if (!is_dir($tmpdir)) $texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
+			else {
+				$upload_dir = $tmpdir;
+			}
+		}
+		if ($upload_dir)
+		{
+			$result = dol_add_file_process($upload_dir, 0, 1, 'uploadfile', '');
+			if ($result <= 0) $error++;
+		}
+	}
 
-    if (!$error)
-    {
-        $db->commit();
-        if (empty($nomessageinsetmoduleoptions)) setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    } else {
-        $db->rollback();
-        if (empty($nomessageinsetmoduleoptions)) setEventMessages($langs->trans("SetupNotSaved"), null, 'errors');
-    }
+	if (!$error)
+	{
+		$db->commit();
+		if (empty($nomessageinsetmoduleoptions)) setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
+		$db->rollback();
+		if (empty($nomessageinsetmoduleoptions)) setEventMessages($langs->trans("SetupNotSaved"), null, 'errors');
+	}
 }
diff --git a/htdocs/core/actions_setnotes.inc.php b/htdocs/core/actions_setnotes.inc.php
index f8d54f2b40b..b9dd4194268 100644
--- a/htdocs/core/actions_setnotes.inc.php
+++ b/htdocs/core/actions_setnotes.inc.php
@@ -33,7 +33,7 @@ if ($action == 'setnote_public' && !empty($permissionnote) && !GETPOST('cancel',
 	if (empty($action) || !is_object($object) || empty($id)) dol_print_error('', 'Include of actions_setnotes.inc.php was done but required variable was not set before');
 	if (empty($object->id)) $object->fetch($id); // Fetch may not be already done
 
-	$result_update = $object->update_note(dol_html_entity_decode(GETPOST('note_public', 'restricthtml'), ENT_QUOTES|ENT_HTML5, 'UTF-8', 1), '_public');
+	$result_update = $object->update_note(dol_html_entity_decode(GETPOST('note_public', 'restricthtml'), ENT_QUOTES | ENT_HTML5, 'UTF-8', 1), '_public');
 
 	if ($result_update < 0) setEventMessages($object->error, $object->errors, 'errors');
 	elseif (in_array($object->table_element, array('supplier_proposal', 'propal', 'commande_fournisseur', 'commande', 'facture_fourn', 'facture')))
@@ -63,6 +63,6 @@ if ($action == 'setnote_public' && !empty($permissionnote) && !GETPOST('cancel',
 	// Set public note
 	if (empty($action) || !is_object($object) || empty($id)) dol_print_error('', 'Include of actions_setnotes.inc.php was done but required variable was not set before');
 	if (empty($object->id)) $object->fetch($id); // Fetch may not be already done
-	$result = $object->update_note(dol_html_entity_decode(GETPOST('note_private', 'restricthtml'), ENT_QUOTES|ENT_HTML5), '_private');
+	$result = $object->update_note(dol_html_entity_decode(GETPOST('note_private', 'restricthtml'), ENT_QUOTES | ENT_HTML5), '_private');
 	if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
 }
diff --git a/htdocs/core/ajax/ajaxdirtree.php b/htdocs/core/ajax/ajaxdirtree.php
index 620643da8f2..e6fd1e000cb 100644
--- a/htdocs/core/ajax/ajaxdirtree.php
+++ b/htdocs/core/ajax/ajaxdirtree.php
@@ -83,10 +83,10 @@ if ($modulepart == 'ecm')
 // On interdit les remontees de repertoire ainsi que les pipe dans les noms de fichiers.
 if (preg_match('/\.\./', $fullpathselecteddir) || preg_match('/[<>|]/', $fullpathselecteddir))
 {
-    dol_syslog("Refused to deliver file ".$original_file);
-    // Do no show plain path in shown error message
-    dol_print_error(0, $langs->trans("ErrorFileNameInvalid", GETPOST("file")));
-    exit;
+	dol_syslog("Refused to deliver file ".$original_file);
+	// Do no show plain path in shown error message
+	dol_print_error(0, $langs->trans("ErrorFileNameInvalid", GETPOST("file")));
+	exit;
 }
 
 // Check permissions
@@ -120,11 +120,11 @@ if (empty($sqltree)) $sqltree = $ecmdirstatic->get_full_arbo(0);
 $current_ecmdir_id = -1;
 foreach ($sqltree as $keycursor => $val)
 {
-    //print $val['fullrelativename']." == ".$selecteddir;
-    if ($val['fullrelativename'] == $selecteddir)
-    {
-        $current_ecmdir_id = $keycursor;
-    }
+	//print $val['fullrelativename']." == ".$selecteddir;
+	if ($val['fullrelativename'] == $selecteddir)
+	{
+		$current_ecmdir_id = $keycursor;
+	}
 }
 
 if (!empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABLE_JS))
diff --git a/htdocs/core/ajax/box.php b/htdocs/core/ajax/box.php
index 2b03eb858e1..cc27ca11844 100644
--- a/htdocs/core/ajax/box.php
+++ b/htdocs/core/ajax/box.php
@@ -58,7 +58,7 @@ if ($boxid > 0 && $zone != '' && $userid > 0)
 	$nbboxonright = substr_count($tmp[1], ',');
 	print $nbboxonleft.'-'.$nbboxonright;
 	if ($nbboxonleft > $nbboxonright) $boxorder = preg_replace('/B:/', 'B:'.$boxid.',', $boxorder); // Insert id of new box into list
-    else $boxorder = preg_replace('/^A:/', 'A:'.$boxid.',', $boxorder); // Insert id of new box into list
+	else $boxorder = preg_replace('/^A:/', 'A:'.$boxid.',', $boxorder); // Insert id of new box into list
 }
 
 // Registering the location of boxes after a move
@@ -70,10 +70,10 @@ if ($boxorder && $zone != '' && $userid > 0)
 	$result = InfoBox::saveboxorder($db, $zone, $boxorder, $userid);
 	if ($result > 0)
 	{
-	    $langs->load("boxes");
-	    if (!GETPOST('closing'))
-	    {
-	        setEventMessages($langs->trans("BoxAdded"), null);
-	    }
+		$langs->load("boxes");
+		if (!GETPOST('closing'))
+		{
+			setEventMessages($langs->trans("BoxAdded"), null);
+		}
 	}
 }
diff --git a/htdocs/core/ajax/check_notifications.php b/htdocs/core/ajax/check_notifications.php
index 01cb85008bd..a6134b05bdc 100644
--- a/htdocs/core/ajax/check_notifications.php
+++ b/htdocs/core/ajax/check_notifications.php
@@ -18,7 +18,7 @@
  */
 
 if (!defined('NOCSRFCHECK')) define('NOCSRFCHECK', '1');
-if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1');		// Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
+if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1'); // Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
 if (!defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1');
 if (!defined('NOREQUIREHTML'))  define('NOREQUIREHTML', '1');
 if (!defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX', '1');
@@ -47,7 +47,7 @@ if (!defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN', '1');
 require '../../main.inc.php';
 
 //$time = (int) GETPOST('time', 'int'); // Use the time parameter that is always increased by time_update, even if call is late
-$time=dol_now();
+$time = dol_now();
 $action = GETPOST('action', 'aZ09');
 $listofreminderids = GETPOST('listofreminderids', 'aZ09');
 
@@ -105,7 +105,7 @@ $eventfound = array();
 // This need to extend period to be sure to not miss and save in session what we notified to avoid duplicate.
 if (empty($_SESSION['auto_check_events_not_before']) || $time >= $_SESSION['auto_check_events_not_before'] || GETPOST('forcechecknow', 'int'))
 {
-    /*$time_update = (int) $conf->global->MAIN_BROWSER_NOTIFICATION_FREQUENCY; // Always defined
+	/*$time_update = (int) $conf->global->MAIN_BROWSER_NOTIFICATION_FREQUENCY; // Always defined
     if (!empty($_SESSION['auto_check_events_not_before']))
     {
         // We start scan from the not before so if two tabs were opend at differents seconds and we close one (so the js timer),
@@ -124,51 +124,51 @@ if (empty($_SESSION['auto_check_events_not_before']) || $time >= $_SESSION['auto
     $_SESSION['auto_check_events_not_before'] = $time + $time_update;
 	*/
 
-    // Force save of the session change we did.
-    // WARNING: Any change in sessions after that will not be saved !
-    session_write_close();
+	// Force save of the session change we did.
+	// WARNING: Any change in sessions after that will not be saved !
+	session_write_close();
 
-    require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
 
 
-    dol_syslog('NEW $_SESSION[auto_check_events_not_before]='.$_SESSION['auto_check_events_not_before']);
+	dol_syslog('NEW $_SESSION[auto_check_events_not_before]='.(empty($_SESSION['auto_check_events_not_before']) ? '' : $_SESSION['auto_check_events_not_before']));
 
-    $sql = 'SELECT a.id as id_agenda, a.code, a.datep, a.label, a.location, ar.rowid as id_reminder, ar.dateremind, ar.fk_user as id_user_reminder';
-    $sql .= ' FROM '.MAIN_DB_PREFIX.'actioncomm as a';
-    if (!empty($user->conf->MAIN_USER_WANT_ALL_EVENTS_NOTIFICATIONS)) {
-    	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'actioncomm_reminder as ar ON a.id = ar.fk_actioncomm AND ar.fk_user = '.$user->id;
-    	$sql .= ' WHERE a.code <> "AC_OTH_AUTO"';
-    	$sql .= ' AND (';
-    	$sql .= " (ar.typeremind = 'browser' AND ar.dateremind < '".$db->idate(dol_now())."' AND ar.status = 0 AND ar.entity = ".$conf->entity;
-    	$sql .= ' )';
-    } else {
-    	$sql .= ' JOIN '.MAIN_DB_PREFIX.'actioncomm_reminder as ar ON a.id = ar.fk_actioncomm AND ar.fk_user = '.$user->id;
-    	$sql .= " AND ar.typeremind = 'browser' AND ar.dateremind < '".$db->idate(dol_now())."' AND ar.status = 0 AND ar.entity = ".$conf->entity;
-    }
-    $sql .= $db->order('datep', 'ASC');
-    $sql .= ' LIMIT 10'; // Avoid too many notification at once
+	$sql = 'SELECT a.id as id_agenda, a.code, a.datep, a.label, a.location, ar.rowid as id_reminder, ar.dateremind, ar.fk_user as id_user_reminder';
+	$sql .= ' FROM '.MAIN_DB_PREFIX.'actioncomm as a';
+	if (!empty($user->conf->MAIN_USER_WANT_ALL_EVENTS_NOTIFICATIONS)) {
+		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'actioncomm_reminder as ar ON a.id = ar.fk_actioncomm AND ar.fk_user = '.$user->id;
+		$sql .= ' WHERE a.code <> "AC_OTH_AUTO"';
+		$sql .= ' AND (';
+		$sql .= " (ar.typeremind = 'browser' AND ar.dateremind < '".$db->idate(dol_now())."' AND ar.status = 0 AND ar.entity = ".$conf->entity;
+		$sql .= ' )';
+	} else {
+		$sql .= ' JOIN '.MAIN_DB_PREFIX.'actioncomm_reminder as ar ON a.id = ar.fk_actioncomm AND ar.fk_user = '.$user->id;
+		$sql .= " AND ar.typeremind = 'browser' AND ar.dateremind < '".$db->idate(dol_now())."' AND ar.status = 0 AND ar.entity = ".$conf->entity;
+	}
+	$sql .= $db->order('datep', 'ASC');
+	$sql .= ' LIMIT 10'; // Avoid too many notification at once
 
-    $resql = $db->query($sql);
-    if ($resql) {
-        while ($obj = $db->fetch_object($resql))
-        {
-            // Message must be formated and translated to be used with javascript directly
-            $event = array();
-            $event['type'] = 'agenda';
-            $event['id_reminder'] = $obj->id_reminder;
-            $event['id_agenda'] = $obj->id_agenda;
-            $event['id_user'] = $obj->id_user_reminder;
-            $event['code'] = $obj->code;
-            $event['label'] = $obj->label;
-            $event['location'] = $obj->location;
-            $event['reminder_date_formated'] = dol_print_date($db->jdate($obj->dateremind), 'standard');
-            $event['event_date_start_formated'] = dol_print_date($db->jdate($obj->datep), 'standard');
+	$resql = $db->query($sql);
+	if ($resql) {
+		while ($obj = $db->fetch_object($resql))
+		{
+			// Message must be formated and translated to be used with javascript directly
+			$event = array();
+			$event['type'] = 'agenda';
+			$event['id_reminder'] = $obj->id_reminder;
+			$event['id_agenda'] = $obj->id_agenda;
+			$event['id_user'] = $obj->id_user_reminder;
+			$event['code'] = $obj->code;
+			$event['label'] = $obj->label;
+			$event['location'] = $obj->location;
+			$event['reminder_date_formated'] = dol_print_date($db->jdate($obj->dateremind), 'standard');
+			$event['event_date_start_formated'] = dol_print_date($db->jdate($obj->datep), 'standard');
 
-            $eventfound[$obj->id_agenda] = $event;
-        }
-    } else {
-        dol_syslog("Error sql = ".$db->lasterror(), LOG_ERR);
-    }
+			$eventfound[$obj->id_agenda] = $event;
+		}
+	} else {
+		dol_syslog("Error sql = ".$db->lasterror(), LOG_ERR);
+	}
 }
 
 print json_encode(array('pastreminders'=>$eventfound, 'nextreminder'=>''));
diff --git a/htdocs/core/ajax/constantonoff.php b/htdocs/core/ajax/constantonoff.php
index 710759e10bb..a530bea092f 100644
--- a/htdocs/core/ajax/constantonoff.php
+++ b/htdocs/core/ajax/constantonoff.php
@@ -31,7 +31,7 @@ if (!defined('CSRFCHECK_WITH_TOKEN'))  define('CSRFCHECK_WITH_TOKEN', '1'); // T
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 
-$action = GETPOST('action', 'aZ09');	// set or del
+$action = GETPOST('action', 'aZ09'); // set or del
 $name = GETPOST('name', 'alpha');
 
 
diff --git a/htdocs/core/ajax/contacts.php b/htdocs/core/ajax/contacts.php
index 6b476a8f59a..e56b8689e0d 100644
--- a/htdocs/core/ajax/contacts.php
+++ b/htdocs/core/ajax/contacts.php
@@ -27,7 +27,7 @@ if (!defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX', '1');
 
 require '../../main.inc.php';
 
-$id = GETPOST('id', 'int');	// id of thirdparty
+$id = GETPOST('id', 'int'); // id of thirdparty
 $action = GETPOST('action', 'aZ09');
 $htmlname = GETPOST('htmlname', 'alpha');
 $showempty = GETPOST('showempty', 'int');
diff --git a/htdocs/core/ajax/selectsearchbox.php b/htdocs/core/ajax/selectsearchbox.php
index 69dd65b868e..877379b54ad 100644
--- a/htdocs/core/ajax/selectsearchbox.php
+++ b/htdocs/core/ajax/selectsearchbox.php
@@ -26,21 +26,21 @@
 
 if (!isset($usedbyinclude) || empty($usedbyinclude))
 {
-    if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', 1); // Disables token renewal
-    if (!defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1');
-    if (!defined('NOREQUIREHTML'))  define('NOREQUIREHTML', '1');
-    if (!defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX', '1');
-    if (!defined('NOREDIRECTBYMAINTOLOGIN')) define('NOREDIRECTBYMAINTOLOGIN', '1');
+	if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', 1); // Disables token renewal
+	if (!defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1');
+	if (!defined('NOREQUIREHTML'))  define('NOREQUIREHTML', '1');
+	if (!defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX', '1');
+	if (!defined('NOREDIRECTBYMAINTOLOGIN')) define('NOREDIRECTBYMAINTOLOGIN', '1');
 
-    $res = @include '../../main.inc.php';
-    if ($res == 'ERROR_NOT_LOGGED')
-    {
-    	$langs->load("other");
-    	$arrayresult['jumptologin'] = array('img'=>'object_generic', 'label'=>$langs->trans("JumpToLogin"), 'text'=>'<span class="fa fa-sign-in"></span> '.$langs->trans("JumpToLogin"), 'url'=>DOL_URL_ROOT.'/index.php');
-    	print json_encode($arrayresult);
-    	if (is_object($db)) $db->close();
-    	exit;
-    }
+	$res = @include '../../main.inc.php';
+	if ($res == 'ERROR_NOT_LOGGED')
+	{
+		$langs->load("other");
+		$arrayresult['jumptologin'] = array('img'=>'object_generic', 'label'=>$langs->trans("JumpToLogin"), 'text'=>'<span class="fa fa-sign-in"></span> '.$langs->trans("JumpToLogin"), 'url'=>DOL_URL_ROOT.'/index.php');
+		print json_encode($arrayresult);
+		if (is_object($db)) $db->close();
+		exit;
+	}
 }
 
 include_once DOL_DOCUMENT_ROOT.'/core/lib/json.lib.php';
@@ -110,11 +110,11 @@ if (!empty($conf->supplier_proposal->enabled) && empty($conf->global->MAIN_SEARC
 {
 	$arrayresult['searchintosupplierpropal'] = array('position'=>100, 'img'=>'object_propal', 'label'=>$langs->trans("SearchIntoSupplierProposals", $search_boxvalue), 'text'=>img_picto('', 'object_supplier_proposal').' '.$langs->trans("SearchIntoSupplierProposals", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/supplier_proposal/list.php'.($search_boxvalue ? '?sall='.urlencode($search_boxvalue) : ''));
 }
-if ((! empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_SEARCHFORM_SUPPLIER_ORDER_DISABLED) || ! empty($conf->supplier_order->enabled)) && $user->rights->fournisseur->commande->lire)
+if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_SEARCHFORM_SUPPLIER_ORDER_DISABLED) || !empty($conf->supplier_order->enabled)) && $user->rights->fournisseur->commande->lire)
 {
 	$arrayresult['searchintosupplierorder'] = array('position'=>110, 'img'=>'object_order', 'label'=>$langs->trans("SearchIntoSupplierOrders", $search_boxvalue), 'text'=>img_picto('', 'object_supplier_order').' '.$langs->trans("SearchIntoSupplierOrders", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/fourn/commande/list.php'.($search_boxvalue ? '?search_all='.urlencode($search_boxvalue) : ''));
 }
-if ((! empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_SEARCHFORM_SUPPLIER_INVOICE_DISABLED) || ! empty($conf->supplier_invoice->enabled)) && $user->rights->fournisseur->facture->lire)
+if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_SEARCHFORM_SUPPLIER_INVOICE_DISABLED) || !empty($conf->supplier_invoice->enabled)) && $user->rights->fournisseur->facture->lire)
 {
 	$arrayresult['searchintosupplierinvoice'] = array('position'=>120, 'img'=>'object_bill', 'label'=>$langs->trans("SearchIntoSupplierInvoices", $search_boxvalue), 'text'=>img_picto('', 'object_supplier_invoice').' '.$langs->trans("SearchIntoSupplierInvoices", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/fourn/facture/list.php'.($search_boxvalue ? '?sall='.urlencode($search_boxvalue) : ''));
 }
@@ -131,7 +131,7 @@ if (!empty($conf->facture->enabled) && empty($conf->global->MAIN_SEARCHFORM_CUST
 }
 
 // Vendor payments
-if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_SEARCHFORM_SUPPLIER_INVOICE_DISABLED) || ! empty($conf->supplier_invoice->enabled)) && $user->rights->fournisseur->facture->lire)
+if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_SEARCHFORM_SUPPLIER_INVOICE_DISABLED) || !empty($conf->supplier_invoice->enabled)) && $user->rights->fournisseur->facture->lire)
 {
 	$arrayresult['searchintovendorpayments'] = array(
 		'position'=>175,
@@ -189,8 +189,8 @@ if (empty($reshook))
 
 // This pushes a search entry to the top
 if (!empty($conf->global->DEFAULT_SEARCH_INTO_MODULE)) {
-    $key = 'searchinto'.$conf->global->DEFAULT_SEARCH_INTO_MODULE;
-    if (array_key_exists($key, $arrayresult)) $arrayresult[$key]['position'] = -1000;
+	$key = 'searchinto'.$conf->global->DEFAULT_SEARCH_INTO_MODULE;
+	if (array_key_exists($key, $arrayresult)) $arrayresult[$key]['position'] = -1000;
 }
 
 // Sort on position
@@ -199,6 +199,6 @@ $arrayresult = dol_sort_array($arrayresult, 'position');
 // Print output if called by ajax or do nothing (var $arrayresult will be used) if called by an include
 if (!isset($usedbyinclude) || empty($usedbyinclude))
 {
-    print json_encode($arrayresult);
-    if (is_object($db)) $db->close();
+	print json_encode($arrayresult);
+	if (is_object($db)) $db->close();
 }
diff --git a/htdocs/core/boxes/box_accountancy_last_manual_entries.php b/htdocs/core/boxes/box_accountancy_last_manual_entries.php
index 76c3fa5eb47..cbd6a16b62e 100644
--- a/htdocs/core/boxes/box_accountancy_last_manual_entries.php
+++ b/htdocs/core/boxes/box_accountancy_last_manual_entries.php
@@ -32,77 +32,77 @@ include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
  */
 class box_accountancy_last_manual_entries extends ModeleBoxes
 {
-    public $boxcode = "accountancy_last_manual_entries";
-    public $boximg = "object_invoice";
-    public $boxlabel = "BoxLastManualEntries";
-    public $depends = array("accounting");
+	public $boxcode = "accountancy_last_manual_entries";
+	public $boximg = "object_invoice";
+	public $boxlabel = "BoxLastManualEntries";
+	public $depends = array("accounting");
 
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $param;
+	public $param;
 
-    public $info_box_head = array();
-    public $info_box_contents = array();
+	public $info_box_head = array();
+	public $info_box_contents = array();
 
 
-    /**
-     *  Constructor
-     *
-     *  @param  DoliDB  $db         Database handler
-     *  @param  string  $param      More parameters
-     */
-    public function __construct($db, $param)
-    {
-        global $user;
+	/**
+	 *  Constructor
+	 *
+	 *  @param  DoliDB  $db         Database handler
+	 *  @param  string  $param      More parameters
+	 */
+	public function __construct($db, $param)
+	{
+		global $user;
 
-        $this->db = $db;
+		$this->db = $db;
 
-        $this->hidden = !($user->rights->accounting->mouvements->lire);
-    }
+		$this->hidden = !($user->rights->accounting->mouvements->lire);
+	}
 
-    /**
-     *  Load data for box to show them later
-     *
-     *  @param	int		$max        Maximum number of records to load
-     *  @return	void
-     */
-    public function loadBox($max = 5)
-    {
-        global $user, $langs, $conf;
+	/**
+	 *  Load data for box to show them later
+	 *
+	 *  @param	int		$max        Maximum number of records to load
+	 *  @return	void
+	 */
+	public function loadBox($max = 5)
+	{
+		global $user, $langs, $conf;
 
-        include_once DOL_DOCUMENT_ROOT.'/accountancy/class/bookkeeping.class.php';
+		include_once DOL_DOCUMENT_ROOT.'/accountancy/class/bookkeeping.class.php';
 
-        $bookkeepingstatic = new BookKeeping($this->db);
+		$bookkeepingstatic = new BookKeeping($this->db);
 
-        $this->info_box_head = array('text' => $langs->trans("BoxTitleLastManualEntries", $max));
+		$this->info_box_head = array('text' => $langs->trans("BoxTitleLastManualEntries", $max));
 
-        if ($user->rights->accounting->mouvements->lire)
-        {
-            $sql = "SELECT DISTINCT b.piece_num";
-            $sql .= ", b.doc_date as date_movement";
-            $sql .= ", b.label_operation";
-            $sql .= ", b.montant as amount";
-            $sql .= ", b.code_journal";
-            $sql .= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as b";
-            $sql .= " WHERE b.fk_doc = 0";
-            $sql .= " AND b.entity = ".$conf->entity;
-            $sql .= " ORDER BY b.piece_num DESC ";
-            $sql .= $this->db->plimit($max, 0);
+		if ($user->rights->accounting->mouvements->lire)
+		{
+			$sql = "SELECT DISTINCT b.piece_num";
+			$sql .= ", b.doc_date as date_movement";
+			$sql .= ", b.label_operation";
+			$sql .= ", b.montant as amount";
+			$sql .= ", b.code_journal";
+			$sql .= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as b";
+			$sql .= " WHERE b.fk_doc = 0";
+			$sql .= " AND b.entity = ".$conf->entity;
+			$sql .= " ORDER BY b.piece_num DESC ";
+			$sql .= $this->db->plimit($max, 0);
 
-            $result = $this->db->query($sql);
-            if ($result) {
-                $num = $this->db->num_rows($result);
+			$result = $this->db->query($sql);
+			if ($result) {
+				$num = $this->db->num_rows($result);
 
-                $line = 0;
+				$line = 0;
 
-                while ($line < $num) {
-                    $objp		= $this->db->fetch_object($result);
-                    $date		= $this->db->jdate($objp->date_movement);
+				while ($line < $num) {
+					$objp		= $this->db->fetch_object($result);
+					$date		= $this->db->jdate($objp->date_movement);
 					$journal	= $objp->code_journal;
-                    $label		= $objp->label_operation;
+					$label = $objp->label_operation;
 					$amount		= $objp->amount;
 
 					$bookkeepingstatic->id = $objp->id;
@@ -114,11 +114,11 @@ class box_accountancy_last_manual_entries extends ModeleBoxes
 						'asis' => 1,
 					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right"',
-                        'text' => dol_print_date($date, 'day'),
-                        'asis' => 1,
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right"',
+						'text' => dol_print_date($date, 'day'),
+						'asis' => 1,
+					);
 
 					$this->info_box_contents[$line][] = array(
 						'td' => 'class="center"',
@@ -132,34 +132,34 @@ class box_accountancy_last_manual_entries extends ModeleBoxes
 						'asis' => 1,
 					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="nowraponall right"',
-                        'text' => price($amount, 0, $langs, 0, -1, -1, $conf->currency),
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="nowraponall right"',
+						'text' => price($amount, 0, $langs, 0, -1, -1, $conf->currency),
+					);
 
-                    $line++;
-                }
+					$line++;
+				}
 
-                if ($num == 0) $this->info_box_contents[$line][0] = array(
-                	'td' => 'class="center opacitymedium"',
-                	'text'=>$langs->trans("NoRecordedManualEntries")
-                );
+				if ($num == 0) $this->info_box_contents[$line][0] = array(
+					'td' => 'class="center opacitymedium"',
+					'text'=>$langs->trans("NoRecordedManualEntries")
+				);
 
-                $this->db->free($result);
-            } else {
-                $this->info_box_contents[0][0] = array(
-                    'td' => '',
-                    'maxlength'=>500,
-                    'text' => ($this->db->error().' sql='.$sql),
-                );
-            }
-        } else {
-            $this->info_box_contents[0][0] = array(
-                'td' => 'class="nohover opacitymedium left"',
-                'text' => $langs->trans("ReadPermissionNotAllowed")
-            );
-        }
-    }
+				$this->db->free($result);
+			} else {
+				$this->info_box_contents[0][0] = array(
+					'td' => '',
+					'maxlength'=>500,
+					'text' => ($this->db->error().' sql='.$sql),
+				);
+			}
+		} else {
+			$this->info_box_contents[0][0] = array(
+				'td' => 'class="nohover opacitymedium left"',
+				'text' => $langs->trans("ReadPermissionNotAllowed")
+			);
+		}
+	}
 
 	/**
 	 *	Method to show box
@@ -169,8 +169,8 @@ class box_accountancy_last_manual_entries extends ModeleBoxes
 	 *  @param	int		$nooutput	No print, only return string
 	 *	@return	string
 	 */
-    public function showBox($head = null, $contents = null, $nooutput = 0)
-    {
-        return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
-    }
+	public function showBox($head = null, $contents = null, $nooutput = 0)
+	{
+		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+	}
 }
diff --git a/htdocs/core/boxes/box_accountancy_suspense_account.php b/htdocs/core/boxes/box_accountancy_suspense_account.php
index 639ce1ebc23..653f49d2bd9 100644
--- a/htdocs/core/boxes/box_accountancy_suspense_account.php
+++ b/htdocs/core/boxes/box_accountancy_suspense_account.php
@@ -32,57 +32,57 @@ include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
  */
 class box_accountancy_suspense_account extends ModeleBoxes
 {
-    public $boxcode = "accountancy_suspense_account";
-    public $boximg = "object_invoice";
-    public $boxlabel = "BoxSuspenseAccount";
-    public $depends = array("accounting");
+	public $boxcode = "accountancy_suspense_account";
+	public $boximg = "object_invoice";
+	public $boxlabel = "BoxSuspenseAccount";
+	public $depends = array("accounting");
 
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $param;
+	public $param;
 
-    public $info_box_head = array();
-    public $info_box_contents = array();
+	public $info_box_head = array();
+	public $info_box_contents = array();
 
 
-    /**
-     *  Constructor
-     *
-     *  @param  DoliDB  $db         Database handler
-     *  @param  string  $param      More parameters
-     */
-    public function __construct($db, $param)
-    {
-        global $user;
+	/**
+	 *  Constructor
+	 *
+	 *  @param  DoliDB  $db         Database handler
+	 *  @param  string  $param      More parameters
+	 */
+	public function __construct($db, $param)
+	{
+		global $user;
 
-        $this->db = $db;
+		$this->db = $db;
 
-        $this->hidden = !($user->rights->accounting->mouvements->lire);
-    }
+		$this->hidden = !($user->rights->accounting->mouvements->lire);
+	}
 
-    /**
-     *  Load data for box to show them later
-     *
-     *  @return	void
-     */
-    public function loadBox()
-    {
-        global $user, $langs, $conf;
+	/**
+	 *  Load data for box to show them later
+	 *
+	 *  @return	void
+	 */
+	public function loadBox()
+	{
+		global $user, $langs, $conf;
 
-        include_once DOL_DOCUMENT_ROOT.'/accountancy/class/bookkeeping.class.php';
+		include_once DOL_DOCUMENT_ROOT.'/accountancy/class/bookkeeping.class.php';
 
-        //$bookkeepingstatic = new BookKeeping($this->db);
+		//$bookkeepingstatic = new BookKeeping($this->db);
 
-        $this->info_box_head = array('text' => $langs->trans("BoxTitleSuspenseAccount"));
+		$this->info_box_head = array('text' => $langs->trans("BoxTitleSuspenseAccount"));
 
-        if ($user->rights->accounting->mouvements->lire)
-        {
+		if ($user->rights->accounting->mouvements->lire)
+		{
 			$suspenseAccount = $conf->global->ACCOUNTING_ACCOUNT_SUSPENSE;
-        	if (!empty($suspenseAccount) && $suspenseAccount > 0)
-        	{
+			if (!empty($suspenseAccount) && $suspenseAccount > 0)
+			{
 				$sql = "SELECT COUNT(*) as nb_suspense_account";
 				$sql .= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as b";
 				$sql .= " WHERE b.numero_compte = ".$suspenseAccount;
@@ -112,13 +112,13 @@ class box_accountancy_suspense_account extends ModeleBoxes
 					'text' => '<span class="opacitymedium">'.$langs->trans("SuspenseAccountNotDefined").'</span>'
 				);
 			}
-        } else {
-            $this->info_box_contents[0][0] = array(
-                'td' => 'class="nohover"',
-            	'text' => '<span class="opacitymedium">'.$langs->trans("ReadPermissionNotAllowed").'</span>'
-            );
-        }
-    }
+		} else {
+			$this->info_box_contents[0][0] = array(
+				'td' => 'class="nohover"',
+				'text' => '<span class="opacitymedium">'.$langs->trans("ReadPermissionNotAllowed").'</span>'
+			);
+		}
+	}
 
 	/**
 	 *	Method to show box
@@ -128,8 +128,8 @@ class box_accountancy_suspense_account extends ModeleBoxes
 	 *  @param	int		$nooutput	No print, only return string
 	 *	@return	string
 	 */
-    public function showBox($head = null, $contents = null, $nooutput = 0)
-    {
-        return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
-    }
+	public function showBox($head = null, $contents = null, $nooutput = 0)
+	{
+		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+	}
 }
diff --git a/htdocs/core/boxes/box_actions.php b/htdocs/core/boxes/box_actions.php
index a951402fd7b..0f3b65b651d 100644
--- a/htdocs/core/boxes/box_actions.php
+++ b/htdocs/core/boxes/box_actions.php
@@ -32,20 +32,20 @@ include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
  */
 class box_actions extends ModeleBoxes
 {
-    public $boxcode = "lastactions";
-    public $boximg = "object_action";
-    public $boxlabel = "BoxLastActions";
-    public $depends = array("agenda");
+	public $boxcode = "lastactions";
+	public $boximg = "object_action";
+	public $boxlabel = "BoxLastActions";
+	public $depends = array("agenda");
 
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $param;
+	public $enabled = 1;
 
-    public $info_box_head = array();
-    public $info_box_contents = array();
+	public $info_box_head = array();
+	public $info_box_contents = array();
 
 
 	/**
@@ -54,20 +54,22 @@ class box_actions extends ModeleBoxes
 	 *  @param  DoliDB	$db      	Database handler
 	 *  @param	string	$param		More parameters
 	 */
-	public function __construct($db, $param = '')
+	public function __construct($db, $param)
 	{
-	    global $user;
+		global $conf, $user;
 
-	    $this->db = $db;
+		$this->db = $db;
 
-	    $this->hidden = !($user->rights->agenda->myactions->read);
+		$this->enabled = $conf->agenda->enabled;
+
+		$this->hidden = !($user->rights->agenda->myactions->read);
 	}
 
 	/**
-     *  Load data for box to show them later
-     *
-     *  @param	int		$max        Maximum number of records to load
-     *  @return	void
+	 *  Load data for box to show them later
+	 *
+	 *  @param	int		$max        Maximum number of records to load
+	 *  @return	void
 	 */
 	public function loadBox($max = 5)
 	{
@@ -75,25 +77,25 @@ class box_actions extends ModeleBoxes
 
 		$this->max = $max;
 
-        include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
-        include_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
-        $societestatic = new Societe($this->db);
-        $actionstatic = new ActionComm($this->db);
+		include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
+		include_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
+		$societestatic = new Societe($this->db);
+		$actionstatic = new ActionComm($this->db);
 
 		$this->info_box_head = array('text' => $langs->trans("BoxTitleLastActionsToDo", $max));
 
-        if ($user->rights->agenda->myactions->read) {
+		if ($user->rights->agenda->myactions->read) {
 			$sql = "SELECT a.id, a.label, a.datep as dp, a.percent as percentage";
-            $sql .= ", ta.code";
-            $sql .= ", ta.libelle as type_label";
-            $sql .= ", s.nom as name";
-            $sql .= ", s.rowid as socid";
-            $sql .= ", s.code_client";
+			$sql .= ", ta.code";
+			$sql .= ", ta.libelle as type_label";
+			$sql .= ", s.nom as name";
+			$sql .= ", s.rowid as socid";
+			$sql .= ", s.code_client";
 			$sql .= " FROM ".MAIN_DB_PREFIX."c_actioncomm AS ta, ".MAIN_DB_PREFIX."actioncomm AS a";
 			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON a.fk_soc = sc.fk_soc";
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON a.fk_soc = s.rowid";
 			$sql .= " WHERE a.fk_action = ta.id";
-			$sql .= " AND a.entity = ".$conf->entity;
+			$sql .= " AND a.entity IN (".getEntity('actioncomm').")";
 			$sql .= " AND a.percent >= 0 AND a.percent < 100";
 			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND (a.fk_soc IS NULL OR sc.fk_user = ".$user->id.")";
 			if ($user->socid)   $sql .= " AND s.rowid = ".$user->socid;
@@ -101,82 +103,86 @@ class box_actions extends ModeleBoxes
 			$sql .= " ORDER BY a.datec DESC";
 			$sql .= $this->db->plimit($max, 0);
 
-			dol_syslog("Box_actions::loadBox", LOG_DEBUG);
+			dol_syslog(get_class($this)."::loadBox", LOG_DEBUG);
 			$result = $this->db->query($sql);
-            if ($result) {
+			if ($result) {
 				$now = dol_now();
 				$delay_warning = $conf->global->MAIN_DELAY_ACTIONS_TODO * 24 * 60 * 60;
 
 				$num = $this->db->num_rows($result);
+
 				$line = 0;
-                while ($line < $num) {
+				while ($line < $num) {
 					$late = '';
 					$objp = $this->db->fetch_object($result);
 					$datelimite = $this->db->jdate($objp->dp);
-                    $actionstatic->id = $objp->id;
-                    $actionstatic->label = $objp->label;
-                    $actionstatic->type_label = $objp->type_label;
-                    $actionstatic->code = $objp->code;
-                    $societestatic->id = $objp->socid;
-                    $societestatic->name = $objp->name;
-                    $societestatic->code_client = $objp->code_client;
+					$actionstatic->id = $objp->id;
+					$actionstatic->label = $objp->label;
+					$actionstatic->type_label = $objp->type_label;
+					$actionstatic->code = $objp->code;
+					$societestatic->id = $objp->socid;
+					$societestatic->name = $objp->name;
+					$societestatic->code_client = $objp->code_client;
 
-                    if ($objp->percentage >= 0 && $objp->percentage < 100 && $datelimite < ($now - $delay_warning))
-                        $late = img_warning($langs->trans("Late"));
+					if ($objp->percentage >= 0 && $objp->percentage < 100 && $datelimite < ($now - $delay_warning))
+						$late = img_warning($langs->trans("Late"));
 
 					//($langs->transnoentities("Action".$objp->code)!=("Action".$objp->code) ? $langs->transnoentities("Action".$objp->code) : $objp->label)
 					$label = empty($objp->label) ? $objp->type_label : $objp->label;
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => '',
-                        'text' => $actionstatic->getNomUrl(1),
-                        'text2'=> $late,
-                        'asis' => 1,
-                    );
+					$this->info_box_contents[$line][0] = array(
+						'td' => '',
+						'text' => $actionstatic->getNomUrl(1),
+						'text2'=> $late,
+						'asis' => 1
+					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => '',
-                        'text' => ($societestatic->id > 0 ? $societestatic->getNomUrl(1) : ''),
-                        'asis' => 1,
-                    );
+					$this->info_box_contents[$line][1] = array(
+						'td' => '',
+						'text' => ($societestatic->id > 0 ? $societestatic->getNomUrl(1) : ''),
+						'asis' => 1
+					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="nowrap left"',
-                        'text' => dol_print_date($datelimite, "dayhour"),
-                    );
+					$this->info_box_contents[$line][2] = array(
+						'td' => 'class="nowrap left"',
+						'text' => dol_print_date($datelimite, "dayhour"),
+						'asis' => 1
+					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right"',
-                        'text' => ($objp->percentage >= 0 ? $objp->percentage.'%' : ''),
-                    );
+					$this->info_box_contents[$line][3] = array(
+						'td' => 'class="right"',
+						'text' => ($objp->percentage >= 0 ? $objp->percentage.'%' : ''),
+						'asis' => 1
+					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right" width="18"',
-                        'text' => $actionstatic->LibStatut($objp->percentage, 3),
-                    );
+					$this->info_box_contents[$line][4] = array(
+						'td' => 'class="right" width="18"',
+						'text' => $actionstatic->LibStatut($objp->percentage, 3),
+						'asis' => 1
+					);
 
-                    $line++;
-                }
+					$line++;
+				}
 
-                if ($num == 0)
-                    $this->info_box_contents[$line][0] = array(
-                        'td' => 'class="center"',
-                        'text'=>$langs->trans("NoActionsToDo"),
-                    );
+				if ($num == 0)
+					$this->info_box_contents[$line][0] = array(
+						'td' => 'class="center opacitymedium"',
+						'text'=>$langs->trans("NoActionsToDo")
+					);
 
-                $this->db->free($result);
-            } else {
-                $this->info_box_contents[0][0] = array(
-                    'td' => '',
-                    'maxlength'=>500,
-                    'text' => ($this->db->error().' sql='.$sql),
-                );
-            }
-        } else {
-            $this->info_box_contents[0][0] = array(
-                'td' => 'class="nohover opacitymedium left"',
-                'text' => $langs->trans("ReadPermissionNotAllowed")
-            );
+				$this->db->free($result);
+			} else {
+				$this->info_box_contents[0][0] = array(
+					'td' => '',
+					'maxlength'=>500,
+					'text' => ($this->db->error().' sql='.$sql)
+				);
+			}
+		} else {
+			$this->info_box_contents[0][0] = array(
+				'td' => 'class="nohover opacitymedium left"',
+				'text' => $langs->trans("ReadPermissionNotAllowed")
+			);
 		}
 	}
 
@@ -188,13 +194,13 @@ class box_actions extends ModeleBoxes
 	 *  @param	int		$nooutput	No print, only return string
 	 *	@return	string
 	 */
-    public function showBox($head = null, $contents = null, $nooutput = 0)
-    {
+	public function showBox($head = null, $contents = null, $nooutput = 0)
+	{
 		global $langs, $conf;
-		$out = parent::showBox($this->info_box_head, $this->info_box_contents);
+		$out = parent::showBox($this->info_box_head, $this->info_box_contents, 1);
 
-        if (!empty($conf->global->SHOW_DIALOG_HOMEPAGE))
-        {
+		if (!empty($conf->global->SHOW_DIALOG_HOMEPAGE))
+		{
 			$actioncejour = false;
 			$contents = $this->info_box_contents;
 			$nblines = count($contents);
@@ -255,5 +261,5 @@ class box_actions extends ModeleBoxes
 		else print $out;
 
 		return '';
-    }
+	}
 }
diff --git a/htdocs/core/boxes/box_birthdays.php b/htdocs/core/boxes/box_birthdays.php
index e6d032d41f8..f0a5c8d61bb 100644
--- a/htdocs/core/boxes/box_birthdays.php
+++ b/htdocs/core/boxes/box_birthdays.php
@@ -32,27 +32,27 @@ include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
  */
 class box_birthdays extends ModeleBoxes
 {
-    public $boxcode = "birthdays";
-    public $boximg = "object_user";
-    public $boxlabel = "BoxTitleUserBirthdaysOfMonth";
-    public $depends = array("user");
+	public $boxcode = "birthdays";
+	public $boximg = "object_user";
+	public $boxlabel = "BoxTitleUserBirthdaysOfMonth";
+	public $depends = array("user");
 
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $enabled = 1;
+	public $enabled = 1;
 
-    public $info_box_head = array();
-    public $info_box_contents = array();
+	public $info_box_head = array();
+	public $info_box_contents = array();
 
 
 	/**
 	 *  Constructor
 	 *
 	 *  @param  DoliDB	$db      	Database handler
-     *  @param	string	$param		More parameters
+	 *  @param	string	$param		More parameters
 	 */
 	public function __construct($db, $param = '')
 	{
@@ -64,10 +64,10 @@ class box_birthdays extends ModeleBoxes
 	}
 
 	/**
-     *  Load data for box to show them later
-     *
-     *  @param	int		$max        Maximum number of records to load
-     *  @return	void
+	 *  Load data for box to show them later
+	 *
+	 *  @param	int		$max        Maximum number of records to load
+	 *  @return	void
 	 */
 	public function loadBox($max = 20)
 	{
@@ -78,9 +78,9 @@ class box_birthdays extends ModeleBoxes
 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 		include_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
-        $userstatic = new User($this->db);
+		$userstatic = new User($this->db);
 
-        $this->info_box_head = array('text' => $langs->trans("BoxTitleUserBirthdaysOfMonth"));
+		$this->info_box_head = array('text' => $langs->trans("BoxTitleUserBirthdaysOfMonth"));
 
 		if ($user->rights->user->user->lire)
 		{
@@ -103,25 +103,25 @@ class box_birthdays extends ModeleBoxes
 				while ($line < $num)
 				{
 					$objp = $this->db->fetch_object($result);
-                    $userstatic->id = $objp->rowid;
-                    $userstatic->firstname = $objp->firstname;
-                    $userstatic->lastname = $objp->lastname;
-                    $userstatic->email = $objp->email;
-                    $dateb = $this->db->jdate($objp->birth);
-                    $age = date('Y', dol_now()) - date('Y', $dateb);
+					$userstatic->id = $objp->rowid;
+					$userstatic->firstname = $objp->firstname;
+					$userstatic->lastname = $objp->lastname;
+					$userstatic->email = $objp->email;
+					$dateb = $this->db->jdate($objp->birth);
+					$age = date('Y', dol_now()) - date('Y', $dateb);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => '',
-                        'text' => $userstatic->getNomUrl(1),
-                        'asis' => 1,
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => '',
+						'text' => $userstatic->getNomUrl(1),
+						'asis' => 1,
+					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right"',
-                        'text' => dol_print_date($dateb, "day").' - '.$age.' '.$langs->trans('DurationYears')
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right"',
+						'text' => dol_print_date($dateb, "day").' - '.$age.' '.$langs->trans('DurationYears')
+					);
 
-                    /*$this->info_box_contents[$line][] = array(
+					/*$this->info_box_contents[$line][] = array(
                         'td' => 'class="right" width="18"',
                         'text' => $userstatic->LibStatut($objp->status, 3)
                     );*/
@@ -134,15 +134,15 @@ class box_birthdays extends ModeleBoxes
 				$this->db->free($result);
 			} else {
 				$this->info_box_contents[0][0] = array(
-                    'td' => '',
-                    'maxlength'=>500,
-                    'text' => ($this->db->error().' sql='.$sql)
-                );
+					'td' => '',
+					'maxlength'=>500,
+					'text' => ($this->db->error().' sql='.$sql)
+				);
 			}
 		} else {
 			$this->info_box_contents[0][0] = array(
-			    'td' => 'class="nohover opacitymedium left"',
-                'text' => $langs->trans("ReadPermissionNotAllowed")
+				'td' => 'class="nohover opacitymedium left"',
+				'text' => $langs->trans("ReadPermissionNotAllowed")
 			);
 		}
 	}
@@ -155,8 +155,8 @@ class box_birthdays extends ModeleBoxes
 	 *  @param	int		$nooutput	No print, only return string
 	 *	@return	string
 	 */
-    public function showBox($head = null, $contents = null, $nooutput = 0)
-    {
+	public function showBox($head = null, $contents = null, $nooutput = 0)
+	{
 		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
 }
diff --git a/htdocs/core/boxes/box_birthdays_members.php b/htdocs/core/boxes/box_birthdays_members.php
index e49d21ba387..02a315ea836 100644
--- a/htdocs/core/boxes/box_birthdays_members.php
+++ b/htdocs/core/boxes/box_birthdays_members.php
@@ -32,27 +32,27 @@ include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
  */
 class box_birthdays_members extends ModeleBoxes
 {
-    public $boxcode = "birthdays_members";
-    public $boximg = "object_user";
-    public $boxlabel = "BoxTitleMemberNextBirthdays";
-    public $depends = array("adherent");
+	public $boxcode = "birthdays_members";
+	public $boximg = "object_user";
+	public $boxlabel = "BoxTitleMemberNextBirthdays";
+	public $depends = array("adherent");
 
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $enabled = 1;
+	public $enabled = 1;
 
-    public $info_box_head = array();
-    public $info_box_contents = array();
+	public $info_box_head = array();
+	public $info_box_contents = array();
 
 
 	/**
 	 *  Constructor
 	 *
 	 *  @param  DoliDB	$db      	Database handler
-     *  @param	string	$param		More parameters
+	 *  @param	string	$param		More parameters
 	 */
 	public function __construct($db, $param = '')
 	{
@@ -64,10 +64,10 @@ class box_birthdays_members extends ModeleBoxes
 	}
 
 	/**
-     *  Load data for box to show them later
-     *
-     *  @param	int		$max        Maximum number of records to load
-     *  @return	void
+	 *  Load data for box to show them later
+	 *
+	 *  @param	int		$max        Maximum number of records to load
+	 *  @return	void
 	 */
 	public function loadBox($max = 20)
 	{
@@ -78,9 +78,9 @@ class box_birthdays_members extends ModeleBoxes
 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 		include_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
-        $memberstatic = new Adherent($this->db);
+		$memberstatic = new Adherent($this->db);
 
-        $this->info_box_head = array('text' => $langs->trans("BoxTitleMemberNextBirthdays"));
+		$this->info_box_head = array('text' => $langs->trans("BoxTitleMemberNextBirthdays"));
 
 		if ($user->rights->adherent->lire)
 		{
@@ -89,8 +89,8 @@ class box_birthdays_members extends ModeleBoxes
 			$sql = "SELECT u.rowid, u.firstname, u.lastname, u.birth";
 			$sql .= " FROM ".MAIN_DB_PREFIX."adherent as u";
 			$sql .= " WHERE u.entity IN (".getEntity('adherent').")";
-      		$sql .= " AND u.statut = 1";
-      		$sql .= dolSqlDateFilter('u.birth', 0, $tmparray['mon'], 0);
+	  		$sql .= " AND u.statut = 1";
+	  		$sql .= dolSqlDateFilter('u.birth', 0, $tmparray['mon'], 0);
 			$sql .= " ORDER BY u.birth ASC";
 			$sql .= $this->db->plimit($max, 0);
 
@@ -104,25 +104,25 @@ class box_birthdays_members extends ModeleBoxes
 				while ($line < $num)
 				{
 					$objp = $this->db->fetch_object($result);
-                    $memberstatic->id = $objp->rowid;
-                    $memberstatic->firstname = $objp->firstname;
-                    $memberstatic->lastname = $objp->lastname;
-                    $memberstatic->email = $objp->email;
-                    $dateb = $this->db->jdate($objp->birth);
-                    $age = date('Y', dol_now()) - date('Y', $dateb);
+					$memberstatic->id = $objp->rowid;
+					$memberstatic->firstname = $objp->firstname;
+					$memberstatic->lastname = $objp->lastname;
+					$memberstatic->email = $objp->email;
+					$dateb = $this->db->jdate($objp->birth);
+					$age = date('Y', dol_now()) - date('Y', $dateb);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => '',
-                        'text' => $memberstatic->getNomUrl(1),
-                        'asis' => 1,
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => '',
+						'text' => $memberstatic->getNomUrl(1),
+						'asis' => 1,
+					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right"',
-                        'text' => dol_print_date($dateb, "day").' - '.$age.' '.$langs->trans('DurationYears')
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right"',
+						'text' => dol_print_date($dateb, "day").' - '.$age.' '.$langs->trans('DurationYears')
+					);
 
-                    /*$this->info_box_contents[$line][] = array(
+					/*$this->info_box_contents[$line][] = array(
                         'td' => 'class="right" width="18"',
                         'text' => $memberstatic->LibStatut($objp->status, 3)
                     );*/
@@ -135,15 +135,15 @@ class box_birthdays_members extends ModeleBoxes
 				$this->db->free($result);
 			} else {
 				$this->info_box_contents[0][0] = array(
-                    'td' => '',
-                    'maxlength'=>500,
-                    'text' => ($this->db->error().' sql='.$sql)
-                );
+					'td' => '',
+					'maxlength'=>500,
+					'text' => ($this->db->error().' sql='.$sql)
+				);
 			}
 		} else {
 			$this->info_box_contents[0][0] = array(
-			    'td' => 'class="nohover opacitymedium left"',
-                'text' => $langs->trans("ReadPermissionNotAllowed")
+				'td' => 'class="nohover opacitymedium left"',
+				'text' => $langs->trans("ReadPermissionNotAllowed")
 			);
 		}
 	}
@@ -156,8 +156,8 @@ class box_birthdays_members extends ModeleBoxes
 	 *  @param	int		$nooutput	No print, only return string
 	 *	@return	string
 	 */
-    public function showBox($head = null, $contents = null, $nooutput = 0)
-    {
+	public function showBox($head = null, $contents = null, $nooutput = 0)
+	{
 		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
 }
diff --git a/htdocs/core/boxes/box_boms.php b/htdocs/core/boxes/box_boms.php
index c75c4c24e8f..6a2554bcde0 100644
--- a/htdocs/core/boxes/box_boms.php
+++ b/htdocs/core/boxes/box_boms.php
@@ -32,147 +32,147 @@ include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
  */
 class box_boms extends ModeleBoxes
 {
-    public $boxcode = "lastboms";
-    public $boximg = "object_bom";
-    public $boxlabel = "BoxTitleLatestModifiedBoms";
-    public $depends = array("bom");
+	public $boxcode = "lastboms";
+	public $boximg = "object_bom";
+	public $boxlabel = "BoxTitleLatestModifiedBoms";
+	public $depends = array("bom");
 
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $param;
+	public $param;
 
-    public $info_box_head = array();
-    public $info_box_contents = array();
+	public $info_box_head = array();
+	public $info_box_contents = array();
 
 
-    /**
-     *  Constructor
-     *
-     *  @param  DoliDB  $db         Database handler
-     *  @param  string  $param      More parameters
-     */
-    public function __construct($db, $param)
-    {
-        global $user;
+	/**
+	 *  Constructor
+	 *
+	 *  @param  DoliDB  $db         Database handler
+	 *  @param  string  $param      More parameters
+	 */
+	public function __construct($db, $param)
+	{
+		global $user;
 
-        $this->db = $db;
+		$this->db = $db;
 
-        $this->hidden = !($user->rights->bom->read);
-    }
+		$this->hidden = !($user->rights->bom->read);
+	}
 
-    /**
-     *  Load data for box to show them later
-     *
-     *  @param	int		$max        Maximum number of records to load
-     *  @return	void
-     */
-    public function loadBox($max = 5)
-    {
-        global $user, $langs, $conf;
+	/**
+	 *  Load data for box to show them later
+	 *
+	 *  @param	int		$max        Maximum number of records to load
+	 *  @return	void
+	 */
+	public function loadBox($max = 5)
+	{
+		global $user, $langs, $conf;
 
-        $this->max = $max;
+		$this->max = $max;
 
-        include_once DOL_DOCUMENT_ROOT.'/bom/class/bom.class.php';
-        include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+		include_once DOL_DOCUMENT_ROOT.'/bom/class/bom.class.php';
+		include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 
-        $bomstatic = new Bom($this->db);
-        $productstatic = new Product($this->db);
-        $userstatic = new User($this->db);
+		$bomstatic = new Bom($this->db);
+		$productstatic = new Product($this->db);
+		$userstatic = new User($this->db);
 
-        $this->info_box_head = array('text' => $langs->trans("BoxTitleLatestModifiedBoms", $max));
+		$this->info_box_head = array('text' => $langs->trans("BoxTitleLatestModifiedBoms", $max));
 
-        if ($user->rights->bom->read)
-        {
-            $sql = "SELECT p.ref as product_ref, p.tobuy, p.tosell";
-            $sql .= ", c.rowid";
-            $sql .= ", c.date_creation";
-            $sql .= ", c.tms";
-            $sql .= ", c.ref";
-            $sql .= ", c.status";
-            $sql .= ", c.fk_user_valid";
-            $sql .= " FROM ".MAIN_DB_PREFIX."product as p";
-            $sql .= ", ".MAIN_DB_PREFIX."bom_bom as c";
-            $sql .= " WHERE c.fk_product = p.rowid";
-            $sql .= " AND c.entity = ".$conf->entity;
-            $sql .= " ORDER BY c.tms DESC, c.ref DESC";
-            $sql .= " ".$this->db->plimit($max, 0);
+		if ($user->rights->bom->read)
+		{
+			$sql = "SELECT p.ref as product_ref, p.tobuy, p.tosell";
+			$sql .= ", c.rowid";
+			$sql .= ", c.date_creation";
+			$sql .= ", c.tms";
+			$sql .= ", c.ref";
+			$sql .= ", c.status";
+			$sql .= ", c.fk_user_valid";
+			$sql .= " FROM ".MAIN_DB_PREFIX."product as p";
+			$sql .= ", ".MAIN_DB_PREFIX."bom_bom as c";
+			$sql .= " WHERE c.fk_product = p.rowid";
+			$sql .= " AND c.entity = ".$conf->entity;
+			$sql .= " ORDER BY c.tms DESC, c.ref DESC";
+			$sql .= " ".$this->db->plimit($max, 0);
 
-            $result = $this->db->query($sql);
-            if ($result) {
-                $num = $this->db->num_rows($result);
+			$result = $this->db->query($sql);
+			if ($result) {
+				$num = $this->db->num_rows($result);
 
-                $line = 0;
+				$line = 0;
 
-                while ($line < $num) {
-                    $objp = $this->db->fetch_object($result);
-                    $datem = $this->db->jdate($objp->tms);
+				while ($line < $num) {
+					$objp = $this->db->fetch_object($result);
+					$datem = $this->db->jdate($objp->tms);
 
-                    $bomstatic->id = $objp->rowid;
-                    $bomstatic->ref = $objp->ref;
-                    $bomstatic->id = $objp->socid;
-                    $bomstatic->status = $objp->status;
+					$bomstatic->id = $objp->rowid;
+					$bomstatic->ref = $objp->ref;
+					$bomstatic->id = $objp->socid;
+					$bomstatic->status = $objp->status;
 
-                    $productstatic->ref = $objp->product_ref;
-                    $productstatic->status = $objp->tobuy;
-                    $productstatic->status_buy = $objp->tosell;
+					$productstatic->ref = $objp->product_ref;
+					$productstatic->status = $objp->tobuy;
+					$productstatic->status_buy = $objp->tosell;
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="nowraponall"',
-                        'text' => $bomstatic->getNomUrl(1),
-                        'asis' => 1,
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="nowraponall"',
+						'text' => $bomstatic->getNomUrl(1),
+						'asis' => 1,
+					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="tdoverflowmax150 maxwidth150onsmartphone"',
-                        'text' => $productstatic->getNomUrl(1),
-                        'asis' => 1,
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="tdoverflowmax150 maxwidth150onsmartphone"',
+						'text' => $productstatic->getNomUrl(1),
+						'asis' => 1,
+					);
 
-                    if (!empty($conf->global->BOM_BOX_LAST_BOMS_SHOW_VALIDATE_USER)) {
-                        if ($objp->fk_user_valid > 0) $userstatic->fetch($objp->fk_user_valid);
-                        $this->info_box_contents[$line][] = array(
-                            'td' => 'class="right"',
-                            'text' => (($objp->fk_user_valid > 0) ? $userstatic->getNomUrl(1) : ''),
-                            'asis' => 1,
-                        );
-                    }
+					if (!empty($conf->global->BOM_BOX_LAST_BOMS_SHOW_VALIDATE_USER)) {
+						if ($objp->fk_user_valid > 0) $userstatic->fetch($objp->fk_user_valid);
+						$this->info_box_contents[$line][] = array(
+							'td' => 'class="right"',
+							'text' => (($objp->fk_user_valid > 0) ? $userstatic->getNomUrl(1) : ''),
+							'asis' => 1,
+						);
+					}
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right"',
-                        'text' => dol_print_date($datem, 'day'),
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right"',
+						'text' => dol_print_date($datem, 'day'),
+					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right" width="18"',
-                        'text' => $bomstatic->LibStatut($objp->status, 3),
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right" width="18"',
+						'text' => $bomstatic->LibStatut($objp->status, 3),
+					);
 
-                    $line++;
-                }
+					$line++;
+				}
 
-                if ($num == 0) $this->info_box_contents[$line][0] = array(
-                	'td' => 'class="center opacitymedium"',
-                	'text'=>$langs->trans("NoRecordedOrders")
-                );
+				if ($num == 0) $this->info_box_contents[$line][0] = array(
+					'td' => 'class="center opacitymedium"',
+					'text'=>$langs->trans("NoRecordedOrders")
+				);
 
-                $this->db->free($result);
-            } else {
-                $this->info_box_contents[0][0] = array(
-                    'td' => '',
-                    'maxlength'=>500,
-                    'text' => ($this->db->error().' sql='.$sql),
-                );
-            }
-        } else {
-            $this->info_box_contents[0][0] = array(
-                'td' => 'class="nohover opacitymedium left"',
-                'text' => $langs->trans("ReadPermissionNotAllowed")
-            );
-        }
-    }
+				$this->db->free($result);
+			} else {
+				$this->info_box_contents[0][0] = array(
+					'td' => '',
+					'maxlength'=>500,
+					'text' => ($this->db->error().' sql='.$sql),
+				);
+			}
+		} else {
+			$this->info_box_contents[0][0] = array(
+				'td' => 'class="nohover opacitymedium left"',
+				'text' => $langs->trans("ReadPermissionNotAllowed")
+			);
+		}
+	}
 
 	/**
 	 *	Method to show box
@@ -182,8 +182,8 @@ class box_boms extends ModeleBoxes
 	 *  @param	int		$nooutput	No print, only return string
 	 *	@return	string
 	 */
-    public function showBox($head = null, $contents = null, $nooutput = 0)
-    {
-        return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
-    }
+	public function showBox($head = null, $contents = null, $nooutput = 0)
+	{
+		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+	}
 }
diff --git a/htdocs/core/boxes/box_bookmarks.php b/htdocs/core/boxes/box_bookmarks.php
index c81e226decb..795eaeccf36 100644
--- a/htdocs/core/boxes/box_bookmarks.php
+++ b/htdocs/core/boxes/box_bookmarks.php
@@ -28,20 +28,20 @@ include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
  */
 class box_bookmarks extends ModeleBoxes
 {
-    public $boxcode = "bookmarks";
-    public $boximg = "bookmark";
-    public $boxlabel = "BoxMyLastBookmarks";
-    public $depends = array("bookmark");
+	public $boxcode = "bookmarks";
+	public $boximg = "bookmark";
+	public $boxlabel = "BoxMyLastBookmarks";
+	public $depends = array("bookmark");
 
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $param;
+	public $param;
 
-    public $info_box_head = array();
-    public $info_box_contents = array();
+	public $info_box_head = array();
+	public $info_box_contents = array();
 
 
 	/**
@@ -52,18 +52,18 @@ class box_bookmarks extends ModeleBoxes
 	 */
 	public function __construct($db, $param)
 	{
-	    global $user;
+		global $user;
 
-	    $this->db = $db;
+		$this->db = $db;
 
-	    $this->hidden = !($user->rights->bookmark->lire);
+		$this->hidden = !($user->rights->bookmark->lire);
 	}
 
 	/**
-     *  Load data for box to show them later
-     *
-     *  @param	int		$max        Maximum number of records to load
-     *  @return	void
+	 *  Load data for box to show them later
+	 *
+	 *  @param	int		$max        Maximum number of records to load
+	 *  @return	void
 	 */
 	public function loadBox($max = 5)
 	{
@@ -73,10 +73,10 @@ class box_bookmarks extends ModeleBoxes
 		$this->max = $max;
 
 		$this->info_box_head = array(
-            'text' => $langs->trans("BoxMyLastBookmarks", $max),
-            'sublink' => DOL_URL_ROOT.'/bookmarks/list.php',
-        );
-        if ($user->rights->bookmark->creer) {
+			'text' => $langs->trans("BoxMyLastBookmarks", $max),
+			'sublink' => DOL_URL_ROOT.'/bookmarks/list.php',
+		);
+		if ($user->rights->bookmark->creer) {
 			$this->info_box_head['subpicto'] = 'bookmark';
 			$this->info_box_head['subtext'] = $langs->trans("BookmarksManagement");
 		} else {
@@ -89,7 +89,7 @@ class box_bookmarks extends ModeleBoxes
 			$sql = "SELECT b.title, b.url, b.target, b.favicon";
 			$sql .= " FROM ".MAIN_DB_PREFIX."bookmark as b";
 			$sql .= " WHERE fk_user = ".$user->id;
-            $sql .= " AND b.entity = ".$conf->entity;
+			$sql .= " AND b.entity = ".$conf->entity;
 			$sql .= $this->db->order("position", "ASC");
 			$sql .= $this->db->plimit($max, 0);
 
@@ -100,63 +100,63 @@ class box_bookmarks extends ModeleBoxes
 
 				$line = 0;
 
-                while ($line < $num) {
-                    $objp = $this->db->fetch_object($result);
+				while ($line < $num) {
+					$objp = $this->db->fetch_object($result);
 
-                    $this->info_box_contents[$line][0] = array(
-                        'td' => 'class="left" width="16"',
-                        'logo' => $this->boximg,
-                        'url' => $objp->url,
-                        'tooltip' => $objp->title,
-                        'target' => $objp->target ? 'newtab' : '',
-                    );
-                    $this->info_box_contents[$line][1] = array(
-                        'td' => '',
-                        'text' => $objp->title,
-                        'url' => $objp->url,
-                        'tooltip' => $objp->title,
-                        'target' => $objp->target ? 'newtab' : '',
-                    );
+					$this->info_box_contents[$line][0] = array(
+						'td' => 'class="left" width="16"',
+						'logo' => $this->boximg,
+						'url' => $objp->url,
+						'tooltip' => $objp->title,
+						'target' => $objp->target ? 'newtab' : '',
+					);
+					$this->info_box_contents[$line][1] = array(
+						'td' => '',
+						'text' => $objp->title,
+						'url' => $objp->url,
+						'tooltip' => $objp->title,
+						'target' => $objp->target ? 'newtab' : '',
+					);
 
-                    $line++;
-                }
+					$line++;
+				}
 
-                if ($num == 0) {
-                    $mytxt = $langs->trans("NoRecordedBookmarks");
-                    if ($user->rights->bookmark->creer) $mytxt .= ' '.$langs->trans("ClickToAdd");
-                    $this->info_box_contents[$line][0] = array(
-                        'td' => 'class="center" colspan="2"',
-                        'tooltip' => $mytxt,
-                        'url'=> DOL_URL_ROOT.'/bookmarks/list.php', 'text'=>$mytxt,
-                    );
-                }
+				if ($num == 0) {
+					$mytxt = $langs->trans("NoRecordedBookmarks");
+					if ($user->rights->bookmark->creer) $mytxt .= ' '.$langs->trans("ClickToAdd");
+					$this->info_box_contents[$line][0] = array(
+						'td' => 'class="center" colspan="2"',
+						'tooltip' => $mytxt,
+						'url'=> DOL_URL_ROOT.'/bookmarks/list.php', 'text'=>$mytxt,
+					);
+				}
 
-                $this->db->free($result);
-            } else {
-                $this->info_box_contents[0][0] = array(
-                    'td' => '',
-                    'maxlength'=>500,
-                    'text' => ($this->db->error().' sql='.$sql),
-                );
-            }
-        } else {
-            $this->info_box_contents[0][0] = array(
-                'td' => 'class="nohover opacitymedium left"',
-                'text' => $langs->trans("ReadPermissionNotAllowed")
-            );
-        }
-    }
+				$this->db->free($result);
+			} else {
+				$this->info_box_contents[0][0] = array(
+					'td' => '',
+					'maxlength'=>500,
+					'text' => ($this->db->error().' sql='.$sql),
+				);
+			}
+		} else {
+			$this->info_box_contents[0][0] = array(
+				'td' => 'class="nohover opacitymedium left"',
+				'text' => $langs->trans("ReadPermissionNotAllowed")
+			);
+		}
+	}
 
-    /**
-     *  Method to show box
-     *
-     *  @param	array	$head       Array with properties of box title
-     *  @param  array	$contents   Array with properties of box lines
-     *  @param	int		$nooutput	No print, only return string
-     *  @return	string
-     */
-    public function showBox($head = null, $contents = null, $nooutput = 0)
-    {
-        return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
-    }
+	/**
+	 *  Method to show box
+	 *
+	 *  @param	array	$head       Array with properties of box title
+	 *  @param  array	$contents   Array with properties of box lines
+	 *  @param	int		$nooutput	No print, only return string
+	 *  @return	string
+	 */
+	public function showBox($head = null, $contents = null, $nooutput = 0)
+	{
+		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+	}
 }
diff --git a/htdocs/core/boxes/box_clients.php b/htdocs/core/boxes/box_clients.php
index 00cad787e0b..816facc3ee4 100644
--- a/htdocs/core/boxes/box_clients.php
+++ b/htdocs/core/boxes/box_clients.php
@@ -32,27 +32,27 @@ include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
  */
 class box_clients extends ModeleBoxes
 {
-    public $boxcode = "lastcustomers";
-    public $boximg = "object_company";
-    public $boxlabel = "BoxLastCustomers";
-    public $depends = array("societe");
+	public $boxcode = "lastcustomers";
+	public $boximg = "object_company";
+	public $boxlabel = "BoxLastCustomers";
+	public $depends = array("societe");
 
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $enabled = 1;
+	public $enabled = 1;
 
-    public $info_box_head = array();
-    public $info_box_contents = array();
+	public $info_box_head = array();
+	public $info_box_contents = array();
 
 
 	/**
 	 *  Constructor
 	 *
 	 *  @param  DoliDB	$db      	Database handler
-     *  @param	string	$param		More parameters
+	 *  @param	string	$param		More parameters
 	 */
 	public function __construct($db, $param = '')
 	{
@@ -67,10 +67,10 @@ class box_clients extends ModeleBoxes
 	}
 
 	/**
-     *  Load data for box to show them later
-     *
-     *  @param	int		$max        Maximum number of records to load
-     *  @return	void
+	 *  Load data for box to show them later
+	 *
+	 *  @param	int		$max        Maximum number of records to load
+	 *  @return	void
 	 */
 	public function loadBox($max = 5)
 	{
@@ -79,23 +79,23 @@ class box_clients extends ModeleBoxes
 
 		$this->max = $max;
 
-        include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
-        $thirdpartystatic = new Societe($this->db);
+		include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
+		$thirdpartystatic = new Societe($this->db);
 
-        $this->info_box_head = array('text' => $langs->trans("BoxTitleLastModifiedCustomers", $max));
+		$this->info_box_head = array('text' => $langs->trans("BoxTitleLastModifiedCustomers", $max));
 
 		if ($user->rights->societe->lire)
 		{
 			$sql = "SELECT s.nom as name, s.rowid as socid";
-            $sql .= ", s.code_client";
-            $sql .= ", s.client";
-            $sql .= ", s.code_fournisseur";
-            $sql .= ", s.fournisseur";
-            $sql .= ", s.code_compta";
-            $sql .= ", s.code_compta_fournisseur";
-            $sql .= ", s.logo";
-            $sql .= ", s.email";
-            $sql .= ", s.datec, s.tms, s.status, s.entity";
+			$sql .= ", s.code_client";
+			$sql .= ", s.client";
+			$sql .= ", s.code_fournisseur";
+			$sql .= ", s.fournisseur";
+			$sql .= ", s.code_compta";
+			$sql .= ", s.code_compta_fournisseur";
+			$sql .= ", s.logo";
+			$sql .= ", s.email";
+			$sql .= ", s.datec, s.tms, s.status, s.entity";
 			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 			$sql .= " WHERE s.client IN (1, 3)";
@@ -117,33 +117,33 @@ class box_clients extends ModeleBoxes
 					$objp = $this->db->fetch_object($result);
 					$datec = $this->db->jdate($objp->datec);
 					$datem = $this->db->jdate($objp->tms);
-                    $thirdpartystatic->id = $objp->socid;
-                    $thirdpartystatic->name = $objp->name;
-                    $thirdpartystatic->code_client = $objp->code_client;
-                    $thirdpartystatic->code_fournisseur = $objp->code_fournisseur;
-                    $thirdpartystatic->code_compta = $objp->code_compta;
-                    $thirdpartystatic->code_compta_fournisseur = $objp->code_compta_fournisseur;
-                    $thirdpartystatic->client = $objp->client;
-                    $thirdpartystatic->fournisseur = $objp->fournisseur;
-                    $thirdpartystatic->logo = $objp->logo;
-                    $thirdpartystatic->email = $objp->email;
+					$thirdpartystatic->id = $objp->socid;
+					$thirdpartystatic->name = $objp->name;
+					$thirdpartystatic->code_client = $objp->code_client;
+					$thirdpartystatic->code_fournisseur = $objp->code_fournisseur;
+					$thirdpartystatic->code_compta = $objp->code_compta;
+					$thirdpartystatic->code_compta_fournisseur = $objp->code_compta_fournisseur;
+					$thirdpartystatic->client = $objp->client;
+					$thirdpartystatic->fournisseur = $objp->fournisseur;
+					$thirdpartystatic->logo = $objp->logo;
+					$thirdpartystatic->email = $objp->email;
 					$thirdpartystatic->entity = $objp->entity;
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => '',
-                        'text' => $thirdpartystatic->getNomUrl(1),
-                        'asis' => 1,
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => '',
+						'text' => $thirdpartystatic->getNomUrl(1),
+						'asis' => 1,
+					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right"',
-                        'text' => dol_print_date($datem, "day")
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right"',
+						'text' => dol_print_date($datem, "day")
+					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right" width="18"',
-                        'text' => $thirdpartystatic->LibStatut($objp->status, 3)
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right" width="18"',
+						'text' => $thirdpartystatic->LibStatut($objp->status, 3)
+					);
 
 					$line++;
 				}
@@ -156,15 +156,15 @@ class box_clients extends ModeleBoxes
 				$this->db->free($result);
 			} else {
 				$this->info_box_contents[0][0] = array(
-                    'td' => '',
-                    'maxlength'=>500,
-                    'text' => ($this->db->error().' sql='.$sql)
-                );
+					'td' => '',
+					'maxlength'=>500,
+					'text' => ($this->db->error().' sql='.$sql)
+				);
 			}
 		} else {
 			$this->info_box_contents[0][0] = array(
-			    'td' => 'class="nohover opacitymedium left"',
-                'text' => $langs->trans("ReadPermissionNotAllowed")
+				'td' => 'class="nohover opacitymedium left"',
+				'text' => $langs->trans("ReadPermissionNotAllowed")
 			);
 		}
 	}
@@ -177,8 +177,8 @@ class box_clients extends ModeleBoxes
 	 *  @param	int		$nooutput	No print, only return string
 	 *	@return	string
 	 */
-    public function showBox($head = null, $contents = null, $nooutput = 0)
-    {
+	public function showBox($head = null, $contents = null, $nooutput = 0)
+	{
 		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
 }
diff --git a/htdocs/core/boxes/box_commandes.php b/htdocs/core/boxes/box_commandes.php
index 90729b96017..c94353f1d5c 100644
--- a/htdocs/core/boxes/box_commandes.php
+++ b/htdocs/core/boxes/box_commandes.php
@@ -32,168 +32,168 @@ include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
  */
 class box_commandes extends ModeleBoxes
 {
-    public $boxcode = "lastcustomerorders";
-    public $boximg = "object_order";
-    public $boxlabel = "BoxLastCustomerOrders";
-    public $depends = array("commande");
+	public $boxcode = "lastcustomerorders";
+	public $boximg = "object_order";
+	public $boxlabel = "BoxLastCustomerOrders";
+	public $depends = array("commande");
 
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $param;
+	public $param;
 
-    public $info_box_head = array();
-    public $info_box_contents = array();
+	public $info_box_head = array();
+	public $info_box_contents = array();
 
 
-    /**
-     *  Constructor
-     *
-     *  @param  DoliDB  $db         Database handler
-     *  @param  string  $param      More parameters
-     */
-    public function __construct($db, $param)
-    {
-        global $user;
+	/**
+	 *  Constructor
+	 *
+	 *  @param  DoliDB  $db         Database handler
+	 *  @param  string  $param      More parameters
+	 */
+	public function __construct($db, $param)
+	{
+		global $user;
 
-        $this->db = $db;
+		$this->db = $db;
 
-        $this->hidden = !($user->rights->commande->lire);
-    }
+		$this->hidden = !($user->rights->commande->lire);
+	}
 
-    /**
-     *  Load data for box to show them later
-     *
-     *  @param	int		$max        Maximum number of records to load
-     *  @return	void
-     */
-    public function loadBox($max = 5)
-    {
-        global $user, $langs, $conf;
-        $langs->load('orders');
+	/**
+	 *  Load data for box to show them later
+	 *
+	 *  @param	int		$max        Maximum number of records to load
+	 *  @return	void
+	 */
+	public function loadBox($max = 5)
+	{
+		global $user, $langs, $conf;
+		$langs->load('orders');
 
-        $this->max = $max;
+		$this->max = $max;
 
-        include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
-        include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
+		include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
+		include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 
-        $commandestatic = new Commande($this->db);
-        $societestatic = new Societe($this->db);
-        $userstatic = new User($this->db);
+		$commandestatic = new Commande($this->db);
+		$societestatic = new Societe($this->db);
+		$userstatic = new User($this->db);
 
-        $this->info_box_head = array('text' => $langs->trans("BoxTitleLast".($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE ? "" : "Modified")."CustomerOrders", $max));
+		$this->info_box_head = array('text' => $langs->trans("BoxTitleLast".($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE ? "" : "Modified")."CustomerOrders", $max));
 
-        if ($user->rights->commande->lire)
-        {
-            $sql = "SELECT s.nom as name";
-            $sql .= ", s.rowid as socid";
-            $sql .= ", s.code_client";
-            $sql .= ", s.logo, s.email";
-            $sql .= ", c.ref, c.tms";
-            $sql .= ", c.rowid";
-            $sql .= ", c.date_commande";
-            $sql .= ", c.ref_client";
-            $sql .= ", c.fk_statut";
-            $sql .= ", c.fk_user_valid";
-            $sql .= ", c.facture";
-            $sql .= ", c.total_ht";
-            $sql .= ", c.tva as total_tva";
-            $sql .= ", c.total_ttc";
-            $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
-            $sql .= ", ".MAIN_DB_PREFIX."commande as c";
-            if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-            $sql .= " WHERE c.fk_soc = s.rowid";
-            $sql .= " AND c.entity IN (".getEntity('commande').")";
-            if (!empty($conf->global->ORDER_BOX_LAST_ORDERS_VALIDATED_ONLY)) $sql .= " AND c.fk_statut = 1";
-            if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
-            if ($user->socid) $sql .= " AND s.rowid = ".$user->socid;
-            if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) $sql .= " ORDER BY c.date_commande DESC, c.ref DESC ";
-            else $sql .= " ORDER BY c.tms DESC, c.ref DESC ";
-            $sql .= $this->db->plimit($max, 0);
+		if ($user->rights->commande->lire)
+		{
+			$sql = "SELECT s.nom as name";
+			$sql .= ", s.rowid as socid";
+			$sql .= ", s.code_client";
+			$sql .= ", s.logo, s.email";
+			$sql .= ", c.ref, c.tms";
+			$sql .= ", c.rowid";
+			$sql .= ", c.date_commande";
+			$sql .= ", c.ref_client";
+			$sql .= ", c.fk_statut";
+			$sql .= ", c.fk_user_valid";
+			$sql .= ", c.facture";
+			$sql .= ", c.total_ht";
+			$sql .= ", c.tva as total_tva";
+			$sql .= ", c.total_ttc";
+			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+			$sql .= ", ".MAIN_DB_PREFIX."commande as c";
+			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+			$sql .= " WHERE c.fk_soc = s.rowid";
+			$sql .= " AND c.entity IN (".getEntity('commande').")";
+			if (!empty($conf->global->ORDER_BOX_LAST_ORDERS_VALIDATED_ONLY)) $sql .= " AND c.fk_statut = 1";
+			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+			if ($user->socid) $sql .= " AND s.rowid = ".$user->socid;
+			if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) $sql .= " ORDER BY c.date_commande DESC, c.ref DESC ";
+			else $sql .= " ORDER BY c.tms DESC, c.ref DESC ";
+			$sql .= $this->db->plimit($max, 0);
 
-            $result = $this->db->query($sql);
-            if ($result) {
-                $num = $this->db->num_rows($result);
+			$result = $this->db->query($sql);
+			if ($result) {
+				$num = $this->db->num_rows($result);
 
-                $line = 0;
+				$line = 0;
 
-                while ($line < $num) {
-                    $objp = $this->db->fetch_object($result);
-                    $date = $this->db->jdate($objp->date_commande);
-                    $datem = $this->db->jdate($objp->tms);
-                    $commandestatic->id = $objp->rowid;
-                    $commandestatic->ref = $objp->ref;
-                    $commandestatic->ref_client = $objp->ref_client;
-                    $commandestatic->total_ht = $objp->total_ht;
-                    $commandestatic->total_tva = $objp->total_tva;
-                    $commandestatic->total_ttc = $objp->total_ttc;
-                    $societestatic->id = $objp->socid;
-                    $societestatic->name = $objp->name;
-                    $societestatic->email = $objp->email;
-                    $societestatic->code_client = $objp->code_client;
-                    $societestatic->logo = $objp->logo;
+				while ($line < $num) {
+					$objp = $this->db->fetch_object($result);
+					$date = $this->db->jdate($objp->date_commande);
+					$datem = $this->db->jdate($objp->tms);
+					$commandestatic->id = $objp->rowid;
+					$commandestatic->ref = $objp->ref;
+					$commandestatic->ref_client = $objp->ref_client;
+					$commandestatic->total_ht = $objp->total_ht;
+					$commandestatic->total_tva = $objp->total_tva;
+					$commandestatic->total_ttc = $objp->total_ttc;
+					$societestatic->id = $objp->socid;
+					$societestatic->name = $objp->name;
+					$societestatic->email = $objp->email;
+					$societestatic->code_client = $objp->code_client;
+					$societestatic->logo = $objp->logo;
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="nowraponall"',
-                        'text' => $commandestatic->getNomUrl(1),
-                        'asis' => 1,
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="nowraponall"',
+						'text' => $commandestatic->getNomUrl(1),
+						'asis' => 1,
+					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="tdoverflowmax150 maxwidth150onsmartphone"',
-                        'text' => $societestatic->getNomUrl(1),
-                        'asis' => 1,
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="tdoverflowmax150 maxwidth150onsmartphone"',
+						'text' => $societestatic->getNomUrl(1),
+						'asis' => 1,
+					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="nowraponall right"',
-                        'text' => price($objp->total_ht, 0, $langs, 0, -1, -1, $conf->currency),
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="nowraponall right"',
+						'text' => price($objp->total_ht, 0, $langs, 0, -1, -1, $conf->currency),
+					);
 
-                    if (!empty($conf->global->ORDER_BOX_LAST_ORDERS_SHOW_VALIDATE_USER)) {
-                        if ($objp->fk_user_valid > 0) $userstatic->fetch($objp->fk_user_valid);
-                        $this->info_box_contents[$line][] = array(
-                            'td' => 'class="right"',
-                            'text' => (($objp->fk_user_valid > 0) ? $userstatic->getNomUrl(1) : ''),
-                            'asis' => 1,
-                        );
-                    }
+					if (!empty($conf->global->ORDER_BOX_LAST_ORDERS_SHOW_VALIDATE_USER)) {
+						if ($objp->fk_user_valid > 0) $userstatic->fetch($objp->fk_user_valid);
+						$this->info_box_contents[$line][] = array(
+							'td' => 'class="right"',
+							'text' => (($objp->fk_user_valid > 0) ? $userstatic->getNomUrl(1) : ''),
+							'asis' => 1,
+						);
+					}
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right"',
-                        'text' => dol_print_date($date, 'day'),
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right"',
+						'text' => dol_print_date($date, 'day'),
+					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right" width="18"',
-                        'text' => $commandestatic->LibStatut($objp->fk_statut, $objp->facture, 3),
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right" width="18"',
+						'text' => $commandestatic->LibStatut($objp->fk_statut, $objp->facture, 3),
+					);
 
-                    $line++;
-                }
+					$line++;
+				}
 
-                if ($num == 0) $this->info_box_contents[$line][0] = array(
-                	'td' => 'class="center opacitymedium"',
-                	'text'=>$langs->trans("NoRecordedOrders")
-                );
+				if ($num == 0) $this->info_box_contents[$line][0] = array(
+					'td' => 'class="center opacitymedium"',
+					'text'=>$langs->trans("NoRecordedOrders")
+				);
 
-                $this->db->free($result);
-            } else {
-                $this->info_box_contents[0][0] = array(
-                    'td' => '',
-                    'maxlength'=>500,
-                    'text' => ($this->db->error().' sql='.$sql),
-                );
-            }
-        } else {
-            $this->info_box_contents[0][0] = array(
-                'td' => 'class="nohover opacitymedium left"',
-                'text' => $langs->trans("ReadPermissionNotAllowed")
-            );
-        }
-    }
+				$this->db->free($result);
+			} else {
+				$this->info_box_contents[0][0] = array(
+					'td' => '',
+					'maxlength'=>500,
+					'text' => ($this->db->error().' sql='.$sql),
+				);
+			}
+		} else {
+			$this->info_box_contents[0][0] = array(
+				'td' => 'class="nohover opacitymedium left"',
+				'text' => $langs->trans("ReadPermissionNotAllowed")
+			);
+		}
+	}
 
 	/**
 	 *	Method to show box
@@ -203,8 +203,8 @@ class box_commandes extends ModeleBoxes
 	 *  @param	int		$nooutput	No print, only return string
 	 *	@return	string
 	 */
-    public function showBox($head = null, $contents = null, $nooutput = 0)
-    {
-        return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
-    }
+	public function showBox($head = null, $contents = null, $nooutput = 0)
+	{
+		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+	}
 }
diff --git a/htdocs/core/boxes/box_comptes.php b/htdocs/core/boxes/box_comptes.php
index b3f23817712..53be2725680 100644
--- a/htdocs/core/boxes/box_comptes.php
+++ b/htdocs/core/boxes/box_comptes.php
@@ -33,28 +33,28 @@ include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
  */
 class box_comptes extends ModeleBoxes
 {
-    public $boxcode = "currentaccounts";
-    public $boximg = "object_bill";
-    public $boxlabel = "BoxCurrentAccounts";
-    public $depends = array("banque"); // Box active if module banque active
+	public $boxcode = "currentaccounts";
+	public $boximg = "object_bill";
+	public $boxlabel = "BoxCurrentAccounts";
+	public $depends = array("banque"); // Box active if module banque active
 
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $param;
-    public $enabled = 1;
+	public $param;
+	public $enabled = 1;
 
-    public $info_box_head = array();
-    public $info_box_contents = array();
+	public $info_box_head = array();
+	public $info_box_contents = array();
 
 
 	/**
 	 *  Constructor
 	 *
 	 *  @param  DoliDB	$db      	Database handler
-     *  @param	string	$param		More parameters
+	 *  @param	string	$param		More parameters
 	 */
 	public function __construct($db, $param = '')
 	{
@@ -73,7 +73,7 @@ class box_comptes extends ModeleBoxes
 	 *  Load data into info_box_contents array to show array later.
 	 *
 	 *  @param	int		$max        Maximum number of records to load
-     *  @return	void
+	 *  @return	void
 	 */
 	public function loadBox($max = 5)
 	{
@@ -83,109 +83,109 @@ class box_comptes extends ModeleBoxes
 
 		$this->info_box_head = array('text' => $langs->trans("BoxTitleCurrentAccounts"));
 
-        if ($user->rights->banque->lire) {
+		if ($user->rights->banque->lire) {
 			$sql = "SELECT b.rowid, b.ref, b.label, b.bank,b.number, b.courant, b.clos, b.rappro, b.url";
 			$sql .= ", b.code_banque, b.code_guichet, b.cle_rib, b.bic, b.iban_prefix as iban";
 			$sql .= ", b.domiciliation, b.proprio, b.owner_address";
 			$sql .= ", b.account_number, b.currency_code";
 			$sql .= ", b.min_allowed, b.min_desired, comment";
-            $sql .= ', b.fk_accountancy_journal';
-            $sql .= ', aj.code as accountancy_journal';
-            $sql .= " FROM ".MAIN_DB_PREFIX."bank_account as b";
-            $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'accounting_journal as aj ON aj.rowid=b.fk_accountancy_journal';
-            $sql .= " WHERE b.entity = ".$conf->entity;
+			$sql .= ', b.fk_accountancy_journal';
+			$sql .= ', aj.code as accountancy_journal';
+			$sql .= " FROM ".MAIN_DB_PREFIX."bank_account as b";
+			$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'accounting_journal as aj ON aj.rowid=b.fk_accountancy_journal';
+			$sql .= " WHERE b.entity = ".$conf->entity;
 			$sql .= " AND clos = 0";
 			//$sql.= " AND courant = 1";
 			$sql .= " ORDER BY label";
 			$sql .= $this->db->plimit($max, 0);
 
-            dol_syslog(get_class($this)."::loadBox", LOG_DEBUG);
-            $result = $this->db->query($sql);
-            if ($result) {
-                $num = $this->db->num_rows($result);
+			dol_syslog(get_class($this)."::loadBox", LOG_DEBUG);
+			$result = $this->db->query($sql);
+			if ($result) {
+				$num = $this->db->num_rows($result);
 
-                $line = 0;
-                $solde_total = array();
+				$line = 0;
+				$solde_total = array();
 
-                $account_static = new Account($this->db);
-                while ($line < $num) {
-                    $objp = $this->db->fetch_object($result);
+				$account_static = new Account($this->db);
+				while ($line < $num) {
+					$objp = $this->db->fetch_object($result);
 
-                    $account_static->id = $objp->rowid;
+					$account_static->id = $objp->rowid;
 					$account_static->ref = $objp->ref;
-                    $account_static->label = $objp->label;
-                    $account_static->number = $objp->number;
-                    $account_static->account_number = $objp->account_number;
-                    $account_static->currency_code = $objp->currency_code;
-                    $account_static->accountancy_journal = $objp->accountancy_journal;
-                    $solde = $account_static->solde(0);
+					$account_static->label = $objp->label;
+					$account_static->number = $objp->number;
+					$account_static->account_number = $objp->account_number;
+					$account_static->currency_code = $objp->currency_code;
+					$account_static->accountancy_journal = $objp->accountancy_journal;
+					$solde = $account_static->solde(0);
 
-                    $solde_total[$objp->currency_code] += $solde;
+					$solde_total[$objp->currency_code] += $solde;
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => '',
-                        'text' => $account_static->getNomUrl(1),
-                        'asis' => 1,
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => '',
+						'text' => $account_static->getNomUrl(1),
+						'asis' => 1,
+					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => '',
-                        'text' => $objp->number,
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => '',
+						'text' => $objp->number,
+					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right nowraponall"',
-                        'text' => price($solde, 0, $langs, 0, -1, -1, $objp->currency_code)
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right nowraponall"',
+						'text' => price($solde, 0, $langs, 0, -1, -1, $objp->currency_code)
+					);
 
-                    $line++;
-                }
+					$line++;
+				}
 
-                // Total
-                foreach ($solde_total as $key=>$solde) {
-                    $this->info_box_contents[$line][] = array(
-                        'tr' => 'class="liste_total"',
-                        'td' => 'class="liste_total left"',
-                        'text' => $langs->trans('Total').' '.$key,
-                    );
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="liste_total right"',
-                        'text' => '&nbsp;'
-                    );
+				// Total
+				foreach ($solde_total as $key=>$solde) {
+					$this->info_box_contents[$line][] = array(
+						'tr' => 'class="liste_total"',
+						'td' => 'class="liste_total left"',
+						'text' => $langs->trans('Total').' '.$key,
+					);
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="liste_total right"',
+						'text' => '&nbsp;'
+					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="liste_total right nowraponall"',
-                        'text' => price($solde, 0, $langs, 0, -1, -1, $key)
-                    );
-                    $line++;
-                }
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="liste_total right nowraponall"',
+						'text' => price($solde, 0, $langs, 0, -1, -1, $key)
+					);
+					$line++;
+				}
 
-                $this->db->free($result);
-            } else {
-                $this->info_box_contents[0][0] = array(
-                    'td' => '',
-                    'maxlength'=>500,
-                    'text' => ($this->db->error().' sql='.$sql),
-                );
-            }
-        } else {
-            $this->info_box_contents[0][0] = array(
-                'td' => 'class="nohover opacitymedium left"',
-                'text' => $langs->trans("ReadPermissionNotAllowed")
-            );
-        }
+				$this->db->free($result);
+			} else {
+				$this->info_box_contents[0][0] = array(
+					'td' => '',
+					'maxlength'=>500,
+					'text' => ($this->db->error().' sql='.$sql),
+				);
+			}
+		} else {
+			$this->info_box_contents[0][0] = array(
+				'td' => 'class="nohover opacitymedium left"',
+				'text' => $langs->trans("ReadPermissionNotAllowed")
+			);
+		}
 	}
 
-    /**
-     *  Method to show box
-     *
-     *  @param  array   $head       Array with properties of box title
-     *  @param  array   $contents   Array with properties of box lines
-     *  @param  int     $nooutput   No print, only return string
-     *  @return string
-     */
-    public function showBox($head = null, $contents = null, $nooutput = 0)
-    {
-        return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
-    }
+	/**
+	 *  Method to show box
+	 *
+	 *  @param  array   $head       Array with properties of box title
+	 *  @param  array   $contents   Array with properties of box lines
+	 *  @param  int     $nooutput   No print, only return string
+	 *  @return string
+	 */
+	public function showBox($head = null, $contents = null, $nooutput = 0)
+	{
+		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+	}
 }
diff --git a/htdocs/core/boxes/box_contacts.php b/htdocs/core/boxes/box_contacts.php
index 7141728c23d..c3756bfd86c 100644
--- a/htdocs/core/boxes/box_contacts.php
+++ b/htdocs/core/boxes/box_contacts.php
@@ -35,20 +35,20 @@ include_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
  */
 class box_contacts extends ModeleBoxes
 {
-    public $boxcode = "lastcontacts";
-    public $boximg = "object_contact";
-    public $boxlabel = "BoxLastContacts";
-    public $depends = array("societe");
+	public $boxcode = "lastcontacts";
+	public $boximg = "object_contact";
+	public $boxlabel = "BoxLastContacts";
+	public $depends = array("societe");
 
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $param;
+	public $param;
 
-    public $info_box_head = array();
-    public $info_box_contents = array();
+	public $info_box_head = array();
+	public $info_box_contents = array();
 
 
 	/**
@@ -59,18 +59,18 @@ class box_contacts extends ModeleBoxes
 	 */
 	public function __construct($db, $param)
 	{
-	    global $user;
+		global $user;
 
-	    $this->db = $db;
+		$this->db = $db;
 
-	    $this->hidden = !($user->rights->societe->lire && $user->rights->societe->contact->lire);
+		$this->hidden = !($user->rights->societe->lire && $user->rights->societe->contact->lire);
 	}
 
 	/**
 	 *  Load data into info_box_contents array to show array later.
 	 *
 	 *  @param	int		$max        Maximum number of records to load
-     *  @return	void
+	 *  @return	void
 	 */
 	public function loadBox($max = 5)
 	{
@@ -121,7 +121,7 @@ class box_contacts extends ModeleBoxes
 					$contactstatic->phone_pro = $objp->phone;
 					$contactstatic->phone_perso = $objp->phone_perso;
 					$contactstatic->phone_mobile = $objp->phone_mobile;
-                    $contactstatic->email = $objp->spemail;
+					$contactstatic->email = $objp->spemail;
 					$contactstatic->address = $objp->address;
 					$contactstatic->zip = $objp->zip;
 					$contactstatic->town = $objp->town;
@@ -130,7 +130,7 @@ class box_contacts extends ModeleBoxes
 
 					$societestatic->id = $objp->fk_soc;
 					$societestatic->name = $objp->socname;
-                    $societestatic->email = $objp->semail;
+					$societestatic->email = $objp->semail;
 					$societestatic->name_alias = $objp->name_alias;
 					$societestatic->code_client = $objp->code_client;
 					$societestatic->code_fournisseur = $objp->code_fournisseur;
diff --git a/htdocs/core/boxes/box_contracts.php b/htdocs/core/boxes/box_contracts.php
index 75fbc207134..9350bae2da9 100644
--- a/htdocs/core/boxes/box_contracts.php
+++ b/htdocs/core/boxes/box_contracts.php
@@ -31,158 +31,158 @@ include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
  */
 class box_contracts extends ModeleBoxes
 {
-    public $boxcode = "lastcontracts";
-    public $boximg = "object_contract";
-    public $boxlabel = "BoxLastContracts";
-    public $depends = array("contrat"); // conf->contrat->enabled
+	public $boxcode = "lastcontracts";
+	public $boximg = "object_contract";
+	public $boxlabel = "BoxLastContracts";
+	public $depends = array("contrat"); // conf->contrat->enabled
 
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $param;
+	public $param;
 
-    public $info_box_head = array();
-    public $info_box_contents = array();
+	public $info_box_head = array();
+	public $info_box_contents = array();
 
 
-    /**
-     *  Constructor
-     *
-     *  @param  DoliDB  $db         Database handler
-     *  @param  string  $param      More parameters
-     */
-    public function __construct($db, $param)
-    {
-        global $user;
+	/**
+	 *  Constructor
+	 *
+	 *  @param  DoliDB  $db         Database handler
+	 *  @param  string  $param      More parameters
+	 */
+	public function __construct($db, $param)
+	{
+		global $user;
 
-        $this->db = $db;
+		$this->db = $db;
 
-        $this->hidden = !($user->rights->contrat->lire);
-    }
+		$this->hidden = !($user->rights->contrat->lire);
+	}
 
-    /**
-     *  Load data for box to show them later
-     *
-     *  @param	int		$max        Maximum number of records to load
-     *  @return	void
-     */
-    public function loadBox($max = 5)
-    {
-    	global $user, $langs, $conf;
+	/**
+	 *  Load data for box to show them later
+	 *
+	 *  @param	int		$max        Maximum number of records to load
+	 *  @return	void
+	 */
+	public function loadBox($max = 5)
+	{
+		global $user, $langs, $conf;
 
-    	$this->max = $max;
+		$this->max = $max;
 
-    	include_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
+		include_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
 
-    	$this->info_box_head = array('text' => $langs->trans("BoxTitleLastContracts", $max));
+		$this->info_box_head = array('text' => $langs->trans("BoxTitleLastContracts", $max));
 
-    	if ($user->rights->contrat->lire)
-    	{
-        	$contractstatic = new Contrat($this->db);
-        	$thirdpartytmp = new Societe($this->db);
+		if ($user->rights->contrat->lire)
+		{
+			$contractstatic = new Contrat($this->db);
+			$thirdpartytmp = new Societe($this->db);
 
-    	    $sql = "SELECT s.nom as name, s.rowid as socid, s.email, s.client, s.fournisseur, s.code_client, s.code_fournisseur, s.code_compta, s.code_compta_fournisseur,";
-            $sql .= " c.rowid, c.ref, c.statut as fk_statut, c.date_contrat, c.datec, c.fin_validite, c.date_cloture";
-            $sql .= ", c.ref_customer, c.ref_supplier";
-    		$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."contrat as c";
-    		if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-    		$sql .= " WHERE c.fk_soc = s.rowid";
-    		$sql .= " AND c.entity = ".$conf->entity;
-    		if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
-    		if ($user->socid) $sql .= " AND s.rowid = ".$user->socid;
-    		if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) $sql .= " ORDER BY c.date_contrat DESC, c.ref DESC ";
-    		else $sql .= " ORDER BY c.tms DESC, c.ref DESC ";
-    		$sql .= $this->db->plimit($max, 0);
+			$sql = "SELECT s.nom as name, s.rowid as socid, s.email, s.client, s.fournisseur, s.code_client, s.code_fournisseur, s.code_compta, s.code_compta_fournisseur,";
+			$sql .= " c.rowid, c.ref, c.statut as fk_statut, c.date_contrat, c.datec, c.fin_validite, c.date_cloture";
+			$sql .= ", c.ref_customer, c.ref_supplier";
+			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."contrat as c";
+			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+			$sql .= " WHERE c.fk_soc = s.rowid";
+			$sql .= " AND c.entity = ".$conf->entity;
+			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+			if ($user->socid) $sql .= " AND s.rowid = ".$user->socid;
+			if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) $sql .= " ORDER BY c.date_contrat DESC, c.ref DESC ";
+			else $sql .= " ORDER BY c.tms DESC, c.ref DESC ";
+			$sql .= $this->db->plimit($max, 0);
 
-    		$resql = $this->db->query($sql);
-    		if ($resql)
-    		{
-    			$num = $this->db->num_rows($resql);
-    			$now = dol_now();
+			$resql = $this->db->query($sql);
+			if ($resql)
+			{
+				$num = $this->db->num_rows($resql);
+				$now = dol_now();
 
-    			$line = 0;
+				$line = 0;
 
-    			$langs->load("contracts");
+				$langs->load("contracts");
 
-                while ($line < $num)
-                {
-    				$objp = $this->db->fetch_object($resql);
+				while ($line < $num)
+				{
+					$objp = $this->db->fetch_object($resql);
 
-    				$datec = $this->db->jdate($objp->datec);
-    				$dateterm = $this->db->jdate($objp->fin_validite);
-    				$dateclose = $this->db->jdate($objp->date_cloture);
-    				$late = '';
+					$datec = $this->db->jdate($objp->datec);
+					$dateterm = $this->db->jdate($objp->fin_validite);
+					$dateclose = $this->db->jdate($objp->date_cloture);
+					$late = '';
 
-    				$contractstatic->statut = $objp->fk_statut;
-    				$contractstatic->id = $objp->rowid;
-    				$contractstatic->ref = $objp->ref;
-    				$contractstatic->ref_customer = $objp->ref_customer;
-    				$contractstatic->ref_supplier = $objp->ref_supplier;
-    				$result = $contractstatic->fetch_lines();
+					$contractstatic->statut = $objp->fk_statut;
+					$contractstatic->id = $objp->rowid;
+					$contractstatic->ref = $objp->ref;
+					$contractstatic->ref_customer = $objp->ref_customer;
+					$contractstatic->ref_supplier = $objp->ref_supplier;
+					$result = $contractstatic->fetch_lines();
 
-    				$thirdpartytmp->name = $objp->name;
-    				$thirdpartytmp->id = $objp->socid;
-    				$thirdpartytmp->email = $objp->email;
-    				$thirdpartytmp->client = $objp->client;
-    				$thirdpartytmp->fournisseur = $objp->fournisseur;
-    				$thirdpartytmp->code_client = $objp->code_client;
-    				$thirdpartytmp->code_fournisseur = $objp->code_fournisseur;
-    				$thirdpartytmp->code_compta = $objp->code_compta;
-    				$thirdpartytmp->code_compta_fournisseur = $objp->code_compta_fournisseur;
+					$thirdpartytmp->name = $objp->name;
+					$thirdpartytmp->id = $objp->socid;
+					$thirdpartytmp->email = $objp->email;
+					$thirdpartytmp->client = $objp->client;
+					$thirdpartytmp->fournisseur = $objp->fournisseur;
+					$thirdpartytmp->code_client = $objp->code_client;
+					$thirdpartytmp->code_fournisseur = $objp->code_fournisseur;
+					$thirdpartytmp->code_compta = $objp->code_compta;
+					$thirdpartytmp->code_compta_fournisseur = $objp->code_compta_fournisseur;
 
-    				// fin_validite is no more on contract but on services
-    				// if ($objp->fk_statut == 1 && $dateterm < ($now - $conf->contrat->cloture->warning_delay)) { $late = img_warning($langs->trans("Late")); }
+					// fin_validite is no more on contract but on services
+					// if ($objp->fk_statut == 1 && $dateterm < ($now - $conf->contrat->cloture->warning_delay)) { $late = img_warning($langs->trans("Late")); }
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="nowraponall"',
-                        'text' => $contractstatic->getNomUrl(1),
-                        'text2'=> $late,
-                        'asis'=>1
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="nowraponall"',
+						'text' => $contractstatic->getNomUrl(1),
+						'text2'=> $late,
+						'asis'=>1
+					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="tdoverflowmax150 maxwidth150onsmartphone"',
-                        'text' => $thirdpartytmp->getNomUrl(1),
-                        'asis'=>1
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="tdoverflowmax150 maxwidth150onsmartphone"',
+						'text' => $thirdpartytmp->getNomUrl(1),
+						'asis'=>1
+					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right"',
-                        'text' => dol_print_date($datec, 'day'),
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right"',
+						'text' => dol_print_date($datec, 'day'),
+					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="nowraponall right"',
-                        'text' => $contractstatic->getLibStatut(7),
-                        'asis'=>1,
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="nowraponall right"',
+						'text' => $contractstatic->getLibStatut(7),
+						'asis'=>1,
+					);
 
-                    $line++;
-                }
+					$line++;
+				}
 
-                if ($num == 0)
-                    $this->info_box_contents[$line][0] = array(
-                        'td' => 'class="center opacitymedium"',
-                        'text'=>$langs->trans("NoRecordedContracts"),
-                    );
+				if ($num == 0)
+					$this->info_box_contents[$line][0] = array(
+						'td' => 'class="center opacitymedium"',
+						'text'=>$langs->trans("NoRecordedContracts"),
+					);
 
-                $this->db->free($resql);
-            } else {
-                $this->info_box_contents[0][0] = array(
-                    'td' => '',
-                    'maxlength'=>500,
-                    'text' => ($this->db->error().' sql='.$sql),
-                );
-            }
-        } else {
-            $this->info_box_contents[0][0] = array(
-                'td' => 'class="nohover opacitymedium left"',
-                'text' => $langs->trans("ReadPermissionNotAllowed")
-            );
-        }
-    }
+				$this->db->free($resql);
+			} else {
+				$this->info_box_contents[0][0] = array(
+					'td' => '',
+					'maxlength'=>500,
+					'text' => ($this->db->error().' sql='.$sql),
+				);
+			}
+		} else {
+			$this->info_box_contents[0][0] = array(
+				'td' => 'class="nohover opacitymedium left"',
+				'text' => $langs->trans("ReadPermissionNotAllowed")
+			);
+		}
+	}
 
 	/**
 	 *	Method to show box
@@ -192,8 +192,8 @@ class box_contracts extends ModeleBoxes
 	 *  @param	int		$nooutput	No print, only return string
 	 *	@return	string
 	 */
-    public function showBox($head = null, $contents = null, $nooutput = 0)
-    {
-        return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
-    }
+	public function showBox($head = null, $contents = null, $nooutput = 0)
+	{
+		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+	}
 }
diff --git a/htdocs/core/boxes/box_external_rss.php b/htdocs/core/boxes/box_external_rss.php
index d5cc859eaa7..949f6ac1382 100644
--- a/htdocs/core/boxes/box_external_rss.php
+++ b/htdocs/core/boxes/box_external_rss.php
@@ -34,45 +34,45 @@ include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
  */
 class box_external_rss extends ModeleBoxes
 {
-    public $boxcode = "lastrssinfos";
-    public $boximg = "object_rss";
-    public $boxlabel = "BoxLastRssInfos";
-    public $depends = array("externalrss");
+	public $boxcode = "lastrssinfos";
+	public $boximg = "object_rss";
+	public $boxlabel = "BoxLastRssInfos";
+	public $depends = array("externalrss");
 
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $paramdef; // Params of box definition (not user params)
+	public $paramdef; // Params of box definition (not user params)
 
-    public $info_box_head = array();
-    public $info_box_contents = array();
+	public $info_box_head = array();
+	public $info_box_contents = array();
 
 
-    /**
-     *  Constructor
-     *
-     * 	@param	DoliDB	$db			Database handler
-     *  @param	string	$param		More parameters
-     */
-    public function __construct($db, $param)
-    {
+	/**
+	 *  Constructor
+	 *
+	 * 	@param	DoliDB	$db			Database handler
+	 *  @param	string	$param		More parameters
+	 */
+	public function __construct($db, $param)
+	{
 		$this->db = $db;
 		$this->paramdef = $param;
-    }
+	}
 
-    /**
+	/**
 	 *  Load data into info_box_contents array to show array later.
 	 *
 	 *  @param	int		$max        	Maximum number of records to load
-     *  @param	int		$cachedelay		Delay we accept for cache file
-     *  @return	void
-     */
-    public function loadBox($max = 5, $cachedelay = 3600)
-    {
-        global $user, $langs, $conf;
-        $langs->load("boxes");
+	 *  @param	int		$cachedelay		Delay we accept for cache file
+	 *  @return	void
+	 */
+	public function loadBox($max = 5, $cachedelay = 3600)
+	{
+		global $user, $langs, $conf;
+		$langs->load("boxes");
 
 		$this->max = $max;
 
@@ -90,42 +90,42 @@ class box_external_rss extends ModeleBoxes
 		// Get RSS feed
 		$url = $conf->global->$keyforparamurl;
 
-        $rssparser = new RssParser($this->db);
+		$rssparser = new RssParser($this->db);
 		$result = $rssparser->parser($url, $this->max, $cachedelay, $conf->externalrss->dir_temp);
 
 		// INFO on channel
 		$description = $rssparser->getDescription();
 		$link = $rssparser->getLink();
 
-        $title = $langs->trans("BoxTitleLastRssInfos", $max, $conf->global->$keyforparamtitle);
-        if ($result < 0 || !empty($rssparser->error))
-        {
-            // Show warning
-        	$errormessage = $langs->trans("FailedToRefreshDataInfoNotUpToDate", ($rssparser->getLastFetchDate() ? dol_print_date($rssparser->getLastFetchDate(), "dayhourtext") : $langs->trans("Unknown")));
-        	if ($rssparser->error) $errormessage .= " - ".$rssparser->error;
-        	$title .= " ".img_error($errormessage);
-            $this->info_box_head = array('text' => $title, 'limit' => 0);
-        } else {
-            $this->info_box_head = array(
-                'text' => $title,
-                'sublink' => $link,
-                'subtext'=>$langs->trans("LastRefreshDate").': '.($rssparser->getLastFetchDate() ? dol_print_date($rssparser->getLastFetchDate(), "dayhourtext") : $langs->trans("Unknown")),
-                'subpicto'=>'globe',
-                'target'=>'_blank',
-            );
+		$title = $langs->trans("BoxTitleLastRssInfos", $max, $conf->global->$keyforparamtitle);
+		if ($result < 0 || !empty($rssparser->error))
+		{
+			// Show warning
+			$errormessage = $langs->trans("FailedToRefreshDataInfoNotUpToDate", ($rssparser->getLastFetchDate() ? dol_print_date($rssparser->getLastFetchDate(), "dayhourtext") : $langs->trans("Unknown")));
+			if ($rssparser->error) $errormessage .= " - ".$rssparser->error;
+			$title .= " ".img_error($errormessage);
+			$this->info_box_head = array('text' => $title, 'limit' => 0);
+		} else {
+			$this->info_box_head = array(
+				'text' => $title,
+				'sublink' => $link,
+				'subtext'=>$langs->trans("LastRefreshDate").': '.($rssparser->getLastFetchDate() ? dol_print_date($rssparser->getLastFetchDate(), "dayhourtext") : $langs->trans("Unknown")),
+				'subpicto'=>'globe',
+				'target'=>'_blank',
+			);
 		}
 
 		// INFO on items
 		$items = $rssparser->getItems();
-        //print '<pre>'.print_r($items,true).'</pre>';
+		//print '<pre>'.print_r($items,true).'</pre>';
 		$nbitems = count($items);
-        for ($line = 0; $line < $max && $line < $nbitems; $line++)
-        {
-            $item = $items[$line];
+		for ($line = 0; $line < $max && $line < $nbitems; $line++)
+		{
+			$item = $items[$line];
 
 			// Feed common fields
-            $href = $item['link'];
-        	$title = urldecode($item['title']);
+			$href = $item['link'];
+			$title = urldecode($item['title']);
 			$date = $item['date_timestamp']; // date will be empty if conversion into timestamp failed
 			if ($rssparser->getFormat() == 'rss')   // If RSS
 			{
@@ -145,46 +145,46 @@ class box_external_rss extends ModeleBoxes
 			if (is_numeric($date)) $date = dol_print_date($date, "dayhour");
 
 			$isutf8 = utf8_check($title);
-	        if (!$isutf8 && $conf->file->character_set_client == 'UTF-8') $title = utf8_encode($title);
-	        elseif ($isutf8 && $conf->file->character_set_client == 'ISO-8859-1') $title = utf8_decode($title);
+			if (!$isutf8 && $conf->file->character_set_client == 'UTF-8') $title = utf8_encode($title);
+			elseif ($isutf8 && $conf->file->character_set_client == 'ISO-8859-1') $title = utf8_decode($title);
 
-            $title = preg_replace("/([[:alnum:]])\?([[:alnum:]])/", "\\1'\\2", $title); // Gere probleme des apostrophes mal codee/decodee par utf8
-            $title = preg_replace("/^\s+/", "", $title); // Supprime espaces de debut
-            $this->info_box_contents["$href"] = "$title";
+			$title = preg_replace("/([[:alnum:]])\?([[:alnum:]])/", "\\1'\\2", $title); // Gere probleme des apostrophes mal codee/decodee par utf8
+			$title = preg_replace("/^\s+/", "", $title); // Supprime espaces de debut
+			$this->info_box_contents["$href"] = "$title";
 
-            $tooltip = $title;
-            $description = !empty($item['description']) ? $item['description'] : '';
-            $isutf8 = utf8_check($description);
-            if (!$isutf8 && $conf->file->character_set_client == 'UTF-8') $description = utf8_encode($description);
-            elseif ($isutf8 && $conf->file->character_set_client == 'ISO-8859-1') $description = utf8_decode($description);
-            $description = preg_replace("/([[:alnum:]])\?([[:alnum:]])/", "\\1'\\2", $description);
-            $description = preg_replace("/^\s+/", "", $description);
-            $description = str_replace("\r\n", "", $description);
-            $tooltip .= '<br>'.$description;
+			$tooltip = $title;
+			$description = !empty($item['description']) ? $item['description'] : '';
+			$isutf8 = utf8_check($description);
+			if (!$isutf8 && $conf->file->character_set_client == 'UTF-8') $description = utf8_encode($description);
+			elseif ($isutf8 && $conf->file->character_set_client == 'ISO-8859-1') $description = utf8_decode($description);
+			$description = preg_replace("/([[:alnum:]])\?([[:alnum:]])/", "\\1'\\2", $description);
+			$description = preg_replace("/^\s+/", "", $description);
+			$description = str_replace("\r\n", "", $description);
+			$tooltip .= '<br>'.$description;
 
-            $this->info_box_contents[$line][0] = array(
-                'td' => 'class="left" width="16"',
-                'logo' => $this->boximg,
-                'url' => $href,
-                'tooltip' => $tooltip,
-                'target' => 'newrss',
-            );
+			$this->info_box_contents[$line][0] = array(
+				'td' => 'class="left" width="16"',
+				'logo' => $this->boximg,
+				'url' => $href,
+				'tooltip' => $tooltip,
+				'target' => 'newrss',
+			);
 
-            $this->info_box_contents[$line][1] = array(
-                'td' => '',
-                'text' => $title,
-                'url' => $href,
-                'tooltip' => $tooltip,
-                'maxlength' => 64,
-                'target' => 'newrss',
-            );
+			$this->info_box_contents[$line][1] = array(
+				'td' => '',
+				'text' => $title,
+				'url' => $href,
+				'tooltip' => $tooltip,
+				'maxlength' => 64,
+				'target' => 'newrss',
+			);
 
-            $this->info_box_contents[$line][2] = array(
-                'td' => 'class="right nowrap"',
-                'text' => $date,
-            );
-        }
-    }
+			$this->info_box_contents[$line][2] = array(
+				'td' => 'class="right nowrap"',
+				'text' => $date,
+			);
+		}
+	}
 
 
 	/**
@@ -195,8 +195,8 @@ class box_external_rss extends ModeleBoxes
 	 *  @param	int		$nooutput	No print, only return string
 	 *	@return	string
 	 */
-    public function showBox($head = null, $contents = null, $nooutput = 0)
-    {
-        return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
-    }
+	public function showBox($head = null, $contents = null, $nooutput = 0)
+	{
+		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+	}
 }
diff --git a/htdocs/core/boxes/box_factures.php b/htdocs/core/boxes/box_factures.php
index ebaff31268d..6a824849212 100644
--- a/htdocs/core/boxes/box_factures.php
+++ b/htdocs/core/boxes/box_factures.php
@@ -30,20 +30,20 @@ include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
  */
 class box_factures extends ModeleBoxes
 {
-    public $boxcode = "lastcustomerbills";
-    public $boximg = "object_bill";
-    public $boxlabel = "BoxLastCustomerBills";
-    public $depends = array("facture");
+	public $boxcode = "lastcustomerbills";
+	public $boximg = "object_bill";
+	public $boxlabel = "BoxLastCustomerBills";
+	public $depends = array("facture");
 
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $param;
+	public $param;
 
-    public $info_box_head = array();
-    public $info_box_contents = array();
+	public $info_box_head = array();
+	public $info_box_contents = array();
 
 
 	/**
@@ -54,18 +54,18 @@ class box_factures extends ModeleBoxes
 	 */
 	public function __construct($db, $param)
 	{
-	    global $user;
+		global $user;
 
-	    $this->db = $db;
+		$this->db = $db;
 
-	    $this->hidden = !($user->rights->facture->lire);
+		$this->hidden = !($user->rights->facture->lire);
 	}
 
 	/**
 	 *  Load data into info_box_contents array to show array later.
 	 *
 	 *  @param	int		$max        Maximum number of records to load
-     *  @return	void
+	 *  @return	void
 	 */
 	public function loadBox($max = 5)
 	{
@@ -73,13 +73,13 @@ class box_factures extends ModeleBoxes
 
 		$this->max = $max;
 
-        include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-        include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
+		include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+		include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 
-        $facturestatic = new Facture($this->db);
-        $societestatic = new Societe($this->db);
+		$facturestatic = new Facture($this->db);
+		$societestatic = new Societe($this->db);
 
-        $langs->load("bills");
+		$langs->load("bills");
 
 		$text = $langs->trans("BoxTitleLast".($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE ? "" : "Modified")."CustomerBills", $max);
 		$this->info_box_head = array(
@@ -87,14 +87,14 @@ class box_factures extends ModeleBoxes
 			'limit'=> dol_strlen($text)
 		);
 
-        if ($user->rights->facture->lire) {
-            $sql = "SELECT f.rowid as facid";
-            $sql .= ", f.ref, f.type, f.total as total_ht";
-            $sql .= ", f.tva as total_tva";
-            $sql .= ", f.total_ttc";
-            $sql .= ", f.datef as df";
+		if ($user->rights->facture->lire) {
+			$sql = "SELECT f.rowid as facid";
+			$sql .= ", f.ref, f.type, f.total as total_ht";
+			$sql .= ", f.tva as total_tva";
+			$sql .= ", f.total_ttc";
+			$sql .= ", f.datef as df";
 			$sql .= ", f.paye, f.fk_statut, f.datec, f.tms";
-            $sql .= ", s.rowid as socid, s.nom as name, s.code_client, s.email, s.tva_intra, s.code_compta, s.siren as idprof1, s.siret as idprof2, s.ape as idprof3, s.idprof4, s.idprof5, s.idprof6";
+			$sql .= ", s.rowid as socid, s.nom as name, s.code_client, s.email, s.tva_intra, s.code_compta, s.siren as idprof1, s.siret as idprof2, s.ape as idprof3, s.idprof4, s.idprof5, s.idprof6";
 			$sql .= ", f.date_lim_reglement as datelimite";
 			$sql .= " FROM (".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f";
 			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@@ -103,8 +103,8 @@ class box_factures extends ModeleBoxes
 			$sql .= " AND f.entity IN (".getEntity('invoice').")";
 			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
 			if ($user->socid)	$sql .= " AND s.rowid = ".$user->socid;
-            if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) $sql .= " ORDER BY f.datef DESC, f.ref DESC ";
-            else $sql .= " ORDER BY f.tms DESC, f.ref DESC ";
+			if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) $sql .= " ORDER BY f.datef DESC, f.ref DESC ";
+			else $sql .= " ORDER BY f.tms DESC, f.ref DESC ";
 			$sql .= $this->db->plimit($max, 0);
 
 			$result = $this->db->query($sql);
@@ -116,90 +116,90 @@ class box_factures extends ModeleBoxes
 				$line = 0;
 				$l_due_date = $langs->trans('Late').' ('.$langs->trans('DateDue').': %s)';
 
-                while ($line < $num) {
-                    $objp = $this->db->fetch_object($result);
-                    $datelimite = $this->db->jdate($objp->datelimite);
-                    $date = $this->db->jdate($objp->df);
-                    $datem = $this->db->jdate($objp->tms);
+				while ($line < $num) {
+					$objp = $this->db->fetch_object($result);
+					$datelimite = $this->db->jdate($objp->datelimite);
+					$date = $this->db->jdate($objp->df);
+					$datem = $this->db->jdate($objp->tms);
 
-                    $facturestatic->id = $objp->facid;
-                    $facturestatic->ref = $objp->ref;
-                    $facturestatic->type = $objp->type;
-                    $facturestatic->total_ht = $objp->total_ht;
-                    $facturestatic->total_tva = $objp->total_tva;
-                    $facturestatic->total_ttc = $objp->total_ttc;
-                    $facturestatic->statut = $objp->fk_statut;
-                    $facturestatic->date_lim_reglement = $this->db->jdate($objp->datelimite);
+					$facturestatic->id = $objp->facid;
+					$facturestatic->ref = $objp->ref;
+					$facturestatic->type = $objp->type;
+					$facturestatic->total_ht = $objp->total_ht;
+					$facturestatic->total_tva = $objp->total_tva;
+					$facturestatic->total_ttc = $objp->total_ttc;
+					$facturestatic->statut = $objp->fk_statut;
+					$facturestatic->date_lim_reglement = $this->db->jdate($objp->datelimite);
 
-                    $societestatic->id = $objp->socid;
-                    $societestatic->name = $objp->name;
-                    $societestatic->code_client = $objp->code_client;
-                    $societestatic->tva_intra = $objp->tva_intra;
-                    $societestatic->email = $objp->email;
-                    $societestatic->idprof1 = $objp->idprof1;
-                    $societestatic->idprof2 = $objp->idprof2;
-                    $societestatic->idprof3 = $objp->idprof3;
-                    $societestatic->idprof4 = $objp->idprof4;
-                    $societestatic->idprof5 = $objp->idprof5;
-                    $societestatic->idprof6 = $objp->idprof6;
+					$societestatic->id = $objp->socid;
+					$societestatic->name = $objp->name;
+					$societestatic->code_client = $objp->code_client;
+					$societestatic->tva_intra = $objp->tva_intra;
+					$societestatic->email = $objp->email;
+					$societestatic->idprof1 = $objp->idprof1;
+					$societestatic->idprof2 = $objp->idprof2;
+					$societestatic->idprof3 = $objp->idprof3;
+					$societestatic->idprof4 = $objp->idprof4;
+					$societestatic->idprof5 = $objp->idprof5;
+					$societestatic->idprof6 = $objp->idprof6;
 
 					$late = '';
 					if ($facturestatic->hasDelay()) {
-                        $late = img_warning(sprintf($l_due_date, dol_print_date($datelimite, 'day')));
-                    }
+						$late = img_warning(sprintf($l_due_date, dol_print_date($datelimite, 'day')));
+					}
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="nowraponall"',
-                        'text' => $facturestatic->getNomUrl(1),
-                        'text2'=> $late,
-                        'asis' => 1,
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="nowraponall"',
+						'text' => $facturestatic->getNomUrl(1),
+						'text2'=> $late,
+						'asis' => 1,
+					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="tdoverflowmax200"',
-                        'text' => $societestatic->getNomUrl(1, '', 40),
-                        'asis' => 1,
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="tdoverflowmax200"',
+						'text' => $societestatic->getNomUrl(1, '', 40),
+						'asis' => 1,
+					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right nowraponall"',
-                        'text' => price($objp->total_ht, 0, $langs, 0, -1, -1, $conf->currency),
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right nowraponall"',
+						'text' => price($objp->total_ht, 0, $langs, 0, -1, -1, $conf->currency),
+					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right"',
-                        'text' => dol_print_date($date, 'day'),
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right"',
+						'text' => dol_print_date($date, 'day'),
+					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right" width="18"',
-                        'text' => $facturestatic->LibStatut($objp->paye, $objp->fk_statut, 3),
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right" width="18"',
+						'text' => $facturestatic->LibStatut($objp->paye, $objp->fk_statut, 3),
+					);
 
-                    $line++;
-                }
+					$line++;
+				}
 
-                if ($num == 0)
-                    $this->info_box_contents[$line][0] = array(
-                        'td' => 'class="center"',
-                        'text'=>$langs->trans("NoRecordedInvoices"),
-                    );
+				if ($num == 0)
+					$this->info_box_contents[$line][0] = array(
+						'td' => 'class="center"',
+						'text'=>$langs->trans("NoRecordedInvoices"),
+					);
 
-                $this->db->free($result);
-            } else {
-                $this->info_box_contents[0][0] = array(
-                    'td' => '',
-                    'maxlength'=>500,
-                    'text' => ($this->db->error().' sql='.$sql),
-                );
-            }
-        } else {
-            $this->info_box_contents[0][0] = array(
-                'td' => 'class="nohover opacitymedium left"',
-                'text' => $langs->trans("ReadPermissionNotAllowed")
-            );
-        }
-    }
+				$this->db->free($result);
+			} else {
+				$this->info_box_contents[0][0] = array(
+					'td' => '',
+					'maxlength'=>500,
+					'text' => ($this->db->error().' sql='.$sql),
+				);
+			}
+		} else {
+			$this->info_box_contents[0][0] = array(
+				'td' => 'class="nohover opacitymedium left"',
+				'text' => $langs->trans("ReadPermissionNotAllowed")
+			);
+		}
+	}
 
 	/**
 	 *  Method to show box
@@ -209,8 +209,8 @@ class box_factures extends ModeleBoxes
 	 *  @param	int		$nooutput	No print, only return string
 	 *	@return	string
 	 */
-    public function showBox($head = null, $contents = null, $nooutput = 0)
-    {
+	public function showBox($head = null, $contents = null, $nooutput = 0)
+	{
 		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
 }
diff --git a/htdocs/core/boxes/box_factures_fourn.php b/htdocs/core/boxes/box_factures_fourn.php
index 30f3cd503c2..7053acb9e97 100644
--- a/htdocs/core/boxes/box_factures_fourn.php
+++ b/htdocs/core/boxes/box_factures_fourn.php
@@ -31,20 +31,20 @@ include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
  */
 class box_factures_fourn extends ModeleBoxes
 {
-    public $boxcode = "lastsupplierbills";
-    public $boximg = "object_bill";
-    public $boxlabel = "BoxLastSupplierBills";
-    public $depends = array("facture", "fournisseur");
+	public $boxcode = "lastsupplierbills";
+	public $boximg = "object_bill";
+	public $boxlabel = "BoxLastSupplierBills";
+	public $depends = array("facture", "fournisseur");
 
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $param;
+	public $param;
 
-    public $info_box_head = array();
-    public $info_box_contents = array();
+	public $info_box_head = array();
+	public $info_box_contents = array();
 
 
 	/**
@@ -55,18 +55,18 @@ class box_factures_fourn extends ModeleBoxes
 	 */
 	public function __construct($db, $param)
 	{
-	    global $user;
+		global $user;
 
-	    $this->db = $db;
+		$this->db = $db;
 
-	    $this->hidden = !($user->rights->fournisseur->facture->lire);
+		$this->hidden = !($user->rights->fournisseur->facture->lire);
 	}
 
 	/**
 	 *  Load data into info_box_contents array to show array later.
 	 *
 	 *  @param	int		$max        Maximum number of records to load
-     *  @return	void
+	 *  @return	void
 	 */
 	public function loadBox($max = 5)
 	{
@@ -75,10 +75,10 @@ class box_factures_fourn extends ModeleBoxes
 		$this->max = $max;
 
 		include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
-        include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
+		include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
 
-        $facturestatic = new FactureFournisseur($this->db);
-        $thirdpartytmp = new Fournisseur($this->db);
+		$facturestatic = new FactureFournisseur($this->db);
+		$thirdpartytmp = new Fournisseur($this->db);
 
 		$this->info_box_head = array(
 			'text' => $langs->trans("BoxTitleLast".($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE ? "" : "Modified")."SupplierBills", $max)
@@ -87,12 +87,12 @@ class box_factures_fourn extends ModeleBoxes
 		if ($user->rights->fournisseur->facture->lire)
 		{
 			$sql = "SELECT s.nom as name, s.rowid as socid,";
-            $sql .= " s.code_fournisseur, s.email,";
-            $sql .= " s.logo,";
+			$sql .= " s.code_fournisseur, s.email,";
+			$sql .= " s.logo,";
 			$sql .= " f.rowid as facid, f.ref, f.ref_supplier,";
-            $sql .= " f.total_ht,";
-            $sql .= " f.total_tva,";
-            $sql .= " f.total_ttc,";
+			$sql .= " f.total_ht,";
+			$sql .= " f.total_tva,";
+			$sql .= " f.total_ttc,";
 			$sql .= " f.paye, f.fk_statut,";
 			$sql .= ' f.datef as df,';
 			$sql .= ' f.datec as datec,';
@@ -104,8 +104,8 @@ class box_factures_fourn extends ModeleBoxes
 			$sql .= " AND f.entity = ".$conf->entity;
 			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
 			if ($user->socid) $sql .= " AND s.rowid = ".$user->socid;
-            if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) $sql .= " ORDER BY f.datef DESC, f.ref DESC ";
-            else $sql .= " ORDER BY f.tms DESC, f.ref DESC ";
+			if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) $sql .= " ORDER BY f.datef DESC, f.ref DESC ";
+			else $sql .= " ORDER BY f.tms DESC, f.ref DESC ";
 			$sql .= $this->db->plimit($max, 0);
 
 			$result = $this->db->query($sql);
@@ -116,96 +116,96 @@ class box_factures_fourn extends ModeleBoxes
 				$line = 0;
 				$l_due_date = $langs->trans('Late').' ('.$langs->trans('DateDue').': %s)';
 
-                while ($line < $num) {
+				while ($line < $num) {
 					$objp = $this->db->fetch_object($result);
 					$datelimite = $this->db->jdate($objp->datelimite);
 					$date = $this->db->jdate($objp->df);
 					$datem = $this->db->jdate($objp->tms);
 
-                    $facturestatic->id = $objp->facid;
-                    $facturestatic->ref = $objp->ref;
-                    $facturestatic->total_ht = $objp->total_ht;
-                    $facturestatic->total_tva = $objp->total_tva;
-                    $facturestatic->total_ttc = $objp->total_ttc;
-                    $facturestatic->date_echeance = $datelimite;
-                    $facturestatic->statut = $objp->fk_statut;
-                    $facturestatic->ref_supplier = $objp->ref_supplier;
+					$facturestatic->id = $objp->facid;
+					$facturestatic->ref = $objp->ref;
+					$facturestatic->total_ht = $objp->total_ht;
+					$facturestatic->total_tva = $objp->total_tva;
+					$facturestatic->total_ttc = $objp->total_ttc;
+					$facturestatic->date_echeance = $datelimite;
+					$facturestatic->statut = $objp->fk_statut;
+					$facturestatic->ref_supplier = $objp->ref_supplier;
 
-                    $thirdpartytmp->id = $objp->socid;
-                    $thirdpartytmp->name = $objp->name;
-                    $thirdpartytmp->email = $objp->email;
-                    $thirdpartytmp->fournisseur = 1;
-                    $thirdpartytmp->code_fournisseur = $objp->code_fournisseur;
-                    $thirdpartytmp->logo = $objp->logo;
+					$thirdpartytmp->id = $objp->socid;
+					$thirdpartytmp->name = $objp->name;
+					$thirdpartytmp->email = $objp->email;
+					$thirdpartytmp->fournisseur = 1;
+					$thirdpartytmp->code_fournisseur = $objp->code_fournisseur;
+					$thirdpartytmp->logo = $objp->logo;
 
 					$late = '';
 
 					if ($facturestatic->hasDelay()) {
-                        $late = img_warning(sprintf($l_due_date, dol_print_date($datelimite, 'day')));
-                    }
+						$late = img_warning(sprintf($l_due_date, dol_print_date($datelimite, 'day')));
+					}
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="nowraponall"',
-                        'text' => $facturestatic->getNomUrl(1),
-                        'text2'=> $late,
-                        'asis' => 1,
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="nowraponall"',
+						'text' => $facturestatic->getNomUrl(1),
+						'text2'=> $late,
+						'asis' => 1,
+					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="tdoverflowmax150"',
-                        'text' => $objp->ref_supplier,
-                        'tooltip' => $langs->trans('SupplierInvoice').': '.($objp->ref ? $objp->ref : $objp->facid).'<br>'.$langs->trans('RefSupplier').': '.$objp->ref_supplier,
-                        'url' => DOL_URL_ROOT."/fourn/facture/card.php?facid=".$objp->facid,
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="tdoverflowmax150"',
+						'text' => $objp->ref_supplier,
+						'tooltip' => $langs->trans('SupplierInvoice').': '.($objp->ref ? $objp->ref : $objp->facid).'<br>'.$langs->trans('RefSupplier').': '.$objp->ref_supplier,
+						'url' => DOL_URL_ROOT."/fourn/facture/card.php?facid=".$objp->facid,
+					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="tdoverflowmax150"',
-                        'text' => $thirdpartytmp->getNomUrl(1, 'supplier'),
-                        'asis' => 1,
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="tdoverflowmax150"',
+						'text' => $thirdpartytmp->getNomUrl(1, 'supplier'),
+						'asis' => 1,
+					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right nowraponall"',
-                        'text' => price($objp->total_ht, 0, $langs, 0, -1, -1, $conf->currency),
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right nowraponall"',
+						'text' => price($objp->total_ht, 0, $langs, 0, -1, -1, $conf->currency),
+					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right"',
-                        'text' => dol_print_date($date, 'day'),
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right"',
+						'text' => dol_print_date($date, 'day'),
+					);
 
-                    $fac = new FactureFournisseur($this->db);
-                    $fac->fetch($objp->facid);
-                    $alreadypaid = $fac->getSommePaiement();
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right" width="18"',
-                        'text' => $facturestatic->LibStatut($objp->paye, $objp->fk_statut, 3, $alreadypaid, $objp->type),
-                    );
+					$fac = new FactureFournisseur($this->db);
+					$fac->fetch($objp->facid);
+					$alreadypaid = $fac->getSommePaiement();
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right" width="18"',
+						'text' => $facturestatic->LibStatut($objp->paye, $objp->fk_statut, 3, $alreadypaid, $objp->type),
+					);
 
-                    $line++;
-                }
+					$line++;
+				}
 
-                if ($num == 0)
-                    $this->info_box_contents[$line][0] = array(
-                        'td' => 'class="center"',
-                        'text'=>$langs->trans("NoModifiedSupplierBills"),
-                    );
+				if ($num == 0)
+					$this->info_box_contents[$line][0] = array(
+						'td' => 'class="center"',
+						'text'=>$langs->trans("NoModifiedSupplierBills"),
+					);
 
-                $this->db->free($result);
-            } else {
-                $this->info_box_contents[0][0] = array(
-                    'td' => '',
-                    'maxlength'=>500,
-                    'text' => ($this->db->error().' sql='.$sql),
-                );
-            }
-        } else {
-            $this->info_box_contents[0][0] = array(
-                'td' => 'class="nohover opacitymedium left"',
-                'text' => $langs->transnoentities("ReadPermissionNotAllowed")
-            );
-        }
-    }
+				$this->db->free($result);
+			} else {
+				$this->info_box_contents[0][0] = array(
+					'td' => '',
+					'maxlength'=>500,
+					'text' => ($this->db->error().' sql='.$sql),
+				);
+			}
+		} else {
+			$this->info_box_contents[0][0] = array(
+				'td' => 'class="nohover opacitymedium left"',
+				'text' => $langs->transnoentities("ReadPermissionNotAllowed")
+			);
+		}
+	}
 
 	/**
 	 *	Method to show box
@@ -215,8 +215,8 @@ class box_factures_fourn extends ModeleBoxes
 	 *  @param	int		$nooutput	No print, only return string
 	 *	@return	string
 	 */
-    public function showBox($head = null, $contents = null, $nooutput = 0)
-    {
+	public function showBox($head = null, $contents = null, $nooutput = 0)
+	{
 		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
 }
diff --git a/htdocs/core/boxes/box_factures_fourn_imp.php b/htdocs/core/boxes/box_factures_fourn_imp.php
index c2b5e7c705e..938505caab4 100644
--- a/htdocs/core/boxes/box_factures_fourn_imp.php
+++ b/htdocs/core/boxes/box_factures_fourn_imp.php
@@ -30,20 +30,20 @@ include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
  */
 class box_factures_fourn_imp extends ModeleBoxes
 {
-    public $boxcode = "oldestunpaidsupplierbills";
-    public $boximg = "object_bill";
-    public $boxlabel = "BoxOldestUnpaidSupplierBills";
-    public $depends = array("facture", "fournisseur");
+	public $boxcode = "oldestunpaidsupplierbills";
+	public $boximg = "object_bill";
+	public $boxlabel = "BoxOldestUnpaidSupplierBills";
+	public $depends = array("facture", "fournisseur");
 
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $param;
+	public $param;
 
-    public $info_box_head = array();
-    public $info_box_contents = array();
+	public $info_box_head = array();
+	public $info_box_contents = array();
 
 
 	/**
@@ -54,18 +54,18 @@ class box_factures_fourn_imp extends ModeleBoxes
 	 */
 	public function __construct($db, $param)
 	{
-	    global $user;
+		global $user;
 
-	    $this->db = $db;
+		$this->db = $db;
 
-	    $this->hidden = !($user->rights->fournisseur->facture->lire);
+		$this->hidden = !($user->rights->fournisseur->facture->lire);
 	}
 
 	/**
 	 *  Load data into info_box_contents array to show array later.
 	 *
 	 *  @param	int		$max        Maximum number of records to load
-     *  @return	void
+	 *  @return	void
 	 */
 	public function loadBox($max = 5)
 	{
@@ -85,9 +85,9 @@ class box_factures_fourn_imp extends ModeleBoxes
 			$sql = "SELECT s.nom as name, s.rowid as socid,";
 			$sql .= " f.rowid as facid, f.ref, f.ref_supplier, f.date_lim_reglement as datelimite,";
 			$sql .= " f.datef as df,";
-            $sql .= " f.total_ht as total_ht,";
-            $sql .= " f.tva as total_tva,";
-            $sql .= " f.total_ttc,";
+			$sql .= " f.total_ht as total_ht,";
+			$sql .= " f.tva as total_tva,";
+			$sql .= " f.total_ttc,";
 			$sql .= " f.paye, f.fk_statut, f.type";
 			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 			$sql .= ",".MAIN_DB_PREFIX."facture_fourn as f";
@@ -109,7 +109,7 @@ class box_factures_fourn_imp extends ModeleBoxes
 				$line = 0;
 				$l_due_date = $langs->trans('Late').' ('.$langs->trans('DateDue').': %s)';
 
-                $facturestatic = new FactureFournisseur($this->db);
+				$facturestatic = new FactureFournisseur($this->db);
 
 				while ($line < $num)
 				{
@@ -127,71 +127,71 @@ class box_factures_fourn_imp extends ModeleBoxes
 					$thirdpartytmp->id = $objp->socid;
 					$thirdpartytmp->name = $objp->name;
 					$thirdpartytmp->fournisseur = 1;
-                    $thirdpartytmp->code_fournisseur = $objp->code_fournisseur;
-                    $thirdpartytmp->logo = $objp->logo;
+					$thirdpartytmp->code_fournisseur = $objp->code_fournisseur;
+					$thirdpartytmp->logo = $objp->logo;
 
 					$late = '';
 					if ($facturestatic->hasDelay()) {
-                        $late = img_warning(sprintf($l_due_date, dol_print_date($datelimite, 'day')));
-                    }
+						$late = img_warning(sprintf($l_due_date, dol_print_date($datelimite, 'day')));
+					}
 
-                    $tooltip = $langs->trans('SupplierInvoice').': '.($objp->ref ? $objp->ref : $objp->facid).'<br>'.$langs->trans('RefSupplier').': '.$objp->ref_supplier;
+					$tooltip = $langs->trans('SupplierInvoice').': '.($objp->ref ? $objp->ref : $objp->facid).'<br>'.$langs->trans('RefSupplier').': '.$objp->ref_supplier;
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="nowraponall"',
-                        'text' => $facturestatic->getNomUrl(1),
-                        'text2'=> $late,
-                        'asis' => 1
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="nowraponall"',
+						'text' => $facturestatic->getNomUrl(1),
+						'text2'=> $late,
+						'asis' => 1
+					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="tdoverflowmax150 maxwidth150onsmartphone"',
-                        'text' => $thirdpartytmp->getNomUrl(1, '', 40),
-                        'asis' => 1,
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="tdoverflowmax150 maxwidth150onsmartphone"',
+						'text' => $thirdpartytmp->getNomUrl(1, '', 40),
+						'asis' => 1,
+					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="nowraponall right"',
-                        'text' => price($objp->total_ht, 0, $langs, 0, -1, -1, $conf->currency),
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="nowraponall right"',
+						'text' => price($objp->total_ht, 0, $langs, 0, -1, -1, $conf->currency),
+					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right"',
-                        'text' => dol_print_date($datelimite, 'day'),
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right"',
+						'text' => dol_print_date($datelimite, 'day'),
+					);
 
 					$fac = new FactureFournisseur($this->db);
 					$fac->fetch($objp->facid);
 					$alreadypaid = $fac->getSommePaiement();
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right" width="18"',
-                        'text' => $facturestatic->LibStatut($objp->paye, $objp->fk_statut, 3, $alreadypaid, $objp->type),
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right" width="18"',
+						'text' => $facturestatic->LibStatut($objp->paye, $objp->fk_statut, 3, $alreadypaid, $objp->type),
+					);
 
-                    $line++;
-                }
+					$line++;
+				}
 
-                if ($num == 0)
-                    $this->info_box_contents[$line][0] = array(
-                        'td' => 'class="center"',
-                        'text'=>$langs->trans("NoUnpaidSupplierBills"),
-                    );
+				if ($num == 0)
+					$this->info_box_contents[$line][0] = array(
+						'td' => 'class="center"',
+						'text'=>$langs->trans("NoUnpaidSupplierBills"),
+					);
 
-                $this->db->free($result);
-            } else {
-                $this->info_box_contents[0][0] = array(
-                    'td' => '',
-                    'maxlength'=>500,
-                    'text' => ($this->db->error().' sql='.$sql),
-                );
-            }
-        } else {
-            $this->info_box_contents[0][0] = array(
-                'td' => 'class="nohover opacitymedium left"',
-                'text' => $langs->trans("ReadPermissionNotAllowed")
-            );
-        }
-    }
+				$this->db->free($result);
+			} else {
+				$this->info_box_contents[0][0] = array(
+					'td' => '',
+					'maxlength'=>500,
+					'text' => ($this->db->error().' sql='.$sql),
+				);
+			}
+		} else {
+			$this->info_box_contents[0][0] = array(
+				'td' => 'class="nohover opacitymedium left"',
+				'text' => $langs->trans("ReadPermissionNotAllowed")
+			);
+		}
+	}
 
 	/**
 	 *	Method to show box
@@ -201,8 +201,8 @@ class box_factures_fourn_imp extends ModeleBoxes
 	 *  @param	int		$nooutput	No print, only return string
 	 *	@return	string
 	 */
-    public function showBox($head = null, $contents = null, $nooutput = 0)
-    {
+	public function showBox($head = null, $contents = null, $nooutput = 0)
+	{
 		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
 }
diff --git a/htdocs/core/boxes/box_factures_imp.php b/htdocs/core/boxes/box_factures_imp.php
index f5fe3e76dde..e1b6a39b529 100644
--- a/htdocs/core/boxes/box_factures_imp.php
+++ b/htdocs/core/boxes/box_factures_imp.php
@@ -33,20 +33,20 @@ require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
  */
 class box_factures_imp extends ModeleBoxes
 {
-    public $boxcode = "oldestunpaidcustomerbills";
-    public $boximg = "object_bill";
-    public $boxlabel = "BoxOldestUnpaidCustomerBills";
-    public $depends = array("facture");
+	public $boxcode = "oldestunpaidcustomerbills";
+	public $boximg = "object_bill";
+	public $boxlabel = "BoxOldestUnpaidCustomerBills";
+	public $depends = array("facture");
 
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $param;
+	public $param;
 
-    public $info_box_head = array();
-    public $info_box_contents = array();
+	public $info_box_head = array();
+	public $info_box_contents = array();
 
 
 	/**
@@ -57,18 +57,18 @@ class box_factures_imp extends ModeleBoxes
 	 */
 	public function __construct($db, $param)
 	{
-	    global $user;
+		global $user;
 
-	    $this->db = $db;
+		$this->db = $db;
 
-	    $this->hidden = !($user->rights->facture->lire);
+		$this->hidden = !($user->rights->facture->lire);
 	}
 
 	/**
 	 *  Load data into info_box_contents array to show array later.
 	 *
 	 *  @param	int		$max        Maximum number of records to load
-     *  @return	void
+	 *  @return	void
 	 */
 	public function loadBox($max = 5)
 	{
@@ -77,10 +77,10 @@ class box_factures_imp extends ModeleBoxes
 		$this->max = $max;
 
 		include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-        include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
+		include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 
-        $facturestatic = new Facture($this->db);
-        $societestatic = new Societe($this->db);
+		$facturestatic = new Facture($this->db);
+		$societestatic = new Societe($this->db);
 
 		$langs->load("bills");
 
@@ -89,14 +89,14 @@ class box_factures_imp extends ModeleBoxes
 		if ($user->rights->facture->lire)
 		{
 			$sql = "SELECT s.nom as name, s.rowid as socid, s.email,";
-            $sql .= " s.code_client,";
-            $sql .= " s.logo,";
+			$sql .= " s.code_client,";
+			$sql .= " s.logo,";
 			$sql .= " f.ref, f.date_lim_reglement as datelimite,";
-            $sql .= " f.type,";
+			$sql .= " f.type,";
 			$sql .= " f.datef as df,";
-            $sql .= " f.total as total_ht,";
-            $sql .= " f.tva as total_tva,";
-            $sql .= " f.total_ttc,";
+			$sql .= " f.total as total_ht,";
+			$sql .= " f.tva as total_tva,";
+			$sql .= " f.total_ttc,";
 			$sql .= " f.paye, f.fk_statut, f.rowid as facid";
 			$sql .= ", sum(pf.amount) as am";
 			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
@@ -128,54 +128,54 @@ class box_factures_imp extends ModeleBoxes
 				{
 					$objp = $this->db->fetch_object($result);
 					$datelimite = $this->db->jdate($objp->datelimite);
-                    $facturestatic->id = $objp->facid;
-                    $facturestatic->ref = $objp->ref;
-                    $facturestatic->type = $objp->type;
-                    $facturestatic->total_ht = $objp->total_ht;
-                    $facturestatic->total_tva = $objp->total_tva;
-                    $facturestatic->total_ttc = $objp->total_ttc;
+					$facturestatic->id = $objp->facid;
+					$facturestatic->ref = $objp->ref;
+					$facturestatic->type = $objp->type;
+					$facturestatic->total_ht = $objp->total_ht;
+					$facturestatic->total_tva = $objp->total_tva;
+					$facturestatic->total_ttc = $objp->total_ttc;
 					$facturestatic->statut = $objp->fk_statut;
 					$facturestatic->date_lim_reglement = $this->db->jdate($objp->datelimite);
 
-                    $societestatic->id = $objp->socid;
-                    $societestatic->name = $objp->name;
-                    $societestatic->client = 1;
-                    $societestatic->email = $objp->email;
-                    $societestatic->code_client = $objp->code_client;
-                    $societestatic->logo = $objp->logo;
+					$societestatic->id = $objp->socid;
+					$societestatic->name = $objp->name;
+					$societestatic->client = 1;
+					$societestatic->email = $objp->email;
+					$societestatic->code_client = $objp->code_client;
+					$societestatic->logo = $objp->logo;
 
 					$late = '';
 					if ($facturestatic->hasDelay()) {
 						$late = img_warning(sprintf($l_due_date, dol_print_date($datelimite, 'day')));
 					}
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="nowraponall"',
-                        'text' => $facturestatic->getNomUrl(1),
-                        'text2'=> $late,
-                        'asis' => 1,
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="nowraponall"',
+						'text' => $facturestatic->getNomUrl(1),
+						'text2'=> $late,
+						'asis' => 1,
+					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="tdoverflowmax150 maxwidth150onsmartphone"',
-                        'text' => $societestatic->getNomUrl(1, '', 44),
-                        'asis' => 1,
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="tdoverflowmax150 maxwidth150onsmartphone"',
+						'text' => $societestatic->getNomUrl(1, '', 44),
+						'asis' => 1,
+					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="nowraponall right"',
-                        'text' => price($objp->total_ht, 0, $langs, 0, -1, -1, $conf->currency),
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="nowraponall right"',
+						'text' => price($objp->total_ht, 0, $langs, 0, -1, -1, $conf->currency),
+					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right"',
-                        'text' => dol_print_date($datelimite, 'day'),
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right"',
+						'text' => dol_print_date($datelimite, 'day'),
+					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right" width="18"',
-                        'text' => $facturestatic->LibStatut($objp->paye, $objp->fk_statut, 3, $objp->am),
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right" width="18"',
+						'text' => $facturestatic->LibStatut($objp->paye, $objp->fk_statut, 3, $objp->am),
+					);
 
 					$line++;
 				}
@@ -187,17 +187,17 @@ class box_factures_imp extends ModeleBoxes
 
 				$this->db->free($result);
 			} else {
-                $this->info_box_contents[0][0] = array(
-                    'td' => '',
-                    'maxlength'=>500,
-                    'text' => ($this->db->error().' sql='.$sql),
-                );
+				$this->info_box_contents[0][0] = array(
+					'td' => '',
+					'maxlength'=>500,
+					'text' => ($this->db->error().' sql='.$sql),
+				);
 			}
 		} else {
-            $this->info_box_contents[0][0] = array(
-                'td' => 'class="nohover opacitymedium left"',
-                'text' => $langs->trans("ReadPermissionNotAllowed")
-            );
+			$this->info_box_contents[0][0] = array(
+				'td' => 'class="nohover opacitymedium left"',
+				'text' => $langs->trans("ReadPermissionNotAllowed")
+			);
 		}
 	}
 
@@ -209,8 +209,8 @@ class box_factures_imp extends ModeleBoxes
 	 *  @param	int		$nooutput	No print, only return string
 	 *	@return	string
 	 */
-    public function showBox($head = null, $contents = null, $nooutput = 0)
-    {
+	public function showBox($head = null, $contents = null, $nooutput = 0)
+	{
 		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
 }
diff --git a/htdocs/core/boxes/box_ficheinter.php b/htdocs/core/boxes/box_ficheinter.php
index 2c104bea729..fc9fcc9fc17 100644
--- a/htdocs/core/boxes/box_ficheinter.php
+++ b/htdocs/core/boxes/box_ficheinter.php
@@ -31,20 +31,20 @@ include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
  */
 class box_ficheinter extends ModeleBoxes
 {
-    public $boxcode = "ficheinter";
-    public $boximg = "object_intervention";
-    public $boxlabel = "BoxFicheInter";
-    public $depends = array("ficheinter"); // conf->contrat->enabled
+	public $boxcode = "ficheinter";
+	public $boximg = "object_intervention";
+	public $boxlabel = "BoxFicheInter";
+	public $depends = array("ficheinter"); // conf->contrat->enabled
 
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $param;
+	public $param;
 
-    public $info_box_head = array();
-    public $info_box_contents = array();
+	public $info_box_head = array();
+	public $info_box_contents = array();
 
 
 	/**
@@ -55,11 +55,11 @@ class box_ficheinter extends ModeleBoxes
 	 */
 	public function __construct($db, $param)
 	{
-	    global $user;
+		global $user;
 
-	    $this->db = $db;
+		$this->db = $db;
 
-	    $this->hidden = !($user->rights->ficheinter->lire);
+		$this->hidden = !($user->rights->ficheinter->lire);
 	}
 
 	/**
@@ -67,7 +67,7 @@ class box_ficheinter extends ModeleBoxes
 	 *
 	 *  @param	int		$max        Maximum number of records to load
 	 *  @return	void
-	*/
+	 */
 	public function loadBox($max = 10)
 	{
 		global $user, $langs, $conf;
@@ -120,26 +120,26 @@ class box_ficheinter extends ModeleBoxes
 					$companystatic->email = $objp->semail;
 
 					$this->info_box_contents[$i][] = array(
-                        'td' => 'class="nowraponall"',
-                        'text' => $ficheinterstatic->getNomUrl(1),
-                        'asis' => 1,
+						'td' => 'class="nowraponall"',
+						'text' => $ficheinterstatic->getNomUrl(1),
+						'asis' => 1,
 					);
 
 					$this->info_box_contents[$i][] = array(
-                        'td' => 'class="tdoverflowmax150 maxwidth150onsmartphone"',
-                        'text' => $companystatic->getNomUrl(1),
-                        'asis' => 1,
-                    );
+						'td' => 'class="tdoverflowmax150 maxwidth150onsmartphone"',
+						'text' => $companystatic->getNomUrl(1),
+						'asis' => 1,
+					);
 
 					$this->info_box_contents[$i][] = array(
-                        'td' => 'class="right"',
-                        'text' => dol_print_date($datec, 'day'),
-                    );
+						'td' => 'class="right"',
+						'text' => dol_print_date($datec, 'day'),
+					);
 
 					$this->info_box_contents[$i][] = array(
-                        'td' => 'class="nowrap right"',
-                        'text' => $ficheinterstatic->getLibStatut(3),
-                        'asis' => 1,
+						'td' => 'class="nowrap right"',
+						'text' => $ficheinterstatic->getLibStatut(3),
+						'asis' => 1,
 					);
 
 					$i++;
@@ -153,15 +153,15 @@ class box_ficheinter extends ModeleBoxes
 				$this->db->free($resql);
 			} else {
 				$this->info_box_contents[0][0] = array(
-                    'td' => '',
-                    'maxlength'=>500,
-                    'text' => ($this->db->error().' sql='.$sql),
-                );
+					'td' => '',
+					'maxlength'=>500,
+					'text' => ($this->db->error().' sql='.$sql),
+				);
 			}
 		} else {
 			$this->info_box_contents[0][0] = array(
-			    'td' => 'class="nohover opacitymedium left"',
-			    'text' => $langs->trans("ReadPermissionNotAllowed")
+				'td' => 'class="nohover opacitymedium left"',
+				'text' => $langs->trans("ReadPermissionNotAllowed")
 			);
 		}
 	}
@@ -174,8 +174,8 @@ class box_ficheinter extends ModeleBoxes
 	 *  @param	int		$nooutput	No print, only return string
 	 *	@return	string
 	 */
-    public function showBox($head = null, $contents = null, $nooutput = 0)
-    {
+	public function showBox($head = null, $contents = null, $nooutput = 0)
+	{
 		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
 }
diff --git a/htdocs/core/boxes/box_fournisseurs.php b/htdocs/core/boxes/box_fournisseurs.php
index 44dd891bfb8..4be895f769c 100644
--- a/htdocs/core/boxes/box_fournisseurs.php
+++ b/htdocs/core/boxes/box_fournisseurs.php
@@ -32,129 +32,129 @@ include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
  */
 class box_fournisseurs extends ModeleBoxes
 {
-    public $boxcode = "lastsuppliers";
-    public $boximg = "object_company";
-    public $boxlabel = "BoxLastSuppliers";
-    public $depends = array("fournisseur");
+	public $boxcode = "lastsuppliers";
+	public $boximg = "object_company";
+	public $boxlabel = "BoxLastSuppliers";
+	public $depends = array("fournisseur");
 
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $param;
+	public $param;
 
-    public $info_box_head = array();
-    public $info_box_contents = array();
+	public $info_box_head = array();
+	public $info_box_contents = array();
 
 
-    /**
-     *  Constructor
-     *
-     *  @param  DoliDB  $db         Database handler
-     *  @param  string  $param      More parameters
-     */
-    public function __construct($db, $param)
-    {
-        global $user;
+	/**
+	 *  Constructor
+	 *
+	 *  @param  DoliDB  $db         Database handler
+	 *  @param  string  $param      More parameters
+	 */
+	public function __construct($db, $param)
+	{
+		global $user;
 
-        $this->db = $db;
+		$this->db = $db;
 
-        $this->hidden = !($user->rights->societe->lire && empty($user->socid));
-    }
+		$this->hidden = !($user->rights->societe->lire && empty($user->socid));
+	}
 
-    /**
+	/**
 	 *  Load data into info_box_contents array to show array later.
 	 *
 	 *  @param	int		$max        Maximum number of records to load
-     *  @return	void
-     */
-    public function loadBox($max = 5)
-    {
-        global $conf, $user, $langs;
-        $langs->load("boxes");
+	 *  @return	void
+	 */
+	public function loadBox($max = 5)
+	{
+		global $conf, $user, $langs;
+		$langs->load("boxes");
 
 		$this->max = $max;
 
-        include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
-        $thirdpartystatic = new Societe($this->db);
+		include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
+		$thirdpartystatic = new Societe($this->db);
 		include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
 		$thirdpartytmp = new Fournisseur($this->db);
 
 		$this->info_box_head = array('text' => $langs->trans("BoxTitleLastModifiedSuppliers", $max));
 
-        if ($user->rights->societe->lire)
-        {
-            $sql = "SELECT s.nom as name, s.rowid as socid, s.datec, s.tms, s.status,";
-            $sql .= " s.code_fournisseur, s.email as semail,";
-            $sql .= " s.logo, s.code_compta_fournisseur, s.entity";
-            $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
-            if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-            $sql .= " WHERE s.fournisseur = 1";
-            $sql .= " AND s.entity IN (".getEntity('societe').")";
-            if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
-            if ($user->socid) $sql .= " AND s.rowid = ".$user->socid;
-            $sql .= " ORDER BY s.tms DESC ";
-            $sql .= $this->db->plimit($max, 0);
+		if ($user->rights->societe->lire)
+		{
+			$sql = "SELECT s.nom as name, s.rowid as socid, s.datec, s.tms, s.status,";
+			$sql .= " s.code_fournisseur, s.email as semail,";
+			$sql .= " s.logo, s.code_compta_fournisseur, s.entity";
+			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+			$sql .= " WHERE s.fournisseur = 1";
+			$sql .= " AND s.entity IN (".getEntity('societe').")";
+			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+			if ($user->socid) $sql .= " AND s.rowid = ".$user->socid;
+			$sql .= " ORDER BY s.tms DESC ";
+			$sql .= $this->db->plimit($max, 0);
 
-            $result = $this->db->query($sql);
-            if ($result)
-            {
-                $num = $this->db->num_rows($result);
+			$result = $this->db->query($sql);
+			if ($result)
+			{
+				$num = $this->db->num_rows($result);
 
-                $line = 0;
-                while ($line < $num)
-                {
-                    $objp = $this->db->fetch_object($result);
-    				$datec = $this->db->jdate($objp->datec);
-    				$datem = $this->db->jdate($objp->tms);
+				$line = 0;
+				while ($line < $num)
+				{
+					$objp = $this->db->fetch_object($result);
+					$datec = $this->db->jdate($objp->datec);
+					$datem = $this->db->jdate($objp->tms);
 					$thirdpartytmp->id = $objp->socid;
-                    $thirdpartytmp->name = $objp->name;
-                    $thirdpartytmp->email = $objp->semail;
-                    $thirdpartytmp->code_client = $objp->code_client;
-                    $thirdpartytmp->logo = $objp->logo;
-                    $thirdpartytmp->code_compta_fournisseur = $objp->code_compta_fournisseur;
-                    $thirdpartytmp->entity = $objp->entity;
+					$thirdpartytmp->name = $objp->name;
+					$thirdpartytmp->email = $objp->semail;
+					$thirdpartytmp->code_client = $objp->code_client;
+					$thirdpartytmp->logo = $objp->logo;
+					$thirdpartytmp->code_compta_fournisseur = $objp->code_compta_fournisseur;
+					$thirdpartytmp->entity = $objp->entity;
 
-                   	$this->info_box_contents[$line][] = array(
-                        'td' => '',
-                        'text' => $thirdpartytmp->getNomUrl(1, '', 40),
-                        'asis' => 1,
-                    );
+				   	$this->info_box_contents[$line][] = array(
+						'td' => '',
+						'text' => $thirdpartytmp->getNomUrl(1, '', 40),
+						'asis' => 1,
+					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right"',
-                        'text' => dol_print_date($datem, "day"),
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right"',
+						'text' => dol_print_date($datem, "day"),
+					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right" width="18"',
-                        'text' => $thirdpartystatic->LibStatut($objp->status, 3),
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right" width="18"',
+						'text' => $thirdpartystatic->LibStatut($objp->status, 3),
+					);
 
-                    $line++;
-                }
+					$line++;
+				}
 
-                if ($num == 0) $this->info_box_contents[$line][0] = array(
-                    'td' => 'class="center opacitymedium"',
-                    'text'=>$langs->trans("NoRecordedSuppliers"),
-                );
+				if ($num == 0) $this->info_box_contents[$line][0] = array(
+					'td' => 'class="center opacitymedium"',
+					'text'=>$langs->trans("NoRecordedSuppliers"),
+				);
 
-                $this->db->free($result);
-            } else {
-                $this->info_box_contents[0][0] = array(
-                    'td' => '',
-                    'maxlength'=>500,
-                    'text' => ($this->db->error().' sql='.$sql),
-                );
-            }
-        } else {
-            $this->info_box_contents[0][0] = array(
-                'td' => 'class="nohover opacitymedium left"',
-                'text' => $langs->trans("ReadPermissionNotAllowed")
-            );
-        }
-    }
+				$this->db->free($result);
+			} else {
+				$this->info_box_contents[0][0] = array(
+					'td' => '',
+					'maxlength'=>500,
+					'text' => ($this->db->error().' sql='.$sql),
+				);
+			}
+		} else {
+			$this->info_box_contents[0][0] = array(
+				'td' => 'class="nohover opacitymedium left"',
+				'text' => $langs->trans("ReadPermissionNotAllowed")
+			);
+		}
+	}
 
 	/**
 	 *	Method to show box
@@ -164,8 +164,8 @@ class box_fournisseurs extends ModeleBoxes
 	 *  @param	int		$nooutput	No print, only return string
 	 *	@return	string
 	 */
-    public function showBox($head = null, $contents = null, $nooutput = 0)
-    {
-        return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
-    }
+	public function showBox($head = null, $contents = null, $nooutput = 0)
+	{
+		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+	}
 }
diff --git a/htdocs/core/boxes/box_goodcustomers.php b/htdocs/core/boxes/box_goodcustomers.php
index 66497c2e94f..7efecc4001c 100644
--- a/htdocs/core/boxes/box_goodcustomers.php
+++ b/htdocs/core/boxes/box_goodcustomers.php
@@ -33,27 +33,27 @@ include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
  */
 class box_goodcustomers extends ModeleBoxes
 {
-    public $boxcode = "goodcustomers";
-    public $boximg = "object_company";
-    public $boxlabel = "BoxGoodCustomers";
-    public $depends = array("societe");
+	public $boxcode = "goodcustomers";
+	public $boximg = "object_company";
+	public $boxlabel = "BoxGoodCustomers";
+	public $depends = array("societe");
 
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $enabled = 1;
+	public $enabled = 1;
 
-    public $info_box_head = array();
-    public $info_box_contents = array();
+	public $info_box_head = array();
+	public $info_box_contents = array();
 
 
 	/**
 	 *  Constructor
 	 *
 	 *  @param  DoliDB	$db      	Database handler
-     *  @param	string	$param		More parameters
+	 *  @param	string	$param		More parameters
 	 */
 	public function __construct($db, $param = '')
 	{
@@ -69,10 +69,10 @@ class box_goodcustomers extends ModeleBoxes
 	}
 
 	/**
-     *  Load data for box to show them later
-     *
-     *  @param	int		$max        Maximum number of records to load
-     *  @return	void
+	 *  Load data for box to show them later
+	 *
+	 *  @param	int		$max        Maximum number of records to load
+	 *  @return	void
 	 */
 	public function loadBox($max = 5)
 	{
@@ -81,10 +81,10 @@ class box_goodcustomers extends ModeleBoxes
 
 		$this->max = $max;
 
-        include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
-        $thirdpartystatic = new Societe($this->db);
+		include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
+		$thirdpartystatic = new Societe($this->db);
 
-        $this->info_box_head = array('text' => $langs->trans("BoxTitleGoodCustomers", $max));
+		$this->info_box_head = array('text' => $langs->trans("BoxTitleGoodCustomers", $max));
 
 		if ($user->rights->societe->lire)
 		{
@@ -119,24 +119,24 @@ class box_goodcustomers extends ModeleBoxes
 					$nbimpaye = $objp->nbfact - $objp->nbfactpaye;
 
 					$this->info_box_contents[$line][] = array(
-					    'td' => '',
-					    'text' => $thirdpartystatic->getNomUrl(1),
-					    'asis' => 1,
+						'td' => '',
+						'text' => $thirdpartystatic->getNomUrl(1),
+						'asis' => 1,
 					);
 
 					$this->info_box_contents[$line][] = array(
-					    'td' => 'class="right"',
-					    'text' => dol_print_date($datem, "day")
+						'td' => 'class="right"',
+						'text' => dol_print_date($datem, "day")
 					);
 
 					$this->info_box_contents[$line][] = array(
-					    'td' => 'class="right"',
-					    'text' => $nbfact.($nbimpaye != 0 ? ' ('.$nbimpaye.')' : '')
+						'td' => 'class="right"',
+						'text' => $nbfact.($nbimpaye != 0 ? ' ('.$nbimpaye.')' : '')
 					);
 
 					$this->info_box_contents[$line][] = array(
-					    'td' => 'class="right" width="18"',
-					    'text' => $thirdpartystatic->LibStatut($objp->status, 3)
+						'td' => 'class="right" width="18"',
+						'text' => $thirdpartystatic->LibStatut($objp->status, 3)
 					);
 
 					$line++;
@@ -150,14 +150,14 @@ class box_goodcustomers extends ModeleBoxes
 				$this->db->free($result);
 			} else {
 				$this->info_box_contents[0][0] = array(
-                    'td' => '',
-                    'maxlength'=>500,
-                    'text' => ($this->db->error().' sql='.$sql),
-                );
+					'td' => '',
+					'maxlength'=>500,
+					'text' => ($this->db->error().' sql='.$sql),
+				);
 			}
 		} else {
 			$this->info_box_contents[0][0] = array(
-			    'td' => 'class="nohover opacitymedium left"',
+				'td' => 'class="nohover opacitymedium left"',
 				'text' => $langs->trans("ReadPermissionNotAllowed")
 			);
 		}
@@ -171,8 +171,8 @@ class box_goodcustomers extends ModeleBoxes
 	 *  @param	int		$nooutput	No print, only return string
 	 *	@return	string
 	 */
-    public function showBox($head = null, $contents = null, $nooutput = 0)
-    {
+	public function showBox($head = null, $contents = null, $nooutput = 0)
+	{
 		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
 }
diff --git a/htdocs/core/boxes/box_graph_invoices_permonth.php b/htdocs/core/boxes/box_graph_invoices_permonth.php
index 9d5aeda7b36..d1fb6dd4114 100644
--- a/htdocs/core/boxes/box_graph_invoices_permonth.php
+++ b/htdocs/core/boxes/box_graph_invoices_permonth.php
@@ -28,18 +28,18 @@ include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
  */
 class box_graph_invoices_permonth extends ModeleBoxes
 {
-    public $boxcode = "invoicespermonth";
-    public $boximg = "object_bill";
-    public $boxlabel = "BoxCustomersInvoicesPerMonth";
-    public $depends = array("facture");
+	public $boxcode = "invoicespermonth";
+	public $boximg = "object_bill";
+	public $boxlabel = "BoxCustomersInvoicesPerMonth";
+	public $depends = array("facture");
 
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $info_box_head = array();
-    public $info_box_contents = array();
+	public $info_box_head = array();
+	public $info_box_contents = array();
 
 
 	/**
@@ -61,7 +61,7 @@ class box_graph_invoices_permonth extends ModeleBoxes
 	 *  Load data into info_box_contents array to show array later.
 	 *
 	 *  @param	int		$max        Maximum number of records to load
-     *  @return	void
+	 *  @return	void
 	 */
 	public function loadBox($max = 5)
 	{
@@ -141,9 +141,9 @@ class box_graph_invoices_permonth extends ModeleBoxes
 				$mesg = $px1->isGraphKo();
 				if (!$mesg)
 				{
-				    $langs->load("bills");
+					$langs->load("bills");
 
-				    $px1->SetData($data1);
+					$px1->SetData($data1);
 					unset($data1);
 					$i = $startyear; $legend = array();
 					while ($i <= $endyear)
@@ -186,7 +186,7 @@ class box_graph_invoices_permonth extends ModeleBoxes
 				$mesg = $px2->isGraphKo();
 				if (!$mesg)
 				{
-				    $langs->load("bills");
+					$langs->load("bills");
 
 					$px2->SetData($data2);
 					unset($data2);
@@ -269,8 +269,8 @@ class box_graph_invoices_permonth extends ModeleBoxes
 			}
 		} else {
 			$this->info_box_contents[0][0] = array(
-			    'td' => 'class="nohover opacitymedium left"',
-                'text' => $langs->trans("ReadPermissionNotAllowed")
+				'td' => 'class="nohover opacitymedium left"',
+				'text' => $langs->trans("ReadPermissionNotAllowed")
 			);
 		}
 	}
@@ -283,8 +283,8 @@ class box_graph_invoices_permonth extends ModeleBoxes
 	 *  @param	int		$nooutput	No print, only return string
 	 *	@return	string
 	 */
-    public function showBox($head = null, $contents = null, $nooutput = 0)
-    {
+	public function showBox($head = null, $contents = null, $nooutput = 0)
+	{
 		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
 }
diff --git a/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php b/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
index b9fde24b759..1490f5ea6e9 100644
--- a/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
+++ b/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
@@ -28,18 +28,18 @@ include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
  */
 class box_graph_invoices_supplier_permonth extends ModeleBoxes
 {
-    public $boxcode = "invoicessupplierpermonth";
-    public $boximg = "object_bill";
-    public $boxlabel = "BoxSuppliersInvoicesPerMonth";
-    public $depends = array("fournisseur");
+	public $boxcode = "invoicessupplierpermonth";
+	public $boximg = "object_bill";
+	public $boxlabel = "BoxSuppliersInvoicesPerMonth";
+	public $depends = array("fournisseur");
 
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $info_box_head = array();
-    public $info_box_contents = array();
+	public $info_box_head = array();
+	public $info_box_contents = array();
 
 
 	/**
@@ -61,7 +61,7 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes
 	 *  Load data into info_box_contents array to show array later.
 	 *
 	 *  @param	int		$max        Maximum number of records to load
-     *  @return	void
+	 *  @return	void
 	 */
 	public function loadBox($max = 5)
 	{
@@ -130,7 +130,7 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes
 				$data1 = $stats->getNbByMonthWithPrevYear($endyear, $startyear, (GETPOST('action', 'aZ09') == $refreshaction ?-1 : (3600 * 24)), ($WIDTH < 300 ? 2 : 0), $startmonth);
 
 				$filenamenb = $dir."/".$prefix."invoicessuppliernbinyear-".$year.".png";
-                // default value for customer mode
+				// default value for customer mode
 				$fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstats&amp;file=invoicesnbinyear-'.$year.'.png';
 				if ($mode == 'supplier') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstatssupplier&amp;file=invoicessuppliernbinyear-'.$year.'.png';
 
@@ -138,12 +138,12 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes
 				$mesg = $px1->isGraphKo();
 				if (!$mesg)
 				{
-				    $langs->load("bills");
+					$langs->load("bills");
 
-				    $px1->SetData($data1);
+					$px1->SetData($data1);
 					unset($data1);
 					$i = $startyear;
-                    $legend = array();
+					$legend = array();
 					while ($i <= $endyear)
 					{
 						if ($startmonth != 1)
@@ -183,7 +183,7 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes
 				$mesg = $px2->isGraphKo();
 				if (!$mesg)
 				{
-				    $langs->load("bills");
+					$langs->load("bills");
 
 					$px2->SetData($data2);
 					unset($data2);
@@ -263,16 +263,16 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes
 				$this->info_box_contents[0][0] = array('tr'=>'class="oddeven nohover"', 'td' => 'class="nohover center"', 'textnoformat'=>$stringtoshow);
 			} else {
 				$this->info_box_contents[0][0] = array(
-                    'tr'=>'class="oddeven nohover"',
-                    'td' => 'class="nohover left"',
-                    'maxlength'=>500,
-                    'text' => $mesg,
-                );
+					'tr'=>'class="oddeven nohover"',
+					'td' => 'class="nohover left"',
+					'maxlength'=>500,
+					'text' => $mesg,
+				);
 			}
 		} else {
 			$this->info_box_contents[0][0] = array(
-			    'td' => 'class="nohover opacitymedium left"',
-                'text' => $langs->trans("ReadPermissionNotAllowed")
+				'td' => 'class="nohover opacitymedium left"',
+				'text' => $langs->trans("ReadPermissionNotAllowed")
 			);
 		}
 	}
@@ -285,8 +285,8 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes
 	 *  @param	int		$nooutput	No print, only return string
 	 *	@return	string
 	 */
-    public function showBox($head = null, $contents = null, $nooutput = 0)
-    {
+	public function showBox($head = null, $contents = null, $nooutput = 0)
+	{
 		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
 }
diff --git a/htdocs/core/boxes/box_graph_orders_permonth.php b/htdocs/core/boxes/box_graph_orders_permonth.php
index 2ff1a579798..d9c26620553 100644
--- a/htdocs/core/boxes/box_graph_orders_permonth.php
+++ b/htdocs/core/boxes/box_graph_orders_permonth.php
@@ -28,18 +28,18 @@ include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
  */
 class box_graph_orders_permonth extends ModeleBoxes
 {
-    public $boxcode = "orderspermonth";
-    public $boximg = "object_order";
-    public $boxlabel = "BoxCustomersOrdersPerMonth";
-    public $depends = array("commande");
+	public $boxcode = "orderspermonth";
+	public $boximg = "object_order";
+	public $boxlabel = "BoxCustomersOrdersPerMonth";
+	public $depends = array("commande");
 
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $info_box_head = array();
-    public $info_box_contents = array();
+	public $info_box_head = array();
+	public $info_box_contents = array();
 
 
 	/**
@@ -61,7 +61,7 @@ class box_graph_orders_permonth extends ModeleBoxes
 	 *  Load data into info_box_contents array to show array later.
 	 *
 	 *  @param	int		$max        Maximum number of records to load
-     *  @return	void
+	 *  @return	void
 	 */
 	public function loadBox($max = 5)
 	{
@@ -97,9 +97,9 @@ class box_graph_orders_permonth extends ModeleBoxes
 
 		if ($user->rights->commande->lire)
 		{
-		    $langs->load("orders");
+			$langs->load("orders");
 
-		    $param_year = 'DOLUSERCOOKIE_box_'.$this->boxcode.'_year';
+			$param_year = 'DOLUSERCOOKIE_box_'.$this->boxcode.'_year';
 			$param_shownb = 'DOLUSERCOOKIE_box_'.$this->boxcode.'_shownb';
 			$param_showtot = 'DOLUSERCOOKIE_box_'.$this->boxcode.'_showtot';
 
@@ -133,7 +133,7 @@ class box_graph_orders_permonth extends ModeleBoxes
 				$data1 = $stats->getNbByMonthWithPrevYear($endyear, $startyear, (GETPOST('action', 'aZ09') == $refreshaction ?-1 : (3600 * 24)), ($WIDTH < 300 ? 2 : 0), $startmonth);
 
 				$filenamenb = $dir."/".$prefix."ordersnbinyear-".$endyear.".png";
-                // default value for customer mode
+				// default value for customer mode
 				$fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&amp;file=ordersnbinyear-'.$endyear.'.png';
 				if ($mode == 'supplier') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&amp;file=ordersnbinyear-'.$endyear.'.png';
 
@@ -144,7 +144,7 @@ class box_graph_orders_permonth extends ModeleBoxes
 					$px1->SetData($data1);
 					unset($data1);
 					$i = $startyear;
-                    $legend = array();
+					$legend = array();
 					while ($i <= $endyear)
 					{
 						if ($startmonth != 1)
@@ -176,7 +176,7 @@ class box_graph_orders_permonth extends ModeleBoxes
 				$data2 = $stats->getAmountByMonthWithPrevYear($endyear, $startyear, (GETPOST('action', 'aZ09') == $refreshaction ?-1 : (3600 * 24)), ($WIDTH < 300 ? 2 : 0), $startmonth);
 
 				$filenamenb = $dir."/".$prefix."ordersamountinyear-".$endyear.".png";
-                // default value for customer mode
+				// default value for customer mode
 				$fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&amp;file=ordersamountinyear-'.$endyear.'.png';
 				if ($mode == 'supplier') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&amp;file=ordersamountinyear-'.$endyear.'.png';
 
@@ -260,22 +260,22 @@ class box_graph_orders_permonth extends ModeleBoxes
 					$stringtoshow .= '</div>';
 				}
 				$this->info_box_contents[0][0] = array(
-                    'tr'=>'class="oddeven nohover"',
-                    'td' => 'class="nohover center"',
-                    'textnoformat'=>$stringtoshow,
-                );
+					'tr'=>'class="oddeven nohover"',
+					'td' => 'class="nohover center"',
+					'textnoformat'=>$stringtoshow,
+				);
 			} else {
 				$this->info_box_contents[0][0] = array(
-                    'tr'=>'class="oddeven nohover"',
-                    'td' => 'class="nohover left"',
-                    'maxlength'=>500,
-                    'text' => $mesg,
-                );
+					'tr'=>'class="oddeven nohover"',
+					'td' => 'class="nohover left"',
+					'maxlength'=>500,
+					'text' => $mesg,
+				);
 			}
 		} else {
 			$this->info_box_contents[0][0] = array(
-			    'td' => 'class="nohover opacitymedium left"',
-                'text' => $langs->trans("ReadPermissionNotAllowed")
+				'td' => 'class="nohover opacitymedium left"',
+				'text' => $langs->trans("ReadPermissionNotAllowed")
 			);
 		}
 	}
@@ -288,8 +288,8 @@ class box_graph_orders_permonth extends ModeleBoxes
 	 *  @param	int		$nooutput	No print, only return string
 	 *  @return	string
 	 */
-    public function showBox($head = null, $contents = null, $nooutput = 0)
-    {
+	public function showBox($head = null, $contents = null, $nooutput = 0)
+	{
 		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
 }
diff --git a/htdocs/core/boxes/box_graph_orders_supplier_permonth.php b/htdocs/core/boxes/box_graph_orders_supplier_permonth.php
index fb40ee1f68f..765c6324516 100644
--- a/htdocs/core/boxes/box_graph_orders_supplier_permonth.php
+++ b/htdocs/core/boxes/box_graph_orders_supplier_permonth.php
@@ -28,18 +28,18 @@ include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
  */
 class box_graph_orders_supplier_permonth extends ModeleBoxes
 {
-    public $boxcode = "orderssupplierpermonth";
-    public $boximg = "object_order";
-    public $boxlabel = "BoxSuppliersOrdersPerMonth";
-    public $depends = array("fournisseur");
+	public $boxcode = "orderssupplierpermonth";
+	public $boximg = "object_order";
+	public $boxlabel = "BoxSuppliersOrdersPerMonth";
+	public $depends = array("fournisseur");
 
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $info_box_head = array();
-    public $info_box_contents = array();
+	public $info_box_head = array();
+	public $info_box_contents = array();
 
 
 	/**
@@ -61,7 +61,7 @@ class box_graph_orders_supplier_permonth extends ModeleBoxes
 	 *  Load data into info_box_contents array to show array later.
 	 *
 	 *  @param	int		$max        Maximum number of records to load
-     *  @return	void
+	 *  @return	void
 	 */
 	public function loadBox($max = 5)
 	{
@@ -96,9 +96,9 @@ class box_graph_orders_supplier_permonth extends ModeleBoxes
 
 		if ($user->rights->fournisseur->commande->lire)
 		{
-		    $langs->load("orders");
+			$langs->load("orders");
 
-		    $param_year = 'DOLUSERCOOKIE_box_'.$this->boxcode.'_year';
+			$param_year = 'DOLUSERCOOKIE_box_'.$this->boxcode.'_year';
 			$param_shownb = 'DOLUSERCOOKIE_box_'.$this->boxcode.'_shownb';
 			$param_showtot = 'DOLUSERCOOKIE_box_'.$this->boxcode.'_showtot';
 
@@ -259,22 +259,22 @@ class box_graph_orders_supplier_permonth extends ModeleBoxes
 					$stringtoshow .= '</div>';
 				}
 				$this->info_box_contents[0][0] = array(
-                    'tr'=>'class="oddeven nohover"',
-                    'td' => 'class="nohover center"',
-                    'textnoformat'=>$stringtoshow,
-                );
+					'tr'=>'class="oddeven nohover"',
+					'td' => 'class="nohover center"',
+					'textnoformat'=>$stringtoshow,
+				);
 			} else {
 				$this->info_box_contents[0][0] = array(
-                    'tr'=>'class="oddeven nohover"',
-                    'td' => 'class="nohover left"',
-                    'maxlength'=>500,
-                    'text' => $mesg,
-                );
+					'tr'=>'class="oddeven nohover"',
+					'td' => 'class="nohover left"',
+					'maxlength'=>500,
+					'text' => $mesg,
+				);
 			}
 		} else {
 			$this->info_box_contents[0][0] = array(
-			    'td' => 'class="nohover opacitymedium left"',
-                'text' => $langs->trans("ReadPermissionNotAllowed")
+				'td' => 'class="nohover opacitymedium left"',
+				'text' => $langs->trans("ReadPermissionNotAllowed")
 			);
 		}
 	}
@@ -287,8 +287,8 @@ class box_graph_orders_supplier_permonth extends ModeleBoxes
 	 *  @param	int		$nooutput	No print, only return string
 	 *	@return	string
 	 */
-    public function showBox($head = null, $contents = null, $nooutput = 0)
-    {
+	public function showBox($head = null, $contents = null, $nooutput = 0)
+	{
 		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
 }
diff --git a/htdocs/core/boxes/box_graph_product_distribution.php b/htdocs/core/boxes/box_graph_product_distribution.php
index 957277005e7..407c66177b5 100644
--- a/htdocs/core/boxes/box_graph_product_distribution.php
+++ b/htdocs/core/boxes/box_graph_product_distribution.php
@@ -29,20 +29,20 @@ include_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
  */
 class box_graph_product_distribution extends ModeleBoxes
 {
-    public $boxcode = "productdistribution";
-    public $boximg = "object_product";
-    public $boxlabel = "BoxProductDistribution";
-    public $depends = array("product|service", "facture|propal|commande");
+	public $boxcode = "productdistribution";
+	public $boximg = "object_product";
+	public $boxlabel = "BoxProductDistribution";
+	public $depends = array("product|service", "facture|propal|commande");
 
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $param;
+	public $param;
 
-    public $info_box_head = array();
-    public $info_box_contents = array();
+	public $info_box_head = array();
+	public $info_box_contents = array();
 
 
 	/**
@@ -58,7 +58,7 @@ class box_graph_product_distribution extends ModeleBoxes
 		$this->db = $db;
 
 		$this->hidden = !(
-		    (!empty($conf->facture->enabled) && !empty($user->rights->facture->lire))
+			(!empty($conf->facture->enabled) && !empty($user->rights->facture->lire))
 		 || (!empty($conf->commande->enabled) && !empty($user->rights->commande->lire))
 		 || (!empty($conf->propal->enabled) && !empty($user->rights->propale->lire))
 		);
@@ -68,7 +68,7 @@ class box_graph_product_distribution extends ModeleBoxes
 	 *  Load data into info_box_contents array to show array later.
 	 *
 	 *  @param	int		$max        Maximum number of records to load
-     *  @return	void
+	 *  @return	void
 	 */
 	public function loadBox($max = 5)
 	{
@@ -138,7 +138,7 @@ class box_graph_product_distribution extends ModeleBoxes
 			// Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
 			if ($showpropalnb)
 			{
-                $langs->load("propal");
+				$langs->load("propal");
 				include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propalestats.class.php';
 
 				$showpointvalue = 1; $nocolor = 0;
@@ -197,7 +197,7 @@ class box_graph_product_distribution extends ModeleBoxes
 			// Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
 			if ($showordernb)
 			{
-			    $langs->load("orders");
+				$langs->load("orders");
 				include_once DOL_DOCUMENT_ROOT.'/commande/class/commandestats.class.php';
 
 				$showpointvalue = 1; $nocolor = 0;
@@ -315,8 +315,8 @@ class box_graph_product_distribution extends ModeleBoxes
 
 		if (empty($nbofgraph))
 		{
-		    $langs->load("errors");
-		    $mesg = $langs->trans("ReadPermissionNotAllowed");
+			$langs->load("errors");
+			$mesg = $langs->trans("ReadPermissionNotAllowed");
 		}
 		if (empty($conf->use_javascript_ajax))
 		{
@@ -388,13 +388,13 @@ class box_graph_product_distribution extends ModeleBoxes
 				$stringtoshow .= '</div></div>';
 			}
 			$this->info_box_contents[0][0] = array(
-                'tr'=>'class="oddeven nohover"',
-                'td' => 'class="nohover center"',
-                'textnoformat'=>$stringtoshow,
-            );
+				'tr'=>'class="oddeven nohover"',
+				'td' => 'class="nohover center"',
+				'textnoformat'=>$stringtoshow,
+			);
 		} else {
 			$this->info_box_contents[0][0] = array(
-			    'td' => 'class="nohover opacitymedium left"',
+				'td' => 'class="nohover opacitymedium left"',
 				'maxlength'=>500,
 				'text' => $mesg
 			);
@@ -409,8 +409,8 @@ class box_graph_product_distribution extends ModeleBoxes
 	 *  @param	int		$nooutput	No print, only return string
 	 *	@return	string
 	 */
-    public function showBox($head = null, $contents = null, $nooutput = 0)
-    {
+	public function showBox($head = null, $contents = null, $nooutput = 0)
+	{
 		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
 }
diff --git a/htdocs/core/boxes/box_graph_propales_permonth.php b/htdocs/core/boxes/box_graph_propales_permonth.php
index 4231638948a..de1a1f8de83 100644
--- a/htdocs/core/boxes/box_graph_propales_permonth.php
+++ b/htdocs/core/boxes/box_graph_propales_permonth.php
@@ -28,18 +28,18 @@ include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
  */
 class box_graph_propales_permonth extends ModeleBoxes
 {
-    public $boxcode = "propalpermonth";
-    public $boximg = "object_propal";
-    public $boxlabel = "BoxProposalsPerMonth";
-    public $depends = array("propal");
+	public $boxcode = "propalpermonth";
+	public $boximg = "object_propal";
+	public $boxlabel = "BoxProposalsPerMonth";
+	public $depends = array("propal");
 
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $info_box_head = array();
-    public $info_box_contents = array();
+	public $info_box_head = array();
+	public $info_box_contents = array();
 
 
 	/**
@@ -61,7 +61,7 @@ class box_graph_propales_permonth extends ModeleBoxes
 	 *  Load data into info_box_contents array to show array later.
 	 *
 	 *  @param	int		$max        Maximum number of records to load
-     *  @return	void
+	 *  @return	void
 	 */
 	public function loadBox($max = 5)
 	{
@@ -191,7 +191,7 @@ class box_graph_propales_permonth extends ModeleBoxes
 					{
 						if ($startmonth != 1)
 						{
-                            $legend[] = sprintf("%d/%d", $i - 2001, $i - 2000);
+							$legend[] = sprintf("%d/%d", $i - 2001, $i - 2000);
 						} else {
 							$legend[] = $i;
 						}
@@ -260,22 +260,22 @@ class box_graph_propales_permonth extends ModeleBoxes
 					$stringtoshow .= '</div>';
 				}
 				$this->info_box_contents[0][0] = array(
-                    'tr'=>'class="oddeven nohover"',
-                    'td' => 'class="nohover center"',
-                    'textnoformat'=>$stringtoshow,
-                );
+					'tr'=>'class="oddeven nohover"',
+					'td' => 'class="nohover center"',
+					'textnoformat'=>$stringtoshow,
+				);
 			} else {
 				$this->info_box_contents[0][0] = array(
-                    'tr'=>'class="oddeven nohover"',
-                    'td' => 'class="nohover left"',
-                    'maxlength' => 500,
-                    'text' => $mesg,
-                );
+					'tr'=>'class="oddeven nohover"',
+					'td' => 'class="nohover left"',
+					'maxlength' => 500,
+					'text' => $mesg,
+				);
 			}
 		} else {
 			$this->info_box_contents[0][0] = array(
-			    'td' => 'class="nohover opacitymedium left"',
-                'text' => $langs->trans("ReadPermissionNotAllowed")
+				'td' => 'class="nohover opacitymedium left"',
+				'text' => $langs->trans("ReadPermissionNotAllowed")
 			);
 		}
 	}
@@ -288,8 +288,8 @@ class box_graph_propales_permonth extends ModeleBoxes
 	 *  @param	int		$nooutput	No print, only return string
 	 *	@return	string
 	 */
-    public function showBox($head = null, $contents = null, $nooutput = 0)
-    {
+	public function showBox($head = null, $contents = null, $nooutput = 0)
+	{
 		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
 }
diff --git a/htdocs/core/boxes/box_last_modified_ticket.php b/htdocs/core/boxes/box_last_modified_ticket.php
index f6bbbb76854..2950eb9cfd8 100644
--- a/htdocs/core/boxes/box_last_modified_ticket.php
+++ b/htdocs/core/boxes/box_last_modified_ticket.php
@@ -31,179 +31,179 @@ require_once DOL_DOCUMENT_ROOT."/core/boxes/modules_boxes.php";
 class box_last_modified_ticket extends ModeleBoxes
 {
 
-    public $boxcode = "box_last_modified_ticket";
-    public $boximg = "ticket";
-    public $boxlabel;
-    public $depends = array("ticket");
+	public $boxcode = "box_last_modified_ticket";
+	public $boximg = "ticket";
+	public $boxlabel;
+	public $depends = array("ticket");
 
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $param;
-    public $info_box_head = array();
-    public $info_box_contents = array();
+	public $param;
+	public $info_box_head = array();
+	public $info_box_contents = array();
 
-    /**
-     * Constructor
-     *  @param  DoliDB  $db         Database handler
-     *  @param  string  $param      More parameters
-     */
-    public function __construct($db, $param = '')
-    {
-        global $langs;
+	/**
+	 * Constructor
+	 *  @param  DoliDB  $db         Database handler
+	 *  @param  string  $param      More parameters
+	 */
+	public function __construct($db, $param = '')
+	{
+		global $langs;
 		$langs->load("boxes");
 		$this->db = $db;
 
-        $this->boxlabel = $langs->transnoentitiesnoconv("BoxLastModifiedTicket");
-    }
+		$this->boxlabel = $langs->transnoentitiesnoconv("BoxLastModifiedTicket");
+	}
 
-    /**
-     * Load data into info_box_contents array to show array later.
-     *
-     *     @param  int $max Maximum number of records to load
-     *     @return void
-     */
-    public function loadBox($max = 5)
-    {
-        global $conf, $user, $langs;
+	/**
+	 * Load data into info_box_contents array to show array later.
+	 *
+	 *     @param  int $max Maximum number of records to load
+	 *     @return void
+	 */
+	public function loadBox($max = 5)
+	{
+		global $conf, $user, $langs;
 
-        $this->max = $max;
+		$this->max = $max;
 
-        require_once DOL_DOCUMENT_ROOT."/ticket/class/ticket.class.php";
+		require_once DOL_DOCUMENT_ROOT."/ticket/class/ticket.class.php";
 
-        $text = $langs->trans("BoxLastModifiedTicketDescription", $max);
-        $this->info_box_head = array(
-         	'text' => $text,
-         	'limit' => dol_strlen($text)
-        );
+		$text = $langs->trans("BoxLastModifiedTicketDescription", $max);
+		$this->info_box_head = array(
+		 	'text' => $text,
+		 	'limit' => dol_strlen($text)
+		);
 
-        $this->info_box_contents[0][0] = array(
-            'td' => 'class="left"',
-            'text' => $langs->trans("BoxLastModifiedTicketContent"),
-        );
+		$this->info_box_contents[0][0] = array(
+			'td' => 'class="left"',
+			'text' => $langs->trans("BoxLastModifiedTicketContent"),
+		);
 
-        if ($user->rights->ticket->read) {
-            $sql = "SELECT t.rowid as id, t.ref, t.track_id, t.fk_soc, t.fk_user_create, t.fk_user_assign, t.subject, t.message, t.fk_statut, t.type_code, t.category_code, t.severity_code, t.datec, t.date_read, t.date_close, t.origin_email ";
-            $sql .= ", type.label as type_label, category.label as category_label, severity.label as severity_label";
-            $sql .= ", s.nom as company_name, s.email as socemail, s.client, s.fournisseur";
-            $sql .= " FROM ".MAIN_DB_PREFIX."ticket as t";
-            $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_ticket_type as type ON type.code=t.type_code";
-            $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_ticket_category as category ON category.code=t.category_code";
-            $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_ticket_severity as severity ON severity.code=t.severity_code";
-            $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid=t.fk_soc";
+		if ($user->rights->ticket->read) {
+			$sql = "SELECT t.rowid as id, t.ref, t.track_id, t.fk_soc, t.fk_user_create, t.fk_user_assign, t.subject, t.message, t.fk_statut, t.type_code, t.category_code, t.severity_code, t.datec, t.date_read, t.date_close, t.origin_email ";
+			$sql .= ", type.label as type_label, category.label as category_label, severity.label as severity_label";
+			$sql .= ", s.nom as company_name, s.email as socemail, s.client, s.fournisseur";
+			$sql .= " FROM ".MAIN_DB_PREFIX."ticket as t";
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_ticket_type as type ON type.code=t.type_code";
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_ticket_category as category ON category.code=t.category_code";
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_ticket_severity as severity ON severity.code=t.severity_code";
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid=t.fk_soc";
 
-            $sql .= " WHERE t.entity = ".$conf->entity;
-            //  		$sql.= " AND e.rowid = er.fk_event";
-            //if (!$user->rights->societe->client->voir && !$user->socid) $sql.= " WHERE s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-            if ($user->socid) {
-                $sql .= " AND t.fk_soc= ".$user->socid;
-            }
+			$sql .= " WHERE t.entity = ".$conf->entity;
+			//  		$sql.= " AND e.rowid = er.fk_event";
+			//if (!$user->rights->societe->client->voir && !$user->socid) $sql.= " WHERE s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+			if ($user->socid) {
+				$sql .= " AND t.fk_soc= ".$user->socid;
+			}
 
-            $sql .= " ORDER BY t.tms DESC, t.rowid DESC ";
-            $sql .= $this->db->plimit($max, 0);
+			$sql .= " ORDER BY t.tms DESC, t.rowid DESC ";
+			$sql .= $this->db->plimit($max, 0);
 
-            $resql = $this->db->query($sql);
-            if ($resql) {
-                $num = $this->db->num_rows($resql);
+			$resql = $this->db->query($sql);
+			if ($resql) {
+				$num = $this->db->num_rows($resql);
 
-                $i = 0;
+				$i = 0;
 
-                while ($i < $num) {
-                    $objp = $this->db->fetch_object($resql);
-                    $datec = $this->db->jdate($objp->datec);
-                    $dateterm = $this->db->jdate($objp->fin_validite);
-                    $dateclose = $this->db->jdate($objp->date_cloture);
-                    $late = '';
+				while ($i < $num) {
+					$objp = $this->db->fetch_object($resql);
+					$datec = $this->db->jdate($objp->datec);
+					$dateterm = $this->db->jdate($objp->fin_validite);
+					$dateclose = $this->db->jdate($objp->date_cloture);
+					$late = '';
 
-                    $ticket = new Ticket($this->db);
-                    $ticket->id = $objp->id;
-                    $ticket->track_id = $objp->track_id;
-                    $ticket->ref = $objp->ref;
-                    $ticket->fk_statut = $objp->fk_statut;
-                    $ticket->subject = $objp->subject;
-                    if ($objp->fk_soc > 0) {
-                        $thirdparty = new Societe($this->db);
-                        $thirdparty->id = $objp->fk_soc;
-                        $thirdparty->email = $objp->socemail;
-                        $thirdparty->client = $objp->client;
-                        $thirdparty->fournisseur = $objp->fournisseur;
-                        $thirdparty->name = $objp->company_name;
-                        $link = $thirdparty->getNomUrl(1);
-                    } else {
-                        $link = dol_print_email($objp->origin_email);
-                    }
+					$ticket = new Ticket($this->db);
+					$ticket->id = $objp->id;
+					$ticket->track_id = $objp->track_id;
+					$ticket->ref = $objp->ref;
+					$ticket->fk_statut = $objp->fk_statut;
+					$ticket->subject = $objp->subject;
+					if ($objp->fk_soc > 0) {
+						$thirdparty = new Societe($this->db);
+						$thirdparty->id = $objp->fk_soc;
+						$thirdparty->email = $objp->socemail;
+						$thirdparty->client = $objp->client;
+						$thirdparty->fournisseur = $objp->fournisseur;
+						$thirdparty->name = $objp->company_name;
+						$link = $thirdparty->getNomUrl(1);
+					} else {
+						$link = dol_print_email($objp->origin_email);
+					}
 
 
-                    $r = 0;
+					$r = 0;
 
-                    // Ticket
-                    $this->info_box_contents[$i][0] = array(
-                        'td' => 'class="nowraponall"',
-                        'text' => $ticket->getNomUrl(1),
-                        'asis' => 1,
-                    );
-                    $r++;
+					// Ticket
+					$this->info_box_contents[$i][0] = array(
+						'td' => 'class="nowraponall"',
+						'text' => $ticket->getNomUrl(1),
+						'asis' => 1,
+					);
+					$r++;
 
-                    // Subject
-                    $this->info_box_contents[$i][$r] = array(
-                        'td' => 'class="nowrap"',
-                        'text' => $objp->subject, // Some event have no ref
-                        'url' => DOL_URL_ROOT."/ticket/card.php?track_id=".$objp->track_id,
-                    );
-                    $r++;
+					// Subject
+					$this->info_box_contents[$i][$r] = array(
+						'td' => 'class="nowrap"',
+						'text' => $objp->subject, // Some event have no ref
+						'url' => DOL_URL_ROOT."/ticket/card.php?track_id=".$objp->track_id,
+					);
+					$r++;
 
-                    // Customer
-                    $this->info_box_contents[$i][$r] = array(
-                        'td' => 'class="tdoverflowmax150 maxwidth300onsmartphone"',
-                        'text' => $link,
-                        'asis' => 1,
-                    );
-                    $r++;
+					// Customer
+					$this->info_box_contents[$i][$r] = array(
+						'td' => 'class="tdoverflowmax150 maxwidth300onsmartphone"',
+						'text' => $link,
+						'asis' => 1,
+					);
+					$r++;
 
 
-                    // Date creation
-                    $this->info_box_contents[$i][$r] = array(
-                        'td' => 'class="right"',
-                        'text' => dol_print_date($datec, 'dayhour')
-                    );
-                    $r++;
+					// Date creation
+					$this->info_box_contents[$i][$r] = array(
+						'td' => 'class="right"',
+						'text' => dol_print_date($datec, 'dayhour')
+					);
+					$r++;
 
-                    // Statut
-                    $this->info_box_contents[$i][$r] = array(
-                        'td' => 'class="right nowraponall"',
-                        'text' => $ticket->getLibStatut(3)
-                    );
-                    $r++;
+					// Statut
+					$this->info_box_contents[$i][$r] = array(
+						'td' => 'class="right nowraponall"',
+						'text' => $ticket->getLibStatut(3)
+					);
+					$r++;
 
-                    $i++;
-                }
+					$i++;
+				}
 
-                if ($num == 0) {
-                    $this->info_box_contents[$i][0] = array('td' => 'class="center"', 'text'=>$langs->trans("BoxLastModifiedTicketNoRecordedTickets"));
-                }
-            } else {
-                dol_print_error($this->db);
-            }
-        } else {
-            $this->info_box_contents[0][0] = array(
-                'td' => 'class="left"',
-                'text' => $langs->trans("ReadPermissionNotAllowed"),
-            );
-        }
-    }
+				if ($num == 0) {
+					$this->info_box_contents[$i][0] = array('td' => 'class="center"', 'text'=>$langs->trans("BoxLastModifiedTicketNoRecordedTickets"));
+				}
+			} else {
+				dol_print_error($this->db);
+			}
+		} else {
+			$this->info_box_contents[0][0] = array(
+				'td' => 'class="left"',
+				'text' => $langs->trans("ReadPermissionNotAllowed"),
+			);
+		}
+	}
 
-    /**
-     *     Method to show box
-     *
-     *     @param  array $head     Array with properties of box title
-     *     @param  array $contents Array with properties of box lines
-     *     @param  int   $nooutput No print, only return string
-     *     @return string
-     */
-    public function showBox($head = null, $contents = null, $nooutput = 0)
-    {
-        parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
-    }
+	/**
+	 *     Method to show box
+	 *
+	 *     @param  array $head     Array with properties of box title
+	 *     @param  array $contents Array with properties of box lines
+	 *     @param  int   $nooutput No print, only return string
+	 *     @return string
+	 */
+	public function showBox($head = null, $contents = null, $nooutput = 0)
+	{
+		parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+	}
 }
diff --git a/htdocs/core/boxes/box_last_ticket.php b/htdocs/core/boxes/box_last_ticket.php
index 252141db9eb..9ada300901c 100644
--- a/htdocs/core/boxes/box_last_ticket.php
+++ b/htdocs/core/boxes/box_last_ticket.php
@@ -31,177 +31,177 @@ require_once DOL_DOCUMENT_ROOT."/core/boxes/modules_boxes.php";
 class box_last_ticket extends ModeleBoxes
 {
 
-    public $boxcode = "box_last_ticket";
-    public $boximg = "ticket";
-    public $boxlabel;
-    public $depends = array("ticket");
+	public $boxcode = "box_last_ticket";
+	public $boximg = "ticket";
+	public $boxlabel;
+	public $depends = array("ticket");
 
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $param;
-    public $info_box_head = array();
-    public $info_box_contents = array();
+	public $param;
+	public $info_box_head = array();
+	public $info_box_contents = array();
 
-    /**
-     * Constructor
-     *  @param  DoliDB  $db         Database handler
-     *  @param  string  $param      More parameters
-     */
-    public function __construct($db, $param = '')
-    {
-        global $langs;
-        $langs->load("boxes");
-        $this->db = $db;
+	/**
+	 * Constructor
+	 *  @param  DoliDB  $db         Database handler
+	 *  @param  string  $param      More parameters
+	 */
+	public function __construct($db, $param = '')
+	{
+		global $langs;
+		$langs->load("boxes");
+		$this->db = $db;
 
-        $this->boxlabel = $langs->transnoentitiesnoconv("BoxLastTicket");
-    }
+		$this->boxlabel = $langs->transnoentitiesnoconv("BoxLastTicket");
+	}
 
-    /**
-     * Load data into info_box_contents array to show array later.
-     *
-     *     @param  int $max Maximum number of records to load
-     *     @return void
-     */
-    public function loadBox($max = 5)
-    {
-        global $conf, $user, $langs;
+	/**
+	 * Load data into info_box_contents array to show array later.
+	 *
+	 *     @param  int $max Maximum number of records to load
+	 *     @return void
+	 */
+	public function loadBox($max = 5)
+	{
+		global $conf, $user, $langs;
 
-        $this->max = $max;
+		$this->max = $max;
 
-        require_once DOL_DOCUMENT_ROOT."/ticket/class/ticket.class.php";
+		require_once DOL_DOCUMENT_ROOT."/ticket/class/ticket.class.php";
 
-        $text = $langs->trans("BoxLastTicketDescription", $max);
-        $this->info_box_head = array(
-            'text' => $text,
-            'limit' => dol_strlen($text),
-        );
+		$text = $langs->trans("BoxLastTicketDescription", $max);
+		$this->info_box_head = array(
+			'text' => $text,
+			'limit' => dol_strlen($text),
+		);
 
-        $this->info_box_contents[0][0] = array(
-            'td' => 'class="left"',
-            'text' => $langs->trans("BoxLastTicketContent"),
-        );
+		$this->info_box_contents[0][0] = array(
+			'td' => 'class="left"',
+			'text' => $langs->trans("BoxLastTicketContent"),
+		);
 
-        if ($user->rights->ticket->read) {
-            $sql = "SELECT t.rowid as id, t.ref, t.track_id, t.fk_soc, t.fk_user_create, t.fk_user_assign, t.subject, t.message, t.fk_statut, t.type_code, t.category_code, t.severity_code, t.datec, t.date_read, t.date_close, t.origin_email ";
-            $sql .= ", type.label as type_label, category.label as category_label, severity.label as severity_label";
-            $sql .= ", s.nom as company_name, s.email as socemail, s.client, s.fournisseur";
-            $sql .= " FROM ".MAIN_DB_PREFIX."ticket as t";
-            $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_ticket_type as type ON type.code=t.type_code";
-            $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_ticket_category as category ON category.code=t.category_code";
-            $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_ticket_severity as severity ON severity.code=t.severity_code";
-            $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid=t.fk_soc";
+		if ($user->rights->ticket->read) {
+			$sql = "SELECT t.rowid as id, t.ref, t.track_id, t.fk_soc, t.fk_user_create, t.fk_user_assign, t.subject, t.message, t.fk_statut, t.type_code, t.category_code, t.severity_code, t.datec, t.date_read, t.date_close, t.origin_email ";
+			$sql .= ", type.label as type_label, category.label as category_label, severity.label as severity_label";
+			$sql .= ", s.nom as company_name, s.email as socemail, s.client, s.fournisseur";
+			$sql .= " FROM ".MAIN_DB_PREFIX."ticket as t";
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_ticket_type as type ON type.code=t.type_code";
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_ticket_category as category ON category.code=t.category_code";
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_ticket_severity as severity ON severity.code=t.severity_code";
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid=t.fk_soc";
 
-            $sql .= " WHERE t.entity = ".$conf->entity;
-            //          $sql.= " AND e.rowid = er.fk_event";
-            //if (!$user->rights->societe->client->voir && !$user->socid) $sql.= " WHERE s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-            if ($user->socid) {
-                $sql .= " AND t.fk_soc= ".$user->socid;
-            }
+			$sql .= " WHERE t.entity = ".$conf->entity;
+			//          $sql.= " AND e.rowid = er.fk_event";
+			//if (!$user->rights->societe->client->voir && !$user->socid) $sql.= " WHERE s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+			if ($user->socid) {
+				$sql .= " AND t.fk_soc= ".$user->socid;
+			}
 
-            //$sql.= " AND t.fk_statut > 9";
+			//$sql.= " AND t.fk_statut > 9";
 
-            $sql .= " ORDER BY t.datec DESC, t.rowid DESC ";
-            $sql .= $this->db->plimit($max, 0);
+			$sql .= " ORDER BY t.datec DESC, t.rowid DESC ";
+			$sql .= $this->db->plimit($max, 0);
 
-            $resql = $this->db->query($sql);
-            if ($resql) {
-                $num = $this->db->num_rows($resql);
+			$resql = $this->db->query($sql);
+			if ($resql) {
+				$num = $this->db->num_rows($resql);
 
-                $i = 0;
+				$i = 0;
 
-                while ($i < $num) {
-                    $objp = $this->db->fetch_object($resql);
-                    $datec = $this->db->jdate($objp->datec);
-                    $dateterm = $this->db->jdate($objp->fin_validite);
-                    $dateclose = $this->db->jdate($objp->date_cloture);
-                    $late = '';
+				while ($i < $num) {
+					$objp = $this->db->fetch_object($resql);
+					$datec = $this->db->jdate($objp->datec);
+					$dateterm = $this->db->jdate($objp->fin_validite);
+					$dateclose = $this->db->jdate($objp->date_cloture);
+					$late = '';
 
-                    $ticket = new Ticket($this->db);
-                    $ticket->id = $objp->id;
-                    $ticket->track_id = $objp->track_id;
-                    $ticket->ref = $objp->ref;
-                    $ticket->fk_statut = $objp->fk_statut;
-                    $ticket->subject = $objp->subject;
-                    if ($objp->fk_soc > 0) {
-                        $thirdparty = new Societe($this->db);
-                        $thirdparty->id = $objp->fk_soc;
-                        $thirdparty->email = $objp->socemail;
-                        $thirdparty->client = $objp->client;
-                        $thirdparty->fournisseur = $objp->fournisseur;
-                        $thirdparty->name = $objp->company_name;
-                        $link = $thirdparty->getNomUrl(1);
-                    } else {
-                        $link = dol_print_email($objp->origin_email);
-                    }
+					$ticket = new Ticket($this->db);
+					$ticket->id = $objp->id;
+					$ticket->track_id = $objp->track_id;
+					$ticket->ref = $objp->ref;
+					$ticket->fk_statut = $objp->fk_statut;
+					$ticket->subject = $objp->subject;
+					if ($objp->fk_soc > 0) {
+						$thirdparty = new Societe($this->db);
+						$thirdparty->id = $objp->fk_soc;
+						$thirdparty->email = $objp->socemail;
+						$thirdparty->client = $objp->client;
+						$thirdparty->fournisseur = $objp->fournisseur;
+						$thirdparty->name = $objp->company_name;
+						$link = $thirdparty->getNomUrl(1);
+					} else {
+						$link = dol_print_email($objp->origin_email);
+					}
 
-                    $r = 0;
+					$r = 0;
 
-                    // Ticket
-                    $this->info_box_contents[$i][$r] = array(
-                        'td' => 'class="nowraponall"',
-                        'text' => $ticket->getNomUrl(1),
-                        'asis' => 1
-                    );
-                    $r++;
+					// Ticket
+					$this->info_box_contents[$i][$r] = array(
+						'td' => 'class="nowraponall"',
+						'text' => $ticket->getNomUrl(1),
+						'asis' => 1
+					);
+					$r++;
 
-                    // Subject
-                    $this->info_box_contents[$i][$r] = array(
-                        'td' => '',
-                        'text' => $objp->subject, // Some event have no ref
-                        'url' => DOL_URL_ROOT."/ticket/card.php?track_id=".$objp->track_id,
-                    );
-                    $r++;
+					// Subject
+					$this->info_box_contents[$i][$r] = array(
+						'td' => '',
+						'text' => $objp->subject, // Some event have no ref
+						'url' => DOL_URL_ROOT."/ticket/card.php?track_id=".$objp->track_id,
+					);
+					$r++;
 
-                    // Customer
-                    $this->info_box_contents[$i][$r] = array(
-                        'td' => '',
-                        'text' => $link,
-                        'asis' => 1,
-                    );
-                    $r++;
+					// Customer
+					$this->info_box_contents[$i][$r] = array(
+						'td' => '',
+						'text' => $link,
+						'asis' => 1,
+					);
+					$r++;
 
-                    // Date creation
-                    $this->info_box_contents[$i][$r] = array(
-                        'td' => 'class="right"',
-                        'text' => dol_print_date($datec, 'dayhour'),
-                    );
-                    $r++;
+					// Date creation
+					$this->info_box_contents[$i][$r] = array(
+						'td' => 'class="right"',
+						'text' => dol_print_date($datec, 'dayhour'),
+					);
+					$r++;
 
-                    // Statut
-                    $this->info_box_contents[$i][$r] = array(
-                        'td' => 'class="right nowraponall"',
-                        'text' => $ticket->getLibStatut(3),
-                    );
-                    $r++;
+					// Statut
+					$this->info_box_contents[$i][$r] = array(
+						'td' => 'class="right nowraponall"',
+						'text' => $ticket->getLibStatut(3),
+					);
+					$r++;
 
-                    $i++;
-                }
+					$i++;
+				}
 
-                if ($num == 0) {
-                    $this->info_box_contents[$i][0] = array('td' => 'class="center"', 'text' => $langs->trans("BoxLastTicketNoRecordedTickets"));
-                }
-            } else {
-                dol_print_error($this->db);
-            }
-        } else {
-            $this->info_box_contents[0][0] = array('td' => 'class="left"',
-                'text' => $langs->trans("ReadPermissionNotAllowed"));
-        }
-    }
+				if ($num == 0) {
+					$this->info_box_contents[$i][0] = array('td' => 'class="center"', 'text' => $langs->trans("BoxLastTicketNoRecordedTickets"));
+				}
+			} else {
+				dol_print_error($this->db);
+			}
+		} else {
+			$this->info_box_contents[0][0] = array('td' => 'class="left"',
+				'text' => $langs->trans("ReadPermissionNotAllowed"));
+		}
+	}
 
-    /**
-     *     Method to show box
-     *
-     *     @param  array $head     Array with properties of box title
-     *     @param  array $contents Array with properties of box lines
-     *     @param  int   $nooutput No print, only return string
-     *     @return string
-     */
-    public function showBox($head = null, $contents = null, $nooutput = 0)
-    {
-        parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
-    }
+	/**
+	 *     Method to show box
+	 *
+	 *     @param  array $head     Array with properties of box title
+	 *     @param  array $contents Array with properties of box lines
+	 *     @param  int   $nooutput No print, only return string
+	 *     @return string
+	 */
+	public function showBox($head = null, $contents = null, $nooutput = 0)
+	{
+		parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+	}
 }
diff --git a/htdocs/core/boxes/box_lastlogin.php b/htdocs/core/boxes/box_lastlogin.php
index 6af4468c669..b45986387a8 100644
--- a/htdocs/core/boxes/box_lastlogin.php
+++ b/htdocs/core/boxes/box_lastlogin.php
@@ -30,75 +30,75 @@ include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
  */
 class box_lastlogin extends ModeleBoxes
 {
-    public $boxcode = "lastlogin";
-    public $boximg = "object_user";
-    public $boxlabel = 'BoxLoginInformation';
-    public $depends = array("user");
+	public $boxcode = "lastlogin";
+	public $boximg = "object_user";
+	public $boxlabel = 'BoxLoginInformation';
+	public $depends = array("user");
 
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $param;
-    public $enabled = 1;
+	public $param;
+	public $enabled = 1;
 
-    public $info_box_head = array();
-    public $info_box_contents = array();
+	public $info_box_head = array();
+	public $info_box_contents = array();
 
 
-    /**
-     *  Constructor
-     *
-     *  @param  DoliDB  $db         Database handler
-     *  @param  string  $param      More parameters
-     */
-    public function __construct($db, $param)
-    {
-        global $conf;
+	/**
+	 *  Constructor
+	 *
+	 *  @param  DoliDB  $db         Database handler
+	 *  @param  string  $param      More parameters
+	 */
+	public function __construct($db, $param)
+	{
+		global $conf;
 
-        $this->db = $db;
-    }
+		$this->db = $db;
+	}
 
-    /**
-     *  Charge les donnees en memoire pour affichage ulterieur
-     *
-     *  @param  int     $max        Maximum number of records to load
-     *  @return void
-     */
-    public function loadBox($max = 5)
-    {
-        global $conf, $user, $langs;
+	/**
+	 *  Charge les donnees en memoire pour affichage ulterieur
+	 *
+	 *  @param  int     $max        Maximum number of records to load
+	 *  @return void
+	 */
+	public function loadBox($max = 5)
+	{
+		global $conf, $user, $langs;
 
-        $textHead = $langs->trans("BoxLoginInformation");
-        $this->info_box_head = array(
-            'text' => $textHead,
-            'limit'=> dol_strlen($textHead),
-        );
+		$textHead = $langs->trans("BoxLoginInformation");
+		$this->info_box_head = array(
+			'text' => $textHead,
+			'limit'=> dol_strlen($textHead),
+		);
 
-        $line = 0;
-        $this->info_box_contents[$line][0] = array(
-            'td' => 'class="tdoverflowmax150 maxwidth150onsmartphone"',
-            'text' => $langs->trans("User"),
-        );
-        $this->info_box_contents[$line][1] = array(
-            'td' => 'class="tdoverflowmax150 maxwidth150onsmartphone"',
-            'text' => $user->getNomUrl(-1),
-            'asis' => 1
-        );
+		$line = 0;
+		$this->info_box_contents[$line][0] = array(
+			'td' => 'class="tdoverflowmax150 maxwidth150onsmartphone"',
+			'text' => $langs->trans("User"),
+		);
+		$this->info_box_contents[$line][1] = array(
+			'td' => 'class="tdoverflowmax150 maxwidth150onsmartphone"',
+			'text' => $user->getNomUrl(-1),
+			'asis' => 1
+		);
 
-        $line = 1;
-        $this->info_box_contents[$line][0] = array(
-            'td' => '',
-            'text' => $langs->trans("PreviousConnexion"),
-        );
-        if ($user->datepreviouslogin) $tmp = dol_print_date($user->datepreviouslogin, "dayhour", 'tzuser');
-        else $tmp = $langs->trans("Unknown");
-        $this->info_box_contents[$line][1] = array(
-            'td' => '',
-            'text' => $tmp,
-        );
-    }
+		$line = 1;
+		$this->info_box_contents[$line][0] = array(
+			'td' => '',
+			'text' => $langs->trans("PreviousConnexion"),
+		);
+		if ($user->datepreviouslogin) $tmp = dol_print_date($user->datepreviouslogin, "dayhour", 'tzuser');
+		else $tmp = $langs->trans("Unknown");
+		$this->info_box_contents[$line][1] = array(
+			'td' => '',
+			'text' => $tmp,
+		);
+	}
 
 
 	/**
@@ -109,8 +109,8 @@ class box_lastlogin extends ModeleBoxes
 	 *  @param	int		$nooutput	No print, only return string
 	 *  @return	void
 	 */
-    public function showBox($head = null, $contents = null, $nooutput = 0)
-    {
+	public function showBox($head = null, $contents = null, $nooutput = 0)
+	{
 		parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
 }
diff --git a/htdocs/core/boxes/box_members.php b/htdocs/core/boxes/box_members.php
index 2ca1fb3ae25..72bc088ae6c 100644
--- a/htdocs/core/boxes/box_members.php
+++ b/htdocs/core/boxes/box_members.php
@@ -32,28 +32,28 @@ include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
  */
 class box_members extends ModeleBoxes
 {
-    public $boxcode = "lastmembers";
-    public $boximg = "object_user";
-    public $boxlabel = "BoxLastMembers";
-    public $depends = array("adherent");
+	public $boxcode = "lastmembers";
+	public $boximg = "object_user";
+	public $boxlabel = "BoxLastMembers";
+	public $depends = array("adherent");
 
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $param;
-    public $enabled = 1;
+	public $param;
+	public $enabled = 1;
 
-    public $info_box_head = array();
-    public $info_box_contents = array();
+	public $info_box_head = array();
+	public $info_box_contents = array();
 
 
 	/**
 	 *  Constructor
 	 *
 	 *  @param  DoliDB	$db      	Database handler
-     *  @param	string	$param		More parameters
+	 *  @param	string	$param		More parameters
 	 */
 	public function __construct($db, $param = '')
 	{
@@ -72,7 +72,7 @@ class box_members extends ModeleBoxes
 	 *  Load data into info_box_contents array to show array later.
 	 *
 	 *  @param	int		$max        Maximum number of records to load
-     *  @return	void
+	 *  @return	void
 	 */
 	public function loadBox($max = 5)
 	{
@@ -81,8 +81,8 @@ class box_members extends ModeleBoxes
 
 		$this->max = $max;
 
-        include_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
-        $memberstatic = new Adherent($this->db);
+		include_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
+		$memberstatic = new Adherent($this->db);
 
 		$this->info_box_head = array('text' => $langs->trans("BoxTitleLastModifiedMembers", $max));
 
@@ -110,12 +110,12 @@ class box_members extends ModeleBoxes
 					$memberstatic->lastname = $objp->lastname;
 					$memberstatic->firstname = $objp->firstname;
 					$memberstatic->id = $objp->rowid;
-                    $memberstatic->ref = $objp->rowid;
-                    $memberstatic->photo = $objp->photo;
-                    $memberstatic->gender = $objp->gender;
-                    $memberstatic->email = $objp->email;
-                    $memberstatic->morphy = $objp->morphy;
-                    $memberstatic->company = $objp->company;
+					$memberstatic->ref = $objp->rowid;
+					$memberstatic->photo = $objp->photo;
+					$memberstatic->gender = $objp->gender;
+					$memberstatic->email = $objp->email;
+					$memberstatic->morphy = $objp->morphy;
+					$memberstatic->company = $objp->company;
 
 					if (!empty($objp->fk_soc)) {
 						$memberstatic->socid = $objp->fk_soc;
@@ -125,52 +125,52 @@ class box_members extends ModeleBoxes
 						$memberstatic->name = $objp->company;
 					}
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="tdoverflowmax150 maxwidth150onsmartphone"',
-                        'text' => $memberstatic->getNomUrl(-1),
-                        'asis' => 1,
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="tdoverflowmax150 maxwidth150onsmartphone"',
+						'text' => $memberstatic->getNomUrl(-1),
+						'asis' => 1,
+					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="tdoverflowmax150 maxwidth150onsmartphone"',
-                        'text' => $memberstatic->company,
-                        'url' => DOL_URL_ROOT."/adherents/card.php?rowid=".$objp->rowid,
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="tdoverflowmax150 maxwidth150onsmartphone"',
+						'text' => $memberstatic->company,
+						'url' => DOL_URL_ROOT."/adherents/card.php?rowid=".$objp->rowid,
+					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right"',
-                        'text' => dol_print_date($datem, "day"),
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right"',
+						'text' => dol_print_date($datem, "day"),
+					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right" width="18"',
-                        'text' => $memberstatic->LibStatut($objp->status, $objp->subscription, $this->db->jdate($objp->date_end_subscription), 3),
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right" width="18"',
+						'text' => $memberstatic->LibStatut($objp->status, $objp->subscription, $this->db->jdate($objp->date_end_subscription), 3),
+					);
 
-                    $line++;
-                }
+					$line++;
+				}
 
-                if ($num == 0)
-                    $this->info_box_contents[$line][0] = array(
-                        'td' => 'class="center"',
-                        'text'=>$langs->trans("NoRecordedCustomers"),
-                    );
+				if ($num == 0)
+					$this->info_box_contents[$line][0] = array(
+						'td' => 'class="center"',
+						'text'=>$langs->trans("NoRecordedCustomers"),
+					);
 
-                $this->db->free($result);
-            } else {
-                $this->info_box_contents[0][0] = array(
-                    'td' => '',
-                    'maxlength'=>500,
-                    'text' => ($this->db->error().' sql='.$sql),
-                );
-            }
-        } else {
-            $this->info_box_contents[0][0] = array(
-                'td' => 'class="nohover opacitymedium left"',
-                'text' => $langs->trans("ReadPermissionNotAllowed")
-            );
-        }
-    }
+				$this->db->free($result);
+			} else {
+				$this->info_box_contents[0][0] = array(
+					'td' => '',
+					'maxlength'=>500,
+					'text' => ($this->db->error().' sql='.$sql),
+				);
+			}
+		} else {
+			$this->info_box_contents[0][0] = array(
+				'td' => 'class="nohover opacitymedium left"',
+				'text' => $langs->trans("ReadPermissionNotAllowed")
+			);
+		}
+	}
 
 	/**
 	 *	Method to show box
@@ -180,8 +180,8 @@ class box_members extends ModeleBoxes
 	 *  @param	int		$nooutput	No print, only return string
 	 *	@return	string
 	 */
-    public function showBox($head = null, $contents = null, $nooutput = 0)
-    {
+	public function showBox($head = null, $contents = null, $nooutput = 0)
+	{
 		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
 }
diff --git a/htdocs/core/boxes/box_mos.php b/htdocs/core/boxes/box_mos.php
index ec21d5d00cf..dde8294f80b 100644
--- a/htdocs/core/boxes/box_mos.php
+++ b/htdocs/core/boxes/box_mos.php
@@ -32,143 +32,143 @@ include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
  */
 class box_mos extends ModeleBoxes
 {
-    public $boxcode = "lastmos";
-    public $boximg = "object_mrp";
-    public $boxlabel = "BoxTitleLatestModifiedMos";
-    public $depends = array("mrp");
+	public $boxcode = "lastmos";
+	public $boximg = "object_mrp";
+	public $boxlabel = "BoxTitleLatestModifiedMos";
+	public $depends = array("mrp");
 
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $param;
+	public $param;
 
-    public $info_box_head = array();
-    public $info_box_contents = array();
+	public $info_box_head = array();
+	public $info_box_contents = array();
 
 
-    /**
-     *  Constructor
-     *
-     *  @param  DoliDB  $db         Database handler
-     *  @param  string  $param      More parameters
-     */
-    public function __construct($db, $param)
-    {
-        global $user;
+	/**
+	 *  Constructor
+	 *
+	 *  @param  DoliDB  $db         Database handler
+	 *  @param  string  $param      More parameters
+	 */
+	public function __construct($db, $param)
+	{
+		global $user;
 
-        $this->db = $db;
+		$this->db = $db;
 
-        $this->hidden = !($user->rights->bom->read);
-    }
+		$this->hidden = !($user->rights->bom->read);
+	}
 
-    /**
-     *  Load data for box to show them later
-     *
-     *  @param	int		$max        Maximum number of records to load
-     *  @return	void
-     */
-    public function loadBox($max = 5)
-    {
-        global $user, $langs, $conf;
+	/**
+	 *  Load data for box to show them later
+	 *
+	 *  @param	int		$max        Maximum number of records to load
+	 *  @return	void
+	 */
+	public function loadBox($max = 5)
+	{
+		global $user, $langs, $conf;
 
-        $this->max = $max;
+		$this->max = $max;
 
-        include_once DOL_DOCUMENT_ROOT.'/mrp/class/mo.class.php';
-        include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+		include_once DOL_DOCUMENT_ROOT.'/mrp/class/mo.class.php';
+		include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 
-        $mostatic = new Mo($this->db);
-        $productstatic = new Product($this->db);
-        $userstatic = new User($this->db);
+		$mostatic = new Mo($this->db);
+		$productstatic = new Product($this->db);
+		$userstatic = new User($this->db);
 
-        $this->info_box_head = array('text' => $langs->trans("BoxTitleLatestModifiedMos", $max));
+		$this->info_box_head = array('text' => $langs->trans("BoxTitleLatestModifiedMos", $max));
 
-        if ($user->rights->mrp->read)
-        {
-            $sql = "SELECT p.ref as product_ref";
-            $sql .= ", c.rowid";
-            $sql .= ", c.date_creation";
-            $sql .= ", c.tms";
-            $sql .= ", c.ref";
-            $sql .= ", c.status";
-            //$sql.= ", c.fk_user_valid";
-            $sql .= " FROM ".MAIN_DB_PREFIX."product as p";
-            $sql .= ", ".MAIN_DB_PREFIX."mrp_mo as c";
-            $sql .= " WHERE c.fk_product = p.rowid";
-            $sql .= " AND c.entity = ".$conf->entity;
-            $sql .= " ORDER BY c.tms DESC, c.ref DESC";
-            $sql .= " ".$this->db->plimit($max, 0);
+		if ($user->rights->mrp->read)
+		{
+			$sql = "SELECT p.ref as product_ref";
+			$sql .= ", c.rowid";
+			$sql .= ", c.date_creation";
+			$sql .= ", c.tms";
+			$sql .= ", c.ref";
+			$sql .= ", c.status";
+			//$sql.= ", c.fk_user_valid";
+			$sql .= " FROM ".MAIN_DB_PREFIX."product as p";
+			$sql .= ", ".MAIN_DB_PREFIX."mrp_mo as c";
+			$sql .= " WHERE c.fk_product = p.rowid";
+			$sql .= " AND c.entity = ".$conf->entity;
+			$sql .= " ORDER BY c.tms DESC, c.ref DESC";
+			$sql .= " ".$this->db->plimit($max, 0);
 
-            $result = $this->db->query($sql);
-            if ($result) {
-                $num = $this->db->num_rows($result);
+			$result = $this->db->query($sql);
+			if ($result) {
+				$num = $this->db->num_rows($result);
 
-                $line = 0;
+				$line = 0;
 
-                while ($line < $num) {
-                    $objp = $this->db->fetch_object($result);
-                    $datem = $this->db->jdate($objp->tms);
-                    $mostatic->id = $objp->rowid;
-                    $mostatic->ref = $objp->ref;
-                    $mostatic->id = $objp->socid;
-                    $mostatic->status = $objp->status;
-                    $productstatic->ref = $objp->product_ref;
+				while ($line < $num) {
+					$objp = $this->db->fetch_object($result);
+					$datem = $this->db->jdate($objp->tms);
+					$mostatic->id = $objp->rowid;
+					$mostatic->ref = $objp->ref;
+					$mostatic->id = $objp->socid;
+					$mostatic->status = $objp->status;
+					$productstatic->ref = $objp->product_ref;
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="nowraponall"',
-                        'text' => $mostatic->getNomUrl(1),
-                        'asis' => 1,
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="nowraponall"',
+						'text' => $mostatic->getNomUrl(1),
+						'asis' => 1,
+					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="tdoverflowmax150 maxwidth150onsmartphone"',
-                        'text' => $productstatic->getNomUrl(1),
-                        'asis' => 1,
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="tdoverflowmax150 maxwidth150onsmartphone"',
+						'text' => $productstatic->getNomUrl(1),
+						'asis' => 1,
+					);
 
-                    if (!empty($conf->global->MRP_BOX_LAST_MOS_SHOW_VALIDATE_USER)) {
-                        if ($objp->fk_user_valid > 0) $userstatic->fetch($objp->fk_user_valid);
-                        $this->info_box_contents[$line][] = array(
-                            'td' => 'class="right"',
-                            'text' => (($objp->fk_user_valid > 0) ? $userstatic->getNomUrl(1) : ''),
-                            'asis' => 1,
-                        );
-                    }
+					if (!empty($conf->global->MRP_BOX_LAST_MOS_SHOW_VALIDATE_USER)) {
+						if ($objp->fk_user_valid > 0) $userstatic->fetch($objp->fk_user_valid);
+						$this->info_box_contents[$line][] = array(
+							'td' => 'class="right"',
+							'text' => (($objp->fk_user_valid > 0) ? $userstatic->getNomUrl(1) : ''),
+							'asis' => 1,
+						);
+					}
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right"',
-                        'text' => dol_print_date($datem, 'day'),
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right"',
+						'text' => dol_print_date($datem, 'day'),
+					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right" width="18"',
-                        'text' => $mostatic->LibStatut($objp->status, 3),
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right" width="18"',
+						'text' => $mostatic->LibStatut($objp->status, 3),
+					);
 
-                    $line++;
-                }
+					$line++;
+				}
 
-                if ($num == 0) $this->info_box_contents[$line][0] = array(
-                	'td' => 'class="center opacitymedium"',
-                	'text'=>$langs->trans("NoRecordedOrders")
-                );
+				if ($num == 0) $this->info_box_contents[$line][0] = array(
+					'td' => 'class="center opacitymedium"',
+					'text'=>$langs->trans("NoRecordedOrders")
+				);
 
-                $this->db->free($result);
-            } else {
-                $this->info_box_contents[0][0] = array(
-                    'td' => '',
-                    'maxlength'=>500,
-                    'text' => ($this->db->error().' sql='.$sql),
-                );
-            }
-        } else {
-            $this->info_box_contents[0][0] = array(
-                'td' => 'class="nohover opacitymedium left"',
-                'text' => $langs->trans("ReadPermissionNotAllowed")
-            );
-        }
-    }
+				$this->db->free($result);
+			} else {
+				$this->info_box_contents[0][0] = array(
+					'td' => '',
+					'maxlength'=>500,
+					'text' => ($this->db->error().' sql='.$sql),
+				);
+			}
+		} else {
+			$this->info_box_contents[0][0] = array(
+				'td' => 'class="nohover opacitymedium left"',
+				'text' => $langs->trans("ReadPermissionNotAllowed")
+			);
+		}
+	}
 
 	/**
 	 *	Method to show box
@@ -178,8 +178,8 @@ class box_mos extends ModeleBoxes
 	 *  @param	int		$nooutput	No print, only return string
 	 *	@return	string
 	 */
-    public function showBox($head = null, $contents = null, $nooutput = 0)
-    {
-        return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
-    }
+	public function showBox($head = null, $contents = null, $nooutput = 0)
+	{
+		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+	}
 }
diff --git a/htdocs/core/boxes/box_produits.php b/htdocs/core/boxes/box_produits.php
index 52591fa5292..06808ab2518 100644
--- a/htdocs/core/boxes/box_produits.php
+++ b/htdocs/core/boxes/box_produits.php
@@ -33,20 +33,20 @@ include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
  */
 class box_produits extends ModeleBoxes
 {
-    public $boxcode = "lastproducts";
-    public $boximg = "object_product";
-    public $boxlabel = "BoxLastProducts";
-    public $depends = array("produit");
+	public $boxcode = "lastproducts";
+	public $boximg = "object_product";
+	public $boxlabel = "BoxLastProducts";
+	public $depends = array("produit");
 
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $param;
+	public $param;
 
-    public $info_box_head = array();
-    public $info_box_contents = array();
+	public $info_box_head = array();
+	public $info_box_contents = array();
 
 
 	/**
@@ -57,21 +57,21 @@ class box_produits extends ModeleBoxes
 	 */
 	public function __construct($db, $param)
 	{
-	    global $conf, $user;
+		global $conf, $user;
 
-	    $this->db = $db;
+		$this->db = $db;
 
-	    $listofmodulesforexternal = explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL);
-	    $tmpentry = array('enabled'=>(!empty($conf->product->enabled) || !empty($conf->service->enabled)), 'perms'=>(!empty($user->rights->produit->lire) || !empty($user->rights->service->lire)), 'module'=>'product|service');
-	    $showmode = isVisibleToUserType(($user->socid > 0 ? 1 : 0), $tmpentry, $listofmodulesforexternal);
-	    $this->hidden = ($showmode != 1);
+		$listofmodulesforexternal = explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL);
+		$tmpentry = array('enabled'=>(!empty($conf->product->enabled) || !empty($conf->service->enabled)), 'perms'=>(!empty($user->rights->produit->lire) || !empty($user->rights->service->lire)), 'module'=>'product|service');
+		$showmode = isVisibleToUserType(($user->socid > 0 ? 1 : 0), $tmpentry, $listofmodulesforexternal);
+		$this->hidden = ($showmode != 1);
 	}
 
 	/**
 	 *  Load data into info_box_contents array to show array later.
 	 *
 	 *  @param	int		$max        Maximum number of records to load
-     *  @return	void
+	 *  @return	void
 	 */
 	public function loadBox($max = 5)
 	{
@@ -94,9 +94,9 @@ class box_produits extends ModeleBoxes
 			// Add where from hooks
 			if (is_object($hookmanager))
 			{
-			    $parameters = array('boxproductlist'=>1);
-			    $reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook
-			    $sql .= $hookmanager->resPrint;
+				$parameters = array('boxproductlist'=>1);
+				$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook
+				$sql .= $hookmanager->resPrint;
 			}
 			$sql .= $this->db->order('p.datec', 'DESC');
 			$sql .= $this->db->plimit($max, 0);
@@ -128,33 +128,33 @@ class box_produits extends ModeleBoxes
 								$objp->label = $objtp->label;
 						}
 					}
-                    $productstatic->id = $objp->rowid;
-                    $productstatic->ref = $objp->ref;
-                    $productstatic->type = $objp->fk_product_type;
-                    $productstatic->label = $objp->label;
+					$productstatic->id = $objp->rowid;
+					$productstatic->ref = $objp->ref;
+					$productstatic->type = $objp->fk_product_type;
+					$productstatic->label = $objp->label;
 					$productstatic->entity = $objp->entity;
 
 					$this->info_box_contents[$line][] = array(
-                        'td' => 'class="tdoverflowmax100 maxwidth100onsmartphone"',
-                        'text' => $productstatic->getNomUrl(1),
-                        'asis' => 1,
-                    );
+						'td' => 'class="tdoverflowmax100 maxwidth100onsmartphone"',
+						'text' => $productstatic->getNomUrl(1),
+						'asis' => 1,
+					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="tdoverflowmax100 maxwidth100onsmartphone"',
-                        'text' => $objp->label,
-                    );
-                    $price = '';
-                    $price_base_type = '';
-                    if (empty($conf->dynamicprices->enabled) || empty($objp->fk_price_expression)) {
-                        $price_base_type = $langs->trans($objp->price_base_type);
-                        $price = ($objp->price_base_type == 'HT') ?price($objp->price) : $price = price($objp->price_ttc);
-	                } else //Parse the dynamic price
-	               	{
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="tdoverflowmax100 maxwidth100onsmartphone"',
+						'text' => $objp->label,
+					);
+					$price = '';
+					$price_base_type = '';
+					if (empty($conf->dynamicprices->enabled) || empty($objp->fk_price_expression)) {
+						$price_base_type = $langs->trans($objp->price_base_type);
+						$price = ($objp->price_base_type == 'HT') ?price($objp->price) : $price = price($objp->price_ttc);
+					} else //Parse the dynamic price
+				   	{
 						$productstatic->fetch($objp->rowid, '', '', 1);
-	                    $priceparser = new PriceParser($this->db);
-	                    $price_result = $priceparser->parseProduct($productstatic);
-	                    if ($price_result >= 0) {
+						$priceparser = new PriceParser($this->db);
+						$price_result = $priceparser->parseProduct($productstatic);
+						if ($price_result >= 0) {
 							if ($objp->price_base_type == 'HT')
 							{
 								$price_base_type = $langs->trans("HT");
@@ -163,69 +163,69 @@ class box_produits extends ModeleBoxes
 								$price_base_type = $langs->trans("TTC");
 							}
 							$price = price($price_result);
-	                    }
-	               	}
+						}
+				   	}
 					$this->info_box_contents[$line][] = array(
-                        'td' => 'class="right"',
-                        'text' => $price,
-                    );
+						'td' => 'class="right"',
+						'text' => $price,
+					);
 
 					$this->info_box_contents[$line][] = array(
-                        'td' => 'class="nowrap"',
-                        'text' => $price_base_type,
-                    );
+						'td' => 'class="nowrap"',
+						'text' => $price_base_type,
+					);
 
 					$this->info_box_contents[$line][] = array(
-                        'td' => 'class="right"',
-                        'text' => dol_print_date($datem, 'day'),
-                    );
+						'td' => 'class="right"',
+						'text' => dol_print_date($datem, 'day'),
+					);
 
 					$this->info_box_contents[$line][] = array(
-                        'td' => 'class="right" width="18"',
-                        'text' => '<span class="statusrefsell">'.$productstatic->LibStatut($objp->tosell, 3, 0).'<span>',
-					    'asis' => 1
-                    );
+						'td' => 'class="right" width="18"',
+						'text' => '<span class="statusrefsell">'.$productstatic->LibStatut($objp->tosell, 3, 0).'<span>',
+						'asis' => 1
+					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right" width="18"',
-                        'text' => '<span class="statusrefbuy">'.$productstatic->LibStatut($objp->tobuy, 3, 1).'</span>',
-					    'asis' => 1
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right" width="18"',
+						'text' => '<span class="statusrefbuy">'.$productstatic->LibStatut($objp->tobuy, 3, 1).'</span>',
+						'asis' => 1
+					);
 
-                    $line++;
-                }
-                if ($num == 0)
-                    $this->info_box_contents[$line][0] = array(
-                        'td' => 'class="center"',
-                        'text'=>$langs->trans("NoRecordedProducts"),
-                    );
+					$line++;
+				}
+				if ($num == 0)
+					$this->info_box_contents[$line][0] = array(
+						'td' => 'class="center"',
+						'text'=>$langs->trans("NoRecordedProducts"),
+					);
 
-                $this->db->free($result);
-            } else {
-                $this->info_box_contents[0][0] = array(
-                    'td' => '',
-                    'maxlength'=>500,
-                    'text' => ($this->db->error().' sql='.$sql),
-                );
-            }
-        } else {
-            $this->info_box_contents[0][0] = array(
-                'td' => 'class="nohover opacitymedium left"',
-                'text' => $langs->trans("ReadPermissionNotAllowed")
-            );
-        }
-    }
+				$this->db->free($result);
+			} else {
+				$this->info_box_contents[0][0] = array(
+					'td' => '',
+					'maxlength'=>500,
+					'text' => ($this->db->error().' sql='.$sql),
+				);
+			}
+		} else {
+			$this->info_box_contents[0][0] = array(
+				'td' => 'class="nohover opacitymedium left"',
+				'text' => $langs->trans("ReadPermissionNotAllowed")
+			);
+		}
+	}
 
-    /**
-     *  Method to show box
-     *
-     *  @param	array	$head       Array with properties of box title
-     *  @param  array	$contents   Array with properties of box lines
-     *  @param	int		$nooutput	No print, only return string
-     *  @return	string
-     */
-    public function showBox($head = null, $contents = null, $nooutput = 0)
-    {
-        return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
-    }
+	/**
+	 *  Method to show box
+	 *
+	 *  @param	array	$head       Array with properties of box title
+	 *  @param  array	$contents   Array with properties of box lines
+	 *  @param	int		$nooutput	No print, only return string
+	 *  @return	string
+	 */
+	public function showBox($head = null, $contents = null, $nooutput = 0)
+	{
+		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+	}
 }
diff --git a/htdocs/core/boxes/box_produits_alerte_stock.php b/htdocs/core/boxes/box_produits_alerte_stock.php
index 6845cb2db5f..893bb2273ab 100644
--- a/htdocs/core/boxes/box_produits_alerte_stock.php
+++ b/htdocs/core/boxes/box_produits_alerte_stock.php
@@ -35,20 +35,20 @@ include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
  */
 class box_produits_alerte_stock extends ModeleBoxes
 {
-    public $boxcode = "productsalertstock";
-    public $boximg = "object_product";
-    public $boxlabel = "BoxProductsAlertStock";
-    public $depends = array("produit");
+	public $boxcode = "productsalertstock";
+	public $boximg = "object_product";
+	public $boxlabel = "BoxProductsAlertStock";
+	public $depends = array("produit");
 
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $param;
+	public $param;
 
-    public $info_box_head = array();
-    public $info_box_contents = array();
+	public $info_box_head = array();
+	public $info_box_contents = array();
 
 
 	/**
@@ -59,21 +59,21 @@ class box_produits_alerte_stock extends ModeleBoxes
 	 */
 	public function __construct($db, $param = '')
 	{
-	    global $conf, $user;
+		global $conf, $user;
 
-	    $this->db = $db;
+		$this->db = $db;
 
-	    $listofmodulesforexternal = explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL);
-	    $tmpentry = array('enabled'=>((!empty($conf->product->enabled) || !empty($conf->service->enabled)) && !empty($conf->stock->enabled)), 'perms'=>($user->rights->stock->lire), 'module'=>'product|service|stock');
-	    $showmode = isVisibleToUserType(($user->socid > 0 ? 1 : 0), $tmpentry, $listofmodulesforexternal);
-	    $this->hidden = ($showmode != 1);
+		$listofmodulesforexternal = explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL);
+		$tmpentry = array('enabled'=>((!empty($conf->product->enabled) || !empty($conf->service->enabled)) && !empty($conf->stock->enabled)), 'perms'=>($user->rights->stock->lire), 'module'=>'product|service|stock');
+		$showmode = isVisibleToUserType(($user->socid > 0 ? 1 : 0), $tmpentry, $listofmodulesforexternal);
+		$this->hidden = ($showmode != 1);
 	}
 
 	/**
 	 *  Load data into info_box_contents array to show array later.
 	 *
 	 *  @param	int		$max        Maximum number of records to load
-     *  @return	void
+	 *  @return	void
 	 */
 	public function loadBox($max = 5)
 	{
@@ -99,16 +99,16 @@ class box_produits_alerte_stock extends ModeleBoxes
 			if (empty($user->rights->produit->lire)) $sql .= ' AND p.fk_product_type != 0';
 			if (empty($user->rights->service->lire)) $sql .= ' AND p.fk_product_type != 1';
 			// Add where from hooks
-    		if (is_object($hookmanager))
-    		{
-			    $parameters = array('boxproductalertstocklist'=>1);
-    		    $reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook
-    		    $sql .= $hookmanager->resPrint;
-    		}
-		    $sql .= " GROUP BY p.rowid, p.ref, p.label, p.price, p.price_base_type, p.price_ttc, p.fk_product_type, p.tms, p.tosell, p.tobuy, p.barcode, p.seuil_stock_alerte, p.entity,";
-		    $sql .= " p.accountancy_code_sell, p.accountancy_code_sell_intra, p.accountancy_code_sell_export,";
-		    $sql .= " p.accountancy_code_buy, p.accountancy_code_buy_intra, p.accountancy_code_buy_export";
-		    $sql .= " HAVING SUM(".$this->db->ifsql("s.reel IS NULL", "0", "s.reel").") < p.seuil_stock_alerte";
+			if (is_object($hookmanager))
+			{
+				$parameters = array('boxproductalertstocklist'=>1);
+				$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook
+				$sql .= $hookmanager->resPrint;
+			}
+			$sql .= " GROUP BY p.rowid, p.ref, p.label, p.price, p.price_base_type, p.price_ttc, p.fk_product_type, p.tms, p.tosell, p.tobuy, p.barcode, p.seuil_stock_alerte, p.entity,";
+			$sql .= " p.accountancy_code_sell, p.accountancy_code_sell_intra, p.accountancy_code_sell_export,";
+			$sql .= " p.accountancy_code_buy, p.accountancy_code_buy_intra, p.accountancy_code_buy_export";
+			$sql .= " HAVING SUM(".$this->db->ifsql("s.reel IS NULL", "0", "s.reel").") < p.seuil_stock_alerte";
 			$sql .= $this->db->order('p.seuil_stock_alerte', 'DESC');
 			$sql .= $this->db->plimit($max, 0);
 
@@ -118,11 +118,11 @@ class box_produits_alerte_stock extends ModeleBoxes
 				$langs->load("stocks");
 				$num = $this->db->num_rows($result);
 				$line = 0;
-                while ($line < $num) {
+				while ($line < $num) {
 					$objp = $this->db->fetch_object($result);
 					$datem = $this->db->jdate($objp->tms);
-                    $price = '';
-                    $price_base_type = '';
+					$price = '';
+					$price_base_type = '';
 
 					// Multilangs
 					if (!empty($conf->global->MAIN_MULTILANGS)) // si l'option est active
@@ -141,10 +141,10 @@ class box_produits_alerte_stock extends ModeleBoxes
 								$objp->label = $objtp->label;
 						}
 					}
-                    $productstatic->id = $objp->rowid;
-                    $productstatic->ref = $objp->ref;
-                    $productstatic->type = $objp->fk_product_type;
-                    $productstatic->label = $objp->label;
+					$productstatic->id = $objp->rowid;
+					$productstatic->ref = $objp->ref;
+					$productstatic->type = $objp->fk_product_type;
+					$productstatic->label = $objp->label;
 					$productstatic->entity = $objp->entity;
 					$productstatic->barcode = $objp->barcode;
 					$productstatic->status = $objp->tosell;
@@ -156,27 +156,27 @@ class box_produits_alerte_stock extends ModeleBoxes
 					$productstatic->accountancy_code_buy_intra = $objp->accountancy_code_buy_intra;
 					$productstatic->accountancy_code_buy_export = $objp->accountancy_code_buy_export;
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => '',
-                        'text' => $productstatic->getNomUrl(1),
-                        'asis' => 1,
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => '',
+						'text' => $productstatic->getNomUrl(1),
+						'asis' => 1,
+					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="tdoverflowmax150 maxwidth150onsmartphone"',
-                        'text' => $objp->label,
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="tdoverflowmax150 maxwidth150onsmartphone"',
+						'text' => $objp->label,
+					);
 
-                    if (empty($conf->dynamicprices->enabled) || empty($objp->fk_price_expression))
-                    {
-                        $price_base_type = $langs->trans($objp->price_base_type);
-                        $price = ($objp->price_base_type == 'HT') ?price($objp->price) : $price = price($objp->price_ttc);
-	                } else //Parse the dynamic price
-	               	{
+					if (empty($conf->dynamicprices->enabled) || empty($objp->fk_price_expression))
+					{
+						$price_base_type = $langs->trans($objp->price_base_type);
+						$price = ($objp->price_base_type == 'HT') ?price($objp->price) : $price = price($objp->price_ttc);
+					} else //Parse the dynamic price
+				   	{
 						$productstatic->fetch($objp->rowid, '', '', 1);
-	                    $priceparser = new PriceParser($this->db);
-	                    $price_result = $priceparser->parseProduct($productstatic);
-	                    if ($price_result >= 0) {
+						$priceparser = new PriceParser($this->db);
+						$price_result = $priceparser->parseProduct($productstatic);
+						if ($price_result >= 0) {
 							if ($objp->price_base_type == 'HT')
 							{
 								$price_base_type = $langs->trans("HT");
@@ -185,58 +185,58 @@ class box_produits_alerte_stock extends ModeleBoxes
 								$price_base_type = $langs->trans("TTC");
 							}
 							$price = price($price_result);
-	                    }
-	               	}
-
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right nowraponall"',
-                        'text' => $price,
-                    );
-
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right"',
-                        'text' => $price_base_type,
-                    );
+						}
+				   	}
 
 					$this->info_box_contents[$line][] = array(
-					    'td' => 'class="center"',
-                        'text' => $objp->total_stock.' / '.$objp->seuil_stock_alerte,
-                        'text2'=>img_warning($langs->transnoentitiesnoconv("StockLowerThanLimit", $objp->seuil_stock_alerte)),
-                    );
-
-					$this->info_box_contents[$line][] = array(
-					    'td' => 'class="right" width="18"',
-                        'text' => '<span class="statusrefsell">'.$productstatic->LibStatut($objp->tosell, 3, 0).'<span>',
-					    'asis' => 1
+						'td' => 'class="right nowraponall"',
+						'text' => $price,
 					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right" width="18"',
-                        'text' => '<span class="statusrefbuy">'.$productstatic->LibStatut($objp->tobuy, 3, 0).'<span>',
-                        'asis' => 1
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right"',
+						'text' => $price_base_type,
+					);
 
-                    $line++;
-                }
-                if ($num == 0)
-                    $this->info_box_contents[$line][0] = array(
-                        'td' => 'class="center"',
-                        'text'=>$langs->trans("NoTooLowStockProducts"),
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="center"',
+						'text' => $objp->total_stock.' / '.$objp->seuil_stock_alerte,
+						'text2'=>img_warning($langs->transnoentitiesnoconv("StockLowerThanLimit", $objp->seuil_stock_alerte)),
+					);
+
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right" width="18"',
+						'text' => '<span class="statusrefsell">'.$productstatic->LibStatut($objp->tosell, 3, 0).'<span>',
+						'asis' => 1
+					);
+
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right" width="18"',
+						'text' => '<span class="statusrefbuy">'.$productstatic->LibStatut($objp->tobuy, 3, 0).'<span>',
+						'asis' => 1
+					);
+
+					$line++;
+				}
+				if ($num == 0)
+					$this->info_box_contents[$line][0] = array(
+						'td' => 'class="center"',
+						'text'=>$langs->trans("NoTooLowStockProducts"),
+					);
 
 				$this->db->free($result);
 			} else {
 				$this->info_box_contents[0][0] = array(
-                    'td' => '',
-                    'maxlength'=>500,
-                    'text' => ($this->db->error().' sql='.$sql),
-                );
+					'td' => '',
+					'maxlength'=>500,
+					'text' => ($this->db->error().' sql='.$sql),
+				);
 			}
 		} else {
-            $this->info_box_contents[0][0] = array(
-                'td' => 'class="nohover opacitymedium left"',
-                'text' => $langs->trans("ReadPermissionNotAllowed")
-            );
+			$this->info_box_contents[0][0] = array(
+				'td' => 'class="nohover opacitymedium left"',
+				'text' => $langs->trans("ReadPermissionNotAllowed")
+			);
 		}
 	}
 
@@ -248,8 +248,8 @@ class box_produits_alerte_stock extends ModeleBoxes
 	 *  @param	int		$nooutput	No print, only return string
 	 *	@return	string
 	 */
-    public function showBox($head = null, $contents = null, $nooutput = 0)
-    {
-        return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+	public function showBox($head = null, $contents = null, $nooutput = 0)
+	{
+		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
 }
diff --git a/htdocs/core/boxes/box_project.php b/htdocs/core/boxes/box_project.php
index e8b056322da..1afbdfc6837 100644
--- a/htdocs/core/boxes/box_project.php
+++ b/htdocs/core/boxes/box_project.php
@@ -31,174 +31,174 @@ include_once DOL_DOCUMENT_ROOT."/core/boxes/modules_boxes.php";
  */
 class box_project extends ModeleBoxes
 {
-    public $boxcode = "project";
-    public $boximg = "object_projectpub";
-    public $boxlabel;
-    //var $depends = array("projet");
+	public $boxcode = "project";
+	public $boximg = "object_projectpub";
+	public $boxlabel;
+	//var $depends = array("projet");
 
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $param;
+	public $param;
 
-    public $info_box_head = array();
-    public $info_box_contents = array();
+	public $info_box_head = array();
+	public $info_box_contents = array();
 
-    /**
-     *  Constructor
-     *
-     *  @param  DoliDB  $db         Database handler
-     *  @param  string  $param      More parameters
-     */
-    public function __construct($db, $param = '')
-    {
-        global $user, $langs;
+	/**
+	 *  Constructor
+	 *
+	 *  @param  DoliDB  $db         Database handler
+	 *  @param  string  $param      More parameters
+	 */
+	public function __construct($db, $param = '')
+	{
+		global $user, $langs;
 
-        // Load translation files required by the page
-        $langs->loadLangs(array('boxes', 'projects'));
+		// Load translation files required by the page
+		$langs->loadLangs(array('boxes', 'projects'));
 
-        $this->db = $db;
-        $this->boxlabel = "OpenedProjects";
+		$this->db = $db;
+		$this->boxlabel = "OpenedProjects";
 
-        $this->hidden = !($user->rights->projet->lire);
-    }
+		$this->hidden = !($user->rights->projet->lire);
+	}
 
-    /**
-    *  Load data for box to show them later
-    *
-    *  @param   int		$max        Maximum number of records to load
-    *  @return  void
-    */
-    public function loadBox($max = 5)
-    {
-        global $conf, $user, $langs;
+	/**
+	 *  Load data for box to show them later
+	 *
+	 *  @param   int		$max        Maximum number of records to load
+	 *  @return  void
+	 */
+	public function loadBox($max = 5)
+	{
+		global $conf, $user, $langs;
 
-        $this->max = $max;
+		$this->max = $max;
 
-        $totalMnt = 0;
-        $totalnb = 0;
-        $totalnbTask = 0;
+		$totalMnt = 0;
+		$totalnb = 0;
+		$totalnbTask = 0;
 
-        $textHead = $langs->trans("OpenedProjects");
-        $this->info_box_head = array('text' => $textHead, 'limit'=> dol_strlen($textHead));
+		$textHead = $langs->trans("OpenedProjects");
+		$this->info_box_head = array('text' => $textHead, 'limit'=> dol_strlen($textHead));
 
-        // list the summary of the orders
-        if ($user->rights->projet->lire) {
-            include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
-            $projectstatic = new Project($this->db);
+		// list the summary of the orders
+		if ($user->rights->projet->lire) {
+			include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+			$projectstatic = new Project($this->db);
 
-            $socid = 0;
-            //if ($user->socid > 0) $socid = $user->socid;    // For external user, no check is done on company because readability is managed by public status of project and assignement.
+			$socid = 0;
+			//if ($user->socid > 0) $socid = $user->socid;    // For external user, no check is done on company because readability is managed by public status of project and assignement.
 
-            // Get list of project id allowed to user (in a string list separated by coma)
-            $projectsListId = '';
-            if (!$user->rights->projet->all->lire) $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1, $socid);
+			// Get list of project id allowed to user (in a string list separated by coma)
+			$projectsListId = '';
+			if (!$user->rights->projet->all->lire) $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1, $socid);
 
-            $sql = "SELECT p.rowid, p.ref, p.title, p.fk_statut as status, p.public";
-            $sql .= " FROM ".MAIN_DB_PREFIX."projet as p";
-            $sql .= " WHERE p.entity IN (".getEntity('project').")"; // Only current entity or severals if permission ok
+			$sql = "SELECT p.rowid, p.ref, p.title, p.fk_statut as status, p.public";
+			$sql .= " FROM ".MAIN_DB_PREFIX."projet as p";
+			$sql .= " WHERE p.entity IN (".getEntity('project').")"; // Only current entity or severals if permission ok
 			$sql .= " AND p.fk_statut = 1"; // Only open projects
-            if (!$user->rights->projet->all->lire) $sql .= " AND p.rowid IN (".$projectsListId.")"; // public and assigned to, or restricted to company for external users
+			if (!$user->rights->projet->all->lire) $sql .= " AND p.rowid IN (".$projectsListId.")"; // public and assigned to, or restricted to company for external users
 
-            $sql .= " ORDER BY p.datec DESC";
-            //$sql.= $this->db->plimit($max, 0);
+			$sql .= " ORDER BY p.datec DESC";
+			//$sql.= $this->db->plimit($max, 0);
 
-            $result = $this->db->query($sql);
+			$result = $this->db->query($sql);
 
-            if ($result) {
-                $num = $this->db->num_rows($result);
-                $i = 0;
-                while ($i < min($num, $max)) {
-                    $objp = $this->db->fetch_object($result);
+			if ($result) {
+				$num = $this->db->num_rows($result);
+				$i = 0;
+				while ($i < min($num, $max)) {
+					$objp = $this->db->fetch_object($result);
 
-                    $projectstatic->id = $objp->rowid;
-                    $projectstatic->ref = $objp->ref;
-                    $projectstatic->title = $objp->title;
-                    $projectstatic->public = $objp->public;
-                    $projectstatic->statut = $objp->status;
+					$projectstatic->id = $objp->rowid;
+					$projectstatic->ref = $objp->ref;
+					$projectstatic->title = $objp->title;
+					$projectstatic->public = $objp->public;
+					$projectstatic->statut = $objp->status;
 
-                    $this->info_box_contents[$i][] = array(
-                        'td' => 'class="nowraponall"',
-                        'text' => $projectstatic->getNomUrl(1),
-                        'asis' => 1
-                    );
+					$this->info_box_contents[$i][] = array(
+						'td' => 'class="nowraponall"',
+						'text' => $projectstatic->getNomUrl(1),
+						'asis' => 1
+					);
 
-                    $this->info_box_contents[$i][] = array(
-                        'td' => 'class="tdoverflowmax150 maxwidth200onsmartphone"',
-                        'text' => $objp->title,
-                    );
+					$this->info_box_contents[$i][] = array(
+						'td' => 'class="tdoverflowmax150 maxwidth200onsmartphone"',
+						'text' => $objp->title,
+					);
 
-                    $sql = "SELECT count(*) as nb, sum(progress) as totprogress";
-                    $sql .= " FROM ".MAIN_DB_PREFIX."projet as p LEFT JOIN ".MAIN_DB_PREFIX."projet_task as pt on pt.fk_projet = p.rowid";
-                       $sql .= " WHERE p.entity IN (".getEntity('project').')';
-                    $sql .= " AND p.rowid = ".$objp->rowid;
-                    $resultTask = $this->db->query($sql);
-                    if ($resultTask) {
-                        $objTask = $this->db->fetch_object($resultTask);
-                        $this->info_box_contents[$i][] = array(
-                            'td' => 'class="right"',
-                            'text' => $objTask->nb."&nbsp;".$langs->trans("Tasks"),
-                        );
-                        if ($objTask->nb > 0)
-                            $this->info_box_contents[$i][] = array(
-                                'td' => 'class="right"',
-                                'text' => round($objTask->totprogress / $objTask->nb, 0)."%",
-                            );
-                        else $this->info_box_contents[$i][] = array('td' => 'class="right"', 'text' => "N/A&nbsp;");
-                        $totalnbTask += $objTask->nb;
-                    } else {
-                        $this->info_box_contents[$i][] = array('td' => 'class="right"', 'text' => round(0));
-                        $this->info_box_contents[$i][] = array('td' => 'class="right"', 'text' => "N/A&nbsp;");
-                    }
-                    $this->info_box_contents[$i][] = array('td' => 'class="right"', 'text' => $projectstatic->getLibStatut(3));
+					$sql = "SELECT count(*) as nb, sum(progress) as totprogress";
+					$sql .= " FROM ".MAIN_DB_PREFIX."projet as p LEFT JOIN ".MAIN_DB_PREFIX."projet_task as pt on pt.fk_projet = p.rowid";
+					   $sql .= " WHERE p.entity IN (".getEntity('project').')';
+					$sql .= " AND p.rowid = ".$objp->rowid;
+					$resultTask = $this->db->query($sql);
+					if ($resultTask) {
+						$objTask = $this->db->fetch_object($resultTask);
+						$this->info_box_contents[$i][] = array(
+							'td' => 'class="right"',
+							'text' => $objTask->nb."&nbsp;".$langs->trans("Tasks"),
+						);
+						if ($objTask->nb > 0)
+							$this->info_box_contents[$i][] = array(
+								'td' => 'class="right"',
+								'text' => round($objTask->totprogress / $objTask->nb, 0)."%",
+							);
+						else $this->info_box_contents[$i][] = array('td' => 'class="right"', 'text' => "N/A&nbsp;");
+						$totalnbTask += $objTask->nb;
+					} else {
+						$this->info_box_contents[$i][] = array('td' => 'class="right"', 'text' => round(0));
+						$this->info_box_contents[$i][] = array('td' => 'class="right"', 'text' => "N/A&nbsp;");
+					}
+					$this->info_box_contents[$i][] = array('td' => 'class="right"', 'text' => $projectstatic->getLibStatut(3));
 
-                    $i++;
-                }
-                if ($max < $num)
-                {
-                    $this->info_box_contents[$i][] = array('td' => 'colspan="5"', 'text' => '...');
-                    $i++;
-                }
-            }
-        }
+					$i++;
+				}
+				if ($max < $num)
+				{
+					$this->info_box_contents[$i][] = array('td' => 'colspan="5"', 'text' => '...');
+					$i++;
+				}
+			}
+		}
 
 
-        // Add the sum à the bottom of the boxes
-        $this->info_box_contents[$i][] = array(
-            'td' => 'class="liste_total"',
-            'text' => $langs->trans("Total")."&nbsp;".$textHead,
-             'text' => "&nbsp;",
-        );
-        $this->info_box_contents[$i][] = array(
-            'td' => 'class="right liste_total" ',
-            'text' => round($num, 0)."&nbsp;".$langs->trans("Projects"),
-        );
-        $this->info_box_contents[$i][] = array(
-            'td' => 'class="right liste_total" ',
-            'text' => (($max < $num) ? '' : (round($totalnbTask, 0)."&nbsp;".$langs->trans("Tasks"))),
-        );
-        $this->info_box_contents[$i][] = array(
-            'td' => 'class="liste_total"',
-            'text' => "&nbsp;",
-        );
-        $this->info_box_contents[$i][] = array(
-        	'td' => 'class="liste_total"',
-        	'text' => "&nbsp;",
-        );
-    }
+		// Add the sum à the bottom of the boxes
+		$this->info_box_contents[$i][] = array(
+			'td' => 'class="liste_total"',
+			'text' => $langs->trans("Total")."&nbsp;".$textHead,
+			 'text' => "&nbsp;",
+		);
+		$this->info_box_contents[$i][] = array(
+			'td' => 'class="right liste_total" ',
+			'text' => round($num, 0)."&nbsp;".$langs->trans("Projects"),
+		);
+		$this->info_box_contents[$i][] = array(
+			'td' => 'class="right liste_total" ',
+			'text' => (($max < $num) ? '' : (round($totalnbTask, 0)."&nbsp;".$langs->trans("Tasks"))),
+		);
+		$this->info_box_contents[$i][] = array(
+			'td' => 'class="liste_total"',
+			'text' => "&nbsp;",
+		);
+		$this->info_box_contents[$i][] = array(
+			'td' => 'class="liste_total"',
+			'text' => "&nbsp;",
+		);
+	}
 
-    /**
-     *	Method to show box
-     *
-     *	@param	array	$head       Array with properties of box title
-     *	@param  array	$contents   Array with properties of box lines
-     *  @param	int		$nooutput	No print, only return string
-     *	@return	string
-     */
-    public function showBox($head = null, $contents = null, $nooutput = 0)
-    {
-        return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
-    }
+	/**
+	 *	Method to show box
+	 *
+	 *	@param	array	$head       Array with properties of box title
+	 *	@param  array	$contents   Array with properties of box lines
+	 *  @param	int		$nooutput	No print, only return string
+	 *	@return	string
+	 */
+	public function showBox($head = null, $contents = null, $nooutput = 0)
+	{
+		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+	}
 }
diff --git a/htdocs/core/boxes/box_propales.php b/htdocs/core/boxes/box_propales.php
index 331ff54cb8d..bbfa2f6fb19 100644
--- a/htdocs/core/boxes/box_propales.php
+++ b/htdocs/core/boxes/box_propales.php
@@ -33,155 +33,155 @@ include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
  */
 class box_propales extends ModeleBoxes
 {
-    public $boxcode = "lastpropals";
-    public $boximg = "object_propal";
-    public $boxlabel = "BoxLastProposals";
-    public $depends = array("propal"); // conf->propal->enabled
+	public $boxcode = "lastpropals";
+	public $boximg = "object_propal";
+	public $boxlabel = "BoxLastProposals";
+	public $depends = array("propal"); // conf->propal->enabled
 
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $param;
+	public $param;
 
-    public $info_box_head = array();
-    public $info_box_contents = array();
+	public $info_box_head = array();
+	public $info_box_contents = array();
 
 
-    /**
-     *  Constructor
-     *
-     *  @param  DoliDB  $db         Database handler
-     *  @param  string  $param      More parameters
-     */
-    public function __construct($db, $param)
-    {
-        global $user;
+	/**
+	 *  Constructor
+	 *
+	 *  @param  DoliDB  $db         Database handler
+	 *  @param  string  $param      More parameters
+	 */
+	public function __construct($db, $param)
+	{
+		global $user;
 
-        $this->db = $db;
+		$this->db = $db;
 
-        $this->hidden = !($user->rights->propale->lire);
-    }
+		$this->hidden = !($user->rights->propale->lire);
+	}
 
-    /**
+	/**
 	 *  Load data into info_box_contents array to show array later.
 	 *
 	 *  @param	int		$max        Maximum number of records to load
-     *  @return	void
-     */
-    public function loadBox($max = 5)
-    {
-    	global $user, $langs, $conf;
+	 *  @return	void
+	 */
+	public function loadBox($max = 5)
+	{
+		global $user, $langs, $conf;
 
-    	$this->max = $max;
+		$this->max = $max;
 
-    	include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
-        include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
-    	$propalstatic = new Propal($this->db);
-        $societestatic = new Societe($this->db);
+		include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
+		include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
+		$propalstatic = new Propal($this->db);
+		$societestatic = new Societe($this->db);
 
-        $this->info_box_head = array('text' => $langs->trans("BoxTitleLast".($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE ? "" : "Modified")."Propals", $max));
+		$this->info_box_head = array('text' => $langs->trans("BoxTitleLast".($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE ? "" : "Modified")."Propals", $max));
 
-    	if ($user->rights->propale->lire)
-    	{
-    		$sql = "SELECT s.nom as name, s.rowid as socid, s.code_client, s.logo, s.entity, s.email,";
-    		$sql .= " p.rowid, p.ref, p.fk_statut, p.datep as dp, p.datec, p.fin_validite, p.date_cloture, p.total_ht, p.tva as total_tva, p.total as total_ttc, p.tms";
-    		$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
-    		$sql .= ", ".MAIN_DB_PREFIX."propal as p";
-    		if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-    		$sql .= " WHERE p.fk_soc = s.rowid";
-    		$sql .= " AND p.entity IN (".getEntity('propal').")";
-    		if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
-    		if ($user->socid) $sql .= " AND s.rowid = ".$user->socid;
-            if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) $sql .= " ORDER BY p.datep DESC, p.ref DESC ";
-            else $sql .= " ORDER BY p.tms DESC, p.ref DESC ";
-    		$sql .= $this->db->plimit($max, 0);
+		if ($user->rights->propale->lire)
+		{
+			$sql = "SELECT s.nom as name, s.rowid as socid, s.code_client, s.logo, s.entity, s.email,";
+			$sql .= " p.rowid, p.ref, p.fk_statut, p.datep as dp, p.datec, p.fin_validite, p.date_cloture, p.total_ht, p.tva as total_tva, p.total as total_ttc, p.tms";
+			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+			$sql .= ", ".MAIN_DB_PREFIX."propal as p";
+			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+			$sql .= " WHERE p.fk_soc = s.rowid";
+			$sql .= " AND p.entity IN (".getEntity('propal').")";
+			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+			if ($user->socid) $sql .= " AND s.rowid = ".$user->socid;
+			if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) $sql .= " ORDER BY p.datep DESC, p.ref DESC ";
+			else $sql .= " ORDER BY p.tms DESC, p.ref DESC ";
+			$sql .= $this->db->plimit($max, 0);
 
-    		$result = $this->db->query($sql);
-    		if ($result)
-    		{
-    			$num = $this->db->num_rows($result);
-    			$now = dol_now();
+			$result = $this->db->query($sql);
+			if ($result)
+			{
+				$num = $this->db->num_rows($result);
+				$now = dol_now();
 
-    			$line = 0;
+				$line = 0;
 
-                while ($line < $num) {
-    				$objp = $this->db->fetch_object($result);
-    				$date = $this->db->jdate($objp->dp);
-    				$datec = $this->db->jdate($objp->datec);
-    				$datem = $this->db->jdate($objp->tms);
-    				$dateterm = $this->db->jdate($objp->fin_validite);
-    				$dateclose = $this->db->jdate($objp->date_cloture);
-                    $propalstatic->id = $objp->rowid;
-                    $propalstatic->ref = $objp->ref;
-                    $propalstatic->total_ht = $objp->total_ht;
-                    $propalstatic->total_tva = $objp->total_tva;
-                    $propalstatic->total_ttc = $objp->total_ttc;
-                    $societestatic->id = $objp->socid;
-                    $societestatic->name = $objp->name;
-                    $societestatic->code_client = $objp->code_client;
-                    $societestatic->logo = $objp->logo;
-                    $societestatic->email = $objp->email;
+				while ($line < $num) {
+					$objp = $this->db->fetch_object($result);
+					$date = $this->db->jdate($objp->dp);
+					$datec = $this->db->jdate($objp->datec);
+					$datem = $this->db->jdate($objp->tms);
+					$dateterm = $this->db->jdate($objp->fin_validite);
+					$dateclose = $this->db->jdate($objp->date_cloture);
+					$propalstatic->id = $objp->rowid;
+					$propalstatic->ref = $objp->ref;
+					$propalstatic->total_ht = $objp->total_ht;
+					$propalstatic->total_tva = $objp->total_tva;
+					$propalstatic->total_ttc = $objp->total_ttc;
+					$societestatic->id = $objp->socid;
+					$societestatic->name = $objp->name;
+					$societestatic->code_client = $objp->code_client;
+					$societestatic->logo = $objp->logo;
+					$societestatic->email = $objp->email;
 					$societestatic->entity = $objp->entity;
 
-    				$late = '';
-    				if ($objp->fk_statut == 1 && $dateterm < ($now - $conf->propal->cloture->warning_delay)) {
-    					$late = img_warning($langs->trans("Late"));
-    				}
+					$late = '';
+					if ($objp->fk_statut == 1 && $dateterm < ($now - $conf->propal->cloture->warning_delay)) {
+						$late = img_warning($langs->trans("Late"));
+					}
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="nowraponall"',
-                        'text' => $propalstatic->getNomUrl(1),
-                        'text2'=> $late,
-                        'asis' => 1,
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="nowraponall"',
+						'text' => $propalstatic->getNomUrl(1),
+						'text2'=> $late,
+						'asis' => 1,
+					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="tdoverflowmax150 maxwidth150onsmartphone"',
-                        'text' => $societestatic->getNomUrl(1),
-                        'asis' => 1,
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="tdoverflowmax150 maxwidth150onsmartphone"',
+						'text' => $societestatic->getNomUrl(1),
+						'asis' => 1,
+					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right nowraponall"',
-                        'text' => price($objp->total_ht, 0, $langs, 0, -1, -1, $conf->currency),
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right nowraponall"',
+						'text' => price($objp->total_ht, 0, $langs, 0, -1, -1, $conf->currency),
+					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right"',
-                        'text' => dol_print_date($date, 'day'),
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right"',
+						'text' => dol_print_date($date, 'day'),
+					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right" width="18"',
-                        'text' => $propalstatic->LibStatut($objp->fk_statut, 3),
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right" width="18"',
+						'text' => $propalstatic->LibStatut($objp->fk_statut, 3),
+					);
 
-                    $line++;
-                }
+					$line++;
+				}
 
-                if ($num == 0)
-                    $this->info_box_contents[$line][0] = array(
-                        'td' => 'class="center"',
-                        'text'=>$langs->trans("NoRecordedProposals"),
-                    );
+				if ($num == 0)
+					$this->info_box_contents[$line][0] = array(
+						'td' => 'class="center"',
+						'text'=>$langs->trans("NoRecordedProposals"),
+					);
 
-                $this->db->free($result);
-            } else {
-                $this->info_box_contents[0][0] = array(
-                    'td' => '',
-                    'maxlength'=>500,
-                    'text' => ($this->db->error().' sql='.$sql),
-                );
-            }
-        } else {
-            $this->info_box_contents[0][0] = array(
-                'td' => 'class="nohover opacitymedium left"',
-                'text' => $langs->trans("ReadPermissionNotAllowed")
-            );
-        }
-    }
+				$this->db->free($result);
+			} else {
+				$this->info_box_contents[0][0] = array(
+					'td' => '',
+					'maxlength'=>500,
+					'text' => ($this->db->error().' sql='.$sql),
+				);
+			}
+		} else {
+			$this->info_box_contents[0][0] = array(
+				'td' => 'class="nohover opacitymedium left"',
+				'text' => $langs->trans("ReadPermissionNotAllowed")
+			);
+		}
+	}
 
 	/**
 	 *  Method to show box
@@ -191,8 +191,8 @@ class box_propales extends ModeleBoxes
 	 *  @param	int		$nooutput	No print, only return string
 	 *	@return	string
 	 */
-    public function showBox($head = null, $contents = null, $nooutput = 0)
-    {
-        return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
-    }
+	public function showBox($head = null, $contents = null, $nooutput = 0)
+	{
+		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+	}
 }
diff --git a/htdocs/core/boxes/box_prospect.php b/htdocs/core/boxes/box_prospect.php
index 1024ef1d4ec..10a8698aaf9 100644
--- a/htdocs/core/boxes/box_prospect.php
+++ b/htdocs/core/boxes/box_prospect.php
@@ -34,27 +34,27 @@ include_once DOL_DOCUMENT_ROOT.'/societe/class/client.class.php';
  */
 class box_prospect extends ModeleBoxes
 {
-    public $boxcode = "lastprospects";
-    public $boximg = "object_company";
-    public $boxlabel = "BoxLastProspects";
-    public $depends = array("societe");
+	public $boxcode = "lastprospects";
+	public $boximg = "object_company";
+	public $boxlabel = "BoxLastProspects";
+	public $depends = array("societe");
 
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $enabled = 1;
+	public $enabled = 1;
 
-    public $info_box_head = array();
-    public $info_box_contents = array();
+	public $info_box_head = array();
+	public $info_box_contents = array();
 
 
 	/**
 	 *  Constructor
 	 *
 	 *  @param  DoliDB	$db      	Database handler
-     *  @param	string	$param		More parameters
+	 *  @param	string	$param		More parameters
 	 */
 	public function __construct($db, $param = '')
 	{
@@ -72,7 +72,7 @@ class box_prospect extends ModeleBoxes
 	 *  Load data into info_box_contents array to show array later.
 	 *
 	 *  @param	int		$max        Maximum number of records to load
-     *  @return	void
+	 *  @return	void
 	 */
 	public function loadBox($max = 5)
 	{
@@ -88,10 +88,10 @@ class box_prospect extends ModeleBoxes
 		{
 			$sql = "SELECT s.nom as name, s.rowid as socid";
 			$sql .= ", s.code_client";
-            $sql .= ", s.client, s.email";
-            $sql .= ", s.code_fournisseur";
-            $sql .= ", s.fournisseur";
-            $sql .= ", s.logo";
+			$sql .= ", s.client, s.email";
+			$sql .= ", s.code_fournisseur";
+			$sql .= ", s.fournisseur";
+			$sql .= ", s.logo";
 			$sql .= ", s.fk_stcomm, s.datec, s.tms, s.status";
 			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@@ -115,58 +115,58 @@ class box_prospect extends ModeleBoxes
 					$datec = $this->db->jdate($objp->datec);
 					$datem = $this->db->jdate($objp->tms);
 					$thirdpartystatic->id = $objp->socid;
-                    $thirdpartystatic->name = $objp->name;
-                    $thirdpartystatic->email = $objp->email;
-                    $thirdpartystatic->code_client = $objp->code_client;
-                    $thirdpartystatic->code_fournisseur = $objp->code_fournisseur;
-                    $thirdpartystatic->client = $objp->client;
-                    $thirdpartystatic->fournisseur = $objp->fournisseur;
-                    $thirdpartystatic->logo = $objp->logo;
+					$thirdpartystatic->name = $objp->name;
+					$thirdpartystatic->email = $objp->email;
+					$thirdpartystatic->code_client = $objp->code_client;
+					$thirdpartystatic->code_fournisseur = $objp->code_fournisseur;
+					$thirdpartystatic->client = $objp->client;
+					$thirdpartystatic->fournisseur = $objp->fournisseur;
+					$thirdpartystatic->logo = $objp->logo;
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => '',
-                        'text' => $thirdpartystatic->getNomUrl(1),
-                    	'asis' => 1,
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => '',
+						'text' => $thirdpartystatic->getNomUrl(1),
+						'asis' => 1,
+					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right"',
-                        'text' => dol_print_date($datem, "day"),
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right"',
+						'text' => dol_print_date($datem, "day"),
+					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right" width="18"',
-                        'text' => str_replace('img ', 'img height="14" ', $thirdpartystatic->LibProspCommStatut($objp->fk_stcomm, 3)),
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right" width="18"',
+						'text' => str_replace('img ', 'img height="14" ', $thirdpartystatic->LibProspCommStatut($objp->fk_stcomm, 3)),
+					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right" width="18"',
-                        'text' => $thirdpartystatic->LibStatut($objp->status, 3),
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right" width="18"',
+						'text' => $thirdpartystatic->LibStatut($objp->status, 3),
+					);
 
-                    $line++;
-                }
+					$line++;
+				}
 
-                if ($num == 0) {
-                    $this->info_box_contents[$line][0] = array(
-                        'td' => 'class="center opacitymedium"',
-                        'text'=> $langs->trans("NoRecordedProspects"),
-                    );
-                }
+				if ($num == 0) {
+					$this->info_box_contents[$line][0] = array(
+						'td' => 'class="center opacitymedium"',
+						'text'=> $langs->trans("NoRecordedProspects"),
+					);
+				}
 
-                $this->db->free($resql);
-            } else {
-                $this->info_box_contents[0][0] = array(
-                    'td' => '',
-                    'maxlength' => 500,
-                    'text' => ($this->db->error().' sql='.$sql),
-                );
-            }
-        } else {
-            $this->info_box_contents[0][0] = array(
-                'td' => 'class="nohover opacitymedium left"',
-                'text' => $langs->trans("ReadPermissionNotAllowed")
-            );
+				$this->db->free($resql);
+			} else {
+				$this->info_box_contents[0][0] = array(
+					'td' => '',
+					'maxlength' => 500,
+					'text' => ($this->db->error().' sql='.$sql),
+				);
+			}
+		} else {
+			$this->info_box_contents[0][0] = array(
+				'td' => 'class="nohover opacitymedium left"',
+				'text' => $langs->trans("ReadPermissionNotAllowed")
+			);
 		}
 	}
 
@@ -178,8 +178,8 @@ class box_prospect extends ModeleBoxes
 	 *  @param	int		$nooutput	No print, only return string
 	 *	@return	string
 	 */
-    public function showBox($head = null, $contents = null, $nooutput = 0)
-    {
+	public function showBox($head = null, $contents = null, $nooutput = 0)
+	{
 		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
 }
diff --git a/htdocs/core/boxes/box_services_contracts.php b/htdocs/core/boxes/box_services_contracts.php
index a5a1c4bea8a..c4a713a03b5 100644
--- a/htdocs/core/boxes/box_services_contracts.php
+++ b/htdocs/core/boxes/box_services_contracts.php
@@ -32,20 +32,20 @@ include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
  */
 class box_services_contracts extends ModeleBoxes
 {
-    public $boxcode = "lastproductsincontract";
-    public $boximg = "object_product";
-    public $boxlabel = "BoxLastProductsInContract";
-    public $depends = array("service", "contrat");
+	public $boxcode = "lastproductsincontract";
+	public $boximg = "object_product";
+	public $boxlabel = "BoxLastProductsInContract";
+	public $depends = array("service", "contrat");
 
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $param;
+	public $param;
 
-    public $info_box_head = array();
-    public $info_box_contents = array();
+	public $info_box_head = array();
+	public $info_box_contents = array();
 
 
 	/**
@@ -56,18 +56,18 @@ class box_services_contracts extends ModeleBoxes
 	 */
 	public function __construct($db, $param)
 	{
-	    global $user;
+		global $user;
 
-	    $this->db = $db;
+		$this->db = $db;
 
-	    $this->hidden = !($user->rights->service->lire && $user->rights->contrat->lire);
+		$this->hidden = !($user->rights->service->lire && $user->rights->contrat->lire);
 	}
 
 	/**
 	 *  Load data into info_box_contents array to show array later.
 	 *
 	 *  @param	int		$max        Maximum number of records to load
-     *  @return	void
+	 *  @return	void
 	 */
 	public function loadBox($max = 5)
 	{
@@ -83,10 +83,10 @@ class box_services_contracts extends ModeleBoxes
 
 		if ($user->rights->service->lire && $user->rights->contrat->lire)
 		{
-		    $contractstatic = new Contrat($this->db);
-		    $contractlinestatic = new ContratLigne($this->db);
-		    $thirdpartytmp = new Societe($this->db);
-		    $productstatic = new Product($this->db);
+			$contractstatic = new Contrat($this->db);
+			$contractlinestatic = new ContratLigne($this->db);
+			$thirdpartytmp = new Societe($this->db);
+			$productstatic = new Product($this->db);
 
 			$sql = "SELECT s.nom as name, s.rowid as socid, s.email, s.client, s.fournisseur, s.code_client, s.code_fournisseur, s.code_compta, s.code_compta_fournisseur,";
 			$sql .= " c.rowid, c.ref, c.statut as contract_status, c.ref_customer, c.ref_supplier,";
@@ -182,31 +182,31 @@ class box_services_contracts extends ModeleBoxes
 
 
 					$this->info_box_contents[$i][] = array(
-                        'td' => 'class="tdoverflowmax150 maxwidth150onsmartphone"',
-                        'text' => $s,
-                        'asis' => 1
-                    );
+						'td' => 'class="tdoverflowmax150 maxwidth150onsmartphone"',
+						'text' => $s,
+						'asis' => 1
+					);
 
 					$this->info_box_contents[$i][] = array(
-                        'td' => 'class="nowraponall"',
-                        'text' => $contractstatic->getNomUrl(1),
-                        'asis' => 1
-                    );
+						'td' => 'class="nowraponall"',
+						'text' => $contractstatic->getNomUrl(1),
+						'asis' => 1
+					);
 
 					$this->info_box_contents[$i][] = array(
-                        'td' => 'class="tdoverflowmax150 maxwidth150onsmartphone"',
-                        'text' => $thirdpartytmp->getNomUrl(1),
-                        'asis' => 1
-                    );
+						'td' => 'class="tdoverflowmax150 maxwidth150onsmartphone"',
+						'text' => $thirdpartytmp->getNomUrl(1),
+						'asis' => 1
+					);
 
 					$this->info_box_contents[$i][] = array(
-                        'td' => '',
-                        'text' => dol_print_date($datem, 'day'),
+						'td' => '',
+						'text' => dol_print_date($datem, 'day'),
 						'text2'=> $late,
-                    );
+					);
 
 					$this->info_box_contents[$i][] = array(
-                        'td' => 'class="right" width="18"',
+						'td' => 'class="right" width="18"',
 						'text' => $contractlinestatic->getLibStatut(3)
 					);
 
@@ -220,15 +220,15 @@ class box_services_contracts extends ModeleBoxes
 				$this->db->free($result);
 			} else {
 				$this->info_box_contents[0][0] = array(
-                    'td' => '',
-                    'maxlength' => 500,
-                    'text' => ($this->db->error().' sql='.$sql),
-                );
+					'td' => '',
+					'maxlength' => 500,
+					'text' => ($this->db->error().' sql='.$sql),
+				);
 			}
 		} else {
 			$this->info_box_contents[0][0] = array(
-			    'td' => 'class="nohover opacitymedium left"',
-                'text' => $langs->trans("ReadPermissionNotAllowed")
+				'td' => 'class="nohover opacitymedium left"',
+				'text' => $langs->trans("ReadPermissionNotAllowed")
 			);
 		}
 	}
@@ -241,8 +241,8 @@ class box_services_contracts extends ModeleBoxes
 	 *  @param	int		$nooutput	No print, only return string
 	 *	@return	string
 	 */
-    public function showBox($head = null, $contents = null, $nooutput = 0)
-    {
-        return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
-    }
+	public function showBox($head = null, $contents = null, $nooutput = 0)
+	{
+		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+	}
 }
diff --git a/htdocs/core/boxes/box_services_expired.php b/htdocs/core/boxes/box_services_expired.php
index d7b3433f6d2..7a65fd0a9d2 100644
--- a/htdocs/core/boxes/box_services_expired.php
+++ b/htdocs/core/boxes/box_services_expired.php
@@ -30,160 +30,160 @@ include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
 class box_services_expired extends ModeleBoxes
 {
 
-    public $boxcode = "expiredservices"; // id of box
-    public $boximg = "object_contract";
-    public $boxlabel = "BoxOldestExpiredServices";
-    public $depends = array("contrat"); // conf->propal->enabled
+	public $boxcode = "expiredservices"; // id of box
+	public $boximg = "object_contract";
+	public $boxlabel = "BoxOldestExpiredServices";
+	public $depends = array("contrat"); // conf->propal->enabled
 
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $param;
+	public $param;
 
-    public $info_box_head = array();
-    public $info_box_contents = array();
+	public $info_box_head = array();
+	public $info_box_contents = array();
 
 
-    /**
-     *  Constructor
-     *
-     *  @param  DoliDB  $db         Database handler
-     *  @param  string  $param      More parameters
-     */
-    public function __construct($db, $param)
-    {
-        global $user;
+	/**
+	 *  Constructor
+	 *
+	 *  @param  DoliDB  $db         Database handler
+	 *  @param  string  $param      More parameters
+	 */
+	public function __construct($db, $param)
+	{
+		global $user;
 
-        $this->db = $db;
+		$this->db = $db;
 
-        $this->hidden = !($user->rights->contrat->lire);
-    }
+		$this->hidden = !($user->rights->contrat->lire);
+	}
 
-    /**
-     *  Load data for box to show them later
-     *
-     *  @param	int		$max        Maximum number of records to load
-     *  @return	void
-     */
-    public function loadBox($max = 5)
-    {
-    	global $user, $langs, $conf;
+	/**
+	 *  Load data for box to show them later
+	 *
+	 *  @param	int		$max        Maximum number of records to load
+	 *  @return	void
+	 */
+	public function loadBox($max = 5)
+	{
+		global $user, $langs, $conf;
 
-    	$this->max = $max;
+		$this->max = $max;
 
-    	include_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
+		include_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
 
-    	$now = dol_now();
+		$now = dol_now();
 
-    	$this->info_box_head = array('text' => $langs->trans("BoxLastExpiredServices", $max));
+		$this->info_box_head = array('text' => $langs->trans("BoxLastExpiredServices", $max));
 
-    	if ($user->rights->contrat->lire)
-    	{
-    	    // Select contracts with at least one expired service
+		if ($user->rights->contrat->lire)
+		{
+			// Select contracts with at least one expired service
 			$sql = "SELECT ";
-    		$sql .= " c.rowid, c.ref, c.statut as fk_statut, c.date_contrat, c.ref_customer, c.ref_supplier,";
+			$sql .= " c.rowid, c.ref, c.statut as fk_statut, c.date_contrat, c.ref_customer, c.ref_supplier,";
 			$sql .= " s.nom as name, s.rowid as socid, s.email, s.client, s.fournisseur, s.code_client, s.code_fournisseur, s.code_compta, s.code_compta_fournisseur,";
 			$sql .= " MIN(cd.date_fin_validite) as date_line, COUNT(cd.rowid) as nb_services";
-    		$sql .= " FROM ".MAIN_DB_PREFIX."contrat as c, ".MAIN_DB_PREFIX."societe s, ".MAIN_DB_PREFIX."contratdet as cd";
-            if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-    		$sql .= " WHERE cd.statut = 4 AND cd.date_fin_validite <= '".$this->db->idate($now)."'";
-    		$sql .= " AND c.entity = ".$conf->entity;
-    		$sql .= " AND c.fk_soc=s.rowid AND cd.fk_contrat=c.rowid AND c.statut > 0";
-            if ($user->socid) $sql .= ' AND c.fk_soc = '.$user->socid;
-            if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
-    		$sql .= " GROUP BY c.rowid, c.ref, c.statut, c.date_contrat, c.ref_customer, c.ref_supplier, s.nom, s.rowid";
-    		$sql .= ", s.email, s.client, s.fournisseur, s.code_client, s.code_fournisseur, s.code_compta, s.code_compta_fournisseur";
-    		$sql .= " ORDER BY date_line ASC";
-    		$sql .= $this->db->plimit($max, 0);
+			$sql .= " FROM ".MAIN_DB_PREFIX."contrat as c, ".MAIN_DB_PREFIX."societe s, ".MAIN_DB_PREFIX."contratdet as cd";
+			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+			$sql .= " WHERE cd.statut = 4 AND cd.date_fin_validite <= '".$this->db->idate($now)."'";
+			$sql .= " AND c.entity = ".$conf->entity;
+			$sql .= " AND c.fk_soc=s.rowid AND cd.fk_contrat=c.rowid AND c.statut > 0";
+			if ($user->socid) $sql .= ' AND c.fk_soc = '.$user->socid;
+			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+			$sql .= " GROUP BY c.rowid, c.ref, c.statut, c.date_contrat, c.ref_customer, c.ref_supplier, s.nom, s.rowid";
+			$sql .= ", s.email, s.client, s.fournisseur, s.code_client, s.code_fournisseur, s.code_compta, s.code_compta_fournisseur";
+			$sql .= " ORDER BY date_line ASC";
+			$sql .= $this->db->plimit($max, 0);
 
-    		$resql = $this->db->query($sql);
-    		if ($resql)
-    		{
-    			$num = $this->db->num_rows($resql);
+			$resql = $this->db->query($sql);
+			if ($resql)
+			{
+				$num = $this->db->num_rows($resql);
 
-    			$i = 0;
+				$i = 0;
 
-    			$thirdpartytmp = new Societe($this->db);
-    			$contract = new Contrat($this->db);
+				$thirdpartytmp = new Societe($this->db);
+				$contract = new Contrat($this->db);
 
-    			while ($i < $num)
-    			{
-    			    $late = '';
+				while ($i < $num)
+				{
+					$late = '';
 
-    				$objp = $this->db->fetch_object($resql);
+					$objp = $this->db->fetch_object($resql);
 
-    				$thirdpartytmp->name = $objp->name;
-    				$thirdpartytmp->id = $objp->socid;
-    				$thirdpartytmp->email = $objp->email;
-    				$thirdpartytmp->client = $objp->client;
-    				$thirdpartytmp->fournisseur = $objp->fournisseur;
-    				$thirdpartytmp->code_client = $objp->code_client;
-    				$thirdpartytmp->code_fournisseur = $objp->code_fournisseur;
-    				$thirdpartytmp->code_compta = $objp->code_compta;
-    				$thirdpartytmp->code_compta_fournisseur = $objp->code_compta_fournisseur;
+					$thirdpartytmp->name = $objp->name;
+					$thirdpartytmp->id = $objp->socid;
+					$thirdpartytmp->email = $objp->email;
+					$thirdpartytmp->client = $objp->client;
+					$thirdpartytmp->fournisseur = $objp->fournisseur;
+					$thirdpartytmp->code_client = $objp->code_client;
+					$thirdpartytmp->code_fournisseur = $objp->code_fournisseur;
+					$thirdpartytmp->code_compta = $objp->code_compta;
+					$thirdpartytmp->code_compta_fournisseur = $objp->code_compta_fournisseur;
 
-    				$contract->id = $objp->rowid;
-    				$contract->ref = $objp->ref;
-    				$contract->statut = $objp->fk_statut;
-    				$contract->ref_customer = $objp->ref_customer;
-    				$contract->ref_supplier = $objp->ref_supplier;
+					$contract->id = $objp->rowid;
+					$contract->ref = $objp->ref;
+					$contract->statut = $objp->fk_statut;
+					$contract->ref_customer = $objp->ref_customer;
+					$contract->ref_supplier = $objp->ref_supplier;
 
 					$dateline = $this->db->jdate($objp->date_line);
 					if (($dateline + $conf->contrat->services->expires->warning_delay) < $now) $late = img_warning($langs->trans("Late"));
 
-    				$this->info_box_contents[$i][] = array(
-                        'td' => 'class="nowraponall"',
-                        'text' => $contract->getNomUrl(1),
-                        'asis' => 1
-    				);
+					$this->info_box_contents[$i][] = array(
+						'td' => 'class="nowraponall"',
+						'text' => $contract->getNomUrl(1),
+						'asis' => 1
+					);
 
-    				$this->info_box_contents[$i][] = array(
-                        'td' => 'class="tdoverflowmax150 maxwidth150onsmartphone left"',
-                        'text' => $thirdpartytmp->getNomUrl(1, 'customer'),
-                        'asis' => 1
-    				);
+					$this->info_box_contents[$i][] = array(
+						'td' => 'class="tdoverflowmax150 maxwidth150onsmartphone left"',
+						'text' => $thirdpartytmp->getNomUrl(1, 'customer'),
+						'asis' => 1
+					);
 
-    				$this->info_box_contents[$i][] = array(
-                        'td' => 'class="center nowraponall"',
-                        'text' => dol_print_date($dateline, 'day'),
-                        'text2'=> $late,
-                    );
+					$this->info_box_contents[$i][] = array(
+						'td' => 'class="center nowraponall"',
+						'text' => dol_print_date($dateline, 'day'),
+						'text2'=> $late,
+					);
 
-    				$this->info_box_contents[$i][] = array(
-                        'td' => 'class="right"',
-                        'text' => $objp->nb_services,
-                    );
+					$this->info_box_contents[$i][] = array(
+						'td' => 'class="right"',
+						'text' => $objp->nb_services,
+					);
 
 
-    				$i++;
-    			}
+					$i++;
+				}
 
-    			if ($num == 0)
-    			{
-    			    $langs->load("contracts");
-    			    $this->info_box_contents[$i][] = array(
-                        'td' => 'class="nohover opacitymedium center"',
-                        'text' => $langs->trans("NoExpiredServices"),
-                    );
-    			}
+				if ($num == 0)
+				{
+					$langs->load("contracts");
+					$this->info_box_contents[$i][] = array(
+						'td' => 'class="nohover opacitymedium center"',
+						'text' => $langs->trans("NoExpiredServices"),
+					);
+				}
 
 				$this->db->free($resql);
-    		} else {
-    			$this->info_box_contents[0][] = array(
-                    'td' => '',
-                    'maxlength'=>500,
-                    'text' => ($this->db->error().' sql='.$sql),
-                );
-    		}
-    	} else {
-    		$this->info_box_contents[0][0] = array(
-    		    'td' => 'class="nohover opacitymedium left"',
-    		    'text' => $langs->trans("ReadPermissionNotAllowed")
-    		);
-    	}
-    }
+			} else {
+				$this->info_box_contents[0][] = array(
+					'td' => '',
+					'maxlength'=>500,
+					'text' => ($this->db->error().' sql='.$sql),
+				);
+			}
+		} else {
+			$this->info_box_contents[0][0] = array(
+				'td' => 'class="nohover opacitymedium left"',
+				'text' => $langs->trans("ReadPermissionNotAllowed")
+			);
+		}
+	}
 
 	/**
 	 *  Method to show box
@@ -193,8 +193,8 @@ class box_services_expired extends ModeleBoxes
 	 *  @param	int		$nooutput	No print, only return string
 	 *  @return	string
 	 */
-    public function showBox($head = null, $contents = null, $nooutput = 0)
-    {
-        return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
-    }
+	public function showBox($head = null, $contents = null, $nooutput = 0)
+	{
+		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+	}
 }
diff --git a/htdocs/core/boxes/box_shipments.php b/htdocs/core/boxes/box_shipments.php
index 8574b7ce01b..1b3c865f5a1 100644
--- a/htdocs/core/boxes/box_shipments.php
+++ b/htdocs/core/boxes/box_shipments.php
@@ -32,152 +32,152 @@ include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
  */
 class box_shipments extends ModeleBoxes
 {
-    public $boxcode = "lastcustomershipments";
-    public $boximg = "sending";
-    public $boxlabel = "BoxLastCustomerShipments";
-    public $depends = array("expedition");
+	public $boxcode = "lastcustomershipments";
+	public $boximg = "sending";
+	public $boxlabel = "BoxLastCustomerShipments";
+	public $depends = array("expedition");
 
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $param;
+	public $param;
 
-    public $info_box_head = array();
-    public $info_box_contents = array();
+	public $info_box_head = array();
+	public $info_box_contents = array();
 
 
-    /**
-     *  Constructor
-     *
-     *  @param  DoliDB  $db         Database handler
-     *  @param  string  $param      More parameters
-     */
-    public function __construct($db, $param)
-    {
-        global $user;
+	/**
+	 *  Constructor
+	 *
+	 *  @param  DoliDB  $db         Database handler
+	 *  @param  string  $param      More parameters
+	 */
+	public function __construct($db, $param)
+	{
+		global $user;
 
-        $this->db = $db;
+		$this->db = $db;
 
-        $this->hidden = !($user->rights->expedition->lire);
-    }
+		$this->hidden = !($user->rights->expedition->lire);
+	}
 
-    /**
-     *  Load data for box to show them later
-     *
-     *  @param	int		$max        Maximum number of records to load
-     *  @return	void
-     */
-    public function loadBox($max = 5)
-    {
-        global $user, $langs, $conf;
-        $langs->loadLangs(array('orders', 'sendings'));
+	/**
+	 *  Load data for box to show them later
+	 *
+	 *  @param	int		$max        Maximum number of records to load
+	 *  @return	void
+	 */
+	public function loadBox($max = 5)
+	{
+		global $user, $langs, $conf;
+		$langs->loadLangs(array('orders', 'sendings'));
 
-        $this->max = $max;
+		$this->max = $max;
 
-        include_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
-        include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
-        include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
+		include_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
+		include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
+		include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 
-        $shipmentstatic = new Expedition($this->db);
-        $orderstatic = new Commande($this->db);
-        $societestatic = new Societe($this->db);
+		$shipmentstatic = new Expedition($this->db);
+		$orderstatic = new Commande($this->db);
+		$societestatic = new Societe($this->db);
 
-        $this->info_box_head = array('text' => $langs->trans("BoxTitleLastCustomerShipments", $max));
+		$this->info_box_head = array('text' => $langs->trans("BoxTitleLastCustomerShipments", $max));
 
-        if ($user->rights->expedition->lire)
-        {
-            $sql = "SELECT s.nom as name";
-            $sql .= ", s.rowid as socid";
-            $sql .= ", s.code_client";
-            $sql .= ", s.logo, s.email";
-            $sql .= ", e.ref, e.tms";
-            $sql .= ", e.rowid";
-            $sql .= ", e.ref_customer";
-            $sql .= ", e.fk_statut";
-            $sql .= ", e.fk_user_valid";
-            $sql .= ", c.ref as commande_ref";
-            $sql .= ", c.rowid as commande_id";
-            $sql .= " FROM ".MAIN_DB_PREFIX."expedition as e";
-            $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as el ON e.rowid = el.fk_target AND el.targettype = 'shipping' AND el.sourcetype IN ('commande')";
-            $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."commande as c ON el.fk_source = c.rowid AND el.sourcetype IN ('commande') AND el.targettype = 'shipping'";
-            $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = e.fk_soc";
-            if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON e.fk_soc = sc.fk_soc";
-            $sql .= " WHERE e.entity IN (".getEntity('expedition').")";
-            if (!empty($conf->global->ORDER_BOX_LAST_SHIPMENTS_VALIDATED_ONLY)) $sql .= " AND e.fk_statut = 1";
-            if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND sc.fk_user = ".$user->id;
-            else $sql .= " ORDER BY e.date_delivery, e.ref DESC ";
-            $sql .= $this->db->plimit($max, 0);
+		if ($user->rights->expedition->lire)
+		{
+			$sql = "SELECT s.nom as name";
+			$sql .= ", s.rowid as socid";
+			$sql .= ", s.code_client";
+			$sql .= ", s.logo, s.email";
+			$sql .= ", e.ref, e.tms";
+			$sql .= ", e.rowid";
+			$sql .= ", e.ref_customer";
+			$sql .= ", e.fk_statut";
+			$sql .= ", e.fk_user_valid";
+			$sql .= ", c.ref as commande_ref";
+			$sql .= ", c.rowid as commande_id";
+			$sql .= " FROM ".MAIN_DB_PREFIX."expedition as e";
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as el ON e.rowid = el.fk_target AND el.targettype = 'shipping' AND el.sourcetype IN ('commande')";
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."commande as c ON el.fk_source = c.rowid AND el.sourcetype IN ('commande') AND el.targettype = 'shipping'";
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = e.fk_soc";
+			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON e.fk_soc = sc.fk_soc";
+			$sql .= " WHERE e.entity IN (".getEntity('expedition').")";
+			if (!empty($conf->global->ORDER_BOX_LAST_SHIPMENTS_VALIDATED_ONLY)) $sql .= " AND e.fk_statut = 1";
+			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND sc.fk_user = ".$user->id;
+			else $sql .= " ORDER BY e.date_delivery, e.ref DESC ";
+			$sql .= $this->db->plimit($max, 0);
 
-            $result = $this->db->query($sql);
-            if ($result) {
-                $num = $this->db->num_rows($result);
+			$result = $this->db->query($sql);
+			if ($result) {
+				$num = $this->db->num_rows($result);
 
-                $line = 0;
+				$line = 0;
 
-                while ($line < $num) {
-                    $objp = $this->db->fetch_object($result);
+				while ($line < $num) {
+					$objp = $this->db->fetch_object($result);
 
-                    $shipmentstatic->id = $objp->rowid;
-                    $shipmentstatic->ref = $objp->ref;
-                    $shipmentstatic->ref_customer = $objp->ref_customer;
+					$shipmentstatic->id = $objp->rowid;
+					$shipmentstatic->ref = $objp->ref;
+					$shipmentstatic->ref_customer = $objp->ref_customer;
 
-                    $orderstatic->id = $objp->commande_id;
-                    $orderstatic->ref = $objp->commande_ref;
+					$orderstatic->id = $objp->commande_id;
+					$orderstatic->ref = $objp->commande_ref;
 
-                    $societestatic->id = $objp->socid;
-                    $societestatic->name = $objp->name;
-                    $societestatic->email = $objp->email;
-                    $societestatic->code_client = $objp->code_client;
-                    $societestatic->logo = $objp->logo;
+					$societestatic->id = $objp->socid;
+					$societestatic->name = $objp->name;
+					$societestatic->email = $objp->email;
+					$societestatic->code_client = $objp->code_client;
+					$societestatic->logo = $objp->logo;
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="nowraponall"',
-                        'text' => $shipmentstatic->getNomUrl(1),
-                        'asis' => 1,
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="nowraponall"',
+						'text' => $shipmentstatic->getNomUrl(1),
+						'asis' => 1,
+					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="tdoverflowmax150 maxwidth150onsmartphone"',
-                        'text' => $societestatic->getNomUrl(1),
-                        'asis' => 1,
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="tdoverflowmax150 maxwidth150onsmartphone"',
+						'text' => $societestatic->getNomUrl(1),
+						'asis' => 1,
+					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="nowraponall"',
-                        'text' => $orderstatic->getNomUrl(1),
-                        'asis' => 1,
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="nowraponall"',
+						'text' => $orderstatic->getNomUrl(1),
+						'asis' => 1,
+					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right" width="18"',
-                        'text' => $shipmentstatic->LibStatut($objp->fk_statut, 3),
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right" width="18"',
+						'text' => $shipmentstatic->LibStatut($objp->fk_statut, 3),
+					);
 
-                    $line++;
-                }
+					$line++;
+				}
 
-                if ($num == 0) $this->info_box_contents[$line][0] = array(
-                	'td' => 'class="center opacitymedium"',
-                	'text'=>$langs->trans("NoRecordedShipments")
-                );
+				if ($num == 0) $this->info_box_contents[$line][0] = array(
+					'td' => 'class="center opacitymedium"',
+					'text'=>$langs->trans("NoRecordedShipments")
+				);
 
-                $this->db->free($result);
-            } else {
-                $this->info_box_contents[0][0] = array(
-                    'td' => '',
-                    'maxlength'=>500,
-                    'text' => ($this->db->error().' sql='.$sql),
-                );
-            }
-        } else {
-            $this->info_box_contents[0][0] = array(
-                'td' => 'class="nohover opacitymedium left"',
-                'text' => $langs->trans("ReadPermissionNotAllowed")
-            );
-        }
-    }
+				$this->db->free($result);
+			} else {
+				$this->info_box_contents[0][0] = array(
+					'td' => '',
+					'maxlength'=>500,
+					'text' => ($this->db->error().' sql='.$sql),
+				);
+			}
+		} else {
+			$this->info_box_contents[0][0] = array(
+				'td' => 'class="nohover opacitymedium left"',
+				'text' => $langs->trans("ReadPermissionNotAllowed")
+			);
+		}
+	}
 
 	/**
 	 *	Method to show box
@@ -187,8 +187,8 @@ class box_shipments extends ModeleBoxes
 	 *  @param	int		$nooutput	No print, only return string
 	 *	@return	string
 	 */
-    public function showBox($head = null, $contents = null, $nooutput = 0)
-    {
-        return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
-    }
+	public function showBox($head = null, $contents = null, $nooutput = 0)
+	{
+		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+	}
 }
diff --git a/htdocs/core/boxes/box_supplier_orders.php b/htdocs/core/boxes/box_supplier_orders.php
index cdc1dd51440..6c5dd4379d3 100644
--- a/htdocs/core/boxes/box_supplier_orders.php
+++ b/htdocs/core/boxes/box_supplier_orders.php
@@ -31,160 +31,160 @@ include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
 class box_supplier_orders extends ModeleBoxes
 {
 
-    public $boxcode = "latestsupplierorders";
-    public $boximg = "object_order";
-    public $boxlabel = "BoxLatestSupplierOrders";
-    public $depends = array("fournisseur");
+	public $boxcode = "latestsupplierorders";
+	public $boximg = "object_order";
+	public $boxlabel = "BoxLatestSupplierOrders";
+	public $depends = array("fournisseur");
 
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $param;
-    public $info_box_head = array();
-    public $info_box_contents = array();
+	public $param;
+	public $info_box_head = array();
+	public $info_box_contents = array();
 
 
-    /**
-     *  Constructor
-     *
-     *  @param  DoliDB  $db         Database handler
-     *  @param  string  $param      More parameters
-     */
-    public function __construct($db, $param)
-    {
-        global $user;
+	/**
+	 *  Constructor
+	 *
+	 *  @param  DoliDB  $db         Database handler
+	 *  @param  string  $param      More parameters
+	 */
+	public function __construct($db, $param)
+	{
+		global $user;
 
-        $this->db = $db;
+		$this->db = $db;
 
-        $this->hidden = !($user->rights->fournisseur->commande->lire);
-    }
+		$this->hidden = !($user->rights->fournisseur->commande->lire);
+	}
 
-    /**
-     *  Load data into info_box_contents array to show array later.
-     *
-     *  @param	int		$max        Maximum number of records to load
-     *  @return	void
-     */
-    public function loadBox($max = 5)
-    {
-        global $conf, $user, $langs;
-        $langs->load("boxes");
+	/**
+	 *  Load data into info_box_contents array to show array later.
+	 *
+	 *  @param	int		$max        Maximum number of records to load
+	 *  @return	void
+	 */
+	public function loadBox($max = 5)
+	{
+		global $conf, $user, $langs;
+		$langs->load("boxes");
 
-        $this->max = $max;
+		$this->max = $max;
 
-        include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
-        $supplierorderstatic = new CommandeFournisseur($this->db);
-        include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
-        $thirdpartytmp = new Fournisseur($this->db);
+		include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
+		$supplierorderstatic = new CommandeFournisseur($this->db);
+		include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
+		$thirdpartytmp = new Fournisseur($this->db);
 
-        $this->info_box_head = array('text' => $langs->trans("BoxTitleLatest".($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE ? "" : "Modified")."SupplierOrders", $max));
+		$this->info_box_head = array('text' => $langs->trans("BoxTitleLatest".($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE ? "" : "Modified")."SupplierOrders", $max));
 
-        if ($user->rights->fournisseur->commande->lire)
-        {
-            $sql = "SELECT s.nom as name, s.rowid as socid,";
-            $sql .= " s.code_client, s.code_fournisseur,";
-            $sql .= " s.logo, s.email,";
-            $sql .= " c.rowid, c.ref, c.tms, c.date_commande,";
-            $sql .= " c.total_ht,";
-            $sql .= " c.tva as total_tva,";
-            $sql .= " c.total_ttc,";
-            $sql .= " c.fk_statut";
-            $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
-            $sql .= ", ".MAIN_DB_PREFIX."commande_fournisseur as c";
-            if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-            $sql .= " WHERE c.fk_soc = s.rowid";
-            $sql .= " AND c.entity IN (".getEntity('supplier_order').")";
-            if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
-            if ($user->socid) $sql .= " AND s.rowid = ".$user->socid;
-            if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) $sql .= " ORDER BY c.date_commande DESC, c.ref DESC ";
-            else $sql .= " ORDER BY c.tms DESC, c.ref DESC ";
-            $sql .= $this->db->plimit($max, 0);
+		if ($user->rights->fournisseur->commande->lire)
+		{
+			$sql = "SELECT s.nom as name, s.rowid as socid,";
+			$sql .= " s.code_client, s.code_fournisseur,";
+			$sql .= " s.logo, s.email,";
+			$sql .= " c.rowid, c.ref, c.tms, c.date_commande,";
+			$sql .= " c.total_ht,";
+			$sql .= " c.tva as total_tva,";
+			$sql .= " c.total_ttc,";
+			$sql .= " c.fk_statut";
+			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+			$sql .= ", ".MAIN_DB_PREFIX."commande_fournisseur as c";
+			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+			$sql .= " WHERE c.fk_soc = s.rowid";
+			$sql .= " AND c.entity IN (".getEntity('supplier_order').")";
+			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+			if ($user->socid) $sql .= " AND s.rowid = ".$user->socid;
+			if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) $sql .= " ORDER BY c.date_commande DESC, c.ref DESC ";
+			else $sql .= " ORDER BY c.tms DESC, c.ref DESC ";
+			$sql .= $this->db->plimit($max, 0);
 
-            $result = $this->db->query($sql);
-            if ($result)
-            {
-                $num = $this->db->num_rows($result);
+			$result = $this->db->query($sql);
+			if ($result)
+			{
+				$num = $this->db->num_rows($result);
 
-                $line = 0;
-                while ($line < $num) {
-                    $objp = $this->db->fetch_object($result);
-                    $date = $this->db->jdate($objp->date_commande);
+				$line = 0;
+				while ($line < $num) {
+					$objp = $this->db->fetch_object($result);
+					$date = $this->db->jdate($objp->date_commande);
 					$datem = $this->db->jdate($objp->tms);
 
 					$supplierorderstatic->id = $objp->rowid;
 					$supplierorderstatic->ref = $objp->ref;
 
 					$thirdpartytmp->id = $objp->socid;
-                    $thirdpartytmp->name = $objp->name;
-                    $thirdpartytmp->email = $objp->email;
-                    $thirdpartytmp->fournisseur = 1;
-                    $thirdpartytmp->code_fournisseur = $objp->code_fournisseur;
-                    $thirdpartytmp->logo = $objp->logo;
-
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="nowraponall"',
-                        'text' => $supplierorderstatic->getNomUrl(1),
-                    	'asis' => 1
-                    );
-
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="tdoverflowmax150 maxwidth150onsmartphone"',
-                        'text' => $thirdpartytmp->getNomUrl(1, 'supplier'),
-                        'asis' => 1,
-                    );
-
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right nowraponall"',
-                        'text' => price($objp->total_ht, 0, $langs, 0, -1, -1, $conf->currency),
-                    );
+					$thirdpartytmp->name = $objp->name;
+					$thirdpartytmp->email = $objp->email;
+					$thirdpartytmp->fournisseur = 1;
+					$thirdpartytmp->code_fournisseur = $objp->code_fournisseur;
+					$thirdpartytmp->logo = $objp->logo;
 
 					$this->info_box_contents[$line][] = array(
-                        'td' => 'class="right"',
-                        'text' => dol_print_date($date, 'day'),
-                    );
+						'td' => 'class="nowraponall"',
+						'text' => $supplierorderstatic->getNomUrl(1),
+						'asis' => 1
+					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right" width="18"',
-                        'text' => $supplierorderstatic->LibStatut($objp->fk_statut, 3),
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="tdoverflowmax150 maxwidth150onsmartphone"',
+						'text' => $thirdpartytmp->getNomUrl(1, 'supplier'),
+						'asis' => 1,
+					);
 
-                    $line++;
-                }
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right nowraponall"',
+						'text' => price($objp->total_ht, 0, $langs, 0, -1, -1, $conf->currency),
+					);
 
-                if ($num == 0)
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="center"',
-                        'text' => $langs->trans("NoSupplierOrder"),
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right"',
+						'text' => dol_print_date($date, 'day'),
+					);
 
-                $this->db->free($result);
-            } else {
-                $this->info_box_contents[0][] = array(
-                    'td' => '',
-                    'maxlength'=>500,
-                    'text' => ($this->db->error().' sql='.$sql),
-                );
-            }
-        } else {
-            $this->info_box_contents[0][] = array(
-                'td' => 'class="nohover opacitymedium left"',
-                'text' => $langs->trans("ReadPermissionNotAllowed")
-            );
-        }
-    }
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right" width="18"',
+						'text' => $supplierorderstatic->LibStatut($objp->fk_statut, 3),
+					);
 
-    /**
-     *  Method to show box
-     *
-     *  @param  array   $head       Array with properties of box title
-     *  @param  array   $contents   Array with properties of box lines
-     *  @param  int     $nooutput   No print, only return string
-     *  @return string
-     */
-    public function showBox($head = null, $contents = null, $nooutput = 0)
-    {
-        return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
-    }
+					$line++;
+				}
+
+				if ($num == 0)
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="center"',
+						'text' => $langs->trans("NoSupplierOrder"),
+					);
+
+				$this->db->free($result);
+			} else {
+				$this->info_box_contents[0][] = array(
+					'td' => '',
+					'maxlength'=>500,
+					'text' => ($this->db->error().' sql='.$sql),
+				);
+			}
+		} else {
+			$this->info_box_contents[0][] = array(
+				'td' => 'class="nohover opacitymedium left"',
+				'text' => $langs->trans("ReadPermissionNotAllowed")
+			);
+		}
+	}
+
+	/**
+	 *  Method to show box
+	 *
+	 *  @param  array   $head       Array with properties of box title
+	 *  @param  array   $contents   Array with properties of box lines
+	 *  @param  int     $nooutput   No print, only return string
+	 *  @return string
+	 */
+	public function showBox($head = null, $contents = null, $nooutput = 0)
+	{
+		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+	}
 }
diff --git a/htdocs/core/boxes/box_supplier_orders_awaiting_reception.php b/htdocs/core/boxes/box_supplier_orders_awaiting_reception.php
index bc86591fc22..1d367774432 100644
--- a/htdocs/core/boxes/box_supplier_orders_awaiting_reception.php
+++ b/htdocs/core/boxes/box_supplier_orders_awaiting_reception.php
@@ -31,166 +31,166 @@ include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
 class box_supplier_orders_awaiting_reception extends ModeleBoxes
 {
 
-    public $boxcode = "supplierordersawaitingreception";
-    public $boximg = "object_order";
-    public $boxlabel = "BoxLatestSupplierOrdersAwaitingReception";
-    public $depends = array("fournisseur");
+	public $boxcode = "supplierordersawaitingreception";
+	public $boximg = "object_order";
+	public $boxlabel = "BoxLatestSupplierOrdersAwaitingReception";
+	public $depends = array("fournisseur");
 
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $param;
-    public $info_box_head = array();
-    public $info_box_contents = array();
+	public $param;
+	public $info_box_head = array();
+	public $info_box_contents = array();
 
 
-    /**
-     *  Constructor
-     *
-     *  @param  DoliDB  $db         Database handler
-     *  @param  string  $param      More parameters
-     */
-    public function __construct($db, $param)
-    {
-        global $user;
+	/**
+	 *  Constructor
+	 *
+	 *  @param  DoliDB  $db         Database handler
+	 *  @param  string  $param      More parameters
+	 */
+	public function __construct($db, $param)
+	{
+		global $user;
 
-        $this->db = $db;
+		$this->db = $db;
 
-        $this->hidden = !($user->rights->fournisseur->commande->lire);
-    }
+		$this->hidden = !($user->rights->fournisseur->commande->lire);
+	}
 
-    /**
-     *  Load data into info_box_contents array to show array later.
-     *
-     *  @param	int		$max        Maximum number of records to load
-     *  @return	void
-     */
-    public function loadBox($max = 5)
-    {
-        global $conf, $user, $langs;
-        $langs->loadLangs(array("boxes", "sendings", "orders"));
+	/**
+	 *  Load data into info_box_contents array to show array later.
+	 *
+	 *  @param	int		$max        Maximum number of records to load
+	 *  @return	void
+	 */
+	public function loadBox($max = 5)
+	{
+		global $conf, $user, $langs;
+		$langs->loadLangs(array("boxes", "sendings", "orders"));
 
-        $this->max = $max;
+		$this->max = $max;
 
-        include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
-        $supplierorderstatic = new CommandeFournisseur($this->db);
-        include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
-        $thirdpartytmp = new Fournisseur($this->db);
+		include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
+		$supplierorderstatic = new CommandeFournisseur($this->db);
+		include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
+		$thirdpartytmp = new Fournisseur($this->db);
 
-        $this->info_box_head = array('text' => $langs->trans("BoxTitleSupplierOrdersAwaitingReception", $max));
+		$this->info_box_head = array('text' => $langs->trans("BoxTitleSupplierOrdersAwaitingReception", $max));
 
-        if ($user->rights->fournisseur->commande->lire)
-        {
-            $sql = "SELECT s.nom as name, s.rowid as socid,";
-            $sql .= " s.code_client, s.code_fournisseur, s.email,";
-            $sql .= " s.logo,";
-            $sql .= " c.rowid, c.ref, c.tms, c.date_commande, c.date_livraison, ";
-            $sql .= " c.total_ht,";
-            $sql .= " c.tva as total_tva,";
-            $sql .= " c.total_ttc,";
-            $sql .= " c.fk_statut";
-            $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
-            $sql .= ", ".MAIN_DB_PREFIX."commande_fournisseur as c";
-            if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-            $sql .= " WHERE c.fk_soc = s.rowid";
-            $sql .= " AND c.entity IN (".getEntity('supplier_order').")";
-            $sql .= " AND c.fk_statut = ".CommandeFournisseur::STATUS_ORDERSENT;
-            if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
-            if ($user->socid) $sql .= " AND s.rowid = ".$user->socid;
-            if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) $sql .= " ORDER BY c.date_commande DESC, c.ref DESC ";
-            else $sql .= " ORDER BY c.date_livraison ASC, c.fk_statut ASC ";
-            $sql .= $this->db->plimit($max, 0);
+		if ($user->rights->fournisseur->commande->lire)
+		{
+			$sql = "SELECT s.nom as name, s.rowid as socid,";
+			$sql .= " s.code_client, s.code_fournisseur, s.email,";
+			$sql .= " s.logo,";
+			$sql .= " c.rowid, c.ref, c.tms, c.date_commande, c.date_livraison, ";
+			$sql .= " c.total_ht,";
+			$sql .= " c.tva as total_tva,";
+			$sql .= " c.total_ttc,";
+			$sql .= " c.fk_statut";
+			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+			$sql .= ", ".MAIN_DB_PREFIX."commande_fournisseur as c";
+			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+			$sql .= " WHERE c.fk_soc = s.rowid";
+			$sql .= " AND c.entity IN (".getEntity('supplier_order').")";
+			$sql .= " AND c.fk_statut = ".CommandeFournisseur::STATUS_ORDERSENT;
+			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+			if ($user->socid) $sql .= " AND s.rowid = ".$user->socid;
+			if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) $sql .= " ORDER BY c.date_commande DESC, c.ref DESC ";
+			else $sql .= " ORDER BY c.date_livraison ASC, c.fk_statut ASC ";
+			$sql .= $this->db->plimit($max, 0);
 
-            $result = $this->db->query($sql);
-            if ($result)
-            {
-                $num = $this->db->num_rows($result);
+			$result = $this->db->query($sql);
+			if ($result)
+			{
+				$num = $this->db->num_rows($result);
 
-                $line = 0;
-                while ($line < $num) {
-                    $objp = $this->db->fetch_object($result);
-                    $date = $this->db->jdate($objp->date_commande);
-                    $delivery_date = $this->db->jdate($objp->date_livraison);
+				$line = 0;
+				while ($line < $num) {
+					$objp = $this->db->fetch_object($result);
+					$date = $this->db->jdate($objp->date_commande);
+					$delivery_date = $this->db->jdate($objp->date_livraison);
 					$datem = $this->db->jdate($objp->tms);
 
-                    $supplierorderstatic->date_livraison = $delivery_date;
-                    $supplierorderstatic->statut = $objp->fk_statut;
+					$supplierorderstatic->date_livraison = $delivery_date;
+					$supplierorderstatic->statut = $objp->fk_statut;
 
 					$supplierorderstatic->id = $objp->rowid;
 					$supplierorderstatic->ref = $objp->ref;
 
 					$thirdpartytmp->id = $objp->socid;
-                    $thirdpartytmp->name = $objp->name;
-                    $thirdpartytmp->email = $objp->email;
-                    $thirdpartytmp->fournisseur = 1;
-                    $thirdpartytmp->code_fournisseur = $objp->code_fournisseur;
-                    $thirdpartytmp->logo = $objp->logo;
+					$thirdpartytmp->name = $objp->name;
+					$thirdpartytmp->email = $objp->email;
+					$thirdpartytmp->fournisseur = 1;
+					$thirdpartytmp->code_fournisseur = $objp->code_fournisseur;
+					$thirdpartytmp->logo = $objp->logo;
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="nowraponall"',
-                        'text' => $supplierorderstatic->getNomUrl(1),
-                    	'asis' => 1
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="nowraponall"',
+						'text' => $supplierorderstatic->getNomUrl(1),
+						'asis' => 1
+					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="tdoverflowmax150 maxwidth150onsmartphone"',
-                        'text' => $thirdpartytmp->getNomUrl(1, 'supplier'),
-                        'asis' => 1,
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="tdoverflowmax150 maxwidth150onsmartphone"',
+						'text' => $thirdpartytmp->getNomUrl(1, 'supplier'),
+						'asis' => 1,
+					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right nowraponall"',
-                        'text' => price($objp->total_ht, 0, $langs, 0, -1, -1, $conf->currency),
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right nowraponall"',
+						'text' => price($objp->total_ht, 0, $langs, 0, -1, -1, $conf->currency),
+					);
 
-                    $delayIcon = '';
-                    if ($supplierorderstatic->hasDelay()) {
-                        $delayIcon = img_warning($langs->trans("Late"));
-                    }
+					$delayIcon = '';
+					if ($supplierorderstatic->hasDelay()) {
+						$delayIcon = img_warning($langs->trans("Late"));
+					}
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right"',
-                        'text' => $delayIcon.'<span class="classfortooltip" title="'.$langs->trans('DateDeliveryPlanned').'"><i class="fa fa-dolly" ></i> '.dol_print_date($delivery_date, 'day').'</span>',
-                        'asis' => 1
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right"',
+						'text' => $delayIcon.'<span class="classfortooltip" title="'.$langs->trans('DateDeliveryPlanned').'"><i class="fa fa-dolly" ></i> '.dol_print_date($delivery_date, 'day').'</span>',
+						'asis' => 1
+					);
 
-                    $line++;
-                }
+					$line++;
+				}
 
-                if ($num == 0)
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="center"',
-                        'text' => $langs->trans("NoSupplierOrder"),
-                    );
+				if ($num == 0)
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="center"',
+						'text' => $langs->trans("NoSupplierOrder"),
+					);
 
-                $this->db->free($result);
-            } else {
-                $this->info_box_contents[0][] = array(
-                    'td' => '',
-                    'maxlength'=>500,
-                    'text' => ($this->db->error().' sql='.$sql),
-                );
-            }
-        } else {
-            $this->info_box_contents[0][] = array(
-                'td' => 'class="nohover opacitymedium left"',
-                'text' => $langs->trans("ReadPermissionNotAllowed")
-            );
-        }
-    }
+				$this->db->free($result);
+			} else {
+				$this->info_box_contents[0][] = array(
+					'td' => '',
+					'maxlength'=>500,
+					'text' => ($this->db->error().' sql='.$sql),
+				);
+			}
+		} else {
+			$this->info_box_contents[0][] = array(
+				'td' => 'class="nohover opacitymedium left"',
+				'text' => $langs->trans("ReadPermissionNotAllowed")
+			);
+		}
+	}
 
-    /**
-     *  Method to show box
-     *
-     *  @param  array   $head       Array with properties of box title
-     *  @param  array   $contents   Array with properties of box lines
-     *  @param  int     $nooutput   No print, only return string
-     *  @return string
-     */
-    public function showBox($head = null, $contents = null, $nooutput = 0)
-    {
-        return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
-    }
+	/**
+	 *  Method to show box
+	 *
+	 *  @param  array   $head       Array with properties of box title
+	 *  @param  array   $contents   Array with properties of box lines
+	 *  @param  int     $nooutput   No print, only return string
+	 *  @return string
+	 */
+	public function showBox($head = null, $contents = null, $nooutput = 0)
+	{
+		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+	}
 }
diff --git a/htdocs/core/boxes/box_task.php b/htdocs/core/boxes/box_task.php
index c1d728eb667..f2bfd523d75 100644
--- a/htdocs/core/boxes/box_task.php
+++ b/htdocs/core/boxes/box_task.php
@@ -1,6 +1,6 @@
 <?php
-/* Copyright (C) 2012-2018 Charlene BENKE 	<charlie@patas-monkey.com>
- * Copyright (C) 2015-2019  Frederic France      <frederic.france@netlogic.fr>
+/* Copyright (C) 2012-2018  Charlene BENKE 	<charlie@patas-monkey.com>
+ * Copyright (C) 2015-2020  Frederic 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
@@ -31,41 +31,41 @@ require_once DOL_DOCUMENT_ROOT."/core/lib/date.lib.php";
  */
 class box_task extends ModeleBoxes
 {
-    public $boxcode = "projettask";
-    public $boximg = "object_projecttask";
-    public $boxlabel;
-    public $depends = array("projet");
+	public $boxcode = "projettask";
+	public $boximg = "object_projecttask";
+	public $boxlabel;
+	public $depends = array("projet");
 
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $param;
-    public $enabled = 1; // enable because fixed ;-).
+	public $param;
+	public $enabled = 1; // enable because fixed ;-).
 
-    public $info_box_head = array();
-    public $info_box_contents = array();
+	public $info_box_head = array();
+	public $info_box_contents = array();
 
 
-    /**
-     *  Constructor
-     *
-     *  @param  DoliDB  $db         Database handler
-     *  @param  string  $param      More parameters
-     */
-    public function __construct($db, $param = '')
-    {
-        global $conf, $user, $langs;
+	/**
+	 *  Constructor
+	 *
+	 *  @param  DoliDB  $db         Database handler
+	 *  @param  string  $param      More parameters
+	 */
+	public function __construct($db, $param = '')
+	{
+		global $conf, $user, $langs;
 
-        // Load translation files required by the page
-        $langs->loadLangs(array('boxes', 'projects'));
+		// Load translation files required by the page
+		$langs->loadLangs(array('boxes', 'projects'));
 
-        $this->boxlabel = "Tasks";
-        $this->db = $db;
+		$this->boxlabel = "Tasks";
+		$this->db = $db;
 
-        $this->hidden = (!empty($conf->global->PROJECT_HIDE_TASKS) || !($user->rights->projet->lire));
-    }
+		$this->hidden = (!empty($conf->global->PROJECT_HIDE_TASKS) || !($user->rights->projet->lire));
+	}
 
 	/**
 	 *  Load data for box to show them later
@@ -80,93 +80,93 @@ class box_task extends ModeleBoxes
 		$this->max = $max;
 		include_once DOL_DOCUMENT_ROOT."/projet/class/task.class.php";
 		include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
-        require_once DOL_DOCUMENT_ROOT."/core/lib/project.lib.php";
-        $projectstatic = new Project($this->db);
+		require_once DOL_DOCUMENT_ROOT."/core/lib/project.lib.php";
+		$projectstatic = new Project($this->db);
 		$taskstatic = new Task($this->db);
 		$form = new Form($this->db);
-        $cookie_name = 'DOLUSERCOOKIE_boxfilter_task';
-        $boxcontent = '';
-        $socid = $user->socid;
+		$cookie_name = 'DOLUSERCOOKIE_boxfilter_task';
+		$boxcontent = '';
+		$socid = $user->socid;
 
-        $textHead = $langs->trans("CurentlyOpenedTasks");
+		$textHead = $langs->trans("CurentlyOpenedTasks");
 
-        $filterValue = 'all';
-        if (in_array(GETPOST($cookie_name), array('all', 'im_project_contact', 'im_task_contact'))) {
-            $filterValue = GETPOST($cookie_name);
-        } elseif (!empty($_COOKIE[$cookie_name])) {
-            $filterValue = preg_replace('/[^a-z_]/', '', $_COOKIE[$cookie_name]);	// Clean cookie from evil data
-        }
+		$filterValue = 'all';
+		if (in_array(GETPOST($cookie_name), array('all', 'im_project_contact', 'im_task_contact'))) {
+			$filterValue = GETPOST($cookie_name);
+		} elseif (!empty($_COOKIE[$cookie_name])) {
+			$filterValue = preg_replace('/[^a-z_]/', '', $_COOKIE[$cookie_name]); // Clean cookie from evil data
+		}
 
-        if ($filterValue == 'im_task_contact') {
-            $textHead .= ' : '.$langs->trans("WhichIamLinkedTo");
-        } elseif ($filterValue == 'im_project_contact') {
-            $textHead .= ' : '.$langs->trans("WhichIamLinkedToProject");
-        }
+		if ($filterValue == 'im_task_contact') {
+			$textHead .= ' : '.$langs->trans("WhichIamLinkedTo");
+		} elseif ($filterValue == 'im_project_contact') {
+			$textHead .= ' : '.$langs->trans("WhichIamLinkedToProject");
+		}
 
 
 		$this->info_box_head = array(
-		    'text' => $textHead,
-            'limit'=> dol_strlen($textHead),
-            'sublink'=>'',
-            'subtext'=>$langs->trans("Filter"),
-            'subpicto'=>'filter.png',
-            'subclass'=>'linkobject boxfilter',
-            'target'=>'none'	// Set '' to get target="_blank"
-        );
+			'text' => $textHead,
+			'limit'=> dol_strlen($textHead),
+			'sublink'=>'',
+			'subtext'=>$langs->trans("Filter"),
+			'subpicto'=>'filter.png',
+			'subclass'=>'linkobject boxfilter',
+			'target'=>'none'	// Set '' to get target="_blank"
+		);
 
 		// list the summary of the orders
 		if ($user->rights->projet->lire) {
-            $boxcontent .= '<div id="ancor-idfilter'.$this->boxcode.'" style="display: block; position: absolute; margin-top: -100px"></div>'."\n";
-            $boxcontent .= '<div id="idfilter'.$this->boxcode.'" class="center" >'."\n";
-            $boxcontent .= '<form class="flat " method="POST" action="'.$_SERVER["PHP_SELF"].'#ancor-idfilter'.$this->boxcode.'">'."\n";
-            $boxcontent .= '<input type="hidden" name="token" value="'.newToken().'">'."\n";
-            $selectArray = array('all' => $langs->trans("NoFilter"), 'im_task_contact' => $langs->trans("WhichIamLinkedTo"), 'im_project_contact' => $langs->trans("WhichIamLinkedToProject"));
-            $boxcontent .= $form->selectArray($cookie_name, $selectArray, $filterValue);
-            $boxcontent .= '<button type="submit" class="button buttongen">'.$langs->trans("Refresh").'</button>';
-            $boxcontent .= '</form>'."\n";
-            $boxcontent .= '</div>'."\n";
-            if (!empty($conf->use_javascript_ajax)) {
-	            $boxcontent .= '<script type="text/javascript" language="javascript">
+			$boxcontent .= '<div id="ancor-idfilter'.$this->boxcode.'" style="display: block; position: absolute; margin-top: -100px"></div>'."\n";
+			$boxcontent .= '<div id="idfilter'.$this->boxcode.'" class="center" >'."\n";
+			$boxcontent .= '<form class="flat " method="POST" action="'.$_SERVER["PHP_SELF"].'#ancor-idfilter'.$this->boxcode.'">'."\n";
+			$boxcontent .= '<input type="hidden" name="token" value="'.newToken().'">'."\n";
+			$selectArray = array('all' => $langs->trans("NoFilter"), 'im_task_contact' => $langs->trans("WhichIamLinkedTo"), 'im_project_contact' => $langs->trans("WhichIamLinkedToProject"));
+			$boxcontent .= $form->selectArray($cookie_name, $selectArray, $filterValue);
+			$boxcontent .= '<button type="submit" class="button buttongen">'.$langs->trans("Refresh").'</button>';
+			$boxcontent .= '</form>'."\n";
+			$boxcontent .= '</div>'."\n";
+			if (!empty($conf->use_javascript_ajax)) {
+				$boxcontent .= '<script type="text/javascript" language="javascript">
 						jQuery(document).ready(function() {
 							jQuery("#idsubimg'.$this->boxcode.'").click(function() {
 								jQuery(".showiffilter'.$this->boxcode.'").toggle();
 							});
 						});
 						</script>';
-	            // set cookie by js
-	            $boxcontent .= '<script>date = new Date(); date.setTime(date.getTime()+(30*86400000)); document.cookie = "'.$cookie_name.'='.$filterValue.'; expires= " + date.toGMTString() + "; path=/ "; </script>';
-            }
-            $this->info_box_contents[0][] = array(
-                'tr'=>'class="nohover showiffilter'.$this->boxcode.' hideobject"',
-                'td' => 'class="nohover"',
-                'textnoformat' => $boxcontent,
-            );
+				// set cookie by js
+				$boxcontent .= '<script>date = new Date(); date.setTime(date.getTime()+(30*86400000)); document.cookie = "'.$cookie_name.'='.$filterValue.'; expires= " + date.toGMTString() + "; path=/ "; </script>';
+			}
+			$this->info_box_contents[0][] = array(
+				'tr'=>'class="nohover showiffilter'.$this->boxcode.' hideobject"',
+				'td' => 'class="nohover"',
+				'textnoformat' => $boxcontent,
+			);
 
 
-            // Get list of project id allowed to user (in a string list separated by coma)
-            $projectsListId = '';
-            if (!$user->rights->projet->all->lire) $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1, $socid);
+			// Get list of project id allowed to user (in a string list separated by coma)
+			$projectsListId = '';
+			if (!$user->rights->projet->all->lire) $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1, $socid);
 
-            $sql = "SELECT pt.rowid, pt.ref, pt.fk_projet, pt.fk_task_parent, pt.datec, pt.dateo, pt.datee, pt.datev, pt.label, pt.description, pt.duration_effective, pt.planned_workload, pt.progress";
+			$sql = "SELECT pt.rowid, pt.ref, pt.fk_projet, pt.fk_task_parent, pt.datec, pt.dateo, pt.datee, pt.datev, pt.label, pt.description, pt.duration_effective, pt.planned_workload, pt.progress";
 			$sql .= ", p.rowid project_id, p.ref project_ref, p.title project_title";
 
 			$sql .= " FROM ".MAIN_DB_PREFIX."projet_task as pt";
 			$sql .= " JOIN ".MAIN_DB_PREFIX."projet as p ON (pt.fk_projet = p.rowid)";
 
-            if ($filterValue === 'im_task_contact') {
-                $sql .= " JOIN ".MAIN_DB_PREFIX."element_contact as ec ON (ec.element_id = pt.rowid AND ec.fk_socpeople = ".((int) $user->id).")";
-                $sql .= " JOIN ".MAIN_DB_PREFIX."c_type_contact  as tc ON (ec.fk_c_type_contact = tc.rowid AND tc.element = 'project_task' AND tc.source = 'internal' )";
-            } elseif ($filterValue === 'im_project_contact') {
-                $sql .= " JOIN ".MAIN_DB_PREFIX."element_contact as ec ON (ec.element_id = p.rowid AND ec.fk_socpeople = ".((int) $user->id).")";
-                $sql .= " JOIN ".MAIN_DB_PREFIX."c_type_contact  as tc ON (ec.fk_c_type_contact = tc.rowid AND tc.element = 'project' AND tc.source = 'internal' )";
-            }
+			if ($filterValue === 'im_task_contact') {
+				$sql .= " JOIN ".MAIN_DB_PREFIX."element_contact as ec ON (ec.element_id = pt.rowid AND ec.fk_socpeople = ".((int) $user->id).")";
+				$sql .= " JOIN ".MAIN_DB_PREFIX."c_type_contact  as tc ON (ec.fk_c_type_contact = tc.rowid AND tc.element = 'project_task' AND tc.source = 'internal' )";
+			} elseif ($filterValue === 'im_project_contact') {
+				$sql .= " JOIN ".MAIN_DB_PREFIX."element_contact as ec ON (ec.element_id = p.rowid AND ec.fk_socpeople = ".((int) $user->id).")";
+				$sql .= " JOIN ".MAIN_DB_PREFIX."c_type_contact  as tc ON (ec.fk_c_type_contact = tc.rowid AND tc.element = 'project' AND tc.source = 'internal' )";
+			}
 
 			$sql .= " WHERE ";
 			$sql .= " pt.entity = ".$conf->entity;
 			$sql .= " AND p.fk_statut = ".Project::STATUS_VALIDATED;
 			$sql .= " AND (pt.progress < 100 OR pt.progress IS NULL ) "; // 100% is done and not displayed
-            $sql .= " AND p.usage_task = 1 ";
-            if (!$user->rights->projet->all->lire) $sql .= " AND p.rowid IN (".$projectsListId.")"; // public and assigned to, or restricted to company for external users
+			$sql .= " AND p.usage_task = 1 ";
+			if (!$user->rights->projet->all->lire) $sql .= " AND p.rowid IN (".$projectsListId.")"; // public and assigned to, or restricted to company for external users
 
 			$sql .= " ORDER BY pt.datee ASC, pt.dateo ASC";
 			$sql .= $this->db->plimit($max, 0);
@@ -175,33 +175,33 @@ class box_task extends ModeleBoxes
 			$i = 1;
 			if ($result) {
 				$num = $this->db->num_rows($result);
-                while ($objp = $this->db->fetch_object($result)) {
-                    $taskstatic->id = $objp->rowid;
-                    $taskstatic->ref = $objp->ref;
-                    $taskstatic->label = $objp->label;
-                    $taskstatic->progress = $objp->progress;
-                    $taskstatic->fk_statut = $objp->fk_statut;
-                    $taskstatic->date_end = $objp->datee;
-                    $taskstatic->planned_workload = $objp->planned_workload;
-                    $taskstatic->duration_effective = $objp->duration_effective;
+				while ($objp = $this->db->fetch_object($result)) {
+					$taskstatic->id = $objp->rowid;
+					$taskstatic->ref = $objp->ref;
+					$taskstatic->label = $objp->label;
+					$taskstatic->progress = $objp->progress;
+					$taskstatic->fk_statut = $objp->fk_statut;
+					$taskstatic->date_end = $this->db->jdate($objp->datee);
+					$taskstatic->planned_workload = $objp->planned_workload;
+					$taskstatic->duration_effective = $objp->duration_effective;
 
-                    $projectstatic->id = $objp->project_id;
-                    $projectstatic->ref = $objp->project_ref;
-                    $projectstatic->title = $objp->project_title;
+					$projectstatic->id = $objp->project_id;
+					$projectstatic->ref = $objp->project_ref;
+					$projectstatic->title = $objp->project_title;
 
-                    $label = $projectstatic->getNomUrl(1).' &nbsp; '.$taskstatic->getNomUrl(1).' '.dol_htmlentities($taskstatic->label);
+					$label = $projectstatic->getNomUrl(1).' &nbsp; '.$taskstatic->getNomUrl(1).' '.dol_htmlentities($taskstatic->label);
 
-                    $boxcontent = getTaskProgressView($taskstatic, $label, true, false, false);
+					$boxcontent = getTaskProgressView($taskstatic, $label, true, false, false);
 
-                    $this->info_box_contents[$i][] = array(
-                        'td' => '',
-                        'text' => $boxcontent,
-                    );
+					$this->info_box_contents[$i][] = array(
+						'td' => '',
+						'text' => $boxcontent,
+					);
 					$i++;
 				}
 			} else {
-                dol_print_error($this->db);
-            }
+				dol_print_error($this->db);
+			}
 		}
 	}
 
diff --git a/htdocs/core/boxes/box_validated_projects.php b/htdocs/core/boxes/box_validated_projects.php
index b4eddf5f18d..537e88b9bdf 100644
--- a/htdocs/core/boxes/box_validated_projects.php
+++ b/htdocs/core/boxes/box_validated_projects.php
@@ -31,95 +31,95 @@ include_once DOL_DOCUMENT_ROOT."/core/boxes/modules_boxes.php";
  */
 class box_validated_projects extends ModeleBoxes
 {
-    public $boxcode="validated_project";
-    public $boximg="object_projectpub";
-    public $boxlabel;
-    //var $depends = array("projet");
+	public $boxcode = "validated_project";
+	public $boximg = "object_projectpub";
+	public $boxlabel;
+	//var $depends = array("projet");
 
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $param;
+	public $param;
 
-    public $info_box_head = array();
-    public $info_box_contents = array();
+	public $info_box_head = array();
+	public $info_box_contents = array();
 
-    public $enabled = 1;
+	public $enabled = 1;
 
 
-    /**
-     *  Constructor
-     *
-     *  @param  DoliDB  $db         Database handler
-     *  @param  string  $param      More parameters
-     */
-    public function __construct($db, $param = '')
-    {
-        global $conf, $user, $langs;
+	/**
+	 *  Constructor
+	 *
+	 *  @param  DoliDB  $db         Database handler
+	 *  @param  string  $param      More parameters
+	 */
+	public function __construct($db, $param = '')
+	{
+		global $conf, $user, $langs;
 
-        // Load translation files required by the page
-        $langs->loadLangs(array('boxes', 'projects'));
+		// Load translation files required by the page
+		$langs->loadLangs(array('boxes', 'projects'));
 
-        $this->db = $db;
-        $this->boxlabel = "ProjectsWithTask";
+		$this->db = $db;
+		$this->boxlabel = "ProjectsWithTask";
 
-        $this->hidden = ! ($user->rights->projet->lire);
+		$this->hidden = !($user->rights->projet->lire);
 
 		if ($conf->global->MAIN_FEATURES_LEVEL < 2) $this->enabled = 0;
-    }
+	}
 
-    /**
-    *  Load data for box to show them later
-    *
-    *  @param   int		$max        Maximum number of records to load
-    *  @return  void
-    */
-    public function loadBox($max = 5)
-    {
-        global $conf, $user, $langs;
+	/**
+	 *  Load data for box to show them later
+	 *
+	 *  @param   int		$max        Maximum number of records to load
+	 *  @return  void
+	 */
+	public function loadBox($max = 5)
+	{
+		global $conf, $user, $langs;
 
-        $this->max=$max;
+		$this->max = $max;
 
-        $totalMnt = 0;
-        $totalnb = 0;
-        $totalnbTask=0;
+		$totalMnt = 0;
+		$totalnb = 0;
+		$totalnbTask = 0;
 
-        $textHead = $langs->trans("ProjectTasksWithoutTimeSpent");
-        $this->info_box_head = array('text' => $textHead, 'limit'=> dol_strlen($textHead));
+		$textHead = $langs->trans("ProjectTasksWithoutTimeSpent");
+		$this->info_box_head = array('text' => $textHead, 'limit'=> dol_strlen($textHead));
 
-        // list the summary of the orders
-        if ($user->rights->projet->lire) {
-            include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
-            $projectstatic = new Project($this->db);
+		// list the summary of the orders
+		if ($user->rights->projet->lire) {
+			include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+			$projectstatic = new Project($this->db);
 
-            $socid=0;
-            //if ($user->socid > 0) $socid = $user->socid;    // For external user, no check is done on company because readability is managed by public status of project and assignement.
+			$socid = 0;
+			//if ($user->socid > 0) $socid = $user->socid;    // For external user, no check is done on company because readability is managed by public status of project and assignement.
 
-            // Get list of project id allowed to user (in a string list separated by coma)
-            $projectsListId='';
-            if (! $user->rights->projet->all->lire) $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1, $socid);
+			// Get list of project id allowed to user (in a string list separated by coma)
+			$projectsListId = '';
+			if (!$user->rights->projet->all->lire) $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1, $socid);
 
-            // I tried to solve sql error and performance problem, rewriting sql request but it is not clear what we want.
-            // Count of tasks without time spent for tasks we are assigned too or
-            // Count of tasks without time spent for all tasks of projects we are allowed to read (what it does) ?
-            $sql = "SELECT p.rowid, p.ref, p.fk_soc, p.dateo as startdate,";
-            $sql.= " COUNT(DISTINCT t.rowid) as tasknumber";
-            $sql.= " FROM ".MAIN_DB_PREFIX."projet AS p";
-            $sql.= " INNER JOIN ".MAIN_DB_PREFIX."projet_task AS t ON p.rowid = t.fk_projet";
-            // TODO Replace -1, -2, -3 with ID used for type of contat project_task into llx_c_type_contact. Once done, we can switch widget as stable.
-            $sql.= " INNER JOIN ".MAIN_DB_PREFIX."element_contact as ec ON ec.element_id = t.rowid AND fk_c_type_contact IN (-1, -2, -3)";
-            $sql.= " WHERE p.fk_statut = 1"; // Only open projects
-            if ($projectsListId) $sql .= ' AND p.rowid IN ('.$this->db->sanitize($projectsListId).')'; // Only project we ara allowed
-			$sql.= " AND t.rowid NOT IN (SELECT fk_task FROM ".MAIN_DB_PREFIX."projet_task_time WHERE fk_user =".$user->id.")";
-			$sql.= " GROUP BY p.rowid, p.ref, p.fk_soc, p.dateo";
-            $sql.= " ORDER BY p.dateo ASC";
+			// I tried to solve sql error and performance problem, rewriting sql request but it is not clear what we want.
+			// Count of tasks without time spent for tasks we are assigned too or
+			// Count of tasks without time spent for all tasks of projects we are allowed to read (what it does) ?
+			$sql = "SELECT p.rowid, p.ref, p.fk_soc, p.dateo as startdate,";
+			$sql .= " COUNT(DISTINCT t.rowid) as tasknumber";
+			$sql .= " FROM ".MAIN_DB_PREFIX."projet AS p";
+			$sql .= " INNER JOIN ".MAIN_DB_PREFIX."projet_task AS t ON p.rowid = t.fk_projet";
+			// TODO Replace -1, -2, -3 with ID used for type of contat project_task into llx_c_type_contact. Once done, we can switch widget as stable.
+			$sql .= " INNER JOIN ".MAIN_DB_PREFIX."element_contact as ec ON ec.element_id = t.rowid AND fk_c_type_contact IN (-1, -2, -3)";
+			$sql .= " WHERE p.fk_statut = 1"; // Only open projects
+			if ($projectsListId) $sql .= ' AND p.rowid IN ('.$this->db->sanitize($projectsListId).')'; // Only project we ara allowed
+			$sql .= " AND t.rowid NOT IN (SELECT fk_task FROM ".MAIN_DB_PREFIX."projet_task_time WHERE fk_user =".$user->id.")";
+			$sql .= " GROUP BY p.rowid, p.ref, p.fk_soc, p.dateo";
+			$sql .= " ORDER BY p.dateo ASC";
 
-            $result = $this->db->query($sql);
-            if ($result) {
-                $num = $this->db->num_rows($result);
-                $i = 0;
+			$result = $this->db->query($sql);
+			if ($result) {
+				$num = $this->db->num_rows($result);
+				$i = 0;
 				$this->info_box_contents[$i][] = array(
 					'td' => 'class="nowraponall"',
 					'text' => "Reference projet",
@@ -138,67 +138,67 @@ class box_validated_projects extends ModeleBoxes
 				);
 				$i++;
 
-                while ($i < min($num+1, $max+1)) {
-                    $objp = $this->db->fetch_object($result);
+				while ($i < min($num + 1, $max + 1)) {
+					$objp = $this->db->fetch_object($result);
 
-                    $projectstatic->id = $objp->rowid;
-                    $projectstatic->ref = $objp->ref;
+					$projectstatic->id = $objp->rowid;
+					$projectstatic->ref = $objp->ref;
 
-                    $this->info_box_contents[$i][] = array(
-                        'td' => 'class="nowraponall"',
-                        'text' => $projectstatic->getNomUrl(1),
-                        'asis' => 1
-                    );
+					$this->info_box_contents[$i][] = array(
+						'td' => 'class="nowraponall"',
+						'text' => $projectstatic->getNomUrl(1),
+						'asis' => 1
+					);
 
-                    if ($objp->fk_soc > 0) {
-                    	$sql = 'SELECT rowid, nom as name FROM '.MAIN_DB_PREFIX.'societe WHERE rowid ='.$objp->fk_soc;
-                    	$resql = $this->db->query($sql);
-                    	//$socstatic = new Societe($this->db);
-                    	$obj2 = $this->db->fetch_object($resql);
-                    	$this->info_box_contents[$i][] = array(
-                    		'td' => 'class="tdoverflowmax150 maxwidth200onsmartphone"',
-                    		'text' => $obj2->name,
-                    		'asis' => 1,
-                    		'url' => DOL_URL_ROOT.'/societe/card.php?socid='.$obj2->rowid
-                    	);
-                    }
-                    else {
-                    	$this->info_box_contents[$i][] = array(
-                    		'td' => 'class="tdoverflowmax150 maxwidth200onsmartphone"',
-                    		'text' => '',
-                    		'asis' => 1,
-                    		'url' => ''
-                    	);
-                    }
+					if ($objp->fk_soc > 0) {
+						$sql = 'SELECT rowid, nom as name FROM '.MAIN_DB_PREFIX.'societe WHERE rowid ='.$objp->fk_soc;
+						$resql = $this->db->query($sql);
+						//$socstatic = new Societe($this->db);
+						$obj2 = $this->db->fetch_object($resql);
+						$this->info_box_contents[$i][] = array(
+							'td' => 'class="tdoverflowmax150 maxwidth200onsmartphone"',
+							'text' => $obj2->name,
+							'asis' => 1,
+							'url' => DOL_URL_ROOT.'/societe/card.php?socid='.$obj2->rowid
+						);
+					}
+					else {
+						$this->info_box_contents[$i][] = array(
+							'td' => 'class="tdoverflowmax150 maxwidth200onsmartphone"',
+							'text' => '',
+							'asis' => 1,
+							'url' => ''
+						);
+					}
 
-                    $this->info_box_contents[$i][] = array(
-                        'td' => 'class="center"',
-                        'text' => $objp->startDate,
-                    );
+					$this->info_box_contents[$i][] = array(
+						'td' => 'class="center"',
+						'text' => $objp->startDate,
+					);
 
-                    $this->info_box_contents[$i][] = array(
-                        'td' => 'class="center"',
-                        'text' => $objp->tasknumber."&nbsp;".$langs->trans("Tasks"),
+					$this->info_box_contents[$i][] = array(
+						'td' => 'class="center"',
+						'text' => $objp->tasknumber."&nbsp;".$langs->trans("Tasks"),
 						'asis' => 1,
-                    );
-                    $i++;
-                }
-            }else {
-            	dol_print_error($this->db);
+					);
+					$i++;
+				}
+			} else {
+				dol_print_error($this->db);
 			}
-        }
-    }
+		}
+	}
 
-    /**
-     *	Method to show box
-     *
-     *	@param	array	$head       Array with properties of box title
-     *	@param  array	$contents   Array with properties of box lines
-     *  @param	int		$nooutput	No print, only return string
-     *	@return	string
-     */
-    public function showBox($head = null, $contents = null, $nooutput = 0)
-    {
-        return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
-    }
+	/**
+	 *	Method to show box
+	 *
+	 *	@param	array	$head       Array with properties of box title
+	 *	@param  array	$contents   Array with properties of box lines
+	 *  @param	int		$nooutput	No print, only return string
+	 *	@return	string
+	 */
+	public function showBox($head = null, $contents = null, $nooutput = 0)
+	{
+		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+	}
 }
diff --git a/htdocs/core/boxes/intracommreport_box.php b/htdocs/core/boxes/intracommreport_box.php
index 1df09500173..d7c383138b6 100644
--- a/htdocs/core/boxes/intracommreport_box.php
+++ b/htdocs/core/boxes/intracommreport_box.php
@@ -22,7 +22,7 @@
  * 	\brief		This file is a sample box definition file
  * 				Put some comments here
  */
-include_once DOL_DOCUMENT_ROOT . "/core/boxes/modules_boxes.php";
+include_once DOL_DOCUMENT_ROOT."/core/boxes/modules_boxes.php";
 
 /**
  * Class to manage the box
@@ -30,59 +30,59 @@ include_once DOL_DOCUMENT_ROOT . "/core/boxes/modules_boxes.php";
 class intracommreportbox extends ModeleBoxes
 {
 
-    public $boxcode = "mybox";
-    public $boximg = "intracommreport";
-    public $boxlabel;
-    public $depends = array("intracommreport");
-    public $db;
-    public $param;
-    public $info_box_head = array();
-    public $info_box_contents = array();
+	public $boxcode = "mybox";
+	public $boximg = "intracommreport";
+	public $boxlabel;
+	public $depends = array("intracommreport");
+	public $db;
+	public $param;
+	public $info_box_head = array();
+	public $info_box_contents = array();
 
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-        global $langs;
-        $langs->load("boxes");
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		global $langs;
+		$langs->load("boxes");
 
-        $this->boxlabel = $langs->transnoentitiesnoconv("MyBox");
-    }
+		$this->boxlabel = $langs->transnoentitiesnoconv("MyBox");
+	}
 
-    /**
-     * Load data into info_box_contents array to show array later.
-     *
-     * 	@param		int		$max		Maximum number of records to load
-     * 	@return		void
-     */
-    public function loadBox($max = 5)
-    {
-        global $conf, $user, $langs, $db;
+	/**
+	 * Load data into info_box_contents array to show array later.
+	 *
+	 * 	@param		int		$max		Maximum number of records to load
+	 * 	@return		void
+	 */
+	public function loadBox($max = 5)
+	{
+		global $conf, $user, $langs, $db;
 
-        $this->max = $max;
+		$this->max = $max;
 
-        //include_once DOL_DOCUMENT_ROOT . "/intracommreport/class/intracommreport.class.php";
+		//include_once DOL_DOCUMENT_ROOT . "/intracommreport/class/intracommreport.class.php";
 
-        $text = $langs->trans("MyBoxDescription", $max);
-        $this->info_box_head = array(
-            'text' => $text,
-            'limit' => dol_strlen($text)
-        );
+		$text = $langs->trans("MyBoxDescription", $max);
+		$this->info_box_head = array(
+			'text' => $text,
+			'limit' => dol_strlen($text)
+		);
 
-        $this->info_box_contents[0][0] = array('td' => 'align="left"',
-            'text' => $langs->trans("MyBoxContent"));
-    }
+		$this->info_box_contents[0][0] = array('td' => 'align="left"',
+			'text' => $langs->trans("MyBoxContent"));
+	}
 
-    /**
-     * 	Method to show box
-     *
-     * 	@param	array	$head       Array with properties of box title
-     * 	@param  array	$contents   Array with properties of box lines
-     * 	@return	void
-     */
-    public function showBox($head = null, $contents = null)
-    {
-        parent::showBox($this->info_box_head, $this->info_box_contents);
-    }
+	/**
+	 * 	Method to show box
+	 *
+	 * 	@param	array	$head       Array with properties of box title
+	 * 	@param  array	$contents   Array with properties of box lines
+	 * 	@return	void
+	 */
+	public function showBox($head = null, $contents = null)
+	{
+		parent::showBox($this->info_box_head, $this->info_box_contents);
+	}
 }
diff --git a/htdocs/core/boxes/modules_boxes.php b/htdocs/core/boxes/modules_boxes.php
index fd179dec7b6..2ac7ee05c6b 100644
--- a/htdocs/core/boxes/modules_boxes.php
+++ b/htdocs/core/boxes/modules_boxes.php
@@ -113,7 +113,7 @@ class ModeleBoxes // Can't be abtract as it is instantiated to build "empty" box
 	 * Constructor
 	 *
 	 * @param   DoliDB  $db     Database handler
-     * @param   string  $param  More parameters
+	 * @param   string  $param  More parameters
 	 */
 	public function __construct($db, $param = '')
 	{
@@ -156,7 +156,7 @@ class ModeleBoxes // Can't be abtract as it is instantiated to build "empty" box
 			if ($obj)
 			{
 				$this->id = $obj->id;
-				$this->rowid = $obj->id;	// For backward compatibility
+				$this->rowid = $obj->id; // For backward compatibility
 				$this->box_id = $obj->box_id;
 				$this->position = $obj->position;
 				$this->box_order = $obj->box_order;
@@ -184,180 +184,180 @@ class ModeleBoxes // Can't be abtract as it is instantiated to build "empty" box
 
 		if (!empty($this->hidden)) return '\n<!-- Box ".get_class($this)." hidden -->\n'; // Nothing done if hidden (for example when user has no permission)
 
-        require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 		$MAXLENGTHBOX = 60; // Mettre 0 pour pas de limite
 
-        $cachetime = 900; // 900 : 15mn
-        $cachedir = DOL_DATA_ROOT.'/boxes/temp';
-        $fileid = get_class($this).'id-'.$this->box_id.'-e'.$conf->entity.'-u'.$user->id.'-s'.$user->socid.'.cache';
-        $filename = '/box-'.$fileid;
-        $refresh = dol_cache_refresh($cachedir, $filename, $cachetime);
-        $out = '';
+		$cachetime = 900; // 900 : 15mn
+		$cachedir = DOL_DATA_ROOT.'/boxes/temp';
+		$fileid = get_class($this).'id-'.$this->box_id.'-e'.$conf->entity.'-u'.$user->id.'-s'.$user->socid.'.cache';
+		$filename = '/box-'.$fileid;
+		$refresh = dol_cache_refresh($cachedir, $filename, $cachetime);
+		$out = '';
 
-        if ($refresh) {
-            dol_syslog(get_class($this).'::showBox');
+		if ($refresh) {
+			dol_syslog(get_class($this).'::showBox');
 
-            // Define nbcol and nblines of the box to show
-            $nbcol = 0;
-            if (isset($contents[0])) $nbcol = count($contents[0]);
-            $nblines = count($contents);
+			// Define nbcol and nblines of the box to show
+			$nbcol = 0;
+			if (isset($contents[0])) $nbcol = count($contents[0]);
+			$nblines = count($contents);
 
-            $out .= "\n<!-- Box ".get_class($this)." start -->\n";
+			$out .= "\n<!-- Box ".get_class($this)." start -->\n";
 
-            $out .= '<div class="box boxdraggable" id="boxto_'.$this->box_id.'">'."\n";
+			$out .= '<div class="box boxdraggable" id="boxto_'.$this->box_id.'">'."\n";
 
-            if (!empty($head['text']) || !empty($head['sublink']) || !empty($head['subpicto']) || $nblines)
-            {
-                $out .= '<table summary="boxtable'.$this->box_id.'" width="100%" class="noborder boxtable">'."\n";
-            }
+			if (!empty($head['text']) || !empty($head['sublink']) || !empty($head['subpicto']) || $nblines)
+			{
+				$out .= '<table summary="boxtable'.$this->box_id.'" width="100%" class="noborder boxtable">'."\n";
+			}
 
-            // Show box title
-            if (!empty($head['text']) || !empty($head['sublink']) || !empty($head['subpicto']))
-            {
-                $out .= '<tr class="liste_titre box_titre">';
-                $out .= '<td';
-                if ($nbcol > 0) { $out .= ' colspan="'.$nbcol.'"'; }
-                $out .= '>';
-                if (!empty($conf->use_javascript_ajax))
-                {
-                    //$out.= '<table summary="" class="nobordernopadding" width="100%"><tr><td class="tdoverflowmax150 maxwidth150onsmartphone">';
-                	$out .= '<div class="tdoverflowmax250 maxwidth150onsmartphone float">';
-                }
-                if (!empty($head['text']))
-                {
-                    $s = dol_trunc($head['text'], isset($head['limit']) ? $head['limit'] : $MAXLENGTHBOX);
-                    $out .= $s;
-                }
-                if (!empty($conf->use_javascript_ajax))
-                {
-                	$out .= '</div>';
-                }
-                //$out.= '</td>';
+			// Show box title
+			if (!empty($head['text']) || !empty($head['sublink']) || !empty($head['subpicto']))
+			{
+				$out .= '<tr class="liste_titre box_titre">';
+				$out .= '<td';
+				if ($nbcol > 0) { $out .= ' colspan="'.$nbcol.'"'; }
+				$out .= '>';
+				if (!empty($conf->use_javascript_ajax))
+				{
+					//$out.= '<table summary="" class="nobordernopadding" width="100%"><tr><td class="tdoverflowmax150 maxwidth150onsmartphone">';
+					$out .= '<div class="tdoverflowmax250 maxwidth150onsmartphone float">';
+				}
+				if (!empty($head['text']))
+				{
+					$s = dol_trunc($head['text'], isset($head['limit']) ? $head['limit'] : $MAXLENGTHBOX);
+					$out .= $s;
+				}
+				if (!empty($conf->use_javascript_ajax))
+				{
+					$out .= '</div>';
+				}
+				//$out.= '</td>';
 
-                if (!empty($conf->use_javascript_ajax))
-                {
-                    $sublink = '';
-                    if (!empty($head['sublink']))  $sublink .= '<a href="'.$head['sublink'].'"'.(empty($head['target']) ? '' : ' target="'.$head['target'].'"').'>';
-                    if (!empty($head['subpicto'])) $sublink .= img_picto($head['subtext'], $head['subpicto'], 'class="opacitymedium marginleftonly '.(empty($head['subclass']) ? '' : $head['subclass']).'" id="idsubimg'.$this->boxcode.'"');
-                    if (!empty($head['sublink']))  $sublink .= '</a>';
+				if (!empty($conf->use_javascript_ajax))
+				{
+					$sublink = '';
+					if (!empty($head['sublink']))  $sublink .= '<a href="'.$head['sublink'].'"'.(empty($head['target']) ? '' : ' target="'.$head['target'].'"').'>';
+					if (!empty($head['subpicto'])) $sublink .= img_picto($head['subtext'], $head['subpicto'], 'class="opacitymedium marginleftonly '.(empty($head['subclass']) ? '' : $head['subclass']).'" id="idsubimg'.$this->boxcode.'"');
+					if (!empty($head['sublink']))  $sublink .= '</a>';
 
-                    //$out.= '<td class="nocellnopadd boxclose right nowraponall">';
-                    $out .= '<div class="nocellnopadd boxclose floatright nowraponall">';
-                    $out .= $sublink;
-                    // The image must have the class 'boxhandle' beause it's value used in DOM draggable objects to define the area used to catch the full object
-                    $out .= img_picto($langs->trans("MoveBox", $this->box_id), 'grip_title', 'class="opacitymedium boxhandle hideonsmartphone cursormove marginleftonly"');
-                    $out .= img_picto($langs->trans("CloseBox", $this->box_id), 'close_title', 'class="opacitymedium boxclose cursorpointer marginleftonly" rel="x:y" id="imgclose'.$this->box_id.'"');
-                    $label = $head['text'];
-                    //if (! empty($head['graph'])) $label.=' ('.$langs->trans("Graph").')';
-                    if (!empty($head['graph'])) $label .= ' <span class="opacitymedium fa fa-bar-chart"></span>';
-                    $out .= '<input type="hidden" id="boxlabelentry'.$this->box_id.'" value="'.dol_escape_htmltag($label).'">';
-                    //$out.= '</td></tr></table>';
-                    $out .= '</div>';
-                }
+					//$out.= '<td class="nocellnopadd boxclose right nowraponall">';
+					$out .= '<div class="nocellnopadd boxclose floatright nowraponall">';
+					$out .= $sublink;
+					// The image must have the class 'boxhandle' beause it's value used in DOM draggable objects to define the area used to catch the full object
+					$out .= img_picto($langs->trans("MoveBox", $this->box_id), 'grip_title', 'class="opacitymedium boxhandle hideonsmartphone cursormove marginleftonly"');
+					$out .= img_picto($langs->trans("CloseBox", $this->box_id), 'close_title', 'class="opacitymedium boxclose cursorpointer marginleftonly" rel="x:y" id="imgclose'.$this->box_id.'"');
+					$label = $head['text'];
+					//if (! empty($head['graph'])) $label.=' ('.$langs->trans("Graph").')';
+					if (!empty($head['graph'])) $label .= ' <span class="opacitymedium fa fa-bar-chart"></span>';
+					$out .= '<input type="hidden" id="boxlabelentry'.$this->box_id.'" value="'.dol_escape_htmltag($label).'">';
+					//$out.= '</td></tr></table>';
+					$out .= '</div>';
+				}
 
-                $out .= "</td>";
-                $out .= "</tr>\n";
-            }
+				$out .= "</td>";
+				$out .= "</tr>\n";
+			}
 
-            // Show box lines
-            if ($nblines)
-            {
-                // Loop on each record
-                for ($i = 0, $n = $nblines; $i < $n; $i++)
-                {
-                    if (isset($contents[$i]))
-                    {
-                        // TR
-                        if (isset($contents[$i][0]['tr'])) $out .= '<tr '.$contents[$i][0]['tr'].'>';
-                        else $out .= '<tr class="oddeven">';
+			// Show box lines
+			if ($nblines)
+			{
+				// Loop on each record
+				for ($i = 0, $n = $nblines; $i < $n; $i++)
+				{
+					if (isset($contents[$i]))
+					{
+						// TR
+						if (isset($contents[$i][0]['tr'])) $out .= '<tr '.$contents[$i][0]['tr'].'>';
+						else $out .= '<tr class="oddeven">';
 
-                        // Loop on each TD
-                        $nbcolthisline = count($contents[$i]);
-                        for ($j = 0; $j < $nbcolthisline; $j++) {
-                            // Define tdparam
-                            $tdparam = '';
-                            if (isset($contents[$i][$j]['td'])) $tdparam .= ' '.$contents[$i][$j]['td'];
+						// Loop on each TD
+						$nbcolthisline = count($contents[$i]);
+						for ($j = 0; $j < $nbcolthisline; $j++) {
+							// Define tdparam
+							$tdparam = '';
+							if (isset($contents[$i][$j]['td'])) $tdparam .= ' '.$contents[$i][$j]['td'];
 
-                            $text = isset($contents[$i][$j]['text']) ? $contents[$i][$j]['text'] : '';
-                            $textwithnotags = preg_replace('/<([^>]+)>/i', '', $text);
-                            $text2 = isset($contents[$i][$j]['text2']) ? $contents[$i][$j]['text2'] : '';
-                            $text2withnotags = preg_replace('/<([^>]+)>/i', '', $text2);
+							$text = isset($contents[$i][$j]['text']) ? $contents[$i][$j]['text'] : '';
+							$textwithnotags = preg_replace('/<([^>]+)>/i', '', $text);
+							$text2 = isset($contents[$i][$j]['text2']) ? $contents[$i][$j]['text2'] : '';
+							$text2withnotags = preg_replace('/<([^>]+)>/i', '', $text2);
 
-                            $textnoformat = isset($contents[$i][$j]['textnoformat']) ? $contents[$i][$j]['textnoformat'] : '';
-                            //$out.= "xxx $textwithnotags y";
-                            if (empty($contents[$i][$j]['tooltip'])) $contents[$i][$j]['tooltip'] = "";
-                            $tooltip = isset($contents[$i][$j]['tooltip']) ? $contents[$i][$j]['tooltip'] : '';
+							$textnoformat = isset($contents[$i][$j]['textnoformat']) ? $contents[$i][$j]['textnoformat'] : '';
+							//$out.= "xxx $textwithnotags y";
+							if (empty($contents[$i][$j]['tooltip'])) $contents[$i][$j]['tooltip'] = "";
+							$tooltip = isset($contents[$i][$j]['tooltip']) ? $contents[$i][$j]['tooltip'] : '';
 
-                            $out .= '<td'.$tdparam.'>'."\n";
+							$out .= '<td'.$tdparam.'>'."\n";
 
-                            // Url
-                            if (!empty($contents[$i][$j]['url']) && empty($contents[$i][$j]['logo']))
-                            {
-                                $out .= '<a href="'.$contents[$i][$j]['url'].'"';
-                                if (!empty($tooltip)) {
-                                    $out .= ' title="'.dol_escape_htmltag($langs->trans("Show").' '.$tooltip, 1).'" class="classfortooltip"';
-                                }
-                                //$out.= ' alt="'.$textwithnotags.'"';      // Pas de alt sur un "<a href>"
-                                $out .= isset($contents[$i][$j]['target']) ? ' target="'.$contents[$i][$j]['target'].'"' : '';
-                                $out .= '>';
-                            }
+							// Url
+							if (!empty($contents[$i][$j]['url']) && empty($contents[$i][$j]['logo']))
+							{
+								$out .= '<a href="'.$contents[$i][$j]['url'].'"';
+								if (!empty($tooltip)) {
+									$out .= ' title="'.dol_escape_htmltag($langs->trans("Show").' '.$tooltip, 1).'" class="classfortooltip"';
+								}
+								//$out.= ' alt="'.$textwithnotags.'"';      // Pas de alt sur un "<a href>"
+								$out .= isset($contents[$i][$j]['target']) ? ' target="'.$contents[$i][$j]['target'].'"' : '';
+								$out .= '>';
+							}
 
-                            // Logo
-                            if (!empty($contents[$i][$j]['logo']))
-                            {
-                                $logo = preg_replace("/^object_/i", "", $contents[$i][$j]['logo']);
-                                $out .= '<a href="'.$contents[$i][$j]['url'].'">';
-                                $out .= img_object($langs->trans("Show").' '.$tooltip, $logo, 'class="classfortooltip"');
-                            }
+							// Logo
+							if (!empty($contents[$i][$j]['logo']))
+							{
+								$logo = preg_replace("/^object_/i", "", $contents[$i][$j]['logo']);
+								$out .= '<a href="'.$contents[$i][$j]['url'].'">';
+								$out .= img_object($langs->trans("Show").' '.$tooltip, $logo, 'class="classfortooltip"');
+							}
 
-                            $maxlength = $MAXLENGTHBOX;
-                            if (!empty($contents[$i][$j]['maxlength'])) $maxlength = $contents[$i][$j]['maxlength'];
+							$maxlength = $MAXLENGTHBOX;
+							if (!empty($contents[$i][$j]['maxlength'])) $maxlength = $contents[$i][$j]['maxlength'];
 
-                            if ($maxlength) $textwithnotags = dol_trunc($textwithnotags, $maxlength);
-                            if (preg_match('/^<(img|div|span)/i', $text) || !empty($contents[$i][$j]['asis'])) $out .= $text; // show text with no html cleaning
-                            else $out .= $textwithnotags; // show text with html cleaning
+							if ($maxlength) $textwithnotags = dol_trunc($textwithnotags, $maxlength);
+							if (preg_match('/^<(img|div|span)/i', $text) || !empty($contents[$i][$j]['asis'])) $out .= $text; // show text with no html cleaning
+							else $out .= $textwithnotags; // show text with html cleaning
 
-                            // End Url
-                            if (!empty($contents[$i][$j]['url'])) $out .= '</a>';
+							// End Url
+							if (!empty($contents[$i][$j]['url'])) $out .= '</a>';
 
-                            if (preg_match('/^<(img|div|span)/i', $text2) || !empty($contents[$i][$j]['asis2'])) $out .= $text2; // show text with no html cleaning
-                            else $out .= $text2withnotags; // show text with html cleaning
+							if (preg_match('/^<(img|div|span)/i', $text2) || !empty($contents[$i][$j]['asis2'])) $out .= $text2; // show text with no html cleaning
+							else $out .= $text2withnotags; // show text with html cleaning
 
-                            if (!empty($textnoformat)) $out .= "\n".$textnoformat."\n";
+							if (!empty($textnoformat)) $out .= "\n".$textnoformat."\n";
 
-                            $out .= "</td>\n";
-                        }
+							$out .= "</td>\n";
+						}
 
-                        $out .= "</tr>\n";
-                    }
-                }
-            }
+						$out .= "</tr>\n";
+					}
+				}
+			}
 
-            if (!empty($head['text']) || !empty($head['sublink']) || !empty($head['subpicto']) || $nblines)
-            {
-                $out .= "</table>\n";
-            }
+			if (!empty($head['text']) || !empty($head['sublink']) || !empty($head['subpicto']) || $nblines)
+			{
+				$out .= "</table>\n";
+			}
 
-            // If invisible box with no contents
-            if (empty($head['text']) && empty($head['sublink']) && empty($head['subpicto']) && !$nblines) $out .= "<br>\n";
+			// If invisible box with no contents
+			if (empty($head['text']) && empty($head['sublink']) && empty($head['subpicto']) && !$nblines) $out .= "<br>\n";
 
-            $out .= "</div>\n";
+			$out .= "</div>\n";
 
-            $out .= "<!-- Box ".get_class($this)." end -->\n\n";
-            if (!empty($conf->global->MAIN_ACTIVATE_FILECACHE)) {
-                dol_filecache($cachedir, $filename, $out);
-            }
-        } else {
-            dol_syslog(get_class($this).'::showBoxCached');
-            $out = "<!-- Box ".get_class($this)." from cache -->";
-            $out .= dol_readcachefile($cachedir, $filename);
-        }
+			$out .= "<!-- Box ".get_class($this)." end -->\n\n";
+			if (!empty($conf->global->MAIN_ACTIVATE_FILECACHE)) {
+				dol_filecache($cachedir, $filename, $out);
+			}
+		} else {
+			dol_syslog(get_class($this).'::showBoxCached');
+			$out = "<!-- Box ".get_class($this)." from cache -->";
+			$out .= dol_readcachefile($cachedir, $filename);
+		}
 
-        if ($nooutput) return $out;
-        else print $out;
+		if ($nooutput) return $out;
+		else print $out;
 
-        return '';
+		return '';
 	}
 
 
@@ -458,6 +458,7 @@ class ModeleBoxes // Can't be abtract as it is instantiated to build "empty" box
 			{
 				// Define disabledbyname and disabledbymodule
 				$disabledbyname = 0;
+				$disabledbymodule = 0; // TODO Set to 2 if module is not enabled
 				$module = '';
 
 				// Check if widget file is disabled by name
@@ -476,7 +477,7 @@ class ModeleBoxes // Can't be abtract as it is instantiated to build "empty" box
 				$text = '<b>'.$langs->trans("Description").':</b><br>';
 				$text .= $objMod->boxlabel.'<br>';
 				$text .= '<br><b>'.$langs->trans("Status").':</b><br>';
-				if ($disabledbymodule == 2) $text .= $langs->trans("HooksDisabledAsModuleDisabled", $module).'<br>';
+				if ($disabledbymodule == 2) $text .= $langs->trans("WidgetDisabledAsModuleDisabled", $module).'<br>';
 
 				$widget[$j]['info'] = $text;
 			}
diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php
index bb8086f9b90..65c017e3dad 100644
--- a/htdocs/core/class/CMailFile.class.php
+++ b/htdocs/core/class/CMailFile.class.php
@@ -294,13 +294,13 @@ class CMailFile
 			$addr_bcc .= ($addr_bcc ? ', ' : '').$conf->global->MAIN_MAIL_AUTOCOPY_TO;
 		}
 
-		$keyforsslseflsigned  ='MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED';
+		$keyforsslseflsigned = 'MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED';
 		if (!empty($this->sendcontext)) {
 			$smtpContextKey = strtoupper($this->sendcontext);
-			$keyForSMTPSendMode = 'MAIN_MAIL_SENDMODE_' . $smtpContextKey;
+			$keyForSMTPSendMode = 'MAIN_MAIL_SENDMODE_'.$smtpContextKey;
 			$smtpContextSendMode = $conf->global->{$keyForSMTPSendMode};
 			if (!empty($smtpContextSendMode) && $smtpContextSendMode != 'default') {
-				$keyforsslseflsigned  ='MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED_' . $smtpContextKey;
+				$keyforsslseflsigned = 'MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED_'.$smtpContextKey;
 			}
 		}
 
@@ -653,19 +653,19 @@ class CMailFile
 			$keyforsmtppw    = 'MAIN_MAIL_SMTPS_PW';
 			$keyfortls       = 'MAIN_MAIL_EMAIL_TLS';
 			$keyforstarttls  = 'MAIN_MAIL_EMAIL_STARTTLS';
-			$keyforsslseflsigned  ='MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED';
+			$keyforsslseflsigned = 'MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED';
 			if (!empty($this->sendcontext)) {
 				$smtpContextKey = strtoupper($this->sendcontext);
 				$keyForSMTPSendMode = 'MAIN_MAIL_SENDMODE_'.$smtpContextKey;
 				$smtpContextSendMode = $conf->global->{$keyForSMTPSendMode};
 				if (!empty($smtpContextSendMode) && $smtpContextSendMode != 'default') {
-					$keyforsmtpserver = 'MAIN_MAIL_SMTP_SERVER_' . $smtpContextKey;
-					$keyforsmtpport   = 'MAIN_MAIL_SMTP_PORT_' . $smtpContextKey;
-					$keyforsmtpid     = 'MAIN_MAIL_SMTPS_ID_' . $smtpContextKey;
-					$keyforsmtppw     = 'MAIN_MAIL_SMTPS_PW_' . $smtpContextKey;
-					$keyfortls        = 'MAIN_MAIL_EMAIL_TLS_' . $smtpContextKey;
-					$keyforstarttls   = 'MAIN_MAIL_EMAIL_STARTTLS_' . $smtpContextKey;
-					$keyforsslseflsigned  ='MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED_' . $smtpContextKey;
+					$keyforsmtpserver = 'MAIN_MAIL_SMTP_SERVER_'.$smtpContextKey;
+					$keyforsmtpport   = 'MAIN_MAIL_SMTP_PORT_'.$smtpContextKey;
+					$keyforsmtpid     = 'MAIN_MAIL_SMTPS_ID_'.$smtpContextKey;
+					$keyforsmtppw     = 'MAIN_MAIL_SMTPS_PW_'.$smtpContextKey;
+					$keyfortls        = 'MAIN_MAIL_EMAIL_TLS_'.$smtpContextKey;
+					$keyforstarttls   = 'MAIN_MAIL_EMAIL_STARTTLS_'.$smtpContextKey;
+					$keyforsslseflsigned = 'MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED_'.$smtpContextKey;
 				}
 			}
 
@@ -862,7 +862,7 @@ class CMailFile
 
 				if (!empty($conf->global->$keyforsmtpid)) $this->transport->setUsername($conf->global->$keyforsmtpid);
 				if (!empty($conf->global->$keyforsmtppw)) $this->transport->setPassword($conf->global->$keyforsmtppw);
-				if (! empty($conf->global->$keyforsslseflsigned)) $this->transport->setStreamOptions(array('ssl' => array('allow_self_signed' => true, 'verify_peer' => false)));;
+				if (!empty($conf->global->$keyforsslseflsigned)) $this->transport->setStreamOptions(array('ssl' => array('allow_self_signed' => true, 'verify_peer' => false)));
 				//$smtps->_msgReplyTo  = 'reply@web.com';
 
 				// Switch content encoding to base64 - avoid the doubledot issue with quoted-printable
diff --git a/htdocs/core/class/CSMSFile.class.php b/htdocs/core/class/CSMSFile.class.php
index 4f1959d2707..62257e79447 100644
--- a/htdocs/core/class/CSMSFile.class.php
+++ b/htdocs/core/class/CSMSFile.class.php
@@ -34,7 +34,7 @@
  */
 class CSMSFile
 {
-    /**
+	/**
 	 * @var string Error code (or message)
 	 */
 	public $error = '';
@@ -76,21 +76,21 @@ class CSMSFile
 		// If ending method not defined
 		if (empty($conf->global->MAIN_SMS_SENDMODE))
 		{
-		    $this->error = 'No SMS Engine defined';
-		    return -1;
+			$this->error = 'No SMS Engine defined';
+			return -1;
 		}
 
 		dol_syslog("CSMSFile::CSMSFile: MAIN_SMS_SENDMODE=".$conf->global->MAIN_SMS_SENDMODE." charset=".$conf->file->character_set_client." from=".$from.", to=".$to.", msg length=".count($msg), LOG_DEBUG);
 		dol_syslog("CSMSFile::CSMSFile: deferred=".$deferred." priority=".$priority." class=".$class, LOG_DEBUG);
 
 		// Action according to choosed sending method
-	    $this->addr_from = $from;
-	    $this->addr_to = $to;
-        $this->deferred = $deferred;
-        $this->priority = $priority;
-        $this->class = $class;
-        $this->message = $msg;
-        $this->nostop = false;
+		$this->addr_from = $from;
+		$this->addr_to = $to;
+		$this->deferred = $deferred;
+		$this->priority = $priority;
+		$this->class = $class;
+		$this->message = $msg;
+		$this->nostop = false;
 	}
 
 
@@ -108,17 +108,17 @@ class CSMSFile
 
 		$res = false;
 
-        dol_syslog("CSMSFile::sendfile addr_to=".$this->addr_to, LOG_DEBUG);
-        dol_syslog("CSMSFile::sendfile message=\n".$this->message);
+		dol_syslog("CSMSFile::sendfile addr_to=".$this->addr_to, LOG_DEBUG);
+		dol_syslog("CSMSFile::sendfile message=\n".$this->message);
 
-        $this->message = stripslashes($this->message);
+		$this->message = stripslashes($this->message);
 
-        if (!empty($conf->global->MAIN_SMS_DEBUG)) $this->dump_sms();
+		if (!empty($conf->global->MAIN_SMS_DEBUG)) $this->dump_sms();
 
 		if (empty($conf->global->MAIN_DISABLE_ALL_SMS))
 		{
-		    // Action according to choosed sending method
-		    if ($conf->global->MAIN_SMS_SENDMODE == 'ovh')    // Backward compatibility    @deprecated
+			// Action according to choosed sending method
+			if ($conf->global->MAIN_SMS_SENDMODE == 'ovh')    // Backward compatibility    @deprecated
 			{
 				dol_include_once('/ovh/class/ovhsms.class.php');
 				$sms = new OvhSms($this->db);
@@ -127,14 +127,14 @@ class CSMSFile
 				$sms->message = $this->message;
 				$sms->deferred = $this->deferred;
 				$sms->priority = $this->priority;
-                $sms->class = $this->class;
-                $sms->nostop = $this->nostop;
+				$sms->class = $this->class;
+				$sms->nostop = $this->nostop;
 
-                $sms->socid = $this->socid;
-                $sms->contact_id = $this->contact_id;
-                $sms->project = $this->fk_project;
+				$sms->socid = $this->socid;
+				$sms->contact_id = $this->contact_id;
+				$sms->project = $this->fk_project;
 
-                $res = $sms->SmsSend();
+				$res = $sms->SmsSend();
 
 				if ($res <= 0)
 				{
@@ -146,42 +146,42 @@ class CSMSFile
 					if (!empty($conf->global->MAIN_SMS_DEBUG)) $this->dump_sms_result($res);
 				}
 			} elseif (!empty($conf->global->MAIN_SMS_SENDMODE))    // $conf->global->MAIN_SMS_SENDMODE looks like a value 'class@module'
-		    {
-		        $tmp = explode('@', $conf->global->MAIN_SMS_SENDMODE);
-		        $classfile = $tmp[0]; $module = (empty($tmp[1]) ? $tmp[0] : $tmp[1]);
-		        dol_include_once('/'.$module.'/class/'.$classfile.'.class.php');
-		        try {
-		            $classname = ucfirst($classfile);
-		            $sms = new $classname($this->db);
-		            $sms->expe = $this->addr_from;
-		            $sms->dest = $this->addr_to;
-		            $sms->deferred = $this->deferred;
-		            $sms->priority = $this->priority;
-		            $sms->class = $this->class;
-		            $sms->message = $this->message;
-		            $sms->nostop = $this->nostop;
+			{
+				$tmp = explode('@', $conf->global->MAIN_SMS_SENDMODE);
+				$classfile = $tmp[0]; $module = (empty($tmp[1]) ? $tmp[0] : $tmp[1]);
+				dol_include_once('/'.$module.'/class/'.$classfile.'.class.php');
+				try {
+					$classname = ucfirst($classfile);
+					$sms = new $classname($this->db);
+					$sms->expe = $this->addr_from;
+					$sms->dest = $this->addr_to;
+					$sms->deferred = $this->deferred;
+					$sms->priority = $this->priority;
+					$sms->class = $this->class;
+					$sms->message = $this->message;
+					$sms->nostop = $this->nostop;
 
-		            $sms->socid = $this->socid;
-		            $sms->contact_id = $this->contact_id;
-		            $sms->fk_project = $this->fk_project;
+					$sms->socid = $this->socid;
+					$sms->contact_id = $this->contact_id;
+					$sms->fk_project = $this->fk_project;
 
-                    $res = $sms->SmsSend();
+					$res = $sms->SmsSend();
 
-                    $this->error = $sms->error;
-                    $this->errors = $sms->errors;
-    				if ($res <= 0)
-    				{
-    					dol_syslog("CSMSFile::sendfile: sms send error=".$this->error, LOG_ERR);
-    				} else {
-    					dol_syslog("CSMSFile::sendfile: sms send success with id=".$res, LOG_DEBUG);
-    					//var_dump($res);        // 1973128
-    					if (!empty($conf->global->MAIN_SMS_DEBUG)) $this->dump_sms_result($res);
-    				}
-		        } catch (Exception $e)
-		        {
-		            dol_print_error('', 'Error to get list of senders: '.$e->getMessage());
-		        }
-		    } else {
+					$this->error = $sms->error;
+					$this->errors = $sms->errors;
+					if ($res <= 0)
+					{
+						dol_syslog("CSMSFile::sendfile: sms send error=".$this->error, LOG_ERR);
+					} else {
+						dol_syslog("CSMSFile::sendfile: sms send success with id=".$res, LOG_DEBUG);
+						//var_dump($res);        // 1973128
+						if (!empty($conf->global->MAIN_SMS_DEBUG)) $this->dump_sms_result($res);
+					}
+				} catch (Exception $e)
+				{
+					dol_print_error('', 'Error to get list of senders: '.$e->getMessage());
+				}
+			} else {
 				// Send sms method not correctly defined
 				// --------------------------------------
 
@@ -198,17 +198,17 @@ class CSMSFile
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Write content of a SendSms request into a dump file (mode = all)
-     *  Used for debugging.
-     *
-     *  @return	void
-     */
-    public function dump_sms()
-    {
-        // phpcs:enable
-        global $conf, $dolibarr_main_data_root;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Write content of a SendSms request into a dump file (mode = all)
+	 *  Used for debugging.
+	 *
+	 *  @return	void
+	 */
+	public function dump_sms()
+	{
+		// phpcs:enable
+		global $conf, $dolibarr_main_data_root;
 
 		if (@is_writeable($dolibarr_main_data_root))	// Avoid fatal error on fopen with open_basedir
 		{
@@ -229,29 +229,29 @@ class CSMSFile
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Write content of a SendSms result into a dump file (mode = all)
-     *  Used for debugging.
-     *
-     *  @param	int		$result		Result of sms sending
-     *  @return	void
-     */
-    public function dump_sms_result($result)
-    {
-        // phpcs:enable
-        global $conf, $dolibarr_main_data_root;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Write content of a SendSms result into a dump file (mode = all)
+	 *  Used for debugging.
+	 *
+	 *  @param	int		$result		Result of sms sending
+	 *  @return	void
+	 */
+	public function dump_sms_result($result)
+	{
+		// phpcs:enable
+		global $conf, $dolibarr_main_data_root;
 
-        if (@is_writeable($dolibarr_main_data_root))    // Avoid fatal error on fopen with open_basedir
-        {
-        	$outputfile = $dolibarr_main_data_root."/dolibarr_sms.log";
-            $fp = fopen($outputfile, "a+");
+		if (@is_writeable($dolibarr_main_data_root))    // Avoid fatal error on fopen with open_basedir
+		{
+			$outputfile = $dolibarr_main_data_root."/dolibarr_sms.log";
+			$fp = fopen($outputfile, "a+");
 
-            fputs($fp, "\nResult id=".$result);
+			fputs($fp, "\nResult id=".$result);
 
-            fclose($fp);
-            if (!empty($conf->global->MAIN_UMASK))
-            @chmod($outputfile, octdec($conf->global->MAIN_UMASK));
-        }
-    }
+			fclose($fp);
+			if (!empty($conf->global->MAIN_UMASK))
+			@chmod($outputfile, octdec($conf->global->MAIN_UMASK));
+		}
+	}
 }
diff --git a/htdocs/core/class/antivir.class.php b/htdocs/core/class/antivir.class.php
index f897ae46a62..e6bd24ad016 100644
--- a/htdocs/core/class/antivir.class.php
+++ b/htdocs/core/class/antivir.class.php
@@ -45,9 +45,9 @@ class AntiVir
 	public $output;
 
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
 	/**
 	 *  Constructor
@@ -59,7 +59,7 @@ class AntiVir
 		$this->db = $db;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Scan a file with antivirus.
 	 *  This function runs the command defined in setup. This antivirus command must return 0 if OK.
@@ -70,24 +70,24 @@ class AntiVir
 	 */
 	public function dol_avscan_file($file)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 		$return = 0;
 
 		if (preg_match('/\.virus$/i', $file))
 		{
-		    $this->errors[] = 'File has an extension saying file is a virus';
-		    return -97;
+			$this->errors[] = 'File has an extension saying file is a virus';
+			return -97;
 		}
 
 		$fullcommand = $this->getCliCommand($file);
 		//$fullcommand='"c:\Program Files (x86)\ClamWin\bin\clamscan.exe" --database="C:\Program Files (x86)\ClamWin\lib" "c:\temp\aaa.txt"';
-        $fullcommand .= ' 2>&1'; // This is to get error output
+		$fullcommand .= ' 2>&1'; // This is to get error output
 
 		$output = array();
 		$return_var = 0;
-        $safemode = ini_get("safe_mode");
+		$safemode = ini_get("safe_mode");
 		// Create a clean fullcommand
 		dol_syslog("AntiVir::dol_avscan_file Run command=".$fullcommand." with safe_mode ".($safemode ? "on" : "off"));
 		// Run CLI command. If run of Windows, you can get return with echo %ERRORLEVEL%
@@ -95,7 +95,7 @@ class AntiVir
 
 		if (is_null($output)) $output = array();
 
-        //print "x".$lastline." - ".join(',',$output)." - ".$return_var."y";exit;
+		//print "x".$lastline." - ".join(',',$output)." - ".$return_var."y";exit;
 
 		/*
         $outputfile=$conf->admin->dir_temp.'/dol_avscan_file.out.'.session_id();
@@ -181,7 +181,7 @@ class AntiVir
 
 		$ret = $command.' '.$param;
 		//$ret=$command.' '.$param.' 2>&1';
-        //print "xx".$ret."xx";exit;
+		//print "xx".$ret."xx";exit;
 
 		return $ret;
 	}
diff --git a/htdocs/core/class/canvas.class.php b/htdocs/core/class/canvas.class.php
index 80c6ff1b7a6..91157f52ba0 100644
--- a/htdocs/core/class/canvas.class.php
+++ b/htdocs/core/class/canvas.class.php
@@ -29,9 +29,9 @@
 class Canvas
 {
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
 	/**
 	 * @var string Error code (or message)
@@ -45,16 +45,16 @@ class Canvas
 
 	public $actiontype;
 
-    public $dirmodule; // Module directory
-    public $targetmodule; // Module concerned by canvas (ex: thirdparty, contact, ...)
-    public $canvas; // Name of canvas (ex: company, individual, product, service, ...)
-    public $card; // Tab (sub-canvas)
+	public $dirmodule; // Module directory
+	public $targetmodule; // Module concerned by canvas (ex: thirdparty, contact, ...)
+	public $canvas; // Name of canvas (ex: company, individual, product, service, ...)
+	public $card; // Tab (sub-canvas)
 
-    public $template_dir; // Initialized by getCanvas with templates directory
-    public $control; // Initialized by getCanvas with controller instance
+	public $template_dir; // Initialized by getCanvas with templates directory
+	public $control; // Initialized by getCanvas with controller instance
 
 
-    /**
+	/**
 	 *   Constructor
 	 *
 	 *   @param     DoliDB	$db          	Database handler
@@ -75,11 +75,11 @@ class Canvas
 	 */
 	private function _cleanaction($action)
 	{
-	    $newaction = $action;
-	    if ($newaction == 'add')    $newaction = 'create';
-	    if ($newaction == 'update') $newaction = 'edit';
-	    if (empty($newaction) || $newaction == 'delete' || $newaction == 'create_user' || $newaction == 'presend' || $newaction == 'send') $newaction = 'view';
-	    return $newaction;
+		$newaction = $action;
+		if ($newaction == 'add')    $newaction = 'create';
+		if ($newaction == 'update') $newaction = 'edit';
+		if (empty($newaction) || $newaction == 'delete' || $newaction == 'create_user' || $newaction == 'presend' || $newaction == 'send') $newaction = 'view';
+		return $newaction;
 	}
 
 
@@ -96,45 +96,45 @@ class Canvas
 		global $conf, $langs;
 
 		// Set properties with value specific to dolibarr core: this->targetmodule, this->card, this->canvas
-        $this->targetmodule = $module;
-        $this->canvas = $canvas;
-        $this->card = $card;
-        $this->dirmodule = $module;
-        // Correct values if canvas is into an external module
+		$this->targetmodule = $module;
+		$this->canvas = $canvas;
+		$this->card = $card;
+		$this->dirmodule = $module;
+		// Correct values if canvas is into an external module
 		if (preg_match('/^([^@]+)@([^@]+)$/i', $canvas, $regs))
 		{
-            $this->canvas = $regs[1];
-		    $this->dirmodule = $regs[2];
+			$this->canvas = $regs[1];
+			$this->dirmodule = $regs[2];
 		}
 		// For compatibility
-        if ($this->dirmodule == 'thirdparty') { $this->dirmodule = 'societe'; }
+		if ($this->dirmodule == 'thirdparty') { $this->dirmodule = 'societe'; }
 
-        // Control file
+		// Control file
 		$controlclassfile = dol_buildpath('/'.$this->dirmodule.'/canvas/'.$this->canvas.'/actions_'.$this->card.'_'.$this->canvas.'.class.php');
 		if (file_exists($controlclassfile))
 		{
-            // Include actions class (controller)
-            $this->control_file = $controlclassfile;
-            require_once $controlclassfile;
+			// Include actions class (controller)
+			$this->control_file = $controlclassfile;
+			require_once $controlclassfile;
 
-            // Instantiate actions class (controller)
-            $controlclassname = 'Actions'.ucfirst($this->card).ucfirst($this->canvas);
-            $this->control = new $controlclassname($this->db, $this->dirmodule, $this->targetmodule, $this->canvas, $this->card);
+			// Instantiate actions class (controller)
+			$controlclassname = 'Actions'.ucfirst($this->card).ucfirst($this->canvas);
+			$this->control = new $controlclassname($this->db, $this->dirmodule, $this->targetmodule, $this->canvas, $this->card);
 		}
 
 		// Template dir
 		$this->template_dir = dol_buildpath('/'.$this->dirmodule.'/canvas/'.$this->canvas.'/tpl/');
-        if (!is_dir($this->template_dir))
-        {
-            $this->template_dir = '';
-        }
+		if (!is_dir($this->template_dir))
+		{
+			$this->template_dir = '';
+		}
 
-        //print 'dimodule='.$dirmodule.' canvas='.$this->canvas.'<br>';
-        //print ' => template_dir='.$this->template_dir.'<br>';
+		//print 'dimodule='.$dirmodule.' canvas='.$this->canvas.'<br>';
+		//print ' => template_dir='.$this->template_dir.'<br>';
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
 	 * 	Shared method for canvas to assign values for templates
 	 *
 	 * 	@param		string		$action	Action string
@@ -144,25 +144,25 @@ class Canvas
 	 */
 	public function assign_values(&$action = 'view', $id = 0, $ref = '')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		if (method_exists($this->control, 'assign_values')) $this->control->assign_values($action, $id, $ref);
 	}
 
-    /**
-     *	Return the template to display canvas (if it exists)
+	/**
+	 *	Return the template to display canvas (if it exists)
 	 *
 	 *	@param	string	$action		Action code
-     *	@return	int		0=Canvas template file does not exist, 1=Canvas template file exists
-     */
-    public function displayCanvasExists($action)
-    {
-        if (empty($this->template_dir)) return 0;
+	 *	@return	int		0=Canvas template file does not exist, 1=Canvas template file exists
+	 */
+	public function displayCanvasExists($action)
+	{
+		if (empty($this->template_dir)) return 0;
 
-        if (file_exists($this->template_dir.(!empty($this->card) ? $this->card.'_' : '').$this->_cleanaction($action).'.tpl.php')) return 1;
-        else return 0;
-    }
+		if (file_exists($this->template_dir.(!empty($this->card) ? $this->card.'_' : '').$this->_cleanaction($action).'.tpl.php')) return 1;
+		else return 0;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Display a canvas page. This will include the template for output.
 	 *	Variables used by templates may have been defined or loaded before into the assign_values function.
@@ -172,7 +172,7 @@ class Canvas
 	 */
 	public function display_canvas($action)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $db, $conf, $langs, $user, $canvas;
 		global $form, $formfile;
 
@@ -191,12 +191,12 @@ class Canvas
 	 */
 	public function hasActions()
 	{
-        return (is_object($this->control));
+		return (is_object($this->control));
 	}
 
 	/**
 	 * 	Shared method for canvas to execute actions.
-     *  @deprecated Use the doActions of hooks instead of this.
+	 *  @deprecated Use the doActions of hooks instead of this.
 	 * 	            This function is called if you add a doActions class inside your canvas. Try to not
 	 * 				do that and add action code into a hook instead.
 	 *
diff --git a/htdocs/core/class/ccountry.class.php b/htdocs/core/class/ccountry.class.php
index cf671eb57ca..d19e6d00a36 100644
--- a/htdocs/core/class/ccountry.class.php
+++ b/htdocs/core/class/ccountry.class.php
@@ -33,9 +33,9 @@
 class Ccountry // extends CommonObject
 {
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
 	/**
 	 * @var string Error code (or message)
@@ -50,7 +50,7 @@ class Ccountry // extends CommonObject
 	public $element = 'ccountry'; //!< Id that identify managed objects
 	public $table_element = 'c_country'; //!< Name of table without prefix where object is stored
 
-    /**
+	/**
 	 * @var int ID
 	 */
 	public $id;
@@ -59,9 +59,9 @@ class Ccountry // extends CommonObject
 	public $code_iso;
 
 	/**
-     * @var string Countries label
-     */
-    public $label;
+	 * @var string Countries label
+	 */
+	public $label;
 
 	public $active;
 
@@ -70,27 +70,27 @@ class Ccountry // extends CommonObject
 	);
 
 
-    /**
-     *  Constructor
-     *
-     *  @param      DoliDb		$db      Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-    }
+	/**
+	 *  Constructor
+	 *
+	 *  @param      DoliDb		$db      Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
 
 
-    /**
-     *  Create object into database
-     *
-     *  @param      User	$user        User that create
-     *  @param      int		$notrigger   0=launch triggers after, 1=disable triggers
-     *  @return     int      		   	 <0 if KO, Id of created object if OK
-     */
-    public function create($user, $notrigger = 0)
-    {
-    	global $conf, $langs;
+	/**
+	 *  Create object into database
+	 *
+	 *  @param      User	$user        User that create
+	 *  @param      int		$notrigger   0=launch triggers after, 1=disable triggers
+	 *  @return     int      		   	 <0 if KO, Id of created object if OK
+	 */
+	public function create($user, $notrigger = 0)
+	{
+		global $conf, $langs;
 		$error = 0;
 
 		// Clean parameters
@@ -102,14 +102,14 @@ class Ccountry // extends CommonObject
 		// Check parameters
 		// Put here code to add control on parameters values
 
-        // Insert request
+		// Insert request
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."c_country(";
 		$sql .= "rowid,";
 		$sql .= "code,";
 		$sql .= "code_iso,";
 		$sql .= "label,";
 		$sql .= "active";
-        $sql .= ") VALUES (";
+		$sql .= ") VALUES (";
 		$sql .= " ".(!isset($this->rowid) ? 'NULL' : "'".$this->db->escape($this->rowid)."'").",";
 		$sql .= " ".(!isset($this->code) ? 'NULL' : "'".$this->db->escape($this->code)."'").",";
 		$sql .= " ".(!isset($this->code_iso) ? 'NULL' : "'".$this->db->escape($this->code_iso)."'").",";
@@ -120,88 +120,88 @@ class Ccountry // extends CommonObject
 		$this->db->begin();
 
 	   	dol_syslog(get_class($this)."::create", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-    	if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+		$resql = $this->db->query($sql);
+		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
 		if (!$error)
-        {
-            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."c_country");
-        }
+		{
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."c_country");
+		}
 
-        // Commit or rollback
-        if ($error)
+		// Commit or rollback
+		if ($error)
 		{
 			foreach ($this->errors as $errmsg)
 			{
-	            dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
-	            $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
+				dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
 			return -1 * $error;
 		} else {
 			$this->db->commit();
-            return $this->id;
+			return $this->id;
 		}
-    }
+	}
 
 
-    /**
-     *  Load object in memory from database
-     *
-     *  @param      int		$id    	  Id object
-     *  @param		string	$code	    Code
-     *  @param		string	$code_iso	Code ISO
-     *  @return     int          	>0 if OK, 0 if not found, <0 if KO
-     */
-    public function fetch($id, $code = '', $code_iso = '')
-    {
-        $sql = "SELECT";
+	/**
+	 *  Load object in memory from database
+	 *
+	 *  @param      int		$id    	  Id object
+	 *  @param		string	$code	    Code
+	 *  @param		string	$code_iso	Code ISO
+	 *  @return     int          	>0 if OK, 0 if not found, <0 if KO
+	 */
+	public function fetch($id, $code = '', $code_iso = '')
+	{
+		$sql = "SELECT";
   		$sql .= " t.rowid,";
   		$sql .= " t.code,";
   		$sql .= " t.code_iso,";
   		$sql .= " t.label,";
   		$sql .= " t.active";
-        $sql .= " FROM ".MAIN_DB_PREFIX."c_country as t";
-        if ($id) $sql .= " WHERE t.rowid = ".$id;
-        elseif ($code) $sql .= " WHERE t.code = '".$this->db->escape($code)."'";
-        elseif ($code_iso) $sql .= " WHERE t.code_iso = '".$this->db->escape($code_iso)."'";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_country as t";
+		if ($id) $sql .= " WHERE t.rowid = ".$id;
+		elseif ($code) $sql .= " WHERE t.code = '".$this->db->escape($code)."'";
+		elseif ($code_iso) $sql .= " WHERE t.code_iso = '".$this->db->escape($code_iso)."'";
 
-    	dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            if ($this->db->num_rows($resql))
-            {
-                $obj = $this->db->fetch_object($resql);
+		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			if ($this->db->num_rows($resql))
+			{
+				$obj = $this->db->fetch_object($resql);
 
-                $this->id = $obj->rowid;
+				$this->id = $obj->rowid;
 				$this->code = $obj->code;
 				$this->code_iso = $obj->code_iso;
 				$this->label = $obj->label;
 				$this->active = $obj->active;
 
-                $this->db->free($resql);
-                return 1;
-            } else {
-                return 0;
-            }
-        } else {
-      	    $this->error = "Error ".$this->db->lasterror();
-            return -1;
-        }
-    }
+				$this->db->free($resql);
+				return 1;
+			} else {
+				return 0;
+			}
+		} else {
+	  		$this->error = "Error ".$this->db->lasterror();
+			return -1;
+		}
+	}
 
 
-    /**
-     *  Update object into database
-     *
-     *  @param      User	$user        User that modify
-     *  @param      int		$notrigger	 0=launch triggers after, 1=disable triggers
-     *  @return     int     		   	 <0 if KO, >0 if OK
-     */
-    public function update($user = null, $notrigger = 0)
-    {
-    	global $conf, $langs;
+	/**
+	 *  Update object into database
+	 *
+	 *  @param      User	$user        User that modify
+	 *  @param      int		$notrigger	 0=launch triggers after, 1=disable triggers
+	 *  @return     int     		   	 <0 if KO, >0 if OK
+	 */
+	public function update($user = null, $notrigger = 0)
+	{
+		global $conf, $langs;
 		$error = 0;
 
 		// Clean parameters
@@ -214,27 +214,27 @@ class Ccountry // extends CommonObject
 		// Check parameters
 		// Put here code to add control on parameters values
 
-        // Update request
-        $sql = "UPDATE ".MAIN_DB_PREFIX."c_country SET";
+		// Update request
+		$sql = "UPDATE ".MAIN_DB_PREFIX."c_country SET";
 		$sql .= " code=".(isset($this->code) ? "'".$this->db->escape($this->code)."'" : "null").",";
 		$sql .= " code_iso=".(isset($this->code_iso) ? "'".$this->db->escape($this->code_iso)."'" : "null").",";
 		$sql .= " label=".(isset($this->label) ? "'".$this->db->escape($this->label)."'" : "null").",";
 		$sql .= " active=".(isset($this->active) ? $this->active : "null")."";
-        $sql .= " WHERE rowid=".$this->id;
+		$sql .= " WHERE rowid=".$this->id;
 
 		$this->db->begin();
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-    	if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+		$resql = $this->db->query($sql);
+		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
-        // Commit or rollback
+		// Commit or rollback
 		if ($error)
 		{
 			foreach ($this->errors as $errmsg)
 			{
-	            dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
-	            $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
+				dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
 			return -1 * $error;
@@ -242,16 +242,16 @@ class Ccountry // extends CommonObject
 			$this->db->commit();
 			return 1;
 		}
-    }
+	}
 
 
  	/**
  	 *  Delete object in database
-	 *
-     *	@param  User	$user        User that delete
-     *  @param	int		$notrigger	 0=launch triggers after, 1=disable triggers
-	 *  @return	int					 <0 if KO, >0 if OK
-	 */
+ 	 *
+ 	 *	@param  User	$user        User that delete
+ 	 *  @param	int		$notrigger	 0=launch triggers after, 1=disable triggers
+ 	 *  @return	int					 <0 if KO, >0 if OK
+ 	 */
 	public function delete($user, $notrigger = 0)
 	{
 		global $conf, $langs;
@@ -264,15 +264,15 @@ class Ccountry // extends CommonObject
 
 		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-    	if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
-        // Commit or rollback
+		// Commit or rollback
 		if ($error)
 		{
 			foreach ($this->errors as $errmsg)
 			{
-	            dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
-	            $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
+				dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
 			return -1 * $error;
@@ -282,19 +282,19 @@ class Ccountry // extends CommonObject
 		}
 	}
 
-    /**
-     *  Return a link to the object card (with optionaly the picto)
-     *
-     *	@param	int		$withpicto					Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
-     *	@param	string	$option						On what the link point to ('nolink', ...)
-     *  @param	int  	$notooltip					1=Disable tooltip
-     *  @param  string  $morecss            		Add more css on link
-     *  @param  int     $save_lastsearch_value    	-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
-     *	@return	string								String with URL
-     */
-    public function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $morecss = '', $save_lastsearch_value = -1)
-    {
-    	global $langs;
-        return $langs->trans($this->label);
-    }
+	/**
+	 *  Return a link to the object card (with optionaly the picto)
+	 *
+	 *	@param	int		$withpicto					Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
+	 *	@param	string	$option						On what the link point to ('nolink', ...)
+	 *  @param	int  	$notooltip					1=Disable tooltip
+	 *  @param  string  $morecss            		Add more css on link
+	 *  @param  int     $save_lastsearch_value    	-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+	 *	@return	string								String with URL
+	 */
+	public function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $morecss = '', $save_lastsearch_value = -1)
+	{
+		global $langs;
+		return $langs->trans($this->label);
+	}
 }
diff --git a/htdocs/core/class/comment.class.php b/htdocs/core/class/comment.class.php
index 39ae2eb63ef..d2c6221a598 100644
--- a/htdocs/core/class/comment.class.php
+++ b/htdocs/core/class/comment.class.php
@@ -44,27 +44,27 @@ class Comment extends CommonObject
 	public $description;
 
 	/**
-     * Date modification record (tms)
-     *
-     * @var integer
-     */
+	 * Date modification record (tms)
+	 *
+	 * @var integer
+	 */
 	public $tms;
 
 	/**
-     * Date creation record (datec)
-     *
-     * @var integer
-     */
-    public $datec;
+	 * Date creation record (datec)
+	 *
+	 * @var integer
+	 */
+	public $datec;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_user_author;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_user_modif;
 
 	/**
diff --git a/htdocs/core/class/commonincoterm.class.php b/htdocs/core/class/commonincoterm.class.php
index b2d5491684e..f98f3aaabad 100644
--- a/htdocs/core/class/commonincoterm.class.php
+++ b/htdocs/core/class/commonincoterm.class.php
@@ -105,7 +105,7 @@ trait CommonIncoterm
 	 *
 	 *    @param	int		$id_incoterm     Id of incoterm to set or '' to remove
 	 * 	  @param 	string  $location		 location of incoterm
-	 *    @return	int     		<0 if KO, >0 if OK
+	 *    @return	int     				<0 if KO, >0 if OK
 	 */
 	public function setIncoterms($id_incoterm, $location)
 	{
diff --git a/htdocs/core/class/commoninvoice.class.php b/htdocs/core/class/commoninvoice.class.php
index 034e436a612..cb7944e1cac 100644
--- a/htdocs/core/class/commoninvoice.class.php
+++ b/htdocs/core/class/commoninvoice.class.php
@@ -33,36 +33,36 @@ abstract class CommonInvoice extends CommonObject
 {
 	use CommonIncoterm;
 
-    /**
-     * Standard invoice
-     */
-    const TYPE_STANDARD = 0;
+	/**
+	 * Standard invoice
+	 */
+	const TYPE_STANDARD = 0;
 
-    /**
-     * Replacement invoice
-     */
-    const TYPE_REPLACEMENT = 1;
+	/**
+	 * Replacement invoice
+	 */
+	const TYPE_REPLACEMENT = 1;
 
-    /**
-     * Credit note invoice
-     */
-    const TYPE_CREDIT_NOTE = 2;
+	/**
+	 * Credit note invoice
+	 */
+	const TYPE_CREDIT_NOTE = 2;
 
-    /**
-     * Deposit invoice
-     */
-    const TYPE_DEPOSIT = 3;
+	/**
+	 * Deposit invoice
+	 */
+	const TYPE_DEPOSIT = 3;
 
-    /**
-     * Proforma invoice.
-     * @deprectad Remove this. A "proforma invoice" is an order with a look of invoice, not an invoice !
-     */
-    const TYPE_PROFORMA = 4;
+	/**
+	 * Proforma invoice.
+	 * @deprectad Remove this. A "proforma invoice" is an order with a look of invoice, not an invoice !
+	 */
+	const TYPE_PROFORMA = 4;
 
-    /**
-     * Situation invoice
-     */
-    const TYPE_SITUATION = 5;
+	/**
+	 * Situation invoice
+	 */
+	const TYPE_SITUATION = 5;
 
 	/**
 	 * Draft status
@@ -102,16 +102,16 @@ abstract class CommonInvoice extends CommonObject
 	 */
 	public function getRemainToPay($multicurrency = 0)
 	{
-	    $alreadypaid = 0.0;
-	    $alreadypaid += $this->getSommePaiement($multicurrency);
-	    $alreadypaid += $this->getSumDepositsUsed($multicurrency);
-	    $alreadypaid += $this->getSumCreditNotesUsed($multicurrency);
+		$alreadypaid = 0.0;
+		$alreadypaid += $this->getSommePaiement($multicurrency);
+		$alreadypaid += $this->getSumDepositsUsed($multicurrency);
+		$alreadypaid += $this->getSumCreditNotesUsed($multicurrency);
 
-	    $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.0;
-	    }
-	    return $remaintopay;
+		$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.0;
+		}
+		return $remaintopay;
 	}
 
 	/**
@@ -151,7 +151,7 @@ abstract class CommonInvoice extends CommonObject
 
 	/**
 	 *    	Return amount (with tax) of all deposits invoices used by invoice.
-     *      Should always be empty, except if option FACTURE_DEPOSITS_ARE_JUST_PAYMENTS is on (not recommended).
+	 *      Should always be empty, except if option FACTURE_DEPOSITS_ARE_JUST_PAYMENTS is on (not recommended).
 	 *
 	 * 		@param 		int 	$multicurrency 	Return multicurrency_amount instead of amount
 	 *		@return		float						<0 if KO, Sum of deposits amount otherwise
@@ -159,21 +159,21 @@ abstract class CommonInvoice extends CommonObject
 	public function getSumDepositsUsed($multicurrency = 0)
 	{
 		if ($this->element == 'facture_fourn' || $this->element == 'invoice_supplier')
-	    {
-	        // TODO
-	        return 0.0;
-	    }
+		{
+			// TODO
+			return 0.0;
+		}
 
-	    require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
 
-	    $discountstatic = new DiscountAbsolute($this->db);
-	    $result = $discountstatic->getSumDepositsUsed($this, $multicurrency);
-	    if ($result >= 0) {
-	        return $result;
-	    } else {
-	        $this->error = $discountstatic->error;
-	        return -1;
-	    }
+		$discountstatic = new DiscountAbsolute($this->db);
+		$result = $discountstatic->getSumDepositsUsed($this, $multicurrency);
+		if ($result >= 0) {
+			return $result;
+		} else {
+			$this->error = $discountstatic->error;
+			return -1;
+		}
 	}
 
 	/**
@@ -184,16 +184,16 @@ abstract class CommonInvoice extends CommonObject
 	 */
 	public function getSumCreditNotesUsed($multicurrency = 0)
 	{
-	    require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
 
-	    $discountstatic = new DiscountAbsolute($this->db);
-	    $result = $discountstatic->getSumCreditNotesUsed($this, $multicurrency);
-	    if ($result >= 0) {
-	        return $result;
-	    } else {
-	        $this->error = $discountstatic->error;
-	        return -1;
-	    }
+		$discountstatic = new DiscountAbsolute($this->db);
+		$result = $discountstatic->getSumCreditNotesUsed($this, $multicurrency);
+		if ($result >= 0) {
+			return $result;
+		} else {
+			$this->error = $discountstatic->error;
+			return -1;
+		}
 	}
 
 	/**
@@ -204,16 +204,16 @@ abstract class CommonInvoice extends CommonObject
 	 */
 	public function getSumFromThisCreditNotesNotUsed($multicurrency = 0)
 	{
-	    require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
 
-	    $discountstatic = new DiscountAbsolute($this->db);
-	    $result = $discountstatic->getSumFromThisCreditNotesNotUsed($this, $multicurrency);
-	    if ($result >= 0) {
-	        return $result;
-	    } else {
-	        $this->error = $discountstatic->error;
-	        return -1;
-	    }
+		$discountstatic = new DiscountAbsolute($this->db);
+		$result = $discountstatic->getSumFromThisCreditNotesNotUsed($this, $multicurrency);
+		if ($result >= 0) {
+			return $result;
+		} else {
+			$this->error = $discountstatic->error;
+			return -1;
+		}
 	}
 
 	/**
@@ -297,7 +297,7 @@ abstract class CommonInvoice extends CommonObject
 		$table2 = 'paiement';
 		$field = 'fk_facture';
 		$field2 = 'fk_paiement';
-		$field3=', p.ref_ext';
+		$field3 = ', p.ref_ext';
 		$sharedentity = 'facture';
 		if ($this->element == 'facture_fourn' || $this->element == 'invoice_supplier')
 		{
@@ -305,7 +305,7 @@ abstract class CommonInvoice extends CommonObject
 			$table2 = 'paiementfourn';
 			$field = 'fk_facturefourn';
 			$field2 = 'fk_paiementfourn';
-			$field3='';
+			$field3 = '';
 			$sharedentity = 'facture_fourn';
 		}
 
@@ -327,11 +327,11 @@ abstract class CommonInvoice extends CommonObject
 			while ($i < $num)
 			{
 				$obj = $this->db->fetch_object($resql);
-				$tmp = array('amount'=>$obj->amount,'type'=>$obj->code, 'date'=>$obj->datep, 'num'=>$obj->num, 'ref'=>$obj->ref);
+				$tmp = array('amount'=>$obj->amount, 'type'=>$obj->code, 'date'=>$obj->datep, 'num'=>$obj->num, 'ref'=>$obj->ref);
 				if (!empty($field3)) {
-				    $tmp['ref_ext'] = $obj->ref_ext;
+					$tmp['ref_ext'] = $obj->ref_ext;
 				}
-				$retarray[]=$tmp;
+				$retarray[] = $tmp;
 				$i++;
 			}
 			$this->db->free($resql);
@@ -385,7 +385,7 @@ abstract class CommonInvoice extends CommonObject
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return if an invoice can be deleted
 	 *	Rule is:
@@ -399,9 +399,9 @@ abstract class CommonInvoice extends CommonObject
 	 *
 	 *  @return    int         <=0 if no, >0 if yes
 	 */
-    public function is_erasable()
-    {
-        // phpcs:enable
+	public function is_erasable()
+	{
+		// phpcs:enable
 		global $conf;
 
 		// We check if invoice is a temporary number (PROVxxxx)
@@ -486,15 +486,15 @@ abstract class CommonInvoice extends CommonObject
 	 *
 	 *	@return     string        Label of type of invoice
 	 */
-    public function getLibType()
+	public function getLibType()
 	{
 		global $langs;
-        if ($this->type == CommonInvoice::TYPE_STANDARD) return $langs->trans("InvoiceStandard");
-        elseif ($this->type == CommonInvoice::TYPE_REPLACEMENT) return $langs->trans("InvoiceReplacement");
-        elseif ($this->type == CommonInvoice::TYPE_CREDIT_NOTE) return $langs->trans("InvoiceAvoir");
-        elseif ($this->type == CommonInvoice::TYPE_DEPOSIT) return $langs->trans("InvoiceDeposit");
-        elseif ($this->type == CommonInvoice::TYPE_PROFORMA) return $langs->trans("InvoiceProForma"); // Not used.
-        elseif ($this->type == CommonInvoice::TYPE_SITUATION) return $langs->trans("InvoiceSituation");
+		if ($this->type == CommonInvoice::TYPE_STANDARD) return $langs->trans("InvoiceStandard");
+		elseif ($this->type == CommonInvoice::TYPE_REPLACEMENT) return $langs->trans("InvoiceReplacement");
+		elseif ($this->type == CommonInvoice::TYPE_CREDIT_NOTE) return $langs->trans("InvoiceAvoir");
+		elseif ($this->type == CommonInvoice::TYPE_DEPOSIT) return $langs->trans("InvoiceDeposit");
+		elseif ($this->type == CommonInvoice::TYPE_PROFORMA) return $langs->trans("InvoiceProForma"); // Not used.
+		elseif ($this->type == CommonInvoice::TYPE_SITUATION) return $langs->trans("InvoiceSituation");
 		return $langs->trans("Unknown");
 	}
 
@@ -510,7 +510,7 @@ abstract class CommonInvoice extends CommonObject
 		return $this->LibStatut($this->paye, $this->statut, $mode, $alreadypaid, $this->type);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Return label of a status
 	 *
@@ -523,52 +523,52 @@ abstract class CommonInvoice extends CommonObject
 	 */
 	public function LibStatut($paye, $status, $mode = 0, $alreadypaid = -1, $type = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 		$langs->load('bills');
 
 		$statusType = 'status0';
 		$prefix = 'Short';
 		if (!$paye) {
-		    if ($status == 0) {
-		    	$labelStatus = $langs->transnoentitiesnoconv('BillStatusDraft');
-		    	$labelStatusShort = $langs->transnoentitiesnoconv('Bill'.$prefix.'StatusDraft');
-		    } elseif (($status == 3 || $status == 2) && $alreadypaid <= 0) {
-		    	$labelStatus = $langs->transnoentitiesnoconv('BillStatusClosedUnpaid');
-		    	$labelStatusShort = $langs->transnoentitiesnoconv('Bill'.$prefix.'StatusClosedUnpaid');
-		        $statusType = 'status5';
-		    } elseif (($status == 3 || $status == 2) && $alreadypaid > 0) {
-		    	$labelStatus = $langs->transnoentitiesnoconv('BillStatusClosedPaidPartially');
-		    	$labelStatusShort = $langs->transnoentitiesnoconv('Bill'.$prefix.'StatusClosedPaidPartially');
-		        $statusType = 'status9';
-		    } elseif ($alreadypaid == 0) {
-		    	$labelStatus = $langs->transnoentitiesnoconv('BillStatusNotPaid');
-		    	$labelStatusShort = $langs->transnoentitiesnoconv('Bill'.$prefix.'StatusNotPaid');
-		        $statusType = 'status1';
-		    } else {
-		    	$labelStatus = $langs->transnoentitiesnoconv('BillStatusStarted');
-		    	$labelStatusShort = $langs->transnoentitiesnoconv('Bill'.$prefix.'StatusStarted');
-		        $statusType = 'status3';
-		    }
+			if ($status == 0) {
+				$labelStatus = $langs->transnoentitiesnoconv('BillStatusDraft');
+				$labelStatusShort = $langs->transnoentitiesnoconv('Bill'.$prefix.'StatusDraft');
+			} elseif (($status == 3 || $status == 2) && $alreadypaid <= 0) {
+				$labelStatus = $langs->transnoentitiesnoconv('BillStatusClosedUnpaid');
+				$labelStatusShort = $langs->transnoentitiesnoconv('Bill'.$prefix.'StatusClosedUnpaid');
+				$statusType = 'status5';
+			} elseif (($status == 3 || $status == 2) && $alreadypaid > 0) {
+				$labelStatus = $langs->transnoentitiesnoconv('BillStatusClosedPaidPartially');
+				$labelStatusShort = $langs->transnoentitiesnoconv('Bill'.$prefix.'StatusClosedPaidPartially');
+				$statusType = 'status9';
+			} elseif ($alreadypaid == 0) {
+				$labelStatus = $langs->transnoentitiesnoconv('BillStatusNotPaid');
+				$labelStatusShort = $langs->transnoentitiesnoconv('Bill'.$prefix.'StatusNotPaid');
+				$statusType = 'status1';
+			} else {
+				$labelStatus = $langs->transnoentitiesnoconv('BillStatusStarted');
+				$labelStatusShort = $langs->transnoentitiesnoconv('Bill'.$prefix.'StatusStarted');
+				$statusType = 'status3';
+			}
 		} else {
-		    $statusType = 'status6';
+			$statusType = 'status6';
 
-		    if ($type == self::TYPE_CREDIT_NOTE) {
-		    	$labelStatus = $langs->transnoentitiesnoconv('BillStatusPaidBackOrConverted'); // credit note
-		    	$labelStatusShort = $langs->transnoentitiesnoconv('Bill'.$prefix.'StatusPaidBackOrConverted'); // credit note
-		    } elseif ($type == self::TYPE_DEPOSIT) {
-		    	$labelStatus = $langs->transnoentitiesnoconv('BillStatusConverted'); // deposit invoice
-		        $labelStatusShort = $langs->transnoentitiesnoconv('Bill'.$prefix.'StatusConverted'); // deposit invoice
-		    } else {
-		    	$labelStatus = $langs->transnoentitiesnoconv('BillStatusPaid');
-		    	$labelStatusShort = $langs->transnoentitiesnoconv('Bill'.$prefix.'StatusPaid');
-		    }
+			if ($type == self::TYPE_CREDIT_NOTE) {
+				$labelStatus = $langs->transnoentitiesnoconv('BillStatusPaidBackOrConverted'); // credit note
+				$labelStatusShort = $langs->transnoentitiesnoconv('Bill'.$prefix.'StatusPaidBackOrConverted'); // credit note
+			} elseif ($type == self::TYPE_DEPOSIT) {
+				$labelStatus = $langs->transnoentitiesnoconv('BillStatusConverted'); // deposit invoice
+				$labelStatusShort = $langs->transnoentitiesnoconv('Bill'.$prefix.'StatusConverted'); // deposit invoice
+			} else {
+				$labelStatus = $langs->transnoentitiesnoconv('BillStatusPaid');
+				$labelStatusShort = $langs->transnoentitiesnoconv('Bill'.$prefix.'StatusPaid');
+			}
 		}
 
 		return dolGetStatus($labelStatus, $labelStatusShort, '', $statusType, $mode);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Returns an invoice payment deadline based on the invoice settlement
 	 *  conditions and billing date.
@@ -576,15 +576,15 @@ abstract class CommonInvoice extends CommonObject
 	 *	@param      integer	$cond_reglement   	Condition of payment (code or id) to use. If 0, we use current condition.
 	 *  @return     integer    			       	Date limite de reglement si ok, <0 si ko
 	 */
-    public function calculate_date_lim_reglement($cond_reglement = 0)
+	public function calculate_date_lim_reglement($cond_reglement = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		if (!$cond_reglement) $cond_reglement = $this->cond_reglement_code;
 		if (!$cond_reglement) $cond_reglement = $this->cond_reglement_id;
 
 		$cdr_nbjour = 0;
-        $cdr_type = 0;
-        $cdr_decalage = 0;
+		$cdr_type = 0;
+		$cdr_decalage = 0;
 
 		$sqltemp = 'SELECT c.type_cdr, c.nbjour, c.decalage';
 		$sqltemp .= ' FROM '.MAIN_DB_PREFIX.'c_payment_term as c';
@@ -643,7 +643,7 @@ abstract class CommonInvoice extends CommonObject
 		// 2 : application of the rule, the N of the current or next month
 		elseif ($cdr_type == 2 && !empty($cdr_decalage))
 		{
-		    include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+			include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 			$datelim = $this->date + ($cdr_nbjour * 3600 * 24);
 
 			$date_piece = dol_mktime(0, 0, 0, date('m', $datelim), date('d', $datelim), date('Y', $datelim)); // Sans les heures minutes et secondes
@@ -694,7 +694,7 @@ abstract class CommonInvoice extends CommonObject
 			} else {
 				$sql .= ' WHERE fk_facture = '.$this->id;
 			}
-			$sql .= ' AND ext_payment_id IS NULL';			// To exclude record done for some online payments
+			$sql .= ' AND ext_payment_id IS NULL'; // To exclude record done for some online payments
 			$sql .= ' AND traite = 0';
 
 			dol_syslog(get_class($this)."::demande_prelevement", LOG_DEBUG);
@@ -753,7 +753,7 @@ abstract class CommonInvoice extends CommonObject
 
 					if (!$error) {
 						// Force payment mode of invoice to withdraw
-						$payment_mode_id = dol_getIdFromCode($this->db, 'PRE', 'c_paiement', 'code', 'id', 1);
+						$payment_mode_id = dol_getIdFromCode($this->db, ($type == 'bank-transfer' ? 'VIR' : 'PRE'), 'c_paiement', 'code', 'id', 1);
 						if ($payment_mode_id > 0) {
 							$result = $this->setPaymentMethods($payment_mode_id);
 						}
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 58b36ac3643..2bd32df1f05 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -12,7 +12,7 @@
  * Copyright (C) 2017      ATM Consulting       <support@atm-consulting.fr>
  * Copyright (C) 2017-2019 Nicolas ZABOURI      <info@inovea-conseil.com>
  * Copyright (C) 2017      Rui Strecht		    <rui.strecht@aliartalentos.com>
- * Copyright (C) 2018-2019 Frédéric France      <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2020 Frédéric France      <frederic.france@netlogic.fr>
  * Copyright (C) 2018      Josep Lluís Amador   <joseplluis@lliuretic.cat>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -296,11 +296,11 @@ abstract class CommonObject
 	 */
 	public $cond_reglement_id;
 
-    /**
-     * @var int Transport mode ID (For module intracomm report)
-     * @see setTransportMode()
-     */
-    public $transport_mode_id;
+	/**
+	 * @var int Transport mode ID (For module intracomm report)
+	 * @see setTransportMode()
+	 */
+	public $transport_mode_id;
 
 	/**
 	 * @var int Payment terms ID
@@ -334,6 +334,13 @@ abstract class CommonObject
 	 */
 	public $last_main_doc;
 
+	/**
+	 * @var int Bank account ID
+	 * @deprecated
+	 * @see $fk_account
+	 */
+	public $fk_bank;
+
 	/**
 	 * @var int Bank account ID
 	 * @see SetBankAccount()
@@ -437,6 +444,11 @@ abstract class CommonObject
 
 	public $next_prev_filter;
 
+	/**
+	 * @var int 1 if object is specimen
+	 */
+	public $specimen = 0;
+
 	/**
 	 * @var array	List of child tables. To test if we can delete object.
 	 */
@@ -569,6 +581,28 @@ abstract class CommonObject
 		return dol_trunc($ret, $maxlen);
 	}
 
+	/**
+	 * Set to upper or ucwords/lower if needed
+	 *
+	 * @return void;
+	 */
+	public function setUpperOrLowerCase()
+	{
+		global $conf;
+		if (!empty($conf->global->MAIN_FIRST_TO_UPPER)) {
+			$this->lastname = dol_ucwords(dol_strtolower($this->lastname));
+			$this->firstname = dol_ucwords(dol_strtolower($this->firstname));
+			$this->name = dol_ucwords(dol_strtolower($this->name));
+		}
+		if (!empty($conf->global->MAIN_ALL_TO_UPPER)) {
+			$this->lastname = dol_strtoupper($this->lastname);
+			$this->name = dol_strtoupper($this->name);
+		}
+		if (!empty($conf->global->MAIN_ALL_TOWN_TO_UPPER)) {
+			$this->town = dol_strtoupper($this->town);
+		}
+	}
+
 	/**
 	 *	Return clicable link of object (with eventually picto)
 	 *
@@ -2196,42 +2230,42 @@ abstract class CommonObject
 		}
 	}
 
-    /**
-     *  Change the transport mode methods
-     *
-     *  @param		int		$id		Id of new payment method
-     *  @return		int				>0 if OK, <0 if KO
-     */
-    public function setTransportMode($id)
-    {
-        dol_syslog(get_class($this).'::setTransportMode('.$id.')');
-        if ($this->statut >= 0 || $this->element == 'societe')
-        {
-            $fieldname = 'fk_transport_mode';
-            if ($this->element == 'societe') $fieldname = 'transport_mode';
-            if (get_class($this) == 'Fournisseur') $fieldname = 'transport_mode_supplier';
+	/**
+	 *  Change the transport mode methods
+	 *
+	 *  @param		int		$id		Id of new payment method
+	 *  @return		int				>0 if OK, <0 if KO
+	 */
+	public function setTransportMode($id)
+	{
+		dol_syslog(get_class($this).'::setTransportMode('.$id.')');
+		if ($this->statut >= 0 || $this->element == 'societe')
+		{
+			$fieldname = 'fk_transport_mode';
+			if ($this->element == 'societe') $fieldname = 'transport_mode';
+			if (get_class($this) == 'Fournisseur') $fieldname = 'transport_mode_supplier';
 
-            $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
-            $sql .= ' SET '.$fieldname.' = '.(($id > 0 || $id == '0') ? $id : 'NULL');
-            $sql .= ' WHERE rowid='.$this->id;
+			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
+			$sql .= ' SET '.$fieldname.' = '.(($id > 0 || $id == '0') ? $id : 'NULL');
+			$sql .= ' WHERE rowid='.$this->id;
 
-            if ($this->db->query($sql))
-            {
-                $this->transport_mode_id = $id;
-                // for supplier
-                if (get_class($this) == 'Fournisseur') $this->transport_mode_supplier_id = $id;
-                return 1;
-            } else {
-                dol_syslog(get_class($this).'::setTransportMode Error '.$sql.' - '.$this->db->error());
-                $this->error=$this->db->error();
-                return -1;
-            }
-        } else {
-            dol_syslog(get_class($this).'::setTransportMode, status of the object is incompatible');
-            $this->error='Status of the object is incompatible '.$this->statut;
-            return -2;
-        }
-    }
+			if ($this->db->query($sql))
+			{
+				$this->transport_mode_id = $id;
+				// for supplier
+				if (get_class($this) == 'Fournisseur') $this->transport_mode_supplier_id = $id;
+				return 1;
+			} else {
+				dol_syslog(get_class($this).'::setTransportMode Error '.$sql.' - '.$this->db->error());
+				$this->error = $this->db->error();
+				return -1;
+			}
+		} else {
+			dol_syslog(get_class($this).'::setTransportMode, status of the object is incompatible');
+			$this->error = 'Status of the object is incompatible '.$this->statut;
+			return -2;
+		}
+	}
 
 	/**
 	 *  Change the retained warranty payments terms
@@ -2785,8 +2819,8 @@ abstract class CommonObject
 	 */
 	public function line_max($fk_parent_line = 0)
 	{
-        // phpcs:enable
-        $positionfield = 'rang';
+		// phpcs:enable
+		$positionfield = 'rang';
 		if ($this->table_element == 'bom_bom') $positionfield = 'position';
 
 		// Search the last rang with fk_parent_line
@@ -4975,7 +5009,7 @@ abstract class CommonObject
 			{
 				$value_arr = GETPOST($postfieldkey, 'array'); // check if an array
 				if (!empty($value_arr)) {
-					$value_key = implode($value_arr, ',');
+					$value_key = implode(',', $value_arr);
 				} else {
 					$value_key = '';
 				}
@@ -5328,8 +5362,8 @@ abstract class CommonObject
 								$new_array_options[$key] = '';
 							} elseif ($value) {
 								$object = new $InfoFieldList[0]($this->db);
-								if (is_numeric($value)) $res = $object->fetch($value);	// Common case
-								else $res = $object->fetch('', $value);					// For compatibility
+								if (is_numeric($value)) $res = $object->fetch($value); // Common case
+								else $res = $object->fetch('', $value); // For compatibility
 
 								if ($res > 0) $new_array_options[$key] = $object->id;
 								else {
@@ -5767,7 +5801,7 @@ abstract class CommonObject
 	 *
 	 * @param  array   		$val	       Array of properties for field to show (used only if ->fields not defined)
 	 * @param  string  		$key           Key of attribute
-	 * @param  string  		$value         Preselected value to show (for date type it must be in timestamp format, for amount or price it must be a php numeric value)
+	 * @param  string|array	$value         Preselected value to show (for date type it must be in timestamp format, for amount or price it must be a php numeric value, for array type must be array)
 	 * @param  string  		$moreparam     To add more parameters on html input tag
 	 * @param  string  		$keysuffix     Prefix string to add into name and id of field (can be used to avoid duplicate names)
 	 * @param  string  		$keyprefix     Suffix string to add into name and id of field (can be used to avoid duplicate names)
@@ -6284,7 +6318,8 @@ abstract class CommonObject
 			$param_list = array_keys($param['options']); // $param_list='ObjectName:classPath[:AddCreateButtonOrNot[:Filter]]'
 			$param_list_array = explode(':', $param_list[0]);
 			$showempty = (($required && $default != '') ? 0 : 1);
-			if (!empty($param_list_array[2])) {		// If the entry into $fields is set to add a create button
+
+			if (!preg_match('/search_/', $keyprefix) && !empty($param_list_array[2])) {		// If the entry into $fields is set to add a create button
 				$morecss .= ' widthcentpercentminusx';
 			}
 
@@ -6388,7 +6423,7 @@ abstract class CommonObject
 			$type = 'varchar'; // convert varchar(xx) int varchar
 			$size = $reg[1];
 		} elseif (preg_match('/varchar/', $type)) $type = 'varchar'; // convert varchar(xx) int varchar
-		if (is_array($val['arrayofkeyval'])) $type = 'select';
+		if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) $type = 'select';
 		if (preg_match('/^integer:(.*):(.*)/i', $val['type'], $reg)) $type = 'link';
 
 		$default = $val['default'];
@@ -6398,7 +6433,7 @@ abstract class CommonObject
 		$param = array();
 		$param['options'] = array();
 
-		if (is_array($val['arrayofkeyval'])) $param['options'] = $val['arrayofkeyval'];
+		if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) $param['options'] = $val['arrayofkeyval'];
 		if (preg_match('/^integer:(.*):(.*)/i', $val['type'], $reg))
 		{
 			$type = 'link';
@@ -6787,7 +6822,7 @@ abstract class CommonObject
 
 					switch ($mode) {
 						case "view":
-							$value = $this->array_options["options_".$key.$keysuffix];	// Value may be clean or formated later
+							$value = $this->array_options["options_".$key.$keysuffix]; // Value may be clean or formated later
 							break;
 						case "create":
 						case "edit":
@@ -6862,7 +6897,7 @@ abstract class CommonObject
 							{
 								$datenotinstring = $this->db->jdate($datenotinstring);
 							}
-							$value = (GETPOSTISSET($keyprefix.'options_'.$key.$keysuffix) || $value) ? dol_mktime(GETPOST($keyprefix.'options_'.$key.$keysuffix."hour", 'int', 3), GETPOST($keyprefix.'options_'.$key.$keysuffix."min", 'int', 3), 0, GETPOST($keyprefix.'options_'.$key.$keysuffix."month", 'int', 3), GETPOST($keyprefix.'options_'.$key.$keysuffix."day", 'int', 3), GETPOST($keyprefix.'options_'.$key.$keysuffix."year", 'int', 3)) : $datenotinstring;
+							$value = (GETPOSTISSET($keyprefix.'options_'.$key.$keysuffix)) ? dol_mktime(GETPOST($keyprefix.'options_'.$key.$keysuffix."hour", 'int', 3), GETPOST($keyprefix.'options_'.$key.$keysuffix."min", 'int', 3), 0, GETPOST($keyprefix.'options_'.$key.$keysuffix."month", 'int', 3), GETPOST($keyprefix.'options_'.$key.$keysuffix."day", 'int', 3), GETPOST($keyprefix.'options_'.$key.$keysuffix."year", 'int', 3)) : $datenotinstring;
 						}
 						// Convert float submited string into real php numeric (value in memory must be a php numeric)
 						if (in_array($extrafields->attributes[$this->table_element]['type'][$key], array('price', 'double')))
@@ -8213,8 +8248,11 @@ abstract class CommonObject
 
 		$this->db->begin();
 
+		$statusfield = 'status';
+		if ($this->element == 'don' || $this->element == 'donation') $statusfield = 'fk_statut';
+
 		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
-		$sql .= " SET status = ".$status;
+		$sql .= " SET ".$statusfield." = ".((int) $status);
 		$sql .= " WHERE rowid = ".$this->id;
 
 		if ($this->db->query($sql))
@@ -8250,22 +8288,31 @@ abstract class CommonObject
 	 * Initialise object with example values
 	 * Id must be 0 if object instance is a specimen
 	 *
-	 * @return void
+	 * @return int
 	 */
 	public function initAsSpecimenCommon()
 	{
 		global $user;
 
 		$this->id = 0;
-		if (array_key_exists('label', $this->fields)) $this->label = 'This is label';
-		if (array_key_exists('note_public', $this->fields)) $this->note_public = 'Public note';
-		if (array_key_exists('note_private', $this->fields)) $this->note_private = 'Private note';
-		if (array_key_exists('date_creation', $this->fields)) $this->date_creation = (dol_now() - 3600 * 24);
-		if (array_key_exists('date_modification', $this->fields)) $this->date_modification = (dol_now() - 3600 * 24);
-		if (array_key_exists('fk_user_creat', $this->fields)) $this->fk_user_creat = $user->id;
-		if (array_key_exists('fk_user_modif', $this->fields)) $this->fk_user_modif = $user->id;
-		if (array_key_exists('date', $this->fields)) $this->date = dol_now();
-		// ...
+		$this->specimen = 1;
+		$fields = array(
+			'label' => 'This is label',
+			'ref' => 'ABCD1234',
+			'description' => 'This is a description',
+			'qty' => 123.12,
+			'note_public' => 'Public note',
+			'note_private' => 'Private note',
+			'date_creation' => (dol_now() - 3600 * 48),
+			'date_modification' => (dol_now() - 3600 * 24),
+			'fk_user_creat' => $user->id,
+			'fk_user_modif' => $user->id,
+			'date' => dol_now(),
+		);
+		foreach ($fields as $key => $value) {
+			if (array_key_exists($key, $this->fields)) $this->{$key} = $value;
+		}
+		return 1;
 	}
 
 
@@ -8440,7 +8487,7 @@ abstract class CommonObject
 
 		$this->db->begin();
 
-		switch ($this->element){
+		switch ($this->element) {
 			case 'propal':
 				$element = 'propale';
 				break;
@@ -8448,10 +8495,10 @@ abstract class CommonObject
 				$element = 'produit';
 				break;
 			case 'order_supplier':
-				$element ='fournisseur/commande';
+				$element = 'fournisseur/commande';
 				break;
 			case 'invoice_supplier':
-				$element = 'fournisseur/facture/' . get_exdir($this->id, 2, 0, 1, $this, 'invoice_supplier');
+				$element = 'fournisseur/facture/'.get_exdir($this->id, 2, 0, 1, $this, 'invoice_supplier');
 				break;
 			case 'shipping':
 				$element = 'expedition/sending';
@@ -8461,8 +8508,8 @@ abstract class CommonObject
 		}
 
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."ecm_files";
-		$sql.= " WHERE filename LIKE '".$this->db->escape($this->ref)."%'";
-		$sql.= " AND filepath = '".$this->db->escape($element)."/".$this->db->escape($this->ref)."' AND entity = ".$conf->entity;
+		$sql .= " WHERE filename LIKE '".$this->db->escape($this->ref)."%'";
+		$sql .= " AND filepath = '".$this->db->escape($element)."/".$this->db->escape($this->ref)."' AND entity = ".$conf->entity;
 
 		if (!$this->db->query($sql)) {
 			$this->error = $this->db->lasterror();
diff --git a/htdocs/core/class/commonorder.class.php b/htdocs/core/class/commonorder.class.php
index 8874175a138..e7c40d60bfd 100644
--- a/htdocs/core/class/commonorder.class.php
+++ b/htdocs/core/class/commonorder.class.php
@@ -89,7 +89,7 @@ abstract class CommonOrderLine extends CommonObjectLine
 	 * @deprecated
 	 * @see $subprice
 	 */
-    public $price;
+	public $price;
 
 	/**
 	 * Unit price before taxes
diff --git a/htdocs/core/class/commonstickergenerator.class.php b/htdocs/core/class/commonstickergenerator.class.php
index c3d6e7de299..3a8712ad67d 100644
--- a/htdocs/core/class/commonstickergenerator.class.php
+++ b/htdocs/core/class/commonstickergenerator.class.php
@@ -61,46 +61,46 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/format_cards.lib.php';
  */
 abstract class CommonStickerGenerator
 {
-    public $code; // Code of format
+	public $code; // Code of format
 
-    /**
-     * @var array format Array with informations
-     */
-    public $format;
+	/**
+	 * @var array format Array with informations
+	 */
+	public $format;
 
-    // phpcs:disable PEAR.NamingConventions.ValidVariableName.PublicUnderscore
-    // protected
-    // Nom du format de l'etiquette
-    protected $_Avery_Name = '';
-    // Marge de gauche de l'etiquette
-    protected $_Margin_Left = 0;
-    // marge en haut de la page avant la premiere etiquette
-    protected $_Margin_Top = 0;
-    // Espace horizontal entre 2 bandes d'etiquettes
-    protected $_X_Space = 0;
-    // Espace vertical entre 2 bandes d'etiquettes
-    protected $_Y_Space = 0;
-    // NX Nombre d'etiquettes sur la largeur de la page
-    protected $_X_Number = 0;
-    // NY Nombre d'etiquettes sur la hauteur de la page
-    protected $_Y_Number = 0;
-    // Largeur de chaque etiquette
-    protected $_Width = 0;
-    // Hauteur de chaque etiquette
-    protected $_Height = 0;
-    // Hauteur des caracteres
-    protected $_Char_Size = 10;
-    // Hauteur par defaut d'une ligne
-    protected $_Line_Height = 10;
-    // Type of metric.. Will help to calculate good values
-    protected $_Metric = 'mm';
-    // Type of metric for the doc..
-    protected $_Metric_Doc = 'mm';
-    protected $_COUNTX = 1;
-    protected $_COUNTY = 1;
-    protected $_First = 1;
-    public $Tformat;
-    // phpcs:enable
+	// phpcs:disable PEAR.NamingConventions.ValidVariableName.PublicUnderscore
+	// protected
+	// Nom du format de l'etiquette
+	protected $_Avery_Name = '';
+	// Marge de gauche de l'etiquette
+	protected $_Margin_Left = 0;
+	// marge en haut de la page avant la premiere etiquette
+	protected $_Margin_Top = 0;
+	// Espace horizontal entre 2 bandes d'etiquettes
+	protected $_X_Space = 0;
+	// Espace vertical entre 2 bandes d'etiquettes
+	protected $_Y_Space = 0;
+	// NX Nombre d'etiquettes sur la largeur de la page
+	protected $_X_Number = 0;
+	// NY Nombre d'etiquettes sur la hauteur de la page
+	protected $_Y_Number = 0;
+	// Largeur de chaque etiquette
+	protected $_Width = 0;
+	// Hauteur de chaque etiquette
+	protected $_Height = 0;
+	// Hauteur des caracteres
+	protected $_Char_Size = 10;
+	// Hauteur par defaut d'une ligne
+	protected $_Line_Height = 10;
+	// Type of metric.. Will help to calculate good values
+	protected $_Metric = 'mm';
+	// Type of metric for the doc..
+	protected $_Metric_Doc = 'mm';
+	protected $_COUNTX = 1;
+	protected $_COUNTY = 1;
+	protected $_First = 1;
+	public $Tformat;
+	// phpcs:enable
 	/**
 	 *	Constructor
 	 *
@@ -111,7 +111,7 @@ abstract class CommonStickerGenerator
 		$this->db = $db;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Function to build PDF on disk, then output on HTTP strem.
 	 *
@@ -122,7 +122,7 @@ abstract class CommonStickerGenerator
 	 *  @return int             				1=OK, 0=KO
 	 */
 	public abstract function write_file($arrayofrecords, $outputlangs, $srctemplatepath, $outputdir = '');
-    // phpcs:enable
+	// phpcs:enable
 
 	/**
 	 * Output a sticker on page at position _COUNTX, _COUNTY (_COUNTX and _COUNTY start from 0)
@@ -134,7 +134,7 @@ abstract class CommonStickerGenerator
 	 */
 	public abstract function addSticker(&$pdf, $outputlangs, $param);
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Methode qui permet de modifier la taille des caracteres
 	 * Cela modiera aussi l'espace entre chaque ligne
@@ -145,7 +145,7 @@ abstract class CommonStickerGenerator
 	 */
 	public function Set_Char_Size(&$pdf, $pt)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		if ($pt > 3) {
 			$this->_Char_Size = $pt;
 			$this->_Line_Height = $this->_Get_Height_Chars($pt);
@@ -153,8 +153,8 @@ abstract class CommonStickerGenerator
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * protected Print dot line
 	 *
@@ -167,9 +167,9 @@ abstract class CommonStickerGenerator
 	 * @param 	int		$nbPointilles		Nb pointilles
 	 * @return	void
 	 */
-    protected function _Pointille(&$pdf, $x1 = 0, $y1 = 0, $x2 = 210, $y2 = 297, $epaisseur = 1, $nbPointilles = 15)
-    {
-        // phpcs:enable
+	protected function _Pointille(&$pdf, $x1 = 0, $y1 = 0, $x2 = 210, $y2 = 297, $epaisseur = 1, $nbPointilles = 15)
+	{
+		// phpcs:enable
 		$pdf->SetLineWidth($epaisseur);
 		$length = abs($x1 - $x2);
 		$hauteur = abs($y1 - $y2);
@@ -181,23 +181,23 @@ abstract class CommonStickerGenerator
 		for ($i = $x1; $i <= $x2; $i += $Pointilles + $Pointilles) {
 			for ($j = $i; $j <= ($i + $Pointilles); $j++) {
 				if ($j <= ($x2 - 1)) {
-		            $pdf->Line($j, $y1, $j + 1, $y1); // on trace le pointill? du haut, point par point
-		            $pdf->Line($j, $y2, $j + 1, $y2); // on trace le pointill? du bas, point par point
+					$pdf->Line($j, $y1, $j + 1, $y1); // on trace le pointill? du haut, point par point
+					$pdf->Line($j, $y2, $j + 1, $y2); // on trace le pointill? du bas, point par point
 				}
 			}
 		}
 		for ($i = $y1; $i <= $y2; $i += $Pointilles + $Pointilles) {
 			for ($j = $i; $j <= ($i + $Pointilles); $j++) {
 				if ($j <= ($y2 - 1)) {
-		            $pdf->Line($x1, $j, $x1, $j + 1); // on trace le pointill? du haut, point par point
-		            $pdf->Line($x2, $j, $x2, $j + 1); // on trace le pointill? du bas, point par point
+					$pdf->Line($x1, $j, $x1, $j + 1); // on trace le pointill? du haut, point par point
+					$pdf->Line($x2, $j, $x2, $j + 1); // on trace le pointill? du bas, point par point
 				}
 			}
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 * protected Function realisant une croix aux 4 coins des cartes
 	 *
@@ -212,7 +212,7 @@ abstract class CommonStickerGenerator
 	 */
 	protected function _Croix(&$pdf, $x1 = 0, $y1 = 0, $x2 = 210, $y2 = 297, $epaisseur = 1, $taille = 4)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$pdf->SetDrawColor(192, 192, 192);
 
 		$pdf->SetLineWidth($epaisseur);
@@ -255,8 +255,8 @@ abstract class CommonStickerGenerator
 		return $value;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 * protected Give the height for a char size given.
 	 *
@@ -265,7 +265,7 @@ abstract class CommonStickerGenerator
 	 */
 	protected function _Get_Height_Chars($pt)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		// Array for link between height of characters and space between lines
 		$_Table_Hauteur_Chars = array(6=>2, 7=>2.5, 8=>3, 9=>3.5, 10=>4, 11=>6, 12=>7, 13=>8, 14=>9, 15=>10);
 		if (in_array($pt, array_keys($_Table_Hauteur_Chars))) {
@@ -275,8 +275,8 @@ abstract class CommonStickerGenerator
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 * protected Set format
 	 *
@@ -286,7 +286,7 @@ abstract class CommonStickerGenerator
 	 */
 	protected function _Set_Format(&$pdf, $format)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$this->_Metric = $format['metric'];
 		$this->_Avery_Name = $format['name'];
 		$this->_Avery_Code = $format['code'];
diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index d87174c5636..5bb441ceb0a 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -32,61 +32,61 @@
  */
 class Conf
 {
-    /** \public */
-    //! To store properties found in conf file
-    public $file;
+	/** \public */
+	//! To store properties found in conf file
+	public $file;
 
-    /**
-     * @var Object 	Associative array with some properties ->type, ->db, ...
-     */
-    public $db;
+	/**
+	 * @var Object 	Associative array with some properties ->type, ->db, ...
+	 */
+	public $db;
 
-    //! To store properties found into database
-    public $global;
-    //! To store browser info
-    public $browser;
+	//! To store properties found into database
+	public $global;
+	//! To store browser info
+	public $browser;
 
-    //! To store if javascript/ajax is enabked
-    public $use_javascript_ajax;
-    //! To store if javascript/ajax is enabked
-    public $disable_compute;
+	//! To store if javascript/ajax is enabked
+	public $use_javascript_ajax;
+	//! To store if javascript/ajax is enabked
+	public $disable_compute;
 	//! Used to store current currency (ISO code like 'USD', 'EUR', ...)
 	public $currency;
 	//! Used to store current css (from theme)
 	public $theme; // Contains current theme ("eldy", "auguria", ...)
 	public $css; // Contains full path of css page ("/theme/eldy/style.css.php", ...)
-    //! Used to store current menu handler
+	//! Used to store current menu handler
 	public $standard_menu;
-    // List of activated modules
-    public $modules = array();
-    public $modules_parts = array(
-        'css' => array(),
-        'js' => array(),
-        'tabs' => array(),
-        'triggers' => array(),
-        'login' => array(),
-        'substitutions' => array(),
-        'menus' => array(),
-        'theme' => array(),
-        'sms' => array(),
-        'tpl' => array(),
-        'barcode' => array(),
-        'models' => array(),
-        'societe' => array(),
-        'hooks' => array(),
-        'dir' => array(),
-        'syslog' => array(),
-    );
+	// List of activated modules
+	public $modules = array();
+	public $modules_parts = array(
+		'css' => array(),
+		'js' => array(),
+		'tabs' => array(),
+		'triggers' => array(),
+		'login' => array(),
+		'substitutions' => array(),
+		'menus' => array(),
+		'theme' => array(),
+		'sms' => array(),
+		'tpl' => array(),
+		'barcode' => array(),
+		'models' => array(),
+		'societe' => array(),
+		'hooks' => array(),
+		'dir' => array(),
+		'syslog' => array(),
+	);
 
-    public $logbuffer = array();
+	public $logbuffer = array();
 
-    /**
-     * @var LogHandlerInterface[]
-     */
-    public $loghandlers = array();
+	/**
+	 * @var LogHandlerInterface[]
+	 */
+	public $loghandlers = array();
 
-    //! To store properties of multi-company
-    public $multicompany;
+	//! To store properties of multi-company
+	public $multicompany;
 	//! Used to store running instance for multi-company (default 1)
 	public $entity = 1;
 	//! Used to store list of entities to use for each element
@@ -212,7 +212,7 @@ class Conf
 							elseif ($value == 1) $value = '/'.$modulename.'/core/modules/'.$partname.'/'; // ex: partname = societe
 							$this->modules_parts[$partname] = array_merge($this->modules_parts[$partname], array($modulename => $value)); // $value may be a string or an array
 						}
-                        // If this is a module constant (must be at end)
+						// If this is a module constant (must be at end)
 						elseif (preg_match('/^MAIN_MODULE_([0-9A-Z_]+)$/i', $key, $reg))
 						{
 							$modulename = strtolower($reg[1]);
@@ -227,20 +227,20 @@ class Conf
 				$i++;
 			}
 
-            $db->free($resql);
-        }
+			$db->free($resql);
+		}
 
-        // Include other local consts.php files and fetch their values to the corresponding database constants.
-        if (!empty($this->global->LOCAL_CONSTS_FILES)) {
-            $filesList = explode(":", $this->global->LOCAL_CONSTS_FILES);
-            foreach ($filesList as $file) {
-                $file = dol_sanitizeFileName($file);
-                dol_include_once($file."/".$file."_consts.php"); // This file can run code like setting $this->global->XXX vars.
-            }
-        }
+		// Include other local consts.php files and fetch their values to the corresponding database constants.
+		if (!empty($this->global->LOCAL_CONSTS_FILES)) {
+			$filesList = explode(":", $this->global->LOCAL_CONSTS_FILES);
+			foreach ($filesList as $file) {
+				$file = dol_sanitizeFileName($file);
+				dol_include_once($file."/".$file."_consts.php"); // This file can run code like setting $this->global->XXX vars.
+			}
+		}
 
-        //var_dump($this->modules);
-        //var_dump($this->modules_parts['theme']);
+		//var_dump($this->modules);
+		//var_dump($this->modules_parts['theme']);
 
 		// If you can't set timezone of your PHP, set this constant. Better is to set it to UTC.
 		// In future, this constant will be forced to 'UTC' so PHP server timezone will not have effect anymore.
@@ -296,7 +296,7 @@ class Conf
 		// Define default dir_output and dir_temp for directories of modules
 		foreach ($this->modules as $module)
 		{
-		    //var_dump($module);
+			//var_dump($module);
 			// For multicompany sharings
 			$this->$module->multidir_output = array($this->entity => $rootfordata."/".$module);
 			$this->$module->multidir_temp = array($this->entity => $rootfortemp."/".$module."/temp");
@@ -450,7 +450,7 @@ class Conf
 
 		// Set some default values
 		//$this->global->MAIN_LIST_FILTER_ON_DAY=1;		// On filter that show date, we must show input field for day before or after month
-        $this->global->MAIN_MAIL_USE_MULTI_PART = 1;
+		$this->global->MAIN_MAIL_USE_MULTI_PART = 1;
 
 		// societe
 		if (empty($this->global->SOCIETE_CODECLIENT_ADDON))		$this->global->SOCIETE_CODECLIENT_ADDON = "mod_codeclient_leopard";
@@ -459,9 +459,9 @@ class Conf
 		if (empty($this->global->CHEQUERECEIPTS_ADDON))			$this->global->CHEQUERECEIPTS_ADDON = 'mod_chequereceipt_mint';
 		if (empty($this->global->TICKET_ADDON))				    $this->global->TICKET_ADDON = 'mod_ticket_simple';
 
-        // Security
+		// Security
 		if (empty($this->global->USER_PASSWORD_GENERATED)) $this->global->USER_PASSWORD_GENERATED = 'standard'; // Default password generator
-        if (empty($this->global->MAIN_UMASK)) $this->global->MAIN_UMASK = '0664'; // Default mask
+		if (empty($this->global->MAIN_UMASK)) $this->global->MAIN_UMASK = '0664'; // Default mask
 
 		// conf->use_javascript_ajax
 		$this->use_javascript_ajax = 1;
@@ -499,16 +499,16 @@ class Conf
 		if (empty($this->global->MAIN_BROWSER_NOTIFICATION_FREQUENCY)) $this->global->MAIN_BROWSER_NOTIFICATION_FREQUENCY = 30; // Less than 1 minutes to be sure
 
 		// conf->global->ACCOUNTING_MODE = Option des modules Comptabilites (simple ou expert). Defini le mode de calcul des etats comptables (CA,...)
-        if (empty($this->global->ACCOUNTING_MODE)) $this->global->ACCOUNTING_MODE = 'RECETTES-DEPENSES'; // By default. Can be 'RECETTES-DEPENSES' ou 'CREANCES-DETTES'
+		if (empty($this->global->ACCOUNTING_MODE)) $this->global->ACCOUNTING_MODE = 'RECETTES-DEPENSES'; // By default. Can be 'RECETTES-DEPENSES' ou 'CREANCES-DETTES'
 
-        // By default, suppliers objects can be linked to all projects
-        if (!isset($this->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS)) $this->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS = 1;
+		// By default, suppliers objects can be linked to all projects
+		if (!isset($this->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS)) $this->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS = 1;
 
-        // By default we enable feature to bill time spent
-        if (!isset($this->global->PROJECT_BILL_TIME_SPENT)) $this->global->PROJECT_BILL_TIME_SPENT = 1;
+		// By default we enable feature to bill time spent
+		if (!isset($this->global->PROJECT_BILL_TIME_SPENT)) $this->global->PROJECT_BILL_TIME_SPENT = 1;
 
-        // MAIN_HTML_TITLE
-        if (!isset($this->global->MAIN_HTML_TITLE)) $this->global->MAIN_HTML_TITLE = 'noapp,thirdpartynameonly,contactnameonly,projectnameonly';
+		// MAIN_HTML_TITLE
+		if (!isset($this->global->MAIN_HTML_TITLE)) $this->global->MAIN_HTML_TITLE = 'noapp,thirdpartynameonly,contactnameonly,projectnameonly';
 
 		// conf->liste_limit = constante de taille maximale des listes
 		if (empty($this->global->MAIN_SIZE_LISTE_LIMIT)) $this->global->MAIN_SIZE_LISTE_LIMIT = 25;
@@ -520,7 +520,7 @@ class Conf
 
 		// conf->theme et $this->css
 		if (empty($this->global->MAIN_THEME)) $this->global->MAIN_THEME = "eldy";
-        if (!empty($this->global->MAIN_FORCETHEME)) $this->global->MAIN_THEME = $this->global->MAIN_FORCETHEME;
+		if (!empty($this->global->MAIN_FORCETHEME)) $this->global->MAIN_THEME = $this->global->MAIN_FORCETHEME;
 		$this->theme = $this->global->MAIN_THEME;
 		$this->css = "/theme/".$this->theme."/style.css.php";
 
@@ -537,20 +537,20 @@ class Conf
 		if (!empty($this->global->MAILING_EMAIL_FROM))	$this->mailing->email_from = $this->global->MAILING_EMAIL_FROM;
 		if (!isset($this->global->MAIN_EMAIL_ADD_TRACK_ID)) $this->global->MAIN_EMAIL_ADD_TRACK_ID = 1;
 
-        // Format for date (used by default when not found or not searched in lang)
-        $this->format_date_short = "%d/%m/%Y"; // Format of day with PHP/C tags (strftime functions)
-        $this->format_date_short_java = "dd/MM/yyyy"; // Format of day with Java tags
-        $this->format_hour_short = "%H:%M";
-        $this->format_hour_short_duration = "%H:%M";
-        $this->format_date_text_short = "%d %b %Y";
-        $this->format_date_text = "%d %B %Y";
-        $this->format_date_hour_short = "%d/%m/%Y %H:%M";
-        $this->format_date_hour_sec_short = "%d/%m/%Y %H:%M:%S";
-        $this->format_date_hour_text_short = "%d %b %Y %H:%M";
-        $this->format_date_hour_text = "%d %B %Y %H:%M";
+		// Format for date (used by default when not found or not searched in lang)
+		$this->format_date_short = "%d/%m/%Y"; // Format of day with PHP/C tags (strftime functions)
+		$this->format_date_short_java = "dd/MM/yyyy"; // Format of day with Java tags
+		$this->format_hour_short = "%H:%M";
+		$this->format_hour_short_duration = "%H:%M";
+		$this->format_date_text_short = "%d %b %Y";
+		$this->format_date_text = "%d %B %Y";
+		$this->format_date_hour_short = "%d/%m/%Y %H:%M";
+		$this->format_date_hour_sec_short = "%d/%m/%Y %H:%M:%S";
+		$this->format_date_hour_text_short = "%d %b %Y %H:%M";
+		$this->format_date_hour_text = "%d %B %Y %H:%M";
 
-        // Duration of workday
-        if (!isset($this->global->MAIN_DURATION_OF_WORKDAY)) $this->global->MAIN_DURATION_OF_WORKDAY = 86400;
+		// Duration of workday
+		if (!isset($this->global->MAIN_DURATION_OF_WORKDAY)) $this->global->MAIN_DURATION_OF_WORKDAY = 86400;
 
 		// Limites decimales si non definie (peuvent etre egale a 0)
 		if (!isset($this->global->MAIN_MAX_DECIMALS_UNIT))  $this->global->MAIN_MAX_DECIMALS_UNIT = 5;
@@ -590,76 +590,76 @@ class Conf
 		if (empty($this->global->MAIN_USE_JQUERY_MULTISELECT) || $this->global->MAIN_USE_JQUERY_MULTISELECT == '1') $this->global->MAIN_USE_JQUERY_MULTISELECT = 'select2';
 
 		// Timeouts
-        if (empty($this->global->MAIN_USE_CONNECT_TIMEOUT)) $this->global->MAIN_USE_CONNECT_TIMEOUT = 10;
-        if (empty($this->global->MAIN_USE_RESPONSE_TIMEOUT)) $this->global->MAIN_USE_RESPONSE_TIMEOUT = 30;
+		if (empty($this->global->MAIN_USE_CONNECT_TIMEOUT)) $this->global->MAIN_USE_CONNECT_TIMEOUT = 10;
+		if (empty($this->global->MAIN_USE_RESPONSE_TIMEOUT)) $this->global->MAIN_USE_RESPONSE_TIMEOUT = 30;
 
 		// Set default variable to calculate VAT as if option tax_mode was 0 (standard)
-        if (empty($this->global->TAX_MODE_SELL_PRODUCT)) $this->global->TAX_MODE_SELL_PRODUCT = 'invoice';
-        if (empty($this->global->TAX_MODE_BUY_PRODUCT))  $this->global->TAX_MODE_BUY_PRODUCT = 'invoice';
-        if (empty($this->global->TAX_MODE_SELL_SERVICE)) $this->global->TAX_MODE_SELL_SERVICE = 'payment';
-        if (empty($this->global->TAX_MODE_BUY_SERVICE))  $this->global->TAX_MODE_BUY_SERVICE = 'payment';
+		if (empty($this->global->TAX_MODE_SELL_PRODUCT)) $this->global->TAX_MODE_SELL_PRODUCT = 'invoice';
+		if (empty($this->global->TAX_MODE_BUY_PRODUCT))  $this->global->TAX_MODE_BUY_PRODUCT = 'invoice';
+		if (empty($this->global->TAX_MODE_SELL_SERVICE)) $this->global->TAX_MODE_SELL_SERVICE = 'payment';
+		if (empty($this->global->TAX_MODE_BUY_SERVICE))  $this->global->TAX_MODE_BUY_SERVICE = 'payment';
 
 		// Delay before warnings
 		// Avoid strict errors. TODO: Replace xxx->warning_delay with a property ->warning_delay_xxx
 		if (isset($this->agenda)) {
-		    $this->adherent->subscription = new stdClass();
-            $this->adherent->subscription->warning_delay = (isset($this->global->MAIN_DELAY_MEMBERS) ? $this->global->MAIN_DELAY_MEMBERS : 0) * 86400;
+			$this->adherent->subscription = new stdClass();
+			$this->adherent->subscription->warning_delay = (isset($this->global->MAIN_DELAY_MEMBERS) ? $this->global->MAIN_DELAY_MEMBERS : 0) * 86400;
 		}
 		if (isset($this->agenda)) {
 			$this->agenda->warning_delay = (isset($this->global->MAIN_DELAY_ACTIONS_TODO) ? $this->global->MAIN_DELAY_ACTIONS_TODO : 7) * 86400;
-        }
+		}
 		if (isset($this->projet))
 		{
 			$this->projet->warning_delay = (isset($this->global->MAIN_DELAY_PROJECT_TO_CLOSE) ? $this->global->MAIN_DELAY_PROJECT_TO_CLOSE : 7) * 86400;
-		    $this->projet->task = new StdClass();
-		    $this->projet->task->warning_delay = (isset($this->global->MAIN_DELAY_TASKS_TODO) ? $this->global->MAIN_DELAY_TASKS_TODO : 7) * 86400;
+			$this->projet->task = new StdClass();
+			$this->projet->task->warning_delay = (isset($this->global->MAIN_DELAY_TASKS_TODO) ? $this->global->MAIN_DELAY_TASKS_TODO : 7) * 86400;
 		}
 
-        if (isset($this->commande)) {
-            $this->commande->client = new stdClass();
-    		$this->commande->fournisseur = new stdClass();
-    		$this->commande->client->warning_delay = (isset($this->global->MAIN_DELAY_ORDERS_TO_PROCESS) ? $this->global->MAIN_DELAY_ORDERS_TO_PROCESS : 2) * 86400;
-    		$this->commande->fournisseur->warning_delay = (isset($this->global->MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS) ? $this->global->MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS : 7) * 86400;
+		if (isset($this->commande)) {
+			$this->commande->client = new stdClass();
+			$this->commande->fournisseur = new stdClass();
+			$this->commande->client->warning_delay = (isset($this->global->MAIN_DELAY_ORDERS_TO_PROCESS) ? $this->global->MAIN_DELAY_ORDERS_TO_PROCESS : 2) * 86400;
+			$this->commande->fournisseur->warning_delay = (isset($this->global->MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS) ? $this->global->MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS : 7) * 86400;
 		}
 		if (isset($this->propal)) {
-		    $this->propal->cloture = new stdClass();
-    		$this->propal->facturation = new stdClass();
-    		$this->propal->cloture->warning_delay = (isset($this->global->MAIN_DELAY_PROPALS_TO_CLOSE) ? $this->global->MAIN_DELAY_PROPALS_TO_CLOSE : 0) * 86400;
-    		$this->propal->facturation->warning_delay = (isset($this->global->MAIN_DELAY_PROPALS_TO_BILL) ? $this->global->MAIN_DELAY_PROPALS_TO_BILL : 0) * 86400;
+			$this->propal->cloture = new stdClass();
+			$this->propal->facturation = new stdClass();
+			$this->propal->cloture->warning_delay = (isset($this->global->MAIN_DELAY_PROPALS_TO_CLOSE) ? $this->global->MAIN_DELAY_PROPALS_TO_CLOSE : 0) * 86400;
+			$this->propal->facturation->warning_delay = (isset($this->global->MAIN_DELAY_PROPALS_TO_BILL) ? $this->global->MAIN_DELAY_PROPALS_TO_BILL : 0) * 86400;
 		}
 		if (isset($this->facture)) {
-		    $this->facture->client = new stdClass();
-    		$this->facture->fournisseur = new stdClass();
-    		$this->facture->client->warning_delay = (isset($this->global->MAIN_DELAY_CUSTOMER_BILLS_UNPAYED) ? $this->global->MAIN_DELAY_CUSTOMER_BILLS_UNPAYED : 0) * 86400;
-    		$this->facture->fournisseur->warning_delay = (isset($this->global->MAIN_DELAY_SUPPLIER_BILLS_TO_PAY) ? $this->global->MAIN_DELAY_SUPPLIER_BILLS_TO_PAY : 0) * 86400;
+			$this->facture->client = new stdClass();
+			$this->facture->fournisseur = new stdClass();
+			$this->facture->client->warning_delay = (isset($this->global->MAIN_DELAY_CUSTOMER_BILLS_UNPAYED) ? $this->global->MAIN_DELAY_CUSTOMER_BILLS_UNPAYED : 0) * 86400;
+			$this->facture->fournisseur->warning_delay = (isset($this->global->MAIN_DELAY_SUPPLIER_BILLS_TO_PAY) ? $this->global->MAIN_DELAY_SUPPLIER_BILLS_TO_PAY : 0) * 86400;
 		}
 		if (isset($this->contrat)) {
-		    $this->contrat->services = new stdClass();
-    		$this->contrat->services->inactifs = new stdClass();
-	   	    $this->contrat->services->expires = new stdClass();
-	   	    $this->contrat->services->inactifs->warning_delay = (isset($this->global->MAIN_DELAY_NOT_ACTIVATED_SERVICES) ? $this->global->MAIN_DELAY_NOT_ACTIVATED_SERVICES : 0) * 86400;
-	   	    $this->contrat->services->expires->warning_delay = (isset($this->global->MAIN_DELAY_RUNNING_SERVICES) ? $this->global->MAIN_DELAY_RUNNING_SERVICES : 0) * 86400;
+			$this->contrat->services = new stdClass();
+			$this->contrat->services->inactifs = new stdClass();
+	   		$this->contrat->services->expires = new stdClass();
+	   		$this->contrat->services->inactifs->warning_delay = (isset($this->global->MAIN_DELAY_NOT_ACTIVATED_SERVICES) ? $this->global->MAIN_DELAY_NOT_ACTIVATED_SERVICES : 0) * 86400;
+	   		$this->contrat->services->expires->warning_delay = (isset($this->global->MAIN_DELAY_RUNNING_SERVICES) ? $this->global->MAIN_DELAY_RUNNING_SERVICES : 0) * 86400;
 		}
 		if (isset($this->commande)) {
-		    $this->bank->rappro					= new stdClass();
-    		$this->bank->cheque					= new stdClass();
-    		$this->bank->rappro->warning_delay = (isset($this->global->MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE) ? $this->global->MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE : 0) * 86400;
-    		$this->bank->cheque->warning_delay = (isset($this->global->MAIN_DELAY_CHEQUES_TO_DEPOSIT) ? $this->global->MAIN_DELAY_CHEQUES_TO_DEPOSIT : 0) * 86400;
+			$this->bank->rappro					= new stdClass();
+			$this->bank->cheque					= new stdClass();
+			$this->bank->rappro->warning_delay = (isset($this->global->MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE) ? $this->global->MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE : 0) * 86400;
+			$this->bank->cheque->warning_delay = (isset($this->global->MAIN_DELAY_CHEQUES_TO_DEPOSIT) ? $this->global->MAIN_DELAY_CHEQUES_TO_DEPOSIT : 0) * 86400;
 		}
 		if (isset($this->expensereport)) {
-		    $this->expensereport->approve = new stdClass();
-		    $this->expensereport->approve->warning_delay = (isset($this->global->MAIN_DELAY_EXPENSEREPORTS) ? $this->global->MAIN_DELAY_EXPENSEREPORTS : 0) * 86400;
-		    $this->expensereport->payment = new stdClass();
-		    $this->expensereport->payment->warning_delay = (isset($this->global->MAIN_DELAY_EXPENSEREPORTS_TO_PAY) ? $this->global->MAIN_DELAY_EXPENSEREPORTS_TO_PAY : 0) * 86400;
+			$this->expensereport->approve = new stdClass();
+			$this->expensereport->approve->warning_delay = (isset($this->global->MAIN_DELAY_EXPENSEREPORTS) ? $this->global->MAIN_DELAY_EXPENSEREPORTS : 0) * 86400;
+			$this->expensereport->payment = new stdClass();
+			$this->expensereport->payment->warning_delay = (isset($this->global->MAIN_DELAY_EXPENSEREPORTS_TO_PAY) ? $this->global->MAIN_DELAY_EXPENSEREPORTS_TO_PAY : 0) * 86400;
+		}
+		if (isset($this->holiday)) {
+			$this->holiday->approve = new stdClass();
+			$this->holiday->approve->warning_delay = (isset($this->global->MAIN_DELAY_HOLIDAYS) ? $this->global->MAIN_DELAY_HOLIDAYS : 0) * 86400;
 		}
-        if (isset($this->holiday)) {
-            $this->holiday->approve = new stdClass();
-            $this->holiday->approve->warning_delay = (isset($this->global->MAIN_DELAY_HOLIDAYS) ? $this->global->MAIN_DELAY_HOLIDAYS : 0) * 86400;
-        }
 
 		if (!empty($this->global->PRODUIT_MULTIPRICES) && empty($this->global->PRODUIT_MULTIPRICES_LIMIT))
 		{
-		    $this->global->PRODUIT_MULTIPRICES_LIMIT = 5;
+			$this->global->PRODUIT_MULTIPRICES_LIMIT = 5;
 		}
 
 		// For modules that want to disable top or left menu
@@ -695,13 +695,13 @@ class Conf
 		if (isset($this->categorie)) $this->category = $this->categorie;
 		if (isset($this->project))   $this->project = $this->projet;
 
-        // Object $mc
-        if (!defined('NOREQUIREMC') && !empty($this->multicompany->enabled))
-        {
-        	if (is_object($mc)) $mc->setValues($this);
-        }
+		// Object $mc
+		if (!defined('NOREQUIREMC') && !empty($this->multicompany->enabled))
+		{
+			if (is_object($mc)) $mc->setValues($this);
+		}
 
-        if (!empty($this->syslog->enabled)) {
+		if (!empty($this->syslog->enabled)) {
 			// We init log handlers
 			if (!empty($this->global->SYSLOG_HANDLERS)) {
 				$handlers = json_decode($this->global->SYSLOG_HANDLERS);
@@ -737,6 +737,8 @@ class Conf
 					$this->loghandlers[$handler] = $loghandlerinstance;
 				}
 			}
-        }
+		}
+
+		return 0;
 	}
 }
diff --git a/htdocs/core/class/cproductnature.class.php b/htdocs/core/class/cproductnature.class.php
index 9e79093b12b..eb16cff53ea 100644
--- a/htdocs/core/class/cproductnature.class.php
+++ b/htdocs/core/class/cproductnature.class.php
@@ -29,9 +29,9 @@
 class CProductNature // extends CommonObject
 {
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
 	/**
 	 * @var string Error code (or message)
@@ -48,67 +48,67 @@ class CProductNature // extends CommonObject
 	 */
 	public $records = array();
 
-    /**
-     * @var string element
-     */
-	public $element='cproductnbature';
+	/**
+	 * @var string element
+	 */
+	public $element = 'cproductnbature';
 
-    /**
-     * @var string table element
-     */
-	public $table_element='c_product_nature';
+	/**
+	 * @var string table element
+	 */
+	public $table_element = 'c_product_nature';
 
-    /**
+	/**
 	 * @var int ID
 	 */
 	public $id;
 
-    /**
-     * @var int code
-     */
+	/**
+	 * @var int code
+	 */
 	public $code;
 
-    /**
-     * @var string label
-     */
+	/**
+	 * @var string label
+	 */
 	public $label;
 
-    /**
-     * @var int active
-     */
+	/**
+	 * @var int active
+	 */
 	public $active;
 
 
-    /**
-     *  Constructor
-     *
-     *  @param      DoliDb		$db      Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-    }
+	/**
+	 *  Constructor
+	 *
+	 *  @param      DoliDb		$db      Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
 
 
-    /**
-     *  Create object into database
-     *
-     *  @param      User	$user        User that create
-     *  @param      int		$notrigger   0=launch triggers after, 1=disable triggers
-     *  @return     int      		   	 <0 if KO, Id of created object if OK
-     */
-    public function create($user, $notrigger = 0)
-    {
-    	global $conf, $langs;
+	/**
+	 *  Create object into database
+	 *
+	 *  @param      User	$user        User that create
+	 *  @param      int		$notrigger   0=launch triggers after, 1=disable triggers
+	 *  @return     int      		   	 <0 if KO, Id of created object if OK
+	 */
+	public function create($user, $notrigger = 0)
+	{
+		global $conf, $langs;
 
-        // Insert request
+		// Insert request
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX.$this->table_element."(";
 		$sql .= "rowid,";
 		$sql .= "code,";
 		$sql .= "label,";
 		$sql .= "active";
-        $sql .= ") VALUES (";
-		$sql .= " ".(!isset($this->id) ? 'NULL' : ((int) $this->id)) .",";
+		$sql .= ") VALUES (";
+		$sql .= " ".(!isset($this->id) ? 'NULL' : ((int) $this->id)).",";
 		$sql .= " ".(!isset($this->code) ? 'NULL' : ((int) $this->code)).",";
 		$sql .= " ".(!isset($this->label) ? 'NULL' : "'".$this->db->escape(trim($this->label))."'").",";
 		$sql .= " ".(!isset($this->active) ? 'NULL' : ((int) $this->active)).",";
@@ -117,185 +117,185 @@ class CProductNature // extends CommonObject
 		$this->db->begin();
 
 	   	dol_syslog(get_class($this)."::create", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        // Commit or rollback
-        if (!$resql) {
+		$resql = $this->db->query($sql);
+		// Commit or rollback
+		if (!$resql) {
 			dol_syslog(get_class($this)."::create ".$this->db->lasterror(), LOG_ERR);
-	        $this->error = "Error ".$this->db->lasterror();
+			$this->error = "Error ".$this->db->lasterror();
 			$this->db->rollback();
 			return -1;
 		} else {
-            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);
 			$this->db->commit();
-            return $this->id;
+			return $this->id;
 		}
-    }
+	}
 
 
-    /**
-     *  Load object in memory from database
-     *
-     *  @param      int		$id    			Id of CUnit object to fetch (rowid)
-     *  @param		string	$code			Code
-     *  @return     int						<0 if KO, >0 if OK
-     */
-    public function fetch($id, $code = '')
-    {
-    	global $langs;
+	/**
+	 *  Load object in memory from database
+	 *
+	 *  @param      int		$id    			Id of CUnit object to fetch (rowid)
+	 *  @param		string	$code			Code
+	 *  @return     int						<0 if KO, >0 if OK
+	 */
+	public function fetch($id, $code = '')
+	{
+		global $langs;
 
-        $sql = "SELECT";
+		$sql = "SELECT";
 		$sql .= " t.rowid,";
 		$sql .= " t.code,";
 		$sql .= " t.label,";
 		$sql .= " t.active";
-        $sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element." as t";
-        $sql_where = array();
-        if ($id)   $sql_where[] = " t.rowid = ".$id;
-        if ($code>=0) $sql_where[] = " t.code = ". ((int) $code);
-        if (count($sql_where) > 0) {
-        	$sql .= ' WHERE '.implode(' AND ', $sql_where);
-        }
+		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element." as t";
+		$sql_where = array();
+		if ($id)   $sql_where[] = " t.rowid = ".$id;
+		if ($code >= 0) $sql_where[] = " t.code = ".((int) $code);
+		if (count($sql_where) > 0) {
+			$sql .= ' WHERE '.implode(' AND ', $sql_where);
+		}
 
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            if ($this->db->num_rows($resql))
-            {
-                $obj = $this->db->fetch_object($resql);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			if ($this->db->num_rows($resql))
+			{
+				$obj = $this->db->fetch_object($resql);
 
-                $this->id = $obj->rowid;
+				$this->id = $obj->rowid;
 				$this->code = $obj->code;
 				$this->label = $obj->label;
 				$this->active = $obj->active;
-            }
-            $this->db->free($resql);
+			}
+			$this->db->free($resql);
 
-            return 1;
-        } else {
-      	    $this->error = "Error ".$this->db->lasterror();
-            return -1;
-        }
-    }
+			return 1;
+		} else {
+	  		$this->error = "Error ".$this->db->lasterror();
+			return -1;
+		}
+	}
 
 
-    /**
-     * Load list of objects in memory from the database.
-     *
-     * @param  string      $sortorder    Sort Order
-     * @param  string      $sortfield    Sort field
-     * @param  int         $limit        limit
-     * @param  int         $offset       Offset
-     * @param  array       $filter       Filter array. Example array('field'=>'valueforlike', 'customurl'=>...)
-     * @param  string      $filtermode   Filter mode (AND or OR)
-     * @return array|int                 int <0 if KO, array of pages if OK
-     */
-    public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
-    {
-    	global $conf;
+	/**
+	 * Load list of objects in memory from the database.
+	 *
+	 * @param  string      $sortorder    Sort Order
+	 * @param  string      $sortfield    Sort field
+	 * @param  int         $limit        limit
+	 * @param  int         $offset       Offset
+	 * @param  array       $filter       Filter array. Example array('field'=>'valueforlike', 'customurl'=>...)
+	 * @param  string      $filtermode   Filter mode (AND or OR)
+	 * @return array|int                 int <0 if KO, array of pages if OK
+	 */
+	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
+	{
+		global $conf;
 
-    	dol_syslog(__METHOD__, LOG_DEBUG);
+		dol_syslog(__METHOD__, LOG_DEBUG);
 
-    	$sql = 'SELECT';
-    	$sql .= " t.rowid,";
-    	$sql .= " t.code,";
-    	$sql .= " t.label,";
-    	$sql .= " t.active";
-    	$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
-    	// Manage filter
-    	$sqlwhere = array();
-    	if (count($filter) > 0) {
-    		foreach ($filter as $key => $value) {
-    			if ($key == 't.rowid' || $key == 't.active' || $key == 't.code') {
-    				$sqlwhere[] = $key.'='.(int) $value;
-    			} elseif (strpos($key, 'date') !== false) {
-    				$sqlwhere[] = $key.' = \''.$this->db->idate($value).'\'';
-    			} elseif ($key == 't.label') {
-    				$sqlwhere[] = $key.' = \''.$this->db->escape($value).'\'';
-    			} else {
-    				$sqlwhere[] = $key.' LIKE \'%'.$this->db->escape($value).'%\'';
-    			}
-    		}
-    	}
-    	if (count($sqlwhere) > 0) {
-    		$sql .= ' WHERE ('.implode(' '.$filtermode.' ', $sqlwhere).')';
-    	}
+		$sql = 'SELECT';
+		$sql .= " t.rowid,";
+		$sql .= " t.code,";
+		$sql .= " t.label,";
+		$sql .= " t.active";
+		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
+		// Manage filter
+		$sqlwhere = array();
+		if (count($filter) > 0) {
+			foreach ($filter as $key => $value) {
+				if ($key == 't.rowid' || $key == 't.active' || $key == 't.code') {
+					$sqlwhere[] = $key.'='.(int) $value;
+				} elseif (strpos($key, 'date') !== false) {
+					$sqlwhere[] = $key.' = \''.$this->db->idate($value).'\'';
+				} elseif ($key == 't.label') {
+					$sqlwhere[] = $key.' = \''.$this->db->escape($value).'\'';
+				} else {
+					$sqlwhere[] = $key.' LIKE \'%'.$this->db->escape($value).'%\'';
+				}
+			}
+		}
+		if (count($sqlwhere) > 0) {
+			$sql .= ' WHERE ('.implode(' '.$filtermode.' ', $sqlwhere).')';
+		}
 
-    	if (!empty($sortfield)) {
-    		$sql .= $this->db->order($sortfield, $sortorder);
-    	}
-    	if (!empty($limit)) {
-    		$sql .= ' '.$this->db->plimit($limit, $offset);
-    	}
+		if (!empty($sortfield)) {
+			$sql .= $this->db->order($sortfield, $sortorder);
+		}
+		if (!empty($limit)) {
+			$sql .= ' '.$this->db->plimit($limit, $offset);
+		}
 
-    	$resql = $this->db->query($sql);
-    	if ($resql) {
-    		$this->records = array();
-    		$num = $this->db->num_rows($resql);
-    		if ($num > 0) {
-	    		while ($obj = $this->db->fetch_object($resql))
-	    		{
-	    			$record = new self($this->db);
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			$this->records = array();
+			$num = $this->db->num_rows($resql);
+			if ($num > 0) {
+				while ($obj = $this->db->fetch_object($resql))
+				{
+					$record = new self($this->db);
 
-	    			$record->id    = $obj->rowid;
-	    			$record->code = $obj->code;
-	    			$record->label = $obj->label;
-	    			$this->records[$record->id] = $record;
-	    		}
-    		}
-    		$this->db->free($resql);
+					$record->id    = $obj->rowid;
+					$record->code = $obj->code;
+					$record->label = $obj->label;
+					$this->records[$record->id] = $record;
+				}
+			}
+			$this->db->free($resql);
 
-    		return $this->records;
-    	} else {
-    		$this->errors[] = 'Error '.$this->db->lasterror();
-    		dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+			return $this->records;
+		} else {
+			$this->errors[] = 'Error '.$this->db->lasterror();
+			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
 
-    		return -1;
-    	}
-    }
+			return -1;
+		}
+	}
 
 
-    /**
-     *  Update object into database
-     *
-     *  @param      User	$user        User that modify
-     *  @param      int		$notrigger	 0=launch triggers after, 1=disable triggers
-     *  @return     int     		   	 <0 if KO, >0 if OK
-     */
-    public function update($user = null, $notrigger = 0)
-    {
-    	global $conf, $langs;
+	/**
+	 *  Update object into database
+	 *
+	 *  @param      User	$user        User that modify
+	 *  @param      int		$notrigger	 0=launch triggers after, 1=disable triggers
+	 *  @return     int     		   	 <0 if KO, >0 if OK
+	 */
+	public function update($user = null, $notrigger = 0)
+	{
+		global $conf, $langs;
 
-        // Update request
-        $sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
+		// Update request
+		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
 		$sql .= " code=".(isset($this->code) ? ((int) $this->code) : "null").",";
 		$sql .= " label=".(isset($this->label) ? "'".$this->db->escape(trim($this->label))."'" : "null").",";
 		$sql .= " active=".(isset($this->active) ? ((int) $this->active) : "null");
-        $sql .= " WHERE rowid=".(int) $this->id;
+		$sql .= " WHERE rowid=".(int) $this->id;
 
 		$this->db->begin();
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        // Commit or rollback
+		$resql = $this->db->query($sql);
+		// Commit or rollback
 		if (!$resql) {
-	        dol_syslog(get_class($this)."::update Error ".$this->db->lasterror(), LOG_ERR);
-	        $this->error = "Error ".$this->db->lasterror();
+			dol_syslog(get_class($this)."::update Error ".$this->db->lasterror(), LOG_ERR);
+			$this->error = "Error ".$this->db->lasterror();
 			$this->db->rollback();
 			return -1;
 		} else {
 			$this->db->commit();
 			return 1;
 		}
-    }
+	}
 
 
  	/**
-	 *  Delete object in database
-	 *
-     *	@param  User	$user        User that delete
-     *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
-	 *  @return	int					 <0 if KO, >0 if OK
-	 */
+ 	 *  Delete object in database
+ 	 *
+ 	 *	@param  User	$user        User that delete
+ 	 *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
+ 	 *  @return	int					 <0 if KO, >0 if OK
+ 	 */
 	public function delete($user, $notrigger = 0)
 	{
 		global $conf, $langs;
@@ -308,10 +308,10 @@ class CProductNature // extends CommonObject
 
 		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-        // Commit or rollback
+		// Commit or rollback
 		if (!$resql) {
-	        dol_syslog(get_class($this)."::delete Error ".$this->db->lasterror(), LOG_ERR);
-	        $this->error = "Error ".$this->db->lasterror();
+			dol_syslog(get_class($this)."::delete Error ".$this->db->lasterror(), LOG_ERR);
+			$this->error = "Error ".$this->db->lasterror();
 			$this->db->rollback();
 			return -1;
 		} else {
@@ -331,7 +331,7 @@ class CProductNature // extends CommonObject
 	{
 		if ($mode == 'label') {
 			return dol_getIdFromCode($this->db, $code, $this->table_element, 'label', 'code');
-		} elseif ($mode == 'code'){
+		} elseif ($mode == 'code') {
 			return dol_getIdFromCode($this->db, $code, $this->table_element, 'code', 'code');
 		}
 
diff --git a/htdocs/core/class/cstate.class.php b/htdocs/core/class/cstate.class.php
index 80c47591fbb..75ef9cc7f77 100644
--- a/htdocs/core/class/cstate.class.php
+++ b/htdocs/core/class/cstate.class.php
@@ -27,9 +27,9 @@
 class Cstate // extends CommonObject
 {
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
 	/**
 	 * @var string Error code (or message)
@@ -44,7 +44,7 @@ class Cstate // extends CommonObject
 	//var $element='cstate';			//!< Id that identify managed objects
 	//var $table_element='cstate';	    //!< Name of table without prefix where object is stored
 
-    /**
+	/**
 	 * @var int ID
 	 */
 	public $id;
@@ -68,27 +68,27 @@ class Cstate // extends CommonObject
 
 
 
-    /**
-     *  Constructor
-     *
-     *  @param      DoliDb		$db      Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-    }
+	/**
+	 *  Constructor
+	 *
+	 *  @param      DoliDb		$db      Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
 
 
-    /**
-     *  Create object into database
-     *
-     *  @param      User	$user        User that create
-     *  @param      int		$notrigger   0=launch triggers after, 1=disable triggers
-     *  @return     int      		   	 <0 if KO, Id of created object if OK
-     */
-    public function create($user, $notrigger = 0)
-    {
-    	global $conf, $langs;
+	/**
+	 *  Create object into database
+	 *
+	 *  @param      User	$user        User that create
+	 *  @param      int		$notrigger   0=launch triggers after, 1=disable triggers
+	 *  @return     int      		   	 <0 if KO, Id of created object if OK
+	 */
+	public function create($user, $notrigger = 0)
+	{
+		global $conf, $langs;
 		$error = 0;
 
 		// Clean parameters
@@ -99,13 +99,13 @@ class Cstate // extends CommonObject
 		// Check parameters
 		// Put here code to add control on parameters values
 
-        // Insert request
+		// Insert request
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."c_departements(";
 		$sql .= "rowid,";
 		$sql .= "code_departement,";
 		$sql .= "nom,";
 		$sql .= "active";
-        $sql .= ") VALUES (";
+		$sql .= ") VALUES (";
 		$sql .= " ".(!isset($this->rowid) ? 'NULL' : "'".$this->db->escape($this->rowid)."'").",";
 		$sql .= " ".(!isset($this->code_departement) ? 'NULL' : "'".$this->db->escape($this->code_departement)."'").",";
 		$sql .= " ".(!isset($this->nom) ? 'NULL' : "'".$this->db->escape($this->nom)."'").",";
@@ -115,84 +115,84 @@ class Cstate // extends CommonObject
 		$this->db->begin();
 
 	   	dol_syslog(get_class($this)."::create", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-    	if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+		$resql = $this->db->query($sql);
+		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
-        if (!$error) {
-            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."c_departements");
-        }
+		if (!$error) {
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."c_departements");
+		}
 
-        // Commit or rollback
-        if ($error)
+		// Commit or rollback
+		if ($error)
 		{
 			foreach ($this->errors as $errmsg)
 			{
-	            dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
-	            $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
+				dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
 			return -1 * $error;
 		} else {
 			$this->db->commit();
-            return $this->id;
+			return $this->id;
 		}
-    }
+	}
 
 
-    /**
-     *  Load object in memory from database
-     *
-     *  @param      int		$id    	Id object
-     *  @param		string	$code	Code
-     *  @return     int          	<0 if KO, >0 if OK
-     */
-    public function fetch($id, $code = '')
-    {
-    	global $langs;
-        $sql = "SELECT";
+	/**
+	 *  Load object in memory from database
+	 *
+	 *  @param      int		$id    	Id object
+	 *  @param		string	$code	Code
+	 *  @return     int          	<0 if KO, >0 if OK
+	 */
+	public function fetch($id, $code = '')
+	{
+		global $langs;
+		$sql = "SELECT";
 		$sql .= " t.rowid,";
 		$sql .= " t.code_departement,";
 		$sql .= " t.nom,";
 		$sql .= " t.active";
-        $sql .= " FROM ".MAIN_DB_PREFIX."c_departements as t";
-        if ($id)   $sql .= " WHERE t.rowid = ".$id;
-        elseif ($code) $sql .= " WHERE t.code_departement = '".$this->db->escape($code)."'";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_departements as t";
+		if ($id)   $sql .= " WHERE t.rowid = ".$id;
+		elseif ($code) $sql .= " WHERE t.code_departement = '".$this->db->escape($code)."'";
 
-    	dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            if ($this->db->num_rows($resql))
-            {
-                $obj = $this->db->fetch_object($resql);
+		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			if ($this->db->num_rows($resql))
+			{
+				$obj = $this->db->fetch_object($resql);
 
-                $this->id = $obj->rowid;
-				$this->code_departement = $obj->code_departement;    //deprecated
+				$this->id = $obj->rowid;
+				$this->code_departement = $obj->code_departement; //deprecated
 				$this->code = $obj->code_departement;
-				$this->nom = $obj->nom;   //deprecated
+				$this->nom = $obj->nom; //deprecated
 				$this->name = $obj->nom;
 				$this->active = $obj->active;
-            }
-            $this->db->free($resql);
+			}
+			$this->db->free($resql);
 
-            return 1;
-        } else {
-      	    $this->error = "Error ".$this->db->lasterror();
-            return -1;
-        }
-    }
+			return 1;
+		} else {
+	  		$this->error = "Error ".$this->db->lasterror();
+			return -1;
+		}
+	}
 
 
-    /**
-     *  Update object into database
-     *
-     *  @param      User	$user        User that modify
-     *  @param      int		$notrigger	 0=launch triggers after, 1=disable triggers
-     *  @return     int     		   	 <0 if KO, >0 if OK
-     */
-    public function update($user = null, $notrigger = 0)
-    {
-    	global $conf, $langs;
+	/**
+	 *  Update object into database
+	 *
+	 *  @param      User	$user        User that modify
+	 *  @param      int		$notrigger	 0=launch triggers after, 1=disable triggers
+	 *  @return     int     		   	 <0 if KO, >0 if OK
+	 */
+	public function update($user = null, $notrigger = 0)
+	{
+		global $conf, $langs;
 		$error = 0;
 
 		// Clean parameters
@@ -204,40 +204,40 @@ class Cstate // extends CommonObject
 		// Check parameters
 		// Put here code to add control on parameters values
 
-        // Update request
-        $sql = "UPDATE ".MAIN_DB_PREFIX."c_departements SET";
+		// Update request
+		$sql = "UPDATE ".MAIN_DB_PREFIX."c_departements SET";
 		$sql .= " code_departement=".(isset($this->code_departement) ? "'".$this->db->escape($this->code_departement)."'" : "null").",";
 		$sql .= " nom=".(isset($this->nom) ? "'".$this->db->escape($this->nom)."'" : "null").",";
 		$sql .= " active=".(isset($this->active) ? $this->active : "null")."";
-        $sql .= " WHERE rowid=".$this->id;
+		$sql .= " WHERE rowid=".$this->id;
 
 		$this->db->begin();
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-    	if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+		$resql = $this->db->query($sql);
+		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
-	    // Commit or rollback
-	    if ($error) {
-		    foreach ($this->errors as $errmsg) {
-			    dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
-			    $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
-		    }
-		    $this->db->rollback();
-		    return -1 * $error;
-	    } else {
-		    $this->db->commit();
-		    return 1;
-	    }
-    }
+		// Commit or rollback
+		if ($error) {
+			foreach ($this->errors as $errmsg) {
+				dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
+			}
+			$this->db->rollback();
+			return -1 * $error;
+		} else {
+			$this->db->commit();
+			return 1;
+		}
+	}
 
  	/**
  	 *  Delete object in database
-	 *
-     *	@param  User	$user        User that delete
-     *  @param	int		$notrigger	 0=launch triggers after, 1=disable triggers
-	 *  @return	int					 <0 if KO, >0 if OK
-	 */
+ 	 *
+ 	 *	@param  User	$user        User that delete
+ 	 *  @param	int		$notrigger	 0=launch triggers after, 1=disable triggers
+ 	 *  @return	int					 <0 if KO, >0 if OK
+ 	 */
 	public function delete($user, $notrigger = 0)
 	{
 		global $conf, $langs;
@@ -250,15 +250,15 @@ class Cstate // extends CommonObject
 
 		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-    	if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
-        // Commit or rollback
+		// Commit or rollback
 		if ($error)
 		{
 			foreach ($this->errors as $errmsg)
 			{
-	            dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
-	            $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
+				dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
 			return -1 * $error;
diff --git a/htdocs/core/class/ctypent.class.php b/htdocs/core/class/ctypent.class.php
index 07d3563088e..fccdec72ab6 100644
--- a/htdocs/core/class/ctypent.class.php
+++ b/htdocs/core/class/ctypent.class.php
@@ -28,9 +28,9 @@
 class Ctypent // extends CommonObject
 {
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
 	/**
 	 * @var string Error code (or message)
@@ -45,7 +45,7 @@ class Ctypent // extends CommonObject
 	//var $element='ctypent';			//!< Id that identify managed objects
 	//var $table_element='ctypent';	//!< Name of table without prefix where object is stored
 
-    /**
+	/**
 	 * @var int ID
 	 */
 	public $id;
@@ -58,27 +58,27 @@ class Ctypent // extends CommonObject
 
 
 
-    /**
-     *  Constructor
-     *
-     *  @param      DoliDb		$db      Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-    }
+	/**
+	 *  Constructor
+	 *
+	 *  @param      DoliDb		$db      Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
 
 
-    /**
-     *  Create object into database
-     *
-     *  @param      User	$user        User that create
-     *  @param      int		$notrigger   0=launch triggers after, 1=disable triggers
-     *  @return     int      		   	 <0 if KO, Id of created object if OK
-     */
-    public function create($user, $notrigger = 0)
-    {
-    	global $conf, $langs;
+	/**
+	 *  Create object into database
+	 *
+	 *  @param      User	$user        User that create
+	 *  @param      int		$notrigger   0=launch triggers after, 1=disable triggers
+	 *  @return     int      		   	 <0 if KO, Id of created object if OK
+	 */
+	public function create($user, $notrigger = 0)
+	{
+		global $conf, $langs;
 		$error = 0;
 
 		// Clean parameters
@@ -94,7 +94,7 @@ class Ctypent // extends CommonObject
 		// Check parameters
 		// Put here code to add control on parameters values
 
-        // Insert request
+		// Insert request
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."c_typent(";
 
 		$sql .= "id,";
@@ -104,7 +104,7 @@ class Ctypent // extends CommonObject
 		$sql .= "module";
 
 
-        $sql .= ") VALUES (";
+		$sql .= ") VALUES (";
 
 		$sql .= " ".(!isset($this->id) ? 'NULL' : "'".$this->db->escape($this->id)."'").",";
 		$sql .= " ".(!isset($this->code) ? 'NULL' : "'".$this->db->escape($this->code)."'").",";
@@ -118,88 +118,88 @@ class Ctypent // extends CommonObject
 		$this->db->begin();
 
 	   	dol_syslog(get_class($this)."::create", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-    	if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+		$resql = $this->db->query($sql);
+		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
 		if (!$error)
-        {
-            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."c_typent");
-        }
+		{
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."c_typent");
+		}
 
-        // Commit or rollback
-        if ($error)
+		// Commit or rollback
+		if ($error)
 		{
 			foreach ($this->errors as $errmsg)
 			{
-	            dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
-	            $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
+				dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
 			return -1 * $error;
 		} else {
 			$this->db->commit();
-            return $this->id;
+			return $this->id;
 		}
-    }
+	}
 
 
-    /**
-     *  Load object in memory from database
-     *
-     *  @param      int		$id    	Id object
-     *  @param		string	$code	Code
-     *  @param		string	$label	Label
-     *  @return     int          	<0 if KO, >0 if OK
-     */
-    public function fetch($id, $code = '', $label = '')
-    {
-    	global $langs;
-        $sql = "SELECT";
+	/**
+	 *  Load object in memory from database
+	 *
+	 *  @param      int		$id    	Id object
+	 *  @param		string	$code	Code
+	 *  @param		string	$label	Label
+	 *  @return     int          	<0 if KO, >0 if OK
+	 */
+	public function fetch($id, $code = '', $label = '')
+	{
+		global $langs;
+		$sql = "SELECT";
 		$sql .= " t.id,";
 		$sql .= " t.code,";
 		$sql .= " t.libelle as label,";
 		$sql .= " t.fk_country as country_id,";
 		$sql .= " t.active,";
 		$sql .= " t.module";
-        $sql .= " FROM ".MAIN_DB_PREFIX."c_typent as t";
-        if ($id)   $sql .= " WHERE t.id = ".$id;
-        elseif ($code) $sql .= " WHERE t.code = '".$this->db->escape($code)."'";
-        elseif ($label) $sql .= " WHERE t.libelle = '".$this->db->escape($label)."'";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_typent as t";
+		if ($id)   $sql .= " WHERE t.id = ".$id;
+		elseif ($code) $sql .= " WHERE t.code = '".$this->db->escape($code)."'";
+		elseif ($label) $sql .= " WHERE t.libelle = '".$this->db->escape($label)."'";
 
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            if ($this->db->num_rows($resql))
-            {
-                $obj = $this->db->fetch_object($resql);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			if ($this->db->num_rows($resql))
+			{
+				$obj = $this->db->fetch_object($resql);
 
-                $this->id = $obj->id;
+				$this->id = $obj->id;
 				$this->code = $obj->code;
 				$this->libelle = $obj->label;
 				$this->country_id = $obj->country_id;
 				$this->active = $obj->active;
 				$this->module = $obj->module;
-            }
-            $this->db->free($resql);
+			}
+			$this->db->free($resql);
 
-            return 1;
-        } else {
-      	    $this->error = "Error ".$this->db->lasterror();
-            return -1;
-        }
-    }
+			return 1;
+		} else {
+	  		$this->error = "Error ".$this->db->lasterror();
+			return -1;
+		}
+	}
 
 
-    /**
-     *  Update object into database
-     *
-     *  @param      User	$user        User that modify
-     *  @param      int		$notrigger	 0=launch triggers after, 1=disable triggers
-     *  @return     int     		   	 <0 if KO, >0 if OK
-     */
-    public function update($user = null, $notrigger = 0)
-    {
-    	global $conf, $langs;
+	/**
+	 *  Update object into database
+	 *
+	 *  @param      User	$user        User that modify
+	 *  @param      int		$notrigger	 0=launch triggers after, 1=disable triggers
+	 *  @return     int     		   	 <0 if KO, >0 if OK
+	 */
+	public function update($user = null, $notrigger = 0)
+	{
+		global $conf, $langs;
 		$error = 0;
 
 		// Clean parameters
@@ -212,27 +212,27 @@ class Ctypent // extends CommonObject
 		// Check parameters
 		// Put here code to add control on parameters values
 
-        // Update request
-        $sql = "UPDATE ".MAIN_DB_PREFIX."c_typent SET";
+		// Update request
+		$sql = "UPDATE ".MAIN_DB_PREFIX."c_typent SET";
 		$sql .= " code=".(isset($this->code) ? "'".$this->db->escape($this->code)."'" : "null").",";
 		$sql .= " libelle=".(isset($this->libelle) ? "'".$this->db->escape($this->libelle)."'" : "null").",";
 		$sql .= " active=".(isset($this->active) ? $this->active : "null").",";
 		$sql .= " module=".(isset($this->module) ? "'".$this->db->escape($this->module)."'" : "null")."";
-        $sql .= " WHERE id=".$this->id;
+		$sql .= " WHERE id=".$this->id;
 
 		$this->db->begin();
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-    	if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+		$resql = $this->db->query($sql);
+		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
-        // Commit or rollback
+		// Commit or rollback
 		if ($error)
 		{
 			foreach ($this->errors as $errmsg)
 			{
-	            dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
-	            $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
+				dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
 			return -1 * $error;
@@ -240,16 +240,16 @@ class Ctypent // extends CommonObject
 			$this->db->commit();
 			return 1;
 		}
-    }
+	}
 
 
  	/**
-	 *  Delete object in database
-	 *
-     *	@param  User	$user        User that delete
-     *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
-	 *  @return	int					 <0 if KO, >0 if OK
-	 */
+ 	 *  Delete object in database
+ 	 *
+ 	 *	@param  User	$user        User that delete
+ 	 *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
+ 	 *  @return	int					 <0 if KO, >0 if OK
+ 	 */
 	public function delete($user, $notrigger = 0)
 	{
 		global $conf, $langs;
@@ -262,21 +262,21 @@ class Ctypent // extends CommonObject
 
 		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-    	if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
-        // Commit or rollback
-        if ($error)
-        {
+		// Commit or rollback
+		if ($error)
+		{
 			foreach ($this->errors as $errmsg)
 			{
-	            dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
-	            $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
+				dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
 			return -1 * $error;
-        } else {
-            $this->db->commit();
-            return 1;
-        }
-    }
+		} else {
+			$this->db->commit();
+			return 1;
+		}
+	}
 }
diff --git a/htdocs/core/class/ctyperesource.class.php b/htdocs/core/class/ctyperesource.class.php
index 410c3ae3f21..9d1e5c53de1 100644
--- a/htdocs/core/class/ctyperesource.class.php
+++ b/htdocs/core/class/ctyperesource.class.php
@@ -50,9 +50,9 @@ class Ctyperesource
 	public $code;
 
 	/**
-     * @var string Type resource label
-     */
-    public $label;
+	 * @var string Type resource label
+	 */
+	public $label;
 
 	public $active;
 
@@ -252,7 +252,7 @@ class Ctyperesource
 			$sql .= $this->db->order($sortfield, $sortorder);
 		}
 		if (!empty($limit)) {
-		    $sql .= ' '.$this->db->plimit($limit, $offset);
+			$sql .= ' '.$this->db->plimit($limit, $offset);
 		}
 
 		$resql = $this->db->query($sql);
@@ -482,9 +482,9 @@ class CtyperesourceLine
 	public $code;
 
 	/**
-     * @var string Type resource line label
-     */
-    public $label;
+	 * @var string Type resource line label
+	 */
+	public $label;
 
 	public $active;
 
diff --git a/htdocs/core/class/cunits.class.php b/htdocs/core/class/cunits.class.php
index ac7b07ea5a9..c94919eb1dc 100644
--- a/htdocs/core/class/cunits.class.php
+++ b/htdocs/core/class/cunits.class.php
@@ -28,9 +28,9 @@
 class CUnits // extends CommonObject
 {
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
 	/**
 	 * @var string Error code (or message)
@@ -46,7 +46,7 @@ class CUnits // extends CommonObject
 	//var $element='ctypent';			//!< Id that identify managed objects
 	//var $table_element='ctypent';	//!< Name of table without prefix where object is stored
 
-    /**
+	/**
 	 * @var int ID
 	 */
 	public $id;
@@ -61,27 +61,27 @@ class CUnits // extends CommonObject
 
 
 
-    /**
-     *  Constructor
-     *
-     *  @param      DoliDb		$db      Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-    }
+	/**
+	 *  Constructor
+	 *
+	 *  @param      DoliDb		$db      Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
 
 
-    /**
-     *  Create object into database
-     *
-     *  @param      User	$user        User that create
-     *  @param      int		$notrigger   0=launch triggers after, 1=disable triggers
-     *  @return     int      		   	 <0 if KO, Id of created object if OK
-     */
-    public function create($user, $notrigger = 0)
-    {
-    	global $conf, $langs;
+	/**
+	 *  Create object into database
+	 *
+	 *  @param      User	$user        User that create
+	 *  @param      int		$notrigger   0=launch triggers after, 1=disable triggers
+	 *  @return     int      		   	 <0 if KO, Id of created object if OK
+	 */
+	public function create($user, $notrigger = 0)
+	{
+		global $conf, $langs;
 		$error = 0;
 
 		// Clean parameters
@@ -97,7 +97,7 @@ class CUnits // extends CommonObject
 		// Check parameters
 		// Put here code to add control on parameters values
 
-        // Insert request
+		// Insert request
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."c_units(";
 		$sql .= "rowid,";
 		$sql .= "code,";
@@ -105,7 +105,7 @@ class CUnits // extends CommonObject
 		$sql .= "short_label,";
 		$sql .= "unit_type";
 		$sql .= "scale";
-        $sql .= ") VALUES (";
+		$sql .= ") VALUES (";
 		$sql .= " ".(!isset($this->id) ? 'NULL' : "'".$this->db->escape($this->id)."'").",";
 		$sql .= " ".(!isset($this->code) ? 'NULL' : "'".$this->db->escape($this->code)."'").",";
 		$sql .= " ".(!isset($this->label) ? 'NULL' : "'".$this->db->escape($this->label)."'").",";
@@ -117,45 +117,45 @@ class CUnits // extends CommonObject
 		$this->db->begin();
 
 	   	dol_syslog(get_class($this)."::create", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-    	if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+		$resql = $this->db->query($sql);
+		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
 		if (!$error)
-        {
-            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."c_units");
-        }
+		{
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."c_units");
+		}
 
-        // Commit or rollback
-        if ($error)
+		// Commit or rollback
+		if ($error)
 		{
 			foreach ($this->errors as $errmsg)
 			{
-	            dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
-	            $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
+				dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
 			return -1 * $error;
 		} else {
 			$this->db->commit();
-            return $this->id;
+			return $this->id;
 		}
-    }
+	}
 
 
-    /**
-     *  Load object in memory from database
-     *
-     *  @param      int		$id    			Id of CUnit object to fetch (rowid)
-     *  @param		string	$code			Code
-     *  @param		string	$short_label	Short Label ('g', 'kg', ...)
-     *  @param		string	$unit_type		Unit type ('size', 'surface', 'volume', 'weight', ...)
-     *  @return     int						<0 if KO, >0 if OK
-     */
-    public function fetch($id, $code = '', $short_label = '', $unit_type = '')
-    {
-    	global $langs;
+	/**
+	 *  Load object in memory from database
+	 *
+	 *  @param      int		$id    			Id of CUnit object to fetch (rowid)
+	 *  @param		string	$code			Code
+	 *  @param		string	$short_label	Short Label ('g', 'kg', ...)
+	 *  @param		string	$unit_type		Unit type ('size', 'surface', 'volume', 'weight', ...)
+	 *  @return     int						<0 if KO, >0 if OK
+	 */
+	public function fetch($id, $code = '', $short_label = '', $unit_type = '')
+	{
+		global $langs;
 
-        $sql = "SELECT";
+		$sql = "SELECT";
 		$sql .= " t.rowid,";
 		$sql .= " t.code,";
 		$sql .= " t.label,";
@@ -164,24 +164,24 @@ class CUnits // extends CommonObject
 		$sql .= " t.unit_type,";
 		$sql .= " t.scale,";
 		$sql .= " t.active";
-        $sql .= " FROM ".MAIN_DB_PREFIX."c_units as t";
-        $sql_where = array();
-        if ($id)   $sql_where[] = " t.rowid = ".$id;
-        if ($unit_type)   $sql_where[] = " t.unit_type = '".$this->db->escape($unit_type)."'";
-        if ($code) $sql_where[] = " t.code = '".$this->db->escape($code)."'";
-        if ($short_label) $sql_where[] = " t.short_label = '".$this->db->escape($short_label)."'";
-        if (count($sql_where) > 0) {
-        	$sql .= ' WHERE '.implode(' AND ', $sql_where);
-        }
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_units as t";
+		$sql_where = array();
+		if ($id)   $sql_where[] = " t.rowid = ".$id;
+		if ($unit_type)   $sql_where[] = " t.unit_type = '".$this->db->escape($unit_type)."'";
+		if ($code) $sql_where[] = " t.code = '".$this->db->escape($code)."'";
+		if ($short_label) $sql_where[] = " t.short_label = '".$this->db->escape($short_label)."'";
+		if (count($sql_where) > 0) {
+			$sql .= ' WHERE '.implode(' AND ', $sql_where);
+		}
 
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            if ($this->db->num_rows($resql))
-            {
-                $obj = $this->db->fetch_object($resql);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			if ($this->db->num_rows($resql))
+			{
+				$obj = $this->db->fetch_object($resql);
 
-                $this->id = $obj->rowid;
+				$this->id = $obj->rowid;
 				$this->code = $obj->code;
 				$this->label = $obj->label;
 				$this->short_label = $obj->short_label;
@@ -189,110 +189,109 @@ class CUnits // extends CommonObject
 				$this->unit_type = $obj->unit_type;
 				$this->scale = $obj->scale;
 				$this->active = $obj->active;
-            }
-            $this->db->free($resql);
+			}
+			$this->db->free($resql);
 
-            return 1;
-        } else {
-      	    $this->error = "Error ".$this->db->lasterror();
-            return -1;
-        }
-    }
+			return 1;
+		} else {
+	  		$this->error = "Error ".$this->db->lasterror();
+			return -1;
+		}
+	}
 
 
-    /**
-     * Load list of objects in memory from the database.
-     *
-     * @param  string      $sortorder    Sort Order
-     * @param  string      $sortfield    Sort field
-     * @param  int         $limit        limit
-     * @param  int         $offset       Offset
-     * @param  array       $filter       Filter array. Example array('field'=>'valueforlike', 'customurl'=>...)
-     * @param  string      $filtermode   Filter mode (AND or OR)
-     * @return array|int                 int <0 if KO, array of pages if OK
-     */
-    public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
-    {
-    	global $conf;
+	/**
+	 * Load list of objects in memory from the database.
+	 *
+	 * @param  string      $sortorder    Sort Order
+	 * @param  string      $sortfield    Sort field
+	 * @param  int         $limit        limit
+	 * @param  int         $offset       Offset
+	 * @param  array       $filter       Filter array. Example array('field'=>'valueforlike', 'customurl'=>...)
+	 * @param  string      $filtermode   Filter mode (AND or OR)
+	 * @return array|int                 int <0 if KO, array of pages if OK
+	 */
+	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
+	{
+		global $conf;
 
-    	dol_syslog(__METHOD__, LOG_DEBUG);
+		dol_syslog(__METHOD__, LOG_DEBUG);
 
-    	$sql = 'SELECT';
-    	$sql .= " t.rowid,";
-    	$sql .= " t.code,";
-    	$sql .= " t.label,";
-    	$sql .= " t.short_label,";
-    	$sql .= " t.unit_type,";
-    	$sql .= " t.scale,";
-    	$sql .= " t.active";
-    	$sql .= ' FROM '.MAIN_DB_PREFIX.'c_units as t';
-    	// Manage filter
-    	$sqlwhere = array();
-    	if (count($filter) > 0) {
-    		foreach ($filter as $key => $value) {
-    			if ($key == 't.rowid' || $key == 't.active' || $key == 't.scale') {
-    				$sqlwhere[] = $key.'='.(int) $value;
-    			} elseif (strpos($key, 'date') !== false) {
-    				$sqlwhere[] = $key.' = \''.$this->db->idate($value).'\'';
-    			} elseif ($key == 't.unit_type' || $key == 't.code' || $key == 't.short_label') {
-    				$sqlwhere[] = $key.' = \''.$this->db->escape($value).'\'';
-    			} else {
-    				$sqlwhere[] = $key.' LIKE \'%'.$this->db->escape($value).'%\'';
-    			}
-    		}
-    	}
-    	if (count($sqlwhere) > 0) {
-    		$sql .= ' WHERE ('.implode(' '.$filtermode.' ', $sqlwhere).')';
-    	}
+		$sql = 'SELECT';
+		$sql .= " t.rowid,";
+		$sql .= " t.code,";
+		$sql .= " t.label,";
+		$sql .= " t.short_label,";
+		$sql .= " t.unit_type,";
+		$sql .= " t.scale,";
+		$sql .= " t.active";
+		$sql .= ' FROM '.MAIN_DB_PREFIX.'c_units as t';
+		// Manage filter
+		$sqlwhere = array();
+		if (count($filter) > 0) {
+			foreach ($filter as $key => $value) {
+				if ($key == 't.rowid' || $key == 't.active' || $key == 't.scale') {
+					$sqlwhere[] = $key.'='.(int) $value;
+				} elseif (strpos($key, 'date') !== false) {
+					$sqlwhere[] = $key.' = \''.$this->db->idate($value).'\'';
+				} elseif ($key == 't.unit_type' || $key == 't.code' || $key == 't.short_label') {
+					$sqlwhere[] = $key.' = \''.$this->db->escape($value).'\'';
+				} else {
+					$sqlwhere[] = $key.' LIKE \'%'.$this->db->escape($value).'%\'';
+				}
+			}
+		}
+		if (count($sqlwhere) > 0) {
+			$sql .= ' WHERE ('.implode(' '.$filtermode.' ', $sqlwhere).')';
+		}
 
-    	if (!empty($sortfield)) {
-    		$sql .= $this->db->order($sortfield, $sortorder);
-    	}
-    	if (!empty($limit)) {
-    		$sql .= ' '.$this->db->plimit($limit, $offset);
-    	}
+		if (!empty($sortfield)) {
+			$sql .= $this->db->order($sortfield, $sortorder);
+		}
+		if (!empty($limit)) {
+			$sql .= ' '.$this->db->plimit($limit, $offset);
+		}
 
-    	$resql = $this->db->query($sql);
-    	if ($resql) {
-    		$this->records = array();
-    		$num = $this->db->num_rows($resql);
-    		if ($num > 0) {
-	    		while ($obj = $this->db->fetch_object($resql))
-	    		{
-	    			$record = new self($this->db);
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			$this->records = array();
+			$num = $this->db->num_rows($resql);
+			if ($num > 0) {
+				while ($obj = $this->db->fetch_object($resql)) {
+					$record = new self($this->db);
 
-	    			$record->id    = $obj->rowid;
-	    			$record->code = $obj->code;
-	    			$record->label = $obj->label;
-	    			$record->short_label = $obj->short_label;
-	    			$record->unit_type = $obj->unit_type;
-	    			$record->scale = $obj->scale;
-	    			$record->active = $obj->active;
-	    			$this->records[$record->id] = $record;
-	    		}
-    		}
-    		$this->db->free($resql);
+					$record->id    = $obj->rowid;
+					$record->code = $obj->code;
+					$record->label = $obj->label;
+					$record->short_label = $obj->short_label;
+					$record->unit_type = $obj->unit_type;
+					$record->scale = $obj->scale;
+					$record->active = $obj->active;
+					$this->records[$record->id] = $record;
+				}
+			}
+			$this->db->free($resql);
 
-    		return $this->records;
-    	} else {
-    		$this->errors[] = 'Error '.$this->db->lasterror();
-    		dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+			return $this->records;
+		} else {
+			$this->errors[] = 'Error '.$this->db->lasterror();
+			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
 
-    		return -1;
-    	}
-    }
+			return -1;
+		}
+	}
 
 
-    /**
-     *  Update object into database
-     *
-     *  @param      User	$user        User that modify
-     *  @param      int		$notrigger	 0=launch triggers after, 1=disable triggers
-     *  @return     int     		   	 <0 if KO, >0 if OK
-     */
-    public function update($user = null, $notrigger = 0)
-    {
-    	global $conf, $langs;
+	/**
+	 *  Update object into database
+	 *
+	 *  @param      User	$user        User that modify
+	 *  @param      int		$notrigger	 0=launch triggers after, 1=disable triggers
+	 *  @return     int     		   	 <0 if KO, >0 if OK
+	 */
+	public function update($user = null, $notrigger = 0)
+	{
+		global $conf, $langs;
 		$error = 0;
 
 		// Clean parameters
@@ -306,29 +305,29 @@ class CUnits // extends CommonObject
 		// Check parameters
 		// Put here code to add control on parameters values
 
-        // Update request
-        $sql = "UPDATE ".MAIN_DB_PREFIX."c_units SET";
+		// Update request
+		$sql = "UPDATE ".MAIN_DB_PREFIX."c_units SET";
 		$sql .= " code=".(isset($this->code) ? "'".$this->db->escape($this->code)."'" : "null").",";
 		$sql .= " label=".(isset($this->label) ? "'".$this->db->escape($this->label)."'" : "null").",";
 		$sql .= " short_label=".(isset($this->short_label) ? "'".$this->db->escape($this->short_label)."'" : "null").",";
 		$sql .= " unit_type=".(isset($this->unit_type) ? "'".$this->db->escape($this->unit_type)."'" : "null").",";
 		$sql .= " scale=".(isset($this->scale) ? "'".$this->db->escape($this->scale)."'" : "null").",";
 		$sql .= " active=".(isset($this->active) ? $this->active : "null");
-        $sql .= " WHERE rowid=".$this->id;
+		$sql .= " WHERE rowid=".$this->id;
 
 		$this->db->begin();
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-    	if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+		$resql = $this->db->query($sql);
+		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
-        // Commit or rollback
+		// Commit or rollback
 		if ($error)
 		{
 			foreach ($this->errors as $errmsg)
 			{
-	            dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
-	            $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
+				dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
 			return -1 * $error;
@@ -336,16 +335,16 @@ class CUnits // extends CommonObject
 			$this->db->commit();
 			return 1;
 		}
-    }
+	}
 
 
  	/**
-	 *  Delete object in database
-	 *
-     *	@param  User	$user        User that delete
-     *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
-	 *  @return	int					 <0 if KO, >0 if OK
-	 */
+ 	 *  Delete object in database
+ 	 *
+ 	 *	@param  User	$user        User that delete
+ 	 *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
+ 	 *  @return	int					 <0 if KO, >0 if OK
+ 	 */
 	public function delete($user, $notrigger = 0)
 	{
 		global $conf, $langs;
@@ -358,15 +357,15 @@ class CUnits // extends CommonObject
 
 		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-    	if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
-        // Commit or rollback
+		// Commit or rollback
 		if ($error)
 		{
 			foreach ($this->errors as $errmsg)
 			{
-	            dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
-	            $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
+				dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
 			return -1 * $error;
@@ -386,9 +385,9 @@ class CUnits // extends CommonObject
 	public function getUnitFromCode($code, $mode = 'code')
 	{
 
-		if ($mode == 'short_label'){
+		if ($mode == 'short_label') {
 			return dol_getIdFromCode($this->db, $code, 'c_units', 'short_label', 'rowid');
-		} elseif ($mode == 'code'){
+		} elseif ($mode == 'code') {
 			return dol_getIdFromCode($this->db, $code, 'c_units', 'code', 'rowid');
 		}
 
@@ -404,21 +403,21 @@ class CUnits // extends CommonObject
 	 */
 	public function unitConverter($value, $fk_unit, $fk_new_unit = 0)
 	{
-		$value  = doubleval(price2num($value));
+		$value = doubleval(price2num($value));
 		$fk_unit = intval($fk_unit);
 
 		// Calcul en unité de base
 		$scaleUnitPow = $this->scaleOfUnitPow($fk_unit);
 
 		// convert to standard unit
-		$value  = $value * $scaleUnitPow;
-		if ($fk_new_unit !=0 ){
+		$value = $value * $scaleUnitPow;
+		if ($fk_new_unit != 0) {
 			// Calcul en unité de base
 			$scaleUnitPow = $this->scaleOfUnitPow($fk_new_unit);
 			if (!empty($scaleUnitPow))
 			{
 				// convert to new unit
-				$value  = $value / $scaleUnitPow;
+				$value = $value / $scaleUnitPow;
 			}
 		}
 		return round($value, 2);
diff --git a/htdocs/core/class/discount.class.php b/htdocs/core/class/discount.class.php
index 4cddc65d636..9f901ed3452 100644
--- a/htdocs/core/class/discount.class.php
+++ b/htdocs/core/class/discount.class.php
@@ -28,12 +28,12 @@
  */
 class DiscountAbsolute
 {
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    /**
+	/**
 	 * @var string Error code (or message)
 	 */
 	public $error;
@@ -48,190 +48,190 @@ class DiscountAbsolute
 	 */
 	public $id;
 
-    /**
+	/**
 	 * @var int Thirdparty ID
 	 */
-    public $fk_soc;
+	public $fk_soc;
 
-    public $discount_type; // 0 => customer discount, 1 => supplier discount
-    public $amount_ht; //
-    public $amount_tva; //
-    public $amount_ttc; //
-    public $multicurrency_amount_ht;
-    public $multicurrency_amount_tva;
-    public $multicurrency_amount_ttc;
-    // Vat rate
-    public $tva_tx;
-    public $vat_src_code;
+	public $discount_type; // 0 => customer discount, 1 => supplier discount
+	public $amount_ht; //
+	public $amount_tva; //
+	public $amount_ttc; //
+	public $multicurrency_amount_ht;
+	public $multicurrency_amount_tva;
+	public $multicurrency_amount_ttc;
+	// Vat rate
+	public $tva_tx;
+	public $vat_src_code;
 
-    /**
+	/**
 	 * @var int User ID Id utilisateur qui accorde la remise
 	 */
 	public $fk_user;
 
-    /**
+	/**
 	 * @var string description
 	 */
 	public $description;
 
-    /**
-     * Date creation record (datec)
-     *
-     * @var integer
-     */
-    public $datec;
+	/**
+	 * Date creation record (datec)
+	 *
+	 * @var integer
+	 */
+	public $datec;
 
-    /**
-     * @var int ID invoice line when a discount is used into an invoice line (for absolute discounts)
-     */
-    public $fk_facture_line;
+	/**
+	 * @var int ID invoice line when a discount is used into an invoice line (for absolute discounts)
+	 */
+	public $fk_facture_line;
 
-    /**
-     * @var int ID invoice when a discount line is used into an invoice (for credit note)
-     */
-    public $fk_facture;
+	/**
+	 * @var int ID invoice when a discount line is used into an invoice (for credit note)
+	 */
+	public $fk_facture;
 
-    /**
-     * @var int ID credit note or deposit used to create the discount
-     */
-    public $fk_facture_source;
-    public $ref_facture_source; // Ref credit note or deposit used to create the discount
+	/**
+	 * @var int ID credit note or deposit used to create the discount
+	 */
+	public $fk_facture_source;
+	public $ref_facture_source; // Ref credit note or deposit used to create the discount
 	public $type_facture_source;
 
-    public $fk_invoice_supplier_source;
-    public $ref_invoice_supplier_source; // Ref credit note or deposit used to create the discount
-    public $type_invoice_supplier_source;
+	public $fk_invoice_supplier_source;
+	public $ref_invoice_supplier_source; // Ref credit note or deposit used to create the discount
+	public $type_invoice_supplier_source;
 
-    /**
-     *	Constructor
-     *
-     *  @param  	DoliDB		$db		Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-    }
+	/**
+	 *	Constructor
+	 *
+	 *  @param  	DoliDB		$db		Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
 
 
-    /**
-     *	Load object from database into memory
-     *
-     *  @param      int		$rowid       					id discount to load
-     *  @param      int		$fk_facture_source				fk_facture_source
-     *  @param		int		$fk_invoice_supplier_source		fk_invoice_supplier_source
-     *	@return		int										<0 if KO, =0 if not found, >0 if OK
-     */
-    public function fetch($rowid, $fk_facture_source = 0, $fk_invoice_supplier_source = 0)
-    {
-    	global $conf;
+	/**
+	 *	Load object from database into memory
+	 *
+	 *  @param      int		$rowid       					id discount to load
+	 *  @param      int		$fk_facture_source				fk_facture_source
+	 *  @param		int		$fk_invoice_supplier_source		fk_invoice_supplier_source
+	 *	@return		int										<0 if KO, =0 if not found, >0 if OK
+	 */
+	public function fetch($rowid, $fk_facture_source = 0, $fk_invoice_supplier_source = 0)
+	{
+		global $conf;
 
-        // Check parameters
-        if (!$rowid && !$fk_facture_source && !$fk_invoice_supplier_source)
-        {
-            $this->error = 'ErrorBadParameters';
-            return -1;
-        }
+		// Check parameters
+		if (!$rowid && !$fk_facture_source && !$fk_invoice_supplier_source)
+		{
+			$this->error = 'ErrorBadParameters';
+			return -1;
+		}
 
-        $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, 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,";
-        $sql .= " f.ref as ref_facture_source, f.type as type_facture_source,";
-        $sql .= " fsup.ref as ref_invoice_supplier_source, fsup.type as type_invoice_supplier_source";
-        $sql .= " FROM ".MAIN_DB_PREFIX."societe_remise_except as sr";
-        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."facture as f ON sr.fk_facture_source = f.rowid";
-        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."facture as fsup ON sr.fk_invoice_supplier_source = fsup.rowid";
-        $sql .= " WHERE sr.entity IN (".getEntity('invoice').")";
-        if ($rowid) $sql .= " AND sr.rowid=".$rowid;
-        if ($fk_facture_source) $sql .= " AND sr.fk_facture_source=".$fk_facture_source;
-        if ($fk_invoice_supplier_source) $sql .= " AND sr.fk_invoice_supplier_source=".$fk_invoice_supplier_source;
+		$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, 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,";
+		$sql .= " f.ref as ref_facture_source, f.type as type_facture_source,";
+		$sql .= " fsup.ref as ref_invoice_supplier_source, fsup.type as type_invoice_supplier_source";
+		$sql .= " FROM ".MAIN_DB_PREFIX."societe_remise_except as sr";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."facture as f ON sr.fk_facture_source = f.rowid";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."facture as fsup ON sr.fk_invoice_supplier_source = fsup.rowid";
+		$sql .= " WHERE sr.entity IN (".getEntity('invoice').")";
+		if ($rowid) $sql .= " AND sr.rowid=".$rowid;
+		if ($fk_facture_source) $sql .= " AND sr.fk_facture_source=".$fk_facture_source;
+		if ($fk_invoice_supplier_source) $sql .= " AND sr.fk_invoice_supplier_source=".$fk_invoice_supplier_source;
 
-        dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            if ($this->db->num_rows($resql))
-            {
-                $obj = $this->db->fetch_object($resql);
+		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			if ($this->db->num_rows($resql))
+			{
+				$obj = $this->db->fetch_object($resql);
 
-                $this->id = $obj->rowid;
-                $this->fk_soc = $obj->fk_soc;
-                $this->discount_type = $obj->discount_type;
+				$this->id = $obj->rowid;
+				$this->fk_soc = $obj->fk_soc;
+				$this->discount_type = $obj->discount_type;
 
-                $this->amount_ht = $obj->amount_ht;
-                $this->amount_tva = $obj->amount_tva;
-                $this->amount_ttc = $obj->amount_ttc;
+				$this->amount_ht = $obj->amount_ht;
+				$this->amount_tva = $obj->amount_tva;
+				$this->amount_ttc = $obj->amount_ttc;
 
-                $this->multicurrency_amount_ht = $this->multicurrency_subprice = $obj->multicurrency_amount_ht;
-                $this->multicurrency_amount_tva = $obj->multicurrency_amount_tva;
-                $this->multicurrency_amount_ttc = $obj->multicurrency_amount_ttc;
+				$this->multicurrency_amount_ht = $this->multicurrency_subprice = $obj->multicurrency_amount_ht;
+				$this->multicurrency_amount_tva = $obj->multicurrency_amount_tva;
+				$this->multicurrency_amount_ttc = $obj->multicurrency_amount_ttc;
 
-                $this->tva_tx = $obj->tva_tx;
-                $this->vat_src_code = $obj->vat_src_code;
+				$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;
-                $this->fk_facture_source = $obj->fk_facture_source; // Id credit note or deposit source
-                $this->ref_facture_source = $obj->ref_facture_source; // Ref credit note or deposit  source
-                $this->type_facture_source = $obj->type_facture_source; // Type credit note or deposit  source
-                $this->fk_invoice_supplier_line = $obj->fk_invoice_supplier_line;
-                $this->fk_invoice_supplier = $obj->fk_invoice_supplier;
-                $this->fk_invoice_supplier_source = $obj->fk_invoice_supplier_source; // Id credit note or deposit source
-                $this->ref_invoice_supplier_source = $obj->ref_invoice_supplier_source; // Ref credit note or deposit  source
-                $this->type_invoice_supplier_source = $obj->type_invoice_supplier_source; // Type credit note or deposit  source
-                $this->description = $obj->description;
-                $this->datec = $this->db->jdate($obj->datec);
+				$this->fk_user = $obj->fk_user;
+				$this->fk_facture_line = $obj->fk_facture_line;
+				$this->fk_facture = $obj->fk_facture;
+				$this->fk_facture_source = $obj->fk_facture_source; // Id credit note or deposit source
+				$this->ref_facture_source = $obj->ref_facture_source; // Ref credit note or deposit  source
+				$this->type_facture_source = $obj->type_facture_source; // Type credit note or deposit  source
+				$this->fk_invoice_supplier_line = $obj->fk_invoice_supplier_line;
+				$this->fk_invoice_supplier = $obj->fk_invoice_supplier;
+				$this->fk_invoice_supplier_source = $obj->fk_invoice_supplier_source; // Id credit note or deposit source
+				$this->ref_invoice_supplier_source = $obj->ref_invoice_supplier_source; // Ref credit note or deposit  source
+				$this->type_invoice_supplier_source = $obj->type_invoice_supplier_source; // Type credit note or deposit  source
+				$this->description = $obj->description;
+				$this->datec = $this->db->jdate($obj->datec);
 
-                $this->db->free($resql);
-                return 1;
-            } else {
-                $this->db->free($resql);
-                return 0;
-            }
-        } else {
-            $this->error = $this->db->error();
-            return -1;
-        }
-    }
+				$this->db->free($resql);
+				return 1;
+			} else {
+				$this->db->free($resql);
+				return 0;
+			}
+		} else {
+			$this->error = $this->db->error();
+			return -1;
+		}
+	}
 
 
-    /**
-     *      Create a discount into database
-     *
-     *      @param      User	$user       User that create
-     *      @return     int         		<0 if KO, >0 if OK
-     */
-    public function create($user)
-    {
-        global $conf, $langs;
+	/**
+	 *      Create a discount into database
+	 *
+	 *      @param      User	$user       User that create
+	 *      @return     int         		<0 if KO, >0 if OK
+	 */
+	public function create($user)
+	{
+		global $conf, $langs;
 
-        // Clean parameters
-        $this->amount_ht = price2num($this->amount_ht);
-        $this->amount_tva = price2num($this->amount_tva);
-        $this->amount_ttc = price2num($this->amount_ttc);
+		// Clean parameters
+		$this->amount_ht = price2num($this->amount_ht);
+		$this->amount_tva = price2num($this->amount_tva);
+		$this->amount_ttc = price2num($this->amount_ttc);
 
-        $this->tva_tx = price2num($this->tva_tx);
+		$this->tva_tx = price2num($this->tva_tx);
 
-        $this->multicurrency_amount_ht = price2num($this->multicurrency_amount_ht);
-        $this->multicurrency_amount_tva = price2num($this->multicurrency_amount_tva);
-        $this->multicurrency_amount_ttc = price2num($this->multicurrency_amount_ttc);
+		$this->multicurrency_amount_ht = price2num($this->multicurrency_amount_ht);
+		$this->multicurrency_amount_tva = price2num($this->multicurrency_amount_tva);
+		$this->multicurrency_amount_ttc = price2num($this->multicurrency_amount_ttc);
 
-        if (empty($this->multicurrency_amount_ht)) $this->multicurrency_amount_ht = 0;
-        if (empty($this->multicurrency_amount_tva)) $this->multicurrency_amount_tva = 0;
-        if (empty($this->multicurrency_amount_ttc)) $this->multicurrency_amount_ttc = 0;
+		if (empty($this->multicurrency_amount_ht)) $this->multicurrency_amount_ht = 0;
+		if (empty($this->multicurrency_amount_tva)) $this->multicurrency_amount_tva = 0;
+		if (empty($this->multicurrency_amount_ttc)) $this->multicurrency_amount_ttc = 0;
 
-        // Check parameters
-        if (empty($this->description))
-        {
-            $this->error = 'BadValueForPropertyDescription';
-            dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
-            return -1;
-        }
+		// Check parameters
+		if (empty($this->description))
+		{
+			$this->error = 'BadValueForPropertyDescription';
+			dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
+			return -1;
+		}
 
-        $userid = $user->id;
+		$userid = $user->id;
 		if (!($userid > 0))		// For example when record is saved into an anonymous context with a not loaded object $user.
 		{
 			include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
@@ -240,463 +240,463 @@ class DiscountAbsolute
 			$userid = $tmpinvoice->fk_user_author; // We use the author of invoice
 		}
 
-        // 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, 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.", '".$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");
-        $sql .= ")";
+		// 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, 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.", '".$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");
+		$sql .= ")";
 
-        dol_syslog(get_class($this)."::create", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."societe_remise_except");
-            return $this->id;
-        } else {
-            $this->error = $this->db->lasterror().' - sql='.$sql;
-            return -1;
-        }
-    }
+		dol_syslog(get_class($this)."::create", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."societe_remise_except");
+			return $this->id;
+		} else {
+			$this->error = $this->db->lasterror().' - sql='.$sql;
+			return -1;
+		}
+	}
 
 
-    /**
-     *  Delete object in database. If fk_facture_source is defined, we delete all familiy with same fk_facture_source. If not, only with id is removed
-     *
-     *  @param      User    $user       Object of user asking to delete
-     *  @return     int                 <0 if KO, >0 if OK
-     */
-    public function delete($user)
-    {
-        global $conf, $langs;
+	/**
+	 *  Delete object in database. If fk_facture_source is defined, we delete all familiy with same fk_facture_source. If not, only with id is removed
+	 *
+	 *  @param      User    $user       Object of user asking to delete
+	 *  @return     int                 <0 if KO, >0 if OK
+	 */
+	public function delete($user)
+	{
+		global $conf, $langs;
 
-        // Check if we can remove the discount
-        if ($this->fk_facture_source)
-        {
-            $sql = "SELECT COUNT(rowid) as nb";
-            $sql .= " FROM ".MAIN_DB_PREFIX."societe_remise_except";
-            $sql .= " WHERE (fk_facture_line IS NOT NULL"; // Not used as absolute simple discount
-            $sql .= " OR fk_facture IS NOT NULL)"; // Not used as credit note and not used as deposit
-            $sql .= " AND fk_facture_source = ".$this->fk_facture_source;
-            //$sql.=" AND rowid != ".$this->id;
+		// Check if we can remove the discount
+		if ($this->fk_facture_source)
+		{
+			$sql = "SELECT COUNT(rowid) as nb";
+			$sql .= " FROM ".MAIN_DB_PREFIX."societe_remise_except";
+			$sql .= " WHERE (fk_facture_line IS NOT NULL"; // Not used as absolute simple discount
+			$sql .= " OR fk_facture IS NOT NULL)"; // Not used as credit note and not used as deposit
+			$sql .= " AND fk_facture_source = ".$this->fk_facture_source;
+			//$sql.=" AND rowid != ".$this->id;
 
-            dol_syslog(get_class($this)."::delete Check if we can remove discount", LOG_DEBUG);
-            $resql = $this->db->query($sql);
-            if ($resql)
-            {
-                $obj = $this->db->fetch_object($resql);
-                if ($obj->nb > 0)
-                {
-                    $this->error = 'ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved';
-                    return -2;
-                }
-            } else {
-                dol_print_error($this->db);
-                return -1;
-            }
-        }
+			dol_syslog(get_class($this)."::delete Check if we can remove discount", LOG_DEBUG);
+			$resql = $this->db->query($sql);
+			if ($resql)
+			{
+				$obj = $this->db->fetch_object($resql);
+				if ($obj->nb > 0)
+				{
+					$this->error = 'ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved';
+					return -2;
+				}
+			} else {
+				dol_print_error($this->db);
+				return -1;
+			}
+		}
 
-        // Check if we can remove the discount
-        if ($this->fk_invoice_supplier_source)
-        {
-            $sql = "SELECT COUNT(rowid) as nb";
-            $sql .= " FROM ".MAIN_DB_PREFIX."societe_remise_except";
-        	$sql .= " WHERE (fk_invoice_supplier_line IS NOT NULL"; // Not used as absolute simple discount
-        	$sql .= " OR fk_invoice_supplier IS NOT NULL)"; // Not used as credit note and not used as deposit
-        	$sql .= " AND fk_invoice_supplier_source = ".$this->fk_invoice_supplier_source;
-        	//$sql.=" AND rowid != ".$this->id;
+		// Check if we can remove the discount
+		if ($this->fk_invoice_supplier_source)
+		{
+			$sql = "SELECT COUNT(rowid) as nb";
+			$sql .= " FROM ".MAIN_DB_PREFIX."societe_remise_except";
+			$sql .= " WHERE (fk_invoice_supplier_line IS NOT NULL"; // Not used as absolute simple discount
+			$sql .= " OR fk_invoice_supplier IS NOT NULL)"; // Not used as credit note and not used as deposit
+			$sql .= " AND fk_invoice_supplier_source = ".$this->fk_invoice_supplier_source;
+			//$sql.=" AND rowid != ".$this->id;
 
-        	dol_syslog(get_class($this)."::delete Check if we can remove discount", LOG_DEBUG);
-        	$resql = $this->db->query($sql);
-        	if ($resql)
-        	{
-        		$obj = $this->db->fetch_object($resql);
-        		if ($obj->nb > 0)
-        		{
-        			$this->error = 'ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved';
-        			return -2;
-        		}
-        	} else {
-        		dol_print_error($this->db);
-        		return -1;
-        	}
-        }
+			dol_syslog(get_class($this)."::delete Check if we can remove discount", LOG_DEBUG);
+			$resql = $this->db->query($sql);
+			if ($resql)
+			{
+				$obj = $this->db->fetch_object($resql);
+				if ($obj->nb > 0)
+				{
+					$this->error = 'ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved';
+					return -2;
+				}
+			} else {
+				dol_print_error($this->db);
+				return -1;
+			}
+		}
 
-        $this->db->begin();
+		$this->db->begin();
 
-        // Delete but only if not used
-        $sql = "DELETE FROM ".MAIN_DB_PREFIX."societe_remise_except ";
-        if ($this->fk_facture_source) $sql .= " WHERE fk_facture_source = ".$this->fk_facture_source; // Delete all lines of same serie
-        elseif ($this->fk_invoice_supplier_source) $sql .= " WHERE fk_invoice_supplier_source = ".$this->fk_invoice_supplier_source; // Delete all lines of same serie
-        else $sql .= " WHERE rowid = ".$this->id; // Delete only line
-        $sql .= " AND (fk_facture_line IS NULL"; // Not used as absolute simple discount
-        $sql .= " AND fk_facture IS NULL)"; // Not used as credit note and not used as deposit
-        $sql .= " AND (fk_invoice_supplier_line IS NULL"; // Not used as absolute simple discount
-        $sql .= " AND fk_invoice_supplier IS NULL)"; // Not used as credit note and not used as deposit
+		// Delete but only if not used
+		$sql = "DELETE FROM ".MAIN_DB_PREFIX."societe_remise_except ";
+		if ($this->fk_facture_source) $sql .= " WHERE fk_facture_source = ".$this->fk_facture_source; // Delete all lines of same serie
+		elseif ($this->fk_invoice_supplier_source) $sql .= " WHERE fk_invoice_supplier_source = ".$this->fk_invoice_supplier_source; // Delete all lines of same serie
+		else $sql .= " WHERE rowid = ".$this->id; // Delete only line
+		$sql .= " AND (fk_facture_line IS NULL"; // Not used as absolute simple discount
+		$sql .= " AND fk_facture IS NULL)"; // Not used as credit note and not used as deposit
+		$sql .= " AND (fk_invoice_supplier_line IS NULL"; // Not used as absolute simple discount
+		$sql .= " AND fk_invoice_supplier IS NULL)"; // Not used as credit note and not used as deposit
 
-        dol_syslog(get_class($this)."::delete Delete discount", LOG_DEBUG);
-        $result = $this->db->query($sql);
-        if ($result)
-        {
-            // If source of discount was a credit note or deposit, we change source statut.
-            if ($this->fk_facture_source)
-            {
-                $sql = "UPDATE ".MAIN_DB_PREFIX."facture";
-                $sql .= " set paye=0, fk_statut=1";
-                $sql .= " WHERE (type = 2 or type = 3) AND rowid=".$this->fk_facture_source;
+		dol_syslog(get_class($this)."::delete Delete discount", LOG_DEBUG);
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+			// If source of discount was a credit note or deposit, we change source statut.
+			if ($this->fk_facture_source)
+			{
+				$sql = "UPDATE ".MAIN_DB_PREFIX."facture";
+				$sql .= " set paye=0, fk_statut=1";
+				$sql .= " WHERE (type = 2 or type = 3) AND rowid=".$this->fk_facture_source;
 
-                dol_syslog(get_class($this)."::delete Update credit note or deposit invoice statut", LOG_DEBUG);
-                $result = $this->db->query($sql);
-                if ($result)
-                {
-                    $this->db->commit();
-                    return 1;
-                } else {
-                    $this->error = $this->db->lasterror();
-                    $this->db->rollback();
-                    return -1;
-                }
-            } elseif ($this->fk_invoice_supplier_source) {
-            	$sql = "UPDATE ".MAIN_DB_PREFIX."facture_fourn";
-            	$sql .= " set paye=0, fk_statut=1";
-            	$sql .= " WHERE (type = 2 or type = 3) AND rowid=".$this->fk_invoice_supplier_source;
+				dol_syslog(get_class($this)."::delete Update credit note or deposit invoice statut", LOG_DEBUG);
+				$result = $this->db->query($sql);
+				if ($result)
+				{
+					$this->db->commit();
+					return 1;
+				} else {
+					$this->error = $this->db->lasterror();
+					$this->db->rollback();
+					return -1;
+				}
+			} elseif ($this->fk_invoice_supplier_source) {
+				$sql = "UPDATE ".MAIN_DB_PREFIX."facture_fourn";
+				$sql .= " set paye=0, fk_statut=1";
+				$sql .= " WHERE (type = 2 or type = 3) AND rowid=".$this->fk_invoice_supplier_source;
 
-            	dol_syslog(get_class($this)."::delete Update credit note or deposit invoice statut", LOG_DEBUG);
-            	$result = $this->db->query($sql);
-            	if ($result)
-            	{
-            		$this->db->commit();
-            		return 1;
-            	} else {
-            		$this->error = $this->db->lasterror();
-            		$this->db->rollback();
-            		return -1;
-            	}
-            } else {
-                $this->db->commit();
-                return 1;
-            }
-        } else {
-            $this->error = $this->db->lasterror();
-            $this->db->rollback();
-            return -1;
-        }
-    }
+				dol_syslog(get_class($this)."::delete Update credit note or deposit invoice statut", LOG_DEBUG);
+				$result = $this->db->query($sql);
+				if ($result)
+				{
+					$this->db->commit();
+					return 1;
+				} else {
+					$this->error = $this->db->lasterror();
+					$this->db->rollback();
+					return -1;
+				}
+			} else {
+				$this->db->commit();
+				return 1;
+			}
+		} else {
+			$this->error = $this->db->lasterror();
+			$this->db->rollback();
+			return -1;
+		}
+	}
 
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *	Link the discount to a particular invoice line or a particular invoice.
-     *	When discount is a global discount used as an invoice line, we link using rowidline.
-     *	When discount is from a credit note used to reduce payment of an invoice, we link using rowidinvoice
-     *
-     *	@param		int		$rowidline		Invoice line id (To use discount into invoice lines)
-     *	@param		int		$rowidinvoice	Invoice id (To use discount as a credit note to reduc payment of invoice)
-     *	@return		int						<0 if KO, >0 if OK
-     */
-    public function link_to_invoice($rowidline, $rowidinvoice)
-    {
-        // phpcs:enable
-        // Check parameters
-        if (!$rowidline && !$rowidinvoice)
-        {
-            $this->error = 'ErrorBadParameters';
-            return -1;
-        }
-        if ($rowidline && $rowidinvoice)
-        {
-            $this->error = 'ErrorBadParameters';
-            return -2;
-        }
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *	Link the discount to a particular invoice line or a particular invoice.
+	 *	When discount is a global discount used as an invoice line, we link using rowidline.
+	 *	When discount is from a credit note used to reduce payment of an invoice, we link using rowidinvoice
+	 *
+	 *	@param		int		$rowidline		Invoice line id (To use discount into invoice lines)
+	 *	@param		int		$rowidinvoice	Invoice id (To use discount as a credit note to reduc payment of invoice)
+	 *	@return		int						<0 if KO, >0 if OK
+	 */
+	public function link_to_invoice($rowidline, $rowidinvoice)
+	{
+		// phpcs:enable
+		// Check parameters
+		if (!$rowidline && !$rowidinvoice)
+		{
+			$this->error = 'ErrorBadParameters';
+			return -1;
+		}
+		if ($rowidline && $rowidinvoice)
+		{
+			$this->error = 'ErrorBadParameters';
+			return -2;
+		}
 
-        $sql = "UPDATE ".MAIN_DB_PREFIX."societe_remise_except";
-        if (!empty($this->discount_type)) {
-        	if ($rowidline)    $sql .= " SET fk_invoice_supplier_line = ".$rowidline;
-        	if ($rowidinvoice) $sql .= " SET fk_invoice_supplier = ".$rowidinvoice;
-        } else {
-        	if ($rowidline)    $sql .= " SET fk_facture_line = ".$rowidline;
-        	if ($rowidinvoice) $sql .= " SET fk_facture = ".$rowidinvoice;
-        }
-        $sql .= " WHERE rowid = ".$this->id;
+		$sql = "UPDATE ".MAIN_DB_PREFIX."societe_remise_except";
+		if (!empty($this->discount_type)) {
+			if ($rowidline)    $sql .= " SET fk_invoice_supplier_line = ".$rowidline;
+			if ($rowidinvoice) $sql .= " SET fk_invoice_supplier = ".$rowidinvoice;
+		} else {
+			if ($rowidline)    $sql .= " SET fk_facture_line = ".$rowidline;
+			if ($rowidinvoice) $sql .= " SET fk_facture = ".$rowidinvoice;
+		}
+		$sql .= " WHERE rowid = ".$this->id;
 
-        dol_syslog(get_class($this)."::link_to_invoice", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-        	if (!empty($this->discount_type)) {
-        		$this->fk_invoice_supplier_line = $rowidline;
-        		$this->fk_invoice_supplier = $rowidinvoice;
-        	} else {
-        		$this->fk_facture_line = $rowidline;
-        		$this->fk_facture = $rowidinvoice;
-        	}
-            return 1;
-        } else {
-            $this->error = $this->db->error();
-            return -3;
-        }
-    }
+		dol_syslog(get_class($this)."::link_to_invoice", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			if (!empty($this->discount_type)) {
+				$this->fk_invoice_supplier_line = $rowidline;
+				$this->fk_invoice_supplier = $rowidinvoice;
+			} else {
+				$this->fk_facture_line = $rowidline;
+				$this->fk_facture = $rowidinvoice;
+			}
+			return 1;
+		} else {
+			$this->error = $this->db->error();
+			return -3;
+		}
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *	Link the discount to a particular invoice line or a particular invoice.
-     *	Do not call this if discount is linked to a reconcialiated invoice
-     *
-     *	@return		int							<0 if KO, >0 if OK
-     */
-    public function unlink_invoice()
-    {
-        // phpcs:enable
-        $sql = "UPDATE ".MAIN_DB_PREFIX."societe_remise_except";
-        if (!empty($this->discount_type)) {
-            $sql .= " SET fk_invoice_supplier_line = NULL, fk_invoice_supplier = NULL";
-        } else {
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *	Link the discount to a particular invoice line or a particular invoice.
+	 *	Do not call this if discount is linked to a reconcialiated invoice
+	 *
+	 *	@return		int							<0 if KO, >0 if OK
+	 */
+	public function unlink_invoice()
+	{
+		// phpcs:enable
+		$sql = "UPDATE ".MAIN_DB_PREFIX."societe_remise_except";
+		if (!empty($this->discount_type)) {
+			$sql .= " SET fk_invoice_supplier_line = NULL, fk_invoice_supplier = NULL";
+		} else {
 			$sql .= " SET fk_facture_line = NULL, fk_facture = NULL";
 		}
-        $sql .= " WHERE rowid = ".$this->id;
+		$sql .= " WHERE rowid = ".$this->id;
 
-        dol_syslog(get_class($this)."::unlink_invoice", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            return 1;
-        } else {
-            $this->error = $this->db->error();
-            return -3;
-        }
-    }
+		dol_syslog(get_class($this)."::unlink_invoice", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			return 1;
+		} else {
+			$this->error = $this->db->error();
+			return -3;
+		}
+	}
 
 
-    /**
-     *  Return amount (with tax) of discounts currently available for a company, user or other criteria
-     *
-     *	@param		Societe		$company		Object third party for filter
-     *	@param		User		$user			Filtre sur un user auteur des remises
-     * 	@param		string		$filter			Filtre autre
-     * 	@param		int			$maxvalue		Filter on max value for discount
-     *  @param      int			$discount_type  0 => customer discount, 1 => supplier discount
+	/**
+	 *  Return amount (with tax) of discounts currently available for a company, user or other criteria
+	 *
+	 *	@param		Societe		$company		Object third party for filter
+	 *	@param		User		$user			Filtre sur un user auteur des remises
+	 * 	@param		string		$filter			Filtre autre
+	 * 	@param		int			$maxvalue		Filter on max value for discount
+	 *  @param      int			$discount_type  0 => customer discount, 1 => supplier discount
 	 *  @param      int			$multicurrency  Return multicurrency_amount instead of amount
-     * 	@return		int						<0 if KO, amount otherwise
-     */
-    public function getAvailableDiscounts($company = '', $user = '', $filter = '', $maxvalue = 0, $discount_type = 0, $multicurrency = 0)
-    {
-        global $conf;
+	 * 	@return		int						<0 if KO, amount otherwise
+	 */
+	public function getAvailableDiscounts($company = '', $user = '', $filter = '', $maxvalue = 0, $discount_type = 0, $multicurrency = 0)
+	{
+		global $conf;
 
-        dol_syslog(get_class($this)."::getAvailableDiscounts discount_type=".$discount_type, LOG_DEBUG);
+		dol_syslog(get_class($this)."::getAvailableDiscounts discount_type=".$discount_type, LOG_DEBUG);
 
-        $sql = "SELECT SUM(rc.amount_ttc) as amount, SUM(rc.multicurrency_amount_ttc) as multicurrency_amount";
-        $sql .= " FROM ".MAIN_DB_PREFIX."societe_remise_except as rc";
-        $sql .= " WHERE rc.entity = ".$conf->entity;
-        $sql .= " AND rc.discount_type=".intval($discount_type);
-        if (!empty($discount_type)) {
-        	$sql .= " AND (rc.fk_invoice_supplier IS NULL AND rc.fk_invoice_supplier_line IS NULL)"; // Available from supplier
-        } else {
-        	$sql .= " AND (rc.fk_facture IS NULL AND rc.fk_facture_line IS NULL)"; // Available to customer
-        }
-        if (is_object($company)) $sql .= " AND rc.fk_soc = ".$company->id;
-        if (is_object($user))    $sql .= " AND rc.fk_user = ".$user->id;
-        if ($filter)   $sql .= ' AND ('.$filter.')';
-        if ($maxvalue) $sql .= ' AND rc.amount_ttc <= '.price2num($maxvalue);
+		$sql = "SELECT SUM(rc.amount_ttc) as amount, SUM(rc.multicurrency_amount_ttc) as multicurrency_amount";
+		$sql .= " FROM ".MAIN_DB_PREFIX."societe_remise_except as rc";
+		$sql .= " WHERE rc.entity = ".$conf->entity;
+		$sql .= " AND rc.discount_type=".intval($discount_type);
+		if (!empty($discount_type)) {
+			$sql .= " AND (rc.fk_invoice_supplier IS NULL AND rc.fk_invoice_supplier_line IS NULL)"; // Available from supplier
+		} else {
+			$sql .= " AND (rc.fk_facture IS NULL AND rc.fk_facture_line IS NULL)"; // Available to customer
+		}
+		if (is_object($company)) $sql .= " AND rc.fk_soc = ".$company->id;
+		if (is_object($user))    $sql .= " AND rc.fk_user = ".$user->id;
+		if ($filter)   $sql .= ' AND ('.$filter.')';
+		if ($maxvalue) $sql .= ' AND rc.amount_ttc <= '.price2num($maxvalue);
 
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            $obj = $this->db->fetch_object($resql);
-            //while ($obj)
-            //{
-            //print 'zz'.$obj->amount;
-            //$obj = $this->db->fetch_object($resql);
-            //}
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$obj = $this->db->fetch_object($resql);
+			//while ($obj)
+			//{
+			//print 'zz'.$obj->amount;
+			//$obj = $this->db->fetch_object($resql);
+			//}
 			if ($multicurrency)
 			{
 				return $obj->amount_multicurrency;
 			}
 
-            return $obj->amount;
-        }
-        return -1;
-    }
-
-
-    /**
-     *  Return amount (with tax) of all deposits invoices used by invoice as a payment.
-     *  Should always be empty, except if option FACTURE_DEPOSITS_ARE_JUST_PAYMENTS is on (not recommended).
-     *
-     *	@param		CommonInvoice	$invoice		Object invoice (customer of supplier)
-     *  @param 		int 		    $multicurrency 	1=Return multicurrency_amount instead of amount
-     *	@return		int				     			<0 if KO, Sum of credit notes and deposits amount otherwise
-     */
-    public function getSumDepositsUsed($invoice, $multicurrency = 0)
-    {
-        dol_syslog(get_class($this)."::getSumDepositsUsed", LOG_DEBUG);
-
-        if ($invoice->element == 'facture' || $invoice->element == 'invoice')
-        {
-            $sql = 'SELECT sum(rc.amount_ttc) as amount, sum(rc.multicurrency_amount_ttc) as multicurrency_amount';
-            $sql .= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc, '.MAIN_DB_PREFIX.'facture as f';
-            $sql .= ' WHERE rc.fk_facture_source=f.rowid AND rc.fk_facture = '.$invoice->id;
-            $sql .= ' AND f.type = 3';
-        } elseif ($invoice->element == 'invoice_supplier')
-        {
-            $sql = 'SELECT sum(rc.amount_ttc) as amount, sum(rc.multicurrency_amount_ttc) as multicurrency_amount';
-            $sql .= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc, '.MAIN_DB_PREFIX.'facture_fourn as f';
-            $sql .= ' WHERE rc.fk_invoice_supplier_source=f.rowid AND rc.fk_invoice_supplier = '.$invoice->id;
-            $sql .= ' AND f.type = 3';
-        } else {
-            $this->error = get_class($this)."::getSumDepositsUsed was called with a bad object as a first parameter";
-            dol_print_error($this->error);
-            return -1;
-        }
-
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            $obj = $this->db->fetch_object($resql);
-            if ($multicurrency == 1) return $obj->multicurrency_amount;
-			else return $obj->amount;
-        } else {
-            $this->error = $this->db->lasterror();
-            return -1;
-        }
-    }
-
-    /**
-     *  Return amount (with tax) of all credit notes invoices + excess received used by invoice as a payment
-     *
-     *	@param      CommonInvoice	  $invoice	    	Object invoice
-     *	@param      int			      $multicurrency	1=Return multicurrency_amount instead of amount
-     *	@return     int					        		<0 if KO, Sum of credit notes and excess received amount otherwise
-     */
-    public function getSumCreditNotesUsed($invoice, $multicurrency = 0)
-    {
-        dol_syslog(get_class($this)."::getSumCreditNotesUsed", LOG_DEBUG);
-
-        if ($invoice->element == 'facture' || $invoice->element == 'invoice')
-        {
-            $sql = 'SELECT sum(rc.amount_ttc) as amount, sum(rc.multicurrency_amount_ttc) as multicurrency_amount';
-            $sql .= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc, '.MAIN_DB_PREFIX.'facture as f';
-            $sql .= ' WHERE rc.fk_facture_source=f.rowid AND rc.fk_facture = '.$invoice->id;
-            $sql .= ' AND f.type IN ('.$invoice::TYPE_STANDARD.', '.$invoice::TYPE_CREDIT_NOTE.', '.$invoice::TYPE_SITUATION.')'; // Find discount coming from credit note or excess received
-        } elseif ($invoice->element == 'invoice_supplier')
-        {
-            $sql = 'SELECT sum(rc.amount_ttc) as amount, sum(rc.multicurrency_amount_ttc) as multicurrency_amount';
-            $sql .= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc, '.MAIN_DB_PREFIX.'facture_fourn as f';
-            $sql .= ' WHERE rc.fk_invoice_supplier_source=f.rowid AND rc.fk_invoice_supplier = '.$invoice->id;
-            $sql .= ' AND f.type IN ('.$invoice::TYPE_STANDARD.', '.$invoice::TYPE_CREDIT_NOTE.')'; // Find discount coming from credit note or excess paid
-        } else {
-            $this->error = get_class($this)."::getSumCreditNotesUsed was called with a bad object as a first parameter";
-            dol_print_error($this->error);
-            return -1;
-        }
-
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            $obj = $this->db->fetch_object($resql);
-            if ($multicurrency == 1) return $obj->multicurrency_amount;
-			else return $obj->amount;
-        } else {
-            $this->error = $this->db->lasterror();
-            return -1;
-        }
-    }
-    /**
-     *    	Return amount (with tax) of all converted amount for this credit note
-     *
-     *	@param		CommonInvoice	  $invoice	    	Object invoice
-	 *	@param		int			      $multicurrency	Return multicurrency_amount instead of amount
-     *	@return		int					        		<0 if KO, Sum of credit notes and deposits amount otherwise
-     */
-    public function getSumFromThisCreditNotesNotUsed($invoice, $multicurrency = 0)
-    {
-        dol_syslog(get_class($this)."::getSumCreditNotesUsed", LOG_DEBUG);
-
-        if ($invoice->element == 'facture' || $invoice->element == 'invoice')
-        {
-            $sql = 'SELECT sum(rc.amount_ttc) as amount, sum(rc.multicurrency_amount_ttc) as multicurrency_amount';
-            $sql .= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc';
-            $sql .= ' WHERE rc.fk_facture IS NULL AND rc.fk_facture_source = '.$invoice->id;
-        } elseif ($invoice->element == 'invoice_supplier')
-        {
-            $sql = 'SELECT sum(rc.amount_ttc) as amount, sum(rc.multicurrency_amount_ttc) as multicurrency_amount';
-            $sql .= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc';
-            $sql .= ' WHERE rc.fk_invoice_supplier IS NULL AND rc.fk_invoice_supplier_source = '.$invoice->id;
-        } else {
-            $this->error = get_class($this)."::getSumCreditNotesUsed was called with a bad object as a first parameter";
-            dol_print_error($this->error);
-            return -1;
-        }
-
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            $obj = $this->db->fetch_object($resql);
-            if ($multicurrency) return $obj->multicurrency_amount;
-			else return $obj->amount;
-        } else {
-            $this->error = $this->db->lasterror();
-            return -1;
-        }
-    }
-
-    /**
-     *  Return clickable ref of object (with picto or not)
-     *
-     *  @param		int		$withpicto		0=No picto, 1=Include picto into link, 2=Picto only
-     *  @param		string	$option			Where to link to ('invoice' or 'discount')
-     *  @return		string					String with URL
-     */
-    public function getNomUrl($withpicto, $option = 'invoice')
-    {
-        global $langs;
-
-        $result = '';
-        $link = '';
-        $linkend = '';
-        $label = '';
-        $picto = '';
-        $ref = '';
-
-        if ($option == 'invoice') {
-            $facid = !empty($this->discount_type) ? $this->fk_invoice_supplier_source : $this->fk_facture_source;
-            $link = !empty($this->discount_type) ? '/fourn/facture/card.php' : '/compta/facture/card.php';
-            $label = $langs->trans("ShowSourceInvoice").': '.$this->ref_facture_source;
-            $link = '<a href="'.DOL_URL_ROOT.$link.'?facid='.$facid.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
-            $linkend = '</a>';
-            $ref = !empty($this->discount_type) ? $this->ref_invoice_supplier_source : $this->ref_facture_source;
-            $picto = 'bill';
-        }
-        if ($option == 'discount') {
-            $label = $langs->trans("Discount");
-            $link = '<a href="'.DOL_URL_ROOT.'/comm/remx.php?id='.$this->fk_soc.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
-            $linkend = '</a>';
-            $ref = $langs->trans("Discount");
-            $picto = 'generic';
-        }
-
-
-        if ($withpicto) $result .= ($link.img_object($label, $picto, 'class="classfortooltip"').$linkend);
-        if ($withpicto && $withpicto != 2) $result .= ' ';
-        $result .= $link.$ref.$linkend;
-        return $result;
-    }
+			return $obj->amount;
+		}
+		return -1;
+	}
 
 
 	/**
-     *  Initialise an instance with random values.
-     *  Used to build previews or test instances.
-     *	id must be 0 if object instance is a specimen.
-     *
-     *  @return	void
+	 *  Return amount (with tax) of all deposits invoices used by invoice as a payment.
+	 *  Should always be empty, except if option FACTURE_DEPOSITS_ARE_JUST_PAYMENTS is on (not recommended).
+	 *
+	 *	@param		CommonInvoice	$invoice		Object invoice (customer of supplier)
+	 *  @param 		int 		    $multicurrency 	1=Return multicurrency_amount instead of amount
+	 *	@return		int				     			<0 if KO, Sum of credit notes and deposits amount otherwise
+	 */
+	public function getSumDepositsUsed($invoice, $multicurrency = 0)
+	{
+		dol_syslog(get_class($this)."::getSumDepositsUsed", LOG_DEBUG);
+
+		if ($invoice->element == 'facture' || $invoice->element == 'invoice')
+		{
+			$sql = 'SELECT sum(rc.amount_ttc) as amount, sum(rc.multicurrency_amount_ttc) as multicurrency_amount';
+			$sql .= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc, '.MAIN_DB_PREFIX.'facture as f';
+			$sql .= ' WHERE rc.fk_facture_source=f.rowid AND rc.fk_facture = '.$invoice->id;
+			$sql .= ' AND f.type = 3';
+		} elseif ($invoice->element == 'invoice_supplier')
+		{
+			$sql = 'SELECT sum(rc.amount_ttc) as amount, sum(rc.multicurrency_amount_ttc) as multicurrency_amount';
+			$sql .= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc, '.MAIN_DB_PREFIX.'facture_fourn as f';
+			$sql .= ' WHERE rc.fk_invoice_supplier_source=f.rowid AND rc.fk_invoice_supplier = '.$invoice->id;
+			$sql .= ' AND f.type = 3';
+		} else {
+			$this->error = get_class($this)."::getSumDepositsUsed was called with a bad object as a first parameter";
+			dol_print_error($this->error);
+			return -1;
+		}
+
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$obj = $this->db->fetch_object($resql);
+			if ($multicurrency == 1) return $obj->multicurrency_amount;
+			else return $obj->amount;
+		} else {
+			$this->error = $this->db->lasterror();
+			return -1;
+		}
+	}
+
+	/**
+	 *  Return amount (with tax) of all credit notes invoices + excess received used by invoice as a payment
+	 *
+	 *	@param      CommonInvoice	  $invoice	    	Object invoice
+	 *	@param      int			      $multicurrency	1=Return multicurrency_amount instead of amount
+	 *	@return     int					        		<0 if KO, Sum of credit notes and excess received amount otherwise
+	 */
+	public function getSumCreditNotesUsed($invoice, $multicurrency = 0)
+	{
+		dol_syslog(get_class($this)."::getSumCreditNotesUsed", LOG_DEBUG);
+
+		if ($invoice->element == 'facture' || $invoice->element == 'invoice')
+		{
+			$sql = 'SELECT sum(rc.amount_ttc) as amount, sum(rc.multicurrency_amount_ttc) as multicurrency_amount';
+			$sql .= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc, '.MAIN_DB_PREFIX.'facture as f';
+			$sql .= ' WHERE rc.fk_facture_source=f.rowid AND rc.fk_facture = '.$invoice->id;
+			$sql .= ' AND f.type IN ('.$invoice::TYPE_STANDARD.', '.$invoice::TYPE_CREDIT_NOTE.', '.$invoice::TYPE_SITUATION.')'; // Find discount coming from credit note or excess received
+		} elseif ($invoice->element == 'invoice_supplier')
+		{
+			$sql = 'SELECT sum(rc.amount_ttc) as amount, sum(rc.multicurrency_amount_ttc) as multicurrency_amount';
+			$sql .= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc, '.MAIN_DB_PREFIX.'facture_fourn as f';
+			$sql .= ' WHERE rc.fk_invoice_supplier_source=f.rowid AND rc.fk_invoice_supplier = '.$invoice->id;
+			$sql .= ' AND f.type IN ('.$invoice::TYPE_STANDARD.', '.$invoice::TYPE_CREDIT_NOTE.')'; // Find discount coming from credit note or excess paid
+		} else {
+			$this->error = get_class($this)."::getSumCreditNotesUsed was called with a bad object as a first parameter";
+			dol_print_error($this->error);
+			return -1;
+		}
+
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$obj = $this->db->fetch_object($resql);
+			if ($multicurrency == 1) return $obj->multicurrency_amount;
+			else return $obj->amount;
+		} else {
+			$this->error = $this->db->lasterror();
+			return -1;
+		}
+	}
+	/**
+	 *    	Return amount (with tax) of all converted amount for this credit note
+	 *
+	 *	@param		CommonInvoice	  $invoice	    	Object invoice
+	 *	@param		int			      $multicurrency	Return multicurrency_amount instead of amount
+	 *	@return		int					        		<0 if KO, Sum of credit notes and deposits amount otherwise
+	 */
+	public function getSumFromThisCreditNotesNotUsed($invoice, $multicurrency = 0)
+	{
+		dol_syslog(get_class($this)."::getSumCreditNotesUsed", LOG_DEBUG);
+
+		if ($invoice->element == 'facture' || $invoice->element == 'invoice')
+		{
+			$sql = 'SELECT sum(rc.amount_ttc) as amount, sum(rc.multicurrency_amount_ttc) as multicurrency_amount';
+			$sql .= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc';
+			$sql .= ' WHERE rc.fk_facture IS NULL AND rc.fk_facture_source = '.$invoice->id;
+		} elseif ($invoice->element == 'invoice_supplier')
+		{
+			$sql = 'SELECT sum(rc.amount_ttc) as amount, sum(rc.multicurrency_amount_ttc) as multicurrency_amount';
+			$sql .= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc';
+			$sql .= ' WHERE rc.fk_invoice_supplier IS NULL AND rc.fk_invoice_supplier_source = '.$invoice->id;
+		} else {
+			$this->error = get_class($this)."::getSumCreditNotesUsed was called with a bad object as a first parameter";
+			dol_print_error($this->error);
+			return -1;
+		}
+
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$obj = $this->db->fetch_object($resql);
+			if ($multicurrency) return $obj->multicurrency_amount;
+			else return $obj->amount;
+		} else {
+			$this->error = $this->db->lasterror();
+			return -1;
+		}
+	}
+
+	/**
+	 *  Return clickable ref of object (with picto or not)
+	 *
+	 *  @param		int		$withpicto		0=No picto, 1=Include picto into link, 2=Picto only
+	 *  @param		string	$option			Where to link to ('invoice' or 'discount')
+	 *  @return		string					String with URL
+	 */
+	public function getNomUrl($withpicto, $option = 'invoice')
+	{
+		global $langs;
+
+		$result = '';
+		$link = '';
+		$linkend = '';
+		$label = '';
+		$picto = '';
+		$ref = '';
+
+		if ($option == 'invoice') {
+			$facid = !empty($this->discount_type) ? $this->fk_invoice_supplier_source : $this->fk_facture_source;
+			$link = !empty($this->discount_type) ? '/fourn/facture/card.php' : '/compta/facture/card.php';
+			$label = $langs->trans("ShowSourceInvoice").': '.$this->ref_facture_source;
+			$link = '<a href="'.DOL_URL_ROOT.$link.'?facid='.$facid.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
+			$linkend = '</a>';
+			$ref = !empty($this->discount_type) ? $this->ref_invoice_supplier_source : $this->ref_facture_source;
+			$picto = 'bill';
+		}
+		if ($option == 'discount') {
+			$label = $langs->trans("Discount");
+			$link = '<a href="'.DOL_URL_ROOT.'/comm/remx.php?id='.$this->fk_soc.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
+			$linkend = '</a>';
+			$ref = $langs->trans("Discount");
+			$picto = 'generic';
+		}
+
+
+		if ($withpicto) $result .= ($link.img_object($label, $picto, 'class="classfortooltip"').$linkend);
+		if ($withpicto && $withpicto != 2) $result .= ' ';
+		$result .= $link.$ref.$linkend;
+		return $result;
+	}
+
+
+	/**
+	 *  Initialise an instance with random values.
+	 *  Used to build previews or test instances.
+	 *	id must be 0 if object instance is a specimen.
+	 *
+	 *  @return	void
 	 */
 	public function initAsSpecimen()
 	{
diff --git a/htdocs/core/class/doleditor.class.php b/htdocs/core/class/doleditor.class.php
index 55474850b8e..a5405fd7158 100644
--- a/htdocs/core/class/doleditor.class.php
+++ b/htdocs/core/class/doleditor.class.php
@@ -28,132 +28,132 @@
  */
 class DolEditor
 {
-    public $tool; // Store the selected tool
+	public $tool; // Store the selected tool
 
-    // If using fckeditor
-    public $editor;
+	// If using fckeditor
+	public $editor;
 
-    // If not using fckeditor
-    public $content;
-    public $htmlname;
-    public $toolbarname;
-    public $toolbarstartexpanded;
-    public $rows;
-    public $cols;
-    public $height;
-    public $width;
-    public $readonly;
+	// If not using fckeditor
+	public $content;
+	public $htmlname;
+	public $toolbarname;
+	public $toolbarstartexpanded;
+	public $rows;
+	public $cols;
+	public $height;
+	public $width;
+	public $readonly;
 
 
-    /**
-     *  Create an object to build an HTML area to edit a large string content
-     *
-     *  @param 	string	$htmlname		        		HTML name of WYSIWIG field
-     *  @param 	string	$content		        		Content of WYSIWIG field
-     *  @param	int		$width							Width in pixel of edit area (auto by default)
-     *  @param 	int		$height			       		 	Height in pixel of edit area (200px by default)
-     *  @param 	string	$toolbarname	       		 	Name of bar set to use ('Full', 'dolibarr_notes[_encoded]', 'dolibarr_details[_encoded]'=the less featured, 'dolibarr_mailings[_encoded]', 'dolibarr_readonly').
-     *  @param  string	$toolbarlocation       			Where bar is stored :
-     *                       		                    'In' each window has its own toolbar
-     *                              		            'Out:name' share toolbar into the div called 'name'
-     *  @param  boolean	$toolbarstartexpanded  			Bar is visible or not at start
+	/**
+	 *  Create an object to build an HTML area to edit a large string content
+	 *
+	 *  @param 	string	$htmlname		        		HTML name of WYSIWIG field
+	 *  @param 	string	$content		        		Content of WYSIWIG field
+	 *  @param	int		$width							Width in pixel of edit area (auto by default)
+	 *  @param 	int		$height			       		 	Height in pixel of edit area (200px by default)
+	 *  @param 	string	$toolbarname	       		 	Name of bar set to use ('Full', 'dolibarr_notes[_encoded]', 'dolibarr_details[_encoded]'=the less featured, 'dolibarr_mailings[_encoded]', 'dolibarr_readonly').
+	 *  @param  string	$toolbarlocation       			Where bar is stored :
+	 *                       		                    'In' each window has its own toolbar
+	 *                              		            'Out:name' share toolbar into the div called 'name'
+	 *  @param  boolean	$toolbarstartexpanded  			Bar is visible or not at start
 	 *  @param	int		$uselocalbrowser				Enabled to add links to local object with local browser. If false, only external images can be added in content.
 	 *  @param  boolean|string	$okforextendededitor    True=Allow usage of extended editor tool if qualified (like ckeditor). If 'textarea', force use of simple textarea. If 'ace', force use of Ace.
 	 *                                                  Warning: If you use 'ace', don't forget to also include ace.js in page header. Also, the button "save" must have class="buttonforacesave".
-     *  @param  int		$rows                   		Size of rows for textarea tool
+	 *  @param  int		$rows                   		Size of rows for textarea tool
 	 *  @param  string	$cols                   		Size of cols for textarea tool (textarea number of cols '70' or percent 'x%')
 	 *  @param	int		$readonly						0=Read/Edit, 1=Read only
 	 */
-    public function __construct($htmlname, $content, $width = '', $height = 200, $toolbarname = 'Basic', $toolbarlocation = 'In', $toolbarstartexpanded = false, $uselocalbrowser = true, $okforextendededitor = true, $rows = 0, $cols = 0, $readonly = 0)
-    {
-    	global $conf, $langs;
+	public function __construct($htmlname, $content, $width = '', $height = 200, $toolbarname = 'Basic', $toolbarlocation = 'In', $toolbarstartexpanded = false, $uselocalbrowser = true, $okforextendededitor = true, $rows = 0, $cols = 0, $readonly = 0)
+	{
+		global $conf, $langs;
 
-    	dol_syslog(get_class($this)."::DolEditor htmlname=".$htmlname." width=".$width." height=".$height." toolbarname=".$toolbarname);
+		dol_syslog(get_class($this)."::DolEditor htmlname=".$htmlname." width=".$width." height=".$height." toolbarname=".$toolbarname);
 
-    	if (!$rows) $rows = round($height / 20);
-    	if (!$cols) $cols = ($width ?round($width / 6) : 80);
+		if (!$rows) $rows = round($height / 20);
+		if (!$cols) $cols = ($width ?round($width / 6) : 80);
 		$shorttoolbarname = preg_replace('/_encoded$/', '', $toolbarname);
 
-        // Name of extended editor to use (FCKEDITOR_EDITORNAME can be 'ckeditor' or 'fckeditor')
-        $defaulteditor = 'ckeditor';
-        $this->tool = empty($conf->global->FCKEDITOR_EDITORNAME) ? $defaulteditor : $conf->global->FCKEDITOR_EDITORNAME;
-        $this->uselocalbrowser = $uselocalbrowser;
-        $this->readonly = $readonly;
+		// Name of extended editor to use (FCKEDITOR_EDITORNAME can be 'ckeditor' or 'fckeditor')
+		$defaulteditor = 'ckeditor';
+		$this->tool = empty($conf->global->FCKEDITOR_EDITORNAME) ? $defaulteditor : $conf->global->FCKEDITOR_EDITORNAME;
+		$this->uselocalbrowser = $uselocalbrowser;
+		$this->readonly = $readonly;
 
-        // Check if extended editor is ok. If not we force textarea
-        if ((empty($conf->fckeditor->enabled) && $okforextendededitor != 'ace') || empty($okforextendededitor)) $this->tool = 'textarea';
+		// Check if extended editor is ok. If not we force textarea
+		if ((empty($conf->fckeditor->enabled) && $okforextendededitor != 'ace') || empty($okforextendededitor)) $this->tool = 'textarea';
 		if ($okforextendededitor === 'ace') $this->tool = 'ace';
-        //if ($conf->dol_use_jmobile) $this->tool = 'textarea';       // ckeditor and ace seems ok with mobile
+		//if ($conf->dol_use_jmobile) $this->tool = 'textarea';       // ckeditor and ace seems ok with mobile
 
-    	// Define some properties
-        if (in_array($this->tool, array('textarea', 'ckeditor', 'ace')))
-        {
-        	if ($this->tool == 'ckeditor' && ! dol_textishtml($content)) {	// We force content to be into HTML if we are using an advanced editor if content is not HTML.
-        		$this->content = dol_nl2br($content);
-        	}
-        	else {
-    	    	$this->content = $content;
-        	}
-    	    $this->htmlname 			= $htmlname;
-    	    $this->toolbarname = $shorttoolbarname;
-    	    $this->toolbarstartexpanded = $toolbarstartexpanded;
-            $this->rows					= max(ROWS_3, $rows);
-            $this->cols					= (preg_match('/%/', $cols) ? $cols : max(40, $cols)); // If $cols is a percent, we keep it, otherwise, we take max
-            $this->height = $height;
-            $this->width				= $width;
-        }
-    }
+		// Define some properties
+		if (in_array($this->tool, array('textarea', 'ckeditor', 'ace')))
+		{
+			if ($this->tool == 'ckeditor' && !dol_textishtml($content)) {	// We force content to be into HTML if we are using an advanced editor if content is not HTML.
+				$this->content = dol_nl2br($content);
+			}
+			else {
+				$this->content = $content;
+			}
+			$this->htmlname 			= $htmlname;
+			$this->toolbarname = $shorttoolbarname;
+			$this->toolbarstartexpanded = $toolbarstartexpanded;
+			$this->rows					= max(ROWS_3, $rows);
+			$this->cols					= (preg_match('/%/', $cols) ? $cols : max(40, $cols)); // If $cols is a percent, we keep it, otherwise, we take max
+			$this->height = $height;
+			$this->width				= $width;
+		}
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *	Output edit area inside the HTML stream.
-     *	Output depends on this->tool (fckeditor, ckeditor, textarea, ...)
-     *
-     *  @param	int		$noprint             1=Return HTML string instead of printing it to output
-     *  @param	string	$morejs		         Add more js. For example: ".on( \'saveSnapshot\', function(e) { alert(\'ee\'); });". Used by CKEditor only.
-     *  @param  boolean $disallowAnyContent  Disallow to use any content. true=restrict to a predefined list of allowed elements. Used by CKEditor only.
-     *  @param	string	$titlecontent		 Show title content before editor area. Used by ACE editor only.
-     *  @param	string	$option				 For ACE editor, set the source language ('html', 'php', 'javascript', ...)
-     *  @return	void|string
-     */
-    public function Create($noprint = 0, $morejs = '', $disallowAnyContent = true, $titlecontent = '', $option = '')
-    {
-        // phpcs:enable
-    	global $conf, $langs;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *	Output edit area inside the HTML stream.
+	 *	Output depends on this->tool (fckeditor, ckeditor, textarea, ...)
+	 *
+	 *  @param	int		$noprint             1=Return HTML string instead of printing it to output
+	 *  @param	string	$morejs		         Add more js. For example: ".on( \'saveSnapshot\', function(e) { alert(\'ee\'); });". Used by CKEditor only.
+	 *  @param  boolean $disallowAnyContent  Disallow to use any content. true=restrict to a predefined list of allowed elements. Used by CKEditor only.
+	 *  @param	string	$titlecontent		 Show title content before editor area. Used by ACE editor only.
+	 *  @param	string	$option				 For ACE editor, set the source language ('html', 'php', 'javascript', ...)
+	 *  @return	void|string
+	 */
+	public function Create($noprint = 0, $morejs = '', $disallowAnyContent = true, $titlecontent = '', $option = '')
+	{
+		// phpcs:enable
+		global $conf, $langs;
 
-    	$fullpage = false;
-    	if (isset($conf->global->FCKEDITOR_ALLOW_ANY_CONTENT))
-    	{
-            $disallowAnyContent = empty($conf->global->FCKEDITOR_ALLOW_ANY_CONTENT); // Only predefined list of html tags are allowed or all
-    	}
+		$fullpage = false;
+		if (isset($conf->global->FCKEDITOR_ALLOW_ANY_CONTENT))
+		{
+			$disallowAnyContent = empty($conf->global->FCKEDITOR_ALLOW_ANY_CONTENT); // Only predefined list of html tags are allowed or all
+		}
 
-    	$found = 0;
+		$found = 0;
 		$out = '';
 
-        if (in_array($this->tool, array('textarea', 'ckeditor')))
-        {
-            $found = 1;
-            //$out.= '<textarea id="'.$this->htmlname.'" name="'.$this->htmlname.'" '.($this->readonly?' disabled':'').' rows="'.$this->rows.'"'.(preg_match('/%/',$this->cols)?' style="margin-top: 5px; width: '.$this->cols.'"':' cols="'.$this->cols.'"').' class="flat">';
-            // TODO We do not put the 'disabled' tag because on a read form, it change style with grey.
-            //print $this->content;
-            $out .= '<textarea id="'.$this->htmlname.'" name="'.$this->htmlname.'" rows="'.$this->rows.'"'.(preg_match('/%/', $this->cols) ? ' style="margin-top: 5px; width: '.$this->cols.'"' : ' cols="'.$this->cols.'"').' class="flat">';
-            $out .= htmlspecialchars($this->content);
-            $out .= '</textarea>';
+		if (in_array($this->tool, array('textarea', 'ckeditor')))
+		{
+			$found = 1;
+			//$out.= '<textarea id="'.$this->htmlname.'" name="'.$this->htmlname.'" '.($this->readonly?' disabled':'').' rows="'.$this->rows.'"'.(preg_match('/%/',$this->cols)?' style="margin-top: 5px; width: '.$this->cols.'"':' cols="'.$this->cols.'"').' class="flat">';
+			// TODO We do not put the 'disabled' tag because on a read form, it change style with grey.
+			//print $this->content;
+			$out .= '<textarea id="'.$this->htmlname.'" name="'.$this->htmlname.'" rows="'.$this->rows.'"'.(preg_match('/%/', $this->cols) ? ' style="margin-top: 5px; width: '.$this->cols.'"' : ' cols="'.$this->cols.'"').' class="flat">';
+			$out .= htmlspecialchars($this->content);
+			$out .= '</textarea>';
 
-            if ($this->tool == 'ckeditor' && !empty($conf->use_javascript_ajax) && !empty($conf->fckeditor->enabled))
-            {
-            	if (!defined('REQUIRE_CKEDITOR')) define('REQUIRE_CKEDITOR', '1');
+			if ($this->tool == 'ckeditor' && !empty($conf->use_javascript_ajax) && !empty($conf->fckeditor->enabled))
+			{
+				if (!defined('REQUIRE_CKEDITOR')) define('REQUIRE_CKEDITOR', '1');
 
-            	if (!empty($conf->global->FCKEDITOR_SKIN)) {
+				if (!empty($conf->global->FCKEDITOR_SKIN)) {
 					$skin = $conf->global->FCKEDITOR_SKIN;
 				} else {
 					$skin = 'moono-lisa'; // default with ckeditor 4.6 : moono-lisa
 				}
 
-            	$htmlencode_force = preg_match('/_encoded$/', $this->toolbarname) ? 'true' : 'false';
+				$htmlencode_force = preg_match('/_encoded$/', $this->toolbarname) ? 'true' : 'false';
 
-            	$out .= '<!-- Output ckeditor $disallowAnyContent='.$disallowAnyContent.' toolbarname='.$this->toolbarname.' -->'."\n";
-            	$out .= '<script type="text/javascript">
+				$out .= '<!-- Output ckeditor $disallowAnyContent='.$disallowAnyContent.' toolbarname='.$this->toolbarname.' -->'."\n";
+				$out .= '<script type="text/javascript">
             			$(document).ready(function () {
 							/* console.log("Run ckeditor"); */
                             /* if (CKEDITOR.loadFullCore) CKEDITOR.loadFullCore(); */
@@ -191,16 +191,16 @@ class DolEditor
                                             },
 											disableNativeSpellChecker: '.(empty($conf->global->CKEDITOR_NATIVE_SPELLCHECKER) ? 'true' : 'false');
 
-            	if ($this->uselocalbrowser)
-            	{
-                    $out .= ','."\n";
-                    // To use filemanager with old fckeditor (GPL)
-                    $out .= '    filebrowserBrowseUrl : ckeditorFilebrowserBrowseUrl,';
-                    $out .= '    filebrowserImageBrowseUrl : ckeditorFilebrowserImageBrowseUrl,';
-                    //$out.= '    filebrowserUploadUrl : \''.DOL_URL_ROOT.'/includes/fckeditor/editor/filemanagerdol/connectors/php/upload.php?Type=File\',';
-                    //$out.= '    filebrowserImageUploadUrl : \''.DOL_URL_ROOT.'/includes/fckeditor/editor/filemanagerdol/connectors/php/upload.php?Type=Image\',';
-                    $out .= "\n";
-                    // To use filemanager with ckfinder (Non free) and ckfinder directory is inside htdocs/includes
+				if ($this->uselocalbrowser)
+				{
+					$out .= ','."\n";
+					// To use filemanager with old fckeditor (GPL)
+					$out .= '    filebrowserBrowseUrl : ckeditorFilebrowserBrowseUrl,';
+					$out .= '    filebrowserImageBrowseUrl : ckeditorFilebrowserImageBrowseUrl,';
+					//$out.= '    filebrowserUploadUrl : \''.DOL_URL_ROOT.'/includes/fckeditor/editor/filemanagerdol/connectors/php/upload.php?Type=File\',';
+					//$out.= '    filebrowserImageUploadUrl : \''.DOL_URL_ROOT.'/includes/fckeditor/editor/filemanagerdol/connectors/php/upload.php?Type=Image\',';
+					$out .= "\n";
+					// To use filemanager with ckfinder (Non free) and ckfinder directory is inside htdocs/includes
 					/* $out.= '    filebrowserBrowseUrl : \''.DOL_URL_ROOT.'/includes/ckfinder/ckfinder.html\',
                                filebrowserImageBrowseUrl : \''.DOL_URL_ROOT.'/includes/ckfinder/ckfinder.html?Type=Images\',
                                filebrowserFlashBrowseUrl : \''.DOL_URL_ROOT.'/includes/ckfinder/ckfinder.html?Type=Flash\',
@@ -208,34 +208,34 @@ class DolEditor
                                filebrowserImageUploadUrl : \''.DOL_URL_ROOT.'/includes/ckfinder/core/connector/php/connector.php?command=QuickUpload&type=Images\',
                                filebrowserFlashUploadUrl : \''.DOL_URL_ROOT.'/includes/ckfinder/core/connector/php/connector.php?command=QuickUpload&type=Flash\','."\n";
 					*/
-                    $out .= '    filebrowserWindowWidth : \'900\',
+					$out .= '    filebrowserWindowWidth : \'900\',
                                filebrowserWindowHeight : \'500\',
                                filebrowserImageWindowWidth : \'900\',
                                filebrowserImageWindowHeight : \'500\'';
-            	}
-            	$out .= '	})'.$morejs;
-            	$out .= '});'."\n";
-            	$out .= '</script>'."\n";
-            }
-        }
+				}
+				$out .= '	})'.$morejs;
+				$out .= '});'."\n";
+				$out .= '</script>'."\n";
+			}
+		}
 
-        // Output editor ACE
-        // Warning: ace.js and ext-statusbar.js must be loaded by the parent page.
-        if (preg_match('/^ace/', $this->tool))
-        {
-        	$found = 1;
+		// Output editor ACE
+		// Warning: ace.js and ext-statusbar.js must be loaded by the parent page.
+		if (preg_match('/^ace/', $this->tool))
+		{
+			$found = 1;
 			$format = $option;
 
-            $out .= "\n".'<!-- Output Ace editor -->'."\n";
+			$out .= "\n".'<!-- Output Ace editor -->'."\n";
 
 			if ($titlecontent)
 			{
-	            $out .= '<div class="aceeditorstatusbar" id="statusBar'.$this->htmlname.'">'.$titlecontent;
-	            $out .= ' &nbsp; - &nbsp; <a id="morelines" href="#" class="right morelines'.$this->htmlname.' reposition">'.dol_escape_htmltag($langs->trans("ShowMoreLines")).'</a> &nbsp; &nbsp; ';
-	            $out .= '</div>';
-	            $out .= '<script type="text/javascript" language="javascript">'."\n";
-	            $out .= 'jQuery(document).ready(function() {'."\n";
-	            $out .= '	var aceEditor = window.ace.edit("'.$this->htmlname.'aceeditorid");
+				$out .= '<div class="aceeditorstatusbar" id="statusBar'.$this->htmlname.'">'.$titlecontent;
+				$out .= ' &nbsp; - &nbsp; <a id="morelines" href="#" class="right morelines'.$this->htmlname.' reposition">'.dol_escape_htmltag($langs->trans("ShowMoreLines")).'</a> &nbsp; &nbsp; ';
+				$out .= '</div>';
+				$out .= '<script type="text/javascript" language="javascript">'."\n";
+				$out .= 'jQuery(document).ready(function() {'."\n";
+				$out .= '	var aceEditor = window.ace.edit("'.$this->htmlname.'aceeditorid");
 	    	    		   	var StatusBar = window.ace.require("ace/ext/statusbar").StatusBar;									// Init status bar. Need lib ext-statusbar
 	        			   	var statusBar = new StatusBar(aceEditor, document.getElementById("statusBar'.$this->htmlname.'"));	// Init status bar. Need lib ext-statusbar
 	            			var oldNbOfLines = 0
@@ -257,21 +257,21 @@ class DolEditor
 									}
 							});
 						})';
-	            $out .= '</script>'."\n";
+				$out .= '</script>'."\n";
 			}
 
-            $out .= '<pre id="'.$this->htmlname.'aceeditorid" style="'.($this->width ? 'width: '.$this->width.'px; ' : '');
-            $out .= ($this->height ? ' height: '.$this->height.'px; ' : '');
-            //$out.=" min-height: 100px;";
-            $out .= '">';
-        	$out .= htmlspecialchars($this->content);
-        	$out .= '</pre>';
-        	$out .= '<textarea id="'.$this->htmlname.'" name="'.$this->htmlname.'" style="width:0px; height: 0px; display: none;">';
-        	$out .= htmlspecialchars($this->content);
-        	$out .= '</textarea>';
+			$out .= '<pre id="'.$this->htmlname.'aceeditorid" style="'.($this->width ? 'width: '.$this->width.'px; ' : '');
+			$out .= ($this->height ? ' height: '.$this->height.'px; ' : '');
+			//$out.=" min-height: 100px;";
+			$out .= '">';
+			$out .= htmlspecialchars($this->content);
+			$out .= '</pre>';
+			$out .= '<textarea id="'.$this->htmlname.'" name="'.$this->htmlname.'" style="width:0px; height: 0px; display: none;">';
+			$out .= htmlspecialchars($this->content);
+			$out .= '</textarea>';
 
-        	$out .= '<script type="text/javascript" language="javascript">'."\n";
-        	$out .= 'var aceEditor = window.ace.edit("'.$this->htmlname.'aceeditorid");
+			$out .= '<script type="text/javascript" language="javascript">'."\n";
+			$out .= 'var aceEditor = window.ace.edit("'.$this->htmlname.'aceeditorid");
 
 				    aceEditor.session.setMode("ace/mode/'.$format.'");
 					aceEditor.setOptions({
@@ -291,7 +291,7 @@ class DolEditor
 					//aceEditor.getSession().setMode("ace/mode/javascript_expression");
 					'."\n";
 
-        	$out .= 'jQuery(document).ready(function() {
+			$out .= 'jQuery(document).ready(function() {
 						jQuery(".buttonforacesave").click(function() {
         					console.log("We click on savefile button for component '.$this->htmlname.'");
         					var aceEditor = window.ace.edit("'.$this->htmlname.'aceeditorid")
@@ -301,15 +301,15 @@ class DolEditor
 							else return false;*/
 	        			});
 					})';
-        	$out .= '</script>'."\n";
-        }
+			$out .= '</script>'."\n";
+		}
 
-        if (empty($found))
-        {
-            $out .= 'Error, unknown value for tool '.$this->tool.' in DolEditor Create function.';
-        }
+		if (empty($found))
+		{
+			$out .= 'Error, unknown value for tool '.$this->tool.' in DolEditor Create function.';
+		}
 
-        if ($noprint) return $out;
-        else print $out;
-    }
+		if ($noprint) return $out;
+		else print $out;
+	}
 }
diff --git a/htdocs/core/class/dolexception.class.php b/htdocs/core/class/dolexception.class.php
index 2c43a43127c..e083a47d5f7 100644
--- a/htdocs/core/class/dolexception.class.php
+++ b/htdocs/core/class/dolexception.class.php
@@ -27,10 +27,10 @@
  */
 class DolException extends Exception
 {
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-    }
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+	}
 }
diff --git a/htdocs/core/class/dolgeoip.class.php b/htdocs/core/class/dolgeoip.class.php
index 2b148a96e8a..215a1710b82 100644
--- a/htdocs/core/class/dolgeoip.class.php
+++ b/htdocs/core/class/dolgeoip.class.php
@@ -33,7 +33,7 @@
  */
 class DolGeoIP
 {
-    public $gi;
+	public $gi;
 
 	/**
 	 * Constructor
@@ -50,18 +50,18 @@ class DolGeoIP
 
 		if ($type == 'country')
 		{
-		    // geoip may have been already included with PEAR
+			// geoip may have been already included with PEAR
 			if ($geoipversion == '2' || ($geoipversion != 'php' && !function_exists('geoip_country_code_by_name')))
-		    {
-		    	require_once DOL_DOCUMENT_ROOT.'/includes/geoip2/geoip2.phar';
-		    }
+			{
+				require_once DOL_DOCUMENT_ROOT.'/includes/geoip2/geoip2.phar';
+			}
 		} elseif ($type == 'city')
 		{
-		    // geoip may have been already included with PEAR
+			// geoip may have been already included with PEAR
 			if ($geoipversion == '2' || ($geoipversion != 'php' && !function_exists('geoip_country_code_by_name')))
-		    {
-		    	require_once DOL_DOCUMENT_ROOT.'/includes/geoip2/geoip2.phar';
-		    }
+			{
+				require_once DOL_DOCUMENT_ROOT.'/includes/geoip2/geoip2.phar';
+			}
 		} else { print 'ErrorBadParameterInConstructor'; return 0; }
 
 		// Here, function exists (embedded into PHP or exists because we made include)
@@ -92,10 +92,13 @@ class DolGeoIP
 		} elseif (function_exists('geoip_open'))
 		{
 			$this->gi = geoip_open($datfile, GEOIP_STANDARD);
+		}
+		elseif (function_exists('geoip_country_code_by_name')) {
+			$this->gi = 'NOGI'; // We are using embedded php geoip functions
+			//print 'function_exists(geoip_country_code_by_name))='.function_exists('geoip_country_code_by_name');
+			//print geoip_database_info();
 		} else {
-		    $this->gi = 'NOGI'; // We are using embedded php geoip functions
-		    //print 'function_exists(geoip_country_code_by_name))='.function_exists('geoip_country_code_by_name');
-		    //print geoip_database_info();
+		    $this->gi = ''; // For avoid error
 		}
 	}
 
@@ -118,8 +121,8 @@ class DolGeoIP
 		}
 		if ($this->gi == 'NOGI')
 		{
-		    // geoip_country_code_by_addr does not exists
-    		return strtolower(geoip_country_code_by_name($ip));
+			// geoip_country_code_by_addr does not exists
+			return strtolower(geoip_country_code_by_name($ip));
 		} else {
 			if (preg_match('/^[0-9]+.[0-9]+\.[0-9]+\.[0-9]+/', $ip))
 			{
@@ -133,8 +136,8 @@ class DolGeoIP
 						return '';
 					}
 				} else {
-			    	if (!function_exists('geoip_country_code_by_addr')) return strtolower(geoip_country_code_by_name($this->gi, $ip));
-			    	return strtolower(geoip_country_code_by_addr($this->gi, $ip));
+					if (!function_exists('geoip_country_code_by_addr')) return strtolower(geoip_country_code_by_name($this->gi, $ip));
+					return strtolower(geoip_country_code_by_addr($this->gi, $ip));
 				}
 			} else {
 				if ($geoipversion == '2')
@@ -186,37 +189,37 @@ class DolGeoIP
 		}
 	}
 
-    /**
-     * Return verion of data file
-     *
-     * @return  string      Version of datafile
-     */
-    public function getVersion()
-    {
-    	global $conf;
+	/**
+	 * Return verion of data file
+	 *
+	 * @return  string      Version of datafile
+	 */
+	public function getVersion()
+	{
+		global $conf;
 
-    	$geoipversion = '2'; // 'php', or '2'
-    	if (!empty($conf->global->GEOIP_VERSION)) $geoipversion = $conf->global->GEOIP_VERSION;
+		$geoipversion = '2'; // 'php', or '2'
+		if (!empty($conf->global->GEOIP_VERSION)) $geoipversion = $conf->global->GEOIP_VERSION;
 
-    	if ($geoipversion == 'php')
-    	{
-        	if ($this->gi == 'NOGI') return geoip_database_info();
-        	else return 'geoip_database_info() function not available';
-    	}
+		if ($geoipversion == 'php')
+		{
+			if ($this->gi == 'NOGI') return geoip_database_info();
+			else return 'geoip_database_info() function not available';
+		}
 
-    	return 'Not available (not using PHP internal geo functions - We are using embedded Geoip v'.$geoipversion.')';
-    }
+		return 'Not available (not using PHP internal geo functions - We are using embedded Geoip v'.$geoipversion.')';
+	}
 
-    /**
-     * Close geoip object
-     *
-     * @return	void
-     */
-    public function close()
-    {
-        if (function_exists('geoip_close')) {
-            // With some geoip with PEAR, geoip_close function may not exists
-            geoip_close($this->gi);
-        }
-    }
+	/**
+	 * Close geoip object
+	 *
+	 * @return	void
+	 */
+	public function close()
+	{
+		if (function_exists('geoip_close')) {
+			// With some geoip with PEAR, geoip_close function may not exists
+			geoip_close($this->gi);
+		}
+	}
 }
diff --git a/htdocs/core/class/dolgraph.class.php b/htdocs/core/class/dolgraph.class.php
index dee727cb596..0ff627ba20c 100644
--- a/htdocs/core/class/dolgraph.class.php
+++ b/htdocs/core/class/dolgraph.class.php
@@ -120,7 +120,7 @@ class DolGraph
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Utiliser SetNumTicks ou SetHorizTickIncrement mais pas les 2
 	 *
@@ -129,12 +129,12 @@ class DolGraph
 	 */
 	public function SetHorizTickIncrement($xi)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$this->horizTickIncrement = $xi;
 		return true;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Utiliser SetNumTicks ou SetHorizTickIncrement mais pas les 2
 	 *
@@ -143,12 +143,12 @@ class DolGraph
 	 */
 	public function SetNumXTicks($xt)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$this->SetNumXTicks = $xt;
 		return true;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Set label interval to reduce number of labels
 	 *
@@ -157,12 +157,12 @@ class DolGraph
 	 */
 	public function SetLabelInterval($x)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$this->labelInterval = $x;
 		return true;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Hide X grid
 	 *
@@ -171,12 +171,12 @@ class DolGraph
 	 */
 	public function SetHideXGrid($bool)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$this->hideXGrid = $bool;
 		return true;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Hide Y grid
 	 *
@@ -185,12 +185,12 @@ class DolGraph
 	 */
 	public function SetHideYGrid($bool)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$this->hideYGrid = $bool;
 		return true;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Set y label
 	 *
@@ -199,11 +199,11 @@ class DolGraph
 	 */
 	public function SetYLabel($label)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$this->YLabel = $label;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Set width
 	 *
@@ -212,11 +212,11 @@ class DolGraph
 	 */
 	public function SetWidth($w)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$this->width = $w;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Set title
 	 *
@@ -225,11 +225,11 @@ class DolGraph
 	 */
 	public function SetTitle($title)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$this->title = $title;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Set data
 	 *
@@ -239,11 +239,11 @@ class DolGraph
 	 */
 	public function SetData($data)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$this->data = $data;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Set data
 	 *
@@ -252,11 +252,11 @@ class DolGraph
 	 */
 	public function SetDataColor($datacolor)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$this->datacolor = $datacolor;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Set type
 	 *
@@ -266,11 +266,11 @@ class DolGraph
 	 */
 	public function SetType($type)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$this->type = $type;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Set legend
 	 *
@@ -279,11 +279,11 @@ class DolGraph
 	 */
 	public function SetLegend($legend)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$this->Legend = $legend;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Set min width
 	 *
@@ -292,120 +292,120 @@ class DolGraph
 	 */
 	public function SetLegendWidthMin($legendwidthmin)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$this->LegendWidthMin = $legendwidthmin;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Set max value
 	 *
 	 * @param 	int		$max			Max value
 	 * @return	void
 	 */
-    public function SetMaxValue($max)
+	public function SetMaxValue($max)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$this->MaxValue = $max;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Get max value
 	 *
 	 * @return	int		Max value
 	 */
-    public function GetMaxValue()
+	public function GetMaxValue()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		return $this->MaxValue;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Set min value
 	 *
 	 * @param 	int		$min			Min value
 	 * @return	void
 	 */
-    public function SetMinValue($min)
+	public function SetMinValue($min)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$this->MinValue = $min;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Get min value
 	 *
 	 * @return	int		Max value
 	 */
-    public function GetMinValue()
+	public function GetMinValue()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		return $this->MinValue;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Set height
 	 *
 	 * @param 	int		$h				Height
 	 * @return	void
 	 */
-    public function SetHeight($h)
+	public function SetHeight($h)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$this->height = $h;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Set shading
 	 *
 	 * @param 	string	$s				Shading
 	 * @return	void
 	 */
-    public function SetShading($s)
+	public function SetShading($s)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$this->SetShading = $s;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Set shading
 	 *
 	 * @param 	string	$s				Shading
 	 * @return	void
 	 */
-    public function SetCssPrefix($s)
+	public function SetCssPrefix($s)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$this->cssprefix = $s;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Reset bg color
 	 *
 	 * @return	void
 	 */
-    public function ResetBgColor()
+	public function ResetBgColor()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		unset($this->bgcolor);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Reset bgcolorgrid
 	 *
 	 * @return	void
 	 */
-    public function ResetBgColorGrid()
+	public function ResetBgColorGrid()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		unset($this->bgcolorgrid);
 	}
 
@@ -414,7 +414,7 @@ class DolGraph
 	 *
 	 * @return	string		Error
 	 */
-    public function isGraphKo()
+	public function isGraphKo()
 	{
 		return $this->error;
 	}
@@ -425,7 +425,7 @@ class DolGraph
 	 * @param	int		$showlegend		1=Show legend (default), 0=Hide legend, 2=Show legend on right
 	 * @return	void
 	 */
-    public function setShowLegend($showlegend)
+	public function setShowLegend($showlegend)
 	{
 		$this->showlegend = $showlegend;
 	}
@@ -436,7 +436,7 @@ class DolGraph
 	 * @param	int		$showpointvalue		1=Show value for each point, as tooltip or inline (default), 0=Hide value
 	 * @return	void
 	 */
-    public function setShowPointValue($showpointvalue)
+	public function setShowPointValue($showpointvalue)
 	{
 		$this->showpointvalue = $showpointvalue;
 	}
@@ -447,23 +447,23 @@ class DolGraph
 	 * @param	int		$showpercent		1=Show percent for each point, as tooltip or inline, 0=Hide percent (default)
 	 * @return	void
 	 */
-    public function setShowPercent($showpercent)
+	public function setShowPercent($showpercent)
 	{
 		$this->showpercent = $showpercent;
 	}
 
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Define background color of complete image
 	 *
 	 * @param	array	$bg_color		array(R,G,B) ou 'onglet' ou 'default'
 	 * @return	void
 	 */
-    public function SetBgColor($bg_color = array(255, 255, 255))
+	public function SetBgColor($bg_color = array(255, 255, 255))
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $theme_bgcolor, $theme_bgcoloronglet;
 
 		if (!is_array($bg_color))
@@ -480,16 +480,16 @@ class DolGraph
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Define background color of grid
 	 *
 	 * @param	array	$bg_colorgrid		array(R,G,B) ou 'onglet' ou 'default'
 	 * @return	void
 	 */
-    public function SetBgColorGrid($bg_colorgrid = array(255, 255, 255))
+	public function SetBgColorGrid($bg_colorgrid = array(255, 255, 255))
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $theme_bgcolor, $theme_bgcoloronglet;
 
 		if (!is_array($bg_colorgrid))
@@ -506,27 +506,27 @@ class DolGraph
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Reset data color
 	 *
 	 * @return	void
 	 */
-    public function ResetDataColor()
-    {
-        // phpcs:enable
-        unset($this->datacolor);
-    }
+	public function ResetDataColor()
+	{
+		// phpcs:enable
+		unset($this->datacolor);
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
 	 * Get max value
 	 *
 	 * @return	int		Max value
 	 */
-    public function GetMaxValueInData()
+	public function GetMaxValueInData()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		if (!is_array($this->data)) return 0;
 
 		$k = 0;
@@ -547,15 +547,15 @@ class DolGraph
 		return $vals[0];
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Return min value of all data
 	 *
 	 * @return	int		Min value of all data
 	 */
-    public function GetMinValueInData()
+	public function GetMinValueInData()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		if (!is_array($this->data)) return 0;
 
 		$k = 0;
@@ -576,15 +576,15 @@ class DolGraph
 		return $vals[0];
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Return max value of all data
 	 *
 	 * @return 	int		Max value of all data
 	 */
-    public function GetCeilMaxValue()
+	public function GetCeilMaxValue()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$max = $this->GetMaxValueInData();
 		if ($max != 0) $max++;
 		$size = dol_strlen(abs(ceil($max)));
@@ -601,15 +601,15 @@ class DolGraph
 		return $res;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Return min value of all data
 	 *
 	 * @return 	double		Max value of all data
 	 */
-    public function GetFloorMinValue()
+	public function GetFloorMinValue()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$min = $this->GetMinValueInData();
 		if ($min == '') $min = 0;
 		if ($min != 0) $min--;
@@ -633,7 +633,7 @@ class DolGraph
 	 * @param	string	$fileurl	Url path to show image if saved onto disk
 	 * @return	integer|null
 	 */
-    public function draw($file, $fileurl = '')
+	public function draw($file, $fileurl = '')
 	{
 		if (empty($file))
 		{
@@ -656,7 +656,7 @@ class DolGraph
 		call_user_func_array(array($this, $call), array($file, $fileurl));
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Build a graph using JFlot library. Input when calling this method should be:
 	 *	$this->data  = array(array(0=>'labelxA',1=>yA),  array('labelxB',yB));
@@ -675,7 +675,7 @@ class DolGraph
 	 */
 	private function draw_jflot($file, $fileurl)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $langs;
 
 		dol_syslog(get_class($this)."::draw_jflot this->type=".join(',', $this->type)." this->MaxValue=".$this->MaxValue);
@@ -732,9 +732,9 @@ class DolGraph
 		if (!empty($this->title)) $this->stringtoshow .= '<div class="center dolgraphtitle'.(empty($this->cssprefix) ? '' : ' dolgraphtitle'.$this->cssprefix).'">'.$this->title.'</div>';
 		if (!empty($this->shownographyet))
 		{
-		    $this->stringtoshow .= '<div style="width:'.$this->width.'px;height:'.$this->height.'px;" class="nographyet"></div>';
-		    $this->stringtoshow .= '<div class="nographyettext margintoponly">'.$langs->trans("NotEnoughDataYet").'...</div>';
-		    return;
+			$this->stringtoshow .= '<div style="width:'.$this->width.'px;height:'.$this->height.'px;" class="nographyet"></div>';
+			$this->stringtoshow .= '<div class="nographyettext margintoponly">'.$langs->trans("NotEnoughDataYet").'...</div>';
+			return;
 		}
 
 		// Start the div that will contains all the graph
@@ -825,7 +825,7 @@ class DolGraph
 		// Other cases, graph of type 'bars', 'lines'
 		else {
 			// Add code to support tooltips
-		    // TODO: remove js css and use graph-tooltip-inner class instead by adding css in each themes
+			// TODO: remove js css and use graph-tooltip-inner class instead by adding css in each themes
 			$this->stringtoshow .= '
 			function showTooltip_'.$tag.'(x, y, contents) {
 				$(\'<div class="graph-tooltip-inner" id="tooltip_'.$tag.'">\' + contents + \'</div>\').css({
@@ -881,14 +881,14 @@ class DolGraph
 				if ($i > $firstlot) $this->stringtoshow .= ', '."\n";
 				$color = sprintf("%02x%02x%02x", $this->datacolor[$i][0], $this->datacolor[$i][1], $this->datacolor[$i][2]);
 				$this->stringtoshow .= '{ ';
-				if (! isset($this->type[$i]) || $this->type[$i] == 'bars') {
-                    if ($nblot == 3) {
-                        if ($i == $firstlot) $align = 'right';
-                        elseif ($i == $firstlot + 1) $align = 'center';
-                        else $align = 'left';
-                        $this->stringtoshow .= 'bars: { lineWidth: 1, show: true, align: "'.$align.'", barWidth: 0.45 }, ';
-                    } else $this->stringtoshow.='bars: { lineWidth: 1, show: true, align: "'.($i==$firstlot?'center':'left').'", barWidth: 0.5 }, ';
-                }
+				if (!isset($this->type[$i]) || $this->type[$i] == 'bars') {
+					if ($nblot == 3) {
+						if ($i == $firstlot) $align = 'right';
+						elseif ($i == $firstlot + 1) $align = 'center';
+						else $align = 'left';
+						$this->stringtoshow .= 'bars: { lineWidth: 1, show: true, align: "'.$align.'", barWidth: 0.45 }, ';
+					} else $this->stringtoshow .= 'bars: { lineWidth: 1, show: true, align: "'.($i == $firstlot ? 'center' : 'left').'", barWidth: 0.5 }, ';
+				}
 				if (isset($this->type[$i]) && ($this->type[$i] == 'lines' || $this->type[$i] == 'linesnopoint')) $this->stringtoshow .= 'lines: { show: true, fill: false }, points: { show: '.($this->type[$i] == 'linesnopoint' ? 'false' : 'true').' }, ';
 				$this->stringtoshow .= 'color: "#'.$color.'", label: "'.(isset($this->Legend[$i]) ? dol_escape_js($this->Legend[$i]) : '').'", data: d'.$i.' }';
 				$i++;
@@ -1280,7 +1280,7 @@ class DolGraph
 	 *
 	 * @return	string							HTML string to total value
 	 */
-    public function total()
+	public function total()
 	{
 		$value = 0;
 		foreach ($this->data as $valarray)	// Loop on each x
@@ -1296,7 +1296,7 @@ class DolGraph
 	 * @param	int|string		$shownographyet    Show graph to say there is not enough data or the message in $shownographyet if it is a string.
 	 * @return	string							   HTML string to show graph
 	 */
-    public function show($shownographyet = 0)
+	public function show($shownographyet = 0)
 	{
 		global $langs;
 
@@ -1305,9 +1305,9 @@ class DolGraph
 			$s = '<div class="nographyet" style="width:'.(preg_match('/%/', $this->width) ? $this->width : $this->width.'px').'; height:'.(preg_match('/%/', $this->height) ? $this->height : $this->height.'px').';"></div>';
 			$s .= '<div class="nographyettext margintoponly">';
 			if (is_numeric($shownographyet)) {
-                $s .= $langs->trans("NotEnoughDataYet").'...';
+				$s .= $langs->trans("NotEnoughDataYet").'...';
 			} else {
-			    $s .= $shownographyet.'...';
+				$s .= $shownographyet.'...';
 			}
 			$s .= '</div>';
 			return $s;
diff --git a/htdocs/core/class/dolreceiptprinter.class.php b/htdocs/core/class/dolreceiptprinter.class.php
index ba636ac2569..5ff3f397813 100644
--- a/htdocs/core/class/dolreceiptprinter.class.php
+++ b/htdocs/core/class/dolreceiptprinter.class.php
@@ -115,429 +115,429 @@ use Mike42\Escpos\EscposImage;
  */
 class dolReceiptPrinter extends Printer
 {
-    const CONNECTOR_DUMMY = 1;
-    const CONNECTOR_FILE_PRINT = 2;
-    const CONNECTOR_NETWORK_PRINT = 3;
-    const CONNECTOR_WINDOWS_PRINT = 4;
-    const CONNECTOR_CUPS_PRINT = 5;
+	const CONNECTOR_DUMMY = 1;
+	const CONNECTOR_FILE_PRINT = 2;
+	const CONNECTOR_NETWORK_PRINT = 3;
+	const CONNECTOR_WINDOWS_PRINT = 4;
+	const CONNECTOR_CUPS_PRINT = 5;
 
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    /*
+	/*
      * @var string[] array of tags
      */
-    public $tags;
-    public $printer;
-    public $template;
+	public $tags;
+	public $printer;
+	public $template;
 
-    /**
-     * Number of order printer
-     * @var int
-     */
-    public $orderprinter;
+	/**
+	 * Number of order printer
+	 * @var int
+	 */
+	public $orderprinter;
 
-    /**
-     * @var string Error code (or message)
-     */
-    public $error = '';
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error = '';
 
-    /**
-     * @var string[] Error codes (or messages)
-     */
-    public $errors = array();
+	/**
+	 * @var string[] Error codes (or messages)
+	 */
+	public $errors = array();
 
-    /**
-     * Constructor
-     *
-     * @param   DoliDB      $db         database
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-        $this->tags = array(
-            'dol_line_feed' => 'DOL_LINE_FEED',
-        	'dol_line_feed_reverse' => 'DOL_LINE_FEED_REVERSE',
-            'dol_align_left' => 'DOL_ALIGN_LEFT',
-            'dol_align_center' => 'DOL_ALIGN_CENTER',
-            'dol_align_right' => 'DOL_ALIGN_RIGHT',
-            'dol_use_font_a' => 'DOL_USE_FONT_A',
-            'dol_use_font_b' => 'DOL_USE_FONT_B',
-        	'dol_use_font_c' => 'DOL_USE_FONT_C',
-        	'dol_bold' => 'DOL_BOLD',
-        	'dol_bold_disabled' => 'DOL_BOLD_DISABLED',
-        	'dol_double_height' => 'DOL_DOUBLE_HEIGHT',
-        	'dol_double_width' => 'DOL_DOUBLE_WIDTH',
-        	'dol_default_height_width' => 'DOL_DEFAULT_HEIGHT_WIDTH',
-        	'dol_underline' => 'DOL_UNDERLINE',
-        	'dol_underline_disabled' => 'DOL_UNDERLINE_DISABLED',
-        	'dol_cut_paper_full' => 'DOL_CUT_PAPER_FULL',
-        	'dol_cut_paper_partial' => 'DOL_CUT_PAPER_PARTIAL',
-        	'dol_open_drawer' => 'DOL_OPEN_DRAWER',
-        	'dol_beep' => 'DOL_BEEP',
-        	'dol_print_text' => 'DOL_PRINT_TEXT',
-        	'dol_print_barcode' => 'DOL_PRINT_BARCODE',
-        	'dol_value_date' => 'DateInvoice',
-        	'dol_value_date_time' => 'DateInvoiceWithTime',
-        	'dol_value_year' => 'YearInvoice',
-        	'dol_value_month_letters' => 'DOL_VALUE_MONTH_LETTERS',
-        	'dol_value_month' => 'DOL_VALUE_MONTH',
-        	'dol_value_day' => 'DOL_VALUE_DAY',
-        	'dol_value_day_letters' => 'DOL_VALUE_DAY',
-            'dol_print_payment' => 'DOL_PRINT_PAYMENT',
-        	'dol_print_logo' => 'DOL_PRINT_LOGO',
-        	'dol_print_logo_old' => 'DOL_PRINT_LOGO_OLD',
-        	'dol_value_object_id' => 'InvoiceID',
-        	'dol_value_object_ref' => 'InvoiceRef',
-        	'dol_print_object_lines' => 'DOL_PRINT_OBJECT_LINES',
-        	'dol_print_object_tax' => 'TotalVAT',
-        	'dol_print_object_local_tax1' => 'TotalLT1',
-        	'dol_print_object_local_tax2' => 'TotalLT2',
-        	'dol_print_object_total' => 'Total',
-        	'dol_print_object_number' => 'DOL_PRINT_OBJECT_NUMBER',
-        	//'dol_value_object_points' => 'DOL_VALUE_OBJECT_POINTS',
-        	'dol_print_order_lines' => 'DOL_PRINT_ORDER_LINES',
-        	'dol_value_customer_firstname' => 'DOL_VALUE_CUSTOMER_FIRSTNAME',
-        	'dol_value_customer_lastname' => 'DOL_VALUE_CUSTOMER_LASTNAME',
-        	'dol_value_customer_mail' => 'DOL_VALUE_CUSTOMER_MAIL',
-        	'dol_value_customer_phone' => 'DOL_VALUE_CUSTOMER_PHONE',
-        	'dol_value_customer_skype' => 'DOL_VALUE_CUSTOMER_SKYPE',
-        	'dol_value_customer_tax_number' => 'DOL_VALUE_CUSTOMER_TAX_NUMBER',
-        	//'dol_value_customer_account_balance' => 'DOL_VALUE_CUSTOMER_ACCOUNT_BALANCE',
-        	//'dol_value_customer_points' => 'DOL_VALUE_CUSTOMER_POINTS',
-        	'dol_value_mysoc_name' => 'DOL_VALUE_MYSOC_NAME',
-        	'dol_value_mysoc_address' => 'Address',
-        	'dol_value_mysoc_zip' => 'Zip',
-        	'dol_value_mysoc_town' => 'Town',
-        	'dol_value_mysoc_country' => 'Country',
-        	'dol_value_mysoc_idprof1' => 'ProfId1',
-        	'dol_value_mysoc_idprof2' => 'ProfId2',
-        	'dol_value_mysoc_idprof3' => 'ProfId3',
-        	'dol_value_mysoc_idprof4' => 'ProfId4',
-        	'dol_value_mysoc_idprof5' => 'ProfId5',
-        	'dol_value_mysoc_idprof6' => 'ProfId6',
-        	'dol_value_mysoc_tva_intra' => 'VATIntra',
-        	'dol_value_mysoc_capital' => 'Capital',
-        	'dol_value_vendor_lastname' => 'VendorLastname',
-        	'dol_value_vendor_firstname' => 'VendorFirstname',
-        	'dol_value_vendor_mail' => 'VendorEmail',
-        );
-    }
+	/**
+	 * Constructor
+	 *
+	 * @param   DoliDB      $db         database
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+		$this->tags = array(
+			'dol_line_feed' => 'DOL_LINE_FEED',
+			'dol_line_feed_reverse' => 'DOL_LINE_FEED_REVERSE',
+			'dol_align_left' => 'DOL_ALIGN_LEFT',
+			'dol_align_center' => 'DOL_ALIGN_CENTER',
+			'dol_align_right' => 'DOL_ALIGN_RIGHT',
+			'dol_use_font_a' => 'DOL_USE_FONT_A',
+			'dol_use_font_b' => 'DOL_USE_FONT_B',
+			'dol_use_font_c' => 'DOL_USE_FONT_C',
+			'dol_bold' => 'DOL_BOLD',
+			'dol_bold_disabled' => 'DOL_BOLD_DISABLED',
+			'dol_double_height' => 'DOL_DOUBLE_HEIGHT',
+			'dol_double_width' => 'DOL_DOUBLE_WIDTH',
+			'dol_default_height_width' => 'DOL_DEFAULT_HEIGHT_WIDTH',
+			'dol_underline' => 'DOL_UNDERLINE',
+			'dol_underline_disabled' => 'DOL_UNDERLINE_DISABLED',
+			'dol_cut_paper_full' => 'DOL_CUT_PAPER_FULL',
+			'dol_cut_paper_partial' => 'DOL_CUT_PAPER_PARTIAL',
+			'dol_open_drawer' => 'DOL_OPEN_DRAWER',
+			'dol_beep' => 'DOL_BEEP',
+			'dol_print_text' => 'DOL_PRINT_TEXT',
+			'dol_print_barcode' => 'DOL_PRINT_BARCODE',
+			'dol_value_date' => 'DateInvoice',
+			'dol_value_date_time' => 'DateInvoiceWithTime',
+			'dol_value_year' => 'YearInvoice',
+			'dol_value_month_letters' => 'DOL_VALUE_MONTH_LETTERS',
+			'dol_value_month' => 'DOL_VALUE_MONTH',
+			'dol_value_day' => 'DOL_VALUE_DAY',
+			'dol_value_day_letters' => 'DOL_VALUE_DAY',
+			'dol_print_payment' => 'DOL_PRINT_PAYMENT',
+			'dol_print_logo' => 'DOL_PRINT_LOGO',
+			'dol_print_logo_old' => 'DOL_PRINT_LOGO_OLD',
+			'dol_value_object_id' => 'InvoiceID',
+			'dol_value_object_ref' => 'InvoiceRef',
+			'dol_print_object_lines' => 'DOL_PRINT_OBJECT_LINES',
+			'dol_print_object_tax' => 'TotalVAT',
+			'dol_print_object_local_tax1' => 'TotalLT1',
+			'dol_print_object_local_tax2' => 'TotalLT2',
+			'dol_print_object_total' => 'Total',
+			'dol_print_object_number' => 'DOL_PRINT_OBJECT_NUMBER',
+			//'dol_value_object_points' => 'DOL_VALUE_OBJECT_POINTS',
+			'dol_print_order_lines' => 'DOL_PRINT_ORDER_LINES',
+			'dol_value_customer_firstname' => 'DOL_VALUE_CUSTOMER_FIRSTNAME',
+			'dol_value_customer_lastname' => 'DOL_VALUE_CUSTOMER_LASTNAME',
+			'dol_value_customer_mail' => 'DOL_VALUE_CUSTOMER_MAIL',
+			'dol_value_customer_phone' => 'DOL_VALUE_CUSTOMER_PHONE',
+			'dol_value_customer_skype' => 'DOL_VALUE_CUSTOMER_SKYPE',
+			'dol_value_customer_tax_number' => 'DOL_VALUE_CUSTOMER_TAX_NUMBER',
+			//'dol_value_customer_account_balance' => 'DOL_VALUE_CUSTOMER_ACCOUNT_BALANCE',
+			//'dol_value_customer_points' => 'DOL_VALUE_CUSTOMER_POINTS',
+			'dol_value_mysoc_name' => 'DOL_VALUE_MYSOC_NAME',
+			'dol_value_mysoc_address' => 'Address',
+			'dol_value_mysoc_zip' => 'Zip',
+			'dol_value_mysoc_town' => 'Town',
+			'dol_value_mysoc_country' => 'Country',
+			'dol_value_mysoc_idprof1' => 'ProfId1',
+			'dol_value_mysoc_idprof2' => 'ProfId2',
+			'dol_value_mysoc_idprof3' => 'ProfId3',
+			'dol_value_mysoc_idprof4' => 'ProfId4',
+			'dol_value_mysoc_idprof5' => 'ProfId5',
+			'dol_value_mysoc_idprof6' => 'ProfId6',
+			'dol_value_mysoc_tva_intra' => 'VATIntra',
+			'dol_value_mysoc_capital' => 'Capital',
+			'dol_value_vendor_lastname' => 'VendorLastname',
+			'dol_value_vendor_firstname' => 'VendorFirstname',
+			'dol_value_vendor_mail' => 'VendorEmail',
+		);
+	}
 
-    /**
-     * list printers
-     *
-     * @return  int                     0 if OK; >0 if KO
-     */
-    public function listPrinters()
-    {
-        global $conf;
-        $error = 0;
-        $line = 0;
-        $obj = array();
-        $sql = 'SELECT rowid, name, fk_type, fk_profile, parameter';
-        $sql .= ' FROM '.MAIN_DB_PREFIX.'printer_receipt';
-        $sql .= ' WHERE entity = '.$conf->entity;
-        $resql = $this->db->query($sql);
-        if ($resql) {
-            $num = $this->db->num_rows($resql);
-            while ($line < $num) {
-                $row = $this->db->fetch_array($resql);
-                switch ($row['fk_type']) {
-                    case 1:
-                        $row['fk_type_name'] = 'CONNECTOR_DUMMY';
-                        break;
-                    case 2:
-                        $row['fk_type_name'] = 'CONNECTOR_FILE_PRINT';
-                        break;
-                    case 3:
-                        $row['fk_type_name'] = 'CONNECTOR_NETWORK_PRINT';
-                        break;
-                    case 4:
-                        $row['fk_type_name'] = 'CONNECTOR_WINDOWS_PRINT';
-                        break;
-                    case 5:
-                        $row['fk_type_name'] = 'CONNECTOR_CUPS_PRINT';
-                        break;
-                    default:
-                        $row['fk_type_name'] = 'CONNECTOR_UNKNOWN';
-                        break;
-                }
-                switch ($row['fk_profile']) {
-                    case 0:
-                        $row['fk_profile_name'] = 'PROFILE_DEFAULT';
-                        break;
-                    case 1:
-                        $row['fk_profile_name'] = 'PROFILE_SIMPLE';
-                        break;
-                    case 2:
-                        $row['fk_profile_name'] = 'PROFILE_EPOSTEP';
-                        break;
-                    case 3:
-                        $row['fk_profile_name'] = 'PROFILE_P822D';
-                        break;
-                    default:
-                        $row['fk_profile_name'] = 'PROFILE_STAR';
-                        break;
-                }
-                $obj[] = $row;
-                $line++;
-            }
-        } else {
-            $error++;
-            $this->errors[] = $this->db->lasterror;
-        }
-        $this->listprinters = $obj;
-        return $error;
-    }
+	/**
+	 * list printers
+	 *
+	 * @return  int                     0 if OK; >0 if KO
+	 */
+	public function listPrinters()
+	{
+		global $conf;
+		$error = 0;
+		$line = 0;
+		$obj = array();
+		$sql = 'SELECT rowid, name, fk_type, fk_profile, parameter';
+		$sql .= ' FROM '.MAIN_DB_PREFIX.'printer_receipt';
+		$sql .= ' WHERE entity = '.$conf->entity;
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			$num = $this->db->num_rows($resql);
+			while ($line < $num) {
+				$row = $this->db->fetch_array($resql);
+				switch ($row['fk_type']) {
+					case 1:
+						$row['fk_type_name'] = 'CONNECTOR_DUMMY';
+						break;
+					case 2:
+						$row['fk_type_name'] = 'CONNECTOR_FILE_PRINT';
+						break;
+					case 3:
+						$row['fk_type_name'] = 'CONNECTOR_NETWORK_PRINT';
+						break;
+					case 4:
+						$row['fk_type_name'] = 'CONNECTOR_WINDOWS_PRINT';
+						break;
+					case 5:
+						$row['fk_type_name'] = 'CONNECTOR_CUPS_PRINT';
+						break;
+					default:
+						$row['fk_type_name'] = 'CONNECTOR_UNKNOWN';
+						break;
+				}
+				switch ($row['fk_profile']) {
+					case 0:
+						$row['fk_profile_name'] = 'PROFILE_DEFAULT';
+						break;
+					case 1:
+						$row['fk_profile_name'] = 'PROFILE_SIMPLE';
+						break;
+					case 2:
+						$row['fk_profile_name'] = 'PROFILE_EPOSTEP';
+						break;
+					case 3:
+						$row['fk_profile_name'] = 'PROFILE_P822D';
+						break;
+					default:
+						$row['fk_profile_name'] = 'PROFILE_STAR';
+						break;
+				}
+				$obj[] = $row;
+				$line++;
+			}
+		} else {
+			$error++;
+			$this->errors[] = $this->db->lasterror;
+		}
+		$this->listprinters = $obj;
+		return $error;
+	}
 
 
-    /**
-     * List printers templates
-     *
-     * @return  int                     0 if OK; >0 if KO
-     */
-    public function listPrintersTemplates()
-    {
-        global $conf;
-        $error = 0;
-        $line = 0;
-        $obj = array();
-        $sql = 'SELECT rowid, name, template';
-        $sql .= ' FROM '.MAIN_DB_PREFIX.'printer_receipt_template';
-        $sql .= ' WHERE entity = '.$conf->entity;
-        $resql = $this->db->query($sql);
-        if ($resql) {
-            $num = $this->db->num_rows($resql);
-            while ($line < $num) {
-                $obj[] = $this->db->fetch_array($resql);
-                $line++;
-            }
-        } else {
-            $error++;
-            $this->errors[] = $this->db->lasterror;
-        }
-        $this->listprinterstemplates = $obj;
-        return $error;
-    }
+	/**
+	 * List printers templates
+	 *
+	 * @return  int                     0 if OK; >0 if KO
+	 */
+	public function listPrintersTemplates()
+	{
+		global $conf;
+		$error = 0;
+		$line = 0;
+		$obj = array();
+		$sql = 'SELECT rowid, name, template';
+		$sql .= ' FROM '.MAIN_DB_PREFIX.'printer_receipt_template';
+		$sql .= ' WHERE entity = '.$conf->entity;
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			$num = $this->db->num_rows($resql);
+			while ($line < $num) {
+				$obj[] = $this->db->fetch_array($resql);
+				$line++;
+			}
+		} else {
+			$error++;
+			$this->errors[] = $this->db->lasterror;
+		}
+		$this->listprinterstemplates = $obj;
+		return $error;
+	}
 
 
-    /**
-     *  Form to Select type printer
-     *
-     *  @param    string    $selected       Id printer type pre-selected
-     *  @param    string    $htmlname       select html name
-     *  @return  int                        0 if OK; >0 if KO
-     */
-    public function selectTypePrinter($selected = '', $htmlname = 'printertypeid')
-    {
-        global $langs;
+	/**
+	 *  Form to Select type printer
+	 *
+	 *  @param    string    $selected       Id printer type pre-selected
+	 *  @param    string    $htmlname       select html name
+	 *  @return  int                        0 if OK; >0 if KO
+	 */
+	public function selectTypePrinter($selected = '', $htmlname = 'printertypeid')
+	{
+		global $langs;
 
-        $options = array(
-            1 => $langs->trans('CONNECTOR_DUMMY'),
-            2 => $langs->trans('CONNECTOR_FILE_PRINT'),
-            3 => $langs->trans('CONNECTOR_NETWORK_PRINT'),
-            4 => $langs->trans('CONNECTOR_WINDOWS_PRINT'),
+		$options = array(
+			1 => $langs->trans('CONNECTOR_DUMMY'),
+			2 => $langs->trans('CONNECTOR_FILE_PRINT'),
+			3 => $langs->trans('CONNECTOR_NETWORK_PRINT'),
+			4 => $langs->trans('CONNECTOR_WINDOWS_PRINT'),
 			5 => $langs->trans('CONNECTOR_CUPS_PRINT'),
-        );
+		);
 
-        $this->resprint = Form::selectarray($htmlname, $options, $selected);
+		$this->resprint = Form::selectarray($htmlname, $options, $selected);
 
-        return 0;
-    }
+		return 0;
+	}
 
 
-    /**
-     *  Form to Select Profile printer
-     *
-     *  @param    string    $selected       Id printer profile pre-selected
-     *  @param    string    $htmlname       select html name
-     *  @return  int                        0 if OK; >0 if KO
-     */
-    public function selectProfilePrinter($selected = '', $htmlname = 'printerprofileid')
-    {
-        global $langs;
+	/**
+	 *  Form to Select Profile printer
+	 *
+	 *  @param    string    $selected       Id printer profile pre-selected
+	 *  @param    string    $htmlname       select html name
+	 *  @return  int                        0 if OK; >0 if KO
+	 */
+	public function selectProfilePrinter($selected = '', $htmlname = 'printerprofileid')
+	{
+		global $langs;
 
-        $options = array(
-            0 => $langs->trans('PROFILE_DEFAULT'),
-            1 => $langs->trans('PROFILE_SIMPLE'),
-            2 => $langs->trans('PROFILE_EPOSTEP'),
-            3 => $langs->trans('PROFILE_P822D'),
-            4 => $langs->trans('PROFILE_STAR'),
-        );
+		$options = array(
+			0 => $langs->trans('PROFILE_DEFAULT'),
+			1 => $langs->trans('PROFILE_SIMPLE'),
+			2 => $langs->trans('PROFILE_EPOSTEP'),
+			3 => $langs->trans('PROFILE_P822D'),
+			4 => $langs->trans('PROFILE_STAR'),
+		);
 
-        $this->profileresprint = Form::selectarray($htmlname, $options, $selected);
-        return 0;
-    }
+		$this->profileresprint = Form::selectarray($htmlname, $options, $selected);
+		return 0;
+	}
 
 
-    /**
-     *  Function to Add a printer in db
-     *
-     *  @param    string    $name           Printer name
-     *  @param    int       $type           Printer type
-     *  @param    int       $profile        Printer profile
-     *  @param    string    $parameter      Printer parameter
-     *  @return  int                        0 if OK; >0 if KO
-     */
-    public function addPrinter($name, $type, $profile, $parameter)
-    {
-        global $conf;
-        $error = 0;
-        $sql = 'INSERT INTO '.MAIN_DB_PREFIX.'printer_receipt';
-        $sql .= ' (name, fk_type, fk_profile, parameter, entity)';
-        $sql .= ' VALUES ("'.$this->db->escape($name).'", '.$type.', '.$profile.', "'.$this->db->escape($parameter).'", '.$conf->entity.')';
-        $resql = $this->db->query($sql);
-        if (!$resql) {
-            $error++;
-            $this->errors[] = $this->db->lasterror;
-        }
-        return $error;
-    }
+	/**
+	 *  Function to Add a printer in db
+	 *
+	 *  @param    string    $name           Printer name
+	 *  @param    int       $type           Printer type
+	 *  @param    int       $profile        Printer profile
+	 *  @param    string    $parameter      Printer parameter
+	 *  @return  int                        0 if OK; >0 if KO
+	 */
+	public function addPrinter($name, $type, $profile, $parameter)
+	{
+		global $conf;
+		$error = 0;
+		$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'printer_receipt';
+		$sql .= ' (name, fk_type, fk_profile, parameter, entity)';
+		$sql .= ' VALUES ("'.$this->db->escape($name).'", '.$type.', '.$profile.', "'.$this->db->escape($parameter).'", '.$conf->entity.')';
+		$resql = $this->db->query($sql);
+		if (!$resql) {
+			$error++;
+			$this->errors[] = $this->db->lasterror;
+		}
+		return $error;
+	}
 
-    /**
-     *  Function to Update a printer in db
-     *
-     *  @param    string    $name           Printer name
-     *  @param    int       $type           Printer type
-     *  @param    int       $profile        Printer profile
-     *  @param    string    $parameter      Printer parameter
-     *  @param    int       $printerid      Printer id
-     *  @return  int                        0 if OK; >0 if KO
-     */
-    public function updatePrinter($name, $type, $profile, $parameter, $printerid)
-    {
-        global $conf;
-        $error = 0;
-        $sql = 'UPDATE '.MAIN_DB_PREFIX.'printer_receipt';
-        $sql .= ' SET name="'.$this->db->escape($name).'"';
-        $sql .= ', fk_type='.$type;
-        $sql .= ', fk_profile='.$profile;
-        $sql .= ', parameter="'.$this->db->escape($parameter).'"';
-        $sql .= ' WHERE rowid='.$printerid;
-        $resql = $this->db->query($sql);
-        if (!$resql) {
-            $error++;
-            $this->errors[] = $this->db->lasterror;
-        }
-        return $error;
-    }
+	/**
+	 *  Function to Update a printer in db
+	 *
+	 *  @param    string    $name           Printer name
+	 *  @param    int       $type           Printer type
+	 *  @param    int       $profile        Printer profile
+	 *  @param    string    $parameter      Printer parameter
+	 *  @param    int       $printerid      Printer id
+	 *  @return  int                        0 if OK; >0 if KO
+	 */
+	public function updatePrinter($name, $type, $profile, $parameter, $printerid)
+	{
+		global $conf;
+		$error = 0;
+		$sql = 'UPDATE '.MAIN_DB_PREFIX.'printer_receipt';
+		$sql .= ' SET name="'.$this->db->escape($name).'"';
+		$sql .= ', fk_type='.$type;
+		$sql .= ', fk_profile='.$profile;
+		$sql .= ', parameter="'.$this->db->escape($parameter).'"';
+		$sql .= ' WHERE rowid='.$printerid;
+		$resql = $this->db->query($sql);
+		if (!$resql) {
+			$error++;
+			$this->errors[] = $this->db->lasterror;
+		}
+		return $error;
+	}
 
-    /**
-     *  Function to Delete a printer from db
-     *
-     *  @param    int       $printerid      Printer id
-     *  @return  int                        0 if OK; >0 if KO
-     */
-    public function deletePrinter($printerid)
-    {
-        global $conf;
-        $error = 0;
-        $sql = 'DELETE FROM '.MAIN_DB_PREFIX.'printer_receipt';
-        $sql .= ' WHERE rowid='.$printerid;
-        $resql = $this->db->query($sql);
-        if (!$resql) {
-            $error++;
-            $this->errors[] = $this->db->lasterror;
-        }
-        return $error;
-    }
+	/**
+	 *  Function to Delete a printer from db
+	 *
+	 *  @param    int       $printerid      Printer id
+	 *  @return  int                        0 if OK; >0 if KO
+	 */
+	public function deletePrinter($printerid)
+	{
+		global $conf;
+		$error = 0;
+		$sql = 'DELETE FROM '.MAIN_DB_PREFIX.'printer_receipt';
+		$sql .= ' WHERE rowid='.$printerid;
+		$resql = $this->db->query($sql);
+		if (!$resql) {
+			$error++;
+			$this->errors[] = $this->db->lasterror;
+		}
+		return $error;
+	}
 
-    /**
-     *  Function to add a printer template in db
-     *
-     *  @param    string    $name           Template name
-     *  @param    int       $template       Template
-     *  @return   int                       0 if OK; >0 if KO
-     */
-    public function addTemplate($name, $template)
-    {
-        global $conf;
-        $error = 0;
-        $sql = 'INSERT INTO '.MAIN_DB_PREFIX.'printer_receipt_template';
-        $sql .= ' (name, template, entity) VALUES ("'.$this->db->escape($name).'"';
-        $sql .= ', "'.$this->db->escape($template).'", '.$conf->entity.')';
-        $resql = $this->db->query($sql);
-        if (!$resql) {
-            $error++;
-            $this->errors[] = $this->db->lasterror;
-        }
-        return $error;
-    }
+	/**
+	 *  Function to add a printer template in db
+	 *
+	 *  @param    string    $name           Template name
+	 *  @param    int       $template       Template
+	 *  @return   int                       0 if OK; >0 if KO
+	 */
+	public function addTemplate($name, $template)
+	{
+		global $conf;
+		$error = 0;
+		$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'printer_receipt_template';
+		$sql .= ' (name, template, entity) VALUES ("'.$this->db->escape($name).'"';
+		$sql .= ', "'.$this->db->escape($template).'", '.$conf->entity.')';
+		$resql = $this->db->query($sql);
+		if (!$resql) {
+			$error++;
+			$this->errors[] = $this->db->lasterror;
+		}
+		return $error;
+	}
 
-    /**
-     *  Function to delete a printer template in db
-     *
-     *  @param    int       $templateid     Template ID
-     *  @return   int                       0 if OK; >0 if KO
-     */
-    public function deleteTemplate($templateid)
-    {
-    	global $conf;
-    	$error = 0;
-    	$sql = 'DELETE FROM '.MAIN_DB_PREFIX.'printer_receipt_template';
-    	$sql .= " WHERE rowid = ".((int) $this->db->escape($templateid));
-    	$sql .= " AND entity = ".$conf->entity;
-    	$resql = $this->db->query($sql);
-    	if (!$resql) {
-    		$error++;
-    		$this->errors[] = $this->db->lasterror;
-    	}
-    	return $error;
-    }
+	/**
+	 *  Function to delete a printer template in db
+	 *
+	 *  @param    int       $templateid     Template ID
+	 *  @return   int                       0 if OK; >0 if KO
+	 */
+	public function deleteTemplate($templateid)
+	{
+		global $conf;
+		$error = 0;
+		$sql = 'DELETE FROM '.MAIN_DB_PREFIX.'printer_receipt_template';
+		$sql .= " WHERE rowid = ".((int) $this->db->escape($templateid));
+		$sql .= " AND entity = ".$conf->entity;
+		$resql = $this->db->query($sql);
+		if (!$resql) {
+			$error++;
+			$this->errors[] = $this->db->lasterror;
+		}
+		return $error;
+	}
 
-    /**
-     *  Function to Update a printer template in db
-     *
-     *  @param    string    $name           Template name
-     *  @param    int       $template       Template
-     *  @param    int       $templateid     Template id
-     *  @return   int                       0 if OK; >0 if KO
-     */
-    public function updateTemplate($name, $template, $templateid)
-    {
-        global $conf;
-        $error = 0;
-        $sql = 'UPDATE '.MAIN_DB_PREFIX.'printer_receipt_template';
-        $sql .= ' SET name="'.$this->db->escape($name).'"';
-        $sql .= ', template="'.$this->db->escape($template).'"';
-        $sql .= ' WHERE rowid='.$templateid;
-        $resql = $this->db->query($sql);
-        if (!$resql) {
-            $error++;
-            $this->errors[] = $this->db->lasterror;
-        }
-        return $error;
-    }
+	/**
+	 *  Function to Update a printer template in db
+	 *
+	 *  @param    string    $name           Template name
+	 *  @param    int       $template       Template
+	 *  @param    int       $templateid     Template id
+	 *  @return   int                       0 if OK; >0 if KO
+	 */
+	public function updateTemplate($name, $template, $templateid)
+	{
+		global $conf;
+		$error = 0;
+		$sql = 'UPDATE '.MAIN_DB_PREFIX.'printer_receipt_template';
+		$sql .= ' SET name="'.$this->db->escape($name).'"';
+		$sql .= ', template="'.$this->db->escape($template).'"';
+		$sql .= ' WHERE rowid='.$templateid;
+		$resql = $this->db->query($sql);
+		if (!$resql) {
+			$error++;
+			$this->errors[] = $this->db->lasterror;
+		}
+		return $error;
+	}
 
 
-    /**
-     *  Function to Send Test page to Printer
-     *
-     *  @param    int       $printerid      Printer id
-     *  @return  int                        0 if OK; >0 if KO
-     */
-    public function sendTestToPrinter($printerid)
-    {
-        global $conf;
-        $error = 0;
-        $img = EscposImage::load(DOL_DOCUMENT_ROOT.'/theme/dolibarr_logo_bw.png');
-        //$this->profile = CapabilityProfile::load("TM-T88IV");
-        $ret = $this->initPrinter($printerid);
-        if ($ret > 0) {
-            setEventMessages($this->error, $this->errors, 'errors');
-        } else {
-            try {
-                $this->printer->bitImage($img);
-                $this->printer->text("Hello World!\n");
-                $testStr = "1234567890";
-                $this->printer->barcode($testStr);
-                //$this->printer->qrcode($testStr, Printer::QR_ECLEVEL_M, 5, Printer::QR_MODEL_1);
-                $this->printer->text("Most simple example\n");
-                $this->printer->feed();
-                $this->printer->cut();
+	/**
+	 *  Function to Send Test page to Printer
+	 *
+	 *  @param    int       $printerid      Printer id
+	 *  @return  int                        0 if OK; >0 if KO
+	 */
+	public function sendTestToPrinter($printerid)
+	{
+		global $conf;
+		$error = 0;
+		$img = EscposImage::load(DOL_DOCUMENT_ROOT.'/theme/dolibarr_logo_bw.png');
+		//$this->profile = CapabilityProfile::load("TM-T88IV");
+		$ret = $this->initPrinter($printerid);
+		if ($ret > 0) {
+			setEventMessages($this->error, $this->errors, 'errors');
+		} else {
+			try {
+				$this->printer->bitImage($img);
+				$this->printer->text("Hello World!\n");
+				$testStr = "1234567890";
+				$this->printer->barcode($testStr);
+				//$this->printer->qrcode($testStr, Printer::QR_ECLEVEL_M, 5, Printer::QR_MODEL_1);
+				$this->printer->text("Most simple example\n");
+				$this->printer->feed();
+				$this->printer->cut();
 
 				// If is DummyPrintConnector send to log to debugging
 				if ($this->printer->connector instanceof DummyPrintConnector)
@@ -545,227 +545,227 @@ class dolReceiptPrinter extends Printer
 					$data = $this->printer->connector-> getData();
 					dol_syslog($data);
 				}
-                $this->printer->close();
-            } catch (Exception $e) {
-                $this->errors[] = $e->getMessage();
-                $error++;
-            }
-        }
-        return $error;
-    }
+				$this->printer->close();
+			} catch (Exception $e) {
+				$this->errors[] = $e->getMessage();
+				$error++;
+			}
+		}
+		return $error;
+	}
 
-    /**
-     *  Function to Print Receipt Ticket
-     *
-     *  @param   Facture|Commande   $object         Order or invoice object
-     *  @param   int       			$templateid     Template id
-     *  @param   int       			$printerid      Printer id
-     *  @return  int                				0 if OK; >0 if KO
-     */
-    public function sendToPrinter($object, $templateid, $printerid)
-    {
-        global $conf, $mysoc, $langs, $user;
-        $error = 0;
-        $ret = $this->loadTemplate($templateid);
+	/**
+	 *  Function to Print Receipt Ticket
+	 *
+	 *  @param   Facture|Commande   $object         Order or invoice object
+	 *  @param   int       			$templateid     Template id
+	 *  @param   int       			$printerid      Printer id
+	 *  @return  int                				0 if OK; >0 if KO
+	 */
+	public function sendToPrinter($object, $templateid, $printerid)
+	{
+		global $conf, $mysoc, $langs, $user;
+		$error = 0;
+		$ret = $this->loadTemplate($templateid);
 
-        // tags a remplacer par leur valeur avant de parser (dol_value_xxx)
-        $this->template = str_replace('{dol_value_object_id}', $object->id, $this->template);
-        $this->template = str_replace('{dol_value_object_ref}', $object->ref, $this->template);
-        //$this->template = str_replace('<dol_value_object_points>', $object->points, $this->template);
-        $this->template = str_replace('{dol_value_date}', dol_print_date($object->date, 'day'), $this->template);
-        $this->template = str_replace('{dol_value_date_time}', dol_print_date($object->date, 'dayhour'), $this->template);
-        $this->template = str_replace('{dol_value_year}', dol_print_date($object->date, '%Y'), $this->template);
-        $this->template = str_replace('{dol_value_month_letters}', $langs->trans("Month".dol_print_date($object->date, '%m')), $this->template);
-        $this->template = str_replace('{dol_value_month}', dol_print_date($object->date, '%m'), $this->template);
-        $this->template = str_replace('{dol_value_day}', dol_print_date($object->date, '%d'), $this->template);
-        $this->template = str_replace('{dol_value_day_letters}', $langs->trans("Day".dol_print_date($object->date, '%m')[1]), $this->template);
+		// tags a remplacer par leur valeur avant de parser (dol_value_xxx)
+		$this->template = str_replace('{dol_value_object_id}', $object->id, $this->template);
+		$this->template = str_replace('{dol_value_object_ref}', $object->ref, $this->template);
+		//$this->template = str_replace('<dol_value_object_points>', $object->points, $this->template);
+		$this->template = str_replace('{dol_value_date}', dol_print_date($object->date, 'day'), $this->template);
+		$this->template = str_replace('{dol_value_date_time}', dol_print_date($object->date, 'dayhour'), $this->template);
+		$this->template = str_replace('{dol_value_year}', dol_print_date($object->date, '%Y'), $this->template);
+		$this->template = str_replace('{dol_value_month_letters}', $langs->trans("Month".dol_print_date($object->date, '%m')), $this->template);
+		$this->template = str_replace('{dol_value_month}', dol_print_date($object->date, '%m'), $this->template);
+		$this->template = str_replace('{dol_value_day}', dol_print_date($object->date, '%d'), $this->template);
+		$this->template = str_replace('{dol_value_day_letters}', $langs->trans("Day".dol_print_date($object->date, '%m')[1]), $this->template);
 
-        $this->template = str_replace('{dol_value_customer_firstname}', $object->thirdparty->firstname, $this->template);
-        $this->template = str_replace('{dol_value_customer_lastname}', $object->thirdparty->lastname, $this->template);
-        $this->template = str_replace('{dol_value_customer_mail}', $object->thirdparty->email, $this->template);
-        $this->template = str_replace('{dol_value_customer_phone}', $object->thirdparty->phone, $this->template);
-        //$this->template = str_replace('<dol_value_customer_mobile>', $object->thirdparty->mobile, $this->template);
-        $this->template = str_replace('{dol_value_customer_tax_number}', $object->thirdparty->tva_intra, $this->template);
-        //$this->template = str_replace('<dol_value_customer_account_balance>', $object->customer_account_balance, $this->template);
-        //$this->template = str_replace('<dol_value_customer_points>', $object->customer_points, $this->template);
+		$this->template = str_replace('{dol_value_customer_firstname}', $object->thirdparty->firstname, $this->template);
+		$this->template = str_replace('{dol_value_customer_lastname}', $object->thirdparty->lastname, $this->template);
+		$this->template = str_replace('{dol_value_customer_mail}', $object->thirdparty->email, $this->template);
+		$this->template = str_replace('{dol_value_customer_phone}', $object->thirdparty->phone, $this->template);
+		//$this->template = str_replace('<dol_value_customer_mobile>', $object->thirdparty->mobile, $this->template);
+		$this->template = str_replace('{dol_value_customer_tax_number}', $object->thirdparty->tva_intra, $this->template);
+		//$this->template = str_replace('<dol_value_customer_account_balance>', $object->customer_account_balance, $this->template);
+		//$this->template = str_replace('<dol_value_customer_points>', $object->customer_points, $this->template);
 
-        $this->template = str_replace('{dol_value_mysoc_name}', $mysoc->name, $this->template);
-        $this->template = str_replace('{dol_value_mysoc_address}', $mysoc->address, $this->template);
-        $this->template = str_replace('{dol_value_mysoc_zip}', $mysoc->zip, $this->template);
-        $this->template = str_replace('{dol_value_mysoc_town}', $mysoc->town, $this->template);
-        $this->template = str_replace('{dol_value_mysoc_country}', $mysoc->country, $this->template);
-        $this->template = str_replace('{dol_value_mysoc_idprof1}', $mysoc->idprof1, $this->template);
-        $this->template = str_replace('{dol_value_mysoc_idprof2}', $mysoc->idprof2, $this->template);
-        $this->template = str_replace('{dol_value_mysoc_idprof3}', $mysoc->idprof3, $this->template);
-        $this->template = str_replace('{dol_value_mysoc_idprof4}', $mysoc->idprof4, $this->template);
-        $this->template = str_replace('{dol_value_mysoc_idprof5}', $mysoc->idprof5, $this->template);
-        $this->template = str_replace('{dol_value_mysoc_idprof6}', $mysoc->idprof6, $this->template);
-        $this->template = str_replace('{dol_value_mysoc_tva_intra}', $mysoc->tva_intra, $this->template);
-        $this->template = str_replace('{dol_value_mysoc_capital}', $mysoc->capital, $this->template);
+		$this->template = str_replace('{dol_value_mysoc_name}', $mysoc->name, $this->template);
+		$this->template = str_replace('{dol_value_mysoc_address}', $mysoc->address, $this->template);
+		$this->template = str_replace('{dol_value_mysoc_zip}', $mysoc->zip, $this->template);
+		$this->template = str_replace('{dol_value_mysoc_town}', $mysoc->town, $this->template);
+		$this->template = str_replace('{dol_value_mysoc_country}', $mysoc->country, $this->template);
+		$this->template = str_replace('{dol_value_mysoc_idprof1}', $mysoc->idprof1, $this->template);
+		$this->template = str_replace('{dol_value_mysoc_idprof2}', $mysoc->idprof2, $this->template);
+		$this->template = str_replace('{dol_value_mysoc_idprof3}', $mysoc->idprof3, $this->template);
+		$this->template = str_replace('{dol_value_mysoc_idprof4}', $mysoc->idprof4, $this->template);
+		$this->template = str_replace('{dol_value_mysoc_idprof5}', $mysoc->idprof5, $this->template);
+		$this->template = str_replace('{dol_value_mysoc_idprof6}', $mysoc->idprof6, $this->template);
+		$this->template = str_replace('{dol_value_mysoc_tva_intra}', $mysoc->tva_intra, $this->template);
+		$this->template = str_replace('{dol_value_mysoc_capital}', $mysoc->capital, $this->template);
 
-        $this->template = str_replace('{dol_value_vendor_firstname}', $user->firstname, $this->template);
-        $this->template = str_replace('{dol_value_vendor_lastname}', $user->lastname, $this->template);
-        $this->template = str_replace('{dol_value_vendor_mail}', $user->email, $this->template);
+		$this->template = str_replace('{dol_value_vendor_firstname}', $user->firstname, $this->template);
+		$this->template = str_replace('{dol_value_vendor_lastname}', $user->lastname, $this->template);
+		$this->template = str_replace('{dol_value_vendor_mail}', $user->email, $this->template);
 
-        // parse template
+		// parse template
 		$this->template = str_replace("{", "<", $this->template);
 		$this->template = str_replace("}", ">", $this->template);
-        $p = xml_parser_create();
-        xml_parse_into_struct($p, $this->template, $vals, $index);
-        xml_parser_free($p);
-        //print '<pre>'.print_r($index, true).'</pre>';
-        //print '<pre>'.print_r($vals, true).'</pre>';
-        // print ticket
-        $level = 0;
-        $nbcharactbyline = (!empty($conf->global->RECEIPT_PRINTER_NB_CHARACT_BY_LINE) ? $conf->global->RECEIPT_PRINTER_NB_CHARACT_BY_LINE : 48);
-        $ret = $this->initPrinter($printerid);
-        if ($ret > 0) {
-            setEventMessages($this->error, $this->errors, 'errors');
-        } else {
-            $nboflines = count($vals);
-            for ($tplline = 0; $tplline < $nboflines; $tplline++) {
-                //var_dump($vals[$tplline]['value']);
-                switch ($vals[$tplline]['tag']) {
-                    case 'DOL_PRINT_TEXT':
-                        $this->printer->text($vals[$tplline]['value']);
-                        break;
-                    case 'DOL_PRINT_OBJECT_LINES':
-                        foreach ($object->lines as $line) {
-                            //var_dump($line);
-                            $spacestoadd = $nbcharactbyline - strlen($line->ref) - strlen($line->qty) - 10 - 1;
-                            $spaces = str_repeat(' ', $spacestoadd);
-                            $this->printer->text($line->ref.$spaces.$line->qty.' '.str_pad(price($line->total_ttc), 10, ' ', STR_PAD_LEFT)."\n");
-                            $this->printer->text(strip_tags(htmlspecialchars_decode($line->product_label))."\n");
-                        }
-                        break;
-                    case 'DOL_PRINT_OBJECT_TAX':
-                        //var_dump($object);
-                        $vatarray = array();
-                        foreach ($object->lines as $line) {
-                            $vatarray[$line->tva_tx] += $line->total_tva;
-                        }
-                        foreach ($vatarray as $vatkey => $vatvalue) {
-                             $spacestoadd = $nbcharactbyline - strlen($vatkey) - 12;
-                             $spaces = str_repeat(' ', $spacestoadd);
-                             $this->printer->text($spaces.$vatkey.'% '.str_pad(price($vatvalue), 10, ' ', STR_PAD_LEFT)."\n");
-                        }
-                        break;
-                    case 'DOL_PRINT_OBJECT_TAX1':
-                    	//var_dump($object);
-                    	$total_localtax1 = 0;
-                    	foreach ($object->lines as $line) {
-                    		$total_localtax1 += $line->total_localtax1;
-                    	}
-                    	foreach ($vatarray as $vatkey => $vatvalue) {
-                    		$this->printer->text(str_pad(price($total_localtax1), 10, ' ', STR_PAD_LEFT)."\n");
-                    	}
-                    	break;
-                    case 'DOL_PRINT_OBJECT_TAX2':
-                    	//var_dump($object);
-                    	$total_localtax2 = 0;
-                    	foreach ($object->lines as $line) {
-                    		$total_localtax2 += $line->total_localtax2;
-                    	}
-                    	foreach ($vatarray as $vatkey => $vatvalue) {
-                    		$this->printer->text(str_pad(price($total_localtax2), 10, ' ', STR_PAD_LEFT)."\n");
-                    	}
-                    	break;
-                    case 'DOL_PRINT_OBJECT_TOTAL':
-                        $title = $langs->trans('TotalHT');
-                        $spacestoadd = $nbcharactbyline - strlen($title) - 10;
-                        $spaces = str_repeat(' ', $spacestoadd);
-                        $this->printer->text($title.$spaces.str_pad(price($object->total_ht), 10, ' ', STR_PAD_LEFT)."\n");
-                        $title = $langs->trans('TotalVAT');
-                        $spacestoadd = $nbcharactbyline - strlen($title) - 10;
-                        $spaces = str_repeat(' ', $spacestoadd);
-                        $this->printer->text($title.$spaces.str_pad(price($object->total_tva), 10, ' ', STR_PAD_LEFT)."\n");
-                        $title = $langs->trans('TotalTTC');
-                        $spacestoadd = $nbcharactbyline - strlen($title) - 10;
-                        $spaces = str_repeat(' ', $spacestoadd);
-                        $this->printer->text($title.$spaces.str_pad(price($object->total_ttc), 10, ' ', STR_PAD_LEFT)."\n");
-                        break;
-                    case 'DOL_LINE_FEED':
-                        $this->printer->feed();
-                        break;
-                    case 'DOL_LINE_FEED_REVERSE':
-                        $this->printer->feedReverse();
-                        break;
-                    case 'DOL_ALIGN_CENTER':
-                        $this->printer->setJustification(Printer::JUSTIFY_CENTER);
-                        break;
-                    case 'DOL_ALIGN_RIGHT':
-                        $this->printer->setJustification(Printer::JUSTIFY_RIGHT);
-                        break;
-                    case 'DOL_ALIGN_LEFT':
-                        $this->printer->setJustification(Printer::JUSTIFY_LEFT);
-                        break;
-                    case 'DOL_OPEN_DRAWER':
-                        $this->printer->pulse();
-                        break;
-                    case 'DOL_ACTIVATE_BUZZER':
-                        //$this->printer->buzzer();
-                        break;
-                    case 'DOL_PRINT_BARCODE':
-                        // $vals[$tplline]['value'] -> barcode($content, $type)
-                        // var_dump($vals[$tplline]['value']);
-                        try {
-                            $this->printer->barcode($vals[$tplline]['value']);
-                        } catch (Exception $e) {
-                            $this->errors[] = 'Invalid Barcode value: '.$vals[$tplline]['value'];
-                            $error++;
-                        }
-                        break;
-                    case 'DOL_PRINT_LOGO':
-                        $img = EscposImage::load(DOL_DATA_ROOT.'/mycompany/logos/'.$mysoc->logo);
-                        $this->printer->graphics($img);
-                        break;
-                    case 'DOL_PRINT_LOGO_OLD':
-                        $img = EscposImage::load(DOL_DATA_ROOT.'/mycompany/logos/'.$mysoc->logo);
-                        $this->printer->bitImage($img);
-                        break;
-                    case 'DOL_PRINT_QRCODE':
-                        // $vals[$tplline]['value'] -> qrCode($content, $ec, $size, $model)
-                        $this->printer->qrcode($vals[$tplline]['value']);
-                        break;
-                    case 'DOL_CUT_PAPER_FULL':
-                        $this->printer->cut(Printer::CUT_FULL);
-                        break;
-                    case 'DOL_CUT_PAPER_PARTIAL':
-                        $this->printer->cut(Printer::CUT_PARTIAL);
-                        break;
-                    case 'DOL_USE_FONT_A':
-                        $this->printer->setFont(Printer::FONT_A);
-                        break;
-                    case 'DOL_USE_FONT_B':
-                        $this->printer->setFont(Printer::FONT_B);
-                        break;
-                    case 'DOL_USE_FONT_C':
-                        $this->printer->setFont(Printer::FONT_C);
-                        break;
+		$p = xml_parser_create();
+		xml_parse_into_struct($p, $this->template, $vals, $index);
+		xml_parser_free($p);
+		//print '<pre>'.print_r($index, true).'</pre>';
+		//print '<pre>'.print_r($vals, true).'</pre>';
+		// print ticket
+		$level = 0;
+		$nbcharactbyline = (!empty($conf->global->RECEIPT_PRINTER_NB_CHARACT_BY_LINE) ? $conf->global->RECEIPT_PRINTER_NB_CHARACT_BY_LINE : 48);
+		$ret = $this->initPrinter($printerid);
+		if ($ret > 0) {
+			setEventMessages($this->error, $this->errors, 'errors');
+		} else {
+			$nboflines = count($vals);
+			for ($tplline = 0; $tplline < $nboflines; $tplline++) {
+				//var_dump($vals[$tplline]['value']);
+				switch ($vals[$tplline]['tag']) {
+					case 'DOL_PRINT_TEXT':
+						$this->printer->text($vals[$tplline]['value']);
+						break;
+					case 'DOL_PRINT_OBJECT_LINES':
+						foreach ($object->lines as $line) {
+							//var_dump($line);
+							$spacestoadd = $nbcharactbyline - strlen($line->ref) - strlen($line->qty) - 10 - 1;
+							$spaces = str_repeat(' ', $spacestoadd);
+							$this->printer->text($line->ref.$spaces.$line->qty.' '.str_pad(price($line->total_ttc), 10, ' ', STR_PAD_LEFT)."\n");
+							$this->printer->text(strip_tags(htmlspecialchars_decode($line->product_label))."\n");
+						}
+						break;
+					case 'DOL_PRINT_OBJECT_TAX':
+						//var_dump($object);
+						$vatarray = array();
+						foreach ($object->lines as $line) {
+							$vatarray[$line->tva_tx] += $line->total_tva;
+						}
+						foreach ($vatarray as $vatkey => $vatvalue) {
+							 $spacestoadd = $nbcharactbyline - strlen($vatkey) - 12;
+							 $spaces = str_repeat(' ', $spacestoadd);
+							 $this->printer->text($spaces.$vatkey.'% '.str_pad(price($vatvalue), 10, ' ', STR_PAD_LEFT)."\n");
+						}
+						break;
+					case 'DOL_PRINT_OBJECT_TAX1':
+						//var_dump($object);
+						$total_localtax1 = 0;
+						foreach ($object->lines as $line) {
+							$total_localtax1 += $line->total_localtax1;
+						}
+						foreach ($vatarray as $vatkey => $vatvalue) {
+							$this->printer->text(str_pad(price($total_localtax1), 10, ' ', STR_PAD_LEFT)."\n");
+						}
+						break;
+					case 'DOL_PRINT_OBJECT_TAX2':
+						//var_dump($object);
+						$total_localtax2 = 0;
+						foreach ($object->lines as $line) {
+							$total_localtax2 += $line->total_localtax2;
+						}
+						foreach ($vatarray as $vatkey => $vatvalue) {
+							$this->printer->text(str_pad(price($total_localtax2), 10, ' ', STR_PAD_LEFT)."\n");
+						}
+						break;
+					case 'DOL_PRINT_OBJECT_TOTAL':
+						$title = $langs->trans('TotalHT');
+						$spacestoadd = $nbcharactbyline - strlen($title) - 10;
+						$spaces = str_repeat(' ', $spacestoadd);
+						$this->printer->text($title.$spaces.str_pad(price($object->total_ht), 10, ' ', STR_PAD_LEFT)."\n");
+						$title = $langs->trans('TotalVAT');
+						$spacestoadd = $nbcharactbyline - strlen($title) - 10;
+						$spaces = str_repeat(' ', $spacestoadd);
+						$this->printer->text($title.$spaces.str_pad(price($object->total_tva), 10, ' ', STR_PAD_LEFT)."\n");
+						$title = $langs->trans('TotalTTC');
+						$spacestoadd = $nbcharactbyline - strlen($title) - 10;
+						$spaces = str_repeat(' ', $spacestoadd);
+						$this->printer->text($title.$spaces.str_pad(price($object->total_ttc), 10, ' ', STR_PAD_LEFT)."\n");
+						break;
+					case 'DOL_LINE_FEED':
+						$this->printer->feed();
+						break;
+					case 'DOL_LINE_FEED_REVERSE':
+						$this->printer->feedReverse();
+						break;
+					case 'DOL_ALIGN_CENTER':
+						$this->printer->setJustification(Printer::JUSTIFY_CENTER);
+						break;
+					case 'DOL_ALIGN_RIGHT':
+						$this->printer->setJustification(Printer::JUSTIFY_RIGHT);
+						break;
+					case 'DOL_ALIGN_LEFT':
+						$this->printer->setJustification(Printer::JUSTIFY_LEFT);
+						break;
+					case 'DOL_OPEN_DRAWER':
+						$this->printer->pulse();
+						break;
+					case 'DOL_ACTIVATE_BUZZER':
+						//$this->printer->buzzer();
+						break;
+					case 'DOL_PRINT_BARCODE':
+						// $vals[$tplline]['value'] -> barcode($content, $type)
+						// var_dump($vals[$tplline]['value']);
+						try {
+							$this->printer->barcode($vals[$tplline]['value']);
+						} catch (Exception $e) {
+							$this->errors[] = 'Invalid Barcode value: '.$vals[$tplline]['value'];
+							$error++;
+						}
+						break;
+					case 'DOL_PRINT_LOGO':
+						$img = EscposImage::load(DOL_DATA_ROOT.'/mycompany/logos/'.$mysoc->logo);
+						$this->printer->graphics($img);
+						break;
+					case 'DOL_PRINT_LOGO_OLD':
+						$img = EscposImage::load(DOL_DATA_ROOT.'/mycompany/logos/'.$mysoc->logo);
+						$this->printer->bitImage($img);
+						break;
+					case 'DOL_PRINT_QRCODE':
+						// $vals[$tplline]['value'] -> qrCode($content, $ec, $size, $model)
+						$this->printer->qrcode($vals[$tplline]['value']);
+						break;
+					case 'DOL_CUT_PAPER_FULL':
+						$this->printer->cut(Printer::CUT_FULL);
+						break;
+					case 'DOL_CUT_PAPER_PARTIAL':
+						$this->printer->cut(Printer::CUT_PARTIAL);
+						break;
+					case 'DOL_USE_FONT_A':
+						$this->printer->setFont(Printer::FONT_A);
+						break;
+					case 'DOL_USE_FONT_B':
+						$this->printer->setFont(Printer::FONT_B);
+						break;
+					case 'DOL_USE_FONT_C':
+						$this->printer->setFont(Printer::FONT_C);
+						break;
 					case 'DOL_BOLD':
-                        $this->printer->setEmphasis(true);
-                        break;
+						$this->printer->setEmphasis(true);
+						break;
 					case 'DOL_BOLD_DISABLED':
-                        $this->printer->setEmphasis(false);
-                        break;
+						$this->printer->setEmphasis(false);
+						break;
 					case 'DOL_DOUBLE_HEIGHT':
-                        $this->printer->setTextSize(1, 2);
-                        break;
+						$this->printer->setTextSize(1, 2);
+						break;
 					case 'DOL_DOUBLE_WIDTH':
-                        $this->printer->setTextSize(2, 1);
-                        break;
+						$this->printer->setTextSize(2, 1);
+						break;
 					case 'DOL_DEFAULT_HEIGHT_WIDTH':
-                        $this->printer->setTextSize(1, 1);
-                        break;
+						$this->printer->setTextSize(1, 1);
+						break;
 					case 'DOL_UNDERLINE':
-                        $this->printer->setUnderline(true);
-                        break;
+						$this->printer->setUnderline(true);
+						break;
 					case 'DOL_UNDERLINE_DISABLED':
-                        $this->printer->setUnderline(false);
-                        break;
+						$this->printer->setUnderline(false);
+						break;
 					case 'DOL_BEEP':
-                        $this->printer->getPrintConnector() -> write("\x1e");
-                        break;
+						$this->printer->getPrintConnector() -> write("\x1e");
+						break;
 					case 'DOL_PRINT_ORDER_LINES':
 						foreach ($object->lines as $line) {
 							if ($line->special_code == $this->orderprinter)
@@ -775,7 +775,7 @@ class dolReceiptPrinter extends Printer
 								$this->printer->text($line->ref.$spaces.$line->qty.' '.str_pad(price($line->total_ttc), 10, ' ', STR_PAD_LEFT)."\n");
 								$this->printer->text(strip_tags(htmlspecialchars_decode($line->desc))."\n");
 							}
-                        }
+						}
 						break;
 					case 'DOL_PRINT_PAYMENT':
 						$sql = "SELECT p.pos_change as pos_change, p.datep as date, p.fk_paiement, p.num_paiement as num, pf.amount as amount, pf.multicurrency_amount,";
@@ -793,10 +793,10 @@ class dolReceiptPrinter extends Printer
 								$row = $this->db->fetch_object($resql);
 								$spacestoadd = $nbcharactbyline - strlen($langs->transnoentitiesnoconv("PaymentTypeShort".$row->code)) - 12;
 								$spaces = str_repeat(' ', $spacestoadd);
-								$amount_payment=($conf->multicurrency->enabled && $object->multicurrency_tx != 1) ? $row->multicurrency_amount : $row->amount;
+								$amount_payment = ($conf->multicurrency->enabled && $object->multicurrency_tx != 1) ? $row->multicurrency_amount : $row->amount;
 								if ($row->code == "LIQ") $amount_payment = $amount_payment + $row->pos_change; // Show amount with excess received if is cash payment
 								$this->printer->text($spaces.$langs->transnoentitiesnoconv("PaymentTypeShort".$row->code).' '.str_pad(price($amount_payment), 10, ' ', STR_PAD_LEFT)."\n");
-								if ($row->code == "LIQ" && $row->pos_change>0) // Print change only in cash payments
+								if ($row->code == "LIQ" && $row->pos_change > 0) // Print change only in cash payments
 								{
 									$spacestoadd = $nbcharactbyline - strlen($langs->trans("Change")) - 12;
 									$spaces = str_repeat(' ', $spacestoadd);
@@ -806,15 +806,15 @@ class dolReceiptPrinter extends Printer
 							}
 						}
 						break;
-                    default:
-                        $this->printer->text($vals[$tplline]['tag']);
-                        $this->printer->text($vals[$tplline]['value']);
-                        $this->errors[] = 'UnknowTag: &lt;'.strtolower($vals[$tplline]['tag']).'&gt;';
-                        $error++;
-                        break;
-                }
-            }
-            // If is DummyPrintConnector send to log to debugging
+					default:
+						$this->printer->text($vals[$tplline]['tag']);
+						$this->printer->text($vals[$tplline]['value']);
+						$this->errors[] = 'UnknowTag: &lt;'.strtolower($vals[$tplline]['tag']).'&gt;';
+						$error++;
+						break;
+				}
+			}
+			// If is DummyPrintConnector send to log to debugging
 			if ($this->printer->connector instanceof DummyPrintConnector || $conf->global->TAKEPOS_PRINT_METHOD == "takeposconnector")
 			{
 				$data = $this->printer->connector->getData();
@@ -822,103 +822,103 @@ class dolReceiptPrinter extends Printer
 				dol_syslog($data);
 			}
 			// Close and print
-            $this->printer->close();
-        }
-        return $error;
-    }
+			$this->printer->close();
+		}
+		return $error;
+	}
 
-    /**
-     *  Function to load Template
-     *
-     *  @param   int       $templateid          Template id
-     *  @return  int                            0 if OK; >0 if KO
-     */
-    public function loadTemplate($templateid)
-    {
-        global $conf;
-        $error = 0;
-        $sql = 'SELECT template';
-        $sql .= ' FROM '.MAIN_DB_PREFIX.'printer_receipt_template';
-        $sql .= ' WHERE rowid='.$templateid;
-        $sql .= ' AND entity = '.$conf->entity;
-        $resql = $this->db->query($sql);
-        if ($resql) {
-            $obj = $this->db->fetch_array($resql);
-        } else {
-            $error++;
-            $this->errors[] = $this->db->lasterror;
-        }
-        if (empty($obj)) {
-            $error++;
-            $this->errors[] = 'TemplateDontExist';
-        } else {
-            $this->template = $obj['0'];
-        }
+	/**
+	 *  Function to load Template
+	 *
+	 *  @param   int       $templateid          Template id
+	 *  @return  int                            0 if OK; >0 if KO
+	 */
+	public function loadTemplate($templateid)
+	{
+		global $conf;
+		$error = 0;
+		$sql = 'SELECT template';
+		$sql .= ' FROM '.MAIN_DB_PREFIX.'printer_receipt_template';
+		$sql .= ' WHERE rowid='.$templateid;
+		$sql .= ' AND entity = '.$conf->entity;
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			$obj = $this->db->fetch_array($resql);
+		} else {
+			$error++;
+			$this->errors[] = $this->db->lasterror;
+		}
+		if (empty($obj)) {
+			$error++;
+			$this->errors[] = 'TemplateDontExist';
+		} else {
+			$this->template = $obj['0'];
+		}
 
-        return $error;
-    }
+		return $error;
+	}
 
 
-    /**
-     *  Function Init Printer
-     *
-     *  @param   int       $printerid       Printer id
-     *  @return  int                        0 if OK; >0 if KO
-     */
-    public function initPrinter($printerid)
-    {
-        global $conf;
-		if ($conf->global->TAKEPOS_PRINT_METHOD == "takeposconnector"){
+	/**
+	 *  Function Init Printer
+	 *
+	 *  @param   int       $printerid       Printer id
+	 *  @return  int                        0 if OK; >0 if KO
+	 */
+	public function initPrinter($printerid)
+	{
+		global $conf;
+		if ($conf->global->TAKEPOS_PRINT_METHOD == "takeposconnector") {
 			$this->connector = new DummyPrintConnector();
 			$this->printer = new Printer($this->connector, $this->profile);
 			return;
 		}
-        $error = 0;
-        $sql = 'SELECT rowid, name, fk_type, fk_profile, parameter';
-        $sql .= ' FROM '.MAIN_DB_PREFIX.'printer_receipt';
-        $sql .= ' WHERE rowid = '.$printerid;
-        $sql .= ' AND entity = '.$conf->entity;
-        $resql = $this->db->query($sql);
-        if ($resql) {
-            $obj = $this->db->fetch_array($resql);
-        } else {
-            $error++;
-            $this->errors[] = $this->db->lasterror;
-        }
-        if (empty($obj)) {
-            $error++;
-            $this->errors[] = 'PrinterDontExist';
-        }
-        if (!$error) {
-            $parameter = $obj['parameter'];
-            try {
-                switch ($obj['fk_type']) {
-                    case 1:
-                        $this->connector = new DummyPrintConnector();
-                        break;
-                    case 2:
-                        $this->connector = new FilePrintConnector($parameter);
-                        break;
-                    case 3:
-                        $parameters = explode(':', $parameter);
-                        $this->connector = new NetworkPrintConnector($parameters[0], $parameters[1]);
-                        break;
-                    case 4:
-                        $this->connector = new WindowsPrintConnector($parameter);
-                        break;
+		$error = 0;
+		$sql = 'SELECT rowid, name, fk_type, fk_profile, parameter';
+		$sql .= ' FROM '.MAIN_DB_PREFIX.'printer_receipt';
+		$sql .= ' WHERE rowid = '.$printerid;
+		$sql .= ' AND entity = '.$conf->entity;
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			$obj = $this->db->fetch_array($resql);
+		} else {
+			$error++;
+			$this->errors[] = $this->db->lasterror;
+		}
+		if (empty($obj)) {
+			$error++;
+			$this->errors[] = 'PrinterDontExist';
+		}
+		if (!$error) {
+			$parameter = $obj['parameter'];
+			try {
+				switch ($obj['fk_type']) {
+					case 1:
+						$this->connector = new DummyPrintConnector();
+						break;
+					case 2:
+						$this->connector = new FilePrintConnector($parameter);
+						break;
+					case 3:
+						$parameters = explode(':', $parameter);
+						$this->connector = new NetworkPrintConnector($parameters[0], $parameters[1]);
+						break;
+					case 4:
+						$this->connector = new WindowsPrintConnector($parameter);
+						break;
 					case 5:
-                        $this->connector = new CupsPrintConnector($parameter);
-                        break;
-                    default:
-                        $this->connector = 'CONNECTOR_UNKNOWN';
-                        break;
-                }
-                $this->printer = new Printer($this->connector, $this->profile);
-            } catch (Exception $e) {
-                $this->errors[] = $e->getMessage();
-                $error++;
-            }
-        }
-        return $error;
-    }
+						$this->connector = new CupsPrintConnector($parameter);
+						break;
+					default:
+						$this->connector = 'CONNECTOR_UNKNOWN';
+						break;
+				}
+				$this->printer = new Printer($this->connector, $this->profile);
+			} catch (Exception $e) {
+				$this->errors[] = $e->getMessage();
+				$error++;
+			}
+		}
+		return $error;
+	}
 }
diff --git a/htdocs/core/class/emailsenderprofile.class.php b/htdocs/core/class/emailsenderprofile.class.php
index 7cf18ae4801..efb2e554da9 100644
--- a/htdocs/core/class/emailsenderprofile.class.php
+++ b/htdocs/core/class/emailsenderprofile.class.php
@@ -114,21 +114,20 @@ class EmailSenderProfile extends CommonObject
 	public $entity;
 
 	/**
-     * @var string Email Sender Profile label
-     */
-    public $label;
+	 * @var string Email Sender Profile label
+	 */
+	public $label;
 
 	public $email;
 
 	/**
-     * @var integer|string date_creation
-     */
+	 * @var integer|string date_creation
+	 */
 	public $date_creation;
 
 
 	public $tms;
-	//public $fk_user_creat;
-	//public $fk_user_modif;
+	public $private;
 	public $signature;
 	public $position;
 	public $active;
@@ -306,9 +305,9 @@ class EmailSenderProfile extends CommonObject
 		$result = '';
 		$companylink = '';
 
-        $label = $this->label;
+		$label = $this->label;
 
-        $url = '';
+		$url = '';
 		//$url = dol_buildpath('/monmodule/emailsenderprofile_card.php',1).'?id='.$this->id;
 
 		$linkstart = '';
@@ -333,7 +332,7 @@ class EmailSenderProfile extends CommonObject
 		return $this->LibStatut($this->active, $mode);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return the status
 	 *
@@ -357,8 +356,8 @@ class EmailSenderProfile extends CommonObject
 		return dolGetStatus($label, $labelshort, '', $statusType, $mode);
 	}
 
-    /**
-     *  Charge les informations d'ordre info dans l'objet commande
+	/**
+	 *  Charge les informations d'ordre info dans l'objet commande
 	 *
 	 *  @param  int     $id       Id of order
 	 *  @return	void
diff --git a/htdocs/core/class/evalmath.class.php b/htdocs/core/class/evalmath.class.php
index 7e02aa57032..c30c37266c1 100644
--- a/htdocs/core/class/evalmath.class.php
+++ b/htdocs/core/class/evalmath.class.php
@@ -149,8 +149,8 @@ class EvalMath
 		$expr = trim($expr);
 		if (substr($expr, - 1, 1) == ';')
 			$expr = substr($expr, 0, strlen($expr) - 1); // strip semicolons at the end
-			                                             // ===============
-			                                             // is it a variable assignment?
+														 // ===============
+														 // is it a variable assignment?
 		$matches = array();
 		if (preg_match('/^\s*([a-z]\w*)\s*=\s*(.+)$/', $expr, $matches)) {
 			if (in_array($matches[1], $this->vb)) { // make sure we're not assigning to a constant
@@ -160,8 +160,8 @@ class EvalMath
 				return false; // get the result and make sure it's good
 			$this->v[$matches[1]] = $tmp; // if so, stick it in the variable array
 			return $this->v[$matches[1]]; // and return the resulting value
-			                              // ===============
-			                              // is it a function assignment?
+										  // ===============
+										  // is it a function assignment?
 		} elseif (preg_match('/^\s*([a-z]\w*)\s*\(\s*([a-z]\w*(?:\s*,\s*[a-z]\w*)*)\s*\)\s*=\s*(.+)$/', $expr, $matches)) {
 			$fnn = $matches[1]; // get the function name
 			if (in_array($matches[1], $this->fb)) { // make sure it isn't built in
@@ -235,7 +235,7 @@ class EvalMath
 		$ops_p = array('+' => 0, '-' => 0, '*' => 1, '/' => 1, '_' => 1, '^' => 2); // operator precedence
 
 		$expecting_op = false; // we use this in syntax-checking the expression
-		                       // and determining when a - is a negation
+							   // and determining when a - is a negation
 
 		$matches = array();
 		if (preg_match("/[^\w\s+*^\/()\.,-]/", $expr, $matches)) { // make sure the characters are all good
@@ -244,7 +244,7 @@ class EvalMath
 
 		while (1) { // 1 Infinite Loop ;)
 			$op = substr($expr, $index, 1); // get the first character at the current index
-			                                // find out if we're currently at the beginning of a number/variable/function/parenthesis/operand
+											// find out if we're currently at the beginning of a number/variable/function/parenthesis/operand
 			$match = array();
 			$ex = preg_match('/^([a-z]\w*\(?|\d+(?:\.\d*)?|\.\d+|\()/', substr($expr, $index), $match);
 			// ===============
@@ -253,7 +253,7 @@ class EvalMath
 				$index++;
 			} elseif ($op == '_') { // we have to explicitly deny this, because it's legal on the stack
 				return $this->trigger(4, "illegal character '_'", "_"); // but not in the input expression
-				                                                        // ===============
+																		// ===============
 			} elseif ((in_array($op, $ops) or $ex) and $expecting_op) { // are we putting an operator on the stack?
 				if ($ex) { // are we expecting an operator but have a number/variable/function/opening parethesis?
 					$op = '*';
@@ -372,7 +372,7 @@ class EvalMath
 		$stack = new EvalMathStack();
 
 		foreach ($tokens as $token) { // nice and easy
-		                              // if the token is a binary operator, pop two values off the stack, do the operation, and push the result back on
+									  // if the token is a binary operator, pop two values off the stack, do the operation, and push the result back on
 			$matches = array();
 			if (in_array($token, array('+', '-', '*', '/', '^'))) {
 				if (is_null($op2 = $stack->pop()))
@@ -412,7 +412,7 @@ class EvalMath
 						$fnn = 'log';
 					eval('$stack->push('.$fnn.'($op1));'); // perfectly safe eval()
 				} elseif (array_key_exists($fnn, $this->f)) { // user function
-				                                              // get args
+															  // get args
 					$args = array();
 					for ($i = count($this->f[$fnn]['args']) - 1; $i >= 0; $i--) {
 						if (is_null($args[$this->f[$fnn]['args'][$i]] = $stack->pop()))
diff --git a/htdocs/core/class/events.class.php b/htdocs/core/class/events.class.php
index bffd23f05d2..fc0c4533b7d 100644
--- a/htdocs/core/class/events.class.php
+++ b/htdocs/core/class/events.class.php
@@ -43,10 +43,10 @@ class Events // extends CommonObject
 	 */
 	public $id;
 
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
 	/**
 	 * @var string Error code (or message)
@@ -58,7 +58,7 @@ class Events // extends CommonObject
 	 */
 	public $tms;
 
-    /**
+	/**
 	 * @var string Type
 	 */
 	public $type;
@@ -94,7 +94,7 @@ class Events // extends CommonObject
 	public $eventstolog = array(
 		array('id'=>'USER_LOGIN', 'test'=>1),
 		array('id'=>'USER_LOGIN_FAILED', 'test'=>1),
-	    array('id'=>'USER_LOGOUT', 'test'=>1),
+		array('id'=>'USER_LOGOUT', 'test'=>1),
 		array('id'=>'USER_CREATE', 'test'=>1),
 		array('id'=>'USER_MODIFY', 'test'=>1),
 		array('id'=>'USER_NEW_PASSWORD', 'test'=>1),
@@ -187,7 +187,7 @@ class Events // extends CommonObject
 	 * @param   int		$notrigger	    0=no, 1=yes (no update trigger)
 	 * @return  int         			<0 if KO, >0 if OK
 	 */
-    public function update($user = null, $notrigger = 0)
+	public function update($user = null, $notrigger = 0)
 	{
 		// Clean parameters
 		$this->id = (int) $this->id;
@@ -222,7 +222,7 @@ class Events // extends CommonObject
 	 *  @param  User	$user       User that load
 	 *  @return int         		<0 if KO, >0 if OK
 	 */
-    public function fetch($id, $user = null)
+	public function fetch($id, $user = null)
 	{
 		$sql = "SELECT";
 		$sql .= " t.rowid,";
@@ -271,7 +271,7 @@ class Events // extends CommonObject
 	 *	@param	User	$user       User that delete
 	 *	@return	int					<0 if KO, >0 if OK
 	 */
-    public function delete($user)
+	public function delete($user)
 	{
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."events";
 		$sql .= " WHERE rowid=".$this->id;
@@ -289,13 +289,13 @@ class Events // extends CommonObject
 
 
 	/**
-     *  Initialise an instance with random values.
-     *  Used to build previews or test instances.
-     *	id must be 0 if object instance is a specimen.
-     *
-     *  @return	void
-     */
-    public function initAsSpecimen()
+	 *  Initialise an instance with random values.
+	 *  Used to build previews or test instances.
+	 *	id must be 0 if object instance is a specimen.
+	 *
+	 *  @return	void
+	 */
+	public function initAsSpecimen()
 	{
 		$this->id = 0;
 
@@ -306,5 +306,5 @@ class Events // extends CommonObject
 		$this->ip = '1.2.3.4';
 		$this->user_agent = 'Mozilla specimen User Agent X.Y';
 		$this->prefix_session = dol_getprefix();
-    }
+	}
 }
diff --git a/htdocs/core/class/extralanguages.class.php b/htdocs/core/class/extralanguages.class.php
index a57fa20f510..34c2e34dc82 100644
--- a/htdocs/core/class/extralanguages.class.php
+++ b/htdocs/core/class/extralanguages.class.php
@@ -28,13 +28,13 @@
 class ExtraLanguages
 {
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
 	/**
-     * @var array New array to store extralanguages definition
-     */
+	 * @var array New array to store extralanguages definition
+	 */
 	public $attributes;
 
 	/**
@@ -47,7 +47,7 @@ class ExtraLanguages
 	 */
 	public $errors = array();
 
-    /**
+	/**
 	 * @var string DB Error number
 	 */
 	public $errno;
@@ -57,7 +57,7 @@ class ExtraLanguages
 	 *	Constructor
 	 *
 	 *  @param		DoliDB		$db      Database handler
-	*/
+	 */
 	public function __construct($db)
 	{
 		$this->db = $db;
@@ -67,7 +67,7 @@ class ExtraLanguages
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * 	Load array this->attributes with list of fields per object that need an alternate translation. The object and field must be managed with
 	 *  the widgetForTranslation() method.
@@ -80,7 +80,7 @@ class ExtraLanguages
 	 */
 	public function fetch_name_extralanguages($elementtype, $forceload = false)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 		if (empty($elementtype)) return array();
diff --git a/htdocs/core/class/fileupload.class.php b/htdocs/core/class/fileupload.class.php
index c941a3a0745..b601994536e 100644
--- a/htdocs/core/class/fileupload.class.php
+++ b/htdocs/core/class/fileupload.class.php
@@ -176,16 +176,16 @@ class FileUpload
 				)
 		);
 
-        $hookmanager->executeHooks(
-            'overrideUploadOptions',
-            array(
-                'options' => &$options,
-                'element' => $element
-            ),
-            $object,
-            $action,
-            $hookmanager
-        );
+		$hookmanager->executeHooks(
+			'overrideUploadOptions',
+			array(
+				'options' => &$options,
+				'element' => $element
+			),
+			$object,
+			$action,
+			$hookmanager
+		);
 
 		if ($options) {
 			$this->options = array_replace_recursive($this->options, $options);
@@ -504,26 +504,26 @@ class FileUpload
 			// param_name is an array identifier like "files[]",
 			// $_FILES is a multi-dimensional array:
 			foreach ($upload['tmp_name'] as $index => $value) {
-                $info[] = $this->handleFileUpload(
-                    $upload['tmp_name'][$index],
-                    isset($_SERVER['HTTP_X_FILE_NAME']) ? $_SERVER['HTTP_X_FILE_NAME'] : $upload['name'][$index],
-                    isset($_SERVER['HTTP_X_FILE_SIZE']) ? $_SERVER['HTTP_X_FILE_SIZE'] : $upload['size'][$index],
-                    isset($_SERVER['HTTP_X_FILE_TYPE']) ? $_SERVER['HTTP_X_FILE_TYPE'] : $upload['type'][$index],
-                    $upload['error'][$index],
-                    $index
-                );
+				$info[] = $this->handleFileUpload(
+					$upload['tmp_name'][$index],
+					isset($_SERVER['HTTP_X_FILE_NAME']) ? $_SERVER['HTTP_X_FILE_NAME'] : $upload['name'][$index],
+					isset($_SERVER['HTTP_X_FILE_SIZE']) ? $_SERVER['HTTP_X_FILE_SIZE'] : $upload['size'][$index],
+					isset($_SERVER['HTTP_X_FILE_TYPE']) ? $_SERVER['HTTP_X_FILE_TYPE'] : $upload['type'][$index],
+					$upload['error'][$index],
+					$index
+				);
 			}
 		} elseif ($upload || isset($_SERVER['HTTP_X_FILE_NAME'])) {
 			// param_name is a single object identifier like "file",
 			// $_FILES is a one-dimensional array:
-            $info[] = $this->handleFileUpload(
-                isset($upload['tmp_name']) ? $upload['tmp_name'] : null,
-                isset($_SERVER['HTTP_X_FILE_NAME']) ? $_SERVER['HTTP_X_FILE_NAME'] : (isset($upload['name']) ? $upload['name'] : null),
-                isset($_SERVER['HTTP_X_FILE_SIZE']) ? $_SERVER['HTTP_X_FILE_SIZE'] : (isset($upload['size']) ? $upload['size'] : null),
-                isset($_SERVER['HTTP_X_FILE_TYPE']) ? $_SERVER['HTTP_X_FILE_TYPE'] : (isset($upload['type']) ? $upload['type'] : null),
-                isset($upload['error']) ? $upload['error'] : null,
-                0
-            );
+			$info[] = $this->handleFileUpload(
+				isset($upload['tmp_name']) ? $upload['tmp_name'] : null,
+				isset($_SERVER['HTTP_X_FILE_NAME']) ? $_SERVER['HTTP_X_FILE_NAME'] : (isset($upload['name']) ? $upload['name'] : null),
+				isset($_SERVER['HTTP_X_FILE_SIZE']) ? $_SERVER['HTTP_X_FILE_SIZE'] : (isset($upload['size']) ? $upload['size'] : null),
+				isset($_SERVER['HTTP_X_FILE_TYPE']) ? $_SERVER['HTTP_X_FILE_TYPE'] : (isset($upload['type']) ? $upload['type'] : null),
+				isset($upload['error']) ? $upload['error'] : null,
+				0
+			);
 		}
 		header('Vary: Accept');
 		$json = json_encode($info);
diff --git a/htdocs/core/class/fiscalyear.class.php b/htdocs/core/class/fiscalyear.class.php
index c0216f16a19..0e822076641 100644
--- a/htdocs/core/class/fiscalyear.class.php
+++ b/htdocs/core/class/fiscalyear.class.php
@@ -69,25 +69,25 @@ class Fiscalyear extends CommonObject
 	public $label;
 
 	/**
-     * Date start (date_start)
-     *
-     * @var integer
-     */
+	 * Date start (date_start)
+	 *
+	 * @var integer
+	 */
 	public $date_start;
 
 	/**
-     * Date end (date_end)
-     *
-     * @var integer
-     */
+	 * Date end (date_end)
+	 *
+	 * @var integer
+	 */
 	public $date_end;
 
 	/**
-     * Date creation record (datec)
-     *
-     * @var integer
-     */
-    public $datec;
+	 * Date creation record (datec)
+	 *
+	 * @var integer
+	 */
+	public $datec;
 
 	public $statut; // 0=open, 1=closed
 
@@ -214,11 +214,11 @@ class Fiscalyear extends CommonObject
 	}
 
 	/**
-	* Load an object from database
-	*
-	* @param	int		$id		Id of record to load
-	* @return	int				<0 if KO, >0 if OK
-	*/
+	 * Load an object from database
+	 *
+	 * @param	int		$id		Id of record to load
+	 * @return	int				<0 if KO, >0 if OK
+	 */
 	public function fetch($id)
 	{
 		$sql = "SELECT rowid, label, date_start, date_end, statut";
@@ -245,7 +245,7 @@ class Fiscalyear extends CommonObject
 		}
 	}
 
-    /**
+	/**
 	 *	Delete record
 	 *
 	 *	@param	int		$id		Id of record to delete
diff --git a/htdocs/core/class/genericobject.class.php b/htdocs/core/class/genericobject.class.php
index 25f3dc6af11..e27e45de954 100644
--- a/htdocs/core/class/genericobject.class.php
+++ b/htdocs/core/class/genericobject.class.php
@@ -29,13 +29,13 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
 
 class GenericObject extends CommonObject
 {
-    /**
-     * Constructor
-     *
-     * @param       DoliDB      $db     Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-    }
+	/**
+	 * Constructor
+	 *
+	 * @param       DoliDB      $db     Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
 }
diff --git a/htdocs/core/class/google.class.php b/htdocs/core/class/google.class.php
index 117b8e30e02..ee122ff7cb5 100644
--- a/htdocs/core/class/google.class.php
+++ b/htdocs/core/class/google.class.php
@@ -26,63 +26,63 @@
  */
 class GoogleAPI
 {
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    /**
-     * @var string Error code (or message)
-     */
-    public $error = '';
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error = '';
 
-    public $key;
+	public $key;
 
-    /**
-     * Constructor
-     *
-     * @param 	DoliDB		$db			Database handler
-     * @param	string		$key		Google key
-     */
-    public function __construct($db, $key)
-    {
-        $this->db = $db;
-        $this->key = $key;
-    }
+	/**
+	 * Constructor
+	 *
+	 * @param 	DoliDB		$db			Database handler
+	 * @param	string		$key		Google key
+	 */
+	public function __construct($db, $key)
+	{
+		$this->db = $db;
+		$this->key = $key;
+	}
 
 
-    /**
-     *  Return geo coordinates of an address
-     *
-     *  @param	string	$address	Address
-     * 								Example: 68 Grande rue Charles de Gaulle,+94130,+Nogent sur Marne,+France
-     *								Example: 188, rue de Fontenay,+94300,+Vincennes,+France
-     *	@return	string				Coordinates
-     */
-    public function getGeoCoordinatesOfAddress($address)
-    {
-        global $conf;
+	/**
+	 *  Return geo coordinates of an address
+	 *
+	 *  @param	string	$address	Address
+	 * 								Example: 68 Grande rue Charles de Gaulle,+94130,+Nogent sur Marne,+France
+	 *								Example: 188, rue de Fontenay,+94300,+Vincennes,+France
+	 *	@return	string				Coordinates
+	 */
+	public function getGeoCoordinatesOfAddress($address)
+	{
+		global $conf;
 
-        $i = 0;
+		$i = 0;
 
-        // Desired address
-        $urladdress = "https://maps.google.com/maps/geo?q=".urlencode($address)."&output=xml&key=".$this->key;
+		// Desired address
+		$urladdress = "https://maps.google.com/maps/geo?q=".urlencode($address)."&output=xml&key=".$this->key;
 
-        // Retrieve the URL contents
-        $page = file_get_contents($urladdress);
+		// Retrieve the URL contents
+		$page = file_get_contents($urladdress);
 
-        $code = strstr($page, '<coordinates>');
-        $code = strstr($code, '>');
-        $val = strpos($code, "<");
-        $code = substr($code, 1, $val - 1);
-        //print $code;
-        //print "<br>";
-        $latitude = substr($code, 0, strpos($code, ","));
-        $longitude = substr($code, strpos($code, ",") + 1, dol_strlen(strpos($code, ",")) - 3);
+		$code = strstr($page, '<coordinates>');
+		$code = strstr($code, '>');
+		$val = strpos($code, "<");
+		$code = substr($code, 1, $val - 1);
+		//print $code;
+		//print "<br>";
+		$latitude = substr($code, 0, strpos($code, ","));
+		$longitude = substr($code, strpos($code, ",") + 1, dol_strlen(strpos($code, ",")) - 3);
 
-        // Output the coordinates
-        //echo "Longitude: $longitude ',' Latitude: $latitude";
+		// Output the coordinates
+		//echo "Longitude: $longitude ',' Latitude: $latitude";
 
-        $i++;
-    }
+		$i++;
+	}
 }
diff --git a/htdocs/core/class/hookmanager.class.php b/htdocs/core/class/hookmanager.class.php
index 3c094ff5a6b..89b5a79df4b 100644
--- a/htdocs/core/class/hookmanager.class.php
+++ b/htdocs/core/class/hookmanager.class.php
@@ -105,7 +105,7 @@ class HookManager
 				if (in_array($context, $arrayhooks) || in_array('all', $arrayhooks))    // We instantiate action class only if initialized hook is handled by module
 				{
 					// Include actions class overwriting hooks
-					if (!is_object($this->hooks[$context][$module]))	// If set, class was already loaded
+					if (empty($this->hooks[$context][$module]) || !is_object($this->hooks[$context][$module]))	// If set to an object value, class was already loaded
 					{
 						$path = '/'.$module.'/class/';
 						$actionfile = 'actions_'.$module.'.class.php';
@@ -144,7 +144,7 @@ class HookManager
 	 */
 	public function executeHooks($method, $parameters = array(), &$object = '', &$action = '')
 	{
-		if (!is_array($this->hooks) || empty($this->hooks)) return 0;	// No hook available, do nothing.
+		if (!is_array($this->hooks) || empty($this->hooks)) return 0; // No hook available, do nothing.
 
 		$parameters['context'] = join(':', $this->contextarray);
 		//dol_syslog(get_class($this).'::executeHooks method='.$method." action=".$action." context=".$parameters['context']);
@@ -167,6 +167,7 @@ class HookManager
 				'doActions',
 				'doMassActions',
 				'formatEvent',
+				'formConfirm',
 				'formCreateThirdpartyOptions',
 				'formObjectOptions',
 				'formattachOptions',
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index bf52ff5871a..5c457a2a28c 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -509,7 +509,6 @@ class Form
 	 *  @param	int			$forcenowrap		Force no wrap between text and picto (works with notabs=2 only)
 	 *	@return	string							Code html du tooltip (texte+picto)
 	 *	@see	textwithpicto() Use thisfunction if you can.
-	 *  TODO Move this as static as soon as everybody use textwithpicto or @Form::textwithtooltip
 	 */
 	public function textwithtooltip($text, $htmltext, $tooltipon = 1, $direction = 0, $img = '', $extracss = '', $notabs = 3, $incbefore = '', $noencodehtmltext = 0, $tooltiptrigger = '', $forcenowrap = 0)
 	{
@@ -1188,12 +1187,12 @@ class Form
 
 		// We search companies
 		$sql = "SELECT s.rowid, s.nom as name, s.name_alias, s.client, s.fournisseur, s.code_client, s.code_fournisseur";
-		if (! empty($conf->global->COMPANY_SHOW_ADDRESS_SELECTLIST)) {
+		if (!empty($conf->global->COMPANY_SHOW_ADDRESS_SELECTLIST)) {
 			$sql .= ", s.address, s.zip, s.town";
 			$sql .= ", dictp.code as country_code";
 		}
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
-		if (! empty($conf->global->COMPANY_SHOW_ADDRESS_SELECTLIST)) {
+		if (!empty($conf->global->COMPANY_SHOW_ADDRESS_SELECTLIST)) {
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as dictp ON dictp.rowid = s.fk_pays";
 		}
 		if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@@ -1284,7 +1283,7 @@ class Form
 						if ($obj->client || $obj->fournisseur) $label .= ')';
 					}
 
-					if (! empty($conf->global->COMPANY_SHOW_ADDRESS_SELECTLIST)) {
+					if (!empty($conf->global->COMPANY_SHOW_ADDRESS_SELECTLIST)) {
 						$label .= ($obj->address ? ' - '.$obj->address : '').($obj->zip ? ' - '.$obj->zip : '').($obj->town ? ' '.$obj->town : '');
 						if (!empty($obj->country_code)) {
 							$label .= ', '.$langs->trans('Country'.$obj->country_code);
@@ -3567,106 +3566,106 @@ class Form
 		return $return;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *      Load in cache list of transport mode
-     *
-     *      @return     int                 Nb of lines loaded, <0 if KO
-     */
-    public function load_cache_transport_mode()
-    {
-        // phpcs:enable
-        global $langs;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *      Load in cache list of transport mode
+	 *
+	 *      @return     int                 Nb of lines loaded, <0 if KO
+	 */
+	public function load_cache_transport_mode()
+	{
+		// phpcs:enable
+		global $langs;
 
-        $num=count($this->cache_transport_mode);
-        if ($num > 0) return $num;    // Cache already loaded
+		$num = count($this->cache_transport_mode);
+		if ($num > 0) return $num; // Cache already loaded
 
-        dol_syslog(__METHOD__, LOG_DEBUG);
+		dol_syslog(__METHOD__, LOG_DEBUG);
 
-        $this->cache_transport_mode = array();
+		$this->cache_transport_mode = array();
 
-        $sql = "SELECT rowid, code, label, active";
-        $sql.= " FROM ".MAIN_DB_PREFIX."c_transport_mode";
-        $sql.= " WHERE entity IN (".getEntity('c_transport_mode').")";
-        //if ($active >= 0) $sql.= " AND active = ".$active;
+		$sql = "SELECT rowid, code, label, active";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_transport_mode";
+		$sql .= " WHERE entity IN (".getEntity('c_transport_mode').")";
+		//if ($active >= 0) $sql.= " AND active = ".$active;
 
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            $num = $this->db->num_rows($resql);
-            $i = 0;
-            while ($i < $num)
-            {
-                $obj = $this->db->fetch_object($resql);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$num = $this->db->num_rows($resql);
+			$i = 0;
+			while ($i < $num)
+			{
+				$obj = $this->db->fetch_object($resql);
 
-                // If traduction exist, we use it else we take the default label
-                $label=($langs->transnoentitiesnoconv("PaymentTypeShort".$obj->code)!=("PaymentTypeShort".$obj->code)?$langs->transnoentitiesnoconv("PaymentTypeShort".$obj->code):($obj->label!='-'?$obj->label:''));
-                $this->cache_transport_mode[$obj->rowid]['rowid'] = $obj->rowid;
-                $this->cache_transport_mode[$obj->rowid]['code'] = $obj->code;
-                $this->cache_transport_mode[$obj->rowid]['label']= $label;
-                $this->cache_transport_mode[$obj->rowid]['active'] = $obj->active;
-                $i++;
-            }
+				// If traduction exist, we use it else we take the default label
+				$label = ($langs->transnoentitiesnoconv("PaymentTypeShort".$obj->code) != ("PaymentTypeShort".$obj->code) ? $langs->transnoentitiesnoconv("PaymentTypeShort".$obj->code) : ($obj->label != '-' ? $obj->label : ''));
+				$this->cache_transport_mode[$obj->rowid]['rowid'] = $obj->rowid;
+				$this->cache_transport_mode[$obj->rowid]['code'] = $obj->code;
+				$this->cache_transport_mode[$obj->rowid]['label'] = $label;
+				$this->cache_transport_mode[$obj->rowid]['active'] = $obj->active;
+				$i++;
+			}
 
-            $this->cache_transport_mode = dol_sort_array($this->cache_transport_mode, 'label', 'asc', 0, 0, 1);
+			$this->cache_transport_mode = dol_sort_array($this->cache_transport_mode, 'label', 'asc', 0, 0, 1);
 
-            return $num;
-        }
-        else {
-            dol_print_error($this->db);
-            return -1;
-        }
-    }
+			return $num;
+		}
+		else {
+			dol_print_error($this->db);
+			return -1;
+		}
+	}
 
-    /**
-     *      Return list of transport mode for intracomm report
-     *
-     *      @param	string	$selected       Id of the transport mode pre-selected
-     *      @param  string	$htmlname       Name of the select field
-     *      @param  int		$format         0=id+label, 1=code+code, 2=code+label, 3=id+code
-     *      @param  int		$empty			1=can be empty, 0 else
-     *      @param	int		$noadmininfo	0=Add admin info, 1=Disable admin info
-     *      @param  int		$maxlength      Max length of label
-     *      @param  int     $active         Active or not, -1 = all
-     *      @param  string  $morecss        Add more CSS on select tag
-     * 		@return	void
-     */
-    public function selectTransportMode($selected = '', $htmlname = 'transportmode', $format = 0, $empty = 1, $noadmininfo = 0, $maxlength = 0, $active = 1, $morecss = '')
-    {
-        global $langs,$user;
+	/**
+	 *      Return list of transport mode for intracomm report
+	 *
+	 *      @param	string	$selected       Id of the transport mode pre-selected
+	 *      @param  string	$htmlname       Name of the select field
+	 *      @param  int		$format         0=id+label, 1=code+code, 2=code+label, 3=id+code
+	 *      @param  int		$empty			1=can be empty, 0 else
+	 *      @param	int		$noadmininfo	0=Add admin info, 1=Disable admin info
+	 *      @param  int		$maxlength      Max length of label
+	 *      @param  int     $active         Active or not, -1 = all
+	 *      @param  string  $morecss        Add more CSS on select tag
+	 * 		@return	void
+	 */
+	public function selectTransportMode($selected = '', $htmlname = 'transportmode', $format = 0, $empty = 1, $noadmininfo = 0, $maxlength = 0, $active = 1, $morecss = '')
+	{
+		global $langs, $user;
 
-        dol_syslog(__METHOD__." ".$selected.", ".$htmlname.", ".$format, LOG_DEBUG);
+		dol_syslog(__METHOD__." ".$selected.", ".$htmlname.", ".$format, LOG_DEBUG);
 
-        $this->load_cache_transport_mode();
+		$this->load_cache_transport_mode();
 
-        print '<select id="select'.$htmlname.'" class="flat selectmodetransport'.($morecss?' '.$morecss:'').'" name="'.$htmlname.'">';
-        if ($empty) print '<option value="">&nbsp;</option>';
-        foreach ($this->cache_transport_mode as $id => $arraytypes)
-        {
-            // If not good status
-            if ($active >= 0 && $arraytypes['active'] != $active) continue;
+		print '<select id="select'.$htmlname.'" class="flat selectmodetransport'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'">';
+		if ($empty) print '<option value="">&nbsp;</option>';
+		foreach ($this->cache_transport_mode as $id => $arraytypes)
+		{
+			// If not good status
+			if ($active >= 0 && $arraytypes['active'] != $active) continue;
 
-            // We discard empty line if showempty is on because an empty line has already been output.
-            if ($empty && empty($arraytypes['code'])) continue;
+			// We discard empty line if showempty is on because an empty line has already been output.
+			if ($empty && empty($arraytypes['code'])) continue;
 
-            if ($format == 0) print '<option value="'.$id.'"';
-            elseif ($format == 1) print '<option value="'.$arraytypes['code'].'"';
-            elseif ($format == 2) print '<option value="'.$arraytypes['code'].'"';
-            elseif ($format == 3) print '<option value="'.$id.'"';
-            // If text is selected, we compare with code, else with id
-            if (preg_match('/[a-z]/i', $selected) && $selected == $arraytypes['code']) print ' selected';
-            elseif ($selected == $id) print ' selected';
-            print '>';
-            if ($format == 0) $value=($maxlength?dol_trunc($arraytypes['label'], $maxlength):$arraytypes['label']);
-            elseif ($format == 1) $value=$arraytypes['code'];
-            elseif ($format == 2) $value=($maxlength?dol_trunc($arraytypes['label'], $maxlength):$arraytypes['label']);
-            elseif ($format == 3) $value=$arraytypes['code'];
-            print $value?$value:'&nbsp;';
-            print '</option>';
-        }
-        print '</select>';
-        if ($user->admin && ! $noadmininfo) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
-    }
+			if ($format == 0) print '<option value="'.$id.'"';
+			elseif ($format == 1) print '<option value="'.$arraytypes['code'].'"';
+			elseif ($format == 2) print '<option value="'.$arraytypes['code'].'"';
+			elseif ($format == 3) print '<option value="'.$id.'"';
+			// If text is selected, we compare with code, else with id
+			if (preg_match('/[a-z]/i', $selected) && $selected == $arraytypes['code']) print ' selected';
+			elseif ($selected == $id) print ' selected';
+			print '>';
+			if ($format == 0) $value = ($maxlength ?dol_trunc($arraytypes['label'], $maxlength) : $arraytypes['label']);
+			elseif ($format == 1) $value = $arraytypes['code'];
+			elseif ($format == 2) $value = ($maxlength ?dol_trunc($arraytypes['label'], $maxlength) : $arraytypes['label']);
+			elseif ($format == 3) $value = $arraytypes['code'];
+			print $value ? $value : '&nbsp;';
+			print '</option>';
+		}
+		print '</select>';
+		if ($user->admin && !$noadmininfo) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+	}
 
 	/**
 	 *  Return a HTML select list of shipping mode
@@ -4705,40 +4704,40 @@ class Form
 		}
 	}
 
-    /**
-     *    Show form with transport mode
-     *
-     *    @param	string	$page        	Page
-     *    @param    int		$selected    	Id mode pre-select
-     *    @param    string	$htmlname    	Name of select html field
-     *    @param    int     $active         Active or not, -1 = all
-     *    @param    int     $addempty       1=Add empty entry
-     *    @return	void
-     */
-    public function formSelectTransportMode($page, $selected = '', $htmlname = 'transport_mode_id', $active = 1, $addempty = 0)
-    {
-        global $langs;
-        if ($htmlname != "none")
-        {
-            print '<form method="POST" action="'.$page.'">';
-            print '<input type="hidden" name="action" value="setmode">';
-            print '<input type="hidden" name="token" value="'.newToken().'">';
-            $this->selectTransportMode($selected, $htmlname, 2, $addempty, 0, 0, $active);
-            print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-            print '</form>';
-        }
-        else {
-            if ($selected)
-            {
-                $this->load_cache_transport_mode();
-                print $this->cache_transport_mode[$selected]['label'];
-            } else {
-                print "&nbsp;";
-            }
-        }
-    }
+	/**
+	 *    Show form with transport mode
+	 *
+	 *    @param	string	$page        	Page
+	 *    @param    int		$selected    	Id mode pre-select
+	 *    @param    string	$htmlname    	Name of select html field
+	 *    @param    int     $active         Active or not, -1 = all
+	 *    @param    int     $addempty       1=Add empty entry
+	 *    @return	void
+	 */
+	public function formSelectTransportMode($page, $selected = '', $htmlname = 'transport_mode_id', $active = 1, $addempty = 0)
+	{
+		global $langs;
+		if ($htmlname != "none")
+		{
+			print '<form method="POST" action="'.$page.'">';
+			print '<input type="hidden" name="action" value="setmode">';
+			print '<input type="hidden" name="token" value="'.newToken().'">';
+			$this->selectTransportMode($selected, $htmlname, 2, $addempty, 0, 0, $active);
+			print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+			print '</form>';
+		}
+		else {
+			if ($selected)
+			{
+				$this->load_cache_transport_mode();
+				print $this->cache_transport_mode[$selected]['label'];
+			} else {
+				print "&nbsp;";
+			}
+		}
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *    Show form with multicurrency code
 	 *
@@ -5049,9 +5048,11 @@ class Form
 	 *  @param	string	$selected    preselected currency code
 	 *  @param  string	$htmlname    name of HTML select list
 	 *  @param  integer	$useempty    1=Add empty line
+	 *  @param string $filter Optional filters criteras (example: 'code <> x', ' in (1,3)')
+	 *  @param bool $excludeConfCurrency false  = If company current currency not in table, we add it into list. Should always be available.  true = we are in currency_rate update , we don't want to see conf->currency in select
 	 * 	@return	string
 	 */
-	public function selectMultiCurrency($selected = '', $htmlname = 'multicurrency_code', $useempty = 0)
+	public function selectMultiCurrency($selected = '', $htmlname = 'multicurrency_code', $useempty = 0, $filter = '', $excludeConfCurrency = false)
 	{
 		global $db, $conf, $langs, $user;
 
@@ -5061,6 +5062,7 @@ class Form
 
 		$sql = 'SELECT code FROM '.MAIN_DB_PREFIX.'multicurrency';
 		$sql .= " WHERE entity IN ('".getEntity('mutlicurrency')."')";
+		if ($filter) $sql .= " AND ".$filter;
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
@@ -5071,7 +5073,7 @@ class Form
 		$out .= '<select class="flat" name="'.$htmlname.'" id="'.$htmlname.'">';
 		if ($useempty) $out .= '<option value="">&nbsp;</option>';
 		// If company current currency not in table, we add it into list. Should always be available.
-		if (!in_array($conf->currency, $TCurrency))
+		if (!in_array($conf->currency, $TCurrency) && !$excludeConfCurrency)
 		{
 			$TCurrency[$conf->currency] = $conf->currency;
 		}
@@ -5648,7 +5650,7 @@ class Form
 
 		if ($d && $h) {
 			$retstring .= ($h == 2 ? '<br>' : ' ');
-			$retstring.='<span class="nowraponall">';
+			$retstring .= '<span class="nowraponall">';
 		}
 
 		if ($h)
@@ -6620,7 +6622,7 @@ class Form
 							 	templateSelection: formatSelection		/* For 4.0 */
 							});
 						});'."\n";
-			} elseif ($addjscombo == 2 && ! defined('DISABLE_MULTISELECT'))
+			} elseif ($addjscombo == 2 && !defined('DISABLE_MULTISELECT'))
 			{
 				// Add other js lib
 				// TODO external lib multiselect/jquery.multi-select.js must have been loaded to use this multiselect plugin
@@ -7721,7 +7723,7 @@ class Form
             $(document).ready(function() {
                 $("#' . $cssclass.'s").click(function() {
                     if($(this).is(\':checked\')){
-                        console.log("We check all '.$cssclass.'");
+                        console.log("We check all '.$cssclass.' and trigger the change method");
                 		$(".'.$cssclass.'").prop(\'checked\', true).trigger(\'change\');
                     }
                     else
diff --git a/htdocs/core/class/html.formaccounting.class.php b/htdocs/core/class/html.formaccounting.class.php
index f48e9b8eb74..d6f7b269da1 100644
--- a/htdocs/core/class/html.formaccounting.class.php
+++ b/htdocs/core/class/html.formaccounting.class.php
@@ -36,26 +36,26 @@ class FormAccounting extends Form
 	private $options_cache = array();
 
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
 	/**
 	 * @var string Error code (or message)
 	 */
 	public $error = '';
 
-    /**
+	/**
 	 * Constructor
 	 *
 	 * @param		DoliDB		$db      Database handler
 	 */
 	public function __construct($db)
 	{
-	    $this->db = $db;
+		$this->db = $db;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Return list of journals with label by nature
 	 *
@@ -72,16 +72,16 @@ class FormAccounting extends Form
 	 */
 	public function select_journal($selectid, $htmlname = 'journal', $nature = 0, $showempty = 0, $select_in = 0, $select_out = 0, $morecss = 'maxwidth300 maxwidthonsmartphone', $usecache = '', $disabledajaxcombo = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $langs;
 
 		$out = '';
 
-    	$options = array();
+		$options = array();
 		if ($usecache && !empty($this->options_cache[$usecache]))
 		{
-		    $options = $this->options_cache[$usecache];
-		    $selected = $selectid;
+			$options = $this->options_cache[$usecache];
+			$selected = $selectid;
 		} else {
 			$sql = "SELECT rowid, code, label, nature, entity, active";
 			$sql .= " FROM ".MAIN_DB_PREFIX."accounting_journal";
@@ -99,27 +99,27 @@ class FormAccounting extends Form
 				return -1;
 			}
 
-    		$selected = 0;
+			$selected = 0;
 			$langs->load('accountancy');
 			while ($obj = $this->db->fetch_object($resql))
 			{
 				$label = $obj->code.' - '.$langs->trans($obj->label);
 
-    			$select_value_in = $obj->rowid;
+				$select_value_in = $obj->rowid;
 				$select_value_out = $obj->rowid;
 
 				// Try to guess if we have found default value
-    			if ($select_in == 1) {
-    				$select_value_in = $obj->code;
-    			}
-    			if ($select_out == 1) {
-    				$select_value_out = $obj->code;
-    			}
-    			// Remember guy's we store in database llx_accounting_bookkeeping the code of accounting_journal and not the rowid
-    			if ($selectid != '' && $selectid == $select_value_in) {
-    			    //var_dump("Found ".$selectid." ".$select_value_in);
-    				$selected = $select_value_out;
-    			}
+				if ($select_in == 1) {
+					$select_value_in = $obj->code;
+				}
+				if ($select_out == 1) {
+					$select_value_out = $obj->code;
+				}
+				// Remember guy's we store in database llx_accounting_bookkeeping the code of accounting_journal and not the rowid
+				if ($selectid != '' && $selectid == $select_value_in) {
+					//var_dump("Found ".$selectid." ".$select_value_in);
+					$selected = $select_value_out;
+				}
 
 				$options[$select_value_out] = $label;
 			}
@@ -136,83 +136,83 @@ class FormAccounting extends Form
 		return $out;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *	Return list of accounting category.
-     * 	Use mysoc->country_id or mysoc->country_code so they must be defined.
-     *
-     *	@param	string	$selected       Preselected type
-     *	@param  string	$htmlname       Name of field in form
-     * 	@param	int		$useempty		Set to 1 if we want an empty value
-     * 	@param	int		$maxlen			Max length of text in combo box
-     * 	@param	int		$help			Add or not the admin help picto
-     *  @param  int     $allcountries   All countries
-     * 	@return	void
-     */
-    public function select_accounting_category($selected = '', $htmlname = 'account_category', $useempty = 0, $maxlen = 0, $help = 1, $allcountries = 0)
-    {
-        // phpcs:enable
-        global $db, $langs, $user, $mysoc;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *	Return list of accounting category.
+	 * 	Use mysoc->country_id or mysoc->country_code so they must be defined.
+	 *
+	 *	@param	string	$selected       Preselected type
+	 *	@param  string	$htmlname       Name of field in form
+	 * 	@param	int		$useempty		Set to 1 if we want an empty value
+	 * 	@param	int		$maxlen			Max length of text in combo box
+	 * 	@param	int		$help			Add or not the admin help picto
+	 *  @param  int     $allcountries   All countries
+	 * 	@return	void
+	 */
+	public function select_accounting_category($selected = '', $htmlname = 'account_category', $useempty = 0, $maxlen = 0, $help = 1, $allcountries = 0)
+	{
+		// phpcs:enable
+		global $db, $langs, $user, $mysoc;
 
-        if (empty($mysoc->country_id) && empty($mysoc->country_code) && empty($allcountries))
-        {
-            dol_print_error('', 'Call to select_accounting_account with mysoc country not yet defined');
-            exit;
-        }
+		if (empty($mysoc->country_id) && empty($mysoc->country_code) && empty($allcountries))
+		{
+			dol_print_error('', 'Call to select_accounting_account with mysoc country not yet defined');
+			exit;
+		}
 
-        if (!empty($mysoc->country_id))
-        {
-            $sql = "SELECT c.rowid, c.label as type, c.range_account";
-            $sql .= " FROM ".MAIN_DB_PREFIX."c_accounting_category as c";
-            $sql .= " WHERE c.active = 1";
+		if (!empty($mysoc->country_id))
+		{
+			$sql = "SELECT c.rowid, c.label as type, c.range_account";
+			$sql .= " FROM ".MAIN_DB_PREFIX."c_accounting_category as c";
+			$sql .= " WHERE c.active = 1";
 			$sql .= " AND c.category_type = 0";
-            if (empty($allcountries)) $sql .= " AND c.fk_country = ".$mysoc->country_id;
-            $sql .= " ORDER BY c.label ASC";
-        } else {
-            $sql = "SELECT c.rowid, c.label as type, c.range_account";
-            $sql .= " FROM ".MAIN_DB_PREFIX."c_accounting_category as c, ".MAIN_DB_PREFIX."c_country as co";
-            $sql .= " WHERE c.active = 1";
+			if (empty($allcountries)) $sql .= " AND c.fk_country = ".$mysoc->country_id;
+			$sql .= " ORDER BY c.label ASC";
+		} else {
+			$sql = "SELECT c.rowid, c.label as type, c.range_account";
+			$sql .= " FROM ".MAIN_DB_PREFIX."c_accounting_category as c, ".MAIN_DB_PREFIX."c_country as co";
+			$sql .= " WHERE c.active = 1";
 			$sql .= " AND c.category_type = 0";
 			$sql .= " AND c.fk_country = co.rowid";
-            if (empty($allcountries)) $sql .= " AND co.code = '".$this->db->escape($mysoc->country_code)."'";
-            $sql .= " ORDER BY c.label ASC";
-        }
+			if (empty($allcountries)) $sql .= " AND co.code = '".$this->db->escape($mysoc->country_code)."'";
+			$sql .= " ORDER BY c.label ASC";
+		}
 
-        dol_syslog(get_class($this).'::'.__METHOD__, LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-        	$num = $this->db->num_rows($resql);
-            if ($num)
-            {
-                $out = '<select class="flat minwidth200" id="'.$htmlname.'" name="'.$htmlname.'">';
-                $i = 0;
+		dol_syslog(get_class($this).'::'.__METHOD__, LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$num = $this->db->num_rows($resql);
+			if ($num)
+			{
+				$out = '<select class="flat minwidth200" id="'.$htmlname.'" name="'.$htmlname.'">';
+				$i = 0;
 
-                if ($useempty) $out .= '<option value="0">&nbsp;</option>';
-                while ($i < $num)
-                {
-                	$obj = $this->db->fetch_object($resql);
-                    $out .= '<option value="'.$obj->rowid.'"';
-                    if ($obj->rowid == $selected) $out .= ' selected';
-                    $out .= '>'.($maxlen ? dol_trunc($obj->type, $maxlen) : $obj->type);
+				if ($useempty) $out .= '<option value="0">&nbsp;</option>';
+				while ($i < $num)
+				{
+					$obj = $this->db->fetch_object($resql);
+					$out .= '<option value="'.$obj->rowid.'"';
+					if ($obj->rowid == $selected) $out .= ' selected';
+					$out .= '>'.($maxlen ? dol_trunc($obj->type, $maxlen) : $obj->type);
 					$out .= ' ('.$obj->range_account.')';
-                    $i++;
-                }
-                $out .= '</select>';
-                //if ($user->admin && $help) $out .= info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
-            } else {
-                $out .= $langs->trans("ErrorNoAccountingCategoryForThisCountry", $mysoc->country_code);
-            }
-        } else {
-        	dol_print_error($this->db);
-        }
+					$i++;
+				}
+				$out .= '</select>';
+				//if ($user->admin && $help) $out .= info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+			} else {
+				$out .= $langs->trans("ErrorNoAccountingCategoryForThisCountry", $mysoc->country_code);
+			}
+		} else {
+			dol_print_error($this->db);
+		}
 
-        $out .= ajax_combobox($htmlname, array());
+		$out .= ajax_combobox($htmlname, array());
 
-        print $out;
-    }
+		print $out;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Return select filter with date of transaction
 	 *
@@ -220,13 +220,13 @@ class FormAccounting extends Form
 	 * @param string $selectedkey      Value
 	 * @return string                  HTML edit field
 	 */
-    public function select_bookkeeping_importkey($htmlname = 'importkey', $selectedkey = '')
-    {
-        // phpcs:enable
+	public function select_bookkeeping_importkey($htmlname = 'importkey', $selectedkey = '')
+	{
+		// phpcs:enable
 		$options = array();
 
 		$sql = 'SELECT DISTINCT import_key from '.MAIN_DB_PREFIX.'accounting_bookkeeping';
-	    $sql .= " WHERE entity IN (".getEntity('accountancy').")";
+		$sql .= " WHERE entity IN (".getEntity('accountancy').")";
 		$sql .= ' ORDER BY import_key DESC';
 
 		dol_syslog(get_class($this)."::select_bookkeeping_importkey", LOG_DEBUG);
@@ -245,7 +245,7 @@ class FormAccounting extends Form
 		return Form::selectarray($htmlname, $options, $selectedkey);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Return list of accounts with label by chart of accounts
 	 *
@@ -261,47 +261,47 @@ class FormAccounting extends Form
 	 */
 	public function select_account($selectid, $htmlname = 'account', $showempty = 0, $event = array(), $select_in = 0, $select_out = 0, $morecss = 'maxwidth300 maxwidthonsmartphone', $usecache = '')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $langs;
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
 
 		$out = '';
 
-    	$options = array();
+		$options = array();
 
-    	if ($showempty == 2)
-    	{
-    		$options['0'] = '--- '.$langs->trans("None").' ---';
-    	}
+		if ($showempty == 2)
+		{
+			$options['0'] = '--- '.$langs->trans("None").' ---';
+		}
 
 		if ($usecache && !empty($this->options_cache[$usecache]))
 		{
-		    $options = $options + $this->options_cache[$usecache]; // We use + instead of array_merge because we don't want to reindex key from 0
-		    $selected = $selectid;
+			$options = $options + $this->options_cache[$usecache]; // We use + instead of array_merge because we don't want to reindex key from 0
+			$selected = $selectid;
 		} else {
-    		$trunclength = empty($conf->global->ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT) ? 50 : $conf->global->ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT;
+			$trunclength = empty($conf->global->ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT) ? 50 : $conf->global->ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT;
 
-    		$sql = "SELECT DISTINCT aa.account_number, aa.label, aa.labelshort, aa.rowid, aa.fk_pcg_version";
-    		$sql .= " FROM ".MAIN_DB_PREFIX."accounting_account as aa";
-    		$sql .= " INNER JOIN ".MAIN_DB_PREFIX."accounting_system as asy ON aa.fk_pcg_version = asy.pcg_version";
-    		$sql .= " AND asy.rowid = ".$conf->global->CHARTOFACCOUNTS;
-    		$sql .= " AND aa.active = 1";
-    		$sql .= " AND aa.entity=".$conf->entity;
-    		$sql .= " ORDER BY aa.account_number";
+			$sql = "SELECT DISTINCT aa.account_number, aa.label, aa.labelshort, aa.rowid, aa.fk_pcg_version";
+			$sql .= " FROM ".MAIN_DB_PREFIX."accounting_account as aa";
+			$sql .= " INNER JOIN ".MAIN_DB_PREFIX."accounting_system as asy ON aa.fk_pcg_version = asy.pcg_version";
+			$sql .= " AND asy.rowid = ".$conf->global->CHARTOFACCOUNTS;
+			$sql .= " AND aa.active = 1";
+			$sql .= " AND aa.entity=".$conf->entity;
+			$sql .= " ORDER BY aa.account_number";
 
-    		dol_syslog(get_class($this)."::select_account", LOG_DEBUG);
-    		$resql = $this->db->query($sql);
+			dol_syslog(get_class($this)."::select_account", LOG_DEBUG);
+			$resql = $this->db->query($sql);
 
-    		if (!$resql) {
-    			$this->error = "Error ".$this->db->lasterror();
-    			dol_syslog(get_class($this)."::select_account ".$this->error, LOG_ERR);
-    			return -1;
-    		}
+			if (!$resql) {
+				$this->error = "Error ".$this->db->lasterror();
+				dol_syslog(get_class($this)."::select_account ".$this->error, LOG_ERR);
+				return -1;
+			}
 
-    		$selected = $selectid; // selectid can be -1, 0, 123
-    		while ($obj = $this->db->fetch_object($resql))
-    		{
+			$selected = $selectid; // selectid can be -1, 0, 123
+			while ($obj = $this->db->fetch_object($resql))
+			{
 				if (empty($obj->labelshort))
 				{
 					$labeltoshow = $obj->label;
@@ -312,32 +312,32 @@ class FormAccounting extends Form
 				$label = length_accountg($obj->account_number).' - '.$labeltoshow;
 				$label = dol_trunc($label, $trunclength);
 
-    			$select_value_in = $obj->rowid;
-    			$select_value_out = $obj->rowid;
+				$select_value_in = $obj->rowid;
+				$select_value_out = $obj->rowid;
 
-    			// Try to guess if we have found default value
-    			if ($select_in == 1) {
-    				$select_value_in = $obj->account_number;
-    			}
-    			if ($select_out == 1) {
-    				$select_value_out = $obj->account_number;
-    			}
-    			// Remember guy's we store in database llx_facturedet the rowid of accounting_account and not the account_number
-    			// Because same account_number can be share between different accounting_system and do have the same meaning
-    			if ($selectid != '' && $selectid == $select_value_in) {
-    			    //var_dump("Found ".$selectid." ".$select_value_in);
-    				$selected = $select_value_out;
-    			}
+				// Try to guess if we have found default value
+				if ($select_in == 1) {
+					$select_value_in = $obj->account_number;
+				}
+				if ($select_out == 1) {
+					$select_value_out = $obj->account_number;
+				}
+				// Remember guy's we store in database llx_facturedet the rowid of accounting_account and not the account_number
+				// Because same account_number can be share between different accounting_system and do have the same meaning
+				if ($selectid != '' && $selectid == $select_value_in) {
+					//var_dump("Found ".$selectid." ".$select_value_in);
+					$selected = $select_value_out;
+				}
 
-    			$options[$select_value_out] = $label;
-    		}
-    		$this->db->free($resql);
+				$options[$select_value_out] = $label;
+			}
+			$this->db->free($resql);
 
-    		if ($usecache)
-    		{
-                $this->options_cache[$usecache] = $options;
-                unset($this->options_cache[$usecache]['0']);
-    		}
+			if ($usecache)
+			{
+				$this->options_cache[$usecache] = $options;
+				unset($this->options_cache[$usecache]['0']);
+			}
 		}
 
 		$out .= Form::selectarray($htmlname, $options, $selected, ($showempty > 0 ? 1 : 0), 0, 0, '', 0, 0, 0, '', $morecss, 1);
@@ -345,7 +345,7 @@ class FormAccounting extends Form
 		return $out;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Return list of auxilary thirdparty accounts
 	 *
@@ -355,16 +355,16 @@ class FormAccounting extends Form
 	 * @param string   $morecss        More css
 	 * @return string                  String with HTML select
 	 */
-    public function select_auxaccount($selectid, $htmlname = 'account_num_aux', $showempty = 0, $morecss = 'maxwidth200')
-    {
-        // phpcs:enable
+	public function select_auxaccount($selectid, $htmlname = 'account_num_aux', $showempty = 0, $morecss = 'maxwidth200')
+	{
+		// phpcs:enable
 
 		$aux_account = array();
 
 		// Auxiliary customer account
 		$sql = "SELECT DISTINCT code_compta, nom ";
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe";
-	    $sql .= " WHERE entity IN (".getEntity('societe').")";
+		$sql .= " WHERE entity IN (".getEntity('societe').")";
 		$sql .= " ORDER BY code_compta";
 
 		dol_syslog(get_class($this)."::select_auxaccount", LOG_DEBUG);
@@ -402,25 +402,25 @@ class FormAccounting extends Form
 		}
 		$this->db->free($resql);
 
-        // Auxiliary user account
-        $sql = "SELECT DISTINCT accountancy_code, lastname, firstname ";
-        $sql .= " FROM ".MAIN_DB_PREFIX."user";
-        $sql .= " WHERE entity IN (".getEntity('user').")";
-        $sql .= " ORDER BY accountancy_code";
-        dol_syslog(get_class($this)."::select_auxaccount", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if ($resql) {
-            while ($obj = $this->db->fetch_object($resql)) {
-                if (!empty($obj->accountancy_code)) {
-                    $aux_account[$obj->accountancy_code] = $obj->accountancy_code.' ('.dolGetFirstLastname($obj->firstname, $obj->lastname).')';
-                }
-            }
-        } else {
-            $this->error = "Error ".$this->db->lasterror();
-            dol_syslog(get_class($this)."::select_auxaccount ".$this->error, LOG_ERR);
-            return -1;
-        }
-        $this->db->free($resql);
+		// Auxiliary user account
+		$sql = "SELECT DISTINCT accountancy_code, lastname, firstname ";
+		$sql .= " FROM ".MAIN_DB_PREFIX."user";
+		$sql .= " WHERE entity IN (".getEntity('user').")";
+		$sql .= " ORDER BY accountancy_code";
+		dol_syslog(get_class($this)."::select_auxaccount", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			while ($obj = $this->db->fetch_object($resql)) {
+				if (!empty($obj->accountancy_code)) {
+					$aux_account[$obj->accountancy_code] = $obj->accountancy_code.' ('.dolGetFirstLastname($obj->firstname, $obj->lastname).')';
+				}
+			}
+		} else {
+			$this->error = "Error ".$this->db->lasterror();
+			dol_syslog(get_class($this)."::select_auxaccount ".$this->error, LOG_ERR);
+			return -1;
+		}
+		$this->db->free($resql);
 
 		// Build select
 		$out .= Form::selectarray($htmlname, $aux_account, $selectid, $showempty, 0, 0, '', 0, 0, 0, '', $morecss, 1);
@@ -428,7 +428,7 @@ class FormAccounting extends Form
 		return $out;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Return HTML combo list of years existing into book keepping
 	 *
@@ -440,14 +440,14 @@ class FormAccounting extends Form
 	 */
 	public function selectyear_accountancy_bookkepping($selected = '', $htmlname = 'yearid', $useempty = 0, $output_format = 'html')
 	{
-        // phpcs:enable
-	    global $conf;
+		// phpcs:enable
+		global $conf;
 
 		$out_array = array();
 
 		$sql = "SELECT DISTINCT date_format(doc_date, '%Y') as dtyear";
 		$sql .= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping";
-	    $sql .= " WHERE entity IN (".getEntity('accountancy').")";
+		$sql .= " WHERE entity IN (".getEntity('accountancy').")";
 		$sql .= " ORDER BY date_format(doc_date, '%Y')";
 		dol_syslog(__METHOD__, LOG_DEBUG);
 		$resql = $this->db->query($sql);
diff --git a/htdocs/core/class/html.formadmin.class.php b/htdocs/core/class/html.formadmin.class.php
index b53d73bc757..34749325822 100644
--- a/htdocs/core/class/html.formadmin.class.php
+++ b/htdocs/core/class/html.formadmin.class.php
@@ -29,40 +29,40 @@
  */
 class FormAdmin
 {
-    public $db;
-    public $error;
+	public $db;
+	public $error;
 
 
 	/**
 	 *  Constructor
-     *
-     *  @param      DoliDB      $db      Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-    }
+	 *
+	 *  @param      DoliDB      $db      Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Return html select list with available languages (key='en_US', value='United States' for example)
-     *
-     *  @param      string		$selected       Language pre-selected
-     *  @param      string		$htmlname       Name of HTML select
-     *  @param      int			$showauto       Show 'auto' choice
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Return html select list with available languages (key='en_US', value='United States' for example)
+	 *
+	 *  @param      string		$selected       Language pre-selected
+	 *  @param      string		$htmlname       Name of HTML select
+	 *  @param      int			$showauto       Show 'auto' choice
 	 *  @param      array		$filter         Array of keys to exclude in list (opposite of $onlykeys)
 	 *  @param		string		$showempty		'1'=Add empty value or string to show
 	 *  @param      int			$showwarning    Show a warning if language is not complete
 	 *  @param		int			$disabled		Disable edit of select
 	 *  @param		string		$morecss		Add more css styles
 	 *  @param      int         $showcode       1=Add language code into label at begining, 2=Add language code into label at end
-     *  @param		int			$forcecombo		Force to use combo box (so no ajax beautify effect)
-     *  @param		int			$multiselect	Make the combo a multiselect
-     *  @param		array		$onlykeys		Show only the following keys (opposite of $filter). Example array('fr', 'es', ...)
-     *  @param		int			$mainlangonly	1=Show only main languages ('fr_FR' no' fr_BE', 'es_ES' not 'es_MX', ...)
-     *  @return		string						Return HTML select string with list of languages
-     */
-    public function select_language($selected = '', $htmlname = 'lang_id', $showauto = 0, $filter = null, $showempty = '', $showwarning = 0, $disabled = 0, $morecss = '', $showcode = 0, $forcecombo = 0, $multiselect = 0, $onlykeys = null, $mainlangonly = 0)
+	 *  @param		int			$forcecombo		Force to use combo box (so no ajax beautify effect)
+	 *  @param		int			$multiselect	Make the combo a multiselect
+	 *  @param		array		$onlykeys		Show only the following keys (opposite of $filter). Example array('fr', 'es', ...)
+	 *  @param		int			$mainlangonly	1=Show only main languages ('fr_FR' no' fr_BE', 'es_ES' not 'es_MX', ...)
+	 *  @return		string						Return HTML select string with list of languages
+	 */
+	public function select_language($selected = '', $htmlname = 'lang_id', $showauto = 0, $filter = null, $showempty = '', $showwarning = 0, $disabled = 0, $morecss = '', $showcode = 0, $forcecombo = 0, $multiselect = 0, $onlykeys = null, $mainlangonly = 0)
 	{
 		// phpcs:enable
 		global $conf, $langs;
@@ -130,73 +130,73 @@ class FormAdmin
 		return $out;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *    Return list of available menus (eldy_backoffice, ...)
-     *
-     *    @param	string		$selected        Preselected menu value
-     *    @param    string		$htmlname        Name of html select
-     *    @param    array		$dirmenuarray    Array of directories to scan
-     *    @param    string		$moreattrib      More attributes on html select tag
-     *    @return	integer|null
-     */
-    public function select_menu($selected, $htmlname, $dirmenuarray, $moreattrib = '')
-    {
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *    Return list of available menus (eldy_backoffice, ...)
+	 *
+	 *    @param	string		$selected        Preselected menu value
+	 *    @param    string		$htmlname        Name of html select
+	 *    @param    array		$dirmenuarray    Array of directories to scan
+	 *    @param    string		$moreattrib      More attributes on html select tag
+	 *    @return	integer|null
+	 */
+	public function select_menu($selected, $htmlname, $dirmenuarray, $moreattrib = '')
+	{
 		// phpcs:enable
-        global $langs, $conf;
+		global $langs, $conf;
 
-        // Clean parameters
+		// Clean parameters
 
 
-        // Check parameters
-        if (!is_array($dirmenuarray)) return -1;
+		// Check parameters
+		if (!is_array($dirmenuarray)) return -1;
 
 		$menuarray = array();
-        foreach ($conf->file->dol_document_root as $dirroot)
-        {
-            foreach ($dirmenuarray as $dirtoscan)
-            {
-                $dir = $dirroot.$dirtoscan;
-                //print $dir.'<br>';
-                if (is_dir($dir))
-                {
-    	            $handle = opendir($dir);
-    	            if (is_resource($handle))
-    	            {
-    	                while (($file = readdir($handle)) !== false)
-    	                {
-    	                    if (is_file($dir."/".$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && substr($file, 0, 5) != 'index')
-    	                    {
-    	                        if (preg_match('/lib\.php$/i', $file)) continue; // We exclude library files
-    	                        if (preg_match('/eldy_(backoffice|frontoffice)\.php$/i', $file)) continue; // We exclude all menu manager files
-    	                        if (preg_match('/auguria_(backoffice|frontoffice)\.php$/i', $file)) continue; // We exclude all menu manager files
-    	                        if (preg_match('/smartphone_(backoffice|frontoffice)\.php$/i', $file)) continue; // We exclude all menu manager files
+		foreach ($conf->file->dol_document_root as $dirroot)
+		{
+			foreach ($dirmenuarray as $dirtoscan)
+			{
+				$dir = $dirroot.$dirtoscan;
+				//print $dir.'<br>';
+				if (is_dir($dir))
+				{
+					$handle = opendir($dir);
+					if (is_resource($handle))
+					{
+						while (($file = readdir($handle)) !== false)
+						{
+							if (is_file($dir."/".$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && substr($file, 0, 5) != 'index')
+							{
+								if (preg_match('/lib\.php$/i', $file)) continue; // We exclude library files
+								if (preg_match('/eldy_(backoffice|frontoffice)\.php$/i', $file)) continue; // We exclude all menu manager files
+								if (preg_match('/auguria_(backoffice|frontoffice)\.php$/i', $file)) continue; // We exclude all menu manager files
+								if (preg_match('/smartphone_(backoffice|frontoffice)\.php$/i', $file)) continue; // We exclude all menu manager files
 
-    	                        $filelib = preg_replace('/\.php$/i', '', $file);
-    	        				$prefix = '';
-    	        				// 0=Recommanded, 1=Experimental, 2=Developpement, 3=Other
-    	        				if (preg_match('/^eldy/i', $file)) $prefix = '0';
-                                elseif (preg_match('/^smartphone/i', $file)) $prefix = '2';
-    	        				else $prefix = '3';
+								$filelib = preg_replace('/\.php$/i', '', $file);
+								$prefix = '';
+								// 0=Recommanded, 1=Experimental, 2=Developpement, 3=Other
+								if (preg_match('/^eldy/i', $file)) $prefix = '0';
+								elseif (preg_match('/^smartphone/i', $file)) $prefix = '2';
+								else $prefix = '3';
 
-    	                        if ($file == $selected)
-    	                        {
-    	        					$menuarray[$prefix.'_'.$file] = '<option value="'.$file.'" selected>'.$filelib.'</option>';
-    	                        } else {
-    	                            $menuarray[$prefix.'_'.$file] = '<option value="'.$file.'">'.$filelib.'</option>';
-    	                        }
-    	                    }
-    	                }
-    	                closedir($handle);
-    	            }
-                }
-            }
-        }
+								if ($file == $selected)
+								{
+									$menuarray[$prefix.'_'.$file] = '<option value="'.$file.'" selected>'.$filelib.'</option>';
+								} else {
+									$menuarray[$prefix.'_'.$file] = '<option value="'.$file.'">'.$filelib.'</option>';
+								}
+							}
+						}
+						closedir($handle);
+					}
+				}
+			}
+		}
 		ksort($menuarray);
 
 		// Output combo list of menus
-        print '<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'"'.($moreattrib ? ' '.$moreattrib : '').'>';
-        $oldprefix = '';
+		print '<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'"'.($moreattrib ? ' '.$moreattrib : '').'>';
+		$oldprefix = '';
 		foreach ($menuarray as $key => $val)
 		{
 			$tab = explode('_', $key);
@@ -208,7 +208,7 @@ class FormAdmin
 				// Affiche titre
 				print '<option value="-1" disabled>';
 				if ($newprefix == '0') print '-- '.$langs->trans("VersionRecommanded").' --';
-                if ($newprefix == '1') print '-- '.$langs->trans("VersionExperimental").' --';
+				if ($newprefix == '1') print '-- '.$langs->trans("VersionExperimental").' --';
 				if ($newprefix == '2') print '-- '.$langs->trans("VersionDevelopment").' --';
 				if ($newprefix == '3') print '-- '.$langs->trans("Other").' --';
 				print '</option>';
@@ -217,69 +217,69 @@ class FormAdmin
 			print $val."\n"; // Show menu entry
 		}
 		print '</select>';
-    }
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Return combo list of available menu families
-     *
-     *  @param	string		$selected        Menu pre-selected
-     *  @param	string		$htmlname        Name of html select
-     *  @param	string[]	$dirmenuarray    Directories to scan
-     *  @return	void
-     */
-    public function select_menu_families($selected, $htmlname, $dirmenuarray)
-    {
-        // phpcs:enable
-        global $langs, $conf;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Return combo list of available menu families
+	 *
+	 *  @param	string		$selected        Menu pre-selected
+	 *  @param	string		$htmlname        Name of html select
+	 *  @param	string[]	$dirmenuarray    Directories to scan
+	 *  @return	void
+	 */
+	public function select_menu_families($selected, $htmlname, $dirmenuarray)
+	{
+		// phpcs:enable
+		global $langs, $conf;
 
-        //$expdevmenu=array('smartphone_backoffice.php','smartphone_frontoffice.php');  // Menu to disable if $conf->global->MAIN_FEATURES_LEVEL is not set
-        $expdevmenu = array();
+		//$expdevmenu=array('smartphone_backoffice.php','smartphone_frontoffice.php');  // Menu to disable if $conf->global->MAIN_FEATURES_LEVEL is not set
+		$expdevmenu = array();
 
 		$menuarray = array();
 
 		foreach ($dirmenuarray as $dirmenu)
 		{
-            foreach ($conf->file->dol_document_root as $dirroot)
-            {
-                $dir = $dirroot.$dirmenu;
-                if (is_dir($dir))
-                {
-	                $handle = opendir($dir);
-	                if (is_resource($handle))
-	                {
-	        			while (($file = readdir($handle)) !== false)
-	        			{
-	        				if (is_file($dir."/".$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS')
-	        				{
-	        					$filelib = preg_replace('/(_backoffice|_frontoffice)?\.php$/i', '', $file);
-	        					if (preg_match('/^index/i', $filelib)) continue;
-	        					if (preg_match('/^default/i', $filelib)) continue;
-	        					if (preg_match('/^empty/i', $filelib)) continue;
-	        					if (preg_match('/\.lib/i', $filelib)) continue;
-	        					if (empty($conf->global->MAIN_FEATURES_LEVEL) && in_array($file, $expdevmenu)) continue;
+			foreach ($conf->file->dol_document_root as $dirroot)
+			{
+				$dir = $dirroot.$dirmenu;
+				if (is_dir($dir))
+				{
+					$handle = opendir($dir);
+					if (is_resource($handle))
+					{
+						while (($file = readdir($handle)) !== false)
+						{
+							if (is_file($dir."/".$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS')
+							{
+								$filelib = preg_replace('/(_backoffice|_frontoffice)?\.php$/i', '', $file);
+								if (preg_match('/^index/i', $filelib)) continue;
+								if (preg_match('/^default/i', $filelib)) continue;
+								if (preg_match('/^empty/i', $filelib)) continue;
+								if (preg_match('/\.lib/i', $filelib)) continue;
+								if (empty($conf->global->MAIN_FEATURES_LEVEL) && in_array($file, $expdevmenu)) continue;
 
-	        					$menuarray[$filelib] = 1;
-	        				}
-	        				$menuarray['all'] = 1;
-	        			}
-	        			closedir($handle);
-	                }
-                }
-            }
+								$menuarray[$filelib] = 1;
+							}
+							$menuarray['all'] = 1;
+						}
+						closedir($handle);
+					}
+				}
+			}
 		}
 
 		ksort($menuarray);
 
 		// Affichage liste deroulante des menus
-        print '<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'">';
-        $oldprefix = '';
+		print '<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'">';
+		$oldprefix = '';
 		foreach ($menuarray as $key => $val)
 		{
 			$tab = explode('_', $key);
 			$newprefix = $tab[0];
 			print '<option value="'.$key.'"';
-            if ($key == $selected)
+			if ($key == $selected)
 			{
 				print '	selected';
 			}
@@ -289,26 +289,26 @@ class FormAdmin
 			print '</option>'."\n";
 		}
 		print '</select>';
-    }
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Return a HTML select list of timezones
-     *
-     *  @param	string		$selected        Menu pre-selectionnee
-     *  @param  string		$htmlname        Nom de la zone select
-     *  @return	void
-     */
-    public function select_timezone($selected, $htmlname)
-    {
-        // phpcs:enable
-        global $langs, $conf;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Return a HTML select list of timezones
+	 *
+	 *  @param	string		$selected        Menu pre-selectionnee
+	 *  @param  string		$htmlname        Nom de la zone select
+	 *  @return	void
+	 */
+	public function select_timezone($selected, $htmlname)
+	{
+		// phpcs:enable
+		global $langs, $conf;
 
-        print '<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'">';
-        print '<option value="-1">&nbsp;</option>';
+		print '<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'">';
+		print '<option value="-1">&nbsp;</option>';
 
-        $arraytz = array(
+		$arraytz = array(
 			"Pacific/Midway"=>"GMT-11:00",
 			"Pacific/Fakaofo"=>"GMT-10:00",
 			"America/Anchorage"=>"GMT-09:00",
@@ -335,17 +335,17 @@ class FormAdmin
 			"Pacific/Auckland"=>"GMT+12:00",
 			"Pacific/Enderbury"=>"GMT+13:00"
 		);
-        foreach ($arraytz as $lib => $gmt) {
-            print '<option value="'.$lib.'"';
-            if ($selected == $lib || $selected == $gmt) print ' selected';
-            print '>'.$gmt.'</option>'."\n";
-        }
-        print '</select>';
-    }
+		foreach ($arraytz as $lib => $gmt) {
+			print '<option value="'.$lib.'"';
+			if ($selected == $lib || $selected == $gmt) print ' selected';
+			print '>'.$gmt.'</option>'."\n";
+		}
+		print '</select>';
+	}
 
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return html select list with available languages (key='en_US', value='United States' for example)
 	 *
@@ -365,23 +365,23 @@ class FormAdmin
 		$sql = "SELECT code, label, width, height, unit";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_paper_format";
 		$sql .= " WHERE active=1";
-        if ($filter) $sql .= " AND code LIKE '%".$this->db->escape($filter)."%'";
+		if ($filter) $sql .= " AND code LIKE '%".$this->db->escape($filter)."%'";
 
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            $num = $this->db->num_rows($resql);
-            $i = 0;
-            while ($i < $num)
-            {
-                $obj = $this->db->fetch_object($resql);
-                $unitKey = $langs->trans('SizeUnit'.$obj->unit);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$num = $this->db->num_rows($resql);
+			$i = 0;
+			while ($i < $num)
+			{
+				$obj = $this->db->fetch_object($resql);
+				$unitKey = $langs->trans('SizeUnit'.$obj->unit);
 
-                $paperformat[$obj->code] = $langs->trans('PaperFormat'.strtoupper($obj->code)).' - '.round($obj->width).'x'.round($obj->height).' '.($unitKey == 'SizeUnit'.$obj->unit ? $obj->unit : $unitKey);
+				$paperformat[$obj->code] = $langs->trans('PaperFormat'.strtoupper($obj->code)).' - '.round($obj->width).'x'.round($obj->height).' '.($unitKey == 'SizeUnit'.$obj->unit ? $obj->unit : $unitKey);
 
-                $i++;
-            }
-        } else {
+				$i++;
+			}
+		} else {
 			dol_print_error($this->db);
 			return '';
 		}
@@ -396,7 +396,7 @@ class FormAdmin
 		}
 		foreach ($paperformat as $key => $value)
 		{
-            if ($selected == $key)
+			if ($selected == $key)
 			{
 				$out .= '<option value="'.$key.'" selected>'.$value.'</option>';
 			} else {
diff --git a/htdocs/core/class/html.formbank.class.php b/htdocs/core/class/html.formbank.class.php
index a359bd194f7..9d50a0bb60b 100644
--- a/htdocs/core/class/html.formbank.class.php
+++ b/htdocs/core/class/html.formbank.class.php
@@ -31,40 +31,40 @@ include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
  */
 class FormBank
 {
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    /**
+	/**
 	 * @var string Error code (or message)
 	 */
 	public $error = '';
 
 
-    /**
-     * Constructor
-     *
-     * @param		DoliDB		$db      Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-    }
+	/**
+	 * Constructor
+	 *
+	 * @param		DoliDB		$db      Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
 
-    /**
-     *  Retourne la liste des types de comptes financiers
-     *
-     *  @param	integer	$selected        Type pre-selectionne
-     *  @param  string	$htmlname        Nom champ formulaire
-     *  @return	void
-     */
-    public function selectTypeOfBankAccount($selected = Account::TYPE_CURRENT, $htmlname = 'type')
-    {
-        $account = new Account($this->db);
+	/**
+	 *  Retourne la liste des types de comptes financiers
+	 *
+	 *  @param	integer	$selected        Type pre-selectionne
+	 *  @param  string	$htmlname        Nom champ formulaire
+	 *  @return	void
+	 */
+	public function selectTypeOfBankAccount($selected = Account::TYPE_CURRENT, $htmlname = 'type')
+	{
+		$account = new Account($this->db);
 
-        print Form::selectarray($htmlname, $account->type_lib, $selected);
-    }
+		print Form::selectarray($htmlname, $account->type_lib, $selected);
+	}
 
 	/**
 	 * Returns the name of the Iban label. India uses 'IFSC' and the rest of the world 'IBAN' name.
diff --git a/htdocs/core/class/html.formbarcode.class.php b/htdocs/core/class/html.formbarcode.class.php
index 104daf6de0e..52d4c795c85 100644
--- a/htdocs/core/class/html.formbarcode.class.php
+++ b/htdocs/core/class/html.formbarcode.class.php
@@ -29,198 +29,198 @@
  */
 class FormBarCode
 {
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    /**
-     * @var string Error code (or message)
-     */
-    public $error = '';
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error = '';
 
 
-    /**
-     *  Constructor
-     *
-     *  @param  DoliDB		$db		Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-    }
+	/**
+	 *  Constructor
+	 *
+	 *  @param  DoliDB		$db		Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
 
 
-    /**
-     *	Return HTML select with list of bar code generators
-     *
-     *  @param	int		$selected       Id code pre-selected
-     *  @param 	array	$barcodelist	Array of barcodes generators
-     *  @param  int		$code_id        Id du code barre
-     *  @param  int		$idForm			Id du formulaire
-     * 	@return	string					HTML select string
-     */
-    public function setBarcodeEncoder($selected, $barcodelist, $code_id, $idForm = 'formbarcode')
-    {
-        global $conf, $langs;
+	/**
+	 *	Return HTML select with list of bar code generators
+	 *
+	 *  @param	int		$selected       Id code pre-selected
+	 *  @param 	array	$barcodelist	Array of barcodes generators
+	 *  @param  int		$code_id        Id du code barre
+	 *  @param  int		$idForm			Id du formulaire
+	 * 	@return	string					HTML select string
+	 */
+	public function setBarcodeEncoder($selected, $barcodelist, $code_id, $idForm = 'formbarcode')
+	{
+		global $conf, $langs;
 
-        $disable = '';
+		$disable = '';
 
-        if (!empty($conf->use_javascript_ajax))
-        {
-            print "\n".'<script type="text/javascript" language="javascript">';
-            print 'jQuery(document).ready(function () {
+		if (!empty($conf->use_javascript_ajax))
+		{
+			print "\n".'<script type="text/javascript" language="javascript">';
+			print 'jQuery(document).ready(function () {
                         jQuery("#select'.$idForm.'").change(function() {
                             var formName = document.getElementById("form'.$idForm.'");
                             formName.action.value="setcoder";
                             formName.submit();
                         });
                });';
-            print '</script>'."\n";
-            //onChange="barcode_coder_save(\''.$idForm.'\')
-        }
+			print '</script>'."\n";
+			//onChange="barcode_coder_save(\''.$idForm.'\')
+		}
 
-        // We check if barcode is already selected by default
-        if (((!empty($conf->product->enabled) || !empty($conf->service->enabled)) && $conf->global->PRODUIT_DEFAULT_BARCODE_TYPE == $code_id) ||
-        (!empty($conf->societe->enabled) && $conf->global->GENBARCODE_BARCODETYPE_THIRDPARTY == $code_id))
-        {
-            $disable = 'disabled';
-        }
+		// We check if barcode is already selected by default
+		if (((!empty($conf->product->enabled) || !empty($conf->service->enabled)) && $conf->global->PRODUIT_DEFAULT_BARCODE_TYPE == $code_id) ||
+		(!empty($conf->societe->enabled) && $conf->global->GENBARCODE_BARCODETYPE_THIRDPARTY == $code_id))
+		{
+			$disable = 'disabled';
+		}
 
-        if (!empty($conf->use_javascript_ajax))
-        {
-            $select_encoder = '<form action="'.DOL_URL_ROOT.'/admin/barcode.php" method="POST" id="form'.$idForm.'">';
-            $select_encoder .= '<input type="hidden" name="token" value="'.newToken().'">';
-            $select_encoder .= '<input type="hidden" name="action" value="update">';
-            $select_encoder .= '<input type="hidden" name="code_id" value="'.$code_id.'">';
-        }
+		if (!empty($conf->use_javascript_ajax))
+		{
+			$select_encoder = '<form action="'.DOL_URL_ROOT.'/admin/barcode.php" method="POST" id="form'.$idForm.'">';
+			$select_encoder .= '<input type="hidden" name="token" value="'.newToken().'">';
+			$select_encoder .= '<input type="hidden" name="action" value="update">';
+			$select_encoder .= '<input type="hidden" name="code_id" value="'.$code_id.'">';
+		}
 
-        $selectname = (!empty($conf->use_javascript_ajax) ? 'coder' : 'coder'.$code_id);
-        $select_encoder .= '<select id="select'.$idForm.'" class="flat" name="'.$selectname.'">';
-        $select_encoder .= '<option value="0"'.($selected == 0 ? ' selected' : '').' '.$disable.'>'.$langs->trans('Disable').'</option>';
-        $select_encoder .= '<option value="-1" disabled>--------------------</option>';
-        foreach ($barcodelist as $key => $value)
-        {
-            $select_encoder .= '<option value="'.$key.'"'.($selected == $key ? ' selected' : '').'>'.$value.'</option>';
-        }
-        $select_encoder .= '</select>';
+		$selectname = (!empty($conf->use_javascript_ajax) ? 'coder' : 'coder'.$code_id);
+		$select_encoder .= '<select id="select'.$idForm.'" class="flat" name="'.$selectname.'">';
+		$select_encoder .= '<option value="0"'.($selected == 0 ? ' selected' : '').' '.$disable.'>'.$langs->trans('Disable').'</option>';
+		$select_encoder .= '<option value="-1" disabled>--------------------</option>';
+		foreach ($barcodelist as $key => $value)
+		{
+			$select_encoder .= '<option value="'.$key.'"'.($selected == $key ? ' selected' : '').'>'.$value.'</option>';
+		}
+		$select_encoder .= '</select>';
 
-        if (!empty($conf->use_javascript_ajax))
-        {
-            $select_encoder .= '</form>';
-        }
+		if (!empty($conf->use_javascript_ajax))
+		{
+			$select_encoder .= '</form>';
+		}
 
-        return $select_encoder;
-    }
+		return $select_encoder;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Print form to select type of barcode
-     *
-     *  @param  int     $selected          Id code pre-selected
-     *  @param  string  $htmlname          Name of HTML select field
-     *  @param  int     $useempty          Affiche valeur vide dans liste
-     *  @return void
-     *  @deprecated
-     */
-    public function select_barcode_type($selected = '', $htmlname = 'barcodetype_id', $useempty = 0)
-    {
-        // phpcs:enable
-        print $this->selectBarcodeType($selected, $htmlname, $useempty);
-    }
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Print form to select type of barcode
+	 *
+	 *  @param  int     $selected          Id code pre-selected
+	 *  @param  string  $htmlname          Name of HTML select field
+	 *  @param  int     $useempty          Affiche valeur vide dans liste
+	 *  @return void
+	 *  @deprecated
+	 */
+	public function select_barcode_type($selected = '', $htmlname = 'barcodetype_id', $useempty = 0)
+	{
+		// phpcs:enable
+		print $this->selectBarcodeType($selected, $htmlname, $useempty);
+	}
 
-    /**
-     *  Return html form to select type of barcode
-     *
-     *  @param  int     $selected          Id code pre-selected
-     *  @param  string  $htmlname          Name of HTML select field
-     *  @param  int     $useempty          Display empty value in select
-     *  @return string
-     */
-    public function selectBarcodeType($selected = '', $htmlname = 'barcodetype_id', $useempty = 0)
-    {
-        global $langs, $conf;
+	/**
+	 *  Return html form to select type of barcode
+	 *
+	 *  @param  int     $selected          Id code pre-selected
+	 *  @param  string  $htmlname          Name of HTML select field
+	 *  @param  int     $useempty          Display empty value in select
+	 *  @return string
+	 */
+	public function selectBarcodeType($selected = '', $htmlname = 'barcodetype_id', $useempty = 0)
+	{
+		global $langs, $conf;
 
-        $out = '';
+		$out = '';
 
-        $sql = "SELECT rowid, code, libelle";
-        $sql .= " FROM ".MAIN_DB_PREFIX."c_barcode_type";
-        $sql .= " WHERE coder <> '0'";
-        $sql .= " AND entity = ".$conf->entity;
-        $sql .= " ORDER BY code";
+		$sql = "SELECT rowid, code, libelle";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_barcode_type";
+		$sql .= " WHERE coder <> '0'";
+		$sql .= " AND entity = ".$conf->entity;
+		$sql .= " ORDER BY code";
 
-        $result = $this->db->query($sql);
-        if ($result) {
-            $num = $this->db->num_rows($result);
-            $i = 0;
+		$result = $this->db->query($sql);
+		if ($result) {
+			$num = $this->db->num_rows($result);
+			$i = 0;
 
-            if ($useempty && $num > 0) {
-                $out .= '<select class="flat minwidth75imp" name="'.$htmlname.'" id="select_'.$htmlname.'">';
-                $out .= '<option value="0">&nbsp;</option>';
-            } else {
-                $langs->load("errors");
-                $out .= '<select disabled class="flat minwidth75imp" name="'.$htmlname.'" id="select_'.$htmlname.'">';
-                $out .= '<option value="0" selected>'.$langs->trans('ErrorNoActivatedBarcode').'</option>';
-            }
+			if ($useempty && $num > 0) {
+				$out .= '<select class="flat minwidth75imp" name="'.$htmlname.'" id="select_'.$htmlname.'">';
+				$out .= '<option value="0">&nbsp;</option>';
+			} else {
+				$langs->load("errors");
+				$out .= '<select disabled class="flat minwidth75imp" name="'.$htmlname.'" id="select_'.$htmlname.'">';
+				$out .= '<option value="0" selected>'.$langs->trans('ErrorNoActivatedBarcode').'</option>';
+			}
 
-            while ($i < $num) {
-                $obj = $this->db->fetch_object($result);
-                if ($selected == $obj->rowid) {
-                    $out .= '<option value="'.$obj->rowid.'" selected>';
-                } else {
-                    $out .= '<option value="'.$obj->rowid.'">';
-                }
-                $out .= $obj->libelle;
-                $out .= '</option>';
-                $i++;
-            }
-            $out .= "</select>";
-            $out .= ajax_combobox("select_".$htmlname);
-        } else {
-            dol_print_error($this->db);
-        }
-        return $out;
-    }
+			while ($i < $num) {
+				$obj = $this->db->fetch_object($result);
+				if ($selected == $obj->rowid) {
+					$out .= '<option value="'.$obj->rowid.'" selected>';
+				} else {
+					$out .= '<option value="'.$obj->rowid.'">';
+				}
+				$out .= $obj->libelle;
+				$out .= '</option>';
+				$i++;
+			}
+			$out .= "</select>";
+			$out .= ajax_combobox("select_".$htmlname);
+		} else {
+			dol_print_error($this->db);
+		}
+		return $out;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Show form to select type of barcode
-     *
-     *  @param  string		$page        	Page
-     *  @param  int			$selected    	Id condition preselected
-     *  @param  string		$htmlname    	Nom du formulaire select
-     *  @return	void
-     *  @deprecated
-     */
-    public function form_barcode_type($page, $selected = '', $htmlname = 'barcodetype_id')
-    {
-        // phpcs:enable
-        print $this->formBarcodeType($page, $selected, $htmlname);
-    }
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Show form to select type of barcode
+	 *
+	 *  @param  string		$page        	Page
+	 *  @param  int			$selected    	Id condition preselected
+	 *  @param  string		$htmlname    	Nom du formulaire select
+	 *  @return	void
+	 *  @deprecated
+	 */
+	public function form_barcode_type($page, $selected = '', $htmlname = 'barcodetype_id')
+	{
+		// phpcs:enable
+		print $this->formBarcodeType($page, $selected, $htmlname);
+	}
 
-    /**
-     *  Return html form to select type of barcode
-     *
-     *  @param  string      $page           Page
-     *  @param  int         $selected       Id condition preselected
-     *  @param  string      $htmlname       Nom du formulaire select
-     *  @return string
-     */
-    public function formBarcodeType($page, $selected = '', $htmlname = 'barcodetype_id')
-    {
-        global $langs, $conf;
-        $out = '';
-        if ($htmlname != "none") {
-            $out .= '<form method="post" action="'.$page.'">';
-            $out .= '<input type="hidden" name="token" value="'.newToken().'">';
-            $out .= '<input type="hidden" name="action" value="set'.$htmlname.'">';
-            $out .= '<table class="nobordernopadding" cellpadding="0" cellspacing="0">';
-            $out .= '<tr><td>';
-            $out .= $this->selectBarcodeType($selected, $htmlname, 1);
-            $out .= '</td>';
-            $out .= '<td class="left"><input type="submit" class="button" value="'.$langs->trans("Modify").'">';
-            $out .= '</td></tr></table></form>';
-        }
-        return $out;
-    }
+	/**
+	 *  Return html form to select type of barcode
+	 *
+	 *  @param  string      $page           Page
+	 *  @param  int         $selected       Id condition preselected
+	 *  @param  string      $htmlname       Nom du formulaire select
+	 *  @return string
+	 */
+	public function formBarcodeType($page, $selected = '', $htmlname = 'barcodetype_id')
+	{
+		global $langs, $conf;
+		$out = '';
+		if ($htmlname != "none") {
+			$out .= '<form method="post" action="'.$page.'">';
+			$out .= '<input type="hidden" name="token" value="'.newToken().'">';
+			$out .= '<input type="hidden" name="action" value="set'.$htmlname.'">';
+			$out .= '<table class="nobordernopadding" cellpadding="0" cellspacing="0">';
+			$out .= '<tr><td>';
+			$out .= $this->selectBarcodeType($selected, $htmlname, 1);
+			$out .= '</td>';
+			$out .= '<td class="left"><input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+			$out .= '</td></tr></table></form>';
+		}
+		return $out;
+	}
 }
diff --git a/htdocs/core/class/html.formcompany.class.php b/htdocs/core/class/html.formcompany.class.php
index f6e412e0958..ee9e8564933 100644
--- a/htdocs/core/class/html.formcompany.class.php
+++ b/htdocs/core/class/html.formcompany.class.php
@@ -186,13 +186,13 @@ class FormCompany extends Form
 	{
 		global $user, $langs;
 
-		print '<form method="post" action="' . $page . '">';
+		print '<form method="post" action="'.$page.'">';
 		print '<input type="hidden" name="action" value="setprospectcontactlevel">';
-		print '<input type="hidden" name="token" value="' . newToken() . '">';
+		print '<input type="hidden" name="token" value="'.newToken().'">';
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
 		$sql = "SELECT code, label";
-		$sql .= " FROM " . MAIN_DB_PREFIX . "c_prospectcontactlevel";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_prospectcontactlevel";
 		$sql .= " WHERE active > 0";
 		$sql .= " ORDER BY sortorder";
 		$resql = $this->db->query($sql);
@@ -220,8 +220,8 @@ class FormCompany extends Form
 			print Form::selectarray($htmlname, $options, $selected);
 		}
 		else dol_print_error($this->db);
-		if (!empty($htmlname) && $user->admin) print ' ' . info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
-		print '<input type="submit" class="button valignmiddle" value="' . $langs->trans("Modify") . '">';
+		if (!empty($htmlname) && $user->admin) print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+		print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
 		print '</form>';
 	}
 
diff --git a/htdocs/core/class/html.formcontract.class.php b/htdocs/core/class/html.formcontract.class.php
index b2e32b8c063..7c91c1a4148 100644
--- a/htdocs/core/class/html.formcontract.class.php
+++ b/htdocs/core/class/html.formcontract.class.php
@@ -27,29 +27,29 @@
  */
 class FormContract
 {
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    /**
+	/**
 	 * @var string Error code (or message)
 	 */
 	public $error = '';
 
 
-    /**
-     * Constructor
-     *
-     * @param		DoliDB		$db      Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-    }
+	/**
+	 * Constructor
+	 *
+	 * @param		DoliDB		$db      Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Show a combo list with contracts qualified for a third party
 	 *
@@ -61,9 +61,9 @@ class FormContract
 	 *	@param	int		$showRef	Show customer and supplier reference on each contract (when found)
 	 *	@return int         		Nbr of project if OK, <0 if KO
 	 */
-    public function select_contract($socid = -1, $selected = '', $htmlname = 'contrattid', $maxlength = 16, $showempty = 1, $showRef = 0)
-    {
-        // phpcs:enable
+	public function select_contract($socid = -1, $selected = '', $htmlname = 'contrattid', $maxlength = 16, $showempty = 1, $showRef = 0)
+	{
+		// phpcs:enable
 		global $db, $user, $conf, $langs;
 
 		$hideunselectables = false;
@@ -78,12 +78,12 @@ class FormContract
 		if ($socid > 0)
 		{
 			// CONTRACT_ALLOW_TO_LINK_FROM_OTHER_COMPANY is 'all' or a list of ids separated by coma.
-		    if (empty($conf->global->CONTRACT_ALLOW_TO_LINK_FROM_OTHER_COMPANY)) {
-		        $sql .= " AND (c.fk_soc=".$socid." OR c.fk_soc IS NULL)";
+			if (empty($conf->global->CONTRACT_ALLOW_TO_LINK_FROM_OTHER_COMPANY)) {
+				$sql .= " AND (c.fk_soc=".$socid." OR c.fk_soc IS NULL)";
 			} elseif ($conf->global->CONTRACT_ALLOW_TO_LINK_FROM_OTHER_COMPANY != 'all') {
-		        $sql .= " AND (c.fk_soc IN (".$socid.", ".$conf->global->CONTRACT_ALLOW_TO_LINK_FROM_OTHER_COMPANY.") ";
+				$sql .= " AND (c.fk_soc IN (".$socid.", ".$conf->global->CONTRACT_ALLOW_TO_LINK_FROM_OTHER_COMPANY.") ";
 				$sql .= " OR c.fk_soc IS NULL)";
-		    }
+			}
 		}
 		if ($socid == 0) $sql .= " AND (c.fk_soc = 0 OR c.fk_soc IS NULL)";
 		$sql .= " ORDER BY c.ref ";
@@ -164,30 +164,30 @@ class FormContract
 			dol_print_error($this->db);
 			return -1;
 		}
-    }
+	}
 
-    /**
-     *  Show a form to select a contract
-     *
-     *  @param  int     $page       Page
-     *  @param  int     $socid      Id third party (-1=all, 0=only contracts not linked to a third party, id=contracts not linked or linked to third party id)
-     *  @param  int     $selected   Id contract preselected
-     *  @param  string  $htmlname   Nom de la zone html
-     *  @param  int     $maxlength	Maximum length of label
-     *  @param  int     $showempty	Show empty line
-     *  @param  int     $showRef    Show customer and supplier reference on each contract (when found)
-     *  @return int                 Nbr of project if OK, <0 if KO
-     */
-    public function formSelectContract($page, $socid = -1, $selected = '', $htmlname = 'contrattid', $maxlength = 16, $showempty = 1, $showRef = 0)
-    {
-        global $langs;
+	/**
+	 *  Show a form to select a contract
+	 *
+	 *  @param  int     $page       Page
+	 *  @param  int     $socid      Id third party (-1=all, 0=only contracts not linked to a third party, id=contracts not linked or linked to third party id)
+	 *  @param  int     $selected   Id contract preselected
+	 *  @param  string  $htmlname   Nom de la zone html
+	 *  @param  int     $maxlength	Maximum length of label
+	 *  @param  int     $showempty	Show empty line
+	 *  @param  int     $showRef    Show customer and supplier reference on each contract (when found)
+	 *  @return int                 Nbr of project if OK, <0 if KO
+	 */
+	public function formSelectContract($page, $socid = -1, $selected = '', $htmlname = 'contrattid', $maxlength = 16, $showempty = 1, $showRef = 0)
+	{
+		global $langs;
 
-        print "\n";
-        print '<form method="post" action="'.$page.'">';
-        print '<input type="hidden" name="action" value="setcontract">';
-        print '<input type="hidden" name="token" value="'.newToken().'">';
-        $this->select_contract($socid, $selected, $htmlname, $maxlength, $showempty, $showRef);
-        print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-        print '</form>';
-    }
+		print "\n";
+		print '<form method="post" action="'.$page.'">';
+		print '<input type="hidden" name="action" value="setcontract">';
+		print '<input type="hidden" name="token" value="'.newToken().'">';
+		$this->select_contract($socid, $selected, $htmlname, $maxlength, $showempty, $showRef);
+		print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+		print '</form>';
+	}
 }
diff --git a/htdocs/core/class/html.formcron.class.php b/htdocs/core/class/html.formcron.class.php
index 2701d126331..b6a9140cf58 100644
--- a/htdocs/core/class/html.formcron.class.php
+++ b/htdocs/core/class/html.formcron.class.php
@@ -28,75 +28,75 @@
  */
 class FormCron extends Form
 {
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    /**
-     * @var string Error code (or message)
-     */
-    public $error = '';
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error = '';
 
-    /**
-     *  Constructor
-     *
-     *  @param      DoliDB      $db      Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-    }
+	/**
+	 *  Constructor
+	 *
+	 *  @param      DoliDB      $db      Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Display On Off selector
-     *
-     *  @param  string      $htmlname       Html control name
-     *  @param  integer     $selected       selected value
-     *  @param  integer     $readonly       Select is read only or not
-     *  @return string                      HTML select field
-     */
-    public function select_typejob($htmlname, $selected = 0, $readonly = 0)
-    {
-        // phpcs:enable
-        global $langs;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Display On Off selector
+	 *
+	 *  @param  string      $htmlname       Html control name
+	 *  @param  integer     $selected       selected value
+	 *  @param  integer     $readonly       Select is read only or not
+	 *  @return string                      HTML select field
+	 */
+	public function select_typejob($htmlname, $selected = 0, $readonly = 0)
+	{
+		// phpcs:enable
+		global $langs;
 
-        $langs->load('cron@cron');
-        $out = '';
-        if (!empty($readonly)) {
-            if ($selected == 'command') {
-                $out = $langs->trans('CronType_command');
-                $out .= '<SELECT name="'.$htmlname.'" id="'.$htmlname.'" style="display:none"/>';
-                $out .= '<OPTION value="command" selected>'.$langs->trans('CronType_command').'</OPTION>';
-                $out .= '</SELECT>';
-            } elseif ($selected == 'method') {
-                $out = $langs->trans('CronType_method');
-                $out .= '<SELECT name="'.$htmlname.'" id="'.$htmlname.'" style="display:none"/>';
-                $out .= '<OPTION value="method" selected>'.$langs->trans('CronType_method').'</OPTION>';
-                $out .= '</SELECT>';
-            }
-        } else {
-            $out = '<SELECT class="flat" name="'.$htmlname.'" id="'.$htmlname.'" />';
+		$langs->load('cron@cron');
+		$out = '';
+		if (!empty($readonly)) {
+			if ($selected == 'command') {
+				$out = $langs->trans('CronType_command');
+				$out .= '<SELECT name="'.$htmlname.'" id="'.$htmlname.'" style="display:none"/>';
+				$out .= '<OPTION value="command" selected>'.$langs->trans('CronType_command').'</OPTION>';
+				$out .= '</SELECT>';
+			} elseif ($selected == 'method') {
+				$out = $langs->trans('CronType_method');
+				$out .= '<SELECT name="'.$htmlname.'" id="'.$htmlname.'" style="display:none"/>';
+				$out .= '<OPTION value="method" selected>'.$langs->trans('CronType_method').'</OPTION>';
+				$out .= '</SELECT>';
+			}
+		} else {
+			$out = '<SELECT class="flat" name="'.$htmlname.'" id="'.$htmlname.'" />';
 
-            if ($selected == 'command') {
-                $selected_attr = ' selected ';
-            } else {
-                $selected_attr = '';
-            }
-            $out .= '<OPTION value="command" '.$selected_attr.'>'.$langs->trans('CronType_command').'</OPTION>';
+			if ($selected == 'command') {
+				$selected_attr = ' selected ';
+			} else {
+				$selected_attr = '';
+			}
+			$out .= '<OPTION value="command" '.$selected_attr.'>'.$langs->trans('CronType_command').'</OPTION>';
 
-            if ($selected == 'method') {
-                $selected_attr = ' selected ';
-            } else {
-                $selected_attr = '';
-            }
-            $out .= '<OPTION value="method" '.$selected_attr.'>'.$langs->trans('CronType_method').'</OPTION>';
+			if ($selected == 'method') {
+				$selected_attr = ' selected ';
+			} else {
+				$selected_attr = '';
+			}
+			$out .= '<OPTION value="method" '.$selected_attr.'>'.$langs->trans('CronType_method').'</OPTION>';
 
-            $out .= '</SELECT>';
-        }
+			$out .= '</SELECT>';
+		}
 
-        return $out;
-    }
+		return $out;
+	}
 }
diff --git a/htdocs/core/class/html.formexpensereport.class.php b/htdocs/core/class/html.formexpensereport.class.php
index 516c6e4b59c..d65f68423b2 100644
--- a/htdocs/core/class/html.formexpensereport.class.php
+++ b/htdocs/core/class/html.formexpensereport.class.php
@@ -27,111 +27,111 @@
  */
 class FormExpenseReport
 {
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    /**
+	/**
 	 * @var string Error code (or message)
 	 */
 	public $error = '';
 
 
-    /**
-     * Constructor
-     *
-     * @param		DoliDB		$db      Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-    }
+	/**
+	 * Constructor
+	 *
+	 * @param		DoliDB		$db      Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
 
 
-    /**
-     *    Retourne la liste deroulante des differents etats d'une note de frais.
-     *    Les valeurs de la liste sont les id de la table c_expensereport_statuts
-     *
-     *    @param    int     $selected       preselect status
-     *    @param    string  $htmlname       Name of HTML select
-     *    @param    int     $useempty       1=Add empty line
-     *    @param    int     $useshortlabel  Use short labels
-     *    @return   string                  HTML select with status
-     */
-    public function selectExpensereportStatus($selected = '', $htmlname = 'fk_statut', $useempty = 1, $useshortlabel = 0)
-    {
-    	global $langs;
+	/**
+	 *    Retourne la liste deroulante des differents etats d'une note de frais.
+	 *    Les valeurs de la liste sont les id de la table c_expensereport_statuts
+	 *
+	 *    @param    int     $selected       preselect status
+	 *    @param    string  $htmlname       Name of HTML select
+	 *    @param    int     $useempty       1=Add empty line
+	 *    @param    int     $useshortlabel  Use short labels
+	 *    @return   string                  HTML select with status
+	 */
+	public function selectExpensereportStatus($selected = '', $htmlname = 'fk_statut', $useempty = 1, $useshortlabel = 0)
+	{
+		global $langs;
 
-    	$tmpep = new ExpenseReport($this->db);
+		$tmpep = new ExpenseReport($this->db);
 
-    	print '<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'">';
-    	if ($useempty) print '<option value="-1">&nbsp;</option>';
-    	$arrayoflabels = $tmpep->statuts;
-    	if ($useshortlabel) $arrayoflabels = $tmpep->statuts_short;
-    	foreach ($arrayoflabels as $key => $val)
-    	{
-    		if ($selected != '' && $selected == $key)
-    		{
-    			print '<option value="'.$key.'" selected>';
-    		} else {
-    			print '<option value="'.$key.'">';
-    		}
-    		print $langs->trans($val);
-    		print '</option>';
-    	}
-    	print '</select>';
-    	print ajax_combobox($htmlname);
-    }
+		print '<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'">';
+		if ($useempty) print '<option value="-1">&nbsp;</option>';
+		$arrayoflabels = $tmpep->statuts;
+		if ($useshortlabel) $arrayoflabels = $tmpep->statuts_short;
+		foreach ($arrayoflabels as $key => $val)
+		{
+			if ($selected != '' && $selected == $key)
+			{
+				print '<option value="'.$key.'" selected>';
+			} else {
+				print '<option value="'.$key.'">';
+			}
+			print $langs->trans($val);
+			print '</option>';
+		}
+		print '</select>';
+		print ajax_combobox($htmlname);
+	}
 
-    /**
-     *  Return list of types of notes with select value = id
-     *
-     *  @param      int     $selected       Preselected type
-     *  @param      string  $htmlname       Name of field in form
-     *  @param      int     $showempty      Add an empty field
-     *  @param      int     $active         1=Active only, 0=Unactive only, -1=All
-     *  @return     string                  Select html
-     */
-    public function selectTypeExpenseReport($selected = '', $htmlname = 'type', $showempty = 0, $active = 1)
-    {
-    	// phpcs:enable
-    	global $langs, $user;
-    	$langs->load("trips");
+	/**
+	 *  Return list of types of notes with select value = id
+	 *
+	 *  @param      int     $selected       Preselected type
+	 *  @param      string  $htmlname       Name of field in form
+	 *  @param      int     $showempty      Add an empty field
+	 *  @param      int     $active         1=Active only, 0=Unactive only, -1=All
+	 *  @return     string                  Select html
+	 */
+	public function selectTypeExpenseReport($selected = '', $htmlname = 'type', $showempty = 0, $active = 1)
+	{
+		// phpcs:enable
+		global $langs, $user;
+		$langs->load("trips");
 
-    	$out = '';
+		$out = '';
 
-    	$out .= '<select class="flat" name="'.$htmlname.'" id="'.$htmlname.'">';
-    	if ($showempty)
-    	{
-    		$out .= '<option value="-1"';
-    		if ($selected == -1) $out .= ' selected';
-    		$out .= '>&nbsp;</option>';
-    	}
+		$out .= '<select class="flat" name="'.$htmlname.'" id="'.$htmlname.'">';
+		if ($showempty)
+		{
+			$out .= '<option value="-1"';
+			if ($selected == -1) $out .= ' selected';
+			$out .= '>&nbsp;</option>';
+		}
 
-    	$sql = "SELECT c.id, c.code, c.label as type FROM ".MAIN_DB_PREFIX."c_type_fees as c";
-    	if ($active >= 0) $sql .= " WHERE c.active = ".$active;
-    	$sql .= " ORDER BY c.label ASC";
-    	$resql = $this->db->query($sql);
-    	if ($resql)
-    	{
-    		$num = $this->db->num_rows($resql);
-    		$i = 0;
+		$sql = "SELECT c.id, c.code, c.label as type FROM ".MAIN_DB_PREFIX."c_type_fees as c";
+		if ($active >= 0) $sql .= " WHERE c.active = ".$active;
+		$sql .= " ORDER BY c.label ASC";
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$num = $this->db->num_rows($resql);
+			$i = 0;
 
-    		while ($i < $num)
-    		{
-    			$obj = $this->db->fetch_object($resql);
-    			$out .= '<option value="'.$obj->id.'"';
-    			if ($obj->code == $selected || $obj->id == $selected) $out .= ' selected';
-    			$out .= '>';
-    			if ($obj->code != $langs->trans($obj->code)) $out .= $langs->trans($obj->code);
-    			else $out .= $langs->trans($obj->type);
-    			$i++;
-    		}
-    	}
-    	$out .= '</select>';
-    	$out .= ajax_combobox($htmlname);
+			while ($i < $num)
+			{
+				$obj = $this->db->fetch_object($resql);
+				$out .= '<option value="'.$obj->id.'"';
+				if ($obj->code == $selected || $obj->id == $selected) $out .= ' selected';
+				$out .= '>';
+				if ($obj->code != $langs->trans($obj->code)) $out .= $langs->trans($obj->code);
+				else $out .= $langs->trans($obj->type);
+				$i++;
+			}
+		}
+		$out .= '</select>';
+		$out .= ajax_combobox($htmlname);
 
-    	return $out;
-    }
+		return $out;
+	}
 }
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index c700cd9d6f1..f932e739ad1 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -1203,7 +1203,7 @@ class FormFile
 					{
 						print '</a>';
 						$section_dir = dirname(GETPOST('urlfile', 'alpha'));
-						if (! preg_match('/\/$/', $section_dir)) $section_dir.='/';
+						if (!preg_match('/\/$/', $section_dir)) $section_dir .= '/';
 						print '<input type="hidden" name="section_dir" value="'.$section_dir.'">';
 						print '<input type="hidden" name="renamefilefrom" value="'.dol_escape_htmltag($file['name']).'">';
 						print '<input type="text" name="renamefileto" class="quatrevingtpercent" value="'.dol_escape_htmltag($file['name']).'">';
@@ -1303,7 +1303,7 @@ class FormFile
 						if ($useinecm == 1 || $useinecm == 5)	// ECM manual tree only
 						{
 							// $section is inside $param
-							$newparam.=preg_replace('/&file=.*$/', '', $param);		// We don't need param file=
+							$newparam .= preg_replace('/&file=.*$/', '', $param); // We don't need param file=
 							$backtopage = DOL_URL_ROOT.'/ecm/index.php?&section_dir='.urlencode($relativepath).$newparam;
 							print '<a class="editfielda" href="'.DOL_URL_ROOT.'/ecm/file_card.php?urlfile='.urlencode($file['name']).$param.'&backtopage='.urlencode($backtopage).'" class="editfilelink" rel="'.urlencode($file['name']).'">'.img_edit('default', 0, 'class="paddingrightonly"').'</a>';
 						}
diff --git a/htdocs/core/class/html.formintervention.class.php b/htdocs/core/class/html.formintervention.class.php
index dccbe50333a..81c857e2683 100644
--- a/htdocs/core/class/html.formintervention.class.php
+++ b/htdocs/core/class/html.formintervention.class.php
@@ -27,29 +27,29 @@
  */
 class FormIntervention
 {
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    /**
+	/**
 	 * @var string Error code (or message)
 	 */
 	public $error = '';
 
 
-    /**
-     * Constructor
-     *
-     * @param		DoliDB		$db      Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-    }
+	/**
+	 * Constructor
+	 *
+	 * @param		DoliDB		$db      Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Show a combo list with contracts qualified for a third party
 	 *
@@ -62,7 +62,7 @@ class FormIntervention
 	 */
 	public function select_interventions($socid = -1, $selected = '', $htmlname = 'interventionid', $maxlength = 16, $showempty = 1)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $db, $user, $conf, $langs;
 
 		$out = '';
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index 200b50cd512..420ad549413 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -1264,8 +1264,8 @@ class FormMail extends Form
 					$defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendActionComm");
 				} elseif ($type_template == 'thirdparty') {
 					$defaultmessage = $outputlangs->transnoentities("PredefinedMailContentThirdparty");
-			    } elseif ($type_template == 'user') {
-			    	$defaultmessage = $outputlangs->transnoentities("PredefinedMailContentUser");
+				} elseif ($type_template == 'user') {
+					$defaultmessage = $outputlangs->transnoentities("PredefinedMailContentUser");
 				} elseif (!empty($type_template)) {
 					$defaultmessage = $outputlangs->transnoentities("PredefinedMailContentGeneric");
 				}
diff --git a/htdocs/core/class/html.formmailing.class.php b/htdocs/core/class/html.formmailing.class.php
index 1681d3e8439..9c74cb1203a 100644
--- a/htdocs/core/class/html.formmailing.class.php
+++ b/htdocs/core/class/html.formmailing.class.php
@@ -27,36 +27,36 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
  */
 class FormMailing extends Form
 {
-    /**
-     * @var string[] Error codes (or messages)
-     */
-    public $errors = array();
+	/**
+	 * @var string[] Error codes (or messages)
+	 */
+	public $errors = array();
 
-    /**
-     * Output a select with destinaries status
-     *
-     * @param string   $selectedid     The selected id
-     * @param string   $htmlname       Name of controm
-     * @param integer  $show_empty     Show empty option
-     * @return string HTML select
-     */
-    public function selectDestinariesStatus($selectedid = '', $htmlname = 'dest_status', $show_empty = 0)
-    {
+	/**
+	 * Output a select with destinaries status
+	 *
+	 * @param string   $selectedid     The selected id
+	 * @param string   $htmlname       Name of controm
+	 * @param integer  $show_empty     Show empty option
+	 * @return string HTML select
+	 */
+	public function selectDestinariesStatus($selectedid = '', $htmlname = 'dest_status', $show_empty = 0)
+	{
 
-        global $langs;
-        $langs->load("mails");
+		global $langs;
+		$langs->load("mails");
 
-        require_once DOL_DOCUMENT_ROOT.'/comm/mailing/class/mailing.class.php';
-        $mailing = new Mailing($this->db);
+		require_once DOL_DOCUMENT_ROOT.'/comm/mailing/class/mailing.class.php';
+		$mailing = new Mailing($this->db);
 
-        $options = array();
+		$options = array();
 
-        if ($show_empty) {
-            $options[-2] = ''; // Note -1 is used for error
-        }
+		if ($show_empty) {
+			$options[-2] = ''; // Note -1 is used for error
+		}
 
-        $options = $options + $mailing->statut_dest;
+		$options = $options + $mailing->statut_dest;
 
-        return Form::selectarray($htmlname, $options, $selectedid, 0, 0, 0, '', 1);
-    }
+		return Form::selectarray($htmlname, $options, $selectedid, 0, 0, 0, '', 1);
+	}
 }
diff --git a/htdocs/core/class/html.formmargin.class.php b/htdocs/core/class/html.formmargin.class.php
index cf159819764..233f98df662 100644
--- a/htdocs/core/class/html.formmargin.class.php
+++ b/htdocs/core/class/html.formmargin.class.php
@@ -28,26 +28,26 @@
  */
 class FormMargin
 {
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    /**
+	/**
 	 * @var string Error code (or message)
 	 */
 	public $error = '';
 
 
-    /**
-     *	Constructor
-     *
-     *	@param	DoliDB		$db      Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-    }
+	/**
+	 *	Constructor
+	 *
+	 *	@param	DoliDB		$db      Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
 
 
 
@@ -146,7 +146,7 @@ class FormMargin
 					//}
 					//else
 					//{
-					    $marginInfos['margin_on_products'] += $pv - $pa;
+						$marginInfos['margin_on_products'] += $pv - $pa;
 					//}
 				} elseif ($type == 1) {  // service
 					$marginInfos['pa_services'] += $pa;
@@ -195,24 +195,24 @@ class FormMargin
 	{
 		global $langs, $conf, $user;
 
-    	if (!empty($user->socid)) return;
+		if (!empty($user->socid)) return;
 
-    	if (!$user->rights->margins->liretous) return;
+		if (!$user->rights->margins->liretous) return;
 
 		$marginInfo = $this->getMarginInfosArray($object, $force_price);
 
 		if (!empty($conf->global->MARGIN_ADD_SHOWHIDE_BUTTON))	// TODO Warning this feature rely on an external js file that may be removed. Using native js function document.cookie should be better
 		{
 			print $langs->trans('ShowMarginInfos').' : ';
-	        $hidemargininfos = preg_replace('/[^a-zA-Z0-9_\-]/', '', $_COOKIE['DOLUSER_MARGININFO_HIDE_SHOW']);	// Clean cookie
-	    	print '<span id="showMarginInfos" class="linkobject '.(!empty($hidemargininfos) ? '' : 'hideobject').'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</span>';
-	    	print '<span id="hideMarginInfos" class="linkobject '.(!empty($hidemargininfos) ? 'hideobject' : '').'">'.img_picto($langs->trans("Enabled"), 'switch_on').'</span>';
+			$hidemargininfos = preg_replace('/[^a-zA-Z0-9_\-]/', '', $_COOKIE['DOLUSER_MARGININFO_HIDE_SHOW']); // Clean cookie
+			print '<span id="showMarginInfos" class="linkobject '.(!empty($hidemargininfos) ? '' : 'hideobject').'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</span>';
+			print '<span id="hideMarginInfos" class="linkobject '.(!empty($hidemargininfos) ? 'hideobject' : '').'">'.img_picto($langs->trans("Enabled"), 'switch_on').'</span>';
 
-    	    print '<script>$(document).ready(function() {
+			print '<script>$(document).ready(function() {
         	    $("span#showMarginInfos").click(function() { $.getScript( "'.dol_buildpath('/includes/jquery/plugins/jquerytreeview/lib/jquery.cookie.js', 1).'", function( data, textStatus, jqxhr ) { $.cookie("DOLUSER_MARGININFO_HIDE_SHOW", 0); $(".margininfos").show(); $("span#showMarginInfos").addClass("hideobject"); $("span#hideMarginInfos").removeClass("hideobject");})});
         	    $("span#hideMarginInfos").click(function() { $.getScript( "'.dol_buildpath('/includes/jquery/plugins/jquerytreeview/lib/jquery.cookie.js', 1).'", function( data, textStatus, jqxhr ) { $.cookie("DOLUSER_MARGININFO_HIDE_SHOW", 1); $(".margininfos").hide(); $("span#hideMarginInfos").addClass("hideobject"); $("span#showMarginInfos").removeClass("hideobject");})});
       	        });</script>';
-    	    if (!empty($hidemargininfos)) print '<script>$(document).ready(function() {$(".margininfos").hide();});</script>';
+			if (!empty($hidemargininfos)) print '<script>$(document).ready(function() {$(".margininfos").hide();});</script>';
 		}
 
 		print '<div class="div-table-responsive-no-min">';
diff --git a/htdocs/core/class/html.formorder.class.php b/htdocs/core/class/html.formorder.class.php
index 1dcac0023c4..dbb97b61656 100644
--- a/htdocs/core/class/html.formorder.class.php
+++ b/htdocs/core/class/html.formorder.class.php
@@ -31,39 +31,39 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
 class FormOrder extends Form
 {
 
-    /**
-     *  Return combo list of differents status of a orders
-     *
-     *  @param	string	$selected   Preselected value
-     *  @param	int		$short		Use short labels
-     *  @param	string	$hmlname	Name of HTML select element
-     *  @return	void
-     */
-    public function selectSupplierOrderStatus($selected = '', $short = 0, $hmlname = 'order_status')
-    {
-	    $options = array();
+	/**
+	 *  Return combo list of differents status of a orders
+	 *
+	 *  @param	string	$selected   Preselected value
+	 *  @param	int		$short		Use short labels
+	 *  @param	string	$hmlname	Name of HTML select element
+	 *  @return	void
+	 */
+	public function selectSupplierOrderStatus($selected = '', $short = 0, $hmlname = 'order_status')
+	{
+		$options = array();
 
-	    // 7 is same label than 6. 8 does not exists (billed is another field)
-	    $statustohow = array(
-		    '0' => '0',
-		    '1' => '1',
-		    '2' => '2',
-		    '3' => '3',
-		    '4' => '4',
-		    '5' => '5',
-		    '6' => '6,7',
-		    '9' => '9'
-	    );
+		// 7 is same label than 6. 8 does not exists (billed is another field)
+		$statustohow = array(
+			'0' => '0',
+			'1' => '1',
+			'2' => '2',
+			'3' => '3',
+			'4' => '4',
+			'5' => '5',
+			'6' => '6,7',
+			'9' => '9'
+		);
 
-	    $tmpsupplierorder = new CommandeFournisseur($this->db);
+		$tmpsupplierorder = new CommandeFournisseur($this->db);
 
-	    foreach ($statustohow as $key => $value) {
-		    $tmpsupplierorder->statut = $key;
-		    $options[$value] = $tmpsupplierorder->getLibStatut($short);
-	    }
+		foreach ($statustohow as $key => $value) {
+			$tmpsupplierorder->statut = $key;
+			$options[$value] = $tmpsupplierorder->getLibStatut($short);
+		}
 
-	    print Form::selectarray($hmlname, $options, $selected, 1, 0, 0, '', 0, 0, 0, '', '', 1);
-    }
+		print Form::selectarray($hmlname, $options, $selected, 1, 0, 0, '', 0, 0, 0, '', '', 1);
+	}
 
 	/**
 	 *	Return list of input method (mode used to receive order, like order received by email, fax, online)
@@ -78,7 +78,7 @@ class FormOrder extends Form
 	{
 		global $langs;
 
-        $listofmethods = array();
+		$listofmethods = array();
 
 		$sql = "SELECT rowid, code, libelle as label";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_input_method";
diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php
index 5d3bd181753..7606779afe5 100644
--- a/htdocs/core/class/html.formother.class.php
+++ b/htdocs/core/class/html.formother.class.php
@@ -1152,6 +1152,7 @@ class FormOther
 		}
 
 		// Define boxlista and boxlistb
+		$boxlista = ''; $boxlistb = '';
 		$nbboxactivated = count($boxidactivatedforuser);
 
 		if ($nbboxactivated)
diff --git a/htdocs/core/class/html.formpropal.class.php b/htdocs/core/class/html.formpropal.class.php
index 730133eae27..78a35a5dd50 100644
--- a/htdocs/core/class/html.formpropal.class.php
+++ b/htdocs/core/class/html.formpropal.class.php
@@ -27,115 +27,115 @@
  */
 class FormPropal
 {
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    /**
-     * @var string Error code (or message)
-     */
-    public $error = '';
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error = '';
 
 
-    /**
-     * Constructor
-     *
-     * @param		DoliDB		$db      Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-    }
+	/**
+	 * Constructor
+	 *
+	 * @param		DoliDB		$db      Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
 
-    /**
-     *    Return combo list of differents status of a proposal
-     *    Values are id of table c_propalst
-     *
-     *    @param	string	$selected   	Preselected value
-     *    @param	int		$short			Use short labels
-     *    @param	int		$excludedraft	0=All status, 1=Exclude draft status
-     *    @param	int 	$showempty		1=Add empty line
-     *    @param    string  $mode           'customer', 'supplier'
-     *    @param    string  $htmlname       Name of select field
-     *    @return	void
-     */
-    public function selectProposalStatus($selected = '', $short = 0, $excludedraft = 0, $showempty = 1, $mode = 'customer', $htmlname = 'propal_statut')
-    {
-        global $langs;
+	/**
+	 *    Return combo list of differents status of a proposal
+	 *    Values are id of table c_propalst
+	 *
+	 *    @param	string	$selected   	Preselected value
+	 *    @param	int		$short			Use short labels
+	 *    @param	int		$excludedraft	0=All status, 1=Exclude draft status
+	 *    @param	int 	$showempty		1=Add empty line
+	 *    @param    string  $mode           'customer', 'supplier'
+	 *    @param    string  $htmlname       Name of select field
+	 *    @return	void
+	 */
+	public function selectProposalStatus($selected = '', $short = 0, $excludedraft = 0, $showempty = 1, $mode = 'customer', $htmlname = 'propal_statut')
+	{
+		global $langs;
 
-        $prefix = '';
-        $listofstatus = array();
-        if ($mode == 'supplier') {
-            $prefix = 'SupplierProposalStatus';
+		$prefix = '';
+		$listofstatus = array();
+		if ($mode == 'supplier') {
+			$prefix = 'SupplierProposalStatus';
 
-            $langs->load("supplier_proposal");
-            $listofstatus = array(
-                0=>array('id'=>0, 'code'=>'PR_DRAFT'),
-                1=>array('id'=>1, 'code'=>'PR_OPEN'),
-                2=>array('id'=>2, 'code'=>'PR_SIGNED'),
-                3=>array('id'=>3, 'code'=>'PR_NOTSIGNED'),
-                4=>array('id'=>4, 'code'=>'PR_CLOSED')
-            );
-        } else {
-            $prefix = "PropalStatus";
+			$langs->load("supplier_proposal");
+			$listofstatus = array(
+				0=>array('id'=>0, 'code'=>'PR_DRAFT'),
+				1=>array('id'=>1, 'code'=>'PR_OPEN'),
+				2=>array('id'=>2, 'code'=>'PR_SIGNED'),
+				3=>array('id'=>3, 'code'=>'PR_NOTSIGNED'),
+				4=>array('id'=>4, 'code'=>'PR_CLOSED')
+			);
+		} else {
+			$prefix = "PropalStatus";
 
-            $sql = "SELECT id, code, label, active FROM ".MAIN_DB_PREFIX."c_propalst";
-            $sql .= " WHERE active = 1";
-            dol_syslog(get_class($this)."::selectProposalStatus", LOG_DEBUG);
-            $resql = $this->db->query($sql);
-            if ($resql)
-            {
-                $num = $this->db->num_rows($resql);
-                $i = 0;
-                if ($num)
-                {
-                    while ($i < $num)
-                    {
-                        $obj = $this->db->fetch_object($resql);
-                        $listofstatus[$obj->id] = array('id'=>$obj->id, 'code'=>$obj->code, 'label'=>$obj->label);
-                        $i++;
-                    }
-                }
-            } else {
-                dol_print_error($this->db);
-            }
-        }
+			$sql = "SELECT id, code, label, active FROM ".MAIN_DB_PREFIX."c_propalst";
+			$sql .= " WHERE active = 1";
+			dol_syslog(get_class($this)."::selectProposalStatus", LOG_DEBUG);
+			$resql = $this->db->query($sql);
+			if ($resql)
+			{
+				$num = $this->db->num_rows($resql);
+				$i = 0;
+				if ($num)
+				{
+					while ($i < $num)
+					{
+						$obj = $this->db->fetch_object($resql);
+						$listofstatus[$obj->id] = array('id'=>$obj->id, 'code'=>$obj->code, 'label'=>$obj->label);
+						$i++;
+					}
+				}
+			} else {
+				dol_print_error($this->db);
+			}
+		}
 
-        print '<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'">';
-        if ($showempty) print '<option value="-1">&nbsp;</option>';
+		print '<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'">';
+		if ($showempty) print '<option value="-1">&nbsp;</option>';
 
-        foreach ($listofstatus as $key => $obj)
-        {
-            if ($excludedraft)
-            {
-                if ($obj['code'] == 'Draft' || $obj['code'] == 'PR_DRAFT')
-                {
-                    $i++;
-                    continue;
-                }
-            }
-            if ($selected != '' && $selected == $obj['id'])
-            {
-                print '<option value="'.$obj['id'].'" selected>';
-            } else {
-                print '<option value="'.$obj['id'].'">';
-            }
-            $key = $obj['code'];
-            if ($langs->trans($prefix.$key.($short ? 'Short' : '')) != $prefix.$key.($short ? 'Short' : ''))
-            {
-                print $langs->trans($prefix.$key.($short ? 'Short' : ''));
-            } else {
-                $conv_to_new_code = array('PR_DRAFT'=>'Draft', 'PR_OPEN'=>'Validated', 'PR_CLOSED'=>'Closed', 'PR_SIGNED'=>'Signed', 'PR_NOTSIGNED'=>'NotSigned', 'PR_FAC'=>'Billed');
-                if (!empty($conv_to_new_code[$obj['code']])) $key = $conv_to_new_code[$obj['code']];
+		foreach ($listofstatus as $key => $obj)
+		{
+			if ($excludedraft)
+			{
+				if ($obj['code'] == 'Draft' || $obj['code'] == 'PR_DRAFT')
+				{
+					$i++;
+					continue;
+				}
+			}
+			if ($selected != '' && $selected == $obj['id'])
+			{
+				print '<option value="'.$obj['id'].'" selected>';
+			} else {
+				print '<option value="'.$obj['id'].'">';
+			}
+			$key = $obj['code'];
+			if ($langs->trans($prefix.$key.($short ? 'Short' : '')) != $prefix.$key.($short ? 'Short' : ''))
+			{
+				print $langs->trans($prefix.$key.($short ? 'Short' : ''));
+			} else {
+				$conv_to_new_code = array('PR_DRAFT'=>'Draft', 'PR_OPEN'=>'Validated', 'PR_CLOSED'=>'Closed', 'PR_SIGNED'=>'Signed', 'PR_NOTSIGNED'=>'NotSigned', 'PR_FAC'=>'Billed');
+				if (!empty($conv_to_new_code[$obj['code']])) $key = $conv_to_new_code[$obj['code']];
 
-                print ($langs->trans($prefix.$key.($short ? 'Short' : '')) != $prefix.$key.($short ? 'Short' : '')) ? $langs->trans($prefix.$key.($short ? 'Short' : '')) : ($obj['label'] ? $obj['label'] : $obj['code']);
-            }
-            print '</option>';
-            $i++;
-        }
-        print '</select>';
+				print ($langs->trans($prefix.$key.($short ? 'Short' : '')) != $prefix.$key.($short ? 'Short' : '')) ? $langs->trans($prefix.$key.($short ? 'Short' : '')) : ($obj['label'] ? $obj['label'] : $obj['code']);
+			}
+			print '</option>';
+			$i++;
+		}
+		print '</select>';
 
-        print ajax_combobox($htmlname);
-    }
+		print ajax_combobox($htmlname);
+	}
 }
diff --git a/htdocs/core/class/html.formsms.class.php b/htdocs/core/class/html.formsms.class.php
index 55d214fbbd6..c6ffa4e092c 100644
--- a/htdocs/core/class/html.formsms.class.php
+++ b/htdocs/core/class/html.formsms.class.php
@@ -33,99 +33,99 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
  */
 class FormSms
 {
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $fromid;
-    public $fromname;
-    public $fromsms;
-    public $fromtype;
-    public $replytoname;
-    public $replytomail;
-    public $toname;
-    public $tomail;
+	public $fromid;
+	public $fromname;
+	public $fromsms;
+	public $fromtype;
+	public $replytoname;
+	public $replytomail;
+	public $toname;
+	public $tomail;
 
-    public $withsubstit; // Show substitution array
-    public $withfrom;
-    public $withto;
-    public $withtopic;
-    public $withbody;
+	public $withsubstit; // Show substitution array
+	public $withfrom;
+	public $withto;
+	public $withtopic;
+	public $withbody;
 
-    /**
-     * @var int 	Id of company
-     */
-    public $withtosocid;
+	/**
+	 * @var int 	Id of company
+	 */
+	public $withtosocid;
 
-    public $withfromreadonly;
-    public $withreplytoreadonly;
-    public $withtoreadonly;
-    public $withtopicreadonly;
-    public $withcancel;
+	public $withfromreadonly;
+	public $withreplytoreadonly;
+	public $withtoreadonly;
+	public $withtopicreadonly;
+	public $withcancel;
 
-    public $substit = array();
-    public $param = array();
+	public $substit = array();
+	public $param = array();
 
-    /**
-     * @var string Error code (or message)
-     */
-    public $error = '';
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error = '';
 
-    /**
-     * @var string[]	Array of error strings
-     */
-    public $errors = array();
+	/**
+	 * @var string[]	Array of error strings
+	 */
+	public $errors = array();
 
 
-    /**
-     *	Constructor
-     *
-     *  @param		DoliDB		$db      Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
+	/**
+	 *	Constructor
+	 *
+	 *  @param		DoliDB		$db      Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
 
-        $this->withfrom = 1;
-        $this->withto = 1;
-        $this->withtopic = 1;
-        $this->withbody = 1;
+		$this->withfrom = 1;
+		$this->withto = 1;
+		$this->withtopic = 1;
+		$this->withbody = 1;
 
-        $this->withfromreadonly = 1;
-        $this->withreplytoreadonly = 1;
-        $this->withtoreadonly = 0;
-        $this->withtopicreadonly = 0;
-        $this->withbodyreadonly = 0;
-    }
+		$this->withfromreadonly = 1;
+		$this->withreplytoreadonly = 1;
+		$this->withtoreadonly = 0;
+		$this->withtopicreadonly = 0;
+		$this->withbodyreadonly = 0;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *	Show the form to input an sms.
-     *
-     *	@param	string	$morecss Class on first column td
-     *  @param int $showform Show form tags and submit button (recommanded is to use with value 0)
-     *	@return	void
-     */
-    public function show_form($morecss = 'titlefield', $showform = 1)
-    {
-     // phpcs:enable
-        global $conf, $langs, $user, $form;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *	Show the form to input an sms.
+	 *
+	 *	@param	string	$morecss Class on first column td
+	 *  @param int $showform Show form tags and submit button (recommanded is to use with value 0)
+	 *	@return	void
+	 */
+	public function show_form($morecss = 'titlefield', $showform = 1)
+	{
+	 // phpcs:enable
+		global $conf, $langs, $user, $form;
 
-        if (!is_object($form)) $form = new Form($this->db);
+		if (!is_object($form)) $form = new Form($this->db);
 
-        // Load translation files required by the page
-        $langs->loadLangs(array('other', 'mails', 'sms'));
+		// Load translation files required by the page
+		$langs->loadLangs(array('other', 'mails', 'sms'));
 
-        $soc = new Societe($this->db);
-        if (!empty($this->withtosocid) && $this->withtosocid > 0)
-        {
-            $soc->fetch($this->withtosocid);
-        }
+		$soc = new Societe($this->db);
+		if (!empty($this->withtosocid) && $this->withtosocid > 0)
+		{
+			$soc->fetch($this->withtosocid);
+		}
 
-        print "\n<!-- Begin form SMS -->\n";
+		print "\n<!-- Begin form SMS -->\n";
 
-        print '
+		print '
 <script language="javascript">
 function limitChars(textarea, limit, infodiv)
 {
@@ -138,174 +138,174 @@ function limitChars(textarea, limit, infodiv)
 }
 </script>';
 
-        if ($showform) print "<form method=\"POST\" name=\"smsform\" enctype=\"multipart/form-data\" action=\"".$this->param["returnurl"]."\">\n";
+		if ($showform) print "<form method=\"POST\" name=\"smsform\" enctype=\"multipart/form-data\" action=\"".$this->param["returnurl"]."\">\n";
 
-        print '<input type="hidden" name="token" value="'.newToken().'">';
-        foreach ($this->param as $key=>$value)
-        {
-            print "<input type=\"hidden\" name=\"$key\" value=\"$value\">\n";
-        }
-        print "<table class=\"border centpercent\">\n";
+		print '<input type="hidden" name="token" value="'.newToken().'">';
+		foreach ($this->param as $key=>$value)
+		{
+			print "<input type=\"hidden\" name=\"$key\" value=\"$value\">\n";
+		}
+		print "<table class=\"border centpercent\">\n";
 
-        // Substitution array
-        if (!empty($this->withsubstit))		// Unset or set ->withsubstit=0 to disable this.
-        {
-            print "<tr><td colspan=\"2\">";
-            $help = "";
-            foreach ($this->substit as $key => $val)
-            {
-                $help .= $key.' -> '.$langs->trans($val).'<br>';
-            }
-            print $form->textwithpicto($langs->trans("SmsTestSubstitutionReplacedByGenericValues"), $help);
-            print "</td></tr>\n";
-        }
+		// Substitution array
+		if (!empty($this->withsubstit))		// Unset or set ->withsubstit=0 to disable this.
+		{
+			print "<tr><td colspan=\"2\">";
+			$help = "";
+			foreach ($this->substit as $key => $val)
+			{
+				$help .= $key.' -> '.$langs->trans($val).'<br>';
+			}
+			print $form->textwithpicto($langs->trans("SmsTestSubstitutionReplacedByGenericValues"), $help);
+			print "</td></tr>\n";
+		}
 
-        // From
-        if ($this->withfrom)
-        {
-            if ($this->withfromreadonly)
-            {
-                print '<tr><td class="titlefield '.$morecss.'">'.$langs->trans("SmsFrom");
-                print '<input type="hidden" name="fromsms" value="'.$this->fromsms.'">';
-                print "</td><td>";
-                if ($this->fromtype == 'user')
-                {
-                    $langs->load("users");
-                    $fuser = new User($this->db);
-                    $fuser->fetch($this->fromid);
-                    print $fuser->getNomUrl(1);
-                    print ' &nbsp; ';
-                }
-                if ($this->fromsms)
-                {
-                    print $this->fromsms;
-                } else {
-                    if ($this->fromtype)
-                    {
-                        $langs->load("errors");
-                        print '<font class="warning"> &lt;'.$langs->trans("ErrorNoPhoneDefinedForThisUser").'&gt; </font>';
-                    }
-                }
-                print "</td></tr>\n";
-                print "</td></tr>\n";
-            } else {
-                print '<tr><td class="'.$morecss.'">'.$langs->trans("SmsFrom")."</td><td>";
-                //print '<input type="text" name="fromname" size="30" value="'.$this->fromsms.'">';
-                if ($conf->global->MAIN_SMS_SENDMODE == 'ovh')        // For backward compatibility        @deprecated
-                {
-                    dol_include_once('/ovh/class/ovhsms.class.php');
-                    try {
-                        $sms = new OvhSms($this->db);
-                        if (empty($conf->global->OVHSMS_ACCOUNT))
-                        {
-                            $resultsender = 'ErrorOVHSMS_ACCOUNT not defined';
-                        } else {
-                            $resultsender = $sms->SmsSenderList();
-                        }
-                    } catch (Exception $e)
-                    {
-                        dol_print_error('', 'Error to get list of senders: '.$e->getMessage());
-                    }
-                } elseif (!empty($conf->global->MAIN_SMS_SENDMODE))    // $conf->global->MAIN_SMS_SENDMODE looks like a value 'class@module'
-                {
-                    $tmp = explode('@', $conf->global->MAIN_SMS_SENDMODE);
-                    $classfile = $tmp[0]; $module = (empty($tmp[1]) ? $tmp[0] : $tmp[1]);
-                    dol_include_once('/'.$module.'/class/'.$classfile.'.class.php');
-                    try {
-                        $classname = ucfirst($classfile);
-                        if (class_exists($classname))
-                        {
-                        	$sms = new $classname($this->db);
-                        	$resultsender = $sms->SmsSenderList();
-                        } else {
-                        	$sms = new stdClass();
-                        	$sms->error = 'The SMS manager "'.$classfile.'" defined into SMS setup MAIN_SMS_SENDMODE is not found';
-                        }
-                    } catch (Exception $e)
-                    {
-                        dol_print_error('', 'Error to get list of senders: '.$e->getMessage());
-                        exit;
-                    }
-                } else {
-                    dol_syslog("Warning: The SMS sending method has not been defined into MAIN_SMS_SENDMODE", LOG_WARNING);
-	                $resultsender = array();
-                    $resultsender[0]->number = $this->fromsms;
-                }
+		// From
+		if ($this->withfrom)
+		{
+			if ($this->withfromreadonly)
+			{
+				print '<tr><td class="titlefield '.$morecss.'">'.$langs->trans("SmsFrom");
+				print '<input type="hidden" name="fromsms" value="'.$this->fromsms.'">';
+				print "</td><td>";
+				if ($this->fromtype == 'user')
+				{
+					$langs->load("users");
+					$fuser = new User($this->db);
+					$fuser->fetch($this->fromid);
+					print $fuser->getNomUrl(1);
+					print ' &nbsp; ';
+				}
+				if ($this->fromsms)
+				{
+					print $this->fromsms;
+				} else {
+					if ($this->fromtype)
+					{
+						$langs->load("errors");
+						print '<font class="warning"> &lt;'.$langs->trans("ErrorNoPhoneDefinedForThisUser").'&gt; </font>';
+					}
+				}
+				print "</td></tr>\n";
+				print "</td></tr>\n";
+			} else {
+				print '<tr><td class="'.$morecss.'">'.$langs->trans("SmsFrom")."</td><td>";
+				//print '<input type="text" name="fromname" size="30" value="'.$this->fromsms.'">';
+				if ($conf->global->MAIN_SMS_SENDMODE == 'ovh')        // For backward compatibility        @deprecated
+				{
+					dol_include_once('/ovh/class/ovhsms.class.php');
+					try {
+						$sms = new OvhSms($this->db);
+						if (empty($conf->global->OVHSMS_ACCOUNT))
+						{
+							$resultsender = 'ErrorOVHSMS_ACCOUNT not defined';
+						} else {
+							$resultsender = $sms->SmsSenderList();
+						}
+					} catch (Exception $e)
+					{
+						dol_print_error('', 'Error to get list of senders: '.$e->getMessage());
+					}
+				} elseif (!empty($conf->global->MAIN_SMS_SENDMODE))    // $conf->global->MAIN_SMS_SENDMODE looks like a value 'class@module'
+				{
+					$tmp = explode('@', $conf->global->MAIN_SMS_SENDMODE);
+					$classfile = $tmp[0]; $module = (empty($tmp[1]) ? $tmp[0] : $tmp[1]);
+					dol_include_once('/'.$module.'/class/'.$classfile.'.class.php');
+					try {
+						$classname = ucfirst($classfile);
+						if (class_exists($classname))
+						{
+							$sms = new $classname($this->db);
+							$resultsender = $sms->SmsSenderList();
+						} else {
+							$sms = new stdClass();
+							$sms->error = 'The SMS manager "'.$classfile.'" defined into SMS setup MAIN_SMS_SENDMODE is not found';
+						}
+					} catch (Exception $e)
+					{
+						dol_print_error('', 'Error to get list of senders: '.$e->getMessage());
+						exit;
+					}
+				} else {
+					dol_syslog("Warning: The SMS sending method has not been defined into MAIN_SMS_SENDMODE", LOG_WARNING);
+					$resultsender = array();
+					$resultsender[0]->number = $this->fromsms;
+				}
 
-                if (is_array($resultsender) && count($resultsender) > 0)
-                {
-                    print '<select name="fromsms" id="fromsms" class="flat">';
-                    foreach ($resultsender as $obj)
-                    {
-                        print '<option value="'.$obj->number.'">'.$obj->number.'</option>';
-                    }
-                    print '</select>';
-                } else {
-                    print '<span class="error">'.$langs->trans("SmsNoPossibleSenderFound");
-                    if (is_object($sms) && !empty($sms->error)) print ' '.$sms->error;
-                    print '</span>';
-                }
-                print '</td>';
-                print "</tr>\n";
-            }
-        }
+				if (is_array($resultsender) && count($resultsender) > 0)
+				{
+					print '<select name="fromsms" id="fromsms" class="flat">';
+					foreach ($resultsender as $obj)
+					{
+						print '<option value="'.$obj->number.'">'.$obj->number.'</option>';
+					}
+					print '</select>';
+				} else {
+					print '<span class="error">'.$langs->trans("SmsNoPossibleSenderFound");
+					if (is_object($sms) && !empty($sms->error)) print ' '.$sms->error;
+					print '</span>';
+				}
+				print '</td>';
+				print "</tr>\n";
+			}
+		}
 
-        // To (target)
-        if ($this->withto || is_array($this->withto))
-        {
-            print '<tr><td>';
-            //$moretext=$langs->trans("YouCanUseCommaSeparatorForSeveralRecipients");
-            $moretext = '';
-            print $form->textwithpicto($langs->trans("SmsTo"), $moretext);
-            print '</td><td>';
-            if ($this->withtoreadonly)
-            {
-                print (!is_array($this->withto) && !is_numeric($this->withto)) ? $this->withto : "";
-            } else {
-                print "<input size=\"16\" id=\"sendto\" name=\"sendto\" value=\"".dol_escape_htmltag(!is_array($this->withto) && $this->withto != '1' ? (isset($_REQUEST["sendto"]) ?GETPOST("sendto") : $this->withto) : "+")."\">";
-                if (!empty($this->withtosocid) && $this->withtosocid > 0)
-                {
-                    $liste = array();
-                    foreach ($soc->thirdparty_and_contact_phone_array() as $key => $value)
-                    {
-                        $liste[$key] = $value;
-                    }
-                    print " ".$langs->trans("or")." ";
-                    //var_dump($_REQUEST);exit;
-                    print $form->selectarray("receiver", $liste, GETPOST("receiver"), 1);
-                }
-                print ' <span class="opacitymedium">'.$langs->trans("SmsInfoNumero").'</span>';
-            }
-            print "</td></tr>\n";
-        }
+		// To (target)
+		if ($this->withto || is_array($this->withto))
+		{
+			print '<tr><td>';
+			//$moretext=$langs->trans("YouCanUseCommaSeparatorForSeveralRecipients");
+			$moretext = '';
+			print $form->textwithpicto($langs->trans("SmsTo"), $moretext);
+			print '</td><td>';
+			if ($this->withtoreadonly)
+			{
+				print (!is_array($this->withto) && !is_numeric($this->withto)) ? $this->withto : "";
+			} else {
+				print "<input size=\"16\" id=\"sendto\" name=\"sendto\" value=\"".dol_escape_htmltag(!is_array($this->withto) && $this->withto != '1' ? (isset($_REQUEST["sendto"]) ?GETPOST("sendto") : $this->withto) : "+")."\">";
+				if (!empty($this->withtosocid) && $this->withtosocid > 0)
+				{
+					$liste = array();
+					foreach ($soc->thirdparty_and_contact_phone_array() as $key => $value)
+					{
+						$liste[$key] = $value;
+					}
+					print " ".$langs->trans("or")." ";
+					//var_dump($_REQUEST);exit;
+					print $form->selectarray("receiver", $liste, GETPOST("receiver"), 1);
+				}
+				print ' <span class="opacitymedium">'.$langs->trans("SmsInfoNumero").'</span>';
+			}
+			print "</td></tr>\n";
+		}
 
-        // Message
-        if ($this->withbody)
-        {
-            $defaultmessage = '';
-            if ($this->param["models"] == 'body')
-            {
-                $defaultmessage = $this->withbody;
-            }
-            $defaultmessage = make_substitutions($defaultmessage, $this->substit);
-            if (isset($_POST["message"])) $defaultmessage = $_POST["message"];
-            $defaultmessage = str_replace('\n', "\n", $defaultmessage);
+		// Message
+		if ($this->withbody)
+		{
+			$defaultmessage = '';
+			if ($this->param["models"] == 'body')
+			{
+				$defaultmessage = $this->withbody;
+			}
+			$defaultmessage = make_substitutions($defaultmessage, $this->substit);
+			if (isset($_POST["message"])) $defaultmessage = $_POST["message"];
+			$defaultmessage = str_replace('\n', "\n", $defaultmessage);
 
-            print "<tr>";
-            print '<td class="tdtop">'.$langs->trans("SmsText")."</td>";
-            print "<td>";
-            if ($this->withbodyreadonly)
-            {
-                print nl2br($defaultmessage);
-                print '<input type="hidden" name="message" value="'.dol_escape_htmltag($defaultmessage).'">';
-            } else {
-                print '<textarea class="quatrevingtpercent" name="message" id="message" rows="'.ROWS_4.'" onkeyup="limitChars(this, 160, \'charlimitinfospan\')">'.$defaultmessage.'</textarea>';
-                print '<div id="charlimitinfo">'.$langs->trans("SmsInfoCharRemain").': <span id="charlimitinfospan">'.(160 - dol_strlen($defaultmessage)).'</span></div></td>';
-            }
-            print "</td></tr>\n";
-        }
+			print "<tr>";
+			print '<td class="tdtop">'.$langs->trans("SmsText")."</td>";
+			print "<td>";
+			if ($this->withbodyreadonly)
+			{
+				print nl2br($defaultmessage);
+				print '<input type="hidden" name="message" value="'.dol_escape_htmltag($defaultmessage).'">';
+			} else {
+				print '<textarea class="quatrevingtpercent" name="message" id="message" rows="'.ROWS_4.'" onkeyup="limitChars(this, 160, \'charlimitinfospan\')">'.$defaultmessage.'</textarea>';
+				print '<div id="charlimitinfo">'.$langs->trans("SmsInfoCharRemain").': <span id="charlimitinfospan">'.(160 - dol_strlen($defaultmessage)).'</span></div></td>';
+			}
+			print "</td></tr>\n";
+		}
 
-        print '
+		print '
            <tr>
             <td>'.$langs->trans("DelayBeforeSending").':</td>
             <td> <input name="deferred" id="deferred" size="4" value="0"></td></tr>
@@ -332,23 +332,23 @@ function limitChars(textarea, limit, infodiv)
            <option value="1" selected>Yes</option>
            </select></td></tr>';
 
-        print "</table>\n";
+		print "</table>\n";
 
 
-        if ($showform)
-        {
-            print '<div class="center">';
-            print '<input class="button" type="submit" name="sendmail" value="'.dol_escape_htmltag($langs->trans("SendSms")).'">';
-            if ($this->withcancel)
-            {
-                print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-                print '<input class="button" type="submit" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'">';
-            }
-            print '</div>';
+		if ($showform)
+		{
+			print '<div class="center">';
+			print '<input class="button" type="submit" name="sendmail" value="'.dol_escape_htmltag($langs->trans("SendSms")).'">';
+			if ($this->withcancel)
+			{
+				print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
+				print '<input class="button" type="submit" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'">';
+			}
+			print '</div>';
 
-            print "</form>\n";
-        }
+			print "</form>\n";
+		}
 
-        print "<!-- End form SMS -->\n";
-    }
+		print "<!-- End form SMS -->\n";
+	}
 }
diff --git a/htdocs/core/class/html.formsocialcontrib.class.php b/htdocs/core/class/html.formsocialcontrib.class.php
index e3a063b0d69..ea96f393525 100644
--- a/htdocs/core/class/html.formsocialcontrib.class.php
+++ b/htdocs/core/class/html.formsocialcontrib.class.php
@@ -28,9 +28,9 @@
 class FormSocialContrib
 {
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
 	/**
 	 * @var string Error code (or message)
@@ -39,82 +39,82 @@ class FormSocialContrib
 
 
 	/**
-	* Constructor
-	*
-	* @param		DoliDB		$db      Database handler
-	*/
+	 * Constructor
+	 *
+	 * @param		DoliDB		$db      Database handler
+	 */
 	public function __construct($db)
 	{
-	    $this->db = $db;
+		$this->db = $db;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Return list of social contributions.
-     *  Use mysoc->country_id or mysoc->country_code so they must be defined.
-     *
-     *	@param	string	$selected       Preselected type
-     *	@param  string	$htmlname       Name of field in form
-     * 	@param	int		$useempty		Set to 1 if we want an empty value
-     * 	@param	int		$maxlen			Max length of text in combo box
-     * 	@param	int		$help			Add or not the admin help picto
-     *  @param	string	$morecss		Add more CSS on select
-     *  @param	int		$noerrorifempty	No print error if list is empty for the country
-     * 	@return	void
-     */
-    public function select_type_socialcontrib($selected = '', $htmlname = 'actioncode', $useempty = 0, $maxlen = 40, $help = 1, $morecss = 'minwidth300', $noerrorifempty = 0)
-    {
-        // phpcs:enable
-        global $conf, $db, $langs, $user, $mysoc;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Return list of social contributions.
+	 *  Use mysoc->country_id or mysoc->country_code so they must be defined.
+	 *
+	 *	@param	string	$selected       Preselected type
+	 *	@param  string	$htmlname       Name of field in form
+	 * 	@param	int		$useempty		Set to 1 if we want an empty value
+	 * 	@param	int		$maxlen			Max length of text in combo box
+	 * 	@param	int		$help			Add or not the admin help picto
+	 *  @param	string	$morecss		Add more CSS on select
+	 *  @param	int		$noerrorifempty	No print error if list is empty for the country
+	 * 	@return	void
+	 */
+	public function select_type_socialcontrib($selected = '', $htmlname = 'actioncode', $useempty = 0, $maxlen = 40, $help = 1, $morecss = 'minwidth300', $noerrorifempty = 0)
+	{
+		// phpcs:enable
+		global $conf, $db, $langs, $user, $mysoc;
 
-        if (empty($mysoc->country_id) && empty($mysoc->country_code))
-        {
-        	print $langs->trans("ErrorSetupOfCountryMustBeDone");
+		if (empty($mysoc->country_id) && empty($mysoc->country_code))
+		{
+			print $langs->trans("ErrorSetupOfCountryMustBeDone");
 			return;
-        }
+		}
 
-        if (!empty($mysoc->country_id))
-        {
-            $sql = "SELECT c.id, c.libelle as type";
-            $sql .= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c";
-            $sql .= " WHERE c.active = 1";
-            $sql .= " AND c.fk_pays = ".$mysoc->country_id;
-            $sql .= " ORDER BY c.libelle ASC";
-        } else {
-            $sql = "SELECT c.id, c.libelle as type";
-            $sql .= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c, ".MAIN_DB_PREFIX."c_country as co";
-            $sql .= " WHERE c.active = 1 AND c.fk_pays = co.rowid";
-            $sql .= " AND co.code = '".$this->db->escape($mysoc->country_code)."'";
-            $sql .= " ORDER BY c.libelle ASC";
-        }
+		if (!empty($mysoc->country_id))
+		{
+			$sql = "SELECT c.id, c.libelle as type";
+			$sql .= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c";
+			$sql .= " WHERE c.active = 1";
+			$sql .= " AND c.fk_pays = ".$mysoc->country_id;
+			$sql .= " ORDER BY c.libelle ASC";
+		} else {
+			$sql = "SELECT c.id, c.libelle as type";
+			$sql .= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c, ".MAIN_DB_PREFIX."c_country as co";
+			$sql .= " WHERE c.active = 1 AND c.fk_pays = co.rowid";
+			$sql .= " AND co.code = '".$this->db->escape($mysoc->country_code)."'";
+			$sql .= " ORDER BY c.libelle ASC";
+		}
 
-        dol_syslog("Form::select_type_socialcontrib", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-        	$num = $this->db->num_rows($resql);
-            if ($num)
-            {
-            	print '<select class="'.($morecss ? $morecss : '').'" id="'.$htmlname.'" name="'.$htmlname.'">';
-                $i = 0;
+		dol_syslog("Form::select_type_socialcontrib", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$num = $this->db->num_rows($resql);
+			if ($num)
+			{
+				print '<select class="'.($morecss ? $morecss : '').'" id="'.$htmlname.'" name="'.$htmlname.'">';
+				$i = 0;
 
-                if ($useempty) print '<option value="0">&nbsp;</option>';
-                while ($i < $num)
-                {
-                	$obj = $this->db->fetch_object($resql);
-                    print '<option value="'.$obj->id.'"';
-                    if ($obj->id == $selected) print ' selected';
-                    print '>'.dol_trunc($obj->type, $maxlen);
-                    $i++;
-                }
-                print '</select>';
-                if ($user->admin && $help) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
-                if (!empty($conf->use_javascript_ajax)) print ajax_combobox($htmlname);
-            } else {
-            	if (empty($noerrorifempty)) print $langs->trans("ErrorNoSocialContributionForSellerCountry", $mysoc->country_code);
-            }
-        } else {
-        	dol_print_error($this->db);
-        }
-    }
+				if ($useempty) print '<option value="0">&nbsp;</option>';
+				while ($i < $num)
+				{
+					$obj = $this->db->fetch_object($resql);
+					print '<option value="'.$obj->id.'"';
+					if ($obj->id == $selected) print ' selected';
+					print '>'.dol_trunc($obj->type, $maxlen);
+					$i++;
+				}
+				print '</select>';
+				if ($user->admin && $help) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+				if (!empty($conf->use_javascript_ajax)) print ajax_combobox($htmlname);
+			} else {
+				if (empty($noerrorifempty)) print $langs->trans("ErrorNoSocialContributionForSellerCountry", $mysoc->country_code);
+			}
+		} else {
+			dol_print_error($this->db);
+		}
+	}
 }
diff --git a/htdocs/core/class/html.formticket.class.php b/htdocs/core/class/html.formticket.class.php
index d83aa3cc19a..8b1618c8da9 100644
--- a/htdocs/core/class/html.formticket.class.php
+++ b/htdocs/core/class/html.formticket.class.php
@@ -422,7 +422,7 @@ class FormTicket
 
 		print '</table>';
 
-		if ($withdolfichehead) dol_fiche_end();
+		if ($withdolfichehead) print dol_get_fiche_end();
 
 		print '<div class="center">';
 		print '<input class="button" type="submit" name="add" value="'.$langs->trans(($this->withthreadid > 0 ? "SendResponse" : "NewTicket")).'" />';
diff --git a/htdocs/core/class/html.formwebsite.class.php b/htdocs/core/class/html.formwebsite.class.php
index c656f5e39ee..763a7bbe64f 100644
--- a/htdocs/core/class/html.formwebsite.class.php
+++ b/htdocs/core/class/html.formwebsite.class.php
@@ -27,263 +27,263 @@
  */
 class FormWebsite
 {
-    private $db;
+	private $db;
 
-    /**
+	/**
 	 * @var string Error code (or message)
 	 */
 	public $error;
 
 
-    /**
-     *	Constructor
-     *
-     *	@param	DoliDB		$db      Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-    }
+	/**
+	 *	Constructor
+	 *
+	 *	@param	DoliDB		$db      Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
 
 
-    /**
-     *    Return HTML select list of websites
-     *
-     *    @param    string	$selected          Id modele pre-selectionne
-     *    @param    string	$htmlname          Name of HTML select
-     *    @param    int		$useempty          Show empty value or not
-     *    @return	string					   Html component
-     */
-    public function selectWebsite($selected = '', $htmlname = 'exportmodelid', $useempty = 0)
-    {
-        $out = '';
+	/**
+	 *    Return HTML select list of websites
+	 *
+	 *    @param    string	$selected          Id modele pre-selectionne
+	 *    @param    string	$htmlname          Name of HTML select
+	 *    @param    int		$useempty          Show empty value or not
+	 *    @return	string					   Html component
+	 */
+	public function selectWebsite($selected = '', $htmlname = 'exportmodelid', $useempty = 0)
+	{
+		$out = '';
 
-        $sql = "SELECT rowid, ref";
-        $sql .= " FROM ".MAIN_DB_PREFIX."website";
-        $sql .= " WHERE 1 = 1";
-        $sql .= " ORDER BY rowid";
-        $result = $this->db->query($sql);
-        if ($result)
-        {
-            $out .= '<select class="flat minwidth100" name="'.$htmlname.'" id="'.$htmlname.'">';
-            if ($useempty)
-            {
-                $out .= '<option value="-1">&nbsp;</option>';
-            }
+		$sql = "SELECT rowid, ref";
+		$sql .= " FROM ".MAIN_DB_PREFIX."website";
+		$sql .= " WHERE 1 = 1";
+		$sql .= " ORDER BY rowid";
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+			$out .= '<select class="flat minwidth100" name="'.$htmlname.'" id="'.$htmlname.'">';
+			if ($useempty)
+			{
+				$out .= '<option value="-1">&nbsp;</option>';
+			}
 
-            $num = $this->db->num_rows($result);
-            $i = 0;
-            while ($i < $num)
-            {
-                $obj = $this->db->fetch_object($result);
-                if ($selected == $obj->rowid)
-                {
-                    $out .= '<option value="'.$obj->rowid.'" selected>';
-                } else {
-                    $out .= '<option value="'.$obj->rowid.'">';
-                }
-                $out .= $obj->ref;
-                $out .= '</option>';
-                $i++;
-            }
-            $out .= "</select>";
-        } else {
-            dol_print_error($this->db);
-        }
+			$num = $this->db->num_rows($result);
+			$i = 0;
+			while ($i < $num)
+			{
+				$obj = $this->db->fetch_object($result);
+				if ($selected == $obj->rowid)
+				{
+					$out .= '<option value="'.$obj->rowid.'" selected>';
+				} else {
+					$out .= '<option value="'.$obj->rowid.'">';
+				}
+				$out .= $obj->ref;
+				$out .= '</option>';
+				$i++;
+			}
+			$out .= "</select>";
+		} else {
+			dol_print_error($this->db);
+		}
 
-        return $out;
-    }
+		return $out;
+	}
 
 
-    /**
-     *  Return a HTML select list of type of containers from the dictionary
-     *
-     *  @param  string	$htmlname          	Name of select zone
-     *  @param	string	$selected			Selected value
-     *  @param  int		$useempty          	1=Add an empty value in list, 2=Add an empty value in list only if there is more than 2 entries.
-     *  @param  string  $moreattrib         More attributes on HTML select tag
-     * 	@return	void
-     */
-    public function selectTypeOfContainer($htmlname, $selected = '', $useempty = 0, $moreattrib = '')
-    {
-        global $langs, $conf, $user;
+	/**
+	 *  Return a HTML select list of type of containers from the dictionary
+	 *
+	 *  @param  string	$htmlname          	Name of select zone
+	 *  @param	string	$selected			Selected value
+	 *  @param  int		$useempty          	1=Add an empty value in list, 2=Add an empty value in list only if there is more than 2 entries.
+	 *  @param  string  $moreattrib         More attributes on HTML select tag
+	 * 	@return	void
+	 */
+	public function selectTypeOfContainer($htmlname, $selected = '', $useempty = 0, $moreattrib = '')
+	{
+		global $langs, $conf, $user;
 
-        $langs->load("admin");
+		$langs->load("admin");
 
-        $sql = "SELECT rowid, code, label, entity";
-        $sql .= " FROM ".MAIN_DB_PREFIX.'c_type_container';
-        $sql .= " WHERE active = 1 AND entity IN (".getEntity('c_type_container').")";
-        $sql .= " ORDER BY label";
+		$sql = "SELECT rowid, code, label, entity";
+		$sql .= " FROM ".MAIN_DB_PREFIX.'c_type_container';
+		$sql .= " WHERE active = 1 AND entity IN (".getEntity('c_type_container').")";
+		$sql .= " ORDER BY label";
 
-    	dol_syslog(get_class($this)."::selectTypeOfContainer", LOG_DEBUG);
-    	$result = $this->db->query($sql);
-    	if ($result)
-    	{
-    		$num = $this->db->num_rows($result);
-    		$i = 0;
-    		if ($num)
-    		{
-    			print '<select id="select'.$htmlname.'" class="flat selectTypeOfContainer" name="'.$htmlname.'"'.($moreattrib ? ' '.$moreattrib : '').'>';
-    			if ($useempty == 1 || ($useempty == 2 && $num > 1))
-    			{
-    				print '<option value="-1">&nbsp;</option>';
-    			}
+		dol_syslog(get_class($this)."::selectTypeOfContainer", LOG_DEBUG);
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+			$num = $this->db->num_rows($result);
+			$i = 0;
+			if ($num)
+			{
+				print '<select id="select'.$htmlname.'" class="flat selectTypeOfContainer" name="'.$htmlname.'"'.($moreattrib ? ' '.$moreattrib : '').'>';
+				if ($useempty == 1 || ($useempty == 2 && $num > 1))
+				{
+					print '<option value="-1">&nbsp;</option>';
+				}
 
-    			while ($i < $num)
-    			{
-    				$obj = $this->db->fetch_object($result);
-    				if ($selected == $obj->rowid || $selected == $obj->code)
-    				{
-    					print '<option value="'.$obj->code.'" selected>';
-    				} else {
-    					print '<option value="'.$obj->code.'">';
-    				}
-    				print $obj->label;
-    				print '</option>';
-    				$i++;
-    			}
-    			print "</select>";
-    			if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
-    		} else {
-    			print $langs->trans("NoTypeOfPagePleaseEditDictionary");
-    		}
-    	} else {
-    		dol_print_error($this->db);
-    	}
-    }
+				while ($i < $num)
+				{
+					$obj = $this->db->fetch_object($result);
+					if ($selected == $obj->rowid || $selected == $obj->code)
+					{
+						print '<option value="'.$obj->code.'" selected>';
+					} else {
+						print '<option value="'.$obj->code.'">';
+					}
+					print $obj->label;
+					print '</option>';
+					$i++;
+				}
+				print "</select>";
+				if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+			} else {
+				print $langs->trans("NoTypeOfPagePleaseEditDictionary");
+			}
+		} else {
+			dol_print_error($this->db);
+		}
+	}
 
 
-    /**
-     *  Return a HTML select list of samples of containers content
-     *
-     *  @param  string	$htmlname          	Name of select zone
-     *  @param	string	$selected			Selected value
-     *  @param  int		$useempty          	1=Add an empty value in list
-     *  @param  string  $moreattrib         More attributes on HTML select tag
-     * 	@return	string						HTML select component with list of type of containers
-     */
-    public function selectSampleOfContainer($htmlname, $selected = '', $useempty = 0, $moreattrib = '')
-    {
-    	global $langs, $conf, $user;
+	/**
+	 *  Return a HTML select list of samples of containers content
+	 *
+	 *  @param  string	$htmlname          	Name of select zone
+	 *  @param	string	$selected			Selected value
+	 *  @param  int		$useempty          	1=Add an empty value in list
+	 *  @param  string  $moreattrib         More attributes on HTML select tag
+	 * 	@return	string						HTML select component with list of type of containers
+	 */
+	public function selectSampleOfContainer($htmlname, $selected = '', $useempty = 0, $moreattrib = '')
+	{
+		global $langs, $conf, $user;
 
-    	$langs->load("admin");
+		$langs->load("admin");
 
-    	$listofsamples = dol_dir_list(DOL_DOCUMENT_ROOT.'/website/samples', 'files', 0, '^page-sample-.*\.html$');
+		$listofsamples = dol_dir_list(DOL_DOCUMENT_ROOT.'/website/samples', 'files', 0, '^page-sample-.*\.html$');
 
-    	$arrayofsamples = array();
-    	$arrayofsamples['empty'] = 'EmptyPage'; // Always this one first
-    	foreach ($listofsamples as $sample)
-    	{
-    		$reg = array();
-    		if (preg_match('/^page-sample-(.*)\.html$/', $sample['name'], $reg))
-    		{
-    			$key = $reg[1];
-	    		$labelkey = ucfirst($key);
-    			if ($key == 'empty') $labelkey = 'EmptyPage';
-    			$arrayofsamples[$key] = $labelkey;
-    		}
-    	}
+		$arrayofsamples = array();
+		$arrayofsamples['empty'] = 'EmptyPage'; // Always this one first
+		foreach ($listofsamples as $sample)
+		{
+			$reg = array();
+			if (preg_match('/^page-sample-(.*)\.html$/', $sample['name'], $reg))
+			{
+				$key = $reg[1];
+				$labelkey = ucfirst($key);
+				if ($key == 'empty') $labelkey = 'EmptyPage';
+				$arrayofsamples[$key] = $labelkey;
+			}
+		}
 
-    	$out = '';
-    	$out .= '<select id="select'.$htmlname.'" class="flat selectTypeOfContainer" name="'.$htmlname.'"'.($moreattrib ? ' '.$moreattrib : '').'>';
+		$out = '';
+		$out .= '<select id="select'.$htmlname.'" class="flat selectTypeOfContainer" name="'.$htmlname.'"'.($moreattrib ? ' '.$moreattrib : '').'>';
 
-    	if ($useempty == 1 || $useempty == 2)
-    	{
-    		$out .= '<option value="-1">&nbsp;</option>';
-    	}
+		if ($useempty == 1 || $useempty == 2)
+		{
+			$out .= '<option value="-1">&nbsp;</option>';
+		}
 
-    	foreach ($arrayofsamples as $key => $val)
-    	{
-    		if ($selected == $key)
-    		{
-    			$out .= '<option value="'.$key.'" selected>';
-    		} else {
-    			$out .= '<option value="'.$key.'">';
-    		}
-    		$out .= $langs->trans($val);
-    		$out .= '</option>';
-    	}
-    	$out .= "</select>";
+		foreach ($arrayofsamples as $key => $val)
+		{
+			if ($selected == $key)
+			{
+				$out .= '<option value="'.$key.'" selected>';
+			} else {
+				$out .= '<option value="'.$key.'">';
+			}
+			$out .= $langs->trans($val);
+			$out .= '</option>';
+		}
+		$out .= "</select>";
 
-    	return $out;
-    }
+		return $out;
+	}
 
 
-    /**
-     *  Return a HTML select list of containers of a website.
-     *  Note: $website->lines must have been loaded.
-     *
-     *  @param  Website		$website       	Object Website
-     *  @param	string		$htmlname		Name of select zone
-     *  @param	int			$pageid			Preselected container ID
-     *  @param	int			$showempty		Show empty record
-     *  @param	string		$action			Action on page that use this select list
-     *  @param	string		$morecss		More CSS
-     *  @param	array		$excludeids		Exclude some ID in list
-     * 	@return	string						HTML select component with list of type of containers
-     */
-    public function selectContainer($website, $htmlname = 'pageid', $pageid = 0, $showempty = 0, $action = '', $morecss = 'minwidth200', $excludeids = null)
-    {
-    	global $langs;
+	/**
+	 *  Return a HTML select list of containers of a website.
+	 *  Note: $website->lines must have been loaded.
+	 *
+	 *  @param  Website		$website       	Object Website
+	 *  @param	string		$htmlname		Name of select zone
+	 *  @param	int			$pageid			Preselected container ID
+	 *  @param	int			$showempty		Show empty record
+	 *  @param	string		$action			Action on page that use this select list
+	 *  @param	string		$morecss		More CSS
+	 *  @param	array		$excludeids		Exclude some ID in list
+	 * 	@return	string						HTML select component with list of type of containers
+	 */
+	public function selectContainer($website, $htmlname = 'pageid', $pageid = 0, $showempty = 0, $action = '', $morecss = 'minwidth200', $excludeids = null)
+	{
+		global $langs;
 
-    	$atleastonepage = (is_array($website->lines) && count($website->lines) > 0);
+		$atleastonepage = (is_array($website->lines) && count($website->lines) > 0);
 
-	    $out = '';
-	    if ($atleastonepage && $action != 'editsource')
-	    {
-	    	$out .= '<select name="'.$htmlname.'" id="'.$htmlname.'" class="maxwidth300'.($morecss ? ' '.$morecss : '').'">';
-	    } else {
-	    	$out .= '<select name="pageidbis" id="pageid" class="maxwidth300'.($morecss ? ' '.$morecss : '').'" disabled="disabled">';
-	    }
+		$out = '';
+		if ($atleastonepage && $action != 'editsource')
+		{
+			$out .= '<select name="'.$htmlname.'" id="'.$htmlname.'" class="maxwidth300'.($morecss ? ' '.$morecss : '').'">';
+		} else {
+			$out .= '<select name="pageidbis" id="pageid" class="maxwidth300'.($morecss ? ' '.$morecss : '').'" disabled="disabled">';
+		}
 
-	    if ($showempty || !$atleastonepage) $out .= '<option value="-1">&nbsp;</option>';
+		if ($showempty || !$atleastonepage) $out .= '<option value="-1">&nbsp;</option>';
 
-	    if ($atleastonepage)
-	    {
-	    	if (empty($pageid) && $action != 'createcontainer')      // Page id is not defined, we try to take one
-	    	{
-	    		$firstpageid = 0; $homepageid = 0;
-	    		foreach ($website->lines as $key => $valpage)
-	    		{
-	    			if (empty($firstpageid)) $firstpageid = $valpage->id;
-	    			if ($website->fk_default_home && $key == $website->fk_default_home) $homepageid = $valpage->id;
-	    		}
-	    		$pageid = $homepageid ? $homepageid : $firstpageid; // We choose home page and if not defined yet, we take first page
-	    	}
+		if ($atleastonepage)
+		{
+			if (empty($pageid) && $action != 'createcontainer')      // Page id is not defined, we try to take one
+			{
+				$firstpageid = 0; $homepageid = 0;
+				foreach ($website->lines as $key => $valpage)
+				{
+					if (empty($firstpageid)) $firstpageid = $valpage->id;
+					if ($website->fk_default_home && $key == $website->fk_default_home) $homepageid = $valpage->id;
+				}
+				$pageid = $homepageid ? $homepageid : $firstpageid; // We choose home page and if not defined yet, we take first page
+			}
 
-	    	foreach ($website->lines as $key => $valpage)
-	    	{
-	    		if (is_array($excludeids) && count($excludeids) && in_array($valpage->id, $excludeids)) continue;
+			foreach ($website->lines as $key => $valpage)
+			{
+				if (is_array($excludeids) && count($excludeids) && in_array($valpage->id, $excludeids)) continue;
 
-	    		$valueforoption = '<span class="opacitymedium">['.$valpage->type_container.' '.sprintf("%03d", $valpage->id).']</span> ';
-	    		$valueforoption .= $valpage->pageurl.' - '.$valpage->title;
-	    		if ($website->otherlang) {	// If there is alternative lang for this web site, we show the language code
-	    			if ($valpage->lang) {
-	    				$valueforoption .= ' <span class="opacitymedium">('.$valpage->lang.')</span>';
-	    			}
-	    		}
-	    		if ($website->fk_default_home && $key == $website->fk_default_home) {
-	    			//$valueforoption .= ' <span class="opacitymedium">('.$langs->trans("HomePage").')</span>';
-	    			$valueforoption .= ' <span class="opacitymedium fa fa-home"></span>';
-	    		}
+				$valueforoption = '<span class="opacitymedium">['.$valpage->type_container.' '.sprintf("%03d", $valpage->id).']</span> ';
+				$valueforoption .= $valpage->pageurl.' - '.$valpage->title;
+				if ($website->otherlang) {	// If there is alternative lang for this web site, we show the language code
+					if ($valpage->lang) {
+						$valueforoption .= ' <span class="opacitymedium">('.$valpage->lang.')</span>';
+					}
+				}
+				if ($website->fk_default_home && $key == $website->fk_default_home) {
+					//$valueforoption .= ' <span class="opacitymedium">('.$langs->trans("HomePage").')</span>';
+					$valueforoption .= ' <span class="opacitymedium fa fa-home"></span>';
+				}
 
-	    		$out .= '<option value="'.$key.'"';
-	    		if ($pageid > 0 && $pageid == $key) $out .= ' selected'; // To preselect a value
-	    		$out .= ' data-html="'.dol_escape_htmltag($valueforoption).'"';
-	    		$out .= '>';
-	    		$out .= $valueforoption;
-	    		$out .= '</option>';
-	    	}
-	    }
-	    $out .= '</select>';
+				$out .= '<option value="'.$key.'"';
+				if ($pageid > 0 && $pageid == $key) $out .= ' selected'; // To preselect a value
+				$out .= ' data-html="'.dol_escape_htmltag($valueforoption).'"';
+				$out .= '>';
+				$out .= $valueforoption;
+				$out .= '</option>';
+			}
+		}
+		$out .= '</select>';
 
-	    if ($atleastonepage && $action != 'editsource')
-	    {
-	    	$out .= ajax_combobox($htmlname);
-	    } else {
-	    	$out .= '<input type="hidden" name="'.$htmlname.'" value="'.$pageid.'">';
-	    	$out .= ajax_combobox($htmlname);
-	    }
-	    return $out;
+		if ($atleastonepage && $action != 'editsource')
+		{
+			$out .= ajax_combobox($htmlname);
+		} else {
+			$out .= '<input type="hidden" name="'.$htmlname.'" value="'.$pageid.'">';
+			$out .= ajax_combobox($htmlname);
+		}
+		return $out;
 	}
 }
diff --git a/htdocs/core/class/infobox.class.php b/htdocs/core/class/infobox.class.php
index 26edc402880..a4cb7a603dd 100644
--- a/htdocs/core/class/infobox.class.php
+++ b/htdocs/core/class/infobox.class.php
@@ -28,21 +28,21 @@
  */
 class InfoBox
 {
-    /**
-     * Name of positions (See below)
-     *
-     * @return	string[]		Array with list of zones
-     */
-    public static function getListOfPagesForBoxes()
-    {
+	/**
+	 * Name of positions (See below)
+	 *
+	 * @return	string[]		Array with list of zones
+	 */
+	public static function getListOfPagesForBoxes()
+	{
 		global $conf;
 
 		if (empty($conf->global->MAIN_FEATURES_LEVEL) || $conf->global->MAIN_FEATURES_LEVEL < 2)
 		{
-        	return array(
-        		0 => 'Home',
-        		27 => 'AccountancyHome'
-        	);
+			return array(
+				0 => 'Home',
+				27 => 'AccountancyHome'
+			);
 		} else {
 			return array(
 				0 => 'Home',
@@ -75,237 +75,237 @@ class InfoBox
 				27 => 'AccountancyHome'
 			);
 		}
-    }
+	}
 
-    /**
-     *  Return array of boxes qualified for area and user
-     *
-     *  @param	DoliDB		$db				Database handler
-     *  @param	string		$mode			'available' or 'activated'
-     *  @param	string		$zone			Name or area (-1 for all, 0 for Homepage, 1 for Accountancy, 2 for xxx, ...)
-     *  @param  User|null   $user	  		Object user to filter
-     *  @param	array		$excludelist	Array of box id (box.box_id = boxes_def.rowid) to exclude
-     *  @param  int         $includehidden  Include also hidden boxes
-     *  @return array       	        	Array of boxes
-     */
-    public static function listBoxes($db, $mode, $zone, $user = null, $excludelist = array(), $includehidden = 1)
-    {
-        global $conf;
+	/**
+	 *  Return array of boxes qualified for area and user
+	 *
+	 *  @param	DoliDB		$db				Database handler
+	 *  @param	string		$mode			'available' or 'activated'
+	 *  @param	string		$zone			Name or area (-1 for all, 0 for Homepage, 1 for Accountancy, 2 for xxx, ...)
+	 *  @param  User|null   $user	  		Object user to filter
+	 *  @param	array		$excludelist	Array of box id (box.box_id = boxes_def.rowid) to exclude
+	 *  @param  int         $includehidden  Include also hidden boxes
+	 *  @return array       	        	Array of boxes
+	 */
+	public static function listBoxes($db, $mode, $zone, $user = null, $excludelist = array(), $includehidden = 1)
+	{
+		global $conf;
 
-        $boxes = array();
+		$boxes = array();
 
-        $confuserzone = 'MAIN_BOXES_'.$zone;
-        if ($mode == 'activated')	// activated
-        {
-            $sql = "SELECT b.rowid, b.position, b.box_order, b.fk_user,";
-            $sql .= " d.rowid as box_id, d.file, d.note, d.tms";
-            $sql .= " FROM ".MAIN_DB_PREFIX."boxes as b, ".MAIN_DB_PREFIX."boxes_def as d";
-            $sql .= " WHERE b.box_id = d.rowid";
-            $sql .= " AND b.entity IN (0,".$conf->entity.")";
-            if ($zone >= 0) $sql .= " AND b.position = ".$zone;
-            if (is_object($user)) $sql .= " AND b.fk_user IN (0,".$user->id.")";
-            else $sql .= " AND b.fk_user = 0";
-            $sql .= " ORDER BY b.box_order";
-        } else // available
-        {
-            $sql = "SELECT d.rowid as box_id, d.file, d.note, d.tms";
-            $sql .= " FROM ".MAIN_DB_PREFIX."boxes_def as d";
-            $sql .= " WHERE d.entity IN (0,".$conf->entity.")";
-        }
+		$confuserzone = 'MAIN_BOXES_'.$zone;
+		if ($mode == 'activated')	// activated
+		{
+			$sql = "SELECT b.rowid, b.position, b.box_order, b.fk_user,";
+			$sql .= " d.rowid as box_id, d.file, d.note, d.tms";
+			$sql .= " FROM ".MAIN_DB_PREFIX."boxes as b, ".MAIN_DB_PREFIX."boxes_def as d";
+			$sql .= " WHERE b.box_id = d.rowid";
+			$sql .= " AND b.entity IN (0,".$conf->entity.")";
+			if ($zone >= 0) $sql .= " AND b.position = ".$zone;
+			if (is_object($user)) $sql .= " AND b.fk_user IN (0,".$user->id.")";
+			else $sql .= " AND b.fk_user = 0";
+			$sql .= " ORDER BY b.box_order";
+		} else // available
+		{
+			$sql = "SELECT d.rowid as box_id, d.file, d.note, d.tms";
+			$sql .= " FROM ".MAIN_DB_PREFIX."boxes_def as d";
+			$sql .= " WHERE d.entity IN (0,".$conf->entity.")";
+		}
 
-        dol_syslog(get_class()."::listBoxes get default box list for mode=".$mode." userid=".(is_object($user) ? $user->id : '')."", LOG_DEBUG);
-        $resql = $db->query($sql);
-        if ($resql)
-        {
-            $num = $db->num_rows($resql);
-            $j = 0;
-            while ($j < $num)
-            {
-                $obj = $db->fetch_object($resql);
+		dol_syslog(get_class()."::listBoxes get default box list for mode=".$mode." userid=".(is_object($user) ? $user->id : '')."", LOG_DEBUG);
+		$resql = $db->query($sql);
+		if ($resql)
+		{
+			$num = $db->num_rows($resql);
+			$j = 0;
+			while ($j < $num)
+			{
+				$obj = $db->fetch_object($resql);
 
-                if (!in_array($obj->box_id, $excludelist))
-                {
-                	$regs = array();
-                    if (preg_match('/^([^@]+)@([^@]+)$/i', $obj->file, $regs))
-                    {
-                        $boxname = preg_replace('/\.php$/i', '', $regs[1]);
-                        $module = $regs[2];
-                        $relsourcefile = "/".$module."/core/boxes/".$boxname.".php";
-                    } else {
-                        $boxname = preg_replace('/\.php$/i', '', $obj->file);
-                        $relsourcefile = "/core/boxes/".$boxname.".php";
-                    }
+				if (!in_array($obj->box_id, $excludelist))
+				{
+					$regs = array();
+					if (preg_match('/^([^@]+)@([^@]+)$/i', $obj->file, $regs))
+					{
+						$boxname = preg_replace('/\.php$/i', '', $regs[1]);
+						$module = $regs[2];
+						$relsourcefile = "/".$module."/core/boxes/".$boxname.".php";
+					} else {
+						$boxname = preg_replace('/\.php$/i', '', $obj->file);
+						$relsourcefile = "/core/boxes/".$boxname.".php";
+					}
 
-                    //print $obj->box_id.'-'.$boxname.'-'.$relsourcefile.'<br>';
+					//print $obj->box_id.'-'.$boxname.'-'.$relsourcefile.'<br>';
 
-                    // TODO PERF Do not make "dol_include_once" here, nor "new" later. This means, we must store a 'depends' field to store modules list, then
-                    // the "enabled" condition for modules forbidden for external users and the depends condition can be done.
-                    // Goal is to avoid making a "new" done for each boxes returned by select.
-                    dol_include_once($relsourcefile);
-                    if (class_exists($boxname))
-                    {
-                        $box = new $boxname($db, $obj->note); // Constructor may set properties like box->enabled. obj->note is note into box def, not user params.
-                        //$box=new stdClass();
+					// TODO PERF Do not make "dol_include_once" here, nor "new" later. This means, we must store a 'depends' field to store modules list, then
+					// the "enabled" condition for modules forbidden for external users and the depends condition can be done.
+					// Goal is to avoid making a "new" done for each boxes returned by select.
+					dol_include_once($relsourcefile);
+					if (class_exists($boxname))
+					{
+						$box = new $boxname($db, $obj->note); // Constructor may set properties like box->enabled. obj->note is note into box def, not user params.
+						//$box=new stdClass();
 
-                        // box properties
-                        $box->rowid = (empty($obj->rowid) ? '' : $obj->rowid);
-                        $box->id = (empty($obj->box_id) ? '' : $obj->box_id);
-                        $box->position = ($obj->position == '' ? '' : $obj->position); // '0' must stay '0'
-                        $box->box_order	= (empty($obj->box_order) ? '' : $obj->box_order);
-                        $box->fk_user = (empty($obj->fk_user) ? 0 : $obj->fk_user);
-                        $box->sourcefile = $relsourcefile;
-                        $box->class     = $boxname;
+						// box properties
+						$box->rowid = (empty($obj->rowid) ? '' : $obj->rowid);
+						$box->id = (empty($obj->box_id) ? '' : $obj->box_id);
+						$box->position = ($obj->position == '' ? '' : $obj->position); // '0' must stay '0'
+						$box->box_order	= (empty($obj->box_order) ? '' : $obj->box_order);
+						$box->fk_user = (empty($obj->fk_user) ? 0 : $obj->fk_user);
+						$box->sourcefile = $relsourcefile;
+						$box->class     = $boxname;
 
-                        if ($mode == 'activated' && !is_object($user))	// List of activated box was not yet personalized into database
-                        {
-                            if (is_numeric($box->box_order))
-                            {
-                                if ($box->box_order % 2 == 1) $box->box_order = 'A'.$box->box_order;
-                                elseif ($box->box_order % 2 == 0) $box->box_order = 'B'.$box->box_order;
-                            }
-                        }
-                        // box_def properties
-                        $box->box_id = (empty($obj->box_id) ? '' : $obj->box_id);
-                        $box->note = (empty($obj->note) ? '' : $obj->note);
+						if ($mode == 'activated' && !is_object($user))	// List of activated box was not yet personalized into database
+						{
+							if (is_numeric($box->box_order))
+							{
+								if ($box->box_order % 2 == 1) $box->box_order = 'A'.$box->box_order;
+								elseif ($box->box_order % 2 == 0) $box->box_order = 'B'.$box->box_order;
+							}
+						}
+						// box_def properties
+						$box->box_id = (empty($obj->box_id) ? '' : $obj->box_id);
+						$box->note = (empty($obj->note) ? '' : $obj->note);
 
-                        // Filter on box->enabled (used for example by box_comptes)
-                        // Filter also on box->depends. Example: array("product|service") or array("contrat", "service")
-                        $enabled = $box->enabled;
-                        if (isset($box->depends) && count($box->depends) > 0)
-                        {
-                            foreach ($box->depends as $moduleelem)
-                            {
-                                $arrayelem = explode('|', $moduleelem);
-                                $tmpenabled = 0; // $tmpenabled is used for the '|' test (OR)
-                                foreach ($arrayelem as $module)
-                                {
-                                    $tmpmodule = preg_replace('/@[^@]+/', '', $module);
-                                    if (!empty($conf->$tmpmodule->enabled)) $tmpenabled = 1;
-                                    //print $boxname.'-'.$module.'-module enabled='.(empty($conf->$tmpmodule->enabled)?0:1).'<br>';
-                                }
-                                if (empty($tmpenabled))	// We found at least one module required that is disabled
-                                {
-                                    $enabled = 0;
-                                    break;
-                                }
-                            }
-                        }
-                        //print '=>'.$boxname.'-enabled='.$enabled.'<br>';
+						// Filter on box->enabled (used for example by box_comptes)
+						// Filter also on box->depends. Example: array("product|service") or array("contrat", "service")
+						$enabled = $box->enabled;
+						if (isset($box->depends) && count($box->depends) > 0)
+						{
+							foreach ($box->depends as $moduleelem)
+							{
+								$arrayelem = explode('|', $moduleelem);
+								$tmpenabled = 0; // $tmpenabled is used for the '|' test (OR)
+								foreach ($arrayelem as $module)
+								{
+									$tmpmodule = preg_replace('/@[^@]+/', '', $module);
+									if (!empty($conf->$tmpmodule->enabled)) $tmpenabled = 1;
+									//print $boxname.'-'.$module.'-module enabled='.(empty($conf->$tmpmodule->enabled)?0:1).'<br>';
+								}
+								if (empty($tmpenabled))	// We found at least one module required that is disabled
+								{
+									$enabled = 0;
+									break;
+								}
+							}
+						}
+						//print '=>'.$boxname.'-enabled='.$enabled.'<br>';
 
-                        //print 'xx module='.$module.' enabled='.$enabled;
-                        if ($enabled && ($includehidden || empty($box->hidden))) $boxes[] = $box;
-                        else unset($box);
-                    } else {
-                        dol_syslog("Failed to load box '".$boxname."' into file '".$relsourcefile."'", LOG_WARNING);
-                    }
-                }
-                $j++;
-            }
-        } else {
-            dol_syslog($db->lasterror(), LOG_ERR);
-            return array('error'=>$db->lasterror());
-        }
+						//print 'xx module='.$module.' enabled='.$enabled;
+						if ($enabled && ($includehidden || empty($box->hidden))) $boxes[] = $box;
+						else unset($box);
+					} else {
+						dol_syslog("Failed to load box '".$boxname."' into file '".$relsourcefile."'", LOG_WARNING);
+					}
+				}
+				$j++;
+			}
+		} else {
+			dol_syslog($db->lasterror(), LOG_ERR);
+			return array('error'=>$db->lasterror());
+		}
 
-        return $boxes;
-    }
+		return $boxes;
+	}
 
 
-    /**
-     *  Save order of boxes for area and user
-     *
-     *  @param	DoliDB	$db				Database handler
-     *  @param	string	$zone       	Name of area (0 for Homepage, ...)
-     *  @param  string  $boxorder   	List of boxes with correct order 'A:123,456,...-B:789,321...'
-     *  @param  int     $userid     	Id of user
-     *  @return int                   	<0 if KO, 0=Nothing done, > 0 if OK
-     */
-    public static function saveboxorder($db, $zone, $boxorder, $userid = 0)
-    {
-        global $conf;
+	/**
+	 *  Save order of boxes for area and user
+	 *
+	 *  @param	DoliDB	$db				Database handler
+	 *  @param	string	$zone       	Name of area (0 for Homepage, ...)
+	 *  @param  string  $boxorder   	List of boxes with correct order 'A:123,456,...-B:789,321...'
+	 *  @param  int     $userid     	Id of user
+	 *  @return int                   	<0 if KO, 0=Nothing done, > 0 if OK
+	 */
+	public static function saveboxorder($db, $zone, $boxorder, $userid = 0)
+	{
+		global $conf;
 
-        $error = 0;
+		$error = 0;
 
-        require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
-        dol_syslog(get_class()."::saveboxorder zone=".$zone." userid=".$userid);
+		dol_syslog(get_class()."::saveboxorder zone=".$zone." userid=".$userid);
 
-        if (!$userid || $userid == 0) return 0;
+		if (!$userid || $userid == 0) return 0;
 
-        $user = new User($db);
-        $user->id = $userid;
+		$user = new User($db);
+		$user->id = $userid;
 
-        $db->begin();
+		$db->begin();
 
-        // Save parameters to say user has a dedicated setup
-        $tab = array();
-        $confuserzone = 'MAIN_BOXES_'.$zone;
-        $tab[$confuserzone] = 1;
-        if (dol_set_user_param($db, $conf, $user, $tab) < 0)
-        {
-            $error = $db->lasterror();
-            $db->rollback();
-            return -3;
-        }
+		// Save parameters to say user has a dedicated setup
+		$tab = array();
+		$confuserzone = 'MAIN_BOXES_'.$zone;
+		$tab[$confuserzone] = 1;
+		if (dol_set_user_param($db, $conf, $user, $tab) < 0)
+		{
+			$error = $db->lasterror();
+			$db->rollback();
+			return -3;
+		}
 
-        // Delete all lines
-        $sql = "DELETE FROM ".MAIN_DB_PREFIX."boxes";
-        $sql .= " WHERE entity = ".$conf->entity;
-        $sql .= " AND fk_user = ".$userid;
-        $sql .= " AND position = ".$zone;
+		// Delete all lines
+		$sql = "DELETE FROM ".MAIN_DB_PREFIX."boxes";
+		$sql .= " WHERE entity = ".$conf->entity;
+		$sql .= " AND fk_user = ".$userid;
+		$sql .= " AND position = ".$zone;
 
-        dol_syslog(get_class()."::saveboxorder", LOG_DEBUG);
-        $result = $db->query($sql);
-        if ($result)
-        {
-            $colonnes = explode('-', $boxorder);
-            foreach ($colonnes as $collist)
-            {
-                $part = explode(':', $collist);
-                $colonne = $part[0];
-                $list = $part[1];
-                dol_syslog(get_class()."::saveboxorder column=".$colonne.' list='.$list);
+		dol_syslog(get_class()."::saveboxorder", LOG_DEBUG);
+		$result = $db->query($sql);
+		if ($result)
+		{
+			$colonnes = explode('-', $boxorder);
+			foreach ($colonnes as $collist)
+			{
+				$part = explode(':', $collist);
+				$colonne = $part[0];
+				$list = $part[1];
+				dol_syslog(get_class()."::saveboxorder column=".$colonne.' list='.$list);
 
-                $i = 0;
-                $listarray = explode(',', $list);
-                foreach ($listarray as $id)
-                {
-                    if (is_numeric($id))
-                    {
-                        //dol_syslog("aaaaa".count($listarray));
-                        $i++;
-                        $ii = sprintf('%02d', $i);
+				$i = 0;
+				$listarray = explode(',', $list);
+				foreach ($listarray as $id)
+				{
+					if (is_numeric($id))
+					{
+						//dol_syslog("aaaaa".count($listarray));
+						$i++;
+						$ii = sprintf('%02d', $i);
 
-                        $sql = "INSERT INTO ".MAIN_DB_PREFIX."boxes";
-                        $sql .= "(box_id, position, box_order, fk_user, entity)";
-                        $sql .= " values (";
-                        $sql .= " ".$id.",";
-                        $sql .= " ".$zone.",";
-                        $sql .= " '".$db->escape($colonne.$ii)."',";
-                        $sql .= " ".$userid.",";
-                        $sql .= " ".$conf->entity;
-                        $sql .= ")";
+						$sql = "INSERT INTO ".MAIN_DB_PREFIX."boxes";
+						$sql .= "(box_id, position, box_order, fk_user, entity)";
+						$sql .= " values (";
+						$sql .= " ".$id.",";
+						$sql .= " ".$zone.",";
+						$sql .= " '".$db->escape($colonne.$ii)."',";
+						$sql .= " ".$userid.",";
+						$sql .= " ".$conf->entity;
+						$sql .= ")";
 
-                        dol_syslog(get_class()."::saveboxorder", LOG_DEBUG);
-                        $result = $db->query($sql);
-                        if ($result < 0)
-                        {
-                            $error++;
-                            break;
-                        }
-                    }
-                }
-            }
-        } else {
-        	$error++;
-        }
+						dol_syslog(get_class()."::saveboxorder", LOG_DEBUG);
+						$result = $db->query($sql);
+						if ($result < 0)
+						{
+							$error++;
+							break;
+						}
+					}
+				}
+			}
+		} else {
+			$error++;
+		}
 
-        if ($error)
-        {
-        	$db->rollback();
-        	return -2;
-        } else {
-        	$db->commit();
-        	return 1;
-        }
-    }
+		if ($error)
+		{
+			$db->rollback();
+			return -2;
+		} else {
+			$db->commit();
+			return 1;
+		}
+	}
 }
diff --git a/htdocs/core/class/interfaces.class.php b/htdocs/core/class/interfaces.class.php
index c7004eea8b4..d8c8d36d3a5 100644
--- a/htdocs/core/class/interfaces.class.php
+++ b/htdocs/core/class/interfaces.class.php
@@ -31,348 +31,348 @@ require_once DOL_DOCUMENT_ROOT.'/core/triggers/dolibarrtriggers.class.php';
  */
 class Interfaces
 {
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $dir; // Directory with all core and external triggers files
+	public $dir; // Directory with all core and external triggers files
 
-    /**
-     * @var string[] Error codes (or messages)
-     */
-    public $errors = array();
+	/**
+	 * @var string[] Error codes (or messages)
+	 */
+	public $errors = array();
 
-    /**
-     *	Constructor
-     *
-     *  @param		DoliDB		$db      Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-    }
+	/**
+	 *	Constructor
+	 *
+	 *  @param		DoliDB		$db      Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *   Function called when a Dolibarr business event occurs
-     *   This function call all qualified triggers.
-     *
-     *   @param		string		$action     Trigger event code
-     *   @param     object		$object     Objet concerned. Some context information may also be provided into array property object->context.
-     *   @param     User		$user       Objet user
-     *   @param     Translate	$langs      Objet lang
-     *   @param     Conf		$conf       Objet conf
-     *   @return    int         			Nb of triggers ran if no error, -Nb of triggers with errors otherwise.
-     */
-    public function run_triggers($action, $object, $user, $langs, $conf)
-    {
-        // phpcs:enable
-        // Check parameters
-        if (!is_object($object) || !is_object($conf))	// Error
-        {
-            $this->error = 'function run_triggers called with wrong parameters action='.$action.' object='.is_object($object).' user='.is_object($user).' langs='.is_object($langs).' conf='.is_object($conf);
-            dol_syslog(get_class($this).'::run_triggers '.$this->error, LOG_ERR);
-            $this->errors[] = $this->error;
-            return -1;
-        }
-        if (!is_object($langs))	// Warning
-        {
-            dol_syslog(get_class($this).'::run_triggers was called with wrong parameters action='.$action.' object='.is_object($object).' user='.is_object($user).' langs='.is_object($langs).' conf='.is_object($conf), LOG_WARNING);
-        }
-        if (!is_object($user))	    // Warning
-        {
-            dol_syslog(get_class($this).'::run_triggers was called with wrong parameters action='.$action.' object='.is_object($object).' user='.is_object($user).' langs='.is_object($langs).' conf='.is_object($conf), LOG_WARNING);
-            $user = new User($this->db);
-        }
-        //dol_syslog(get_class($this)."::run_triggers action=".$action." Launch run_triggers", LOG_DEBUG);
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *   Function called when a Dolibarr business event occurs
+	 *   This function call all qualified triggers.
+	 *
+	 *   @param		string		$action     Trigger event code
+	 *   @param     object		$object     Objet concerned. Some context information may also be provided into array property object->context.
+	 *   @param     User		$user       Objet user
+	 *   @param     Translate	$langs      Objet lang
+	 *   @param     Conf		$conf       Objet conf
+	 *   @return    int         			Nb of triggers ran if no error, -Nb of triggers with errors otherwise.
+	 */
+	public function run_triggers($action, $object, $user, $langs, $conf)
+	{
+		// phpcs:enable
+		// Check parameters
+		if (!is_object($object) || !is_object($conf))	// Error
+		{
+			$this->error = 'function run_triggers called with wrong parameters action='.$action.' object='.is_object($object).' user='.is_object($user).' langs='.is_object($langs).' conf='.is_object($conf);
+			dol_syslog(get_class($this).'::run_triggers '.$this->error, LOG_ERR);
+			$this->errors[] = $this->error;
+			return -1;
+		}
+		if (!is_object($langs))	// Warning
+		{
+			dol_syslog(get_class($this).'::run_triggers was called with wrong parameters action='.$action.' object='.is_object($object).' user='.is_object($user).' langs='.is_object($langs).' conf='.is_object($conf), LOG_WARNING);
+		}
+		if (!is_object($user))	    // Warning
+		{
+			dol_syslog(get_class($this).'::run_triggers was called with wrong parameters action='.$action.' object='.is_object($object).' user='.is_object($user).' langs='.is_object($langs).' conf='.is_object($conf), LOG_WARNING);
+			$user = new User($this->db);
+		}
+		//dol_syslog(get_class($this)."::run_triggers action=".$action." Launch run_triggers", LOG_DEBUG);
 
-        $nbfile = $nbtotal = $nbok = $nbko = 0;
+		$nbfile = $nbtotal = $nbok = $nbko = 0;
 
-        $files = array();
-        $modules = array();
-        $orders = array();
-        $i = 0;
+		$files = array();
+		$modules = array();
+		$orders = array();
+		$i = 0;
 
 
-        $dirtriggers = array_merge(array('/core/triggers'), $conf->modules_parts['triggers']);
-        foreach ($dirtriggers as $reldir)
-        {
-            $dir = dol_buildpath($reldir, 0);
-            $newdir = dol_osencode($dir);
-            //print "xx".$dir;exit;
+		$dirtriggers = array_merge(array('/core/triggers'), $conf->modules_parts['triggers']);
+		foreach ($dirtriggers as $reldir)
+		{
+			$dir = dol_buildpath($reldir, 0);
+			$newdir = dol_osencode($dir);
+			//print "xx".$dir;exit;
 
-            // Check if directory exists (we do not use dol_is_dir to avoir loading files.lib.php at each call)
-            if (!is_dir($newdir)) continue;
+			// Check if directory exists (we do not use dol_is_dir to avoir loading files.lib.php at each call)
+			if (!is_dir($newdir)) continue;
 
-            $handle = opendir($newdir);
-            if (is_resource($handle))
-            {
-            	$fullpathfiles = array();
-                while (($file = readdir($handle)) !== false)
-                {
-                	$reg = array();
-                    if (is_readable($newdir."/".$file) && preg_match('/^interface_([0-9]+)_([^_]+)_(.+)\.class\.php$/i', $file, $reg))
-                    {
-                        $part1 = $reg[1];
-                        $part2 = $reg[2];
-                        $part3 = $reg[3];
+			$handle = opendir($newdir);
+			if (is_resource($handle))
+			{
+				$fullpathfiles = array();
+				while (($file = readdir($handle)) !== false)
+				{
+					$reg = array();
+					if (is_readable($newdir."/".$file) && preg_match('/^interface_([0-9]+)_([^_]+)_(.+)\.class\.php$/i', $file, $reg))
+					{
+						$part1 = $reg[1];
+						$part2 = $reg[2];
+						$part3 = $reg[3];
 
-                        $nbfile++;
+						$nbfile++;
 
-                        // Check if trigger file is disabled by name
-                        if (preg_match('/NORUN$/i', $file)) continue;
-                        // Check if trigger file is for a particular module
-                        $qualified = true;
-                        if (strtolower($reg[2]) != 'all')
-                        {
-                            $module = preg_replace('/^mod/i', '', $reg[2]);
-                            $constparam = 'MAIN_MODULE_'.strtoupper($module);
-                            if (empty($conf->global->$constparam)) $qualified = false;
-                        }
+						// Check if trigger file is disabled by name
+						if (preg_match('/NORUN$/i', $file)) continue;
+						// Check if trigger file is for a particular module
+						$qualified = true;
+						if (strtolower($reg[2]) != 'all')
+						{
+							$module = preg_replace('/^mod/i', '', $reg[2]);
+							$constparam = 'MAIN_MODULE_'.strtoupper($module);
+							if (empty($conf->global->$constparam)) $qualified = false;
+						}
 
-                        if (!$qualified)
-                        {
-                            //dol_syslog(get_class($this)."::run_triggers action=".$action." Triggers for file '".$file."' need module to be enabled", LOG_DEBUG);
-                            continue;
-                        }
+						if (!$qualified)
+						{
+							//dol_syslog(get_class($this)."::run_triggers action=".$action." Triggers for file '".$file."' need module to be enabled", LOG_DEBUG);
+							continue;
+						}
 
-                        $modName = "Interface".ucfirst($reg[3]);
-                        //print "file=$file - modName=$modName\n";
-                        if (in_array($modName, $modules))    // $modules = list of modName already loaded
-                        {
-                            $langs->load("errors");
-                            dol_syslog(get_class($this)."::run_triggers action=".$action." ".$langs->trans("ErrorDuplicateTrigger", $newdir."/".$file, $fullpathfiles[$modName]), LOG_WARNING);
-                            continue;
-                        }
+						$modName = "Interface".ucfirst($reg[3]);
+						//print "file=$file - modName=$modName\n";
+						if (in_array($modName, $modules))    // $modules = list of modName already loaded
+						{
+							$langs->load("errors");
+							dol_syslog(get_class($this)."::run_triggers action=".$action." ".$langs->trans("ErrorDuplicateTrigger", $newdir."/".$file, $fullpathfiles[$modName]), LOG_WARNING);
+							continue;
+						}
 
-                        try {
-                            //print 'Todo for '.$modName." : ".$newdir.'/'.$file."\n";
-                            include_once $newdir.'/'.$file;
-                            //print 'Done for '.$modName."\n";
-                        } catch (Exception $e)
-                        {
-                            dol_syslog('ko for '.$modName." ".$e->getMessage()."\n", LOG_ERR);
-                        }
+						try {
+							//print 'Todo for '.$modName." : ".$newdir.'/'.$file."\n";
+							include_once $newdir.'/'.$file;
+							//print 'Done for '.$modName."\n";
+						} catch (Exception $e)
+						{
+							dol_syslog('ko for '.$modName." ".$e->getMessage()."\n", LOG_ERR);
+						}
 
-                        $modules[$i] = $modName;
-                        $files[$i] = $file;
-                        $fullpathfiles[$modName] = $newdir.'/'.$file;
-                        $orders[$i] = $part1.'_'.$part2.'_'.$part3; // Set sort criteria value
+						$modules[$i] = $modName;
+						$files[$i] = $file;
+						$fullpathfiles[$modName] = $newdir.'/'.$file;
+						$orders[$i] = $part1.'_'.$part2.'_'.$part3; // Set sort criteria value
 
-                        $i++;
-                    }
-                }
+						$i++;
+					}
+				}
 
 				closedir($handle);
-            }
-        }
+			}
+		}
 
-        asort($orders);
+		asort($orders);
 
-        // Loop on each trigger
-        foreach ($orders as $key => $value)
-        {
-            $modName = $modules[$key];
-            if (empty($modName)) continue;
+		// Loop on each trigger
+		foreach ($orders as $key => $value)
+		{
+			$modName = $modules[$key];
+			if (empty($modName)) continue;
 
-            $objMod = new $modName($this->db);
-            if ($objMod)
-            {
-                $result = 0;
+			$objMod = new $modName($this->db);
+			if ($objMod)
+			{
+				$result = 0;
 
-                if (method_exists($objMod, 'runTrigger'))	// New method to implement
-                {
-                    //dol_syslog(get_class($this)."::run_triggers action=".$action." Launch runTrigger for file '".$files[$key]."'", LOG_DEBUG);
-                    $result = $objMod->runTrigger($action, $object, $user, $langs, $conf);
-                } elseif (method_exists($objMod, 'run_trigger'))	// Deprecated method
-                {
-                    dol_syslog(get_class($this)."::run_triggers action=".$action." Launch old method run_trigger (rename your trigger into runTrigger) for file '".$files[$key]."'", LOG_WARNING);
-                    $result = $objMod->run_trigger($action, $object, $user, $langs, $conf);
-                } else {
-                    dol_syslog(get_class($this)."::run_triggers action=".$action." A trigger was declared for class ".get_class($objMod)." but method runTrigger was not found", LOG_ERR);
-                }
+				if (method_exists($objMod, 'runTrigger'))	// New method to implement
+				{
+					//dol_syslog(get_class($this)."::run_triggers action=".$action." Launch runTrigger for file '".$files[$key]."'", LOG_DEBUG);
+					$result = $objMod->runTrigger($action, $object, $user, $langs, $conf);
+				} elseif (method_exists($objMod, 'run_trigger'))	// Deprecated method
+				{
+					dol_syslog(get_class($this)."::run_triggers action=".$action." Launch old method run_trigger (rename your trigger into runTrigger) for file '".$files[$key]."'", LOG_WARNING);
+					$result = $objMod->run_trigger($action, $object, $user, $langs, $conf);
+				} else {
+					dol_syslog(get_class($this)."::run_triggers action=".$action." A trigger was declared for class ".get_class($objMod)." but method runTrigger was not found", LOG_ERR);
+				}
 
-                if ($result > 0)
-                {
-                    // Action OK
-                    $nbtotal++;
-                    $nbok++;
-                }
-                if ($result == 0)
-                {
-                    // Aucune action faite
-                    $nbtotal++;
-                }
-                if ($result < 0)
-                {
-                    // Action KO
-                    //dol_syslog("Error in trigger ".$action." - Nb of error string returned = ".count($objMod->errors), LOG_ERR);
-                    $nbtotal++;
-                    $nbko++;
-                    if (!empty($objMod->errors)) $this->errors = array_merge($this->errors, $objMod->errors);
-                    elseif (!empty($objMod->error))  $this->errors[] = $objMod->error;
-                    //dol_syslog("Error in trigger ".$action." - Nb of error string returned = ".count($this->errors), LOG_ERR);
-                }
-            } else {
-                dol_syslog(get_class($this)."::run_triggers action=".$action." Failed to instantiate trigger for file '".$files[$key]."'", LOG_ERR);
-            }
-        }
+				if ($result > 0)
+				{
+					// Action OK
+					$nbtotal++;
+					$nbok++;
+				}
+				if ($result == 0)
+				{
+					// Aucune action faite
+					$nbtotal++;
+				}
+				if ($result < 0)
+				{
+					// Action KO
+					//dol_syslog("Error in trigger ".$action." - Nb of error string returned = ".count($objMod->errors), LOG_ERR);
+					$nbtotal++;
+					$nbko++;
+					if (!empty($objMod->errors)) $this->errors = array_merge($this->errors, $objMod->errors);
+					elseif (!empty($objMod->error))  $this->errors[] = $objMod->error;
+					//dol_syslog("Error in trigger ".$action." - Nb of error string returned = ".count($this->errors), LOG_ERR);
+				}
+			} else {
+				dol_syslog(get_class($this)."::run_triggers action=".$action." Failed to instantiate trigger for file '".$files[$key]."'", LOG_ERR);
+			}
+		}
 
-        if ($nbko)
-        {
-            dol_syslog(get_class($this)."::run_triggers action=".$action." Files found: ".$nbfile.", Files launched: ".$nbtotal.", Done: ".$nbok.", Failed: ".$nbko." - Nb of error string returned in this->errors = ".count($this->errors), LOG_ERR);
-            return -$nbko;
-        } else {
-            //dol_syslog(get_class($this)."::run_triggers Files found: ".$nbfile.", Files launched: ".$nbtotal.", Done: ".$nbok.", Failed: ".$nbko, LOG_DEBUG);
-            return $nbok;
-        }
-    }
+		if ($nbko)
+		{
+			dol_syslog(get_class($this)."::run_triggers action=".$action." Files found: ".$nbfile.", Files launched: ".$nbtotal.", Done: ".$nbok.", Failed: ".$nbko." - Nb of error string returned in this->errors = ".count($this->errors), LOG_ERR);
+			return -$nbko;
+		} else {
+			//dol_syslog(get_class($this)."::run_triggers Files found: ".$nbfile.", Files launched: ".$nbtotal.", Done: ".$nbok.", Failed: ".$nbko, LOG_DEBUG);
+			return $nbok;
+		}
+	}
 
-    /**
-     *  Return list of triggers. Function used by admin page htdoc/admin/triggers.
-     *  List is sorted by trigger filename so by priority to run.
-     *
-     *  @param	array		$forcedirtriggers		null=All default directories. This parameter is used by modulebuilder module only.
-     * 	@return	array								Array list of triggers
-     */
-    public function getTriggersList($forcedirtriggers = null)
-    {
-        global $conf, $langs, $db;
+	/**
+	 *  Return list of triggers. Function used by admin page htdoc/admin/triggers.
+	 *  List is sorted by trigger filename so by priority to run.
+	 *
+	 *  @param	array		$forcedirtriggers		null=All default directories. This parameter is used by modulebuilder module only.
+	 * 	@return	array								Array list of triggers
+	 */
+	public function getTriggersList($forcedirtriggers = null)
+	{
+		global $conf, $langs, $db;
 
-        $files = array();
-        $fullpath = array();
-        $relpath = array();
-        $iscoreorexternal = array();
-        $modules = array();
-        $orders = array();
-        $i = 0;
+		$files = array();
+		$fullpath = array();
+		$relpath = array();
+		$iscoreorexternal = array();
+		$modules = array();
+		$orders = array();
+		$i = 0;
 
-        $dirtriggers = array_merge(array('/core/triggers/'), $conf->modules_parts['triggers']);
-        if (is_array($forcedirtriggers))
-        {
-            $dirtriggers = $forcedirtriggers;
-        }
+		$dirtriggers = array_merge(array('/core/triggers/'), $conf->modules_parts['triggers']);
+		if (is_array($forcedirtriggers))
+		{
+			$dirtriggers = $forcedirtriggers;
+		}
 
-        foreach ($dirtriggers as $reldir)
-        {
-            $dir = dol_buildpath($reldir, 0);
-            $newdir = dol_osencode($dir);
+		foreach ($dirtriggers as $reldir)
+		{
+			$dir = dol_buildpath($reldir, 0);
+			$newdir = dol_osencode($dir);
 
-            // Check if directory exists (we do not use dol_is_dir to avoid loading files.lib.php at each call)
-            if (!is_dir($newdir)) continue;
+			// Check if directory exists (we do not use dol_is_dir to avoid loading files.lib.php at each call)
+			if (!is_dir($newdir)) continue;
 
-            $handle = opendir($newdir);
-            if (is_resource($handle))
-            {
-                while (($file = readdir($handle)) !== false)
-                {
-                	$reg = array();
-                    if (is_readable($newdir.'/'.$file) && preg_match('/^interface_([0-9]+)_([^_]+)_(.+)\.class\.php/', $file, $reg))
-                    {
-                        if (preg_match('/\.back$/', $file)) continue;
+			$handle = opendir($newdir);
+			if (is_resource($handle))
+			{
+				while (($file = readdir($handle)) !== false)
+				{
+					$reg = array();
+					if (is_readable($newdir.'/'.$file) && preg_match('/^interface_([0-9]+)_([^_]+)_(.+)\.class\.php/', $file, $reg))
+					{
+						if (preg_match('/\.back$/', $file)) continue;
 
-                        $part1 = $reg[1];
-                        $part2 = $reg[2];
-                        $part3 = $reg[3];
+						$part1 = $reg[1];
+						$part2 = $reg[2];
+						$part3 = $reg[3];
 
-                        $modName = 'Interface'.ucfirst($reg[3]);
-                        //print "file=$file"; print "modName=$modName"; exit;
-                        if (in_array($modName, $modules))
-                        {
-                            $langs->load("errors");
-                            print '<div class="error">'.$langs->trans("Error").' : '.$langs->trans("ErrorDuplicateTrigger", $modName, "/htdocs/core/triggers/").'</div>';
-                        } else {
-                            include_once $newdir.'/'.$file;
-                        }
+						$modName = 'Interface'.ucfirst($reg[3]);
+						//print "file=$file"; print "modName=$modName"; exit;
+						if (in_array($modName, $modules))
+						{
+							$langs->load("errors");
+							print '<div class="error">'.$langs->trans("Error").' : '.$langs->trans("ErrorDuplicateTrigger", $modName, "/htdocs/core/triggers/").'</div>';
+						} else {
+							include_once $newdir.'/'.$file;
+						}
 
-                        $files[$i] = $file;
-                        $fullpath[$i] = $dir.'/'.$file;
-                        $relpath[$i] = preg_replace('/^\//', '', $reldir).'/'.$file;
-                        $iscoreorexternal[$i] = ($reldir == '/core/triggers/' ? 'internal' : 'external');
-                        $modules[$i] = $modName;
-                        $orders[$i] = $part1.'_'.$part2.'_'.$part3; // Set sort criteria value
+						$files[$i] = $file;
+						$fullpath[$i] = $dir.'/'.$file;
+						$relpath[$i] = preg_replace('/^\//', '', $reldir).'/'.$file;
+						$iscoreorexternal[$i] = ($reldir == '/core/triggers/' ? 'internal' : 'external');
+						$modules[$i] = $modName;
+						$orders[$i] = $part1.'_'.$part2.'_'.$part3; // Set sort criteria value
 
-                        $i++;
-                    }
-                }
-                closedir($handle);
-            }
-        }
+						$i++;
+					}
+				}
+				closedir($handle);
+			}
+		}
 
-        asort($orders);
+		asort($orders);
 
-        $triggers = array();
-        $j = 0;
+		$triggers = array();
+		$j = 0;
 
-        // Loop on each trigger
-        foreach ($orders as $key => $value)
-        {
-            $modName = $modules[$key];
-            if (empty($modName)) continue;
+		// Loop on each trigger
+		foreach ($orders as $key => $value)
+		{
+			$modName = $modules[$key];
+			if (empty($modName)) continue;
 
-            if (!class_exists($modName))
-            {
-                print 'Error: A trigger file was found but its class "'.$modName.'" was not found.'."<br>\n";
-                continue;
-            }
+			if (!class_exists($modName))
+			{
+				print 'Error: A trigger file was found but its class "'.$modName.'" was not found.'."<br>\n";
+				continue;
+			}
 
-            $text = '';
+			$text = '';
 
-            try {
-	            $objMod = new $modName($db);
+			try {
+				$objMod = new $modName($db);
 
-	            if (is_subclass_of($objMod, 'DolibarrTriggers'))
-	            {
-		            // Define disabledbyname and disabledbymodule
-		            $disabledbyname = 0;
-		            $disabledbymodule = 1;
-		            $module = '';
+				if (is_subclass_of($objMod, 'DolibarrTriggers'))
+				{
+					// Define disabledbyname and disabledbymodule
+					$disabledbyname = 0;
+					$disabledbymodule = 1;
+					$module = '';
 
-		            // Check if trigger file is disabled by name
-		            if (preg_match('/NORUN$/i', $files[$key])) $disabledbyname = 1;
-		            // Check if trigger file is for a particular module
-		            if (preg_match('/^interface_([0-9]+)_([^_]+)_(.+)\.class\.php/i', $files[$key], $reg))
-		            {
-		                $module = preg_replace('/^mod/i', '', $reg[2]);
-		                $constparam = 'MAIN_MODULE_'.strtoupper($module);
-		                if (strtolower($module) == 'all') $disabledbymodule = 0;
-		                elseif (empty($conf->global->$constparam)) $disabledbymodule = 2;
-		                $triggers[$j]['module'] = strtolower($module);
-		            }
+					// Check if trigger file is disabled by name
+					if (preg_match('/NORUN$/i', $files[$key])) $disabledbyname = 1;
+					// Check if trigger file is for a particular module
+					if (preg_match('/^interface_([0-9]+)_([^_]+)_(.+)\.class\.php/i', $files[$key], $reg))
+					{
+						$module = preg_replace('/^mod/i', '', $reg[2]);
+						$constparam = 'MAIN_MODULE_'.strtoupper($module);
+						if (strtolower($module) == 'all') $disabledbymodule = 0;
+						elseif (empty($conf->global->$constparam)) $disabledbymodule = 2;
+						$triggers[$j]['module'] = strtolower($module);
+					}
 
-		            // We set info of modules
-		            $triggers[$j]['picto'] = $objMod->picto ?img_object('', $objMod->picto, 'class="valignmiddle pictomodule "') : img_object('', 'generic', 'class="valignmiddle pictomodule "');
-		            $triggers[$j]['file'] = $files[$key];
-		            $triggers[$j]['fullpath'] = $fullpath[$key];
-		            $triggers[$j]['relpath'] = $relpath[$key];
-		            $triggers[$j]['iscoreorexternal'] = $iscoreorexternal[$key];
-		            $triggers[$j]['version'] = $objMod->getVersion();
-		            $triggers[$j]['status'] = img_picto($langs->trans("Active"), 'tick');
-		            if ($disabledbyname > 0 || $disabledbymodule > 1) $triggers[$j]['status'] = '';
+					// We set info of modules
+					$triggers[$j]['picto'] = $objMod->picto ?img_object('', $objMod->picto, 'class="valignmiddle pictomodule "') : img_object('', 'generic', 'class="valignmiddle pictomodule "');
+					$triggers[$j]['file'] = $files[$key];
+					$triggers[$j]['fullpath'] = $fullpath[$key];
+					$triggers[$j]['relpath'] = $relpath[$key];
+					$triggers[$j]['iscoreorexternal'] = $iscoreorexternal[$key];
+					$triggers[$j]['version'] = $objMod->getVersion();
+					$triggers[$j]['status'] = img_picto($langs->trans("Active"), 'tick');
+					if ($disabledbyname > 0 || $disabledbymodule > 1) $triggers[$j]['status'] = '';
 
-		            $text = '<b>'.$langs->trans("Description").':</b><br>';
-		            $text .= $objMod->getDesc().'<br>';
-		            $text .= '<br><b>'.$langs->trans("Status").':</b><br>';
-		            if ($disabledbyname == 1)
-		            {
-		                $text .= $langs->trans("TriggerDisabledByName").'<br>';
-		                if ($disabledbymodule == 2) $text .= $langs->trans("TriggerDisabledAsModuleDisabled", $module).'<br>';
-		            } else {
-		                if ($disabledbymodule == 0) $text .= $langs->trans("TriggerAlwaysActive").'<br>';
-		                if ($disabledbymodule == 1) $text .= $langs->trans("TriggerActiveAsModuleActive", $module).'<br>';
-		                if ($disabledbymodule == 2) $text .= $langs->trans("TriggerDisabledAsModuleDisabled", $module).'<br>';
-		            }
-	            } else {
-	            	print 'Error: Trigger '.$modName.' does not extends DolibarrTriggers<br>';
-	            }
-            } catch (Exception $e) {
-            	print $e->getMessage();
-            }
+					$text = '<b>'.$langs->trans("Description").':</b><br>';
+					$text .= $objMod->getDesc().'<br>';
+					$text .= '<br><b>'.$langs->trans("Status").':</b><br>';
+					if ($disabledbyname == 1)
+					{
+						$text .= $langs->trans("TriggerDisabledByName").'<br>';
+						if ($disabledbymodule == 2) $text .= $langs->trans("TriggerDisabledAsModuleDisabled", $module).'<br>';
+					} else {
+						if ($disabledbymodule == 0) $text .= $langs->trans("TriggerAlwaysActive").'<br>';
+						if ($disabledbymodule == 1) $text .= $langs->trans("TriggerActiveAsModuleActive", $module).'<br>';
+						if ($disabledbymodule == 2) $text .= $langs->trans("TriggerDisabledAsModuleDisabled", $module).'<br>';
+					}
+				} else {
+					print 'Error: Trigger '.$modName.' does not extends DolibarrTriggers<br>';
+				}
+			} catch (Exception $e) {
+				print $e->getMessage();
+			}
 
-            $triggers[$j]['info'] = $text;
-            $j++;
-        }
-        return $triggers;
-    }
+			$triggers[$j]['info'] = $text;
+			$j++;
+		}
+		return $triggers;
+	}
 }
diff --git a/htdocs/core/class/ldap.class.php b/htdocs/core/class/ldap.class.php
index a1de5813b46..9011d9b54f7 100644
--- a/htdocs/core/class/ldap.class.php
+++ b/htdocs/core/class/ldap.class.php
@@ -42,82 +42,82 @@ class Ldap
 	/**
 	 * Tableau des serveurs (IP addresses ou nom d'hotes)
 	 */
-    public $server = array();
+	public $server = array();
 
 	/**
 	 * Base DN (e.g. "dc=foo,dc=com")
 	 */
-    public $dn;
+	public $dn;
 	/**
 	 * type de serveur, actuellement OpenLdap et Active Directory
 	 */
-    public $serverType;
+	public $serverType;
 	/**
 	 * Version du protocole ldap
 	 */
-    public $ldapProtocolVersion;
-    /**
-     * Server DN
-     */
-    public $domain;
+	public $ldapProtocolVersion;
+	/**
+	 * Server DN
+	 */
+	public $domain;
 	/**
 	 * User administrateur Ldap
 	 * Active Directory ne supporte pas les connexions anonymes
 	 */
-    public $searchUser;
+	public $searchUser;
 	/**
 	 * Mot de passe de l'administrateur
 	 * Active Directory ne supporte pas les connexions anonymes
 	 */
-    public $searchPassword;
+	public $searchPassword;
 	/**
 	 *  DN des utilisateurs
 	 */
-    public $people;
+	public $people;
 	/**
 	 * DN des groupes
 	 */
-    public $groups;
+	public $groups;
 	/**
 	 * Code erreur retourne par le serveur Ldap
 	 */
-    public $ldapErrorCode;
+	public $ldapErrorCode;
 	/**
 	 * Message texte de l'erreur
 	 */
-    public $ldapErrorText;
+	public $ldapErrorText;
 
 
 	//Fetch user
-    public $name;
-    public $firstname;
-    public $login;
-    public $phone;
-    public $skype;
-    public $fax;
-    public $mail;
-    public $mobile;
+	public $name;
+	public $firstname;
+	public $login;
+	public $phone;
+	public $skype;
+	public $fax;
+	public $mail;
+	public $mobile;
 
-    public $uacf;
-    public $pwdlastset;
+	public $uacf;
+	public $pwdlastset;
 
-    public $ldapcharset = 'UTF-8'; // LDAP should be UTF-8 encoded
+	public $ldapcharset = 'UTF-8'; // LDAP should be UTF-8 encoded
 
 
 	/**
 	 * The internal LDAP connection handle
 	 */
-    public $connection;
+	public $connection;
 	/**
 	 * Result of any connections etc.
 	 */
-    public $result;
+	public $result;
 
 
 	/**
 	 *  Constructor
 	 */
-    public function __construct()
+	public function __construct()
 	{
 		global $conf;
 
@@ -153,7 +153,7 @@ class Ldap
 
 	// Connection handling methods -------------------------------------------
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Connect and bind
 	 * 	Use this->server, this->serverPort, this->ldapProtocolVersion, this->serverType, this->searchUser, this->searchPassword
@@ -161,9 +161,9 @@ class Ldap
 	 *
 	 *	@return		int		<0 if KO, 1 if bind anonymous, 2 if bind auth
 	 */
-    public function connect_bind()
+	public function connect_bind()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 		$connected = 0;
@@ -283,7 +283,7 @@ class Ldap
 	 *
 	 * @return	boolean			true or false
 	 */
-    public function close()
+	public function close()
 	{
 		if ($this->connection && !@ldap_close($this->connection))
 		{
@@ -299,7 +299,7 @@ class Ldap
 	 *
 	 * @return	boolean			true or false
 	 */
-    public function bind()
+	public function bind()
 	{
 		if (!$this->result = @ldap_bind($this->connection))
 		{
@@ -322,7 +322,7 @@ class Ldap
 	 * @param	string	$pass			Password
 	 * @return	boolean					true or false
 	 */
-    public function bindauth($bindDn, $pass)
+	public function bindauth($bindDn, $pass)
 	{
 		if (!$this->result = @ldap_bind($this->connection, $bindDn, $pass))
 		{
@@ -340,7 +340,7 @@ class Ldap
 	 *
 	 * @return	boolean					true or false
 	 */
-    public function unbind()
+	public function unbind()
 	{
 		if (!$this->result = @ldap_unbind($this->connection))
 		{
@@ -356,7 +356,7 @@ class Ldap
 	 *
 	 * @return	string					version
 	 */
-    public function getVersion()
+	public function getVersion()
 	{
 		$version = 0;
 		$version = @ldap_get_option($this->connection, LDAP_OPT_PROTOCOL_VERSION, $version);
@@ -368,8 +368,8 @@ class Ldap
 	 *
 	 * @return	boolean                 version
 	 */
-    public function setVersion()
-    {
+	public function setVersion()
+	{
 		// LDAP_OPT_PROTOCOL_VERSION est une constante qui vaut 17
 		$ldapsetversion = ldap_set_option($this->connection, LDAP_OPT_PROTOCOL_VERSION, $this->ldapProtocolVersion);
 		return $ldapsetversion;
@@ -380,8 +380,8 @@ class Ldap
 	 *
 	 * @return	boolean                 referrals
 	 */
-    public function setReferrals()
-    {
+	public function setReferrals()
+	{
 		// LDAP_OPT_REFERRALS est une constante qui vaut ?
 		$ldapreferrals = ldap_set_option($this->connection, LDAP_OPT_REFERRALS, 0);
 		return $ldapreferrals;
@@ -397,7 +397,7 @@ class Ldap
 	 *	@param	User		$user		Objet user that create
 	 *	@return	int					<0 if KO, >0 if OK
 	 */
-    public function add($dn, $info, $user)
+	public function add($dn, $info, $user)
 	{
 		dol_syslog(get_class($this)."::add dn=".$dn." info=".join(',', $info));
 
@@ -447,7 +447,7 @@ class Ldap
 	 *	@param	User		$user		Objet user that modify
 	 *	@return	int						<0 if KO, >0 if OK
 	 */
-    public function modify($dn, $info, $user)
+	public function modify($dn, $info, $user)
 	{
 		dol_syslog(get_class($this)."::modify dn=".$dn." info=".join(',', $info));
 
@@ -474,7 +474,7 @@ class Ldap
 
 		//print_r($info);
 
-    	// For better compatibility with Samba4 AD
+		// For better compatibility with Samba4 AD
 		if ($this->serverType == "activedirectory") {
 			unset($info['cn']); // To avoid error : Operation not allowed on RDN (Code 67)
 		}
@@ -502,7 +502,7 @@ class Ldap
 	 *	@param	bool			$deleteoldrdn	If true the old RDN value(s) is removed, else the old RDN value(s) is retained as non-distinguished values of the entry.
 	 *	@return	int							<0 if KO, >0 if OK
 	 */
-    public function rename($dn, $newrdn, $newparent, $user, $deleteoldrdn = true)
+	public function rename($dn, $newrdn, $newparent, $user, $deleteoldrdn = true)
 	{
 		dol_syslog(get_class($this)."::modify dn=".$dn." newrdn=".$newrdn." newparent=".$newparent." deleteoldrdn=".($deleteoldrdn ? 1 : 0));
 
@@ -549,7 +549,7 @@ class Ldap
 	 *	@param	string	$newparent	New parent (ou=xxx,dc=aaa,dc=bbb) (for ldap_rename)
 	 *	@return	int					<0 if KO, >0 if OK
 	 */
-    public function update($dn, $info, $user, $olddn, $newrdn = false, $newparent = false)
+	public function update($dn, $info, $user, $olddn, $newrdn = false, $newparent = false)
 	{
 		dol_syslog(get_class($this)."::update dn=".$dn." olddn=".$olddn);
 
@@ -567,12 +567,12 @@ class Ldap
 
 		if (!$olddn || $olddn != $dn)
 		{
-			if (! empty($olddn) && ! empty($newrdn) && ! empty($newparent) && $this->ldapProtocolVersion === '3')
+			if (!empty($olddn) && !empty($newrdn) && !empty($newparent) && $this->ldapProtocolVersion === '3')
 			{
 				// This function currently only works with LDAPv3
 				$result = $this->rename($olddn, $newrdn, $newparent, $user, true);
-				$result = $this->modify($dn, $info, $user);	// We force "modify" for avoid some fields not modify
-			}	else {
+				$result = $this->modify($dn, $info, $user); // We force "modify" for avoid some fields not modify
+			} else {
 				// If change we make is rename the key of LDAP record, we create new one and if ok, we delete old one.
 				$result = $this->add($dn, $info, $user);
 				if ($result > 0 && $olddn && $olddn != $dn) $result = $this->delete($olddn); // If add fails, we do not try to delete old one
@@ -602,7 +602,7 @@ class Ldap
 	 *	@param	string	$dn			DN entry key
 	 *	@return	int					<0 if KO, >0 if OK
 	 */
-    public function delete($dn)
+	public function delete($dn)
 	{
 		dol_syslog(get_class($this)."::delete Delete LDAP entry dn=".$dn);
 
@@ -627,7 +627,7 @@ class Ldap
 		return -1;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * 	Build a LDAP message
 	 *
@@ -635,9 +635,9 @@ class Ldap
 	 *	@param	array		$info		Attributes array
 	 *	@return	string					Content of file
 	 */
-    public function dump_content($dn, $info)
+	public function dump_content($dn, $info)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$content = '';
 
 		// Create file content
@@ -674,7 +674,7 @@ class Ldap
 	 *	@param	array		$info		Attributes array
 	 *	@return	int						<0 if KO, >0 if OK
 	 */
-    public function dump($dn, $info)
+	public function dump($dn, $info)
 	{
 		global $conf;
 
@@ -706,7 +706,7 @@ class Ldap
 	 * @param int		$timeout		Timeout in second (default 1s)
 	 * @return boolean				true or false
 	 */
-    public function serverPing($host, $port = 389, $timeout = 1)
+	public function serverPing($host, $port = 389, $timeout = 1)
 	{
 		// Replace ldaps:// by ssl://
 		if (preg_match('/^ldaps:\/\/([^\/]+)\/?$/', $host, $regs)) {
@@ -736,7 +736,7 @@ class Ldap
 	 *	@param	User		$user		Objet user that create
 	 *	@return	int						<0 if KO, >0 if OK
 	 */
-    public function addAttribute($dn, $info, $user)
+	public function addAttribute($dn, $info, $user)
 	{
 		dol_syslog(get_class($this)."::addAttribute dn=".$dn." info=".join(',', $info));
 
@@ -784,7 +784,7 @@ class Ldap
 	 *	@param	User		$user		Objet user that create
 	 *	@return	int						<0 if KO, >0 if OK
 	 */
-    public function updateAttribute($dn, $info, $user)
+	public function updateAttribute($dn, $info, $user)
 	{
 		dol_syslog(get_class($this)."::updateAttribute dn=".$dn." info=".join(',', $info));
 
@@ -832,7 +832,7 @@ class Ldap
 	 *	@param	User		$user		Objet user that create
 	 *	@return	int						<0 if KO, >0 if OK
 	 */
-    public function deleteAttribute($dn, $info, $user)
+	public function deleteAttribute($dn, $info, $user)
 	{
 		dol_syslog(get_class($this)."::deleteAttribute dn=".$dn." info=".join(',', $info));
 
@@ -878,7 +878,7 @@ class Ldap
 	 *	@param	string	$filter		Filter
 	 *	@return	int|array			<0 or false if KO, array if OK
 	 */
-    public function getAttribute($dn, $filter)
+	public function getAttribute($dn, $filter)
 	{
 		// Check parameters
 		if (!$this->connection)
@@ -923,7 +923,7 @@ class Ldap
 	 * 	@param	string	$attribute			Attributes
 	 * 	@return void
 	 */
-    public function getAttributeValues($filterrecord, $attribute)
+	public function getAttributeValues($filterrecord, $attribute)
 	{
 		$attributes = array();
 		$attributes[0] = $attribute;
@@ -968,7 +968,7 @@ class Ldap
 	 *	@param	array	$attributeAsArray 	Array of fields wanted as an array not a string
 	 *	@return	array						Array of [id_record][ldap_field]=value
 	 */
-    public function getRecords($search, $userDn, $useridentifier, $attributeArray, $activefilter = 0, $attributeAsArray = array())
+	public function getRecords($search, $userDn, $useridentifier, $attributeArray, $activefilter = 0, $attributeAsArray = array())
 	{
 		$fulllist = array();
 
@@ -1068,7 +1068,7 @@ class Ldap
 	 *	@param	string		$hex			Hex value
 	 *	@return	string						Little endian
 	 */
-    public function littleEndian($hex)
+	public function littleEndian($hex)
 	{
 		for ($x = dol_strlen($hex) - 2; $x >= 0; $x = $x - 2) {
 			$result .= substr($hex, $x, 2);
@@ -1084,7 +1084,7 @@ class Ldap
 	 * 	@param	string		$ldapUser		Login de l'utilisateur
 	 * 	@return	string						Sid
 	 */
-    public function getObjectSid($ldapUser)
+	public function getObjectSid($ldapUser)
 	{
 		$criteria = '('.$this->getUserIdentifier().'='.$ldapUser.')';
 		$justthese = array("objectsid");
@@ -1139,7 +1139,7 @@ class Ldap
 	 * @param	string	$binsid		Binary SID
 	 * @return	string				Textual SID
 	 */
-    public function binSIDtoText($binsid)
+	public function binSIDtoText($binsid)
 	{
 		$hex_sid = bin2hex($binsid);
 		$rev = hexdec(substr($hex_sid, 0, 2)); // Get revision-part of SID
@@ -1165,7 +1165,7 @@ class Ldap
 	 * 	@param 	string		$filter			Search filter (ex: (sn=nom_personne) )
 	 *	@return	array|int					Array with answers (key lowercased - value)
 	 */
-    public function search($checkDn, $filter)
+	public function search($checkDn, $filter)
 	{
 		dol_syslog(get_class($this)."::search checkDn=".$checkDn." filter=".$filter);
 
@@ -1199,7 +1199,7 @@ class Ldap
 	 *                       	       	Examples: &(objectClass=inetOrgPerson) &(objectClass=user)(objectCategory=person) &(isMemberOf=cn=Sales,ou=Groups,dc=opencsi,dc=com)
 	 *		@return	int					>0 if OK, <0 if KO
 	 */
-    public function fetch($user, $filter)
+	public function fetch($user, $filter)
 	{
 		// Perform the search and get the entry handles
 
@@ -1284,7 +1284,7 @@ class Ldap
 	 *
 	 *	@return	string 				Login
 	 */
-    public function getUserIdentifier()
+	public function getUserIdentifier()
 	{
 		if ($this->serverType == "activedirectory") {
 			return $this->attr_sambalogin;
@@ -1293,13 +1293,13 @@ class Ldap
 		}
 	}
 
-    /**
-     * 	UserAccountControl Flgs to more human understandable form...
-     *
-     *	@param	string		$uacf		UACF
-     *	@return	void
-     */
-    public function parseUACF($uacf)
+	/**
+	 * 	UserAccountControl Flgs to more human understandable form...
+	 *
+	 *	@param	string		$uacf		UACF
+	 *	@return	void
+	 */
+	public function parseUACF($uacf)
 	{
 		//All flags array
 		$flags = array(
@@ -1340,13 +1340,13 @@ class Ldap
 		return($retval);
 	}
 
-    /**
-     * 	SamAccountType value to text
-     *
-     *	@param	string	$samtype	SamType
-     *	@return	string				Sam string
-     */
-    public function parseSAT($samtype)
+	/**
+	 * 	SamAccountType value to text
+	 *
+	 *	@param	string	$samtype	SamType
+	 *	@return	string				Sam string
+	 */
+	public function parseSAT($samtype)
 	{
 		$stypes = array(
 			805306368    =>    "NORMAL_ACCOUNT",
@@ -1370,16 +1370,16 @@ class Ldap
 		return($retval);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Convertit le temps ActiveDirectory en Unix timestamp
 	 *
 	 *	@param	string	$value		AD time to convert
 	 *	@return	integer				Unix timestamp
 	 */
-    public function convert_time($value)
+	public function convert_time($value)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$dateLargeInt = $value; // nano secondes depuis 1601 !!!!
 		$secsAfterADEpoch = $dateLargeInt / (10000000); // secondes depuis le 1 jan 1601
 		$ADToUnixConvertor = ((1970 - 1601) * 365.242190) * 86400; // UNIX start date - AD start date * jours * secondes
@@ -1410,7 +1410,7 @@ class Ldap
 	 *  @param	string	$pagecodeto		Page code for result string
 	 *  @return string         			Converted string
 	 */
-    public function convFromOutputCharset($str, $pagecodeto = 'UTF-8')
+	public function convFromOutputCharset($str, $pagecodeto = 'UTF-8')
 	{
 		global $conf;
 		if ($pagecodeto == 'ISO-8859-1' && $conf->file->character_set_client == 'UTF-8') $str = utf8_decode($str);
@@ -1425,7 +1425,7 @@ class Ldap
 	 *	@param	string	$keygroup	Key of group
 	 *	@return	int					gid number
 	 */
-    public function getNextGroupGid($keygroup = 'LDAP_KEY_GROUPS')
+	public function getNextGroupGid($keygroup = 'LDAP_KEY_GROUPS')
 	{
 		global $conf;
 
diff --git a/htdocs/core/class/link.class.php b/htdocs/core/class/link.class.php
index 9d70458a198..2c08d2709ca 100644
--- a/htdocs/core/class/link.class.php
+++ b/htdocs/core/class/link.class.php
@@ -28,359 +28,359 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
  */
 class Link extends CommonObject
 {
-    /**
+	/**
 	 * @var string ID to identify managed object
 	 */
 	public $element = 'link';
 
-    /**
+	/**
 	 * @var string Name of table without prefix where object is stored
 	 */
 	public $table_element = 'links';
 
-    /**
+	/**
 	 * @var int Entity
 	 */
 	public $entity;
 
-    public $datea;
-    public $url;
+	public $datea;
+	public $url;
 
-    /**
-     * @var string Links label
-     */
-    public $label;
+	/**
+	 * @var string Links label
+	 */
+	public $label;
 
-    public $objecttype;
-    public $objectid;
+	public $objecttype;
+	public $objectid;
 
 
-    /**
-     *    Constructor
-     *
-     *    @param	DoliDB		$db		Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-    }
+	/**
+	 *    Constructor
+	 *
+	 *    @param	DoliDB		$db		Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
 
 
-    /**
-     *    Create link in database
-     *
-     *    @param	User	$user       Object of user that ask creation
-     *    @return   int         		>= 0 if OK, < 0 if KO
-     */
-    public function create($user = '')
-    {
-        global $langs, $conf;
+	/**
+	 *    Create link in database
+	 *
+	 *    @param	User	$user       Object of user that ask creation
+	 *    @return   int         		>= 0 if OK, < 0 if KO
+	 */
+	public function create($user = '')
+	{
+		global $langs, $conf;
 
-        $error = 0;
-        $langs->load("errors");
-        // Clean parameters
-        if (empty($this->label)) {
-            $this->label = trim(basename($this->url));
-        }
-        if (empty($this->datea)) {
-            $this->datea = dol_now();
-        }
-        $this->url = trim($this->url);
+		$error = 0;
+		$langs->load("errors");
+		// Clean parameters
+		if (empty($this->label)) {
+			$this->label = trim(basename($this->url));
+		}
+		if (empty($this->datea)) {
+			$this->datea = dol_now();
+		}
+		$this->url = trim($this->url);
 
-        dol_syslog(get_class($this)."::create ".$this->url);
+		dol_syslog(get_class($this)."::create ".$this->url);
 
-        // Check parameters
-        if (empty($this->url)) {
-            $this->error = $langs->trans("NoUrl");
-            return -1;
-        }
+		// Check parameters
+		if (empty($this->url)) {
+			$this->error = $langs->trans("NoUrl");
+			return -1;
+		}
 
-        $this->db->begin();
+		$this->db->begin();
 
-        $sql = "INSERT INTO ".MAIN_DB_PREFIX."links (entity, datea, url, label, objecttype, objectid)";
-        $sql .= " VALUES (".$conf->entity.", '".$this->db->idate($this->datea)."'";
-        $sql .= ", '".$this->db->escape($this->url)."'";
-        $sql .= ", '".$this->db->escape($this->label)."'";
-        $sql .= ", '".$this->db->escape($this->objecttype)."'";
-        $sql .= ", ".$this->objectid.")";
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."links (entity, datea, url, label, objecttype, objectid)";
+		$sql .= " VALUES (".$conf->entity.", '".$this->db->idate($this->datea)."'";
+		$sql .= ", '".$this->db->escape($this->url)."'";
+		$sql .= ", '".$this->db->escape($this->label)."'";
+		$sql .= ", '".$this->db->escape($this->objecttype)."'";
+		$sql .= ", ".$this->objectid.")";
 
-        dol_syslog(get_class($this)."::create", LOG_DEBUG);
-        $result = $this->db->query($sql);
-        if ($result) {
-            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."links");
+		dol_syslog(get_class($this)."::create", LOG_DEBUG);
+		$result = $this->db->query($sql);
+		if ($result) {
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."links");
 
-            if ($this->id > 0) {
-                // Call trigger
-                $result = $this->call_trigger('LINK_CREATE', $user);
-                if ($result < 0) $error++;
-                // End call triggers
-            } else {
-                $error++;
-            }
+			if ($this->id > 0) {
+				// Call trigger
+				$result = $this->call_trigger('LINK_CREATE', $user);
+				if ($result < 0) $error++;
+				// End call triggers
+			} else {
+				$error++;
+			}
 
-            if (!$error)
-            {
-                dol_syslog(get_class($this)."::Create success id=".$this->id);
-                $this->db->commit();
-                return $this->id;
-            } else {
-                dol_syslog(get_class($this)."::Create echec update ".$this->error, LOG_ERR);
-                $this->db->rollback();
-                return -3;
-            }
-        } else {
-            if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
-            {
-                $this->error = $langs->trans("ErrorCompanyNameAlreadyExists", $this->name);
-                $result = -1;
-            } else {
-                $this->error = $this->db->lasterror();
-                $result = -2;
-            }
-            $this->db->rollback();
-            return $result;
-        }
-    }
+			if (!$error)
+			{
+				dol_syslog(get_class($this)."::Create success id=".$this->id);
+				$this->db->commit();
+				return $this->id;
+			} else {
+				dol_syslog(get_class($this)."::Create echec update ".$this->error, LOG_ERR);
+				$this->db->rollback();
+				return -3;
+			}
+		} else {
+			if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
+			{
+				$this->error = $langs->trans("ErrorCompanyNameAlreadyExists", $this->name);
+				$result = -1;
+			} else {
+				$this->error = $this->db->lasterror();
+				$result = -2;
+			}
+			$this->db->rollback();
+			return $result;
+		}
+	}
 
-    /**
-     *  Update parameters of third party
-     *
-     *  @param  User	$user            			User executing update
-     *  @param  int		$call_trigger    			0=no, 1=yes
-     *  @return int  			           			<0 if KO, >=0 if OK
-     */
-    public function update($user = '', $call_trigger = 1)
-    {
-        global $langs, $conf;
-        require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+	/**
+	 *  Update parameters of third party
+	 *
+	 *  @param  User	$user            			User executing update
+	 *  @param  int		$call_trigger    			0=no, 1=yes
+	 *  @return int  			           			<0 if KO, >=0 if OK
+	 */
+	public function update($user = '', $call_trigger = 1)
+	{
+		global $langs, $conf;
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
-        $langs->load("errors");
-        $error = 0;
+		$langs->load("errors");
+		$error = 0;
 
-        dol_syslog(get_class($this)."::Update id = ".$this->id." call_trigger = ".$call_trigger);
+		dol_syslog(get_class($this)."::Update id = ".$this->id." call_trigger = ".$call_trigger);
 
-        // Check parameters
-        if (empty($this->url))
-        {
-            $this->error = $langs->trans("NoURL");
-            return -1;
-        }
+		// Check parameters
+		if (empty($this->url))
+		{
+			$this->error = $langs->trans("NoURL");
+			return -1;
+		}
 
-        // Clean parameters
-        $this->url       = clean_url($this->url, 1);
-        if (empty($this->label)) $this->label = basename($this->url);
-        $this->label     = trim($this->label);
+		// Clean parameters
+		$this->url       = clean_url($this->url, 1);
+		if (empty($this->label)) $this->label = basename($this->url);
+		$this->label     = trim($this->label);
 
 
-        $this->db->begin();
+		$this->db->begin();
 
-        $sql  = "UPDATE ".MAIN_DB_PREFIX."links SET ";
-        $sql .= "entity = ".$conf->entity;
-        $sql .= ", datea = '".$this->db->idate(dol_now())."'";
-        $sql .= ", url = '".$this->db->escape($this->url)."'";
-        $sql .= ", label = '".$this->db->escape($this->label)."'";
-        $sql .= ", objecttype = '".$this->db->escape($this->objecttype)."'";
-        $sql .= ", objectid = ".$this->objectid;
-        $sql .= " WHERE rowid = ".$this->id;
+		$sql  = "UPDATE ".MAIN_DB_PREFIX."links SET ";
+		$sql .= "entity = ".$conf->entity;
+		$sql .= ", datea = '".$this->db->idate(dol_now())."'";
+		$sql .= ", url = '".$this->db->escape($this->url)."'";
+		$sql .= ", label = '".$this->db->escape($this->label)."'";
+		$sql .= ", objecttype = '".$this->db->escape($this->objecttype)."'";
+		$sql .= ", objectid = ".$this->objectid;
+		$sql .= " WHERE rowid = ".$this->id;
 
-        dol_syslog(get_class($this)."::update sql = ".$sql);
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            if ($call_trigger)
-            {
-                // Call trigger
-                $result = $this->call_trigger('LINK_MODIFY', $user);
-                if ($result < 0) $error++;
-                // End call triggers
-            }
+		dol_syslog(get_class($this)."::update sql = ".$sql);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			if ($call_trigger)
+			{
+				// Call trigger
+				$result = $this->call_trigger('LINK_MODIFY', $user);
+				if ($result < 0) $error++;
+				// End call triggers
+			}
 
-            if (!$error)
-            {
-                dol_syslog(get_class($this)."::Update success");
-                $this->db->commit();
-                return 1;
-            } else {
-                setEventMessages('', $this->errors, 'errors');
-                $this->db->rollback();
-                return -1;
-            }
-        } else {
-            if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
-            {
-                // Doublon
-                $this->error = $langs->trans("ErrorDuplicateField");
-                $result = -1;
-            } else {
-                $this->error = $langs->trans("Error sql = ".$sql);
-                $result = -2;
-            }
-            $this->db->rollback();
-            return $result;
-        }
-    }
+			if (!$error)
+			{
+				dol_syslog(get_class($this)."::Update success");
+				$this->db->commit();
+				return 1;
+			} else {
+				setEventMessages('', $this->errors, 'errors');
+				$this->db->rollback();
+				return -1;
+			}
+		} else {
+			if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
+			{
+				// Doublon
+				$this->error = $langs->trans("ErrorDuplicateField");
+				$result = -1;
+			} else {
+				$this->error = $langs->trans("Error sql = ".$sql);
+				$result = -2;
+			}
+			$this->db->rollback();
+			return $result;
+		}
+	}
 
-    /**
-     *  Loads all links from database
-     *
-     *  @param  array   $links      array of Link objects to fill
-     *  @param  string  $objecttype type of the associated object in dolibarr
-     *  @param  int     $objectid   id of the associated object in dolibarr
-     *  @param  string  $sortfield  field used to sort
-     *  @param  string  $sortorder  sort order
-     *  @return int                 1 if ok, 0 if no records, -1 if error
-     **/
-    public function fetchAll(&$links, $objecttype, $objectid, $sortfield = null, $sortorder = null)
-    {
-        global $conf;
+	/**
+	 *  Loads all links from database
+	 *
+	 *  @param  array   $links      array of Link objects to fill
+	 *  @param  string  $objecttype type of the associated object in dolibarr
+	 *  @param  int     $objectid   id of the associated object in dolibarr
+	 *  @param  string  $sortfield  field used to sort
+	 *  @param  string  $sortorder  sort order
+	 *  @return int                 1 if ok, 0 if no records, -1 if error
+	 **/
+	public function fetchAll(&$links, $objecttype, $objectid, $sortfield = null, $sortorder = null)
+	{
+		global $conf;
 
-        $sql = "SELECT rowid, entity, datea, url, label, objecttype, objectid FROM ".MAIN_DB_PREFIX."links";
-        $sql .= " WHERE objecttype = '".$this->db->escape($objecttype)."' AND objectid = ".$objectid;
-        if ($conf->entity != 0) $sql .= " AND entity = ".$conf->entity;
-        if ($sortfield) {
-            if (empty($sortorder)) {
-                $sortorder = "ASC";
-            }
-            $sql .= " ORDER BY ".$sortfield." ".$sortorder;
-        }
+		$sql = "SELECT rowid, entity, datea, url, label, objecttype, objectid FROM ".MAIN_DB_PREFIX."links";
+		$sql .= " WHERE objecttype = '".$this->db->escape($objecttype)."' AND objectid = ".$objectid;
+		if ($conf->entity != 0) $sql .= " AND entity = ".$conf->entity;
+		if ($sortfield) {
+			if (empty($sortorder)) {
+				$sortorder = "ASC";
+			}
+			$sql .= " ORDER BY ".$sortfield." ".$sortorder;
+		}
 
-        dol_syslog(get_class($this)."::fetchAll", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            $num = $this->db->num_rows($resql);
-            dol_syslog(get_class($this)."::fetchAll ".$num."records", LOG_DEBUG);
-            if ($num > 0)
-            {
-                while ($obj = $this->db->fetch_object($resql))
-                {
-                    $link = new Link($this->db);
-                    $link->id = $obj->rowid;
-                    $link->entity = $obj->entity;
-                    $link->datea = $this->db->jdate($obj->datea);
-                    $link->url = $obj->url;
-                    $link->label = $obj->label;
-                    $link->objecttype = $obj->objecttype;
-                    $link->objectid = $obj->objectid;
-                    $links[] = $link;
-                }
-                return 1;
-            } else {
-                return 0;
-            }
-        } else {
-            return -1;
-        }
-    }
+		dol_syslog(get_class($this)."::fetchAll", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$num = $this->db->num_rows($resql);
+			dol_syslog(get_class($this)."::fetchAll ".$num."records", LOG_DEBUG);
+			if ($num > 0)
+			{
+				while ($obj = $this->db->fetch_object($resql))
+				{
+					$link = new Link($this->db);
+					$link->id = $obj->rowid;
+					$link->entity = $obj->entity;
+					$link->datea = $this->db->jdate($obj->datea);
+					$link->url = $obj->url;
+					$link->label = $obj->label;
+					$link->objecttype = $obj->objecttype;
+					$link->objectid = $obj->objectid;
+					$links[] = $link;
+				}
+				return 1;
+			} else {
+				return 0;
+			}
+		} else {
+			return -1;
+		}
+	}
 
-    /**
-     *  Return nb of links
-     *
-     *  @param  DoliDb  $db         Database handler
-     *  @param  string  $objecttype Type of the associated object in dolibarr
-     *  @param  int     $objectid   Id of the associated object in dolibarr
-     *  @return int                 Nb of links, -1 if error
-     **/
-    public static function count($db, $objecttype, $objectid)
-    {
-        global $conf;
+	/**
+	 *  Return nb of links
+	 *
+	 *  @param  DoliDb  $db         Database handler
+	 *  @param  string  $objecttype Type of the associated object in dolibarr
+	 *  @param  int     $objectid   Id of the associated object in dolibarr
+	 *  @return int                 Nb of links, -1 if error
+	 **/
+	public static function count($db, $objecttype, $objectid)
+	{
+		global $conf;
 
-        $sql = "SELECT COUNT(rowid) as nb FROM ".MAIN_DB_PREFIX."links";
-        $sql .= " WHERE objecttype = '".$db->escape($objecttype)."' AND objectid = ".$objectid;
-        if ($conf->entity != 0) $sql .= " AND entity = ".$conf->entity;
+		$sql = "SELECT COUNT(rowid) as nb FROM ".MAIN_DB_PREFIX."links";
+		$sql .= " WHERE objecttype = '".$db->escape($objecttype)."' AND objectid = ".$objectid;
+		if ($conf->entity != 0) $sql .= " AND entity = ".$conf->entity;
 
-        $resql = $db->query($sql);
-        if ($resql)
-        {
-            $obj = $db->fetch_object($resql);
-            if ($obj) return $obj->nb;
-        }
-        return -1;
-    }
+		$resql = $db->query($sql);
+		if ($resql)
+		{
+			$obj = $db->fetch_object($resql);
+			if ($obj) return $obj->nb;
+		}
+		return -1;
+	}
 
-    /**
-     *  Loads a link from database
-     *
-     *  @param 	int		$rowid 		Id of link to load
-     *  @return int 				1 if ok, 0 if no record found, -1 if error
-     **/
-    public function fetch($rowid = null)
-    {
-        global $conf;
+	/**
+	 *  Loads a link from database
+	 *
+	 *  @param 	int		$rowid 		Id of link to load
+	 *  @return int 				1 if ok, 0 if no record found, -1 if error
+	 **/
+	public function fetch($rowid = null)
+	{
+		global $conf;
 
-        if (empty($rowid)) {
-            $rowid = $this->id;
-        }
+		if (empty($rowid)) {
+			$rowid = $this->id;
+		}
 
-        $sql = "SELECT rowid, entity, datea, url, label, objecttype, objectid FROM ".MAIN_DB_PREFIX."links";
-        $sql .= " WHERE rowid = ".$rowid;
-        if ($conf->entity != 0) $sql .= " AND entity = ".$conf->entity;
+		$sql = "SELECT rowid, entity, datea, url, label, objecttype, objectid FROM ".MAIN_DB_PREFIX."links";
+		$sql .= " WHERE rowid = ".$rowid;
+		if ($conf->entity != 0) $sql .= " AND entity = ".$conf->entity;
 
-        dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            if ($this->db->num_rows($resql) > 0)
-            {
-                $obj = $this->db->fetch_object($resql);
+		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			if ($this->db->num_rows($resql) > 0)
+			{
+				$obj = $this->db->fetch_object($resql);
 
-                $this->id = $obj->rowid;
-                $this->entity = $obj->entity;
-                $this->datea = $this->db->jdate($obj->datea);
-                $this->url = $obj->url;
-                $this->label = $obj->label;
-                $this->objecttype = $obj->objecttype;
-                $this->objectid = $obj->objectid;
-                return 1;
-            } else {
-                return 0;
-            }
-        } else {
-            $this->error = $this->db->lasterror();
-            return -1;
-        }
-    }
+				$this->id = $obj->rowid;
+				$this->entity = $obj->entity;
+				$this->datea = $this->db->jdate($obj->datea);
+				$this->url = $obj->url;
+				$this->label = $obj->label;
+				$this->objecttype = $obj->objecttype;
+				$this->objectid = $obj->objectid;
+				return 1;
+			} else {
+				return 0;
+			}
+		} else {
+			$this->error = $this->db->lasterror();
+			return -1;
+		}
+	}
 
-    /**
-     *    Delete a link from database
-     *
-     *	  @param	User		$user		Object suer
-     *    @return	int						<0 if KO, 0 if nothing done, >0 if OK
-     */
-    public function delete($user)
-    {
-        dol_syslog(get_class($this)."::delete", LOG_DEBUG);
-        $error = 0;
+	/**
+	 *    Delete a link from database
+	 *
+	 *	  @param	User		$user		Object suer
+	 *    @return	int						<0 if KO, 0 if nothing done, >0 if OK
+	 */
+	public function delete($user)
+	{
+		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
+		$error = 0;
 
-        $this->db->begin();
+		$this->db->begin();
 
-        // Call trigger
-        $result = $this->call_trigger('LINK_DELETE', $user);
-        if ($result < 0)
-        {
-        	$this->db->rollback();
-        	return -1;
-        }
-        // End call triggers
+		// Call trigger
+		$result = $this->call_trigger('LINK_DELETE', $user);
+		if ($result < 0)
+		{
+			$this->db->rollback();
+			return -1;
+		}
+		// End call triggers
 
-        // Remove link
-        $sql = "DELETE FROM ".MAIN_DB_PREFIX."links";
-        $sql .= " WHERE rowid = ".$this->id;
+		// Remove link
+		$sql = "DELETE FROM ".MAIN_DB_PREFIX."links";
+		$sql .= " WHERE rowid = ".$this->id;
 
-        dol_syslog(get_class($this)."::delete", LOG_DEBUG);
-        if (!$this->db->query($sql))
-        {
-            $error++;
-            $this->error = $this->db->lasterror();
-        }
+		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
+		if (!$this->db->query($sql))
+		{
+			$error++;
+			$this->error = $this->db->lasterror();
+		}
 
-        if (!$error) {
-            $this->db->commit();
+		if (!$error) {
+			$this->db->commit();
 
-            return 1;
-        } else {
-            $this->db->rollback();
-            return -1;
-        }
-    }
+			return 1;
+		} else {
+			$this->db->rollback();
+			return -1;
+		}
+	}
 }
diff --git a/htdocs/core/class/menu.class.php b/htdocs/core/class/menu.class.php
index 06bc79804bf..52bd1ebddad 100644
--- a/htdocs/core/class/menu.class.php
+++ b/htdocs/core/class/menu.class.php
@@ -28,101 +28,101 @@
  */
 class Menu
 {
-    public $liste;
+	public $liste;
 
-    /**
-     *	Constructor
-     */
-    public function __construct()
-    {
-          $this->liste = array();
-    }
+	/**
+	 *	Constructor
+	 */
+	public function __construct()
+	{
+		  $this->liste = array();
+	}
 
-    /**
-     * Clear property ->liste
-     *
-     * @return	void
-     */
-    public function clear()
-    {
-        $this->liste = array();
-    }
+	/**
+	 * Clear property ->liste
+	 *
+	 * @return	void
+	 */
+	public function clear()
+	{
+		$this->liste = array();
+	}
 
-    /**
-     * Add a menu entry into this->liste (at end)
-     *
-     * @param	string	$url        Url to follow on click (does not include DOL_URL_ROOT)
-     * @param   string	$titre      Label of menu to add. The value must already be translated.
-     * @param   integer	$level      Level of menu to add
-     * @param   int		$enabled    Menu active or not (0=Not active, 1=Active, 2=Active but grey)
-     * @param   string	$target		Target link
-     * @param	string	$mainmenu	Main menu ('home', 'companies', 'products', ...)
-     * @param	string	$leftmenu	Left menu ('setup', 'system', 'admintools', ...)
-     * @param	int		$position	Position (not used yet)
-     * @param	string	$id			Id
-     * @param	string	$idsel		Id sel
-     * @param	string	$classname	Class name
-     * @param	string	$prefix		Prefix to title (image or picto)
-     * @return	void
-     */
-    public function add($url, $titre, $level = 0, $enabled = 1, $target = '', $mainmenu = '', $leftmenu = '', $position = 0, $id = '', $idsel = '', $classname = '', $prefix = '')
-    {
-        $this->liste[] = array('url'=>$url, 'titre'=>$titre, 'level'=>$level, 'enabled'=>$enabled, 'target'=>$target, 'mainmenu'=>$mainmenu, 'leftmenu'=>$leftmenu, 'position'=>$position, 'id'=>$id, 'idsel'=>$idsel, 'classname'=>$classname, 'prefix'=>$prefix);
-    }
+	/**
+	 * Add a menu entry into this->liste (at end)
+	 *
+	 * @param	string	$url        Url to follow on click (does not include DOL_URL_ROOT)
+	 * @param   string	$titre      Label of menu to add. The value must already be translated.
+	 * @param   integer	$level      Level of menu to add
+	 * @param   int		$enabled    Menu active or not (0=Not active, 1=Active, 2=Active but grey)
+	 * @param   string	$target		Target link
+	 * @param	string	$mainmenu	Main menu ('home', 'companies', 'products', ...)
+	 * @param	string	$leftmenu	Left menu ('setup', 'system', 'admintools', ...)
+	 * @param	int		$position	Position (not used yet)
+	 * @param	string	$id			Id
+	 * @param	string	$idsel		Id sel
+	 * @param	string	$classname	Class name
+	 * @param	string	$prefix		Prefix to title (image or picto)
+	 * @return	void
+	 */
+	public function add($url, $titre, $level = 0, $enabled = 1, $target = '', $mainmenu = '', $leftmenu = '', $position = 0, $id = '', $idsel = '', $classname = '', $prefix = '')
+	{
+		$this->liste[] = array('url'=>$url, 'titre'=>$titre, 'level'=>$level, 'enabled'=>$enabled, 'target'=>$target, 'mainmenu'=>$mainmenu, 'leftmenu'=>$leftmenu, 'position'=>$position, 'id'=>$id, 'idsel'=>$idsel, 'classname'=>$classname, 'prefix'=>$prefix);
+	}
 
-    /**
-     * Insert a menu entry into this->liste
-     *
-     * @param   int     $idafter    Array key after which inserting new entry
-     * @param	string	$url        Url to follow on click
-     * @param   string	$titre      Label of menu to add. The value must already be translated.
-     * @param   integer	$level      Level of menu to add
-     * @param   int		$enabled    Menu active or not
-     * @param   string	$target		Target link
-     * @param	string	$mainmenu	Main menu ('home', 'companies', 'products', ...)
-     * @param	string	$leftmenu	Left menu ('setup', 'system', 'admintools', ...)
-     * @param	int		$position	Position (not used yet)
-     * @param	string	$id			Id
-     * @param	string	$idsel		Id sel
-     * @param	string	$classname	Class name
-     * @param	string	$prefix		Prefix to title (image or picto)
-     * @return	void
-     */
-    public function insert($idafter, $url, $titre, $level = 0, $enabled = 1, $target = '', $mainmenu = '', $leftmenu = '', $position = 0, $id = '', $idsel = '', $classname = '', $prefix = '')
-    {
-        $array_start = array_slice($this->liste, 0, ($idafter + 1));
-        $array_new   = array(0=>array('url'=>$url, 'titre'=>$titre, 'level'=>$level, 'enabled'=>$enabled, 'target'=>$target, 'mainmenu'=>$mainmenu, 'leftmenu'=>$leftmenu, 'position'=>$position, 'id'=>$id, 'idsel'=>$idsel, 'classname'=>$classname, 'prefix'=>$prefix));
-        $array_end   = array_slice($this->liste, ($idafter + 1));
-        $this->liste = array_merge($array_start, $array_new, $array_end);
-    }
+	/**
+	 * Insert a menu entry into this->liste
+	 *
+	 * @param   int     $idafter    Array key after which inserting new entry
+	 * @param	string	$url        Url to follow on click
+	 * @param   string	$titre      Label of menu to add. The value must already be translated.
+	 * @param   integer	$level      Level of menu to add
+	 * @param   int		$enabled    Menu active or not
+	 * @param   string	$target		Target link
+	 * @param	string	$mainmenu	Main menu ('home', 'companies', 'products', ...)
+	 * @param	string	$leftmenu	Left menu ('setup', 'system', 'admintools', ...)
+	 * @param	int		$position	Position (not used yet)
+	 * @param	string	$id			Id
+	 * @param	string	$idsel		Id sel
+	 * @param	string	$classname	Class name
+	 * @param	string	$prefix		Prefix to title (image or picto)
+	 * @return	void
+	 */
+	public function insert($idafter, $url, $titre, $level = 0, $enabled = 1, $target = '', $mainmenu = '', $leftmenu = '', $position = 0, $id = '', $idsel = '', $classname = '', $prefix = '')
+	{
+		$array_start = array_slice($this->liste, 0, ($idafter + 1));
+		$array_new   = array(0=>array('url'=>$url, 'titre'=>$titre, 'level'=>$level, 'enabled'=>$enabled, 'target'=>$target, 'mainmenu'=>$mainmenu, 'leftmenu'=>$leftmenu, 'position'=>$position, 'id'=>$id, 'idsel'=>$idsel, 'classname'=>$classname, 'prefix'=>$prefix));
+		$array_end   = array_slice($this->liste, ($idafter + 1));
+		$this->liste = array_merge($array_start, $array_new, $array_end);
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * Remove a menu entry from this->liste
-     *
-     * @return	void
-     */
-    public function remove_last()
-    {
-        // phpcs:enable
-    	if (count($this->liste) > 1) {
-            array_pop($this->liste);
-        }
-    }
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Remove a menu entry from this->liste
+	 *
+	 * @return	void
+	 */
+	public function remove_last()
+	{
+		// phpcs:enable
+		if (count($this->liste) > 1) {
+			array_pop($this->liste);
+		}
+	}
 
-    /**
-     * Return number of visible entries (gray or not)
-     *
-     *  @return int     Number of visible (gray or not) menu entries
-     */
-    public function getNbOfVisibleMenuEntries()
-    {
-        $nb = 0;
-        foreach ($this->liste as $val)
-        {
-        	//if (dol_eval($val['enabled'], 1)) $nb++;
-        	if (!empty($val['enabled'])) $nb++;			// $val['enabled'] is already evaluated to 0 or 1, no need for dol_eval()
-        }
-        return $nb;
-    }
+	/**
+	 * Return number of visible entries (gray or not)
+	 *
+	 *  @return int     Number of visible (gray or not) menu entries
+	 */
+	public function getNbOfVisibleMenuEntries()
+	{
+		$nb = 0;
+		foreach ($this->liste as $val)
+		{
+			//if (dol_eval($val['enabled'], 1)) $nb++;
+			if (!empty($val['enabled'])) $nb++; // $val['enabled'] is already evaluated to 0 or 1, no need for dol_eval()
+		}
+		return $nb;
+	}
 }
diff --git a/htdocs/core/class/notify.class.php b/htdocs/core/class/notify.class.php
index 82b6c8859bc..6547b98471a 100644
--- a/htdocs/core/class/notify.class.php
+++ b/htdocs/core/class/notify.class.php
@@ -37,9 +37,9 @@ class Notify
 	public $id;
 
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
 	/**
 	 * @var string Error code (or message)
@@ -58,9 +58,9 @@ class Notify
 	public $note;
 
 	/**
-     * @var int Project ID
-     */
-    public $fk_project;
+	 * @var int Project ID
+	 */
+	public $fk_project;
 
 	// Les codes actions sont definis dans la table llx_notify_def
 
@@ -335,7 +335,7 @@ class Notify
 		$object_type = '';
 		$link = '';
 		$num = 0;
-        $error = 0;
+		$error = 0;
 
 		$oldref = (empty($object->oldref) ? $object->ref : $object->oldref);
 		$newref = (empty($object->newref) ? $object->ref : $object->newref);
@@ -413,31 +413,31 @@ class Notify
 
 						switch ($notifcode) {
 							case 'BILL_VALIDATE':
-								$link = '<a href="' . $urlwithroot . '/compta/facture/card.php?facid=' . $object->id . '">' . $newref . '</a>';
+								$link = '<a href="'.$urlwithroot.'/compta/facture/card.php?facid='.$object->id.'">'.$newref.'</a>';
 								$dir_output = $conf->facture->dir_output;
 								$object_type = 'facture';
 								$mesg = $outputlangs->transnoentitiesnoconv("EMailTextInvoiceValidated", $link);
 								break;
 							case 'BILL_PAYED':
-								$link ='<a href="' . $urlwithroot . '/compta/facture/card.php?facid='.$object->id . '">' . $newref . '</a>';
+								$link = '<a href="'.$urlwithroot.'/compta/facture/card.php?facid='.$object->id.'">'.$newref.'</a>';
 								$dir_output = $conf->facture->dir_output;
 								$object_type = 'facture';
 								$mesg = $outputlangs->transnoentitiesnoconv("EMailTextInvoicePayed", $link);
 								break;
 							case 'ORDER_VALIDATE':
-								$link = '<a href="' . $urlwithroot . '/commande/card.php?id='.$object->id . '">' . $newref . '</a>';
+								$link = '<a href="'.$urlwithroot.'/commande/card.php?id='.$object->id.'">'.$newref.'</a>';
 								$dir_output = $conf->commande->dir_output;
 								$object_type = 'order';
 								$mesg = $outputlangs->transnoentitiesnoconv("EMailTextOrderValidated", $link);
 								break;
 							case 'PROPAL_VALIDATE':
-								$link = '<a href="' . $urlwithroot . '/comm/propal/card.php?id='.$object->id . '">' . $newref . '</a>';
+								$link = '<a href="'.$urlwithroot.'/comm/propal/card.php?id='.$object->id.'">'.$newref.'</a>';
 								$dir_output = $conf->propal->multidir_output[$object->entity];
 								$object_type = 'propal';
 								$mesg = $outputlangs->transnoentitiesnoconv("EMailTextProposalValidated", $link);
 								break;
 							case 'PROPAL_CLOSE_SIGNED':
-								$link = '<a href="' . $urlwithroot . '/comm/propal/card.php?id='.$object->id . '">' . $newref . '</a>';
+								$link = '<a href="'.$urlwithroot.'/comm/propal/card.php?id='.$object->id.'">'.$newref.'</a>';
 								$dir_output = $conf->propal->multidir_output[$object->entity];
 								$object_type = 'propal';
 								$mesg = $outputlangs->transnoentitiesnoconv("EMailTextProposalClosedSigned", $link);
@@ -471,7 +471,7 @@ class Notify
 								$mesg .= "\n\n".$outputlangs->transnoentitiesnoconv("Sincerely").".\n\n";
 								break;
 							case 'ORDER_SUPPLIER_REFUSE':
-								$link = '<a href="' . $urlwithroot . '/fourn/commande/card.php?id='.$object->id . '">' . $newref . '</a>';
+								$link = '<a href="'.$urlwithroot.'/fourn/commande/card.php?id='.$object->id.'">'.$newref.'</a>';
 								$dir_output = $conf->fournisseur->commande->dir_output;
 								$object_type = 'order_supplier';
 								$mesg = $outputlangs->transnoentitiesnoconv("Hello").",\n\n";
@@ -534,7 +534,7 @@ class Notify
 							if (!empty($hookmanager->resArray['message'])) $message .= $hookmanager->resArray['message'];
 						}
 
-                        $mailfile = new CMailFile(
+						$mailfile = new CMailFile(
 							$subject,
 							$sendto,
 							$replyto,
@@ -546,12 +546,12 @@ class Notify
 							'',
 							0,
 							-1,
-                            '',
-                            '',
-                            $trackid,
-                            '',
-                            'notification'
-                        );
+							'',
+							'',
+							$trackid,
+							'',
+							'notification'
+						);
 
 						if ($mailfile->sendfile())
 						{
@@ -761,7 +761,7 @@ class Notify
 						if (!empty($hookmanager->resArray['subject'])) $subject .= $hookmanager->resArray['subject'];
 						if (!empty($hookmanager->resArray['message'])) $message .= $hookmanager->resArray['message'];
 					}
-                    $mailfile = new CMailFile(
+					$mailfile = new CMailFile(
 						$subject,
 						$sendto,
 						$replyto,
@@ -773,11 +773,11 @@ class Notify
 						'',
 						0,
 						1,
-                        '',
-                        $trackid,
-                        '',
-                        '',
-                        'notification'
+						'',
+						$trackid,
+						'',
+						'',
+						'notification'
 					);
 
 					if ($mailfile->sendfile())
diff --git a/htdocs/core/class/openid.class.php b/htdocs/core/class/openid.class.php
index 19a94bca9f6..0d382a78589 100644
--- a/htdocs/core/class/openid.class.php
+++ b/htdocs/core/class/openid.class.php
@@ -26,127 +26,127 @@
  */
 class SimpleOpenID
 {
-    public $openid_url_identity;
-    public $URLs = array();
-    public $error = array();
-    public $fields = array(
-        'required' => array(),
-        'optional' => array(),
-    );
+	public $openid_url_identity;
+	public $URLs = array();
+	public $error = array();
+	public $fields = array(
+		'required' => array(),
+		'optional' => array(),
+	);
 
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-        if (!function_exists('curl_exec'))
-        {
-            die('Error: Class SimpleOpenID requires curl extension to work');
-        }
-    }
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		if (!function_exists('curl_exec'))
+		{
+			die('Error: Class SimpleOpenID requires curl extension to work');
+		}
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * SetOpenIDServer
-     *
-     * @param	string	$a		Server
-     * @return	void
-     */
-    public function SetOpenIDServer($a)
-    {
-        // phpcs:enable
-        $this->URLs['openid_server'] = $a;
-    }
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * SetOpenIDServer
+	 *
+	 * @param	string	$a		Server
+	 * @return	void
+	 */
+	public function SetOpenIDServer($a)
+	{
+		// phpcs:enable
+		$this->URLs['openid_server'] = $a;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * SetOpenIDServer
-     *
-     * @param	string	$a		Server
-     * @return	void
-     */
-    public function SetTrustRoot($a)
-    {
-        // phpcs:enable
-        $this->URLs['trust_root'] = $a;
-    }
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * SetOpenIDServer
+	 *
+	 * @param	string	$a		Server
+	 * @return	void
+	 */
+	public function SetTrustRoot($a)
+	{
+		// phpcs:enable
+		$this->URLs['trust_root'] = $a;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * SetOpenIDServer
-     *
-     * @param	string	$a		Server
-     * @return	void
-     */
-    public function SetCancelURL($a)
-    {
-        // phpcs:enable
-        $this->URLs['cancel'] = $a;
-    }
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * SetOpenIDServer
+	 *
+	 * @param	string	$a		Server
+	 * @return	void
+	 */
+	public function SetCancelURL($a)
+	{
+		// phpcs:enable
+		$this->URLs['cancel'] = $a;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * SetApprovedURL
-     *
-     * @param	string	$a		Server
-     * @return	void
-     */
-    public function SetApprovedURL($a)
-    {
-        // phpcs:enable
-        $this->URLs['approved'] = $a;
-    }
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * SetApprovedURL
+	 *
+	 * @param	string	$a		Server
+	 * @return	void
+	 */
+	public function SetApprovedURL($a)
+	{
+		// phpcs:enable
+		$this->URLs['approved'] = $a;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * SetRequiredFields
-     *
-     * @param	string	$a		Server
-     * @return	void
-     */
-    public function SetRequiredFields($a)
-    {
-        // phpcs:enable
-        if (is_array($a)) {
-            $this->fields['required'] = $a;
-        } else {
-            $this->fields['required'][] = $a;
-        }
-    }
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * SetRequiredFields
+	 *
+	 * @param	string	$a		Server
+	 * @return	void
+	 */
+	public function SetRequiredFields($a)
+	{
+		// phpcs:enable
+		if (is_array($a)) {
+			$this->fields['required'] = $a;
+		} else {
+			$this->fields['required'][] = $a;
+		}
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * SetOptionalFields
-     *
-     * @param	string	$a		Server
-     * @return	void
-     */
-    public function SetOptionalFields($a)
-    {
-        // phpcs:enable
-        if (is_array($a)) {
-            $this->fields['optional'] = $a;
-        } else {
-            $this->fields['optional'][] = $a;
-        }
-    }
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * SetOptionalFields
+	 *
+	 * @param	string	$a		Server
+	 * @return	void
+	 */
+	public function SetOptionalFields($a)
+	{
+		// phpcs:enable
+		if (is_array($a)) {
+			$this->fields['optional'] = $a;
+		} else {
+			$this->fields['optional'][] = $a;
+		}
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * SetIdentity
-     *
-     * @param	string  $a		Server
-     * @return	void
-     */
-    public function SetIdentity($a)
-    {
-        // phpcs:enable
-        // Set Identity URL
-        if ((stripos($a, 'http://') === false)
-        && (stripos($a, 'https://') === false)) {
-            $a = 'http://'.$a;
-        }
-        /*
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * SetIdentity
+	 *
+	 * @param	string  $a		Server
+	 * @return	void
+	 */
+	public function SetIdentity($a)
+	{
+		// phpcs:enable
+		// Set Identity URL
+		if ((stripos($a, 'http://') === false)
+		&& (stripos($a, 'https://') === false)) {
+			$a = 'http://'.$a;
+		}
+		/*
          $u = parse_url(trim($a));
          if (!isset($u['path'])){
          $u['path'] = '/';
@@ -159,371 +159,371 @@ class SimpleOpenID
          $identity = $u['scheme'] . '://' . $u['host'] . $u['path'];
          }
         */
-        $this->openid_url_identity = $a;
-    }
+		$this->openid_url_identity = $a;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * GetIdentity
-     *
-     * @return	string
-     */
-    public function GetIdentity()
-    {
-        // phpcs:enable
-        // Get Identity
-        return $this->openid_url_identity;
-    }
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * GetIdentity
+	 *
+	 * @return	string
+	 */
+	public function GetIdentity()
+	{
+		// phpcs:enable
+		// Get Identity
+		return $this->openid_url_identity;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * SetOpenIDServer
-     *
-     * @return	void
-     */
-    public function GetError()
-    {
-        // phpcs:enable
-        $e = $this->error;
-        return array('code'=>$e[0], 'description'=>$e[1]);
-    }
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * SetOpenIDServer
+	 *
+	 * @return	void
+	 */
+	public function GetError()
+	{
+		// phpcs:enable
+		$e = $this->error;
+		return array('code'=>$e[0], 'description'=>$e[1]);
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * ErrorStore
-     *
-     * @param	string	$code		Code
-     * @param	string	$desc		Description
-     * @return	void
-     */
-    public function ErrorStore($code, $desc = null)
-    {
-        // phpcs:enable
-        $errs['OPENID_NOSERVERSFOUND'] = 'Cannot find OpenID Server TAG on Identity page.';
-        if ($desc == null) {
-            $desc = $errs[$code];
-        }
-        $this->error = array($code, $desc);
-    }
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * ErrorStore
+	 *
+	 * @param	string	$code		Code
+	 * @param	string	$desc		Description
+	 * @return	void
+	 */
+	public function ErrorStore($code, $desc = null)
+	{
+		// phpcs:enable
+		$errs['OPENID_NOSERVERSFOUND'] = 'Cannot find OpenID Server TAG on Identity page.';
+		if ($desc == null) {
+			$desc = $errs[$code];
+		}
+		$this->error = array($code, $desc);
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * IsError
-     *
-     * @return	boolean
-     */
-    public function IsError()
-    {
-        // phpcs:enable
-        if (count($this->error) > 0)
-        {
-            return true;
-        } else {
-            return false;
-        }
-    }
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * IsError
+	 *
+	 * @return	boolean
+	 */
+	public function IsError()
+	{
+		// phpcs:enable
+		if (count($this->error) > 0)
+		{
+			return true;
+		} else {
+			return false;
+		}
+	}
 
-    /**
-     * splitResponse
-     *
-     * @param	string	$response		Server
-     * @return	void
-     */
-    public function splitResponse($response)
-    {
-        $r = array();
-        $response = explode("\n", $response);
-        foreach ($response as $line) {
-            $line = trim($line);
-            if ($line != "") {
-                list($key, $value) = explode(":", $line, 2);
-                $r[trim($key)] = trim($value);
-            }
-        }
-        return $r;
-    }
+	/**
+	 * splitResponse
+	 *
+	 * @param	string	$response		Server
+	 * @return	void
+	 */
+	public function splitResponse($response)
+	{
+		$r = array();
+		$response = explode("\n", $response);
+		foreach ($response as $line) {
+			$line = trim($line);
+			if ($line != "") {
+				list($key, $value) = explode(":", $line, 2);
+				$r[trim($key)] = trim($value);
+			}
+		}
+		return $r;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * OpenID_Standarize
-     *
-     * @param	string	$openid_identity		Server
-     * @return	string
-     */
-    public function OpenID_Standarize($openid_identity = null)
-    {
-        // phpcs:enable
-        if ($openid_identity === null)
-        $openid_identity = $this->openid_url_identity;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * OpenID_Standarize
+	 *
+	 * @param	string	$openid_identity		Server
+	 * @return	string
+	 */
+	public function OpenID_Standarize($openid_identity = null)
+	{
+		// phpcs:enable
+		if ($openid_identity === null)
+		$openid_identity = $this->openid_url_identity;
 
-        $u = parse_url(strtolower(trim($openid_identity)));
+		$u = parse_url(strtolower(trim($openid_identity)));
 
-        if (!isset($u['path']) || ($u['path'] == '/')) {
-            $u['path'] = '';
-        }
-        if (substr($u['path'], -1, 1) == '/') {
-            $u['path'] = substr($u['path'], 0, strlen($u['path']) - 1);
-        }
-        if (isset($u['query'])) { // If there is a query string, then use identity as is
-            return $u['host'].$u['path'].'?'.$u['query'];
-        } else {
-            return $u['host'].$u['path'];
-        }
-    }
+		if (!isset($u['path']) || ($u['path'] == '/')) {
+			$u['path'] = '';
+		}
+		if (substr($u['path'], -1, 1) == '/') {
+			$u['path'] = substr($u['path'], 0, strlen($u['path']) - 1);
+		}
+		if (isset($u['query'])) { // If there is a query string, then use identity as is
+			return $u['host'].$u['path'].'?'.$u['query'];
+		} else {
+			return $u['host'].$u['path'];
+		}
+	}
 
-    /**
-     * array2url
-     *
-     * @param 	array	$arr		An array
-     * @return false|string		false if KO, string of url if OK
-     */
-    public function array2url($arr)
-    {
-        // converts associated array to URL Query String
-        if (!is_array($arr)) {
-            return false;
-        }
-        $query = '';
-        foreach ($arr as $key => $value) {
-            $query .= $key."=".$value."&";
-        }
-        return $query;
-    }
+	/**
+	 * array2url
+	 *
+	 * @param 	array	$arr		An array
+	 * @return false|string		false if KO, string of url if OK
+	 */
+	public function array2url($arr)
+	{
+		// converts associated array to URL Query String
+		if (!is_array($arr)) {
+			return false;
+		}
+		$query = '';
+		foreach ($arr as $key => $value) {
+			$query .= $key."=".$value."&";
+		}
+		return $query;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * FSOCK_Request
-     *
-     * @param string 	$url		URL
-     * @param string	$method		Method
-     * @param string	$params		Params
-     * @return boolean|void			True if success, False if error
-     */
-    public function FSOCK_Request($url, $method = "GET", $params = "")
-    {
-        // phpcs:enable
-        $fp = fsockopen("ssl://www.myopenid.com", 443, $errno, $errstr, 3); // Connection timeout is 3 seconds
-        if (!$fp) {
-            $this->ErrorStore('OPENID_SOCKETERROR', $errstr);
-            return false;
-        } else {
-            $request = $method." /server HTTP/1.0\r\n";
-            $request .= "User-Agent: Dolibarr\r\n";
-            $request .= "Connection: close\r\n\r\n";
-            fwrite($fp, $request);
-            stream_set_timeout($fp, 4); // Connection response timeout is 4 seconds
-            $res = fread($fp, 2000);
-            $info = stream_get_meta_data($fp);
-            fclose($fp);
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * FSOCK_Request
+	 *
+	 * @param string 	$url		URL
+	 * @param string	$method		Method
+	 * @param string	$params		Params
+	 * @return boolean|void			True if success, False if error
+	 */
+	public function FSOCK_Request($url, $method = "GET", $params = "")
+	{
+		// phpcs:enable
+		$fp = fsockopen("ssl://www.myopenid.com", 443, $errno, $errstr, 3); // Connection timeout is 3 seconds
+		if (!$fp) {
+			$this->ErrorStore('OPENID_SOCKETERROR', $errstr);
+			return false;
+		} else {
+			$request = $method." /server HTTP/1.0\r\n";
+			$request .= "User-Agent: Dolibarr\r\n";
+			$request .= "Connection: close\r\n\r\n";
+			fwrite($fp, $request);
+			stream_set_timeout($fp, 4); // Connection response timeout is 4 seconds
+			$res = fread($fp, 2000);
+			$info = stream_get_meta_data($fp);
+			fclose($fp);
 
-            if ($info['timed_out']) {
-                $this->ErrorStore('OPENID_SOCKETTIMEOUT');
-            } else {
-                return $res;
-            }
-        }
-    }
+			if ($info['timed_out']) {
+				$this->ErrorStore('OPENID_SOCKETTIMEOUT');
+			} else {
+				return $res;
+			}
+		}
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * CURL_Request
-     *
-     * @param 	string	$url		URL
-     * @param 	string	$method		Method
-     * @param 	string	$params		Params
-     * @return string
-     */
-    public function CURL_Request($url, $method = "GET", $params = "")
-    {
-        // phpcs:enable
-        // Remember, SSL MUST BE SUPPORTED
-        if (is_array($params)) $params = $this->array2url($params);
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * CURL_Request
+	 *
+	 * @param 	string	$url		URL
+	 * @param 	string	$method		Method
+	 * @param 	string	$params		Params
+	 * @return string
+	 */
+	public function CURL_Request($url, $method = "GET", $params = "")
+	{
+		// phpcs:enable
+		// Remember, SSL MUST BE SUPPORTED
+		if (is_array($params)) $params = $this->array2url($params);
 
-        $curl = curl_init($url.($method == "GET" && $params != "" ? "?".$params : ""));
-        @curl_setopt($curl, CURLOPT_FOLLOWLOCATION, true);
-        curl_setopt($curl, CURLOPT_HEADER, false);
-        curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false);
-        curl_setopt($curl, CURLOPT_HTTPGET, ($method == "GET"));
-        curl_setopt($curl, CURLOPT_POST, ($method == "POST"));
-        if ($method == "POST") curl_setopt($curl, CURLOPT_POSTFIELDS, $params);
-        curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
-        $response = curl_exec($curl);
+		$curl = curl_init($url.($method == "GET" && $params != "" ? "?".$params : ""));
+		@curl_setopt($curl, CURLOPT_FOLLOWLOCATION, true);
+		curl_setopt($curl, CURLOPT_HEADER, false);
+		curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false);
+		curl_setopt($curl, CURLOPT_HTTPGET, ($method == "GET"));
+		curl_setopt($curl, CURLOPT_POST, ($method == "POST"));
+		if ($method == "POST") curl_setopt($curl, CURLOPT_POSTFIELDS, $params);
+		curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
+		$response = curl_exec($curl);
 
-        if (curl_errno($curl) == 0) {
-            $response;
-        } else {
-            $this->ErrorStore('OPENID_CURL', curl_error($curl));
-        }
-        return $response;
-    }
+		if (curl_errno($curl) == 0) {
+			$response;
+		} else {
+			$this->ErrorStore('OPENID_CURL', curl_error($curl));
+		}
+		return $response;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * HTML2OpenIDServer
-     *
-     * @param string	$content	Content
-     * @return array				Array of servers
-     */
-    public function HTML2OpenIDServer($content)
-    {
-        // phpcs:enable
-        $get = array();
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * HTML2OpenIDServer
+	 *
+	 * @param string	$content	Content
+	 * @return array				Array of servers
+	 */
+	public function HTML2OpenIDServer($content)
+	{
+		// phpcs:enable
+		$get = array();
 
-        // Get details of their OpenID server and (optional) delegate
-        preg_match_all('/<link[^>]*rel=[\'"]openid.server[\'"][^>]*href=[\'"]([^\'"]+)[\'"][^>]*\/?>/i', $content, $matches1);
-        preg_match_all('/<link[^>]*href=\'"([^\'"]+)[\'"][^>]*rel=[\'"]openid.server[\'"][^>]*\/?>/i', $content, $matches2);
-        $servers = array_merge($matches1[1], $matches2[1]);
+		// Get details of their OpenID server and (optional) delegate
+		preg_match_all('/<link[^>]*rel=[\'"]openid.server[\'"][^>]*href=[\'"]([^\'"]+)[\'"][^>]*\/?>/i', $content, $matches1);
+		preg_match_all('/<link[^>]*href=\'"([^\'"]+)[\'"][^>]*rel=[\'"]openid.server[\'"][^>]*\/?>/i', $content, $matches2);
+		$servers = array_merge($matches1[1], $matches2[1]);
 
-        preg_match_all('/<link[^>]*rel=[\'"]openid.delegate[\'"][^>]*href=[\'"]([^\'"]+)[\'"][^>]*\/?>/i', $content, $matches1);
+		preg_match_all('/<link[^>]*rel=[\'"]openid.delegate[\'"][^>]*href=[\'"]([^\'"]+)[\'"][^>]*\/?>/i', $content, $matches1);
 
-        preg_match_all('/<link[^>]*href=[\'"]([^\'"]+)[\'"][^>]*rel=[\'"]openid.delegate[\'"][^>]*\/?>/i', $content, $matches2);
+		preg_match_all('/<link[^>]*href=[\'"]([^\'"]+)[\'"][^>]*rel=[\'"]openid.delegate[\'"][^>]*\/?>/i', $content, $matches2);
 
-        $delegates = array_merge($matches1[1], $matches2[1]);
+		$delegates = array_merge($matches1[1], $matches2[1]);
 
-        $ret = array($servers, $delegates);
-        return $ret;
-    }
+		$ret = array($servers, $delegates);
+		return $ret;
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * Get openid server
-     *
-     * @param	string	$url	Url to found endpoint
-     * @return 	string			Endpoint
-     */
-    public function GetOpenIDServer($url = '')
-    {
-        // phpcs:enable
-        global $conf;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Get openid server
+	 *
+	 * @param	string	$url	Url to found endpoint
+	 * @return 	string			Endpoint
+	 */
+	public function GetOpenIDServer($url = '')
+	{
+		// phpcs:enable
+		global $conf;
 
-        include_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
-        if (empty($url)) $url = $conf->global->MAIN_AUTHENTICATION_OPENID_URL;
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
+		if (empty($url)) $url = $conf->global->MAIN_AUTHENTICATION_OPENID_URL;
 
-        $response = getURLContent($url);
+		$response = getURLContent($url);
 
-        list($servers, $delegates) = $this->HTML2OpenIDServer($response);
-        if (count($servers) == 0) {
-            $this->ErrorStore('OPENID_NOSERVERSFOUND');
-            return false;
-        }
-        if (isset($delegates[0])
-        && ($delegates[0] != "")) {
-            $this->SetIdentity($delegates[0]);
-        }
-        $this->SetOpenIDServer($servers[0]);
-        return $servers[0];
-    }
+		list($servers, $delegates) = $this->HTML2OpenIDServer($response);
+		if (count($servers) == 0) {
+			$this->ErrorStore('OPENID_NOSERVERSFOUND');
+			return false;
+		}
+		if (isset($delegates[0])
+		&& ($delegates[0] != "")) {
+			$this->SetIdentity($delegates[0]);
+		}
+		$this->SetOpenIDServer($servers[0]);
+		return $servers[0];
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * GetRedirectURL
-     *
-     * @return	string
-     */
-    public function GetRedirectURL()
-    {
-        // phpcs:enable
-        $params = array();
-        $params['openid.return_to'] = urlencode($this->URLs['approved']);
-        $params['openid.mode'] = 'checkid_setup';
-        $params['openid.identity'] = urlencode($this->openid_url_identity);
-        $params['openid.trust_root'] = urlencode($this->URLs['trust_root']);
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * GetRedirectURL
+	 *
+	 * @return	string
+	 */
+	public function GetRedirectURL()
+	{
+		// phpcs:enable
+		$params = array();
+		$params['openid.return_to'] = urlencode($this->URLs['approved']);
+		$params['openid.mode'] = 'checkid_setup';
+		$params['openid.identity'] = urlencode($this->openid_url_identity);
+		$params['openid.trust_root'] = urlencode($this->URLs['trust_root']);
 
-        if (isset($this->fields['required'])
-        && (count($this->fields['required']) > 0)) {
-            $params['openid.sreg.required'] = implode(',', $this->fields['required']);
-        }
-        if (isset($this->fields['optional'])
-        && (count($this->fields['optional']) > 0)) {
-            $params['openid.sreg.optional'] = implode(',', $this->fields['optional']);
-        }
-        return $this->URLs['openid_server']."?".$this->array2url($params);
-    }
+		if (isset($this->fields['required'])
+		&& (count($this->fields['required']) > 0)) {
+			$params['openid.sreg.required'] = implode(',', $this->fields['required']);
+		}
+		if (isset($this->fields['optional'])
+		&& (count($this->fields['optional']) > 0)) {
+			$params['openid.sreg.optional'] = implode(',', $this->fields['optional']);
+		}
+		return $this->URLs['openid_server']."?".$this->array2url($params);
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * Redirect
-     *
-     * @return	void
-     */
-    public function Redirect()
-    {
-        // phpcs:enable
-        $redirect_to = $this->GetRedirectURL();
-        if (headers_sent())
-        { // Use JavaScript to redirect if content has been previously sent (not recommended, but safe)
-            echo '<script language="JavaScript" type="text/javascript">window.location=\'';
-            echo $redirect_to;
-            echo '\';</script>';
-        } else {	// Default Header Redirect
-            header('Location: '.$redirect_to);
-        }
-    }
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Redirect
+	 *
+	 * @return	void
+	 */
+	public function Redirect()
+	{
+		// phpcs:enable
+		$redirect_to = $this->GetRedirectURL();
+		if (headers_sent())
+		{ // Use JavaScript to redirect if content has been previously sent (not recommended, but safe)
+			echo '<script language="JavaScript" type="text/javascript">window.location=\'';
+			echo $redirect_to;
+			echo '\';</script>';
+		} else {	// Default Header Redirect
+			header('Location: '.$redirect_to);
+		}
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * ValidateWithServer
-     *
-     * @return	boolean
-     */
-    public function ValidateWithServer()
-    {
-        // phpcs:enable
-        $params = array(
-            'openid.assoc_handle' => urlencode($_GET['openid_assoc_handle']),
-            'openid.signed' => urlencode($_GET['openid_signed']),
-            'openid.sig' => urlencode($_GET['openid_sig'])
-        );
-        // Send only required parameters to confirm validity
-        $arr_signed = explode(",", str_replace('sreg.', 'sreg_', $_GET['openid_signed']));
-        $num = count($arr_signed);
-        for ($i = 0; $i < $num; $i++)
-        {
-            $s = str_replace('sreg_', 'sreg.', $arr_signed[$i]);
-            $c = $_GET['openid_'.$arr_signed[$i]];
-            // if ($c != ""){
-            $params['openid.'.$s] = urlencode($c);
-            // }
-        }
-        $params['openid.mode'] = "check_authentication";
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * ValidateWithServer
+	 *
+	 * @return	boolean
+	 */
+	public function ValidateWithServer()
+	{
+		// phpcs:enable
+		$params = array(
+			'openid.assoc_handle' => urlencode($_GET['openid_assoc_handle']),
+			'openid.signed' => urlencode($_GET['openid_signed']),
+			'openid.sig' => urlencode($_GET['openid_sig'])
+		);
+		// Send only required parameters to confirm validity
+		$arr_signed = explode(",", str_replace('sreg.', 'sreg_', $_GET['openid_signed']));
+		$num = count($arr_signed);
+		for ($i = 0; $i < $num; $i++)
+		{
+			$s = str_replace('sreg_', 'sreg.', $arr_signed[$i]);
+			$c = $_GET['openid_'.$arr_signed[$i]];
+			// if ($c != ""){
+			$params['openid.'.$s] = urlencode($c);
+			// }
+		}
+		$params['openid.mode'] = "check_authentication";
 
-        $openid_server = $this->GetOpenIDServer();
-        if ($openid_server == false)
-        {
-            return false;
-        }
-        $response = $this->CURL_Request($openid_server, 'POST', $params);
-        $data = $this->splitResponse($response);
-        if ($data['is_valid'] == "true")
-        {
-            return true;
-        } else {
-            return false;
-        }
-    }
+		$openid_server = $this->GetOpenIDServer();
+		if ($openid_server == false)
+		{
+			return false;
+		}
+		$response = $this->CURL_Request($openid_server, 'POST', $params);
+		$data = $this->splitResponse($response);
+		if ($data['is_valid'] == "true")
+		{
+			return true;
+		} else {
+			return false;
+		}
+	}
 
 
 
 
-    /**
-     * Get XRDS response and set possible servers.
-     *
-     * @param	string	$url	Url of endpoint to request
-     * @return 	string			First endpoint OpenID server found. False if it failed to found.
-     */
-    public function sendDiscoveryRequestToGetXRDS($url = '')
-    {
-        global $conf;
+	/**
+	 * Get XRDS response and set possible servers.
+	 *
+	 * @param	string	$url	Url of endpoint to request
+	 * @return 	string			First endpoint OpenID server found. False if it failed to found.
+	 */
+	public function sendDiscoveryRequestToGetXRDS($url = '')
+	{
+		global $conf;
 
-        include_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
-        if (empty($url)) $url = $conf->global->MAIN_AUTHENTICATION_OPENID_URL;
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
+		if (empty($url)) $url = $conf->global->MAIN_AUTHENTICATION_OPENID_URL;
 
-        dol_syslog(get_class($this).'::sendDiscoveryRequestToGetXRDS get XRDS');
+		dol_syslog(get_class($this).'::sendDiscoveryRequestToGetXRDS get XRDS');
 
-        $addheaders = array('Accept: application/xrds+xml');
-        $response = getURLContent($url, 'GET', '', 1, $addheaders);
-        /* response should like this:
+		$addheaders = array('Accept: application/xrds+xml');
+		$response = getURLContent($url, 'GET', '', 1, $addheaders);
+		/* response should like this:
         <?xml version="1.0" encoding="UTF-8"?>
         <xrds:XRDS xmlns:xrds="xri://$xrds" xmlns="xri://$xrd*($v*2.0)">
         <XRD>
@@ -536,22 +536,22 @@ class SimpleOpenID
         </XRD>
         </xrds:XRDS>
         */
-        $content = $response['content'];
+		$content = $response['content'];
 
-        $server = '';
-        if (preg_match('/'.preg_quote('<URI>', '/').'(.*)'.preg_quote('</URI>', '/').'/is', $content, $reg))
-        {
-            $server = $reg[1];
-        }
+		$server = '';
+		if (preg_match('/'.preg_quote('<URI>', '/').'(.*)'.preg_quote('</URI>', '/').'/is', $content, $reg))
+		{
+			$server = $reg[1];
+		}
 
-        if (empty($server))
-        {
-            $this->ErrorStore('OPENID_NOSERVERSFOUND');
-            return false;
-        } else {
-            dol_syslog(get_class($this).'::sendDiscoveryRequestToGetXRDS found endpoint = '.$server);
-            $this->SetOpenIDServer($server);
-            return $server;
-        }
-    }
+		if (empty($server))
+		{
+			$this->ErrorStore('OPENID_NOSERVERSFOUND');
+			return false;
+		} else {
+			dol_syslog(get_class($this).'::sendDiscoveryRequestToGetXRDS found endpoint = '.$server);
+			$this->SetOpenIDServer($server);
+			return $server;
+		}
+	}
 }
diff --git a/htdocs/core/class/rssparser.class.php b/htdocs/core/class/rssparser.class.php
index c18bfd1d263..cc278713c63 100644
--- a/htdocs/core/class/rssparser.class.php
+++ b/htdocs/core/class/rssparser.class.php
@@ -254,7 +254,7 @@ class RssParser
 				libxml_use_internal_errors(false);
 				$rss = simplexml_load_string($str, "SimpleXMLElement", LIBXML_NOCDATA);
 			} else {
-				if (! function_exists('xml_parser_create')) {
+				if (!function_exists('xml_parser_create')) {
 					$this->error = 'Function xml_parser_create are not supported by your PHP';
 					return -1;
 				}
diff --git a/htdocs/core/class/smtps.class.php b/htdocs/core/class/smtps.class.php
index 3adbf4af4d5..e42622c4170 100644
--- a/htdocs/core/class/smtps.class.php
+++ b/htdocs/core/class/smtps.class.php
@@ -45,435 +45,435 @@
  */
 class SMTPs
 {
-    /**
-     * Host Name or IP of SMTP Server to use
-     */
-    private $_smtpsHost = 'localhost';
+	/**
+	 * Host Name or IP of SMTP Server to use
+	 */
+	private $_smtpsHost = 'localhost';
 
-    /**
-     * SMTP Server Port definition. 25 is default value
-     * This can be defined via a INI file or via a setter method
-     */
-    private $_smtpsPort = '25';
+	/**
+	 * SMTP Server Port definition. 25 is default value
+	 * This can be defined via a INI file or via a setter method
+	 */
+	private $_smtpsPort = '25';
 
-    /**
-     * Secure SMTP Server access ID
-     * This can be defined via a INI file or via a setter method
-     */
-    private $_smtpsID = null;
+	/**
+	 * Secure SMTP Server access ID
+	 * This can be defined via a INI file or via a setter method
+	 */
+	private $_smtpsID = null;
 
-    /**
-     * Secure SMTP Server access Password
-     * This can be defined via a INI file or via a setter method
-     */
-    private $_smtpsPW = null;
+	/**
+	 * Secure SMTP Server access Password
+	 * This can be defined via a INI file or via a setter method
+	 */
+	private $_smtpsPW = null;
 
-    /**
-     * Who sent the Message
-     * This can be defined via a INI file or via a setter method
-     */
-    private $_msgFrom = null;
+	/**
+	 * Who sent the Message
+	 * This can be defined via a INI file or via a setter method
+	 */
+	private $_msgFrom = null;
 
-    /**
-     * Where are replies and errors to be sent to
-     * This can be defined via a INI file or via a setter method
-     */
-    private $_msgReplyTo = null;
+	/**
+	 * Where are replies and errors to be sent to
+	 * This can be defined via a INI file or via a setter method
+	 */
+	private $_msgReplyTo = null;
 
-    /**
-     * Who will the Message be sent to; TO, CC, BCC
-     * Multi-diminsional array containg addresses the message will
-     * be sent TO, CC or BCC
-     */
-    private $_msgRecipients = null;
+	/**
+	 * Who will the Message be sent to; TO, CC, BCC
+	 * Multi-diminsional array containg addresses the message will
+	 * be sent TO, CC or BCC
+	 */
+	private $_msgRecipients = null;
 
-    /**
-     * Message Subject
-     */
-    private $_msgSubject = null;
+	/**
+	 * Message Subject
+	 */
+	private $_msgSubject = null;
 
-    /**
-     * Message Content
-     */
-    private $_msgContent = null;
+	/**
+	 * Message Content
+	 */
+	private $_msgContent = null;
 
-    /**
-     * Custom X-Headers
-     */
-    private $_msgXheader = null;
+	/**
+	 * Custom X-Headers
+	 */
+	private $_msgXheader = null;
 
-    /**
-     * Character set
-     * Defaulted to 'iso-8859-1'
-     */
-    private $_smtpsCharSet = 'iso-8859-1';
+	/**
+	 * Character set
+	 * Defaulted to 'iso-8859-1'
+	 */
+	private $_smtpsCharSet = 'iso-8859-1';
 
-    /**
-     * Message Sensitivity
-     * Defaults to ZERO - None
-     */
-    private $_msgSensitivity = 0;
+	/**
+	 * Message Sensitivity
+	 * Defaults to ZERO - None
+	 */
+	private $_msgSensitivity = 0;
 
-    /**
-     * Message Sensitivity
-     */
-    private $_arySensitivity = array(false,
-                                  'Personal',
-                                  'Private',
-                                  'Company Confidential');
+	/**
+	 * Message Sensitivity
+	 */
+	private $_arySensitivity = array(false,
+								  'Personal',
+								  'Private',
+								  'Company Confidential');
 
-    /**
-     * Message Sensitivity
-     * Defaults to 3 - Normal
-     */
-    private $_msgPriority = 3;
+	/**
+	 * Message Sensitivity
+	 * Defaults to 3 - Normal
+	 */
+	private $_msgPriority = 3;
 
-    /**
-     * Message Priority
-     */
-    private $_aryPriority = array('Bulk',
-                                'Highest',
-                                'High',
-                                'Normal',
-                                'Low',
-                                'Lowest');
+	/**
+	 * Message Priority
+	 */
+	private $_aryPriority = array('Bulk',
+								'Highest',
+								'High',
+								'Normal',
+								'Low',
+								'Lowest');
 
-    /**
-     * Content-Transfer-Encoding
-     * Defaulted to 0 - 7bit
-     */
-    private $_smtpsTransEncodeType = 0;
+	/**
+	 * Content-Transfer-Encoding
+	 * Defaulted to 0 - 7bit
+	 */
+	private $_smtpsTransEncodeType = 0;
 
-    /**
-     * Content-Transfer-Encoding
-     */
-    private $_smtpsTransEncodeTypes = array('7bit', // Simple 7-bit ASCII
-                                         '8bit', // 8-bit coding with line termination characters
-                                         'base64', // 3 octets encoded into 4 sextets with offset
-                                         'binary', // Arbitrary binary stream
-                                         'mac-binhex40', // Macintosh binary to hex encoding
-                                         'quoted-printable', // Mostly 7-bit, with 8-bit characters encoded as "=HH"
-                                         'uuencode'); // UUENCODE encoding
+	/**
+	 * Content-Transfer-Encoding
+	 */
+	private $_smtpsTransEncodeTypes = array('7bit', // Simple 7-bit ASCII
+										 '8bit', // 8-bit coding with line termination characters
+										 'base64', // 3 octets encoded into 4 sextets with offset
+										 'binary', // Arbitrary binary stream
+										 'mac-binhex40', // Macintosh binary to hex encoding
+										 'quoted-printable', // Mostly 7-bit, with 8-bit characters encoded as "=HH"
+										 'uuencode'); // UUENCODE encoding
 
-    /**
-     * Content-Transfer-Encoding
-     * Defaulted to '7bit'
-     */
-    private $_smtpsTransEncode = '7bit';
+	/**
+	 * Content-Transfer-Encoding
+	 * Defaulted to '7bit'
+	 */
+	private $_smtpsTransEncode = '7bit';
 
-    /**
-     * Boundary String for MIME seperation
-     */
-    private $_smtpsBoundary = null;
+	/**
+	 * Boundary String for MIME seperation
+	 */
+	private $_smtpsBoundary = null;
 
-    /**
-     * Related Boundary
-     */
-    private $_smtpsRelatedBoundary = null;
+	/**
+	 * Related Boundary
+	 */
+	private $_smtpsRelatedBoundary = null;
 
-    /**
-     * Alternative Boundary
-     */
-    private $_smtpsAlternativeBoundary = null;
+	/**
+	 * Alternative Boundary
+	 */
+	private $_smtpsAlternativeBoundary = null;
 
-    /**
-     * Determines the method inwhich the message are to be sent.
-     * - 'sockets' [0] - conect via network to SMTP server - default
-     * - 'pipe     [1] - use UNIX path to EXE
-     * - 'phpmail  [2] - use the PHP built-in mail function
-     * NOTE: Only 'sockets' is implemented
-     */
-    private $_transportType = 0;
+	/**
+	 * Determines the method inwhich the message are to be sent.
+	 * - 'sockets' [0] - conect via network to SMTP server - default
+	 * - 'pipe     [1] - use UNIX path to EXE
+	 * - 'phpmail  [2] - use the PHP built-in mail function
+	 * NOTE: Only 'sockets' is implemented
+	 */
+	private $_transportType = 0;
 
-    /**
-     * If '$_transportType' is set to '1', then this variable is used
-     * to define the UNIX file system path to the sendmail execuable
-     */
-    private $_mailPath = '/usr/lib/sendmail';
+	/**
+	 * If '$_transportType' is set to '1', then this variable is used
+	 * to define the UNIX file system path to the sendmail execuable
+	 */
+	private $_mailPath = '/usr/lib/sendmail';
 
-    /**
-     * Sets the SMTP server timeout in seconds.
-     */
-    private $_smtpTimeout = 10;
+	/**
+	 * Sets the SMTP server timeout in seconds.
+	 */
+	private $_smtpTimeout = 10;
 
-    /**
-     * Determines whether to calculate message MD5 checksum.
-     */
-    private $_smtpMD5 = false;
+	/**
+	 * Determines whether to calculate message MD5 checksum.
+	 */
+	private $_smtpMD5 = false;
 
-    /**
-     * Class error codes and messages
-     */
-    private $_smtpsErrors = null;
+	/**
+	 * Class error codes and messages
+	 */
+	private $_smtpsErrors = null;
 
-    /**
-     * Defines log level
-     *  0 - no logging
-     *  1 - connectivity logging
-     *  2 - message generation logging
-     *  3 - detail logging
-     */
-    private $_log_level = 0;
+	/**
+	 * Defines log level
+	 *  0 - no logging
+	 *  1 - connectivity logging
+	 *  2 - message generation logging
+	 *  3 - detail logging
+	 */
+	private $_log_level = 0;
 
-    /**
-     * Place Class in" debug" mode
-     */
-    private $_debug = false;
+	/**
+	 * Place Class in" debug" mode
+	 */
+	private $_debug = false;
 
 
-    // @CHANGE LDR
-    public $log = '';
-    private $_errorsTo = '';
-    private $_deliveryReceipt = 0;
-    private $_trackId = '';
-    private $_moreInHeader = '';
+	// @CHANGE LDR
+	public $log = '';
+	private $_errorsTo = '';
+	private $_deliveryReceipt = 0;
+	private $_trackId = '';
+	private $_moreInHeader = '';
 
-    /**
-     * An array of options for stream_context_create()
-     */
+	/**
+	 * An array of options for stream_context_create()
+	 */
 	private $_options = [];
 
-    /**
-     * Set delivery receipt
-     *
-     * @param	array		$_options		An array of options for stream_context_create()
-     * @return	void
-     */
+	/**
+	 * Set delivery receipt
+	 *
+	 * @param	array		$_options		An array of options for stream_context_create()
+	 * @return	void
+	 */
 	public function setOptions($_options = [])
-    {
-        $this->_options = $_options;
-    }
+	{
+		$this->_options = $_options;
+	}
 
-    /**
-     * Set delivery receipt
-     *
-     * @param	int		$_val		Value
-     * @return	void
-     */
-    public function setDeliveryReceipt($_val = 0)
-    {
-        $this->_deliveryReceipt = $_val;
-    }
+	/**
+	 * Set delivery receipt
+	 *
+	 * @param	int		$_val		Value
+	 * @return	void
+	 */
+	public function setDeliveryReceipt($_val = 0)
+	{
+		$this->_deliveryReceipt = $_val;
+	}
 
-    /**
-     * get delivery receipt
-     *
-     * @return	int		Delivery receipt
-     */
-    public function getDeliveryReceipt()
-    {
-        return $this->_deliveryReceipt;
-    }
+	/**
+	 * get delivery receipt
+	 *
+	 * @return	int		Delivery receipt
+	 */
+	public function getDeliveryReceipt()
+	{
+		return $this->_deliveryReceipt;
+	}
 
-    /**
-     * Set trackid
-     *
-     * @param	string		$_val		Value
-     * @return	void
-     */
-    public function setTrackId($_val = '')
-    {
-        $this->_trackId = $_val;
-    }
+	/**
+	 * Set trackid
+	 *
+	 * @param	string		$_val		Value
+	 * @return	void
+	 */
+	public function setTrackId($_val = '')
+	{
+		$this->_trackId = $_val;
+	}
 
-    /**
-     * Set moreInHeader
-     *
-     * @param	string		$_val		Value
-     * @return	void
-     */
-    public function setMoreInHeader($_val = '')
-    {
-        $this->_moreinheader = $_val;
-    }
+	/**
+	 * Set moreInHeader
+	 *
+	 * @param	string		$_val		Value
+	 * @return	void
+	 */
+	public function setMoreInHeader($_val = '')
+	{
+		$this->_moreinheader = $_val;
+	}
 
-    /**
-     * get trackid
-     *
-     * @return	string		Track id
-     */
-    public function getTrackId()
-    {
-        return $this->_trackId;
-    }
+	/**
+	 * get trackid
+	 *
+	 * @return	string		Track id
+	 */
+	public function getTrackId()
+	{
+		return $this->_trackId;
+	}
 
-    /**
-     * get moreInHeader
-     *
-     * @return	string		moreInHeader
-     */
-    public function getMoreInHeader()
-    {
-        return $this->_moreinheader;
-    }
+	/**
+	 * get moreInHeader
+	 *
+	 * @return	string		moreInHeader
+	 */
+	public function getMoreInHeader()
+	{
+		return $this->_moreinheader;
+	}
 
-    /**
-     * Set errors to
-     *
-     * @param	string		$_strErrorsTo		Errors to
-     * @return	void
-     */
-    public function setErrorsTo($_strErrorsTo)
-    {
-        if ($_strErrorsTo)
-        $this->_errorsTo = $this->_strip_email($_strErrorsTo);
-    }
+	/**
+	 * Set errors to
+	 *
+	 * @param	string		$_strErrorsTo		Errors to
+	 * @return	void
+	 */
+	public function setErrorsTo($_strErrorsTo)
+	{
+		if ($_strErrorsTo)
+		$this->_errorsTo = $this->_strip_email($_strErrorsTo);
+	}
 
-    /**
-     * Get errors to
-     *
-     * @param	boolean		$_part		Variant
-     * @return	string					Errors to
-     */
-    public function getErrorsTo($_part = true)
-    {
-        $_retValue = '';
+	/**
+	 * Get errors to
+	 *
+	 * @param	boolean		$_part		Variant
+	 * @return	string					Errors to
+	 */
+	public function getErrorsTo($_part = true)
+	{
+		$_retValue = '';
 
-        if ($_part === true)
-        $_retValue = $this->_errorsTo;
-        else $_retValue = $this->_errorsTo[$_part];
+		if ($_part === true)
+		$_retValue = $this->_errorsTo;
+		else $_retValue = $this->_errorsTo[$_part];
 
-        return $_retValue;
-    }
+		return $_retValue;
+	}
 
-    /**
-     * Set debug
-     *
-     * @param	boolean		$_vDebug		Value for debug
-     * @return 	void
-     */
-    public function setDebug($_vDebug = false)
-    {
-        $this->_debug = $_vDebug;
-    }
+	/**
+	 * Set debug
+	 *
+	 * @param	boolean		$_vDebug		Value for debug
+	 * @return 	void
+	 */
+	public function setDebug($_vDebug = false)
+	{
+		$this->_debug = $_vDebug;
+	}
 
-    /**
-     * build RECIPIENT List, all addresses who will recieve this message
-     *
-     * @return void
-     */
-    public function buildRCPTlist()
-    {
-        // Pull TO list
-        $_aryToList = $this->getTO();
-    }
+	/**
+	 * build RECIPIENT List, all addresses who will recieve this message
+	 *
+	 * @return void
+	 */
+	public function buildRCPTlist()
+	{
+		// Pull TO list
+		$_aryToList = $this->getTO();
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * Attempt a connection to mail server
-     *
-     * @return mixed  $_retVal   Boolean indicating success or failure on connection
-     */
-    private function _server_connect()
-    {
-        // phpcs:enable
-        // Default return value
-        $_retVal = true;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Attempt a connection to mail server
+	 *
+	 * @return mixed  $_retVal   Boolean indicating success or failure on connection
+	 */
+	private function _server_connect()
+	{
+		// phpcs:enable
+		// Default return value
+		$_retVal = true;
 
-        // We have to make sure the HOST given is valid
-        // This is done here because '@fsockopen' will not give me this
-        // information if it failes to connect because it can't find the HOST
-        $host = $this->getHost();
-        $usetls = preg_match('@tls://@i', $host);
+		// We have to make sure the HOST given is valid
+		// This is done here because '@fsockopen' will not give me this
+		// information if it failes to connect because it can't find the HOST
+		$host = $this->getHost();
+		$usetls = preg_match('@tls://@i', $host);
 
-        $host = preg_replace('@tcp://@i', '', $host); // Remove prefix
-        $host = preg_replace('@ssl://@i', '', $host); // Remove prefix
-        $host = preg_replace('@tls://@i', '', $host); // Remove prefix
+		$host = preg_replace('@tcp://@i', '', $host); // Remove prefix
+		$host = preg_replace('@ssl://@i', '', $host); // Remove prefix
+		$host = preg_replace('@tls://@i', '', $host); // Remove prefix
 
-        // @CHANGE LDR
-        include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+		// @CHANGE LDR
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
-        if ((!is_ip($host)) && ((gethostbyname($host)) == $host))
-        {
-            $this->_setErr(99, $host.' is either offline or is an invalid host name.');
-            $_retVal = false;
-        } else {
-            if (function_exists('stream_socket_client') && !empty($this->_options)) {
-                $socket_context = stream_context_create($this->_options); // An array of options for stream_context_create()
-                set_error_handler([$this, 'errorHandler']);
-                $this->socket = @stream_socket_client(
-					preg_replace('@tls://@i', '', $this->getHost()) .    // Host to 'hit', IP or domain
-                    ':' . $this->getPort(),             // which Port number to use
-                    $this->errno,                       // actual system level error
-                    $this->errstr,                      // and any text that goes with the error
-                    $this->_smtpTimeout,                // timeout for reading/writing data over the socket
-                    STREAM_CLIENT_CONNECT,
-                    $socket_context                     // Options for connection
-                );
-        	} else {
-                $this->socket = @fsockopen(
-					preg_replace('@tls://@i', '', $this->getHost()),       // Host to 'hit', IP or domain
-                $this->getPort(), // which Port number to use
-                $this->errno, // actual system level error
-                $this->errstr, // and any text that goes with the error
-                $this->_smtpTimeout     // timeout for reading/writing data over the socket
-                );
-            }
+		if ((!is_ip($host)) && ((gethostbyname($host)) == $host))
+		{
+			$this->_setErr(99, $host.' is either offline or is an invalid host name.');
+			$_retVal = false;
+		} else {
+			if (function_exists('stream_socket_client') && !empty($this->_options)) {
+				$socket_context = stream_context_create($this->_options); // An array of options for stream_context_create()
+				set_error_handler([$this, 'errorHandler']);
+				$this->socket = @stream_socket_client(
+					preg_replace('@tls://@i', '', $this->getHost()).// Host to 'hit', IP or domain
+					':'.$this->getPort(), // which Port number to use
+					$this->errno, // actual system level error
+					$this->errstr, // and any text that goes with the error
+					$this->_smtpTimeout, // timeout for reading/writing data over the socket
+					STREAM_CLIENT_CONNECT,
+					$socket_context                     // Options for connection
+				);
+			} else {
+				$this->socket = @fsockopen(
+					preg_replace('@tls://@i', '', $this->getHost()), // Host to 'hit', IP or domain
+				$this->getPort(), // which Port number to use
+				$this->errno, // actual system level error
+				$this->errstr, // and any text that goes with the error
+				$this->_smtpTimeout     // timeout for reading/writing data over the socket
+				);
+			}
 
-            //See if we can connect to the SMTP server
-            if (is_resource($this->socket))
-            {
-                // Fix from PHP SMTP class by 'Chris Ryan'
-                // Sometimes the SMTP server takes a little longer to respond
-                // so we will give it a longer timeout for the first read
-                // Windows still does not have support for this timeout function
-                if (function_exists('stream_set_timeout')) stream_set_timeout($this->socket, $this->_smtpTimeout, 0);
+			//See if we can connect to the SMTP server
+			if (is_resource($this->socket))
+			{
+				// Fix from PHP SMTP class by 'Chris Ryan'
+				// Sometimes the SMTP server takes a little longer to respond
+				// so we will give it a longer timeout for the first read
+				// Windows still does not have support for this timeout function
+				if (function_exists('stream_set_timeout')) stream_set_timeout($this->socket, $this->_smtpTimeout, 0);
 
-                // Check response from Server
-                if ($_retVal = $this->server_parse($this->socket, "220"))
-                $_retVal = $this->socket;
-            }
-            // This connection attempt failed.
-            else {
-                // @CHANGE LDR
-                if (empty($this->errstr)) $this->errstr = 'Failed to connect with fsockopen host='.$this->getHost().' port='.$this->getPort();
-                $this->_setErr($this->errno, $this->errstr);
-                $_retVal = false;
-            }
-        }
+				// Check response from Server
+				if ($_retVal = $this->server_parse($this->socket, "220"))
+				$_retVal = $this->socket;
+			}
+			// This connection attempt failed.
+			else {
+				// @CHANGE LDR
+				if (empty($this->errstr)) $this->errstr = 'Failed to connect with fsockopen host='.$this->getHost().' port='.$this->getPort();
+				$this->_setErr($this->errno, $this->errstr);
+				$_retVal = false;
+			}
+		}
 
-        return $_retVal;
-    }
+		return $_retVal;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * Attempt mail server authentication for a secure connection
-     *
-     * @return boolean|null  $_retVal   Boolean indicating success or failure of authentication
-     */
-    private function _server_authenticate()
-    {
-        // phpcs:enable
-        global $conf;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Attempt mail server authentication for a secure connection
+	 *
+	 * @return boolean|null  $_retVal   Boolean indicating success or failure of authentication
+	 */
+	private function _server_authenticate()
+	{
+		// phpcs:enable
+		global $conf;
 
-        // Send the RFC2554 specified EHLO.
-        // This improvment as provided by 'SirSir' to
-        // accomodate both SMTP AND ESMTP capable servers
-        $host = $this->getHost();
-        $usetls = preg_match('@tls://@i', $host);
+		// Send the RFC2554 specified EHLO.
+		// This improvment as provided by 'SirSir' to
+		// accomodate both SMTP AND ESMTP capable servers
+		$host = $this->getHost();
+		$usetls = preg_match('@tls://@i', $host);
 
-        $host = preg_replace('@tcp://@i', '', $host); // Remove prefix
-        $host = preg_replace('@ssl://@i', '', $host); // Remove prefix
-        $host = preg_replace('@tls://@i', '', $host); // Remove prefix
+		$host = preg_replace('@tcp://@i', '', $host); // Remove prefix
+		$host = preg_replace('@ssl://@i', '', $host); // Remove prefix
+		$host = preg_replace('@tls://@i', '', $host); // Remove prefix
 
-		if ($usetls && ! empty($conf->global->MAIN_SMTPS_ADD_TLS_TO_HOST_FOR_HELO)) $host = 'tls://'.$host;
+		if ($usetls && !empty($conf->global->MAIN_SMTPS_ADD_TLS_TO_HOST_FOR_HELO)) $host = 'tls://'.$host;
 
-        $hosth = $host;
+		$hosth = $host;
 
-        if (!empty($conf->global->MAIL_SMTP_USE_FROM_FOR_HELO))
-        {
-            // If the from to is 'aaa <bbb@ccc.com>', we will keep 'ccc.com'
-            $hosth = $this->getFrom('addr');
-            $hosth = preg_replace('/^.*</', '', $hosth);
-            $hosth = preg_replace('/>.*$/', '', $hosth);
-            $hosth = preg_replace('/.*@/', '', $hosth);
-        }
+		if (!empty($conf->global->MAIL_SMTP_USE_FROM_FOR_HELO))
+		{
+			// If the from to is 'aaa <bbb@ccc.com>', we will keep 'ccc.com'
+			$hosth = $this->getFrom('addr');
+			$hosth = preg_replace('/^.*</', '', $hosth);
+			$hosth = preg_replace('/>.*$/', '', $hosth);
+			$hosth = preg_replace('/.*@/', '', $hosth);
+		}
 
-        if ($_retVal = $this->socket_send_str('EHLO '.$hosth, '250'))
-        {
-            if ($usetls)
-            {
-                /*
+		if ($_retVal = $this->socket_send_str('EHLO '.$hosth, '250'))
+		{
+			if ($usetls)
+			{
+				/*
                 The following dialog illustrates how a client and server can start a TLS STARTTLS session
                 S: <waits for connection on TCP port 25>
                 C: <opens connection>
@@ -492,144 +492,144 @@ class SMTPs
                 S: 250 AUTH LOGIN
                 C: <continues by sending an SMTP command
                 */
-                if (!$_retVal = $this->socket_send_str('STARTTLS', 220))
-                {
-                    $this->_setErr(131, 'STARTTLS connection is not supported.');
-                    return $_retVal;
-                }
+				if (!$_retVal = $this->socket_send_str('STARTTLS', 220))
+				{
+					$this->_setErr(131, 'STARTTLS connection is not supported.');
+					return $_retVal;
+				}
 
-                // Before 5.6.7:
-                // STREAM_CRYPTO_METHOD_SSLv23_CLIENT = STREAM_CRYPTO_METHOD_SSLv2_CLIENT|STREAM_CRYPTO_METHOD_SSLv3_CLIENT
-                // STREAM_CRYPTO_METHOD_TLS_CLIENT = STREAM_CRYPTO_METHOD_TLSv1_0_CLIENT|STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT|STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT
-                // PHP >= 5.6.7:
-                // STREAM_CRYPTO_METHOD_SSLv23_CLIENT = STREAM_CRYPTO_METHOD_TLSv1_0_CLIENT|STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT|STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT
-                // STREAM_CRYPTO_METHOD_TLS_CLIENT = STREAM_CRYPTO_METHOD_TLSv1_0_CLIENT
+				// Before 5.6.7:
+				// STREAM_CRYPTO_METHOD_SSLv23_CLIENT = STREAM_CRYPTO_METHOD_SSLv2_CLIENT|STREAM_CRYPTO_METHOD_SSLv3_CLIENT
+				// STREAM_CRYPTO_METHOD_TLS_CLIENT = STREAM_CRYPTO_METHOD_TLSv1_0_CLIENT|STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT|STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT
+				// PHP >= 5.6.7:
+				// STREAM_CRYPTO_METHOD_SSLv23_CLIENT = STREAM_CRYPTO_METHOD_TLSv1_0_CLIENT|STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT|STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT
+				// STREAM_CRYPTO_METHOD_TLS_CLIENT = STREAM_CRYPTO_METHOD_TLSv1_0_CLIENT
 
-                $crypto_method = STREAM_CRYPTO_METHOD_TLS_CLIENT;
-                if (defined('STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT')) {
-                    $crypto_method |= STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT;
-                    $crypto_method |= STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT;
-                }
+				$crypto_method = STREAM_CRYPTO_METHOD_TLS_CLIENT;
+				if (defined('STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT')) {
+					$crypto_method |= STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT;
+					$crypto_method |= STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT;
+				}
 
-                if (!stream_socket_enable_crypto($this->socket, true, $crypto_method))
-                {
-                    $this->_setErr(132, 'STARTTLS connection failed.');
-                    return $_retVal;
-                }
-                // Most server servers expect a 2nd pass of EHLO after TLS is established to get another time
-                // the answer with list of supported AUTH methods. They may differs between non STARTTLS and with STARTTLS.
-                if (!$_retVal = $this->socket_send_str('EHLO '.$hosth, '250'))
-                {
-                    $this->_setErr(126, '"'.$hosth.'" does not support authenticated connections.');
-                    return $_retVal;
-                }
-            }
+				if (!stream_socket_enable_crypto($this->socket, true, $crypto_method))
+				{
+					$this->_setErr(132, 'STARTTLS connection failed.');
+					return $_retVal;
+				}
+				// Most server servers expect a 2nd pass of EHLO after TLS is established to get another time
+				// the answer with list of supported AUTH methods. They may differs between non STARTTLS and with STARTTLS.
+				if (!$_retVal = $this->socket_send_str('EHLO '.$hosth, '250'))
+				{
+					$this->_setErr(126, '"'.$hosth.'" does not support authenticated connections.');
+					return $_retVal;
+				}
+			}
 
 			// Default authentication method is LOGIN
 			if (empty($conf->global->MAIL_SMTP_AUTH_TYPE)) $conf->global->MAIL_SMTP_AUTH_TYPE = 'LOGIN';
 
-            // Send Authentication to Server
-            // Check for errors along the way
-            switch ($conf->global->MAIL_SMTP_AUTH_TYPE) {
-                case 'PLAIN':
-                    $this->socket_send_str('AUTH PLAIN', '334');
-                    // The error here just means the ID/password combo doesn't work.
-                    $_retVal = $this->socket_send_str(base64_encode("\0".$this->_smtpsID."\0".$this->_smtpsPW), '235');
-                    break;
-                case 'LOGIN':	// most common case
-                default:
-                    $this->socket_send_str('AUTH LOGIN', '334');
-                    // User name will not return any error, server will take anything we give it.
-                    $this->socket_send_str(base64_encode($this->_smtpsID), '334');
-                    // The error here just means the ID/password combo doesn't work.
-                    // There is not a method to determine which is the problem, ID or password
-                    $_retVal = $this->socket_send_str(base64_encode($this->_smtpsPW), '235');
-                    break;
-            }
-            if (!$_retVal) {
-                $this->_setErr(130, 'Invalid Authentication Credentials.');
+			// Send Authentication to Server
+			// Check for errors along the way
+			switch ($conf->global->MAIL_SMTP_AUTH_TYPE) {
+				case 'PLAIN':
+					$this->socket_send_str('AUTH PLAIN', '334');
+					// The error here just means the ID/password combo doesn't work.
+					$_retVal = $this->socket_send_str(base64_encode("\0".$this->_smtpsID."\0".$this->_smtpsPW), '235');
+					break;
+				case 'LOGIN':	// most common case
+				default:
+					$this->socket_send_str('AUTH LOGIN', '334');
+					// User name will not return any error, server will take anything we give it.
+					$this->socket_send_str(base64_encode($this->_smtpsID), '334');
+					// The error here just means the ID/password combo doesn't work.
+					// There is not a method to determine which is the problem, ID or password
+					$_retVal = $this->socket_send_str(base64_encode($this->_smtpsPW), '235');
+					break;
 			}
-        } else {
-            $this->_setErr(126, '"'.$host.'" does not support authenticated connections.');
-        }
+			if (!$_retVal) {
+				$this->_setErr(130, 'Invalid Authentication Credentials.');
+			}
+		} else {
+			$this->_setErr(126, '"'.$host.'" does not support authenticated connections.');
+		}
 
-        return $_retVal;
-    }
+		return $_retVal;
+	}
 
-    /**
-     * Now send the message
-     *
-     * @return boolean|null   Result
-     */
-    public function sendMsg()
-    {
-        global $conf;
+	/**
+	 * Now send the message
+	 *
+	 * @return boolean|null   Result
+	 */
+	public function sendMsg()
+	{
+		global $conf;
 
-        /**
-         * Default return value
-         */
-        $_retVal = false;
+		/**
+		 * Default return value
+		 */
+		$_retVal = false;
 
-        // Connect to Server
-        if ($this->socket = $this->_server_connect())
-        {
-            // If a User ID *and* a password is given, assume Authentication is desired
-            if (!empty($this->_smtpsID) && !empty($this->_smtpsPW))
-            {
-                // Send the RFC2554 specified EHLO.
-                $_retVal = $this->_server_authenticate();
-            }
+		// Connect to Server
+		if ($this->socket = $this->_server_connect())
+		{
+			// If a User ID *and* a password is given, assume Authentication is desired
+			if (!empty($this->_smtpsID) && !empty($this->_smtpsPW))
+			{
+				// Send the RFC2554 specified EHLO.
+				$_retVal = $this->_server_authenticate();
+			}
 
-            // This is a "normal" SMTP Server "handshack"
-            else {
-                // Send the RFC821 specified HELO.
-                $host = $this->getHost();
-                $usetls = preg_match('@tls://@i', $host);
+			// This is a "normal" SMTP Server "handshack"
+			else {
+				// Send the RFC821 specified HELO.
+				$host = $this->getHost();
+				$usetls = preg_match('@tls://@i', $host);
 
-                $host = preg_replace('@tcp://@i', '', $host); // Remove prefix
-                $host = preg_replace('@ssl://@i', '', $host); // Remove prefix
-                $host = preg_replace('@tls://@i', '', $host); // Remove prefix
+				$host = preg_replace('@tcp://@i', '', $host); // Remove prefix
+				$host = preg_replace('@ssl://@i', '', $host); // Remove prefix
+				$host = preg_replace('@tls://@i', '', $host); // Remove prefix
 
-                if ($usetls && ! empty($conf->global->MAIN_SMTPS_ADD_TLS_TO_HOST_FOR_HELO)) $host = 'tls://'.$host;
+				if ($usetls && !empty($conf->global->MAIN_SMTPS_ADD_TLS_TO_HOST_FOR_HELO)) $host = 'tls://'.$host;
 
-                $hosth = $host;
+				$hosth = $host;
 
-                if (!empty($conf->global->MAIL_SMTP_USE_FROM_FOR_HELO))
-                {
-                    // If the from to is 'aaa <bbb@ccc.com>', we will keep 'ccc.com'
-                    $hosth = $this->getFrom('addr');
-                    $hosth = preg_replace('/^.*</', '', $hosth);
-                    $hosth = preg_replace('/>.*$/', '', $hosth);
-                    $hosth = preg_replace('/.*@/', '', $hosth);
-                }
+				if (!empty($conf->global->MAIL_SMTP_USE_FROM_FOR_HELO))
+				{
+					// If the from to is 'aaa <bbb@ccc.com>', we will keep 'ccc.com'
+					$hosth = $this->getFrom('addr');
+					$hosth = preg_replace('/^.*</', '', $hosth);
+					$hosth = preg_replace('/>.*$/', '', $hosth);
+					$hosth = preg_replace('/.*@/', '', $hosth);
+				}
 
-                $_retVal = $this->socket_send_str('HELO '.$hosth, '250');
-            }
+				$_retVal = $this->socket_send_str('HELO '.$hosth, '250');
+			}
 
-            // Well, did we get to the server?
-            if ($_retVal)
-            {
-                // From this point onward most server response codes should be 250
-                // Specify who the mail is from....
-                // This has to be the raw email address, strip the "name" off
-                $resultmailfrom = $this->socket_send_str('MAIL FROM: '.$this->getFrom('addr'), '250');
-			    if (!$resultmailfrom) {
-			        fclose($this->socket);
-			        return false;
-			    }
+			// Well, did we get to the server?
+			if ($_retVal)
+			{
+				// From this point onward most server response codes should be 250
+				// Specify who the mail is from....
+				// This has to be the raw email address, strip the "name" off
+				$resultmailfrom = $this->socket_send_str('MAIL FROM: '.$this->getFrom('addr'), '250');
+				if (!$resultmailfrom) {
+					fclose($this->socket);
+					return false;
+				}
 
-                // 'RCPT TO:' must be given a single address, so this has to loop
-                // through the list of addresses, regardless of TO, CC or BCC
-                // and send it out "single file"
-                foreach ($this->get_RCPT_list() as $_address)
-                {
-                    /* Note:
+				// 'RCPT TO:' must be given a single address, so this has to loop
+				// through the list of addresses, regardless of TO, CC or BCC
+				// and send it out "single file"
+				foreach ($this->get_RCPT_list() as $_address)
+				{
+					/* Note:
                      * BCC email addresses must be listed in the RCPT TO command list,
                      * but the BCC header should not be printed under the DATA command.
                      * http://stackoverflow.com/questions/2750211/sending-bcc-emails-using-a-smtp-server
                      */
 
-                    /*
+					/*
                      * TODO
                      * After each 'RCPT TO:' is sent, we need to make sure it was kosher,
                      * if not, the whole message will fail
@@ -637,1233 +637,1233 @@ class SMTPs
                      * mark the last address as "bad" and start the address loop over again.
                      * If any address fails, the entire message fails.
                      */
-                    $this->socket_send_str('RCPT TO: <'.$_address.'>', '250');
-                }
-
-                // Tell the server we are ready to start sending data
-                // with any custom headers...
-                // This is the last response code we look for until the end of the message.
-                $this->socket_send_str('DATA', '354');
-
-                // Now we are ready for the message...
-                // Ok, all the ingredients are mixed in let's cook this puppy...
-                $this->socket_send_str($this->getHeader().$this->getBodyContent()."\r\n".'.', '250');
-
-                // Now tell the server we are done and close the socket...
-                fputs($this->socket, 'QUIT');
-                fclose($this->socket);
-            }
-        }
-
-        return $_retVal;
-    }
-
-    // =============================================================
-    // ** Setter & Getter methods
-
-    // ** Basic System configuration
-
-    /**
-     * setConfig() is used to populate select class properties from either
-     * a user defined INI file or the systems 'php.ini' file
-     *
-     * If a user defined INI is to be used, the files complete path is passed
-     * as the method single parameter. The INI can define any class and/or
-     * user properties. Only properties defined within this file will be setter
-     * and/or orverwritten
-     *
-     * If the systems 'php.ini' file is to be used, the method is called without
-     * parameters. In this case, only HOST, PORT and FROM properties will be set
-     * as they are the only properties that are defined within the 'php.ini'.
-     *
-     * If secure SMTP is to be used, the user ID and Password can be defined with
-     * the user INI file, but the properties are not defined with the systems
-     * 'php.ini'file, they must be defined via their setter methods
-     *
-     * This method can be called twice, if desired. Once without a parameter to
-     * load the properties as defined within the systems 'php.ini' file, and a
-     * second time, with a path to a user INI file for other properties to be
-     * defined.
-     *
-     * @param mixed $_strConfigPath path to config file or VOID
-     * @return boolean
-     */
-    public function setConfig($_strConfigPath = null)
-    {
-        /**
-         * Returns constructed SELECT Object string or boolean upon failure
-         * Default value is set at true
-         */
-        $_retVal = true;
-
-        // if we have a path...
-        if (!empty($_strConfigPath))
-        {
-            // If the path is not valid, this will NOT generate an error,
-            // it will simply return false.
-            if (!@include $_strConfigPath)
-            {
-                $this->_setErr(110, '"'.$_strConfigPath.'" is not a valid path.');
-                $_retVal = false;
-            }
-        }
-
-        // Read the Systems php.ini file
-        else {
-            // Set these properties ONLY if they are set in the php.ini file.
-            // Otherwise the default values will be used.
-            if ($_host = ini_get('SMTPs'))
-            $this->setHost($_host);
-
-            if ($_port = ini_get('smtp_port'))
-            $this->setPort($_port);
-
-            if ($_from = ini_get('sendmail_from'))
-            $this->setFrom($_from);
-        }
-
-        // Send back what we have
-        return $_retVal;
-    }
-
-    /**
-     * Determines the method inwhich the messages are to be sent.
-     * - 'sockets' [0] - conect via network to SMTP server
-     * - 'pipe     [1] - use UNIX path to EXE
-     * - 'phpmail  [2] - use the PHP built-in mail function
-     *
-     * @param int $_type  Interger value representing Mail Transport Type
-     * @return void
-     */
-    public function setTransportType($_type = 0)
-    {
-        if ((is_numeric($_type)) && (($_type >= 0) && ($_type <= 3))) {
-            $this->_transportType = $_type;
-        }
-    }
-
-    /**
-     * Return the method inwhich the message is to be sent.
-     * - 'sockets' [0] - conect via network to SMTP server
-     * - 'pipe     [1] - use UNIX path to EXE
-     * - 'phpmail  [2] - use the PHP built-in mail function
-     *
-     * @return int $_strHost Host Name or IP of the Mail Server to use
-     */
-    public function getTransportType()
-    {
-        return $this->_transportType;
-    }
-
-    /**
-     * Path to the sendmail execuable
-     *
-     * @param string $_path Path to the sendmail execuable
-     * @return boolean
-     *
-     */
-    public function setMailPath($_path)
-    {
-        // This feature is not yet implemented
-        return true;
-
-        //if ( $_path ) $this->_mailPath = $_path;
-    }
-
-    /**
-     * Defines the Host Name or IP of the Mail Server to use.
-     * This is defaulted to 'localhost'
-     * This is  used only with 'socket' based mail transmission
-     *
-     * @param 	string 	$_strHost 		Host Name or IP of the Mail Server to use
-     * @return 	void
-     */
-    public function setHost($_strHost)
-    {
-        if ($_strHost)
-        $this->_smtpsHost = $_strHost;
-    }
-
-    /**
-     * Retrieves the Host Name or IP of the Mail Server to use
-     * This is  used only with 'socket' based mail transmission
-     *
-     * @return 	string 	$_strHost 		Host Name or IP of the Mail Server to use
-     */
-    public function getHost()
-    {
-        return $this->_smtpsHost;
-    }
-
-    /**
-     * Defines the Port Number of the Mail Server to use
-     * This is defaulted to '25'
-     * This is  used only with 'socket' based mail transmission
-     *
-     * @param 	int 	$_intPort 		Port Number of the Mail Server to use
-     * @return 	void
-     */
-    public function setPort($_intPort)
-    {
-        if ((is_numeric($_intPort)) &&
-        (($_intPort >= 1) && ($_intPort <= 65536)))
-        $this->_smtpsPort = $_intPort;
-    }
-
-    /**
-     * Retrieves the Port Number of the Mail Server to use
-     * This is  used only with 'socket' based mail transmission
-     *
-     * @return 	string 		Port Number of the Mail Server to use
-     */
-    public function getPort()
-    {
-        return $this->_smtpsPort;
-    }
-
-    /**
-     * User Name for authentication on Mail Server
-     *
-     * @param 	string 	$_strID 	User Name for authentication on Mail Server
-     * @return 	void
-     */
-    public function setID($_strID)
-    {
-        $this->_smtpsID = $_strID;
-    }
-
-    /**
-     * Retrieves the User Name for authentication on Mail Server
-     *
-     * @return string 	User Name for authentication on Mail Server
-     */
-    public function getID()
-    {
-        return $this->_smtpsID;
-    }
-
-    /**
-     * User Password for authentication on Mail Server
-     *
-     * @param 	string 	$_strPW 	User Password for authentication on Mail Server
-     * @return 	void
-     */
-    public function setPW($_strPW)
-    {
-        $this->_smtpsPW = $_strPW;
-    }
-
-    /**
-     * Retrieves the User Password for authentication on Mail Server
-     *
-     * @return 	string 		User Password for authentication on Mail Server
-     */
-    public function getPW()
-    {
-        return $this->_smtpsPW;
-    }
-
-    /**
-     * Character set used for current message
-     * Character set is defaulted to 'iso-8859-1';
-     *
-     * @param string $_strCharSet Character set used for current message
-     * @return void
-     */
-    public function setCharSet($_strCharSet)
-    {
-        if ($_strCharSet)
-        $this->_smtpsCharSet = $_strCharSet;
-    }
-
-    /**
-     * Retrieves the Character set used for current message
-     *
-     * @return string $_smtpsCharSet Character set used for current message
-     */
-    public function getCharSet()
-    {
-        return $this->_smtpsCharSet;
-    }
-
-    /**
-     * Content-Transfer-Encoding, Defaulted to '7bit'
-     * This can be changed for 2byte characers sets
-     * Known Encode Types
-     *  - 7bit               Simple 7-bit ASCII
-     *  - 8bit               8-bit coding with line termination characters
-     *  - base64             3 octets encoded into 4 sextets with offset
-     *  - binary             Arbitrary binary stream
-     *  - mac-binhex40       Macintosh binary to hex encoding
-     *  - quoted-printable   Mostly 7-bit, with 8-bit characters encoded as "=HH"
-     *  - uuencode           UUENCODE encoding
-     *
-     * @param string $_strTransEncode Content-Transfer-Encoding
-     * @return void
-     */
-    public function setTransEncode($_strTransEncode)
-    {
-        if (array_search($_strTransEncode, $this->_smtpsTransEncodeTypes))
-        $this->_smtpsTransEncode = $_strTransEncode;
-    }
-
-    /**
-     * Retrieves the Content-Transfer-Encoding
-     *
-     * @return string $_smtpsTransEncode Content-Transfer-Encoding
-     */
-    public function getTransEncode()
-    {
-        return $this->_smtpsTransEncode;
-    }
-
-    /**
-     * Content-Transfer-Encoding, Defaulted to '0' [ZERO]
-     * This can be changed for 2byte characers sets
-     * Known Encode Types
-     *  - [0] 7bit               Simple 7-bit ASCII
-     *  - [1] 8bit               8-bit coding with line termination characters
-     *  - [2] base64             3 octets encoded into 4 sextets with offset
-     *  - [3] binary             Arbitrary binary stream
-     *  - [4] mac-binhex40       Macintosh binary to hex encoding
-     *  - [5] quoted-printable   Mostly 7-bit, with 8-bit characters encoded as "=HH"
-     *  - [6] uuencode           UUENCODE encoding
-     *
-     * @param string $_strTransEncodeType Content-Transfer-Encoding
-     * @return void
-     *
-     */
-    public function setTransEncodeType($_strTransEncodeType)
-    {
-        if (array_search($_strTransEncodeType, $this->_smtpsTransEncodeTypes))
-        $this->_smtpsTransEncodeType = $_strTransEncodeType;
-    }
-
-    /**
-     * Retrieves the Content-Transfer-Encoding
-     *
-     * @return 	string 		Content-Transfer-Encoding
-     */
-    public function getTransEncodeType()
-    {
-        return $this->_smtpsTransEncodeTypes[$this->_smtpsTransEncodeType];
-    }
-
-
-    // ** Message Construction
-
-    /**
-     * FROM Address from which mail will be sent
-     *
-     * @param 	string 	$_strFrom 	Address from which mail will be sent
-     * @return 	void
-     */
-    public function setFrom($_strFrom)
-    {
-        if ($_strFrom)
-        $this->_msgFrom = $this->_strip_email($_strFrom);
-    }
-
-    /**
-     * Retrieves the Address from which mail will be sent
-     *
-     * @param  	boolean $_part		To "strip" 'Real name' from address
-     * @return 	string 				Address from which mail will be sent
-     */
-    public function getFrom($_part = true)
-    {
-        $_retValue = '';
-
-        if ($_part === true)
-        $_retValue = $this->_msgFrom;
-        else $_retValue = $this->_msgFrom[$_part];
-
-        return $_retValue;
-    }
-
-    /**
-     * Reply-To Address from which mail will be the reply-to
-     *
-     * @param 	string 	$_strReplyTo 	Address from which mail will be the reply-to
-     * @return 	void
-     */
-    public function setReplyTo($_strReplyTo)
-    {
-        if ($_strReplyTo)
-            $this->_msgReplyTo = $this->_strip_email($_strReplyTo);
-    }
-
-    /**
-     * Retrieves the Address from which mail will be the reply-to
-     *
-     * @param  	boolean $_part		To "strip" 'Real name' from address
-     * @return 	string 				Address from which mail will be the reply-to
-     */
-    public function getReplyTo($_part = true)
-    {
-        $_retValue = '';
-
-        if ($_part === true)
-            $_retValue = $this->_msgReplyTo;
-        else $_retValue = $this->_msgReplyTo[$_part];
-
-        return $_retValue;
-    }
-
-    /**
-     * Inserts given addresses into structured format.
-     * This method takes a list of given addresses, via an array
-     * or a COMMA delimted string, and inserts them into a highly
-     * structured array. This array is designed to remove duplicate
-     * addresses and to sort them by Domain.
-     *
-     * @param 	string 	$_type 			TO, CC, or BCC lists to add addrresses into
-     * @param 	mixed 	$_addrList 		Array or COMMA delimited string of addresses
-     * @return void
-     *
-     */
-    private function _buildAddrList($_type, $_addrList)
-    {
-        // Pull existing list
-        $aryHost = $this->_msgRecipients;
-
-        // Only run this if we have something
-        if (!empty($_addrList))
-        {
-            // $_addrList can be a STRING or an array
-            if (is_string($_addrList))
-            {
-                // This could be a COMMA delimited string
-                if (strstr($_addrList, ','))
-                // "explode "list" into an array
-                $_addrList = explode(',', $_addrList);
-
-                // Stick it in an array
-                else $_addrList = array($_addrList);
-            }
-
-            // take the array of addresses and split them further
-            foreach ($_addrList as $_strAddr)
-            {
-                // Strip off the end '>'
-                $_strAddr = str_replace('>', '', $_strAddr);
-
-                // Seperate "Real Name" from eMail address
-                $_tmpaddr = null;
-                $_tmpaddr = explode('<', $_strAddr);
-
-                // We have a "Real Name" and eMail address
-                if (count($_tmpaddr) == 2)
-                {
-                    $_tmpHost = explode('@', $_tmpaddr[1]);
-                    $_tmpaddr[0] = trim($_tmpaddr[0], ' ">');
-                    $aryHost[$_tmpHost[1]][$_type][$_tmpHost[0]] = $_tmpaddr[0];
-                }
-                // We only have an eMail address
-                else {
-                    // Strip off the beggining '<'
-                    $_strAddr = str_replace('<', '', $_strAddr);
-
-                    $_tmpHost = explode('@', $_strAddr);
-                    $_tmpHost[0] = trim($_tmpHost[0]);
-                    $_tmpHost[1] = trim($_tmpHost[1]);
-
-                    $aryHost[$_tmpHost[1]][$_type][$_tmpHost[0]] = '';
-                }
-            }
-        }
-        // replace list
-        $this->_msgRecipients = $aryHost;
-    }
-
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * Returns an array of the various parts of an email address
-     * This assumes a well formed address:
-     * - "Real name" <username@domain.tld>
-     * - "Real Name" is optional
-     * - if "Real Name" does not exist, the angle brackets are optional
-     * This will split an email address into 4 or 5 parts.
-     * - $_aryEmail[org]  = orignal string
-     * - $_aryEmail[real] = "real name" - if there is one
-     * - $_aryEmail[addr] = address part "username@domain.tld"
-     * - $_aryEmail[host] = "domain.tld"
-     * - $_aryEmail[user] = "userName"
-     *
-     *	@param		string		$_strAddr		Email address
-     * 	@return 	array	 					An array of the various parts of an email address
-     */
-    private function _strip_email($_strAddr)
-    {
-        // phpcs:enable
-        // Keep the orginal
-        $_aryEmail['org'] = $_strAddr;
-
-        // Set entire string to Lower Case
-        $_strAddr = strtolower($_strAddr);
-
-        // Drop "stuff' off the end
-        $_strAddr = trim($_strAddr, ' ">');
-
-        // Seperate "Real Name" from eMail address, if we have one
-        $_tmpAry = explode('<', $_strAddr);
-
-        // Do we have a "Real name"
-        if (count($_tmpAry) == 2)
-        {
-            // We may not really have a "Real Name"
-            if ($_tmpAry[0])
-            $_aryEmail['real'] = trim($_tmpAry[0], ' ">');
-
-            $_aryEmail['addr'] = $_tmpAry[1];
-        } else $_aryEmail['addr'] = $_tmpAry[0];
-
-        // Pull User Name and Host.tld apart
-        list($_aryEmail['user'], $_aryEmail['host']) = explode('@', $_aryEmail['addr']);
-
-        // Put the brackets back around the address
-        $_aryEmail['addr'] = '<'.$_aryEmail['addr'].'>';
-
-        return $_aryEmail;
-    }
-
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * Returns an array of bares addresses for use with 'RCPT TO:'
-     * This is a "build as you go" method. Each time this method is called
-     * the underlaying array is destroyed and reconstructed.
-     *
-     * @return 		array		Returns an array of bares addresses
-     */
-    public function get_RCPT_list()
-    {
-        // phpcs:enable
-        /**
-         * An array of bares addresses for use with 'RCPT TO:'
-         */
-        $_RCPT_list = array();
-
-        // walk down Recipients array and pull just email addresses
-        foreach ($this->_msgRecipients as $_host => $_list)
-        {
-            foreach ($_list as $_subList)
-            {
-                foreach ($_subList as $_name => $_addr)
-                {
-                    // build RCPT list
-                    $_RCPT_list[] = $_name.'@'.$_host;
-                }
-            }
-        }
-
-        return $_RCPT_list;
-    }
-
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * Returns an array of addresses for a specific type; TO, CC or BCC
-     *
-     * @param 		string 	       $_which 	    Which collection of addresses to return ('to', 'cc', 'bcc')
-     * @return 		string|false 				Array of emaill address
-     */
-    public function get_email_list($_which = null)
-    {
-        // phpcs:enable
-        // We need to know which address segment to pull
-        if ($_which)
-        {
-            // Make sure we have addresses to process
-            if ($this->_msgRecipients)
-            {
-                $_RCPT_list = array();
-                // walk down Recipients array and pull just email addresses
-                foreach ($this->_msgRecipients as $_host => $_list)
-                {
-                    if ($this->_msgRecipients[$_host][$_which])
-                    {
-                        foreach ($this->_msgRecipients[$_host][$_which] as $_addr => $_realName)
-                        {
-                            if ($_realName)	// @CHANGE LDR
-                            {
-                                $_realName = '"'.$_realName.'"';
-                                $_RCPT_list[] = $_realName.' <'.$_addr.'@'.$_host.'>';
-                            } else {
-                                $_RCPT_list[] = $_addr.'@'.$_host;
-                            }
-                        }
-                    }
-                }
-
-                return implode(', ', $_RCPT_list);
-            } else {
-                $this->_setErr(101, 'No eMail Address for message to be sent to.');
-                return false;
-            }
-        } else {
-            $this->_setErr(102, 'eMail type not defined.');
-            return false;
-        }
-    }
-
-    /**
-     * TO Address[es] inwhich to send mail to
-     *
-     * @param 	string 	$_addrTo 	TO Address[es] inwhich to send mail to
-     * @return 	void
-     */
-    public function setTO($_addrTo)
-    {
-        if ($_addrTo)
-        $this->_buildAddrList('to', $_addrTo);
-    }
-
-    /**
-     * Retrieves the TO Address[es] inwhich to send mail to
-     *
-     * @return 	string 	TO Address[es] inwhich to send mail to
-     */
-    public function getTo()
-    {
-        return $this->get_email_list('to');
-    }
-
-    /**
-     * CC Address[es] inwhich to send mail to
-     *
-     * @param 	string	$_strCC		CC Address[es] inwhich to send mail to
-     * @return 	void
-     */
-    public function setCC($_strCC)
-    {
-        if ($_strCC)
-        $this->_buildAddrList('cc', $_strCC);
-    }
-
-    /**
-     * Retrieves the CC Address[es] inwhich to send mail to
-     *
-     * @return 	string 		CC Address[es] inwhich to send mail to
-     */
-    public function getCC()
-    {
-        return $this->get_email_list('cc');
-    }
-
-    /**
-     * BCC Address[es] inwhich to send mail to
-     *
-     * @param 	string		$_strBCC	Recipients BCC Address[es] inwhich to send mail to
-     * @return 	void
-     */
-    public function setBCC($_strBCC)
-    {
-        if ($_strBCC)
-        $this->_buildAddrList('bcc', $_strBCC);
-    }
-
-    /**
-     * Retrieves the BCC Address[es] inwhich to send mail to
-     *
-     * @return 	string		BCC Address[es] inwhich to send mail to
-     */
-    public function getBCC()
-    {
-        return $this->get_email_list('bcc');
-    }
-
-    /**
-     * Message Subject
-     *
-     * @param 	string 	$_strSubject	Message Subject
-     * @return 	void
-     */
-    public function setSubject($_strSubject = '')
-    {
-        if ($_strSubject)
-        $this->_msgSubject = $_strSubject;
-    }
-
-    /**
-     * Retrieves the Message Subject
-     *
-     * @return 	string 		Message Subject
-     */
-    public function getSubject()
-    {
-        return $this->_msgSubject;
-    }
-
-    /**
-     * Constructes and returns message header
-     *
-     * @return string Complete message header
-     */
-    public function getHeader()
-    {
-        global $conf;
-
-        $_header = 'From: '.$this->getFrom('org')."\r\n"
-        . 'To: '.$this->getTO()."\r\n";
-
-        if ($this->getCC())
-        $_header .= 'Cc: '.$this->getCC()."\r\n";
-
-        /* Note:
+					$this->socket_send_str('RCPT TO: <'.$_address.'>', '250');
+				}
+
+				// Tell the server we are ready to start sending data
+				// with any custom headers...
+				// This is the last response code we look for until the end of the message.
+				$this->socket_send_str('DATA', '354');
+
+				// Now we are ready for the message...
+				// Ok, all the ingredients are mixed in let's cook this puppy...
+				$this->socket_send_str($this->getHeader().$this->getBodyContent()."\r\n".'.', '250');
+
+				// Now tell the server we are done and close the socket...
+				fputs($this->socket, 'QUIT');
+				fclose($this->socket);
+			}
+		}
+
+		return $_retVal;
+	}
+
+	// =============================================================
+	// ** Setter & Getter methods
+
+	// ** Basic System configuration
+
+	/**
+	 * setConfig() is used to populate select class properties from either
+	 * a user defined INI file or the systems 'php.ini' file
+	 *
+	 * If a user defined INI is to be used, the files complete path is passed
+	 * as the method single parameter. The INI can define any class and/or
+	 * user properties. Only properties defined within this file will be setter
+	 * and/or orverwritten
+	 *
+	 * If the systems 'php.ini' file is to be used, the method is called without
+	 * parameters. In this case, only HOST, PORT and FROM properties will be set
+	 * as they are the only properties that are defined within the 'php.ini'.
+	 *
+	 * If secure SMTP is to be used, the user ID and Password can be defined with
+	 * the user INI file, but the properties are not defined with the systems
+	 * 'php.ini'file, they must be defined via their setter methods
+	 *
+	 * This method can be called twice, if desired. Once without a parameter to
+	 * load the properties as defined within the systems 'php.ini' file, and a
+	 * second time, with a path to a user INI file for other properties to be
+	 * defined.
+	 *
+	 * @param mixed $_strConfigPath path to config file or VOID
+	 * @return boolean
+	 */
+	public function setConfig($_strConfigPath = null)
+	{
+		/**
+		 * Returns constructed SELECT Object string or boolean upon failure
+		 * Default value is set at true
+		 */
+		$_retVal = true;
+
+		// if we have a path...
+		if (!empty($_strConfigPath))
+		{
+			// If the path is not valid, this will NOT generate an error,
+			// it will simply return false.
+			if (!@include $_strConfigPath)
+			{
+				$this->_setErr(110, '"'.$_strConfigPath.'" is not a valid path.');
+				$_retVal = false;
+			}
+		}
+
+		// Read the Systems php.ini file
+		else {
+			// Set these properties ONLY if they are set in the php.ini file.
+			// Otherwise the default values will be used.
+			if ($_host = ini_get('SMTPs'))
+			$this->setHost($_host);
+
+			if ($_port = ini_get('smtp_port'))
+			$this->setPort($_port);
+
+			if ($_from = ini_get('sendmail_from'))
+			$this->setFrom($_from);
+		}
+
+		// Send back what we have
+		return $_retVal;
+	}
+
+	/**
+	 * Determines the method inwhich the messages are to be sent.
+	 * - 'sockets' [0] - conect via network to SMTP server
+	 * - 'pipe     [1] - use UNIX path to EXE
+	 * - 'phpmail  [2] - use the PHP built-in mail function
+	 *
+	 * @param int $_type  Interger value representing Mail Transport Type
+	 * @return void
+	 */
+	public function setTransportType($_type = 0)
+	{
+		if ((is_numeric($_type)) && (($_type >= 0) && ($_type <= 3))) {
+			$this->_transportType = $_type;
+		}
+	}
+
+	/**
+	 * Return the method inwhich the message is to be sent.
+	 * - 'sockets' [0] - conect via network to SMTP server
+	 * - 'pipe     [1] - use UNIX path to EXE
+	 * - 'phpmail  [2] - use the PHP built-in mail function
+	 *
+	 * @return int $_strHost Host Name or IP of the Mail Server to use
+	 */
+	public function getTransportType()
+	{
+		return $this->_transportType;
+	}
+
+	/**
+	 * Path to the sendmail execuable
+	 *
+	 * @param string $_path Path to the sendmail execuable
+	 * @return boolean
+	 *
+	 */
+	public function setMailPath($_path)
+	{
+		// This feature is not yet implemented
+		return true;
+
+		//if ( $_path ) $this->_mailPath = $_path;
+	}
+
+	/**
+	 * Defines the Host Name or IP of the Mail Server to use.
+	 * This is defaulted to 'localhost'
+	 * This is  used only with 'socket' based mail transmission
+	 *
+	 * @param 	string 	$_strHost 		Host Name or IP of the Mail Server to use
+	 * @return 	void
+	 */
+	public function setHost($_strHost)
+	{
+		if ($_strHost)
+		$this->_smtpsHost = $_strHost;
+	}
+
+	/**
+	 * Retrieves the Host Name or IP of the Mail Server to use
+	 * This is  used only with 'socket' based mail transmission
+	 *
+	 * @return 	string 	$_strHost 		Host Name or IP of the Mail Server to use
+	 */
+	public function getHost()
+	{
+		return $this->_smtpsHost;
+	}
+
+	/**
+	 * Defines the Port Number of the Mail Server to use
+	 * This is defaulted to '25'
+	 * This is  used only with 'socket' based mail transmission
+	 *
+	 * @param 	int 	$_intPort 		Port Number of the Mail Server to use
+	 * @return 	void
+	 */
+	public function setPort($_intPort)
+	{
+		if ((is_numeric($_intPort)) &&
+		(($_intPort >= 1) && ($_intPort <= 65536)))
+		$this->_smtpsPort = $_intPort;
+	}
+
+	/**
+	 * Retrieves the Port Number of the Mail Server to use
+	 * This is  used only with 'socket' based mail transmission
+	 *
+	 * @return 	string 		Port Number of the Mail Server to use
+	 */
+	public function getPort()
+	{
+		return $this->_smtpsPort;
+	}
+
+	/**
+	 * User Name for authentication on Mail Server
+	 *
+	 * @param 	string 	$_strID 	User Name for authentication on Mail Server
+	 * @return 	void
+	 */
+	public function setID($_strID)
+	{
+		$this->_smtpsID = $_strID;
+	}
+
+	/**
+	 * Retrieves the User Name for authentication on Mail Server
+	 *
+	 * @return string 	User Name for authentication on Mail Server
+	 */
+	public function getID()
+	{
+		return $this->_smtpsID;
+	}
+
+	/**
+	 * User Password for authentication on Mail Server
+	 *
+	 * @param 	string 	$_strPW 	User Password for authentication on Mail Server
+	 * @return 	void
+	 */
+	public function setPW($_strPW)
+	{
+		$this->_smtpsPW = $_strPW;
+	}
+
+	/**
+	 * Retrieves the User Password for authentication on Mail Server
+	 *
+	 * @return 	string 		User Password for authentication on Mail Server
+	 */
+	public function getPW()
+	{
+		return $this->_smtpsPW;
+	}
+
+	/**
+	 * Character set used for current message
+	 * Character set is defaulted to 'iso-8859-1';
+	 *
+	 * @param string $_strCharSet Character set used for current message
+	 * @return void
+	 */
+	public function setCharSet($_strCharSet)
+	{
+		if ($_strCharSet)
+		$this->_smtpsCharSet = $_strCharSet;
+	}
+
+	/**
+	 * Retrieves the Character set used for current message
+	 *
+	 * @return string $_smtpsCharSet Character set used for current message
+	 */
+	public function getCharSet()
+	{
+		return $this->_smtpsCharSet;
+	}
+
+	/**
+	 * Content-Transfer-Encoding, Defaulted to '7bit'
+	 * This can be changed for 2byte characers sets
+	 * Known Encode Types
+	 *  - 7bit               Simple 7-bit ASCII
+	 *  - 8bit               8-bit coding with line termination characters
+	 *  - base64             3 octets encoded into 4 sextets with offset
+	 *  - binary             Arbitrary binary stream
+	 *  - mac-binhex40       Macintosh binary to hex encoding
+	 *  - quoted-printable   Mostly 7-bit, with 8-bit characters encoded as "=HH"
+	 *  - uuencode           UUENCODE encoding
+	 *
+	 * @param string $_strTransEncode Content-Transfer-Encoding
+	 * @return void
+	 */
+	public function setTransEncode($_strTransEncode)
+	{
+		if (array_search($_strTransEncode, $this->_smtpsTransEncodeTypes))
+		$this->_smtpsTransEncode = $_strTransEncode;
+	}
+
+	/**
+	 * Retrieves the Content-Transfer-Encoding
+	 *
+	 * @return string $_smtpsTransEncode Content-Transfer-Encoding
+	 */
+	public function getTransEncode()
+	{
+		return $this->_smtpsTransEncode;
+	}
+
+	/**
+	 * Content-Transfer-Encoding, Defaulted to '0' [ZERO]
+	 * This can be changed for 2byte characers sets
+	 * Known Encode Types
+	 *  - [0] 7bit               Simple 7-bit ASCII
+	 *  - [1] 8bit               8-bit coding with line termination characters
+	 *  - [2] base64             3 octets encoded into 4 sextets with offset
+	 *  - [3] binary             Arbitrary binary stream
+	 *  - [4] mac-binhex40       Macintosh binary to hex encoding
+	 *  - [5] quoted-printable   Mostly 7-bit, with 8-bit characters encoded as "=HH"
+	 *  - [6] uuencode           UUENCODE encoding
+	 *
+	 * @param string $_strTransEncodeType Content-Transfer-Encoding
+	 * @return void
+	 *
+	 */
+	public function setTransEncodeType($_strTransEncodeType)
+	{
+		if (array_search($_strTransEncodeType, $this->_smtpsTransEncodeTypes))
+		$this->_smtpsTransEncodeType = $_strTransEncodeType;
+	}
+
+	/**
+	 * Retrieves the Content-Transfer-Encoding
+	 *
+	 * @return 	string 		Content-Transfer-Encoding
+	 */
+	public function getTransEncodeType()
+	{
+		return $this->_smtpsTransEncodeTypes[$this->_smtpsTransEncodeType];
+	}
+
+
+	// ** Message Construction
+
+	/**
+	 * FROM Address from which mail will be sent
+	 *
+	 * @param 	string 	$_strFrom 	Address from which mail will be sent
+	 * @return 	void
+	 */
+	public function setFrom($_strFrom)
+	{
+		if ($_strFrom)
+		$this->_msgFrom = $this->_strip_email($_strFrom);
+	}
+
+	/**
+	 * Retrieves the Address from which mail will be sent
+	 *
+	 * @param  	boolean $_part		To "strip" 'Real name' from address
+	 * @return 	string 				Address from which mail will be sent
+	 */
+	public function getFrom($_part = true)
+	{
+		$_retValue = '';
+
+		if ($_part === true)
+		$_retValue = $this->_msgFrom;
+		else $_retValue = $this->_msgFrom[$_part];
+
+		return $_retValue;
+	}
+
+	/**
+	 * Reply-To Address from which mail will be the reply-to
+	 *
+	 * @param 	string 	$_strReplyTo 	Address from which mail will be the reply-to
+	 * @return 	void
+	 */
+	public function setReplyTo($_strReplyTo)
+	{
+		if ($_strReplyTo)
+			$this->_msgReplyTo = $this->_strip_email($_strReplyTo);
+	}
+
+	/**
+	 * Retrieves the Address from which mail will be the reply-to
+	 *
+	 * @param  	boolean $_part		To "strip" 'Real name' from address
+	 * @return 	string 				Address from which mail will be the reply-to
+	 */
+	public function getReplyTo($_part = true)
+	{
+		$_retValue = '';
+
+		if ($_part === true)
+			$_retValue = $this->_msgReplyTo;
+		else $_retValue = $this->_msgReplyTo[$_part];
+
+		return $_retValue;
+	}
+
+	/**
+	 * Inserts given addresses into structured format.
+	 * This method takes a list of given addresses, via an array
+	 * or a COMMA delimted string, and inserts them into a highly
+	 * structured array. This array is designed to remove duplicate
+	 * addresses and to sort them by Domain.
+	 *
+	 * @param 	string 	$_type 			TO, CC, or BCC lists to add addrresses into
+	 * @param 	mixed 	$_addrList 		Array or COMMA delimited string of addresses
+	 * @return void
+	 *
+	 */
+	private function _buildAddrList($_type, $_addrList)
+	{
+		// Pull existing list
+		$aryHost = $this->_msgRecipients;
+
+		// Only run this if we have something
+		if (!empty($_addrList))
+		{
+			// $_addrList can be a STRING or an array
+			if (is_string($_addrList))
+			{
+				// This could be a COMMA delimited string
+				if (strstr($_addrList, ','))
+				// "explode "list" into an array
+				$_addrList = explode(',', $_addrList);
+
+				// Stick it in an array
+				else $_addrList = array($_addrList);
+			}
+
+			// take the array of addresses and split them further
+			foreach ($_addrList as $_strAddr)
+			{
+				// Strip off the end '>'
+				$_strAddr = str_replace('>', '', $_strAddr);
+
+				// Seperate "Real Name" from eMail address
+				$_tmpaddr = null;
+				$_tmpaddr = explode('<', $_strAddr);
+
+				// We have a "Real Name" and eMail address
+				if (count($_tmpaddr) == 2)
+				{
+					$_tmpHost = explode('@', $_tmpaddr[1]);
+					$_tmpaddr[0] = trim($_tmpaddr[0], ' ">');
+					$aryHost[$_tmpHost[1]][$_type][$_tmpHost[0]] = $_tmpaddr[0];
+				}
+				// We only have an eMail address
+				else {
+					// Strip off the beggining '<'
+					$_strAddr = str_replace('<', '', $_strAddr);
+
+					$_tmpHost = explode('@', $_strAddr);
+					$_tmpHost[0] = trim($_tmpHost[0]);
+					$_tmpHost[1] = trim($_tmpHost[1]);
+
+					$aryHost[$_tmpHost[1]][$_type][$_tmpHost[0]] = '';
+				}
+			}
+		}
+		// replace list
+		$this->_msgRecipients = $aryHost;
+	}
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Returns an array of the various parts of an email address
+	 * This assumes a well formed address:
+	 * - "Real name" <username@domain.tld>
+	 * - "Real Name" is optional
+	 * - if "Real Name" does not exist, the angle brackets are optional
+	 * This will split an email address into 4 or 5 parts.
+	 * - $_aryEmail[org]  = orignal string
+	 * - $_aryEmail[real] = "real name" - if there is one
+	 * - $_aryEmail[addr] = address part "username@domain.tld"
+	 * - $_aryEmail[host] = "domain.tld"
+	 * - $_aryEmail[user] = "userName"
+	 *
+	 *	@param		string		$_strAddr		Email address
+	 * 	@return 	array	 					An array of the various parts of an email address
+	 */
+	private function _strip_email($_strAddr)
+	{
+		// phpcs:enable
+		// Keep the orginal
+		$_aryEmail['org'] = $_strAddr;
+
+		// Set entire string to Lower Case
+		$_strAddr = strtolower($_strAddr);
+
+		// Drop "stuff' off the end
+		$_strAddr = trim($_strAddr, ' ">');
+
+		// Seperate "Real Name" from eMail address, if we have one
+		$_tmpAry = explode('<', $_strAddr);
+
+		// Do we have a "Real name"
+		if (count($_tmpAry) == 2)
+		{
+			// We may not really have a "Real Name"
+			if ($_tmpAry[0])
+			$_aryEmail['real'] = trim($_tmpAry[0], ' ">');
+
+			$_aryEmail['addr'] = $_tmpAry[1];
+		} else $_aryEmail['addr'] = $_tmpAry[0];
+
+		// Pull User Name and Host.tld apart
+		list($_aryEmail['user'], $_aryEmail['host']) = explode('@', $_aryEmail['addr']);
+
+		// Put the brackets back around the address
+		$_aryEmail['addr'] = '<'.$_aryEmail['addr'].'>';
+
+		return $_aryEmail;
+	}
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Returns an array of bares addresses for use with 'RCPT TO:'
+	 * This is a "build as you go" method. Each time this method is called
+	 * the underlaying array is destroyed and reconstructed.
+	 *
+	 * @return 		array		Returns an array of bares addresses
+	 */
+	public function get_RCPT_list()
+	{
+		// phpcs:enable
+		/**
+		 * An array of bares addresses for use with 'RCPT TO:'
+		 */
+		$_RCPT_list = array();
+
+		// walk down Recipients array and pull just email addresses
+		foreach ($this->_msgRecipients as $_host => $_list)
+		{
+			foreach ($_list as $_subList)
+			{
+				foreach ($_subList as $_name => $_addr)
+				{
+					// build RCPT list
+					$_RCPT_list[] = $_name.'@'.$_host;
+				}
+			}
+		}
+
+		return $_RCPT_list;
+	}
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Returns an array of addresses for a specific type; TO, CC or BCC
+	 *
+	 * @param 		string 	       $_which 	    Which collection of addresses to return ('to', 'cc', 'bcc')
+	 * @return 		string|false 				Array of emaill address
+	 */
+	public function get_email_list($_which = null)
+	{
+		// phpcs:enable
+		// We need to know which address segment to pull
+		if ($_which)
+		{
+			// Make sure we have addresses to process
+			if ($this->_msgRecipients)
+			{
+				$_RCPT_list = array();
+				// walk down Recipients array and pull just email addresses
+				foreach ($this->_msgRecipients as $_host => $_list)
+				{
+					if ($this->_msgRecipients[$_host][$_which])
+					{
+						foreach ($this->_msgRecipients[$_host][$_which] as $_addr => $_realName)
+						{
+							if ($_realName)	// @CHANGE LDR
+							{
+								$_realName = '"'.$_realName.'"';
+								$_RCPT_list[] = $_realName.' <'.$_addr.'@'.$_host.'>';
+							} else {
+								$_RCPT_list[] = $_addr.'@'.$_host;
+							}
+						}
+					}
+				}
+
+				return implode(', ', $_RCPT_list);
+			} else {
+				$this->_setErr(101, 'No eMail Address for message to be sent to.');
+				return false;
+			}
+		} else {
+			$this->_setErr(102, 'eMail type not defined.');
+			return false;
+		}
+	}
+
+	/**
+	 * TO Address[es] inwhich to send mail to
+	 *
+	 * @param 	string 	$_addrTo 	TO Address[es] inwhich to send mail to
+	 * @return 	void
+	 */
+	public function setTO($_addrTo)
+	{
+		if ($_addrTo)
+		$this->_buildAddrList('to', $_addrTo);
+	}
+
+	/**
+	 * Retrieves the TO Address[es] inwhich to send mail to
+	 *
+	 * @return 	string 	TO Address[es] inwhich to send mail to
+	 */
+	public function getTo()
+	{
+		return $this->get_email_list('to');
+	}
+
+	/**
+	 * CC Address[es] inwhich to send mail to
+	 *
+	 * @param 	string	$_strCC		CC Address[es] inwhich to send mail to
+	 * @return 	void
+	 */
+	public function setCC($_strCC)
+	{
+		if ($_strCC)
+		$this->_buildAddrList('cc', $_strCC);
+	}
+
+	/**
+	 * Retrieves the CC Address[es] inwhich to send mail to
+	 *
+	 * @return 	string 		CC Address[es] inwhich to send mail to
+	 */
+	public function getCC()
+	{
+		return $this->get_email_list('cc');
+	}
+
+	/**
+	 * BCC Address[es] inwhich to send mail to
+	 *
+	 * @param 	string		$_strBCC	Recipients BCC Address[es] inwhich to send mail to
+	 * @return 	void
+	 */
+	public function setBCC($_strBCC)
+	{
+		if ($_strBCC)
+		$this->_buildAddrList('bcc', $_strBCC);
+	}
+
+	/**
+	 * Retrieves the BCC Address[es] inwhich to send mail to
+	 *
+	 * @return 	string		BCC Address[es] inwhich to send mail to
+	 */
+	public function getBCC()
+	{
+		return $this->get_email_list('bcc');
+	}
+
+	/**
+	 * Message Subject
+	 *
+	 * @param 	string 	$_strSubject	Message Subject
+	 * @return 	void
+	 */
+	public function setSubject($_strSubject = '')
+	{
+		if ($_strSubject)
+		$this->_msgSubject = $_strSubject;
+	}
+
+	/**
+	 * Retrieves the Message Subject
+	 *
+	 * @return 	string 		Message Subject
+	 */
+	public function getSubject()
+	{
+		return $this->_msgSubject;
+	}
+
+	/**
+	 * Constructes and returns message header
+	 *
+	 * @return string Complete message header
+	 */
+	public function getHeader()
+	{
+		global $conf;
+
+		$_header = 'From: '.$this->getFrom('org')."\r\n"
+		. 'To: '.$this->getTO()."\r\n";
+
+		if ($this->getCC())
+		$_header .= 'Cc: '.$this->getCC()."\r\n";
+
+		/* Note:
          * BCC email addresses must be listed in the RCPT TO command list,
          * but the BCC header should not be printed under the DATA command.
          * So it is included into the function sendMsg() but not here.
          * http://stackoverflow.com/questions/2750211/sending-bcc-emails-using-a-smtp-server
          */
-        /*
+		/*
         if ( $this->getBCC() )
         $_header .= 'Bcc: ' . $this->getBCC()  . "\r\n";
         */
 
-        $host = dol_getprefix('email');
-
-        //NOTE: Message-ID should probably contain the username of the user who sent the msg
-        $_header .= 'Subject: '.$this->getSubject()."\r\n";
-        $_header .= 'Date: '.date("r")."\r\n";
-
-        $trackid = $this->getTrackId();
-        if ($trackid)
-        {
-            // References is kept in response and Message-ID is returned into In-Reply-To:
-            $_header .= 'Message-ID: <'.time().'.SMTPs-dolibarr-'.$trackid.'@'.$host.">\r\n";
-            $_header .= 'References: <'.time().'.SMTPs-dolibarr-'.$trackid.'@'.$host.">\r\n";
-            $_header .= 'X-Dolibarr-TRACKID: '.$trackid.'@'.$host."\r\n";
-        } else {
-            $_header .= 'Message-ID: <'.time().'.SMTPs@'.$host.">\r\n";
-        }
-        if (!empty($_SERVER['REMOTE_ADDR'])) $_header .= "X-RemoteAddr: ".$_SERVER['REMOTE_ADDR']."\r\n";
-        if ($this->getMoreInHeader())
-            $_header .= $this->getMoreInHeader(); // Value must include the "\r\n";
-
-        //$_header .=
-        //                 'Read-Receipt-To: '   . $this->getFrom( 'org' ) . "\r\n"
-        //                 'Return-Receipt-To: ' . $this->getFrom( 'org' ) . "\r\n";
-
-        if ($this->getSensitivity())
-        $_header .= 'Sensitivity: '.$this->getSensitivity()."\r\n";
-
-        if ($this->_msgPriority != 3)
-        $_header .= $this->getPriority();
-
-
-        // @CHANGE LDR
-        if ($this->getDeliveryReceipt())
-            $_header .= 'Disposition-Notification-To: '.$this->getFrom('addr')."\r\n";
-        if ($this->getErrorsTo())
-            $_header .= 'Errors-To: '.$this->getErrorsTo('addr')."\r\n";
-        if ($this->getReplyTo())
-            $_header .= "Reply-To: ".$this->getReplyTo('addr')."\r\n";
-
-        $_header .= 'X-Mailer: Dolibarr version '.DOL_VERSION.' (using SMTPs Mailer)'."\r\n";
-        $_header .= 'X-Dolibarr-Option: '.($conf->global->MAIN_MAIL_USE_MULTI_PART ? 'MAIN_MAIL_USE_MULTI_PART' : 'No MAIN_MAIL_USE_MULTI_PART')."\r\n";
-        $_header .= 'Mime-Version: 1.0'."\r\n";
-
-
-        return $_header;
-    }
-
-    /**
-     * Message Content
-     *
-     * @param 	string 	$strContent		Message Content
-     * @param	string	$strType		Type
-     * @return 	void
-     */
-    public function setBodyContent($strContent, $strType = 'plain')
-    {
-        //if ( $strContent )
-        //{
-        if ($strType == 'html')
-        $strMimeType = 'text/html';
-        else $strMimeType = 'text/plain';
-
-        // Make RFC821 Compliant, replace bare linefeeds
-        $strContent = preg_replace("/(?<!\r)\n/si", "\r\n", $strContent);
-
-        $strContentAltText = '';
-        if ($strType == 'html')
-        {
-        	// Similar code to forge a text from html is also in CMailFile.class.php
-        	$strContentAltText = preg_replace('/<head><title>.*<\/style><\/head>/', '', $strContent);
-        	$strContentAltText = preg_replace("/<br\s*[^>]*>/", " ", $strContentAltText);
-        	$strContentAltText = html_entity_decode(strip_tags($strContentAltText));
-            $strContentAltText = trim(wordwrap($strContentAltText, 75, "\r\n"));
-        }
-
-        // Make RFC2045 Compliant
-        //$strContent = rtrim(chunk_split($strContent));    // Function chunck_split seems ko if not used on a base64 content
-        $strContent = rtrim(wordwrap($strContent, 75, "\r\n")); // TODO Using this method creates unexpected line break on text/plain content.
-
-        $this->_msgContent[$strType] = array();
-
-        $this->_msgContent[$strType]['mimeType'] = $strMimeType;
-        $this->_msgContent[$strType]['data']     = $strContent;
-        $this->_msgContent[$strType]['dataText'] = $strContentAltText;
-
-        if ($this->getMD5flag())
-        $this->_msgContent[$strType]['md5']      = dol_hash($strContent, 3);
-        //}
-    }
-
-    /**
-     * Retrieves the Message Content
-     *
-     * @return 	string			Message Content
-     */
-    public function getBodyContent()
-    {
-        global $conf;
-
-        // Generate a new Boundary string
-        $this->_setBoundary();
-
-        // What type[s] of content do we have
-        $_types = array_keys($this->_msgContent);
-
-        // How many content types do we have
-        $keyCount = count($_types);
-
-        // If we have ZERO, we have a problem
-        if ($keyCount === 0)
-        die("Sorry, no content");
-
-        // If we have ONE, we can use the simple format
-        elseif ($keyCount === 1 && empty($conf->global->MAIN_MAIL_USE_MULTI_PART))
-        {
-            $_msgData = $this->_msgContent;
-            $_msgData = $_msgData[$_types[0]];
-
-            $content = 'Content-Type: '.$_msgData['mimeType'].'; charset="'.$this->getCharSet().'"'."\r\n"
-            . 'Content-Transfer-Encoding: '.$this->getTransEncodeType()."\r\n"
-            . 'Content-Disposition: inline'."\r\n"
-            . 'Content-Description: Message'."\r\n";
-
-            if ($this->getMD5flag())
-            $content .= 'Content-MD5: '.$_msgData['md5']."\r\n";
-
-            $content .= "\r\n"
-            .  $_msgData['data']."\r\n";
-        }
-
-        // If we have more than ONE, we use the multi-part format
-        elseif ($keyCount >= 1 || !empty($conf->global->MAIN_MAIL_USE_MULTI_PART))
-        {
-            // Since this is an actual multi-part message
-            // We need to define a content message Boundary
-            // NOTE: This was 'multipart/alternative', but Windows based mail servers have issues with this.
-
-            //$content = 'Content-Type: multipart/related; boundary="' . $this->_getBoundary() . '"'   . "\r\n";
-            $content = 'Content-Type: multipart/mixed; boundary="'.$this->_getBoundary('mixed').'"'."\r\n";
-
-            //                     . "\r\n"
-            //                     . 'This is a multi-part message in MIME format.' . "\r\n";
-            $content .= "Content-Transfer-Encoding: 8bit\r\n";
-            $content .= "\r\n";
-
-            $content .= "--".$this->_getBoundary('mixed')."\r\n";
-
-            if (key_exists('image', $this->_msgContent))     // If inline image found
-            {
-                $content .= 'Content-Type: multipart/alternative; boundary="'.$this->_getBoundary('alternative').'"'."\r\n";
-                $content .= "\r\n";
-                $content .= "--".$this->_getBoundary('alternative')."\r\n";
-            }
-
-
-            // $this->_msgContent must be sorted with key 'text' or 'html' first then 'image' then 'attachment'
-
-
-            // Loop through message content array
-            foreach ($this->_msgContent as $type => $_content)
-            {
-                if ($type == 'attachment')
-                {
-                    // loop through all attachments
-                    foreach ($_content as $_file => $_data)
-                    {
-                        $content .= "--".$this->_getBoundary('mixed')."\r\n"
-                        .  'Content-Disposition: attachment; filename="'.$_data['fileName'].'"'."\r\n"
-                        .  'Content-Type: '.$_data['mimeType'].'; name="'.$_data['fileName'].'"'."\r\n"
-                        .  'Content-Transfer-Encoding: base64'."\r\n"
-                        .  'Content-Description: '.$_data['fileName']."\r\n";
-
-                        if ($this->getMD5flag())
-                        $content .= 'Content-MD5: '.$_data['md5']."\r\n";
-
-                        $content .= "\r\n".$_data['data']."\r\n\r\n";
-                    }
-                }
-                // @CHANGE LDR
-                elseif ($type == 'image')
-                {
-                    // loop through all images
-                    foreach ($_content as $_image => $_data)
-                    {
-                        $content .= "--".$this->_getBoundary('related')."\r\n"; // always related for an inline image
-
-                        $content .= 'Content-Type: '.$_data['mimeType'].'; name="'.$_data['imageName'].'"'."\r\n"
-                        .  'Content-Transfer-Encoding: base64'."\r\n"
-                        .  'Content-Disposition: inline; filename="'.$_data['imageName'].'"'."\r\n"
-                        .  'Content-ID: <'.$_data['cid'].'> '."\r\n";
-
-                        if ($this->getMD5flag())
-                        $content .= 'Content-MD5: '.$_data['md5']."\r\n";
-
-                        $content .= "\r\n"
-                        . $_data['data']."\r\n";
-                    }
-
-                    // always end related and end alternative after inline images
-                    $content .= "--".$this->_getBoundary('related')."--\r\n";
-                    $content .= "\r\n--".$this->_getBoundary('alternative')."--\r\n";
-                    $content .= "\r\n";
-                } else {
-                    if (key_exists('image', $this->_msgContent))
-                    {
-                        $content .= "Content-Type: text/plain; charset=".$this->getCharSet()."\r\n";
-                        $content .= "\r\n".($_content['dataText'] ? $_content['dataText'] : strip_tags($_content['data']))."\r\n"; // Add plain text message
-                        $content .= "--".$this->_getBoundary('alternative')."\r\n";
-                        $content .= 'Content-Type: multipart/related; boundary="'.$this->_getBoundary('related').'"'."\r\n";
-                        $content .= "\r\n";
-                        $content .= "--".$this->_getBoundary('related')."\r\n";
-                    }
-
-                    if (!key_exists('image', $this->_msgContent) && $_content['dataText'] && !empty($conf->global->MAIN_MAIL_USE_MULTI_PART))  // Add plain text message part before html part
-                    {
-                        $content .= 'Content-Type: multipart/alternative; boundary="'.$this->_getBoundary('alternative').'"'."\r\n";
-                        $content .= "\r\n";
-                           $content .= "--".$this->_getBoundary('alternative')."\r\n";
-
-                           $content .= "Content-Type: text/plain; charset=".$this->getCharSet()."\r\n";
-                           $content .= "\r\n".$_content['dataText']."\r\n";
-                           $content .= "--".$this->_getBoundary('alternative')."\r\n";
-                    }
-
-                    $content .= 'Content-Type: '.$_content['mimeType'].'; charset='.$this->getCharSet();
-
-                    $content .= "\r\n";
-
-                    if ($this->getMD5flag()) {
-                    	$content .= 'Content-MD5: '.$_content['md5']."\r\n";
-                    }
-
-                    $content .= "\r\n".$_content['data']."\r\n";
-
-                    if (!key_exists('image', $this->_msgContent) && $_content['dataText'] && !empty($conf->global->MAIN_MAIL_USE_MULTI_PART))  // Add plain text message part after html part
-                    {
-                        $content .= "--".$this->_getBoundary('alternative')."--\r\n";
-                    }
-
-                    $content .= "\r\n";
-                }
-            }
-
-            $content .= "--".$this->_getBoundary('mixed').'--'."\r\n";
-        }
-
-        return $content;
-    }
-
-    /**
-     * File attachments are added to the content array as sub-arrays,
-     * allowing for multiple attachments for each outbound email
-     *
-     * @param string $strContent  File data to attach to message
-     * @param string $strFileName File Name to give to attachment
-     * @param string $strMimeType File Mime Type of attachment
-     * @return void
-     */
-    public function setAttachment($strContent, $strFileName = 'unknown', $strMimeType = 'unknown')
-    {
-        if ($strContent)
-        {
-            $strContent = rtrim(chunk_split(base64_encode($strContent), 76, "\r\n")); // 76 max is defined into http://tools.ietf.org/html/rfc2047
-
-            $this->_msgContent['attachment'][$strFileName]['mimeType'] = $strMimeType;
-            $this->_msgContent['attachment'][$strFileName]['fileName'] = $strFileName;
-            $this->_msgContent['attachment'][$strFileName]['data']     = $strContent;
-
-            if ($this->getMD5flag())
-            $this->_msgContent['attachment'][$strFileName]['md5']      = dol_hash($strContent, 3);
-        }
-    }
-
-
-    // @CHANGE LDR
-
-    /**
-     * Image attachments are added to the content array as sub-arrays,
-     * allowing for multiple images for each outbound email
-     *
-     * @param 	string $strContent  	Image data to attach to message
-     * @param 	string $strImageName 	Image Name to give to attachment
-     * @param 	string $strMimeType 	Image Mime Type of attachment
-     * @param 	string $strImageCid		CID
-     * @return 	void
-     */
-    public function setImageInline($strContent, $strImageName = 'unknown', $strMimeType = 'unknown', $strImageCid = 'unknown')
-    {
-        if ($strContent)
-        {
-            $this->_msgContent['image'][$strImageName]['mimeType'] = $strMimeType;
-            $this->_msgContent['image'][$strImageName]['imageName'] = $strImageName;
-            $this->_msgContent['image'][$strImageName]['cid']      = $strImageCid;
-            $this->_msgContent['image'][$strImageName]['data']     = $strContent;
-
-            if ($this->getMD5flag())
-            $this->_msgContent['image'][$strImageName]['md5']      = dol_hash($strContent, 3);
-        }
-    }
-    // END @CHANGE LDR
-
-
-    /**
-     * Message Content Sensitivity
-     * Message Sensitivity values:
-     *   - [0] None - default
-     *   - [1] Personal
-     *   - [2] Private
-     *   - [3] Company Confidential
-     *
-     * @param 	integer	$_value		Message Sensitivity
-     * @return 	void
-     */
-    public function setSensitivity($_value = 0)
-    {
-        if ((is_numeric($_value)) &&
-        (($_value >= 0) && ($_value <= 3)))
-        $this->_msgSensitivity = $_value;
-    }
-
-    /**
-     * Returns Message Content Sensitivity string
-     * Message Sensitivity values:
-     *   - [0] None - default
-     *   - [1] Personal
-     *   - [2] Private
-     *   - [3] Company Confidential
-     *
-     * @return 	void
-     */
-    public function getSensitivity()
-    {
-        return $this->_arySensitivity[$this->_msgSensitivity];
-    }
-
-    /**
-     * Message Content Priority
-     * Message Priority values:
-     *  - [0] 'Bulk'
-     *  - [1] 'Highest'
-     *  - [2] 'High'
-     *  - [3] 'Normal' - default
-     *  - [4] 'Low'
-     *  - [5] 'Lowest'
-     *
-     * @param 	integer 	$_value 	Message Priority
-     * @return 	void
-     */
-    public function setPriority($_value = 3)
-    {
-        if ((is_numeric($_value)) &&
-        (($_value >= 0) && ($_value <= 5)))
-        $this->_msgPriority = $_value;
-    }
-
-    /**
-     * Message Content Priority
-     * Message Priority values:
-     *  - [0] 'Bulk'
-     *  - [1] 'Highest'
-     *  - [2] 'High'
-     *  - [3] 'Normal' - default
-     *  - [4] 'Low'
-     *  - [5] 'Lowest'
-     *
-     * @return string
-     */
-    public function getPriority()
-    {
-        return 'Importance: '.$this->_aryPriority[$this->_msgPriority]."\r\n"
-        . 'Priority: '.$this->_aryPriority[$this->_msgPriority]."\r\n"
-        . 'X-Priority: '.$this->_msgPriority.' ('.$this->_aryPriority[$this->_msgPriority].')'."\r\n";
-    }
-
-    /**
-     * Set flag which determines whether to calculate message MD5 checksum.
-     *
-     * @param 	string 	$_flag		Message Priority
-     * @return 	void
-     */
-    public function setMD5flag($_flag = false)
-    {
-        $this->_smtpMD5 = $_flag;
-    }
-
-    /**
-     * Gets flag which determines whether to calculate message MD5 checksum.
-     *
-     * @return 	boolean 				Message Priority
-     */
-    public function getMD5flag()
-    {
-        return $this->_smtpMD5;
-    }
-
-    /**
-     * Message X-Header Content
-     * This is a simple "insert". Whatever is given will be placed
-     * "as is" into the Xheader array.
-     *
-     * @param string $strXdata Message X-Header Content
-     * @return void
-     */
-    public function setXheader($strXdata)
-    {
-        if ($strXdata)
-        $this->_msgXheader[] = $strXdata;
-    }
-
-    /**
-     * Retrieves the Message X-Header Content
-     *
-     * @return string[] $_msgContent Message X-Header Content
-     */
-    public function getXheader()
-    {
-        return $this->_msgXheader;
-    }
-
-    /**
-     * Generates Random string for MIME message Boundary
-     *
-     * @return void
-     */
-    private function _setBoundary()
-    {
-        $this->_smtpsBoundary = "multipart_x.".time().".x_boundary";
-        $this->_smtpsRelatedBoundary = 'mul_'.dol_hash(uniqid("dolibarr2"), 3);
-        $this->_smtpsAlternativeBoundary = 'mul_'.dol_hash(uniqid("dolibarr3"), 3);
-    }
-
-    /**
-     * Retrieves the MIME message Boundary
-     *
-     * @param  string $type				Type of boundary
-     * @return string $_smtpsBoundary 	MIME message Boundary
-     */
-    private function _getBoundary($type = 'mixed')
-    {
-        if ($type == 'mixed') return $this->_smtpsBoundary;
-        elseif ($type == 'related') return $this->_smtpsRelatedBoundary;
-        elseif ($type == 'alternative') return $this->_smtpsAlternativeBoundary;
-    }
-
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * This function has been modified as provided by SirSir to allow multiline responses when
-     * using SMTP Extensions
-     *
-     * @param	resource    $socket			Socket handler
-     * @param	string		$response		Response. Example: "550 5.7.1  https://support.google.com/a/answer/6140680#invalidcred j21sm814390wre.3"
-     * @return	boolean						True or false
-     */
-    public function server_parse($socket, $response)
-    {
-        // phpcs:enable
-        /**
-         * Returns constructed SELECT Object string or boolean upon failure
-         * Default value is set at true
-         */
-        $_retVal = true;
-
-        $server_response = '';
-
-        // avoid infinite loop
-        $limit = 0;
-
-        while (substr($server_response, 3, 1) != ' ' && $limit < 100)
-        {
-            if (!($server_response = fgets($socket, 256)))
-            {
-                $this->_setErr(121, "Couldn't get mail server response codes");
-                $_retVal = false;
-                break;
-            }
+		$host = dol_getprefix('email');
+
+		//NOTE: Message-ID should probably contain the username of the user who sent the msg
+		$_header .= 'Subject: '.$this->getSubject()."\r\n";
+		$_header .= 'Date: '.date("r")."\r\n";
+
+		$trackid = $this->getTrackId();
+		if ($trackid)
+		{
+			// References is kept in response and Message-ID is returned into In-Reply-To:
+			$_header .= 'Message-ID: <'.time().'.SMTPs-dolibarr-'.$trackid.'@'.$host.">\r\n";
+			$_header .= 'References: <'.time().'.SMTPs-dolibarr-'.$trackid.'@'.$host.">\r\n";
+			$_header .= 'X-Dolibarr-TRACKID: '.$trackid.'@'.$host."\r\n";
+		} else {
+			$_header .= 'Message-ID: <'.time().'.SMTPs@'.$host.">\r\n";
+		}
+		if (!empty($_SERVER['REMOTE_ADDR'])) $_header .= "X-RemoteAddr: ".$_SERVER['REMOTE_ADDR']."\r\n";
+		if ($this->getMoreInHeader())
+			$_header .= $this->getMoreInHeader(); // Value must include the "\r\n";
+
+		//$_header .=
+		//                 'Read-Receipt-To: '   . $this->getFrom( 'org' ) . "\r\n"
+		//                 'Return-Receipt-To: ' . $this->getFrom( 'org' ) . "\r\n";
+
+		if ($this->getSensitivity())
+		$_header .= 'Sensitivity: '.$this->getSensitivity()."\r\n";
+
+		if ($this->_msgPriority != 3)
+		$_header .= $this->getPriority();
+
+
+		// @CHANGE LDR
+		if ($this->getDeliveryReceipt())
+			$_header .= 'Disposition-Notification-To: '.$this->getFrom('addr')."\r\n";
+		if ($this->getErrorsTo())
+			$_header .= 'Errors-To: '.$this->getErrorsTo('addr')."\r\n";
+		if ($this->getReplyTo())
+			$_header .= "Reply-To: ".$this->getReplyTo('addr')."\r\n";
+
+		$_header .= 'X-Mailer: Dolibarr version '.DOL_VERSION.' (using SMTPs Mailer)'."\r\n";
+		$_header .= 'X-Dolibarr-Option: '.($conf->global->MAIN_MAIL_USE_MULTI_PART ? 'MAIN_MAIL_USE_MULTI_PART' : 'No MAIN_MAIL_USE_MULTI_PART')."\r\n";
+		$_header .= 'Mime-Version: 1.0'."\r\n";
+
+
+		return $_header;
+	}
+
+	/**
+	 * Message Content
+	 *
+	 * @param 	string 	$strContent		Message Content
+	 * @param	string	$strType		Type
+	 * @return 	void
+	 */
+	public function setBodyContent($strContent, $strType = 'plain')
+	{
+		//if ( $strContent )
+		//{
+		if ($strType == 'html')
+		$strMimeType = 'text/html';
+		else $strMimeType = 'text/plain';
+
+		// Make RFC821 Compliant, replace bare linefeeds
+		$strContent = preg_replace("/(?<!\r)\n/si", "\r\n", $strContent);
+
+		$strContentAltText = '';
+		if ($strType == 'html')
+		{
+			// Similar code to forge a text from html is also in CMailFile.class.php
+			$strContentAltText = preg_replace('/<head><title>.*<\/style><\/head>/', '', $strContent);
+			$strContentAltText = preg_replace("/<br\s*[^>]*>/", " ", $strContentAltText);
+			$strContentAltText = html_entity_decode(strip_tags($strContentAltText));
+			$strContentAltText = trim(wordwrap($strContentAltText, 75, "\r\n"));
+		}
+
+		// Make RFC2045 Compliant
+		//$strContent = rtrim(chunk_split($strContent));    // Function chunck_split seems ko if not used on a base64 content
+		$strContent = rtrim(wordwrap($strContent, 75, "\r\n")); // TODO Using this method creates unexpected line break on text/plain content.
+
+		$this->_msgContent[$strType] = array();
+
+		$this->_msgContent[$strType]['mimeType'] = $strMimeType;
+		$this->_msgContent[$strType]['data']     = $strContent;
+		$this->_msgContent[$strType]['dataText'] = $strContentAltText;
+
+		if ($this->getMD5flag())
+		$this->_msgContent[$strType]['md5']      = dol_hash($strContent, 3);
+		//}
+	}
+
+	/**
+	 * Retrieves the Message Content
+	 *
+	 * @return 	string			Message Content
+	 */
+	public function getBodyContent()
+	{
+		global $conf;
+
+		// Generate a new Boundary string
+		$this->_setBoundary();
+
+		// What type[s] of content do we have
+		$_types = array_keys($this->_msgContent);
+
+		// How many content types do we have
+		$keyCount = count($_types);
+
+		// If we have ZERO, we have a problem
+		if ($keyCount === 0)
+		die("Sorry, no content");
+
+		// If we have ONE, we can use the simple format
+		elseif ($keyCount === 1 && empty($conf->global->MAIN_MAIL_USE_MULTI_PART))
+		{
+			$_msgData = $this->_msgContent;
+			$_msgData = $_msgData[$_types[0]];
+
+			$content = 'Content-Type: '.$_msgData['mimeType'].'; charset="'.$this->getCharSet().'"'."\r\n"
+			. 'Content-Transfer-Encoding: '.$this->getTransEncodeType()."\r\n"
+			. 'Content-Disposition: inline'."\r\n"
+			. 'Content-Description: Message'."\r\n";
+
+			if ($this->getMD5flag())
+			$content .= 'Content-MD5: '.$_msgData['md5']."\r\n";
+
+			$content .= "\r\n"
+			.  $_msgData['data']."\r\n";
+		}
+
+		// If we have more than ONE, we use the multi-part format
+		elseif ($keyCount >= 1 || !empty($conf->global->MAIN_MAIL_USE_MULTI_PART))
+		{
+			// Since this is an actual multi-part message
+			// We need to define a content message Boundary
+			// NOTE: This was 'multipart/alternative', but Windows based mail servers have issues with this.
+
+			//$content = 'Content-Type: multipart/related; boundary="' . $this->_getBoundary() . '"'   . "\r\n";
+			$content = 'Content-Type: multipart/mixed; boundary="'.$this->_getBoundary('mixed').'"'."\r\n";
+
+			//                     . "\r\n"
+			//                     . 'This is a multi-part message in MIME format.' . "\r\n";
+			$content .= "Content-Transfer-Encoding: 8bit\r\n";
+			$content .= "\r\n";
+
+			$content .= "--".$this->_getBoundary('mixed')."\r\n";
+
+			if (key_exists('image', $this->_msgContent))     // If inline image found
+			{
+				$content .= 'Content-Type: multipart/alternative; boundary="'.$this->_getBoundary('alternative').'"'."\r\n";
+				$content .= "\r\n";
+				$content .= "--".$this->_getBoundary('alternative')."\r\n";
+			}
+
+
+			// $this->_msgContent must be sorted with key 'text' or 'html' first then 'image' then 'attachment'
+
+
+			// Loop through message content array
+			foreach ($this->_msgContent as $type => $_content)
+			{
+				if ($type == 'attachment')
+				{
+					// loop through all attachments
+					foreach ($_content as $_file => $_data)
+					{
+						$content .= "--".$this->_getBoundary('mixed')."\r\n"
+						.  'Content-Disposition: attachment; filename="'.$_data['fileName'].'"'."\r\n"
+						.  'Content-Type: '.$_data['mimeType'].'; name="'.$_data['fileName'].'"'."\r\n"
+						.  'Content-Transfer-Encoding: base64'."\r\n"
+						.  'Content-Description: '.$_data['fileName']."\r\n";
+
+						if ($this->getMD5flag())
+						$content .= 'Content-MD5: '.$_data['md5']."\r\n";
+
+						$content .= "\r\n".$_data['data']."\r\n\r\n";
+					}
+				}
+				// @CHANGE LDR
+				elseif ($type == 'image')
+				{
+					// loop through all images
+					foreach ($_content as $_image => $_data)
+					{
+						$content .= "--".$this->_getBoundary('related')."\r\n"; // always related for an inline image
+
+						$content .= 'Content-Type: '.$_data['mimeType'].'; name="'.$_data['imageName'].'"'."\r\n"
+						.  'Content-Transfer-Encoding: base64'."\r\n"
+						.  'Content-Disposition: inline; filename="'.$_data['imageName'].'"'."\r\n"
+						.  'Content-ID: <'.$_data['cid'].'> '."\r\n";
+
+						if ($this->getMD5flag())
+						$content .= 'Content-MD5: '.$_data['md5']."\r\n";
+
+						$content .= "\r\n"
+						. $_data['data']."\r\n";
+					}
+
+					// always end related and end alternative after inline images
+					$content .= "--".$this->_getBoundary('related')."--\r\n";
+					$content .= "\r\n--".$this->_getBoundary('alternative')."--\r\n";
+					$content .= "\r\n";
+				} else {
+					if (key_exists('image', $this->_msgContent))
+					{
+						$content .= "Content-Type: text/plain; charset=".$this->getCharSet()."\r\n";
+						$content .= "\r\n".($_content['dataText'] ? $_content['dataText'] : strip_tags($_content['data']))."\r\n"; // Add plain text message
+						$content .= "--".$this->_getBoundary('alternative')."\r\n";
+						$content .= 'Content-Type: multipart/related; boundary="'.$this->_getBoundary('related').'"'."\r\n";
+						$content .= "\r\n";
+						$content .= "--".$this->_getBoundary('related')."\r\n";
+					}
+
+					if (!key_exists('image', $this->_msgContent) && $_content['dataText'] && !empty($conf->global->MAIN_MAIL_USE_MULTI_PART))  // Add plain text message part before html part
+					{
+						$content .= 'Content-Type: multipart/alternative; boundary="'.$this->_getBoundary('alternative').'"'."\r\n";
+						$content .= "\r\n";
+						   $content .= "--".$this->_getBoundary('alternative')."\r\n";
+
+						   $content .= "Content-Type: text/plain; charset=".$this->getCharSet()."\r\n";
+						   $content .= "\r\n".$_content['dataText']."\r\n";
+						   $content .= "--".$this->_getBoundary('alternative')."\r\n";
+					}
+
+					$content .= 'Content-Type: '.$_content['mimeType'].'; charset='.$this->getCharSet();
+
+					$content .= "\r\n";
+
+					if ($this->getMD5flag()) {
+						$content .= 'Content-MD5: '.$_content['md5']."\r\n";
+					}
+
+					$content .= "\r\n".$_content['data']."\r\n";
+
+					if (!key_exists('image', $this->_msgContent) && $_content['dataText'] && !empty($conf->global->MAIN_MAIL_USE_MULTI_PART))  // Add plain text message part after html part
+					{
+						$content .= "--".$this->_getBoundary('alternative')."--\r\n";
+					}
+
+					$content .= "\r\n";
+				}
+			}
+
+			$content .= "--".$this->_getBoundary('mixed').'--'."\r\n";
+		}
+
+		return $content;
+	}
+
+	/**
+	 * File attachments are added to the content array as sub-arrays,
+	 * allowing for multiple attachments for each outbound email
+	 *
+	 * @param string $strContent  File data to attach to message
+	 * @param string $strFileName File Name to give to attachment
+	 * @param string $strMimeType File Mime Type of attachment
+	 * @return void
+	 */
+	public function setAttachment($strContent, $strFileName = 'unknown', $strMimeType = 'unknown')
+	{
+		if ($strContent)
+		{
+			$strContent = rtrim(chunk_split(base64_encode($strContent), 76, "\r\n")); // 76 max is defined into http://tools.ietf.org/html/rfc2047
+
+			$this->_msgContent['attachment'][$strFileName]['mimeType'] = $strMimeType;
+			$this->_msgContent['attachment'][$strFileName]['fileName'] = $strFileName;
+			$this->_msgContent['attachment'][$strFileName]['data']     = $strContent;
+
+			if ($this->getMD5flag())
+			$this->_msgContent['attachment'][$strFileName]['md5']      = dol_hash($strContent, 3);
+		}
+	}
+
+
+	// @CHANGE LDR
+
+	/**
+	 * Image attachments are added to the content array as sub-arrays,
+	 * allowing for multiple images for each outbound email
+	 *
+	 * @param 	string $strContent  	Image data to attach to message
+	 * @param 	string $strImageName 	Image Name to give to attachment
+	 * @param 	string $strMimeType 	Image Mime Type of attachment
+	 * @param 	string $strImageCid		CID
+	 * @return 	void
+	 */
+	public function setImageInline($strContent, $strImageName = 'unknown', $strMimeType = 'unknown', $strImageCid = 'unknown')
+	{
+		if ($strContent)
+		{
+			$this->_msgContent['image'][$strImageName]['mimeType'] = $strMimeType;
+			$this->_msgContent['image'][$strImageName]['imageName'] = $strImageName;
+			$this->_msgContent['image'][$strImageName]['cid']      = $strImageCid;
+			$this->_msgContent['image'][$strImageName]['data']     = $strContent;
+
+			if ($this->getMD5flag())
+			$this->_msgContent['image'][$strImageName]['md5']      = dol_hash($strContent, 3);
+		}
+	}
+	// END @CHANGE LDR
+
+
+	/**
+	 * Message Content Sensitivity
+	 * Message Sensitivity values:
+	 *   - [0] None - default
+	 *   - [1] Personal
+	 *   - [2] Private
+	 *   - [3] Company Confidential
+	 *
+	 * @param 	integer	$_value		Message Sensitivity
+	 * @return 	void
+	 */
+	public function setSensitivity($_value = 0)
+	{
+		if ((is_numeric($_value)) &&
+		(($_value >= 0) && ($_value <= 3)))
+		$this->_msgSensitivity = $_value;
+	}
+
+	/**
+	 * Returns Message Content Sensitivity string
+	 * Message Sensitivity values:
+	 *   - [0] None - default
+	 *   - [1] Personal
+	 *   - [2] Private
+	 *   - [3] Company Confidential
+	 *
+	 * @return 	void
+	 */
+	public function getSensitivity()
+	{
+		return $this->_arySensitivity[$this->_msgSensitivity];
+	}
+
+	/**
+	 * Message Content Priority
+	 * Message Priority values:
+	 *  - [0] 'Bulk'
+	 *  - [1] 'Highest'
+	 *  - [2] 'High'
+	 *  - [3] 'Normal' - default
+	 *  - [4] 'Low'
+	 *  - [5] 'Lowest'
+	 *
+	 * @param 	integer 	$_value 	Message Priority
+	 * @return 	void
+	 */
+	public function setPriority($_value = 3)
+	{
+		if ((is_numeric($_value)) &&
+		(($_value >= 0) && ($_value <= 5)))
+		$this->_msgPriority = $_value;
+	}
+
+	/**
+	 * Message Content Priority
+	 * Message Priority values:
+	 *  - [0] 'Bulk'
+	 *  - [1] 'Highest'
+	 *  - [2] 'High'
+	 *  - [3] 'Normal' - default
+	 *  - [4] 'Low'
+	 *  - [5] 'Lowest'
+	 *
+	 * @return string
+	 */
+	public function getPriority()
+	{
+		return 'Importance: '.$this->_aryPriority[$this->_msgPriority]."\r\n"
+		. 'Priority: '.$this->_aryPriority[$this->_msgPriority]."\r\n"
+		. 'X-Priority: '.$this->_msgPriority.' ('.$this->_aryPriority[$this->_msgPriority].')'."\r\n";
+	}
+
+	/**
+	 * Set flag which determines whether to calculate message MD5 checksum.
+	 *
+	 * @param 	string 	$_flag		Message Priority
+	 * @return 	void
+	 */
+	public function setMD5flag($_flag = false)
+	{
+		$this->_smtpMD5 = $_flag;
+	}
+
+	/**
+	 * Gets flag which determines whether to calculate message MD5 checksum.
+	 *
+	 * @return 	boolean 				Message Priority
+	 */
+	public function getMD5flag()
+	{
+		return $this->_smtpMD5;
+	}
+
+	/**
+	 * Message X-Header Content
+	 * This is a simple "insert". Whatever is given will be placed
+	 * "as is" into the Xheader array.
+	 *
+	 * @param string $strXdata Message X-Header Content
+	 * @return void
+	 */
+	public function setXheader($strXdata)
+	{
+		if ($strXdata)
+		$this->_msgXheader[] = $strXdata;
+	}
+
+	/**
+	 * Retrieves the Message X-Header Content
+	 *
+	 * @return string[] $_msgContent Message X-Header Content
+	 */
+	public function getXheader()
+	{
+		return $this->_msgXheader;
+	}
+
+	/**
+	 * Generates Random string for MIME message Boundary
+	 *
+	 * @return void
+	 */
+	private function _setBoundary()
+	{
+		$this->_smtpsBoundary = "multipart_x.".time().".x_boundary";
+		$this->_smtpsRelatedBoundary = 'mul_'.dol_hash(uniqid("dolibarr2"), 3);
+		$this->_smtpsAlternativeBoundary = 'mul_'.dol_hash(uniqid("dolibarr3"), 3);
+	}
+
+	/**
+	 * Retrieves the MIME message Boundary
+	 *
+	 * @param  string $type				Type of boundary
+	 * @return string $_smtpsBoundary 	MIME message Boundary
+	 */
+	private function _getBoundary($type = 'mixed')
+	{
+		if ($type == 'mixed') return $this->_smtpsBoundary;
+		elseif ($type == 'related') return $this->_smtpsRelatedBoundary;
+		elseif ($type == 'alternative') return $this->_smtpsAlternativeBoundary;
+	}
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * This function has been modified as provided by SirSir to allow multiline responses when
+	 * using SMTP Extensions
+	 *
+	 * @param	resource    $socket			Socket handler
+	 * @param	string		$response		Response. Example: "550 5.7.1  https://support.google.com/a/answer/6140680#invalidcred j21sm814390wre.3"
+	 * @return	boolean						True or false
+	 */
+	public function server_parse($socket, $response)
+	{
+		// phpcs:enable
+		/**
+		 * Returns constructed SELECT Object string or boolean upon failure
+		 * Default value is set at true
+		 */
+		$_retVal = true;
+
+		$server_response = '';
+
+		// avoid infinite loop
+		$limit = 0;
+
+		while (substr($server_response, 3, 1) != ' ' && $limit < 100)
+		{
+			if (!($server_response = fgets($socket, 256)))
+			{
+				$this->_setErr(121, "Couldn't get mail server response codes");
+				$_retVal = false;
+				break;
+			}
 			$this->log .= $server_response;
-            $limit++;
-        }
+			$limit++;
+		}
 
-        if (!(substr($server_response, 0, 3) == $response))
-        {
-            $this->_setErr(120, "Ran into problems sending Mail.\r\nResponse: $server_response");
-            $_retVal = false;
-        }
+		if (!(substr($server_response, 0, 3) == $response))
+		{
+			$this->_setErr(120, "Ran into problems sending Mail.\r\nResponse: $server_response");
+			$_retVal = false;
+		}
 
-        return $_retVal;
-    }
+		return $_retVal;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * Send str
-     *
-     * @param	string		$_strSend		String to send
-     * @param 	string		$_returnCode	Return code
-     * @param 	string		$CRLF			CRLF
-     * @return 	boolean|null						True or false
-     */
-    public function socket_send_str($_strSend, $_returnCode = null, $CRLF = "\r\n")
-    {
-        // phpcs:enable
-        if ($this->_debug) $this->log .= $_strSend; // @CHANGE LDR for log
-        fputs($this->socket, $_strSend.$CRLF);
-        if ($this->_debug) $this->log .= ' ('.$_returnCode.')'.$CRLF;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Send str
+	 *
+	 * @param	string		$_strSend		String to send
+	 * @param 	string		$_returnCode	Return code
+	 * @param 	string		$CRLF			CRLF
+	 * @return 	boolean|null						True or false
+	 */
+	public function socket_send_str($_strSend, $_returnCode = null, $CRLF = "\r\n")
+	{
+		// phpcs:enable
+		if ($this->_debug) $this->log .= $_strSend; // @CHANGE LDR for log
+		fputs($this->socket, $_strSend.$CRLF);
+		if ($this->_debug) $this->log .= ' ('.$_returnCode.')'.$CRLF;
 
-        if ($_returnCode)
-        return $this->server_parse($this->socket, $_returnCode);
-    }
+		if ($_returnCode)
+		return $this->server_parse($this->socket, $_returnCode);
+	}
 
-    // =============================================================
-    // ** Error handling methods
+	// =============================================================
+	// ** Error handling methods
 
-    /**
-     * Defines errors codes and messages for Class
-     *
-     * @param  int    $_errNum  Error Code Number
-     * @param  string $_errMsg  Error Message
-     * @return void
-     */
-    private function _setErr($_errNum, $_errMsg)
-    {
-        $this->_smtpsErrors[] = array(
-            'num' => $_errNum,
-            'msg' => $_errMsg,
-        );
-    }
+	/**
+	 * Defines errors codes and messages for Class
+	 *
+	 * @param  int    $_errNum  Error Code Number
+	 * @param  string $_errMsg  Error Message
+	 * @return void
+	 */
+	private function _setErr($_errNum, $_errMsg)
+	{
+		$this->_smtpsErrors[] = array(
+			'num' => $_errNum,
+			'msg' => $_errMsg,
+		);
+	}
 
-    /**
-     * Returns errors codes and messages for Class
-     *
-     * @return string $_errMsg  Error Message
-     */
-    public function getErrors()
-    {
-        $_errMsg = array();
+	/**
+	 * Returns errors codes and messages for Class
+	 *
+	 * @return string $_errMsg  Error Message
+	 */
+	public function getErrors()
+	{
+		$_errMsg = array();
 
-        if (is_array($this->_smtpsErrors))
-        {
-            foreach ($this->_smtpsErrors as $_err => $_info)
-            {
-                $_errMsg[] = 'Error ['.$_info['num'].']: '.$_info['msg'];
-            }
-        }
+		if (is_array($this->_smtpsErrors))
+		{
+			foreach ($this->_smtpsErrors as $_err => $_info)
+			{
+				$_errMsg[] = 'Error ['.$_info['num'].']: '.$_info['msg'];
+			}
+		}
 
-        return implode("\n", $_errMsg);
-    }
+		return implode("\n", $_errMsg);
+	}
 }
 
 
diff --git a/htdocs/core/class/stats.class.php b/htdocs/core/class/stats.class.php
index a18bad625e6..b1d569eae45 100644
--- a/htdocs/core/class/stats.class.php
+++ b/htdocs/core/class/stats.class.php
@@ -29,9 +29,9 @@
  */
 abstract class Stats
 {
-    protected $db;
-    protected $lastfetchdate = array(); // Dates of cache file read by methods
-    public $cachefilesuffix = ''; // Suffix to add to name of cache file (to avoid file name conflicts)
+	protected $db;
+	protected $lastfetchdate = array(); // Dates of cache file read by methods
+	public $cachefilesuffix = ''; // Suffix to add to name of cache file (to avoid file name conflicts)
 
 	/**
 	 * Return nb of elements by month for several years
@@ -39,25 +39,24 @@ abstract class Stats
 	 * @param 	int		$endyear		Start year
 	 * @param 	int		$startyear		End year
 	 * @param	int		$cachedelay		Delay we accept for cache file (0=No read, no save of cache, -1=No read but save)
-     * @param	int		$format			0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
+	 * @param	int		$format			0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
 	 * @param   int 	$startmonth		month of the fiscal year start min 1 max 12 ; if 1 = january
-     * @return 	array					Array of values
-
+	 * @return 	array					Array of values
 	 */
 	public function getNbByMonthWithPrevYear($endyear, $startyear, $cachedelay = 0, $format = 0, $startmonth = 1)
 	{
 		global $conf, $user, $langs;
 
-	    if ($startyear > $endyear) return -1;
+		if ($startyear > $endyear) return -1;
 
 		$datay = array();
 
 		// Search into cache
 		if (!empty($cachedelay))
-	    {
-	    	include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-	    	include_once DOL_DOCUMENT_ROOT.'/core/lib/json.lib.php';
-	    }
+		{
+			include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+			include_once DOL_DOCUMENT_ROOT.'/core/lib/json.lib.php';
+		}
 
 		$newpathofdestfile = $conf->user->dir_temp.'/'.get_class($this).'_'.__FUNCTION__.'_'.(empty($this->cachefilesuffix) ? '' : $this->cachefilesuffix.'_').$langs->defaultlang.'_entity.'.$conf->entity.'_user'.$user->id.'.cache';
 		$newmask = '0644';
@@ -133,7 +132,7 @@ abstract class Stats
 	 * @param	int		$endyear		Start year
 	 * @param	int		$startyear		End year
 	 * @param	int		$cachedelay		Delay we accept for cache file (0=No read, no save of cache, -1=No read but save)
-     * @param	int		$format			0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
+	 * @param	int		$format			0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
 	 * @param   int 	$startmonth		month of the fiscal year start min 1 max 12 ; if 1 = january
 	 * @return 	array					Array of values
 	 */
@@ -141,42 +140,42 @@ abstract class Stats
 	{
 		global $conf, $user, $langs;
 
-        if ($startyear > $endyear) return -1;
+		if ($startyear > $endyear) return -1;
 
-        $datay = array();
+		$datay = array();
 
-        // Search into cache
-        if (!empty($cachedelay))
-        {
-        	include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-        	include_once DOL_DOCUMENT_ROOT.'/core/lib/json.lib.php';
-        }
+		// Search into cache
+		if (!empty($cachedelay))
+		{
+			include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+			include_once DOL_DOCUMENT_ROOT.'/core/lib/json.lib.php';
+		}
 
-        $newpathofdestfile = $conf->user->dir_temp.'/'.get_class($this).'_'.__FUNCTION__.'_'.(empty($this->cachefilesuffix) ? '' : $this->cachefilesuffix.'_').$langs->defaultlang.'_entity.'.$conf->entity.'_user'.$user->id.'.cache';
-        $newmask = '0644';
+		$newpathofdestfile = $conf->user->dir_temp.'/'.get_class($this).'_'.__FUNCTION__.'_'.(empty($this->cachefilesuffix) ? '' : $this->cachefilesuffix.'_').$langs->defaultlang.'_entity.'.$conf->entity.'_user'.$user->id.'.cache';
+		$newmask = '0644';
 
-        $nowgmt = dol_now();
+		$nowgmt = dol_now();
 
-        $foundintocache = 0;
-        if ($cachedelay > 0)
-        {
-        	$filedate = dol_filemtime($newpathofdestfile);
-        	if ($filedate >= ($nowgmt - $cachedelay))
-        	{
-        		$foundintocache = 1;
+		$foundintocache = 0;
+		if ($cachedelay > 0)
+		{
+			$filedate = dol_filemtime($newpathofdestfile);
+			if ($filedate >= ($nowgmt - $cachedelay))
+			{
+				$foundintocache = 1;
 
-        		$this->lastfetchdate[get_class($this).'_'.__FUNCTION__] = $filedate;
-        	} else {
-        		dol_syslog(get_class($this).'::'.__FUNCTION__." cache file ".$newpathofdestfile." is not found or older than now - cachedelay (".$nowgmt." - ".$cachedelay.") so we can't use it.");
-        	}
-        }
+				$this->lastfetchdate[get_class($this).'_'.__FUNCTION__] = $filedate;
+			} else {
+				dol_syslog(get_class($this).'::'.__FUNCTION__." cache file ".$newpathofdestfile." is not found or older than now - cachedelay (".$nowgmt." - ".$cachedelay.") so we can't use it.");
+			}
+		}
 
-        // Load file into $data
-        if ($foundintocache)    // Cache file found and is not too old
-        {
-        	dol_syslog(get_class($this).'::'.__FUNCTION__." read data from cache file ".$newpathofdestfile." ".$filedate.".");
-        	$data = json_decode(file_get_contents($newpathofdestfile), true);
-        } else {
+		// Load file into $data
+		if ($foundintocache)    // Cache file found and is not too old
+		{
+			dol_syslog(get_class($this).'::'.__FUNCTION__." read data from cache file ".$newpathofdestfile." ".$filedate.".");
+			$data = json_decode(file_get_contents($newpathofdestfile), true);
+		} else {
 			$year = $startyear;
 			$sm = $startmonth - 1;
 			if ($sm != 0) $year = $year - 1;
@@ -226,11 +225,11 @@ abstract class Stats
 	 * @param	int		$startyear		End year
 	 * @return 	array					Array of values
 	 */
-    public function getAverageByMonthWithPrevYear($endyear, $startyear)
-    {
-        if ($startyear > $endyear) return -1;
+	public function getAverageByMonthWithPrevYear($endyear, $startyear)
+	{
+		if ($startyear > $endyear) return -1;
 
-        $datay = array();
+		$datay = array();
 
 		$year = $startyear;
 		while ($year <= $endyear)
@@ -260,47 +259,47 @@ abstract class Stats
 	 *
 	 * @param	int		$year			Year
 	 * @param	int		$cachedelay		Delay we accept for cache file (0=No read, no save of cache, -1=No read but save)
-     * @param  	int     $limit      	Limit
+	 * @param  	int     $limit      	Limit
 	 * @return 	array					Array of values
 	 */
-    public function getAllByProductEntry($year, $cachedelay = 0, $limit = 10)
-    {
-        global $conf, $user, $langs;
+	public function getAllByProductEntry($year, $cachedelay = 0, $limit = 10)
+	{
+		global $conf, $user, $langs;
 
-        $data = array();
+		$data = array();
 
-        // Search into cache
-        if (!empty($cachedelay))
-        {
-        	include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-        	include_once DOL_DOCUMENT_ROOT.'/core/lib/json.lib.php';
-        }
+		// Search into cache
+		if (!empty($cachedelay))
+		{
+			include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+			include_once DOL_DOCUMENT_ROOT.'/core/lib/json.lib.php';
+		}
 
-        $newpathofdestfile = $conf->user->dir_temp.'/'.get_class($this).'_'.__FUNCTION__.'_'.(empty($this->cachefilesuffix) ? '' : $this->cachefilesuffix.'_').$langs->defaultlang.'_entity.'.$conf->entity.'_user'.$user->id.'.cache';
-        $newmask = '0644';
+		$newpathofdestfile = $conf->user->dir_temp.'/'.get_class($this).'_'.__FUNCTION__.'_'.(empty($this->cachefilesuffix) ? '' : $this->cachefilesuffix.'_').$langs->defaultlang.'_entity.'.$conf->entity.'_user'.$user->id.'.cache';
+		$newmask = '0644';
 
-        $nowgmt = dol_now();
+		$nowgmt = dol_now();
 
-        $foundintocache = 0;
-        if ($cachedelay > 0)
-        {
-        	$filedate = dol_filemtime($newpathofdestfile);
-        	if ($filedate >= ($nowgmt - $cachedelay))
-        	{
-        		$foundintocache = 1;
+		$foundintocache = 0;
+		if ($cachedelay > 0)
+		{
+			$filedate = dol_filemtime($newpathofdestfile);
+			if ($filedate >= ($nowgmt - $cachedelay))
+			{
+				$foundintocache = 1;
 
-        		$this->lastfetchdate[get_class($this).'_'.__FUNCTION__] = $filedate;
-        	} else {
-        		dol_syslog(get_class($this).'::'.__FUNCTION__." cache file ".$newpathofdestfile." is not found or older than now - cachedelay (".$nowgmt." - ".$cachedelay.") so we can't use it.");
-        	}
-        }
+				$this->lastfetchdate[get_class($this).'_'.__FUNCTION__] = $filedate;
+			} else {
+				dol_syslog(get_class($this).'::'.__FUNCTION__." cache file ".$newpathofdestfile." is not found or older than now - cachedelay (".$nowgmt." - ".$cachedelay.") so we can't use it.");
+			}
+		}
 
-        // Load file into $data
-        if ($foundintocache)    // Cache file found and is not too old
-        {
-        	dol_syslog(get_class($this).'::'.__FUNCTION__." read data from cache file ".$newpathofdestfile." ".$filedate.".");
-        	$data = json_decode(file_get_contents($newpathofdestfile), true);
-        } else {
+		// Load file into $data
+		if ($foundintocache)    // Cache file found and is not too old
+		{
+			dol_syslog(get_class($this).'::'.__FUNCTION__." read data from cache file ".$newpathofdestfile." ".$filedate.".");
+			$data = json_decode(file_get_contents($newpathofdestfile), true);
+		} else {
 			$data = $this->getAllByProduct($year, $limit);
 			//					$data[$i][]=$datay[$year][$i][1];	// set yval for x=i
 		}
@@ -328,16 +327,16 @@ abstract class Stats
 	// Here we have low level of shared code called by XxxStats.class.php
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
-    /**
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	/**
 	 * 	Return nb of elements by year
 	 *
 	 *	@param	string	$sql		SQL request
 	 * 	@return	array
 	 */
-    protected function _getNbByYear($sql)
-    {
-        // phpcs:enable
+	protected function _getNbByYear($sql)
+	{
+		// phpcs:enable
 		$result = array();
 
 		dol_syslog(get_class($this).'::'.__FUNCTION__."", LOG_DEBUG);
@@ -359,7 +358,7 @@ abstract class Stats
 		return $result;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 * 	Return nb of elements, total amount and avg amount each year
 	 *
@@ -368,7 +367,7 @@ abstract class Stats
 	 */
 	protected function _getAllByYear($sql)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$result = array();
 
 		dol_syslog(get_class($this).'::'.__FUNCTION__."", LOG_DEBUG);
@@ -390,8 +389,8 @@ abstract class Stats
 				// For some $sql only
 				if (isset($row->weighted))
 				{
-				    $result[$i]['weighted'] = $row->weighted;
-				    if ($i > 0 && $row->weighted > 0) $result[$i - 1]['avg_weighted'] = ($result[$i - 1]['weighted'] - $row->weighted) / $row->weighted * 100;
+					$result[$i]['weighted'] = $row->weighted;
+					if ($i > 0 && $row->weighted > 0) $result[$i - 1]['avg_weighted'] = ($result[$i - 1]['weighted'] - $row->weighted) / $row->weighted * 100;
 				}
 				$i++;
 			}
@@ -402,19 +401,19 @@ abstract class Stats
 		return $result;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 *     Renvoie le nombre de documents par mois pour une annee donnee
 	 *     Return number of documents per month for a given year
 	 *
-     *     @param   int		$year       Year
-     *     @param   string	$sql        SQL
-     *     @param	int		$format		0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
-     *     @return	array				Array of nb each month
-     */
-    protected function _getNbByMonth($year, $sql, $format = 0)
-    {
-        // phpcs:enable
+	 *     @param   int		$year       Year
+	 *     @param   string	$sql        SQL
+	 *     @param	int		$format		0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
+	 *     @return	array				Array of nb each month
+	 */
+	protected function _getNbByMonth($year, $sql, $format = 0)
+	{
+		// phpcs:enable
 		global $langs;
 
 		$result = array();
@@ -460,18 +459,18 @@ abstract class Stats
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
-     *     Return the amount per month for a given year
+	 *     Return the amount per month for a given year
 	 *
 	 *     @param	int		$year       Year
 	 *     @param   string	$sql		SQL
-     *     @param	int		$format		0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
+	 *     @param	int		$format		0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
 	 *     @return	array
 	 */
-    protected function _getAmountByMonth($year, $sql, $format = 0)
-    {
-        // phpcs:enable
+	protected function _getAmountByMonth($year, $sql, $format = 0)
+	{
+		// phpcs:enable
 		global $langs;
 
 		$result = array();
@@ -513,21 +512,21 @@ abstract class Stats
 		}
 
 		return $data;
-    }
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
-    /**
-     *  Renvoie le montant moyen par mois pour une annee donnee
-     *  Return the amount average par month for a given year
-     *
-     *  @param  int     $year       Year
-     *  @param  string  $sql        SQL
-     *  @param  int     $format     0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
-     *  @return array
-     */
-    protected function _getAverageByMonth($year, $sql, $format = 0)
-    {
-        // phpcs:enable
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	/**
+	 *  Renvoie le montant moyen par mois pour une annee donnee
+	 *  Return the amount average par month for a given year
+	 *
+	 *  @param  int     $year       Year
+	 *  @param  string  $sql        SQL
+	 *  @param  int     $format     0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
+	 *  @return array
+	 */
+	protected function _getAverageByMonth($year, $sql, $format = 0)
+	{
+		// phpcs:enable
 		global $langs;
 
 		$result = array();
@@ -568,20 +567,20 @@ abstract class Stats
 		}
 
 		return $data;
-    }
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
-    /**
-     *  Return number or total of product refs
-     *
-     *  @param  string  $sql        SQL
-     *  @param  int     $limit      Limit
-     *  @return array
-     */
-    protected function _getAllByProduct($sql, $limit = 10)
-    {
-        // phpcs:enable
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	/**
+	 *  Return number or total of product refs
+	 *
+	 *  @param  string  $sql        SQL
+	 *  @param  int     $limit      Limit
+	 *  @return array
+	 */
+	protected function _getAllByProduct($sql, $limit = 10)
+	{
+		// phpcs:enable
 		global $langs;
 
 		$result = array();
@@ -594,15 +593,15 @@ abstract class Stats
 			$i = 0; $other = 0;
 			while ($i < $num)
 			{
-                $row = $this->db->fetch_row($resql);
+				$row = $this->db->fetch_row($resql);
 		  		if ($i < $limit || $num == $limit) $result[$i] = array($row[0], $row[1]); // Ref of product, nb
 		  		else $other += $row[1];
 		  		$i++;
-            }
+			}
 		  	if ($num > $limit) $result[$i] = array($langs->transnoentitiesnoconv("Other"), $other);
 		  	$this->db->free($resql);
 		} else dol_print_error($this->db);
 
 		return $result;
-    }
+	}
 }
diff --git a/htdocs/core/class/translate.class.php b/htdocs/core/class/translate.class.php
index 6bfe5cdc195..dc8f969540f 100644
--- a/htdocs/core/class/translate.class.php
+++ b/htdocs/core/class/translate.class.php
@@ -40,7 +40,7 @@ class Translate
 
 	public $cache_labels = array(); // Cache for labels return by getLabelFromKey method
 	public $cache_currencies = array(); // Cache to store currency symbols
-    private $cache_currencies_all_loaded = false;
+	private $cache_currencies_all_loaded = false;
 
 
 	/**
@@ -79,7 +79,7 @@ class Translate
 				$newdir = $dir.$conf->global->MAIN_FORCELANGDIR; // For example $conf->global->MAIN_FORCELANGDIR is '/mymodule' meaning we search files into '/mymodule/langs/xx_XX'
 				if (!in_array($newdir, $this->dir))
 				{
-				    $more['module_'.$i] = $newdir; $i++; // We add the forced dir into the array $more. Just after, we add entries into $more to list of lang dir $this->dir.
+					$more['module_'.$i] = $newdir; $i++; // We add the forced dir into the array $more. Just after, we add entries into $more to list of lang dir $this->dir.
 				}
 			}
 			$this->dir = array_merge($more, $this->dir); // Forced dir ($more) are before standard dirs ($this->dir)
@@ -112,8 +112,8 @@ class Translate
 				if (isset($longforlong[strtolower($srclang)])) $srclang = $longforlong[strtolower($srclang)];
 			} else $srclang = strtolower($langpart[0])."_".strtoupper($langpart[0]);
 		} else {						// If it's for a codetouse that is a short code xx
-    	    // Array to convert short lang code into long code.
-	        $longforshort = array('ar'=>'ar_SA', 'el'=>'el_GR', 'ca'=>'ca_ES', 'en'=>'en_US', 'ja'=>'ja_JP', 'nb'=>'nb_NO', 'no'=>'nb_NO');
+			// Array to convert short lang code into long code.
+			$longforshort = array('ar'=>'ar_SA', 'el'=>'el_GR', 'ca'=>'ca_ES', 'en'=>'en_US', 'ja'=>'ja_JP', 'nb'=>'nb_NO', 'no'=>'nb_NO');
 			if (isset($longforshort[strtolower($langpart[0])])) $srclang = $longforshort[strtolower($langpart[0])];
 			elseif (!empty($langpart[0])) $srclang = strtolower($langpart[0])."_".strtoupper($langpart[0]);
 			else $srclang = 'en_US';
@@ -134,36 +134,36 @@ class Translate
 	 */
 	public function getDefaultLang($mode = 0)
 	{
-	    if (empty($mode)) return $this->defaultlang;
-	    else return substr($this->defaultlang, 0, 2);
+		if (empty($mode)) return $this->defaultlang;
+		else return substr($this->defaultlang, 0, 2);
 	}
 
 
 	/**
 	 *  Load translation files.
-     *
+	 *
 	 *  @param	array	$domains      		Array of lang files to load
 	 *	@return	int							<0 if KO, 0 if already loaded or loading not required, >0 if OK
 	 */
 	public function loadLangs($domains)
 	{
-	    foreach ($domains as $domain)
-	    {
-	        $this->load($domain);
-	    }
+		foreach ($domains as $domain)
+		{
+			$this->load($domain);
+		}
 	}
 
 	/**
 	 *  Load translation key-value for a particular file, into a memory array.
 	 *  If data for file already loaded, do nothing.
 	 * 	All data in translation array are stored in UTF-8 format.
-     *  tab_loaded is completed with $domain key.
-     *  rule "we keep first entry found with we keep last entry found" so it is probably not what you want to do.
-     *
-     *  Value for hash are: 1:Loaded from disk, 2:Not found, 3:Loaded from cache
-     *
+	 *  tab_loaded is completed with $domain key.
+	 *  rule "we keep first entry found with we keep last entry found" so it is probably not what you want to do.
+	 *
+	 *  Value for hash are: 1:Loaded from disk, 2:Not found, 3:Loaded from cache
+	 *
 	 *  @param	string	$domain      				File name to load (.lang file). Must be "file" or "file@module" for module language files:
- 	 *												If $domain is "file@module" instead of "file" then we look for module lang file
+	 *												If $domain is "file@module" instead of "file" then we look for module lang file
 	 *												in htdocs/custom/modules/mymodule/langs/code_CODE/file.lang
 	 *												then in htdocs/module/langs/code_CODE/file.lang instead of htdocs/langs/code_CODE/file.lang
 	 *  @param	integer	$alt         				0 (try xx_ZZ then 1), 1 (try xx_XX then 2), 2 (try en_US)
@@ -183,8 +183,8 @@ class Translate
 		// Check parameters
 		if (empty($domain))
 		{
-		    dol_print_error('', get_class($this)."::Load ErrorWrongParameters");
-		    return -1;
+			dol_print_error('', get_class($this)."::Load ErrorWrongParameters");
+			return -1;
 		}
 		if ($this->defaultlang == 'none_NONE') return 0; // Special language code to not translate keys
 
@@ -204,7 +204,7 @@ class Translate
 			$modulename = $regs[2];
 		}
 
-        // Check cache
+		// Check cache
 		if (!empty($this->_tab_loaded[$newdomain])
 			&& ($this->_tab_loaded[$newdomain] != 2 || empty($forceloadifalreadynotfound))) // File already loaded and found and not forced for this domain
 		{
@@ -212,7 +212,7 @@ class Translate
 			return 0;
 		}
 
-        $fileread = 0;
+		$fileread = 0;
 		$langofdir = (empty($forcelangdir) ? $this->defaultlang : $forcelangdir);
 
 		// Redefine alt
@@ -240,7 +240,7 @@ class Translate
 			if ($filelangexists)
 			{
 				// TODO Move cache read out of loop on dirs or at least filelangexists
-			    $found = false;
+				$found = false;
 
 				// Enable caching of lang file in memory (not by default)
 				$usecachekey = '';
@@ -257,14 +257,14 @@ class Translate
 
 				if ($usecachekey)
 				{
-			        //dol_syslog('Translate::Load we will cache result into usecachekey '.$usecachekey);
-                    //global $aaa; $aaa+=1;
-                    //print $aaa." ".$usecachekey."\n";
-				    require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php';
+					//dol_syslog('Translate::Load we will cache result into usecachekey '.$usecachekey);
+					//global $aaa; $aaa+=1;
+					//print $aaa." ".$usecachekey."\n";
+					require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php';
 					$tmparray = dol_getcache($usecachekey);
 					if (is_array($tmparray) && count($tmparray))
 					{
-				        $this->tab_translate += $tmparray; // Faster than array_merge($tmparray,$this->tab_translate). Note: If a value already exists into tab_translate, value into tmparaay is not added.
+						$this->tab_translate += $tmparray; // Faster than array_merge($tmparray,$this->tab_translate). Note: If a value already exists into tab_translate, value into tmparaay is not added.
 						//print $newdomain."\n";
 						//var_dump($this->tab_translate);
 						if ($alt == 2) $fileread = 1;
@@ -303,7 +303,7 @@ class Translate
 										}
 									} elseif ($key[0] == '#')
 									{
-									    continue;
+										continue;
 									} else {
 										// Convert some strings: Parse and render carriage returns. Also, change '\\s' into '\s' because transifex sync pull the string '\s' into string '\\s'
 										$this->tab_translate[$key] = str_replace(array('\\n', '\\\\s'), array("\n", '\s'), $value);
@@ -324,8 +324,8 @@ class Translate
 							$ressetcache = dol_setcache($usecachekey, $tabtranslatedomain);
 							if ($ressetcache < 0)
 							{
-							    $error = 'Failed to set cache for usecachekey='.$usecachekey.' result='.$ressetcache;
-							    dol_syslog($error, LOG_ERR);
+								$error = 'Failed to set cache for usecachekey='.$usecachekey.' result='.$ressetcache;
+								dol_syslog($error, LOG_ERR);
 							}
 						}
 
@@ -367,20 +367,20 @@ class Translate
 		// Kept for backward compatibility.
 		if (empty($loadfromfileonly))
 		{
-    		$overwritekey = 'MAIN_OVERWRITE_TRANS_'.$this->defaultlang;
-            if (!empty($conf->global->$overwritekey))    // Overwrite translation with key1:newstring1,key2:newstring2
-            {
-        		// Overwrite translation with param MAIN_OVERWRITE_TRANS_xx_XX
-                $tmparray = explode(',', $conf->global->$overwritekey);
-                foreach ($tmparray as $tmp)
-                {
-                    $tmparray2 = explode(':', $tmp);
-                    if (!empty($tmparray2[1])) $this->tab_translate[$tmparray2[0]] = $tmparray2[1];
-                }
-            }
+			$overwritekey = 'MAIN_OVERWRITE_TRANS_'.$this->defaultlang;
+			if (!empty($conf->global->$overwritekey))    // Overwrite translation with key1:newstring1,key2:newstring2
+			{
+				// Overwrite translation with param MAIN_OVERWRITE_TRANS_xx_XX
+				$tmparray = explode(',', $conf->global->$overwritekey);
+				foreach ($tmparray as $tmp)
+				{
+					$tmparray2 = explode(':', $tmp);
+					if (!empty($tmparray2[1])) $this->tab_translate[$tmparray2[0]] = $tmparray2[1];
+				}
+			}
 		}
 
-        // Check to be sure that SeparatorDecimal differs from SeparatorThousand
+		// Check to be sure that SeparatorDecimal differs from SeparatorThousand
 		if (!empty($this->tab_translate["SeparatorDecimal"]) && !empty($this->tab_translate["SeparatorThousand"])
 		&& $this->tab_translate["SeparatorDecimal"] == $this->tab_translate["SeparatorThousand"]) $this->tab_translate["SeparatorThousand"] = '';
 
@@ -391,12 +391,12 @@ class Translate
 	 *  Load translation key-value from database into a memory array.
 	 *  If data already loaded, do nothing.
 	 * 	All data in translation array are stored in UTF-8 format.
-     *  tab_loaded is completed with $domain key.
-     *  rule "we keep first entry found with we keep last entry found" so it is probably not what you want to do.
-     *
-     *  Value for hash are: 1:Loaded from disk, 2:Not found, 3:Loaded from cache
-     *
-     *  @param  Database    $db             Database handler
+	 *  tab_loaded is completed with $domain key.
+	 *  rule "we keep first entry found with we keep last entry found" so it is probably not what you want to do.
+	 *
+	 *  Value for hash are: 1:Loaded from disk, 2:Not found, 3:Loaded from cache
+	 *
+	 *  @param  Database    $db             Database handler
 	 *	@return	int							<0 if KO, 0 if already loaded or loading not required, >0 if OK
 	 */
 	public function loadFromDatabase($db)
@@ -421,7 +421,7 @@ class Translate
 
 		$this->_tab_loaded[$newdomain] = 1; // We want to be sure this function is called once only for domain 'database'
 
-        $fileread = 0;
+		$fileread = 0;
 		$langofdir = $this->defaultlang;
 
 		if (empty($langofdir))	// This may occurs when load is called without setting the language and without providing a value for forcelangdir
@@ -448,10 +448,10 @@ class Translate
 
 		if ($usecachekey)
 		{
-	        //dol_syslog('Translate::Load we will cache result into usecachekey '.$usecachekey);
-            //global $aaa; $aaa+=1;
-            //print $aaa." ".$usecachekey."\n";
-		    require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php';
+			//dol_syslog('Translate::Load we will cache result into usecachekey '.$usecachekey);
+			//global $aaa; $aaa+=1;
+			//print $aaa." ".$usecachekey."\n";
+			require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php';
 			$tmparray = dol_getcache($usecachekey);
 			if (is_array($tmparray) && count($tmparray))
 			{
@@ -465,26 +465,26 @@ class Translate
 
 		if (!$found && !empty($conf->global->MAIN_ENABLE_OVERWRITE_TRANSLATION))
 		{
-    		// Overwrite translation with database read
-            $sql = "SELECT transkey, transvalue FROM ".MAIN_DB_PREFIX."overwrite_trans where lang='".$db->escape($this->defaultlang)."' OR lang IS NULL";
-            $sql .= " AND entity IN (0, ".getEntity('overwrite_trans').")";
-            $sql .= $db->order("lang", "DESC");
-		    $resql = $db->query($sql);
+			// Overwrite translation with database read
+			$sql = "SELECT transkey, transvalue FROM ".MAIN_DB_PREFIX."overwrite_trans where lang='".$db->escape($this->defaultlang)."' OR lang IS NULL";
+			$sql .= " AND entity IN (0, ".getEntity('overwrite_trans').")";
+			$sql .= $db->order("lang", "DESC");
+			$resql = $db->query($sql);
 
-		    if ($resql)
-		    {
-    		    $num = $db->num_rows($resql);
-    		    if ($num)
-    		    {
-    				if ($usecachekey) $tabtranslatedomain = array(); // To save lang content in cache
+			if ($resql)
+			{
+				$num = $db->num_rows($resql);
+				if ($num)
+				{
+					if ($usecachekey) $tabtranslatedomain = array(); // To save lang content in cache
 
-    				$i = 0;
-    				while ($i < $num)	// Ex: Need 225ms for all fgets on all lang file for Third party page. Same speed than file_get_contents
-    				{
-    				    $obj = $db->fetch_object($resql);
+					$i = 0;
+					while ($i < $num)	// Ex: Need 225ms for all fgets on all lang file for Third party page. Same speed than file_get_contents
+					{
+						$obj = $db->fetch_object($resql);
 
-    				    $key = $obj->transkey;
-    					$value = $obj->transvalue;
+						$key = $obj->transkey;
+						$value = $obj->transvalue;
 
 						//print "Domain=$domain, found a string for $tab[0] with value $tab[1]<br>";
 						if (empty($this->tab_translate[$key]))    // If translation was already found, we must not continue, even if MAIN_FORCELANGDIR is set (MAIN_FORCELANGDIR is to replace lang dir, not to overwrite entries)
@@ -495,26 +495,26 @@ class Translate
 							if ($usecachekey) $tabtranslatedomain[$key] = $value; // To save lang content in cache
 						}
 
-    					$i++;
-    				}
+						$i++;
+					}
 
-    				$fileread = 1;
+					$fileread = 1;
 
-    				// TODO Move cache write out of loop on dirs
-    				// To save lang content for usecachekey into cache
-    				if ($usecachekey && count($tabtranslatedomain))
-    				{
-    					$ressetcache = dol_setcache($usecachekey, $tabtranslatedomain);
-    					if ($ressetcache < 0)
-    					{
-    					    $error = 'Failed to set cache for usecachekey='.$usecachekey.' result='.$ressetcache;
-    					    dol_syslog($error, LOG_ERR);
-    					}
-    				}
-    			}
-		    } else {
-		        dol_print_error($db);
-		    }
+					// TODO Move cache write out of loop on dirs
+					// To save lang content for usecachekey into cache
+					if ($usecachekey && count($tabtranslatedomain))
+					{
+						$ressetcache = dol_setcache($usecachekey, $tabtranslatedomain);
+						if ($ressetcache < 0)
+						{
+							$error = 'Failed to set cache for usecachekey='.$usecachekey.' result='.$ressetcache;
+							dol_syslog($error, LOG_ERR);
+						}
+					}
+				}
+			} else {
+				dol_print_error($db);
+			}
 		}
 
 		if ($fileread) $this->_tab_loaded[$newdomain] = 1; // Set domain file as loaded
@@ -546,8 +546,8 @@ class Translate
 	 * @param	string		$key		Key to translate
 	 * @return 	string					Translated string (translated with transnoentitiesnoconv)
 	 */
-    private function getTradFromKey($key)
-    {
+	private function getTradFromKey($key)
+	{
 		global $conf, $db;
 
 		if (!is_string($key)) {
@@ -556,35 +556,35 @@ class Translate
 		}
 
 		$newstr = $key;
-	    if (preg_match('/^Civility([0-9A-Z]+)$/i', $key, $reg))
-        {
-            $newstr = $this->getLabelFromKey($db, $reg[1], 'c_civility', 'code', 'label');
-        } elseif (preg_match('/^Currency([A-Z][A-Z][A-Z])$/i', $key, $reg))
+		if (preg_match('/^Civility([0-9A-Z]+)$/i', $key, $reg))
+		{
+			$newstr = $this->getLabelFromKey($db, $reg[1], 'c_civility', 'code', 'label');
+		} elseif (preg_match('/^Currency([A-Z][A-Z][A-Z])$/i', $key, $reg))
 		{
 			$newstr = $this->getLabelFromKey($db, $reg[1], 'c_currencies', 'code_iso', 'label');
 		} elseif (preg_match('/^SendingMethod([0-9A-Z]+)$/i', $key, $reg))
 		{
 			$newstr = $this->getLabelFromKey($db, $reg[1], 'c_shipment_mode', 'code', 'libelle');
 		} elseif (preg_match('/^PaymentTypeShort([0-9A-Z]+)$/i', $key, $reg))
-        {
-            $newstr = $this->getLabelFromKey($db, $reg[1], 'c_paiement', 'code', 'libelle', '', 1);
-        } elseif (preg_match('/^OppStatus([0-9A-Z]+)$/i', $key, $reg))
-        {
-            $newstr = $this->getLabelFromKey($db, $reg[1], 'c_lead_status', 'code', 'label');
-        } elseif (preg_match('/^OrderSource([0-9A-Z]+)$/i', $key, $reg))
-        {
-        	// TODO OrderSourceX must be replaced with content of table llx_c_input_reason or llx_c_input_method
-            //$newstr=$this->getLabelFromKey($db,$reg[1],'c_ordersource','code','label');
-        }
+		{
+			$newstr = $this->getLabelFromKey($db, $reg[1], 'c_paiement', 'code', 'libelle', '', 1);
+		} elseif (preg_match('/^OppStatus([0-9A-Z]+)$/i', $key, $reg))
+		{
+			$newstr = $this->getLabelFromKey($db, $reg[1], 'c_lead_status', 'code', 'label');
+		} elseif (preg_match('/^OrderSource([0-9A-Z]+)$/i', $key, $reg))
+		{
+			// TODO OrderSourceX must be replaced with content of table llx_c_input_reason or llx_c_input_method
+			//$newstr=$this->getLabelFromKey($db,$reg[1],'c_ordersource','code','label');
+		}
 
-        /* Disabled. There is too many cases where translation of $newstr is not defined is normal (like when output with setEventMessage an already translated string)
+		/* Disabled. There is too many cases where translation of $newstr is not defined is normal (like when output with setEventMessage an already translated string)
         if (! empty($conf->global->MAIN_FEATURES_LEVEL) && $conf->global->MAIN_FEATURES_LEVEL >= 2)
         {
         	dol_syslog(__METHOD__." MAIN_FEATURES_LEVEL=DEVELOP: missing translation for key '".$newstr."' in ".$_SERVER["PHP_SELF"], LOG_DEBUG);
         }*/
 
-        return $newstr;
-    }
+		return $newstr;
+	}
 
 
 	/**
@@ -601,49 +601,49 @@ class Translate
 	 *	@param	int		$maxsize	Max length of text
 	 *  @return string      		Translated string (encoded into HTML entities and UTF8)
 	 */
-    public function trans($key, $param1 = '', $param2 = '', $param3 = '', $param4 = '', $maxsize = 0)
-    {
-        global $conf;
+	public function trans($key, $param1 = '', $param2 = '', $param3 = '', $param4 = '', $maxsize = 0)
+	{
+		global $conf;
 
-	    if (!empty($this->tab_translate[$key]))	// Translation is available
+		if (!empty($this->tab_translate[$key]))	// Translation is available
 		{
-            $str = $this->tab_translate[$key];
+			$str = $this->tab_translate[$key];
 
-    		// Make some string replacement after translation
-            $replacekey = 'MAIN_REPLACE_TRANS_'.$this->defaultlang;
-            if (!empty($conf->global->$replacekey))    // Replacement translation variable with string1:newstring1;string2:newstring2
-            {
-                $tmparray = explode(';', $conf->global->$replacekey);
-                foreach ($tmparray as $tmp)
-                {
-                    $tmparray2 = explode(':', $tmp);
-                    $str = preg_replace('/'.preg_quote($tmparray2[0]).'/', $tmparray2[1], $str);
-                }
-            }
+			// Make some string replacement after translation
+			$replacekey = 'MAIN_REPLACE_TRANS_'.$this->defaultlang;
+			if (!empty($conf->global->$replacekey))    // Replacement translation variable with string1:newstring1;string2:newstring2
+			{
+				$tmparray = explode(';', $conf->global->$replacekey);
+				foreach ($tmparray as $tmp)
+				{
+					$tmparray2 = explode(':', $tmp);
+					$str = preg_replace('/'.preg_quote($tmparray2[0]).'/', $tmparray2[1], $str);
+				}
+			}
 
-            if (strpos($key, 'Format') !== 0)
-            {
-            	$str = sprintf($str, $param1, $param2, $param3, $param4); // Replace %s and %d except for FormatXXX strings.
-            }
+			if (strpos($key, 'Format') !== 0)
+			{
+				$str = sprintf($str, $param1, $param2, $param3, $param4); // Replace %s and %d except for FormatXXX strings.
+			}
 
 			if ($maxsize) $str = dol_trunc($str, $maxsize);
 
 			// We replace some HTML tags by __xx__ to avoid having them encoded by htmlentities
-            $str = str_replace(array('<', '>', '"',), array('__lt__', '__gt__', '__quot__'), $str);
+			$str = str_replace(array('<', '>', '"',), array('__lt__', '__gt__', '__quot__'), $str);
 
 			// Crypt string into HTML
 			$str = htmlentities($str, ENT_COMPAT, $this->charset_output); // Do not convert simple quotes in translation (strings in html are enmbraced by "). Use dol_escape_htmltag around text in HTML content
 
 			// Restore HTML tags
-            $str = str_replace(array('__lt__', '__gt__', '__quot__'), array('<', '>', '"',), $str);
+			$str = str_replace(array('__lt__', '__gt__', '__quot__'), array('<', '>', '"',), $str);
 
 			return $str;
 		} else // Translation is not available
 		{
-		    //if ($key[0] == '$') { return dol_eval($key,1); }
+			//if ($key[0] == '$') { return dol_eval($key,1); }
 			return $this->getTradFromKey($key);
 		}
-    }
+	}
 
 
 	/**
@@ -687,29 +687,29 @@ class Translate
 
 		if (!empty($this->tab_translate[$key]))	// Translation is available
 		{
-		    $str = $this->tab_translate[$key];
+			$str = $this->tab_translate[$key];
 
-    		// Make some string replacement after translation
-            $replacekey = 'MAIN_REPLACE_TRANS_'.$this->defaultlang;
-            if (!empty($conf->global->$replacekey))    // Replacement translation variable with string1:newstring1;string2:newstring2
-            {
-                $tmparray = explode(';', $conf->global->$replacekey);
-                foreach ($tmparray as $tmp)
-                {
-                    $tmparray2 = explode(':', $tmp);
-                    $str = preg_replace('/'.preg_quote($tmparray2[0]).'/', $tmparray2[1], $str);
-                }
-            }
+			// Make some string replacement after translation
+			$replacekey = 'MAIN_REPLACE_TRANS_'.$this->defaultlang;
+			if (!empty($conf->global->$replacekey))    // Replacement translation variable with string1:newstring1;string2:newstring2
+			{
+				$tmparray = explode(';', $conf->global->$replacekey);
+				foreach ($tmparray as $tmp)
+				{
+					$tmparray2 = explode(':', $tmp);
+					$str = preg_replace('/'.preg_quote($tmparray2[0]).'/', $tmparray2[1], $str);
+				}
+			}
 
-            if (!preg_match('/^Format/', $key))
-            {
-            	//print $str;
-           		$str = sprintf($str, $param1, $param2, $param3, $param4, $param5); // Replace %s and %d except for FormatXXX strings.
-            }
+			if (!preg_match('/^Format/', $key))
+			{
+				//print $str;
+		   		$str = sprintf($str, $param1, $param2, $param3, $param4, $param5); // Replace %s and %d except for FormatXXX strings.
+			}
 
-            return $str;
+			return $str;
 		} else {
-		    if ($key[0] == '$') { return dol_eval($key, 1); }
+			if ($key[0] == '$') { return dol_eval($key, 1); }
 			return $this->getTradFromKey($key);
 		}
 	}
@@ -758,7 +758,7 @@ class Translate
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return list of all available languages
 	 *
@@ -769,8 +769,8 @@ class Translate
 	 *  @return array     				List of languages
 	 */
 	public function get_available_languages($langdir = DOL_DOCUMENT_ROOT, $maxlength = 0, $usecode = 0, $mainlangonly = 0)
-    {
-        // phpcs:enable
+	{
+		// phpcs:enable
 		global $conf;
 
 		$this->load("languages");
@@ -818,12 +818,12 @@ class Translate
 
 				if ($usecode == 2)
 				{
-				    $langs_available[$dir] = $dir;
+					$langs_available[$dir] = $dir;
 				}
 
 				if ($usecode == 1 || !empty($conf->global->MAIN_SHOW_LANGUAGE_CODE))
 				{
-				    $langs_available[$dir] = $dir.': '.dol_trunc($this->trans('Language_'.$dir), $maxlength);
+					$langs_available[$dir] = $dir.': '.dol_trunc($this->trans('Language_'.$dir), $maxlength);
 				} else {
 					$langs_available[$dir] = $this->trans('Language_'.$dir);
 				}
@@ -833,10 +833,10 @@ class Translate
 			}
 		}
 		return $langs_available;
-    }
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return if a filename $filename exists for current language (or alternate language)
 	 *
@@ -844,9 +844,9 @@ class Translate
 	 *  @param  integer	$searchalt      Search also alernate language file
 	 *  @return boolean         		true if exists and readable
 	 */
-    public function file_exists($filename, $searchalt = 0)
-    {
-        // phpcs:enable
+	public function file_exists($filename, $searchalt = 0)
+	{
+		// phpcs:enable
 		// Test si fichier dans repertoire de la langue
 		foreach ($this->dir as $searchdir)
 		{
@@ -862,22 +862,22 @@ class Translate
 		}
 
 		return false;
-    }
+	}
 
 
 	/**
 	 *      Return full text translated to language label for a key. Store key-label in a cache.
-     *      This function need module "numberwords" to be installed. If not it will return
-     *      same number (this module is not provided by default as it use non GPL source code).
+	 *      This function need module "numberwords" to be installed. If not it will return
+	 *      same number (this module is not provided by default as it use non GPL source code).
 	 *
 	 *		@param	int		$number		Number to encode in full text
-     *      @param  string	$isamount	''=it's just a number, '1'=It's an amount (default currency), 'currencycode'=It's an amount (foreign currency)
+	 *      @param  string	$isamount	''=it's just a number, '1'=It's an amount (default currency), 'currencycode'=It's an amount (foreign currency)
 	 *      @return string				Label translated in UTF8 (but without entities)
 	 * 									10 if setDefaultLang was en_US => ten
 	 * 									123 if setDefaultLang was fr_FR => cent vingt trois
 	 */
-    public function getLabelFromNumber($number, $isamount = '')
-    {
+	public function getLabelFromNumber($number, $isamount = '')
+	{
 		global $conf;
 
 		$newnumber = $number;
@@ -885,11 +885,11 @@ class Translate
 		$dirsubstitutions = array_merge(array(), $conf->modules_parts['substitutions']);
 		foreach ($dirsubstitutions as $reldir)
 		{
-		    $dir = dol_buildpath($reldir, 0);
-		    $newdir = dol_osencode($dir);
+			$dir = dol_buildpath($reldir, 0);
+			$newdir = dol_osencode($dir);
 
-		    // Check if directory exists
-		    if (!is_dir($newdir)) continue; // We must not use dol_is_dir here, function may not be loaded
+			// Check if directory exists
+			if (!is_dir($newdir)) continue; // We must not use dol_is_dir here, function may not be loaded
 
 			$fonc = 'numberwords';
 			if (file_exists($newdir.'/functions_'.$fonc.'.lib.php'))
@@ -901,7 +901,7 @@ class Translate
 		}
 
 		return $newnumber;
-    }
+	}
 
 
 	/**
@@ -919,12 +919,12 @@ class Translate
 	 *      @return string					Label in UTF8 (but without entities)
 	 *      @see dol_getIdFromCode()
 	 */
-    public function getLabelFromKey($db, $key, $tablename, $fieldkey, $fieldlabel, $keyforselect = '', $filteronentity = 0)
-    {
+	public function getLabelFromKey($db, $key, $tablename, $fieldkey, $fieldlabel, $keyforselect = '', $filteronentity = 0)
+	{
 		// If key empty
 		if ($key == '') return '';
 
-        //print 'param: '.$key.'-'.$keydatabase.'-'.$this->trans($key); exit;
+		//print 'param: '.$key.'-'.$keydatabase.'-'.$this->trans($key); exit;
 
 		// Check if a translation is available (this can call getTradFromKey)
 		$tmp = $this->transnoentitiesnoconv($key);
@@ -957,7 +957,7 @@ class Translate
 			$this->error = $db->lasterror();
 			return -1;
 		}
-    }
+	}
 
 
 	/**
@@ -969,7 +969,7 @@ class Translate
 	 *  @deprecated							Use method price to output a price
 	 *  @see price()
 	 */
-    public function getCurrencyAmount($currency_code, $amount)
+	public function getCurrencyAmount($currency_code, $amount)
 	{
 		$symbol = $this->getCurrencySymbol($currency_code);
 
@@ -985,8 +985,8 @@ class Translate
 	 *  @param	integer	$forceloadall		1=Force to load all currencies into cache. We know we need to use all of them. By default read and cache only the requested currency.
 	 *  @return	string						Currency symbol encoded into UTF8
 	 */
-    public function getCurrencySymbol($currency_code, $forceloadall = 0)
-    {
+	public function getCurrencySymbol($currency_code, $forceloadall = 0)
+	{
 		$currency_sign = ''; // By default return iso code
 
 		if (function_exists("mb_convert_encoding"))
@@ -1003,7 +1003,7 @@ class Translate
 		}
 
 		return ($currency_sign ? $currency_sign : $currency_code);
-    }
+	}
 
 	/**
 	 *  Load into the cache this->cache_currencies, all currencies
@@ -1057,23 +1057,23 @@ class Translate
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Return an array with content of all loaded translation keys (found into this->tab_translate) so
 	 * we get a substitution array we can use for substitutions (for mail or ODT generation for example)
 	 *
 	 * @return array	Array of translation keys lang_key => string_translation_loaded
 	 */
-    public function get_translations_for_substitutions()
-    {
-        // phpcs:enable
-        $substitutionarray = array();
+	public function get_translations_for_substitutions()
+	{
+		// phpcs:enable
+		$substitutionarray = array();
 
-        foreach ($this->tab_translate as $code => $label) {
-            $substitutionarray['lang_'.$code] = $label;
-            $substitutionarray['__('.$code.')__'] = $label;
-        }
+		foreach ($this->tab_translate as $code => $label) {
+			$substitutionarray['lang_'.$code] = $label;
+			$substitutionarray['__('.$code.')__'] = $label;
+		}
 
-        return $substitutionarray;
-    }
+		return $substitutionarray;
+	}
 }
diff --git a/htdocs/core/class/utils.class.php b/htdocs/core/class/utils.class.php
index 454ace0ebfa..3436a6d3c4f 100644
--- a/htdocs/core/class/utils.class.php
+++ b/htdocs/core/class/utils.class.php
@@ -28,12 +28,12 @@
 class Utils
 {
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $output; // Used by Cron method to return message
-    public $result; // Used by Cron method to return data
+	public $output; // Used by Cron method to return message
+	public $result; // Used by Cron method to return data
 
 	/**
 	 *	Constructor
@@ -72,14 +72,14 @@ class Utils
 			// Delete temporary files
 			if ($dolibarr_main_data_root)
 			{
-			    $filesarray = dol_dir_list($dolibarr_main_data_root, "directories", 1, '^temp$', '', 'name', SORT_ASC, 2, 0, '', 1); // Do not follow symlinks
+				$filesarray = dol_dir_list($dolibarr_main_data_root, "directories", 1, '^temp$', '', 'name', SORT_ASC, 2, 0, '', 1); // Do not follow symlinks
 
-			    if ($choice == 'tempfilesold')
+				if ($choice == 'tempfilesold')
 				{
 					$now = dol_now();
 					foreach ($filesarray as $key => $val)
 					{
-					    if ($val['date'] > ($now - ($nbsecondsold))) unset($filesarray[$key]); // Discard temp dir not older than $nbsecondsold
+						if ($val['date'] > ($now - ($nbsecondsold))) unset($filesarray[$key]); // Discard temp dir not older than $nbsecondsold
 					}
 				}
 			}
@@ -122,10 +122,10 @@ class Utils
 		$counterror = 0;
 		if (count($filesarray))
 		{
-		    foreach ($filesarray as $key => $value)
+			foreach ($filesarray as $key => $value)
 			{
 				//print "x ".$filesarray[$key]['fullname']."-".$filesarray[$key]['type']."<br>\n";
-			    if ($filesarray[$key]['type'] == 'dir')
+				if ($filesarray[$key]['type'] == 'dir')
 				{
 					$startcount = 0;
 					$tmpcountdeleted = 0;
@@ -168,7 +168,7 @@ class Utils
 		// Recreate temp dir that are not automatically recreated by core code for performance purpose, we need them
 		if (!empty($conf->api->enabled))
 		{
-		    dol_mkdir($conf->api->dir_temp);
+			dol_mkdir($conf->api->dir_temp);
 		}
 		dol_mkdir($conf->user->dir_temp);
 
@@ -631,8 +631,8 @@ class Utils
 
 				if (empty($conf->global->MODULEBUILDER_ASCIIDOCTOR) && empty($conf->global->MODULEBUILDER_ASCIIDOCTORPDF))
 				{
-				    $this->error = 'Setup of module ModuleBuilder not complete';
-				    return -1;
+					$this->error = 'Setup of module ModuleBuilder not complete';
+					return -1;
 				}
 
 				// Copy some files into temp directory, so instruction include::ChangeLog.md[] will works inside the asciidoc file.
@@ -687,36 +687,36 @@ class Utils
 
 					//var_dump($phpfileval['fullname']);
 					$arrayreplacement = array(
-					    'mymodule'=>strtolower($module),
-					    'MyModule'=>$module,
-					    'MYMODULE'=>strtoupper($module),
-					    'My module'=>$module,
-					    'my module'=>$module,
-					    'Mon module'=>$module,
-					    'mon module'=>$module,
-					    'htdocs/modulebuilder/template'=>strtolower($module),
-					    '__MYCOMPANY_NAME__'=>$mysoc->name,
-					    '__KEYWORDS__'=>$module,
-					    '__USER_FULLNAME__'=>$user->getFullName($langs),
-					    '__USER_EMAIL__'=>$user->email,
-					    '__YYYY-MM-DD__'=>dol_print_date($now, 'dayrfc'),
-					    '---Put here your own copyright and developer email---'=>dol_print_date($now, 'dayrfc').' '.$user->getFullName($langs).($user->email ? ' <'.$user->email.'>' : ''),
-					    '__DATA_SPECIFICATION__'=>'Not yet available',
-					    '__README__'=>dolMd2Asciidoc($contentreadme),
-					    '__CHANGELOG__'=>dolMd2Asciidoc($contentchangelog),
+						'mymodule'=>strtolower($module),
+						'MyModule'=>$module,
+						'MYMODULE'=>strtoupper($module),
+						'My module'=>$module,
+						'my module'=>$module,
+						'Mon module'=>$module,
+						'mon module'=>$module,
+						'htdocs/modulebuilder/template'=>strtolower($module),
+						'__MYCOMPANY_NAME__'=>$mysoc->name,
+						'__KEYWORDS__'=>$module,
+						'__USER_FULLNAME__'=>$user->getFullName($langs),
+						'__USER_EMAIL__'=>$user->email,
+						'__YYYY-MM-DD__'=>dol_print_date($now, 'dayrfc'),
+						'---Put here your own copyright and developer email---'=>dol_print_date($now, 'dayrfc').' '.$user->getFullName($langs).($user->email ? ' <'.$user->email.'>' : ''),
+						'__DATA_SPECIFICATION__'=>'Not yet available',
+						'__README__'=>dolMd2Asciidoc($contentreadme),
+						'__CHANGELOG__'=>dolMd2Asciidoc($contentchangelog),
 					);
 
 					dolReplaceInFile($destfile, $arrayreplacement);
 				}
 
 				// Launch doc generation
-                $currentdir = getcwd();
-                chdir($dirofmodule);
+				$currentdir = getcwd();
+				chdir($dirofmodule);
 
-                require_once DOL_DOCUMENT_ROOT.'/core/class/utils.class.php';
-                $utils = new Utils($this->db);
+				require_once DOL_DOCUMENT_ROOT.'/core/class/utils.class.php';
+				$utils = new Utils($this->db);
 
-                // Build HTML doc
+				// Build HTML doc
 				$command = $conf->global->MODULEBUILDER_ASCIIDOCTOR.' '.$destfile.' -n -o '.$dirofmoduledoc.'/'.$FILENAMEDOC;
 				$outfile = $dirofmoduletmp.'/out.tmp';
 
@@ -733,7 +733,7 @@ class Utils
 				$resarray = $utils->executeCLI($command, $outfile);
 				if ($resarray['result'] != '0')
 				{
-				    $this->error = $resarray['error'].' '.$resarray['output'];
+					$this->error = $resarray['error'].' '.$resarray['output'];
 				}
 				$result = ($resarray['result'] == 0) ? 1 : 0;
 
@@ -766,8 +766,8 @@ class Utils
 	 *
 	 * @return	int						0 if OK, < 0 if KO
 	 */
-    public function compressSyslogs()
-    {
+	public function compressSyslogs()
+	{
 		global $conf;
 
 		if (empty($conf->loghandlers['mod_syslog_file'])) { // File Syslog disabled
@@ -871,7 +871,7 @@ class Utils
 
 		$this->output = 'Archive log files (keeping last SYSLOG_FILE_SAVES='.$nbSaves.' files) done.';
 		return 0;
-    }
+	}
 
 	/**	Backup the db OR just a table without mysqldump binary, with PHP only (does not require any exec permission)
 	 *	Author: David Walsh (http://davidwalsh.name/backup-mysql-database-php)
diff --git a/htdocs/core/class/vcard.class.php b/htdocs/core/class/vcard.class.php
index fc67eb2f2a0..0e3f04fa0f5 100644
--- a/htdocs/core/class/vcard.class.php
+++ b/htdocs/core/class/vcard.class.php
@@ -31,7 +31,7 @@
  */
 function encode($string)
 {
-    return str_replace(";", "\;", (dol_quoted_printable_encode(utf8_decode($string))));
+	return str_replace(";", "\;", (dol_quoted_printable_encode(utf8_decode($string))));
 }
 
 
@@ -45,38 +45,38 @@ function encode($string)
  */
 function dol_quoted_printable_encode($input, $line_max = 76)
 {
-    $hex = array('0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F');
-    $lines = preg_split("/(\?:\r\n|\r|\n)/", $input);
-    $eol = "\r\n";
-    $linebreak = "=0D=0A";
-    $escape = "=";
-    $output = "";
+	$hex = array('0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F');
+	$lines = preg_split("/(\?:\r\n|\r|\n)/", $input);
+	$eol = "\r\n";
+	$linebreak = "=0D=0A";
+	$escape = "=";
+	$output = "";
 
-    $num = count($lines);
-    for ($j = 0; $j < $num; $j++)
-    {
-        $line = $lines[$j];
-        $linlen = strlen($line);
-        $newline = "";
-        for ($i = 0; $i < $linlen; $i++) {
-            $c = substr($line, $i, 1);
-            $dec = ord($c);
-            if (($dec == 32) && ($i == ($linlen - 1))) { // convert space at eol only
-                $c = "=20";
-            } elseif (($dec == 61) || ($dec < 32) || ($dec > 126)) { // always encode "\t", which is *not* required
-                $h2 = floor($dec / 16); $h1 = floor($dec % 16);
-                $c = $escape.$hex["$h2"].$hex["$h1"];
-            }
-            if ((strlen($newline) + strlen($c)) >= $line_max) { // CRLF is not counted
-                $output .= $newline.$escape.$eol; // soft line break; " =\r\n" is okay
-                $newline = "    ";
-            }
-            $newline .= $c;
-        } // end of for
-        $output .= $newline;
-        if ($j < count($lines) - 1) $output .= $linebreak;
-    }
-    return trim($output);
+	$num = count($lines);
+	for ($j = 0; $j < $num; $j++)
+	{
+		$line = $lines[$j];
+		$linlen = strlen($line);
+		$newline = "";
+		for ($i = 0; $i < $linlen; $i++) {
+			$c = substr($line, $i, 1);
+			$dec = ord($c);
+			if (($dec == 32) && ($i == ($linlen - 1))) { // convert space at eol only
+				$c = "=20";
+			} elseif (($dec == 61) || ($dec < 32) || ($dec > 126)) { // always encode "\t", which is *not* required
+				$h2 = floor($dec / 16); $h1 = floor($dec % 16);
+				$c = $escape.$hex["$h2"].$hex["$h1"];
+			}
+			if ((strlen($newline) + strlen($c)) >= $line_max) { // CRLF is not counted
+				$output .= $newline.$escape.$eol; // soft line break; " =\r\n" is okay
+				$newline = "    ";
+			}
+			$newline .= $c;
+		} // end of for
+		$output .= $newline;
+		if ($j < count($lines) - 1) $output .= $linebreak;
+	}
+	return trim($output);
 }
 
 
@@ -85,254 +85,254 @@ function dol_quoted_printable_encode($input, $line_max = 76)
  */
 class vCard
 {
-    public $properties;
-    public $filename;
+	public $properties;
+	public $filename;
 
-    //var $encoding="UTF-8";
-    public $encoding = "ISO-8859-1;ENCODING=QUOTED-PRINTABLE";
+	//var $encoding="UTF-8";
+	public $encoding = "ISO-8859-1;ENCODING=QUOTED-PRINTABLE";
 
 
-    /**
-     *  mise en forme du numero de telephone
-     *
-     *  @param	int		$number		numero de telephone
-     *  @param	string	$type		Type
-     *  @return	void
-     */
-    public function setPhoneNumber($number, $type = "")
-    {
-        // type may be PREF | WORK | HOME | VOICE | FAX | MSG | CELL | PAGER | BBS | CAR | MODEM | ISDN | VIDEO or any senseful combination, e.g. "PREF;WORK;VOICE"
-        $key = "TEL";
-        if ($type != "") $key .= ";".$type;
-        $key .= ";CHARSET=".$this->encoding;
-        $this->properties[$key] = encode($number);
-    }
+	/**
+	 *  mise en forme du numero de telephone
+	 *
+	 *  @param	int		$number		numero de telephone
+	 *  @param	string	$type		Type
+	 *  @return	void
+	 */
+	public function setPhoneNumber($number, $type = "")
+	{
+		// type may be PREF | WORK | HOME | VOICE | FAX | MSG | CELL | PAGER | BBS | CAR | MODEM | ISDN | VIDEO or any senseful combination, e.g. "PREF;WORK;VOICE"
+		$key = "TEL";
+		if ($type != "") $key .= ";".$type;
+		$key .= ";CHARSET=".$this->encoding;
+		$this->properties[$key] = encode($number);
+	}
 
-    /**
-     *	mise en forme de la photo
-     *  warning NON TESTE !
-     *
-     *  @param  string  $type			Type
-     *  @param  string  $photo			Photo
-     *  @return	void
-     */
-    public function setPhoto($type, $photo)
-    {
-        // $type = "GIF" | "JPEG"
-        $this->properties["PHOTO;TYPE=$type;ENCODING=BASE64"] = base64_encode($photo);
-    }
+	/**
+	 *	mise en forme de la photo
+	 *  warning NON TESTE !
+	 *
+	 *  @param  string  $type			Type
+	 *  @param  string  $photo			Photo
+	 *  @return	void
+	 */
+	public function setPhoto($type, $photo)
+	{
+		// $type = "GIF" | "JPEG"
+		$this->properties["PHOTO;TYPE=$type;ENCODING=BASE64"] = base64_encode($photo);
+	}
 
-    /**
-     *	mise en forme du nom formate
-     *
-     *	@param	string	$name			Name
-     *	@return	void
-     */
-    public function setFormattedName($name)
-    {
-        $this->properties["FN;CHARSET=".$this->encoding] = encode($name);
-    }
+	/**
+	 *	mise en forme du nom formate
+	 *
+	 *	@param	string	$name			Name
+	 *	@return	void
+	 */
+	public function setFormattedName($name)
+	{
+		$this->properties["FN;CHARSET=".$this->encoding] = encode($name);
+	}
 
-    /**
-     *	mise en forme du nom complet
-     *
-     *	@param	string	$family			Family name
-     *	@param	string	$first			First name
-     *	@param	string	$additional		Additional (e.g. second name, nick name)
-     *	@param	string	$prefix			Prefix (e.g. "Mr.", "Ms.", "Prof.")
-     *	@param	string	$suffix			Suffix (e.g. "sen." for senior, "jun." for junior)
-     *	@return	void
-     */
-    public function setName($family = "", $first = "", $additional = "", $prefix = "", $suffix = "")
-    {
-        $this->properties["N;CHARSET=".$this->encoding] = encode($family).";".encode($first).";".encode($additional).";".encode($prefix).";".encode($suffix);
-        $this->filename = "$first%20$family.vcf";
-        if (empty($this->properties["FN"])) $this->setFormattedName(trim("$prefix $first $additional $family $suffix"));
-    }
+	/**
+	 *	mise en forme du nom complet
+	 *
+	 *	@param	string	$family			Family name
+	 *	@param	string	$first			First name
+	 *	@param	string	$additional		Additional (e.g. second name, nick name)
+	 *	@param	string	$prefix			Prefix (e.g. "Mr.", "Ms.", "Prof.")
+	 *	@param	string	$suffix			Suffix (e.g. "sen." for senior, "jun." for junior)
+	 *	@return	void
+	 */
+	public function setName($family = "", $first = "", $additional = "", $prefix = "", $suffix = "")
+	{
+		$this->properties["N;CHARSET=".$this->encoding] = encode($family).";".encode($first).";".encode($additional).";".encode($prefix).";".encode($suffix);
+		$this->filename = "$first%20$family.vcf";
+		if (empty($this->properties["FN"])) $this->setFormattedName(trim("$prefix $first $additional $family $suffix"));
+	}
 
-    /**
-     *	mise en forme de l'anniversaire
-     *
-     *	@param	integer	  $date		Date
-     *	@return	void
-     */
-    public function setBirthday($date)
-    {
-        // $date format is YYYY-MM-DD - RFC 2425 and RFC 2426
-        $this->properties["BDAY"] = dol_print_date($date, 'dayrfc');
-    }
+	/**
+	 *	mise en forme de l'anniversaire
+	 *
+	 *	@param	integer	  $date		Date
+	 *	@return	void
+	 */
+	public function setBirthday($date)
+	{
+		// $date format is YYYY-MM-DD - RFC 2425 and RFC 2426
+		$this->properties["BDAY"] = dol_print_date($date, 'dayrfc');
+	}
 
-    /**
-     *	mise en forme de l'adresse
-     *
-     *	@param	string	$postoffice		Postoffice
-     *	@param	string	$extended		Extended
-     *	@param	string	$street			Street
-     *	@param	string	$city			City
-     *	@param	string	$region			Region
-     *	@param	string	$zip			Zip
-     *	@param	string	$country		Country
-     *	@param	string	$type			Type
-     *	@return	void
-     */
-    public function setAddress($postoffice = "", $extended = "", $street = "", $city = "", $region = "", $zip = "", $country = "", $type = "HOME;POSTAL")
-    {
-        // $type may be DOM | INTL | POSTAL | PARCEL | HOME | WORK or any combination of these: e.g. "WORK;PARCEL;POSTAL"
-        $key = "ADR";
-        if ($type != "") $key .= ";$type";
-        $key .= ";CHARSET=".$this->encoding;
-        $this->properties[$key] = ";".encode($extended).";".encode($street).";".encode($city).";".encode($region).";".encode($zip).";".encode($country);
+	/**
+	 *	mise en forme de l'adresse
+	 *
+	 *	@param	string	$postoffice		Postoffice
+	 *	@param	string	$extended		Extended
+	 *	@param	string	$street			Street
+	 *	@param	string	$city			City
+	 *	@param	string	$region			Region
+	 *	@param	string	$zip			Zip
+	 *	@param	string	$country		Country
+	 *	@param	string	$type			Type
+	 *	@return	void
+	 */
+	public function setAddress($postoffice = "", $extended = "", $street = "", $city = "", $region = "", $zip = "", $country = "", $type = "HOME;POSTAL")
+	{
+		// $type may be DOM | INTL | POSTAL | PARCEL | HOME | WORK or any combination of these: e.g. "WORK;PARCEL;POSTAL"
+		$key = "ADR";
+		if ($type != "") $key .= ";$type";
+		$key .= ";CHARSET=".$this->encoding;
+		$this->properties[$key] = ";".encode($extended).";".encode($street).";".encode($city).";".encode($region).";".encode($zip).";".encode($country);
 
-        if ($this->properties["LABEL;$type;CHARSET=".$this->encoding] == "")
-        {
-            //$this->setLabel($postoffice, $extended, $street, $city, $region, $zip, $country, $type);
-        }
-    }
+		if ($this->properties["LABEL;$type;CHARSET=".$this->encoding] == "")
+		{
+			//$this->setLabel($postoffice, $extended, $street, $city, $region, $zip, $country, $type);
+		}
+	}
 
-    /**
-     *  mise en forme du label
-     *
-     *  @param	string	$postoffice		Postoffice
-     *  @param	string	$extended		Extended
-     *  @param	string	$street			Street
-     *  @param	string	$city			City
-     *  @param	string	$region			Region
-     *  @param	string	$zip			Zip
-     *  @param	string	$country		Country
-     *  @param	string	$type			Type
-     *  @return	void
-     */
-    public function setLabel($postoffice = "", $extended = "", $street = "", $city = "", $region = "", $zip = "", $country = "", $type = "HOME;POSTAL")
-    {
-        $label = "";
-        if ($postoffice != "") $label .= "$postoffice\r\n";
-        if ($extended != "") $label .= "$extended\r\n";
-        if ($street != "") $label .= "$street\r\n";
-        if ($zip != "") $label .= "$zip ";
-        if ($city != "") $label .= "$city\r\n";
-        if ($region != "") $label .= "$region\r\n";
-        if ($country != "") $country .= "$country\r\n";
+	/**
+	 *  mise en forme du label
+	 *
+	 *  @param	string	$postoffice		Postoffice
+	 *  @param	string	$extended		Extended
+	 *  @param	string	$street			Street
+	 *  @param	string	$city			City
+	 *  @param	string	$region			Region
+	 *  @param	string	$zip			Zip
+	 *  @param	string	$country		Country
+	 *  @param	string	$type			Type
+	 *  @return	void
+	 */
+	public function setLabel($postoffice = "", $extended = "", $street = "", $city = "", $region = "", $zip = "", $country = "", $type = "HOME;POSTAL")
+	{
+		$label = "";
+		if ($postoffice != "") $label .= "$postoffice\r\n";
+		if ($extended != "") $label .= "$extended\r\n";
+		if ($street != "") $label .= "$street\r\n";
+		if ($zip != "") $label .= "$zip ";
+		if ($city != "") $label .= "$city\r\n";
+		if ($region != "") $label .= "$region\r\n";
+		if ($country != "") $country .= "$country\r\n";
 
-        $this->properties["LABEL;$type;CHARSET=".$this->encoding] = encode($label);
-    }
+		$this->properties["LABEL;$type;CHARSET=".$this->encoding] = encode($label);
+	}
 
-    /**
-     *	Add a e-mail address to this vCard
-     *
-     *	@param	string	$address		E-mail address
-     *	@param	string	$type			(optional) The type of the e-mail (typical "PREF;INTERNET" or "INTERNET")
-     *	@return	void
-     */
-    public function setEmail($address, $type = "TYPE=INTERNET;PREF")
-    {
-        $key = "EMAIL";
-        if ($type != "") $key .= ";".$type;
-        $this->properties[$key] = $address;
-    }
+	/**
+	 *	Add a e-mail address to this vCard
+	 *
+	 *	@param	string	$address		E-mail address
+	 *	@param	string	$type			(optional) The type of the e-mail (typical "PREF;INTERNET" or "INTERNET")
+	 *	@return	void
+	 */
+	public function setEmail($address, $type = "TYPE=INTERNET;PREF")
+	{
+		$key = "EMAIL";
+		if ($type != "") $key .= ";".$type;
+		$this->properties[$key] = $address;
+	}
 
-    /**
-     *	mise en forme de la note
-     *
-     *	@param	string	$note		Note
-     *	@return	void
-     */
-    public function setNote($note)
-    {
-        $this->properties["NOTE;CHARSET=".$this->encoding] = encode($note);
-    }
+	/**
+	 *	mise en forme de la note
+	 *
+	 *	@param	string	$note		Note
+	 *	@return	void
+	 */
+	public function setNote($note)
+	{
+		$this->properties["NOTE;CHARSET=".$this->encoding] = encode($note);
+	}
 
-    /**
-     * 	mise en forme de la fonction
-     *
-     *	@param	string	$title		Title
-     *	@return	void
-     */
-    public function setTitle($title)
-    {
-        $this->properties["TITLE;CHARSET=".$this->encoding] = encode($title);
-    }
+	/**
+	 * 	mise en forme de la fonction
+	 *
+	 *	@param	string	$title		Title
+	 *	@return	void
+	 */
+	public function setTitle($title)
+	{
+		$this->properties["TITLE;CHARSET=".$this->encoding] = encode($title);
+	}
 
 
-    /**
-     *  mise en forme de la societe
-     *
-     *  @param	string	$org		Org
-     *  @return	void
-     */
-    public function setOrg($org)
-    {
-        $this->properties["ORG;CHARSET=".$this->encoding] = encode($org);
-    }
+	/**
+	 *  mise en forme de la societe
+	 *
+	 *  @param	string	$org		Org
+	 *  @return	void
+	 */
+	public function setOrg($org)
+	{
+		$this->properties["ORG;CHARSET=".$this->encoding] = encode($org);
+	}
 
 
-    /**
-     * 	mise en forme du logiciel generateur
-     *
-     *  @param	string	$prodid		Prodid
-     *	@return	void
-     */
-    public function setProdId($prodid)
-    {
-        $this->properties["PRODID;CHARSET=".$this->encoding] = encode($prodid);
-    }
+	/**
+	 * 	mise en forme du logiciel generateur
+	 *
+	 *  @param	string	$prodid		Prodid
+	 *	@return	void
+	 */
+	public function setProdId($prodid)
+	{
+		$this->properties["PRODID;CHARSET=".$this->encoding] = encode($prodid);
+	}
 
 
-    /**
-     * 	mise en forme du logiciel generateur
-     *
-     *  @param	string	$uid	Uid
-     *	@return	void
-     */
-    public function setUID($uid)
-    {
-        $this->properties["UID;CHARSET=".$this->encoding] = encode($uid);
-    }
+	/**
+	 * 	mise en forme du logiciel generateur
+	 *
+	 *  @param	string	$uid	Uid
+	 *	@return	void
+	 */
+	public function setUID($uid)
+	{
+		$this->properties["UID;CHARSET=".$this->encoding] = encode($uid);
+	}
 
 
-    /**
-     *  mise en forme de l'url
-     *
-     *	@param	string	$url		URL
-     *  @param	string	$type		Type
-     *	@return	void
-     */
-    public function setURL($url, $type = "")
-    {
-        // $type may be WORK | HOME
-        $key = "URL";
-        if ($type != "") $key .= ";$type";
-        $this->properties[$key] = $url;
-    }
+	/**
+	 *  mise en forme de l'url
+	 *
+	 *	@param	string	$url		URL
+	 *  @param	string	$type		Type
+	 *	@return	void
+	 */
+	public function setURL($url, $type = "")
+	{
+		// $type may be WORK | HOME
+		$key = "URL";
+		if ($type != "") $key .= ";$type";
+		$this->properties[$key] = $url;
+	}
 
-    /**
-     *  permet d'obtenir une vcard
-     *
-     *  @return	string
-     */
-    public function getVCard()
-    {
-        $text = "BEGIN:VCARD\r\n";
-        $text .= "VERSION:3.0\r\n";
-        //$text.= "VERSION:2.1\r\n";
-        foreach ($this->properties as $key => $value)
-        {
-            $text .= "$key:$value\r\n";
-        }
-        $text .= "REV:".date("Y-m-d")."T".date("H:i:s")."Z\r\n";
-        $text .= "MAILER: Dolibarr\r\n";
-        $text .= "END:VCARD\r\n";
-        return $text;
-    }
+	/**
+	 *  permet d'obtenir une vcard
+	 *
+	 *  @return	string
+	 */
+	public function getVCard()
+	{
+		$text = "BEGIN:VCARD\r\n";
+		$text .= "VERSION:3.0\r\n";
+		//$text.= "VERSION:2.1\r\n";
+		foreach ($this->properties as $key => $value)
+		{
+			$text .= "$key:$value\r\n";
+		}
+		$text .= "REV:".date("Y-m-d")."T".date("H:i:s")."Z\r\n";
+		$text .= "MAILER: Dolibarr\r\n";
+		$text .= "END:VCARD\r\n";
+		return $text;
+	}
 
-    /**
-     *  permet d'obtenir le nom de fichier
-     *
-     *  @return	string		Filename
-     */
-    public function getFileName()
-    {
-        return $this->filename;
-    }
+	/**
+	 *  permet d'obtenir le nom de fichier
+	 *
+	 *  @return	string		Filename
+	 */
+	public function getFileName()
+	{
+		return $this->filename;
+	}
 
 	/* Example from Microsoft Outlook 2019
 
diff --git a/htdocs/core/commonfieldsinexport.inc.php b/htdocs/core/commonfieldsinexport.inc.php
index a16d6297dd4..5db67f36c78 100644
--- a/htdocs/core/commonfieldsinexport.inc.php
+++ b/htdocs/core/commonfieldsinexport.inc.php
@@ -2,9 +2,9 @@
 
 if (empty($keyforclass) || empty($keyforclassfile) || empty($keyforelement))
 {
-    //print $keyforclass.' - '.$keyforclassfile.' - '.$keyforelement;
-    dol_print_error('', 'include of file commonfieldsinexport.inc.php was done but var $keyforclass or $keyforclassfile or $keyforelement was not set');
-    exit;
+	//print $keyforclass.' - '.$keyforclassfile.' - '.$keyforelement;
+	dol_print_error('', 'include of file commonfieldsinexport.inc.php was done but var $keyforclass or $keyforclassfile or $keyforelement was not set');
+	exit;
 }
 if (empty($keyforalias)) $keyforalias = 't';
 
diff --git a/htdocs/core/customreports.php b/htdocs/core/customreports.php
index 859f6e5cac1..0a7f4ce9826 100644
--- a/htdocs/core/customreports.php
+++ b/htdocs/core/customreports.php
@@ -115,23 +115,23 @@ elseif (is_array($hookmanager->resArray)) {
 	}
 	if (!empty($hookmanager->resArray['arrayoftype'])) {	// Add entries from hook
 		foreach ($hookmanager->resArray['arrayoftype'] as $key => $val) {
-	        $arrayoftype[$key] = $val;
-	    }
+			$arrayoftype[$key] = $val;
+		}
 	}
 }
 
 if ($objecttype) {
-    try {
-    	if (!empty($arrayoftype[$objecttype]['ClassPath'])) {
-    		dol_include_once($arrayoftype[$objecttype]['ClassPath']);
-    	} else {
-    		dol_include_once("/".$objecttype."/class/".$objecttype.".class.php");
-    	}
-        $ObjectClassName = $arrayoftype[$objecttype]['ObjectClassName'];
-        $object = new $ObjectClassName($db);
-    } catch (Exception $e) {
-        print 'Failed to load class for type '.$objecttype;
-    }
+	try {
+		if (!empty($arrayoftype[$objecttype]['ClassPath'])) {
+			dol_include_once($arrayoftype[$objecttype]['ClassPath']);
+		} else {
+			dol_include_once("/".$objecttype."/class/".$objecttype.".class.php");
+		}
+		$ObjectClassName = $arrayoftype[$objecttype]['ObjectClassName'];
+		$object = new $ObjectClassName($db);
+	} catch (Exception $e) {
+		print 'Failed to load class for type '.$objecttype;
+	}
 }
 
 // Security check
@@ -289,13 +289,13 @@ if (is_array($search_groupby) && count($search_groupby)) {
 		if (count($arrayofvaluesforgroupby['g_'.$gkey]) > $MAXUNIQUEVALFORGROUP) {
 			$langs->load("errors");
 			if (strpos($fieldtocount, 'te.') === 0) {
-                //if (!empty($extrafields->attributes[$object->table_element]['langfile'][$gvalwithoutprefix])) {
-                //      $langs->load($extrafields->attributes[$object->table_element]['langfile'][$gvalwithoutprefix]);
-                //}
-                $keyforlabeloffield = $extrafields->attributes[$object->table_element]['label'][$gvalwithoutprefix];
-            } else {
-                $keyforlabeloffield = $object->fields[$gvalwithoutprefix]['label'];
-            }
+				//if (!empty($extrafields->attributes[$object->table_element]['langfile'][$gvalwithoutprefix])) {
+				//      $langs->load($extrafields->attributes[$object->table_element]['langfile'][$gvalwithoutprefix]);
+				//}
+				$keyforlabeloffield = $extrafields->attributes[$object->table_element]['label'][$gvalwithoutprefix];
+			} else {
+				$keyforlabeloffield = $object->fields[$gvalwithoutprefix]['label'];
+			}
 			//var_dump($gkey.' '.$gval.' '.$gvalwithoutprefix);
 			$gvalwithoutprefix = preg_replace('/\-(year|month|day)/', '', $gvalwithoutprefix);
 			$labeloffield = $langs->transnoentitiesnoconv($keyforlabeloffield);
@@ -339,7 +339,7 @@ foreach ($arrayoftype as $key => $val) {
 print $form->selectarray('objecttype', $newarrayoftype, $objecttype, 0, 0, 0, '', 1, 0, 0, '', 'minwidth200', 1);
 if (empty($conf->use_javascript_ajax)) print '<input type="submit" class="button buttongen" name="changeobjecttype" value="'.$langs->trans("Refresh").'">';
 else {
-    print '<script type="text/javascript" language="javascript">
+	print '<script type="text/javascript" language="javascript">
         jQuery(document).ready(function() {
         	jQuery("#objecttype").change(function() {
         		console.log("Reload for "+jQuery("#objecttype").val());
@@ -359,22 +359,22 @@ print '</div>';
 print '<div class="divadvancedsearchfield clearboth">';
 foreach ($object->fields as $key => $val) {
 	if (!empty($val['isameasure']) && (!isset($val['enabled']) || dol_eval($val['enabled'], 1))) {
-        $arrayofmesures['t.'.$key.'-sum'] = $langs->trans($val['label']).' <span class="opacitymedium">('.$langs->trans("Sum").')</span>';
-        $arrayofmesures['t.'.$key.'-average'] = $langs->trans($val['label']).' <span class="opacitymedium">('.$langs->trans("Average").')</span>';
-        $arrayofmesures['t.'.$key.'-min'] = $langs->trans($val['label']).' <span class="opacitymedium">('.$langs->trans("Minimum").')</span>';
-        $arrayofmesures['t.'.$key.'-max'] = $langs->trans($val['label']).' <span class="opacitymedium">('.$langs->trans("Maximum").')</span>';
-    }
+		$arrayofmesures['t.'.$key.'-sum'] = $langs->trans($val['label']).' <span class="opacitymedium">('.$langs->trans("Sum").')</span>';
+		$arrayofmesures['t.'.$key.'-average'] = $langs->trans($val['label']).' <span class="opacitymedium">('.$langs->trans("Average").')</span>';
+		$arrayofmesures['t.'.$key.'-min'] = $langs->trans($val['label']).' <span class="opacitymedium">('.$langs->trans("Minimum").')</span>';
+		$arrayofmesures['t.'.$key.'-max'] = $langs->trans($val['label']).' <span class="opacitymedium">('.$langs->trans("Maximum").')</span>';
+	}
 }
 // Add extrafields to Measures
 if ($object->isextrafieldmanaged) {
-    foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
-    	if (!empty($extrafields->attributes[$object->table_element]['totalizable'][$key]) && (!isset($extrafields->attributes[$object->table_element]['enabled'][$key]) || dol_eval($extrafields->attributes[$object->table_element]['enabled'][$key], 1))) {
-            $arrayofmesures['te.'.$key.'-sum'] = $langs->trans($extrafields->attributes[$object->table_element]['label'][$key]).' <span class="opacitymedium">('.$langs->trans("Sum").')</span>';
-            $arrayofmesures['te.'.$key.'-average'] = $langs->trans($extrafields->attributes[$object->table_element]['label'][$key]).' <span class="opacitymedium">('.$langs->trans("Average").')</span>';
-            $arrayofmesures['te.'.$key.'-min'] = $langs->trans($extrafields->attributes[$object->table_element]['label'][$key]).' <span class="opacitymedium">('.$langs->trans("Minimum").')</span>';
-            $arrayofmesures['te.'.$key.'-max'] = $langs->trans($extrafields->attributes[$object->table_element]['label'][$key]).' <span class="opacitymedium">('.$langs->trans("Maximum").')</span>';
-        }
-    }
+	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
+		if (!empty($extrafields->attributes[$object->table_element]['totalizable'][$key]) && (!isset($extrafields->attributes[$object->table_element]['enabled'][$key]) || dol_eval($extrafields->attributes[$object->table_element]['enabled'][$key], 1))) {
+			$arrayofmesures['te.'.$key.'-sum'] = $langs->trans($extrafields->attributes[$object->table_element]['label'][$key]).' <span class="opacitymedium">('.$langs->trans("Sum").')</span>';
+			$arrayofmesures['te.'.$key.'-average'] = $langs->trans($extrafields->attributes[$object->table_element]['label'][$key]).' <span class="opacitymedium">('.$langs->trans("Average").')</span>';
+			$arrayofmesures['te.'.$key.'-min'] = $langs->trans($extrafields->attributes[$object->table_element]['label'][$key]).' <span class="opacitymedium">('.$langs->trans("Minimum").')</span>';
+			$arrayofmesures['te.'.$key.'-max'] = $langs->trans($extrafields->attributes[$object->table_element]['label'][$key]).' <span class="opacitymedium">('.$langs->trans("Maximum").')</span>';
+		}
+	}
 }
 print '<div class="inline-block"><span class="fas fa-chart-line paddingright" title="'.$langs->trans("Measures").'"></span>'.$langs->trans("Measures").'</div> ';
 print $form->multiselectarray('search_measures', $arrayofmesures, $search_measures, 0, 0, 'minwidth500', 1);
@@ -398,44 +398,44 @@ print '</div>';
 if ($mode == 'grid') {
 	// YAxis
 	print '<div class="divadvancedsearchfield">';
-    foreach ($object->fields as $key => $val) {
-    	if (empty($val['measure']) && (!isset($val['enabled']) || dol_eval($val['enabled'], 1))) {
-            if (in_array($key, array('id', 'rowid', 'entity', 'last_main_doc', 'extraparams'))) continue;
-            if (preg_match('/^fk_/', $key)) continue;
-            if (in_array($val['type'], array('html', 'text'))) continue;
-            if (in_array($val['type'], array('timestamp', 'date', 'datetime'))) {
-            	$arrayofyaxis['t.'.$key.'-year'] = array('label' => $langs->trans($val['label']).' ('.$YYYY.')', 'position' => $val['position']);
-                $arrayofyaxis['t.'.$key.'-month'] = array('label' => $langs->trans($val['label']).' ('.$YYYY.'-'.$MM.')', 'position' => $val['position']);
-                $arrayofyaxis['t.'.$key.'-day'] = array('label' => $langs->trans($val['label']).' ('.$YYYY.'-'.$MM.'-'.$DD.')', 'position' => $val['position']);
-            } else {
-                $arrayofyaxis['t.'.$key] = array('label' => $val['label'], 'position' => (int) $val['position']);
-            }
-        }
-        // Add measure from extrafields
-        if ($object->isextrafieldmanaged) {
-            foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
-            	if (!empty($extrafields->attributes[$object->table_element]['totalizable'][$key]) && (!isset($extrafields->attributes[$object->table_element]['enabled'][$key]) || dol_eval($extrafields->attributes[$object->table_element]['enabled'][$key], 1))) {
+	foreach ($object->fields as $key => $val) {
+		if (empty($val['measure']) && (!isset($val['enabled']) || dol_eval($val['enabled'], 1))) {
+			if (in_array($key, array('id', 'rowid', 'entity', 'last_main_doc', 'extraparams'))) continue;
+			if (preg_match('/^fk_/', $key)) continue;
+			if (in_array($val['type'], array('html', 'text'))) continue;
+			if (in_array($val['type'], array('timestamp', 'date', 'datetime'))) {
+				$arrayofyaxis['t.'.$key.'-year'] = array('label' => $langs->trans($val['label']).' ('.$YYYY.')', 'position' => $val['position']);
+				$arrayofyaxis['t.'.$key.'-month'] = array('label' => $langs->trans($val['label']).' ('.$YYYY.'-'.$MM.')', 'position' => $val['position']);
+				$arrayofyaxis['t.'.$key.'-day'] = array('label' => $langs->trans($val['label']).' ('.$YYYY.'-'.$MM.'-'.$DD.')', 'position' => $val['position']);
+			} else {
+				$arrayofyaxis['t.'.$key] = array('label' => $val['label'], 'position' => (int) $val['position']);
+			}
+		}
+		// Add measure from extrafields
+		if ($object->isextrafieldmanaged) {
+			foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
+				if (!empty($extrafields->attributes[$object->table_element]['totalizable'][$key]) && (!isset($extrafields->attributes[$object->table_element]['enabled'][$key]) || dol_eval($extrafields->attributes[$object->table_element]['enabled'][$key], 1))) {
 					$arrayofyaxis['te.'.$key] = array('label' => $extrafields->attributes[$object->table_element]['label'][$key], 'position' => (int) $extrafields->attributes[$object->table_element]['pos'][$key]);
-                }
-            }
-        }
-    }
-    $arrayofyaxis = dol_sort_array($arrayofyaxis, 'position');
-    $arrayofyaxislabel = array();
-    foreach ($arrayofyaxis as $key => $val) {
-        $arrayofyaxislabel[$key] = $val['label'];
-    }
-    print '<div class="inline-block opacitymedium"><span class="fas fa-ruler-vertical paddingright" title="'.$langs->trans("YAxis").'"></span>'.$langs->trans("YAxis").'</div> ';
-    print $form->multiselectarray('search_yaxis', $arrayofyaxislabel, $search_yaxis, 0, 0, 'minwidth100', 1);
-    print '</div>';
+				}
+			}
+		}
+	}
+	$arrayofyaxis = dol_sort_array($arrayofyaxis, 'position');
+	$arrayofyaxislabel = array();
+	foreach ($arrayofyaxis as $key => $val) {
+		$arrayofyaxislabel[$key] = $val['label'];
+	}
+	print '<div class="inline-block opacitymedium"><span class="fas fa-ruler-vertical paddingright" title="'.$langs->trans("YAxis").'"></span>'.$langs->trans("YAxis").'</div> ';
+	print $form->multiselectarray('search_yaxis', $arrayofyaxislabel, $search_yaxis, 0, 0, 'minwidth100', 1);
+	print '</div>';
 }
 
 if ($mode == 'graph') {
-    print '<div class="divadvancedsearchfield">';
-    $arrayofgraphs = array('bars' => 'Bars', 'lines' => 'Lines'); // also 'pies'
-    print '<div class="inline-block opacitymedium"><span class="fas fa-chart-area paddingright" title="'.$langs->trans("Graph").'"></span>'.$langs->trans("Graph").'</div> ';
-    print $form->selectarray('search_graph', $arrayofgraphs, $search_graph, 0, 0, 0, 'minwidth100', 1);
-    print '</div>';
+	print '<div class="divadvancedsearchfield">';
+	$arrayofgraphs = array('bars' => 'Bars', 'lines' => 'Lines'); // also 'pies'
+	print '<div class="inline-block opacitymedium"><span class="fas fa-chart-area paddingright" title="'.$langs->trans("Graph").'"></span>'.$langs->trans("Graph").'</div> ';
+	print $form->selectarray('search_graph', $arrayofgraphs, $search_graph, 0, 0, 0, 'minwidth100', 1);
+	print '</div>';
 }
 print '<div class="divadvancedsearchfield">';
 print '<input type="submit" class="button buttongen" value="'.$langs->trans("Refresh").'">';
@@ -447,129 +447,129 @@ print '</form>';
 $sql = '';
 if (!empty($search_measures) && !empty($search_xaxis))
 {
-    $fieldid = 'rowid';
+	$fieldid = 'rowid';
 
-    $sql = 'SELECT ';
-    foreach ($search_xaxis as $key => $val) {
-        if (preg_match('/\-year$/', $val)) {
-            $tmpval = preg_replace('/\-year$/', '', $val);
-            $sql .= 'DATE_FORMAT('.$tmpval.", '%Y') as x_".$key.', ';
-        } elseif (preg_match('/\-month$/', $val)) {
-            $tmpval = preg_replace('/\-month$/', '', $val);
-            $sql .= 'DATE_FORMAT('.$tmpval.", '%Y-%m') as x_".$key.', ';
-        } elseif (preg_match('/\-day$/', $val)) {
-            $tmpval = preg_replace('/\-day$/', '', $val);
-            $sql .= 'DATE_FORMAT('.$tmpval.", '%Y-%m-%d') as x_".$key.', ';
-        } else $sql .= $val.' as x_'.$key.', ';
-    }
-    foreach ($search_groupby as $key => $val) {
-    	if (preg_match('/\-year$/', $val)) {
-    		$tmpval = preg_replace('/\-year$/', '', $val);
-    		$sql .= 'DATE_FORMAT('.$tmpval.", '%Y') as g_".$key.', ';
-    	} elseif (preg_match('/\-month$/', $val)) {
-    		$tmpval = preg_replace('/\-month$/', '', $val);
-    		$sql .= 'DATE_FORMAT('.$tmpval.", '%Y-%m') as g_".$key.', ';
-    	} elseif (preg_match('/\-day$/', $val)) {
-    		$tmpval = preg_replace('/\-day$/', '', $val);
-    		$sql .= 'DATE_FORMAT('.$tmpval.", '%Y-%m-%d') as g_".$key.', ';
-    	} else $sql .= $val.' as g_'.$key.', ';
-    }
-    foreach ($search_measures as $key => $val) {
-        if ($val == 't.count') $sql .= 'COUNT(t.'.$fieldid.') as y_'.$key.', ';
-        elseif (preg_match('/\-sum$/', $val)) {
-            $tmpval = preg_replace('/\-sum$/', '', $val);
-            $sql .= 'SUM('.$db->ifsql($tmpval.' IS NULL', '0', $tmpval).') as y_'.$key.', ';
-        } elseif (preg_match('/\-average$/', $val)) {
-            $tmpval = preg_replace('/\-average$/', '', $val);
-            $sql .= 'AVG('.$db->ifsql($tmpval.' IS NULL', '0', $tmpval).') as y_'.$key.', ';
-        } elseif (preg_match('/\-min$/', $val)) {
-        	$tmpval  = preg_replace('/\-min$/', '', $val);
-        	$sql .= 'MIN('.$db->ifsql($tmpval.' IS NULL', '0', $tmpval).') as y_'.$key.', ';
-        } elseif (preg_match('/\-max$/', $val)) {
-        	$tmpval = preg_replace('/\-max$/', '', $val);
-        	$sql .= 'MAX('.$db->ifsql($tmpval.' IS NULL', '0', $tmpval).') as y_'.$key.', ';
-        }
-    }
-    $sql = preg_replace('/,\s*$/', '', $sql);
-    $sql .= ' FROM '.MAIN_DB_PREFIX.$object->table_element.' as t';
-    // Add measure from extrafields
-    if ($object->isextrafieldmanaged) {
-        $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.$object->table_element.'_extrafields as te ON te.fk_object = t.'.$fieldid;
-    }
-    if ($object->ismultientitymanaged) {
-    	if ($object->ismultientitymanaged == 1) {
-    		// Nothing here
-    	} else {
-    		$tmparray = explode('@', $object->ismultientitymanaged);
-    		$sql .= ' INNER JOIN '.MAIN_DB_PREFIX.$tmparray[1].' as parenttable ON t.'.$tmparray[0].' = parenttable.rowid';
-    		$sql .= ' AND parenttable.entity IN ('.getEntity($tmparray[1]).')';
-    	}
-    }
-    $sql .= ' WHERE 1 = 1';
-    if ($object->ismultientitymanaged == 1) {
+	$sql = 'SELECT ';
+	foreach ($search_xaxis as $key => $val) {
+		if (preg_match('/\-year$/', $val)) {
+			$tmpval = preg_replace('/\-year$/', '', $val);
+			$sql .= 'DATE_FORMAT('.$tmpval.", '%Y') as x_".$key.', ';
+		} elseif (preg_match('/\-month$/', $val)) {
+			$tmpval = preg_replace('/\-month$/', '', $val);
+			$sql .= 'DATE_FORMAT('.$tmpval.", '%Y-%m') as x_".$key.', ';
+		} elseif (preg_match('/\-day$/', $val)) {
+			$tmpval = preg_replace('/\-day$/', '', $val);
+			$sql .= 'DATE_FORMAT('.$tmpval.", '%Y-%m-%d') as x_".$key.', ';
+		} else $sql .= $val.' as x_'.$key.', ';
+	}
+	foreach ($search_groupby as $key => $val) {
+		if (preg_match('/\-year$/', $val)) {
+			$tmpval = preg_replace('/\-year$/', '', $val);
+			$sql .= 'DATE_FORMAT('.$tmpval.", '%Y') as g_".$key.', ';
+		} elseif (preg_match('/\-month$/', $val)) {
+			$tmpval = preg_replace('/\-month$/', '', $val);
+			$sql .= 'DATE_FORMAT('.$tmpval.", '%Y-%m') as g_".$key.', ';
+		} elseif (preg_match('/\-day$/', $val)) {
+			$tmpval = preg_replace('/\-day$/', '', $val);
+			$sql .= 'DATE_FORMAT('.$tmpval.", '%Y-%m-%d') as g_".$key.', ';
+		} else $sql .= $val.' as g_'.$key.', ';
+	}
+	foreach ($search_measures as $key => $val) {
+		if ($val == 't.count') $sql .= 'COUNT(t.'.$fieldid.') as y_'.$key.', ';
+		elseif (preg_match('/\-sum$/', $val)) {
+			$tmpval = preg_replace('/\-sum$/', '', $val);
+			$sql .= 'SUM('.$db->ifsql($tmpval.' IS NULL', '0', $tmpval).') as y_'.$key.', ';
+		} elseif (preg_match('/\-average$/', $val)) {
+			$tmpval = preg_replace('/\-average$/', '', $val);
+			$sql .= 'AVG('.$db->ifsql($tmpval.' IS NULL', '0', $tmpval).') as y_'.$key.', ';
+		} elseif (preg_match('/\-min$/', $val)) {
+			$tmpval = preg_replace('/\-min$/', '', $val);
+			$sql .= 'MIN('.$db->ifsql($tmpval.' IS NULL', '0', $tmpval).') as y_'.$key.', ';
+		} elseif (preg_match('/\-max$/', $val)) {
+			$tmpval = preg_replace('/\-max$/', '', $val);
+			$sql .= 'MAX('.$db->ifsql($tmpval.' IS NULL', '0', $tmpval).') as y_'.$key.', ';
+		}
+	}
+	$sql = preg_replace('/,\s*$/', '', $sql);
+	$sql .= ' FROM '.MAIN_DB_PREFIX.$object->table_element.' as t';
+	// Add measure from extrafields
+	if ($object->isextrafieldmanaged) {
+		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.$object->table_element.'_extrafields as te ON te.fk_object = t.'.$fieldid;
+	}
+	if ($object->ismultientitymanaged) {
+		if ($object->ismultientitymanaged == 1) {
+			// Nothing here
+		} else {
+			$tmparray = explode('@', $object->ismultientitymanaged);
+			$sql .= ' INNER JOIN '.MAIN_DB_PREFIX.$tmparray[1].' as parenttable ON t.'.$tmparray[0].' = parenttable.rowid';
+			$sql .= ' AND parenttable.entity IN ('.getEntity($tmparray[1]).')';
+		}
+	}
+	$sql .= ' WHERE 1 = 1';
+	if ($object->ismultientitymanaged == 1) {
    		$sql .= ' AND entity IN ('.getEntity($object->element).')';
-    }
-    foreach ($search_filters as $key => $val) {
-    	// TODO Add the where here
-    }
-    $sql .= ' GROUP BY ';
-    foreach ($search_xaxis as $key => $val) {
-        if (preg_match('/\-year$/', $val)) {
-            $tmpval = preg_replace('/\-year$/', '', $val);
-            $sql .= 'DATE_FORMAT('.$tmpval.", '%Y'), ";
-        } elseif (preg_match('/\-month$/', $val)) {
-            $tmpval = preg_replace('/\-month$/', '', $val);
-            $sql .= 'DATE_FORMAT('.$tmpval.", '%Y-%m'), ";
-        } elseif (preg_match('/\-day$/', $val)) {
-            $tmpval = preg_replace('/\-day$/', '', $val);
-            $sql .= 'DATE_FORMAT('.$tmpval.", '%Y-%m-%d'), ";
-        } else $sql .= $val.', ';
-    }
-    foreach ($search_groupby as $key => $val) {
-    	if (preg_match('/\-year$/', $val)) {
-    		$tmpval = preg_replace('/\-year$/', '', $val);
-    		$sql .= 'DATE_FORMAT('.$tmpval.", '%Y'), ";
-    	} elseif (preg_match('/\-month$/', $val)) {
-    		$tmpval = preg_replace('/\-month$/', '', $val);
-    		$sql .= 'DATE_FORMAT('.$tmpval.", '%Y-%m'), ";
-    	} elseif (preg_match('/\-day$/', $val)) {
-    		$tmpval = preg_replace('/\-day$/', '', $val);
-    		$sql .= 'DATE_FORMAT('.$tmpval.", '%Y-%m-%d'), ";
-    	} else $sql .= $val.', ';
-    }
-    $sql = preg_replace('/,\s*$/', '', $sql);
-    $sql .= ' ORDER BY ';
-    foreach ($search_xaxis as $key => $val) {
-        if (preg_match('/\-year$/', $val)) {
-            $tmpval = preg_replace('/\-year$/', '', $val);
-            $sql .= 'DATE_FORMAT('.$tmpval.", '%Y'), ";
-        } elseif (preg_match('/\-month$/', $val)) {
-            $tmpval = preg_replace('/\-month$/', '', $val);
-            $sql .= 'DATE_FORMAT('.$tmpval.", '%Y-%m'), ";
-        } elseif (preg_match('/\-day$/', $val)) {
-            $tmpval = preg_replace('/\-day$/', '', $val);
-            $sql .= 'DATE_FORMAT('.$tmpval.", '%Y-%m-%d'), ";
-        } else $sql .= $val.', ';
-    }
-    foreach ($search_groupby as $key => $val) {
-    	if (preg_match('/\-year$/', $val)) {
-    		$tmpval = preg_replace('/\-year$/', '', $val);
-    		$sql .= 'DATE_FORMAT('.$tmpval.", '%Y'), ";
-    	} elseif (preg_match('/\-month$/', $val)) {
-    		$tmpval = preg_replace('/\-month$/', '', $val);
-    		$sql .= 'DATE_FORMAT('.$tmpval.", '%Y-%m'), ";
-    	} elseif (preg_match('/\-day$/', $val)) {
-    		$tmpval = preg_replace('/\-day$/', '', $val);
-    		$sql .= 'DATE_FORMAT('.$tmpval.", '%Y-%m-%d'), ";
-    	} else $sql .= $val.', ';
-    }
-    $sql = preg_replace('/,\s*$/', '', $sql);
+	}
+	foreach ($search_filters as $key => $val) {
+		// TODO Add the where here
+	}
+	$sql .= ' GROUP BY ';
+	foreach ($search_xaxis as $key => $val) {
+		if (preg_match('/\-year$/', $val)) {
+			$tmpval = preg_replace('/\-year$/', '', $val);
+			$sql .= 'DATE_FORMAT('.$tmpval.", '%Y'), ";
+		} elseif (preg_match('/\-month$/', $val)) {
+			$tmpval = preg_replace('/\-month$/', '', $val);
+			$sql .= 'DATE_FORMAT('.$tmpval.", '%Y-%m'), ";
+		} elseif (preg_match('/\-day$/', $val)) {
+			$tmpval = preg_replace('/\-day$/', '', $val);
+			$sql .= 'DATE_FORMAT('.$tmpval.", '%Y-%m-%d'), ";
+		} else $sql .= $val.', ';
+	}
+	foreach ($search_groupby as $key => $val) {
+		if (preg_match('/\-year$/', $val)) {
+			$tmpval = preg_replace('/\-year$/', '', $val);
+			$sql .= 'DATE_FORMAT('.$tmpval.", '%Y'), ";
+		} elseif (preg_match('/\-month$/', $val)) {
+			$tmpval = preg_replace('/\-month$/', '', $val);
+			$sql .= 'DATE_FORMAT('.$tmpval.", '%Y-%m'), ";
+		} elseif (preg_match('/\-day$/', $val)) {
+			$tmpval = preg_replace('/\-day$/', '', $val);
+			$sql .= 'DATE_FORMAT('.$tmpval.", '%Y-%m-%d'), ";
+		} else $sql .= $val.', ';
+	}
+	$sql = preg_replace('/,\s*$/', '', $sql);
+	$sql .= ' ORDER BY ';
+	foreach ($search_xaxis as $key => $val) {
+		if (preg_match('/\-year$/', $val)) {
+			$tmpval = preg_replace('/\-year$/', '', $val);
+			$sql .= 'DATE_FORMAT('.$tmpval.", '%Y'), ";
+		} elseif (preg_match('/\-month$/', $val)) {
+			$tmpval = preg_replace('/\-month$/', '', $val);
+			$sql .= 'DATE_FORMAT('.$tmpval.", '%Y-%m'), ";
+		} elseif (preg_match('/\-day$/', $val)) {
+			$tmpval = preg_replace('/\-day$/', '', $val);
+			$sql .= 'DATE_FORMAT('.$tmpval.", '%Y-%m-%d'), ";
+		} else $sql .= $val.', ';
+	}
+	foreach ($search_groupby as $key => $val) {
+		if (preg_match('/\-year$/', $val)) {
+			$tmpval = preg_replace('/\-year$/', '', $val);
+			$sql .= 'DATE_FORMAT('.$tmpval.", '%Y'), ";
+		} elseif (preg_match('/\-month$/', $val)) {
+			$tmpval = preg_replace('/\-month$/', '', $val);
+			$sql .= 'DATE_FORMAT('.$tmpval.", '%Y-%m'), ";
+		} elseif (preg_match('/\-day$/', $val)) {
+			$tmpval = preg_replace('/\-day$/', '', $val);
+			$sql .= 'DATE_FORMAT('.$tmpval.", '%Y-%m-%d'), ";
+		} else $sql .= $val.', ';
+	}
+	$sql = preg_replace('/,\s*$/', '', $sql);
 }
 //print $sql;
 
 $legend = array();
 foreach ($search_measures as $key => $val) {
-    $legend[] = $langs->trans($arrayofmesures[$val]);
+	$legend[] = $langs->trans($arrayofmesures[$val]);
 }
 
 $useagroupby = (is_array($search_groupby) && count($search_groupby));
@@ -580,33 +580,33 @@ $useagroupby = (is_array($search_groupby) && count($search_groupby));
 $totalnbofrecord = 0;
 $data = array();
 if ($sql) {
-    $resql = $db->query($sql);
-    if (!$resql) {
-        dol_print_error($db);
-    }
+	$resql = $db->query($sql);
+	if (!$resql) {
+		dol_print_error($db);
+	}
 
-    $ifetch = 0; $xi = 0; $oldlabeltouse = '';
-    while ($obj = $db->fetch_object($resql)) {
-    	$ifetch++;
-    	if ($useagroupby) {
-    		$xval = $search_xaxis[0];
-    		$fieldforxkey = 'x_0';
-    		$xlabel = $obj->$fieldforxkey;
-    		$xvalwithoutprefix = preg_replace('/^[a-z]+\./', '', $xval);
+	$ifetch = 0; $xi = 0; $oldlabeltouse = '';
+	while ($obj = $db->fetch_object($resql)) {
+		$ifetch++;
+		if ($useagroupby) {
+			$xval = $search_xaxis[0];
+			$fieldforxkey = 'x_0';
+			$xlabel = $obj->$fieldforxkey;
+			$xvalwithoutprefix = preg_replace('/^[a-z]+\./', '', $xval);
 
-    		// Define $xlabel
-    		if (!empty($object->fields[$xvalwithoutprefix]['arrayofkeyval'])) {
-    			$xlabel = $object->fields[$xvalwithoutprefix]['arrayofkeyval'][$obj->$fieldforxkey];
-    		}
-    		$labeltouse = (($xlabel || $xlabel == '0') ? dol_trunc($xlabel, 20, 'middle') : ($xlabel === '' ? $langs->trans("Empty") : $langs->trans("NotDefined")));
+			// Define $xlabel
+			if (!empty($object->fields[$xvalwithoutprefix]['arrayofkeyval'])) {
+				$xlabel = $object->fields[$xvalwithoutprefix]['arrayofkeyval'][$obj->$fieldforxkey];
+			}
+			$labeltouse = (($xlabel || $xlabel == '0') ? dol_trunc($xlabel, 20, 'middle') : ($xlabel === '' ? $langs->trans("Empty") : $langs->trans("NotDefined")));
 
-    		if ($oldlabeltouse && ($labeltouse != $oldlabeltouse)) {
-    			$xi++; // Increase $xi
-    		}
-    		//var_dump($labeltouse.' '.$oldlabeltouse.' '.$xi);
-    		$oldlabeltouse = $labeltouse;
+			if ($oldlabeltouse && ($labeltouse != $oldlabeltouse)) {
+				$xi++; // Increase $xi
+			}
+			//var_dump($labeltouse.' '.$oldlabeltouse.' '.$xi);
+			$oldlabeltouse = $labeltouse;
 
-    		/* Example of value for $arrayofvaluesforgroupby
+			/* Example of value for $arrayofvaluesforgroupby
     		 * array (size=1)
 			 *	  'g_0' =>
 			 *	    array (size=6)
@@ -617,80 +617,80 @@ if ($sql) {
 			 *	      'processing' => string 'processing' (length=10)
 			 *	      'undeployed' => string 'undeployed' (length=10)
     		 */
-    		foreach ($search_measures as $key => $val) {
-    			$gi = 0;
-    			foreach ($search_groupby as $gkey) {
-    				//var_dump('*** Fetch #'.$ifetch.' for labeltouse='.$labeltouse.' measure number '.$key.' and group g_'.$gi);
-    				//var_dump($arrayofvaluesforgroupby);
-    				foreach ($arrayofvaluesforgroupby['g_'.$gi] as $gvaluepossiblekey => $gvaluepossiblelabel) {
-    					$ykeysuffix = $gvaluepossiblelabel;
-    					$gvalwithoutprefix = preg_replace('/^[a-z]+\./', '', $gval);
+			foreach ($search_measures as $key => $val) {
+				$gi = 0;
+				foreach ($search_groupby as $gkey) {
+					//var_dump('*** Fetch #'.$ifetch.' for labeltouse='.$labeltouse.' measure number '.$key.' and group g_'.$gi);
+					//var_dump($arrayofvaluesforgroupby);
+					foreach ($arrayofvaluesforgroupby['g_'.$gi] as $gvaluepossiblekey => $gvaluepossiblelabel) {
+						$ykeysuffix = $gvaluepossiblelabel;
+						$gvalwithoutprefix = preg_replace('/^[a-z]+\./', '', $gval);
 
-    					$fieldfory = 'y_'.$key;
-    					$fieldforg = 'g_'.$gi;
-    					$fieldforybis = 'y_'.$key.'_'.$ykeysuffix;
-    					//var_dump('gvaluepossiblekey='.$gvaluepossiblekey.' gvaluepossiblelabel='.$gvaluepossiblelabel.' ykeysuffix='.$ykeysuffix.' gval='.$gval.' gvalwithoutsuffix='.$gvalwithoutprefix);
-    					//var_dump('fieldforg='.$fieldforg.' obj->$fieldforg='.$obj->$fieldforg.' fieldfory='.$fieldfory.' obj->$fieldfory='.$obj->$fieldfory.' fieldforybis='.$fieldforybis);
+						$fieldfory = 'y_'.$key;
+						$fieldforg = 'g_'.$gi;
+						$fieldforybis = 'y_'.$key.'_'.$ykeysuffix;
+						//var_dump('gvaluepossiblekey='.$gvaluepossiblekey.' gvaluepossiblelabel='.$gvaluepossiblelabel.' ykeysuffix='.$ykeysuffix.' gval='.$gval.' gvalwithoutsuffix='.$gvalwithoutprefix);
+						//var_dump('fieldforg='.$fieldforg.' obj->$fieldforg='.$obj->$fieldforg.' fieldfory='.$fieldfory.' obj->$fieldfory='.$obj->$fieldfory.' fieldforybis='.$fieldforybis);
 
-    					if (!is_array($data[$xi])) $data[$xi] = array();
+						if (!is_array($data[$xi])) $data[$xi] = array();
 
 						if (!array_key_exists('label', $data[$xi])) {
-    						$data[$xi] = array();
-    						$data[$xi]['label'] = $labeltouse;
-    					}
+							$data[$xi] = array();
+							$data[$xi]['label'] = $labeltouse;
+						}
 
-    					$objfieldforg = $obj->$fieldforg;
-    					if (is_null($objfieldforg)) $objfieldforg = '__NULL__';
+						$objfieldforg = $obj->$fieldforg;
+						if (is_null($objfieldforg)) $objfieldforg = '__NULL__';
 
-    					if ($gvaluepossiblekey == '0') {	// $gvaluepossiblekey can have type int or string. So we create a special if, used when value is '0'
-    						//var_dump($objfieldforg.' == \'0\' -> '.($objfieldforg == '0'));
-    						if ($objfieldforg == '0') {
-    							// The record we fetch is for this group
-    							$data[$xi][$fieldforybis] = $obj->$fieldfory;
-    						}
-    						// The record we fetch is not for this group
-    						elseif (!isset($data[$xi][$fieldforybis])) {
-    							$data[$xi][$fieldforybis] = '0';
-    						}
-    					} else {
-    						//var_dump((string) $objfieldforg.' === '.(string) $gvaluepossiblekey.' -> '.((string) $objfieldforg === (string) $gvaluepossiblekey));
-    						if ((string) $objfieldforg === (string) $gvaluepossiblekey) {
-    							// The record we fetch is for this group
-    							$data[$xi][$fieldforybis] = $obj->$fieldfory;
-    						}
-    						// The record we fetch is not for this group
-    						elseif (!isset($data[$xi][$fieldforybis])) {
-    							$data[$xi][$fieldforybis] = '0';
-    						}
-    					}
-    				}
-    				//var_dump($data[$xi]);
-    				$gi++;
-    			}
-    		}
-    	} else {	// No group by
-    		$xval = $search_xaxis[0];
-    		$fieldforxkey = 'x_0';
-    		$xlabel = $obj->$fieldforxkey;
-    		$xvalwithoutprefix = preg_replace('/^[a-z]+\./', '', $xval);
+						if ($gvaluepossiblekey == '0') {	// $gvaluepossiblekey can have type int or string. So we create a special if, used when value is '0'
+							//var_dump($objfieldforg.' == \'0\' -> '.($objfieldforg == '0'));
+							if ($objfieldforg == '0') {
+								// The record we fetch is for this group
+								$data[$xi][$fieldforybis] = $obj->$fieldfory;
+							}
+							// The record we fetch is not for this group
+							elseif (!isset($data[$xi][$fieldforybis])) {
+								$data[$xi][$fieldforybis] = '0';
+							}
+						} else {
+							//var_dump((string) $objfieldforg.' === '.(string) $gvaluepossiblekey.' -> '.((string) $objfieldforg === (string) $gvaluepossiblekey));
+							if ((string) $objfieldforg === (string) $gvaluepossiblekey) {
+								// The record we fetch is for this group
+								$data[$xi][$fieldforybis] = $obj->$fieldfory;
+							}
+							// The record we fetch is not for this group
+							elseif (!isset($data[$xi][$fieldforybis])) {
+								$data[$xi][$fieldforybis] = '0';
+							}
+						}
+					}
+					//var_dump($data[$xi]);
+					$gi++;
+				}
+			}
+		} else {	// No group by
+			$xval = $search_xaxis[0];
+			$fieldforxkey = 'x_0';
+			$xlabel = $obj->$fieldforxkey;
+			$xvalwithoutprefix = preg_replace('/^[a-z]+\./', '', $xval);
 
-    		// Define $xlabel
-    		if (!empty($object->fields[$xvalwithoutprefix]['arrayofkeyval'])) {
-    			$xlabel = $object->fields[$xvalwithoutprefix]['arrayofkeyval'][$obj->$fieldforxkey];
-    		}
+			// Define $xlabel
+			if (!empty($object->fields[$xvalwithoutprefix]['arrayofkeyval'])) {
+				$xlabel = $object->fields[$xvalwithoutprefix]['arrayofkeyval'][$obj->$fieldforxkey];
+			}
 
-    		$labeltouse = (($xlabel || $xlabel == '0') ? dol_trunc($xlabel, 20, 'middle') : ($xlabel === '' ? $langs->trans("Empty") : $langs->trans("NotDefined")));
-    		$xarrayforallseries = array('label' => $labeltouse);
-    		foreach ($search_measures as $key => $val) {
-    			$fieldfory = 'y_'.$key;
-    			$xarrayforallseries[$fieldfory] = $obj->$fieldfory;
-    		}
-    		$data[$xi] = $xarrayforallseries;
-    		$xi++;
-    	}
-    }
+			$labeltouse = (($xlabel || $xlabel == '0') ? dol_trunc($xlabel, 20, 'middle') : ($xlabel === '' ? $langs->trans("Empty") : $langs->trans("NotDefined")));
+			$xarrayforallseries = array('label' => $labeltouse);
+			foreach ($search_measures as $key => $val) {
+				$fieldfory = 'y_'.$key;
+				$xarrayforallseries[$fieldfory] = $obj->$fieldfory;
+			}
+			$data[$xi] = $xarrayforallseries;
+			$xi++;
+		}
+	}
 
-    $totalnbofrecord = count($data);
+	$totalnbofrecord = count($data);
 }
 //var_dump($data);
 
@@ -703,62 +703,62 @@ if ($mode == 'grid') {
 }
 
 if ($mode == 'graph') {
-    $WIDTH = '80%';
-    $HEIGHT = 200;
+	$WIDTH = '80%';
+	$HEIGHT = 200;
 
-    // Show graph
-    $px1 = new DolGraph();
-    $mesg = $px1->isGraphKo();
-    if (!$mesg)
-    {
-    	/*var_dump($legend);
+	// Show graph
+	$px1 = new DolGraph();
+	$mesg = $px1->isGraphKo();
+	if (!$mesg)
+	{
+		/*var_dump($legend);
     	var_dump($data);*/
-    	$px1->SetData($data);
-    	unset($data);
+		$px1->SetData($data);
+		unset($data);
 
-    	$arrayoftypes = array();
-    	foreach ($search_measures as $key => $val) {
-    	    $arrayoftypes[] = $search_graph;
-    	}
+		$arrayoftypes = array();
+		foreach ($search_measures as $key => $val) {
+			$arrayoftypes[] = $search_graph;
+		}
 
-    	$px1->SetLegend($legend);
-    	$px1->SetMinValue($px1->GetFloorMinValue());
-    	$px1->SetMaxValue($px1->GetCeilMaxValue());
-    	$px1->SetWidth($WIDTH);
-    	$px1->SetHeight($HEIGHT);
-    	$px1->SetYLabel($langs->trans("Y"));
-    	$px1->SetShading(3);
-    	$px1->SetHorizTickIncrement(1);
-    	$px1->SetCssPrefix("cssboxes");
-    	$px1->SetType($arrayoftypes);
-    	$px1->mode = 'depth';
-    	$px1->SetTitle('');
+		$px1->SetLegend($legend);
+		$px1->SetMinValue($px1->GetFloorMinValue());
+		$px1->SetMaxValue($px1->GetCeilMaxValue());
+		$px1->SetWidth($WIDTH);
+		$px1->SetHeight($HEIGHT);
+		$px1->SetYLabel($langs->trans("Y"));
+		$px1->SetShading(3);
+		$px1->SetHorizTickIncrement(1);
+		$px1->SetCssPrefix("cssboxes");
+		$px1->SetType($arrayoftypes);
+		$px1->mode = 'depth';
+		$px1->SetTitle('');
 
-    	$dir = $conf->user->dir_temp;
-    	dol_mkdir($dir);
-    	$filenamenb = $dir.'/customreport_'.$object->element.'.png';
-    	$fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=user&file=customreport_'.$object->element.'.png';
+		$dir = $conf->user->dir_temp;
+		dol_mkdir($dir);
+		$filenamenb = $dir.'/customreport_'.$object->element.'.png';
+		$fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=user&file=customreport_'.$object->element.'.png';
 
-    	$px1->draw($filenamenb, $fileurlnb);
+		$px1->draw($filenamenb, $fileurlnb);
 
-    	$texttoshow = $langs->trans("NoRecordFound");
-    	if (!GETPOSTISSET('search_measures') || !GETPOSTISSET('search_xaxis')) {
-    		$texttoshow = $langs->trans("SelectYourGraphOptionsFirst");
-    	}
+		$texttoshow = $langs->trans("NoRecordFound");
+		if (!GETPOSTISSET('search_measures') || !GETPOSTISSET('search_xaxis')) {
+			$texttoshow = $langs->trans("SelectYourGraphOptionsFirst");
+		}
 
-    	print $px1->show($totalnbofrecord ? 0 : $texttoshow);
-    }
+		print $px1->show($totalnbofrecord ? 0 : $texttoshow);
+	}
 }
 
 if ($sql) {
-    // Show admin info
-    print '<br>'.info_admin($langs->trans("SQLUsedForExport").':<br> '.$sql, 0, 0, 1, '', 'TechnicalInformation');
+	// Show admin info
+	print '<br>'.info_admin($langs->trans("SQLUsedForExport").':<br> '.$sql, 0, 0, 1, '', 'TechnicalInformation');
 }
 
 print '<div>';
 
 if (!defined('USE_CUSTOME_REPORT_AS_INCLUDE')) {
-	dol_fiche_end();
+	print dol_get_fiche_end();
 }
 
 // End of page
diff --git a/htdocs/core/db/DoliDB.class.php b/htdocs/core/db/DoliDB.class.php
index 8af9f7bbc25..48bcbab6f3e 100644
--- a/htdocs/core/db/DoliDB.class.php
+++ b/htdocs/core/db/DoliDB.class.php
@@ -75,7 +75,7 @@ abstract class DoliDB implements Database
 	 *	@param	string	$resko          resultat si test non egal
 	 *	@return	string          		SQL string
 	 */
-    public function ifsql($test, $resok, $resko)
+	public function ifsql($test, $resok, $resko)
 	{
 		return 'IF('.$test.','.$resok.','.$resko.')';
 	}
@@ -87,7 +87,7 @@ abstract class DoliDB implements Database
 	 *   @param	    int		$param      	Date TMS to convert
 	 *   @return	string      			Date in a string YYYY-MM-DD HH:MM:SS
 	 */
-    public function idate($param)
+	public function idate($param)
 	{
 		// TODO GMT $param should be gmt, so we should add tzouptut to 'gmt'
 		return dol_print_date($param, "%Y-%m-%d %H:%M:%S", 'tzserver');
@@ -98,7 +98,7 @@ abstract class DoliDB implements Database
 	 *
 	 *	@return	    string	lasterrno
 	 */
-    public function lasterrno()
+	public function lasterrno()
 	{
 		return $this->lasterrno;
 	}
@@ -124,7 +124,7 @@ abstract class DoliDB implements Database
 	 *
 	 * @return	    int         1 if transaction successfuly opened or already opened, 0 if error
 	 */
-    public function begin()
+	public function begin()
 	{
 		if (!$this->transaction_opened)
 		{
@@ -149,7 +149,7 @@ abstract class DoliDB implements Database
 	 * @param	string	$log		Add more log to default log line
 	 * @return	int         		1 if validation is OK or transaction level no started, 0 if ERROR
 	 */
-    public function commit($log = '')
+	public function commit($log = '')
 	{
 		dol_syslog('', 0, -1);
 		if ($this->transaction_opened <= 1)
@@ -175,7 +175,7 @@ abstract class DoliDB implements Database
 	 * 	@param	string			$log		Add more log to default log line
 	 * 	@return	resource|int         		1 if cancelation is ok or transaction not open, 0 if error
 	 */
-    public function rollback($log = '')
+	public function rollback($log = '')
 	{
 		dol_syslog('', 0, -1);
 		if ($this->transaction_opened <= 1)
@@ -197,7 +197,7 @@ abstract class DoliDB implements Database
 	 *	@param	int		$offset     Numero of line from where starting fetch
 	 *	@return	string      		String with SQL syntax to add a limit and offset
 	 */
-    public function plimit($limit = 0, $offset = 0)
+	public function plimit($limit = 0, $offset = 0)
 	{
 		global $conf;
 		if (empty($limit)) return "";
@@ -211,7 +211,7 @@ abstract class DoliDB implements Database
 	 *
 	 *	@return	        array  		Version array
 	 */
-    public function getVersionArray()
+	public function getVersionArray()
 	{
 		return preg_split("/[\.,-]/", $this->getVersion());
 	}
@@ -221,7 +221,7 @@ abstract class DoliDB implements Database
 	 *
 	 *	@return	string					Last query
 	 */
-    public function lastquery()
+	public function lastquery()
 	{
 		return $this->lastquery;
 	}
@@ -233,28 +233,32 @@ abstract class DoliDB implements Database
 	 * @param	string		$sortorder		Sort order, separated by comma. Example: 'ASC,DESC';
 	 * @return	string						String to provide syntax of a sort sql string
 	 */
-    public function order($sortfield = null, $sortorder = null)
+	public function order($sortfield = null, $sortorder = null)
 	{
 		if (!empty($sortfield))
 		{
+			$oldsortorder = '';
 			$return = '';
 			$fields = explode(',', $sortfield);
 			$orders = explode(',', $sortorder);
 			$i = 0;
-			foreach ($fields as $val)
-			{
+			foreach ($fields as $val) {
 				if (!$return) $return .= ' ORDER BY ';
 				else $return .= ', ';
 
-				$return .= preg_replace('/[^0-9a-z_\.]/i', '', $val);
+				$return .= preg_replace('/[^0-9a-z_\.]/i', '', $val); // Add field
 
-				$tmpsortorder = trim($orders[$i]);
+				$tmpsortorder = (empty($orders[$i]) ? '' : trim($orders[$i]));
 
 				// Only ASC and DESC values are valid SQL
 				if (strtoupper($tmpsortorder) === 'ASC') {
+					$oldsortorder = 'ASC';
 					$return .= ' ASC';
 				} elseif (strtoupper($tmpsortorder) === 'DESC') {
+					$oldsortorder = 'DESC';
 					$return .= ' DESC';
+				} else {
+					$return .= ' '.($oldsortorder ? $oldsortorder : 'ASC');
 				}
 
 				$i++;
@@ -270,7 +274,7 @@ abstract class DoliDB implements Database
 	 *
 	 *	@return	    string		Last error
 	 */
-    public function lasterror()
+	public function lasterror()
 	{
 		return $this->lasterror;
 	}
@@ -284,7 +288,7 @@ abstract class DoliDB implements Database
 	 *	@param	bool				$gm			1=Input informations are GMT values, otherwise local to server TZ
 	 *	@return	int|string						Date TMS or ''
 	 */
-    public function jdate($string, $gm = false)
+	public function jdate($string, $gm = false)
 	{
 		// TODO GMT must set param gm to true by default
 		if ($string == 0 || $string == "0000-00-00 00:00:00") return '';
@@ -299,7 +303,7 @@ abstract class DoliDB implements Database
 	 *
 	 *	@return	    string	lastqueryerror
 	 */
-    public function lastqueryerror()
+	public function lastqueryerror()
 	{
 		return $this->lastqueryerror;
 	}
@@ -337,8 +341,8 @@ abstract class DoliDB implements Database
 		if ($res)
 		{
 			$results = array();
-			if ($this->num_rows($res) > 0){
-				while ($obj = $this->fetch_object($res)){
+			if ($this->num_rows($res) > 0) {
+				while ($obj = $this->fetch_object($res)) {
 					$results[] = $obj;
 				}
 			}
diff --git a/htdocs/core/db/mysqli.class.php b/htdocs/core/db/mysqli.class.php
index e3687f7f405..2c24cfe7461 100644
--- a/htdocs/core/db/mysqli.class.php
+++ b/htdocs/core/db/mysqli.class.php
@@ -34,16 +34,16 @@ class DoliDBMysqli extends DoliDB
 {
 	/** @var mysqli Database object */
 	public $db;
-    //! Database type
-    public $type = 'mysqli';
-    //! Database label
-    const LABEL = 'MySQL or MariaDB';
-    //! Version min database
-    const VERSIONMIN = '5.0.3';
+	//! Database type
+	public $type = 'mysqli';
+	//! Database label
+	const LABEL = 'MySQL or MariaDB';
+	//! Version min database
+	const VERSIONMIN = '5.0.3';
 	/** @var bool|mysqli_result Resultset of last query */
 	private $_results;
 
-    /**
+	/**
 	 *	Constructor.
 	 *	This create an opened connexion to a database server and eventually to a database
 	 *
@@ -53,38 +53,38 @@ class DoliDBMysqli extends DoliDB
 	 *	@param	    string	$pass		Mot de passe
 	 *	@param	    string	$name		Nom de la database
 	 *	@param	    int		$port		Port of database server
-     */
-    public function __construct($type, $host, $user, $pass, $name = '', $port = 0)
-    {
-        global $conf, $langs;
+	 */
+	public function __construct($type, $host, $user, $pass, $name = '', $port = 0)
+	{
+		global $conf, $langs;
 
-        // Note that having "static" property for "$forcecharset" and "$forcecollate" will make error here in strict mode, so they are not static
-        if (!empty($conf->db->character_set)) $this->forcecharset = $conf->db->character_set;
-        if (!empty($conf->db->dolibarr_main_db_collation)) $this->forcecollate = $conf->db->dolibarr_main_db_collation;
+		// Note that having "static" property for "$forcecharset" and "$forcecollate" will make error here in strict mode, so they are not static
+		if (!empty($conf->db->character_set)) $this->forcecharset = $conf->db->character_set;
+		if (!empty($conf->db->dolibarr_main_db_collation)) $this->forcecollate = $conf->db->dolibarr_main_db_collation;
 
-        $this->database_user = $user;
-        $this->database_host = $host;
-        $this->database_port = $port;
+		$this->database_user = $user;
+		$this->database_host = $host;
+		$this->database_port = $port;
 
-        $this->transaction_opened = 0;
+		$this->transaction_opened = 0;
 
-        //print "Name DB: $host,$user,$pass,$name<br>";
+		//print "Name DB: $host,$user,$pass,$name<br>";
 
-        if (!class_exists('mysqli'))
-        {
-            $this->connected = false;
-            $this->ok = false;
-            $this->error = "Mysqli PHP functions for using Mysqli driver are not available in this version of PHP. Try to use another driver.";
-            dol_syslog(get_class($this)."::DoliDBMysqli : Mysqli PHP functions for using Mysqli driver are not available in this version of PHP. Try to use another driver.", LOG_ERR);
-        }
+		if (!class_exists('mysqli'))
+		{
+			$this->connected = false;
+			$this->ok = false;
+			$this->error = "Mysqli PHP functions for using Mysqli driver are not available in this version of PHP. Try to use another driver.";
+			dol_syslog(get_class($this)."::DoliDBMysqli : Mysqli PHP functions for using Mysqli driver are not available in this version of PHP. Try to use another driver.", LOG_ERR);
+		}
 
-        if (!$host)
-        {
-            $this->connected = false;
-            $this->ok = false;
-            $this->error = $langs->trans("ErrorWrongHostParameter");
-            dol_syslog(get_class($this)."::DoliDBMysqli : Connect error, wrong host parameters", LOG_ERR);
-        }
+		if (!$host)
+		{
+			$this->connected = false;
+			$this->ok = false;
+			$this->error = $langs->trans("ErrorWrongHostParameter");
+			dol_syslog(get_class($this)."::DoliDBMysqli : Connect error, wrong host parameters", LOG_ERR);
+		}
 
 		// Try server connection
 		// We do not try to connect to database, only to server. Connect to database is done later in constrcutor
@@ -101,17 +101,17 @@ class DoliDBMysqli extends DoliDB
 		}
 
 		// If server connection is ok, we try to connect to the database
-        if ($this->connected && $name)
-        {
-            if ($this->select_db($name))
-            {
-                $this->database_selected = true;
-                $this->database_name = $name;
-                $this->ok = true;
+		if ($this->connected && $name)
+		{
+			if ($this->select_db($name))
+			{
+				$this->database_selected = true;
+				$this->database_name = $name;
+				$this->ok = true;
 
-                // If client is old latin, we force utf8
-                $clientmustbe = empty($conf->db->dolibarr_main_db_character_set) ? 'utf8' : $conf->db->dolibarr_main_db_character_set;
-                if (preg_match('/latin1/', $clientmustbe)) $clientmustbe = 'utf8';
+				// If client is old latin, we force utf8
+				$clientmustbe = empty($conf->db->dolibarr_main_db_character_set) ? 'utf8' : $conf->db->dolibarr_main_db_character_set;
+				if (preg_match('/latin1/', $clientmustbe)) $clientmustbe = 'utf8';
 
 				if ($this->db->character_set_name() != $clientmustbe) {
 					$this->db->set_charset($clientmustbe); // This set charset, but with a bad collation
@@ -121,63 +121,63 @@ class DoliDBMysqli extends DoliDB
 
 					if (!preg_match('/general/', $collation)) $this->db->query("SET collation_connection = ".$collation);
 				}
-            } else {
-                $this->database_selected = false;
-                $this->database_name = '';
-                $this->ok = false;
-                $this->error = $this->error();
-                dol_syslog(get_class($this)."::DoliDBMysqli : Select_db error ".$this->error, LOG_ERR);
-            }
-        } else {
-            // Pas de selection de base demandee, ok ou ko
-            $this->database_selected = false;
+			} else {
+				$this->database_selected = false;
+				$this->database_name = '';
+				$this->ok = false;
+				$this->error = $this->error();
+				dol_syslog(get_class($this)."::DoliDBMysqli : Select_db error ".$this->error, LOG_ERR);
+			}
+		} else {
+			// Pas de selection de base demandee, ok ou ko
+			$this->database_selected = false;
 
-            if ($this->connected)
-            {
-            	// If client is old latin, we force utf8
-            	$clientmustbe = empty($conf->db->dolibarr_main_db_character_set) ? 'utf8' : $conf->db->dolibarr_main_db_character_set;
-            	if (preg_match('/latin1/', $clientmustbe)) $clientmustbe = 'utf8';
-            	if (preg_match('/utf8mb4/', $clientmustbe)) $clientmustbe = 'utf8';
+			if ($this->connected)
+			{
+				// If client is old latin, we force utf8
+				$clientmustbe = empty($conf->db->dolibarr_main_db_character_set) ? 'utf8' : $conf->db->dolibarr_main_db_character_set;
+				if (preg_match('/latin1/', $clientmustbe)) $clientmustbe = 'utf8';
+				if (preg_match('/utf8mb4/', $clientmustbe)) $clientmustbe = 'utf8';
 
-            	if ($this->db->character_set_name() != $clientmustbe) {
-            		$this->db->set_charset($clientmustbe); // This set utf8_unicode_ci
+				if ($this->db->character_set_name() != $clientmustbe) {
+					$this->db->set_charset($clientmustbe); // This set utf8_unicode_ci
 
-            		$collation = $conf->db->dolibarr_main_db_collation;
-            		if (preg_match('/latin1/', $collation)) $collation = 'utf8_unicode_ci';
-            		if (preg_match('/utf8mb4/', $collation)) $collation = 'utf8_unicode_ci';
+					$collation = $conf->db->dolibarr_main_db_collation;
+					if (preg_match('/latin1/', $collation)) $collation = 'utf8_unicode_ci';
+					if (preg_match('/utf8mb4/', $collation)) $collation = 'utf8_unicode_ci';
 
 					if (!preg_match('/general/', $collation)) $this->db->query("SET collation_connection = ".$collation);
 				}
 			}
-        }
-    }
+		}
+	}
 
 
-    /**
-     *  Convert a SQL request in Mysql syntax to native syntax
-     *
-     *  @param     string	$line   SQL request line to convert
-     *  @param     string	$type	Type of SQL order ('ddl' for insert, update, select, delete or 'dml' for create, alter...)
-     *  @return    string   		SQL request line converted
-     */
-    public static function convertSQLFromMysql($line, $type = 'ddl')
-    {
-        return $line;
-    }
+	/**
+	 *  Convert a SQL request in Mysql syntax to native syntax
+	 *
+	 *  @param     string	$line   SQL request line to convert
+	 *  @param     string	$type	Type of SQL order ('ddl' for insert, update, select, delete or 'dml' for create, alter...)
+	 *  @return    string   		SQL request line converted
+	 */
+	public static function convertSQLFromMysql($line, $type = 'ddl')
+	{
+		return $line;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Select a database
 	 *
 	 *  @param	    string	$database	Name of database
 	 *  @return	    boolean  		    true if OK, false if KO
 	 */
-    public function select_db($database)
-    {
-        // phpcs:enable
-        dol_syslog(get_class($this)."::select_db database=".$database, LOG_DEBUG);
-        return $this->db->select_db($database);
-    }
+	public function select_db($database)
+	{
+		// phpcs:enable
+		dol_syslog(get_class($this)."::select_db database=".$database, LOG_DEBUG);
+		return $this->db->select_db($database);
+	}
 
 
 	/**
@@ -191,385 +191,385 @@ class DoliDBMysqli extends DoliDB
 	 * @return  mysqli  		Database access object
 	 * @see close()
 	 */
-    public function connect($host, $login, $passwd, $name, $port = 0)
-    {
+	public function connect($host, $login, $passwd, $name, $port = 0)
+	{
 		dol_syslog(get_class($this)."::connect host=$host, port=$port, login=$login, passwd=--hidden--, name=$name", LOG_DEBUG);
 
 		// Can also be
 		// mysqli::init(); mysql::options(MYSQLI_INIT_COMMAND, 'SET AUTOCOMMIT = 0'); mysqli::options(MYSQLI_OPT_CONNECT_TIMEOUT, 5);
 		// return mysqli::real_connect($host, $user, $pass, $db, $port);
 		return new mysqli($host, $login, $passwd, $name, $port);
-    }
+	}
 
-    /**
+	/**
 	 *	Return version of database server
 	 *
 	 *	@return	        string      Version string
-     */
-    public function getVersion()
-    {
-        return $this->db->server_info;
-    }
+	 */
+	public function getVersion()
+	{
+		return $this->db->server_info;
+	}
 
-    /**
-     *	Return version of database client driver
-     *
-     *	@return	        string      Version string
-     */
-    public function getDriverInfo()
-    {
-        return $this->db->client_info;
-    }
+	/**
+	 *	Return version of database client driver
+	 *
+	 *	@return	        string      Version string
+	 */
+	public function getDriverInfo()
+	{
+		return $this->db->client_info;
+	}
 
 
-    /**
-     *  Close database connexion
-     *
-     *  @return     bool     True if disconnect successfull, false otherwise
-     *  @see        connect()
-     */
-    public function close()
-    {
-        if ($this->db)
-        {
-	        if ($this->transaction_opened > 0) dol_syslog(get_class($this)."::close Closing a connection with an opened transaction depth=".$this->transaction_opened, LOG_ERR);
-            $this->connected = false;
-            return $this->db->close();
-        }
-        return false;
-    }
+	/**
+	 *  Close database connexion
+	 *
+	 *  @return     bool     True if disconnect successfull, false otherwise
+	 *  @see        connect()
+	 */
+	public function close()
+	{
+		if ($this->db)
+		{
+			if ($this->transaction_opened > 0) dol_syslog(get_class($this)."::close Closing a connection with an opened transaction depth=".$this->transaction_opened, LOG_ERR);
+			$this->connected = false;
+			return $this->db->close();
+		}
+		return false;
+	}
 
-    /**
-     * 	Execute a SQL request and return the resultset
-     *
-     * 	@param	string	$query			SQL query string
-     * 	@param	int		$usesavepoint	0=Default mode, 1=Run a savepoint before and a rollback to savepoint if error (this allow to have some request with errors inside global transactions).
-     * 									Note that with Mysql, this parameter is not used as Myssql can already commit a transaction even if one request is in error, without using savepoints.
-     *  @param  string	$type           Type of SQL order ('ddl' for insert, update, select, delete or 'dml' for create, alter...)
-     *	@return	bool|mysqli_result		Resultset of answer
-     */
-    public function query($query, $usesavepoint = 0, $type = 'auto')
-    {
-    	global $conf;
+	/**
+	 * 	Execute a SQL request and return the resultset
+	 *
+	 * 	@param	string	$query			SQL query string
+	 * 	@param	int		$usesavepoint	0=Default mode, 1=Run a savepoint before and a rollback to savepoint if error (this allow to have some request with errors inside global transactions).
+	 * 									Note that with Mysql, this parameter is not used as Myssql can already commit a transaction even if one request is in error, without using savepoints.
+	 *  @param  string	$type           Type of SQL order ('ddl' for insert, update, select, delete or 'dml' for create, alter...)
+	 *	@return	bool|mysqli_result		Resultset of answer
+	 */
+	public function query($query, $usesavepoint = 0, $type = 'auto')
+	{
+		global $conf;
 
-        $query = trim($query);
+		$query = trim($query);
 
-	    if (!in_array($query, array('BEGIN', 'COMMIT', 'ROLLBACK')))
-	    {
-	    	$SYSLOG_SQL_LIMIT = 10000; // limit log to 10kb per line to limit DOS attacks
-	    	dol_syslog('sql='.substr($query, 0, $SYSLOG_SQL_LIMIT), LOG_DEBUG);
-	    }
-        if (empty($query)) return false; // Return false = error if empty request
+		if (!in_array($query, array('BEGIN', 'COMMIT', 'ROLLBACK')))
+		{
+			$SYSLOG_SQL_LIMIT = 10000; // limit log to 10kb per line to limit DOS attacks
+			dol_syslog('sql='.substr($query, 0, $SYSLOG_SQL_LIMIT), LOG_DEBUG);
+		}
+		if (empty($query)) return false; // Return false = error if empty request
 
-        if (!$this->database_name)
-        {
-            // Ordre SQL ne necessitant pas de connexion a une base (exemple: CREATE DATABASE)
-            $ret = $this->db->query($query);
-        } else {
-            $ret = $this->db->query($query);
-        }
+		if (!$this->database_name)
+		{
+			// Ordre SQL ne necessitant pas de connexion a une base (exemple: CREATE DATABASE)
+			$ret = $this->db->query($query);
+		} else {
+			$ret = $this->db->query($query);
+		}
 
-        if (!preg_match("/^COMMIT/i", $query) && !preg_match("/^ROLLBACK/i", $query))
-        {
-            // Si requete utilisateur, on la sauvegarde ainsi que son resultset
-            if (!$ret)
-            {
-                $this->lastqueryerror = $query;
-                $this->lasterror = $this->error();
-                $this->lasterrno = $this->errno();
+		if (!preg_match("/^COMMIT/i", $query) && !preg_match("/^ROLLBACK/i", $query))
+		{
+			// Si requete utilisateur, on la sauvegarde ainsi que son resultset
+			if (!$ret)
+			{
+				$this->lastqueryerror = $query;
+				$this->lasterror = $this->error();
+				$this->lasterrno = $this->errno();
 
 				if ($conf->global->SYSLOG_LEVEL < LOG_DEBUG) dol_syslog(get_class($this)."::query SQL Error query: ".$query, LOG_ERR); // Log of request was not yet done previously
-                dol_syslog(get_class($this)."::query SQL Error message: ".$this->lasterrno." ".$this->lasterror, LOG_ERR);
-                //var_dump(debug_print_backtrace());
-            }
-            $this->lastquery = $query;
-            $this->_results = $ret;
-        }
+				dol_syslog(get_class($this)."::query SQL Error message: ".$this->lasterrno." ".$this->lasterror, LOG_ERR);
+				//var_dump(debug_print_backtrace());
+			}
+			$this->lastquery = $query;
+			$this->_results = $ret;
+		}
 
-        return $ret;
-    }
+		return $ret;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *	Renvoie la ligne courante (comme un objet) pour le curseur resultset
-     *
-     *	@param	mysqli_result	$resultset	Curseur de la requete voulue
-     *	@return	object|null					Object result line or null if KO or end of cursor
-     */
-    public function fetch_object($resultset)
-    {
-        // phpcs:enable
-        // Si le resultset n'est pas fourni, on prend le dernier utilise sur cette connexion
-        if (!is_object($resultset)) { $resultset = $this->_results; }
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *	Renvoie la ligne courante (comme un objet) pour le curseur resultset
+	 *
+	 *	@param	mysqli_result	$resultset	Curseur de la requete voulue
+	 *	@return	object|null					Object result line or null if KO or end of cursor
+	 */
+	public function fetch_object($resultset)
+	{
+		// phpcs:enable
+		// Si le resultset n'est pas fourni, on prend le dernier utilise sur cette connexion
+		if (!is_object($resultset)) { $resultset = $this->_results; }
 		return $resultset->fetch_object();
-    }
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *	Return datas as an array
-     *
-     *	@param	mysqli_result	$resultset	Resultset of request
-     *	@return	array|null					Array or null if KO or end of cursor
-     */
-    public function fetch_array($resultset)
-    {
-        // phpcs:enable
-        // If resultset not provided, we take the last used by connexion
-        if (!is_object($resultset)) { $resultset = $this->_results; }
-        return $resultset->fetch_array();
-    }
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *	Return datas as an array
+	 *
+	 *	@param	mysqli_result	$resultset	Resultset of request
+	 *	@return	array|null					Array or null if KO or end of cursor
+	 */
+	public function fetch_array($resultset)
+	{
+		// phpcs:enable
+		// If resultset not provided, we take the last used by connexion
+		if (!is_object($resultset)) { $resultset = $this->_results; }
+		return $resultset->fetch_array();
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *	Return datas as an array
-     *
-     *	@param	mysqli_result	$resultset	Resultset of request
-     *	@return	array|null|int				Array or null if KO or end of cursor or 0 if resultset is bool
-     */
-    public function fetch_row($resultset)
-    {
-        // phpcs:enable
-        // If resultset not provided, we take the last used by connexion
-        if (!is_bool($resultset))
-        {
-            if (!is_object($resultset)) { $resultset = $this->_results; }
-            return $resultset->fetch_row();
-        } else {
-            // si le curseur est un booleen on retourne la valeur 0
-            return 0;
-        }
-    }
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *	Return datas as an array
+	 *
+	 *	@param	mysqli_result	$resultset	Resultset of request
+	 *	@return	array|null|int				Array or null if KO or end of cursor or 0 if resultset is bool
+	 */
+	public function fetch_row($resultset)
+	{
+		// phpcs:enable
+		// If resultset not provided, we take the last used by connexion
+		if (!is_bool($resultset))
+		{
+			if (!is_object($resultset)) { $resultset = $this->_results; }
+			return $resultset->fetch_row();
+		} else {
+			// si le curseur est un booleen on retourne la valeur 0
+			return 0;
+		}
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *	Return number of lines for result of a SELECT
-     *
-     *	@param	mysqli_result	$resultset  Resulset of requests
-     *	@return	int				Nb of lines
-     *	@see    affected_rows()
-     */
-    public function num_rows($resultset)
-    {
-        // phpcs:enable
-        // If resultset not provided, we take the last used by connexion
-        if (!is_object($resultset)) { $resultset = $this->_results; }
-        return $resultset->num_rows;
-    }
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *	Return number of lines for result of a SELECT
+	 *
+	 *	@param	mysqli_result	$resultset  Resulset of requests
+	 *	@return	int				Nb of lines
+	 *	@see    affected_rows()
+	 */
+	public function num_rows($resultset)
+	{
+		// phpcs:enable
+		// If resultset not provided, we take the last used by connexion
+		if (!is_object($resultset)) { $resultset = $this->_results; }
+		return $resultset->num_rows;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *	Return the number of lines in the result of a request INSERT, DELETE or UPDATE
-     *
-     *	@param	mysqli_result	$resultset	Curseur de la requete voulue
-     *	@return int							Number of lines
-     *	@see    num_rows()
-     */
-    public function affected_rows($resultset)
-    {
-        // phpcs:enable
-        // If resultset not provided, we take the last used by connexion
-        if (!is_object($resultset)) { $resultset = $this->_results; }
-        // mysql necessite un link de base pour cette fonction contrairement
-        // a pqsql qui prend un resultset
-        return $this->db->affected_rows;
-    }
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *	Return the number of lines in the result of a request INSERT, DELETE or UPDATE
+	 *
+	 *	@param	mysqli_result	$resultset	Curseur de la requete voulue
+	 *	@return int							Number of lines
+	 *	@see    num_rows()
+	 */
+	public function affected_rows($resultset)
+	{
+		// phpcs:enable
+		// If resultset not provided, we take the last used by connexion
+		if (!is_object($resultset)) { $resultset = $this->_results; }
+		// mysql necessite un link de base pour cette fonction contrairement
+		// a pqsql qui prend un resultset
+		return $this->db->affected_rows;
+	}
 
 
-    /**
-     *	Libere le dernier resultset utilise sur cette connexion
-     *
-     *	@param  mysqli_result	$resultset	Curseur de la requete voulue
-     *	@return	void
-     */
-    public function free($resultset = null)
-    {
-        // If resultset not provided, we take the last used by connexion
-        if (!is_object($resultset)) { $resultset = $this->_results; }
-        // Si resultset en est un, on libere la memoire
-        if (is_object($resultset)) $resultset->free_result();
-    }
+	/**
+	 *	Libere le dernier resultset utilise sur cette connexion
+	 *
+	 *	@param  mysqli_result	$resultset	Curseur de la requete voulue
+	 *	@return	void
+	 */
+	public function free($resultset = null)
+	{
+		// If resultset not provided, we take the last used by connexion
+		if (!is_object($resultset)) { $resultset = $this->_results; }
+		// Si resultset en est un, on libere la memoire
+		if (is_object($resultset)) $resultset->free_result();
+	}
 
-    /**
-     *	Escape a string to insert data
-     *
-     *	@param	string	$stringtoencode		String to escape
-     *	@return	string						String escaped
-     */
-    public function escape($stringtoencode)
-    {
-        return $this->db->real_escape_string($stringtoencode);
-    }
+	/**
+	 *	Escape a string to insert data
+	 *
+	 *	@param	string	$stringtoencode		String to escape
+	 *	@return	string						String escaped
+	 */
+	public function escape($stringtoencode)
+	{
+		return $this->db->real_escape_string($stringtoencode);
+	}
 
-    /**
-     *	Return generic error code of last operation.
-     *
-     *	@return	string		Error code (Exemples: DB_ERROR_TABLE_ALREADY_EXISTS, DB_ERROR_RECORD_ALREADY_EXISTS...)
-     */
-    public function errno()
-    {
-        if (!$this->connected) {
-            // Si il y a eu echec de connexion, $this->db n'est pas valide.
-            return 'DB_ERROR_FAILED_TO_CONNECT';
-        } else {
-            // Constants to convert a MySql error code to a generic Dolibarr error code
-            $errorcode_map = array(
-            1004 => 'DB_ERROR_CANNOT_CREATE',
-            1005 => 'DB_ERROR_CANNOT_CREATE',
-            1006 => 'DB_ERROR_CANNOT_CREATE',
-            1007 => 'DB_ERROR_ALREADY_EXISTS',
-            1008 => 'DB_ERROR_CANNOT_DROP',
-            1022 => 'DB_ERROR_KEY_NAME_ALREADY_EXISTS',
-            1025 => 'DB_ERROR_NO_FOREIGN_KEY_TO_DROP',
-            1044 => 'DB_ERROR_ACCESSDENIED',
-            1046 => 'DB_ERROR_NODBSELECTED',
-            1048 => 'DB_ERROR_CONSTRAINT',
-            1050 => 'DB_ERROR_TABLE_ALREADY_EXISTS',
-            1051 => 'DB_ERROR_NOSUCHTABLE',
-            1054 => 'DB_ERROR_NOSUCHFIELD',
-            1060 => 'DB_ERROR_COLUMN_ALREADY_EXISTS',
-            1061 => 'DB_ERROR_KEY_NAME_ALREADY_EXISTS',
-            1062 => 'DB_ERROR_RECORD_ALREADY_EXISTS',
-            1064 => 'DB_ERROR_SYNTAX',
-            1068 => 'DB_ERROR_PRIMARY_KEY_ALREADY_EXISTS',
-            1075 => 'DB_ERROR_CANT_DROP_PRIMARY_KEY',
-            1091 => 'DB_ERROR_NOSUCHFIELD',
-            1100 => 'DB_ERROR_NOT_LOCKED',
-            1136 => 'DB_ERROR_VALUE_COUNT_ON_ROW',
-            1146 => 'DB_ERROR_NOSUCHTABLE',
-            1215 => 'DB_ERROR_CANNOT_ADD_FOREIGN_KEY_CONSTRAINT',
-            1216 => 'DB_ERROR_NO_PARENT',
-            1217 => 'DB_ERROR_CHILD_EXISTS',
-            1396 => 'DB_ERROR_USER_ALREADY_EXISTS', // When creating a user that already existing
-            1451 => 'DB_ERROR_CHILD_EXISTS',
-            1826 => 'DB_ERROR_KEY_NAME_ALREADY_EXISTS'
-            );
+	/**
+	 *	Return generic error code of last operation.
+	 *
+	 *	@return	string		Error code (Exemples: DB_ERROR_TABLE_ALREADY_EXISTS, DB_ERROR_RECORD_ALREADY_EXISTS...)
+	 */
+	public function errno()
+	{
+		if (!$this->connected) {
+			// Si il y a eu echec de connexion, $this->db n'est pas valide.
+			return 'DB_ERROR_FAILED_TO_CONNECT';
+		} else {
+			// Constants to convert a MySql error code to a generic Dolibarr error code
+			$errorcode_map = array(
+			1004 => 'DB_ERROR_CANNOT_CREATE',
+			1005 => 'DB_ERROR_CANNOT_CREATE',
+			1006 => 'DB_ERROR_CANNOT_CREATE',
+			1007 => 'DB_ERROR_ALREADY_EXISTS',
+			1008 => 'DB_ERROR_CANNOT_DROP',
+			1022 => 'DB_ERROR_KEY_NAME_ALREADY_EXISTS',
+			1025 => 'DB_ERROR_NO_FOREIGN_KEY_TO_DROP',
+			1044 => 'DB_ERROR_ACCESSDENIED',
+			1046 => 'DB_ERROR_NODBSELECTED',
+			1048 => 'DB_ERROR_CONSTRAINT',
+			1050 => 'DB_ERROR_TABLE_ALREADY_EXISTS',
+			1051 => 'DB_ERROR_NOSUCHTABLE',
+			1054 => 'DB_ERROR_NOSUCHFIELD',
+			1060 => 'DB_ERROR_COLUMN_ALREADY_EXISTS',
+			1061 => 'DB_ERROR_KEY_NAME_ALREADY_EXISTS',
+			1062 => 'DB_ERROR_RECORD_ALREADY_EXISTS',
+			1064 => 'DB_ERROR_SYNTAX',
+			1068 => 'DB_ERROR_PRIMARY_KEY_ALREADY_EXISTS',
+			1075 => 'DB_ERROR_CANT_DROP_PRIMARY_KEY',
+			1091 => 'DB_ERROR_NOSUCHFIELD',
+			1100 => 'DB_ERROR_NOT_LOCKED',
+			1136 => 'DB_ERROR_VALUE_COUNT_ON_ROW',
+			1146 => 'DB_ERROR_NOSUCHTABLE',
+			1215 => 'DB_ERROR_CANNOT_ADD_FOREIGN_KEY_CONSTRAINT',
+			1216 => 'DB_ERROR_NO_PARENT',
+			1217 => 'DB_ERROR_CHILD_EXISTS',
+			1396 => 'DB_ERROR_USER_ALREADY_EXISTS', // When creating a user that already existing
+			1451 => 'DB_ERROR_CHILD_EXISTS',
+			1826 => 'DB_ERROR_KEY_NAME_ALREADY_EXISTS'
+			);
 
-            if (isset($errorcode_map[$this->db->errno])) {
-                return $errorcode_map[$this->db->errno];
-            }
-            $errno = $this->db->errno;
-            return ($errno ? 'DB_ERROR_'.$errno : '0');
-        }
-    }
+			if (isset($errorcode_map[$this->db->errno])) {
+				return $errorcode_map[$this->db->errno];
+			}
+			$errno = $this->db->errno;
+			return ($errno ? 'DB_ERROR_'.$errno : '0');
+		}
+	}
 
-    /**
+	/**
 	 *	Return description of last error
 	 *
 	 *	@return	string		Error text
-     */
-    public function error()
-    {
-        if (!$this->connected) {
-            // Si il y a eu echec de connexion, $this->db n'est pas valide pour mysqli_error.
-            return 'Not connected. Check setup parameters in conf/conf.php file and your mysql client and server versions';
-        } else {
-            return $this->db->error;
-        }
-    }
+	 */
+	public function error()
+	{
+		if (!$this->connected) {
+			// Si il y a eu echec de connexion, $this->db n'est pas valide pour mysqli_error.
+			return 'Not connected. Check setup parameters in conf/conf.php file and your mysql client and server versions';
+		} else {
+			return $this->db->error;
+		}
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
 	 * Get last ID after an insert INSERT
 	 *
 	 * @param   string	$tab    	Table name concerned by insert. Ne sert pas sous MySql mais requis pour compatibilite avec Postgresql
 	 * @param	string	$fieldid	Field name
 	 * @return  int|string			Id of row
-     */
-    public function last_insert_id($tab, $fieldid = 'rowid')
-    {
-        // phpcs:enable
-        return $this->db->insert_id;
-    }
+	 */
+	public function last_insert_id($tab, $fieldid = 'rowid')
+	{
+		// phpcs:enable
+		return $this->db->insert_id;
+	}
 
-    /**
-     *	Encrypt sensitive data in database
-     *  Warning: This function includes the escape, so it must use direct value
-     *
-     *	@param	string	$fieldorvalue	Field name or value to encrypt
-     * 	@param	int		$withQuotes		Return string with quotes
-     * 	@return	string					XXX(field) or XXX('value') or field or 'value'
-     *
-     */
-    public function encrypt($fieldorvalue, $withQuotes = 0)
-    {
-        global $conf;
+	/**
+	 *	Encrypt sensitive data in database
+	 *  Warning: This function includes the escape, so it must use direct value
+	 *
+	 *	@param	string	$fieldorvalue	Field name or value to encrypt
+	 * 	@param	int		$withQuotes		Return string with quotes
+	 * 	@return	string					XXX(field) or XXX('value') or field or 'value'
+	 *
+	 */
+	public function encrypt($fieldorvalue, $withQuotes = 0)
+	{
+		global $conf;
 
-        // Type of encryption (2: AES (recommended), 1: DES , 0: no encryption)
-        $cryptType = (!empty($conf->db->dolibarr_main_db_encryption) ? $conf->db->dolibarr_main_db_encryption : 0);
+		// Type of encryption (2: AES (recommended), 1: DES , 0: no encryption)
+		$cryptType = (!empty($conf->db->dolibarr_main_db_encryption) ? $conf->db->dolibarr_main_db_encryption : 0);
 
-        //Encryption key
-        $cryptKey = (!empty($conf->db->dolibarr_main_db_cryptkey) ? $conf->db->dolibarr_main_db_cryptkey : '');
+		//Encryption key
+		$cryptKey = (!empty($conf->db->dolibarr_main_db_cryptkey) ? $conf->db->dolibarr_main_db_cryptkey : '');
 
-        $return = ($withQuotes ? "'" : "").$this->escape($fieldorvalue).($withQuotes ? "'" : "");
+		$return = ($withQuotes ? "'" : "").$this->escape($fieldorvalue).($withQuotes ? "'" : "");
 
-        if ($cryptType && !empty($cryptKey))
-        {
-            if ($cryptType == 2)
-            {
-                $return = 'AES_ENCRYPT('.$return.',\''.$cryptKey.'\')';
-            } elseif ($cryptType == 1)
-            {
-                $return = 'DES_ENCRYPT('.$return.',\''.$cryptKey.'\')';
-            }
-        }
+		if ($cryptType && !empty($cryptKey))
+		{
+			if ($cryptType == 2)
+			{
+				$return = 'AES_ENCRYPT('.$return.',\''.$cryptKey.'\')';
+			} elseif ($cryptType == 1)
+			{
+				$return = 'DES_ENCRYPT('.$return.',\''.$cryptKey.'\')';
+			}
+		}
 
-        return $return;
-    }
+		return $return;
+	}
 
-    /**
-     *	Decrypt sensitive data in database
-     *
-     *	@param	string	$value			Value to decrypt
-     * 	@return	string					Decrypted value if used
-     */
-    public function decrypt($value)
-    {
-        global $conf;
+	/**
+	 *	Decrypt sensitive data in database
+	 *
+	 *	@param	string	$value			Value to decrypt
+	 * 	@return	string					Decrypted value if used
+	 */
+	public function decrypt($value)
+	{
+		global $conf;
 
-        // Type of encryption (2: AES (recommended), 1: DES , 0: no encryption)
-        $cryptType = (!empty($conf->db->dolibarr_main_db_encryption) ? $conf->db->dolibarr_main_db_encryption : 0);
+		// Type of encryption (2: AES (recommended), 1: DES , 0: no encryption)
+		$cryptType = (!empty($conf->db->dolibarr_main_db_encryption) ? $conf->db->dolibarr_main_db_encryption : 0);
 
-        //Encryption key
-        $cryptKey = (!empty($conf->db->dolibarr_main_db_cryptkey) ? $conf->db->dolibarr_main_db_cryptkey : '');
+		//Encryption key
+		$cryptKey = (!empty($conf->db->dolibarr_main_db_cryptkey) ? $conf->db->dolibarr_main_db_cryptkey : '');
 
-        $return = $value;
+		$return = $value;
 
-        if ($cryptType && !empty($cryptKey))
-        {
-            if ($cryptType == 2)
-            {
-                $return = 'AES_DECRYPT('.$value.',\''.$cryptKey.'\')';
-            } elseif ($cryptType == 1)
-            {
-                $return = 'DES_DECRYPT('.$value.',\''.$cryptKey.'\')';
-            }
-        }
+		if ($cryptType && !empty($cryptKey))
+		{
+			if ($cryptType == 2)
+			{
+				$return = 'AES_DECRYPT('.$value.',\''.$cryptKey.'\')';
+			} elseif ($cryptType == 1)
+			{
+				$return = 'DES_DECRYPT('.$value.',\''.$cryptKey.'\')';
+			}
+		}
 
-        return $return;
-    }
+		return $return;
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
 	 * Return connexion ID
 	 *
 	 * @return	        string      Id connexion
-     */
-    public function DDLGetConnectId()
-    {
-        // phpcs:enable
-        $resql = $this->query('SELECT CONNECTION_ID()');
-        if ($resql)
-        {
-            $row = $this->fetch_row($resql);
-            return $row[0];
-        } else return '?';
-    }
+	 */
+	public function DDLGetConnectId()
+	{
+		// phpcs:enable
+		$resql = $this->query('SELECT CONNECTION_ID()');
+		if ($resql)
+		{
+			$row = $this->fetch_row($resql);
+			return $row[0];
+		} else return '?';
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Create a new database
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Create a new database
 	 *	Do not use function xxx_create_db (xxx=mysql, ...) as they are deprecated
 	 *	We force to create database with charset this->forcecharset and collate this->forcecollate
 	 *
@@ -578,85 +578,85 @@ class DoliDBMysqli extends DoliDB
 	 * 	@param	string	$collation		Charset used to sort data
 	 * 	@param	string	$owner			Username of database owner
 	 * 	@return	bool|mysqli_result		resource defined if OK, null if KO
-     */
-    public function DDLCreateDb($database, $charset = '', $collation = '', $owner = '')
-    {
-        // phpcs:enable
-        if (empty($charset))   $charset = $this->forcecharset;
-        if (empty($collation)) $collation = $this->forcecollate;
+	 */
+	public function DDLCreateDb($database, $charset = '', $collation = '', $owner = '')
+	{
+		// phpcs:enable
+		if (empty($charset))   $charset = $this->forcecharset;
+		if (empty($collation)) $collation = $this->forcecollate;
 
-        // ALTER DATABASE dolibarr_db DEFAULT CHARACTER SET latin DEFAULT COLLATE latin1_swedish_ci
+		// ALTER DATABASE dolibarr_db DEFAULT CHARACTER SET latin DEFAULT COLLATE latin1_swedish_ci
 		$sql = "CREATE DATABASE `".$this->escape($database)."`";
 		$sql .= " DEFAULT CHARACTER SET `".$this->escape($charset)."` DEFAULT COLLATE `".$this->escape($collation)."`";
 
-        dol_syslog($sql, LOG_DEBUG);
-        $ret = $this->query($sql);
-        if (!$ret)
-        {
-            // We try again for compatibility with Mysql < 4.1.1
-            $sql = "CREATE DATABASE `".$this->escape($database)."`";
-            dol_syslog($sql, LOG_DEBUG);
-            $ret = $this->query($sql);
-        }
-        return $ret;
-    }
+		dol_syslog($sql, LOG_DEBUG);
+		$ret = $this->query($sql);
+		if (!$ret)
+		{
+			// We try again for compatibility with Mysql < 4.1.1
+			$sql = "CREATE DATABASE `".$this->escape($database)."`";
+			dol_syslog($sql, LOG_DEBUG);
+			$ret = $this->query($sql);
+		}
+		return $ret;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
 	 *  List tables into a database
 	 *
 	 *  @param	string		$database	Name of database
 	 *  @param	string		$table		Nmae of table filter ('xxx%')
 	 *  @return	array					List of tables in an array
-     */
-    public function DDLListTables($database, $table = '')
-    {
-        // phpcs:enable
-        $listtables = array();
+	 */
+	public function DDLListTables($database, $table = '')
+	{
+		// phpcs:enable
+		$listtables = array();
 
-        $like = '';
-        if ($table) $like = "LIKE '".$table."'";
-        $sql = "SHOW TABLES FROM ".$database." ".$like.";";
-        //print $sql;
-        $result = $this->query($sql);
-        if ($result)
-        {
-            while ($row = $this->fetch_row($result))
-            {
-                $listtables[] = $row[0];
-            }
-        }
-        return $listtables;
-    }
+		$like = '';
+		if ($table) $like = "LIKE '".$table."'";
+		$sql = "SHOW TABLES FROM ".$database." ".$like.";";
+		//print $sql;
+		$result = $this->query($sql);
+		if ($result)
+		{
+			while ($row = $this->fetch_row($result))
+			{
+				$listtables[] = $row[0];
+			}
+		}
+		return $listtables;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
 	 *	List information of columns into a table.
 	 *
 	 *	@param	string	$table		Name of table
 	 *	@return	array				Tableau des informations des champs de la table
-     */
-    public function DDLInfoTable($table)
-    {
-        // phpcs:enable
-        $infotables = array();
+	 */
+	public function DDLInfoTable($table)
+	{
+		// phpcs:enable
+		$infotables = array();
 
-        $sql = "SHOW FULL COLUMNS FROM ".$table.";";
+		$sql = "SHOW FULL COLUMNS FROM ".$table.";";
 
-        dol_syslog($sql, LOG_DEBUG);
-        $result = $this->query($sql);
-        if ($result)
-        {
-            while ($row = $this->fetch_row($result))
-            {
-                $infotables[] = $row;
-            }
-        }
-        return $infotables;
-    }
+		dol_syslog($sql, LOG_DEBUG);
+		$result = $this->query($sql);
+		if ($result)
+		{
+			while ($row = $this->fetch_row($result))
+			{
+				$infotables[] = $row;
+			}
+		}
+		return $infotables;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
 	 *	Create a table into database
 	 *
 	 *	@param	    string	$table 			Name of table
@@ -667,20 +667,20 @@ class DoliDBMysqli extends DoliDB
 	 *	@param	    array	$fulltext_keys	Tableau des Nom de champs qui seront indexes en fulltext
 	 *	@param	    array	$keys 			Tableau des champs cles noms => valeur
 	 *	@return	    int						<0 if KO, >=0 if OK
-     */
-    public function DDLCreateTable($table, $fields, $primary_key, $type, $unique_keys = null, $fulltext_keys = null, $keys = null)
-    {
-        // phpcs:enable
-	    // FIXME: $fulltext_keys parameter is unused
+	 */
+	public function DDLCreateTable($table, $fields, $primary_key, $type, $unique_keys = null, $fulltext_keys = null, $keys = null)
+	{
+		// phpcs:enable
+		// FIXME: $fulltext_keys parameter is unused
 
-        // cles recherchees dans le tableau des descriptions (fields) : type,value,attribute,null,default,extra
-        // ex. : $fields['rowid'] = array('type'=>'int','value'=>'11','null'=>'not null','extra'=> 'auto_increment');
-        $sql = "CREATE TABLE ".$table."(";
-        $i = 0;
-	    $sqlfields = array();
-        foreach ($fields as $field_name => $field_desc)
-        {
-        	$sqlfields[$i] = $field_name." ";
+		// cles recherchees dans le tableau des descriptions (fields) : type,value,attribute,null,default,extra
+		// ex. : $fields['rowid'] = array('type'=>'int','value'=>'11','null'=>'not null','extra'=> 'auto_increment');
+		$sql = "CREATE TABLE ".$table."(";
+		$i = 0;
+		$sqlfields = array();
+		foreach ($fields as $field_name => $field_desc)
+		{
+			$sqlfields[$i] = $field_name." ";
 			$sqlfields[$i] .= $field_desc['type'];
 			if (preg_match("/^[^\s]/i", $field_desc['value'])) {
 				$sqlfields[$i]  .= "(".$field_desc['value'].")";
@@ -702,79 +702,79 @@ class DoliDBMysqli extends DoliDB
 			if (preg_match("/^[^\s]/i", $field_desc['extra'])) {
 				$sqlfields[$i]  .= " ".$field_desc['extra'];
 			}
-            $i++;
-        }
-        if ($primary_key != "")
-        $pk = "primary key(".$primary_key.")";
+			$i++;
+		}
+		if ($primary_key != "")
+		$pk = "primary key(".$primary_key.")";
 
-        if (is_array($unique_keys)) {
-            $i = 0;
-            foreach ($unique_keys as $key => $value)
-            {
-                $sqluq[$i] = "UNIQUE KEY '".$key."' ('".$this->escape($value)."')";
-                $i++;
-            }
-        }
-        if (is_array($keys))
-        {
-            $i = 0;
-            foreach ($keys as $key => $value)
-            {
-                $sqlk[$i] = "KEY ".$key." (".$value.")";
-                $i++;
-            }
-        }
-        $sql .= implode(',', $sqlfields);
-        if ($primary_key != "")
-        $sql .= ",".$pk;
-        if ($unique_keys != "")
-        $sql .= ",".implode(',', $sqluq);
-        if (is_array($keys))
-        $sql .= ",".implode(',', $sqlk);
-        $sql .= ") engine=".$type;
+		if (is_array($unique_keys)) {
+			$i = 0;
+			foreach ($unique_keys as $key => $value)
+			{
+				$sqluq[$i] = "UNIQUE KEY '".$key."' ('".$this->escape($value)."')";
+				$i++;
+			}
+		}
+		if (is_array($keys))
+		{
+			$i = 0;
+			foreach ($keys as $key => $value)
+			{
+				$sqlk[$i] = "KEY ".$key." (".$value.")";
+				$i++;
+			}
+		}
+		$sql .= implode(',', $sqlfields);
+		if ($primary_key != "")
+		$sql .= ",".$pk;
+		if ($unique_keys != "")
+		$sql .= ",".implode(',', $sqluq);
+		if (is_array($keys))
+		$sql .= ",".implode(',', $sqlk);
+		$sql .= ") engine=".$type;
 
-        if (!$this->query($sql))
-        return -1;
-        else return 1;
-    }
+		if (!$this->query($sql))
+		return -1;
+		else return 1;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Drop a table into database
-     *
-     *	@param	    string	$table 			Name of table
-     *	@return	    int						<0 if KO, >=0 if OK
-     */
-    public function DDLDropTable($table)
-    {
-        // phpcs:enable
-        $sql = "DROP TABLE ".$table;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Drop a table into database
+	 *
+	 *	@param	    string	$table 			Name of table
+	 *	@return	    int						<0 if KO, >=0 if OK
+	 */
+	public function DDLDropTable($table)
+	{
+		// phpcs:enable
+		$sql = "DROP TABLE ".$table;
 
 		if (!$this->query($sql))
  			return -1;
-    	else return 1;
-    }
+		else return 1;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
 	 *	Return a pointer of line with description of a table or field
 	 *
 	 *	@param	string		$table	Name of table
 	 *	@param	string		$field	Optionnel : Name of field if we want description of field
 	 *	@return	bool|mysqli_result	Resultset x (x->Field, x->Type, ...)
-     */
-    public function DDLDescTable($table, $field = "")
-    {
-        // phpcs:enable
-        $sql = "DESC ".$table." ".$field;
+	 */
+	public function DDLDescTable($table, $field = "")
+	{
+		// phpcs:enable
+		$sql = "DESC ".$table." ".$field;
 
-        dol_syslog(get_class($this)."::DDLDescTable ".$sql, LOG_DEBUG);
-        $this->_results = $this->query($sql);
-        return $this->_results;
-    }
+		dol_syslog(get_class($this)."::DDLDescTable ".$sql, LOG_DEBUG);
+		$this->_results = $this->query($sql);
+		return $this->_results;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
 	 *	Create a new field into table
 	 *
 	 *	@param	string	$table 				Name of table
@@ -782,116 +782,116 @@ class DoliDBMysqli extends DoliDB
 	 *	@param	string	$field_desc 		Tableau associatif de description du champ a inserer[nom du parametre][valeur du parametre]
 	 *	@param	string	$field_position 	Optionnel ex.: "after champtruc"
 	 *	@return	int							<0 if KO, >0 if OK
-     */
-    public function DDLAddField($table, $field_name, $field_desc, $field_position = "")
-    {
-        // phpcs:enable
-        // cles recherchees dans le tableau des descriptions (field_desc) : type,value,attribute,null,default,extra
-        // ex. : $field_desc = array('type'=>'int','value'=>'11','null'=>'not null','extra'=> 'auto_increment');
-        $sql = "ALTER TABLE ".$table." ADD ".$field_name." ";
-        $sql .= $field_desc['type'];
-        if (preg_match("/^[^\s]/i", $field_desc['value']))
-        {
-        	if (!in_array($field_desc['type'], array('date', 'datetime')) && $field_desc['value'])
-            {
-                $sql .= "(".$field_desc['value'].")";
-            }
-        }
-        if (isset($field_desc['attribute']) && preg_match("/^[^\s]/i", $field_desc['attribute']))
-        {
-        	$sql .= " ".$field_desc['attribute'];
-        }
-        if (isset($field_desc['null']) && preg_match("/^[^\s]/i", $field_desc['null']))
-        {
-        	$sql .= " ".$field_desc['null'];
-        }
-        if (isset($field_desc['default']) && preg_match("/^[^\s]/i", $field_desc['default']))
-        {
-            if (preg_match("/null/i", $field_desc['default']))
-            $sql .= " default ".$field_desc['default'];
-            else $sql .= " default '".$this->escape($field_desc['default'])."'";
-        }
-        if (isset($field_desc['extra']) && preg_match("/^[^\s]/i", $field_desc['extra']))
-        {
-        	$sql .= " ".$field_desc['extra'];
-        }
-        $sql .= " ".$field_position;
+	 */
+	public function DDLAddField($table, $field_name, $field_desc, $field_position = "")
+	{
+		// phpcs:enable
+		// cles recherchees dans le tableau des descriptions (field_desc) : type,value,attribute,null,default,extra
+		// ex. : $field_desc = array('type'=>'int','value'=>'11','null'=>'not null','extra'=> 'auto_increment');
+		$sql = "ALTER TABLE ".$table." ADD ".$field_name." ";
+		$sql .= $field_desc['type'];
+		if (preg_match("/^[^\s]/i", $field_desc['value']))
+		{
+			if (!in_array($field_desc['type'], array('date', 'datetime')) && $field_desc['value'])
+			{
+				$sql .= "(".$field_desc['value'].")";
+			}
+		}
+		if (isset($field_desc['attribute']) && preg_match("/^[^\s]/i", $field_desc['attribute']))
+		{
+			$sql .= " ".$field_desc['attribute'];
+		}
+		if (isset($field_desc['null']) && preg_match("/^[^\s]/i", $field_desc['null']))
+		{
+			$sql .= " ".$field_desc['null'];
+		}
+		if (isset($field_desc['default']) && preg_match("/^[^\s]/i", $field_desc['default']))
+		{
+			if (preg_match("/null/i", $field_desc['default']))
+			$sql .= " default ".$field_desc['default'];
+			else $sql .= " default '".$this->escape($field_desc['default'])."'";
+		}
+		if (isset($field_desc['extra']) && preg_match("/^[^\s]/i", $field_desc['extra']))
+		{
+			$sql .= " ".$field_desc['extra'];
+		}
+		$sql .= " ".$field_position;
 
-        dol_syslog(get_class($this)."::DDLAddField ".$sql, LOG_DEBUG);
-        if ($this->query($sql)) {
-            return 1;
-        }
-        return -1;
-    }
+		dol_syslog(get_class($this)."::DDLAddField ".$sql, LOG_DEBUG);
+		if ($this->query($sql)) {
+			return 1;
+		}
+		return -1;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
 	 *	Update format of a field into a table
 	 *
 	 *	@param	string	$table 				Name of table
 	 *	@param	string	$field_name 		Name of field to modify
 	 *	@param	string	$field_desc 		Array with description of field format
 	 *	@return	int							<0 if KO, >0 if OK
-     */
-    public function DDLUpdateField($table, $field_name, $field_desc)
-    {
-        // phpcs:enable
-        $sql = "ALTER TABLE ".$table;
-        $sql .= " MODIFY COLUMN ".$field_name." ".$field_desc['type'];
-        if (in_array($field_desc['type'], array('double', 'tinyint', 'int', 'varchar')) && $field_desc['value']) {
-        	$sql .= "(".$field_desc['value'].")";
-        }
-        if ($field_desc['null'] == 'not null' || $field_desc['null'] == 'NOT NULL')
-        {
-        	// We will try to change format of column to NOT NULL. To be sure the ALTER works, we try to update fields that are NULL
-        	if ($field_desc['type'] == 'varchar' || $field_desc['type'] == 'text')
-        	{
-        		$sqlbis = "UPDATE ".$table." SET ".$field_name." = '".$this->escape($field_desc['default'] ? $field_desc['default'] : '')."' WHERE ".$field_name." IS NULL";
-        		$this->query($sqlbis);
-        	} elseif ($field_desc['type'] == 'tinyint' || $field_desc['type'] == 'int')
-        	{
-        		$sqlbis = "UPDATE ".$table." SET ".$field_name." = ".((int) $this->escape($field_desc['default'] ? $field_desc['default'] : 0))." WHERE ".$field_name." IS NULL";
-        		$this->query($sqlbis);
-        	}
+	 */
+	public function DDLUpdateField($table, $field_name, $field_desc)
+	{
+		// phpcs:enable
+		$sql = "ALTER TABLE ".$table;
+		$sql .= " MODIFY COLUMN ".$field_name." ".$field_desc['type'];
+		if (in_array($field_desc['type'], array('double', 'tinyint', 'int', 'varchar')) && $field_desc['value']) {
+			$sql .= "(".$field_desc['value'].")";
+		}
+		if ($field_desc['null'] == 'not null' || $field_desc['null'] == 'NOT NULL')
+		{
+			// We will try to change format of column to NOT NULL. To be sure the ALTER works, we try to update fields that are NULL
+			if ($field_desc['type'] == 'varchar' || $field_desc['type'] == 'text')
+			{
+				$sqlbis = "UPDATE ".$table." SET ".$field_name." = '".$this->escape($field_desc['default'] ? $field_desc['default'] : '')."' WHERE ".$field_name." IS NULL";
+				$this->query($sqlbis);
+			} elseif ($field_desc['type'] == 'tinyint' || $field_desc['type'] == 'int')
+			{
+				$sqlbis = "UPDATE ".$table." SET ".$field_name." = ".((int) $this->escape($field_desc['default'] ? $field_desc['default'] : 0))." WHERE ".$field_name." IS NULL";
+				$this->query($sqlbis);
+			}
 
-        	$sql .= " NOT NULL";
-        }
+			$sql .= " NOT NULL";
+		}
 
-        if ($field_desc['default'] != '')
-        {
+		if ($field_desc['default'] != '')
+		{
 			if ($field_desc['type'] == 'double' || $field_desc['type'] == 'tinyint' || $field_desc['type'] == 'int') $sql .= " DEFAULT ".$this->escape($field_desc['default']);
 			elseif ($field_desc['type'] != 'text') $sql .= " DEFAULT '".$this->escape($field_desc['default'])."'"; // Default not supported on text fields
-        }
+		}
 
-        dol_syslog(get_class($this)."::DDLUpdateField ".$sql, LOG_DEBUG);
-        if (!$this->query($sql))
-        return -1;
-        else return 1;
-    }
+		dol_syslog(get_class($this)."::DDLUpdateField ".$sql, LOG_DEBUG);
+		if (!$this->query($sql))
+		return -1;
+		else return 1;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
 	 *	Drop a field from table
 	 *
 	 *	@param	string	$table 			Name of table
 	 *	@param	string	$field_name 	Name of field to drop
 	 *	@return	int						<0 if KO, >0 if OK
-     */
-    public function DDLDropField($table, $field_name)
-    {
-        // phpcs:enable
-        $sql = "ALTER TABLE ".$table." DROP COLUMN `".$field_name."`";
-        dol_syslog(get_class($this)."::DDLDropField ".$sql, LOG_DEBUG);
-        if ($this->query($sql)) {
-            return 1;
-        }
-        $this->error = $this->lasterror();
-        return -1;
-    }
+	 */
+	public function DDLDropField($table, $field_name)
+	{
+		// phpcs:enable
+		$sql = "ALTER TABLE ".$table." DROP COLUMN `".$field_name."`";
+		dol_syslog(get_class($this)."::DDLDropField ".$sql, LOG_DEBUG);
+		if ($this->query($sql)) {
+			return 1;
+		}
+		$this->error = $this->lasterror();
+		return -1;
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
 	 * 	Create a user and privileges to connect to database (even if database does not exists yet)
 	 *
 	 *	@param	string	$dolibarr_main_db_host 		Ip server or '%'
@@ -899,218 +899,218 @@ class DoliDBMysqli extends DoliDB
 	 *	@param	string	$dolibarr_main_db_pass 		Mot de passe user a creer
 	 *	@param	string	$dolibarr_main_db_name		Database name where user must be granted
 	 *	@return	int									<0 if KO, >=0 if OK
-     */
-    public function DDLCreateUser($dolibarr_main_db_host, $dolibarr_main_db_user, $dolibarr_main_db_pass, $dolibarr_main_db_name)
-    {
-        // phpcs:enable
-        $sql = "CREATE USER '".$this->escape($dolibarr_main_db_user)."'";
-        dol_syslog(get_class($this)."::DDLCreateUser", LOG_DEBUG); // No sql to avoid password in log
-        $resql = $this->query($sql);
-        if (!$resql)
-        {
-            if ($this->lasterrno != 'DB_ERROR_USER_ALREADY_EXISTS')
-            {
-            	return -1;
-            } else {
-            	// If user already exists, we continue to set permissions
-            	dol_syslog(get_class($this)."::DDLCreateUser sql=".$sql, LOG_WARNING);
-            }
-        }
+	 */
+	public function DDLCreateUser($dolibarr_main_db_host, $dolibarr_main_db_user, $dolibarr_main_db_pass, $dolibarr_main_db_name)
+	{
+		// phpcs:enable
+		$sql = "CREATE USER '".$this->escape($dolibarr_main_db_user)."'";
+		dol_syslog(get_class($this)."::DDLCreateUser", LOG_DEBUG); // No sql to avoid password in log
+		$resql = $this->query($sql);
+		if (!$resql)
+		{
+			if ($this->lasterrno != 'DB_ERROR_USER_ALREADY_EXISTS')
+			{
+				return -1;
+			} else {
+				// If user already exists, we continue to set permissions
+				dol_syslog(get_class($this)."::DDLCreateUser sql=".$sql, LOG_WARNING);
+			}
+		}
 
-        // Redo with localhost forced (sometimes user is created on %)
-        $sql = "CREATE USER '".$this->escape($dolibarr_main_db_user)."'@'localhost'";
-        $resql = $this->query($sql);
+		// Redo with localhost forced (sometimes user is created on %)
+		$sql = "CREATE USER '".$this->escape($dolibarr_main_db_user)."'@'localhost'";
+		$resql = $this->query($sql);
 
-        $sql = "GRANT ALL PRIVILEGES ON ".$this->escape($dolibarr_main_db_name).".* TO '".$this->escape($dolibarr_main_db_user)."'@'".$this->escape($dolibarr_main_db_host)."' IDENTIFIED BY '".$this->escape($dolibarr_main_db_pass)."'";
-        dol_syslog(get_class($this)."::DDLCreateUser", LOG_DEBUG); // No sql to avoid password in log
-        $resql = $this->query($sql);
-        if (!$resql)
-        {
-            $this->error = "Connected user not allowed to GRANT ALL PRIVILEGES ON ".$this->escape($dolibarr_main_db_name).".* TO '".$this->escape($dolibarr_main_db_user)."'@'".$this->escape($dolibarr_main_db_host)."'  IDENTIFIED BY '*****'";
-            return -1;
-        }
+		$sql = "GRANT ALL PRIVILEGES ON ".$this->escape($dolibarr_main_db_name).".* TO '".$this->escape($dolibarr_main_db_user)."'@'".$this->escape($dolibarr_main_db_host)."' IDENTIFIED BY '".$this->escape($dolibarr_main_db_pass)."'";
+		dol_syslog(get_class($this)."::DDLCreateUser", LOG_DEBUG); // No sql to avoid password in log
+		$resql = $this->query($sql);
+		if (!$resql)
+		{
+			$this->error = "Connected user not allowed to GRANT ALL PRIVILEGES ON ".$this->escape($dolibarr_main_db_name).".* TO '".$this->escape($dolibarr_main_db_user)."'@'".$this->escape($dolibarr_main_db_host)."'  IDENTIFIED BY '*****'";
+			return -1;
+		}
 
-        $sql = "FLUSH Privileges";
+		$sql = "FLUSH Privileges";
 
-        dol_syslog(get_class($this)."::DDLCreateUser", LOG_DEBUG);
-        $resql = $this->query($sql);
-        if (!$resql)
-        {
-            return -1;
-        }
+		dol_syslog(get_class($this)."::DDLCreateUser", LOG_DEBUG);
+		$resql = $this->query($sql);
+		if (!$resql)
+		{
+			return -1;
+		}
 
-        return 1;
-    }
+		return 1;
+	}
 
-    /**
-     *	Return charset used to store data in current database
-     *  Note: if we are connected to databasename, it is same result than using SELECT default_character_set_name FROM information_schema.SCHEMATA WHERE schema_name = "databasename";)
-     *
-     *	@return		string		Charset
-     *  @see getDefaultCollationDatabase()
-     */
-    public function getDefaultCharacterSetDatabase()
-    {
-        $resql = $this->query('SHOW VARIABLES LIKE \'character_set_database\'');
-        if (!$resql)
-        {
-            // version Mysql < 4.1.1
-            return $this->forcecharset;
-        }
-        $liste = $this->fetch_array($resql);
-        $tmpval = $liste['Value'];
+	/**
+	 *	Return charset used to store data in current database
+	 *  Note: if we are connected to databasename, it is same result than using SELECT default_character_set_name FROM information_schema.SCHEMATA WHERE schema_name = "databasename";)
+	 *
+	 *	@return		string		Charset
+	 *  @see getDefaultCollationDatabase()
+	 */
+	public function getDefaultCharacterSetDatabase()
+	{
+		$resql = $this->query('SHOW VARIABLES LIKE \'character_set_database\'');
+		if (!$resql)
+		{
+			// version Mysql < 4.1.1
+			return $this->forcecharset;
+		}
+		$liste = $this->fetch_array($resql);
+		$tmpval = $liste['Value'];
 
-        return $tmpval;
-    }
+		return $tmpval;
+	}
 
-    /**
-     *	Return list of available charset that can be used to store data in database
-     *
-     *	@return		array|null		List of Charset
-     */
-    public function getListOfCharacterSet()
-    {
-        $resql = $this->query('SHOW CHARSET');
-        $liste = array();
-        if ($resql)
-        {
-            $i = 0;
-            while ($obj = $this->fetch_object($resql))
-            {
-                $liste[$i]['charset'] = $obj->Charset;
-                $liste[$i]['description'] = $obj->Description;
-                $i++;
-            }
-            $this->free($resql);
-        } else {
-            // version Mysql < 4.1.1
-            return null;
-        }
-        return $liste;
-    }
+	/**
+	 *	Return list of available charset that can be used to store data in database
+	 *
+	 *	@return		array|null		List of Charset
+	 */
+	public function getListOfCharacterSet()
+	{
+		$resql = $this->query('SHOW CHARSET');
+		$liste = array();
+		if ($resql)
+		{
+			$i = 0;
+			while ($obj = $this->fetch_object($resql))
+			{
+				$liste[$i]['charset'] = $obj->Charset;
+				$liste[$i]['description'] = $obj->Description;
+				$i++;
+			}
+			$this->free($resql);
+		} else {
+			// version Mysql < 4.1.1
+			return null;
+		}
+		return $liste;
+	}
 
-    /**
-     *	Return collation used in current database
-     *
-     *	@return		string		Collation value
-     *  @see getDefaultCharacterSetDatabase()
-     */
-    public function getDefaultCollationDatabase()
-    {
-        $resql = $this->query('SHOW VARIABLES LIKE \'collation_database\'');
-        if (!$resql)
-        {
-            // version Mysql < 4.1.1
-            return $this->forcecollate;
-        }
-        $liste = $this->fetch_array($resql);
-        $tmpval = $liste['Value'];
+	/**
+	 *	Return collation used in current database
+	 *
+	 *	@return		string		Collation value
+	 *  @see getDefaultCharacterSetDatabase()
+	 */
+	public function getDefaultCollationDatabase()
+	{
+		$resql = $this->query('SHOW VARIABLES LIKE \'collation_database\'');
+		if (!$resql)
+		{
+			// version Mysql < 4.1.1
+			return $this->forcecollate;
+		}
+		$liste = $this->fetch_array($resql);
+		$tmpval = $liste['Value'];
 
-        return $tmpval;
-    }
+		return $tmpval;
+	}
 
-    /**
-     *	Return list of available collation that can be used for database
-     *
-     *	@return		array|null		Liste of Collation
-     */
-    public function getListOfCollation()
-    {
-        $resql = $this->query('SHOW COLLATION');
-        $liste = array();
-        if ($resql)
-        {
-            $i = 0;
-            while ($obj = $this->fetch_object($resql))
-            {
-                $liste[$i]['collation'] = $obj->Collation;
-                $i++;
-            }
-            $this->free($resql);
-        } else {
-            // version Mysql < 4.1.1
-            return null;
-        }
-        return $liste;
-    }
+	/**
+	 *	Return list of available collation that can be used for database
+	 *
+	 *	@return		array|null		Liste of Collation
+	 */
+	public function getListOfCollation()
+	{
+		$resql = $this->query('SHOW COLLATION');
+		$liste = array();
+		if ($resql)
+		{
+			$i = 0;
+			while ($obj = $this->fetch_object($resql))
+			{
+				$liste[$i]['collation'] = $obj->Collation;
+				$i++;
+			}
+			$this->free($resql);
+		} else {
+			// version Mysql < 4.1.1
+			return null;
+		}
+		return $liste;
+	}
 
-    /**
+	/**
 	 *	Return full path of dump program
 	 *
 	 *	@return		string		Full path of dump program
-     */
-    public function getPathOfDump()
-    {
-        $fullpathofdump = '/pathtomysqldump/mysqldump';
+	 */
+	public function getPathOfDump()
+	{
+		$fullpathofdump = '/pathtomysqldump/mysqldump';
 
-        $resql = $this->query('SHOW VARIABLES LIKE \'basedir\'');
-        if ($resql)
-        {
-            $liste = $this->fetch_array($resql);
-            $basedir = $liste['Value'];
-            $fullpathofdump = $basedir.(preg_match('/\/$/', $basedir) ? '' : '/').'bin/mysqldump';
-        }
-        return $fullpathofdump;
-    }
+		$resql = $this->query('SHOW VARIABLES LIKE \'basedir\'');
+		if ($resql)
+		{
+			$liste = $this->fetch_array($resql);
+			$basedir = $liste['Value'];
+			$fullpathofdump = $basedir.(preg_match('/\/$/', $basedir) ? '' : '/').'bin/mysqldump';
+		}
+		return $fullpathofdump;
+	}
 
-    /**
-     *	Return full path of restore program
-     *
-     *	@return		string		Full path of restore program
-     */
-    public function getPathOfRestore()
-    {
-        $fullpathofimport = '/pathtomysql/mysql';
+	/**
+	 *	Return full path of restore program
+	 *
+	 *	@return		string		Full path of restore program
+	 */
+	public function getPathOfRestore()
+	{
+		$fullpathofimport = '/pathtomysql/mysql';
 
-        $resql = $this->query('SHOW VARIABLES LIKE \'basedir\'');
-        if ($resql)
-        {
-            $liste = $this->fetch_array($resql);
-            $basedir = $liste['Value'];
-            $fullpathofimport = $basedir.(preg_match('/\/$/', $basedir) ? '' : '/').'bin/mysql';
-        }
-        return $fullpathofimport;
-    }
+		$resql = $this->query('SHOW VARIABLES LIKE \'basedir\'');
+		if ($resql)
+		{
+			$liste = $this->fetch_array($resql);
+			$basedir = $liste['Value'];
+			$fullpathofimport = $basedir.(preg_match('/\/$/', $basedir) ? '' : '/').'bin/mysql';
+		}
+		return $fullpathofimport;
+	}
 
-    /**
-     * Return value of server parameters
-     *
-     * @param	string	$filter		Filter list on a particular value
+	/**
+	 * Return value of server parameters
+	 *
+	 * @param	string	$filter		Filter list on a particular value
 	 * @return	array				Array of key-values (key=>value)
-     */
-    public function getServerParametersValues($filter = '')
-    {
-        $result = array();
+	 */
+	public function getServerParametersValues($filter = '')
+	{
+		$result = array();
 
-        $sql = 'SHOW VARIABLES';
-        if ($filter) $sql .= " LIKE '".$this->escape($filter)."'";
-        $resql = $this->query($sql);
-        if ($resql)
-        {
-        	while ($obj = $this->fetch_object($resql)) $result[$obj->Variable_name] = $obj->Value;
-        }
+		$sql = 'SHOW VARIABLES';
+		if ($filter) $sql .= " LIKE '".$this->escape($filter)."'";
+		$resql = $this->query($sql);
+		if ($resql)
+		{
+			while ($obj = $this->fetch_object($resql)) $result[$obj->Variable_name] = $obj->Value;
+		}
 
-        return $result;
-    }
+		return $result;
+	}
 
-    /**
-     * Return value of server status (current indicators on memory, cache...)
-     *
-     * @param	string	$filter		Filter list on a particular value
+	/**
+	 * Return value of server status (current indicators on memory, cache...)
+	 *
+	 * @param	string	$filter		Filter list on a particular value
 	 * @return  array				Array of key-values (key=>value)
-     */
-    public function getServerStatusValues($filter = '')
-    {
-        $result = array();
+	 */
+	public function getServerStatusValues($filter = '')
+	{
+		$result = array();
 
-        $sql = 'SHOW STATUS';
-        if ($filter) $sql .= " LIKE '".$this->escape($filter)."'";
-        $resql = $this->query($sql);
-        if ($resql)
-        {
-            while ($obj = $this->fetch_object($resql)) $result[$obj->Variable_name] = $obj->Value;
-        }
+		$sql = 'SHOW STATUS';
+		if ($filter) $sql .= " LIKE '".$this->escape($filter)."'";
+		$resql = $this->query($sql);
+		if ($resql)
+		{
+			while ($obj = $this->fetch_object($resql)) $result[$obj->Variable_name] = $obj->Value;
+		}
 
-        return $result;
-    }
+		return $result;
+	}
 }
diff --git a/htdocs/core/db/pgsql.class.php b/htdocs/core/db/pgsql.class.php
index d24b4e98189..b393945eeb3 100644
--- a/htdocs/core/db/pgsql.class.php
+++ b/htdocs/core/db/pgsql.class.php
@@ -35,14 +35,14 @@ require_once DOL_DOCUMENT_ROOT.'/core/db/DoliDB.class.php';
  */
 class DoliDBPgsql extends DoliDB
 {
-    //! Database type
-    public $type = 'pgsql'; // Name of manager
-    //! Database label
+	//! Database type
+	public $type = 'pgsql'; // Name of manager
+	//! Database label
 	const LABEL = 'PostgreSQL'; // Label of manager
 	//! Charset
-    public $forcecharset = 'UTF8'; // Can't be static as it may be forced with a dynamic value
-    //! Collate used to force collate when creating database
-    public $forcecollate = ''; // Can't be static as it may be forced with a dynamic value
+	public $forcecharset = 'UTF8'; // Can't be static as it may be forced with a dynamic value
+	//! Collate used to force collate when creating database
+	public $forcecollate = ''; // Can't be static as it may be forced with a dynamic value
 	//! Version min database
 	const VERSIONMIN = '9.0.0'; // Version min database
 	/** @var resource Resultset of last query */
@@ -62,17 +62,17 @@ class DoliDBPgsql extends DoliDB
 	 *	@param	    string	$name		Nom de la database
 	 *	@param	    int		$port		Port of database server
 	 */
-    public function __construct($type, $host, $user, $pass, $name = '', $port = 0)
+	public function __construct($type, $host, $user, $pass, $name = '', $port = 0)
 	{
 		global $conf, $langs;
 
-        // Note that having "static" property for "$forcecharset" and "$forcecollate" will make error here in strict mode, so they are not static
+		// Note that having "static" property for "$forcecharset" and "$forcecollate" will make error here in strict mode, so they are not static
 		if (!empty($conf->db->character_set)) $this->forcecharset = $conf->db->character_set;
 		if (!empty($conf->db->dolibarr_main_db_collation))	$this->forcecollate = $conf->db->dolibarr_main_db_collation;
 
 		$this->database_user = $user;
-        $this->database_host = $host;
-        $this->database_port = $port;
+		$this->database_host = $host;
+		$this->database_port = $port;
 
 		$this->transaction_opened = 0;
 
@@ -136,14 +136,14 @@ class DoliDBPgsql extends DoliDB
 	}
 
 
-    /**
-     *  Convert a SQL request in Mysql syntax to native syntax
-     *
-     *  @param  string	$line   			SQL request line to convert
-     *  @param  string	$type				Type of SQL order ('ddl' for insert, update, select, delete or 'dml' for create, alter...)
-     *  @param	bool	$unescapeslashquot	Unescape slash quote with quote quote
-     *  @return string   					SQL request line converted
-     */
+	/**
+	 *  Convert a SQL request in Mysql syntax to native syntax
+	 *
+	 *  @param  string	$line   			SQL request line to convert
+	 *  @param  string	$type				Type of SQL order ('ddl' for insert, update, select, delete or 'dml' for create, alter...)
+	 *  @param	bool	$unescapeslashquot	Unescape slash quote with quote quote
+	 *  @return string   					SQL request line converted
+	 */
 	public static function convertSQLFromMysql($line, $type = 'auto', $unescapeslashquot = false)
 	{
 		global $conf;
@@ -161,163 +161,163 @@ class DoliDBPgsql extends DoliDB
 		{
 			// group_concat support (PgSQL >= 9.0)
 			// Replace group_concat(x) or group_concat(x SEPARATOR ',') with string_agg(x, ',')
-		    $line = preg_replace('/GROUP_CONCAT/i', 'STRING_AGG', $line);
+			$line = preg_replace('/GROUP_CONCAT/i', 'STRING_AGG', $line);
 			$line = preg_replace('/ SEPARATOR/i', ',', $line);
 			$line = preg_replace('/STRING_AGG\(([^,\)]+)\)/i', 'STRING_AGG(\\1, \',\')', $line);
 			//print $line."\n";
 
-		    if ($type == 'auto')
-		    {
-                if (preg_match('/ALTER TABLE/i', $line)) $type = 'dml';
-                elseif (preg_match('/CREATE TABLE/i', $line)) $type = 'dml';
-                elseif (preg_match('/DROP TABLE/i', $line)) $type = 'dml';
-		    }
+			if ($type == 'auto')
+			{
+				if (preg_match('/ALTER TABLE/i', $line)) $type = 'dml';
+				elseif (preg_match('/CREATE TABLE/i', $line)) $type = 'dml';
+				elseif (preg_match('/DROP TABLE/i', $line)) $type = 'dml';
+			}
 
-    		$line = preg_replace('/ as signed\)/i', ' as integer)', $line);
+			$line = preg_replace('/ as signed\)/i', ' as integer)', $line);
 
-		    if ($type == 'dml')
-		    {
-		    	$reg = array();
+			if ($type == 'dml')
+			{
+				$reg = array();
 
-                $line = preg_replace('/\s/', ' ', $line); // Replace tabulation with space
+				$line = preg_replace('/\s/', ' ', $line); // Replace tabulation with space
 
-		        // we are inside create table statement so lets process datatypes
-    			if (preg_match('/(ISAM|innodb)/i', $line)) { // end of create table sequence
-    				$line = preg_replace('/\)[\s\t]*type[\s\t]*=[\s\t]*(MyISAM|innodb).*;/i', ');', $line);
-    				$line = preg_replace('/\)[\s\t]*engine[\s\t]*=[\s\t]*(MyISAM|innodb).*;/i', ');', $line);
-    				$line = preg_replace('/,$/', '', $line);
-    			}
+				// we are inside create table statement so lets process datatypes
+				if (preg_match('/(ISAM|innodb)/i', $line)) { // end of create table sequence
+					$line = preg_replace('/\)[\s\t]*type[\s\t]*=[\s\t]*(MyISAM|innodb).*;/i', ');', $line);
+					$line = preg_replace('/\)[\s\t]*engine[\s\t]*=[\s\t]*(MyISAM|innodb).*;/i', ');', $line);
+					$line = preg_replace('/,$/', '', $line);
+				}
 
-    			// Process case: "CREATE TABLE llx_mytable(rowid integer NOT NULL AUTO_INCREMENT PRIMARY KEY,code..."
-    			if (preg_match('/[\s\t\(]*(\w*)[\s\t]+int.*auto_increment/i', $line, $reg)) {
-    				$newline = preg_replace('/([\s\t\(]*)([a-zA-Z_0-9]*)[\s\t]+int.*auto_increment[^,]*/i', '\\1 \\2 SERIAL PRIMARY KEY', $line);
-                    //$line = "-- ".$line." replaced by --\n".$newline;
-                    $line = $newline;
-    			}
+				// Process case: "CREATE TABLE llx_mytable(rowid integer NOT NULL AUTO_INCREMENT PRIMARY KEY,code..."
+				if (preg_match('/[\s\t\(]*(\w*)[\s\t]+int.*auto_increment/i', $line, $reg)) {
+					$newline = preg_replace('/([\s\t\(]*)([a-zA-Z_0-9]*)[\s\t]+int.*auto_increment[^,]*/i', '\\1 \\2 SERIAL PRIMARY KEY', $line);
+					//$line = "-- ".$line." replaced by --\n".$newline;
+					$line = $newline;
+				}
 
-    			if (preg_match('/[\s\t\(]*(\w*)[\s\t]+bigint.*auto_increment/i', $line, $reg)) {
-    				$newline = preg_replace('/([\s\t\(]*)([a-zA-Z_0-9]*)[\s\t]+bigint.*auto_increment[^,]*/i', '\\1 \\2 BIGSERIAL PRIMARY KEY', $line);
-    				//$line = "-- ".$line." replaced by --\n".$newline;
-    				$line = $newline;
-    			}
+				if (preg_match('/[\s\t\(]*(\w*)[\s\t]+bigint.*auto_increment/i', $line, $reg)) {
+					$newline = preg_replace('/([\s\t\(]*)([a-zA-Z_0-9]*)[\s\t]+bigint.*auto_increment[^,]*/i', '\\1 \\2 BIGSERIAL PRIMARY KEY', $line);
+					//$line = "-- ".$line." replaced by --\n".$newline;
+					$line = $newline;
+				}
 
-    			// tinyint type conversion
-    			$line = preg_replace('/tinyint\(?[0-9]*\)?/', 'smallint', $line);
-    			$line = preg_replace('/tinyint/i', 'smallint', $line);
+				// tinyint type conversion
+				$line = preg_replace('/tinyint\(?[0-9]*\)?/', 'smallint', $line);
+				$line = preg_replace('/tinyint/i', 'smallint', $line);
 
-    			// nuke unsigned
-    			$line = preg_replace('/(int\w+|smallint)\s+unsigned/i', '\\1', $line);
+				// nuke unsigned
+				$line = preg_replace('/(int\w+|smallint)\s+unsigned/i', '\\1', $line);
 
-    			// blob -> text
-    			$line = preg_replace('/\w*blob/i', 'text', $line);
+				// blob -> text
+				$line = preg_replace('/\w*blob/i', 'text', $line);
 
-    			// tinytext/mediumtext -> text
-    			$line = preg_replace('/tinytext/i', 'text', $line);
-    			$line = preg_replace('/mediumtext/i', 'text', $line);
-    			$line = preg_replace('/longtext/i', 'text', $line);
+				// tinytext/mediumtext -> text
+				$line = preg_replace('/tinytext/i', 'text', $line);
+				$line = preg_replace('/mediumtext/i', 'text', $line);
+				$line = preg_replace('/longtext/i', 'text', $line);
 
-    			$line = preg_replace('/text\([0-9]+\)/i', 'text', $line);
+				$line = preg_replace('/text\([0-9]+\)/i', 'text', $line);
 
-    			// change not null datetime field to null valid ones
-    			// (to support remapping of "zero time" to null
-    			$line = preg_replace('/datetime not null/i', 'datetime', $line);
-    			$line = preg_replace('/datetime/i', 'timestamp', $line);
+				// change not null datetime field to null valid ones
+				// (to support remapping of "zero time" to null
+				$line = preg_replace('/datetime not null/i', 'datetime', $line);
+				$line = preg_replace('/datetime/i', 'timestamp', $line);
 
-    			// double -> numeric
-    			$line = preg_replace('/^double/i', 'numeric', $line);
-    			$line = preg_replace('/(\s*)double/i', '\\1numeric', $line);
-    			// float -> numeric
-    			$line = preg_replace('/^float/i', 'numeric', $line);
-    			$line = preg_replace('/(\s*)float/i', '\\1numeric', $line);
+				// double -> numeric
+				$line = preg_replace('/^double/i', 'numeric', $line);
+				$line = preg_replace('/(\s*)double/i', '\\1numeric', $line);
+				// float -> numeric
+				$line = preg_replace('/^float/i', 'numeric', $line);
+				$line = preg_replace('/(\s*)float/i', '\\1numeric', $line);
 
-    			//Check tms timestamp field case (in Mysql this field is defautled to now and
-    			// on update defaulted by now
-    			$line = preg_replace('/(\s*)tms(\s*)timestamp/i', '\\1tms timestamp without time zone DEFAULT now() NOT NULL', $line);
+				//Check tms timestamp field case (in Mysql this field is defautled to now and
+				// on update defaulted by now
+				$line = preg_replace('/(\s*)tms(\s*)timestamp/i', '\\1tms timestamp without time zone DEFAULT now() NOT NULL', $line);
 
-    			// nuke DEFAULT CURRENT_TIMESTAMP
-    			$line = preg_replace('/(\s*)DEFAULT(\s*)CURRENT_TIMESTAMP/i', '\\1', $line);
+				// nuke DEFAULT CURRENT_TIMESTAMP
+				$line = preg_replace('/(\s*)DEFAULT(\s*)CURRENT_TIMESTAMP/i', '\\1', $line);
 
-    			// nuke ON UPDATE CURRENT_TIMESTAMP
-    			$line = preg_replace('/(\s*)ON(\s*)UPDATE(\s*)CURRENT_TIMESTAMP/i', '\\1', $line);
+				// nuke ON UPDATE CURRENT_TIMESTAMP
+				$line = preg_replace('/(\s*)ON(\s*)UPDATE(\s*)CURRENT_TIMESTAMP/i', '\\1', $line);
 
-    			// unique index(field1,field2)
-    			if (preg_match('/unique index\s*\((\w+\s*,\s*\w+)\)/i', $line))
-    			{
-    				$line = preg_replace('/unique index\s*\((\w+\s*,\s*\w+)\)/i', 'UNIQUE\(\\1\)', $line);
-    			}
+				// unique index(field1,field2)
+				if (preg_match('/unique index\s*\((\w+\s*,\s*\w+)\)/i', $line))
+				{
+					$line = preg_replace('/unique index\s*\((\w+\s*,\s*\w+)\)/i', 'UNIQUE\(\\1\)', $line);
+				}
 
-    			// We remove end of requests "AFTER fieldxxx"
-    			$line = preg_replace('/\sAFTER [a-z0-9_]+/i', '', $line);
+				// We remove end of requests "AFTER fieldxxx"
+				$line = preg_replace('/\sAFTER [a-z0-9_]+/i', '', $line);
 
-    			// We remove start of requests "ALTER TABLE tablexxx" if this is a DROP INDEX
-    			$line = preg_replace('/ALTER TABLE [a-z0-9_]+\s+DROP INDEX/i', 'DROP INDEX', $line);
+				// We remove start of requests "ALTER TABLE tablexxx" if this is a DROP INDEX
+				$line = preg_replace('/ALTER TABLE [a-z0-9_]+\s+DROP INDEX/i', 'DROP INDEX', $line);
 
-                // Translate order to rename fields
-                if (preg_match('/ALTER TABLE ([a-z0-9_]+)\s+CHANGE(?: COLUMN)? ([a-z0-9_]+) ([a-z0-9_]+)(.*)$/i', $line, $reg))
-                {
-                	$line = "-- ".$line." replaced by --\n";
-                    $line .= "ALTER TABLE ".$reg[1]." RENAME COLUMN ".$reg[2]." TO ".$reg[3];
-                }
+				// Translate order to rename fields
+				if (preg_match('/ALTER TABLE ([a-z0-9_]+)\s+CHANGE(?: COLUMN)? ([a-z0-9_]+) ([a-z0-9_]+)(.*)$/i', $line, $reg))
+				{
+					$line = "-- ".$line." replaced by --\n";
+					$line .= "ALTER TABLE ".$reg[1]." RENAME COLUMN ".$reg[2]." TO ".$reg[3];
+				}
 
-                // Translate order to modify field format
-                if (preg_match('/ALTER TABLE ([a-z0-9_]+)\s+MODIFY(?: COLUMN)? ([a-z0-9_]+) (.*)$/i', $line, $reg))
-                {
-                    $line = "-- ".$line." replaced by --\n";
-                    $newreg3 = $reg[3];
-                    $newreg3 = preg_replace('/ DEFAULT NULL/i', '', $newreg3);
-                    $newreg3 = preg_replace('/ NOT NULL/i', '', $newreg3);
-                    $newreg3 = preg_replace('/ NULL/i', '', $newreg3);
-                    $newreg3 = preg_replace('/ DEFAULT 0/i', '', $newreg3);
-                    $newreg3 = preg_replace('/ DEFAULT \'?[0-9a-zA-Z_@]*\'?/i', '', $newreg3);
-                    $line .= "ALTER TABLE ".$reg[1]." ALTER COLUMN ".$reg[2]." TYPE ".$newreg3;
-                    // TODO Add alter to set default value or null/not null if there is this in $reg[3]
-                }
+				// Translate order to modify field format
+				if (preg_match('/ALTER TABLE ([a-z0-9_]+)\s+MODIFY(?: COLUMN)? ([a-z0-9_]+) (.*)$/i', $line, $reg))
+				{
+					$line = "-- ".$line." replaced by --\n";
+					$newreg3 = $reg[3];
+					$newreg3 = preg_replace('/ DEFAULT NULL/i', '', $newreg3);
+					$newreg3 = preg_replace('/ NOT NULL/i', '', $newreg3);
+					$newreg3 = preg_replace('/ NULL/i', '', $newreg3);
+					$newreg3 = preg_replace('/ DEFAULT 0/i', '', $newreg3);
+					$newreg3 = preg_replace('/ DEFAULT \'?[0-9a-zA-Z_@]*\'?/i', '', $newreg3);
+					$line .= "ALTER TABLE ".$reg[1]." ALTER COLUMN ".$reg[2]." TYPE ".$newreg3;
+					// TODO Add alter to set default value or null/not null if there is this in $reg[3]
+				}
 
-                // alter table add primary key (field1, field2 ...) -> We remove the primary key name not accepted by PostGreSQL
-    			// ALTER TABLE llx_dolibarr_modules ADD PRIMARY KEY pk_dolibarr_modules (numero, entity)
-    			if (preg_match('/ALTER\s+TABLE\s*(.*)\s*ADD\s+PRIMARY\s+KEY\s*(.*)\s*\((.*)$/i', $line, $reg))
-    			{
-    				$line = "-- ".$line." replaced by --\n";
-    				$line .= "ALTER TABLE ".$reg[1]." ADD PRIMARY KEY (".$reg[3];
-    			}
+				// alter table add primary key (field1, field2 ...) -> We remove the primary key name not accepted by PostGreSQL
+				// ALTER TABLE llx_dolibarr_modules ADD PRIMARY KEY pk_dolibarr_modules (numero, entity)
+				if (preg_match('/ALTER\s+TABLE\s*(.*)\s*ADD\s+PRIMARY\s+KEY\s*(.*)\s*\((.*)$/i', $line, $reg))
+				{
+					$line = "-- ".$line." replaced by --\n";
+					$line .= "ALTER TABLE ".$reg[1]." ADD PRIMARY KEY (".$reg[3];
+				}
 
-                // Translate order to drop primary keys
-                // ALTER TABLE llx_dolibarr_modules DROP PRIMARY KEY pk_xxx
-                if (preg_match('/ALTER\s+TABLE\s*(.*)\s*DROP\s+PRIMARY\s+KEY\s*([^;]+)$/i', $line, $reg))
-                {
-                    $line = "-- ".$line." replaced by --\n";
-                    $line .= "ALTER TABLE ".$reg[1]." DROP CONSTRAINT ".$reg[2];
-                }
+				// Translate order to drop primary keys
+				// ALTER TABLE llx_dolibarr_modules DROP PRIMARY KEY pk_xxx
+				if (preg_match('/ALTER\s+TABLE\s*(.*)\s*DROP\s+PRIMARY\s+KEY\s*([^;]+)$/i', $line, $reg))
+				{
+					$line = "-- ".$line." replaced by --\n";
+					$line .= "ALTER TABLE ".$reg[1]." DROP CONSTRAINT ".$reg[2];
+				}
 
-		        // Translate order to drop foreign keys
-                // ALTER TABLE llx_dolibarr_modules DROP FOREIGN KEY fk_xxx
-                if (preg_match('/ALTER\s+TABLE\s*(.*)\s*DROP\s+FOREIGN\s+KEY\s*(.*)$/i', $line, $reg))
-                {
-                    $line = "-- ".$line." replaced by --\n";
-                    $line .= "ALTER TABLE ".$reg[1]." DROP CONSTRAINT ".$reg[2];
-                }
+				// Translate order to drop foreign keys
+				// ALTER TABLE llx_dolibarr_modules DROP FOREIGN KEY fk_xxx
+				if (preg_match('/ALTER\s+TABLE\s*(.*)\s*DROP\s+FOREIGN\s+KEY\s*(.*)$/i', $line, $reg))
+				{
+					$line = "-- ".$line." replaced by --\n";
+					$line .= "ALTER TABLE ".$reg[1]." DROP CONSTRAINT ".$reg[2];
+				}
 
-                // Translate order to add foreign keys
-                // ALTER TABLE llx_tablechild ADD CONSTRAINT fk_tablechild_fk_fieldparent FOREIGN KEY (fk_fieldparent) REFERENCES llx_tableparent (rowid)
-                if (preg_match('/ALTER\s+TABLE\s+(.*)\s*ADD CONSTRAINT\s+(.*)\s*FOREIGN\s+KEY\s*(.*)$/i', $line, $reg))
-                {
-                    $line = preg_replace('/;$/', '', $line);
-                    $line .= " DEFERRABLE INITIALLY IMMEDIATE;";
-                }
+				// Translate order to add foreign keys
+				// ALTER TABLE llx_tablechild ADD CONSTRAINT fk_tablechild_fk_fieldparent FOREIGN KEY (fk_fieldparent) REFERENCES llx_tableparent (rowid)
+				if (preg_match('/ALTER\s+TABLE\s+(.*)\s*ADD CONSTRAINT\s+(.*)\s*FOREIGN\s+KEY\s*(.*)$/i', $line, $reg))
+				{
+					$line = preg_replace('/;$/', '', $line);
+					$line .= " DEFERRABLE INITIALLY IMMEDIATE;";
+				}
 
-                // alter table add [unique] [index] (field1, field2 ...)
-    			// ALTER TABLE llx_accountingaccount ADD INDEX idx_accountingaccount_fk_pcg_version (fk_pcg_version)
-    			if (preg_match('/ALTER\s+TABLE\s*(.*)\s*ADD\s+(UNIQUE INDEX|INDEX|UNIQUE)\s+(.*)\s*\(([\w,\s]+)\)/i', $line, $reg))
-    			{
-    				$fieldlist = $reg[4];
-    				$idxname = $reg[3];
-    				$tablename = $reg[1];
-    				$line = "-- ".$line." replaced by --\n";
-    				$line .= "CREATE ".(preg_match('/UNIQUE/', $reg[2]) ? 'UNIQUE ' : '')."INDEX ".$idxname." ON ".$tablename." (".$fieldlist.")";
-    			}
-            }
+				// alter table add [unique] [index] (field1, field2 ...)
+				// ALTER TABLE llx_accountingaccount ADD INDEX idx_accountingaccount_fk_pcg_version (fk_pcg_version)
+				if (preg_match('/ALTER\s+TABLE\s*(.*)\s*ADD\s+(UNIQUE INDEX|INDEX|UNIQUE)\s+(.*)\s*\(([\w,\s]+)\)/i', $line, $reg))
+				{
+					$fieldlist = $reg[4];
+					$idxname = $reg[3];
+					$tablename = $reg[1];
+					$line = "-- ".$line." replaced by --\n";
+					$line .= "CREATE ".(preg_match('/UNIQUE/', $reg[2]) ? 'UNIQUE ' : '')."INDEX ".$idxname." ON ".$tablename." (".$fieldlist.")";
+				}
+			}
 
-            // To have postgresql case sensitive
+			// To have postgresql case sensitive
 			$count_like = 0;
 			$line = str_replace(' LIKE \'', ' ILIKE \'', $line, $count_like);
 			if (!empty($conf->global->PSQL_USE_UNACCENT) && $count_like > 0)
@@ -326,10 +326,10 @@ class DoliDBPgsql extends DoliDB
 				$line = preg_replace('/\s+(\(+\s*)([a-zA-Z0-9\-\_\.]+) ILIKE /', ' \1unaccent(\2) ILIKE ', $line);
 			}
 
-            $line = str_replace(' LIKE BINARY \'', ' LIKE \'', $line);
+			$line = str_replace(' LIKE BINARY \'', ' LIKE \'', $line);
 
-            // Replace INSERT IGNORE into INSERT
-            $line = preg_replace('/^INSERT IGNORE/', 'INSERT', $line);
+			// Replace INSERT IGNORE into INSERT
+			$line = preg_replace('/^INSERT IGNORE/', 'INSERT', $line);
 
 			// Delete using criteria on other table must not declare twice the deleted table
 			// DELETE FROM tabletodelete USING tabletodelete, othertable -> DELETE FROM tabletodelete USING othertable
@@ -373,24 +373,24 @@ class DoliDBPgsql extends DoliDB
 		return $line;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Select a database
-     *  Ici postgresql n'a aucune fonction equivalente de mysql_select_db
-     *  On compare juste manuellement si la database choisie est bien celle activee par la connexion
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Select a database
+	 *  Ici postgresql n'a aucune fonction equivalente de mysql_select_db
+	 *  On compare juste manuellement si la database choisie est bien celle activee par la connexion
 	 *
 	 *	@param	    string	$database	Name of database
 	 *	@return	    bool				true if OK, false if KO
 	 */
-    public function select_db($database)
+	public function select_db($database)
 	{
-        // phpcs:enable
-        if ($database == $this->database_name) {
-            return true;
-        } else {
-            return false;
-        }
-    }
+		// phpcs:enable
+		if ($database == $this->database_name) {
+			return true;
+		} else {
+			return false;
+		}
+	}
 
 	/**
 	 *	Connexion to server
@@ -403,7 +403,7 @@ class DoliDBPgsql extends DoliDB
 	 *	@return		bool|resource			Database access handler
 	 *	@see		close()
 	 */
-    public function connect($host, $login, $passwd, $name, $port = 0)
+	public function connect($host, $login, $passwd, $name, $port = 0)
 	{
 		// use pg_pconnect() instead of pg_connect() if you want to use persistent connection costing 1ms, instead of 30ms for non persistent
 
@@ -428,7 +428,7 @@ class DoliDBPgsql extends DoliDB
 		// if local connection failed or not requested, use TCP/IP
 		if (!$this->db)
 		{
-		    if (!$host) $host = "localhost";
+			if (!$host) $host = "localhost";
 			if (!$port) $port = 5432;
 
 			$con_string = "host='".$host."' port='".$port."' dbname='".$name."' user='".$login."' password='".$passwd."'";
@@ -451,13 +451,13 @@ class DoliDBPgsql extends DoliDB
 	 *
 	 *	@return	        string      Version string
 	 */
-    public function getVersion()
+	public function getVersion()
 	{
 		$resql = $this->query('SHOW server_version');
 		if ($resql)
 		{
-		    $liste = $this->fetch_array($resql);
-		    return $liste['server_version'];
+			$liste = $this->fetch_array($resql);
+			return $liste['server_version'];
 		}
 		return '';
 	}
@@ -467,37 +467,37 @@ class DoliDBPgsql extends DoliDB
 	 *
 	 *	@return	        string      Version string
 	 */
-    public function getDriverInfo()
+	public function getDriverInfo()
 	{
 		return 'pgsql php driver';
 	}
 
-    /**
-     *  Close database connexion
-     *
-     *  @return     boolean     True if disconnect successfull, false otherwise
-     *  @see        connect()
-     */
-    public function close()
-    {
-        if ($this->db)
-        {
-            if ($this->transaction_opened > 0) dol_syslog(get_class($this)."::close Closing a connection with an opened transaction depth=".$this->transaction_opened, LOG_ERR);
-            $this->connected = false;
-            return pg_close($this->db);
-        }
-        return false;
-    }
+	/**
+	 *  Close database connexion
+	 *
+	 *  @return     boolean     True if disconnect successfull, false otherwise
+	 *  @see        connect()
+	 */
+	public function close()
+	{
+		if ($this->db)
+		{
+			if ($this->transaction_opened > 0) dol_syslog(get_class($this)."::close Closing a connection with an opened transaction depth=".$this->transaction_opened, LOG_ERR);
+			$this->connected = false;
+			return pg_close($this->db);
+		}
+		return false;
+	}
 
 	/**
 	 * Convert request to PostgreSQL syntax, execute it and return the resultset
 	 *
 	 * @param	string	$query			SQL query string
 	 * @param	int		$usesavepoint	0=Default mode, 1=Run a savepoint before and a rollback to savepoint if error (this allow to have some request with errors inside global transactions).
-     * @param   string	$type           Type of SQL order ('ddl' for insert, update, select, delete or 'dml' for create, alter...)
+	 * @param   string	$type           Type of SQL order ('ddl' for insert, update, select, delete or 'dml' for create, alter...)
 	 * @return	false|resource			Resultset of answer
 	 */
-    public function query($query, $usesavepoint = 0, $type = 'auto')
+	public function query($query, $usesavepoint = 0, $type = 'auto')
 	{
 		global $conf;
 
@@ -539,16 +539,16 @@ class DoliDBPgsql extends DoliDB
 		{
 			if (!$ret)
 			{
-			    if ($this->errno() != 'DB_ERROR_25P02')	// Do not overwrite errors if this is a consecutive error
-			    {
-    				$this->lastqueryerror = $query;
-    				$this->lasterror = $this->error();
-    				$this->lasterrno = $this->errno();
+				if ($this->errno() != 'DB_ERROR_25P02')	// Do not overwrite errors if this is a consecutive error
+				{
+					$this->lastqueryerror = $query;
+					$this->lasterror = $this->error();
+					$this->lasterrno = $this->errno();
 
-    				if ($conf->global->SYSLOG_LEVEL < LOG_DEBUG) dol_syslog(get_class($this)."::query SQL Error query: ".$query, LOG_ERR); // Log of request was not yet done previously
+					if ($conf->global->SYSLOG_LEVEL < LOG_DEBUG) dol_syslog(get_class($this)."::query SQL Error query: ".$query, LOG_ERR); // Log of request was not yet done previously
 					dol_syslog(get_class($this)."::query SQL Error message: ".$this->lasterror." (".$this->lasterrno.")", LOG_ERR);
 					dol_syslog(get_class($this)."::query SQL Error usesavepoint = ".$usesavepoint, LOG_ERR);
-			    }
+				}
 
 				if ($usesavepoint && $this->transaction_opened)	// Warning, after that errno will be erased
 				{
@@ -562,68 +562,68 @@ class DoliDBPgsql extends DoliDB
 		return $ret;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Renvoie la ligne courante (comme un objet) pour le curseur resultset
 	 *
 	 *	@param	resource	$resultset  Curseur de la requete voulue
 	 *	@return	false|object			Object result line or false if KO or end of cursor
 	 */
-    public function fetch_object($resultset)
+	public function fetch_object($resultset)
 	{
-        // phpcs:enable
-        // If resultset not provided, we take the last used by connexion
+		// phpcs:enable
+		// If resultset not provided, we take the last used by connexion
 		if (!is_resource($resultset)) { $resultset = $this->_results; }
 		return pg_fetch_object($resultset);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *	Return datas as an array
-     *
-     *	@param	resource	$resultset  Resultset of request
-     *	@return	false|array				Array
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *	Return datas as an array
+	 *
+	 *	@param	resource	$resultset  Resultset of request
+	 *	@return	false|array				Array
 	 */
-    public function fetch_array($resultset)
+	public function fetch_array($resultset)
 	{
-        // phpcs:enable
-        // If resultset not provided, we take the last used by connexion
+		// phpcs:enable
+		// If resultset not provided, we take the last used by connexion
 		if (!is_resource($resultset)) { $resultset = $this->_results; }
 		return pg_fetch_array($resultset);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-     *	Return datas as an array
-     *
-     *	@param	resource	$resultset  Resultset of request
-     *	@return	false|array				Array
+	 *	Return datas as an array
+	 *
+	 *	@param	resource	$resultset  Resultset of request
+	 *	@return	false|array				Array
 	 */
-    public function fetch_row($resultset)
+	public function fetch_row($resultset)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		// Si le resultset n'est pas fourni, on prend le dernier utilise sur cette connexion
 		if (!is_resource($resultset)) { $resultset = $this->_results; }
 		return pg_fetch_row($resultset);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *	Return number of lines for result of a SELECT
-     *
-     *	@param	resource	$resultset  Resulset of requests
-     *	@return int		    			Nb of lines, -1 on error
-     *	@see    affected_rows()
-     */
-    public function num_rows($resultset)
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *	Return number of lines for result of a SELECT
+	 *
+	 *	@param	resource	$resultset  Resulset of requests
+	 *	@return int		    			Nb of lines, -1 on error
+	 *	@see    affected_rows()
+	 */
+	public function num_rows($resultset)
 	{
-        // phpcs:enable
-        // If resultset not provided, we take the last used by connexion
+		// phpcs:enable
+		// If resultset not provided, we take the last used by connexion
 		if (!is_resource($resultset)) { $resultset = $this->_results; }
 		return pg_num_rows($resultset);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Return the number of lines in the result of a request INSERT, DELETE or UPDATE
 	 *
@@ -631,10 +631,10 @@ class DoliDBPgsql extends DoliDB
 	 * @return  int		    			Nb of lines
 	 * @see 	num_rows()
 	 */
-    public function affected_rows($resultset)
+	public function affected_rows($resultset)
 	{
-        // phpcs:enable
-        // If resultset not provided, we take the last used by connexion
+		// phpcs:enable
+		// If resultset not provided, we take the last used by connexion
 		if (!is_resource($resultset)) { $resultset = $this->_results; }
 		// pgsql necessite un resultset pour cette fonction contrairement
 		// a mysql qui prend un link de base
@@ -648,9 +648,9 @@ class DoliDBPgsql extends DoliDB
 	 * @param	resource	$resultset  Result set of request
 	 * @return	void
 	 */
-    public function free($resultset = null)
+	public function free($resultset = null)
 	{
-        // If resultset not provided, we take the last used by connexion
+		// If resultset not provided, we take the last used by connexion
 		if (!is_resource($resultset)) { $resultset = $this->_results; }
 		// Si resultset en est un, on libere la memoire
 		if (is_resource($resultset)) pg_free_result($resultset);
@@ -658,16 +658,16 @@ class DoliDBPgsql extends DoliDB
 
 
 	/**
-     *	Define limits and offset of request
-     *
-     *	@param	int		$limit      Maximum number of lines returned (-1=conf->liste_limit, 0=no limit)
-     *	@param	int		$offset     Numero of line from where starting fetch
-     *	@return	string      		String with SQL syntax to add a limit and offset
+	 *	Define limits and offset of request
+	 *
+	 *	@param	int		$limit      Maximum number of lines returned (-1=conf->liste_limit, 0=no limit)
+	 *	@param	int		$offset     Numero of line from where starting fetch
+	 *	@return	string      		String with SQL syntax to add a limit and offset
 	 */
-    public function plimit($limit = 0, $offset = 0)
+	public function plimit($limit = 0, $offset = 0)
 	{
 		global $conf;
-        if (empty($limit)) return "";
+		if (empty($limit)) return "";
 		if ($limit < 0) $limit = $conf->liste_limit;
 		if ($offset > 0) return " LIMIT ".$limit." OFFSET ".$offset." ";
 		else return " LIMIT $limit ";
@@ -680,32 +680,32 @@ class DoliDBPgsql extends DoliDB
 	 *   @param		string	$stringtoencode		String to escape
 	 *   @return	string						String escaped
 	 */
-    public function escape($stringtoencode)
+	public function escape($stringtoencode)
 	{
 		return pg_escape_string($stringtoencode);
 	}
 
-    /**
+	/**
 	 *   Convert (by PHP) a GM Timestamp date into a GM string date to insert into a date field.
 	 *   Function to use to build INSERT, UPDATE or WHERE predica
 	 *
 	 *   @param	    string	$param      Date TMS to convert
 	 *   @return	string   			Date in a string YYYY-MM-DD HH:MM:SS
 	 */
-    public function idate($param)
+	public function idate($param)
 	{
 		return dol_print_date($param, "%Y-%m-%d %H:%M:%S");
 	}
 
 	/**
-     *  Format a SQL IF
-     *
+	 *  Format a SQL IF
+	 *
 	 *  @param	string	$test           Test string (example: 'cd.statut=0', 'field IS NULL')
 	 *  @param	string	$resok          resultat si test egal
 	 *  @param	string	$resko          resultat si test non egal
 	 *  @return	string          		chaine formate SQL
 	 */
-    public function ifsql($test, $resok, $resko)
+	public function ifsql($test, $resok, $resko)
 	{
 		return '(CASE WHEN '.$test.' THEN '.$resok.' ELSE '.$resko.' END)';
 	}
@@ -715,7 +715,7 @@ class DoliDBPgsql extends DoliDB
 	 *
 	 * @return	string		Error code (Exemples: DB_ERROR_TABLE_ALREADY_EXISTS, DB_ERROR_RECORD_ALREADY_EXISTS...)
 	 */
-    public function errno()
+	public function errno()
 	{
 		if (!$this->connected) {
 			// Si il y a eu echec de connexion, $this->db n'est pas valide.
@@ -780,12 +780,12 @@ class DoliDBPgsql extends DoliDB
 	 *
 	 * @return	string		Error text
 	 */
-    public function error()
+	public function error()
 	{
 		return pg_last_error($this->db);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Get last ID after an insert INSERT
 	 *
@@ -793,9 +793,9 @@ class DoliDBPgsql extends DoliDB
 	 * @param	string	$fieldid	Field name
 	 * @return  string     			Id of row
 	 */
-    public function last_insert_id($tab, $fieldid = 'rowid')
+	public function last_insert_id($tab, $fieldid = 'rowid')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		//$result = pg_query($this->db,"SELECT MAX(".$fieldid.") FROM ".$tab);
 		$result = pg_query($this->db, "SELECT currval('".$tab."_".$fieldid."_seq')");
 		if (!$result)
@@ -809,14 +809,14 @@ class DoliDBPgsql extends DoliDB
 	}
 
 	/**
-     *  Encrypt sensitive data in database
-     *  Warning: This function includes the escape, so it must use direct value
-     *
-     *  @param  string  $fieldorvalue   Field name or value to encrypt
-     *  @param	int		$withQuotes     Return string with quotes
-     *  @return string          		XXX(field) or XXX('value') or field or 'value'
+	 *  Encrypt sensitive data in database
+	 *  Warning: This function includes the escape, so it must use direct value
+	 *
+	 *  @param  string  $fieldorvalue   Field name or value to encrypt
+	 *  @param	int		$withQuotes     Return string with quotes
+	 *  @return string          		XXX(field) or XXX('value') or field or 'value'
 	 */
-    public function encrypt($fieldorvalue, $withQuotes = 0)
+	public function encrypt($fieldorvalue, $withQuotes = 0)
 	{
 		global $conf;
 
@@ -837,7 +837,7 @@ class DoliDBPgsql extends DoliDB
 	 *	@param	int		$value			Value to decrypt
 	 * 	@return	string					Decrypted value if used
 	 */
-    public function decrypt($value)
+	public function decrypt($value)
 	{
 		global $conf;
 
@@ -852,21 +852,21 @@ class DoliDBPgsql extends DoliDB
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Return connexion ID
 	 *
 	 * @return	        string      Id connexion
 	 */
-    public function DDLGetConnectId()
+	public function DDLGetConnectId()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		return '?';
 	}
 
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Create a new database
 	 *	Do not use function xxx_create_db (xxx=mysql, ...) as they are deprecated
@@ -878,10 +878,10 @@ class DoliDBPgsql extends DoliDB
 	 * 	@param	string	$owner			Username of database owner
 	 * 	@return	false|resource				resource defined if OK, null if KO
 	 */
-    public function DDLCreateDb($database, $charset = '', $collation = '', $owner = '')
+	public function DDLCreateDb($database, $charset = '', $collation = '', $owner = '')
 	{
-        // phpcs:enable
-	    if (empty($charset))   $charset = $this->forcecharset;
+		// phpcs:enable
+		if (empty($charset))   $charset = $this->forcecharset;
 		if (empty($collation)) $collation = $this->forcecollate;
 
 		// Test charset match LC_TYPE (pgsql error otherwise)
@@ -893,7 +893,7 @@ class DoliDBPgsql extends DoliDB
 		return $ret;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  List tables into a database
 	 *
@@ -901,25 +901,25 @@ class DoliDBPgsql extends DoliDB
 	 *  @param	string		$table		Name of table filter ('xxx%')
 	 *  @return	array					List of tables in an array
 	 */
-    public function DDLListTables($database, $table = '')
-    {
-        // phpcs:enable
+	public function DDLListTables($database, $table = '')
+	{
+		// phpcs:enable
 		$listtables = array();
 
 		$like = '';
 		if ($table) $like = " AND table_name LIKE '".$this->escape($table)."'";
 		$result = pg_query($this->db, "SELECT table_name FROM information_schema.tables WHERE table_schema = 'public'".$like." ORDER BY table_name");
-        if ($result)
-        {
-    		while ($row = $this->fetch_row($result))
-    		{
-    			$listtables[] = $row[0];
-    		}
-        }
+		if ($result)
+		{
+			while ($row = $this->fetch_row($result))
+			{
+				$listtables[] = $row[0];
+			}
+		}
 		return $listtables;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	List information of columns into a table.
 	 *
@@ -927,9 +927,9 @@ class DoliDBPgsql extends DoliDB
 	 *	@return	array				Tableau des informations des champs de la table
 	 *
 	 */
-    public function DDLInfoTable($table)
+	public function DDLInfoTable($table)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$infotables = array();
 
 		$sql = "SELECT ";
@@ -952,16 +952,16 @@ class DoliDBPgsql extends DoliDB
 		$result = $this->query($sql);
 		if ($result)
 		{
-    		while ($row = $this->fetch_row($result))
-    		{
-    			$infotables[] = $row;
-    		}
+			while ($row = $this->fetch_row($result))
+			{
+				$infotables[] = $row;
+			}
 		}
-        return $infotables;
+		return $infotables;
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Create a table into database
 	 *
@@ -974,9 +974,9 @@ class DoliDBPgsql extends DoliDB
 	 *	@param	    array	$keys 			Tableau des champs cles noms => valeur
 	 *	@return	    int						<0 if KO, >=0 if OK
 	 */
-    public function DDLCreateTable($table, $fields, $primary_key, $type, $unique_keys = null, $fulltext_keys = null, $keys = null)
+	public function DDLCreateTable($table, $fields, $primary_key, $type, $unique_keys = null, $fulltext_keys = null, $keys = null)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		// FIXME: $fulltext_keys parameter is unused
 
 		// cles recherchees dans le tableau des descriptions (fields) : type,value,attribute,null,default,extra
@@ -988,19 +988,19 @@ class DoliDBPgsql extends DoliDB
 			$sqlfields[$i] = $field_name." ";
 			$sqlfields[$i] .= $field_desc['type'];
 			if (preg_match("/^[^\s]/i", $field_desc['value']))
-			    $sqlfields[$i] .= "(".$field_desc['value'].")";
+				$sqlfields[$i] .= "(".$field_desc['value'].")";
 			elseif (preg_match("/^[^\s]/i", $field_desc['attribute']))
-			    $sqlfields[$i] .= " ".$field_desc['attribute'];
+				$sqlfields[$i] .= " ".$field_desc['attribute'];
 			elseif (preg_match("/^[^\s]/i", $field_desc['default']))
 			{
 				if (preg_match("/null/i", $field_desc['default']))
-				    $sqlfields[$i] .= " default ".$field_desc['default'];
-			    else $sqlfields[$i] .= " default '".$this->escape($field_desc['default'])."'";
+					$sqlfields[$i] .= " default ".$field_desc['default'];
+				else $sqlfields[$i] .= " default '".$this->escape($field_desc['default'])."'";
 			} elseif (preg_match("/^[^\s]/i", $field_desc['null']))
-			    $sqlfields[$i]  .= " ".$field_desc['null'];
+				$sqlfields[$i]  .= " ".$field_desc['null'];
 
 			elseif (preg_match("/^[^\s]/i", $field_desc['extra']))
-			    $sqlfields[$i]  .= " ".$field_desc['extra'];
+				$sqlfields[$i]  .= " ".$field_desc['extra'];
 			$i++;
 		}
 		if ($primary_key != "")
@@ -1039,16 +1039,16 @@ class DoliDBPgsql extends DoliDB
 		else return 1;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Drop a table into database
 	 *
 	 *	@param	    string	$table 			Name of table
 	 *	@return	    int						<0 if KO, >=0 if OK
 	 */
-    public function DDLDropTable($table)
+	public function DDLDropTable($table)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$sql = "DROP TABLE ".$table;
 
 		if (!$this->query($sql))
@@ -1056,7 +1056,7 @@ class DoliDBPgsql extends DoliDB
 		else return 1;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * 	Create a user to connect to database
 	 *
@@ -1066,9 +1066,9 @@ class DoliDBPgsql extends DoliDB
 	 *	@param	string	$dolibarr_main_db_name		Database name where user must be granted
 	 *	@return	int									<0 if KO, >=0 if OK
 	 */
-    public function DDLCreateUser($dolibarr_main_db_host, $dolibarr_main_db_user, $dolibarr_main_db_pass, $dolibarr_main_db_name)
+	public function DDLCreateUser($dolibarr_main_db_host, $dolibarr_main_db_user, $dolibarr_main_db_pass, $dolibarr_main_db_name)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		// Note: using ' on user does not works with pgsql
 		$sql = "CREATE USER ".$this->escape($dolibarr_main_db_user)." with password '".$this->escape($dolibarr_main_db_pass)."'";
 
@@ -1082,7 +1082,7 @@ class DoliDBPgsql extends DoliDB
 		return 1;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Return a pointer of line with description of a table or field
 	 *
@@ -1090,9 +1090,9 @@ class DoliDBPgsql extends DoliDB
 	 *	@param	string		$field	Optionnel : Name of field if we want description of field
 	 *	@return	false|resource		Resultset x (x->attname)
 	 */
-    public function DDLDescTable($table, $field = "")
+	public function DDLDescTable($table, $field = "")
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$sql = "SELECT attname FROM pg_attribute, pg_type WHERE typname = '".$this->escape($table)."' AND attrelid = typrelid";
 		$sql .= " AND attname NOT IN ('cmin', 'cmax', 'ctid', 'oid', 'tableoid', 'xmin', 'xmax')";
 		if ($field) $sql .= " AND attname = '".$this->escape($field)."'";
@@ -1102,7 +1102,7 @@ class DoliDBPgsql extends DoliDB
 		return $this->_results;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Create a new field into table
 	 *
@@ -1112,26 +1112,26 @@ class DoliDBPgsql extends DoliDB
 	 *	@param	string	$field_position 	Optionnel ex.: "after champtruc"
 	 *	@return	int							<0 if KO, >0 if OK
 	 */
-    public function DDLAddField($table, $field_name, $field_desc, $field_position = "")
+	public function DDLAddField($table, $field_name, $field_desc, $field_position = "")
 	{
-        // phpcs:enable
+		// phpcs:enable
 		// cles recherchees dans le tableau des descriptions (field_desc) : type,value,attribute,null,default,extra
 		// ex. : $field_desc = array('type'=>'int','value'=>'11','null'=>'not null','extra'=> 'auto_increment');
 		$sql = "ALTER TABLE ".$table." ADD ".$field_name." ";
 		$sql .= $field_desc['type'];
 		if (preg_match("/^[^\s]/i", $field_desc['value'])) {
 			if (!in_array($field_desc['type'], array('int', 'date', 'datetime')) && $field_desc['value'])
-		    {
-		        $sql .= "(".$field_desc['value'].")";
-		    }
+			{
+				$sql .= "(".$field_desc['value'].")";
+			}
 		}
 		if (preg_match("/^[^\s]/i", $field_desc['attribute']))
-            $sql .= " ".$field_desc['attribute'];
+			$sql .= " ".$field_desc['attribute'];
 		if (preg_match("/^[^\s]/i", $field_desc['null']))
-            $sql .= " ".$field_desc['null'];
+			$sql .= " ".$field_desc['null'];
 		if (preg_match("/^[^\s]/i", $field_desc['default'])) {
-            if (preg_match("/null/i", $field_desc['default'])) {
-                $sql .= " default ".$field_desc['default'];
+			if (preg_match("/null/i", $field_desc['default'])) {
+				$sql .= " default ".$field_desc['default'];
 			} else {
 				$sql .= " default '".$this->escape($field_desc['default'])."'";
 			}
@@ -1147,7 +1147,7 @@ class DoliDBPgsql extends DoliDB
 		return 1;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Update format of a field into a table
 	 *
@@ -1156,9 +1156,9 @@ class DoliDBPgsql extends DoliDB
 	 *	@param	string	$field_desc 		Array with description of field format
 	 *	@return	int							<0 if KO, >0 if OK
 	 */
-    public function DDLUpdateField($table, $field_name, $field_desc)
+	public function DDLUpdateField($table, $field_name, $field_desc)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$sql = "ALTER TABLE ".$table;
 		$sql .= " MODIFY COLUMN ".$field_name." ".$field_desc['type'];
 		if (in_array($field_desc['type'], array('double', 'tinyint', 'int', 'varchar')) && $field_desc['value']) {
@@ -1167,22 +1167,22 @@ class DoliDBPgsql extends DoliDB
 
 		if ($field_desc['null'] == 'not null' || $field_desc['null'] == 'NOT NULL')
 		{
-        	// We will try to change format of column to NOT NULL. To be sure the ALTER works, we try to update fields that are NULL
-        	if ($field_desc['type'] == 'varchar' || $field_desc['type'] == 'text')
-        	{
-        		$sqlbis = "UPDATE ".$table." SET ".$field_name." = '".$this->escape($field_desc['default'] ? $field_desc['default'] : '')."' WHERE ".$field_name." IS NULL";
-        		$this->query($sqlbis);
-        	} elseif ($field_desc['type'] == 'tinyint' || $field_desc['type'] == 'int')
-        	{
-        		$sqlbis = "UPDATE ".$table." SET ".$field_name." = ".((int) $this->escape($field_desc['default'] ? $field_desc['default'] : 0))." WHERE ".$field_name." IS NULL";
-        		$this->query($sqlbis);
-        	}
+			// We will try to change format of column to NOT NULL. To be sure the ALTER works, we try to update fields that are NULL
+			if ($field_desc['type'] == 'varchar' || $field_desc['type'] == 'text')
+			{
+				$sqlbis = "UPDATE ".$table." SET ".$field_name." = '".$this->escape($field_desc['default'] ? $field_desc['default'] : '')."' WHERE ".$field_name." IS NULL";
+				$this->query($sqlbis);
+			} elseif ($field_desc['type'] == 'tinyint' || $field_desc['type'] == 'int')
+			{
+				$sqlbis = "UPDATE ".$table." SET ".$field_name." = ".((int) $this->escape($field_desc['default'] ? $field_desc['default'] : 0))." WHERE ".$field_name." IS NULL";
+				$this->query($sqlbis);
+			}
 		}
 
 		if ($field_desc['default'] != '')
 		{
 			if ($field_desc['type'] == 'double' || $field_desc['type'] == 'tinyint' || $field_desc['type'] == 'int') $sql .= " DEFAULT ".$this->escape($field_desc['default']);
-        	elseif ($field_desc['type'] != 'text') $sql .= " DEFAULT '".$this->escape($field_desc['default'])."'"; // Default not supported on text fields
+			elseif ($field_desc['type'] != 'text') $sql .= " DEFAULT '".$this->escape($field_desc['default'])."'"; // Default not supported on text fields
 		}
 
 		dol_syslog($sql, LOG_DEBUG);
@@ -1191,7 +1191,7 @@ class DoliDBPgsql extends DoliDB
 		return 1;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Drop a field from table
 	 *
@@ -1199,9 +1199,9 @@ class DoliDBPgsql extends DoliDB
 	 *	@param	string	$field_name 	Name of field to drop
 	 *	@return	int						<0 if KO, >0 if OK
 	 */
-    public function DDLDropField($table, $field_name)
+	public function DDLDropField($table, $field_name)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$sql = "ALTER TABLE ".$table." DROP COLUMN ".$field_name;
 		dol_syslog($sql, LOG_DEBUG);
 		if (!$this->query($sql))
@@ -1217,13 +1217,13 @@ class DoliDBPgsql extends DoliDB
 	 *
 	 *	@return		string		Charset
 	 */
-    public function getDefaultCharacterSetDatabase()
+	public function getDefaultCharacterSetDatabase()
 	{
 		$resql = $this->query('SHOW SERVER_ENCODING');
 		if ($resql)
 		{
-            $liste = $this->fetch_array($resql);
-		    return $liste['server_encoding'];
+			$liste = $this->fetch_array($resql);
+			return $liste['server_encoding'];
 		} else return '';
 	}
 
@@ -1232,7 +1232,7 @@ class DoliDBPgsql extends DoliDB
 	 *
 	 *	@return		array		List of Charset
 	 */
-    public function getListOfCharacterSet()
+	public function getListOfCharacterSet()
 	{
 		$resql = $this->query('SHOW SERVER_ENCODING');
 		$liste = array();
@@ -1257,12 +1257,12 @@ class DoliDBPgsql extends DoliDB
 	 *
 	 *	@return		string		Collation value
 	 */
-    public function getDefaultCollationDatabase()
+	public function getDefaultCollationDatabase()
 	{
 		$resql = $this->query('SHOW LC_COLLATE');
 		if ($resql)
 		{
-		    $liste = $this->fetch_array($resql);
+			$liste = $this->fetch_array($resql);
 			return $liste['lc_collate'];
 		} else return '';
 	}
@@ -1272,7 +1272,7 @@ class DoliDBPgsql extends DoliDB
 	 *
 	 *	@return		array		Liste of Collation
 	 */
-    public function getListOfCollation()
+	public function getListOfCollation()
 	{
 		$resql = $this->query('SHOW LC_COLLATE');
 		$liste = array();
@@ -1296,52 +1296,52 @@ class DoliDBPgsql extends DoliDB
 	 *
 	 *	@return		string		Full path of dump program
 	 */
-    public function getPathOfDump()
+	public function getPathOfDump()
 	{
 		$fullpathofdump = '/pathtopgdump/pg_dump';
 
 		if (file_exists('/usr/bin/pg_dump'))
 		{
-		    $fullpathofdump = '/usr/bin/pg_dump';
+			$fullpathofdump = '/usr/bin/pg_dump';
 		} else {
-            // TODO L'utilisateur de la base doit etre un superadmin pour lancer cette commande
-		    $resql = $this->query('SHOW data_directory');
-    		if ($resql)
-    		{
-    			$liste = $this->fetch_array($resql);
-    			$basedir = $liste['data_directory'];
-    			$fullpathofdump = preg_replace('/data$/', 'bin', $basedir).'/pg_dump';
-    		}
+			// TODO L'utilisateur de la base doit etre un superadmin pour lancer cette commande
+			$resql = $this->query('SHOW data_directory');
+			if ($resql)
+			{
+				$liste = $this->fetch_array($resql);
+				$basedir = $liste['data_directory'];
+				$fullpathofdump = preg_replace('/data$/', 'bin', $basedir).'/pg_dump';
+			}
 		}
 
 		return $fullpathofdump;
 	}
 
-    /**
-     *	Return full path of restore program
-     *
-     *	@return		string		Full path of restore program
-     */
-    public function getPathOfRestore()
+	/**
+	 *	Return full path of restore program
+	 *
+	 *	@return		string		Full path of restore program
+	 */
+	public function getPathOfRestore()
 	{
 		//$tool='pg_restore';
 		$tool = 'psql';
 
 		$fullpathofdump = '/pathtopgrestore/'.$tool;
 
-        if (file_exists('/usr/bin/'.$tool))
-        {
-            $fullpathofdump = '/usr/bin/'.$tool;
-        } else {
-            // TODO L'utilisateur de la base doit etre un superadmin pour lancer cette commande
-            $resql = $this->query('SHOW data_directory');
-            if ($resql)
-            {
-                $liste = $this->fetch_array($resql);
-                $basedir = $liste['data_directory'];
-                $fullpathofdump = preg_replace('/data$/', 'bin', $basedir).'/'.$tool;
-            }
-        }
+		if (file_exists('/usr/bin/'.$tool))
+		{
+			$fullpathofdump = '/usr/bin/'.$tool;
+		} else {
+			// TODO L'utilisateur de la base doit etre un superadmin pour lancer cette commande
+			$resql = $this->query('SHOW data_directory');
+			if ($resql)
+			{
+				$liste = $this->fetch_array($resql);
+				$basedir = $liste['data_directory'];
+				$fullpathofdump = preg_replace('/data$/', 'bin', $basedir).'/'.$tool;
+			}
+		}
 
 		return $fullpathofdump;
 	}
@@ -1352,7 +1352,7 @@ class DoliDBPgsql extends DoliDB
 	 * @param	string	$filter		Filter list on a particular value
 	 * @return	array				Array of key-values (key=>value)
 	 */
-    public function getServerParametersValues($filter = '')
+	public function getServerParametersValues($filter = '')
 	{
 		$result = array();
 
@@ -1373,7 +1373,7 @@ class DoliDBPgsql extends DoliDB
 	 * @param	string	$filter		Filter list on a particular value
 	 * @return  array				Array of key-values (key=>value)
 	 */
-    public function getServerStatusValues($filter = '')
+	public function getServerStatusValues($filter = '')
 	{
 		/* This is to return current running requests.
 		$sql='SELECT datname,procpid,current_query FROM pg_stat_activity ORDER BY procpid';
diff --git a/htdocs/core/db/sqlite3.class.php b/htdocs/core/db/sqlite3.class.php
index c34b9dddac0..a6ca38c7e15 100644
--- a/htdocs/core/db/sqlite3.class.php
+++ b/htdocs/core/db/sqlite3.class.php
@@ -32,48 +32,48 @@ require_once DOL_DOCUMENT_ROOT.'/core/db/DoliDB.class.php';
  */
 class DoliDBSqlite3 extends DoliDB
 {
-    //! Database type
-    public $type = 'sqlite3';
-    //! Database label
-    const LABEL = 'Sqlite3';
-    //! Version min database
-    const VERSIONMIN = '3.0.0';
-    /** @var SQLite3Result Resultset of last query */
-    private $_results;
+	//! Database type
+	public $type = 'sqlite3';
+	//! Database label
+	const LABEL = 'Sqlite3';
+	//! Version min database
+	const VERSIONMIN = '3.0.0';
+	/** @var SQLite3Result Resultset of last query */
+	private $_results;
 
-    const WEEK_MONDAY_FIRST = 1;
-    const WEEK_YEAR = 2;
-    const WEEK_FIRST_WEEKDAY = 4;
+	const WEEK_MONDAY_FIRST = 1;
+	const WEEK_YEAR = 2;
+	const WEEK_FIRST_WEEKDAY = 4;
 
 
-    /**
-     *  Constructor.
-     *  This create an opened connexion to a database server and eventually to a database
-     *
-     *  @param      string	$type		Type of database (mysql, pgsql...)
-     *  @param	    string	$host		Address of database server
-     *  @param	    string	$user		Nom de l'utilisateur autorise
-     *  @param	    string	$pass		Mot de passe
-     *  @param	    string	$name		Nom de la database
-     *  @param	    int		$port		Port of database server
-     */
-    public function __construct($type, $host, $user, $pass, $name = '', $port = 0)
-    {
-        global $conf;
+	/**
+	 *  Constructor.
+	 *  This create an opened connexion to a database server and eventually to a database
+	 *
+	 *  @param      string	$type		Type of database (mysql, pgsql...)
+	 *  @param	    string	$host		Address of database server
+	 *  @param	    string	$user		Nom de l'utilisateur autorise
+	 *  @param	    string	$pass		Mot de passe
+	 *  @param	    string	$name		Nom de la database
+	 *  @param	    int		$port		Port of database server
+	 */
+	public function __construct($type, $host, $user, $pass, $name = '', $port = 0)
+	{
+		global $conf;
 
-        // Note that having "static" property for "$forcecharset" and "$forcecollate" will make error here in strict mode, so they are not static
-        if (!empty($conf->db->character_set)) $this->forcecharset = $conf->db->character_set;
-        if (!empty($conf->db->dolibarr_main_db_collation)) $this->forcecollate = $conf->db->dolibarr_main_db_collation;
+		// Note that having "static" property for "$forcecharset" and "$forcecollate" will make error here in strict mode, so they are not static
+		if (!empty($conf->db->character_set)) $this->forcecharset = $conf->db->character_set;
+		if (!empty($conf->db->dolibarr_main_db_collation)) $this->forcecollate = $conf->db->dolibarr_main_db_collation;
 
-        $this->database_user = $user;
-        $this->database_host = $host;
-        $this->database_port = $port;
+		$this->database_user = $user;
+		$this->database_host = $host;
+		$this->database_port = $port;
 
-        $this->transaction_opened = 0;
+		$this->transaction_opened = 0;
 
-        //print "Name DB: $host,$user,$pass,$name<br>";
+		//print "Name DB: $host,$user,$pass,$name<br>";
 
-        /*if (! function_exists("sqlite_query"))
+		/*if (! function_exists("sqlite_query"))
         {
             $this->connected = false;
             $this->ok = false;
@@ -82,7 +82,7 @@ class DoliDBSqlite3 extends DoliDB
             return $this->ok;
         }*/
 
-        /*if (! $host)
+		/*if (! $host)
         {
             $this->connected = false;
             $this->ok = false;
@@ -91,228 +91,228 @@ class DoliDBSqlite3 extends DoliDB
             return $this->ok;
         }*/
 
-        // Essai connexion serveur
-        // We do not try to connect to database, only to server. Connect to database is done later in constrcutor
-        $this->db = $this->connect($host, $user, $pass, $name, $port);
+		// Essai connexion serveur
+		// We do not try to connect to database, only to server. Connect to database is done later in constrcutor
+		$this->db = $this->connect($host, $user, $pass, $name, $port);
 
-        if ($this->db)
-        {
-            $this->connected = true;
-            $this->ok = true;
-            $this->database_selected = true;
-            $this->database_name = $name;
+		if ($this->db)
+		{
+			$this->connected = true;
+			$this->ok = true;
+			$this->database_selected = true;
+			$this->database_name = $name;
 
-            $this->addCustomFunction('IF');
-            $this->addCustomFunction('MONTH');
-            $this->addCustomFunction('CURTIME');
-            $this->addCustomFunction('CURDATE');
-            $this->addCustomFunction('WEEK', 1);
-            $this->addCustomFunction('WEEK', 2);
-            $this->addCustomFunction('WEEKDAY');
-            $this->addCustomFunction('date_format');
-            //$this->db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
-        } else {
-            // host, login ou password incorrect
-            $this->connected = false;
-            $this->ok = false;
-            $this->database_selected = false;
-            $this->database_name = '';
-            //$this->error=sqlite_connect_error();
-            dol_syslog(get_class($this)."::DoliDBSqlite3 : Error Connect ".$this->error, LOG_ERR);
-        }
+			$this->addCustomFunction('IF');
+			$this->addCustomFunction('MONTH');
+			$this->addCustomFunction('CURTIME');
+			$this->addCustomFunction('CURDATE');
+			$this->addCustomFunction('WEEK', 1);
+			$this->addCustomFunction('WEEK', 2);
+			$this->addCustomFunction('WEEKDAY');
+			$this->addCustomFunction('date_format');
+			//$this->db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+		} else {
+			// host, login ou password incorrect
+			$this->connected = false;
+			$this->ok = false;
+			$this->database_selected = false;
+			$this->database_name = '';
+			//$this->error=sqlite_connect_error();
+			dol_syslog(get_class($this)."::DoliDBSqlite3 : Error Connect ".$this->error, LOG_ERR);
+		}
 
-        return $this->ok;
-    }
+		return $this->ok;
+	}
 
 
-    /**
-     *  Convert a SQL request in Mysql syntax to native syntax
-     *
-     *  @param     string	$line   SQL request line to convert
-     *  @param     string	$type	Type of SQL order ('ddl' for insert, update, select, delete or 'dml' for create, alter...)
-     *  @return    string   		SQL request line converted
-     */
-    public static function convertSQLFromMysql($line, $type = 'ddl')
-    {
-        // Removed empty line if this is a comment line for SVN tagging
-        if (preg_match('/^--\s\$Id/i', $line)) {
-            return '';
-        }
-        // Return line if this is a comment
-        if (preg_match('/^#/i', $line) || preg_match('/^$/i', $line) || preg_match('/^--/i', $line))
-        {
-            return $line;
-        }
-        if ($line != "")
-        {
-            if ($type == 'auto')
-            {
-                if (preg_match('/ALTER TABLE/i', $line)) $type = 'dml';
-                elseif (preg_match('/CREATE TABLE/i', $line)) $type = 'dml';
-                elseif (preg_match('/DROP TABLE/i', $line)) $type = 'dml';
-            }
+	/**
+	 *  Convert a SQL request in Mysql syntax to native syntax
+	 *
+	 *  @param     string	$line   SQL request line to convert
+	 *  @param     string	$type	Type of SQL order ('ddl' for insert, update, select, delete or 'dml' for create, alter...)
+	 *  @return    string   		SQL request line converted
+	 */
+	public static function convertSQLFromMysql($line, $type = 'ddl')
+	{
+		// Removed empty line if this is a comment line for SVN tagging
+		if (preg_match('/^--\s\$Id/i', $line)) {
+			return '';
+		}
+		// Return line if this is a comment
+		if (preg_match('/^#/i', $line) || preg_match('/^$/i', $line) || preg_match('/^--/i', $line))
+		{
+			return $line;
+		}
+		if ($line != "")
+		{
+			if ($type == 'auto')
+			{
+				if (preg_match('/ALTER TABLE/i', $line)) $type = 'dml';
+				elseif (preg_match('/CREATE TABLE/i', $line)) $type = 'dml';
+				elseif (preg_match('/DROP TABLE/i', $line)) $type = 'dml';
+			}
 
-            if ($type == 'dml')
-            {
-                $line = preg_replace('/\s/', ' ', $line); // Replace tabulation with space
+			if ($type == 'dml')
+			{
+				$line = preg_replace('/\s/', ' ', $line); // Replace tabulation with space
 
-                // we are inside create table statement so lets process datatypes
-                if (preg_match('/(ISAM|innodb)/i', $line)) { // end of create table sequence
-                    $line = preg_replace('/\)[\s\t]*type[\s\t]*=[\s\t]*(MyISAM|innodb);/i', ');', $line);
-                    $line = preg_replace('/\)[\s\t]*engine[\s\t]*=[\s\t]*(MyISAM|innodb);/i', ');', $line);
-                    $line = preg_replace('/,$/', '', $line);
-                }
+				// we are inside create table statement so lets process datatypes
+				if (preg_match('/(ISAM|innodb)/i', $line)) { // end of create table sequence
+					$line = preg_replace('/\)[\s\t]*type[\s\t]*=[\s\t]*(MyISAM|innodb);/i', ');', $line);
+					$line = preg_replace('/\)[\s\t]*engine[\s\t]*=[\s\t]*(MyISAM|innodb);/i', ');', $line);
+					$line = preg_replace('/,$/', '', $line);
+				}
 
-                // Process case: "CREATE TABLE llx_mytable(rowid integer NOT NULL AUTO_INCREMENT PRIMARY KEY,code..."
-                if (preg_match('/[\s\t\(]*(\w*)[\s\t]+int.*auto_increment/i', $line, $reg)) {
-                    $newline = preg_replace('/([\s\t\(]*)([a-zA-Z_0-9]*)[\s\t]+int.*auto_increment[^,]*/i', '\\1 \\2 integer PRIMARY KEY AUTOINCREMENT', $line);
-                    //$line = "-- ".$line." replaced by --\n".$newline;
-                    $line = $newline;
-                }
+				// Process case: "CREATE TABLE llx_mytable(rowid integer NOT NULL AUTO_INCREMENT PRIMARY KEY,code..."
+				if (preg_match('/[\s\t\(]*(\w*)[\s\t]+int.*auto_increment/i', $line, $reg)) {
+					$newline = preg_replace('/([\s\t\(]*)([a-zA-Z_0-9]*)[\s\t]+int.*auto_increment[^,]*/i', '\\1 \\2 integer PRIMARY KEY AUTOINCREMENT', $line);
+					//$line = "-- ".$line." replaced by --\n".$newline;
+					$line = $newline;
+				}
 
-                // tinyint type conversion
-                $line = str_replace('tinyint', 'smallint', $line);
+				// tinyint type conversion
+				$line = str_replace('tinyint', 'smallint', $line);
 
-                // nuke unsigned
-                $line = preg_replace('/(int\w+|smallint)\s+unsigned/i', '\\1', $line);
+				// nuke unsigned
+				$line = preg_replace('/(int\w+|smallint)\s+unsigned/i', '\\1', $line);
 
-                // blob -> text
-                $line = preg_replace('/\w*blob/i', 'text', $line);
+				// blob -> text
+				$line = preg_replace('/\w*blob/i', 'text', $line);
 
-                // tinytext/mediumtext -> text
-                $line = preg_replace('/tinytext/i', 'text', $line);
-                $line = preg_replace('/mediumtext/i', 'text', $line);
+				// tinytext/mediumtext -> text
+				$line = preg_replace('/tinytext/i', 'text', $line);
+				$line = preg_replace('/mediumtext/i', 'text', $line);
 
-                // change not null datetime field to null valid ones
-                // (to support remapping of "zero time" to null
-                $line = preg_replace('/datetime not null/i', 'datetime', $line);
-                $line = preg_replace('/datetime/i', 'timestamp', $line);
+				// change not null datetime field to null valid ones
+				// (to support remapping of "zero time" to null
+				$line = preg_replace('/datetime not null/i', 'datetime', $line);
+				$line = preg_replace('/datetime/i', 'timestamp', $line);
 
-                // double -> numeric
-                $line = preg_replace('/^double/i', 'numeric', $line);
-                $line = preg_replace('/(\s*)double/i', '\\1numeric', $line);
-                // float -> numeric
-                $line = preg_replace('/^float/i', 'numeric', $line);
-                $line = preg_replace('/(\s*)float/i', '\\1numeric', $line);
+				// double -> numeric
+				$line = preg_replace('/^double/i', 'numeric', $line);
+				$line = preg_replace('/(\s*)double/i', '\\1numeric', $line);
+				// float -> numeric
+				$line = preg_replace('/^float/i', 'numeric', $line);
+				$line = preg_replace('/(\s*)float/i', '\\1numeric', $line);
 
-                // unique index(field1,field2)
-                if (preg_match('/unique index\s*\((\w+\s*,\s*\w+)\)/i', $line))
-                {
-                    $line = preg_replace('/unique index\s*\((\w+\s*,\s*\w+)\)/i', 'UNIQUE\(\\1\)', $line);
-                }
+				// unique index(field1,field2)
+				if (preg_match('/unique index\s*\((\w+\s*,\s*\w+)\)/i', $line))
+				{
+					$line = preg_replace('/unique index\s*\((\w+\s*,\s*\w+)\)/i', 'UNIQUE\(\\1\)', $line);
+				}
 
-                // We remove end of requests "AFTER fieldxxx"
-                $line = preg_replace('/AFTER [a-z0-9_]+/i', '', $line);
+				// We remove end of requests "AFTER fieldxxx"
+				$line = preg_replace('/AFTER [a-z0-9_]+/i', '', $line);
 
-                // We remove start of requests "ALTER TABLE tablexxx" if this is a DROP INDEX
-                $line = preg_replace('/ALTER TABLE [a-z0-9_]+ DROP INDEX/i', 'DROP INDEX', $line);
+				// We remove start of requests "ALTER TABLE tablexxx" if this is a DROP INDEX
+				$line = preg_replace('/ALTER TABLE [a-z0-9_]+ DROP INDEX/i', 'DROP INDEX', $line);
 
-                // Translate order to rename fields
-                if (preg_match('/ALTER TABLE ([a-z0-9_]+) CHANGE(?: COLUMN)? ([a-z0-9_]+) ([a-z0-9_]+)(.*)$/i', $line, $reg))
-                {
-                    $line = "-- ".$line." replaced by --\n";
-                    $line .= "ALTER TABLE ".$reg[1]." RENAME COLUMN ".$reg[2]." TO ".$reg[3];
-                }
+				// Translate order to rename fields
+				if (preg_match('/ALTER TABLE ([a-z0-9_]+) CHANGE(?: COLUMN)? ([a-z0-9_]+) ([a-z0-9_]+)(.*)$/i', $line, $reg))
+				{
+					$line = "-- ".$line." replaced by --\n";
+					$line .= "ALTER TABLE ".$reg[1]." RENAME COLUMN ".$reg[2]." TO ".$reg[3];
+				}
 
-                // Translate order to modify field format
-                if (preg_match('/ALTER TABLE ([a-z0-9_]+) MODIFY(?: COLUMN)? ([a-z0-9_]+) (.*)$/i', $line, $reg))
-                {
-                    $line = "-- ".$line." replaced by --\n";
-                    $newreg3 = $reg[3];
-                    $newreg3 = preg_replace('/ DEFAULT NULL/i', '', $newreg3);
-                    $newreg3 = preg_replace('/ NOT NULL/i', '', $newreg3);
-                    $newreg3 = preg_replace('/ NULL/i', '', $newreg3);
-                    $newreg3 = preg_replace('/ DEFAULT 0/i', '', $newreg3);
-                    $newreg3 = preg_replace('/ DEFAULT \'[0-9a-zA-Z_@]*\'/i', '', $newreg3);
-                    $line .= "ALTER TABLE ".$reg[1]." ALTER COLUMN ".$reg[2]." TYPE ".$newreg3;
-                    // TODO Add alter to set default value or null/not null if there is this in $reg[3]
-                }
+				// Translate order to modify field format
+				if (preg_match('/ALTER TABLE ([a-z0-9_]+) MODIFY(?: COLUMN)? ([a-z0-9_]+) (.*)$/i', $line, $reg))
+				{
+					$line = "-- ".$line." replaced by --\n";
+					$newreg3 = $reg[3];
+					$newreg3 = preg_replace('/ DEFAULT NULL/i', '', $newreg3);
+					$newreg3 = preg_replace('/ NOT NULL/i', '', $newreg3);
+					$newreg3 = preg_replace('/ NULL/i', '', $newreg3);
+					$newreg3 = preg_replace('/ DEFAULT 0/i', '', $newreg3);
+					$newreg3 = preg_replace('/ DEFAULT \'[0-9a-zA-Z_@]*\'/i', '', $newreg3);
+					$line .= "ALTER TABLE ".$reg[1]." ALTER COLUMN ".$reg[2]." TYPE ".$newreg3;
+					// TODO Add alter to set default value or null/not null if there is this in $reg[3]
+				}
 
-                // alter table add primary key (field1, field2 ...) -> We create a unique index instead as dynamic creation of primary key is not supported
-                // ALTER TABLE llx_dolibarr_modules ADD PRIMARY KEY pk_dolibarr_modules (numero, entity);
-                if (preg_match('/ALTER\s+TABLE\s*(.*)\s*ADD\s+PRIMARY\s+KEY\s*(.*)\s*\((.*)$/i', $line, $reg))
-                {
-                    $line = "-- ".$line." replaced by --\n";
-                    $line .= "CREATE UNIQUE INDEX ".$reg[2]." ON ".$reg[1]."(".$reg[3];
-                }
+				// alter table add primary key (field1, field2 ...) -> We create a unique index instead as dynamic creation of primary key is not supported
+				// ALTER TABLE llx_dolibarr_modules ADD PRIMARY KEY pk_dolibarr_modules (numero, entity);
+				if (preg_match('/ALTER\s+TABLE\s*(.*)\s*ADD\s+PRIMARY\s+KEY\s*(.*)\s*\((.*)$/i', $line, $reg))
+				{
+					$line = "-- ".$line." replaced by --\n";
+					$line .= "CREATE UNIQUE INDEX ".$reg[2]." ON ".$reg[1]."(".$reg[3];
+				}
 
-                // Translate order to drop foreign keys
-                // ALTER TABLE llx_dolibarr_modules DROP FOREIGN KEY fk_xxx;
-                if (preg_match('/ALTER\s+TABLE\s*(.*)\s*DROP\s+FOREIGN\s+KEY\s*(.*)$/i', $line, $reg))
-                {
-                    $line = "-- ".$line." replaced by --\n";
-                    $line .= "ALTER TABLE ".$reg[1]." DROP CONSTRAINT ".$reg[2];
-                }
+				// Translate order to drop foreign keys
+				// ALTER TABLE llx_dolibarr_modules DROP FOREIGN KEY fk_xxx;
+				if (preg_match('/ALTER\s+TABLE\s*(.*)\s*DROP\s+FOREIGN\s+KEY\s*(.*)$/i', $line, $reg))
+				{
+					$line = "-- ".$line." replaced by --\n";
+					$line .= "ALTER TABLE ".$reg[1]." DROP CONSTRAINT ".$reg[2];
+				}
 
-                // alter table add [unique] [index] (field1, field2 ...)
-                // ALTER TABLE llx_accountingaccount ADD INDEX idx_accountingaccount_fk_pcg_version (fk_pcg_version)
-                if (preg_match('/ALTER\s+TABLE\s*(.*)\s*ADD\s+(UNIQUE INDEX|INDEX|UNIQUE)\s+(.*)\s*\(([\w,\s]+)\)/i', $line, $reg))
-                {
-                    $fieldlist = $reg[4];
-                    $idxname = $reg[3];
-                    $tablename = $reg[1];
-                    $line = "-- ".$line." replaced by --\n";
-                    $line .= "CREATE ".(preg_match('/UNIQUE/', $reg[2]) ? 'UNIQUE ' : '')."INDEX ".$idxname." ON ".$tablename." (".$fieldlist.")";
-                }
-                if (preg_match('/ALTER\s+TABLE\s*(.*)\s*ADD\s+CONSTRAINT\s+(.*)\s*FOREIGN\s+KEY\s*\(([\w,\s]+)\)\s*REFERENCES\s+(\w+)\s*\(([\w,\s]+)\)/i', $line, $reg)) {
-                    // Pour l'instant les contraintes ne sont pas créées
-                    dol_syslog(get_class().'::query line emptied');
-                    $line = 'SELECT 0;';
-                }
+				// alter table add [unique] [index] (field1, field2 ...)
+				// ALTER TABLE llx_accountingaccount ADD INDEX idx_accountingaccount_fk_pcg_version (fk_pcg_version)
+				if (preg_match('/ALTER\s+TABLE\s*(.*)\s*ADD\s+(UNIQUE INDEX|INDEX|UNIQUE)\s+(.*)\s*\(([\w,\s]+)\)/i', $line, $reg))
+				{
+					$fieldlist = $reg[4];
+					$idxname = $reg[3];
+					$tablename = $reg[1];
+					$line = "-- ".$line." replaced by --\n";
+					$line .= "CREATE ".(preg_match('/UNIQUE/', $reg[2]) ? 'UNIQUE ' : '')."INDEX ".$idxname." ON ".$tablename." (".$fieldlist.")";
+				}
+				if (preg_match('/ALTER\s+TABLE\s*(.*)\s*ADD\s+CONSTRAINT\s+(.*)\s*FOREIGN\s+KEY\s*\(([\w,\s]+)\)\s*REFERENCES\s+(\w+)\s*\(([\w,\s]+)\)/i', $line, $reg)) {
+					// Pour l'instant les contraintes ne sont pas créées
+					dol_syslog(get_class().'::query line emptied');
+					$line = 'SELECT 0;';
+				}
 
-                //if (preg_match('/rowid\s+.*\s+PRIMARY\s+KEY,/i', $line)) {
-                    //preg_replace('/(rowid\s+.*\s+PRIMARY\s+KEY\s*,)/i', '/* \\1 */', $line);
-                //}
-            }
+				//if (preg_match('/rowid\s+.*\s+PRIMARY\s+KEY,/i', $line)) {
+					//preg_replace('/(rowid\s+.*\s+PRIMARY\s+KEY\s*,)/i', '/* \\1 */', $line);
+				//}
+			}
 
-            // Delete using criteria on other table must not declare twice the deleted table
-            // DELETE FROM tabletodelete USING tabletodelete, othertable -> DELETE FROM tabletodelete USING othertable
-            if (preg_match('/DELETE FROM ([a-z_]+) USING ([a-z_]+), ([a-z_]+)/i', $line, $reg))
-            {
+			// Delete using criteria on other table must not declare twice the deleted table
+			// DELETE FROM tabletodelete USING tabletodelete, othertable -> DELETE FROM tabletodelete USING othertable
+			if (preg_match('/DELETE FROM ([a-z_]+) USING ([a-z_]+), ([a-z_]+)/i', $line, $reg))
+			{
 				if ($reg[1] == $reg[2])	// If same table, we remove second one
-                {
-                    $line = preg_replace('/DELETE FROM ([a-z_]+) USING ([a-z_]+), ([a-z_]+)/i', 'DELETE FROM \\1 USING \\3', $line);
-                }
-            }
+				{
+					$line = preg_replace('/DELETE FROM ([a-z_]+) USING ([a-z_]+), ([a-z_]+)/i', 'DELETE FROM \\1 USING \\3', $line);
+				}
+			}
 
-            // Remove () in the tables in FROM if one table
-            $line = preg_replace('/FROM\s*\((([a-z_]+)\s+as\s+([a-z_]+)\s*)\)/i', 'FROM \\1', $line);
-            //print $line."\n";
+			// Remove () in the tables in FROM if one table
+			$line = preg_replace('/FROM\s*\((([a-z_]+)\s+as\s+([a-z_]+)\s*)\)/i', 'FROM \\1', $line);
+			//print $line."\n";
 
-            // Remove () in the tables in FROM if two table
-            $line = preg_replace('/FROM\s*\(([a-z_]+\s+as\s+[a-z_]+)\s*,\s*([a-z_]+\s+as\s+[a-z_]+\s*)\)/i', 'FROM \\1, \\2', $line);
-            //print $line."\n";
+			// Remove () in the tables in FROM if two table
+			$line = preg_replace('/FROM\s*\(([a-z_]+\s+as\s+[a-z_]+)\s*,\s*([a-z_]+\s+as\s+[a-z_]+\s*)\)/i', 'FROM \\1, \\2', $line);
+			//print $line."\n";
 
-            // Remove () in the tables in FROM if two table
-            $line = preg_replace('/FROM\s*\(([a-z_]+\s+as\s+[a-z_]+)\s*,\s*([a-z_]+\s+as\s+[a-z_]+\s*),\s*([a-z_]+\s+as\s+[a-z_]+\s*)\)/i', 'FROM \\1, \\2, \\3', $line);
-            //print $line."\n";
+			// Remove () in the tables in FROM if two table
+			$line = preg_replace('/FROM\s*\(([a-z_]+\s+as\s+[a-z_]+)\s*,\s*([a-z_]+\s+as\s+[a-z_]+\s*),\s*([a-z_]+\s+as\s+[a-z_]+\s*)\)/i', 'FROM \\1, \\2, \\3', $line);
+			//print $line."\n";
 
-            //print "type=".$type." newline=".$line."<br>\n";
-        }
+			//print "type=".$type." newline=".$line."<br>\n";
+		}
 
-        return $line;
-    }
+		return $line;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
 	 *	Select a database
-     *
+	 *
 	 *	@param	    string	$database	Name of database
 	 *	@return	    boolean  		    true if OK, false if KO
-     */
-    public function select_db($database)
-    {
-        // phpcs:enable
-        dol_syslog(get_class($this)."::select_db database=".$database, LOG_DEBUG);
-        // sqlite_select_db() does not exist
-        //return sqlite_select_db($this->db,$database);
-        return true;
-    }
+	 */
+	public function select_db($database)
+	{
+		// phpcs:enable
+		dol_syslog(get_class($this)."::select_db database=".$database, LOG_DEBUG);
+		// sqlite_select_db() does not exist
+		//return sqlite_select_db($this->db,$database);
+		return true;
+	}
 
 
-    /**
+	/**
 	 *	Connexion to server
-     *
+	 *
 	 *	@param	    string	$host		database server host
 	 *	@param	    string	$login		login
 	 *	@param	    string	$passwd		password
@@ -320,324 +320,324 @@ class DoliDBSqlite3 extends DoliDB
 	 *	@param		integer	$port		Port of database server
 	 *	@return		SQLite3				Database access handler
 	 *	@see		close()
-     */
-    public function connect($host, $login, $passwd, $name, $port = 0)
-    {
-        global $main_data_dir;
+	 */
+	public function connect($host, $login, $passwd, $name, $port = 0)
+	{
+		global $main_data_dir;
 
-        dol_syslog(get_class($this)."::connect name=".$name, LOG_DEBUG);
+		dol_syslog(get_class($this)."::connect name=".$name, LOG_DEBUG);
 
-        $dir = $main_data_dir;
-        if (empty($dir)) $dir = DOL_DATA_ROOT;
-        // With sqlite, port must be in connect parameters
-        //if (! $newport) $newport=3306;
-        $database_name = $dir.'/database_'.$name.'.sdb';
-        try {
-            /*** connect to SQLite database ***/
-            //$this->db = new PDO("sqlite:".$dir.'/database_'.$name.'.sdb');
+		$dir = $main_data_dir;
+		if (empty($dir)) $dir = DOL_DATA_ROOT;
+		// With sqlite, port must be in connect parameters
+		//if (! $newport) $newport=3306;
+		$database_name = $dir.'/database_'.$name.'.sdb';
+		try {
+			/*** connect to SQLite database ***/
+			//$this->db = new PDO("sqlite:".$dir.'/database_'.$name.'.sdb');
 			$this->db = new SQLite3($database_name);
-            //$this->db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
-        } catch (Exception $e)
-        {
-            $this->error = self::LABEL.' '.$e->getMessage().' current dir='.$database_name;
-            return '';
-        }
+			//$this->db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+		} catch (Exception $e)
+		{
+			$this->error = self::LABEL.' '.$e->getMessage().' current dir='.$database_name;
+			return '';
+		}
 
-        //print "Resultat fonction connect: ".$this->db;
-        return $this->db;
-    }
+		//print "Resultat fonction connect: ".$this->db;
+		return $this->db;
+	}
 
 
-    /**
+	/**
 	 *	Return version of database server
-     *
+	 *
 	 *	@return	        string      Version string
-     */
-    public function getVersion()
-    {
-    	$tmp = $this->db->version();
-        return $tmp['versionString'];
-    }
+	 */
+	public function getVersion()
+	{
+		$tmp = $this->db->version();
+		return $tmp['versionString'];
+	}
 
-    /**
-     *	Return version of database client driver
-     *
-     *	@return	        string      Version string
-     */
-    public function getDriverInfo()
-    {
-        return 'sqlite3 php driver';
-    }
+	/**
+	 *	Return version of database client driver
+	 *
+	 *	@return	        string      Version string
+	 */
+	public function getDriverInfo()
+	{
+		return 'sqlite3 php driver';
+	}
 
 
-    /**
-     *  Close database connexion
-     *
-     *  @return     bool     True if disconnect successfull, false otherwise
-     *  @see        connect()
-     */
-    public function close()
-    {
-        if ($this->db)
-        {
-            if ($this->transaction_opened > 0) dol_syslog(get_class($this)."::close Closing a connection with an opened transaction depth=".$this->transaction_opened, LOG_ERR);
-            $this->connected = false;
-            $this->db->close();
-            unset($this->db); // Clean this->db
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     *  Execute a SQL request and return the resultset
-     *
-     * 	@param	string	$query			SQL query string
-     * 	@param	int		$usesavepoint	0=Default mode, 1=Run a savepoint before and a rollbock to savepoint if error (this allow to have some request with errors inside global transactions).
-     * 									Note that with Mysql, this parameter is not used as Myssql can already commit a transaction even if one request is in error, without using savepoints.
-     *  @param  string	$type           Type of SQL order ('ddl' for insert, update, select, delete or 'dml' for create, alter...)
-     *	@return	SQLite3Result			Resultset of answer
-     */
-    public function query($query, $usesavepoint = 0, $type = 'auto')
-    {
-    	global $conf;
-
-        $ret = null;
-
-        $query = trim($query);
-
-        $this->error = '';
-
-        // Convert MySQL syntax to SQLite syntax
-        if (preg_match('/ALTER\s+TABLE\s*(.*)\s*ADD\s+CONSTRAINT\s+(.*)\s*FOREIGN\s+KEY\s*\(([\w,\s]+)\)\s*REFERENCES\s+(\w+)\s*\(([\w,\s]+)\)/i', $query, $reg)) {
-            // Ajout d'une clef étrangère à la table
-            // procédure de remplacement de la table pour ajouter la contrainte
-            // Exemple : ALTER TABLE llx_adherent ADD CONSTRAINT adherent_fk_soc FOREIGN KEY (fk_soc) REFERENCES llx_societe (rowid)
-            // -> CREATE TABLE ( ... ,CONSTRAINT adherent_fk_soc FOREIGN KEY (fk_soc) REFERENCES llx_societe (rowid))
-            $foreignFields = $reg[5];
-            $foreignTable = $reg[4];
-            $localfields = $reg[3];
-            $constraintname = trim($reg[2]);
-            $tablename = trim($reg[1]);
-
-            $descTable = $this->db->querySingle("SELECT sql FROM sqlite_master WHERE name='".$this->escape($tablename)."'");
-
-            // 1- Renommer la table avec un nom temporaire
-            $this->query('ALTER TABLE '.$tablename.' RENAME TO tmp_'.$tablename);
-
-            // 2- Recréer la table avec la contrainte ajoutée
-
-            // on bricole la requete pour ajouter la contrainte
-            $descTable = substr($descTable, 0, strlen($descTable) - 1);
-            $descTable .= ", CONSTRAINT ".$constraintname." FOREIGN KEY (".$localfields.") REFERENCES ".$foreignTable."(".$foreignFields.")";
-
-            // fermeture de l'instruction
-            $descTable .= ')';
-
-            // Création proprement dite de la table
-            $this->query($descTable);
-
-            // 3- Transférer les données
-            $this->query('INSERT INTO '.$tablename.' SELECT * FROM tmp_'.$tablename);
-
-            // 4- Supprimer la table temporaire
-            $this->query('DROP TABLE tmp_'.$tablename);
-
-            // dummy statement
-            $query = "SELECT 0";
-        } else {
-            $query = $this->convertSQLFromMysql($query, $type);
-        }
-        //print "After convertSQLFromMysql:\n".$query."<br>\n";
-
-        if (!in_array($query, array('BEGIN', 'COMMIT', 'ROLLBACK')))
-        {
-        	$SYSLOG_SQL_LIMIT = 10000; // limit log to 10kb per line to limit DOS attacks
-        	dol_syslog('sql='.substr($query, 0, $SYSLOG_SQL_LIMIT), LOG_DEBUG);
-        }
-        if (empty($query)) return false; // Return false = error if empty request
-
-        // Ordre SQL ne necessitant pas de connexion a une base (exemple: CREATE DATABASE)
-        try {
-            //$ret = $this->db->exec($query);
-            $ret = $this->db->query($query); // $ret is a Sqlite3Result
-            if ($ret) {
-                $ret->queryString = $query;
-            }
-        } catch (Exception $e)
-        {
-            $this->error = $this->db->lastErrorMsg();
-        }
-
-        if (!preg_match("/^COMMIT/i", $query) && !preg_match("/^ROLLBACK/i", $query))
-        {
-            // Si requete utilisateur, on la sauvegarde ainsi que son resultset
-            if (!is_object($ret) || $this->error)
-            {
-                $this->lastqueryerror = $query;
-                $this->lasterror = $this->error();
-                $this->lasterrno = $this->errno();
-
-                dol_syslog(get_class($this)."::query SQL Error query: ".$query, LOG_ERR);
-
-                $errormsg = get_class($this)."::query SQL Error message: ".$this->lasterror;
-
-                if (preg_match('/[0-9]/', $this->lasterrno)) {
-                    $errormsg .= ' ('.$this->lasterrno.')';
-                }
-
-                if ($conf->global->SYSLOG_LEVEL < LOG_DEBUG) dol_syslog(get_class($this)."::query SQL Error query: ".$query, LOG_ERR); // Log of request was not yet done previously
-                dol_syslog(get_class($this)."::query SQL Error message: ".$errormsg, LOG_ERR);
-            }
-            $this->lastquery = $query;
-            $this->_results = $ret;
-        }
-
-        return $ret;
-    }
-
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *	Renvoie la ligne courante (comme un objet) pour le curseur resultset
-     *
-     *	@param	SQLite3Result	$resultset  Curseur de la requete voulue
-     *	@return	false|object				Object result line or false if KO or end of cursor
-     */
-    public function fetch_object($resultset)
-    {
-        // phpcs:enable
-        // Si le resultset n'est pas fourni, on prend le dernier utilise sur cette connexion
-        if (!is_object($resultset)) { $resultset = $this->_results; }
-        //return $resultset->fetch(PDO::FETCH_OBJ);
-        $ret = $resultset->fetchArray(SQLITE3_ASSOC);
-        if ($ret) {
-            return (object) $ret;
-        }
+	/**
+	 *  Close database connexion
+	 *
+	 *  @return     bool     True if disconnect successfull, false otherwise
+	 *  @see        connect()
+	 */
+	public function close()
+	{
+		if ($this->db)
+		{
+			if ($this->transaction_opened > 0) dol_syslog(get_class($this)."::close Closing a connection with an opened transaction depth=".$this->transaction_opened, LOG_ERR);
+			$this->connected = false;
+			$this->db->close();
+			unset($this->db); // Clean this->db
+			return true;
+		}
 		return false;
-    }
+	}
+
+	/**
+	 *  Execute a SQL request and return the resultset
+	 *
+	 * 	@param	string	$query			SQL query string
+	 * 	@param	int		$usesavepoint	0=Default mode, 1=Run a savepoint before and a rollbock to savepoint if error (this allow to have some request with errors inside global transactions).
+	 * 									Note that with Mysql, this parameter is not used as Myssql can already commit a transaction even if one request is in error, without using savepoints.
+	 *  @param  string	$type           Type of SQL order ('ddl' for insert, update, select, delete or 'dml' for create, alter...)
+	 *	@return	SQLite3Result			Resultset of answer
+	 */
+	public function query($query, $usesavepoint = 0, $type = 'auto')
+	{
+		global $conf;
+
+		$ret = null;
+
+		$query = trim($query);
+
+		$this->error = '';
+
+		// Convert MySQL syntax to SQLite syntax
+		if (preg_match('/ALTER\s+TABLE\s*(.*)\s*ADD\s+CONSTRAINT\s+(.*)\s*FOREIGN\s+KEY\s*\(([\w,\s]+)\)\s*REFERENCES\s+(\w+)\s*\(([\w,\s]+)\)/i', $query, $reg)) {
+			// Ajout d'une clef étrangère à la table
+			// procédure de remplacement de la table pour ajouter la contrainte
+			// Exemple : ALTER TABLE llx_adherent ADD CONSTRAINT adherent_fk_soc FOREIGN KEY (fk_soc) REFERENCES llx_societe (rowid)
+			// -> CREATE TABLE ( ... ,CONSTRAINT adherent_fk_soc FOREIGN KEY (fk_soc) REFERENCES llx_societe (rowid))
+			$foreignFields = $reg[5];
+			$foreignTable = $reg[4];
+			$localfields = $reg[3];
+			$constraintname = trim($reg[2]);
+			$tablename = trim($reg[1]);
+
+			$descTable = $this->db->querySingle("SELECT sql FROM sqlite_master WHERE name='".$this->escape($tablename)."'");
+
+			// 1- Renommer la table avec un nom temporaire
+			$this->query('ALTER TABLE '.$tablename.' RENAME TO tmp_'.$tablename);
+
+			// 2- Recréer la table avec la contrainte ajoutée
+
+			// on bricole la requete pour ajouter la contrainte
+			$descTable = substr($descTable, 0, strlen($descTable) - 1);
+			$descTable .= ", CONSTRAINT ".$constraintname." FOREIGN KEY (".$localfields.") REFERENCES ".$foreignTable."(".$foreignFields.")";
+
+			// fermeture de l'instruction
+			$descTable .= ')';
+
+			// Création proprement dite de la table
+			$this->query($descTable);
+
+			// 3- Transférer les données
+			$this->query('INSERT INTO '.$tablename.' SELECT * FROM tmp_'.$tablename);
+
+			// 4- Supprimer la table temporaire
+			$this->query('DROP TABLE tmp_'.$tablename);
+
+			// dummy statement
+			$query = "SELECT 0";
+		} else {
+			$query = $this->convertSQLFromMysql($query, $type);
+		}
+		//print "After convertSQLFromMysql:\n".$query."<br>\n";
+
+		if (!in_array($query, array('BEGIN', 'COMMIT', 'ROLLBACK')))
+		{
+			$SYSLOG_SQL_LIMIT = 10000; // limit log to 10kb per line to limit DOS attacks
+			dol_syslog('sql='.substr($query, 0, $SYSLOG_SQL_LIMIT), LOG_DEBUG);
+		}
+		if (empty($query)) return false; // Return false = error if empty request
+
+		// Ordre SQL ne necessitant pas de connexion a une base (exemple: CREATE DATABASE)
+		try {
+			//$ret = $this->db->exec($query);
+			$ret = $this->db->query($query); // $ret is a Sqlite3Result
+			if ($ret) {
+				$ret->queryString = $query;
+			}
+		} catch (Exception $e)
+		{
+			$this->error = $this->db->lastErrorMsg();
+		}
+
+		if (!preg_match("/^COMMIT/i", $query) && !preg_match("/^ROLLBACK/i", $query))
+		{
+			// Si requete utilisateur, on la sauvegarde ainsi que son resultset
+			if (!is_object($ret) || $this->error)
+			{
+				$this->lastqueryerror = $query;
+				$this->lasterror = $this->error();
+				$this->lasterrno = $this->errno();
+
+				dol_syslog(get_class($this)."::query SQL Error query: ".$query, LOG_ERR);
+
+				$errormsg = get_class($this)."::query SQL Error message: ".$this->lasterror;
+
+				if (preg_match('/[0-9]/', $this->lasterrno)) {
+					$errormsg .= ' ('.$this->lasterrno.')';
+				}
+
+				if ($conf->global->SYSLOG_LEVEL < LOG_DEBUG) dol_syslog(get_class($this)."::query SQL Error query: ".$query, LOG_ERR); // Log of request was not yet done previously
+				dol_syslog(get_class($this)."::query SQL Error message: ".$errormsg, LOG_ERR);
+			}
+			$this->lastquery = $query;
+			$this->_results = $ret;
+		}
+
+		return $ret;
+	}
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *	Renvoie la ligne courante (comme un objet) pour le curseur resultset
+	 *
+	 *	@param	SQLite3Result	$resultset  Curseur de la requete voulue
+	 *	@return	false|object				Object result line or false if KO or end of cursor
+	 */
+	public function fetch_object($resultset)
+	{
+		// phpcs:enable
+		// Si le resultset n'est pas fourni, on prend le dernier utilise sur cette connexion
+		if (!is_object($resultset)) { $resultset = $this->_results; }
+		//return $resultset->fetch(PDO::FETCH_OBJ);
+		$ret = $resultset->fetchArray(SQLITE3_ASSOC);
+		if ($ret) {
+			return (object) $ret;
+		}
+		return false;
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *	Return datas as an array
-     *
-     *	@param	SQLite3Result	$resultset  Resultset of request
-     *	@return	false|array					Array or false if KO or end of cursor
-     */
-    public function fetch_array($resultset)
-    {
-        // phpcs:enable
-        // If resultset not provided, we take the last used by connexion
-        if (!is_object($resultset)) { $resultset = $this->_results; }
-        //return $resultset->fetch(PDO::FETCH_ASSOC);
-        $ret = $resultset->fetchArray(SQLITE3_ASSOC);
-	    return $ret;
-    }
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *	Return datas as an array
+	 *
+	 *	@param	SQLite3Result	$resultset  Resultset of request
+	 *	@return	false|array					Array or false if KO or end of cursor
+	 */
+	public function fetch_array($resultset)
+	{
+		// phpcs:enable
+		// If resultset not provided, we take the last used by connexion
+		if (!is_object($resultset)) { $resultset = $this->_results; }
+		//return $resultset->fetch(PDO::FETCH_ASSOC);
+		$ret = $resultset->fetchArray(SQLITE3_ASSOC);
+		return $ret;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *	Return datas as an array
-     *
-     *	@param	SQLite3Result	$resultset  Resultset of request
-     *	@return	false|array					Array or false if KO or end of cursor
-     */
-    public function fetch_row($resultset)
-    {
-        // phpcs:enable
-        // If resultset not provided, we take the last used by connexion
-        if (!is_bool($resultset))
-        {
-            if (!is_object($resultset)) { $resultset = $this->_results; }
-            return $resultset->fetchArray(SQLITE3_NUM);
-        } else {
-            // si le curseur est un booleen on retourne la valeur 0
-            return false;
-        }
-    }
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *	Return datas as an array
+	 *
+	 *	@param	SQLite3Result	$resultset  Resultset of request
+	 *	@return	false|array					Array or false if KO or end of cursor
+	 */
+	public function fetch_row($resultset)
+	{
+		// phpcs:enable
+		// If resultset not provided, we take the last used by connexion
+		if (!is_bool($resultset))
+		{
+			if (!is_object($resultset)) { $resultset = $this->_results; }
+			return $resultset->fetchArray(SQLITE3_NUM);
+		} else {
+			// si le curseur est un booleen on retourne la valeur 0
+			return false;
+		}
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *	Return number of lines for result of a SELECT
-     *
-     *	@param	SQLite3Result	$resultset  Resulset of requests
-     *	@return int		    			Nb of lines
-     *	@see    affected_rows()
-     */
-    public function num_rows($resultset)
-    {
-        // phpcs:enable
-        // FIXME: SQLite3Result does not have a queryString member
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *	Return number of lines for result of a SELECT
+	 *
+	 *	@param	SQLite3Result	$resultset  Resulset of requests
+	 *	@return int		    			Nb of lines
+	 *	@see    affected_rows()
+	 */
+	public function num_rows($resultset)
+	{
+		// phpcs:enable
+		// FIXME: SQLite3Result does not have a queryString member
 
-        // If resultset not provided, we take the last used by connexion
-        if (!is_object($resultset)) { $resultset = $this->_results; }
-        if (preg_match("/^SELECT/i", $resultset->queryString)) {
-            return $this->db->querySingle("SELECT count(*) FROM (".$resultset->queryString.") q");
-        }
-        return 0;
-    }
+		// If resultset not provided, we take the last used by connexion
+		if (!is_object($resultset)) { $resultset = $this->_results; }
+		if (preg_match("/^SELECT/i", $resultset->queryString)) {
+			return $this->db->querySingle("SELECT count(*) FROM (".$resultset->queryString.") q");
+		}
+		return 0;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *	Return number of lines for result of a SELECT
-     *
-     *	@param	SQLite3Result	$resultset  Resulset of requests
-     *	@return int		    			Nb of lines
-     *	@see    affected_rows()
-     */
-    public function affected_rows($resultset)
-    {
-        // phpcs:enable
-        // FIXME: SQLite3Result does not have a queryString member
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *	Return number of lines for result of a SELECT
+	 *
+	 *	@param	SQLite3Result	$resultset  Resulset of requests
+	 *	@return int		    			Nb of lines
+	 *	@see    affected_rows()
+	 */
+	public function affected_rows($resultset)
+	{
+		// phpcs:enable
+		// FIXME: SQLite3Result does not have a queryString member
 
-        // If resultset not provided, we take the last used by connexion
-        if (!is_object($resultset)) { $resultset = $this->_results; }
-        if (preg_match("/^SELECT/i", $resultset->queryString)) {
-            return $this->num_rows($resultset);
-        }
-        // mysql necessite un link de base pour cette fonction contrairement
-        // a pqsql qui prend un resultset
-        return $this->db->changes();
-    }
+		// If resultset not provided, we take the last used by connexion
+		if (!is_object($resultset)) { $resultset = $this->_results; }
+		if (preg_match("/^SELECT/i", $resultset->queryString)) {
+			return $this->num_rows($resultset);
+		}
+		// mysql necessite un link de base pour cette fonction contrairement
+		// a pqsql qui prend un resultset
+		return $this->db->changes();
+	}
 
 
-    /**
+	/**
 	 *	Free last resultset used.
-     *
+	 *
 	 *	@param  SQLite3Result	$resultset   Curseur de la requete voulue
 	 *	@return	void
-     */
-    public function free($resultset = null)
-    {
-        // If resultset not provided, we take the last used by connexion
-        if (!is_object($resultset)) { $resultset = $this->_results; }
-        // Si resultset en est un, on libere la memoire
-        if ($resultset && is_object($resultset)) $resultset->finalize();
-    }
+	 */
+	public function free($resultset = null)
+	{
+		// If resultset not provided, we take the last used by connexion
+		if (!is_object($resultset)) { $resultset = $this->_results; }
+		// Si resultset en est un, on libere la memoire
+		if ($resultset && is_object($resultset)) $resultset->finalize();
+	}
 
-    /**
+	/**
 	 *	Escape a string to insert data
-     *
+	 *
 	 *  @param	string	$stringtoencode		String to escape
 	 *  @return	string						String escaped
-     */
-    public function escape($stringtoencode)
-    {
-        return Sqlite3::escapeString($stringtoencode);
-    }
+	 */
+	public function escape($stringtoencode)
+	{
+		return Sqlite3::escapeString($stringtoencode);
+	}
 
-    /**
-     *	Renvoie le code erreur generique de l'operation precedente.
-     *
-     *	@return	string		Error code (Exemples: DB_ERROR_TABLE_ALREADY_EXISTS, DB_ERROR_RECORD_ALREADY_EXISTS...)
-     */
-    public function errno()
-    {
-        if (!$this->connected) {
-            // Si il y a eu echec de connexion, $this->db n'est pas valide.
-            return 'DB_ERROR_FAILED_TO_CONNECT';
-        } else {
-            // Constants to convert error code to a generic Dolibarr error code
-            /*$errorcode_map = array(
+	/**
+	 *	Renvoie le code erreur generique de l'operation precedente.
+	 *
+	 *	@return	string		Error code (Exemples: DB_ERROR_TABLE_ALREADY_EXISTS, DB_ERROR_RECORD_ALREADY_EXISTS...)
+	 */
+	public function errno()
+	{
+		if (!$this->connected) {
+			// Si il y a eu echec de connexion, $this->db n'est pas valide.
+			return 'DB_ERROR_FAILED_TO_CONNECT';
+		} else {
+			// Constants to convert error code to a generic Dolibarr error code
+			/*$errorcode_map = array(
             1004 => 'DB_ERROR_CANNOT_CREATE',
             1005 => 'DB_ERROR_CANNOT_CREATE',
             1006 => 'DB_ERROR_CANNOT_CREATE',
@@ -669,228 +669,228 @@ class DoliDBSqlite3 extends DoliDB
             {
                 return $errorcode_map[$this->db->errorCode()];
             }*/
-            $errno = $this->db->lastErrorCode();
+			$errno = $this->db->lastErrorCode();
 			if ($errno == 'HY000' || $errno == 0)
-            {
-                if (preg_match('/table.*already exists/i', $this->error))     return 'DB_ERROR_TABLE_ALREADY_EXISTS';
-                elseif (preg_match('/index.*already exists/i', $this->error)) return 'DB_ERROR_KEY_NAME_ALREADY_EXISTS';
-                elseif (preg_match('/syntax error/i', $this->error))          return 'DB_ERROR_SYNTAX';
-            }
-            if ($errno == '23000')
-            {
-                if (preg_match('/column.* not unique/i', $this->error))       return 'DB_ERROR_RECORD_ALREADY_EXISTS';
-                elseif (preg_match('/PRIMARY KEY must be unique/i', $this->error)) return 'DB_ERROR_RECORD_ALREADY_EXISTS';
-            }
-            if ($errno > 1) {
-                // TODO Voir la liste des messages d'erreur
-            }
+			{
+				if (preg_match('/table.*already exists/i', $this->error))     return 'DB_ERROR_TABLE_ALREADY_EXISTS';
+				elseif (preg_match('/index.*already exists/i', $this->error)) return 'DB_ERROR_KEY_NAME_ALREADY_EXISTS';
+				elseif (preg_match('/syntax error/i', $this->error))          return 'DB_ERROR_SYNTAX';
+			}
+			if ($errno == '23000')
+			{
+				if (preg_match('/column.* not unique/i', $this->error))       return 'DB_ERROR_RECORD_ALREADY_EXISTS';
+				elseif (preg_match('/PRIMARY KEY must be unique/i', $this->error)) return 'DB_ERROR_RECORD_ALREADY_EXISTS';
+			}
+			if ($errno > 1) {
+				// TODO Voir la liste des messages d'erreur
+			}
 
-            return ($errno ? 'DB_ERROR_'.$errno : '0');
-        }
-    }
+			return ($errno ? 'DB_ERROR_'.$errno : '0');
+		}
+	}
 
-    /**
-     *	Renvoie le texte de l'erreur mysql de l'operation precedente.
-     *
-     *	@return	string	Error text
-     */
-    public function error()
-    {
-        if (!$this->connected) {
-            // Si il y a eu echec de connexion, $this->db n'est pas valide pour sqlite_error.
-            return 'Not connected. Check setup parameters in conf/conf.php file and your sqlite version';
-        } else {
-            return $this->error;
-        }
-    }
+	/**
+	 *	Renvoie le texte de l'erreur mysql de l'operation precedente.
+	 *
+	 *	@return	string	Error text
+	 */
+	public function error()
+	{
+		if (!$this->connected) {
+			// Si il y a eu echec de connexion, $this->db n'est pas valide pour sqlite_error.
+			return 'Not connected. Check setup parameters in conf/conf.php file and your sqlite version';
+		} else {
+			return $this->error;
+		}
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * Get last ID after an insert INSERT
-     *
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Get last ID after an insert INSERT
+	 *
 	 * @param   string	$tab    	Table name concerned by insert. Ne sert pas sous MySql mais requis pour compatibilite avec Postgresql
 	 * @param	string	$fieldid	Field name
 	 * @return  int     			Id of row
-     */
-    public function last_insert_id($tab, $fieldid = 'rowid')
-    {
-        // phpcs:enable
-        return $this->db->lastInsertRowId();
-    }
+	 */
+	public function last_insert_id($tab, $fieldid = 'rowid')
+	{
+		// phpcs:enable
+		return $this->db->lastInsertRowId();
+	}
 
-    /**
-     *  Encrypt sensitive data in database
-     *  Warning: This function includes the escape, so it must use direct value
-     *
-     *  @param  string  $fieldorvalue   Field name or value to encrypt
-     *  @param	int		$withQuotes     Return string with quotes
-     *  @return string          		XXX(field) or XXX('value') or field or 'value'
-     */
-    public function encrypt($fieldorvalue, $withQuotes = 0)
-    {
-        global $conf;
+	/**
+	 *  Encrypt sensitive data in database
+	 *  Warning: This function includes the escape, so it must use direct value
+	 *
+	 *  @param  string  $fieldorvalue   Field name or value to encrypt
+	 *  @param	int		$withQuotes     Return string with quotes
+	 *  @return string          		XXX(field) or XXX('value') or field or 'value'
+	 */
+	public function encrypt($fieldorvalue, $withQuotes = 0)
+	{
+		global $conf;
 
-        // Type of encryption (2: AES (recommended), 1: DES , 0: no encryption)
-        $cryptType = ($conf->db->dolibarr_main_db_encryption ? $conf->db->dolibarr_main_db_encryption : 0);
+		// Type of encryption (2: AES (recommended), 1: DES , 0: no encryption)
+		$cryptType = ($conf->db->dolibarr_main_db_encryption ? $conf->db->dolibarr_main_db_encryption : 0);
 
-        //Encryption key
-        $cryptKey = (!empty($conf->db->dolibarr_main_db_cryptkey) ? $conf->db->dolibarr_main_db_cryptkey : '');
+		//Encryption key
+		$cryptKey = (!empty($conf->db->dolibarr_main_db_cryptkey) ? $conf->db->dolibarr_main_db_cryptkey : '');
 
-        $return = ($withQuotes ? "'" : "").$this->escape($fieldorvalue).($withQuotes ? "'" : "");
+		$return = ($withQuotes ? "'" : "").$this->escape($fieldorvalue).($withQuotes ? "'" : "");
 
-        if ($cryptType && !empty($cryptKey))
-        {
-            if ($cryptType == 2)
-            {
-                $return = 'AES_ENCRYPT('.$return.',\''.$cryptKey.'\')';
-            } elseif ($cryptType == 1)
-            {
-                $return = 'DES_ENCRYPT('.$return.',\''.$cryptKey.'\')';
-            }
-        }
+		if ($cryptType && !empty($cryptKey))
+		{
+			if ($cryptType == 2)
+			{
+				$return = 'AES_ENCRYPT('.$return.',\''.$cryptKey.'\')';
+			} elseif ($cryptType == 1)
+			{
+				$return = 'DES_ENCRYPT('.$return.',\''.$cryptKey.'\')';
+			}
+		}
 
-        return $return;
-    }
+		return $return;
+	}
 
-    /**
-     *	Decrypt sensitive data in database
-     *
-     *	@param	string	$value			Value to decrypt
-     * 	@return	string					Decrypted value if used
-     */
-    public function decrypt($value)
-    {
-        global $conf;
+	/**
+	 *	Decrypt sensitive data in database
+	 *
+	 *	@param	string	$value			Value to decrypt
+	 * 	@return	string					Decrypted value if used
+	 */
+	public function decrypt($value)
+	{
+		global $conf;
 
-        // Type of encryption (2: AES (recommended), 1: DES , 0: no encryption)
-        $cryptType = ($conf->db->dolibarr_main_db_encryption ? $conf->db->dolibarr_main_db_encryption : 0);
+		// Type of encryption (2: AES (recommended), 1: DES , 0: no encryption)
+		$cryptType = ($conf->db->dolibarr_main_db_encryption ? $conf->db->dolibarr_main_db_encryption : 0);
 
-        //Encryption key
-        $cryptKey = (!empty($conf->db->dolibarr_main_db_cryptkey) ? $conf->db->dolibarr_main_db_cryptkey : '');
+		//Encryption key
+		$cryptKey = (!empty($conf->db->dolibarr_main_db_cryptkey) ? $conf->db->dolibarr_main_db_cryptkey : '');
 
-        $return = $value;
+		$return = $value;
 
-        if ($cryptType && !empty($cryptKey))
-        {
-            if ($cryptType == 2)
-            {
-                $return = 'AES_DECRYPT('.$value.',\''.$cryptKey.'\')';
-            } elseif ($cryptType == 1)
-            {
-                $return = 'DES_DECRYPT('.$value.',\''.$cryptKey.'\')';
-            }
-        }
+		if ($cryptType && !empty($cryptKey))
+		{
+			if ($cryptType == 2)
+			{
+				$return = 'AES_DECRYPT('.$value.',\''.$cryptKey.'\')';
+			} elseif ($cryptType == 1)
+			{
+				$return = 'DES_DECRYPT('.$value.',\''.$cryptKey.'\')';
+			}
+		}
 
-        return $return;
-    }
+		return $return;
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * Return connexion ID
-     *
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Return connexion ID
+	 *
 	 * @return	        string      Id connexion
-     */
-    public function DDLGetConnectId()
-    {
-        // phpcs:enable
-        return '?';
-    }
+	 */
+	public function DDLGetConnectId()
+	{
+		// phpcs:enable
+		return '?';
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
 	 *	Create a new database
 	 *	Do not use function xxx_create_db (xxx=mysql, ...) as they are deprecated
 	 *	We force to create database with charset this->forcecharset and collate this->forcecollate
-     *
+	 *
 	 *	@param	string	$database		Database name to create
 	 * 	@param	string	$charset		Charset used to store data
 	 * 	@param	string	$collation		Charset used to sort data
 	 * 	@param	string	$owner			Username of database owner
 	 * 	@return	SQLite3Result   		resource defined if OK, null if KO
-     */
-    public function DDLCreateDb($database, $charset = '', $collation = '', $owner = '')
-    {
-        // phpcs:enable
-        if (empty($charset))   $charset = $this->forcecharset;
-        if (empty($collation)) $collation = $this->forcecollate;
+	 */
+	public function DDLCreateDb($database, $charset = '', $collation = '', $owner = '')
+	{
+		// phpcs:enable
+		if (empty($charset))   $charset = $this->forcecharset;
+		if (empty($collation)) $collation = $this->forcecollate;
 
-        // ALTER DATABASE dolibarr_db DEFAULT CHARACTER SET latin DEFAULT COLLATE latin1_swedish_ci
-        $sql = 'CREATE DATABASE '.$database;
-        $sql .= ' DEFAULT CHARACTER SET '.$charset.' DEFAULT COLLATE '.$collation;
+		// ALTER DATABASE dolibarr_db DEFAULT CHARACTER SET latin DEFAULT COLLATE latin1_swedish_ci
+		$sql = 'CREATE DATABASE '.$database;
+		$sql .= ' DEFAULT CHARACTER SET '.$charset.' DEFAULT COLLATE '.$collation;
 
-        dol_syslog($sql, LOG_DEBUG);
-        $ret = $this->query($sql);
-        if (!$ret)
-        {
-            // We try again for compatibility with Mysql < 4.1.1
-            $sql = 'CREATE DATABASE '.$database;
-            $ret = $this->query($sql);
-            dol_syslog($sql, LOG_DEBUG);
-        }
-        return $ret;
-    }
+		dol_syslog($sql, LOG_DEBUG);
+		$ret = $this->query($sql);
+		if (!$ret)
+		{
+			// We try again for compatibility with Mysql < 4.1.1
+			$sql = 'CREATE DATABASE '.$database;
+			$ret = $this->query($sql);
+			dol_syslog($sql, LOG_DEBUG);
+		}
+		return $ret;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  List tables into a database
-     *
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  List tables into a database
+	 *
 	 *  @param	string		$database	Name of database
 	 *  @param	string		$table		Name of table filter ('xxx%')
 	 *  @return	array					List of tables in an array
-     */
-    public function DDLListTables($database, $table = '')
-    {
-        // phpcs:enable
-        $listtables = array();
+	 */
+	public function DDLListTables($database, $table = '')
+	{
+		// phpcs:enable
+		$listtables = array();
 
-        $like = '';
-        if ($table) $like = "LIKE '".$table."'";
-        $sql = "SHOW TABLES FROM ".$database." ".$like.";";
-        //print $sql;
-        $result = $this->query($sql);
-        if ($result)
-        {
-            while ($row = $this->fetch_row($result))
-            {
-                $listtables[] = $row[0];
-            }
-        }
-        return $listtables;
-    }
+		$like = '';
+		if ($table) $like = "LIKE '".$table."'";
+		$sql = "SHOW TABLES FROM ".$database." ".$like.";";
+		//print $sql;
+		$result = $this->query($sql);
+		if ($result)
+		{
+			while ($row = $this->fetch_row($result))
+			{
+				$listtables[] = $row[0];
+			}
+		}
+		return $listtables;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  List information of columns into a table.
-     *
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  List information of columns into a table.
+	 *
 	 *	@param	string	$table		Name of table
 	 *	@return	array				Tableau des informations des champs de la table
 	 *	TODO modify for sqlite
-     */
-    public function DDLInfoTable($table)
-    {
-        // phpcs:enable
-        $infotables = array();
+	 */
+	public function DDLInfoTable($table)
+	{
+		// phpcs:enable
+		$infotables = array();
 
-        $sql = "SHOW FULL COLUMNS FROM ".$table.";";
+		$sql = "SHOW FULL COLUMNS FROM ".$table.";";
 
-        dol_syslog($sql, LOG_DEBUG);
-        $result = $this->query($sql);
-        if ($result)
-        {
-            while ($row = $this->fetch_row($result))
-            {
-                $infotables[] = $row;
-            }
-        }
-        return $infotables;
-    }
+		dol_syslog($sql, LOG_DEBUG);
+		$result = $this->query($sql);
+		if ($result)
+		{
+			while ($row = $this->fetch_row($result))
+			{
+				$infotables[] = $row;
+			}
+		}
+		return $infotables;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
 	 *	Create a table into database
-     *
+	 *
 	 *	@param	    string	$table 			Nom de la table
 	 *	@param	    array	$fields 		Tableau associatif [nom champ][tableau des descriptions]
 	 *	@param	    string	$primary_key 	Nom du champ qui sera la clef primaire
@@ -899,391 +899,391 @@ class DoliDBSqlite3 extends DoliDB
 	 *	@param	    array	$fulltext_keys	Tableau des Nom de champs qui seront indexes en fulltext
 	 *	@param	    array	$keys 			Tableau des champs cles noms => valeur
 	 *	@return	    int						<0 if KO, >=0 if OK
-     */
-    public function DDLCreateTable($table, $fields, $primary_key, $type, $unique_keys = null, $fulltext_keys = null, $keys = null)
-    {
-        // phpcs:enable
-        // FIXME: $fulltext_keys parameter is unused
+	 */
+	public function DDLCreateTable($table, $fields, $primary_key, $type, $unique_keys = null, $fulltext_keys = null, $keys = null)
+	{
+		// phpcs:enable
+		// FIXME: $fulltext_keys parameter is unused
 
-        // cles recherchees dans le tableau des descriptions (fields) : type,value,attribute,null,default,extra
-        // ex. : $fields['rowid'] = array('type'=>'int','value'=>'11','null'=>'not null','extra'=> 'auto_increment');
-        $sql = "create table ".$table."(";
-        $i = 0;
-        foreach ($fields as $field_name => $field_desc)
-        {
-            $sqlfields[$i] = $field_name." ";
-            $sqlfields[$i] .= $field_desc['type'];
-            if (preg_match("/^[^\s]/i", $field_desc['value']))
-                $sqlfields[$i]  .= "(".$field_desc['value'].")";
-            elseif (preg_match("/^[^\s]/i", $field_desc['attribute']))
-                $sqlfields[$i]  .= " ".$field_desc['attribute'];
-            elseif (preg_match("/^[^\s]/i", $field_desc['default']))
-            {
-                if (preg_match("/null/i", $field_desc['default']))
-                    $sqlfields[$i] .= " default ".$field_desc['default'];
-                else $sqlfields[$i] .= " default '".$this->escape($field_desc['default'])."'";
-            } elseif (preg_match("/^[^\s]/i", $field_desc['null']))
-                $sqlfields[$i] .= " ".$field_desc['null'];
+		// cles recherchees dans le tableau des descriptions (fields) : type,value,attribute,null,default,extra
+		// ex. : $fields['rowid'] = array('type'=>'int','value'=>'11','null'=>'not null','extra'=> 'auto_increment');
+		$sql = "create table ".$table."(";
+		$i = 0;
+		foreach ($fields as $field_name => $field_desc)
+		{
+			$sqlfields[$i] = $field_name." ";
+			$sqlfields[$i] .= $field_desc['type'];
+			if (preg_match("/^[^\s]/i", $field_desc['value']))
+				$sqlfields[$i]  .= "(".$field_desc['value'].")";
+			elseif (preg_match("/^[^\s]/i", $field_desc['attribute']))
+				$sqlfields[$i]  .= " ".$field_desc['attribute'];
+			elseif (preg_match("/^[^\s]/i", $field_desc['default']))
+			{
+				if (preg_match("/null/i", $field_desc['default']))
+					$sqlfields[$i] .= " default ".$field_desc['default'];
+				else $sqlfields[$i] .= " default '".$this->escape($field_desc['default'])."'";
+			} elseif (preg_match("/^[^\s]/i", $field_desc['null']))
+				$sqlfields[$i] .= " ".$field_desc['null'];
 
-            elseif (preg_match("/^[^\s]/i", $field_desc['extra']))
-                $sqlfields[$i] .= " ".$field_desc['extra'];
-            $i++;
-        }
-        if ($primary_key != "")
-        $pk = "primary key(".$primary_key.")";
+			elseif (preg_match("/^[^\s]/i", $field_desc['extra']))
+				$sqlfields[$i] .= " ".$field_desc['extra'];
+			$i++;
+		}
+		if ($primary_key != "")
+		$pk = "primary key(".$primary_key.")";
 
-        if (is_array($unique_keys))
-        {
-            $i = 0;
-            foreach ($unique_keys as $key => $value)
-            {
-            	$sqluq[$i] = "UNIQUE KEY '".$key."' ('".$this->escape($value)."')";
-                $i++;
-            }
-        }
-        if (is_array($keys))
-        {
-            $i = 0;
-            foreach ($keys as $key => $value)
-            {
-                $sqlk[$i] = "KEY ".$key." (".$value.")";
-                $i++;
-            }
-        }
-        $sql .= implode(',', $sqlfields);
-        if ($primary_key != "")
-        $sql .= ",".$pk;
-        if (is_array($unique_keys))
-        $sql .= ",".implode(',', $sqluq);
-        if (is_array($keys))
-        $sql .= ",".implode(',', $sqlk);
-        $sql .= ") type=".$type;
+		if (is_array($unique_keys))
+		{
+			$i = 0;
+			foreach ($unique_keys as $key => $value)
+			{
+				$sqluq[$i] = "UNIQUE KEY '".$key."' ('".$this->escape($value)."')";
+				$i++;
+			}
+		}
+		if (is_array($keys))
+		{
+			$i = 0;
+			foreach ($keys as $key => $value)
+			{
+				$sqlk[$i] = "KEY ".$key." (".$value.")";
+				$i++;
+			}
+		}
+		$sql .= implode(',', $sqlfields);
+		if ($primary_key != "")
+		$sql .= ",".$pk;
+		if (is_array($unique_keys))
+		$sql .= ",".implode(',', $sqluq);
+		if (is_array($keys))
+		$sql .= ",".implode(',', $sqlk);
+		$sql .= ") type=".$type;
 
-        dol_syslog($sql, LOG_DEBUG);
-        if (!$this -> query($sql))
-            return -1;
-        return 1;
-    }
+		dol_syslog($sql, LOG_DEBUG);
+		if (!$this -> query($sql))
+			return -1;
+		return 1;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *	Drop a table into database
-     *
-     *	@param	    string	$table 			Name of table
-     *	@return	    int						<0 if KO, >=0 if OK
-     */
-    public function DDLDropTable($table)
-    {
-        // phpcs:enable
-    	$sql = "DROP TABLE ".$table;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *	Drop a table into database
+	 *
+	 *	@param	    string	$table 			Name of table
+	 *	@return	    int						<0 if KO, >=0 if OK
+	 */
+	public function DDLDropTable($table)
+	{
+		// phpcs:enable
+		$sql = "DROP TABLE ".$table;
 
-    	if (!$this->query($sql))
-    		return -1;
-    	else return 1;
-    }
+		if (!$this->query($sql))
+			return -1;
+		else return 1;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
 	 *	Return a pointer of line with description of a table or field
-     *
+	 *
 	 *	@param	string		$table	Name of table
 	 *	@param	string		$field	Optionnel : Name of field if we want description of field
 	 *	@return	SQLite3Result		Resource
-     */
-    public function DDLDescTable($table, $field = "")
-    {
-        // phpcs:enable
-        $sql = "DESC ".$table." ".$field;
+	 */
+	public function DDLDescTable($table, $field = "")
+	{
+		// phpcs:enable
+		$sql = "DESC ".$table." ".$field;
 
-        dol_syslog(get_class($this)."::DDLDescTable ".$sql, LOG_DEBUG);
-        $this->_results = $this->query($sql);
-        return $this->_results;
-    }
+		dol_syslog(get_class($this)."::DDLDescTable ".$sql, LOG_DEBUG);
+		$this->_results = $this->query($sql);
+		return $this->_results;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
 	 *	Create a new field into table
-     *
+	 *
 	 *	@param	string	$table 				Name of table
 	 *	@param	string	$field_name 		Name of field to add
 	 *	@param	string	$field_desc 		Tableau associatif de description du champ a inserer[nom du parametre][valeur du parametre]
 	 *	@param	string	$field_position 	Optionnel ex.: "after champtruc"
 	 *	@return	int							<0 if KO, >0 if OK
-     */
-    public function DDLAddField($table, $field_name, $field_desc, $field_position = "")
-    {
-        // phpcs:enable
-        // cles recherchees dans le tableau des descriptions (field_desc) : type,value,attribute,null,default,extra
-        // ex. : $field_desc = array('type'=>'int','value'=>'11','null'=>'not null','extra'=> 'auto_increment');
-        $sql = "ALTER TABLE ".$table." ADD ".$field_name." ";
-        $sql .= $field_desc['type'];
-        if (preg_match("/^[^\s]/i", $field_desc['value']))
-        if (!in_array($field_desc['type'], array('date', 'datetime')))
-        {
-            $sql .= "(".$field_desc['value'].")";
-        }
-        if (preg_match("/^[^\s]/i", $field_desc['attribute']))
-        $sql .= " ".$field_desc['attribute'];
-        if (preg_match("/^[^\s]/i", $field_desc['null']))
-        $sql .= " ".$field_desc['null'];
-        if (preg_match("/^[^\s]/i", $field_desc['default']))
-        {
-            if (preg_match("/null/i", $field_desc['default']))
-            $sql .= " default ".$field_desc['default'];
-            else $sql .= " default '".$this->escape($field_desc['default'])."'";
-        }
-        if (preg_match("/^[^\s]/i", $field_desc['extra']))
-        $sql .= " ".$field_desc['extra'];
-        $sql .= " ".$field_position;
+	 */
+	public function DDLAddField($table, $field_name, $field_desc, $field_position = "")
+	{
+		// phpcs:enable
+		// cles recherchees dans le tableau des descriptions (field_desc) : type,value,attribute,null,default,extra
+		// ex. : $field_desc = array('type'=>'int','value'=>'11','null'=>'not null','extra'=> 'auto_increment');
+		$sql = "ALTER TABLE ".$table." ADD ".$field_name." ";
+		$sql .= $field_desc['type'];
+		if (preg_match("/^[^\s]/i", $field_desc['value']))
+		if (!in_array($field_desc['type'], array('date', 'datetime')))
+		{
+			$sql .= "(".$field_desc['value'].")";
+		}
+		if (preg_match("/^[^\s]/i", $field_desc['attribute']))
+		$sql .= " ".$field_desc['attribute'];
+		if (preg_match("/^[^\s]/i", $field_desc['null']))
+		$sql .= " ".$field_desc['null'];
+		if (preg_match("/^[^\s]/i", $field_desc['default']))
+		{
+			if (preg_match("/null/i", $field_desc['default']))
+			$sql .= " default ".$field_desc['default'];
+			else $sql .= " default '".$this->escape($field_desc['default'])."'";
+		}
+		if (preg_match("/^[^\s]/i", $field_desc['extra']))
+		$sql .= " ".$field_desc['extra'];
+		$sql .= " ".$field_position;
 
-        dol_syslog(get_class($this)."::DDLAddField ".$sql, LOG_DEBUG);
-        if (!$this->query($sql))
-        {
-            return -1;
-        }
-        return 1;
-    }
+		dol_syslog(get_class($this)."::DDLAddField ".$sql, LOG_DEBUG);
+		if (!$this->query($sql))
+		{
+			return -1;
+		}
+		return 1;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
 	 *	Update format of a field into a table
-     *
+	 *
 	 *	@param	string	$table 				Name of table
 	 *	@param	string	$field_name 		Name of field to modify
 	 *	@param	string	$field_desc 		Array with description of field format
 	 *	@return	int							<0 if KO, >0 if OK
-     */
-    public function DDLUpdateField($table, $field_name, $field_desc)
-    {
-        // phpcs:enable
-        $sql = "ALTER TABLE ".$table;
-        $sql .= " MODIFY COLUMN ".$field_name." ".$field_desc['type'];
-        if ($field_desc['type'] == 'tinyint' || $field_desc['type'] == 'int' || $field_desc['type'] == 'varchar') {
-            $sql .= "(".$field_desc['value'].")";
-        }
+	 */
+	public function DDLUpdateField($table, $field_name, $field_desc)
+	{
+		// phpcs:enable
+		$sql = "ALTER TABLE ".$table;
+		$sql .= " MODIFY COLUMN ".$field_name." ".$field_desc['type'];
+		if ($field_desc['type'] == 'tinyint' || $field_desc['type'] == 'int' || $field_desc['type'] == 'varchar') {
+			$sql .= "(".$field_desc['value'].")";
+		}
 
-        dol_syslog(get_class($this)."::DDLUpdateField ".$sql, LOG_DEBUG);
-        if (!$this->query($sql))
-            return -1;
-        return 1;
-    }
+		dol_syslog(get_class($this)."::DDLUpdateField ".$sql, LOG_DEBUG);
+		if (!$this->query($sql))
+			return -1;
+		return 1;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
 	 *	Drop a field from table
-     *
+	 *
 	 *	@param	string	$table 			Name of table
 	 *	@param	string	$field_name 	Name of field to drop
 	 *	@return	int						<0 if KO, >0 if OK
-     */
-    public function DDLDropField($table, $field_name)
-    {
-        // phpcs:enable
-        $sql = "ALTER TABLE ".$table." DROP COLUMN `".$field_name."`";
-        dol_syslog(get_class($this)."::DDLDropField ".$sql, LOG_DEBUG);
-        if (!$this->query($sql))
-        {
-            $this->error = $this->lasterror();
-            return -1;
-        }
-        return 1;
-    }
+	 */
+	public function DDLDropField($table, $field_name)
+	{
+		// phpcs:enable
+		$sql = "ALTER TABLE ".$table." DROP COLUMN `".$field_name."`";
+		dol_syslog(get_class($this)."::DDLDropField ".$sql, LOG_DEBUG);
+		if (!$this->query($sql))
+		{
+			$this->error = $this->lasterror();
+			return -1;
+		}
+		return 1;
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * 	Create a user and privileges to connect to database (even if database does not exists yet)
-     *
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * 	Create a user and privileges to connect to database (even if database does not exists yet)
+	 *
 	 *	@param	string	$dolibarr_main_db_host 		Ip serveur
 	 *	@param	string	$dolibarr_main_db_user 		Nom user a creer
 	 *	@param	string	$dolibarr_main_db_pass 		Mot de passe user a creer
 	 *	@param	string	$dolibarr_main_db_name		Database name where user must be granted
 	 *	@return	int									<0 if KO, >=0 if OK
-     */
-    public function DDLCreateUser($dolibarr_main_db_host, $dolibarr_main_db_user, $dolibarr_main_db_pass, $dolibarr_main_db_name)
-    {
-        // phpcs:enable
-        $sql = "INSERT INTO user ";
-        $sql .= "(Host,User,password,Select_priv,Insert_priv,Update_priv,Delete_priv,Create_priv,Drop_priv,Index_Priv,Alter_priv,Lock_tables_priv)";
-        $sql .= " VALUES ('".$this->escape($dolibarr_main_db_host)."','".$this->escape($dolibarr_main_db_user)."',password('".addslashes($dolibarr_main_db_pass)."')";
-        $sql .= ",'Y','Y','Y','Y','Y','Y','Y','Y','Y')";
+	 */
+	public function DDLCreateUser($dolibarr_main_db_host, $dolibarr_main_db_user, $dolibarr_main_db_pass, $dolibarr_main_db_name)
+	{
+		// phpcs:enable
+		$sql = "INSERT INTO user ";
+		$sql .= "(Host,User,password,Select_priv,Insert_priv,Update_priv,Delete_priv,Create_priv,Drop_priv,Index_Priv,Alter_priv,Lock_tables_priv)";
+		$sql .= " VALUES ('".$this->escape($dolibarr_main_db_host)."','".$this->escape($dolibarr_main_db_user)."',password('".addslashes($dolibarr_main_db_pass)."')";
+		$sql .= ",'Y','Y','Y','Y','Y','Y','Y','Y','Y')";
 
-        dol_syslog(get_class($this)."::DDLCreateUser", LOG_DEBUG); // No sql to avoid password in log
-        $resql = $this->query($sql);
-        if (!$resql)
-        {
-            return -1;
-        }
+		dol_syslog(get_class($this)."::DDLCreateUser", LOG_DEBUG); // No sql to avoid password in log
+		$resql = $this->query($sql);
+		if (!$resql)
+		{
+			return -1;
+		}
 
-        $sql = "INSERT INTO db ";
-        $sql .= "(Host,Db,User,Select_priv,Insert_priv,Update_priv,Delete_priv,Create_priv,Drop_priv,Index_Priv,Alter_priv,Lock_tables_priv)";
-        $sql .= " VALUES ('".$this->escape($dolibarr_main_db_host)."','".$this->escape($dolibarr_main_db_name)."','".addslashes($dolibarr_main_db_user)."'";
-        $sql .= ",'Y','Y','Y','Y','Y','Y','Y','Y','Y')";
+		$sql = "INSERT INTO db ";
+		$sql .= "(Host,Db,User,Select_priv,Insert_priv,Update_priv,Delete_priv,Create_priv,Drop_priv,Index_Priv,Alter_priv,Lock_tables_priv)";
+		$sql .= " VALUES ('".$this->escape($dolibarr_main_db_host)."','".$this->escape($dolibarr_main_db_name)."','".addslashes($dolibarr_main_db_user)."'";
+		$sql .= ",'Y','Y','Y','Y','Y','Y','Y','Y','Y')";
 
-        dol_syslog(get_class($this)."::DDLCreateUser", LOG_DEBUG);
-        $resql = $this->query($sql);
-        if (!$resql)
-        {
-            return -1;
-        }
+		dol_syslog(get_class($this)."::DDLCreateUser", LOG_DEBUG);
+		$resql = $this->query($sql);
+		if (!$resql)
+		{
+			return -1;
+		}
 
-        $sql = "FLUSH Privileges";
+		$sql = "FLUSH Privileges";
 
-        dol_syslog(get_class($this)."::DDLCreateUser", LOG_DEBUG);
-        $resql = $this->query($sql);
-        if (!$resql)
-        {
-            return -1;
-        }
-        return 1;
-    }
+		dol_syslog(get_class($this)."::DDLCreateUser", LOG_DEBUG);
+		$resql = $this->query($sql);
+		if (!$resql)
+		{
+			return -1;
+		}
+		return 1;
+	}
 
-    /**
+	/**
 	 *	Return charset used to store data in database
-     *
+	 *
 	 *	@return		string		Charset
-     */
-    public function getDefaultCharacterSetDatabase()
-    {
-        return 'UTF-8';
-    }
+	 */
+	public function getDefaultCharacterSetDatabase()
+	{
+		return 'UTF-8';
+	}
 
-    /**
+	/**
 	 *	Return list of available charset that can be used to store data in database
-     *
+	 *
 	 *	@return		array		List of Charset
-     */
-    public function getListOfCharacterSet()
-    {
-        $liste = array();
-        $i = 0;
-        $liste[$i]['charset'] = 'UTF-8';
-        $liste[$i]['description'] = 'UTF-8';
-        return $liste;
-    }
+	 */
+	public function getListOfCharacterSet()
+	{
+		$liste = array();
+		$i = 0;
+		$liste[$i]['charset'] = 'UTF-8';
+		$liste[$i]['description'] = 'UTF-8';
+		return $liste;
+	}
 
-    /**
+	/**
 	 *	Return collation used in database
-     *
+	 *
 	 *	@return		string		Collation value
-     */
-    public function getDefaultCollationDatabase()
-    {
-        return 'UTF-8';
-    }
+	 */
+	public function getDefaultCollationDatabase()
+	{
+		return 'UTF-8';
+	}
 
-    /**
+	/**
 	 *	Return list of available collation that can be used for database
-     *
+	 *
 	 *	@return		array		List of Collation
-     */
-    public function getListOfCollation()
-    {
-        $liste = array();
-        $i = 0;
-        $liste[$i]['charset'] = 'UTF-8';
-        $liste[$i]['description'] = 'UTF-8';
-        return $liste;
-    }
+	 */
+	public function getListOfCollation()
+	{
+		$liste = array();
+		$i = 0;
+		$liste[$i]['charset'] = 'UTF-8';
+		$liste[$i]['description'] = 'UTF-8';
+		return $liste;
+	}
 
-    /**
+	/**
 	 *	Return full path of dump program
-     *
+	 *
 	 *	@return		string		Full path of dump program
-     */
-    public function getPathOfDump()
-    {
-	    // FIXME: not for SQLite
-        $fullpathofdump = '/pathtomysqldump/mysqldump';
+	 */
+	public function getPathOfDump()
+	{
+		// FIXME: not for SQLite
+		$fullpathofdump = '/pathtomysqldump/mysqldump';
 
-        $resql = $this->query('SHOW VARIABLES LIKE \'basedir\'');
-        if ($resql)
-        {
-            $liste = $this->fetch_array($resql);
-            $basedir = $liste['Value'];
-            $fullpathofdump = $basedir.(preg_match('/\/$/', $basedir) ? '' : '/').'bin/mysqldump';
-        }
-        return $fullpathofdump;
-    }
+		$resql = $this->query('SHOW VARIABLES LIKE \'basedir\'');
+		if ($resql)
+		{
+			$liste = $this->fetch_array($resql);
+			$basedir = $liste['Value'];
+			$fullpathofdump = $basedir.(preg_match('/\/$/', $basedir) ? '' : '/').'bin/mysqldump';
+		}
+		return $fullpathofdump;
+	}
 
-    /**
+	/**
 	 *	Return full path of restore program
-     *
+	 *
 	 *	@return		string		Full path of restore program
-     */
-    public function getPathOfRestore()
-    {
-	    // FIXME: not for SQLite
-        $fullpathofimport = '/pathtomysql/mysql';
+	 */
+	public function getPathOfRestore()
+	{
+		// FIXME: not for SQLite
+		$fullpathofimport = '/pathtomysql/mysql';
 
-        $resql = $this->query('SHOW VARIABLES LIKE \'basedir\'');
-        if ($resql)
-        {
-            $liste = $this->fetch_array($resql);
-            $basedir = $liste['Value'];
-            $fullpathofimport = $basedir.(preg_match('/\/$/', $basedir) ? '' : '/').'bin/mysql';
-        }
-        return $fullpathofimport;
-    }
+		$resql = $this->query('SHOW VARIABLES LIKE \'basedir\'');
+		if ($resql)
+		{
+			$liste = $this->fetch_array($resql);
+			$basedir = $liste['Value'];
+			$fullpathofimport = $basedir.(preg_match('/\/$/', $basedir) ? '' : '/').'bin/mysql';
+		}
+		return $fullpathofimport;
+	}
 
-    /**
-     * Return value of server parameters
-     *
+	/**
+	 * Return value of server parameters
+	 *
 	 * @param	string	$filter		Filter list on a particular value
 	 * @return	array				Array of key-values (key=>value)
-     */
-    public function getServerParametersValues($filter = '')
-    {
-        $result = array();
-        static $pragmas;
-        if (!isset($pragmas)) {
-            // Définition de la liste des pragmas utilisés qui ne retournent qu'une seule valeur
-            // indépendante de la base de données.
-            // cf. http://www.sqlite.org/pragma.html
-            $pragmas = array(
-                'application_id', 'auto_vacuum', 'automatic_index', 'busy_timeout', 'cache_size',
-                'cache_spill', 'case_sensitive_like', 'checkpoint_fullsync', 'collation_list',
-                'compile_options', 'data_version', /*'database_list',*/
-                'defer_foreign_keys', 'encoding', 'foreign_key_check', 'freelist_count',
-                'full_column_names', 'fullsync', 'ingore_check_constraints', 'integrity_check',
-                'journal_mode', 'journal_size_limit', 'legacy_file_format', 'locking_mode',
-                'max_page_count', 'page_count', 'page_size', 'parser_trace',
-                'query_only', 'quick_check', 'read_uncommitted', 'recursive_triggers',
-                'reverse_unordered_selects', 'schema_version', 'user_version',
-                'secure_delete', 'short_column_names', 'shrink_memory', 'soft_heap_limit',
-                'synchronous', 'temp_store', /*'temp_store_directory',*/ 'threads',
-                'vdbe_addoptrace', 'vdbe_debug', 'vdbe_listing', 'vdbe_trace',
-                'wal_autocheckpoint',
-            );
-        }
+	 */
+	public function getServerParametersValues($filter = '')
+	{
+		$result = array();
+		static $pragmas;
+		if (!isset($pragmas)) {
+			// Définition de la liste des pragmas utilisés qui ne retournent qu'une seule valeur
+			// indépendante de la base de données.
+			// cf. http://www.sqlite.org/pragma.html
+			$pragmas = array(
+				'application_id', 'auto_vacuum', 'automatic_index', 'busy_timeout', 'cache_size',
+				'cache_spill', 'case_sensitive_like', 'checkpoint_fullsync', 'collation_list',
+				'compile_options', 'data_version', /*'database_list',*/
+				'defer_foreign_keys', 'encoding', 'foreign_key_check', 'freelist_count',
+				'full_column_names', 'fullsync', 'ingore_check_constraints', 'integrity_check',
+				'journal_mode', 'journal_size_limit', 'legacy_file_format', 'locking_mode',
+				'max_page_count', 'page_count', 'page_size', 'parser_trace',
+				'query_only', 'quick_check', 'read_uncommitted', 'recursive_triggers',
+				'reverse_unordered_selects', 'schema_version', 'user_version',
+				'secure_delete', 'short_column_names', 'shrink_memory', 'soft_heap_limit',
+				'synchronous', 'temp_store', /*'temp_store_directory',*/ 'threads',
+				'vdbe_addoptrace', 'vdbe_debug', 'vdbe_listing', 'vdbe_trace',
+				'wal_autocheckpoint',
+			);
+		}
 
-        // TODO prendre en compte le filtre
-        foreach ($pragmas as $var) {
-            $sql = "PRAGMA $var";
-            $resql = $this->query($sql);
-            if ($resql)
-            {
-                $obj = $this->fetch_row($resql);
-                //dol_syslog(get_class($this)."::select_db getServerParametersValues $var=". print_r($obj, true), LOG_DEBUG);
-                $result[$var] = $obj[0];
-            } else {
-                // TODO Récupérer le message
-                $result[$var] = 'FAIL';
-            }
-        }
-        return $result;
-    }
+		// TODO prendre en compte le filtre
+		foreach ($pragmas as $var) {
+			$sql = "PRAGMA $var";
+			$resql = $this->query($sql);
+			if ($resql)
+			{
+				$obj = $this->fetch_row($resql);
+				//dol_syslog(get_class($this)."::select_db getServerParametersValues $var=". print_r($obj, true), LOG_DEBUG);
+				$result[$var] = $obj[0];
+			} else {
+				// TODO Récupérer le message
+				$result[$var] = 'FAIL';
+			}
+		}
+		return $result;
+	}
 
-    /**
-     * Return value of server status
-     *
+	/**
+	 * Return value of server status
+	 *
 	 * @param	string	$filter		Filter list on a particular value
 	 * @return  array				Array of key-values (key=>value)
-     */
-    public function getServerStatusValues($filter = '')
-    {
-        $result = array();
-        /*
+	 */
+	public function getServerStatusValues($filter = '')
+	{
+		$result = array();
+		/*
         $sql='SHOW STATUS';
         if ($filter) $sql.=" LIKE '".$this->escape($filter)."'";
         $resql=$this->query($sql);
@@ -1293,88 +1293,88 @@ class DoliDBSqlite3 extends DoliDB
         }
          */
 
-        return $result;
-    }
+		return $result;
+	}
 
-    /**
-     * Permet le chargement d'une fonction personnalisee dans le moteur de base de donnees.
-     * Note: le nom de la fonction personnalisee est prefixee par 'db'. La fonction doit être
-     * statique et publique. Le nombre de parametres est determine automatiquement.
-     *
-     * @param 	string 	$name 			Le nom de la fonction a definir dans Sqlite
-     * @param	int		$arg_count		Arg count
-     * @return	void
-     */
-    private function addCustomFunction($name, $arg_count = -1)
-    {
-        if ($this->db)
-        {
-        	$newname = preg_replace('/_/', '', $name);
-            $localname = __CLASS__.'::db'.$newname;
-            $reflectClass = new ReflectionClass(__CLASS__);
-            $reflectFunction = $reflectClass->getMethod('db'.$newname);
-            if ($arg_count < 0) {
-                $arg_count = $reflectFunction->getNumberOfParameters();
-            }
-            if (!$this->db->createFunction($name, $localname, $arg_count))
-            {
-                $this->error = "unable to create custom function '$name'";
-            }
-        }
-    }
+	/**
+	 * Permet le chargement d'une fonction personnalisee dans le moteur de base de donnees.
+	 * Note: le nom de la fonction personnalisee est prefixee par 'db'. La fonction doit être
+	 * statique et publique. Le nombre de parametres est determine automatiquement.
+	 *
+	 * @param 	string 	$name 			Le nom de la fonction a definir dans Sqlite
+	 * @param	int		$arg_count		Arg count
+	 * @return	void
+	 */
+	private function addCustomFunction($name, $arg_count = -1)
+	{
+		if ($this->db)
+		{
+			$newname = preg_replace('/_/', '', $name);
+			$localname = __CLASS__.'::db'.$newname;
+			$reflectClass = new ReflectionClass(__CLASS__);
+			$reflectFunction = $reflectClass->getMethod('db'.$newname);
+			if ($arg_count < 0) {
+				$arg_count = $reflectFunction->getNumberOfParameters();
+			}
+			if (!$this->db->createFunction($name, $localname, $arg_count))
+			{
+				$this->error = "unable to create custom function '$name'";
+			}
+		}
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * calc_daynr
-     *
-     * @param 	int 	$year		Year
-     * @param 	int 	$month		Month
-     * @param	int     $day 		Day
-     * @return int Formatted date
-     */
-    private static function calc_daynr($year, $month, $day)
-    {
-        // phpcs:enable
-        $y = $year;
-        if ($y == 0 && $month == 0) return 0;
-        $num = (365 * $y + 31 * ($month - 1) + $day);
-        if ($month <= 2) {
-            $y--; } else {
-            $num -= floor(($month * 4 + 23) / 10);
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * calc_daynr
+	 *
+	 * @param 	int 	$year		Year
+	 * @param 	int 	$month		Month
+	 * @param	int     $day 		Day
+	 * @return int Formatted date
+	 */
+	private static function calc_daynr($year, $month, $day)
+	{
+		// phpcs:enable
+		$y = $year;
+		if ($y == 0 && $month == 0) return 0;
+		$num = (365 * $y + 31 * ($month - 1) + $day);
+		if ($month <= 2) {
+			$y--; } else {
+			$num -= floor(($month * 4 + 23) / 10);
 			}
 			$temp = floor(($y / 100 + 1) * 3 / 4);
 			return $num + floor($y / 4) - $temp;
-    }
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * calc_weekday
-     *
-     * @param int	$daynr							???
-     * @param bool	$sunday_first_day_of_week		???
-     * @return int
-     */
-    private static function calc_weekday($daynr, $sunday_first_day_of_week)
-    {
-        // phpcs:enable
-        $ret = floor(($daynr + 5 + ($sunday_first_day_of_week ? 1 : 0)) % 7);
-        return $ret;
-    }
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * calc_weekday
+	 *
+	 * @param int	$daynr							???
+	 * @param bool	$sunday_first_day_of_week		???
+	 * @return int
+	 */
+	private static function calc_weekday($daynr, $sunday_first_day_of_week)
+	{
+		// phpcs:enable
+		$ret = floor(($daynr + 5 + ($sunday_first_day_of_week ? 1 : 0)) % 7);
+		return $ret;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * calc_days_in_year
-     *
-     * @param 	string	$year		Year
-     * @return	int					Nb of days in year
-     */
-    private static function calc_days_in_year($year)
-    {
-        // phpcs:enable
-        return (($year & 3) == 0 && ($year % 100 || ($year % 400 == 0 && $year)) ? 366 : 365);
-    }
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * calc_days_in_year
+	 *
+	 * @param 	string	$year		Year
+	 * @return	int					Nb of days in year
+	 */
+	private static function calc_days_in_year($year)
+	{
+		// phpcs:enable
+		return (($year & 3) == 0 && ($year % 100 || ($year % 400 == 0 && $year)) ? 366 : 365);
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * calc_week
 	 *
@@ -1385,40 +1385,40 @@ class DoliDBSqlite3 extends DoliDB
 	 * @param 	string	$calc_year			???
 	 * @return	string						???
 	 */
-    private static function calc_week($year, $month, $day, $week_behaviour, &$calc_year)
-    {
-        // phpcs:enable
-        $daynr = self::calc_daynr($year, $month, $day);
-        $first_daynr = self::calc_daynr($year, 1, 1);
-        $monday_first = ($week_behaviour & self::WEEK_MONDAY_FIRST) ? 1 : 0;
-        $week_year = ($week_behaviour & self::WEEK_YEAR) ? 1 : 0;
-        $first_weekday = ($week_behaviour & self::WEEK_FIRST_WEEKDAY) ? 1 : 0;
+	private static function calc_week($year, $month, $day, $week_behaviour, &$calc_year)
+	{
+		// phpcs:enable
+		$daynr = self::calc_daynr($year, $month, $day);
+		$first_daynr = self::calc_daynr($year, 1, 1);
+		$monday_first = ($week_behaviour & self::WEEK_MONDAY_FIRST) ? 1 : 0;
+		$week_year = ($week_behaviour & self::WEEK_YEAR) ? 1 : 0;
+		$first_weekday = ($week_behaviour & self::WEEK_FIRST_WEEKDAY) ? 1 : 0;
 
-        $weekday = self::calc_weekday($first_daynr, !$monday_first);
-        $calc_year = $year;
+		$weekday = self::calc_weekday($first_daynr, !$monday_first);
+		$calc_year = $year;
 
-        if ($month == 1 && $day <= 7 - $weekday) {
-            if (!$week_year && (($first_weekday && $weekday != 0) || (!$first_weekday && $weekday >= 4)))
-                return 0;
-            $week_year = 1;
-            $calc_year--;
-            $first_daynr -= ($days = self::calc_days_in_year($calc_year));
-            $weekday = ($weekday + 53 * 7 - $days) % 7;
-        }
+		if ($month == 1 && $day <= 7 - $weekday) {
+			if (!$week_year && (($first_weekday && $weekday != 0) || (!$first_weekday && $weekday >= 4)))
+				return 0;
+			$week_year = 1;
+			$calc_year--;
+			$first_daynr -= ($days = self::calc_days_in_year($calc_year));
+			$weekday = ($weekday + 53 * 7 - $days) % 7;
+		}
 
-        if (($first_weekday && $weekday != 0) || (!$first_weekday && $weekday >= 4)) {
-            $days = $daynr - ($first_daynr + (7 - $weekday));
-        } else {
-            $days = $daynr - ($first_daynr - $weekday);
-        }
+		if (($first_weekday && $weekday != 0) || (!$first_weekday && $weekday >= 4)) {
+			$days = $daynr - ($first_daynr + (7 - $weekday));
+		} else {
+			$days = $daynr - ($first_daynr - $weekday);
+		}
 
-        if ($week_year && $days >= 52 * 7) {
-            $weekday = ($weekday + self::calc_days_in_year($calc_year)) % 7;
-            if ((!$first_weekday && $weekday < 4) || ($first_weekday && $weekday == 0)) {
-                $calc_year++;
-                return 1;
-            }
-        }
-        return floor($days / 7 + 1);
-    }
+		if ($week_year && $days >= 52 * 7) {
+			$weekday = ($weekday + self::calc_days_in_year($calc_year)) % 7;
+			if ((!$first_weekday && $weekday < 4) || ($first_weekday && $weekday == 0)) {
+				$calc_year++;
+				return 1;
+			}
+		}
+		return floor($days / 7 + 1);
+	}
 }
diff --git a/htdocs/core/extrafieldsinexport.inc.php b/htdocs/core/extrafieldsinexport.inc.php
index ae6fdf8bf70..cef5f74d172 100644
--- a/htdocs/core/extrafieldsinexport.inc.php
+++ b/htdocs/core/extrafieldsinexport.inc.php
@@ -2,9 +2,9 @@
 
 if (empty($keyforselect) || empty($keyforelement) || empty($keyforaliasextra))
 {
-    //print $keyforselet.' - '.$keyforelement.' - '.$keyforaliasextra;
-    dol_print_error('', 'include of file extrafieldsinexport.inc.php was done but var $keyforselect or $keyforelement or $keyforaliasextra was not set');
-    exit;
+	//print $keyforselet.' - '.$keyforelement.' - '.$keyforaliasextra;
+	dol_print_error('', 'include of file extrafieldsinexport.inc.php was done but var $keyforselect or $keyforelement or $keyforaliasextra was not set');
+	exit;
 }
 
 // Add extra fields
@@ -36,14 +36,14 @@ if ($resql)    // This can fail when class is used on old database (during migra
 				$typeFilter = "Boolean";
 				break;
 			case 'select':
-			    if (!empty($conf->global->EXPORT_LABEL_FOR_SELECT))
-			    {
-    			    $tmpparam = unserialize($obj->param); // $tmpparam may be array with 'options' = array(key1=>val1, key2=>val2 ...)
-    			    if ($tmpparam['options'] && is_array($tmpparam['options'])) {
-    			        $typeFilter = "Select:".$obj->param;
-    			    }
-			    }
-			    break;
+				if (!empty($conf->global->EXPORT_LABEL_FOR_SELECT))
+				{
+					$tmpparam = unserialize($obj->param); // $tmpparam may be array with 'options' = array(key1=>val1, key2=>val2 ...)
+					if ($tmpparam['options'] && is_array($tmpparam['options'])) {
+						$typeFilter = "Select:".$obj->param;
+					}
+				}
+				break;
 			case 'sellist':
 				$tmp = '';
 				$tmpparam = unserialize($obj->param); // $tmp ay be array 'options' => array 'c_currencies:code_iso:code_iso' => null
@@ -56,19 +56,19 @@ if ($resql)    // This can fail when class is used on old database (during migra
 		}
 		if ($obj->type != 'separate')
 		{
-		    // If not a computed field
-		    if (empty($obj->fieldcomputed))
-		    {
-    			$this->export_fields_array[$r][$fieldname] = $fieldlabel;
-    			$this->export_TypeFields_array[$r][$fieldname] = $typeFilter;
-    			$this->export_entities_array[$r][$fieldname] = $keyforelement;
-		    }
+			// If not a computed field
+			if (empty($obj->fieldcomputed))
+			{
+				$this->export_fields_array[$r][$fieldname] = $fieldlabel;
+				$this->export_TypeFields_array[$r][$fieldname] = $typeFilter;
+				$this->export_entities_array[$r][$fieldname] = $keyforelement;
+			}
 			// If this is a computed field
 			else {
-			    $this->export_fields_array[$r][$fieldname] = $fieldlabel;
-			    $this->export_TypeFields_array[$r][$fieldname] = $typeFilter.'Compute';
-			    $this->export_special_array[$r][$fieldname] = $obj->fieldcomputed;
-			    $this->export_entities_array[$r][$fieldname] = $keyforelement;
+				$this->export_fields_array[$r][$fieldname] = $fieldlabel;
+				$this->export_TypeFields_array[$r][$fieldname] = $typeFilter.'Compute';
+				$this->export_special_array[$r][$fieldname] = $obj->fieldcomputed;
+				$this->export_entities_array[$r][$fieldname] = $keyforelement;
 			}
 		}
 	}
diff --git a/htdocs/core/filemanagerdol/connectors/php/commands.php b/htdocs/core/filemanagerdol/connectors/php/commands.php
index 5590879f8e6..cc6afb4e0e4 100644
--- a/htdocs/core/filemanagerdol/connectors/php/commands.php
+++ b/htdocs/core/filemanagerdol/connectors/php/commands.php
@@ -197,8 +197,8 @@ function FileUpload($resourceType, $currentFolder, $sCommand, $CKEcallback = '')
 	$sFileName = '';
 
 	if (isset($_FILES['NewFile']) && !is_null($_FILES['NewFile']['tmp_name'])
-       // This is for the QuickUpload tab box
-        or (isset($_FILES['upload']) && !is_null($_FILES['upload']['tmp_name'])))
+	   // This is for the QuickUpload tab box
+		or (isset($_FILES['upload']) && !is_null($_FILES['upload']['tmp_name'])))
 	{
 		global $Config;
 
@@ -298,16 +298,16 @@ function FileUpload($resourceType, $currentFolder, $sCommand, $CKEcallback = '')
 	// @CHANGE
 	//SendUploadResults( $sErrorNumber, $sFileUrl, $sFileName );
 	if ($CKEcallback == '')
-    {
-        // this line already exists so wrap the if block around it
-        SendUploadResults($sErrorNumber, $sFileUrl, $sFileName);
-    } else {
-	    //issue the CKEditor Callback
-        SendCKEditorResults(
+	{
+		// this line already exists so wrap the if block around it
+		SendUploadResults($sErrorNumber, $sFileUrl, $sFileName);
+	} else {
+		//issue the CKEditor Callback
+		SendCKEditorResults(
 			$CKEcallback,
 			$sFileUrl,
 			($sErrorNumber != 0 ? 'Error '.$sErrorNumber.' upload failed.' : 'Upload Successful')
-    	);
+		);
 	}
 
 	exit;
diff --git a/htdocs/core/filemanagerdol/connectors/php/connector.php b/htdocs/core/filemanagerdol/connectors/php/connector.php
index ce38e7c059a..6d67734d3bc 100644
--- a/htdocs/core/filemanagerdol/connectors/php/connector.php
+++ b/htdocs/core/filemanagerdol/connectors/php/connector.php
@@ -42,9 +42,9 @@ DoResponse();
  */
 function DoResponse()
 {
-    if (!isset($_GET)) {
-        global $_GET;
-    }
+	if (!isset($_GET)) {
+		global $_GET;
+	}
 	if (!isset($_GET['Command']) || !isset($_GET['Type']) || !isset($_GET['CurrentFolder']))
 		return;
 
diff --git a/htdocs/core/filemanagerdol/connectors/php/io.php b/htdocs/core/filemanagerdol/connectors/php/io.php
index 2438882604e..5ad0cd1b25e 100644
--- a/htdocs/core/filemanagerdol/connectors/php/io.php
+++ b/htdocs/core/filemanagerdol/connectors/php/io.php
@@ -128,8 +128,8 @@ function ServerMapFolder($resourceType, $folderPath, $sCommand)
  */
 function GetParentFolder($folderPath)
 {
-    $sPattern = "-[/\\\\][^/\\\\]+[/\\\\]?$-";
-    return preg_replace($sPattern, '', $folderPath);
+	$sPattern = "-[/\\\\][^/\\\\]+[/\\\\]?$-";
+	return preg_replace($sPattern, '', $folderPath);
 }
 
 /**
@@ -207,26 +207,26 @@ function CreateServerFolder($folderPath, $lastFolder = null)
  */
 function GetRootPath()
 {
-    if (!isset($_SERVER)) {
-        global $_SERVER;
-    }
-    $sRealPath = realpath('./');
-    // #2124 ensure that no slash is at the end
-    $sRealPath = rtrim($sRealPath, "\\/");
+	if (!isset($_SERVER)) {
+		global $_SERVER;
+	}
+	$sRealPath = realpath('./');
+	// #2124 ensure that no slash is at the end
+	$sRealPath = rtrim($sRealPath, "\\/");
 
-    $sSelfPath = $_SERVER['PHP_SELF'];
-    $sSelfPath = substr($sSelfPath, 0, strrpos($sSelfPath, '/'));
+	$sSelfPath = $_SERVER['PHP_SELF'];
+	$sSelfPath = substr($sSelfPath, 0, strrpos($sSelfPath, '/'));
 
-    $sSelfPath = str_replace('/', DIRECTORY_SEPARATOR, $sSelfPath);
+	$sSelfPath = str_replace('/', DIRECTORY_SEPARATOR, $sSelfPath);
 
-    $position = strpos($sRealPath, $sSelfPath);
+	$position = strpos($sRealPath, $sSelfPath);
 
-    // This can check only that this script isn't run from a virtual dir
-    // But it avoids the problems that arise if it isn't checked
-    if ($position === false || $position <> strlen($sRealPath) - strlen($sSelfPath))
-        SendError(1, 'Sorry, can\'t map "UserFilesPath" to a physical path. You must set the "UserFilesAbsolutePath" value in "editor/filemanager/connectors/php/config.php".');
+	// This can check only that this script isn't run from a virtual dir
+	// But it avoids the problems that arise if it isn't checked
+	if ($position === false || $position <> strlen($sRealPath) - strlen($sSelfPath))
+		SendError(1, 'Sorry, can\'t map "UserFilesPath" to a physical path. You must set the "UserFilesAbsolutePath" value in "editor/filemanager/connectors/php/config.php".');
 
-    return substr($sRealPath, 0, $position);
+	return substr($sRealPath, 0, $position);
 }
 
 /**
@@ -236,15 +236,15 @@ function GetRootPath()
  */
 function Server_MapPath($path)
 {
-    // This function is available only for Apache
-    if (function_exists('apache_lookup_uri')) {
-        $info = apache_lookup_uri($path);
-        return $info->filename.$info->path_info;
-    }
+	// This function is available only for Apache
+	if (function_exists('apache_lookup_uri')) {
+		$info = apache_lookup_uri($path);
+		return $info->filename.$info->path_info;
+	}
 
-    // This isn't correct but for the moment there's no other solution
-    // If this script is under a virtual directory or symlink it will detect the problem and stop
-    return GetRootPath().$path;
+	// This isn't correct but for the moment there's no other solution
+	// If this script is under a virtual directory or symlink it will detect the problem and stop
+	return GetRootPath().$path;
 }
 
 /**
@@ -415,11 +415,11 @@ EOF;
  */
 function SendCKEditorResults($callback, $sFileUrl, $customMsg = '')
 {
-    echo '<script type="text/javascript">';
+	echo '<script type="text/javascript">';
 
-    $rpl = array('\\' => '\\\\', '"' => '\\"');
+	$rpl = array('\\' => '\\\\', '"' => '\\"');
 
-    echo 'window.parent.CKEDITOR.tools.callFunction("'.$callback.'","'.strtr($sFileUrl, $rpl).'", "'.strtr($customMsg, $rpl).'");';
+	echo 'window.parent.CKEDITOR.tools.callFunction("'.$callback.'","'.strtr($sFileUrl, $rpl).'", "'.strtr($customMsg, $rpl).'");';
 
-    echo '</script>';
+	echo '</script>';
 }
diff --git a/htdocs/core/filemanagerdol/connectors/php/util.php b/htdocs/core/filemanagerdol/connectors/php/util.php
index b8caad99ee3..beec251f40e 100644
--- a/htdocs/core/filemanagerdol/connectors/php/util.php
+++ b/htdocs/core/filemanagerdol/connectors/php/util.php
@@ -59,7 +59,7 @@ function FindBadUtf8($string)
 	$regex = '([\x00-\x7F]|[\xC2-\xDF][\x80-\xBF]|\xE0[\xA0-\xBF][\x80-\xBF]|[\xE1-\xEC\xEE\xEF][\x80-\xBF]{2}|\xED[\x80-\x9F][\x80-\xBF]';
 	$regex .= '|\xF0[\x90-\xBF][\x80-\xBF]{2}|[\xF1-\xF3][\x80-\xBF]{3}|\xF4[\x80-\x8F][\x80-\xBF]{2}|(.{1}))';
 
-	$matches =array();
+	$matches = array();
 	while (preg_match('/'.$regex.'/S', $string, $matches)) {
 		if (isset($matches[2])) {
 			return true;
diff --git a/htdocs/core/get_info.php b/htdocs/core/get_info.php
index 48b957b9e8a..a91d5a6afec 100644
--- a/htdocs/core/get_info.php
+++ b/htdocs/core/get_info.php
@@ -60,8 +60,6 @@ print '<body>'."\n";
 print '<div style="padding: 20px;">';
 //print '<br>';
 
-$nbofsearch = 0;
-
 // Define link to login card
 $appli = constant('DOL_APPLICATION_TITLE');
 if (!empty($conf->global->MAIN_APPLICATION_TITLE))
@@ -117,6 +115,11 @@ if (is_numeric($result))
 	else $toprightmenu = $hookmanager->resPrint; // replace
 } else $toprightmenu .= $result; // For backward compatibility
 
+if (!isset($form) || !is_object($form)) {
+	include_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
+	$form = new Form($db);
+}
+
 // Link to module builder
 if (!empty($conf->modulebuilder->enabled))
 {
@@ -124,7 +127,7 @@ if (!empty($conf->modulebuilder->enabled))
 	//$text.= img_picto(":".$langs->trans("ModuleBuilder"), 'printer_top.png', 'class="printer"');
 	$text .= '<span class="fa fa-bug atoplogin"></span>';
 	$text .= '</a>';
-	$toprightmenu .= @Form::textwithtooltip('', $langs->trans("ModuleBuilder"), 2, 1, $text, 'login_block_elem', 2);
+	$toprightmenu .= $form->textwithtooltip('', $langs->trans("ModuleBuilder"), 2, 1, $text, 'login_block_elem', 2);
 }
 
 // Link to print main content area
@@ -144,7 +147,7 @@ if (empty($conf->global->MAIN_PRINT_DISABLELINK) && empty($conf->global->MAIN_OP
 	//$text.= img_picto(":".$langs->trans("PrintContentArea"), 'printer_top.png', 'class="printer"');
 	$text.='<span class="fa fa-print atoplogin"></span>';
 	$text.='</a>';
-	$toprightmenu.=@Form::textwithtooltip('',$langs->trans("PrintContentArea"),2,1,$text,'login_block_elem',2);
+	$toprightmenu .= $form->textwithtooltip('',$langs->trans("PrintContentArea"),2,1,$text,'login_block_elem',2);
 }
 */
 
@@ -183,13 +186,13 @@ if (empty($conf->global->MAIN_HELP_DISABLELINK) && empty($conf->global->MAIN_OPT
 		//if ($mode == 'wiki') $text.=' ('.dol_trunc(strtr($helppage,'_',' '),8).')';
 		$text.='</a>';
 		//$toprightmenu.='</div>'."\n";
-		$toprightmenu.=@Form::textwithtooltip('',$title,2,1,$text,'login_block_elem',2);
+		$toprightmenu .= $form->textwithtooltip('',$title,2,1,$text,'login_block_elem',2);
 	}
 }
 */
 
 // Logout link
-if (GETPOST('withlogout', 'int')) $toprightmenu .= @Form::textwithtooltip('', $logouthtmltext, 2, 1, $logouttext, 'login_block_elem', 2);
+if (GETPOST('withlogout', 'int')) $toprightmenu .= $form->textwithtooltip('', $logouthtmltext, 2, 1, $logouttext, 'login_block_elem', 2);
 
 $toprightmenu .= '</div>';
 
diff --git a/htdocs/core/get_menudiv.php b/htdocs/core/get_menudiv.php
index 9232d845442..c64006439bc 100644
--- a/htdocs/core/get_menudiv.php
+++ b/htdocs/core/get_menudiv.php
@@ -184,7 +184,7 @@ if (empty($user->socid))	// If internal user or not defined
 
 // Load the menu manager (only if not already done)
 $file_menu = $conf->standard_menu;
-if (GETPOST('menu', 'aZ09')) $file_menu = GETPOST('menu', 'aZ09');     // example: menu=eldy_menu.php
+if (GETPOST('menu', 'aZ09')) $file_menu = GETPOST('menu', 'aZ09'); // example: menu=eldy_menu.php
 if (!class_exists('MenuManager'))
 {
 	$menufound = 0;
diff --git a/htdocs/core/js/lib_head.js.php b/htdocs/core/js/lib_head.js.php
index b71dfc3eeb2..382f12840d7 100644
--- a/htdocs/core/js/lib_head.js.php
+++ b/htdocs/core/js/lib_head.js.php
@@ -1105,7 +1105,7 @@ function price2numjs(amount) {
 
 <?php
 if (empty($conf->global->MAIN_DISABLE_JQUERY_JNOTIFY) && !defined('DISABLE_JQUERY_JNOTIFY')) {
-    ?>
+	?>
 // Defined properties for JNotify
 $(document).ready(function() {
 	if (typeof $.jnotify == 'function')
@@ -1135,7 +1135,7 @@ $(document).ready(function() {
 	if (window.location !== window.parent.location ) {
 		console.log("Page is detected to be into an iframe, we hide by CSS the menus");
 		// The page is in an iframe
-		jQuery(".side-nav-vert, .side-nav").hide();
+		jQuery(".side-nav-vert, .side-nav, .websitebar").hide();
 		jQuery(".id-container").css('width', '100%');
 
 	}
diff --git a/htdocs/core/js/lib_notification.js.php b/htdocs/core/js/lib_notification.js.php
index ee212b4373f..b2ed1c467c8 100644
--- a/htdocs/core/js/lib_notification.js.php
+++ b/htdocs/core/js/lib_notification.js.php
@@ -30,17 +30,17 @@ if (!defined('NOREQUIREHTML')) define('NOREQUIREHTML', 1);
 require_once '../../main.inc.php';
 
 if (!($_SERVER['HTTP_REFERER'] === $dolibarr_main_url_root.'/' || $_SERVER['HTTP_REFERER'] === $dolibarr_main_url_root.'/index.php'
-    || preg_match('/getmenu_div\.php/', $_SERVER['HTTP_REFERER'])))
+	|| preg_match('/getmenu_div\.php/', $_SERVER['HTTP_REFERER'])))
 {
-    global $langs, $conf;
+	global $langs, $conf;
 
-    top_httphead('text/javascript; charset=UTF-8');
+	top_httphead('text/javascript; charset=UTF-8');
 
-    print 'var login = \''.$_SESSION['dol_login'].'\';'."\n";
+	print 'var login = \''.$_SESSION['dol_login'].'\';'."\n";
 	print 'var nowtime = Date.now();';
-    print 'var time_auto_update = '.$conf->global->MAIN_BROWSER_NOTIFICATION_FREQUENCY.';'."\n"; // Always defined
-    print 'var time_js_next_test;'."\n";
-    ?>
+	print 'var time_auto_update = '.$conf->global->MAIN_BROWSER_NOTIFICATION_FREQUENCY.';'."\n"; // Always defined
+	print 'var time_js_next_test;'."\n";
+	?>
 
 	/* Check if permission ok */
 	if (Notification.permission !== "granted") {
@@ -51,7 +51,7 @@ if (!($_SERVER['HTTP_REFERER'] === $dolibarr_main_url_root.'/' || $_SERVER['HTTP
 	/* Launch timer */
    	// We set a delay before launching first test so next check will arrive after the time_auto_update compared to previous one.
     //var time_first_execution = (time_auto_update + (time_js_next_test - nowtime)) * 1000;	//need milliseconds
-    var time_first_execution = <?php echo max(3, $conf->global->MAIN_BROWSER_NOTIFICATION_CHECK_FIRST_EXECUTION); ?>;
+    var time_first_execution = <?php echo max(3, empty($conf->global->MAIN_BROWSER_NOTIFICATION_CHECK_FIRST_EXECUTION) ? 0 : $conf->global->MAIN_BROWSER_NOTIFICATION_CHECK_FIRST_EXECUTION); ?>;
     if (login != '') {
     	setTimeout(first_execution, time_first_execution * 1000);
         time_js_next_test = nowtime + time_first_execution;
diff --git a/htdocs/core/lib/accounting.lib.php b/htdocs/core/lib/accounting.lib.php
index f380152abdb..20ffa3f52b6 100644
--- a/htdocs/core/lib/accounting.lib.php
+++ b/htdocs/core/lib/accounting.lib.php
@@ -235,7 +235,7 @@ function journalHead($nom, $variante, $period, $periodlink, $description, $build
 
 	print '</table>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div class="center"><input type="submit" class="button" name="submit" value="'.$langs->trans("Refresh").'"></div>';
 
diff --git a/htdocs/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php
index 49ababf4a25..6cab3638eb5 100644
--- a/htdocs/core/lib/admin.lib.php
+++ b/htdocs/core/lib/admin.lib.php
@@ -35,11 +35,11 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
  */
 function versiontostring($versionarray)
 {
-    $string = '?';
-    if (isset($versionarray[0])) $string = $versionarray[0];
-    if (isset($versionarray[1])) $string .= '.'.$versionarray[1];
-    if (isset($versionarray[2])) $string .= '.'.$versionarray[2];
-    return $string;
+	$string = '?';
+	if (isset($versionarray[0])) $string = $versionarray[0];
+	if (isset($versionarray[1])) $string .= '.'.$versionarray[1];
+	if (isset($versionarray[2])) $string .= '.'.$versionarray[2];
+	return $string;
 }
 
 /**
@@ -59,32 +59,32 @@ function versiontostring($versionarray)
  */
 function versioncompare($versionarray1, $versionarray2)
 {
-    $ret = 0;
-    $level = 0;
-    $count1 = count($versionarray1);
-    $count2 = count($versionarray2);
-    $maxcount = max($count1, $count2);
-    while ($level < $maxcount)
-    {
-        $operande1 = isset($versionarray1[$level]) ? $versionarray1[$level] : 0;
-        $operande2 = isset($versionarray2[$level]) ? $versionarray2[$level] : 0;
-        if (preg_match('/alpha|dev/i', $operande1)) $operande1 = -5;
-        if (preg_match('/alpha|dev/i', $operande2)) $operande2 = -5;
-        if (preg_match('/beta$/i', $operande1)) $operande1 = -4;
-        if (preg_match('/beta$/i', $operande2)) $operande2 = -4;
-        if (preg_match('/beta([0-9])+/i', $operande1)) $operande1 = -3;
-        if (preg_match('/beta([0-9])+/i', $operande2)) $operande2 = -3;
-        if (preg_match('/rc$/i', $operande1)) $operande1 = -2;
-        if (preg_match('/rc$/i', $operande2)) $operande2 = -2;
-        if (preg_match('/rc([0-9])+/i', $operande1)) $operande1 = -1;
-        if (preg_match('/rc([0-9])+/i', $operande2)) $operande2 = -1;
-        $level++;
-        //print 'level '.$level.' '.$operande1.'-'.$operande2.'<br>';
-        if ($operande1 < $operande2) { $ret = -$level; break; }
-        if ($operande1 > $operande2) { $ret = $level; break; }
-    }
-    //print join('.',$versionarray1).'('.count($versionarray1).') / '.join('.',$versionarray2).'('.count($versionarray2).') => '.$ret.'<br>'."\n";
-    return $ret;
+	$ret = 0;
+	$level = 0;
+	$count1 = count($versionarray1);
+	$count2 = count($versionarray2);
+	$maxcount = max($count1, $count2);
+	while ($level < $maxcount)
+	{
+		$operande1 = isset($versionarray1[$level]) ? $versionarray1[$level] : 0;
+		$operande2 = isset($versionarray2[$level]) ? $versionarray2[$level] : 0;
+		if (preg_match('/alpha|dev/i', $operande1)) $operande1 = -5;
+		if (preg_match('/alpha|dev/i', $operande2)) $operande2 = -5;
+		if (preg_match('/beta$/i', $operande1)) $operande1 = -4;
+		if (preg_match('/beta$/i', $operande2)) $operande2 = -4;
+		if (preg_match('/beta([0-9])+/i', $operande1)) $operande1 = -3;
+		if (preg_match('/beta([0-9])+/i', $operande2)) $operande2 = -3;
+		if (preg_match('/rc$/i', $operande1)) $operande1 = -2;
+		if (preg_match('/rc$/i', $operande2)) $operande2 = -2;
+		if (preg_match('/rc([0-9])+/i', $operande1)) $operande1 = -1;
+		if (preg_match('/rc([0-9])+/i', $operande2)) $operande2 = -1;
+		$level++;
+		//print 'level '.$level.' '.$operande1.'-'.$operande2.'<br>';
+		if ($operande1 < $operande2) { $ret = -$level; break; }
+		if ($operande1 > $operande2) { $ret = $level; break; }
+	}
+	//print join('.',$versionarray1).'('.count($versionarray1).') / '.join('.',$versionarray2).'('.count($versionarray2).') => '.$ret.'<br>'."\n";
+	return $ret;
 }
 
 
@@ -95,7 +95,7 @@ function versioncompare($versionarray1, $versionarray2)
  */
 function versionphparray()
 {
-    return explode('.', PHP_VERSION);
+	return explode('.', PHP_VERSION);
 }
 
 /**
@@ -105,7 +105,7 @@ function versionphparray()
  */
 function versiondolibarrarray()
 {
-    return explode('.', DOL_VERSION);
+	return explode('.', DOL_VERSION);
 }
 
 
@@ -131,246 +131,246 @@ function versiondolibarrarray()
  */
 function run_sql($sqlfile, $silent = 1, $entity = '', $usesavepoint = 1, $handler = '', $okerror = 'default', $linelengthlimit = 32768, $nocommentremoval = 0, $offsetforchartofaccount = 0)
 {
-    global $db, $conf, $langs, $user;
+	global $db, $conf, $langs, $user;
 
-    dol_syslog("Admin.lib::run_sql run sql file ".$sqlfile." silent=".$silent." entity=".$entity." usesavepoint=".$usesavepoint." handler=".$handler." okerror=".$okerror, LOG_DEBUG);
+	dol_syslog("Admin.lib::run_sql run sql file ".$sqlfile." silent=".$silent." entity=".$entity." usesavepoint=".$usesavepoint." handler=".$handler." okerror=".$okerror, LOG_DEBUG);
 
-    if (!is_numeric($linelengthlimit))
-    {
-    	dol_syslog("Admin.lib::run_sql param linelengthlimit is not a numeric", LOG_ERR);
-    	return -1;
-    }
+	if (!is_numeric($linelengthlimit))
+	{
+		dol_syslog("Admin.lib::run_sql param linelengthlimit is not a numeric", LOG_ERR);
+		return -1;
+	}
 
-    $ok = 0;
-    $error = 0;
-    $i = 0;
-    $buffer = '';
-    $arraysql = array();
+	$ok = 0;
+	$error = 0;
+	$i = 0;
+	$buffer = '';
+	$arraysql = array();
 
-    // Get version of database
-    $versionarray = $db->getVersionArray();
+	// Get version of database
+	$versionarray = $db->getVersionArray();
 
-    $fp = fopen($sqlfile, "r");
-    if ($fp)
-    {
-        while (!feof($fp))
-        {
-        	// Warning fgets with second parameter that is null or 0 hang.
-        	if ($linelengthlimit > 0) $buf = fgets($fp, $linelengthlimit);
-        	else $buf = fgets($fp);
+	$fp = fopen($sqlfile, "r");
+	if ($fp)
+	{
+		while (!feof($fp))
+		{
+			// Warning fgets with second parameter that is null or 0 hang.
+			if ($linelengthlimit > 0) $buf = fgets($fp, $linelengthlimit);
+			else $buf = fgets($fp);
 
-            // Test if request must be ran only for particular database or version (if yes, we must remove the -- comment)
-            $reg = array();
-            if (preg_match('/^--\sV(MYSQL|PGSQL)([^\s]*)/i', $buf, $reg))
-            {
-            	$qualified = 1;
+			// Test if request must be ran only for particular database or version (if yes, we must remove the -- comment)
+			$reg = array();
+			if (preg_match('/^--\sV(MYSQL|PGSQL)([^\s]*)/i', $buf, $reg))
+			{
+				$qualified = 1;
 
-            	// restrict on database type
-            	if (!empty($reg[1]))
-            	{
-            		if (!preg_match('/'.preg_quote($reg[1]).'/i', $db->type)) $qualified = 0;
-            	}
+				// restrict on database type
+				if (!empty($reg[1]))
+				{
+					if (!preg_match('/'.preg_quote($reg[1]).'/i', $db->type)) $qualified = 0;
+				}
 
-            	// restrict on version
-            	if ($qualified)
-            	{
-            		if (!empty($reg[2]))
-            		{
-            			if (is_numeric($reg[2]))	// This is a version
-            			{
-			                $versionrequest = explode('.', $reg[2]);
-			                //print var_dump($versionrequest);
-			                //print var_dump($versionarray);
-			                if (!count($versionrequest) || !count($versionarray) || versioncompare($versionrequest, $versionarray) > 0)
-			                {
-			                	$qualified = 0;
-			                }
-            			} else // This is a test on a constant. For example when we have -- VMYSQLUTF8UNICODE, we test constant $conf->global->UTF8UNICODE
-            			{
-            				$dbcollation = strtoupper(preg_replace('/_/', '', $conf->db->dolibarr_main_db_collation));
-            				//var_dump($reg[2]);
-            				//var_dump($dbcollation);
-            				if (empty($conf->db->dolibarr_main_db_collation) || ($reg[2] != $dbcollation)) $qualified = 0;
-            				//var_dump($qualified);
-            			}
-            		}
-            	}
+				// restrict on version
+				if ($qualified)
+				{
+					if (!empty($reg[2]))
+					{
+						if (is_numeric($reg[2]))	// This is a version
+						{
+							$versionrequest = explode('.', $reg[2]);
+							//print var_dump($versionrequest);
+							//print var_dump($versionarray);
+							if (!count($versionrequest) || !count($versionarray) || versioncompare($versionrequest, $versionarray) > 0)
+							{
+								$qualified = 0;
+							}
+						} else // This is a test on a constant. For example when we have -- VMYSQLUTF8UNICODE, we test constant $conf->global->UTF8UNICODE
+						{
+							$dbcollation = strtoupper(preg_replace('/_/', '', $conf->db->dolibarr_main_db_collation));
+							//var_dump($reg[2]);
+							//var_dump($dbcollation);
+							if (empty($conf->db->dolibarr_main_db_collation) || ($reg[2] != $dbcollation)) $qualified = 0;
+							//var_dump($qualified);
+						}
+					}
+				}
 
-                if ($qualified)
-                {
-                    // Version qualified, delete SQL comments
-                    $buf = preg_replace('/^--\sV(MYSQL|PGSQL)([^\s]*)/i', '', $buf);
-                    //print "Ligne $i qualifi?e par version: ".$buf.'<br>';
-                }
-            }
+				if ($qualified)
+				{
+					// Version qualified, delete SQL comments
+					$buf = preg_replace('/^--\sV(MYSQL|PGSQL)([^\s]*)/i', '', $buf);
+					//print "Ligne $i qualifi?e par version: ".$buf.'<br>';
+				}
+			}
 
-            // Add line buf to buffer if not a comment
-            if ($nocommentremoval || !preg_match('/^\s*--/', $buf))
-            {
-            	if (empty($nocommentremoval)) $buf = preg_replace('/([,;ERLT\)])\s*--.*$/i', '\1', $buf); //remove comment from a line that not start with -- before add it to the buffer
-                $buffer .= trim($buf);
-            }
+			// Add line buf to buffer if not a comment
+			if ($nocommentremoval || !preg_match('/^\s*--/', $buf))
+			{
+				if (empty($nocommentremoval)) $buf = preg_replace('/([,;ERLT\)])\s*--.*$/i', '\1', $buf); //remove comment from a line that not start with -- before add it to the buffer
+				$buffer .= trim($buf);
+			}
 
-            //print $buf.'<br>';exit;
+			//print $buf.'<br>';exit;
 
-            if (preg_match('/;/', $buffer))	// If string contains ';', it's end of a request string, we save it in arraysql.
-            {
-                // Found new request
-                if ($buffer) $arraysql[$i] = $buffer;
-                $i++;
-                $buffer = '';
-            }
-        }
+			if (preg_match('/;/', $buffer))	// If string contains ';', it's end of a request string, we save it in arraysql.
+			{
+				// Found new request
+				if ($buffer) $arraysql[$i] = $buffer;
+				$i++;
+				$buffer = '';
+			}
+		}
 
-        if ($buffer) $arraysql[$i] = $buffer;
-        fclose($fp);
-    } else {
-        dol_syslog("Admin.lib::run_sql failed to open file ".$sqlfile, LOG_ERR);
-    }
+		if ($buffer) $arraysql[$i] = $buffer;
+		fclose($fp);
+	} else {
+		dol_syslog("Admin.lib::run_sql failed to open file ".$sqlfile, LOG_ERR);
+	}
 
-    // Loop on each request to see if there is a __+MAX_table__ key
-    $listofmaxrowid = array(); // This is a cache table
-    foreach ($arraysql as $i => $sql)
-    {
-        $newsql = $sql;
+	// Loop on each request to see if there is a __+MAX_table__ key
+	$listofmaxrowid = array(); // This is a cache table
+	foreach ($arraysql as $i => $sql)
+	{
+		$newsql = $sql;
 
-        // Replace __+MAX_table__ with max of table
-        while (preg_match('/__\+MAX_([A-Za-z0-9_]+)__/i', $newsql, $reg))
-        {
-            $table = $reg[1];
-            if (!isset($listofmaxrowid[$table]))
-            {
-                //var_dump($db);
-                $sqlgetrowid = 'SELECT MAX(rowid) as max from '.preg_replace('/^llx_/', MAIN_DB_PREFIX, $table);
-                $resql = $db->query($sqlgetrowid);
-                if ($resql)
-                {
-                    $obj = $db->fetch_object($resql);
-                    $listofmaxrowid[$table] = $obj->max;
-                    if (empty($listofmaxrowid[$table])) $listofmaxrowid[$table] = 0;
-                } else {
-                    if (!$silent) print '<tr><td class="tdtop" colspan="2">';
-                    if (!$silent) print '<div class="error">'.$langs->trans("Failed to get max rowid for ".$table)."</div></td>";
-                    if (!$silent) print '</tr>';
-                    $error++;
-                    break;
-                }
-            }
-            // Replace __+MAX_llx_table__ with +999
-            $from = '__+MAX_'.$table.'__';
-            $to = '+'.$listofmaxrowid[$table];
-            $newsql = str_replace($from, $to, $newsql);
-            dol_syslog('Admin.lib::run_sql New Request '.($i + 1).' (replacing '.$from.' to '.$to.')', LOG_DEBUG);
+		// Replace __+MAX_table__ with max of table
+		while (preg_match('/__\+MAX_([A-Za-z0-9_]+)__/i', $newsql, $reg))
+		{
+			$table = $reg[1];
+			if (!isset($listofmaxrowid[$table]))
+			{
+				//var_dump($db);
+				$sqlgetrowid = 'SELECT MAX(rowid) as max from '.preg_replace('/^llx_/', MAIN_DB_PREFIX, $table);
+				$resql = $db->query($sqlgetrowid);
+				if ($resql)
+				{
+					$obj = $db->fetch_object($resql);
+					$listofmaxrowid[$table] = $obj->max;
+					if (empty($listofmaxrowid[$table])) $listofmaxrowid[$table] = 0;
+				} else {
+					if (!$silent) print '<tr><td class="tdtop" colspan="2">';
+					if (!$silent) print '<div class="error">'.$langs->trans("Failed to get max rowid for ".$table)."</div></td>";
+					if (!$silent) print '</tr>';
+					$error++;
+					break;
+				}
+			}
+			// Replace __+MAX_llx_table__ with +999
+			$from = '__+MAX_'.$table.'__';
+			$to = '+'.$listofmaxrowid[$table];
+			$newsql = str_replace($from, $to, $newsql);
+			dol_syslog('Admin.lib::run_sql New Request '.($i + 1).' (replacing '.$from.' to '.$to.')', LOG_DEBUG);
 
-            $arraysql[$i] = $newsql;
-        }
+			$arraysql[$i] = $newsql;
+		}
 
-        if ($offsetforchartofaccount > 0)
-        {
-        	// Replace lines
-        	// 'INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1401, 'PCG99-ABREGE', 'CAPIT', '1234', 1400, '...', 1);'
-        	// with
-            // 'INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1401 + 200100000, 'PCG99-ABREGE','CAPIT', '1234', 1400 + 200100000, '...', 1);'
-            // Note: string with 1234 instead of '1234' is also supported
-        	$newsql = preg_replace('/VALUES\s*\(__ENTITY__, \s*(\d+)\s*,(\s*\'[^\',]*\'\s*,\s*\'[^\',]*\'\s*,\s*\'?[^\',]*\'?\s*),\s*\'?([^\',]*)\'?/ims', 'VALUES (__ENTITY__, \1 + '.$offsetforchartofaccount.', \2, \3 + '.$offsetforchartofaccount, $newsql);
-        	$newsql = preg_replace('/([,\s])0 \+ '.$offsetforchartofaccount.'/ims', '\1 0', $newsql);
-        	//var_dump($newsql);
-        	$arraysql[$i] = $newsql;
-        }
-    }
+		if ($offsetforchartofaccount > 0)
+		{
+			// Replace lines
+			// 'INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1401, 'PCG99-ABREGE', 'CAPIT', '1234', 1400, '...', 1);'
+			// with
+			// 'INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1401 + 200100000, 'PCG99-ABREGE','CAPIT', '1234', 1400 + 200100000, '...', 1);'
+			// Note: string with 1234 instead of '1234' is also supported
+			$newsql = preg_replace('/VALUES\s*\(__ENTITY__, \s*(\d+)\s*,(\s*\'[^\',]*\'\s*,\s*\'[^\',]*\'\s*,\s*\'?[^\',]*\'?\s*),\s*\'?([^\',]*)\'?/ims', 'VALUES (__ENTITY__, \1 + '.$offsetforchartofaccount.', \2, \3 + '.$offsetforchartofaccount, $newsql);
+			$newsql = preg_replace('/([,\s])0 \+ '.$offsetforchartofaccount.'/ims', '\1 0', $newsql);
+			//var_dump($newsql);
+			$arraysql[$i] = $newsql;
+		}
+	}
 
-    // Loop on each request to execute request
-    $cursorinsert = 0;
-    $listofinsertedrowid = array();
-    foreach ($arraysql as $i => $sql)
-    {
-        if ($sql)
-        {
-        	// Replace the prefix tables
-        	if (MAIN_DB_PREFIX != 'llx_')
-        	{
-        		$sql = preg_replace('/llx_/i', MAIN_DB_PREFIX, $sql);
-        	}
+	// Loop on each request to execute request
+	$cursorinsert = 0;
+	$listofinsertedrowid = array();
+	foreach ($arraysql as $i => $sql)
+	{
+		if ($sql)
+		{
+			// Replace the prefix tables
+			if (MAIN_DB_PREFIX != 'llx_')
+			{
+				$sql = preg_replace('/llx_/i', MAIN_DB_PREFIX, $sql);
+			}
 
-            if (!empty($handler)) $sql = preg_replace('/__HANDLER__/i', "'".$db->escape($handler)."'", $sql);
+			if (!empty($handler)) $sql = preg_replace('/__HANDLER__/i', "'".$db->escape($handler)."'", $sql);
 
-            $newsql = preg_replace('/__ENTITY__/i', (!empty($entity) ? $entity : $conf->entity), $sql);
+			$newsql = preg_replace('/__ENTITY__/i', (!empty($entity) ? $entity : $conf->entity), $sql);
 
-            // Ajout trace sur requete (eventuellement a commenter si beaucoup de requetes)
-            if (!$silent) print '<tr><td class="tdtop">'.$langs->trans("Request").' '.($i + 1)." sql='".dol_htmlentities($newsql, ENT_NOQUOTES)."'</td></tr>\n";
-            dol_syslog('Admin.lib::run_sql Request '.($i + 1), LOG_DEBUG);
+			// Add log of request
+			if (!$silent) print '<tr class="trforrunsql"><td class="tdtop opacitymedium">'.$langs->trans("Request").' '.($i + 1)." sql='".dol_htmlentities($newsql, ENT_NOQUOTES)."'</td></tr>\n";
+			dol_syslog('Admin.lib::run_sql Request '.($i + 1), LOG_DEBUG);
 			$sqlmodified = 0;
 
-            // Replace for encrypt data
-            if (preg_match_all('/__ENCRYPT\(\'([^\']+)\'\)__/i', $newsql, $reg))
-            {
-                $num = count($reg[0]);
+			// Replace for encrypt data
+			if (preg_match_all('/__ENCRYPT\(\'([^\']+)\'\)__/i', $newsql, $reg))
+			{
+				$num = count($reg[0]);
 
-                for ($j = 0; $j < $num; $j++)
-                {
-                    $from = $reg[0][$j];
-                    $to = $db->encrypt($reg[1][$j], 1);
-                    $newsql = str_replace($from, $to, $newsql);
-                }
-                $sqlmodified++;
-            }
+				for ($j = 0; $j < $num; $j++)
+				{
+					$from = $reg[0][$j];
+					$to = $db->encrypt($reg[1][$j], 1);
+					$newsql = str_replace($from, $to, $newsql);
+				}
+				$sqlmodified++;
+			}
 
-            // Replace for decrypt data
-            if (preg_match_all('/__DECRYPT\(\'([A-Za-z0-9_]+)\'\)__/i', $newsql, $reg))
-            {
-                $num = count($reg[0]);
+			// Replace for decrypt data
+			if (preg_match_all('/__DECRYPT\(\'([A-Za-z0-9_]+)\'\)__/i', $newsql, $reg))
+			{
+				$num = count($reg[0]);
 
-                for ($j = 0; $j < $num; $j++)
-                {
-                    $from = $reg[0][$j];
-                    $to = $db->decrypt($reg[1][$j]);
-                    $newsql = str_replace($from, $to, $newsql);
-                }
-                $sqlmodified++;
-            }
+				for ($j = 0; $j < $num; $j++)
+				{
+					$from = $reg[0][$j];
+					$to = $db->decrypt($reg[1][$j]);
+					$newsql = str_replace($from, $to, $newsql);
+				}
+				$sqlmodified++;
+			}
 
-            // Replace __x__ with rowid of insert nb x
-            while (preg_match('/__([0-9]+)__/', $newsql, $reg))
-            {
-                $cursor = $reg[1];
-                if (empty($listofinsertedrowid[$cursor]))
-                {
-                    if (!$silent) print '<tr><td class="tdtop" colspan="2">';
-                    if (!$silent) print '<div class="error">'.$langs->trans("FileIsNotCorrect")."</div></td>";
-                    if (!$silent) print '</tr>';
-                    $error++;
-                    break;
-                }
-                $from = '__'.$cursor.'__';
-                $to = $listofinsertedrowid[$cursor];
-                $newsql = str_replace($from, $to, $newsql);
-                $sqlmodified++;
-            }
+			// Replace __x__ with rowid of insert nb x
+			while (preg_match('/__([0-9]+)__/', $newsql, $reg))
+			{
+				$cursor = $reg[1];
+				if (empty($listofinsertedrowid[$cursor]))
+				{
+					if (!$silent) print '<tr><td class="tdtop" colspan="2">';
+					if (!$silent) print '<div class="error">'.$langs->trans("FileIsNotCorrect")."</div></td>";
+					if (!$silent) print '</tr>';
+					$error++;
+					break;
+				}
+				$from = '__'.$cursor.'__';
+				$to = $listofinsertedrowid[$cursor];
+				$newsql = str_replace($from, $to, $newsql);
+				$sqlmodified++;
+			}
 
-            if ($sqlmodified) dol_syslog('Admin.lib::run_sql New Request '.($i + 1), LOG_DEBUG);
+			if ($sqlmodified) dol_syslog('Admin.lib::run_sql New Request '.($i + 1), LOG_DEBUG);
 
-            $result = $db->query($newsql, $usesavepoint);
-            if ($result)
-            {
-                if (!$silent) print '<!-- Result = OK -->'."\n";
+			$result = $db->query($newsql, $usesavepoint);
+			if ($result)
+			{
+				if (!$silent) print '<!-- Result = OK -->'."\n";
 
-                if (preg_replace('/insert into ([^\s]+)/i', $newsql, $reg))
-                {
-                    $cursorinsert++;
+				if (preg_replace('/insert into ([^\s]+)/i', $newsql, $reg))
+				{
+					$cursorinsert++;
 
-                    // It's an insert
-                    $table = preg_replace('/([^a-zA-Z_]+)/i', '', $reg[1]);
-                    $insertedrowid = $db->last_insert_id($table);
-                    $listofinsertedrowid[$cursorinsert] = $insertedrowid;
-                    dol_syslog('Admin.lib::run_sql Insert nb '.$cursorinsert.', done in table '.$table.', rowid is '.$listofinsertedrowid[$cursorinsert], LOG_DEBUG);
-                }
-                // 	          print '<td class="right">OK</td>';
-            } else {
-                $errno = $db->errno();
-                if (!$silent) print '<!-- Result = '.$errno.' -->'."\n";
+					// It's an insert
+					$table = preg_replace('/([^a-zA-Z_]+)/i', '', $reg[1]);
+					$insertedrowid = $db->last_insert_id($table);
+					$listofinsertedrowid[$cursorinsert] = $insertedrowid;
+					dol_syslog('Admin.lib::run_sql Insert nb '.$cursorinsert.', done in table '.$table.', rowid is '.$listofinsertedrowid[$cursorinsert], LOG_DEBUG);
+				}
+				// 	          print '<td class="right">OK</td>';
+			} else {
+				$errno = $db->errno();
+				if (!$silent) print '<!-- Result = '.$errno.' -->'."\n";
 
 				// Define list of errors we accept (array $okerrors)
-            	$okerrors = array(	// By default
+				$okerrors = array(	// By default
 					'DB_ERROR_TABLE_ALREADY_EXISTS',
 					'DB_ERROR_COLUMN_ALREADY_EXISTS',
 					'DB_ERROR_KEY_NAME_ALREADY_EXISTS',
@@ -383,37 +383,59 @@ function run_sql($sqlfile, $silent = 1, $entity = '', $usesavepoint = 1, $handle
 					'DB_ERROR_CANNOT_CREATE', // Qd contrainte deja existante
 					'DB_ERROR_CANT_DROP_PRIMARY_KEY',
 					'DB_ERROR_PRIMARY_KEY_ALREADY_EXISTS',
-            		'DB_ERROR_22P02'
+					'DB_ERROR_22P02'
 				);
-                if ($okerror == 'none') $okerrors = array();
+				if ($okerror == 'none') $okerrors = array();
 
-                // Is it an error we accept
+				// Is it an error we accept
 				if (!in_array($errno, $okerrors))
 				{
-				    if (!$silent) print '<tr><td class="tdtop" colspan="2">';
-				    if (!$silent) print '<div class="error">'.$langs->trans("Error")." ".$db->errno().": ".$newsql."<br>".$db->error()."</div></td>";
-				    if (!$silent) print '</tr>'."\n";
-				    dol_syslog('Admin.lib::run_sql Request '.($i + 1)." Error ".$db->errno()." ".$newsql."<br>".$db->error(), LOG_ERR);
-				    $error++;
+					if (!$silent) print '<tr><td class="tdtop" colspan="2">';
+					if (!$silent) print '<div class="error">'.$langs->trans("Error")." ".$db->errno().": ".$newsql."<br>".$db->error()."</div></td>";
+					if (!$silent) print '</tr>'."\n";
+					dol_syslog('Admin.lib::run_sql Request '.($i + 1)." Error ".$db->errno()." ".$newsql."<br>".$db->error(), LOG_ERR);
+					$error++;
 				}
-            }
+			}
 
-            if (!$silent) print '</tr>'."\n";
-        }
-    }
+			if (!$silent) print '</tr>'."\n";
+		}
+	}
 
-    if ($error == 0)
-    {
-        if (!$silent) print '<tr><td>'.$langs->trans("ProcessMigrateScript").'</td>';
-        if (!$silent) print '<td class="right">'.$langs->trans("OK").'</td></tr>'."\n";
-        $ok = 1;
-    } else {
-        if (!$silent) print '<tr><td>'.$langs->trans("ProcessMigrateScript").'</td>';
-        if (!$silent) print '<td class="right"><font class="error">'.$langs->trans("KO").'</font></td></tr>'."\n";
-        $ok = 0;
-    }
+	if ($error == 0)
+	{
+		if (!$silent) {
+			print '<tr><td>'.$langs->trans("ProcessMigrateScript").'</td>';
+			print '<td class="right">'.$langs->trans("OK");
+			//if (! empty($conf->use_javascript_ajax)) {
+				print '<script type="text/javascript" language="javascript">
+				jQuery(document).ready(function() {
+					function init_trrunsql()
+					{
+						console.log("toggle .trforrunsql");
+						jQuery(".trforrunsql").toggle();
+					}
+					init_trrunsql();
+					jQuery(".trforrunsqlshowhide").click(function() {
+						init_trrunsql();
+					});
+				});
+				</script>';
+				print ' - <a class="trforrunsqlshowhide" href="#">'.$langs->trans("ShowHideDetails").'</a>';
+			//}
+			print '</td></tr>'."\n";
+		}
+		$ok = 1;
+	} else {
+		if (!$silent) {
+			print '<tr><td>'.$langs->trans("ProcessMigrateScript").'</td>';
+			print '<td class="right"><font class="error">'.$langs->trans("KO").'</font>';
+			print '</td></tr>'."\n";
+		}
+		$ok = 0;
+	}
 
-    return $ok;
+	return $ok;
 }
 
 
@@ -429,30 +451,30 @@ function run_sql($sqlfile, $silent = 1, $entity = '', $usesavepoint = 1, $handle
  */
 function dolibarr_del_const($db, $name, $entity = 1)
 {
-    global $conf;
+	global $conf;
 
-    if (empty($name))
-    {
-    	dol_print_error('', 'Error call dolibar_del_const with parameter name empty');
-    	return -1;
-    }
+	if (empty($name))
+	{
+		dol_print_error('', 'Error call dolibar_del_const with parameter name empty');
+		return -1;
+	}
 
-    $sql = "DELETE FROM ".MAIN_DB_PREFIX."const";
-    $sql .= " WHERE (".$db->decrypt('name')." = '".$db->escape($name)."'";
-    if (is_numeric($name)) $sql .= " OR rowid = '".$db->escape($name)."'";
-    $sql .= ")";
-    if ($entity >= 0) $sql .= " AND entity = ".$entity;
+	$sql = "DELETE FROM ".MAIN_DB_PREFIX."const";
+	$sql .= " WHERE (".$db->decrypt('name')." = '".$db->escape($name)."'";
+	if (is_numeric($name)) $sql .= " OR rowid = '".$db->escape($name)."'";
+	$sql .= ")";
+	if ($entity >= 0) $sql .= " AND entity = ".$entity;
 
-    dol_syslog("admin.lib::dolibarr_del_const", LOG_DEBUG);
-    $resql = $db->query($sql);
-    if ($resql)
-    {
-        $conf->global->$name = '';
-        return 1;
-    } else {
-        dol_print_error($db);
-        return -1;
-    }
+	dol_syslog("admin.lib::dolibarr_del_const", LOG_DEBUG);
+	$resql = $db->query($sql);
+	if ($resql)
+	{
+		$conf->global->$name = '';
+		return 1;
+	} else {
+		dol_print_error($db);
+		return -1;
+	}
 }
 
 /**
@@ -467,22 +489,22 @@ function dolibarr_del_const($db, $name, $entity = 1)
  */
 function dolibarr_get_const($db, $name, $entity = 1)
 {
-    global $conf;
-    $value = '';
+	global $conf;
+	$value = '';
 
-    $sql = "SELECT ".$db->decrypt('value')." as value";
-    $sql .= " FROM ".MAIN_DB_PREFIX."const";
-    $sql .= " WHERE name = ".$db->encrypt($name, 1);
-    $sql .= " AND entity = ".$entity;
+	$sql = "SELECT ".$db->decrypt('value')." as value";
+	$sql .= " FROM ".MAIN_DB_PREFIX."const";
+	$sql .= " WHERE name = ".$db->encrypt($name, 1);
+	$sql .= " AND entity = ".$entity;
 
-    dol_syslog("admin.lib::dolibarr_get_const", LOG_DEBUG);
-    $resql = $db->query($sql);
-    if ($resql)
-    {
-        $obj = $db->fetch_object($resql);
-        if ($obj) $value = $obj->value;
-    }
-    return $value;
+	dol_syslog("admin.lib::dolibarr_get_const", LOG_DEBUG);
+	$resql = $db->query($sql);
+	if ($resql)
+	{
+		$obj = $db->fetch_object($resql);
+		if ($obj) $value = $obj->value;
+	}
+	return $value;
 }
 
 
@@ -502,53 +524,53 @@ function dolibarr_get_const($db, $name, $entity = 1)
  */
 function dolibarr_set_const($db, $name, $value, $type = 'chaine', $visible = 0, $note = '', $entity = 1)
 {
-    global $conf;
+	global $conf;
 
-    // Clean parameters
-    $name = trim($name);
+	// Clean parameters
+	$name = trim($name);
 
-    // Check parameters
-    if (empty($name))
-    {
-        dol_print_error($db, "Error: Call to function dolibarr_set_const with wrong parameters", LOG_ERR);
-        exit;
-    }
+	// Check parameters
+	if (empty($name))
+	{
+		dol_print_error($db, "Error: Call to function dolibarr_set_const with wrong parameters", LOG_ERR);
+		exit;
+	}
 
-    //dol_syslog("dolibarr_set_const name=$name, value=$value type=$type, visible=$visible, note=$note entity=$entity");
+	//dol_syslog("dolibarr_set_const name=$name, value=$value type=$type, visible=$visible, note=$note entity=$entity");
 
-    $db->begin();
+	$db->begin();
 
-    $sql = "DELETE FROM ".MAIN_DB_PREFIX."const";
-    $sql .= " WHERE name = ".$db->encrypt($name, 1);
-    if ($entity >= 0) $sql .= " AND entity = ".$entity;
+	$sql = "DELETE FROM ".MAIN_DB_PREFIX."const";
+	$sql .= " WHERE name = ".$db->encrypt($name, 1);
+	if ($entity >= 0) $sql .= " AND entity = ".$entity;
 
-    dol_syslog("admin.lib::dolibarr_set_const", LOG_DEBUG);
-    $resql = $db->query($sql);
+	dol_syslog("admin.lib::dolibarr_set_const", LOG_DEBUG);
+	$resql = $db->query($sql);
 
-    if (strcmp($value, ''))	// true if different. Must work for $value='0' or $value=0
-    {
-        $sql = "INSERT INTO ".MAIN_DB_PREFIX."const(name,value,type,visible,note,entity)";
-        $sql .= " VALUES (";
-        $sql .= $db->encrypt($name, 1);
-        $sql .= ", ".$db->encrypt($value, 1);
-        $sql .= ",'".$db->escape($type)."',".$visible.",'".$db->escape($note)."',".$entity.")";
+	if (strcmp($value, ''))	// true if different. Must work for $value='0' or $value=0
+	{
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."const(name,value,type,visible,note,entity)";
+		$sql .= " VALUES (";
+		$sql .= $db->encrypt($name, 1);
+		$sql .= ", ".$db->encrypt($value, 1);
+		$sql .= ",'".$db->escape($type)."',".$visible.",'".$db->escape($note)."',".$entity.")";
 
-        //print "sql".$value."-".pg_escape_string($value)."-".$sql;exit;
-        //print "xx".$db->escape($value);
-        dol_syslog("admin.lib::dolibarr_set_const", LOG_DEBUG);
-        $resql = $db->query($sql);
-    }
+		//print "sql".$value."-".pg_escape_string($value)."-".$sql;exit;
+		//print "xx".$db->escape($value);
+		dol_syslog("admin.lib::dolibarr_set_const", LOG_DEBUG);
+		$resql = $db->query($sql);
+	}
 
-    if ($resql)
-    {
-        $db->commit();
-        $conf->global->$name = $value;
-        return 1;
-    } else {
-        $error = $db->lasterror();
-        $db->rollback();
-        return -1;
-    }
+	if ($resql)
+	{
+		$db->commit();
+		$conf->global->$name = $value;
+		return 1;
+	} else {
+		$error = $db->lasterror();
+		$db->rollback();
+		return -1;
+	}
 }
 
 
@@ -596,65 +618,65 @@ function modules_prepare_head()
  */
 function security_prepare_head()
 {
-    global $db, $langs, $conf, $user;
-    $h = 0;
-    $head = array();
+	global $db, $langs, $conf, $user;
+	$h = 0;
+	$head = array();
 
-    $head[$h][0] = DOL_URL_ROOT."/admin/security_other.php";
-    $head[$h][1] = $langs->trans("Miscellaneous");
-    $head[$h][2] = 'misc';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT."/admin/security_other.php";
+	$head[$h][1] = $langs->trans("Miscellaneous");
+	$head[$h][2] = 'misc';
+	$h++;
 
-    $head[$h][0] = DOL_URL_ROOT."/admin/security.php";
-    $head[$h][1] = $langs->trans("Passwords");
-    $head[$h][2] = 'passwords';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT."/admin/security.php";
+	$head[$h][1] = $langs->trans("Passwords");
+	$head[$h][2] = 'passwords';
+	$h++;
 
-    $head[$h][0] = DOL_URL_ROOT."/admin/security_file.php";
-    $head[$h][1] = $langs->trans("Files").' ('.$langs->trans("Upload").')';
-    $head[$h][2] = 'file';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT."/admin/security_file.php";
+	$head[$h][1] = $langs->trans("Files").' ('.$langs->trans("Upload").')';
+	$head[$h][2] = 'file';
+	$h++;
 
-    /*
+	/*
     $head[$h][0] = DOL_URL_ROOT."/admin/security_file_download.php";
     $head[$h][1] = $langs->trans("Files").' ('.$langs->trans("Download").')';
     $head[$h][2] = 'filedownload';
     $h++;
 	*/
 
-    $head[$h][0] = DOL_URL_ROOT."/admin/proxy.php";
-    $head[$h][1] = $langs->trans("ExternalAccess");
-    $head[$h][2] = 'proxy';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT."/admin/proxy.php";
+	$head[$h][1] = $langs->trans("ExternalAccess");
+	$head[$h][2] = 'proxy';
+	$h++;
 
-    $head[$h][0] = DOL_URL_ROOT."/admin/events.php";
-    $head[$h][1] = $langs->trans("Audit");
-    $head[$h][2] = 'audit';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT."/admin/events.php";
+	$head[$h][1] = $langs->trans("Audit");
+	$head[$h][2] = 'audit';
+	$h++;
 
 
-    // Show permissions lines
-    $nbPerms = 0;
-    $sql = "SELECT COUNT(r.id) as nb";
-    $sql .= " FROM ".MAIN_DB_PREFIX."rights_def as r";
-    $sql .= " WHERE r.libelle NOT LIKE 'tou%'"; // On ignore droits "tous"
-    $sql .= " AND entity = ".$conf->entity;
-    $sql .= " AND bydefault = 1";
-    if (empty($conf->global->MAIN_USE_ADVANCED_PERMS)) $sql .= " AND r.perms NOT LIKE '%_advance'"; // Hide advanced perms if option is not enabled
-    $resql = $db->query($sql);
-    if ($resql)
-    {
-    	$obj = $db->fetch_object($resql);
-    	if ($obj) $nbPerms = $obj->nb;
-    } else dol_print_error($db);
+	// Show permissions lines
+	$nbPerms = 0;
+	$sql = "SELECT COUNT(r.id) as nb";
+	$sql .= " FROM ".MAIN_DB_PREFIX."rights_def as r";
+	$sql .= " WHERE r.libelle NOT LIKE 'tou%'"; // On ignore droits "tous"
+	$sql .= " AND entity = ".$conf->entity;
+	$sql .= " AND bydefault = 1";
+	if (empty($conf->global->MAIN_USE_ADVANCED_PERMS)) $sql .= " AND r.perms NOT LIKE '%_advance'"; // Hide advanced perms if option is not enabled
+	$resql = $db->query($sql);
+	if ($resql)
+	{
+		$obj = $db->fetch_object($resql);
+		if ($obj) $nbPerms = $obj->nb;
+	} else dol_print_error($db);
 
-    $head[$h][0] = DOL_URL_ROOT."/admin/perms.php";
-    $head[$h][1] = $langs->trans("DefaultRights");
-    if ($nbPerms > 0) $head[$h][1] .= (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '<span class="badge marginleftonlyshort">'.$nbPerms.'</span>' : '');
-    $head[$h][2] = 'default';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT."/admin/perms.php";
+	$head[$h][1] = $langs->trans("DefaultRights");
+	if ($nbPerms > 0) $head[$h][1] .= (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '<span class="badge marginleftonlyshort">'.$nbPerms.'</span>' : '');
+	$head[$h][2] = 'default';
+	$h++;
 
-    return $head;
+	return $head;
 }
 
 /**
@@ -664,12 +686,12 @@ function security_prepare_head()
  */
 function modulehelp_prepare_head($object)
 {
-    global $langs, $conf, $user;
-    $h = 0;
-    $head = array();
+	global $langs, $conf, $user;
+	$h = 0;
+	$head = array();
 
-    // FIX for compatibity habitual tabs
-    $object->id = $object->numero;
+	// FIX for compatibity habitual tabs
+	$object->id = $object->numero;
 
 	$head[$h][0] = DOL_URL_ROOT."/admin/modulehelp.php?id=".$object->id.'&mode=desc';
 	$head[$h][1] = $langs->trans("Description");
@@ -689,12 +711,12 @@ function modulehelp_prepare_head($object)
 		$h++;
 	}
 
-    complete_head_from_modules($conf, $langs, $object, $head, $h, 'modulehelp_admin');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'modulehelp_admin');
 
-    complete_head_from_modules($conf, $langs, $object, $head, $h, 'modulehelp_admin', 'remove');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'modulehelp_admin', 'remove');
 
 
-    return $head;
+	return $head;
 }
 /**
  * Prepare array with list of tabs
@@ -703,26 +725,26 @@ function modulehelp_prepare_head($object)
  */
 function translation_prepare_head()
 {
-    global $langs, $conf, $user;
-    $h = 0;
-    $head = array();
+	global $langs, $conf, $user;
+	$h = 0;
+	$head = array();
 
-    $head[$h][0] = DOL_URL_ROOT."/admin/translation.php?mode=searchkey";
-    $head[$h][1] = $langs->trans("TranslationKeySearch");
-    $head[$h][2] = 'searchkey';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT."/admin/translation.php?mode=searchkey";
+	$head[$h][1] = $langs->trans("TranslationKeySearch");
+	$head[$h][2] = 'searchkey';
+	$h++;
 
-    $head[$h][0] = DOL_URL_ROOT."/admin/translation.php?mode=overwrite";
-    $head[$h][1] = $langs->trans("TranslationOverwriteKey").'<span class="fa fa-plus-circle valignmiddle paddingleft"></span>';
-    $head[$h][2] = 'overwrite';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT."/admin/translation.php?mode=overwrite";
+	$head[$h][1] = $langs->trans("TranslationOverwriteKey").'<span class="fa fa-plus-circle valignmiddle paddingleft"></span>';
+	$head[$h][2] = 'overwrite';
+	$h++;
 
-    complete_head_from_modules($conf, $langs, null, $head, $h, 'translation_admin');
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'translation_admin');
 
-    complete_head_from_modules($conf, $langs, null, $head, $h, 'translation_admin', 'remove');
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'translation_admin', 'remove');
 
 
-    return $head;
+	return $head;
 }
 
 
@@ -733,49 +755,49 @@ function translation_prepare_head()
  */
 function defaultvalues_prepare_head()
 {
-    global $langs, $conf, $user;
-    $h = 0;
-    $head = array();
+	global $langs, $conf, $user;
+	$h = 0;
+	$head = array();
 
-    $head[$h][0] = DOL_URL_ROOT."/admin/defaultvalues.php?mode=createform";
-    $head[$h][1] = $langs->trans("DefaultCreateForm");
-    $head[$h][2] = 'createform';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT."/admin/defaultvalues.php?mode=createform";
+	$head[$h][1] = $langs->trans("DefaultCreateForm");
+	$head[$h][2] = 'createform';
+	$h++;
 
-    $head[$h][0] = DOL_URL_ROOT."/admin/defaultvalues.php?mode=filters";
-    $head[$h][1] = $langs->trans("DefaultSearchFilters");
-    $head[$h][2] = 'filters';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT."/admin/defaultvalues.php?mode=filters";
+	$head[$h][1] = $langs->trans("DefaultSearchFilters");
+	$head[$h][2] = 'filters';
+	$h++;
 
-    $head[$h][0] = DOL_URL_ROOT."/admin/defaultvalues.php?mode=sortorder";
-    $head[$h][1] = $langs->trans("DefaultSortOrder");
-    $head[$h][2] = 'sortorder';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT."/admin/defaultvalues.php?mode=sortorder";
+	$head[$h][1] = $langs->trans("DefaultSortOrder");
+	$head[$h][2] = 'sortorder';
+	$h++;
 
-    if (!empty($conf->use_javascript_ajax))
-    {
-    	$head[$h][0] = DOL_URL_ROOT."/admin/defaultvalues.php?mode=focus";
-	    $head[$h][1] = $langs->trans("DefaultFocus");
-	    $head[$h][2] = 'focus';
-	    $h++;
+	if (!empty($conf->use_javascript_ajax))
+	{
+		$head[$h][0] = DOL_URL_ROOT."/admin/defaultvalues.php?mode=focus";
+		$head[$h][1] = $langs->trans("DefaultFocus");
+		$head[$h][2] = 'focus';
+		$h++;
 
-	    $head[$h][0] = DOL_URL_ROOT."/admin/defaultvalues.php?mode=mandatory";
-	    $head[$h][1] = $langs->trans("DefaultMandatory");
-	    $head[$h][2] = 'mandatory';
-	    $h++;
-    }
+		$head[$h][0] = DOL_URL_ROOT."/admin/defaultvalues.php?mode=mandatory";
+		$head[$h][1] = $langs->trans("DefaultMandatory");
+		$head[$h][2] = 'mandatory';
+		$h++;
+	}
 
-    /*$head[$h][0] = DOL_URL_ROOT."/admin/translation.php?mode=searchkey";
+	/*$head[$h][0] = DOL_URL_ROOT."/admin/translation.php?mode=searchkey";
     $head[$h][1] = $langs->trans("TranslationKeySearch");
     $head[$h][2] = 'searchkey';
     $h++;*/
 
-    complete_head_from_modules($conf, $langs, null, $head, $h, 'defaultvalues_admin');
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'defaultvalues_admin');
 
-    complete_head_from_modules($conf, $langs, null, $head, $h, 'defaultvalues_admin', 'remove');
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'defaultvalues_admin', 'remove');
 
 
-    return $head;
+	return $head;
 }
 
 
@@ -786,55 +808,55 @@ function defaultvalues_prepare_head()
  */
 function listOfSessions()
 {
-    global $conf;
+	global $conf;
 
-    $arrayofSessions = array();
-    // session.save_path can be returned empty so we set a default location and work from there
-    $sessPath = '/tmp';
-    $iniPath = ini_get("session.save_path");
-    if ($iniPath) {
-        $sessPath = $iniPath;
-    }
-    $sessPath .= '/'; // We need the trailing slash
-    dol_syslog('admin.lib:listOfSessions sessPath='.$sessPath);
+	$arrayofSessions = array();
+	// session.save_path can be returned empty so we set a default location and work from there
+	$sessPath = '/tmp';
+	$iniPath = ini_get("session.save_path");
+	if ($iniPath) {
+		$sessPath = $iniPath;
+	}
+	$sessPath .= '/'; // We need the trailing slash
+	dol_syslog('admin.lib:listOfSessions sessPath='.$sessPath);
 
-    $dh = @opendir(dol_osencode($sessPath));
-    if ($dh)
-    {
-        while (($file = @readdir($dh)) !== false)
-        {
-            if (preg_match('/^sess_/i', $file) && $file != "." && $file != "..")
-            {
-                $fullpath = $sessPath.$file;
-                if (!@is_dir($fullpath) && is_readable($fullpath))
-                {
-                    $sessValues = file_get_contents($fullpath); // get raw session data
-                    // Example of possible value
+	$dh = @opendir(dol_osencode($sessPath));
+	if ($dh)
+	{
+		while (($file = @readdir($dh)) !== false)
+		{
+			if (preg_match('/^sess_/i', $file) && $file != "." && $file != "..")
+			{
+				$fullpath = $sessPath.$file;
+				if (!@is_dir($fullpath) && is_readable($fullpath))
+				{
+					$sessValues = file_get_contents($fullpath); // get raw session data
+					// Example of possible value
 					//$sessValues = 'newtoken|s:32:"1239f7a0c4b899200fe9ca5ea394f307";dol_loginmesg|s:0:"";newtoken|s:32:"1236457104f7ae0f328c2928973f3cb5";dol_loginmesg|s:0:"";token|s:32:"123615ad8d650c5cc4199b9a1a76783f";
 					// dol_login|s:5:"admin";dol_authmode|s:8:"dolibarr";dol_tz|s:1:"1";dol_tz_string|s:13:"Europe/Berlin";dol_dst|i:0;dol_dst_observed|s:1:"1";dol_dst_first|s:0:"";dol_dst_second|s:0:"";dol_screenwidth|s:4:"1920";
 					// dol_screenheight|s:3:"971";dol_company|s:12:"MyBigCompany";dol_entity|i:1;mainmenu|s:4:"home";leftmenuopened|s:10:"admintools";idmenu|s:0:"";leftmenu|s:10:"admintools";';
 
-                    if (preg_match('/dol_login/i', $sessValues) && // limit to dolibarr session
-                        (preg_match('/dol_entity\|i:'.$conf->entity.';/i', $sessValues) || preg_match('/dol_entity\|s:([0-9]+):"'.$conf->entity.'"/i', $sessValues)) && // limit to current entity
-                    preg_match('/dol_company\|s:([0-9]+):"('.$conf->global->MAIN_INFO_SOCIETE_NOM.')"/i', $sessValues)) // limit to company name
-                    {
-                        $tmp = explode('_', $file);
-                        $idsess = $tmp[1];
-                        $regs = array();
-                        $loginfound = preg_match('/dol_login\|s:[0-9]+:"([A-Za-z0-9]+)"/i', $sessValues, $regs);
-                        if ($loginfound) $arrayofSessions[$idsess]["login"] = $regs[1];
-                        $arrayofSessions[$idsess]["age"] = time() - filectime($fullpath);
-                        $arrayofSessions[$idsess]["creation"] = filectime($fullpath);
-                        $arrayofSessions[$idsess]["modification"] = filemtime($fullpath);
-                        $arrayofSessions[$idsess]["raw"] = $sessValues;
-                    }
-                }
-            }
-        }
-        @closedir($dh);
-    }
+					if (preg_match('/dol_login/i', $sessValues) && // limit to dolibarr session
+						(preg_match('/dol_entity\|i:'.$conf->entity.';/i', $sessValues) || preg_match('/dol_entity\|s:([0-9]+):"'.$conf->entity.'"/i', $sessValues)) && // limit to current entity
+					preg_match('/dol_company\|s:([0-9]+):"('.$conf->global->MAIN_INFO_SOCIETE_NOM.')"/i', $sessValues)) // limit to company name
+					{
+						$tmp = explode('_', $file);
+						$idsess = $tmp[1];
+						$regs = array();
+						$loginfound = preg_match('/dol_login\|s:[0-9]+:"([A-Za-z0-9]+)"/i', $sessValues, $regs);
+						if ($loginfound) $arrayofSessions[$idsess]["login"] = $regs[1];
+						$arrayofSessions[$idsess]["age"] = time() - filectime($fullpath);
+						$arrayofSessions[$idsess]["creation"] = filectime($fullpath);
+						$arrayofSessions[$idsess]["modification"] = filemtime($fullpath);
+						$arrayofSessions[$idsess]["raw"] = $sessValues;
+					}
+				}
+			}
+		}
+		@closedir($dh);
+	}
 
-    return $arrayofSessions;
+	return $arrayofSessions;
 }
 
 /**
@@ -845,42 +867,42 @@ function listOfSessions()
  */
 function purgeSessions($mysessionid)
 {
-    global $conf;
+	global $conf;
 
-    $sessPath = ini_get("session.save_path")."/";
-    dol_syslog('admin.lib:purgeSessions mysessionid='.$mysessionid.' sessPath='.$sessPath);
+	$sessPath = ini_get("session.save_path")."/";
+	dol_syslog('admin.lib:purgeSessions mysessionid='.$mysessionid.' sessPath='.$sessPath);
 
-    $error = 0;
-    $dh = @opendir(dol_osencode($sessPath));
-    while (($file = @readdir($dh)) !== false)
-    {
-        if ($file != "." && $file != "..")
-        {
-            $fullpath = $sessPath.$file;
-            if (!@is_dir($fullpath))
-            {
-                $sessValues = file_get_contents($fullpath); // get raw session data
+	$error = 0;
+	$dh = @opendir(dol_osencode($sessPath));
+	while (($file = @readdir($dh)) !== false)
+	{
+		if ($file != "." && $file != "..")
+		{
+			$fullpath = $sessPath.$file;
+			if (!@is_dir($fullpath))
+			{
+				$sessValues = file_get_contents($fullpath); // get raw session data
 
-                if (preg_match('/dol_login/i', $sessValues) && // limit to dolibarr session
-                preg_match('/dol_entity\|s:([0-9]+):"('.$conf->entity.')"/i', $sessValues) && // limit to current entity
-                preg_match('/dol_company\|s:([0-9]+):"('.$conf->global->MAIN_INFO_SOCIETE_NOM.')"/i', $sessValues)) // limit to company name
-                {
-                    $tmp = explode('_', $file);
-                    $idsess = $tmp[1];
-                    // We remove session if it's not ourself
-                    if ($idsess != $mysessionid)
-                    {
-                        $res = @unlink($fullpath);
-                        if (!$res) $error++;
-                    }
-                }
-            }
-        }
-    }
-    @closedir($dh);
+				if (preg_match('/dol_login/i', $sessValues) && // limit to dolibarr session
+				preg_match('/dol_entity\|s:([0-9]+):"('.$conf->entity.')"/i', $sessValues) && // limit to current entity
+				preg_match('/dol_company\|s:([0-9]+):"('.$conf->global->MAIN_INFO_SOCIETE_NOM.')"/i', $sessValues)) // limit to company name
+				{
+					$tmp = explode('_', $file);
+					$idsess = $tmp[1];
+					// We remove session if it's not ourself
+					if ($idsess != $mysessionid)
+					{
+						$res = @unlink($fullpath);
+						if (!$res) $error++;
+					}
+				}
+			}
+		}
+	}
+	@closedir($dh);
 
-    if (!$error) return 1;
-    else return -$error;
+	if (!$error) return 1;
+	else return -$error;
 }
 
 
@@ -894,9 +916,9 @@ function purgeSessions($mysessionid)
  */
 function activateModule($value, $withdeps = 1)
 {
-    global $db, $langs, $conf, $mysoc;
+	global $db, $langs, $conf, $mysoc;
 
-    $ret = array();
+	$ret = array();
 
 	// Check parameters
 	if (empty($value)) {
@@ -904,38 +926,38 @@ function activateModule($value, $withdeps = 1)
 		return $ret;
 	}
 
-    $ret = array('nbmodules'=>0, 'errors'=>array(), 'nbperms'=>0);
-    $modName = $value;
-    $modFile = $modName.".class.php";
+	$ret = array('nbmodules'=>0, 'errors'=>array(), 'nbperms'=>0);
+	$modName = $value;
+	$modFile = $modName.".class.php";
 
-    // Loop on each directory to fill $modulesdir
-    $modulesdir = dolGetModulesDirs();
+	// Loop on each directory to fill $modulesdir
+	$modulesdir = dolGetModulesDirs();
 
-    // Loop on each modulesdir directories
-    $found = false;
-    foreach ($modulesdir as $dir)
-    {
-        if (file_exists($dir.$modFile))
-        {
-            $found = @include_once $dir.$modFile;
-            if ($found) break;
-        }
-    }
+	// Loop on each modulesdir directories
+	$found = false;
+	foreach ($modulesdir as $dir)
+	{
+		if (file_exists($dir.$modFile))
+		{
+			$found = @include_once $dir.$modFile;
+			if ($found) break;
+		}
+	}
 
-    $objMod = new $modName($db);
+	$objMod = new $modName($db);
 
-    // Test if PHP version ok
-    $verphp = versionphparray();
-    $vermin = isset($objMod->phpmin) ? $objMod->phpmin : 0;
+	// Test if PHP version ok
+	$verphp = versionphparray();
+	$vermin = isset($objMod->phpmin) ? $objMod->phpmin : 0;
 	if (is_array($vermin) && versioncompare($verphp, $vermin) < 0) {
 		$ret['errors'][] = $langs->trans("ErrorModuleRequirePHPVersion", versiontostring($vermin));
 		return $ret;
 	}
 
-    // Test if Dolibarr version ok
-    $verdol = versiondolibarrarray();
-    $vermin = isset($objMod->need_dolibarr_version) ? $objMod->need_dolibarr_version : 0;
-    //print 'version: '.versioncompare($verdol,$vermin).' - '.join(',',$verdol).' - '.join(',',$vermin);exit;
+	// Test if Dolibarr version ok
+	$verdol = versiondolibarrarray();
+	$vermin = isset($objMod->need_dolibarr_version) ? $objMod->need_dolibarr_version : 0;
+	//print 'version: '.versioncompare($verdol,$vermin).' - '.join(',',$verdol).' - '.join(',',$vermin);exit;
 	if (is_array($vermin) && versioncompare($verdol, $vermin) < 0) {
 		$ret['errors'][] = $langs->trans("ErrorModuleRequireDolibarrVersion", versiontostring($vermin));
 		return $ret;
@@ -949,81 +971,81 @@ function activateModule($value, $withdeps = 1)
 
 	$const_name = $objMod->const_name;
 	if (!empty($conf->global->$const_name)) {
-        return $ret;
-    }
+		return $ret;
+	}
 
-    $result = $objMod->init(); // Enable module
+	$result = $objMod->init(); // Enable module
 
-    if ($result <= 0)
-    {
-        $ret['errors'][] = $objMod->error;
-    } else {
-        if ($withdeps)
-        {
-            if (isset($objMod->depends) && is_array($objMod->depends) && !empty($objMod->depends))
-            {
-                // Activation of modules this module depends on
-                // this->depends may be array('modModule1', 'mmodModule2') or array('always1'=>"modModule1", 'FR'=>'modModule2')
-                foreach ($objMod->depends as $key => $modulestring)
-                {
-                	//var_dump((! is_numeric($key)) && ! preg_match('/^always/', $key) && $mysoc->country_code && ! preg_match('/^'.$mysoc->country_code.'/', $key));exit;
-                	if ((!is_numeric($key)) && !preg_match('/^always/', $key) && $mysoc->country_code && !preg_match('/^'.$mysoc->country_code.'/', $key))
-                    {
-                        dol_syslog("We are not concerned by dependency with key=".$key." because our country is ".$mysoc->country_code);
-                        continue;
-                    }
-                	$activate = false;
-                	foreach ($modulesdir as $dir)
-                	{
-                		if (file_exists($dir.$modulestring.".class.php"))
-                		{
-                			$resarray = activateModule($modulestring);
-    						if (empty($resarray['errors'])) {
-    						    $activate = true;
-                            } else {
-    						    foreach ($resarray['errors'] as $errorMessage) {
-                                    dol_syslog($errorMessage, LOG_ERR);
-                                }
-                            }
-    						break;
-                		}
-                	}
+	if ($result <= 0)
+	{
+		$ret['errors'][] = $objMod->error;
+	} else {
+		if ($withdeps)
+		{
+			if (isset($objMod->depends) && is_array($objMod->depends) && !empty($objMod->depends))
+			{
+				// Activation of modules this module depends on
+				// this->depends may be array('modModule1', 'mmodModule2') or array('always1'=>"modModule1", 'FR'=>'modModule2')
+				foreach ($objMod->depends as $key => $modulestring)
+				{
+					//var_dump((! is_numeric($key)) && ! preg_match('/^always/', $key) && $mysoc->country_code && ! preg_match('/^'.$mysoc->country_code.'/', $key));exit;
+					if ((!is_numeric($key)) && !preg_match('/^always/', $key) && $mysoc->country_code && !preg_match('/^'.$mysoc->country_code.'/', $key))
+					{
+						dol_syslog("We are not concerned by dependency with key=".$key." because our country is ".$mysoc->country_code);
+						continue;
+					}
+					$activate = false;
+					foreach ($modulesdir as $dir)
+					{
+						if (file_exists($dir.$modulestring.".class.php"))
+						{
+							$resarray = activateModule($modulestring);
+							if (empty($resarray['errors'])) {
+								$activate = true;
+							} else {
+								foreach ($resarray['errors'] as $errorMessage) {
+									dol_syslog($errorMessage, LOG_ERR);
+								}
+							}
+							break;
+						}
+					}
 
-    				if ($activate)
-    				{
-    				    $ret['nbmodules'] += $resarray['nbmodules'];
-    				    $ret['nbperms'] += $resarray['nbperms'];
-    				} else {
-    				    $ret['errors'][] = $langs->trans('activateModuleDependNotSatisfied', $objMod->name, $modulestring);
-    				}
-                }
-            }
+					if ($activate)
+					{
+						$ret['nbmodules'] += $resarray['nbmodules'];
+						$ret['nbperms'] += $resarray['nbperms'];
+					} else {
+						$ret['errors'][] = $langs->trans('activateModuleDependNotSatisfied', $objMod->name, $modulestring);
+					}
+				}
+			}
 
-            if (isset($objMod->conflictwith) && is_array($objMod->conflictwith) && !empty($objMod->conflictwith))
-            {
-                // Desactivation des modules qui entrent en conflit
-                $num = count($objMod->conflictwith);
-                for ($i = 0; $i < $num; $i++)
-                {
-                	foreach ($modulesdir as $dir)
-                	{
-                		if (file_exists($dir.$objMod->conflictwith[$i].".class.php"))
-                		{
-                			unActivateModule($objMod->conflictwith[$i], 0);
-                		}
-                	}
-                }
-            }
-        }
-    }
+			if (isset($objMod->conflictwith) && is_array($objMod->conflictwith) && !empty($objMod->conflictwith))
+			{
+				// Desactivation des modules qui entrent en conflit
+				$num = count($objMod->conflictwith);
+				for ($i = 0; $i < $num; $i++)
+				{
+					foreach ($modulesdir as $dir)
+					{
+						if (file_exists($dir.$objMod->conflictwith[$i].".class.php"))
+						{
+							unActivateModule($objMod->conflictwith[$i], 0);
+						}
+					}
+				}
+			}
+		}
+	}
 
-    if (!count($ret['errors']))
-    {
-        $ret['nbmodules']++;
-        $ret['nbperms'] += count($objMod->rights);
-    }
+	if (!count($ret['errors']))
+	{
+		$ret['nbmodules']++;
+		$ret['nbperms'] += count($objMod->rights);
+	}
 
-    return $ret;
+	return $ret;
 }
 
 
@@ -1036,59 +1058,59 @@ function activateModule($value, $withdeps = 1)
  */
 function unActivateModule($value, $requiredby = 1)
 {
-    global $db, $modules, $conf;
+	global $db, $modules, $conf;
 
-    // Check parameters
-    if (empty($value)) return 'ErrorBadParameter';
+	// Check parameters
+	if (empty($value)) return 'ErrorBadParameter';
 
-    $ret = '';
-    $modName = $value;
-    $modFile = $modName.".class.php";
+	$ret = '';
+	$modName = $value;
+	$modFile = $modName.".class.php";
 
-    // Loop on each directory to fill $modulesdir
-    $modulesdir = dolGetModulesDirs();
+	// Loop on each directory to fill $modulesdir
+	$modulesdir = dolGetModulesDirs();
 
-    // Loop on each modulesdir directories
-    $found = false;
-    foreach ($modulesdir as $dir)
-    {
-        if (file_exists($dir.$modFile))
-        {
-            $found = @include_once $dir.$modFile;
-            if ($found) break;
-        }
-    }
+	// Loop on each modulesdir directories
+	$found = false;
+	foreach ($modulesdir as $dir)
+	{
+		if (file_exists($dir.$modFile))
+		{
+			$found = @include_once $dir.$modFile;
+			if ($found) break;
+		}
+	}
 
-    if ($found)
-    {
-        $objMod = new $modName($db);
-        $result = $objMod->remove();
-        if ($result <= 0) $ret = $objMod->error;
-    } else // We come here when we try to unactivate a module when module does not exists anymore in sources
-    {
-        //print $dir.$modFile;exit;
-    	// TODO Replace this after DolibarrModules is moved as abstract class with a try catch to show module we try to disable has not been found or could not be loaded
-        include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
-    	$genericMod = new DolibarrModules($db);
-        $genericMod->name = preg_replace('/^mod/i', '', $modName);
-        $genericMod->rights_class = strtolower(preg_replace('/^mod/i', '', $modName));
-        $genericMod->const_name = 'MAIN_MODULE_'.strtoupper(preg_replace('/^mod/i', '', $modName));
-        dol_syslog("modules::unActivateModule Failed to find module file, we use generic function with name ".$modName);
-        $genericMod->remove('');
-    }
+	if ($found)
+	{
+		$objMod = new $modName($db);
+		$result = $objMod->remove();
+		if ($result <= 0) $ret = $objMod->error;
+	} else // We come here when we try to unactivate a module when module does not exists anymore in sources
+	{
+		//print $dir.$modFile;exit;
+		// TODO Replace this after DolibarrModules is moved as abstract class with a try catch to show module we try to disable has not been found or could not be loaded
+		include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
+		$genericMod = new DolibarrModules($db);
+		$genericMod->name = preg_replace('/^mod/i', '', $modName);
+		$genericMod->rights_class = strtolower(preg_replace('/^mod/i', '', $modName));
+		$genericMod->const_name = 'MAIN_MODULE_'.strtoupper(preg_replace('/^mod/i', '', $modName));
+		dol_syslog("modules::unActivateModule Failed to find module file, we use generic function with name ".$modName);
+		$genericMod->remove('');
+	}
 
-    // Disable modules that depends on module we disable
-    if (!$ret && $requiredby && is_object($objMod) && is_array($objMod->requiredby))
-    {
-        $countrb = count($objMod->requiredby);
-        for ($i = 0; $i < $countrb; $i++)
-        {
-            //var_dump($objMod->requiredby[$i]);
-            unActivateModule($objMod->requiredby[$i]);
-        }
-    }
+	// Disable modules that depends on module we disable
+	if (!$ret && $requiredby && is_object($objMod) && is_array($objMod->requiredby))
+	{
+		$countrb = count($objMod->requiredby);
+		for ($i = 0; $i < $countrb; $i++)
+		{
+			//var_dump($objMod->requiredby[$i]);
+			unActivateModule($objMod->requiredby[$i]);
+		}
+	}
 
-    return $ret;
+	return $ret;
 }
 
 
@@ -1112,53 +1134,53 @@ function unActivateModule($value, $requiredby = 1)
  */
 function complete_dictionary_with_modules(&$taborder, &$tabname, &$tablib, &$tabsql, &$tabsqlsort, &$tabfield, &$tabfieldvalue, &$tabfieldinsert, &$tabrowid, &$tabcond, &$tabhelp, &$tabfieldcheck)
 {
-    global $db, $modules, $conf, $langs;
+	global $db, $modules, $conf, $langs;
 
-    dol_syslog("complete_dictionary_with_modules Search external modules to complete the list of dictionnary tables", LOG_DEBUG, 1);
+	dol_syslog("complete_dictionary_with_modules Search external modules to complete the list of dictionnary tables", LOG_DEBUG, 1);
 
-    // Search modules
+	// Search modules
 	$modulesdir = dolGetModulesDirs();
-    $i = 0; // is a sequencer of modules found
-    $j = 0; // j is module number. Automatically affected if module number not defined.
+	$i = 0; // is a sequencer of modules found
+	$j = 0; // j is module number. Automatically affected if module number not defined.
 
-    foreach ($modulesdir as $dir)
-    {
-    	// Load modules attributes in arrays (name, numero, orders) from dir directory
-    	//print $dir."\n<br>";
-    	dol_syslog("Scan directory ".$dir." for modules");
-        $handle = @opendir(dol_osencode($dir));
-        if (is_resource($handle))
-        {
-            while (($file = readdir($handle)) !== false)
-            {
-                //print "$i ".$file."\n<br>";
-                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);
+	foreach ($modulesdir as $dir)
+	{
+		// Load modules attributes in arrays (name, numero, orders) from dir directory
+		//print $dir."\n<br>";
+		dol_syslog("Scan directory ".$dir." for modules");
+		$handle = @opendir(dol_osencode($dir));
+		if (is_resource($handle))
+		{
+			while (($file = readdir($handle)) !== false)
+			{
+				//print "$i ".$file."\n<br>";
+				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)
-                    {
-                        include_once $dir.$file;
-                        $objMod = new $modName($db);
+					if ($modName)
+					{
+						include_once $dir.$file;
+						$objMod = new $modName($db);
 
-                        if ($objMod->numero > 0)
-                        {
-                            $j = $objMod->numero;
-                        } else {
-                            $j = 1000 + $i;
-                        }
+						if ($objMod->numero > 0)
+						{
+							$j = $objMod->numero;
+						} else {
+							$j = 1000 + $i;
+						}
 
-                        $modulequalified = 1;
+						$modulequalified = 1;
 
-                        // We discard modules according to features level (PS: if module is activated we always show it)
-                        $const_name = 'MAIN_MODULE_'.strtoupper(preg_replace('/^mod/i', '', get_class($objMod)));
-                        if ($objMod->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2 && !$conf->global->$const_name) $modulequalified = 0;
-                        if ($objMod->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1 && !$conf->global->$const_name) $modulequalified = 0;
-                        //If module is not activated disqualified
-                        if (empty($conf->global->$const_name)) $modulequalified = 0;
+						// We discard modules according to features level (PS: if module is activated we always show it)
+						$const_name = 'MAIN_MODULE_'.strtoupper(preg_replace('/^mod/i', '', get_class($objMod)));
+						if ($objMod->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2 && !$conf->global->$const_name) $modulequalified = 0;
+						if ($objMod->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1 && !$conf->global->$const_name) $modulequalified = 0;
+						//If module is not activated disqualified
+						if (empty($conf->global->$const_name)) $modulequalified = 0;
 
-                        if ($modulequalified)
-                        {
+						if ($modulequalified)
+						{
 							// Load languages files of module
 							if (isset($objMod->langfiles) && is_array($objMod->langfiles)) {
 								foreach ($objMod->langfiles as $langfile) {
@@ -1166,49 +1188,49 @@ function complete_dictionary_with_modules(&$taborder, &$tabname, &$tablib, &$tab
 								}
 							}
 
-                            // Complete the arrays &$tabname,&$tablib,&$tabsql,&$tabsqlsort,&$tabfield,&$tabfieldvalue,&$tabfieldinsert,&$tabrowid,&$tabcond
-                            if (empty($objMod->dictionaries) && !empty($objMod->dictionnaries)) $objMod->dictionaries = $objMod->dictionnaries; // For backward compatibility
+							// Complete the arrays &$tabname,&$tablib,&$tabsql,&$tabsqlsort,&$tabfield,&$tabfieldvalue,&$tabfieldinsert,&$tabrowid,&$tabcond
+							if (empty($objMod->dictionaries) && !empty($objMod->dictionnaries)) $objMod->dictionaries = $objMod->dictionnaries; // For backward compatibility
 
-                            if (!empty($objMod->dictionaries))
-                            {
-                                //var_dump($objMod->dictionaries['tabname']);
-                                $nbtabname = $nbtablib = $nbtabsql = $nbtabsqlsort = $nbtabfield = $nbtabfieldvalue = $nbtabfieldinsert = $nbtabrowid = $nbtabcond = $nbtabfieldcheck = $nbtabhelp = 0;
-                                foreach ($objMod->dictionaries['tabname'] as $val) { $nbtabname++; $taborder[] = max($taborder) + 1; $tabname[] = $val; }		// Position
-                                foreach ($objMod->dictionaries['tablib'] as $val) { $nbtablib++; $tablib[] = $val; }
-                                foreach ($objMod->dictionaries['tabsql'] as $val) { $nbtabsql++; $tabsql[] = $val; }
-                                foreach ($objMod->dictionaries['tabsqlsort'] as $val) { $nbtabsqlsort++; $tabsqlsort[] = $val; }
-                                foreach ($objMod->dictionaries['tabfield'] as $val) { $nbtabfield++; $tabfield[] = $val; }
-                                foreach ($objMod->dictionaries['tabfieldvalue'] as $val) { $nbtabfieldvalue++; $tabfieldvalue[] = $val; }
-                                foreach ($objMod->dictionaries['tabfieldinsert'] as $val) { $nbtabfieldinsert++; $tabfieldinsert[] = $val; }
-                                foreach ($objMod->dictionaries['tabrowid'] as $val) { $nbtabrowid++; $tabrowid[] = $val; }
-                                foreach ($objMod->dictionaries['tabcond'] as $val) { $nbtabcond++; $tabcond[] = $val; }
-                                if (!empty($objMod->dictionaries['tabhelp']))       foreach ($objMod->dictionaries['tabhelp'] as $val) { $nbtabhelp++; $tabhelp[] = $val; }
-                                if (!empty($objMod->dictionaries['tabfieldcheck'])) foreach ($objMod->dictionaries['tabfieldcheck'] as $val) { $nbtabfieldcheck++; $tabfieldcheck[] = $val; }
+							if (!empty($objMod->dictionaries))
+							{
+								//var_dump($objMod->dictionaries['tabname']);
+								$nbtabname = $nbtablib = $nbtabsql = $nbtabsqlsort = $nbtabfield = $nbtabfieldvalue = $nbtabfieldinsert = $nbtabrowid = $nbtabcond = $nbtabfieldcheck = $nbtabhelp = 0;
+								foreach ($objMod->dictionaries['tabname'] as $val) { $nbtabname++; $taborder[] = max($taborder) + 1; $tabname[] = $val; }		// Position
+								foreach ($objMod->dictionaries['tablib'] as $val) { $nbtablib++; $tablib[] = $val; }
+								foreach ($objMod->dictionaries['tabsql'] as $val) { $nbtabsql++; $tabsql[] = $val; }
+								foreach ($objMod->dictionaries['tabsqlsort'] as $val) { $nbtabsqlsort++; $tabsqlsort[] = $val; }
+								foreach ($objMod->dictionaries['tabfield'] as $val) { $nbtabfield++; $tabfield[] = $val; }
+								foreach ($objMod->dictionaries['tabfieldvalue'] as $val) { $nbtabfieldvalue++; $tabfieldvalue[] = $val; }
+								foreach ($objMod->dictionaries['tabfieldinsert'] as $val) { $nbtabfieldinsert++; $tabfieldinsert[] = $val; }
+								foreach ($objMod->dictionaries['tabrowid'] as $val) { $nbtabrowid++; $tabrowid[] = $val; }
+								foreach ($objMod->dictionaries['tabcond'] as $val) { $nbtabcond++; $tabcond[] = $val; }
+								if (!empty($objMod->dictionaries['tabhelp']))       foreach ($objMod->dictionaries['tabhelp'] as $val) { $nbtabhelp++; $tabhelp[] = $val; }
+								if (!empty($objMod->dictionaries['tabfieldcheck'])) foreach ($objMod->dictionaries['tabfieldcheck'] as $val) { $nbtabfieldcheck++; $tabfieldcheck[] = $val; }
 
-                                if ($nbtabname != $nbtablib || $nbtablib != $nbtabsql || $nbtabsql != $nbtabsqlsort)
-                                {
-                                    print 'Error in descriptor of module '.$const_name.'. Array ->dictionaries has not same number of record for key "tabname", "tablib", "tabsql" and "tabsqlsort"';
-                                    //print "$const_name: $nbtabname=$nbtablib=$nbtabsql=$nbtabsqlsort=$nbtabfield=$nbtabfieldvalue=$nbtabfieldinsert=$nbtabrowid=$nbtabcond=$nbtabfieldcheck=$nbtabhelp\n";
-                                } else {
-                                	$taborder[] = 0; // Add an empty line
-                                }
-                            }
+								if ($nbtabname != $nbtablib || $nbtablib != $nbtabsql || $nbtabsql != $nbtabsqlsort)
+								{
+									print 'Error in descriptor of module '.$const_name.'. Array ->dictionaries has not same number of record for key "tabname", "tablib", "tabsql" and "tabsqlsort"';
+									//print "$const_name: $nbtabname=$nbtablib=$nbtabsql=$nbtabsqlsort=$nbtabfield=$nbtabfieldvalue=$nbtabfieldinsert=$nbtabrowid=$nbtabcond=$nbtabfieldcheck=$nbtabhelp\n";
+								} else {
+									$taborder[] = 0; // Add an empty line
+								}
+							}
 
-                            $j++;
-                            $i++;
-                        } else dol_syslog("Module ".get_class($objMod)." not qualified");
-                    }
-                }
-            }
-            closedir($handle);
-        } else {
-            dol_syslog("htdocs/admin/modules.php: Failed to open directory ".$dir.". See permission and open_basedir option.", LOG_WARNING);
-        }
-    }
+							$j++;
+							$i++;
+						} else dol_syslog("Module ".get_class($objMod)." not qualified");
+					}
+				}
+			}
+			closedir($handle);
+		} else {
+			dol_syslog("htdocs/admin/modules.php: Failed to open directory ".$dir.". See permission and open_basedir option.", LOG_WARNING);
+		}
+	}
 
-    dol_syslog("", LOG_DEBUG, -1);
+	dol_syslog("", LOG_DEBUG, -1);
 
-    return 1;
+	return 1;
 }
 
 /**
@@ -1280,95 +1302,95 @@ function activateModulesRequiredByCountry($country_code)
  */
 function complete_elementList_with_modules(&$elementList)
 {
-    global $db, $modules, $conf, $langs;
+	global $db, $modules, $conf, $langs;
 
-    // Search modules
-    $filename = array();
-    $modules = array();
-    $orders = array();
-    $categ = array();
-    $dirmod = array();
+	// Search modules
+	$filename = array();
+	$modules = array();
+	$orders = array();
+	$categ = array();
+	$dirmod = array();
 
-    $i = 0; // is a sequencer of modules found
-    $j = 0; // j is module number. Automatically affected if module number not defined.
+	$i = 0; // is a sequencer of modules found
+	$j = 0; // j is module number. Automatically affected if module number not defined.
 
-    dol_syslog("complete_elementList_with_modules Search external modules to complete the list of contact element", LOG_DEBUG, 1);
+	dol_syslog("complete_elementList_with_modules Search external modules to complete the list of contact element", LOG_DEBUG, 1);
 
-    $modulesdir = dolGetModulesDirs();
+	$modulesdir = dolGetModulesDirs();
 
-    foreach ($modulesdir as $dir)
-    {
-    	// Load modules attributes in arrays (name, numero, orders) from dir directory
-    	//print $dir."\n<br>";
-    	dol_syslog("Scan directory ".$dir." for modules");
-        $handle = @opendir(dol_osencode($dir));
-        if (is_resource($handle))
-        {
-            while (($file = readdir($handle)) !== false)
-            {
-                //print "$i ".$file."\n<br>";
-                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);
+	foreach ($modulesdir as $dir)
+	{
+		// Load modules attributes in arrays (name, numero, orders) from dir directory
+		//print $dir."\n<br>";
+		dol_syslog("Scan directory ".$dir." for modules");
+		$handle = @opendir(dol_osencode($dir));
+		if (is_resource($handle))
+		{
+			while (($file = readdir($handle)) !== false)
+			{
+				//print "$i ".$file."\n<br>";
+				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)
-                    {
-                        include_once $dir.$file;
-                        $objMod = new $modName($db);
+					if ($modName)
+					{
+						include_once $dir.$file;
+						$objMod = new $modName($db);
 
-                        if ($objMod->numero > 0)
-                        {
-                            $j = $objMod->numero;
-                        } else {
-                            $j = 1000 + $i;
-                        }
+						if ($objMod->numero > 0)
+						{
+							$j = $objMod->numero;
+						} else {
+							$j = 1000 + $i;
+						}
 
-                        $modulequalified = 1;
+						$modulequalified = 1;
 
-                        // We discard modules according to features level (PS: if module is activated we always show it)
-                        $const_name = 'MAIN_MODULE_'.strtoupper(preg_replace('/^mod/i', '', get_class($objMod)));
-                        if ($objMod->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2 && !$conf->global->$const_name) $modulequalified = 0;
-                        if ($objMod->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1 && !$conf->global->$const_name) $modulequalified = 0;
-                        //If module is not activated disqualified
-                        if (empty($conf->global->$const_name)) $modulequalified = 0;
+						// We discard modules according to features level (PS: if module is activated we always show it)
+						$const_name = 'MAIN_MODULE_'.strtoupper(preg_replace('/^mod/i', '', get_class($objMod)));
+						if ($objMod->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2 && !$conf->global->$const_name) $modulequalified = 0;
+						if ($objMod->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1 && !$conf->global->$const_name) $modulequalified = 0;
+						//If module is not activated disqualified
+						if (empty($conf->global->$const_name)) $modulequalified = 0;
 
-                        if ($modulequalified)
-                        {
+						if ($modulequalified)
+						{
 							// Load languages files of module
-                            if (isset($objMod->langfiles) && is_array($objMod->langfiles))
-                            {
-                             	foreach ($objMod->langfiles as $langfile)
-                              	{
-                               		$langs->load($langfile);
-                               	}
-                           	}
+							if (isset($objMod->langfiles) && is_array($objMod->langfiles))
+							{
+							 	foreach ($objMod->langfiles as $langfile)
+							  	{
+							   		$langs->load($langfile);
+							   	}
+						   	}
 
-                            $modules[$i] = $objMod;
-                            $filename[$i] = $modName;
-                            $orders[$i]  = $objMod->family."_".$j; // Sort on family then module number
-                            $dirmod[$i] = $dir;
-                            //print "x".$modName." ".$orders[$i]."\n<br>";
+							$modules[$i] = $objMod;
+							$filename[$i] = $modName;
+							$orders[$i]  = $objMod->family."_".$j; // Sort on family then module number
+							$dirmod[$i] = $dir;
+							//print "x".$modName." ".$orders[$i]."\n<br>";
 
-                            if (!empty($objMod->module_parts['contactelement']))
-                            {
-                            	$elementList[$objMod->name] = $langs->trans($objMod->name);
-                            }
+							if (!empty($objMod->module_parts['contactelement']))
+							{
+								$elementList[$objMod->name] = $langs->trans($objMod->name);
+							}
 
-                            $j++;
-                            $i++;
-                        } else dol_syslog("Module ".get_class($objMod)." not qualified");
-                    }
-                }
-            }
-            closedir($handle);
-        } else {
-            dol_syslog("htdocs/admin/modules.php: Failed to open directory ".$dir.". See permission and open_basedir option.", LOG_WARNING);
-        }
-    }
+							$j++;
+							$i++;
+						} else dol_syslog("Module ".get_class($objMod)." not qualified");
+					}
+				}
+			}
+			closedir($handle);
+		} else {
+			dol_syslog("htdocs/admin/modules.php: Failed to open directory ".$dir.". See permission and open_basedir option.", LOG_WARNING);
+		}
+	}
 
-    dol_syslog("", LOG_DEBUG, -1);
+	dol_syslog("", LOG_DEBUG, -1);
 
-    return 1;
+	return 1;
 }
 
 /**
@@ -1382,201 +1404,201 @@ function complete_elementList_with_modules(&$elementList)
  */
 function form_constantes($tableau, $strictw3c = 0, $helptext = '')
 {
-    global $db, $langs, $conf, $user;
-    global $_Avery_Labels;
+	global $db, $langs, $conf, $user;
+	global $_Avery_Labels;
 
-    $form = new Form($db);
+	$form = new Form($db);
 
-    if (empty($strictw3c)) {
-    	dol_syslog("Warning: Function form_constantes is calle with parameter strictw3c = 0, this is deprecated. Value must be 2 now.", LOG_DEBUG);
-    }
-    if (!empty($strictw3c) && $strictw3c == 1)
-    {
-        print "\n".'<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-        print '<input type="hidden" name="token" value="'.newToken().'">';
-        print '<input type="hidden" name="action" value="updateall">';
-    }
+	if (empty($strictw3c)) {
+		dol_syslog("Warning: Function form_constantes is calle with parameter strictw3c = 0, this is deprecated. Value must be 2 now.", LOG_DEBUG);
+	}
+	if (!empty($strictw3c) && $strictw3c == 1)
+	{
+		print "\n".'<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+		print '<input type="hidden" name="token" value="'.newToken().'">';
+		print '<input type="hidden" name="action" value="updateall">';
+	}
 
-    print '<table class="noborder centpercent">';
-    print '<tr class="liste_titre">';
-    print '<td class="titlefield">'.$langs->trans("Description").'</td>';
-    print '<td>';
-    $text = $langs->trans("Value");
-    print $form->textwithpicto($text, $helptext, 1, 'help', '', 0, 2, 'idhelptext');
-    print '</td>';
-    if (empty($strictw3c)) print '<td class="center" width="80">'.$langs->trans("Action").'</td>';
-    print "</tr>\n";
+	print '<table class="noborder centpercent">';
+	print '<tr class="liste_titre">';
+	print '<td class="titlefield">'.$langs->trans("Description").'</td>';
+	print '<td>';
+	$text = $langs->trans("Value");
+	print $form->textwithpicto($text, $helptext, 1, 'help', '', 0, 2, 'idhelptext');
+	print '</td>';
+	if (empty($strictw3c)) print '<td class="center" width="80">'.$langs->trans("Action").'</td>';
+	print "</tr>\n";
 
-    $label = '';
-    foreach ($tableau as $key => $const)	// Loop on each param
-    {
-    	$label = '';
-    	// $const is a const key like 'MYMODULE_ABC'
-    	if (is_numeric($key)) {		// Very old behaviour
-    		$type = 'string';
-    	} else {
-    		if (is_array($const))
-    		{
-    			$type = $const['type'];
+	$label = '';
+	foreach ($tableau as $key => $const)	// Loop on each param
+	{
+		$label = '';
+		// $const is a const key like 'MYMODULE_ABC'
+		if (is_numeric($key)) {		// Very old behaviour
+			$type = 'string';
+		} else {
+			if (is_array($const))
+			{
+				$type = $const['type'];
 				$label = $const['label'];
-    			$const = $key;
-    		} else {
-    			$type = $const;
-    			$const = $key;
-    		}
-    	}
+				$const = $key;
+			} else {
+				$type = $const;
+				$const = $key;
+			}
+		}
 
-        $sql = "SELECT ";
-        $sql .= "rowid";
-        $sql .= ", ".$db->decrypt('name')." as name";
-        $sql .= ", ".$db->decrypt('value')." as value";
-        $sql .= ", type";
-        $sql .= ", note";
-        $sql .= " FROM ".MAIN_DB_PREFIX."const";
-        $sql .= " WHERE ".$db->decrypt('name')." = '".$db->escape($const)."'";
-        $sql .= " AND entity IN (0, ".$conf->entity.")";
-        $sql .= " ORDER BY name ASC, entity DESC";
-        $result = $db->query($sql);
+		$sql = "SELECT ";
+		$sql .= "rowid";
+		$sql .= ", ".$db->decrypt('name')." as name";
+		$sql .= ", ".$db->decrypt('value')." as value";
+		$sql .= ", type";
+		$sql .= ", note";
+		$sql .= " FROM ".MAIN_DB_PREFIX."const";
+		$sql .= " WHERE ".$db->decrypt('name')." = '".$db->escape($const)."'";
+		$sql .= " AND entity IN (0, ".$conf->entity.")";
+		$sql .= " ORDER BY name ASC, entity DESC";
+		$result = $db->query($sql);
 
-        dol_syslog("List params", LOG_DEBUG);
-        if ($result)
-        {
-            $obj = $db->fetch_object($result); // Take first result of select
+		dol_syslog("List params", LOG_DEBUG);
+		if ($result)
+		{
+			$obj = $db->fetch_object($result); // Take first result of select
 
-            if (empty($obj))	// If not yet into table
-            {
-            	$obj = (object) array('rowid'=>'', 'name'=>$const, 'value'=>'', 'type'=>$type, 'note'=>'');
-            }
+			if (empty($obj))	// If not yet into table
+			{
+				$obj = (object) array('rowid'=>'', 'name'=>$const, 'value'=>'', 'type'=>$type, 'note'=>'');
+			}
 
-            if (empty($strictw3c))
-            {
-            	print "\n".'<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-            	print '<input type="hidden" name="token" value="'.newToken().'">';
-            }
+			if (empty($strictw3c))
+			{
+				print "\n".'<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+				print '<input type="hidden" name="token" value="'.newToken().'">';
+			}
 
-            print '<tr class="oddeven">';
+			print '<tr class="oddeven">';
 
-            // Show constant
-            print '<td>';
-            if (empty($strictw3c)) print '<input type="hidden" name="action" value="update">';
-            print '<input type="hidden" name="rowid'.(empty($strictw3c) ? '' : '[]').'" value="'.$obj->rowid.'">';
-            print '<input type="hidden" name="constname'.(empty($strictw3c) ? '' : '[]').'" value="'.$const.'">';
-            print '<input type="hidden" name="constnote_'.$obj->name.'" value="'.nl2br(dol_escape_htmltag($obj->note)).'">';
-            print '<input type="hidden" name="consttype_'.$obj->name.'" value="'.($obj->type ? $obj->type : 'string').'">';
+			// Show constant
+			print '<td>';
+			if (empty($strictw3c)) print '<input type="hidden" name="action" value="update">';
+			print '<input type="hidden" name="rowid'.(empty($strictw3c) ? '' : '[]').'" value="'.$obj->rowid.'">';
+			print '<input type="hidden" name="constname'.(empty($strictw3c) ? '' : '[]').'" value="'.$const.'">';
+			print '<input type="hidden" name="constnote_'.$obj->name.'" value="'.nl2br(dol_escape_htmltag($obj->note)).'">';
+			print '<input type="hidden" name="consttype_'.$obj->name.'" value="'.($obj->type ? $obj->type : 'string').'">';
 
-            print ($label ? $label : $langs->trans('Desc'.$const));
+			print ($label ? $label : $langs->trans('Desc'.$const));
 
-            if ($const == 'ADHERENT_MAILMAN_URL')
-            {
-                print '. '.$langs->trans("Example").': <a href="#" id="exampleclick1">'.img_down().'</a><br>';
-                //print 'http://lists.exampe.com/cgi-bin/mailman/admin/%LISTE%/members?adminpw=%MAILMAN_ADMINPW%&subscribees=%EMAIL%&send_welcome_msg_to_this_batch=1';
-                print '<div id="example1" class="hidden">';
-                print 'http://lists.example.com/cgi-bin/mailman/admin/%LISTE%/members/add?subscribees_upload=%EMAIL%&amp;adminpw=%MAILMAN_ADMINPW%&amp;subscribe_or_invite=0&amp;send_welcome_msg_to_this_batch=0&amp;notification_to_list_owner=0';
-                print '</div>';
-            }
-            if ($const == 'ADHERENT_MAILMAN_UNSUB_URL')
-            {
-                print '. '.$langs->trans("Example").': <a href="#" id="exampleclick2">'.img_down().'</a><br>';
-                print '<div id="example2" class="hidden">';
-                print 'http://lists.example.com/cgi-bin/mailman/admin/%LISTE%/members/remove?unsubscribees_upload=%EMAIL%&amp;adminpw=%MAILMAN_ADMINPW%&amp;send_unsub_ack_to_this_batch=0&amp;send_unsub_notifications_to_list_owner=0';
-                print '</div>';
-                //print 'http://lists.example.com/cgi-bin/mailman/admin/%LISTE%/members/remove?adminpw=%MAILMAN_ADMINPW%&unsubscribees=%EMAIL%';
-            }
-            if ($const == 'ADHERENT_MAILMAN_LISTS')
-            {
-            	print '. '.$langs->trans("Example").': <a href="#" id="exampleclick3">'.img_down().'</a><br>';
-            	print '<div id="example3" class="hidden">';
-            	print 'mymailmanlist<br>';
-            	print 'mymailmanlist1,mymailmanlist2<br>';
-            	print 'TYPE:Type1:mymailmanlist1,TYPE:Type2:mymailmanlist2<br>';
-            	if ($conf->categorie->enabled) print 'CATEG:Categ1:mymailmanlist1,CATEG:Categ2:mymailmanlist2<br>';
-            	print '</div>';
-            	//print 'http://lists.example.com/cgi-bin/mailman/admin/%LISTE%/members/remove?adminpw=%MAILMAN_ADMINPW%&unsubscribees=%EMAIL%';
-            }
+			if ($const == 'ADHERENT_MAILMAN_URL')
+			{
+				print '. '.$langs->trans("Example").': <a href="#" id="exampleclick1">'.img_down().'</a><br>';
+				//print 'http://lists.exampe.com/cgi-bin/mailman/admin/%LISTE%/members?adminpw=%MAILMAN_ADMINPW%&subscribees=%EMAIL%&send_welcome_msg_to_this_batch=1';
+				print '<div id="example1" class="hidden">';
+				print 'http://lists.example.com/cgi-bin/mailman/admin/%LISTE%/members/add?subscribees_upload=%EMAIL%&amp;adminpw=%MAILMAN_ADMINPW%&amp;subscribe_or_invite=0&amp;send_welcome_msg_to_this_batch=0&amp;notification_to_list_owner=0';
+				print '</div>';
+			}
+			if ($const == 'ADHERENT_MAILMAN_UNSUB_URL')
+			{
+				print '. '.$langs->trans("Example").': <a href="#" id="exampleclick2">'.img_down().'</a><br>';
+				print '<div id="example2" class="hidden">';
+				print 'http://lists.example.com/cgi-bin/mailman/admin/%LISTE%/members/remove?unsubscribees_upload=%EMAIL%&amp;adminpw=%MAILMAN_ADMINPW%&amp;send_unsub_ack_to_this_batch=0&amp;send_unsub_notifications_to_list_owner=0';
+				print '</div>';
+				//print 'http://lists.example.com/cgi-bin/mailman/admin/%LISTE%/members/remove?adminpw=%MAILMAN_ADMINPW%&unsubscribees=%EMAIL%';
+			}
+			if ($const == 'ADHERENT_MAILMAN_LISTS')
+			{
+				print '. '.$langs->trans("Example").': <a href="#" id="exampleclick3">'.img_down().'</a><br>';
+				print '<div id="example3" class="hidden">';
+				print 'mymailmanlist<br>';
+				print 'mymailmanlist1,mymailmanlist2<br>';
+				print 'TYPE:Type1:mymailmanlist1,TYPE:Type2:mymailmanlist2<br>';
+				if ($conf->categorie->enabled) print 'CATEG:Categ1:mymailmanlist1,CATEG:Categ2:mymailmanlist2<br>';
+				print '</div>';
+				//print 'http://lists.example.com/cgi-bin/mailman/admin/%LISTE%/members/remove?adminpw=%MAILMAN_ADMINPW%&unsubscribees=%EMAIL%';
+			}
 
-            print "</td>\n";
+			print "</td>\n";
 
-            // Value
-            if ($const == 'ADHERENT_CARD_TYPE' || $const == 'ADHERENT_ETIQUETTE_TYPE')
-            {
-                print '<td>';
-                // List of possible labels (defined into $_Avery_Labels variable set into format_cards.lib.php)
-                require_once DOL_DOCUMENT_ROOT.'/core/lib/format_cards.lib.php';
-                $arrayoflabels = array();
-                foreach (array_keys($_Avery_Labels) as $codecards)
-                {
-                    $arrayoflabels[$codecards] = $_Avery_Labels[$codecards]['name'];
-                }
-                print $form->selectarray('constvalue'.(empty($strictw3c) ? '' : '[]'), $arrayoflabels, ($obj->value ? $obj->value : 'CARD'), 1, 0, 0);
-                print '<input type="hidden" name="consttype" value="yesno">';
-                print '<input type="hidden" name="constnote'.(empty($strictw3c) ? '' : '[]').'" value="'.nl2br(dol_escape_htmltag($obj->note)).'">';
-                print '</td>';
-            } else {
-                print '<td>';
-                print '<input type="hidden" name="consttype'.(empty($strictw3c) ? '' : '[]').'" value="'.($obj->type ? $obj->type : 'string').'">';
-                print '<input type="hidden" name="constnote'.(empty($strictw3c) ? '' : '[]').'" value="'.nl2br(dol_escape_htmltag($obj->note)).'">';
-                if ($obj->type == 'textarea' || in_array($const, array('ADHERENT_CARD_TEXT', 'ADHERENT_CARD_TEXT_RIGHT', 'ADHERENT_ETIQUETTE_TEXT')))
-                {
-                    print '<textarea class="flat" name="constvalue'.(empty($strictw3c) ? '' : '[]').'" cols="50" rows="5" wrap="soft">'."\n";
-                    print $obj->value;
-                    print "</textarea>\n";
-                } elseif ($obj->type == 'html')
-                {
-                	require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-                	$doleditor = new DolEditor('constvalue_'.$const.(empty($strictw3c) ? '' : '[]'), $obj->value, '', 160, 'dolibarr_notes', '', false, false, $conf->fckeditor->enabled, ROWS_5, '90%');
-                	$doleditor->Create();
-                } elseif ($obj->type == 'yesno')
-                {
-                	print $form->selectyesno('constvalue'.(empty($strictw3c) ? '' : '[]'), $obj->value, 1);
-                } elseif (preg_match('/emailtemplate/', $obj->type))
-                {
-                	include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
-                	$formmail = new FormMail($db);
+			// Value
+			if ($const == 'ADHERENT_CARD_TYPE' || $const == 'ADHERENT_ETIQUETTE_TYPE')
+			{
+				print '<td>';
+				// List of possible labels (defined into $_Avery_Labels variable set into format_cards.lib.php)
+				require_once DOL_DOCUMENT_ROOT.'/core/lib/format_cards.lib.php';
+				$arrayoflabels = array();
+				foreach (array_keys($_Avery_Labels) as $codecards)
+				{
+					$arrayoflabels[$codecards] = $_Avery_Labels[$codecards]['name'];
+				}
+				print $form->selectarray('constvalue'.(empty($strictw3c) ? '' : '[]'), $arrayoflabels, ($obj->value ? $obj->value : 'CARD'), 1, 0, 0);
+				print '<input type="hidden" name="consttype" value="yesno">';
+				print '<input type="hidden" name="constnote'.(empty($strictw3c) ? '' : '[]').'" value="'.nl2br(dol_escape_htmltag($obj->note)).'">';
+				print '</td>';
+			} else {
+				print '<td>';
+				print '<input type="hidden" name="consttype'.(empty($strictw3c) ? '' : '[]').'" value="'.($obj->type ? $obj->type : 'string').'">';
+				print '<input type="hidden" name="constnote'.(empty($strictw3c) ? '' : '[]').'" value="'.nl2br(dol_escape_htmltag($obj->note)).'">';
+				if ($obj->type == 'textarea' || in_array($const, array('ADHERENT_CARD_TEXT', 'ADHERENT_CARD_TEXT_RIGHT', 'ADHERENT_ETIQUETTE_TEXT')))
+				{
+					print '<textarea class="flat" name="constvalue'.(empty($strictw3c) ? '' : '[]').'" cols="50" rows="5" wrap="soft">'."\n";
+					print $obj->value;
+					print "</textarea>\n";
+				} elseif ($obj->type == 'html')
+				{
+					require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+					$doleditor = new DolEditor('constvalue_'.$const.(empty($strictw3c) ? '' : '[]'), $obj->value, '', 160, 'dolibarr_notes', '', false, false, $conf->fckeditor->enabled, ROWS_5, '90%');
+					$doleditor->Create();
+				} elseif ($obj->type == 'yesno')
+				{
+					print $form->selectyesno('constvalue'.(empty($strictw3c) ? '' : '[]'), $obj->value, 1);
+				} elseif (preg_match('/emailtemplate/', $obj->type))
+				{
+					include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
+					$formmail = new FormMail($db);
 
-                	$tmp = explode(':', $obj->type);
+					$tmp = explode(':', $obj->type);
 
-                	$nboftemplates = $formmail->fetchAllEMailTemplate($tmp[1], $user, null, -1); // We set lang=null to get in priority record with no lang
-                	//$arraydefaultmessage = $formmail->getEMailTemplate($db, $tmp[1], $user, null, 0, 1, '');
-                	$arrayofmessagename = array();
-                	if (is_array($formmail->lines_model))
-                	{
-	                	foreach ($formmail->lines_model as $modelmail)
-	                	{
-	                		//var_dump($modelmail);
-	                		$moreonlabel = '';
-	                		if (!empty($arrayofmessagename[$modelmail->label])) $moreonlabel = ' <span class="opacitymedium">('.$langs->trans("SeveralLangugeVariatFound").')</span>';
-	                		// The 'label' is the key that is unique if we exclude the language
-	                		$arrayofmessagename[$modelmail->label.':'.$tmp[1]] = $langs->trans(preg_replace('/\(|\)/', '', $modelmail->label)).$moreonlabel;
-	                	}
-                	}
-                	//var_dump($arraydefaultmessage);
-                	//var_dump($arrayofmessagename);
-                	print $form->selectarray('constvalue_'.$obj->name, $arrayofmessagename, $obj->value.':'.$tmp[1], 'None', 0, 0, '', 0, 0, 0, '', '', 1);
-                } else // type = 'string' ou 'chaine'
-                {
-                    print '<input type="text" class="flat" size="48" name="constvalue'.(empty($strictw3c) ? '' : '[]').'" value="'.dol_escape_htmltag($obj->value).'">';
-                }
-                print '</td>';
-            }
-            // Submit
-            if (empty($strictw3c))
-            {
-            	print '<td class="center">';
-            	print '<input type="submit" class="button" value="'.$langs->trans("Update").'" name="Button">';
-	            print "</td>";
-            }
-    	    print "</tr>\n";
+					$nboftemplates = $formmail->fetchAllEMailTemplate($tmp[1], $user, null, -1); // We set lang=null to get in priority record with no lang
+					//$arraydefaultmessage = $formmail->getEMailTemplate($db, $tmp[1], $user, null, 0, 1, '');
+					$arrayofmessagename = array();
+					if (is_array($formmail->lines_model))
+					{
+						foreach ($formmail->lines_model as $modelmail)
+						{
+							//var_dump($modelmail);
+							$moreonlabel = '';
+							if (!empty($arrayofmessagename[$modelmail->label])) $moreonlabel = ' <span class="opacitymedium">('.$langs->trans("SeveralLangugeVariatFound").')</span>';
+							// The 'label' is the key that is unique if we exclude the language
+							$arrayofmessagename[$modelmail->label.':'.$tmp[1]] = $langs->trans(preg_replace('/\(|\)/', '', $modelmail->label)).$moreonlabel;
+						}
+					}
+					//var_dump($arraydefaultmessage);
+					//var_dump($arrayofmessagename);
+					print $form->selectarray('constvalue_'.$obj->name, $arrayofmessagename, $obj->value.':'.$tmp[1], 'None', 0, 0, '', 0, 0, 0, '', '', 1);
+				} else // type = 'string' ou 'chaine'
+				{
+					print '<input type="text" class="flat" size="48" name="constvalue'.(empty($strictw3c) ? '' : '[]').'" value="'.dol_escape_htmltag($obj->value).'">';
+				}
+				print '</td>';
+			}
+			// Submit
+			if (empty($strictw3c))
+			{
+				print '<td class="center">';
+				print '<input type="submit" class="button" value="'.$langs->trans("Update").'" name="Button">';
+				print "</td>";
+			}
+			print "</tr>\n";
 
-            if (empty($strictw3c)) print "</form>\n";
-        }
-    }
-    print '</table>';
+			if (empty($strictw3c)) print "</form>\n";
+		}
+	}
+	print '</table>';
 
-    if (!empty($strictw3c) && $strictw3c == 1)
-    {
-    	print '<div align="center"><input type="submit" class="button" value="'.$langs->trans("Update").'" name="update"></div>';
-    	print "</form>\n";
-    }
+	if (!empty($strictw3c) && $strictw3c == 1)
+	{
+		print '<div align="center"><input type="submit" class="button" value="'.$langs->trans("Update").'" name="update"></div>';
+		print "</form>\n";
+	}
 }
 
 
@@ -1629,13 +1651,13 @@ function addDocumentModel($name, $type, $label = '', $description = '')
 
 	$db->begin();
 
-    $sql = "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity, libelle, description)";
-    $sql .= " VALUES ('".$db->escape($name)."','".$db->escape($type)."',".$conf->entity.", ";
-    $sql .= ($label ? "'".$db->escape($label)."'" : 'null').", ";
-    $sql .= (!empty($description) ? "'".$db->escape($description)."'" : "null");
-    $sql .= ")";
+	$sql = "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity, libelle, description)";
+	$sql .= " VALUES ('".$db->escape($name)."','".$db->escape($type)."',".$conf->entity.", ";
+	$sql .= ($label ? "'".$db->escape($label)."'" : 'null').", ";
+	$sql .= (!empty($description) ? "'".$db->escape($description)."'" : "null");
+	$sql .= ")";
 
-    dol_syslog("admin.lib::addDocumentModel", LOG_DEBUG);
+	dol_syslog("admin.lib::addDocumentModel", LOG_DEBUG);
 	$resql = $db->query($sql);
 	if ($resql)
 	{
diff --git a/htdocs/core/lib/agenda.lib.php b/htdocs/core/lib/agenda.lib.php
index 0a4d57658d7..599ee983296 100644
--- a/htdocs/core/lib/agenda.lib.php
+++ b/htdocs/core/lib/agenda.lib.php
@@ -97,15 +97,15 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh
 
 		if ($conf->resource->enabled)
 		{
-		    include_once DOL_DOCUMENT_ROOT.'/resource/class/html.formresource.class.php';
-		    $formresource = new FormResource($db);
+			include_once DOL_DOCUMENT_ROOT.'/resource/class/html.formresource.class.php';
+			$formresource = new FormResource($db);
 
-    		// Resource
-		    print '<div class="divsearchfield">';
-		    print img_picto('', 'object_resource', 'class="fawidth30 inline-block"');
-		    print '<span class="hideonsmartphone">'.$langs->trans("Resource").'</span>';
-    		print $formresource->select_resource_list($resourceid, "search_resourceid", '', 1, 0, 0, null, '', 2, 0, 'maxwidth500');
-    		print '</div>';
+			// Resource
+			print '<div class="divsearchfield">';
+			print img_picto('', 'object_resource', 'class="fawidth30 inline-block"');
+			print '<span class="hideonsmartphone">'.$langs->trans("Resource").'</span>';
+			print $formresource->select_resource_list($resourceid, "search_resourceid", '', 1, 0, 0, null, '', 2, 0, 'maxwidth500');
+			print '</div>';
 		}
 	}
 
@@ -169,10 +169,10 @@ function show_array_actions_to_do($max = 5)
 	$sql .= " s.nom as sname, s.rowid, s.client";
 	$sql .= " FROM ".MAIN_DB_PREFIX."actioncomm as a LEFT JOIN ";
 	$sql .= " ".MAIN_DB_PREFIX."c_actioncomm as c ON c.id = a.fk_action";
-    $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON a.fk_soc = s.rowid";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON a.fk_soc = s.rowid";
 	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	$sql .= " WHERE a.entity IN (".getEntity('agenda').")";
-    $sql .= " AND ((a.percent >= 0 AND a.percent < 100) OR (a.percent = -1 AND a.datep2 > '".$db->idate($now)."'))";
+	$sql .= " AND ((a.percent >= 0 AND a.percent < 100) OR (a.percent = -1 AND a.datep2 > '".$db->idate($now)."'))";
 	if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
 	if ($socid) $sql .= " AND s.rowid = ".$socid;
 	$sql .= " ORDER BY a.datep DESC, a.id DESC";
@@ -181,48 +181,48 @@ function show_array_actions_to_do($max = 5)
 	$resql = $db->query($sql);
 	if ($resql)
 	{
-	    $num = $db->num_rows($resql);
+		$num = $db->num_rows($resql);
 
 		print '<div class="div-table-responsive-no-min">';
-	    print '<table class="noborder centpercent">';
-	    print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("LastActionsToDo", $max).'</th>';
+		print '<table class="noborder centpercent">';
+		print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("LastActionsToDo", $max).'</th>';
 		print '<th colspan="2" class="right"><a class="commonlink" href="'.DOL_URL_ROOT.'/comm/action/list.php?action=show_list&status=todo">'.$langs->trans("FullList").'</a></th>';
 		print '</tr>';
 
 		$var = true;
-	    $i = 0;
+		$i = 0;
 
 		$staticaction = new ActionComm($db);
-	    $customerstatic = new Client($db);
+		$customerstatic = new Client($db);
 
-        while ($i < $num)
-        {
-            $obj = $db->fetch_object($resql);
+		while ($i < $num)
+		{
+			$obj = $db->fetch_object($resql);
 
 
-            print '<tr class="oddeven">';
+			print '<tr class="oddeven">';
 
-            $staticaction->type_code = $obj->code;
-            $staticaction->label = ($obj->label ? $obj->label : $obj->type_label);
-            $staticaction->id = $obj->id;
-            print '<td>'.$staticaction->getNomUrl(1, 34).'</td>';
+			$staticaction->type_code = $obj->code;
+			$staticaction->label = ($obj->label ? $obj->label : $obj->type_label);
+			$staticaction->id = $obj->id;
+			print '<td>'.$staticaction->getNomUrl(1, 34).'</td>';
 
-            // print '<td>'.dol_trunc($obj->label,22).'</td>';
+			// print '<td>'.dol_trunc($obj->label,22).'</td>';
 
-            print '<td>';
-            if ($obj->rowid > 0)
-            {
-            	$customerstatic->id = $obj->rowid;
-            	$customerstatic->name = $obj->sname;
-            	$customerstatic->client = $obj->client;
-            	print $customerstatic->getNomUrl(1, '', 16);
-            }
-            print '</td>';
+			print '<td>';
+			if ($obj->rowid > 0)
+			{
+				$customerstatic->id = $obj->rowid;
+				$customerstatic->name = $obj->sname;
+				$customerstatic->client = $obj->client;
+				print $customerstatic->getNomUrl(1, '', 16);
+			}
+			print '</td>';
 
-            $datep = $db->jdate($obj->dp);
-            $datep2 = $db->jdate($obj->dp2);
+			$datep = $db->jdate($obj->dp);
+			$datep2 = $db->jdate($obj->dp2);
 
-            // Date
+			// Date
 			print '<td width="100" class="right tddate">'.dol_print_date($datep, 'day').'&nbsp;';
 			$late = 0;
 			if ($obj->percent == 0 && $datep && $datep < time()) $late = 1;
@@ -237,13 +237,13 @@ function show_array_actions_to_do($max = 5)
 
 			print "</tr>\n";
 
-            $i++;
-        }
-	    print "</table></div><br>";
+			$i++;
+		}
+		print "</table></div><br>";
 
-	    $db->free($resql);
+		$db->free($resql);
 	} else {
-	    dol_print_error($db);
+		dol_print_error($db);
 	}
 }
 
@@ -265,12 +265,12 @@ function show_array_last_actions_done($max = 5)
 	$sql .= " s.rowid, s.nom as sname, s.client";
 	$sql .= " FROM ".MAIN_DB_PREFIX."actioncomm as a LEFT JOIN ";
 	$sql .= " ".MAIN_DB_PREFIX."c_actioncomm as c ON c.id = a.fk_action ";
-    $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON a.fk_soc = s.rowid";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON a.fk_soc = s.rowid";
 	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	$sql .= " WHERE a.entity IN (".getEntity('agenda').")";
-    $sql .= " AND (a.percent >= 100 OR (a.percent = -1 AND a.datep2 <= '".$db->idate($now)."'))";
+	$sql .= " AND (a.percent >= 100 OR (a.percent = -1 AND a.datep2 <= '".$db->idate($now)."'))";
 	if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
-    if ($socid) $sql .= " AND s.rowid = ".$socid;
+	if ($socid) $sql .= " AND s.rowid = ".$socid;
 	$sql .= " ORDER BY a.datep2 DESC";
 	$sql .= $db->plimit($max, 0);
 
@@ -287,8 +287,8 @@ function show_array_last_actions_done($max = 5)
 		$var = true;
 		$i = 0;
 
-	    $staticaction = new ActionComm($db);
-	    $customerstatic = new Societe($db);
+		$staticaction = new ActionComm($db);
+		$customerstatic = new Societe($db);
 
 		while ($i < $num)
 		{
@@ -302,15 +302,15 @@ function show_array_last_actions_done($max = 5)
 			$staticaction->id = $obj->id;
 			print '<td>'.$staticaction->getNomUrl(1, 34).'</td>';
 
-            //print '<td>'.dol_trunc($obj->label,24).'</td>';
+			//print '<td>'.dol_trunc($obj->label,24).'</td>';
 
 			print '<td>';
 			if ($obj->rowid > 0)
 			{
-                $customerstatic->id = $obj->rowid;
-                $customerstatic->name = $obj->sname;
-                $customerstatic->client = $obj->client;
-			    print $customerstatic->getNomUrl(1, '', 24);
+				$customerstatic->id = $obj->rowid;
+				$customerstatic->name = $obj->sname;
+				$customerstatic->client = $obj->client;
+				print $customerstatic->getNomUrl(1, '', 24);
 			}
 			print '</td>';
 
@@ -358,10 +358,10 @@ function agenda_prepare_head()
 
 	if ($conf->global->MAIN_FEATURES_LEVEL > 0)
 	{
-	    $head[$h][0] = DOL_URL_ROOT."/admin/agenda_reminder.php";
-	    $head[$h][1] = $langs->trans("Reminders");
-	    $head[$h][2] = 'reminders';
-	    $h++;
+		$head[$h][0] = DOL_URL_ROOT."/admin/agenda_reminder.php";
+		$head[$h][1] = $langs->trans("Reminders");
+		$head[$h][2] = 'reminders';
+		$h++;
 	}
 
 	$head[$h][0] = DOL_URL_ROOT."/admin/agenda_xcal.php";
@@ -405,32 +405,32 @@ function actions_prepare_head($object)
 	$head[$h][2] = 'card';
 	$h++;
 
-    // Tab to link resources
+	// Tab to link resources
 	if ($conf->resource->enabled)
 	{
-	    include_once DOL_DOCUMENT_ROOT.'/resource/class/dolresource.class.php';
-	    $resource = new DolResource($db);
+		include_once DOL_DOCUMENT_ROOT.'/resource/class/dolresource.class.php';
+		$resource = new DolResource($db);
 
 		$head[$h][0] = DOL_URL_ROOT.'/resource/element_resource.php?element=action&element_id='.$object->id;
-        $listofresourcelinked = $resource->getElementResources($object->element, $object->id);
-        $nbResources = (is_array($listofresourcelinked) ?count($listofresourcelinked) : 0);
+		$listofresourcelinked = $resource->getElementResources($object->element, $object->id);
+		$nbResources = (is_array($listofresourcelinked) ?count($listofresourcelinked) : 0);
 		$head[$h][1] = $langs->trans("Resources");
 		if ($nbResources > 0) $head[$h][1] .= (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '<span class="badge marginleftonlyshort">'.($nbResources).'</span>' : '');
 		$head[$h][2] = 'resources';
 		$h++;
 	}
 
-    // Attached files
-    require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-    require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-    $upload_dir = $conf->agenda->dir_output."/".$object->id;
-    $nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
-    $nbLinks = Link::count($db, $object->element, $object->id);
-    $head[$h][0] = DOL_URL_ROOT.'/comm/action/document.php?id='.$object->id;
-    $head[$h][1] = $langs->trans("Documents");
-    if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>' : '');
-    $head[$h][2] = 'documents';
-    $h++;
+	// Attached files
+	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
+	$upload_dir = $conf->agenda->dir_output."/".$object->id;
+	$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
+	$nbLinks = Link::count($db, $object->element, $object->id);
+	$head[$h][0] = DOL_URL_ROOT.'/comm/action/document.php?id='.$object->id;
+	$head[$h][1] = $langs->trans("Documents");
+	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>' : '');
+	$head[$h][2] = 'documents';
+	$h++;
 
 	$head[$h][0] = DOL_URL_ROOT.'/comm/action/info.php?id='.$object->id;
 	$head[$h][1] = $langs->trans('Info');
@@ -453,55 +453,55 @@ function actions_prepare_head($object)
  */
 function calendars_prepare_head($param)
 {
-    global $langs, $conf, $user;
+	global $langs, $conf, $user;
 
-    $h = 0;
-    $head = array();
+	$h = 0;
+	$head = array();
 
-    $head[$h][0] = DOL_URL_ROOT.'/comm/action/list.php?action=show_list'.($param ? '&'.$param : '');
-    $head[$h][1] = $langs->trans("ViewList");
-    $head[$h][2] = 'cardlist';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT.'/comm/action/list.php?action=show_list'.($param ? '&'.$param : '');
+	$head[$h][1] = $langs->trans("ViewList");
+	$head[$h][2] = 'cardlist';
+	$h++;
 
-    $head[$h][0] = DOL_URL_ROOT.'/comm/action/index.php?action=show_month'.($param ? '&'.$param : '');
-    $head[$h][1] = $langs->trans("ViewCal");
-    $head[$h][2] = 'cardmonth';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT.'/comm/action/index.php?action=show_month'.($param ? '&'.$param : '');
+	$head[$h][1] = $langs->trans("ViewCal");
+	$head[$h][2] = 'cardmonth';
+	$h++;
 
-    $head[$h][0] = DOL_URL_ROOT.'/comm/action/index.php?action=show_week'.($param ? '&'.$param : '');
-    $head[$h][1] = $langs->trans("ViewWeek");
-    $head[$h][2] = 'cardweek';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT.'/comm/action/index.php?action=show_week'.($param ? '&'.$param : '');
+	$head[$h][1] = $langs->trans("ViewWeek");
+	$head[$h][2] = 'cardweek';
+	$h++;
 
-    $head[$h][0] = DOL_URL_ROOT.'/comm/action/index.php?action=show_day'.($param ? '&'.$param : '');
-    $head[$h][1] = $langs->trans("ViewDay");
-    $head[$h][2] = 'cardday';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT.'/comm/action/index.php?action=show_day'.($param ? '&'.$param : '');
+	$head[$h][1] = $langs->trans("ViewDay");
+	$head[$h][2] = 'cardday';
+	$h++;
 
-    //if (! empty($conf->global->AGENDA_USE_EVENT_TYPE))
-    if (!empty($conf->global->AGENDA_SHOW_PERTYPE))
-    {
-        $head[$h][0] = DOL_URL_ROOT.'/comm/action/pertype.php'.($param ? '?'.$param : '');
-        $head[$h][1] = $langs->trans("ViewPerType");
-        $head[$h][2] = 'cardpertype';
-        $h++;
-    }
+	//if (! empty($conf->global->AGENDA_USE_EVENT_TYPE))
+	if (!empty($conf->global->AGENDA_SHOW_PERTYPE))
+	{
+		$head[$h][0] = DOL_URL_ROOT.'/comm/action/pertype.php'.($param ? '?'.$param : '');
+		$head[$h][1] = $langs->trans("ViewPerType");
+		$head[$h][2] = 'cardpertype';
+		$h++;
+	}
 
-    $newparam = $param;
-    $newparam = preg_replace('/&?search_filtert=\d+/', '', $newparam);
-    $head[$h][0] = DOL_URL_ROOT.'/comm/action/peruser.php'.($newparam ? '?'.$newparam : '');
-    $head[$h][1] = $langs->trans("ViewPerUser");
-    $head[$h][2] = 'cardperuser';
-    $h++;
+	$newparam = $param;
+	$newparam = preg_replace('/&?search_filtert=\d+/', '', $newparam);
+	$head[$h][0] = DOL_URL_ROOT.'/comm/action/peruser.php'.($newparam ? '?'.$newparam : '');
+	$head[$h][1] = $langs->trans("ViewPerUser");
+	$head[$h][2] = 'cardperuser';
+	$h++;
 
 
-    // Show more tabs from modules
-    // Entries must be declared in modules descriptor with line
-    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
-    // $this->tabs = array('entity:-tabname);   												to remove a tab
-    complete_head_from_modules($conf, $langs, null, $head, $h, 'agenda');
+	// Show more tabs from modules
+	// Entries must be declared in modules descriptor with line
+	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
+	// $this->tabs = array('entity:-tabname);   												to remove a tab
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'agenda');
 
-    complete_head_from_modules($conf, $langs, null, $head, $h, 'agenda', 'remove');
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'agenda', 'remove');
 
-    return $head;
+	return $head;
 }
diff --git a/htdocs/core/lib/bank.lib.php b/htdocs/core/lib/bank.lib.php
index 387d705780a..7df82942613 100644
--- a/htdocs/core/lib/bank.lib.php
+++ b/htdocs/core/lib/bank.lib.php
@@ -34,88 +34,88 @@
  */
 function bank_prepare_head(Account $object)
 {
-    global $db, $langs, $conf, $user;
-    $h = 0;
-    $head = array();
+	global $db, $langs, $conf, $user;
+	$h = 0;
+	$head = array();
 
-    $head[$h][0] = DOL_URL_ROOT.'/compta/bank/card.php?id='.$object->id;
-    $head[$h][1] = $langs->trans("BankAccount");
-    $head[$h][2] = 'bankname';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT.'/compta/bank/card.php?id='.$object->id;
+	$head[$h][1] = $langs->trans("BankAccount");
+	$head[$h][2] = 'bankname';
+	$h++;
 
-    $head[$h][0] = DOL_URL_ROOT."/compta/bank/bankentries_list.php?id=".$object->id;
-    $head[$h][1] = $langs->trans("BankTransactions");
-    $head[$h][2] = 'journal';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT."/compta/bank/bankentries_list.php?id=".$object->id;
+	$head[$h][1] = $langs->trans("BankTransactions");
+	$head[$h][2] = 'journal';
+	$h++;
 
-    //    if ($conf->global->MAIN_FEATURES_LEVEL >= 1)
-    //    {
-    $head[$h][0] = DOL_URL_ROOT."/compta/bank/treso.php?account=".$object->id;
-    $head[$h][1] = $langs->trans("PlannedTransactions");
-    $head[$h][2] = 'cash';
-    $h++;
-    //    }
+	//    if ($conf->global->MAIN_FEATURES_LEVEL >= 1)
+	//    {
+	$head[$h][0] = DOL_URL_ROOT."/compta/bank/treso.php?account=".$object->id;
+	$head[$h][1] = $langs->trans("PlannedTransactions");
+	$head[$h][2] = 'cash';
+	$h++;
+	//    }
 
-    $head[$h][0] = DOL_URL_ROOT."/compta/bank/annuel.php?account=".$object->id;
-    $head[$h][1] = $langs->trans("IOMonthlyReporting");
-    $head[$h][2] = 'annual';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT."/compta/bank/annuel.php?account=".$object->id;
+	$head[$h][1] = $langs->trans("IOMonthlyReporting");
+	$head[$h][2] = 'annual';
+	$h++;
 
-    $head[$h][0] = DOL_URL_ROOT."/compta/bank/graph.php?account=".$object->id;
-    $head[$h][1] = $langs->trans("Graph");
-    $head[$h][2] = 'graph';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT."/compta/bank/graph.php?account=".$object->id;
+	$head[$h][1] = $langs->trans("Graph");
+	$head[$h][2] = 'graph';
+	$h++;
 
-    if ($object->courant != Account::TYPE_CASH)
-    {
-    	$nbReceipts = 0;
+	if ($object->courant != Account::TYPE_CASH)
+	{
+		$nbReceipts = 0;
 
-    	// List of all standing receipts
-    	$sql = "SELECT COUNT(DISTINCT(b.num_releve)) as nb";
-    	$sql .= " FROM ".MAIN_DB_PREFIX."bank as b";
-    	$sql .= " WHERE b.fk_account = ".$object->id;
+		// List of all standing receipts
+		$sql = "SELECT COUNT(DISTINCT(b.num_releve)) as nb";
+		$sql .= " FROM ".MAIN_DB_PREFIX."bank as b";
+		$sql .= " WHERE b.fk_account = ".$object->id;
 
-    	$resql = $db->query($sql);
-    	if ($resql)
-    	{
-    		$obj = $db->fetch_object($resql);
-    		if ($obj) $nbReceipts = $obj->nb;
-    		$db->free($resql);
-    	}
+		$resql = $db->query($sql);
+		if ($resql)
+		{
+			$obj = $db->fetch_object($resql);
+			if ($obj) $nbReceipts = $obj->nb;
+			$db->free($resql);
+		}
 
-    	$head[$h][0] = DOL_URL_ROOT."/compta/bank/releve.php?account=".$object->id;
-	    $head[$h][1] = $langs->trans("AccountStatements");
-	    if (($nbReceipts) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbReceipts).'</span>';
-	    $head[$h][2] = 'statement';
-	    $h++;
+		$head[$h][0] = DOL_URL_ROOT."/compta/bank/releve.php?account=".$object->id;
+		$head[$h][1] = $langs->trans("AccountStatements");
+		if (($nbReceipts) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbReceipts).'</span>';
+		$head[$h][2] = 'statement';
+		$h++;
 	}
 
-    // Attached files
-    require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-    require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-    $upload_dir = $conf->bank->dir_output."/".dol_sanitizeFileName($object->ref);
-    $nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
-    $nbLinks = Link::count($db, $object->element, $object->id);
-    $head[$h][0] = DOL_URL_ROOT."/compta/bank/document.php?account=".$object->id;
-    $head[$h][1] = $langs->trans("Documents");
-    if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
-    $head[$h][2] = 'document';
-    $h++;
+	// Attached files
+	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
+	$upload_dir = $conf->bank->dir_output."/".dol_sanitizeFileName($object->ref);
+	$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
+	$nbLinks = Link::count($db, $object->element, $object->id);
+	$head[$h][0] = DOL_URL_ROOT."/compta/bank/document.php?account=".$object->id;
+	$head[$h][1] = $langs->trans("Documents");
+	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
+	$head[$h][2] = 'document';
+	$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, 'bank');
+	// 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, 'bank');
 
-    /*$head[$h][0] = DOL_URL_ROOT . "/compta/bank/info.php?id=" . $object->id;
+	/*$head[$h][0] = DOL_URL_ROOT . "/compta/bank/info.php?id=" . $object->id;
     $head[$h][1] = $langs->trans("Info");
     $head[$h][2] = 'info';
     $h++;*/
 
 	complete_head_from_modules($conf, $langs, $object, $head, $h, 'bank', 'remove');
 
-    return $head;
+	return $head;
 }
 /**
  * Prepare array with list of tabs
@@ -134,10 +134,10 @@ function bank_admin_prepare_head($object)
 	$head[$h][2] = 'general';
 	$h++;
 
-    $head[$h][0] = DOL_URL_ROOT.'/admin/chequereceipts.php';
-    $head[$h][1] = $langs->trans("CheckReceiptShort");
-    $head[$h][2] = 'checkreceipts';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT.'/admin/chequereceipts.php';
+	$head[$h][1] = $langs->trans("CheckReceiptShort");
+	$head[$h][2] = 'checkreceipts';
+	$h++;
 
 
 	// Show more tabs from modules
@@ -215,17 +215,17 @@ function various_payment_prepare_head($object)
 	$head[$h][2] = 'card';
 	$h++;
 
-    // Show more tabs from modules
-    // Entries must be declared in modules descriptor with line
-    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
-    // $this->tabs = array('entity:-tabname);   												to remove a tab
-    complete_head_from_modules($conf, $langs, $object, $head, $h, 'various_payment');
+	// Show more tabs from modules
+	// Entries must be declared in modules descriptor with line
+	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
+	// $this->tabs = array('entity:-tabname);   												to remove a tab
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'various_payment');
 
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-    require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
 	$upload_dir = $conf->bank->dir_output."/".dol_sanitizeFileName($object->ref);
 	$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
-    $nbLinks = Link::count($db, $object->element, $object->id);
+	$nbLinks = Link::count($db, $object->element, $object->id);
 	$head[$h][0] = DOL_URL_ROOT.'/compta/bank/various_payment/document.php?id='.$object->id;
 	$head[$h][1] = $langs->trans('Documents');
 	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
@@ -250,12 +250,12 @@ function various_payment_prepare_head($object)
  */
 function checkSwiftForAccount($account)
 {
-    $swift = $account->bic;
-    if (preg_match("/^([a-zA-Z]){4}([a-zA-Z]){2}([0-9a-zA-Z]){2}([0-9a-zA-Z]{3})?$/", $swift)) {
-        return true;
-    } else {
-        return false;
-    }
+	$swift = $account->bic;
+	if (preg_match("/^([a-zA-Z]){4}([a-zA-Z]){2}([0-9a-zA-Z]){2}([0-9a-zA-Z]{3})?$/", $swift)) {
+		return true;
+	} else {
+		return false;
+	}
 }
 
 /**
@@ -266,13 +266,13 @@ function checkSwiftForAccount($account)
  */
 function checkIbanForAccount($account)
 {
-    require_once DOL_DOCUMENT_ROOT.'/includes/php-iban/oophp-iban.php';
+	require_once DOL_DOCUMENT_ROOT.'/includes/php-iban/oophp-iban.php';
 
-    $iban = new IBAN($account->iban);
-    $check = $iban->Verify();
+	$iban = new IBAN($account->iban);
+	$check = $iban->Verify();
 
-    if ($check) return true;
-    else return false;
+	if ($check) return true;
+	else return false;
 }
 
 /**
@@ -283,68 +283,68 @@ function checkIbanForAccount($account)
  */
 function checkBanForAccount($account)
 {
-    $country_code = $account->getCountryCode();
+	$country_code = $account->getCountryCode();
 
-    // For compatibility between
-    // account of type CompanyBankAccount class (we use number, cle_rib)
-    // account of type Account class (we use num_compte, cle)
-    if (empty($account->number))
-        $account->number = $account->num_compte;
-    if (empty($account->cle))
-        $account->cle = $account->cle_rib;
+	// For compatibility between
+	// account of type CompanyBankAccount class (we use number, cle_rib)
+	// account of type Account class (we use num_compte, cle)
+	if (empty($account->number))
+		$account->number = $account->num_compte;
+	if (empty($account->cle))
+		$account->cle = $account->cle_rib;
 
-    dol_syslog("bank.lib::checkBanForAccount account->code_banque=".$account->code_banque." account->code_guichet=".$account->code_guichet." account->number=".$account->number." account->cle=".$account->cle." account->iban=".$account->iban." country_code=".$country_code, LOG_DEBUG);
+	dol_syslog("bank.lib::checkBanForAccount account->code_banque=".$account->code_banque." account->code_guichet=".$account->code_guichet." account->number=".$account->number." account->cle=".$account->cle." account->iban=".$account->iban." country_code=".$country_code, LOG_DEBUG);
 
-    if ($country_code == 'FR') { // France rules
-        $coef = array(62, 34, 3);
-        // Concatenation des differents codes.
-        $rib = strtolower(trim($account->code_banque).trim($account->code_guichet).trim($account->number).trim($account->cle));
-        // On remplace les eventuelles lettres par des chiffres.
-        //$rib = strtr($rib, "abcdefghijklmnopqrstuvwxyz","12345678912345678912345678");	//Ne marche pas
-        $rib = strtr($rib, "abcdefghijklmnopqrstuvwxyz", "12345678912345678923456789");
-        // Separation du rib en 3 groupes de 7 + 1 groupe de 2.
-        // Multiplication de chaque groupe par les coef du tableau
+	if ($country_code == 'FR') { // France rules
+		$coef = array(62, 34, 3);
+		// Concatenation des differents codes.
+		$rib = strtolower(trim($account->code_banque).trim($account->code_guichet).trim($account->number).trim($account->cle));
+		// On remplace les eventuelles lettres par des chiffres.
+		//$rib = strtr($rib, "abcdefghijklmnopqrstuvwxyz","12345678912345678912345678");	//Ne marche pas
+		$rib = strtr($rib, "abcdefghijklmnopqrstuvwxyz", "12345678912345678923456789");
+		// Separation du rib en 3 groupes de 7 + 1 groupe de 2.
+		// Multiplication de chaque groupe par les coef du tableau
 
-        for ($i = 0, $s = 0; $i < 3; $i++) {
-            $code = substr($rib, 7 * $i, 7);
-            $s += (0 + (int) $code) * $coef[$i];
-        }
-        // Soustraction du modulo 97 de $s a 97 pour obtenir la cle
-        $cle_rib = 97 - ($s % 97);
-        if ($cle_rib == $account->cle) {
-            return true;
-        }
-        return false;
-    }
+		for ($i = 0, $s = 0; $i < 3; $i++) {
+			$code = substr($rib, 7 * $i, 7);
+			$s += (0 + (int) $code) * $coef[$i];
+		}
+		// Soustraction du modulo 97 de $s a 97 pour obtenir la cle
+		$cle_rib = 97 - ($s % 97);
+		if ($cle_rib == $account->cle) {
+			return true;
+		}
+		return false;
+	}
 
-    if ($country_code == 'BE') { // Belgium rules
-    }
+	if ($country_code == 'BE') { // Belgium rules
+	}
 
-    if ($country_code == 'ES') { // Spanish rules
-        $CCC = strtolower(trim($account->number));
-        $rib = strtolower(trim($account->code_banque).trim($account->code_guichet));
-        $cle_rib = strtolower(checkES($rib, $CCC));
-        if ($cle_rib == strtolower($account->cle)) {
-            return true;
-        }
-        return false;
-    }
-    if ($country_code == 'AU') {  // Australian
-        if (strlen($account->code_banque) > 7)
-            return false; // Sould be 6 but can be 123-456
-        elseif (strlen($account->code_banque) < 6)
-            return false; // Sould be 6
-        else return true;
-    }
+	if ($country_code == 'ES') { // Spanish rules
+		$CCC = strtolower(trim($account->number));
+		$rib = strtolower(trim($account->code_banque).trim($account->code_guichet));
+		$cle_rib = strtolower(checkES($rib, $CCC));
+		if ($cle_rib == strtolower($account->cle)) {
+			return true;
+		}
+		return false;
+	}
+	if ($country_code == 'AU') {  // Australian
+		if (strlen($account->code_banque) > 7)
+			return false; // Sould be 6 but can be 123-456
+		elseif (strlen($account->code_banque) < 6)
+			return false; // Sould be 6
+		else return true;
+	}
 
-    // No particular rule
-    // If account is CompanyBankAccount class, we use number
-    // If account is Account class, we use num_compte
-    if (empty($account->number)) {
-        return false;
-    }
+	// No particular rule
+	// If account is CompanyBankAccount class, we use number
+	// If account is Account class, we use num_compte
+	if (empty($account->number)) {
+		return false;
+	}
 
-    return true;
+	return true;
 }
 
 
@@ -358,53 +358,53 @@ function checkBanForAccount($account)
  */
 function checkES($IentOfi, $InumCta)
 {
-    if (empty($IentOfi) || empty($InumCta) || strlen($IentOfi) != 8 || strlen($InumCta) != 10) {
-        $keycontrol = "";
-        return $keycontrol;
-    }
+	if (empty($IentOfi) || empty($InumCta) || strlen($IentOfi) != 8 || strlen($InumCta) != 10) {
+		$keycontrol = "";
+		return $keycontrol;
+	}
 
-    $ccc = $IentOfi.$InumCta;
-    $numbers = "1234567890";
+	$ccc = $IentOfi.$InumCta;
+	$numbers = "1234567890";
 
-    $i = 0;
+	$i = 0;
 
-    while ($i <= strlen($ccc) - 1) {
-        if (strpos($numbers, substr($ccc, $i, 1)) === false) {
-            $keycontrol = "";
-            return $keycontrol;
-        }
-        $i++;
-    }
+	while ($i <= strlen($ccc) - 1) {
+		if (strpos($numbers, substr($ccc, $i, 1)) === false) {
+			$keycontrol = "";
+			return $keycontrol;
+		}
+		$i++;
+	}
 
-    $values = array(1, 2, 4, 8, 5, 10, 9, 7, 3, 6);
-    $sum = 0;
+	$values = array(1, 2, 4, 8, 5, 10, 9, 7, 3, 6);
+	$sum = 0;
 
-    for ($i = 2; $i < 10; $i++) {
-        $sum += $values[$i] * substr($IentOfi, $i - 2, 1);
-    }
+	for ($i = 2; $i < 10; $i++) {
+		$sum += $values[$i] * substr($IentOfi, $i - 2, 1);
+	}
 
-    $key = 11 - $sum % 11;
+	$key = 11 - $sum % 11;
 
-    if ($key == 10)
-        $key = 1;
-    if ($key == 11)
-        $key = 0;
+	if ($key == 10)
+		$key = 1;
+	if ($key == 11)
+		$key = 0;
 
-    $keycontrol = $key;
+	$keycontrol = $key;
 
-    $sum = 0;
+	$sum = 0;
 
-    for ($i = 0; $i < 11; $i++) {
-        $sum += $values[$i] * (int) substr($InumCta, $i, 1); //int to cast result of substr to a number
-    }
+	for ($i = 0; $i < 11; $i++) {
+		$sum += $values[$i] * (int) substr($InumCta, $i, 1); //int to cast result of substr to a number
+	}
 
-    $key = 11 - $sum % 11;
+	$key = 11 - $sum % 11;
 
-    if ($key == 10)
-        $key = 1;
-    if ($key == 11)
-        $key = 0;
+	if ($key == 10)
+		$key = 1;
+	if ($key == 11)
+		$key = 0;
 
-    $keycontrol .= $key;
-    return $keycontrol;
+	$keycontrol .= $key;
+	return $keycontrol;
 }
diff --git a/htdocs/core/lib/barcode.lib.php b/htdocs/core/lib/barcode.lib.php
index da712d960cd..0447927ec4d 100644
--- a/htdocs/core/lib/barcode.lib.php
+++ b/htdocs/core/lib/barcode.lib.php
@@ -67,23 +67,23 @@ else $genbarcode_loc = $conf->global->GENBARCODE_LOCATION;
  */
 function barcode_print($code, $encoding = "ANY", $scale = 2, $mode = "png")
 {
-    dol_syslog("barcode.lib.php::barcode_print $code $encoding $scale $mode");
+	dol_syslog("barcode.lib.php::barcode_print $code $encoding $scale $mode");
 
-    $bars = barcode_encode($code, $encoding);
-    if (!$bars || !empty($bars['error']))
-    {
-        // Return error message instead of array
-        if (empty($bars['error'])) $error = 'Bad Value '.$code.' for encoding '.$encoding;
-        else $error = $bars['error'];
-        dol_syslog('barcode.lib.php::barcode_print '.$error, LOG_ERR);
-        return $error;
-    }
-    if (!$mode) $mode = "png";
-    //if (preg_match("/^(text|txt|plain)$/i",$mode)) print barcode_outtext($bars['text'],$bars['bars']);
-    //elseif (preg_match("/^(html|htm)$/i",$mode)) print barcode_outhtml($bars['text'],$bars['bars'], $scale,0, 0);
-    //else
-    barcode_outimage($bars['text'], $bars['bars'], $scale, $mode);
-    return $bars;
+	$bars = barcode_encode($code, $encoding);
+	if (!$bars || !empty($bars['error']))
+	{
+		// Return error message instead of array
+		if (empty($bars['error'])) $error = 'Bad Value '.$code.' for encoding '.$encoding;
+		else $error = $bars['error'];
+		dol_syslog('barcode.lib.php::barcode_print '.$error, LOG_ERR);
+		return $error;
+	}
+	if (!$mode) $mode = "png";
+	//if (preg_match("/^(text|txt|plain)$/i",$mode)) print barcode_outtext($bars['text'],$bars['bars']);
+	//elseif (preg_match("/^(html|htm)$/i",$mode)) print barcode_outhtml($bars['text'],$bars['bars'], $scale,0, 0);
+	//else
+	barcode_outimage($bars['text'], $bars['bars'], $scale, $mode);
+	return $bars;
 }
 
 /**
@@ -110,42 +110,42 @@ function barcode_print($code, $encoding = "ANY", $scale = 2, $mode = "png")
  */
 function barcode_encode($code, $encoding)
 {
-    global $genbarcode_loc;
+	global $genbarcode_loc;
 
-    if (
-    (preg_match("/^ean$/i", $encoding))
+	if (
+	(preg_match("/^ean$/i", $encoding))
 
-    || (($encoding) && (preg_match("/^isbn$/i", $encoding))
-    && ((strlen($code) == 9 || strlen($code) == 10) ||
-    (((preg_match("/^978/", $code) && strlen($code) == 12) ||
-    (strlen($code) == 13)))))
+	|| (($encoding) && (preg_match("/^isbn$/i", $encoding))
+	&& ((strlen($code) == 9 || strlen($code) == 10) ||
+	(((preg_match("/^978/", $code) && strlen($code) == 12) ||
+	(strlen($code) == 13)))))
 
-    || ((!isset($encoding) || !$encoding || (preg_match("/^ANY$/i", $encoding)))
-    && (preg_match("/^[0-9]{12,13}$/", $code)))
-    )
-    {
-        /* use built-in EAN-Encoder */
-        dol_syslog("barcode.lib.php::barcode_encode Use barcode_encode_ean");
-        $bars = barcode_encode_ean($code, $encoding);
-    } elseif (file_exists($genbarcode_loc))	// For example C39
-    {
-        /* use genbarcode */
-        dol_syslog("barcode.lib.php::barcode_encode Use genbarcode ".$genbarcode_loc." code=".$code." encoding=".$encoding);
-        $bars = barcode_encode_genbarcode($code, $encoding);
-    } else {
-        print "barcode_encode needs an external programm for encodings other then EAN/ISBN (code=".$code.", encoding=".$encoding.")<BR>\n";
-        print "<UL>\n";
-        print "<LI>download gnu-barcode from <A href=\"https://www.gnu.org/software/barcode/\">www.gnu.org/software/barcode/</A>\n";
-        print "<LI>compile and install them\n";
-        print "<LI>download genbarcode from <A href=\"http://www.ashberg.de/bar/\">www.ashberg.de/bar/</A>\n";
-        print "<LI>compile and install them\n";
-        print "<LI>specify path the genbarcode in barcode module setup\n";
-        print "</UL>\n";
-        print "<BR>\n";
-        return false;
-    }
+	|| ((!isset($encoding) || !$encoding || (preg_match("/^ANY$/i", $encoding)))
+	&& (preg_match("/^[0-9]{12,13}$/", $code)))
+	)
+	{
+		/* use built-in EAN-Encoder */
+		dol_syslog("barcode.lib.php::barcode_encode Use barcode_encode_ean");
+		$bars = barcode_encode_ean($code, $encoding);
+	} elseif (file_exists($genbarcode_loc))	// For example C39
+	{
+		/* use genbarcode */
+		dol_syslog("barcode.lib.php::barcode_encode Use genbarcode ".$genbarcode_loc." code=".$code." encoding=".$encoding);
+		$bars = barcode_encode_genbarcode($code, $encoding);
+	} else {
+		print "barcode_encode needs an external programm for encodings other then EAN/ISBN (code=".$code.", encoding=".$encoding.")<BR>\n";
+		print "<UL>\n";
+		print "<LI>download gnu-barcode from <A href=\"https://www.gnu.org/software/barcode/\">www.gnu.org/software/barcode/</A>\n";
+		print "<LI>compile and install them\n";
+		print "<LI>download genbarcode from <A href=\"http://www.ashberg.de/bar/\">www.ashberg.de/bar/</A>\n";
+		print "<LI>compile and install them\n";
+		print "<LI>specify path the genbarcode in barcode module setup\n";
+		print "</UL>\n";
+		print "<BR>\n";
+		return false;
+	}
 
-    return $bars;
+	return $bars;
 }
 
 
@@ -157,14 +157,14 @@ function barcode_encode($code, $encoding)
  */
 function barcode_gen_ean_sum($ean)
 {
-    $even = true; $esum = 0; $osum = 0;
-    $ln = strlen($ean) - 1;
-    for ($i = $ln; $i >= 0; $i--)
-    {
-        if ($even) $esum += $ean[$i]; else $osum += $ean[$i];
-        $even = !$even;
-    }
-    return (10 - ((3 * $esum + $osum) % 10)) % 10;
+	$even = true; $esum = 0; $osum = 0;
+	$ln = strlen($ean) - 1;
+	for ($i = $ln; $i >= 0; $i--)
+	{
+		if ($even) $esum += $ean[$i]; else $osum += $ean[$i];
+		$even = !$even;
+	}
+	return (10 - ((3 * $esum + $osum) % 10)) % 10;
 }
 
 /**
@@ -176,56 +176,56 @@ function barcode_gen_ean_sum($ean)
  */
 function barcode_encode_ean($ean, $encoding = "EAN-13")
 {
-    $digits = array(3211, 2221, 2122, 1411, 1132, 1231, 1114, 1312, 1213, 3112);
-    $mirror = array("000000", "001011", "001101", "001110", "010011", "011001", "011100", "010101", "010110", "011010");
-    $guards = array("9a1a", "1a1a1", "a1a");
+	$digits = array(3211, 2221, 2122, 1411, 1132, 1231, 1114, 1312, 1213, 3112);
+	$mirror = array("000000", "001011", "001101", "001110", "010011", "011001", "011100", "010101", "010110", "011010");
+	$guards = array("9a1a", "1a1a1", "a1a");
 
-    $ean = trim($ean);
-    if (preg_match("/[^0-9]/i", $ean))
-    {
-        return array("error"=>"Invalid encoding/code. encoding=".$encoding." code=".$ean." (not a numeric)", "text"=>"Invalid encoding/code. encoding=".$encoding." code=".$ean." (not a numeric)");
-    }
-    $encoding = strtoupper($encoding);
-    if ($encoding == "ISBN")
-    {
-        if (!preg_match("/^978/", $ean)) $ean = "978".$ean;
-    }
-    if (preg_match("/^978/", $ean)) $encoding = "ISBN";
-    if (strlen($ean) < 12 || strlen($ean) > 13)
-    {
-        return array("error"=>"Invalid encoding/code. encoding=".$encoding." code=".$ean." (must have 12/13 numbers)", "text"=>"Invalid encoding/code. encoding=".$encoding." code=".$ean." (must have 12/13 numbers)");
-    }
+	$ean = trim($ean);
+	if (preg_match("/[^0-9]/i", $ean))
+	{
+		return array("error"=>"Invalid encoding/code. encoding=".$encoding." code=".$ean." (not a numeric)", "text"=>"Invalid encoding/code. encoding=".$encoding." code=".$ean." (not a numeric)");
+	}
+	$encoding = strtoupper($encoding);
+	if ($encoding == "ISBN")
+	{
+		if (!preg_match("/^978/", $ean)) $ean = "978".$ean;
+	}
+	if (preg_match("/^978/", $ean)) $encoding = "ISBN";
+	if (strlen($ean) < 12 || strlen($ean) > 13)
+	{
+		return array("error"=>"Invalid encoding/code. encoding=".$encoding." code=".$ean." (must have 12/13 numbers)", "text"=>"Invalid encoding/code. encoding=".$encoding." code=".$ean." (must have 12/13 numbers)");
+	}
 
-    $ean = substr($ean, 0, 12);
-    $eansum = barcode_gen_ean_sum($ean);
-    $ean .= $eansum;
-    $line = $guards[0];
-    for ($i = 1; $i < 13; $i++)
-    {
-        $str = $digits[$ean[$i]];
-        if ($i < 7 && $mirror[$ean[0]][$i - 1] == 1) $line .= strrev($str); else $line .= $str;
-        if ($i == 6) $line .= $guards[1];
-    }
-    $line .= $guards[2];
+	$ean = substr($ean, 0, 12);
+	$eansum = barcode_gen_ean_sum($ean);
+	$ean .= $eansum;
+	$line = $guards[0];
+	for ($i = 1; $i < 13; $i++)
+	{
+		$str = $digits[$ean[$i]];
+		if ($i < 7 && $mirror[$ean[0]][$i - 1] == 1) $line .= strrev($str); else $line .= $str;
+		if ($i == 6) $line .= $guards[1];
+	}
+	$line .= $guards[2];
 
-    /* create text */
-    $pos = 0;
-    $text = "";
-    for ($a = 0; $a < 13; $a++)
-    {
-        if ($a > 0) $text .= " ";
-        $text .= "$pos:12:{$ean[$a]}";
-        if ($a == 0) $pos += 12;
-        elseif ($a == 6) $pos += 12;
-        else $pos += 7;
-    }
+	/* create text */
+	$pos = 0;
+	$text = "";
+	for ($a = 0; $a < 13; $a++)
+	{
+		if ($a > 0) $text .= " ";
+		$text .= "$pos:12:{$ean[$a]}";
+		if ($a == 0) $pos += 12;
+		elseif ($a == 6) $pos += 12;
+		else $pos += 7;
+	}
 
-    return array(
-        "error" => '',
-        "encoding" => $encoding,
+	return array(
+		"error" => '',
+		"encoding" => $encoding,
 		"bars" => $line,
 		"text" => $text
-    );
+	);
 }
 
 /**
@@ -237,50 +237,50 @@ function barcode_encode_ean($ean, $encoding = "EAN-13")
  */
 function barcode_encode_genbarcode($code, $encoding)
 {
-    global $genbarcode_loc;
+	global $genbarcode_loc;
 
-    // Clean parameters
-    if (preg_match("/^ean$/i", $encoding) && strlen($code) == 13) $code = substr($code, 0, 12);
-    if (!$encoding) $encoding = "ANY";
-    $encoding = preg_replace("/[\\\|]/", "_", $encoding);
-    $code = preg_replace("/[\\\|]/", "_", $code);
+	// Clean parameters
+	if (preg_match("/^ean$/i", $encoding) && strlen($code) == 13) $code = substr($code, 0, 12);
+	if (!$encoding) $encoding = "ANY";
+	$encoding = preg_replace("/[\\\|]/", "_", $encoding);
+	$code = preg_replace("/[\\\|]/", "_", $code);
 
-    $command = escapeshellarg($genbarcode_loc);
-    //$paramclear=" \"".str_replace("\"", "\\\"",$code)."\" \"".str_replace("\"", "\\\"",strtoupper($encoding))."\"";
-    $paramclear = " ".escapeshellarg($code)." ".escapeshellarg(strtoupper($encoding));
+	$command = escapeshellarg($genbarcode_loc);
+	//$paramclear=" \"".str_replace("\"", "\\\"",$code)."\" \"".str_replace("\"", "\\\"",strtoupper($encoding))."\"";
+	$paramclear = " ".escapeshellarg($code)." ".escapeshellarg(strtoupper($encoding));
 
-    $fullcommandclear = $command." ".$paramclear." 2>&1";
-    //print $fullcommandclear."<br>\n";exit;
+	$fullcommandclear = $command." ".$paramclear." 2>&1";
+	//print $fullcommandclear."<br>\n";exit;
 
-    dol_syslog("Run command ".$fullcommandclear);
-    $fp = popen($fullcommandclear, "r");
-    if ($fp)
-    {
-        $bars = fgets($fp, 1024);
-        $text = fgets($fp, 1024);
-        $encoding = fgets($fp, 1024);
-        pclose($fp);
-    } else {
-        dol_syslog("barcode.lib.php::barcode_encode_genbarcode failed to run popen ".$fullcommandclear, LOG_ERR);
-        return false;
-    }
-    //var_dump($bars);
-    $ret = array(
+	dol_syslog("Run command ".$fullcommandclear);
+	$fp = popen($fullcommandclear, "r");
+	if ($fp)
+	{
+		$bars = fgets($fp, 1024);
+		$text = fgets($fp, 1024);
+		$encoding = fgets($fp, 1024);
+		pclose($fp);
+	} else {
+		dol_syslog("barcode.lib.php::barcode_encode_genbarcode failed to run popen ".$fullcommandclear, LOG_ERR);
+		return false;
+	}
+	//var_dump($bars);
+	$ret = array(
 		"bars" => trim($bars),
 		"text" => trim($text),
 		"encoding" => trim($encoding),
-    	"error" => ""
-    );
-    //var_dump($ret);
-    if (preg_match('/permission denied/i', $ret['bars']))
-    {
-    	$ret['error'] = $ret['bars']; $ret['bars'] = '';
-    	return $ret;
-    }
-    if (!$ret['bars']) return false;
-    if (!$ret['text']) return false;
-    if (!$ret['encoding']) return false;
-    return $ret;
+		"error" => ""
+	);
+	//var_dump($ret);
+	if (preg_match('/permission denied/i', $ret['bars']))
+	{
+		$ret['error'] = $ret['bars']; $ret['bars'] = '';
+		return $ret;
+	}
+	if (!$ret['bars']) return false;
+	if (!$ret['text']) return false;
+	if (!$ret['encoding']) return false;
+	return $ret;
 }
 
 /**
@@ -296,110 +296,105 @@ function barcode_encode_genbarcode($code, $encoding)
  */
 function barcode_outimage($text, $bars, $scale = 1, $mode = "png", $total_y = 0, $space = '')
 {
-    global $bar_color, $bg_color, $text_color;
-    global $font_loc, $filebarcode;
+	global $bar_color, $bg_color, $text_color;
+	global $font_loc, $filebarcode;
 
-    //print "$text, $bars, $scale, $mode, $total_y, $space, $font_loc, $filebarcode<br>";
-    //var_dump($text);
-    //var_dump($bars);
-    //var_dump($font_loc);
+	//print "$text, $bars, $scale, $mode, $total_y, $space, $font_loc, $filebarcode<br>";
+	//var_dump($text);
+	//var_dump($bars);
+	//var_dump($font_loc);
 
-    /* set defaults */
-    if ($scale < 1) $scale = 2;
-    $total_y = (int) $total_y;
-    if ($total_y < 1) $total_y = (int) $scale * 60;
-    if (!$space)
-    $space = array('top'=>2 * $scale, 'bottom'=>2 * $scale, 'left'=>2 * $scale, 'right'=>2 * $scale);
+	/* set defaults */
+	if ($scale < 1) $scale = 2;
+	$total_y = (int) $total_y;
+	if ($total_y < 1) $total_y = (int) $scale * 60;
+	if (!$space)
+	$space = array('top'=>2 * $scale, 'bottom'=>2 * $scale, 'left'=>2 * $scale, 'right'=>2 * $scale);
 
-    /* count total width */
-    $xpos = 0;
-    $width = true;
-    $ln = strlen($bars);
-    for ($i = 0; $i < $ln; $i++)
-    {
-        $val = strtolower($bars[$i]);
-        if ($width)
-        {
-            $xpos += $val * $scale;
-            $width = false;
-            continue;
-        }
-        if (preg_match("/[a-z]/", $val))
-        {
-            /* tall bar */
-            $val = ord($val) - ord('a') + 1;
-        }
-        $xpos += $val * $scale;
-        $width = true;
-    }
+	/* count total width */
+	$xpos = 0;
+	$width = true;
+	$ln = strlen($bars);
+	for ($i = 0; $i < $ln; $i++)
+	{
+		$val = strtolower($bars[$i]);
+		if ($width)
+		{
+			$xpos += $val * $scale;
+			$width = false;
+			continue;
+		}
+		if (preg_match("/[a-z]/", $val))
+		{
+			/* tall bar */
+			$val = ord($val) - ord('a') + 1;
+		}
+		$xpos += $val * $scale;
+		$width = true;
+	}
 
-    /* allocate the image */
-    $total_x = ($xpos) + $space['right'] + $space['right'];
-    $xpos = $space['left'];
-    if (!function_exists("imagecreate"))
-    {
-        print "You don't have the gd2 extension enabled<br>\n";
-        return "";
-    }
-    $im = imagecreate($total_x, $total_y);
-    /* create two images */
-    $col_bg = ImageColorAllocate($im, $bg_color[0], $bg_color[1], $bg_color[2]);
-    $col_bar = ImageColorAllocate($im, $bar_color[0], $bar_color[1], $bar_color[2]);
-    $col_text = ImageColorAllocate($im, $text_color[0], $text_color[1], $text_color[2]);
-    $height = round($total_y - ($scale * 10));
-    $height2 = round($total_y - $space['bottom']);
+	/* allocate the image */
+	$total_x = ($xpos) + $space['right'] + $space['right'];
+	$xpos = $space['left'];
+	if (!function_exists("imagecreate"))
+	{
+		print "You don't have the gd2 extension enabled<br>\n";
+		return "";
+	}
+	$im = imagecreate($total_x, $total_y);
+	/* create two images */
+	$col_bg = ImageColorAllocate($im, $bg_color[0], $bg_color[1], $bg_color[2]);
+	$col_bar = ImageColorAllocate($im, $bar_color[0], $bar_color[1], $bar_color[2]);
+	$col_text = ImageColorAllocate($im, $text_color[0], $text_color[1], $text_color[2]);
+	$height = round($total_y - ($scale * 10));
+	$height2 = round($total_y - $space['bottom']);
 
-    /* paint the bars */
-    $width = true;
-    $ln = strlen($bars);
-    for ($i = 0; $i < $ln; $i++)
-    {
-        $val = strtolower($bars[$i]);
-        if ($width)
-        {
-            $xpos += $val * $scale;
-            $width = false;
-            continue;
-        }
-        if (preg_match("/[a-z]/", $val))
-        {
-            /* tall bar */
-            $val = ord($val) - ord('a') + 1;
-            $h = $height2;
-        } else $h = $height;
-        imagefilledrectangle($im, $xpos, $space['top'], $xpos + ($val * $scale) - 1, $h, $col_bar);
-        $xpos += $val * $scale;
-        $width = true;
-    }
+	/* paint the bars */
+	$width = true;
+	$ln = strlen($bars);
+	for ($i = 0; $i < $ln; $i++)
+	{
+		$val = strtolower($bars[$i]);
+		if ($width)
+		{
+			$xpos += $val * $scale;
+			$width = false;
+			continue;
+		}
+		if (preg_match("/[a-z]/", $val))
+		{
+			/* tall bar */
+			$val = ord($val) - ord('a') + 1;
+			$h = $height2;
+		} else $h = $height;
+		imagefilledrectangle($im, $xpos, $space['top'], $xpos + ($val * $scale) - 1, $h, $col_bar);
+		$xpos += $val * $scale;
+		$width = true;
+	}
 
-    $chars = explode(" ", $text);
-    reset($chars);
-    while (list($n, $v) = each($chars))
-    {
-        if (trim($v))
-        {
-            $inf = explode(":", $v);
-            $fontsize = $scale * ($inf[1] / 1.8);
-            $fontheight = $total_y - ($fontsize / 2.7) + 2;
-            imagettftext($im, $fontsize, 0, $space['left'] + ($scale * $inf[0]) + 2, $fontheight, $col_text, $font_loc, $inf[2]);
-        }
-    }
+	$chars = explode(" ", $text);
+	foreach ($chars as $v) {
+		if (trim($v)) {
+			$inf = explode(":", $v);
+			$fontsize = $scale * ($inf[1] / 1.8);
+			$fontheight = $total_y - ($fontsize / 2.7) + 2;
+			imagettftext($im, $fontsize, 0, $space['left'] + ($scale * $inf[0]) + 2, $fontheight, $col_text, $font_loc, $inf[2]);
+		}
+	}
 
-    /* output the image */
-    $mode = strtolower($mode);
-    if ($mode == 'jpg' || $mode == 'jpeg')
-    {
-        header("Content-Type: image/jpeg; name=\"barcode.jpg\"");
-        imagejpeg($im);
-    } elseif ($mode == 'gif')
-    {
-        header("Content-Type: image/gif; name=\"barcode.gif\"");
-        imagegif($im);
-    } elseif (!empty($filebarcode))    // To wxrite into  afile onto disk
-    {
-        imagepng($im, $filebarcode);
-    } else {
-        header("Content-Type: image/png; name=\"barcode.png\"");
-        imagepng($im);
-    }
+	/* output the image */
+	$mode = strtolower($mode);
+	if ($mode == 'jpg' || $mode == 'jpeg') {
+		header("Content-Type: image/jpeg; name=\"barcode.jpg\"");
+		imagejpeg($im);
+	} elseif ($mode == 'gif') {
+		header("Content-Type: image/gif; name=\"barcode.gif\"");
+		imagegif($im);
+	} elseif (!empty($filebarcode)) {
+		// To wxrite into  afile onto disk
+		imagepng($im, $filebarcode);
+	} else {
+		header("Content-Type: image/png; name=\"barcode.png\"");
+		imagepng($im);
+	}
 }
diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index 56b23722a74..1e2be9e856d 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -50,10 +50,8 @@ function societe_prepare_head(Societe $object)
 	$head[$h][2] = 'card';
 	$h++;
 
-	if (empty($conf->global->MAIN_SUPPORT_SHARED_CONTACT_BETWEEN_THIRDPARTIES))
-	{
-		if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && $user->rights->societe->contact->lire)
-		{
+	if (empty($conf->global->MAIN_SUPPORT_SHARED_CONTACT_BETWEEN_THIRDPARTIES)) {
+		if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && $user->rights->societe->contact->lire) {
 			//$nbContact = count($object->liste_contact(-1,'internal')) + count($object->liste_contact(-1,'external'));
 			$nbContact = 0; // TODO
 
@@ -61,8 +59,7 @@ function societe_prepare_head(Societe $object)
 			$sql .= " FROM ".MAIN_DB_PREFIX."socpeople as p";
 			$sql .= " WHERE p.fk_soc = ".$object->id;
 			$resql = $db->query($sql);
-			if ($resql)
-			{
+			if ($resql) {
 				$obj = $db->fetch_object($resql);
 				if ($obj) $nbContact = $obj->nb;
 			}
@@ -82,8 +79,7 @@ function societe_prepare_head(Societe $object)
 		$h++;
 	}
 
-	if ($object->client == 1 || $object->client == 2 || $object->client == 3)
-	{
+	if ($object->client == 1 || $object->client == 2 || $object->client == 3) {
 		$head[$h][0] = DOL_URL_ROOT.'/comm/card.php?socid='.$object->id;
 		$head[$h][1] = '';
 		if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && ($object->client == 2 || $object->client == 3)) $head[$h][1] .= $langs->trans("Prospect");
@@ -92,8 +88,7 @@ function societe_prepare_head(Societe $object)
 		$head[$h][2] = 'customer';
 		$h++;
 
-		if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
-		{
+		if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 			$langs->load("products");
 			// price
 			$head[$h][0] = DOL_URL_ROOT.'/societe/price.php?socid='.$object->id;
@@ -104,16 +99,14 @@ function societe_prepare_head(Societe $object)
 	}
 	$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))
-	{
+	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");
 		$head[$h][2] = 'supplier';
 		$h++;
 	}
 
-	if (!empty($conf->projet->enabled) && (!empty($user->rights->projet->lire)))
-	{
+	if (!empty($conf->projet->enabled) && (!empty($user->rights->projet->lire))) {
 		$head[$h][0] = DOL_URL_ROOT.'/societe/project.php?socid='.$object->id;
 		$head[$h][1] = $langs->trans("Projects");
 		$nbNote = 0;
@@ -122,12 +115,10 @@ function societe_prepare_head(Societe $object)
 		$sql .= " WHERE fk_soc = ".$object->id;
 		$sql .= " AND entity IN (".getEntity('project').")";
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $db->num_rows($resql);
 			$i = 0;
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$obj = $db->fetch_object($resql);
 				$nbNote = $obj->nb;
 				$i++;
@@ -141,19 +132,16 @@ function societe_prepare_head(Societe $object)
 	}
 
 	// Tab to link resources
-	if (!empty($conf->resource->enabled) && !empty($conf->global->RESOURCE_ON_THIRDPARTIES))
-	{
+	if (!empty($conf->resource->enabled) && !empty($conf->global->RESOURCE_ON_THIRDPARTIES)) {
 		$head[$h][0] = DOL_URL_ROOT.'/resource/element_resource.php?element=societe&element_id='.$object->id;
 		$head[$h][1] = $langs->trans("Resources");
 		$head[$h][2] = 'resources';
 		$h++;
 	}
 
-	if (!empty($conf->global->ACCOUNTING_ENABLE_LETTERING))
-	{
+	if (!empty($conf->global->ACCOUNTING_ENABLE_LETTERING)) {
 		// Tab to accountancy
-		if (!empty($conf->accounting->enabled) && $object->client > 0)
-		{
+		if (!empty($conf->accounting->enabled) && $object->client > 0) {
 			$head[$h][0] = DOL_URL_ROOT.'/accountancy/bookkeeping/thirdparty_lettering_customer.php?socid='.$object->id;
 			$head[$h][1] = $langs->trans("TabLetteringCustomer");
 			$head[$h][2] = 'lettering_customer';
@@ -161,8 +149,7 @@ function societe_prepare_head(Societe $object)
 		}
 
 		// Tab to accountancy
-		if (!empty($conf->accounting->enabled) && $object->fournisseur > 0)
-		{
+		if (!empty($conf->accounting->enabled) && $object->fournisseur > 0) {
 			$head[$h][0] = DOL_URL_ROOT.'/accountancy/bookkeeping/thirdparty_lettering_supplier.php?socid='.$object->id;
 			$head[$h][1] = $langs->trans("TabLetteringSupplier");
 			$head[$h][2] = 'lettering_supplier';
@@ -172,8 +159,7 @@ function societe_prepare_head(Societe $object)
 
 	// Related items
 	if ((!empty($conf->commande->enabled) || !empty($conf->propal->enabled) || !empty($conf->facture->enabled) || !empty($conf->ficheinter->enabled) || !empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled))
-		&& empty($conf->global->THIRPARTIES_DISABLE_RELATED_OBJECT_TAB))
-	{
+		&& empty($conf->global->THIRPARTIES_DISABLE_RELATED_OBJECT_TAB)) {
 		$head[$h][0] = DOL_URL_ROOT.'/societe/consumption.php?socid='.$object->id;
 		$head[$h][1] = $langs->trans("Referers");
 		$head[$h][2] = 'consumption';
@@ -181,8 +167,7 @@ function societe_prepare_head(Societe $object)
 	}
 
 	// Bank accounts
-	if (empty($conf->global->SOCIETE_DISABLE_BANKACCOUNT))
-	{
+	if (empty($conf->global->SOCIETE_DISABLE_BANKACCOUNT)) {
 		$nbBankAccount = 0;
 		$foundonexternalonlinesystem = 0;
 		$langs->load("banks");
@@ -190,8 +175,7 @@ function societe_prepare_head(Societe $object)
 		//$title = $langs->trans("BankAccounts");
 		$title = $langs->trans("PaymentInformation");
 
-		if (!empty($conf->stripe->enabled))
-		{
+		if (!empty($conf->stripe->enabled)) {
 			//$langs->load("stripe");
 			//$title = $langs->trans("BankAccountsAndGateways");
 
@@ -214,12 +198,10 @@ function societe_prepare_head(Societe $object)
 		}
 
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $db->num_rows($resql);
 			$i = 0;
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$obj = $db->fetch_object($resql);
 				$nbBankAccount = $obj->nb;
 				$i++;
@@ -238,8 +220,7 @@ function societe_prepare_head(Societe $object)
 		$h++;
 	}
 
-	if (!empty($conf->website->enabled) && (!empty($conf->global->WEBSITE_USE_WEBSITE_ACCOUNTS)) && (!empty($user->rights->societe->lire)))
-	{
+	if (!empty($conf->website->enabled) && (!empty($conf->global->WEBSITE_USE_WEBSITE_ACCOUNTS)) && (!empty($user->rights->societe->lire))) {
 		$head[$h][0] = DOL_URL_ROOT.'/societe/website.php?id='.$object->id;
 		$head[$h][1] = $langs->trans("WebSiteAccounts");
 		$nbNote = 0;
@@ -247,12 +228,10 @@ function societe_prepare_head(Societe $object)
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe_account as n";
 		$sql .= " WHERE fk_soc = ".$object->id.' AND fk_website > 0';
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $db->num_rows($resql);
 			$i = 0;
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$obj = $db->fetch_object($resql);
 				$nbNote = $obj->nb;
 				$i++;
@@ -271,22 +250,18 @@ function societe_prepare_head(Societe $object)
 	// $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, 'thirdparty');
 
-	if ($user->socid == 0)
-	{
+	if ($user->socid == 0) {
 		// Notifications
-		if (!empty($conf->notification->enabled))
-		{
+		if (!empty($conf->notification->enabled)) {
 			$nbNote = 0;
 			$sql = "SELECT COUNT(n.rowid) as nb";
 			$sql .= " FROM ".MAIN_DB_PREFIX."notify_def as n";
 			$sql .= " WHERE fk_soc = ".$object->id;
 			$resql = $db->query($sql);
-			if ($resql)
-			{
+			if ($resql) {
 				$num = $db->num_rows($resql);
 				$i = 0;
-				while ($i < $num)
-				{
+				while ($i < $num) {
 					$obj = $db->fetch_object($resql);
 					$nbNote = $obj->nb;
 					$i++;
@@ -328,8 +303,7 @@ function societe_prepare_head(Societe $object)
 
 	$head[$h][0] = DOL_URL_ROOT.'/societe/agenda.php?socid='.$object->id;
 	$head[$h][1] .= $langs->trans("Events");
-	if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read)))
-	{
+	if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) {
 		$head[$h][1] .= '/';
 		$head[$h][1] .= $langs->trans("Agenda");
 	}
@@ -437,8 +411,7 @@ function getCountry($searchkey, $withcode = '', $dbtouse = 0, $outputlangs = '',
 	$result = '';
 
 	// Check parameters
-	if (empty($searchkey) && empty($searchlabel))
-	{
+	if (empty($searchkey) && empty($searchlabel)) {
 		if ($withcode === 'all') return array('id'=>'', 'code'=>'', 'label'=>'');
 		else return '';
 	}
@@ -451,14 +424,11 @@ function getCountry($searchkey, $withcode = '', $dbtouse = 0, $outputlangs = '',
 	else $sql .= " WHERE label='".$db->escape($searchlabel)."'";
 
 	$resql = $dbtouse->query($sql);
-	if ($resql)
-	{
+	if ($resql) {
 		$obj = $dbtouse->fetch_object($resql);
-		if ($obj)
-		{
+		if ($obj) {
 			$label = ((!empty($obj->label) && $obj->label != '-') ? $obj->label : '');
-			if (is_object($outputlangs))
-			{
+			if (is_object($outputlangs)) {
 				$outputlangs->load("dict");
 				if ($entconv) $label = ($obj->code && ($outputlangs->trans("Country".$obj->code) != "Country".$obj->code)) ? $outputlangs->trans("Country".$obj->code) : $label;
 				else $label = ($obj->code && ($outputlangs->transnoentitiesnoconv("Country".$obj->code) != "Country".$obj->code)) ? $outputlangs->transnoentitiesnoconv("Country".$obj->code) : $label;
@@ -506,14 +476,11 @@ function getState($id, $withcode = '', $dbtouse = 0, $withregion = 0, $outputlan
 
 	dol_syslog("Company.lib::getState", LOG_DEBUG);
 	$resql = $dbtouse->query($sql);
-	if ($resql)
-	{
+	if ($resql) {
 		$obj = $dbtouse->fetch_object($resql);
-		if ($obj)
-		{
+		if ($obj) {
 			$label = ((!empty($obj->name) && $obj->name != '-') ? $obj->name : '');
-			if (is_object($outputlangs))
-			{
+			if (is_object($outputlangs)) {
 				$outputlangs->load("dict");
 				if ($entconv) $label = ($obj->code && ($outputlangs->trans("State".$obj->code) != "State".$obj->code)) ? $outputlangs->trans("State".$obj->code) : $label;
 				else $label = ($obj->code && ($outputlangs->transnoentitiesnoconv("State".$obj->code) != "State".$obj->code)) ? $outputlangs->transnoentitiesnoconv("State".$obj->code) : $label;
@@ -567,8 +534,7 @@ function currency_name($code_iso, $withcode = '', $outputlangs = null)
 	$outputlangs->load("dict");
 
 	// If there is a translation, we can send immediatly the label
-	if ($outputlangs->trans("Currency".$code_iso) != "Currency".$code_iso)
-	{
+	if ($outputlangs->trans("Currency".$code_iso) != "Currency".$code_iso) {
 		return ($withcode ? $code_iso.' - ' : '').$outputlangs->trans("Currency".$code_iso);
 	}
 
@@ -577,12 +543,10 @@ function currency_name($code_iso, $withcode = '', $outputlangs = null)
 	$sql .= " WHERE code_iso='".$db->escape($code_iso)."'";
 
 	$resql = $db->query($sql);
-	if ($resql)
-	{
+	if ($resql) {
 		$num = $db->num_rows($resql);
 
-		if ($num)
-		{
+		if ($num) {
 			$obj = $db->fetch_object($resql);
 			$label = ($obj->label != '-' ? $obj->label : '');
 			if ($withcode) return ($label == $code_iso) ? "$code_iso" : "$code_iso - $label";
@@ -611,12 +575,10 @@ function getFormeJuridiqueLabel($code)
 
 	dol_syslog("Company.lib::getFormeJuridiqueLabel", LOG_DEBUG);
 	$resql = $db->query($sql);
-	if ($resql)
-	{
+	if ($resql) {
 		$num = $db->num_rows($resql);
 
-		if ($num)
-		{
+		if ($num) {
 			$obj = $db->fetch_object($resql);
 			$label = ($obj->libelle != '-' ? $obj->libelle : '');
 			return $label;
@@ -675,8 +637,7 @@ function getCountriesInEEC()
 		//'CH',	// Switzerland - No. Swizerland in not in EEC
 	);
 
-	if (!empty($conf->global->MAIN_COUNTRIES_IN_EEC))
-	{
+	if (!empty($conf->global->MAIN_COUNTRIES_IN_EEC)) {
 		// For example MAIN_COUNTRIES_IN_EEC = 'AT,BE,BG,CY,CZ,DE,DK,EE,ES,FI,FR,GB,GR,HR,NL,HU,IE,IM,IT,LT,LU,LV,MC,MT,PL,PT,RO,SE,SK,SI,UK'
 		$country_code_in_EEC = explode(',', $conf->global->MAIN_COUNTRIES_IN_EEC);
 	}
@@ -719,13 +680,11 @@ function show_projects($conf, $langs, $db, $object, $backtopage = '', $nocreatel
 
 	$i = -1;
 
-	if (!empty($conf->projet->enabled) && $user->rights->projet->lire)
-	{
+	if (!empty($conf->projet->enabled) && $user->rights->projet->lire) {
 		$langs->load("projects");
 
 		$newcardbutton = '';
-		if (!empty($conf->projet->enabled) && $user->rights->projet->creer && empty($nocreatelink))
-		{
+		if (!empty($conf->projet->enabled) && $user->rights->projet->creer && empty($nocreatelink)) {
 			$newcardbutton .= dolGetButtonTitle($langs->trans('AddProject'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/projet/card.php?socid='.$object->id.'&amp;action=create&amp;backtopage='.urlencode($backtopage));
 		}
 
@@ -743,8 +702,7 @@ function show_projects($conf, $langs, $db, $object, $backtopage = '', $nocreatel
 		$sql .= " ORDER BY p.dateo DESC";
 
 		$result = $db->query($sql);
-		if ($result)
-		{
+		if ($result) {
 			$num = $db->num_rows($result);
 
 			print '<tr class="liste_titre">';
@@ -758,24 +716,21 @@ function show_projects($conf, $langs, $db, $object, $backtopage = '', $nocreatel
 			print '<td class="right">'.$langs->trans("Status").'</td>';
 			print '</tr>';
 
-			if ($num > 0)
-			{
+			if ($num > 0) {
 				require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 
 				$projecttmp = new Project($db);
 
 				$i = 0;
 
-				while ($i < $num)
-				{
+				while ($i < $num) {
 					$obj = $db->fetch_object($result);
 					$projecttmp->fetch($obj->id);
 
 					// To verify role of users
 					$userAccess = $projecttmp->restrictedProjectArea($user);
 
-					if ($user->rights->projet->lire && $userAccess > 0)
-					{
+					if ($user->rights->projet->lire && $userAccess > 0) {
 						print '<tr class="oddeven">';
 
 						// Ref
@@ -791,8 +746,7 @@ function show_projects($conf, $langs, $db, $object, $backtopage = '', $nocreatel
 						print '<td class="center">'.dol_print_date($db->jdate($obj->de), "day").'</td>';
 						// Opp amount
 						print '<td class="right">';
-						if ($obj->opp_status_code)
-						{
+						if ($obj->opp_status_code) {
 							print price($obj->opp_amount, 1, '', 1, -1, -1, '');
 						}
 						print '</td>';
@@ -889,8 +843,7 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '')
 	if (!$sortorder) $sortorder = "ASC";
 	if (!$sortfield) $sortfield = "t.lastname";
 
-	if (!empty($conf->clicktodial->enabled))
-	{
+	if (!empty($conf->clicktodial->enabled)) {
 		$user->fetch_clicktodial(); // lecture des infos de clicktodial du user
 	}
 
@@ -917,10 +870,8 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '')
 		't.statut'=>array('label'=>"Status", 'checked'=>1, 'position'=>50, 'class'=>'center'),
 	);
 	// Extra fields
-	if (is_array($extrafields->attributes[$contactstatic->table_element]['label']) && count($extrafields->attributes[$contactstatic->table_element]['label']))
-	{
-		foreach ($extrafields->attributes[$contactstatic->table_element]['label'] as $key => $val)
-		{
+	if (is_array($extrafields->attributes[$contactstatic->table_element]['label']) && count($extrafields->attributes[$contactstatic->table_element]['label'])) {
+		foreach ($extrafields->attributes[$contactstatic->table_element]['label'] as $key => $val) {
 			if (!empty($extrafields->attributes[$contactstatic->table_element]['list'][$key])) {
 				$arrayfields["ef.".$key] = array(
 					'label'=>$extrafields->attributes[$contactstatic->table_element]['label'][$key],
@@ -933,8 +884,7 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '')
 
 	// Initialize array of search criterias
 	$search = array();
-	foreach ($arrayfields as $key => $val)
-	{
+	foreach ($arrayfields as $key => $val) {
 		$queryName = 'search_'.substr($key, 2);
 		if (GETPOST($queryName, 'alpha')) {
 			$search[substr($key, 2)] = GETPOST($queryName, 'alpha');
@@ -943,8 +893,7 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '')
 	$search_array_options = $extrafields->getOptionalsFromPost($contactstatic->table_element, '', 'search_');
 
 	// Purge search criteria
-	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
-	{
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All tests are required to be compatible with all browsers
 		$search_status = '';
 		$search_name         = '';
 		$search_roles        = array();
@@ -953,8 +902,7 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '')
 		$search = array();
 		$search_array_options = array();
 
-		foreach ($contactstatic->fields as $key => $val)
-   		{
+		foreach ($contactstatic->fields as $key => $val) {
    			$search[$key] = '';
    		}
 	}
@@ -963,8 +911,7 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '')
 	$arrayfields = dol_sort_array($arrayfields, 'position');
 
 	$newcardbutton = '';
-	if ($user->rights->societe->contact->creer)
-	{
+	if ($user->rights->societe->contact->creer) {
 		$addcontact = (!empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("AddContact") : $langs->trans("AddContactAddress"));
 		$newcardbutton .= dolGetButtonTitle($addcontact, '', 'fa fa-plus-circle', DOL_URL_ROOT.'/contact/card.php?socid='.$object->id.'&amp;action=create&amp;backtopage='.urlencode($backtopage));
 	}
@@ -1030,14 +977,12 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '')
 	// Fields title search
 	// --------------------------------------------------------------------
 	print '<tr class="liste_titre">';
-	foreach ($contactstatic->fields as $key => $val)
-	{
+	foreach ($contactstatic->fields as $key => $val) {
 		$align = '';
 		if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) $align .= ($align ? ' ' : '').'center';
 		if (in_array($val['type'], array('timestamp'))) $align .= ($align ? ' ' : '').'nowrap';
 		if ($key == 'status' || $key == 'statut') $align .= ($align ? ' ' : '').'center';
-		if (!empty($arrayfields['t.'.$key]['checked']) || !empty($arrayfields['sc.'.$key]['checked']))
-		{
+		if (!empty($arrayfields['t.'.$key]['checked']) || !empty($arrayfields['sc.'.$key]['checked'])) {
 			print '<td class="liste_titre'.($align ? ' '.$align : '').'">';
 			if (in_array($key, array('statut'))) {
 				print $form->selectarray('search_status', array('-1'=>'', '0'=>$contactstatic->LibStatut(0, 1), '1'=>$contactstatic->LibStatut(1, 1)), $search_status);
@@ -1067,8 +1012,7 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '')
 	// Fields title label
 	// --------------------------------------------------------------------
 	print '<tr class="liste_titre">';
-	foreach ($contactstatic->fields as $key => $val)
-	{
+	foreach ($contactstatic->fields as $key => $val) {
 		$align = '';
 		if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) $align .= ($align ? ' ' : '').'center';
 		if (in_array($val['type'], array('timestamp'))) $align .= ($align ? ' ' : '').'nowrap';
@@ -1091,12 +1035,10 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '')
 
 	$i = -1;
 
-	if ($num || (GETPOST('button_search') || GETPOST('button_search.x') || GETPOST('button_search_x')))
-	{
+	if ($num || (GETPOST('button_search') || GETPOST('button_search.x') || GETPOST('button_search_x'))) {
 		$i = 0;
 
-		while ($i < $num)
-		{
+		while ($i < $num) {
 			$obj = $db->fetch_object($result);
 
 			$contactstatic->id = $obj->rowid;
@@ -1129,10 +1071,8 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '')
 				setEventMessages(null, $contactstatic->errors, 'errors');
 			}
 
-			if (is_array($contactstatic->array_options))
-			{
-				foreach ($contactstatic->array_options as $key => $val)
-				{
+			if (is_array($contactstatic->array_options)) {
+				foreach ($contactstatic->array_options as $key => $val) {
 					$obj->$key = $val;
 				}
 			}
@@ -1140,16 +1080,14 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '')
 			print '<tr class="oddeven">';
 
 			// ID
-			if (!empty($arrayfields['t.rowid']['checked']))
-			{
+			if (!empty($arrayfields['t.rowid']['checked'])) {
 				print '<td>';
 				print $contactstatic->id;
 				print '</td>';
 			}
 
 			// Photo - Name
-			if (!empty($arrayfields['t.name']['checked']))
-			{
+			if (!empty($arrayfields['t.name']['checked'])) {
 				print '<td>';
 				print $form->showphoto('contact', $contactstatic, 0, 0, 0, 'photorefnoborder valignmiddle marginrightonly', 'small', 1, 0, 1);
 				print $contactstatic->getNomUrl(0, '', 0, '&backtopage='.urlencode($backtopage));
@@ -1157,32 +1095,28 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '')
 			}
 
 			// Job position
-			if (!empty($arrayfields['t.poste']['checked']))
-			{
+			if (!empty($arrayfields['t.poste']['checked'])) {
 				print '<td>';
 				if ($obj->poste) print $obj->poste;
 				print '</td>';
 			}
 
 			// Address - Phone - Email
-			if (!empty($arrayfields['t.address']['checked']))
-			{
+			if (!empty($arrayfields['t.address']['checked'])) {
 				print '<td>';
 				print $contactstatic->getBannerAddress('contact', $object);
 				print '</td>';
 			}
 
 			// Role
-			if (!empty($arrayfields['sc.role']['checked']))
-			{
+			if (!empty($arrayfields['sc.role']['checked'])) {
 				print '<td>';
 				print $formcompany->showRoles("roles", $contactstatic, 'view');
 				print '</td>';
 			}
 
 			// Status
-			if (!empty($arrayfields['t.statut']['checked']))
-			{
+			if (!empty($arrayfields['t.statut']['checked'])) {
 				print '<td class="center">'.$contactstatic->getLibStatut(5).'</td>';
 			}
 
@@ -1194,16 +1128,14 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '')
 			print '<td align="right">';
 
 			// Add to agenda
-			if (!empty($conf->agenda->enabled) && $user->rights->agenda->myactions->create)
-			{
+			if (!empty($conf->agenda->enabled) && $user->rights->agenda->myactions->create) {
 				print '<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&actioncode=&contactid='.$obj->rowid.'&socid='.$object->id.'&backtopage='.urlencode($backtopage).'">';
 				print img_object($langs->trans("Event"), "action");
 				print '</a> &nbsp; ';
 			}
 
 			// Edit
-			if ($user->rights->societe->contact->creer)
-			{
+			if ($user->rights->societe->contact->creer) {
 				print '<a class="editfielda paddingleft" href="'.DOL_URL_ROOT.'/contact/card.php?action=edit&id='.$obj->rowid.'&backtopage='.urlencode($backtopage).'">';
 				print img_edit();
 				print '</a>';
@@ -1288,8 +1220,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
 		$search_end = $end_year.'-'.$end_month.'-'.$end_day.' 23:59:59';
 		$tms_end = strtotime($search_end);
 	}
-	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All test are required to be compatible with all browsers
-	{
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All test are required to be compatible with all browsers
 		$search_start = '';
 		$tms_start = '';
 		$search_end = '';
@@ -1316,8 +1247,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
 
 	$sql = '';
 
-	if (!empty($conf->agenda->enabled))
-	{
+	if (!empty($conf->agenda->enabled)) {
 		// Recherche histo sur actioncomm
 		if (is_object($objcon) && $objcon->id > 0) {
 			$sql = "SELECT DISTINCT a.id, a.label as label,";
@@ -1370,32 +1300,25 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
 			if (is_object($filterobj) && in_array(get_class($filterobj), array('Societe', 'Client', 'Fournisseur')) && $filterobj->id) $sql .= " AND a.fk_soc = ".$filterobj->id;
 			elseif (is_object($filterobj) && get_class($filterobj) == 'Dolresource') { /* Nothing */ }
 			elseif (is_object($filterobj) && get_class($filterobj) == 'Project' && $filterobj->id) $sql .= " AND a.fk_project = ".$filterobj->id;
-			elseif (is_object($filterobj) && get_class($filterobj) == 'Adherent')
-			{
+			elseif (is_object($filterobj) && get_class($filterobj) == 'Adherent') {
 				$sql .= " AND a.fk_element = m.rowid AND a.elementtype = 'member'";
 				if ($filterobj->id) $sql .= " AND a.fk_element = ".$filterobj->id;
-			} elseif (is_object($filterobj) && get_class($filterobj) == 'CommandeFournisseur')
-			{
+			} elseif (is_object($filterobj) && get_class($filterobj) == 'CommandeFournisseur') {
 				$sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'order_supplier'";
 				if ($filterobj->id) $sql .= " AND a.fk_element = ".$filterobj->id;
-			} elseif (is_object($filterobj) && get_class($filterobj) == 'Product')
-			{
+			} elseif (is_object($filterobj) && get_class($filterobj) == 'Product') {
 				$sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'product'";
 				if ($filterobj->id) $sql .= " AND a.fk_element = ".$filterobj->id;
-			} elseif (is_object($filterobj) && get_class($filterobj) == 'Ticket')
-			{
+			} elseif (is_object($filterobj) && get_class($filterobj) == 'Ticket') {
 				$sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'ticket'";
 				if ($filterobj->id) $sql .= " AND a.fk_element = ".$filterobj->id;
-			} elseif (is_object($filterobj) && get_class($filterobj) == 'BOM')
-			{
+			} elseif (is_object($filterobj) && get_class($filterobj) == 'BOM') {
 				$sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'bom'";
 				if ($filterobj->id) $sql .= " AND a.fk_element = ".$filterobj->id;
-			} elseif (is_object($filterobj) && get_class($filterobj) == 'Contrat')
-			{
+			} elseif (is_object($filterobj) && get_class($filterobj) == 'Contrat') {
 				$sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'contract'";
 				if ($filterobj->id) $sql .= " AND a.fk_element = ".$filterobj->id;
-			} elseif (is_object($filterobj) && is_array($filterobj->fields) && is_array($filterobj->fields['rowid']) && is_array($filterobj->fields['ref']) && $filterobj->table_element && $filterobj->element)
-			{
+			} elseif (is_object($filterobj) && is_array($filterobj->fields) && is_array($filterobj->fields['rowid']) && is_array($filterobj->fields['ref']) && $filterobj->table_element && $filterobj->element) {
 				// Generic case
 				$sql .= " AND a.fk_element = o.rowid AND a.elementtype = '".$db->escape($filterobj->element).($module ? '@'.$module : '')."'";
 				if ($filterobj->id) $sql .= " AND a.fk_element = ".$filterobj->id;
@@ -1445,18 +1368,15 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
 	}
 
 	//TODO Add limit in nb of results
-	if ($sql)
-	{
+	if ($sql) {
 		$sql .= $db->order($sortfield_new, $sortorder);
 		dol_syslog("company.lib::show_actions_done", LOG_DEBUG);
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$i = 0;
 			$num = $db->num_rows($resql);
 
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$obj = $db->fetch_object($resql);
 
 				if ($obj->type == 'action') {
@@ -1527,8 +1447,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
 		}
 	}
 
-	if (!empty($conf->agenda->enabled) || (!empty($conf->mailing->enabled) && !empty($objcon->email)))
-	{
+	if (!empty($conf->agenda->enabled) || (!empty($conf->mailing->enabled) && !empty($objcon->email))) {
 		$delay_warning = $conf->global->MAIN_DELAY_ACTIONS_TODO * 24 * 60 * 60;
 
 		require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
@@ -1540,13 +1459,14 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
 
 		$actionstatic = new ActionComm($db);
 		$userstatic = new User($db);
+		$userlinkcache = array();
 		$contactstatic = new Contact($db);
+		$elementlinkcache = array();
 
 		$out .= '<form name="listactionsfilter" class="listactionsfilter" action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 		$out .= '<input type="hidden" name="token" value="'.newToken().'">';
 		if ($objcon && get_class($objcon) == 'Contact' &&
-			(is_null($filterobj) || get_class($filterobj) == 'Societe'))
-		{
+			(is_null($filterobj) || get_class($filterobj) == 'Societe')) {
 			$out .= '<input type="hidden" name="id" value="'.$objcon->id.'" />';
 		} else {
 			$out .= '<input type="hidden" name="id" value="'.$filterobj->id.'" />';
@@ -1559,8 +1479,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
 		$out .= '<table class="noborder centpercent">';
 
 		$out .= '<tr class="liste_titre">';
-		if ($donetodo)
-		{
+		if ($donetodo) {
 			$out .= '<td class="liste_titre"></td>';
 		}
 		$out .= '<td class="liste_titre"></td>';
@@ -1581,8 +1500,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
 		$out .= '</tr>';
 
 		$out .= '<tr class="liste_titre">';
-		if ($donetodo)
-		{
+		if ($donetodo) {
 			$tmp = '';
 			if (get_class($filterobj) == 'Societe') $tmp .= '<a href="'.DOL_URL_ROOT.'/comm/action/list.php?action=show_list&socid='.$filterobj->id.'&status=done">';
 			$tmp .= ($donetodo != 'done' ? $langs->trans("ActionsToDoShort") : '');
@@ -1607,8 +1525,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
 		$caction = new CActionComm($db);
 		$arraylist = $caction->liste_array(1, 'code', '', (empty($conf->global->AGENDA_USE_EVENT_TYPE) ? 1 : 0), '', 1);
 
-		foreach ($histo as $key => $value)
-		{
+		foreach ($histo as $key => $value) {
 			$actionstatic->fetch($histo[$key]['id']); // TODO Do we need this, we already have a lot of data of line into $histo
 
 			$actionstatic->type_picto = $histo[$key]['apicto'];
@@ -1617,8 +1534,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
 			$out .= '<tr class="oddeven">';
 
 			// Done or todo
-			if ($donetodo)
-			{
+			if ($donetodo) {
 				$out .= '<td class="nowrap">';
 				$out .= '</td>';
 			}
@@ -1639,10 +1555,15 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
 			//$userstatic->id=$histo[$key]['userid'];
 			//$userstatic->login=$histo[$key]['login'];
 			//$out.=$userstatic->getLoginUrl(1);
-			if ($histo[$key]['userid'] > 0)
-			{
-				$userstatic->fetch($histo[$key]['userid']); // TODO Introduce a cache on users fetched
-				$out .= $userstatic->getNomUrl(-1, '', 0, 0, 16, 0, 'firstelselast', '');
+			if ($histo[$key]['userid'] > 0) {
+				if (isset($userlinkcache[$histo[$key]['userid']])) {
+					$link = $userlinkcache[$histo[$key]['userid']];
+				} else {
+					$userstatic->fetch($histo[$key]['userid']);
+					$link = $userstatic->getNomUrl(-1, '', 0, 0, 16, 0, 'firstelselast', '');
+					$userlinkcache[$histo[$key]['userid']] = $link;
+				}
+				$out .= $link;
 			}
 			$out .= '</td>';
 
@@ -1650,8 +1571,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
 			$out .= '<td>';
 			// TODO Code common with code into showactions
 			$imgpicto = '';
-			if (!empty($conf->global->AGENDA_USE_EVENT_TYPE))
-			{
+			if (!empty($conf->global->AGENDA_USE_EVENT_TYPE)) {
 				if ($actionstatic->type_picto) {
 					$imgpicto .= img_picto('', $actionstatic->type_picto);
 				}
@@ -1679,8 +1599,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
 
 			// Title
 			$out .= '<td>';
-			if (isset($histo[$key]['type']) && $histo[$key]['type'] == 'action')
-			{
+			if (isset($histo[$key]['type']) && $histo[$key]['type'] == 'action') {
 				$transcode = $langs->trans("Action".$histo[$key]['acode']);
 				$libelle = ($transcode != "Action".$histo[$key]['acode'] ? $transcode : $histo[$key]['alabel']);
 				//$actionstatic->libelle=$libelle;
@@ -1688,8 +1607,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
 				$actionstatic->id = $histo[$key]['id'];
 				$out .= dol_trunc($libelle, 120);
 			}
-			if (isset($histo[$key]['type']) && $histo[$key]['type'] == 'mailing')
-			{
+			if (isset($histo[$key]['type']) && $histo[$key]['type'] == 'mailing') {
 				$out .= '<a href="'.DOL_URL_ROOT.'/comm/mailing/card.php?id='.$histo[$key]['id'].'">'.img_object($langs->trans("ShowEMailing"), "email").' ';
 				$transcode = $langs->trans("Action".$histo[$key]['acode']);
 				$libelle = ($transcode != "Action".$histo[$key]['acode'] ? $transcode : 'Send mass mailing');
@@ -1700,8 +1618,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
 			// Date
 			$out .= '<td class="center nowrap">';
 			$out .= dol_print_date($histo[$key]['datestart'], 'dayhour', 'tzuserrel');
-			if ($histo[$key]['dateend'] && $histo[$key]['dateend'] != $histo[$key]['datestart'])
-			{
+			if ($histo[$key]['dateend'] && $histo[$key]['dateend'] != $histo[$key]['datestart']) {
 				$tmpa = dol_getdate($histo[$key]['datestart'], true);
 				$tmpb = dol_getdate($histo[$key]['dateend'], true);
 				if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year']) $out .= '-'.dol_print_date($histo[$key]['dateend'], 'hour', 'tzuserrel');
@@ -1720,15 +1637,24 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
 
 			// Linked object
 			$out .= '<td class="nowraponall">';
-			if (isset($histo[$key]['elementtype']) && !empty($histo[$key]['fk_element']))
-			{
-				$out .= dolGetElementUrl($histo[$key]['fk_element'], $histo[$key]['elementtype'], 1);
-			} else $out .= '&nbsp;';
+			if (isset($histo[$key]['elementtype']) && !empty($histo[$key]['fk_element'])) {
+				if (isset($elementlinkcache[$histo[$key]['elementtype']]) && isset($elementlinkcache[$histo[$key]['elementtype']][$histo[$key]['fk_element']])) {
+					$link = $elementlinkcache[$histo[$key]['elementtype']][$histo[$key]['fk_element']];
+				} else {
+					if (!isset($elementlinkcache[$histo[$key]['elementtype']])) {
+						$elementlinkcache[$histo[$key]['elementtype']] = array();
+					}
+					$link = dolGetElementUrl($histo[$key]['fk_element'], $histo[$key]['elementtype'], 1);
+					$elementlinkcache[$histo[$key]['elementtype']][$histo[$key]['fk_element']] = $link;
+				}
+				$out .= $link;
+			} else {
+				$out .= '&nbsp;';
+			}
 			$out .= '</td>';
 
 			// Contact(s) for action
-			if (empty($objcon->id) && isset($histo[$key]['contact_id']) && $histo[$key]['contact_id'] > 0)
-			{
+			if (empty($objcon->id) && isset($histo[$key]['contact_id']) && $histo[$key]['contact_id'] > 0) {
 				$contactstatic->lastname = $histo[$key]['lastname'];
 				$contactstatic->firstname = $histo[$key]['firstname'];
 				$contactstatic->id = $histo[$key]['contact_id'];
@@ -1799,8 +1725,7 @@ function show_subsidiaries($conf, $langs, $db, $object)
 	$result = $db->query($sql);
 	$num = $db->num_rows($result);
 
-	if ($num)
-	{
+	if ($num) {
 		$socstatic = new Societe($db);
 
 		print load_fiche_titre($langs->trans("Subsidiaries"), '', '');
@@ -1814,8 +1739,7 @@ function show_subsidiaries($conf, $langs, $db, $object)
 
 		$i = 0;
 
-		while ($i < $num)
-		{
+		while ($i < $num) {
 			$obj = $db->fetch_object($result);
 
 			$socstatic->id = $obj->rowid;
@@ -1873,8 +1797,7 @@ function addEventTypeSQL(&$sql, $actioncode, $donetodo, $now, $filters, $sqlANDO
 	global $conf, $db;
 	// Condition on actioncode
 
-	if (empty($conf->global->AGENDA_USE_EVENT_TYPE))
-		{
+	if (empty($conf->global->AGENDA_USE_EVENT_TYPE)) {
 		if ($actioncode == 'AC_NON_AUTO') $sql .= " $sqlANDOR c.type != 'systemauto'";
 		elseif ($actioncode == 'AC_ALL_AUTO') $sql .= " $sqlANDOR c.type = 'systemauto'";
 		else {
@@ -1896,12 +1819,12 @@ function addEventTypeSQL(&$sql, $actioncode, $donetodo, $now, $filters, $sqlANDO
 }
 
 /**
- * 		Add Mailing Event Type SQL
+ *  Add Mailing Event Type SQL
  *
- * 		@param	string	    $actioncode		Action code
- * 		@param	string		$objcon		    objcon
- * 		@param	Object		$filterobj      filterobj
- * 		@return	string
+ *  @param	string	    $actioncode		Action code
+ *  @param	Object		$objcon		    objcon
+ *  @param	Object		$filterobj      filterobj
+ *  @return	string
  */
 function addMailingEventTypeSQL($actioncode, $objcon, $filterobj)
 {
diff --git a/htdocs/core/lib/contact.lib.php b/htdocs/core/lib/contact.lib.php
index 1589809dd6b..7f7ea22e254 100644
--- a/htdocs/core/lib/contact.lib.php
+++ b/htdocs/core/lib/contact.lib.php
@@ -59,54 +59,54 @@ function contact_prepare_head(Contact $object)
 	$tab++;
 
 	// Related items
-    if (! empty($conf->commande->enabled) || ! empty($conf->propal->enabled) || ! empty($conf->facture->enabled) || ! empty($conf->ficheinter->enabled) || !empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled))
-    {
-        $head[$tab][0] = DOL_URL_ROOT.'/contact/consumption.php?id='.$object->id;
-        $head[$tab][1] = $langs->trans("Referers");
-        $head[$tab][2] = 'consumption';
-        $tab++;
-    }
+	if (!empty($conf->commande->enabled) || !empty($conf->propal->enabled) || !empty($conf->facture->enabled) || !empty($conf->ficheinter->enabled) || !empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled))
+	{
+		$head[$tab][0] = DOL_URL_ROOT.'/contact/consumption.php?id='.$object->id;
+		$head[$tab][1] = $langs->trans("Referers");
+		$head[$tab][2] = 'consumption';
+		$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, $tab, 'contact');
+	// 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, $tab, 'contact');
 
-    // Notes
-    if (empty($conf->global->MAIN_DISABLE_NOTES_TAB)) {
-        $nbNote = (empty($object->note_private) ? 0 : 1) + (empty($object->note_public) ? 0 : 1);
-        $head[$tab][0] = DOL_URL_ROOT.'/contact/note.php?id='.$object->id;
-        $head[$tab][1] = $langs->trans("Note");
-        if ($nbNote > 0) $head[$tab][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
-        $head[$tab][2] = 'note';
-        $tab++;
-    }
+	// Notes
+	if (empty($conf->global->MAIN_DISABLE_NOTES_TAB)) {
+		$nbNote = (empty($object->note_private) ? 0 : 1) + (empty($object->note_public) ? 0 : 1);
+		$head[$tab][0] = DOL_URL_ROOT.'/contact/note.php?id='.$object->id;
+		$head[$tab][1] = $langs->trans("Note");
+		if ($nbNote > 0) $head[$tab][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
+		$head[$tab][2] = 'note';
+		$tab++;
+	}
 
-    require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-    require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-    $upload_dir = $conf->societe->dir_output."/contact/".dol_sanitizeFileName($object->ref);
-    $nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
-    $nbLinks = Link::count($db, $object->element, $object->id);
-    $head[$tab][0] = DOL_URL_ROOT.'/contact/document.php?id='.$object->id;
-    $head[$tab][1] = $langs->trans("Documents");
-    if (($nbFiles + $nbLinks) > 0) $head[$tab][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
-    $head[$tab][2] = 'documents';
-    $tab++;
+	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
+	$upload_dir = $conf->societe->dir_output."/contact/".dol_sanitizeFileName($object->ref);
+	$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
+	$nbLinks = Link::count($db, $object->element, $object->id);
+	$head[$tab][0] = DOL_URL_ROOT.'/contact/document.php?id='.$object->id;
+	$head[$tab][1] = $langs->trans("Documents");
+	if (($nbFiles + $nbLinks) > 0) $head[$tab][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
+	$head[$tab][2] = 'documents';
+	$tab++;
 
-    // Agenda / Events
-    $head[$tab][0] = DOL_URL_ROOT.'/contact/agenda.php?id='.$object->id;
-    $head[$tab][1] .= $langs->trans("Events");
-    if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read)))
-    {
-        $head[$tab][1] .= '/';
-        $head[$tab][1] .= $langs->trans("Agenda");
-    }
-    $head[$tab][2] = 'agenda';
-    $tab++;
+	// Agenda / Events
+	$head[$tab][0] = DOL_URL_ROOT.'/contact/agenda.php?id='.$object->id;
+	$head[$tab][1] .= $langs->trans("Events");
+	if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read)))
+	{
+		$head[$tab][1] .= '/';
+		$head[$tab][1] .= $langs->trans("Agenda");
+	}
+	$head[$tab][2] = 'agenda';
+	$tab++;
 
-    // Log
-    /*
+	// Log
+	/*
     $head[$tab][0] = DOL_URL_ROOT.'/contact/info.php?id='.$object->id;
 	$head[$tab][1] = $langs->trans("Info");
 	$head[$tab][2] = 'info';
diff --git a/htdocs/core/lib/contract.lib.php b/htdocs/core/lib/contract.lib.php
index b7d3c45bee3..c72c46c8916 100644
--- a/htdocs/core/lib/contract.lib.php
+++ b/htdocs/core/lib/contract.lib.php
@@ -42,37 +42,37 @@ function contract_prepare_head(Contrat $object)
 
 	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
 	{
-	    $nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external'));
-	    $head[$h][0] = DOL_URL_ROOT.'/contrat/contact.php?id='.$object->id;
+		$nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external'));
+		$head[$h][0] = DOL_URL_ROOT.'/contrat/contact.php?id='.$object->id;
 		$head[$h][1] = $langs->trans("ContactsAddresses");
 		if ($nbContact > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';
 		$head[$h][2] = 'contact';
 		$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, 'contract');
+	// 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, 'contract');
 
-    if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
-    {
-    	$nbNote = 0;
-        if (!empty($object->note_private)) $nbNote++;
+	if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
+	{
+		$nbNote = 0;
+		if (!empty($object->note_private)) $nbNote++;
 		if (!empty($object->note_public)) $nbNote++;
-    	$head[$h][0] = DOL_URL_ROOT.'/contrat/note.php?id='.$object->id;
-    	$head[$h][1] = $langs->trans("Notes");
+		$head[$h][0] = DOL_URL_ROOT.'/contrat/note.php?id='.$object->id;
+		$head[$h][1] = $langs->trans("Notes");
 		if ($nbNote > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
-    	$head[$h][2] = 'note';
-    	$h++;
-    }
+		$head[$h][2] = 'note';
+		$h++;
+	}
 
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-    require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
 	$upload_dir = $conf->contrat->dir_output."/".dol_sanitizeFileName($object->ref);
 	$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
-    $nbLinks = Link::count($db, $object->element, $object->id);
+	$nbLinks = Link::count($db, $object->element, $object->id);
 	$head[$h][0] = DOL_URL_ROOT.'/contrat/document.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("Documents");
 	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
@@ -89,7 +89,7 @@ function contract_prepare_head(Contrat $object)
 	$head[$h][2] = 'agenda';
 	$h++;
 
-    complete_head_from_modules($conf, $langs, $object, $head, $h, 'contract', 'remove');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'contract', 'remove');
 
 	return $head;
 }
@@ -119,13 +119,13 @@ function contract_admin_prepare_head()
 
 	$head[$h][0] = DOL_URL_ROOT.'/contrat/admin/contract_extrafields.php';
 	$head[$h][1] = $langs->trans("ExtraFields");
-    $head[$h][2] = 'attributes';
-    $h++;
+	$head[$h][2] = 'attributes';
+	$h++;
 
-    $head[$h][0] = DOL_URL_ROOT.'/contrat/admin/contractdet_extrafields.php';
-    $head[$h][1] = $langs->trans("ExtraFieldsLines");
-    $head[$h][2] = 'attributeslines';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT.'/contrat/admin/contractdet_extrafields.php';
+	$head[$h][1] = $langs->trans("ExtraFieldsLines");
+	$head[$h][2] = 'attributeslines';
+	$h++;
 
 	complete_head_from_modules($conf, $langs, null, $head, $h, 'contract_admin', 'remove');
 
diff --git a/htdocs/core/lib/cron.lib.php b/htdocs/core/lib/cron.lib.php
index 1779e77213e..084b781d3b4 100644
--- a/htdocs/core/lib/cron.lib.php
+++ b/htdocs/core/lib/cron.lib.php
@@ -30,21 +30,21 @@
  */
 function cronadmin_prepare_head()
 {
-    global $langs, $conf, $user;
-    $h = 0;
-    $head = array();
+	global $langs, $conf, $user;
+	$h = 0;
+	$head = array();
 
-    $head[$h][0] = dol_buildpath('/cron/admin/cron.php', 1);
-    $head[$h][1] = $langs->trans("Miscellaneous");
-    $head[$h][2] = 'setup';
-    $h++;
+	$head[$h][0] = dol_buildpath('/cron/admin/cron.php', 1);
+	$head[$h][1] = $langs->trans("Miscellaneous");
+	$head[$h][2] = 'setup';
+	$h++;
 
-    complete_head_from_modules($conf, $langs, null, $head, $h, 'cronadmin');
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'cronadmin');
 
-    complete_head_from_modules($conf, $langs, null, $head, $h, 'cronadmin', 'remove');
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'cronadmin', 'remove');
 
 
-    return $head;
+	return $head;
 }
 
 /**
@@ -99,8 +99,8 @@ function dol_print_cron_urls()
 	print ' '.$langs->trans("OrToLaunchASpecificJob").'<br>';
 	$url = $urlwithroot.'/public/cron/cron_run_jobs.php?'.(empty($conf->global->CRON_KEY) ? '' : 'securitykey='.$conf->global->CRON_KEY.'&').'userlogin='.$user->login.'&id=cronjobid';
 	print img_picto('', 'globe').' <a href="'.$url.'" target="_blank">'.$url."</a><br>\n";
-    print '</div>';
-    print '<br>';
+	print '</div>';
+	print '<br>';
 
 	$logintouse = 'firstadmin';
 	if ($user->admin) $logintouse = $user->login;
@@ -114,18 +114,18 @@ function dol_print_cron_urls()
 	// Add note
 	if (empty($conf->global->CRON_DISABLE_TUTORIAL_CRON))
 	{
-    	$linuxlike = 1;
-    	if (preg_match('/^win/i', PHP_OS)) $linuxlike = 0;
-    	if (preg_match('/^mac/i', PHP_OS)) $linuxlike = 0;
-    	print $langs->trans("Note").': ';
-    	if ($linuxlike)
-    	{
-    		print $langs->trans("CronExplainHowToRunUnix");
-    		print '<br>';
-    		print '<textarea class="quatrevingtpercent">*/5 * * * * pathtoscript/scripts/cron/cron_run_jobs.php '.(empty($conf->global->CRON_KEY) ? 'securitykey' : ''.$conf->global->CRON_KEY.'').' '.$logintouse.' &gt; '.DOL_DATA_ROOT.'/cron_run_jobs.php.log</textarea><br>';
-    	} else {
-    		print $langs->trans("CronExplainHowToRunWin");
-    	}
+		$linuxlike = 1;
+		if (preg_match('/^win/i', PHP_OS)) $linuxlike = 0;
+		if (preg_match('/^mac/i', PHP_OS)) $linuxlike = 0;
+		print $langs->trans("Note").': ';
+		if ($linuxlike)
+		{
+			print $langs->trans("CronExplainHowToRunUnix");
+			print '<br>';
+			print '<textarea class="quatrevingtpercent">*/5 * * * * pathtoscript/scripts/cron/cron_run_jobs.php '.(empty($conf->global->CRON_KEY) ? 'securitykey' : ''.$conf->global->CRON_KEY.'').' '.$logintouse.' &gt; '.DOL_DATA_ROOT.'/cron_run_jobs.php.log</textarea><br>';
+		} else {
+			print $langs->trans("CronExplainHowToRunWin");
+		}
 	}
 
 	return 0;
diff --git a/htdocs/core/lib/date.lib.php b/htdocs/core/lib/date.lib.php
index 48e347afbd1..284bcffe4bb 100644
--- a/htdocs/core/lib/date.lib.php
+++ b/htdocs/core/lib/date.lib.php
@@ -33,34 +33,34 @@
  */
 function get_tz_array()
 {
-    $tzarray = array(
-        -11=>"Pacific/Midway",
-        -10=>"Pacific/Fakaofo",
-        -9=>"America/Anchorage",
-        -8=>"America/Los_Angeles",
-        -7=>"America/Dawson_Creek",
-        -6=>"America/Chicago",
-        -5=>"America/Bogota",
-        -4=>"America/Anguilla",
-        -3=>"America/Araguaina",
-        -2=>"America/Noronha",
-        -1=>"Atlantic/Azores",
-        0=>"Africa/Abidjan",
-        1=>"Europe/Paris",
-        2=>"Europe/Helsinki",
-        3=>"Europe/Moscow",
-        4=>"Asia/Dubai",
-        5=>"Asia/Karachi",
-        6=>"Indian/Chagos",
-        7=>"Asia/Jakarta",
-        8=>"Asia/Hong_Kong",
-        9=>"Asia/Tokyo",
-        10=>"Australia/Sydney",
-        11=>"Pacific/Noumea",
-        12=>"Pacific/Auckland",
-        13=>"Pacific/Enderbury"
-    );
-    return $tzarray;
+	$tzarray = array(
+		-11=>"Pacific/Midway",
+		-10=>"Pacific/Fakaofo",
+		-9=>"America/Anchorage",
+		-8=>"America/Los_Angeles",
+		-7=>"America/Dawson_Creek",
+		-6=>"America/Chicago",
+		-5=>"America/Bogota",
+		-4=>"America/Anguilla",
+		-3=>"America/Araguaina",
+		-2=>"America/Noronha",
+		-1=>"Atlantic/Azores",
+		0=>"Africa/Abidjan",
+		1=>"Europe/Paris",
+		2=>"Europe/Helsinki",
+		3=>"Europe/Moscow",
+		4=>"Asia/Dubai",
+		5=>"Asia/Karachi",
+		6=>"Indian/Chagos",
+		7=>"Asia/Jakarta",
+		8=>"Asia/Hong_Kong",
+		9=>"Asia/Tokyo",
+		10=>"Australia/Sydney",
+		11=>"Pacific/Noumea",
+		12=>"Pacific/Auckland",
+		13=>"Pacific/Enderbury"
+	);
+	return $tzarray;
 }
 
 
@@ -71,7 +71,7 @@ function get_tz_array()
  */
 function getServerTimeZoneString()
 {
-    return @date_default_timezone_get();
+	return @date_default_timezone_get();
 }
 
 /**
@@ -82,24 +82,24 @@ function getServerTimeZoneString()
  */
 function getServerTimeZoneInt($refgmtdate = 'now')
 {
-    if (method_exists('DateTimeZone', 'getOffset'))
-    {
-        // Method 1 (include daylight)
-        $gmtnow = dol_now('gmt'); $yearref = dol_print_date($gmtnow, '%Y'); $monthref = dol_print_date($gmtnow, '%m'); $dayref = dol_print_date($gmtnow, '%d');
-        if ($refgmtdate == 'now') $newrefgmtdate = $yearref.'-'.$monthref.'-'.$dayref;
-        elseif ($refgmtdate == 'summer') $newrefgmtdate = $yearref.'-08-01';
-        else $newrefgmtdate = $yearref.'-01-01';
-        $newrefgmtdate .= 'T00:00:00+00:00';
-        $localtz = new DateTimeZone(getServerTimeZoneString());
-        $localdt = new DateTime($newrefgmtdate, $localtz);
-        $tmp = -1 * $localtz->getOffset($localdt);
-        //print $refgmtdate.'='.$tmp;
-    } else {
-    	$tmp = 0;
-    	dol_print_error('', 'PHP version must be 5.3+');
-    }
-    $tz = round(($tmp < 0 ? 1 : -1) * abs($tmp / 3600));
-    return $tz;
+	if (method_exists('DateTimeZone', 'getOffset'))
+	{
+		// Method 1 (include daylight)
+		$gmtnow = dol_now('gmt'); $yearref = dol_print_date($gmtnow, '%Y'); $monthref = dol_print_date($gmtnow, '%m'); $dayref = dol_print_date($gmtnow, '%d');
+		if ($refgmtdate == 'now') $newrefgmtdate = $yearref.'-'.$monthref.'-'.$dayref;
+		elseif ($refgmtdate == 'summer') $newrefgmtdate = $yearref.'-08-01';
+		else $newrefgmtdate = $yearref.'-01-01';
+		$newrefgmtdate .= 'T00:00:00+00:00';
+		$localtz = new DateTimeZone(getServerTimeZoneString());
+		$localdt = new DateTime($newrefgmtdate, $localtz);
+		$tmp = -1 * $localtz->getOffset($localdt);
+		//print $refgmtdate.'='.$tmp;
+	} else {
+		$tmp = 0;
+		dol_print_error('', 'PHP version must be 5.3+');
+	}
+	$tz = round(($tmp < 0 ? 1 : -1) * abs($tmp / 3600));
+	return $tz;
 }
 
 
@@ -182,15 +182,15 @@ function convertSecondToTime($iSecond, $format = 'all', $lengthOfDay = 86400, $l
 	global $langs;
 
 	if (empty($lengthOfDay))  $lengthOfDay = 86400; // 1 day = 24 hours
-    if (empty($lengthOfWeek)) $lengthOfWeek = 7; // 1 week = 7 days
+	if (empty($lengthOfWeek)) $lengthOfWeek = 7; // 1 week = 7 days
 
-    if ($format == 'all' || $format == 'allwithouthour' || $format == 'allhour' || $format == 'allhourmin' || $format == 'allhourminsec')
+	if ($format == 'all' || $format == 'allwithouthour' || $format == 'allhour' || $format == 'allhourmin' || $format == 'allhourminsec')
 	{
 		if ((int) $iSecond === 0) return '0'; // This is to avoid having 0 return a 12:00 AM for en_US
 
-        $sTime = '';
-        $sDay = 0;
-        $sWeek = 0;
+		$sTime = '';
+		$sDay = 0;
+		$sWeek = 0;
 
 		if ($iSecond >= $lengthOfDay)
 		{
@@ -205,17 +205,17 @@ function convertSecondToTime($iSecond, $format = 'all', $lengthOfDay = 86400, $l
 
 		if ($lengthOfWeek < 7)
 		{
-        	if ($sDay)
-            {
-                if ($sDay >= $lengthOfWeek)
-                {
-                    $sWeek = (int) (($sDay - $sDay % $lengthOfWeek) / $lengthOfWeek);
-                    $sDay = $sDay % $lengthOfWeek;
-                    $weekTranslate = $langs->trans("DurationWeek");
-                    if ($sWeek >= 2) $weekTranslate = $langs->trans("DurationWeeks");
-                    $sTime .= $sWeek.' '.$weekTranslate.' ';
-                }
-            }
+			if ($sDay)
+			{
+				if ($sDay >= $lengthOfWeek)
+				{
+					$sWeek = (int) (($sDay - $sDay % $lengthOfWeek) / $lengthOfWeek);
+					$sDay = $sDay % $lengthOfWeek;
+					$weekTranslate = $langs->trans("DurationWeek");
+					if ($sWeek >= 2) $weekTranslate = $langs->trans("DurationWeeks");
+					$sTime .= $sWeek.' '.$weekTranslate.' ';
+				}
+			}
 		}
 		if ($sDay > 0)
 		{
@@ -232,10 +232,10 @@ function convertSecondToTime($iSecond, $format = 'all', $lengthOfDay = 86400, $l
 			}
 		} elseif ($format == 'allhourminsec')
 		{
-		    return sprintf("%02d", ($sWeek * $lengthOfWeek * 24 + $sDay * 24 + (int) floor($iSecond / 3600))).':'.sprintf("%02d", ((int) floor(($iSecond % 3600) / 60))).':'.sprintf("%02d", ((int) ($iSecond % 60)));
+			return sprintf("%02d", ($sWeek * $lengthOfWeek * 24 + $sDay * 24 + (int) floor($iSecond / 3600))).':'.sprintf("%02d", ((int) floor(($iSecond % 3600) / 60))).':'.sprintf("%02d", ((int) ($iSecond % 60)));
 		} elseif ($format == 'allhourmin')
 		{
-		    return sprintf("%02d", ($sWeek * $lengthOfWeek * 24 + $sDay * 24 + (int) floor($iSecond / 3600))).':'.sprintf("%02d", ((int) floor(($iSecond % 3600) / 60)));
+			return sprintf("%02d", ($sWeek * $lengthOfWeek * 24 + $sDay * 24 + (int) floor($iSecond / 3600))).':'.sprintf("%02d", ((int) floor(($iSecond % 3600) / 60)));
 		} elseif ($format == 'allhour')
 		{
 			return sprintf("%02d", ($sWeek * $lengthOfWeek * 24 + $sDay * 24 + (int) floor($iSecond / 3600)));
@@ -255,16 +255,16 @@ function convertSecondToTime($iSecond, $format = 'all', $lengthOfDay = 86400, $l
 	{
 		$sTime = dol_print_date($iSecond, '%M', true);
 	} elseif ($format == 'sec')	// only sec part
-    {
-        $sTime = dol_print_date($iSecond, '%S', true);
-    } elseif ($format == 'month')	// only month part
-    {
-        $sTime = dol_print_date($iSecond, '%m', true);
-    } elseif ($format == 'year')	// only year part
-    {
-        $sTime = dol_print_date($iSecond, '%Y', true);
-    }
-    return trim($sTime);
+	{
+		$sTime = dol_print_date($iSecond, '%S', true);
+	} elseif ($format == 'month')	// only month part
+	{
+		$sTime = dol_print_date($iSecond, '%m', true);
+	} elseif ($format == 'year')	// only year part
+	{
+		$sTime = dol_print_date($iSecond, '%Y', true);
+	}
+	return trim($sTime);
 }
 
 
@@ -319,40 +319,40 @@ function dolSqlDateFilter($datefield, $day_date, $month_date, $year_date, $exclu
 function dol_stringtotime($string, $gm = 1)
 {
 	$reg = array();
-    // Convert date with format DD/MM/YYY HH:MM:SS. This part of code should not be used.
-    if (preg_match('/^([0-9]+)\/([0-9]+)\/([0-9]+)\s?([0-9]+)?:?([0-9]+)?:?([0-9]+)?/i', $string, $reg))
-    {
-        dol_syslog("dol_stringtotime call to function with deprecated parameter format", LOG_WARNING);
-        // Date est au format 'DD/MM/YY' ou 'DD/MM/YY HH:MM:SS'
-        // Date est au format 'DD/MM/YYYY' ou 'DD/MM/YYYY HH:MM:SS'
-        $sday = $reg[1];
-        $smonth = $reg[2];
-        $syear = $reg[3];
-        $shour = $reg[4];
-        $smin = $reg[5];
-        $ssec = $reg[6];
-        if ($syear < 50) $syear += 1900;
-        if ($syear >= 50 && $syear < 100) $syear += 2000;
-        $string = sprintf("%04d%02d%02d%02d%02d%02d", $syear, $smonth, $sday, $shour, $smin, $ssec);
-    } elseif (
-    	   preg_match('/^([0-9]{4})-([0-9]{2})-([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})Z$/i', $string, $reg)	// Convert date with format YYYY-MM-DDTHH:MM:SSZ (RFC3339)
-    	|| preg_match('/^([0-9]{4})-([0-9]{2})-([0-9]{2}) ([0-9]{2}):([0-9]{2}):([0-9]{2})$/i', $string, $reg)	// Convert date with format YYYY-MM-DD HH:MM:SS
+	// Convert date with format DD/MM/YYY HH:MM:SS. This part of code should not be used.
+	if (preg_match('/^([0-9]+)\/([0-9]+)\/([0-9]+)\s?([0-9]+)?:?([0-9]+)?:?([0-9]+)?/i', $string, $reg))
+	{
+		dol_syslog("dol_stringtotime call to function with deprecated parameter format", LOG_WARNING);
+		// Date est au format 'DD/MM/YY' ou 'DD/MM/YY HH:MM:SS'
+		// Date est au format 'DD/MM/YYYY' ou 'DD/MM/YYYY HH:MM:SS'
+		$sday = $reg[1];
+		$smonth = $reg[2];
+		$syear = $reg[3];
+		$shour = $reg[4];
+		$smin = $reg[5];
+		$ssec = $reg[6];
+		if ($syear < 50) $syear += 1900;
+		if ($syear >= 50 && $syear < 100) $syear += 2000;
+		$string = sprintf("%04d%02d%02d%02d%02d%02d", $syear, $smonth, $sday, $shour, $smin, $ssec);
+	} elseif (
+		   preg_match('/^([0-9]{4})-([0-9]{2})-([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})Z$/i', $string, $reg)	// Convert date with format YYYY-MM-DDTHH:MM:SSZ (RFC3339)
+		|| preg_match('/^([0-9]{4})-([0-9]{2})-([0-9]{2}) ([0-9]{2}):([0-9]{2}):([0-9]{2})$/i', $string, $reg)	// Convert date with format YYYY-MM-DD HH:MM:SS
    		|| preg_match('/^([0-9]{4})([0-9]{2})([0-9]{2})T([0-9]{2})([0-9]{2})([0-9]{2})Z$/i', $string, $reg)		// Convert date with format YYYYMMDDTHHMMSSZ
-    )
-    {
-        $syear = $reg[1];
-        $smonth = $reg[2];
-        $sday = $reg[3];
-        $shour = $reg[4];
-        $smin = $reg[5];
-        $ssec = $reg[6];
-        $string = sprintf("%04d%02d%02d%02d%02d%02d", $syear, $smonth, $sday, $shour, $smin, $ssec);
-    }
+	)
+	{
+		$syear = $reg[1];
+		$smonth = $reg[2];
+		$sday = $reg[3];
+		$shour = $reg[4];
+		$smin = $reg[5];
+		$ssec = $reg[6];
+		$string = sprintf("%04d%02d%02d%02d%02d%02d", $syear, $smonth, $sday, $shour, $smin, $ssec);
+	}
 
-    $string = preg_replace('/([^0-9])/i', '', $string);
-    $tmp = $string.'000000';
-    $date = dol_mktime(substr($tmp, 8, 2), substr($tmp, 10, 2), substr($tmp, 12, 2), substr($tmp, 4, 2), substr($tmp, 6, 2), substr($tmp, 0, 4), ($gm ? 1 : 0));
-    return $date;
+	$string = preg_replace('/([^0-9])/i', '', $string);
+	$tmp = $string.'000000';
+	$date = dol_mktime(substr($tmp, 8, 2), substr($tmp, 10, 2), substr($tmp, 12, 2), substr($tmp, 4, 2), substr($tmp, 6, 2), substr($tmp, 0, 4), ($gm ? 1 : 0));
+	return $date;
 }
 
 
@@ -548,28 +548,28 @@ function dol_get_first_day_week($day, $month, $year, $gm = false)
 	$days = $start_week - $tmparray['wday'];
  	if ($days >= 1) $days = 7 - $days;
  	$days = abs($days);
-    $seconds = $days * 24 * 60 * 60;
+	$seconds = $days * 24 * 60 * 60;
 	//print 'start_week='.$start_week.' tmparray[wday]='.$tmparray['wday'].' day offset='.$days.' seconds offset='.$seconds.'<br>';
 
-    //Get first day of week
-    $tmpdaytms = date($tmparray[0]) - $seconds; // $tmparray[0] is day of parameters
+	//Get first day of week
+	$tmpdaytms = date($tmparray[0]) - $seconds; // $tmparray[0] is day of parameters
 	$tmpday = date("d", $tmpdaytms);
 
 	//Check first day of week is in same month than current day or not
 	if ($tmpday > $day)
-    {
-    	$prev_month = $month - 1;
+	{
+		$prev_month = $month - 1;
 		$prev_year = $year;
 
-    	if ($prev_month == 0)
-    	{
-    		$prev_month = 12;
-    		$prev_year  = $year - 1;
-    	}
-    } else {
-    	$prev_month = $month;
+		if ($prev_month == 0)
+		{
+			$prev_month = 12;
+			$prev_year  = $year - 1;
+		}
+	} else {
+		$prev_month = $month;
 		$prev_year = $year;
-    }
+	}
 	$tmpmonth = $prev_month;
 	$tmpyear = $prev_year;
 
@@ -577,22 +577,22 @@ function dol_get_first_day_week($day, $month, $year, $gm = false)
 	$tmptime = dol_mktime(12, 0, 0, $month, $tmpday, $year, 1, 0);
 	$tmptime -= 24 * 60 * 60 * 7;
 	$tmparray = dol_getdate($tmptime, true);
-    $prev_day = $tmparray['mday'];
+	$prev_day = $tmparray['mday'];
 
-    //Check prev day of week is in same month than first day or not
+	//Check prev day of week is in same month than first day or not
 	if ($prev_day > $tmpday)
-    {
-    	$prev_month = $month - 1;
+	{
+		$prev_month = $month - 1;
 		$prev_year = $year;
 
-    	if ($prev_month == 0)
-    	{
-    		$prev_month = 12;
-    		$prev_year  = $year - 1;
-    	}
-    }
+		if ($prev_month == 0)
+		{
+			$prev_month = 12;
+			$prev_year  = $year - 1;
+		}
+	}
 
-    $week = date("W", dol_mktime(0, 0, 0, $tmpmonth, $tmpday, $tmpyear, $gm));
+	$week = date("W", dol_mktime(0, 0, 0, $tmpmonth, $tmpday, $tmpyear, $gm));
 
 	return array('year' => $year, 'month' => $month, 'week' => $week, 'first_day' => $tmpday, 'first_month' => $tmpmonth, 'first_year' => $tmpyear, 'prev_year' => $prev_year, 'prev_month' => $prev_month, 'prev_day' => $prev_day);
 }
@@ -629,7 +629,7 @@ function num_public_holiday($timestampStart, $timestampEnd, $country_code = '',
 
 	$i = 0;
 	while ((($lastday == 0 && $timestampStart < $timestampEnd) || ($lastday && $timestampStart <= $timestampEnd))
-	    && ($i < 50000))		// Loop end when equals (Test on i is a security loop to avoid infinite loop)
+		&& ($i < 50000))		// Loop end when equals (Test on i is a security loop to avoid infinite loop)
 	{
 		$ferie = false;
 
@@ -688,13 +688,13 @@ function num_public_holiday($timestampStart, $timestampEnd, $country_code = '',
 			// Calculation for the monday of easter date
 			$date_paques = easter_date($annee);
 			$date_lundi_paques = mktime(
-                date("H", $date_paques),
-                date("i", $date_paques),
-                date("s", $date_paques),
-                date("m", $date_paques),
-                date("d", $date_paques) + 1,
-                date("Y", $date_paques)
-            );
+				date("H", $date_paques),
+				date("i", $date_paques),
+				date("s", $date_paques),
+				date("m", $date_paques),
+				date("d", $date_paques) + 1,
+				date("Y", $date_paques)
+			);
 			$jour_lundi_ascension = date("d", $date_lundi_paques);
 			$mois_lundi_ascension = date("m", $date_lundi_paques);
 			if ($jour_lundi_ascension == $jour && $mois_lundi_ascension == $mois) $ferie = true;
@@ -706,13 +706,13 @@ function num_public_holiday($timestampStart, $timestampEnd, $country_code = '',
 			// Calcul du jour de l'ascension (39 days after easter day)
 			$date_paques = easter_date($annee);
 			$date_ascension = mktime(
-                date("H", $date_paques),
-                date("i", $date_paques),
-                date("s", $date_paques),
-                date("m", $date_paques),
-                date("d", $date_paques) + 39,
-                date("Y", $date_paques)
-            );
+				date("H", $date_paques),
+				date("i", $date_paques),
+				date("s", $date_paques),
+				date("m", $date_paques),
+				date("d", $date_paques) + 39,
+				date("Y", $date_paques)
+			);
 			$jour_ascension = date("d", $date_ascension);
 			$mois_ascension = date("m", $date_ascension);
 			if ($jour_ascension == $jour && $mois_ascension == $mois) $ferie = true;
@@ -724,13 +724,13 @@ function num_public_holiday($timestampStart, $timestampEnd, $country_code = '',
 			// Calculation of "Pentecote" (49 days after easter day)
 			$date_paques = easter_date($annee);
 			$date_pentecote = mktime(
-                date("H", $date_paques),
-                date("i", $date_paques),
-                date("s", $date_paques),
-                date("m", $date_paques),
-                date("d", $date_paques) + 49,
-                date("Y", $date_paques)
-            );
+				date("H", $date_paques),
+				date("i", $date_paques),
+				date("s", $date_paques),
+				date("m", $date_paques),
+				date("d", $date_paques) + 49,
+				date("Y", $date_paques)
+			);
 			$jour_pentecote = date("d", $date_pentecote);
 			$mois_pentecote = date("m", $date_pentecote);
 			if ($jour_pentecote == $jour && $mois_pentecote == $mois) $ferie = true;
@@ -759,13 +759,13 @@ function num_public_holiday($timestampStart, $timestampEnd, $country_code = '',
 			// Viernes Santo
 			$date_paques = easter_date($annee);
 			$date_viernes = mktime(
-                date("H", $date_paques),
-                date("i", $date_paques),
-                date("s", $date_paques),
-                date("m", $date_paques),
-                date("d", $date_paques) - 2,
-                date("Y", $date_paques)
-            );
+				date("H", $date_paques),
+				date("i", $date_paques),
+				date("s", $date_paques),
+				date("m", $date_paques),
+				date("d", $date_paques) - 2,
+				date("Y", $date_paques)
+			);
 			$jour_viernes = date("d", $date_viernes);
 			$mois_viernes = date("m", $date_viernes);
 			if ($jour_viernes == $jour && $mois_viernes == $mois) $ferie = true;
@@ -774,20 +774,20 @@ function num_public_holiday($timestampStart, $timestampEnd, $country_code = '',
 
 		if (in_array('fronleichnam', $specialdayrule))
 		{
-		    // Fronleichnam (60 days after easter sunday)
+			// Fronleichnam (60 days after easter sunday)
 			$date_paques = easter_date($annee);
 			$date_fronleichnam = mktime(
-		        date("H", $date_paques),
-		        date("i", $date_paques),
-		        date("s", $date_paques),
-		        date("m", $date_paques),
-		        date("d", $date_paques) + 60,
-		        date("Y", $date_paques)
-		        );
-		    $jour_fronleichnam = date("d", $date_fronleichnam);
-		    $mois_fronleichnam = date("m", $date_fronleichnam);
-		    if ($jour_fronleichnam == $jour && $mois_fronleichnam == $mois) $ferie = true;
-		    // Fronleichnam
+				date("H", $date_paques),
+				date("i", $date_paques),
+				date("s", $date_paques),
+				date("m", $date_paques),
+				date("d", $date_paques) + 60,
+				date("Y", $date_paques)
+				);
+			$jour_fronleichnam = date("d", $date_fronleichnam);
+			$mois_fronleichnam = date("m", $date_fronleichnam);
+			if ($jour_fronleichnam == $jour && $mois_fronleichnam == $mois) $ferie = true;
+			// Fronleichnam
 		}
 
 		// If we have to include saturday and sunday
@@ -907,35 +907,35 @@ function num_open_day($timestampStart, $timestampEnd, $inhour = 0, $lastday = 0,
 function monthArray($outputlangs, $short = 0)
 {
 	$montharray = array(
-	    1  => $outputlangs->trans("Month01"),
-	    2  => $outputlangs->trans("Month02"),
-	    3  => $outputlangs->trans("Month03"),
-	    4  => $outputlangs->trans("Month04"),
-	    5  => $outputlangs->trans("Month05"),
-	    6  => $outputlangs->trans("Month06"),
-	    7  => $outputlangs->trans("Month07"),
-	    8  => $outputlangs->trans("Month08"),
-	    9  => $outputlangs->trans("Month09"),
-	    10 => $outputlangs->trans("Month10"),
-	    11 => $outputlangs->trans("Month11"),
-	    12 => $outputlangs->trans("Month12")
-    );
+		1  => $outputlangs->trans("Month01"),
+		2  => $outputlangs->trans("Month02"),
+		3  => $outputlangs->trans("Month03"),
+		4  => $outputlangs->trans("Month04"),
+		5  => $outputlangs->trans("Month05"),
+		6  => $outputlangs->trans("Month06"),
+		7  => $outputlangs->trans("Month07"),
+		8  => $outputlangs->trans("Month08"),
+		9  => $outputlangs->trans("Month09"),
+		10 => $outputlangs->trans("Month10"),
+		11 => $outputlangs->trans("Month11"),
+		12 => $outputlangs->trans("Month12")
+	);
 
 	if (!empty($short))
 	{
 		$montharray = array(
-		    1  => $outputlangs->trans("MonthShort01"),
-		    2  => $outputlangs->trans("MonthShort02"),
-		    3  => $outputlangs->trans("MonthShort03"),
-		    4  => $outputlangs->trans("MonthShort04"),
-		    5  => $outputlangs->trans("MonthShort05"),
-		    6  => $outputlangs->trans("MonthShort06"),
-		    7  => $outputlangs->trans("MonthShort07"),
-		    8  => $outputlangs->trans("MonthShort08"),
-		    9  => $outputlangs->trans("MonthShort09"),
-		    10 => $outputlangs->trans("MonthShort10"),
-		    11 => $outputlangs->trans("MonthShort11"),
-		    12 => $outputlangs->trans("MonthShort12")
+			1  => $outputlangs->trans("MonthShort01"),
+			2  => $outputlangs->trans("MonthShort02"),
+			3  => $outputlangs->trans("MonthShort03"),
+			4  => $outputlangs->trans("MonthShort04"),
+			5  => $outputlangs->trans("MonthShort05"),
+			6  => $outputlangs->trans("MonthShort06"),
+			7  => $outputlangs->trans("MonthShort07"),
+			8  => $outputlangs->trans("MonthShort08"),
+			9  => $outputlangs->trans("MonthShort09"),
+			10 => $outputlangs->trans("MonthShort10"),
+			11 => $outputlangs->trans("MonthShort11"),
+			12 => $outputlangs->trans("MonthShort12")
 			);
 	}
 
@@ -943,7 +943,6 @@ function monthArray($outputlangs, $short = 0)
 }
 /**
  *	Return array of week numbers.
-
  *
  *	@param	int 		$month			Month number
  *  @param	int			$year			Year number
@@ -961,7 +960,6 @@ function getWeekNumbersOfMonth($month, $year)
 }
 /**
  *	Return array of first day of weeks.
-
  *
  *	@param	array 		$TWeek			array of week numbers
  *  @param	int			$year			Year number
@@ -978,7 +976,6 @@ function getFirstDayOfEachWeek($TWeek, $year)
 }
 /**
  *	Return array of last day of weeks.
-
  *
  *	@param	array 		$TWeek			array of week numbers
  *  @param	int			$year			Year number
@@ -994,7 +991,6 @@ function getLastDayOfEachWeek($TWeek, $year)
 }
 /**
  *	Return week number.
-
  *
  *	@param	int 		$day			Day number
  *	@param	int 		$month			Month number
diff --git a/htdocs/core/lib/doleditor.lib.php b/htdocs/core/lib/doleditor.lib.php
index ddccb11247e..1ad17280f22 100644
--- a/htdocs/core/lib/doleditor.lib.php
+++ b/htdocs/core/lib/doleditor.lib.php
@@ -33,36 +33,36 @@
  */
 function show_skin($fuser, $edit = 0)
 {
-    global $conf, $langs, $db;
-    global $bc;
+	global $conf, $langs, $db;
+	global $bc;
 
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 
-    $formother = new FormOther($db);
+	$formother = new FormOther($db);
 
-    $dirskins = array('/includes/ckeditor/ckeditor/skins');
-    if (!empty($conf->modules_parts['theme']))		// Using this feature slow down application
-    {
-    	foreach ($conf->modules_parts['theme'] as $reldir)
-    	{
-	    	$dirskins = array_merge($dirskins, (array) ($reldir.'theme'));
-    	}
-    }
-    $dirskins = array_unique($dirskins);
+	$dirskins = array('/includes/ckeditor/ckeditor/skins');
+	if (!empty($conf->modules_parts['theme']))		// Using this feature slow down application
+	{
+		foreach ($conf->modules_parts['theme'] as $reldir)
+		{
+			$dirskins = array_merge($dirskins, (array) ($reldir.'theme'));
+		}
+	}
+	$dirskins = array_unique($dirskins);
 	// Now dir_themes=array('/themes') or dir_themes=array('/theme','/mymodule/theme')
 
-    $selected_theme = '';
-    if (empty($conf->global->FCKEDITOR_SKIN)) $selected_theme = 'moono-lisa';
-    else $selected_theme = $conf->global->FCKEDITOR_SKIN;
+	$selected_theme = '';
+	if (empty($conf->global->FCKEDITOR_SKIN)) $selected_theme = 'moono-lisa';
+	else $selected_theme = $conf->global->FCKEDITOR_SKIN;
 
-    $colspan = 2;
+	$colspan = 2;
 
-    $thumbsbyrow = 6;
-    print '<table class="noborder centpercent">';
+	$thumbsbyrow = 6;
+	print '<table class="noborder centpercent">';
 
-    $var = false;
+	$var = false;
 
-    // Title
+	// Title
    	print '<tr class="liste_titre"><th width="35%">'.$langs->trans("DefaultSkin").'</th>';
    	print '<th class="right">';
    	$url = 'http://ckeditor.com/addons/skins/all';
@@ -81,51 +81,51 @@ function show_skin($fuser, $edit = 0)
    	print '</td>';
    	print '</tr>';
 
-    //
-    print '<tr class="oddeven"><td colspan="'.$colspan.'">';
+	//
+	print '<tr class="oddeven"><td colspan="'.$colspan.'">';
 
-    print '<table class="nobordernopadding" width="100%"><tr><td><div class="center">';
+	print '<table class="nobordernopadding" width="100%"><tr><td><div class="center">';
 
-    $i = 0;
-    foreach ($dirskins as $dir)
-    {
-    	//print $dirroot.$dir;exit;
-    	$dirskin = dol_buildpath($dir, 0); // This include loop on $conf->file->dol_document_root
-    	$urltheme = dol_buildpath($dir, 1);
+	$i = 0;
+	foreach ($dirskins as $dir)
+	{
+		//print $dirroot.$dir;exit;
+		$dirskin = dol_buildpath($dir, 0); // This include loop on $conf->file->dol_document_root
+		$urltheme = dol_buildpath($dir, 1);
 
-    	if (is_dir($dirskin))
-    	{
-    		$handle = opendir($dirskin);
-    		if (is_resource($handle))
-    		{
-    			while (($subdir = readdir($handle)) !== false)
-    			{
-    				if (is_dir($dirskin."/".$subdir) && substr($subdir, 0, 1) <> '.'
-    						&& substr($subdir, 0, 3) <> 'CVS' && !preg_match('/common|phones/i', $subdir))
-    				{
-    					// Disable not stable themes (dir ends with _exp or _dev)
-    					if ($conf->global->MAIN_FEATURES_LEVEL < 2 && preg_match('/_dev$/i', $subdir)) continue;
-    					if ($conf->global->MAIN_FEATURES_LEVEL < 1 && preg_match('/_exp$/i', $subdir)) continue;
+		if (is_dir($dirskin))
+		{
+			$handle = opendir($dirskin);
+			if (is_resource($handle))
+			{
+				while (($subdir = readdir($handle)) !== false)
+				{
+					if (is_dir($dirskin."/".$subdir) && substr($subdir, 0, 1) <> '.'
+							&& substr($subdir, 0, 3) <> 'CVS' && !preg_match('/common|phones/i', $subdir))
+					{
+						// Disable not stable themes (dir ends with _exp or _dev)
+						if ($conf->global->MAIN_FEATURES_LEVEL < 2 && preg_match('/_dev$/i', $subdir)) continue;
+						if ($conf->global->MAIN_FEATURES_LEVEL < 1 && preg_match('/_exp$/i', $subdir)) continue;
 
-    					print '<div class="inline-block" style="margin-top: 10px; margin-bottom: 10px; margin-right: 20px; margin-left: 20px;">';
-    					if ($subdir == $selected_theme)
-    					{
-    						print '<input '.($edit ? '' : 'disabled').' type="radio" '.$bc[$var].' style="border: 0px;" checked name="fckeditor_skin" value="'.$subdir.'"> <b>'.$subdir.'</b>';
-    					} else {
-    						print '<input '.($edit ? '' : 'disabled').' type="radio" '.$bc[$var].' style="border: 0px;" name="fckeditor_skin" value="'.$subdir.'"> '.$subdir;
-    					}
+						print '<div class="inline-block" style="margin-top: 10px; margin-bottom: 10px; margin-right: 20px; margin-left: 20px;">';
+						if ($subdir == $selected_theme)
+						{
+							print '<input '.($edit ? '' : 'disabled').' type="radio" '.$bc[$var].' style="border: 0px;" checked name="fckeditor_skin" value="'.$subdir.'"> <b>'.$subdir.'</b>';
+						} else {
+							print '<input '.($edit ? '' : 'disabled').' type="radio" '.$bc[$var].' style="border: 0px;" name="fckeditor_skin" value="'.$subdir.'"> '.$subdir;
+						}
 						print '</div>';
 
-    					$i++;
-    				}
-    			}
-    		}
-    	}
-    }
+						$i++;
+					}
+				}
+			}
+		}
+	}
 
-    print '</div></td></tr></table>';
+	print '</div></td></tr></table>';
 
-    print '</td></tr>';
+	print '</td></tr>';
 
-    print '</table>';
+	print '</table>';
 }
diff --git a/htdocs/core/lib/donation.lib.php b/htdocs/core/lib/donation.lib.php
index 425dd05fbb5..c39229d1e23 100644
--- a/htdocs/core/lib/donation.lib.php
+++ b/htdocs/core/lib/donation.lib.php
@@ -46,7 +46,7 @@ function donation_admin_prepare_head()
 
 	$head[$h][0] = DOL_URL_ROOT.'/don/admin/donation_extrafields.php';
 	$head[$h][1] = $langs->trans("ExtraFields");
-    $head[$h][2] = 'attributes';
+	$head[$h][2] = 'attributes';
 	$h++;
 
 	complete_head_from_modules($conf, $langs, null, $head, $h, 'donation_admin', 'remove');
@@ -79,10 +79,10 @@ function donation_prepare_head($object)
 	complete_head_from_modules($conf, $langs, $object, $head, $h, 'donation');
 
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-    require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
 	$upload_dir = $conf->don->dir_output.'/'.dol_sanitizeFileName($object->ref);
 	$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
-    $nbLinks = Link::count($db, $object->element, $object->id);
+	$nbLinks = Link::count($db, $object->element, $object->id);
 	$head[$h][0] = DOL_URL_ROOT.'/don/document.php?id='.$object->id;
 	$head[$h][1] = $langs->trans('Documents');
 	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
diff --git a/htdocs/core/lib/emailing.lib.php b/htdocs/core/lib/emailing.lib.php
index 8afbf7a654d..86f11a7a271 100644
--- a/htdocs/core/lib/emailing.lib.php
+++ b/htdocs/core/lib/emailing.lib.php
@@ -41,11 +41,11 @@ function emailing_prepare_head(Mailing $object)
 
 	if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->mailing->mailing_advance->recipient))
 	{
-    	$head[$h][0] = DOL_URL_ROOT."/comm/mailing/cibles.php?id=".$object->id;
-    	$head[$h][1] = $langs->trans("MailRecipients");
+		$head[$h][0] = DOL_URL_ROOT."/comm/mailing/cibles.php?id=".$object->id;
+		$head[$h][1] = $langs->trans("MailRecipients");
 		if ($object->nbemail > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$object->nbemail.'</span>';
-    	$head[$h][2] = 'targets';
-    	$h++;
+		$head[$h][2] = 'targets';
+		$h++;
 	}
 
 	if (!empty($conf->global->EMAILING_USE_ADVANCED_SELECTOR))
diff --git a/htdocs/core/lib/expensereport.lib.php b/htdocs/core/lib/expensereport.lib.php
index e7a6b897fdb..b77082804ba 100644
--- a/htdocs/core/lib/expensereport.lib.php
+++ b/htdocs/core/lib/expensereport.lib.php
@@ -41,15 +41,15 @@ function expensereport_prepare_head($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, 'expensereport');
 
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-    require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
 	$upload_dir = $conf->expensereport->dir_output."/".dol_sanitizeFileName($object->ref);
 	$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
-    $nbLinks = Link::count($db, $object->element, $object->id);
+	$nbLinks = Link::count($db, $object->element, $object->id);
 	$head[$h][0] = DOL_URL_ROOT.'/expensereport/document.php?id='.$object->id;
 	$head[$h][1] = $langs->trans('Documents');
 	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
@@ -58,14 +58,14 @@ function expensereport_prepare_head($object)
 
 	if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
 	{
-	    $nbNote = 0;
-	    if (!empty($object->note_private)) $nbNote++;
-	    if (!empty($object->note_public)) $nbNote++;
-	    $head[$h][0] = DOL_URL_ROOT.'/expensereport/note.php?id='.$object->id;
-	    $head[$h][1] = $langs->trans('Notes');
-	    if ($nbNote > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
-	    $head[$h][2] = 'note';
-	    $h++;
+		$nbNote = 0;
+		if (!empty($object->note_private)) $nbNote++;
+		if (!empty($object->note_public)) $nbNote++;
+		$head[$h][0] = DOL_URL_ROOT.'/expensereport/note.php?id='.$object->id;
+		$head[$h][1] = $langs->trans('Notes');
+		if ($nbNote > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
+		$head[$h][2] = 'note';
+		$h++;
 	}
 
 	$head[$h][0] = DOL_URL_ROOT.'/expensereport/info.php?id='.$object->id;
@@ -98,11 +98,11 @@ function payment_expensereport_prepare_head(PaymentExpenseReport $object)
 	$head[$h][2] = 'payment';
 	$h++;
 
-    // Show more tabs from modules
-    // Entries must be declared in modules descriptor with line
-    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
-    // $this->tabs = array('entity:-tabname);   												to remove a tab
-    complete_head_from_modules($conf, $langs, $object, $head, $h, 'payment_expensereport');
+	// Show more tabs from modules
+	// Entries must be declared in modules descriptor with line
+	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
+	// $this->tabs = array('entity:-tabname);   												to remove a tab
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'payment_expensereport');
 
 	$head[$h][0] = DOL_URL_ROOT.'/expensereport/payment/info.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("Info");
@@ -157,10 +157,10 @@ function expensereport_admin_prepare_head()
 
 	$head[$h][0] = DOL_URL_ROOT.'/admin/expensereport_extrafields.php';
 	$head[$h][1] = $langs->trans("ExtraFields");
-    $head[$h][2] = 'attributes';
-    $h++;
+	$head[$h][2] = 'attributes';
+	$h++;
 
-    /*
+	/*
 	$head[$h][0] = DOL_URL_ROOT.'/fichinter/admin/fichinterdet_extrafields.php';
 	$head[$h][1] = $langs->trans("ExtraFieldsLines");
     $head[$h][2] = 'attributesdet';
@@ -169,5 +169,5 @@ function expensereport_admin_prepare_head()
 
 	complete_head_from_modules($conf, $langs, null, $head, $h, 'expensereport_admin', 'remove');
 
-    return $head;
+	return $head;
 }
diff --git a/htdocs/core/lib/fichinter.lib.php b/htdocs/core/lib/fichinter.lib.php
index 260bbf980f8..bbc10f0b756 100644
--- a/htdocs/core/lib/fichinter.lib.php
+++ b/htdocs/core/lib/fichinter.lib.php
@@ -48,19 +48,19 @@ function fichinter_prepare_head($object)
 
 	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
 	{
-	    $nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external'));
-	    $head[$h][0] = DOL_URL_ROOT.'/fichinter/contact.php?id='.$object->id;
+		$nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external'));
+		$head[$h][0] = DOL_URL_ROOT.'/fichinter/contact.php?id='.$object->id;
 		$head[$h][1] = $langs->trans('InterventionContact');
 		if ($nbContact > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';
 		$head[$h][2] = 'contact';
 		$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, 'intervention');
+	// 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, 'intervention');
 
 	// Tab to link resources
 	if ($conf->resource->enabled)
@@ -88,37 +88,37 @@ function fichinter_prepare_head($object)
 		$h++;
 	}
 
-    if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
-    {
-    	$nbNote = 0;
-        if (!empty($object->note_private)) $nbNote++;
+	if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
+	{
+		$nbNote = 0;
+		if (!empty($object->note_private)) $nbNote++;
 		if (!empty($object->note_public)) $nbNote++;
-    	$head[$h][0] = DOL_URL_ROOT.'/fichinter/note.php?id='.$object->id;
-    	$head[$h][1] = $langs->trans('Notes');
+		$head[$h][0] = DOL_URL_ROOT.'/fichinter/note.php?id='.$object->id;
+		$head[$h][1] = $langs->trans('Notes');
 		if ($nbNote > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
-    	$head[$h][2] = 'note';
-    	$h++;
-    }
+		$head[$h][2] = 'note';
+		$h++;
+	}
 
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-    require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
 	$upload_dir = $conf->ficheinter->dir_output."/".dol_sanitizeFileName($object->ref);
 	$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
-    $nbLinks = Link::count($db, $object->element, $object->id);
+	$nbLinks = Link::count($db, $object->element, $object->id);
 	$head[$h][0] = DOL_URL_ROOT.'/fichinter/document.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("Documents");
 	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
 	$head[$h][2] = 'documents';
 	$h++;
 
-    $head[$h][0] = DOL_URL_ROOT.'/fichinter/info.php?id='.$object->id;
+	$head[$h][0] = DOL_URL_ROOT.'/fichinter/info.php?id='.$object->id;
 	$head[$h][1] = $langs->trans('Info');
 	$head[$h][2] = 'info';
 	$h++;
 
-    complete_head_from_modules($conf, $langs, $object, $head, $h, 'intervention', 'remove');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'intervention', 'remove');
 
-    return $head;
+	return $head;
 }
 
 /**
@@ -148,13 +148,13 @@ function fichinter_admin_prepare_head()
 
 	$head[$h][0] = DOL_URL_ROOT.'/fichinter/admin/fichinter_extrafields.php';
 	$head[$h][1] = $langs->trans("ExtraFields");
-    $head[$h][2] = 'attributes';
-    $h++;
+	$head[$h][2] = 'attributes';
+	$h++;
 
 	$head[$h][0] = DOL_URL_ROOT.'/fichinter/admin/fichinterdet_extrafields.php';
 	$head[$h][1] = $langs->trans("ExtraFieldsLines");
-    $head[$h][2] = 'attributesdet';
-    $h++;
+	$head[$h][2] = 'attributesdet';
+	$h++;
 
 
 
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 1e0d298bb69..dd74ce70a64 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -1562,7 +1562,7 @@ function dol_add_file_process($upload_dir, $allowoverwrite = 0, $donotupdatesess
 				$destfile = dol_sanitizeFileName($info['filename'].($info['extension'] != '' ? ('.'.strtolower($info['extension'])) : ''));
 
 				// We apply dol_string_nohtmltag also to clean file names (this remove duplicate spaces) because
-				// this function is also applied when we make try to download file (by the GETPOST(filename, 'alphanohtml') call).
+				// this function is also applied when we rename and when we make try to download file (by the GETPOST(filename, 'alphanohtml') call).
 				$destfile = dol_string_nohtmltag($destfile);
 				$destfull = dol_string_nohtmltag($destfull);
 
@@ -1746,10 +1746,10 @@ function addFileIntoDatabaseIndex($dir, $file, $fullpathorig = '', $mode = 'uplo
 		$ecmfile->description = ''; // indexed content
 		$ecmfile->keyword = ''; // keyword content
 
-        if (is_object($object) && $object->id > 0) {
-            $ecmfile->src_object_id = $object->id;
-            $ecmfile->src_object_type = $object->table_element;
-        }
+		if (is_object($object) && $object->id > 0) {
+			$ecmfile->src_object_id = $object->id;
+			$ecmfile->src_object_type = $object->table_element;
+		}
 
 		if ($setsharekey)
 		{
@@ -2852,9 +2852,11 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 
 			// Check fuser->rights->modulepart->myobject->read and fuser->rights->modulepart->read
 			$partsofdirinoriginalfile = explode('/', $original_file);
-			$partofdirinoriginalfile = $partsofdirinoriginalfile[0];
-			if ($partofdirinoriginalfile && ($fuser->rights->$modulepart->$partofdirinoriginalfile->{$lire} || $fuser->rights->$modulepart->$partofdirinoriginalfile->{$read})) $accessallowed = 1;
-			if ($fuser->rights->$modulepart->{$lire} || $fuser->rights->$modulepart->{$read}) $accessallowed = 1;
+			if (!empty($partsofdirinoriginalfile[1])) {	// If original_file is xxx/filename (xxx is a part we will use)
+				$partofdirinoriginalfile = $partsofdirinoriginalfile[0];
+				if ($partofdirinoriginalfile && !empty($fuser->rights->$modulepart->$partofdirinoriginalfile) && ($fuser->rights->$modulepart->$partofdirinoriginalfile->{$lire} || $fuser->rights->$modulepart->$partofdirinoriginalfile->{$read})) $accessallowed = 1;
+			}
+			if (!empty($fuser->rights->$modulepart->{$lire}) || !empty($fuser->rights->$modulepart->{$read})) $accessallowed = 1;
 
 			if (is_array($conf->$modulepart->multidir_output) && !empty($conf->$modulepart->multidir_output[$entity])) {
 				$original_file = $conf->$modulepart->multidir_output[$entity].'/'.$original_file;
diff --git a/htdocs/core/lib/fiscalyear.lib.php b/htdocs/core/lib/fiscalyear.lib.php
index 8bd3ff55624..9b235287993 100644
--- a/htdocs/core/lib/fiscalyear.lib.php
+++ b/htdocs/core/lib/fiscalyear.lib.php
@@ -41,8 +41,8 @@ function fiscalyear_prepare_head(Fiscalyear $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, 'fiscalyear');
 
 	$head[$h][0] = DOL_URL_ROOT.'/accountancy/admin/fiscalyear_info.php?id='.$object->id;
diff --git a/htdocs/core/lib/format_cards.lib.php b/htdocs/core/lib/format_cards.lib.php
index 1693329329e..d8e5f17f8e0 100644
--- a/htdocs/core/lib/format_cards.lib.php
+++ b/htdocs/core/lib/format_cards.lib.php
@@ -36,27 +36,27 @@ $sql = "SELECT rowid, code, name, paper_size, orientation, metric, leftmargin, t
 $resql = $db->query($sql);
 if ($resql)
 {
-    while ($row = $db->fetch_array($resql))
-    {
-        $_Avery_Labels[$row['code']]['name'] = $row['name'];
-        $_Avery_Labels[$row['code']]['paper-size'] = $row['paper_size'];
-        $_Avery_Labels[$row['code']]['orientation'] = $row['orientation'];
-        $_Avery_Labels[$row['code']]['metric'] = $row['metric'];
-        $_Avery_Labels[$row['code']]['marginLeft'] = $row['leftmargin'];
-        $_Avery_Labels[$row['code']]['marginTop'] = $row['topmargin'];
-        $_Avery_Labels[$row['code']]['marginTop'] = $row['topmargin'];
-        $_Avery_Labels[$row['code']]['NX'] = $row['nx'];
-        $_Avery_Labels[$row['code']]['NY'] = $row['ny'];
-        $_Avery_Labels[$row['code']]['SpaceX'] = $row['spacex'];
-        $_Avery_Labels[$row['code']]['SpaceY'] = $row['spacey'];
-        $_Avery_Labels[$row['code']]['width'] = $row['width'];
-        $_Avery_Labels[$row['code']]['height'] = $row['height'];
-        $_Avery_Labels[$row['code']]['font-size'] = $row['font_size'];
-        $_Avery_Labels[$row['code']]['custom_x'] = $row['custom_x'];
-        $_Avery_Labels[$row['code']]['custom_y'] = $row['custom_y'];
-    }
+	while ($row = $db->fetch_array($resql))
+	{
+		$_Avery_Labels[$row['code']]['name'] = $row['name'];
+		$_Avery_Labels[$row['code']]['paper-size'] = $row['paper_size'];
+		$_Avery_Labels[$row['code']]['orientation'] = $row['orientation'];
+		$_Avery_Labels[$row['code']]['metric'] = $row['metric'];
+		$_Avery_Labels[$row['code']]['marginLeft'] = $row['leftmargin'];
+		$_Avery_Labels[$row['code']]['marginTop'] = $row['topmargin'];
+		$_Avery_Labels[$row['code']]['marginTop'] = $row['topmargin'];
+		$_Avery_Labels[$row['code']]['NX'] = $row['nx'];
+		$_Avery_Labels[$row['code']]['NY'] = $row['ny'];
+		$_Avery_Labels[$row['code']]['SpaceX'] = $row['spacex'];
+		$_Avery_Labels[$row['code']]['SpaceY'] = $row['spacey'];
+		$_Avery_Labels[$row['code']]['width'] = $row['width'];
+		$_Avery_Labels[$row['code']]['height'] = $row['height'];
+		$_Avery_Labels[$row['code']]['font-size'] = $row['font_size'];
+		$_Avery_Labels[$row['code']]['custom_x'] = $row['custom_x'];
+		$_Avery_Labels[$row['code']]['custom_y'] = $row['custom_y'];
+	}
 } else {
-    dol_print_error($db);
+	dol_print_error($db);
 }
 
 // We add characteristics to the name
diff --git a/htdocs/core/lib/fourn.lib.php b/htdocs/core/lib/fourn.lib.php
index 8b0e71a2a46..7ebe1d290b7 100644
--- a/htdocs/core/lib/fourn.lib.php
+++ b/htdocs/core/lib/fourn.lib.php
@@ -45,8 +45,8 @@ function facturefourn_prepare_head($object)
 
 	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
 	{
-	    $nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external'));
-	    $head[$h][0] = DOL_URL_ROOT.'/fourn/facture/contact.php?facid='.$object->id;
+		$nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external'));
+		$head[$h][0] = DOL_URL_ROOT.'/fourn/facture/contact.php?facid='.$object->id;
 		$head[$h][1] = $langs->trans('ContactsAddresses');
 		if ($nbContact > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';
 		$head[$h][2] = 'contact';
@@ -75,29 +75,29 @@ function facturefourn_prepare_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);   												to remove a tab
-    complete_head_from_modules($conf, $langs, $object, $head, $h, 'supplier_invoice');
+	// 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, 'supplier_invoice');
 
-    if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
-    {
-    	$nbNote = 0;
-        if (!empty($object->note_private)) $nbNote++;
+	if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
+	{
+		$nbNote = 0;
+		if (!empty($object->note_private)) $nbNote++;
 		if (!empty($object->note_public)) $nbNote++;
-    	$head[$h][0] = DOL_URL_ROOT.'/fourn/facture/note.php?facid='.$object->id;
-    	$head[$h][1] = $langs->trans('Notes');
+		$head[$h][0] = DOL_URL_ROOT.'/fourn/facture/note.php?facid='.$object->id;
+		$head[$h][1] = $langs->trans('Notes');
 		if ($nbNote > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
-    	$head[$h][2] = 'note';
-    	$h++;
-    }
+		$head[$h][2] = 'note';
+		$h++;
+	}
 
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-    require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
 	$upload_dir = $conf->fournisseur->facture->dir_output.'/'.get_exdir($object->id, 2, 0, 0, $object, 'invoice_supplier').$object->ref;
 	$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
-    $nbLinks = Link::count($db, $object->element, $object->id);
+	$nbLinks = Link::count($db, $object->element, $object->id);
 	$head[$h][0] = DOL_URL_ROOT.'/fourn/facture/document.php?facid='.$object->id;
 	$head[$h][1] = $langs->trans('Documents');
 	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
@@ -109,9 +109,9 @@ function facturefourn_prepare_head($object)
 	$head[$h][2] = 'info';
 	$h++;
 
-    complete_head_from_modules($conf, $langs, $object, $head, $h, 'supplier_invoice', 'remove');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'supplier_invoice', 'remove');
 
-    return $head;
+	return $head;
 }
 
 
@@ -135,8 +135,8 @@ function ordersupplier_prepare_head($object)
 
 	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
 	{
-	    $nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external'));
-	    $head[$h][0] = DOL_URL_ROOT.'/fourn/commande/contact.php?id='.$object->id;
+		$nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external'));
+		$head[$h][0] = DOL_URL_ROOT.'/fourn/commande/contact.php?id='.$object->id;
 		$head[$h][1] = $langs->trans('ContactsAddresses');
 		if ($nbContact > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';
 		$head[$h][2] = 'contact';
@@ -153,28 +153,28 @@ function ordersupplier_prepare_head($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:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab
-    complete_head_from_modules($conf, $langs, $object, $head, $h, 'supplier_order');
+	// 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, 'supplier_order');
 
-    if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
-    {
-    	$nbNote = 0;
-        if (!empty($object->note_private)) $nbNote++;
+	if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
+	{
+		$nbNote = 0;
+		if (!empty($object->note_private)) $nbNote++;
 		if (!empty($object->note_public)) $nbNote++;
-    	$head[$h][0] = DOL_URL_ROOT.'/fourn/commande/note.php?id='.$object->id;
-    	$head[$h][1] = $langs->trans("Notes");
+		$head[$h][0] = DOL_URL_ROOT.'/fourn/commande/note.php?id='.$object->id;
+		$head[$h][1] = $langs->trans("Notes");
 		if ($nbNote > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
-    	$head[$h][2] = 'note';
-    	$h++;
-    }
+		$head[$h][2] = 'note';
+		$h++;
+	}
 
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-    require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
 	$upload_dir = $conf->fournisseur->dir_output."/commande/".dol_sanitizeFileName($object->ref);
 	$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
-    $nbLinks = Link::count($db, $object->element, $object->id);
+	$nbLinks = Link::count($db, $object->element, $object->id);
 	$head[$h][0] = DOL_URL_ROOT.'/fourn/commande/document.php?id='.$object->id;
 	$head[$h][1] = $langs->trans('Documents');
 	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
@@ -185,8 +185,8 @@ function ordersupplier_prepare_head($object)
 	$head[$h][1] .= $langs->trans("Events");
 	if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read)))
 	{
-	    $head[$h][1] .= '/';
-	    $head[$h][1] .= $langs->trans("Agenda");
+		$head[$h][1] .= '/';
+		$head[$h][1] .= $langs->trans("Agenda");
 	}
 	$head[$h][2] = 'info';
 	$h++;
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index a3eb00a38ec..f8087dc396e 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -185,6 +185,7 @@ function getBrowserInfo($user_agent)
 	if (preg_match('/linux/i', $user_agent)) { $os = 'linux'; } elseif (preg_match('/macintosh/i', $user_agent)) { $os = 'macintosh'; } elseif (preg_match('/windows/i', $user_agent)) { $os = 'windows'; }
 
 	// Name
+	$reg = array();
 	if (preg_match('/firefox(\/|\s)([\d\.]*)/i', $user_agent, $reg)) { $name = 'firefox'; $version = $reg[2]; } elseif (preg_match('/edge(\/|\s)([\d\.]*)/i', $user_agent, $reg)) { $name = 'edge'; $version = $reg[2]; } elseif (preg_match('/chrome(\/|\s)([\d\.]+)/i', $user_agent, $reg)) { $name = 'chrome'; $version = $reg[2]; } // we can have 'chrome (Mozilla...) chrome x.y' in one string
 	elseif (preg_match('/chrome/i', $user_agent, $reg)) { $name = 'chrome'; } elseif (preg_match('/iceweasel/i', $user_agent)) { $name = 'iceweasel'; } elseif (preg_match('/epiphany/i', $user_agent)) { $name = 'epiphany'; } elseif (preg_match('/safari(\/|\s)([\d\.]*)/i', $user_agent, $reg)) { $name = 'safari'; $version = $reg[2]; } // Safari is often present in string for mobile but its not.
 	elseif (preg_match('/opera(\/|\s)([\d\.]*)/i', $user_agent, $reg)) { $name = 'opera'; $version = $reg[2]; } elseif (preg_match('/(MSIE\s([0-9]+\.[0-9]))|.*(Trident\/[0-9]+.[0-9];.*rv:([0-9]+\.[0-9]+))/i', $user_agent, $reg)) { $name = 'ie'; $version = end($reg); } // MS products at end
@@ -658,11 +659,11 @@ function checkVal($out = '', $check = 'alphanohtml', $filter = null, $options =
 			break;
 		case 'alpha':		// No html and no " and no ../
 		case 'alphanohtml':	// Recommended for most scalar parameters and search parameters
-			if (!is_array($out))
-			{
+			if (!is_array($out)) {
 				// '"' is dangerous because param in url can close the href= or src= and add javascript functions.
 				// '../' is dangerous because it allows dir transversals
 				$out = str_replace(array('&quot;', '"', '../'), '', trim($out));
+				// keep lines feed
 				$out = dol_string_nohtmltag($out, 0);
 			}
 			break;
@@ -1018,9 +1019,9 @@ function dol_string_nospecial($str, $newstr = '_', $badcharstoreplace = '')
 function dol_string_nounprintableascii($str, $removetabcrlf = 1)
 {
 	if ($removetabcrlf) {
-		return preg_replace('/[\x00-\x1F\x7F]/u', '', $str);	// /u operator makes UTF8 valid characters being ignored so are not included into the replace
+		return preg_replace('/[\x00-\x1F\x7F]/u', '', $str); // /u operator makes UTF8 valid characters being ignored so are not included into the replace
 	} else {
-		return preg_replace('/[\x00-\x08\x11-\x12\x14-\x1F\x7F]/u', '', $str);	// /u operator should make UTF8 valid characters being ignored so are not included into the replace
+		return preg_replace('/[\x00-\x08\x11-\x12\x14-\x1F\x7F]/u', '', $str); // /u operator should make UTF8 valid characters being ignored so are not included into the replace
 	}
 }
 
@@ -1086,29 +1087,69 @@ function dol_escape_htmltag($stringtoescape, $keepb = 0, $keepn = 0, $keepmoreta
 	}
 }
 
-
 /**
  * Convert a string to lower. Never use strtolower because it does not works with UTF8 strings.
  *
- * @param 	string		$utf8_string		String to encode
+ * @param 	string		$string		        String to encode
+ * @param   string      $encoding           Character set encoding
  * @return 	string							String converted
  */
-function dol_strtolower($utf8_string)
+function dol_strtolower($string, $encoding = "UTF-8")
 {
-	return mb_strtolower($utf8_string, "UTF-8");
+	if (function_exists('mb_strtolower')) {
+		return mb_strtolower($string, $encoding);
+	} else {
+		return strtolower($string);
+	}
 }
 
 /**
  * Convert a string to upper. Never use strtolower because it does not works with UTF8 strings.
  *
- * @param 	string		$utf8_string		String to encode
+ * @param 	string		$string		        String to encode
+ * @param   string      $encoding           Character set encoding
  * @return 	string							String converted
  */
-function dol_strtoupper($utf8_string)
+function dol_strtoupper($string, $encoding = "UTF-8")
 {
-	return mb_strtoupper($utf8_string, "UTF-8");
+	if (function_exists('mb_strtoupper')) {
+		return mb_strtoupper($string, $encoding);
+	} else {
+		return strtoupper($string);
+	}
 }
 
+/**
+ * Convert first character of the first word of a string to upper. Never use ucfirst because it does not works with UTF8 strings.
+ *
+ * @param   string      $string         String to encode
+ * @param   string      $encoding       Character set encodign
+ * @return  string                      String converted
+ */
+function dol_ucfirst($string, $encoding = "UTF-8")
+{
+	if (function_exists('mb_substr')) {
+		return mb_strtoupper(mb_substr($string, 0, 1, $encoding), $encoding).mb_substr($string, 1, null, $encoding);
+	} else {
+		return ucfirst($string);
+	}
+}
+
+/**
+ * Convert first character of all the words of a string to upper. Never use ucfirst because it does not works with UTF8 strings.
+ *
+ * @param   string      $string         String to encode
+ * @param   string      $encoding       Character set encodign
+ * @return  string                      String converted
+ */
+function dol_ucwords($string, $encoding = "UTF-8")
+{
+	if (function_exists('mb_convert_case')) {
+		return mb_convert_case($string, MB_CASE_TITLE, $encoding);
+	} else {
+		return ucwords($string);
+	}
+}
 
 /**
  *	Write log message into outputs. Possible outputs can be:
@@ -1258,7 +1299,7 @@ function dolButtonToOpenUrlInDialogPopup($name, $label, $buttonstring, $url, $di
  *	@param	array	$links				Array of tabs. Currently initialized by calling a function xxx_admin_prepare_head
  *	@param	string	$active     		Active tab name (document', 'info', 'ldap', ....)
  *	@param  string	$title      		Title
- *	@param  int		$notab				-1 or 0=Add tab header, 1=no tab header (if you set this to 1, using dol_fiche_end() to close tab is not required), -2=Add tab header with no seaparation under tab (to start a tab just after)
+ *	@param  int		$notab				-1 or 0=Add tab header, 1=no tab header (if you set this to 1, using print dol_get_fiche_end() to close tab is not required), -2=Add tab header with no seaparation under tab (to start a tab just after)
  * 	@param	string	$picto				Add a picto on tab title
  *	@param	int		$pictoisfullpath	If 1, image path is a full path. If you set this to 1, you can use url returned by dol_buildpath('/mymodyle/img/myimg.png',1) for $picto.
  *  @param	string	$morehtmlright		Add more html content on right of tabs title
@@ -1279,7 +1320,7 @@ function dol_fiche_head($links = array(), $active = '0', $title = '', $notab = 0
  *	@param	array	$links				Array of tabs
  *	@param	string	$active     		Active tab name
  *	@param  string	$title      		Title
- *	@param  int		$notab				-1 or 0=Add tab header, 1=no tab header (if you set this to 1, using dol_fiche_end() to close tab is not required), -2=Add tab header with no seaparation under tab (to start a tab just after)
+ *	@param  int		$notab				-1 or 0=Add tab header, 1=no tab header (if you set this to 1, using print dol_get_fiche_end() to close tab is not required), -2=Add tab header with no seaparation under tab (to start a tab just after)
  * 	@param	string	$picto				Add a picto on tab title
  *	@param	int		$pictoisfullpath	If 1, image path is a full path. If you set this to 1, you can use url returned by dol_buildpath('/mymodyle/img/myimg.png',1) for $picto.
  *  @param	string	$morehtmlright		Add more html content on right of tabs title
@@ -2081,8 +2122,8 @@ function dol_getdate($timestamp, $fast = false, $forcetimezone = '')
 	if (empty($conf->global->MAIN_USE_OLD_FUNCTIONS_FOR_GETDATE)) {
 		//$datetimeobj = new DateTime('@'.$timestamp);
 		$datetimeobj = new DateTime();
-		$datetimeobj->setTimestamp($timestamp);	// Use local PHP server timezone
-		if ($forcetimezone) $datetimeobj->setTimezone(new DateTimeZone($forcetimezone));		//  (add timezone relative to the date entered)
+		$datetimeobj->setTimestamp($timestamp); // Use local PHP server timezone
+		if ($forcetimezone) $datetimeobj->setTimezone(new DateTimeZone($forcetimezone)); //  (add timezone relative to the date entered)
 		$arrayinfo = array(
 			'year'=>((int) date_format($datetimeobj, 'Y')),
 			'mon'=>((int) date_format($datetimeobj, 'm')),
@@ -2449,7 +2490,7 @@ function dol_print_phone($phone, $countrycode = '', $cid = 0, $socid = 0, $addli
 	// Clean phone parameter
 	$phone = preg_replace("/[\s.-]/", "", trim($phone));
 	if (empty($phone)) { return ''; }
-	if ($conf->global->MAIN_PHONE_SEPAR) $separ = $conf->global->MAIN_PHONE_SEPAR;
+	if (!empty($conf->global->MAIN_PHONE_SEPAR)) $separ = $conf->global->MAIN_PHONE_SEPAR;
 	if (empty($countrycode)) $countrycode = $mysoc->country_code;
 
 	// Short format for small screens
@@ -3149,11 +3190,11 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				'1downarrow', '1uparrow', '1leftarrow', '1rightarrow', '1uparrow_selected', '1downarrow_selected', '1leftarrow_selected', '1rightarrow_selected',
 				'accountancy', 'account', 'accountline', 'action', 'add', 'address', 'bank_account', 'barcode', 'bank', 'bill', 'bookmark', 'bom', 'building',
 				'cash-register', 'category', 'check', 'clock', 'close_title', 'company', 'contact', 'contract', 'cubes',
-				'delete', 'dolly', 'dollyrevert', 'edit', 'ellipsis-h', 'email', 'external-link-alt', 'external-link-square-alt',
-				'filter', 'file-code', 'file-export', 'file-import', 'file-upload', 'folder', 'folder-open', 'globe', 'globe-americas', 'grip', 'grip_title',
+				'delete', 'dolly', 'dollyrevert', 'donation', 'edit', 'ellipsis-h', 'email', 'external-link-alt', 'external-link-square-alt',
+				'filter', 'file-code', 'file-export', 'file-import', 'file-upload', 'folder', 'folder-open', 'globe', 'globe-americas', 'grip', 'grip_title', 'group',
 				'help', 'holiday',
 				'intervention', 'label', 'language', 'list', 'listlight', 'lot',
-				'map-marker-alt', 'money-bill-alt', 'mrp', 'note', 'next',
+				'map-marker-alt', 'member', 'money-bill-alt', 'mrp', 'note', 'next',
 				'object_accounting', 'object_account', 'object_accountline', 'object_action', 'object_barcode', 'object_bill', 'object_billa', 'object_billd', 'object_bom',
 				'object_category', 'object_conversation', 'object_bookmark', 'object_bug', 'object_dolly', 'object_dollyrevert', 'object_generic', 'object_folder',
 				'object_list-alt', 'object_calendar', 'object_calendarweek', 'object_calendarmonth', 'object_calendarday', 'object_calendarperuser',
@@ -3304,13 +3345,14 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 
 			// This snippet only needed since function img_edit accepts only one additional parameter: no separate one for css only.
 			// class/style need to be extracted to avoid duplicate class/style validation errors when $moreatt is added to the end of the attributes.
+			$morestyle = '';
 			$reg = array();
 			if (preg_match('/class="([^"]+)"/', $moreatt, $reg)) {
 				$morecss .= ($morecss ? ' ' : '').$reg[1];
 				$moreatt = str_replace('class="'.$reg[1].'"', '', $moreatt);
 			}
 			if (preg_match('/style="([^"]+)"/', $moreatt, $reg)) {
-				$morestyle = ' '.$reg[1];
+				$morestyle = $reg[1];
 				$moreatt = str_replace('style="'.$reg[1].'"', '', $moreatt);
 			}
 			$moreatt = trim($moreatt);
@@ -5620,17 +5662,18 @@ function picto_required()
  *	@param	integer	$removelinefeed		1=Replace all new lines by 1 space, 0=Only ending new lines are removed others are replaced with \n, 2=Ending new lines are removed but others are kept with a same number of \n than nb of <br> when there is both "...<br>\n..."
  *  @param  string	$pagecodeto      	Encoding of input/output string
  *  @param	integer	$strip_tags			0=Use internal strip, 1=Use strip_tags() php function (bugged when text contains a < char that is not for a html tag)
+ *  @param	integer	$removedoublespaces	Replace double space into one space
  *	@return string	    				String cleaned
  *
  * 	@see	dol_escape_htmltag() strip_tags() dol_string_onlythesehtmltags() dol_string_neverthesehtmltags(), dolStripPhpCode()
  */
-function dol_string_nohtmltag($stringtoclean, $removelinefeed = 1, $pagecodeto = 'UTF-8', $strip_tags = 0)
+function dol_string_nohtmltag($stringtoclean, $removelinefeed = 1, $pagecodeto = 'UTF-8', $strip_tags = 0, $removedoublespaces = 1)
 {
 	if ($removelinefeed == 2) $stringtoclean = preg_replace('/<br[^>]*>(\n|\r)+/ims', '<br>', $stringtoclean);
 	$temp = preg_replace('/<br[^>]*>/i', "\n", $stringtoclean);
 
 	// We remove entities BEFORE stripping (in case of a separator char is encoded and not the other, the strip will fails)
-	$temp = dol_html_entity_decode($temp, ENT_COMPAT|ENT_HTML5, $pagecodeto);
+	$temp = dol_html_entity_decode($temp, ENT_COMPAT | ENT_HTML5, $pagecodeto);
 
 	if ($strip_tags) {
 		$temp = strip_tags($temp);
@@ -5643,13 +5686,16 @@ function dol_string_nohtmltag($stringtoclean, $removelinefeed = 1, $pagecodeto =
 		// $temp after pass 2: 0000-021
 	}
 
-	// Remove also CR LF
+	$temp = dol_html_entity_decode($temp, ENT_COMPAT, $pagecodeto);
+
+	// Remove also carriage returns
 	if ($removelinefeed == 1) $temp = str_replace(array("\r\n", "\r", "\n"), " ", $temp);
 
-	// and double spaces
-	while (strpos($temp, "  "))
-	{
-		$temp = str_replace("  ", " ", $temp);
+	// And double quotes
+	if ($removedoublespaces) {
+		while (strpos($temp, "  ")) {
+			$temp = str_replace("  ", " ", $temp);
+		}
 	}
 
 	return trim($temp);
@@ -5842,7 +5888,7 @@ function dol_htmlentitiesbr($stringtoencode, $nl2brmode = 0, $pagecodefrom = 'UT
  */
 function dol_htmlentitiesbr_decode($stringtodecode, $pagecodeto = 'UTF-8')
 {
-	$ret = dol_html_entity_decode($stringtodecode, ENT_COMPAT|ENT_HTML5, $pagecodeto);
+	$ret = dol_html_entity_decode($stringtodecode, ENT_COMPAT | ENT_HTML5, $pagecodeto);
 	$ret = preg_replace('/'."\r\n".'<br(\s[\sa-zA-Z_="]*)?\/?>/i', "<br>", $ret);
 	$ret = preg_replace('/<br(\s[\sa-zA-Z_="]*)?\/?>'."\r\n".'/i', "\r\n", $ret);
 	$ret = preg_replace('/<br(\s[\sa-zA-Z_="]*)?\/?>'."\n".'/i', "\n", $ret);
@@ -6444,11 +6490,13 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 		$tmp4 = dol_get_next_day($tmp['mday'], $tmp['mon'], $tmp['year']);
 		$tmp5 = dol_get_next_month($tmp['mon'], $tmp['year']);
 
+		$daytext = $outputlangs->trans('Day'.$tmp['wday']);
+
 		$substitutionarray = array_merge($substitutionarray, array(
 			'__DAY__' => (string) $tmp['mday'],
-			'__DAY_TEXT__' => $outputlangs->trans('Day'.$tmp['wday']), // Monday
-			'__DAY_TEXT_SHORT__' => $outputlangs->trans($tmp['weekday'].'Min'), // Mon
-			'__DAY_TEXT_MIN__' => $outputlangs->trans('Short'.$tmp['weekday']), // M
+			'__DAY_TEXT__' => $daytext, // Monday
+			'__DAY_TEXT_SHORT__' => dol_trunc($daytext, 3, 'right', 'UTF-8', 1), // Mon
+			'__DAY_TEXT_MIN__' => dol_trunc($daytext, 1, 'right', 'UTF-8', 1), // M
 			'__MONTH__' => (string) $tmp['mon'],
 			'__MONTH_TEXT__' => $outputlangs->trans('Month'.sprintf("%02d", $tmp['mon'])),
 			'__MONTH_TEXT_SHORT__' => $outputlangs->trans('MonthShort'.sprintf("%02d", $tmp['mon'])),
@@ -6701,10 +6749,10 @@ function setEventMessage($mesgs, $style = 'mesgs')
 {
 	//dol_syslog(__FUNCTION__ . " is deprecated", LOG_WARNING);		This is not deprecated, it is used by setEventMessages function
 	if (!is_array($mesgs)) {
-        // If mesgs is a string
+		// If mesgs is a string
 		if ($mesgs) $_SESSION['dol_events'][$style][] = $mesgs;
 	} else {
-        // If mesgs is an array
+		// If mesgs is an array
 		foreach ($mesgs as $mesg)
 		{
 			if ($mesg) $_SESSION['dol_events'][$style][] = $mesg;
@@ -7158,8 +7206,7 @@ function dol_eval($s, $returnvalue = 0, $hideerrors = 1)
 	global $soc; // For backward compatibility
 
 	//print $s."<br>\n";
-	if ($returnvalue)
-	{
+	if ($returnvalue) {
 		if ($hideerrors) return @eval('return '.$s.';');
 		else return eval('return '.$s.';');
 	} else {
@@ -7562,7 +7609,7 @@ function printCommonFooter($zone = 'private')
 
 	// A div to store page_y POST parameter so we can read it using javascript
 	print "\n<!-- A div to store page_y POST parameter -->\n";
-	print '<div id="page_y" style="display: none;">'.$_POST['page_y'].'</div>'."\n";
+	print '<div id="page_y" style="display: none;">'.(empty($_POST['page_y']) ? '' : $_POST['page_y']).'</div>'."\n";
 
 	$parameters = array();
 	$reshook = $hookmanager->executeHooks('printCommonFooter', $parameters); // Note that $action and $object may have been modified by some hooks
diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php
index 2f859d3093a..9d8673578dd 100644
--- a/htdocs/core/lib/functions2.lib.php
+++ b/htdocs/core/lib/functions2.lib.php
@@ -66,7 +66,7 @@ function jsUnEscape($source)
 			$pos++;
 		}
 	}
-	return dol_html_entity_decode($decodedStr, ENT_COMPAT|ENT_HTML5);
+	return dol_html_entity_decode($decodedStr, ENT_COMPAT | ENT_HTML5);
 }
 
 
@@ -492,7 +492,7 @@ function dolAddEmailTrackId($email, $trackingid)
 function isValidMailDomain($mail)
 {
 	list($user, $domain) = explode("@", $mail, 2);
-	return ($domain ? isValidMXRecord($domain, "MX") : 0);
+	return ($domain ? isValidMXRecord($domain) : 0);
 }
 
 /**
@@ -1641,7 +1641,7 @@ function getListOfModels($db, $type, $maxfilenamelength = 0)
 						$liste[$obj->id.':'.$key] = ($obj->label ? $obj->label : $obj->doc_template_name).' '.$val['name'];
 					}
 				} else {
-                    // Common usage
+					// Common usage
 					$liste[$obj->id] = $obj->label ? $obj->label : $obj->doc_template_name;
 				}
 			}
@@ -1688,10 +1688,23 @@ function is_ip($ip)
  */
 function dol_buildlogin($lastname, $firstname)
 {
-	$login = strtolower(dol_string_unaccent($firstname));
-	$login .= ($login ? '.' : '');
-	$login .= strtolower(dol_string_unaccent($lastname));
-	$login = dol_string_nospecial($login, ''); // For special names
+	global $conf;
+
+	//$conf->global->MAIN_BUILD_LOGIN_RULE = 'f.lastname';
+	if (!empty($conf->global->MAIN_BUILD_LOGIN_RULE) && $conf->global->MAIN_BUILD_LOGIN_RULE == 'f.lastname') {	// f.lastname
+		$login = strtolower(dol_string_unaccent(dol_trunc($firstname, 1, 'right', 'UTF-8', 1)));
+		$login .= ($login ? '.' : '');
+		$login .= strtolower(dol_string_unaccent($lastname));
+		$login = dol_string_nospecial($login, ''); // For special names
+	} else {	// firstname.lastname
+		$login = strtolower(dol_string_unaccent($firstname));
+		$login .= ($login ? '.' : '');
+		$login .= strtolower(dol_string_unaccent($lastname));
+		$login = dol_string_nospecial($login, ''); // For special names
+	}
+
+	// TODO Add a hook to allow external modules to suggest new rules
+
 	return $login;
 }
 
@@ -2404,9 +2417,9 @@ function phpSyntaxError($code)
 	if (!defined("LF")) define("LF", "\n");
 	if (!defined("CRLF")) define("CRLF", "\r\n");
 
-	$braces=0;
-	$inString=0;
-	foreach (token_get_all('<?php ' . $code) as $token) {
+	$braces = 0;
+	$inString = 0;
+	foreach (token_get_all('<?php '.$code) as $token) {
 		if (is_array($token)) {
 			switch ($token[0]) {
 				case T_CURLY_OPEN:
@@ -2455,7 +2468,7 @@ function phpSyntaxError($code)
 			$code[2] = (int) $code[2];
 			$code = $code[2] <= $braces
 			? array($code[1], $code[2])
-			: array('unexpected $end' . substr($code[1], 14), $braces);
+			: array('unexpected $end'.substr($code[1], 14), $braces);
 		} else $code = array('syntax error', 0);
 	} else {
 		ob_end_clean();
diff --git a/htdocs/core/lib/geturl.lib.php b/htdocs/core/lib/geturl.lib.php
index 908884ee059..8cfc08222cd 100644
--- a/htdocs/core/lib/geturl.lib.php
+++ b/htdocs/core/lib/geturl.lib.php
@@ -18,11 +18,13 @@
 
 /**
  *	\file			htdocs/core/lib/geturl.lib.php
- *	\brief			This file contains functions dedicated to get URL.
+ *	\brief			This file contains functions dedicated to get URLs.
  */
 
 /**
- * Function to get a content from an URL (use proxy if proxy defined)
+ * Function to get a content from an URL (use proxy if proxy defined).
+ * Support Dolibarr setup for timeout and proxy.
+ * Enhancement of CURL to add an anti SSRF protection.
  *
  * @param	string	  $url 				    URL to call.
  * @param	string    $postorget		    'POST', 'GET', 'HEAD', 'PUT', 'PUTALREADYFORMATED', 'POSTALREADYFORMATED', 'DELETE'
@@ -35,24 +37,24 @@
  */
 function getURLContent($url, $postorget = 'GET', $param = '', $followlocation = 1, $addheaders = array(), $allowedschemes = array('http', 'https'), $localurl = 0)
 {
-    //declaring of global variables
-    global $conf;
-    $USE_PROXY = empty($conf->global->MAIN_PROXY_USE) ? 0 : $conf->global->MAIN_PROXY_USE;
-    $PROXY_HOST = empty($conf->global->MAIN_PROXY_HOST) ? 0 : $conf->global->MAIN_PROXY_HOST;
-    $PROXY_PORT = empty($conf->global->MAIN_PROXY_PORT) ? 0 : $conf->global->MAIN_PROXY_PORT;
-    $PROXY_USER = empty($conf->global->MAIN_PROXY_USER) ? 0 : $conf->global->MAIN_PROXY_USER;
-    $PROXY_PASS = empty($conf->global->MAIN_PROXY_PASS) ? 0 : $conf->global->MAIN_PROXY_PASS;
+	//declaring of global variables
+	global $conf;
+	$USE_PROXY = empty($conf->global->MAIN_PROXY_USE) ? 0 : $conf->global->MAIN_PROXY_USE;
+	$PROXY_HOST = empty($conf->global->MAIN_PROXY_HOST) ? 0 : $conf->global->MAIN_PROXY_HOST;
+	$PROXY_PORT = empty($conf->global->MAIN_PROXY_PORT) ? 0 : $conf->global->MAIN_PROXY_PORT;
+	$PROXY_USER = empty($conf->global->MAIN_PROXY_USER) ? 0 : $conf->global->MAIN_PROXY_USER;
+	$PROXY_PASS = empty($conf->global->MAIN_PROXY_PASS) ? 0 : $conf->global->MAIN_PROXY_PASS;
 
 	dol_syslog("getURLContent postorget=".$postorget." URL=".$url." param=".$param);
 
-    //setting the curl parameters.
-    $ch = curl_init();
+	//setting the curl parameters.
+	$ch = curl_init();
 
-    /*print $API_Endpoint."-".$API_version."-".$PAYPAL_API_USER."-".$PAYPAL_API_PASSWORD."-".$PAYPAL_API_SIGNATURE."<br>";
+	/*print $API_Endpoint."-".$API_version."-".$PAYPAL_API_USER."-".$PAYPAL_API_PASSWORD."-".$PAYPAL_API_SIGNATURE."<br>";
      print $USE_PROXY."-".$gv_ApiErrorURL."<br>";
      print $nvpStr;
      exit;*/
-    curl_setopt($ch, CURLOPT_VERBOSE, 1);
+	curl_setopt($ch, CURLOPT_VERBOSE, 1);
 	curl_setopt($ch, CURLOPT_USERAGENT, 'Dolibarr geturl function');
 
 	// We use @ here because this may return warning if safe mode is on or open_basedir is on (following location is forbidden when safe mode is on).
@@ -67,126 +69,160 @@ function getURLContent($url, $postorget = 'GET', $param = '', $followlocation =
 	if (!empty($conf->global->MAIN_CURL_SSLVERSION)) curl_setopt($ch, CURLOPT_SSLVERSION, $conf->global->MAIN_CURL_SSLVERSION);
 	//curl_setopt($ch, CURLOPT_SSLVERSION, 6); for tls 1.2
 
-    // Turning off the server and peer verification(TrustManager Concept).
-    curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
-    curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
+	// Turning off the server and peer verification(TrustManager Concept).
+	curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
+	curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
 
-    // Restrict use to some protocols only
-    $protocols = 0;
-    if (is_array($allowedschemes)) {
-	    foreach($allowedschemes as $allowedscheme) {
-	    	if ($allowedscheme == 'http') $protocols |= CURLPROTO_HTTP;
-	    	if ($allowedscheme == 'https') $protocols |= CURLPROTO_HTTPS;
-	    }
-	    curl_setopt($ch, CURLOPT_PROTOCOLS, $protocols);
-    	curl_setopt($ch, CURLOPT_REDIR_PROTOCOLS, $protocols);
-    }
+	// Restrict use to some protocols only
+	$protocols = 0;
+	if (is_array($allowedschemes)) {
+		foreach ($allowedschemes as $allowedscheme) {
+			if ($allowedscheme == 'http') $protocols |= CURLPROTO_HTTP;
+			if ($allowedscheme == 'https') $protocols |= CURLPROTO_HTTPS;
+		}
+		curl_setopt($ch, CURLOPT_PROTOCOLS, $protocols);
+		curl_setopt($ch, CURLOPT_REDIR_PROTOCOLS, $protocols);
+	}
 
-    curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, empty($conf->global->MAIN_USE_CONNECT_TIMEOUT) ? 5 : $conf->global->MAIN_USE_CONNECT_TIMEOUT);
-    curl_setopt($ch, CURLOPT_TIMEOUT, empty($conf->global->MAIN_USE_RESPONSE_TIMEOUT) ? 30 : $conf->global->MAIN_USE_RESPONSE_TIMEOUT);
+	curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, empty($conf->global->MAIN_USE_CONNECT_TIMEOUT) ? 5 : $conf->global->MAIN_USE_CONNECT_TIMEOUT);
+	curl_setopt($ch, CURLOPT_TIMEOUT, empty($conf->global->MAIN_USE_RESPONSE_TIMEOUT) ? 30 : $conf->global->MAIN_USE_RESPONSE_TIMEOUT);
 
-    //curl_setopt($ch, CURLOPT_SAFE_UPLOAD, true);	// PHP 5.5
-    curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); // We want response
-    if ($postorget == 'POST') {
-    	curl_setopt($ch, CURLOPT_POST, 1); // POST
-    	curl_setopt($ch, CURLOPT_POSTFIELDS, $param); // Setting param x=a&y=z as POST fields
-    } elseif ($postorget == 'POSTALREADYFORMATED') {
-        curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'POST'); // HTTP request is 'POST' but param string is taken as it is
-        curl_setopt($ch, CURLOPT_POSTFIELDS, $param); // param = content of post, like a xml string
-    } elseif ($postorget == 'PUT') {
-        $array_param = null;
-    	curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'PUT'); // HTTP request is 'PUT'
-    	if (!is_array($param)) parse_str($param, $array_param);
-    	else {
-    	    dol_syslog("parameter param must be a string", LOG_WARNING);
-    	    $array_param = $param;
-    	}
-    	curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query($array_param)); // Setting param x=a&y=z as PUT fields
-    } elseif ($postorget == 'PUTALREADYFORMATED') {
-    	curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'PUT'); // HTTP request is 'PUT'
-    	curl_setopt($ch, CURLOPT_POSTFIELDS, $param); // param = content of post, like a xml string
-    } elseif ($postorget == 'HEAD') {
-    	curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'HEAD'); // HTTP request is 'HEAD'
-    	curl_setopt($ch, CURLOPT_NOBODY, true);
-    } elseif ($postorget == 'DELETE') {
-    	curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'DELETE'); // POST
-    } else {
-    	curl_setopt($ch, CURLOPT_POST, 0); // GET
-    }
+	//curl_setopt($ch, CURLOPT_SAFE_UPLOAD, true);	// PHP 5.5
+	curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); // We want response
+	if ($postorget == 'POST') {
+		curl_setopt($ch, CURLOPT_POST, 1); // POST
+		curl_setopt($ch, CURLOPT_POSTFIELDS, $param); // Setting param x=a&y=z as POST fields
+	} elseif ($postorget == 'POSTALREADYFORMATED') {
+		curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'POST'); // HTTP request is 'POST' but param string is taken as it is
+		curl_setopt($ch, CURLOPT_POSTFIELDS, $param); // param = content of post, like a xml string
+	} elseif ($postorget == 'PUT') {
+		$array_param = null;
+		curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'PUT'); // HTTP request is 'PUT'
+		if (!is_array($param)) parse_str($param, $array_param);
+		else {
+			dol_syslog("parameter param must be a string", LOG_WARNING);
+			$array_param = $param;
+		}
+		curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query($array_param)); // Setting param x=a&y=z as PUT fields
+	} elseif ($postorget == 'PUTALREADYFORMATED') {
+		curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'PUT'); // HTTP request is 'PUT'
+		curl_setopt($ch, CURLOPT_POSTFIELDS, $param); // param = content of post, like a xml string
+	} elseif ($postorget == 'HEAD') {
+		curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'HEAD'); // HTTP request is 'HEAD'
+		curl_setopt($ch, CURLOPT_NOBODY, true);
+	} elseif ($postorget == 'DELETE') {
+		curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'DELETE'); // POST
+	} else {
+		curl_setopt($ch, CURLOPT_POST, 0); // GET
+	}
 
-    //if USE_PROXY constant set at begin of this method.
-    if ($USE_PROXY) {
-        dol_syslog("getURLContent set proxy to ".$PROXY_HOST.":".$PROXY_PORT." - ".$PROXY_USER.":".$PROXY_PASS);
-        //curl_setopt ($ch, CURLOPT_PROXYTYPE, CURLPROXY_HTTP); // Curl 7.10
-        curl_setopt($ch, CURLOPT_PROXY, $PROXY_HOST.":".$PROXY_PORT);
-        if ($PROXY_USER) curl_setopt($ch, CURLOPT_PROXYUSERPWD, $PROXY_USER.":".$PROXY_PASS);
-    }
+	//if USE_PROXY constant set at begin of this method.
+	if ($USE_PROXY) {
+		dol_syslog("getURLContent set proxy to ".$PROXY_HOST.":".$PROXY_PORT." - ".$PROXY_USER.":".$PROXY_PASS);
+		//curl_setopt ($ch, CURLOPT_PROXYTYPE, CURLPROXY_HTTP); // Curl 7.10
+		curl_setopt($ch, CURLOPT_PROXY, $PROXY_HOST.":".$PROXY_PORT);
+		if ($PROXY_USER) curl_setopt($ch, CURLOPT_PROXYUSERPWD, $PROXY_USER.":".$PROXY_PASS);
+	}
 
-    $newUrl = $url;
-    $maxRedirection = 5;
-    $info = array();
+	$newUrl = $url;
+	$maxRedirection = 5;
+	$info = array();
+	$response = '';
 
-    do
-    {
-    	if ($maxRedirection < 1) break;
+	do {
+		if ($maxRedirection < 1) break;
 
-	    curl_setopt($ch, CURLOPT_URL, $newUrl);
+		curl_setopt($ch, CURLOPT_URL, $newUrl);
 
-	    // TODO Test for $localurl on $newUrl
-	    // Parse $newUrl, check server address, then set parsed value with CURLOPT_CONNECT_TO
+		// Parse $newUrl
+		$newUrlArray = parse_url($newUrl);
+		$hosttocheck = $newUrlArray['host'];
+		$hosttocheck = str_replace(array('[', ']'), '', $hosttocheck); // Remove brackets of IPv6
 
-	    // Getting response from server
-	    $response = curl_exec($ch);
+		if (in_array($hosttocheck, array('localhost', 'localhost.domain'))) {
+			$iptocheck = '127.0.0.1';
+		} else {
+			// TODO Resolve $iptocheck to get an IP and set CURLOPT_CONNECT_TO to use this ip
+			$iptocheck = $hosttocheck;
+		}
 
-	    $info = curl_getinfo($ch); // Reading of request must be done after sending request
-	    $http_code = $info['http_code'];
-	    if ($followlocation && ($http_code == 301 || $http_code == 302 || $http_code == 303 || $http_code == 307)) {
-	    	$newUrl = $info['redirect_url'];
-	    	$maxRedirection--;
-	    	// TODO Use $info['local_ip'] and $info['primary_ip'] ?
-	    	continue;
-	    } else {
-	    	$http_code = 0;
-	    }
-    }
-    while($http_code);
+		if (!filter_var($iptocheck, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4 | FILTER_FLAG_IPV6)) {	// This is not an IP
+			$iptocheck = 0; //
+		}
 
-    $request = curl_getinfo($ch, CURLINFO_HEADER_OUT); // Reading of request must be done after sending request
+		if ($iptocheck) {
+			if ($localurl == 0) {	// Only external url allowed (dangerous, may allow to get malware)
+				if (!filter_var($iptocheck, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE)) {
+					$info['http_code'] = 400;
+					$info['content'] = 'Error bad hostname IP (private or reserved range). Must be an external URL.';
+					break;
+				}
+				if (in_array($iptocheck, array('100.100.100.200'))) {
+					$info['http_code'] = 400;
+					$info['content'] = 'Error bad hostname IP (Used by Alibaba metadata). Must be an external URL.';
+					break;
+				}
+			}
+			if ($localurl == 1) {	// Only local url allowed (dangerous, may allow to get metadata on server or make internal port scanning)
+				if (filter_var($iptocheck, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE)) {
+					$info['http_code'] = 400;
+					$info['content'] = 'Error bad hostname. Must be a local URL.';
+					break;
+				}
+			}
+		}
 
-    dol_syslog("getURLContent request=".$request);
-    //dol_syslog("getURLContent response =".response);	// This may contains binary data, so we dont output it
-    dol_syslog("getURLContent response size=".strlen($response)); // This may contains binary data, so we dont output it
+		// Getting response from server
+		$response = curl_exec($ch);
 
-    $rep = array();
-    if (curl_errno($ch))
-    {
-        // Ad keys to $rep
-        $rep['content'] = $response;
+		$info = curl_getinfo($ch); // Reading of request must be done after sending request
+		$http_code = $info['http_code'];
+		if ($followlocation && ($http_code == 301 || $http_code == 302 || $http_code == 303 || $http_code == 307)) {
+			$newUrl = $info['redirect_url'];
+			$maxRedirection--;
+			// TODO Use $info['local_ip'] and $info['primary_ip'] ?
+			continue;
+		} else {
+			$http_code = 0;
+		}
+	}
+	while ($http_code);
 
-        // moving to display page to display curl errors
+	$request = curl_getinfo($ch, CURLINFO_HEADER_OUT); // Reading of request must be done after sending request
+
+	dol_syslog("getURLContent request=".$request);
+	//dol_syslog("getURLContent response =".response);	// This may contains binary data, so we dont output it
+	dol_syslog("getURLContent response size=".strlen($response)); // This may contains binary data, so we dont output it
+
+	$rep = array();
+	if (curl_errno($ch)) {
+		// Ad keys to $rep
+		$rep['content'] = $response;
+
+		// moving to display page to display curl errors
 		$rep['curl_error_no'] = curl_errno($ch);
-        $rep['curl_error_msg'] = curl_error($ch);
+		$rep['curl_error_msg'] = curl_error($ch);
 
 		dol_syslog("getURLContent response array is ".join(',', $rep));
-    } else {
-    	//$info = curl_getinfo($ch);
+	} else {
+		//$info = curl_getinfo($ch);
 
-    	// Ad keys to $rep
-    	$rep = $info;
-    	//$rep['header_size']=$info['header_size'];
-    	//$rep['http_code']=$info['http_code'];
-    	dol_syslog("getURLContent http_code=".$rep['http_code']);
+		// Ad keys to $rep
+		$rep = $info;
+		//$rep['header_size']=$info['header_size'];
+		//$rep['http_code']=$info['http_code'];
+		dol_syslog("getURLContent http_code=".$rep['http_code']);
 
-        // Add more keys to $rep
-        $rep['content'] = $response;
-    	$rep['curl_error_no'] = '';
-    	$rep['curl_error_msg'] = '';
-    }
+		// Add more keys to $rep
+		$rep['content'] = $response;
+		$rep['curl_error_no'] = '';
+		$rep['curl_error_msg'] = '';
+	}
 
-    //closing the curl
-    curl_close($ch);
+	//closing the curl
+	curl_close($ch);
 
-    return $rep;
+	return $rep;
 }
 
 
@@ -202,14 +238,12 @@ function getDomainFromURL($url, $mode = 0)
 {
 	$tmpdomain = preg_replace('/^https?:\/\//i', '', $url); // Remove http(s)://
 	$tmpdomain = preg_replace('/\/.*$/i', '', $tmpdomain); // Remove part after domain
-	if ($mode == 2)
-	{
+	if ($mode == 2) {
 		$tmpdomain = preg_replace('/^.*\.([^\.]+)\.([^\.]+)\.([^\.]+)$/', '\1.\2.\3', $tmpdomain); // Remove part 'www.' before 'abc.mydomain.com'
 	} else {
 		$tmpdomain = preg_replace('/^.*\.([^\.]+)\.([^\.]+)$/', '\1.\2', $tmpdomain); // Remove part 'www.abc.' before 'mydomain.com'
 	}
-	if (empty($mode))
-	{
+	if (empty($mode)) {
 		$tmpdomain = preg_replace('/\.[^\.]+$/', '', $tmpdomain); // Remove first level domain (.com, .net, ...)
 	}
 
diff --git a/htdocs/core/lib/holiday.lib.php b/htdocs/core/lib/holiday.lib.php
index 3c98f14a385..f5297f6fd89 100644
--- a/htdocs/core/lib/holiday.lib.php
+++ b/htdocs/core/lib/holiday.lib.php
@@ -34,28 +34,28 @@ function holiday_prepare_head($object)
 	$h = 0;
 	$head = array();
 
-    $head[$h][0] = DOL_URL_ROOT.'/holiday/card.php?id='.$object->id;
-    $head[$h][1] = $langs->trans("Leave");
-    $head[$h][2] = 'card';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT.'/holiday/card.php?id='.$object->id;
+	$head[$h][1] = $langs->trans("Leave");
+	$head[$h][2] = 'card';
+	$h++;
 
-    // Attachments
-    require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-    require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-    $upload_dir = $conf->holiday->multidir_output[$object->entity].'/'.dol_sanitizeFileName($object->ref);
-    $nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
-    $nbLinks = Link::count($db, $object->element, $object->id);
-    $head[$h][0] = DOL_URL_ROOT.'/holiday/document.php?id='.$object->id;
-    $head[$h][1] = $langs->trans('Documents');
-    if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
-    $head[$h][2] = 'documents';
-    $h++;
+	// Attachments
+	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
+	$upload_dir = $conf->holiday->multidir_output[$object->entity].'/'.dol_sanitizeFileName($object->ref);
+	$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
+	$nbLinks = Link::count($db, $object->element, $object->id);
+	$head[$h][0] = DOL_URL_ROOT.'/holiday/document.php?id='.$object->id;
+	$head[$h][1] = $langs->trans('Documents');
+	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
+	$head[$h][2] = 'documents';
+	$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, 'holiday');
+	// 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, 'holiday');
 
 	complete_head_from_modules($conf, $langs, $object, $head, $h, 'holiday', 'remove');
 
@@ -66,7 +66,7 @@ function holiday_prepare_head($object)
 /**
  *  Return array head with list of tabs to view object informations
  *
-  *  @return array           		head
+ *  @return array           		head
  */
 function holiday_admin_prepare_head()
 {
@@ -75,21 +75,21 @@ function holiday_admin_prepare_head()
 	$h = 0;
 	$head = array();
 
-    $head[$h][0] = DOL_URL_ROOT.'/admin/holiday.php';
-    $head[$h][1] = $langs->trans("Setup");
-    $head[$h][2] = 'holiday';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT.'/admin/holiday.php';
+	$head[$h][1] = $langs->trans("Setup");
+	$head[$h][2] = 'holiday';
+	$h++;
 
-    // Show more tabs from modules
-    // Entries must be declared in modules descriptor with line
-    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
-    // $this->tabs = array('entity:-tabname);   												to remove a tab
-    complete_head_from_modules($conf, $langs, null, $head, $h, 'holiday_admin');
+	// Show more tabs from modules
+	// Entries must be declared in modules descriptor with line
+	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
+	// $this->tabs = array('entity:-tabname);   												to remove a tab
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'holiday_admin');
 
-    $head[$h][0] = DOL_URL_ROOT.'/admin/holiday_extrafields.php';
-    $head[$h][1] = $langs->trans("ExtraFields");
-    $head[$h][2] = 'attributes';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT.'/admin/holiday_extrafields.php';
+	$head[$h][1] = $langs->trans("ExtraFields");
+	$head[$h][2] = 'attributes';
+	$h++;
 
 	complete_head_from_modules($conf, $langs, null, $head, $h, 'holiday_admin', 'remove');
 
diff --git a/htdocs/core/lib/intracommreport.lib.php b/htdocs/core/lib/intracommreport.lib.php
index ce63b320983..9bf4996525b 100644
--- a/htdocs/core/lib/intracommreport.lib.php
+++ b/htdocs/core/lib/intracommreport.lib.php
@@ -29,26 +29,26 @@
  */
 function intracommReportAdminPrepareHead()
 {
-    global $langs, $conf;
+	global $langs, $conf;
 
-    $langs->load("intracommreport");
+	$langs->load("intracommreport");
 
-    $h = 0;
-    $head = array();
+	$h = 0;
+	$head = array();
 
-    $head[$h][0] = DOL_URL_ROOT.'/intracommreport/admin/intracommreport.php';
-    $head[$h][1] = $langs->trans("Parameters");
-    $head[$h][2] = 'general';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT.'/intracommreport/admin/intracommreport.php';
+	$head[$h][1] = $langs->trans("Parameters");
+	$head[$h][2] = 'general';
+	$h++;
 
-    // Show more tabs from modules
-    // Entries must be declared in modules descriptor with line
-    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab
-    // $this->tabs = array('entity:-tabname); to remove a tab
-    complete_head_from_modules($conf, $langs, null, $head, $h, 'intracommreport_admin');
+	// Show more tabs from modules
+	// Entries must be declared in modules descriptor with line
+	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab
+	// $this->tabs = array('entity:-tabname); to remove a tab
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'intracommreport_admin');
 
-    complete_head_from_modules($conf, $langs, null, $head, $h, 'intracommreport_admin', 'remove');
-    return $head;
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'intracommreport_admin', 'remove');
+	return $head;
 }
 
 /**
@@ -60,24 +60,24 @@ function intracommReportAdminPrepareHead()
  */
 function intracommReportPrepareHead($object)
 {
-    global $langs, $conf;
+	global $langs, $conf;
 
-    $langs->load("intracommreport");
+	$langs->load("intracommreport");
 
-    $h = 0;
-    $head = array();
+	$h = 0;
+	$head = array();
 
-    $head[$h][0] = DOL_URL_ROOT.'/intracommreport/card.php?rowid='.$object->id;
-    $head[$h][1] = $langs->trans("Card");
-    $head[$h][2] = 'card';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT.'/intracommreport/card.php?rowid='.$object->id;
+	$head[$h][1] = $langs->trans("Card");
+	$head[$h][2] = 'card';
+	$h++;
 
-    // Show more tabs from modules
-    // Entries must be declared in modules descriptor with line
-    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab
-    // $this->tabs = array('entity:-tabname); to remove a tab
-    complete_head_from_modules($conf, $langs, null, $head, $h, 'intracommreport');
+	// Show more tabs from modules
+	// Entries must be declared in modules descriptor with line
+	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab
+	// $this->tabs = array('entity:-tabname); to remove a tab
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'intracommreport');
 
-    complete_head_from_modules($conf, $langs, null, $head, $h, 'intracommreport', 'remove');
-    return $head;
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'intracommreport', 'remove');
+	return $head;
 }
diff --git a/htdocs/core/lib/invoice.lib.php b/htdocs/core/lib/invoice.lib.php
index f840c037821..453bc34be8a 100644
--- a/htdocs/core/lib/invoice.lib.php
+++ b/htdocs/core/lib/invoice.lib.php
@@ -47,8 +47,8 @@ function facture_prepare_head($object)
 
 	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
 	{
-	    $nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external'));
-	    $head[$h][0] = DOL_URL_ROOT.'/compta/facture/contact.php?facid='.$object->id;
+		$nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external'));
+		$head[$h][0] = DOL_URL_ROOT.'/compta/facture/contact.php?facid='.$object->id;
 		$head[$h][1] = $langs->trans('ContactsAddresses');
 		if ($nbContact > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';
 		$head[$h][2] = 'contact';
@@ -57,17 +57,17 @@ function facture_prepare_head($object)
 
 	if (!empty($conf->prelevement->enabled))
 	{
-	    $nbStandingOrders = 0;
-	    $sql = "SELECT COUNT(pfd.rowid) as nb";
-	    $sql .= " FROM ".MAIN_DB_PREFIX."prelevement_facture_demande as pfd";
-	    $sql .= " WHERE pfd.fk_facture = ".$object->id;
-	    $sql .= " AND pfd.ext_payment_id IS NULL";
-        $resql = $db->query($sql);
-        if ($resql)
-        {
-            $obj = $db->fetch_object($resql);
-            if ($obj) $nbStandingOrders = $obj->nb;
-        } else dol_print_error($db);
+		$nbStandingOrders = 0;
+		$sql = "SELECT COUNT(pfd.rowid) as nb";
+		$sql .= " FROM ".MAIN_DB_PREFIX."prelevement_facture_demande as pfd";
+		$sql .= " WHERE pfd.fk_facture = ".$object->id;
+		$sql .= " AND pfd.ext_payment_id IS NULL";
+		$resql = $db->query($sql);
+		if ($resql)
+		{
+			$obj = $db->fetch_object($resql);
+			if ($obj) $nbStandingOrders = $obj->nb;
+		} else dol_print_error($db);
 		$head[$h][0] = DOL_URL_ROOT.'/compta/facture/prelevement.php?facid='.$object->id;
 		$head[$h][1] = $langs->trans('StandingOrders');
 		if ($nbStandingOrders > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbStandingOrders.'</span>';
@@ -75,29 +75,29 @@ function facture_prepare_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);   												to remove a tab
-    complete_head_from_modules($conf, $langs, $object, $head, $h, 'invoice');
+	// 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, 'invoice');
 
-    if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
-    {
-    	$nbNote = 0;
-        if (!empty($object->note_private)) $nbNote++;
+	if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
+	{
+		$nbNote = 0;
+		if (!empty($object->note_private)) $nbNote++;
 		if (!empty($object->note_public)) $nbNote++;
-    	$head[$h][0] = DOL_URL_ROOT.'/compta/facture/note.php?facid='.$object->id;
-    	$head[$h][1] = $langs->trans('Notes');
+		$head[$h][0] = DOL_URL_ROOT.'/compta/facture/note.php?facid='.$object->id;
+		$head[$h][1] = $langs->trans('Notes');
 		if ($nbNote > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
-    	$head[$h][2] = 'note';
-    	$h++;
-    }
+		$head[$h][2] = 'note';
+		$h++;
+	}
 
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-    require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
 	$upload_dir = $conf->facture->dir_output."/".dol_sanitizeFileName($object->ref);
 	$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
-    $nbLinks = Link::count($db, $object->element, $object->id);
+	$nbLinks = Link::count($db, $object->element, $object->id);
 	$head[$h][0] = DOL_URL_ROOT.'/compta/facture/document.php?facid='.$object->id;
 	$head[$h][1] = $langs->trans('Documents');
 	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
@@ -193,11 +193,11 @@ function invoice_rec_prepare_head($object)
 	$head[$h][2] = 'card';
 	$h++;
 
-    // Show more tabs from modules
-    // Entries must be declared in modules descriptor with line
-    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
-    // $this->tabs = array('entity:-tabname);   												to remove a tab
-    complete_head_from_modules($conf, $langs, $object, $head, $h, 'invoice-rec');
+	// 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, 'invoice-rec');
 
 	complete_head_from_modules($conf, $langs, $object, $head, $h, 'invoice-rec', 'remove');
 
diff --git a/htdocs/core/lib/json.lib.php b/htdocs/core/lib/json.lib.php
index e4dfa3a0830..51eb648bf6f 100644
--- a/htdocs/core/lib/json.lib.php
+++ b/htdocs/core/lib/json.lib.php
@@ -54,7 +54,7 @@ function dol_json_encode($elements)
 	{
 		foreach ($elements as $key => $value) $num++;
 	} else {
-	    $num = count($elements);
+		$num = count($elements);
 	}
 	//var_dump($num);
 
@@ -105,94 +105,94 @@ function _val($val)
 {
 	if (is_string($val))
 	{
-        // STRINGS ARE EXPECTED TO BE IN ASCII OR UTF-8 FORMAT
-        $ascii = '';
-        $strlen_var = strlen($val);
+		// STRINGS ARE EXPECTED TO BE IN ASCII OR UTF-8 FORMAT
+		$ascii = '';
+		$strlen_var = strlen($val);
 
-        /*
+		/*
 	     * Iterate over every character in the string,
 	     * escaping with a slash or encoding to UTF-8 where necessary
 	     */
-	    for ($c = 0; $c < $strlen_var; ++$c) {
-	        $ord_var_c = ord($val[$c]);
+		for ($c = 0; $c < $strlen_var; ++$c) {
+			$ord_var_c = ord($val[$c]);
 
-	        switch (true) {
-	            case $ord_var_c == 0x08:
-	                $ascii .= '\b';
-	                break;
-	            case $ord_var_c == 0x09:
-	                $ascii .= '\t';
-	                break;
-	            case $ord_var_c == 0x0A:
-	                $ascii .= '\n';
-	                break;
-	            case $ord_var_c == 0x0C:
-	                $ascii .= '\f';
-	                break;
-	            case $ord_var_c == 0x0D:
-	                $ascii .= '\r';
-	                break;
+			switch (true) {
+				case $ord_var_c == 0x08:
+					$ascii .= '\b';
+					break;
+				case $ord_var_c == 0x09:
+					$ascii .= '\t';
+					break;
+				case $ord_var_c == 0x0A:
+					$ascii .= '\n';
+					break;
+				case $ord_var_c == 0x0C:
+					$ascii .= '\f';
+					break;
+				case $ord_var_c == 0x0D:
+					$ascii .= '\r';
+					break;
 
-	            case $ord_var_c == 0x22:
-	            case $ord_var_c == 0x2F:
-	            case $ord_var_c == 0x5C:
-	                // double quote, slash, slosh
-	                $ascii .= '\\'.$val[$c];
-	                break;
+				case $ord_var_c == 0x22:
+				case $ord_var_c == 0x2F:
+				case $ord_var_c == 0x5C:
+					// double quote, slash, slosh
+					$ascii .= '\\'.$val[$c];
+					break;
 
-	            case (($ord_var_c >= 0x20) && ($ord_var_c <= 0x7F)):
-	                // characters U-00000000 - U-0000007F (same as ASCII)
-	                $ascii .= $val[$c];
-	                break;
+				case (($ord_var_c >= 0x20) && ($ord_var_c <= 0x7F)):
+					// characters U-00000000 - U-0000007F (same as ASCII)
+					$ascii .= $val[$c];
+					break;
 
-	            case (($ord_var_c & 0xE0) == 0xC0):
-	                // characters U-00000080 - U-000007FF, mask 110XXXXX
-	                // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-	                $char = pack('C*', $ord_var_c, ord($val[$c + 1]));
-	                $c += 1;
-	                $utf16 = utf82utf16($char);
-	                $ascii .= sprintf('\u%04s', bin2hex($utf16));
-	                break;
+				case (($ord_var_c & 0xE0) == 0xC0):
+					// characters U-00000080 - U-000007FF, mask 110XXXXX
+					// see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+					$char = pack('C*', $ord_var_c, ord($val[$c + 1]));
+					$c += 1;
+					$utf16 = utf82utf16($char);
+					$ascii .= sprintf('\u%04s', bin2hex($utf16));
+					break;
 
-	            case (($ord_var_c & 0xF0) == 0xE0):
-	                // characters U-00000800 - U-0000FFFF, mask 1110XXXX
-	                // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-	                $char = pack('C*', $ord_var_c, ord($val[$c + 1]), ord($val[$c + 2]));
-	                $c += 2;
-	                $utf16 = utf82utf16($char);
-	                $ascii .= sprintf('\u%04s', bin2hex($utf16));
-	                break;
+				case (($ord_var_c & 0xF0) == 0xE0):
+					// characters U-00000800 - U-0000FFFF, mask 1110XXXX
+					// see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+					$char = pack('C*', $ord_var_c, ord($val[$c + 1]), ord($val[$c + 2]));
+					$c += 2;
+					$utf16 = utf82utf16($char);
+					$ascii .= sprintf('\u%04s', bin2hex($utf16));
+					break;
 
-	            case (($ord_var_c & 0xF8) == 0xF0):
-	                // characters U-00010000 - U-001FFFFF, mask 11110XXX
-	                // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-	                $char = pack('C*', $ord_var_c, ord($val[$c + 1]), ord($val[$c + 2]), ord($val[$c + 3]));
-	                $c += 3;
-	                $utf16 = utf82utf16($char);
-	                $ascii .= sprintf('\u%04s', bin2hex($utf16));
-	                break;
+				case (($ord_var_c & 0xF8) == 0xF0):
+					// characters U-00010000 - U-001FFFFF, mask 11110XXX
+					// see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+					$char = pack('C*', $ord_var_c, ord($val[$c + 1]), ord($val[$c + 2]), ord($val[$c + 3]));
+					$c += 3;
+					$utf16 = utf82utf16($char);
+					$ascii .= sprintf('\u%04s', bin2hex($utf16));
+					break;
 
-	            case (($ord_var_c & 0xFC) == 0xF8):
-	                // characters U-00200000 - U-03FFFFFF, mask 111110XX
-	                // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-	                $char = pack('C*', $ord_var_c, ord($val[$c + 1]), ord($val[$c + 2]), ord($val[$c + 3]), ord($val[$c + 4]));
-	                $c += 4;
-	                $utf16 = utf82utf16($char);
-	                $ascii .= sprintf('\u%04s', bin2hex($utf16));
-	                break;
+				case (($ord_var_c & 0xFC) == 0xF8):
+					// characters U-00200000 - U-03FFFFFF, mask 111110XX
+					// see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+					$char = pack('C*', $ord_var_c, ord($val[$c + 1]), ord($val[$c + 2]), ord($val[$c + 3]), ord($val[$c + 4]));
+					$c += 4;
+					$utf16 = utf82utf16($char);
+					$ascii .= sprintf('\u%04s', bin2hex($utf16));
+					break;
 
-	            case (($ord_var_c & 0xFE) == 0xFC):
-	                // characters U-04000000 - U-7FFFFFFF, mask 1111110X
-	                // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-	                $char = pack('C*', $ord_var_c, ord($val[$c + 1]), ord($val[$c + 2]), ord($val[$c + 3]), ord($val[$c + 4]), ord($val[$c + 5]));
-	                $c += 5;
-	                $utf16 = utf82utf16($char);
-	                $ascii .= sprintf('\u%04s', bin2hex($utf16));
-	                break;
-	        }
-	    }
+				case (($ord_var_c & 0xFE) == 0xFC):
+					// characters U-04000000 - U-7FFFFFFF, mask 1111110X
+					// see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+					$char = pack('C*', $ord_var_c, ord($val[$c + 1]), ord($val[$c + 2]), ord($val[$c + 3]), ord($val[$c + 4]), ord($val[$c + 5]));
+					$c += 5;
+					$utf16 = utf82utf16($char);
+					$ascii .= sprintf('\u%04s', bin2hex($utf16));
+					break;
+			}
+		}
 
-	    return '"'.$ascii.'"';
+		return '"'.$ascii.'"';
 	} elseif (is_int($val)) return sprintf('%d', $val);
 	elseif (is_float($val)) return sprintf('%F', $val);
 	elseif (is_bool($val)) return ($val ? 'true' : 'false');
@@ -229,7 +229,7 @@ function dol_json_decode($json, $assoc = false)
 
 	$comment = false;
 
-    $out = '';
+	$out = '';
 	$strLength = strlen($json); // Must stay strlen and not dol_strlen because we want technical length, not visible length
 	for ($i = 0; $i < $strLength; $i++)
 	{
@@ -290,10 +290,10 @@ function _unval($val)
 	$reg = array();
 	while (preg_match('/\\\u([0-9A-F]{2})([0-9A-F]{2})/i', $val, $reg))
 	{
-	    // single, escaped unicode character
-	    $utf16 = chr(hexdec($reg[1])).chr(hexdec($reg[2]));
-	    $utf8  = utf162utf8($utf16);
-	    $val = preg_replace('/\\\u'.$reg[1].$reg[2].'/i', $utf8, $val);
+		// single, escaped unicode character
+		$utf16 = chr(hexdec($reg[1])).chr(hexdec($reg[2]));
+		$utf8  = utf162utf8($utf16);
+		$val = preg_replace('/\\\u'.$reg[1].$reg[2].'/i', $utf8, $val);
 	}
 	return $val;
 }
@@ -312,29 +312,29 @@ function utf162utf8($utf16)
 {
 	// oh please oh please oh please oh please oh please
 	if (function_exists('mb_convert_encoding')) {
-	    return mb_convert_encoding($utf16, 'UTF-8', 'UTF-16');
+		return mb_convert_encoding($utf16, 'UTF-8', 'UTF-16');
 	}
 
 	$bytes = (ord($utf16[0]) << 8) | ord($utf16[1]);
 
 	switch (true) {
-    	case ((0x7F & $bytes) == $bytes):
+		case ((0x7F & $bytes) == $bytes):
 			// this case should never be reached, because we are in ASCII range
 			// see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-    	return chr($bytes);
+		return chr($bytes);
 
-    	case (0x07FF & $bytes) == $bytes:
+		case (0x07FF & $bytes) == $bytes:
 			// return a 2-byte UTF-8 character
 			// see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-    	return chr(0xC0 | (($bytes >> 6) & 0x1F))
-    	. chr(0x80 | ($bytes & 0x3F));
+		return chr(0xC0 | (($bytes >> 6) & 0x1F))
+		. chr(0x80 | ($bytes & 0x3F));
 
-    	case (0xFFFF & $bytes) == $bytes:
+		case (0xFFFF & $bytes) == $bytes:
 			// return a 3-byte UTF-8 character
 			// see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-    	return chr(0xE0 | (($bytes >> 12) & 0x0F))
-    	. chr(0x80 | (($bytes >> 6) & 0x3F))
-    	. chr(0x80 | ($bytes & 0x3F));
+		return chr(0xE0 | (($bytes >> 12) & 0x0F))
+		. chr(0x80 | (($bytes >> 6) & 0x3F))
+		. chr(0x80 | ($bytes & 0x3F));
 	}
 
 	// ignoring UTF-32 for now, sorry
@@ -355,12 +355,12 @@ function utf82utf16($utf8)
 {
 	// oh please oh please oh please oh please oh please
 	if (function_exists('mb_convert_encoding')) {
-	    return mb_convert_encoding($utf8, 'UTF-16', 'UTF-8');
+		return mb_convert_encoding($utf8, 'UTF-16', 'UTF-8');
 	}
 
 	switch (strlen($utf8)) {
 		case 1:
-	        // this case should never be reached, because we are in ASCII range
+			// this case should never be reached, because we are in ASCII range
 			// see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
 			return $utf8;
 
diff --git a/htdocs/core/lib/loan.lib.php b/htdocs/core/lib/loan.lib.php
index 638eb83b9cd..3a34d3e57c4 100644
--- a/htdocs/core/lib/loan.lib.php
+++ b/htdocs/core/lib/loan.lib.php
@@ -32,10 +32,10 @@
  */
 function loan_prepare_head($object)
 {
-    global $db, $langs, $conf;
+	global $db, $langs, $conf;
 
-    $tab = 0;
-    $head = array();
+	$tab = 0;
+	$head = array();
 
 	$head[$tab][0] = DOL_URL_ROOT.'/loan/card.php?id='.$object->id;
 	$head[$tab][1] = $langs->trans('Card');
@@ -47,17 +47,17 @@ function loan_prepare_head($object)
 	$head[$tab][2] = 'FinancialCommitment';
 	$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, $tab, 'loan');
+	// 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, $tab, 'loan');
 
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-    require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
 	$upload_dir = $conf->loan->dir_output."/".dol_sanitizeFileName($object->ref);
 	$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
-    $nbLinks = Link::count($db, $object->element, $object->id);
+	$nbLinks = Link::count($db, $object->element, $object->id);
 	$head[$tab][0] = DOL_URL_ROOT.'/loan/document.php?id='.$object->id;
 	$head[$tab][1] = $langs->trans("Documents");
 	if (($nbFiles + $nbLinks) > 0) $head[$tab][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
@@ -73,14 +73,14 @@ function loan_prepare_head($object)
 		$tab++;
 	}
 
-    $head[$tab][0] = DOL_URL_ROOT.'/loan/info.php?id='.$object->id;
-    $head[$tab][1] = $langs->trans("Info");
-    $head[$tab][2] = 'info';
-    $tab++;
+	$head[$tab][0] = DOL_URL_ROOT.'/loan/info.php?id='.$object->id;
+	$head[$tab][1] = $langs->trans("Info");
+	$head[$tab][2] = 'info';
+	$tab++;
 
-    complete_head_from_modules($conf, $langs, $object, $head, $tab, 'loan', 'remove');
+	complete_head_from_modules($conf, $langs, $object, $head, $tab, 'loan', 'remove');
 
-    return $head;
+	return $head;
 }
 
 /**
@@ -95,42 +95,42 @@ function loan_prepare_head($object)
  */
 function loanCalcMonthlyPayment($mens, $capital, $rate, $echance, $nbterm)
 {
-    global $conf, $db;
-    require_once DOL_DOCUMENT_ROOT.'/loan/class/loanschedule.class.php';
-    $object = new LoanSchedule($db);
-    $output = array();
+	global $conf, $db;
+	require_once DOL_DOCUMENT_ROOT.'/loan/class/loanschedule.class.php';
+	$object = new LoanSchedule($db);
+	$output = array();
 
-    // If mensuality is 0 we don't pay interests and remaining capital not modified
-    if ($mens == 0) {
-        $int = 0;
-        $cap_rest = $capital;
-    } else {
-        $int = ($capital * ($rate / 12));
-        $int = round($int, 2, PHP_ROUND_HALF_UP);
-        $cap_rest = round($capital - ($mens - $int), 2, PHP_ROUND_HALF_UP);
-    }
-    $output[$echance] = array('cap_rest'=>$cap_rest, 'cap_rest_str'=>price($cap_rest, 0, '', 1, -1, -1, $conf->currency), 'interet'=>$int, 'interet_str'=>price($int, 0, '', 1, -1, -1, $conf->currency), 'mens'=>$mens);
+	// If mensuality is 0 we don't pay interests and remaining capital not modified
+	if ($mens == 0) {
+		$int = 0;
+		$cap_rest = $capital;
+	} else {
+		$int = ($capital * ($rate / 12));
+		$int = round($int, 2, PHP_ROUND_HALF_UP);
+		$cap_rest = round($capital - ($mens - $int), 2, PHP_ROUND_HALF_UP);
+	}
+	$output[$echance] = array('cap_rest'=>$cap_rest, 'cap_rest_str'=>price($cap_rest, 0, '', 1, -1, -1, $conf->currency), 'interet'=>$int, 'interet_str'=>price($int, 0, '', 1, -1, -1, $conf->currency), 'mens'=>$mens);
 
-    $echance++;
-    $capital = $cap_rest;
-    while ($echance <= $nbterm) {
-        $mens = round($object->calcMonthlyPayments($capital, $rate, $nbterm - $echance + 1), 2, PHP_ROUND_HALF_UP);
+	$echance++;
+	$capital = $cap_rest;
+	while ($echance <= $nbterm) {
+		$mens = round($object->calcMonthlyPayments($capital, $rate, $nbterm - $echance + 1), 2, PHP_ROUND_HALF_UP);
 
-        $int = ($capital * ($rate / 12));
-        $int = round($int, 2, PHP_ROUND_HALF_UP);
-        $cap_rest = round($capital - ($mens - $int), 2, PHP_ROUND_HALF_UP);
+		$int = ($capital * ($rate / 12));
+		$int = round($int, 2, PHP_ROUND_HALF_UP);
+		$cap_rest = round($capital - ($mens - $int), 2, PHP_ROUND_HALF_UP);
 
-        $output[$echance] = array(
-            'cap_rest' => $cap_rest,
-            'cap_rest_str' => price($cap_rest, 0, '', 1, -1, -1, $conf->currency),
-            'interet' => $int,
-            'interet_str' => price($int, 0, '', 1, -1, -1, $conf->currency),
-            'mens' => $mens,
-        );
+		$output[$echance] = array(
+			'cap_rest' => $cap_rest,
+			'cap_rest_str' => price($cap_rest, 0, '', 1, -1, -1, $conf->currency),
+			'interet' => $int,
+			'interet_str' => price($int, 0, '', 1, -1, -1, $conf->currency),
+			'mens' => $mens,
+		);
 
-        $capital = $cap_rest;
-        $echance++;
-    }
+		$capital = $cap_rest;
+		$echance++;
+	}
 
-    return $output;
+	return $output;
 }
diff --git a/htdocs/core/lib/memory.lib.php b/htdocs/core/lib/memory.lib.php
index 9d64185c781..7b863391b24 100644
--- a/htdocs/core/lib/memory.lib.php
+++ b/htdocs/core/lib/memory.lib.php
@@ -47,16 +47,16 @@ function dol_setcache($memoryid, $data)
 	// Using a memcached server
 	if (!empty($conf->memcached->enabled) && class_exists('Memcached'))
 	{
-	    global $dolmemcache;
+		global $dolmemcache;
 		if (empty($dolmemcache) || !is_object($dolmemcache))
-    	{
-       	    $dolmemcache = new Memcached();
-       		$tmparray = explode(':', $conf->global->MEMCACHED_SERVER);
-       		$result = $dolmemcache->addServer($tmparray[0], $tmparray[1] ? $tmparray[1] : 11211);
-       		if (!$result) return -1;
-       	}
+		{
+	   		$dolmemcache = new Memcached();
+	   		$tmparray = explode(':', $conf->global->MEMCACHED_SERVER);
+	   		$result = $dolmemcache->addServer($tmparray[0], $tmparray[1] ? $tmparray[1] : 11211);
+	   		if (!$result) return -1;
+	   	}
 
-	    $memoryid = session_name().'_'.$memoryid;
+		$memoryid = session_name().'_'.$memoryid;
 		//$dolmemcache->setOption(Memcached::OPT_COMPRESSION, false);
 		$dolmemcache->add($memoryid, $data); // This fails if key already exists
 		$rescode = $dolmemcache->getResultCode();
@@ -70,14 +70,14 @@ function dol_setcache($memoryid, $data)
 	{
 		global $dolmemcache;
 		if (empty($dolmemcache) || !is_object($dolmemcache))
-    	{
-       	    $dolmemcache = new Memcache();
-       		$tmparray = explode(':', $conf->global->MEMCACHED_SERVER);
-       		$result = $dolmemcache->addServer($tmparray[0], $tmparray[1] ? $tmparray[1] : 11211);
-       		if (!$result) return -1;
-       	}
+		{
+	   		$dolmemcache = new Memcache();
+	   		$tmparray = explode(':', $conf->global->MEMCACHED_SERVER);
+	   		$result = $dolmemcache->addServer($tmparray[0], $tmparray[1] ? $tmparray[1] : 11211);
+	   		if (!$result) return -1;
+	   	}
 
-       	$memoryid = session_name().'_'.$memoryid;
+	   	$memoryid = session_name().'_'.$memoryid;
 		//$dolmemcache->setOption(Memcached::OPT_COMPRESSION, false);
 		$result = $dolmemcache->add($memoryid, $data); // This fails if key already exists
 		if ($result)
@@ -110,12 +110,12 @@ function dol_getcache($memoryid)
 	{
 		global $m;
 		if (empty($m) || !is_object($m))
-    	{
-            $m = new Memcached();
-       		$tmparray = explode(':', $conf->global->MEMCACHED_SERVER);
-       		$result = $m->addServer($tmparray[0], $tmparray[1] ? $tmparray[1] : 11211);
-       		if (!$result) return -1;
-       	}
+		{
+			$m = new Memcached();
+	   		$tmparray = explode(':', $conf->global->MEMCACHED_SERVER);
+	   		$result = $m->addServer($tmparray[0], $tmparray[1] ? $tmparray[1] : 11211);
+	   		if (!$result) return -1;
+	   	}
 
 		$memoryid = session_name().'_'.$memoryid;
 		//$m->setOption(Memcached::OPT_COMPRESSION, false);
@@ -134,14 +134,14 @@ function dol_getcache($memoryid)
 	{
 		global $m;
 		if (empty($m) || !is_object($m))
-    	{
-       	    $m = new Memcache();
-       		$tmparray = explode(':', $conf->global->MEMCACHED_SERVER);
-       		$result = $m->addServer($tmparray[0], $tmparray[1] ? $tmparray[1] : 11211);
-       		if (!$result) return -1;
-       	}
+		{
+	   		$m = new Memcache();
+	   		$tmparray = explode(':', $conf->global->MEMCACHED_SERVER);
+	   		$result = $m->addServer($tmparray[0], $tmparray[1] ? $tmparray[1] : 11211);
+	   		if (!$result) return -1;
+	   	}
 
-       	$memoryid = session_name().'_'.$memoryid;
+	   	$memoryid = session_name().'_'.$memoryid;
 		//$m->setOption(Memcached::OPT_COMPRESSION, false);
 		$data = $m->get($memoryid);
 		//print "memoryid=".$memoryid." - rescode=".$rescode." - data=".count($data)."\n<br>";
diff --git a/htdocs/core/lib/multicurrency.lib.php b/htdocs/core/lib/multicurrency.lib.php
index 065b4dfc886..a3f7d56ec90 100644
--- a/htdocs/core/lib/multicurrency.lib.php
+++ b/htdocs/core/lib/multicurrency.lib.php
@@ -40,6 +40,11 @@ function multicurrencyAdminPrepareHead()
 	$head[$h][2] = 'settings';
 	$h++;
 
+	$head[$h][0] = dol_buildpath("/multicurrency/multicurrency_rate.php", 1);
+	$head[$h][1] = $langs->trans("TabTitleMulticurrencyRate");
+	$head[$h][2] = 'ratelist';
+	$h++;
+
 	complete_head_from_modules($conf, $langs, null, $head, $h, 'multicurrency');
 
 	complete_head_from_modules($conf, $langs, null, $head, $h, 'multicurrency', 'remove');
diff --git a/htdocs/core/lib/oauth.lib.php b/htdocs/core/lib/oauth.lib.php
index 34e1d99bd80..a006aad8964 100644
--- a/htdocs/core/lib/oauth.lib.php
+++ b/htdocs/core/lib/oauth.lib.php
@@ -25,7 +25,7 @@
 
 // Supported OAUTH (a provider is supported when a file xxx_oauthcallback.php is available into htdocs/core/modules/oauth)
 $supportedoauth2array = array(
-    'OAUTH_GOOGLE_NAME'=>'google',
+	'OAUTH_GOOGLE_NAME'=>'google',
 );
 if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
 {
@@ -38,188 +38,188 @@ $supportedoauth2array['OAUTH_GITHUB_NAME'] = 'github';
 
 // API access parameters OAUTH
 $list = array(
-    array(
-        'OAUTH_AMAZON_NAME',
-        'OAUTH_AMAZON_ID',
-        'OAUTH_AMAZON_SECRET',
-    ),
-    array(
-        'OAUTH_BITBUCKET_NAME',
-        'OAUTH_BITBUCKET_ID',
-        'OAUTH_BITBUCKET_SECRET',
-    ),
-    array(
-        'OAUTH_BITLY_NAME',
-        'OAUTH_BITLY_ID',
-        'OAUTH_BITLY_SECRET',
-    ),
-    array(
-        'OAUTH_BITRIX24_NAME',
-        'OAUTH_BITRIX24_ID',
-        'OAUTH_BITRIX24_SECRET',
-    ),
-    array(
-        'OAUTH_BOX_NAME',
-        'OAUTH_BOX_ID',
-        'OAUTH_BOX_SECRET',
-    ),
-    array(
-        'OAUTH_BUFFER_NAME',
-        'OAUTH_BUFFER_ID',
-        'OAUTH_BUFFER_SECRET',
-    ),
-    array(
-        'OAUTH_DAILYMOTION_NAME',
-        'OAUTH_DAILYMOTION_ID',
-        'OAUTH_DAILYMOTION_SECRET',
-    ),
-    array(
-        'OAUTH_DEVIANTART_NAME',
-        'OAUTH_DEVIANTART_ID',
-        'OAUTH_DEVIANTART_SECRET',
-    ),
-    array(
-        'OAUTH_DROPBOX_NAME',
-        'OAUTH_DROPBOX_ID',
-        'OAUTH_DROPBOX_SECRET',
-    ),
-    array(
-        'OAUTH_ETSY_NAME',
-        'OAUTH_ETSY_ID',
-        'OAUTH_ETSY_SECRET',
-    ),
-    array(
-        'OAUTH_EVEONLINE_NAME',
-        'OAUTH_EVEONLINE_ID',
-        'OAUTH_EVEONLINE_SECRET',
-    ),
-    array(
-        'OAUTH_FACEBOOK_NAME',
-        'OAUTH_FACEBOOK_ID',
-        'OAUTH_FACEBOOK_SECRET',
-    ),
-    array(
-        'OAUTH_FITBIT_NAME',
-        'OAUTH_FITBIT_ID',
-        'OAUTH_FITBIT_SECRET',
-    ),
-    array(
-        'OAUTH_FIVEHUNDREDPX_NAME',
-        'OAUTH_FIVEHUNDREDPX_ID',
-        'OAUTH_FIVEHUNDREDPX_SECRET',
-    ),
-    array(
-        'OAUTH_FLICKR_NAME',
-        'OAUTH_FLICKR_ID',
-        'OAUTH_FLICKR_SECRET',
-    ),
-    array(
-        'OAUTH_FOURSQUARE_NAME',
-        'OAUTH_FOURSQUARE_ID',
-        'OAUTH_FOURSQUARE_SECRET',
-    ),
-    array(
-        'OAUTH_GITHUB_NAME',
-        'OAUTH_GITHUB_ID',
-        'OAUTH_GITHUB_SECRET',
-        'OAUTH_GITHUB_DESC',
-    ),
-    array(
-        'OAUTH_GOOGLE_NAME',
-        'OAUTH_GOOGLE_ID',
-        'OAUTH_GOOGLE_SECRET',
-        'OAUTH_GOOGLE_DESC',
-    ),
-    array(
-        'OAUTH_HUBIC_NAME',
-        'OAUTH_HUBIC_ID',
-        'OAUTH_HUBIC_SECRET',
-    ),
-    array(
-        'OAUTH_INSTAGRAM_NAME',
-        'OAUTH_INSTAGRAM_ID',
-        'OAUTH_INSTAGRAM_SECRET',
-    ),
-    array(
-        'OAUTH_LINKEDIN_NAME',
-        'OAUTH_LINKEDIN_ID',
-        'OAUTH_LINKEDIN_SECRET',
-    ),
-    array(
-        'OAUTH_MAILCHIMP_NAME',
-        'OAUTH_MAILCHIMP_ID',
-        'OAUTH_MAILCHIMP_SECRET',
-    ),
-    array(
-        'OAUTH_MICROSOFT_NAME',
-        'OAUTH_MICROSOFT_ID',
-        'OAUTH_MICROSOFT_SECRET',
-    ),
-    array(
-        'OAUTH_NEST_NAME',
-        'OAUTH_NEST_ID',
-        'OAUTH_NEST_SECRET',
-    ),
-    array(
-        'OAUTH_NETATMO_NAME',
-        'OAUTH_NETATMO_ID',
-        'OAUTH_NETATMO_SECRET',
-    ),
-    array(
-        'OAUTH_PARROTFLOWERPOWER_NAME',
-        'OAUTH_PARROTFLOWERPOWER_ID',
-        'OAUTH_PARROTFLOWERPOWER_SECRET',
-    ),
-    array(
-        'OAUTH_PAYPAL_NAME',
-        'OAUTH_PAYPAL_ID',
-        'OAUTH_PAYPAL_SECRET',
-    ),
-    array(
-        'OAUTH_POCKET_NAME',
-        'OAUTH_POCKET_ID',
-        'OAUTH_POCKET_SECRET',
-    ),
-    array(
-        'OAUTH_QUICKBOOKS_NAME',
-        'OAUTH_QUICKBOOKS_ID',
-        'OAUTH_QUICKBOOKS_SECRET',
-    ),
-    array(
-        'OAUTH_REDDIT_NAME',
-        'OAUTH_REDDIT_ID',
-        'OAUTH_REDDIT_SECRET',
-    ),
-    array(
-        'OAUTH_REDMINE_NAME',
-        'OAUTH_REDMINE_ID',
-        'OAUTH_REDMINE_SECRET',
-    ),
-    array(
-        'OAUTH_RUNKEEPER_NAME',
-        'OAUTH_RUNKEEPER_ID',
-        'OAUTH_RUNKEEPER_SECRET',
-    ),
-    array(
-        'OAUTH_SCOOPIT_NAME',
-        'OAUTH_SCOOPIT_ID',
-        'OAUTH_SCOOPIT_SECRET',
-    ),
-    array(
-        'OAUTH_SOUNDCLOUD_NAME',
-        'OAUTH_SOUNDCLOUD_ID',
-        'OAUTH_SOUNDCLOUD_SECRET',
-    ),
-    array(
-        'OAUTH_SPOTIFY_NAME',
-        'OAUTH_SPOTIFY_ID',
-        'OAUTH_SPOTIFY_SECRET',
-    ),
-    array(
-        'OAUTH_STRAVA_NAME',
-        'OAUTH_STRAVA_ID',
-        'OAUTH_STRAVA_SECRET',
-    ),
+	array(
+		'OAUTH_AMAZON_NAME',
+		'OAUTH_AMAZON_ID',
+		'OAUTH_AMAZON_SECRET',
+	),
+	array(
+		'OAUTH_BITBUCKET_NAME',
+		'OAUTH_BITBUCKET_ID',
+		'OAUTH_BITBUCKET_SECRET',
+	),
+	array(
+		'OAUTH_BITLY_NAME',
+		'OAUTH_BITLY_ID',
+		'OAUTH_BITLY_SECRET',
+	),
+	array(
+		'OAUTH_BITRIX24_NAME',
+		'OAUTH_BITRIX24_ID',
+		'OAUTH_BITRIX24_SECRET',
+	),
+	array(
+		'OAUTH_BOX_NAME',
+		'OAUTH_BOX_ID',
+		'OAUTH_BOX_SECRET',
+	),
+	array(
+		'OAUTH_BUFFER_NAME',
+		'OAUTH_BUFFER_ID',
+		'OAUTH_BUFFER_SECRET',
+	),
+	array(
+		'OAUTH_DAILYMOTION_NAME',
+		'OAUTH_DAILYMOTION_ID',
+		'OAUTH_DAILYMOTION_SECRET',
+	),
+	array(
+		'OAUTH_DEVIANTART_NAME',
+		'OAUTH_DEVIANTART_ID',
+		'OAUTH_DEVIANTART_SECRET',
+	),
+	array(
+		'OAUTH_DROPBOX_NAME',
+		'OAUTH_DROPBOX_ID',
+		'OAUTH_DROPBOX_SECRET',
+	),
+	array(
+		'OAUTH_ETSY_NAME',
+		'OAUTH_ETSY_ID',
+		'OAUTH_ETSY_SECRET',
+	),
+	array(
+		'OAUTH_EVEONLINE_NAME',
+		'OAUTH_EVEONLINE_ID',
+		'OAUTH_EVEONLINE_SECRET',
+	),
+	array(
+		'OAUTH_FACEBOOK_NAME',
+		'OAUTH_FACEBOOK_ID',
+		'OAUTH_FACEBOOK_SECRET',
+	),
+	array(
+		'OAUTH_FITBIT_NAME',
+		'OAUTH_FITBIT_ID',
+		'OAUTH_FITBIT_SECRET',
+	),
+	array(
+		'OAUTH_FIVEHUNDREDPX_NAME',
+		'OAUTH_FIVEHUNDREDPX_ID',
+		'OAUTH_FIVEHUNDREDPX_SECRET',
+	),
+	array(
+		'OAUTH_FLICKR_NAME',
+		'OAUTH_FLICKR_ID',
+		'OAUTH_FLICKR_SECRET',
+	),
+	array(
+		'OAUTH_FOURSQUARE_NAME',
+		'OAUTH_FOURSQUARE_ID',
+		'OAUTH_FOURSQUARE_SECRET',
+	),
+	array(
+		'OAUTH_GITHUB_NAME',
+		'OAUTH_GITHUB_ID',
+		'OAUTH_GITHUB_SECRET',
+		'OAUTH_GITHUB_DESC',
+	),
+	array(
+		'OAUTH_GOOGLE_NAME',
+		'OAUTH_GOOGLE_ID',
+		'OAUTH_GOOGLE_SECRET',
+		'OAUTH_GOOGLE_DESC',
+	),
+	array(
+		'OAUTH_HUBIC_NAME',
+		'OAUTH_HUBIC_ID',
+		'OAUTH_HUBIC_SECRET',
+	),
+	array(
+		'OAUTH_INSTAGRAM_NAME',
+		'OAUTH_INSTAGRAM_ID',
+		'OAUTH_INSTAGRAM_SECRET',
+	),
+	array(
+		'OAUTH_LINKEDIN_NAME',
+		'OAUTH_LINKEDIN_ID',
+		'OAUTH_LINKEDIN_SECRET',
+	),
+	array(
+		'OAUTH_MAILCHIMP_NAME',
+		'OAUTH_MAILCHIMP_ID',
+		'OAUTH_MAILCHIMP_SECRET',
+	),
+	array(
+		'OAUTH_MICROSOFT_NAME',
+		'OAUTH_MICROSOFT_ID',
+		'OAUTH_MICROSOFT_SECRET',
+	),
+	array(
+		'OAUTH_NEST_NAME',
+		'OAUTH_NEST_ID',
+		'OAUTH_NEST_SECRET',
+	),
+	array(
+		'OAUTH_NETATMO_NAME',
+		'OAUTH_NETATMO_ID',
+		'OAUTH_NETATMO_SECRET',
+	),
+	array(
+		'OAUTH_PARROTFLOWERPOWER_NAME',
+		'OAUTH_PARROTFLOWERPOWER_ID',
+		'OAUTH_PARROTFLOWERPOWER_SECRET',
+	),
+	array(
+		'OAUTH_PAYPAL_NAME',
+		'OAUTH_PAYPAL_ID',
+		'OAUTH_PAYPAL_SECRET',
+	),
+	array(
+		'OAUTH_POCKET_NAME',
+		'OAUTH_POCKET_ID',
+		'OAUTH_POCKET_SECRET',
+	),
+	array(
+		'OAUTH_QUICKBOOKS_NAME',
+		'OAUTH_QUICKBOOKS_ID',
+		'OAUTH_QUICKBOOKS_SECRET',
+	),
+	array(
+		'OAUTH_REDDIT_NAME',
+		'OAUTH_REDDIT_ID',
+		'OAUTH_REDDIT_SECRET',
+	),
+	array(
+		'OAUTH_REDMINE_NAME',
+		'OAUTH_REDMINE_ID',
+		'OAUTH_REDMINE_SECRET',
+	),
+	array(
+		'OAUTH_RUNKEEPER_NAME',
+		'OAUTH_RUNKEEPER_ID',
+		'OAUTH_RUNKEEPER_SECRET',
+	),
+	array(
+		'OAUTH_SCOOPIT_NAME',
+		'OAUTH_SCOOPIT_ID',
+		'OAUTH_SCOOPIT_SECRET',
+	),
+	array(
+		'OAUTH_SOUNDCLOUD_NAME',
+		'OAUTH_SOUNDCLOUD_ID',
+		'OAUTH_SOUNDCLOUD_SECRET',
+	),
+	array(
+		'OAUTH_SPOTIFY_NAME',
+		'OAUTH_SPOTIFY_ID',
+		'OAUTH_SPOTIFY_SECRET',
+	),
+	array(
+		'OAUTH_STRAVA_NAME',
+		'OAUTH_STRAVA_ID',
+		'OAUTH_STRAVA_SECRET',
+	),
 	array(
 		'OAUTH_STRIPE_TEST_NAME',
 		'OAUTH_STRIPE_TEST_ID',
@@ -231,35 +231,35 @@ $list = array(
 		'STRIPE_LIVE_SECRET_KEY',
 	),
 	array(
-        'OAUTH_TUMBLR_NAME',
-        'OAUTH_TUMBLR_ID',
-        'OAUTH_TUMBLR_SECRET',
-    ),
-    array(
-        'OAUTH_TWITTER_NAME',
-        'OAUTH_TWITTER_ID',
-        'OAUTH_TWITTER_SECRET',
-    ),
-    array(
-        'OAUTH_USTREAM_NAME',
-        'OAUTH_USTREAM_ID',
-        'OAUTH_USTREAM_SECRET',
-    ),
-    array(
-        'OAUTH_VIMEO_NAME',
-        'OAUTH_VIMEO_ID',
-        'OAUTH_VIMEO_SECRET',
-    ),
-    array(
-        'OAUTH_YAHOO_NAME',
-        'OAUTH_YAHOO_ID',
-        'OAUTH_YAHOO_SECRET',
-    ),
-    array(
-        'OAUTH_YAMMER_NAME',
-        'OAUTH_YAMMER_ID',
-        'OAUTH_YAMMER_SECRET',
-    ),
+		'OAUTH_TUMBLR_NAME',
+		'OAUTH_TUMBLR_ID',
+		'OAUTH_TUMBLR_SECRET',
+	),
+	array(
+		'OAUTH_TWITTER_NAME',
+		'OAUTH_TWITTER_ID',
+		'OAUTH_TWITTER_SECRET',
+	),
+	array(
+		'OAUTH_USTREAM_NAME',
+		'OAUTH_USTREAM_ID',
+		'OAUTH_USTREAM_SECRET',
+	),
+	array(
+		'OAUTH_VIMEO_NAME',
+		'OAUTH_VIMEO_ID',
+		'OAUTH_VIMEO_SECRET',
+	),
+	array(
+		'OAUTH_YAHOO_NAME',
+		'OAUTH_YAHOO_ID',
+		'OAUTH_YAHOO_SECRET',
+	),
+	array(
+		'OAUTH_YAMMER_NAME',
+		'OAUTH_YAMMER_ID',
+		'OAUTH_YAMMER_SECRET',
+	),
 );
 
 
@@ -271,24 +271,24 @@ $list = array(
  */
 function oauthadmin_prepare_head()
 {
-    global $langs, $conf;
-    $h = 0;
-    $head = array();
+	global $langs, $conf;
+	$h = 0;
+	$head = array();
 
-    $head[$h][0] = dol_buildpath('/admin/oauth.php', 1);
-    $head[$h][1] = $langs->trans("OAuthServices");
-    $head[$h][2] = 'services';
-    $h++;
+	$head[$h][0] = dol_buildpath('/admin/oauth.php', 1);
+	$head[$h][1] = $langs->trans("OAuthServices");
+	$head[$h][2] = 'services';
+	$h++;
 
-    $head[$h][0] = dol_buildpath('/admin/oauthlogintokens.php', 1);
-    $head[$h][1] = $langs->trans("TokenManager");
-    $head[$h][2] = 'tokengeneration';
-    $h++;
+	$head[$h][0] = dol_buildpath('/admin/oauthlogintokens.php', 1);
+	$head[$h][1] = $langs->trans("TokenManager");
+	$head[$h][2] = 'tokengeneration';
+	$h++;
 
-    complete_head_from_modules($conf, $langs, null, $head, $h, 'oauthadmin');
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'oauthadmin');
 
-    complete_head_from_modules($conf, $langs, null, $head, $h, 'oauthadmin', 'remove');
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'oauthadmin', 'remove');
 
 
-    return $head;
+	return $head;
 }
diff --git a/htdocs/core/lib/order.lib.php b/htdocs/core/lib/order.lib.php
index bf7bc352e3f..9bd92a2c79b 100644
--- a/htdocs/core/lib/order.lib.php
+++ b/htdocs/core/lib/order.lib.php
@@ -50,8 +50,8 @@ function commande_prepare_head(Commande $object)
 
 	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
 	{
-	    $nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external'));
-	    $head[$h][0] = DOL_URL_ROOT.'/commande/contact.php?id='.$object->id;
+		$nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external'));
+		$head[$h][0] = DOL_URL_ROOT.'/commande/contact.php?id='.$object->id;
 		$head[$h][1] = $langs->trans('ContactsAddresses');
 		if ($nbContact > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';
 		$head[$h][2] = 'contact';
@@ -76,16 +76,16 @@ function commande_prepare_head(Commande $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);   												to remove a tab
-    complete_head_from_modules($conf, $langs, $object, $head, $h, 'order');
+	// 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, 'order');
 
 	if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
 	{
 		$nbNote = 0;
-        if (!empty($object->note_private)) $nbNote++;
+		if (!empty($object->note_private)) $nbNote++;
 		if (!empty($object->note_public)) $nbNote++;
 		$head[$h][0] = DOL_URL_ROOT.'/commande/note.php?id='.$object->id;
 		$head[$h][1] = $langs->trans('Notes');
@@ -95,10 +95,10 @@ function commande_prepare_head(Commande $object)
 	}
 
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-    require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
 	$upload_dir = $conf->commande->multidir_output[$object->entity]."/".dol_sanitizeFileName($object->ref);
 	$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
-    $nbLinks = Link::count($db, $object->element, $object->id);
+	$nbLinks = Link::count($db, $object->element, $object->id);
 	$head[$h][0] = DOL_URL_ROOT.'/commande/document.php?id='.$object->id;
 	$head[$h][1] = $langs->trans('Documents');
 	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
@@ -110,9 +110,9 @@ function commande_prepare_head(Commande $object)
 	$head[$h][2] = 'info';
 	$h++;
 
-    complete_head_from_modules($conf, $langs, $object, $head, $h, 'order', 'remove');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'order', 'remove');
 
-    return $head;
+	return $head;
 }
 
 /**
diff --git a/htdocs/core/lib/parsemd.lib.php b/htdocs/core/lib/parsemd.lib.php
index 1120b3f8d15..ef0de8c1298 100644
--- a/htdocs/core/lib/parsemd.lib.php
+++ b/htdocs/core/lib/parsemd.lib.php
@@ -31,25 +31,25 @@
  */
 function dolMd2Html($content, $parser = 'parsedown', $replaceimagepath = null)
 {
-    if (is_array($replaceimagepath))
-    {
-        foreach ($replaceimagepath as $key => $val)
-        {
-            $keytoreplace = ']('.$key;
-            $valafter = ']('.$val;
-            $content = preg_replace('/'.preg_quote($keytoreplace, '/').'/m', $valafter, $content);
-        }
-    }
-    if ($parser == 'parsedown')
-    {
-        include_once DOL_DOCUMENT_ROOT.'/includes/parsedown/Parsedown.php';
-        $Parsedown = new Parsedown();
-        $content = $Parsedown->text($content);
-    } else {
-        $content = nl2br($content);
-    }
+	if (is_array($replaceimagepath))
+	{
+		foreach ($replaceimagepath as $key => $val)
+		{
+			$keytoreplace = ']('.$key;
+			$valafter = ']('.$val;
+			$content = preg_replace('/'.preg_quote($keytoreplace, '/').'/m', $valafter, $content);
+		}
+	}
+	if ($parser == 'parsedown')
+	{
+		include_once DOL_DOCUMENT_ROOT.'/includes/parsedown/Parsedown.php';
+		$Parsedown = new Parsedown();
+		$content = $Parsedown->text($content);
+	} else {
+		$content = nl2br($content);
+	}
 
-    return $content;
+	return $content;
 }
 
 
@@ -63,23 +63,23 @@ function dolMd2Html($content, $parser = 'parsedown', $replaceimagepath = null)
  */
 function dolMd2Asciidoc($content, $parser = 'dolibarr', $replaceimagepath = null)
 {
-    if (is_array($replaceimagepath))
-    {
-        foreach ($replaceimagepath as $key => $val)
-        {
-            $keytoreplace = ']('.$key;
-            $valafter = ']('.$val;
-            $content = preg_replace('/'.preg_quote($keytoreplace, '/').'/m', $valafter, $content);
-        }
-    }
-    //if ($parser == 'dolibarr')
-    //{
-        $content = preg_replace('/<!--.*-->/msU', '', $content);
-    //}
-    //else
-    //{
-    //    $content = $content;
-    //}
+	if (is_array($replaceimagepath))
+	{
+		foreach ($replaceimagepath as $key => $val)
+		{
+			$keytoreplace = ']('.$key;
+			$valafter = ']('.$val;
+			$content = preg_replace('/'.preg_quote($keytoreplace, '/').'/m', $valafter, $content);
+		}
+	}
+	//if ($parser == 'dolibarr')
+	//{
+		$content = preg_replace('/<!--.*-->/msU', '', $content);
+	//}
+	//else
+	//{
+	//    $content = $content;
+	//}
 
-    return $content;
+	return $content;
 }
diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index 0ff40659daa..5e7ddbd38fc 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -293,41 +293,41 @@ function pdf_getHeightForLogo($logo, $url = false)
  */
 function pdfGetHeightForHtmlContent(&$pdf, $htmlcontent)
 {
-    // store current object
-    $pdf->startTransaction();
-    // store starting values
-    $start_y = $pdf->GetY();
-    //var_dump($start_y);
-    $start_page = $pdf->getPage();
-    // call printing functions with content
-    $pdf->writeHTMLCell(0, 0, 0, $start_y, $htmlcontent, 0, 1, false, true, 'J', true);
-    // get the new Y
-    $end_y = $pdf->GetY();
-    $end_page = $pdf->getPage();
-    // calculate height
-    $height = 0;
-    if ($end_page == $start_page) {
-        $height = $end_y - $start_y;
-    } else {
-        for ($page = $start_page; $page <= $end_page; ++$page) {
-        	$pdf->setPage($page);
-        	$tmpm = $pdf->getMargins();
-        	$tMargin = $tmpm['top'];
-        	if ($page == $start_page) {
-        		// first page
-        		$height = $pdf->getPageHeight() - $start_y - $pdf->getBreakMargin();
-        	} elseif ($page == $end_page) {
-        		// last page
-        		$height = $end_y - $tMargin;
-        	} else {
-        		$height = $pdf->getPageHeight() - $tMargin - $pdf->getBreakMargin();
-        	}
-        }
+	// store current object
+	$pdf->startTransaction();
+	// store starting values
+	$start_y = $pdf->GetY();
+	//var_dump($start_y);
+	$start_page = $pdf->getPage();
+	// call printing functions with content
+	$pdf->writeHTMLCell(0, 0, 0, $start_y, $htmlcontent, 0, 1, false, true, 'J', true);
+	// get the new Y
+	$end_y = $pdf->GetY();
+	$end_page = $pdf->getPage();
+	// calculate height
+	$height = 0;
+	if ($end_page == $start_page) {
+		$height = $end_y - $start_y;
+	} else {
+		for ($page = $start_page; $page <= $end_page; ++$page) {
+			$pdf->setPage($page);
+			$tmpm = $pdf->getMargins();
+			$tMargin = $tmpm['top'];
+			if ($page == $start_page) {
+				// first page
+				$height = $pdf->getPageHeight() - $start_y - $pdf->getBreakMargin();
+			} elseif ($page == $end_page) {
+				// last page
+				$height = $end_y - $tMargin;
+			} else {
+				$height = $pdf->getPageHeight() - $tMargin - $pdf->getBreakMargin();
+			}
+		}
 	}
 	// restore previous object
 	$pdf = $pdf->rollbackTransaction();
 
-    return $height;
+	return $height;
 }
 
 
@@ -341,7 +341,7 @@ function pdfGetHeightForHtmlContent(&$pdf, $htmlcontent)
  */
 function pdfBuildThirdpartyName($thirdparty, Translate $outputlangs, $includealias = 0)
 {
-    global $conf;
+	global $conf;
 
 	// Recipient name
 	$socname = '';
@@ -349,7 +349,7 @@ function pdfBuildThirdpartyName($thirdparty, Translate $outputlangs, $includeali
 	if ($thirdparty instanceof Societe) {
 		$socname .= $thirdparty->name;
 		if (($includealias || !empty($conf->global->PDF_INCLUDE_ALIAS_IN_THIRDPARTY_NAME)) && !empty($thirdparty->name_alias)) {
-		    $socname .= " - ".$thirdparty->name_alias;
+			$socname .= " - ".$thirdparty->name_alias;
 		}
 	} elseif ($thirdparty instanceof Contact) {
 		$socname = $thirdparty->socname;
@@ -394,82 +394,82 @@ function pdf_build_address($outputlangs, $sourcecompany, $targetcompany = '', $t
 	}
 	if (empty($reshook))
 	{
-    	if ($mode == 'source')
-    	{
-    		$withCountry = 0;
-    		if (!empty($sourcecompany->country_code) && ($targetcompany->country_code != $sourcecompany->country_code)) $withCountry = 1;
+		if ($mode == 'source')
+		{
+			$withCountry = 0;
+			if (!empty($sourcecompany->country_code) && ($targetcompany->country_code != $sourcecompany->country_code)) $withCountry = 1;
 
-    		$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->convToOutputCharset(dol_format_address($sourcecompany, $withCountry, "\n", $outputlangs))."\n";
+			$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->convToOutputCharset(dol_format_address($sourcecompany, $withCountry, "\n", $outputlangs))."\n";
 
-    		if (empty($conf->global->MAIN_PDF_DISABLESOURCEDETAILS))
-    		{
-    			// Phone
-    			if ($sourcecompany->phone) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("PhoneShort").": ".$outputlangs->convToOutputCharset($sourcecompany->phone);
-    			// Fax
-    			if ($sourcecompany->fax) $stringaddress .= ($stringaddress ? ($sourcecompany->phone ? " - " : "\n") : '').$outputlangs->transnoentities("Fax").": ".$outputlangs->convToOutputCharset($sourcecompany->fax);
-    			// EMail
-    			if ($sourcecompany->email) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Email").": ".$outputlangs->convToOutputCharset($sourcecompany->email);
-    			// Web
-    			if ($sourcecompany->url) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Web").": ".$outputlangs->convToOutputCharset($sourcecompany->url);
-    		}
-    		// Intra VAT
-    		if (!empty($conf->global->MAIN_TVAINTRA_IN_SOURCE_ADDRESS))
-    		{
-    			if ($sourcecompany->tva_intra) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("VATIntraShort").': '.$outputlangs->convToOutputCharset($sourcecompany->tva_intra);
-    		}
-    		// Professionnal Ids
-    		$reg = array();
-    		if (!empty($conf->global->MAIN_PROFID1_IN_SOURCE_ADDRESS) && !empty($sourcecompany->idprof1))
-    		{
-    			$tmp = $outputlangs->transcountrynoentities("ProfId1", $sourcecompany->country_code);
-    			if (preg_match('/\((.+)\)/', $tmp, $reg)) $tmp = $reg[1];
-    			$stringaddress .= ($stringaddress ? "\n" : '').$tmp.': '.$outputlangs->convToOutputCharset($sourcecompany->idprof1);
-    		}
-    		if (!empty($conf->global->MAIN_PROFID2_IN_SOURCE_ADDRESS) && !empty($sourcecompany->idprof2))
-    		{
-    			$tmp = $outputlangs->transcountrynoentities("ProfId2", $sourcecompany->country_code);
-    			if (preg_match('/\((.+)\)/', $tmp, $reg)) $tmp = $reg[1];
-    			$stringaddress .= ($stringaddress ? "\n" : '').$tmp.': '.$outputlangs->convToOutputCharset($sourcecompany->idprof2);
-    		}
-    		if (!empty($conf->global->MAIN_PROFID3_IN_SOURCE_ADDRESS) && !empty($sourcecompany->idprof3))
-    		{
-    			$tmp = $outputlangs->transcountrynoentities("ProfId3", $sourcecompany->country_code);
-    			if (preg_match('/\((.+)\)/', $tmp, $reg)) $tmp = $reg[1];
-    			$stringaddress .= ($stringaddress ? "\n" : '').$tmp.': '.$outputlangs->convToOutputCharset($sourcecompany->idprof3);
-    		}
-    		if (!empty($conf->global->MAIN_PROFID4_IN_SOURCE_ADDRESS) && !empty($sourcecompany->idprof4))
-    		{
-    			$tmp = $outputlangs->transcountrynoentities("ProfId4", $sourcecompany->country_code);
-    			if (preg_match('/\((.+)\)/', $tmp, $reg)) $tmp = $reg[1];
-    			$stringaddress .= ($stringaddress ? "\n" : '').$tmp.': '.$outputlangs->convToOutputCharset($sourcecompany->idprof4);
-    		}
-    		if (!empty($conf->global->MAIN_PROFID5_IN_SOURCE_ADDRESS) && !empty($sourcecompany->idprof5))
-    		{
-    			$tmp = $outputlangs->transcountrynoentities("ProfId5", $sourcecompany->country_code);
-    			if (preg_match('/\((.+)\)/', $tmp, $reg)) $tmp = $reg[1];
-    			$stringaddress .= ($stringaddress ? "\n" : '').$tmp.': '.$outputlangs->convToOutputCharset($sourcecompany->idprof5);
-    		}
-    		if (!empty($conf->global->MAIN_PROFID6_IN_SOURCE_ADDRESS) && !empty($sourcecompany->idprof6))
-    		{
-    			$tmp = $outputlangs->transcountrynoentities("ProfId6", $sourcecompany->country_code);
-    			if (preg_match('/\((.+)\)/', $tmp, $reg)) $tmp = $reg[1];
-    			$stringaddress .= ($stringaddress ? "\n" : '').$tmp.': '.$outputlangs->convToOutputCharset($sourcecompany->idprof6);
-    		}
-    		if (!empty($conf->global->PDF_ADD_MORE_AFTER_SOURCE_ADDRESS)) {
-    			$stringaddress .= ($stringaddress ? "\n" : '').$conf->global->PDF_ADD_MORE_AFTER_SOURCE_ADDRESS;
-    		}
-    	}
+			if (empty($conf->global->MAIN_PDF_DISABLESOURCEDETAILS))
+			{
+				// Phone
+				if ($sourcecompany->phone) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("PhoneShort").": ".$outputlangs->convToOutputCharset($sourcecompany->phone);
+				// Fax
+				if ($sourcecompany->fax) $stringaddress .= ($stringaddress ? ($sourcecompany->phone ? " - " : "\n") : '').$outputlangs->transnoentities("Fax").": ".$outputlangs->convToOutputCharset($sourcecompany->fax);
+				// EMail
+				if ($sourcecompany->email) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Email").": ".$outputlangs->convToOutputCharset($sourcecompany->email);
+				// Web
+				if ($sourcecompany->url) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Web").": ".$outputlangs->convToOutputCharset($sourcecompany->url);
+			}
+			// Intra VAT
+			if (!empty($conf->global->MAIN_TVAINTRA_IN_SOURCE_ADDRESS))
+			{
+				if ($sourcecompany->tva_intra) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("VATIntraShort").': '.$outputlangs->convToOutputCharset($sourcecompany->tva_intra);
+			}
+			// Professionnal Ids
+			$reg = array();
+			if (!empty($conf->global->MAIN_PROFID1_IN_SOURCE_ADDRESS) && !empty($sourcecompany->idprof1))
+			{
+				$tmp = $outputlangs->transcountrynoentities("ProfId1", $sourcecompany->country_code);
+				if (preg_match('/\((.+)\)/', $tmp, $reg)) $tmp = $reg[1];
+				$stringaddress .= ($stringaddress ? "\n" : '').$tmp.': '.$outputlangs->convToOutputCharset($sourcecompany->idprof1);
+			}
+			if (!empty($conf->global->MAIN_PROFID2_IN_SOURCE_ADDRESS) && !empty($sourcecompany->idprof2))
+			{
+				$tmp = $outputlangs->transcountrynoentities("ProfId2", $sourcecompany->country_code);
+				if (preg_match('/\((.+)\)/', $tmp, $reg)) $tmp = $reg[1];
+				$stringaddress .= ($stringaddress ? "\n" : '').$tmp.': '.$outputlangs->convToOutputCharset($sourcecompany->idprof2);
+			}
+			if (!empty($conf->global->MAIN_PROFID3_IN_SOURCE_ADDRESS) && !empty($sourcecompany->idprof3))
+			{
+				$tmp = $outputlangs->transcountrynoentities("ProfId3", $sourcecompany->country_code);
+				if (preg_match('/\((.+)\)/', $tmp, $reg)) $tmp = $reg[1];
+				$stringaddress .= ($stringaddress ? "\n" : '').$tmp.': '.$outputlangs->convToOutputCharset($sourcecompany->idprof3);
+			}
+			if (!empty($conf->global->MAIN_PROFID4_IN_SOURCE_ADDRESS) && !empty($sourcecompany->idprof4))
+			{
+				$tmp = $outputlangs->transcountrynoentities("ProfId4", $sourcecompany->country_code);
+				if (preg_match('/\((.+)\)/', $tmp, $reg)) $tmp = $reg[1];
+				$stringaddress .= ($stringaddress ? "\n" : '').$tmp.': '.$outputlangs->convToOutputCharset($sourcecompany->idprof4);
+			}
+			if (!empty($conf->global->MAIN_PROFID5_IN_SOURCE_ADDRESS) && !empty($sourcecompany->idprof5))
+			{
+				$tmp = $outputlangs->transcountrynoentities("ProfId5", $sourcecompany->country_code);
+				if (preg_match('/\((.+)\)/', $tmp, $reg)) $tmp = $reg[1];
+				$stringaddress .= ($stringaddress ? "\n" : '').$tmp.': '.$outputlangs->convToOutputCharset($sourcecompany->idprof5);
+			}
+			if (!empty($conf->global->MAIN_PROFID6_IN_SOURCE_ADDRESS) && !empty($sourcecompany->idprof6))
+			{
+				$tmp = $outputlangs->transcountrynoentities("ProfId6", $sourcecompany->country_code);
+				if (preg_match('/\((.+)\)/', $tmp, $reg)) $tmp = $reg[1];
+				$stringaddress .= ($stringaddress ? "\n" : '').$tmp.': '.$outputlangs->convToOutputCharset($sourcecompany->idprof6);
+			}
+			if (!empty($conf->global->PDF_ADD_MORE_AFTER_SOURCE_ADDRESS)) {
+				$stringaddress .= ($stringaddress ? "\n" : '').$conf->global->PDF_ADD_MORE_AFTER_SOURCE_ADDRESS;
+			}
+		}
 
-    	if ($mode == 'target' || preg_match('/targetwithdetails/', $mode))
-    	{
-    		if ($usecontact)
-    		{
-    			$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->convToOutputCharset($targetcontact->getFullName($outputlangs, 1));
+		if ($mode == 'target' || preg_match('/targetwithdetails/', $mode))
+		{
+			if ($usecontact)
+			{
+				$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->convToOutputCharset($targetcontact->getFullName($outputlangs, 1));
 
-    			if (!empty($targetcontact->address)) {
-    				$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->convToOutputCharset(dol_format_address($targetcontact));
-    			} else {
-    				$companytouseforaddress = $targetcompany;
+				if (!empty($targetcontact->address)) {
+					$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->convToOutputCharset(dol_format_address($targetcontact));
+				} else {
+					$companytouseforaddress = $targetcompany;
 
 					// Contact on a thirdparty that is a different thirdparty than the thirdparty of object
 					if ($targetcontact->socid > 0 && $targetcontact->socid != $targetcompany->id)
@@ -480,129 +480,129 @@ function pdf_build_address($outputlangs, $sourcecompany, $targetcompany = '', $t
 
 					$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->convToOutputCharset(dol_format_address($companytouseforaddress));
 				}
-    			// Country
-    			if (!empty($targetcontact->country_code) && $targetcontact->country_code != $sourcecompany->country_code) {
-    				$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$targetcontact->country_code));
-    			} elseif (empty($targetcontact->country_code) && !empty($targetcompany->country_code) && ($targetcompany->country_code != $sourcecompany->country_code)) {
-    				$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$targetcompany->country_code));
-    			}
+				// Country
+				if (!empty($targetcontact->country_code) && $targetcontact->country_code != $sourcecompany->country_code) {
+					$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$targetcontact->country_code));
+				} elseif (empty($targetcontact->country_code) && !empty($targetcompany->country_code) && ($targetcompany->country_code != $sourcecompany->country_code)) {
+					$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$targetcompany->country_code));
+				}
 
-    			if (!empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || preg_match('/targetwithdetails/', $mode))
-    			{
-    				// Phone
-    			    if (!empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_phone/', $mode))
-    			    {
-        				if (!empty($targetcontact->phone_pro) || !empty($targetcontact->phone_mobile)) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Phone").": ";
-        				if (!empty($targetcontact->phone_pro)) $stringaddress .= $outputlangs->convToOutputCharset($targetcontact->phone_pro);
-        				if (!empty($targetcontact->phone_pro) && !empty($targetcontact->phone_mobile)) $stringaddress .= " / ";
-        				if (!empty($targetcontact->phone_mobile)) $stringaddress .= $outputlangs->convToOutputCharset($targetcontact->phone_mobile);
-    			    }
-    				// Fax
-    			    if (!empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_fax/', $mode))
-    			    {
-                        if ($targetcontact->fax) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Fax").": ".$outputlangs->convToOutputCharset($targetcontact->fax);
-    			    }
-    				// EMail
-    			    if (!empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_email/', $mode))
-    			    {
-                        if ($targetcontact->email) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Email").": ".$outputlangs->convToOutputCharset($targetcontact->email);
-    			    }
-    				// Web
-    			    if (!empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_url/', $mode))
-    			    {
-                        if ($targetcontact->url) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Web").": ".$outputlangs->convToOutputCharset($targetcontact->url);
-    			    }
-    			}
-    		} else {
-    			$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->convToOutputCharset(dol_format_address($targetcompany));
-    			// Country
-    			if (!empty($targetcompany->country_code) && $targetcompany->country_code != $sourcecompany->country_code) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$targetcompany->country_code));
+				if (!empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || preg_match('/targetwithdetails/', $mode))
+				{
+					// Phone
+					if (!empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_phone/', $mode))
+					{
+						if (!empty($targetcontact->phone_pro) || !empty($targetcontact->phone_mobile)) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Phone").": ";
+						if (!empty($targetcontact->phone_pro)) $stringaddress .= $outputlangs->convToOutputCharset($targetcontact->phone_pro);
+						if (!empty($targetcontact->phone_pro) && !empty($targetcontact->phone_mobile)) $stringaddress .= " / ";
+						if (!empty($targetcontact->phone_mobile)) $stringaddress .= $outputlangs->convToOutputCharset($targetcontact->phone_mobile);
+					}
+					// Fax
+					if (!empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_fax/', $mode))
+					{
+						if ($targetcontact->fax) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Fax").": ".$outputlangs->convToOutputCharset($targetcontact->fax);
+					}
+					// EMail
+					if (!empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_email/', $mode))
+					{
+						if ($targetcontact->email) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Email").": ".$outputlangs->convToOutputCharset($targetcontact->email);
+					}
+					// Web
+					if (!empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_url/', $mode))
+					{
+						if ($targetcontact->url) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Web").": ".$outputlangs->convToOutputCharset($targetcontact->url);
+					}
+				}
+			} else {
+				$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->convToOutputCharset(dol_format_address($targetcompany));
+				// Country
+				if (!empty($targetcompany->country_code) && $targetcompany->country_code != $sourcecompany->country_code) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$targetcompany->country_code));
 
-    			if (!empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || preg_match('/targetwithdetails/', $mode))
-    			{
-    				// Phone
-    			    if (!empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_phone/', $mode))
-    			    {
-    			    	if (!empty($targetcompany->phone) || !empty($targetcompany->phone_mobile)) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Phone").": ";
-	    				if (!empty($targetcompany->phone)) $stringaddress .= $outputlangs->convToOutputCharset($targetcompany->phone);
-    					if (!empty($targetcompany->phone) && !empty($targetcompany->phone_mobile)) $stringaddress .= " / ";
-    					if (!empty($targetcompany->phone_mobile)) $stringaddress .= $outputlangs->convToOutputCharset($targetcompany->phone_mobile);
-    			    }
-    				// Fax
-    			    if (!empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_fax/', $mode))
-    			    {
-    			    	if ($targetcompany->fax) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Fax").": ".$outputlangs->convToOutputCharset($targetcompany->fax);
-    			    }
-    				// EMail
-    			    if (!empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_email/', $mode))
-    			    {
-    			    	if ($targetcompany->email) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Email").": ".$outputlangs->convToOutputCharset($targetcompany->email);
-    			    }
-    				// Web
-    			    if (!empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_url/', $mode))
-    			    {
-    			    	if ($targetcompany->url) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Web").": ".$outputlangs->convToOutputCharset($targetcompany->url);
-    			    }
-    			}
-    		}
+				if (!empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || preg_match('/targetwithdetails/', $mode))
+				{
+					// Phone
+					if (!empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_phone/', $mode))
+					{
+						if (!empty($targetcompany->phone) || !empty($targetcompany->phone_mobile)) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Phone").": ";
+						if (!empty($targetcompany->phone)) $stringaddress .= $outputlangs->convToOutputCharset($targetcompany->phone);
+						if (!empty($targetcompany->phone) && !empty($targetcompany->phone_mobile)) $stringaddress .= " / ";
+						if (!empty($targetcompany->phone_mobile)) $stringaddress .= $outputlangs->convToOutputCharset($targetcompany->phone_mobile);
+					}
+					// Fax
+					if (!empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_fax/', $mode))
+					{
+						if ($targetcompany->fax) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Fax").": ".$outputlangs->convToOutputCharset($targetcompany->fax);
+					}
+					// EMail
+					if (!empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_email/', $mode))
+					{
+						if ($targetcompany->email) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Email").": ".$outputlangs->convToOutputCharset($targetcompany->email);
+					}
+					// Web
+					if (!empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_url/', $mode))
+					{
+						if ($targetcompany->url) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Web").": ".$outputlangs->convToOutputCharset($targetcompany->url);
+					}
+				}
+			}
 
-    		// Intra VAT
-    		if (empty($conf->global->MAIN_TVAINTRA_NOT_IN_ADDRESS))
-    		{
-    			if ($targetcompany->tva_intra) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("VATIntraShort").': '.$outputlangs->convToOutputCharset($targetcompany->tva_intra);
-    		}
+			// Intra VAT
+			if (empty($conf->global->MAIN_TVAINTRA_NOT_IN_ADDRESS))
+			{
+				if ($targetcompany->tva_intra) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("VATIntraShort").': '.$outputlangs->convToOutputCharset($targetcompany->tva_intra);
+			}
 
-    		// Professionnal Ids
-    		if (!empty($conf->global->MAIN_PROFID1_IN_ADDRESS) && !empty($targetcompany->idprof1))
-    		{
-    			$tmp = $outputlangs->transcountrynoentities("ProfId1", $targetcompany->country_code);
-    			if (preg_match('/\((.+)\)/', $tmp, $reg)) $tmp = $reg[1];
-    			$stringaddress .= ($stringaddress ? "\n" : '').$tmp.': '.$outputlangs->convToOutputCharset($targetcompany->idprof1);
-    		}
-    		if (!empty($conf->global->MAIN_PROFID2_IN_ADDRESS) && !empty($targetcompany->idprof2))
-    		{
-    			$tmp = $outputlangs->transcountrynoentities("ProfId2", $targetcompany->country_code);
-    			if (preg_match('/\((.+)\)/', $tmp, $reg)) $tmp = $reg[1];
-    			$stringaddress .= ($stringaddress ? "\n" : '').$tmp.': '.$outputlangs->convToOutputCharset($targetcompany->idprof2);
-    		}
-    		if (!empty($conf->global->MAIN_PROFID3_IN_ADDRESS) && !empty($targetcompany->idprof3))
-    		{
-    			$tmp = $outputlangs->transcountrynoentities("ProfId3", $targetcompany->country_code);
-    			if (preg_match('/\((.+)\)/', $tmp, $reg)) $tmp = $reg[1];
-    			$stringaddress .= ($stringaddress ? "\n" : '').$tmp.': '.$outputlangs->convToOutputCharset($targetcompany->idprof3);
-    		}
-    		if (!empty($conf->global->MAIN_PROFID4_IN_ADDRESS) && !empty($targetcompany->idprof4))
-    		{
-    			$tmp = $outputlangs->transcountrynoentities("ProfId4", $targetcompany->country_code);
-    			if (preg_match('/\((.+)\)/', $tmp, $reg)) $tmp = $reg[1];
-    			$stringaddress .= ($stringaddress ? "\n" : '').$tmp.': '.$outputlangs->convToOutputCharset($targetcompany->idprof4);
-    		}
-    		if (!empty($conf->global->MAIN_PROFID5_IN_ADDRESS) && !empty($targetcompany->idprof5))
-    		{
-    		    $tmp = $outputlangs->transcountrynoentities("ProfId5", $targetcompany->country_code);
-    		    if (preg_match('/\((.+)\)/', $tmp, $reg)) $tmp = $reg[1];
-    		    $stringaddress .= ($stringaddress ? "\n" : '').$tmp.': '.$outputlangs->convToOutputCharset($targetcompany->idprof5);
-    		}
-    		if (!empty($conf->global->MAIN_PROFID6_IN_ADDRESS) && !empty($targetcompany->idprof6))
-    		{
-    		    $tmp = $outputlangs->transcountrynoentities("ProfId6", $targetcompany->country_code);
-    		    if (preg_match('/\((.+)\)/', $tmp, $reg)) $tmp = $reg[1];
-    		    $stringaddress .= ($stringaddress ? "\n" : '').$tmp.': '.$outputlangs->convToOutputCharset($targetcompany->idprof6);
-    		}
+			// Professionnal Ids
+			if (!empty($conf->global->MAIN_PROFID1_IN_ADDRESS) && !empty($targetcompany->idprof1))
+			{
+				$tmp = $outputlangs->transcountrynoentities("ProfId1", $targetcompany->country_code);
+				if (preg_match('/\((.+)\)/', $tmp, $reg)) $tmp = $reg[1];
+				$stringaddress .= ($stringaddress ? "\n" : '').$tmp.': '.$outputlangs->convToOutputCharset($targetcompany->idprof1);
+			}
+			if (!empty($conf->global->MAIN_PROFID2_IN_ADDRESS) && !empty($targetcompany->idprof2))
+			{
+				$tmp = $outputlangs->transcountrynoentities("ProfId2", $targetcompany->country_code);
+				if (preg_match('/\((.+)\)/', $tmp, $reg)) $tmp = $reg[1];
+				$stringaddress .= ($stringaddress ? "\n" : '').$tmp.': '.$outputlangs->convToOutputCharset($targetcompany->idprof2);
+			}
+			if (!empty($conf->global->MAIN_PROFID3_IN_ADDRESS) && !empty($targetcompany->idprof3))
+			{
+				$tmp = $outputlangs->transcountrynoentities("ProfId3", $targetcompany->country_code);
+				if (preg_match('/\((.+)\)/', $tmp, $reg)) $tmp = $reg[1];
+				$stringaddress .= ($stringaddress ? "\n" : '').$tmp.': '.$outputlangs->convToOutputCharset($targetcompany->idprof3);
+			}
+			if (!empty($conf->global->MAIN_PROFID4_IN_ADDRESS) && !empty($targetcompany->idprof4))
+			{
+				$tmp = $outputlangs->transcountrynoentities("ProfId4", $targetcompany->country_code);
+				if (preg_match('/\((.+)\)/', $tmp, $reg)) $tmp = $reg[1];
+				$stringaddress .= ($stringaddress ? "\n" : '').$tmp.': '.$outputlangs->convToOutputCharset($targetcompany->idprof4);
+			}
+			if (!empty($conf->global->MAIN_PROFID5_IN_ADDRESS) && !empty($targetcompany->idprof5))
+			{
+				$tmp = $outputlangs->transcountrynoentities("ProfId5", $targetcompany->country_code);
+				if (preg_match('/\((.+)\)/', $tmp, $reg)) $tmp = $reg[1];
+				$stringaddress .= ($stringaddress ? "\n" : '').$tmp.': '.$outputlangs->convToOutputCharset($targetcompany->idprof5);
+			}
+			if (!empty($conf->global->MAIN_PROFID6_IN_ADDRESS) && !empty($targetcompany->idprof6))
+			{
+				$tmp = $outputlangs->transcountrynoentities("ProfId6", $targetcompany->country_code);
+				if (preg_match('/\((.+)\)/', $tmp, $reg)) $tmp = $reg[1];
+				$stringaddress .= ($stringaddress ? "\n" : '').$tmp.': '.$outputlangs->convToOutputCharset($targetcompany->idprof6);
+			}
 
-    		// Public note
-    		if (!empty($conf->global->MAIN_PUBLIC_NOTE_IN_ADDRESS))
-    		{
-    		    if ($mode == 'source' && !empty($sourcecompany->note_public))
-        		{
-        		    $stringaddress .= ($stringaddress ? "\n" : '').dol_string_nohtmltag($sourcecompany->note_public);
-        		}
-        		if (($mode == 'target' || preg_match('/targetwithdetails/', $mode)) && !empty($targetcompany->note_public))
-        		{
-        		    $stringaddress .= ($stringaddress ? "\n" : '').dol_string_nohtmltag($targetcompany->note_public);
-        		}
-    		}
-    	}
+			// Public note
+			if (!empty($conf->global->MAIN_PUBLIC_NOTE_IN_ADDRESS))
+			{
+				if ($mode == 'source' && !empty($sourcecompany->note_public))
+				{
+					$stringaddress .= ($stringaddress ? "\n" : '').dol_string_nohtmltag($sourcecompany->note_public);
+				}
+				if (($mode == 'target' || preg_match('/targetwithdetails/', $mode)) && !empty($targetcompany->note_public))
+				{
+					$stringaddress .= ($stringaddress ? "\n" : '').dol_string_nohtmltag($targetcompany->note_public);
+				}
+			}
+		}
 	}
 
 	return $stringaddress;
@@ -642,10 +642,10 @@ function pdf_pagehead(&$pdf, $outputlangs, $page_height)
  */
 function pdf_getSubstitutionArray($outputlangs, $exclude = null, $object = null, $onlykey = 0)
 {
-    $substitutionarray = getCommonSubstitutionArray($outputlangs, $onlykey, $exclude, $object);
-    $substitutionarray['__FROM_NAME__'] = '__FROM_NAME__';
-    $substitutionarray['__FROM_EMAIL__'] = '__FROM_EMAIL__';
-    return $substitutionarray;
+	$substitutionarray = getCommonSubstitutionArray($outputlangs, $onlykey, $exclude, $object);
+	$substitutionarray['__FROM_NAME__'] = '__FROM_NAME__';
+	$substitutionarray['__FROM_EMAIL__'] = '__FROM_EMAIL__';
+	return $substitutionarray;
 }
 
 
@@ -750,12 +750,12 @@ function pdf_bank(&$pdf, $outputlangs, $curx, $cury, $account, $onlynumber = 0,
 
 		if (empty($conf->global->PDF_BANK_HIDE_NUMBER_SHOW_ONLY_BICIBAN))    // Note that some countries still need bank number, BIC/IBAN not enougth for them
 		{
-		    // Note:
-		    // bank = code_banque (FR), sort code (GB, IR. Example: 12-34-56)
-		    // desk = code guichet (FR), used only when $usedetailedbban = 1
-		    // number = account number
-		    // key = check control key used only when $usedetailedbban = 1
-    		if (empty($onlynumber)) $pdf->line($curx + 1, $cury + 1, $curx + 1, $cury + 6);
+			// Note:
+			// bank = code_banque (FR), sort code (GB, IR. Example: 12-34-56)
+			// desk = code guichet (FR), used only when $usedetailedbban = 1
+			// number = account number
+			// key = check control key used only when $usedetailedbban = 1
+			if (empty($onlynumber)) $pdf->line($curx + 1, $cury + 1, $curx + 1, $cury + 6);
 
 
 			foreach ($account->getFieldsToShow() as $val)
@@ -796,10 +796,10 @@ function pdf_bank(&$pdf, $outputlangs, $curx, $cury, $account, $onlynumber = 0,
 				if (empty($onlynumber)) {
 					$pdf->line($curx, $cury + 1, $curx, $cury + 7);
 				}
-    		}
+			}
 
-    		$curx = $savcurx;
-    		$cury += 8;
+			$curx = $savcurx;
+			$cury += 8;
 		}
 	} else {
 		$pdf->SetFont('', 'B', $default_font_size - $diffsizecontent);
@@ -916,7 +916,7 @@ function pdf_pagefoot(&$pdf, $outputlangs, $paramfreetext, $fromcompany, $marge_
 	// First line of company infos
 	$line1 = ""; $line2 = ""; $line3 = ""; $line4 = "";
 
-    if ($showdetails == 1 || $showdetails == 3)
+	if ($showdetails == 1 || $showdetails == 3)
 	{
 		// Company name
 		if ($fromcompany->name)
@@ -1045,16 +1045,16 @@ function pdf_pagefoot(&$pdf, $outputlangs, $paramfreetext, $fromcompany, $marge_
 	if ($line)	// Free text
 	{
 		//$line="sample text<br>\nfd<strong>sf</strong>sdf<br>\nghfghg<br>";
-	    if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
+		if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 		{
 			$width = 20000; $align = 'L'; // By default, ask a manual break: We use a large value 20000, to not have automatic wrap. This make user understand, he need to add CR on its text.
-    		if (!empty($conf->global->MAIN_USE_AUTOWRAP_ON_FREETEXT)) {
-    			$width = 200; $align = 'C';
-    		}
-		    $freetextheight = $pdf->getStringHeight($width, $line);
+			if (!empty($conf->global->MAIN_USE_AUTOWRAP_ON_FREETEXT)) {
+				$width = 200; $align = 'C';
+			}
+			$freetextheight = $pdf->getStringHeight($width, $line);
 		} else {
-            $freetextheight = pdfGetHeightForHtmlContent($pdf, dol_htmlentitiesbr($line, 1, 'UTF-8', 0)); // New method (works for HTML content)
-            //print '<br>'.$freetextheight;exit;
+			$freetextheight = pdfGetHeightForHtmlContent($pdf, dol_htmlentitiesbr($line, 1, 'UTF-8', 0)); // New method (works for HTML content)
+			//print '<br>'.$freetextheight;exit;
 		}
 	}
 
@@ -1066,9 +1066,9 @@ function pdf_pagefoot(&$pdf, $outputlangs, $paramfreetext, $fromcompany, $marge_
 		$pdf->SetXY($dims['lm'], -$posy);
 		if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))   // by default
 		{
-            $pdf->MultiCell(0, 3, $line, 0, $align, 0);
+			$pdf->MultiCell(0, 3, $line, 0, $align, 0);
 		} else {
-            $pdf->writeHTMLCell($pdf->page_largeur - $pdf->margin_left - $pdf->margin_right, $freetextheight, $dims['lm'], $dims['hk'] - $marginwithfooter, dol_htmlentitiesbr($line, 1, 'UTF-8', 0));
+			$pdf->writeHTMLCell($pdf->page_largeur - $pdf->margin_left - $pdf->margin_right, $freetextheight, $dims['lm'], $dims['hk'] - $marginwithfooter, dol_htmlentitiesbr($line, 1, 'UTF-8', 0));
 		}
 		$posy -= $freetextheight;
 	}
@@ -1140,11 +1140,11 @@ function pdf_writeLinkedObjects(&$pdf, $object, $outputlangs, $posx, $posy, $w,
 	{
 		foreach ($linkedobjects as $linkedobject)
 		{
-		    $reftoshow = $linkedobject["ref_title"].' : '.$linkedobject["ref_value"];
-		    if (!empty($linkedobject["date_value"]))
-		    {
-		        $reftoshow .= ' / '.$linkedobject["date_value"];
-		    }
+			$reftoshow = $linkedobject["ref_title"].' : '.$linkedobject["ref_value"];
+			if (!empty($linkedobject["date_value"]))
+			{
+				$reftoshow .= ' / '.$linkedobject["date_value"];
+			}
 
 			$posy += 3;
 			$pdf->SetXY($posx, $posy);
@@ -1260,7 +1260,7 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0,
 			// Manage HTML entities description test because $prodser->description is store with htmlentities but $desc no
 			$textwasmodified = false;
 			if (!empty($desc) && dol_textishtml($desc) && !empty($prodser->description) && dol_textishtml($prodser->description)) {
-				$textwasmodified = (strpos(dol_html_entity_decode($desc, ENT_QUOTES|ENT_HTML5), dol_html_entity_decode($prodser->description, ENT_QUOTES|ENT_HTML5)) !== false);
+				$textwasmodified = (strpos(dol_html_entity_decode($desc, ENT_QUOTES | ENT_HTML5), dol_html_entity_decode($prodser->description, ENT_QUOTES | ENT_HTML5)) !== false);
 			} else {
 				$textwasmodified = ($desc == $prodser->description);
 			}
@@ -1279,7 +1279,7 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0,
 	// Description short of product line
 	$libelleproduitservice = $label;
 	if (!empty($libelleproduitservice) && !empty($conf->global->PDF_BOLD_PRODUCT_LABEL)) {
-		$libelleproduitservice = '<b>' . $libelleproduitservice . '</b>';
+		$libelleproduitservice = '<b>'.$libelleproduitservice.'</b>';
 	}
 
 	// Description long of product line
@@ -1391,7 +1391,7 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0,
 	if (!empty($object->lines[$i]->date_start) || !empty($object->lines[$i]->date_end))
 	{
 		$format = 'day';
-        $period = '';
+		$period = '';
 		// Show duration if exists
 		if ($object->lines[$i]->date_start && $object->lines[$i]->date_end)
 		{
@@ -1407,9 +1407,9 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0,
 		}
 		//print '>'.$outputlangs->charset_output.','.$period;
 		if (!empty($conf->global->PDF_BOLD_PRODUCT_REF_AND_PERIOD)) {
-		    $libelleproduitservice .= '<b style="color:#333666;" ><em>'."__N__</b> ".$period.'</em>';
+			$libelleproduitservice .= '<b style="color:#333666;" ><em>'."__N__</b> ".$period.'</em>';
 		} else {
-		    $libelleproduitservice .= "__N__".$period;
+			$libelleproduitservice .= "__N__".$period;
 		}
 		//print $libelleproduitservice;
 	}
@@ -1694,10 +1694,10 @@ function pdf_getlineqty($object, $i, $outputlangs, $hidedetails = 0)
 
 		if (!empty($hookmanager->resPrint)) $result = $hookmanager->resPrint;
 	}
-    if (empty($reshook))
+	if (empty($reshook))
 	{
-	    if ($object->lines[$i]->special_code == 3) return '';
-	    if (empty($hidedetails) || $hidedetails > 1) $result .= $object->lines[$i]->qty;
+		if ($object->lines[$i]->special_code == 3) return '';
+		if (empty($hidedetails) || $hidedetails > 1) $result .= $object->lines[$i]->qty;
 	}
 	return $result;
 }
@@ -1730,8 +1730,8 @@ function pdf_getlineqty_asked($object, $i, $outputlangs, $hidedetails = 0)
 	}
 	if (empty($reshook))
 	{
-        if ($object->lines[$i]->special_code == 3) return '';
-        if (empty($hidedetails) || $hidedetails > 1) $result .= $object->lines[$i]->qty_asked;
+		if ($object->lines[$i]->special_code == 3) return '';
+		if (empty($hidedetails) || $hidedetails > 1) $result .= $object->lines[$i]->qty_asked;
 	}
 	return $result;
 }
@@ -1764,8 +1764,8 @@ function pdf_getlineqty_shipped($object, $i, $outputlangs, $hidedetails = 0)
 	}
 	if (empty($reshook))
 	{
-        if ($object->lines[$i]->special_code == 3) return '';
-	    if (empty($hidedetails) || $hidedetails > 1) $result .= $object->lines[$i]->qty_shipped;
+		if ($object->lines[$i]->special_code == 3) return '';
+		if (empty($hidedetails) || $hidedetails > 1) $result .= $object->lines[$i]->qty_shipped;
 	}
 	return $result;
 }
@@ -1784,8 +1784,8 @@ function pdf_getlineqty_keeptoship($object, $i, $outputlangs, $hidedetails = 0)
 	global $hookmanager;
 
 	$reshook = 0;
-    $result = '';
-    //if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
+	$result = '';
+	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
 	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 	{
 		$special_code = $object->lines[$i]->special_code;
@@ -1798,7 +1798,7 @@ function pdf_getlineqty_keeptoship($object, $i, $outputlangs, $hidedetails = 0)
 	}
 	if (empty($reshook))
 	{
-        if ($object->lines[$i]->special_code == 3) return '';
+		if ($object->lines[$i]->special_code == 3) return '';
 		if (empty($hidedetails) || $hidedetails > 1) $result .= ($object->lines[$i]->qty_asked - $object->lines[$i]->qty_shipped);
 	}
 	return $result;
@@ -1819,8 +1819,8 @@ function pdf_getlineunit($object, $i, $outputlangs, $hidedetails = 0, $hookmanag
 	global $langs;
 
 	$reshook = 0;
-    $result = '';
-    //if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
+	$result = '';
+	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
 	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 	{
 		$special_code = $object->lines[$i]->special_code;
@@ -1840,7 +1840,7 @@ function pdf_getlineunit($object, $i, $outputlangs, $hidedetails = 0, $hookmanag
 	}
 	if (empty($reshook))
 	{
-	    if (empty($hidedetails) || $hidedetails > 1) $result .= $langs->transnoentitiesnoconv($object->lines[$i]->getLabelOfUnit('short'));
+		if (empty($hidedetails) || $hidedetails > 1) $result .= $langs->transnoentitiesnoconv($object->lines[$i]->getLabelOfUnit('short'));
 	}
 	return $result;
 }
@@ -1876,8 +1876,8 @@ function pdf_getlineremisepercent($object, $i, $outputlangs, $hidedetails = 0)
 	}
 	if (empty($reshook))
 	{
-        if ($object->lines[$i]->special_code == 3) return '';
-	    if (empty($hidedetails) || $hidedetails > 1) $result .= dol_print_reduction($object->lines[$i]->remise_percent, $outputlangs);
+		if ($object->lines[$i]->special_code == 3) return '';
+		if (empty($hidedetails) || $hidedetails > 1) $result .= dol_print_reduction($object->lines[$i]->remise_percent, $outputlangs);
 	}
 	return $result;
 }
@@ -1898,8 +1898,8 @@ function pdf_getlineprogress($object, $i, $outputlangs, $hidedetails = 0, $hookm
 	global $conf;
 
 	$reshook = 0;
-    $result = '';
-    //if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
+	$result = '';
+	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
 	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 	{
 		$special_code = $object->lines[$i]->special_code;
@@ -1912,7 +1912,7 @@ function pdf_getlineprogress($object, $i, $outputlangs, $hidedetails = 0, $hookm
 	}
 	if (empty($reshook))
 	{
-        	if ($object->lines[$i]->special_code == 3) return '';
+			if ($object->lines[$i]->special_code == 3) return '';
 		if (empty($hidedetails) || $hidedetails > 1)
 		{
 			if ($conf->global->SITUATION_DISPLAY_DIFF_ON_PDF)
@@ -1958,32 +1958,32 @@ function pdf_getlinetotalexcltax($object, $i, $outputlangs, $hidedetails = 0)
 
 		if (!empty($hookmanager->resPrint)) $result .= $hookmanager->resPrint;
 	}
-    if (empty($reshook))
-    {
-	    if ($object->lines[$i]->special_code == 3)
-    	{
-    		$result .= $outputlangs->transnoentities("Option");
-    	}
-        elseif (empty($hidedetails) || $hidedetails > 1)
-        {
-        	$total_ht = ($conf->multicurrency->enabled && $object->multicurrency_tx != 1 ? $object->lines[$i]->multicurrency_total_ht : $object->lines[$i]->total_ht);
-        	if ($object->lines[$i]->situation_percent > 0)
-        	{
-        	    // TODO Remove this. The total should be saved correctly in database instead of being modified here.
-        		$prev_progress = 0;
-        		$progress = 1;
-        		if (method_exists($object->lines[$i], 'get_prev_progress'))
-        		{
+	if (empty($reshook))
+	{
+		if ($object->lines[$i]->special_code == 3)
+		{
+			$result .= $outputlangs->transnoentities("Option");
+		}
+		elseif (empty($hidedetails) || $hidedetails > 1)
+		{
+			$total_ht = ($conf->multicurrency->enabled && $object->multicurrency_tx != 1 ? $object->lines[$i]->multicurrency_total_ht : $object->lines[$i]->total_ht);
+			if ($object->lines[$i]->situation_percent > 0)
+			{
+				// TODO Remove this. The total should be saved correctly in database instead of being modified here.
+				$prev_progress = 0;
+				$progress = 1;
+				if (method_exists($object->lines[$i], 'get_prev_progress'))
+				{
 					$prev_progress = $object->lines[$i]->get_prev_progress($object->id);
 					$progress = ($object->lines[$i]->situation_percent - $prev_progress) / 100;
-        		}
+				}
 				$result .= price($sign * ($total_ht / ($object->lines[$i]->situation_percent / 100)) * $progress, 0, $outputlangs);
-        	} else {
-                $result .= price($sign * $total_ht, 0, $outputlangs);
-        	}
-        }
-    }
-    return $result;
+			} else {
+				$result .= price($sign * $total_ht, 0, $outputlangs);
+			}
+		}
+	}
+	return $result;
 }
 
 /**
@@ -2018,27 +2018,27 @@ function pdf_getlinetotalwithtax($object, $i, $outputlangs, $hidedetails = 0)
 	if (empty($reshook))
 	{
 		if ($object->lines[$i]->special_code == 3)
-    	{
-    		$result .= $outputlangs->transnoentities("Option");
-    	}
-    	elseif (empty($hidedetails) || $hidedetails > 1)
-    	{
-    		$total_ttc = ($conf->multicurrency->enabled && $object->multicurrency_tx != 1 ? $object->lines[$i]->multicurrency_total_ttc : $object->lines[$i]->total_ttc);
-    		if ($object->lines[$i]->situation_percent > 0)
-    		{
-    			// TODO Remove this. The total should be saved correctly in database instead of being modified here.
-    			$prev_progress = 0;
-    			$progress = 1;
-    			if (method_exists($object->lines[$i], 'get_prev_progress'))
-    			{
-    				$prev_progress = $object->lines[$i]->get_prev_progress($object->id);
-    				$progress = ($object->lines[$i]->situation_percent - $prev_progress) / 100;
-    			}
-    			$result .= price($sign * ($total_ttc / ($object->lines[$i]->situation_percent / 100)) * $progress, 0, $outputlangs);
-    		} else {
-    			$result .= price($sign * $total_ttc, 0, $outputlangs);
-    		}
-    	}
+		{
+			$result .= $outputlangs->transnoentities("Option");
+		}
+		elseif (empty($hidedetails) || $hidedetails > 1)
+		{
+			$total_ttc = ($conf->multicurrency->enabled && $object->multicurrency_tx != 1 ? $object->lines[$i]->multicurrency_total_ttc : $object->lines[$i]->total_ttc);
+			if ($object->lines[$i]->situation_percent > 0)
+			{
+				// TODO Remove this. The total should be saved correctly in database instead of being modified here.
+				$prev_progress = 0;
+				$progress = 1;
+				if (method_exists($object->lines[$i], 'get_prev_progress'))
+				{
+					$prev_progress = $object->lines[$i]->get_prev_progress($object->id);
+					$progress = ($object->lines[$i]->situation_percent - $prev_progress) / 100;
+				}
+				$result .= price($sign * ($total_ttc / ($object->lines[$i]->situation_percent / 100)) * $progress, 0, $outputlangs);
+			} else {
+				$result .= price($sign * $total_ttc, 0, $outputlangs);
+			}
+		}
 	}
 	return $result;
 }
@@ -2106,10 +2106,10 @@ function pdf_getLinkedObjects($object, $outputlangs)
 
 	foreach ($object->linkedObjects as $objecttype => $objects)
 	{
-	    if ($objecttype == 'facture')
-	    {
-	        // For invoice, we don't want to have a reference line on document. Image we are using recuring invoice, we will have a line longer than document width.
-	    } elseif ($objecttype == 'propal' || $objecttype == 'supplier_proposal')
+		if ($objecttype == 'facture')
+		{
+			// For invoice, we don't want to have a reference line on document. Image we are using recuring invoice, we will have a line longer than document width.
+		} elseif ($objecttype == 'propal' || $objecttype == 'supplier_proposal')
 		{
 			$outputlangs->load('propal');
 
@@ -2156,34 +2156,34 @@ function pdf_getLinkedObjects($object, $outputlangs)
 
 			foreach ($objects as $x => $elementobject)
 			{
-			    $order = null;
-			    // We concat this record info into fields xxx_value. title is overwrote.
-			    if (empty($object->linkedObjects['commande']) && $object->element != 'commande')	// There is not already a link to order and object is not the order, so we show also info with order
-			    {
-			        $elementobject->fetchObjectLinked(null, '', null, '', 'OR', 1, 'sourcetype', 0);
-			        if (!empty($elementobject->linkedObjectsIds['commande'])) {
+				$order = null;
+				// We concat this record info into fields xxx_value. title is overwrote.
+				if (empty($object->linkedObjects['commande']) && $object->element != 'commande')	// There is not already a link to order and object is not the order, so we show also info with order
+				{
+					$elementobject->fetchObjectLinked(null, '', null, '', 'OR', 1, 'sourcetype', 0);
+					if (!empty($elementobject->linkedObjectsIds['commande'])) {
 						include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 						$order = new Commande($db);
 						$ret = $order->fetch(reset($elementobject->linkedObjectsIds['commande']));
 						if ($ret < 1) { $order = null; }
 					}
-			    }
-			    if (!is_object($order))
-			    {
-			        $linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefSending");
-			        if (!empty($linkedobjects[$objecttype]['ref_value'])) $linkedobjects[$objecttype]['ref_value'] .= ' / ';
-			        $linkedobjects[$objecttype]['ref_value'] .= $outputlangs->transnoentities($elementobject->ref);
-			        //$linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("DateShipment");
-			        //if (! empty($linkedobjects[$objecttype]['date_value'])) $linkedobjects[$objecttype]['date_value'].=' / ';
-			        //$linkedobjects[$objecttype]['date_value'].= dol_print_date($elementobject->date_delivery,'day','',$outputlangs);
-			    } else {
-			        $linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefOrder").' / '.$outputlangs->transnoentities("RefSending");
-			        if (empty($linkedobjects[$objecttype]['ref_value'])) $linkedobjects[$objecttype]['ref_value'] = $outputlangs->convToOutputCharset($order->ref).($order->ref_client ? ' ('.$order->ref_client.')' : '');
-			        $linkedobjects[$objecttype]['ref_value'] .= ' / '.$outputlangs->transnoentities($elementobject->ref);
-			        //$linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("OrderDate") . ($elementobject->date_delivery ? ' / ' . $outputlangs->transnoentities("DateShipment") : '');
-			        //if (empty($linkedobjects[$objecttype]['date_value'])) $linkedobjects[$objecttype]['date_value'] = dol_print_date($order->date,'day','',$outputlangs);
-			        //$linkedobjects[$objecttype]['date_value'].= ($elementobject->date_delivery ? ' / ' . dol_print_date($elementobject->date_delivery,'day','',$outputlangs) : '');
-			    }
+				}
+				if (!is_object($order))
+				{
+					$linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefSending");
+					if (!empty($linkedobjects[$objecttype]['ref_value'])) $linkedobjects[$objecttype]['ref_value'] .= ' / ';
+					$linkedobjects[$objecttype]['ref_value'] .= $outputlangs->transnoentities($elementobject->ref);
+					//$linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("DateShipment");
+					//if (! empty($linkedobjects[$objecttype]['date_value'])) $linkedobjects[$objecttype]['date_value'].=' / ';
+					//$linkedobjects[$objecttype]['date_value'].= dol_print_date($elementobject->date_delivery,'day','',$outputlangs);
+				} else {
+					$linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefOrder").' / '.$outputlangs->transnoentities("RefSending");
+					if (empty($linkedobjects[$objecttype]['ref_value'])) $linkedobjects[$objecttype]['ref_value'] = $outputlangs->convToOutputCharset($order->ref).($order->ref_client ? ' ('.$order->ref_client.')' : '');
+					$linkedobjects[$objecttype]['ref_value'] .= ' / '.$outputlangs->transnoentities($elementobject->ref);
+					//$linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("OrderDate") . ($elementobject->date_delivery ? ' / ' . $outputlangs->transnoentities("DateShipment") : '');
+					//if (empty($linkedobjects[$objecttype]['date_value'])) $linkedobjects[$objecttype]['date_value'] = dol_print_date($order->date,'day','',$outputlangs);
+					//$linkedobjects[$objecttype]['date_value'].= ($elementobject->date_delivery ? ' / ' . dol_print_date($elementobject->date_delivery,'day','',$outputlangs) : '');
+				}
 			}
 		}
 	}
diff --git a/htdocs/core/lib/price.lib.php b/htdocs/core/lib/price.lib.php
index ea80732ae41..7ab6dcdb233 100644
--- a/htdocs/core/lib/price.lib.php
+++ b/htdocs/core/lib/price.lib.php
@@ -121,7 +121,7 @@ function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $uselocalt
 	//var_dump($uselocaltax1_rate.' - '.$uselocaltax2_rate);
 	dol_syslog('Price.lib::calcul_price_total qty='.$qty.' pu='.$pu.' remise_percent_ligne='.$remise_percent_ligne.' txtva='.$txtva.' uselocaltax1_rate='.$uselocaltax1_rate.' uselocaltax2_rate='.$uselocaltax2_rate.' remise_percent_global='.$remise_percent_global.' price_base_type='.$price_base_type.' type='.$type.' progress='.$progress);
 
-    // Now we search localtaxes information ourself (rates and types).
+	// Now we search localtaxes information ourself (rates and types).
 	$localtax1_type = 0;
 	$localtax2_type = 0;
 
@@ -133,9 +133,9 @@ function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $uselocalt
 		$localtax2_rate = $localtaxes_array[3];
 	} else // deprecated method. values and type for localtaxes must be provided by caller and loaded with getLocalTaxesFromRate using the full vat rate (including text code)
 	{
-	    dol_syslog("Price.lib::calcul_price_total search vat information using old deprecated method", LOG_WARNING);
+		dol_syslog("Price.lib::calcul_price_total search vat information using old deprecated method", LOG_WARNING);
 
-	    $sql = "SELECT taux, localtax1, localtax2, localtax1_type, localtax2_type";
+		$sql = "SELECT taux, localtax1, localtax2, localtax1_type, localtax2_type";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as cv";
 		$sql .= " WHERE cv.taux = ".$txtva;
 		$sql .= " AND cv.fk_pays = ".$countryid;
@@ -182,35 +182,35 @@ function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $uselocalt
 
 	// if there's some localtax including vat, we calculate localtaxes (we will add later)
 
-    // if input unit price is 'HT', we need to have the totals with main VAT for a correct calculation
-    if ($price_base_type != 'TTC')
-    {
-    	$tot_sans_remise_wt = price2num($tot_sans_remise * (1 + ($txtva / 100)), 'MU');
-    	$tot_avec_remise_wt = price2num($tot_avec_remise * (1 + ($txtva / 100)), 'MU');
-    	$pu_wt = price2num($pu * (1 + ($txtva / 100)), 'MU');
-    } else {
-    	$tot_sans_remise_wt = $tot_sans_remise;
-    	$tot_avec_remise_wt = $tot_avec_remise;
-    	$pu_wt = $pu;
-    }
+	// if input unit price is 'HT', we need to have the totals with main VAT for a correct calculation
+	if ($price_base_type != 'TTC')
+	{
+		$tot_sans_remise_wt = price2num($tot_sans_remise * (1 + ($txtva / 100)), 'MU');
+		$tot_avec_remise_wt = price2num($tot_avec_remise * (1 + ($txtva / 100)), 'MU');
+		$pu_wt = price2num($pu * (1 + ($txtva / 100)), 'MU');
+	} else {
+		$tot_sans_remise_wt = $tot_sans_remise;
+		$tot_avec_remise_wt = $tot_avec_remise;
+		$pu_wt = $pu;
+	}
 
 	//print 'rr'.$price_base_type.'-'.$txtva.'-'.$tot_sans_remise_wt."-".$pu_wt."-".$uselocaltax1_rate."-".$localtax1_rate."-".$localtax1_type."\n";
 
-    $localtaxes = array(0, 0, 0);
-    $apply_tax = false;
-    switch ($localtax1_type) {
-        case '2':     // localtax on product or service
-            $apply_tax = true;
-            break;
-        case '4':     // localtax on product
-            if ($type == 0) $apply_tax = true;
-            break;
-        case '6':     // localtax on service
-            if ($type == 1) $apply_tax = true;
-            break;
-    }
+	$localtaxes = array(0, 0, 0);
+	$apply_tax = false;
+	switch ($localtax1_type) {
+		case '2':     // localtax on product or service
+			$apply_tax = true;
+			break;
+		case '4':     // localtax on product
+			if ($type == 0) $apply_tax = true;
+			break;
+		case '6':     // localtax on service
+			if ($type == 1) $apply_tax = true;
+			break;
+	}
 
-    if ($uselocaltax1_rate && $apply_tax) {
+	if ($uselocaltax1_rate && $apply_tax) {
   		$result[14] = price2num(($tot_sans_remise_wt * (1 + ($localtax1_rate / 100))) - $tot_sans_remise_wt, 'MT');
   		$localtaxes[0] += $result[14];
 
@@ -219,21 +219,21 @@ function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $uselocalt
 
   		$result[11] = price2num(($pu_wt * (1 + ($localtax1_rate / 100))) - $pu_wt, 'MU');
   		$localtaxes[2] += $result[11];
-    }
+	}
 
-    $apply_tax = false;
-    switch ($localtax2_type) {
-        case '2':     // localtax on product or service
-            $apply_tax = true;
-            break;
-        case '4':     // localtax on product
-            if ($type == 0) $apply_tax = true;
-            break;
-        case '6':     // localtax on service
-            if ($type == 1) $apply_tax = true;
-            break;
-    }
-    if ($uselocaltax2_rate && $apply_tax) {
+	$apply_tax = false;
+	switch ($localtax2_type) {
+		case '2':     // localtax on product or service
+			$apply_tax = true;
+			break;
+		case '4':     // localtax on product
+			if ($type == 0) $apply_tax = true;
+			break;
+		case '6':     // localtax on service
+			if ($type == 1) $apply_tax = true;
+			break;
+	}
+	if ($uselocaltax2_rate && $apply_tax) {
   		$result[15] = price2num(($tot_sans_remise_wt * (1 + ($localtax2_rate / 100))) - $tot_sans_remise_wt, 'MT');
   		$localtaxes[0] += $result[15];
 
@@ -242,7 +242,7 @@ function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $uselocalt
 
   		$result[12] = price2num(($pu_wt * (1 + ($localtax2_rate / 100))) - $pu_wt, 'MU');
   		$localtaxes[2] += $result[12];
-    }
+	}
 
 	//dol_syslog("price.lib::calcul_price_total $qty, $pu, $remise_percent_ligne, $txtva, $price_base_type $info_bits");
 	if ($price_base_type == 'HT')
@@ -282,27 +282,27 @@ function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $uselocalt
 
 	// if there's some localtax without vat, we calculate localtaxes (we will add them at end)
 
-    //If input unit price is 'TTC', we need to have the totals without main VAT for a correct calculation
-    if ($price_base_type == 'TTC')
-    {
-    	$tot_sans_remise = price2num($tot_sans_remise / (1 + ($txtva / 100)), 'MU');
-    	$tot_avec_remise = price2num($tot_avec_remise / (1 + ($txtva / 100)), 'MU');
-    	$pu = price2num($pu / (1 + ($txtva / 100)), 'MU');
-    }
+	//If input unit price is 'TTC', we need to have the totals without main VAT for a correct calculation
+	if ($price_base_type == 'TTC')
+	{
+		$tot_sans_remise = price2num($tot_sans_remise / (1 + ($txtva / 100)), 'MU');
+		$tot_avec_remise = price2num($tot_avec_remise / (1 + ($txtva / 100)), 'MU');
+		$pu = price2num($pu / (1 + ($txtva / 100)), 'MU');
+	}
 
 	$apply_tax = false;
-    switch ($localtax1_type) {
-        case '1':     // localtax on product or service
-            $apply_tax = true;
-            break;
-        case '3':     // localtax on product
-            if ($type == 0) $apply_tax = true;
-            break;
-        case '5':     // localtax on service
-            if ($type == 1) $apply_tax = true;
-            break;
-    }
-    if ($uselocaltax1_rate && $apply_tax) {
+	switch ($localtax1_type) {
+		case '1':     // localtax on product or service
+			$apply_tax = true;
+			break;
+		case '3':     // localtax on product
+			if ($type == 0) $apply_tax = true;
+			break;
+		case '5':     // localtax on service
+			if ($type == 1) $apply_tax = true;
+			break;
+	}
+	if ($uselocaltax1_rate && $apply_tax) {
   		$result[14] = price2num(($tot_sans_remise * (1 + ($localtax1_rate / 100))) - $tot_sans_remise, 'MT'); // amount tax1 for total_ht_without_discount
   		$result[8] += $result[14]; // total_ttc_without_discount + tax1
 
@@ -311,21 +311,21 @@ function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $uselocalt
 
   		$result[11] = price2num(($pu * (1 + ($localtax1_rate / 100))) - $pu, 'MU'); // amount tax1 for pu_ht
   		$result[5] += $result[11]; // pu_ht + tax1
-    }
+	}
 
-    $apply_tax = false;
-    switch ($localtax2_type) {
-        case '1':     // localtax on product or service
-            $apply_tax = true;
-            break;
-        case '3':     // localtax on product
-            if ($type == 0) $apply_tax = true;
-            break;
-        case '5':     // localtax on service
-            if ($type == 1) $apply_tax = true;
-            break;
-    }
-    if ($uselocaltax2_rate && $apply_tax) {
+	$apply_tax = false;
+	switch ($localtax2_type) {
+		case '1':     // localtax on product or service
+			$apply_tax = true;
+			break;
+		case '3':     // localtax on product
+			if ($type == 0) $apply_tax = true;
+			break;
+		case '5':     // localtax on service
+			if ($type == 1) $apply_tax = true;
+			break;
+	}
+	if ($uselocaltax2_rate && $apply_tax) {
   		$result[15] = price2num(($tot_sans_remise * (1 + ($localtax2_rate / 100))) - $tot_sans_remise, 'MT'); // amount tax2 for total_ht_without_discount
   		$result[8] += $result[15]; // total_ttc_without_discount + tax2
 
@@ -334,7 +334,7 @@ function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $uselocalt
 
   		$result[12] = price2num(($pu * (1 + ($localtax2_rate / 100))) - $pu, 'MU'); // amount tax2 for pu_ht
   		$result[5] += $result[12]; // pu_ht + tax2
-    }
+	}
 
 	// If rounding is not using base 10 (rare)
 	if (!empty($conf->global->MAIN_ROUNDING_RULE_TOT))
diff --git a/htdocs/core/lib/product.lib.php b/htdocs/core/lib/product.lib.php
index d643498162f..09232fbd012 100644
--- a/htdocs/core/lib/product.lib.php
+++ b/htdocs/core/lib/product.lib.php
@@ -50,23 +50,23 @@ function product_prepare_head($object)
 
 	if (!empty($object->status))
 	{
-    	$head[$h][0] = DOL_URL_ROOT."/product/price.php?id=".$object->id;
-    	$head[$h][1] = $langs->trans("SellingPrices");
-    	$head[$h][2] = 'price';
-    	$h++;
+		$head[$h][0] = DOL_URL_ROOT."/product/price.php?id=".$object->id;
+		$head[$h][1] = $langs->trans("SellingPrices");
+		$head[$h][2] = 'price';
+		$h++;
 	}
 
 	if (!empty($object->status_buy) || (!empty($conf->margin->enabled) && !empty($object->status)))   // If margin is on and product on sell, we may need the cost price even if product os not on purchase
 	{
-    	if (((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) && $user->rights->fournisseur->lire)
-    	|| (!empty($conf->margin->enabled) && $user->rights->margin->liretous)
-    	)
-    	{
-    		$head[$h][0] = DOL_URL_ROOT."/product/fournisseurs.php?id=".$object->id;
-    		$head[$h][1] = $langs->trans("BuyingPrices");
-    		$head[$h][2] = 'suppliers';
-    		$h++;
-    	}
+		if (((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) && $user->rights->fournisseur->lire)
+		|| (!empty($conf->margin->enabled) && $user->rights->margin->liretous)
+		)
+		{
+			$head[$h][0] = DOL_URL_ROOT."/product/fournisseurs.php?id=".$object->id;
+			$head[$h][1] = $langs->trans("BuyingPrices");
+			$head[$h][2] = 'suppliers';
+			$h++;
+		}
 	}
 
 	// Multilangs
@@ -107,97 +107,97 @@ function product_prepare_head($object)
 
 		$prodcomb = new ProductCombination($db);
 
-		if ($prodcomb->fetchByFkProductChild($object->id) == -1)
+		if ($prodcomb->fetchByFkProductChild($object->id) <= 0)
 		{
 			$head[$h][0] = DOL_URL_ROOT."/variants/combinations.php?id=".$object->id;
 			$head[$h][1] = $langs->trans('ProductCombinations');
 			$head[$h][2] = 'combinations';
 			$nbVariant = $prodcomb->countNbOfCombinationForFkProductParent($object->id);
-            if ($nbVariant > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbVariant.'</span>';
+			if ($nbVariant > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbVariant.'</span>';
 		}
 
 		$h++;
 	}
 
-    if ($object->isProduct() || ($object->isService() && !empty($conf->global->STOCK_SUPPORTS_SERVICES)))    // If physical product we can stock (or service with option)
-    {
-        if (!empty($conf->stock->enabled) && $user->rights->stock->lire)
-        {
-            $head[$h][0] = DOL_URL_ROOT."/product/stock/product.php?id=".$object->id;
-            $head[$h][1] = $langs->trans("Stock");
-            $head[$h][2] = 'stock';
-            $h++;
-        }
-    }
+	if ($object->isProduct() || ($object->isService() && !empty($conf->global->STOCK_SUPPORTS_SERVICES)))    // If physical product we can stock (or service with option)
+	{
+		if (!empty($conf->stock->enabled) && $user->rights->stock->lire)
+		{
+			$head[$h][0] = DOL_URL_ROOT."/product/stock/product.php?id=".$object->id;
+			$head[$h][1] = $langs->trans("Stock");
+			$head[$h][2] = 'stock';
+			$h++;
+		}
+	}
 
-    // Tab to link resources
-    if (!empty($conf->resource->enabled))
-    {
-        if ($object->isProduct() && !empty($conf->global->RESOURCE_ON_PRODUCTS))
-        {
-            $head[$h][0] = DOL_URL_ROOT.'/resource/element_resource.php?element=product&ref='.$object->ref;
-            $head[$h][1] = $langs->trans("Resources");
-            $head[$h][2] = 'resources';
-            $h++;
-        }
-        if ($object->isService() && !empty($conf->global->RESOURCE_ON_SERVICES))
-        {
-            $head[$h][0] = DOL_URL_ROOT.'/resource/element_resource.php?element=service&ref='.$object->ref;
-            $head[$h][1] = $langs->trans("Resources");
-            $head[$h][2] = 'resources';
-            $h++;
-        }
-    }
+	// Tab to link resources
+	if (!empty($conf->resource->enabled))
+	{
+		if ($object->isProduct() && !empty($conf->global->RESOURCE_ON_PRODUCTS))
+		{
+			$head[$h][0] = DOL_URL_ROOT.'/resource/element_resource.php?element=product&ref='.$object->ref;
+			$head[$h][1] = $langs->trans("Resources");
+			$head[$h][2] = 'resources';
+			$h++;
+		}
+		if ($object->isService() && !empty($conf->global->RESOURCE_ON_SERVICES))
+		{
+			$head[$h][0] = DOL_URL_ROOT.'/resource/element_resource.php?element=service&ref='.$object->ref;
+			$head[$h][1] = $langs->trans("Resources");
+			$head[$h][2] = 'resources';
+			$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, 'product');
+	// 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, 'product');
 
-    // Notes
-    if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
-    {
-        $nbNote = 0;
-        if (!empty($object->note_private)) $nbNote++;
-        if (!empty($object->note_public)) $nbNote++;
-        $head[$h][0] = DOL_URL_ROOT.'/product/note.php?id='.$object->id;
-        $head[$h][1] = $langs->trans('Notes');
-        if ($nbNote > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
-        $head[$h][2] = 'note';
-        $h++;
-    }
+	// Notes
+	if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
+	{
+		$nbNote = 0;
+		if (!empty($object->note_private)) $nbNote++;
+		if (!empty($object->note_public)) $nbNote++;
+		$head[$h][0] = DOL_URL_ROOT.'/product/note.php?id='.$object->id;
+		$head[$h][1] = $langs->trans('Notes');
+		if ($nbNote > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
+		$head[$h][2] = 'note';
+		$h++;
+	}
 
-    // Attachments
+	// Attachments
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-    require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-    if (!empty($conf->product->enabled) && ($object->type == Product::TYPE_PRODUCT)) $upload_dir = $conf->product->multidir_output[$object->entity].'/'.dol_sanitizeFileName($object->ref);
-    if (!empty($conf->service->enabled) && ($object->type == Product::TYPE_SERVICE)) $upload_dir = $conf->service->multidir_output[$object->entity].'/'.dol_sanitizeFileName($object->ref);
-    $nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
-    if (!empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) {
-        if (!empty($conf->product->enabled) && ($object->type == Product::TYPE_PRODUCT)) $upload_dir = $conf->product->multidir_output[$object->entity].'/'.get_exdir($object->id, 2, 0, 0, $object, 'product').$object->id.'/photos';
-        if (!empty($conf->service->enabled) && ($object->type == Product::TYPE_SERVICE)) $upload_dir = $conf->service->multidir_output[$object->entity].'/'.get_exdir($object->id, 2, 0, 0, $object, 'product').$object->id.'/photos';
-        $nbFiles += count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
-    }
-    $nbLinks = Link::count($db, $object->element, $object->id);
+	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
+	if (!empty($conf->product->enabled) && ($object->type == Product::TYPE_PRODUCT)) $upload_dir = $conf->product->multidir_output[$object->entity].'/'.dol_sanitizeFileName($object->ref);
+	if (!empty($conf->service->enabled) && ($object->type == Product::TYPE_SERVICE)) $upload_dir = $conf->service->multidir_output[$object->entity].'/'.dol_sanitizeFileName($object->ref);
+	$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
+	if (!empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) {
+		if (!empty($conf->product->enabled) && ($object->type == Product::TYPE_PRODUCT)) $upload_dir = $conf->product->multidir_output[$object->entity].'/'.get_exdir($object->id, 2, 0, 0, $object, 'product').$object->id.'/photos';
+		if (!empty($conf->service->enabled) && ($object->type == Product::TYPE_SERVICE)) $upload_dir = $conf->service->multidir_output[$object->entity].'/'.get_exdir($object->id, 2, 0, 0, $object, 'product').$object->id.'/photos';
+		$nbFiles += count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
+	}
+	$nbLinks = Link::count($db, $object->element, $object->id);
 	$head[$h][0] = DOL_URL_ROOT.'/product/document.php?id='.$object->id;
 	$head[$h][1] = $langs->trans('Documents');
 	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
 	$head[$h][2] = 'documents';
 	$h++;
 
-    complete_head_from_modules($conf, $langs, $object, $head, $h, 'product', 'remove');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'product', 'remove');
 
-    // Log
-    $head[$h][0] = DOL_URL_ROOT.'/product/agenda.php?id='.$object->id;
-    $head[$h][1] = $langs->trans("Events");
-    if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read)))
-    {
-    	$head[$h][1] .= '/';
-    	$head[$h][1] .= $langs->trans("Agenda");
-    }
-    $head[$h][2] = 'agenda';
-    $h++;
+	// Log
+	$head[$h][0] = DOL_URL_ROOT.'/product/agenda.php?id='.$object->id;
+	$head[$h][1] = $langs->trans("Events");
+	if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read)))
+	{
+		$head[$h][1] .= '/';
+		$head[$h][1] .= $langs->trans("Agenda");
+	}
+	$head[$h][2] = 'agenda';
+	$h++;
 
 	return $head;
 }
@@ -210,48 +210,48 @@ function product_prepare_head($object)
  */
 function productlot_prepare_head($object)
 {
-    global $db, $langs, $conf, $user;
+	global $db, $langs, $conf, $user;
 
-    // Load translation files required by the page
-    $langs->loadLangs(array("products", "productbatch"));
+	// Load translation files required by the page
+	$langs->loadLangs(array("products", "productbatch"));
 
-    $h = 0;
-    $head = array();
+	$h = 0;
+	$head = array();
 
-    $head[$h][0] = DOL_URL_ROOT."/product/stock/productlot_card.php?id=".$object->id;
-    $head[$h][1] = $langs->trans("Lot");
-    $head[$h][2] = 'card';
+	$head[$h][0] = DOL_URL_ROOT."/product/stock/productlot_card.php?id=".$object->id;
+	$head[$h][1] = $langs->trans("Lot");
+	$head[$h][2] = 'card';
 	$h++;
 
 	// Attachments
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-    require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-    $upload_dir = $conf->productbatch->multidir_output[$object->entity].'/'.dol_sanitizeFileName($object->ref);
-    $nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
-    $nbLinks = Link::count($db, $object->element, $object->id);
+	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
+	$upload_dir = $conf->productbatch->multidir_output[$object->entity].'/'.dol_sanitizeFileName($object->ref);
+	$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
+	$nbLinks = Link::count($db, $object->element, $object->id);
 	$head[$h][0] = DOL_URL_ROOT."/product/stock/productlot_document.php?id=".$object->id;
 	$head[$h][1] = $langs->trans("Documents");
 	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
-    $head[$h][2] = 'documents';
+	$head[$h][2] = 'documents';
 	$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, 'productlot');
+	// 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, 'productlot');
 
-    complete_head_from_modules($conf, $langs, $object, $head, $h, 'productlot', 'remove');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'productlot', 'remove');
 
-    // Log
-    /*
+	// Log
+	/*
     $head[$h][0] = DOL_URL_ROOT.'/product/info.php?id='.$object->id;
     $head[$h][1] = $langs->trans("Info");
     $head[$h][2] = 'info';
     $h++;
     */
 
-    return $head;
+	return $head;
 }
 
 
@@ -285,8 +285,8 @@ function product_admin_prepare_head()
 
 	// 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, null, $head, $h, 'product_admin');
 
 	$head[$h][0] = DOL_URL_ROOT.'/product/admin/product_extrafields.php';
@@ -313,25 +313,25 @@ function product_admin_prepare_head()
  */
 function product_lot_admin_prepare_head()
 {
-    global $langs, $conf, $user;
+	global $langs, $conf, $user;
 
-    $h = 0;
-    $head = array();
+	$h = 0;
+	$head = array();
 
-    // Show more tabs from modules
-    // Entries must be declared in modules descriptor with line
-    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
-    // $this->tabs = array('entity:-tabname);   												to remove a tab
-    complete_head_from_modules($conf, $langs, null, $head, $h, 'product_lot_admin');
+	// Show more tabs from modules
+	// Entries must be declared in modules descriptor with line
+	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
+	// $this->tabs = array('entity:-tabname);   												to remove a tab
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'product_lot_admin');
 
-    $head[$h][0] = DOL_URL_ROOT.'/product/admin/product_lot_extrafields.php';
-    $head[$h][1] = $langs->trans("ExtraFields");
-    $head[$h][2] = 'attributes';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT.'/product/admin/product_lot_extrafields.php';
+	$head[$h][1] = $langs->trans("ExtraFields");
+	$head[$h][2] = 'attributes';
+	$h++;
 
-    complete_head_from_modules($conf, $langs, null, $head, $h, 'product_lot_admin', 'remove');
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'product_lot_admin', 'remove');
 
-    return $head;
+	return $head;
 }
 
 
diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index 29a522e7335..19b46f8f75c 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -409,7 +409,7 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
 		$total_projectlinesa_spent = 0;
 		$total_projectlinesa_planned = 0;
 		$total_projectlinesa_spent_if_planned = 0;
-        $total_projectlinesa_declared_if_planned = 0;
+		$total_projectlinesa_declared_if_planned = 0;
 		$total_projectlinesa_tobill = 0;
 		$total_projectlinesa_billed = 0;
 	}
@@ -484,8 +484,8 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
 				$taskstatic->progress = $lines[$i]->progress;
 				$taskstatic->fk_statut = $lines[$i]->status;
 				$taskstatic->datee = $lines[$i]->date_end;
-                $taskstatic->planned_workload = $lines[$i]->planned_workload;
-                $taskstatic->duration_effective = $lines[$i]->duration;
+				$taskstatic->planned_workload = $lines[$i]->planned_workload;
+				$taskstatic->duration_effective = $lines[$i]->duration;
 
 
 				if ($showproject)
@@ -622,7 +622,7 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
 
 				if ($showbilltime)
 				{
-    				// Time not billed
+					// Time not billed
 					if (count($arrayfields) > 0 && !empty($arrayfields['t.tobill']['checked'])) {
 						print '<td class="right">';
 						if ($lines[$i]->usage_bill_time) {
@@ -634,7 +634,7 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
 						print '</td>';
 					}
 
-    				// Time billed
+					// Time billed
 					if (count($arrayfields) > 0 && !empty($arrayfields['t.billed']['checked'])) {
 						print '<td class="right">';
 						if ($lines[$i]->usage_bill_time) {
@@ -697,7 +697,7 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
 				$total_projectlinesa_spent += $lines[$i]->duration;
 				$total_projectlinesa_planned += $lines[$i]->planned_workload;
 				if ($lines[$i]->planned_workload) $total_projectlinesa_spent_if_planned += $lines[$i]->duration;
-                if ($lines[$i]->planned_workload) $total_projectlinesa_declared_if_planned += $lines[$i]->planned_workload * $lines[$i]->progress / 100;
+				if ($lines[$i]->planned_workload) $total_projectlinesa_declared_if_planned += $lines[$i]->planned_workload * $lines[$i]->progress / 100;
 			}
 		} else {
 			//$level--;
@@ -705,7 +705,7 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
 	}
 
 	if (($total_projectlinesa_planned > 0 || $total_projectlinesa_spent > 0 || $total_projectlinesa_tobill > 0 || $total_projectlinesa_billed > 0)
-	    && $level <= 0)
+		&& $level <= 0)
 	{
 		print '<tr class="liste_total nodrag nodrop">';
 		print '<td class="liste_total">'.$langs->trans("Total").'</td>';
@@ -728,28 +728,28 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
 			print '</td>';
 		}
 
-        if ($total_projectlinesa_planned) {
-            $totalAverageDeclaredProgress = round(100 * $total_projectlinesa_declared_if_planned / $total_projectlinesa_planned, 2);
-            $totalCalculatedProgress = round(100 * $total_projectlinesa_spent / $total_projectlinesa_planned, 2);
+		if ($total_projectlinesa_planned) {
+			$totalAverageDeclaredProgress = round(100 * $total_projectlinesa_declared_if_planned / $total_projectlinesa_planned, 2);
+			$totalCalculatedProgress = round(100 * $total_projectlinesa_spent / $total_projectlinesa_planned, 2);
 
-            // this conf is actually hidden, by default we use 10% for "be carefull or warning"
-            $warningRatio = !empty($conf->global->PROJECT_TIME_SPEND_WARNING_PERCENT) ? (1 + $conf->global->PROJECT_TIME_SPEND_WARNING_PERCENT / 100) : 1.10;
+			// this conf is actually hidden, by default we use 10% for "be carefull or warning"
+			$warningRatio = !empty($conf->global->PROJECT_TIME_SPEND_WARNING_PERCENT) ? (1 + $conf->global->PROJECT_TIME_SPEND_WARNING_PERCENT / 100) : 1.10;
 
-            // define progress color according to time spend vs workload
-            $progressBarClass = 'progress-bar-info';
-            $badgeClass = 'badge ';
+			// define progress color according to time spend vs workload
+			$progressBarClass = 'progress-bar-info';
+			$badgeClass = 'badge ';
 
-            if ($totalCalculatedProgress > $totalAverageDeclaredProgress) {
-                $progressBarClass = 'progress-bar-danger';
-                $badgeClass .= 'badge-danger';
-            } elseif ($totalCalculatedProgress * $warningRatio >= $totalAverageDeclaredProgress) { // warning if close at 1%
-                $progressBarClass = 'progress-bar-warning';
-                $badgeClass .= 'badge-warning';
-            } else {
-                $progressBarClass = 'progress-bar-success';
-                $badgeClass .= 'badge-success';
-            }
-        }
+			if ($totalCalculatedProgress > $totalAverageDeclaredProgress) {
+				$progressBarClass = 'progress-bar-danger';
+				$badgeClass .= 'badge-danger';
+			} elseif ($totalCalculatedProgress * $warningRatio >= $totalAverageDeclaredProgress) { // warning if close at 1%
+				$progressBarClass = 'progress-bar-warning';
+				$badgeClass .= 'badge-warning';
+			} else {
+				$progressBarClass = 'progress-bar-success';
+				$badgeClass .= 'badge-success';
+			}
+		}
 
 		if (count($arrayfields) > 0 && !empty($arrayfields['t.progress_calculated']['checked'])) {
 			print '<td class="nowrap liste_total right">';
@@ -765,7 +765,7 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
 		}
 
 
-        // resume
+		// resume
 		if (count($arrayfields) > 0 && !empty($arrayfields['t.progress_summary']['checked'])) {
 			print '<td class="right">';
 			if ($total_projectlinesa_planned) {
@@ -1082,7 +1082,7 @@ function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsr
 
 		if ($lines[$i]->fk_task_parent == $parent)
 		{
-            $obj = &$lines[$i]; // To display extrafields
+			$obj = &$lines[$i]; // To display extrafields
 
 			// If we want all or we have a role on task, we show it
 			if (empty($mine) || !empty($tasksrole[$lines[$i]->id]))
@@ -1130,13 +1130,13 @@ function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsr
 
 				if (empty($oldprojectforbreak) || ($oldprojectforbreak != -1 && $oldprojectforbreak != $projectstatic->id))
 				{
-                    $addcolspan = 0;
-                    if (!empty($arrayfields['t.planned_workload']['checked'])) $addcolspan++;
-                    if (!empty($arrayfields['t.progress']['checked'])) $addcolspan++;
-                    foreach ($arrayfields as $key => $val)
-                    {
-                        if ($val['checked'] && substr($key, 0, 5) == 'efpt.') $addcolspan++;
-                    }
+					$addcolspan = 0;
+					if (!empty($arrayfields['t.planned_workload']['checked'])) $addcolspan++;
+					if (!empty($arrayfields['t.progress']['checked'])) $addcolspan++;
+					foreach ($arrayfields as $key => $val)
+					{
+						if ($val['checked'] && substr($key, 0, 5) == 'efpt.') $addcolspan++;
+					}
 
 					print '<tr class="oddeven trforbreak nobold">'."\n";
 					print '<td colspan="'.(7 + $addcolspan).'">';
@@ -1226,17 +1226,17 @@ function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsr
 				// Project
 				if (!empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT))
 				{
-				    print "<td>";
-				    if ($oldprojectforbreak == -1) print $projectstatic->getNomUrl(1, '', 0, $langs->transnoentitiesnoconv("YourRole").': '.$projectsrole[$lines[$i]->fk_project]);
-				    print "</td>";
+					print "<td>";
+					if ($oldprojectforbreak == -1) print $projectstatic->getNomUrl(1, '', 0, $langs->transnoentitiesnoconv("YourRole").': '.$projectsrole[$lines[$i]->fk_project]);
+					print "</td>";
 				}
 
 				// Thirdparty
 				if (!empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT))
 				{
-				    print '<td class="tdoverflowmax100">';
-				    if ($thirdpartystatic->id > 0) print $thirdpartystatic->getNomUrl(1, 'project', 10);
-				    print '</td>';
+					print '<td class="tdoverflowmax100">';
+					if ($thirdpartystatic->id > 0) print $thirdpartystatic->getNomUrl(1, 'project', 10);
+					print '</td>';
 				}
 
 				// Ref
@@ -1250,27 +1250,27 @@ function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsr
 				for ($k = 0; $k < $level; $k++) print "</div>";
 				print "</td>\n";
 
-                // TASK extrafields
-                $extrafieldsobjectkey = 'projet_task';
-                $extrafieldsobjectprefix = 'efpt.';
-                include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
+				// TASK extrafields
+				$extrafieldsobjectkey = 'projet_task';
+				$extrafieldsobjectprefix = 'efpt.';
+				include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 
-                // Planned Workload
-                if (!empty($arrayfields['t.planned_workload']['checked']))
-                {
-                    print '<td class="leftborder plannedworkload right">';
-				    if ($lines[$i]->planned_workload) print convertSecondToTime($lines[$i]->planned_workload, 'allhourmin');
-				    else print '--:--';
-				    print '</td>';
-                }
+				// Planned Workload
+				if (!empty($arrayfields['t.planned_workload']['checked']))
+				{
+					print '<td class="leftborder plannedworkload right">';
+					if ($lines[$i]->planned_workload) print convertSecondToTime($lines[$i]->planned_workload, 'allhourmin');
+					else print '--:--';
+					print '</td>';
+				}
 
 				// Progress declared %
-                if (!empty($arrayfields['t.progress']['checked']))
-                {
-                    print '<td class="right">';
-				    print $formother->select_percent($lines[$i]->progress, $lines[$i]->id.'progress');
-				    print '</td>';
-                }
+				if (!empty($arrayfields['t.progress']['checked']))
+				{
+					print '<td class="right">';
+					print $formother->select_percent($lines[$i]->progress, $lines[$i]->id.'progress');
+					print '</td>';
+				}
 
 				// Time spent by everybody
 				print '<td class="right">';
@@ -1439,7 +1439,7 @@ function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$
 	{
 		for ($i = 0; $i < $numlines; $i++)
 		{
-		    if ($lines[$i]->fk_task_parent) $lineswithoutlevel0[] = $lines[$i];
+			if ($lines[$i]->fk_task_parent) $lineswithoutlevel0[] = $lines[$i];
 		}
 	}
 
@@ -1456,7 +1456,7 @@ function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$
 
 		if ($lines[$i]->fk_task_parent == $parent)
 		{
-            $obj = &$lines[$i]; // To display extrafields
+			$obj = &$lines[$i]; // To display extrafields
 
 			// If we want all or we have a role on task, we show it
 			if (empty($mine) || !empty($tasksrole[$lines[$i]->id]))
@@ -1503,13 +1503,13 @@ function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$
 
 				if (empty($oldprojectforbreak) || ($oldprojectforbreak != -1 && $oldprojectforbreak != $projectstatic->id))
 				{
-                    $addcolspan = 0;
-                    if (!empty($arrayfields['t.planned_workload']['checked'])) $addcolspan++;
-                    if (!empty($arrayfields['t.progress']['checked'])) $addcolspan++;
-                    foreach ($arrayfields as $key => $val)
-                    {
-                        if ($val['checked'] && substr($key, 0, 5) == 'efpt.') $addcolspan++;
-                    }
+					$addcolspan = 0;
+					if (!empty($arrayfields['t.planned_workload']['checked'])) $addcolspan++;
+					if (!empty($arrayfields['t.progress']['checked'])) $addcolspan++;
+					foreach ($arrayfields as $key => $val)
+					{
+						if ($val['checked'] && substr($key, 0, 5) == 'efpt.') $addcolspan++;
+					}
 
 					print '<tr class="oddeven trforbreak nobold">'."\n";
 					print '<td colspan="'.(11 + $addcolspan).'">';
@@ -1521,7 +1521,7 @@ function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$
 						print '<span class="secondary">'.$projectstatic->title.'</span>';
 					}
 
-                    /*$colspan=5+(empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)?0:2);
+					/*$colspan=5+(empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)?0:2);
 					print '<table class="">';
 
 					print '<tr class="liste_titre">';
@@ -1599,17 +1599,17 @@ function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$
 				// Project
 				if (!empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT))
 				{
-    				print '<td class="nowrap">';
-    				if ($oldprojectforbreak == -1) print $projectstatic->getNomUrl(1, '', 0, $langs->transnoentitiesnoconv("YourRole").': '.$projectsrole[$lines[$i]->fk_project]);
-    				print "</td>";
+					print '<td class="nowrap">';
+					if ($oldprojectforbreak == -1) print $projectstatic->getNomUrl(1, '', 0, $langs->transnoentitiesnoconv("YourRole").': '.$projectsrole[$lines[$i]->fk_project]);
+					print "</td>";
 				}
 
 				// Thirdparty
 				if (!empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT))
 				{
-				    print '<td class="tdoverflowmax100">';
-				    if ($thirdpartystatic->id > 0) print $thirdpartystatic->getNomUrl(1, 'project');
-				    print '</td>';
+					print '<td class="tdoverflowmax100">';
+					if ($thirdpartystatic->id > 0) print $thirdpartystatic->getNomUrl(1, 'project');
+					print '</td>';
 				}
 
 				// Ref
@@ -1624,26 +1624,26 @@ function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$
 				print "</td>\n";
 
 				// TASK extrafields
-                $extrafieldsobjectkey = 'projet_task';
-                $extrafieldsobjectprefix = 'efpt.';
-                include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
+				$extrafieldsobjectkey = 'projet_task';
+				$extrafieldsobjectprefix = 'efpt.';
+				include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 
-                // Planned Workload
-                if (!empty($arrayfields['t.planned_workload']['checked']))
-                {
-    				print '<td class="leftborder plannedworkload right">';
-    				if ($lines[$i]->planned_workload) print convertSecondToTime($lines[$i]->planned_workload, 'allhourmin');
-    				else print '--:--';
-    				print '</td>';
-                }
+				// Planned Workload
+				if (!empty($arrayfields['t.planned_workload']['checked']))
+				{
+					print '<td class="leftborder plannedworkload right">';
+					if ($lines[$i]->planned_workload) print convertSecondToTime($lines[$i]->planned_workload, 'allhourmin');
+					else print '--:--';
+					print '</td>';
+				}
 
-                if (!empty($arrayfields['t.progress']['checked']))
-                {
-                    // Progress declared %
-    				print '<td class="right">';
-    				print $formother->select_percent($lines[$i]->progress, $lines[$i]->id.'progress');
-    				print '</td>';
-                }
+				if (!empty($arrayfields['t.progress']['checked']))
+				{
+					// Progress declared %
+					print '<td class="right">';
+					print $formother->select_percent($lines[$i]->progress, $lines[$i]->id.'progress');
+					print '</td>';
+				}
 
 				// Time spent by everybody
 				print '<td class="right">';
@@ -2182,7 +2182,7 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks
 	$resql = $db->query($sql2);
 	if ($resql)
 	{
-	    $total_task = 0;
+		$total_task = 0;
 		$total_opp_amount = 0;
 		$ponderated_opp_amount = 0;
 
@@ -2377,117 +2377,117 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks
  */
 function getTaskProgressView($task, $label = true, $progressNumber = true, $hideOnProgressNull = false, $spaced = false)
 {
-    global $langs, $conf;
+	global $langs, $conf;
 
-    $out = '';
+	$out = '';
 
-    $plannedworkloadoutputformat = 'allhourmin';
-    $timespentoutputformat = 'allhourmin';
-    if (!empty($conf->global->PROJECT_PLANNED_WORKLOAD_FORMAT)) $plannedworkloadoutputformat = $conf->global->PROJECT_PLANNED_WORKLOAD_FORMAT;
-    if (!empty($conf->global->PROJECT_TIMES_SPENT_FORMAT)) $timespentoutputformat = $conf->global->PROJECT_TIME_SPENT_FORMAT;
+	$plannedworkloadoutputformat = 'allhourmin';
+	$timespentoutputformat = 'allhourmin';
+	if (!empty($conf->global->PROJECT_PLANNED_WORKLOAD_FORMAT)) $plannedworkloadoutputformat = $conf->global->PROJECT_PLANNED_WORKLOAD_FORMAT;
+	if (!empty($conf->global->PROJECT_TIMES_SPENT_FORMAT)) $timespentoutputformat = $conf->global->PROJECT_TIME_SPENT_FORMAT;
 
-    if (empty($task->progress) && !empty($hideOnProgressNull)) {
-        return '';
-    }
+	if (empty($task->progress) && !empty($hideOnProgressNull)) {
+		return '';
+	}
 
-    $spaced = !empty($spaced) ? 'spaced' : '';
+	$spaced = !empty($spaced) ? 'spaced' : '';
 
-    $diff = '';
+	$diff = '';
 
-    // define progress color according to time spend vs workload
-    $progressBarClass = 'progress-bar-info';
-    if ($task->planned_workload) {
-        $progressCalculated = round(100 * doubleval($task->duration_effective) / doubleval($task->planned_workload), 2);
+	// define progress color according to time spend vs workload
+	$progressBarClass = 'progress-bar-info';
+	if ($task->planned_workload) {
+		$progressCalculated = round(100 * doubleval($task->duration_effective) / doubleval($task->planned_workload), 2);
 
-        // this conf is actually hidden, by default we use 10% for "be carefull or warning"
-        $warningRatio = !empty($conf->global->PROJECT_TIME_SPEND_WARNING_PERCENT) ? (1 + $conf->global->PROJECT_TIME_SPEND_WARNING_PERCENT / 100) : 1.10;
+		// this conf is actually hidden, by default we use 10% for "be carefull or warning"
+		$warningRatio = !empty($conf->global->PROJECT_TIME_SPEND_WARNING_PERCENT) ? (1 + $conf->global->PROJECT_TIME_SPEND_WARNING_PERCENT / 100) : 1.10;
 
-        $diffTitle = '<br/>'.$langs->trans('ProgressDeclared').' : '.$task->progress.($task->progress ? '%' : '');
-        $diffTitle .= '<br/>'.$langs->trans('ProgressCalculated').' : '.$progressCalculated.($progressCalculated ? '%' : '');
+		$diffTitle = '<br/>'.$langs->trans('ProgressDeclared').' : '.$task->progress.($task->progress ? '%' : '');
+		$diffTitle .= '<br/>'.$langs->trans('ProgressCalculated').' : '.$progressCalculated.($progressCalculated ? '%' : '');
 
-        //var_dump($progressCalculated.' '.$warningRatio.' '.$task->progress.' '.doubleval($task->progress * $warningRatio));
-        if (doubleval($progressCalculated) > doubleval($task->progress * $warningRatio)) {
-            $progressBarClass = 'progress-bar-danger';
-            $title = $langs->trans('TheReportedProgressIsLessThanTheCalculatedProgressionByX', abs($task->progress - $progressCalculated).' '.$langs->trans("point"));
-            $diff = '<span class="text-danger classfortooltip paddingrightonly" title="'.dol_htmlentities($title.$diffTitle).'" ><i class="fa fa-caret-down"></i> '.($task->progress - $progressCalculated).'%</span>';
-        } elseif (doubleval($progressCalculated) > doubleval($task->progress)) { // warning if close at 10%
-            $progressBarClass = 'progress-bar-warning';
-            $title = $langs->trans('TheReportedProgressIsLessThanTheCalculatedProgressionByX', abs($task->progress - $progressCalculated).' '.$langs->trans("point"));
-            $diff = '<span class="text-warning classfortooltip paddingrightonly" title="'.dol_htmlentities($title.$diffTitle).'" ><i class="fa fa-caret-left"></i> '.($task->progress - $progressCalculated).'%</span>';
-        } else {
-            $progressBarClass = 'progress-bar-success';
-            $title = $langs->trans('TheReportedProgressIsMoreThanTheCalculatedProgressionByX', ($task->progress - $progressCalculated).' '.$langs->trans("point"));
-            $diff = '<span class="text-success classfortooltip paddingrightonly" title="'.dol_htmlentities($title.$diffTitle).'" ><i class="fa fa-caret-up"></i> '.($task->progress - $progressCalculated).'%</span>';
-        }
-    }
+		//var_dump($progressCalculated.' '.$warningRatio.' '.$task->progress.' '.doubleval($task->progress * $warningRatio));
+		if (doubleval($progressCalculated) > doubleval($task->progress * $warningRatio)) {
+			$progressBarClass = 'progress-bar-danger';
+			$title = $langs->trans('TheReportedProgressIsLessThanTheCalculatedProgressionByX', abs($task->progress - $progressCalculated).' '.$langs->trans("point"));
+			$diff = '<span class="text-danger classfortooltip paddingrightonly" title="'.dol_htmlentities($title.$diffTitle).'" ><i class="fa fa-caret-down"></i> '.($task->progress - $progressCalculated).'%</span>';
+		} elseif (doubleval($progressCalculated) > doubleval($task->progress)) { // warning if close at 10%
+			$progressBarClass = 'progress-bar-warning';
+			$title = $langs->trans('TheReportedProgressIsLessThanTheCalculatedProgressionByX', abs($task->progress - $progressCalculated).' '.$langs->trans("point"));
+			$diff = '<span class="text-warning classfortooltip paddingrightonly" title="'.dol_htmlentities($title.$diffTitle).'" ><i class="fa fa-caret-left"></i> '.($task->progress - $progressCalculated).'%</span>';
+		} else {
+			$progressBarClass = 'progress-bar-success';
+			$title = $langs->trans('TheReportedProgressIsMoreThanTheCalculatedProgressionByX', ($task->progress - $progressCalculated).' '.$langs->trans("point"));
+			$diff = '<span class="text-success classfortooltip paddingrightonly" title="'.dol_htmlentities($title.$diffTitle).'" ><i class="fa fa-caret-up"></i> '.($task->progress - $progressCalculated).'%</span>';
+		}
+	}
 
-    $out .= '<div class="progress-group">';
+	$out .= '<div class="progress-group">';
 
-    if ($label !== false)
-    {
-        $out .= '    <span class="progress-text">';
+	if ($label !== false)
+	{
+		$out .= '    <span class="progress-text">';
 
-        if ($label !== true) {
-            $out .= $label; // replace label by param
-        } else {
-            $out .= $task->getNomUrl(1).' '.dol_htmlentities($task->label);
-        }
-        $out .= '    </span>';
-    }
+		if ($label !== true) {
+			$out .= $label; // replace label by param
+		} else {
+			$out .= $task->getNomUrl(1).' '.dol_htmlentities($task->label);
+		}
+		$out .= '    </span>';
+	}
 
 
-    if ($progressNumber !== false)
-    {
-        $out .= '    <span class="progress-number">';
-        if ($progressNumber !== true) {
-            $out .= $progressNumber; // replace label by param
-        } else {
-            if ($task->hasDelay()) $out .= img_warning($langs->trans("Late")).' ';
+	if ($progressNumber !== false)
+	{
+		$out .= '    <span class="progress-number">';
+		if ($progressNumber !== true) {
+			$out .= $progressNumber; // replace label by param
+		} else {
+			if ($task->hasDelay()) $out .= img_warning($langs->trans("Late")).' ';
 
 			$url = DOL_URL_ROOT.'/projet/tasks/time.php?id='.$task->id;
 
-            $out .= !empty($diff) ? $diff.' ' : '';
+			$out .= !empty($diff) ? $diff.' ' : '';
 			$out .= '<a href="'.$url.'" >';
-            $out .= '<b title="'.$langs->trans('TimeSpent').'" >';
-            if ($task->duration_effective) $out .= convertSecondToTime($task->duration_effective, $timespentoutputformat);
-            else $out .= '--:--';
-            $out .= '</b>';
+			$out .= '<b title="'.$langs->trans('TimeSpent').'" >';
+			if ($task->duration_effective) $out .= convertSecondToTime($task->duration_effective, $timespentoutputformat);
+			else $out .= '--:--';
+			$out .= '</b>';
 			$out .= '</a>';
 
-            $out .= ' / ';
+			$out .= ' / ';
 
 			$out .= '<a href="'.$url.'" >';
-            $out .= '<span title="'.$langs->trans('PlannedWorkload').'" >';
-            if ($task->planned_workload) $out .= convertSecondToTime($task->planned_workload, $plannedworkloadoutputformat);
-            else $out .= '--:--';
+			$out .= '<span title="'.$langs->trans('PlannedWorkload').'" >';
+			if ($task->planned_workload) $out .= convertSecondToTime($task->planned_workload, $plannedworkloadoutputformat);
+			else $out .= '--:--';
 			$out .= '</a>';
-        }
-        $out .= '    </span>';
-    }
+		}
+		$out .= '    </span>';
+	}
 
 
-    $out .= '</span>';
-    $out .= '    <div class="progress sm '.$spaced.'">';
-    $diffval = doubleval($task->progress) - doubleval($progressCalculated);
-    if ($diffval >= 0) {
-    	// good
-    	$out .= '        <div class="progress-bar '.$progressBarClass.'" style="width: '.doubleval($task->progress).'%" title="'.doubleval($task->progress).'%">';
-    	if (!empty($task->progress)) {
+	$out .= '</span>';
+	$out .= '    <div class="progress sm '.$spaced.'">';
+	$diffval = doubleval($task->progress) - doubleval($progressCalculated);
+	if ($diffval >= 0) {
+		// good
+		$out .= '        <div class="progress-bar '.$progressBarClass.'" style="width: '.doubleval($task->progress).'%" title="'.doubleval($task->progress).'%">';
+		if (!empty($task->progress)) {
 			$out .= '        <div class="progress-bar progress-bar-consumed" style="width: '.doubleval($progressCalculated / $task->progress * 100).'%" title="'.doubleval($progressCalculated).'%"></div>';
 		}
-    	$out .= '        </div>';
-    } else {
-    	// bad
-    	$out .= '        <div class="progress-bar progress-bar-consumed" style="width: '.doubleval($progressCalculated).'%" title="'.doubleval($progressCalculated).'%">';
-    	$out .= '        <div class="progress-bar '.$progressBarClass.'" style="width: '.($task->progress ? doubleval($task->progress / $progressCalculated * 100).'%' : '1px').'" title="'.doubleval($task->progress).'%"></div>';
-    	$out .= '        </div>';
-    }
-    $out .= '    </div>';
-    $out .= '</div>';
+		$out .= '        </div>';
+	} else {
+		// bad
+		$out .= '        <div class="progress-bar progress-bar-consumed" style="width: '.doubleval($progressCalculated).'%" title="'.doubleval($progressCalculated).'%">';
+		$out .= '        <div class="progress-bar '.$progressBarClass.'" style="width: '.($task->progress ? doubleval($task->progress / $progressCalculated * 100).'%' : '1px').'" title="'.doubleval($task->progress).'%"></div>';
+		$out .= '        </div>';
+	}
+	$out .= '    </div>';
+	$out .= '</div>';
 
 
 
-    return $out;
+	return $out;
 }
 /**
  * @param   Task    $task       the task object
@@ -2498,48 +2498,48 @@ function getTaskProgressView($task, $label = true, $progressNumber = true, $hide
  */
 function getTaskProgressBadge($task, $label = '', $tooltip = '')
 {
-    global $conf, $langs;
+	global $conf, $langs;
 
-    $out = '';
-    $badgeClass = '';
-    if ($task->progress != '')
-    {
-        // TODO : manage 100%
+	$out = '';
+	$badgeClass = '';
+	if ($task->progress != '')
+	{
+		// TODO : manage 100%
 
-        // define color according to time spend vs workload
-        $badgeClass = 'badge ';
-        if ($task->planned_workload) {
-            $progressCalculated = round(100 * doubleval($task->duration_effective) / doubleval($task->planned_workload), 2);
+		// define color according to time spend vs workload
+		$badgeClass = 'badge ';
+		if ($task->planned_workload) {
+			$progressCalculated = round(100 * doubleval($task->duration_effective) / doubleval($task->planned_workload), 2);
 
-            // this conf is actually hidden, by default we use 10% for "be carefull or warning"
-            $warningRatio = !empty($conf->global->PROJECT_TIME_SPEND_WARNING_PERCENT) ? (1 + $conf->global->PROJECT_TIME_SPEND_WARNING_PERCENT / 100) : 1.10;
+			// this conf is actually hidden, by default we use 10% for "be carefull or warning"
+			$warningRatio = !empty($conf->global->PROJECT_TIME_SPEND_WARNING_PERCENT) ? (1 + $conf->global->PROJECT_TIME_SPEND_WARNING_PERCENT / 100) : 1.10;
 
-            if (doubleval($progressCalculated) > doubleval($task->progress * $warningRatio)) {
-                $badgeClass .= 'badge-danger';
-                if (empty($tooltip)) $tooltip = $task->progress.'% < '.$langs->trans("Expected").' '.$progressCalculated.'%';
-            } elseif (doubleval($progressCalculated) > doubleval($task->progress)) { // warning if close at 10%
-                $badgeClass .= 'badge-warning';
-                if (empty($tooltip)) $tooltip = $task->progress.'% < '.$langs->trans("Expected").' '.$progressCalculated.'%';
-            } else {
-                $badgeClass .= 'badge-success';
-                if (empty($tooltip)) $tooltip = $task->progress.'% >= '.$langs->trans("Expected").' '.$progressCalculated.'%';
-            }
-        }
-    }
+			if (doubleval($progressCalculated) > doubleval($task->progress * $warningRatio)) {
+				$badgeClass .= 'badge-danger';
+				if (empty($tooltip)) $tooltip = $task->progress.'% < '.$langs->trans("Expected").' '.$progressCalculated.'%';
+			} elseif (doubleval($progressCalculated) > doubleval($task->progress)) { // warning if close at 10%
+				$badgeClass .= 'badge-warning';
+				if (empty($tooltip)) $tooltip = $task->progress.'% < '.$langs->trans("Expected").' '.$progressCalculated.'%';
+			} else {
+				$badgeClass .= 'badge-success';
+				if (empty($tooltip)) $tooltip = $task->progress.'% >= '.$langs->trans("Expected").' '.$progressCalculated.'%';
+			}
+		}
+	}
 
-    $title = '';
-    if (!empty($tooltip)) {
-        $badgeClass .= ' classfortooltip';
-        $title = 'title="'.dol_htmlentities($tooltip).'"';
-    }
+	$title = '';
+	if (!empty($tooltip)) {
+		$badgeClass .= ' classfortooltip';
+		$title = 'title="'.dol_htmlentities($tooltip).'"';
+	}
 
-    if (empty($label)) {
-        $label = $task->progress.' %';
-    }
+	if (empty($label)) {
+		$label = $task->progress.' %';
+	}
 
-    if (!empty($label)) {
-        $out = '<span class="'.$badgeClass.'" '.$title.' >'.$label.'</span>';
-    }
+	if (!empty($label)) {
+		$out = '<span class="'.$badgeClass.'" '.$title.' >'.$label.'</span>';
+	}
 
-    return $out;
+	return $out;
 }
diff --git a/htdocs/core/lib/propal.lib.php b/htdocs/core/lib/propal.lib.php
index ef41614116f..bd3a30151da 100644
--- a/htdocs/core/lib/propal.lib.php
+++ b/htdocs/core/lib/propal.lib.php
@@ -43,7 +43,7 @@ function propal_prepare_head($object)
 	$h++;
 
 	if ((empty($conf->commande->enabled) && ((!empty($conf->expedition->enabled) && !empty($conf->expedition_bon->enabled) && $user->rights->expedition->lire)
-	    || (!empty($conf->expedition->enabled) && !empty($conf->delivery_note->enabled) && $user->rights->expedition->delivery->lire))))
+		|| (!empty($conf->expedition->enabled) && !empty($conf->delivery_note->enabled) && $user->rights->expedition->delivery->lire))))
 	{
 		$langs->load("sendings");
 		$text = '';
@@ -57,7 +57,7 @@ function propal_prepare_head($object)
 
 	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
 	{
-	    $nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external'));
+		$nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external'));
 		$head[$h][0] = DOL_URL_ROOT.'/comm/propal/contact.php?id='.$object->id;
 		$head[$h][1] = $langs->trans('ContactsAddresses');
 		if ($nbContact > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';
@@ -65,29 +65,29 @@ function propal_prepare_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);   												to remove a tab
-    complete_head_from_modules($conf, $langs, $object, $head, $h, 'propal');
+	// 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, 'propal');
 
-    if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
-    {
-    	$nbNote = 0;
-        if (!empty($object->note_private)) $nbNote++;
+	if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
+	{
+		$nbNote = 0;
+		if (!empty($object->note_private)) $nbNote++;
 		if (!empty($object->note_public)) $nbNote++;
-	    $head[$h][0] = DOL_URL_ROOT.'/comm/propal/note.php?id='.$object->id;
+		$head[$h][0] = DOL_URL_ROOT.'/comm/propal/note.php?id='.$object->id;
 		$head[$h][1] = $langs->trans('Notes');
 		if ($nbNote > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
 		$head[$h][2] = 'note';
 		$h++;
-    }
+	}
 
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-    require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-    $upload_dir = $conf->propal->multidir_output[$object->entity]."/".dol_sanitizeFileName($object->ref);
+	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
+	$upload_dir = $conf->propal->multidir_output[$object->entity]."/".dol_sanitizeFileName($object->ref);
 	$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
-    $nbLinks = Link::count($db, $object->element, $object->id);
+	$nbLinks = Link::count($db, $object->element, $object->id);
 	$head[$h][0] = DOL_URL_ROOT.'/comm/propal/document.php?id='.$object->id;
 	$head[$h][1] = $langs->trans('Documents');
 	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
@@ -129,13 +129,13 @@ function propal_admin_prepare_head()
 
 	$head[$h][0] = DOL_URL_ROOT.'/comm/admin/propal_extrafields.php';
 	$head[$h][1] = $langs->trans("ExtraFields");
-    $head[$h][2] = 'attributes';
-    $h++;
+	$head[$h][2] = 'attributes';
+	$h++;
 
-    $head[$h][0] = DOL_URL_ROOT.'/comm/admin/propaldet_extrafields.php';
-    $head[$h][1] = $langs->trans("ExtraFieldsLines");
-    $head[$h][2] = 'attributeslines';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT.'/comm/admin/propaldet_extrafields.php';
+	$head[$h][1] = $langs->trans("ExtraFieldsLines");
+	$head[$h][2] = 'attributeslines';
+	$h++;
 
 	complete_head_from_modules($conf, $langs, null, $head, $h, 'propal_admin', 'remove');
 
diff --git a/htdocs/core/lib/report.lib.php b/htdocs/core/lib/report.lib.php
index 385c22146b9..b23acd76a5b 100644
--- a/htdocs/core/lib/report.lib.php
+++ b/htdocs/core/lib/report.lib.php
@@ -115,7 +115,7 @@ function report_header($reportname, $notused, $period, $periodlink, $description
 
 	print '</table>'."\n";
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div class="center"><input type="submit" class="button" name="submit" value="'.$langs->trans("Refresh").'"></div>';
 
diff --git a/htdocs/core/lib/security.lib.php b/htdocs/core/lib/security.lib.php
index cd4bc333b41..3df92993091 100644
--- a/htdocs/core/lib/security.lib.php
+++ b/htdocs/core/lib/security.lib.php
@@ -644,13 +644,13 @@ function checkUserAccessToObject($user, $featuresarray, $objectid = 0, $tableand
  */
 function accessforbidden($message = '', $printheader = 1, $printfooter = 1, $showonlymessage = 0, $params = null)
 {
-    global $conf, $db, $user, $langs, $hookmanager;
-    if (!is_object($langs))
-    {
-        include_once DOL_DOCUMENT_ROOT.'/core/class/translate.class.php';
-        $langs = new Translate('', $conf);
-        $langs->setDefaultLang();
-    }
+	global $conf, $db, $user, $langs, $hookmanager;
+	if (!is_object($langs))
+	{
+		include_once DOL_DOCUMENT_ROOT.'/core/class/translate.class.php';
+		$langs = new Translate('', $conf);
+		$langs->setDefaultLang();
+	}
 
 	$langs->load("errors");
 
diff --git a/htdocs/core/lib/security2.lib.php b/htdocs/core/lib/security2.lib.php
index 60b01b567f4..fefe0aa19d5 100644
--- a/htdocs/core/lib/security2.lib.php
+++ b/htdocs/core/lib/security2.lib.php
@@ -34,10 +34,10 @@
  */
 function dol_getwebuser($mode)
 {
-    $t = '?';
-    if ($mode == 'user')  $t = getenv('APACHE_RUN_USER'); // $_ENV['APACHE_RUN_USER'] is empty
-    if ($mode == 'group') $t = getenv('APACHE_RUN_GROUP');
-    return $t;
+	$t = '?';
+	if ($mode == 'user')  $t = getenv('APACHE_RUN_USER'); // $_ENV['APACHE_RUN_USER'] is empty
+	if ($mode == 'group') $t = getenv('APACHE_RUN_GROUP');
+	return $t;
 }
 
 /**
@@ -53,64 +53,64 @@ function dol_getwebuser($mode)
 function checkLoginPassEntity($usertotest, $passwordtotest, $entitytotest, $authmode, $context = '')
 {
 	global $conf, $langs;
-    //global $dolauthmode;    // To return authentication finally used
+	//global $dolauthmode;    // To return authentication finally used
 
 	// Check parameters
 	if ($entitytotest == '') $entitytotest = 1;
 
-    dol_syslog("checkLoginPassEntity usertotest=".$usertotest." entitytotest=".$entitytotest." authmode=".join(',', $authmode));
+	dol_syslog("checkLoginPassEntity usertotest=".$usertotest." entitytotest=".$entitytotest." authmode=".join(',', $authmode));
 	$login = '';
 
 	// Validation of login/pass/entity with standard modules
 	if (empty($login))
 	{
-	    $test = true;
-    	foreach ($authmode as $mode)
-    	{
-    		if ($test && $mode && !$login)
-    		{
-    		    // Validation of login/pass/entity for mode $mode
-    		    $mode = trim($mode);
-        		$authfile = 'functions_'.$mode.'.php';
-        		$fullauthfile = '';
+		$test = true;
+		foreach ($authmode as $mode)
+		{
+			if ($test && $mode && !$login)
+			{
+				// Validation of login/pass/entity for mode $mode
+				$mode = trim($mode);
+				$authfile = 'functions_'.$mode.'.php';
+				$fullauthfile = '';
 
-    		    $dirlogin = array_merge(array("/core/login"), (array) $conf->modules_parts['login']);
-    		    foreach ($dirlogin as $reldir)
-    		    {
-    		        $dir = dol_buildpath($reldir, 0);
-    		        $newdir = dol_osencode($dir);
+				$dirlogin = array_merge(array("/core/login"), (array) $conf->modules_parts['login']);
+				foreach ($dirlogin as $reldir)
+				{
+					$dir = dol_buildpath($reldir, 0);
+					$newdir = dol_osencode($dir);
 
-    		        // Check if file found (do not use dol_is_file to avoid loading files.lib.php)
-    		        $tmpnewauthfile = $newdir.(preg_match('/\/$/', $newdir) ? '' : '/').$authfile;
-    		        if (is_file($tmpnewauthfile)) $fullauthfile = $tmpnewauthfile;
-    		    }
+					// Check if file found (do not use dol_is_file to avoid loading files.lib.php)
+					$tmpnewauthfile = $newdir.(preg_match('/\/$/', $newdir) ? '' : '/').$authfile;
+					if (is_file($tmpnewauthfile)) $fullauthfile = $tmpnewauthfile;
+				}
 
-    		    $result = false;
-    		    if ($fullauthfile) $result = include_once $fullauthfile;
-    			if ($fullauthfile && $result)
-    			{
-    				// Call function to check user/password
-    				$function = 'check_user_password_'.$mode;
-    				$login = call_user_func($function, $usertotest, $passwordtotest, $entitytotest, $context);
-    				if ($login && $login != '--bad-login-validity--')	// Login is successfull
-    				{
-    					$test = false; // To stop once at first login success
-    					$conf->authmode = $mode; // This properties is defined only when logged to say what mode was successfully used
-    					$dol_tz = GETPOST('tz');
-    					$dol_dst = GETPOST('dst');
-    					$dol_screenwidth = GETPOST('screenwidth');
-    					$dol_screenheight = GETPOST('screenheight');
-    				}
-    			} else {
-    				dol_syslog("Authentication KO - failed to load file '".$authfile."'", LOG_ERR);
-    				sleep(1);
-    				// Load translation files required by the page
-                    $langs->loadLangs(array('other', 'main', 'errors'));
+				$result = false;
+				if ($fullauthfile) $result = include_once $fullauthfile;
+				if ($fullauthfile && $result)
+				{
+					// Call function to check user/password
+					$function = 'check_user_password_'.$mode;
+					$login = call_user_func($function, $usertotest, $passwordtotest, $entitytotest, $context);
+					if ($login && $login != '--bad-login-validity--')	// Login is successfull
+					{
+						$test = false; // To stop once at first login success
+						$conf->authmode = $mode; // This properties is defined only when logged to say what mode was successfully used
+						$dol_tz = GETPOST('tz');
+						$dol_dst = GETPOST('dst');
+						$dol_screenwidth = GETPOST('screenwidth');
+						$dol_screenheight = GETPOST('screenheight');
+					}
+				} else {
+					dol_syslog("Authentication KO - failed to load file '".$authfile."'", LOG_ERR);
+					sleep(1);
+					// Load translation files required by the page
+					$langs->loadLangs(array('other', 'main', 'errors'));
 
-    				$_SESSION["dol_loginmesg"] = $langs->trans("ErrorFailedToLoadLoginFileForMode", $mode);
-    			}
-    		}
-    	}
+					$_SESSION["dol_loginmesg"] = $langs->trans("ErrorFailedToLoadLoginFileForMode", $mode);
+				}
+			}
+		}
 	}
 
 	return $login;
@@ -119,16 +119,16 @@ function checkLoginPassEntity($usertotest, $passwordtotest, $entitytotest, $auth
 
 if (!function_exists('dol_loginfunction'))
 {
-    /**
-     * Show Dolibarr default login page.
-     * Part of this code is also duplicated into main.inc.php::top_htmlhead
-     *
-     * @param       Translate   $langs      Lang object (must be initialized by a new).
-     * @param       Conf        $conf       Conf object
-     * @param       Societe     $mysoc      Company object
-     * @return      void
-     */
-    function dol_loginfunction($langs, $conf, $mysoc)
+	/**
+	 * Show Dolibarr default login page.
+	 * Part of this code is also duplicated into main.inc.php::top_htmlhead
+	 *
+	 * @param       Translate   $langs      Lang object (must be initialized by a new).
+	 * @param       Conf        $conf       Conf object
+	 * @param       Societe     $mysoc      Company object
+	 * @return      void
+	 */
+	function dol_loginfunction($langs, $conf, $mysoc)
 	{
 		global $dolibarr_main_demo, $dolibarr_main_force_https;
 		global $db, $hookmanager;
@@ -260,9 +260,9 @@ if (!function_exists('dol_loginfunction'))
 		$main_home = '';
 		if (!empty($conf->global->MAIN_HOME))
 		{
-		    $substitutionarray = getCommonSubstitutionArray($langs);
-		    complete_substitutions_array($substitutionarray, $langs);
-		    $texttoshow = make_substitutions($conf->global->MAIN_HOME, $substitutionarray, $langs);
+			$substitutionarray = getCommonSubstitutionArray($langs);
+			complete_substitutions_array($substitutionarray, $langs);
+			$texttoshow = make_substitutions($conf->global->MAIN_HOME, $substitutionarray, $langs);
 
 			$main_home = dol_htmlcleanlastbr($texttoshow);
 		}
@@ -450,15 +450,18 @@ function getRandomPassword($generic = false, $replaceambiguouschars = null, $len
 		{
 			$max = strlen($lowercase) - 1;
 			for ($x = 0; $x < $nbofchar; $x++) {
-				$randomCode .= $lowercase[random_int(0, $max)];
+				$tmp = random_int(0, $max);
+				$randomCode .= $lowercase[$tmp];
 			}
 			$max = strlen($uppercase) - 1;
 			for ($x = 0; $x < $nbofchar; $x++) {
-				$randomCode .= $uppercase[random_int(0, $max)];
+				$tmp = random_int(0, $max);
+				$randomCode .= $uppercase[$tmp];
 			}
 			$max = strlen($numbers) - 1;
 			for ($x = 0; $x < $nbofcharlast; $x++) {
-				$randomCode .= $numbers[random_int(0, $max)];
+				$tmp = random_int(0, $max);
+				$randomCode .= $numbers[$tmp];
 			}
 
 			$generated_password = str_shuffle($randomCode);
@@ -466,15 +469,18 @@ function getRandomPassword($generic = false, $replaceambiguouschars = null, $len
 		{
 			$max = strlen($lowercase) - 1;
 			for ($x = 0; $x < $nbofchar; $x++) {
-				$randomCode .= $lowercase[mt_rand(0, $max)];
+				$tmp = mt_rand(0, $max);
+				$randomCode .= $lowercase[$tmp];
 			}
 			$max = strlen($uppercase) - 1;
 			for ($x = 0; $x < $nbofchar; $x++) {
-				$randomCode .= $uppercase[mt_rand(0, $max)];
+				$tmp = mt_rand(0, $max);
+				$randomCode .= $uppercase[$tmp];
 			}
 			$max = strlen($numbers) - 1;
 			for ($x = 0; $x < $nbofcharlast; $x++) {
-				$randomCode .= $numbers[mt_rand(0, $max)];
+				$tmp = mt_rand(0, $max);
+				$randomCode .= $numbers[$tmp];
 			}
 
 			$generated_password = str_shuffle($randomCode);
@@ -495,11 +501,12 @@ function getRandomPassword($generic = false, $replaceambiguouschars = null, $len
 	{
 		$numbers = "ABCDEF";
 		$max = strlen($numbers) - 1;
-		if (function_exists('random_int'))	// Cryptographic random
-		{
-			$generated_password = str_replace($replaceambiguouschars, $numbers[random_int(0, $max)], $generated_password);
+		if (function_exists('random_int')) {	// Cryptographic random
+			$tmp = random_int(0, $max);
+			$generated_password = str_replace($replaceambiguouschars, $numbers[$tmp], $generated_password);
 		} else {
-			$generated_password = str_replace($replaceambiguouschars, $numbers[mt_rand(0, $max)], $generated_password);
+			$tmp = mt_rand(0, $max);
+			$generated_password = str_replace($replaceambiguouschars, $numbers[$tmp], $generated_password);
 		}
 	}
 
diff --git a/htdocs/core/lib/sendings.lib.php b/htdocs/core/lib/sendings.lib.php
index 81775bf8dbd..cf1d1793a88 100644
--- a/htdocs/core/lib/sendings.lib.php
+++ b/htdocs/core/lib/sendings.lib.php
@@ -37,7 +37,7 @@ function shipping_prepare_head($object)
 	global $db, $langs, $conf, $user;
 
 	// Load translation files required by the page
-    $langs->loadLangs(array("sendings", "deliveries"));
+	$langs->loadLangs(array("sendings", "deliveries"));
 
 	$h = 0;
 	$head = array();
@@ -53,8 +53,8 @@ function shipping_prepare_head($object)
 		$object->fetchObjectLinked($object->id, $object->element);
 		if (is_array($object->linkedObjectsIds['delivery']) && count($object->linkedObjectsIds['delivery']) > 0)        // If there is a delivery
 		{
-		    // Take first one element of array
-		    $tmp = reset($object->linkedObjectsIds['delivery']);
+			// Take first one element of array
+			$tmp = reset($object->linkedObjectsIds['delivery']);
 
 			$head[$h][0] = DOL_URL_ROOT."/delivery/card.php?id=".$tmp;
 			$head[$h][1] = $langs->trans("DeliveryCard");
@@ -65,34 +65,34 @@ function shipping_prepare_head($object)
 
 	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
 	{
-	    $objectsrc = $object;
-	    if ($object->origin == 'commande' && $object->origin_id > 0)
-	    {
-	        $objectsrc = new Commande($db);
-	        $objectsrc->fetch($object->origin_id);
-	    }
-	    $nbContact = count($objectsrc->liste_contact(-1, 'internal')) + count($objectsrc->liste_contact(-1, 'external'));
-	    $head[$h][0] = DOL_URL_ROOT."/expedition/contact.php?id=".$object->id;
-    	$head[$h][1] = $langs->trans("ContactsAddresses");
+		$objectsrc = $object;
+		if ($object->origin == 'commande' && $object->origin_id > 0)
+		{
+			$objectsrc = new Commande($db);
+			$objectsrc->fetch($object->origin_id);
+		}
+		$nbContact = count($objectsrc->liste_contact(-1, 'internal')) + count($objectsrc->liste_contact(-1, 'external'));
+		$head[$h][0] = DOL_URL_ROOT."/expedition/contact.php?id=".$object->id;
+		$head[$h][1] = $langs->trans("ContactsAddresses");
 		if ($nbContact > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';
-    	$head[$h][2] = 'contact';
-    	$h++;
+		$head[$h][2] = 'contact';
+		$h++;
 	}
 
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-    require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
 	$upload_dir = $conf->commande->dir_output."/".dol_sanitizeFileName($object->ref);
 	$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
-    $nbLinks = Link::count($db, $object->element, $object->id);
+	$nbLinks = Link::count($db, $object->element, $object->id);
 	$head[$h][0] = DOL_URL_ROOT.'/expedition/document.php?id='.$object->id;
 	$head[$h][1] = $langs->trans('Documents');
 	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
 	$head[$h][2] = 'documents';
 	$h++;
 
-    $nbNote = 0;
-    if (!empty($object->note_private)) $nbNote++;
-    if (!empty($object->note_public)) $nbNote++;
+	$nbNote = 0;
+	if (!empty($object->note_private)) $nbNote++;
+	if (!empty($object->note_public)) $nbNote++;
 	$head[$h][0] = DOL_URL_ROOT."/expedition/note.php?id=".$object->id;
 	$head[$h][1] = $langs->trans("Notes");
 	if ($nbNote > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
@@ -101,8 +101,8 @@ function shipping_prepare_head($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, 'delivery');
 
 	complete_head_from_modules($conf, $langs, $object, $head, $h, 'delivery', 'remove');
@@ -122,7 +122,7 @@ function delivery_prepare_head($object)
 	global $langs, $db, $conf, $user;
 
 	// Load translation files required by the page
-    $langs->loadLangs(array("sendings", "deliveries"));
+	$langs->loadLangs(array("sendings", "deliveries"));
 
 	$h = 0;
 	$head = array();
@@ -195,7 +195,7 @@ function delivery_prepare_head($object)
 
 	$object->id = $tmpobject->id;
 
-    complete_head_from_modules($conf, $langs, $object, $head, $h, 'delivery');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'delivery');
 
 	complete_head_from_modules($conf, $langs, $object, $head, $h, 'delivery', 'remove');
 
@@ -262,7 +262,7 @@ function show_list_sending_receive($origin, $origin_id, $filter = '')
 			print '<td class="center">'.$langs->trans("QtyPreparedOrShipped").'</td>';
 			if (!empty($conf->stock->enabled))
 			{
-                print '<td>'.$langs->trans("Warehouse").'</td>';
+				print '<td>'.$langs->trans("Warehouse").'</td>';
 			}
 			/*TODO Add link to expeditiondet_batch
 			if (! empty($conf->productbatch->enabled))
@@ -371,13 +371,13 @@ function show_list_sending_receive($origin, $origin_id, $filter = '')
 				// Warehouse
 				if (!empty($conf->stock->enabled))
 				{
-				    print '<td>';
-    				if ($objp->warehouse_id > 0)
-    				{
-        				$warehousestatic->fetch($objp->warehouse_id);
-        				print $warehousestatic->getNomUrl(1);
-    				}
-    				print '</td>';
+					print '<td>';
+					if ($objp->warehouse_id > 0)
+					{
+						$warehousestatic->fetch($objp->warehouse_id);
+						print $warehousestatic->getNomUrl(1);
+					}
+					print '</td>';
 				}
 
 				// Batch number managment
diff --git a/htdocs/core/lib/signature.lib.php b/htdocs/core/lib/signature.lib.php
index 37cb9b31e8d..14ca70926d3 100644
--- a/htdocs/core/lib/signature.lib.php
+++ b/htdocs/core/lib/signature.lib.php
@@ -29,7 +29,7 @@ function showOnlineSignatureUrl($type, $ref)
 	global $conf, $langs;
 
 	// Load translation files required by the page
-    $langs->loadLangs(array("payment", "paybox"));
+	$langs->loadLangs(array("payment", "paybox"));
 
 	$servicename = 'Online';
 
diff --git a/htdocs/core/lib/stock.lib.php b/htdocs/core/lib/stock.lib.php
index 0b9deb7779b..2d6768010fb 100644
--- a/htdocs/core/lib/stock.lib.php
+++ b/htdocs/core/lib/stock.lib.php
@@ -66,20 +66,20 @@ function stock_prepare_head($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
-    complete_head_from_modules($conf, $langs, $object, $head, $h, 'stock');
+	// 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, 'stock');
 
-    $head[$h][0] = DOL_URL_ROOT.'/product/stock/info.php?id='.$object->id;
+	$head[$h][0] = DOL_URL_ROOT.'/product/stock/info.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("Info");
 	$head[$h][2] = 'info';
 	$h++;
 
-    complete_head_from_modules($conf, $langs, $object, $head, $h, 'stock', 'remove');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'stock', 'remove');
 
-    return $head;
+	return $head;
 }
 
 /**
@@ -89,28 +89,28 @@ function stock_prepare_head($object)
  */
 function stock_admin_prepare_head()
 {
-    global $langs, $conf, $user;
+	global $langs, $conf, $user;
 
-    $h = 0;
-    $head = array();
+	$h = 0;
+	$head = array();
 
-    $head[$h][0] = DOL_URL_ROOT.'/admin/stock.php';
-    $head[$h][1] = $langs->trans("Miscellaneous");
-    $head[$h][2] = 'general';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT.'/admin/stock.php';
+	$head[$h][1] = $langs->trans("Miscellaneous");
+	$head[$h][2] = 'general';
+	$h++;
 
-    // Show more tabs from modules
-    // Entries must be declared in modules descriptor with line
-    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
-    // $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab
-    complete_head_from_modules($conf, $langs, null, $head, $h, 'stock_admin');
+	// 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, null, $head, $h, 'stock_admin');
 
-    $head[$h][0] = DOL_URL_ROOT.'/product/admin/stock_extrafields.php';
-    $head[$h][1] = $langs->trans("ExtraFields");
-    $head[$h][2] = 'attributes';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT.'/product/admin/stock_extrafields.php';
+	$head[$h][1] = $langs->trans("ExtraFields");
+	$head[$h][2] = 'attributes';
+	$h++;
 
-    complete_head_from_modules($conf, $langs, null, $head, $h, 'stock_admin', 'remove');
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'stock_admin', 'remove');
 
-    return $head;
+	return $head;
 }
diff --git a/htdocs/core/lib/supplier_proposal.lib.php b/htdocs/core/lib/supplier_proposal.lib.php
index ddc85616ba6..ec782350c9d 100644
--- a/htdocs/core/lib/supplier_proposal.lib.php
+++ b/htdocs/core/lib/supplier_proposal.lib.php
@@ -34,7 +34,7 @@ function supplier_proposal_prepare_head($object)
 	global $db, $langs, $conf, $user;
 
 	// Load translation files required by the page
-    $langs->loadLangs(array("supplier_proposal", "compta"));
+	$langs->loadLangs(array("supplier_proposal", "compta"));
 
 	$h = 0;
 	$head = array();
@@ -54,29 +54,29 @@ function supplier_proposal_prepare_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);   												to remove a tab
-    complete_head_from_modules($conf, $langs, $object, $head, $h, 'supplier_proposal');
+	// 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, 'supplier_proposal');
 
-    if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
-    {
-    	$nbNote = 0;
-        if (!empty($object->note_private)) $nbNote++;
+	if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
+	{
+		$nbNote = 0;
+		if (!empty($object->note_private)) $nbNote++;
 		if (!empty($object->note_public)) $nbNote++;
-	    $head[$h][0] = DOL_URL_ROOT.'/supplier_proposal/note.php?id='.$object->id;
+		$head[$h][0] = DOL_URL_ROOT.'/supplier_proposal/note.php?id='.$object->id;
 		$head[$h][1] = $langs->trans('Notes');
 		if ($nbNote > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
 		$head[$h][2] = 'note';
 		$h++;
-    }
+	}
 
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-    require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
 	$upload_dir = $conf->supplier_proposal->dir_output."/".dol_sanitizeFileName($object->ref);
 	$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
-    $nbLinks = Link::count($db, $object->element, $object->id);
+	$nbLinks = Link::count($db, $object->element, $object->id);
 	$head[$h][0] = DOL_URL_ROOT.'/supplier_proposal/document.php?id='.$object->id;
 	$head[$h][1] = $langs->trans('Documents');
 	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
@@ -118,13 +118,13 @@ function supplier_proposal_admin_prepare_head()
 
 	$head[$h][0] = DOL_URL_ROOT.'/supplier_proposal/admin/supplier_proposal_extrafields.php';
 	$head[$h][1] = $langs->trans("ExtraFields");
-    $head[$h][2] = 'attributes';
-    $h++;
+	$head[$h][2] = 'attributes';
+	$h++;
 
-    $head[$h][0] = DOL_URL_ROOT.'/supplier_proposal/admin/supplier_proposaldet_extrafields.php';
-    $head[$h][1] = $langs->trans("ExtraFieldsLines");
-    $head[$h][2] = 'attributeslines';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT.'/supplier_proposal/admin/supplier_proposaldet_extrafields.php';
+	$head[$h][1] = $langs->trans("ExtraFieldsLines");
+	$head[$h][2] = 'attributeslines';
+	$h++;
 
 	complete_head_from_modules($conf, $langs, null, $head, $h, 'supplier_proposal_admin', 'remove');
 
diff --git a/htdocs/core/lib/tax.lib.php b/htdocs/core/lib/tax.lib.php
index 3b261bd0814..36ce55f7c85 100644
--- a/htdocs/core/lib/tax.lib.php
+++ b/htdocs/core/lib/tax.lib.php
@@ -36,41 +36,41 @@
  */
 function tax_prepare_head(ChargeSociales $object)
 {
-    global $db, $langs, $conf, $user;
+	global $db, $langs, $conf, $user;
 
-    $h = 0;
-    $head = array();
+	$h = 0;
+	$head = array();
 
 	$head[$h][0] = DOL_URL_ROOT.'/compta/sociales/card.php?id='.$object->id;
 	$head[$h][1] = $langs->trans('SocialContribution');
 	$head[$h][2] = 'card';
 	$h++;
 
-    // Show more tabs from modules
-    // Entries must be declared in modules descriptor with line
-    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
-    // $this->tabs = array('entity:-tabname);   												to remove a tab
-    complete_head_from_modules($conf, $langs, $object, $head, $h, 'tax');
+	// 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, 'tax');
 
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-    require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
 	$upload_dir = $conf->tax->dir_output."/".dol_sanitizeFileName($object->ref);
 	$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
-    $nbLinks = Link::count($db, $object->element, $object->id);
+	$nbLinks = Link::count($db, $object->element, $object->id);
 	$head[$h][0] = DOL_URL_ROOT.'/compta/sociales/document.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("Documents");
 	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
 	$head[$h][2] = 'documents';
 	$h++;
 
-    $head[$h][0] = DOL_URL_ROOT.'/compta/sociales/info.php?id='.$object->id;
-    $head[$h][1] = $langs->trans("Info");
-    $head[$h][2] = 'info';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT.'/compta/sociales/info.php?id='.$object->id;
+	$head[$h][1] = $langs->trans("Info");
+	$head[$h][2] = 'info';
+	$h++;
 
-    complete_head_from_modules($conf, $langs, $object, $head, $h, 'tax', 'remove');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'tax', 'remove');
 
-    return $head;
+	return $head;
 }
 
 
@@ -90,438 +90,438 @@ function tax_prepare_head(ChargeSociales $object)
  */
 function tax_by_thirdparty($type, $db, $y, $date_start, $date_end, $modetax, $direction, $m = 0, $q = 0)
 {
-    global $conf;
+	global $conf;
 
-    // If we use date_start and date_end, we must not use $y, $m, $q
-    if (($date_start || $date_end) && (!empty($y) || !empty($m) || !empty($q)))
-    {
-    	dol_print_error('', 'Bad value of input parameter for tax_by_rate');
-    }
+	// If we use date_start and date_end, we must not use $y, $m, $q
+	if (($date_start || $date_end) && (!empty($y) || !empty($m) || !empty($q)))
+	{
+		dol_print_error('', 'Bad value of input parameter for tax_by_rate');
+	}
 
-    $list = array();
-    if ($direction == 'sell')
-    {
-    	$invoicetable = 'facture';
-    	$invoicedettable = 'facturedet';
-    	$fk_facture = 'fk_facture';
-    	$fk_facture2 = 'fk_facture';
-    	$fk_payment = 'fk_paiement';
-    	$total_tva = 'total_tva';
-    	$paymenttable = 'paiement';
-    	$paymentfacturetable = 'paiement_facture';
-    	$invoicefieldref = 'ref';
-    } elseif ($direction == 'buy')
-    {
-    	$invoicetable = 'facture_fourn';
-    	$invoicedettable = 'facture_fourn_det';
-    	$fk_facture = 'fk_facture_fourn';
-    	$fk_facture2 = 'fk_facturefourn';
-    	$fk_payment = 'fk_paiementfourn';
-    	$total_tva = 'tva';
-    	$paymenttable = 'paiementfourn';
-    	$paymentfacturetable = 'paiementfourn_facturefourn';
-    	$invoicefieldref = 'ref';
-    }
+	$list = array();
+	if ($direction == 'sell')
+	{
+		$invoicetable = 'facture';
+		$invoicedettable = 'facturedet';
+		$fk_facture = 'fk_facture';
+		$fk_facture2 = 'fk_facture';
+		$fk_payment = 'fk_paiement';
+		$total_tva = 'total_tva';
+		$paymenttable = 'paiement';
+		$paymentfacturetable = 'paiement_facture';
+		$invoicefieldref = 'ref';
+	} elseif ($direction == 'buy')
+	{
+		$invoicetable = 'facture_fourn';
+		$invoicedettable = 'facture_fourn_det';
+		$fk_facture = 'fk_facture_fourn';
+		$fk_facture2 = 'fk_facturefourn';
+		$fk_payment = 'fk_paiementfourn';
+		$total_tva = 'tva';
+		$paymenttable = 'paiementfourn';
+		$paymentfacturetable = 'paiementfourn_facturefourn';
+		$invoicefieldref = 'ref';
+	}
 
-    if (strpos($type, 'localtax') === 0) {
-    	$f_rate = $type.'_tx';
-    } else {
-    	$f_rate = 'tva_tx';
-    }
+	if (strpos($type, 'localtax') === 0) {
+		$f_rate = $type.'_tx';
+	} else {
+		$f_rate = 'tva_tx';
+	}
 
-    $total_localtax1 = 'total_localtax1';
-    $total_localtax2 = 'total_localtax2';
+	$total_localtax1 = 'total_localtax1';
+	$total_localtax2 = 'total_localtax2';
 
 
-    // CAS DES BIENS/PRODUITS
+	// CAS DES BIENS/PRODUITS
 
-    // Define sql request
-    $sql = '';
-    if (($direction == 'sell' && $conf->global->TAX_MODE_SELL_PRODUCT == 'invoice')
-    	|| ($direction == 'buy' && $conf->global->TAX_MODE_BUY_PRODUCT == 'invoice'))
-    {
-    	// Count on delivery date (use invoice date as delivery is unknown)
-    	$sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
-    	$sql .= " d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
-    	$sql .= " d.date_start as date_start, d.date_end as date_end,";
-    	$sql .= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,";
-    	$sql .= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";
-    	$sql .= " 0 as payment_id, 0 as payment_amount";
-    	$sql .= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
-    	$sql .= " ".MAIN_DB_PREFIX."societe as s,";
-    	$sql .= " ".MAIN_DB_PREFIX.$invoicedettable." as d";
-    	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
-    	$sql .= " WHERE f.entity IN (".getEntity($invoicetable).")";
-    	$sql .= " AND f.fk_statut in (1,2)"; // Validated or paid (partially or completely)
-    	if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql .= " AND f.type IN (0,1,2,5)";
-    	else $sql .= " AND f.type IN (0,1,2,3,5)";
-    	$sql .= " AND f.rowid = d.".$fk_facture;
-    	$sql .= " AND s.rowid = f.fk_soc";
-    	if ($y && $m)
-    	{
-    		$sql .= " AND f.datef >= '".$db->idate(dol_get_first_day($y, $m, false))."'";
-    		$sql .= " AND f.datef <= '".$db->idate(dol_get_last_day($y, $m, false))."'";
-    	} elseif ($y)
-    	{
-    		$sql .= " AND f.datef >= '".$db->idate(dol_get_first_day($y, 1, false))."'";
-    		$sql .= " AND f.datef <= '".$db->idate(dol_get_last_day($y, 12, false))."'";
-    	}
-    	if ($q) $sql .= " AND (date_format(f.datef,'%m') > ".(($q - 1) * 3)." AND date_format(f.datef,'%m') <= ".($q * 3).")";
-    	if ($date_start && $date_end) $sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
-    	$sql .= " AND (d.product_type = 0"; // Limit to products
-    	$sql .= " AND d.date_start is null AND d.date_end IS NULL)"; // enhance detection of products
-    	if (!empty($conf->global->MAIN_NOT_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
-    	$sql .= " ORDER BY d.rowid, d.".$fk_facture;
-    } else {
-    	// Count on payments date
-    	$sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
-    	$sql .= " d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
-    	$sql .= " d.date_start as date_start, d.date_end as date_end,";
-    	$sql .= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,";
-    	$sql .= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";
-    	$sql .= " pf.".$fk_payment." as payment_id, pf.amount as payment_amount,";
-    	$sql .= " pa.datep as datep";
-    	$sql .= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
-    	$sql .= " ".MAIN_DB_PREFIX.$paymentfacturetable." as pf,";
-    	$sql .= " ".MAIN_DB_PREFIX.$paymenttable." as pa,";
-    	$sql .= " ".MAIN_DB_PREFIX."societe as s,";
-    	$sql .= " ".MAIN_DB_PREFIX.$invoicedettable." as d";
-    	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
-    	$sql .= " WHERE f.entity IN (".getEntity($invoicetable).")";
-    	$sql .= " AND f.fk_statut in (1,2)"; // Paid (partially or completely)
-    	if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql .= " AND f.type IN (0,1,2,5)";
-    	else $sql .= " AND f.type IN (0,1,2,3,5)";
-    	$sql .= " AND f.rowid = d.".$fk_facture;
-    	$sql .= " AND s.rowid = f.fk_soc";
-    	$sql .= " AND pf.".$fk_facture2." = f.rowid";
-    	$sql .= " AND pa.rowid = pf.".$fk_payment;
-    	if ($y && $m)
-    	{
-    		$sql .= " AND pa.datep >= '".$db->idate(dol_get_first_day($y, $m, false))."'";
-    		$sql .= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, $m, false))."'";
-    	} elseif ($y)
-    	{
-    		$sql .= " AND pa.datep >= '".$db->idate(dol_get_first_day($y, 1, false))."'";
-    		$sql .= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, 12, false))."'";
-    	}
-    	if ($q) $sql .= " AND (date_format(pa.datep,'%m') > ".(($q - 1) * 3)." AND date_format(pa.datep,'%m') <= ".($q * 3).")";
-    	if ($date_start && $date_end) $sql .= " AND pa.datep >= '".$db->idate($date_start)."' AND pa.datep <= '".$db->idate($date_end)."'";
-    	$sql .= " AND (d.product_type = 0"; // Limit to products
-    	$sql .= " AND d.date_start is null AND d.date_end IS NULL)"; // enhance detection of products
-    	if (!empty($conf->global->MAIN_NOT_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
-    	$sql .= " ORDER BY d.rowid, d.".$fk_facture.", pf.rowid";
-    }
+	// Define sql request
+	$sql = '';
+	if (($direction == 'sell' && $conf->global->TAX_MODE_SELL_PRODUCT == 'invoice')
+		|| ($direction == 'buy' && $conf->global->TAX_MODE_BUY_PRODUCT == 'invoice'))
+	{
+		// Count on delivery date (use invoice date as delivery is unknown)
+		$sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
+		$sql .= " d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
+		$sql .= " d.date_start as date_start, d.date_end as date_end,";
+		$sql .= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,";
+		$sql .= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";
+		$sql .= " 0 as payment_id, 0 as payment_amount";
+		$sql .= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
+		$sql .= " ".MAIN_DB_PREFIX."societe as s,";
+		$sql .= " ".MAIN_DB_PREFIX.$invoicedettable." as d";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
+		$sql .= " WHERE f.entity IN (".getEntity($invoicetable).")";
+		$sql .= " AND f.fk_statut in (1,2)"; // Validated or paid (partially or completely)
+		if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql .= " AND f.type IN (0,1,2,5)";
+		else $sql .= " AND f.type IN (0,1,2,3,5)";
+		$sql .= " AND f.rowid = d.".$fk_facture;
+		$sql .= " AND s.rowid = f.fk_soc";
+		if ($y && $m)
+		{
+			$sql .= " AND f.datef >= '".$db->idate(dol_get_first_day($y, $m, false))."'";
+			$sql .= " AND f.datef <= '".$db->idate(dol_get_last_day($y, $m, false))."'";
+		} elseif ($y)
+		{
+			$sql .= " AND f.datef >= '".$db->idate(dol_get_first_day($y, 1, false))."'";
+			$sql .= " AND f.datef <= '".$db->idate(dol_get_last_day($y, 12, false))."'";
+		}
+		if ($q) $sql .= " AND (date_format(f.datef,'%m') > ".(($q - 1) * 3)." AND date_format(f.datef,'%m') <= ".($q * 3).")";
+		if ($date_start && $date_end) $sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
+		$sql .= " AND (d.product_type = 0"; // Limit to products
+		$sql .= " AND d.date_start is null AND d.date_end IS NULL)"; // enhance detection of products
+		if (!empty($conf->global->MAIN_NOT_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
+		$sql .= " ORDER BY d.rowid, d.".$fk_facture;
+	} else {
+		// Count on payments date
+		$sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
+		$sql .= " d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
+		$sql .= " d.date_start as date_start, d.date_end as date_end,";
+		$sql .= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,";
+		$sql .= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";
+		$sql .= " pf.".$fk_payment." as payment_id, pf.amount as payment_amount,";
+		$sql .= " pa.datep as datep";
+		$sql .= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
+		$sql .= " ".MAIN_DB_PREFIX.$paymentfacturetable." as pf,";
+		$sql .= " ".MAIN_DB_PREFIX.$paymenttable." as pa,";
+		$sql .= " ".MAIN_DB_PREFIX."societe as s,";
+		$sql .= " ".MAIN_DB_PREFIX.$invoicedettable." as d";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
+		$sql .= " WHERE f.entity IN (".getEntity($invoicetable).")";
+		$sql .= " AND f.fk_statut in (1,2)"; // Paid (partially or completely)
+		if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql .= " AND f.type IN (0,1,2,5)";
+		else $sql .= " AND f.type IN (0,1,2,3,5)";
+		$sql .= " AND f.rowid = d.".$fk_facture;
+		$sql .= " AND s.rowid = f.fk_soc";
+		$sql .= " AND pf.".$fk_facture2." = f.rowid";
+		$sql .= " AND pa.rowid = pf.".$fk_payment;
+		if ($y && $m)
+		{
+			$sql .= " AND pa.datep >= '".$db->idate(dol_get_first_day($y, $m, false))."'";
+			$sql .= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, $m, false))."'";
+		} elseif ($y)
+		{
+			$sql .= " AND pa.datep >= '".$db->idate(dol_get_first_day($y, 1, false))."'";
+			$sql .= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, 12, false))."'";
+		}
+		if ($q) $sql .= " AND (date_format(pa.datep,'%m') > ".(($q - 1) * 3)." AND date_format(pa.datep,'%m') <= ".($q * 3).")";
+		if ($date_start && $date_end) $sql .= " AND pa.datep >= '".$db->idate($date_start)."' AND pa.datep <= '".$db->idate($date_end)."'";
+		$sql .= " AND (d.product_type = 0"; // Limit to products
+		$sql .= " AND d.date_start is null AND d.date_end IS NULL)"; // enhance detection of products
+		if (!empty($conf->global->MAIN_NOT_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
+		$sql .= " ORDER BY d.rowid, d.".$fk_facture.", pf.rowid";
+	}
 
-    if (!$sql) return -1;
-    if ($sql == 'TODO') return -2;
-    if ($sql != 'TODO')
-    {
-    	dol_syslog("Tax.lib.php::tax_by_thirdparty", LOG_DEBUG);
+	if (!$sql) return -1;
+	if ($sql == 'TODO') return -2;
+	if ($sql != 'TODO')
+	{
+		dol_syslog("Tax.lib.php::tax_by_thirdparty", LOG_DEBUG);
 
-    	$resql = $db->query($sql);
-    	if ($resql)
-    	{
-    		$company_id = -1;
-    		$oldrowid = '';
-    		while ($assoc = $db->fetch_array($resql))
-    		{
-    			if (!isset($list[$assoc['company_id']]['totalht']))  $list[$assoc['company_id']]['totalht'] = 0;
-    			if (!isset($list[$assoc['company_id']]['vat']))      $list[$assoc['company_id']]['vat'] = 0;
-    			if (!isset($list[$assoc['company_id']]['localtax1']))      $list[$assoc['company_id']]['localtax1'] = 0;
-    			if (!isset($list[$assoc['company_id']]['localtax2']))      $list[$assoc['company_id']]['localtax2'] = 0;
+		$resql = $db->query($sql);
+		if ($resql)
+		{
+			$company_id = -1;
+			$oldrowid = '';
+			while ($assoc = $db->fetch_array($resql))
+			{
+				if (!isset($list[$assoc['company_id']]['totalht']))  $list[$assoc['company_id']]['totalht'] = 0;
+				if (!isset($list[$assoc['company_id']]['vat']))      $list[$assoc['company_id']]['vat'] = 0;
+				if (!isset($list[$assoc['company_id']]['localtax1']))      $list[$assoc['company_id']]['localtax1'] = 0;
+				if (!isset($list[$assoc['company_id']]['localtax2']))      $list[$assoc['company_id']]['localtax2'] = 0;
 
-    			if ($assoc['rowid'] != $oldrowid)       // Si rupture sur d.rowid
-    			{
-    				$oldrowid = $assoc['rowid'];
-    				$list[$assoc['company_id']]['totalht']  += $assoc['total_ht'];
-    				$list[$assoc['company_id']]['vat']      += $assoc['total_vat'];
-    				$list[$assoc['company_id']]['localtax1']      += $assoc['total_localtax1'];
-    				$list[$assoc['company_id']]['localtax2']      += $assoc['total_localtax2'];
-    			}
-    			$list[$assoc['company_id']]['dtotal_ttc'][] = $assoc['total_ttc'];
-    			$list[$assoc['company_id']]['dtype'][] = $assoc['dtype'];
-    			$list[$assoc['company_id']]['datef'][] = $db->jdate($assoc['datef']);
-    			$list[$assoc['company_id']]['datep'][] = $db->jdate($assoc['datep']);
-    			$list[$assoc['company_id']]['company_name'][] = $assoc['company_name'];
-    			$list[$assoc['company_id']]['company_id'][] = $assoc['company_id'];
-    			$list[$assoc['company_id']]['drate'][] = $assoc['rate'];
-    			$list[$assoc['company_id']]['ddate_start'][] = $db->jdate($assoc['date_start']);
-    			$list[$assoc['company_id']]['ddate_end'][] = $db->jdate($assoc['date_end']);
+				if ($assoc['rowid'] != $oldrowid)       // Si rupture sur d.rowid
+				{
+					$oldrowid = $assoc['rowid'];
+					$list[$assoc['company_id']]['totalht']  += $assoc['total_ht'];
+					$list[$assoc['company_id']]['vat']      += $assoc['total_vat'];
+					$list[$assoc['company_id']]['localtax1']      += $assoc['total_localtax1'];
+					$list[$assoc['company_id']]['localtax2']      += $assoc['total_localtax2'];
+				}
+				$list[$assoc['company_id']]['dtotal_ttc'][] = $assoc['total_ttc'];
+				$list[$assoc['company_id']]['dtype'][] = $assoc['dtype'];
+				$list[$assoc['company_id']]['datef'][] = $db->jdate($assoc['datef']);
+				$list[$assoc['company_id']]['datep'][] = $db->jdate($assoc['datep']);
+				$list[$assoc['company_id']]['company_name'][] = $assoc['company_name'];
+				$list[$assoc['company_id']]['company_id'][] = $assoc['company_id'];
+				$list[$assoc['company_id']]['drate'][] = $assoc['rate'];
+				$list[$assoc['company_id']]['ddate_start'][] = $db->jdate($assoc['date_start']);
+				$list[$assoc['company_id']]['ddate_end'][] = $db->jdate($assoc['date_end']);
 
-    			$list[$assoc['company_id']]['facid'][] = $assoc['facid'];
-    			$list[$assoc['company_id']]['facnum'][] = $assoc['facnum'];
-    			$list[$assoc['company_id']]['type'][] = $assoc['type'];
-    			$list[$assoc['company_id']]['ftotal_ttc'][] = $assoc['ftotal_ttc'];
-    			$list[$assoc['company_id']]['descr'][] = $assoc['descr'];
+				$list[$assoc['company_id']]['facid'][] = $assoc['facid'];
+				$list[$assoc['company_id']]['facnum'][] = $assoc['facnum'];
+				$list[$assoc['company_id']]['type'][] = $assoc['type'];
+				$list[$assoc['company_id']]['ftotal_ttc'][] = $assoc['ftotal_ttc'];
+				$list[$assoc['company_id']]['descr'][] = $assoc['descr'];
 
-    			$list[$assoc['company_id']]['totalht_list'][] = $assoc['total_ht'];
-    			$list[$assoc['company_id']]['vat_list'][] = $assoc['total_vat'];
-    			$list[$assoc['company_id']]['localtax1_list'][] = $assoc['total_localtax1'];
-    			$list[$assoc['company_id']]['localtax2_list'][] = $assoc['total_localtax2'];
+				$list[$assoc['company_id']]['totalht_list'][] = $assoc['total_ht'];
+				$list[$assoc['company_id']]['vat_list'][] = $assoc['total_vat'];
+				$list[$assoc['company_id']]['localtax1_list'][] = $assoc['total_localtax1'];
+				$list[$assoc['company_id']]['localtax2_list'][] = $assoc['total_localtax2'];
 
-    			$list[$assoc['company_id']]['pid'][] = $assoc['pid'];
-    			$list[$assoc['company_id']]['pref'][] = $assoc['pref'];
-    			$list[$assoc['company_id']]['ptype'][] = $assoc['ptype'];
+				$list[$assoc['company_id']]['pid'][] = $assoc['pid'];
+				$list[$assoc['company_id']]['pref'][] = $assoc['pref'];
+				$list[$assoc['company_id']]['ptype'][] = $assoc['ptype'];
 
-    			$list[$assoc['company_id']]['payment_id'][] = $assoc['payment_id'];
-    			$list[$assoc['company_id']]['payment_amount'][] = $assoc['payment_amount'];
+				$list[$assoc['company_id']]['payment_id'][] = $assoc['payment_id'];
+				$list[$assoc['company_id']]['payment_amount'][] = $assoc['payment_amount'];
 
-    			$company_id = $assoc['company_id'];
-    		}
-    	} else {
-    		dol_print_error($db);
-    		return -3;
-    	}
-    }
+				$company_id = $assoc['company_id'];
+			}
+		} else {
+			dol_print_error($db);
+			return -3;
+		}
+	}
 
 
-    // CAS DES SERVICES
+	// CAS DES SERVICES
 
-    // Define sql request
-    $sql = '';
-    if (($direction == 'sell' && $conf->global->TAX_MODE_SELL_SERVICE == 'invoice')
-    	|| ($direction == 'buy' && $conf->global->TAX_MODE_BUY_SERVICE == 'invoice'))
-    {
-    	// Count on invoice date
-    	$sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
-    	$sql .= " d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
-    	$sql .= " d.date_start as date_start, d.date_end as date_end,";
-    	$sql .= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,";
-    	$sql .= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";
-    	$sql .= " 0 as payment_id, 0 as payment_amount";
-    	$sql .= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
-    	$sql .= " ".MAIN_DB_PREFIX."societe as s,";
-    	$sql .= " ".MAIN_DB_PREFIX.$invoicedettable." as d";
-    	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
-    	$sql .= " WHERE f.entity IN (".getEntity($invoicetable).")";
-    	$sql .= " AND f.fk_statut in (1,2)"; // Validated or paid (partially or completely)
-    	if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql .= " AND f.type IN (0,1,2,5)";
-    	else $sql .= " AND f.type IN (0,1,2,3,5)";
-    	$sql .= " AND f.rowid = d.".$fk_facture;
-    	$sql .= " AND s.rowid = f.fk_soc";
-    	if ($y && $m)
-    	{
-    		$sql .= " AND f.datef >= '".$db->idate(dol_get_first_day($y, $m, false))."'";
-    		$sql .= " AND f.datef <= '".$db->idate(dol_get_last_day($y, $m, false))."'";
-    	} elseif ($y)
-    	{
-    		$sql .= " AND f.datef >= '".$db->idate(dol_get_first_day($y, 1, false))."'";
-    		$sql .= " AND f.datef <= '".$db->idate(dol_get_last_day($y, 12, false))."'";
-    	}
-    	if ($q) $sql .= " AND (date_format(f.datef,'%m') > ".(($q - 1) * 3)." AND date_format(f.datef,'%m') <= ".($q * 3).")";
-    	if ($date_start && $date_end) $sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
-    	$sql .= " AND (d.product_type = 1"; // Limit to services
-    	$sql .= " OR d.date_start is NOT null OR d.date_end IS NOT NULL)"; // enhance detection of service
-    	if (!empty($conf->global->MAIN_NOT_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
-    	$sql .= " ORDER BY d.rowid, d.".$fk_facture;
-    } else {
-    	// Count on payments date
-    	$sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
-    	$sql .= " d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
-    	$sql .= " d.date_start as date_start, d.date_end as date_end,";
-    	$sql .= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,";
-    	$sql .= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";
-    	$sql .= " pf.".$fk_payment." as payment_id, pf.amount as payment_amount,";
-    	$sql .= " pa.datep as datep";
-    	$sql .= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
-    	$sql .= " ".MAIN_DB_PREFIX.$paymentfacturetable." as pf,";
-    	$sql .= " ".MAIN_DB_PREFIX.$paymenttable." as pa,";
-    	$sql .= " ".MAIN_DB_PREFIX."societe as s,";
-    	$sql .= " ".MAIN_DB_PREFIX.$invoicedettable." as d";
-    	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
-    	$sql .= " WHERE f.entity IN (".getEntity($invoicetable).")";
-    	$sql .= " AND f.fk_statut in (1,2)"; // Paid (partially or completely)
-    	if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql .= " AND f.type IN (0,1,2,5)";
-    	else $sql .= " AND f.type IN (0,1,2,3,5)";
-    	$sql .= " AND f.rowid = d.".$fk_facture;
-    	$sql .= " AND s.rowid = f.fk_soc";
-    	$sql .= " AND pf.".$fk_facture2." = f.rowid";
-    	$sql .= " AND pa.rowid = pf.".$fk_payment;
-    	if ($y && $m)
-    	{
-    		$sql .= " AND pa.datep >= '".$db->idate(dol_get_first_day($y, $m, false))."'";
-    		$sql .= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, $m, false))."'";
-    	} elseif ($y)
-    	{
-    		$sql .= " AND pa.datep >= '".$db->idate(dol_get_first_day($y, 1, false))."'";
-    		$sql .= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, 12, false))."'";
-    	}
-    	if ($q) $sql .= " AND (date_format(pa.datep,'%m') > ".(($q - 1) * 3)." AND date_format(pa.datep,'%m') <= ".($q * 3).")";
-    	if ($date_start && $date_end) $sql .= " AND pa.datep >= '".$db->idate($date_start)."' AND pa.datep <= '".$db->idate($date_end)."'";
-    	$sql .= " AND (d.product_type = 1"; // Limit to services
-    	$sql .= " OR d.date_start is NOT null OR d.date_end IS NOT NULL)"; // enhance detection of service
-    	if (!empty($conf->global->MAIN_NOT_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
-    	$sql .= " ORDER BY d.rowid, d.".$fk_facture.", pf.rowid";
-    }
+	// Define sql request
+	$sql = '';
+	if (($direction == 'sell' && $conf->global->TAX_MODE_SELL_SERVICE == 'invoice')
+		|| ($direction == 'buy' && $conf->global->TAX_MODE_BUY_SERVICE == 'invoice'))
+	{
+		// Count on invoice date
+		$sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
+		$sql .= " d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
+		$sql .= " d.date_start as date_start, d.date_end as date_end,";
+		$sql .= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,";
+		$sql .= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";
+		$sql .= " 0 as payment_id, 0 as payment_amount";
+		$sql .= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
+		$sql .= " ".MAIN_DB_PREFIX."societe as s,";
+		$sql .= " ".MAIN_DB_PREFIX.$invoicedettable." as d";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
+		$sql .= " WHERE f.entity IN (".getEntity($invoicetable).")";
+		$sql .= " AND f.fk_statut in (1,2)"; // Validated or paid (partially or completely)
+		if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql .= " AND f.type IN (0,1,2,5)";
+		else $sql .= " AND f.type IN (0,1,2,3,5)";
+		$sql .= " AND f.rowid = d.".$fk_facture;
+		$sql .= " AND s.rowid = f.fk_soc";
+		if ($y && $m)
+		{
+			$sql .= " AND f.datef >= '".$db->idate(dol_get_first_day($y, $m, false))."'";
+			$sql .= " AND f.datef <= '".$db->idate(dol_get_last_day($y, $m, false))."'";
+		} elseif ($y)
+		{
+			$sql .= " AND f.datef >= '".$db->idate(dol_get_first_day($y, 1, false))."'";
+			$sql .= " AND f.datef <= '".$db->idate(dol_get_last_day($y, 12, false))."'";
+		}
+		if ($q) $sql .= " AND (date_format(f.datef,'%m') > ".(($q - 1) * 3)." AND date_format(f.datef,'%m') <= ".($q * 3).")";
+		if ($date_start && $date_end) $sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
+		$sql .= " AND (d.product_type = 1"; // Limit to services
+		$sql .= " OR d.date_start is NOT null OR d.date_end IS NOT NULL)"; // enhance detection of service
+		if (!empty($conf->global->MAIN_NOT_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
+		$sql .= " ORDER BY d.rowid, d.".$fk_facture;
+	} else {
+		// Count on payments date
+		$sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
+		$sql .= " d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
+		$sql .= " d.date_start as date_start, d.date_end as date_end,";
+		$sql .= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,";
+		$sql .= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";
+		$sql .= " pf.".$fk_payment." as payment_id, pf.amount as payment_amount,";
+		$sql .= " pa.datep as datep";
+		$sql .= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
+		$sql .= " ".MAIN_DB_PREFIX.$paymentfacturetable." as pf,";
+		$sql .= " ".MAIN_DB_PREFIX.$paymenttable." as pa,";
+		$sql .= " ".MAIN_DB_PREFIX."societe as s,";
+		$sql .= " ".MAIN_DB_PREFIX.$invoicedettable." as d";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
+		$sql .= " WHERE f.entity IN (".getEntity($invoicetable).")";
+		$sql .= " AND f.fk_statut in (1,2)"; // Paid (partially or completely)
+		if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql .= " AND f.type IN (0,1,2,5)";
+		else $sql .= " AND f.type IN (0,1,2,3,5)";
+		$sql .= " AND f.rowid = d.".$fk_facture;
+		$sql .= " AND s.rowid = f.fk_soc";
+		$sql .= " AND pf.".$fk_facture2." = f.rowid";
+		$sql .= " AND pa.rowid = pf.".$fk_payment;
+		if ($y && $m)
+		{
+			$sql .= " AND pa.datep >= '".$db->idate(dol_get_first_day($y, $m, false))."'";
+			$sql .= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, $m, false))."'";
+		} elseif ($y)
+		{
+			$sql .= " AND pa.datep >= '".$db->idate(dol_get_first_day($y, 1, false))."'";
+			$sql .= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, 12, false))."'";
+		}
+		if ($q) $sql .= " AND (date_format(pa.datep,'%m') > ".(($q - 1) * 3)." AND date_format(pa.datep,'%m') <= ".($q * 3).")";
+		if ($date_start && $date_end) $sql .= " AND pa.datep >= '".$db->idate($date_start)."' AND pa.datep <= '".$db->idate($date_end)."'";
+		$sql .= " AND (d.product_type = 1"; // Limit to services
+		$sql .= " OR d.date_start is NOT null OR d.date_end IS NOT NULL)"; // enhance detection of service
+		if (!empty($conf->global->MAIN_NOT_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
+		$sql .= " ORDER BY d.rowid, d.".$fk_facture.", pf.rowid";
+	}
 
-    if (!$sql)
-    {
-    	dol_syslog("Tax.lib.php::tax_by_rate no accountancy module enabled".$sql, LOG_ERR);
-    	return -1; // -1 = Not accountancy module enabled
-    }
-    if ($sql == 'TODO') return -2; // -2 = Feature not yet available
-    if ($sql != 'TODO')
-    {
-    	dol_syslog("Tax.lib.php::tax_by_rate", LOG_DEBUG);
-    	$resql = $db->query($sql);
-    	if ($resql)
-    	{
-    		$company_id = -1;
-    		$oldrowid = '';
-    		while ($assoc = $db->fetch_array($resql))
-    		{
-    			if (!isset($list[$assoc['company_id']]['totalht']))  $list[$assoc['company_id']]['totalht'] = 0;
-    			if (!isset($list[$assoc['company_id']]['vat']))      $list[$assoc['company_id']]['vat'] = 0;
-    			if (!isset($list[$assoc['company_id']]['localtax1']))      $list[$assoc['company_id']]['localtax1'] = 0;
-    			if (!isset($list[$assoc['company_id']]['localtax2']))      $list[$assoc['company_id']]['localtax2'] = 0;
+	if (!$sql)
+	{
+		dol_syslog("Tax.lib.php::tax_by_rate no accountancy module enabled".$sql, LOG_ERR);
+		return -1; // -1 = Not accountancy module enabled
+	}
+	if ($sql == 'TODO') return -2; // -2 = Feature not yet available
+	if ($sql != 'TODO')
+	{
+		dol_syslog("Tax.lib.php::tax_by_rate", LOG_DEBUG);
+		$resql = $db->query($sql);
+		if ($resql)
+		{
+			$company_id = -1;
+			$oldrowid = '';
+			while ($assoc = $db->fetch_array($resql))
+			{
+				if (!isset($list[$assoc['company_id']]['totalht']))  $list[$assoc['company_id']]['totalht'] = 0;
+				if (!isset($list[$assoc['company_id']]['vat']))      $list[$assoc['company_id']]['vat'] = 0;
+				if (!isset($list[$assoc['company_id']]['localtax1']))      $list[$assoc['company_id']]['localtax1'] = 0;
+				if (!isset($list[$assoc['company_id']]['localtax2']))      $list[$assoc['company_id']]['localtax2'] = 0;
 
-    			if ($assoc['rowid'] != $oldrowid)       // Si rupture sur d.rowid
-    			{
-    				$oldrowid = $assoc['rowid'];
-    				$list[$assoc['company_id']]['totalht']  += $assoc['total_ht'];
-    				$list[$assoc['company_id']]['vat']      += $assoc['total_vat'];
-    				$list[$assoc['company_id']]['localtax1']	 += $assoc['total_localtax1'];
-    				$list[$assoc['company_id']]['localtax2']	 += $assoc['total_localtax2'];
-    			}
-    			$list[$assoc['company_id']]['dtotal_ttc'][] = $assoc['total_ttc'];
-    			$list[$assoc['company_id']]['dtype'][] = $assoc['dtype'];
-    			$list[$assoc['company_id']]['datef'][] = $db->jdate($assoc['datef']);
-    			$list[$assoc['company_id']]['datep'][] = $db->jdate($assoc['datep']);
-    			$list[$assoc['company_id']]['company_name'][] = $assoc['company_name'];
-    			$list[$assoc['company_id']]['company_id'][] = $assoc['company_id'];
-    			$list[$assoc['company_id']]['drate'][] = $assoc['rate'];
-    			$list[$assoc['company_id']]['ddate_start'][] = $db->jdate($assoc['date_start']);
-    			$list[$assoc['company_id']]['ddate_end'][] = $db->jdate($assoc['date_end']);
+				if ($assoc['rowid'] != $oldrowid)       // Si rupture sur d.rowid
+				{
+					$oldrowid = $assoc['rowid'];
+					$list[$assoc['company_id']]['totalht']  += $assoc['total_ht'];
+					$list[$assoc['company_id']]['vat']      += $assoc['total_vat'];
+					$list[$assoc['company_id']]['localtax1']	 += $assoc['total_localtax1'];
+					$list[$assoc['company_id']]['localtax2']	 += $assoc['total_localtax2'];
+				}
+				$list[$assoc['company_id']]['dtotal_ttc'][] = $assoc['total_ttc'];
+				$list[$assoc['company_id']]['dtype'][] = $assoc['dtype'];
+				$list[$assoc['company_id']]['datef'][] = $db->jdate($assoc['datef']);
+				$list[$assoc['company_id']]['datep'][] = $db->jdate($assoc['datep']);
+				$list[$assoc['company_id']]['company_name'][] = $assoc['company_name'];
+				$list[$assoc['company_id']]['company_id'][] = $assoc['company_id'];
+				$list[$assoc['company_id']]['drate'][] = $assoc['rate'];
+				$list[$assoc['company_id']]['ddate_start'][] = $db->jdate($assoc['date_start']);
+				$list[$assoc['company_id']]['ddate_end'][] = $db->jdate($assoc['date_end']);
 
-    			$list[$assoc['company_id']]['facid'][] = $assoc['facid'];
-    			$list[$assoc['company_id']]['facnum'][] = $assoc['facnum'];
-    			$list[$assoc['company_id']]['type'][] = $assoc['type'];
-    			$list[$assoc['company_id']]['ftotal_ttc'][] = $assoc['ftotal_ttc'];
-    			$list[$assoc['company_id']]['descr'][] = $assoc['descr'];
+				$list[$assoc['company_id']]['facid'][] = $assoc['facid'];
+				$list[$assoc['company_id']]['facnum'][] = $assoc['facnum'];
+				$list[$assoc['company_id']]['type'][] = $assoc['type'];
+				$list[$assoc['company_id']]['ftotal_ttc'][] = $assoc['ftotal_ttc'];
+				$list[$assoc['company_id']]['descr'][] = $assoc['descr'];
 
-    			$list[$assoc['company_id']]['totalht_list'][] = $assoc['total_ht'];
-    			$list[$assoc['company_id']]['vat_list'][] = $assoc['total_vat'];
-    			$list[$assoc['company_id']]['localtax1_list'][] = $assoc['total_localtax1'];
-    			$list[$assoc['company_id']]['localtax2_list'][] = $assoc['total_localtax2'];
+				$list[$assoc['company_id']]['totalht_list'][] = $assoc['total_ht'];
+				$list[$assoc['company_id']]['vat_list'][] = $assoc['total_vat'];
+				$list[$assoc['company_id']]['localtax1_list'][] = $assoc['total_localtax1'];
+				$list[$assoc['company_id']]['localtax2_list'][] = $assoc['total_localtax2'];
 
-    			$list[$assoc['company_id']]['pid'][] = $assoc['pid'];
-    			$list[$assoc['company_id']]['pref'][] = $assoc['pref'];
-    			$list[$assoc['company_id']]['ptype'][] = $assoc['ptype'];
+				$list[$assoc['company_id']]['pid'][] = $assoc['pid'];
+				$list[$assoc['company_id']]['pref'][] = $assoc['pref'];
+				$list[$assoc['company_id']]['ptype'][] = $assoc['ptype'];
 
-    			$list[$assoc['company_id']]['payment_id'][] = $assoc['payment_id'];
-    			$list[$assoc['company_id']]['payment_amount'][] = $assoc['payment_amount'];
+				$list[$assoc['company_id']]['payment_id'][] = $assoc['payment_id'];
+				$list[$assoc['company_id']]['payment_amount'][] = $assoc['payment_amount'];
 
-    			$company_id = $assoc['company_id'];
-    		}
-    	} else {
-    		dol_print_error($db);
-    		return -3;
-    	}
-    }
+				$company_id = $assoc['company_id'];
+			}
+		} else {
+			dol_print_error($db);
+			return -3;
+		}
+	}
 
 
-    // CASE OF EXPENSE REPORT
+	// CASE OF EXPENSE REPORT
 
-    if ($direction == 'buy')		// buy only for expense reports
-    {
-    	// Define sql request
-    	$sql = '';
+	if ($direction == 'buy')		// buy only for expense reports
+	{
+		// Define sql request
+		$sql = '';
 
-    	// Count on payments date
-    	$sql = "SELECT d.rowid, d.product_type as dtype, e.rowid as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.total_tva as total_vat, e.note_private as descr,";
-    	$sql .= " d.total_localtax1 as total_localtax1, d.total_localtax2 as total_localtax2, ";
-    	$sql .= " e.date_debut as date_start, e.date_fin as date_end, e.fk_user_author,";
-    	$sql .= " e.ref as facnum, e.total_ttc as ftotal_ttc, e.date_create, d.fk_c_type_fees as type,";
-    	$sql .= " p.fk_bank as payment_id, p.amount as payment_amount, p.rowid as pid, e.ref as pref";
-    	$sql .= " FROM ".MAIN_DB_PREFIX."expensereport as e";
-    	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."expensereport_det as d ON d.fk_expensereport = e.rowid ";
-    	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."payment_expensereport as p ON p.fk_expensereport = e.rowid ";
-    	$sql .= " WHERE e.entity = ".$conf->entity;
-    	$sql .= " AND e.fk_statut in (6)";
-    	if ($y && $m)
-    	{
-    		$sql .= " AND p.datep >= '".$db->idate(dol_get_first_day($y, $m, false))."'";
-    		$sql .= " AND p.datep <= '".$db->idate(dol_get_last_day($y, $m, false))."'";
-    	} elseif ($y)
-    	{
-    		$sql .= " AND p.datep >= '".$db->idate(dol_get_first_day($y, 1, false))."'";
-    		$sql .= " AND p.datep <= '".$db->idate(dol_get_last_day($y, 12, false))."'";
-    	}
-    	if ($q) $sql .= " AND (date_format(p.datep,'%m') > ".(($q - 1) * 3)." AND date_format(p.datep,'%m') <= ".($q * 3).")";
-    	if ($date_start && $date_end) $sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
-    	$sql .= " AND (d.product_type = -1";
-    	$sql .= " OR e.date_debut is NOT null OR e.date_fin IS NOT NULL)"; // enhance detection of service
-    	if (!empty($conf->global->MAIN_NOT_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.total_tva <> 0)";
-    	$sql .= " ORDER BY e.rowid";
+		// Count on payments date
+		$sql = "SELECT d.rowid, d.product_type as dtype, e.rowid as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.total_tva as total_vat, e.note_private as descr,";
+		$sql .= " d.total_localtax1 as total_localtax1, d.total_localtax2 as total_localtax2, ";
+		$sql .= " e.date_debut as date_start, e.date_fin as date_end, e.fk_user_author,";
+		$sql .= " e.ref as facnum, e.total_ttc as ftotal_ttc, e.date_create, d.fk_c_type_fees as type,";
+		$sql .= " p.fk_bank as payment_id, p.amount as payment_amount, p.rowid as pid, e.ref as pref";
+		$sql .= " FROM ".MAIN_DB_PREFIX."expensereport as e";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."expensereport_det as d ON d.fk_expensereport = e.rowid ";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."payment_expensereport as p ON p.fk_expensereport = e.rowid ";
+		$sql .= " WHERE e.entity = ".$conf->entity;
+		$sql .= " AND e.fk_statut in (6)";
+		if ($y && $m)
+		{
+			$sql .= " AND p.datep >= '".$db->idate(dol_get_first_day($y, $m, false))."'";
+			$sql .= " AND p.datep <= '".$db->idate(dol_get_last_day($y, $m, false))."'";
+		} elseif ($y)
+		{
+			$sql .= " AND p.datep >= '".$db->idate(dol_get_first_day($y, 1, false))."'";
+			$sql .= " AND p.datep <= '".$db->idate(dol_get_last_day($y, 12, false))."'";
+		}
+		if ($q) $sql .= " AND (date_format(p.datep,'%m') > ".(($q - 1) * 3)." AND date_format(p.datep,'%m') <= ".($q * 3).")";
+		if ($date_start && $date_end) $sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
+		$sql .= " AND (d.product_type = -1";
+		$sql .= " OR e.date_debut is NOT null OR e.date_fin IS NOT NULL)"; // enhance detection of service
+		if (!empty($conf->global->MAIN_NOT_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.total_tva <> 0)";
+		$sql .= " ORDER BY e.rowid";
 
-    	if (!$sql)
-    	{
-    		dol_syslog("Tax.lib.php::tax_by_rate no accountancy module enabled".$sql, LOG_ERR);
-    		return -1; // -1 = Not accountancy module enabled
-    	}
-    	if ($sql == 'TODO') return -2; // -2 = Feature not yet available
-    	if ($sql != 'TODO')
-    	{
-    		dol_syslog("Tax.lib.php::tax_by_rate", LOG_DEBUG);
-    		$resql = $db->query($sql);
-    		if ($resql)
-    		{
-    			$company_id = -1;
-    			$oldrowid = '';
-    			while ($assoc = $db->fetch_array($resql))
-    			{
-    				if (!isset($list[$assoc['company_id']]['totalht']))  $list[$assoc['company_id']]['totalht'] = 0;
-    				if (!isset($list[$assoc['company_id']]['vat']))      $list[$assoc['company_id']]['vat'] = 0;
-    				if (!isset($list[$assoc['company_id']]['localtax1']))      $list[$assoc['company_id']]['localtax1'] = 0;
-    				if (!isset($list[$assoc['company_id']]['localtax2']))      $list[$assoc['company_id']]['localtax2'] = 0;
+		if (!$sql)
+		{
+			dol_syslog("Tax.lib.php::tax_by_rate no accountancy module enabled".$sql, LOG_ERR);
+			return -1; // -1 = Not accountancy module enabled
+		}
+		if ($sql == 'TODO') return -2; // -2 = Feature not yet available
+		if ($sql != 'TODO')
+		{
+			dol_syslog("Tax.lib.php::tax_by_rate", LOG_DEBUG);
+			$resql = $db->query($sql);
+			if ($resql)
+			{
+				$company_id = -1;
+				$oldrowid = '';
+				while ($assoc = $db->fetch_array($resql))
+				{
+					if (!isset($list[$assoc['company_id']]['totalht']))  $list[$assoc['company_id']]['totalht'] = 0;
+					if (!isset($list[$assoc['company_id']]['vat']))      $list[$assoc['company_id']]['vat'] = 0;
+					if (!isset($list[$assoc['company_id']]['localtax1']))      $list[$assoc['company_id']]['localtax1'] = 0;
+					if (!isset($list[$assoc['company_id']]['localtax2']))      $list[$assoc['company_id']]['localtax2'] = 0;
 
-    				if ($assoc['rowid'] != $oldrowid)       // Si rupture sur d.rowid
-    				{
-    					$oldrowid = $assoc['rowid'];
-    					$list[$assoc['company_id']]['totalht'] += $assoc['total_ht'];
-    					$list[$assoc['company_id']]['vat'] += $assoc['total_vat'];
-    					$list[$assoc['company_id']]['localtax1']	 += $assoc['total_localtax1'];
-    					$list[$assoc['company_id']]['localtax2']	 += $assoc['total_localtax2'];
-    				}
+					if ($assoc['rowid'] != $oldrowid)       // Si rupture sur d.rowid
+					{
+						$oldrowid = $assoc['rowid'];
+						$list[$assoc['company_id']]['totalht'] += $assoc['total_ht'];
+						$list[$assoc['company_id']]['vat'] += $assoc['total_vat'];
+						$list[$assoc['company_id']]['localtax1']	 += $assoc['total_localtax1'];
+						$list[$assoc['company_id']]['localtax2']	 += $assoc['total_localtax2'];
+					}
 
-    				$list[$assoc['company_id']]['dtotal_ttc'][] = $assoc['total_ttc'];
-    				$list[$assoc['company_id']]['dtype'][] = 'ExpenseReportPayment';
-    				$list[$assoc['company_id']]['datef'][] = $assoc['datef'];
-    				$list[$assoc['company_id']]['company_name'][] = '';
-    				$list[$assoc['company_id']]['company_id'][] = '';
-    				$list[$assoc['company_id']]['user_id'][] = $assoc['fk_user_author'];
-    				$list[$assoc['company_id']]['drate'][] = $assoc['rate'];
-    				$list[$assoc['company_id']]['ddate_start'][] = $db->jdate($assoc['date_start']);
-    				$list[$assoc['company_id']]['ddate_end'][] = $db->jdate($assoc['date_end']);
+					$list[$assoc['company_id']]['dtotal_ttc'][] = $assoc['total_ttc'];
+					$list[$assoc['company_id']]['dtype'][] = 'ExpenseReportPayment';
+					$list[$assoc['company_id']]['datef'][] = $assoc['datef'];
+					$list[$assoc['company_id']]['company_name'][] = '';
+					$list[$assoc['company_id']]['company_id'][] = '';
+					$list[$assoc['company_id']]['user_id'][] = $assoc['fk_user_author'];
+					$list[$assoc['company_id']]['drate'][] = $assoc['rate'];
+					$list[$assoc['company_id']]['ddate_start'][] = $db->jdate($assoc['date_start']);
+					$list[$assoc['company_id']]['ddate_end'][] = $db->jdate($assoc['date_end']);
 
-    				$list[$assoc['company_id']]['facid'][] = $assoc['facid'];
-    				$list[$assoc['company_id']]['facnum'][] = $assoc['facnum'];
-    				$list[$assoc['company_id']]['type'][] = $assoc['type'];
-    				$list[$assoc['company_id']]['ftotal_ttc'][] = $assoc['ftotal_ttc'];
-    				$list[$assoc['company_id']]['descr'][] = $assoc['descr'];
+					$list[$assoc['company_id']]['facid'][] = $assoc['facid'];
+					$list[$assoc['company_id']]['facnum'][] = $assoc['facnum'];
+					$list[$assoc['company_id']]['type'][] = $assoc['type'];
+					$list[$assoc['company_id']]['ftotal_ttc'][] = $assoc['ftotal_ttc'];
+					$list[$assoc['company_id']]['descr'][] = $assoc['descr'];
 
-    				$list[$assoc['company_id']]['totalht_list'][] = $assoc['total_ht'];
-    				$list[$assoc['company_id']]['vat_list'][] = $assoc['total_vat'];
-    				$list[$assoc['company_id']]['localtax1_list'][] = $assoc['total_localtax1'];
-    				$list[$assoc['company_id']]['localtax2_list'][] = $assoc['total_localtax2'];
+					$list[$assoc['company_id']]['totalht_list'][] = $assoc['total_ht'];
+					$list[$assoc['company_id']]['vat_list'][] = $assoc['total_vat'];
+					$list[$assoc['company_id']]['localtax1_list'][] = $assoc['total_localtax1'];
+					$list[$assoc['company_id']]['localtax2_list'][] = $assoc['total_localtax2'];
 
-    				$list[$assoc['company_id']]['pid'][] = $assoc['pid'];
-    				$list[$assoc['company_id']]['pref'][] = $assoc['pref'];
-    				$list[$assoc['company_id']]['ptype'][] = 'ExpenseReportPayment';
+					$list[$assoc['company_id']]['pid'][] = $assoc['pid'];
+					$list[$assoc['company_id']]['pref'][] = $assoc['pref'];
+					$list[$assoc['company_id']]['ptype'][] = 'ExpenseReportPayment';
 
-    				$list[$assoc['company_id']]['payment_id'][] = $assoc['payment_id'];
-    				$list[$assoc['company_id']]['payment_amount'][] = $assoc['payment_amount'];
+					$list[$assoc['company_id']]['payment_id'][] = $assoc['payment_id'];
+					$list[$assoc['company_id']]['payment_amount'][] = $assoc['payment_amount'];
 
-    				$company_id = $assoc['company_id'];
-    			}
-    		} else {
-    			dol_print_error($db);
-    			return -3;
-    		}
-    	}
-    }
+					$company_id = $assoc['company_id'];
+				}
+			} else {
+				dol_print_error($db);
+				return -3;
+			}
+		}
+	}
 
-    return $list;
+	return $list;
 }
 
 /**
@@ -542,38 +542,38 @@ function tax_by_thirdparty($type, $db, $y, $date_start, $date_end, $modetax, $di
  */
 function tax_by_rate($type, $db, $y, $q, $date_start, $date_end, $modetax, $direction, $m = 0)
 {
-    global $conf;
+	global $conf;
 
-    // If we use date_start and date_end, we must not use $y, $m, $q
-    if (($date_start || $date_end) && (!empty($y) || !empty($m) || !empty($q)))
-    {
-    	dol_print_error('', 'Bad value of input parameter for tax_by_rate');
-    }
+	// If we use date_start and date_end, we must not use $y, $m, $q
+	if (($date_start || $date_end) && (!empty($y) || !empty($m) || !empty($q)))
+	{
+		dol_print_error('', 'Bad value of input parameter for tax_by_rate');
+	}
 
-    $list = array();
+	$list = array();
 
-    if ($direction == 'sell')
-    {
-        $invoicetable = 'facture';
-        $invoicedettable = 'facturedet';
-        $fk_facture = 'fk_facture';
-        $fk_facture2 = 'fk_facture';
-        $fk_payment = 'fk_paiement';
-        $total_tva = 'total_tva';
-        $paymenttable = 'paiement';
-        $paymentfacturetable = 'paiement_facture';
-        $invoicefieldref = 'ref';
-    } else {
-        $invoicetable = 'facture_fourn';
-        $invoicedettable = 'facture_fourn_det';
-        $fk_facture = 'fk_facture_fourn';
-        $fk_facture2 = 'fk_facturefourn';
-        $fk_payment = 'fk_paiementfourn';
-        $total_tva = 'tva';
-        $paymenttable = 'paiementfourn';
-        $paymentfacturetable = 'paiementfourn_facturefourn';
-        $invoicefieldref = 'ref';
-    }
+	if ($direction == 'sell')
+	{
+		$invoicetable = 'facture';
+		$invoicedettable = 'facturedet';
+		$fk_facture = 'fk_facture';
+		$fk_facture2 = 'fk_facture';
+		$fk_payment = 'fk_paiement';
+		$total_tva = 'total_tva';
+		$paymenttable = 'paiement';
+		$paymentfacturetable = 'paiement_facture';
+		$invoicefieldref = 'ref';
+	} else {
+		$invoicetable = 'facture_fourn';
+		$invoicedettable = 'facture_fourn_det';
+		$fk_facture = 'fk_facture_fourn';
+		$fk_facture2 = 'fk_facturefourn';
+		$fk_payment = 'fk_paiementfourn';
+		$total_tva = 'tva';
+		$paymenttable = 'paiementfourn';
+		$paymentfacturetable = 'paiementfourn_facturefourn';
+		$invoicefieldref = 'ref';
+	}
 
 	if (strpos($type, 'localtax') === 0) {
 		$f_rate = $type.'_tx';
@@ -585,294 +585,294 @@ function tax_by_rate($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
 	$total_localtax2 = 'total_localtax2';
 
 
-    // CAS DES BIENS/PRODUITS
+	// CAS DES BIENS/PRODUITS
 
-    // Define sql request
-    $sql = '';
-    if (($direction == 'sell' && $conf->global->TAX_MODE_SELL_PRODUCT == 'invoice')
-    	|| ($direction == 'buy' && $conf->global->TAX_MODE_BUY_PRODUCT == 'invoice'))
-    {
-        // Count on delivery date (use invoice date as delivery is unknown)
-        $sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
-        $sql .= " d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
-        $sql .= " d.date_start as date_start, d.date_end as date_end,";
-        $sql .= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,";
-        $sql .= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";
-        $sql .= " 0 as payment_id, 0 as payment_amount";
-        $sql .= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
-        $sql .= " ".MAIN_DB_PREFIX."societe as s,";
-        $sql .= " ".MAIN_DB_PREFIX.$invoicedettable." as d";
-        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
-        $sql .= " WHERE f.entity IN (".getEntity($invoicetable).")";
-        $sql .= " AND f.fk_statut in (1,2)"; // Validated or paid (partially or completely)
-        if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql .= " AND f.type IN (0,1,2,5)";
-        else $sql .= " AND f.type IN (0,1,2,3,5)";
-        $sql .= " AND f.rowid = d.".$fk_facture;
-        $sql .= " AND s.rowid = f.fk_soc";
-        if ($y && $m)
-        {
-            $sql .= " AND f.datef >= '".$db->idate(dol_get_first_day($y, $m, false))."'";
-            $sql .= " AND f.datef <= '".$db->idate(dol_get_last_day($y, $m, false))."'";
-        } elseif ($y)
-        {
-            $sql .= " AND f.datef >= '".$db->idate(dol_get_first_day($y, 1, false))."'";
-            $sql .= " AND f.datef <= '".$db->idate(dol_get_last_day($y, 12, false))."'";
-        }
-        if ($q) $sql .= " AND (date_format(f.datef,'%m') > ".(($q - 1) * 3)." AND date_format(f.datef,'%m') <= ".($q * 3).")";
-        if ($date_start && $date_end) $sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
-        $sql .= " AND (d.product_type = 0"; // Limit to products
-        $sql .= " AND d.date_start is null AND d.date_end IS NULL)"; // enhance detection of products
-        if (!empty($conf->global->MAIN_NOT_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
-        $sql .= " ORDER BY d.rowid, d.".$fk_facture;
-    } else {
-    	// Count on payments date
-    	$sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
-    	$sql .= " d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
-    	$sql .= " d.date_start as date_start, d.date_end as date_end,";
-    	$sql .= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,";
-    	$sql .= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";
-    	$sql .= " pf.".$fk_payment." as payment_id, pf.amount as payment_amount,";
-    	$sql .= " pa.datep as datep";
-    	$sql .= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
-    	$sql .= " ".MAIN_DB_PREFIX.$paymentfacturetable." as pf,";
-    	$sql .= " ".MAIN_DB_PREFIX.$paymenttable." as pa,";
-    	$sql .= " ".MAIN_DB_PREFIX."societe as s,";
-    	$sql .= " ".MAIN_DB_PREFIX.$invoicedettable." as d";
-    	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
-    	$sql .= " WHERE f.entity IN (".getEntity($invoicetable).")";
-    	$sql .= " AND f.fk_statut in (1,2)"; // Paid (partially or completely)
-    	if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql .= " AND f.type IN (0,1,2,5)";
-    	else $sql .= " AND f.type IN (0,1,2,3,5)";
-    	$sql .= " AND f.rowid = d.".$fk_facture;
-    	$sql .= " AND s.rowid = f.fk_soc";
-    	$sql .= " AND pf.".$fk_facture2." = f.rowid";
-    	$sql .= " AND pa.rowid = pf.".$fk_payment;
-    	if ($y && $m)
-    	{
-    		$sql .= " AND pa.datep >= '".$db->idate(dol_get_first_day($y, $m, false))."'";
-    		$sql .= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, $m, false))."'";
-    	} elseif ($y)
-    	{
-    		$sql .= " AND pa.datep >= '".$db->idate(dol_get_first_day($y, 1, false))."'";
-    		$sql .= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, 12, false))."'";
-    	}
-    	if ($q) $sql .= " AND (date_format(pa.datep,'%m') > ".(($q - 1) * 3)." AND date_format(pa.datep,'%m') <= ".($q * 3).")";
-    	if ($date_start && $date_end) $sql .= " AND pa.datep >= '".$db->idate($date_start)."' AND pa.datep <= '".$db->idate($date_end)."'";
-    	$sql .= " AND (d.product_type = 0"; // Limit to products
-    	$sql .= " AND d.date_start is null AND d.date_end IS NULL)"; // enhance detection of products
-    	if (!empty($conf->global->MAIN_NOT_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
-    	$sql .= " ORDER BY d.rowid, d.".$fk_facture.", pf.rowid";
-    }
-
-    if (!$sql) return -1;
-    if ($sql == 'TODO') return -2;
-    if ($sql != 'TODO')
-    {
-        dol_syslog("Tax.lib.php::tax_by_rate", LOG_DEBUG);
-
-        $resql = $db->query($sql);
-        if ($resql)
-        {
-            $rate = -1;
-            $oldrowid = '';
-            while ($assoc = $db->fetch_array($resql))
-            {
-            	// Code to avoid warnings when array entry not defined
-            	if (!isset($list[$assoc['rate']]['totalht']))   $list[$assoc['rate']]['totalht'] = 0;
-                if (!isset($list[$assoc['rate']]['vat']))       $list[$assoc['rate']]['vat'] = 0;
-                if (!isset($list[$assoc['rate']]['localtax1'])) $list[$assoc['rate']]['localtax1'] = 0;
-                if (!isset($list[$assoc['rate']]['localtax2'])) $list[$assoc['rate']]['localtax2'] = 0;
-
-                if ($assoc['rowid'] != $oldrowid)       // Si rupture sur d.rowid
-                {
-                    $oldrowid = $assoc['rowid'];
-                    $list[$assoc['rate']]['totalht']   += $assoc['total_ht'];
-                    $list[$assoc['rate']]['vat']       += $assoc['total_vat'];
-                    $list[$assoc['rate']]['localtax1'] += $assoc['total_localtax1'];
-                    $list[$assoc['rate']]['localtax2'] += $assoc['total_localtax2'];
-                }
-                $list[$assoc['rate']]['dtotal_ttc'][] = $assoc['total_ttc'];
-                $list[$assoc['rate']]['dtype'][] = $assoc['dtype'];
-                $list[$assoc['rate']]['datef'][] = $db->jdate($assoc['datef']);
-                $list[$assoc['rate']]['datep'][] = $db->jdate($assoc['datep']);
-                $list[$assoc['rate']]['company_name'][] = $assoc['company_name'];
-                $list[$assoc['rate']]['company_id'][] = $assoc['company_id'];
-                $list[$assoc['rate']]['ddate_start'][] = $db->jdate($assoc['date_start']);
-                $list[$assoc['rate']]['ddate_end'][] = $db->jdate($assoc['date_end']);
-
-                $list[$assoc['rate']]['facid'][] = $assoc['facid'];
-                $list[$assoc['rate']]['facnum'][] = $assoc['facnum'];
-                $list[$assoc['rate']]['type'][] = $assoc['type'];
-                $list[$assoc['rate']]['ftotal_ttc'][] = $assoc['ftotal_ttc'];
-                $list[$assoc['rate']]['descr'][] = $assoc['descr'];
-
-                $list[$assoc['rate']]['totalht_list'][] = $assoc['total_ht'];
-                $list[$assoc['rate']]['vat_list'][] = $assoc['total_vat'];
-                $list[$assoc['rate']]['localtax1_list'][] = $assoc['total_localtax1'];
-                $list[$assoc['rate']]['localtax2_list'][] = $assoc['total_localtax2'];
-
-                $list[$assoc['rate']]['pid'][] = $assoc['pid'];
-                $list[$assoc['rate']]['pref'][] = $assoc['pref'];
-                $list[$assoc['rate']]['ptype'][] = $assoc['ptype'];
-
-                $list[$assoc['rate']]['payment_id'][] = $assoc['payment_id'];
-                $list[$assoc['rate']]['payment_amount'][] = $assoc['payment_amount'];
-
-                $rate = $assoc['rate'];
-            }
-        } else {
-            dol_print_error($db);
-            return -3;
-        }
-    }
-
-
-    // CAS DES SERVICES
-
-    // Define sql request
-    $sql = '';
-    if (($direction == 'sell' && $conf->global->TAX_MODE_SELL_SERVICE == 'invoice')
-    	|| ($direction == 'buy' && $conf->global->TAX_MODE_BUY_SERVICE == 'invoice'))
-    {
-        // Count on invoice date
-        $sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
-        $sql .= " d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
-        $sql .= " d.date_start as date_start, d.date_end as date_end,";
-        $sql .= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,";
-        $sql .= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";
-        $sql .= " 0 as payment_id, 0 as payment_amount";
-        $sql .= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
-        $sql .= " ".MAIN_DB_PREFIX."societe as s,";
-        $sql .= " ".MAIN_DB_PREFIX.$invoicedettable." as d";
-        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
-        $sql .= " WHERE f.entity IN (".getEntity($invoicetable).")";
-        $sql .= " AND f.fk_statut in (1,2)"; // Validated or paid (partially or completely)
-        if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql .= " AND f.type IN (0,1,2,5)";
+	// Define sql request
+	$sql = '';
+	if (($direction == 'sell' && $conf->global->TAX_MODE_SELL_PRODUCT == 'invoice')
+		|| ($direction == 'buy' && $conf->global->TAX_MODE_BUY_PRODUCT == 'invoice'))
+	{
+		// Count on delivery date (use invoice date as delivery is unknown)
+		$sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
+		$sql .= " d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
+		$sql .= " d.date_start as date_start, d.date_end as date_end,";
+		$sql .= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,";
+		$sql .= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";
+		$sql .= " 0 as payment_id, 0 as payment_amount";
+		$sql .= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
+		$sql .= " ".MAIN_DB_PREFIX."societe as s,";
+		$sql .= " ".MAIN_DB_PREFIX.$invoicedettable." as d";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
+		$sql .= " WHERE f.entity IN (".getEntity($invoicetable).")";
+		$sql .= " AND f.fk_statut in (1,2)"; // Validated or paid (partially or completely)
+		if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql .= " AND f.type IN (0,1,2,5)";
 		else $sql .= " AND f.type IN (0,1,2,3,5)";
-        $sql .= " AND f.rowid = d.".$fk_facture;
-        $sql .= " AND s.rowid = f.fk_soc";
-        if ($y && $m)
-        {
-            $sql .= " AND f.datef >= '".$db->idate(dol_get_first_day($y, $m, false))."'";
-            $sql .= " AND f.datef <= '".$db->idate(dol_get_last_day($y, $m, false))."'";
-        } elseif ($y)
-        {
-            $sql .= " AND f.datef >= '".$db->idate(dol_get_first_day($y, 1, false))."'";
-            $sql .= " AND f.datef <= '".$db->idate(dol_get_last_day($y, 12, false))."'";
-        }
-        if ($q) $sql .= " AND (date_format(f.datef,'%m') > ".(($q - 1) * 3)." AND date_format(f.datef,'%m') <= ".($q * 3).")";
-        if ($date_start && $date_end) $sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
-        $sql .= " AND (d.product_type = 1"; // Limit to services
-        $sql .= " OR d.date_start is NOT null OR d.date_end IS NOT NULL)"; // enhance detection of service
-        if (!empty($conf->global->MAIN_NOT_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
-        $sql .= " ORDER BY d.rowid, d.".$fk_facture;
-    } else {
-        // Count on payments date
-        $sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
-        $sql .= " d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
-        $sql .= " d.date_start as date_start, d.date_end as date_end,";
-        $sql .= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,";
-        $sql .= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";
-        $sql .= " pf.".$fk_payment." as payment_id, pf.amount as payment_amount,";
-        $sql .= " pa.datep as datep";
-        $sql .= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
-        $sql .= " ".MAIN_DB_PREFIX.$paymentfacturetable." as pf,";
-        $sql .= " ".MAIN_DB_PREFIX.$paymenttable." as pa,";
-        $sql .= " ".MAIN_DB_PREFIX."societe as s,";
-        $sql .= " ".MAIN_DB_PREFIX.$invoicedettable." as d";
-        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
-        $sql .= " WHERE f.entity IN (".getEntity($invoicetable).")";
-        $sql .= " AND f.fk_statut in (1,2)"; // Paid (partially or completely)
-        if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql .= " AND f.type IN (0,1,2,5)";
+		$sql .= " AND f.rowid = d.".$fk_facture;
+		$sql .= " AND s.rowid = f.fk_soc";
+		if ($y && $m)
+		{
+			$sql .= " AND f.datef >= '".$db->idate(dol_get_first_day($y, $m, false))."'";
+			$sql .= " AND f.datef <= '".$db->idate(dol_get_last_day($y, $m, false))."'";
+		} elseif ($y)
+		{
+			$sql .= " AND f.datef >= '".$db->idate(dol_get_first_day($y, 1, false))."'";
+			$sql .= " AND f.datef <= '".$db->idate(dol_get_last_day($y, 12, false))."'";
+		}
+		if ($q) $sql .= " AND (date_format(f.datef,'%m') > ".(($q - 1) * 3)." AND date_format(f.datef,'%m') <= ".($q * 3).")";
+		if ($date_start && $date_end) $sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
+		$sql .= " AND (d.product_type = 0"; // Limit to products
+		$sql .= " AND d.date_start is null AND d.date_end IS NULL)"; // enhance detection of products
+		if (!empty($conf->global->MAIN_NOT_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
+		$sql .= " ORDER BY d.rowid, d.".$fk_facture;
+	} else {
+		// Count on payments date
+		$sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
+		$sql .= " d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
+		$sql .= " d.date_start as date_start, d.date_end as date_end,";
+		$sql .= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,";
+		$sql .= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";
+		$sql .= " pf.".$fk_payment." as payment_id, pf.amount as payment_amount,";
+		$sql .= " pa.datep as datep";
+		$sql .= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
+		$sql .= " ".MAIN_DB_PREFIX.$paymentfacturetable." as pf,";
+		$sql .= " ".MAIN_DB_PREFIX.$paymenttable." as pa,";
+		$sql .= " ".MAIN_DB_PREFIX."societe as s,";
+		$sql .= " ".MAIN_DB_PREFIX.$invoicedettable." as d";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
+		$sql .= " WHERE f.entity IN (".getEntity($invoicetable).")";
+		$sql .= " AND f.fk_statut in (1,2)"; // Paid (partially or completely)
+		if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql .= " AND f.type IN (0,1,2,5)";
 		else $sql .= " AND f.type IN (0,1,2,3,5)";
-        $sql .= " AND f.rowid = d.".$fk_facture;
-        $sql .= " AND s.rowid = f.fk_soc";
-        $sql .= " AND pf.".$fk_facture2." = f.rowid";
-        $sql .= " AND pa.rowid = pf.".$fk_payment;
-        if ($y && $m)
-        {
-            $sql .= " AND pa.datep >= '".$db->idate(dol_get_first_day($y, $m, false))."'";
-            $sql .= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, $m, false))."'";
-        } elseif ($y)
-        {
-            $sql .= " AND pa.datep >= '".$db->idate(dol_get_first_day($y, 1, false))."'";
-            $sql .= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, 12, false))."'";
-        }
-        if ($q) $sql .= " AND (date_format(pa.datep,'%m') > ".(($q - 1) * 3)." AND date_format(pa.datep,'%m') <= ".($q * 3).")";
-        if ($date_start && $date_end) $sql .= " AND pa.datep >= '".$db->idate($date_start)."' AND pa.datep <= '".$db->idate($date_end)."'";
-        $sql .= " AND (d.product_type = 1"; // Limit to services
-        $sql .= " OR d.date_start is NOT null OR d.date_end IS NOT NULL)"; // enhance detection of service
-        if (!empty($conf->global->MAIN_NOT_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
-        $sql .= " ORDER BY d.rowid, d.".$fk_facture.", pf.rowid";
-    }
+		$sql .= " AND f.rowid = d.".$fk_facture;
+		$sql .= " AND s.rowid = f.fk_soc";
+		$sql .= " AND pf.".$fk_facture2." = f.rowid";
+		$sql .= " AND pa.rowid = pf.".$fk_payment;
+		if ($y && $m)
+		{
+			$sql .= " AND pa.datep >= '".$db->idate(dol_get_first_day($y, $m, false))."'";
+			$sql .= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, $m, false))."'";
+		} elseif ($y)
+		{
+			$sql .= " AND pa.datep >= '".$db->idate(dol_get_first_day($y, 1, false))."'";
+			$sql .= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, 12, false))."'";
+		}
+		if ($q) $sql .= " AND (date_format(pa.datep,'%m') > ".(($q - 1) * 3)." AND date_format(pa.datep,'%m') <= ".($q * 3).")";
+		if ($date_start && $date_end) $sql .= " AND pa.datep >= '".$db->idate($date_start)."' AND pa.datep <= '".$db->idate($date_end)."'";
+		$sql .= " AND (d.product_type = 0"; // Limit to products
+		$sql .= " AND d.date_start is null AND d.date_end IS NULL)"; // enhance detection of products
+		if (!empty($conf->global->MAIN_NOT_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
+		$sql .= " ORDER BY d.rowid, d.".$fk_facture.", pf.rowid";
+	}
 
-    if (!$sql)
-    {
-        dol_syslog("Tax.lib.php::tax_by_rate no accountancy module enabled".$sql, LOG_ERR);
-        return -1; // -1 = Not accountancy module enabled
-    }
-    if ($sql == 'TODO') return -2; // -2 = Feature not yet available
-    if ($sql != 'TODO')
-    {
-        dol_syslog("Tax.lib.php::tax_by_rate", LOG_DEBUG);
-        $resql = $db->query($sql);
-        if ($resql)
-        {
-            $rate = -1;
-            $oldrowid = '';
-            while ($assoc = $db->fetch_array($resql))
-            {
-            	// Code to avoid warnings when array entry not defined
-            	if (!isset($list[$assoc['rate']]['totalht']))   $list[$assoc['rate']]['totalht'] = 0;
-                if (!isset($list[$assoc['rate']]['vat']))       $list[$assoc['rate']]['vat'] = 0;
+	if (!$sql) return -1;
+	if ($sql == 'TODO') return -2;
+	if ($sql != 'TODO')
+	{
+		dol_syslog("Tax.lib.php::tax_by_rate", LOG_DEBUG);
+
+		$resql = $db->query($sql);
+		if ($resql)
+		{
+			$rate = -1;
+			$oldrowid = '';
+			while ($assoc = $db->fetch_array($resql))
+			{
+				// Code to avoid warnings when array entry not defined
+				if (!isset($list[$assoc['rate']]['totalht']))   $list[$assoc['rate']]['totalht'] = 0;
+				if (!isset($list[$assoc['rate']]['vat']))       $list[$assoc['rate']]['vat'] = 0;
 				if (!isset($list[$assoc['rate']]['localtax1'])) $list[$assoc['rate']]['localtax1'] = 0;
-                if (!isset($list[$assoc['rate']]['localtax2'])) $list[$assoc['rate']]['localtax2'] = 0;
+				if (!isset($list[$assoc['rate']]['localtax2'])) $list[$assoc['rate']]['localtax2'] = 0;
 
-                if ($assoc['rowid'] != $oldrowid)       // Si rupture sur d.rowid
-                {
-                    $oldrowid = $assoc['rowid'];
-                    $list[$assoc['rate']]['totalht']   += $assoc['total_ht'];
-                    $list[$assoc['rate']]['vat']       += $assoc['total_vat'];
-                    $list[$assoc['rate']]['localtax1'] += $assoc['total_localtax1'];
-                    $list[$assoc['rate']]['localtax2'] += $assoc['total_localtax2'];
-                }
-                $list[$assoc['rate']]['dtotal_ttc'][] = $assoc['total_ttc'];
-                $list[$assoc['rate']]['dtype'][] = $assoc['dtype'];
-                $list[$assoc['rate']]['datef'][] = $db->jdate($assoc['datef']);
-                $list[$assoc['rate']]['datep'][] = $db->jdate($assoc['datep']);
-                $list[$assoc['rate']]['company_name'][] = $assoc['company_name'];
-                $list[$assoc['rate']]['company_id'][] = $assoc['company_id'];
-                $list[$assoc['rate']]['ddate_start'][] = $db->jdate($assoc['date_start']);
-                $list[$assoc['rate']]['ddate_end'][] = $db->jdate($assoc['date_end']);
+				if ($assoc['rowid'] != $oldrowid)       // Si rupture sur d.rowid
+				{
+					$oldrowid = $assoc['rowid'];
+					$list[$assoc['rate']]['totalht']   += $assoc['total_ht'];
+					$list[$assoc['rate']]['vat']       += $assoc['total_vat'];
+					$list[$assoc['rate']]['localtax1'] += $assoc['total_localtax1'];
+					$list[$assoc['rate']]['localtax2'] += $assoc['total_localtax2'];
+				}
+				$list[$assoc['rate']]['dtotal_ttc'][] = $assoc['total_ttc'];
+				$list[$assoc['rate']]['dtype'][] = $assoc['dtype'];
+				$list[$assoc['rate']]['datef'][] = $db->jdate($assoc['datef']);
+				$list[$assoc['rate']]['datep'][] = $db->jdate($assoc['datep']);
+				$list[$assoc['rate']]['company_name'][] = $assoc['company_name'];
+				$list[$assoc['rate']]['company_id'][] = $assoc['company_id'];
+				$list[$assoc['rate']]['ddate_start'][] = $db->jdate($assoc['date_start']);
+				$list[$assoc['rate']]['ddate_end'][] = $db->jdate($assoc['date_end']);
 
-                $list[$assoc['rate']]['facid'][] = $assoc['facid'];
-                $list[$assoc['rate']]['facnum'][] = $assoc['facnum'];
-                $list[$assoc['rate']]['type'][] = $assoc['type'];
-                $list[$assoc['rate']]['ftotal_ttc'][] = $assoc['ftotal_ttc'];
-                $list[$assoc['rate']]['descr'][] = $assoc['descr'];
+				$list[$assoc['rate']]['facid'][] = $assoc['facid'];
+				$list[$assoc['rate']]['facnum'][] = $assoc['facnum'];
+				$list[$assoc['rate']]['type'][] = $assoc['type'];
+				$list[$assoc['rate']]['ftotal_ttc'][] = $assoc['ftotal_ttc'];
+				$list[$assoc['rate']]['descr'][] = $assoc['descr'];
 
-                $list[$assoc['rate']]['totalht_list'][] = $assoc['total_ht'];
-                $list[$assoc['rate']]['vat_list'][] = $assoc['total_vat'];
-                $list[$assoc['rate']]['localtax1_list'][] = $assoc['total_localtax1'];
-                $list[$assoc['rate']]['localtax2_list'][] = $assoc['total_localtax2'];
+				$list[$assoc['rate']]['totalht_list'][] = $assoc['total_ht'];
+				$list[$assoc['rate']]['vat_list'][] = $assoc['total_vat'];
+				$list[$assoc['rate']]['localtax1_list'][] = $assoc['total_localtax1'];
+				$list[$assoc['rate']]['localtax2_list'][] = $assoc['total_localtax2'];
 
-                $list[$assoc['rate']]['pid'][] = $assoc['pid'];
-                $list[$assoc['rate']]['pref'][] = $assoc['pref'];
-                $list[$assoc['rate']]['ptype'][] = $assoc['ptype'];
+				$list[$assoc['rate']]['pid'][] = $assoc['pid'];
+				$list[$assoc['rate']]['pref'][] = $assoc['pref'];
+				$list[$assoc['rate']]['ptype'][] = $assoc['ptype'];
 
-                $list[$assoc['rate']]['payment_id'][] = $assoc['payment_id'];
-                $list[$assoc['rate']]['payment_amount'][] = $assoc['payment_amount'];
+				$list[$assoc['rate']]['payment_id'][] = $assoc['payment_id'];
+				$list[$assoc['rate']]['payment_amount'][] = $assoc['payment_amount'];
 
-                $rate = $assoc['rate'];
-            }
-        } else {
-            dol_print_error($db);
-            return -3;
-        }
-    }
+				$rate = $assoc['rate'];
+			}
+		} else {
+			dol_print_error($db);
+			return -3;
+		}
+	}
 
 
-    // CASE OF EXPENSE REPORT
+	// CAS DES SERVICES
+
+	// Define sql request
+	$sql = '';
+	if (($direction == 'sell' && $conf->global->TAX_MODE_SELL_SERVICE == 'invoice')
+		|| ($direction == 'buy' && $conf->global->TAX_MODE_BUY_SERVICE == 'invoice'))
+	{
+		// Count on invoice date
+		$sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
+		$sql .= " d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
+		$sql .= " d.date_start as date_start, d.date_end as date_end,";
+		$sql .= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,";
+		$sql .= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";
+		$sql .= " 0 as payment_id, 0 as payment_amount";
+		$sql .= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
+		$sql .= " ".MAIN_DB_PREFIX."societe as s,";
+		$sql .= " ".MAIN_DB_PREFIX.$invoicedettable." as d";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
+		$sql .= " WHERE f.entity IN (".getEntity($invoicetable).")";
+		$sql .= " AND f.fk_statut in (1,2)"; // Validated or paid (partially or completely)
+		if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql .= " AND f.type IN (0,1,2,5)";
+		else $sql .= " AND f.type IN (0,1,2,3,5)";
+		$sql .= " AND f.rowid = d.".$fk_facture;
+		$sql .= " AND s.rowid = f.fk_soc";
+		if ($y && $m)
+		{
+			$sql .= " AND f.datef >= '".$db->idate(dol_get_first_day($y, $m, false))."'";
+			$sql .= " AND f.datef <= '".$db->idate(dol_get_last_day($y, $m, false))."'";
+		} elseif ($y)
+		{
+			$sql .= " AND f.datef >= '".$db->idate(dol_get_first_day($y, 1, false))."'";
+			$sql .= " AND f.datef <= '".$db->idate(dol_get_last_day($y, 12, false))."'";
+		}
+		if ($q) $sql .= " AND (date_format(f.datef,'%m') > ".(($q - 1) * 3)." AND date_format(f.datef,'%m') <= ".($q * 3).")";
+		if ($date_start && $date_end) $sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
+		$sql .= " AND (d.product_type = 1"; // Limit to services
+		$sql .= " OR d.date_start is NOT null OR d.date_end IS NOT NULL)"; // enhance detection of service
+		if (!empty($conf->global->MAIN_NOT_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
+		$sql .= " ORDER BY d.rowid, d.".$fk_facture;
+	} else {
+		// Count on payments date
+		$sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
+		$sql .= " d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
+		$sql .= " d.date_start as date_start, d.date_end as date_end,";
+		$sql .= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,";
+		$sql .= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";
+		$sql .= " pf.".$fk_payment." as payment_id, pf.amount as payment_amount,";
+		$sql .= " pa.datep as datep";
+		$sql .= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
+		$sql .= " ".MAIN_DB_PREFIX.$paymentfacturetable." as pf,";
+		$sql .= " ".MAIN_DB_PREFIX.$paymenttable." as pa,";
+		$sql .= " ".MAIN_DB_PREFIX."societe as s,";
+		$sql .= " ".MAIN_DB_PREFIX.$invoicedettable." as d";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
+		$sql .= " WHERE f.entity IN (".getEntity($invoicetable).")";
+		$sql .= " AND f.fk_statut in (1,2)"; // Paid (partially or completely)
+		if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql .= " AND f.type IN (0,1,2,5)";
+		else $sql .= " AND f.type IN (0,1,2,3,5)";
+		$sql .= " AND f.rowid = d.".$fk_facture;
+		$sql .= " AND s.rowid = f.fk_soc";
+		$sql .= " AND pf.".$fk_facture2." = f.rowid";
+		$sql .= " AND pa.rowid = pf.".$fk_payment;
+		if ($y && $m)
+		{
+			$sql .= " AND pa.datep >= '".$db->idate(dol_get_first_day($y, $m, false))."'";
+			$sql .= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, $m, false))."'";
+		} elseif ($y)
+		{
+			$sql .= " AND pa.datep >= '".$db->idate(dol_get_first_day($y, 1, false))."'";
+			$sql .= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, 12, false))."'";
+		}
+		if ($q) $sql .= " AND (date_format(pa.datep,'%m') > ".(($q - 1) * 3)." AND date_format(pa.datep,'%m') <= ".($q * 3).")";
+		if ($date_start && $date_end) $sql .= " AND pa.datep >= '".$db->idate($date_start)."' AND pa.datep <= '".$db->idate($date_end)."'";
+		$sql .= " AND (d.product_type = 1"; // Limit to services
+		$sql .= " OR d.date_start is NOT null OR d.date_end IS NOT NULL)"; // enhance detection of service
+		if (!empty($conf->global->MAIN_NOT_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
+		$sql .= " ORDER BY d.rowid, d.".$fk_facture.", pf.rowid";
+	}
+
+	if (!$sql)
+	{
+		dol_syslog("Tax.lib.php::tax_by_rate no accountancy module enabled".$sql, LOG_ERR);
+		return -1; // -1 = Not accountancy module enabled
+	}
+	if ($sql == 'TODO') return -2; // -2 = Feature not yet available
+	if ($sql != 'TODO')
+	{
+		dol_syslog("Tax.lib.php::tax_by_rate", LOG_DEBUG);
+		$resql = $db->query($sql);
+		if ($resql)
+		{
+			$rate = -1;
+			$oldrowid = '';
+			while ($assoc = $db->fetch_array($resql))
+			{
+				// Code to avoid warnings when array entry not defined
+				if (!isset($list[$assoc['rate']]['totalht']))   $list[$assoc['rate']]['totalht'] = 0;
+				if (!isset($list[$assoc['rate']]['vat']))       $list[$assoc['rate']]['vat'] = 0;
+				if (!isset($list[$assoc['rate']]['localtax1'])) $list[$assoc['rate']]['localtax1'] = 0;
+				if (!isset($list[$assoc['rate']]['localtax2'])) $list[$assoc['rate']]['localtax2'] = 0;
+
+				if ($assoc['rowid'] != $oldrowid)       // Si rupture sur d.rowid
+				{
+					$oldrowid = $assoc['rowid'];
+					$list[$assoc['rate']]['totalht']   += $assoc['total_ht'];
+					$list[$assoc['rate']]['vat']       += $assoc['total_vat'];
+					$list[$assoc['rate']]['localtax1'] += $assoc['total_localtax1'];
+					$list[$assoc['rate']]['localtax2'] += $assoc['total_localtax2'];
+				}
+				$list[$assoc['rate']]['dtotal_ttc'][] = $assoc['total_ttc'];
+				$list[$assoc['rate']]['dtype'][] = $assoc['dtype'];
+				$list[$assoc['rate']]['datef'][] = $db->jdate($assoc['datef']);
+				$list[$assoc['rate']]['datep'][] = $db->jdate($assoc['datep']);
+				$list[$assoc['rate']]['company_name'][] = $assoc['company_name'];
+				$list[$assoc['rate']]['company_id'][] = $assoc['company_id'];
+				$list[$assoc['rate']]['ddate_start'][] = $db->jdate($assoc['date_start']);
+				$list[$assoc['rate']]['ddate_end'][] = $db->jdate($assoc['date_end']);
+
+				$list[$assoc['rate']]['facid'][] = $assoc['facid'];
+				$list[$assoc['rate']]['facnum'][] = $assoc['facnum'];
+				$list[$assoc['rate']]['type'][] = $assoc['type'];
+				$list[$assoc['rate']]['ftotal_ttc'][] = $assoc['ftotal_ttc'];
+				$list[$assoc['rate']]['descr'][] = $assoc['descr'];
+
+				$list[$assoc['rate']]['totalht_list'][] = $assoc['total_ht'];
+				$list[$assoc['rate']]['vat_list'][] = $assoc['total_vat'];
+				$list[$assoc['rate']]['localtax1_list'][] = $assoc['total_localtax1'];
+				$list[$assoc['rate']]['localtax2_list'][] = $assoc['total_localtax2'];
+
+				$list[$assoc['rate']]['pid'][] = $assoc['pid'];
+				$list[$assoc['rate']]['pref'][] = $assoc['pref'];
+				$list[$assoc['rate']]['ptype'][] = $assoc['ptype'];
+
+				$list[$assoc['rate']]['payment_id'][] = $assoc['payment_id'];
+				$list[$assoc['rate']]['payment_amount'][] = $assoc['payment_amount'];
+
+				$rate = $assoc['rate'];
+			}
+		} else {
+			dol_print_error($db);
+			return -3;
+		}
+	}
+
+
+	// CASE OF EXPENSE REPORT
 
 	if ($direction == 'buy')		// buy only for expense reports
 	{
@@ -932,7 +932,7 @@ function tax_by_rate($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
 					{
 						$oldrowid = $assoc['rowid'];
 						$list[$assoc['rate']]['totalht']   += $assoc['total_ht'];
-                        $list[$assoc['rate']]['vat'] += $assoc['total_vat'];
+						$list[$assoc['rate']]['vat'] += $assoc['total_vat'];
 						$list[$assoc['rate']]['localtax1'] += $assoc['total_localtax1'];
 						$list[$assoc['rate']]['localtax2'] += $assoc['total_localtax2'];
 					}
diff --git a/htdocs/core/lib/treeview.lib.php b/htdocs/core/lib/treeview.lib.php
index c0cfa20f529..e4de8b0c833 100644
--- a/htdocs/core/lib/treeview.lib.php
+++ b/htdocs/core/lib/treeview.lib.php
@@ -49,7 +49,7 @@ function tree_showpad(&$fulltree, $key, $silent = 0)
 		//print 'x'.$key;
 		foreach ($fulltree as $key2 => $val2)
 		{
-            //print "x".$pos." ".$key2." ".$found." ".$fulltree[$key2]['level'];
+			//print "x".$pos." ".$key2." ".$found." ".$fulltree[$key2]['level'];
 			if ($found == 1) // We are after the entry to show
 			{
 				if ($fulltree[$key2]['level'] > $pos)
@@ -75,14 +75,14 @@ function tree_showpad(&$fulltree, $key, $silent = 0)
 
 		if (!$silent)
 		{
-    		if ($atleastoneofthislevelafter)
-    		{
-    			if ($fulltree[$key]['level'] == $pos) print img_picto_common('', 'treemenu/branch.gif');
-    			else print img_picto_common('', 'treemenu/line.gif');
-    		} else {
-    			if ($fulltree[$key]['level'] == $pos) print img_picto_common('', 'treemenu/branchbottom.gif');
-    			else print img_picto_common('', 'treemenu/linebottom.gif');
-    		}
+			if ($atleastoneofthislevelafter)
+			{
+				if ($fulltree[$key]['level'] == $pos) print img_picto_common('', 'treemenu/branch.gif');
+				else print img_picto_common('', 'treemenu/line.gif');
+			} else {
+				if ($fulltree[$key]['level'] == $pos) print img_picto_common('', 'treemenu/branchbottom.gif');
+				else print img_picto_common('', 'treemenu/linebottom.gif');
+			}
 		}
 		$pos++;
 	}
@@ -114,11 +114,11 @@ function tree_showpad(&$fulltree, $key, $silent = 0)
  */
 function tree_recur($tab, $pere, $rang, $iddivjstree = 'iddivjstree', $donoresetalreadyloaded = 0, $showfk = 0, $moreparam = '')
 {
-    global $tree_recur_alreadyadded, $menu_handler_to_search;
+	global $tree_recur_alreadyadded, $menu_handler_to_search;
 
-    if ($rang == 0 && empty($donoresetalreadyloaded)) $tree_recur_alreadyadded = array();
+	if ($rang == 0 && empty($donoresetalreadyloaded)) $tree_recur_alreadyadded = array();
 
-    if ($rang == 0)
+	if ($rang == 0)
 	{
 		// Test also done with jstree and dynatree (not able to have <a> inside label)
 		print '<script type="text/javascript" language="javascript">
@@ -140,7 +140,7 @@ function tree_recur($tab, $pere, $rang, $iddivjstree = 'iddivjstree', $donoreset
 
 	if ($rang > 50)
 	{
-	    return; // Protect against infinite loop. Max 50 depth
+		return; // Protect against infinite loop. Max 50 depth
 	}
 
 	//ballayage du tableau
@@ -152,71 +152,71 @@ function tree_recur($tab, $pere, $rang, $iddivjstree = 'iddivjstree', $donoreset
 		// If an element has $pere for parent
 		if ($tab[$x]['fk_menu'] != -1 && $tab[$x]['fk_menu'] == $pere['rowid'])
 		{
-		    //print 'rang='.$rang.'-x='.$x." rowid=".$tab[$x]['rowid']." tab[x]['fk_leftmenu'] = ".$tab[$x]['fk_leftmenu']." leftmenu pere = ".$pere['leftmenu']."<br>\n";
+			//print 'rang='.$rang.'-x='.$x." rowid=".$tab[$x]['rowid']." tab[x]['fk_leftmenu'] = ".$tab[$x]['fk_leftmenu']." leftmenu pere = ".$pere['leftmenu']."<br>\n";
 			if (empty($ulprinted) && !empty($pere['rowid']))
 			{
-    		    if (!empty($tree_recur_alreadyadded[$tab[$x]['rowid']]))
-    		    {
-    		          dol_syslog('Error, record with id '.$tab[$x]['rowid'].' seems to be a child of record with id '.$pere['rowid'].' but it was already output. Complete field "leftmenu" and "mainmenu" on ALL records to avoid ambiguity.', LOG_WARNING);
-    		          continue;
-    		    }
+				if (!empty($tree_recur_alreadyadded[$tab[$x]['rowid']]))
+				{
+					  dol_syslog('Error, record with id '.$tab[$x]['rowid'].' seems to be a child of record with id '.$pere['rowid'].' but it was already output. Complete field "leftmenu" and "mainmenu" on ALL records to avoid ambiguity.', LOG_WARNING);
+					  continue;
+				}
 
-                print '<ul'.(empty($pere['rowid']) ? ' id="treeData"' : '').'>'; $ulprinted++;
+				print '<ul'.(empty($pere['rowid']) ? ' id="treeData"' : '').'>'; $ulprinted++;
 			}
 			print "\n".'<li '.($tab[$x]['statut'] ? ' class="liuseractive"' : 'class="liuserdisabled"').'>';
 			if ($showfk)
 			{
-			    print '<table class="nobordernopadding centpercent"><tr><td>';
-			    print '<strong> &nbsp; ';
-			    print $tab[$x]['title'];
-			    print '&nbsp; (fk_mainmenu='.$tab[$x]['fk_mainmenu'].' fk_leftmenu='.$tab[$x]['fk_leftmenu'].')';
-			    print '</td><td class="right">';
-			    print $tab[$x]['buttons'];
-			    print '</td></tr></table>';
+				print '<table class="nobordernopadding centpercent"><tr><td>';
+				print '<strong> &nbsp; ';
+				print $tab[$x]['title'];
+				print '&nbsp; (fk_mainmenu='.$tab[$x]['fk_mainmenu'].' fk_leftmenu='.$tab[$x]['fk_leftmenu'].')';
+				print '</td><td class="right">';
+				print $tab[$x]['buttons'];
+				print '</td></tr></table>';
 			} else {
-			    print $tab[$x]['entry'];
+				print $tab[$x]['entry'];
 			}
 			//print ' -> A '.$tab[$x]['rowid'].' mainmenu='.$tab[$x]['mainmenu'].' leftmenu='.$tab[$x]['leftmenu'].' fk_mainmenu='.$tab[$x]['fk_mainmenu'].' fk_leftmenu='.$tab[$x]['fk_leftmenu'].'<br>'."\n";
-		    $tree_recur_alreadyadded[$tab[$x]['rowid']] = ($rang + 1);
+			$tree_recur_alreadyadded[$tab[$x]['rowid']] = ($rang + 1);
 			// And now we search all its sons of lower level
 			tree_recur($tab, $tab[$x], $rang + 1, 'iddivjstree', 0, $showfk);
 			print '</li>';
 		} elseif (!empty($tab[$x]['rowid']) && $tab[$x]['fk_menu'] == -1 && $tab[$x]['fk_mainmenu'] == $pere['mainmenu'] && $tab[$x]['fk_leftmenu'] == $pere['leftmenu']) {
-		    //print 'rang='.$rang.'-x='.$x." rowid=".$tab[$x]['rowid']." tab[x]['fk_leftmenu'] = ".$tab[$x]['fk_leftmenu']." leftmenu pere = ".$pere['leftmenu']."<br>\n";
-		    if (empty($ulprinted) && !empty($pere['rowid']))
-		    {
-		        if (!empty($tree_recur_alreadyadded[$tab[$x]['rowid']]))
-		        {
-		            dol_syslog('Error, record with id '.$tab[$x]['rowid'].' seems to be a child of record with id '.$pere['rowid'].' but it was already output. Complete field "leftmenu" and "mainmenu" on ALL records to avoid ambiguity.', LOG_WARNING);
-		            //print 'Error, record with id '.$tab[$x]['rowid'].' seems to be a child of record with id '.$pere['rowid'].' but it was already output. Complete field "leftmenu" and "mainmenu" on ALL records to avoid ambiguity.';
-                    continue;
-		        }
+			//print 'rang='.$rang.'-x='.$x." rowid=".$tab[$x]['rowid']." tab[x]['fk_leftmenu'] = ".$tab[$x]['fk_leftmenu']." leftmenu pere = ".$pere['leftmenu']."<br>\n";
+			if (empty($ulprinted) && !empty($pere['rowid']))
+			{
+				if (!empty($tree_recur_alreadyadded[$tab[$x]['rowid']]))
+				{
+					dol_syslog('Error, record with id '.$tab[$x]['rowid'].' seems to be a child of record with id '.$pere['rowid'].' but it was already output. Complete field "leftmenu" and "mainmenu" on ALL records to avoid ambiguity.', LOG_WARNING);
+					//print 'Error, record with id '.$tab[$x]['rowid'].' seems to be a child of record with id '.$pere['rowid'].' but it was already output. Complete field "leftmenu" and "mainmenu" on ALL records to avoid ambiguity.';
+					continue;
+				}
 
-		        print '<ul'.(empty($pere['rowid']) ? ' id="treeData"' : '').'>'; $ulprinted++;
-		    }
+				print '<ul'.(empty($pere['rowid']) ? ' id="treeData"' : '').'>'; $ulprinted++;
+			}
 			print "\n".'<li '.($tab[$x]['statut'] ? ' class="liuseractive"' : 'class="liuserdisabled"').'>';
 			if ($showfk)
 			{
-			    print '<table class="nobordernopadding centpercent"><tr><td>';
-			    print '<strong> &nbsp; <a href="edit.php?menu_handler='.$menu_handler_to_search.'&action=edit&menuId='.$tab[$x]['rowid'].$moreparam.'">';
-			    print $tab[$x]['title'];
-			    print '</a></strong>';
-			    print '&nbsp; (mainmenu='.$tab[$x]['mainmenu'].' leftmenu='.$tab[$x]['leftmenu'].' - fk_mainmenu='.$tab[$x]['fk_mainmenu'].' fk_leftmenu='.$tab[$x]['fk_leftmenu'].')';
-			    print '</td><td class="right">';
-			    print $tab[$x]['buttons'];
-			    print '</td></tr></table>';
+				print '<table class="nobordernopadding centpercent"><tr><td>';
+				print '<strong> &nbsp; <a href="edit.php?menu_handler='.$menu_handler_to_search.'&action=edit&menuId='.$tab[$x]['rowid'].$moreparam.'">';
+				print $tab[$x]['title'];
+				print '</a></strong>';
+				print '&nbsp; (mainmenu='.$tab[$x]['mainmenu'].' leftmenu='.$tab[$x]['leftmenu'].' - fk_mainmenu='.$tab[$x]['fk_mainmenu'].' fk_leftmenu='.$tab[$x]['fk_leftmenu'].')';
+				print '</td><td class="right">';
+				print $tab[$x]['buttons'];
+				print '</td></tr></table>';
 			} else {
-			    print $tab[$x]['entry'];
+				print $tab[$x]['entry'];
 			}
 			//print ' -> B '.$tab[$x]['rowid'].' mainmenu='.$tab[$x]['mainmenu'].' leftmenu='.$tab[$x]['leftmenu'].' fk_mainmenu='.$tab[$x]['fk_mainmenu'].' fk_leftmenu='.$tab[$x]['fk_leftmenu'].'<br>'."\n";
 			$tree_recur_alreadyadded[$tab[$x]['rowid']] = ($rang + 1);
 			// And now we search all its sons of lower level
 			//print 'Call tree_recur for x='.$x.' rowid='.$tab[$x]['rowid']." fk_mainmenu pere = ".$tab[$x]['fk_mainmenu']." fk_leftmenu pere = ".$tab[$x]['fk_leftmenu']."<br>\n";
-		    tree_recur($tab, $tab[$x], $rang + 1, 'iddivjstree', 0, $showfk);
+			tree_recur($tab, $tab[$x], $rang + 1, 'iddivjstree', 0, $showfk);
 			print '</li>';
 		}
 	}
 	if (!empty($ulprinted) && !empty($pere['rowid'])) { print '</ul>'."\n"; }
 
-    if ($rang == 0) print '</ul>';
+	if ($rang == 0) print '</ul>';
 }
diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php
index 722c0f41263..c464d36c5c1 100644
--- a/htdocs/core/lib/usergroups.lib.php
+++ b/htdocs/core/lib/usergroups.lib.php
@@ -38,8 +38,7 @@ function user_prepare_head($object)
 	$langs->load("users");
 
 	$canreadperms = true;
-	if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS))
-	{
+	if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS)) {
 		$canreadperms = ($user->admin || ($user->id != $object->id && $user->rights->user->user_advance->readperms) || ($user->id == $object->id && $user->rights->user->self_advance->readperms));
 	}
 
@@ -52,8 +51,7 @@ function user_prepare_head($object)
 	$h++;
 
 	if ((!empty($conf->ldap->enabled) && !empty($conf->global->LDAP_SYNCHRO_ACTIVE))
-		&& (empty($conf->global->MAIN_DISABLE_LDAP_TAB) || !empty($user->admin)))
-	{
+		&& (empty($conf->global->MAIN_DISABLE_LDAP_TAB) || !empty($user->admin))) {
 		$langs->load("ldap");
 		$head[$h][0] = DOL_URL_ROOT.'/user/ldap.php?id='.$object->id;
 		$head[$h][1] = $langs->trans("LDAPCard");
@@ -61,8 +59,7 @@ function user_prepare_head($object)
 		$h++;
 	}
 
-	if ($canreadperms)
-	{
+	if ($canreadperms) {
 		$head[$h][0] = DOL_URL_ROOT.'/user/perms.php?id='.$object->id;
 		$head[$h][1] = $langs->trans("Rights").(empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '<span class="badge marginleftonlyshort">'.($object->nb_rights).'</span>' : '');
 		$head[$h][2] = 'rights';
@@ -74,15 +71,13 @@ function user_prepare_head($object)
 	$head[$h][2] = 'guisetup';
 	$h++;
 
-	if (!empty($conf->agenda->enabled))
-	{
+	if (!empty($conf->agenda->enabled)) {
 		if (empty($conf->global->AGENDA_EXT_NB)) $conf->global->AGENDA_EXT_NB = 5;
 		$MAXAGENDA = $conf->global->AGENDA_EXT_NB;
 
 		$i = 1;
 		$nbagenda = 0;
-		while ($i <= $MAXAGENDA)
-		{
+		while ($i <= $MAXAGENDA) {
 			$key = $i;
 			$name = 'AGENDA_EXT_NAME_'.$object->id.'_'.$key;
 			$src = 'AGENDA_EXT_SRC_'.$object->id.'_'.$key;
@@ -99,8 +94,7 @@ function user_prepare_head($object)
 		$h++;
 	}
 
-	if (!empty($conf->clicktodial->enabled))
-	{
+	if (!empty($conf->clicktodial->enabled)) {
 		$head[$h][0] = DOL_URL_ROOT.'/user/clicktodial.php?id='.$object->id;
 		$head[$h][1] = $langs->trans("ClickToDial");
 		$head[$h][2] = 'clicktodial';
@@ -108,19 +102,16 @@ function user_prepare_head($object)
 	}
 
 	// Notifications
-	if ($user->socid == 0 && !empty($conf->notification->enabled))
-	{
+	if ($user->socid == 0 && !empty($conf->notification->enabled)) {
 		$nbNote = 0;
 		$sql = "SELECT COUNT(n.rowid) as nb";
 		$sql .= " FROM ".MAIN_DB_PREFIX."notify_def as n";
 		$sql .= " WHERE fk_user = ".$object->id;
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $db->num_rows($resql);
 			$i = 0;
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$obj = $db->fetch_object($resql);
 				$nbNote = $obj->nb;
 				$i++;
@@ -147,8 +138,7 @@ function user_prepare_head($object)
 		|| (!empty($conf->hrm->enabled) && !empty($user->rights->hrm->employee->read))
 		|| (!empty($conf->expensereport->enabled) && !empty($user->rights->expensereport->lire) && ($user->id == $object->id || $user->rights->expensereport->readall))
 		|| (!empty($conf->holiday->enabled) && !empty($user->rights->holiday->read) && ($user->id == $object->id || $user->rights->holiday->read_all))
-		)
-	{
+		) {
 		// Bank
 		$head[$h][0] = DOL_URL_ROOT.'/user/bank.php?id='.$object->id;
 		$head[$h][1] = $langs->trans("HRAndBank");
@@ -157,8 +147,7 @@ function user_prepare_head($object)
 	}
 
 	// Such info on users is visible only by internal user
-	if (empty($user->socid))
-	{
+	if (empty($user->socid)) {
 		// Notes
 		$nbNote = 0;
 		if (!empty($object->note)) $nbNote++;
@@ -202,8 +191,7 @@ function group_prepare_head($object)
 	global $langs, $conf, $user;
 
 	$canreadperms = true;
-	if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS))
-	{
+	if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS)) {
 		$canreadperms = ($user->admin || $user->rights->user->group_advance->readperms);
 	}
 
@@ -216,8 +204,7 @@ function group_prepare_head($object)
 	$h++;
 
 	if ((!empty($conf->ldap->enabled) && !empty($conf->global->LDAP_SYNCHRO_ACTIVE))
-		&& (empty($conf->global->MAIN_DISABLE_LDAP_TAB) || !empty($user->admin)))
-	{
+		&& (empty($conf->global->MAIN_DISABLE_LDAP_TAB) || !empty($user->admin))) {
 		$langs->load("ldap");
 		$head[$h][0] = DOL_URL_ROOT.'/user/group/ldap.php?id='.$object->id;
 		$head[$h][1] = $langs->trans("LDAPCard");
@@ -225,8 +212,7 @@ function group_prepare_head($object)
 		$h++;
 	}
 
-	if ($canreadperms)
-	{
+	if ($canreadperms) {
 		$head[$h][0] = DOL_URL_ROOT.'/user/group/perms.php?id='.$object->id;
 		$head[$h][1] = $langs->trans("GroupRights").'<span class="badge marginleftonlyshort">'.($object->nb_rights).'</span>';
 		$head[$h][2] = 'rights';
@@ -255,7 +241,7 @@ function user_admin_prepare_head()
 
 	$langs->load("users");
 	$h = 0;
-    $head = array();
+	$head = array();
 
 	$head[$h][0] = DOL_URL_ROOT.'/admin/user.php';
 	$head[$h][1] = $langs->trans("Parameters");
@@ -305,10 +291,8 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 	$formother = new FormOther($db);
 
 	$dirthemes = array('/theme');
-	if (!empty($conf->modules_parts['theme']))		// Using this feature slow down application
-	{
-		foreach ($conf->modules_parts['theme'] as $reldir)
-		{
+	if (!empty($conf->modules_parts['theme'])) {		// Using this feature slow down application
+		foreach ($conf->modules_parts['theme'] as $reldir) {
 			$dirthemes = array_merge($dirthemes, (array) ($reldir.'theme'));
 		}
 	}
@@ -334,8 +318,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 	print '<table class="noborder centpercent'.($edit ? ' editmode' : '').' tableforfield">';
 
 	// Title
-	if ($foruserprofile)
-	{
+	if ($foruserprofile) {
 		print '<tr class="liste_titre"><th class="titlefield">'.$langs->trans("Parameter").'</th><th>'.$langs->trans("DefaultValue").'</th>';
 		print '<th colspan="2">&nbsp;</th>';
 		print '</tr>';
@@ -348,8 +331,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		print '</tr>';
 	} else {
 		$dirthemestring = '';
-		foreach ($dirthemes as $dirtheme)
-		{
+		foreach ($dirthemes as $dirtheme) {
 			$dirthemestring .= '"'.$dirtheme.'" ';
 		}
 
@@ -369,22 +351,17 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 	print '<table class="nobordernopadding" width="100%"><tr><td><div class="center">';
 
 	$i = 0;
-	foreach ($dirthemes as $dir)
-	{
+	foreach ($dirthemes as $dir) {
 		//print $dirroot.$dir;exit;
 		$dirtheme = dol_buildpath($dir, 0); // This include loop on $conf->file->dol_document_root
 		$urltheme = dol_buildpath($dir, 1);
 
-		if (is_dir($dirtheme))
-		{
+		if (is_dir($dirtheme)) {
 			$handle = opendir($dirtheme);
-			if (is_resource($handle))
-			{
-				while (($subdir = readdir($handle)) !== false)
-				{
+			if (is_resource($handle)) {
+				while (($subdir = readdir($handle)) !== false) {
 					if (is_dir($dirtheme."/".$subdir) && substr($subdir, 0, 1) <> '.'
-							&& substr($subdir, 0, 3) <> 'CVS' && !preg_match('/common|phones/i', $subdir))
-					{
+							&& substr($subdir, 0, 3) <> 'CVS' && !preg_match('/common|phones/i', $subdir)) {
 						// Disable not stable themes (dir ends with _exp or _dev)
 						if ($conf->global->MAIN_FEATURES_LEVEL < 2 && preg_match('/_dev$/i', $subdir)) continue;
 						if ($conf->global->MAIN_FEATURES_LEVEL < 1 && preg_match('/_exp$/i', $subdir)) continue;
@@ -398,8 +375,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 						else $title = $langs->trans("ShowPreview");
 						print '<img class="img-skinthumb shadow" src="'.$url.'" alt="'.$title.'" title="'.$title.'" style="border: none; margin-bottom: 5px;">';
 						print '</a><br>';
-						if ($subdir == $selected_theme)
-						{
+						if ($subdir == $selected_theme) {
 							print '<input '.($edit ? '' : 'disabled').' type="radio" class="themethumbs" style="border: 0px;" checked name="main_theme" value="'.$subdir.'"> <b>'.$subdir.'</b>';
 						} else {
 							print '<input '.($edit ? '' : 'disabled').' type="radio" class="themethumbs" style="border: 0px;" name="main_theme" value="'.$subdir.'"> '.$subdir;
@@ -435,14 +411,12 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 	}
 
 	// Show logo
-	if ($foruserprofile)
-	{
+	if ($foruserprofile) {
 		// Nothing
 	} else {
 		// Show logo
 		print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("EnableShowLogo").'</td><td>';
-		if ($edit)
-		{
+		if ($edit) {
 			print ajax_constantonoff('MAIN_SHOW_LOGO', array(), null, 0, 0, 1);
 			//print $form->selectyesno('MAIN_SHOW_LOGO', $conf->global->MAIN_SHOW_LOGO, 1);
 		} else {
@@ -457,8 +431,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 
 
 	// TopMenuDisableImages
-	if ($foruserprofile)
-	{
+	if ($foruserprofile) {
 		/*
          print '<tr class="oddeven">';
          print '<td>'.$langs->trans("TopMenuDisableImages").'</td>';
@@ -469,7 +442,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
          print '<td>';
          if ($edit)
          {
-         print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_TOPMENU_DISABLE_IMAGE,array()),''),'THEME_TOPMENU_DISABLE_IMAGE','formcolor',1).' ';
+         print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_TOPMENU_DISABLE_IMAGE,array()),''),'THEME_TOPMENU_DISABLE_IMAGE','',1).' ';
          }
          else
          {
@@ -484,8 +457,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		print '<tr class="oddeven">';
 		print '<td>'.$langs->trans("TopMenuDisableImages").'</td>';
 		print '<td colspan="'.($colspan - 1).'">';
-		if ($edit)
-		{
+		if ($edit) {
 			print ajax_constantonoff('THEME_TOPMENU_DISABLE_IMAGE', array(), null, 0, 0, 1);
 			//print $form->selectyesno('THEME_TOPMENU_DISABLE_IMAGE', $conf->global->THEME_TOPMENU_DISABLE_IMAGE, 1);
 		} else {
@@ -498,8 +470,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 	}
 
 	// Background color THEME_ELDY_BACKBODY
-	if ($foruserprofile)
-	{
+	if ($foruserprofile) {
 		/*
 	    print '<tr class="oddeven">';
 	    print '<td>'.$langs->trans("TopMenuBackgroundColor").'</td>';
@@ -510,7 +481,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
         print '<td>';
 	    if ($edit)
 	    {
-			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TOPMENU_BACK1,array()),''),'THEME_ELDY_TOPMENU_BACK1','formcolor',1).' ';
+			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TOPMENU_BACK1,array()),''),'THEME_ELDY_TOPMENU_BACK1','',1).' ';
 	    }
 	   	else
 	   	{
@@ -525,9 +496,8 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		print '<td>'.$langs->trans("BackgroundColor").'</td>';
 		print '<td colspan="'.($colspan - 1).'">';
 		//var_dump($conf->global->THEME_ELDY_BACKBODY);
-		if ($edit)
-		{
-			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_BACKBODY, array()), ''), 'THEME_ELDY_BACKBODY', 'formcolor', 1, '', '', 'colorbackbody').' ';
+		if ($edit) {
+			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_BACKBODY, array()), ''), 'THEME_ELDY_BACKBODY', '', 1, '', '', 'colorbackbody').' ';
 		} else {
 	   		$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_BACKBODY, array()), '');
 			if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
@@ -540,8 +510,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 	}
 
 	// TopMenuBackgroundColor
-	if ($foruserprofile)
-	{
+	if ($foruserprofile) {
 		/*
 	    print '<tr class="oddeven">';
 	    print '<td>'.$langs->trans("TopMenuBackgroundColor").'</td>';
@@ -552,7 +521,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
         print '<td>';
 	    if ($edit)
 	    {
-			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TOPMENU_BACK1,array()),''),'THEME_ELDY_TOPMENU_BACK1','formcolor',1).' ';
+			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TOPMENU_BACK1,array()),''),'THEME_ELDY_TOPMENU_BACK1','',1).' ';
 	    }
 	   	else
 	   	{
@@ -568,9 +537,8 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		print '<tr class="oddeven">';
 		print '<td>'.$langs->trans("TopMenuBackgroundColor").'</td>';
 		print '<td colspan="'.($colspan - 1).'">';
-		if ($edit)
-		{
-			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TOPMENU_BACK1, array()), ''), 'THEME_ELDY_TOPMENU_BACK1', 'formcolor', 1, '', '', 'colorbackhmenu1').' ';
+		if ($edit) {
+			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TOPMENU_BACK1, array()), ''), 'THEME_ELDY_TOPMENU_BACK1', '', 1, '', '', 'colorbackhmenu1').' ';
 		} else {
 	   		$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TOPMENU_BACK1, array()), '');
 			if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
@@ -583,8 +551,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 	}
 
 	// LeftMenuBackgroundColor
-	if ($foruserprofile)
-	{
+	if ($foruserprofile) {
 		/*
 		 print '<tr class="oddeven">';
 		 print '<td>'.$langs->trans("TopMenuBackgroundColor").'</td>';
@@ -595,7 +562,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		 print '<td>';
 		 if ($edit)
 		 {
-		 print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_VERMENU_BACK1,array()),''),'THEME_ELDY_VERMENU_BACK1','formcolor',1).' ';
+		 print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_VERMENU_BACK1,array()),''),'THEME_ELDY_VERMENU_BACK1','',1).' ';
 		 }
 		 else
 		 {
@@ -611,9 +578,8 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		print '<tr class="oddeven">';
 		print '<td>'.$langs->trans("LeftMenuBackgroundColor").'</td>';
 		print '<td colspan="'.($colspan - 1).'">';
-		if ($edit)
-		{
-			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_VERMENU_BACK1, array()), ''), 'THEME_ELDY_VERMENU_BACK1', 'formcolor', 1, '', '', 'colorbackvmenu1').' ';
+		if ($edit) {
+			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_VERMENU_BACK1, array()), ''), 'THEME_ELDY_VERMENU_BACK1', '', 1, '', '', 'colorbackvmenu1').' ';
 		} else {
 			$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_VERMENU_BACK1, array()), '');
 			if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
@@ -626,17 +592,15 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 	}
 
 	// TextTitleColor for title of Pages
-	if ($foruserprofile)
-	{
+	if ($foruserprofile) {
 	} else {
 		$default = (empty($colortexttitlenotab) ? $langs->trans("Unknown") : colorArrayToHex(colorStringToArray($colortexttitlenotab)));
 
 		print '<tr class="oddeven">';
 		print '<td>'.$langs->trans("TextTitleColor").'</td>';
 		print '<td colspan="'.($colspan - 1).'">';
-		if ($edit)
-		{
-			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTTITLENOTAB, array()), ''), 'THEME_ELDY_TEXTTITLENOTAB', 'formcolor', 1, '', '', 'colortexttitlenotab').' ';
+		if ($edit) {
+			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTTITLENOTAB, array()), ''), 'THEME_ELDY_TEXTTITLENOTAB', '', 1, '', '', 'colortexttitlenotab').' ';
 		} else {
 			print $formother->showColor($conf->global->THEME_ELDY_TEXTTITLENOTAB, $langs->trans("Default"));
 		}
@@ -648,17 +612,15 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 	}
 
 	// BackgroundTableTitleColor
-	if ($foruserprofile)
-	{
+	if ($foruserprofile) {
 	} else {
 		$default = (empty($colorbacktitle1) ? $langs->trans("Unknown") : colorArrayToHex(colorStringToArray($colorbacktitle1)));
 
 		print '<tr class="oddeven">';
 		print '<td>'.$langs->trans("BackgroundTableTitleColor").'</td>';
 		print '<td colspan="'.($colspan - 1).'">';
-		if ($edit)
-		{
-			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_BACKTITLE1, array()), ''), 'THEME_ELDY_BACKTITLE1', 'formcolor', 1, '', '', 'colorbacktitle1').' ';
+		if ($edit) {
+			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_BACKTITLE1, array()), ''), 'THEME_ELDY_BACKTITLE1', '', 1, '', '', 'colorbacktitle1').' ';
 		} else {
 	   		print $formother->showColor($conf->global->THEME_ELDY_BACKTITLE1, $langs->trans("Default"));
 	   	}
@@ -670,17 +632,15 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 	}
 
 	// TextTitleColor
-	if ($foruserprofile)
-	{
+	if ($foruserprofile) {
 	} else {
 		$default = (empty($colortexttitle) ? $langs->trans("Unknown") : colorArrayToHex(colorStringToArray($colortexttitle)));
 
 		print '<tr class="oddeven">';
 		print '<td>'.$langs->trans("BackgroundTableTitleTextColor").'</td>';
 		print '<td colspan="'.($colspan - 1).'">';
-		if ($edit)
-		{
-			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTTITLE, array()), ''), 'THEME_ELDY_TEXTTITLE', 'formcolor', 1, '', '', 'colortexttitle').' ';
+		if ($edit) {
+			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTTITLE, array()), ''), 'THEME_ELDY_TEXTTITLE', '', 1, '', '', 'colortexttitle').' ';
 		} else {
 			print $formother->showColor($conf->global->THEME_ELDY_TEXTTITLE, $langs->trans("Default"));
 		}
@@ -692,17 +652,15 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 	}
 
 	// TextTitleLinkColor
-	if ($foruserprofile)
-	{
+	if ($foruserprofile) {
 	} else {
-		$default=(empty($colortexttitlelink) ? $langs->trans("Unknown") : colorArrayToHex(colorStringToArray($colortexttitlelink)));
+		$default = (empty($colortexttitlelink) ? $langs->trans("Unknown") : colorArrayToHex(colorStringToArray($colortexttitlelink)));
 
 		print '<tr class="oddeven">';
 		print '<td>'.$langs->trans("BackgroundTableTitleTextlinkColor").'</td>';
 		print '<td colspan="'.($colspan - 1).'">';
-		if ($edit)
-		{
-			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTTITLELINK, array()), ''), 'THEME_ELDY_TEXTTITLELINK', 'formcolor', 1, '', '', 'colortexttitlelink').' ';
+		if ($edit) {
+			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTTITLELINK, array()), ''), 'THEME_ELDY_TEXTTITLELINK', '', 1, '', '', 'colortexttitlelink').' ';
 		} else {
 			print $formother->showColor($conf->global->THEME_ELDY_TEXTTITLELINK, $langs->trans("Default"));
 		}
@@ -715,17 +673,15 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 	}
 
 	// BackgroundTableLineOddColor
-	if ($foruserprofile)
-	{
+	if ($foruserprofile) {
 	} else {
 		$default = (empty($colorbacklineimpair1) ? $langs->trans("Unknown") : colorArrayToHex(colorStringToArray($colorbacklineimpair1)));
 
 		print '<tr class="oddeven">';
 		print '<td>'.$langs->trans("BackgroundTableLineOddColor").'</td>';
 		print '<td colspan="'.($colspan - 1).'">';
-		if ($edit)
-		{
-			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_LINEIMPAIR1, array()), ''), 'THEME_ELDY_LINEIMPAIR1', 'formcolor', 1, '', '', 'colorbacklinepair2').' ';
+		if ($edit) {
+			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_LINEIMPAIR1, array()), ''), 'THEME_ELDY_LINEIMPAIR1', '', 1, '', '', 'colorbacklinepair2').' ';
 		} else {
 			$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_LINEIMPAIR1, array()), '');
 			if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
@@ -738,17 +694,15 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 	}
 
 	// BackgroundTableLineEvenColor
-	if ($foruserprofile)
-	{
+	if ($foruserprofile) {
 	} else {
 		$default = (empty($colorbacklinepair1) ? $langs->trans("Unknown") : colorArrayToHex(colorStringToArray($colorbacklinepair1)));
 
 		print '<tr class="oddeven">';
 		print '<td>'.$langs->trans("BackgroundTableLineEvenColor").'</td>';
 		print '<td colspan="'.($colspan - 1).'">';
-		if ($edit)
-		{
-			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_LINEPAIR1, array()), ''), 'THEME_ELDY_LINEPAIR1', 'formcolor', 1, '', '', 'colorbacklineimpair2').' ';
+		if ($edit) {
+			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_LINEPAIR1, array()), ''), 'THEME_ELDY_LINEPAIR1', '', 1, '', '', 'colorbacklineimpair2').' ';
 		} else {
 			$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_LINEPAIR1, array()), '');
 			if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
@@ -761,8 +715,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 	}
 
 	// Text LinkColor
-	if ($foruserprofile)
-	{
+	if ($foruserprofile) {
 		/*
 	     print '<tr class="oddeven">';
 	     print '<td>'.$langs->trans("TopMenuBackgroundColor").'</td>';
@@ -773,7 +726,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 	     print '<td>';
 	     if ($edit)
 	     {
-	     print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTLINK,array()),''),'THEME_ELDY_TEXTLINK','formcolor',1).' ';
+	     print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTLINK,array()),''),'THEME_ELDY_TEXTLINK','',1).' ';
 	     }
 	     else
 	     {
@@ -789,9 +742,8 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		print '<tr class="oddeven">';
 		print '<td>'.$langs->trans("LinkColor").'</td>';
 		print '<td colspan="'.($colspan - 1).'">';
-		if ($edit)
-		{
-			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTLINK, array()), ''), 'THEME_ELDY_TEXTLINK', 'formcolor', 1, '', '', 'colortextlink').' ';
+		if ($edit) {
+			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTLINK, array()), ''), 'THEME_ELDY_TEXTLINK', '', 1, '', '', 'colortextlink').' ';
 		} else {
 			$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTLINK, array()), '');
 			if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
@@ -808,8 +760,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 	}
 
 	// Use Hover
-	if ($foruserprofile)
-	{
+	if ($foruserprofile) {
 		/* Must first change option to choose color of highlight instead of yes or no.
 	     print '<tr class="oddeven">';
 	     print '<td>'.$langs->trans("HighlightLinesOnMouseHover").'</td>';
@@ -828,16 +779,14 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		print '<td colspan="'.($colspan - 1).'">';
 		//print '<input name="check_THEME_ELDY_USE_HOVER"'.($edit?'':' disabled').' type="checkbox" '.($hoverdisabled?"":" checked").'>';
 		//print ' &nbsp; ('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
-		if ($edit)
-		{
+		if ($edit) {
 			if ($conf->global->THEME_ELDY_USE_HOVER == '1') $color = colorArrayToHex(colorStringToArray($colorbacklinepairhover));
 			else $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_USE_HOVER, array()), '');
-			print $formother->selectColor($color, 'THEME_ELDY_USE_HOVER', 'formcolor', 1, '', '', 'colorbacklinepairhover').' ';
+			print $formother->selectColor($color, 'THEME_ELDY_USE_HOVER', '', 1, '', '', 'colorbacklinepairhover').' ';
 		} else {
 			if ($conf->global->THEME_ELDY_USE_HOVER == '1') $color = colorArrayToHex(colorStringToArray($colorbacklinepairhover));
 			else $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_USE_HOVER, array()), '');
-			if ($color)
-			{
+			if ($color) {
 				if ($color != colorArrayToHex(colorStringToArray($colorbacklinepairhover))) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
 				else print $langs->trans("Default");
 			} else print $langs->trans("Default");
@@ -848,8 +797,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 	}
 
 	// Use Checked
-	if ($foruserprofile)
-	{
+	if ($foruserprofile) {
 		/* Must first change option to choose color of highlight instead of yes or no.
 	     print '<tr class="oddeven">';
 	     print '<td>'.$langs->trans("HighlightLinesOnMouseHover").'</td>';
@@ -868,16 +816,14 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		print '<td colspan="'.($colspan - 1).'">';
 		//print '<input name="check_THEME_ELDY_USE_HOVER"'.($edit?'':' disabled').' type="checkbox" '.($hoverdisabled?"":" checked").'>';
 		//print ' &nbsp; ('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
-		if ($edit)
-		{
+		if ($edit) {
 			if ($conf->global->THEME_ELDY_USE_CHECKED == '1') $color = 'e6edf0';
 			else $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_USE_CHECKED, array()), '');
-			print $formother->selectColor($color, 'THEME_ELDY_USE_CHECKED', 'formcolor', 1, '', '', 'colorbacklinepairchecked').' ';
+			print $formother->selectColor($color, 'THEME_ELDY_USE_CHECKED', '', 1, '', '', 'colorbacklinepairchecked').' ';
 		} else {
 			if ($conf->global->THEME_ELDY_USE_CHECKED == '1') $color = 'e6edf0';
 			else $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_USE_CHECKED, array()), '');
-			if ($color)
-			{
+			if ($color) {
 				if ($color != 'e6edf0') print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
 				else print $langs->trans("Default");
 			} else print $langs->trans("Default");
@@ -889,32 +835,29 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 	}
 
 	// Use MAIN_OPTIMIZEFORTEXTBROWSER
-	if ($foruserprofile)
-	{
-	    //$default=yn($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER);
-	    $default = $langs->trans('No');
-	    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);
-   	    } else {
-   	        if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-   	        {
-   	            print yn($fuser->conf->MAIN_OPTIMIZEFORTEXTBROWSER);
-   	        } else {
-   	            print yn(1);
-   	            if (empty($fuser->conf->MAIN_OPTIMIZEFORTEXTBROWSER)) print ' ('.$langs->trans("ForcedByGlobalSetup").')';
-   	        }
-   	    }
-   	    print ' &nbsp; <span class="opacitymedium">'.$langs->trans("Default").'</span>: <strong>'.$default.'</strong> ';
-	    print $form->textwithpicto('', $langs->trans("MAIN_OPTIMIZEFORTEXTBROWSERDesc"));
-	    print '</td>';
-	    print '</tr>';
+	if ($foruserprofile) {
+		//$default=yn($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER);
+		$default = $langs->trans('No');
+		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);
+   		} else {
+   			if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+   				print yn($fuser->conf->MAIN_OPTIMIZEFORTEXTBROWSER);
+   			} else {
+   				print yn(1);
+   				if (empty($fuser->conf->MAIN_OPTIMIZEFORTEXTBROWSER)) print ' ('.$langs->trans("ForcedByGlobalSetup").')';
+   			}
+   		}
+   		print ' &nbsp; <span class="opacitymedium">'.$langs->trans("Default").'</span>: <strong>'.$default.'</strong> ';
+		print $form->textwithpicto('', $langs->trans("MAIN_OPTIMIZEFORTEXTBROWSERDesc"));
+		print '</td>';
+		print '</tr>';
 	} else {
-	    /*var_dump($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER);
+		/*var_dump($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER);
 	    $default=$langs->trans('No');
 	    print '<tr class="oddeven">';
 	    print '<td>'.$langs->trans("MAIN_OPTIMIZEFORTEXTBROWSER").'</td>';
@@ -937,8 +880,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 
 
 	// Use MAIN_OPTIMIZEFORTEXTBROWSER
-	if ($foruserprofile)
-	{
+	if ($foruserprofile) {
 		//$default=yn($conf->global->MAIN_OPTIMIZEFORCOLORBLIND);
 		$default = $langs->trans('No');
 		print '<tr class="oddeven">';
@@ -953,8 +895,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 			'tritanopes' => $langs->trans('Tritanopes'),
 		);
 
-		if ($edit)
-		{
+		if ($edit) {
 			print $form->selectArray('MAIN_OPTIMIZEFORCOLORBLIND', $colorBlindOptions, $fuser->conf->MAIN_OPTIMIZEFORCOLORBLIND, 0);
 		} else {
 			if (!empty($fuser->conf->MAIN_OPTIMIZEFORCOLORBLIND) && isset($colorBlindOptions[$fuser->conf->MAIN_OPTIMIZEFORCOLORBLIND])) {
diff --git a/htdocs/core/lib/vat.lib.php b/htdocs/core/lib/vat.lib.php
index 68e52a142a3..5cd2203a393 100644
--- a/htdocs/core/lib/vat.lib.php
+++ b/htdocs/core/lib/vat.lib.php
@@ -31,39 +31,39 @@
  */
 function vat_prepare_head($object)
 {
-    global $db, $langs, $conf;
+	global $db, $langs, $conf;
 
-    $tab = 0;
-    $head = array();
+	$tab = 0;
+	$head = array();
 
 	$head[$tab][0] = DOL_URL_ROOT.'/compta/tva/card.php?id='.$object->id;
 	$head[$tab][1] = $langs->trans('VATPayment');
 	$head[$tab][2] = 'card';
 	$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, $tab, 'vat');
+	// 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, $tab, 'vat');
 
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-    require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
 	$upload_dir = $conf->tax->dir_output."/vat/".dol_sanitizeFileName($object->ref);
 	$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
-    $nbLinks = Link::count($db, $object->element, $object->id);
+	$nbLinks = Link::count($db, $object->element, $object->id);
 	$head[$tab][0] = DOL_URL_ROOT.'/compta/tva/document.php?id='.$object->id;
 	$head[$tab][1] = $langs->trans("Documents");
 	if (($nbFiles + $nbLinks) > 0) $head[$tab][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
 	$head[$tab][2] = 'documents';
 	$tab++;
 
-    $head[$tab][0] = DOL_URL_ROOT.'/compta/tva/info.php?id='.$object->id;
-    $head[$tab][1] = $langs->trans("Info");
-    $head[$tab][2] = 'info';
-    $tab++;
+	$head[$tab][0] = DOL_URL_ROOT.'/compta/tva/info.php?id='.$object->id;
+	$head[$tab][1] = $langs->trans("Info");
+	$head[$tab][2] = 'info';
+	$tab++;
 
-    complete_head_from_modules($conf, $langs, $object, $head, $tab, 'vat', 'remove');
+	complete_head_from_modules($conf, $langs, $object, $head, $tab, 'vat', 'remove');
 
-    return $head;
+	return $head;
 }
diff --git a/htdocs/core/lib/website.lib.php b/htdocs/core/lib/website.lib.php
index e0f7f4d50b6..75a20ac6852 100644
--- a/htdocs/core/lib/website.lib.php
+++ b/htdocs/core/lib/website.lib.php
@@ -554,7 +554,7 @@ function getStructuredData($type, $data = array())
 			"name": "'.dol_escape_json($data['name']).'",
 			"operatingSystem": "'.dol_escape_json($data['os']).'",
 			"applicationCategory": "https://schema.org/'.$data['applicationCategory'].'",';
-		if (! empty($data['ratingcount'])) {
+		if (!empty($data['ratingcount'])) {
 			$ret .= '
 				"aggregateRating": {
 					"@type": "AggregateRating",
@@ -594,11 +594,11 @@ function getStructuredData($type, $data = array())
 			$i = 0;
 			foreach ($mysoc->socialnetworks as $key => $value) {
 				if ($key == 'linkedin') {
-					$ret.= '"https://www.'.$key.'.com/company/'.dol_escape_json($value).'"';
+					$ret .= '"https://www.'.$key.'.com/company/'.dol_escape_json($value).'"';
 				} elseif ($key == 'youtube') {
-					$ret.= '"https://www.'.$key.'.com/user/'.dol_escape_json($value).'"';
+					$ret .= '"https://www.'.$key.'.com/user/'.dol_escape_json($value).'"';
 				} else {
-					$ret.= '"https://www.'.$key.'.com/'.dol_escape_json($value).'"';
+					$ret .= '"https://www.'.$key.'.com/'.dol_escape_json($value).'"';
 				}
 				$i++;
 				if ($i < count($mysoc->socialnetworks)) $ret .= ', ';
@@ -660,7 +660,7 @@ function getStructuredData($type, $data = array())
 				$i = 0;
 				$arrayofkeywords = explode(',', $websitepage->keywords);
 				foreach ($arrayofkeywords as $keyword) {
-					$ret.= '"'.dol_escape_json($keyword).'"';
+					$ret .= '"'.dol_escape_json($keyword).'"';
 					$i++;
 					if ($i < count($arrayofkeywords)) $ret .= ', ';
 				}
@@ -849,7 +849,7 @@ function getPagesFromSearchCriterias($type, $algo, $searchstring, $max = 25, $so
 	if (!$error && (empty($max) || ($found < $max)) && (preg_match('/meta/', $algo) || preg_match('/content/', $algo)))
 	{
 		$sql = 'SELECT wp.rowid FROM '.MAIN_DB_PREFIX.'website_page as wp';
-		if (is_array($otherfilters) && ! empty($otherfilters['category'])) {
+		if (is_array($otherfilters) && !empty($otherfilters['category'])) {
 			$sql .= ', '.MAIN_DB_PREFIX.'categorie_website_page as cwp';
 		}
 		$sql .= " WHERE wp.fk_website = ".$website->id;
@@ -879,7 +879,7 @@ function getPagesFromSearchCriterias($type, $algo, $searchstring, $max = 25, $so
 			$searchalgo .= ($searchalgo ? ' OR ' : '')."wp.content LIKE '%".$db->escape($searchstring)."%'";
 		}
 		$sql .= $searchalgo;
-		if (is_array($otherfilters) && ! empty($otherfilters['category'])) {
+		if (is_array($otherfilters) && !empty($otherfilters['category'])) {
 			$sql .= ' AND cwp.fk_website_page = wp.rowid AND cwp.fk_categorie = '.((int) $otherfilters['category']);
 		}
 		$sql .= ")";
diff --git a/htdocs/core/lib/ws.lib.php b/htdocs/core/lib/ws.lib.php
index ad16755f617..faf1b5bc871 100644
--- a/htdocs/core/lib/ws.lib.php
+++ b/htdocs/core/lib/ws.lib.php
@@ -34,35 +34,35 @@
  */
 function check_authentication($authentication, &$error, &$errorcode, &$errorlabel)
 {
-    global $db, $conf, $langs;
-    global $dolibarr_main_authentication, $dolibarr_auto_user;
+	global $db, $conf, $langs;
+	global $dolibarr_main_authentication, $dolibarr_auto_user;
 
-    $fuser = new User($db);
+	$fuser = new User($db);
 
-    if (!$error && ($authentication['dolibarrkey'] != $conf->global->WEBSERVICES_KEY))
-    {
-        $error++;
-        $errorcode = 'BAD_VALUE_FOR_SECURITY_KEY'; $errorlabel = 'Value provided into dolibarrkey entry field does not match security key defined in Webservice module setup';
-    }
+	if (!$error && ($authentication['dolibarrkey'] != $conf->global->WEBSERVICES_KEY))
+	{
+		$error++;
+		$errorcode = 'BAD_VALUE_FOR_SECURITY_KEY'; $errorlabel = 'Value provided into dolibarrkey entry field does not match security key defined in Webservice module setup';
+	}
 
-    if (!$error && !empty($authentication['entity']) && !is_numeric($authentication['entity']))
-    {
-        $error++;
-        $errorcode = 'BAD_PARAMETERS'; $errorlabel = "The entity parameter must be empty (or filled with numeric id of instance if multicompany module is used).";
-    }
+	if (!$error && !empty($authentication['entity']) && !is_numeric($authentication['entity']))
+	{
+		$error++;
+		$errorcode = 'BAD_PARAMETERS'; $errorlabel = "The entity parameter must be empty (or filled with numeric id of instance if multicompany module is used).";
+	}
 
-    if (!$error)
-    {
-        $result = $fuser->fetch('', $authentication['login'], '', 0);
-        if ($result < 0)
-        {
-            $error++;
-            $errorcode = 'ERROR_FETCH_USER'; $errorlabel = 'A technical error occurred during fetch of user';
-        } elseif ($result == 0)
-        {
-            $error++;
-            $errorcode = 'BAD_CREDENTIALS'; $errorlabel = 'Bad value for login or password';
-        }
+	if (!$error)
+	{
+		$result = $fuser->fetch('', $authentication['login'], '', 0);
+		if ($result < 0)
+		{
+			$error++;
+			$errorcode = 'ERROR_FETCH_USER'; $errorlabel = 'A technical error occurred during fetch of user';
+		} elseif ($result == 0)
+		{
+			$error++;
+			$errorcode = 'BAD_CREDENTIALS'; $errorlabel = 'Bad value for login or password';
+		}
 
 		if (!$error && $fuser->statut == 0)
 		{
@@ -70,27 +70,27 @@ function check_authentication($authentication, &$error, &$errorcode, &$errorlabe
 			$errorcode = 'ERROR_USER_DISABLED'; $errorlabel = 'This user has been locked or disabled';
 		}
 
-    	// Validation of login
+		// Validation of login
 		if (!$error)
 		{
 			$fuser->getrights(); // Load permission of user
 
-        	// Authentication mode
-        	if (empty($dolibarr_main_authentication)) $dolibarr_main_authentication = 'http,dolibarr';
-        	// Authentication mode: forceuser
-        	if ($dolibarr_main_authentication == 'forceuser' && empty($dolibarr_auto_user)) $dolibarr_auto_user = 'auto';
-        	// Set authmode
-        	$authmode = explode(',', $dolibarr_main_authentication);
+			// Authentication mode
+			if (empty($dolibarr_main_authentication)) $dolibarr_main_authentication = 'http,dolibarr';
+			// Authentication mode: forceuser
+			if ($dolibarr_main_authentication == 'forceuser' && empty($dolibarr_auto_user)) $dolibarr_auto_user = 'auto';
+			// Set authmode
+			$authmode = explode(',', $dolibarr_main_authentication);
 
-            include_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
-        	$login = checkLoginPassEntity($authentication['login'], $authentication['password'], $authentication['entity'], $authmode, 'ws');
+			include_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
+			$login = checkLoginPassEntity($authentication['login'], $authentication['password'], $authentication['entity'], $authmode, 'ws');
 			if (empty($login))
 			{
-			    $error++;
-                $errorcode = 'BAD_CREDENTIALS'; $errorlabel = 'Bad value for login or password';
+				$error++;
+				$errorcode = 'BAD_CREDENTIALS'; $errorlabel = 'Bad value for login or password';
 			}
 		}
-    }
+	}
 
-    return $fuser;
+	return $fuser;
 }
diff --git a/htdocs/core/login/functions_dolibarr.php b/htdocs/core/login/functions_dolibarr.php
index 52e50a504af..a6f9323f99b 100644
--- a/htdocs/core/login/functions_dolibarr.php
+++ b/htdocs/core/login/functions_dolibarr.php
@@ -123,11 +123,11 @@ function check_user_password_dolibarr($usertotest, $passwordtotest, $entitytotes
 				{
 					$login = $obj->login;
 				} else {
-				    sleep(2); // Anti brut force protection
-				    dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentication KO bad password for '".$usertotest."', cryptType=".$cryptType, LOG_NOTICE);
+					sleep(2); // Anti brut force protection
+					dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentication KO bad password for '".$usertotest."', cryptType=".$cryptType, LOG_NOTICE);
 
 					// Load translation files required by the page
-                    $langs->loadLangs(array('main', 'errors'));
+					$langs->loadLangs(array('main', 'errors'));
 
 					$_SESSION["dol_loginmesg"] = $langs->trans("ErrorBadLoginPassword");
 				}
@@ -152,7 +152,7 @@ function check_user_password_dolibarr($usertotest, $passwordtotest, $entitytotes
 				sleep(1);
 
 				// Load translation files required by the page
-                $langs->loadLangs(array('main', 'errors'));
+				$langs->loadLangs(array('main', 'errors'));
 
 				$_SESSION["dol_loginmesg"] = $langs->trans("ErrorBadLoginPassword");
 			}
diff --git a/htdocs/core/login/functions_googleoauth.php b/htdocs/core/login/functions_googleoauth.php
index e621f41e562..b5e56c74d74 100644
--- a/htdocs/core/login/functions_googleoauth.php
+++ b/htdocs/core/login/functions_googleoauth.php
@@ -41,16 +41,16 @@
  */
 function check_user_password_googleoauth($usertotest, $passwordtotest, $entitytotest)
 {
-    global $_POST, $db, $conf, $langs;
+	global $_POST, $db, $conf, $langs;
 
-    dol_syslog("functions_googleoauth::check_user_password_googleoauth usertotest=".$usertotest);
+	dol_syslog("functions_googleoauth::check_user_password_googleoauth usertotest=".$usertotest);
 
-    $login = '';
+	$login = '';
 
-    // Get identity from user and redirect browser to Google OAuth Server
-    if (GETPOSTISSET('username'))
-    {
-        /*$openid = new SimpleOpenID();
+	// Get identity from user and redirect browser to Google OAuth Server
+	if (GETPOSTISSET('username'))
+	{
+		/*$openid = new SimpleOpenID();
         $openid->SetIdentity($_POST['username']);
         $protocol = ($conf->file->main_force_https ? 'https://' : 'http://');
         $openid->SetTrustRoot($protocol . $_SERVER["HTTP_HOST"]);
@@ -68,8 +68,8 @@ function check_user_password_googleoauth($usertotest, $passwordtotest, $entityto
             return false;
         }
         return false;*/
-    }
+	}
 
 
-    return $login;
+	return $login;
 }
diff --git a/htdocs/core/login/functions_ldap.php b/htdocs/core/login/functions_ldap.php
index 287563b01c3..41ce8a67316 100644
--- a/htdocs/core/login/functions_ldap.php
+++ b/htdocs/core/login/functions_ldap.php
@@ -56,7 +56,7 @@ function check_user_password_ldap($usertotest, $passwordtotest, $entitytotest)
 		sleep(1);
 
 		// Load translation files required by the page
-        $langs->loadLangs(array('main', 'other'));
+		$langs->loadLangs(array('main', 'other'));
 
 		$_SESSION["dol_loginmesg"] = $langs->trans("ErrorLDAPFunctionsAreDisabledOnThisPHP").' '.$langs->trans("TryAnotherConnectionMode");
 		return;
@@ -234,7 +234,7 @@ function check_user_password_ldap($usertotest, $passwordtotest, $entitytotest)
 				sleep(1);
 
 				// Load translation files required by the page
-                $langs->loadLangs(array('main', 'other'));
+				$langs->loadLangs(array('main', 'other'));
 
 				$_SESSION["dol_loginmesg"] = $langs->trans("ErrorBadLoginPassword");
 			}
@@ -257,7 +257,7 @@ function check_user_password_ldap($usertotest, $passwordtotest, $entitytotest)
 			sleep(2); // Anti brut force protection
 
 			// Load translation files required by the page
-            $langs->loadLangs(array('main', 'other', 'errors'));
+			$langs->loadLangs(array('main', 'other', 'errors'));
 			$_SESSION["dol_loginmesg"] = ($ldap->error ? $ldap->error : $langs->trans("ErrorBadLoginPassword"));
 		}
 
diff --git a/htdocs/core/login/functions_openid.php b/htdocs/core/login/functions_openid.php
index e5e66a7fc80..f0191da53c0 100644
--- a/htdocs/core/login/functions_openid.php
+++ b/htdocs/core/login/functions_openid.php
@@ -36,87 +36,87 @@ include_once DOL_DOCUMENT_ROOT.'/core/class/openid.class.php';
  */
 function check_user_password_openid($usertotest, $passwordtotest, $entitytotest)
 {
-    global $db, $conf, $langs;
+	global $db, $conf, $langs;
 
-    dol_syslog("functions_openid::check_user_password_openid usertotest=".$usertotest);
+	dol_syslog("functions_openid::check_user_password_openid usertotest=".$usertotest);
 
-    $login = '';
+	$login = '';
 
-    // Get identity from user and redirect browser to OpenID Server
-    if (GETPOSISSET('username'))
-    {
-        $openid = new SimpleOpenID();
-        $openid->SetIdentity($_POST['username']);
-        $protocol = ($conf->file->main_force_https ? 'https://' : 'http://');
-        $openid->SetTrustRoot($protocol.$_SERVER["HTTP_HOST"]);
-        $openid->SetRequiredFields(array('email', 'fullname'));
-        $_SESSION['dol_entity'] = $_POST["entity"];
-        //$openid->SetOptionalFields(array('dob','gender','postcode','country','language','timezone'));
-        if ($openid->sendDiscoveryRequestToGetXRDS())
-        {
-            $openid->SetApprovedURL($protocol.$_SERVER["HTTP_HOST"].$_SERVER["SCRIPT_NAME"]); // Send Response from OpenID server to this script
-            $openid->Redirect(); // This will redirect user to OpenID Server
-        } else {
-        	$_SESSION["dol_loginmesg"] = $openid->GetError();
-            return false;
-        }
-        return false;
-    }
-    // Perform HTTP Request to OpenID server to validate key
-    elseif ($_GET['openid_mode'] == 'id_res')
-    {
-        $openid = new SimpleOpenID();
-        $openid->SetIdentity($_GET['openid_identity']);
-        $openid_validation_result = $openid->ValidateWithServer();
-        if ($openid_validation_result === true)
-        {
-            // OK HERE KEY IS VALID
+	// Get identity from user and redirect browser to OpenID Server
+	if (GETPOSISSET('username'))
+	{
+		$openid = new SimpleOpenID();
+		$openid->SetIdentity($_POST['username']);
+		$protocol = ($conf->file->main_force_https ? 'https://' : 'http://');
+		$openid->SetTrustRoot($protocol.$_SERVER["HTTP_HOST"]);
+		$openid->SetRequiredFields(array('email', 'fullname'));
+		$_SESSION['dol_entity'] = $_POST["entity"];
+		//$openid->SetOptionalFields(array('dob','gender','postcode','country','language','timezone'));
+		if ($openid->sendDiscoveryRequestToGetXRDS())
+		{
+			$openid->SetApprovedURL($protocol.$_SERVER["HTTP_HOST"].$_SERVER["SCRIPT_NAME"]); // Send Response from OpenID server to this script
+			$openid->Redirect(); // This will redirect user to OpenID Server
+		} else {
+			$_SESSION["dol_loginmesg"] = $openid->GetError();
+			return false;
+		}
+		return false;
+	}
+	// Perform HTTP Request to OpenID server to validate key
+	elseif ($_GET['openid_mode'] == 'id_res')
+	{
+		$openid = new SimpleOpenID();
+		$openid->SetIdentity($_GET['openid_identity']);
+		$openid_validation_result = $openid->ValidateWithServer();
+		if ($openid_validation_result === true)
+		{
+			// OK HERE KEY IS VALID
 
-            $sql = "SELECT login, entity, datestartvalidity, dateendvalidity";
-            $sql .= " FROM ".MAIN_DB_PREFIX."user";
-            $sql .= " WHERE openid = '".$db->escape($_GET['openid_identity'])."'";
-            $sql .= " AND entity IN (0,".($_SESSION["dol_entity"] ? $_SESSION["dol_entity"] : 1).")";
+			$sql = "SELECT login, entity, datestartvalidity, dateendvalidity";
+			$sql .= " FROM ".MAIN_DB_PREFIX."user";
+			$sql .= " WHERE openid = '".$db->escape($_GET['openid_identity'])."'";
+			$sql .= " AND entity IN (0,".($_SESSION["dol_entity"] ? $_SESSION["dol_entity"] : 1).")";
 
-            dol_syslog("functions_openid::check_user_password_openid", LOG_DEBUG);
-            $resql = $db->query($sql);
-            if ($resql)
-            {
-                $obj = $db->fetch_object($resql);
-                if ($obj)
-                {
-                	$now = dol_now();
-                	if ($obj->datestartvalidity && $db->jdate($obj->datestartvalidity) > $now) {
-                		// Load translation files required by the page
-                		$langs->loadLangs(array('main', 'errors'));
-                		$_SESSION["dol_loginmesg"] = $langs->trans("ErrorLoginDateValidity");
-                		return '--bad-login-validity--';
-                	}
-                	if ($obj->dateendvalidity && $db->jdate($obj->dateendvalidity) < dol_get_first_hour($now)) {
-                		// Load translation files required by the page
-                		$langs->loadLangs(array('main', 'errors'));
-                		$_SESSION["dol_loginmesg"] = $langs->trans("ErrorLoginDateValidity");
-                		return '--bad-login-validity--';
-                	}
+			dol_syslog("functions_openid::check_user_password_openid", LOG_DEBUG);
+			$resql = $db->query($sql);
+			if ($resql)
+			{
+				$obj = $db->fetch_object($resql);
+				if ($obj)
+				{
+					$now = dol_now();
+					if ($obj->datestartvalidity && $db->jdate($obj->datestartvalidity) > $now) {
+						// Load translation files required by the page
+						$langs->loadLangs(array('main', 'errors'));
+						$_SESSION["dol_loginmesg"] = $langs->trans("ErrorLoginDateValidity");
+						return '--bad-login-validity--';
+					}
+					if ($obj->dateendvalidity && $db->jdate($obj->dateendvalidity) < dol_get_first_hour($now)) {
+						// Load translation files required by the page
+						$langs->loadLangs(array('main', 'errors'));
+						$_SESSION["dol_loginmesg"] = $langs->trans("ErrorLoginDateValidity");
+						return '--bad-login-validity--';
+					}
 
-                    $login = $obj->login;
-                }
-            }
-        } elseif ($openid->IsError() === true)
-        {
-            // ON THE WAY, WE GOT SOME ERROR
-        	$_SESSION["dol_loginmesg"] = $openid->GetError();
-            return false;
-        } else {
-            // Signature Verification Failed
-            //echo "INVALID AUTHORIZATION";
-            return false;
-        }
-    } elseif ($_GET['openid_mode'] == 'cancel')
-    {
-        // User Canceled your Request
-        //echo "USER CANCELED REQUEST";
-        return false;
-    }
+					$login = $obj->login;
+				}
+			}
+		} elseif ($openid->IsError() === true)
+		{
+			// ON THE WAY, WE GOT SOME ERROR
+			$_SESSION["dol_loginmesg"] = $openid->GetError();
+			return false;
+		} else {
+			// Signature Verification Failed
+			//echo "INVALID AUTHORIZATION";
+			return false;
+		}
+	} elseif ($_GET['openid_mode'] == 'cancel')
+	{
+		// User Canceled your Request
+		//echo "USER CANCELED REQUEST";
+		return false;
+	}
 
-    return $login;
+	return $login;
 }
diff --git a/htdocs/core/menus/init_menu_auguria.sql b/htdocs/core/menus/init_menu_auguria.sql
index 818198fc035..27eed001188 100644
--- a/htdocs/core/menus/init_menu_auguria.sql
+++ b/htdocs/core/menus/init_menu_auguria.sql
@@ -227,7 +227,7 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left
 -- Social contributions
 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->tax->enabled', __HANDLER__, 'left', 2250__+MAX_llx_menu__, 'billing', 'tax_social', 2200__+MAX_llx_menu__, '/compta/sociales/list.php?mainmenu=billing&amp;leftmenu=tax_social', 'SocialContributions', 1, '', '$user->rights->tax->charges->lire', '', 0, 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->tax->enabled && $leftmenu=="tax_social"', __HANDLER__, 'left', 2251__+MAX_llx_menu__, 'billing', '', 2250__+MAX_llx_menu__, '/compta/sociales/card.php?mainmenu=billing&amp;leftmenu=tax_social&amp;action=create', 'MenuNewSocialContribution', 2, '', '$user->rights->tax->charges->creer', '', 0, 2, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->tax->enabled && $leftmenu=="tax_social"', __HANDLER__, 'left', 2252__+MAX_llx_menu__, 'billing', '', 2250__+MAX_llx_menu__, '/compta/sociales/payments.php?mainmenu=billing&amp;leftmenu=tax_social&amp;mode=sconly', 'Payments', 2, '', '$user->rights->tax->charges->lire', '', 0, 3, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->tax->enabled && $leftmenu=="tax_social"', __HANDLER__, 'left', 2252__+MAX_llx_menu__, 'billing', '', 2250__+MAX_llx_menu__, '/compta/sociales/payments.php?mainmenu=billing&amp;leftmenu=tax_social', 'Payments', 2, '', '$user->rights->tax->charges->lire', '', 0, 3, __ENTITY__);
 -- VAT
 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->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS)', __HANDLER__, 'left', 2300__+MAX_llx_menu__, 'billing', 'tax_vat', 2200__+MAX_llx_menu__, '/compta/tva/list.php?mainmenu=billing&amp;leftmenu=tax_vat', 'VAT', 1, 'companies', '$user->rights->tax->charges->lire', '', 0, 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->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS) && $leftmenu=="tax_vat"', __HANDLER__, 'left', 2301__+MAX_llx_menu__, 'billing', '', 2300__+MAX_llx_menu__, '/compta/tva/card.php?mainmenu=billing&amp;leftmenu=tax_vat&amp;action=create', 'New', 2, 'companies', '$user->rights->tax->charges->creer', '', 0, 0, __ENTITY__);
@@ -251,61 +251,61 @@ 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->banque->enabled && $leftmenu=="tax_various"', __HANDLER__, 'left', 2352__+MAX_llx_menu__, 'billing', '', 2350__+MAX_llx_menu__, '/compta/bank/various_payment/list.php?mainmenu=billing&amp;leftmenu=tax_various', 'List', 1, 'various_payment', '$user->rights->banque->lire', '', 0, 3, __ENTITY__);
 -- Accounting (Double entries)
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2400__+MAX_llx_menu__, 'accountancy', 'accountancy', 9__+MAX_llx_menu__, '/accountancy/index.php?mainmenu=accountancy&amp;leftmenu=accountancy', 'MenuAccountancy', 0, 'main', '! empty($conf->accounting->enabled) || $user->rights->accounting->bind->write || $user->rights->accounting->bind->write || $user->rights->compta->resultat->lire', '', 0, 7, __ENTITY__);
-	-- Setup
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2451__+MAX_llx_menu__, 'accountancy', 'accountancy_admin',            2400__+MAX_llx_menu__, '/accountancy/index.php?mainmenu=accountancy&leftmenu=accountancy_admin', 'Setup', 1, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 1, __ENTITY__);
+-- Setup
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2451__+MAX_llx_menu__, 'accountancy', 'accountancy_admin',            2400__+MAX_llx_menu__, '/accountancy/index.php?mainmenu=accountancy&leftmenu=accountancy_admin', 'Setup', 1, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 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->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2453__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_general',       2451__+MAX_llx_menu__, '/accountancy/admin/index.php?mainmenu=accountancy&leftmenu=accountancy_admin', 'General', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 10, __ENTITY__);
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2454__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_journal',       2451__+MAX_llx_menu__, '/accountancy/admin/journals_list.php?id=35&mainmenu=accountancy&leftmenu=accountancy_admin', 'AccountingJournals', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 20, __ENTITY__);
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2455__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_chartmodel',    2451__+MAX_llx_menu__, '/accountancy/admin/account.php?mainmenu=accountancy&leftmenu=accountancy_admin', 'Pcg_version', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 30, __ENTITY__);
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2456__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_chart',         2451__+MAX_llx_menu__, '/accountancy/admin/account.php?mainmenu=accountancy&leftmenu=accountancy_admin', 'Chartofaccounts', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 40, __ENTITY__);
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2456__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_chartsubledger',2451__+MAX_llx_menu__, '/accountancy/admin/subaccount.php?mainmenu=accountancy&leftmenu=accountancy_admin', 'ChartOfSubaccounts', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 41, __ENTITY__);
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2457__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_chart_group',   2451__+MAX_llx_menu__, '/accountancy/admin/categories_list.php?id=32&mainmenu=accountancy&leftmenu=accountancy_admin', 'AccountingCategory', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 45, __ENTITY__);
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2458__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_default',       2451__+MAX_llx_menu__, '/accountancy/admin/defaultaccounts.php?mainmenu=accountancy&leftmenu=accountancy_admin', 'MenuDefaultAccounts', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 50, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2453__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_general',       2451__+MAX_llx_menu__, '/accountancy/admin/index.php?mainmenu=accountancy&leftmenu=accountancy_admin', 'General', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 10, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2454__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_journal',       2451__+MAX_llx_menu__, '/accountancy/admin/journals_list.php?id=35&mainmenu=accountancy&leftmenu=accountancy_admin', 'AccountingJournals', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 20, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2455__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_chartmodel',    2451__+MAX_llx_menu__, '/accountancy/admin/account.php?mainmenu=accountancy&leftmenu=accountancy_admin', 'Pcg_version', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 30, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2456__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_chart',         2451__+MAX_llx_menu__, '/accountancy/admin/account.php?mainmenu=accountancy&leftmenu=accountancy_admin', 'Chartofaccounts', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 40, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2457__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_chartsubledger',2451__+MAX_llx_menu__, '/accountancy/admin/subaccount.php?mainmenu=accountancy&leftmenu=accountancy_admin', 'ChartOfSubaccounts', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 41, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2458__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_chart_group',   2451__+MAX_llx_menu__, '/accountancy/admin/categories_list.php?id=32&mainmenu=accountancy&leftmenu=accountancy_admin', 'AccountingCategory', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 45, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2459__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_default',       2451__+MAX_llx_menu__, '/accountancy/admin/defaultaccounts.php?mainmenu=accountancy&leftmenu=accountancy_admin', 'MenuDefaultAccounts', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 50, __ENTITY__);
 
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2459__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_vat',           2451__+MAX_llx_menu__, '/compta/bank/list.php?mainmenu=accountancy&leftmenu=accountancy_admin', 'MenuBankAccounts', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 51, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2460__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_vat',           2451__+MAX_llx_menu__, '/compta/bank/list.php?mainmenu=accountancy&leftmenu=accountancy_admin', 'MenuBankAccounts', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 51, __ENTITY__);
 
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2460__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_vat',           2451__+MAX_llx_menu__, '/admin/dict.php?id=10&from=accountancy&search_country_id=__MYCOUNTRYID__&mainmenu=accountancy&leftmenu=accountancy_admin', 'MenuVatAccounts', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 52, __ENTITY__);
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2461__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_tax',           2451__+MAX_llx_menu__, '/admin/dict.php?id=7&from=accountancy&search_country_id=__MYCOUNTRYID__&mainmenu=accountancy&leftmenu=accountancy_admin', 'MenuTaxAccounts', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 53, __ENTITY__);
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $conf->expensereport->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2462__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_expensereport', 2451__+MAX_llx_menu__, '/admin/dict.php?id=17&from=accountancy&mainmenu=accountancy&leftmenu=accountancy_admin', 'MenuExpenseReportAccounts', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 54, __ENTITY__);
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2463__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_product',       2451__+MAX_llx_menu__, '/accountancy/admin/productaccount.php?mainmenu=accountancy&leftmenu=accountancy_admin', 'MenuProductsAccounts', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 55, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2461__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_vat',           2451__+MAX_llx_menu__, '/admin/dict.php?id=10&from=accountancy&search_country_id=__MYCOUNTRYID__&mainmenu=accountancy&leftmenu=accountancy_admin', 'MenuVatAccounts', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 52, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2462__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_tax',           2451__+MAX_llx_menu__, '/admin/dict.php?id=7&from=accountancy&search_country_id=__MYCOUNTRYID__&mainmenu=accountancy&leftmenu=accountancy_admin', 'MenuTaxAccounts', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 53, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $conf->expensereport->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2463__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_expensereport', 2451__+MAX_llx_menu__, '/admin/dict.php?id=17&from=accountancy&mainmenu=accountancy&leftmenu=accountancy_admin', 'MenuExpenseReportAccounts', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 54, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2464__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_product',       2451__+MAX_llx_menu__, '/accountancy/admin/productaccount.php?mainmenu=accountancy&leftmenu=accountancy_admin', 'MenuProductsAccounts', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 55, __ENTITY__);
 
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2464__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_export',        2451__+MAX_llx_menu__, '/accountancy/admin/export.php?mainmenu=accountancy&leftmenu=accountancy_admin', 'ExportOptions', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 60, __ENTITY__);
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin" && $conf->global->MAIN_FEATURES_LEVEL > 1', __HANDLER__, 'left', 2465__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_closure',       2451__+MAX_llx_menu__, '/accountancy/admin/closure.php?mainmenu=accountancy&leftmenu=accountancy_admin', 'MenuClosureAccounts', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 70, __ENTITY__);
-	-- Accounting period
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin" && $conf->global->MAIN_FEATURES_LEVEL > 0', __HANDLER__, 'left', 2450__+MAX_llx_menu__,  'accountancy', 'accountancy_admin_period', 2451__+MAX_llx_menu__, '/accountancy/admin/fiscalyear.php?mainmenu=accountancy&leftmenu=accountancy_admin', 'FiscalPeriod', 1, 'admin', '', '', 2, 80, __ENTITY__);
-	-- Binding
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $conf->facture->enabled && empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_SALES)', __HANDLER__, 'left', 2401__+MAX_llx_menu__, 'accountancy', 'accountancy_dispatch_customer', 2400__+MAX_llx_menu__, '/accountancy/customer/index.php?mainmenu=accountancy&amp;leftmenu=accountancy_dispatch_customer', 'CustomersVentilation', 1, 'accountancy', '$user->rights->accounting->bind->write', '', 0, 2, __ENTITY__);
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $conf->facture->enabled && empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_SALES) && $leftmenu=="accountancy_dispatch_customer"', __HANDLER__, 'left', 2402__+MAX_llx_menu__, 'accountancy', '', 2401__+MAX_llx_menu__, '/accountancy/customer/list.php?mainmenu=accountancy', 'ToDispatch', 2, 'accountancy', '$user->rights->accounting->bind->write', '', 0, 3, __ENTITY__);
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $conf->facture->enabled && empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_SALES) && $leftmenu=="accountancy_dispatch_customer"', __HANDLER__, 'left', 2403__+MAX_llx_menu__, 'accountancy', '', 2401__+MAX_llx_menu__, '/accountancy/customer/lines.php?mainmenu=accountancy', 'Dispatched', 2, 'accountancy', '$user->rights->accounting->bind->write', '', 0, 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->accounting->enabled && (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_invoice->enabled)) && empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_PURCHASES)', __HANDLER__, 'left', 2410__+MAX_llx_menu__, 'accountancy', 'accountancy_dispatch_supplier', 2400__+MAX_llx_menu__, '/accountancy/supplier/index.php?mainmenu=accountancy&amp;leftmenu=accountancy_dispatch_supplier', 'SuppliersVentilation', 1, 'accountancy', '$user->rights->accounting->bind->write', '', 0, 5, __ENTITY__);
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_invoice->enabled)) && empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_PURCHASES) && $leftmenu=="accountancy_dispatch_supplier"', __HANDLER__, 'left', 2411__+MAX_llx_menu__, 'accountancy', '', 2410__+MAX_llx_menu__, '/accountancy/supplier/list.php?mainmenu=accountancy', 'ToDispatch', 2, 'accountancy', '$user->rights->accounting->bind->write', '', 0, 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->accounting->enabled && (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_invoice->enabled)) && empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_PURCHASES) && $leftmenu=="accountancy_dispatch_supplier"', __HANDLER__, 'left', 2412__+MAX_llx_menu__, 'accountancy', '', 2410__+MAX_llx_menu__, '/accountancy/supplier/lines.php?mainmenu=accountancy', 'Dispatched', 2, 'accountancy', '$user->rights->accounting->bind->write', '', 0, 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->accounting->enabled && $conf->expensereport->enabled && empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS)', __HANDLER__, 'left', 2420__+MAX_llx_menu__, 'accountancy', 'accountancy_dispatch_expensereport', 2400__+MAX_llx_menu__, '/accountancy/expensereport/index.php?mainmenu=accountancy&amp;leftmenu=accountancy_dispatch_expensereport', 'ExpenseReportsVentilation', 1, 'accountancy', '$user->rights->accounting->bind->write', '', 0, 5, __ENTITY__);
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $conf->expensereport->enabled && empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS) && $leftmenu=="accountancy_dispatch_expensereport"', __HANDLER__, 'left', 2421__+MAX_llx_menu__, 'accountancy', '', 2420__+MAX_llx_menu__, '/accountancy/expensereport/list.php?mainmenu=accountancy', 'ToDispatch', 2, 'accountancy', '$user->rights->accounting->bind->write', '', 0, 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->accounting->enabled && $conf->expensereport->enabled && empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS) && $leftmenu=="accountancy_dispatch_expensereport"', __HANDLER__, 'left', 2422__+MAX_llx_menu__, 'accountancy', '', 2420__+MAX_llx_menu__, '/accountancy/expensereport/lines.php?mainmenu=accountancy', 'Dispatched', 2, 'accountancy', '$user->rights->accounting->bind->write', '', 0, 7, __ENTITY__);
-	-- Journals
-	--insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2705__+MAX_llx_menu__, 'accountancy', '', 2400__+MAX_llx_menu__, '', 'Journalization', 1, 'main', '$user->rights->accounting->comptarapport->lire', '', 0, 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->accounting->enabled', __HANDLER__, 'left', 2707__+MAX_llx_menu__, 'accountancy', '', 2705__+MAX_llx_menu__, '/accountancy/journal/bankjournal.php?mainmenu=accountancy&leftmenu=accountancy_journal&id_journal=3', 'BankJournal', 2, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 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->accounting->enabled', __HANDLER__, 'left', 2708__+MAX_llx_menu__, 'accountancy', '', 2705__+MAX_llx_menu__, '/accountancy/journal/expensereportsjournal.php?mainmenu=accountancy&leftmenu=accountancy_journal&id_journal=6', 'ExpenseReportJournal', 2, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 2, __ENTITY__);
-	--insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2709__+MAX_llx_menu__, 'accountancy', '', 2705__+MAX_llx_menu__, '/accountancy/journal/purchasesjournal.php?mainmenu=accountancy&leftmenu=accountancy_journal&id_journal=2', 'PurchasesJournal', 2, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 3, __ENTITY__);
-	--insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2706__+MAX_llx_menu__, 'accountancy', '', 2705__+MAX_llx_menu__, '/accountancy/journal/sellsjournal.php?mainmenu=accountancy&leftmenu=accountancy_journal&id_journal=1', 'SellsJournal', 2, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 4, __ENTITY__);
-	-- Balance
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2430__+MAX_llx_menu__, 'accountancy', 'balance', 2400__+MAX_llx_menu__, '/accountancy/bookkeeping/balance.php?mainmenu=accountancy&leftmenu=accountancy_balance', 'AccountBalance', 1, 'accountancy', '$user->rights->accounting->mouvements->lire', '', 0, 10, __ENTITY__);
-	-- General Ledger
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2432__+MAX_llx_menu__, 'accountancy', 'bookkeeping', 2400__+MAX_llx_menu__, '/accountancy/bookkeeping/listbyaccount.php?mainmenu=accountancy&leftmenu=accountancy_bookeeping', 'Bookkeeping', 1, 'accountancy', '$user->rights->accounting->mouvements->lire', '', 0, 12, __ENTITY__);
-    -- Journals
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2434__+MAX_llx_menu__, 'accountancy', 'bookkeeping', 2400__+MAX_llx_menu__, '/accountancy/bookkeeping/list.php?mainmenu=accountancy&leftmenu=accountancy_bookeeping', 'Journals', 1, 'accountancy', '$user->rights->accounting->mouvements->lire', '', 0, 15, __ENTITY__);
-	-- Export accounting documents
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled || $conf->accounting->enabled', __HANDLER__, 'left', 2436__+MAX_llx_menu__, 'accountancy', 'accountancy_files', 2400__+MAX_llx_menu__, '/compta/accounting-files.php?mainmenu=accountancy&leftmenu=accountancy_files', 'AccountantFiles', 1, 'accountancy', '$user->rights->compta->resultat->lire || $user->rights->accounting->mouvements->lire', '', 0, 17, __ENTITY__);
-	-- Reports
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2440__+MAX_llx_menu__, 'accountancy', 'accountancy_report', 2400__+MAX_llx_menu__, '/compta/resultat/index.php?mainmenu=accountancy&leftmenu=accountancy_report', 'Reportings', 1, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 17, __ENTITY__);
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_report"', __HANDLER__, 'left', 2441__+MAX_llx_menu__, 'accountancy', 'accountancy_report', 2440__+MAX_llx_menu__, '/compta/resultat/index.php?mainmenu=accountancy&leftmenu=accountancy_report', 'MenuReportInOut', 2, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 18, __ENTITY__);
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_report"', __HANDLER__, 'left', 2443__+MAX_llx_menu__, 'accountancy', 'accountancy_report', 2441__+MAX_llx_menu__, '/compta/resultat/clientfourn.php?mainmenu=accountancy&leftmenu=accountancy_report', 'ByPredefinedAccountGroups', 3, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 19, __ENTITY__);
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_report"', __HANDLER__, 'left', 2442__+MAX_llx_menu__, 'accountancy', 'accountancy_report', 2441__+MAX_llx_menu__, '/compta/resultat/result.php?mainmenu=accountancy&leftmenu=accountancy_report', 'ByPersonalizedAccountGroups', 3, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 20, __ENTITY__);
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_report"', __HANDLER__, 'left', 2444__+MAX_llx_menu__, 'accountancy', 'accountancy_report', 2440__+MAX_llx_menu__, '/compta/stats/index.php?mainmenu=accountancy&leftmenu=accountancy_report', 'ReportTurnover', 2, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 21, __ENTITY__);
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_report"', __HANDLER__, 'left', 2445__+MAX_llx_menu__, 'accountancy', 'accountancy_report', 2444__+MAX_llx_menu__, '/compta/stats/casoc.php?mainmenu=accountancy&leftmenu=accountancy_report', 'ByCompanies', 3, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 22, __ENTITY__);
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_report"', __HANDLER__, 'left', 2446__+MAX_llx_menu__, 'accountancy', 'accountancy_report', 2444__+MAX_llx_menu__, '/compta/stats/cabyuser.php?mainmenu=accountancy&leftmenu=accountancy_report', 'ByUsers', 3, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 23, __ENTITY__);
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_report"', __HANDLER__, 'left', 2447__+MAX_llx_menu__, 'accountancy', 'accountancy_report', 2444__+MAX_llx_menu__, '/compta/stats/cabyprodserv.php?mainmenu=accountancy&leftmenu=accountancy_report', 'ByProductsAndServices', 3, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 24, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2465__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_export',        2451__+MAX_llx_menu__, '/accountancy/admin/export.php?mainmenu=accountancy&leftmenu=accountancy_admin', 'ExportOptions', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 60, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin" && $conf->global->MAIN_FEATURES_LEVEL > 1', __HANDLER__, 'left', 2466__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_closure',       2451__+MAX_llx_menu__, '/accountancy/admin/closure.php?mainmenu=accountancy&leftmenu=accountancy_admin', 'MenuClosureAccounts', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 70, __ENTITY__);
+-- Accounting period
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin" && $conf->global->MAIN_FEATURES_LEVEL > 0', __HANDLER__, 'left', 2450__+MAX_llx_menu__,  'accountancy', 'accountancy_admin_period', 2451__+MAX_llx_menu__, '/accountancy/admin/fiscalyear.php?mainmenu=accountancy&leftmenu=accountancy_admin', 'FiscalPeriod', 1, 'admin', '', '', 2, 80, __ENTITY__);
+-- Binding
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $conf->facture->enabled && empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_SALES)', __HANDLER__, 'left', 2401__+MAX_llx_menu__, 'accountancy', 'accountancy_dispatch_customer', 2400__+MAX_llx_menu__, '/accountancy/customer/index.php?mainmenu=accountancy&amp;leftmenu=accountancy_dispatch_customer', 'CustomersVentilation', 1, 'accountancy', '$user->rights->accounting->bind->write', '', 0, 2, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $conf->facture->enabled && empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_SALES) && $leftmenu=="accountancy_dispatch_customer"', __HANDLER__, 'left', 2402__+MAX_llx_menu__, 'accountancy', '', 2401__+MAX_llx_menu__, '/accountancy/customer/list.php?mainmenu=accountancy', 'ToDispatch', 2, 'accountancy', '$user->rights->accounting->bind->write', '', 0, 3, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $conf->facture->enabled && empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_SALES) && $leftmenu=="accountancy_dispatch_customer"', __HANDLER__, 'left', 2403__+MAX_llx_menu__, 'accountancy', '', 2401__+MAX_llx_menu__, '/accountancy/customer/lines.php?mainmenu=accountancy', 'Dispatched', 2, 'accountancy', '$user->rights->accounting->bind->write', '', 0, 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->accounting->enabled && (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_invoice->enabled)) && empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_PURCHASES)', __HANDLER__, 'left', 2410__+MAX_llx_menu__, 'accountancy', 'accountancy_dispatch_supplier', 2400__+MAX_llx_menu__, '/accountancy/supplier/index.php?mainmenu=accountancy&amp;leftmenu=accountancy_dispatch_supplier', 'SuppliersVentilation', 1, 'accountancy', '$user->rights->accounting->bind->write', '', 0, 5, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_invoice->enabled)) && empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_PURCHASES) && $leftmenu=="accountancy_dispatch_supplier"', __HANDLER__, 'left', 2411__+MAX_llx_menu__, 'accountancy', '', 2410__+MAX_llx_menu__, '/accountancy/supplier/list.php?mainmenu=accountancy', 'ToDispatch', 2, 'accountancy', '$user->rights->accounting->bind->write', '', 0, 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->accounting->enabled && (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_invoice->enabled)) && empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_PURCHASES) && $leftmenu=="accountancy_dispatch_supplier"', __HANDLER__, 'left', 2412__+MAX_llx_menu__, 'accountancy', '', 2410__+MAX_llx_menu__, '/accountancy/supplier/lines.php?mainmenu=accountancy', 'Dispatched', 2, 'accountancy', '$user->rights->accounting->bind->write', '', 0, 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->accounting->enabled && $conf->expensereport->enabled && empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS)', __HANDLER__, 'left', 2420__+MAX_llx_menu__, 'accountancy', 'accountancy_dispatch_expensereport', 2400__+MAX_llx_menu__, '/accountancy/expensereport/index.php?mainmenu=accountancy&amp;leftmenu=accountancy_dispatch_expensereport', 'ExpenseReportsVentilation', 1, 'accountancy', '$user->rights->accounting->bind->write', '', 0, 5, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $conf->expensereport->enabled && empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS) && $leftmenu=="accountancy_dispatch_expensereport"', __HANDLER__, 'left', 2421__+MAX_llx_menu__, 'accountancy', '', 2420__+MAX_llx_menu__, '/accountancy/expensereport/list.php?mainmenu=accountancy', 'ToDispatch', 2, 'accountancy', '$user->rights->accounting->bind->write', '', 0, 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->accounting->enabled && $conf->expensereport->enabled && empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS) && $leftmenu=="accountancy_dispatch_expensereport"', __HANDLER__, 'left', 2422__+MAX_llx_menu__, 'accountancy', '', 2420__+MAX_llx_menu__, '/accountancy/expensereport/lines.php?mainmenu=accountancy', 'Dispatched', 2, 'accountancy', '$user->rights->accounting->bind->write', '', 0, 7, __ENTITY__);
+-- Journals
+--insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2705__+MAX_llx_menu__, 'accountancy', '', 2400__+MAX_llx_menu__, '', 'Journalization', 1, 'main', '$user->rights->accounting->comptarapport->lire', '', 0, 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->accounting->enabled', __HANDLER__, 'left', 2707__+MAX_llx_menu__, 'accountancy', '', 2705__+MAX_llx_menu__, '/accountancy/journal/bankjournal.php?mainmenu=accountancy&leftmenu=accountancy_journal&id_journal=3', 'BankJournal', 2, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 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->accounting->enabled', __HANDLER__, 'left', 2708__+MAX_llx_menu__, 'accountancy', '', 2705__+MAX_llx_menu__, '/accountancy/journal/expensereportsjournal.php?mainmenu=accountancy&leftmenu=accountancy_journal&id_journal=6', 'ExpenseReportJournal', 2, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 2, __ENTITY__);
+--insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2709__+MAX_llx_menu__, 'accountancy', '', 2705__+MAX_llx_menu__, '/accountancy/journal/purchasesjournal.php?mainmenu=accountancy&leftmenu=accountancy_journal&id_journal=2', 'PurchasesJournal', 2, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 3, __ENTITY__);
+--insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2706__+MAX_llx_menu__, 'accountancy', '', 2705__+MAX_llx_menu__, '/accountancy/journal/sellsjournal.php?mainmenu=accountancy&leftmenu=accountancy_journal&id_journal=1', 'SellsJournal', 2, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 4, __ENTITY__);
+-- Balance
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2430__+MAX_llx_menu__, 'accountancy', 'balance', 2400__+MAX_llx_menu__, '/accountancy/bookkeeping/balance.php?mainmenu=accountancy&leftmenu=accountancy_balance', 'AccountBalance', 1, 'accountancy', '$user->rights->accounting->mouvements->lire', '', 0, 10, __ENTITY__);
+-- General Ledger
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2432__+MAX_llx_menu__, 'accountancy', 'bookkeeping', 2400__+MAX_llx_menu__, '/accountancy/bookkeeping/listbyaccount.php?mainmenu=accountancy&leftmenu=accountancy_bookeeping', 'Bookkeeping', 1, 'accountancy', '$user->rights->accounting->mouvements->lire', '', 0, 12, __ENTITY__);
+-- Journals
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2434__+MAX_llx_menu__, 'accountancy', 'bookkeeping', 2400__+MAX_llx_menu__, '/accountancy/bookkeeping/list.php?mainmenu=accountancy&leftmenu=accountancy_bookeeping', 'Journals', 1, 'accountancy', '$user->rights->accounting->mouvements->lire', '', 0, 15, __ENTITY__);
+-- Export accounting documents
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled || $conf->accounting->enabled', __HANDLER__, 'left', 2436__+MAX_llx_menu__, 'accountancy', 'accountancy_files', 2400__+MAX_llx_menu__, '/compta/accounting-files.php?mainmenu=accountancy&leftmenu=accountancy_files', 'AccountantFiles', 1, 'accountancy', '$user->rights->compta->resultat->lire || $user->rights->accounting->mouvements->lire', '', 0, 17, __ENTITY__);
+-- Reports
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2440__+MAX_llx_menu__, 'accountancy', 'accountancy_report', 2400__+MAX_llx_menu__, '/compta/resultat/index.php?mainmenu=accountancy&leftmenu=accountancy_report', 'Reportings', 1, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 17, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_report"', __HANDLER__, 'left', 2441__+MAX_llx_menu__, 'accountancy', 'accountancy_report', 2440__+MAX_llx_menu__, '/compta/resultat/index.php?mainmenu=accountancy&leftmenu=accountancy_report', 'MenuReportInOut', 2, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 18, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_report"', __HANDLER__, 'left', 2443__+MAX_llx_menu__, 'accountancy', 'accountancy_report', 2441__+MAX_llx_menu__, '/compta/resultat/clientfourn.php?mainmenu=accountancy&leftmenu=accountancy_report', 'ByPredefinedAccountGroups', 3, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 19, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_report"', __HANDLER__, 'left', 2442__+MAX_llx_menu__, 'accountancy', 'accountancy_report', 2441__+MAX_llx_menu__, '/compta/resultat/result.php?mainmenu=accountancy&leftmenu=accountancy_report', 'ByPersonalizedAccountGroups', 3, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 20, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_report"', __HANDLER__, 'left', 2444__+MAX_llx_menu__, 'accountancy', 'accountancy_report', 2440__+MAX_llx_menu__, '/compta/stats/index.php?mainmenu=accountancy&leftmenu=accountancy_report', 'ReportTurnover', 2, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 21, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_report"', __HANDLER__, 'left', 2445__+MAX_llx_menu__, 'accountancy', 'accountancy_report', 2444__+MAX_llx_menu__, '/compta/stats/casoc.php?mainmenu=accountancy&leftmenu=accountancy_report', 'ByCompanies', 3, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 22, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_report"', __HANDLER__, 'left', 2446__+MAX_llx_menu__, 'accountancy', 'accountancy_report', 2444__+MAX_llx_menu__, '/compta/stats/cabyuser.php?mainmenu=accountancy&leftmenu=accountancy_report', 'ByUsers', 3, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 23, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_report"', __HANDLER__, 'left', 2447__+MAX_llx_menu__, 'accountancy', 'accountancy_report', 2444__+MAX_llx_menu__, '/compta/stats/cabyprodserv.php?mainmenu=accountancy&leftmenu=accountancy_report', 'ByProductsAndServices', 3, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 24, __ENTITY__);
 -- Accounting simple
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled', __HANDLER__, 'left', 2700__+MAX_llx_menu__, 'accountancy', 'ca', 9__+MAX_llx_menu__, '/compta/resultat/index.php?mainmenu=accountancy&amp;leftmenu=ca', 'Reportings', 0, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 11, __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->comptabilite->enabled && $leftmenu=="ca"', __HANDLER__, 'left', 2711__+MAX_llx_menu__, 'accountancy', '', 2700__+MAX_llx_menu__, '/compta/resultat/index.php?mainmenu=accountancy&amp;leftmenu=ca', 'MenuReportInOut', 1, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 0, __ENTITY__);
@@ -393,10 +393,10 @@ 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->adherent->enabled', __HANDLER__, 'left', 4203__+MAX_llx_menu__, 'members', '', 4202__+MAX_llx_menu__, '/adherents/list.php?mainmenu=members&amp;leftmenu=members&amp;statut=-1', 'MenuMembersToValidate', 2, 'members', '$user->rights->adherent->lire', '', 2, 2, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->adherent->enabled', __HANDLER__, 'left', 4204__+MAX_llx_menu__, 'members', '', 4202__+MAX_llx_menu__, '/adherents/list.php?mainmenu=members&amp;leftmenu=members&amp;statut=1', 'MenuMembersValidated', 2, 'members', '$user->rights->adherent->lire', '', 2, 3, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->adherent->enabled', __HANDLER__, 'left', 4205__+MAX_llx_menu__, 'members', '', 4204__+MAX_llx_menu__, '/adherents/list.php?mainmenu=members&amp;leftmenu=members&amp;statut=1&amp;filter=withoutsubscription', 'WithoutSubscription', 2, 'members', '$user->rights->adherent->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->adherent->enabled', __HANDLER__, 'left', 4205__+MAX_llx_menu__, 'members', '', 4204__+MAX_llx_menu__, '/adherents/list.php?mainmenu=members&amp;leftmenu=members&amp;statut=1&amp;filter=outofdate', 'UpToDate', 2, 'members', '$user->rights->adherent->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->adherent->enabled', __HANDLER__, 'left', 4206__+MAX_llx_menu__, 'members', '', 4204__+MAX_llx_menu__, '/adherents/list.php?mainmenu=members&amp;leftmenu=members&amp;statut=1&amp;filter=uptodate', 'OutOfDate', 2, 'members', '$user->rights->adherent->lire', '', 2, 5, __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->adherent->enabled', __HANDLER__, 'left', 4207__+MAX_llx_menu__, 'members', '', 4202__+MAX_llx_menu__, '/adherents/list.php?mainmenu=members&amp;leftmenu=members&amp;statut=0', 'MenuMembersResiliated', 2, 'members', '$user->rights->adherent->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->adherent->enabled', __HANDLER__, 'left', 4208__+MAX_llx_menu__, 'members', '', 4200__+MAX_llx_menu__, '/adherents/stats/geo.php?mainmenu=members&amp;leftmenu=members&amp;mode=memberbycountry', 'MenuMembersStats', 1, 'members', '$user->rights->adherent->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->adherent->enabled', __HANDLER__, 'left', 4206__+MAX_llx_menu__, 'members', '', 4204__+MAX_llx_menu__, '/adherents/list.php?mainmenu=members&amp;leftmenu=members&amp;statut=1&amp;filter=outofdate', 'UpToDate', 2, 'members', '$user->rights->adherent->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->adherent->enabled', __HANDLER__, 'left', 4207__+MAX_llx_menu__, 'members', '', 4204__+MAX_llx_menu__, '/adherents/list.php?mainmenu=members&amp;leftmenu=members&amp;statut=1&amp;filter=uptodate', 'OutOfDate', 2, 'members', '$user->rights->adherent->lire', '', 2, 5, __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->adherent->enabled', __HANDLER__, 'left', 4208__+MAX_llx_menu__, 'members', '', 4202__+MAX_llx_menu__, '/adherents/list.php?mainmenu=members&amp;leftmenu=members&amp;statut=0', 'MenuMembersResiliated', 2, 'members', '$user->rights->adherent->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->adherent->enabled', __HANDLER__, 'left', 4209__+MAX_llx_menu__, 'members', '', 4200__+MAX_llx_menu__, '/adherents/stats/geo.php?mainmenu=members&amp;leftmenu=members&amp;mode=memberbycountry', 'MenuMembersStats', 1, 'members', '$user->rights->adherent->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 ('', '! empty($conf->global->MEMBER_LINK_TO_HTPASSWDFILE) && $conf->adherent->enabled', __HANDLER__, 'left', 4502__+MAX_llx_menu__, 'members', '', 4200__+MAX_llx_menu__, '/adherents/htpasswd.php?mainmenu=members&amp;leftmenu=export', 'Filehtpasswd', 1, 'members', '$user->rights->adherent->export', '', 2, 9, __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->adherent->enabled', __HANDLER__, 'left', 4503__+MAX_llx_menu__, 'members', '', 4200__+MAX_llx_menu__, '/adherents/cartes/carte.php?mainmenu=members&amp;leftmenu=export', 'MembersCards', 1, 'members', '$user->rights->adherent->export', '', 2, 10, __ENTITY__);
 -- Members - Subscriptions
diff --git a/htdocs/core/menus/standard/auguria.lib.php b/htdocs/core/menus/standard/auguria.lib.php
index a124759faa8..b50ff9594c0 100644
--- a/htdocs/core/menus/standard/auguria.lib.php
+++ b/htdocs/core/menus/standard/auguria.lib.php
@@ -59,14 +59,14 @@ function print_auguria_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout
 	global $usemenuhider;
 	$usemenuhider = 1;
 
-    // Show/Hide vertical menu. The hamburger icon for .menuhider action.
-    if ($mode != 'jmobile' && $mode != 'topnb' && $usemenuhider && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+	// Show/Hide vertical menu. The hamburger icon for .menuhider action.
+	if ($mode != 'jmobile' && $mode != 'topnb' && $usemenuhider && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
 	{
-	    $showmode = 1;
-	    $classname = 'class="tmenu menuhider"';
-	    $idsel = 'menu';
+		$showmode = 1;
+		$classname = 'class="tmenu menuhider"';
+		$idsel = 'menu';
 
-	    $menu->add('#', (!empty($conf->global->THEME_TOPMENU_DISABLE_IMAGE) ? '<span class="fa fa-bars"></span>' : ''), 0, $showmode, $atarget, "xxx", '', 0, $id, $idsel, $classname);
+		$menu->add('#', (!empty($conf->global->THEME_TOPMENU_DISABLE_IMAGE) ? '<span class="fa fa-bars"></span>' : ''), 0, $showmode, $atarget, "xxx", '', 0, $id, $idsel, $classname);
 	}
 
 	$num = count($newTabMenu);
@@ -74,28 +74,29 @@ function print_auguria_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout
 	{
 		$idsel = (empty($newTabMenu[$i]['mainmenu']) ? 'none' : $newTabMenu[$i]['mainmenu']);
 
+		$shorturl = '';
+
 		$showmode = dol_auguria_showmenu($type_user, $newTabMenu[$i], $listofmodulesforexternal);
-		if ($showmode == 1)
-		{
+		if ($showmode == 1) {
 			$newTabMenu[$i]['url'] = make_substitutions($newTabMenu[$i]['url'], $substitarray);
 
 			$url = $shorturl = $newTabMenu[$i]['url'];
 
 			if (!preg_match("/^(http:\/\/|https:\/\/)/i", $newTabMenu[$i]['url']))
 			{
-			    $tmp = explode('?', $newTabMenu[$i]['url'], 2);
+				$tmp = explode('?', $newTabMenu[$i]['url'], 2);
 				$url = $shorturl = $tmp[0];
 				$param = (isset($tmp[1]) ? $tmp[1] : '');
 
 				// Complete param to force leftmenu to '' to close open menu when we click on a link with no leftmenu defined.
-			    if ((!preg_match('/mainmenu/i', $param)) && (!preg_match('/leftmenu/i', $param)) && !empty($newTabMenu[$i]['url']))
-			    {
-			        $param .= ($param ? '&' : '').'mainmenu='.$newTabMenu[$i]['mainmenu'].'&leftmenu=';
-			    }
-			    if ((!preg_match('/mainmenu/i', $param)) && (!preg_match('/leftmenu/i', $param)) && empty($newTabMenu[$i]['url']))
-			    {
-			        $param .= ($param ? '&' : '').'leftmenu=';
-			    }
+				if ((!preg_match('/mainmenu/i', $param)) && (!preg_match('/leftmenu/i', $param)) && !empty($newTabMenu[$i]['url']))
+				{
+					$param .= ($param ? '&' : '').'mainmenu='.$newTabMenu[$i]['mainmenu'].'&leftmenu=';
+				}
+				if ((!preg_match('/mainmenu/i', $param)) && (!preg_match('/leftmenu/i', $param)) && empty($newTabMenu[$i]['url']))
+				{
+					$param .= ($param ? '&' : '').'leftmenu=';
+				}
 				//$url.="idmenu=".$newTabMenu[$i]['rowid'];    // Already done by menuLoad
 				$url = dol_buildpath($url, 1).($param ? '?'.$param : '');
 				//$shorturl = $shorturl.($param?'?'.$param:'');
@@ -107,16 +108,20 @@ function print_auguria_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout
 			// TODO Find a generic solution
 			if (preg_match('/search_project_user=__search_project_user__/', $shorturl))
 			{
-			    $search_project_user = GETPOST('search_project_user', 'int');
-			    if ($search_project_user) $shorturl = preg_replace('/search_project_user=__search_project_user__/', 'search_project_user='.$search_project_user, $shorturl);
-			    else $shorturl = preg_replace('/search_project_user=__search_project_user__/', '', $shorturl);
+				$search_project_user = GETPOST('search_project_user', 'int');
+				if ($search_project_user) $shorturl = preg_replace('/search_project_user=__search_project_user__/', 'search_project_user='.$search_project_user, $shorturl);
+				else $shorturl = preg_replace('/search_project_user=__search_project_user__/', '', $shorturl);
 			}
 
 			// Define the class (top menu selected or not)
 			if (!empty($_SESSION['idmenu']) && $newTabMenu[$i]['rowid'] == $_SESSION['idmenu']) $classname = 'class="tmenusel"';
 			elseif (!empty($_SESSION["mainmenu"]) && $newTabMenu[$i]['mainmenu'] == $_SESSION["mainmenu"]) $classname = 'class="tmenusel"';
 			else $classname = 'class="tmenu"';
-		} elseif ($showmode == 2) $classname = 'class="tmenu"';
+		} elseif ($showmode == 2) {
+			$classname = 'class="tmenu"';
+		} else {
+			$classname = '';
+		}
 
 		$menu->add($shorturl, $newTabMenu[$i]['titre'], 0, $showmode, ($newTabMenu[$i]['target'] ? $newTabMenu[$i]['target'] : $atarget), ($newTabMenu[$i]['mainmenu'] ? $newTabMenu[$i]['mainmenu'] : $newTabMenu[$i]['rowid']), ($newTabMenu[$i]['leftmenu'] ? $newTabMenu[$i]['leftmenu'] : ''), $newTabMenu[$i]['position'], $id, $idsel, $classname);
 	}
@@ -162,8 +167,8 @@ function print_auguria_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout
 	if (empty($noout)) {
 		foreach ($menu->liste as $menuval) {
 			print_start_menu_entry_auguria($menuval['idsel'], $menuval['classname'], $menuval['enabled']);
-	    	print_text_menu_entry_auguria($menuval['titre'], $menuval['enabled'], ($menuval['url'] != '#' ?DOL_URL_ROOT:'').$menuval['url'], $menuval['id'], $menuval['idsel'], $menuval['classname'], ($menuval['target'] ? $menuval['target'] : $atarget));
-		    print_end_menu_entry_auguria($menuval['enabled']);
+			print_text_menu_entry_auguria($menuval['titre'], $menuval['enabled'], ($menuval['url'] != '#' ?DOL_URL_ROOT:'').$menuval['url'], $menuval['id'], $menuval['idsel'], $menuval['classname'], ($menuval['target'] ? $menuval['target'] : $atarget));
+			print_end_menu_entry_auguria($menuval['enabled']);
 		}
 	}
 
@@ -185,7 +190,7 @@ function print_auguria_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout
  */
 function print_start_menu_array_auguria()
 {
-    global $conf;
+	global $conf;
 
 	print '<div class="tmenudiv">';
 	print '<ul role="navigation" class="tmenu"'.(empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '' : ' title="Top menu"').'>';
@@ -302,22 +307,22 @@ function print_left_auguria_menu($db, $menu_array_before, $menu_array_after, &$t
 
 	if (is_array($moredata) && !empty($moredata['searchform']))	// searchform can contains select2 code or link to show old search form or link to switch on search page
 	{
-        print "\n";
-        print "<!-- Begin SearchForm -->\n";
-        print '<div id="blockvmenusearch" class="blockvmenusearch">'."\n";
-        print $moredata['searchform'];
-        print '</div>'."\n";
-        print "<!-- End SearchForm -->\n";
+		print "\n";
+		print "<!-- Begin SearchForm -->\n";
+		print '<div id="blockvmenusearch" class="blockvmenusearch">'."\n";
+		print $moredata['searchform'];
+		print '</div>'."\n";
+		print "<!-- End SearchForm -->\n";
 	}
 
 	if (is_array($moredata) && !empty($moredata['bookmarks']))
 	{
-	    print "\n";
-	    print "<!-- Begin Bookmarks -->\n";
-	    print '<div id="blockvmenubookmarks" class="blockvmenubookmarks">'."\n";
-	    print $moredata['bookmarks'];
-	    print '</div>'."\n";
-	    print "<!-- End Bookmarks -->\n";
+		print "\n";
+		print "<!-- Begin Bookmarks -->\n";
+		print '<div id="blockvmenubookmarks" class="blockvmenubookmarks">'."\n";
+		print $moredata['bookmarks'];
+		print '</div>'."\n";
+		print "<!-- End Bookmarks -->\n";
 	}
 
 	$substitarray = getCommonSubstitutionArray($langs, 0, null, null);
@@ -329,7 +334,7 @@ function print_left_auguria_menu($db, $menu_array_before, $menu_array_after, &$t
 	// We update newmenu for special dynamic menus
 	if ($conf->banque->enabled && $user->rights->banque->lire && $mainmenu == 'bank')	// Entry for each bank account
 	{
-	    include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; // Required for to get Account::TYPE_CASH for example
+		include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; // Required for to get Account::TYPE_CASH for example
 
 		$sql = "SELECT rowid, label, courant, rappro, courant";
 		$sql .= " FROM ".MAIN_DB_PREFIX."bank_account";
@@ -404,9 +409,9 @@ function print_left_auguria_menu($db, $menu_array_before, $menu_array_after, &$t
 
 					if ($nature)
 					{
-                        $langs->load('accountancy');
-                        $journallabel = $langs->transnoentities($objp->label); // Labels in this table are set by loading llx_accounting_abc.sql. Label can be 'ACCOUNTING_SELL_JOURNAL', 'InventoryJournal', ...
-                        $newmenu->add('/accountancy/journal/'.$nature.'journal.php?mainmenu=accountancy&leftmenu=accountancy_journal&id_journal='.$objp->rowid, $journallabel, 2, $user->rights->accounting->comptarapport->lire);
+						$langs->load('accountancy');
+						$journallabel = $langs->transnoentities($objp->label); // Labels in this table are set by loading llx_accounting_abc.sql. Label can be 'ACCOUNTING_SELL_JOURNAL', 'InventoryJournal', ...
+						$newmenu->add('/accountancy/journal/'.$nature.'journal.php?mainmenu=accountancy&leftmenu=accountancy_journal&id_journal='.$objp->rowid, $journallabel, 2, $user->rights->accounting->comptarapport->lire);
 					}
 					$i++;
 				}
@@ -465,7 +470,7 @@ function print_left_auguria_menu($db, $menu_array_before, $menu_array_after, &$t
 				$lastopened = true;
 				for ($j = ($i + 1); $j < $num; $j++)
 				{
-				    if (empty($menu_array[$j]['level'])) $lastopened = false;
+					if (empty($menu_array[$j]['level'])) $lastopened = false;
 				}
 				if ($altok % 2 == 0)
 				{
@@ -533,7 +538,7 @@ function print_left_auguria_menu($db, $menu_array_before, $menu_array_after, &$t
 					print '<div class="menu_titre">'.$tabstring.'<font class="vmenudisabled">'.$menu_array[$i]['titre'].'</font></div>'."\n";
 					$lastlevel0 = 'greyed';
 				} else {
-				    $lastlevel0 = 'hidden';
+					$lastlevel0 = 'hidden';
 				}
 				if ($showmenu)
 				{
diff --git a/htdocs/core/menus/standard/auguria_menu.php b/htdocs/core/menus/standard/auguria_menu.php
index 5b7aa913350..c80810656db 100644
--- a/htdocs/core/menus/standard/auguria_menu.php
+++ b/htdocs/core/menus/standard/auguria_menu.php
@@ -29,31 +29,31 @@
 class MenuManager
 {
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $type_user; // Put 0 for internal users, 1 for external users
-    public $atarget = ""; // To store default target to use onto links
-    public $name = "auguria";
+	public $type_user; // Put 0 for internal users, 1 for external users
+	public $atarget = ""; // To store default target to use onto links
+	public $name = "auguria";
 
-    public $menu_array;
-    public $menu_array_after;
+	public $menu_array;
+	public $menu_array_after;
 
-    public $tabMenu;
+	public $tabMenu;
 
 
-    /**
-     *  Constructor
-     *
+	/**
+	 *  Constructor
+	 *
 	 *  @param	DoliDB		$db     	Database handler
-     *  @param	int			$type_user	Type of user
-     */
-    public function __construct($db, $type_user)
-    {
-    	$this->type_user = $type_user;
-    	$this->db = $db;
-    }
+	 *  @param	int			$type_user	Type of user
+	 */
+	public function __construct($db, $type_user)
+	{
+		$this->type_user = $type_user;
+		$this->db = $db;
+	}
 
 
    	/**
@@ -65,252 +65,252 @@ class MenuManager
    	 */
    	public function loadMenu($forcemainmenu = '', $forceleftmenu = '')
    	{
-    	global $conf, $user, $langs;
+		global $conf, $user, $langs;
 
    		// On sauve en session le menu principal choisi
-    	if (GETPOSTISSET("mainmenu")) $_SESSION["mainmenu"] = GETPOST("mainmenu", 'aZ09');
-    	if (GETPOSTISSET("idmenu"))   $_SESSION["idmenu"] = GETPOST("idmenu", 'int');
+		if (GETPOSTISSET("mainmenu")) $_SESSION["mainmenu"] = GETPOST("mainmenu", 'aZ09');
+		if (GETPOSTISSET("idmenu"))   $_SESSION["idmenu"] = GETPOST("idmenu", 'int');
 
-    	// Read mainmenu and leftmenu that define which menu to show
-    	if (GETPOSTISSET("mainmenu"))
-    	{
-    		// On sauve en session le menu principal choisi
-    		$mainmenu = GETPOST("mainmenu", 'aZ09');
-    		$_SESSION["mainmenu"] = $mainmenu;
-    		$_SESSION["leftmenuopened"] = "";
-    	} else {
-    		// On va le chercher en session si non defini par le lien
-    		$mainmenu = isset($_SESSION["mainmenu"]) ? $_SESSION["mainmenu"] : '';
-    	}
+		// Read mainmenu and leftmenu that define which menu to show
+		if (GETPOSTISSET("mainmenu"))
+		{
+			// On sauve en session le menu principal choisi
+			$mainmenu = GETPOST("mainmenu", 'aZ09');
+			$_SESSION["mainmenu"] = $mainmenu;
+			$_SESSION["leftmenuopened"] = "";
+		} else {
+			// On va le chercher en session si non defini par le lien
+			$mainmenu = isset($_SESSION["mainmenu"]) ? $_SESSION["mainmenu"] : '';
+		}
 		if (!empty($forcemainmenu)) $mainmenu = $forcemainmenu;
 
-    	if (GETPOSTISSET("leftmenu"))
-    	{
-    		// On sauve en session le menu principal choisi
-    		$leftmenu = GETPOST("leftmenu", 'aZ09');
-    		$_SESSION["leftmenu"] = $leftmenu;
+		if (GETPOSTISSET("leftmenu"))
+		{
+			// On sauve en session le menu principal choisi
+			$leftmenu = GETPOST("leftmenu", 'aZ09');
+			$_SESSION["leftmenu"] = $leftmenu;
 
-    		if ($_SESSION["leftmenuopened"] == $leftmenu)	// To collapse
-    		{
-    			//$leftmenu="";
-    			$_SESSION["leftmenuopened"] = "";
-    		} else {
-    			$_SESSION["leftmenuopened"] = $leftmenu;
-    		}
-    	} else {
-    		// On va le chercher en session si non defini par le lien
-    		$leftmenu = isset($_SESSION["leftmenu"]) ? $_SESSION["leftmenu"] : '';
-    	}
-    	if (!empty($forceleftmenu)) $leftmenu = $forceleftmenu;
+			if ($_SESSION["leftmenuopened"] == $leftmenu)	// To collapse
+			{
+				//$leftmenu="";
+				$_SESSION["leftmenuopened"] = "";
+			} else {
+				$_SESSION["leftmenuopened"] = $leftmenu;
+			}
+		} else {
+			// On va le chercher en session si non defini par le lien
+			$leftmenu = isset($_SESSION["leftmenu"]) ? $_SESSION["leftmenu"] : '';
+		}
+		if (!empty($forceleftmenu)) $leftmenu = $forceleftmenu;
 
-    	require_once DOL_DOCUMENT_ROOT.'/core/class/menubase.class.php';
-    	$tabMenu = array();
-    	$menuArbo = new Menubase($this->db, 'auguria');
-    	$menuArbo->menuLoad($mainmenu, $leftmenu, $this->type_user, 'auguria', $tabMenu);
-    	$this->tabMenu = $tabMenu;
-    	//var_dump($tabMenu);
+		require_once DOL_DOCUMENT_ROOT.'/core/class/menubase.class.php';
+		$tabMenu = array();
+		$menuArbo = new Menubase($this->db, 'auguria');
+		$menuArbo->menuLoad($mainmenu, $leftmenu, $this->type_user, 'auguria', $tabMenu);
+		$this->tabMenu = $tabMenu;
+		//var_dump($tabMenu);
 
-    	//if ($forcemainmenu == 'all') { var_dump($this->tabMenu); exit; }
+		//if ($forcemainmenu == 'all') { var_dump($this->tabMenu); exit; }
    	}
 
 
-    /**
-     *  Show menu.
-     *  Menu defined in sql tables were stored into $this->tabMenu BEFORE this is called.
-     *
-     *	@param	string	$mode		    'top', 'topnb', 'left', 'jmobile' (used to get full xml ul/li menu)
-     *  @param	array	$moredata		An array with more data to output
-     *  @return int                     0 or nb of top menu entries if $mode = 'topnb'
+	/**
+	 *  Show menu.
+	 *  Menu defined in sql tables were stored into $this->tabMenu BEFORE this is called.
+	 *
+	 *	@param	string	$mode		    'top', 'topnb', 'left', 'jmobile' (used to get full xml ul/li menu)
+	 *  @param	array	$moredata		An array with more data to output
+	 *  @return int                     0 or nb of top menu entries if $mode = 'topnb'
 	 */
 	public function showmenu($mode, $moredata = null)
 	{
-    	global $conf, $langs, $user;
+		global $conf, $langs, $user;
 
-        require_once DOL_DOCUMENT_ROOT.'/core/menus/standard/auguria.lib.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/menus/standard/auguria.lib.php';
 
-        if ($this->type_user == 1)
-        {
-        	$conf->global->MAIN_SEARCHFORM_SOCIETE_DISABLED = 1;
-	        $conf->global->MAIN_SEARCHFORM_CONTACT_DISABLED = 1;
-        }
+		if ($this->type_user == 1)
+		{
+			$conf->global->MAIN_SEARCHFORM_SOCIETE_DISABLED = 1;
+			$conf->global->MAIN_SEARCHFORM_CONTACT_DISABLED = 1;
+		}
 
 		require_once DOL_DOCUMENT_ROOT.'/core/class/menu.class.php';
-        $this->menu = new Menu();
+		$this->menu = new Menu();
 
-        if (empty($conf->global->MAIN_MENU_INVERT))
-        {
-        	if ($mode == 'top')  print_auguria_menu($this->db, $this->atarget, $this->type_user, $this->tabMenu, $this->menu, 0, $mode);
-        	if ($mode == 'left') print_left_auguria_menu($this->db, $this->menu_array, $this->menu_array_after, $this->tabMenu, $this->menu, 0, '', '', $moredata);
-        } else {
-        	$conf->global->MAIN_SHOW_LOGO = 0;
-        	if ($mode == 'top')  print_left_auguria_menu($this->db, $this->menu_array, $this->menu_array_after, $this->tabMenu, $this->menu, 0);
-        	if ($mode == 'left') print_auguria_menu($this->db, $this->atarget, $this->type_user, $this->tabMenu, $this->menu, 0, $mode);
-        }
+		if (empty($conf->global->MAIN_MENU_INVERT))
+		{
+			if ($mode == 'top')  print_auguria_menu($this->db, $this->atarget, $this->type_user, $this->tabMenu, $this->menu, 0, $mode);
+			if ($mode == 'left') print_left_auguria_menu($this->db, $this->menu_array, $this->menu_array_after, $this->tabMenu, $this->menu, 0, '', '', $moredata);
+		} else {
+			$conf->global->MAIN_SHOW_LOGO = 0;
+			if ($mode == 'top')  print_left_auguria_menu($this->db, $this->menu_array, $this->menu_array_after, $this->tabMenu, $this->menu, 0);
+			if ($mode == 'left') print_auguria_menu($this->db, $this->atarget, $this->type_user, $this->tabMenu, $this->menu, 0, $mode);
+		}
 
 		if ($mode == 'topnb')
 		{
-		    print_auguria_menu($this->db, $this->atarget, $this->type_user, $this->tabMenu, $this->menu, 1, $mode);
-		    return $this->menu->getNbOfVisibleMenuEntries();
+			print_auguria_menu($this->db, $this->atarget, $this->type_user, $this->tabMenu, $this->menu, 1, $mode);
+			return $this->menu->getNbOfVisibleMenuEntries();
 		}
 
-        if ($mode == 'jmobile')     // Used to get menu in xml ul/li
-        {
-        	print_auguria_menu($this->db, $this->atarget, $this->type_user, $this->tabMenu, $this->menu, 1, $mode);
+		if ($mode == 'jmobile')     // Used to get menu in xml ul/li
+		{
+			print_auguria_menu($this->db, $this->atarget, $this->type_user, $this->tabMenu, $this->menu, 1, $mode);
 
-            // $this->menu->liste is top menu
-            //var_dump($this->menu->liste);exit;
-        	$lastlevel = array();
-        	print '<!-- Generate menu list from menu handler '.$this->name.' -->'."\n";
-        	foreach ($this->menu->liste as $key => $val)		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
-        	{
-        		print '<ul class="ulmenu" data-inset="true">';
-        		print '<li class="lilevel0">';
-        		if ($val['enabled'] == 1)
-        		{
-        			$substitarray = array('__LOGIN__' => $user->login, '__USER_ID__' => $user->id, '__USER_SUPERVISOR_ID__' => $user->fk_user);
-        			$substitarray['__USERID__'] = $user->id; // For backward compatibility
-        			$val['url'] = make_substitutions($val['url'], $substitarray);
+			// $this->menu->liste is top menu
+			//var_dump($this->menu->liste);exit;
+			$lastlevel = array();
+			print '<!-- Generate menu list from menu handler '.$this->name.' -->'."\n";
+			foreach ($this->menu->liste as $key => $val)		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
+			{
+				print '<ul class="ulmenu" data-inset="true">';
+				print '<li class="lilevel0">';
+				if ($val['enabled'] == 1)
+				{
+					$substitarray = array('__LOGIN__' => $user->login, '__USER_ID__' => $user->id, '__USER_SUPERVISOR_ID__' => $user->fk_user);
+					$substitarray['__USERID__'] = $user->id; // For backward compatibility
+					$val['url'] = make_substitutions($val['url'], $substitarray);
 
-        			$relurl = dol_buildpath($val['url'], 1);
-        			$canonurl = preg_replace('/\?.*$/', '', $val['url']);
+					$relurl = dol_buildpath($val['url'], 1);
+					$canonurl = preg_replace('/\?.*$/', '', $val['url']);
 
-        			print '<a class="alilevel0" href="#">';
+					print '<a class="alilevel0" href="#">';
 
 					// Add font-awesome
 					if ($val['level'] == 0 && $val['mainmenu'] == 'home') print '<span class="fa fa-home fa-fw paddingright" aria-hidden="true"></span>';
 
 					print $val['titre'];
-        			print '</a>'."\n";
+					print '</a>'."\n";
 
-        			// Search submenu fot this mainmenu entry
-        			$tmpmainmenu = $val['mainmenu'];
-        			$tmpleftmenu = 'all';
-        			$submenu = new Menu();
-        			print_left_auguria_menu($this->db, $this->menu_array, $this->menu_array_after, $this->tabMenu, $submenu, 1, $tmpmainmenu, $tmpleftmenu);
-        			$nexturl = dol_buildpath($submenu->liste[0]['url'], 1);
+					// Search submenu fot this mainmenu entry
+					$tmpmainmenu = $val['mainmenu'];
+					$tmpleftmenu = 'all';
+					$submenu = new Menu();
+					print_left_auguria_menu($this->db, $this->menu_array, $this->menu_array_after, $this->tabMenu, $submenu, 1, $tmpmainmenu, $tmpleftmenu);
+					$nexturl = dol_buildpath($submenu->liste[0]['url'], 1);
 
-        			$canonrelurl = preg_replace('/\?.*$/', '', $relurl);
-        			$canonnexturl = preg_replace('/\?.*$/', '', $nexturl);
-        			//var_dump($canonrelurl);
-        			//var_dump($canonnexturl);
-        			print '<ul>'."\n";
-        			if (($canonrelurl != $canonnexturl && !in_array($val['mainmenu'], array('tools')))
-        				|| (strpos($canonrelurl, '/product/index.php') !== false || strpos($canonrelurl, '/compta/bank/list.php') !== false))
+					$canonrelurl = preg_replace('/\?.*$/', '', $relurl);
+					$canonnexturl = preg_replace('/\?.*$/', '', $nexturl);
+					//var_dump($canonrelurl);
+					//var_dump($canonnexturl);
+					print '<ul>'."\n";
+					if (($canonrelurl != $canonnexturl && !in_array($val['mainmenu'], array('tools')))
+						|| (strpos($canonrelurl, '/product/index.php') !== false || strpos($canonrelurl, '/compta/bank/list.php') !== false))
 					{
 						// We add sub entry
 						print str_pad('', 1).'<li class="lilevel1 ui-btn-icon-right ui-btn">'; // ui-btn to highlight on clic
 						print '<a href="'.$relurl.'">';
-					    if ($langs->trans(ucfirst($val['mainmenu'])."Dashboard") == ucfirst($val['mainmenu'])."Dashboard")  // No translation
-        				{
-        				    if (in_array($val['mainmenu'], array('cashdesk', 'externalsite', 'website', 'collab'))) print $langs->trans("Access");
-        				    else print $langs->trans("Dashboard");
-        				} else print $langs->trans(ucfirst($val['mainmenu'])."Dashboard");
+						if ($langs->trans(ucfirst($val['mainmenu'])."Dashboard") == ucfirst($val['mainmenu'])."Dashboard")  // No translation
+						{
+							if (in_array($val['mainmenu'], array('cashdesk', 'externalsite', 'website', 'collab'))) print $langs->trans("Access");
+							else print $langs->trans("Dashboard");
+						} else print $langs->trans(ucfirst($val['mainmenu'])."Dashboard");
 						print '</a>';
 						print '</li>'."\n";
-        			}
+					}
 
-    				if ($val['level'] == 0)
+					if ($val['level'] == 0)
 					{
-					    if ($val['enabled'])
-					    {
-					        $lastlevel[0] = 'enabled';
-					    } elseif ($showmenu)                 // Not enabled but visible (so greyed)
-					    {
-					        $lastlevel[0] = 'greyed';
-					    } else {
-					        $lastlevel[0] = 'hidden';
-					    }
+						if ($val['enabled'])
+						{
+							$lastlevel[0] = 'enabled';
+						} elseif ($showmenu)                 // Not enabled but visible (so greyed)
+						{
+							$lastlevel[0] = 'greyed';
+						} else {
+							$lastlevel[0] = 'hidden';
+						}
 					}
 
 					$lastlevel2 = array();
 					foreach ($submenu->liste as $key2 => $val2)		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
-        			{
+					{
 						$showmenu = true;
 						if (!empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED) && empty($val2['enabled'])) $showmenu = false;
 
-        				// If at least one parent is not enabled, we do not show any menu of all children
+						// If at least one parent is not enabled, we do not show any menu of all children
 						if ($val2['level'] > 0)
 						{
-						    $levelcursor = $val2['level'] - 1;
-						    while ($levelcursor >= 0)
-						    {
-                                if ($lastlevel2[$levelcursor] != 'enabled') $showmenu = false;
-                                $levelcursor--;
-						    }
+							$levelcursor = $val2['level'] - 1;
+							while ($levelcursor >= 0)
+							{
+								if ($lastlevel2[$levelcursor] != 'enabled') $showmenu = false;
+								$levelcursor--;
+							}
 						}
 
 						if ($showmenu)		// Visible (option to hide when not allowed is off or allowed)
-       					{
-       						$substitarray = array('__LOGIN__' => $user->login, '__USER_ID__' => $user->id, '__USER_SUPERVISOR_ID__' => $user->fk_user);
-       						$substitarray['__USERID__'] = $user->id; // For backward compatibility
-       						$val2['url'] = make_substitutions($val2['url'], $substitarray); // Make also substitution of __(XXX)__ and __[XXX]__
+	   					{
+	   						$substitarray = array('__LOGIN__' => $user->login, '__USER_ID__' => $user->id, '__USER_SUPERVISOR_ID__' => $user->fk_user);
+	   						$substitarray['__USERID__'] = $user->id; // For backward compatibility
+	   						$val2['url'] = make_substitutions($val2['url'], $substitarray); // Make also substitution of __(XXX)__ and __[XXX]__
 
-       						if (!preg_match("/^(http:\/\/|https:\/\/)/i", $val2['url']))
-       						{
-       							$relurl2 = dol_buildpath($val2['url'], 1);
-       						} else {
-       							$relurl2 = $val2['url'];
-       						}
-	        				$canonurl2 = preg_replace('/\?.*$/', '', $val2['url']);
-	        				//var_dump($val2['url'].' - '.$canonurl2.' - '.$val2['level']);
-	        				if (in_array($canonurl2, array('/admin/index.php', '/admin/tools/index.php', '/core/tools.php'))) $relurl2 = '';
+	   						if (!preg_match("/^(http:\/\/|https:\/\/)/i", $val2['url']))
+	   						{
+	   							$relurl2 = dol_buildpath($val2['url'], 1);
+	   						} else {
+	   							$relurl2 = $val2['url'];
+	   						}
+							$canonurl2 = preg_replace('/\?.*$/', '', $val2['url']);
+							//var_dump($val2['url'].' - '.$canonurl2.' - '.$val2['level']);
+							if (in_array($canonurl2, array('/admin/index.php', '/admin/tools/index.php', '/core/tools.php'))) $relurl2 = '';
 
-	        				$disabled = '';
-	        				if (!$val2['enabled'])
-	        				{
-	        				    $disabled = " vsmenudisabled";
-	        				}
+							$disabled = '';
+							if (!$val2['enabled'])
+							{
+								$disabled = " vsmenudisabled";
+							}
 
-	        				print str_pad('', $val2['level'] + 1);
-	        				print '<li class="lilevel'.($val2['level'] + 1);
-	        				if ($val2['level'] == 0) print ' ui-btn-icon-right ui-btn'; // ui-btn to highlight on clic
-	        				print $disabled.'">'; // ui-btn to highlight on clic
-	        				if ($relurl2)
-	        				{
-	        					if ($val2['enabled'])	// Allowed
-	        					{
-	        						print '<a href="'.$relurl2.'"';
-		        					//print ' data-ajax="false"';
-		        					print '>';
-		        					$lastlevel2[$val2['level']] = 'enabled';
-	        					} else // Not allowed but visible (greyed)
-	        					{
-				        			print '<a href="#" class="vsmenudisabled">';
-				        			$lastlevel2[$val2['level']] = 'greyed';
-	        					}
-	        				} else {
-	        				    if ($val2['enabled'])	// Allowed
-	        				    {
-	        				        $lastlevel2[$val2['level']] = 'enabled';
-	        				    } else {
-	        				        $lastlevel2[$val2['level']] = 'greyed';
-	        				    }
-	        				}
-	        				print $val2['titre'];
-	        				if ($relurl2)
-	        				{
-	        					if ($val2['enabled'])	// Allowed
-	        						print '</a>';
-	        					else print '</a>';
-	        				}
-	        				print '</li>'."\n";
-       					}
-        			}
-        			//var_dump($submenu);
-        			print '</ul>';
-        		}
-        		if ($val['enabled'] == 2)
-        		{
-        			print '<font class="vsmenudisabled">'.$val['titre'].'</font>';
-        		}
-        		print '</li>';
-        		print '</ul>'."\n";
-        	}
-        }
+							print str_pad('', $val2['level'] + 1);
+							print '<li class="lilevel'.($val2['level'] + 1);
+							if ($val2['level'] == 0) print ' ui-btn-icon-right ui-btn'; // ui-btn to highlight on clic
+							print $disabled.'">'; // ui-btn to highlight on clic
+							if ($relurl2)
+							{
+								if ($val2['enabled'])	// Allowed
+								{
+									print '<a href="'.$relurl2.'"';
+									//print ' data-ajax="false"';
+									print '>';
+									$lastlevel2[$val2['level']] = 'enabled';
+								} else // Not allowed but visible (greyed)
+								{
+									print '<a href="#" class="vsmenudisabled">';
+									$lastlevel2[$val2['level']] = 'greyed';
+								}
+							} else {
+								if ($val2['enabled'])	// Allowed
+								{
+									$lastlevel2[$val2['level']] = 'enabled';
+								} else {
+									$lastlevel2[$val2['level']] = 'greyed';
+								}
+							}
+							print $val2['titre'];
+							if ($relurl2)
+							{
+								if ($val2['enabled'])	// Allowed
+									print '</a>';
+								else print '</a>';
+							}
+							print '</li>'."\n";
+	   					}
+					}
+					//var_dump($submenu);
+					print '</ul>';
+				}
+				if ($val['enabled'] == 2)
+				{
+					print '<font class="vsmenudisabled">'.$val['titre'].'</font>';
+				}
+				print '</li>';
+				print '</ul>'."\n";
+			}
+		}
 
-        unset($this->menu);
+		unset($this->menu);
 
-        //print 'xx'.$mode;
-        return 0;
-    }
+		//print 'xx'.$mode;
+		return 0;
+	}
 }
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 33380c531f1..8f7501e3fce 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -353,7 +353,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 
 		'session' => (($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "accountancy") ? 0 : 1),
 
-		'loadLangs' => array("compta", "accountancy", "assets","intracommreport"),
+		'loadLangs' => array("compta", "accountancy", "assets", "intracommreport"),
 		'submenus' => array(),
 	);
 
@@ -763,9 +763,11 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 				$newmenu->add('/admin/system/os.php?mainmenu=home&amp;leftmenu=admintools', $langs->trans('InfoOS'), 1);
 				$newmenu->add('/admin/system/web.php?mainmenu=home&amp;leftmenu=admintools', $langs->trans('InfoWebServer'), 1);
 				$newmenu->add('/admin/system/phpinfo.php?mainmenu=home&amp;leftmenu=admintools', $langs->trans('InfoPHP'), 1);
-				//if (function_exists('xdebug_is_enabled')) $newmenu->add('/admin/system/xdebug.php', $langs->trans('XDebug'),1);
 				$newmenu->add('/admin/system/database.php?mainmenu=home&amp;leftmenu=admintools', $langs->trans('InfoDatabase'), 1);
-				//$newmenu->add("/admin/system/perf.php?mainmenu=home&amp;leftmenu=admintools", $langs->trans("InfoPerf"),1);
+				if (!empty($conf->global->MAIN_FEATURES_LEVEL)) {
+					$newmenu->add("/admin/system/perf.php?mainmenu=home&amp;leftmenu=admintools", $langs->trans("InfoPerf"), 1);
+					$newmenu->add("/admin/system/security.php?mainmenu=home&amp;leftmenu=admintools", $langs->trans("InfoSecurity"), 1);
+				}
 				$newmenu->add("/admin/tools/dolibarr_export.php?mainmenu=home&amp;leftmenu=admintools", $langs->trans("Backup"), 1);
 				$newmenu->add("/admin/tools/dolibarr_import.php?mainmenu=home&amp;leftmenu=admintools", $langs->trans("Restore"), 1);
 				$newmenu->add("/admin/tools/update.php?mainmenu=home&amp;leftmenu=admintools", $langs->trans("MenuUpgrade"), 1);
@@ -1096,7 +1098,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 				if ($usemenuhider || empty($leftmenu) || preg_match('/^tax_social/i', $leftmenu)) {
 					$newmenu->add("/compta/sociales/card.php?leftmenu=tax_social&action=create", $langs->trans("MenuNewSocialContribution"), 2, $user->rights->tax->charges->creer);
 					$newmenu->add("/compta/sociales/list.php?leftmenu=tax_social", $langs->trans("List"), 2, $user->rights->tax->charges->lire);
-					$newmenu->add("/compta/sociales/payments.php?leftmenu=tax_social&amp;mainmenu=billing&amp;mode=sconly", $langs->trans("Payments"), 2, $user->rights->tax->charges->lire);
+					$newmenu->add("/compta/sociales/payments.php?leftmenu=tax_social&amp;mainmenu=billing", $langs->trans("Payments"), 2, $user->rights->tax->charges->lire);
 				}
 				// VAT
 				if (empty($conf->global->TAX_DISABLE_VAT_MENUS))
@@ -1439,16 +1441,16 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 				//if ($leftmenu=="ca") $newmenu->add("/compta/journaux/index.php?leftmenu=ca",$langs->trans("Journals"),1,$user->rights->compta->resultat->lire||$user->rights->accounting->comptarapport->lire);
 			}
 
-            // Intracomm report
-            if (! empty($conf->intracommreport->enabled))
-            {
-                $newmenu->add("/intracommreport/list.php?leftmenu=intracommreport", $langs->trans("MenuIntracommReport"), 0, $user->rights->intracommreport->read, '', $mainmenu, 'intracommreport', 1);
-                if ($usemenuhider || empty($leftmenu) || preg_match('/intracommreport/', $leftmenu)) {
-                    // DEB / DES
-                    $newmenu->add("/intracommreport/card.php?action=create&leftmenu=intracommreport", $langs->trans("MenuIntracommReportNew"), 1, $user->rights->intracommreport->write, '', $mainmenu, 'intracommreport', 1);
-                    $newmenu->add("/intracommreport/list.php?leftmenu=intracommreport", $langs->trans("MenuIntracommReportList"), 1, $user->rights->intracommreport->read, '', $mainmenu, 'intracommreport', 1);
-                }
-            }
+			// Intracomm report
+			if (!empty($conf->intracommreport->enabled))
+			{
+				$newmenu->add("/intracommreport/list.php?leftmenu=intracommreport", $langs->trans("MenuIntracommReport"), 0, $user->rights->intracommreport->read, '', $mainmenu, 'intracommreport', 1);
+				if ($usemenuhider || empty($leftmenu) || preg_match('/intracommreport/', $leftmenu)) {
+					// DEB / DES
+					$newmenu->add("/intracommreport/card.php?action=create&leftmenu=intracommreport", $langs->trans("MenuIntracommReportNew"), 1, $user->rights->intracommreport->write, '', $mainmenu, 'intracommreport', 1);
+					$newmenu->add("/intracommreport/list.php?leftmenu=intracommreport", $langs->trans("MenuIntracommReportList"), 1, $user->rights->intracommreport->read, '', $mainmenu, 'intracommreport', 1);
+				}
+			}
 
 			// Assets
 			if (!empty($conf->asset->enabled))
diff --git a/htdocs/core/menus/standard/eldy_menu.php b/htdocs/core/menus/standard/eldy_menu.php
index c3e6a0bce05..56a56d3af9b 100644
--- a/htdocs/core/menus/standard/eldy_menu.php
+++ b/htdocs/core/menus/standard/eldy_menu.php
@@ -28,293 +28,293 @@
 class MenuManager
 {
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $type_user; // Put 0 for internal users, 1 for external users
-    public $atarget = ""; // To store default target to use onto links
-    public $name = "eldy";
+	public $type_user; // Put 0 for internal users, 1 for external users
+	public $atarget = ""; // To store default target to use onto links
+	public $name = "eldy";
 
-    public $menu_array;
-    public $menu_array_after;
+	public $menu_array;
+	public $menu_array_after;
 
-    public $tabMenu;
+	public $tabMenu;
 
 
-    /**
-     *  Constructor
-     *
+	/**
+	 *  Constructor
+	 *
 	 *  @param	DoliDB		$db     	Database handler
-     *  @param	int			$type_user	Type of user
-     */
-    public function __construct($db, $type_user)
-    {
-    	$this->type_user = $type_user;
-        $this->db = $db;
-    }
+	 *  @param	int			$type_user	Type of user
+	 */
+	public function __construct($db, $type_user)
+	{
+		$this->type_user = $type_user;
+		$this->db = $db;
+	}
 
 
-    /**
-     * Load this->tabMenu
-     *
-   	 * @param	string	$forcemainmenu		To force mainmenu to load
-   	 * @param	string	$forceleftmenu		To force leftmenu to load
-     * @return	void
-     */
-    public function loadMenu($forcemainmenu = '', $forceleftmenu = '')
-    {
-    	global $conf, $user, $langs;
+	/**
+	 * Load this->tabMenu
+	 *
+	 * @param	string	$forcemainmenu		To force mainmenu to load
+	 * @param	string	$forceleftmenu		To force leftmenu to load
+	 * @return	void
+	 */
+	public function loadMenu($forcemainmenu = '', $forceleftmenu = '')
+	{
+		global $conf, $user, $langs;
 
 		// We save into session the main menu selected
-    	if (GETPOSTISSET("mainmenu")) $_SESSION["mainmenu"] = GETPOST("mainmenu", 'aZ09');
-    	if (GETPOSTISSET("idmenu"))   $_SESSION["idmenu"] = GETPOST("idmenu", 'int');
+		if (GETPOSTISSET("mainmenu")) $_SESSION["mainmenu"] = GETPOST("mainmenu", 'aZ09');
+		if (GETPOSTISSET("idmenu"))   $_SESSION["idmenu"] = GETPOST("idmenu", 'int');
 
 		// Read now mainmenu and leftmenu that define which menu to show
-    	if (GETPOSTISSET("mainmenu"))
-        {
-        	// On sauve en session le menu principal choisi
-        	$mainmenu = GETPOST("mainmenu", 'aZ09');
-        	$_SESSION["mainmenu"] = $mainmenu;
-        	$_SESSION["leftmenuopened"] = "";
-        } else {
-        	// On va le chercher en session si non defini par le lien
-        	$mainmenu = isset($_SESSION["mainmenu"]) ? $_SESSION["mainmenu"] : '';
-        }
-        if (!empty($forcemainmenu)) $mainmenu = $forcemainmenu;
+		if (GETPOSTISSET("mainmenu"))
+		{
+			// On sauve en session le menu principal choisi
+			$mainmenu = GETPOST("mainmenu", 'aZ09');
+			$_SESSION["mainmenu"] = $mainmenu;
+			$_SESSION["leftmenuopened"] = "";
+		} else {
+			// On va le chercher en session si non defini par le lien
+			$mainmenu = isset($_SESSION["mainmenu"]) ? $_SESSION["mainmenu"] : '';
+		}
+		if (!empty($forcemainmenu)) $mainmenu = $forcemainmenu;
 
-        if (GETPOSTISSET("leftmenu"))
-        {
-        	// On sauve en session le menu principal choisi
-        	$leftmenu = GETPOST("leftmenu", 'aZ09');
-        	$_SESSION["leftmenu"] = $leftmenu;
+		if (GETPOSTISSET("leftmenu"))
+		{
+			// On sauve en session le menu principal choisi
+			$leftmenu = GETPOST("leftmenu", 'aZ09');
+			$_SESSION["leftmenu"] = $leftmenu;
 
-        	if ($_SESSION["leftmenuopened"] == $leftmenu)	// To collapse
-        	{
-        		//$leftmenu="";
-        		$_SESSION["leftmenuopened"] = "";
-        	} else {
-        		$_SESSION["leftmenuopened"] = $leftmenu;
-        	}
-        } else {
-        	// On va le chercher en session si non defini par le lien
-        	$leftmenu = isset($_SESSION["leftmenu"]) ? $_SESSION["leftmenu"] : '';
-        }
-        if (!empty($forceleftmenu)) $leftmenu = $forceleftmenu;
+			if ($_SESSION["leftmenuopened"] == $leftmenu)	// To collapse
+			{
+				//$leftmenu="";
+				$_SESSION["leftmenuopened"] = "";
+			} else {
+				$_SESSION["leftmenuopened"] = $leftmenu;
+			}
+		} else {
+			// On va le chercher en session si non defini par le lien
+			$leftmenu = isset($_SESSION["leftmenu"]) ? $_SESSION["leftmenu"] : '';
+		}
+		if (!empty($forceleftmenu)) $leftmenu = $forceleftmenu;
 
-        require_once DOL_DOCUMENT_ROOT.'/core/class/menubase.class.php';
-        $tabMenu = array();
-        $menuArbo = new Menubase($this->db, 'eldy');
-        $menuArbo->menuLoad($mainmenu, $leftmenu, $this->type_user, 'eldy', $tabMenu);
-        $this->tabMenu = $tabMenu;
-        //var_dump($tabMenu);
+		require_once DOL_DOCUMENT_ROOT.'/core/class/menubase.class.php';
+		$tabMenu = array();
+		$menuArbo = new Menubase($this->db, 'eldy');
+		$menuArbo->menuLoad($mainmenu, $leftmenu, $this->type_user, 'eldy', $tabMenu);
+		$this->tabMenu = $tabMenu;
+		//var_dump($tabMenu);
 
-        //if ($forcemainmenu == 'all') { var_dump($this->tabMenu); exit; }
-    }
+		//if ($forcemainmenu == 'all') { var_dump($this->tabMenu); exit; }
+	}
 
 
-    /**
-     *  Show menu.
-     *  Menu defined in sql tables were stored into $this->tabMenu BEFORE this is called.
-     *
-     *	@param	string	$mode			'top', 'topnb', 'left', 'jmobile' (used to get full xml ul/li menu)
-     *  @param	array	$moredata		An array with more data to output
-     *  @return int                     0 or nb of top menu entries if $mode = 'topnb'
-     */
-    public function showmenu($mode, $moredata = null)
-    {
-    	global $conf, $langs, $user;
+	/**
+	 *  Show menu.
+	 *  Menu defined in sql tables were stored into $this->tabMenu BEFORE this is called.
+	 *
+	 *	@param	string	$mode			'top', 'topnb', 'left', 'jmobile' (used to get full xml ul/li menu)
+	 *  @param	array	$moredata		An array with more data to output
+	 *  @return int                     0 or nb of top menu entries if $mode = 'topnb'
+	 */
+	public function showmenu($mode, $moredata = null)
+	{
+		global $conf, $langs, $user;
 
-    	//var_dump($this->tabMenu);
+		//var_dump($this->tabMenu);
 
-        require_once DOL_DOCUMENT_ROOT.'/core/menus/standard/eldy.lib.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/menus/standard/eldy.lib.php';
 
-        if ($this->type_user == 1)
-        {
-        	$conf->global->MAIN_SEARCHFORM_SOCIETE_DISABLED = 1;
-        	$conf->global->MAIN_SEARCHFORM_CONTACT_DISABLED = 1;
-        }
+		if ($this->type_user == 1)
+		{
+			$conf->global->MAIN_SEARCHFORM_SOCIETE_DISABLED = 1;
+			$conf->global->MAIN_SEARCHFORM_CONTACT_DISABLED = 1;
+		}
 
 		require_once DOL_DOCUMENT_ROOT.'/core/class/menu.class.php';
-        $this->menu = new Menu();
+		$this->menu = new Menu();
 
-        if (empty($conf->global->MAIN_MENU_INVERT))
-        {
-        	if ($mode == 'top')  print_eldy_menu($this->db, $this->atarget, $this->type_user, $this->tabMenu, $this->menu, 0, $mode);
-        	if ($mode == 'left') print_left_eldy_menu($this->db, $this->menu_array, $this->menu_array_after, $this->tabMenu, $this->menu, 0, '', '', $moredata);
-        } else {
-        	$conf->global->MAIN_SHOW_LOGO = 0;
-        	if ($mode == 'top')  print_left_eldy_menu($this->db, $this->menu_array, $this->menu_array_after, $this->tabMenu, $this->menu, 0);
-        	if ($mode == 'left') print_eldy_menu($this->db, $this->atarget, $this->type_user, $this->tabMenu, $this->menu, 0, $mode);
+		if (empty($conf->global->MAIN_MENU_INVERT))
+		{
+			if ($mode == 'top')  print_eldy_menu($this->db, $this->atarget, $this->type_user, $this->tabMenu, $this->menu, 0, $mode);
+			if ($mode == 'left') print_left_eldy_menu($this->db, $this->menu_array, $this->menu_array_after, $this->tabMenu, $this->menu, 0, '', '', $moredata);
+		} else {
+			$conf->global->MAIN_SHOW_LOGO = 0;
+			if ($mode == 'top')  print_left_eldy_menu($this->db, $this->menu_array, $this->menu_array_after, $this->tabMenu, $this->menu, 0);
+			if ($mode == 'left') print_eldy_menu($this->db, $this->atarget, $this->type_user, $this->tabMenu, $this->menu, 0, $mode);
 		}
 		if ($mode == 'topnb')
 		{
-		    print_eldy_menu($this->db, $this->atarget, $this->type_user, $this->tabMenu, $this->menu, 1, $mode); // no output
-		    return $this->menu->getNbOfVisibleMenuEntries();
+			print_eldy_menu($this->db, $this->atarget, $this->type_user, $this->tabMenu, $this->menu, 1, $mode); // no output
+			return $this->menu->getNbOfVisibleMenuEntries();
 		}
 
-        if ($mode == 'jmobile')     // Used to get menu in xml ul/li
-        {
-            print_eldy_menu($this->db, $this->atarget, $this->type_user, $this->tabMenu, $this->menu, 1, $mode); // Fill this->menu that is empty with top menu
+		if ($mode == 'jmobile')     // Used to get menu in xml ul/li
+		{
+			print_eldy_menu($this->db, $this->atarget, $this->type_user, $this->tabMenu, $this->menu, 1, $mode); // Fill this->menu that is empty with top menu
 
-            // $this->menu->liste is top menu
-            //var_dump($this->menu->liste);exit;
-            $lastlevel = array();
-        	print '<!-- Generate menu list from menu handler '.$this->name.' -->'."\n";
-        	foreach ($this->menu->liste as $key => $val)		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
-        	{
-        		print '<ul class="ulmenu" data-inset="true">';
-        		print '<li class="lilevel0">';
+			// $this->menu->liste is top menu
+			//var_dump($this->menu->liste);exit;
+			$lastlevel = array();
+			print '<!-- Generate menu list from menu handler '.$this->name.' -->'."\n";
+			foreach ($this->menu->liste as $key => $val)		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
+			{
+				print '<ul class="ulmenu" data-inset="true">';
+				print '<li class="lilevel0">';
 
-        		if ($val['enabled'] == 1)
-        		{
-        			$substitarray = array('__LOGIN__' => $user->login, '__USER_ID__' => $user->id, '__USER_SUPERVISOR_ID__' => $user->fk_user);
-        			$substitarray['__USERID__'] = $user->id; // For backward compatibility
-        			$val['url'] = make_substitutions($val['url'], $substitarray);
+				if ($val['enabled'] == 1)
+				{
+					$substitarray = array('__LOGIN__' => $user->login, '__USER_ID__' => $user->id, '__USER_SUPERVISOR_ID__' => $user->fk_user);
+					$substitarray['__USERID__'] = $user->id; // For backward compatibility
+					$val['url'] = make_substitutions($val['url'], $substitarray);
 
 					$relurl = dol_buildpath($val['url'], 1);
 					$canonurl = preg_replace('/\?.*$/', '', $val['url']);
 
-        			print '<a class="alilevel0" href="#">';
+					print '<a class="alilevel0" href="#">';
 
 					// Add font-awesome
 					if ($val['level'] == 0 && $val['mainmenu'] == 'home') print '<span class="fa fa-home fa-fw paddingright" aria-hidden="true"></span>';
 
 					print $val['titre'];
-        			print '</a>'."\n";
+					print '</a>'."\n";
 
-        			// Search submenu fot this mainmenu entry
-        			$tmpmainmenu = $val['mainmenu'];
-        			$tmpleftmenu = 'all';
-        			$submenu = new Menu();
-	        		print_left_eldy_menu($this->db, $this->menu_array, $this->menu_array_after, $this->tabMenu, $submenu, 1, $tmpmainmenu, $tmpleftmenu); // Fill $submenu (example with tmpmainmenu='home' tmpleftmenu='all', return left menu tree of Home)
-	        		// Note: $submenu contains menu entry with substitution not yet done
-        		    //if ($tmpmainmenu.'-'.$tmpleftmenu == 'home-all') { var_dump($submenu); exit; }
-                    //if ($tmpmainmenu=='accountancy') { var_dump($submenu->liste); exit; }
-	        		$nexturl = dol_buildpath($submenu->liste[0]['url'], 1);
+					// Search submenu fot this mainmenu entry
+					$tmpmainmenu = $val['mainmenu'];
+					$tmpleftmenu = 'all';
+					$submenu = new Menu();
+					print_left_eldy_menu($this->db, $this->menu_array, $this->menu_array_after, $this->tabMenu, $submenu, 1, $tmpmainmenu, $tmpleftmenu); // Fill $submenu (example with tmpmainmenu='home' tmpleftmenu='all', return left menu tree of Home)
+					// Note: $submenu contains menu entry with substitution not yet done
+					//if ($tmpmainmenu.'-'.$tmpleftmenu == 'home-all') { var_dump($submenu); exit; }
+					//if ($tmpmainmenu=='accountancy') { var_dump($submenu->liste); exit; }
+					$nexturl = dol_buildpath($submenu->liste[0]['url'], 1);
 
-        			$canonrelurl = preg_replace('/\?.*$/', '', $relurl);
-        			$canonnexturl = preg_replace('/\?.*$/', '', $nexturl);
-        			//var_dump($canonrelurl);
-        			//var_dump($canonnexturl);
-        			print '<ul>'."\n";
-        			if (($canonrelurl != $canonnexturl && !in_array($val['mainmenu'], array('tools')))
-        				|| (strpos($canonrelurl, '/product/index.php') !== false || strpos($canonrelurl, '/compta/bank/list.php') !== false))
+					$canonrelurl = preg_replace('/\?.*$/', '', $relurl);
+					$canonnexturl = preg_replace('/\?.*$/', '', $nexturl);
+					//var_dump($canonrelurl);
+					//var_dump($canonnexturl);
+					print '<ul>'."\n";
+					if (($canonrelurl != $canonnexturl && !in_array($val['mainmenu'], array('tools')))
+						|| (strpos($canonrelurl, '/product/index.php') !== false || strpos($canonrelurl, '/compta/bank/list.php') !== false))
 					{
-        				// We add sub entry
-        				print str_pad('', 1).'<li class="lilevel1 ui-btn-icon-right ui-btn">'; // ui-btn to highlight on clic
-        				print '<a href="'.$relurl.'">';
-        				if ($langs->trans(ucfirst($val['mainmenu'])."Dashboard") == ucfirst($val['mainmenu'])."Dashboard")  // No translation
-        				{
-        					if (in_array($val['mainmenu'], array('cashdesk', 'externalsite', 'website', 'collab'))) print $langs->trans("Access");
-        				    else print $langs->trans("Dashboard");
-        				} else print $langs->trans(ucfirst($val['mainmenu'])."Dashboard");
-        				print '</a>';
-        				print '</li>'."\n";
-        			}
+						// We add sub entry
+						print str_pad('', 1).'<li class="lilevel1 ui-btn-icon-right ui-btn">'; // ui-btn to highlight on clic
+						print '<a href="'.$relurl.'">';
+						if ($langs->trans(ucfirst($val['mainmenu'])."Dashboard") == ucfirst($val['mainmenu'])."Dashboard")  // No translation
+						{
+							if (in_array($val['mainmenu'], array('cashdesk', 'externalsite', 'website', 'collab'))) print $langs->trans("Access");
+							else print $langs->trans("Dashboard");
+						} else print $langs->trans(ucfirst($val['mainmenu'])."Dashboard");
+						print '</a>';
+						print '</li>'."\n";
+					}
 
-        			if ($val['level'] == 0)
-        			{
-        			    if ($val['enabled'])
-        			    {
-        			        $lastlevel[0] = 'enabled';
-        			    } elseif ($showmenu)                 // Not enabled but visible (so greyed)
-        			    {
-        			        $lastlevel[0] = 'greyed';
-        			    } else {
-        			        $lastlevel[0] = 'hidden';
-        			    }
-        			}
+					if ($val['level'] == 0)
+					{
+						if ($val['enabled'])
+						{
+							$lastlevel[0] = 'enabled';
+						} elseif ($showmenu)                 // Not enabled but visible (so greyed)
+						{
+							$lastlevel[0] = 'greyed';
+						} else {
+							$lastlevel[0] = 'hidden';
+						}
+					}
 
-        			$lastlevel2 = array();
-       				foreach ($submenu->liste as $key2 => $val2)		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
-       				{
+					$lastlevel2 = array();
+	   				foreach ($submenu->liste as $key2 => $val2)		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
+	   				{
 						$showmenu = true;
 						if (!empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED) && empty($val2['enabled'])) $showmenu = false;
 
 						// If at least one parent is not enabled, we do not show any menu of all children
 						if ($val2['level'] > 0)
 						{
-						    $levelcursor = $val2['level'] - 1;
-						    while ($levelcursor >= 0)
-						    {
-                                if ($lastlevel2[$levelcursor] != 'enabled') $showmenu = false;
-                                $levelcursor--;
-						    }
+							$levelcursor = $val2['level'] - 1;
+							while ($levelcursor >= 0)
+							{
+								if ($lastlevel2[$levelcursor] != 'enabled') $showmenu = false;
+								$levelcursor--;
+							}
 						}
 
-       					if ($showmenu)		// Visible (option to hide when not allowed is off or allowed)
-       					{
-       						$substitarray = array('__LOGIN__' => $user->login, '__USER_ID__' => $user->id, '__USER_SUPERVISOR_ID__' => $user->fk_user);
-       						$substitarray['__USERID__'] = $user->id; // For backward compatibility
-       						$val2['url'] = make_substitutions($val2['url'], $substitarray); // Make also substitution of __(XXX)__ and __[XXX]__
+	   					if ($showmenu)		// Visible (option to hide when not allowed is off or allowed)
+	   					{
+	   						$substitarray = array('__LOGIN__' => $user->login, '__USER_ID__' => $user->id, '__USER_SUPERVISOR_ID__' => $user->fk_user);
+	   						$substitarray['__USERID__'] = $user->id; // For backward compatibility
+	   						$val2['url'] = make_substitutions($val2['url'], $substitarray); // Make also substitution of __(XXX)__ and __[XXX]__
 
-       						if (!preg_match("/^(http:\/\/|https:\/\/)/i", $val2['url']))
-       						{
-       							$relurl2 = dol_buildpath($val2['url'], 1);
-       						} else {
-       							$relurl2 = $val2['url'];
-       						}
-	        				$canonurl2 = preg_replace('/\?.*$/', '', $val2['url']);
-	        				//var_dump($val2['url'].' - '.$canonurl2.' - '.$val2['level']);
-	        				if (in_array($canonurl2, array('/admin/index.php', '/admin/tools/index.php', '/core/tools.php'))) $relurl2 = '';
+	   						if (!preg_match("/^(http:\/\/|https:\/\/)/i", $val2['url']))
+	   						{
+	   							$relurl2 = dol_buildpath($val2['url'], 1);
+	   						} else {
+	   							$relurl2 = $val2['url'];
+	   						}
+							$canonurl2 = preg_replace('/\?.*$/', '', $val2['url']);
+							//var_dump($val2['url'].' - '.$canonurl2.' - '.$val2['level']);
+							if (in_array($canonurl2, array('/admin/index.php', '/admin/tools/index.php', '/core/tools.php'))) $relurl2 = '';
 
-	        				$disabled = '';
-	        				if (!$val2['enabled'])
-	        				{
-	        				    $disabled = " vsmenudisabled";
-	        				}
+							$disabled = '';
+							if (!$val2['enabled'])
+							{
+								$disabled = " vsmenudisabled";
+							}
 
-	        				print str_pad('', $val2['level'] + 1);
-	        				print '<li class="lilevel'.($val2['level'] + 1);
-	        				if ($val2['level'] == 0) print ' ui-btn-icon-right ui-btn'; // ui-btn to highlight on clic
-	        				print $disabled.'">'; // ui-btn to highlight on clic
-	        				if ($relurl2)
-	        				{
-	        					if ($val2['enabled'])	// Allowed
-	        					{
-	        						print '<a href="'.$relurl2.'"';
-		        					//print ' data-ajax="false"';
-		        					print '>';
-		        					$lastlevel2[$val2['level']] = 'enabled';
-	        					} else // Not allowed but visible (greyed)
-	        					{
-				        			print '<a href="#" class="vsmenudisabled">';
-				        			$lastlevel2[$val2['level']] = 'greyed';
-	        					}
-	        				} else {
-	        				    if ($val2['enabled'])	// Allowed
-	        				    {
-	        				        $lastlevel2[$val2['level']] = 'enabled';
-	        				    } else {
-	        				        $lastlevel2[$val2['level']] = 'greyed';
-	        				    }
-	        				}
-                            print $val2['titre'];
-	        				if ($relurl2)
-	        				{
-	        					if ($val2['enabled'])	// Allowed
-	        						print '</a>';
-	        					else print '</a>';
-	        				}
-	        				print '</li>'."\n";
-       					}
-       				}
-        			//var_dump($submenu);
-        			print '</ul>';
-        		}
-        		if ($val['enabled'] == 2)
-        		{
-        			print '<font class="vsmenudisabled">'.$val['titre'].'</font>';
-        		}
-        		print '</li>';
-        		print '</ul>'."\n";
-        	}
-        }
+							print str_pad('', $val2['level'] + 1);
+							print '<li class="lilevel'.($val2['level'] + 1);
+							if ($val2['level'] == 0) print ' ui-btn-icon-right ui-btn'; // ui-btn to highlight on clic
+							print $disabled.'">'; // ui-btn to highlight on clic
+							if ($relurl2)
+							{
+								if ($val2['enabled'])	// Allowed
+								{
+									print '<a href="'.$relurl2.'"';
+									//print ' data-ajax="false"';
+									print '>';
+									$lastlevel2[$val2['level']] = 'enabled';
+								} else // Not allowed but visible (greyed)
+								{
+									print '<a href="#" class="vsmenudisabled">';
+									$lastlevel2[$val2['level']] = 'greyed';
+								}
+							} else {
+								if ($val2['enabled'])	// Allowed
+								{
+									$lastlevel2[$val2['level']] = 'enabled';
+								} else {
+									$lastlevel2[$val2['level']] = 'greyed';
+								}
+							}
+							print $val2['titre'];
+							if ($relurl2)
+							{
+								if ($val2['enabled'])	// Allowed
+									print '</a>';
+								else print '</a>';
+							}
+							print '</li>'."\n";
+	   					}
+	   				}
+					//var_dump($submenu);
+					print '</ul>';
+				}
+				if ($val['enabled'] == 2)
+				{
+					print '<font class="vsmenudisabled">'.$val['titre'].'</font>';
+				}
+				print '</li>';
+				print '</ul>'."\n";
+			}
+		}
 
-        unset($this->menu);
+		unset($this->menu);
 
-        //print 'xx'.$mode;
-        return 0;
-    }
+		//print 'xx'.$mode;
+		return 0;
+	}
 }
diff --git a/htdocs/core/menus/standard/empty.php b/htdocs/core/menus/standard/empty.php
index d0f2ae5b7be..3a16b76079e 100644
--- a/htdocs/core/menus/standard/empty.php
+++ b/htdocs/core/menus/standard/empty.php
@@ -26,22 +26,22 @@
 class MenuManager
 {
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $type_user = 0; // Put 0 for internal users, 1 for external users
-    public $atarget = ""; // To store default target to use onto links
+	public $type_user = 0; // Put 0 for internal users, 1 for external users
+	public $atarget = ""; // To store default target to use onto links
 
-    public $menu;
-    public $menu_array_after;
+	public $menu;
+	public $menu_array_after;
 
 
 	/**
 	 *  Constructor
 	 *
 	 *  @param	DoliDB		$db     		Database handler
-     *  @param	int			$type_user		Type of user
+	 *  @param	int			$type_user		Type of user
 	 */
 	public function __construct($db, $type_user)
 	{
@@ -51,11 +51,11 @@ class MenuManager
 
 
 	/**
-   	 * Load this->tabMenu
-   	 *
-   	 * @param	string	$forcemainmenu		To force mainmenu to load
-   	 * @param	string	$forceleftmenu		To force leftmenu to load
-   	 * @return	void
+	 * Load this->tabMenu
+	 *
+	 * @param	string	$forcemainmenu		To force mainmenu to load
+	 * @param	string	$forceleftmenu		To force leftmenu to load
+	 * @return	void
 	 */
 	public function loadMenu($forcemainmenu = '', $forceleftmenu = '')
 	{
@@ -66,9 +66,9 @@ class MenuManager
 	/**
 	 *  Show menu
 	 *
-     *	@param	string	$mode			'top', 'left', 'jmobile'
-     *  @param	array	$moredata		An array with more data to output
-     *  @return int                     0 or nb of top menu entries if $mode = 'topnb'
+	 *	@param	string	$mode			'top', 'left', 'jmobile'
+	 *  @param	array	$moredata		An array with more data to output
+	 *  @return int                     0 or nb of top menu entries if $mode = 'topnb'
 	 */
 	public function showmenu($mode, $moredata = null)
 	{
@@ -86,23 +86,23 @@ class MenuManager
 
 		if ($mode == 'topnb')
 		{
-		    return 1;
+			return 1;
 		}
 
 		if ($mode == 'top')
 		{
 			if (empty($noout)) print_start_menu_array_empty();
 
-            $usemenuhider = 1;
+			$usemenuhider = 1;
 
 			// Show/Hide vertical menu
 			if ($mode != 'jmobile' && $mode != 'topnb' && $usemenuhider && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
 			{
-			    $showmode = 1;
-			    $classname = 'class="tmenu menuhider"';
-			    $idsel = 'menu';
+				$showmode = 1;
+				$classname = 'class="tmenu menuhider"';
+				$idsel = 'menu';
 
-			    $this->menu->add('#', '', 0, $showmode, $atarget, "xxx", '', 0, $id, $idsel, $classname);
+				$this->menu->add('#', '', 0, $showmode, $atarget, "xxx", '', 0, $id, $idsel, $classname);
 			}
 
 			// Home
@@ -119,9 +119,9 @@ class MenuManager
 			// Output menu entries
 			foreach ($this->menu->liste as $menkey => $menuval)
 			{
-			    if (empty($noout)) print_start_menu_entry_empty($menuval['idsel'], $menuval['classname'], $menuval['enabled']);
-			    if (empty($noout)) print_text_menu_entry_empty($menuval['titre'], $menuval['enabled'], ($menuval['url'] != '#' ?DOL_URL_ROOT:'').$menuval['url'], $menuval['id'], $menuval['idsel'], $menuval['classname'], ($menuval['target'] ? $menuval['target'] : $atarget));
-			    if (empty($noout)) print_end_menu_entry_empty($menuval['enabled']);
+				if (empty($noout)) print_start_menu_entry_empty($menuval['idsel'], $menuval['classname'], $menuval['enabled']);
+				if (empty($noout)) print_text_menu_entry_empty($menuval['titre'], $menuval['enabled'], ($menuval['url'] != '#' ?DOL_URL_ROOT:'').$menuval['url'], $menuval['id'], $menuval['idsel'], $menuval['classname'], ($menuval['target'] ? $menuval['target'] : $atarget));
+				if (empty($noout)) print_end_menu_entry_empty($menuval['enabled']);
 			}
 
 			$showmode = 1;
@@ -139,182 +139,182 @@ class MenuManager
 
 		if ($mode == 'jmobile')     // Used to get menu in xml ul/li
 		{
-		    // Home
-		    $showmode = 1;
-		    $classname = 'class="tmenusel"';
-		    $idsel = 'home';
+			// Home
+			$showmode = 1;
+			$classname = 'class="tmenusel"';
+			$idsel = 'home';
 
-		    $this->menu->add('/index.php', $langs->trans("Home"), 0, $showmode, $this->atarget, 'home', '', 10, $id, $idsel, $classname);
+			$this->menu->add('/index.php', $langs->trans("Home"), 0, $showmode, $this->atarget, 'home', '', 10, $id, $idsel, $classname);
 
-		    $substitarray = getCommonSubstitutionArray($langs, 0, null, null);
+			$substitarray = getCommonSubstitutionArray($langs, 0, null, null);
 
-		    // $this->menu->liste is top menu
-		    //var_dump($this->menu->liste);exit;
-		    $lastlevel = array();
-		    print '<!-- Generate menu list from menu handler '.$this->name.' -->'."\n";
-		    foreach ($this->menu->liste as $key => $val)		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
-		    {
-		        print '<ul class="ulmenu" data-inset="true">';
-		        print '<li class="lilevel0">';
+			// $this->menu->liste is top menu
+			//var_dump($this->menu->liste);exit;
+			$lastlevel = array();
+			print '<!-- Generate menu list from menu handler '.$this->name.' -->'."\n";
+			foreach ($this->menu->liste as $key => $val)		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
+			{
+				print '<ul class="ulmenu" data-inset="true">';
+				print '<li class="lilevel0">';
 
-		        $val['url'] = make_substitutions($val['url'], $substitarray);
+				$val['url'] = make_substitutions($val['url'], $substitarray);
 
-		        if ($val['enabled'] == 1)
-		        {
-		            $relurl = dol_buildpath($val['url'], 1);
-		            $canonurl = preg_replace('/\?.*$/', '', $val['url']);
+				if ($val['enabled'] == 1)
+				{
+					$relurl = dol_buildpath($val['url'], 1);
+					$canonurl = preg_replace('/\?.*$/', '', $val['url']);
 
-		            print '<a class="alilevel0" href="#">';
+					print '<a class="alilevel0" href="#">';
 
-		            // Add font-awesome
-		            if ($val['level'] == 0 && $val['mainmenu'] == 'home') print '<span class="fa fa-home fa-fw paddingright" aria-hidden="true"></span>';
+					// Add font-awesome
+					if ($val['level'] == 0 && $val['mainmenu'] == 'home') print '<span class="fa fa-home fa-fw paddingright" aria-hidden="true"></span>';
 
-		            print $val['titre'];
-		            print '</a>'."\n";
+					print $val['titre'];
+					print '</a>'."\n";
 
-		            // Search submenu fot this mainmenu entry
-		            $tmpmainmenu = $val['mainmenu'];
-		            $tmpleftmenu = 'all';
-		            $submenu = new Menu();
+					// Search submenu fot this mainmenu entry
+					$tmpmainmenu = $val['mainmenu'];
+					$tmpleftmenu = 'all';
+					$submenu = new Menu();
 
-		            $langs->load("admin"); // Load translation file admin.lang
-		            $submenu->add("/admin/index.php?leftmenu=setup", $langs->trans("Setup"), 0);
-		            $submenu->add("/admin/company.php", $langs->trans("MenuCompanySetup"), 1);
-		            $submenu->add("/admin/modules.php", $langs->trans("Modules"), 1);
-		            $submenu->add("/admin/menus.php", $langs->trans("Menus"), 1);
-		            $submenu->add("/admin/ihm.php", $langs->trans("GUISetup"), 1);
-		            $submenu->add("/admin/translation.php?mainmenu=home", $langs->trans("Translation"), 1);
-		            $submenu->add("/admin/defaultvalues.php?mainmenu=home", $langs->trans("DefaultValues"), 1);
+					$langs->load("admin"); // Load translation file admin.lang
+					$submenu->add("/admin/index.php?leftmenu=setup", $langs->trans("Setup"), 0);
+					$submenu->add("/admin/company.php", $langs->trans("MenuCompanySetup"), 1);
+					$submenu->add("/admin/modules.php", $langs->trans("Modules"), 1);
+					$submenu->add("/admin/menus.php", $langs->trans("Menus"), 1);
+					$submenu->add("/admin/ihm.php", $langs->trans("GUISetup"), 1);
+					$submenu->add("/admin/translation.php?mainmenu=home", $langs->trans("Translation"), 1);
+					$submenu->add("/admin/defaultvalues.php?mainmenu=home", $langs->trans("DefaultValues"), 1);
 
-		            $submenu->add("/admin/boxes.php", $langs->trans("Boxes"), 1);
-		            $submenu->add("/admin/delais.php", $langs->trans("Alerts"), 1);
-		            $submenu->add("/admin/proxy.php?mainmenu=home", $langs->trans("Security"), 1);
-		            $submenu->add("/admin/limits.php?mainmenu=home", $langs->trans("MenuLimits"), 1);
-		            $submenu->add("/admin/pdf.php?mainmenu=home", $langs->trans("PDF"), 1);
-		            $submenu->add("/admin/mails.php?mainmenu=home", $langs->trans("Emails"), 1);
-		            $submenu->add("/admin/sms.php?mainmenu=home", $langs->trans("SMS"), 1);
-		            $submenu->add("/admin/dict.php?mainmenu=home", $langs->trans("DictionarySetup"), 1);
-		            $submenu->add("/admin/const.php?mainmenu=home", $langs->trans("OtherSetup"), 1);
+					$submenu->add("/admin/boxes.php", $langs->trans("Boxes"), 1);
+					$submenu->add("/admin/delais.php", $langs->trans("Alerts"), 1);
+					$submenu->add("/admin/proxy.php?mainmenu=home", $langs->trans("Security"), 1);
+					$submenu->add("/admin/limits.php?mainmenu=home", $langs->trans("MenuLimits"), 1);
+					$submenu->add("/admin/pdf.php?mainmenu=home", $langs->trans("PDF"), 1);
+					$submenu->add("/admin/mails.php?mainmenu=home", $langs->trans("Emails"), 1);
+					$submenu->add("/admin/sms.php?mainmenu=home", $langs->trans("SMS"), 1);
+					$submenu->add("/admin/dict.php?mainmenu=home", $langs->trans("DictionarySetup"), 1);
+					$submenu->add("/admin/const.php?mainmenu=home", $langs->trans("OtherSetup"), 1);
 
-		            //if ($tmpmainmenu.'-'.$tmpleftmenu == 'home-all') { var_dump($submenu); exit; }
-		            //if ($tmpmainmenu=='accountancy') { var_dump($submenu->liste); exit; }
-		            $nexturl = dol_buildpath($submenu->liste[0]['url'], 1);
+					//if ($tmpmainmenu.'-'.$tmpleftmenu == 'home-all') { var_dump($submenu); exit; }
+					//if ($tmpmainmenu=='accountancy') { var_dump($submenu->liste); exit; }
+					$nexturl = dol_buildpath($submenu->liste[0]['url'], 1);
 
-		            $canonrelurl = preg_replace('/\?.*$/', '', $relurl);
-		            $canonnexturl = preg_replace('/\?.*$/', '', $nexturl);
-		            //var_dump($canonrelurl);
-		            //var_dump($canonnexturl);
-		            print '<ul>'."\n";
-		            if (($canonrelurl != $canonnexturl && !in_array($val['mainmenu'], array('tools')))
-		                || (strpos($canonrelurl, '/product/index.php') !== false || strpos($canonrelurl, '/compta/bank/list.php') !== false))
-		            {
-		                // We add sub entry
-		                print str_pad('', 1).'<li class="lilevel1 ui-btn-icon-right ui-btn">'; // ui-btn to highlight on clic
-		                print '<a href="'.$relurl.'">';
-		                if ($langs->trans(ucfirst($val['mainmenu'])."Dashboard") == ucfirst($val['mainmenu'])."Dashboard")  // No translation
-		                {
-		                    if (in_array($val['mainmenu'], array('cashdesk', 'websites'))) print $langs->trans("Access");
-		                    else print $langs->trans("Dashboard");
-		                } else print $langs->trans(ucfirst($val['mainmenu'])."Dashboard");
-		                print '</a>';
-		                print '</li>'."\n";
-		            }
+					$canonrelurl = preg_replace('/\?.*$/', '', $relurl);
+					$canonnexturl = preg_replace('/\?.*$/', '', $nexturl);
+					//var_dump($canonrelurl);
+					//var_dump($canonnexturl);
+					print '<ul>'."\n";
+					if (($canonrelurl != $canonnexturl && !in_array($val['mainmenu'], array('tools')))
+						|| (strpos($canonrelurl, '/product/index.php') !== false || strpos($canonrelurl, '/compta/bank/list.php') !== false))
+					{
+						// We add sub entry
+						print str_pad('', 1).'<li class="lilevel1 ui-btn-icon-right ui-btn">'; // ui-btn to highlight on clic
+						print '<a href="'.$relurl.'">';
+						if ($langs->trans(ucfirst($val['mainmenu'])."Dashboard") == ucfirst($val['mainmenu'])."Dashboard")  // No translation
+						{
+							if (in_array($val['mainmenu'], array('cashdesk', 'websites'))) print $langs->trans("Access");
+							else print $langs->trans("Dashboard");
+						} else print $langs->trans(ucfirst($val['mainmenu'])."Dashboard");
+						print '</a>';
+						print '</li>'."\n";
+					}
 
-		            if ($val['level'] == 0)
-		            {
-		                if ($val['enabled'])
-		                {
-		                    $lastlevel[0] = 'enabled';
-		                } elseif ($showmenu)                 // Not enabled but visible (so greyed)
-		                {
-		                    $lastlevel[0] = 'greyed';
-		                } else {
-		                    $lastlevel[0] = 'hidden';
-		                }
-		            }
+					if ($val['level'] == 0)
+					{
+						if ($val['enabled'])
+						{
+							$lastlevel[0] = 'enabled';
+						} elseif ($showmenu)                 // Not enabled but visible (so greyed)
+						{
+							$lastlevel[0] = 'greyed';
+						} else {
+							$lastlevel[0] = 'hidden';
+						}
+					}
 
-		            $lastlevel2 = array();
-		            foreach ($submenu->liste as $key2 => $val2)		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
-		            {
-		                $showmenu = true;
-		                if (!empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED) && empty($val2['enabled'])) $showmenu = false;
+					$lastlevel2 = array();
+					foreach ($submenu->liste as $key2 => $val2)		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
+					{
+						$showmenu = true;
+						if (!empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED) && empty($val2['enabled'])) $showmenu = false;
 
-		                // If at least one parent is not enabled, we do not show any menu of all children
-		                if ($val2['level'] > 0)
-		                {
-		                    $levelcursor = $val2['level'] - 1;
-		                    while ($levelcursor >= 0)
-		                    {
-		                        if ($lastlevel2[$levelcursor] != 'enabled') $showmenu = false;
-		                        $levelcursor--;
-		                    }
-		                }
+						// If at least one parent is not enabled, we do not show any menu of all children
+						if ($val2['level'] > 0)
+						{
+							$levelcursor = $val2['level'] - 1;
+							while ($levelcursor >= 0)
+							{
+								if ($lastlevel2[$levelcursor] != 'enabled') $showmenu = false;
+								$levelcursor--;
+							}
+						}
 
-		                if ($showmenu)		// Visible (option to hide when not allowed is off or allowed)
-		                {
-		                	$val2['url'] = make_substitutions($val2['url'], $substitarray);
+						if ($showmenu)		// Visible (option to hide when not allowed is off or allowed)
+						{
+							$val2['url'] = make_substitutions($val2['url'], $substitarray);
 
-		                    $relurl2 = dol_buildpath($val2['url'], 1);
-		                    $canonurl2 = preg_replace('/\?.*$/', '', $val2['url']);
-		                    //var_dump($val2['url'].' - '.$canonurl2.' - '.$val2['level']);
-		                    if (in_array($canonurl2, array('/admin/index.php', '/admin/tools/index.php', '/core/tools.php'))) $relurl2 = '';
+							$relurl2 = dol_buildpath($val2['url'], 1);
+							$canonurl2 = preg_replace('/\?.*$/', '', $val2['url']);
+							//var_dump($val2['url'].' - '.$canonurl2.' - '.$val2['level']);
+							if (in_array($canonurl2, array('/admin/index.php', '/admin/tools/index.php', '/core/tools.php'))) $relurl2 = '';
 
-		                    $disabled = '';
-		                    if (!$val2['enabled'])
-		                    {
-		                        $disabled = " vsmenudisabled";
-		                    }
+							$disabled = '';
+							if (!$val2['enabled'])
+							{
+								$disabled = " vsmenudisabled";
+							}
 
-		                    print str_pad('', $val2['level'] + 1);
-		                    print '<li class="lilevel'.($val2['level'] + 1);
-		                    if ($val2['level'] == 0) print ' ui-btn-icon-right ui-btn'; // ui-btn to highlight on clic
-		                    print $disabled.'">'; // ui-btn to highlight on clic
-		                    if ($relurl2)
-		                    {
-		                        if ($val2['enabled'])	// Allowed
-		                        {
-		                            print '<a href="'.$relurl2.'"';
-		                            //print ' data-ajax="false"';
-		                            print '>';
-		                            $lastlevel2[$val2['level']] = 'enabled';
-		                        } else // Not allowed but visible (greyed)
-		                        {
-		                            print '<a href="#" class="vsmenudisabled">';
-		                            $lastlevel2[$val2['level']] = 'greyed';
-		                        }
-		                    } else {
-		                        if ($val2['enabled'])	// Allowed
-		                        {
-		                            $lastlevel2[$val2['level']] = 'enabled';
-		                        } else {
-		                            $lastlevel2[$val2['level']] = 'greyed';
-		                        }
-		                    }
-		                    //var_dump($val2['level']);
-		                    //var_dump($lastlevel2);
-		                    print $val2['titre'];
-		                    if ($relurl2)
-		                    {
-		                        if ($val2['enabled']) {
-                                    // Allowed
-                                    print '</a>';
-                                } else {
-                                    print '</a>';
-                                }
-		                    }
-		                    print '</li>'."\n";
-		                }
-		            }
-		            //var_dump($submenu);
-		            print '</ul>';
-		        }
-		        if ($val['enabled'] == 2)
-		        {
-		            print '<font class="vsmenudisabled">'.$val['titre'].'</font>';
-		        }
-		        print '</li>';
-		        print '</ul>'."\n";
-		    }
+							print str_pad('', $val2['level'] + 1);
+							print '<li class="lilevel'.($val2['level'] + 1);
+							if ($val2['level'] == 0) print ' ui-btn-icon-right ui-btn'; // ui-btn to highlight on clic
+							print $disabled.'">'; // ui-btn to highlight on clic
+							if ($relurl2)
+							{
+								if ($val2['enabled'])	// Allowed
+								{
+									print '<a href="'.$relurl2.'"';
+									//print ' data-ajax="false"';
+									print '>';
+									$lastlevel2[$val2['level']] = 'enabled';
+								} else // Not allowed but visible (greyed)
+								{
+									print '<a href="#" class="vsmenudisabled">';
+									$lastlevel2[$val2['level']] = 'greyed';
+								}
+							} else {
+								if ($val2['enabled'])	// Allowed
+								{
+									$lastlevel2[$val2['level']] = 'enabled';
+								} else {
+									$lastlevel2[$val2['level']] = 'greyed';
+								}
+							}
+							//var_dump($val2['level']);
+							//var_dump($lastlevel2);
+							print $val2['titre'];
+							if ($relurl2)
+							{
+								if ($val2['enabled']) {
+									// Allowed
+									print '</a>';
+								} else {
+									print '</a>';
+								}
+							}
+							print '</li>'."\n";
+						}
+					}
+					//var_dump($submenu);
+					print '</ul>';
+				}
+				if ($val['enabled'] == 2)
+				{
+					print '<font class="vsmenudisabled">'.$val['titre'].'</font>';
+				}
+				print '</li>';
+				print '</ul>'."\n";
+			}
 		}
 
 		if ($mode == 'left')
@@ -331,7 +331,7 @@ class MenuManager
 			$this->menu->add("/admin/translation.php?mainmenu=home", $langs->trans("Translation"), 1);
 			$this->menu->add("/admin/defaultvalues.php?mainmenu=home", $langs->trans("DefaultValues"), 1);
 
-		    $this->menu->add("/admin/boxes.php", $langs->trans("Boxes"), 1);
+			$this->menu->add("/admin/boxes.php", $langs->trans("Boxes"), 1);
 			$this->menu->add("/admin/delais.php", $langs->trans("Alerts"), 1);
 			$this->menu->add("/admin/proxy.php?mainmenu=home", $langs->trans("Security"), 1);
 			$this->menu->add("/admin/limits.php?mainmenu=home", $langs->trans("MenuLimits"), 1);
@@ -354,15 +354,15 @@ class MenuManager
 					$alt++;
 					if (empty($this->menu->liste[$i]['level']))
 					{
-			    		$altok++;
-    					$blockvmenuopened = true;
+						$altok++;
+						$blockvmenuopened = true;
 						$lastopened = true;
-        				for ($j = ($i + 1); $j < $num; $j++)
-        				{
-        				    if (empty($menu_array[$j]['level'])) $lastopened = false;
-        				}
-        				$alt = 0; // For menu manager "empty", we force to not have blockvmenufirst defined
-        				$lastopened = 1; // For menu manager "empty", we force to not have blockvmenulast defined
+						for ($j = ($i + 1); $j < $num; $j++)
+						{
+							if (empty($menu_array[$j]['level'])) $lastopened = false;
+						}
+						$alt = 0; // For menu manager "empty", we force to not have blockvmenufirst defined
+						$lastopened = 1; // For menu manager "empty", we force to not have blockvmenulast defined
 						if (($alt % 2 == 0))
 						{
 							print '<div class="blockvmenub lockvmenuimpair blockvmenuunique'.($lastopened ? ' blockvmenulast' : '').($alt == 1 ? ' blockvmenufirst' : '').'">'."\n";
@@ -394,10 +394,10 @@ class MenuManager
 
 					if ($this->menu->liste[$i]['level'] > 0)
 					{
-        				$cssmenu = '';
-        				if ($this->menu->liste[$i]['url']) $cssmenu = ' menu_contenu'.dol_string_nospecial(preg_replace('/\.php.*$/', '', $this->menu->liste[$i]['url']));
+						$cssmenu = '';
+						if ($this->menu->liste[$i]['url']) $cssmenu = ' menu_contenu'.dol_string_nospecial(preg_replace('/\.php.*$/', '', $this->menu->liste[$i]['url']));
 
-					    print '<div class="menu_contenu'.$cssmenu.'">';
+						print '<div class="menu_contenu'.$cssmenu.'">';
 
 						if ($this->menu->liste[$i]['enabled'])
 						{
@@ -432,7 +432,7 @@ class MenuManager
 				unset($this->menu->liste);
 			}
 		}
-        /*
+		/*
 		if ($mode == 'jmobile')
 		{
 			$substitarray = getCommonSubstitutionArray($langs, 0, null, null);
@@ -503,7 +503,7 @@ class MenuManager
  */
 function print_start_menu_array_empty()
 {
-    global $conf;
+	global $conf;
 
 	print '<div class="tmenudiv">';
 	print '<ul role="navigation" class="tmenu"'.(empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '' : ' title="Top menu"').'>';
diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php
index 69fce65f781..794cfd0cef4 100644
--- a/htdocs/core/modules/DolibarrModules.class.php
+++ b/htdocs/core/modules/DolibarrModules.class.php
@@ -1679,13 +1679,12 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 					$r_id       = $this->rights[$key][0];
 					$r_desc     = $this->rights[$key][1];
 					$r_type     = isset($this->rights[$key][2]) ? $this->rights[$key][2] : '';
-					$r_def      = $this->rights[$key][3];
+					$r_def      = empty($this->rights[$key][3]) ? 0 : $this->rights[$key][3];
 					$r_perms    = $this->rights[$key][4];
 					$r_subperms = isset($this->rights[$key][5]) ? $this->rights[$key][5] : '';
 					$r_modul = empty($this->rights_class) ?strtolower($this->name) : $this->rights_class;
 
 					if (empty($r_type)) { $r_type = 'w'; }
-					if (empty($r_def)) { $r_def = 0; }
 
 					// Search if perm already present
 					$sql = "SELECT count(*) as nb FROM ".MAIN_DB_PREFIX."rights_def";
diff --git a/htdocs/core/modules/action/modules_action.php b/htdocs/core/modules/action/modules_action.php
index 27260748662..cb57315322f 100644
--- a/htdocs/core/modules/action/modules_action.php
+++ b/htdocs/core/modules/action/modules_action.php
@@ -28,32 +28,32 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commondocgenerator.class.php';
  */
 abstract class ModeleAction extends CommonDocGenerator
 {
-    /**
+	/**
 	 * @var string Error code (or message)
 	 */
 	public $error = '';
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Return list of active generation modules
-     *
-     * 	@param	DoliDB		$db					Database handler
-     *  @param	integer		$maxfilenamelength  Max length of value to show
-     * 	@return	array							List of templates
-     */
-    public static function liste_modeles($db, $maxfilenamelength = 0)
-    {
-        // phpcs:enable
-        global $conf;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Return list of active generation modules
+	 *
+	 * 	@param	DoliDB		$db					Database handler
+	 *  @param	integer		$maxfilenamelength  Max length of value to show
+	 * 	@return	array							List of templates
+	 */
+	public static function liste_modeles($db, $maxfilenamelength = 0)
+	{
+		// phpcs:enable
+		global $conf;
 
-        $type = 'action';
-        $list = array();
+		$type = 'action';
+		$list = array();
 
-        include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-        $list = getListOfModels($db, $type, $maxfilenamelength);
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+		$list = getListOfModels($db, $type, $maxfilenamelength);
 
-        return $list;
-    }
+		return $list;
+	}
 }
 
 // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@@ -71,7 +71,7 @@ abstract class ModeleAction extends CommonDocGenerator
  */
 function action_create($db, $object, $modele, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
 {
-    // phpcs:enable
+	// phpcs:enable
 	global $conf, $langs, $user;
 	$langs->load("action");
 
@@ -92,11 +92,11 @@ function action_create($db, $object, $modele, $outputlangs, $hidedetails = 0, $h
 
 	// If selected modele is a filename template (then $modele="modelname:filename")
 	$tmp = explode(':', $modele, 2);
-    if (!empty($tmp[1]))
-    {
-        $modele = $tmp[0];
-        $srctemplatepath = $tmp[1];
-    }
+	if (!empty($tmp[1]))
+	{
+		$modele = $tmp[0];
+		$srctemplatepath = $tmp[1];
+	}
 
 	// Search template files
 	$file = ''; $classname = ''; $filefound = 0;
@@ -104,21 +104,21 @@ function action_create($db, $object, $modele, $outputlangs, $hidedetails = 0, $h
 	if (is_array($conf->modules_parts['models'])) $dirmodels = array_merge($dirmodels, $conf->modules_parts['models']);
 	foreach ($dirmodels as $reldir)
 	{
-    	foreach (array('doc', 'pdf') as $prefix)
-    	{
-    	    $file = $prefix."_".$modele.".modules.php";
+		foreach (array('doc', 'pdf') as $prefix)
+		{
+			$file = $prefix."_".$modele.".modules.php";
 
-    		// On verifie l'emplacement du modele
-	        $file = dol_buildpath($reldir."core/modules/action/doc/".$file, 0);
-    		if (file_exists($file))
-    		{
-    			$filefound = 1;
-    			$classname = $prefix.'_'.$modele;
-    			break;
-    		}
-    	}
-    	if ($filefound) break;
-    }
+			// On verifie l'emplacement du modele
+			$file = dol_buildpath($reldir."core/modules/action/doc/".$file, 0);
+			if (file_exists($file))
+			{
+				$filefound = 1;
+				$classname = $prefix.'_'.$modele;
+				break;
+			}
+		}
+		if ($filefound) break;
+	}
 
 	// Charge le modele
 	if ($filefound)
diff --git a/htdocs/core/modules/action/rapport.pdf.php b/htdocs/core/modules/action/rapport.pdf.php
index 0b489e7202c..43df3d227b9 100644
--- a/htdocs/core/modules/action/rapport.pdf.php
+++ b/htdocs/core/modules/action/rapport.pdf.php
@@ -36,9 +36,9 @@ require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 class CommActionRapport
 {
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
 	/**
 	 * @var string description
@@ -76,7 +76,7 @@ class CommActionRapport
 		global $conf, $langs;
 
 		// Load translation files required by the page
-        $langs->loadLangs(array("commercial", "projects"));
+		$langs->loadLangs(array("commercial", "projects"));
 
 		$this->db = $db;
 		$this->description = "";
@@ -95,22 +95,22 @@ class CommActionRapport
 		$this->marge_haute = isset($conf->global->MAIN_PDF_MARGIN_TOP) ? $conf->global->MAIN_PDF_MARGIN_TOP : 10;
 		$this->marge_basse = isset($conf->global->MAIN_PDF_MARGIN_BOTTOM) ? $conf->global->MAIN_PDF_MARGIN_BOTTOM : 10;
 
-        $this->title = $langs->transnoentitiesnoconv("ActionsReport").' '.$this->year."-".$this->month;
-        $this->subject = $langs->transnoentitiesnoconv("ActionsReport").' '.$this->year."-".$this->month;
+		$this->title = $langs->transnoentitiesnoconv("ActionsReport").' '.$this->year."-".$this->month;
+		$this->subject = $langs->transnoentitiesnoconv("ActionsReport").' '.$this->year."-".$this->month;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *      Write the object to document file to disk
-     *
-     *      @param	int			$socid			Thirdparty id
-     *      @param  int			$catid			Cat id
-     *      @param  Translate	$outputlangs    Lang object for output language
-     *      @return int             			1=OK, 0=KO
-     */
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *      Write the object to document file to disk
+	 *
+	 *      @param	int			$socid			Thirdparty id
+	 *      @param  int			$catid			Cat id
+	 *      @param  Translate	$outputlangs    Lang object for output language
+	 *      @return int             			1=OK, 0=KO
+	 */
 	public function write_file($socid = 0, $catid = 0, $outputlangs = '')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $user, $conf, $langs, $hookmanager;
 
 		if (!is_object($outputlangs)) $outputlangs = $langs;
@@ -120,7 +120,7 @@ class CommActionRapport
 		// Load traductions files required by page
 		$outputlangs->loadLangs(array("main", "dict", "companies", "bills", "products"));
 
-        $dir = $conf->agenda->dir_temp."/";
+		$dir = $conf->agenda->dir_temp."/";
 		$file = $dir."actions-".$this->month."-".$this->year.".pdf";
 
 		if (!file_exists($dir))
@@ -148,18 +148,18 @@ class CommActionRapport
 			$parameters = array('file'=>$file, 'outputlangs'=>$outputlangs);
 			$reshook = $hookmanager->executeHooks('beforePDFCreation', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 
-            $pdf = pdf_getInstance($this->format);
-            $heightforinfotot = 50; // Height reserved to output the info and total part
-            $heightforfreetext = (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT) ? $conf->global->MAIN_PDF_FREETEXT_HEIGHT : 5); // Height reserved to output the free text on last page
-            $heightforfooter = $this->marge_basse + 8; // Height reserved to output the footer (value include bottom margin)
-            $pdf->SetAutoPageBreak(1, 0);
+			$pdf = pdf_getInstance($this->format);
+			$heightforinfotot = 50; // Height reserved to output the info and total part
+			$heightforfreetext = (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT) ? $conf->global->MAIN_PDF_FREETEXT_HEIGHT : 5); // Height reserved to output the free text on last page
+			$heightforfooter = $this->marge_basse + 8; // Height reserved to output the footer (value include bottom margin)
+			$pdf->SetAutoPageBreak(1, 0);
 
-            if (class_exists('TCPDF'))
-            {
-                $pdf->setPrintHeader(false);
-                $pdf->setPrintFooter(false);
-            }
-            $pdf->SetFont(pdf_getPDFFont($outputlangs));
+			if (class_exists('TCPDF'))
+			{
+				$pdf->setPrintHeader(false);
+				$pdf->setPrintFooter(false);
+			}
+			$pdf->SetFont(pdf_getPDFFont($outputlangs));
 
 			$pdf->Open();
 			$pagenb = 0;
@@ -193,8 +193,8 @@ class CommActionRapport
 			$reshook = $hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 			if ($reshook < 0)
 			{
-			    $this->error = $hookmanager->error;
-			    $this->errors = $hookmanager->errors;
+				$this->error = $hookmanager->error;
+				$this->errors = $hookmanager->errors;
 			}
 
 			if (!empty($conf->global->MAIN_UMASK))
@@ -210,7 +210,7 @@ class CommActionRapport
 	 * Write content of pages
 	 *
 	 * @param   PDF			$pdf			Object pdf
-     * @param	Translate   $outputlangs	Object langs
+	 * @param	Translate   $outputlangs	Object langs
 	 * @return  int							1
 	 */
 	private function _pages(&$pdf, $outputlangs)
@@ -230,7 +230,7 @@ class CommActionRapport
 		$sql .= " c.code, c.libelle,";
 		$sql .= " u.login";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_actioncomm as c, ".MAIN_DB_PREFIX."user as u, ".MAIN_DB_PREFIX."actioncomm as a";
-        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON a.fk_soc = s.rowid";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON a.fk_soc = s.rowid";
 		$sql .= " WHERE c.id=a.fk_action AND a.fk_user_author = u.rowid";
 		$sql .= " AND a.datep BETWEEN '".$this->db->idate(dol_get_first_day($this->year, $this->month, false))."'";
 		$sql .= " AND '".$this->db->idate(dol_get_last_day($this->year, $this->month, false))."'";
@@ -353,12 +353,12 @@ class CommActionRapport
 		$pdf->SetFont('', 'B', 10);
 		$pdf->SetXY($this->marge_gauche, $this->marge_haute);
 		$pdf->MultiCell(120, 1, $outputlangs->convToOutputCharset($this->title), 0, 'L', 0);
-        // Show page nb only on iso languages (so default Helvetica font)
-        if (pdf_getPDFFont($outputlangs) == 'Helvetica')
-        {
-		    $pdf->SetXY($this->page_largeur - $this->marge_droite - 40, $this->marge_haute);
-            $pdf->MultiCell(40, 1, $pagenb.'/'.$pdf->getAliasNbPages(), 0, 'R', 0);
-        }
+		// Show page nb only on iso languages (so default Helvetica font)
+		if (pdf_getPDFFont($outputlangs) == 'Helvetica')
+		{
+			$pdf->SetXY($this->page_largeur - $this->marge_droite - 40, $this->marge_haute);
+			$pdf->MultiCell(40, 1, $pagenb.'/'.$pdf->getAliasNbPages(), 0, 'R', 0);
+		}
 
 		$y = $pdf->GetY() + 2;
 
diff --git a/htdocs/core/modules/bank/modules_bank.php b/htdocs/core/modules/bank/modules_bank.php
index ac03fa3d6fa..70f6717d0c7 100644
--- a/htdocs/core/modules/bank/modules_bank.php
+++ b/htdocs/core/modules/bank/modules_bank.php
@@ -37,17 +37,17 @@ abstract class ModeleBankAccountDoc extends CommonDocGenerator
 	public $error = '';
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return list of active generation modules
 	 *
-     *  @param	DoliDB	$db     			Database handler
-     *  @param  integer	$maxfilenamelength  Max length of value to show
-     *  @return	array						List of templates
-     */
+	 *  @param	DoliDB	$db     			Database handler
+	 *  @param  integer	$maxfilenamelength  Max length of value to show
+	 *  @return	array						List of templates
+	 */
 	public static function liste_modeles($db, $maxfilenamelength = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 		$type = 'bankaccount';
diff --git a/htdocs/core/modules/barcode/doc/phpbarcode.modules.php b/htdocs/core/modules/barcode/doc/phpbarcode.modules.php
index a39e18f4cfb..34ebc518e56 100644
--- a/htdocs/core/modules/barcode/doc/phpbarcode.modules.php
+++ b/htdocs/core/modules/barcode/doc/phpbarcode.modules.php
@@ -33,9 +33,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/barcode.lib.php'; // This is to includ
 class modPhpbarcode extends ModeleBarCode
 {
 	/**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
 	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 
 	/**
@@ -93,7 +93,7 @@ class modPhpbarcode extends ModeleBarCode
 	public function encodingIsSupported($encoding)
 	{
 		global $genbarcode_loc;
-        //print 'genbarcode_loc='.$genbarcode_loc.' encoding='.$encoding;exit;
+		//print 'genbarcode_loc='.$genbarcode_loc.' encoding='.$encoding;exit;
 
 		$supported = 0;
 		if ($encoding == 'EAN13') $supported = 1;
@@ -109,7 +109,7 @@ class modPhpbarcode extends ModeleBarCode
 		return $supported;
 	}
 
-    /**
+	/**
 	 *	Return an image file on the fly (no need to write on disk)
 	 *
 	 *	@param	string   	$code			  Value to encode
@@ -118,8 +118,8 @@ class modPhpbarcode extends ModeleBarCode
 	 *	@param	integer		$scale			  Scale
 	 *  @param  integer     $nooutputiferror  No output if error
 	 *	@return	int							  <0 if KO, >0 if OK
-     */
-    public function buildBarCode($code, $encoding, $readable = 'Y', $scale = 1, $nooutputiferror = 0)
+	 */
+	public function buildBarCode($code, $encoding, $readable = 'Y', $scale = 1, $nooutputiferror = 0)
 	{
 		global $_GET, $_SERVER;
 		global $conf;
diff --git a/htdocs/core/modules/barcode/doc/tcpdfbarcode.modules.php b/htdocs/core/modules/barcode/doc/tcpdfbarcode.modules.php
index d87f39598c6..d13fe589883 100644
--- a/htdocs/core/modules/barcode/doc/tcpdfbarcode.modules.php
+++ b/htdocs/core/modules/barcode/doc/tcpdfbarcode.modules.php
@@ -32,9 +32,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/barcode.lib.php'; // This is to includ
 class modTcpdfbarcode extends ModeleBarCode
 {
 	/**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
 	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 
 	/**
diff --git a/htdocs/core/modules/barcode/mod_barcode_product_standard.php b/htdocs/core/modules/barcode/mod_barcode_product_standard.php
index 5d43609e7de..3f18d536122 100644
--- a/htdocs/core/modules/barcode/mod_barcode_product_standard.php
+++ b/htdocs/core/modules/barcode/mod_barcode_product_standard.php
@@ -44,9 +44,9 @@ class mod_barcode_product_standard extends ModeleNumRefBarCode
 	public $code_null; // Optional code
 
 	/**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
 	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 
 	/**
@@ -232,7 +232,7 @@ class mod_barcode_product_standard extends ModeleNumRefBarCode
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Return if a code is used (by other element)
 	 *
@@ -243,7 +243,7 @@ class mod_barcode_product_standard extends ModeleNumRefBarCode
 	 */
 	public function verif_dispo($db, $code, $product)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$sql = "SELECT barcode FROM ".MAIN_DB_PREFIX."product";
 		$sql .= " WHERE barcode = '".$db->escape($code)."'";
 		if ($product->id > 0) $sql .= " AND rowid <> ".$product->id;
@@ -262,17 +262,17 @@ class mod_barcode_product_standard extends ModeleNumRefBarCode
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Return if a barcode value match syntax
 	 *
 	 *	@param	string	$codefortest	Code to check syntax
-     *  @param	string	$typefortest	Type of barcode (ISBN, EAN, ...)
+	 *  @param	string	$typefortest	Type of barcode (ISBN, EAN, ...)
 	 *	@return	int						0 if OK, <0 if KO
 	 */
 	public function verif_syntax($codefortest, $typefortest)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 		$result = 0;
@@ -289,15 +289,15 @@ class mod_barcode_product_standard extends ModeleNumRefBarCode
 
 		$newcodefortest = $codefortest;
 
-        // Special case, if mask is on 12 digits instead of 13, we remove last char into code to test
-        if (in_array($typefortest, array('EAN13', 'ISBN')))	// We remove the CRC char not included into mask
-        {
-            if (preg_match('/\{(0+)([@\+][0-9]+)?([@\+][0-9]+)?\}/i', $mask, $reg))
-            {
-                if (strlen($reg[1]) == 12) $newcodefortest = substr($newcodefortest, 0, 12);
-                dol_syslog(get_class($this).'::verif_syntax newcodefortest='.$newcodefortest);
-            }
-        }
+		// Special case, if mask is on 12 digits instead of 13, we remove last char into code to test
+		if (in_array($typefortest, array('EAN13', 'ISBN')))	// We remove the CRC char not included into mask
+		{
+			if (preg_match('/\{(0+)([@\+][0-9]+)?([@\+][0-9]+)?\}/i', $mask, $reg))
+			{
+				if (strlen($reg[1]) == 12) $newcodefortest = substr($newcodefortest, 0, 12);
+				dol_syslog(get_class($this).'::verif_syntax newcodefortest='.$newcodefortest);
+			}
+		}
 
 		$result = check_value($mask, $newcodefortest);
 		if (is_string($result))
diff --git a/htdocs/core/modules/barcode/modules_barcode.class.php b/htdocs/core/modules/barcode/modules_barcode.class.php
index d043bfe6bc8..01e532a7e29 100644
--- a/htdocs/core/modules/barcode/modules_barcode.class.php
+++ b/htdocs/core/modules/barcode/modules_barcode.class.php
@@ -29,21 +29,21 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php';
  */
 abstract class ModeleBarCode
 {
-    /**
-     * @var string Error code (or message)
-     */
-    public $error = '';
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error = '';
 
 
-    /**
-     * Return if a model can be used or not
-     *
-     * @return		boolean     true if model can be used
-     */
-    public function isEnabled()
-    {
-        return true;
-    }
+	/**
+	 * Return if a model can be used or not
+	 *
+	 * @return		boolean     true if model can be used
+	 */
+	public function isEnabled()
+	{
+		return true;
+	}
 }
 
 
@@ -52,128 +52,128 @@ abstract class ModeleBarCode
  */
 abstract class ModeleNumRefBarCode
 {
-    /**
-     * @var string Error code (or message)
-     */
-    public $error = '';
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error = '';
 
-    /**     Return default description of numbering model
-     *
-     *		@param	Translate	$langs		Object langs
-     *      @return string      			Descriptive text
-     */
-    public function info($langs)
-    {
-        $langs->load("bills");
-        return $langs->trans("NoDescription");
-    }
+	/**     Return default description of numbering model
+	 *
+	 *		@param	Translate	$langs		Object langs
+	 *      @return string      			Descriptive text
+	 */
+	public function info($langs)
+	{
+		$langs->load("bills");
+		return $langs->trans("NoDescription");
+	}
 
-    /**     Return model name
-     *
-     *		@param	Translate	$langs		Object langs
-     *      @return string      			Model name
-     */
-    public function getNom($langs)
-    {
-        return empty($this->name) ? $this->nom : $this->name;
-    }
+	/**     Return model name
+	 *
+	 *		@param	Translate	$langs		Object langs
+	 *      @return string      			Model name
+	 */
+	public function getNom($langs)
+	{
+		return empty($this->name) ? $this->nom : $this->name;
+	}
 
-    /**     Return a numbering example
-     *
-     *		@param	Translate	$langs		Object langs
-     *      @return string      			Example
-     */
-    public function getExample($langs)
-    {
-        $langs->load("bills");
-        return $langs->trans("NoExample");
-    }
+	/**     Return a numbering example
+	 *
+	 *		@param	Translate	$langs		Object langs
+	 *      @return string      			Example
+	 */
+	public function getExample($langs)
+	{
+		$langs->load("bills");
+		return $langs->trans("NoExample");
+	}
 
-    /**
-     *  Return next value available
-     *
-     *	@param	Product		$objproduct	Object Product
-     *	@param	string		$type		Type of barcode (EAN, ISBN, ...)
-     *  @return string      			Value
-     */
-    public function getNextValue($objproduct, $type = '')
-    {
-        global $langs;
-        return $langs->trans("Function_getNextValue_InModuleNotWorking");
-    }
+	/**
+	 *  Return next value available
+	 *
+	 *	@param	Product		$objproduct	Object Product
+	 *	@param	string		$type		Type of barcode (EAN, ISBN, ...)
+	 *  @return string      			Value
+	 */
+	public function getNextValue($objproduct, $type = '')
+	{
+		global $langs;
+		return $langs->trans("Function_getNextValue_InModuleNotWorking");
+	}
 
-    /**     Return version of module
-     *
-     *      @return     string      Version
-     */
-    public function getVersion()
-    {
-        global $langs;
-        $langs->load("admin");
+	/**     Return version of module
+	 *
+	 *      @return     string      Version
+	 */
+	public function getVersion()
+	{
+		global $langs;
+		$langs->load("admin");
 
-        if ($this->version == 'development') return $langs->trans("VersionDevelopment");
-        if ($this->version == 'experimental') return $langs->trans("VersionExperimental");
-        if ($this->version == 'dolibarr') return DOL_VERSION;
-        if ($this->version) return $this->version;
-        return $langs->trans("NotAvailable");
-    }
+		if ($this->version == 'development') return $langs->trans("VersionDevelopment");
+		if ($this->version == 'experimental') return $langs->trans("VersionExperimental");
+		if ($this->version == 'dolibarr') return DOL_VERSION;
+		if ($this->version) return $this->version;
+		return $langs->trans("NotAvailable");
+	}
 
-    /**
-     *      Return description of module parameters
-     *
-     *      @param	Translate	$langs      Output language
-     *		@param	Societe		$soc		Third party object
-     *		@param	int			$type		-1=Nothing, 0=Product, 1=Service
-     *		@return	string					HTML translated description
-     */
-    public function getToolTip($langs, $soc, $type)
-    {
-        global $conf;
+	/**
+	 *      Return description of module parameters
+	 *
+	 *      @param	Translate	$langs      Output language
+	 *		@param	Societe		$soc		Third party object
+	 *		@param	int			$type		-1=Nothing, 0=Product, 1=Service
+	 *		@return	string					HTML translated description
+	 */
+	public function getToolTip($langs, $soc, $type)
+	{
+		global $conf;
 
-        $langs->load("admin");
+		$langs->load("admin");
 
-        $s = '';
-        $s .= $langs->trans("Name").': <b>'.$this->name.'</b><br>';
-        $s .= $langs->trans("Version").': <b>'.$this->getVersion().'</b><br>';
-        if ($type != -1) $s .= $langs->trans("ValidityControledByModule").': <b>'.$this->getNom($langs).'</b><br>';
-        $s .= '<br>';
-        $s .= '<u>'.$langs->trans("ThisIsModuleRules").':</u><br>';
-        if ($type == 0)
-        {
-            $s .= $langs->trans("RequiredIfProduct").': ';
-            if (!empty($conf->global->MAIN_BARCODE_CODE_ALWAYS_REQUIRED) && !empty($this->code_null)) $s .= '<strike>';
-            $s .= yn(!$this->code_null, 1, 2);
-            if (!empty($conf->global->MAIN_BARCODE_CODE_ALWAYS_REQUIRED) && !empty($this->code_null)) $s .= '</strike> '.yn(1, 1, 2).' ('.$langs->trans("ForcedToByAModule", $langs->transnoentities("yes")).')';
-            $s .= '<br>';
-        }
-        if ($type == 1)
-        {
-            $s .= $langs->trans("RequiredIfService").': ';
-            if (!empty($conf->global->MAIN_BARCODE_CODE_ALWAYS_REQUIRED) && !empty($this->code_null)) $s .= '<strike>';
-            $s .= yn(!$this->code_null, 1, 2);
-            if (!empty($conf->global->MAIN_BARCODE_CODE_ALWAYS_REQUIRED) && !empty($this->code_null)) $s .= '</strike> '.yn(1, 1, 2).' ('.$langs->trans("ForcedToByAModule", $langs->transnoentities("yes")).')';
-            $s .= '<br>';
-        }
-        if ($type == -1)
-        {
-            $s .= $langs->trans("Required").': ';
-            if (!empty($conf->global->MAIN_BARCODE_CODE_ALWAYS_REQUIRED) && !empty($this->code_null)) $s .= '<strike>';
-            $s .= yn(!$this->code_null, 1, 2);
-            if (!empty($conf->global->MAIN_BARCODE_CODE_ALWAYS_REQUIRED) && !empty($this->code_null)) $s .= '</strike> '.yn(1, 1, 2).' ('.$langs->trans("ForcedToByAModule", $langs->transnoentities("yes")).')';
-            $s .= '<br>';
-        }
-        /*$s.=$langs->trans("CanBeModifiedIfOk").': ';
+		$s = '';
+		$s .= $langs->trans("Name").': <b>'.$this->name.'</b><br>';
+		$s .= $langs->trans("Version").': <b>'.$this->getVersion().'</b><br>';
+		if ($type != -1) $s .= $langs->trans("ValidityControledByModule").': <b>'.$this->getNom($langs).'</b><br>';
+		$s .= '<br>';
+		$s .= '<u>'.$langs->trans("ThisIsModuleRules").':</u><br>';
+		if ($type == 0)
+		{
+			$s .= $langs->trans("RequiredIfProduct").': ';
+			if (!empty($conf->global->MAIN_BARCODE_CODE_ALWAYS_REQUIRED) && !empty($this->code_null)) $s .= '<strike>';
+			$s .= yn(!$this->code_null, 1, 2);
+			if (!empty($conf->global->MAIN_BARCODE_CODE_ALWAYS_REQUIRED) && !empty($this->code_null)) $s .= '</strike> '.yn(1, 1, 2).' ('.$langs->trans("ForcedToByAModule", $langs->transnoentities("yes")).')';
+			$s .= '<br>';
+		}
+		if ($type == 1)
+		{
+			$s .= $langs->trans("RequiredIfService").': ';
+			if (!empty($conf->global->MAIN_BARCODE_CODE_ALWAYS_REQUIRED) && !empty($this->code_null)) $s .= '<strike>';
+			$s .= yn(!$this->code_null, 1, 2);
+			if (!empty($conf->global->MAIN_BARCODE_CODE_ALWAYS_REQUIRED) && !empty($this->code_null)) $s .= '</strike> '.yn(1, 1, 2).' ('.$langs->trans("ForcedToByAModule", $langs->transnoentities("yes")).')';
+			$s .= '<br>';
+		}
+		if ($type == -1)
+		{
+			$s .= $langs->trans("Required").': ';
+			if (!empty($conf->global->MAIN_BARCODE_CODE_ALWAYS_REQUIRED) && !empty($this->code_null)) $s .= '<strike>';
+			$s .= yn(!$this->code_null, 1, 2);
+			if (!empty($conf->global->MAIN_BARCODE_CODE_ALWAYS_REQUIRED) && !empty($this->code_null)) $s .= '</strike> '.yn(1, 1, 2).' ('.$langs->trans("ForcedToByAModule", $langs->transnoentities("yes")).')';
+			$s .= '<br>';
+		}
+		/*$s.=$langs->trans("CanBeModifiedIfOk").': ';
         $s.=yn($this->code_modifiable,1,2);
         $s.='<br>';
         $s.=$langs->trans("CanBeModifiedIfKo").': '.yn($this->code_modifiable_invalide,1,2).'<br>';
         */
-        $s .= $langs->trans("AutomaticCode").': '.yn($this->code_auto, 1, 2).'<br>';
-        $s .= '<br>';
+		$s .= $langs->trans("AutomaticCode").': '.yn($this->code_auto, 1, 2).'<br>';
+		$s .= '<br>';
 
-        $nextval = $this->getNextValue($soc, '');
-        if (empty($nextval)) $nextval = $langs->trans("Undefined");
-        $s .= $langs->trans("NextValue").': <b>'.$nextval.'</b><br>';
+		$nextval = $this->getNextValue($soc, '');
+		if (empty($nextval)) $nextval = $langs->trans("Undefined");
+		$s .= $langs->trans("NextValue").': <b>'.$nextval.'</b><br>';
 
-        return $s;
-    }
+		return $s;
+	}
 }
diff --git a/htdocs/core/modules/bom/doc/doc_generic_bom_odt.modules.php b/htdocs/core/modules/bom/doc/doc_generic_bom_odt.modules.php
index 9b22b04800d..750f1a7ab39 100644
--- a/htdocs/core/modules/bom/doc/doc_generic_bom_odt.modules.php
+++ b/htdocs/core/modules/bom/doc/doc_generic_bom_odt.modules.php
@@ -47,14 +47,14 @@ class doc_generic_bom_odt extends ModelePDFBom
 	public $emetteur;
 
 	/**
-     * @var array Minimum version of PHP required by module.
-     * e.g.: PHP ≥ 5.6 = array(5, 6)
-     */
+	 * @var array Minimum version of PHP required by module.
+	 * e.g.: PHP ≥ 5.6 = array(5, 6)
+	 */
 	public $phpmin = array(5, 6);
 
 	/**
-     * @var string Dolibarr version of the loaded document
-     */
+	 * @var string Dolibarr version of the loaded document
+	 */
 	public $version = 'dolibarr';
 
 
@@ -63,12 +63,12 @@ class doc_generic_bom_odt extends ModelePDFBom
 	 *
 	 *  @param		DoliDB		$db      Database handler
 	 */
-    public function __construct($db)
+	public function __construct($db)
 	{
 		global $conf, $langs, $mysoc;
 
 		// Load translation files required by the page
-        $langs->loadLangs(array("main", "companies"));
+		$langs->loadLangs(array("main", "companies"));
 
 		$this->db = $db;
 		$this->name = "ODT templates";
@@ -101,12 +101,12 @@ class doc_generic_bom_odt extends ModelePDFBom
 	 *	@param	Translate	$langs      Lang object to use for output
 	 *	@return string       			Description
 	 */
-    public function info($langs)
+	public function info($langs)
 	{
 		global $conf, $langs;
 
 		// Load translation files required by the page
-        $langs->loadLangs(array("errors", "companies"));
+		$langs->loadLangs(array("errors", "companies"));
 
 		$form = new Form($this->db);
 
@@ -165,7 +165,7 @@ class doc_generic_bom_odt extends ModelePDFBom
    			$texte .= '<div id="div_'.get_class($this).'" class="hidden">';
    			foreach ($listoffiles as $file)
    			{
-                $texte .= $file['name'].'<br>';
+				$texte .= $file['name'].'<br>';
    			}
    			$texte .= '</div>';
 		}
@@ -183,7 +183,7 @@ class doc_generic_bom_odt extends ModelePDFBom
 		return $texte;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Function to build a document on disk using the generic odt module.
 	 *
@@ -195,9 +195,9 @@ class doc_generic_bom_odt extends ModelePDFBom
 	 *  @param		int			$hideref			Do not show ref
 	 *	@return		int         					1 if OK, <=0 if KO
 	 */
-    public function write_file($object, $outputlangs, $srctemplatepath, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
+	public function write_file($object, $outputlangs, $srctemplatepath, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $user, $langs, $conf, $mysoc, $hookmanager;
 
 		if (empty($srctemplatepath))
@@ -236,6 +236,8 @@ class doc_generic_bom_odt extends ModelePDFBom
 				}
 			}
 
+			$object->fetch_thirdparty();
+
 			$dir = $conf->bom->multidir_output[isset($object->entity) ? $object->entity : 1];
 			$objectref = dol_sanitizeFileName($object->ref);
 			if (!preg_match('/specimen/i', $objectref)) $dir .= "/".$objectref;
@@ -263,8 +265,8 @@ class doc_generic_bom_odt extends ModelePDFBom
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
 				if (!empty($conf->global->MAIN_DOC_USE_TIMING))
 				{
-				    $format = $conf->global->MAIN_DOC_USE_TIMING;
-				    if ($format == '1') $format = '%Y%m%d%H%M%S';
+					$format = $conf->global->MAIN_DOC_USE_TIMING;
+					if ($format == '1') $format = '%Y%m%d%H%M%S';
 					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
 				} else {
 					$filename = $newfiletmp.'.'.$newfileformat;
@@ -294,10 +296,10 @@ class doc_generic_bom_odt extends ModelePDFBom
 					// On peut utiliser le nom de la societe du contact
 					if (!empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socobject = $object->contact;
 					else {
-                        $socobject = $object->thirdparty;
-               			// if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
-            			$contactobject = $object->contact;
-                    }
+						$socobject = $object->thirdparty;
+			   			// if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
+						$contactobject = $object->contact;
+					}
 				} else {
 					$socobject = $object->thirdparty;
 				}
@@ -322,7 +324,7 @@ class doc_generic_bom_odt extends ModelePDFBom
 				// Open and load template
 				require_once ODTPHP_PATH.'odf.php';
 				try {
-                    $odfHandler = new odf(
+					$odfHandler = new odf(
 						$srctemplatepath,
 						array(
 						'PATH_TO_TMP'	  => $conf->bom->dir_temp,
@@ -349,7 +351,7 @@ class doc_generic_bom_odt extends ModelePDFBom
 					$odfHandler->setVars('free_text', $newfreetext, true, 'UTF-8');
 				} catch (OdfException $e)
 				{
-                    dol_syslog($e->getMessage(), LOG_INFO);
+					dol_syslog($e->getMessage(), LOG_INFO);
 				}
 
 				// Define substitution array
@@ -384,7 +386,7 @@ class doc_generic_bom_odt extends ModelePDFBom
 						}
 					} catch (OdfException $e)
 					{
-                        dol_syslog($e->getMessage(), LOG_INFO);
+						dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
 				// Replace tags of lines
@@ -415,10 +417,10 @@ class doc_generic_bom_odt extends ModelePDFBom
 									$listlines->setVars($key, $val, true, 'UTF-8');
 								} catch (OdfException $e)
 								{
-                                    dol_syslog($e->getMessage(), LOG_INFO);
+									dol_syslog($e->getMessage(), LOG_INFO);
 								} catch (SegmentException $e)
 								{
-                                    dol_syslog($e->getMessage(), LOG_INFO);
+									dol_syslog($e->getMessage(), LOG_INFO);
 								}
 							}
 							$listlines->merge();
@@ -440,7 +442,7 @@ class doc_generic_bom_odt extends ModelePDFBom
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
 					} catch (OdfException $e)
 					{
-                        dol_syslog($e->getMessage(), LOG_INFO);
+						dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
 
@@ -454,16 +456,16 @@ class doc_generic_bom_odt extends ModelePDFBom
 					try {
 						$odfHandler->exportAsAttachedPDF($file);
 					} catch (Exception $e) {
-                        $this->error = $e->getMessage();
-                        dol_syslog($e->getMessage(), LOG_INFO);
+						$this->error = $e->getMessage();
+						dol_syslog($e->getMessage(), LOG_INFO);
 						return -1;
 					}
 				} else {
 					try {
 						$odfHandler->saveToDisk($file);
 					} catch (Exception $e) {
-                        $this->error = $e->getMessage();
-                        dol_syslog($e->getMessage(), LOG_INFO);
+						$this->error = $e->getMessage();
+						dol_syslog($e->getMessage(), LOG_INFO);
 						return -1;
 					}
 				}
diff --git a/htdocs/core/modules/bom/mod_bom_advanced.php b/htdocs/core/modules/bom/mod_bom_advanced.php
index bb123f25b7c..53bd17f1b9d 100644
--- a/htdocs/core/modules/bom/mod_bom_advanced.php
+++ b/htdocs/core/modules/bom/mod_bom_advanced.php
@@ -35,9 +35,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/bom/modules_bom.php';
 class mod_bom_advanced extends ModeleNumRefboms
 {
 	/**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
 	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 
 	/**
@@ -51,14 +51,14 @@ class mod_bom_advanced extends ModeleNumRefboms
 	public $name = 'advanced';
 
 
-    /**
-     *  Returns the description of the numbering model
-     *
-     *  @return     string      Texte descripif
-     */
-    public function info()
-    {
-    	global $conf, $langs, $db;
+	/**
+	 *  Returns the description of the numbering model
+	 *
+	 *  @return     string      Texte descripif
+	 */
+	public function info()
+	{
+		global $conf, $langs, $db;
 
 		$langs->load("bills");
 
@@ -89,22 +89,22 @@ class mod_bom_advanced extends ModeleNumRefboms
 		$texte .= '</form>';
 
 		return $texte;
-    }
+	}
 
-    /**
-     *  Return an example of numbering
-     *
-     *  @return     string      Example
-     */
-    public function getExample()
-    {
-     	global $conf, $langs, $mysoc;
+	/**
+	 *  Return an example of numbering
+	 *
+	 *  @return     string      Example
+	 */
+	public function getExample()
+	{
+	 	global $conf, $langs, $mysoc;
 
-    	$old_code_client = $mysoc->code_client;
-    	$old_code_type = $mysoc->typent_code;
-    	$mysoc->code_client = 'CCCCCCCCCC';
-    	$mysoc->typent_code = 'TTTTTTTTTT';
-     	$numExample = $this->getNextValue($mysoc, '');
+		$old_code_client = $mysoc->code_client;
+		$old_code_type = $mysoc->typent_code;
+		$mysoc->code_client = 'CCCCCCCCCC';
+		$mysoc->typent_code = 'TTTTTTTTTT';
+	 	$numExample = $this->getNextValue($mysoc, '');
 		$mysoc->code_client = $old_code_client;
 		$mysoc->typent_code = $old_code_type;
 
@@ -113,7 +113,7 @@ class mod_bom_advanced extends ModeleNumRefboms
 			$numExample = $langs->trans('NotConfigured');
 		}
 		return $numExample;
-    }
+	}
 
 	/**
 	 * 	Return next free value
@@ -122,8 +122,8 @@ class mod_bom_advanced extends ModeleNumRefboms
 	 *  @param  Object		$object		Object we need next value for
 	 *  @return string      			Value if KO, <0 if KO
 	 */
-    public function getNextValue($objprod, $object)
-    {
+	public function getNextValue($objprod, $object)
+	{
 		global $db, $conf;
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
diff --git a/htdocs/core/modules/cheque/mod_chequereceipt_thyme.php b/htdocs/core/modules/cheque/mod_chequereceipt_thyme.php
index 9538155167f..6af1a89baca 100644
--- a/htdocs/core/modules/cheque/mod_chequereceipt_thyme.php
+++ b/htdocs/core/modules/cheque/mod_chequereceipt_thyme.php
@@ -32,9 +32,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/cheque/modules_chequereceipts.php'
 class mod_chequereceipt_thyme extends ModeleNumRefChequeReceipts
 {
 	/**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
 	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 
 	/**
@@ -45,14 +45,14 @@ class mod_chequereceipt_thyme extends ModeleNumRefChequeReceipts
 	public $name = 'Thyme';
 
 
-    /**
-     *  Returns the description of the numbering model
-     *
-     *  @return     string      Texte descripif
-     */
+	/**
+	 *  Returns the description of the numbering model
+	 *
+	 *  @return     string      Texte descripif
+	 */
 	public function info()
-    {
-    	global $conf, $langs, $db;
+	{
+		global $conf, $langs, $db;
 
 		$langs->load("bills");
 
@@ -83,20 +83,20 @@ class mod_chequereceipt_thyme extends ModeleNumRefChequeReceipts
 		$texte .= '</form>';
 
 		return $texte;
-    }
+	}
 
-    /**
-     *  Return an example of numbering
-     *
-     *  @return     string      Example
-     */
-    public function getExample()
-    {
-        global $conf, $langs, $mysoc;
+	/**
+	 *  Return an example of numbering
+	 *
+	 *  @return     string      Example
+	 */
+	public function getExample()
+	{
+		global $conf, $langs, $mysoc;
 
-    	$old_code_client = $mysoc->code_client;
-    	$mysoc->code_client = 'CCCCCCCCCC';
-     	$numExample = $this->getNextValue($mysoc, '');
+		$old_code_client = $mysoc->code_client;
+		$mysoc->code_client = 'CCCCCCCCCC';
+	 	$numExample = $this->getNextValue($mysoc, '');
 		$mysoc->code_client = $old_code_client;
 
 		if (!$numExample)
@@ -104,7 +104,7 @@ class mod_chequereceipt_thyme extends ModeleNumRefChequeReceipts
 			$numExample = $langs->trans('NotConfigured');
 		}
 		return $numExample;
-    }
+	}
 
 	/**
 	 * 	Return next free value
@@ -113,8 +113,8 @@ class mod_chequereceipt_thyme extends ModeleNumRefChequeReceipts
 	 *  @param  Object		$object		Object we need next value for
 	 *  @return string      			Value if KO, <0 if KO
 	 */
-    public function getNextValue($objsoc, $object)
-    {
+	public function getNextValue($objsoc, $object)
+	{
 		global $db, $conf;
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
@@ -134,17 +134,17 @@ class mod_chequereceipt_thyme extends ModeleNumRefChequeReceipts
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return next free value
 	 *
 	 *  @param	Societe		$objsoc     Object third party
 	 * 	@param	string		$objforref	Object for number to search
 	 *  @return string      			Next free value
-     */
-    public function chequereceipt_get_num($objsoc, $objforref)
-    {
-        // phpcs:enable
-        return $this->getNextValue($objsoc, $objforref);
-    }
+	 */
+	public function chequereceipt_get_num($objsoc, $objforref)
+	{
+		// phpcs:enable
+		return $this->getNextValue($objsoc, $objforref);
+	}
 }
diff --git a/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php b/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
index 9c8bd72a6a0..eb2c8121397 100644
--- a/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
+++ b/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
@@ -47,14 +47,14 @@ class doc_generic_order_odt extends ModelePDFCommandes
 	public $emetteur;
 
 	/**
-     * @var array Minimum version of PHP required by module.
-     * e.g.: PHP ≥ 5.6 = array(5, 6)
-     */
+	 * @var array Minimum version of PHP required by module.
+	 * e.g.: PHP ≥ 5.6 = array(5, 6)
+	 */
 	public $phpmin = array(5, 6);
 
 	/**
-     * @var string Dolibarr version of the loaded document
-     */
+	 * @var string Dolibarr version of the loaded document
+	 */
 	public $version = 'dolibarr';
 
 
@@ -63,12 +63,12 @@ class doc_generic_order_odt extends ModelePDFCommandes
 	 *
 	 *  @param		DoliDB		$db      Database handler
 	 */
-    public function __construct($db)
+	public function __construct($db)
 	{
 		global $conf, $langs, $mysoc;
 
 		// Load translation files required by the page
-        $langs->loadLangs(array("main", "companies"));
+		$langs->loadLangs(array("main", "companies"));
 
 		$this->db = $db;
 		$this->name = "ODT templates";
@@ -108,12 +108,12 @@ class doc_generic_order_odt extends ModelePDFCommandes
 	 *	@param	Translate	$langs      Lang object to use for output
 	 *	@return string       			Description
 	 */
-    public function info($langs)
+	public function info($langs)
 	{
 		global $conf, $langs;
 
 		// Load translation files required by the page
-        $langs->loadLangs(array("errors", "companies"));
+		$langs->loadLangs(array("errors", "companies"));
 
 		$form = new Form($this->db);
 
@@ -172,15 +172,15 @@ class doc_generic_order_odt extends ModelePDFCommandes
    			$texte .= '<div id="div_'.get_class($this).'" class="hidden">';
    			foreach ($listoffiles as $file)
    			{
-                $texte .= $file['name'].'<br>';
+				$texte .= $file['name'].'<br>';
    			}
    			$texte .= '</div>';
 		}
-        // Add input to upload a new template file.
-        $texte .= '<div>'.$langs->trans("UploadNewTemplate").' <input type="file" name="uploadfile">';
-        $texte .= '<input type="hidden" value="COMMANDE_ADDON_PDF_ODT_PATH" name="keyforuploaddir">';
-        $texte .= '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Upload")).'" name="upload">';
-        $texte .= '</div>';
+		// Add input to upload a new template file.
+		$texte .= '<div>'.$langs->trans("UploadNewTemplate").' <input type="file" name="uploadfile">';
+		$texte .= '<input type="hidden" value="COMMANDE_ADDON_PDF_ODT_PATH" name="keyforuploaddir">';
+		$texte .= '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Upload")).'" name="upload">';
+		$texte .= '</div>';
 
 		$texte .= '</td>';
 
@@ -195,7 +195,7 @@ class doc_generic_order_odt extends ModelePDFCommandes
 		return $texte;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Function to build a document on disk using the generic odt module.
 	 *
@@ -207,9 +207,9 @@ class doc_generic_order_odt extends ModelePDFCommandes
 	 *  @param		int			$hideref			Do not show ref
 	 *	@return		int         					1 if OK, <=0 if KO
 	 */
-    public function write_file($object, $outputlangs, $srctemplatepath, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
+	public function write_file($object, $outputlangs, $srctemplatepath, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $user, $langs, $conf, $mysoc, $hookmanager;
 
 		if (empty($srctemplatepath))
@@ -248,6 +248,8 @@ class doc_generic_order_odt extends ModelePDFCommandes
 				}
 			}
 
+			$object->fetch_thirdparty();
+
 			$dir = $conf->commande->multidir_output[$object->entity];
 			$objectref = dol_sanitizeFileName($object->ref);
 			if (!preg_match('/specimen/i', $objectref)) $dir .= "/".$objectref;
@@ -275,8 +277,8 @@ class doc_generic_order_odt extends ModelePDFCommandes
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
 				if (!empty($conf->global->MAIN_DOC_USE_TIMING))
 				{
-				    $format = $conf->global->MAIN_DOC_USE_TIMING;
-				    if ($format == '1') $format = '%Y%m%d%H%M%S';
+					$format = $conf->global->MAIN_DOC_USE_TIMING;
+					if ($format == '1') $format = '%Y%m%d%H%M%S';
 					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
 				} else {
 					$filename = $newfiletmp.'.'.$newfileformat;
@@ -306,10 +308,10 @@ class doc_generic_order_odt extends ModelePDFCommandes
 					// On peut utiliser le nom de la societe du contact
 					if (!empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socobject = $object->contact;
 					else {
-                        $socobject = $object->thirdparty;
-               			// if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
-            			$contactobject = $object->contact;
-                    }
+						$socobject = $object->thirdparty;
+			   			// if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
+						$contactobject = $object->contact;
+					}
 				} else {
 					$socobject = $object->thirdparty;
 				}
@@ -320,7 +322,7 @@ class doc_generic_order_odt extends ModelePDFCommandes
 				'__FROM_EMAIL__' => $this->emetteur->email,
 				'__TOTAL_TTC__' => $object->total_ttc,
 				'__TOTAL_HT__' => $object->total_ht,
-				'__TOTAL_VAT__' => $object->total_vat
+				'__TOTAL_VAT__' => $object->total_tva
 				);
 				complete_substitutions_array($substitutionarray, $langs, $object);
 				// Call the ODTSubstitution hook
@@ -338,7 +340,7 @@ class doc_generic_order_odt extends ModelePDFCommandes
 				// Open and load template
 				require_once ODTPHP_PATH.'odf.php';
 				try {
-                    $odfHandler = new odf(
+					$odfHandler = new odf(
 						$srctemplatepath,
 						array(
 						'PATH_TO_TMP'	  => $conf->commande->dir_temp,
@@ -365,7 +367,7 @@ class doc_generic_order_odt extends ModelePDFCommandes
 					$odfHandler->setVars('free_text', $newfreetext, true, 'UTF-8');
 				} catch (OdfException $e)
 				{
-                    dol_syslog($e->getMessage(), LOG_INFO);
+					dol_syslog($e->getMessage(), LOG_INFO);
 				}
 
 				// Define substitution array
@@ -400,7 +402,7 @@ class doc_generic_order_odt extends ModelePDFCommandes
 						}
 					} catch (OdfException $e)
 					{
-                        dol_syslog($e->getMessage(), LOG_INFO);
+						dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
 				// Replace tags of lines
@@ -431,10 +433,10 @@ class doc_generic_order_odt extends ModelePDFCommandes
 									$listlines->setVars($key, $val, true, 'UTF-8');
 								} catch (OdfException $e)
 								{
-                                    dol_syslog($e->getMessage(), LOG_INFO);
+									dol_syslog($e->getMessage(), LOG_INFO);
 								} catch (SegmentException $e)
 								{
-                                    dol_syslog($e->getMessage(), LOG_INFO);
+									dol_syslog($e->getMessage(), LOG_INFO);
 								}
 							}
 							$listlines->merge();
@@ -456,7 +458,7 @@ class doc_generic_order_odt extends ModelePDFCommandes
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
 					} catch (OdfException $e)
 					{
-                        dol_syslog($e->getMessage(), LOG_INFO);
+						dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
 
@@ -470,16 +472,16 @@ class doc_generic_order_odt extends ModelePDFCommandes
 					try {
 						$odfHandler->exportAsAttachedPDF($file);
 					} catch (Exception $e) {
-                        $this->error = $e->getMessage();
-                        dol_syslog($e->getMessage(), LOG_INFO);
+						$this->error = $e->getMessage();
+						dol_syslog($e->getMessage(), LOG_INFO);
 						return -1;
 					}
 				} else {
 					try {
-					    $odfHandler->saveToDisk($file);
+						$odfHandler->saveToDisk($file);
 					} catch (Exception $e) {
-                        $this->error = $e->getMessage();
-                        dol_syslog($e->getMessage(), LOG_INFO);
+						$this->error = $e->getMessage();
+						dol_syslog($e->getMessage(), LOG_INFO);
 						return -1;
 					}
 				}
diff --git a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
index 5bc041fd7b5..da95eeabb19 100644
--- a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
@@ -42,83 +42,83 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
  */
 class pdf_einstein extends ModelePDFCommandes
 {
-    /**
-     * @var DoliDb Database handler
-     */
-    public $db;
+	/**
+	 * @var DoliDb Database handler
+	 */
+	public $db;
 
 	/**
-     * @var string model name
-     */
-    public $name;
+	 * @var string model name
+	 */
+	public $name;
 
 	/**
-     * @var string model description (short text)
-     */
-    public $description;
-
-    /**
-     * @var int 	Save the name of generated file as the main doc when generating a doc with this template
-     */
-    public $update_main_doc_field;
+	 * @var string model description (short text)
+	 */
+	public $description;
 
 	/**
-     * @var string document type
-     */
-    public $type;
+	 * @var int 	Save the name of generated file as the main doc when generating a doc with this template
+	 */
+	public $update_main_doc_field;
 
 	/**
-     * @var array Minimum version of PHP required by module.
-     * e.g.: PHP ≥ 5.6 = array(5, 6)
-     */
+	 * @var string document type
+	 */
+	public $type;
+
+	/**
+	 * @var array Minimum version of PHP required by module.
+	 * e.g.: PHP ≥ 5.6 = array(5, 6)
+	 */
 	public $phpmin = array(5, 6);
 
 	/**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
 	public $version = 'dolibarr';
 
 	/**
-     * @var int page_largeur
-     */
-    public $page_largeur;
+	 * @var int page_largeur
+	 */
+	public $page_largeur;
 
-    /**
-     * @var int page_hauteur
-     */
-    public $page_hauteur;
+	/**
+	 * @var int page_hauteur
+	 */
+	public $page_hauteur;
 
-    /**
-     * @var array format
-     */
-    public $format;
+	/**
+	 * @var array format
+	 */
+	public $format;
 
-    /**
-     * @var int marge_gauche
-     */
+	/**
+	 * @var int marge_gauche
+	 */
 	public $marge_gauche;
 
 	/**
-     * @var int marge_droite
-     */
+	 * @var int marge_droite
+	 */
 	public $marge_droite;
 
 	/**
-     * @var int marge_haute
-     */
+	 * @var int marge_haute
+	 */
 	public $marge_haute;
 
 	/**
-     * @var int marge_basse
-     */
+	 * @var int marge_basse
+	 */
 	public $marge_basse;
 
 	/**
 	 * Issuer
 	 * @var Societe    Object that emits
 	 */
-    public $emetteur;
+	public $emetteur;
 
 
 	/**
@@ -200,21 +200,21 @@ class pdf_einstein extends ModelePDFCommandes
 		$this->atleastonediscount = 0;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Function to build pdf onto disk
-     *
-     *  @param		Object		$object				Object to generate
-     *  @param		Translate	$outputlangs		Lang output object
-     *  @param		string		$srctemplatepath	Full path of source filename for generator using a template file
-     *  @param		int			$hidedetails		Do not show line details
-     *  @param		int			$hidedesc			Do not show desc
-     *  @param		int			$hideref			Do not show ref
-     *  @return     int             			    1=OK, 0=KO
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Function to build pdf onto disk
+	 *
+	 *  @param		Object		$object				Object to generate
+	 *  @param		Translate	$outputlangs		Lang output object
+	 *  @param		string		$srctemplatepath	Full path of source filename for generator using a template file
+	 *  @param		int			$hidedetails		Do not show line details
+	 *  @param		int			$hidedesc			Do not show desc
+	 *  @param		int			$hideref			Do not show ref
+	 *  @return     int             			    1=OK, 0=KO
 	 */
 	public function write_file($object, $outputlangs, $srctemplatepath = '', $hidedetails = 0, $hidedesc = 0, $hideref = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $user, $langs, $conf, $mysoc, $db, $hookmanager, $nblines;
 
 		if (!is_object($outputlangs)) $outputlangs = $langs;
@@ -235,11 +235,11 @@ class pdf_einstein extends ModelePDFCommandes
 
 		if ($conf->commande->multidir_output[$conf->entity])
 		{
-            $object->fetch_thirdparty();
+			$object->fetch_thirdparty();
 
-            $deja_regle = 0;
+			$deja_regle = 0;
 
-            // Definition of $dir and $file
+			// Definition of $dir and $file
 			if ($object->specimen)
 			{
 				$dir = $conf->commande->multidir_output[$conf->entity];
@@ -278,22 +278,22 @@ class pdf_einstein extends ModelePDFCommandes
 				$pdf->SetAutoPageBreak(1, 0);
 
 				$heightforinfotot = 40; // Height reserved to output the info and total part
-		        $heightforfreetext = (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT) ? $conf->global->MAIN_PDF_FREETEXT_HEIGHT : 5); // Height reserved to output the free text on last page
-	            $heightforfooter = $this->marge_basse + 8; // Height reserved to output the footer (value include bottom margin)
-	            if ($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS > 0) $heightforfooter += 6;
+				$heightforfreetext = (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT) ? $conf->global->MAIN_PDF_FREETEXT_HEIGHT : 5); // Height reserved to output the free text on last page
+				$heightforfooter = $this->marge_basse + 8; // Height reserved to output the footer (value include bottom margin)
+				if ($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS > 0) $heightforfooter += 6;
 
-                if (class_exists('TCPDF'))
-                {
-                    $pdf->setPrintHeader(false);
-                    $pdf->setPrintFooter(false);
-                }
-                $pdf->SetFont(pdf_getPDFFont($outputlangs));
-                // Set path to the background PDF File
-                if (!empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
-                {
-                	$pagecount = $pdf->setSourceFile($conf->mycompany->multidir_output[$object->entity].'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
-                    $tplidx = $pdf->importPage(1);
-                }
+				if (class_exists('TCPDF'))
+				{
+					$pdf->setPrintHeader(false);
+					$pdf->setPrintFooter(false);
+				}
+				$pdf->SetFont(pdf_getPDFFont($outputlangs));
+				// Set path to the background PDF File
+				if (!empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
+				{
+					$pagecount = $pdf->setSourceFile($conf->mycompany->multidir_output[$object->entity].'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
+					$tplidx = $pdf->importPage(1);
+				}
 
 				$pdf->Open();
 				$pagenb = 0;
@@ -318,14 +318,14 @@ class pdf_einstein extends ModelePDFCommandes
 				}
 				if (empty($this->atleastonediscount))
 				{
-				    $delta = ($this->postotalht - $this->posxdiscount);
-				    $this->posxpicture += $delta;
-				    $this->posxtva += $delta;
-				    $this->posxup += $delta;
-				    $this->posxqty += $delta;
-				    $this->posxunit += $delta;
-				    $this->posxdiscount += $delta;
-				    // post of fields after are not modified, stay at same position
+					$delta = ($this->postotalht - $this->posxdiscount);
+					$this->posxpicture += $delta;
+					$this->posxtva += $delta;
+					$this->posxup += $delta;
+					$this->posxqty += $delta;
+					$this->posxunit += $delta;
+					$this->posxdiscount += $delta;
+					// post of fields after are not modified, stay at same position
 				}
 
 				// New page
@@ -376,11 +376,11 @@ class pdf_einstein extends ModelePDFCommandes
 						if (!empty($salerepobj->signature)) $notetoshow = dol_concatdesc($notetoshow, $salerepobj->signature);
 					}
 				}
-                // Extrafields in note
-                $extranote = $this->getExtrafieldsInHtml($object, $outputlangs);
-                if (!empty($extranote)) {
-                    $notetoshow = dol_concatdesc($notetoshow, $extranote);
-                }
+				// Extrafields in note
+				$extranote = $this->getExtrafieldsInHtml($object, $outputlangs);
+				if (!empty($extranote)) {
+					$notetoshow = dol_concatdesc($notetoshow, $extranote);
+				}
 
 				if ($notetoshow)
 				{
@@ -537,7 +537,7 @@ class pdf_einstein extends ModelePDFCommandes
 						$localtax2_type = $localtaxtmp_array[2];
 					}
 
-				    // retrieve global local tax
+					// retrieve global local tax
 					if ($localtax1_type && $localtax1ligne != 0)
 						$this->localtax1[$localtax1_type][$localtax1_rate] += $localtax1ligne;
 					if ($localtax2_type && $localtax2ligne != 0)
@@ -629,8 +629,8 @@ class pdf_einstein extends ModelePDFCommandes
 				$reshook = $hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 				if ($reshook < 0)
 				{
-				    $this->error = $hookmanager->error;
-				    $this->errors = $hookmanager->errors;
+					$this->error = $hookmanager->error;
+					$this->errors = $hookmanager->errors;
 				}
 
 				if (!empty($conf->global->MAIN_UMASK))
@@ -650,10 +650,10 @@ class pdf_einstein extends ModelePDFCommandes
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Show payments table
-     *
+	 *
 	 *  @param	TCPDF		$pdf     		Object PDF
 	 *  @param  Object		$object			Object order
 	 *	@param	int			$posy			Position y in PDF
@@ -662,11 +662,11 @@ class pdf_einstein extends ModelePDFCommandes
 	 */
 	protected function _tableau_versements(&$pdf, $object, $posy, $outputlangs)
 	{
-        // phpcs:enable
+		// phpcs:enable
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *   Show miscellaneous information (payment mode, payment term, ...)
 	 *
@@ -678,13 +678,13 @@ class pdf_einstein extends ModelePDFCommandes
 	 */
 	protected function _tableau_info(&$pdf, $object, $posy, $outputlangs)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $mysoc;
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
 		$pdf->SetFont('', '', $default_font_size - 1);
 
-        // If France, show VAT mention if not applicable
+		// If France, show VAT mention if not applicable
 		if ($this->emetteur->country_code == 'FR' && empty($mysoc->tva_assuj))
 		{
 			$pdf->SetFont('', 'B', $default_font_size - 2);
@@ -713,8 +713,8 @@ class pdf_einstein extends ModelePDFCommandes
 			$posy = $pdf->GetY() + 3;
 		}
 
-        // Check a payment mode is defined
-        /* Not used with orders
+		// Check a payment mode is defined
+		/* Not used with orders
 		if (empty($object->mode_reglement_code)
         	&& ! $conf->global->FACTURE_CHQ_NUMBER
         	&& ! $conf->global->FACTURE_RIB_NUMBER)
@@ -740,10 +740,10 @@ class pdf_einstein extends ModelePDFCommandes
             $posy=$pdf->GetY()+1;
 		}*/
 
-	    // Show planed date of delivery
-        if (!empty($object->date_livraison))
+		// Show planed date of delivery
+		if (!empty($object->date_livraison))
 		{
-            $outputlangs->load("sendings");
+			$outputlangs->load("sendings");
 			$pdf->SetFont('', 'B', $default_font_size - 2);
 			$pdf->SetXY($this->marge_gauche, $posy);
 			$titre = $outputlangs->transnoentities("DateDeliveryPlanned").':';
@@ -753,7 +753,7 @@ class pdf_einstein extends ModelePDFCommandes
 			$dlp = dol_print_date($object->date_livraison, "daytext", false, $outputlangs, true);
 			$pdf->MultiCell(80, 4, $dlp, 0, 'L');
 
-            $posy = $pdf->GetY() + 1;
+			$posy = $pdf->GetY() + 1;
 		} elseif ($object->availability_code || $object->availability)    // Show availability conditions
 		{
 			$pdf->SetFont('', 'B', $default_font_size - 2);
@@ -770,70 +770,70 @@ class pdf_einstein extends ModelePDFCommandes
 			$posy = $pdf->GetY() + 1;
 		}
 
-        // Show payment mode
-        if ($object->mode_reglement_code
-        	&& $object->mode_reglement_code != 'CHQ'
-           	&& $object->mode_reglement_code != 'VIR') {
-            $pdf->SetFont('', 'B', $default_font_size - 2);
-            $pdf->SetXY($this->marge_gauche, $posy);
-            $titre = $outputlangs->transnoentities("PaymentMode").':';
-            $pdf->MultiCell(80, 5, $titre, 0, 'L');
+		// Show payment mode
+		if ($object->mode_reglement_code
+			&& $object->mode_reglement_code != 'CHQ'
+		   	&& $object->mode_reglement_code != 'VIR') {
+			$pdf->SetFont('', 'B', $default_font_size - 2);
+			$pdf->SetXY($this->marge_gauche, $posy);
+			$titre = $outputlangs->transnoentities("PaymentMode").':';
+			$pdf->MultiCell(80, 5, $titre, 0, 'L');
 
 			$pdf->SetFont('', '', $default_font_size - 2);
-            $pdf->SetXY($posxval, $posy);
-            $lib_mode_reg = $outputlangs->transnoentities("PaymentType".$object->mode_reglement_code) != ('PaymentType'.$object->mode_reglement_code) ? $outputlangs->transnoentities("PaymentType".$object->mode_reglement_code) : $outputlangs->convToOutputCharset($object->mode_reglement);
-            $pdf->MultiCell(80, 5, $lib_mode_reg, 0, 'L');
+			$pdf->SetXY($posxval, $posy);
+			$lib_mode_reg = $outputlangs->transnoentities("PaymentType".$object->mode_reglement_code) != ('PaymentType'.$object->mode_reglement_code) ? $outputlangs->transnoentities("PaymentType".$object->mode_reglement_code) : $outputlangs->convToOutputCharset($object->mode_reglement);
+			$pdf->MultiCell(80, 5, $lib_mode_reg, 0, 'L');
 
-            $posy = $pdf->GetY() + 2;
-        }
-
-		// Show payment mode CHQ
-        if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'CHQ')
-        {
-        	// Si mode reglement non force ou si force a CHQ
-	        if (!empty($conf->global->FACTURE_CHQ_NUMBER))
-	        {
-	        	$diffsizetitle = (empty($conf->global->PDF_DIFFSIZE_TITLE) ? 3 : $conf->global->PDF_DIFFSIZE_TITLE);
-
-	        	if ($conf->global->FACTURE_CHQ_NUMBER > 0)
-	            {
-	                $account = new Account($this->db);
-	                $account->fetch($conf->global->FACTURE_CHQ_NUMBER);
-
-	                $pdf->SetXY($this->marge_gauche, $posy);
-	                $pdf->SetFont('', 'B', $default_font_size - $diffsizetitle);
-	                $pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo', $account->proprio), 0, 'L', 0);
-		            $posy = $pdf->GetY() + 1;
-
-		            if (empty($conf->global->MAIN_PDF_HIDE_CHQ_ADDRESS))
-		            {
-		                $pdf->SetXY($this->marge_gauche, $posy);
-		                $pdf->SetFont('', '', $default_font_size - $diffsizetitle);
-		                $pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($account->owner_address), 0, 'L', 0);
-			            $posy = $pdf->GetY() + 2;
-		            }
-	            }
-	            if ($conf->global->FACTURE_CHQ_NUMBER == -1)
-	            {
-	                $pdf->SetXY($this->marge_gauche, $posy);
-	                $pdf->SetFont('', 'B', $default_font_size - $diffsizetitle);
-	                $pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo', $this->emetteur->name), 0, 'L', 0);
-		            $posy = $pdf->GetY() + 1;
-
-		            if (empty($conf->global->MAIN_PDF_HIDE_CHQ_ADDRESS))
-		            {
-			            $pdf->SetXY($this->marge_gauche, $posy);
-			            $pdf->SetFont('', '', $default_font_size - $diffsizetitle);
-		                $pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($this->emetteur->getFullAddress()), 0, 'L', 0);
-			            $posy = $pdf->GetY() + 2;
-		            }
-	            }
-	        }
+			$posy = $pdf->GetY() + 2;
 		}
 
-        // If payment mode not forced or forced to VIR, show payment with BAN
-        if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'VIR')
-        {
+		// Show payment mode CHQ
+		if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'CHQ')
+		{
+			// Si mode reglement non force ou si force a CHQ
+			if (!empty($conf->global->FACTURE_CHQ_NUMBER))
+			{
+				$diffsizetitle = (empty($conf->global->PDF_DIFFSIZE_TITLE) ? 3 : $conf->global->PDF_DIFFSIZE_TITLE);
+
+				if ($conf->global->FACTURE_CHQ_NUMBER > 0)
+				{
+					$account = new Account($this->db);
+					$account->fetch($conf->global->FACTURE_CHQ_NUMBER);
+
+					$pdf->SetXY($this->marge_gauche, $posy);
+					$pdf->SetFont('', 'B', $default_font_size - $diffsizetitle);
+					$pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo', $account->proprio), 0, 'L', 0);
+					$posy = $pdf->GetY() + 1;
+
+					if (empty($conf->global->MAIN_PDF_HIDE_CHQ_ADDRESS))
+					{
+						$pdf->SetXY($this->marge_gauche, $posy);
+						$pdf->SetFont('', '', $default_font_size - $diffsizetitle);
+						$pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($account->owner_address), 0, 'L', 0);
+						$posy = $pdf->GetY() + 2;
+					}
+				}
+				if ($conf->global->FACTURE_CHQ_NUMBER == -1)
+				{
+					$pdf->SetXY($this->marge_gauche, $posy);
+					$pdf->SetFont('', 'B', $default_font_size - $diffsizetitle);
+					$pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo', $this->emetteur->name), 0, 'L', 0);
+					$posy = $pdf->GetY() + 1;
+
+					if (empty($conf->global->MAIN_PDF_HIDE_CHQ_ADDRESS))
+					{
+						$pdf->SetXY($this->marge_gauche, $posy);
+						$pdf->SetFont('', '', $default_font_size - $diffsizetitle);
+						$pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($this->emetteur->getFullAddress()), 0, 'L', 0);
+						$posy = $pdf->GetY() + 2;
+					}
+				}
+			}
+		}
+
+		// If payment mode not forced or forced to VIR, show payment with BAN
+		if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'VIR')
+		{
 			if ($object->fk_account > 0 || $object->fk_bank > 0 || !empty($conf->global->FACTURE_RIB_NUMBER))
 			{
 				$bankid = ($object->fk_account <= 0 ? $conf->global->FACTURE_RIB_NUMBER : $object->fk_account);
@@ -848,13 +848,13 @@ class pdf_einstein extends ModelePDFCommandes
 
 				$posy += 2;
 			}
-        }
+		}
 
 		return $posy;
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Show total to pay
 	 *
@@ -867,7 +867,7 @@ class pdf_einstein extends ModelePDFCommandes
 	 */
 	protected function _tableau_tot(&$pdf, $object, $deja_regle, $posy, $outputlangs)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $mysoc, $hookmanager;
 
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
@@ -885,7 +885,7 @@ class pdf_einstein extends ModelePDFCommandes
 		$pdf->SetFont('', '', $default_font_size - 1);
 
 		// Total table
-        $col1x = 120; $col2x = 170;
+		$col1x = 120; $col2x = 170;
 		if ($this->page_largeur < 210) // To work with US executive format
 		{
 			$col2x -= 20;
@@ -948,7 +948,7 @@ class pdf_einstein extends ModelePDFCommandes
 						}
 					}
 				}
-	      		//}
+		  		//}
 				//Local tax 2 before VAT
 				//if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
 				//{
@@ -1039,7 +1039,7 @@ class pdf_einstein extends ModelePDFCommandes
 						}
 					}
 				}
-	      		//}
+		  		//}
 				//Local tax 2 after VAT
 				//if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
 				//{
@@ -1090,8 +1090,8 @@ class pdf_einstein extends ModelePDFCommandes
 
 		$pdf->SetTextColor(0, 0, 0);
 
-        $creditnoteamount = 0;
-        $depositsamount = 0;
+		$creditnoteamount = 0;
+		$depositsamount = 0;
 		//$creditnoteamount=$object->getSumCreditNotesUsed();
 		//$depositsamount=$object->getSumDepositsUsed();
 		//print "x".$creditnoteamount."-".$depositsamount;exit;
@@ -1264,7 +1264,7 @@ class pdf_einstein extends ModelePDFCommandes
 		// Show Draft Watermark
 		if ($object->statut == 0 && (!empty($conf->global->COMMANDE_DRAFT_WATERMARK)))
 		{
-            pdf_watermark($pdf, $outputlangs, $this->page_hauteur, $this->page_largeur, 'mm', $conf->global->COMMANDE_DRAFT_WATERMARK);
+			pdf_watermark($pdf, $outputlangs, $this->page_hauteur, $this->page_largeur, 'mm', $conf->global->COMMANDE_DRAFT_WATERMARK);
 		}
 
 		$pdf->SetTextColor(0, 0, 60);
@@ -1292,8 +1292,8 @@ class pdf_einstein extends ModelePDFCommandes
 				}
 				if (is_readable($logo))
 				{
-				    $height = pdf_getHeightForLogo($logo);
-				    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
+					$height = pdf_getHeightForLogo($logo);
+					$pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
 				} else {
 					$pdf->SetTextColor(200, 0, 0);
 					$pdf->SetFont('', 'B', $default_font_size - 2);
@@ -1370,16 +1370,16 @@ class pdf_einstein extends ModelePDFCommandes
 		// Get contact
 		if (!empty($conf->global->DOC_SHOW_FIRST_SALES_REP))
 		{
-		    $arrayidcontact = $object->getIdContact('internal', 'SALESREPFOLL');
-		    if (count($arrayidcontact) > 0)
-		    {
-                $usertmp = new User($this->db);
-		        $usertmp->fetch($arrayidcontact[0]);
-                $posy += 4;
-                $pdf->SetXY($posx, $posy);
-		        $pdf->SetTextColor(0, 0, 60);
-		        $pdf->MultiCell($w, 3, $langs->transnoentities("SalesRepresentative")." : ".$usertmp->getFullName($langs), '', 'R');
-		    }
+			$arrayidcontact = $object->getIdContact('internal', 'SALESREPFOLL');
+			if (count($arrayidcontact) > 0)
+			{
+				$usertmp = new User($this->db);
+				$usertmp->fetch($arrayidcontact[0]);
+				$posy += 4;
+				$pdf->SetXY($posx, $posy);
+				$pdf->SetTextColor(0, 0, 60);
+				$pdf->MultiCell($w, 3, $langs->transnoentities("SalesRepresentative")." : ".$usertmp->getFullName($langs), '', 'R');
+			}
 		}
 
 		$posy += 2;
@@ -1493,7 +1493,7 @@ class pdf_einstein extends ModelePDFCommandes
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 *   	Show footer of page. Need this->emetteur object
-     *
+	 *
 	 *   	@param	TCPDF		$pdf     			PDF
 	 * 		@param	Object		$object				Object to show
 	 *      @param	Translate	$outputlangs		Object lang for output
diff --git a/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php b/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
index 01ee9b0ec98..73410935540 100644
--- a/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
@@ -42,82 +42,82 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
  */
 class pdf_eratosthene extends ModelePDFCommandes
 {
-    /**
-     * @var DoliDb Database handler
-     */
-    public $db;
+	/**
+	 * @var DoliDb Database handler
+	 */
+	public $db;
 
 	/**
-     * @var string model name
-     */
-    public $name;
+	 * @var string model name
+	 */
+	public $name;
 
 	/**
-     * @var string model description (short text)
-     */
-    public $description;
-
-    /**
-     * @var int 	Save the name of generated file as the main doc when generating a doc with this template
-     */
-    public $update_main_doc_field;
+	 * @var string model description (short text)
+	 */
+	public $description;
 
 	/**
-     * @var string document type
-     */
-    public $type;
+	 * @var int 	Save the name of generated file as the main doc when generating a doc with this template
+	 */
+	public $update_main_doc_field;
 
 	/**
-     * @var array Minimum version of PHP required by module.
-     * e.g.: PHP ≥ 5.6 = array(5, 6)
-     */
+	 * @var string document type
+	 */
+	public $type;
+
+	/**
+	 * @var array Minimum version of PHP required by module.
+	 * e.g.: PHP ≥ 5.6 = array(5, 6)
+	 */
 	public $phpmin = array(5, 6);
 
 	/**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
 	public $version = 'dolibarr';
 
-     /**
-     * @var int page_largeur
-     */
-    public $page_largeur;
+	 /**
+	  * @var int page_largeur
+	  */
+	public $page_largeur;
 
 	/**
-     * @var int page_hauteur
-     */
-    public $page_hauteur;
+	 * @var int page_hauteur
+	 */
+	public $page_hauteur;
 
 	/**
-     * @var array format
-     */
-    public $format;
+	 * @var array format
+	 */
+	public $format;
 
 	/**
-     * @var int marge_gauche
-     */
+	 * @var int marge_gauche
+	 */
 	public $marge_gauche;
 
 	/**
-     * @var int marge_droite
-     */
+	 * @var int marge_droite
+	 */
 	public $marge_droite;
 
 	/**
-     * @var int marge_haute
-     */
+	 * @var int marge_haute
+	 */
 	public $marge_haute;
 
 	/**
-     * @var int marge_basse
-     */
+	 * @var int marge_basse
+	 */
 	public $marge_basse;
 
-    /**
-	* Issuer
-	* @var Societe	Object that emits
-	*/
+	/**
+	 * Issuer
+	 * @var Societe	Object that emits
+	 */
 	public $emetteur;
 
 	/**
@@ -184,21 +184,21 @@ class pdf_eratosthene extends ModelePDFCommandes
 		$this->atleastonediscount = 0;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Function to build pdf onto disk
-     *
-     *  @param		Object		$object				Object to generate
-     *  @param		Translate	$outputlangs		Lang output object
-     *  @param		string		$srctemplatepath	Full path of source filename for generator using a template file
-     *  @param		int			$hidedetails		Do not show line details
-     *  @param		int			$hidedesc			Do not show desc
-     *  @param		int			$hideref			Do not show ref
-     *  @return     int             			    1=OK, 0=KO
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Function to build pdf onto disk
+	 *
+	 *  @param		Object		$object				Object to generate
+	 *  @param		Translate	$outputlangs		Lang output object
+	 *  @param		string		$srctemplatepath	Full path of source filename for generator using a template file
+	 *  @param		int			$hidedetails		Do not show line details
+	 *  @param		int			$hidedesc			Do not show desc
+	 *  @param		int			$hideref			Do not show ref
+	 *  @return     int             			    1=OK, 0=KO
 	 */
 	public function write_file($object, $outputlangs, $srctemplatepath = '', $hidedetails = 0, $hidedesc = 0, $hideref = 0)
 	{
-	    // phpcs:enable
+		// phpcs:enable
 		global $user, $langs, $conf, $mysoc, $db, $hookmanager, $nblines;
 
 		if (!is_object($outputlangs)) $outputlangs = $langs;
@@ -219,7 +219,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 
 		$hidetop = 0;
 		if (!empty($conf->global->MAIN_PDF_DISABLE_COL_HEAD_TITLE)) {
-		    $hidetop = $conf->global->MAIN_PDF_DISABLE_COL_HEAD_TITLE;
+			$hidetop = $conf->global->MAIN_PDF_DISABLE_COL_HEAD_TITLE;
 		}
 
 		// Loop on each lines to detect if there is at least one image to show
@@ -227,68 +227,68 @@ class pdf_eratosthene extends ModelePDFCommandes
 		$this->atleastonephoto = false;
 		if (!empty($conf->global->MAIN_GENERATE_ORDERS_WITH_PICTURE))
 		{
-		    $objphoto = new Product($this->db);
+			$objphoto = new Product($this->db);
 
-		    for ($i = 0; $i < $nblines; $i++)
-		    {
-		        if (empty($object->lines[$i]->fk_product)) continue;
+			for ($i = 0; $i < $nblines; $i++)
+			{
+				if (empty($object->lines[$i]->fk_product)) continue;
 
-		        $objphoto->fetch($object->lines[$i]->fk_product);
-		        //var_dump($objphoto->ref);exit;
-		        if (!empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))
-		        {
-		            $pdir[0] = get_exdir($objphoto->id, 2, 0, 0, $objphoto, 'product').$objphoto->id."/photos/";
-		            $pdir[1] = get_exdir(0, 0, 0, 0, $objphoto, 'product').dol_sanitizeFileName($objphoto->ref).'/';
-		        } else {
-		            $pdir[0] = get_exdir(0, 0, 0, 0, $objphoto, 'product').dol_sanitizeFileName($objphoto->ref).'/'; // default
-		            $pdir[1] = get_exdir($objphoto->id, 2, 0, 0, $objphoto, 'product').$objphoto->id."/photos/"; // alternative
-		        }
+				$objphoto->fetch($object->lines[$i]->fk_product);
+				//var_dump($objphoto->ref);exit;
+				if (!empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))
+				{
+					$pdir[0] = get_exdir($objphoto->id, 2, 0, 0, $objphoto, 'product').$objphoto->id."/photos/";
+					$pdir[1] = get_exdir(0, 0, 0, 0, $objphoto, 'product').dol_sanitizeFileName($objphoto->ref).'/';
+				} else {
+					$pdir[0] = get_exdir(0, 0, 0, 0, $objphoto, 'product').dol_sanitizeFileName($objphoto->ref).'/'; // default
+					$pdir[1] = get_exdir($objphoto->id, 2, 0, 0, $objphoto, 'product').$objphoto->id."/photos/"; // alternative
+				}
 
-		        $arephoto = false;
-		        foreach ($pdir as $midir)
-		        {
-		            if (!$arephoto)
-		            {
-		            	if ($conf->product->entity != $objphoto->entity) {
-		            		$dir = $conf->product->multidir_output[$objphoto->entity].'/'.$midir; //Check repertories of current entities
-		            	} else {
-		            		$dir = $conf->product->dir_output.'/'.$midir; //Check repertory of the current product
-		            	}
+				$arephoto = false;
+				foreach ($pdir as $midir)
+				{
+					if (!$arephoto)
+					{
+						if ($conf->product->entity != $objphoto->entity) {
+							$dir = $conf->product->multidir_output[$objphoto->entity].'/'.$midir; //Check repertories of current entities
+						} else {
+							$dir = $conf->product->dir_output.'/'.$midir; //Check repertory of the current product
+						}
 
-		                foreach ($objphoto->liste_photos($dir, 1) as $key => $obj)
-		                {
-		                    if (empty($conf->global->CAT_HIGH_QUALITY_IMAGES))		// If CAT_HIGH_QUALITY_IMAGES not defined, we use thumb if defined and then original photo
-		                    {
-		                        if ($obj['photo_vignette'])
-		                        {
-		                            $filename = $obj['photo_vignette'];
-		                        } else {
-		                            $filename = $obj['photo'];
-		                        }
-		                    } else {
-		                        $filename = $obj['photo'];
-		                    }
+						foreach ($objphoto->liste_photos($dir, 1) as $key => $obj)
+						{
+							if (empty($conf->global->CAT_HIGH_QUALITY_IMAGES))		// If CAT_HIGH_QUALITY_IMAGES not defined, we use thumb if defined and then original photo
+							{
+								if ($obj['photo_vignette'])
+								{
+									$filename = $obj['photo_vignette'];
+								} else {
+									$filename = $obj['photo'];
+								}
+							} else {
+								$filename = $obj['photo'];
+							}
 
-		                    $realpath = $dir.$filename;
-		                    $arephoto = true;
-		                    $this->atleastonephoto = true;
-		                }
-		            }
-		        }
+							$realpath = $dir.$filename;
+							$arephoto = true;
+							$this->atleastonephoto = true;
+						}
+					}
+				}
 
-		        if ($realpath && $arephoto) $realpatharray[$i] = $realpath;
-		    }
+				if ($realpath && $arephoto) $realpatharray[$i] = $realpath;
+			}
 		}
 
 
 
 		if ($conf->commande->multidir_output[$conf->entity])
 		{
-            $object->fetch_thirdparty();
+			$object->fetch_thirdparty();
 
-            $deja_regle = 0;
+			$deja_regle = 0;
 
-            // Definition of $dir and $file
+			// Definition of $dir and $file
 			if ($object->specimen)
 			{
 				$dir = $conf->commande->multidir_output[$conf->entity];
@@ -327,21 +327,21 @@ class pdf_eratosthene extends ModelePDFCommandes
 				$pdf->SetAutoPageBreak(1, 0);
 
 				$heightforinfotot = 40; // Height reserved to output the info and total part
-		        $heightforfreetext = (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT) ? $conf->global->MAIN_PDF_FREETEXT_HEIGHT : 5); // Height reserved to output the free text on last page
-		        $heightforfooter = $this->marge_basse + (empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS) ? 12 : 22); // Height reserved to output the footer (value include bottom margin)
+				$heightforfreetext = (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT) ? $conf->global->MAIN_PDF_FREETEXT_HEIGHT : 5); // Height reserved to output the free text on last page
+				$heightforfooter = $this->marge_basse + (empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS) ? 12 : 22); // Height reserved to output the footer (value include bottom margin)
 
-                if (class_exists('TCPDF'))
-                {
-                    $pdf->setPrintHeader(false);
-                    $pdf->setPrintFooter(false);
-                }
-                $pdf->SetFont(pdf_getPDFFont($outputlangs));
-                // Set path to the background PDF File
-                if (!empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
-                {
-                	$pagecount = $pdf->setSourceFile($conf->mycompany->multidir_output[$object->entity].'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
-                    $tplidx = $pdf->importPage(1);
-                }
+				if (class_exists('TCPDF'))
+				{
+					$pdf->setPrintHeader(false);
+					$pdf->setPrintFooter(false);
+				}
+				$pdf->SetFont(pdf_getPDFFont($outputlangs));
+				// Set path to the background PDF File
+				if (!empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
+				{
+					$pagecount = $pdf->setSourceFile($conf->mycompany->multidir_output[$object->entity].'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
+					$tplidx = $pdf->importPage(1);
+				}
 
 				$pdf->Open();
 				$pagenb = 0;
@@ -415,11 +415,11 @@ class pdf_eratosthene extends ModelePDFCommandes
 					}
 				}
 
-                // Extrafields in note
-                $extranote = $this->getExtrafieldsInHtml($object, $outputlangs);
-                if (!empty($extranote)) {
-                    $notetoshow = dol_concatdesc($notetoshow, $extranote);
-                }
+				// Extrafields in note
+				$extranote = $this->getExtrafieldsInHtml($object, $outputlangs);
+				if (!empty($extranote)) {
+					$notetoshow = dol_concatdesc($notetoshow, $extranote);
+				}
 
 				$pagenb = $pdf->getPage();
 				if ($notetoshow)
@@ -427,112 +427,112 @@ class pdf_eratosthene extends ModelePDFCommandes
 					$tab_top -= 2;
 
 					$tab_width = $this->page_largeur - $this->marge_gauche - $this->marge_droite;
-				    $pageposbeforenote = $pagenb;
+					$pageposbeforenote = $pagenb;
 
-				    $substitutionarray = pdf_getSubstitutionArray($outputlangs, null, $object);
-				    complete_substitutions_array($substitutionarray, $outputlangs, $object);
-				    $notetoshow = make_substitutions($notetoshow, $substitutionarray, $outputlangs);
-				    $notetoshow = convertBackOfficeMediasLinksToPublicLinks($notetoshow);
+					$substitutionarray = pdf_getSubstitutionArray($outputlangs, null, $object);
+					complete_substitutions_array($substitutionarray, $outputlangs, $object);
+					$notetoshow = make_substitutions($notetoshow, $substitutionarray, $outputlangs);
+					$notetoshow = convertBackOfficeMediasLinksToPublicLinks($notetoshow);
 
-				    $pdf->startTransaction();
+					$pdf->startTransaction();
 
-				    $pdf->SetFont('', '', $default_font_size - 1);
-				    $pdf->writeHTMLCell(190, 3, $this->posxdesc - 1, $tab_top, dol_htmlentitiesbr($notetoshow), 0, 1);
-				    // Description
-				    $pageposafternote = $pdf->getPage();
-				    $posyafter = $pdf->GetY();
+					$pdf->SetFont('', '', $default_font_size - 1);
+					$pdf->writeHTMLCell(190, 3, $this->posxdesc - 1, $tab_top, dol_htmlentitiesbr($notetoshow), 0, 1);
+					// Description
+					$pageposafternote = $pdf->getPage();
+					$posyafter = $pdf->GetY();
 
-				    if ($pageposafternote > $pageposbeforenote)
-				    {
-				        $pdf->rollbackTransaction(true);
+					if ($pageposafternote > $pageposbeforenote)
+					{
+						$pdf->rollbackTransaction(true);
 
-				        // prepare pages to receive notes
-				        while ($pagenb < $pageposafternote) {
-				            $pdf->AddPage();
-				            $pagenb++;
-				            if (!empty($tplidx)) $pdf->useTemplate($tplidx);
-				            if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
-				            // $this->_pagefoot($pdf,$object,$outputlangs,1);
-				            $pdf->setTopMargin($tab_top_newpage);
-				            // The only function to edit the bottom margin of current page to set it.
-				            $pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext);
-				        }
+						// prepare pages to receive notes
+						while ($pagenb < $pageposafternote) {
+							$pdf->AddPage();
+							$pagenb++;
+							if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+							if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+							// $this->_pagefoot($pdf,$object,$outputlangs,1);
+							$pdf->setTopMargin($tab_top_newpage);
+							// The only function to edit the bottom margin of current page to set it.
+							$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext);
+						}
 
-				        // back to start
-				        $pdf->setPage($pageposbeforenote);
-				        $pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext);
-				        $pdf->SetFont('', '', $default_font_size - 1);
-				        $pdf->writeHTMLCell(190, 3, $this->posxdesc - 1, $tab_top, dol_htmlentitiesbr($notetoshow), 0, 1);
-				        $pageposafternote = $pdf->getPage();
+						// back to start
+						$pdf->setPage($pageposbeforenote);
+						$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext);
+						$pdf->SetFont('', '', $default_font_size - 1);
+						$pdf->writeHTMLCell(190, 3, $this->posxdesc - 1, $tab_top, dol_htmlentitiesbr($notetoshow), 0, 1);
+						$pageposafternote = $pdf->getPage();
 
-				        $posyafter = $pdf->GetY();
+						$posyafter = $pdf->GetY();
 
-				        if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + 20)))	// There is no space left for total+free text
-				        {
-				            $pdf->AddPage('', '', true);
-				            $pagenb++;
-				            $pageposafternote++;
-				            $pdf->setPage($pageposafternote);
-				            $pdf->setTopMargin($tab_top_newpage);
-				            // The only function to edit the bottom margin of current page to set it.
-				            $pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext);
-				            //$posyafter = $tab_top_newpage;
-				        }
+						if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + 20)))	// There is no space left for total+free text
+						{
+							$pdf->AddPage('', '', true);
+							$pagenb++;
+							$pageposafternote++;
+							$pdf->setPage($pageposafternote);
+							$pdf->setTopMargin($tab_top_newpage);
+							// The only function to edit the bottom margin of current page to set it.
+							$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext);
+							//$posyafter = $tab_top_newpage;
+						}
 
 
-				        // apply note frame to previous pages
-				        $i = $pageposbeforenote;
-				        while ($i < $pageposafternote) {
-				            $pdf->setPage($i);
+						// apply note frame to previous pages
+						$i = $pageposbeforenote;
+						while ($i < $pageposafternote) {
+							$pdf->setPage($i);
 
 
-				            $pdf->SetDrawColor(128, 128, 128);
-				            // Draw note frame
-				            if ($i > $pageposbeforenote) {
-				                $height_note = $this->page_hauteur - ($tab_top_newpage + $heightforfooter);
-				                $pdf->Rect($this->marge_gauche, $tab_top_newpage - 1, $tab_width, $height_note + 1);
-				            } else {
-				                $height_note = $this->page_hauteur - ($tab_top + $heightforfooter);
-				                $pdf->Rect($this->marge_gauche, $tab_top - 1, $tab_width, $height_note + 1);
-				            }
+							$pdf->SetDrawColor(128, 128, 128);
+							// Draw note frame
+							if ($i > $pageposbeforenote) {
+								$height_note = $this->page_hauteur - ($tab_top_newpage + $heightforfooter);
+								$pdf->Rect($this->marge_gauche, $tab_top_newpage - 1, $tab_width, $height_note + 1);
+							} else {
+								$height_note = $this->page_hauteur - ($tab_top + $heightforfooter);
+								$pdf->Rect($this->marge_gauche, $tab_top - 1, $tab_width, $height_note + 1);
+							}
 
-				            // Add footer
-				            $pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
-				            $this->_pagefoot($pdf, $object, $outputlangs, 1);
+							// Add footer
+							$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+							$this->_pagefoot($pdf, $object, $outputlangs, 1);
 
-				            $i++;
-				        }
+							$i++;
+						}
 
-				        // apply note frame to last page
-				        $pdf->setPage($pageposafternote);
-				        if (!empty($tplidx)) $pdf->useTemplate($tplidx);
-				        if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
-				        $height_note = $posyafter - $tab_top_newpage;
-				        $pdf->Rect($this->marge_gauche, $tab_top_newpage - 1, $tab_width, $height_note + 1);
-				    } else // No pagebreak
-				    {
-				        $pdf->commitTransaction();
-				        $posyafter = $pdf->GetY();
-				        $height_note = $posyafter - $tab_top;
-				        $pdf->Rect($this->marge_gauche, $tab_top - 1, $tab_width, $height_note + 1);
+						// apply note frame to last page
+						$pdf->setPage($pageposafternote);
+						if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+						$height_note = $posyafter - $tab_top_newpage;
+						$pdf->Rect($this->marge_gauche, $tab_top_newpage - 1, $tab_width, $height_note + 1);
+					} else // No pagebreak
+					{
+						$pdf->commitTransaction();
+						$posyafter = $pdf->GetY();
+						$height_note = $posyafter - $tab_top;
+						$pdf->Rect($this->marge_gauche, $tab_top - 1, $tab_width, $height_note + 1);
 
 
-				        if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + 20)))
-				        {
-				            // not enough space, need to add page
-				            $pdf->AddPage('', '', true);
-				            $pagenb++;
-				            $pageposafternote++;
-				            $pdf->setPage($pageposafternote);
-				            if (!empty($tplidx)) $pdf->useTemplate($tplidx);
-				            if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+						if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + 20)))
+						{
+							// not enough space, need to add page
+							$pdf->AddPage('', '', true);
+							$pagenb++;
+							$pageposafternote++;
+							$pdf->setPage($pageposafternote);
+							if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+							if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
 
-				            $posyafter = $tab_top_newpage;
-				        }
-				    }
+							$posyafter = $tab_top_newpage;
+						}
+					}
 
-				    $tab_height = $tab_height - $height_note;
-				    $tab_top = $posyafter + 6;
+					$tab_height = $tab_height - $height_note;
+					$tab_top = $posyafter + 6;
 				} else {
 					$height_note = 0;
 				}
@@ -571,67 +571,67 @@ class pdf_eratosthene extends ModelePDFCommandes
 
 					if ($this->getColumnStatus('photo'))
 					{
-					    // We start with Photo of product line
-					    if (isset($imglinesize['width']) && isset($imglinesize['height']) && ($curY + $imglinesize['height']) > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot)))	// If photo too high, we moved completely on new page
-					    {
-					        $pdf->AddPage('', '', true);
-					        if (!empty($tplidx)) $pdf->useTemplate($tplidx);
-					        $pdf->setPage($pageposbefore + 1);
+						// We start with Photo of product line
+						if (isset($imglinesize['width']) && isset($imglinesize['height']) && ($curY + $imglinesize['height']) > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot)))	// If photo too high, we moved completely on new page
+						{
+							$pdf->AddPage('', '', true);
+							if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+							$pdf->setPage($pageposbefore + 1);
 
-					        $curY = $tab_top_newpage;
+							$curY = $tab_top_newpage;
 
 							// Allows data in the first page if description is long enough to break in multiples pages
 							if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
 								$showpricebeforepagebreak = 1;
 							else $showpricebeforepagebreak = 0;
-					    }
+						}
 
-					    if (!empty($this->cols['photo']) && isset($imglinesize['width']) && isset($imglinesize['height']))
-					    {
-					        $pdf->Image($realpatharray[$i], $this->getColumnContentXStart('photo'), $curY, $imglinesize['width'], $imglinesize['height'], '', '', '', 2, 300); // Use 300 dpi
-					        // $pdf->Image does not increase value return by getY, so we save it manually
-					        $posYAfterImage = $curY + $imglinesize['height'];
-					    }
+						if (!empty($this->cols['photo']) && isset($imglinesize['width']) && isset($imglinesize['height']))
+						{
+							$pdf->Image($realpatharray[$i], $this->getColumnContentXStart('photo'), $curY, $imglinesize['width'], $imglinesize['height'], '', '', '', 2, 300); // Use 300 dpi
+							// $pdf->Image does not increase value return by getY, so we save it manually
+							$posYAfterImage = $curY + $imglinesize['height'];
+						}
 					}
 
 					// Description of product line
 					if ($this->getColumnStatus('desc'))
 					{
-    					$pdf->startTransaction();
+						$pdf->startTransaction();
 
-                        $this->printColDescContent($pdf, $curY, 'desc', $object, $i, $outputlangs, $hideref, $hidedesc);
+						$this->printColDescContent($pdf, $curY, 'desc', $object, $i, $outputlangs, $hideref, $hidedesc);
 
-                        $pageposafter = $pdf->getPage();
-    					if ($pageposafter > $pageposbefore)	// There is a pagebreak
-    					{
-    						$pdf->rollbackTransaction(true);
-    						$pageposafter = $pageposbefore;
-    						//print $pageposafter.'-'.$pageposbefore;exit;
-    						$pdf->setPageOrientation('', 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
+						$pageposafter = $pdf->getPage();
+						if ($pageposafter > $pageposbefore)	// There is a pagebreak
+						{
+							$pdf->rollbackTransaction(true);
+							$pageposafter = $pageposbefore;
+							//print $pageposafter.'-'.$pageposbefore;exit;
+							$pdf->setPageOrientation('', 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
 
-                            $this->printColDescContent($pdf, $curY, 'desc', $object, $i, $outputlangs, $hideref, $hidedesc);
-    						$pageposafter = $pdf->getPage();
-    						$posyafter = $pdf->GetY();
-    						if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot)))	// There is no space left for total+free text
-    						{
-    							if ($i == ($nblines - 1))	// No more lines, and no space left to show total, so we create a new page
-    							{
-    								$pdf->AddPage('', '', true);
-    								if (!empty($tplidx)) $pdf->useTemplate($tplidx);
-    								//if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
-    								$pdf->setPage($pageposafter + 1);
-    							}
-    						} else {
-    							// We found a page break
+							$this->printColDescContent($pdf, $curY, 'desc', $object, $i, $outputlangs, $hideref, $hidedesc);
+							$pageposafter = $pdf->getPage();
+							$posyafter = $pdf->GetY();
+							if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot)))	// There is no space left for total+free text
+							{
+								if ($i == ($nblines - 1))	// No more lines, and no space left to show total, so we create a new page
+								{
+									$pdf->AddPage('', '', true);
+									if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+									//if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+									$pdf->setPage($pageposafter + 1);
+								}
+							} else {
+								// We found a page break
 								// Allows data in the first page if description is long enough to break in multiples pages
 								if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
 									$showpricebeforepagebreak = 1;
 								else $showpricebeforepagebreak = 0;
-    						}
-    					} else // No pagebreak
-    					{
-    						$pdf->commitTransaction();
-    					}
+							}
+						} else // No pagebreak
+						{
+							$pdf->commitTransaction();
+						}
 					}
 
 
@@ -655,51 +655,51 @@ class pdf_eratosthene extends ModelePDFCommandes
 					// VAT Rate
 					if ($this->getColumnStatus('vat'))
 					{
-					    $vat_rate = pdf_getlinevatrate($object, $i, $outputlangs, $hidedetails);
-					    $this->printStdColumnContent($pdf, $curY, 'vat', $vat_rate);
-					    $nexY = max($pdf->GetY(), $nexY);
+						$vat_rate = pdf_getlinevatrate($object, $i, $outputlangs, $hidedetails);
+						$this->printStdColumnContent($pdf, $curY, 'vat', $vat_rate);
+						$nexY = max($pdf->GetY(), $nexY);
 					}
 
 					// Unit price before discount
 					if ($this->getColumnStatus('subprice'))
 					{
-					    $up_excl_tax = pdf_getlineupexcltax($object, $i, $outputlangs, $hidedetails);
-					    $this->printStdColumnContent($pdf, $curY, 'subprice', $up_excl_tax);
-					    $nexY = max($pdf->GetY(), $nexY);
+						$up_excl_tax = pdf_getlineupexcltax($object, $i, $outputlangs, $hidedetails);
+						$this->printStdColumnContent($pdf, $curY, 'subprice', $up_excl_tax);
+						$nexY = max($pdf->GetY(), $nexY);
 					}
 
 					// Quantity
 					// Enough for 6 chars
 					if ($this->getColumnStatus('qty'))
 					{
-					    $qty = pdf_getlineqty($object, $i, $outputlangs, $hidedetails);
-					    $this->printStdColumnContent($pdf, $curY, 'qty', $qty);
-					    $nexY = max($pdf->GetY(), $nexY);
+						$qty = pdf_getlineqty($object, $i, $outputlangs, $hidedetails);
+						$this->printStdColumnContent($pdf, $curY, 'qty', $qty);
+						$nexY = max($pdf->GetY(), $nexY);
 					}
 
 
 					// Unit
 					if ($this->getColumnStatus('unit'))
 					{
-					    $unit = pdf_getlineunit($object, $i, $outputlangs, $hidedetails, $hookmanager);
-					    $this->printStdColumnContent($pdf, $curY, 'unit', $unit);
-					    $nexY = max($pdf->GetY(), $nexY);
+						$unit = pdf_getlineunit($object, $i, $outputlangs, $hidedetails, $hookmanager);
+						$this->printStdColumnContent($pdf, $curY, 'unit', $unit);
+						$nexY = max($pdf->GetY(), $nexY);
 					}
 
 					// Discount on line
 					if ($this->getColumnStatus('discount') && $object->lines[$i]->remise_percent)
 					{
-					    $remise_percent = pdf_getlineremisepercent($object, $i, $outputlangs, $hidedetails);
-					    $this->printStdColumnContent($pdf, $curY, 'discount', $remise_percent);
-					    $nexY = max($pdf->GetY(), $nexY);
+						$remise_percent = pdf_getlineremisepercent($object, $i, $outputlangs, $hidedetails);
+						$this->printStdColumnContent($pdf, $curY, 'discount', $remise_percent);
+						$nexY = max($pdf->GetY(), $nexY);
 					}
 
 					// Total excl tax line (HT)
 					if ($this->getColumnStatus('totalexcltax'))
 					{
-					    $total_excl_tax = pdf_getlinetotalexcltax($object, $i, $outputlangs, $hidedetails);
-					    $this->printStdColumnContent($pdf, $curY, 'totalexcltax', $total_excl_tax);
-					    $nexY = max($pdf->GetY(), $nexY);
+						$total_excl_tax = pdf_getlinetotalexcltax($object, $i, $outputlangs, $hidedetails);
+						$this->printStdColumnContent($pdf, $curY, 'totalexcltax', $total_excl_tax);
+						$nexY = max($pdf->GetY(), $nexY);
 					}
 
 					// Total with tax line (TTC)
@@ -711,25 +711,25 @@ class pdf_eratosthene extends ModelePDFCommandes
 					}
 
 					// Extrafields
-                    if (!empty($object->lines[$i]->array_options)) {
-                        foreach ($object->lines[$i]->array_options as $extrafieldColKey => $extrafieldValue) {
-                            if ($this->getColumnStatus($extrafieldColKey))
-                            {
-                                $extrafieldValue = $this->getExtrafieldContent($object->lines[$i], $extrafieldColKey);
-                                $this->printStdColumnContent($pdf, $curY, $extrafieldColKey, $extrafieldValue);
-                                $nexY = max($pdf->GetY(), $nexY);
-                            }
-                        }
-                    }
+					if (!empty($object->lines[$i]->array_options)) {
+						foreach ($object->lines[$i]->array_options as $extrafieldColKey => $extrafieldValue) {
+							if ($this->getColumnStatus($extrafieldColKey))
+							{
+								$extrafieldValue = $this->getExtrafieldContent($object->lines[$i], $extrafieldColKey);
+								$this->printStdColumnContent($pdf, $curY, $extrafieldColKey, $extrafieldValue);
+								$nexY = max($pdf->GetY(), $nexY);
+							}
+						}
+					}
 
 					$parameters = array(
-					    'object' => $object,
-					    'i' => $i,
-					    'pdf' =>& $pdf,
-					    'curY' =>& $curY,
-					    'nexY' =>& $nexY,
-					    'outputlangs' => $outputlangs,
-					    'hidedetails' => $hidedetails
+						'object' => $object,
+						'i' => $i,
+						'pdf' =>& $pdf,
+						'curY' =>& $curY,
+						'nexY' =>& $nexY,
+						'outputlangs' => $outputlangs,
+						'hidedetails' => $hidedetails
 					);
 					$reshook = $hookmanager->executeHooks('printPDFline', $parameters, $this); // Note that $object may have been modified by hook
 
@@ -760,7 +760,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 						$localtax2_type = $localtaxtmp_array[2];
 					}
 
-				    // retrieve global local tax
+					// retrieve global local tax
 					if ($localtax1_type && $localtax1ligne != 0)
 						$this->localtax1[$localtax1_type][$localtax1_rate] += $localtax1ligne;
 					if ($localtax2_type && $localtax2ligne != 0)
@@ -787,7 +787,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 						$pdf->setPage($pagenb);
 						if ($pagenb == $pageposbeforeprintlines)
 						{
-						    $this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, $hidetop, 1, $object->multicurrency_code);
+							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, $hidetop, 1, $object->multicurrency_code);
 						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
 						}
@@ -799,10 +799,10 @@ class pdf_eratosthene extends ModelePDFCommandes
 					}
 					if (isset($object->lines[$i + 1]->pagebreak) && $object->lines[$i + 1]->pagebreak)
 					{
-					    if ($pagenb == $pageposafter)
+						if ($pagenb == $pageposafter)
 						{
-						    $this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, $hidetop, 1, $object->multicurrency_code);
-					    } else {
+							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, $hidetop, 1, $object->multicurrency_code);
+						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -817,7 +817,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 				// Show square
 				if ($pagenb == $pageposbeforeprintlines)
 				{
-				    $this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, $hidetop, 0, $object->multicurrency_code);
+					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, $hidetop, 0, $object->multicurrency_code);
 				} else {
 					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0, $object->multicurrency_code);
 				}
@@ -852,8 +852,8 @@ class pdf_eratosthene extends ModelePDFCommandes
 				$reshook = $hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 				if ($reshook < 0)
 				{
-				    $this->error = $hookmanager->error;
-				    $this->errors = $hookmanager->errors;
+					$this->error = $hookmanager->error;
+					$this->errors = $hookmanager->errors;
 				}
 
 				if (!empty($conf->global->MAIN_UMASK))
@@ -874,7 +874,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 
 	/**
 	 *  Show payments table
-   *
+	 *
 	 *  @param	TCPDF		$pdf     		Object PDF
 	 *  @param  Object		$object			Object order
 	 *	@param	int			$posy			Position y in PDF
@@ -901,7 +901,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 
 		$pdf->SetFont('', '', $default_font_size - 1);
 
-        // If France, show VAT mention if not applicable
+		// If France, show VAT mention if not applicable
 		if ($this->emetteur->country_code == 'FR' && empty($mysoc->tva_assuj))
 		{
 			$pdf->SetFont('', 'B', $default_font_size - 2);
@@ -930,8 +930,8 @@ class pdf_eratosthene extends ModelePDFCommandes
 			$posy = $pdf->GetY() + 3;
 		}
 
-        // Check a payment mode is defined
-        /* Not used with orders
+		// Check a payment mode is defined
+		/* Not used with orders
 		if (empty($object->mode_reglement_code)
         	&& ! $conf->global->FACTURE_CHQ_NUMBER
         	&& ! $conf->global->FACTURE_RIB_NUMBER)
@@ -957,10 +957,10 @@ class pdf_eratosthene extends ModelePDFCommandes
             $posy=$pdf->GetY()+1;
 		}*/
 
-	    // Show planed date of delivery
-        if (!empty($object->date_livraison))
+		// Show planed date of delivery
+		if (!empty($object->date_livraison))
 		{
-            $outputlangs->load("sendings");
+			$outputlangs->load("sendings");
 			$pdf->SetFont('', 'B', $default_font_size - 2);
 			$pdf->SetXY($this->marge_gauche, $posy);
 			$titre = $outputlangs->transnoentities("DateDeliveryPlanned").':';
@@ -970,8 +970,8 @@ class pdf_eratosthene extends ModelePDFCommandes
 			$dlp = dol_print_date($object->date_livraison, "daytext", false, $outputlangs, true);
 			$pdf->MultiCell(80, 4, $dlp, 0, 'L');
 
-            $posy = $pdf->GetY() + 1;
-        } elseif ($object->availability_code || $object->availability)    // Show availability conditions
+			$posy = $pdf->GetY() + 1;
+		} elseif ($object->availability_code || $object->availability)    // Show availability conditions
 		{
 			$pdf->SetFont('', 'B', $default_font_size - 2);
 			$pdf->SetXY($this->marge_gauche, $posy);
@@ -985,72 +985,72 @@ class pdf_eratosthene extends ModelePDFCommandes
 			$pdf->MultiCell(80, 4, $lib_availability, 0, 'L');
 
 			$posy = $pdf->GetY() + 1;
-        }
+		}
 
-        // Show payment mode
-        if ($object->mode_reglement_code
-        	&& $object->mode_reglement_code != 'CHQ'
-           	&& $object->mode_reglement_code != 'VIR') {
-            $pdf->SetFont('', 'B', $default_font_size - 2);
-            $pdf->SetXY($this->marge_gauche, $posy);
-            $titre = $outputlangs->transnoentities("PaymentMode").':';
-            $pdf->MultiCell(80, 5, $titre, 0, 'L');
+		// Show payment mode
+		if ($object->mode_reglement_code
+			&& $object->mode_reglement_code != 'CHQ'
+		   	&& $object->mode_reglement_code != 'VIR') {
+			$pdf->SetFont('', 'B', $default_font_size - 2);
+			$pdf->SetXY($this->marge_gauche, $posy);
+			$titre = $outputlangs->transnoentities("PaymentMode").':';
+			$pdf->MultiCell(80, 5, $titre, 0, 'L');
 
 			$pdf->SetFont('', '', $default_font_size - 2);
-            $pdf->SetXY($posxval, $posy);
-            $lib_mode_reg = $outputlangs->transnoentities("PaymentType".$object->mode_reglement_code) != ('PaymentType'.$object->mode_reglement_code) ? $outputlangs->transnoentities("PaymentType".$object->mode_reglement_code) : $outputlangs->convToOutputCharset($object->mode_reglement);
-            $pdf->MultiCell(80, 5, $lib_mode_reg, 0, 'L');
+			$pdf->SetXY($posxval, $posy);
+			$lib_mode_reg = $outputlangs->transnoentities("PaymentType".$object->mode_reglement_code) != ('PaymentType'.$object->mode_reglement_code) ? $outputlangs->transnoentities("PaymentType".$object->mode_reglement_code) : $outputlangs->convToOutputCharset($object->mode_reglement);
+			$pdf->MultiCell(80, 5, $lib_mode_reg, 0, 'L');
 
-            $posy = $pdf->GetY() + 2;
-        }
+			$posy = $pdf->GetY() + 2;
+		}
 
 		// Show payment mode CHQ
-        if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'CHQ')
-        {
-            // Si mode reglement non force ou si force a CHQ
-            if (!empty($conf->global->FACTURE_CHQ_NUMBER))
-            {
-            	$diffsizetitle = (empty($conf->global->PDF_DIFFSIZE_TITLE) ? 3 : $conf->global->PDF_DIFFSIZE_TITLE);
+		if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'CHQ')
+		{
+			// Si mode reglement non force ou si force a CHQ
+			if (!empty($conf->global->FACTURE_CHQ_NUMBER))
+			{
+				$diffsizetitle = (empty($conf->global->PDF_DIFFSIZE_TITLE) ? 3 : $conf->global->PDF_DIFFSIZE_TITLE);
 
-            	if ($conf->global->FACTURE_CHQ_NUMBER > 0)
-	            {
-	                $account = new Account($this->db);
-	                $account->fetch($conf->global->FACTURE_CHQ_NUMBER);
+				if ($conf->global->FACTURE_CHQ_NUMBER > 0)
+				{
+					$account = new Account($this->db);
+					$account->fetch($conf->global->FACTURE_CHQ_NUMBER);
 
-	                $pdf->SetXY($this->marge_gauche, $posy);
-	                $pdf->SetFont('', 'B', $default_font_size - $diffsizetitle);
-	                $pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo', $account->proprio), 0, 'L', 0);
-		            $posy = $pdf->GetY() + 1;
+					$pdf->SetXY($this->marge_gauche, $posy);
+					$pdf->SetFont('', 'B', $default_font_size - $diffsizetitle);
+					$pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo', $account->proprio), 0, 'L', 0);
+					$posy = $pdf->GetY() + 1;
 
-		            if (empty($conf->global->MAIN_PDF_HIDE_CHQ_ADDRESS))
-		            {
-		                $pdf->SetXY($this->marge_gauche, $posy);
-		                $pdf->SetFont('', '', $default_font_size - $diffsizetitle);
-		                $pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($account->owner_address), 0, 'L', 0);
-			            $posy = $pdf->GetY() + 2;
-		            }
-	            }
-	            if ($conf->global->FACTURE_CHQ_NUMBER == -1)
-	            {
-	                $pdf->SetXY($this->marge_gauche, $posy);
-	                $pdf->SetFont('', 'B', $default_font_size - $diffsizetitle);
-	                $pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo', $this->emetteur->name), 0, 'L', 0);
-		            $posy = $pdf->GetY() + 1;
+					if (empty($conf->global->MAIN_PDF_HIDE_CHQ_ADDRESS))
+					{
+						$pdf->SetXY($this->marge_gauche, $posy);
+						$pdf->SetFont('', '', $default_font_size - $diffsizetitle);
+						$pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($account->owner_address), 0, 'L', 0);
+						$posy = $pdf->GetY() + 2;
+					}
+				}
+				if ($conf->global->FACTURE_CHQ_NUMBER == -1)
+				{
+					$pdf->SetXY($this->marge_gauche, $posy);
+					$pdf->SetFont('', 'B', $default_font_size - $diffsizetitle);
+					$pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo', $this->emetteur->name), 0, 'L', 0);
+					$posy = $pdf->GetY() + 1;
 
-		            if (empty($conf->global->MAIN_PDF_HIDE_CHQ_ADDRESS))
-		            {
-			            $pdf->SetXY($this->marge_gauche, $posy);
-			            $pdf->SetFont('', '', $default_font_size - $diffsizetitle);
-		                $pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($this->emetteur->getFullAddress()), 0, 'L', 0);
-			            $posy = $pdf->GetY() + 2;
-		            }
-	            }
-            }
-        }
+					if (empty($conf->global->MAIN_PDF_HIDE_CHQ_ADDRESS))
+					{
+						$pdf->SetXY($this->marge_gauche, $posy);
+						$pdf->SetFont('', '', $default_font_size - $diffsizetitle);
+						$pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($this->emetteur->getFullAddress()), 0, 'L', 0);
+						$posy = $pdf->GetY() + 2;
+					}
+				}
+			}
+		}
 
-        // If payment mode not forced or forced to VIR, show payment with BAN
-        if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'VIR')
-        {
+		// If payment mode not forced or forced to VIR, show payment with BAN
+		if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'VIR')
+		{
 			if ($object->fk_account > 0 || $object->fk_bank > 0 || !empty($conf->global->FACTURE_RIB_NUMBER))
 			{
 				$bankid = ($object->fk_account <= 0 ? $conf->global->FACTURE_RIB_NUMBER : $object->fk_account);
@@ -1065,7 +1065,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 
 				$posy += 2;
 			}
-        }
+		}
 
 		return $posy;
 	}
@@ -1100,7 +1100,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 		$pdf->SetFont('', '', $default_font_size - 1);
 
 		// Total table
-        $col1x = 120; $col2x = 170;
+		$col1x = 120; $col2x = 170;
 		if ($this->page_largeur < 210) // To work with US executive format
 		{
 			$col2x -= 20;
@@ -1161,7 +1161,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 						}
 					}
 				}
-	      		//}
+		  		//}
 				//Local tax 2 before VAT
 				//if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
 				//{
@@ -1252,7 +1252,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 						}
 					}
 				}
-	      		//}
+		  		//}
 				//Local tax 2 after VAT
 				//if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
 				//{
@@ -1303,8 +1303,8 @@ class pdf_eratosthene extends ModelePDFCommandes
 
 		$pdf->SetTextColor(0, 0, 0);
 
-        $creditnoteamount = 0;
-        $depositsamount = 0;
+		$creditnoteamount = 0;
+		$depositsamount = 0;
 		//$creditnoteamount=$object->getSumCreditNotesUsed();
 		//$depositsamount=$object->getSumDepositsUsed();
 		//print "x".$creditnoteamount."-".$depositsamount;exit;
@@ -1394,7 +1394,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 		$this->pdfTabTitles($pdf, $tab_top, $tab_height, $outputlangs, $hidetop);
 
 		if (empty($hidetop)) {
-		    $pdf->line($this->marge_gauche, $tab_top + $this->tabTitleHeight, $this->page_largeur - $this->marge_droite, $tab_top + $this->tabTitleHeight); // line takes a position y in 2nd parameter and 4th parameter
+			$pdf->line($this->marge_gauche, $tab_top + $this->tabTitleHeight, $this->page_largeur - $this->marge_droite, $tab_top + $this->tabTitleHeight); // line takes a position y in 2nd parameter and 4th parameter
 		}
 	}
 
@@ -1426,7 +1426,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 		// Show Draft Watermark
 		if ($object->statut == 0 && (!empty($conf->global->COMMANDE_DRAFT_WATERMARK)))
 		{
-            pdf_watermark($pdf, $outputlangs, $this->page_hauteur, $this->page_largeur, 'mm', $conf->global->COMMANDE_DRAFT_WATERMARK);
+			pdf_watermark($pdf, $outputlangs, $this->page_hauteur, $this->page_largeur, 'mm', $conf->global->COMMANDE_DRAFT_WATERMARK);
 		}
 
 		$pdf->SetTextColor(0, 0, 60);
@@ -1454,8 +1454,8 @@ class pdf_eratosthene extends ModelePDFCommandes
 				}
 				if (is_readable($logo))
 				{
-				    $height = pdf_getHeightForLogo($logo);
-				    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
+					$height = pdf_getHeightForLogo($logo);
+					$pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
 				} else {
 					$pdf->SetTextColor(200, 0, 0);
 					$pdf->SetFont('', 'B', $default_font_size - 2);
@@ -1533,16 +1533,16 @@ class pdf_eratosthene extends ModelePDFCommandes
 		// Get contact
 		if (!empty($conf->global->DOC_SHOW_FIRST_SALES_REP))
 		{
-		    $arrayidcontact = $object->getIdContact('internal', 'SALESREPFOLL');
-		    if (count($arrayidcontact) > 0)
-		    {
-                $usertmp = new User($this->db);
-		        $usertmp->fetch($arrayidcontact[0]);
-                $posy += 4;
-                $pdf->SetXY($posx, $posy);
-		        $pdf->SetTextColor(0, 0, 60);
-		        $pdf->MultiCell($w, 3, $langs->transnoentities("SalesRepresentative")." : ".$usertmp->getFullName($langs), '', 'R');
-		    }
+			$arrayidcontact = $object->getIdContact('internal', 'SALESREPFOLL');
+			if (count($arrayidcontact) > 0)
+			{
+				$usertmp = new User($this->db);
+				$usertmp->fetch($arrayidcontact[0]);
+				$posy += 4;
+				$pdf->SetXY($posx, $posy);
+				$pdf->SetTextColor(0, 0, 60);
+				$pdf->MultiCell($w, 3, $langs->transnoentities("SalesRepresentative")." : ".$usertmp->getFullName($langs), '', 'R');
+			}
 		}
 
 		$posy += 2;
@@ -1656,7 +1656,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 *   	Show footer of page. Need this->emetteur object
-     *
+	 *
 	 *   	@param	TCPDF		$pdf     			PDF
 	 * 		@param	Object		$object				Object to show
 	 *      @param	Translate	$outputlangs		Object lang for output
@@ -1683,23 +1683,23 @@ class pdf_eratosthene extends ModelePDFCommandes
 	 *      @param	int				$hideref		Do not show ref
 	 *      @return	null
 	 */
-    public function defineColumnField($object, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
-    {
-	    global $conf, $hookmanager;
+	public function defineColumnField($object, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
+	{
+		global $conf, $hookmanager;
 
-	    // Default field style for content
-	    $this->defaultContentsFieldsStyle = array(
-	        'align' => 'R', // R,C,L
-            'padding' => array(1, 0.5, 1, 0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
-	    );
+		// Default field style for content
+		$this->defaultContentsFieldsStyle = array(
+			'align' => 'R', // R,C,L
+			'padding' => array(1, 0.5, 1, 0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
+		);
 
-	    // Default field style for content
-	    $this->defaultTitlesFieldsStyle = array(
-	        'align' => 'C', // R,C,L
-	        'padding' => array(0.5, 0, 0.5, 0), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
-	    );
+		// Default field style for content
+		$this->defaultTitlesFieldsStyle = array(
+			'align' => 'C', // R,C,L
+			'padding' => array(0.5, 0, 0.5, 0), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
+		);
 
-	    /*
+		/*
 	     * For exemple
 	     $this->cols['theColKey'] = array(
 	     'rank' => $rank, // int : use for ordering columns
@@ -1717,157 +1717,157 @@ class pdf_eratosthene extends ModelePDFCommandes
 	     );
 	     */
 
-	    $rank = 0; // do not use negative rank
-	    $this->cols['desc'] = array(
-	        'rank' => $rank,
-	        'width' => false, // only for desc
-	        'status' => true,
-	        'title' => array(
-	            'textkey' => 'Designation', // use lang key is usefull in somme case with module
-	            'align' => 'L',
-	            // 'textkey' => 'yourLangKey', // if there is no label, yourLangKey will be translated to replace label
-	            // 'label' => ' ', // the final label
-                'padding' => array(0.5, 0.5, 0.5, 0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
-	        ),
-	        'content' => array(
-	            'align' => 'L',
-                'padding' => array(1, 0.5, 1, 1.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
-	        ),
-	    );
+		$rank = 0; // do not use negative rank
+		$this->cols['desc'] = array(
+			'rank' => $rank,
+			'width' => false, // only for desc
+			'status' => true,
+			'title' => array(
+				'textkey' => 'Designation', // use lang key is usefull in somme case with module
+				'align' => 'L',
+				// 'textkey' => 'yourLangKey', // if there is no label, yourLangKey will be translated to replace label
+				// 'label' => ' ', // the final label
+				'padding' => array(0.5, 0.5, 0.5, 0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
+			),
+			'content' => array(
+				'align' => 'L',
+				'padding' => array(1, 0.5, 1, 1.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
+			),
+		);
 
-	    // Image of product
-	    $rank = $rank + 10;
-	    $this->cols['photo'] = array(
-	        'rank' => $rank,
-	        'width' => (empty($conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH) ? 20 : $conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH), // in mm
-	        'status' => false,
-	        'title' => array(
-	            'textkey' => 'Photo',
-	            'label' => ' '
-	        ),
-	        'content' => array(
-	            'padding' => array(0, 0, 0, 0), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
-	        ),
-	        'border-left' => false, // remove left line separator
-	    );
+		// Image of product
+		$rank = $rank + 10;
+		$this->cols['photo'] = array(
+			'rank' => $rank,
+			'width' => (empty($conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH) ? 20 : $conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH), // in mm
+			'status' => false,
+			'title' => array(
+				'textkey' => 'Photo',
+				'label' => ' '
+			),
+			'content' => array(
+				'padding' => array(0, 0, 0, 0), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
+			),
+			'border-left' => false, // remove left line separator
+		);
 
-	    if (!empty($conf->global->MAIN_GENERATE_ORDERS_WITH_PICTURE))
-	    {
-	        $this->cols['photo']['status'] = true;
-	    }
+		if (!empty($conf->global->MAIN_GENERATE_ORDERS_WITH_PICTURE))
+		{
+			$this->cols['photo']['status'] = true;
+		}
 
 
-	    $rank = $rank + 10;
-	    $this->cols['vat'] = array(
-	        'rank' => $rank,
-	        'status' => false,
-	        'width' => 16, // in mm
-	        'title' => array(
-	            'textkey' => 'VAT'
-	        ),
-	        'border-left' => true, // add left line separator
-	    );
+		$rank = $rank + 10;
+		$this->cols['vat'] = array(
+			'rank' => $rank,
+			'status' => false,
+			'width' => 16, // in mm
+			'title' => array(
+				'textkey' => 'VAT'
+			),
+			'border-left' => true, // add left line separator
+		);
 
-	    if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) && empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN))
-	    {
-	        $this->cols['vat']['status'] = true;
-	    }
+		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) && empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN))
+		{
+			$this->cols['vat']['status'] = true;
+		}
 
-	    $rank = $rank + 10;
-	    $this->cols['subprice'] = array(
-	        'rank' => $rank,
-	        'width' => 19, // in mm
-	        'status' => true,
-	        'title' => array(
-	            'textkey' => 'PriceUHT'
-	        ),
-	        'border-left' => true, // add left line separator
-	    );
+		$rank = $rank + 10;
+		$this->cols['subprice'] = array(
+			'rank' => $rank,
+			'width' => 19, // in mm
+			'status' => true,
+			'title' => array(
+				'textkey' => 'PriceUHT'
+			),
+			'border-left' => true, // add left line separator
+		);
 
-	    $rank = $rank + 10;
-	    $this->cols['qty'] = array(
-	        'rank' => $rank,
-	        'width' => 16, // in mm
-	        'status' => true,
-	        'title' => array(
-	            'textkey' => 'Qty'
-	        ),
-	        'border-left' => true, // add left line separator
-	    );
+		$rank = $rank + 10;
+		$this->cols['qty'] = array(
+			'rank' => $rank,
+			'width' => 16, // in mm
+			'status' => true,
+			'title' => array(
+				'textkey' => 'Qty'
+			),
+			'border-left' => true, // add left line separator
+		);
 
-	    $rank = $rank + 10;
-	    $this->cols['unit'] = array(
-	        'rank' => $rank,
-	        'width' => 11, // in mm
-	        'status' => false,
-	        'title' => array(
-	            'textkey' => 'Unit'
-	        ),
-	        'border-left' => true, // add left line separator
-	    );
-	    if ($conf->global->PRODUCT_USE_UNITS) {
-	        $this->cols['unit']['status'] = true;
-	    }
+		$rank = $rank + 10;
+		$this->cols['unit'] = array(
+			'rank' => $rank,
+			'width' => 11, // in mm
+			'status' => false,
+			'title' => array(
+				'textkey' => 'Unit'
+			),
+			'border-left' => true, // add left line separator
+		);
+		if ($conf->global->PRODUCT_USE_UNITS) {
+			$this->cols['unit']['status'] = true;
+		}
 
-	    $rank = $rank + 10;
-	    $this->cols['discount'] = array(
-	        'rank' => $rank,
-	        'width' => 13, // in mm
-	        'status' => false,
-	        'title' => array(
-	            'textkey' => 'ReductionShort'
-	        ),
-	        'border-left' => true, // add left line separator
-	    );
-	    if ($this->atleastonediscount) {
-	        $this->cols['discount']['status'] = true;
-	    }
+		$rank = $rank + 10;
+		$this->cols['discount'] = array(
+			'rank' => $rank,
+			'width' => 13, // in mm
+			'status' => false,
+			'title' => array(
+				'textkey' => 'ReductionShort'
+			),
+			'border-left' => true, // add left line separator
+		);
+		if ($this->atleastonediscount) {
+			$this->cols['discount']['status'] = true;
+		}
 
-	    $rank = $rank + 1000; // add a big offset to be sure is the last col because default extrafield rank is 100
-	    $this->cols['totalexcltax'] = array(
-	        'rank' => $rank,
-	        'width' => 26, // in mm
-	    	'status' => empty($conf->global->PDF_PROPAL_HIDE_PRICE_EXCL_TAX) ? true : false,
-	        'title' => array(
-	            'textkey' => 'TotalHT'
-	        ),
-	        'border-left' => true, // add left line separator
-	    );
+		$rank = $rank + 1000; // add a big offset to be sure is the last col because default extrafield rank is 100
+		$this->cols['totalexcltax'] = array(
+			'rank' => $rank,
+			'width' => 26, // in mm
+			'status' => empty($conf->global->PDF_PROPAL_HIDE_PRICE_EXCL_TAX) ? true : false,
+			'title' => array(
+				'textkey' => 'TotalHT'
+			),
+			'border-left' => true, // add left line separator
+		);
 
-	    $rank = $rank + 1010; // add a big offset to be sure is the last col because default extrafield rank is 100
-	    $this->cols['totalincltax'] = array(
-	    	'rank' => $rank,
-	    	'width' => 26, // in mm
-	    	'status' => empty($conf->global->PDF_PROPAL_SHOW_PRICE_INCL_TAX) ? false : true,
-	    	'title' => array(
-	    		'textkey' => 'TotalTTC'
-	    	),
-	    	'border-left' => true, // add left line separator
-	    );
+		$rank = $rank + 1010; // add a big offset to be sure is the last col because default extrafield rank is 100
+		$this->cols['totalincltax'] = array(
+			'rank' => $rank,
+			'width' => 26, // in mm
+			'status' => empty($conf->global->PDF_PROPAL_SHOW_PRICE_INCL_TAX) ? false : true,
+			'title' => array(
+				'textkey' => 'TotalTTC'
+			),
+			'border-left' => true, // add left line separator
+		);
 
-	    // Add extrafields cols
-        if (!empty($object->lines)) {
-            $line = reset($object->lines);
-            $this->defineColumnExtrafield($line, $outputlangs, $hidedetails);
-        }
+		// Add extrafields cols
+		if (!empty($object->lines)) {
+			$line = reset($object->lines);
+			$this->defineColumnExtrafield($line, $outputlangs, $hidedetails);
+		}
 
-	    $parameters = array(
-	        'object' => $object,
-	        'outputlangs' => $outputlangs,
-	        'hidedetails' => $hidedetails,
-	        'hidedesc' => $hidedesc,
-	        'hideref' => $hideref
-	    );
+		$parameters = array(
+			'object' => $object,
+			'outputlangs' => $outputlangs,
+			'hidedetails' => $hidedetails,
+			'hidedesc' => $hidedesc,
+			'hideref' => $hideref
+		);
 
-	    $reshook = $hookmanager->executeHooks('defineColumnField', $parameters, $this); // Note that $object may have been modified by hook
-	    if ($reshook < 0)
-	    {
-	        setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-	    } elseif (empty($reshook))
-	    {
-	        $this->cols = array_replace($this->cols, $hookmanager->resArray); // array_replace is used to preserve keys
-	    } else {
-	        $this->cols = $hookmanager->resArray;
-	    }
-    }
+		$reshook = $hookmanager->executeHooks('defineColumnField', $parameters, $this); // Note that $object may have been modified by hook
+		if ($reshook < 0)
+		{
+			setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+		} elseif (empty($reshook))
+		{
+			$this->cols = array_replace($this->cols, $hookmanager->resArray); // array_replace is used to preserve keys
+		} else {
+			$this->cols = $hookmanager->resArray;
+		}
+	}
 }
diff --git a/htdocs/core/modules/commande/mod_commande_saphir.php b/htdocs/core/modules/commande/mod_commande_saphir.php
index 12b8fc604f6..7d99facd7d3 100644
--- a/htdocs/core/modules/commande/mod_commande_saphir.php
+++ b/htdocs/core/modules/commande/mod_commande_saphir.php
@@ -35,9 +35,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/commande/modules_commande.php';
 class mod_commande_saphir extends ModeleNumRefCommandes
 {
 	/**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
 	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 
 	/**
@@ -51,14 +51,14 @@ class mod_commande_saphir extends ModeleNumRefCommandes
 	public $name = 'Saphir';
 
 
-    /**
-     *  Returns the description of the numbering model
-     *
-     *  @return     string      Texte descripif
-     */
-    public function info()
-    {
-    	global $conf, $langs, $db;
+	/**
+	 *  Returns the description of the numbering model
+	 *
+	 *  @return     string      Texte descripif
+	 */
+	public function info()
+	{
+		global $conf, $langs, $db;
 
 		$langs->load("bills");
 
@@ -89,22 +89,22 @@ class mod_commande_saphir extends ModeleNumRefCommandes
 		$texte .= '</form>';
 
 		return $texte;
-    }
+	}
 
-    /**
-     *  Return an example of numbering
-     *
-     *  @return     string      Example
-     */
-    public function getExample()
-    {
-     	global $conf, $langs, $mysoc;
+	/**
+	 *  Return an example of numbering
+	 *
+	 *  @return     string      Example
+	 */
+	public function getExample()
+	{
+	 	global $conf, $langs, $mysoc;
 
-    	$old_code_client = $mysoc->code_client;
-    	$old_code_type = $mysoc->typent_code;
-    	$mysoc->code_client = 'CCCCCCCCCC';
-    	$mysoc->typent_code = 'TTTTTTTTTT';
-     	$numExample = $this->getNextValue($mysoc, '');
+		$old_code_client = $mysoc->code_client;
+		$old_code_type = $mysoc->typent_code;
+		$mysoc->code_client = 'CCCCCCCCCC';
+		$mysoc->typent_code = 'TTTTTTTTTT';
+	 	$numExample = $this->getNextValue($mysoc, '');
 		$mysoc->code_client = $old_code_client;
 		$mysoc->typent_code = $old_code_type;
 
@@ -113,7 +113,7 @@ class mod_commande_saphir extends ModeleNumRefCommandes
 			$numExample = $langs->trans('NotConfigured');
 		}
 		return $numExample;
-    }
+	}
 
 	/**
 	 * 	Return next free value
@@ -122,8 +122,8 @@ class mod_commande_saphir extends ModeleNumRefCommandes
 	 *  @param  Object		$object		Object we need next value for
 	 *  @return string      			Value if KO, <0 if KO
 	 */
-    public function getNextValue($objsoc, $object)
-    {
+	public function getNextValue($objsoc, $object)
+	{
 		global $db, $conf;
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
@@ -148,17 +148,17 @@ class mod_commande_saphir extends ModeleNumRefCommandes
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return next free value
 	 *
 	 *  @param	Societe		$objsoc     Object third party
 	 *  @param	string		$objforref	Object for number to search
 	 *  @return string      			Next free value
-     */
-    public function commande_get_num($objsoc, $objforref)
-    {
-        // phpcs:enable
-        return $this->getNextValue($objsoc, $objforref);
-    }
+	 */
+	public function commande_get_num($objsoc, $objforref)
+	{
+		// phpcs:enable
+		return $this->getNextValue($objsoc, $objforref);
+	}
 }
diff --git a/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php b/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php
index 8f707493474..7a0b1f91109 100644
--- a/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php
+++ b/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php
@@ -45,15 +45,15 @@ class doc_generic_contract_odt extends ModelePDFContract
 	public $emetteur;
 
 	/**
-     * @var array Minimum version of PHP required by module.
-     * e.g.: PHP ≥ 5.6 = array(5, 6)
-     */
+	 * @var array Minimum version of PHP required by module.
+	 * e.g.: PHP ≥ 5.6 = array(5, 6)
+	 */
 	public $phpmin = array(5, 6);
 
 	/**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
 	public $version = 'dolibarr';
 
 
@@ -67,7 +67,7 @@ class doc_generic_contract_odt extends ModelePDFContract
 		global $conf, $langs, $mysoc;
 
 		// Load translation files required by the page
-        $langs->loadLangs(array("main", "companies"));
+		$langs->loadLangs(array("main", "companies"));
 
 		$this->db = $db;
 		$this->name = "ODT templates";
@@ -112,7 +112,7 @@ class doc_generic_contract_odt extends ModelePDFContract
 		global $conf, $langs;
 
 		// Load translation files required by the page
-        $langs->loadLangs(array('companies', 'errors'));
+		$langs->loadLangs(array('companies', 'errors'));
 
 		$form = new Form($this->db);
 
@@ -165,7 +165,7 @@ class doc_generic_contract_odt extends ModelePDFContract
 		$texte .= '<div>'.$langs->trans("UploadNewTemplate").' <input type="file" name="uploadfile">';
 		$texte .= '<input type="hidden" value="CONTRACT_ADDON_PDF_ODT_PATH" name="keyforuploaddir">';
 		$texte .= '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Upload")).'" name="upload">';
-        $texte .= '</div>';
+		$texte .= '</div>';
 
 		$texte .= '</td>';
 
@@ -180,7 +180,7 @@ class doc_generic_contract_odt extends ModelePDFContract
 		return $texte;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Function to build a document on disk using the generic odt module.
 	 *
@@ -194,7 +194,7 @@ class doc_generic_contract_odt extends ModelePDFContract
 	 */
 	public function write_file($object, $outputlangs, $srctemplatepath, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $user, $langs, $conf, $mysoc, $hookmanager;
 
 		if (empty($srctemplatepath))
@@ -234,6 +234,8 @@ class doc_generic_contract_odt extends ModelePDFContract
 				}
 			}
 
+			$object->fetch_thirdparty();
+
 			$dir = $conf->contrat->dir_output;
 			$objectref = dol_sanitizeFileName($object->ref);
 			if (!preg_match('/specimen/i', $objectref)) $dir .= "/".$objectref;
@@ -262,8 +264,8 @@ class doc_generic_contract_odt extends ModelePDFContract
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
 				if (!empty($conf->global->MAIN_DOC_USE_TIMING))
 				{
-				    $format = $conf->global->MAIN_DOC_USE_TIMING;
-				    if ($format == '1') $format = '%Y%m%d%H%M%S';
+					$format = $conf->global->MAIN_DOC_USE_TIMING;
+					if ($format == '1') $format = '%Y%m%d%H%M%S';
 					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
 				} else {
 					$filename = $newfiletmp.'.'.$newfileformat;
@@ -288,15 +290,15 @@ class doc_generic_contract_odt extends ModelePDFContract
 
 				// Recipient name
 				$contactobject = null;
-                if (!empty($usecontact)) {
-                    // On peut utiliser le nom de la societe du contact
-                    if (!empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) {
-                        $socobject = $object->contact;
-                    } else {
-                        $socobject = $object->thirdparty;
-                        // if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
-                        $contactobject = $object->contact;
-                    }
+				if (!empty($usecontact)) {
+					// On peut utiliser le nom de la societe du contact
+					if (!empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) {
+						$socobject = $object->contact;
+					} else {
+						$socobject = $object->thirdparty;
+						// if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
+						$contactobject = $object->contact;
+					}
 				} else {
 					$socobject = $object->thirdparty;
 				}
@@ -337,7 +339,7 @@ class doc_generic_contract_odt extends ModelePDFContract
 				// Open and load template
 				require_once ODTPHP_PATH.'odf.php';
 				try {
-                    $odfHandler = new odf(
+					$odfHandler = new odf(
 						$srctemplatepath,
 						array(
 						'PATH_TO_TMP'	  => $conf->contrat->dir_temp,
@@ -380,7 +382,7 @@ class doc_generic_contract_odt extends ModelePDFContract
 						}
 					} catch (OdfException $e)
 					{
-                        dol_syslog($e->getMessage(), LOG_INFO);
+						dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
 
@@ -437,7 +439,7 @@ class doc_generic_contract_odt extends ModelePDFContract
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
 					} catch (OdfException $e)
 					{
-                        dol_syslog($e->getMessage(), LOG_INFO);
+						dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
 
@@ -455,7 +457,7 @@ class doc_generic_contract_odt extends ModelePDFContract
 					}
 				} else {
 					try {
-					    $odfHandler->saveToDisk($file);
+						$odfHandler->saveToDisk($file);
 					} catch (Exception $e) {
 						$this->error = $e->getMessage();
 						return -1;
diff --git a/htdocs/core/modules/contract/mod_contract_magre.php b/htdocs/core/modules/contract/mod_contract_magre.php
index b9bfa0a35d6..226efa0c99e 100644
--- a/htdocs/core/modules/contract/mod_contract_magre.php
+++ b/htdocs/core/modules/contract/mod_contract_magre.php
@@ -31,9 +31,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/contract/modules_contract.php';
 class mod_contract_magre extends ModelNumRefContracts
 {
 	/**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
 	public $version = 'dolibarr';
 
 	/**
@@ -63,9 +63,9 @@ class mod_contract_magre extends ModelNumRefContracts
 	 *
 	 *	@return     string      text description
 	 */
-    public function info()
-    {
-    	global $conf, $langs, $db;
+	public function info()
+	{
+		global $conf, $langs, $db;
 
 		$langs->load("bills");
 
@@ -92,20 +92,20 @@ class mod_contract_magre extends ModelNumRefContracts
 		$texte .= '</form>';
 
 		return $texte;
-    }
+	}
 
 	/**
 	 *	Return numbering example
 	 *
 	 *	@return     string      Example
 	 */
-    public function getExample()
-    {
-     	global $conf, $langs, $mysoc;
+	public function getExample()
+	{
+	 	global $conf, $langs, $mysoc;
 
-    	$old_code_client = $mysoc->code_client;
-    	$mysoc->code_client = 'CCCCCCCCCC';
-     	$numExample = $this->getNextValue($mysoc, '');
+		$old_code_client = $mysoc->code_client;
+		$mysoc->code_client = 'CCCCCCCCCC';
+	 	$numExample = $this->getNextValue($mysoc, '');
 		$mysoc->code_client = $old_code_client;
 
 		if (!$numExample)
@@ -113,7 +113,7 @@ class mod_contract_magre extends ModelNumRefContracts
 			$numExample = $langs->trans('NotConfigured');
 		}
 		return $numExample;
-    }
+	}
 
 	/**
 	 *	Return next value
@@ -122,8 +122,8 @@ class mod_contract_magre extends ModelNumRefContracts
 	 *	@param	Object		$contract	contract object
 	 *	@return string      			Value if OK, 0 if KO
 	 */
-    public function getNextValue($objsoc, $contract)
-    {
+	public function getNextValue($objsoc, $contract)
+	{
 		global $db, $conf;
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
@@ -141,17 +141,17 @@ class mod_contract_magre extends ModelNumRefContracts
 		return  $numFinal;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return next value
 	 *
 	 *  @param	Societe		$objsoc     third party object
 	 *  @param	Object		$objforref	contract object
 	 *  @return string      			Value if OK, 0 if KO
-     */
-    public function contract_get_num($objsoc, $objforref)
-    {
-        // phpcs:enable
-        return $this->getNextValue($objsoc, $objforref);
-    }
+	 */
+	public function contract_get_num($objsoc, $objforref)
+	{
+		// phpcs:enable
+		return $this->getNextValue($objsoc, $objforref);
+	}
 }
diff --git a/htdocs/core/modules/contract/mod_contract_olive.php b/htdocs/core/modules/contract/mod_contract_olive.php
index ebb8cbf610e..0c49c63ab4a 100644
--- a/htdocs/core/modules/contract/mod_contract_olive.php
+++ b/htdocs/core/modules/contract/mod_contract_olive.php
@@ -32,7 +32,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/contract/modules_contract.php';
  */
 class mod_contract_olive extends ModelNumRefContracts
 {
-    /**
+	/**
 	 * @var string Nom du modele
 	 * @deprecated
 	 * @see $name
@@ -53,9 +53,9 @@ class mod_contract_olive extends ModelNumRefContracts
 	public $code_null = 1; // Code facultatif
 
 	/**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
 	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 
 	/**
diff --git a/htdocs/core/modules/contract/mod_contract_serpis.php b/htdocs/core/modules/contract/mod_contract_serpis.php
index b503712c58f..de54fff3d76 100644
--- a/htdocs/core/modules/contract/mod_contract_serpis.php
+++ b/htdocs/core/modules/contract/mod_contract_serpis.php
@@ -29,9 +29,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/contract/modules_contract.php';
 class mod_contract_serpis extends ModelNumRefContracts
 {
 	/**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
 	public $version = 'dolibarr';
 
 	public $prefix = 'CT';
@@ -64,11 +64,11 @@ class mod_contract_serpis extends ModelNumRefContracts
 	 *
 	 *	@return     string      text description
 	 */
-    public function info()
-    {
-    	global $langs;
-      	return $langs->trans("SimpleNumRefModelDesc", $this->prefix);
-    }
+	public function info()
+	{
+		global $langs;
+	  	return $langs->trans("SimpleNumRefModelDesc", $this->prefix);
+	}
 
 
 	/**
@@ -154,7 +154,7 @@ class mod_contract_serpis extends ModelNumRefContracts
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Return next value
 	 *
@@ -164,7 +164,7 @@ class mod_contract_serpis extends ModelNumRefContracts
 	 */
 	public function contract_get_num($objsoc, $objforref)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		return $this->getNextValue($objsoc, $objforref);
 	}
 }
diff --git a/htdocs/core/modules/contract/modules_contract.php b/htdocs/core/modules/contract/modules_contract.php
index 641dc56f61a..c259c247304 100644
--- a/htdocs/core/modules/contract/modules_contract.php
+++ b/htdocs/core/modules/contract/modules_contract.php
@@ -43,17 +43,17 @@ abstract class ModelePDFContract extends CommonDocGenerator
 	public $error = '';
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Return list of active generation modules
 	 *
-     *  @param	DoliDB	$db     			Database handler
-     *  @param  integer	$maxfilenamelength  Max length of value to show
-     *  @return	array						List of templates
+	 *  @param	DoliDB	$db     			Database handler
+	 *  @param  integer	$maxfilenamelength  Max length of value to show
+	 *  @return	array						List of templates
 	 */
-    public static function liste_modeles($db, $maxfilenamelength = 0)
+	public static function liste_modeles($db, $maxfilenamelength = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 		$type = 'contract';
diff --git a/htdocs/core/modules/delivery/doc/pdf_storm.modules.php b/htdocs/core/modules/delivery/doc/pdf_storm.modules.php
index 7de29cce294..08c354562c8 100644
--- a/htdocs/core/modules/delivery/doc/pdf_storm.modules.php
+++ b/htdocs/core/modules/delivery/doc/pdf_storm.modules.php
@@ -219,32 +219,32 @@ class pdf_storm extends ModelePDFDeliveryOrder
 
 
 				// Loop on each lines to detect if there is at least one image to show
-				$realpatharray=array();
+				$realpatharray = array();
 				$this->atleastonephoto = false;
-				if (! empty($conf->global->MAIN_GENERATE_DELIVERY_WITH_PICTURE))
+				if (!empty($conf->global->MAIN_GENERATE_DELIVERY_WITH_PICTURE))
 				{
 					$objphoto = new Product($this->db);
 
-					for ($i = 0 ; $i < $nblines ; $i++)
+					for ($i = 0; $i < $nblines; $i++)
 					{
 						if (empty($object->lines[$i]->fk_product)) continue;
 
 						$objphoto->fetch($object->lines[$i]->fk_product);
 
-						if (! empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))
+						if (!empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))
 						{
-							$pdir[0] = get_exdir($objphoto->id, 2, 0, 0, $objphoto, 'product') . $objphoto->id ."/photos/";
-							$pdir[1] = get_exdir(0, 0, 0, 0, $objphoto, 'product') . dol_sanitizeFileName($objphoto->ref).'/';
+							$pdir[0] = get_exdir($objphoto->id, 2, 0, 0, $objphoto, 'product').$objphoto->id."/photos/";
+							$pdir[1] = get_exdir(0, 0, 0, 0, $objphoto, 'product').dol_sanitizeFileName($objphoto->ref).'/';
 						}
 						else {
-							$pdir[0] = get_exdir(0, 0, 0, 0, $objphoto, 'product') . dol_sanitizeFileName($objphoto->ref).'/';				// default
-							$pdir[1] = get_exdir($objphoto->id, 2, 0, 0, $objphoto, 'product') . $objphoto->id ."/photos/";	// alternative
+							$pdir[0] = get_exdir(0, 0, 0, 0, $objphoto, 'product').dol_sanitizeFileName($objphoto->ref).'/'; // default
+							$pdir[1] = get_exdir($objphoto->id, 2, 0, 0, $objphoto, 'product').$objphoto->id."/photos/"; // alternative
 						}
 
 						$arephoto = false;
 						foreach ($pdir as $midir)
 						{
-							if (! $arephoto)
+							if (!$arephoto)
 							{
 								$dir = $conf->product->dir_output.'/'.$midir;
 
@@ -254,14 +254,14 @@ class pdf_storm extends ModelePDFDeliveryOrder
 									{
 										if ($obj['photo_vignette'])
 										{
-											$filename= $obj['photo_vignette'];
+											$filename = $obj['photo_vignette'];
 										}
 										else {
-											$filename=$obj['photo'];
+											$filename = $obj['photo'];
 										}
 									}
 									else {
-										$filename=$obj['photo'];
+										$filename = $obj['photo'];
 									}
 
 									$realpath = $dir.$filename;
@@ -271,7 +271,7 @@ class pdf_storm extends ModelePDFDeliveryOrder
 							}
 						}
 
-						if ($realpath && $arephoto) $realpatharray[$i]=$realpath;
+						if ($realpath && $arephoto) $realpatharray[$i] = $realpath;
 					}
 				}
 
@@ -413,7 +413,7 @@ class pdf_storm extends ModelePDFDeliveryOrder
 				for ($i = 0; $i < $nblines; $i++)
 				{
 					// Fetch optionals
-					if (empty($object->lines[$i]->array_options)){
+					if (empty($object->lines[$i]->array_options)) {
 						$object->lines[$i]->fetch_optionals();
 					}
 
@@ -422,8 +422,8 @@ class pdf_storm extends ModelePDFDeliveryOrder
 					$pdf->SetTextColor(0, 0, 0);
 
 					// Define size of image if we need it
-	                $imglinesize=array();
-	                if (! empty($realpatharray[$i])) $imglinesize=pdf_getSizeForImage($realpatharray[$i]);
+					$imglinesize = array();
+					if (!empty($realpatharray[$i])) $imglinesize = pdf_getSizeForImage($realpatharray[$i]);
 
 
 					$pdf->setTopMargin($tab_top_newpage);
@@ -435,17 +435,17 @@ class pdf_storm extends ModelePDFDeliveryOrder
 
 					$showpricebeforepagebreak = 1;
 
-					$posYAfterImage=0;
-					$posYAfterDescription=0;
+					$posYAfterImage = 0;
+					$posYAfterDescription = 0;
 					if ($this->getColumnStatus('photo'))
 					{
 						// We start with Photo of product line
-						if (isset($imglinesize['width']) && isset($imglinesize['height']) && ($curY + $imglinesize['height']) > ($this->page_hauteur-($heightforfooter+$heightforfreetext+$heightforinfotot)))	// If photo too high, we moved completely on new page
+						if (isset($imglinesize['width']) && isset($imglinesize['height']) && ($curY + $imglinesize['height']) > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot)))	// If photo too high, we moved completely on new page
 						{
 							$pdf->AddPage('', '', true);
-							if (! empty($tplidx)) $pdf->useTemplate($tplidx);
+							if (!empty($tplidx)) $pdf->useTemplate($tplidx);
 							//if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
-							$pdf->setPage($pageposbefore+1);
+							$pdf->setPage($pageposbefore + 1);
 
 							$curY = $tab_top_newpage;
 
@@ -458,9 +458,9 @@ class pdf_storm extends ModelePDFDeliveryOrder
 
 						if (!empty($this->cols['photo']) && isset($imglinesize['width']) && isset($imglinesize['height']))
 						{
-							$pdf->Image($realpatharray[$i], $this->getColumnContentXStart('photo'), $curY, $imglinesize['width'], $imglinesize['height'], '', '', '', 2, 300);	// Use 300 dpi
+							$pdf->Image($realpatharray[$i], $this->getColumnContentXStart('photo'), $curY, $imglinesize['width'], $imglinesize['height'], '', '', '', 2, 300); // Use 300 dpi
 							// $pdf->Image does not increase value return by getY, so we save it manually
-							$posYAfterImage=$curY+$imglinesize['height'];
+							$posYAfterImage = $curY + $imglinesize['height'];
 						}
 					}
 
@@ -499,7 +499,7 @@ class pdf_storm extends ModelePDFDeliveryOrder
 							$pdf->commitTransaction();
 						}
 
-						$posYAfterDescription=$pdf->GetY();
+						$posYAfterDescription = $pdf->GetY();
 					}
 
 					$nexY = $pdf->GetY();
@@ -708,20 +708,20 @@ class pdf_storm extends ModelePDFDeliveryOrder
 		if (empty($hidetop))
 		{
 			//$conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR='230,230,230';
-			if (! empty($conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR)) $pdf->Rect($this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_droite-$this->marge_gauche, 5, 'F', null, explode(',', $conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR));
+			if (!empty($conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR)) $pdf->Rect($this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_droite - $this->marge_gauche, 5, 'F', null, explode(',', $conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR));
 		}
 
 		$pdf->SetDrawColor(128, 128, 128);
 		$pdf->SetFont('', '', $default_font_size - 1);
 
 		// Output Rect
-		$this->printRect($pdf, $this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $tab_height, $hidetop, $hidebottom);	// Rect takes a length in 3rd parameter and 4th parameter
+		$this->printRect($pdf, $this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_gauche - $this->marge_droite, $tab_height, $hidetop, $hidebottom); // Rect takes a length in 3rd parameter and 4th parameter
 
 
 		$this->pdfTabTitles($pdf, $tab_top, $tab_height, $outputlangs, $hidetop);
 
-		if (empty($hidetop)){
-			$pdf->line($this->marge_gauche, $tab_top+$this->tabTitleHeight, $this->page_largeur-$this->marge_droite, $tab_top+$this->tabTitleHeight);	// line takes a position y in 2nd parameter and 4th parameter
+		if (empty($hidetop)) {
+			$pdf->line($this->marge_gauche, $tab_top + $this->tabTitleHeight, $this->page_largeur - $this->marge_droite, $tab_top + $this->tabTitleHeight); // line takes a position y in 2nd parameter and 4th parameter
 		}
 	}
 
diff --git a/htdocs/core/modules/delivery/mod_delivery_saphir.php b/htdocs/core/modules/delivery/mod_delivery_saphir.php
index 10a979d4ee2..df1a15598b1 100644
--- a/htdocs/core/modules/delivery/mod_delivery_saphir.php
+++ b/htdocs/core/modules/delivery/mod_delivery_saphir.php
@@ -32,9 +32,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/delivery/modules_delivery.php';
 class mod_delivery_saphir extends ModeleNumRefDeliveryOrder
 {
 	/**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
 	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 
 	/**
@@ -55,14 +55,14 @@ class mod_delivery_saphir extends ModeleNumRefDeliveryOrder
 	public $name = 'Saphir';
 
 
-    /**
-     *  Returns the description of the numbering model
-     *
-     *  @return     string      Texte descripif
-     */
-    public function info()
-    {
-    	global $conf, $langs, $db;
+	/**
+	 *  Returns the description of the numbering model
+	 *
+	 *  @return     string      Texte descripif
+	 */
+	public function info()
+	{
+		global $conf, $langs, $db;
 
 		$langs->load("bills");
 
@@ -93,28 +93,28 @@ class mod_delivery_saphir extends ModeleNumRefDeliveryOrder
 		$texte .= '</form>';
 
 		return $texte;
-    }
+	}
 
-    /**
-     *  Return an example of number
-     *
-     *  @return     string      Example
-     */
-    public function getExample()
-    {
-     	global $conf, $langs, $mysoc;
+	/**
+	 *  Return an example of number
+	 *
+	 *  @return     string      Example
+	 */
+	public function getExample()
+	{
+	 	global $conf, $langs, $mysoc;
 
-    	$old_code_client = $mysoc->code_client;
-    	$mysoc->code_client = 'CCCCCCCCCC';
+		$old_code_client = $mysoc->code_client;
+		$mysoc->code_client = 'CCCCCCCCCC';
 		$numExample = $this->getNextValue($mysoc, '');
-    	$mysoc->code_client = $old_code_client;
+		$mysoc->code_client = $old_code_client;
 
 		if (!$numExample)
 		{
 			$numExample = $langs->trans('NotConfigured');
 		}
 		return $numExample;
-    }
+	}
 
 
 	/**
@@ -124,8 +124,8 @@ class mod_delivery_saphir extends ModeleNumRefDeliveryOrder
 	 *  @param  Object		$object			Object delivery
 	 *  @return string      				Value if OK, 0 if KO
 	 */
-    public function getNextValue($objsoc, $object)
-    {
+	public function getNextValue($objsoc, $object)
+	{
 		global $db, $conf;
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
@@ -142,33 +142,33 @@ class mod_delivery_saphir extends ModeleNumRefDeliveryOrder
 		$numFinal = get_next_value($db, $mask, 'delivery', 'ref', '', $objsoc, $object->date_livraison);
 
 		return  $numFinal;
-    }
+	}
 
 
 	/**
 	 *  Return next free value
 	 *
-     *  @param	Societe		$objsoc     Object third party
+	 *  @param	Societe		$objsoc     Object third party
 	 * 	@param	string		$objforref	Object for number to search
-     *  @return string      			Next free value
-     */
-    public function getNumRef($objsoc, $objforref)
-    {
-        return $this->getNextValue($objsoc, $objforref);
-    }
+	 *  @return string      			Next free value
+	 */
+	public function getNumRef($objsoc, $objforref)
+	{
+		return $this->getNextValue($objsoc, $objforref);
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Return next free ref
-     *
-     *  @param	Societe		$objsoc      	Object thirdparty
-     *  @param  Object		$object			Objet livraison
-     *  @return string      				Texte descripif
-     */
-    public function delivery_get_num($objsoc = 0, $object = '')
-    {
-        // phpcs:enable
-        return $this->getNextValue($objsoc, $object);
-    }
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Return next free ref
+	 *
+	 *  @param	Societe		$objsoc      	Object thirdparty
+	 *  @param  Object		$object			Objet livraison
+	 *  @return string      				Texte descripif
+	 */
+	public function delivery_get_num($objsoc = 0, $object = '')
+	{
+		// phpcs:enable
+		return $this->getNextValue($objsoc, $object);
+	}
 }
diff --git a/htdocs/core/modules/dons/html_cerfafr.modules.php b/htdocs/core/modules/dons/html_cerfafr.modules.php
index a4ff4e43a2d..b3480297476 100644
--- a/htdocs/core/modules/dons/html_cerfafr.modules.php
+++ b/htdocs/core/modules/dons/html_cerfafr.modules.php
@@ -64,7 +64,7 @@ class html_cerfafr extends ModeleDon
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Write the object to document file to disk
 	 *
@@ -75,7 +75,7 @@ class html_cerfafr extends ModeleDon
 	 */
 	public function write_file($don, $outputlangs, $currency = '')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $user, $conf, $langs, $mysoc;
 
 		$now = dol_now();
@@ -303,67 +303,67 @@ class html_cerfafr extends ModeleDon
 				$prim[$i] = $chif[($unite[$i] + 10)];
 			} elseif ($dix[$i] == 2) {
 				if ($unite[$i] == 1) {
-                    $secon[$i] = 'vingt et';
-                    $prim[$i] = $chif[$unite[$i]];
+					$secon[$i] = 'vingt et';
+					$prim[$i] = $chif[$unite[$i]];
 				} else {
-                    $secon[$i] = 'vingt';
-                    $prim[$i] = $chif[$unite[$i]];
+					$secon[$i] = 'vingt';
+					$prim[$i] = $chif[$unite[$i]];
 				}
 			} elseif ($dix[$i] == 3) {
 				if ($unite[$i] == 1) {
-                    $secon[$i] = 'trente et';
-                    $prim[$i] = $chif[$unite[$i]];
+					$secon[$i] = 'trente et';
+					$prim[$i] = $chif[$unite[$i]];
 				} else {
-                    $secon[$i] = 'trente';
-                    $prim[$i] = $chif[$unite[$i]];
+					$secon[$i] = 'trente';
+					$prim[$i] = $chif[$unite[$i]];
 				}
 			} elseif ($dix[$i] == 4) {
 				if ($unite[$i] == 1) {
-                    $secon[$i] = 'quarante et';
-                    $prim[$i] = $chif[$unite[$i]];
+					$secon[$i] = 'quarante et';
+					$prim[$i] = $chif[$unite[$i]];
 				} else {
-                    $secon[$i] = 'quarante';
-                    $prim[$i] = $chif[$unite[$i]];
+					$secon[$i] = 'quarante';
+					$prim[$i] = $chif[$unite[$i]];
 				}
 			} elseif ($dix[$i] == 5) {
 				if ($unite[$i] == 1) {
-                    $secon[$i] = 'cinquante et';
-                    $prim[$i] = $chif[$unite[$i]];
+					$secon[$i] = 'cinquante et';
+					$prim[$i] = $chif[$unite[$i]];
 				} else {
-                    $secon[$i] = 'cinquante';
-                    $prim[$i] = $chif[$unite[$i]];
+					$secon[$i] = 'cinquante';
+					$prim[$i] = $chif[$unite[$i]];
 				}
 			} elseif ($dix[$i] == 6) {
 				if ($unite[$i] == 1) {
-                    $secon[$i] = 'soixante et';
-                    $prim[$i] = $chif[$unite[$i]];
+					$secon[$i] = 'soixante et';
+					$prim[$i] = $chif[$unite[$i]];
 				} else {
-                    $secon[$i] = 'soixante';
-                    $prim[$i] = $chif[$unite[$i]];
+					$secon[$i] = 'soixante';
+					$prim[$i] = $chif[$unite[$i]];
 				}
 			} elseif ($dix[$i] == 7) {
 				if ($unite[$i] == 1) {
-                    $secon[$i] = 'soixante et';
-                    $prim[$i] = $chif[$unite[$i] + 10];
+					$secon[$i] = 'soixante et';
+					$prim[$i] = $chif[$unite[$i] + 10];
 				} else {
-                    $secon[$i] = 'soixante';
-                    $prim[$i] = $chif[$unite[$i] + 10];
+					$secon[$i] = 'soixante';
+					$prim[$i] = $chif[$unite[$i] + 10];
 				}
 			} elseif ($dix[$i] == 8) {
 				if ($unite[$i] == 1) {
-                    $secon[$i] = 'quatre-vingts et';
-                    $prim[$i] = $chif[$unite[$i]];
+					$secon[$i] = 'quatre-vingts et';
+					$prim[$i] = $chif[$unite[$i]];
 				} else {
-                    $secon[$i] = 'quatre-vingt';
-                    $prim[$i] = $chif[$unite[$i]];
+					$secon[$i] = 'quatre-vingt';
+					$prim[$i] = $chif[$unite[$i]];
 				}
 			} elseif ($dix[$i] == 9) {
 				if ($unite[$i] == 1) {
-                    $secon[$i] = 'quatre-vingts et';
-                    $prim[$i] = $chif[$unite[$i] + 10];
+					$secon[$i] = 'quatre-vingts et';
+					$prim[$i] = $chif[$unite[$i] + 10];
 				} else {
-                    $secon[$i] = 'quatre-vingts';
-                    $prim[$i] = $chif[$unite[$i] + 10];
+					$secon[$i] = 'quatre-vingts';
+					$prim[$i] = $chif[$unite[$i] + 10];
 				}
 			}
 			if ($cent[$i] == 1) $trio[$i] = 'cent';
diff --git a/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php b/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
index 122a5abdc10..039ef128cd7 100644
--- a/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
+++ b/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
@@ -47,15 +47,15 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 	public $emetteur;
 
 	/**
-     * @var array Minimum version of PHP required by module.
-     * e.g.: PHP ≥ 5.6 = array(5, 6)
-     */
+	 * @var array Minimum version of PHP required by module.
+	 * e.g.: PHP ≥ 5.6 = array(5, 6)
+	 */
 	public $phpmin = array(5, 6);
 
 	/**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
 	public $version = 'dolibarr';
 
 
@@ -64,12 +64,12 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 	 *
 	 *  @param		DoliDB		$db      Database handler
 	 */
-    public function __construct($db)
+	public function __construct($db)
 	{
 		global $conf, $langs, $mysoc;
 
 		// Load translation files required by the page
-        $langs->loadLangs(array("main", "companies"));
+		$langs->loadLangs(array("main", "companies"));
 
 		$this->db = $db;
 		$this->name = "ODT templates";
@@ -109,12 +109,12 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 	 *	@param	Translate	$langs      Lang object to use for output
 	 *	@return string       			Description
 	 */
-    public function info($langs)
+	public function info($langs)
 	{
 		global $conf, $langs;
 
 		// Load translation files required by the page
-        $langs->loadLangs(array("errors", "companies"));
+		$langs->loadLangs(array("errors", "companies"));
 
 		$form = new Form($this->db);
 
@@ -172,15 +172,15 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
    			$texte .= '<div id="div_'.get_class($this).'" class="hidden">';
    			foreach ($listoffiles as $file)
    			{
-                $texte .= $file['name'].'<br>';
+				$texte .= $file['name'].'<br>';
    			}
    			$texte .= '</div>';
 		}
-        // Add input to upload a new template file.
-        $texte .= '<div>'.$langs->trans("UploadNewTemplate").' <input type="file" name="uploadfile">';
-        $texte .= '<input type="hidden" value="EXPEDITION_ADDON_PDF_ODT_PATH" name="keyforuploaddir">';
-        $texte .= '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Upload")).'" name="upload">';
-        $texte .= '</div>';
+		// Add input to upload a new template file.
+		$texte .= '<div>'.$langs->trans("UploadNewTemplate").' <input type="file" name="uploadfile">';
+		$texte .= '<input type="hidden" value="EXPEDITION_ADDON_PDF_ODT_PATH" name="keyforuploaddir">';
+		$texte .= '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Upload")).'" name="upload">';
+		$texte .= '</div>';
 		$texte .= '</td>';
 
 		$texte .= '<td rowspan="2" class="tdtop hideonsmartphone">';
@@ -194,7 +194,7 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 		return $texte;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Function to build a document on disk using the generic odt module.
 	 *
@@ -206,9 +206,9 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 	 *  @param		int			$hideref			Do not show ref
 	 *	@return		int         					1 if OK, <=0 if KO
 	 */
-    public function write_file($object, $outputlangs, $srctemplatepath, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
+	public function write_file($object, $outputlangs, $srctemplatepath, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $user, $langs, $conf, $mysoc, $hookmanager;
 
 		if (empty($srctemplatepath))
@@ -248,6 +248,8 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 				}
 			}
 
+			$object->fetch_thirdparty();
+
 			$dir = $conf->expedition->dir_output."/sending";
 			$objectref = dol_sanitizeFileName($object->ref);
 			if (!preg_match('/specimen/i', $objectref)) $dir .= "/".$objectref;
@@ -275,8 +277,8 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
 				if (!empty($conf->global->MAIN_DOC_USE_TIMING))
 				{
-				    $format = $conf->global->MAIN_DOC_USE_TIMING;
-				    if ($format == '1') $format = '%Y%m%d%H%M%S';
+					$format = $conf->global->MAIN_DOC_USE_TIMING;
+					if ($format == '1') $format = '%Y%m%d%H%M%S';
 					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
 				} else {
 					$filename = $newfiletmp.'.'.$newfileformat;
@@ -320,7 +322,7 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 					'__FROM_EMAIL__' => $this->emetteur->email,
 					'__TOTAL_TTC__' => $object->total_ttc,
 					'__TOTAL_HT__' => $object->total_ht,
-					'__TOTAL_VAT__' => $object->total_vat
+					'__TOTAL_VAT__' => $object->total_tva
 				);
 				complete_substitutions_array($substitutionarray, $langs, $object);
 				// Call the ODTSubstitution hook
@@ -338,7 +340,7 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 				// Open and load template
 				require_once ODTPHP_PATH.'odf.php';
 				try {
-                    $odfHandler = new odf(
+					$odfHandler = new odf(
 						$srctemplatepath,
 						array(
 						'PATH_TO_TMP'	  => $conf->expedition->dir_temp,
@@ -385,7 +387,7 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 						}
 					} catch (OdfException $e)
 					{
-                        dol_syslog($e->getMessage(), LOG_INFO);
+						dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
 				// Make substitutions into odt of mysoc
@@ -405,15 +407,15 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 						}
 					} catch (OdfException $e)
 					{
-                        dol_syslog($e->getMessage(), LOG_INFO);
+						dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
 				// Make substitutions into odt of thirdparty
-                if ($socobject->element == 'contact') {
-                    $tmparray = $this->get_substitutionarray_contact($socobject, $outputlangs);
-                } else {
-                    $tmparray = $this->get_substitutionarray_thirdparty($socobject, $outputlangs);
-                }
+				if ($socobject->element == 'contact') {
+					$tmparray = $this->get_substitutionarray_contact($socobject, $outputlangs);
+				} else {
+					$tmparray = $this->get_substitutionarray_thirdparty($socobject, $outputlangs);
+				}
 				foreach ($tmparray as $key=>$value)
 				{
 					try {
@@ -427,7 +429,7 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 						}
 					} catch (OdfException $e)
 					{
-                        dol_syslog($e->getMessage(), LOG_INFO);
+						dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
 
@@ -446,7 +448,7 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 							}
 						} catch (OdfException $e)
 						{
-                            dol_syslog($e->getMessage(), LOG_INFO);
+							dol_syslog($e->getMessage(), LOG_INFO);
 						}
 					}
 				}
@@ -470,7 +472,7 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 						}
 					} catch (OdfException $e)
 					{
-                        dol_syslog($e->getMessage(), LOG_INFO);
+						dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
 				// Replace tags of lines
@@ -524,7 +526,7 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
 					} catch (OdfException $e)
 					{
-                        dol_syslog($e->getMessage(), LOG_INFO);
+						dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
 
@@ -538,15 +540,15 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 						$odfHandler->exportAsAttachedPDF($file);
 					} catch (Exception $e) {
 						$this->error = $e->getMessage();
-                        dol_syslog($e->getMessage(), LOG_INFO);
+						dol_syslog($e->getMessage(), LOG_INFO);
 						return -1;
 					}
 				} else {
 					try {
-					    $odfHandler->saveToDisk($file);
+						$odfHandler->saveToDisk($file);
 					} catch (Exception $e) {
 						$this->error = $e->getMessage();
-                        dol_syslog($e->getMessage(), LOG_INFO);
+						dol_syslog($e->getMessage(), LOG_INFO);
 						return -1;
 					}
 				}
diff --git a/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php b/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
index b07ba46bf85..ac960635576 100644
--- a/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
@@ -191,12 +191,12 @@ class pdf_espadon extends ModelePdfExpedition
 				$objphoto = new Product($this->db);
 				$objphoto->fetch($object->lines[$i]->fk_product);
 
-				if (! empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))
+				if (!empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))
 				{
-					$pdir = get_exdir($object->lines[$i]->fk_product, 2, 0, 0, $objphoto, 'product') . $object->lines[$i]->fk_product ."/photos/";
+					$pdir = get_exdir($object->lines[$i]->fk_product, 2, 0, 0, $objphoto, 'product').$object->lines[$i]->fk_product."/photos/";
 					$dir = $conf->product->dir_output.'/'.$pdir;
 				} else {
-					$pdir = get_exdir(0, 2, 0, 0, $objphoto, 'product') . dol_sanitizeFileName($objphoto->ref).'/';
+					$pdir = get_exdir(0, 2, 0, 0, $objphoto, 'product').dol_sanitizeFileName($objphoto->ref).'/';
 					$dir = $conf->product->dir_output.'/'.$pdir;
 				}
 
diff --git a/htdocs/core/modules/expedition/mod_expedition_ribera.php b/htdocs/core/modules/expedition/mod_expedition_ribera.php
index c8f9b49e58d..6e13e4e3186 100644
--- a/htdocs/core/modules/expedition/mod_expedition_ribera.php
+++ b/htdocs/core/modules/expedition/mod_expedition_ribera.php
@@ -31,9 +31,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/expedition/modules_expedition.php'
 class mod_expedition_ribera extends ModelNumRefExpedition
 {
 	/**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
 	public $version = 'dolibarr';
 
 	/**
@@ -58,9 +58,9 @@ class mod_expedition_ribera extends ModelNumRefExpedition
 	 *
 	 *	@return     string      text description
 	 */
-    public function info()
-    {
-    	global $conf, $langs, $db;
+	public function info()
+	{
+		global $conf, $langs, $db;
 
 		$langs->load("bills");
 
@@ -87,22 +87,22 @@ class mod_expedition_ribera extends ModelNumRefExpedition
 		$texte .= '</form>';
 
 		return $texte;
-    }
+	}
 
 	/**
 	 *	Return numbering example
 	 *
 	 *	@return     string      Example
 	 */
-    public function getExample()
-    {
-     	global $conf, $langs, $mysoc;
+	public function getExample()
+	{
+	 	global $conf, $langs, $mysoc;
 
-    	$old_code_client = $mysoc->code_client;
-    	$old_code_type = $mysoc->typent_code;
-    	$mysoc->code_client = 'CCCCCCCCCC';
-    	$mysoc->typent_code = 'TTTTTTTTTT';
-     	$numExample = $this->getNextValue($mysoc, '');
+		$old_code_client = $mysoc->code_client;
+		$old_code_type = $mysoc->typent_code;
+		$mysoc->code_client = 'CCCCCCCCCC';
+		$mysoc->typent_code = 'TTTTTTTTTT';
+	 	$numExample = $this->getNextValue($mysoc, '');
 		$mysoc->code_client = $old_code_client;
 		$mysoc->typent_code = $old_code_type;
 
@@ -111,7 +111,7 @@ class mod_expedition_ribera extends ModelNumRefExpedition
 			$numExample = $langs->trans('NotConfigured');
 		}
 		return $numExample;
-    }
+	}
 
 	/**
 	 *	Return next value
@@ -120,8 +120,8 @@ class mod_expedition_ribera extends ModelNumRefExpedition
 	 *	@param	Object		$shipment	Shipment object
 	 *	@return string      			Value if OK, 0 if KO
 	 */
-    public function getNextValue($objsoc, $shipment)
-    {
+	public function getNextValue($objsoc, $shipment)
+	{
 		global $db, $conf;
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
@@ -141,7 +141,7 @@ class mod_expedition_ribera extends ModelNumRefExpedition
 		return  $numFinal;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return next free value
 	 *
@@ -149,9 +149,9 @@ class mod_expedition_ribera extends ModelNumRefExpedition
 	 *	@param	Object		$objforref	Shipment object
 	 *	@return string      			Next free value
 	 */
-    public function expedition_get_num($objsoc, $objforref)
-    {
-        // phpcs:enable
-        return $this->getNextValue($objsoc, $objforref);
-    }
+	public function expedition_get_num($objsoc, $objforref)
+	{
+		// phpcs:enable
+		return $this->getNextValue($objsoc, $objforref);
+	}
 }
diff --git a/htdocs/core/modules/expedition/mod_expedition_safor.php b/htdocs/core/modules/expedition/mod_expedition_safor.php
index e30ab1a9d8c..0edd59642c0 100644
--- a/htdocs/core/modules/expedition/mod_expedition_safor.php
+++ b/htdocs/core/modules/expedition/mod_expedition_safor.php
@@ -29,9 +29,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/expedition/modules_expedition.php'
 class mod_expedition_safor extends ModelNumRefExpedition
 {
 	/**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
 	public $version = 'dolibarr';
 
 	public $prefix = 'SH';
@@ -59,11 +59,11 @@ class mod_expedition_safor extends ModelNumRefExpedition
 	 *
 	 *	@return     string      text description
 	 */
-    public function info()
-    {
-    	global $langs;
-      	return $langs->trans("SimpleNumRefModelDesc", $this->prefix);
-    }
+	public function info()
+	{
+		global $langs;
+	  	return $langs->trans("SimpleNumRefModelDesc", $this->prefix);
+	}
 
 
 	/**
@@ -71,7 +71,7 @@ class mod_expedition_safor extends ModelNumRefExpedition
 	 *
 	 *	@return     string      Example
 	 */
-    public function getExample()
+	public function getExample()
 	{
 		return $this->prefix."0501-0001";
 	}
@@ -82,7 +82,7 @@ class mod_expedition_safor extends ModelNumRefExpedition
 	 *
 	 *	@return     boolean     false if conflit, true if ok
 	 */
-    public function canBeActivated()
+	public function canBeActivated()
 	{
 		global $conf, $langs, $db;
 
@@ -117,7 +117,7 @@ class mod_expedition_safor extends ModelNumRefExpedition
 	 *	@param	Object		$shipment	Shipment object
 	 *	@return string      			Value if OK, 0 if KO
 	 */
-    public function getNextValue($objsoc, $shipment)
+	public function getNextValue($objsoc, $shipment)
 	{
 		global $db, $conf;
 
@@ -148,7 +148,7 @@ class mod_expedition_safor extends ModelNumRefExpedition
 		return $this->prefix.$yymm."-".$num;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return next free value
 	 *
@@ -156,9 +156,9 @@ class mod_expedition_safor extends ModelNumRefExpedition
 	 *	@param	Object		$objforref	Shipment object
 	 *	@return string      			Next free value
 	 */
-    public function expedition_get_num($objsoc, $objforref)
+	public function expedition_get_num($objsoc, $objforref)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		return $this->getNextValue($objsoc, $objforref);
 	}
 }
diff --git a/htdocs/core/modules/expedition/modules_expedition.php b/htdocs/core/modules/expedition/modules_expedition.php
index ce9ce7c8aa1..4305f8336e7 100644
--- a/htdocs/core/modules/expedition/modules_expedition.php
+++ b/htdocs/core/modules/expedition/modules_expedition.php
@@ -36,23 +36,23 @@
  */
 abstract class ModelePdfExpedition extends CommonDocGenerator
 {
-    /**
+	/**
 	 * @var string Error code (or message)
 	 */
 	public $error = '';
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return list of active generation models
 	 *
-     *  @param	DoliDB	$db     			Database handler
-     *  @param  integer	$maxfilenamelength  Max length of value to show
-     *  @return	array						List of templates
+	 *  @param	DoliDB	$db     			Database handler
+	 *  @param  integer	$maxfilenamelength  Max length of value to show
+	 *  @return	array						List of templates
 	 */
 	public static function liste_modeles($db, $maxfilenamelength = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 		$type = 'shipping';
@@ -80,7 +80,7 @@ abstract class ModelNumRefExpedition
 	 *
 	 *  @return		boolean     true if model can be used
 	 */
-    public function isEnabled()
+	public function isEnabled()
 	{
 		return true;
 	}
@@ -90,7 +90,7 @@ abstract class ModelNumRefExpedition
 	 *
 	 *	@return     string      text description
 	 */
-    public function info()
+	public function info()
 	{
 		global $langs;
 		$langs->load("sendings");
@@ -102,7 +102,7 @@ abstract class ModelNumRefExpedition
 	 *
 	 *	@return     string      Example
 	 */
-    public function getExample()
+	public function getExample()
 	{
 		global $langs;
 		$langs->load("sendings");
@@ -114,7 +114,7 @@ abstract class ModelNumRefExpedition
 	 *
 	 *	@return     boolean     false if conflict, true if ok
 	 */
-    public function canBeActivated()
+	public function canBeActivated()
 	{
 		return true;
 	}
@@ -126,7 +126,7 @@ abstract class ModelNumRefExpedition
 	 *	@param	Object		$shipment	Shipment object
 	 *	@return	string					Value
 	 */
-    public function getNextValue($objsoc, $shipment)
+	public function getNextValue($objsoc, $shipment)
 	{
 		global $langs;
 		return $langs->trans("NotAvailable");
@@ -137,7 +137,7 @@ abstract class ModelNumRefExpedition
 	 *
 	 *	@return     string      Value
 	 */
-    public function getVersion()
+	public function getVersion()
 	{
 		global $langs;
 		$langs->load("admin");
diff --git a/htdocs/core/modules/expensereport/mod_expensereport_sand.php b/htdocs/core/modules/expensereport/mod_expensereport_sand.php
index 043f67cfb0f..4899383a97b 100644
--- a/htdocs/core/modules/expensereport/mod_expensereport_sand.php
+++ b/htdocs/core/modules/expensereport/mod_expensereport_sand.php
@@ -31,9 +31,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/expensereport/modules_expenserepor
 class mod_expensereport_sand extends ModeleNumRefExpenseReport
 {
 	/**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
 	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 
 	/**
@@ -54,14 +54,14 @@ class mod_expensereport_sand extends ModeleNumRefExpenseReport
 	public $name = 'Sand';
 
 
-    /**
-     *  Returns the description of the numbering model
-     *
-     *  @return     string      Texte descripif
-     */
-    public function info()
-    {
-    	global $db, $conf, $langs;
+	/**
+	 *  Returns the description of the numbering model
+	 *
+	 *  @return     string      Texte descripif
+	 */
+	public function info()
+	{
+		global $db, $conf, $langs;
 
 		$langs->load("bills");
 
@@ -92,39 +92,39 @@ class mod_expensereport_sand extends ModeleNumRefExpenseReport
 		$texte .= '</form>';
 
 		return $texte;
-    }
+	}
 
-    /**
-     *  Return an example of numbering
-     *
-     *  @return     string      Example
-     */
-    public function getExample()
-    {
-     	global $db, $conf, $langs, $user;
+	/**
+	 *  Return an example of numbering
+	 *
+	 *  @return     string      Example
+	 */
+	public function getExample()
+	{
+	 	global $db, $conf, $langs, $user;
 
-     	$exp = new ExpenseReport($db);
-     	$exp->initAsSpecimen();
-     	$exp->fk_user_author = $user->id;
+	 	$exp = new ExpenseReport($db);
+	 	$exp->initAsSpecimen();
+	 	$exp->fk_user_author = $user->id;
 
-     	$numExample = $this->getNextValue($exp);
+	 	$numExample = $this->getNextValue($exp);
 
 		if (!$numExample)
 		{
 			$numExample = $langs->trans('NotConfigured');
 		}
 		return $numExample;
-    }
+	}
 
-    /**
-     *  Return next free value
-     *
-     *  @param  Object      $object     Object we need next value for
-     *  @return string                  Value if KO, <0 if KO
-     */
-    public function getNextValue($object)
-    {
-        global $db, $conf;
+	/**
+	 *  Return next free value
+	 *
+	 *  @param  Object      $object     Object we need next value for
+	 *  @return string                  Value if KO, <0 if KO
+	 */
+	public function getNextValue($object)
+	{
+		global $db, $conf;
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
@@ -154,5 +154,5 @@ class mod_expensereport_sand extends ModeleNumRefExpenseReport
 		$numFinal = get_next_value($db, $mask, 'expensereport', 'ref', '', null, $date, 'next', true, $fuser);
 
 		return $numFinal;
-    }
+	}
 }
diff --git a/htdocs/core/modules/expensereport/modules_expensereport.php b/htdocs/core/modules/expensereport/modules_expensereport.php
index 40f33715c0f..12a6617cf72 100644
--- a/htdocs/core/modules/expensereport/modules_expensereport.php
+++ b/htdocs/core/modules/expensereport/modules_expensereport.php
@@ -29,17 +29,17 @@ abstract class ModeleExpenseReport extends CommonDocGenerator
 	public $error = '';
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return list of active models generation
-     *
-     *  @param	DoliDB	$db     			Database handler
-     *  @param  integer	$maxfilenamelength  Max length of value to show
-     *  @return	array						List of templates
-     */
+	 *
+	 *  @param	DoliDB	$db     			Database handler
+	 *  @param  integer	$maxfilenamelength  Max length of value to show
+	 *  @return	array						List of templates
+	 */
 	public static function liste_modeles($db, $maxfilenamelength = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 		$type = 'expensereport';
@@ -67,7 +67,7 @@ abstract class ModeleExpenseReport extends CommonDocGenerator
  */
 function expensereport_pdf_create(DoliDB $db, ExpenseReport $object, $message, $modele, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
 {
-    return $object->generateDocument($modele, $outputlangs, $hidedetails, $hidedesc, $hideref);
+	return $object->generateDocument($modele, $outputlangs, $hidedetails, $hidedesc, $hideref);
 }
 
 /**
@@ -87,7 +87,7 @@ abstract class ModeleNumRefExpenseReport
 	 *
 	 *	@return		boolean     true if model can be used
 	 */
-    public function isEnabled()
+	public function isEnabled()
 	{
 		return true;
 	}
@@ -97,7 +97,7 @@ abstract class ModeleNumRefExpenseReport
 	 *
 	 *	@return     string      Descriptive text
 	 */
-    public function info()
+	public function info()
 	{
 		global $langs;
 		$langs->load("orders");
@@ -109,7 +109,7 @@ abstract class ModeleNumRefExpenseReport
 	 *
 	 *	@return     string      Example
 	 */
-    public function getExample()
+	public function getExample()
 	{
 		global $langs;
 		$langs->load("trips");
@@ -121,7 +121,7 @@ abstract class ModeleNumRefExpenseReport
 	 *
 	 *	@return     boolean     false if conflict, true if ok
 	 */
-    public function canBeActivated()
+	public function canBeActivated()
 	{
 		return true;
 	}
@@ -132,26 +132,26 @@ abstract class ModeleNumRefExpenseReport
 	 *	@param	Object		$object		Object we need next value for
 	 *	@return	string      Value
 	 */
-    public function getNextValue($object)
+	public function getNextValue($object)
 	{
 		global $langs;
 		return $langs->trans("NotAvailable");
 	}
 
-    /**
-     *  Returns the version of the numbering module
-     *
-     *  @return     string      Value
-     */
-    public function getVersion()
-    {
-        global $langs;
-        $langs->load("admin");
+	/**
+	 *  Returns the version of the numbering module
+	 *
+	 *  @return     string      Value
+	 */
+	public function getVersion()
+	{
+		global $langs;
+		$langs->load("admin");
 
-        if ($this->version == 'development') return $langs->trans("VersionDevelopment");
-        elseif ($this->version == 'experimental') return $langs->trans("VersionExperimental");
-        elseif ($this->version == 'dolibarr') return DOL_VERSION;
-        elseif ($this->version) return $this->version;
-        else return $langs->trans("NotAvailable");
-    }
+		if ($this->version == 'development') return $langs->trans("VersionDevelopment");
+		elseif ($this->version == 'experimental') return $langs->trans("VersionExperimental");
+		elseif ($this->version == 'dolibarr') return DOL_VERSION;
+		elseif ($this->version) return $this->version;
+		else return $langs->trans("NotAvailable");
+	}
 }
diff --git a/htdocs/core/modules/export/export_csv.modules.php b/htdocs/core/modules/export/export_csv.modules.php
index f4691ceb611..364f8562eb2 100644
--- a/htdocs/core/modules/export/export_csv.modules.php
+++ b/htdocs/core/modules/export/export_csv.modules.php
@@ -37,16 +37,16 @@ class ExportCsv extends ModeleExports
 	public $id;
 
 	/**
-     * @var string export files label
-     */
-    public $label;
+	 * @var string export files label
+	 */
+	public $label;
 
 	public $extension;
 
 	/**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
 	public $version = 'dolibarr';
 
 	public $label_lib;
@@ -156,7 +156,7 @@ class ExportCsv extends ModeleExports
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Open output file
 	 *
@@ -166,7 +166,7 @@ class ExportCsv extends ModeleExports
 	 */
 	public function open_file($file, $outputlangs)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 
 		dol_syslog("ExportCsv::open_file file=".$file);
@@ -185,7 +185,7 @@ class ExportCsv extends ModeleExports
 		return $ret;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * 	Output header into file
 	 *
@@ -194,24 +194,24 @@ class ExportCsv extends ModeleExports
 	 */
 	public function write_header($outputlangs)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		return 0;
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * 	Output title line into file
 	 *
-     *  @param      array		$array_export_fields_label   	Array with list of label of fields
-     *  @param      array		$array_selected_sorted       	Array with list of field to export
-     *  @param      Translate	$outputlangs    				Object lang to translate values
-     *  @param		array		$array_types					Array with types of fields
+	 *  @param      array		$array_export_fields_label   	Array with list of label of fields
+	 *  @param      array		$array_selected_sorted       	Array with list of field to export
+	 *  @param      Translate	$outputlangs    				Object lang to translate values
+	 *  @param		array		$array_types					Array with types of fields
 	 * 	@return		int											<0 if KO, >0 if OK
 	 */
 	public function write_title($array_export_fields_label, $array_selected_sorted, $outputlangs, $array_types)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 		if (!empty($conf->global->EXPORT_CSV_FORCE_CHARSET))
@@ -233,19 +233,19 @@ class ExportCsv extends ModeleExports
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *	Output record line into file
-     *
-     *  @param     	array		$array_selected_sorted      Array with list of field to export
-     *  @param     	resource	$objp                       A record from a fetch with all fields from select
-     *  @param     	Translate	$outputlangs    			Object lang to translate values
-     *  @param		array		$array_types				Array with types of fields
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *	Output record line into file
+	 *
+	 *  @param     	array		$array_selected_sorted      Array with list of field to export
+	 *  @param     	resource	$objp                       A record from a fetch with all fields from select
+	 *  @param     	Translate	$outputlangs    			Object lang to translate values
+	 *  @param		array		$array_types				Array with types of fields
 	 * 	@return		int										<0 if KO, >0 if OK
 	 */
 	public function write_record($array_selected_sorted, $objp, $outputlangs, $array_types)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 		if (!empty($conf->global->EXPORT_CSV_FORCE_CHARSET))
@@ -288,7 +288,7 @@ class ExportCsv extends ModeleExports
 		return 0;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * 	Output footer into file
 	 *
@@ -297,11 +297,11 @@ class ExportCsv extends ModeleExports
 	 */
 	public function write_footer($outputlangs)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		return 0;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * 	Close file handle
 	 *
@@ -309,7 +309,7 @@ class ExportCsv extends ModeleExports
 	 */
 	public function close_file()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		fclose($this->handle);
 		return 0;
 	}
diff --git a/htdocs/core/modules/export/export_excel2007new.modules.php b/htdocs/core/modules/export/export_excel2007new.modules.php
index 4f7235f6843..7fa150a11db 100644
--- a/htdocs/core/modules/export/export_excel2007new.modules.php
+++ b/htdocs/core/modules/export/export_excel2007new.modules.php
@@ -39,17 +39,17 @@ class ExportExcel2007new extends ModeleExports
 	 */
 	public $id;
 
-    /**
-     * @var string Export Excel label
-     */
-    public $label;
+	/**
+	 * @var string Export Excel label
+	 */
+	public $label;
 
 	public $extension;
 
 	/**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
 	public $version = 'dolibarr';
 
 	public $label_lib;
@@ -66,7 +66,7 @@ class ExportExcel2007new extends ModeleExports
 
 	public $col;
 
-    public $file; // To save filename
+	public $file; // To save filename
 
 
 	/**
@@ -83,7 +83,7 @@ class ExportExcel2007new extends ModeleExports
 		$this->label = 'Excel 2007'; // Label of driver
 		$this->desc = $langs->trans('Excel2007FormatDesc');
 		$this->extension = 'xlsx'; // Extension for generated file by this driver
-        $this->picto = 'mime/xls'; // Picto
+		$this->picto = 'mime/xls'; // Picto
 		$this->version = '1.30'; // Driver version
 		$this->phpmin = array(5, 6); // Minimum version of PHP required by module
 
@@ -91,12 +91,12 @@ class ExportExcel2007new extends ModeleExports
 
 		if (empty($this->disabled))
 		{
-                //require_once PHPEXCEL_PATH.'PHPExcel.php';
-                //require_once PHPEXCEL_PATH.'PHPExcel/Style/Alignment.php';
-    		    //$this->label_lib='PhpExcel';
-    		    require_once PHPEXCELNEW_PATH.'Spreadsheet.php';
-    		    $this->label_lib = 'PhpSpreadSheet';
-                $this->version_lib = '1.6.0'; // No way to get info from library
+				//require_once PHPEXCEL_PATH.'PHPExcel.php';
+				//require_once PHPEXCEL_PATH.'PHPExcel/Style/Alignment.php';
+				//$this->label_lib='PhpExcel';
+				require_once PHPEXCELNEW_PATH.'Spreadsheet.php';
+				$this->label_lib = 'PhpSpreadSheet';
+				$this->version_lib = '1.6.0'; // No way to get info from library
 		}
 
 		$this->row = 0;
@@ -128,16 +128,16 @@ class ExportExcel2007new extends ModeleExports
 	 * @return string
 	 */
 	public function getDriverDesc()
-    {
-        return $this->desc;
-    }
+	{
+		return $this->desc;
+	}
 
 	/**
 	 * getDriverExtension
 	 *
 	 * @return string
 	 */
-    public function getDriverExtension()
+	public function getDriverExtension()
 	{
 		return $this->extension;
 	}
@@ -173,7 +173,7 @@ class ExportExcel2007new extends ModeleExports
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Open output file
 	 *
@@ -183,86 +183,86 @@ class ExportExcel2007new extends ModeleExports
 	 */
 	public function open_file($file, $outputlangs)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $user, $conf, $langs;
 
 		if (!empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
 		{
-		    $outputlangs->charset_output = 'ISO-8859-1'; // Because Excel 5 format is ISO
+			$outputlangs->charset_output = 'ISO-8859-1'; // Because Excel 5 format is ISO
 		}
 
 		dol_syslog(get_class($this)."::open_file file=".$file);
-        $this->file = $file;
+		$this->file = $file;
 
 		$ret = 1;
 
-    	$outputlangs->load("exports");
+		$outputlangs->load("exports");
 
-        //require_once PHPEXCEL_PATH.'PHPExcel.php';
-        //require_once PHPEXCEL_PATH.'PHPExcel/Style/Alignment.php';
-	    require_once DOL_DOCUMENT_ROOT.'/includes/phpoffice/autoloader.php';
-	    require_once DOL_DOCUMENT_ROOT.'/includes/Psr/autoloader.php';
-	    require_once PHPEXCELNEW_PATH.'Spreadsheet.php';
+		//require_once PHPEXCEL_PATH.'PHPExcel.php';
+		//require_once PHPEXCEL_PATH.'PHPExcel/Style/Alignment.php';
+		require_once DOL_DOCUMENT_ROOT.'/includes/phpoffice/autoloader.php';
+		require_once DOL_DOCUMENT_ROOT.'/includes/Psr/autoloader.php';
+		require_once PHPEXCELNEW_PATH.'Spreadsheet.php';
 
-	    if ($this->id == 'excel2007new')
-	    {
-            if (!class_exists('ZipArchive'))	// For Excel2007, PHPExcel need ZipArchive
-            {
-            	$langs->load("errors");
-            	$this->error = $langs->trans('ErrorPHPNeedModule', 'zip');
-            	return -1;
-            }
-	    }
+		if ($this->id == 'excel2007new')
+		{
+			if (!class_exists('ZipArchive'))	// For Excel2007, PHPExcel need ZipArchive
+			{
+				$langs->load("errors");
+				$this->error = $langs->trans('ErrorPHPNeedModule', 'zip');
+				return -1;
+			}
+		}
 
-        //$this->workbook = new PHPExcel();
-        $this->workbook = new Spreadsheet();
-        $this->workbook->getProperties()->setCreator($user->getFullName($outputlangs).' - '.DOL_APPLICATION_TITLE.' '.DOL_VERSION);
-        //$this->workbook->getProperties()->setLastModifiedBy('Dolibarr '.DOL_VERSION);
-        $this->workbook->getProperties()->setTitle(basename($file));
-        $this->workbook->getProperties()->setSubject(basename($file));
-        $this->workbook->getProperties()->setDescription(DOL_APPLICATION_TITLE.' '.DOL_VERSION);
+		//$this->workbook = new PHPExcel();
+		$this->workbook = new Spreadsheet();
+		$this->workbook->getProperties()->setCreator($user->getFullName($outputlangs).' - '.DOL_APPLICATION_TITLE.' '.DOL_VERSION);
+		//$this->workbook->getProperties()->setLastModifiedBy('Dolibarr '.DOL_VERSION);
+		$this->workbook->getProperties()->setTitle(basename($file));
+		$this->workbook->getProperties()->setSubject(basename($file));
+		$this->workbook->getProperties()->setDescription(DOL_APPLICATION_TITLE.' '.DOL_VERSION);
 
-        $this->workbook->setActiveSheetIndex(0);
-        $this->workbook->getActiveSheet()->setTitle($outputlangs->trans("Sheet"));
-        $this->workbook->getActiveSheet()->getDefaultRowDimension()->setRowHeight(16);
+		$this->workbook->setActiveSheetIndex(0);
+		$this->workbook->getActiveSheet()->setTitle($outputlangs->trans("Sheet"));
+		$this->workbook->getActiveSheet()->getDefaultRowDimension()->setRowHeight(16);
 
 		return $ret;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Write header
 	 *
-     *  @param      Translate	$outputlangs        Object lang to translate values
+	 *  @param      Translate	$outputlangs        Object lang to translate values
 	 * 	@return		int								<0 if KO, >0 if OK
 	 */
 	public function write_header($outputlangs)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		//$outputlangs->charset_output='ISO-8859-1';	// Because Excel 5 format is ISO
 
 		return 0;
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-     *  Output title line into file
-     *
-     *  @param      array		$array_export_fields_label   	Array with list of label of fields
-     *  @param      array		$array_selected_sorted       	Array with list of field to export
-     *  @param      Translate	$outputlangs    				Object lang to translate values
-     *  @param		array		$array_types					Array with types of fields
+	 *  Output title line into file
+	 *
+	 *  @param      array		$array_export_fields_label   	Array with list of label of fields
+	 *  @param      array		$array_selected_sorted       	Array with list of field to export
+	 *  @param      Translate	$outputlangs    				Object lang to translate values
+	 *  @param		array		$array_types					Array with types of fields
 	 * 	@return		int											<0 if KO, >0 if OK
 	 */
 	public function write_title($array_export_fields_label, $array_selected_sorted, $outputlangs, $array_types)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 		// Create a format for the column headings
-        $this->workbook->getActiveSheet()->getStyle('1')->getFont()->setBold(true);
-        $this->workbook->getActiveSheet()->getStyle('1')->getAlignment()->setHorizontal(PhpOffice\PhpSpreadsheet\Style\Alignment::HORIZONTAL_LEFT);
+		$this->workbook->getActiveSheet()->getStyle('1')->getFont()->setBold(true);
+		$this->workbook->getActiveSheet()->getStyle('1')->getAlignment()->setHorizontal(PhpOffice\PhpSpreadsheet\Style\Alignment::HORIZONTAL_LEFT);
 
 		$this->col = 1;
 		if (!empty($conf->global->MAIN_USE_PHP_WRITEEXCEL)) {
@@ -270,38 +270,38 @@ class ExportExcel2007new extends ModeleExports
 		}
 		foreach ($array_selected_sorted as $code => $value)
 		{
-            $alias = $array_export_fields_label[$code];
+			$alias = $array_export_fields_label[$code];
 			//print "dd".$alias;
 			if (empty($alias)) dol_print_error('', 'Bad value for field with code='.$code.'. Try to redefine export.');
-    		if (!empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
-    		{
-    			$this->worksheet->write($this->row, $this->col, $outputlangs->transnoentities($alias), $formatheader);
-    		} else {
-                $this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row + 1, $outputlangs->transnoentities($alias));
-    		    if (!empty($array_types[$code]) && in_array($array_types[$code], array('Date', 'Numeric', 'TextAuto')))		// Set autowidth for some types
-                {
-                	$this->workbook->getActiveSheet()->getColumnDimension($this->column2Letter($this->col + 1))->setAutoSize(true);
-                }
-    		}
+			if (!empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
+			{
+				$this->worksheet->write($this->row, $this->col, $outputlangs->transnoentities($alias), $formatheader);
+			} else {
+				$this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row + 1, $outputlangs->transnoentities($alias));
+				if (!empty($array_types[$code]) && in_array($array_types[$code], array('Date', 'Numeric', 'TextAuto')))		// Set autowidth for some types
+				{
+					$this->workbook->getActiveSheet()->getColumnDimension($this->column2Letter($this->col + 1))->setAutoSize(true);
+				}
+			}
 			$this->col++;
 		}
 		$this->row++;
 		return 0;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-     *  Output record line into file
-     *
-     *  @param      array		$array_selected_sorted      Array with list of field to export
-     *  @param      resource	$objp                       A record from a fetch with all fields from select
-     *  @param      Translate	$outputlangs                Object lang to translate values
-     *  @param		array		$array_types				Array with types of fields
+	 *  Output record line into file
+	 *
+	 *  @param      array		$array_selected_sorted      Array with list of field to export
+	 *  @param      resource	$objp                       A record from a fetch with all fields from select
+	 *  @param      Translate	$outputlangs                Object lang to translate values
+	 *  @param		array		$array_types				Array with types of fields
 	 * 	@return		int										<0 if KO, >0 if OK
 	 */
 	public function write_record($array_selected_sorted, $objp, $outputlangs, $array_types)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 		// Define first row
@@ -316,8 +316,8 @@ class ExportExcel2007new extends ModeleExports
 		{
 			if (strpos($code, ' as ') == 0) $alias = str_replace(array('.', '-', '(', ')'), '_', $code);
 			else $alias = substr($code, strpos($code, ' as ') + 4);
-            if (empty($alias)) dol_print_error('', 'Bad value for field with code='.$code.'. Try to redefine export.');
-            $newvalue = $objp->$alias;
+			if (empty($alias)) dol_print_error('', 'Bad value for field with code='.$code.'. Try to redefine export.');
+			$newvalue = $objp->$alias;
 
 			$newvalue = $this->excel_clean($newvalue);
 			$typefield = isset($array_types[$code]) ? $array_types[$code] : '';
@@ -339,27 +339,27 @@ class ExportExcel2007new extends ModeleExports
 
 			if (preg_match('/^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$/i', $newvalue))
 			{
-        	    $newvalue = dol_stringtotime($newvalue);
-        	    $this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row + 1, \PhpOffice\PhpSpreadsheet\Shared\Date::PHPToExcel($newvalue));
-        	    $coord = $this->workbook->getActiveSheet()->getCellByColumnAndRow($this->col, $this->row + 1)->getCoordinate();
-        	    $this->workbook->getActiveSheet()->getStyle($coord)->getNumberFormat()->setFormatCode('yyyy-mm-dd');
+				$newvalue = dol_stringtotime($newvalue);
+				$this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row + 1, \PhpOffice\PhpSpreadsheet\Shared\Date::PHPToExcel($newvalue));
+				$coord = $this->workbook->getActiveSheet()->getCellByColumnAndRow($this->col, $this->row + 1)->getCoordinate();
+				$this->workbook->getActiveSheet()->getStyle($coord)->getNumberFormat()->setFormatCode('yyyy-mm-dd');
 			} elseif (preg_match('/^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9] [0-9][0-9]:[0-9][0-9]:[0-9][0-9]$/i', $newvalue))
 			{
-        	    $newvalue = dol_stringtotime($newvalue);
-        	    $this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row + 1, \PhpOffice\PhpSpreadsheet\Shared\Date::PHPToExcel($newvalue));
-        	    $coord = $this->workbook->getActiveSheet()->getCellByColumnAndRow($this->col, $this->row + 1)->getCoordinate();
-        	    $this->workbook->getActiveSheet()->getStyle($coord)->getNumberFormat()->setFormatCode('yyyy-mm-dd h:mm:ss');
+				$newvalue = dol_stringtotime($newvalue);
+				$this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row + 1, \PhpOffice\PhpSpreadsheet\Shared\Date::PHPToExcel($newvalue));
+				$coord = $this->workbook->getActiveSheet()->getCellByColumnAndRow($this->col, $this->row + 1)->getCoordinate();
+				$this->workbook->getActiveSheet()->getStyle($coord)->getNumberFormat()->setFormatCode('yyyy-mm-dd h:mm:ss');
 			} else {
-    	    	if ($typefield == 'Text' || $typefield == 'TextAuto')
-    	    	{
-    	    		//$this->workbook->getActiveSheet()->getCellByColumnAndRow($this->col, $this->row+1)->setValueExplicit($newvalue, PHPExcel_Cell_DataType::TYPE_STRING);
+				if ($typefield == 'Text' || $typefield == 'TextAuto')
+				{
+					//$this->workbook->getActiveSheet()->getCellByColumnAndRow($this->col, $this->row+1)->setValueExplicit($newvalue, PHPExcel_Cell_DataType::TYPE_STRING);
 					$this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row + 1, (string) $newvalue);
-    	    		$coord = $this->workbook->getActiveSheet()->getCellByColumnAndRow($this->col, $this->row + 1)->getCoordinate();
-    	    		$this->workbook->getActiveSheet()->getStyle($coord)->getNumberFormat()->setFormatCode('@');
-    	    		$this->workbook->getActiveSheet()->getStyle($coord)->getAlignment()->setHorizontal(PhpOffice\PhpSpreadsheet\Style\Alignment::HORIZONTAL_LEFT);
-    	    	} else {
-    	    		$this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row + 1, $newvalue);
-    	    	}
+					$coord = $this->workbook->getActiveSheet()->getCellByColumnAndRow($this->col, $this->row + 1)->getCoordinate();
+					$this->workbook->getActiveSheet()->getStyle($coord)->getNumberFormat()->setFormatCode('@');
+					$this->workbook->getActiveSheet()->getStyle($coord)->getAlignment()->setHorizontal(PhpOffice\PhpSpreadsheet\Style\Alignment::HORIZONTAL_LEFT);
+				} else {
+					$this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row + 1, $newvalue);
+				}
 			}
 			$this->col++;
 		}
@@ -368,77 +368,77 @@ class ExportExcel2007new extends ModeleExports
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-     *	Write footer
-     *
+	 *	Write footer
+	 *
 	 * 	@param		Translate	$outputlangs	Output language object
 	 * 	@return		int							<0 if KO, >0 if OK
-     */
+	 */
 	public function write_footer($outputlangs)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		return 0;
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *	Close Excel file
-     *
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *	Close Excel file
+	 *
 	 * 	@return		int							<0 if KO, >0 if OK
-     */
+	 */
 	public function close_file()
 	{
-        // phpcs:enable
-        global $conf;
+		// phpcs:enable
+		global $conf;
 
-        $objWriter = new Xlsx($this->workbook);
-        $objWriter->save($this->file);
-        $this->workbook->disconnectWorksheets();
-        unset($this->workbook);
+		$objWriter = new Xlsx($this->workbook);
+		$objWriter->save($this->file);
+		$this->workbook->disconnectWorksheets();
+		unset($this->workbook);
 
 		return 1;
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * Clean a cell to respect rules of Excel file cells
-     *
-     * @param 	string	$newvalue	String to clean
-     * @return 	string				Value cleaned
-     */
-    public function excel_clean($newvalue)
-    {
-        // phpcs:enable
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Clean a cell to respect rules of Excel file cells
+	 *
+	 * @param 	string	$newvalue	String to clean
+	 * @return 	string				Value cleaned
+	 */
+	public function excel_clean($newvalue)
+	{
+		// phpcs:enable
 		// Rule Dolibarr: No HTML
-    	$newvalue = dol_string_nohtmltag($newvalue);
+		$newvalue = dol_string_nohtmltag($newvalue);
 
-    	return $newvalue;
-    }
+		return $newvalue;
+	}
 
 
-    /**
-     * Convert a column to letter (1->A, 0->B, 27->AA, ...)
-     *
-     * @param 	int		$c		Column position
-     * @return 	string			Letter
-     */
-    public function column2Letter($c)
-    {
+	/**
+	 * Convert a column to letter (1->A, 0->B, 27->AA, ...)
+	 *
+	 * @param 	int		$c		Column position
+	 * @return 	string			Letter
+	 */
+	public function column2Letter($c)
+	{
 
-    	$c = intval($c);
-    	if ($c <= 0) return '';
+		$c = intval($c);
+		if ($c <= 0) return '';
 
-    	while ($c != 0) {
-    		$p = ($c - 1) % 26;
-    		$c = intval(($c - $p) / 26);
-    		$letter = chr(65 + $p).$letter;
-    	}
+		while ($c != 0) {
+			$p = ($c - 1) % 26;
+			$c = intval(($c - $p) / 26);
+			$letter = chr(65 + $p).$letter;
+		}
 
-    	return $letter;
-    }
+		return $letter;
+	}
 
 	/**
 	 * Set cell value and automatically merge if we give an endcell
@@ -453,12 +453,12 @@ class ExportExcel2007new extends ModeleExports
 		try {
 			$this->workbook->getActiveSheet()->setCellValue($startCell, $val);
 
-			if (! empty($endCell)) {
+			if (!empty($endCell)) {
 				$cellRange = $startCell.':'.$endCell;
 				$this->workbook->getActiveSheet()->mergeCells($startCell.':'.$endCell);
 			}
 			else $cellRange = $startCell;
-			if (! empty($this->styleArray)) $this->workbook->getActiveSheet()->getStyle($cellRange)->applyFromArray($this->styleArray);
+			if (!empty($this->styleArray)) $this->workbook->getActiveSheet()->getStyle($cellRange)->applyFromArray($this->styleArray);
 		}
 		catch (Exception $e) {
 			$this->error = $e->getMessage();
@@ -534,7 +534,7 @@ class ExportExcel2007new extends ModeleExports
 	public function setBlock($startCell, $TDatas = array(), $boldTitle = false)
 	{
 		try {
-			if (! empty($TDatas)) {
+			if (!empty($TDatas)) {
 				$startCell = $this->workbook->getActiveSheet()->getCell($startCell);
 				$startColumn = Coordinate::columnIndexFromString($startCell->getColumn());
 				$startRow = $startCell->getRow();
@@ -571,7 +571,7 @@ class ExportExcel2007new extends ModeleExports
 	public function setBlock2Columns($startCell, $TDatas = array(), $boldTitle = false)
 	{
 		try {
-			if (! empty($TDatas)) {
+			if (!empty($TDatas)) {
 				$startCell = $this->workbook->getActiveSheet()->getCell($startCell);
 				$startColumn = Coordinate::columnIndexFromString($startCell->getColumn());
 				$startRow = $startCell->getRow();
@@ -622,7 +622,7 @@ class ExportExcel2007new extends ModeleExports
 		try {
 			$startCell = $this->workbook->getActiveSheet()->getCell($startCell);
 			$startColumn = Coordinate::columnIndexFromString($startCell->getColumn());
-			if (! empty($offset)) $startColumn += $offset;
+			if (!empty($offset)) $startColumn += $offset;
 
 			$startRow = $startCell->getRow();
 			$startCell = $this->workbook->getActiveSheet()->getCellByColumnAndRow($startColumn, $startRow);
diff --git a/htdocs/core/modules/export/export_tsv.modules.php b/htdocs/core/modules/export/export_tsv.modules.php
index 873dd397b2e..90e478458f7 100644
--- a/htdocs/core/modules/export/export_tsv.modules.php
+++ b/htdocs/core/modules/export/export_tsv.modules.php
@@ -30,146 +30,146 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/export/modules_export.php';
  */
 class ExportTsv extends ModeleExports
 {
-    /**
+	/**
 	 * @var string ID
 	 */
 	public $id;
 
-    /**
-     * @var string label
-     */
-    public $label;
+	/**
+	 * @var string label
+	 */
+	public $label;
 
-    public $extension;
+	public $extension;
 
-    /**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	/**
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
 	public $version = 'dolibarr';
 
-    public $label_lib;
+	public $label_lib;
 
-    public $version_lib;
+	public $version_lib;
 
-    public $separator = "\t";
+	public $separator = "\t";
 
-    public $handle; // Handle fichier
+	public $handle; // Handle fichier
 
 
-    /**
-     *  Constructor
-     *
-     *  @param      DoliDB	$db      Database handler
-     */
-    public function __construct($db)
-    {
-        global $conf, $langs;
-        $this->db = $db;
+	/**
+	 *  Constructor
+	 *
+	 *  @param      DoliDB	$db      Database handler
+	 */
+	public function __construct($db)
+	{
+		global $conf, $langs;
+		$this->db = $db;
 
-        $this->id = 'tsv'; // Same value then xxx in file name export_xxx.modules.php
-        $this->label = 'TSV'; // Label of driver
-        $this->desc = $langs->trans('TsvFormatDesc');
-        $this->extension = 'tsv'; // Extension for generated file by this driver
-        $this->picto = 'mime/other'; // Picto
-        $this->version = '1.15'; // Driver version
+		$this->id = 'tsv'; // Same value then xxx in file name export_xxx.modules.php
+		$this->label = 'TSV'; // Label of driver
+		$this->desc = $langs->trans('TsvFormatDesc');
+		$this->extension = 'tsv'; // Extension for generated file by this driver
+		$this->picto = 'mime/other'; // Picto
+		$this->version = '1.15'; // Driver version
 
-        // If driver use an external library, put its name here
-        $this->label_lib = 'Dolibarr';
-        $this->version_lib = DOL_VERSION;
-    }
+		// If driver use an external library, put its name here
+		$this->label_lib = 'Dolibarr';
+		$this->version_lib = DOL_VERSION;
+	}
 
 	/**
 	 * getDriverId
 	 *
 	 * @return string
 	 */
-    public function getDriverId()
-    {
-        return $this->id;
-    }
+	public function getDriverId()
+	{
+		return $this->id;
+	}
 
 	/**
 	 * getDriverLabel
 	 *
 	 * @return 	string			Return driver label
 	 */
-    public function getDriverLabel()
-    {
-        return $this->label;
-    }
+	public function getDriverLabel()
+	{
+		return $this->label;
+	}
 
 	/**
 	 * getDriverDesc
 	 *
 	 * @return string
 	 */
-    public function getDriverDesc()
-    {
-        return $this->desc;
-    }
+	public function getDriverDesc()
+	{
+		return $this->desc;
+	}
 
 	/**
 	 * getDriverExtension
 	 *
 	 * @return string
 	 */
-    public function getDriverExtension()
-    {
-        return $this->extension;
-    }
+	public function getDriverExtension()
+	{
+		return $this->extension;
+	}
 
 	/**
 	 * getDriverVersion
 	 *
 	 * @return string
 	 */
-    public function getDriverVersion()
-    {
-        return $this->version;
-    }
+	public function getDriverVersion()
+	{
+		return $this->version;
+	}
 
 	/**
 	 * getLibLabel
 	 *
 	 * @return string
 	 */
-    public function getLibLabel()
-    {
-        return $this->label_lib;
-    }
+	public function getLibLabel()
+	{
+		return $this->label_lib;
+	}
 
 	/**
 	 * getLibVersion
 	 *
 	 * @return string
 	 */
-    public function getLibVersion()
-    {
-        return $this->version_lib;
-    }
+	public function getLibVersion()
+	{
+		return $this->version_lib;
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *   Open output file
-     *
-     *  @param      string		$file			Path of filename to generate
-     *  @param      Translate	$outputlangs	Output language object
-     *  @return     int							<0 if KO, >=0 if OK
-     */
-    public function open_file($file, $outputlangs)
-    {
-        // phpcs:enable
-        global $langs;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *   Open output file
+	 *
+	 *  @param      string		$file			Path of filename to generate
+	 *  @param      Translate	$outputlangs	Output language object
+	 *  @return     int							<0 if KO, >=0 if OK
+	 */
+	public function open_file($file, $outputlangs)
+	{
+		// phpcs:enable
+		global $langs;
 
-        dol_syslog("ExportTsv::open_file file=".$file);
+		dol_syslog("ExportTsv::open_file file=".$file);
 
-        $ret = 1;
+		$ret = 1;
 
-        $outputlangs->load("exports");
+		$outputlangs->load("exports");
 		$this->handle = fopen($file, "wt");
-        if (!$this->handle)
+		if (!$this->handle)
 		{
 			$langs->load("errors");
 			$this->error = $langs->trans("ErrorFailToCreateFile", $file);
@@ -177,73 +177,73 @@ class ExportTsv extends ModeleExports
 		}
 
 		return $ret;
-    }
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * 	Output header into file
 	 *
 	 * 	@param		Translate	$outputlangs		Output language object
 	 * 	@return		int								<0 if KO, >0 if OK
 	 */
-    public function write_header($outputlangs)
-    {
-        // phpcs:enable
-        return 0;
-    }
+	public function write_header($outputlangs)
+	{
+		// phpcs:enable
+		return 0;
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Output title line into file
-     *
-     *  @param      array		$array_export_fields_label   	Array with list of label of fields
-     *  @param      array		$array_selected_sorted       	Array with list of field to export
-     *  @param      Translate	$outputlangs    				Object lang to translate values
-     *  @param		array		$array_types					Array with types of fields
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Output title line into file
+	 *
+	 *  @param      array		$array_export_fields_label   	Array with list of label of fields
+	 *  @param      array		$array_selected_sorted       	Array with list of field to export
+	 *  @param      Translate	$outputlangs    				Object lang to translate values
+	 *  @param		array		$array_types					Array with types of fields
 	 * 	@return		int											<0 if KO, >0 if OK
-     */
-    public function write_title($array_export_fields_label, $array_selected_sorted, $outputlangs, $array_types)
-    {
-        // phpcs:enable
-        foreach ($array_selected_sorted as $code => $value)
-        {
-            $newvalue = $outputlangs->transnoentities($array_export_fields_label[$code]); // newvalue is now $outputlangs->charset_output encoded
+	 */
+	public function write_title($array_export_fields_label, $array_selected_sorted, $outputlangs, $array_types)
+	{
+		// phpcs:enable
+		foreach ($array_selected_sorted as $code => $value)
+		{
+			$newvalue = $outputlangs->transnoentities($array_export_fields_label[$code]); // newvalue is now $outputlangs->charset_output encoded
 			$newvalue = $this->tsv_clean($newvalue, $outputlangs->charset_output);
 
 			fwrite($this->handle, $newvalue.$this->separator);
-        }
-        fwrite($this->handle, "\n");
-        return 0;
-    }
+		}
+		fwrite($this->handle, "\n");
+		return 0;
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * 	Output record line into file
 	 *
 	 *  @param      array		$array_selected_sorted      Array with list of field to export
 	 *  @param      resource	$objp                       A record from a fetch with all fields from select
 	 *  @param      Translate	$outputlangs                Object lang to translate values
-     *  @param		array		$array_types				Array with types of fields
+	 *  @param		array		$array_types				Array with types of fields
 	 * 	@return		int										<0 if KO, >0 if OK
 	 */
-    public function write_record($array_selected_sorted, $objp, $outputlangs, $array_types)
-    {
-        // phpcs:enable
-    	global $conf;
+	public function write_record($array_selected_sorted, $objp, $outputlangs, $array_types)
+	{
+		// phpcs:enable
+		global $conf;
 
 		$this->col = 0;
  		foreach ($array_selected_sorted as $code => $value)
-        {
+		{
 			if (strpos($code, ' as ') == 0) $alias = str_replace(array('.', '-', '(', ')'), '_', $code);
 			else $alias = substr($code, strpos($code, ' as ') + 4);
-            if (empty($alias)) dol_print_error('', 'Bad value for field with code='.$code.'. Try to redefine export.');
+			if (empty($alias)) dol_print_error('', 'Bad value for field with code='.$code.'. Try to redefine export.');
 
-            $newvalue = $outputlangs->convToOutputCharset($objp->$alias); // objp->$alias must be utf8 encoded as any var in memory // newvalue is now $outputlangs->charset_output encoded
-            $typefield = isset($array_types[$code]) ? $array_types[$code] : '';
+			$newvalue = $outputlangs->convToOutputCharset($objp->$alias); // objp->$alias must be utf8 encoded as any var in memory // newvalue is now $outputlangs->charset_output encoded
+			$typefield = isset($array_types[$code]) ? $array_types[$code] : '';
 
-            // Translation newvalue
+			// Translation newvalue
 			if (preg_match('/^\((.*)\)$/i', $newvalue, $reg)) $newvalue = $outputlangs->transnoentities($reg[1]);
 
 			$newvalue = $this->tsv_clean($newvalue, $outputlangs->charset_output);
@@ -256,61 +256,61 @@ class ExportTsv extends ModeleExports
 			}
 
 			fwrite($this->handle, $newvalue.$this->separator);
-            $this->col++;
+			$this->col++;
 		}
-        fwrite($this->handle, "\n");
-        return 0;
-    }
+		fwrite($this->handle, "\n");
+		return 0;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * 	Output footer into file
 	 *
 	 * 	@param		Translate	$outputlangs		Output language object
 	 * 	@return		int								<0 if KO, >0 if OK
 	 */
-    public function write_footer($outputlangs)
-    {
-        // phpcs:enable
+	public function write_footer($outputlangs)
+	{
+		// phpcs:enable
 		return 0;
-    }
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * 	Close file handle
 	 *
 	 * 	@return		int							<0 if KO, >0 if OK
 	 */
-    public function close_file()
-    {
-        // phpcs:enable
-        fclose($this->handle);
-        return 0;
-    }
+	public function close_file()
+	{
+		// phpcs:enable
+		fclose($this->handle);
+		return 0;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * Clean a cell to respect rules of TSV file cells
-     *
-     * @param 	string	$newvalue	String to clean
-     * @param	string	$charset	Input AND Output character set
-     * @return 	string				Value cleaned
-     */
-    public function tsv_clean($newvalue, $charset)
-    {
-        // phpcs:enable
-        // Rule Dolibarr: No HTML
-        $newvalue = dol_string_nohtmltag($newvalue, 1, $charset);
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Clean a cell to respect rules of TSV file cells
+	 *
+	 * @param 	string	$newvalue	String to clean
+	 * @param	string	$charset	Input AND Output character set
+	 * @return 	string				Value cleaned
+	 */
+	public function tsv_clean($newvalue, $charset)
+	{
+		// phpcs:enable
+		// Rule Dolibarr: No HTML
+		$newvalue = dol_string_nohtmltag($newvalue, 1, $charset);
 
-        // Rule 1 TSV: No CR, LF in cells
-        $newvalue = str_replace("\r", '', $newvalue);
-        $newvalue = str_replace("\n", '\n', $newvalue);
+		// Rule 1 TSV: No CR, LF in cells
+		$newvalue = str_replace("\r", '', $newvalue);
+		$newvalue = str_replace("\n", '\n', $newvalue);
 
-        // Rule 2 TSV: If value contains tab, we must replace by space
-        if (preg_match('/'.$this->separator.'/', $newvalue)) {
-            $newvalue = str_replace("\t", " ", $newvalue);
-        }
+		// Rule 2 TSV: If value contains tab, we must replace by space
+		if (preg_match('/'.$this->separator.'/', $newvalue)) {
+			$newvalue = str_replace("\t", " ", $newvalue);
+		}
 
-        return $newvalue;
-    }
+		return $newvalue;
+	}
 }
diff --git a/htdocs/core/modules/export/modules_export.php b/htdocs/core/modules/export/modules_export.php
index 15ccabbb2b2..2f345556bdf 100644
--- a/htdocs/core/modules/export/modules_export.php
+++ b/htdocs/core/modules/export/modules_export.php
@@ -44,17 +44,17 @@ class ModeleExports extends CommonDocGenerator    // This class can't be abstrac
 	public $libversion = array();
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Load into memory list of available export format
 	 *
-     *  @param	DoliDB	$db     			Database handler
-     *  @param  integer	$maxfilenamelength  Max length of value to show
-     *  @return	array						List of templates (same content than array this->driverlabel)
+	 *  @param	DoliDB	$db     			Database handler
+	 *  @param  integer	$maxfilenamelength  Max length of value to show
+	 *  @return	array						List of templates (same content than array this->driverlabel)
 	 */
 	public function liste_modeles($db, $maxfilenamelength = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		dol_syslog(get_class($this)."::liste_modeles");
 
 		$dir = DOL_DOCUMENT_ROOT."/core/modules/export/";
@@ -62,40 +62,40 @@ class ModeleExports extends CommonDocGenerator    // This class can't be abstrac
 
 		// Recherche des fichiers drivers exports disponibles
 		$i = 0;
-        if (is_resource($handle))
-        {
-    		while (($file = readdir($handle)) !== false)
-    		{
-    			if (preg_match("/^export_(.*)\.modules\.php$/i", $file, $reg))
-    			{
-    				$moduleid = $reg[1];
+		if (is_resource($handle))
+		{
+			while (($file = readdir($handle)) !== false)
+			{
+				if (preg_match("/^export_(.*)\.modules\.php$/i", $file, $reg))
+				{
+					$moduleid = $reg[1];
 
-    				// Loading Class
-    				$file = $dir."export_".$moduleid.".modules.php";
-    				$classname = "Export".ucfirst($moduleid);
+					// Loading Class
+					$file = $dir."export_".$moduleid.".modules.php";
+					$classname = "Export".ucfirst($moduleid);
 
-    				require_once $file;
-    				if (class_exists($classname))
-    				{
-        				$module = new $classname($db);
+					require_once $file;
+					if (class_exists($classname))
+					{
+						$module = new $classname($db);
 
-        				// Picto
-        				$this->picto[$module->id] = $module->picto;
-        				// Driver properties
-        				$this->driverlabel[$module->id] = $module->getDriverLabel().(empty($module->disabled) ? '' : ' __(Disabled)__'); // '__(Disabled)__' is a key
-        				$this->driverdesc[$module->id] = $module->getDriverDesc();
-        				$this->driverversion[$module->id] = $module->getDriverVersion();
-        				// If use an external lib
-        				$this->liblabel[$module->id] = $module->getLibLabel();
-        				$this->libversion[$module->id] = $module->getLibVersion();
-    				}
-    				$i++;
-    			}
-    		}
-    		closedir($handle);
-        }
+						// Picto
+						$this->picto[$module->id] = $module->picto;
+						// Driver properties
+						$this->driverlabel[$module->id] = $module->getDriverLabel().(empty($module->disabled) ? '' : ' __(Disabled)__'); // '__(Disabled)__' is a key
+						$this->driverdesc[$module->id] = $module->getDriverDesc();
+						$this->driverversion[$module->id] = $module->getDriverVersion();
+						// If use an external lib
+						$this->liblabel[$module->id] = $module->getLibLabel();
+						$this->libversion[$module->id] = $module->getLibVersion();
+					}
+					$i++;
+				}
+			}
+			closedir($handle);
+		}
 
-        asort($this->driverlabel);
+		asort($this->driverlabel);
 
 		return $this->driverlabel;
 	}
diff --git a/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php b/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
index c581909588a..1d4b65fdb32 100644
--- a/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
+++ b/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
@@ -46,15 +46,15 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 	public $emetteur;
 
 	/**
-     * @var array Minimum version of PHP required by module.
-     * e.g.: PHP ≥ 5.6 = array(5, 6)
-     */
+	 * @var array Minimum version of PHP required by module.
+	 * e.g.: PHP ≥ 5.6 = array(5, 6)
+	 */
 	public $phpmin = array(5, 6);
 
 	/**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
 	public $version = 'dolibarr';
 
 
@@ -63,12 +63,12 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 	 *
 	 *  @param		DoliDB		$db      Database handler
 	 */
-    public function __construct($db)
-    {
+	public function __construct($db)
+	{
 		global $conf, $langs, $mysoc;
 
 		// Load translation files required by the page
-        $langs->loadLangs(array("main", "companies"));
+		$langs->loadLangs(array("main", "companies"));
 
 		$this->db = $db;
 		$this->name = "ODT/ODS templates";
@@ -99,7 +99,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 		// Recupere emetteur
 		$this->emetteur = $mysoc;
 		if (!$this->emetteur->country_code) $this->emetteur->country_code = substr($langs->defaultlang, -2); // Par defaut, si n'etait pas defini
-    }
+	}
 
 
 	/**
@@ -108,12 +108,12 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 	 * @param	Translate	$langs      Lang object to use for output
 	 * @return	string      			Description
 	 */
-    public function info($langs)
-    {
+	public function info($langs)
+	{
 		global $conf, $langs;
 
 		// Load translation files required by the page
-        $langs->loadLangs(array("errors", "companies"));
+		$langs->loadLangs(array("errors", "companies"));
 
 		$form = new Form($this->db);
 
@@ -171,15 +171,15 @@ class doc_generic_invoice_odt extends ModelePDFFactures
    			$texte .= '<div id="div_'.get_class($this).'" class="hidden">';
    			foreach ($listoffiles as $file)
    			{
-                $texte .= $file['name'].'<br>';
+				$texte .= $file['name'].'<br>';
    			}
    			$texte .= '</div>';
 		}
-        // Add input to upload a new template file.
-        $texte .= '<div>'.$langs->trans("UploadNewTemplate").' <input type="file" name="uploadfile">';
-        $texte .= '<input type="hidden" value="FACTURE_ADDON_PDF_ODT_PATH" name="keyforuploaddir">';
-        $texte .= '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Upload")).'" name="upload">';
-        $texte .= '</div>';
+		// Add input to upload a new template file.
+		$texte .= '<div>'.$langs->trans("UploadNewTemplate").' <input type="file" name="uploadfile">';
+		$texte .= '<input type="hidden" value="FACTURE_ADDON_PDF_ODT_PATH" name="keyforuploaddir">';
+		$texte .= '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Upload")).'" name="upload">';
+		$texte .= '</div>';
 		$texte .= '</td>';
 
 		$texte .= '<td rowspan="2" class="tdtop hideonsmartphone">';
@@ -191,9 +191,9 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 		$texte .= '</form>';
 
 		return $texte;
-    }
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Function to build a document on disk using the generic odt module.
 	 *
@@ -205,9 +205,9 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 	 *  @param		int			$hideref			Do not show ref
 	 *	@return		int         					1 if OK, <=0 if KO
 	 */
-    public function write_file($object, $outputlangs, $srctemplatepath, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
-    {
-        // phpcs:enable
+	public function write_file($object, $outputlangs, $srctemplatepath, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
+	{
+		// phpcs:enable
 		global $user, $langs, $conf, $mysoc, $hookmanager;
 
 		if (empty($srctemplatepath))
@@ -247,6 +247,8 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 				}
 			}
 
+			$object->fetch_thirdparty();
+
 			$dir = $conf->facture->dir_output;
 			$objectref = dol_sanitizeFileName($object->ref);
 			if (!preg_match('/specimen/i', $objectref)) $dir .= "/".$objectref;
@@ -275,8 +277,8 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
 				if (!empty($conf->global->MAIN_DOC_USE_TIMING))
 				{
-				    $format = $conf->global->MAIN_DOC_USE_TIMING;
-				    if ($format == '1') $format = '%Y%m%d%H%M%S';
+					$format = $conf->global->MAIN_DOC_USE_TIMING;
+					if ($format == '1') $format = '%Y%m%d%H%M%S';
 					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
 				} else {
 					$filename = $newfiletmp.'.'.$newfileformat;
@@ -345,7 +347,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 				// Open and load template
 				require_once ODTPHP_PATH.'odf.php';
 				try {
-                    $odfHandler = new odf(
+					$odfHandler = new odf(
 						$srctemplatepath,
 						array(
 						'PATH_TO_TMP'	  => $conf->facture->dir_temp,
@@ -410,7 +412,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 						}
 					} catch (OdfException $e)
 					{
-                        dol_syslog($e->getMessage(), LOG_INFO);
+						dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
 				// Replace tags of lines
@@ -466,7 +468,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
 					} catch (OdfException $e)
 					{
-                        dol_syslog($e->getMessage(), LOG_INFO);
+						dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
 
@@ -480,7 +482,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 						$odfHandler->exportAsAttachedPDF($file);
 					} catch (Exception $e) {
 						$this->error = $e->getMessage();
-                        dol_syslog($e->getMessage(), LOG_INFO);
+						dol_syslog($e->getMessage(), LOG_INFO);
 						return -1;
 					}
 				} else {
@@ -488,7 +490,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 						$odfHandler->saveToDisk($file);
 					} catch (Exception $e) {
 						$this->error = $e->getMessage();
-                        dol_syslog($e->getMessage(), LOG_INFO);
+						dol_syslog($e->getMessage(), LOG_INFO);
 						return -1;
 					}
 				}
@@ -510,5 +512,5 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 		}
 
 		return -1;
-    }
+	}
 }
diff --git a/htdocs/core/modules/facture/mod_facture_mars.php b/htdocs/core/modules/facture/mod_facture_mars.php
index 8dc23e045b3..b8c7b941a15 100644
--- a/htdocs/core/modules/facture/mod_facture_mars.php
+++ b/htdocs/core/modules/facture/mod_facture_mars.php
@@ -31,9 +31,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/facture/modules_facture.php';
 class mod_facture_mars extends ModeleNumRefFactures
 {
 	/**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
 	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 
 	public $prefixinvoice = 'FA';
@@ -146,7 +146,7 @@ class mod_facture_mars extends ModeleNumRefFactures
 	 *
 	 * @param	Societe		$objsoc		Object third party
 	 * @param   Facture		$invoice	Object invoice
-     * @param   string		$mode       'next' for next value or 'last' for last value
+	 * @param   string		$mode       'next' for next value or 'last' for last value
 	 * @return  string       			Value
 	 */
 	public function getNextValue($objsoc, $invoice, $mode = 'next')
@@ -178,48 +178,48 @@ class mod_facture_mars extends ModeleNumRefFactures
 
 		if ($mode == 'last')
 		{
-    		if ($max >= (pow(10, 4) - 1)) $num = $max; // If counter > 9999, we do not format on 4 chars, we take number as it is
-    		else $num = sprintf("%04s", $max);
+			if ($max >= (pow(10, 4) - 1)) $num = $max; // If counter > 9999, we do not format on 4 chars, we take number as it is
+			else $num = sprintf("%04s", $max);
 
-            $ref = '';
-            $sql = "SELECT ref as ref";
-            $sql .= " FROM ".MAIN_DB_PREFIX."facture";
-            $sql .= " WHERE ref LIKE '".$db->escape($prefix)."____-".$num."'";
-            $sql .= " AND entity IN (".getEntity('invoicenumber', 1, $invoice).")";
-            $sql .= " ORDER BY ref DESC";
+			$ref = '';
+			$sql = "SELECT ref as ref";
+			$sql .= " FROM ".MAIN_DB_PREFIX."facture";
+			$sql .= " WHERE ref LIKE '".$db->escape($prefix)."____-".$num."'";
+			$sql .= " AND entity IN (".getEntity('invoicenumber', 1, $invoice).")";
+			$sql .= " ORDER BY ref DESC";
 
-            dol_syslog(get_class($this)."::getNextValue", LOG_DEBUG);
-            $resql = $db->query($sql);
-            if ($resql)
-            {
-                $obj = $db->fetch_object($resql);
-                if ($obj) $ref = $obj->ref;
-            } else dol_print_error($db);
+			dol_syslog(get_class($this)."::getNextValue", LOG_DEBUG);
+			$resql = $db->query($sql);
+			if ($resql)
+			{
+				$obj = $db->fetch_object($resql);
+				if ($obj) $ref = $obj->ref;
+			} else dol_print_error($db);
 
-            return $ref;
+			return $ref;
 		} elseif ($mode == 'next')
 		{
 			$date = $invoice->date; // This is invoice date (not creation date)
-    		$yymm = strftime("%y%m", $date);
+			$yymm = strftime("%y%m", $date);
 
-    		if ($max >= (pow(10, 4) - 1)) $num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
-    		else $num = sprintf("%04s", $max + 1);
+			if ($max >= (pow(10, 4) - 1)) $num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
+			else $num = sprintf("%04s", $max + 1);
 
-    		dol_syslog(get_class($this)."::getNextValue return ".$prefix.$yymm."-".$num);
-    		return $prefix.$yymm."-".$num;
+			dol_syslog(get_class($this)."::getNextValue return ".$prefix.$yymm."-".$num);
+			return $prefix.$yymm."-".$num;
 		} else dol_print_error('', 'Bad parameter for getNextValue');
 	}
 
-    /**
-     *  Return next free value
-     *
-     *  @param  Societe     $objsoc         Object third party
-     *  @param  string      $objforref      Object for number to search
-     *  @param  string      $mode           'next' for next value or 'last' for last value
-     *  @return string                      Next free value
-     */
-    public function getNumRef($objsoc, $objforref, $mode = 'next')
-    {
-        return $this->getNextValue($objsoc, $objforref, $mode);
-    }
+	/**
+	 *  Return next free value
+	 *
+	 *  @param  Societe     $objsoc         Object third party
+	 *  @param  string      $objforref      Object for number to search
+	 *  @param  string      $mode           'next' for next value or 'last' for last value
+	 *  @return string                      Next free value
+	 */
+	public function getNumRef($objsoc, $objforref, $mode = 'next')
+	{
+		return $this->getNextValue($objsoc, $objforref, $mode);
+	}
 }
diff --git a/htdocs/core/modules/facture/mod_facture_mercure.php b/htdocs/core/modules/facture/mod_facture_mercure.php
index 50b708baefc..5273803ea58 100644
--- a/htdocs/core/modules/facture/mod_facture_mercure.php
+++ b/htdocs/core/modules/facture/mod_facture_mercure.php
@@ -33,156 +33,156 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/facture/modules_facture.php';
  */
 class mod_facture_mercure extends ModeleNumRefFactures
 {
-    /**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	/**
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
 	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 
-    /**
+	/**
 	 * @var string Error message
 	 */
 	public $error = '';
 
 
-    /**
-     *  Returns the description of the numbering model
-     *
-     *  @return     string      Texte descripif
-     */
-    public function info()
-    {
-        global $db, $conf, $langs;
+	/**
+	 *  Returns the description of the numbering model
+	 *
+	 *  @return     string      Texte descripif
+	 */
+	public function info()
+	{
+		global $db, $conf, $langs;
 
-        $langs->load("bills");
+		$langs->load("bills");
 
-        $form = new Form($db);
+		$form = new Form($db);
 
-        $texte = $langs->trans('GenericNumRefModelDesc')."<br>\n";
-        $texte .= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-        $texte .= '<input type="hidden" name="token" value="'.newToken().'">';
-        $texte .= '<input type="hidden" name="action" value="updateMask">';
-        $texte .= '<input type="hidden" name="maskconstinvoice" value="FACTURE_MERCURE_MASK_INVOICE">';
-        $texte .= '<input type="hidden" name="maskconstreplacement" value="FACTURE_MERCURE_MASK_REPLACEMENT">';
-        $texte .= '<input type="hidden" name="maskconstcredit" value="FACTURE_MERCURE_MASK_CREDIT">';
+		$texte = $langs->trans('GenericNumRefModelDesc')."<br>\n";
+		$texte .= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+		$texte .= '<input type="hidden" name="token" value="'.newToken().'">';
+		$texte .= '<input type="hidden" name="action" value="updateMask">';
+		$texte .= '<input type="hidden" name="maskconstinvoice" value="FACTURE_MERCURE_MASK_INVOICE">';
+		$texte .= '<input type="hidden" name="maskconstreplacement" value="FACTURE_MERCURE_MASK_REPLACEMENT">';
+		$texte .= '<input type="hidden" name="maskconstcredit" value="FACTURE_MERCURE_MASK_CREDIT">';
 		$texte .= '<input type="hidden" name="maskconstdeposit" value="FACTURE_MERCURE_MASK_DEPOSIT">';
-        $texte .= '<table class="nobordernopadding" width="100%">';
+		$texte .= '<table class="nobordernopadding" width="100%">';
 
-        $tooltip = $langs->trans("GenericMaskCodes", $langs->transnoentities("Invoice"), $langs->transnoentities("Invoice"));
-        $tooltip .= $langs->trans("GenericMaskCodes2");
-        $tooltip .= $langs->trans("GenericMaskCodes3");
-        $tooltip .= $langs->trans("GenericMaskCodes4a", $langs->transnoentities("Invoice"), $langs->transnoentities("Invoice"));
-        $tooltip .= $langs->trans("GenericMaskCodes5");
+		$tooltip = $langs->trans("GenericMaskCodes", $langs->transnoentities("Invoice"), $langs->transnoentities("Invoice"));
+		$tooltip .= $langs->trans("GenericMaskCodes2");
+		$tooltip .= $langs->trans("GenericMaskCodes3");
+		$tooltip .= $langs->trans("GenericMaskCodes4a", $langs->transnoentities("Invoice"), $langs->transnoentities("Invoice"));
+		$tooltip .= $langs->trans("GenericMaskCodes5");
 
-        // Setting the prefix
-        $texte .= '<tr><td>'.$langs->trans("Mask").' ('.$langs->trans("InvoiceStandard").'):</td>';
-        $texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskinvoice" value="'.$conf->global->FACTURE_MERCURE_MASK_INVOICE.'">', $tooltip, 1, 1).'</td>';
+		// Setting the prefix
+		$texte .= '<tr><td>'.$langs->trans("Mask").' ('.$langs->trans("InvoiceStandard").'):</td>';
+		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskinvoice" value="'.$conf->global->FACTURE_MERCURE_MASK_INVOICE.'">', $tooltip, 1, 1).'</td>';
 
-        $texte .= '<td class="left" rowspan="3">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
+		$texte .= '<td class="left" rowspan="3">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
 
-        $texte .= '</tr>';
+		$texte .= '</tr>';
 
-        // Prefix setting of replacement invoices
-        $texte .= '<tr><td>'.$langs->trans("Mask").' ('.$langs->trans("InvoiceReplacement").'):</td>';
-        $texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskreplacement" value="'.$conf->global->FACTURE_MERCURE_MASK_REPLACEMENT.'">', $tooltip, 1, 1).'</td>';
-        $texte .= '</tr>';
+		// Prefix setting of replacement invoices
+		$texte .= '<tr><td>'.$langs->trans("Mask").' ('.$langs->trans("InvoiceReplacement").'):</td>';
+		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskreplacement" value="'.$conf->global->FACTURE_MERCURE_MASK_REPLACEMENT.'">', $tooltip, 1, 1).'</td>';
+		$texte .= '</tr>';
 
-        // Prefix setting of credit note
-        $texte .= '<tr><td>'.$langs->trans("Mask").' ('.$langs->trans("InvoiceAvoir").'):</td>';
-        $texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskcredit" value="'.$conf->global->FACTURE_MERCURE_MASK_CREDIT.'">', $tooltip, 1, 1).'</td>';
-        $texte .= '</tr>';
+		// Prefix setting of credit note
+		$texte .= '<tr><td>'.$langs->trans("Mask").' ('.$langs->trans("InvoiceAvoir").'):</td>';
+		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskcredit" value="'.$conf->global->FACTURE_MERCURE_MASK_CREDIT.'">', $tooltip, 1, 1).'</td>';
+		$texte .= '</tr>';
 
-        // Prefix setting of deposit
-        $texte .= '<tr><td>'.$langs->trans("Mask").' ('.$langs->trans("InvoiceDeposit").'):</td>';
-        $texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskdeposit" value="'.$conf->global->FACTURE_MERCURE_MASK_DEPOSIT.'">', $tooltip, 1, 1).'</td>';
-        $texte .= '</tr>';
+		// Prefix setting of deposit
+		$texte .= '<tr><td>'.$langs->trans("Mask").' ('.$langs->trans("InvoiceDeposit").'):</td>';
+		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskdeposit" value="'.$conf->global->FACTURE_MERCURE_MASK_DEPOSIT.'">', $tooltip, 1, 1).'</td>';
+		$texte .= '</tr>';
 
-        $texte .= '</table>';
-        $texte .= '</form>';
+		$texte .= '</table>';
+		$texte .= '</form>';
 
-        return $texte;
-    }
+		return $texte;
+	}
 
-    /**
-     *  Return an example of number value
-     *
-     *  @return     string      Example
-     */
-    public function getExample()
-    {
-        global $conf, $langs, $mysoc;
+	/**
+	 *  Return an example of number value
+	 *
+	 *  @return     string      Example
+	 */
+	public function getExample()
+	{
+		global $conf, $langs, $mysoc;
 
-        $old_code_client = $mysoc->code_client;
-        $old_code_type = $mysoc->typent_code;
-        $mysoc->code_client = 'CCCCCCCCCC';
-        $mysoc->typent_code = 'TTTTTTTTTT';
-        $numExample = $this->getNextValue($mysoc, '');
-        $mysoc->code_client = $old_code_client;
-        $mysoc->typent_code = $old_code_type;
+		$old_code_client = $mysoc->code_client;
+		$old_code_type = $mysoc->typent_code;
+		$mysoc->code_client = 'CCCCCCCCCC';
+		$mysoc->typent_code = 'TTTTTTTTTT';
+		$numExample = $this->getNextValue($mysoc, '');
+		$mysoc->code_client = $old_code_client;
+		$mysoc->typent_code = $old_code_type;
 
-        if (!$numExample)
-        {
-            $numExample = 'NotConfigured';
-        }
-        return $numExample;
-    }
+		if (!$numExample)
+		{
+			$numExample = 'NotConfigured';
+		}
+		return $numExample;
+	}
 
-    /**
-     * Return next value
-     *
-     * @param	Societe		$objsoc     Object third party
-     * @param   Facture		$invoice	Object invoice
-     * @param   string		$mode       'next' for next value or 'last' for last value
-     * @return  string      			Value if OK, 0 if KO
-     */
-    public function getNextValue($objsoc, $invoice, $mode = 'next')
-    {
-    	global $db, $conf;
+	/**
+	 * Return next value
+	 *
+	 * @param	Societe		$objsoc     Object third party
+	 * @param   Facture		$invoice	Object invoice
+	 * @param   string		$mode       'next' for next value or 'last' for last value
+	 * @return  string      			Value if OK, 0 if KO
+	 */
+	public function getNextValue($objsoc, $invoice, $mode = 'next')
+	{
+		global $db, $conf;
 
-    	require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
-        // Get Mask value
-        $mask = '';
-        if (is_object($invoice) && $invoice->type == 1)
-        {
-        	$mask = $conf->global->FACTURE_MERCURE_MASK_REPLACEMENT;
-        	if (!$mask)
-        	{
-        		$mask = $conf->global->FACTURE_MERCURE_MASK_INVOICE;
-        	}
-        } elseif (is_object($invoice) && $invoice->type == 2) $mask = $conf->global->FACTURE_MERCURE_MASK_CREDIT;
-        elseif (is_object($invoice) && $invoice->type == 3) $mask = $conf->global->FACTURE_MERCURE_MASK_DEPOSIT;
-        else $mask = $conf->global->FACTURE_MERCURE_MASK_INVOICE;
-        if (!$mask)
-        {
-            $this->error = 'NotConfigured';
-            return 0;
-        }
+		// Get Mask value
+		$mask = '';
+		if (is_object($invoice) && $invoice->type == 1)
+		{
+			$mask = $conf->global->FACTURE_MERCURE_MASK_REPLACEMENT;
+			if (!$mask)
+			{
+				$mask = $conf->global->FACTURE_MERCURE_MASK_INVOICE;
+			}
+		} elseif (is_object($invoice) && $invoice->type == 2) $mask = $conf->global->FACTURE_MERCURE_MASK_CREDIT;
+		elseif (is_object($invoice) && $invoice->type == 3) $mask = $conf->global->FACTURE_MERCURE_MASK_DEPOSIT;
+		else $mask = $conf->global->FACTURE_MERCURE_MASK_INVOICE;
+		if (!$mask)
+		{
+			$this->error = 'NotConfigured';
+			return 0;
+		}
 
-    	$where = '';
-    	//if ($facture->type == 2) $where.= " AND type = 2";
-    	//else $where.=" AND type != 2";
+		$where = '';
+		//if ($facture->type == 2) $where.= " AND type = 2";
+		//else $where.=" AND type != 2";
 
-    	// Get entities
-    	$entity = getEntity('invoicenumber', 1, $invoice);
+		// Get entities
+		$entity = getEntity('invoicenumber', 1, $invoice);
 
-    	$numFinal = get_next_value($db, $mask, 'facture', 'ref', $where, $objsoc, $invoice->date, $mode, false, null, $entity);
-    	if (!preg_match('/([0-9])+/', $numFinal)) $this->error = $numFinal;
+		$numFinal = get_next_value($db, $mask, 'facture', 'ref', $where, $objsoc, $invoice->date, $mode, false, null, $entity);
+		if (!preg_match('/([0-9])+/', $numFinal)) $this->error = $numFinal;
 
-    	return  $numFinal;
-    }
+		return  $numFinal;
+	}
 
 
-    /**
-     * Return next free value
-     *
-     * @param	Societe		$objsoc     	Object third party
-     * @param	string		$objforref		Object for number to search
-     * @param   string		$mode       	'next' for next value or 'last' for last value
-     * @return  string      				Next free value
-     */
-    public function getNumRef($objsoc, $objforref, $mode = 'next')
-    {
-        return $this->getNextValue($objsoc, $objforref, $mode);
-    }
+	/**
+	 * Return next free value
+	 *
+	 * @param	Societe		$objsoc     	Object third party
+	 * @param	string		$objforref		Object for number to search
+	 * @param   string		$mode       	'next' for next value or 'last' for last value
+	 * @return  string      				Next free value
+	 */
+	public function getNumRef($objsoc, $objforref, $mode = 'next')
+	{
+		return $this->getNextValue($objsoc, $objforref, $mode);
+	}
 }
diff --git a/htdocs/core/modules/facture/mod_facture_terre.php b/htdocs/core/modules/facture/mod_facture_terre.php
index 588b2f34aab..ae1afbf2ce4 100644
--- a/htdocs/core/modules/facture/mod_facture_terre.php
+++ b/htdocs/core/modules/facture/mod_facture_terre.php
@@ -30,34 +30,34 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/facture/modules_facture.php';
  */
 class mod_facture_terre extends ModeleNumRefFactures
 {
-    /**
-     * Dolibarr version of the loaded document 'development', 'experimental', 'dolibarr'
-     * @var string
-     */
-    public $version = 'dolibarr';
+	/**
+	 * Dolibarr version of the loaded document 'development', 'experimental', 'dolibarr'
+	 * @var string
+	 */
+	public $version = 'dolibarr';
 
-    /**
-     * Prefix for invoices
-     * @var string
-     */
-    public $prefixinvoice = 'FA';
+	/**
+	 * Prefix for invoices
+	 * @var string
+	 */
+	public $prefixinvoice = 'FA';
 
-    /**
-     * Prefix for credit note
-     * @var string
-     */
-    public $prefixcreditnote = 'AV';
+	/**
+	 * Prefix for credit note
+	 * @var string
+	 */
+	public $prefixcreditnote = 'AV';
 
-    /**
-     * Prefix for deposit
-     * @var string
-     */
-    public $prefixdeposit = 'AC';
+	/**
+	 * Prefix for deposit
+	 * @var string
+	 */
+	public $prefixdeposit = 'AC';
 
-    /**
-     * @var string Error code (or message)
-     */
-    public $error = '';
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error = '';
 
 
 	/**
@@ -177,7 +177,7 @@ class mod_facture_terre extends ModeleNumRefFactures
 	 *
 	 * @param   Societe		$objsoc		Object third party
 	 * @param   Facture		$invoice	Object invoice
-     * @param   string		$mode       'next' for next value or 'last' for last value
+	 * @param   string		$mode       'next' for next value or 'last' for last value
 	 * @return  string       			Value
 	 */
 	public function getNextValue($objsoc, $invoice, $mode = 'next')
@@ -209,47 +209,47 @@ class mod_facture_terre extends ModeleNumRefFactures
 
 		if ($mode == 'last')
 		{
-    		if ($max >= (pow(10, 4) - 1)) $num = $max; // If counter > 9999, we do not format on 4 chars, we take number as it is
-    		else $num = sprintf("%04s", $max);
+			if ($max >= (pow(10, 4) - 1)) $num = $max; // If counter > 9999, we do not format on 4 chars, we take number as it is
+			else $num = sprintf("%04s", $max);
 
-            $ref = '';
-            $sql = "SELECT ref as ref";
-            $sql .= " FROM ".MAIN_DB_PREFIX."facture";
-            $sql .= " WHERE ref LIKE '".$db->escape($prefix)."____-".$num."'";
-            $sql .= " AND entity IN (".getEntity('invoicenumber', 1, $invoice).")";
-            $sql .= " ORDER BY ref DESC";
+			$ref = '';
+			$sql = "SELECT ref as ref";
+			$sql .= " FROM ".MAIN_DB_PREFIX."facture";
+			$sql .= " WHERE ref LIKE '".$db->escape($prefix)."____-".$num."'";
+			$sql .= " AND entity IN (".getEntity('invoicenumber', 1, $invoice).")";
+			$sql .= " ORDER BY ref DESC";
 
-            $resql = $db->query($sql);
-            if ($resql)
-            {
-                $obj = $db->fetch_object($resql);
-                if ($obj) $ref = $obj->ref;
-            } else dol_print_error($db);
+			$resql = $db->query($sql);
+			if ($resql)
+			{
+				$obj = $db->fetch_object($resql);
+				if ($obj) $ref = $obj->ref;
+			} else dol_print_error($db);
 
-            return $ref;
+			return $ref;
 		} elseif ($mode == 'next')
 		{
 			$date = $invoice->date; // This is invoice date (not creation date)
-    		$yymm = strftime("%y%m", $date);
+			$yymm = strftime("%y%m", $date);
 
-    		if ($max >= (pow(10, 4) - 1)) $num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
-    		else $num = sprintf("%04s", $max + 1);
+			if ($max >= (pow(10, 4) - 1)) $num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
+			else $num = sprintf("%04s", $max + 1);
 
-    		dol_syslog(get_class($this)."::getNextValue return ".$prefix.$yymm."-".$num);
-    		return $prefix.$yymm."-".$num;
+			dol_syslog(get_class($this)."::getNextValue return ".$prefix.$yymm."-".$num);
+			return $prefix.$yymm."-".$num;
 		} else dol_print_error('', 'Bad parameter for getNextValue');
 	}
 
-    /**
-     *  Return next free value
-     *
-     *  @param  Societe     $objsoc         Object third party
-     *  @param  string      $objforref      Object for number to search
-     *  @param   string     $mode           'next' for next value or 'last' for last value
-     *  @return  string                     Next free value
-     */
-    public function getNumRef($objsoc, $objforref, $mode = 'next')
-    {
-        return $this->getNextValue($objsoc, $objforref, $mode);
-    }
+	/**
+	 *  Return next free value
+	 *
+	 *  @param  Societe     $objsoc         Object third party
+	 *  @param  string      $objforref      Object for number to search
+	 *  @param   string     $mode           'next' for next value or 'last' for last value
+	 *  @return  string                     Next free value
+	 */
+	public function getNumRef($objsoc, $objforref, $mode = 'next')
+	{
+		return $this->getNextValue($objsoc, $objforref, $mode);
+	}
 }
diff --git a/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php b/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
index 47abbc3640a..d76c0969761 100644
--- a/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
+++ b/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
@@ -40,70 +40,70 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 class pdf_soleil extends ModelePDFFicheinter
 {
 	 /**
-     * @var DoliDb Database handler
-     */
-    public $db;
+	  * @var DoliDb Database handler
+	  */
+	public $db;
 
 	/**
-     * @var string model name
-     */
-    public $name;
+	 * @var string model name
+	 */
+	public $name;
 
 	/**
-     * @var string model description (short text)
-     */
-    public $description;
+	 * @var string model description (short text)
+	 */
+	public $description;
 
 	/**
-     * @var string document type
-     */
-    public $type;
+	 * @var string document type
+	 */
+	public $type;
 
-    /**
-     * @var array Minimum version of PHP required by module.
-     * e.g.: PHP ≥ 5.6 = array(5, 6)
-     */
+	/**
+	 * @var array Minimum version of PHP required by module.
+	 * e.g.: PHP ≥ 5.6 = array(5, 6)
+	 */
 	public $phpmin = array(5, 6);
 
 	/**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
 	public $version = 'dolibarr';
 
 	/**
-     * @var int page_largeur
-     */
-    public $page_largeur;
+	 * @var int page_largeur
+	 */
+	public $page_largeur;
 
 	/**
-     * @var int page_hauteur
-     */
-    public $page_hauteur;
+	 * @var int page_hauteur
+	 */
+	public $page_hauteur;
 
 	/**
-     * @var array format
-     */
-    public $format;
+	 * @var array format
+	 */
+	public $format;
 
 	/**
-     * @var int marge_gauche
-     */
+	 * @var int marge_gauche
+	 */
 	public $marge_gauche;
 
 	/**
-     * @var int marge_droite
-     */
+	 * @var int marge_droite
+	 */
 	public $marge_droite;
 
 	/**
-     * @var int marge_haute
-     */
+	 * @var int marge_haute
+	 */
 	public $marge_haute;
 
 	/**
-     * @var int marge_basse
-     */
+	 * @var int marge_basse
+	 */
 	public $marge_basse;
 
 	/**
@@ -152,7 +152,7 @@ class pdf_soleil extends ModelePDFFicheinter
 		$this->posxdesc = $this->marge_gauche + 1;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Function to build pdf onto disk
 	 *
@@ -166,7 +166,7 @@ class pdf_soleil extends ModelePDFFicheinter
 	 */
 	public function write_file($object, $outputlangs, $srctemplatepath = '', $hidedetails = 0, $hidedesc = 0, $hideref = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $user, $langs, $conf, $mysoc, $db, $hookmanager;
 
 		if (!is_object($outputlangs)) $outputlangs = $langs;
@@ -180,7 +180,7 @@ class pdf_soleil extends ModelePDFFicheinter
 		{
 			$object->fetch_thirdparty();
 
-		    // Definition of $dir and $file
+			// Definition of $dir and $file
 			if ($object->specimen)
 			{
 				$dir = $conf->ficheinter->dir_output;
@@ -304,8 +304,8 @@ class pdf_soleil extends ModelePDFFicheinter
 				$text = $object->description;
 				if ($object->duration > 0)
 				{
-				    $totaltime = convertSecondToTime($object->duration, 'all', $conf->global->MAIN_DURATION_OF_WORKDAY);
-				    $text .= ($text ? ' - ' : '').$langs->trans("Total").": ".$totaltime;
+					$totaltime = convertSecondToTime($object->duration, 'all', $conf->global->MAIN_DURATION_OF_WORKDAY);
+					$text .= ($text ? ' - ' : '').$langs->trans("Total").": ".$totaltime;
 				}
 				$desc = dol_htmlentitiesbr($text, 1);
 				//print $outputlangs->convToOutputCharset($desc); exit;
@@ -336,12 +336,12 @@ class pdf_soleil extends ModelePDFFicheinter
 						// Description of product line
 						$curX = $this->posxdesc - 1;
 
-                        // Description of product line
-                        if (empty($conf->global->FICHINTER_DATE_WITHOUT_HOUR)) {
-                            $txt = $outputlangs->transnoentities("Date")." : ".dol_print_date($objectligne->datei, 'dayhour', false, $outputlangs, true);
-                        } else {
-                            $txt = $outputlangs->transnoentities("Date")." : ".dol_print_date($objectligne->datei, 'day', false, $outputlangs, true);
-                        }
+						// Description of product line
+						if (empty($conf->global->FICHINTER_DATE_WITHOUT_HOUR)) {
+							$txt = $outputlangs->transnoentities("Date")." : ".dol_print_date($objectligne->datei, 'dayhour', false, $outputlangs, true);
+						} else {
+							$txt = $outputlangs->transnoentities("Date")." : ".dol_print_date($objectligne->datei, 'day', false, $outputlangs, true);
+						}
 
 						if ($objectligne->duration > 0)
 						{
@@ -448,8 +448,8 @@ class pdf_soleil extends ModelePDFFicheinter
 				$reshook = $hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 				if ($reshook < 0)
 				{
-				    $this->error = $hookmanager->error;
-				    $this->errors = $hookmanager->errors;
+					$this->error = $hookmanager->error;
+					$this->errors = $hookmanager->errors;
 				}
 
 				if (!empty($conf->global->MAIN_UMASK))
@@ -487,7 +487,7 @@ class pdf_soleil extends ModelePDFFicheinter
 
 
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
-        /*
+		/*
 		$pdf->SetXY($this->marge_gauche, $tab_top);
 		$pdf->MultiCell(190,8,$outputlangs->transnoentities("Description"),0,'L',0);
 		$pdf->line($this->marge_gauche, $tab_top + 8, $this->page_largeur-$this->marge_droite, $tab_top + 8);
@@ -573,8 +573,8 @@ class pdf_soleil extends ModelePDFFicheinter
 		{
 			if (is_readable($logo))
 			{
-			    $height = pdf_getHeightForLogo($logo);
-			    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
+				$height = pdf_getHeightForLogo($logo);
+				$pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
 			} else {
 				$pdf->SetTextColor(200, 0, 0);
 				$pdf->SetFont('', 'B', $default_font_size - 2);
diff --git a/htdocs/core/modules/fichinter/mod_arctic.php b/htdocs/core/modules/fichinter/mod_arctic.php
index f2f3a135785..58888a7cb8d 100644
--- a/htdocs/core/modules/fichinter/mod_arctic.php
+++ b/htdocs/core/modules/fichinter/mod_arctic.php
@@ -32,10 +32,10 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/fichinter/modules_fichinter.php';
  */
 class mod_arctic extends ModeleNumRefFicheinter
 {
-    /**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	/**
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
 	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 
 	/**
@@ -57,13 +57,13 @@ class mod_arctic extends ModeleNumRefFicheinter
 
 
 	/**
-     *  Returns the description of the numbering model
-     *
-     *  @return     string      Texte descripif
-     */
-    public function info()
-    {
-    	global $db, $conf, $langs;
+	 *  Returns the description of the numbering model
+	 *
+	 *  @return     string      Texte descripif
+	 */
+	public function info()
+	{
+		global $db, $conf, $langs;
 
 		$langs->load("bills");
 
@@ -94,20 +94,20 @@ class mod_arctic extends ModeleNumRefFicheinter
 		$texte .= '</form>';
 
 		return $texte;
-    }
+	}
 
-    /**
-     * Return an example of numbering
-     *
-     * @return     string      Example
-     */
-    public function getExample()
-    {
-     	global $conf, $langs, $mysoc;
+	/**
+	 * Return an example of numbering
+	 *
+	 * @return     string      Example
+	 */
+	public function getExample()
+	{
+	 	global $conf, $langs, $mysoc;
 
-    	$old_code_client = $mysoc->code_client;
-    	$mysoc->code_client = 'CCCCCCCCCC';
-     	$numExample = $this->getNextValue($mysoc, '');
+		$old_code_client = $mysoc->code_client;
+		$mysoc->code_client = 'CCCCCCCCCC';
+	 	$numExample = $this->getNextValue($mysoc, '');
 		$mysoc->code_client = $old_code_client;
 
 		if (!$numExample)
@@ -115,7 +115,7 @@ class mod_arctic extends ModeleNumRefFicheinter
 			$numExample = $langs->trans('NotConfigured');
 		}
 		return $numExample;
-    }
+	}
 
 	/**
 	 * 	Return next free value
@@ -124,8 +124,8 @@ class mod_arctic extends ModeleNumRefFicheinter
 	 *  @param  Object		$object		Object we need next value for
 	 *  @return string      			Value if KO, <0 if KO
 	 */
-    public function getNextValue($objsoc = 0, $object = '')
-    {
+	public function getNextValue($objsoc = 0, $object = '')
+	{
 		global $db, $conf;
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
@@ -142,18 +142,18 @@ class mod_arctic extends ModeleNumRefFicheinter
 		$numFinal = get_next_value($db, $mask, 'fichinter', 'ref', '', $objsoc, $object->datec);
 
 		return  $numFinal;
-    }
+	}
 
 
 	/**
 	 *  Return next free value
 	 *
-     *  @param	Societe		$objsoc     Object third party
+	 *  @param	Societe		$objsoc     Object third party
 	 *  @param	Object		$objforref	Object for number to search
-     *  @return string      			Next free value
-     */
-    public function getNumRef($objsoc, $objforref)
-    {
-        return $this->getNextValue($objsoc, $objforref);
-    }
+	 *  @return string      			Next free value
+	 */
+	public function getNumRef($objsoc, $objforref)
+	{
+		return $this->getNextValue($objsoc, $objforref);
+	}
 }
diff --git a/htdocs/core/modules/fichinter/mod_pacific.php b/htdocs/core/modules/fichinter/mod_pacific.php
index a653dc640cb..5af891f39a2 100644
--- a/htdocs/core/modules/fichinter/mod_pacific.php
+++ b/htdocs/core/modules/fichinter/mod_pacific.php
@@ -30,10 +30,10 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/fichinter/modules_fichinter.php';
  */
 class mod_pacific extends ModeleNumRefFicheinter
 {
-    /**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	/**
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
 	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 
 	public $prefix = 'FI';
@@ -59,13 +59,13 @@ class mod_pacific extends ModeleNumRefFicheinter
 	/**
 	 *  Return description of numbering module
 	 *
-     *  @return     string      Text with description
-     */
-    public function info()
-    {
-    	global $langs;
-      	return $langs->trans("SimpleNumRefModelDesc", $this->prefix);
-    }
+	 *  @return     string      Text with description
+	 */
+	public function info()
+	{
+		global $langs;
+	  	return $langs->trans("SimpleNumRefModelDesc", $this->prefix);
+	}
 
 	/**
 	 *  Return an example of numbering
@@ -143,8 +143,8 @@ class mod_pacific extends ModeleNumRefFicheinter
 		$date = $object->datec;
 		$yymm = strftime("%y%m", $date);
 
-    	if ($max >= (pow(10, 4) - 1)) $num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
-    	else $num = sprintf("%04s", $max + 1);
+		if ($max >= (pow(10, 4) - 1)) $num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
+		else $num = sprintf("%04s", $max + 1);
 
 		return $this->prefix.$yymm."-".$num;
 	}
diff --git a/htdocs/core/modules/holiday/mod_holiday_immaculate.php b/htdocs/core/modules/holiday/mod_holiday_immaculate.php
index 281af533f05..bedcfb0cc80 100644
--- a/htdocs/core/modules/holiday/mod_holiday_immaculate.php
+++ b/htdocs/core/modules/holiday/mod_holiday_immaculate.php
@@ -31,9 +31,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/holiday/modules_holiday.php';
 class mod_holiday_immaculate extends ModelNumRefHolidays
 {
 	/**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
 	public $version = 'dolibarr';
 
 	/**
@@ -63,9 +63,9 @@ class mod_holiday_immaculate extends ModelNumRefHolidays
 	 *
 	 *	@return     string      text description
 	 */
-    public function info()
-    {
-        global $db, $conf, $langs;
+	public function info()
+	{
+		global $db, $conf, $langs;
 
 		$langs->load("bills");
 
@@ -92,20 +92,20 @@ class mod_holiday_immaculate extends ModelNumRefHolidays
 		$texte .= '</form>';
 
 		return $texte;
-    }
+	}
 
 	/**
 	 *	Return numbering example
 	 *
 	 *	@return     string      Example
 	 */
-    public function getExample()
-    {
-     	global $conf, $langs, $user;
+	public function getExample()
+	{
+	 	global $conf, $langs, $user;
 
-    	$old_login = $user->login;
-    	$user->login = 'UUUUUUU';
-     	$numExample = $this->getNextValue($user, '');
+		$old_login = $user->login;
+		$user->login = 'UUUUUUU';
+	 	$numExample = $this->getNextValue($user, '');
 		$user->login = $old_login;
 
 		if (!$numExample)
@@ -113,7 +113,7 @@ class mod_holiday_immaculate extends ModelNumRefHolidays
 			$numExample = $langs->trans('NotConfigured');
 		}
 		return $numExample;
-    }
+	}
 
 	/**
 	 *	Return next value
@@ -122,8 +122,8 @@ class mod_holiday_immaculate extends ModelNumRefHolidays
 	 *	@param	Object		$holiday	holiday object
 	 *	@return string      			Value if OK, 0 if KO
 	 */
-    public function getNextValue($user, $holiday)
-    {
+	public function getNextValue($user, $holiday)
+	{
 		global $db, $conf;
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
@@ -141,7 +141,7 @@ class mod_holiday_immaculate extends ModelNumRefHolidays
 		return  $numFinal;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return next value
 	 *
@@ -149,9 +149,9 @@ class mod_holiday_immaculate extends ModelNumRefHolidays
 	 *  @param  Object		$objforref	Holiday object
 	 *  @return string      			Value if OK, 0 if KO
 	 */
-    public function holiday_get_num($fuser, $objforref)
-    {
-        // phpcs:enable
-        return $this->getNextValue($fuser, $objforref);
-    }
+	public function holiday_get_num($fuser, $objforref)
+	{
+		// phpcs:enable
+		return $this->getNextValue($fuser, $objforref);
+	}
 }
diff --git a/htdocs/core/modules/holiday/mod_holiday_madonna.php b/htdocs/core/modules/holiday/mod_holiday_madonna.php
index 348b25e8338..5028cad8afc 100644
--- a/htdocs/core/modules/holiday/mod_holiday_madonna.php
+++ b/htdocs/core/modules/holiday/mod_holiday_madonna.php
@@ -30,9 +30,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/holiday/modules_holiday.php';
 class mod_holiday_madonna extends ModelNumRefHolidays
 {
 	/**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
 	public $version = 'dolibarr';
 
 	public $prefix = 'HL';
@@ -65,11 +65,11 @@ class mod_holiday_madonna extends ModelNumRefHolidays
 	 *
 	 *	@return     string      text description
 	 */
-    public function info()
-    {
-    	global $langs;
-      	return $langs->trans("SimpleNumRefModelDesc", $this->prefix);
-    }
+	public function info()
+	{
+		global $langs;
+	  	return $langs->trans("SimpleNumRefModelDesc", $this->prefix);
+	}
 
 
 	/**
@@ -155,7 +155,7 @@ class mod_holiday_madonna extends ModelNumRefHolidays
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Return next value
 	 *
@@ -165,7 +165,7 @@ class mod_holiday_madonna extends ModelNumRefHolidays
 	 */
 	public function holiday_get_num($fuser, $objforref)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		return $this->getNextValue($fuser, $objforref);
 	}
 }
diff --git a/htdocs/core/modules/holiday/modules_holiday.php b/htdocs/core/modules/holiday/modules_holiday.php
index af84224dfa2..afd83c7429e 100644
--- a/htdocs/core/modules/holiday/modules_holiday.php
+++ b/htdocs/core/modules/holiday/modules_holiday.php
@@ -44,17 +44,17 @@ abstract class ModelePDFHoliday extends CommonDocGenerator
 	public $error = '';
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
 	 *	Return list of active generation modules
 	 *
-     *  @param  DoliDB  $db     			Database handler
-     *  @param  integer	$maxfilenamelength  Max length of value to show
-     *  @return	array						List of templates
-     */
+	 *  @param  DoliDB  $db     			Database handler
+	 *  @param  integer	$maxfilenamelength  Max length of value to show
+	 *  @return	array						List of templates
+	 */
 	public static function liste_modeles($db, $maxfilenamelength = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 		$type = 'holiday';
diff --git a/htdocs/core/modules/import/import_csv.modules.php b/htdocs/core/modules/import/import_csv.modules.php
index 330454e2105..959cb45a77e 100644
--- a/htdocs/core/modules/import/import_csv.modules.php
+++ b/htdocs/core/modules/import/import_csv.modules.php
@@ -33,12 +33,12 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/import/modules_import.php';
  */
 class ImportCsv extends ModeleImports
 {
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $datatoimport;
+	public $datatoimport;
 
 	/**
 	 * @var string Error code (or message)
@@ -50,22 +50,22 @@ class ImportCsv extends ModeleImports
 	 */
 	public $errors = array();
 
-    /**
+	/**
 	 * @var int ID
 	 */
 	public $id;
 
 	/**
-     * @var string label
-     */
-    public $label;
+	 * @var string label
+	 */
+	public $label;
 
 	public $extension; // Extension of files imported by driver
 
 	/**
-     * Dolibarr version of driver
-     * @var string
-     */
+	 * Dolibarr version of driver
+	 * @var string
+	 */
 	public $version = 'dolibarr';
 
 	public $label_lib; // Label of external lib used by driver
@@ -93,7 +93,7 @@ class ImportCsv extends ModeleImports
 	 *	@param	DoliDB		$db				Database handler
 	 *	@param	string		$datatoimport	String code describing import set (ex: 'societe_1')
 	 */
-    public function __construct($db, $datatoimport)
+	public function __construct($db, $datatoimport)
 	{
 		global $conf, $langs;
 		$this->db = $db;
@@ -118,20 +118,20 @@ class ImportCsv extends ModeleImports
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * 	Output header of an example file for this format
 	 *
 	 * 	@param	Translate	$outputlangs		Output language
 	 *  @return	string							Empty string
 	 */
-    public function write_header_example($outputlangs)
+	public function write_header_example($outputlangs)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		return '';
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * 	Output title line of an example file for this format
 	 *
@@ -139,14 +139,14 @@ class ImportCsv extends ModeleImports
 	 *  @param	array		$headerlinefields	Array of fields name
 	 * 	@return	string							String output
 	 */
-    public function write_title_example($outputlangs, $headerlinefields)
+	public function write_title_example($outputlangs, $headerlinefields)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$s = join($this->separator, array_map('cleansep', $headerlinefields));
 		return $s."\n";
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * 	Output record of an example file for this format
 	 *
@@ -154,37 +154,37 @@ class ImportCsv extends ModeleImports
 	 * 	@param	array		$contentlinevalues	Array of lines
 	 * 	@return	string							String output
 	 */
-    public function write_record_example($outputlangs, $contentlinevalues)
+	public function write_record_example($outputlangs, $contentlinevalues)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$s = join($this->separator, array_map('cleansep', $contentlinevalues));
 		return $s."\n";
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * 	Output footer of an example file for this format
 	 *
 	 * 	@param	Translate	$outputlangs		Output language
 	 *  @return	string							Empty string
 	 */
-    public function write_footer_example($outputlangs)
+	public function write_footer_example($outputlangs)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		return '';
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Open input file
 	 *
 	 *	@param	string	$file		Path of filename
 	 *	@return	int					<0 if KO, >=0 if OK
 	 */
-    public function import_open_file($file)
+	public function import_open_file($file)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 		$ret = 1;
 
@@ -206,42 +206,42 @@ class ImportCsv extends ModeleImports
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * 	Return nb of records. File must be closed.
 	 *
 	 *	@param	string	$file		Path of filename
 	 * 	@return		int		<0 if KO, >=0 if OK
 	 */
-    public function import_get_nb_of_lines($file)
-    {
-        // phpcs:enable
-        return dol_count_nb_of_line($file);
-    }
+	public function import_get_nb_of_lines($file)
+	{
+		// phpcs:enable
+		return dol_count_nb_of_line($file);
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * 	Input header line from file
 	 *
 	 * 	@return		int		<0 if KO, >=0 if OK
 	 */
-    public function import_read_header()
+	public function import_read_header()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		return 0;
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * 	Return array of next record in input file.
 	 *
 	 * 	@return		Array		Array of field values. Data are UTF8 encoded. [fieldpos] => (['val']=>val, ['type']=>-1=null,0=blank,1=not empty string)
 	 */
-    public function import_read_record()
+	public function import_read_record()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 		$arrayres = fgetcsv($this->handle, 100000, $this->separator, $this->enclosure, $this->escape);
@@ -285,21 +285,21 @@ class ImportCsv extends ModeleImports
 		return $newarrayres;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * 	Close file handle
 	 *
 	 *  @return	integer
 	 */
-    public function import_close_file()
+	public function import_close_file()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		fclose($this->handle);
 		return 0;
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Insert a record into database
 	 *
@@ -311,11 +311,11 @@ class ImportCsv extends ModeleImports
 	 * @param	array	$updatekeys						Array of keys to use to try to do an update first before insert. This field are defined into the module descriptor.
 	 * @return	int										<0 if KO, >0 if OK
 	 */
-    public function import_insert($arrayrecord, $array_match_file_to_database, $objimport, $maxfields, $importid, $updatekeys)
+	public function import_insert($arrayrecord, $array_match_file_to_database, $objimport, $maxfields, $importid, $updatekeys)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs, $conf, $user;
-        global $thirdparty_static; // Specific to thirdparty import
+		global $thirdparty_static; // Specific to thirdparty import
 		global $tablewithentity_cache; // Cache to avoid to call  desc at each rows on tables
 
 		$error = 0;
@@ -369,18 +369,18 @@ class ImportCsv extends ModeleImports
 				}
 
 				// array of fields to column index
-                $arrayfield = array();
-                foreach ($sort_array_match_file_to_database as $key => $val) {
-                    $arrayfield[$val] = ($key - 1);
-                }
+				$arrayfield = array();
+				foreach ($sort_array_match_file_to_database as $key => $val) {
+					$arrayfield[$val] = ($key - 1);
+				}
 
 				// Loop on each fields in the match array: $key = 1..n, $val=alias of field (s.nom)
 				foreach ($sort_array_match_file_to_database as $key => $val)
 				{
-				    $fieldalias = preg_replace('/\..*$/i', '', $val);
-				    $fieldname = preg_replace('/^.*\./i', '', $val);
+					$fieldalias = preg_replace('/\..*$/i', '', $val);
+					$fieldname = preg_replace('/^.*\./i', '', $val);
 
-				    if ($alias != $fieldalias) continue; // Not a field of current table
+					if ($alias != $fieldalias) continue; // Not a field of current table
 
 					if ($key <= $maxfields)
 					{
@@ -400,43 +400,42 @@ class ImportCsv extends ModeleImports
 						}
 						// Test format only if field is not a missing mandatory field (field may be a value or empty but not mandatory)
 						else {
-						    // We convert field if required
-						    if (!empty($objimport->array_import_convertvalue[0][$val]))
-						    {
-                                //print 'Must convert '.$newval.' with rule '.join(',',$objimport->array_import_convertvalue[0][$val]).'. ';
-                                if ($objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeid'
-                                	|| $objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromref'
-                                	|| $objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeorlabel'
-                                	)
-                                {
-                                    // New val can be an id or ref. If it start with id: it is forced to id, if it start with ref: it is forced to ref. It not, we try to guess.
-                                    $isidorref = 'id';
-                                    if (!is_numeric($newval) && $newval != '' && !preg_match('/^id:/i', $newval)) $isidorref = 'ref';
+							// We convert field if required
+							if (!empty($objimport->array_import_convertvalue[0][$val]))
+							{
+								//print 'Must convert '.$newval.' with rule '.join(',',$objimport->array_import_convertvalue[0][$val]).'. ';
+								if ($objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeid'
+									|| $objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromref'
+									|| $objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeorlabel'
+									)
+								{
+									// New val can be an id or ref. If it start with id: it is forced to id, if it start with ref: it is forced to ref. It not, we try to guess.
+									$isidorref = 'id';
+									if (!is_numeric($newval) && $newval != '' && !preg_match('/^id:/i', $newval)) $isidorref = 'ref';
 
-                                    $newval = preg_replace('/^(id|ref):/i', '', $newval); // Remove id: or ref: that was used to force if field is id or ref
-                                    //print 'Val is now '.$newval.' and is type '.$isidorref."<br>\n";
+									$newval = preg_replace('/^(id|ref):/i', '', $newval); // Remove id: or ref: that was used to force if field is id or ref
+									//print 'Val is now '.$newval.' and is type '.$isidorref."<br>\n";
 
-                                    if ($isidorref == 'ref')    // If value into input import file is a ref, we apply the function defined into descriptor
-                                    {
-                                        $file = (empty($objimport->array_import_convertvalue[0][$val]['classfile']) ? $objimport->array_import_convertvalue[0][$val]['file'] : $objimport->array_import_convertvalue[0][$val]['classfile']);
-                                        $class = $objimport->array_import_convertvalue[0][$val]['class'];
-                                        $method = $objimport->array_import_convertvalue[0][$val]['method'];
-                                        if ($this->cacheconvert[$file.'_'.$class.'_'.$method.'_'][$newval] != '')
-                                        {
-                                        	$newval = $this->cacheconvert[$file.'_'.$class.'_'.$method.'_'][$newval];
-                                        } else {
-                                            $resultload = dol_include_once($file);
-                                            if (empty($resultload))
-                                            {
-                                                dol_print_error('', 'Error trying to call file='.$file.', class='.$class.', method='.$method);
-                                                break;
-                                            }
-                                            $classinstance = new $class($this->db);
-                                            // Try the fetch from code or ref
-                                            $param_array = array('', $newval);
-                                            if ($class == 'AccountingAccount') {
-                                                //var_dump($arrayrecord[0]['val']);
-                                                /*include_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountancysystem.class.php';
+									if ($isidorref == 'ref') {    // If value into input import file is a ref, we apply the function defined into descriptor
+										$file = (empty($objimport->array_import_convertvalue[0][$val]['classfile']) ? $objimport->array_import_convertvalue[0][$val]['file'] : $objimport->array_import_convertvalue[0][$val]['classfile']);
+										$class = $objimport->array_import_convertvalue[0][$val]['class'];
+										$method = $objimport->array_import_convertvalue[0][$val]['method'];
+										if ($this->cacheconvert[$file.'_'.$class.'_'.$method.'_'][$newval] != '')
+										{
+											$newval = $this->cacheconvert[$file.'_'.$class.'_'.$method.'_'][$newval];
+										} else {
+											$resultload = dol_include_once($file);
+											if (empty($resultload))
+											{
+												dol_print_error('', 'Error trying to call file='.$file.', class='.$class.', method='.$method);
+												break;
+											}
+											$classinstance = new $class($this->db);
+											// Try the fetch from code or ref
+											$param_array = array('', $newval);
+											if ($class == 'AccountingAccount') {
+												//var_dump($arrayrecord[0]['val']);
+												/*include_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountancysystem.class.php';
                                                  $tmpchartofaccount = new AccountancySystem($this->db);
                                                  $tmpchartofaccount->fetch($conf->global->CHARTOFACCOUNTS);
                                                  var_dump($tmpchartofaccount->ref.' - '.$arrayrecord[0]['val']);
@@ -447,183 +446,175 @@ class ImportCsv extends ModeleImports
                                                  $errorforthistable++;
                                                  $error++;
                                                  }*/
-                                                $param_array = array('', $newval, 0, $arrayrecord[0]['val']); // Param to fetch parent from account, in chart.
-                                            }
+												$param_array = array('', $newval, 0, $arrayrecord[0]['val']); // Param to fetch parent from account, in chart.
+											}
 
-                                            call_user_func_array(array($classinstance, $method), $param_array);
-                                            // If not found, try the fetch from label
-                                            if (!($classinstance->id != '') && $objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeorlabel')
-                                            {
-                                                $param_array = array('', '', $newval);
-                                                call_user_func_array(array($classinstance, $method), $param_array);
-                                            }
-                                            $this->cacheconvert[$file.'_'.$class.'_'.$method.'_'][$newval] = $classinstance->id;
-                                            //print 'We have made a '.$class.'->'.$method.' to get id from code '.$newval.'. ';
-                                            if ($classinstance->id != '')	// id may be 0, it is a found value
-                                            {
-                                                $newval = $classinstance->id;
-                                            } else {
-                                                if (!empty($objimport->array_import_convertvalue[0][$val]['dict'])) $this->errors[$error]['lib'] = $langs->trans('ErrorFieldValueNotIn', $key, $newval, 'code', $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['dict']));
-                                                elseif (!empty($objimport->array_import_convertvalue[0][$val]['element'])) $this->errors[$error]['lib'] = $langs->trans('ErrorFieldRefNotIn', $key, $newval, $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['element']));
-                                                else $this->errors[$error]['lib'] = 'ErrorBadDefinitionOfImportProfile';
-                                                $this->errors[$error]['type'] = 'FOREIGNKEY';
-                                                $errorforthistable++;
-                                                $error++;
-                                            }
-                                        }
-                                    }
-                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeandlabel')
-                                {
-                                    $isidorref = 'id';
-                                    if (!is_numeric($newval) && $newval != '' && !preg_match('/^id:/i', $newval)) $isidorref = 'ref';
-                                    $newval = preg_replace('/^(id|ref):/i', '', $newval);
+											call_user_func_array(array($classinstance, $method), $param_array);
+											// If not found, try the fetch from label
+											if (!($classinstance->id != '') && $objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeorlabel')
+											{
+												$param_array = array('', '', $newval);
+												call_user_func_array(array($classinstance, $method), $param_array);
+											}
+											$this->cacheconvert[$file.'_'.$class.'_'.$method.'_'][$newval] = $classinstance->id;
+											//print 'We have made a '.$class.'->'.$method.' to get id from code '.$newval.'. ';
+											if ($classinstance->id != '')	// id may be 0, it is a found value
+											{
+												$newval = $classinstance->id;
+											} else {
+												if (!empty($objimport->array_import_convertvalue[0][$val]['dict'])) $this->errors[$error]['lib'] = $langs->trans('ErrorFieldValueNotIn', $key, $newval, 'code', $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['dict']));
+												elseif (!empty($objimport->array_import_convertvalue[0][$val]['element'])) $this->errors[$error]['lib'] = $langs->trans('ErrorFieldRefNotIn', $key, $newval, $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['element']));
+												else $this->errors[$error]['lib'] = 'ErrorBadDefinitionOfImportProfile';
+												$this->errors[$error]['type'] = 'FOREIGNKEY';
+												$errorforthistable++;
+												$error++;
+											}
+										}
+									}
+								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeandlabel') {
+									$isidorref = 'id';
+									if (!is_numeric($newval) && $newval != '' && !preg_match('/^id:/i', $newval)) $isidorref = 'ref';
+									$newval = preg_replace('/^(id|ref):/i', '', $newval);
 
-                                    if ($isidorref == 'ref') {
-                                        $file = (empty($objimport->array_import_convertvalue[0][$val]['classfile']) ? $objimport->array_import_convertvalue[0][$val]['file'] : $objimport->array_import_convertvalue[0][$val]['classfile']);
-                                        $class = $objimport->array_import_convertvalue[0][$val]['class'];
-                                        $method = $objimport->array_import_convertvalue[0][$val]['method'];
-                                        $codefromfield = $objimport->array_import_convertvalue[0][$val]['codefromfield'];
-                                        $code = $arrayrecord[$arrayfield[$codefromfield]]['val'];
-                                        if ($this->cacheconvert[$file.'_'.$class.'_'.$method.'_'.$code][$newval] != '') {
-                                            $newval = $this->cacheconvert[$file.'_'.$class.'_'.$method.'_'.$code][$newval];
-                                        } else {
-                                            $resultload = dol_include_once($file);
-                                            if (empty($resultload)) {
-                                                dol_print_error('', 'Error trying to call file='.$file.', class='.$class.', method='.$method.', code='.$code);
-                                                break;
-                                            }
-                                            $classinstance = new $class($this->db);
-                                            // Try the fetch from code and ref
-                                            $param_array = array('', $newval, $code);
-                                            call_user_func_array(array($classinstance, $method), $param_array);
-                                            $this->cacheconvert[$file.'_'.$class.'_'.$method.'_'.$code][$newval] = $classinstance->id;
-                                            if ($classinstance->id > 0)    // we found record
-                                            {
-                                                $newval = $classinstance->id;
-                                            } else {
-                                                if (!empty($objimport->array_import_convertvalue[0][$val]['dict'])) $this->errors[$error]['lib'] = $langs->trans('ErrorFieldValueNotIn', $key, $newval, 'scale', $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['dict']));
-                                                else $this->errors[$error]['lib'] = 'ErrorFieldValueNotIn';
-                                                $this->errors[$error]['type'] = 'FOREIGNKEY';
-                                                $errorforthistable++;
-                                                $error++;
-                                            }
-                                        }
-                                    }
-                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'zeroifnull')
-                                {
-                                    if (empty($newval)) $newval = '0';
-                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeunits' || $objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchscalefromcodeunits')
-                                {
-                                	$file = (empty($objimport->array_import_convertvalue[0][$val]['classfile']) ? $objimport->array_import_convertvalue[0][$val]['file'] : $objimport->array_import_convertvalue[0][$val]['classfile']);
-                                	$class = $objimport->array_import_convertvalue[0][$val]['class'];
-                                	$method = $objimport->array_import_convertvalue[0][$val]['method'];
-                                	$units = $objimport->array_import_convertvalue[0][$val]['units'];
-                                	if ($this->cacheconvert[$file.'_'.$class.'_'.$method.'_'.$units][$newval] != '')
-                                	{
-                                		$newval = $this->cacheconvert[$file.'_'.$class.'_'.$method.'_'.$units][$newval];
-                                	} else {
-                                		$resultload = dol_include_once($file);
-                                		if (empty($resultload))
-                                		{
-                                			dol_print_error('', 'Error trying to call file='.$file.', class='.$class.', method='.$method.', units='.$units);
-                                			break;
-                                		}
-                                		$classinstance = new $class($this->db);
-                                		// Try the fetch from code or ref
-                                		call_user_func_array(array($classinstance, $method), array('', '', $newval, $units));
-                                		$scaleorid = (($objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeunits') ? $classinstance->id : $classinstance->scale);
-                                		$this->cacheconvert[$file.'_'.$class.'_'.$method.'_'.$units][$newval] = $scaleorid;
-                                		//print 'We have made a '.$class.'->'.$method." to get a value from key '".$newval."' and we got '".$scaleorid."'.";exit;
-                                		if ($classinstance->id > 0)	// we found record
-                                		{
-                                			$newval = $scaleorid ? $scaleorid : 0;
-                                		} else {
-                                			if (!empty($objimport->array_import_convertvalue[0][$val]['dict'])) $this->errors[$error]['lib'] = $langs->trans('ErrorFieldValueNotIn', $key, $newval, 'scale', $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['dict']));
-                                			else $this->errors[$error]['lib'] = 'ErrorFieldValueNotIn';
-                                			$this->errors[$error]['type'] = 'FOREIGNKEY';
-                                			$errorforthistable++;
-                                			$error++;
-                                		}
-                                	}
-                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getcustomercodeifauto')
-                                {
-                                    if (strtolower($newval) == 'auto')
-                                    {
-                                        $this->thirpartyobject->get_codeclient(0, 0);
-                                        $newval = $this->thirpartyobject->code_client;
-                                        //print 'code_client='.$newval;
-                                    }
-                                    if (empty($newval)) $arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null"
-                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getsuppliercodeifauto')
-                                {
-                                    if (strtolower($newval) == 'auto')
-                                    {
-                                        $newval = $this->thirpartyobject->get_codefournisseur(0, 1);
-                                        $newval = $this->thirpartyobject->code_fournisseur;
-                                        //print 'code_fournisseur='.$newval;
-                                    }
-                                    if (empty($newval)) $arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null"
-                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getcustomeraccountancycodeifauto')
-                                {
-                                    if (strtolower($newval) == 'auto')
-                                    {
-                                        $this->thirpartyobject->get_codecompta('customer');
-                                        $newval = $this->thirpartyobject->code_compta;
-                                        //print 'code_compta='.$newval;
-                                    }
-                                    if (empty($newval)) $arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null"
-                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getsupplieraccountancycodeifauto')
-                                {
-                                    if (strtolower($newval) == 'auto')
-                                    {
-                                        $this->thirpartyobject->get_codecompta('supplier');
-                                        $newval = $this->thirpartyobject->code_compta_fournisseur;
-                                        if (empty($newval)) $arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null"
-                                        //print 'code_compta_fournisseur='.$newval;
-                                    }
-                                    if (empty($newval)) $arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null"
-                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getrefifauto')
-                                {
-                                    $defaultref = '';
-                                    // TODO provide the $modTask (module of generation of ref) as parameter of import_insert function
-                                    $obj = empty($conf->global->PROJECT_TASK_ADDON) ? 'mod_task_simple' : $conf->global->PROJECT_TASK_ADDON;
-                                    if (!empty($conf->global->PROJECT_TASK_ADDON) && is_readable(DOL_DOCUMENT_ROOT."/core/modules/project/task/".$conf->global->PROJECT_TASK_ADDON.".php"))
-                                    {
-                                        require_once DOL_DOCUMENT_ROOT."/core/modules/project/task/".$conf->global->PROJECT_TASK_ADDON.'.php';
-                                        $modTask = new $obj;
-                                        $defaultref = $modTask->getNextValue(null, null);
-                                    }
-                                    if (is_numeric($defaultref) && $defaultref <= 0) $defaultref = '';
-                                    $newval = $defaultref;
-                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'compute')
-                                {
-                                    $file = (empty($objimport->array_import_convertvalue[0][$val]['classfile']) ? $objimport->array_import_convertvalue[0][$val]['file'] : $objimport->array_import_convertvalue[0][$val]['classfile']);
-                                    $class = $objimport->array_import_convertvalue[0][$val]['class'];
-                                    $method = $objimport->array_import_convertvalue[0][$val]['method'];
-                                    $resultload = dol_include_once($file);
-                                    if (empty($resultload))
-                                    {
-                                        dol_print_error('', 'Error trying to call file='.$file.', class='.$class.', method='.$method);
-                                        break;
-                                    }
-                                    $classinstance = new $class($this->db);
-                                    $res = call_user_func_array(array($classinstance, $method), array(&$arrayrecord));
-                                    if ($res < 0) {
-                                        if (!empty($objimport->array_import_convertvalue[0][$val]['dict'])) $this->errors[$error]['lib'] = $langs->trans('ErrorFieldValueNotIn', $key, $newval, 'code', $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['dict']));
-                                        else $this->errors[$error]['lib'] = 'ErrorFieldValueNotIn';
-                                        $this->errors[$error]['type'] = 'FOREIGNKEY';
-                                        $errorforthistable++;
-                                        $error++;
-                                    }
-                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'numeric')
-                                {
-                                    $newval = price2num($newval);
-                                }
+									if ($isidorref == 'ref') {
+										$file = (empty($objimport->array_import_convertvalue[0][$val]['classfile']) ? $objimport->array_import_convertvalue[0][$val]['file'] : $objimport->array_import_convertvalue[0][$val]['classfile']);
+										$class = $objimport->array_import_convertvalue[0][$val]['class'];
+										$method = $objimport->array_import_convertvalue[0][$val]['method'];
+										$codefromfield = $objimport->array_import_convertvalue[0][$val]['codefromfield'];
+										$code = $arrayrecord[$arrayfield[$codefromfield]]['val'];
+										if ($this->cacheconvert[$file.'_'.$class.'_'.$method.'_'.$code][$newval] != '') {
+											$newval = $this->cacheconvert[$file.'_'.$class.'_'.$method.'_'.$code][$newval];
+										} else {
+											$resultload = dol_include_once($file);
+											if (empty($resultload)) {
+												dol_print_error('', 'Error trying to call file='.$file.', class='.$class.', method='.$method.', code='.$code);
+												break;
+											}
+											$classinstance = new $class($this->db);
+											// Try the fetch from code and ref
+											$param_array = array('', $newval, $code);
+											call_user_func_array(array($classinstance, $method), $param_array);
+											$this->cacheconvert[$file.'_'.$class.'_'.$method.'_'.$code][$newval] = $classinstance->id;
+											if ($classinstance->id > 0)    // we found record
+											{
+												$newval = $classinstance->id;
+											} else {
+												if (!empty($objimport->array_import_convertvalue[0][$val]['dict'])) $this->errors[$error]['lib'] = $langs->trans('ErrorFieldValueNotIn', $key, $newval, 'scale', $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['dict']));
+												else $this->errors[$error]['lib'] = 'ErrorFieldValueNotIn';
+												$this->errors[$error]['type'] = 'FOREIGNKEY';
+												$errorforthistable++;
+												$error++;
+											}
+										}
+									}
+								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'zeroifnull') {
+									if (empty($newval)) $newval = '0';
+								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeunits' || $objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchscalefromcodeunits') {
+									$file = (empty($objimport->array_import_convertvalue[0][$val]['classfile']) ? $objimport->array_import_convertvalue[0][$val]['file'] : $objimport->array_import_convertvalue[0][$val]['classfile']);
+									$class = $objimport->array_import_convertvalue[0][$val]['class'];
+									$method = $objimport->array_import_convertvalue[0][$val]['method'];
+									$units = $objimport->array_import_convertvalue[0][$val]['units'];
+									if ($this->cacheconvert[$file.'_'.$class.'_'.$method.'_'.$units][$newval] != '')
+									{
+										$newval = $this->cacheconvert[$file.'_'.$class.'_'.$method.'_'.$units][$newval];
+									} else {
+										$resultload = dol_include_once($file);
+										if (empty($resultload))
+										{
+											dol_print_error('', 'Error trying to call file='.$file.', class='.$class.', method='.$method.', units='.$units);
+											break;
+										}
+										$classinstance = new $class($this->db);
+										// Try the fetch from code or ref
+										call_user_func_array(array($classinstance, $method), array('', '', $newval, $units));
+										$scaleorid = (($objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeunits') ? $classinstance->id : $classinstance->scale);
+										$this->cacheconvert[$file.'_'.$class.'_'.$method.'_'.$units][$newval] = $scaleorid;
+										//print 'We have made a '.$class.'->'.$method." to get a value from key '".$newval."' and we got '".$scaleorid."'.";exit;
+										if ($classinstance->id > 0)	// we found record
+										{
+											$newval = $scaleorid ? $scaleorid : 0;
+										} else {
+											if (!empty($objimport->array_import_convertvalue[0][$val]['dict'])) $this->errors[$error]['lib'] = $langs->trans('ErrorFieldValueNotIn', $key, $newval, 'scale', $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['dict']));
+											else $this->errors[$error]['lib'] = 'ErrorFieldValueNotIn';
+											$this->errors[$error]['type'] = 'FOREIGNKEY';
+											$errorforthistable++;
+											$error++;
+										}
+									}
+								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getcustomercodeifauto') {
+									if (strtolower($newval) == 'auto')
+									{
+										$this->thirpartyobject->get_codeclient(0, 0);
+										$newval = $this->thirpartyobject->code_client;
+										//print 'code_client='.$newval;
+									}
+									if (empty($newval)) $arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null"
+								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getsuppliercodeifauto') {
+									if (strtolower($newval) == 'auto')
+									{
+										$newval = $this->thirpartyobject->get_codefournisseur(0, 1);
+										$newval = $this->thirpartyobject->code_fournisseur;
+										//print 'code_fournisseur='.$newval;
+									}
+									if (empty($newval)) $arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null"
+								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getcustomeraccountancycodeifauto') {
+									if (strtolower($newval) == 'auto')
+									{
+										$this->thirpartyobject->get_codecompta('customer');
+										$newval = $this->thirpartyobject->code_compta;
+										//print 'code_compta='.$newval;
+									}
+									if (empty($newval)) $arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null"
+								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getsupplieraccountancycodeifauto') {
+									if (strtolower($newval) == 'auto')
+									{
+										$this->thirpartyobject->get_codecompta('supplier');
+										$newval = $this->thirpartyobject->code_compta_fournisseur;
+										if (empty($newval)) $arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null"
+										//print 'code_compta_fournisseur='.$newval;
+									}
+									if (empty($newval)) $arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null"
+								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getrefifauto') {
+									$defaultref = '';
+									// TODO provide the $modTask (module of generation of ref) as parameter of import_insert function
+									$obj = empty($conf->global->PROJECT_TASK_ADDON) ? 'mod_task_simple' : $conf->global->PROJECT_TASK_ADDON;
+									if (!empty($conf->global->PROJECT_TASK_ADDON) && is_readable(DOL_DOCUMENT_ROOT."/core/modules/project/task/".$conf->global->PROJECT_TASK_ADDON.".php"))
+									{
+										require_once DOL_DOCUMENT_ROOT."/core/modules/project/task/".$conf->global->PROJECT_TASK_ADDON.'.php';
+										$modTask = new $obj;
+										$defaultref = $modTask->getNextValue(null, null);
+									}
+									if (is_numeric($defaultref) && $defaultref <= 0) $defaultref = '';
+									$newval = $defaultref;
+								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'compute') {
+									$file = (empty($objimport->array_import_convertvalue[0][$val]['classfile']) ? $objimport->array_import_convertvalue[0][$val]['file'] : $objimport->array_import_convertvalue[0][$val]['classfile']);
+									$class = $objimport->array_import_convertvalue[0][$val]['class'];
+									$method = $objimport->array_import_convertvalue[0][$val]['method'];
+									$resultload = dol_include_once($file);
+									if (empty($resultload))
+									{
+										dol_print_error('', 'Error trying to call file='.$file.', class='.$class.', method='.$method);
+										break;
+									}
+									$classinstance = new $class($this->db);
+									$res = call_user_func_array(array($classinstance, $method), array(&$arrayrecord));
+									if ($res < 0) {
+										if (!empty($objimport->array_import_convertvalue[0][$val]['dict'])) $this->errors[$error]['lib'] = $langs->trans('ErrorFieldValueNotIn', $key, $newval, 'code', $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['dict']));
+										else $this->errors[$error]['lib'] = 'ErrorFieldValueNotIn';
+										$this->errors[$error]['type'] = 'FOREIGNKEY';
+										$errorforthistable++;
+										$error++;
+									} else {
+										$newval = $arrayrecord[($key - 1)]['val'];	//We get new value computed.
+									}
+								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'numeric') {
+									$newval = price2num($newval);
+								}
 
-                                //print 'Val to use as insert is '.$newval.'<br>';
-						    }
+								//print 'Val to use as insert is '.$newval.'<br>';
+							}
 
-						    // Test regexp
+							// Test regexp
 							if (!empty($objimport->array_import_regex[0][$val]) && ($newval != ''))
 							{
 								// If test is "Must exist in a field@table or field@table:..."
@@ -668,13 +659,13 @@ class ImportCsv extends ModeleImports
 										if (!empty($filter)) $tableforerror .= ':'.$filter;
 										$this->errors[$error]['lib'] = $langs->transnoentitiesnoconv('ErrorFieldValueNotIn', $key, $newval, $field, $tableforerror);
 										$this->errors[$error]['type'] = 'FOREIGNKEY';
-									    $errorforthistable++;
+										$errorforthistable++;
 										$error++;
 									}
 								}
 								// If test is just a static regex
 								elseif (!preg_match('/'.$objimport->array_import_regex[0][$val].'/i', $newval)) {
-								    //if ($key == 19) print "xxx".$newval."zzz".$objimport->array_import_regex[0][$val]."<br>";
+									//if ($key == 19) print "xxx".$newval."zzz".$objimport->array_import_regex[0][$val]."<br>";
 									$this->errors[$error]['lib'] = $langs->transnoentitiesnoconv('ErrorWrongValueForField', $key, $newval, $objimport->array_import_regex[0][$val]);
 									$this->errors[$error]['type'] = 'REGEX';
 									$errorforthistable++;
@@ -691,12 +682,12 @@ class ImportCsv extends ModeleImports
 
 						// Note: arrayrecord (and 'type') is filled with ->import_read_record called by import.php page before calling import_insert
 						if (empty($newval) && $arrayrecord[($key - 1)]['type'] < 0) {
-                            $listvalues[] = ($newval == '0' ? $newval : "null");
-                        } elseif (empty($newval) && $arrayrecord[($key - 1)]['type'] == 0) {
-                            $listvalues[] = "''";
-                        } else {
-                            $listvalues[] = "'".$this->db->escape($newval)."'";
-                        }
+							$listvalues[] = ($newval == '0' ? $newval : "null");
+						} elseif (empty($newval) && $arrayrecord[($key - 1)]['type'] == 0) {
+							$listvalues[] = "''";
+						} else {
+							$listvalues[] = "'".$this->db->escape($newval)."'";
+						}
 					}
 					$i++;
 				}
@@ -704,33 +695,33 @@ class ImportCsv extends ModeleImports
 				// We add hidden fields (but only if there is at least one field to add into table)
 				if (!empty($listfields) && is_array($objimport->array_import_fieldshidden[0]))
 				{
-    				// Loop on each hidden fields to add them into listfields/listvalues
-				    foreach ($objimport->array_import_fieldshidden[0] as $key => $val)
-    				{
-    					if (!preg_match('/^'.preg_quote($alias, '/').'\./', $key)) continue; // Not a field of current table
-    				    if ($val == 'user->id')
-    				    {
-    				        $listfields[] = preg_replace('/^'.preg_quote($alias, '/').'\./', '', $key);
-    				        $listvalues[] = $user->id;
-    				    } elseif (preg_match('/^lastrowid-/', $val))
-    				    {
-    				        $tmp = explode('-', $val);
-    				        $lastinsertid = (isset($last_insert_id_array[$tmp[1]])) ? $last_insert_id_array[$tmp[1]] : 0;
+					// Loop on each hidden fields to add them into listfields/listvalues
+					foreach ($objimport->array_import_fieldshidden[0] as $key => $val)
+					{
+						if (!preg_match('/^'.preg_quote($alias, '/').'\./', $key)) continue; // Not a field of current table
+						if ($val == 'user->id')
+						{
+							$listfields[] = preg_replace('/^'.preg_quote($alias, '/').'\./', '', $key);
+							$listvalues[] = $user->id;
+						} elseif (preg_match('/^lastrowid-/', $val))
+						{
+							$tmp = explode('-', $val);
+							$lastinsertid = (isset($last_insert_id_array[$tmp[1]])) ? $last_insert_id_array[$tmp[1]] : 0;
 							$keyfield = preg_replace('/^'.preg_quote($alias, '/').'\./', '', $key);
-    				        $listfields[] = $keyfield;
-                            $listvalues[] = $lastinsertid;
-    				        //print $key."-".$val."-".$listfields."-".$listvalues."<br>";exit;
-    				    } elseif (preg_match('/^const-/', $val))
-    				    {
-    				    	$tmp = explode('-', $val, 2);
-    				    	$listfields[] = preg_replace('/^'.preg_quote($alias, '/').'\./', '', $key);
-    				    	$listvalues[] = "'".$tmp[1]."'";
-    				    } else {
-    				    	$this->errors[$error]['lib'] = 'Bad value of profile setup '.$val.' for array_import_fieldshidden';
-    				    	$this->errors[$error]['type'] = 'Import profile setup';
-    				    	$error++;
-    				    }
-    				}
+							$listfields[] = $keyfield;
+							$listvalues[] = $lastinsertid;
+							//print $key."-".$val."-".$listfields."-".$listvalues."<br>";exit;
+						} elseif (preg_match('/^const-/', $val))
+						{
+							$tmp = explode('-', $val, 2);
+							$listfields[] = preg_replace('/^'.preg_quote($alias, '/').'\./', '', $key);
+							$listvalues[] = "'".$tmp[1]."'";
+						} else {
+							$this->errors[$error]['lib'] = 'Bad value of profile setup '.$val.' for array_import_fieldshidden';
+							$this->errors[$error]['type'] = 'Import profile setup';
+							$error++;
+						}
+					}
 				}
 				//print 'listfields='.$listfields.'<br>listvalues='.$listvalues.'<br>';
 
@@ -861,8 +852,8 @@ class ImportCsv extends ModeleImports
 								$resql = $this->db->query($sql);
 								if ($resql)
 								{
-								    $last_insert_id_array[$tablename] = $this->db->last_insert_id($tablename); // store the last inserted auto_increment id for each table, so that child tables can be inserted with the appropriate id. This must be done just after the INSERT request, else we risk losing the id (because another sql query will be issued somewhere in Dolibarr).
-								    $insertdone = true;
+									$last_insert_id_array[$tablename] = $this->db->last_insert_id($tablename); // store the last inserted auto_increment id for each table, so that child tables can be inserted with the appropriate id. This must be done just after the INSERT request, else we risk losing the id (because another sql query will be issued somewhere in Dolibarr).
+									$insertdone = true;
 								} else {
 									//print 'E';
 									$this->errors[$error]['lib'] = $this->db->lasterror();
@@ -878,7 +869,7 @@ class ImportCsv extends ModeleImports
 					}*/
 				}
 
-			    if ($error) break;
+				if ($error) break;
 			}
 
 			if ($updatedone) $this->nbupdate++;
diff --git a/htdocs/core/modules/import/import_xlsx.modules.php b/htdocs/core/modules/import/import_xlsx.modules.php
index 8e910a4fc68..5502508d350 100644
--- a/htdocs/core/modules/import/import_xlsx.modules.php
+++ b/htdocs/core/modules/import/import_xlsx.modules.php
@@ -33,14 +33,14 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/import/modules_import.php';
  */
 class ImportXlsx extends ModeleImports
 {
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $datatoimport;
+	public $datatoimport;
 
-    /**
+	/**
 	 * @var string Error code (or message)
 	 */
 	public $error = '';
@@ -50,22 +50,22 @@ class ImportXlsx extends ModeleImports
 	 */
 	public $errors = array();
 
-    /**
+	/**
 	 * @var int ID
 	 */
 	public $id;
 
 	/**
-     * @var string label
-     */
-    public $label;
+	 * @var string label
+	 */
+	public $label;
 
 	public $extension; // Extension of files imported by driver
 
 	/**
-     * Dolibarr version of driver
-     * @var string
-     */
+	 * Dolibarr version of driver
+	 * @var string
+	 */
 	public $version = 'dolibarr';
 
 	public $label_lib; // Label of external lib used by driver
@@ -74,7 +74,7 @@ class ImportXlsx extends ModeleImports
 
 	public $separator;
 
-    public $file; // Path of file
+	public $file; // Path of file
 
 	public $handle; // Handle fichier
 
@@ -95,7 +95,7 @@ class ImportXlsx extends ModeleImports
 	 *	@param	DoliDB		$db				Database handler
 	 *	@param	string		$datatoimport	String code describing import set (ex: 'societe_1')
 	 */
-    public function __construct($db, $datatoimport)
+	public function __construct($db, $datatoimport)
 	{
 		global $conf, $langs;
 		$this->db = $db;
@@ -109,56 +109,56 @@ class ImportXlsx extends ModeleImports
 		$this->version = '1.0'; // Driver version
 
 		// If driver use an external library, put its name here
-        require_once PHPEXCEL_PATH.'PHPExcel.php';
+		require_once PHPEXCEL_PATH.'PHPExcel.php';
 		require_once PHPEXCEL_PATH.'PHPExcel/Style/Alignment.php';
-        if (!class_exists('ZipArchive')) // For Excel2007, PHPExcel need ZipArchive
-        {
-                $langs->load("errors");
-                $this->error = $langs->trans('ErrorPHPNeedModule', 'zip');
-                return -1;
-        }
-        $this->label_lib = 'PhpExcel';
-        $this->version_lib = '1.8.0';
+		if (!class_exists('ZipArchive')) // For Excel2007, PHPExcel need ZipArchive
+		{
+				$langs->load("errors");
+				$this->error = $langs->trans('ErrorPHPNeedModule', 'zip');
+				return -1;
+		}
+		$this->label_lib = 'PhpExcel';
+		$this->version_lib = '1.8.0';
 
 		$this->datatoimport = $datatoimport;
 		if (preg_match('/^societe_/', $datatoimport)) $this->thirpartyobject = new Societe($this->db);
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * 	Output header of an example file for this format
 	 *
 	 * 	@param	Translate	$outputlangs		Output language
 	 *  @return	string							Empty string
 	 */
-    public function write_header_example($outputlangs)
+	public function write_header_example($outputlangs)
 	{
-        // phpcs:enable
-        global $user, $conf, $langs;
-        // create a temporary object, the final output will be generated in footer
-        if (!empty($conf->global->MAIN_USE_FILECACHE_EXPORT_EXCEL_DIR)) {
-            $cacheMethod = PHPExcel_CachedObjectStorageFactory::cache_to_discISAM;
-            $cacheSettings = array(
-                'dir' => $conf->global->MAIN_USE_FILECACHE_EXPORT_EXCEL_DIR
-            );
-            PHPExcel_Settings::setCacheStorageMethod($cacheMethod, $cacheSettings);
-        }
+		// phpcs:enable
+		global $user, $conf, $langs;
+		// create a temporary object, the final output will be generated in footer
+		if (!empty($conf->global->MAIN_USE_FILECACHE_EXPORT_EXCEL_DIR)) {
+			$cacheMethod = PHPExcel_CachedObjectStorageFactory::cache_to_discISAM;
+			$cacheSettings = array(
+				'dir' => $conf->global->MAIN_USE_FILECACHE_EXPORT_EXCEL_DIR
+			);
+			PHPExcel_Settings::setCacheStorageMethod($cacheMethod, $cacheSettings);
+		}
 
-        $this->workbook = new PHPExcel();
-        $this->workbook->getProperties()->setCreator($user->getFullName($outputlangs).' - Dolibarr '.DOL_VERSION);
-        $this->workbook->getProperties()->setTitle($outputlangs->trans("Import").' - '.$file);
-        $this->workbook->getProperties()->setSubject($outputlangs->trans("Import").' - '.$file);
-        $this->workbook->getProperties()->setDescription($outputlangs->trans("Import").' - '.$file);
+		$this->workbook = new PHPExcel();
+		$this->workbook->getProperties()->setCreator($user->getFullName($outputlangs).' - Dolibarr '.DOL_VERSION);
+		$this->workbook->getProperties()->setTitle($outputlangs->trans("Import").' - '.$file);
+		$this->workbook->getProperties()->setSubject($outputlangs->trans("Import").' - '.$file);
+		$this->workbook->getProperties()->setDescription($outputlangs->trans("Import").' - '.$file);
 
-        $this->workbook->setActiveSheetIndex(0);
-        $this->workbook->getActiveSheet()->setTitle($outputlangs->trans("Sheet"));
-        $this->workbook->getActiveSheet()->getDefaultRowDimension()->setRowHeight(16);
+		$this->workbook->setActiveSheetIndex(0);
+		$this->workbook->getActiveSheet()->setTitle($outputlangs->trans("Sheet"));
+		$this->workbook->getActiveSheet()->getDefaultRowDimension()->setRowHeight(16);
 
-        return '';
-    }
+		return '';
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * 	Output title line of an example file for this format
 	 *
@@ -166,9 +166,9 @@ class ImportXlsx extends ModeleImports
 	 *  @param	array		$headerlinefields	Array of fields name
 	 * 	@return	string							String output
 	 */
-    public function write_title_example($outputlangs, $headerlinefields)
+	public function write_title_example($outputlangs, $headerlinefields)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 		$this->workbook->getActiveSheet()->getStyle('1')->getFont()->setBold(true);
 		$this->workbook->getActiveSheet()->getStyle('1')->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_LEFT);
@@ -184,7 +184,7 @@ class ImportXlsx extends ModeleImports
 		return ''; // final output will be generated in footer
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * 	Output record of an example file for this format
 	 *
@@ -192,9 +192,9 @@ class ImportXlsx extends ModeleImports
 	 * 	@param	array		$contentlinevalues	Array of lines
 	 * 	@return	string							Empty string
 	 */
-    public function write_record_example($outputlangs, $contentlinevalues)
+	public function write_record_example($outputlangs, $contentlinevalues)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$col = 0;
 		$row = 2;
 		foreach ($contentlinevalues as $cell) {
@@ -205,16 +205,16 @@ class ImportXlsx extends ModeleImports
 		return ''; // final output will be generated in footer
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * 	Output footer of an example file for this format
 	 *
 	 * 	@param	Translate	$outputlangs		Output language
 	 *  @return	string							String output
 	 */
-    public function write_footer_example($outputlangs)
+	public function write_footer_example($outputlangs)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		// return the file content as a string
 		$tempfile = tempnam(sys_get_temp_dir(), 'dol');
 		$objWriter = new PHPExcel_Writer_Excel2007($this->workbook);
@@ -229,16 +229,16 @@ class ImportXlsx extends ModeleImports
 
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Open input file
 	 *
 	 *	@param	string	$file		Path of filename
 	 *	@return	int					<0 if KO, >=0 if OK
 	 */
-    public function import_open_file($file)
+	public function import_open_file($file)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 		$ret = 1;
 
@@ -253,16 +253,16 @@ class ImportXlsx extends ModeleImports
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * 	Return nb of records. File must be closed.
 	 *
 	 *	@param	string	$file		Path of filename
 	 * 	@return	int					<0 if KO, >=0 if OK
 	 */
-    public function import_get_nb_of_lines($file)
+	public function import_get_nb_of_lines($file)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$reader = new PHPExcel_Reader_Excel2007();
 		$this->workbook = $reader->load($file);
 
@@ -275,15 +275,15 @@ class ImportXlsx extends ModeleImports
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * 	Input header line from file
 	 *
 	 * 	@return		int		<0 if KO, >=0 if OK
 	 */
-    public function import_read_header()
+	public function import_read_header()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		// This is not called by the import code !!!
 		$this->headers = array();
 		$colcount = PHPExcel_Cell::columnIndexFromString($this->workbook->getActiveSheet()->getHighestDataColumn());
@@ -294,15 +294,15 @@ class ImportXlsx extends ModeleImports
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * 	Return array of next record in input file.
 	 *
 	 * 	@return		Array		Array of field values. Data are UTF8 encoded. [fieldpos] => (['val']=>val, ['type']=>-1=null,0=blank,1=not empty string)
 	 */
-    public function import_read_record()
+	public function import_read_record()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 		$rowcount = $this->workbook->getActiveSheet()->getHighestDataRow();
@@ -319,22 +319,22 @@ class ImportXlsx extends ModeleImports
 		return $array;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * 	Close file handle
 	 *
 	 *  @return	integer
 	 */
-    public function import_close_file()
+	public function import_close_file()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$this->workbook->disconnectWorksheets();
 		unset($this->workbook);
 	}
 
 
-    // What is this doing here ? it is common to all imports, is should be in the parent class
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// What is this doing here ? it is common to all imports, is should be in the parent class
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Insert a record into database
 	 *
@@ -346,11 +346,11 @@ class ImportXlsx extends ModeleImports
 	 * @param	array	$updatekeys						Array of keys to use to try to do an update first before insert. This field are defined into the module descriptor.
 	 * @return	int										<0 if KO, >0 if OK
 	 */
-    public function import_insert($arrayrecord, $array_match_file_to_database, $objimport, $maxfields, $importid, $updatekeys)
+	public function import_insert($arrayrecord, $array_match_file_to_database, $objimport, $maxfields, $importid, $updatekeys)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs, $conf, $user;
-        global $thirdparty_static; // Specific to thirdparty import
+		global $thirdparty_static; // Specific to thirdparty import
 		global $tablewithentity_cache; // Cache to avoid to call  desc at each rows on tables
 
 		$error = 0;
@@ -403,19 +403,19 @@ class ImportXlsx extends ModeleImports
 					//dol_syslog("Table ".$tablename." check for entity into cache is ".$tablewithentity_cache[$tablename]);
 				}
 
-                // array of fields to column index
-                $arrayfield = array();
-                foreach ($sort_array_match_file_to_database as $key => $val) {
-                    $arrayfield[$val] = ($key - 1);
-                }
+				// array of fields to column index
+				$arrayfield = array();
+				foreach ($sort_array_match_file_to_database as $key => $val) {
+					$arrayfield[$val] = ($key - 1);
+				}
 
 				// Loop on each fields in the match array: $key = 1..n, $val=alias of field (s.nom)
 				foreach ($sort_array_match_file_to_database as $key => $val)
 				{
-				    $fieldalias = preg_replace('/\..*$/i', '', $val);
-				    $fieldname = preg_replace('/^.*\./i', '', $val);
+					$fieldalias = preg_replace('/\..*$/i', '', $val);
+					$fieldname = preg_replace('/^.*\./i', '', $val);
 
-				    if ($alias != $fieldalias) continue; // Not a field of current table
+					if ($alias != $fieldalias) continue; // Not a field of current table
 
 					if ($key <= $maxfields)
 					{
@@ -435,43 +435,42 @@ class ImportXlsx extends ModeleImports
 						}
 						// Test format only if field is not a missing mandatory field (field may be a value or empty but not mandatory)
 						else {
-						    // We convert field if required
-						    if (!empty($objimport->array_import_convertvalue[0][$val]))
-						    {
-                                //print 'Must convert '.$newval.' with rule '.join(',',$objimport->array_import_convertvalue[0][$val]).'. ';
-                                if ($objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeid'
-                                	|| $objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromref'
-                                	|| $objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeorlabel'
-                                	)
-                                {
-                                    // New val can be an id or ref. If it start with id: it is forced to id, if it start with ref: it is forced to ref. It not, we try to guess.
-                                    $isidorref = 'id';
-                                    if (!is_numeric($newval) && $newval != '' && !preg_match('/^id:/i', $newval)) $isidorref = 'ref';
-                                    $newval = preg_replace('/^(id|ref):/i', '', $newval); // Remove id: or ref: that was used to force if field is id or ref
-                                    //print 'Val is now '.$newval.' and is type '.$isidorref."<br>\n";
+							// We convert field if required
+							if (!empty($objimport->array_import_convertvalue[0][$val]))
+							{
+								//print 'Must convert '.$newval.' with rule '.join(',',$objimport->array_import_convertvalue[0][$val]).'. ';
+								if ($objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeid'
+									|| $objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromref'
+									|| $objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeorlabel'
+									)
+								{
+									// New val can be an id or ref. If it start with id: it is forced to id, if it start with ref: it is forced to ref. It not, we try to guess.
+									$isidorref = 'id';
+									if (!is_numeric($newval) && $newval != '' && !preg_match('/^id:/i', $newval)) $isidorref = 'ref';
+									$newval = preg_replace('/^(id|ref):/i', '', $newval); // Remove id: or ref: that was used to force if field is id or ref
+									//print 'Val is now '.$newval.' and is type '.$isidorref."<br>\n";
 
-                                    if ($isidorref == 'ref')    // If value into input import file is a ref, we apply the function defined into descriptor
-                                    {
-                                        $file = (empty($objimport->array_import_convertvalue[0][$val]['classfile']) ? $objimport->array_import_convertvalue[0][$val]['file'] : $objimport->array_import_convertvalue[0][$val]['classfile']);
-                                        $class = $objimport->array_import_convertvalue[0][$val]['class'];
-                                        $method = $objimport->array_import_convertvalue[0][$val]['method'];
-                                        if ($this->cacheconvert[$file.'_'.$class.'_'.$method.'_'][$newval] != '')
-                                        {
-                                        	$newval = $this->cacheconvert[$file.'_'.$class.'_'.$method.'_'][$newval];
-                                        } else {
-                                            $resultload = dol_include_once($file);
-                                            if (empty($resultload))
-                                            {
-                                                dol_print_error('', 'Error trying to call file='.$file.', class='.$class.', method='.$method);
-                                                break;
-                                            }
-                                            $classinstance = new $class($this->db);
-                                            // Try the fetch from code or ref
-                                            $param_array = array('', $newval);
-                                            if ($class == 'AccountingAccount')
-                                            {
-                                                //var_dump($arrayrecord[0]['val']);
-                                                /*include_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountancysystem.class.php';
+									if ($isidorref == 'ref') {    // If value into input import file is a ref, we apply the function defined into descriptor
+										$file = (empty($objimport->array_import_convertvalue[0][$val]['classfile']) ? $objimport->array_import_convertvalue[0][$val]['file'] : $objimport->array_import_convertvalue[0][$val]['classfile']);
+										$class = $objimport->array_import_convertvalue[0][$val]['class'];
+										$method = $objimport->array_import_convertvalue[0][$val]['method'];
+										if ($this->cacheconvert[$file.'_'.$class.'_'.$method.'_'][$newval] != '')
+										{
+											$newval = $this->cacheconvert[$file.'_'.$class.'_'.$method.'_'][$newval];
+										} else {
+											$resultload = dol_include_once($file);
+											if (empty($resultload))
+											{
+												dol_print_error('', 'Error trying to call file='.$file.', class='.$class.', method='.$method);
+												break;
+											}
+											$classinstance = new $class($this->db);
+											// Try the fetch from code or ref
+											$param_array = array('', $newval);
+											if ($class == 'AccountingAccount')
+											{
+												//var_dump($arrayrecord[0]['val']);
+												/*include_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountancysystem.class.php';
                                                 $tmpchartofaccount = new AccountancySystem($this->db);
                                                 $tmpchartofaccount->fetch($conf->global->CHARTOFACCOUNTS);
                                                 var_dump($tmpchartofaccount->ref.' - '.$arrayrecord[0]['val']);
@@ -482,182 +481,174 @@ class ImportXlsx extends ModeleImports
                                                     $errorforthistable++;
                                                     $error++;
                                                 }*/
-                                                $param_array = array('', $newval, 0, $arrayrecord[0]['val']); // Param to fetch parent from account, in chart.
-                                            }
-                                            call_user_func_array(array($classinstance, $method), $param_array);
-                                            // If not found, try the fetch from label
-                                            if (!($classinstance->id != '') && $objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeorlabel')
-                                            {
-                                                $param_array = array('', '', $newval);
-                                                call_user_func_array(array($classinstance, $method), $param_array);
-                                            }
-                                            $this->cacheconvert[$file.'_'.$class.'_'.$method.'_'][$newval] = $classinstance->id;
-                                            //print 'We have made a '.$class.'->'.$method.' to get id from code '.$newval.'. ';
-                                            if ($classinstance->id != '')	// id may be 0, it is a found value
-                                            {
-                                                $newval = $classinstance->id;
-                                            } else {
-                                                if (!empty($objimport->array_import_convertvalue[0][$val]['dict'])) $this->errors[$error]['lib'] = $langs->trans('ErrorFieldValueNotIn', $key, $newval, 'code', $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['dict']));
-                                                elseif (!empty($objimport->array_import_convertvalue[0][$val]['element'])) $this->errors[$error]['lib'] = $langs->trans('ErrorFieldRefNotIn', $key, $newval, $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['element']));
-                                                else $this->errors[$error]['lib'] = 'ErrorBadDefinitionOfImportProfile';
-                                                $this->errors[$error]['type'] = 'FOREIGNKEY';
-                                                $errorforthistable++;
-                                                $error++;
-                                            }
-                                        }
-                                    }
-                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeandlabel')
-                                {
-                                    $isidorref = 'id';
-                                    if (!is_numeric($newval) && $newval != '' && !preg_match('/^id:/i', $newval)) $isidorref = 'ref';
-                                    $newval = preg_replace('/^(id|ref):/i', '', $newval);
+												$param_array = array('', $newval, 0, $arrayrecord[0]['val']); // Param to fetch parent from account, in chart.
+											}
+											call_user_func_array(array($classinstance, $method), $param_array);
+											// If not found, try the fetch from label
+											if (!($classinstance->id != '') && $objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeorlabel')
+											{
+												$param_array = array('', '', $newval);
+												call_user_func_array(array($classinstance, $method), $param_array);
+											}
+											$this->cacheconvert[$file.'_'.$class.'_'.$method.'_'][$newval] = $classinstance->id;
+											//print 'We have made a '.$class.'->'.$method.' to get id from code '.$newval.'. ';
+											if ($classinstance->id != '')	// id may be 0, it is a found value
+											{
+												$newval = $classinstance->id;
+											} else {
+												if (!empty($objimport->array_import_convertvalue[0][$val]['dict'])) $this->errors[$error]['lib'] = $langs->trans('ErrorFieldValueNotIn', $key, $newval, 'code', $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['dict']));
+												elseif (!empty($objimport->array_import_convertvalue[0][$val]['element'])) $this->errors[$error]['lib'] = $langs->trans('ErrorFieldRefNotIn', $key, $newval, $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['element']));
+												else $this->errors[$error]['lib'] = 'ErrorBadDefinitionOfImportProfile';
+												$this->errors[$error]['type'] = 'FOREIGNKEY';
+												$errorforthistable++;
+												$error++;
+											}
+										}
+									}
+								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeandlabel') {
+									$isidorref = 'id';
+									if (!is_numeric($newval) && $newval != '' && !preg_match('/^id:/i', $newval)) $isidorref = 'ref';
+									$newval = preg_replace('/^(id|ref):/i', '', $newval);
 
-                                    if ($isidorref == 'ref') {
-                                        $file = (empty($objimport->array_import_convertvalue[0][$val]['classfile']) ? $objimport->array_import_convertvalue[0][$val]['file'] : $objimport->array_import_convertvalue[0][$val]['classfile']);
-                                        $class = $objimport->array_import_convertvalue[0][$val]['class'];
-                                        $method = $objimport->array_import_convertvalue[0][$val]['method'];
-                                        $codefromfield = $objimport->array_import_convertvalue[0][$val]['codefromfield'];
-                                        $code = $arrayrecord[$arrayfield[$codefromfield]]['val'];
-                                        if ($this->cacheconvert[$file.'_'.$class.'_'.$method.'_'.$code][$newval] != '') {
-                                            $newval = $this->cacheconvert[$file.'_'.$class.'_'.$method.'_'.$code][$newval];
-                                        } else {
-                                            $resultload = dol_include_once($file);
-                                            if (empty($resultload)) {
-                                                dol_print_error('', 'Error trying to call file='.$file.', class='.$class.', method='.$method.', code='.$code);
-                                                break;
-                                            }
-                                            $classinstance = new $class($this->db);
-                                            // Try the fetch from code and ref
-                                            $param_array = array('', $newval, $code);
-                                            call_user_func_array(array($classinstance, $method), $param_array);
-                                            $this->cacheconvert[$file.'_'.$class.'_'.$method.'_'.$code][$newval] = $classinstance->id;
-                                            if ($classinstance->id > 0)    // we found record
-                                            {
-                                                $newval = $classinstance->id;
-                                            } else {
-                                                if (!empty($objimport->array_import_convertvalue[0][$val]['dict'])) $this->errors[$error]['lib'] = $langs->trans('ErrorFieldValueNotIn', $key, $newval, 'scale', $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['dict']));
-                                                else $this->errors[$error]['lib'] = 'ErrorFieldValueNotIn';
-                                                $this->errors[$error]['type'] = 'FOREIGNKEY';
-                                                $errorforthistable++;
-                                                $error++;
-                                            }
-                                        }
-                                    }
-                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'zeroifnull')
-                                {
-                                    if (empty($newval)) $newval = '0';
-                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeunits' || $objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchscalefromcodeunits')
-                                {
-                                	$file = (empty($objimport->array_import_convertvalue[0][$val]['classfile']) ? $objimport->array_import_convertvalue[0][$val]['file'] : $objimport->array_import_convertvalue[0][$val]['classfile']);
-                                	$class = $objimport->array_import_convertvalue[0][$val]['class'];
-                                	$method = $objimport->array_import_convertvalue[0][$val]['method'];
-                                	$units = $objimport->array_import_convertvalue[0][$val]['units'];
-                                	if ($this->cacheconvert[$file.'_'.$class.'_'.$method.'_'.$units][$newval] != '')
-                                	{
-                                		$newval = $this->cacheconvert[$file.'_'.$class.'_'.$method.'_'.$units][$newval];
-                                	} else {
-                                		$resultload = dol_include_once($file);
-                                		if (empty($resultload))
-                                		{
-                                			dol_print_error('', 'Error trying to call file='.$file.', class='.$class.', method='.$method.', units='.$units);
-                                			break;
-                                		}
-                                		$classinstance = new $class($this->db);
-                                		// Try the fetch from code or ref
-                                        call_user_func_array(array($classinstance, $method), array('', '', $newval, $units));
-                                        $scaleorid = (($objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeunits') ? $classinstance->id : $classinstance->scale);
-                                        $this->cacheconvert[$file.'_'.$class.'_'.$method.'_'.$units][$newval] = $scaleorid;
-                                        //print 'We have made a '.$class.'->'.$method." to get a value from key '".$newval."' and we got '".$scaleorid."'.";exit;
-                                        if ($classinstance->id > 0)	// we found record
-                                        {
-                                        	$newval = $scaleorid ? $scaleorid : 0;
-                                        } else {
-                                        	if (!empty($objimport->array_import_convertvalue[0][$val]['dict'])) $this->errors[$error]['lib'] = $langs->trans('ErrorFieldValueNotIn', $key, $newval, 'scale', $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['dict']));
-                                        	else $this->errors[$error]['lib'] = 'ErrorFieldValueNotIn';
-                                			$this->errors[$error]['type'] = 'FOREIGNKEY';
-                                			$errorforthistable++;
-                                			$error++;
-                                		}
-                                	}
-                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getcustomercodeifauto')
-                                {
-                                    if (strtolower($newval) == 'auto')
-                                    {
-                                        $this->thirpartyobject->get_codeclient(0, 0);
-                                        $newval = $this->thirpartyobject->code_client;
-                                        //print 'code_client='.$newval;
-                                    }
-                                    if (empty($newval)) $arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null"
-                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getsuppliercodeifauto')
-                                {
-                                    if (strtolower($newval) == 'auto')
-                                    {
-                                        $newval = $this->thirpartyobject->get_codefournisseur(0, 1);
-                                        $newval = $this->thirpartyobject->code_fournisseur;
-                                        //print 'code_fournisseur='.$newval;
-                                    }
-                                    if (empty($newval)) $arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null"
-                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getcustomeraccountancycodeifauto')
-                                {
-                                    if (strtolower($newval) == 'auto')
-                                    {
-                                        $this->thirpartyobject->get_codecompta('customer');
-                                        $newval = $this->thirpartyobject->code_compta;
-                                        //print 'code_compta='.$newval;
-                                    }
-                                    if (empty($newval)) $arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null"
-                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getsupplieraccountancycodeifauto')
-                                {
-                                    if (strtolower($newval) == 'auto')
-                                    {
-                                        $this->thirpartyobject->get_codecompta('supplier');
-                                        $newval = $this->thirpartyobject->code_compta_fournisseur;
-                                        if (empty($newval)) $arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null"
-                                        //print 'code_compta_fournisseur='.$newval;
-                                    }
-                                    if (empty($newval)) $arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null"
-                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getrefifauto')
-                                {
-                                    $defaultref = '';
-                                    // TODO provide the $modTask (module of generation of ref) as parameter of import_insert function
-                                    $obj = empty($conf->global->PROJECT_TASK_ADDON) ? 'mod_task_simple' : $conf->global->PROJECT_TASK_ADDON;
-                                    if (!empty($conf->global->PROJECT_TASK_ADDON) && is_readable(DOL_DOCUMENT_ROOT."/core/modules/project/task/".$conf->global->PROJECT_TASK_ADDON.".php"))
-                                    {
-                                        require_once DOL_DOCUMENT_ROOT."/core/modules/project/task/".$conf->global->PROJECT_TASK_ADDON.'.php';
-                                        $modTask = new $obj;
-                                        $defaultref = $modTask->getNextValue(null, null);
-                                    }
-                                    if (is_numeric($defaultref) && $defaultref <= 0) $defaultref = '';
-                                    $newval = $defaultref;
-                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'compute')
-                                {
-                                    $file = (empty($objimport->array_import_convertvalue[0][$val]['classfile']) ? $objimport->array_import_convertvalue[0][$val]['file'] : $objimport->array_import_convertvalue[0][$val]['classfile']);
-                                    $class = $objimport->array_import_convertvalue[0][$val]['class'];
-                                    $method = $objimport->array_import_convertvalue[0][$val]['method'];
-                                    $resultload = dol_include_once($file);
-                                    if (empty($resultload))
-                                    {
-                                        dol_print_error('', 'Error trying to call file='.$file.', class='.$class.', method='.$method);
-                                        break;
-                                    }
-                                    $classinstance = new $class($this->db);
-                                    $res = call_user_func_array(array($classinstance, $method), array(&$arrayrecord));
-                                    if ($res < 0) {
-                                        if (!empty($objimport->array_import_convertvalue[0][$val]['dict'])) $this->errors[$error]['lib'] = $langs->trans('ErrorFieldValueNotIn', $key, $newval, 'code', $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['dict']));
-                                        else $this->errors[$error]['lib'] = 'ErrorFieldValueNotIn';
-                                        $this->errors[$error]['type'] = 'FOREIGNKEY';
-                                        $errorforthistable++;
-                                        $error++;
-                                    }
-                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'numeric')
-                                {
-                                    $newval = price2num($newval);
-                                }
+									if ($isidorref == 'ref') {
+										$file = (empty($objimport->array_import_convertvalue[0][$val]['classfile']) ? $objimport->array_import_convertvalue[0][$val]['file'] : $objimport->array_import_convertvalue[0][$val]['classfile']);
+										$class = $objimport->array_import_convertvalue[0][$val]['class'];
+										$method = $objimport->array_import_convertvalue[0][$val]['method'];
+										$codefromfield = $objimport->array_import_convertvalue[0][$val]['codefromfield'];
+										$code = $arrayrecord[$arrayfield[$codefromfield]]['val'];
+										if ($this->cacheconvert[$file.'_'.$class.'_'.$method.'_'.$code][$newval] != '') {
+											$newval = $this->cacheconvert[$file.'_'.$class.'_'.$method.'_'.$code][$newval];
+										} else {
+											$resultload = dol_include_once($file);
+											if (empty($resultload)) {
+												dol_print_error('', 'Error trying to call file='.$file.', class='.$class.', method='.$method.', code='.$code);
+												break;
+											}
+											$classinstance = new $class($this->db);
+											// Try the fetch from code and ref
+											$param_array = array('', $newval, $code);
+											call_user_func_array(array($classinstance, $method), $param_array);
+											$this->cacheconvert[$file.'_'.$class.'_'.$method.'_'.$code][$newval] = $classinstance->id;
+											if ($classinstance->id > 0)    // we found record
+											{
+												$newval = $classinstance->id;
+											} else {
+												if (!empty($objimport->array_import_convertvalue[0][$val]['dict'])) $this->errors[$error]['lib'] = $langs->trans('ErrorFieldValueNotIn', $key, $newval, 'scale', $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['dict']));
+												else $this->errors[$error]['lib'] = 'ErrorFieldValueNotIn';
+												$this->errors[$error]['type'] = 'FOREIGNKEY';
+												$errorforthistable++;
+												$error++;
+											}
+										}
+									}
+								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'zeroifnull') {
+									if (empty($newval)) $newval = '0';
+								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeunits' || $objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchscalefromcodeunits') {
+									$file = (empty($objimport->array_import_convertvalue[0][$val]['classfile']) ? $objimport->array_import_convertvalue[0][$val]['file'] : $objimport->array_import_convertvalue[0][$val]['classfile']);
+									$class = $objimport->array_import_convertvalue[0][$val]['class'];
+									$method = $objimport->array_import_convertvalue[0][$val]['method'];
+									$units = $objimport->array_import_convertvalue[0][$val]['units'];
+									if ($this->cacheconvert[$file.'_'.$class.'_'.$method.'_'.$units][$newval] != '')
+									{
+										$newval = $this->cacheconvert[$file.'_'.$class.'_'.$method.'_'.$units][$newval];
+									} else {
+										$resultload = dol_include_once($file);
+										if (empty($resultload))
+										{
+											dol_print_error('', 'Error trying to call file='.$file.', class='.$class.', method='.$method.', units='.$units);
+											break;
+										}
+										$classinstance = new $class($this->db);
+										// Try the fetch from code or ref
+										call_user_func_array(array($classinstance, $method), array('', '', $newval, $units));
+										$scaleorid = (($objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeunits') ? $classinstance->id : $classinstance->scale);
+										$this->cacheconvert[$file.'_'.$class.'_'.$method.'_'.$units][$newval] = $scaleorid;
+										//print 'We have made a '.$class.'->'.$method." to get a value from key '".$newval."' and we got '".$scaleorid."'.";exit;
+										if ($classinstance->id > 0)	// we found record
+										{
+											$newval = $scaleorid ? $scaleorid : 0;
+										} else {
+											if (!empty($objimport->array_import_convertvalue[0][$val]['dict'])) $this->errors[$error]['lib'] = $langs->trans('ErrorFieldValueNotIn', $key, $newval, 'scale', $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['dict']));
+											else $this->errors[$error]['lib'] = 'ErrorFieldValueNotIn';
+											$this->errors[$error]['type'] = 'FOREIGNKEY';
+											$errorforthistable++;
+											$error++;
+										}
+									}
+								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getcustomercodeifauto') {
+									if (strtolower($newval) == 'auto')
+									{
+										$this->thirpartyobject->get_codeclient(0, 0);
+										$newval = $this->thirpartyobject->code_client;
+										//print 'code_client='.$newval;
+									}
+									if (empty($newval)) $arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null"
+								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getsuppliercodeifauto') {
+									if (strtolower($newval) == 'auto')
+									{
+										$newval = $this->thirpartyobject->get_codefournisseur(0, 1);
+										$newval = $this->thirpartyobject->code_fournisseur;
+										//print 'code_fournisseur='.$newval;
+									}
+									if (empty($newval)) $arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null"
+								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getcustomeraccountancycodeifauto') {
+									if (strtolower($newval) == 'auto')
+									{
+										$this->thirpartyobject->get_codecompta('customer');
+										$newval = $this->thirpartyobject->code_compta;
+										//print 'code_compta='.$newval;
+									}
+									if (empty($newval)) $arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null"
+								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getsupplieraccountancycodeifauto') {
+									if (strtolower($newval) == 'auto')
+									{
+										$this->thirpartyobject->get_codecompta('supplier');
+										$newval = $this->thirpartyobject->code_compta_fournisseur;
+										if (empty($newval)) $arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null"
+										//print 'code_compta_fournisseur='.$newval;
+									}
+									if (empty($newval)) $arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null"
+								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getrefifauto') {
+									$defaultref = '';
+									// TODO provide the $modTask (module of generation of ref) as parameter of import_insert function
+									$obj = empty($conf->global->PROJECT_TASK_ADDON) ? 'mod_task_simple' : $conf->global->PROJECT_TASK_ADDON;
+									if (!empty($conf->global->PROJECT_TASK_ADDON) && is_readable(DOL_DOCUMENT_ROOT."/core/modules/project/task/".$conf->global->PROJECT_TASK_ADDON.".php"))
+									{
+										require_once DOL_DOCUMENT_ROOT."/core/modules/project/task/".$conf->global->PROJECT_TASK_ADDON.'.php';
+										$modTask = new $obj;
+										$defaultref = $modTask->getNextValue(null, null);
+									}
+									if (is_numeric($defaultref) && $defaultref <= 0) $defaultref = '';
+									$newval = $defaultref;
+								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'compute') {
+									$file = (empty($objimport->array_import_convertvalue[0][$val]['classfile']) ? $objimport->array_import_convertvalue[0][$val]['file'] : $objimport->array_import_convertvalue[0][$val]['classfile']);
+									$class = $objimport->array_import_convertvalue[0][$val]['class'];
+									$method = $objimport->array_import_convertvalue[0][$val]['method'];
+									$resultload = dol_include_once($file);
+									if (empty($resultload))
+									{
+										dol_print_error('', 'Error trying to call file='.$file.', class='.$class.', method='.$method);
+										break;
+									}
+									$classinstance = new $class($this->db);
+									$res = call_user_func_array(array($classinstance, $method), array(&$arrayrecord));
+									if ($res < 0) {
+										if (!empty($objimport->array_import_convertvalue[0][$val]['dict'])) $this->errors[$error]['lib'] = $langs->trans('ErrorFieldValueNotIn', $key, $newval, 'code', $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['dict']));
+										else $this->errors[$error]['lib'] = 'ErrorFieldValueNotIn';
+										$this->errors[$error]['type'] = 'FOREIGNKEY';
+										$errorforthistable++;
+										$error++;
+									} else {
+										$newval = $arrayrecord[($key - 1)]['val'];	//We get new value computed.
+									}
+								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'numeric') {
+									$newval = price2num($newval);
+								}
 
-                                //print 'Val to use as insert is '.$newval.'<br>';
-						    }
+								//print 'Val to use as insert is '.$newval.'<br>';
+							}
 
-						    // Test regexp
+							// Test regexp
 							if (!empty($objimport->array_import_regex[0][$val]) && ($newval != ''))
 							{
 								// If test is "Must exist in a field@table or field@table:..."
@@ -702,13 +693,13 @@ class ImportXlsx extends ModeleImports
 										if (!empty($filter)) $tableforerror .= ':'.$filter;
 										$this->errors[$error]['lib'] = $langs->transnoentitiesnoconv('ErrorFieldValueNotIn', $key, $newval, $field, $tableforerror);
 										$this->errors[$error]['type'] = 'FOREIGNKEY';
-									    $errorforthistable++;
+										$errorforthistable++;
 										$error++;
 									}
 								}
 								// If test is just a static regex
 								elseif (!preg_match('/'.$objimport->array_import_regex[0][$val].'/i', $newval)) {
-								    //if ($key == 19) print "xxx".$newval."zzz".$objimport->array_import_regex[0][$val]."<br>";
+									//if ($key == 19) print "xxx".$newval."zzz".$objimport->array_import_regex[0][$val]."<br>";
 									$this->errors[$error]['lib'] = $langs->transnoentitiesnoconv('ErrorWrongValueForField', $key, $newval, $objimport->array_import_regex[0][$val]);
 									$this->errors[$error]['type'] = 'REGEX';
 									$errorforthistable++;
@@ -734,33 +725,33 @@ class ImportXlsx extends ModeleImports
 				// We add hidden fields (but only if there is at least one field to add into table)
 				if (!empty($listfields) && is_array($objimport->array_import_fieldshidden[0]))
 				{
-    				// Loop on each hidden fields to add them into listfields/listvalues
-				    foreach ($objimport->array_import_fieldshidden[0] as $key => $val)
-    				{
-    				    if (!preg_match('/^'.preg_quote($alias, '/').'\./', $key)) continue; // Not a field of current table
-    				    if ($val == 'user->id')
-    				    {
-    				        $listfields[] = preg_replace('/^'.preg_quote($alias, '/').'\./', '', $key);
-    				        $listvalues[] = $user->id;
-    				    } elseif (preg_match('/^lastrowid-/', $val))
-    				    {
-    				        $tmp = explode('-', $val);
-    				        $lastinsertid = (isset($last_insert_id_array[$tmp[1]])) ? $last_insert_id_array[$tmp[1]] : 0;
+					// Loop on each hidden fields to add them into listfields/listvalues
+					foreach ($objimport->array_import_fieldshidden[0] as $key => $val)
+					{
+						if (!preg_match('/^'.preg_quote($alias, '/').'\./', $key)) continue; // Not a field of current table
+						if ($val == 'user->id')
+						{
+							$listfields[] = preg_replace('/^'.preg_quote($alias, '/').'\./', '', $key);
+							$listvalues[] = $user->id;
+						} elseif (preg_match('/^lastrowid-/', $val))
+						{
+							$tmp = explode('-', $val);
+							$lastinsertid = (isset($last_insert_id_array[$tmp[1]])) ? $last_insert_id_array[$tmp[1]] : 0;
 							$keyfield = preg_replace('/^'.preg_quote($alias, '/').'\./', '', $key);
-    				        $listfields[] = $keyfield;
-                            $listvalues[] = $lastinsertid;
-    				        //print $key."-".$val."-".$listfields."-".$listvalues."<br>";exit;
-    				    } elseif (preg_match('/^const-/', $val))
-    				    {
-    				    	$tmp = explode('-', $val, 2);
-    				    	$listfields[] = preg_replace('/^'.preg_quote($alias, '/').'\./', '', $key);
-    				    	$listvalues[] = "'".$tmp[1]."'";
-    				    } else {
-    				    	$this->errors[$error]['lib'] = 'Bad value of profile setup '.$val.' for array_import_fieldshidden';
-    				    	$this->errors[$error]['type'] = 'Import profile setup';
-    				    	$error++;
-    				    }
-    				}
+							$listfields[] = $keyfield;
+							$listvalues[] = $lastinsertid;
+							//print $key."-".$val."-".$listfields."-".$listvalues."<br>";exit;
+						} elseif (preg_match('/^const-/', $val))
+						{
+							$tmp = explode('-', $val, 2);
+							$listfields[] = preg_replace('/^'.preg_quote($alias, '/').'\./', '', $key);
+							$listvalues[] = "'".$tmp[1]."'";
+						} else {
+							$this->errors[$error]['lib'] = 'Bad value of profile setup '.$val.' for array_import_fieldshidden';
+							$this->errors[$error]['type'] = 'Import profile setup';
+							$error++;
+						}
+					}
 				}
 				//print 'listfields='.$listfields.'<br>listvalues='.$listvalues.'<br>';
 
@@ -890,8 +881,8 @@ class ImportXlsx extends ModeleImports
 								$resql = $this->db->query($sql);
 								if ($resql)
 								{
-								    $last_insert_id_array[$tablename] = $this->db->last_insert_id($tablename); // store the last inserted auto_increment id for each table, so that child tables can be inserted with the appropriate id. This must be done just after the INSERT request, else we risk losing the id (because another sql query will be issued somewhere in Dolibarr).
-								    $insertdone = true;
+									$last_insert_id_array[$tablename] = $this->db->last_insert_id($tablename); // store the last inserted auto_increment id for each table, so that child tables can be inserted with the appropriate id. This must be done just after the INSERT request, else we risk losing the id (because another sql query will be issued somewhere in Dolibarr).
+									$insertdone = true;
 								} else {
 									//print 'E';
 									$this->errors[$error]['lib'] = $this->db->lasterror();
@@ -907,7 +898,7 @@ class ImportXlsx extends ModeleImports
 					}*/
 				}
 
-			    if ($error) break;
+				if ($error) break;
 			}
 
 			if ($updatedone) $this->nbupdate++;
diff --git a/htdocs/core/modules/import/modules_import.php b/htdocs/core/modules/import/modules_import.php
index 20524b6bdc3..27b9a6e9cf4 100644
--- a/htdocs/core/modules/import/modules_import.php
+++ b/htdocs/core/modules/import/modules_import.php
@@ -30,34 +30,34 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php';
  */
 class ModeleImports
 {
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $datatoimport;
+	public $datatoimport;
 
-    /**
+	/**
 	 * @var string Error code (or message)
 	 */
 	public $error = '';
 
-    /**
+	/**
 	 * @var int id of driver
 	 */
 	public $id;
 
-    /**
-     * @var string label
-     */
-    public $label;
+	/**
+	 * @var string label
+	 */
+	public $label;
 
 	public $extension; // Extension of files imported by driver
 
 	/**
-     * Dolibarr version of driver
-     * @var string
-     */
+	 * Dolibarr version of driver
+	 * @var string
+	 */
 	public $version = 'dolibarr';
 
 	public $label_lib; // Label of external lib used by driver
@@ -77,9 +77,9 @@ class ModeleImports
 
 
 	/**
-     *  Constructor
+	 *  Constructor
 	 */
-    public function __construct()
+	public function __construct()
 	{
 	}
 
@@ -89,9 +89,9 @@ class ModeleImports
 	 *
 	 * @return string		Id
 	 */
-    public function getDriverId()
+	public function getDriverId()
 	{
-	    return $this->id;
+		return $this->id;
 	}
 
 	/**
@@ -99,9 +99,9 @@ class ModeleImports
 	 *
 	 *	@return string	Label
 	 */
-    public function getDriverLabel()
+	public function getDriverLabel()
 	{
-	    return $this->label;
+		return $this->label;
 	}
 
 	/**
@@ -109,9 +109,9 @@ class ModeleImports
 	 *
 	 *	@return string	Description
 	 */
-    public function getDriverDesc()
+	public function getDriverDesc()
 	{
-	    return $this->desc;
+		return $this->desc;
 	}
 
 	/**
@@ -119,9 +119,9 @@ class ModeleImports
 	 *
 	 * @return string	Driver suffix
 	 */
-    public function getDriverExtension()
+	public function getDriverExtension()
 	{
-	    return $this->extension;
+		return $this->extension;
 	}
 
 	/**
@@ -129,9 +129,9 @@ class ModeleImports
 	 *
 	 *	@return string	Driver version
 	 */
-    public function getDriverVersion()
+	public function getDriverVersion()
 	{
-	    return $this->version;
+		return $this->version;
 	}
 
 	/**
@@ -139,9 +139,9 @@ class ModeleImports
 	 *
 	 *	@return string	Label of external lib
 	 */
-    public function getLibLabel()
+	public function getLibLabel()
 	{
-	    return $this->label_lib;
+		return $this->label_lib;
 	}
 
 	/**
@@ -149,23 +149,23 @@ class ModeleImports
 	 *
 	 *	@return string	Version of external lib
 	 */
-    public function getLibVersion()
+	public function getLibVersion()
 	{
-	    return $this->version_lib;
+		return $this->version_lib;
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Charge en memoire et renvoie la liste des modeles actifs
-     *
-     *  @param	DoliDB	$db     			Database handler
-     *  @param  integer	$maxfilenamelength  Max length of value to show
-     *  @return	array						List of templates
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Charge en memoire et renvoie la liste des modeles actifs
+	 *
+	 *  @param	DoliDB	$db     			Database handler
+	 *  @param  integer	$maxfilenamelength  Max length of value to show
+	 *  @return	array						List of templates
 	 */
-    public function liste_modeles($db, $maxfilenamelength = 0)
+	public function liste_modeles($db, $maxfilenamelength = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		dol_syslog(get_class($this)."::liste_modeles");
 
 		$dir = DOL_DOCUMENT_ROOT."/core/modules/import/";
@@ -173,35 +173,35 @@ class ModeleImports
 
 		// Recherche des fichiers drivers imports disponibles
 		$i = 0;
-        if (is_resource($handle))
-        {
-    		while (($file = readdir($handle)) !== false)
-    		{
-    			if (preg_match("/^import_(.*)\.modules\.php/i", $file, $reg))
-    			{
-    				$moduleid = $reg[1];
+		if (is_resource($handle))
+		{
+			while (($file = readdir($handle)) !== false)
+			{
+				if (preg_match("/^import_(.*)\.modules\.php/i", $file, $reg))
+				{
+					$moduleid = $reg[1];
 
-    				// Loading Class
-    				$file = $dir."/import_".$moduleid.".modules.php";
-    				$classname = "Import".ucfirst($moduleid);
+					// Loading Class
+					$file = $dir."/import_".$moduleid.".modules.php";
+					$classname = "Import".ucfirst($moduleid);
 
-    				require_once $file;
-    				$module = new $classname($db, '');
+					require_once $file;
+					$module = new $classname($db, '');
 
-    				// Picto
-    				$this->picto[$module->id] = $module->picto;
-    				// Driver properties
-    				$this->driverlabel[$module->id] = $module->getDriverLabel('');
-    				$this->driverdesc[$module->id] = $module->getDriverDesc('');
-    				$this->driverversion[$module->id] = $module->getDriverVersion('');
-    				// If use an external lib
-    				$this->liblabel[$module->id] = $module->getLibLabel('');
-    				$this->libversion[$module->id] = $module->getLibVersion('');
+					// Picto
+					$this->picto[$module->id] = $module->picto;
+					// Driver properties
+					$this->driverlabel[$module->id] = $module->getDriverLabel('');
+					$this->driverdesc[$module->id] = $module->getDriverDesc('');
+					$this->driverversion[$module->id] = $module->getDriverVersion('');
+					// If use an external lib
+					$this->liblabel[$module->id] = $module->getLibLabel('');
+					$this->libversion[$module->id] = $module->getLibVersion('');
 
-    				$i++;
-    			}
-    		}
-        }
+					$i++;
+				}
+			}
+		}
 
 		return array_keys($this->driverlabel);
 	}
@@ -213,7 +213,7 @@ class ModeleImports
 	 *	@param	string	$key	Key
 	 *	@return	string
 	 */
-    public function getPictoForKey($key)
+	public function getPictoForKey($key)
 	{
 		return $this->picto[$key];
 	}
@@ -224,7 +224,7 @@ class ModeleImports
 	 *	@param	string	$key	Key
 	 *	@return	string
 	 */
-    public function getDriverLabelForKey($key)
+	public function getDriverLabelForKey($key)
 	{
 		return $this->driverlabel[$key];
 	}
@@ -235,7 +235,7 @@ class ModeleImports
 	 *	@param	string	$key	Key
 	 *	@return	string
 	 */
-    public function getDriverDescForKey($key)
+	public function getDriverDescForKey($key)
 	{
 		return $this->driverdesc[$key];
 	}
@@ -246,7 +246,7 @@ class ModeleImports
 	 *	@param	string	$key	Key
 	 *	@return	string
 	 */
-    public function getDriverVersionForKey($key)
+	public function getDriverVersionForKey($key)
 	{
 		return $this->driverversion[$key];
 	}
@@ -257,7 +257,7 @@ class ModeleImports
 	 *	@param	string	$key	Key
 	 *	@return	string
 	 */
-    public function getLibLabelForKey($key)
+	public function getLibLabelForKey($key)
 	{
 		return $this->liblabel[$key];
 	}
@@ -268,7 +268,7 @@ class ModeleImports
 	 *	@param	string	$key	Key
 	 *	@return	string
 	 */
-    public function getLibVersionForKey($key)
+	public function getLibVersionForKey($key)
 	{
 		return $this->libversion[$key];
 	}
diff --git a/htdocs/core/modules/mailings/advthirdparties.modules.php b/htdocs/core/modules/mailings/advthirdparties.modules.php
index 2d6ad7307b2..2820ea00ac5 100644
--- a/htdocs/core/modules/mailings/advthirdparties.modules.php
+++ b/htdocs/core/modules/mailings/advthirdparties.modules.php
@@ -25,22 +25,22 @@ include_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
  */
 class mailing_advthirdparties extends MailingTargets
 {
-    public $name = 'ThirdPartyAdvancedTargeting';
+	public $name = 'ThirdPartyAdvancedTargeting';
 	// This label is used if no translation is found for key XXX neither MailingModuleDescXXX where XXX=name is found
-    public $desc = "Third parties";
-    public $require_admin = 0;
+	public $desc = "Third parties";
+	public $require_admin = 0;
 
-    public $require_module = array("none"); // This module should not be displayed as Selector in mailling
-
-    /**
-     * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
-     */
-    public $picto = 'company';
+	public $require_module = array("none"); // This module should not be displayed as Selector in mailling
 
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+	 */
+	public $picto = 'company';
+
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
 
 	/**
@@ -54,7 +54,7 @@ class mailing_advthirdparties extends MailingTargets
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *    This is the main function that returns the array of emails
 	 *
@@ -66,7 +66,7 @@ class mailing_advthirdparties extends MailingTargets
 	 */
 	public function add_to_target_spec($mailing_id, $socid, $type_of_target, $contactid)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $langs;
 
 		dol_syslog(get_class($this)."::add_to_target_spec socid=".var_export($socid, true).' contactid='.var_export($contactid, true));
@@ -83,41 +83,41 @@ class mailing_advthirdparties extends MailingTargets
 				$sql .= " AND s.rowid IN (".implode(',', $socid).")";
 				$sql .= " ORDER BY email";
 
-    			// Stock recipients emails into targets table
-    			$result = $this->db->query($sql);
-    			if ($result)
-    			{
-    				$num = $this->db->num_rows($result);
-    				$i = 0;
+				// Stock recipients emails into targets table
+				$result = $this->db->query($sql);
+				if ($result)
+				{
+					$num = $this->db->num_rows($result);
+					$i = 0;
 
-    				dol_syslog(get_class($this)."::add_to_target_spec mailing ".$num." targets found", LOG_DEBUG);
+					dol_syslog(get_class($this)."::add_to_target_spec mailing ".$num." targets found", LOG_DEBUG);
 
-    				while ($i < $num)
-    				{
-    					$obj = $this->db->fetch_object($result);
+					while ($i < $num)
+					{
+						$obj = $this->db->fetch_object($result);
 
-    					if (!empty($obj->email) && filter_var($obj->email, FILTER_VALIDATE_EMAIL)) {
-    						if (!array_key_exists($obj->email, $cibles)) {
-    							$cibles[$obj->email] = array(
-    								'email' => $obj->email,
-    								'fk_contact' => $obj->fk_contact,
-    								'name' => $obj->name,
-    								'firstname' => $obj->firstname,
-    								'other' => '',
-    								'source_url' => $this->url($obj->id, 'thirdparty'),
-    								'source_id' => $obj->id,
-    								'source_type' => 'thirdparty'
-    							);
-    						}
-    					}
+						if (!empty($obj->email) && filter_var($obj->email, FILTER_VALIDATE_EMAIL)) {
+							if (!array_key_exists($obj->email, $cibles)) {
+								$cibles[$obj->email] = array(
+									'email' => $obj->email,
+									'fk_contact' => $obj->fk_contact,
+									'name' => $obj->name,
+									'firstname' => $obj->firstname,
+									'other' => '',
+									'source_url' => $this->url($obj->id, 'thirdparty'),
+									'source_id' => $obj->id,
+									'source_type' => 'thirdparty'
+								);
+							}
+						}
 
-    					$i++;
-    				}
-    			} else {
-    				dol_syslog($this->db->error());
-    				$this->error = $this->db->error();
-    				return -1;
-    			}
+						$i++;
+					}
+				} else {
+					dol_syslog($this->db->error());
+					$this->error = $this->db->error();
+					return -1;
+				}
 			}
 		}
 
@@ -136,41 +136,41 @@ class mailing_advthirdparties extends MailingTargets
 				}
 				$sql .= " ORDER BY email";
 
-    			// Stock recipients emails into targets table
-    			$result = $this->db->query($sql);
-    			if ($result)
-    			{
-    				$num = $this->db->num_rows($result);
-    				$i = 0;
+				// Stock recipients emails into targets table
+				$result = $this->db->query($sql);
+				if ($result)
+				{
+					$num = $this->db->num_rows($result);
+					$i = 0;
 
-    				dol_syslog(get_class($this)."::add_to_target_spec mailing ".$num." targets found");
+					dol_syslog(get_class($this)."::add_to_target_spec mailing ".$num." targets found");
 
-    				while ($i < $num)
-    				{
-    					$obj = $this->db->fetch_object($result);
+					while ($i < $num)
+					{
+						$obj = $this->db->fetch_object($result);
 
-    					if (!empty($obj->email) && filter_var($obj->email, FILTER_VALIDATE_EMAIL)) {
-    						if (!array_key_exists($obj->email, $cibles)) {
-    							$cibles[$obj->email] = array(
-    								'email' => $obj->email,
-    								'fk_contact' =>$obj->id,
-    								'lastname' => $obj->lastname,
-    								'firstname' => $obj->firstname,
-    								'other' => '',
-    								'source_url' => $this->url($obj->id, 'contact'),
-    								'source_id' => $obj->id,
-    								'source_type' => 'contact'
-    							);
-    						}
-    					}
+						if (!empty($obj->email) && filter_var($obj->email, FILTER_VALIDATE_EMAIL)) {
+							if (!array_key_exists($obj->email, $cibles)) {
+								$cibles[$obj->email] = array(
+									'email' => $obj->email,
+									'fk_contact' =>$obj->id,
+									'lastname' => $obj->lastname,
+									'firstname' => $obj->firstname,
+									'other' => '',
+									'source_url' => $this->url($obj->id, 'contact'),
+									'source_id' => $obj->id,
+									'source_type' => 'contact'
+								);
+							}
+						}
 
-    					$i++;
-    				}
-    			} else {
-    				dol_syslog($this->db->error());
-    				$this->error = $this->db->error();
-    				return -1;
-    			}
+						$i++;
+					}
+				} else {
+					dol_syslog($this->db->error());
+					$this->error = $this->db->error();
+					return -1;
+				}
 			}
 		}
 
diff --git a/htdocs/core/modules/mailings/contacts1.modules.php b/htdocs/core/modules/mailings/contacts1.modules.php
index be5e8435ad2..deb1b1e12c6 100644
--- a/htdocs/core/modules/mailings/contacts1.modules.php
+++ b/htdocs/core/modules/mailings/contacts1.modules.php
@@ -44,23 +44,23 @@ class mailing_contacts1 extends MailingTargets
 	public $picto = 'contact';
 
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
 
-    /**
-     *  Constructor
-     *
-     *  @param      DoliDB      $db      Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-    }
+	/**
+	 *  Constructor
+	 *
+	 *  @param      DoliDB      $db      Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
 
 
-    /**
+	/**
 	 *	On the main mailing area, there is a box with statistics.
 	 *	If you want to add a line in this report you must provide an
 	 *	array of SQL request that returns two field:
@@ -68,8 +68,8 @@ class mailing_contacts1 extends MailingTargets
 	 *
 	 *	@return		string[]		Array with SQL requests
 	 */
-    public function getSqlArrayForStats()
-    {
+	public function getSqlArrayForStats()
+	{
 		global $conf, $langs;
 
 		$langs->load("commercial");
@@ -84,7 +84,7 @@ class mailing_contacts1 extends MailingTargets
 		$statssql[0] .= " AND c.statut = 1";
 
 		return $statssql;
-    }
+	}
 
 
 	/**
@@ -95,13 +95,13 @@ class mailing_contacts1 extends MailingTargets
 	 *  @param		string	$sql		Requete sql de comptage
 	 *	@return		int
 	 */
-    public function getNbOfRecipients($sql = '')
-    {
+	public function getNbOfRecipients($sql = '')
+	{
 		global $conf;
 
 		$sql = "SELECT count(distinct(c.email)) as nb";
 		$sql .= " FROM ".MAIN_DB_PREFIX."socpeople as c";
-    	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = c.fk_soc";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = c.fk_soc";
 		$sql .= " WHERE c.entity IN (".getEntity('socpeople').")";
 		$sql .= " AND c.email != ''"; // Note that null != '' is false
 		$sql .= " AND c.no_email = 0";
@@ -111,7 +111,7 @@ class mailing_contacts1 extends MailingTargets
 
 		// The request must return a field called "nb" to be understandable by parent::getNbOfRecipients
 		return parent::getNbOfRecipients($sql);
-    }
+	}
 
 
 	/**
@@ -119,12 +119,12 @@ class mailing_contacts1 extends MailingTargets
 	 *
 	 *   @return     string      Retourne zone select
 	 */
-    public function formFilter()
-    {
+	public function formFilter()
+	{
 		global $langs;
 
 		// Load translation files required by the page
-        $langs->loadLangs(array("commercial", "companies", "suppliers", "categories"));
+		$langs->loadLangs(array("commercial", "companies", "suppliers", "categories"));
 
 		$s = '';
 
@@ -306,31 +306,31 @@ class mailing_contacts1 extends MailingTargets
 		$s .= '</select>';
 
 		return $s;
-    }
+	}
 
 
 	/**
 	 *  Renvoie url lien vers fiche de la source du destinataire du mailing
 	 *
-     *  @param	int		$id		ID
+	 *  @param	int		$id		ID
 	 *  @return string      	Url lien
 	 */
-    public function url($id)
-    {
-        return '<a href="'.DOL_URL_ROOT.'/contact/card.php?id='.$id.'">'.img_object('', "contact").'</a>';
-    }
+	public function url($id)
+	{
+		return '<a href="'.DOL_URL_ROOT.'/contact/card.php?id='.$id.'">'.img_object('', "contact").'</a>';
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Ajoute destinataires dans table des cibles
 	 *
 	 *  @param  int		$mailing_id    	Id of emailing
 	 *  @return int           			<0 si erreur, nb ajout si ok
 	 */
-    public function add_to_target($mailing_id)
-    {
-        // phpcs:enable
+	public function add_to_target($mailing_id)
+	{
+		// phpcs:enable
 		global $conf, $langs;
 
 		$filter = GETPOST('filter', 'alpha');
@@ -364,14 +364,14 @@ class mailing_contacts1 extends MailingTargets
 		$sql = "SELECT sp.rowid as id, sp.email as email, sp.rowid as fk_contact, sp.lastname, sp.firstname, sp.civility as civility_id, sp.poste as jobposition,";
 		$sql .= " s.nom as companyname";
 		$sql .= " FROM ".MAIN_DB_PREFIX."socpeople as sp";
-    	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = sp.fk_soc";
-    	if ($filter_category <> 'all') $sql .= ", ".MAIN_DB_PREFIX."categorie as c";
-    	if ($filter_category <> 'all') $sql .= ", ".MAIN_DB_PREFIX."categorie_contact as cs";
-    	if ($filter_category_customer <> 'all') $sql .= ", ".MAIN_DB_PREFIX."categorie as c2";
-    	if ($filter_category_customer <> 'all') $sql .= ", ".MAIN_DB_PREFIX."categorie_societe as c2s";
-    	if ($filter_category_supplier <> 'all') $sql .= ", ".MAIN_DB_PREFIX."categorie as c3";
-    	if ($filter_category_supplier <> 'all') $sql .= ", ".MAIN_DB_PREFIX."categorie_fournisseur as c3s";
-    	$sql .= " WHERE sp.entity IN (".getEntity('socpeople').")";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = sp.fk_soc";
+		if ($filter_category <> 'all') $sql .= ", ".MAIN_DB_PREFIX."categorie as c";
+		if ($filter_category <> 'all') $sql .= ", ".MAIN_DB_PREFIX."categorie_contact as cs";
+		if ($filter_category_customer <> 'all') $sql .= ", ".MAIN_DB_PREFIX."categorie as c2";
+		if ($filter_category_customer <> 'all') $sql .= ", ".MAIN_DB_PREFIX."categorie_societe as c2s";
+		if ($filter_category_supplier <> 'all') $sql .= ", ".MAIN_DB_PREFIX."categorie as c3";
+		if ($filter_category_supplier <> 'all') $sql .= ", ".MAIN_DB_PREFIX."categorie_fournisseur as c3s";
+		$sql .= " WHERE sp.entity IN (".getEntity('socpeople').")";
 		$sql .= " AND sp.email <> ''";
 		$sql .= " AND sp.no_email = 0";
 		$sql .= " AND (SELECT count(*) FROM ".MAIN_DB_PREFIX."mailing_unsubscribe WHERE email = sp.email) = 0";
@@ -380,12 +380,12 @@ class mailing_contacts1 extends MailingTargets
 		$sql .= " AND sp.email NOT IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE fk_mailing=".$mailing_id.")";
 		// Filter on category
 		if ($filter_category <> 'all') $sql .= " AND cs.fk_categorie = c.rowid AND cs.fk_socpeople = sp.rowid";
-    	if ($filter_category <> 'all') $sql .= " AND c.label = '".$this->db->escape($filter_category)."'";
+		if ($filter_category <> 'all') $sql .= " AND c.label = '".$this->db->escape($filter_category)."'";
 		if ($filter_category_customer <> 'all') $sql .= " AND c2s.fk_categorie = c2.rowid AND c2s.fk_soc = sp.fk_soc";
-    	if ($filter_category_customer <> 'all') $sql .= " AND c2.label = '".$this->db->escape($filter_category_customer)."'";
+		if ($filter_category_customer <> 'all') $sql .= " AND c2.label = '".$this->db->escape($filter_category_customer)."'";
 		if ($filter_category_supplier <> 'all') $sql .= " AND c3s.fk_categorie = c3.rowid AND c3s.fk_soc = sp.fk_soc";
-    	if ($filter_category_supplier <> 'all') $sql .= " AND c3.label = '".$this->db->escape($filter_category_supplier)."'";
-    	// Filter on nature
+		if ($filter_category_supplier <> 'all') $sql .= " AND c3.label = '".$this->db->escape($filter_category_supplier)."'";
+		// Filter on nature
 		$key = $filter;
 		{
 			//print "xx".$key;
@@ -417,17 +417,17 @@ class mailing_contacts1 extends MailingTargets
 				if ($old <> $obj->email)
 				{
 					$cibles[$j] = array(
-                    		'email' => $obj->email,
-                    		'fk_contact' => $obj->fk_contact,
-                    		'lastname' => $obj->lastname,
-                    		'firstname' => $obj->firstname,
-                    		'other' =>
-                                ($langs->transnoentities("ThirdParty").'='.$obj->companyname).';'.
-                                ($langs->transnoentities("UserTitle").'='.($obj->civility_id ? $langs->transnoentities("Civility".$obj->civility_id) : '')).';'.
-                                ($langs->transnoentities("JobPosition").'='.$obj->jobposition),
+							'email' => $obj->email,
+							'fk_contact' => $obj->fk_contact,
+							'lastname' => $obj->lastname,
+							'firstname' => $obj->firstname,
+							'other' =>
+								($langs->transnoentities("ThirdParty").'='.$obj->companyname).';'.
+								($langs->transnoentities("UserTitle").'='.($obj->civility_id ? $langs->transnoentities("Civility".$obj->civility_id) : '')).';'.
+								($langs->transnoentities("JobPosition").'='.$obj->jobposition),
 							'source_url' => $this->url($obj->id),
-                            'source_id' => $obj->id,
-                            'source_type' => 'contact'
+							'source_id' => $obj->id,
+							'source_type' => 'contact'
 					);
 					$old = $obj->email;
 					$j++;
@@ -442,5 +442,5 @@ class mailing_contacts1 extends MailingTargets
 		}
 
 		return parent::addTargetsToDatabase($mailing_id, $cibles);
-    }
+	}
 }
diff --git a/htdocs/core/modules/mailings/example.modules.php b/htdocs/core/modules/mailings/example.modules.php
index e0d79bb67ce..6c57baaa4da 100644
--- a/htdocs/core/modules/mailings/example.modules.php
+++ b/htdocs/core/modules/mailings/example.modules.php
@@ -25,70 +25,70 @@ include_once DOL_DOCUMENT_ROOT.'/core/modules/mailings/modules_mailings.php';
 */
 class mailing_example extends MailingTargets
 {
-    // CHANGE THIS: Put here a name not already used
-    public $name = 'example';
-    // CHANGE THIS: Put here a description of your selector module.
-    // This label is used if no translation is found for key MailingModuleDescXXX where XXX=name is found
-    public $desc = 'Put here a description';
-    // CHANGE THIS: Set to 1 if selector is available for admin users only
-    public $require_admin = 0;
-    // CHANGE THIS: Add a tooltip language key to add a tooltip help icon after the email target selector
-    public $tooltip = 'MyTooltipLangKey';
+	// CHANGE THIS: Put here a name not already used
+	public $name = 'example';
+	// CHANGE THIS: Put here a description of your selector module.
+	// This label is used if no translation is found for key MailingModuleDescXXX where XXX=name is found
+	public $desc = 'Put here a description';
+	// CHANGE THIS: Set to 1 if selector is available for admin users only
+	public $require_admin = 0;
+	// CHANGE THIS: Add a tooltip language key to add a tooltip help icon after the email target selector
+	public $tooltip = 'MyTooltipLangKey';
 
-    public $require_module = array();
+	public $require_module = array();
 
-    /**
-     * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
-     */
-    public $picto = '';
+	/**
+	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+	 */
+	public $picto = '';
 
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
 
-    // CHANGE THIS: Constructor name must be called mailing_xxx with xxx=name of your selector
+	// CHANGE THIS: Constructor name must be called mailing_xxx with xxx=name of your selector
 	/**
 	 *	Constructor
 	 *
 	 *  @param		DoliDB		$db      Database handler
 	 */
-    public function __construct($db)
-    {
-        $this->db = $db;
-    }
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  This is the main function that returns the array of emails
-     *
-     *  @param	int		$mailing_id    	Id of mailing. No need to use it.
-     *  @return int           			<0 if error, number of emails added if ok
-     */
-    public function add_to_target($mailing_id)
-    {
-        // phpcs:enable
-        $target = array();
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  This is the main function that returns the array of emails
+	 *
+	 *  @param	int		$mailing_id    	Id of mailing. No need to use it.
+	 *  @return int           			<0 if error, number of emails added if ok
+	 */
+	public function add_to_target($mailing_id)
+	{
+		// phpcs:enable
+		$target = array();
 
-	    // CHANGE THIS
-	    // ----- Your code start here -----
+		// CHANGE THIS
+		// ----- Your code start here -----
 
-	    // You must fill the $target array with record like this
-	    // $target[0]=array('email'=>'email_0','name'=>'name_0','firstname'=>'firstname_0', 'other'=>'other_0');
+		// You must fill the $target array with record like this
+		// $target[0]=array('email'=>'email_0','name'=>'name_0','firstname'=>'firstname_0', 'other'=>'other_0');
 		// ...
-	    // $target[n]=array('email'=>'email_n','name'=>'name_n','firstname'=>'firstname_n', 'other'=>'other_n');
+		// $target[n]=array('email'=>'email_n','name'=>'name_n','firstname'=>'firstname_n', 'other'=>'other_n');
 
 		// Example: $target[0]=array('email'=>'myemail@example.com', 'name'=>'Doe', 'firstname'=>'John', 'other'=>'Other information');
 
 		// ----- Your code end here -----
 
-        return parent::addTargetsToDatabase($mailing_id, $target);
-    }
+		return parent::addTargetsToDatabase($mailing_id, $target);
+	}
 
 
-    /**
+	/**
 	 *	On the main mailing area, there is a box with statistics.
 	 *	If you want to add a line in this report you must provide an
 	 *	array of SQL request that returns two field:
@@ -96,59 +96,59 @@ class mailing_example extends MailingTargets
 	 *
 	 *	@return		array		Array with SQL requests
 	 */
-    public function getSqlArrayForStats()
+	public function getSqlArrayForStats()
 	{
-	    // CHANGE THIS: Optionnal
+		// CHANGE THIS: Optionnal
 
 		//var $statssql=array();
-        //$this->statssql[0]="SELECT field1 as label, count(distinct(email)) as nb FROM mytable WHERE email IS NOT NULL";
+		//$this->statssql[0]="SELECT field1 as label, count(distinct(email)) as nb FROM mytable WHERE email IS NOT NULL";
 		return array();
 	}
 
 
-    /**
-     *  Return here number of distinct emails returned by your selector.
-     *  For example if this selector is used to extract 500 different
-     *  emails from a text file, this function must return 500.
-     *
-     *  @param		string		$sql		Requete sql de comptage
-     *  @return		int|string				Number of recipient or '?'
-     */
-    public function getNbOfRecipients($sql = '')
-    {
-        // CHANGE THIS: Optionnal
+	/**
+	 *  Return here number of distinct emails returned by your selector.
+	 *  For example if this selector is used to extract 500 different
+	 *  emails from a text file, this function must return 500.
+	 *
+	 *  @param		string		$sql		Requete sql de comptage
+	 *  @return		int|string				Number of recipient or '?'
+	 */
+	public function getNbOfRecipients($sql = '')
+	{
+		// CHANGE THIS: Optionnal
 
-        // Example: return parent::getNbOfRecipients("SELECT count(*) as nb from dolibarr_table");
-        // Example: return 500;
-        return '?';
-    }
+		// Example: return parent::getNbOfRecipients("SELECT count(*) as nb from dolibarr_table");
+		// Example: return 500;
+		return '?';
+	}
 
-    /**
-     *  This is to add a form filter to provide variant of selector
-     *  If used, the HTML select must be called "filter"
-     *
-     *  @return     string      A html select zone
-     */
-    public function formFilter()
-    {
-        // CHANGE THIS: Optionnal
+	/**
+	 *  This is to add a form filter to provide variant of selector
+	 *  If used, the HTML select must be called "filter"
+	 *
+	 *  @return     string      A html select zone
+	 */
+	public function formFilter()
+	{
+		// CHANGE THIS: Optionnal
 
-        $s = '';
-        return $s;
-    }
+		$s = '';
+		return $s;
+	}
 
 
-    /**
-     *  Can include an URL link on each record provided by selector
-     *	shown on target page.
-     *
-     *  @param	int		$id		ID
-     *  @return string      	Url link
-     */
-    public function url($id)
-    {
-        // CHANGE THIS: Optionnal
+	/**
+	 *  Can include an URL link on each record provided by selector
+	 *	shown on target page.
+	 *
+	 *  @param	int		$id		ID
+	 *  @return string      	Url link
+	 */
+	public function url($id)
+	{
+		// CHANGE THIS: Optionnal
 
-        return '';
-    }
+		return '';
+	}
 }
diff --git a/htdocs/core/modules/mailings/fraise.modules.php b/htdocs/core/modules/mailings/fraise.modules.php
index 95f180b80ff..d57d4e8061a 100644
--- a/htdocs/core/modules/mailings/fraise.modules.php
+++ b/htdocs/core/modules/mailings/fraise.modules.php
@@ -33,286 +33,286 @@ include_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
  */
 class mailing_fraise extends MailingTargets
 {
-    public $name = 'FundationMembers'; // Identifiant du module mailing
+	public $name = 'FundationMembers'; // Identifiant du module mailing
 	// This label is used if no translation is found for key XXX neither MailingModuleDescXXX where XXX=name is found
-    public $desc = 'Foundation members with emails';
-    // Set to 1 if selector is available for admin users only
-    public $require_admin = 0;
+	public $desc = 'Foundation members with emails';
+	// Set to 1 if selector is available for admin users only
+	public $require_admin = 0;
 
-    public $require_module = array('adherent');
+	public $require_module = array('adherent');
 
-    /**
-     * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
-     */
-    public $picto = 'user';
+	/**
+	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+	 */
+	public $picto = 'user';
 
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    /**
-     *    Constructor
-     *
-     *  @param        DoliDB        $db      Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-    }
+	/**
+	 *    Constructor
+	 *
+	 *  @param        DoliDB        $db      Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
 
 
-    /**
-     *    On the main mailing area, there is a box with statistics.
-     *    If you want to add a line in this report you must provide an
-     *    array of SQL request that returns two field:
-     *    One called "label", One called "nb".
-     *
-     *    @return        string[]        Array with SQL requests
-     */
-    public function getSqlArrayForStats()
-    {
-        global $langs;
+	/**
+	 *    On the main mailing area, there is a box with statistics.
+	 *    If you want to add a line in this report you must provide an
+	 *    array of SQL request that returns two field:
+	 *    One called "label", One called "nb".
+	 *
+	 *    @return        string[]        Array with SQL requests
+	 */
+	public function getSqlArrayForStats()
+	{
+		global $langs;
 
-        $langs->load("members");
+		$langs->load("members");
 
-        // Array for requests for statistics board
-        $statssql = array();
+		// Array for requests for statistics board
+		$statssql = array();
 
-        $statssql[0] = "SELECT '".$this->db->escape($langs->trans("FundationMembers"))."' as label, count(*) as nb";
-        $statssql[0] .= " FROM ".MAIN_DB_PREFIX."adherent where statut = 1 and entity IN (".getEntity('member').")";
+		$statssql[0] = "SELECT '".$this->db->escape($langs->trans("FundationMembers"))."' as label, count(*) as nb";
+		$statssql[0] .= " FROM ".MAIN_DB_PREFIX."adherent where statut = 1 and entity IN (".getEntity('member').")";
 
-        return $statssql;
-    }
+		return $statssql;
+	}
 
 
-    /**
-     *    Return here number of distinct emails returned by your selector.
-     *    For example if this selector is used to extract 500 different
-     *    emails from a text file, this function must return 500.
-     *
-     *  @param    string    $sql        Requete sql de comptage
-     *    @return        int            Nb of recipients
-     */
-    public function getNbOfRecipients($sql = '')
-    {
-        $sql  = "SELECT count(distinct(a.email)) as nb";
-        $sql .= " FROM ".MAIN_DB_PREFIX."adherent as a";
-        $sql .= " WHERE (a.email IS NOT NULL AND a.email != '') AND a.entity IN (".getEntity('member').")";
+	/**
+	 *    Return here number of distinct emails returned by your selector.
+	 *    For example if this selector is used to extract 500 different
+	 *    emails from a text file, this function must return 500.
+	 *
+	 *  @param    string    $sql        Requete sql de comptage
+	 *    @return        int            Nb of recipients
+	 */
+	public function getNbOfRecipients($sql = '')
+	{
+		$sql  = "SELECT count(distinct(a.email)) as nb";
+		$sql .= " FROM ".MAIN_DB_PREFIX."adherent as a";
+		$sql .= " WHERE (a.email IS NOT NULL AND a.email != '') AND a.entity IN (".getEntity('member').")";
 
-        // La requete doit retourner un champ "nb" pour etre comprise
-        // par parent::getNbOfRecipients
-        return parent::getNbOfRecipients($sql);
-    }
+		// La requete doit retourner un champ "nb" pour etre comprise
+		// par parent::getNbOfRecipients
+		return parent::getNbOfRecipients($sql);
+	}
 
 
-    /**
-     *   Affiche formulaire de filtre qui apparait dans page de selection des destinataires de mailings
-     *
-     *   @return     string      Retourne zone select
-     */
-    public function formFilter()
-    {
-        global $conf, $langs;
+	/**
+	 *   Affiche formulaire de filtre qui apparait dans page de selection des destinataires de mailings
+	 *
+	 *   @return     string      Retourne zone select
+	 */
+	public function formFilter()
+	{
+		global $conf, $langs;
 
-        // Load translation files required by the page
-        $langs->loadLangs(array("members", "companies", "categories"));
+		// Load translation files required by the page
+		$langs->loadLangs(array("members", "companies", "categories"));
 
-        $form = new Form($this->db);
+		$form = new Form($this->db);
 
-        $s = '';
+		$s = '';
 
-        // Status
-        $s .= $langs->trans("Status").': ';
-        $s .= '<select name="filter" class="flat">';
-        $s .= '<option value="none">&nbsp;</option>';
-        $s .= '<option value="-1">'.$langs->trans("MemberStatusDraft").'</option>';
-        $s .= '<option value="1a">'.$langs->trans("MemberStatusActiveShort").' ('.$langs->trans("MemberStatusPaidShort").')</option>';
-        $s .= '<option value="1b">'.$langs->trans("MemberStatusActiveShort").' ('.$langs->trans("MemberStatusActiveLateShort").')</option>';
-        $s .= '<option value="0">'.$langs->trans("MemberStatusResiliatedShort").'</option>';
-        $s .= '</select> ';
-        $s .= $langs->trans("Type").': ';
-        $s .= '<select name="filter_type" class="flat">';
-        $sql = "SELECT rowid, libelle as label, statut";
-        $sql .= " FROM ".MAIN_DB_PREFIX."adherent_type";
-        $sql .= " WHERE entity IN (".getEntity('member_type').")";
-        $sql .= " ORDER BY rowid";
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            $num = $this->db->num_rows($resql);
+		// Status
+		$s .= $langs->trans("Status").': ';
+		$s .= '<select name="filter" class="flat">';
+		$s .= '<option value="none">&nbsp;</option>';
+		$s .= '<option value="-1">'.$langs->trans("MemberStatusDraft").'</option>';
+		$s .= '<option value="1a">'.$langs->trans("MemberStatusActiveShort").' ('.$langs->trans("MemberStatusPaidShort").')</option>';
+		$s .= '<option value="1b">'.$langs->trans("MemberStatusActiveShort").' ('.$langs->trans("MemberStatusActiveLateShort").')</option>';
+		$s .= '<option value="0">'.$langs->trans("MemberStatusResiliatedShort").'</option>';
+		$s .= '</select> ';
+		$s .= $langs->trans("Type").': ';
+		$s .= '<select name="filter_type" class="flat">';
+		$sql = "SELECT rowid, libelle as label, statut";
+		$sql .= " FROM ".MAIN_DB_PREFIX."adherent_type";
+		$sql .= " WHERE entity IN (".getEntity('member_type').")";
+		$sql .= " ORDER BY rowid";
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$num = $this->db->num_rows($resql);
 
-            $s .= '<option value="0">&nbsp;</option>';
-            if (!$num) $s .= '<option value="0" disabled="disabled">'.$langs->trans("NoCategoriesDefined").'</option>';
+			$s .= '<option value="0">&nbsp;</option>';
+			if (!$num) $s .= '<option value="0" disabled="disabled">'.$langs->trans("NoCategoriesDefined").'</option>';
 
-            $i = 0;
-            while ($i < $num)
-            {
-                $obj = $this->db->fetch_object($resql);
+			$i = 0;
+			while ($i < $num)
+			{
+				$obj = $this->db->fetch_object($resql);
 
-                $s .= '<option value="'.$obj->rowid.'">'.dol_trunc($obj->label, 38, 'middle');
-                $s .= '</option>';
-                $i++;
-            }
-        } else {
-            dol_print_error($this->db);
-        }
+				$s .= '<option value="'.$obj->rowid.'">'.dol_trunc($obj->label, 38, 'middle');
+				$s .= '</option>';
+				$i++;
+			}
+		} else {
+			dol_print_error($this->db);
+		}
 
-        $s .= '</select>';
+		$s .= '</select>';
 
-        $s .= ' ';
+		$s .= ' ';
 
-        $s .= $langs->trans("Category").': ';
-        $s .= '<select name="filter_category" class="flat">';
+		$s .= $langs->trans("Category").': ';
+		$s .= '<select name="filter_category" class="flat">';
 
-        // Show categories
-        $sql = "SELECT rowid, label, type, visible";
-        $sql .= " FROM ".MAIN_DB_PREFIX."categorie";
-        $sql .= " WHERE type = 3"; // We keep only categories for members
-        // $sql.= " AND visible > 0";	// We ignore the property visible because member's categories does not use this property (only products categories use it).
-        $sql .= " AND entity = ".$conf->entity;
-        $sql .= " ORDER BY label";
+		// Show categories
+		$sql = "SELECT rowid, label, type, visible";
+		$sql .= " FROM ".MAIN_DB_PREFIX."categorie";
+		$sql .= " WHERE type = 3"; // We keep only categories for members
+		// $sql.= " AND visible > 0";	// We ignore the property visible because member's categories does not use this property (only products categories use it).
+		$sql .= " AND entity = ".$conf->entity;
+		$sql .= " ORDER BY label";
 
-        //print $sql;
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-        	$num = $this->db->num_rows($resql);
+		//print $sql;
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$num = $this->db->num_rows($resql);
 
-        	$s .= '<option value="0">&nbsp;</option>';
-        	if (!$num) $s .= '<option value="0" disabled>'.$langs->trans("NoCategoriesDefined").'</option>';
+			$s .= '<option value="0">&nbsp;</option>';
+			if (!$num) $s .= '<option value="0" disabled>'.$langs->trans("NoCategoriesDefined").'</option>';
 
-        	$i = 0;
-        	while ($i < $num)
-        	{
-        		$obj = $this->db->fetch_object($resql);
+			$i = 0;
+			while ($i < $num)
+			{
+				$obj = $this->db->fetch_object($resql);
 
-        		$s .= '<option value="'.$obj->rowid.'">'.dol_trunc($obj->label, 38, 'middle');
-        		$s .= '</option>';
-        		$i++;
-        	}
-        } else {
-        	dol_print_error($this->db);
-        }
+				$s .= '<option value="'.$obj->rowid.'">'.dol_trunc($obj->label, 38, 'middle');
+				$s .= '</option>';
+				$i++;
+			}
+		} else {
+			dol_print_error($this->db);
+		}
 
-        $s .= '</select>';
+		$s .= '</select>';
 
 
-        $s .= '<br>';
-        $s .= $langs->trans("DateEndSubscription").': &nbsp;';
-        $s .= $langs->trans("After").' > '.$form->selectDate(-1, 'subscriptionafter', 0, 0, 1, 'fraise', 1, 0, 0);
-        $s .= ' &nbsp; ';
-        $s .= $langs->trans("Before").' < '.$form->selectDate(-1, 'subscriptionbefore', 0, 0, 1, 'fraise', 1, 0, 0);
+		$s .= '<br>';
+		$s .= $langs->trans("DateEndSubscription").': &nbsp;';
+		$s .= $langs->trans("After").' > '.$form->selectDate(-1, 'subscriptionafter', 0, 0, 1, 'fraise', 1, 0, 0);
+		$s .= ' &nbsp; ';
+		$s .= $langs->trans("Before").' < '.$form->selectDate(-1, 'subscriptionbefore', 0, 0, 1, 'fraise', 1, 0, 0);
 
-        return $s;
-    }
+		return $s;
+	}
 
 
-    /**
-     *  Renvoie url lien vers fiche de la source du destinataire du mailing
-     *
-     *  @param    int        $id        ID
-     *  @return     string      Url lien
-     */
-    public function url($id)
-    {
-        return '<a href="'.DOL_URL_ROOT.'/adherents/card.php?rowid='.$id.'">'.img_object('', "user").'</a>';
-    }
+	/**
+	 *  Renvoie url lien vers fiche de la source du destinataire du mailing
+	 *
+	 *  @param    int        $id        ID
+	 *  @return     string      Url lien
+	 */
+	public function url($id)
+	{
+		return '<a href="'.DOL_URL_ROOT.'/adherents/card.php?rowid='.$id.'">'.img_object('', "user").'</a>';
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Ajoute destinataires dans table des cibles
-     *
-     *  @param    int        $mailing_id        Id of emailing
-     *  @return int                       < 0 si erreur, nb ajout si ok
-     */
-    public function add_to_target($mailing_id)
-    {
-        // phpcs:enable
-    	global $langs, $_POST;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Ajoute destinataires dans table des cibles
+	 *
+	 *  @param    int        $mailing_id        Id of emailing
+	 *  @return int                       < 0 si erreur, nb ajout si ok
+	 */
+	public function add_to_target($mailing_id)
+	{
+		// phpcs:enable
+		global $langs, $_POST;
 
-    	// Load translation files required by the page
-        $langs->loadLangs(array("members", "companies"));
+		// Load translation files required by the page
+		$langs->loadLangs(array("members", "companies"));
 
-        $cibles = array();
-        $now = dol_now();
+		$cibles = array();
+		$now = dol_now();
 
-        $dateendsubscriptionafter = dol_mktime(GETPOST('subscriptionafterhour', 'int'), GETPOST('subscriptionaftermin', 'int'), GETPOST('subscriptionaftersec', 'int'), GETPOST('subscriptionaftermonth', 'int'), GETPOST('subscriptionafterday', 'int'), GETPOST('subscriptionafteryear', 'int'));
-        $dateendsubscriptionbefore = dol_mktime(GETPOST('subscriptionbeforehour', 'int'), GETPOST('subscriptionbeforemin', 'int'), GETPOST('subscriptionbeforesec', 'int'), GETPOST('subscriptionbeforemonth', 'int'), GETPOST('subscriptionbeforeday', 'int'), GETPOST('subscriptionbeforeyear', 'int'));
+		$dateendsubscriptionafter = dol_mktime(GETPOST('subscriptionafterhour', 'int'), GETPOST('subscriptionaftermin', 'int'), GETPOST('subscriptionaftersec', 'int'), GETPOST('subscriptionaftermonth', 'int'), GETPOST('subscriptionafterday', 'int'), GETPOST('subscriptionafteryear', 'int'));
+		$dateendsubscriptionbefore = dol_mktime(GETPOST('subscriptionbeforehour', 'int'), GETPOST('subscriptionbeforemin', 'int'), GETPOST('subscriptionbeforesec', 'int'), GETPOST('subscriptionbeforemonth', 'int'), GETPOST('subscriptionbeforeday', 'int'), GETPOST('subscriptionbeforeyear', 'int'));
 
-        // La requete doit retourner: id, email, fk_contact, name, firstname
-        $sql = "SELECT a.rowid as id, a.email as email, null as fk_contact, ";
-        $sql .= " a.lastname, a.firstname,";
-        $sql .= " a.datefin, a.civility as civility_id, a.login, a.societe"; // Other fields
-        $sql .= " FROM ".MAIN_DB_PREFIX."adherent as a";
-        if (GETPOST('filter_category'))
-        {
-        	$sql .= " INNER JOIN ".MAIN_DB_PREFIX."categorie_member as cm ON cm.fk_member = a.rowid";
-        	$sql .= " INNER JOIN ".MAIN_DB_PREFIX."categorie as c ON c.rowid = cm.fk_categorie AND c.rowid = ".((int) GETPOST('filter_category', 'int'));
-        }
-        $sql .= " , ".MAIN_DB_PREFIX."adherent_type as ta";
-        $sql .= " WHERE a.entity IN (".getEntity('member').") AND a.email <> ''"; // Note that null != '' is false
-        $sql .= " AND a.email NOT IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE fk_mailing=".$this->db->escape($mailing_id).")";
-        // Filter on status
-        if (GETPOST("filter") == '-1') {
-            $sql .= " AND a.statut=-1";
-        }
-        if (GETPOST("filter", 'aZ09') == '1a') $sql .= " AND a.statut=1 AND (a.datefin >= '".$this->db->idate($now)."' OR ta.subscription = 0)";
-        if (GETPOST("filter", 'aZ09') == '1b') $sql .= " AND a.statut=1 AND ((a.datefin IS NULL or a.datefin < '".$this->db->idate($now)."') AND ta.subscription = 1)";
-        if (GETPOST("filter", 'aZ09') === '0')  $sql .= " AND a.statut=0";
-        // Filter on date
-        if ($dateendsubscriptionafter > 0)  $sql .= " AND datefin > '".$this->db->idate($dateendsubscriptionafter)."'";
-        if ($dateendsubscriptionbefore > 0) $sql .= " AND datefin < '".$this->db->idate($dateendsubscriptionbefore)."'";
-        $sql .= " AND a.fk_adherent_type = ta.rowid";
-        // Filter on type
-        if (GETPOST('filter_type', 'int') > 0) $sql .= " AND ta.rowid='".$this->db->escape(GETPOST('filter_type', 'int'))."'";
-        $sql .= " ORDER BY a.email";
-        //print $sql;
+		// La requete doit retourner: id, email, fk_contact, name, firstname
+		$sql = "SELECT a.rowid as id, a.email as email, null as fk_contact, ";
+		$sql .= " a.lastname, a.firstname,";
+		$sql .= " a.datefin, a.civility as civility_id, a.login, a.societe"; // Other fields
+		$sql .= " FROM ".MAIN_DB_PREFIX."adherent as a";
+		if (GETPOST('filter_category'))
+		{
+			$sql .= " INNER JOIN ".MAIN_DB_PREFIX."categorie_member as cm ON cm.fk_member = a.rowid";
+			$sql .= " INNER JOIN ".MAIN_DB_PREFIX."categorie as c ON c.rowid = cm.fk_categorie AND c.rowid = ".((int) GETPOST('filter_category', 'int'));
+		}
+		$sql .= " , ".MAIN_DB_PREFIX."adherent_type as ta";
+		$sql .= " WHERE a.entity IN (".getEntity('member').") AND a.email <> ''"; // Note that null != '' is false
+		$sql .= " AND a.email NOT IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE fk_mailing=".$this->db->escape($mailing_id).")";
+		// Filter on status
+		if (GETPOST("filter") == '-1') {
+			$sql .= " AND a.statut=-1";
+		}
+		if (GETPOST("filter", 'aZ09') == '1a') $sql .= " AND a.statut=1 AND (a.datefin >= '".$this->db->idate($now)."' OR ta.subscription = 0)";
+		if (GETPOST("filter", 'aZ09') == '1b') $sql .= " AND a.statut=1 AND ((a.datefin IS NULL or a.datefin < '".$this->db->idate($now)."') AND ta.subscription = 1)";
+		if (GETPOST("filter", 'aZ09') === '0')  $sql .= " AND a.statut=0";
+		// Filter on date
+		if ($dateendsubscriptionafter > 0)  $sql .= " AND datefin > '".$this->db->idate($dateendsubscriptionafter)."'";
+		if ($dateendsubscriptionbefore > 0) $sql .= " AND datefin < '".$this->db->idate($dateendsubscriptionbefore)."'";
+		$sql .= " AND a.fk_adherent_type = ta.rowid";
+		// Filter on type
+		if (GETPOST('filter_type', 'int') > 0) $sql .= " AND ta.rowid='".$this->db->escape(GETPOST('filter_type', 'int'))."'";
+		$sql .= " ORDER BY a.email";
+		//print $sql;
 
-        // Add targets into table
-        dol_syslog(get_class($this)."::add_to_target", LOG_DEBUG);
-        $result = $this->db->query($sql);
-        if ($result)
-        {
-            $num = $this->db->num_rows($result);
-            $i = 0;
-            $j = 0;
+		// Add targets into table
+		dol_syslog(get_class($this)."::add_to_target", LOG_DEBUG);
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+			$num = $this->db->num_rows($result);
+			$i = 0;
+			$j = 0;
 
-            dol_syslog(get_class($this)."::add_to_target mailing ".$num." targets found");
+			dol_syslog(get_class($this)."::add_to_target mailing ".$num." targets found");
 
-            $old = '';
-            while ($i < $num)
-            {
-                $obj = $this->db->fetch_object($result);
-                if ($old <> $obj->email)
-                {
-                    $cibles[$j] = array(
-                                'email' => $obj->email,
-                                'fk_contact' => $obj->fk_contact,
-                                'lastname' => $obj->lastname,
-                                'firstname' => $obj->firstname,
-                                'other' =>
-                                ($langs->transnoentities("Login").'='.$obj->login).';'.
-                                ($langs->transnoentities("UserTitle").'='.($obj->civility_id ? $langs->transnoentities("Civility".$obj->civility_id) : '')).';'.
-                                ($langs->transnoentities("DateEnd").'='.dol_print_date($this->db->jdate($obj->datefin), 'day')).';'.
-                                ($langs->transnoentities("Company").'='.$obj->societe),
-                                'source_url' => $this->url($obj->id),
-                                'source_id' => $obj->id,
-                                'source_type' => 'member'
-                    );
-                    $old = $obj->email;
-                    $j++;
-                }
+			$old = '';
+			while ($i < $num)
+			{
+				$obj = $this->db->fetch_object($result);
+				if ($old <> $obj->email)
+				{
+					$cibles[$j] = array(
+								'email' => $obj->email,
+								'fk_contact' => $obj->fk_contact,
+								'lastname' => $obj->lastname,
+								'firstname' => $obj->firstname,
+								'other' =>
+								($langs->transnoentities("Login").'='.$obj->login).';'.
+								($langs->transnoentities("UserTitle").'='.($obj->civility_id ? $langs->transnoentities("Civility".$obj->civility_id) : '')).';'.
+								($langs->transnoentities("DateEnd").'='.dol_print_date($this->db->jdate($obj->datefin), 'day')).';'.
+								($langs->transnoentities("Company").'='.$obj->societe),
+								'source_url' => $this->url($obj->id),
+								'source_id' => $obj->id,
+								'source_type' => 'member'
+					);
+					$old = $obj->email;
+					$j++;
+				}
 
-                $i++;
-            }
-        } else {
-            dol_syslog($this->db->error());
-            $this->error = $this->db->error();
-            return -1;
-        }
+				$i++;
+			}
+		} else {
+			dol_syslog($this->db->error());
+			$this->error = $this->db->error();
+			return -1;
+		}
 
-        return parent::addTargetsToDatabase($mailing_id, $cibles);
-    }
+		return parent::addTargetsToDatabase($mailing_id, $cibles);
+	}
 }
diff --git a/htdocs/core/modules/mailings/modules_mailings.php b/htdocs/core/modules/mailings/modules_mailings.php
index 4c078a39130..5b1530bf02c 100644
--- a/htdocs/core/modules/mailings/modules_mailings.php
+++ b/htdocs/core/modules/mailings/modules_mailings.php
@@ -31,180 +31,180 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php';
  */
 class MailingTargets // This can't be abstract as it is used for some method
 {
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    /**
+	/**
 	 * @var string Error code (or message)
 	 */
 	public $error = '';
 
-    public $tooltip = '';
+	public $tooltip = '';
 
 
-    /**
+	/**
 	 *	Constructor
 	 *
 	 *  @param		DoliDB		$db      Database handler
 	 */
-    public function __construct($db)
+	public function __construct($db)
 	{
-        $this->db = $db;
+		$this->db = $db;
 	}
 
-    /**
-     * Return description of email selector
-     *
-     * @return     string      Return translation of module label. Try translation of $this->name then translation of 'MailingModuleDesc'.$this->name, or $this->desc if not found
-     */
-    public function getDesc()
-    {
-        global $langs, $form;
+	/**
+	 * Return description of email selector
+	 *
+	 * @return     string      Return translation of module label. Try translation of $this->name then translation of 'MailingModuleDesc'.$this->name, or $this->desc if not found
+	 */
+	public function getDesc()
+	{
+		global $langs, $form;
 
-        $langs->load("mails");
-        $transstring = "MailingModuleDesc".$this->name;
-        $s = '';
+		$langs->load("mails");
+		$transstring = "MailingModuleDesc".$this->name;
+		$s = '';
 
-        if ($langs->trans($this->name) != $this->name) $s = $langs->trans($this->name);
-        elseif ($langs->trans($transstring) != $transstring) $s = $langs->trans($transstring);
-        else $s = $this->desc;
+		if ($langs->trans($this->name) != $this->name) $s = $langs->trans($this->name);
+		elseif ($langs->trans($transstring) != $transstring) $s = $langs->trans($transstring);
+		else $s = $this->desc;
 
-        if ($this->tooltip && is_object($form)) $s .= ' '.$form->textwithpicto('', $langs->trans($this->tooltip), 1, 1);
-        return $s;
-    }
+		if ($this->tooltip && is_object($form)) $s .= ' '.$form->textwithpicto('', $langs->trans($this->tooltip), 1, 1);
+		return $s;
+	}
 
-    /**
+	/**
 	 *	Return number of records for email selector
-     *
-     *  @return     integer      Example
-     */
-    public function getNbOfRecords()
-    {
-        return 0;
-    }
+	 *
+	 *  @return     integer      Example
+	 */
+	public function getNbOfRecords()
+	{
+		return 0;
+	}
 
-    /**
-     * Retourne nombre de destinataires
-     *
-     * @param      string	$sql        Sql request to count
-     * @return     int       			Nb of recipient, or <0 if error
-     */
-    public function getNbOfRecipients($sql)
-    {
-        $result = $this->db->query($sql);
-        if ($result)
-        {
-            $obj = $this->db->fetch_object($result);
-            return $obj->nb;
-        } else {
-        	$this->error = $this->db->lasterror();
-            return -1;
-        }
-    }
+	/**
+	 * Retourne nombre de destinataires
+	 *
+	 * @param      string	$sql        Sql request to count
+	 * @return     int       			Nb of recipient, or <0 if error
+	 */
+	public function getNbOfRecipients($sql)
+	{
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+			$obj = $this->db->fetch_object($result);
+			return $obj->nb;
+		} else {
+			$this->error = $this->db->lasterror();
+			return -1;
+		}
+	}
 
-    /**
-     * Affiche formulaire de filtre qui apparait dans page de selection
-     * des destinataires de mailings
-     *
-     * @return     string      Retourne zone select
-     */
-    public function formFilter()
-    {
-        return '';
-    }
+	/**
+	 * Affiche formulaire de filtre qui apparait dans page de selection
+	 * des destinataires de mailings
+	 *
+	 * @return     string      Retourne zone select
+	 */
+	public function formFilter()
+	{
+		return '';
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * Met a jour nombre de destinataires
-     *
-     * @param	int		$mailing_id          Id of emailing
-     * @return  int			                 < 0 si erreur, nb destinataires si ok
-     */
-    public function update_nb($mailing_id)
-    {
-        // phpcs:enable
-        // Mise a jour nombre de destinataire dans table des mailings
-        $sql = "SELECT COUNT(*) nb FROM ".MAIN_DB_PREFIX."mailing_cibles";
-        $sql .= " WHERE fk_mailing = ".$mailing_id;
-        $result = $this->db->query($sql);
-        if ($result)
-        {
-            $obj = $this->db->fetch_object($result);
-            $nb = $obj->nb;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Met a jour nombre de destinataires
+	 *
+	 * @param	int		$mailing_id          Id of emailing
+	 * @return  int			                 < 0 si erreur, nb destinataires si ok
+	 */
+	public function update_nb($mailing_id)
+	{
+		// phpcs:enable
+		// Mise a jour nombre de destinataire dans table des mailings
+		$sql = "SELECT COUNT(*) nb FROM ".MAIN_DB_PREFIX."mailing_cibles";
+		$sql .= " WHERE fk_mailing = ".$mailing_id;
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+			$obj = $this->db->fetch_object($result);
+			$nb = $obj->nb;
 
-            $sql = "UPDATE ".MAIN_DB_PREFIX."mailing";
-            $sql .= " SET nbemail = ".$nb." WHERE rowid = ".$mailing_id;
-            if (!$this->db->query($sql))
-            {
-                dol_syslog($this->db->error());
-                $this->error = $this->db->error();
-                return -1;
-            }
-        } else {
-            return -1;
-        }
-        return $nb;
-    }
+			$sql = "UPDATE ".MAIN_DB_PREFIX."mailing";
+			$sql .= " SET nbemail = ".$nb." WHERE rowid = ".$mailing_id;
+			if (!$this->db->query($sql))
+			{
+				dol_syslog($this->db->error());
+				$this->error = $this->db->error();
+				return -1;
+			}
+		} else {
+			return -1;
+		}
+		return $nb;
+	}
 
-    /**
-     * Add a list of targets int the database
-     *
-     * @param	int		$mailing_id    Id of emailing
-     * @param   array	$cibles        Array with targets
-     * @return  int      			   < 0 si erreur, nb ajout si ok
-     */
-    public function addTargetsToDatabase($mailing_id, $cibles)
-    {
-    	global $conf;
+	/**
+	 * Add a list of targets int the database
+	 *
+	 * @param	int		$mailing_id    Id of emailing
+	 * @param   array	$cibles        Array with targets
+	 * @return  int      			   < 0 si erreur, nb ajout si ok
+	 */
+	public function addTargetsToDatabase($mailing_id, $cibles)
+	{
+		global $conf;
 
-    	$this->db->begin();
+		$this->db->begin();
 
-        // Insert emailing targets from array into database
-        $j = 0;
-        $num = count($cibles);
-        foreach ($cibles as $targetarray)
-        {
-        	if (!empty($targetarray['email'])) // avoid empty email address
-        	{
-        		$sql = "INSERT INTO ".MAIN_DB_PREFIX."mailing_cibles";
-        		$sql .= " (fk_mailing,";
-        		$sql .= " fk_contact,";
-        		$sql .= " lastname, firstname, email, other, source_url, source_id,";
-       			$sql .= " tag,";
-        		$sql .= " source_type)";
-        		$sql .= " VALUES (".$mailing_id.",";
-        		$sql .= (empty($targetarray['fk_contact']) ? '0' : "'".$this->db->escape($targetarray['fk_contact'])."'").",";
-        		$sql .= "'".$this->db->escape($targetarray['lastname'])."',";
-        		$sql .= "'".$this->db->escape($targetarray['firstname'])."',";
-        		$sql .= "'".$this->db->escape($targetarray['email'])."',";
-        		$sql .= "'".$this->db->escape($targetarray['other'])."',";
-        		$sql .= "'".$this->db->escape($targetarray['source_url'])."',";
-        		$sql .= (empty($targetarray['source_id']) ? 'null' : "'".$this->db->escape($targetarray['source_id'])."'").",";
-       			$sql .= "'".$this->db->escape(dol_hash($targetarray['email'].';'.$targetarray['lastname'].';'.$mailing_id.';'.$conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY))."',";
-        		$sql .= "'".$this->db->escape($targetarray['source_type'])."')";
-        		dol_syslog(__METHOD__, LOG_DEBUG);
-        		$result = $this->db->query($sql);
-        		if ($result)
-        		{
-        			$j++;
-        		} else {
-        			if ($this->db->errno() != 'DB_ERROR_RECORD_ALREADY_EXISTS')
-        			{
-        				// Si erreur autre que doublon
-        				dol_syslog($this->db->error().' : '.$targetarray['email']);
-        				$this->error = $this->db->error().' : '.$targetarray['email'];
-        				$this->db->rollback();
-        				return -1;
-        			}
-        		}
-        	}
-        }
+		// Insert emailing targets from array into database
+		$j = 0;
+		$num = count($cibles);
+		foreach ($cibles as $targetarray)
+		{
+			if (!empty($targetarray['email'])) // avoid empty email address
+			{
+				$sql = "INSERT INTO ".MAIN_DB_PREFIX."mailing_cibles";
+				$sql .= " (fk_mailing,";
+				$sql .= " fk_contact,";
+				$sql .= " lastname, firstname, email, other, source_url, source_id,";
+	   			$sql .= " tag,";
+				$sql .= " source_type)";
+				$sql .= " VALUES (".$mailing_id.",";
+				$sql .= (empty($targetarray['fk_contact']) ? '0' : "'".$this->db->escape($targetarray['fk_contact'])."'").",";
+				$sql .= "'".$this->db->escape($targetarray['lastname'])."',";
+				$sql .= "'".$this->db->escape($targetarray['firstname'])."',";
+				$sql .= "'".$this->db->escape($targetarray['email'])."',";
+				$sql .= "'".$this->db->escape($targetarray['other'])."',";
+				$sql .= "'".$this->db->escape($targetarray['source_url'])."',";
+				$sql .= (empty($targetarray['source_id']) ? 'null' : "'".$this->db->escape($targetarray['source_id'])."'").",";
+	   			$sql .= "'".$this->db->escape(dol_hash($targetarray['email'].';'.$targetarray['lastname'].';'.$mailing_id.';'.$conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY))."',";
+				$sql .= "'".$this->db->escape($targetarray['source_type'])."')";
+				dol_syslog(__METHOD__, LOG_DEBUG);
+				$result = $this->db->query($sql);
+				if ($result)
+				{
+					$j++;
+				} else {
+					if ($this->db->errno() != 'DB_ERROR_RECORD_ALREADY_EXISTS')
+					{
+						// Si erreur autre que doublon
+						dol_syslog($this->db->error().' : '.$targetarray['email']);
+						$this->error = $this->db->error().' : '.$targetarray['email'];
+						$this->db->rollback();
+						return -1;
+					}
+				}
+			}
+		}
 
-        dol_syslog(__METHOD__.": mailing ".$j." targets added");
+		dol_syslog(__METHOD__.": mailing ".$j." targets added");
 
-        /*
+		/*
         //Update the status to show thirdparty mail that don't want to be contacted anymore'
         $sql = "UPDATE ".MAIN_DB_PREFIX."mailing_cibles";
         $sql .= " SET statut=3";
@@ -222,42 +222,42 @@ class MailingTargets // This can't be abstract as it is used for some method
         $result=$this->db->query($sql);
 		*/
 
-        $sql = "UPDATE ".MAIN_DB_PREFIX."mailing_cibles";
-        $sql .= " SET statut=3";
-        $sql .= " WHERE fk_mailing=".$mailing_id." AND email IN (SELECT mu.email FROM ".MAIN_DB_PREFIX."mailing_unsubscribe AS mu WHERE mu.entity IN ('".getEntity('mailing')."'))";
+		$sql = "UPDATE ".MAIN_DB_PREFIX."mailing_cibles";
+		$sql .= " SET statut=3";
+		$sql .= " WHERE fk_mailing=".$mailing_id." AND email IN (SELECT mu.email FROM ".MAIN_DB_PREFIX."mailing_unsubscribe AS mu WHERE mu.entity IN ('".getEntity('mailing')."'))";
 
-        dol_syslog(__METHOD__.":mailing update status to display emails that do not want to be contacted anymore", LOG_DEBUG);
-        $result = $this->db->query($sql);
-        if (!$result)
-        {
-        	dol_print_error($this->db);
-        }
+		dol_syslog(__METHOD__.":mailing update status to display emails that do not want to be contacted anymore", LOG_DEBUG);
+		$result = $this->db->query($sql);
+		if (!$result)
+		{
+			dol_print_error($this->db);
+		}
 
-        $this->update_nb($mailing_id);
+		$this->update_nb($mailing_id);
 
-        $this->db->commit();
+		$this->db->commit();
 
-        return $j;
-    }
+		return $j;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Supprime tous les destinataires de la table des cibles
-     *
-     *  @param  int		$mailing_id        Id of emailing
-     *  @return	void
-     */
-    public function clear_target($mailing_id)
-    {
-        // phpcs:enable
-        $sql = "DELETE FROM ".MAIN_DB_PREFIX."mailing_cibles";
-        $sql .= " WHERE fk_mailing = ".$mailing_id;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Supprime tous les destinataires de la table des cibles
+	 *
+	 *  @param  int		$mailing_id        Id of emailing
+	 *  @return	void
+	 */
+	public function clear_target($mailing_id)
+	{
+		// phpcs:enable
+		$sql = "DELETE FROM ".MAIN_DB_PREFIX."mailing_cibles";
+		$sql .= " WHERE fk_mailing = ".$mailing_id;
 
-        if (!$this->db->query($sql))
-        {
-            dol_syslog($this->db->error());
-        }
+		if (!$this->db->query($sql))
+		{
+			dol_syslog($this->db->error());
+		}
 
-        $this->update_nb($mailing_id);
-    }
+		$this->update_nb($mailing_id);
+	}
 }
diff --git a/htdocs/core/modules/mailings/pomme.modules.php b/htdocs/core/modules/mailings/pomme.modules.php
index 52da4f87a32..aea4158fb21 100644
--- a/htdocs/core/modules/mailings/pomme.modules.php
+++ b/htdocs/core/modules/mailings/pomme.modules.php
@@ -42,9 +42,9 @@ class mailing_pomme extends MailingTargets
 	public $picto = 'user';
 
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
 
 	/**
@@ -52,13 +52,13 @@ class mailing_pomme extends MailingTargets
 	 *
 	 *  @param		DoliDB		$db      Database handler
 	 */
-    public function __construct($db)
+	public function __construct($db)
 	{
 		$this->db = $db;
 	}
 
 
-    /**
+	/**
 	 *	On the main mailing area, there is a box with statistics.
 	 *	If you want to add a line in this report you must provide an
 	 *	array of SQL request that returns two field:
@@ -66,7 +66,7 @@ class mailing_pomme extends MailingTargets
 	 *
 	 *	@return		string[]		Array with SQL requests
 	 */
-    public function getSqlArrayForStats()
+	public function getSqlArrayForStats()
 	{
 		global $conf, $langs;
 
@@ -84,15 +84,15 @@ class mailing_pomme extends MailingTargets
 	}
 
 
-    /**
-     *	Return here number of distinct emails returned by your selector.
-     *	For example if this selector is used to extract 500 different
-     *	emails from a text file, this function must return 500.
-     *
-     *	@param	string	$sql		SQL request to use to count
-     *	@return	int					Number of recipients
-     */
-    public function getNbOfRecipients($sql = '')
+	/**
+	 *	Return here number of distinct emails returned by your selector.
+	 *	For example if this selector is used to extract 500 different
+	 *	emails from a text file, this function must return 500.
+	 *
+	 *	@param	string	$sql		SQL request to use to count
+	 *	@return	int					Number of recipients
+	 */
+	public function getNbOfRecipients($sql = '')
 	{
 		global $conf;
 
@@ -112,7 +112,7 @@ class mailing_pomme extends MailingTargets
 	 *
 	 *  @return     string      Retourne zone select
 	 */
-    public function formFilter()
+	public function formFilter()
 	{
 		global $langs;
 
@@ -141,26 +141,26 @@ class mailing_pomme extends MailingTargets
 	/**
 	 *  Renvoie url lien vers fiche de la source du destinataire du mailing
 	 *
-     *  @param	int		$id		ID
+	 *  @param	int		$id		ID
 	 *  @return     string      Url lien
 	 */
-    public function url($id)
+	public function url($id)
 	{
 		return '<a href="'.DOL_URL_ROOT.'/user/card.php?id='.$id.'">'.img_object('', "user").'</a>';
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Ajoute destinataires dans table des cibles
 	 *
 	 *  @param	int		$mailing_id    	Id of emailing
 	 *  @return int           			< 0 si erreur, nb ajout si ok
 	 */
-    public function add_to_target($mailing_id)
+	public function add_to_target($mailing_id)
 	{
-        // phpcs:enable
-	    global $conf, $langs;
+		// phpcs:enable
+		global $conf, $langs;
 		$langs->load("companies");
 
 		$cibles = array();
@@ -195,17 +195,17 @@ class mailing_pomme extends MailingTargets
 				if ($old <> $obj->email)
 				{
 					$cibles[$j] = array(
-                    	'email' => $obj->email,
-                    	'fk_contact' => $obj->fk_contact,
-                    	'lastname' => $obj->lastname,
-                    	'firstname' => $obj->firstname,
-                    	'other' =>
-					        ($langs->transnoentities("Login").'='.$obj->login).';'.
-                            ($langs->transnoentities("UserTitle").'='.$obj->civility_id).';'.
-					        ($langs->transnoentities("PhonePro").'='.$obj->office_phone),
-                        'source_url' => $this->url($obj->id),
-                        'source_id' => $obj->id,
-                        'source_type' => 'user'
+						'email' => $obj->email,
+						'fk_contact' => $obj->fk_contact,
+						'lastname' => $obj->lastname,
+						'firstname' => $obj->firstname,
+						'other' =>
+							($langs->transnoentities("Login").'='.$obj->login).';'.
+							($langs->transnoentities("UserTitle").'='.$obj->civility_id).';'.
+							($langs->transnoentities("PhonePro").'='.$obj->office_phone),
+						'source_url' => $this->url($obj->id),
+						'source_id' => $obj->id,
+						'source_type' => 'user'
 					);
 					$old = $obj->email;
 					$j++;
@@ -220,5 +220,5 @@ class mailing_pomme extends MailingTargets
 		}
 
 		return parent::addTargetsToDatabase($mailing_id, $cibles);
-    }
+	}
 }
diff --git a/htdocs/core/modules/mailings/thirdparties.modules.php b/htdocs/core/modules/mailings/thirdparties.modules.php
index b286de97196..b2a082498c6 100644
--- a/htdocs/core/modules/mailings/thirdparties.modules.php
+++ b/htdocs/core/modules/mailings/thirdparties.modules.php
@@ -37,9 +37,9 @@ class mailing_thirdparties extends MailingTargets
 	public $picto = 'company';
 
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
 
 	/**
@@ -47,99 +47,99 @@ class mailing_thirdparties extends MailingTargets
 	 *
 	 *  @param		DoliDB		$db      Database handler
 	 */
-    public function __construct($db)
+	public function __construct($db)
 	{
 		global $conf, $langs;
-        $langs->load("companies");
+		$langs->load("companies");
 
 		$this->db = $db;
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *    This is the main function that returns the array of emails
 	 *
 	 *    @param	int		$mailing_id    	Id of mailing. No need to use it.
 	 *    @return   int 					<0 if error, number of emails added if ok
 	 */
-    public function add_to_target($mailing_id)
+	public function add_to_target($mailing_id)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $langs;
 
 		$cibles = array();
 
-        $addDescription = "";
+		$addDescription = "";
 		// Select the third parties from category
 		if (empty($_POST['filter']))
 		{
-		    $sql = "SELECT s.rowid as id, s.email as email, s.nom as name, null as fk_contact, null as firstname, null as label";
-		    $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
-		    $sql .= " WHERE s.email <> ''";
-		    $sql .= " AND s.entity IN (".getEntity('societe').")";
-		    $sql .= " AND s.email NOT IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE fk_mailing=".$mailing_id.")";
+			$sql = "SELECT s.rowid as id, s.email as email, s.nom as name, null as fk_contact, null as firstname, null as label";
+			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+			$sql .= " WHERE s.email <> ''";
+			$sql .= " AND s.entity IN (".getEntity('societe').")";
+			$sql .= " AND s.email NOT IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE fk_mailing=".$mailing_id.")";
 		} else {
-            $addFilter = "";
-            if (isset($_POST["filter_client"]) && $_POST["filter_client"] <> '-1')
-            {
-                $addFilter .= " AND s.client=".$_POST["filter_client"];
-                $addDescription = $langs->trans('ProspectCustomer')."=";
-                if ($_POST["filter_client"] == 0)
-                {
-                    $addDescription .= $langs->trans('NorProspectNorCustomer');
-                } elseif ($_POST["filter_client"] == 1)
-                {
-                    $addDescription .= $langs->trans('Customer');
-                } elseif ($_POST["filter_client"] == 2)
-                {
-                    $addDescription .= $langs->trans('Prospect');
-                } elseif ($_POST["filter_client"] == 3)
-                {
-                    $addDescription .= $langs->trans('ProspectCustomer');
-                } else {
-                    $addDescription .= "Unknown status ".$_POST["filter_client"];
-                }
-            }
-            if (isset($_POST["filter_status"]))
-            {
-                if (strlen($addDescription) > 0)
-                {
-                    $addDescription .= ";";
-                }
-                $addDescription .= $langs->trans("Status")."=";
-                if ($_POST["filter_status"] == '1')
-                {
-                    $addFilter .= " AND s.status=1";
-                    $addDescription .= $langs->trans("Enabled");
-                } else {
-                    $addFilter .= " AND s.status=0";
-                    $addDescription .= $langs->trans("Disabled");
-                }
-            }
-		    $sql = "SELECT s.rowid as id, s.email as email, s.nom as name, null as fk_contact, null as firstname, c.label as label";
-		    $sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."categorie_societe as cs, ".MAIN_DB_PREFIX."categorie as c";
-		    $sql .= " WHERE s.email <> ''";
-		    $sql .= " AND s.entity IN (".getEntity('societe').")";
-		    $sql .= " AND s.email NOT IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE fk_mailing=".$mailing_id.")";
-		    $sql .= " AND cs.fk_soc = s.rowid";
-		    $sql .= " AND c.rowid = cs.fk_categorie";
-		    $sql .= " AND c.rowid='".$this->db->escape($_POST['filter'])."'";
-            $sql .= $addFilter;
-		    $sql .= " UNION ";
-		    $sql .= "SELECT s.rowid as id, s.email as email, s.nom as name, null as fk_contact, null as firstname, c.label as label";
-		    $sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."categorie_fournisseur as cs, ".MAIN_DB_PREFIX."categorie as c";
-		    $sql .= " WHERE s.email <> ''";
-		    $sql .= " AND s.entity IN (".getEntity('societe').")";
-		    $sql .= " AND s.email NOT IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE fk_mailing=".$mailing_id.")";
-		    $sql .= " AND cs.fk_soc = s.rowid";
-		    $sql .= " AND c.rowid = cs.fk_categorie";
-		    $sql .= " AND c.rowid='".$this->db->escape($_POST['filter'])."'";
-            $sql .= $addFilter;
-        }
-        $sql .= " ORDER BY email";
+			$addFilter = "";
+			if (isset($_POST["filter_client"]) && $_POST["filter_client"] <> '-1')
+			{
+				$addFilter .= " AND s.client=".$_POST["filter_client"];
+				$addDescription = $langs->trans('ProspectCustomer')."=";
+				if ($_POST["filter_client"] == 0)
+				{
+					$addDescription .= $langs->trans('NorProspectNorCustomer');
+				} elseif ($_POST["filter_client"] == 1)
+				{
+					$addDescription .= $langs->trans('Customer');
+				} elseif ($_POST["filter_client"] == 2)
+				{
+					$addDescription .= $langs->trans('Prospect');
+				} elseif ($_POST["filter_client"] == 3)
+				{
+					$addDescription .= $langs->trans('ProspectCustomer');
+				} else {
+					$addDescription .= "Unknown status ".$_POST["filter_client"];
+				}
+			}
+			if (isset($_POST["filter_status"]))
+			{
+				if (strlen($addDescription) > 0)
+				{
+					$addDescription .= ";";
+				}
+				$addDescription .= $langs->trans("Status")."=";
+				if ($_POST["filter_status"] == '1')
+				{
+					$addFilter .= " AND s.status=1";
+					$addDescription .= $langs->trans("Enabled");
+				} else {
+					$addFilter .= " AND s.status=0";
+					$addDescription .= $langs->trans("Disabled");
+				}
+			}
+			$sql = "SELECT s.rowid as id, s.email as email, s.nom as name, null as fk_contact, null as firstname, c.label as label";
+			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."categorie_societe as cs, ".MAIN_DB_PREFIX."categorie as c";
+			$sql .= " WHERE s.email <> ''";
+			$sql .= " AND s.entity IN (".getEntity('societe').")";
+			$sql .= " AND s.email NOT IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE fk_mailing=".$mailing_id.")";
+			$sql .= " AND cs.fk_soc = s.rowid";
+			$sql .= " AND c.rowid = cs.fk_categorie";
+			$sql .= " AND c.rowid='".$this->db->escape($_POST['filter'])."'";
+			$sql .= $addFilter;
+			$sql .= " UNION ";
+			$sql .= "SELECT s.rowid as id, s.email as email, s.nom as name, null as fk_contact, null as firstname, c.label as label";
+			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."categorie_fournisseur as cs, ".MAIN_DB_PREFIX."categorie as c";
+			$sql .= " WHERE s.email <> ''";
+			$sql .= " AND s.entity IN (".getEntity('societe').")";
+			$sql .= " AND s.email NOT IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE fk_mailing=".$mailing_id.")";
+			$sql .= " AND cs.fk_soc = s.rowid";
+			$sql .= " AND c.rowid = cs.fk_categorie";
+			$sql .= " AND c.rowid='".$this->db->escape($_POST['filter'])."'";
+			$sql .= $addFilter;
+		}
+		$sql .= " ORDER BY email";
 
-        // Stock recipients emails into targets table
+		// Stock recipients emails into targets table
 		$result = $this->db->query($sql);
 		if ($result)
 		{
@@ -162,14 +162,14 @@ class mailing_thirdparties extends MailingTargets
 					}
 					$otherTxt .= $addDescription;
 					$cibles[$j] = array(
-                    			'email' => $obj->email,
-                    			'fk_contact' => $obj->fk_contact,
-                    			'lastname' => $obj->name, // For a thirdparty, we must use name
-                    			'firstname' => '', // For a thirdparty, lastname is ''
-                    			'other' => $otherTxt,
-                                'source_url' => $this->url($obj->id),
-                                'source_id' => $obj->id,
-                                'source_type' => 'thirdparty'
+								'email' => $obj->email,
+								'fk_contact' => $obj->fk_contact,
+								'lastname' => $obj->name, // For a thirdparty, we must use name
+								'firstname' => '', // For a thirdparty, lastname is ''
+								'other' => $otherTxt,
+								'source_url' => $this->url($obj->id),
+								'source_id' => $obj->id,
+								'source_type' => 'thirdparty'
 					);
 					$old = $obj->email;
 					$j++;
@@ -187,7 +187,7 @@ class mailing_thirdparties extends MailingTargets
 	}
 
 
-    /**
+	/**
 	 *	On the main mailing area, there is a box with statistics.
 	 *	If you want to add a line in this report you must provide an
 	 *	array of SQL request that returns two field:
@@ -195,7 +195,7 @@ class mailing_thirdparties extends MailingTargets
 	 *
 	 *	@return		array		Array with SQL requests
 	 */
-    public function getSqlArrayForStats()
+	public function getSqlArrayForStats()
 	{
 		// CHANGE THIS: Optionnal
 
@@ -213,7 +213,7 @@ class mailing_thirdparties extends MailingTargets
 	 *  @param      string	$sql        Requete sql de comptage
 	 *	@return		int					Nb of recipients
 	 */
-    public function getNbOfRecipients($sql = '')
+	public function getNbOfRecipients($sql = '')
 	{
 		global $conf;
 
@@ -233,7 +233,7 @@ class mailing_thirdparties extends MailingTargets
 	 *
 	 *  @return     string      A html select zone
 	 */
-    public function formFilter()
+	public function formFilter()
 	{
 		global $conf, $langs;
 
@@ -279,39 +279,39 @@ class mailing_thirdparties extends MailingTargets
 		}
 
 		$s .= '</select> ';
-        $s .= $langs->trans('ProspectCustomer');
-        $s .= ': <select name="filter_client" class="flat">';
-        $s .= '<option value="-1">&nbsp;</option>';
-        if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) {
-            $s .= '<option value="2">'.$langs->trans('Prospect').'</option>';
-        }
-        if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS) && empty($conf->global->SOCIETE_DISABLE_PROSPECTSCUSTOMERS)) {
-            $s .= '<option value="3">'.$langs->trans('ProspectCustomer').'</option>';
-        }
-        if (empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) {
-            $s .= '<option value="1">'.$langs->trans('Customer').'</option>';
-        }
-        $s .= '<option value="0">'.$langs->trans('NorProspectNorCustomer').'</option>';
+		$s .= $langs->trans('ProspectCustomer');
+		$s .= ': <select name="filter_client" class="flat">';
+		$s .= '<option value="-1">&nbsp;</option>';
+		if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) {
+			$s .= '<option value="2">'.$langs->trans('Prospect').'</option>';
+		}
+		if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS) && empty($conf->global->SOCIETE_DISABLE_PROSPECTSCUSTOMERS)) {
+			$s .= '<option value="3">'.$langs->trans('ProspectCustomer').'</option>';
+		}
+		if (empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) {
+			$s .= '<option value="1">'.$langs->trans('Customer').'</option>';
+		}
+		$s .= '<option value="0">'.$langs->trans('NorProspectNorCustomer').'</option>';
 
-        $s .= '</select> ';
+		$s .= '</select> ';
 
-        $s .= $langs->trans("Status");
-        $s .= ': <select name="filter_status" class="flat">';
-        $s .= '<option value="-1">&nbsp;</option>';
-        $s .= '<option value="1" selected>'.$langs->trans("Enabled").'</option>';
-        $s .= '<option value="0">'.$langs->trans("Disabled").'</option>';
-        $s .= '</select>';
+		$s .= $langs->trans("Status");
+		$s .= ': <select name="filter_status" class="flat">';
+		$s .= '<option value="-1">&nbsp;</option>';
+		$s .= '<option value="1" selected>'.$langs->trans("Enabled").'</option>';
+		$s .= '<option value="0">'.$langs->trans("Disabled").'</option>';
+		$s .= '</select>';
 		return $s;
 	}
 
 
-    /**
+	/**
 	 *  Can include an URL link on each record provided by selector shown on target page.
 	 *
-     *  @param	int		$id		ID
+	 *  @param	int		$id		ID
 	 *  @return string      	Url link
 	 */
-    public function url($id)
+	public function url($id)
 	{
 		return '<a href="'.DOL_URL_ROOT.'/societe/card.php?socid='.$id.'">'.img_object('', "company").'</a>';
 	}
diff --git a/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php b/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
index 51bdb7b6b87..d6eea141bab 100644
--- a/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
+++ b/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
@@ -22,224 +22,224 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
  */
 class mailing_thirdparties_services_expired extends MailingTargets
 {
-    public $name = 'DolibarrContractsLinesExpired';
+	public $name = 'DolibarrContractsLinesExpired';
 	// This label is used if no translation is found for key XXX neither MailingModuleDescXXX where XXX=name is found
-    public $desc = 'Third parties with expired contract\'s lines';
-    public $require_admin = 0;
+	public $desc = 'Third parties with expired contract\'s lines';
+	public $require_admin = 0;
 
-    public $require_module = array('contrat');
+	public $require_module = array('contrat');
 
-    /**
-     * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
-     */
-    public $picto = 'company';
+	/**
+	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+	 */
+	public $picto = 'company';
 
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $arrayofproducts = array();
+	public $arrayofproducts = array();
 
 
-    /**
-     *	Constructor
-     *
-     *  @param		DoliDB		$db      Database handler
-     */
-    public function __construct($db)
-    {
-    	global $conf;
+	/**
+	 *	Constructor
+	 *
+	 *  @param		DoliDB		$db      Database handler
+	 */
+	public function __construct($db)
+	{
+		global $conf;
 
-        $this->db = $db;
+		$this->db = $db;
 
-        $this->arrayofproducts = array();
+		$this->arrayofproducts = array();
 
-        // List of services
-        $sql = "SELECT ref FROM ".MAIN_DB_PREFIX."product";
-        $sql .= " WHERE entity IN (".getEntity('product').")";
-        if (empty($conf->global->CONTRACT_SUPPORT_PRODUCTS)) $sql .= " AND fk_product_type = 1"; // By default, only services
-        $sql .= " ORDER BY ref";
-        $result = $this->db->query($sql);
-        if ($result)
-        {
-            $num = $this->db->num_rows($result);
-            dol_syslog("dolibarr_services_expired.modules.php:mailing_dolibarr_services_expired ".$num." services found");
+		// List of services
+		$sql = "SELECT ref FROM ".MAIN_DB_PREFIX."product";
+		$sql .= " WHERE entity IN (".getEntity('product').")";
+		if (empty($conf->global->CONTRACT_SUPPORT_PRODUCTS)) $sql .= " AND fk_product_type = 1"; // By default, only services
+		$sql .= " ORDER BY ref";
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+			$num = $this->db->num_rows($result);
+			dol_syslog("dolibarr_services_expired.modules.php:mailing_dolibarr_services_expired ".$num." services found");
 
-            $i = 0;
-            while ($i < $num)
-            {
-                $obj = $this->db->fetch_object($result);
-                $i++;
-                $this->arrayofproducts[$i] = $obj->ref;
-            }
-        } else {
-            dol_print_error($this->db);
-        }
-    }
+			$i = 0;
+			while ($i < $num)
+			{
+				$obj = $this->db->fetch_object($result);
+				$i++;
+				$this->arrayofproducts[$i] = $obj->ref;
+			}
+		} else {
+			dol_print_error($this->db);
+		}
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  This is the main function that returns the array of emails
-     *
-     *  @param	int		$mailing_id    	Id of mailing. No need to use it.
-     *  @return int           			<0 if error, number of emails added if ok
-     */
-    public function add_to_target($mailing_id)
-    {
-        // phpcs:enable
-        $key = GETPOST('filter', 'int');
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  This is the main function that returns the array of emails
+	 *
+	 *  @param	int		$mailing_id    	Id of mailing. No need to use it.
+	 *  @return int           			<0 if error, number of emails added if ok
+	 */
+	public function add_to_target($mailing_id)
+	{
+		// phpcs:enable
+		$key = GETPOST('filter', 'int');
 
-        $cibles = array();
-        $j = 0;
+		$cibles = array();
+		$j = 0;
 
-        $product = '';
-        if ($key == '0')
-        {
-        	$this->error = "Error: You must choose a filter";
-        	$this->errors[] = $this->error;
-        	return $this->error;
-        }
+		$product = '';
+		if ($key == '0')
+		{
+			$this->error = "Error: You must choose a filter";
+			$this->errors[] = $this->error;
+			return $this->error;
+		}
 
-        $product = $this->arrayofproducts[$key];
+		$product = $this->arrayofproducts[$key];
 
-        $now = dol_now();
+		$now = dol_now();
 
-        // La requete doit retourner: id, email, name
-        $sql = "SELECT s.rowid as id, s.email, s.nom as name, cd.rowid as cdid, cd.date_ouverture, cd.date_fin_validite, cd.fk_contrat";
-        $sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."contrat as c";
-        $sql .= ", ".MAIN_DB_PREFIX."contratdet as cd, ".MAIN_DB_PREFIX."product as p";
-        $sql .= " WHERE s.entity IN (".getEntity('societe').")";
-        $sql .= " AND s.email NOT IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE fk_mailing=".$mailing_id.")";
-        $sql .= " AND s.rowid = c.fk_soc AND cd.fk_contrat = c.rowid AND s.email != ''";
-        $sql .= " AND cd.statut= 4 AND cd.fk_product=p.rowid AND p.ref = '".$this->db->escape($product)."'";
-        $sql .= " AND cd.date_fin_validite < '".$this->db->idate($now)."'";
-        $sql .= " ORDER BY s.email";
+		// La requete doit retourner: id, email, name
+		$sql = "SELECT s.rowid as id, s.email, s.nom as name, cd.rowid as cdid, cd.date_ouverture, cd.date_fin_validite, cd.fk_contrat";
+		$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."contrat as c";
+		$sql .= ", ".MAIN_DB_PREFIX."contratdet as cd, ".MAIN_DB_PREFIX."product as p";
+		$sql .= " WHERE s.entity IN (".getEntity('societe').")";
+		$sql .= " AND s.email NOT IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE fk_mailing=".$mailing_id.")";
+		$sql .= " AND s.rowid = c.fk_soc AND cd.fk_contrat = c.rowid AND s.email != ''";
+		$sql .= " AND cd.statut= 4 AND cd.fk_product=p.rowid AND p.ref = '".$this->db->escape($product)."'";
+		$sql .= " AND cd.date_fin_validite < '".$this->db->idate($now)."'";
+		$sql .= " ORDER BY s.email";
 
-        // Stocke destinataires dans cibles
-        $result = $this->db->query($sql);
-        if ($result)
-        {
-            $num = $this->db->num_rows($result);
-            $i = 0;
+		// Stocke destinataires dans cibles
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+			$num = $this->db->num_rows($result);
+			$i = 0;
 
-            dol_syslog(get_class($this)."::add_to_target ".$num." targets found");
+			dol_syslog(get_class($this)."::add_to_target ".$num." targets found");
 
-            $old = '';
-            while ($i < $num)
-            {
-                $obj = $this->db->fetch_object($result);
-                if ($old <> $obj->email)
-                {
-                    $cibles[$j] = array(
+			$old = '';
+			while ($i < $num)
+			{
+				$obj = $this->db->fetch_object($result);
+				if ($old <> $obj->email)
+				{
+					$cibles[$j] = array(
 					'email' => $obj->email,
 					'lastname' => $obj->name, // For thirdparties, lastname must be name
-                    'firstname' => '', // For thirdparties, firstname is ''
+					'firstname' => '', // For thirdparties, firstname is ''
 					'other' =>
-                    ('DateStart='.dol_print_date($this->db->jdate($obj->date_ouverture), 'day')).';'.
-                    ('DateEnd='.dol_print_date($this->db->jdate($obj->date_fin_validite), 'day')).';'.
-                    ('Contract='.$obj->fk_contrat).';'.
-                    ('ContactLine='.$obj->cdid),
+					('DateStart='.dol_print_date($this->db->jdate($obj->date_ouverture), 'day')).';'.
+					('DateEnd='.dol_print_date($this->db->jdate($obj->date_fin_validite), 'day')).';'.
+					('Contract='.$obj->fk_contrat).';'.
+					('ContactLine='.$obj->cdid),
 					'source_url' => $this->url($obj->id),
 					'source_id' => $obj->id,
 					'source_type' => 'thirdparty'
-                    );
-                    $old = $obj->email;
-                    $j++;
-                }
+					);
+					$old = $obj->email;
+					$j++;
+				}
 
-                $i++;
-            }
-        } else {
-            dol_syslog($this->db->lasterror());
-            $this->error = $this->db->lasterror();
-            return -1;
-        }
+				$i++;
+			}
+		} else {
+			dol_syslog($this->db->lasterror());
+			$this->error = $this->db->lasterror();
+			return -1;
+		}
 
-        // ----- Your code end here -----
+		// ----- Your code end here -----
 
-        return parent::addTargetsToDatabase($mailing_id, $cibles);
-    }
+		return parent::addTargetsToDatabase($mailing_id, $cibles);
+	}
 
 
-    /**
-     *	On the main mailing area, there is a box with statistics.
-     *	If you want to add a line in this report you must provide an
-     *	array of SQL request that returns two field:
-     *	One called "label", One called "nb".
-     *
-     *	@return		array		Array with SQL requests
-     */
-    public function getSqlArrayForStats()
-    {
+	/**
+	 *	On the main mailing area, there is a box with statistics.
+	 *	If you want to add a line in this report you must provide an
+	 *	array of SQL request that returns two field:
+	 *	One called "label", One called "nb".
+	 *
+	 *	@return		array		Array with SQL requests
+	 */
+	public function getSqlArrayForStats()
+	{
 
-        //var $statssql=array();
-        //$this->statssql[0]="SELECT field1 as label, count(distinct(email)) as nb FROM mytable WHERE email IS NOT NULL";
+		//var $statssql=array();
+		//$this->statssql[0]="SELECT field1 as label, count(distinct(email)) as nb FROM mytable WHERE email IS NOT NULL";
 
-        return array();
-    }
+		return array();
+	}
 
 
-    /**
-     *	Return here number of distinct emails returned by your selector.
-     *	For example if this selector is used to extract 500 different
-     *	emails from a text file, this function must return 500.
-     *
-     *	@param	string	$sql		SQL request to use to count
-     *	@return	int					Number of recipients
-     */
-    public function getNbOfRecipients($sql = '')
-    {
-        $now = dol_now();
+	/**
+	 *	Return here number of distinct emails returned by your selector.
+	 *	For example if this selector is used to extract 500 different
+	 *	emails from a text file, this function must return 500.
+	 *
+	 *	@param	string	$sql		SQL request to use to count
+	 *	@return	int					Number of recipients
+	 */
+	public function getNbOfRecipients($sql = '')
+	{
+		$now = dol_now();
 
-        // Example: return parent::getNbOfRecipients("SELECT count(*) as nb from dolibarr_table");
-        // Example: return 500;
-        $sql = "SELECT count(*) as nb";
-        $sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."contrat as c";
-        $sql .= ", ".MAIN_DB_PREFIX."contratdet as cd, ".MAIN_DB_PREFIX."product as p";
-        $sql .= " WHERE s.entity IN (".getEntity('societe').")";
-        $sql .= " AND s.rowid = c.fk_soc AND cd.fk_contrat = c.rowid AND s.email != ''";
-        $sql .= " AND cd.statut= 4 AND cd.fk_product=p.rowid";
-        $sql .= " AND p.ref IN ('".join("','", $this->arrayofproducts)."')";
-        $sql .= " AND cd.date_fin_validite < '".$this->db->idate($now)."'";
+		// Example: return parent::getNbOfRecipients("SELECT count(*) as nb from dolibarr_table");
+		// Example: return 500;
+		$sql = "SELECT count(*) as nb";
+		$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."contrat as c";
+		$sql .= ", ".MAIN_DB_PREFIX."contratdet as cd, ".MAIN_DB_PREFIX."product as p";
+		$sql .= " WHERE s.entity IN (".getEntity('societe').")";
+		$sql .= " AND s.rowid = c.fk_soc AND cd.fk_contrat = c.rowid AND s.email != ''";
+		$sql .= " AND cd.statut= 4 AND cd.fk_product=p.rowid";
+		$sql .= " AND p.ref IN ('".join("','", $this->arrayofproducts)."')";
+		$sql .= " AND cd.date_fin_validite < '".$this->db->idate($now)."'";
 
-        $a = parent::getNbOfRecipients($sql);
+		$a = parent::getNbOfRecipients($sql);
 
-        return $a;
-    }
+		return $a;
+	}
 
-    /**
-     *  This is to add a form filter to provide variant of selector
-     *	If used, the HTML select must be called "filter"
-     *
-     *  @return     string      A html select zone
-     */
-    public function formFilter()
-    {
-        global $langs;
+	/**
+	 *  This is to add a form filter to provide variant of selector
+	 *	If used, the HTML select must be called "filter"
+	 *
+	 *  @return     string      A html select zone
+	 */
+	public function formFilter()
+	{
+		global $langs;
 
-        $s = $langs->trans("ProductOrService");
-        $s .= '<select name="filter" class="flat">';
-        if (count($this->arrayofproducts)) $s .= '<option value="0">&nbsp;</option>';
-        else $s .= '<option value="0">'.$langs->trans("ContactsAllShort").'</option>';
-        foreach ($this->arrayofproducts as $key => $val)
-        {
-            $s .= '<option value="'.$key.'">'.$val.'</option>';
-        }
-        $s .= '</select>';
-        return $s;
-    }
+		$s = $langs->trans("ProductOrService");
+		$s .= '<select name="filter" class="flat">';
+		if (count($this->arrayofproducts)) $s .= '<option value="0">&nbsp;</option>';
+		else $s .= '<option value="0">'.$langs->trans("ContactsAllShort").'</option>';
+		foreach ($this->arrayofproducts as $key => $val)
+		{
+			$s .= '<option value="'.$key.'">'.$val.'</option>';
+		}
+		$s .= '</select>';
+		return $s;
+	}
 
 
-    /**
-     *  Can include an URL link on each record provided by selector	shown on target page.
-     *
-     *  @param	int		$id		ID
-     *  @return string      	Url link
-     */
-    public function url($id)
-    {
-        return '<a href="'.DOL_URL_ROOT.'/societe/card.php?socid='.$id.'">'.img_object('', "company").'</a>';
-    }
+	/**
+	 *  Can include an URL link on each record provided by selector	shown on target page.
+	 *
+	 *  @param	int		$id		ID
+	 *  @return string      	Url link
+	 */
+	public function url($id)
+	{
+		return '<a href="'.DOL_URL_ROOT.'/societe/card.php?socid='.$id.'">'.img_object('', "company").'</a>';
+	}
 }
diff --git a/htdocs/core/modules/mailings/xinputfile.modules.php b/htdocs/core/modules/mailings/xinputfile.modules.php
index 3ab0735429e..afc691f3e2e 100644
--- a/htdocs/core/modules/mailings/xinputfile.modules.php
+++ b/htdocs/core/modules/mailings/xinputfile.modules.php
@@ -30,31 +30,31 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
  */
 class mailing_xinputfile extends MailingTargets
 {
-    public $name = 'EmailsFromFile'; // Identifiant du module mailing
-    // This label is used if no translation is found for key XXX neither MailingModuleDescXXX where XXX=name is found
-    public $desc = 'EMails from a file'; // Libelle utilise si aucune traduction pour MailingModuleDescXXX ou XXX=name trouv�e
-    public $require_module = array(); // Module mailing actif si modules require_module actifs
-    public $require_admin = 0; // Module mailing actif pour user admin ou non
+	public $name = 'EmailsFromFile'; // Identifiant du module mailing
+	// This label is used if no translation is found for key XXX neither MailingModuleDescXXX where XXX=name is found
+	public $desc = 'EMails from a file'; // Libelle utilise si aucune traduction pour MailingModuleDescXXX ou XXX=name trouv�e
+	public $require_module = array(); // Module mailing actif si modules require_module actifs
+	public $require_admin = 0; // Module mailing actif pour user admin ou non
 
-    /**
-     * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
-     */
-    public $picto = 'generic';
-    public $tooltip = 'UseFormatFileEmailToTarget';
+	/**
+	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+	 */
+	public $picto = 'generic';
+	public $tooltip = 'UseFormatFileEmailToTarget';
 
 
-    /**
-     *  Constructor
-     *
-     *  @param      DoliDB      $db      Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-    }
+	/**
+	 *  Constructor
+	 *
+	 *  @param      DoliDB      $db      Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
 
 
-    /**
+	/**
 	 *	On the main mailing area, there is a box with statistics.
 	 *	If you want to add a line in this report you must provide an
 	 *	array of SQL request that returns two field:
@@ -62,7 +62,7 @@ class mailing_xinputfile extends MailingTargets
 	 *
 	 *	@return		array		Array with SQL requests
 	 */
-    public function getSqlArrayForStats()
+	public function getSqlArrayForStats()
 	{
 		global $langs;
 		$langs->load("users");
@@ -80,7 +80,7 @@ class mailing_xinputfile extends MailingTargets
 	 *  @param      string	$sql        Sql request to count
 	 *	@return		string				'' means NA
 	 */
-    public function getNbOfRecipients($sql = '')
+	public function getNbOfRecipients($sql = '')
 	{
 		return '';
 	}
@@ -89,10 +89,10 @@ class mailing_xinputfile extends MailingTargets
 	/**
 	 *  Renvoie url lien vers fiche de la source du destinataire du mailing
 	 *
-     *  @param	int		$id		ID
+	 *  @param	int		$id		ID
 	 *  @return string      	Url lien
 	 */
-    public function url($id)
+	public function url($id)
 	{
 		global $langs;
 		return $langs->trans('LineInFile', $id);
@@ -105,7 +105,7 @@ class mailing_xinputfile extends MailingTargets
 	 *
 	 *   @return     string      Retourne zone select
 	 */
-    public function formFilter()
+	public function formFilter()
 	{
 		global $langs;
 
@@ -114,16 +114,16 @@ class mailing_xinputfile extends MailingTargets
 		return $s;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Ajoute destinataires dans table des cibles
 	 *
 	 *  @param	int		$mailing_id    	Id of emailing
 	 *  @return int           			< 0 si erreur, nb ajout si ok
 	 */
-    public function add_to_target($mailing_id)
+	public function add_to_target($mailing_id)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $langs, $_FILES;
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
@@ -147,53 +147,53 @@ class mailing_xinputfile extends MailingTargets
 				if ($handle)
 				{
 					$i = 0;
-		            $j = 0;
+					$j = 0;
 
-            		$old = '';
+					$old = '';
 					while (!feof($handle))
 					{
 						$cpt++;
-				        $buffer = trim(fgets($handle));
-			        	$tab = explode(';', $buffer, 4);
-				        $email = $tab[0];
-				        $name = $tab[1];
-				        $firstname = $tab[2];
-				        $other = $tab[3];
-				        if (!empty($buffer))
-				        {
-			        		//print 'xx'.dol_strlen($buffer).empty($buffer)."<br>\n";
-				        	$id = $cpt;
-					        if (isValidEMail($email))
-					        {
+						$buffer = trim(fgets($handle));
+						$tab = explode(';', $buffer, 4);
+						$email = $tab[0];
+						$name = $tab[1];
+						$firstname = $tab[2];
+						$other = $tab[3];
+						if (!empty($buffer))
+						{
+							//print 'xx'.dol_strlen($buffer).empty($buffer)."<br>\n";
+							$id = $cpt;
+							if (isValidEMail($email))
+							{
 		   						if ($old <> $email)
 								{
 									$cibles[$j] = array(
-					                    			'email' => $email,
-					                    			'lastname' => $name,
-					                    			'firstname' => $firstname,
+													'email' => $email,
+													'lastname' => $name,
+													'firstname' => $firstname,
 													'other' => $other,
-                                                    'source_url' => '',
-                                                    'source_id' => '',
-                                                    'source_type' => 'file'
+													'source_url' => '',
+													'source_id' => '',
+													'source_type' => 'file'
 									);
 									$old = $email;
 									$j++;
 								}
-					        } else {
-					        	$i++;
-					        	$langs->load("errors");
-                                $msg = $langs->trans("ErrorFoundBadEmailInFile", $i, $cpt, $email);
-					        	if (!empty($msg)) $this->error = $msg;
-                                else $this->error = 'ErrorFoundBadEmailInFile '.$i.' '.$cpt.' '.$email; // We experience case where $langs->trans return an empty string.
-					        }
-				        }
-				    }
-				    fclose($handle);
+							} else {
+								$i++;
+								$langs->load("errors");
+								$msg = $langs->trans("ErrorFoundBadEmailInFile", $i, $cpt, $email);
+								if (!empty($msg)) $this->error = $msg;
+								else $this->error = 'ErrorFoundBadEmailInFile '.$i.' '.$cpt.' '.$email; // We experience case where $langs->trans return an empty string.
+							}
+						}
+					}
+					fclose($handle);
 
-				    if ($i > 0)
-				    {
-				    	return -$i;
-				    }
+					if ($i > 0)
+					{
+						return -$i;
+					}
 				} else {
 					$this->error = $langs->trans("ErrorFaildToOpenFile");
 					return -1;
diff --git a/htdocs/core/modules/mailings/xinputuser.modules.php b/htdocs/core/modules/mailings/xinputuser.modules.php
index 72614d39e9d..9c6748a10c8 100644
--- a/htdocs/core/modules/mailings/xinputuser.modules.php
+++ b/htdocs/core/modules/mailings/xinputuser.modules.php
@@ -48,13 +48,13 @@ class mailing_xinputuser extends MailingTargets
 	 *
 	 *  @param		DoliDB		$db      Database handler
 	 */
-    public function __construct($db)
+	public function __construct($db)
 	{
 		$this->db = $db;
 	}
 
 
-    /**
+	/**
 	 *	On the main mailing area, there is a box with statistics.
 	 *	If you want to add a line in this report you must provide an
 	 *	array of SQL request that returns two field:
@@ -62,7 +62,7 @@ class mailing_xinputuser extends MailingTargets
 	 *
 	 *	@return		array		Array with SQL requests
 	 */
-    public function getSqlArrayForStats()
+	public function getSqlArrayForStats()
 	{
 		global $langs;
 		$langs->load("users");
@@ -80,7 +80,7 @@ class mailing_xinputuser extends MailingTargets
 	 *  @param      string	$sql   	Sql request to count
 	 *	@return		string			'' means NA
 	 */
-    public function getNbOfRecipients($sql = '')
+	public function getNbOfRecipients($sql = '')
 	{
 		return '';
 	}
@@ -89,10 +89,10 @@ class mailing_xinputuser extends MailingTargets
 	/**
 	 *  Renvoie url lien vers fiche de la source du destinataire du mailing
 	 *
-     *  @param	int		$id		ID
+	 *  @param	int		$id		ID
 	 *  @return string      	Url lien
 	 */
-    public function url($id)
+	public function url($id)
 	{
 		return '';
 	}
@@ -103,7 +103,7 @@ class mailing_xinputuser extends MailingTargets
 	 *
 	 *   @return     string      Retourne zone select
 	 */
-    public function formFilter()
+	public function formFilter()
 	{
 		global $langs;
 
@@ -112,16 +112,16 @@ class mailing_xinputuser extends MailingTargets
 		return $s;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Ajoute destinataires dans table des cibles
 	 *
 	 *  @param	int		$mailing_id    	Id of emailing
 	 *  @return int           			< 0 si erreur, nb ajout si ok
 	 */
-    public function add_to_target($mailing_id)
+	public function add_to_target($mailing_id)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $langs, $_FILES;
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
@@ -133,18 +133,18 @@ class mailing_xinputuser extends MailingTargets
 		$other = $tmparray[3];
 
 		$cibles = array();
-        if (!empty($email))
-        {
+		if (!empty($email))
+		{
 			if (isValidEMail($email))
 			{
 				$cibles[] = array(
-           			'email' => $email,
-           			'lastname' => $lastname,
-           			'firstname' => $firstname,
+		   			'email' => $email,
+		   			'lastname' => $lastname,
+		   			'firstname' => $firstname,
 					'other' => $other,
-                    'source_url' => '',
-                    'source_id' => '',
-                    'source_type' => 'file'
+					'source_url' => '',
+					'source_id' => '',
+					'source_type' => 'file'
 				);
 
 				return parent::addTargetsToDatabase($mailing_id, $cibles);
@@ -154,8 +154,8 @@ class mailing_xinputuser extends MailingTargets
 				return -1;
 			}
 		} else {
-            $langs->load("errors");
-            $this->error = $langs->trans("ErrorBadEmail", $email);
+			$langs->load("errors");
+			$this->error = $langs->trans("ErrorBadEmail", $email);
 			return -1;
 		}
 	}
diff --git a/htdocs/core/modules/member/doc/pdf_standard.class.php b/htdocs/core/modules/member/doc/pdf_standard.class.php
index e6fd6d04091..3cecb685f1d 100644
--- a/htdocs/core/modules/member/doc/pdf_standard.class.php
+++ b/htdocs/core/modules/member/doc/pdf_standard.class.php
@@ -242,68 +242,68 @@ class pdf_standard extends CommonStickerGenerator
 	 */
 	public function write_file($object, $outputlangs, $srctemplatepath, $mode = 'member', $nooutput = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $user, $conf, $langs, $mysoc, $_Avery_Labels;
 
 		$this->code = $srctemplatepath;
 
 		if (is_object($object))
 		{
-		    if ($object->country == '-') $object->country = '';
+			if ($object->country == '-') $object->country = '';
 
 			$now = dol_now();
 			$year = dol_print_date($now, '%Y');
 			$month = dol_print_date($now, '%m');
 			$day = dol_print_date($now, '%d');
 
-    		// List of values to scan for a replacement
-    		$substitutionarray = array(
-    		    '__ID__' => $object->id,
-    		    '__LOGIN__'=>$object->login,
-    		    '__FIRSTNAME__'=>$object->firstname,
-    		    '__LASTNAME__'=>$object->lastname,
-    		    '__FULLNAME__'=>$object->getFullName($langs),
-    		    '__COMPANY__'=>$object->company,
-    		    '__ADDRESS__'=>$object->address,
-    		    '__ZIP__'=>$object->zip,
-    		    '__TOWN__'=>$object->town,
-    		    '__COUNTRY__'=>$object->country,
-    		    '__COUNTRY_CODE__'=>$object->country_code,
-    		    '__EMAIL__'=>$object->email,
-    		    '__BIRTH__'=>dol_print_date($object->birth, 'day'),
-    		    '__TYPE__'=>$object->type,
-    		    '__YEAR__'=>$year,
-    		    '__MONTH__'=>$month,
-    		    '__DAY__'=>$day,
-    		    '__DOL_MAIN_URL_ROOT__'=>DOL_MAIN_URL_ROOT,
-    		    '__SERVER__'=>"http://".$_SERVER["SERVER_NAME"]."/"
-    		);
-    		complete_substitutions_array($substitutionarray, $langs);
+			// List of values to scan for a replacement
+			$substitutionarray = array(
+				'__ID__' => $object->id,
+				'__LOGIN__'=>$object->login,
+				'__FIRSTNAME__'=>$object->firstname,
+				'__LASTNAME__'=>$object->lastname,
+				'__FULLNAME__'=>$object->getFullName($langs),
+				'__COMPANY__'=>$object->company,
+				'__ADDRESS__'=>$object->address,
+				'__ZIP__'=>$object->zip,
+				'__TOWN__'=>$object->town,
+				'__COUNTRY__'=>$object->country,
+				'__COUNTRY_CODE__'=>$object->country_code,
+				'__EMAIL__'=>$object->email,
+				'__BIRTH__'=>dol_print_date($object->birth, 'day'),
+				'__TYPE__'=>$object->type,
+				'__YEAR__'=>$year,
+				'__MONTH__'=>$month,
+				'__DAY__'=>$day,
+				'__DOL_MAIN_URL_ROOT__'=>DOL_MAIN_URL_ROOT,
+				'__SERVER__'=>"http://".$_SERVER["SERVER_NAME"]."/"
+			);
+			complete_substitutions_array($substitutionarray, $langs);
 
-    		// For business cards
-		    $textleft = make_substitutions($conf->global->ADHERENT_CARD_TEXT, $substitutionarray);
-		    $textheader = make_substitutions($conf->global->ADHERENT_CARD_HEADER_TEXT, $substitutionarray);
-		    $textfooter = make_substitutions($conf->global->ADHERENT_CARD_FOOTER_TEXT, $substitutionarray);
-		    $textright = make_substitutions($conf->global->ADHERENT_CARD_TEXT_RIGHT, $substitutionarray);
+			// For business cards
+			$textleft = make_substitutions($conf->global->ADHERENT_CARD_TEXT, $substitutionarray);
+			$textheader = make_substitutions($conf->global->ADHERENT_CARD_HEADER_TEXT, $substitutionarray);
+			$textfooter = make_substitutions($conf->global->ADHERENT_CARD_FOOTER_TEXT, $substitutionarray);
+			$textright = make_substitutions($conf->global->ADHERENT_CARD_TEXT_RIGHT, $substitutionarray);
 
-		    $nb = $_Avery_Labels[$this->code]['NX'] * $_Avery_Labels[$this->code]['NY'];
-		    if ($nb <= 0) $nb = 1; // Protection to avoid empty page
+			$nb = $_Avery_Labels[$this->code]['NX'] * $_Avery_Labels[$this->code]['NY'];
+			if ($nb <= 0) $nb = 1; // Protection to avoid empty page
 
-		    for ($j = 0; $j < $nb; $j++)
-	        {
-	            $arrayofmembers[] = array(
-	                'textleft'=>$textleft,
-	                'textheader'=>$textheader,
-	                'textfooter'=>$textfooter,
-	                'textright'=>$textright,
-	                'id'=>$object->rowid,
-	                'photo'=>$object->photo
-	            );
-	        }
+			for ($j = 0; $j < $nb; $j++)
+			{
+				$arrayofmembers[] = array(
+					'textleft'=>$textleft,
+					'textheader'=>$textheader,
+					'textfooter'=>$textfooter,
+					'textright'=>$textright,
+					'id'=>$object->rowid,
+					'photo'=>$object->photo
+				);
+			}
 
-    		$arrayofrecords = $arrayofmembers;
+			$arrayofrecords = $arrayofmembers;
 		} else {
-		    $arrayofrecords = $object;
+			$arrayofrecords = $object;
 		}
 
 		//var_dump($arrayofrecords);exit;
diff --git a/htdocs/core/modules/member/modules_cards.php b/htdocs/core/modules/member/modules_cards.php
index 65e9caef561..a6de637b24f 100644
--- a/htdocs/core/modules/member/modules_cards.php
+++ b/htdocs/core/modules/member/modules_cards.php
@@ -40,7 +40,7 @@ class ModelePDFCards
 	public $error = '';
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Return list of active generation modules
 	 *
@@ -50,7 +50,7 @@ class ModelePDFCards
 	 */
 	public function liste_modeles($db, $maxfilenamelength = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 		$type = 'member';
@@ -78,7 +78,7 @@ class ModelePDFCards
  */
 function members_card_pdf_create($db, $arrayofmembers, $modele, $outputlangs, $outputdir = '', $template = 'standard')
 {
-    // phpcs:enable
+	// phpcs:enable
 	global $conf, $langs;
 	$langs->load("members");
 
diff --git a/htdocs/core/modules/modAccounting.class.php b/htdocs/core/modules/modAccounting.class.php
index e769441288f..811dd57544e 100644
--- a/htdocs/core/modules/modAccounting.class.php
+++ b/htdocs/core/modules/modAccounting.class.php
@@ -173,15 +173,15 @@ class modAccounting extends DolibarrModules
 		$this->rights = array(); // Permission array used by this module
 		$r = 0;
 
-        $this->rights[$r][0] = 50440;
-        $this->rights[$r][1] = 'Manage chart of accounts, setup of accountancy';
-        $this->rights[$r][2] = 'r';
-        $this->rights[$r][3] = 0;
-        $this->rights[$r][4] = 'chartofaccount';
-        $this->rights[$r][5] = '';
-        $r++;
+		$this->rights[$r][0] = 50440;
+		$this->rights[$r][1] = 'Manage chart of accounts, setup of accountancy';
+		$this->rights[$r][2] = 'r';
+		$this->rights[$r][3] = 0;
+		$this->rights[$r][4] = 'chartofaccount';
+		$this->rights[$r][5] = '';
+		$r++;
 
-        $this->rights[$r][0] = 50401;
+		$this->rights[$r][0] = 50401;
 		$this->rights[$r][1] = 'Bind products and invoices with accounting accounts';
 		$this->rights[$r][2] = 'r';
 		$this->rights[$r][3] = 0;
@@ -205,29 +205,29 @@ class modAccounting extends DolibarrModules
 		$this->rights[$r][5] = 'creer';
 		$r++;
 
-        $this->rights[$r][0] = 50414;
-        $this->rights[$r][1] = 'Delete operations in Ledger';
-        $this->rights[$r][2] = 'd';
-        $this->rights[$r][3] = 0;
-        $this->rights[$r][4] = 'mouvements';
-        $this->rights[$r][5] = 'supprimer';
-        $r++;
+		$this->rights[$r][0] = 50414;
+		$this->rights[$r][1] = 'Delete operations in Ledger';
+		$this->rights[$r][2] = 'd';
+		$this->rights[$r][3] = 0;
+		$this->rights[$r][4] = 'mouvements';
+		$this->rights[$r][5] = 'supprimer';
+		$r++;
 
-        $this->rights[$r][0] = 50415;
-        $this->rights[$r][1] = 'Delete all operations by year and journal in Ledger';
-        $this->rights[$r][2] = 'd';
-        $this->rights[$r][3] = 0;
-        $this->rights[$r][4] = 'mouvements';
-        $this->rights[$r][5] = 'supprimer_tous';
-        $r++;
+		$this->rights[$r][0] = 50415;
+		$this->rights[$r][1] = 'Delete all operations by year and journal in Ledger';
+		$this->rights[$r][2] = 'd';
+		$this->rights[$r][3] = 0;
+		$this->rights[$r][4] = 'mouvements';
+		$this->rights[$r][5] = 'supprimer_tous';
+		$r++;
 
-        $this->rights[$r][0] = 50418;
-        $this->rights[$r][1] = 'Export operations of the Ledger';
-        $this->rights[$r][2] = 'r';
-        $this->rights[$r][3] = 0;
-        $this->rights[$r][4] = 'mouvements';
-        $this->rights[$r][5] = 'export';
-        $r++;
+		$this->rights[$r][0] = 50418;
+		$this->rights[$r][1] = 'Export operations of the Ledger';
+		$this->rights[$r][2] = 'r';
+		$this->rights[$r][3] = 0;
+		$this->rights[$r][4] = 'mouvements';
+		$this->rights[$r][5] = 'export';
+		$r++;
 
 		$this->rights[$r][0] = 50420;
 		$this->rights[$r][1] = 'Report and export reports (turnover, balance, journals, ledger)';
@@ -264,7 +264,7 @@ class modAccounting extends DolibarrModules
 
 		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
 		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'accounting_account as aa';
-        $this->export_sql_end[$r] .= ' ,'.MAIN_DB_PREFIX.'accounting_system as ac';
+		$this->export_sql_end[$r] .= ' ,'.MAIN_DB_PREFIX.'accounting_system as ac';
 		$this->export_sql_end[$r] .= ' WHERE ac.pcg_version = aa.fk_pcg_version AND aa.entity IN ('.getEntity('accounting').') ';
 
 
@@ -284,33 +284,33 @@ class modAccounting extends DolibarrModules
 			'b.doc_date'=>"Docdate",
 			//'b.doc_type'=>'Doctype',
 			'b.doc_ref'=>'Piece',
-            'b.code_journal'=>'Codejournal',
-            //'b.journal_label'=>'JournalLabel',
-            'b.numero_compte'=>'AccountAccounting',
-            //'b.label_compte'=>'LabelAccount',
-            'b.subledger_account'=>'SubledgerAccount',
-            'b.subledger_label'=>'SubledgerAccountLabel',
-            'b.label_operation'=>'LabelOperation',
-            'b.debit'=>"Debit",
-            'b.credit'=>"Credit"
-        );
+			'b.code_journal'=>'Codejournal',
+			//'b.journal_label'=>'JournalLabel',
+			'b.numero_compte'=>'AccountAccounting',
+			//'b.label_compte'=>'LabelAccount',
+			'b.subledger_account'=>'SubledgerAccount',
+			'b.subledger_label'=>'SubledgerAccountLabel',
+			'b.label_operation'=>'LabelOperation',
+			'b.debit'=>"Debit",
+			'b.credit'=>"Credit"
+		);
 		$this->import_fieldshidden_array[$r] = array('b.doc_type'=>'const-import_from_external', 'b.fk_doc'=>'const-0', 'b.fk_docdet'=>'const-0', 'b.fk_user_author'=>'user->id', 'b.date_creation'=>'const-'.dol_print_date(dol_now(), 'standard')); // aliastable.field => ('user->id' or 'lastrowid-'.tableparent)
 		$this->import_regex_array[$r] = array('b.doc_date'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$');
 		$this->import_examplevalues_array[$r] = array(
-		    'b.piece_num'=>'123 (!!! use next value not already used)',
+			'b.piece_num'=>'123 (!!! use next value not already used)',
 			'b.doc_date'=>dol_print_date(dol_now(), "%Y-%m-%d"),
 			//'b.doc_type'=>'import',
 			'b.doc_ref'=>'My document ABC',
-            'b.code_journal'=>"VTE",
-            //'b.journal_label'=>"Sale journal",
-            'b.numero_compte'=>"707",
-            //'b.label_compte'=>'Product account 707',
-            'b.subledger_account'=>'',
-            'b.subledger_label'=>'',
-            'b.label_operation'=>"Sale of ABC",
-            'b.debit'=>"0",
-            'b.credit'=>"100"
-        );
+			'b.code_journal'=>"VTE",
+			//'b.journal_label'=>"Sale journal",
+			'b.numero_compte'=>"707",
+			//'b.label_compte'=>'Product account 707',
+			'b.subledger_account'=>'',
+			'b.subledger_label'=>'',
+			'b.label_operation'=>"Sale of ABC",
+			'b.debit'=>"0",
+			'b.credit'=>"100"
+		);
 
 		// Chart of accounts
 		$r++;
@@ -323,8 +323,8 @@ class modAccounting extends DolibarrModules
 		$this->import_fields_array[$r] = array('aa.fk_pcg_version'=>"Chartofaccounts*", 'aa.account_number'=>"AccountAccounting*", 'aa.label'=>"Label*", 'aa.account_parent'=>"Accountparent", "aa.fk_accounting_category"=>"AccountingCategory", "aa.pcg_type"=>"Pcgtype*", 'aa.active'=>'Status*', 'aa.datec'=>"DateCreation");
 		$this->import_regex_array[$r] = array('aa.fk_pcg_version'=>'pcg_version@'.MAIN_DB_PREFIX.'accounting_system', 'aa.account_number'=>'^.{1,32}$', 'aa.label'=>'^.{1,255}$', 'aa.account_parent'=>'^.{0,32}$', 'aa.fk_accounting_category'=>'rowid@'.MAIN_DB_PREFIX.'c_accounting_category', 'aa.pcg_type'=>'^.{1,20}$', 'aa.active'=>'^0|1$', 'aa.datec'=>'^\d{4}-\d{2}-\d{2}$');
 		$this->import_convertvalue_array[$r] = array(
-		    'aa.account_parent'=>array('rule'=>'fetchidfromref', 'classfile'=>'/accountancy/class/accountingaccount.class.php', 'class'=>'AccountingAccount', 'method'=>'fetch', 'element'=>'AccountingAccount'),
-		    'aa.fk_accounting_category'=>array('rule'=>'fetchidfromcodeorlabel', 'classfile'=>'/accountancy/class/accountancycategory.class.php', 'class'=>'AccountancyCategory', 'method'=>'fetch', 'dict'=>'DictionaryAccountancyCategory'),
+			'aa.account_parent'=>array('rule'=>'fetchidfromref', 'classfile'=>'/accountancy/class/accountingaccount.class.php', 'class'=>'AccountingAccount', 'method'=>'fetch', 'element'=>'AccountingAccount'),
+			'aa.fk_accounting_category'=>array('rule'=>'fetchidfromcodeorlabel', 'classfile'=>'/accountancy/class/accountancycategory.class.php', 'class'=>'AccountancyCategory', 'method'=>'fetch', 'dict'=>'DictionaryAccountancyCategory'),
 		);
 		$this->import_examplevalues_array[$r] = array('aa.fk_pcg_version'=>"PCG99-ABREGE", 'aa.account_number'=>"707", 'aa.label'=>"Product sales", 'aa.account_parent'=>"ref:7 or id:1407", "aa.fk_accounting_category"=>"", "aa.pcg_type"=>"PROD", 'aa.active'=>'1', 'aa.datec'=>"2017-04-28");
 		$this->import_updatekeys_array[$r] = array('aa.fk_pcg_version'=>'Chartofaccounts', 'aa.account_number'=>'AccountAccounting');
diff --git a/htdocs/core/modules/modAdherent.class.php b/htdocs/core/modules/modAdherent.class.php
index 911a4bbd5b9..d9a4f72465d 100644
--- a/htdocs/core/modules/modAdherent.class.php
+++ b/htdocs/core/modules/modAdherent.class.php
@@ -37,360 +37,360 @@ include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
 class modAdherent extends DolibarrModules
 {
 
-    /**
-     *   Constructor. Define names, constants, directories, boxes, permissions
-     *
-     *   @param      DoliDB		$db      Database handler
-     */
-    public function __construct($db)
-    {
-        global $conf;
+	/**
+	 *   Constructor. Define names, constants, directories, boxes, permissions
+	 *
+	 *   @param      DoliDB		$db      Database handler
+	 */
+	public function __construct($db)
+	{
+		global $conf;
 
-        $this->db = $db;
-        $this->numero = 310;
+		$this->db = $db;
+		$this->numero = 310;
 
-        $this->family = "hr";
-        $this->module_position = '06';
-        // 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 = "Management of members of a foundation or association";
-        // Possible values for version are: 'development', 'experimental', 'dolibarr' or version
-        $this->version = 'dolibarr';
-        $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-        $this->picto = 'member';
+		$this->family = "hr";
+		$this->module_position = '06';
+		// 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 = "Management of members of a foundation or association";
+		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
+		$this->version = 'dolibarr';
+		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+		$this->picto = 'member';
 
-        // Data directories to create when module is enabled
-        $this->dirs = array("/adherent/temp");
+		// Data directories to create when module is enabled
+		$this->dirs = array("/adherent/temp");
 
-        // Config pages
-        $this->config_page_url = array("adherent.php@adherents");
+		// Config pages
+		$this->config_page_url = array("adherent.php@adherents");
 
-        // Dependencies
-        $this->hidden = false; // A condition to hide module
-        $this->depends = array(); // List of module class names as string that must be enabled if this module is enabled
-        $this->requiredby = array(); // List of module ids to disable if this one is disabled
-        $this->conflictwith = array('modMailmanSpip'); // List of module class names as string this module is in conflict with
-        $this->langfiles = array("members", "companies");
-        $this->phpmin = array(5, 4); // Minimum version of PHP required by module
+		// Dependencies
+		$this->hidden = false; // A condition to hide module
+		$this->depends = array(); // List of module class names as string that must be enabled if this module is enabled
+		$this->requiredby = array(); // List of module ids to disable if this one is disabled
+		$this->conflictwith = array('modMailmanSpip'); // List of module class names as string this module is in conflict with
+		$this->langfiles = array("members", "companies");
+		$this->phpmin = array(5, 4); // Minimum version of PHP required by module
 
-        // Constants
-        $this->const = array();
-        $r = 0;
+		// Constants
+		$this->const = array();
+		$r = 0;
 
-        $this->const[$r][0] = "ADHERENT_ADDON_PDF";
-        $this->const[$r][1] = "chaine";
-        $this->const[$r][2] = "standard";
-        $this->const[$r][3] = 'Name of PDF model of member';
-        $this->const[$r][4] = 0;
-        $r++;
+		$this->const[$r][0] = "ADHERENT_ADDON_PDF";
+		$this->const[$r][1] = "chaine";
+		$this->const[$r][2] = "standard";
+		$this->const[$r][3] = 'Name of PDF model of member';
+		$this->const[$r][4] = 0;
+		$r++;
 
-        // For emails
-        $this->const[$r][0] = "ADHERENT_MAIL_FROM";
-        $this->const[$r][1] = "chaine";
-        $this->const[$r][2] = "";
-        $this->const[$r][3] = "From des mails";
-        $this->const[$r][4] = 0;
-        $r++;
+		// For emails
+		$this->const[$r][0] = "ADHERENT_MAIL_FROM";
+		$this->const[$r][1] = "chaine";
+		$this->const[$r][2] = "";
+		$this->const[$r][3] = "From des mails";
+		$this->const[$r][4] = 0;
+		$r++;
 
-        $this->const[$r][0] = "ADHERENT_EMAIL_TEMPLATE_AUTOREGISTER";
-        $this->const[$r][1] = "emailtemplate:member";
-        $this->const[$r][2] = "(SendingEmailOnAutoSubscription)";
-        $this->const[$r][3] = "";
-        $this->const[$r][4] = 0;
-        $r++;
+		$this->const[$r][0] = "ADHERENT_EMAIL_TEMPLATE_AUTOREGISTER";
+		$this->const[$r][1] = "emailtemplate:member";
+		$this->const[$r][2] = "(SendingEmailOnAutoSubscription)";
+		$this->const[$r][3] = "";
+		$this->const[$r][4] = 0;
+		$r++;
 
-        $this->const[$r][0] = "ADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION";
-        $this->const[$r][1] = "emailtemplate:member";
-        $this->const[$r][2] = "(SendingEmailOnNewSubscription)";
-        $this->const[$r][3] = "";
-        $this->const[$r][4] = 0;
-        $r++;
+		$this->const[$r][0] = "ADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION";
+		$this->const[$r][1] = "emailtemplate:member";
+		$this->const[$r][2] = "(SendingEmailOnNewSubscription)";
+		$this->const[$r][3] = "";
+		$this->const[$r][4] = 0;
+		$r++;
 
-        $this->const[$r][0] = "ADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION";
-        $this->const[$r][1] = "emailtemplate:member";
-        $this->const[$r][2] = "(SendingReminderForExpiredSubscription)";
-        $this->const[$r][3] = "";
-        $this->const[$r][4] = 0;
-        $r++;
+		$this->const[$r][0] = "ADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION";
+		$this->const[$r][1] = "emailtemplate:member";
+		$this->const[$r][2] = "(SendingReminderForExpiredSubscription)";
+		$this->const[$r][3] = "";
+		$this->const[$r][4] = 0;
+		$r++;
 
-        $this->const[$r][0] = "ADHERENT_EMAIL_TEMPLATE_CANCELATION";
-        $this->const[$r][1] = "emailtemplate:member";
-        $this->const[$r][2] = "(SendingEmailOnCancelation)";
-        $this->const[$r][3] = "";
-        $this->const[$r][4] = 0;
-        $r++;
+		$this->const[$r][0] = "ADHERENT_EMAIL_TEMPLATE_CANCELATION";
+		$this->const[$r][1] = "emailtemplate:member";
+		$this->const[$r][2] = "(SendingEmailOnCancelation)";
+		$this->const[$r][3] = "";
+		$this->const[$r][4] = 0;
+		$r++;
 
-        // For cards
-        $this->const[$r][0] = "ADHERENT_CARD_HEADER_TEXT";
-        $this->const[$r][1] = "chaine";
-        $this->const[$r][2] = "__YEAR__";
-        $this->const[$r][3] = "Texte imprimé sur le haut de la carte adhérent";
-        $this->const[$r][4] = 0;
-        $r++;
+		// For cards
+		$this->const[$r][0] = "ADHERENT_CARD_HEADER_TEXT";
+		$this->const[$r][1] = "chaine";
+		$this->const[$r][2] = "__YEAR__";
+		$this->const[$r][3] = "Texte imprimé sur le haut de la carte adhérent";
+		$this->const[$r][4] = 0;
+		$r++;
 
-        $this->const[$r][0] = "ADHERENT_CARD_FOOTER_TEXT";
-        $this->const[$r][1] = "chaine";
-        $this->const[$r][2] = "__COMPANY__";
-        $this->const[$r][3] = "Texte imprimé sur le bas de la carte adhérent";
-        $this->const[$r][4] = 0;
-        $r++;
+		$this->const[$r][0] = "ADHERENT_CARD_FOOTER_TEXT";
+		$this->const[$r][1] = "chaine";
+		$this->const[$r][2] = "__COMPANY__";
+		$this->const[$r][3] = "Texte imprimé sur le bas de la carte adhérent";
+		$this->const[$r][4] = 0;
+		$r++;
 
-        $this->const[$r][0] = "ADHERENT_CARD_TEXT";
-        $this->const[$r][1] = "texte";
-        $this->const[$r][2] = "__FULLNAME__\r\nID: __ID__\r\n__EMAIL__\r\n__ADDRESS__\r\n__ZIP__ __TOWN__\r\n__COUNTRY__";
-        $this->const[$r][3] = "Text to print on member cards";
-        $this->const[$r][4] = 0;
-        $r++;
+		$this->const[$r][0] = "ADHERENT_CARD_TEXT";
+		$this->const[$r][1] = "texte";
+		$this->const[$r][2] = "__FULLNAME__\r\nID: __ID__\r\n__EMAIL__\r\n__ADDRESS__\r\n__ZIP__ __TOWN__\r\n__COUNTRY__";
+		$this->const[$r][3] = "Text to print on member cards";
+		$this->const[$r][4] = 0;
+		$r++;
 
-        $this->const[$r][0] = "ADHERENT_MAILMAN_ADMINPW";
-        $this->const[$r][1] = "chaine";
-        $this->const[$r][2] = "";
-        $this->const[$r][3] = "Mot de passe Admin des liste mailman";
-        $this->const[$r][4] = 0;
-        $r++;
+		$this->const[$r][0] = "ADHERENT_MAILMAN_ADMINPW";
+		$this->const[$r][1] = "chaine";
+		$this->const[$r][2] = "";
+		$this->const[$r][3] = "Mot de passe Admin des liste mailman";
+		$this->const[$r][4] = 0;
+		$r++;
 
-        $this->const[$r][0] = "ADHERENT_ETIQUETTE_TYPE";
-        $this->const[$r][1] = "chaine";
-        $this->const[$r][2] = "L7163";
-        $this->const[$r][3] = "Type of address sheets";
-        $this->const[$r][4] = 0;
-        $r++;
+		$this->const[$r][0] = "ADHERENT_ETIQUETTE_TYPE";
+		$this->const[$r][1] = "chaine";
+		$this->const[$r][2] = "L7163";
+		$this->const[$r][3] = "Type of address sheets";
+		$this->const[$r][4] = 0;
+		$r++;
 
-        $this->const[$r][0] = "ADHERENT_ETIQUETTE_TEXT";
-        $this->const[$r][1] = "texte";
-        $this->const[$r][2] = "__FULLNAME__\n__ADDRESS__\n__ZIP__ __TOWN__\n__COUNTRY%";
-        $this->const[$r][3] = "Text to print on member address sheets";
-        $this->const[$r][4] = 0;
-        $r++;
+		$this->const[$r][0] = "ADHERENT_ETIQUETTE_TEXT";
+		$this->const[$r][1] = "texte";
+		$this->const[$r][2] = "__FULLNAME__\n__ADDRESS__\n__ZIP__ __TOWN__\n__COUNTRY%";
+		$this->const[$r][3] = "Text to print on member address sheets";
+		$this->const[$r][4] = 0;
+		$r++;
 
-        // For subscriptions
-        $this->const[$r][0] = "ADHERENT_BANK_ACCOUNT";
-        $this->const[$r][1] = "chaine";
-        $this->const[$r][2] = "";
-        $this->const[$r][3] = "ID of bank account to use";
-        $this->const[$r][4] = 0;
-        $r++;
+		// For subscriptions
+		$this->const[$r][0] = "ADHERENT_BANK_ACCOUNT";
+		$this->const[$r][1] = "chaine";
+		$this->const[$r][2] = "";
+		$this->const[$r][3] = "ID of bank account to use";
+		$this->const[$r][4] = 0;
+		$r++;
 
-        $this->const[$r][0] = "ADHERENT_BANK_CATEGORIE";
-        $this->const[$r][1] = "chaine";
-        $this->const[$r][2] = "";
-        $this->const[$r][3] = "ID of bank transaction category to use";
-        $this->const[$r][4] = 0;
-        $r++;
+		$this->const[$r][0] = "ADHERENT_BANK_CATEGORIE";
+		$this->const[$r][1] = "chaine";
+		$this->const[$r][2] = "";
+		$this->const[$r][3] = "ID of bank transaction category to use";
+		$this->const[$r][4] = 0;
+		$r++;
 
 
-        // Boxes
-        //-------
-        $this->boxes = array(
+		// Boxes
+		//-------
+		$this->boxes = array(
 			0=>array('file'=>'box_members.php', 'enabledbydefaulton'=>'Home'),
 			2=>array('file'=>'box_birthdays_members.php', 'enabledbydefaulton'=>'Home')
 		);
 
-        // Permissions
-        //------------
-        $this->rights = array();
-        $this->rights_class = 'adherent';
-        $r = 0;
+		// Permissions
+		//------------
+		$this->rights = array();
+		$this->rights_class = 'adherent';
+		$r = 0;
 
-        // $this->rights[$r][0]     Id permission (unique tous modules confondus)
-        // $this->rights[$r][1]     Libelle par defaut si traduction de cle "PermissionXXX" non trouvee (XXX = Id permission)
-        // $this->rights[$r][2]     Non utilise
-        // $this->rights[$r][3]     1=Permis par defaut, 0=Non permis par defaut
-        // $this->rights[$r][4]     Niveau 1 pour nommer permission dans code
-        // $this->rights[$r][5]     Niveau 2 pour nommer permission dans code
+		// $this->rights[$r][0]     Id permission (unique tous modules confondus)
+		// $this->rights[$r][1]     Libelle par defaut si traduction de cle "PermissionXXX" non trouvee (XXX = Id permission)
+		// $this->rights[$r][2]     Non utilise
+		// $this->rights[$r][3]     1=Permis par defaut, 0=Non permis par defaut
+		// $this->rights[$r][4]     Niveau 1 pour nommer permission dans code
+		// $this->rights[$r][5]     Niveau 2 pour nommer permission dans code
 
-        $r++;
-        $this->rights[$r][0] = 71;
-        $this->rights[$r][1] = 'Read members\' card';
-        $this->rights[$r][2] = 'r';
-        $this->rights[$r][3] = 0;
-        $this->rights[$r][4] = 'lire';
+		$r++;
+		$this->rights[$r][0] = 71;
+		$this->rights[$r][1] = 'Read members\' card';
+		$this->rights[$r][2] = 'r';
+		$this->rights[$r][3] = 0;
+		$this->rights[$r][4] = 'lire';
 
-        $r++;
-        $this->rights[$r][0] = 72;
-        $this->rights[$r][1] = 'Create/modify members (need also user module permissions if member linked to a user)';
-        $this->rights[$r][2] = 'w';
-        $this->rights[$r][3] = 0;
-        $this->rights[$r][4] = 'creer';
+		$r++;
+		$this->rights[$r][0] = 72;
+		$this->rights[$r][1] = 'Create/modify members (need also user module permissions if member linked to a user)';
+		$this->rights[$r][2] = 'w';
+		$this->rights[$r][3] = 0;
+		$this->rights[$r][4] = 'creer';
 
-        $r++;
-        $this->rights[$r][0] = 74;
-        $this->rights[$r][1] = 'Remove members';
-        $this->rights[$r][2] = 'd';
-        $this->rights[$r][3] = 0;
-        $this->rights[$r][4] = 'supprimer';
+		$r++;
+		$this->rights[$r][0] = 74;
+		$this->rights[$r][1] = 'Remove members';
+		$this->rights[$r][2] = 'd';
+		$this->rights[$r][3] = 0;
+		$this->rights[$r][4] = 'supprimer';
 
-        $r++;
-        $this->rights[$r][0] = 76;
-        $this->rights[$r][1] = 'Export members';
-        $this->rights[$r][2] = 'r';
-        $this->rights[$r][3] = 0;
-        $this->rights[$r][4] = 'export';
+		$r++;
+		$this->rights[$r][0] = 76;
+		$this->rights[$r][1] = 'Export members';
+		$this->rights[$r][2] = 'r';
+		$this->rights[$r][3] = 0;
+		$this->rights[$r][4] = 'export';
 
-        $r++;
-        $this->rights[$r][0] = 75;
-        $this->rights[$r][1] = 'Setup types of membership';
-        $this->rights[$r][2] = 'w';
-        $this->rights[$r][3] = 0;
-        $this->rights[$r][4] = 'configurer';
+		$r++;
+		$this->rights[$r][0] = 75;
+		$this->rights[$r][1] = 'Setup types of membership';
+		$this->rights[$r][2] = 'w';
+		$this->rights[$r][3] = 0;
+		$this->rights[$r][4] = 'configurer';
 
-        $r++;
-        $this->rights[$r][0] = 78;
-        $this->rights[$r][1] = 'Read subscriptions';
-        $this->rights[$r][2] = 'r';
-        $this->rights[$r][3] = 0;
-        $this->rights[$r][4] = 'cotisation';
-        $this->rights[$r][5] = 'lire';
+		$r++;
+		$this->rights[$r][0] = 78;
+		$this->rights[$r][1] = 'Read subscriptions';
+		$this->rights[$r][2] = 'r';
+		$this->rights[$r][3] = 0;
+		$this->rights[$r][4] = 'cotisation';
+		$this->rights[$r][5] = 'lire';
 
-        $r++;
-        $this->rights[$r][0] = 79;
-        $this->rights[$r][1] = 'Create/modify/remove subscriptions';
-        $this->rights[$r][2] = 'w';
-        $this->rights[$r][3] = 0;
-        $this->rights[$r][4] = 'cotisation';
-        $this->rights[$r][5] = 'creer';
+		$r++;
+		$this->rights[$r][0] = 79;
+		$this->rights[$r][1] = 'Create/modify/remove subscriptions';
+		$this->rights[$r][2] = 'w';
+		$this->rights[$r][3] = 0;
+		$this->rights[$r][4] = 'cotisation';
+		$this->rights[$r][5] = 'creer';
 
 
-        // Menus
-        //-------
-        $this->menu = 1; // This module add menu entries. They are coded into menu manager.
+		// Menus
+		//-------
+		$this->menu = 1; // This module add menu entries. They are coded into menu manager.
 
 
-        // Exports
-        //--------
-        $r = 0;
+		// Exports
+		//--------
+		$r = 0;
 
-        // $this->export_code[$r]          Unique code identifying the export (all modules combined)
-        // $this->export_label[$r]         Libelle by default if translation of key "ExportXXX" not found (XXX = Code)
-        // $this->export_permission[$r]    List of permission codes required to export
-        // $this->export_fields_sql[$r]    List of exportable fields in SQL codiffication
-        // $this->export_fields_name[$r]   List of exportable fields in translation codiffication
-        // $this->export_sql[$r]           SQL query that offers data for export
+		// $this->export_code[$r]          Unique code identifying the export (all modules combined)
+		// $this->export_label[$r]         Libelle by default if translation of key "ExportXXX" not found (XXX = Code)
+		// $this->export_permission[$r]    List of permission codes required to export
+		// $this->export_fields_sql[$r]    List of exportable fields in SQL codiffication
+		// $this->export_fields_name[$r]   List of exportable fields in translation codiffication
+		// $this->export_sql[$r]           SQL query that offers data for export
 
-        $r++;
-        $this->export_code[$r] = $this->rights_class.'_'.$r;
-        $this->export_label[$r] = 'MembersAndSubscriptions';
-        $this->export_permission[$r] = array(array("adherent", "export"));
-        $this->export_fields_array[$r] = array(
-            'a.rowid'=>'Id', 'a.civility'=>"UserTitle", 'a.lastname'=>"Lastname", 'a.firstname'=>"Firstname", 'a.login'=>"Login", 'a.gender'=>"Gender", 'a.morphy'=>'Nature',
-            'a.societe'=>'Company', 'a.address'=>"Address", 'a.zip'=>"Zip", 'a.town'=>"Town", 'd.nom'=>"State", 'co.code'=>"CountryCode", 'co.label'=>"Country",
-            'a.phone'=>"PhonePro", 'a.phone_perso'=>"PhonePerso", 'a.phone_mobile'=>"PhoneMobile", 'a.email'=>"Email", 'a.birth'=>"Birthday", 'a.statut'=>"Status",
-            'a.photo'=>"Photo", 'a.note_public'=>"NotePublic", 'a.note_private'=>"NotePrivate", 'a.datec'=>'DateCreation', 'a.datevalid'=>'DateValidation',
-            'a.tms'=>'DateLastModification', 'a.datefin'=>'DateEndSubscription', 'ta.rowid'=>'MemberTypeId', 'ta.libelle'=>'MemberTypeLabel',
-            'c.rowid'=>'SubscriptionId', 'c.dateadh'=>'DateSubscription', 'c.datef'=>'DateEndSubscription', 'c.subscription'=>'Amount'
-        );
-        $this->export_TypeFields_array[$r] = array(
-            'a.civility'=>"Text", 'a.lastname'=>"Text", 'a.firstname'=>"Text", 'a.login'=>"Text", 'a.gender'=>'Text', 'a.morphy'=>'Text', 'a.societe'=>'Text', 'a.address'=>"Text",
-            'a.zip'=>"Text", 'a.town'=>"Text", 'd.nom'=>"Text", 'co.code'=>'Text', 'co.label'=>"Text", 'a.phone'=>"Text", 'a.phone_perso'=>"Text", 'a.phone_mobile'=>"Text",
-            'a.email'=>"Text", 'a.birth'=>"Date", 'a.statut'=>"Status", 'a.note_public'=>"Text", 'a.note_private'=>"Text", 'a.datec'=>'Date', 'a.datevalid'=>'Date',
-            'a.tms'=>'Date', 'a.datefin'=>'Date', 'ta.rowid'=>'List:adherent_type:libelle::member_type', 'ta.libelle'=>'Text',
+		$r++;
+		$this->export_code[$r] = $this->rights_class.'_'.$r;
+		$this->export_label[$r] = 'MembersAndSubscriptions';
+		$this->export_permission[$r] = array(array("adherent", "export"));
+		$this->export_fields_array[$r] = array(
+			'a.rowid'=>'Id', 'a.civility'=>"UserTitle", 'a.lastname'=>"Lastname", 'a.firstname'=>"Firstname", 'a.login'=>"Login", 'a.gender'=>"Gender", 'a.morphy'=>'Nature',
+			'a.societe'=>'Company', 'a.address'=>"Address", 'a.zip'=>"Zip", 'a.town'=>"Town", 'd.nom'=>"State", 'co.code'=>"CountryCode", 'co.label'=>"Country",
+			'a.phone'=>"PhonePro", 'a.phone_perso'=>"PhonePerso", 'a.phone_mobile'=>"PhoneMobile", 'a.email'=>"Email", 'a.birth'=>"Birthday", 'a.statut'=>"Status",
+			'a.photo'=>"Photo", 'a.note_public'=>"NotePublic", 'a.note_private'=>"NotePrivate", 'a.datec'=>'DateCreation', 'a.datevalid'=>'DateValidation',
+			'a.tms'=>'DateLastModification', 'a.datefin'=>'DateEndSubscription', 'ta.rowid'=>'MemberTypeId', 'ta.libelle'=>'MemberTypeLabel',
+			'c.rowid'=>'SubscriptionId', 'c.dateadh'=>'DateSubscription', 'c.datef'=>'DateEndSubscription', 'c.subscription'=>'Amount'
+		);
+		$this->export_TypeFields_array[$r] = array(
+			'a.civility'=>"Text", 'a.lastname'=>"Text", 'a.firstname'=>"Text", 'a.login'=>"Text", 'a.gender'=>'Text', 'a.morphy'=>'Text', 'a.societe'=>'Text', 'a.address'=>"Text",
+			'a.zip'=>"Text", 'a.town'=>"Text", 'd.nom'=>"Text", 'co.code'=>'Text', 'co.label'=>"Text", 'a.phone'=>"Text", 'a.phone_perso'=>"Text", 'a.phone_mobile'=>"Text",
+			'a.email'=>"Text", 'a.birth'=>"Date", 'a.statut'=>"Status", 'a.note_public'=>"Text", 'a.note_private'=>"Text", 'a.datec'=>'Date', 'a.datevalid'=>'Date',
+			'a.tms'=>'Date', 'a.datefin'=>'Date', 'ta.rowid'=>'List:adherent_type:libelle::member_type', 'ta.libelle'=>'Text',
 			'c.rowid'=>'Numeric', 'c.dateadh'=>'Date', 'c.datef'=>'Date', 'c.subscription'=>'Numeric'
-        );
-        $this->export_entities_array[$r] = array(
-            'a.rowid'=>'member', 'a.civility'=>"member", 'a.lastname'=>"member", 'a.firstname'=>"member", 'a.login'=>"member", 'a.gender'=>'member', 'a.morphy'=>'member',
-            'a.societe'=>'member', 'a.address'=>"member", 'a.zip'=>"member", 'a.town'=>"member", 'd.nom'=>"member", 'co.code'=>"member", 'co.label'=>"member",
-            'a.phone'=>"member", 'a.phone_perso'=>"member", 'a.phone_mobile'=>"member", 'a.email'=>"member", 'a.birth'=>"member", 'a.statut'=>"member",
-            'a.photo'=>"member", 'a.note_public'=>"member", 'a.note_private'=>"member", 'a.datec'=>'member', 'a.datevalid'=>'member', 'a.tms'=>'member',
-            'a.datefin'=>'member', 'ta.rowid'=>'member_type', 'ta.libelle'=>'member_type',
+		);
+		$this->export_entities_array[$r] = array(
+			'a.rowid'=>'member', 'a.civility'=>"member", 'a.lastname'=>"member", 'a.firstname'=>"member", 'a.login'=>"member", 'a.gender'=>'member', 'a.morphy'=>'member',
+			'a.societe'=>'member', 'a.address'=>"member", 'a.zip'=>"member", 'a.town'=>"member", 'd.nom'=>"member", 'co.code'=>"member", 'co.label'=>"member",
+			'a.phone'=>"member", 'a.phone_perso'=>"member", 'a.phone_mobile'=>"member", 'a.email'=>"member", 'a.birth'=>"member", 'a.statut'=>"member",
+			'a.photo'=>"member", 'a.note_public'=>"member", 'a.note_private'=>"member", 'a.datec'=>'member', 'a.datevalid'=>'member', 'a.tms'=>'member',
+			'a.datefin'=>'member', 'ta.rowid'=>'member_type', 'ta.libelle'=>'member_type',
 			'c.rowid'=>'subscription', 'c.dateadh'=>'subscription', 'c.datef'=>'subscription', 'c.subscription'=>'subscription'
-        );
-        // Add extra fields
-        $keyforselect = 'adherent'; $keyforelement = 'member'; $keyforaliasextra = 'extra';
-        include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
-        // End add axtra fields
-        $this->export_sql_start[$r] = 'SELECT DISTINCT ';
-        $this->export_sql_end[$r]  = ' FROM ('.MAIN_DB_PREFIX.'adherent_type as ta, '.MAIN_DB_PREFIX.'adherent as a)';
-        $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'adherent_extrafields as extra ON a.rowid = extra.fk_object';
-        $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'subscription as c ON c.fk_adherent = a.rowid';
-        $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_departements as d ON a.state_id = d.rowid';
-        $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as co ON a.country = co.rowid';
-        $this->export_sql_end[$r] .= ' WHERE a.fk_adherent_type = ta.rowid AND ta.entity IN ('.getEntity('member_type').') ';
-        $this->export_dependencies_array[$r] = array('subscription'=>'c.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
+		);
+		// Add extra fields
+		$keyforselect = 'adherent'; $keyforelement = 'member'; $keyforaliasextra = 'extra';
+		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
+		// End add axtra fields
+		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
+		$this->export_sql_end[$r]  = ' FROM ('.MAIN_DB_PREFIX.'adherent_type as ta, '.MAIN_DB_PREFIX.'adherent as a)';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'adherent_extrafields as extra ON a.rowid = extra.fk_object';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'subscription as c ON c.fk_adherent = a.rowid';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_departements as d ON a.state_id = d.rowid';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as co ON a.country = co.rowid';
+		$this->export_sql_end[$r] .= ' WHERE a.fk_adherent_type = ta.rowid AND ta.entity IN ('.getEntity('member_type').') ';
+		$this->export_dependencies_array[$r] = array('subscription'=>'c.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
 
-        // Imports
-        //--------
-        $r = 0;
+		// Imports
+		//--------
+		$r = 0;
 
-        $now = dol_now();
-        require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+		$now = dol_now();
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 
-        $r++;
-        $this->import_code[$r] = $this->rights_class.'_'.$r;
-        $this->import_label[$r] = "Members"; // Translation key
-        $this->import_icon[$r] = $this->picto;
-        $this->import_entities_array[$r] = array(); // We define here only fields that use another icon that the one defined into import_icon
-        $this->import_tables_array[$r] = array('a'=>MAIN_DB_PREFIX.'adherent', 'extra'=>MAIN_DB_PREFIX.'adherent_extrafields');
-        $this->import_tables_creator_array[$r] = array('a'=>'fk_user_author'); // Fields to store import user id
-        $this->import_fields_array[$r] = array(
-            'a.civility'=>"UserTitle", 'a.lastname'=>"Lastname*", 'a.firstname'=>"Firstname", 'a.gender'=>"Gender", 'a.login'=>"Login*", "a.pass"=>"Password",
-            "a.fk_adherent_type"=>"MemberType*", 'a.morphy'=>'Nature*', 'a.societe'=>'Company', 'a.address'=>"Address", 'a.zip'=>"Zip", 'a.town'=>"Town",
-            'a.state_id'=>'StateId', 'a.country'=>"CountryId", 'a.phone'=>"PhonePro", 'a.phone_perso'=>"PhonePerso", 'a.phone_mobile'=>"PhoneMobile",
-            'a.email'=>"Email", 'a.birth'=>"Birthday", 'a.statut'=>"Status*", 'a.photo'=>"Photo", 'a.note_public'=>"NotePublic", 'a.note_private'=>"NotePrivate",
-            'a.datec'=>'DateCreation', 'a.datefin'=>'DateEndSubscription'
-        );
-        // Add extra fields
-        $sql = "SELECT name, label, fieldrequired FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'adherent' AND entity IN (0,".$conf->entity.")";
-        $resql = $this->db->query($sql);
-        if ($resql)    // This can fail when class is used on old database (during migration for example)
-        {
-            while ($obj = $this->db->fetch_object($resql))
-            {
-                $fieldname = 'extra.'.$obj->name;
-                $fieldlabel = ucfirst($obj->label);
-                $this->import_fields_array[$r][$fieldname] = $fieldlabel.($obj->fieldrequired ? '*' : '');
-            }
-        }
-        // End add extra fields
-        $this->import_fieldshidden_array[$r] = array('extra.fk_object'=>'lastrowid-'.MAIN_DB_PREFIX.'adherent'); // aliastable.field => ('user->id' or 'lastrowid-'.tableparent)
-        $this->import_regex_array[$r] = array(
-            'a.civility'=>'code@'.MAIN_DB_PREFIX.'c_civility', 'a.fk_adherent_type'=>'rowid@'.MAIN_DB_PREFIX.'adherent_type', 'a.morphy'=>'(phy|mor)',
-            'a.statut'=>'^[0|1]', 'a.datec'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$', 'a.datefin'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$');
-        $this->import_examplevalues_array[$r] = array(
-            'a.civility'=>"MR", 'a.lastname'=>'Smith', 'a.firstname'=>'John', 'a.login'=>'jsmith', 'a.pass'=>'passofjsmith', 'a.fk_adherent_type'=>'1',
-            'a.morphy'=>'"mor" or "phy"', 'a.societe'=>'JS company', 'a.address'=>'21 jump street', 'a.zip'=>'55000', 'a.town'=>'New York', 'a.country'=>'1',
-            'a.email'=>'jsmith@example.com', 'a.birth'=>'1972-10-10', 'a.statut'=>"0 or 1", 'a.note_public'=>"This is a public comment on member",
-            'a.note_private'=>"This is private comment on member", 'a.datec'=>dol_print_date($now, '%Y-%m__%d'), 'a.datefin'=>dol_print_date(dol_time_plus_duree($now, 1, 'y'), '%Y-%m-%d')
-        );
+		$r++;
+		$this->import_code[$r] = $this->rights_class.'_'.$r;
+		$this->import_label[$r] = "Members"; // Translation key
+		$this->import_icon[$r] = $this->picto;
+		$this->import_entities_array[$r] = array(); // We define here only fields that use another icon that the one defined into import_icon
+		$this->import_tables_array[$r] = array('a'=>MAIN_DB_PREFIX.'adherent', 'extra'=>MAIN_DB_PREFIX.'adherent_extrafields');
+		$this->import_tables_creator_array[$r] = array('a'=>'fk_user_author'); // Fields to store import user id
+		$this->import_fields_array[$r] = array(
+			'a.civility'=>"UserTitle", 'a.lastname'=>"Lastname*", 'a.firstname'=>"Firstname", 'a.gender'=>"Gender", 'a.login'=>"Login*", "a.pass"=>"Password",
+			"a.fk_adherent_type"=>"MemberType*", 'a.morphy'=>'Nature*', 'a.societe'=>'Company', 'a.address'=>"Address", 'a.zip'=>"Zip", 'a.town'=>"Town",
+			'a.state_id'=>'StateId', 'a.country'=>"CountryId", 'a.phone'=>"PhonePro", 'a.phone_perso'=>"PhonePerso", 'a.phone_mobile'=>"PhoneMobile",
+			'a.email'=>"Email", 'a.birth'=>"Birthday", 'a.statut'=>"Status*", 'a.photo'=>"Photo", 'a.note_public'=>"NotePublic", 'a.note_private'=>"NotePrivate",
+			'a.datec'=>'DateCreation', 'a.datefin'=>'DateEndSubscription'
+		);
+		// Add extra fields
+		$sql = "SELECT name, label, fieldrequired FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'adherent' AND entity IN (0,".$conf->entity.")";
+		$resql = $this->db->query($sql);
+		if ($resql)    // This can fail when class is used on old database (during migration for example)
+		{
+			while ($obj = $this->db->fetch_object($resql))
+			{
+				$fieldname = 'extra.'.$obj->name;
+				$fieldlabel = ucfirst($obj->label);
+				$this->import_fields_array[$r][$fieldname] = $fieldlabel.($obj->fieldrequired ? '*' : '');
+			}
+		}
+		// End add extra fields
+		$this->import_fieldshidden_array[$r] = array('extra.fk_object'=>'lastrowid-'.MAIN_DB_PREFIX.'adherent'); // aliastable.field => ('user->id' or 'lastrowid-'.tableparent)
+		$this->import_regex_array[$r] = array(
+			'a.civility'=>'code@'.MAIN_DB_PREFIX.'c_civility', 'a.fk_adherent_type'=>'rowid@'.MAIN_DB_PREFIX.'adherent_type', 'a.morphy'=>'(phy|mor)',
+			'a.statut'=>'^[0|1]', 'a.datec'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$', 'a.datefin'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$');
+		$this->import_examplevalues_array[$r] = array(
+			'a.civility'=>"MR", 'a.lastname'=>'Smith', 'a.firstname'=>'John', 'a.login'=>'jsmith', 'a.pass'=>'passofjsmith', 'a.fk_adherent_type'=>'1',
+			'a.morphy'=>'"mor" or "phy"', 'a.societe'=>'JS company', 'a.address'=>'21 jump street', 'a.zip'=>'55000', 'a.town'=>'New York', 'a.country'=>'1',
+			'a.email'=>'jsmith@example.com', 'a.birth'=>'1972-10-10', 'a.statut'=>"0 or 1", 'a.note_public'=>"This is a public comment on member",
+			'a.note_private'=>"This is private comment on member", 'a.datec'=>dol_print_date($now, '%Y-%m__%d'), 'a.datefin'=>dol_print_date(dol_time_plus_duree($now, 1, 'y'), '%Y-%m-%d')
+		);
 
-        // Cronjobs
-        $arraydate = dol_getdate(dol_now());
-        $datestart = dol_mktime(22, 0, 0, $arraydate['mon'], $arraydate['mday'], $arraydate['year']);
-        $this->cronjobs = array(
-            0=>array(
-                'label'=>'SendReminderForExpiredSubscriptionTitle',
-                'jobtype'=>'method', 'class'=>'adherents/class/adherent.class.php',
-                'objectname'=>'Adherent',
-                'method'=>'sendReminderForExpiredSubscription',
-                'parameters'=>'10;0',
-                'comment'=>'SendReminderForExpiredSubscription',
-                'frequency'=>1,
-                'unitfrequency'=> 3600 * 24,
-                'priority'=>50,
-                'status'=>1,
-                'test'=>'$conf->adherent->enabled',
-                'datestart'=>$datestart
-            ),
-        );
-    }
+		// Cronjobs
+		$arraydate = dol_getdate(dol_now());
+		$datestart = dol_mktime(22, 0, 0, $arraydate['mon'], $arraydate['mday'], $arraydate['year']);
+		$this->cronjobs = array(
+			0=>array(
+				'label'=>'SendReminderForExpiredSubscriptionTitle',
+				'jobtype'=>'method', 'class'=>'adherents/class/adherent.class.php',
+				'objectname'=>'Adherent',
+				'method'=>'sendReminderForExpiredSubscription',
+				'parameters'=>'10;0',
+				'comment'=>'SendReminderForExpiredSubscription',
+				'frequency'=>1,
+				'unitfrequency'=> 3600 * 24,
+				'priority'=>50,
+				'status'=>1,
+				'test'=>'$conf->adherent->enabled',
+				'datestart'=>$datestart
+			),
+		);
+	}
 
 
-    /**
-     *		Function called when module is enabled.
-     *		The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
-     *		It also creates data directories
-     *
-     *      @param      string	$options    Options when enabling module ('', 'newboxdefonly', 'noboxes')
-     *      @return     int             	1 if OK, 0 if KO
-     */
-    public function init($options = '')
-    {
-        global $conf, $langs;
+	/**
+	 *		Function called when module is enabled.
+	 *		The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
+	 *		It also creates data directories
+	 *
+	 *      @param      string	$options    Options when enabling module ('', 'newboxdefonly', 'noboxes')
+	 *      @return     int             	1 if OK, 0 if KO
+	 */
+	public function init($options = '')
+	{
+		global $conf, $langs;
 
-        // Permissions
-        $this->remove($options);
+		// Permissions
+		$this->remove($options);
 
-        //ODT template
-        /*
+		//ODT template
+		/*
         $src=DOL_DOCUMENT_ROOT.'/install/doctemplates/orders/template_order.odt';
         $dirodt=DOL_DATA_ROOT.'/doctemplates/orders';
         $dest=$dirodt.'/template_order.odt';
@@ -408,11 +408,11 @@ class modAdherent extends DolibarrModules
             }
         }*/
 
-        $sql = array(
-            "DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape($this->const[0][2])."' AND type='member' AND entity = ".$conf->entity,
-            "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[0][2])."','member',".$conf->entity.")"
-        );
+		$sql = array(
+			"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape($this->const[0][2])."' AND type='member' AND entity = ".$conf->entity,
+			"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[0][2])."','member',".$conf->entity.")"
+		);
 
-        return $this->_init($sql, $options);
-    }
+		return $this->_init($sql, $options);
+	}
 }
diff --git a/htdocs/core/modules/modAgenda.class.php b/htdocs/core/modules/modAgenda.class.php
index d8165948837..0712adc59fb 100644
--- a/htdocs/core/modules/modAgenda.class.php
+++ b/htdocs/core/modules/modAgenda.class.php
@@ -76,29 +76,29 @@ class modAgenda extends DolibarrModules
 		$this->phpmin = array(5, 4); // Minimum version of PHP required by module
 
 		// Module parts
-        $this->module_parts = array();
+		$this->module_parts = array();
 
 		// Constants
-        //-----------
-        // List of particular constants to add when module is enabled (key, 'chaine', value, desc, visible, 'current' or 'allentities', deleteonunactive)
-        // Example: $this->const=array(0=>array('MYMODULE_MYNEWCONST1','chaine','myvalue','This is a constant to add',1),
-        //                             1=>array('MYMODULE_MYNEWCONST2','chaine','myvalue','This is another constant to add',0, 'current', 1)
-        // );
+		//-----------
+		// List of particular constants to add when module is enabled (key, 'chaine', value, desc, visible, 'current' or 'allentities', deleteonunactive)
+		// Example: $this->const=array(0=>array('MYMODULE_MYNEWCONST1','chaine','myvalue','This is a constant to add',1),
+		//                             1=>array('MYMODULE_MYNEWCONST2','chaine','myvalue','This is another constant to add',0, 'current', 1)
+		// );
 		$this->const = array();
 		//$this->const[] = array('AGENDA_DEFAULT_FILTER_TYPE', 'chaine', 'AC_NON_AUTO', 'Default filter for type of event on agenda', 0, 'current');
 		$sqlreadactions = "SELECT code, label, description FROM ".MAIN_DB_PREFIX."c_action_trigger ORDER by rang";
 		$resql = $this->db->query($sqlreadactions);
 		if ($resql)
 		{
-		    while ($obj = $this->db->fetch_object($resql))
-		    {
-		        //if (preg_match('/_CREATE$/',$obj->code) && (! in_array($obj->code, array('COMPANY_CREATE','PRODUCT_CREATE','TASK_CREATE')))) continue;    // We don't track such events (*_CREATE) by default, we prefer validation (except thirdparty/product/task creation because there is no validation).
-		        if (preg_match('/^TASK_/', $obj->code)) continue; // We don't track such events by default.
-		        //if (preg_match('/^_MODIFY/',$obj->code)) continue;    // We don't track such events by default.
-		        $this->const[] = array('MAIN_AGENDA_ACTIONAUTO_'.$obj->code, "chaine", "1", '', 0, 'current');
-		    }
+			while ($obj = $this->db->fetch_object($resql))
+			{
+				//if (preg_match('/_CREATE$/',$obj->code) && (! in_array($obj->code, array('COMPANY_CREATE','PRODUCT_CREATE','TASK_CREATE')))) continue;    // We don't track such events (*_CREATE) by default, we prefer validation (except thirdparty/product/task creation because there is no validation).
+				if (preg_match('/^TASK_/', $obj->code)) continue; // We don't track such events by default.
+				//if (preg_match('/^_MODIFY/',$obj->code)) continue;    // We don't track such events by default.
+				$this->const[] = array('MAIN_AGENDA_ACTIONAUTO_'.$obj->code, "chaine", "1", '', 0, 'current');
+			}
 		} else {
-		    dol_print_error($this->db->lasterror());
+			dol_print_error($this->db->lasterror());
 		}
 
 		// New pages on tabs
@@ -203,19 +203,19 @@ class modAgenda extends DolibarrModules
 		//							'user'=>2);				// 0=Menu for internal users, 1=external users, 2=both
 		// $r++;
 		$this->menu[$r] = array(
-            'fk_menu'=>0,
-            'type'=>'top',
-            'titre'=>'TMenuAgenda',
-            'mainmenu'=>'agenda',
-            'url'=>'/comm/action/index.php',
-            'langs'=>'agenda',
-            'position'=>86,
-            'perms'=>'$user->rights->agenda->myactions->read',
-            'enabled'=>'$conf->agenda->enabled',
-            'target'=>'',
-            'user'=>2,
-        );
-        $r++;
+			'fk_menu'=>0,
+			'type'=>'top',
+			'titre'=>'TMenuAgenda',
+			'mainmenu'=>'agenda',
+			'url'=>'/comm/action/index.php',
+			'langs'=>'agenda',
+			'position'=>86,
+			'perms'=>'$user->rights->agenda->myactions->read',
+			'enabled'=>'$conf->agenda->enabled',
+			'target'=>'',
+			'user'=>2,
+		);
+		$r++;
 
 		$this->menu[$r] = array(
 			'fk_menu'=>'r=0',
diff --git a/htdocs/core/modules/modApi.class.php b/htdocs/core/modules/modApi.class.php
index de0db15cb56..729840e7259 100644
--- a/htdocs/core/modules/modApi.class.php
+++ b/htdocs/core/modules/modApi.class.php
@@ -40,9 +40,9 @@ class modApi 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).
@@ -95,8 +95,8 @@ class modApi extends DolibarrModules
 
 		// Array to add new pages in new tabs
 		// Example: $this->tabs = array('objecttype:+tabname1:Title1:mylangfile@api:$user->rights->api->read:/api/mynewtab1.php?id=__ID__',  					// To add a new tab identified by code tabname1
-        //                              'objecttype:+tabname2:SUBSTITUTION_Title2:mylangfile@api:$user->rights->othermodule->read:/api/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.
-        //                              'objecttype:-tabname:NU:conditiontoremove');                                                     										// To remove an existing tab identified by code tabname
+		//                              'objecttype:+tabname2:SUBSTITUTION_Title2:mylangfile@api:$user->rights->othermodule->read:/api/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.
+		//                              '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
@@ -117,19 +117,19 @@ class modApi extends DolibarrModules
 		// 'stock'            to add a tab in stock view
 		// 'thirdparty'       to add a tab in third party view
 		// 'user'             to add a tab in user view
-        $this->tabs = array();
+		$this->tabs = array();
 
-        // Dictionaries
-	    if (!isset($conf->api->enabled))
-        {
-        	$conf->api = new stdClass();
-        	$conf->api->enabled = 0;
-        }
+		// Dictionaries
+		if (!isset($conf->api->enabled))
+		{
+			$conf->api = new stdClass();
+			$conf->api->enabled = 0;
+		}
 		$this->dictionaries = array();
 
-        // Boxes
+		// Boxes
 		// Add here list of php file(s) stored in core/boxes that contains class to show a box.
-        $this->boxes = array(); // List of boxes
+		$this->boxes = array(); // List of boxes
 		// Example:
 		//$this->boxes=array(array(0=>array('file'=>'myboxa.php','note'=>'','enabledbydefaulton'=>'Home'),1=>array('file'=>'myboxb.php','note'=>''),2=>array('file'=>'myboxc.php','note'=>'')););
 
@@ -190,7 +190,7 @@ class modApi extends DolibarrModules
 		// Example:
 		// $this->export_code[$r]=$this->rights_class.'_'.$r;
 		// $this->export_label[$r]='CustomersInvoicesAndInvoiceLines';	// Translation key (used only if key ExportDataset_xxx_z not found)
-        // $this->export_enabled[$r]='1';                               // Condition to show export in list (ie: '$user->id==3'). Set to 1 to always show when module is enabled.
+		// $this->export_enabled[$r]='1';                               // Condition to show export in list (ie: '$user->id==3'). Set to 1 to always show when module is enabled.
 		// $this->export_permission[$r]=array(array("facture","facture","export"));
 		// $this->export_fields_array[$r]=array(
 		//	's.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','s.fk_pays'=>'Country','s.phone'=>'Phone',
@@ -222,17 +222,17 @@ class modApi 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 = '')
-    {
-        $sql = array();
+	public function init($options = '')
+	{
+		$sql = array();
 
-        $result = $this->_load_tables('/api/sql/');
+		$result = $this->_load_tables('/api/sql/');
 
-        return $this->_init($sql, $options);
-    }
+		return $this->_init($sql, $options);
+	}
 
 	/**
 	 *		Function called when module is disabled.
diff --git a/htdocs/core/modules/modAsset.class.php b/htdocs/core/modules/modAsset.class.php
index b736bdb4367..50fe71ef390 100644
--- a/htdocs/core/modules/modAsset.class.php
+++ b/htdocs/core/modules/modAsset.class.php
@@ -166,44 +166,44 @@ class modAsset extends DolibarrModules
 
 		// Permissions
 		$this->rights = array(); // Permission array used by this module
-        $this->rights_class = 'asset';
-        $r = 0;
+		$this->rights_class = 'asset';
+		$r = 0;
 
-        $r++;
-        $this->rights[$r][0] = 51001; // Permission id (must not be already used)
+		$r++;
+		$this->rights[$r][0] = 51001; // Permission id (must not be already used)
 		$this->rights[$r][1] = 'Read assets'; // Permission label
-        $this->rights[$r][2] = 'r';
-        $this->rights[$r][3] = 0; // Permission by default for new user (0/1)
+		$this->rights[$r][2] = 'r';
+		$this->rights[$r][3] = 0; // Permission by default for new user (0/1)
 		$this->rights[$r][4] = 'read'; // In php code, permission will be checked by test if ($user->rights->asset->level1->level2)
 		$this->rights[$r][5] = ''; // In php code, permission will be checked by test if ($user->rights->asset->level1->level2)
 
 		$r++;
 		$this->rights[$r][0] = 51002; // Permission id (must not be already used)
 		$this->rights[$r][1] = 'Create/Update assets'; // Permission label
-        $this->rights[$r][2] = 'w';
-        $this->rights[$r][3] = 0; // Permission by default for new user (0/1)
+		$this->rights[$r][2] = 'w';
+		$this->rights[$r][3] = 0; // Permission by default for new user (0/1)
 		$this->rights[$r][4] = 'write'; // In php code, permission will be checked by test if ($user->rights->asset->level1->level2)
 		$this->rights[$r][5] = ''; // In php code, permission will be checked by test if ($user->rights->asset->level1->level2)
 
 		$r++;
 		$this->rights[$r][0] = 51003; // Permission id (must not be already used)
 		$this->rights[$r][1] = 'Delete assets'; // Permission label
-        $this->rights[$r][2] = 'd';
-        $this->rights[$r][3] = 0; // Permission by default for new user (0/1)
+		$this->rights[$r][2] = 'd';
+		$this->rights[$r][3] = 0; // Permission by default for new user (0/1)
 		$this->rights[$r][4] = 'delete'; // In php code, permission will be checked by test if ($user->rights->asset->level1->level2)
 		$this->rights[$r][5] = ''; // In php code, permission will be checked by test if ($user->rights->asset->level1->level2)
 
-        $r++;
-        $this->rights[$r][0] = 51005; // Permission id (must not be already used)
-        $this->rights[$r][1] = 'Setup types of asset'; // Permission label
-        $this->rights[$r][2] = 'w';
-        $this->rights[$r][3] = 0; // Permission by default for new user (0/1)
-        $this->rights[$r][4] = 'setup_advance'; // In php code, permission will be checked by test if ($user->rights->asset->level1->level2)
-        $this->rights[$r][5] = ''; // In php code, permission will be checked by test if ($user->rights->asset->level1->level2)
+		$r++;
+		$this->rights[$r][0] = 51005; // Permission id (must not be already used)
+		$this->rights[$r][1] = 'Setup types of asset'; // Permission label
+		$this->rights[$r][2] = 'w';
+		$this->rights[$r][3] = 0; // Permission by default for new user (0/1)
+		$this->rights[$r][4] = 'setup_advance'; // In php code, permission will be checked by test if ($user->rights->asset->level1->level2)
+		$this->rights[$r][5] = ''; // In php code, permission will be checked by test if ($user->rights->asset->level1->level2)
 
-        // Menus
-        //-------
-        $this->menu = 1; // This module add menu entries. They are coded into menu manager.
+		// Menus
+		//-------
+		$this->menu = 1; // This module add menu entries. They are coded into menu manager.
 	}
 
 	/**
@@ -214,13 +214,13 @@ class modAsset extends DolibarrModules
 	 *  @param      string	$options    Options when enabling module ('', 'noboxes')
 	 *  @return     int             	1 if OK, 0 if KO
 	 */
-    public function init($options = '')
-    {
-        // Permissions
-        $this->remove($options);
+	public function init($options = '')
+	{
+		// Permissions
+		$this->remove($options);
 
-        $sql = array();
+		$sql = array();
 
-        return $this->_init($sql, $options);
-    }
+		return $this->_init($sql, $options);
+	}
 }
diff --git a/htdocs/core/modules/modBarcode.class.php b/htdocs/core/modules/modBarcode.class.php
index bc45e078976..6a894972eb7 100644
--- a/htdocs/core/modules/modBarcode.class.php
+++ b/htdocs/core/modules/modBarcode.class.php
@@ -91,20 +91,20 @@ class modBarcode extends DolibarrModules
 		$this->rights[2][3] = 0; // La permission est-elle une permission par defaut
 		$this->rights[2][4] = 'creer_advance';
 
-        // Main menu entries
-        $r = 0;
-        $this->menu[$r] = array('fk_menu'=>'fk_mainmenu=tools', // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-						        'mainmenu'=>'tools',
-        						'leftmenu'=>'barcodeprint',
-        						'type'=>'left', // This is a Left menu entry
-						        'titre'=>'BarCodePrintsheet',
-						        'url'=>'/barcode/printsheet.php?mainmenu=tools&leftmenu=barcodeprint',
-						        'langs'=>'products', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-						        'position'=>200,
-						        'enabled'=>'$conf->barcode->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'=>'($conf->global->MAIN_USE_ADVANCED_PERMS && $user->rights->barcode->lire_advance) || (! $conf->global->MAIN_USE_ADVANCED_PERMS)', // Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
-						        'target'=>'',
-						        'user'=>2); // 0=Menu for internal users, 1=external users, 2=both
+		// Main menu entries
+		$r = 0;
+		$this->menu[$r] = array('fk_menu'=>'fk_mainmenu=tools', // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+								'mainmenu'=>'tools',
+								'leftmenu'=>'barcodeprint',
+								'type'=>'left', // This is a Left menu entry
+								'titre'=>'BarCodePrintsheet',
+								'url'=>'/barcode/printsheet.php?mainmenu=tools&leftmenu=barcodeprint',
+								'langs'=>'products', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+								'position'=>200,
+								'enabled'=>'$conf->barcode->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'=>'($conf->global->MAIN_USE_ADVANCED_PERMS && $user->rights->barcode->lire_advance) || (! $conf->global->MAIN_USE_ADVANCED_PERMS)', // Use 'perms'=>'$user->rights->mymodule->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++;
 
 		$this->menu[$r] = array('fk_menu'=>'fk_mainmenu=home,fk_leftmenu=admintools', // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
@@ -121,12 +121,12 @@ class modBarcode extends DolibarrModules
 	}
 
 
-    /**
-     *      Function called when module is enabled.
-     *      The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
-     *      It also creates data directories.
-     *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
+	/**
+	 *      Function called when module is enabled.
+	 *      The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
+	 *      It also creates data directories.
+	 *
+	 *      @param      string	$options    Options when enabling module ('', 'noboxes')
 	 *      @return     int             	1 if OK, 0 if KO
 	 */
 	public function init($options = '')
diff --git a/htdocs/core/modules/modBlockedLog.class.php b/htdocs/core/modules/modBlockedLog.class.php
index 447e3e625ac..6a3cd4767f7 100644
--- a/htdocs/core/modules/modBlockedLog.class.php
+++ b/htdocs/core/modules/modBlockedLog.class.php
@@ -29,57 +29,57 @@ include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
  */
 class modBlockedLog extends DolibarrModules
 {
-    /**
-     *   Constructor. Define names, constants, directories, boxes, permissions
-     *
-     *   @param      DoliDB		$db      Database handler
-     */
-    public function __construct($db)
-    {
-        global $langs, $conf, $mysoc;
+	/**
+	 *   Constructor. Define names, constants, directories, boxes, permissions
+	 *
+	 *   @param      DoliDB		$db      Database handler
+	 */
+	public function __construct($db)
+	{
+		global $langs, $conf, $mysoc;
 
-        $this->db = $db;
-        $this->numero = 3200;
-        // Key text used to identify module (for permissions, menus, etc...)
-        $this->rights_class = 'blockedlog';
+		$this->db = $db;
+		$this->numero = 3200;
+		// Key text used to identify module (for permissions, menus, etc...)
+		$this->rights_class = 'blockedlog';
 
-        // Family can be 'crm','financial','hr','projects','products','ecm','technic','other'
-        // It is used to group modules in module setup page
-        $this->family = "base";
-        // Module position in the family on 2 digits ('01', '10', '20', ...)
-        $this->module_position = '75';
-        // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
-        $this->name = preg_replace('/^mod/i', '', get_class($this));
-        $this->description = "Enable a log on some business events into a non reversible log. This module may be mandatory for some countries.";
-        // Possible values for version are: 'development', 'experimental', 'dolibarr' or version
-        $this->version = 'dolibarr';
-        // Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
-        $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-        // Name of image file used for this module.
-        $this->picto = 'technic';
+		// Family can be 'crm','financial','hr','projects','products','ecm','technic','other'
+		// It is used to group modules in module setup page
+		$this->family = "base";
+		// Module position in the family on 2 digits ('01', '10', '20', ...)
+		$this->module_position = '75';
+		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+		$this->name = preg_replace('/^mod/i', '', get_class($this));
+		$this->description = "Enable a log on some business events into a non reversible log. This module may be mandatory for some countries.";
+		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
+		$this->version = 'dolibarr';
+		// Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
+		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+		// Name of image file used for this module.
+		$this->picto = 'technic';
 
-        // Data directories to create when module is enabled
-        $this->dirs = array();
+		// Data directories to create when module is enabled
+		$this->dirs = array();
 
-        // Config pages
-        //-------------
-        $this->config_page_url = array('blockedlog.php?withtab=1@blockedlog');
+		// Config pages
+		//-------------
+		$this->config_page_url = array('blockedlog.php?withtab=1@blockedlog');
 
-        // Dependancies
-        //-------------
-        $this->hidden = false; // A condition to disable module
-        $this->depends = array('always'=>'modFacture'); // List of modules id that must be enabled if this module is enabled
-        $this->requiredby = array(); // List of modules id to disable if this one is disabled
-        $this->conflictwith = array(); // List of modules id this module is in conflict with
-        $this->langfiles = array('blockedlog');
+		// Dependancies
+		//-------------
+		$this->hidden = false; // A condition to disable module
+		$this->depends = array('always'=>'modFacture'); // List of modules id that must be enabled if this module is enabled
+		$this->requiredby = array(); // List of modules id to disable if this one is disabled
+		$this->conflictwith = array(); // List of modules id this module is in conflict with
+		$this->langfiles = array('blockedlog');
 
-        $this->warnings_activation = array(); // Warning to show when we activate module. array('always'='text') or array('FR'='textfr','ES'='textes'...)
-        $this->warnings_activation_ext = array(); // Warning to show when we activate an external module. array('always'='text') or array('FR'='textfr','ES'='textes'...)
-        $this->warnings_unactivation = array('FR'=>'BlockedLogAreRequiredByYourCountryLegislation');
+		$this->warnings_activation = array(); // Warning to show when we activate module. array('always'='text') or array('FR'='textfr','ES'='textes'...)
+		$this->warnings_activation_ext = array(); // Warning to show when we activate an external module. array('always'='text') or array('FR'='textfr','ES'='textes'...)
+		$this->warnings_unactivation = array('FR'=>'BlockedLogAreRequiredByYourCountryLegislation');
 
-        // Currently, activation is not automatic because only companies (in France) making invoices to non business customers must
-        // enable this module.
-        /*if (! empty($conf->global->BLOCKEDLOG_DISABLE_NOT_ALLOWED_FOR_COUNTRY))
+		// Currently, activation is not automatic because only companies (in France) making invoices to non business customers must
+		// enable this module.
+		/*if (! empty($conf->global->BLOCKEDLOG_DISABLE_NOT_ALLOWED_FOR_COUNTRY))
         {
             $tmp=explode(',', $conf->global->BLOCKEDLOG_DISABLE_NOT_ALLOWED_FOR_COUNTRY);
             $this->automatic_activation = array();
@@ -88,160 +88,160 @@ class modBlockedLog extends DolibarrModules
                 $this->automatic_activation[$key]='BlockedLogActivatedBecauseRequiredByYourCountryLegislation';
             }
         }*/
-        //var_dump($this->automatic_activation);
+		//var_dump($this->automatic_activation);
 
-        $this->always_enabled = (!empty($conf->blockedlog->enabled)
-            && !empty($conf->global->BLOCKEDLOG_DISABLE_NOT_ALLOWED_FOR_COUNTRY)
-            && in_array($mysoc->country_code, explode(',', $conf->global->BLOCKEDLOG_DISABLE_NOT_ALLOWED_FOR_COUNTRY))
-            && $this->alreadyUsed());
+		$this->always_enabled = (!empty($conf->blockedlog->enabled)
+			&& !empty($conf->global->BLOCKEDLOG_DISABLE_NOT_ALLOWED_FOR_COUNTRY)
+			&& in_array($mysoc->country_code, explode(',', $conf->global->BLOCKEDLOG_DISABLE_NOT_ALLOWED_FOR_COUNTRY))
+			&& $this->alreadyUsed());
 
-        // Constants
-        //-----------
-        $this->const = array(
-            1=>array('BLOCKEDLOG_DISABLE_NOT_ALLOWED_FOR_COUNTRY', 'chaine', 'FR', 'This is list of country code where the module may be mandatory', 0, 'current', 0)
-        );
+		// Constants
+		//-----------
+		$this->const = array(
+			1=>array('BLOCKEDLOG_DISABLE_NOT_ALLOWED_FOR_COUNTRY', 'chaine', 'FR', 'This is list of country code where the module may be mandatory', 0, 'current', 0)
+		);
 
-        // New pages on tabs
-        // -----------------
-        $this->tabs = array();
+		// New pages on tabs
+		// -----------------
+		$this->tabs = array();
 
-        // Boxes
-        //------
-        $this->boxes = array();
+		// Boxes
+		//------
+		$this->boxes = array();
 
-        // Permissions
-        // -----------------
-        $this->rights = array(); // Permission array used by this module
+		// Permissions
+		// -----------------
+		$this->rights = array(); // Permission array used by this module
 
-        $r = 0;
-        $this->rights[$r][0] = $this->numero + $r; // Permission id (must not be already used)
-        $this->rights[$r][1] = 'Read archived events and fingerprints'; // Permission label
-        $this->rights[$r][3] = 0; // Permission by default for new user (0/1)
-        $this->rights[$r][4] = 'read'; // In php code, permission will be checked by test if ($user->rights->mymodule->level1->level2)
-        $this->rights[$r][5] = '';
+		$r = 0;
+		$this->rights[$r][0] = $this->numero + $r; // Permission id (must not be already used)
+		$this->rights[$r][1] = 'Read archived events and fingerprints'; // Permission label
+		$this->rights[$r][3] = 0; // Permission by default for new user (0/1)
+		$this->rights[$r][4] = 'read'; // In php code, permission will be checked by test if ($user->rights->mymodule->level1->level2)
+		$this->rights[$r][5] = '';
 
-        // Main menu entries
-        // -----------------
-        $r = 0;
-        $this->menu[$r] = array(
-        'fk_menu'=>'fk_mainmenu=tools', // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-        'mainmenu'=>'tools',
-        'leftmenu'=>'blockedlogbrowser',
-        'type'=>'left', // This is a Left menu entry
-        'titre'=>'BrowseBlockedLog',
-        'url'=>'/blockedlog/admin/blockedlog_list.php?mainmenu=tools&leftmenu=blockedlogbrowser',
-        'langs'=>'blockedlog', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-        'position'=>200,
-        'enabled'=>'$conf->blockedlog->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->blockedlog->read', // Use 'perms'=>'$user->rights->mymodule->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++;
-    }
+		// Main menu entries
+		// -----------------
+		$r = 0;
+		$this->menu[$r] = array(
+		'fk_menu'=>'fk_mainmenu=tools', // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+		'mainmenu'=>'tools',
+		'leftmenu'=>'blockedlogbrowser',
+		'type'=>'left', // This is a Left menu entry
+		'titre'=>'BrowseBlockedLog',
+		'url'=>'/blockedlog/admin/blockedlog_list.php?mainmenu=tools&leftmenu=blockedlogbrowser',
+		'langs'=>'blockedlog', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+		'position'=>200,
+		'enabled'=>'$conf->blockedlog->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->blockedlog->read', // Use 'perms'=>'$user->rights->mymodule->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++;
+	}
 
 
-    /**
-     * Check if module was already used before unactivation linked to warnings_unactivation property
-     *
-     * @return	boolean		True if already used, otherwise False
-     */
-    public function alreadyUsed()
-    {
-        require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/blockedlog.class.php';
-        $b = new BlockedLog($this->db);
-        return $b->alreadyUsed(1);
-    }
+	/**
+	 * Check if module was already used before unactivation linked to warnings_unactivation property
+	 *
+	 * @return	boolean		True if already used, otherwise False
+	 */
+	public function alreadyUsed()
+	{
+		require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/blockedlog.class.php';
+		$b = new BlockedLog($this->db);
+		return $b->alreadyUsed(1);
+	}
 
 
-    /**
-     *      Function called when module is enabled.
-     *      The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
-     *      It also creates data directories.
-     *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
-     *      @return     int             	1 if OK, 0 if KO
-     */
-    public function init($options = '')
-    {
-        global $conf, $user;
+	/**
+	 *      Function called when module is enabled.
+	 *      The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
+	 *      It also creates data directories.
+	 *
+	 *      @param      string	$options    Options when enabling module ('', 'noboxes')
+	 *      @return     int             	1 if OK, 0 if KO
+	 */
+	public function init($options = '')
+	{
+		global $conf, $user;
 
-        $sql = array();
+		$sql = array();
 
-        // If already used, we add an entry to show we enable module
-           require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/blockedlog.class.php';
+		// If already used, we add an entry to show we enable module
+		   require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/blockedlog.class.php';
 
-           $object = new stdClass();
-        $object->id = 1;
-        $object->element = 'module';
-        $object->ref = 'systemevent';
-        $object->entity = $conf->entity;
-        $object->date = dol_now();
+		   $object = new stdClass();
+		$object->id = 1;
+		$object->element = 'module';
+		$object->ref = 'systemevent';
+		$object->entity = $conf->entity;
+		$object->date = dol_now();
 
-        $b = new BlockedLog($this->db);
-        $result = $b->setObjectData($object, 'MODULE_SET', 0);
-        if ($result < 0)
-        {
-            $this->error = $b->error;
-            $this->errors = $b->erros;
-            return 0;
-        }
+		$b = new BlockedLog($this->db);
+		$result = $b->setObjectData($object, 'MODULE_SET', 0);
+		if ($result < 0)
+		{
+			$this->error = $b->error;
+			$this->errors = $b->erros;
+			return 0;
+		}
 
-        $res = $b->create($user);
-        if ($res <= 0) {
-            $this->error = $b->error;
-            $this->errors = $b->errors;
-            return $res;
-        }
+		$res = $b->create($user);
+		if ($res <= 0) {
+			$this->error = $b->error;
+			$this->errors = $b->errors;
+			return $res;
+		}
 
-        return $this->_init($sql, $options);
-    }
+		return $this->_init($sql, $options);
+	}
 
-    /**
-     * Function called when module is disabled.
-     * The remove function removes tabs, constants, boxes, permissions and menus from Dolibarr database.
-     * Data directories are not deleted
-     *
-     * @param      string	$options    Options when enabling module ('', 'noboxes')
-     * @return     int             		1 if OK, 0 if KO
-     */
-    public function remove($options = '')
-    {
+	/**
+	 * Function called when module is disabled.
+	 * The remove function removes tabs, constants, boxes, permissions and menus from Dolibarr database.
+	 * Data directories are not deleted
+	 *
+	 * @param      string	$options    Options when enabling module ('', 'noboxes')
+	 * @return     int             		1 if OK, 0 if KO
+	 */
+	public function remove($options = '')
+	{
 
-        global $conf, $user;
+		global $conf, $user;
 
-        $sql = array();
+		$sql = array();
 
-        // If already used, we add an entry to show we enable module
-        require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/blockedlog.class.php';
+		// If already used, we add an entry to show we enable module
+		require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/blockedlog.class.php';
 
-        $object = new stdClass();
-        $object->id = 1;
-        $object->element = 'module';
-        $object->ref = 'systemevent';
-        $object->entity = $conf->entity;
-        $object->date = dol_now();
+		$object = new stdClass();
+		$object->id = 1;
+		$object->element = 'module';
+		$object->ref = 'systemevent';
+		$object->entity = $conf->entity;
+		$object->date = dol_now();
 
-        $b = new BlockedLog($this->db);
-        $result = $b->setObjectData($object, 'MODULE_RESET', 0);
-        if ($result < 0)
-        {
-            $this->error = $b->error;
-            $this->errors = $b->erros;
-            return 0;
-        }
+		$b = new BlockedLog($this->db);
+		$result = $b->setObjectData($object, 'MODULE_RESET', 0);
+		if ($result < 0)
+		{
+			$this->error = $b->error;
+			$this->errors = $b->erros;
+			return 0;
+		}
 
-        if ($b->alreadyUsed(1))
-        {
-            $res = $b->create($user, '0000000000'); // If already used for something else than SET or UNSET, we log with error
-        } else {
-            $res = $b->create($user);
-        }
-        if ($res <= 0) {
-            $this->error = $b->error;
-            $this->errors = $b->errors;
-            return $res;
-        }
+		if ($b->alreadyUsed(1))
+		{
+			$res = $b->create($user, '0000000000'); // If already used for something else than SET or UNSET, we log with error
+		} else {
+			$res = $b->create($user);
+		}
+		if ($res <= 0) {
+			$this->error = $b->error;
+			$this->errors = $b->errors;
+			return $res;
+		}
 
-        return $this->_remove($sql, $options);
-    }
+		return $this->_remove($sql, $options);
+	}
 }
diff --git a/htdocs/core/modules/modCashDesk.class.php b/htdocs/core/modules/modCashDesk.class.php
index 2863760b138..e3368fb636f 100644
--- a/htdocs/core/modules/modCashDesk.class.php
+++ b/htdocs/core/modules/modCashDesk.class.php
@@ -101,8 +101,8 @@ class modCashDesk extends DolibarrModules
 									'url'=>'/cashdesk/index.php?user=__USER_LOGIN__',
 									'langs'=>'cashdesk', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
 									'position'=>900,
-                                    'enabled'=>'$conf->cashdesk->enabled',
-		                            'perms'=>'$user->rights->cashdesk->run', // Use 'perms'=>'1' if you want your menu with no permission rules
+									'enabled'=>'$conf->cashdesk->enabled',
+									'perms'=>'$user->rights->cashdesk->run', // Use 'perms'=>'1' if you want your menu with no permission rules
 									'target'=>'pointofsale',
 									'user'=>0); // 0=Menu for internal users, 1=external users, 2=both
 
@@ -120,24 +120,24 @@ class modCashDesk extends DolibarrModules
 		//							'target'=>'',
 		//							'user'=>2);				// 0=Menu for internal users, 1=external users, 2=both
 		// $r++;
-    }
+	}
 
 
-    /**
-     *  Function called when module is enabled.
-     *  The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
-     *  It also creates data directories
-     *
-     *  @param      string	$options    Options when enabling module ('', 'noboxes')
-     *  @return     int             	1 if OK, 0 if KO
-     */
-    public function init($options = '')
-    {
-        $sql = array();
+	/**
+	 *  Function called when module is enabled.
+	 *  The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
+	 *  It also creates data directories
+	 *
+	 *  @param      string	$options    Options when enabling module ('', 'noboxes')
+	 *  @return     int             	1 if OK, 0 if KO
+	 */
+	public function init($options = '')
+	{
+		$sql = array();
 
-        // Remove permissions and default values
-        $this->remove($options);
+		// Remove permissions and default values
+		$this->remove($options);
 
-        return $this->_init($sql, $options);
-    }
+		return $this->_init($sql, $options);
+	}
 }
diff --git a/htdocs/core/modules/modCategorie.class.php b/htdocs/core/modules/modCategorie.class.php
index 29a96c0f03c..c6f697f48aa 100644
--- a/htdocs/core/modules/modCategorie.class.php
+++ b/htdocs/core/modules/modCategorie.class.php
@@ -39,7 +39,7 @@ class modCategorie extends DolibarrModules
 	 */
 	public function __construct($db)
 	{
-	    global $conf;
+		global $conf;
 
 		$this->db = $db;
 		$this->numero = 1780;
@@ -153,7 +153,7 @@ class modCategorie extends DolibarrModules
 		$this->export_code[$r] = 'category_'.$r;
 		$this->export_label[$r] = 'CatCusList';
 		$this->export_icon[$r] = 'category';
-        $this->export_enabled[$r] = '$conf->societe->enabled';
+		$this->export_enabled[$r] = '$conf->societe->enabled';
 		$this->export_permission[$r] = array(array("categorie", "lire"), array("societe", "lire"));
 		$this->export_fields_array[$r] = array(
 			'u.rowid'=>"CategId", 'u.label'=>"Label", 'u.description'=>"Description", 's.rowid'=>'IdThirdParty', 's.nom'=>'Name', 's.prefix_comm'=>"Prefix",
@@ -184,43 +184,43 @@ class modCategorie extends DolibarrModules
 		$this->export_sql_end[$r] .= ' AND u.entity IN ('.getEntity('category').')';
 		$this->export_sql_end[$r] .= ' AND u.type = 2'; // Customer/Prospect categories
 
-        // Add extra fields
-        $sql = "SELECT name, label, type, param FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'societe' AND entity IN (0, ".$conf->entity.")";
-        $resql = $this->db->query($sql);
-        if ($resql)    // This can fail when class is used on old database (during migration for example)
-        {
-            while ($obj = $this->db->fetch_object($resql))
-            {
-                $fieldname = 'extra.'.$obj->name;
-                $fieldlabel = ucfirst($obj->label);
-                $typeFilter = "Text";
-                switch ($obj->type)
-                {
-                    case 'int':
-                    case 'double':
-                    case 'price':
-                        $typeFilter = "Numeric";
-                        break;
-                    case 'date':
-                    case 'datetime':
-                        $typeFilter = "Date";
-                        break;
-                    case 'boolean':
-                        $typeFilter = "Boolean";
-                        break;
-                    case 'sellist':
-                        $typeFilter = "List:".$obj->param;
-                        break;
-                    case 'select':
-                        $typeFilter = "Select:".$obj->param;
-                        break;
-                }
-                $this->export_fields_array[$r][$fieldname] = $fieldlabel;
-                $this->export_TypeFields_array[$r][$fieldname] = $typeFilter;
-                $this->export_entities_array[$r][$fieldname] = 'company';
-            }
-        }
-        // End add axtra fields
+		// Add extra fields
+		$sql = "SELECT name, label, type, param FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'societe' AND entity IN (0, ".$conf->entity.")";
+		$resql = $this->db->query($sql);
+		if ($resql)    // This can fail when class is used on old database (during migration for example)
+		{
+			while ($obj = $this->db->fetch_object($resql))
+			{
+				$fieldname = 'extra.'.$obj->name;
+				$fieldlabel = ucfirst($obj->label);
+				$typeFilter = "Text";
+				switch ($obj->type)
+				{
+					case 'int':
+					case 'double':
+					case 'price':
+						$typeFilter = "Numeric";
+						break;
+					case 'date':
+					case 'datetime':
+						$typeFilter = "Date";
+						break;
+					case 'boolean':
+						$typeFilter = "Boolean";
+						break;
+					case 'sellist':
+						$typeFilter = "List:".$obj->param;
+						break;
+					case 'select':
+						$typeFilter = "Select:".$obj->param;
+						break;
+				}
+				$this->export_fields_array[$r][$fieldname] = $fieldlabel;
+				$this->export_TypeFields_array[$r][$fieldname] = $typeFilter;
+				$this->export_entities_array[$r][$fieldname] = 'company';
+			}
+		}
+		// End add axtra fields
 
 
 
@@ -230,7 +230,7 @@ class modCategorie extends DolibarrModules
 		$this->export_code[$r] = 'category_'.$r;
 		$this->export_label[$r] = 'CatProdList';
 		$this->export_icon[$r] = 'category';
-        $this->export_enabled[$r] = '$conf->product->enabled || $conf->service->enabled';
+		$this->export_enabled[$r] = '$conf->product->enabled || $conf->service->enabled';
 		$this->export_permission[$r] = array(array("categorie", "lire"), array("produit", "lire"));
 		$this->export_fields_array[$r] = array('u.rowid'=>"CategId", 'u.label'=>"Label", 'u.description'=>"Description", 'p.rowid'=>'ProductId', 'p.ref'=>'Ref');
 		$this->export_TypeFields_array[$r] = array('u.label'=>"Text", 'u.description'=>"Text", 'p.ref'=>'Text');
@@ -245,7 +245,7 @@ class modCategorie extends DolibarrModules
 		$this->export_code[$r] = 'category_'.$r;
 		$this->export_label[$r] = 'CatMemberList';
 		$this->export_icon[$r] = 'category';
-        $this->export_enabled[$r] = '$conf->adherent->enabled';
+		$this->export_enabled[$r] = '$conf->adherent->enabled';
 		$this->export_permission[$r] = array(array("categorie", "lire"), array("adherent", "lire"));
 		$this->export_fields_array[$r] = array('u.rowid'=>"CategId", 'u.label'=>"Label", 'u.description'=>"Description", 'p.rowid'=>'MemberId', 'p.lastname'=>'LastName', 'p.firstname'=>'Firstname');
 		$this->export_TypeFields_array[$r] = array('u.label'=>"Text", 'u.description'=>"Text", 'p.lastname'=>'Text', 'p.firstname'=>'Text');
@@ -284,7 +284,7 @@ class modCategorie extends DolibarrModules
 			'p.email' => 'Email',
 			'p.note_private' => 'NotePrivate',
 			'p.note_public' => 'NotePublic',
-            'p.statut' => 'Status',
+			'p.statut' => 'Status',
 			's.nom'=>"Name",
 			's.client'=>"Customer",
 			's.fournisseur'=>"Supplier",
@@ -302,7 +302,7 @@ class modCategorie extends DolibarrModules
 			'u.description' => "Text",
 			'p.lastname' => 'Text',
 			'p.firstname' => 'Text',
-            'p.statut'=>"Numeric",
+			'p.statut'=>"Numeric",
 			's.nom'=>"Text",
 			's.status'=>"Text",
 			's.address'=>"Text",
@@ -335,7 +335,7 @@ class modCategorie extends DolibarrModules
 			'p.email' => 'contact',
 			'p.note_private' => 'contact',
 			'p.note_public' => 'contact',
-            'p.statut' => 'contact',
+			'p.statut' => 'contact',
 			's.nom'=>"company",
 			's.client'=>"company",
 			's.fournisseur'=>"company",
@@ -349,49 +349,49 @@ class modCategorie extends DolibarrModules
 			's.email'=>"company"
 		); // We define here only fields that use another picto
 
-        // Add extra fields
-        $sql = "SELECT name, label, type, param FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'socpeople' AND entity IN (0, ".$conf->entity.")";
-        $resql = $this->db->query($sql);
-        if ($resql)    // This can fail when class is used on old database (during migration for example)
-        {
-        	while ($obj = $this->db->fetch_object($resql))
-        	{
-        		$fieldname = 'extra.'.$obj->name;
-        		$fieldlabel = ucfirst($obj->label);
-        		$typeFilter = "Text";
-        		switch ($obj->type)
-        		{
-        			case 'int':
-        			case 'double':
-        			case 'price':
-        				$typeFilter = "Numeric";
-        				break;
-        			case 'date':
-        			case 'datetime':
-        				$typeFilter = "Date";
-        				break;
-        			case 'boolean':
-        				$typeFilter = "Boolean";
-        				break;
-        			case 'sellist':
-        				$typeFilter = "List:".$obj->param;
-        				break;
+		// Add extra fields
+		$sql = "SELECT name, label, type, param FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'socpeople' AND entity IN (0, ".$conf->entity.")";
+		$resql = $this->db->query($sql);
+		if ($resql)    // This can fail when class is used on old database (during migration for example)
+		{
+			while ($obj = $this->db->fetch_object($resql))
+			{
+				$fieldname = 'extra.'.$obj->name;
+				$fieldlabel = ucfirst($obj->label);
+				$typeFilter = "Text";
+				switch ($obj->type)
+				{
+					case 'int':
+					case 'double':
+					case 'price':
+						$typeFilter = "Numeric";
+						break;
+					case 'date':
+					case 'datetime':
+						$typeFilter = "Date";
+						break;
+					case 'boolean':
+						$typeFilter = "Boolean";
+						break;
+					case 'sellist':
+						$typeFilter = "List:".$obj->param;
+						break;
 					case 'select':
 						$typeFilter = "Select:".$obj->param;
 						break;
-        		}
-        		$this->export_fields_array[$r][$fieldname] = $fieldlabel;
-        		$this->export_TypeFields_array[$r][$fieldname] = $typeFilter;
-        		$this->export_entities_array[$r][$fieldname] = 'contact';
-        	}
-        }
-        // End add axtra fields
+				}
+				$this->export_fields_array[$r][$fieldname] = $fieldlabel;
+				$this->export_TypeFields_array[$r][$fieldname] = $typeFilter;
+				$this->export_entities_array[$r][$fieldname] = 'contact';
+			}
+		}
+		// End add axtra fields
 
 		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
 		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'categorie as u, '.MAIN_DB_PREFIX.'categorie_contact as cp, '.MAIN_DB_PREFIX.'socpeople as p';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as country ON p.fk_pays = country.rowid';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s ON s.rowid = p.fk_soc';
-        $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'socpeople_extrafields as extra ON extra.fk_object = p.rowid';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'socpeople_extrafields as extra ON extra.fk_object = p.rowid';
 		$this->export_sql_end[$r] .= ' WHERE u.rowid = cp.fk_categorie AND cp.fk_socpeople = p.rowid AND u.entity IN ('.getEntity('category').')';
 		$this->export_sql_end[$r] .= ' AND u.type = 4'; // contact categories
 
@@ -406,30 +406,30 @@ class modCategorie extends DolibarrModules
 		$this->import_icon[$r] = $this->picto;
 		$this->import_entities_array[$r] = array(); // We define here only fields that use another icon that the one defined into import_icon
 		$this->import_tables_array[$r] = array('ca'=>MAIN_DB_PREFIX.'categorie');
-        $this->import_fields_array[$r] = array(
-            'ca.label'=>"Label*", 'ca.type'=>"Type*", 'ca.description'=>"Description",
-            'ca.fk_parent' => 'Parent'
-        );
+		$this->import_fields_array[$r] = array(
+			'ca.label'=>"Label*", 'ca.type'=>"Type*", 'ca.description'=>"Description",
+			'ca.fk_parent' => 'Parent'
+		);
 		$this->import_regex_array[$r] = array('ca.type'=>'^[0|1|2|3]');
-        $this->import_convertvalue_array[$r] = array(
-            'ca.fk_parent' => array(
-                'rule'          => 'fetchidfromcodeandlabel',
-                'classfile'     => '/categories/class/categorie.class.php',
-                'class'         => 'Categorie',
-                'method'        => 'fetch',
-                'element'       => 'category',
-                'codefromfield' => 'ca.type'
-            )
-        );
+		$this->import_convertvalue_array[$r] = array(
+			'ca.fk_parent' => array(
+				'rule'          => 'fetchidfromcodeandlabel',
+				'classfile'     => '/categories/class/categorie.class.php',
+				'class'         => 'Categorie',
+				'method'        => 'fetch',
+				'element'       => 'category',
+				'codefromfield' => 'ca.type'
+			)
+		);
 		$typeexample = "";
 		if ($conf->product->enabled) { $typeexample .= ($typeexample ? "/" : "")."0=Product"; }
 		if (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) { $typeexample .= ($typeexample ? "/" : "")."1=Supplier"; }
 		if ($conf->societe->enabled) { $typeexample .= ($typeexample ? "/" : "")."2=Customer-Prospect"; }
 		if ($conf->adherent->enabled) { $typeexample .= ($typeexample ? "/" : "")."3=Member"; }
-        $this->import_examplevalues_array[$r] = array(
-            'ca.label'=>"Supplier Category", 'ca.type'=>$typeexample, 'ca.description'=>"My Category description",
-            'ca.fk_parent' => '0'
-        );
+		$this->import_examplevalues_array[$r] = array(
+			'ca.label'=>"Supplier Category", 'ca.type'=>$typeexample, 'ca.description'=>"My Category description",
+			'ca.fk_parent' => '0'
+		);
 
 		if (!empty($conf->product->enabled))
 		{
@@ -515,14 +515,14 @@ class modCategorie extends DolibarrModules
 	}
 
 
-    /**
+	/**
 	 *		Function called when module is enabled.
 	 *		The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
 	 *		It also creates data directories
 	 *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
+	 *      @param      string	$options    Options when enabling module ('', 'noboxes')
 	 *      @return     int             	1 if OK, 0 if KO
-     */
+	 */
 	public function init($options = '')
 	{
 		// Permissions
diff --git a/htdocs/core/modules/modCollab.class.php b/htdocs/core/modules/modCollab.class.php
index 345a292cb92..1f777a4a117 100644
--- a/htdocs/core/modules/modCollab.class.php
+++ b/htdocs/core/modules/modCollab.class.php
@@ -31,65 +31,65 @@ include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
 class modCollab extends DolibarrModules
 {
 
-    /**
-     *   Constructor. Define names, constants, directories, boxes, permissions
-     *
-     *   @param      DoliDB		$db      Database handler
-     */
-    public function __construct($db)
-    {
-        global $langs, $conf;
+	/**
+	 *   Constructor. Define names, constants, directories, boxes, permissions
+	 *
+	 *   @param      DoliDB		$db      Database handler
+	 */
+	public function __construct($db)
+	{
+		global $langs, $conf;
 
-        $this->db = $db;
-        $this->numero = 30000;
+		$this->db = $db;
+		$this->numero = 30000;
 
-        // Family can be 'crm','financial','hr','projects','products','ecm','technic','other'
-        // It is used to group modules in module setup page
-        $this->family = "portal";
-        $this->module_position = '51';
-        // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
-        $this->name = preg_replace('/^mod/i', '', get_class($this));
-        $this->description = "Enable the public collaboration features, like shared pad, shared online sheets, etc...";
-        // Possible values for version are: 'development', 'experimental', 'dolibarr' or version
-        $this->version = 'development';
-        // Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
-        $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-        // Name of image file used for this module.
-        $this->picto = 'website';
+		// Family can be 'crm','financial','hr','projects','products','ecm','technic','other'
+		// It is used to group modules in module setup page
+		$this->family = "portal";
+		$this->module_position = '51';
+		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+		$this->name = preg_replace('/^mod/i', '', get_class($this));
+		$this->description = "Enable the public collaboration features, like shared pad, shared online sheets, etc...";
+		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
+		$this->version = 'development';
+		// Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
+		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+		// Name of image file used for this module.
+		$this->picto = 'website';
 
-        // Data directories to create when module is enabled
-        $this->dirs = array("/collab/temp");
+		// Data directories to create when module is enabled
+		$this->dirs = array("/collab/temp");
 
-        // Config pages
-        //-------------
-        $this->config_page_url = array(/*'collab.php'*/);
+		// Config pages
+		//-------------
+		$this->config_page_url = array(/*'collab.php'*/);
 
-        // Dependancies
-        //-------------
-        $this->hidden = !empty($conf->global->MODULE_COLLAB_DISABLED); // A condition to disable module
-        $this->depends = array(); // List of modules id that must be enabled if this module is enabled
-        $this->requiredby = array(); // List of modules id to disable if this one is disabled
-        $this->conflictwith = array(); // List of modules id this module is in conflict with
-        $this->langfiles = array("collab");
+		// Dependancies
+		//-------------
+		$this->hidden = !empty($conf->global->MODULE_COLLAB_DISABLED); // A condition to disable module
+		$this->depends = array(); // List of modules id that must be enabled if this module is enabled
+		$this->requiredby = array(); // List of modules id to disable if this one is disabled
+		$this->conflictwith = array(); // List of modules id this module is in conflict with
+		$this->langfiles = array("collab");
 
-        // Constants
-        //-----------
-           $this->const = array();
+		// Constants
+		//-----------
+		   $this->const = array();
 
-        // New pages on tabs
-        // -----------------
-        $this->tabs = array();
+		// New pages on tabs
+		// -----------------
+		$this->tabs = array();
 
-        // Boxes
-        //------
-        $this->boxes = array();
+		// Boxes
+		//------
+		$this->boxes = array();
 
-        // Permissions
-        $this->rights = array(); // Permission array used by this module
-        $this->rights_class = 'collab';
-        $r = 0;
+		// Permissions
+		$this->rights = array(); // Permission array used by this module
+		$this->rights_class = 'collab';
+		$r = 0;
 
-        /*$this->rights[$r][0] = 30001;
+		/*$this->rights[$r][0] = 30001;
         $this->rights[$r][1] = 'Read website content';
         $this->rights[$r][3] = 0;
         $this->rights[$r][4] = 'read';
@@ -107,21 +107,21 @@ class modCollab extends DolibarrModules
         $this->rights[$r][4] = 'delete';
         $r++;*/
 
-        // Main menu entries
-        $r = 0;
-        $this->menu[$r] = array(
+		// Main menu entries
+		$r = 0;
+		$this->menu[$r] = array(
 			'fk_menu'=>'0', // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-            'type'=>'top', // This is a Left menu entry
-            'titre'=>'Collab',
-            'mainmenu'=>'collab',
-            'url'=>'/collab/index.php',
-            'langs'=>'collab', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-            'position'=>100,
-            'enabled'=>'$conf->collab->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'=>'1', // Use 'perms'=>'$user->rights->mymodule->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++;
-    }
+			'type'=>'top', // This is a Left menu entry
+			'titre'=>'Collab',
+			'mainmenu'=>'collab',
+			'url'=>'/collab/index.php',
+			'langs'=>'collab', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+			'position'=>100,
+			'enabled'=>'$conf->collab->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'=>'1', // Use 'perms'=>'$user->rights->mymodule->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++;
+	}
 }
diff --git a/htdocs/core/modules/modCommande.class.php b/htdocs/core/modules/modCommande.class.php
index 0da6ac160b8..84a46c49d63 100644
--- a/htdocs/core/modules/modCommande.class.php
+++ b/htdocs/core/modules/modCommande.class.php
@@ -145,7 +145,7 @@ class modCommande extends DolibarrModules
 		$this->rights[$r][2] = 'd';
 		$this->rights[$r][3] = 0;
 		$this->rights[$r][4] = 'order_advance';
-        $this->rights[$r][5] = 'send';
+		$this->rights[$r][5] = 'send';
 
 		$r++;
 		$this->rights[$r][0] = 87;
@@ -205,11 +205,11 @@ class modCommande extends DolibarrModules
 		);
 		if (!empty($conf->multicurrency->enabled))
 		{
-		    $this->export_fields_array[$r]['c.multicurrency_code'] = 'Currency';
-		    $this->export_fields_array[$r]['c.multicurrency_tx'] = 'CurrencyRate';
-		    $this->export_fields_array[$r]['c.multicurrency_total_ht'] = 'MulticurrencyAmountHT';
-		    $this->export_fields_array[$r]['c.multicurrency_total_tva'] = 'MulticurrencyAmountVAT';
-		    $this->export_fields_array[$r]['c.multicurrency_total_ttc'] = 'MulticurrencyAmountTTC';
+			$this->export_fields_array[$r]['c.multicurrency_code'] = 'Currency';
+			$this->export_fields_array[$r]['c.multicurrency_tx'] = 'CurrencyRate';
+			$this->export_fields_array[$r]['c.multicurrency_total_ht'] = 'MulticurrencyAmountHT';
+			$this->export_fields_array[$r]['c.multicurrency_total_tva'] = 'MulticurrencyAmountVAT';
+			$this->export_fields_array[$r]['c.multicurrency_total_ttc'] = 'MulticurrencyAmountTTC';
 		}
 		//$this->export_TypeFields_array[$r]=array(
 		//	's.rowid'=>"List:societe:nom",'s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','co.label'=>'List:c_country:label:label',
@@ -426,7 +426,7 @@ class modCommande 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 ('', 'newboxdefonly', 'noboxes')
+	 *      @param      string	$options    Options when enabling module ('', 'newboxdefonly', 'noboxes')
 	 *      @return     int             	1 if OK, 0 if KO
 	 */
 	public function init($options = '')
diff --git a/htdocs/core/modules/modComptabilite.class.php b/htdocs/core/modules/modComptabilite.class.php
index 508977e2396..7ee9fe3c70f 100644
--- a/htdocs/core/modules/modComptabilite.class.php
+++ b/htdocs/core/modules/modComptabilite.class.php
@@ -35,11 +35,11 @@ include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
 class modComptabilite extends DolibarrModules
 {
 
-    /**
-     *   Constructor. Define names, constants, directories, boxes, permissions
-     *
-     *   @param      DoliDB		$db      Database handler
-     */
+	/**
+	 *   Constructor. Define names, constants, directories, boxes, permissions
+	 *
+	 *   @param      DoliDB		$db      Database handler
+	 */
 	public function __construct($db)
 	{
 		global $conf;
@@ -57,7 +57,7 @@ class modComptabilite extends DolibarrModules
 		$this->version = 'dolibarr';
 
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-        $this->picto = 'accounting';
+		$this->picto = 'accounting';
 
 		// Config pages
 		$this->config_page_url = array("compta.php");
@@ -72,12 +72,12 @@ class modComptabilite extends DolibarrModules
 		$this->const = array();
 
 		// Data directories to create when module is enabled
-        $this->dirs = array(
-            "/comptabilite/temp",
-            "/comptabilite/rapport",
-            "/comptabilite/export",
-            "/comptabilite/bordereau"
-        );
+		$this->dirs = array(
+			"/comptabilite/temp",
+			"/comptabilite/rapport",
+			"/comptabilite/export",
+			"/comptabilite/bordereau"
+		);
 
 		// Boxes
 		$this->boxes = array();
@@ -102,16 +102,16 @@ class modComptabilite extends DolibarrModules
 	}
 
 
-    /**
-     *  Function called when module is enabled.
+	/**
+	 *  Function called when module is enabled.
 	 *  The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
 	 *  It also creates data directories
 	 *
-     *  @param      string	$options    Options when enabling module ('', 'noboxes')
-     *  @return     int             	1 if OK, 0 if KO
-    */
-    public function init($options = '')
-    {
+	 *  @param      string	$options    Options when enabling module ('', 'noboxes')
+	 *  @return     int             	1 if OK, 0 if KO
+	 */
+	public function init($options = '')
+	{
 		global $conf;
 
 		// Nettoyage avant activation
diff --git a/htdocs/core/modules/modContrat.class.php b/htdocs/core/modules/modContrat.class.php
index 31c7a136aac..d58e1d8497a 100644
--- a/htdocs/core/modules/modContrat.class.php
+++ b/htdocs/core/modules/modContrat.class.php
@@ -215,7 +215,7 @@ class modContrat 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 = '')
@@ -232,20 +232,20 @@ class modContrat extends DolibarrModules
 
 		if (file_exists($src) && !file_exists($dest))
 		{
-		    require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-		    dol_mkdir($dirodt);
-		    $result = dol_copy($src, $dest, 0, 0);
-		    if ($result < 0)
-		    {
-		        $langs->load("errors");
-		        $this->error = $langs->trans('ErrorFailToCopyFile', $src, $dest);
-		        return 0;
-		    }
+			require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+			dol_mkdir($dirodt);
+			$result = dol_copy($src, $dest, 0, 0);
+			if ($result < 0)
+			{
+				$langs->load("errors");
+				$this->error = $langs->trans('ErrorFailToCopyFile', $src, $dest);
+				return 0;
+			}
 		}
 
 		$sql = array(
-		    "DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape($this->const[1][2])."' AND type = 'contract' AND entity = ".$conf->entity,
-		    "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[1][2])."','contract',".$conf->entity.")"
+			"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape($this->const[1][2])."' AND type = 'contract' AND entity = ".$conf->entity,
+			"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[1][2])."','contract',".$conf->entity.")"
 		);
 
 		return $this->_init($sql, $options);
diff --git a/htdocs/core/modules/modCron.class.php b/htdocs/core/modules/modCron.class.php
index aebafb5b2d6..b8b281b79d1 100644
--- a/htdocs/core/modules/modCron.class.php
+++ b/htdocs/core/modules/modCron.class.php
@@ -32,37 +32,37 @@ include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
 class modCron extends DolibarrModules
 {
 
-    /**
+	/**
 	 *   Constructor. Define names, constants, directories, boxes, permissions
 	 *
 	 *   @param      DoliDB		$db      Database handler
-     */
-    public function __construct($db)
-    {
-    	global $langs, $conf;
+	 */
+	public function __construct($db)
+	{
+		global $langs, $conf;
 
-        $this->db = $db;
-        $this->numero = 2300;
+		$this->db = $db;
+		$this->numero = 2300;
 
 		// Family can be 'crm','financial','hr','projects','products','ecm','technic','other'
 		// It is used to group modules in module setup page
-        $this->family = "base";
-        // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
-        $this->name = preg_replace('/^mod/i', '', get_class($this));
-        $this->description = "Enable the Dolibarr cron service";
+		$this->family = "base";
+		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+		$this->name = preg_replace('/^mod/i', '', get_class($this));
+		$this->description = "Enable the Dolibarr cron service";
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
-        $this->version = 'dolibarr';
-        // Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
-        $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-        // Name of image file used for this module.
-        $this->picto = 'technic';
+		$this->version = 'dolibarr';
+		// Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
+		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+		// Name of image file used for this module.
+		$this->picto = 'technic';
 
-        // Data directories to create when module is enabled
-        $this->dirs = array();
+		// Data directories to create when module is enabled
+		$this->dirs = array();
 
-        // Config pages
-        //-------------
-        $this->config_page_url = array("cron.php@cron");
+		// Config pages
+		//-------------
+		$this->config_page_url = array("cron.php@cron");
 
 		// Dependancies
 		//-------------
@@ -85,13 +85,13 @@ class modCron extends DolibarrModules
 					0
 				),);
 
-        // New pages on tabs
-        // -----------------
-        $this->tabs = array();
+		// New pages on tabs
+		// -----------------
+		$this->tabs = array();
 
-        // Boxes
-        //------
-        $this->boxes = array();
+		// Boxes
+		//------
+		$this->boxes = array();
 
 		// Cronjobs
 		$this->cronjobs = array(
@@ -100,7 +100,7 @@ class modCron extends DolibarrModules
 			// 1=>array('entity'=>0, 'label'=>'My label', 'jobtype'=>'command', 'command'=>'', 'parameters'=>'', 'comment'=>'Comment', 'frequency'=>1, 'unitfrequency'=>3600*24)
 		);
 
-        // Permissions
+		// Permissions
 		$this->rights = array(); // Permission array used by this module
 		$this->rights_class = 'cron';
 		$r = 0;
@@ -129,18 +129,18 @@ class modCron extends DolibarrModules
 		$this->rights[$r][4] = 'execute';
 		$r++;
 
-        // Main menu entries
-        $r = 0;
-        $this->menu[$r] = array('fk_menu'=>'fk_mainmenu=home,fk_leftmenu=admintools', // 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'=>'CronList',
-						        'url'=>'/cron/list.php?leftmenu=admintools',
-						        'langs'=>'cron', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-						        'position'=>200,
-						        'enabled'=>'$conf->cron->enabled && preg_match(\'/^(admintools|all)/\', $leftmenu)', // 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->cron->read', // Use 'perms'=>'$user->rights->mymodule->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++;
-    }
+		// Main menu entries
+		$r = 0;
+		$this->menu[$r] = array('fk_menu'=>'fk_mainmenu=home,fk_leftmenu=admintools', // 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'=>'CronList',
+								'url'=>'/cron/list.php?leftmenu=admintools',
+								'langs'=>'cron', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+								'position'=>200,
+								'enabled'=>'$conf->cron->enabled && preg_match(\'/^(admintools|all)/\', $leftmenu)', // 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->cron->read', // Use 'perms'=>'$user->rights->mymodule->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++;
+	}
 }
diff --git a/htdocs/core/modules/modDataPolicy.class.php b/htdocs/core/modules/modDataPolicy.class.php
index ca9933d2eb5..54d29595982 100644
--- a/htdocs/core/modules/modDataPolicy.class.php
+++ b/htdocs/core/modules/modDataPolicy.class.php
@@ -37,187 +37,187 @@ include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
  */
 class modDataPolicy extends DolibarrModules {
 
-    // @codingStandardsIgnoreEnd
-    /**
-     * Constructor. Define names, constants, directories, boxes, permissions
-     *
-     * @param DoliDB $db Database handler
-     */
-    public function __construct($db)
-    {
-        global $langs, $conf;
+	// @codingStandardsIgnoreEnd
+	/**
+	 * Constructor. Define names, constants, directories, boxes, permissions
+	 *
+	 * @param DoliDB $db Database handler
+	 */
+	public function __construct($db)
+	{
+		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).
-        $this->numero = 4100;
-        // Key text used to identify module (for permissions, menus, etc...)
-        $this->rights_class = 'datapolicy';
+		// Id for module (must be unique).
+		// Use here a free id (See in Home -> System information -> Dolibarr for list of used modules id).
+		$this->numero = 4100;
+		// Key text used to identify module (for permissions, menus, etc...)
+		$this->rights_class = 'datapolicy';
 
-        // Family can be 'base' (core modules),'crm','financial','hr','projects','products','ecm','technic' (transverse modules),'interface' (link with external tools),'other','...'
-        // It is used to group modules by family in module setup page
-        $this->family = "technic";
-        // Module position in the family on 2 digits ('01', '10', '20', ...)
-        $this->module_position = '78';
-        // Gives the possibility to the module, to provide his own family info and position of this family (Overwrite $this->family and $this->module_position. Avoid this)
-        //$this->familyinfo = array('myownfamily' => array('position' => '01', 'label' => $langs->trans("MyOwnFamily")));
-        // Module label (no space allowed), used if translation string 'ModuledatapolicyName' not found (MyModue is name of module).
-        $this->name = preg_replace('/^mod/i', '', get_class($this));
-        // Module description, used if translation string 'ModuledatapolicyDesc' not found (MyModue is name of module).
-        $this->description = "Module to manage Data policy (for compliance with GDPR in Europe or other Data policy rules)";
-        // Used only if file README.md and README-LL.md not found.
-        $this->descriptionlong = "";
+		// Family can be 'base' (core modules),'crm','financial','hr','projects','products','ecm','technic' (transverse modules),'interface' (link with external tools),'other','...'
+		// It is used to group modules by family in module setup page
+		$this->family = "technic";
+		// Module position in the family on 2 digits ('01', '10', '20', ...)
+		$this->module_position = '78';
+		// Gives the possibility to the module, to provide his own family info and position of this family (Overwrite $this->family and $this->module_position. Avoid this)
+		//$this->familyinfo = array('myownfamily' => array('position' => '01', 'label' => $langs->trans("MyOwnFamily")));
+		// Module label (no space allowed), used if translation string 'ModuledatapolicyName' not found (MyModue is name of module).
+		$this->name = preg_replace('/^mod/i', '', get_class($this));
+		// Module description, used if translation string 'ModuledatapolicyDesc' not found (MyModue is name of module).
+		$this->description = "Module to manage Data policy (for compliance with GDPR in Europe or other Data policy rules)";
+		// Used only if file README.md and README-LL.md not found.
+		$this->descriptionlong = "";
 
-        // Possible values for version are: 'development', 'experimental', 'dolibarr', 'dolibarr_deprecated' or a version string like 'x.y.z'
-        $this->version = 'experimental';
-        // Key used in llx_const table to save module status enabled/disabled (where datapolicy is value of property name of module in uppercase)
-        $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-        // Name of image file used for this module.
-        // If file is in theme/yourtheme/img directory under name object_pictovalue.png, use this->picto='pictovalue'
-        // If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module'
-        $this->picto = 'generic';
+		// Possible values for version are: 'development', 'experimental', 'dolibarr', 'dolibarr_deprecated' or a version string like 'x.y.z'
+		$this->version = 'experimental';
+		// Key used in llx_const table to save module status enabled/disabled (where datapolicy is value of property name of module in uppercase)
+		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+		// Name of image file used for this module.
+		// If file is in theme/yourtheme/img directory under name object_pictovalue.png, use this->picto='pictovalue'
+		// If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module'
+		$this->picto = 'generic';
 
-        // Defined all module parts (triggers, login, substitutions, menus, css, etc...)
-        // for default path (eg: /datapolicy/core/xxxxx) (0=disable, 1=enable)
-        // for specific path of parts (eg: /datapolicy/core/modules/barcode)
-        // for specific css file (eg: /datapolicy/css/datapolicy.css.php)
-        $this->module_parts = array(
-            'triggers' => 0, // Set this to 1 if module has its own trigger directory (core/triggers)
-            'login' => 0, // Set this to 1 if module has its own login method file (core/login)
-            'substitutions' => 0, // Set this to 1 if module has its own substitution function file (core/substitutions)
-            'menus' => 0, // Set this to 1 if module has its own menus handler directory (core/menus)
-            'theme' => 0, // Set this to 1 if module has its own theme directory (theme)
-            'tpl' => 0, // Set this to 1 if module overwrite template dir (core/tpl)
-            'barcode' => 0, // Set this to 1 if module has its own barcode directory (core/modules/barcode)
-            'models' => 0, // Set this to 1 if module has its own models directory (core/modules/xxx)
-            'hooks' => array('data' => array('membercard', 'contactcard', 'thirdpartycard'), 'entity' => $conf->entity)  // Set here all hooks context managed by module. To find available hook context, make a "grep -r '>initHooks(' *" on source code. You can also set hook context 'all'
-        );
+		// Defined all module parts (triggers, login, substitutions, menus, css, etc...)
+		// for default path (eg: /datapolicy/core/xxxxx) (0=disable, 1=enable)
+		// for specific path of parts (eg: /datapolicy/core/modules/barcode)
+		// for specific css file (eg: /datapolicy/css/datapolicy.css.php)
+		$this->module_parts = array(
+			'triggers' => 0, // Set this to 1 if module has its own trigger directory (core/triggers)
+			'login' => 0, // Set this to 1 if module has its own login method file (core/login)
+			'substitutions' => 0, // Set this to 1 if module has its own substitution function file (core/substitutions)
+			'menus' => 0, // Set this to 1 if module has its own menus handler directory (core/menus)
+			'theme' => 0, // Set this to 1 if module has its own theme directory (theme)
+			'tpl' => 0, // Set this to 1 if module overwrite template dir (core/tpl)
+			'barcode' => 0, // Set this to 1 if module has its own barcode directory (core/modules/barcode)
+			'models' => 0, // Set this to 1 if module has its own models directory (core/modules/xxx)
+			'hooks' => array('data' => array('membercard', 'contactcard', 'thirdpartycard'), 'entity' => $conf->entity)  // Set here all hooks context managed by module. To find available hook context, make a "grep -r '>initHooks(' *" on source code. You can also set hook context 'all'
+		);
 
-        // Data directories to create when module is enabled.
-        // Example: this->dirs = array("/datapolicy/temp","/datapolicy/subdir");
-        $this->dirs = array("/datapolicy/temp");
+		// Data directories to create when module is enabled.
+		// Example: this->dirs = array("/datapolicy/temp","/datapolicy/subdir");
+		$this->dirs = array("/datapolicy/temp");
 
-        // Config pages. Put here list of php page, stored into datapolicy/admin directory, to use to setup module.
-        $this->config_page_url = array("setup.php@datapolicy");
+		// Config pages. Put here list of php page, stored into datapolicy/admin directory, to use to setup module.
+		$this->config_page_url = array("setup.php@datapolicy");
 
-        // Dependencies
-        $this->hidden = false; // A condition to hide module
-        $this->depends = array('always'=>'modCron'); // List of module class names as string that must be enabled if this module is enabled
-        $this->requiredby = array(); // List of module ids to disable if this one is disabled
-        $this->conflictwith = array(); // List of module class names as string this module is in conflict with
-        $this->langfiles = array("datapolicy@datapolicy");
-        $this->phpmin = array(5, 3); // Minimum version of PHP required by module
-        $this->need_dolibarr_version = array(4, 0); // Minimum version of Dolibarr required by module
-        $this->warnings_activation = array(); // Warning to show when we activate module. array('always'='text') or array('FR'='textfr','ES'='textes'...)
-        $this->warnings_activation_ext = array(); // Warning to show when we activate an external module. array('always'='text') or array('FR'='textfr','ES'='textes'...)
-        //$this->automatic_activation = array('FR'=>'datapolicyWasAutomaticallyActivatedBecauseOfYourCountryChoice');
-        //$this->always_enabled = true;								// If true, can't be disabled
-        // Constants
-        // List of particular constants to add when module is enabled (key, 'chaine', value, desc, visible, 'current' or 'allentities', deleteonunactive)
-        // Example: $this->const=array(0=>array('datapolicy_MYNEWCONST1','chaine','myvalue','This is a constant to add',1),
-        //                             1=>array('datapolicy_MYNEWCONST2','chaine','myvalue','This is another constant to add',0, 'current', 1)
-        // );
-        $this->const = array(
-            array('DATAPOLICY_TIERS_CLIENT', 'chaine', '', $langs->trans('NUMBER_MONTH_BEFORE_DELETION'), 0),
-            array('DATAPOLICY_TIERS_PROSPECT', 'chaine', '', $langs->trans('NUMBER_MONTH_BEFORE_DELETION'), 0),
-            array('DATAPOLICY_TIERS_PROSPECT_CLIENT', 'chaine', '', $langs->trans('NUMBER_MONTH_BEFORE_DELETION'), 0),
-            array('DATAPOLICY_TIERS_NIPROSPECT_NICLIENT', 'chaine', '', $langs->trans('NUMBER_MONTH_BEFORE_DELETION'), 0),
-            array('DATAPOLICY_TIERS_FOURNISSEUR', 'chaine', '', $langs->trans('NUMBER_MONTH_BEFORE_DELETION'), 0),
-            array('DATAPOLICY_CONTACT_CLIENT', 'chaine', '', $langs->trans('NUMBER_MONTH_BEFORE_DELETION'), 0),
-            array('DATAPOLICY_CONTACT_PROSPECT', 'chaine', '', $langs->trans('NUMBER_MONTH_BEFORE_DELETION'), 0),
-            array('DATAPOLICY_CONTACT_PROSPECT_CLIENT', 'chaine', '', $langs->trans('NUMBER_MONTH_BEFORE_DELETION'), 0),
-            array('DATAPOLICY_CONTACT_NIPROSPECT_NICLIENT', 'chaine', '', $langs->trans('NUMBER_MONTH_BEFORE_DELETION'), 0),
-            array('DATAPOLICY_CONTACT_FOURNISSEUR', 'chaine', '', $langs->trans('NUMBER_MONTH_BEFORE_DELETION'), 0),
-            array('DATAPOLICY_ADHERENT', 'chaine', '', $langs->trans('NUMBER_MONTH_BEFORE_DELETION'), 0),
-        );
+		// Dependencies
+		$this->hidden = false; // A condition to hide module
+		$this->depends = array('always'=>'modCron'); // List of module class names as string that must be enabled if this module is enabled
+		$this->requiredby = array(); // List of module ids to disable if this one is disabled
+		$this->conflictwith = array(); // List of module class names as string this module is in conflict with
+		$this->langfiles = array("datapolicy@datapolicy");
+		$this->phpmin = array(5, 3); // Minimum version of PHP required by module
+		$this->need_dolibarr_version = array(4, 0); // Minimum version of Dolibarr required by module
+		$this->warnings_activation = array(); // Warning to show when we activate module. array('always'='text') or array('FR'='textfr','ES'='textes'...)
+		$this->warnings_activation_ext = array(); // Warning to show when we activate an external module. array('always'='text') or array('FR'='textfr','ES'='textes'...)
+		//$this->automatic_activation = array('FR'=>'datapolicyWasAutomaticallyActivatedBecauseOfYourCountryChoice');
+		//$this->always_enabled = true;								// If true, can't be disabled
+		// Constants
+		// List of particular constants to add when module is enabled (key, 'chaine', value, desc, visible, 'current' or 'allentities', deleteonunactive)
+		// Example: $this->const=array(0=>array('datapolicy_MYNEWCONST1','chaine','myvalue','This is a constant to add',1),
+		//                             1=>array('datapolicy_MYNEWCONST2','chaine','myvalue','This is another constant to add',0, 'current', 1)
+		// );
+		$this->const = array(
+			array('DATAPOLICY_TIERS_CLIENT', 'chaine', '', $langs->trans('NUMBER_MONTH_BEFORE_DELETION'), 0),
+			array('DATAPOLICY_TIERS_PROSPECT', 'chaine', '', $langs->trans('NUMBER_MONTH_BEFORE_DELETION'), 0),
+			array('DATAPOLICY_TIERS_PROSPECT_CLIENT', 'chaine', '', $langs->trans('NUMBER_MONTH_BEFORE_DELETION'), 0),
+			array('DATAPOLICY_TIERS_NIPROSPECT_NICLIENT', 'chaine', '', $langs->trans('NUMBER_MONTH_BEFORE_DELETION'), 0),
+			array('DATAPOLICY_TIERS_FOURNISSEUR', 'chaine', '', $langs->trans('NUMBER_MONTH_BEFORE_DELETION'), 0),
+			array('DATAPOLICY_CONTACT_CLIENT', 'chaine', '', $langs->trans('NUMBER_MONTH_BEFORE_DELETION'), 0),
+			array('DATAPOLICY_CONTACT_PROSPECT', 'chaine', '', $langs->trans('NUMBER_MONTH_BEFORE_DELETION'), 0),
+			array('DATAPOLICY_CONTACT_PROSPECT_CLIENT', 'chaine', '', $langs->trans('NUMBER_MONTH_BEFORE_DELETION'), 0),
+			array('DATAPOLICY_CONTACT_NIPROSPECT_NICLIENT', 'chaine', '', $langs->trans('NUMBER_MONTH_BEFORE_DELETION'), 0),
+			array('DATAPOLICY_CONTACT_FOURNISSEUR', 'chaine', '', $langs->trans('NUMBER_MONTH_BEFORE_DELETION'), 0),
+			array('DATAPOLICY_ADHERENT', 'chaine', '', $langs->trans('NUMBER_MONTH_BEFORE_DELETION'), 0),
+		);
 
-        $country = explode(":", $conf->global->MAIN_INFO_SOCIETE_COUNTRY);
+		$country = explode(":", $conf->global->MAIN_INFO_SOCIETE_COUNTRY);
 
-        // Some keys to add into the overwriting translation tables
-        /* $this->overwrite_translation = array(
+		// Some keys to add into the overwriting translation tables
+		/* $this->overwrite_translation = array(
           'en_US:ParentCompany'=>'Parent company or reseller',
           'fr_FR:ParentCompany'=>'Maison mère ou revendeur'
           ) */
 
-        if (!isset($conf->datapolicy) || !isset($conf->datapolicy->enabled)) {
-            $conf->datapolicy = new stdClass();
-            $conf->datapolicy->enabled = 0;
-        }
+		if (!isset($conf->datapolicy) || !isset($conf->datapolicy->enabled)) {
+			$conf->datapolicy = new stdClass();
+			$conf->datapolicy->enabled = 0;
+		}
 
 
-        // Array to add new pages in new tabs
-        $this->tabs = array();
-        // Example:
-        // $this->tabs[] = array('data'=>'objecttype:+tabname1:Title1:mylangfile@datapolicy:$user->rights->datapolicy->read:/datapolicy/mynewtab1.php?id=__ID__');  					// To add a new tab identified by code tabname1
-        // $this->tabs[] = array('data'=>'objecttype:+tabname2:SUBSTITUTION_Title2:mylangfile@datapolicy:$user->rights->othermodule->read:/datapolicy/mynewtab2.php?id=__ID__',  	// To add another new tab identified by code tabname2. Label will be result of calling all substitution functions on 'Title2' key.
-        // $this->tabs[] = array('data'=>'objecttype:-tabname:NU:conditiontoremove');                                                     										// To remove an existing tab identified by code tabname
-        //
-        // Where objecttype can be
-        // 'categories_x'	  to add a tab in category view (replace 'x' by type of category (0=product, 1=supplier, 2=customer, 3=member)
-        // 'contact'          to add a tab in contact view
-        // 'contract'         to add a tab in contract view
-        // 'group'            to add a tab in group view
-        // 'intervention'     to add a tab in intervention view
-        // 'invoice'          to add a tab in customer invoice view
-        // 'invoice_supplier' to add a tab in supplier invoice view
-        // 'member'           to add a tab in fundation member view
-        // 'opensurveypoll'	  to add a tab in opensurvey poll view
-        // 'order'            to add a tab in customer order view
-        // 'order_supplier'   to add a tab in supplier order view
-        // 'payment'		  to add a tab in payment view
-        // 'payment_supplier' to add a tab in supplier payment view
-        // 'product'          to add a tab in product view
-        // 'propal'           to add a tab in propal view
-        // 'project'          to add a tab in project view
-        // 'stock'            to add a tab in stock view
-        // 'thirdparty'       to add a tab in third party view
-        // 'user'             to add a tab in user view
+		// Array to add new pages in new tabs
+		$this->tabs = array();
+		// Example:
+		// $this->tabs[] = array('data'=>'objecttype:+tabname1:Title1:mylangfile@datapolicy:$user->rights->datapolicy->read:/datapolicy/mynewtab1.php?id=__ID__');  					// To add a new tab identified by code tabname1
+		// $this->tabs[] = array('data'=>'objecttype:+tabname2:SUBSTITUTION_Title2:mylangfile@datapolicy:$user->rights->othermodule->read:/datapolicy/mynewtab2.php?id=__ID__',  	// To add another new tab identified by code tabname2. Label will be result of calling all substitution functions on 'Title2' key.
+		// $this->tabs[] = array('data'=>'objecttype:-tabname:NU:conditiontoremove');                                                     										// To remove an existing tab identified by code tabname
+		//
+		// Where objecttype can be
+		// 'categories_x'	  to add a tab in category view (replace 'x' by type of category (0=product, 1=supplier, 2=customer, 3=member)
+		// 'contact'          to add a tab in contact view
+		// 'contract'         to add a tab in contract view
+		// 'group'            to add a tab in group view
+		// 'intervention'     to add a tab in intervention view
+		// 'invoice'          to add a tab in customer invoice view
+		// 'invoice_supplier' to add a tab in supplier invoice view
+		// 'member'           to add a tab in fundation member view
+		// 'opensurveypoll'	  to add a tab in opensurvey poll view
+		// 'order'            to add a tab in customer order view
+		// 'order_supplier'   to add a tab in supplier order view
+		// 'payment'		  to add a tab in payment view
+		// 'payment_supplier' to add a tab in supplier payment view
+		// 'product'          to add a tab in product view
+		// 'propal'           to add a tab in propal view
+		// 'project'          to add a tab in project view
+		// 'stock'            to add a tab in stock view
+		// 'thirdparty'       to add a tab in third party view
+		// 'user'             to add a tab in user view
 
 
-        // Dictionaries
-        $this->dictionaries = array();
+		// Dictionaries
+		$this->dictionaries = array();
 
 
-        // Boxes/Widgets
-        // Add here list of php file(s) stored in datapolicy/core/boxes that contains class to show a widget.
-        $this->boxes = array();
+		// Boxes/Widgets
+		// Add here list of php file(s) stored in datapolicy/core/boxes that contains class to show a widget.
+		$this->boxes = array();
 
 
-        // Cronjobs (List of cron jobs entries to add when module is enabled)
-        // unit_frequency must be 60 for minute, 3600 for hour, 86400 for day, 604800 for week
-        $this->cronjobs = array(
-            0 => array('label' => 'DATAPOLICYJob', 'jobtype' => 'method', 'class' => 'datapolicy/class/datapolicycron.class.php', 'objectname' => 'DataPolicyCron', 'method' => 'cleanDataForDataPolicy', 'parameters' => '', 'comment' => 'Clean data', 'frequency' => 1, 'unitfrequency' => 86400, 'status' => 1, 'test' => '$conf->datapolicy->enabled'),
-        );
-        // Example: $this->cronjobs=array(0=>array('label'=>'My label', 'jobtype'=>'method', 'class'=>'/dir/class/file.class.php', 'objectname'=>'MyClass', 'method'=>'myMethod', 'parameters'=>'param1, param2', 'comment'=>'Comment', 'frequency'=>2, 'unitfrequency'=>3600, 'status'=>0, 'test'=>true),
-        //                                1=>array('label'=>'My label', 'jobtype'=>'command', 'command'=>'', 'parameters'=>'param1, param2', 'comment'=>'Comment', 'frequency'=>1, 'unitfrequency'=>3600*24, 'status'=>0, 'test'=>true)
-        // );
-        // Permissions
-        $this->rights = array(); // Permission array used by this module
-        // Main menu entries
-        $this->menu = array(); // List of menus to add
-        $r = 0;
-    }
+		// Cronjobs (List of cron jobs entries to add when module is enabled)
+		// unit_frequency must be 60 for minute, 3600 for hour, 86400 for day, 604800 for week
+		$this->cronjobs = array(
+			0 => array('label' => 'DATAPOLICYJob', 'jobtype' => 'method', 'class' => 'datapolicy/class/datapolicycron.class.php', 'objectname' => 'DataPolicyCron', 'method' => 'cleanDataForDataPolicy', 'parameters' => '', 'comment' => 'Clean data', 'frequency' => 1, 'unitfrequency' => 86400, 'status' => 1, 'test' => '$conf->datapolicy->enabled'),
+		);
+		// Example: $this->cronjobs=array(0=>array('label'=>'My label', 'jobtype'=>'method', 'class'=>'/dir/class/file.class.php', 'objectname'=>'MyClass', 'method'=>'myMethod', 'parameters'=>'param1, param2', 'comment'=>'Comment', 'frequency'=>2, 'unitfrequency'=>3600, 'status'=>0, 'test'=>true),
+		//                                1=>array('label'=>'My label', 'jobtype'=>'command', 'command'=>'', 'parameters'=>'param1, param2', 'comment'=>'Comment', 'frequency'=>1, 'unitfrequency'=>3600*24, 'status'=>0, 'test'=>true)
+		// );
+		// Permissions
+		$this->rights = array(); // Permission array used by this module
+		// Main menu entries
+		$this->menu = array(); // List of menus to add
+		$r = 0;
+	}
 
-    /**
-     * 	Function called when module is enabled.
-     * 	The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
-     * 	It also creates data directories
-     *
-     * 	@param      string	$options    Options when enabling module ('', 'noboxes')
-     * 	@return     int             	1 if OK, 0 if KO
-     */
-    public function init($options = '')
-    {
-        global $langs;
+	/**
+	 * 	Function called when module is enabled.
+	 * 	The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
+	 * 	It also creates data directories
+	 *
+	 * 	@param      string	$options    Options when enabling module ('', 'noboxes')
+	 * 	@return     int             	1 if OK, 0 if KO
+	 */
+	public function init($options = '')
+	{
+		global $langs;
 
-        $this->_load_tables('/datapolicy/sql/');
+		$this->_load_tables('/datapolicy/sql/');
 
-        // Create extrafields
-        include_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-        $extrafields = new ExtraFields($this->db);
+		// Create extrafields
+		include_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+		$extrafields = new ExtraFields($this->db);
 
-        /*
+		/*
         // Extrafield contact
         $result1 = $extrafields->addExtraField('datapolicy_consentement', $langs->trans("DATAPOLICY_consentement"), 'boolean', 101, 3, 'thirdparty', 0, 0, '', '', 1, '', '3', 0, '', '', 'datapolicy@datapolicy', '$conf->datapolicy->enabled');
         $result1 = $extrafields->addExtraField('datapolicy_opposition_traitement', $langs->trans("DATAPOLICY_opposition_traitement"), 'boolean', 102, 3, 'thirdparty', 0, 0, '', '', 1, '', '3', 0, '', '', 'datapolicy@datapolicy', '$conf->datapolicy->enabled');
@@ -240,23 +240,23 @@ class modDataPolicy extends DolibarrModules {
         $result1 = $extrafields->addExtraField('datapolicy_send', $langs->trans("DATAPOLICY_send"), 'date', 105, 3, 'adherent', 0, 0, '', '', 0, '', '0', 0);
         */
 
-        $sql = array();
+		$sql = array();
 
-        return $this->_init($sql, $options);
-    }
+		return $this->_init($sql, $options);
+	}
 
-    /**
-     * 	Function called when module is disabled.
-     * 	Remove from database constants, boxes and permissions from Dolibarr database.
-     * 	Data directories are not deleted
-     *
-     * 	@param      string	$options    Options when enabling module ('', 'noboxes')
-     * 	@return     int             	1 if OK, 0 if KO
-     */
-    public function remove($options = '')
-    {
-        $sql = array();
+	/**
+	 * 	Function called when module is disabled.
+	 * 	Remove from database constants, boxes and permissions from Dolibarr database.
+	 * 	Data directories are not deleted
+	 *
+	 * 	@param      string	$options    Options when enabling module ('', 'noboxes')
+	 * 	@return     int             	1 if OK, 0 if KO
+	 */
+	public function remove($options = '')
+	{
+		$sql = array();
 
-        return $this->_remove($sql, $options);
-    }
+		return $this->_remove($sql, $options);
+	}
 }
diff --git a/htdocs/core/modules/modDebugBar.class.php b/htdocs/core/modules/modDebugBar.class.php
index f89f3659285..4d38e848bbe 100644
--- a/htdocs/core/modules/modDebugBar.class.php
+++ b/htdocs/core/modules/modDebugBar.class.php
@@ -32,77 +32,77 @@ include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
 class modDebugBar extends DolibarrModules
 {
 
-    /**
-     *   Constructor. Define names, constants, directories, boxes, permissions
-     *
-     *   @param      DoliDB		$db      Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
+	/**
+	 *   Constructor. Define names, constants, directories, boxes, permissions
+	 *
+	 *   @param      DoliDB		$db      Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
 
-        $this->numero = 43;
+		$this->numero = 43;
 
-        $this->rights_class = 'debugbar';
+		$this->rights_class = 'debugbar';
 
-        $this->family = "base";
-        $this->module_position = '75';
+		$this->family = "base";
+		$this->module_position = '75';
 
-        // 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 = "A tool for developper adding a debug bar in your browser.";
-        // Possible values for version are: 'development', 'experimental', 'dolibarr' or version
-        $this->version = 'dolibarr';
-        $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-        $this->picto = 'bug';
+		// 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 = "A tool for developper adding a debug bar in your browser.";
+		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
+		$this->version = 'dolibarr';
+		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+		$this->picto = 'bug';
 
-        $this->module_parts = array('moduleforexternal' => 0);
+		$this->module_parts = array('moduleforexternal' => 0);
 
-        // Data directories to create when module is enabled
-        $this->dirs = array();
+		// Data directories to create when module is enabled
+		$this->dirs = array();
 
-        // Dependencies
-        $this->depends = array(); // May be used for product or service or third party module
-        $this->requiredby = array();
+		// Dependencies
+		$this->depends = array(); // May be used for product or service or third party module
+		$this->requiredby = array();
 
-        // Config pages
-        $this->config_page_url = array("debugbar.php");
+		// Config pages
+		$this->config_page_url = array("debugbar.php");
 
-        // Constants
-        // Example: $this->const=array(0=>array('MYMODULE_MYNEWCONST1','chaine','myvalue','This is a constant to add',0),
-        //							  1=>array('MYMODULE_MYNEWCONST2','chaine','myvalue','This is another constant to add',0) );
-        $this->const = array();
+		// Constants
+		// Example: $this->const=array(0=>array('MYMODULE_MYNEWCONST1','chaine','myvalue','This is a constant to add',0),
+		//							  1=>array('MYMODULE_MYNEWCONST2','chaine','myvalue','This is another constant to add',0) );
+		$this->const = array();
 
-        // Boxes
-        $this->boxes = array();
+		// Boxes
+		$this->boxes = array();
 
-        // Permissions
-        $this->rights = array();
+		// Permissions
+		$this->rights = array();
 
-        $this->rights[1][0] = 430; // id de la permission
-        $this->rights[1][1] = 'Use Debug Bar'; // libelle de la permission
-        $this->rights[1][2] = 'u'; // type de la permission (deprecie a ce jour)
-        $this->rights[1][3] = 1; // La permission est-elle une permission par defaut
-        $this->rights[1][4] = 'read';
-    }
+		$this->rights[1][0] = 430; // id de la permission
+		$this->rights[1][1] = 'Use Debug Bar'; // libelle de la permission
+		$this->rights[1][2] = 'u'; // type de la permission (deprecie a ce jour)
+		$this->rights[1][3] = 1; // La permission est-elle une permission par defaut
+		$this->rights[1][4] = 'read';
+	}
 
 
-    /**
-     *      Function called when module is enabled.
-     *      The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
-     *      It also creates data directories.
-     *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
-     *      @return     int             	1 if OK, 0 if KO
-     */
-    public function init($options = '')
-    {
-        // Permissions
-        $this->remove($options);
+	/**
+	 *      Function called when module is enabled.
+	 *      The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
+	 *      It also creates data directories.
+	 *
+	 *      @param      string	$options    Options when enabling module ('', 'noboxes')
+	 *      @return     int             	1 if OK, 0 if KO
+	 */
+	public function init($options = '')
+	{
+		// Permissions
+		$this->remove($options);
 
-        $sql = array(
-        );
+		$sql = array(
+		);
 
-        return $this->_init($sql, $options);
-    }
+		return $this->_init($sql, $options);
+	}
 }
diff --git a/htdocs/core/modules/modDeplacement.class.php b/htdocs/core/modules/modDeplacement.class.php
index 349fde7eba7..8e7ec7db4c2 100644
--- a/htdocs/core/modules/modDeplacement.class.php
+++ b/htdocs/core/modules/modDeplacement.class.php
@@ -89,13 +89,13 @@ class modDeplacement extends DolibarrModules
 		$this->rights[2][3] = 0;
 		$this->rights[2][4] = 'creer';
 
-    	$this->rights[3][0] = 173;
+		$this->rights[3][0] = 173;
 		$this->rights[3][1] = 'Supprimer les notes de frais et deplacements';
 		$this->rights[3][2] = 'd';
 		$this->rights[3][3] = 0;
 		$this->rights[3][4] = 'supprimer';
 
-    	$this->rights[4][0] = 174;
+		$this->rights[4][0] = 174;
 		$this->rights[4][1] = 'Lire toutes les notes de frais';
 		$this->rights[4][2] = 'd';
 		$this->rights[4][3] = 0;
@@ -120,10 +120,10 @@ class modDeplacement extends DolibarrModules
 		$this->export_code[$r] = 'trips_'.$r;
 		$this->export_label[$r] = 'ListTripsAndExpenses';
 		$this->export_permission[$r] = array(array("deplacement", "export"));
-        $this->export_fields_array[$r] = array('u.login'=>'Login', 'u.lastname'=>'Lastname', 'u.firstname'=>'Firstname', 'd.rowid'=>"TripId", 'd.type'=>"Type", 'd.km'=>"FeesKilometersOrAmout", 'd.dated'=>"Date", 'd.note_private'=>'NotePrivate', 'd.note_public'=>'NotePublic', 's.nom'=>'ThirdParty');
-        $this->export_TypeFields_array[$r] = array('u.rowid'=>'List:user:name', 'u.login'=>'Text', 'u.lastname'=>'Text', 'u.firstname'=>'Text', 'd.type'=>"Text", 'd.km'=>"Numeric", 'd.dated'=>"Date", 'd.note_private'=>'Text', 'd.note_public'=>'Text', 's.rowid'=>"List:societe:CompanyName", 's.nom'=>'Text');
-        $this->export_entities_array[$r] = array('u.login'=>'user', 'u.lastname'=>'user', 'u.firstname'=>'user', 'd.rowid'=>"trip", 'd.type'=>"trip", 'd.km'=>"trip", 'd.dated'=>"trip", 'd.note_private'=>'trip', 'd.note_public'=>'trip', 's.nom'=>'company');
-        $this->export_dependencies_array[$r] = array('trip'=>'d.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
+		$this->export_fields_array[$r] = array('u.login'=>'Login', 'u.lastname'=>'Lastname', 'u.firstname'=>'Firstname', 'd.rowid'=>"TripId", 'd.type'=>"Type", 'd.km'=>"FeesKilometersOrAmout", 'd.dated'=>"Date", 'd.note_private'=>'NotePrivate', 'd.note_public'=>'NotePublic', 's.nom'=>'ThirdParty');
+		$this->export_TypeFields_array[$r] = array('u.rowid'=>'List:user:name', 'u.login'=>'Text', 'u.lastname'=>'Text', 'u.firstname'=>'Text', 'd.type'=>"Text", 'd.km'=>"Numeric", 'd.dated'=>"Date", 'd.note_private'=>'Text', 'd.note_public'=>'Text', 's.rowid'=>"List:societe:CompanyName", 's.nom'=>'Text');
+		$this->export_entities_array[$r] = array('u.login'=>'user', 'u.lastname'=>'user', 'u.firstname'=>'user', 'd.rowid'=>"trip", 'd.type'=>"trip", 'd.km'=>"trip", 'd.dated'=>"trip", 'd.note_private'=>'trip', 'd.note_public'=>'trip', 's.nom'=>'company');
+		$this->export_dependencies_array[$r] = array('trip'=>'d.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
 
 		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
 		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'user as u';
@@ -136,10 +136,10 @@ class modDeplacement extends DolibarrModules
 
 		if (!empty($user))   // Not defined during migration process
 		{
-    		$childids = $user->getAllChildIds();
-    		$childids[] = $user->id;
+			$childids = $user->getAllChildIds();
+			$childids[] = $user->id;
 
-    		if (empty($user->rights->deplacement->readall) && empty($user->rights->deplacement->lire_tous)) $this->export_sql_end[$r] .= ' AND d.fk_user IN ('.join(',', $childids).')';
+			if (empty($user->rights->deplacement->readall) && empty($user->rights->deplacement->lire_tous)) $this->export_sql_end[$r] .= ' AND d.fk_user IN ('.join(',', $childids).')';
 		}
 	}
 
@@ -149,7 +149,7 @@ class modDeplacement 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/modDocumentGeneration.class.php b/htdocs/core/modules/modDocumentGeneration.class.php
index 698197f0275..2c2c2ed1888 100644
--- a/htdocs/core/modules/modDocumentGeneration.class.php
+++ b/htdocs/core/modules/modDocumentGeneration.class.php
@@ -100,11 +100,11 @@ class modDocumentGeneration 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')
-     *  @return     int                 1 if OK, 0 if KO
-     */
-    public function init($options = '')
-    {
+	 *  @param      string  $options    Options when enabling module ('', 'noboxes')
+	 *  @return     int                 1 if OK, 0 if KO
+	 */
+	public function init($options = '')
+	{
 		global $conf;
 
 		// Permissions
diff --git a/htdocs/core/modules/modDon.class.php b/htdocs/core/modules/modDon.class.php
index 88b7400cc36..64d9c045ad1 100644
--- a/htdocs/core/modules/modDon.class.php
+++ b/htdocs/core/modules/modDon.class.php
@@ -148,7 +148,7 @@ class modDon 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/modDynamicPrices.class.php b/htdocs/core/modules/modDynamicPrices.class.php
index c5e429b465c..fc4863e1280 100644
--- a/htdocs/core/modules/modDynamicPrices.class.php
+++ b/htdocs/core/modules/modDynamicPrices.class.php
@@ -31,57 +31,57 @@ include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
 class modDynamicPrices extends DolibarrModules
 {
 
-    /**
+	/**
 	 *   Constructor. Define names, constants, directories, boxes, permissions
 	 *
 	 *   @param      DoliDB		$db      Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-        $this->numero = 2200;
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+		$this->numero = 2200;
 
-        $this->family = "products";
-        $this->module_position = '85';
-        // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
-        $this->name = preg_replace('/^mod/i', '', get_class($this));
-        $this->description = "Enable the usage of math expressions for prices";
+		$this->family = "products";
+		$this->module_position = '85';
+		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+		$this->name = preg_replace('/^mod/i', '', get_class($this));
+		$this->description = "Enable the usage of math expressions for prices";
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
-        $this->version = 'experimental';
-        // Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
-        $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-        // Name of image file used for this module.
-        $this->picto = 'dynamicprice';
+		$this->version = 'experimental';
+		// Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
+		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+		// Name of image file used for this module.
+		$this->picto = 'dynamicprice';
 
-        // Data directories to create when module is enabled
-        $this->dirs = array();
+		// Data directories to create when module is enabled
+		$this->dirs = array();
 
-        // Config pages
-        //-------------
+		// Config pages
+		//-------------
 		$this->config_page_url = array("dynamic_prices.php@product");
 
-        // Dependancies
-        //-------------
-        $this->depends = array();
-        $this->requiredby = array();
-        $this->langfiles = array("other");
+		// Dependancies
+		//-------------
+		$this->depends = array();
+		$this->requiredby = array();
+		$this->langfiles = array("other");
 
-        // Constants
-        //-----------
-        $this->const = array();
+		// Constants
+		//-----------
+		$this->const = array();
 
-        // New pages on tabs
-        // -----------------
-        $this->tabs = array();
+		// New pages on tabs
+		// -----------------
+		$this->tabs = array();
 
-        // Boxes
-        //------
-        $this->boxes = array();
+		// Boxes
+		//------
+		$this->boxes = array();
 
-        // Permissions
-        //------------
-        $this->rights = array();
-        $this->rights_class = 'dynamicprices';
-        $r = 0;
-    }
+		// Permissions
+		//------------
+		$this->rights = array();
+		$this->rights_class = 'dynamicprices';
+		$r = 0;
+	}
 }
diff --git a/htdocs/core/modules/modECM.class.php b/htdocs/core/modules/modECM.class.php
index 637cdb33739..d83edc6cf96 100644
--- a/htdocs/core/modules/modECM.class.php
+++ b/htdocs/core/modules/modECM.class.php
@@ -32,12 +32,12 @@ include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
 class modECM extends DolibarrModules
 {
 
-    /**
-     *   Constructor. Define names, constants, directories, boxes, permissions
-     *
-     *   @param      DoliDB		$db      Database handler
-    */
-    public function __construct($db)
+	/**
+	 *   Constructor. Define names, constants, directories, boxes, permissions
+	 *
+	 *   @param      DoliDB		$db      Database handler
+	 */
+	public function __construct($db)
 	{
 		$this->db = $db;
 
@@ -86,10 +86,10 @@ class modECM extends DolibarrModules
 
 		// Add here list of php file(s) stored in core/boxes that contains class to show a box.
 		// Example:
-        //$this->boxes[$r][1] = "myboxa.php";
-    	//$r++;
-        //$this->boxes[$r][1] = "myboxb.php";
-    	//$r++;
+		//$this->boxes[$r][1] = "myboxa.php";
+		//$r++;
+		//$this->boxes[$r][1] = "myboxb.php";
+		//$r++;
 
 		// Permissions
 		$this->rights_class = 'ecm'; // Permission key
@@ -117,7 +117,7 @@ class modECM extends DolibarrModules
 		$this->rights[$r][4] = 'setup';
 
 
-        // Menus
+		// Menus
 		//------
 		$this->menus = array(); // List of menus to add
 		$r = 0;
diff --git a/htdocs/core/modules/modEmailCollector.class.php b/htdocs/core/modules/modEmailCollector.class.php
index 1e00f28d40f..45246cadcca 100644
--- a/htdocs/core/modules/modEmailCollector.class.php
+++ b/htdocs/core/modules/modEmailCollector.class.php
@@ -38,9 +38,9 @@ class modEmailCollector 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 modEmailCollector 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 modEmailCollector 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 modEmailCollector 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)
@@ -259,7 +259,7 @@ class modEmailCollector 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/modExpedition.class.php b/htdocs/core/modules/modExpedition.class.php
index 165633849a1..8d11989f02a 100644
--- a/htdocs/core/modules/modExpedition.class.php
+++ b/htdocs/core/modules/modExpedition.class.php
@@ -62,12 +62,12 @@ class modExpedition extends DolibarrModules
 		// Data directories to create when module is enabled
 		$this->dirs = array("/expedition/temp",
 							"/expedition/sending",
-		                    "/expedition/sending/temp",
-		                    "/expedition/receipt",
-		                    "/expedition/receipt/temp",
+							"/expedition/sending/temp",
+							"/expedition/receipt",
+							"/expedition/receipt/temp",
 							"/doctemplates/shipments",
 							"/doctemplates/deliveries"
-		                    );
+							);
 
 		// Config pages
 		$this->config_page_url = array("confexped.php");
@@ -169,7 +169,7 @@ class modExpedition extends DolibarrModules
 		$this->rights[$r][2] = 'd'; // type de la permission (deprecie a ce jour)
 		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
 		$this->rights[$r][4] = 'shipping_advance';
-        $this->rights[$r][5] = 'send';
+		$this->rights[$r][5] = 'send';
 
 		$r++;
 		$this->rights[$r][0] = 106;
@@ -277,8 +277,8 @@ class modExpedition extends DolibarrModules
 		$this->export_dependencies_array[$r] = array('shipment_line'=>'ed.rowid', 'product'=>'ed.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
 		if ($idcontacts && !empty($conf->global->SHIPMENT_ADD_CONTACTS_IN_EXPORT))
 		{
-		    $keyforselect = 'socpeople'; $keyforelement = 'contact'; $keyforaliasextra = 'extra3';
-		    include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
+			$keyforselect = 'socpeople'; $keyforelement = 'contact'; $keyforaliasextra = 'extra3';
+			include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
 		}
 		$keyforselect = 'expedition'; $keyforelement = 'shipment'; $keyforaliasextra = 'extra';
 		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
@@ -300,9 +300,9 @@ class modExpedition extends DolibarrModules
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p on cd.fk_product = p.rowid';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_extrafields as extraprod ON p.rowid = extraprod.fk_object';
 		if ($idcontacts && !empty($conf->global->SHIPMENT_ADD_CONTACTS_IN_EXPORT)) {
-		    $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'element_contact as ee ON ee.element_id = cd.fk_commande AND ee.fk_c_type_contact IN ('.$idcontacts.')';
-		    $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'socpeople as sp ON sp.rowid = ee.fk_socpeople';
-		    $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'socpeople_extrafields as extra3 ON sp.rowid = extra3.fk_object';
+			$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'element_contact as ee ON ee.element_id = cd.fk_commande AND ee.fk_c_type_contact IN ('.$idcontacts.')';
+			$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'socpeople as sp ON sp.rowid = ee.fk_socpeople';
+			$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'socpeople_extrafields as extra3 ON sp.rowid = extra3.fk_object';
 		}
 		$this->export_sql_end[$r] .= ' WHERE c.fk_soc = s.rowid AND c.rowid = ed.fk_expedition AND ed.fk_origin_line = cd.rowid';
 		$this->export_sql_end[$r] .= ' AND c.entity IN ('.getEntity('expedition').')';
@@ -315,7 +315,7 @@ class modExpedition 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/modExpenseReport.class.php b/htdocs/core/modules/modExpenseReport.class.php
index ee6e39c591c..befafbc6767 100644
--- a/htdocs/core/modules/modExpenseReport.class.php
+++ b/htdocs/core/modules/modExpenseReport.class.php
@@ -180,35 +180,35 @@ class modExpenseReport extends DolibarrModules
 		$this->export_label[$r] = 'ListTripsAndExpenses';
 		$this->export_icon[$r] = 'trip';
 		$this->export_permission[$r] = array(array("expensereport", "export"));
-        $this->export_fields_array[$r] = array(
+		$this->export_fields_array[$r] = array(
 			'd.rowid'=>"TripId", 'd.ref'=>'Ref', 'd.date_debut'=>'DateStart', 'd.date_fin'=>'DateEnd', 'd.date_create'=>'DateCreation', 'd.date_approve'=>'DateApprove',
 			'd.total_ht'=>"TotalHT", 'd.total_tva'=>'TotalVAT', 'd.total_ttc'=>'TotalTTC',
-        	'd.fk_statut'=>'Status', 'd.paid'=>'Paid',
-        	'd.note_private'=>'NotePrivate', 'd.note_public'=>'NotePublic', 'd.detail_cancel'=>'MOTIF_CANCEL', 'd.detail_refuse'=>'MOTIF_REFUS',
+			'd.fk_statut'=>'Status', 'd.paid'=>'Paid',
+			'd.note_private'=>'NotePrivate', 'd.note_public'=>'NotePublic', 'd.detail_cancel'=>'MOTIF_CANCEL', 'd.detail_refuse'=>'MOTIF_REFUS',
 			'u.lastname'=>'Lastname', 'u.firstname'=>'Firstname', 'u.login'=>"Login", 'ed.rowid'=>'LineId', 'tf.code'=>'Type', 'ed.date'=>'Date', 'ed.tva_tx'=>'VATRate',
 			'ed.total_ht'=>'TotalHT', 'ed.total_tva'=>'TotalVAT', 'ed.total_ttc'=>'TotalTTC', 'ed.comments'=>'Comment', 'p.rowid'=>'ProjectId', 'p.ref'=>'Ref',
-            'user_rib.iban_prefix' => 'IBAN', 'user_rib.bic' => 'BIC', 'user_rib.code_banque' => 'BankCode', 'user_rib.bank' => 'BankName', 'user_rib.proprio' => 'BankAccountOwner',
-            'user_rib.owner_address' => 'BankAccountOwnerAddress'
+			'user_rib.iban_prefix' => 'IBAN', 'user_rib.bic' => 'BIC', 'user_rib.code_banque' => 'BankCode', 'user_rib.bank' => 'BankName', 'user_rib.proprio' => 'BankAccountOwner',
+			'user_rib.owner_address' => 'BankAccountOwnerAddress'
 		);
-        $this->export_TypeFields_array[$r] = array(
-        	'd.rowid'=>"Numeric", 'd.ref'=>'Text', 'd.date_debut'=>'Date', 'd.date_fin'=>'Date', 'd.date_create'=>'Date', 'd.date_approve'=>'Date',
-        	'd.total_ht'=>"Numeric", 'd.total_tva'=>'Numeric', 'd.total_ttc'=>'Numeric',
-        	'd.fk_statut'=>"Numeric", 'd.paid'=>'Numeric',
-        	'd.note_private'=>'Text', 'd.note_public'=>'Text', 'd.detail_cancel'=>'Text', 'd.detail_refuse'=>'Text',
-        	'u.lastname'=>'Text', 'u.firstname'=>'Text', 'u.login'=>"Text", 'ed.rowid'=>'Numeric', 'tf.code'=>'Code', 'ed.date'=>'Date', 'ed.tva_tx'=>'Numeric',
-        	'ed.total_ht'=>'Numeric', 'ed.total_tva'=>'Numeric', 'ed.total_ttc'=>'Numeric', 'ed.comments'=>'Text', 'p.rowid'=>'Numeric', 'p.ref'=>'Text',
-            'user_rib.iban_prefix' => 'Text', 'user_rib.bic' => 'Text', 'user_rib.code_banque' => 'Text', 'user_rib.bank' => 'Text', 'user_rib.proprio' => 'Text',
-            'user_rib.owner_address' => 'Text'
-        );
-        $this->export_entities_array[$r] = array(
+		$this->export_TypeFields_array[$r] = array(
+			'd.rowid'=>"Numeric", 'd.ref'=>'Text', 'd.date_debut'=>'Date', 'd.date_fin'=>'Date', 'd.date_create'=>'Date', 'd.date_approve'=>'Date',
+			'd.total_ht'=>"Numeric", 'd.total_tva'=>'Numeric', 'd.total_ttc'=>'Numeric',
+			'd.fk_statut'=>"Numeric", 'd.paid'=>'Numeric',
+			'd.note_private'=>'Text', 'd.note_public'=>'Text', 'd.detail_cancel'=>'Text', 'd.detail_refuse'=>'Text',
+			'u.lastname'=>'Text', 'u.firstname'=>'Text', 'u.login'=>"Text", 'ed.rowid'=>'Numeric', 'tf.code'=>'Code', 'ed.date'=>'Date', 'ed.tva_tx'=>'Numeric',
+			'ed.total_ht'=>'Numeric', 'ed.total_tva'=>'Numeric', 'ed.total_ttc'=>'Numeric', 'ed.comments'=>'Text', 'p.rowid'=>'Numeric', 'p.ref'=>'Text',
+			'user_rib.iban_prefix' => 'Text', 'user_rib.bic' => 'Text', 'user_rib.code_banque' => 'Text', 'user_rib.bank' => 'Text', 'user_rib.proprio' => 'Text',
+			'user_rib.owner_address' => 'Text'
+		);
+		$this->export_entities_array[$r] = array(
 			'u.lastname'=>'user', 'u.firstname'=>'user', 'u.login'=>'user', 'ed.rowid'=>'expensereport_line', 'ed.date'=>'expensereport_line',
 			'ed.tva_tx'=>'expensereport_line', 'ed.total_ht'=>'expensereport_line', 'ed.total_tva'=>'expensereport_line', 'ed.total_ttc'=>'expensereport_line',
 			'ed.comments'=>'expensereport_line', 'tf.code'=>'expensereport_line', 'p.project_ref'=>'expensereport_line', 'p.rowid'=>'project', 'p.ref'=>'project',
-            'user_rib.iban_prefix' => 'user', 'user_rib.bic' => 'user', 'user_rib.code_banque' => 'user', 'user_rib.bank' => 'user', 'user_rib.proprio' => 'user',
-            'user_rib.owner_address' => 'user'
+			'user_rib.iban_prefix' => 'user', 'user_rib.bic' => 'user', 'user_rib.code_banque' => 'user', 'user_rib.bank' => 'user', 'user_rib.proprio' => 'user',
+			'user_rib.owner_address' => 'user'
 
 		);
-        $this->export_alias_array[$r] = array('d.rowid'=>"idtrip", 'd.type'=>"type", 'd.note_private'=>'note_private', 'd.note_public'=>'note_public', 'u.lastname'=>'name', 'u.firstname'=>'firstname', 'u.login'=>'login');
+		$this->export_alias_array[$r] = array('d.rowid'=>"idtrip", 'd.type'=>"type", 'd.note_private'=>'note_private', 'd.note_public'=>'note_public', 'u.lastname'=>'name', 'u.firstname'=>'firstname', 'u.login'=>'login');
 		$this->export_dependencies_array[$r] = array('expensereport_line'=>'ed.rowid', 'type_fees'=>'tf.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
 
 		$keyforselect = 'expensereport'; $keyforelement = 'expensereport'; $keyforaliasextra = 'extra';
diff --git a/htdocs/core/modules/modExternalRss.class.php b/htdocs/core/modules/modExternalRss.class.php
index f0bdc6335ff..05cc62094e6 100644
--- a/htdocs/core/modules/modExternalRss.class.php
+++ b/htdocs/core/modules/modExternalRss.class.php
@@ -83,7 +83,7 @@ class modExternalRss 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 = '')
@@ -118,21 +118,21 @@ class modExternalRss extends DolibarrModules
 		return $this->_init($sql, $options);
 	}
 
-    /**
+	/**
 	 *		Function called when module is disabled.
 	 *      Remove from database constants, boxes and permissions from Dolibarr database.
 	 *		Data directories are not deleted
 	 *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
+	 *      @param      string	$options    Options when enabling module ('', 'noboxes')
 	 *      @return     int             	1 if OK, 0 if KO
-     */
-    public function remove($options = '')
-    {
+	 */
+	public function remove($options = '')
+	{
 		$sql = array();
 
 		// Delete old declarations of RSS box
 		$this->boxes[0]['file'] = "box_external_rss.php";
 
 		return $this->_remove($sql, $options);
-    }
+	}
 }
diff --git a/htdocs/core/modules/modExternalSite.class.php b/htdocs/core/modules/modExternalSite.class.php
index d3cf9ea38e6..54c7a9d9b0b 100644
--- a/htdocs/core/modules/modExternalSite.class.php
+++ b/htdocs/core/modules/modExternalSite.class.php
@@ -34,11 +34,11 @@ include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
 class modExternalSite extends DolibarrModules
 {
 
-    /**
+	/**
 	 *   Constructor. Define names, constants, directories, boxes, permissions
 	 *
 	 *   @param      DoliDB		$db      Database handler
-     */
+	 */
 	public function __construct($db)
 	{
 		$this->db = $db;
@@ -86,16 +86,16 @@ class modExternalSite extends DolibarrModules
 
 		// Add here list of php file(s) stored in core/boxes that contains class to show a box.
 		// Example:
-        //$this->boxes[$r][1] = "myboxa.php";
-    	//$r++;
-        //$this->boxes[$r][1] = "myboxb.php";
-    	//$r++;
+		//$this->boxes[$r][1] = "myboxa.php";
+		//$r++;
+		//$this->boxes[$r][1] = "myboxb.php";
+		//$r++;
 
 		// Permissions
 		$this->rights_class = 'externalsite'; // Permission key
 		$this->rights = array(); // Permission array used by this module
 
-        // Menus
+		// Menus
 		//------
 		$r = 0;
 
diff --git a/htdocs/core/modules/modFTP.class.php b/htdocs/core/modules/modFTP.class.php
index 4b6ac9f92ec..52944961379 100644
--- a/htdocs/core/modules/modFTP.class.php
+++ b/htdocs/core/modules/modFTP.class.php
@@ -33,11 +33,11 @@ include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
 class modFTP extends DolibarrModules
 {
 
-    /**
-     *   Constructor. Define names, constants, directories, boxes, permissions
-     *
-     *   @param      DoliDB		$db      Database handler
-    */
+	/**
+	 *   Constructor. Define names, constants, directories, boxes, permissions
+	 *
+	 *   @param      DoliDB		$db      Database handler
+	 */
 	public function __construct($db)
 	{
 		$this->db = $db;
@@ -75,8 +75,8 @@ class modFTP extends DolibarrModules
 
 		// Constants
 		$this->const = array(
-		    1=>array('FTP_CONNECT_WITH_SSL', 'chaine', '0', 'Use FTPS for FTP module', 1, 'current', 1),
-		    2=>array('FTP_CONNECT_WITH_SFTP', 'chaine', '0', 'Use SFTP for FTP module', 1, 'current', 1)
+			1=>array('FTP_CONNECT_WITH_SSL', 'chaine', '0', 'Use FTPS for FTP module', 1, 'current', 1),
+			2=>array('FTP_CONNECT_WITH_SFTP', 'chaine', '0', 'Use SFTP for FTP module', 1, 'current', 1)
 		); // List of parameters
 
 		// Boxes
@@ -85,10 +85,10 @@ class modFTP extends DolibarrModules
 
 		// Add here list of php file(s) stored in core/boxes that contains class to show a box.
 		// Example:
-        //$this->boxes[$r][1] = "myboxa.php";
-    	//$r++;
-        //$this->boxes[$r][1] = "myboxb.php";
-    	//$r++;
+		//$this->boxes[$r][1] = "myboxa.php";
+		//$r++;
+		//$this->boxes[$r][1] = "myboxb.php";
+		//$r++;
 
 		// Permissions
 		$this->rights_class = 'ftp'; // Permission key
@@ -118,8 +118,8 @@ class modFTP extends DolibarrModules
 							  'url'=>'/ftp/index.php',
 							  'langs'=>'ftp',
 							  'position'=>100,
-                              'enabled'=>'$conf->ftp->enabled',
-		                      'perms'=>'$user->rights->ftp->read || $user->rights->ftp->write || $user->rights->ftp->setup',
+							  'enabled'=>'$conf->ftp->enabled',
+							  'perms'=>'$user->rights->ftp->read || $user->rights->ftp->write || $user->rights->ftp->setup',
 							  'target'=>'',
 							  'user'=>2); // 0=Menu for internal users, 1=external users, 2=both
 		$r++;
diff --git a/htdocs/core/modules/modFacture.class.php b/htdocs/core/modules/modFacture.class.php
index a4e6134060d..fdd7205b19c 100644
--- a/htdocs/core/modules/modFacture.class.php
+++ b/htdocs/core/modules/modFacture.class.php
@@ -146,7 +146,7 @@ class modFacture extends DolibarrModules
 		$this->rights[$r][1] = 'Devalidate invoices';
 		$this->rights[$r][2] = 'a';
 		$this->rights[$r][3] = 0;
-        $this->rights[$r][4] = 'invoice_advance';
+		$this->rights[$r][4] = 'invoice_advance';
 		$this->rights[$r][5] = 'unvalidate';
 
 		$r++;
@@ -163,7 +163,7 @@ class modFacture extends DolibarrModules
 		$this->rights[$r][2] = 'a';
 		$this->rights[$r][3] = 0;
 		$this->rights[$r][4] = 'invoice_advance';
-        $this->rights[$r][5] = 'send';
+		$this->rights[$r][5] = 'send';
 
 		$r++;
 		$this->rights[$r][0] = 16;
@@ -210,8 +210,8 @@ class modFacture extends DolibarrModules
 		$this->export_icon[$r] = 'invoice';
 		$this->export_permission[$r] = array(array("facture", "facture", "export", "other"));
 		$this->export_fields_array[$r] = array(
-		    's.rowid'=>"IdCompany", 's.nom'=>'CompanyName', 's.code_client'=>'CustomerCode', 's.address'=>'Address', 's.zip'=>'Zip', 's.town'=>'Town', 'c.code'=>'CountryCode', 'cd.nom'=>'State',
-		    's.phone'=>'Phone',
+			's.rowid'=>"IdCompany", 's.nom'=>'CompanyName', 's.code_client'=>'CustomerCode', 's.address'=>'Address', 's.zip'=>'Zip', 's.town'=>'Town', 'c.code'=>'CountryCode', 'cd.nom'=>'State',
+			's.phone'=>'Phone',
 			's.siren'=>'ProfId1', 's.siret'=>'ProfId2', 's.ape'=>'ProfId3', 's.idprof4'=>'ProfId4',
 			's.code_compta'=>'CustomerAccountancyCode',
 			's.code_compta_fournisseur'=>'SupplierAccountancyCode',
@@ -229,11 +229,11 @@ class modFacture extends DolibarrModules
 		);
 		if (!empty($conf->multicurrency->enabled))
 		{
-		    $this->export_fields_array[$r]['f.multicurrency_code'] = 'Currency';
-		    $this->export_fields_array[$r]['f.multicurrency_tx'] = 'CurrencyRate';
-		    $this->export_fields_array[$r]['f.multicurrency_total_ht'] = 'MulticurrencyAmountHT';
-		    $this->export_fields_array[$r]['f.multicurrency_total_tva'] = 'MulticurrencyAmountVAT';
-		    $this->export_fields_array[$r]['f.multicurrency_total_ttc'] = 'MulticurrencyAmountTTC';
+			$this->export_fields_array[$r]['f.multicurrency_code'] = 'Currency';
+			$this->export_fields_array[$r]['f.multicurrency_tx'] = 'CurrencyRate';
+			$this->export_fields_array[$r]['f.multicurrency_total_ht'] = 'MulticurrencyAmountHT';
+			$this->export_fields_array[$r]['f.multicurrency_total_tva'] = 'MulticurrencyAmountVAT';
+			$this->export_fields_array[$r]['f.multicurrency_total_ttc'] = 'MulticurrencyAmountTTC';
 		}
 		if (!empty($conf->cashdesk->enabled) || !empty($conf->takepos->enabled) || !empty($conf->global->INVOICE_SHOW_POS))
 		{
@@ -299,8 +299,8 @@ class modFacture extends DolibarrModules
 		$this->export_icon[$r] = 'invoice';
 		$this->export_permission[$r] = array(array("facture", "facture", "export"));
 		$this->export_fields_array[$r] = array(
-		    's.rowid'=>"IdCompany", 's.nom'=>'CompanyName', 's.code_client'=>'CustomerCode', 's.address'=>'Address', 's.zip'=>'Zip', 's.town'=>'Town', 'c.code'=>'CountryCode', 'cd.nom'=>'State',
-		    's.phone'=>'Phone',
+			's.rowid'=>"IdCompany", 's.nom'=>'CompanyName', 's.code_client'=>'CustomerCode', 's.address'=>'Address', 's.zip'=>'Zip', 's.town'=>'Town', 'c.code'=>'CountryCode', 'cd.nom'=>'State',
+			's.phone'=>'Phone',
 			's.siren'=>'ProfId1', 's.siret'=>'ProfId2', 's.ape'=>'ProfId3', 's.idprof4'=>'ProfId4', 's.code_compta'=>'CustomerAccountancyCode',
 			's.code_compta_fournisseur'=>'SupplierAccountancyCode', 's.tva_intra'=>'VATIntra',
 			'f.rowid'=>"InvoiceId", 'f.ref'=>"InvoiceRef", 'f.ref_client'=>'RefCustomer',
@@ -315,12 +315,12 @@ class modFacture extends DolibarrModules
 		$this->export_help_array[$r] = array('f.paye'=>'InvoicePaidCompletelyHelp');
 		if (!empty($conf->multicurrency->enabled))
 		{
-		    $this->export_fields_array[$r]['f.multicurrency_code'] = 'Currency';
-		    $this->export_fields_array[$r]['f.multicurrency_tx'] = 'CurrencyRate';
-		    $this->export_fields_array[$r]['f.multicurrency_total_ht'] = 'MulticurrencyAmountHT';
-		    $this->export_fields_array[$r]['f.multicurrency_total_tva'] = 'MulticurrencyAmountVAT';
-		    $this->export_fields_array[$r]['f.multicurrency_total_ttc'] = 'MulticurrencyAmountTTC';
-		    $this->export_examplevalues_array[$r]['f.multicurrency_code'] = 'EUR';
+			$this->export_fields_array[$r]['f.multicurrency_code'] = 'Currency';
+			$this->export_fields_array[$r]['f.multicurrency_tx'] = 'CurrencyRate';
+			$this->export_fields_array[$r]['f.multicurrency_total_ht'] = 'MulticurrencyAmountHT';
+			$this->export_fields_array[$r]['f.multicurrency_total_tva'] = 'MulticurrencyAmountVAT';
+			$this->export_fields_array[$r]['f.multicurrency_total_ttc'] = 'MulticurrencyAmountTTC';
+			$this->export_examplevalues_array[$r]['f.multicurrency_code'] = 'EUR';
 		}
 		if (!empty($conf->cashdesk->enabled) || !empty($conf->takepos->enabled) || !empty($conf->global->INVOICE_SHOW_POS))
 		{
@@ -328,7 +328,7 @@ class modFacture extends DolibarrModules
 			$this->export_fields_array[$r]['f.pos_source'] = 'POSTerminal';
 		}
 		$this->export_TypeFields_array[$r] = array(
-		    's.rowid'=>'Numeric', 's.nom'=>'Text', 's.code_client'=>'Text', 's.address'=>'Text', 's.zip'=>'Text', 's.town'=>'Text', 'c.code'=>'Text', 'cd.nom'=>'Text', 's.phone'=>'Text', 's.siren'=>'Text',
+			's.rowid'=>'Numeric', 's.nom'=>'Text', 's.code_client'=>'Text', 's.address'=>'Text', 's.zip'=>'Text', 's.town'=>'Text', 'c.code'=>'Text', 'cd.nom'=>'Text', 's.phone'=>'Text', 's.siren'=>'Text',
 			's.siret'=>'Text', 's.ape'=>'Text', 's.idprof4'=>'Text', 's.code_compta'=>'Text', 's.code_compta_fournisseur'=>'Text', 's.tva_intra'=>'Text',
 			'f.rowid'=>"Numeric", 'f.ref'=>"Text", 'f.ref_client'=>'Text', 'f.type'=>"Numeric", 'f.datec'=>"Date", 'f.datef'=>"Date", 'f.date_lim_reglement'=>"Date",
 			'f.total'=>"Numeric", 'f.total_ttc'=>"Numeric", 'f.tva'=>"Numeric", 'f.localtax1'=>'Numeric', 'f.localtax2'=>'Numeric', 'f.paye'=>"Boolean", 'f.fk_statut'=>'Status', 'f.close_code'=>'Text', 'f.close_note'=>'Text',
@@ -380,7 +380,7 @@ class modFacture 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 ('', 'newboxdefonly', 'noboxes')
+	 *  @param      string	$options    Options when enabling module ('', 'newboxdefonly', 'noboxes')
 	 *  @return     int             	1 if OK, 0 if KO
 	 */
 	public function init($options = '')
diff --git a/htdocs/core/modules/modFckeditor.class.php b/htdocs/core/modules/modFckeditor.class.php
index 8f2d164e9ca..f93e08c1872 100644
--- a/htdocs/core/modules/modFckeditor.class.php
+++ b/htdocs/core/modules/modFckeditor.class.php
@@ -69,12 +69,12 @@ class modFckeditor extends DolibarrModules
 
 		// Constants
 		$this->const = array();
-        $this->const[0]  = array("FCKEDITOR_ENABLE_SOCIETE", "yesno", "1", "WYSIWIG for description and note (except products/services)");
-        $this->const[1]  = array("FCKEDITOR_ENABLE_PRODUCTDESC", "yesno", "1", "WYSIWIG for products/services description and note");
-        $this->const[2]  = array("FCKEDITOR_ENABLE_MAILING", "yesno", "1", "WYSIWIG for mass emailings");
-        $this->const[3]  = array("FCKEDITOR_ENABLE_DETAILS", "yesno", "1", "WYSIWIG for products details lines for all entities");
-        $this->const[4]  = array("FCKEDITOR_ENABLE_USERSIGN", "yesno", "1", "WYSIWIG for user signature");
-        $this->const[5]  = array("FCKEDITOR_ENABLE_MAIL", "yesno", "1", "WYSIWIG for products details lines for all entities");
+		$this->const[0]  = array("FCKEDITOR_ENABLE_SOCIETE", "yesno", "1", "WYSIWIG for description and note (except products/services)");
+		$this->const[1]  = array("FCKEDITOR_ENABLE_PRODUCTDESC", "yesno", "1", "WYSIWIG for products/services description and note");
+		$this->const[2]  = array("FCKEDITOR_ENABLE_MAILING", "yesno", "1", "WYSIWIG for mass emailings");
+		$this->const[3]  = array("FCKEDITOR_ENABLE_DETAILS", "yesno", "1", "WYSIWIG for products details lines for all entities");
+		$this->const[4]  = array("FCKEDITOR_ENABLE_USERSIGN", "yesno", "1", "WYSIWIG for user signature");
+		$this->const[5]  = array("FCKEDITOR_ENABLE_MAIL", "yesno", "1", "WYSIWIG for products details lines for all entities");
 		$this->const[6] = array("FCKEDITOR_SKIN", "string", "moono-lisa", "Skin by default for fckeditor");
 
 		// Boxes
diff --git a/htdocs/core/modules/modFicheinter.class.php b/htdocs/core/modules/modFicheinter.class.php
index 817ee5a27f8..422ca6b22d5 100644
--- a/htdocs/core/modules/modFicheinter.class.php
+++ b/htdocs/core/modules/modFicheinter.class.php
@@ -37,200 +37,200 @@ include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
 class modFicheinter extends DolibarrModules
 {
 
-    /**
+	/**
 	 *   Constructor. Define names, constants, directories, boxes, permissions
 	 *
 	 *   @param      DoliDB		$db      Database handler
-     */
-    public function __construct($db)
-    {
-        global $conf;
+	 */
+	public function __construct($db)
+	{
+		global $conf;
 
-        $this->db = $db;
-        $this->numero = 70;
+		$this->db = $db;
+		$this->numero = 70;
 
-        $this->family = "crm";
-        $this->module_position = '41';
-        // 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 = "Gestion des fiches d'intervention";
+		$this->family = "crm";
+		$this->module_position = '41';
+		// 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 = "Gestion des fiches d'intervention";
 
-        // Possible values for version are: 'development', 'experimental', 'dolibarr' or version
-        $this->version = 'dolibarr';
+		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
+		$this->version = 'dolibarr';
 
-        $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-        $this->picto = "intervention";
+		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+		$this->picto = "intervention";
 
-        // Data directories to create when module is enabled
-        $this->dirs = array("/ficheinter/temp");
+		// Data directories to create when module is enabled
+		$this->dirs = array("/ficheinter/temp");
 
-        // Dependencies
-        $this->depends = array("modSociete");
-        $this->requiredby = array();
-        $this->conflictwith = array();
-        $this->langfiles = array("bills", "companies", "interventions");
+		// Dependencies
+		$this->depends = array("modSociete");
+		$this->requiredby = array();
+		$this->conflictwith = array();
+		$this->langfiles = array("bills", "companies", "interventions");
 
-        // Config pages
-        $this->config_page_url = array("fichinter.php");
+		// Config pages
+		$this->config_page_url = array("fichinter.php");
 
-        // Constants
-        $this->const = array();
-        $r = 0;
+		// Constants
+		$this->const = array();
+		$r = 0;
 
-        $this->const[$r][0] = "FICHEINTER_ADDON_PDF";
-        $this->const[$r][1] = "chaine";
-        $this->const[$r][2] = "soleil";
-        $r++;
+		$this->const[$r][0] = "FICHEINTER_ADDON_PDF";
+		$this->const[$r][1] = "chaine";
+		$this->const[$r][2] = "soleil";
+		$r++;
 
-        $this->const[$r][0] = "FICHEINTER_ADDON";
-        $this->const[$r][1] = "chaine";
-        $this->const[$r][2] = "pacific";
-        $r++;
+		$this->const[$r][0] = "FICHEINTER_ADDON";
+		$this->const[$r][1] = "chaine";
+		$this->const[$r][2] = "pacific";
+		$r++;
 
-        // Boxes
-        $this->boxes = array(0=>array('file'=>'box_ficheinter.php', 'enabledbydefaulton'=>'Home'));
+		// Boxes
+		$this->boxes = array(0=>array('file'=>'box_ficheinter.php', 'enabledbydefaulton'=>'Home'));
 
-        // Permissions
-        $this->rights = array();
-        $this->rights_class = 'ficheinter';
-        $r = 0;
+		// Permissions
+		$this->rights = array();
+		$this->rights_class = 'ficheinter';
+		$r = 0;
 
-        $r++;
-        $this->rights[$r][0] = 61;
-        $this->rights[$r][1] = 'Lire les fiches d\'intervention';
-        $this->rights[$r][2] = 'r';
-        $this->rights[$r][3] = 0;
-        $this->rights[$r][4] = 'lire';
+		$r++;
+		$this->rights[$r][0] = 61;
+		$this->rights[$r][1] = 'Lire les fiches d\'intervention';
+		$this->rights[$r][2] = 'r';
+		$this->rights[$r][3] = 0;
+		$this->rights[$r][4] = 'lire';
 
-        $r++;
-        $this->rights[$r][0] = 62;
-        $this->rights[$r][1] = 'Creer/modifier les fiches d\'intervention';
-        $this->rights[$r][2] = 'w';
-        $this->rights[$r][3] = 0;
-        $this->rights[$r][4] = 'creer';
+		$r++;
+		$this->rights[$r][0] = 62;
+		$this->rights[$r][1] = 'Creer/modifier les fiches d\'intervention';
+		$this->rights[$r][2] = 'w';
+		$this->rights[$r][3] = 0;
+		$this->rights[$r][4] = 'creer';
 
-        $r++;
-        $this->rights[$r][0] = 64;
-        $this->rights[$r][1] = 'Supprimer les fiches d\'intervention';
-        $this->rights[$r][2] = 'd';
-        $this->rights[$r][3] = 0;
-        $this->rights[$r][4] = 'supprimer';
+		$r++;
+		$this->rights[$r][0] = 64;
+		$this->rights[$r][1] = 'Supprimer les fiches d\'intervention';
+		$this->rights[$r][2] = 'd';
+		$this->rights[$r][3] = 0;
+		$this->rights[$r][4] = 'supprimer';
 
-        $r++;
-        $this->rights[$r][0] = 67;
-        $this->rights[$r][1] = 'Exporter les fiches interventions';
-        $this->rights[$r][2] = 'r';
-        $this->rights[$r][3] = 0;
-        $this->rights[$r][4] = 'export';
+		$r++;
+		$this->rights[$r][0] = 67;
+		$this->rights[$r][1] = 'Exporter les fiches interventions';
+		$this->rights[$r][2] = 'r';
+		$this->rights[$r][3] = 0;
+		$this->rights[$r][4] = 'export';
 
-        $r++;
-        $this->rights[$r][0] = 68;
-        $this->rights[$r][1] = 'Envoyer les fiches d\'intervention par courriel';
-        $this->rights[$r][2] = 'r';
-        $this->rights[$r][3] = 0;
-        $this->rights[$r][4] = 'ficheinter_advance'; // Visible if option MAIN_USE_ADVANCED_PERMS is on
-        $this->rights[$r][5] = 'send';
+		$r++;
+		$this->rights[$r][0] = 68;
+		$this->rights[$r][1] = 'Envoyer les fiches d\'intervention par courriel';
+		$this->rights[$r][2] = 'r';
+		$this->rights[$r][3] = 0;
+		$this->rights[$r][4] = 'ficheinter_advance'; // Visible if option MAIN_USE_ADVANCED_PERMS is on
+		$this->rights[$r][5] = 'send';
 
-        $r++;
-        $this->rights[$r][0] = 69;
-        $this->rights[$r][1] = 'Valider les fiches d\'intervention ';
-        $this->rights[$r][2] = 'a';
-        $this->rights[$r][3] = 0;
-        $this->rights[$r][4] = 'ficheinter_advance'; // Visible if option MAIN_USE_ADVANCED_PERMS is on
-        $this->rights[$r][5] = 'validate';
+		$r++;
+		$this->rights[$r][0] = 69;
+		$this->rights[$r][1] = 'Valider les fiches d\'intervention ';
+		$this->rights[$r][2] = 'a';
+		$this->rights[$r][3] = 0;
+		$this->rights[$r][4] = 'ficheinter_advance'; // Visible if option MAIN_USE_ADVANCED_PERMS is on
+		$this->rights[$r][5] = 'validate';
 
-        $r++;
-        $this->rights[$r][0] = 70;
-        $this->rights[$r][1] = 'Dévalider les fiches d\'intervention';
-        $this->rights[$r][2] = 'a';
-        $this->rights[$r][3] = 0;
-        $this->rights[$r][4] = 'ficheinter_advance'; // Visible if option MAIN_USE_ADVANCED_PERMS is on
-        $this->rights[$r][5] = 'unvalidate';
+		$r++;
+		$this->rights[$r][0] = 70;
+		$this->rights[$r][1] = 'Dévalider les fiches d\'intervention';
+		$this->rights[$r][2] = 'a';
+		$this->rights[$r][3] = 0;
+		$this->rights[$r][4] = 'ficheinter_advance'; // Visible if option MAIN_USE_ADVANCED_PERMS is on
+		$this->rights[$r][5] = 'unvalidate';
 
 
-        // Menus
-        //-------
-        $this->menu = 1; // This module add menu entries. They are coded into menu manager.
+		// Menus
+		//-------
+		$this->menu = 1; // This module add menu entries. They are coded into menu manager.
 
 
-        //Exports
-        //--------
-        $r = 1;
+		//Exports
+		//--------
+		$r = 1;
 
-        $this->export_code[$r] = $this->rights_class.'_'.$r;
-        $this->export_label[$r] = 'InterventionCardsAndInterventionLines'; // Translation key (used only if key ExportDataset_xxx_z not found)
-        $this->export_permission[$r] = array(array("ficheinter", "export"));
-        $this->export_fields_array[$r] = array(
+		$this->export_code[$r] = $this->rights_class.'_'.$r;
+		$this->export_label[$r] = 'InterventionCardsAndInterventionLines'; // Translation key (used only if key ExportDataset_xxx_z not found)
+		$this->export_permission[$r] = array(array("ficheinter", "export"));
+		$this->export_fields_array[$r] = array(
 			's.rowid'=>"IdCompany", 's.nom'=>'CompanyName', 's.address'=>'Address', 's.zip'=>'Zip', 's.town'=>'Town', 's.fk_pays'=>'Country', 's.phone'=>'Phone',
 			's.siren'=>'ProfId1', 's.siret'=>'ProfId2', 's.ape'=>'ProfId3', 's.idprof4'=>'ProfId4', 's.code_compta'=>'CustomerAccountancyCode',
 			's.code_compta_fournisseur'=>'SupplierAccountancyCode', 'f.rowid'=>"InterId", 'f.ref'=>"InterRef", 'f.datec'=>"InterDateCreation",
 			'f.duree'=>"InterDuration", 'f.fk_statut'=>'InterStatus', 'f.description'=>"InterNote");
-        $keyforselect = 'fichinter'; $keyforelement = 'intervention'; $keyforaliasextra = 'extra';
-        include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
-        $this->export_fields_array[$r] += array(
-        	'pj.ref'=>'ProjectRef', 'pj.title'=>'ProjectLabel',
-        	'fd.rowid'=>'InterLineId',
+		$keyforselect = 'fichinter'; $keyforelement = 'intervention'; $keyforaliasextra = 'extra';
+		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
+		$this->export_fields_array[$r] += array(
+			'pj.ref'=>'ProjectRef', 'pj.title'=>'ProjectLabel',
+			'fd.rowid'=>'InterLineId',
 			'fd.date'=>"InterLineDate", 'fd.duree'=>"InterLineDuration", 'fd.description'=>"InterLineDesc"
 		);
-        //$this->export_TypeFields_array[$r]=array(
+		//$this->export_TypeFields_array[$r]=array(
 		//	's.rowid'=>"List:societe:nom",'s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','s.fk_pays'=>'List:c_country:label',
 		//	's.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','s.code_compta'=>'Text',
 		//	's.code_compta_fournisseur'=>'Text','f.ref'=>"Text",'f.datec'=>"Date",'f.duree'=>"Duree",'f.fk_statut'=>'Statut','f.description'=>"Text",
 		//	'f.datee'=>"Date",'f.dateo'=>"Date",'f.fulldayevent'=>"Boolean",'fd.date'=>"Date",'fd.duree'=>"Duree",'fd.description'=>"Text",
 		//	'fd.total_ht'=>"Numeric"
 		//);
-        $this->export_TypeFields_array[$r] = array(
-        	's.rowid'=>"Numeric", 's.nom'=>'Text', 's.address'=>'Text', 's.zip'=>'Text', 's.town'=>'Text', 's.fk_pays'=>'List:c_country:label', 's.phone'=>'Text', 's.siren'=>'Text',
+		$this->export_TypeFields_array[$r] = array(
+			's.rowid'=>"Numeric", 's.nom'=>'Text', 's.address'=>'Text', 's.zip'=>'Text', 's.town'=>'Text', 's.fk_pays'=>'List:c_country:label', 's.phone'=>'Text', 's.siren'=>'Text',
 			's.siret'=>'Text', 's.ape'=>'Text', 's.idprof4'=>'Text', 's.code_compta'=>'Text', 's.code_compta_fournisseur'=>'Text',
-        	'f.rowid'=>'Numeric', 'f.ref'=>"Text", 'f.datec'=>"Date",
+			'f.rowid'=>'Numeric', 'f.ref'=>"Text", 'f.datec'=>"Date",
 			'f.duree'=>"Duree", 'f.fk_statut'=>'Numeric', 'f.description'=>"Text", 'f.datee'=>"Date", 'f.dateo'=>"Date", 'f.fulldayevent'=>"Boolean",
-        	'pj.ref'=>'Text', 'pj.title'=>'Text',
-        	'fd.rowid'=>"Numeric", 'fd.date'=>"Date", 'fd.duree'=>"Duree", 'fd.description'=>"Text", 'fd.total_ht'=>"Numeric"
+			'pj.ref'=>'Text', 'pj.title'=>'Text',
+			'fd.rowid'=>"Numeric", 'fd.date'=>"Date", 'fd.duree'=>"Duree", 'fd.description'=>"Text", 'fd.total_ht'=>"Numeric"
 		);
-        $this->export_entities_array[$r] = array(
+		$this->export_entities_array[$r] = array(
 			's.rowid'=>"company", 's.nom'=>'company', 's.address'=>'company', 's.zip'=>'company', 's.town'=>'company', 's.fk_pays'=>'company', 's.phone'=>'company',
 			's.siren'=>'company', 's.siret'=>'company', 's.ape'=>'company', 's.idprof4'=>'company', 's.code_compta'=>'company',
 			's.code_compta_fournisseur'=>'company', 'f.rowid'=>"intervention", 'f.ref'=>"intervention", 'f.datec'=>"intervention", 'f.duree'=>"intervention",
-        	'f.fk_statut'=>"intervention", 'f.description'=>"intervention", 'pj.ref'=>'project', 'pj.title'=>'project', 'fd.rowid'=>"inter_line", 'fd.date'=>"inter_line",
+			'f.fk_statut'=>"intervention", 'f.description'=>"intervention", 'pj.ref'=>'project', 'pj.title'=>'project', 'fd.rowid'=>"inter_line", 'fd.date'=>"inter_line",
 			'fd.duree'=>'inter_line', 'fd.description'=>'inter_line'
 		);
-        $this->export_dependencies_array[$r] = array('inter_line'=>'fd.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
-        $keyforselect = 'fichinterdet'; $keyforelement = 'inter_line'; $keyforaliasextra = 'extradet';
-        include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
+		$this->export_dependencies_array[$r] = array('inter_line'=>'fd.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
+		$keyforselect = 'fichinterdet'; $keyforelement = 'inter_line'; $keyforaliasextra = 'extradet';
+		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
 
-        $this->export_sql_start[$r] = 'SELECT DISTINCT ';
-        $this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'fichinter as f';
-        $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'fichinter_extrafields as extra ON f.rowid = extra.fk_object';
-        $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'projet as pj ON f.fk_projet = pj.rowid';
-        $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'fichinterdet as fd ON f.rowid = fd.fk_fichinter';
-        $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'fichinterdet_extrafields as extradet ON fd.rowid = extradet.fk_object,';
-        $this->export_sql_end[$r] .= ' '.MAIN_DB_PREFIX.'societe as s';
-        $this->export_sql_end[$r] .= ' WHERE f.fk_soc = s.rowid';
-        $this->export_sql_end[$r] .= ' AND f.entity IN ('.getEntity('intervention').')';
-        $r++;
-    }
+		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
+		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'fichinter as f';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'fichinter_extrafields as extra ON f.rowid = extra.fk_object';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'projet as pj ON f.fk_projet = pj.rowid';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'fichinterdet as fd ON f.rowid = fd.fk_fichinter';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'fichinterdet_extrafields as extradet ON fd.rowid = extradet.fk_object,';
+		$this->export_sql_end[$r] .= ' '.MAIN_DB_PREFIX.'societe as s';
+		$this->export_sql_end[$r] .= ' WHERE f.fk_soc = s.rowid';
+		$this->export_sql_end[$r] .= ' AND f.entity IN ('.getEntity('intervention').')';
+		$r++;
+	}
 
 
-    /**
+	/**
 	 *  Function called when module is enabled.
 	 *  The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
 	 *  It also creates data directories
 	 *
-     *  @param      string	$options    Options when enabling module ('', 'noboxes')
-     *  @return     int             	1 if OK, 0 if KO
-     */
-    public function init($options = '')
-    {
-        global $conf;
+	 *  @param      string	$options    Options when enabling module ('', 'noboxes')
+	 *  @return     int             	1 if OK, 0 if KO
+	 */
+	public function init($options = '')
+	{
+		global $conf;
 
-        // Permissions
-        $this->remove($options);
+		// Permissions
+		$this->remove($options);
 
-        $sql = array(
+		$sql = array(
 			 "DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape($this->const[0][2])."' AND type = 'ficheinter' AND entity = ".$conf->entity,
 			 "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[0][2])."','ficheinter',".$conf->entity.")",
-        );
+		);
 
-        return $this->_init($sql, $options);
-    }
+		return $this->_init($sql, $options);
+	}
 }
diff --git a/htdocs/core/modules/modFournisseur.class.php b/htdocs/core/modules/modFournisseur.class.php
index 71b66925922..d39d67775f5 100644
--- a/htdocs/core/modules/modFournisseur.class.php
+++ b/htdocs/core/modules/modFournisseur.class.php
@@ -830,12 +830,12 @@ class modFournisseur extends DolibarrModules
 
 		//Import Purchase Orders
 		$r++;
-		$this->import_code[$r] = 'commande_fournisseur_' . $r;
+		$this->import_code[$r] = 'commande_fournisseur_'.$r;
 		$this->import_label[$r] = 'Purchase Orders';
 		$this->import_icon[$r] = $this->picto;
 		$this->import_entities_array[$r] = [];
-		$this->import_tables_array[$r] = ['c' => MAIN_DB_PREFIX . 'commande_fournisseur', 'extra' => MAIN_DB_PREFIX . 'commande_fournisseur_extrafields'];
-		$this->import_tables_creator_array[$r] = ['c' => 'fk_user_author'];	// Fields to store import user id
+		$this->import_tables_array[$r] = ['c' => MAIN_DB_PREFIX.'commande_fournisseur', 'extra' => MAIN_DB_PREFIX.'commande_fournisseur_extrafields'];
+		$this->import_tables_creator_array[$r] = ['c' => 'fk_user_author']; // Fields to store import user id
 		$this->import_fields_array[$r] = [
 			'c.ref'               => 'Document Ref*',
 			'c.ref_supplier'      => 'RefSupplier',
@@ -863,7 +863,7 @@ class modFournisseur extends DolibarrModules
 			'c.model_pdf'         => 'Model'
 		];
 
-		if (! empty($conf->multicurrency->enabled)) {
+		if (!empty($conf->multicurrency->enabled)) {
 			$this->import_fields_array[$r]['c.multicurrency_code']      = 'Currency';
 			$this->import_fields_array[$r]['c.multicurrency_tx']        = 'CurrencyRate';
 			$this->import_fields_array[$r]['c.multicurrency_total_ht']  = 'MulticurrencyAmountHT';
@@ -873,23 +873,23 @@ class modFournisseur extends DolibarrModules
 
 		// Add extra fields
 		$import_extrafield_sample = [];
-		$sql = "SELECT name, label, fieldrequired FROM " . MAIN_DB_PREFIX . "extrafields WHERE elementtype = 'commande_fournisseur' AND entity IN (0, " . $conf->entity . ")";
+		$sql = "SELECT name, label, fieldrequired FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'commande_fournisseur' AND entity IN (0, ".$conf->entity.")";
 		$resql = $this->db->query($sql);
 
 		if ($resql) {
 			while ($obj = $this->db->fetch_object($resql)) {
-				$fieldname = 'extra.' . $obj->name;
+				$fieldname = 'extra.'.$obj->name;
 				$fieldlabel = ucfirst($obj->label);
-				$this->import_fields_array[$r][$fieldname] = $fieldlabel . ($obj->fieldrequired ? '*' : '');
+				$this->import_fields_array[$r][$fieldname] = $fieldlabel.($obj->fieldrequired ? '*' : '');
 				$import_extrafield_sample[$fieldname] = $fieldlabel;
 			}
 		}
 		// End add extra fields
 
-		$this->import_fieldshidden_array[$r] = ['extra.fk_object' => 'lastrowid-' . MAIN_DB_PREFIX . 'commande_fournisseur'];
+		$this->import_fieldshidden_array[$r] = ['extra.fk_object' => 'lastrowid-'.MAIN_DB_PREFIX.'commande_fournisseur'];
 		$this->import_regex_array[$r] = [
 			'c.ref' => '(PO\d{4}-\d{4}|PORDER.{1,32}$|PROV.{1,32}$)',
-			'c.multicurrency_code' => 'code@' . MAIN_DB_PREFIX . 'multicurrency'
+			'c.multicurrency_code' => 'code@'.MAIN_DB_PREFIX.'multicurrency'
 		];
 
 		$this->import_updatekeys_array[$r] = ['c.ref' => 'Ref'];
@@ -917,7 +917,7 @@ class modFournisseur extends DolibarrModules
 		$this->import_label[$r] = 'PO Lines';
 		$this->import_icon[$r] = $this->picto;
 		$this->import_entities_array[$r] = [];
-		$this->import_tables_array[$r] = ['cd' => MAIN_DB_PREFIX . 'commande_fournisseurdet', 'extra' => MAIN_DB_PREFIX . 'commande_fournisseurdet_extrafields'];
+		$this->import_tables_array[$r] = ['cd' => MAIN_DB_PREFIX.'commande_fournisseurdet', 'extra' => MAIN_DB_PREFIX.'commande_fournisseurdet_extrafields'];
 		$this->import_fields_array[$r] = [
 			'cd.fk_commande'    => 'Document Ref*',
 			'cd.fk_parent_line' => 'PrParentLine',
@@ -941,7 +941,7 @@ class modFournisseur extends DolibarrModules
 			'cd.fk_unit'        => 'Unit'
 		];
 
-		if (! empty($conf->multicurrency->enabled)) {
+		if (!empty($conf->multicurrency->enabled)) {
 			$this->import_fields_array[$r]['cd.multicurrency_code'] = 'Currency';
 			$this->import_fields_array[$r]['cd.multicurrency_subprice'] = 'CurrencyRate';
 			$this->import_fields_array[$r]['cd.multicurrency_total_ht'] = 'MulticurrencyAmountHT';
@@ -950,22 +950,22 @@ class modFournisseur extends DolibarrModules
 		}
 
 		// Add extra fields
-		$sql="SELECT name, label, fieldrequired FROM " . MAIN_DB_PREFIX . "extrafields WHERE elementtype = 'commande_fournisseurdet' AND entity IN (0, " . $conf->entity . ")";
+		$sql = "SELECT name, label, fieldrequired FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'commande_fournisseurdet' AND entity IN (0, ".$conf->entity.")";
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			while ($obj = $this->db->fetch_object($resql)) {
-				$fieldname = 'extra.' . $obj->name;
+				$fieldname = 'extra.'.$obj->name;
 				$fieldlabel = ucfirst($obj->label);
-				$this->import_fields_array[$r][$fieldname] = $fieldlabel . ($obj->fieldrequired ? '*' : '');
+				$this->import_fields_array[$r][$fieldname] = $fieldlabel.($obj->fieldrequired ? '*' : '');
 			}
 		}
 		// End add extra fields
 
-		$this->import_fieldshidden_array[$r] = ['extra.fk_object' => 'lastrowid-' . MAIN_DB_PREFIX . 'commande_fournisseurdet'];
+		$this->import_fieldshidden_array[$r] = ['extra.fk_object' => 'lastrowid-'.MAIN_DB_PREFIX.'commande_fournisseurdet'];
 		$this->import_regex_array[$r] = [
 			'cd.product_type'       => '[0|1]$',
-			'cd.fk_product'         => 'rowid@' . MAIN_DB_PREFIX . 'product',
-			'cd.multicurrency_code' => 'code@' . MAIN_DB_PREFIX . 'multicurrency'
+			'cd.fk_product'         => 'rowid@'.MAIN_DB_PREFIX.'product',
+			'cd.multicurrency_code' => 'code@'.MAIN_DB_PREFIX.'multicurrency'
 		];
 		$this->import_updatekeys_array[$r] = ['cd.fk_commande' => 'Purchase Order Id'];
 		$this->import_convertvalue_array[$r] = [
diff --git a/htdocs/core/modules/modIncoterm.class.php b/htdocs/core/modules/modIncoterm.class.php
index d8a6186be94..70e6c738801 100644
--- a/htdocs/core/modules/modIncoterm.class.php
+++ b/htdocs/core/modules/modIncoterm.class.php
@@ -37,11 +37,11 @@ class modIncoterm extends DolibarrModules
 	 *
 	 *   @param      DoliDB		$db      Database handler
 	 */
-    public function __construct($db)
-    {
-        global $langs, $conf;
+	public function __construct($db)
+	{
+		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).
@@ -76,28 +76,28 @@ class modIncoterm extends DolibarrModules
 			array('INCOTERM_ACTIVATE', 'chaine', 0, 'Description de INCOTERM_ACTIVATE')
 		);
 
-        $this->tabs = array();
+		$this->tabs = array();
 
-        // Dictionaries
+		// Dictionaries
 		if (!isset($conf->incoterm->enabled))
-        {
-        	$conf->incoterm = new stdClass();
-        	$conf->incoterm->enabled = 0;
-        }
+		{
+			$conf->incoterm = new stdClass();
+			$conf->incoterm->enabled = 0;
+		}
 		$this->dictionaries = array(
 			'langs'=>'incoterm',
-            'tabname'=>array(MAIN_DB_PREFIX."c_incoterms"), // List of tables we want to see into dictonnary editor
-            'tablib'=>array("Incoterms"), // Label of tables
-            'tabsql'=>array('SELECT rowid, code, libelle, active FROM '.MAIN_DB_PREFIX.'c_incoterms'), // Request to select fields
-            'tabsqlsort'=>array("rowid ASC"), // Sort order
-            'tabfield'=>array("code,libelle"), // List of fields (result of select to show dictionary)
-            'tabfieldvalue'=>array("code,libelle"), // List of fields (list of fields to edit a record)
-            'tabfieldinsert'=>array("code,libelle"), // List of fields (list of fields for insert)
-            'tabrowid'=>array("rowid"), // Name of columns with primary key (try to always name it 'rowid')
-            'tabcond'=>array($conf->incoterm->enabled)
+			'tabname'=>array(MAIN_DB_PREFIX."c_incoterms"), // List of tables we want to see into dictonnary editor
+			'tablib'=>array("Incoterms"), // Label of tables
+			'tabsql'=>array('SELECT rowid, code, libelle, active FROM '.MAIN_DB_PREFIX.'c_incoterms'), // Request to select fields
+			'tabsqlsort'=>array("rowid ASC"), // Sort order
+			'tabfield'=>array("code,libelle"), // List of fields (result of select to show dictionary)
+			'tabfieldvalue'=>array("code,libelle"), // List of fields (list of fields to edit a record)
+			'tabfieldinsert'=>array("code,libelle"), // List of fields (list of fields for insert)
+			'tabrowid'=>array("rowid"), // Name of columns with primary key (try to always name it 'rowid')
+			'tabcond'=>array($conf->incoterm->enabled)
 		);
 
-        $this->boxes = array(); // List of boxes
+		$this->boxes = array(); // List of boxes
 		$r = 0;
 
 		// Permissions
diff --git a/htdocs/core/modules/modIntracommreport.class.php b/htdocs/core/modules/modIntracommreport.class.php
index 42e906a15f2..668cf7af875 100644
--- a/htdocs/core/modules/modIntracommreport.class.php
+++ b/htdocs/core/modules/modIntracommreport.class.php
@@ -23,7 +23,7 @@
  * 	\ingroup    Intracomm report
  *	\brief      Module to activate intracomm report module
  */
-include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
+include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
 
 
 /**
@@ -38,35 +38,35 @@ class modIntracommreport extends DolibarrModules
 	 */
 	public function __construct($db)
 	{
-        global $conf, $langs;
+		global $conf, $langs;
 
-        $this->db = $db;
-        $this->numero = 68000;
+		$this->db = $db;
+		$this->numero = 68000;
 
-        $this->family = "financial";
-        $this->module_position = '100';
-        // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
-        $this->name = preg_replace('/^mod/i', '', get_class($this));
-        $this->description = "Intracomm report management (Support for French DEB/DES format)";
+		$this->family = "financial";
+		$this->module_position = '100';
+		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+		$this->name = preg_replace('/^mod/i', '', get_class($this));
+		$this->description = "Intracomm report management (Support for French DEB/DES format)";
 
-        // Possible values for version are: 'development', 'experimental', 'dolibarr' or 'dolibarr_deprecated' or version
-        $this->version = 'development';
+		// Possible values for version are: 'development', 'experimental', 'dolibarr' or 'dolibarr_deprecated' or version
+		$this->version = 'development';
 
-        $this->const_name = 'MAIN_MODULE_' . strtoupper($this->name);
-        $this->picto = 'intracommreport';
+		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+		$this->picto = 'intracommreport';
 
-        // Data directories to create when module is enabled
-        $this->dirs = array('/intracommreport/temp');
+		// Data directories to create when module is enabled
+		$this->dirs = array('/intracommreport/temp');
 
-        // Config pages
-        $this->config_page_url = array("intracommreport.php@intracommreport");
+		// Config pages
+		$this->config_page_url = array("intracommreport.php@intracommreport");
 
 		// Dependencies
-		$this->depends = array("modFacture","modTax");  // List of modules id that must be enabled if this module is enabled
-		$this->requiredby = array();                    // List of modules id to disable if this one is disabled
-		$this->conflictwith = array();                  // List of modules id this module is in conflict with
-		$this->phpmin = array(5,5);                     // Minimum version of PHP required by module
-		$this->need_dolibarr_version = array(13, 0, -5);     // Minimum version of Dolibarr required by module
+		$this->depends = array("modFacture", "modTax"); // List of modules id that must be enabled if this module is enabled
+		$this->requiredby = array(); // List of modules id to disable if this one is disabled
+		$this->conflictwith = array(); // List of modules id this module is in conflict with
+		$this->phpmin = array(5, 5); // Minimum version of PHP required by module
+		$this->need_dolibarr_version = array(13, 0, -5); // Minimum version of Dolibarr required by module
 		$this->langfiles = array("intracommreport");
 
 		// Constants
@@ -76,54 +76,54 @@ class modIntracommreport extends DolibarrModules
 		// );
 		$this->const = array();
 
-        // Tabs
-        $this->tabs = array();
+		// Tabs
+		$this->tabs = array();
 
-        // Css
-        $this->module_parts = array();
+		// Css
+		$this->module_parts = array();
 
-        // Boxes
-        $this->boxes = array();
+		// Boxes
+		$this->boxes = array();
 
-        // Dictionaries
-	    if (! isset($conf->intracommreport->enabled))
-        {
-        	$conf->intracommreport=new stdClass();
-        	$conf->intracommreport->enabled=0;
-        }
-		$this->dictionaries=array();
+		// Dictionaries
+		if (!isset($conf->intracommreport->enabled))
+		{
+			$conf->intracommreport = new stdClass();
+			$conf->intracommreport->enabled = 0;
+		}
+		$this->dictionaries = array();
 
-        // Permissions
+		// Permissions
 		$this->rights = array();
 		$this->rights_class = 'intracommreport';
-        $r = 0;
-
-        $r++;
-        $this->rights[$r][0] = 68001;
-        $this->rights[$r][1] = 'Read intracomm report';
-        $this->rights[$r][2] = 'r';
-        $this->rights[$r][3] = 0;
-        $this->rights[$r][4] = 'read';
-
-        $r++;
-        $this->rights[$r][0] = 68002;
-        $this->rights[$r][1] = 'Create/modify intracomm report';
-        $this->rights[$r][2] = 'w';
-        $this->rights[$r][3] = 0;
-        $this->rights[$r][4] = 'write';
+		$r = 0;
 
 		$r++;
-        $this->rights[$r][0] = 68004;
-        $this->rights[$r][1] = 'Delete intracomm report';
-        $this->rights[$r][2] = 'd';
-        $this->rights[$r][3] = 0;
-        $this->rights[$r][4] = 'delete';
+		$this->rights[$r][0] = 68001;
+		$this->rights[$r][1] = 'Read intracomm report';
+		$this->rights[$r][2] = 'r';
+		$this->rights[$r][3] = 0;
+		$this->rights[$r][4] = 'read';
+
+		$r++;
+		$this->rights[$r][0] = 68002;
+		$this->rights[$r][1] = 'Create/modify intracomm report';
+		$this->rights[$r][2] = 'w';
+		$this->rights[$r][3] = 0;
+		$this->rights[$r][4] = 'write';
+
+		$r++;
+		$this->rights[$r][0] = 68004;
+		$this->rights[$r][1] = 'Delete intracomm report';
+		$this->rights[$r][2] = 'd';
+		$this->rights[$r][3] = 0;
+		$this->rights[$r][4] = 'delete';
 
 		// Main menu entries
-		$this->menu = array();			// List of menus to add
-		$r=0;
+		$this->menu = array(); // List of menus to add
+		$r = 0;
 
 		// Exports
-		$r=1;
+		$r = 1;
 	}
 }
diff --git a/htdocs/core/modules/modLabel.class.php b/htdocs/core/modules/modLabel.class.php
index 78ed97cd295..88e044f0444 100644
--- a/htdocs/core/modules/modLabel.class.php
+++ b/htdocs/core/modules/modLabel.class.php
@@ -97,16 +97,16 @@ class modLabel 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 = '')
-    {
+	public function init($options = '')
+	{
 		// Permissions
 		$this->remove($options);
 
 		$sql = array();
 
 		return $this->_init($sql, $options);
-    }
+	}
 }
diff --git a/htdocs/core/modules/modLoan.class.php b/htdocs/core/modules/modLoan.class.php
index b1adf99940b..c29658ae0a7 100644
--- a/htdocs/core/modules/modLoan.class.php
+++ b/htdocs/core/modules/modLoan.class.php
@@ -153,7 +153,7 @@ class modLoan 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/modMailing.class.php b/htdocs/core/modules/modMailing.class.php
index 3f410a1e3f2..22cc75689a5 100644
--- a/htdocs/core/modules/modMailing.class.php
+++ b/htdocs/core/modules/modMailing.class.php
@@ -146,7 +146,7 @@ class modMailing 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/modModuleBuilder.class.php b/htdocs/core/modules/modModuleBuilder.class.php
index 6f4af44ee1e..6060186a746 100644
--- a/htdocs/core/modules/modModuleBuilder.class.php
+++ b/htdocs/core/modules/modModuleBuilder.class.php
@@ -30,89 +30,89 @@ include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
  */
 class modModuleBuilder extends DolibarrModules
 {
-    /**
+	/**
 	 *   Constructor. Define names, constants, directories, boxes, permissions
 	 *
 	 *   @param      DoliDB		$db      Database handler
-     */
-    public function __construct($db)
-    {
-    	global $langs, $conf;
+	 */
+	public function __construct($db)
+	{
+		global $langs, $conf;
 
-        $this->db = $db;
-        $this->numero = 3300;
+		$this->db = $db;
+		$this->numero = 3300;
 
 		// Family can be 'crm','financial','hr','projects','products','ecm','technic','other'
 		// It is used to group modules in module setup page
-        $this->family = "technic";
-        $this->module_position = '90';
-        // 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 = "A RAD (Rapid Application Development) tool to help developers to build their own module.";
+		$this->family = "technic";
+		$this->module_position = '90';
+		// 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 = "A RAD (Rapid Application Development) tool to help developers to build their own module.";
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
-        $this->version = 'dolibarr';
-        // Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
-        $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-        // Name of image file used for this module.
-        $this->picto = 'bug';
+		$this->version = 'dolibarr';
+		// Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
+		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+		// Name of image file used for this module.
+		$this->picto = 'bug';
 
-        // Data directories to create when module is enabled
-        $this->dirs = array();
+		// Data directories to create when module is enabled
+		$this->dirs = array();
 
-        // Config pages
-        //-------------
-        $this->config_page_url = array('setup.php@modulebuilder');
+		// Config pages
+		//-------------
+		$this->config_page_url = array('setup.php@modulebuilder');
 
-        // Dependencies
-        //-------------
-	    $this->hidden = false; // A condition to disable module
-	    $this->depends = array(); // List of modules id that must be enabled if this module is enabled
-        $this->requiredby = array(); // List of modules id to disable if this one is disabled
-	    $this->conflictwith = array(); // List of modules id this module is in conflict with
-        $this->langfiles = array();
+		// Dependencies
+		//-------------
+		$this->hidden = false; // A condition to disable module
+		$this->depends = array(); // List of modules id that must be enabled if this module is enabled
+		$this->requiredby = array(); // List of modules id to disable if this one is disabled
+		$this->conflictwith = array(); // List of modules id this module is in conflict with
+		$this->langfiles = array();
 
-        // Constants
-        //-----------
+		// Constants
+		//-----------
 
 
-        // New pages on tabs
-        // -----------------
-        $this->tabs = array();
+		// New pages on tabs
+		// -----------------
+		$this->tabs = array();
 
-        // Boxes
-        //------
-        $this->boxes = array();
+		// Boxes
+		//------
+		$this->boxes = array();
 
-        // Permissions
-        //------------
-        $this->rights = array(); // Permission array used by this module
-        $this->rights_class = 'modulebuilder';
+		// Permissions
+		//------------
+		$this->rights = array(); // Permission array used by this module
+		$this->rights_class = 'modulebuilder';
 
-        $r = 0;
+		$r = 0;
 
-        $r++;
-        $this->rights[$r][0] = 3301;
-        $this->rights[$r][1] = 'Generate new modules';
-        $this->rights[$r][2] = 'a';
-        $this->rights[$r][3] = 0;
-        $this->rights[$r][4] = 'run';
+		$r++;
+		$this->rights[$r][0] = 3301;
+		$this->rights[$r][1] = 'Generate new modules';
+		$this->rights[$r][2] = 'a';
+		$this->rights[$r][3] = 0;
+		$this->rights[$r][4] = 'run';
 
 
-        // Main menu entries
-        //------------------
-        $this->menu = array();
+		// Main menu entries
+		//------------------
+		$this->menu = array();
 
-        $this->menu[$r] = array('fk_menu'=>'fk_mainmenu=home,fk_leftmenu=admintools',
-            'type'=>'left',
-            'titre'=>'ModuleBuilder',
-            'mainmenu'=>'home',
-            'leftmenu'=>'admintools_modulebuilder',
-            'url'=>'/modulebuilder/index.php?mainmenu=home&amp;leftmenu=admintools',
-            'langs'=>'modulebuilder',
-            'position'=>100,
-            'perms'=>'1',
-            'enabled'=>'$conf->modulebuilder->enabled && preg_match(\'/^(admintools|all)/\',$leftmenu) && ($user->admin || $conf->global->MODULEBUILDER_FOREVERYONE)',
-            'target'=>'_modulebuilder',
-            'user'=>0);
-    }
+		$this->menu[$r] = array('fk_menu'=>'fk_mainmenu=home,fk_leftmenu=admintools',
+			'type'=>'left',
+			'titre'=>'ModuleBuilder',
+			'mainmenu'=>'home',
+			'leftmenu'=>'admintools_modulebuilder',
+			'url'=>'/modulebuilder/index.php?mainmenu=home&amp;leftmenu=admintools',
+			'langs'=>'modulebuilder',
+			'position'=>100,
+			'perms'=>'1',
+			'enabled'=>'$conf->modulebuilder->enabled && preg_match(\'/^(admintools|all)/\',$leftmenu) && ($user->admin || $conf->global->MODULEBUILDER_FOREVERYONE)',
+			'target'=>'_modulebuilder',
+			'user'=>0);
+	}
 }
diff --git a/htdocs/core/modules/modMultiCurrency.class.php b/htdocs/core/modules/modMultiCurrency.class.php
index 47788fa44c8..605276dee0e 100644
--- a/htdocs/core/modules/modMultiCurrency.class.php
+++ b/htdocs/core/modules/modMultiCurrency.class.php
@@ -38,11 +38,11 @@ class modMultiCurrency extends DolibarrModules
 	 *
 	 * @param DoliDB $db Database handler
 	 */
-    public function __construct($db)
-    {
-        global $langs, $conf;
+	public function __construct($db)
+	{
+		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).
@@ -101,8 +101,8 @@ class modMultiCurrency extends DolibarrModules
 
 		// Array to add new pages in new tabs
 		// Example: $this->tabs = array('objecttype:+tabname1:Title1:mylangfile@multicurrency:$user->rights->multicurrency->read:/multicurrency/mynewtab1.php?id=__ID__',  					// To add a new tab identified by code tabname1
-        //                              'objecttype:+tabname2:SUBSTITUTION_Title2:mylangfile@multicurrency:$user->rights->othermodule->read:/multicurrency/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.
-        //                              'objecttype:-tabname:NU:conditiontoremove');                                                     										// To remove an existing tab identified by code tabname
+		//                              'objecttype:+tabname2:SUBSTITUTION_Title2:mylangfile@multicurrency:$user->rights->othermodule->read:/multicurrency/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.
+		//                              '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
@@ -123,16 +123,16 @@ class modMultiCurrency extends DolibarrModules
 		// 'stock'            to add a tab in stock view
 		// 'thirdparty'       to add a tab in third party view
 		// 'user'             to add a tab in user view
-        $this->tabs = array();
+		$this->tabs = array();
 
-        // Dictionaries
-	    if (!isset($conf->multicurrency->enabled))
-        {
-        	$conf->multicurrency = new stdClass();
-        	$conf->multicurrency->enabled = 0;
-        }
+		// Dictionaries
+		if (!isset($conf->multicurrency->enabled))
+		{
+			$conf->multicurrency = new stdClass();
+			$conf->multicurrency->enabled = 0;
+		}
 		$this->dictionaries = array();
-        /* Example:
+		/* Example:
         if (! isset($conf->multicurrency->enabled)) $conf->multicurrency->enabled=0;	// This is to avoid warnings
         $this->dictionaries=array(
             'langs'=>'mylangfile@multicurrency',
@@ -149,9 +149,9 @@ class modMultiCurrency extends DolibarrModules
         );
         */
 
-        // Boxes
+		// Boxes
 		// Add here list of php file(s) stored in core/boxes that contains class to show a box.
-        $this->boxes = array(); // List of boxes
+		$this->boxes = array(); // List of boxes
 		// Example:
 		//$this->boxes=array(
 		//    0=>array('file'=>'myboxa.php@multicurrency','note'=>'','enabledbydefaulton'=>'Home'),
@@ -215,8 +215,8 @@ class modMultiCurrency extends DolibarrModules
 		// Example:
 		// $this->export_code[$r]=$this->rights_class.'_'.$r;
 		// $this->export_label[$r]='MyModule';	// Translation key (used only if key ExportDataset_xxx_z not found)
-        // $this->export_enabled[$r]='1';                               // Condition to show export in list (ie: '$user->id==3'). Set to 1 to always show when module is enabled.
-        // $this->export_icon[$r]='generic:MyModule';
+		// $this->export_enabled[$r]='1';                               // Condition to show export in list (ie: '$user->id==3'). Set to 1 to always show when module is enabled.
+		// $this->export_icon[$r]='generic:MyModule';
 		// $this->export_permission[$r]=array(array("multicurrency","level1","level2"));
 		// $this->export_fields_array[$r]=array(
 		//	's.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','s.fk_pays'=>'Country','s.phone'=>'Phone',
@@ -259,7 +259,7 @@ class modMultiCurrency 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/modNotification.class.php b/htdocs/core/modules/modNotification.class.php
index ecd66168c8f..dbc355ce53e 100644
--- a/htdocs/core/modules/modNotification.class.php
+++ b/htdocs/core/modules/modNotification.class.php
@@ -49,9 +49,9 @@ class modNotification extends DolibarrModules
 		// 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 = "EMail notifications (push) on business Dolibarr events";
-        $this->descriptionlong = 'Module600Long';
+		$this->descriptionlong = 'Module600Long';
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
-        $this->version = 'dolibarr';
+		$this->version = 'dolibarr';
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
 		$this->picto = 'email';
 
@@ -86,7 +86,7 @@ class modNotification 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/modOauth.class.php b/htdocs/core/modules/modOauth.class.php
index a118ab672bf..48c31b15d24 100644
--- a/htdocs/core/modules/modOauth.class.php
+++ b/htdocs/core/modules/modOauth.class.php
@@ -35,110 +35,110 @@ include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
 class modOauth extends DolibarrModules
 {
 
-    /**
-     *  Constructor
-     *
-     *  @param      DoliDB      $db      Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-        $this->numero = 66000;
-        // Family can be 'crm','financial','hr','projects','products','ecm','technic','other'
-        // It is used to group modules in module setup page
-        $this->family = "interface";
-        $this->module_position = '31';
-        // 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));
-        // Module description, used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
-        $this->description = "Enable OAuth authentication";
-        // Possible values for version are: 'development', 'experimental', 'dolibarr' or 'dolibarr_deprecated' or version
-        $this->version = 'dolibarr';
-        $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-        // Name of image file used for this module.
-        // If file is in theme/yourtheme/img directory under name object_pictovalue.png, use this->picto='pictovalue'
-        // If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module'
-        $this->picto = 'technic';
+	/**
+	 *  Constructor
+	 *
+	 *  @param      DoliDB      $db      Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+		$this->numero = 66000;
+		// Family can be 'crm','financial','hr','projects','products','ecm','technic','other'
+		// It is used to group modules in module setup page
+		$this->family = "interface";
+		$this->module_position = '31';
+		// 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));
+		// Module description, used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
+		$this->description = "Enable OAuth authentication";
+		// Possible values for version are: 'development', 'experimental', 'dolibarr' or 'dolibarr_deprecated' or version
+		$this->version = 'dolibarr';
+		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+		// Name of image file used for this module.
+		// If file is in theme/yourtheme/img directory under name object_pictovalue.png, use this->picto='pictovalue'
+		// If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module'
+		$this->picto = 'technic';
 
-        // Data directories to create when module is enabled.
-        $this->dirs = array();
+		// Data directories to create when module is enabled.
+		$this->dirs = array();
 
-        // Config pages
-        $this->config_page_url = array("oauth.php");
+		// Config pages
+		$this->config_page_url = array("oauth.php");
 
-        // Dependencies
-        $this->hidden = false; // A condition to hide module
+		// Dependencies
+		$this->hidden = false; // A condition to hide module
 		$this->depends = array(); // List of module class names as string that must be enabled if this module is enabled
 		$this->requiredby = array(); // List of module ids to disable if this one is disabled
 		$this->conflictwith = array(); // List of module class names as string this module is in conflict with
 		$this->phpmin = array(5, 4); // Minimum version of PHP required by module                    // Minimum version of PHP required by module
-        $this->need_dolibarr_version = array(3, 7, -2); // Minimum version of Dolibarr required by module
-        $this->conflictwith = array();
-        $this->langfiles = array("oauth");
+		$this->need_dolibarr_version = array(3, 7, -2); // Minimum version of Dolibarr required by module
+		$this->conflictwith = array();
+		$this->langfiles = array("oauth");
 
-        // Constants
-        $this->const = array();
+		// Constants
+		$this->const = array();
 
-        // Boxes
-        $this->boxes = array();
+		// Boxes
+		$this->boxes = array();
 
-        // Permissions
-        $this->rights = array();
-        $this->rights_class = 'oauth';
+		// Permissions
+		$this->rights = array();
+		$this->rights_class = 'oauth';
 
-        $r = 0;
-        // $this->rights[$r][0]     Id permission (unique tous modules confondus)
-        // $this->rights[$r][1]     Libelle par defaut si traduction de cle "PermissionXXX" non trouvee (XXX = Id permission)
-        // $this->rights[$r][2]     Non utilise
-        // $this->rights[$r][3]     1=Permis par defaut, 0=Non permis par defaut
-        // $this->rights[$r][4]     Niveau 1 pour nommer permission dans code
-        // $this->rights[$r][5]     Niveau 2 pour nommer permission dans code
+		$r = 0;
+		// $this->rights[$r][0]     Id permission (unique tous modules confondus)
+		// $this->rights[$r][1]     Libelle par defaut si traduction de cle "PermissionXXX" non trouvee (XXX = Id permission)
+		// $this->rights[$r][2]     Non utilise
+		// $this->rights[$r][3]     1=Permis par defaut, 0=Non permis par defaut
+		// $this->rights[$r][4]     Niveau 1 pour nommer permission dans code
+		// $this->rights[$r][5]     Niveau 2 pour nommer permission dans code
 
-        /*$r++;
+		/*$r++;
         $this->rights[$r][0] = 66000;
         $this->rights[$r][1] = 'OauthAccess';
         $this->rights[$r][2] = 'r';
         $this->rights[$r][3] = 0;
         $this->rights[$r][4] = 'read';*/
 
-        // Main menu entries
-        $this->menus = array(); // List of menus to add
-        $r = 0;
+		// Main menu entries
+		$this->menus = array(); // List of menus to add
+		$r = 0;
 
-        // This is to declare the Top Menu entry:
-        //$this->menu[$r]=array(  'fk_menu'=>'fk_mainmenu=home,fk_leftmenu=admintools',               // Put 0 if this is a top menu
-        //                        'type'=>'left',                 // This is a Top menu entry
-        //                        'titre'=>'MenuOauth',
-        //                        'mainmenu'=>'oauth',
-        //                        'url'=>'/oauth/index.php',
-        //                        'langs'=>'oauth',            // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-        //                        'position'=>300,
-        //                        'enabled'=>'$conf->oauth->enabled && preg_match(\'/^(admintools|all)/\',$leftmenu)',
-        //                        'perms'=>'$user->rights->oauth->read',    // Use 'perms'=>'1' if you want your menu with no permission rules
-        //                        'target'=>'',
-        //                        'user'=>0);                     // 0=Menu for internal users, 1=external users, 2=both
+		// This is to declare the Top Menu entry:
+		//$this->menu[$r]=array(  'fk_menu'=>'fk_mainmenu=home,fk_leftmenu=admintools',               // Put 0 if this is a top menu
+		//                        'type'=>'left',                 // This is a Top menu entry
+		//                        'titre'=>'MenuOauth',
+		//                        'mainmenu'=>'oauth',
+		//                        'url'=>'/oauth/index.php',
+		//                        'langs'=>'oauth',            // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+		//                        'position'=>300,
+		//                        'enabled'=>'$conf->oauth->enabled && preg_match(\'/^(admintools|all)/\',$leftmenu)',
+		//                        'perms'=>'$user->rights->oauth->read',    // Use 'perms'=>'1' if you want your menu with no permission rules
+		//                        'target'=>'',
+		//                        'user'=>0);                     // 0=Menu for internal users, 1=external users, 2=both
 
-        //$r++;
-    }
+		//$r++;
+	}
 
 
-    /**
-     *      Function called when module is enabled.
-     *      The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
-     *      It also creates data directories
-     *
-     *      @param      string  $options    Options when enabling module ('', 'noboxes')
-     *      @return     int                 1 if OK, 0 if KO
-     */
-    public function init($options = '')
-    {
-        global $conf;
+	/**
+	 *      Function called when module is enabled.
+	 *      The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
+	 *      It also creates data directories
+	 *
+	 *      @param      string  $options    Options when enabling module ('', 'noboxes')
+	 *      @return     int                 1 if OK, 0 if KO
+	 */
+	public function init($options = '')
+	{
+		global $conf;
 
-        // Clean before activation
-        $this->remove($options);
+		// Clean before activation
+		$this->remove($options);
 
-        $sql = array();
+		$sql = array();
 
-        return $this->_init($sql, $options);
-    }
+		return $this->_init($sql, $options);
+	}
 }
diff --git a/htdocs/core/modules/modOpenSurvey.class.php b/htdocs/core/modules/modOpenSurvey.class.php
index 1c1774c83fd..623c6d7c43e 100644
--- a/htdocs/core/modules/modOpenSurvey.class.php
+++ b/htdocs/core/modules/modOpenSurvey.class.php
@@ -37,8 +37,8 @@ class modOpenSurvey extends DolibarrModules
 	 *
 	 *   @param		DoliDB		$db		Database handler
 	 */
-    public function __construct($db)
-    {
+	public function __construct($db)
+	{
 		global $langs, $conf;
 
 		$this->db = $db;
@@ -83,7 +83,7 @@ class modOpenSurvey extends DolibarrModules
 		$this->const = array(); // List of parameters
 
 		// Dictionaries
-        $this->dictionaries = array();
+		$this->dictionaries = array();
 
 		// Boxes
 		$this->boxes = array(); // List of boxes
@@ -119,73 +119,73 @@ class modOpenSurvey extends DolibarrModules
 		$r++;
 
 
-        // Menus
-        //-------
-        $r = 0;
-        $this->menu[$r] = array(
-            'fk_menu'=>'fk_mainmenu=tools', // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-            'type'=>'left',
-            'titre'=>'Survey',
-            'mainmenu'=>'tools',
-            'leftmenu'=>'opensurvey',
-            'url'=>'/opensurvey/index.php?mainmenu=tools&leftmenu=opensurvey',
-            'langs'=>'opensurvey',
-            'position'=>200,
-            'enabled'=>'$conf->opensurvey->enabled', // Define condition to show or hide menu entry. Use '$conf->NewsSubmitter->enabled' if entry must be visible if module is enabled.
-            'perms'=>'$user->rights->opensurvey->read',
-            'target'=>'',
-            'user'=>0,
-        );
-        $r++;
+		// Menus
+		//-------
+		$r = 0;
+		$this->menu[$r] = array(
+			'fk_menu'=>'fk_mainmenu=tools', // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+			'type'=>'left',
+			'titre'=>'Survey',
+			'mainmenu'=>'tools',
+			'leftmenu'=>'opensurvey',
+			'url'=>'/opensurvey/index.php?mainmenu=tools&leftmenu=opensurvey',
+			'langs'=>'opensurvey',
+			'position'=>200,
+			'enabled'=>'$conf->opensurvey->enabled', // Define condition to show or hide menu entry. Use '$conf->NewsSubmitter->enabled' if entry must be visible if module is enabled.
+			'perms'=>'$user->rights->opensurvey->read',
+			'target'=>'',
+			'user'=>0,
+		);
+		$r++;
 
-        $this->menu[$r] = array(
-            'fk_menu'=>'fk_mainmenu=tools,fk_leftmenu=opensurvey', // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-            'type'=>'left',
-            'titre'=>'NewSurvey',
-            'mainmenu'=>'tools',
-            'leftmenu'=>'opensurvey_new',
-            'url'=>'/opensurvey/wizard/index.php',
-            'langs'=>'opensurvey',
-            'position'=>210,
-            'enabled'=>'$conf->opensurvey->enabled', // Define condition to show or hide menu entry. Use '$conf->NewsSubmitter->enabled' if entry must be visible if module is enabled.
-            'perms'=>'$user->rights->opensurvey->write',
-            'target'=>'',
-            'user'=>0,
-        );
-        $r++;
+		$this->menu[$r] = array(
+			'fk_menu'=>'fk_mainmenu=tools,fk_leftmenu=opensurvey', // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+			'type'=>'left',
+			'titre'=>'NewSurvey',
+			'mainmenu'=>'tools',
+			'leftmenu'=>'opensurvey_new',
+			'url'=>'/opensurvey/wizard/index.php',
+			'langs'=>'opensurvey',
+			'position'=>210,
+			'enabled'=>'$conf->opensurvey->enabled', // Define condition to show or hide menu entry. Use '$conf->NewsSubmitter->enabled' if entry must be visible if module is enabled.
+			'perms'=>'$user->rights->opensurvey->write',
+			'target'=>'',
+			'user'=>0,
+		);
+		$r++;
 
-        $this->menu[$r] = array(
-            'fk_menu'=>'fk_mainmenu=tools,fk_leftmenu=opensurvey', // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-            'type'=>'left',
-            'titre'=>'List',
-            'mainmenu'=>'tools',
-            'leftmenu'=>'opensurvey_list',
-            'url'=>'/opensurvey/list.php',
-            'langs'=>'opensurvey',
-            'position'=>220,
-            'enabled'=>'$conf->opensurvey->enabled', // Define condition to show or hide menu entry. Use '$conf->NewsSubmitter->enabled' if entry must be visible if module is enabled.
-            'perms'=>'$user->rights->opensurvey->read',
-            'target'=>'',
-            'user'=>0,
-        );
-        $r++;
-    }
+		$this->menu[$r] = array(
+			'fk_menu'=>'fk_mainmenu=tools,fk_leftmenu=opensurvey', // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+			'type'=>'left',
+			'titre'=>'List',
+			'mainmenu'=>'tools',
+			'leftmenu'=>'opensurvey_list',
+			'url'=>'/opensurvey/list.php',
+			'langs'=>'opensurvey',
+			'position'=>220,
+			'enabled'=>'$conf->opensurvey->enabled', // Define condition to show or hide menu entry. Use '$conf->NewsSubmitter->enabled' if entry must be visible if module is enabled.
+			'perms'=>'$user->rights->opensurvey->read',
+			'target'=>'',
+			'user'=>0,
+		);
+		$r++;
+	}
 
 	/**
 	 *	Function called when module is enabled.
 	 *	The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
 	 *	It also creates data directories
 	 *
-     *  @param      string	$options    Options when enabling module ('', 'noboxes')
+	 *  @param      string	$options    Options when enabling module ('', 'noboxes')
 	 *  @return     int             	1 if OK, 0 if KO
 	 */
-    public function init($options = '')
-    {
-        // Permissions
-        $this->remove($options);
+	public function init($options = '')
+	{
+		// Permissions
+		$this->remove($options);
 
-        $sql = array();
+		$sql = array();
 
-        return $this->_init($sql, $options);
-    }
+		return $this->_init($sql, $options);
+	}
 }
diff --git a/htdocs/core/modules/modPaybox.class.php b/htdocs/core/modules/modPaybox.class.php
index cd4630fb6cf..a5cda052656 100644
--- a/htdocs/core/modules/modPaybox.class.php
+++ b/htdocs/core/modules/modPaybox.class.php
@@ -31,161 +31,161 @@ include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
  */
 class modPayBox extends DolibarrModules
 {
-    /**
-     *   Constructor. Define names, constants, directories, boxes, permissions
-     *
-     *   @param      DoliDB		$db      Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
+	/**
+	 *   Constructor. Define names, constants, directories, boxes, permissions
+	 *
+	 *   @param      DoliDB		$db      Database handler
+	 */
+	public function __construct($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).
-        $this->numero = 50000;
-        // Key text used to identify module (for permissions, menus, etc...)
-        $this->rights_class = 'paybox';
+		// Id for module (must be unique).
+		// Use here a free id (See in Home -> System information -> Dolibarr for list of used modules id).
+		$this->numero = 50000;
+		// Key text used to identify module (for permissions, menus, etc...)
+		$this->rights_class = 'paybox';
 
-        // Family can be 'crm','financial','hr','projects','products','ecm','technic','other'
-        // It is used to group modules in module setup page
-        $this->family = "interface";
-        // 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));
-        // Module description, used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
-        $this->description = "Module to offer an online payment page by credit card with PayBox";
-        // Possible values for version are: 'development', 'experimental', 'dolibarr' or version
-        $this->version = 'dolibarr';
-        // Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
-        $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-        // Name of image file used for this module.
-        // If file is in theme/yourtheme/img directory under name object_pictovalue.png, use this->picto='pictovalue'
-        // If file is in module/img directory, use this->picto=DOL_URL_ROOT.'/module/img/file.png'
-        $this->picto = 'paybox@paybox';
+		// Family can be 'crm','financial','hr','projects','products','ecm','technic','other'
+		// It is used to group modules in module setup page
+		$this->family = "interface";
+		// 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));
+		// Module description, used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
+		$this->description = "Module to offer an online payment page by credit card with PayBox";
+		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
+		$this->version = 'dolibarr';
+		// Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
+		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+		// Name of image file used for this module.
+		// If file is in theme/yourtheme/img directory under name object_pictovalue.png, use this->picto='pictovalue'
+		// If file is in module/img directory, use this->picto=DOL_URL_ROOT.'/module/img/file.png'
+		$this->picto = 'paybox@paybox';
 
-        // Data directories to create when module is enabled.
-        $this->dirs = array('/paybox/temp');
+		// Data directories to create when module is enabled.
+		$this->dirs = array('/paybox/temp');
 
-        // Config pages. Put here list of php page names stored in admmin directory used to setup module.
-        $this->config_page_url = array("paybox.php@paybox");
+		// Config pages. Put here list of php page names stored in admmin directory used to setup module.
+		$this->config_page_url = array("paybox.php@paybox");
 
-        // Dependencies
-        $this->hidden = false; // A condition to hide module
+		// Dependencies
+		$this->hidden = false; // A condition to hide module
 		$this->depends = array(); // List of module class names as string that must be enabled if this module is enabled
 		$this->requiredby = array(); // List of module ids to disable if this one is disabled
 		$this->conflictwith = array(); // List of module class names as string this module is in conflict with
 		$this->phpmin = array(5, 4); // Minimum version of PHP required by module
-        $this->need_dolibarr_version = array(2, 6); // Minimum version of Dolibarr required by module
-        $this->langfiles = array("paybox");
+		$this->need_dolibarr_version = array(2, 6); // Minimum version of Dolibarr required by module
+		$this->langfiles = array("paybox");
 
-        // Constants
-        $this->const = array(); // List of particular constants to add when module is enabled
-        //Example: $this->const=array(0=>array('MODULE_MY_NEW_CONST1','chaine','myvalue','This is a constant to add',0),
-        //                            1=>array('MODULE_MY_NEW_CONST2','chaine','myvalue','This is another constant to add',0) );
+		// Constants
+		$this->const = array(); // List of particular constants to add when module is enabled
+		//Example: $this->const=array(0=>array('MODULE_MY_NEW_CONST1','chaine','myvalue','This is a constant to add',0),
+		//                            1=>array('MODULE_MY_NEW_CONST2','chaine','myvalue','This is another constant to add',0) );
 
-        // New pages on tabs
-        $this->tabs = array();
+		// New pages on tabs
+		$this->tabs = array();
 
 
-        // Boxes
-        $this->boxes = array(); // List of boxes
-        $r = 0;
+		// Boxes
+		$this->boxes = array(); // List of boxes
+		$r = 0;
 
-        // Add here list of php file(s) stored in core/boxes that contains class to show a box.
-        // Example:
-        //$this->boxes[$r][1] = "myboxa.php";
-        //$r++;
-        //$this->boxes[$r][1] = "myboxb.php";
-        //$r++;
+		// Add here list of php file(s) stored in core/boxes that contains class to show a box.
+		// Example:
+		//$this->boxes[$r][1] = "myboxa.php";
+		//$r++;
+		//$this->boxes[$r][1] = "myboxb.php";
+		//$r++;
 
 
-        // Permissions
-        $this->rights = array(); // Permission array used by this module
-        $r = 0;
+		// Permissions
+		$this->rights = array(); // Permission array used by this module
+		$r = 0;
 
-        // Add here list of permission defined by an id, a label, a boolean and two constant strings.
-        // Example:
-        // $this->rights[$r][0] = 2000; 				// Permission id (must not be already used)
-        // $this->rights[$r][1] = 'Permision label';	// Permission label
-        // $this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
-        // $this->rights[$r][4] = 'level1';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
-        // $this->rights[$r][5] = 'level2';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
-        // $r++;
+		// Add here list of permission defined by an id, a label, a boolean and two constant strings.
+		// Example:
+		// $this->rights[$r][0] = 2000; 				// Permission id (must not be already used)
+		// $this->rights[$r][1] = 'Permision label';	// Permission label
+		// $this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
+		// $this->rights[$r][4] = 'level1';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+		// $this->rights[$r][5] = 'level2';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+		// $r++;
 
 
-        // Main menu entries
-        $this->menus = array(); // List of menus to add
-        $r = 0;
+		// Main menu entries
+		$this->menus = array(); // List of menus to add
+		$r = 0;
 
-        // Add here entries to declare new menus
-        // Example to declare the Top Menu entry:
-        // $this->menu[$r]=array(	'fk_menu'=>0,			// Put 0 if this is a top menu
-        //							'type'=>'top',			// This is a Top menu entry
-        //							'titre'=>'MyModule top menu',
-        //							'mainmenu'=>'mymodule',
-        //							'url'=>'/mymodule/pagetop.php',
-        //							'langs'=>'mylangfile',	// Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-        //							'position'=>100,
-        //							'perms'=>'1',			// Use 'perms'=>'$user->rights->mymodule->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++;
-        //
-        // Example to declare a Left Menu entry:
-        // $this->menu[$r]=array(	'fk_menu'=>'r=0',		// Use r=value where r is index key used for the parent menu entry (higher parent must be a top menu entry)
-        //							'type'=>'left',			// This is a Left menu entry
-        //							'titre'=>'MyModule left menu 1',
-        //							'mainmenu'=>'mymodule',
-        //							'url'=>'/mymodule/pagelevel1.php',
-        //							'langs'=>'mylangfile',	// Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-        //							'position'=>100,
-        //							'perms'=>'1',			// Use 'perms'=>'$user->rights->mymodule->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++;
-        //
-        // Example to declare another Left Menu entry:
-        // $this->menu[$r]=array(	'fk_menu'=>'r=1',		// Use r=value where r is index key used for the parent menu entry (higher parent must be a top menu entry)
-        //							'type'=>'left',			// This is a Left menu entry
-        //							'titre'=>'MyModule left menu 2',
-        //							'mainmenu'=>'mymodule',
-        //							'url'=>'/mymodule/pagelevel2.php',
-        //							'langs'=>'mylangfile',	// Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-        //							'position'=>100,
-        //							'perms'=>'1',			// Use 'perms'=>'$user->rights->mymodule->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++;
+		// Add here entries to declare new menus
+		// Example to declare the Top Menu entry:
+		// $this->menu[$r]=array(	'fk_menu'=>0,			// Put 0 if this is a top menu
+		//							'type'=>'top',			// This is a Top menu entry
+		//							'titre'=>'MyModule top menu',
+		//							'mainmenu'=>'mymodule',
+		//							'url'=>'/mymodule/pagetop.php',
+		//							'langs'=>'mylangfile',	// Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+		//							'position'=>100,
+		//							'perms'=>'1',			// Use 'perms'=>'$user->rights->mymodule->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++;
+		//
+		// Example to declare a Left Menu entry:
+		// $this->menu[$r]=array(	'fk_menu'=>'r=0',		// Use r=value where r is index key used for the parent menu entry (higher parent must be a top menu entry)
+		//							'type'=>'left',			// This is a Left menu entry
+		//							'titre'=>'MyModule left menu 1',
+		//							'mainmenu'=>'mymodule',
+		//							'url'=>'/mymodule/pagelevel1.php',
+		//							'langs'=>'mylangfile',	// Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+		//							'position'=>100,
+		//							'perms'=>'1',			// Use 'perms'=>'$user->rights->mymodule->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++;
+		//
+		// Example to declare another Left Menu entry:
+		// $this->menu[$r]=array(	'fk_menu'=>'r=1',		// Use r=value where r is index key used for the parent menu entry (higher parent must be a top menu entry)
+		//							'type'=>'left',			// This is a Left menu entry
+		//							'titre'=>'MyModule left menu 2',
+		//							'mainmenu'=>'mymodule',
+		//							'url'=>'/mymodule/pagelevel2.php',
+		//							'langs'=>'mylangfile',	// Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+		//							'position'=>100,
+		//							'perms'=>'1',			// Use 'perms'=>'$user->rights->mymodule->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++;
 
 
-        // Exports
-        $r = 1;
+		// Exports
+		$r = 1;
 
-        // Example:
-        // $this->export_code[$r]=$this->rights_class.'_'.$r;
-        // $this->export_label[$r]='CustomersInvoicesAndInvoiceLines';	// Translation key (used only if key ExportDataset_xxx_z not found)
-        // $this->export_permission[$r]=array(array("facture","facture","export"));
-        // $this->export_fields_array[$r]=array(
-        //     's.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town',
-        //     's.fk_pays'=>'Country','s.phone'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3',
-        //     's.idprof4'=>'ProfId4','s.code_compta'=>'CustomerAccountancyCode','s.code_compta_fournisseur'=>'SupplierAccountancyCode',
-        //     'f.rowid'=>"InvoiceId",'f.ref'=>"InvoiceRef",'f.datec'=>"InvoiceDateCreation",'f.datef'=>"DateInvoice",'f.total'=>"TotalHT",
-        //     'f.total_ttc'=>"TotalTTC",'f.tva'=>"TotalVAT",'f.paye'=>"InvoicePaid",'f.fk_statut'=>'InvoiceStatus','f.note'=>"InvoiceNote",'fd.rowid'=>'LineId',
-        //     'fd.description'=>"LineDescription",'fd.price'=>"LineUnitPrice",'fd.tva_tx'=>"LineVATRate",'fd.qty'=>"LineQty",'fd.total_ht'=>"LineTotalHT",
-        //     'fd.total_tva'=>"LineTotalTVA",'fd.total_ttc'=>"LineTotalTTC",'fd.date_start'=>"DateStart",'fd.date_end'=>"DateEnd",'fd.fk_product'=>'ProductId','p.ref'=>'ProductRef',
-        // );
-        // $this->export_entities_array[$r]=array(
-        //     's.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company',
-        //     's.fk_pays'=>'company','s.phone'=>'company','s.siren'=>'company','s.siret'=>'company','s.ape'=>'company','s.idprof4'=>'company',
-        //     's.code_compta'=>'company','s.code_compta_fournisseur'=>'company','f.rowid'=>"invoice",'f.ref'=>"invoice",'f.datec'=>"invoice",
-        //     'f.datef'=>"invoice",'f.total'=>"invoice",'f.total_ttc'=>"invoice",'f.tva'=>"invoice",'f.paye'=>"invoice",'f.fk_statut'=>'invoice',
-        //     'f.note'=>"invoice",'fd.rowid'=>'invoice_line','fd.description'=>"invoice_line",'fd.price'=>"invoice_line",'fd.total_ht'=>"invoice_line",
-        //     'fd.total_tva'=>"invoice_line",'fd.total_ttc'=>"invoice_line",'fd.tva_tx'=>"invoice_line",'fd.qty'=>"invoice_line",'fd.date_start'=>"invoice_line",
-        //     'fd.date_end'=>"invoice_line",'fd.fk_product'=>'product','p.ref'=>'product',
-        // );
-        // $this->export_sql_start[$r]='SELECT DISTINCT ';
-        // $this->export_sql_end[$r]  =' FROM ('.MAIN_DB_PREFIX.'facture as f, '.MAIN_DB_PREFIX.'facturedet as fd, '.MAIN_DB_PREFIX.'societe as s)';
-        // $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product as p on (fd.fk_product = p.rowid)';
-        // $this->export_sql_end[$r] .=' WHERE f.fk_soc = s.rowid AND f.rowid = fd.fk_facture';
-        // $r++;
-    }
+		// Example:
+		// $this->export_code[$r]=$this->rights_class.'_'.$r;
+		// $this->export_label[$r]='CustomersInvoicesAndInvoiceLines';	// Translation key (used only if key ExportDataset_xxx_z not found)
+		// $this->export_permission[$r]=array(array("facture","facture","export"));
+		// $this->export_fields_array[$r]=array(
+		//     's.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town',
+		//     's.fk_pays'=>'Country','s.phone'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3',
+		//     's.idprof4'=>'ProfId4','s.code_compta'=>'CustomerAccountancyCode','s.code_compta_fournisseur'=>'SupplierAccountancyCode',
+		//     'f.rowid'=>"InvoiceId",'f.ref'=>"InvoiceRef",'f.datec'=>"InvoiceDateCreation",'f.datef'=>"DateInvoice",'f.total'=>"TotalHT",
+		//     'f.total_ttc'=>"TotalTTC",'f.tva'=>"TotalVAT",'f.paye'=>"InvoicePaid",'f.fk_statut'=>'InvoiceStatus','f.note'=>"InvoiceNote",'fd.rowid'=>'LineId',
+		//     'fd.description'=>"LineDescription",'fd.price'=>"LineUnitPrice",'fd.tva_tx'=>"LineVATRate",'fd.qty'=>"LineQty",'fd.total_ht'=>"LineTotalHT",
+		//     'fd.total_tva'=>"LineTotalTVA",'fd.total_ttc'=>"LineTotalTTC",'fd.date_start'=>"DateStart",'fd.date_end'=>"DateEnd",'fd.fk_product'=>'ProductId','p.ref'=>'ProductRef',
+		// );
+		// $this->export_entities_array[$r]=array(
+		//     's.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company',
+		//     's.fk_pays'=>'company','s.phone'=>'company','s.siren'=>'company','s.siret'=>'company','s.ape'=>'company','s.idprof4'=>'company',
+		//     's.code_compta'=>'company','s.code_compta_fournisseur'=>'company','f.rowid'=>"invoice",'f.ref'=>"invoice",'f.datec'=>"invoice",
+		//     'f.datef'=>"invoice",'f.total'=>"invoice",'f.total_ttc'=>"invoice",'f.tva'=>"invoice",'f.paye'=>"invoice",'f.fk_statut'=>'invoice',
+		//     'f.note'=>"invoice",'fd.rowid'=>'invoice_line','fd.description'=>"invoice_line",'fd.price'=>"invoice_line",'fd.total_ht'=>"invoice_line",
+		//     'fd.total_tva'=>"invoice_line",'fd.total_ttc'=>"invoice_line",'fd.tva_tx'=>"invoice_line",'fd.qty'=>"invoice_line",'fd.date_start'=>"invoice_line",
+		//     'fd.date_end'=>"invoice_line",'fd.fk_product'=>'product','p.ref'=>'product',
+		// );
+		// $this->export_sql_start[$r]='SELECT DISTINCT ';
+		// $this->export_sql_end[$r]  =' FROM ('.MAIN_DB_PREFIX.'facture as f, '.MAIN_DB_PREFIX.'facturedet as fd, '.MAIN_DB_PREFIX.'societe as s)';
+		// $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product as p on (fd.fk_product = p.rowid)';
+		// $this->export_sql_end[$r] .=' WHERE f.fk_soc = s.rowid AND f.rowid = fd.fk_facture';
+		// $r++;
+	}
 }
diff --git a/htdocs/core/modules/modPaymentByBankTransfer.class.php b/htdocs/core/modules/modPaymentByBankTransfer.class.php
index 9ea1bf00f29..0eab52fcdec 100644
--- a/htdocs/core/modules/modPaymentByBankTransfer.class.php
+++ b/htdocs/core/modules/modPaymentByBankTransfer.class.php
@@ -120,29 +120,29 @@ class modPaymentByBankTransfer extends DolibarrModules
 		$this->rights[$r][3] = 0;
 		$this->rights[$r][4] = 'debit';
 
-        // Menus
-        //-------
-        $this->menu = 1; // This module add menu entries. They are coded into menu manager.
-    }
+		// Menus
+		//-------
+		$this->menu = 1; // This module add menu entries. They are coded into menu manager.
+	}
 
 
-    /**
-     *  Function called when module is enabled.
-     *  The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
-     *  It also creates data directories
-     *
-     *  @param      string	$options    Options when enabling module ('', 'noboxes')
-     *  @return     int             	1 if OK, 0 if KO
-     */
-    public function init($options = '')
-    {
-        global $conf;
+	/**
+	 *  Function called when module is enabled.
+	 *  The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
+	 *  It also creates data directories
+	 *
+	 *  @param      string	$options    Options when enabling module ('', 'noboxes')
+	 *  @return     int             	1 if OK, 0 if KO
+	 */
+	public function init($options = '')
+	{
+		global $conf;
 
-        // Permissions
-        $this->remove($options);
+		// Permissions
+		$this->remove($options);
 
-        $sql = array();
+		$sql = array();
 
-        return $this->_init($sql, $options);
-    }
+		return $this->_init($sql, $options);
+	}
 }
diff --git a/htdocs/core/modules/modPaypal.class.php b/htdocs/core/modules/modPaypal.class.php
index c8e15838704..15a92020062 100644
--- a/htdocs/core/modules/modPaypal.class.php
+++ b/htdocs/core/modules/modPaypal.class.php
@@ -32,82 +32,82 @@ include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
  */
 class modPaypal extends DolibarrModules
 {
-    /**
-     *   Constructor. Define names, constants, directories, boxes, permissions
-     *
-     *   @param      DoliDB		$db      Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
+	/**
+	 *   Constructor. Define names, constants, directories, boxes, permissions
+	 *
+	 *   @param      DoliDB		$db      Database handler
+	 */
+	public function __construct($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).
-        $this->numero = 50200;
-        // Key text used to identify module (for permissions, menus, etc...)
-        $this->rights_class = 'paypal';
+		// Id for module (must be unique).
+		// Use here a free id (See in Home -> System information -> Dolibarr for list of used modules id).
+		$this->numero = 50200;
+		// Key text used to identify module (for permissions, menus, etc...)
+		$this->rights_class = 'paypal';
 
-        // Family can be 'crm','financial','hr','projects','products','ecm','technic','other'
-        // It is used to group modules in module setup page
-        $this->family = "interface";
-        // 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));
-        // Module description, used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
-        $this->description = "Module to offer an online payment page with PayPal";
-        // Possible values for version are: 'development', 'experimental', 'dolibarr' or version
-        $this->version = 'dolibarr';
-        // Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
-        $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-        // Name of image file used for this module.
-        // If file is in theme/yourtheme/img directory under name object_pictovalue.png, use this->picto='pictovalue'
-        // If file is in module/img directory, use this->picto=DOL_URL_ROOT.'/module/img/file.png'
-        $this->picto = 'paypal@paypal';
+		// Family can be 'crm','financial','hr','projects','products','ecm','technic','other'
+		// It is used to group modules in module setup page
+		$this->family = "interface";
+		// 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));
+		// Module description, used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
+		$this->description = "Module to offer an online payment page with PayPal";
+		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
+		$this->version = 'dolibarr';
+		// Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
+		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+		// Name of image file used for this module.
+		// If file is in theme/yourtheme/img directory under name object_pictovalue.png, use this->picto='pictovalue'
+		// If file is in module/img directory, use this->picto=DOL_URL_ROOT.'/module/img/file.png'
+		$this->picto = 'paypal@paypal';
 
-        // Data directories to create when module is enabled.
-        $this->dirs = array('/paypal/temp');
+		// Data directories to create when module is enabled.
+		$this->dirs = array('/paypal/temp');
 
-        // Config pages. Put here list of php page names stored in admmin directory used to setup module.
-        $this->config_page_url = array("paypal.php@paypal");
+		// Config pages. Put here list of php page names stored in admmin directory used to setup module.
+		$this->config_page_url = array("paypal.php@paypal");
 
-        // Dependencies
-        $this->hidden = false; // A condition to hide module
+		// Dependencies
+		$this->hidden = false; // A condition to hide module
 		$this->depends = array(); // List of module class names as string that must be enabled if this module is enabled
 		$this->requiredby = array('modPaypalPlus'); // List of module ids to disable if this one is disabled
 		$this->conflictwith = array(); // List of module class names as string this module is in conflict with
 		$this->phpmin = array(5, 4); // Minimum version of PHP required by module
-        $this->need_dolibarr_version = array(3, 0); // Minimum version of Dolibarr required by module
-        $this->langfiles = array("paypal");
+		$this->need_dolibarr_version = array(3, 0); // Minimum version of Dolibarr required by module
+		$this->langfiles = array("paypal");
 
-        // Constants
-        $this->const = array(); // List of particular constants to add when module is enabled
-        //Example: $this->const=array(0=>array('MODULE_MY_NEW_CONST1','chaine','myvalue','This is a constant to add',0),
-        //                            1=>array('MODULE_MY_NEW_CONST2','chaine','myvalue','This is another constant to add',0) );
+		// Constants
+		$this->const = array(); // List of particular constants to add when module is enabled
+		//Example: $this->const=array(0=>array('MODULE_MY_NEW_CONST1','chaine','myvalue','This is a constant to add',0),
+		//                            1=>array('MODULE_MY_NEW_CONST2','chaine','myvalue','This is another constant to add',0) );
 
-        // New pages on tabs
-        $this->tabs = array();
+		// New pages on tabs
+		$this->tabs = array();
 
 
-        // Boxes
-        $this->boxes = array(); // List of boxes
-        $r = 0;
+		// Boxes
+		$this->boxes = array(); // List of boxes
+		$r = 0;
 
-        // Add here list of php file(s) stored in core/boxes that contains class to show a box.
-        // Example:
-        //$this->boxes[$r][1] = "myboxa.php";
-        //$r++;
-        //$this->boxes[$r][1] = "myboxb.php";
-        //$r++;
+		// Add here list of php file(s) stored in core/boxes that contains class to show a box.
+		// Example:
+		//$this->boxes[$r][1] = "myboxa.php";
+		//$r++;
+		//$this->boxes[$r][1] = "myboxb.php";
+		//$r++;
 
 
-        // Permissions
-        $this->rights = array(); // Permission array used by this module
-        $r = 0;
+		// Permissions
+		$this->rights = array(); // Permission array used by this module
+		$r = 0;
 
 
-        // Main menu entries
-        $this->menus = array(); // List of menus to add
-        $r = 0;
-        /*$this->menu[$r]=array(
+		// Main menu entries
+		$this->menus = array(); // List of menus to add
+		$r = 0;
+		/*$this->menu[$r]=array(
 	        'fk_menu'=>'fk_mainmenu=billing,fk_leftmenu=customers_bills_payment',		    // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
 	        'mainmenu'=>'billing',
 	        'leftmenu'=>'customers_bills_payment_paypal',
@@ -123,75 +123,75 @@ class modPaypal extends DolibarrModules
         );				                // 0=Menu for internal users, 1=external users, 2=both
         $r++;*/
 
-        // Add here entries to declare new menus
-        // Example to declare the Top Menu entry:
-        // $this->menu[$r]=array(	'fk_menu'=>0,			// Put 0 if this is a top menu
-        //							'type'=>'top',			// This is a Top menu entry
-        //							'titre'=>'MyModule top menu',
-        //							'mainmenu'=>'mymodule',
-        //							'url'=>'/mymodule/pagetop.php',
-        //							'langs'=>'mylangfile',	// Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-        //							'position'=>100,
-        //							'perms'=>'1',			// Use 'perms'=>'$user->rights->mymodule->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++;
-        //
-        // Example to declare a Left Menu entry:
-        // $this->menu[$r]=array(	'fk_menu'=>'r=0',		// Use r=value where r is index key used for the parent menu entry (higher parent must be a top menu entry)
-        //							'type'=>'left',			// This is a Left menu entry
-        //							'titre'=>'MyModule left menu 1',
-        //							'mainmenu'=>'mymodule',
-        //							'url'=>'/mymodule/pagelevel1.php',
-        //							'langs'=>'mylangfile',	// Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-        //							'position'=>100,
-        //							'perms'=>'1',			// Use 'perms'=>'$user->rights->mymodule->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++;
-        //
-        // Example to declare another Left Menu entry:
-        // $this->menu[$r]=array(	'fk_menu'=>'r=1',		// Use r=value where r is index key used for the parent menu entry (higher parent must be a top menu entry)
-        //							'type'=>'left',			// This is a Left menu entry
-        //							'titre'=>'MyModule left menu 2',
-        //							'mainmenu'=>'mymodule',
-        //							'url'=>'/mymodule/pagelevel2.php',
-        //							'langs'=>'mylangfile',	// Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-        //							'position'=>100,
-        //							'perms'=>'1',			// Use 'perms'=>'$user->rights->mymodule->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++;
+		// Add here entries to declare new menus
+		// Example to declare the Top Menu entry:
+		// $this->menu[$r]=array(	'fk_menu'=>0,			// Put 0 if this is a top menu
+		//							'type'=>'top',			// This is a Top menu entry
+		//							'titre'=>'MyModule top menu',
+		//							'mainmenu'=>'mymodule',
+		//							'url'=>'/mymodule/pagetop.php',
+		//							'langs'=>'mylangfile',	// Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+		//							'position'=>100,
+		//							'perms'=>'1',			// Use 'perms'=>'$user->rights->mymodule->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++;
+		//
+		// Example to declare a Left Menu entry:
+		// $this->menu[$r]=array(	'fk_menu'=>'r=0',		// Use r=value where r is index key used for the parent menu entry (higher parent must be a top menu entry)
+		//							'type'=>'left',			// This is a Left menu entry
+		//							'titre'=>'MyModule left menu 1',
+		//							'mainmenu'=>'mymodule',
+		//							'url'=>'/mymodule/pagelevel1.php',
+		//							'langs'=>'mylangfile',	// Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+		//							'position'=>100,
+		//							'perms'=>'1',			// Use 'perms'=>'$user->rights->mymodule->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++;
+		//
+		// Example to declare another Left Menu entry:
+		// $this->menu[$r]=array(	'fk_menu'=>'r=1',		// Use r=value where r is index key used for the parent menu entry (higher parent must be a top menu entry)
+		//							'type'=>'left',			// This is a Left menu entry
+		//							'titre'=>'MyModule left menu 2',
+		//							'mainmenu'=>'mymodule',
+		//							'url'=>'/mymodule/pagelevel2.php',
+		//							'langs'=>'mylangfile',	// Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+		//							'position'=>100,
+		//							'perms'=>'1',			// Use 'perms'=>'$user->rights->mymodule->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++;
 
 
-        // Exports
-        $r = 1;
+		// Exports
+		$r = 1;
 
-        // Example:
-        // $this->export_code[$r]=$this->rights_class.'_'.$r;
-        // $this->export_label[$r]='CustomersInvoicesAndInvoiceLines';	// Translation key (used only if key ExportDataset_xxx_z not found)
-        // $this->export_permission[$r]=array(array("facture","facture","export"));
-        // $this->export_fields_array[$r]=array(
-        //    's.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','s.fk_pays'=>'Country','s.phone'=>'Phone',
-        //    's.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','s.code_compta'=>'CustomerAccountancyCode',
-        //    's.code_compta_fournisseur'=>'SupplierAccountancyCode','f.rowid'=>"InvoiceId",'f.ref'=>"InvoiceRef",'f.datec'=>"InvoiceDateCreation",
-        //    'f.datef'=>"DateInvoice",'f.total'=>"TotalHT",'f.total_ttc'=>"TotalTTC",'f.tva'=>"TotalVAT",'f.paye'=>"InvoicePaid",'f.fk_statut'=>'InvoiceStatus',
-        //    'f.note'=>"InvoiceNote",'fd.rowid'=>'LineId','fd.description'=>"LineDescription",'fd.price'=>"LineUnitPrice",'fd.tva_tx'=>"LineVATRate",
-        //    'fd.qty'=>"LineQty",'fd.total_ht'=>"LineTotalHT",'fd.total_tva'=>"LineTotalTVA",'fd.total_ttc'=>"LineTotalTTC",'fd.date_start'=>"DateStart",
-        //    'fd.date_end'=>"DateEnd",'fd.fk_product'=>'ProductId','p.ref'=>'ProductRef'
-        // );
-        // $this->export_entities_array[$r]=array(
-        //    's.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company','s.fk_pays'=>'company','s.phone'=>'company',
-        //    's.siren'=>'company','s.siret'=>'company','s.ape'=>'company','s.idprof4'=>'company','s.code_compta'=>'company','s.code_compta_fournisseur'=>'company',
-        //    'f.rowid'=>"invoice",'f.ref'=>"invoice",'f.datec'=>"invoice",'f.datef'=>"invoice",'f.total'=>"invoice",'f.total_ttc'=>"invoice",
-        //    'f.tva'=>"invoice",'f.paye'=>"invoice",'f.fk_statut'=>'invoice','f.note'=>"invoice",'fd.rowid'=>'invoice_line','fd.description'=>"invoice_line",
-        //    'fd.price'=>"invoice_line",'fd.total_ht'=>"invoice_line",'fd.total_tva'=>"invoice_line",'fd.total_ttc'=>"invoice_line",'fd.tva_tx'=>"invoice_line",
-        //    'fd.qty'=>"invoice_line",'fd.date_start'=>"invoice_line",'fd.date_end'=>"invoice_line",'fd.fk_product'=>'product','p.ref'=>'product'
-        // );
-        // $this->export_sql_start[$r]='SELECT DISTINCT ';
-        // $this->export_sql_end[$r]  =' FROM ('.MAIN_DB_PREFIX.'facture as f, '.MAIN_DB_PREFIX.'facturedet as fd, '.MAIN_DB_PREFIX.'societe as s)';
-        // $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product as p on (fd.fk_product = p.rowid)';
-        // $this->export_sql_end[$r] .=' WHERE f.fk_soc = s.rowid AND f.rowid = fd.fk_facture';
-        // $r++;
-    }
+		// Example:
+		// $this->export_code[$r]=$this->rights_class.'_'.$r;
+		// $this->export_label[$r]='CustomersInvoicesAndInvoiceLines';	// Translation key (used only if key ExportDataset_xxx_z not found)
+		// $this->export_permission[$r]=array(array("facture","facture","export"));
+		// $this->export_fields_array[$r]=array(
+		//    's.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','s.fk_pays'=>'Country','s.phone'=>'Phone',
+		//    's.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','s.code_compta'=>'CustomerAccountancyCode',
+		//    's.code_compta_fournisseur'=>'SupplierAccountancyCode','f.rowid'=>"InvoiceId",'f.ref'=>"InvoiceRef",'f.datec'=>"InvoiceDateCreation",
+		//    'f.datef'=>"DateInvoice",'f.total'=>"TotalHT",'f.total_ttc'=>"TotalTTC",'f.tva'=>"TotalVAT",'f.paye'=>"InvoicePaid",'f.fk_statut'=>'InvoiceStatus',
+		//    'f.note'=>"InvoiceNote",'fd.rowid'=>'LineId','fd.description'=>"LineDescription",'fd.price'=>"LineUnitPrice",'fd.tva_tx'=>"LineVATRate",
+		//    'fd.qty'=>"LineQty",'fd.total_ht'=>"LineTotalHT",'fd.total_tva'=>"LineTotalTVA",'fd.total_ttc'=>"LineTotalTTC",'fd.date_start'=>"DateStart",
+		//    'fd.date_end'=>"DateEnd",'fd.fk_product'=>'ProductId','p.ref'=>'ProductRef'
+		// );
+		// $this->export_entities_array[$r]=array(
+		//    's.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company','s.fk_pays'=>'company','s.phone'=>'company',
+		//    's.siren'=>'company','s.siret'=>'company','s.ape'=>'company','s.idprof4'=>'company','s.code_compta'=>'company','s.code_compta_fournisseur'=>'company',
+		//    'f.rowid'=>"invoice",'f.ref'=>"invoice",'f.datec'=>"invoice",'f.datef'=>"invoice",'f.total'=>"invoice",'f.total_ttc'=>"invoice",
+		//    'f.tva'=>"invoice",'f.paye'=>"invoice",'f.fk_statut'=>'invoice','f.note'=>"invoice",'fd.rowid'=>'invoice_line','fd.description'=>"invoice_line",
+		//    'fd.price'=>"invoice_line",'fd.total_ht'=>"invoice_line",'fd.total_tva'=>"invoice_line",'fd.total_ttc'=>"invoice_line",'fd.tva_tx'=>"invoice_line",
+		//    'fd.qty'=>"invoice_line",'fd.date_start'=>"invoice_line",'fd.date_end'=>"invoice_line",'fd.fk_product'=>'product','p.ref'=>'product'
+		// );
+		// $this->export_sql_start[$r]='SELECT DISTINCT ';
+		// $this->export_sql_end[$r]  =' FROM ('.MAIN_DB_PREFIX.'facture as f, '.MAIN_DB_PREFIX.'facturedet as fd, '.MAIN_DB_PREFIX.'societe as s)';
+		// $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product as p on (fd.fk_product = p.rowid)';
+		// $this->export_sql_end[$r] .=' WHERE f.fk_soc = s.rowid AND f.rowid = fd.fk_facture';
+		// $r++;
+	}
 }
diff --git a/htdocs/core/modules/modPrelevement.class.php b/htdocs/core/modules/modPrelevement.class.php
index b1e8cb2db57..4ffa8358a06 100644
--- a/htdocs/core/modules/modPrelevement.class.php
+++ b/htdocs/core/modules/modPrelevement.class.php
@@ -123,32 +123,32 @@ class modPrelevement extends DolibarrModules
 		$this->rights[$r][4] = 'bons';
 		$this->rights[$r][5] = 'credit';
 
-        // Menus
-        //-------
-        $this->menu = 1; // This module add menu entries. They are coded into menu manager.
-    }
+		// Menus
+		//-------
+		$this->menu = 1; // This module add menu entries. They are coded into menu manager.
+	}
 
 
-    /**
-     *  Function called when module is enabled.
-     *  The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
-     *  It also creates data directories
-     *
-     *  @param      string	$options    Options when enabling module ('', 'noboxes')
-     *  @return     int             	1 if OK, 0 if KO
-     */
-    public function init($options = '')
-    {
-        global $conf;
+	/**
+	 *  Function called when module is enabled.
+	 *  The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
+	 *  It also creates data directories
+	 *
+	 *  @param      string	$options    Options when enabling module ('', 'noboxes')
+	 *  @return     int             	1 if OK, 0 if KO
+	 */
+	public function init($options = '')
+	{
+		global $conf;
 
-        // Permissions
-        $this->remove($options);
+		// Permissions
+		$this->remove($options);
 
-        $sql = array(
-            "DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape($this->const[0][2])."' AND type = 'bankaccount' AND entity = ".$conf->entity,
-            "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[0][2])."','bankaccount',".$conf->entity.")",
-        );
+		$sql = array(
+			"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape($this->const[0][2])."' AND type = 'bankaccount' AND entity = ".$conf->entity,
+			"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[0][2])."','bankaccount',".$conf->entity.")",
+		);
 
-        return $this->_init($sql, $options);
-    }
+		return $this->_init($sql, $options);
+	}
 }
diff --git a/htdocs/core/modules/modPrinting.class.php b/htdocs/core/modules/modPrinting.class.php
index 464b383c7c1..b918a8b1158 100644
--- a/htdocs/core/modules/modPrinting.class.php
+++ b/htdocs/core/modules/modPrinting.class.php
@@ -35,87 +35,87 @@ include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
 class modPrinting extends DolibarrModules
 {
 
-    /**
-     *  Constructor
-     *
-     *  @param      DoliDB      $db      Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-        $this->numero = 64000;
-        // Family can be 'crm','financial','hr','projects','products','ecm','technic','other'
-        // It is used to group modules in module setup page
-        $this->family = "interface";
-        $this->module_position = '52';
-        // 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));
-        // Module description, used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
-        $this->description = "Enable Direct Printing System.";
-        $this->version = 'dolibarr'; // 'development' or 'experimental' or 'dolibarr' or version
-        $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-        // Name of image file used for this module.
-        // If file is in theme/yourtheme/img directory under name object_pictovalue.png, use this->picto='pictovalue'
-        // If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module'
-        $this->picto = 'printer';
+	/**
+	 *  Constructor
+	 *
+	 *  @param      DoliDB      $db      Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+		$this->numero = 64000;
+		// Family can be 'crm','financial','hr','projects','products','ecm','technic','other'
+		// It is used to group modules in module setup page
+		$this->family = "interface";
+		$this->module_position = '52';
+		// 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));
+		// Module description, used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
+		$this->description = "Enable Direct Printing System.";
+		$this->version = 'dolibarr'; // 'development' or 'experimental' or 'dolibarr' or version
+		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+		// Name of image file used for this module.
+		// If file is in theme/yourtheme/img directory under name object_pictovalue.png, use this->picto='pictovalue'
+		// If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module'
+		$this->picto = 'printer';
 
-        // Data directories to create when module is enabled.
-        $this->dirs = array();
+		// Data directories to create when module is enabled.
+		$this->dirs = array();
 
-        // Config pages
-        $this->config_page_url = array("printing.php@printing");
+		// Config pages
+		$this->config_page_url = array("printing.php@printing");
 
-        // Dependencies
-        $this->hidden = false; // A condition to hide module
+		// Dependencies
+		$this->hidden = false; // A condition to hide module
 		$this->depends = array(); // List of module class names as string that must be enabled if this module is enabled
 		$this->requiredby = array(); // List of module ids to disable if this one is disabled
 		$this->conflictwith = array(); // List of module class names as string this module is in conflict with
 		$this->phpmin = array(5, 4); // Minimum version of PHP required by module
-        $this->need_dolibarr_version = array(3, 7, -2); // Minimum version of Dolibarr required by module
-        $this->conflictwith = array();
-        $this->langfiles = array("printing");
+		$this->need_dolibarr_version = array(3, 7, -2); // Minimum version of Dolibarr required by module
+		$this->conflictwith = array();
+		$this->langfiles = array("printing");
 
-        // Constants
-        $this->const = array();
+		// Constants
+		$this->const = array();
 
-        // Boxes
-        $this->boxes = array();
+		// Boxes
+		$this->boxes = array();
 
-        // Permissions
-        $this->rights = array();
-        $this->rights_class = 'printing';
+		// Permissions
+		$this->rights = array();
+		$this->rights_class = 'printing';
 
-        $r = 0;
-        // $this->rights[$r][0]     Id permission (unique tous modules confondus)
-        // $this->rights[$r][1]     Libelle par defaut si traduction de cle "PermissionXXX" non trouvee (XXX = Id permission)
-        // $this->rights[$r][2]     Non utilise
-        // $this->rights[$r][3]     1=Permis par defaut, 0=Non permis par defaut
-        // $this->rights[$r][4]     Niveau 1 pour nommer permission dans code
-        // $this->rights[$r][5]     Niveau 2 pour nommer permission dans code
+		$r = 0;
+		// $this->rights[$r][0]     Id permission (unique tous modules confondus)
+		// $this->rights[$r][1]     Libelle par defaut si traduction de cle "PermissionXXX" non trouvee (XXX = Id permission)
+		// $this->rights[$r][2]     Non utilise
+		// $this->rights[$r][3]     1=Permis par defaut, 0=Non permis par defaut
+		// $this->rights[$r][4]     Niveau 1 pour nommer permission dans code
+		// $this->rights[$r][5]     Niveau 2 pour nommer permission dans code
 
-        $r++;
-        $this->rights[$r][0] = 64001;
-        $this->rights[$r][1] = 'DirectPrint';
-        $this->rights[$r][2] = 'r';
-        $this->rights[$r][3] = 0;
-        $this->rights[$r][4] = 'read';
+		$r++;
+		$this->rights[$r][0] = 64001;
+		$this->rights[$r][1] = 'DirectPrint';
+		$this->rights[$r][2] = 'r';
+		$this->rights[$r][3] = 0;
+		$this->rights[$r][4] = 'read';
 
-        // Main menu entries
-        $this->menus = array(); // List of menus to add
-        $r = 0;
+		// Main menu entries
+		$this->menus = array(); // List of menus to add
+		$r = 0;
 
-        // This is to declare the Top Menu entry:
-        $this->menu[$r] = array('fk_menu'=>'fk_mainmenu=home,fk_leftmenu=admintools', // Put 0 if this is a top menu
-                                'type'=>'left', // This is a Top menu entry
-                                'titre'=>'MenuDirectPrinting',
-                                'url'=>'/printing/index.php?mainmenu=home&leftmenu=admintools',
-                                'langs'=>'printing', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-                                'position'=>300,
-                                'enabled'=>'$conf->printing->enabled && preg_match(\'/^(admintools|all)/\', $leftmenu)',
-                                'perms'=>'$user->rights->printing->read', // Use 'perms'=>'1' if you want your menu with no permission rules
-                                'target'=>'',
-                                'user'=>0); // 0=Menu for internal users, 1=external users, 2=both
+		// This is to declare the Top Menu entry:
+		$this->menu[$r] = array('fk_menu'=>'fk_mainmenu=home,fk_leftmenu=admintools', // Put 0 if this is a top menu
+								'type'=>'left', // This is a Top menu entry
+								'titre'=>'MenuDirectPrinting',
+								'url'=>'/printing/index.php?mainmenu=home&leftmenu=admintools',
+								'langs'=>'printing', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+								'position'=>300,
+								'enabled'=>'$conf->printing->enabled && preg_match(\'/^(admintools|all)/\', $leftmenu)',
+								'perms'=>'$user->rights->printing->read', // Use 'perms'=>'1' if you want your menu with no permission rules
+								'target'=>'',
+								'user'=>0); // 0=Menu for internal users, 1=external users, 2=both
 
-        $r++;
-    }
+		$r++;
+	}
 }
diff --git a/htdocs/core/modules/modProduct.class.php b/htdocs/core/modules/modProduct.class.php
index 3ed99741715..a3ea922f03e 100644
--- a/htdocs/core/modules/modProduct.class.php
+++ b/htdocs/core/modules/modProduct.class.php
@@ -661,7 +661,7 @@ class modProduct extends DolibarrModules
 			}
 
 			if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING)) {
-				$this->import_fields_array[$r]=array_merge($this->import_fields_array[$r], array('sp.packaging' => 'PackagingForThisProduct'));
+				$this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('sp.packaging' => 'PackagingForThisProduct'));
 			}
 
 			$this->import_convertvalue_array[$r] = array(
diff --git a/htdocs/core/modules/modProductBatch.class.php b/htdocs/core/modules/modProductBatch.class.php
index 7a1d89c8b41..92bfb9b66a5 100644
--- a/htdocs/core/modules/modProductBatch.class.php
+++ b/htdocs/core/modules/modProductBatch.class.php
@@ -40,9 +40,9 @@ class modProductBatch extends DolibarrModules
 	 */
 	public function __construct($db)
 	{
-        global $langs, $conf;
+		global $langs, $conf;
 
-        $this->db = $db;
+		$this->db = $db;
 		$this->numero = 39000;
 
 		$this->family = "products";
@@ -79,18 +79,18 @@ class modProductBatch extends DolibarrModules
 		// Constants
 		$this->const = array();
 
-        $this->tabs = array();
+		$this->tabs = array();
 
-        // Dictionaries
-	    if (!isset($conf->productbatch->enabled))
-        {
-        	$conf->productbatch = new stdClass();
-        	$conf->productbatch->enabled = 0;
-        }
+		// Dictionaries
+		if (!isset($conf->productbatch->enabled))
+		{
+			$conf->productbatch = new stdClass();
+			$conf->productbatch->enabled = 0;
+		}
 		$this->dictionaries = array();
 
-        // Boxes
-        $this->boxes = array(); // List of boxes
+		// Boxes
+		$this->boxes = array(); // List of boxes
 
 		// Permissions
 		$this->rights = array(); // Permission array used by this module
@@ -111,20 +111,20 @@ class modProductBatch 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 = '')
 	{
-	    global $db, $conf;
+		global $db, $conf;
 
 		$sql = array();
 
 		if (!empty($conf->cashdesk->enabled)) {
-    		if (empty($conf->global->CASHDESK_NO_DECREASE_STOCK)) {
-    		    include_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
-    		    $res = dolibarr_set_const($db, "CASHDESK_NO_DECREASE_STOCK", 1, 'chaine', 0, '', $conf->entity);
-    		}
+			if (empty($conf->global->CASHDESK_NO_DECREASE_STOCK)) {
+				include_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+				$res = dolibarr_set_const($db, "CASHDESK_NO_DECREASE_STOCK", 1, 'chaine', 0, '', $conf->entity);
+			}
 		}
 
 		return $this->_init($sql, $options);
diff --git a/htdocs/core/modules/modProjet.class.php b/htdocs/core/modules/modProjet.class.php
index ad77f85dfb5..af6398c7a6d 100644
--- a/htdocs/core/modules/modProjet.class.php
+++ b/htdocs/core/modules/modProjet.class.php
@@ -239,17 +239,17 @@ class modProjet extends DolibarrModules
 			'p.usage_opportunity'=>'ProjectFollowOpportunity', 'p.usage_task'=>'ProjectFollowTasks', 'p.usage_bill_time'=>'BillTime',
 			'p.datec'=>"DateCreation", 'p.dateo'=>"DateStart", 'p.datee'=>"DateEnd", 'p.fk_statut'=>'ProjectStatus', 'cls.code'=>'OpportunityStatus', 'p.opp_percent'=>'OpportunityProbability', 'p.opp_amount'=>'OpportunityAmount', 'p.description'=>"Description"
 		);
-	    // Add multicompany field
-        if (!empty($conf->global->MULTICOMPANY_ENTITY_IN_EXPORT_IF_SHARED))
-        {
-            $nbofallowedentities = count(explode(',', getEntity('project'))); // If project are shared, nb will be > 1
-            if (!empty($conf->multicompany->enabled) && $nbofallowedentities > 1) $this->export_fields_array[$r] += array('p.entity'=>'Entity');
-        }
+		// Add multicompany field
+		if (!empty($conf->global->MULTICOMPANY_ENTITY_IN_EXPORT_IF_SHARED))
+		{
+			$nbofallowedentities = count(explode(',', getEntity('project'))); // If project are shared, nb will be > 1
+			if (!empty($conf->multicompany->enabled) && $nbofallowedentities > 1) $this->export_fields_array[$r] += array('p.entity'=>'Entity');
+		}
 		if (empty($conf->global->PROJECT_USE_OPPORTUNITIES))
 		{
-		    unset($this->export_fields_array[$r]['p.opp_percent']);
-		    unset($this->export_fields_array[$r]['p.opp_amount']);
-		    unset($this->export_fields_array[$r]['cls.code']);
+			unset($this->export_fields_array[$r]['p.opp_percent']);
+			unset($this->export_fields_array[$r]['p.opp_amount']);
+			unset($this->export_fields_array[$r]['cls.code']);
 		}
 
 		// Add fields for project
@@ -260,22 +260,22 @@ class modProjet extends DolibarrModules
 		// Add fields for tasks
 		$this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('pt.rowid'=>'TaskId', 'pt.ref'=>'RefTask', 'pt.label'=>'LabelTask', 'pt.dateo'=>"TaskDateStart", 'pt.datee'=>"TaskDateEnd", 'pt.duration_effective'=>"DurationEffective", 'pt.planned_workload'=>"PlannedWorkload", 'pt.progress'=>"Progress", 'pt.description'=>"TaskDescription"));
 		$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('pt.rowid'=>'projecttask', 'pt.ref'=>'projecttask', 'pt.label'=>'projecttask', 'pt.dateo'=>"projecttask", 'pt.datee'=>"projecttask", 'pt.duration_effective'=>"projecttask", 'pt.planned_workload'=>"projecttask", 'pt.progress'=>"projecttask", 'pt.description'=>"projecttask"));
-        // Add extra fields for task
+		// Add extra fields for task
 		$keyforselect = 'projet_task'; $keyforelement = 'projecttask'; $keyforaliasextra = 'extra2';
 		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
-        // End add extra fields
+		// End add extra fields
 		$this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('ptt.rowid'=>'IdTaskTime', 'ptt.task_date'=>'TaskTimeDate', 'ptt.task_duration'=>"TimesSpent", 'ptt.fk_user'=>"TaskTimeUser", 'ptt.note'=>"TaskTimeNote"));
 		$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('ptt.rowid'=>'task_time', 'ptt.task_date'=>'task_time', 'ptt.task_duration'=>"task_time", 'ptt.fk_user'=>"task_time", 'ptt.note'=>"task_time"));
 		if (empty($conf->global->PROJECT_HIDE_TASKS)) {
 			$this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('f.ref'=>"Billed"));
 			$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('f.ref'=>"task_time"));
 		}
-        $this->export_sql_start[$r] = 'SELECT DISTINCT ';
+		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
 		$this->export_sql_end[$r] = ' FROM '.MAIN_DB_PREFIX.'projet as p';
-        $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'projet_extrafields as extra ON p.rowid = extra.fk_object';
-        $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_lead_status as cls ON p.fk_opp_status = cls.rowid';
-        $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX."projet_task as pt ON p.rowid = pt.fk_projet";
-        $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'projet_task_extrafields as extra2 ON pt.rowid = extra2.fk_object';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'projet_extrafields as extra ON p.rowid = extra.fk_object';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_lead_status as cls ON p.fk_opp_status = cls.rowid';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX."projet_task as pt ON p.rowid = pt.fk_projet";
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'projet_task_extrafields as extra2 ON pt.rowid = extra2.fk_object';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX."projet_task_time as ptt ON pt.rowid = ptt.fk_task";
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s ON p.fk_soc = s.rowid';
 		if (empty($conf->global->PROJECT_HIDE_TASKS)) {
@@ -287,34 +287,34 @@ class modProjet extends DolibarrModules
 		// Import list of tasks
 		if (empty($conf->global->PROJECT_HIDE_TASKS))
 		{
-    		$r++;
-    		$this->import_code[$r] = 'tasksofprojects';
-    		$this->import_label[$r] = 'ImportDatasetTasks';
-    		$this->import_icon[$r] = 'task';
-    		$this->import_entities_array[$r] = array('t.fk_projet'=>'project'); // We define here only fields that use another icon that the one defined into import_icon
-    		$this->import_tables_array[$r] = array('t'=>MAIN_DB_PREFIX.'projet_task', 'extra'=>MAIN_DB_PREFIX.'projet_task_extrafields'); // List of tables to insert into (insert done in same order)
-    		$this->import_fields_array[$r] = array('t.fk_projet'=>'ProjectRef*', 't.ref'=>'RefTask*', 't.label'=>'LabelTask*', 't.dateo'=>"DateStart", 't.datee'=>"DateEnd", 't.planned_workload'=>"PlannedWorkload", 't.progress'=>"Progress", 't.note_private'=>"NotePrivate", 't.note_public'=>"NotePublic", 't.datec'=>"DateCreation");
-    		// Add extra fields
-    		$sql = "SELECT name, label, fieldrequired FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'projet_task' AND entity IN (0,".$conf->entity.")";
-    		$resql = $this->db->query($sql);
-    		if ($resql)    // This can fail when class is used on old database (during migration for example)
-    		{
-    		    while ($obj = $this->db->fetch_object($resql))
-    		    {
-    		        $fieldname = 'extra.'.$obj->name;
-    		        $fieldlabel = ucfirst($obj->label);
-    		        $this->import_fields_array[$r][$fieldname] = $fieldlabel.($obj->fieldrequired ? '*' : '');
-    		    }
-    		}
-    		// End add extra fields
-    		$this->import_fieldshidden_array[$r] = array('t.fk_user_creat'=>'user->id', 'extra.fk_object'=>'lastrowid-'.MAIN_DB_PREFIX.'projet_task'); // aliastable.field => ('user->id' or 'lastrowid-'.tableparent)
-    		$this->import_convertvalue_array[$r] = array(
-    		    't.fk_projet'=>array('rule'=>'fetchidfromref', 'classfile'=>'/projet/class/project.class.php', 'class'=>'Project', 'method'=>'fetch', 'element'=>'Project'),
-    		    't.ref'=>array('rule'=>'getrefifauto')
-    		);
-    		//$this->import_convertvalue_array[$r]=array('s.fk_soc'=>array('rule'=>'lastrowid',table='t');
-    		$this->import_regex_array[$r] = array('t.dateo'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$', 't.datee'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$', 't.datec'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]( [0-9][0-9]:[0-9][0-9]:[0-9][0-9])?$');
-    		$this->import_examplevalues_array[$r] = array('t.fk_projet'=>'MyProjectRef', 't.ref'=>"auto or TK2010-1234", 't.label'=>"My task", 't.progress'=>"0 (not started) to 100 (finished)", 't.datec'=>'1972-10-10', 't.note_private'=>"My private note", 't.note_public'=>"My public note");
+			$r++;
+			$this->import_code[$r] = 'tasksofprojects';
+			$this->import_label[$r] = 'ImportDatasetTasks';
+			$this->import_icon[$r] = 'task';
+			$this->import_entities_array[$r] = array('t.fk_projet'=>'project'); // We define here only fields that use another icon that the one defined into import_icon
+			$this->import_tables_array[$r] = array('t'=>MAIN_DB_PREFIX.'projet_task', 'extra'=>MAIN_DB_PREFIX.'projet_task_extrafields'); // List of tables to insert into (insert done in same order)
+			$this->import_fields_array[$r] = array('t.fk_projet'=>'ProjectRef*', 't.ref'=>'RefTask*', 't.label'=>'LabelTask*', 't.dateo'=>"DateStart", 't.datee'=>"DateEnd", 't.planned_workload'=>"PlannedWorkload", 't.progress'=>"Progress", 't.note_private'=>"NotePrivate", 't.note_public'=>"NotePublic", 't.datec'=>"DateCreation");
+			// Add extra fields
+			$sql = "SELECT name, label, fieldrequired FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'projet_task' AND entity IN (0,".$conf->entity.")";
+			$resql = $this->db->query($sql);
+			if ($resql)    // This can fail when class is used on old database (during migration for example)
+			{
+				while ($obj = $this->db->fetch_object($resql))
+				{
+					$fieldname = 'extra.'.$obj->name;
+					$fieldlabel = ucfirst($obj->label);
+					$this->import_fields_array[$r][$fieldname] = $fieldlabel.($obj->fieldrequired ? '*' : '');
+				}
+			}
+			// End add extra fields
+			$this->import_fieldshidden_array[$r] = array('t.fk_user_creat'=>'user->id', 'extra.fk_object'=>'lastrowid-'.MAIN_DB_PREFIX.'projet_task'); // aliastable.field => ('user->id' or 'lastrowid-'.tableparent)
+			$this->import_convertvalue_array[$r] = array(
+				't.fk_projet'=>array('rule'=>'fetchidfromref', 'classfile'=>'/projet/class/project.class.php', 'class'=>'Project', 'method'=>'fetch', 'element'=>'Project'),
+				't.ref'=>array('rule'=>'getrefifauto')
+			);
+			//$this->import_convertvalue_array[$r]=array('s.fk_soc'=>array('rule'=>'lastrowid',table='t');
+			$this->import_regex_array[$r] = array('t.dateo'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$', 't.datee'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$', 't.datec'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]( [0-9][0-9]:[0-9][0-9]:[0-9][0-9])?$');
+			$this->import_examplevalues_array[$r] = array('t.fk_projet'=>'MyProjectRef', 't.ref'=>"auto or TK2010-1234", 't.label'=>"My task", 't.progress'=>"0 (not started) to 100 (finished)", 't.datec'=>'1972-10-10', 't.note_private'=>"My private note", 't.note_public'=>"My public note");
 		}
 	}
 
@@ -324,7 +324,7 @@ class modProjet 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/modPropale.class.php b/htdocs/core/modules/modPropale.class.php
index 5791998ff6a..f06496e781a 100644
--- a/htdocs/core/modules/modPropale.class.php
+++ b/htdocs/core/modules/modPropale.class.php
@@ -113,8 +113,8 @@ class modPropale extends DolibarrModules
 
 		// Boxes
 		$this->boxes = array(
-           	0=>array('file'=>'box_graph_propales_permonth.php', 'enabledbydefaulton'=>'Home'),
-           	1=>array('file'=>'box_propales.php', 'enabledbydefaulton'=>'Home'),
+		   	0=>array('file'=>'box_graph_propales_permonth.php', 'enabledbydefaulton'=>'Home'),
+		   	1=>array('file'=>'box_propales.php', 'enabledbydefaulton'=>'Home'),
 		);
 
 		// Permissions
@@ -150,7 +150,7 @@ class modPropale extends DolibarrModules
 		$this->rights[$r][2] = 'd'; // type de la permission (deprecie a ce jour)
 		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
 		$this->rights[$r][4] = 'propal_advance';
-        $this->rights[$r][5] = 'send';
+		$this->rights[$r][5] = 'send';
 
 		$r++;
 		$this->rights[$r][0] = 26; // id de la permission
@@ -199,11 +199,11 @@ class modPropale extends DolibarrModules
 		);
 		if (!empty($conf->multicurrency->enabled))
 		{
-		    $this->export_fields_array[$r]['c.multicurrency_code'] = 'Currency';
-		    $this->export_fields_array[$r]['c.multicurrency_tx'] = 'CurrencyRate';
-		    $this->export_fields_array[$r]['c.multicurrency_total_ht'] = 'MulticurrencyAmountHT';
-		    $this->export_fields_array[$r]['c.multicurrency_total_tva'] = 'MulticurrencyAmountVAT';
-		    $this->export_fields_array[$r]['c.multicurrency_total_ttc'] = 'MulticurrencyAmountTTC';
+			$this->export_fields_array[$r]['c.multicurrency_code'] = 'Currency';
+			$this->export_fields_array[$r]['c.multicurrency_tx'] = 'CurrencyRate';
+			$this->export_fields_array[$r]['c.multicurrency_total_ht'] = 'MulticurrencyAmountHT';
+			$this->export_fields_array[$r]['c.multicurrency_total_tva'] = 'MulticurrencyAmountVAT';
+			$this->export_fields_array[$r]['c.multicurrency_total_ttc'] = 'MulticurrencyAmountTTC';
 		}
 		//$this->export_TypeFields_array[$r]=array(
 		//	's.rowid'=>"List:societe:nom",'s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','co.code'=>'Text','s.phone'=>'Text',
@@ -431,7 +431,7 @@ class modPropale 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/modReceiptPrinter.class.php b/htdocs/core/modules/modReceiptPrinter.class.php
index 32124dc8f5b..0c47d4aa4b9 100644
--- a/htdocs/core/modules/modReceiptPrinter.class.php
+++ b/htdocs/core/modules/modReceiptPrinter.class.php
@@ -35,114 +35,114 @@ include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
 class modReceiptPrinter extends DolibarrModules
 {
 
-    /**
-     *  Constructor
-     *
-     *  @param      DoliDB      $db      Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-        $this->numero = 67000;
-        // Family can be 'crm','financial','hr','projects','products','ecm','technic','other'
-        // It is used to group modules in module setup page
-        $this->family = "interface";
-        $this->module_position = '53';
-        // 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));
-        // Module description, used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
-        $this->description = "ReceiptPrinterDesc";
+	/**
+	 *  Constructor
+	 *
+	 *  @param      DoliDB      $db      Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+		$this->numero = 67000;
+		// Family can be 'crm','financial','hr','projects','products','ecm','technic','other'
+		// It is used to group modules in module setup page
+		$this->family = "interface";
+		$this->module_position = '53';
+		// 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));
+		// Module description, used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
+		$this->description = "ReceiptPrinterDesc";
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or 'dolibarr_deprecated' or version
-        $this->version = 'experimental';
-        $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-        // Name of image file used for this module.
-        // If file is in theme/yourtheme/img directory under name object_pictovalue.png, use this->picto='pictovalue'
-        // If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module'
-        $this->picto = 'printer';
+		$this->version = 'experimental';
+		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+		// Name of image file used for this module.
+		// If file is in theme/yourtheme/img directory under name object_pictovalue.png, use this->picto='pictovalue'
+		// If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module'
+		$this->picto = 'printer';
 
-        // Data directories to create when module is enabled.
-        $this->dirs = array();
+		// Data directories to create when module is enabled.
+		$this->dirs = array();
 
-        // Config pages
-        $this->config_page_url = array("receiptprinter.php");
+		// Config pages
+		$this->config_page_url = array("receiptprinter.php");
 
-        // Dependencies
-        $this->hidden = false; // A condition to hide module
+		// Dependencies
+		$this->hidden = false; // A condition to hide module
 		$this->depends = array(); // List of module class names as string that must be enabled if this module is enabled
 		$this->requiredby = array(); // List of module ids to disable if this one is disabled
 		$this->conflictwith = array(); // List of module class names as string this module is in conflict with
 		$this->phpmin = array(5, 4); // Minimum version of PHP required by module
-        $this->need_dolibarr_version = array(3, 9, -2); // Minimum version of Dolibarr required by module
-        $this->conflictwith = array();
-        $this->langfiles = array("receiptprinter");
+		$this->need_dolibarr_version = array(3, 9, -2); // Minimum version of Dolibarr required by module
+		$this->conflictwith = array();
+		$this->langfiles = array("receiptprinter");
 
-        // Constants
-        $this->const = array();
+		// Constants
+		$this->const = array();
 
-        // Boxes
-        $this->boxes = array();
+		// Boxes
+		$this->boxes = array();
 
-        // Permissions
-        $this->rights = array();
-        $this->rights_class = 'receiptprinter';
+		// Permissions
+		$this->rights = array();
+		$this->rights_class = 'receiptprinter';
 
-        $r = 0;
-        // $this->rights[$r][0]     Id permission (unique tous modules confondus)
-        // $this->rights[$r][1]     Libelle par defaut si traduction de cle "PermissionXXX" non trouvee (XXX = Id permission)
-        // $this->rights[$r][2]     Non utilise
-        // $this->rights[$r][3]     1=Permis par defaut, 0=Non permis par defaut
-        // $this->rights[$r][4]     Niveau 1 pour nommer permission dans code
-        // $this->rights[$r][5]     Niveau 2 pour nommer permission dans code
+		$r = 0;
+		// $this->rights[$r][0]     Id permission (unique tous modules confondus)
+		// $this->rights[$r][1]     Libelle par defaut si traduction de cle "PermissionXXX" non trouvee (XXX = Id permission)
+		// $this->rights[$r][2]     Non utilise
+		// $this->rights[$r][3]     1=Permis par defaut, 0=Non permis par defaut
+		// $this->rights[$r][4]     Niveau 1 pour nommer permission dans code
+		// $this->rights[$r][5]     Niveau 2 pour nommer permission dans code
 
-        $r++;
-        $this->rights[$r][0] = 67000;
-        $this->rights[$r][1] = 'ReceiptPrinter';
-        $this->rights[$r][2] = 'r';
-        $this->rights[$r][3] = 0;
-        $this->rights[$r][4] = 'read';
+		$r++;
+		$this->rights[$r][0] = 67000;
+		$this->rights[$r][1] = 'ReceiptPrinter';
+		$this->rights[$r][2] = 'r';
+		$this->rights[$r][3] = 0;
+		$this->rights[$r][4] = 'read';
 
-        // Main menu entries
-        $this->menus = array(); // List of menus to add
-        $r = 0;
+		// Main menu entries
+		$this->menus = array(); // List of menus to add
+		$r = 0;
 
-        // This is to declare the Top Menu entry:
-        //$this->menu[$r]=array(  'fk_menu'=>'fk_mainmenu=home,fk_leftmenu=admintools',               // Put 0 if this is a top menu
-        //                        'type'=>'left',                 // This is a Top menu entry
-        //                        'titre'=>'MenuDirectPrinting',
-        //                        'mainmenu'=>'printing',
-        //                        'url'=>'/printing/index.php',
-        //                        'langs'=>'printing',            // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-        //                        'position'=>300,
-        //                        'enabled'=>'$conf->printing->enabled && preg_match(\'/^(admintools|all)/\',$leftmenu)',
-        //                        'perms'=>'$user->rights->printing->read',    // Use 'perms'=>'1' if you want your menu with no permission rules
-        //                        'target'=>'',
-        //                        'user'=>0);                     // 0=Menu for internal users, 1=external users, 2=both
+		// This is to declare the Top Menu entry:
+		//$this->menu[$r]=array(  'fk_menu'=>'fk_mainmenu=home,fk_leftmenu=admintools',               // Put 0 if this is a top menu
+		//                        'type'=>'left',                 // This is a Top menu entry
+		//                        'titre'=>'MenuDirectPrinting',
+		//                        'mainmenu'=>'printing',
+		//                        'url'=>'/printing/index.php',
+		//                        'langs'=>'printing',            // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+		//                        'position'=>300,
+		//                        'enabled'=>'$conf->printing->enabled && preg_match(\'/^(admintools|all)/\',$leftmenu)',
+		//                        'perms'=>'$user->rights->printing->read',    // Use 'perms'=>'1' if you want your menu with no permission rules
+		//                        'target'=>'',
+		//                        'user'=>0);                     // 0=Menu for internal users, 1=external users, 2=both
 
-        $r++;
-    }
+		$r++;
+	}
 
 
-    /**
-     *      Function called when module is enabled.
-     *      The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
-     *      It also creates data directories
-     *
-     *      @param      string  $options    Options when enabling module ('', 'noboxes')
-     *      @return     int                 1 if OK, 0 if KO
-     */
-    public function init($options = '')
-    {
-        global $conf, $langs;
-        // Clean before activation
-        $this->remove($options);
+	/**
+	 *      Function called when module is enabled.
+	 *      The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
+	 *      It also creates data directories
+	 *
+	 *      @param      string  $options    Options when enabling module ('', 'noboxes')
+	 *      @return     int                 1 if OK, 0 if KO
+	 */
+	public function init($options = '')
+	{
+		global $conf, $langs;
+		// Clean before activation
+		$this->remove($options);
 
-        $templateexample = '{dol_align_center}\r\n{dol_print_text}{dol_value_mysoc_name}\r\n{dol_print_text}{dol_value_mysoc_address}\r\n{dol_print_text}{dol_value_mysoc_zip}{dol_value_mysoc_town}\r\n{dol_line_feed}\r\n{dol_print_text}Facture {dol_value_object_ref}\r\n{dol_line_feed}\r\n{dol_align_left}\r\n{dol_print_object_lines}\r\n{dol_line_feed}\r\n{dol_print_object_tax}\r\n{dol_line_feed}\r\n{dol_print_object_total}\r\n{dol_line_feed}\r\n{dol_cut_paper_full}';
-        $sql = array(
-            "CREATE TABLE IF NOT EXISTS ".MAIN_DB_PREFIX."printer_receipt (rowid integer AUTO_INCREMENT PRIMARY KEY, name varchar(128), fk_type integer, fk_profile integer, parameter varchar(128), entity integer) ENGINE=innodb;",
-            "CREATE TABLE IF NOT EXISTS ".MAIN_DB_PREFIX."printer_receipt_template (rowid integer AUTO_INCREMENT PRIMARY KEY, name varchar(128), template text, entity integer) ENGINE=innodb;",
-        	"DELETE FROM ".MAIN_DB_PREFIX."printer_receipt_template WHERE name = '".$langs->trans('Example')."';",
+		$templateexample = '{dol_align_center}\r\n{dol_print_text}{dol_value_mysoc_name}\r\n{dol_print_text}{dol_value_mysoc_address}\r\n{dol_print_text}{dol_value_mysoc_zip}{dol_value_mysoc_town}\r\n{dol_line_feed}\r\n{dol_print_text}Facture {dol_value_object_ref}\r\n{dol_line_feed}\r\n{dol_align_left}\r\n{dol_print_object_lines}\r\n{dol_line_feed}\r\n{dol_print_object_tax}\r\n{dol_line_feed}\r\n{dol_print_object_total}\r\n{dol_line_feed}\r\n{dol_cut_paper_full}';
+		$sql = array(
+			"CREATE TABLE IF NOT EXISTS ".MAIN_DB_PREFIX."printer_receipt (rowid integer AUTO_INCREMENT PRIMARY KEY, name varchar(128), fk_type integer, fk_profile integer, parameter varchar(128), entity integer) ENGINE=innodb;",
+			"CREATE TABLE IF NOT EXISTS ".MAIN_DB_PREFIX."printer_receipt_template (rowid integer AUTO_INCREMENT PRIMARY KEY, name varchar(128), template text, entity integer) ENGINE=innodb;",
+			"DELETE FROM ".MAIN_DB_PREFIX."printer_receipt_template WHERE name = '".$langs->trans('Example')."';",
 			"INSERT INTO ".MAIN_DB_PREFIX."printer_receipt_template (name,template,entity) VALUES ('".$langs->trans('Example')."', '".$templateexample."', 1);",
 		);
-        return $this->_init($sql, $options);
-    }
+		return $this->_init($sql, $options);
+	}
 }
diff --git a/htdocs/core/modules/modReception.class.php b/htdocs/core/modules/modReception.class.php
index 19cd20271b8..497c0b5f95e 100644
--- a/htdocs/core/modules/modReception.class.php
+++ b/htdocs/core/modules/modReception.class.php
@@ -57,9 +57,9 @@ class modReception extends DolibarrModules
 
 		// Data directories to create when module is enabled
 		$this->dirs = array("/reception/receipt",
-		                    "/reception/receipt/temp",
-		                    "/doctemplates/receptions"
-		                    );
+							"/reception/receipt/temp",
+							"/doctemplates/receptions"
+							);
 
 		// Config pages
 		$this->config_page_url = array("reception_setup.php");
@@ -138,7 +138,7 @@ class modReception extends DolibarrModules
 		$this->rights[$r][2] = 'd'; // type de la permission (deprecie a ce jour)
 		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
 		$this->rights[$r][4] = 'reception_advance';
-        $this->rights[$r][5] = 'send';
+		$this->rights[$r][5] = 'send';
 
 		$r++;
 		$this->rights[$r][0] = $this->numero.$r;
@@ -205,8 +205,8 @@ class modReception extends DolibarrModules
 		$this->export_dependencies_array[$r] = array('reception_line'=>'ed.rowid', 'product'=>'ed.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
 		if ($idcontacts && !empty($conf->global->RECEPTION_ADD_CONTACTS_IN_EXPORT))
 		{
-		    $keyforselect = 'socpeople'; $keyforelement = 'contact'; $keyforaliasextra = 'extra3';
-		    include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
+			$keyforselect = 'socpeople'; $keyforelement = 'contact'; $keyforaliasextra = 'extra3';
+			include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
 		}
 		$keyforselect = 'reception'; $keyforelement = 'reception'; $keyforaliasextra = 'extra';
 		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
@@ -225,9 +225,9 @@ class modReception extends DolibarrModules
 		$this->export_sql_end[$r] .= ' , '.MAIN_DB_PREFIX.'commande_fournisseurdet as cd';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p on cd.fk_product = p.rowid';
 		if ($idcontacts && !empty($conf->global->RECEPTION_ADD_CONTACTS_IN_EXPORT)) {
-		    $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'element_contact as ee ON ee.element_id = cd.fk_commande AND ee.fk_c_type_contact IN ('.$idcontacts.')';
-		    $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'socpeople as sp ON sp.rowid = ee.fk_socpeople';
-		    $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'socpeople_extrafields as extra3 ON sp.rowid = extra3.fk_object';
+			$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'element_contact as ee ON ee.element_id = cd.fk_commande AND ee.fk_c_type_contact IN ('.$idcontacts.')';
+			$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'socpeople as sp ON sp.rowid = ee.fk_socpeople';
+			$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'socpeople_extrafields as extra3 ON sp.rowid = extra3.fk_object';
 		}
 		$this->export_sql_end[$r] .= ' WHERE c.fk_soc = s.rowid AND c.rowid = ed.fk_reception AND ed.fk_commandefourndet = cd.rowid';
 		$this->export_sql_end[$r] .= ' AND c.entity IN ('.getEntity('reception').')';
@@ -240,7 +240,7 @@ class modReception 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/modService.class.php b/htdocs/core/modules/modService.class.php
index 258af06389a..b4dd93ff3e0 100644
--- a/htdocs/core/modules/modService.class.php
+++ b/htdocs/core/modules/modService.class.php
@@ -93,28 +93,28 @@ class modService extends DolibarrModules
 		$this->rights[$r][2] = 'r'; // type de la permission (deprecie a ce jour)
 		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
 		$this->rights[$r][4] = 'lire';
-        $r++;
+		$r++;
 
 		$this->rights[$r][0] = 532; // id de la permission
 		$this->rights[$r][1] = 'Create/modify services'; // libelle de la permission
 		$this->rights[$r][2] = 'w'; // type de la permission (deprecie a ce jour)
 		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
 		$this->rights[$r][4] = 'creer';
-        $r++;
+		$r++;
 
 		$this->rights[$r][0] = 534; // id de la permission
 		$this->rights[$r][1] = 'Delete les services'; // libelle de la permission
 		$this->rights[$r][2] = 'd'; // type de la permission (deprecie a ce jour)
 		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
 		$this->rights[$r][4] = 'supprimer';
-        $r++;
+		$r++;
 
 		$this->rights[$r][0] = 538; // Must be same permission than in product module
 		$this->rights[$r][1] = 'Export services';
 		$this->rights[$r][2] = 'r';
 		$this->rights[$r][3] = 0;
 		$this->rights[$r][4] = 'export';
-        $r++;
+		$r++;
 
 		// Menus
 		//-------
@@ -137,7 +137,7 @@ class modService extends DolibarrModules
 		$usenpr = 0;
 		if (is_object($mysoc)) $usenpr = $mysoc->useNPR();
 
-        // Exports
+		// Exports
 		//--------
 		$r = 0;
 
@@ -208,8 +208,8 @@ class modService extends DolibarrModules
 		if (!empty($conf->global->MAIN_MULTILANGS)) $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_lang as l ON l.fk_product = p.rowid';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_extrafields as extra ON p.rowid = extra.fk_object';
 		if (!empty($conf->fournisseur->enabled)) $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_fournisseur_price as pf ON pf.fk_product = p.rowid LEFT JOIN '.MAIN_DB_PREFIX.'societe s ON s.rowid = pf.fk_soc';
-        $this->export_sql_end[$r] .= ' WHERE p.fk_product_type = 1 AND p.entity IN ('.getEntity('product').')';
-        if (!empty($conf->global->EXPORTTOOL_CATEGORIES)) $this->export_sql_order[$r] = ' GROUP BY p.rowid'; // FIXME The group by used a generic value to say "all fields in select except function fields"
+		$this->export_sql_end[$r] .= ' WHERE p.fk_product_type = 1 AND p.entity IN ('.getEntity('product').')';
+		if (!empty($conf->global->EXPORTTOOL_CATEGORIES)) $this->export_sql_order[$r] = ' GROUP BY p.rowid'; // FIXME The group by used a generic value to say "all fields in select except function fields"
 
 		if (empty($conf->product->enabled))	// We enable next import templates only if module product not already enabled (to avoid duplicate entries)
 		{
@@ -238,8 +238,8 @@ class modService extends DolibarrModules
 					'pr.price_ttc'=>"product",
 					'pr.price_min'=>"product", 'pr.price_min_ttc'=>"product",
 					'pr.tva_tx'=>'product',
-				    'pr.recuperableonly'=>'product',
-				    'pr.date_price'=>"product");
+					'pr.recuperableonly'=>'product',
+					'pr.date_price'=>"product");
 				$this->export_sql_start[$r] = 'SELECT DISTINCT ';
 				$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'product as p';
 				$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_price as pr ON p.rowid = pr.fk_product AND pr.entity = '.$conf->entity; // export prices only for the current entity
@@ -248,90 +248,90 @@ class modService extends DolibarrModules
 
 			if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 			{
-			    // Exports product multiprice
-			    $r++;
-			    $this->export_code[$r] = $this->rights_class.'_'.$r;
-			    $this->export_label[$r] = "ProductsPricePerCustomer"; // Translation key (used only if key ExportDataset_xxx_z not found)
-			    $this->export_permission[$r] = array(array("produit", "export"));
-			    $this->export_fields_array[$r] = array('p.rowid'=>"Id", 'p.ref'=>"Ref",
-			        's.nom'=>'ThirdParty',
-			        'pr.price_base_type'=>"PriceBase",
-			        'pr.price'=>"PriceUnitPriceHT", 'pr.price_ttc'=>"PriceUnitPriceTTC",
-			        'pr.price_min'=>"MinPriceUnitPriceHT", 'pr.price_min_ttc'=>"MinPriceUnitPriceTTC",
-			        'pr.tva_tx'=>'PriceVATRate',
-			        'pr.default_vat_code'=>'PriceVATCode',
-			        'pr.datec'=>'DateCreation');
-			    if (is_object($mysoc) && $usenpr) $this->export_fields_array[$r]['pr.recuperableonly'] = 'NPR';
-			    $this->export_entities_array[$r] = array('p.rowid'=>"product", 'p.ref'=>"product",
-			        's.nom'=>'company',
-			        'pr.price_base_type'=>"product", 'pr.price'=>"product",
-			        'pr.price_ttc'=>"product",
-			        'pr.price_min'=>"product", 'pr.price_min_ttc'=>"product",
-			        'pr.tva_tx'=>'product',
-			        'pr.default_vat_code'=>'product',
-			        'pr.recuperableonly'=>'product',
-			        'pr.datec'=>"product");
-			    $this->export_sql_start[$r] = 'SELECT DISTINCT ';
-			    $this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'product as p';
-			    $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_customer_price as pr ON p.rowid = pr.fk_product AND pr.entity = '.$conf->entity; // export prices only for the current entity
-			    $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s ON pr.fk_soc = s.rowid';
-			    $this->export_sql_end[$r] .= ' WHERE p.entity IN ('.getEntity('product').')'; // For product and service profile
+				// Exports product multiprice
+				$r++;
+				$this->export_code[$r] = $this->rights_class.'_'.$r;
+				$this->export_label[$r] = "ProductsPricePerCustomer"; // Translation key (used only if key ExportDataset_xxx_z not found)
+				$this->export_permission[$r] = array(array("produit", "export"));
+				$this->export_fields_array[$r] = array('p.rowid'=>"Id", 'p.ref'=>"Ref",
+					's.nom'=>'ThirdParty',
+					'pr.price_base_type'=>"PriceBase",
+					'pr.price'=>"PriceUnitPriceHT", 'pr.price_ttc'=>"PriceUnitPriceTTC",
+					'pr.price_min'=>"MinPriceUnitPriceHT", 'pr.price_min_ttc'=>"MinPriceUnitPriceTTC",
+					'pr.tva_tx'=>'PriceVATRate',
+					'pr.default_vat_code'=>'PriceVATCode',
+					'pr.datec'=>'DateCreation');
+				if (is_object($mysoc) && $usenpr) $this->export_fields_array[$r]['pr.recuperableonly'] = 'NPR';
+				$this->export_entities_array[$r] = array('p.rowid'=>"product", 'p.ref'=>"product",
+					's.nom'=>'company',
+					'pr.price_base_type'=>"product", 'pr.price'=>"product",
+					'pr.price_ttc'=>"product",
+					'pr.price_min'=>"product", 'pr.price_min_ttc'=>"product",
+					'pr.tva_tx'=>'product',
+					'pr.default_vat_code'=>'product',
+					'pr.recuperableonly'=>'product',
+					'pr.datec'=>"product");
+				$this->export_sql_start[$r] = 'SELECT DISTINCT ';
+				$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'product as p';
+				$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_customer_price as pr ON p.rowid = pr.fk_product AND pr.entity = '.$conf->entity; // export prices only for the current entity
+				$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s ON pr.fk_soc = s.rowid';
+				$this->export_sql_end[$r] .= ' WHERE p.entity IN ('.getEntity('product').')'; // For product and service profile
 			}
 
 			if (!empty($conf->global->PRODUIT_SOUSPRODUITS))
 			{
-			    // Exports virtual products
-			    $r++;
-			    $this->export_code[$r] = $this->rights_class.'_'.$r;
-			    $this->export_label[$r] = "AssociatedProducts"; // Translation key (used only if key ExportDataset_xxx_z not found)
-			    $this->export_permission[$r] = array(array("produit", "export"));
-			    $this->export_fields_array[$r] = array(
-			        'p.rowid'=>"Id", 'p.ref'=>"Ref", 'p.label'=>"Label", 'p.description'=>"Description", 'p.url'=>"PublicUrl",
-			    	'p.accountancy_code_sell'=>"ProductAccountancySellCode", 'p.accountancy_code_sell_intra'=>"ProductAccountancySellIntraCode",
-			    	'p.accountancy_code_sell_export'=>"ProductAccountancySellExportCode", 'p.accountancy_code_buy'=>"ProductAccountancyBuyCode",
+				// Exports virtual products
+				$r++;
+				$this->export_code[$r] = $this->rights_class.'_'.$r;
+				$this->export_label[$r] = "AssociatedProducts"; // Translation key (used only if key ExportDataset_xxx_z not found)
+				$this->export_permission[$r] = array(array("produit", "export"));
+				$this->export_fields_array[$r] = array(
+					'p.rowid'=>"Id", 'p.ref'=>"Ref", 'p.label'=>"Label", 'p.description'=>"Description", 'p.url'=>"PublicUrl",
+					'p.accountancy_code_sell'=>"ProductAccountancySellCode", 'p.accountancy_code_sell_intra'=>"ProductAccountancySellIntraCode",
+					'p.accountancy_code_sell_export'=>"ProductAccountancySellExportCode", 'p.accountancy_code_buy'=>"ProductAccountancyBuyCode",
 					'p.accountancy_code_buy_intra'=>"ProductAccountancyBuyIntraCode", 'p.accountancy_code_buy_export'=>"ProductAccountancyBuyExportCode",
-			    	'p.note'=>"NotePrivate", 'p.note_public'=>'NotePublic',
-			    	'p.weight'=>"Weight", 'p.length'=>"Length", 'p.surface'=>"Surface", 'p.volume'=>"Volume", 'p.customcode'=>'CustomCode',
-			        'p.price_base_type'=>"PriceBase", 'p.price'=>"UnitPriceHT", 'p.price_ttc'=>"UnitPriceTTC", 'p.tva_tx'=>'VATRate', 'p.tosell'=>"OnSell",
-			        'p.tobuy'=>"OnBuy", 'p.datec'=>'DateCreation', 'p.tms'=>'DateModification'
-			    );
-			    if (!empty($conf->stock->enabled)) $this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('p.stock'=>'Stock', 'p.seuil_stock_alerte'=>'StockLimit', 'p.desiredstock'=>'DesiredStock', 'p.pmp'=>'PMPValue'));
-			    if (!empty($conf->barcode->enabled)) $this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('p.barcode'=>'BarCode'));
-			    $this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('pa.qty'=>'Qty', 'pa.incdec'=>'ComposedProductIncDecStock'));
-			    $this->export_TypeFields_array[$r] = array(
-			        'p.ref'=>"Text", 'p.label'=>"Text", 'p.description'=>"Text", 'p.url'=>"Text",
-			    	'p.accountancy_code_sell'=>"Text", 'p.accountancy_code_sell_intra'=>"Text", 'p.accountancy_code_sell_export'=>"Text",
+					'p.note'=>"NotePrivate", 'p.note_public'=>'NotePublic',
+					'p.weight'=>"Weight", 'p.length'=>"Length", 'p.surface'=>"Surface", 'p.volume'=>"Volume", 'p.customcode'=>'CustomCode',
+					'p.price_base_type'=>"PriceBase", 'p.price'=>"UnitPriceHT", 'p.price_ttc'=>"UnitPriceTTC", 'p.tva_tx'=>'VATRate', 'p.tosell'=>"OnSell",
+					'p.tobuy'=>"OnBuy", 'p.datec'=>'DateCreation', 'p.tms'=>'DateModification'
+				);
+				if (!empty($conf->stock->enabled)) $this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('p.stock'=>'Stock', 'p.seuil_stock_alerte'=>'StockLimit', 'p.desiredstock'=>'DesiredStock', 'p.pmp'=>'PMPValue'));
+				if (!empty($conf->barcode->enabled)) $this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('p.barcode'=>'BarCode'));
+				$this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('pa.qty'=>'Qty', 'pa.incdec'=>'ComposedProductIncDecStock'));
+				$this->export_TypeFields_array[$r] = array(
+					'p.ref'=>"Text", 'p.label'=>"Text", 'p.description'=>"Text", 'p.url'=>"Text",
+					'p.accountancy_code_sell'=>"Text", 'p.accountancy_code_sell_intra'=>"Text", 'p.accountancy_code_sell_export'=>"Text",
 					'p.accountancy_code_buy'=>"Text", 'p.accountancy_code_buy_intra'=>"Text", 'p.accountancy_code_buy_export'=>"Text",
-			    	'p.note'=>"Text", 'p.note_public'=>"Text",
-			    	'p.weight'=>"Numeric", 'p.length'=>"Numeric", 'p.surface'=>"Numeric", 'p.volume'=>"Numeric", 'p.customcode'=>'Text',
-			        'p.price_base_type'=>"Text", 'p.price'=>"Numeric", 'p.price_ttc'=>"Numeric", 'p.tva_tx'=>'Numeric', 'p.tosell'=>"Boolean", 'p.tobuy'=>"Boolean",
-			        'p.datec'=>'Date', 'p.tms'=>'Date'
-			    );
-			    if (!empty($conf->stock->enabled)) $this->export_TypeFields_array[$r] = array_merge($this->export_TypeFields_array[$r], array('p.stock'=>'Numeric', 'p.seuil_stock_alerte'=>'Numeric', 'p.desiredstock'=>'Numeric', 'p.pmp'=>'Numeric', 'p.cost_price'=>'Numeric'));
-			    if (!empty($conf->barcode->enabled)) $this->export_TypeFields_array[$r] = array_merge($this->export_TypeFields_array[$r], array('p.barcode'=>'Text'));
-			    $this->export_TypeFields_array[$r] = array_merge($this->export_TypeFields_array[$r], array('pa.qty'=>'Numeric'));
-			    $this->export_entities_array[$r] = array(
-			        'p.rowid'=>"virtualproduct", 'p.ref'=>"virtualproduct", 'p.label'=>"virtualproduct", 'p.description'=>"virtualproduct", 'p.url'=>"virtualproduct",
-			    	'p.accountancy_code_sell'=>'virtualproduct', 'p.accountancy_code_sell_intra'=>'virtualproduct', 'p.accountancy_code_sell_export'=>'virtualproduct',
-			    	'p.accountancy_code_buy'=>'virtualproduct', 'p.accountancy_code_buy_intra'=>'virtualproduct', 'p.accountancy_code_buy_export'=>'virtualproduct',
+					'p.note'=>"Text", 'p.note_public'=>"Text",
+					'p.weight'=>"Numeric", 'p.length'=>"Numeric", 'p.surface'=>"Numeric", 'p.volume'=>"Numeric", 'p.customcode'=>'Text',
+					'p.price_base_type'=>"Text", 'p.price'=>"Numeric", 'p.price_ttc'=>"Numeric", 'p.tva_tx'=>'Numeric', 'p.tosell'=>"Boolean", 'p.tobuy'=>"Boolean",
+					'p.datec'=>'Date', 'p.tms'=>'Date'
+				);
+				if (!empty($conf->stock->enabled)) $this->export_TypeFields_array[$r] = array_merge($this->export_TypeFields_array[$r], array('p.stock'=>'Numeric', 'p.seuil_stock_alerte'=>'Numeric', 'p.desiredstock'=>'Numeric', 'p.pmp'=>'Numeric', 'p.cost_price'=>'Numeric'));
+				if (!empty($conf->barcode->enabled)) $this->export_TypeFields_array[$r] = array_merge($this->export_TypeFields_array[$r], array('p.barcode'=>'Text'));
+				$this->export_TypeFields_array[$r] = array_merge($this->export_TypeFields_array[$r], array('pa.qty'=>'Numeric'));
+				$this->export_entities_array[$r] = array(
+					'p.rowid'=>"virtualproduct", 'p.ref'=>"virtualproduct", 'p.label'=>"virtualproduct", 'p.description'=>"virtualproduct", 'p.url'=>"virtualproduct",
+					'p.accountancy_code_sell'=>'virtualproduct', 'p.accountancy_code_sell_intra'=>'virtualproduct', 'p.accountancy_code_sell_export'=>'virtualproduct',
+					'p.accountancy_code_buy'=>'virtualproduct', 'p.accountancy_code_buy_intra'=>'virtualproduct', 'p.accountancy_code_buy_export'=>'virtualproduct',
 					'p.note'=>"virtualproduct", 'p.length'=>"virtualproduct",
-			        'p.surface'=>"virtualproduct", 'p.volume'=>"virtualproduct", 'p.weight'=>"virtualproduct", 'p.customcode'=>'virtualproduct',
-			        'p.price_base_type'=>"virtualproduct", 'p.price'=>"virtualproduct", 'p.price_ttc'=>"virtualproduct", 'p.tva_tx'=>"virtualproduct",
-			        'p.tosell'=>"virtualproduct", 'p.tobuy'=>"virtualproduct", 'p.datec'=>"virtualproduct", 'p.tms'=>"virtualproduct"
-			    );
-			    if (!empty($conf->stock->enabled)) $this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('p.stock'=>'virtualproduct', 'p.seuil_stock_alerte'=>'virtualproduct', 'p.desiredstock'=>'virtualproduct', 'p.pmp'=>'virtualproduct'));
-			    if (!empty($conf->barcode->enabled)) $this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('p.barcode'=>'virtualproduct'));
-			    $this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('pa.qty'=>"subproduct", 'pa.incdec'=>'subproduct'));
-			    $keyforselect = 'product'; $keyforelement = 'product'; $keyforaliasextra = 'extra';
-			    include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
-			    $this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('p2.rowid'=>"Id", 'p2.ref'=>"Ref", 'p2.label'=>"Label", 'p2.description'=>"Description"));
-			    $this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('p2.rowid'=>"subproduct", 'p2.ref'=>"subproduct", 'p2.label'=>"subproduct", 'p2.description'=>"subproduct"));
-			    $this->export_sql_start[$r] = 'SELECT DISTINCT ';
-			    $this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'product as p';
-			    $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_extrafields as extra ON p.rowid = extra.fk_object,';
-			    $this->export_sql_end[$r] .= ' '.MAIN_DB_PREFIX.'product_association as pa, '.MAIN_DB_PREFIX.'product as p2';
-			    $this->export_sql_end[$r] .= ' WHERE p.entity IN ('.getEntity('product').')'; // For product and service profile
-			    $this->export_sql_end[$r] .= ' AND p.rowid = pa.fk_product_pere AND p2.rowid = pa.fk_product_fils';
+					'p.surface'=>"virtualproduct", 'p.volume'=>"virtualproduct", 'p.weight'=>"virtualproduct", 'p.customcode'=>'virtualproduct',
+					'p.price_base_type'=>"virtualproduct", 'p.price'=>"virtualproduct", 'p.price_ttc'=>"virtualproduct", 'p.tva_tx'=>"virtualproduct",
+					'p.tosell'=>"virtualproduct", 'p.tobuy'=>"virtualproduct", 'p.datec'=>"virtualproduct", 'p.tms'=>"virtualproduct"
+				);
+				if (!empty($conf->stock->enabled)) $this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('p.stock'=>'virtualproduct', 'p.seuil_stock_alerte'=>'virtualproduct', 'p.desiredstock'=>'virtualproduct', 'p.pmp'=>'virtualproduct'));
+				if (!empty($conf->barcode->enabled)) $this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('p.barcode'=>'virtualproduct'));
+				$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('pa.qty'=>"subproduct", 'pa.incdec'=>'subproduct'));
+				$keyforselect = 'product'; $keyforelement = 'product'; $keyforaliasextra = 'extra';
+				include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
+				$this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('p2.rowid'=>"Id", 'p2.ref'=>"Ref", 'p2.label'=>"Label", 'p2.description'=>"Description"));
+				$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('p2.rowid'=>"subproduct", 'p2.ref'=>"subproduct", 'p2.label'=>"subproduct", 'p2.description'=>"subproduct"));
+				$this->export_sql_start[$r] = 'SELECT DISTINCT ';
+				$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'product as p';
+				$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_extrafields as extra ON p.rowid = extra.fk_object,';
+				$this->export_sql_end[$r] .= ' '.MAIN_DB_PREFIX.'product_association as pa, '.MAIN_DB_PREFIX.'product as p2';
+				$this->export_sql_end[$r] .= ' WHERE p.entity IN ('.getEntity('product').')'; // For product and service profile
+				$this->export_sql_end[$r] .= ' AND p.rowid = pa.fk_product_pere AND p2.rowid = pa.fk_product_fils';
 			}
 		}
 
@@ -348,141 +348,141 @@ class modService extends DolibarrModules
 		$this->import_entities_array[$r] = array(); // We define here only fields that use a different icon from the one defined in import_icon
 		$this->import_tables_array[$r] = array('p'=>MAIN_DB_PREFIX.'product', 'extra'=>MAIN_DB_PREFIX.'product_extrafields');
 		$this->import_tables_creator_array[$r] = array('p'=>'fk_user_author'); // Fields to store import user id
-        $this->import_fields_array[$r] = array(
-        	'p.ref' => "Ref*",
-        	'p.label' => "Label*",
-        	'p.fk_product_type' => "Type*",
-        	'p.tosell' => "OnSell*",
-        	'p.tobuy' => "OnBuy*",
-        	'p.description' => "Description",
-        	'p.url' => "PublicUrl",
-        	'p.customcode' => 'CustomCode',
-        	'p.fk_country' => 'CountryCode',
-        	'p.accountancy_code_sell' => "ProductAccountancySellCode",
-        	'p.accountancy_code_sell_intra' => "ProductAccountancySellIntraCode",
-        	'p.accountancy_code_sell_export' => "ProductAccountancySellExportCode",
-        	'p.accountancy_code_buy' => "ProductAccountancyBuyCode",
-        	'p.accountancy_code_buy_intra' => "ProductAccountancyBuyIntraCode",
-        	'p.accountancy_code_buy_export' => "ProductAccountancyBuyExportCode",
-        	'p.note_public' => "NotePublic",
-        	'p.note' => "NotePrivate",
-        	'p.weight' => "Weight",
-        	'p.weight_units' => "WeightUnits",
-        	'p.length' => "Length",
-        	'p.length_units' => "LengthUnit",
-        	'p.width' => "Width",
-            'p.width_units' => "WidthUnits",
-        	'p.height' => "Height",
-        	'p.height_units' => "HeightUnit",
-        	'p.surface' => "Surface",
-        	'p.surface_units' => "SurfaceUnit",
-        	'p.volume' => "Volume",
-        	'p.volume_units' => "VolumeUnits",
-        	'p.duration' => "Duration", //duration of service
-        	'p.finished' => 'Nature',
-        	'p.price' => "SellingPriceHT", //without
-        	'p.price_min' => "MinPrice",
-        	'p.price_ttc' => "SellingPriceTTC", //with tax
-        	'p.price_min_ttc' => "SellingMinPriceTTC",
-        	'p.price_base_type' => "PriceBaseType", //price base: with-tax (TTC) or without (HT) tax. Displays accordingly in Product card
-        	'p.tva_tx' => 'VATRate',
-        	'p.datec' => 'DateCreation',
-        	'p.cost_price' => "CostPrice",
+		$this->import_fields_array[$r] = array(
+			'p.ref' => "Ref*",
+			'p.label' => "Label*",
+			'p.fk_product_type' => "Type*",
+			'p.tosell' => "OnSell*",
+			'p.tobuy' => "OnBuy*",
+			'p.description' => "Description",
+			'p.url' => "PublicUrl",
+			'p.customcode' => 'CustomCode',
+			'p.fk_country' => 'CountryCode',
+			'p.accountancy_code_sell' => "ProductAccountancySellCode",
+			'p.accountancy_code_sell_intra' => "ProductAccountancySellIntraCode",
+			'p.accountancy_code_sell_export' => "ProductAccountancySellExportCode",
+			'p.accountancy_code_buy' => "ProductAccountancyBuyCode",
+			'p.accountancy_code_buy_intra' => "ProductAccountancyBuyIntraCode",
+			'p.accountancy_code_buy_export' => "ProductAccountancyBuyExportCode",
+			'p.note_public' => "NotePublic",
+			'p.note' => "NotePrivate",
+			'p.weight' => "Weight",
+			'p.weight_units' => "WeightUnits",
+			'p.length' => "Length",
+			'p.length_units' => "LengthUnit",
+			'p.width' => "Width",
+			'p.width_units' => "WidthUnits",
+			'p.height' => "Height",
+			'p.height_units' => "HeightUnit",
+			'p.surface' => "Surface",
+			'p.surface_units' => "SurfaceUnit",
+			'p.volume' => "Volume",
+			'p.volume_units' => "VolumeUnits",
+			'p.duration' => "Duration", //duration of service
+			'p.finished' => 'Nature',
+			'p.price' => "SellingPriceHT", //without
+			'p.price_min' => "MinPrice",
+			'p.price_ttc' => "SellingPriceTTC", //with tax
+			'p.price_min_ttc' => "SellingMinPriceTTC",
+			'p.price_base_type' => "PriceBaseType", //price base: with-tax (TTC) or without (HT) tax. Displays accordingly in Product card
+			'p.tva_tx' => 'VATRate',
+			'p.datec' => 'DateCreation',
+			'p.cost_price' => "CostPrice",
 		);
-        if (!empty($conf->stock->enabled)) {//if Stock module enabled
-        	$this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array(
-        		'p.seuil_stock_alerte' => 'StockLimit', //lower limit for warning
-        		'p.pmp' => 'PMPValue', //weighted average price
-        		'p.desiredstock' => 'DesiredStock'//desired stock for replenishment feature
-        	));
-        }
+		if (!empty($conf->stock->enabled)) {//if Stock module enabled
+			$this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array(
+				'p.seuil_stock_alerte' => 'StockLimit', //lower limit for warning
+				'p.pmp' => 'PMPValue', //weighted average price
+				'p.desiredstock' => 'DesiredStock'//desired stock for replenishment feature
+			));
+		}
 
-        $this->import_convertvalue_array[$r] = array(
-        	'p.weight_units' => array(
-        		'rule' => 'fetchscalefromcodeunits', // Switch this to fetchidfromcodeunits when we will store id instead of scale in product table
-        		'classfile' => '/core/class/cunits.class.php',
-        		'class' => 'CUnits',
-        		'method' => 'fetch',
-        		'units' => 'weight',
-        		'dict' => 'DictionaryMeasuringUnits'
-        	),
-        	'p.length_units' => array(
-        		'rule' => 'fetchscalefromcodeunits', // Switch this to fetchidfromcodeunits when we will store id instead of scale in product table
-        		'classfile' => '/core/class/cunits.class.php',
-        		'class' => 'CUnits',
-        		'method' => 'fetch',
-        		'units' => 'size',
-        		'dict' => 'DictionaryMeasuringUnits'
-        	),
-        	'p.width_units' => array(
-        		'rule' => 'fetchscalefromcodeunits', // Switch this to fetchidfromcodeunits when we will store id instead of scale in product table
-        		'classfile' => '/core/class/cunits.class.php',
-        		'class' => 'CUnits',
-        		'method' => 'fetch',
-        		'units' => 'size',
-        		'dict' => 'DictionaryMeasuringUnits'
-        	),
-        	'p.height_units' => array(
-        		'rule' => 'fetchscalefromcodeunits', // Switch this to fetchidfromcodeunits when we will store id instead of scale in product table
-        		'classfile' => '/core/class/cunits.class.php',
-        		'class' => 'CUnits',
-        		'method' => 'fetch',
-        		'units' => 'size',
-        		'dict' => 'DictionaryMeasuringUnits'
-        	),
-        	'p.surface_units' => array(
-        		'rule' => 'fetchscalefromcodeunits', // Switch this to fetchidfromcodeunits when we will store id instead of scale in product table
-        		'classfile' => '/core/class/cunits.class.php',
-        		'class' => 'CUnits',
-        		'method' => 'fetch',
-        		'units' => 'surface',
-        		'dict' => 'DictionaryMeasuringUnits'
-        	),
-        	'p.volume_units' => array(
-        		'rule' => 'fetchscalefromcodeunits', // Switch this to fetchidfromcodeunits when we will store id instead of scale in product table
-        		'classfile' => '/core/class/cunits.class.php',
-        		'class' => 'CUnits',
-        		'method' => 'fetch',
-        		'units' => 'volume',
-        		'dict' => 'DictionaryMeasuringUnits'
-        	),
-        	'p.fk_country' => array(
-        		'rule' => 'fetchidfromcodeid',
-        		'classfile' => '/core/class/ccountry.class.php',
-        		'class' => 'Ccountry',
-        		'method' => 'fetch',
-        		'dict' => 'DictionaryCountry'
-        	)
-        );
-        if (!empty($conf->fournisseur->enabled) || !empty($conf->margin->enabled)) $this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('p.cost_price'=>'CostPrice'));
-        if (is_object($mysoc) && $usenpr) $this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('p.recuperableonly'=>'NPR'));
-        if (is_object($mysoc) && $mysoc->useLocalTax(1)) $this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('p.localtax1_tx'=>'LT1', 'p.localtax1_type'=>'LT1Type'));
-        if (is_object($mysoc) && $mysoc->useLocalTax(2)) $this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('p.localtax2_tx'=>'LT2', 'p.localtax2_type'=>'LT2Type'));
-        if (!empty($conf->barcode->enabled)) $this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('p.barcode'=>'BarCode'));
+		$this->import_convertvalue_array[$r] = array(
+			'p.weight_units' => array(
+				'rule' => 'fetchscalefromcodeunits', // Switch this to fetchidfromcodeunits when we will store id instead of scale in product table
+				'classfile' => '/core/class/cunits.class.php',
+				'class' => 'CUnits',
+				'method' => 'fetch',
+				'units' => 'weight',
+				'dict' => 'DictionaryMeasuringUnits'
+			),
+			'p.length_units' => array(
+				'rule' => 'fetchscalefromcodeunits', // Switch this to fetchidfromcodeunits when we will store id instead of scale in product table
+				'classfile' => '/core/class/cunits.class.php',
+				'class' => 'CUnits',
+				'method' => 'fetch',
+				'units' => 'size',
+				'dict' => 'DictionaryMeasuringUnits'
+			),
+			'p.width_units' => array(
+				'rule' => 'fetchscalefromcodeunits', // Switch this to fetchidfromcodeunits when we will store id instead of scale in product table
+				'classfile' => '/core/class/cunits.class.php',
+				'class' => 'CUnits',
+				'method' => 'fetch',
+				'units' => 'size',
+				'dict' => 'DictionaryMeasuringUnits'
+			),
+			'p.height_units' => array(
+				'rule' => 'fetchscalefromcodeunits', // Switch this to fetchidfromcodeunits when we will store id instead of scale in product table
+				'classfile' => '/core/class/cunits.class.php',
+				'class' => 'CUnits',
+				'method' => 'fetch',
+				'units' => 'size',
+				'dict' => 'DictionaryMeasuringUnits'
+			),
+			'p.surface_units' => array(
+				'rule' => 'fetchscalefromcodeunits', // Switch this to fetchidfromcodeunits when we will store id instead of scale in product table
+				'classfile' => '/core/class/cunits.class.php',
+				'class' => 'CUnits',
+				'method' => 'fetch',
+				'units' => 'surface',
+				'dict' => 'DictionaryMeasuringUnits'
+			),
+			'p.volume_units' => array(
+				'rule' => 'fetchscalefromcodeunits', // Switch this to fetchidfromcodeunits when we will store id instead of scale in product table
+				'classfile' => '/core/class/cunits.class.php',
+				'class' => 'CUnits',
+				'method' => 'fetch',
+				'units' => 'volume',
+				'dict' => 'DictionaryMeasuringUnits'
+			),
+			'p.fk_country' => array(
+				'rule' => 'fetchidfromcodeid',
+				'classfile' => '/core/class/ccountry.class.php',
+				'class' => 'Ccountry',
+				'method' => 'fetch',
+				'dict' => 'DictionaryCountry'
+			)
+		);
+		if (!empty($conf->fournisseur->enabled) || !empty($conf->margin->enabled)) $this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('p.cost_price'=>'CostPrice'));
+		if (is_object($mysoc) && $usenpr) $this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('p.recuperableonly'=>'NPR'));
+		if (is_object($mysoc) && $mysoc->useLocalTax(1)) $this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('p.localtax1_tx'=>'LT1', 'p.localtax1_type'=>'LT1Type'));
+		if (is_object($mysoc) && $mysoc->useLocalTax(2)) $this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('p.localtax2_tx'=>'LT2', 'p.localtax2_type'=>'LT2Type'));
+		if (!empty($conf->barcode->enabled)) $this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('p.barcode'=>'BarCode'));
 		if (!empty($conf->global->PRODUCT_USE_UNITS)) $this->import_fields_array[$r]['p.fk_unit'] = 'Unit';
-        // Add extra fields
+		// Add extra fields
 		$import_extrafield_sample = array();
 		$sql = "SELECT name, label, fieldrequired FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'product' AND entity IN (0,".$conf->entity.")";
 		$resql = $this->db->query($sql);
 		if ($resql)    // This can fail when class is used on old database (during migration for example)
 		{
-		    while ($obj = $this->db->fetch_object($resql))
-		    {
-		        $fieldname = 'extra.'.$obj->name;
-		        $fieldlabel = ucfirst($obj->label);
-		        $this->import_fields_array[$r][$fieldname] = $fieldlabel.($obj->fieldrequired ? '*' : '');
-		        $import_extrafield_sample[$fieldname] = $fieldlabel;
-		    }
+			while ($obj = $this->db->fetch_object($resql))
+			{
+				$fieldname = 'extra.'.$obj->name;
+				$fieldlabel = ucfirst($obj->label);
+				$this->import_fields_array[$r][$fieldname] = $fieldlabel.($obj->fieldrequired ? '*' : '');
+				$import_extrafield_sample[$fieldname] = $fieldlabel;
+			}
 		}
 		// End add extra fields
 		$this->import_fieldshidden_array[$r] = array('extra.fk_object'=>'lastrowid-'.MAIN_DB_PREFIX.'product'); // aliastable.field => ('user->id' or 'lastrowid-'.tableparent)
 		$this->import_regex_array[$r] = array(
-            'p.ref'=>'[^ ]',
+			'p.ref'=>'[^ ]',
 			'p.price_base_type' => '\AHT\z|\ATTC\z',
 			'p.tosell'=>'^[0|1]$',
-            'p.tobuy'=>'^[0|1]$',
-            'p.fk_product_type'=>'^[0|1]$',
-            'p.datec'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$',
+			'p.tobuy'=>'^[0|1]$',
+			'p.fk_product_type'=>'^[0|1]$',
+			'p.datec'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$',
 			'p.recuperableonly' => '^[0|1]$',
 			'p.finished' => '^[0|1]$'
 		);
@@ -565,7 +565,7 @@ class modService extends DolibarrModules
 		{
 			if (!empty($conf->fournisseur->enabled))
 			{
-			    // Import suppliers prices (note: this code is duplicated in module Service)
+				// Import suppliers prices (note: this code is duplicated in module Service)
 				$r++;
 				$this->import_code[$r] = $this->rights_class.'_supplierprices';
 				$this->import_label[$r] = "SuppliersPricesOfProductsOrServices"; // Translation key
@@ -574,14 +574,14 @@ class modService extends DolibarrModules
 				$this->import_tables_array[$r] = array('sp'=>MAIN_DB_PREFIX.'product_fournisseur_price');
 				$this->import_tables_creator_array[$r] = array('sp'=>'fk_user');
 				$this->import_fields_array[$r] = array(//field order as per structure of table llx_product_fournisseur_price, without optional fields
-				    'sp.fk_product'=>"ProductOrService*",
-				    'sp.fk_soc' => "Supplier*",
-				    'sp.ref_fourn' => 'SupplierRef*',
-				    'sp.quantity' => "QtyMin*",
-				    'sp.tva_tx' => 'VATRate',
-				    'sp.default_vat_code' => 'VATCode',
-				    'sp.delivery_time_days' => 'DeliveryDelay',
-				    'sp.supplier_reputation' => 'SupplierReputation'
+					'sp.fk_product'=>"ProductOrService*",
+					'sp.fk_soc' => "Supplier*",
+					'sp.ref_fourn' => 'SupplierRef*',
+					'sp.quantity' => "QtyMin*",
+					'sp.tva_tx' => 'VATRate',
+					'sp.default_vat_code' => 'VATCode',
+					'sp.delivery_time_days' => 'DeliveryDelay',
+					'sp.supplier_reputation' => 'SupplierReputation'
 				);
 				if (is_object($mysoc) && $usenpr)       $this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('sp.recuperableonly'=>'VATNPR'));
 				if (is_object($mysoc) && $mysoc->useLocalTax(1)) $this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('sp.localtax1_tx'=>'LT1', 'sp.localtax1_type'=>'LT1Type'));
@@ -594,13 +594,13 @@ class modService extends DolibarrModules
 
 				if (!empty($conf->multicurrency->enabled))
 				{
-				    $this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array(
-				        'sp.fk_multicurrency'=>'CurrencyCodeId', //ideally this should be automatically obtained from the CurrencyCode on the next line
-				        'sp.multicurrency_code'=>'CurrencyCode',
-				        'sp.multicurrency_tx'=>'CurrencyRate',
-				        'sp.multicurrency_unitprice'=>'CurrencyUnitPrice',
-				        'sp.multicurrency_price'=>'CurrencyPrice',
-				    ));
+					$this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array(
+						'sp.fk_multicurrency'=>'CurrencyCodeId', //ideally this should be automatically obtained from the CurrencyCode on the next line
+						'sp.multicurrency_code'=>'CurrencyCode',
+						'sp.multicurrency_tx'=>'CurrencyRate',
+						'sp.multicurrency_unitprice'=>'CurrencyUnitPrice',
+						'sp.multicurrency_price'=>'CurrencyPrice',
+					));
 				}
 
 				$this->import_convertvalue_array[$r] = array(
@@ -646,7 +646,7 @@ class modService extends DolibarrModules
 
 			if (!empty($conf->global->PRODUIT_MULTIPRICES))
 			{
-			    // Import products multiprices
+				// Import products multiprices
 				$r++;
 				$this->import_code[$r] = $this->rights_class.'_multiprice';
 				$this->import_label[$r] = "ProductsOrServiceMultiPrice"; // Translation key
@@ -663,20 +663,20 @@ class modService extends DolibarrModules
 				if (is_object($mysoc) && $usenpr) $this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('pr.recuperableonly'=>'NPR'));
 				$this->import_regex_array[$r] = array('pr.datec'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$', 'pr.recuperableonly'=>'^[0|1]$');
 				$this->import_convertvalue_array[$r] = array(
-				    'pr.fk_product'=>array('rule'=>'fetchidfromref', 'classfile'=>'/product/class/product.class.php', 'class'=>'Product', 'method'=>'fetch', 'element'=>'Product')
+					'pr.fk_product'=>array('rule'=>'fetchidfromref', 'classfile'=>'/product/class/product.class.php', 'class'=>'Product', 'method'=>'fetch', 'element'=>'Product')
 				);
 				$this->import_examplevalues_array[$r] = array('pr.fk_product'=>"SERVICE_REF or id:123456",
 					'pr.price_base_type'=>"HT (for excl tax) or TTC (for inc tax)", 'pr.price_level'=>"1",
 					'pr.price'=>"100", 'pr.price_ttc'=>"110",
 					'pr.price_min'=>"100", 'pr.price_min_ttc'=>"110",
 					'pr.tva_tx'=>'20',
-				    'pr.recuperableonly'=>'0',
+					'pr.recuperableonly'=>'0',
 					'pr.date_price'=>'2013-04-10');
 			}
 
 			if (!empty($conf->global->MAIN_MULTILANGS))
 			{
-			    // Import translations of product names and descriptions
+				// Import translations of product names and descriptions
 				$r++;
 				$this->import_code[$r] = $this->rights_class.'_languages';
 				$this->import_label[$r] = "ProductsOrServicesTranslations";
@@ -701,7 +701,7 @@ class modService 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 ('', 'newboxdefonly', 'noboxes')
+	 *      @param      string	$options    Options when enabling module ('', 'newboxdefonly', 'noboxes')
 	 *      @return     int             	1 if OK, 0 if KO
 	 */
 	public function init($options = '')
diff --git a/htdocs/core/modules/modSociete.class.php b/htdocs/core/modules/modSociete.class.php
index 60e0fb3b198..c8bbc50e490 100644
--- a/htdocs/core/modules/modSociete.class.php
+++ b/htdocs/core/modules/modSociete.class.php
@@ -295,7 +295,7 @@ class modSociete extends DolibarrModules
 			's.rowid'=>"Numeric", 's.nom'=>"Text", 's.name_alias'=>"Text", 'ps.nom'=>"Text",
 			's.status'=>"Numeric", 's.client'=>"Numeric", 's.fournisseur'=>"Boolean", 's.datec'=>"Date", 's.tms'=>"Date",
 			's.code_client'=>"Text", 's.code_fournisseur'=>"Text", 's.code_compta'=>"Text", 's.code_compta_fournisseur'=>"Text",
-			's.address'=>"Text", 's.zip'=>"Text",'s.town'=>"Text",
+			's.address'=>"Text", 's.zip'=>"Text", 's.town'=>"Text",
 			'd.nom'=>'Text', 'r.nom'=>'Text', 'c.label'=>"List:c_country:label:label", 'c.code'=>"Text",
 			's.phone'=>"Text", 's.fax'=>"Text",
 			's.url'=>"Text", 's.email'=>"Text", 's.default_lang'=>"Text", 's.canvas' => "Canvas",
diff --git a/htdocs/core/modules/modStock.class.php b/htdocs/core/modules/modStock.class.php
index 831358dcf6b..f4a1e374a2f 100644
--- a/htdocs/core/modules/modStock.class.php
+++ b/htdocs/core/modules/modStock.class.php
@@ -150,29 +150,29 @@ class modStock extends DolibarrModules
 
 		if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
 		{
-    		$this->rights[5][0] = 1011;
-    		$this->rights[5][1] = 'inventoryReadPermission'; // Permission label
-    		$this->rights[5][3] = 0; // Permission by default for new user (0/1)
-    		$this->rights[5][4] = 'inventory_advance'; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
-    		$this->rights[5][5] = 'read'; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+			$this->rights[5][0] = 1011;
+			$this->rights[5][1] = 'inventoryReadPermission'; // Permission label
+			$this->rights[5][3] = 0; // Permission by default for new user (0/1)
+			$this->rights[5][4] = 'inventory_advance'; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+			$this->rights[5][5] = 'read'; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
 
-    		$this->rights[6][0] = 1012;
-    		$this->rights[6][1] = 'inventoryCreatePermission'; // Permission label
-    		$this->rights[6][3] = 0; // Permission by default for new user (0/1)
-    		$this->rights[6][4] = 'inventory_advance'; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
-    		$this->rights[6][5] = 'write'; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+			$this->rights[6][0] = 1012;
+			$this->rights[6][1] = 'inventoryCreatePermission'; // Permission label
+			$this->rights[6][3] = 0; // Permission by default for new user (0/1)
+			$this->rights[6][4] = 'inventory_advance'; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+			$this->rights[6][5] = 'write'; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
 
-    		$this->rights[8][0] = 1014;
-    		$this->rights[8][1] = 'inventoryValidatePermission'; // Permission label
-    		$this->rights[8][3] = 0; // Permission by default for new user (0/1)
-    		$this->rights[8][4] = 'inventory_advance'; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
-    		$this->rights[8][5] = 'validate'; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+			$this->rights[8][0] = 1014;
+			$this->rights[8][1] = 'inventoryValidatePermission'; // Permission label
+			$this->rights[8][3] = 0; // Permission by default for new user (0/1)
+			$this->rights[8][4] = 'inventory_advance'; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+			$this->rights[8][5] = 'validate'; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
 
-    		$this->rights[9][0] = 1015;
-    		$this->rights[9][1] = 'inventoryChangePMPPermission'; // Permission label
-    		$this->rights[9][3] = 0; // Permission by default for new user (0/1)
-    		$this->rights[9][4] = 'inventory_advance'; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
-    		$this->rights[9][5] = 'changePMP'; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+			$this->rights[9][0] = 1015;
+			$this->rights[9][1] = 'inventoryChangePMPPermission'; // Permission label
+			$this->rights[9][3] = 0; // Permission by default for new user (0/1)
+			$this->rights[9][4] = 'inventory_advance'; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+			$this->rights[9][5] = 'changePMP'; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
 		}
 
 		// Main menu entries
@@ -317,20 +317,20 @@ class modStock extends DolibarrModules
 				'e.description'=>"DescWareHouse", 'e.lieu'=>"LieuWareHouse",
 				'e.address'=>"Address", 'e.zip'=>'Zip', 'e.fk_pays'=>'CountryCode',
 				'e.statut'=>'Status',
-                'e.fk_parent'=>'ParentWarehouse'
+				'e.fk_parent'=>'ParentWarehouse'
 		);
 
 		$this->import_convertvalue_array[$r] = array(
 				'e.fk_pays'=>array('rule'=>'fetchidfromcodeid', 'classfile'=>'/core/class/ccountry.class.php', 'class'=>'Ccountry', 'method'=>'fetch', 'dict'=>'DictionaryCountry'),
-                'e.fk_parent'=>array('rule'=>'fetchidfromref', 'classfile'=>'/product/stock/class/entrepot.class.php', 'class'=>'Entrepot', 'method'=>'fetch', 'element'=>'ref')
+				'e.fk_parent'=>array('rule'=>'fetchidfromref', 'classfile'=>'/product/stock/class/entrepot.class.php', 'class'=>'Entrepot', 'method'=>'fetch', 'element'=>'ref')
 		);
 		$this->import_regex_array[$r] = array('e.statut'=>'^[0|1]');
 		$this->import_examplevalues_array[$r] = array('e.ref'=>"ALM001",
 				'e.description'=>"Central Warehouse", 'e.lieu'=>"Central",
 				'e.address'=>"Route 66", 'e.zip'=>'28080', 'e.fk_pays'=>'US',
 				'e.statut'=>'1',
-                'e.fk_parent'=>''
-        );
+				'e.fk_parent'=>''
+		);
 
 		// Import stocks
 		$r++;
@@ -346,11 +346,11 @@ class modStock extends DolibarrModules
 			'ps.fk_entrepot'=>array('rule'=>'fetchidfromref', 'classfile'=>'/product/stock/class/entrepot.class.php', 'class'=>'Entrepot', 'method'=>'fetch', 'element'=>'ref')
 		  );
 		$this->import_examplevalues_array[$r] = array(
-		    'ps.fk_product'=>"PREF123456", 'ps.fk_entrepot'=>"ALM001", 'ps.reel'=>"10"
+			'ps.fk_product'=>"PREF123456", 'ps.fk_entrepot'=>"ALM001", 'ps.reel'=>"10"
 		);
 		$this->import_updatekeys_array[$r] = array('ps.fk_product'=>'Product', 'ps.fk_entrepot'=>"Warehouse");
 		$this->import_run_sql_after_array[$r] = array(    // Because we may change data that are denormalized, we must update dernormalized data after.
-		    'UPDATE '.MAIN_DB_PREFIX.'product p SET p.stock= (SELECT SUM(ps.reel) FROM '.MAIN_DB_PREFIX.'product_stock ps WHERE ps.fk_product = p.rowid);'
+			'UPDATE '.MAIN_DB_PREFIX.'product p SET p.stock= (SELECT SUM(ps.reel) FROM '.MAIN_DB_PREFIX.'product_stock ps WHERE ps.fk_product = p.rowid);'
 		);
 	}
 
diff --git a/htdocs/core/modules/modStripe.class.php b/htdocs/core/modules/modStripe.class.php
index e7a29deeae6..4d95a6329ba 100644
--- a/htdocs/core/modules/modStripe.class.php
+++ b/htdocs/core/modules/modStripe.class.php
@@ -31,68 +31,68 @@ include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
  */
 class modStripe extends DolibarrModules
 {
-    /**
-     *   Constructor. Define names, constants, directories, boxes, permissions
-     *
-     *   @param      DoliDB		$db      Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
+	/**
+	 *   Constructor. Define names, constants, directories, boxes, permissions
+	 *
+	 *   @param      DoliDB		$db      Database handler
+	 */
+	public function __construct($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).
-        $this->numero = 50300;
-        // Key text used to identify module (for permissions, menus, etc...)
-        $this->rights_class = 'stripe';
+		// Id for module (must be unique).
+		// Use here a free id (See in Home -> System information -> Dolibarr for list of used modules id).
+		$this->numero = 50300;
+		// Key text used to identify module (for permissions, menus, etc...)
+		$this->rights_class = 'stripe';
 
-        // Family can be 'crm','financial','hr','projects','products','ecm','technic','other'
-        // It is used to group modules in module setup page
-        $this->family = "interface";
-        // 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));
-        // Module description, used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
-        $this->description = "Module to offer an online payment page by credit card with Stripe";
-        // Possible values for version are: 'development', 'experimental', 'dolibarr' or version
-        $this->version = 'dolibarr';
-        // Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
-        $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-        // Name of image file used for this module.
-        // If file is in theme/yourtheme/img directory under name object_pictovalue.png, use this->picto='pictovalue'
-        // If file is in module/img directory, use this->picto=DOL_URL_ROOT.'/module/img/file.png'
-        $this->picto = 'stripe';
+		// Family can be 'crm','financial','hr','projects','products','ecm','technic','other'
+		// It is used to group modules in module setup page
+		$this->family = "interface";
+		// 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));
+		// Module description, used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
+		$this->description = "Module to offer an online payment page by credit card with Stripe";
+		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
+		$this->version = 'dolibarr';
+		// Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
+		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+		// Name of image file used for this module.
+		// If file is in theme/yourtheme/img directory under name object_pictovalue.png, use this->picto='pictovalue'
+		// If file is in module/img directory, use this->picto=DOL_URL_ROOT.'/module/img/file.png'
+		$this->picto = 'stripe';
 
-        // Data directories to create when module is enabled.
-        $this->dirs = array();
+		// Data directories to create when module is enabled.
+		$this->dirs = array();
 
-        // Config pages. Put here list of php page names stored in admin directory used to setup module.
-        $this->config_page_url = array("stripe.php@stripe");
+		// Config pages. Put here list of php page names stored in admin directory used to setup module.
+		$this->config_page_url = array("stripe.php@stripe");
 
-        // Dependencies
-        $this->hidden = false; // A condition to hide module
-        $this->depends = array(); // List of modules id that must be enabled if this module is enabled
-        $this->requiredby = array(); // List of modules id to disable if this one is disabled
-        $this->phpmin = array(5, 4); // Minimum version of PHP required by module
-        $this->need_dolibarr_version = array(5, 0); // Minimum version of Dolibarr required by module
-        $this->langfiles = array("stripe");
+		// Dependencies
+		$this->hidden = false; // A condition to hide module
+		$this->depends = array(); // List of modules id that must be enabled if this module is enabled
+		$this->requiredby = array(); // List of modules id to disable if this one is disabled
+		$this->phpmin = array(5, 4); // Minimum version of PHP required by module
+		$this->need_dolibarr_version = array(5, 0); // Minimum version of Dolibarr required by module
+		$this->langfiles = array("stripe");
 
-        // Constants
-        $this->const = array(); // List of particular constants to add when module is enabled
+		// Constants
+		$this->const = array(); // List of particular constants to add when module is enabled
 
-        // New pages on tabs
-        $this->tabs = array();
+		// New pages on tabs
+		$this->tabs = array();
 
-        // List of boxes
-        $this->boxes = array();
-        $r = 0;
+		// List of boxes
+		$this->boxes = array();
+		$r = 0;
 
-        // Permissions
-        $this->rights = array(); // Permission array used by this module
-        $r = 0;
+		// Permissions
+		$this->rights = array(); // Permission array used by this module
+		$r = 0;
 
-        // Main menu entries
-        $r = 0;
-        /* $this->menu[$r]=array(
+		// Main menu entries
+		$r = 0;
+		/* $this->menu[$r]=array(
             'fk_menu'=>'fk_mainmenu=billing,fk_leftmenu=customers_bills_payment',		    // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
 	        'mainmenu'=>'billing',
         	'leftmenu'=>'customers_bills_payment_stripe',
@@ -108,8 +108,8 @@ class modStripe extends DolibarrModules
         );				                // 0=Menu for internal users, 1=external users, 2=both
         $r++;*/
 
-        $this->menu[$r] = array(
-        	'fk_menu'=>'fk_mainmenu=bank',
+		$this->menu[$r] = array(
+			'fk_menu'=>'fk_mainmenu=bank',
 			'type'=>'left',
 			'titre'=>'StripeAccount',
 			'mainmenu'=>'bank',
@@ -123,7 +123,7 @@ class modStripe extends DolibarrModules
 			'user' => 0
 		);
 
-        $r++;
+		$r++;
 		$this->menu[$r] = array(
 			'fk_menu' => 'fk_mainmenu=bank,fk_leftmenu=stripe',
 			'type' => 'left',
@@ -137,7 +137,7 @@ class modStripe extends DolibarrModules
 			'user' => 0
 		);
 
-        $r++;
+		$r++;
 		$this->menu[$r] = array(
 			'fk_menu' => 'fk_mainmenu=bank,fk_leftmenu=stripe',
 			'type' => 'left',
@@ -151,8 +151,8 @@ class modStripe extends DolibarrModules
 			'user' => 0
 		);
 
-        $r++;
-	    $this->menu[$r] = array(
+		$r++;
+		$this->menu[$r] = array(
 			'fk_menu' => 'fk_mainmenu=bank,fk_leftmenu=stripe',
 			'type' => 'left',
 			'titre' => 'StripePayoutList',
@@ -165,7 +165,7 @@ class modStripe extends DolibarrModules
 			'user' => 0
 		);
 
-        // Exports
-        $r = 1;
-    }
+		// Exports
+		$r = 1;
+	}
 }
diff --git a/htdocs/core/modules/modSupplierProposal.class.php b/htdocs/core/modules/modSupplierProposal.class.php
index 0deea28f4b1..6074966b4b1 100644
--- a/htdocs/core/modules/modSupplierProposal.class.php
+++ b/htdocs/core/modules/modSupplierProposal.class.php
@@ -63,7 +63,7 @@ class modSupplierProposal extends DolibarrModules
 		$this->dirs = array();
 
 		 // Config pages. Put here list of php page names stored in admin directory used to setup module.
-        $this->config_page_url = array("supplier_proposal.php");
+		$this->config_page_url = array("supplier_proposal.php");
 
 		// Dependencies
 		$this->hidden = false; // A condition to hide module
@@ -127,7 +127,7 @@ class modSupplierProposal extends DolibarrModules
 		$this->rights[$r][0] = $this->numero + $r; // id de la permission
 		$this->rights[$r][1] = 'Envoyer les demandes fournisseurs'; // libelle de la permission
 		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
-        $this->rights[$r][4] = 'send_advance';
+		$this->rights[$r][4] = 'send_advance';
 
 		$r++;
 		$this->rights[$r][0] = $this->numero + $r; // id de la permission
@@ -152,10 +152,10 @@ class modSupplierProposal 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 = '')
+	public function init($options = '')
 	{
 		global $conf, $langs;
 
@@ -200,10 +200,10 @@ class modSupplierProposal extends DolibarrModules
 	 */
 	public function remove($options = '')
 	{
-	    $sql = array(
-	        "DELETE FROM ".MAIN_DB_PREFIX."rights_def WHERE module = 'askpricesupplier'"		// To delete/clean deprecated entries
-	    );
+		$sql = array(
+			"DELETE FROM ".MAIN_DB_PREFIX."rights_def WHERE module = 'askpricesupplier'"		// To delete/clean deprecated entries
+		);
 
-	    return $this->_remove($sql, $options);
+		return $this->_remove($sql, $options);
 	}
 }
diff --git a/htdocs/core/modules/modTakePos.class.php b/htdocs/core/modules/modTakePos.class.php
index 7ff90c2bd6c..e8162ebf570 100644
--- a/htdocs/core/modules/modTakePos.class.php
+++ b/htdocs/core/modules/modTakePos.class.php
@@ -39,9 +39,9 @@ class modTakePos 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).
@@ -78,16 +78,16 @@ class modTakePos extends DolibarrModules
 		// for specific path of parts (eg: /takepos/core/modules/barcode)
 		// for specific css file (eg: /takepos/css/takepos.css.php)
 		$this->module_parts = array(
-		                        	'triggers' => 0, // Set this to 1 if module has its own trigger directory (core/triggers)
+									'triggers' => 0, // Set this to 1 if module has its own trigger directory (core/triggers)
 									'login' => 0, // Set this to 1 if module has its own login method file (core/login)
 									'substitutions' => 1, // Set this to 1 if module has its own substitution function file (core/substitutions)
 									'menus' => 0, // Set this to 1 if module has its own menus handler directory (core/menus)
 									'theme' => 0, // Set this to 1 if module has its own theme directory (theme)
-		                        	'tpl' => 0, // Set this to 1 if module overwrite template dir (core/tpl)
+									'tpl' => 0, // Set this to 1 if module overwrite template dir (core/tpl)
 									'barcode' => 0, // Set this to 1 if module has its own barcode directory (core/modules/barcode)
 									'models' => 0, // Set this to 1 if module has its own models directory (core/modules/xxx)
 									'hooks' => array() 	                                // Set here all hooks context managed by module. To find available hook context, make a "grep -r '>initHooks(' *" on source code. You can also set hook context 'all'
-		                        );
+								);
 
 		// Data directories to create when module is enabled.
 		// Example: this->dirs = array("/takepos/temp","/takepos/subdir");
@@ -127,13 +127,13 @@ class modTakePos 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@takepos:$user->rights->takepos->read:/takepos/mynewtab1.php?id=__ID__');  					// To add a new tab identified by code tabname1
-        // $this->tabs[] = array('data'=>'objecttype:+tabname2:SUBSTITUTION_Title2:mylangfile@takepos:$user->rights->othermodule->read:/takepos/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@takepos:$user->rights->othermodule->read:/takepos/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
@@ -155,9 +155,9 @@ class modTakePos extends DolibarrModules
 		// 'user'             to add a tab in user view
 
 
-        // Dictionaries
+		// Dictionaries
 		$this->dictionaries = array();
-        /* Example:
+		/* Example:
         $this->dictionaries=array(
             'langs'=>'mylangfile@takepos',
             'tabname'=>array(MAIN_DB_PREFIX."table1",MAIN_DB_PREFIX."table2",MAIN_DB_PREFIX."table3"),		// List of tables we want to see into dictonnary editor
@@ -173,13 +173,13 @@ class modTakePos extends DolibarrModules
         */
 
 
-        // Boxes/Widgets
+		// Boxes/Widgets
 		// Add here list of php file(s) stored in takepos/core/boxes that contains class to show a widget.
-        $this->boxes = array(
-        	//0=>array('file'=>'takeposwidget1.php@takepos','note'=>'Widget provided by TakePos','enabledbydefaulton'=>'Home'),
-        	//1=>array('file'=>'takeposwidget2.php@takepos','note'=>'Widget provided by TakePos'),
-        	//2=>array('file'=>'takeposwidget3.php@takepos','note'=>'Widget provided by TakePos')
-        );
+		$this->boxes = array(
+			//0=>array('file'=>'takeposwidget1.php@takepos','note'=>'Widget provided by TakePos','enabledbydefaulton'=>'Home'),
+			//1=>array('file'=>'takeposwidget2.php@takepos','note'=>'Widget provided by TakePos'),
+			//2=>array('file'=>'takeposwidget3.php@takepos','note'=>'Widget provided by TakePos')
+		);
 
 
 		// Cronjobs (List of cron jobs entries to add when module is enabled)
@@ -260,7 +260,7 @@ class modTakePos 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/modTax.class.php b/htdocs/core/modules/modTax.class.php
index cc093225afc..3e2a62e099a 100644
--- a/htdocs/core/modules/modTax.class.php
+++ b/htdocs/core/modules/modTax.class.php
@@ -147,14 +147,14 @@ class modTax extends DolibarrModules
 		$this->import_entities_array[$r] = array(); // We define here only fields that use another icon that the one defined into import_icon
 		$this->import_tables_array[$r] = array('t'=>MAIN_DB_PREFIX.'chargesociales');
 		$this->import_fields_array[$r] = array('t.libelle'=>"Label*", 't.fk_type'=>"Type",
-		    't.amount'=>"Amount*", 't.date_ech'=>"DateDue*", 't.periode'=>"PeriodEndDate*"
+			't.amount'=>"Amount*", 't.date_ech'=>"DateDue*", 't.periode'=>"PeriodEndDate*"
 		);
 
 		$this->import_convertvalue_array[$r] = array(
-		    't.fk_type'=>array('rule'=>'fetchidfromref', 'classfile'=>'/compta/sociales/class/cchargesociales.class.php', 'class'=>'Cchargesociales', 'method'=>'fetch', 'element'=>'Cchargesociales')
+			't.fk_type'=>array('rule'=>'fetchidfromref', 'classfile'=>'/compta/sociales/class/cchargesociales.class.php', 'class'=>'Cchargesociales', 'method'=>'fetch', 'element'=>'Cchargesociales')
 		);
 		$this->import_examplevalues_array[$r] = array('t.libelle'=>"Social/fiscal contribution", 't.fk_type'=>"TAXPRO (must be id or code found into dictionary)",
-		    't.date_ech'=>"2016-01-01", 't.periode'=>"2016-01-01"
+			't.date_ech'=>"2016-01-01", 't.periode'=>"2016-01-01"
 		);
 
 		// Import Taxes
@@ -165,14 +165,14 @@ class modTax extends DolibarrModules
 		$this->import_entities_array[$r] = array(); // We define here only fields that use another icon that the one defined into import_icon
 		$this->import_tables_array[$r] = array('t'=>MAIN_DB_PREFIX.'tva');
 		$this->import_fields_array[$r] = array('t.datep'=>"DatePayment*", 't.datev'=>"DateValue*", 't.label'=>"Label*", 't.fk_typepayment'=>"PaymentMode*",
-		    't.amount'=>"Amount*", 't.num_payment'=>'Numero'
+			't.amount'=>"Amount*", 't.num_payment'=>'Numero'
 		);
 
 		$this->import_convertvalue_array[$r] = array(
-		    't.fk_typepayment'=>array('rule'=>'fetchidfromref', 'classfile'=>'/compta/paiement/class/cpaiement.class.php', 'class'=>'Cpaiement', 'method'=>'fetch', 'element'=>'Cpaiement')
+			't.fk_typepayment'=>array('rule'=>'fetchidfromref', 'classfile'=>'/compta/paiement/class/cpaiement.class.php', 'class'=>'Cpaiement', 'method'=>'fetch', 'element'=>'Cpaiement')
 		);
 		$this->import_examplevalues_array[$r] = array('t.label'=>"VAT Payment 1st quarter 2016", 't.fk_typepayment'=>"CHQ (must be id or code found into dictionary)",
-		    't.datep'=>"2016-04-02", 't.datev'=>"2016-03-31", 't.amount'=>1000, 't.num_payment'=>'123456'
+			't.datep'=>"2016-04-02", 't.datev'=>"2016-03-31", 't.amount'=>1000, 't.num_payment'=>'123456'
 		);
 	}
 
@@ -182,7 +182,7 @@ class modTax 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/modTicket.class.php b/htdocs/core/modules/modTicket.class.php
index 68fe7f2eb22..d19327bcea7 100644
--- a/htdocs/core/modules/modTicket.class.php
+++ b/htdocs/core/modules/modTicket.class.php
@@ -32,267 +32,267 @@ require_once DOL_DOCUMENT_ROOT."/core/modules/DolibarrModules.class.php";
  */
 class modTicket extends DolibarrModules
 {
-    /**
-     *     Constructor. Define names, constants, directories, boxes, permissions
-     *
-     *     @param DoliDB $db Database handler
-     */
-    public function __construct($db)
-    {
-        global $langs, $conf;
+	/**
+	 *     Constructor. Define names, constants, directories, boxes, permissions
+	 *
+	 *     @param DoliDB $db Database handler
+	 */
+	public function __construct($db)
+	{
+		global $langs, $conf;
 
-        $this->db = $db;
+		$this->db = $db;
 
-        // Id for module (must be unique).
-        // Use a free id here
-        // (See in Home -> System information -> Dolibarr for list of used modules id).
-        $this->numero = 56000;
-        // Key text used to identify module (for permissions, menus, etc...)
-        $this->rights_class = 'ticket';
+		// Id for module (must be unique).
+		// Use a free id here
+		// (See in Home -> System information -> Dolibarr for list of used modules id).
+		$this->numero = 56000;
+		// Key text used to identify module (for permissions, menus, etc...)
+		$this->rights_class = 'ticket';
 
-        // Family can be 'crm','financial','hr','projects','products','ecm','technic','other'
-        // It is used to group modules in module setup page
-        $this->family = "crm";
-        // Module position in the family
-        $this->module_position = '60';
-        // 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));
-        // Module description
-        // used if translation string 'ModuleXXXDesc' not found
-        // (where XXX is value of numeric property 'numero' of module)
-        $this->description = "Incident/support ticket management";
-        // Possible values for version are: 'development', 'experimental' or version
-        $this->version = 'dolibarr';
-        // Key used in llx_const table to save module status enabled/disabled
-        // (where MYMODULE is value of property name of module in uppercase)
-        $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-        // Name of image file used for this module.
-        // 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 = 'ticket'; // mypicto@ticket
-        // Defined all module parts (triggers, login, substitutions, menus, css, etc...)
-        // for default path (eg: /ticket/core/xxxxx) (0=disable, 1=enable)
-        // for specific path of parts (eg: /ticket/core/modules/barcode)
-        // for specific css file (eg: /ticket/css/ticket.css.php)
-        $this->module_parts = array(
-            // Set this to 1 if module has its own trigger directory
-            'triggers' => 1,
-        );
+		// Family can be 'crm','financial','hr','projects','products','ecm','technic','other'
+		// It is used to group modules in module setup page
+		$this->family = "crm";
+		// Module position in the family
+		$this->module_position = '60';
+		// 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));
+		// Module description
+		// used if translation string 'ModuleXXXDesc' not found
+		// (where XXX is value of numeric property 'numero' of module)
+		$this->description = "Incident/support ticket management";
+		// Possible values for version are: 'development', 'experimental' or version
+		$this->version = 'dolibarr';
+		// Key used in llx_const table to save module status enabled/disabled
+		// (where MYMODULE is value of property name of module in uppercase)
+		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+		// Name of image file used for this module.
+		// 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 = 'ticket'; // mypicto@ticket
+		// Defined all module parts (triggers, login, substitutions, menus, css, etc...)
+		// for default path (eg: /ticket/core/xxxxx) (0=disable, 1=enable)
+		// for specific path of parts (eg: /ticket/core/modules/barcode)
+		// for specific css file (eg: /ticket/css/ticket.css.php)
+		$this->module_parts = array(
+			// Set this to 1 if module has its own trigger directory
+			'triggers' => 1,
+		);
 
-        // Data directories to create when module is enabled.
-        // Example: this->dirs = array("/ticket/temp");
-        $this->dirs = array();
+		// Data directories to create when module is enabled.
+		// Example: this->dirs = array("/ticket/temp");
+		$this->dirs = array();
 
-        // Config pages. Put here list of php pages
-        // stored into ticket/admin directory, used to setup module.
-        $this->config_page_url = array("ticket.php");
+		// Config pages. Put here list of php pages
+		// stored into ticket/admin directory, used to setup module.
+		$this->config_page_url = array("ticket.php");
 
-        // Dependencies
-        $this->hidden = false; // A condition to hide module
+		// Dependencies
+		$this->hidden = false; // A condition to hide module
 		$this->depends = array('modAgenda'); // List of module class names as string that must be enabled if this module is enabled
 		$this->requiredby = array(); // List of module ids to disable if this one is disabled
 		$this->conflictwith = array(); // List of module class names as string this module is in conflict with
 		$this->phpmin = array(5, 4); // Minimum version of PHP required by module
-        $this->langfiles = array("ticket");
+		$this->langfiles = array("ticket");
 
-        // Constants
-        // List of particular constants to add when module is enabled
-        // (key, 'chaine', value, desc, visible, 'current' or 'allentities', deleteonunactive)
-        // Example:
-        $this->const = array(
-            1 => array('TICKET_ENABLE_PUBLIC_INTERFACE', 'chaine', '0', 'Enable ticket public interface', 0),
-            2 => array('TICKET_ADDON', 'chaine', 'mod_ticket_simple', 'Ticket ref module', 0)
-        );
+		// Constants
+		// List of particular constants to add when module is enabled
+		// (key, 'chaine', value, desc, visible, 'current' or 'allentities', deleteonunactive)
+		// Example:
+		$this->const = array(
+			1 => array('TICKET_ENABLE_PUBLIC_INTERFACE', 'chaine', '0', 'Enable ticket public interface', 0),
+			2 => array('TICKET_ADDON', 'chaine', 'mod_ticket_simple', 'Ticket ref module', 0)
+		);
 
-        $this->tabs = array(
-            'thirdparty:+ticket:Tickets:@ticket:$user->rights->ticket->read:/ticket/list.php?socid=__ID__',
-            'project:+ticket:Tickets:@ticket:$user->rights->ticket->read:/ticket/list.php?projectid=__ID__',
-        );
+		$this->tabs = array(
+			'thirdparty:+ticket:Tickets:@ticket:$user->rights->ticket->read:/ticket/list.php?socid=__ID__',
+			'project:+ticket:Tickets:@ticket:$user->rights->ticket->read:/ticket/list.php?projectid=__ID__',
+		);
 
-        // Dictionaries
-        if (!isset($conf->ticket->enabled)) {
-            $conf->ticket = new stdClass();
-            $conf->ticket->enabled = 0;
-        }
-        $this->dictionaries = array(
-            'langs' => 'ticket',
-        	'tabname' => array(MAIN_DB_PREFIX."c_ticket_type", MAIN_DB_PREFIX."c_ticket_severity", MAIN_DB_PREFIX."c_ticket_category", MAIN_DB_PREFIX."c_ticket_resolution"),
-        	'tablib' => array("TicketDictType", "TicketDictSeverity", "TicketDictCategory", "TicketDictResolution"),
-        	'tabsql' => array(
-        		'SELECT f.rowid as rowid, f.code, f.pos, f.label, f.active, f.use_default FROM '.MAIN_DB_PREFIX.'c_ticket_type as f',
-        		'SELECT f.rowid as rowid, f.code, f.pos, f.label, f.active, f.use_default FROM '.MAIN_DB_PREFIX.'c_ticket_severity as f',
-        		'SELECT f.rowid as rowid, f.code, f.pos, f.label, f.active, f.use_default FROM '.MAIN_DB_PREFIX.'c_ticket_category as f',
-        		'SELECT f.rowid as rowid, f.code, f.pos, f.label, f.active, f.use_default FROM '.MAIN_DB_PREFIX.'c_ticket_resolution as f'
-        	),
-        	'tabsqlsort' => array("pos ASC", "pos ASC", "pos ASC", "pos ASC"),
-        	'tabfield' => array("code,label,pos,use_default", "code,label,pos,use_default", "code,label,pos,use_default", "code,label,pos,use_default"),
-        	'tabfieldvalue' => array("code,label,pos,use_default", "code,label,pos,use_default", "code,label,pos,use_default", "code,label,pos,use_default"),
-        	'tabfieldinsert' => array("code,label,pos,use_default", "code,label,pos,use_default", "code,label,pos,use_default", "code,label,pos,use_default"),
-            'tabrowid' => array("rowid", "rowid", "rowid", "rowid"),
-        	'tabcond' => array($conf->ticket->enabled, $conf->ticket->enabled, $conf->ticket->enabled, $conf->ticket->enabled),
-        	'tabhelp' => array(array('code'=>$langs->trans("EnterAnyCode"), 'use_default'=>$langs->trans("Enter0or1")), array('code'=>$langs->trans("EnterAnyCode"), 'use_default'=>$langs->trans("Enter0or1")), array('code'=>$langs->trans("EnterAnyCode"), 'use_default'=>$langs->trans("Enter0or1")), array('code'=>$langs->trans("EnterAnyCode"), 'use_default'=>$langs->trans("Enter0or1"))),
-        );
+		// Dictionaries
+		if (!isset($conf->ticket->enabled)) {
+			$conf->ticket = new stdClass();
+			$conf->ticket->enabled = 0;
+		}
+		$this->dictionaries = array(
+			'langs' => 'ticket',
+			'tabname' => array(MAIN_DB_PREFIX."c_ticket_type", MAIN_DB_PREFIX."c_ticket_severity", MAIN_DB_PREFIX."c_ticket_category", MAIN_DB_PREFIX."c_ticket_resolution"),
+			'tablib' => array("TicketDictType", "TicketDictSeverity", "TicketDictCategory", "TicketDictResolution"),
+			'tabsql' => array(
+				'SELECT f.rowid as rowid, f.code, f.pos, f.label, f.active, f.use_default FROM '.MAIN_DB_PREFIX.'c_ticket_type as f',
+				'SELECT f.rowid as rowid, f.code, f.pos, f.label, f.active, f.use_default FROM '.MAIN_DB_PREFIX.'c_ticket_severity as f',
+				'SELECT f.rowid as rowid, f.code, f.pos, f.label, f.active, f.use_default FROM '.MAIN_DB_PREFIX.'c_ticket_category as f',
+				'SELECT f.rowid as rowid, f.code, f.pos, f.label, f.active, f.use_default FROM '.MAIN_DB_PREFIX.'c_ticket_resolution as f'
+			),
+			'tabsqlsort' => array("pos ASC", "pos ASC", "pos ASC", "pos ASC"),
+			'tabfield' => array("code,label,pos,use_default", "code,label,pos,use_default", "code,label,pos,use_default", "code,label,pos,use_default"),
+			'tabfieldvalue' => array("code,label,pos,use_default", "code,label,pos,use_default", "code,label,pos,use_default", "code,label,pos,use_default"),
+			'tabfieldinsert' => array("code,label,pos,use_default", "code,label,pos,use_default", "code,label,pos,use_default", "code,label,pos,use_default"),
+			'tabrowid' => array("rowid", "rowid", "rowid", "rowid"),
+			'tabcond' => array($conf->ticket->enabled, $conf->ticket->enabled, $conf->ticket->enabled, $conf->ticket->enabled),
+			'tabhelp' => array(array('code'=>$langs->trans("EnterAnyCode"), 'use_default'=>$langs->trans("Enter0or1")), array('code'=>$langs->trans("EnterAnyCode"), 'use_default'=>$langs->trans("Enter0or1")), array('code'=>$langs->trans("EnterAnyCode"), 'use_default'=>$langs->trans("Enter0or1")), array('code'=>$langs->trans("EnterAnyCode"), 'use_default'=>$langs->trans("Enter0or1"))),
+		);
 
-        // Boxes
-        // Add here list of php file(s) stored in core/boxes that contains class to show a box.
-        $this->boxes = array(); // Boxes list
-        $r = 0;
-        // Example:
+		// Boxes
+		// Add here list of php file(s) stored in core/boxes that contains class to show a box.
+		$this->boxes = array(); // Boxes list
+		$r = 0;
+		// Example:
 
-        $this->boxes[$r][1] = "box_last_ticket";
-        $r++;
+		$this->boxes[$r][1] = "box_last_ticket";
+		$r++;
 
-        $this->boxes[$r][1] = "box_last_modified_ticket";
-        $r++;
+		$this->boxes[$r][1] = "box_last_modified_ticket";
+		$r++;
 
-        // Permissions
-        $this->rights = array(); // Permission array used by this module
+		// Permissions
+		$this->rights = array(); // Permission array used by this module
 
-        $r = 0;
-        $this->rights[$r][0] = 56001; // id de la permission
-        $this->rights[$r][1] = "Read ticket"; // libelle de la permission
-        $this->rights[$r][2] = 'r'; // type de la permission (deprecie a ce jour)
-        $this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
-        $this->rights[$r][4] = 'read';
+		$r = 0;
+		$this->rights[$r][0] = 56001; // id de la permission
+		$this->rights[$r][1] = "Read ticket"; // libelle de la permission
+		$this->rights[$r][2] = 'r'; // type de la permission (deprecie a ce jour)
+		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+		$this->rights[$r][4] = 'read';
 
-        $r++;
-        $this->rights[$r][0] = 56002; // id de la permission
-        $this->rights[$r][1] = "Create les tickets"; // libelle de la permission
-        $this->rights[$r][2] = 'w'; // type de la permission (deprecie a ce jour)
-        $this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
-        $this->rights[$r][4] = 'write';
+		$r++;
+		$this->rights[$r][0] = 56002; // id de la permission
+		$this->rights[$r][1] = "Create les tickets"; // libelle de la permission
+		$this->rights[$r][2] = 'w'; // type de la permission (deprecie a ce jour)
+		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+		$this->rights[$r][4] = 'write';
 
-        $r++;
-        $this->rights[$r][0] = 56003; // id de la permission
-        $this->rights[$r][1] = "Delete les tickets"; // libelle de la permission
-        $this->rights[$r][2] = 'd'; // type de la permission (deprecie a ce jour)
-        $this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
-        $this->rights[$r][4] = 'delete';
+		$r++;
+		$this->rights[$r][0] = 56003; // id de la permission
+		$this->rights[$r][1] = "Delete les tickets"; // libelle de la permission
+		$this->rights[$r][2] = 'd'; // type de la permission (deprecie a ce jour)
+		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+		$this->rights[$r][4] = 'delete';
 
-        $r++;
-        $this->rights[$r][0] = 56004; // id de la permission
-        $this->rights[$r][1] = "Manage tickets"; // libelle de la permission
-        //$this->rights[$r][2] = 'd'; // type de la permission (deprecie a ce jour)
-        $this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
-        $this->rights[$r][4] = 'manage';
+		$r++;
+		$this->rights[$r][0] = 56004; // id de la permission
+		$this->rights[$r][1] = "Manage tickets"; // libelle de la permission
+		//$this->rights[$r][2] = 'd'; // type de la permission (deprecie a ce jour)
+		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+		$this->rights[$r][4] = 'manage';
 
-        $r++;
-        $this->rights[$r][0] = 56005; // id de la permission
-        $this->rights[$r][1] = 'See all tickets, even if not assigned to (not effective for external users, always restricted to the thirdpardy they depends on)'; // libelle de la permission
-        $this->rights[$r][2] = 'r'; // type de la permission (deprecie a ce jour)
-        $this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
-        $this->rights[$r][4] = 'view';
-        $this->rights[$r][5] = 'all';
+		$r++;
+		$this->rights[$r][0] = 56005; // id de la permission
+		$this->rights[$r][1] = 'See all tickets, even if not assigned to (not effective for external users, always restricted to the thirdpardy they depends on)'; // libelle de la permission
+		$this->rights[$r][2] = 'r'; // type de la permission (deprecie a ce jour)
+		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+		$this->rights[$r][4] = 'view';
+		$this->rights[$r][5] = 'all';
 
-        // Main menu entries
-        $this->menus = array(); // List of menus to add
-        $r = 0;
+		// Main menu entries
+		$this->menus = array(); // List of menus to add
+		$r = 0;
 
-        $this->menu[$r] = array('fk_menu' => 0, // Put 0 if this is a top menu
-            'type' => 'top', // This is a Top menu entry
-            'titre' => 'Ticket',
-            'mainmenu' => 'ticket',
-            'leftmenu' => '1', // Use 1 if you also want to add left menu entries using this descriptor.
-            'url' => '/ticket/index.php',
-            'langs' => 'ticket', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-            'position' => 88,
-            'enabled' => '$conf->ticket->enabled', // Define condition to show or hide menu entry. Use '$conf->ticket->enabled' if entry must be visible if module is enabled.
-            'perms' => '$user->rights->ticket->read', // Use 'perms'=>'$user->rights->ticket->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++;
+		$this->menu[$r] = array('fk_menu' => 0, // Put 0 if this is a top menu
+			'type' => 'top', // This is a Top menu entry
+			'titre' => 'Ticket',
+			'mainmenu' => 'ticket',
+			'leftmenu' => '1', // Use 1 if you also want to add left menu entries using this descriptor.
+			'url' => '/ticket/index.php',
+			'langs' => 'ticket', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+			'position' => 88,
+			'enabled' => '$conf->ticket->enabled', // Define condition to show or hide menu entry. Use '$conf->ticket->enabled' if entry must be visible if module is enabled.
+			'perms' => '$user->rights->ticket->read', // Use 'perms'=>'$user->rights->ticket->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++;
 
-        $this->menu[$r] = array('fk_menu' => 'fk_mainmenu=ticket',
-            'type' => 'left',
-            'titre' => 'Ticket',
-            'mainmenu' => 'ticket',
-            'leftmenu' => 'ticket',
-            'url' => '/ticket/index.php',
-            'langs' => 'ticket',
-            'position' => 101,
-            'enabled' => '$conf->ticket->enabled',
-            'perms' => '$user->rights->ticket->read',
-            'target' => '',
-            'user' => 2);
-        $r++;
+		$this->menu[$r] = array('fk_menu' => 'fk_mainmenu=ticket',
+			'type' => 'left',
+			'titre' => 'Ticket',
+			'mainmenu' => 'ticket',
+			'leftmenu' => 'ticket',
+			'url' => '/ticket/index.php',
+			'langs' => 'ticket',
+			'position' => 101,
+			'enabled' => '$conf->ticket->enabled',
+			'perms' => '$user->rights->ticket->read',
+			'target' => '',
+			'user' => 2);
+		$r++;
 
-        $this->menu[$r] = array('fk_menu' => 'fk_mainmenu=ticket,fk_leftmenu=ticket',
-            'type' => 'left',
-            'titre' => 'NewTicket',
-            'mainmenu' => 'ticket',
-            'url' => '/ticket/card.php?action=create',
-            'langs' => 'ticket',
-            'position' => 102,
-            'enabled' => '$conf->ticket->enabled',
-            'perms' => '$user->rights->ticket->write',
-            'target' => '',
-            'user' => 2);
-        $r++;
+		$this->menu[$r] = array('fk_menu' => 'fk_mainmenu=ticket,fk_leftmenu=ticket',
+			'type' => 'left',
+			'titre' => 'NewTicket',
+			'mainmenu' => 'ticket',
+			'url' => '/ticket/card.php?action=create',
+			'langs' => 'ticket',
+			'position' => 102,
+			'enabled' => '$conf->ticket->enabled',
+			'perms' => '$user->rights->ticket->write',
+			'target' => '',
+			'user' => 2);
+		$r++;
 
-        $this->menu[$r] = array('fk_menu' => 'fk_mainmenu=ticket,fk_leftmenu=ticket',
-            'type' => 'left',
-            'titre' => 'List',
-            'mainmenu' => 'ticket',
-            'leftmenu' => 'ticketlist',
-            'url' => '/ticket/list.php?search_fk_status=non_closed',
-            'langs' => 'ticket',
-            'position' => 103,
-            'enabled' => '$conf->ticket->enabled',
-            'perms' => '$user->rights->ticket->read',
-            'target' => '',
-            'user' => 2);
-        $r++;
+		$this->menu[$r] = array('fk_menu' => 'fk_mainmenu=ticket,fk_leftmenu=ticket',
+			'type' => 'left',
+			'titre' => 'List',
+			'mainmenu' => 'ticket',
+			'leftmenu' => 'ticketlist',
+			'url' => '/ticket/list.php?search_fk_status=non_closed',
+			'langs' => 'ticket',
+			'position' => 103,
+			'enabled' => '$conf->ticket->enabled',
+			'perms' => '$user->rights->ticket->read',
+			'target' => '',
+			'user' => 2);
+		$r++;
 
-        $this->menu[$r] = array('fk_menu' => 'fk_mainmenu=ticket,fk_leftmenu=ticket',
-            'type' => 'left',
-            'titre' => 'MenuTicketMyAssign',
-            'mainmenu' => 'ticket',
-            'leftmenu' => 'ticketmy',
-            'url' => '/ticket/list.php?mode=mine&search_fk_status=non_closed',
-            'langs' => 'ticket',
-            'position' => 105,
-            'enabled' => '$conf->ticket->enabled',
-            'perms' => '$user->rights->ticket->read',
-            'target' => '',
-            'user' => 0);
-        $r++;
+		$this->menu[$r] = array('fk_menu' => 'fk_mainmenu=ticket,fk_leftmenu=ticket',
+			'type' => 'left',
+			'titre' => 'MenuTicketMyAssign',
+			'mainmenu' => 'ticket',
+			'leftmenu' => 'ticketmy',
+			'url' => '/ticket/list.php?mode=mine&search_fk_status=non_closed',
+			'langs' => 'ticket',
+			'position' => 105,
+			'enabled' => '$conf->ticket->enabled',
+			'perms' => '$user->rights->ticket->read',
+			'target' => '',
+			'user' => 0);
+		$r++;
 
-        $this->menu[$r] = array('fk_menu' => 'fk_mainmenu=ticket,fk_leftmenu=ticket',
-            'type' => 'left',
-            'titre' => 'Statistics',
-            'mainmenu' => 'ticket',
-            'url' => '/ticket/stats/index.php',
-            'langs' => 'ticket',
-            'position' => 107,
-            'enabled' => '$conf->ticket->enabled',
-            'perms' => '$user->rights->ticket->read',
-            'target' => '',
-            'user' => 0);
-        $r++;
-    }
+		$this->menu[$r] = array('fk_menu' => 'fk_mainmenu=ticket,fk_leftmenu=ticket',
+			'type' => 'left',
+			'titre' => 'Statistics',
+			'mainmenu' => 'ticket',
+			'url' => '/ticket/stats/index.php',
+			'langs' => 'ticket',
+			'position' => 107,
+			'enabled' => '$conf->ticket->enabled',
+			'perms' => '$user->rights->ticket->read',
+			'target' => '',
+			'user' => 0);
+		$r++;
+	}
 
-    /**
-     *	Function called when module is enabled.
-     *	The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
-     *	It also creates data directories
-     *
-     *	@param      string	$options    Options when enabling module ('', 'noboxes')
-     *	@return     int             	1 if OK, 0 if KO
-     */
-    public function init($options = '')
-    {
+	/**
+	 *	Function called when module is enabled.
+	 *	The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
+	 *	It also creates data directories
+	 *
+	 *	@param      string	$options    Options when enabling module ('', 'noboxes')
+	 *	@return     int             	1 if OK, 0 if KO
+	 */
+	public function init($options = '')
+	{
 
-        $sql = array(
-            array("sql" => "insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (110120, 'ticket',  'internal', 'SUPPORTTEC', 'Utilisateur assigné au ticket', 1);", "ignoreerror" => 1),
-            array("sql" => "insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (110121, 'ticket',  'internal', 'CONTRIBUTOR', 'Intervenant', 1);", "ignoreerror" => 1),
-            array("sql" => "insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (110122, 'ticket',  'external', 'SUPPORTCLI', 'Contact client suivi incident', 1);", "ignoreerror" => 1),
-            array("sql" => "insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (110123, 'ticket',  'external', 'CONTRIBUTOR', 'Intervenant', 1);", "ignoreerror" => 1),
-        );
+		$sql = array(
+			array("sql" => "insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (110120, 'ticket',  'internal', 'SUPPORTTEC', 'Utilisateur assigné au ticket', 1);", "ignoreerror" => 1),
+			array("sql" => "insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (110121, 'ticket',  'internal', 'CONTRIBUTOR', 'Intervenant', 1);", "ignoreerror" => 1),
+			array("sql" => "insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (110122, 'ticket',  'external', 'SUPPORTCLI', 'Contact client suivi incident', 1);", "ignoreerror" => 1),
+			array("sql" => "insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (110123, 'ticket',  'external', 'CONTRIBUTOR', 'Intervenant', 1);", "ignoreerror" => 1),
+		);
 
-        return $this->_init($sql, $options);
-    }
+		return $this->_init($sql, $options);
+	}
 }
diff --git a/htdocs/core/modules/modUser.class.php b/htdocs/core/modules/modUser.class.php
index 56e08ee7644..b45fdd1b48a 100644
--- a/htdocs/core/modules/modUser.class.php
+++ b/htdocs/core/modules/modUser.class.php
@@ -77,8 +77,8 @@ class modUser extends DolibarrModules
 
 		// Boxes
 		$this->boxes = array(
-		    0=>array('file'=>'box_lastlogin.php', 'enabledbydefaulton'=>'Home'),
-            1=>array('file'=>'box_birthdays.php', 'enabledbydefaulton'=>'Home')
+			0=>array('file'=>'box_lastlogin.php', 'enabledbydefaulton'=>'Home'),
+			1=>array('file'=>'box_birthdays.php', 'enabledbydefaulton'=>'Home')
 		);
 
 		// Permissions
@@ -208,8 +208,8 @@ class modUser extends DolibarrModules
 		$this->rights[$r][5] = 'export';
 
 
-        // Menus
-        $this->menu = 1; // This module add menu entries. They are coded into menu manager.
+		// Menus
+		$this->menu = 1; // This module add menu entries. They are coded into menu manager.
 
 
 		// Exports
@@ -220,46 +220,46 @@ class modUser extends DolibarrModules
 		$this->export_label[$r] = 'List of users and attributes';
 		$this->export_permission[$r] = array(array("user", "user", "export"));
 		$this->export_fields_array[$r] = array(
-		    'u.rowid'=>"Id", 'u.login'=>"Login", 'u.lastname'=>"Lastname", 'u.firstname'=>"Firstname", 'u.employee'=>"Employee", 'u.job'=>"PostOrFunction", 'u.gender'=>"Gender",
-		    'u.accountancy_code'=>"UserAccountancyCode",
-		    'u.address'=>"Address", 'u.zip'=>"Zip", 'u.town'=>"Town",
-		    'u.office_phone'=>'Phone', 'u.user_mobile'=>"Mobile", 'u.office_fax'=>'Fax',
-		    'u.email'=>"Email", 'u.note'=>"Note", 'u.signature'=>'Signature',
-		    'u.fk_user'=>'HierarchicalResponsible', 'u.thm'=>'THM', 'u.tjm'=>'TJM', 'u.weeklyhours'=>'WeeklyHours',
-		    'u.dateemployment'=>'DateEmployment', 'u.salary'=>'Salary', 'u.color'=>'Color', 'u.api_key'=>'ApiKey',
-		    'u.birth'=>'DateOfBirth',
-		    'u.datec'=>"DateCreation", 'u.tms'=>"DateLastModification",
+			'u.rowid'=>"Id", 'u.login'=>"Login", 'u.lastname'=>"Lastname", 'u.firstname'=>"Firstname", 'u.employee'=>"Employee", 'u.job'=>"PostOrFunction", 'u.gender'=>"Gender",
+			'u.accountancy_code'=>"UserAccountancyCode",
+			'u.address'=>"Address", 'u.zip'=>"Zip", 'u.town'=>"Town",
+			'u.office_phone'=>'Phone', 'u.user_mobile'=>"Mobile", 'u.office_fax'=>'Fax',
+			'u.email'=>"Email", 'u.note'=>"Note", 'u.signature'=>'Signature',
+			'u.fk_user'=>'HierarchicalResponsible', 'u.thm'=>'THM', 'u.tjm'=>'TJM', 'u.weeklyhours'=>'WeeklyHours',
+			'u.dateemployment'=>'DateEmployment', 'u.salary'=>'Salary', 'u.color'=>'Color', 'u.api_key'=>'ApiKey',
+			'u.birth'=>'DateOfBirth',
+			'u.datec'=>"DateCreation", 'u.tms'=>"DateLastModification",
 			'u.admin'=>"Administrator", 'u.statut'=>'Status', 'u.datelastlogin'=>'LastConnexion', 'u.datepreviouslogin'=>'PreviousConnexion',
 			'u.fk_socpeople'=>"IdContact", 'u.fk_soc'=>"IdCompany", 'u.fk_member'=>"MemberId"
 		);
 		$this->export_TypeFields_array[$r] = array(
 			'u.rowid'=>'Numeric', 'u.login'=>"Text", 'u.lastname'=>"Text", 'u.firstname'=>"Text", 'u.employee'=>'Boolean', 'u.job'=>'Text',
-		    'u.accountancy_code'=>'Text',
-		    'u.address'=>"Text", 'u.zip'=>"Text", 'u.town'=>"Text",
-		    'u.office_phone'=>'Text', 'u.user_mobile'=>'Text', 'u.office_fax'=>'Text',
+			'u.accountancy_code'=>'Text',
+			'u.address'=>"Text", 'u.zip'=>"Text", 'u.town'=>"Text",
+			'u.office_phone'=>'Text', 'u.user_mobile'=>'Text', 'u.office_fax'=>'Text',
 			'u.email'=>'Text', 'u.datec'=>"Date", 'u.tms'=>"Date", 'u.admin'=>"Boolean", 'u.statut'=>'Status', 'u.note'=>"Text", 'u.datelastlogin'=>'Date',
-		    'u.fk_user'=>"List:user:login",
-		    'u.birth'=>'Date',
-		    'u.datepreviouslogin'=>'Date', 'u.fk_soc'=>"List:societe:nom:rowid", 'u.fk_member'=>"List:adherent:firstname"
+			'u.fk_user'=>"List:user:login",
+			'u.birth'=>'Date',
+			'u.datepreviouslogin'=>'Date', 'u.fk_soc'=>"List:societe:nom:rowid", 'u.fk_member'=>"List:adherent:firstname"
 		);
 		$this->export_entities_array[$r] = array(
 			'u.rowid'=>"user", 'u.login'=>"user", 'u.lastname'=>"user", 'u.firstname'=>"user", 'u.employee'=>'user', 'u.job'=>'user', 'u.gender'=>'user',
-		    'u.accountancy_code'=>'user',
-		    'u.address'=>"user", 'u.zip'=>"user", 'u.town'=>"user",
-		    'u.office_phone'=>'user', 'u.user_mobile'=>'user', 'u.office_fax'=>'user',
-		    'u.email'=>'user', 'u.note'=>"user", 'u.signature'=>'user',
-		    'u.fk_user'=>'user', 'u.thm'=>'user', 'u.tjm'=>'user', 'u.weeklyhours'=>'user',
-		    'u.dateemployment'=>'user', 'u.salary'=>'user', 'u.color'=>'user', 'u.api_key'=>'user',
-		    'u.birth'=>'user',
-		    'u.datec'=>"user", 'u.tms'=>"user",
-		    'u.admin'=>"user", 'u.statut'=>'user', 'u.datelastlogin'=>'user', 'u.datepreviouslogin'=>'user',
-		    'u.fk_socpeople'=>"contact", 'u.fk_soc'=>"company", 'u.fk_member'=>"member"
+			'u.accountancy_code'=>'user',
+			'u.address'=>"user", 'u.zip'=>"user", 'u.town'=>"user",
+			'u.office_phone'=>'user', 'u.user_mobile'=>'user', 'u.office_fax'=>'user',
+			'u.email'=>'user', 'u.note'=>"user", 'u.signature'=>'user',
+			'u.fk_user'=>'user', 'u.thm'=>'user', 'u.tjm'=>'user', 'u.weeklyhours'=>'user',
+			'u.dateemployment'=>'user', 'u.salary'=>'user', 'u.color'=>'user', 'u.api_key'=>'user',
+			'u.birth'=>'user',
+			'u.datec'=>"user", 'u.tms'=>"user",
+			'u.admin'=>"user", 'u.statut'=>'user', 'u.datelastlogin'=>'user', 'u.datepreviouslogin'=>'user',
+			'u.fk_socpeople'=>"contact", 'u.fk_soc'=>"company", 'u.fk_member'=>"member"
 		);
-        if (empty($conf->adherent->enabled))
-        {
-            unset($this->export_fields_array[$r]['u.fk_member']);
-            unset($this->export_entities_array[$r]['u.fk_member']);
-        }
+		if (empty($conf->adherent->enabled))
+		{
+			unset($this->export_fields_array[$r]['u.fk_member']);
+			unset($this->export_entities_array[$r]['u.fk_member']);
+		}
 		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
 		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'user as u';
 		$this->export_sql_end[$r] .= ' WHERE u.entity IN ('.getEntity('user').')';
@@ -275,43 +275,43 @@ class modUser extends DolibarrModules
 		$this->import_entities_array[$r] = array(); // We define here only fields that use another icon that the one defined into import_icon
 		$this->import_tables_array[$r] = array('u'=>MAIN_DB_PREFIX.'user', 'extra'=>MAIN_DB_PREFIX.'user_extrafields'); // List of tables to insert into (insert done in same order)
 		$this->import_fields_array[$r] = array(
-		    'u.login'=>"Login*", 'u.lastname'=>"Name*", 'u.firstname'=>"Firstname", 'u.employee'=>"Employee*", 'u.job'=>"PostOrFunction", 'u.gender'=>"Gender",
-		    'u.accountancy_code'=>"UserAccountancyCode",
+			'u.login'=>"Login*", 'u.lastname'=>"Name*", 'u.firstname'=>"Firstname", 'u.employee'=>"Employee*", 'u.job'=>"PostOrFunction", 'u.gender'=>"Gender",
+			'u.accountancy_code'=>"UserAccountancyCode",
 			'u.pass_crypted'=>"Password", 'u.admin'=>"Administrator", 'u.fk_soc'=>"Company*", 'u.address'=>"Address", 'u.zip'=>"Zip", 'u.town'=>"Town",
 			'u.fk_state'=>"StateId", 'u.fk_country'=>"CountryCode",
-		    'u.office_phone'=>"Phone", 'u.user_mobile'=>"Mobile", 'u.office_fax'=>"Fax",
-		    'u.email'=>"Email", 'u.note'=>"Note", 'u.signature'=>'Signature',
-		    'u.fk_user'=>'HierarchicalResponsible', 'u.thm'=>'THM', 'u.tjm'=>'TJM', 'u.weeklyhours'=>'WeeklyHours',
+			'u.office_phone'=>"Phone", 'u.user_mobile'=>"Mobile", 'u.office_fax'=>"Fax",
+			'u.email'=>"Email", 'u.note'=>"Note", 'u.signature'=>'Signature',
+			'u.fk_user'=>'HierarchicalResponsible', 'u.thm'=>'THM', 'u.tjm'=>'TJM', 'u.weeklyhours'=>'WeeklyHours',
 			'u.dateemployment'=>'DateEmployment', 'u.salary'=>'Salary', 'u.color'=>'Color', 'u.api_key'=>'ApiKey',
-		    'u.birth'=>'DateOfBirth',
-		    'u.datec'=>"DateCreation",
-		    'u.statut'=>'Status'
+			'u.birth'=>'DateOfBirth',
+			'u.datec'=>"DateCreation",
+			'u.statut'=>'Status'
 		);
 		// Add extra fields
 		$sql = "SELECT name, label, fieldrequired FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'user' AND entity IN (0,".$conf->entity.")";
 		$resql = $this->db->query($sql);
 		if ($resql)    // This can fail when class is used on old database (during migration for example)
 		{
-		    while ($obj = $this->db->fetch_object($resql))
-		    {
-		        $fieldname = 'extra.'.$obj->name;
-		        $fieldlabel = ucfirst($obj->label);
-		        $this->import_fields_array[$r][$fieldname] = $fieldlabel.($obj->fieldrequired ? '*' : '');
-		    }
+			while ($obj = $this->db->fetch_object($resql))
+			{
+				$fieldname = 'extra.'.$obj->name;
+				$fieldlabel = ucfirst($obj->label);
+				$this->import_fields_array[$r][$fieldname] = $fieldlabel.($obj->fieldrequired ? '*' : '');
+			}
 		}
 		// End add extra fields
 		$this->import_fieldshidden_array[$r] = array('u.fk_user_creat'=>'user->id', 'extra.fk_object'=>'lastrowid-'.MAIN_DB_PREFIX.'user'); // aliastable.field => ('user->id' or 'lastrowid-'.tableparent)
 		$this->import_convertvalue_array[$r] = array(
 			'u.fk_state'=>array('rule'=>'fetchidfromcodeid', 'classfile'=>'/core/class/cstate.class.php', 'class'=>'Cstate', 'method'=>'fetch', 'dict'=>'DictionaryState'),
-		    'u.fk_country'=>array('rule'=>'fetchidfromcodeid', 'classfile'=>'/core/class/ccountry.class.php', 'class'=>'Ccountry', 'method'=>'fetch', 'dict'=>'DictionaryCountry'),
-		    'u.salary'=>array('rule'=>'numeric')
+			'u.fk_country'=>array('rule'=>'fetchidfromcodeid', 'classfile'=>'/core/class/ccountry.class.php', 'class'=>'Ccountry', 'method'=>'fetch', 'dict'=>'DictionaryCountry'),
+			'u.salary'=>array('rule'=>'numeric')
 		);
 		//$this->import_convertvalue_array[$r]=array('s.fk_soc'=>array('rule'=>'lastrowid',table='t');
 		$this->import_regex_array[$r] = array(
 			'u.employee'=>'^[0|1]',
 			'u.datec'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]( [0-9][0-9]:[0-9][0-9]:[0-9][0-9])?$',
-            'u.dateemployment'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$',
-            'u.birth'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$'
+			'u.dateemployment'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$',
+			'u.birth'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$'
 		);
 		$this->import_examplevalues_array[$r] = array(
 			'u.lastname'=>"Doe", 'u.firstname'=>'John', 'u.login'=>'jdoe', 'u.employee'=>'0 or 1', 'u.job'=>'CTO', 'u.gender'=>'0 or 1',
@@ -319,22 +319,22 @@ class modUser extends DolibarrModules
 			'u.fk_soc'=>'0 (internal user) or company name (external user)', 'u.datec'=>dol_print_date(dol_now(), '%Y-%m-%d'), 'u.address'=>"61 jump street",
 			'u.zip'=>"123456", 'u.town'=>"Big town", 'u.fk_country'=>'US, FR, DE...', 'u.office_phone'=>"0101010101", 'u.office_fax'=>"0101010102",
 			'u.email'=>"test@mycompany.com", 'u.salary'=>"10000", 'u.note'=>"This is an example of note for record", 'u.datec'=>"2015-01-01 or 2015-01-01 12:30:00",
-		    'u.statut'=>"0 (closed) or 1 (active)",
+			'u.statut'=>"0 (closed) or 1 (active)",
 		);
 		$this->import_updatekeys_array[$r] = array('u.lastname'=>'Lastname', 'u.firstname'=>'Firstname', 'u.login'=>'Login');
 	}
 
 
-    /**
+	/**
 	 *		Function called when module is enabled.
 	 *		The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
 	 *		It also creates data directories
 	 *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
+	 *      @param      string	$options    Options when enabling module ('', 'noboxes')
 	 *      @return     int             	1 if OK, 0 if KO
-     */
-    public function init($options = '')
-    {
+	 */
+	public function init($options = '')
+	{
 		global $conf;
 
 		// Permissions
@@ -343,5 +343,5 @@ class modUser extends DolibarrModules
 		$sql = array();
 
 		return $this->_init($sql, $options);
-    }
+	}
 }
diff --git a/htdocs/core/modules/modVariants.class.php b/htdocs/core/modules/modVariants.class.php
index 827078c3b78..72b29230def 100644
--- a/htdocs/core/modules/modVariants.class.php
+++ b/htdocs/core/modules/modVariants.class.php
@@ -92,7 +92,7 @@ class modVariants extends DolibarrModules
 
 		// Array to add new pages in new tabs
 		$this->tabs = array(
-        //	'product:+combinations:Combinaciones:products:1:/variants/combinations.php?id=__ID__'
+		//	'product:+combinations:Combinaciones:products:1:/variants/combinations.php?id=__ID__'
 		);
 
 		// Dictionaries
diff --git a/htdocs/core/modules/modWebServices.class.php b/htdocs/core/modules/modWebServices.class.php
index 5d405ec0afe..e61ed5dc689 100644
--- a/htdocs/core/modules/modWebServices.class.php
+++ b/htdocs/core/modules/modWebServices.class.php
@@ -30,54 +30,54 @@ include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
 class modWebServices extends DolibarrModules
 {
 
-    /**
+	/**
 	 *   Constructor. Define names, constants, directories, boxes, permissions
 	 *
 	 *   @param      DoliDB		$db      Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-        $this->numero = 2600;
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+		$this->numero = 2600;
 
-        $this->family = "interface";
-        $this->module_position = '25';
-        // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
-        $this->name = preg_replace('/^mod/i', '', get_class($this));
-        $this->description = "Enable the Dolibarr web services server";
+		$this->family = "interface";
+		$this->module_position = '25';
+		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+		$this->name = preg_replace('/^mod/i', '', get_class($this));
+		$this->description = "Enable the Dolibarr web services server";
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
-        $this->version = 'dolibarr';
-        // Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
-        $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-        // Name of image file used for this module.
-        $this->picto = 'technic';
+		$this->version = 'dolibarr';
+		// Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
+		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+		// Name of image file used for this module.
+		$this->picto = 'technic';
 
-        // Data directories to create when module is enabled
-        $this->dirs = array();
+		// Data directories to create when module is enabled
+		$this->dirs = array();
 
-        // Config pages
-        $this->config_page_url = array("index.php@webservices");
+		// Config pages
+		$this->config_page_url = array("index.php@webservices");
 
-        // Dependencies
-        $this->hidden = false; // A condition to hide module
+		// Dependencies
+		$this->hidden = false; // A condition to hide module
 		$this->depends = array(); // List of module class names as string that must be enabled if this module is enabled
 		$this->requiredby = array(); // List of module ids to disable if this one is disabled
 		$this->conflictwith = array(); // List of module class names as string this module is in conflict with
 		$this->phpmin = array(5, 4); // Minimum version of PHP required by module
-        $this->langfiles = array("other");
+		$this->langfiles = array("other");
 
-        // Constants
-        $this->const = array();
+		// Constants
+		$this->const = array();
 
-        // New pages on tabs
-        $this->tabs = array();
+		// New pages on tabs
+		$this->tabs = array();
 
-        // Boxes
-        $this->boxes = array();
+		// Boxes
+		$this->boxes = array();
 
-        // Permissions
-        $this->rights = array();
-        $this->rights_class = 'webservices';
-        $r = 0;
-    }
+		// Permissions
+		$this->rights = array();
+		$this->rights_class = 'webservices';
+		$r = 0;
+	}
 }
diff --git a/htdocs/core/modules/modWebsite.class.php b/htdocs/core/modules/modWebsite.class.php
index 60cc93b5d39..c452ed9ded2 100644
--- a/htdocs/core/modules/modWebsite.class.php
+++ b/htdocs/core/modules/modWebsite.class.php
@@ -31,54 +31,54 @@ include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
 class modWebsite extends DolibarrModules
 {
 
-    /**
+	/**
 	 *   Constructor. Define names, constants, directories, boxes, permissions
 	 *
 	 *   @param      DoliDB		$db      Database handler
-     */
-    public function __construct($db)
-    {
-    	global $langs, $conf;
+	 */
+	public function __construct($db)
+	{
+		global $langs, $conf;
 
-        $this->db = $db;
-        $this->numero = 10000;
+		$this->db = $db;
+		$this->numero = 10000;
 
 		// Family can be 'crm','financial','hr','projects','products','ecm','technic','other'
 		// It is used to group modules in module setup page
-        $this->family = "portal";
-        $this->module_position = '50';
-        // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
-        $this->name = preg_replace('/^mod/i', '', get_class($this));
-        $this->description = "Enable to build and serve public web sites with CMS features";
+		$this->family = "portal";
+		$this->module_position = '50';
+		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+		$this->name = preg_replace('/^mod/i', '', get_class($this));
+		$this->description = "Enable to build and serve public web sites with CMS features";
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
-        $this->version = 'dolibarr';
-        // Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
-        $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-        // Name of image file used for this module.
-        $this->picto = 'website';
+		$this->version = 'dolibarr';
+		// Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
+		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+		// Name of image file used for this module.
+		$this->picto = 'website';
 
 		// Data directories to create when module is enabled
 		$this->dirs = array("/website/temp");
 
-        // Config pages
-        $this->config_page_url = array('website.php');
+		// Config pages
+		$this->config_page_url = array('website.php');
 
-        // Dependencies
+		// Dependencies
 		$this->hidden = !empty($conf->global->MODULE_WEBSITE_DISABLED); // A condition to disable module
 		$this->depends = array('modFckeditor'); // List of modules id that must be enabled if this module is enabled
-        $this->requiredby = array(); // List of modules id to disable if this one is disabled
+		$this->requiredby = array(); // List of modules id to disable if this one is disabled
 		$this->conflictwith = array(); // List of modules id this module is in conflict with
 		$this->phpmin = array(5, 4); // Minimum version of PHP required by module
-        $this->langfiles = array("website");
+		$this->langfiles = array("website");
 
-        // Constants
-       	$this->const = array();
+		// Constants
+	   	$this->const = array();
 
-        // New pages on tabs
-       	//$this->tabs[] = array();  					// To add a new tab identified by code tabname1
+		// New pages on tabs
+	   	//$this->tabs[] = array();  					// To add a new tab identified by code tabname1
 
-        // Boxes
-        $this->boxes = array();
+		// Boxes
+		$this->boxes = array();
 
 		// Permissions
 		$this->rights = array(); // Permission array used by this module
@@ -109,95 +109,95 @@ class modWebsite extends DolibarrModules
 		$this->rights[$r][4] = 'delete';
 		$r++;
 
-        // Main menu entries
-        $r = 0;
-        $this->menu[$r] = array('fk_menu'=>'0', // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-						        'type'=>'top', // This is a Left menu entry
-						        'titre'=>'WebSites',
-                                'mainmenu'=>'website',
-						        'url'=>'/website/index.php',
-						        'langs'=>'website', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-						        'position'=>100,
-						        'enabled'=>'$conf->website->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->website->read', // Use 'perms'=>'$user->rights->mymodule->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++;
+		// Main menu entries
+		$r = 0;
+		$this->menu[$r] = array('fk_menu'=>'0', // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+								'type'=>'top', // This is a Left menu entry
+								'titre'=>'WebSites',
+								'mainmenu'=>'website',
+								'url'=>'/website/index.php',
+								'langs'=>'website', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+								'position'=>100,
+								'enabled'=>'$conf->website->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->website->read', // Use 'perms'=>'$user->rights->mymodule->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++;
 
-        // Exports
-        $r = 1;
+		// Exports
+		$r = 1;
 
-        $this->export_code[$r] = $this->rights_class.'_'.$r;
-        $this->export_label[$r] = 'MyWebsitePages'; // Translation key (used only if key ExportDataset_xxx_z not found)
-        $this->export_icon[$r] = 'globe';
-        $keyforclass = 'WebsitePage'; $keyforclassfile = '/website/class/websitepage.class.php'; $keyforelement = 'Website';
-        include DOL_DOCUMENT_ROOT.'/core/commonfieldsinexport.inc.php';
-        //$keyforselect='myobject'; $keyforelement='myobject'; $keyforaliasextra='extra';
-        //include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
-        $this->export_sql_start[$r] = 'SELECT DISTINCT ';
-        $this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'website_page as t, '.MAIN_DB_PREFIX.'website as p';
-        $this->export_sql_end[$r] .= ' WHERE t.fk_website = p.rowid';
-        $this->export_sql_end[$r] .= ' AND p.entity IN ('.getEntity('website').')';
-        $r++;
-    }
+		$this->export_code[$r] = $this->rights_class.'_'.$r;
+		$this->export_label[$r] = 'MyWebsitePages'; // Translation key (used only if key ExportDataset_xxx_z not found)
+		$this->export_icon[$r] = 'globe';
+		$keyforclass = 'WebsitePage'; $keyforclassfile = '/website/class/websitepage.class.php'; $keyforelement = 'Website';
+		include DOL_DOCUMENT_ROOT.'/core/commonfieldsinexport.inc.php';
+		//$keyforselect='myobject'; $keyforelement='myobject'; $keyforaliasextra='extra';
+		//include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
+		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
+		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'website_page as t, '.MAIN_DB_PREFIX.'website as p';
+		$this->export_sql_end[$r] .= ' WHERE t.fk_website = p.rowid';
+		$this->export_sql_end[$r] .= ' AND p.entity IN ('.getEntity('website').')';
+		$r++;
+	}
 
 
-    /**
-     *  Function called when module is enabled.
-     *  The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
-     *  It also creates data directories
-     *
-     *  @param      string	$options    Options when enabling module ('', 'noboxes')
-     *  @return     int                 1 if OK, 0 if KO
-     */
-    public function init($options = '')
-    {
-    	global $conf, $langs;
+	/**
+	 *  Function called when module is enabled.
+	 *  The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
+	 *  It also creates data directories
+	 *
+	 *  @param      string	$options    Options when enabling module ('', 'noboxes')
+	 *  @return     int                 1 if OK, 0 if KO
+	 */
+	public function init($options = '')
+	{
+		global $conf, $langs;
 
-    	// Remove permissions and default values
-    	$this->remove($options);
+		// Remove permissions and default values
+		$this->remove($options);
 
-    	// Copy flags and octicons directory
-    	$dirarray = array('common/flags'=>'flags', 'common/octicons/build/svg'=>'octicons');
-    	foreach ($dirarray as $dirfrom => $dirtarget)
-    	{
-	    	$src = DOL_DOCUMENT_ROOT.'/theme/'.$dirfrom;
-	    	$dest = DOL_DATA_ROOT.'/medias/image/'.$dirtarget;
+		// Copy flags and octicons directory
+		$dirarray = array('common/flags'=>'flags', 'common/octicons/build/svg'=>'octicons');
+		foreach ($dirarray as $dirfrom => $dirtarget)
+		{
+			$src = DOL_DOCUMENT_ROOT.'/theme/'.$dirfrom;
+			$dest = DOL_DATA_ROOT.'/medias/image/'.$dirtarget;
 
-	    	if (is_dir($src))
-	    	{
-	    		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-	    		dol_mkdir($dest);
-	    		$result = dolCopyDir($src, $dest, 0, 0);
-	    		if ($result < 0)
-	    		{
-	    			$langs->load("errors");
-	    			$this->error = $langs->trans('ErrorFailToCopyDir', $src, $dest);
-	    			return 0;
-	    		}
-	    	}
-    	}
+			if (is_dir($src))
+			{
+				require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+				dol_mkdir($dest);
+				$result = dolCopyDir($src, $dest, 0, 0);
+				if ($result < 0)
+				{
+					$langs->load("errors");
+					$this->error = $langs->trans('ErrorFailToCopyDir', $src, $dest);
+					return 0;
+				}
+			}
+		}
 
-    	// Website templates
-    	$srcroot = DOL_DOCUMENT_ROOT.'/install/doctemplates/websites';
-    	$destroot = DOL_DATA_ROOT.'/doctemplates/websites';
+		// Website templates
+		$srcroot = DOL_DOCUMENT_ROOT.'/install/doctemplates/websites';
+		$destroot = DOL_DATA_ROOT.'/doctemplates/websites';
 
-    	dol_mkdir($destroot);
+		dol_mkdir($destroot);
 
-    	$docs = dol_dir_list($srcroot, 'files', 0, 'website_.*(\.zip|\.jpg)$');
-    	foreach ($docs as $cursorfile) {
-	    	$src = $srcroot.'/'.$cursorfile['name'];
-	    	$dest = $destroot.'/'.$cursorfile['name'];
+		$docs = dol_dir_list($srcroot, 'files', 0, 'website_.*(\.zip|\.jpg)$');
+		foreach ($docs as $cursorfile) {
+			$src = $srcroot.'/'.$cursorfile['name'];
+			$dest = $destroot.'/'.$cursorfile['name'];
 
-	    	$result = dol_copy($src, $dest, 0, 1); // For full zip templates, we overwrite old existing files
-	    	if ($result < 0) {
-	    		$langs->load("errors");
-	    		$this->error = $langs->trans('ErrorFailToCopyFile', $src, $dest);
-	    	}
-    	}
+			$result = dol_copy($src, $dest, 0, 1); // For full zip templates, we overwrite old existing files
+			if ($result < 0) {
+				$langs->load("errors");
+				$this->error = $langs->trans('ErrorFailToCopyFile', $src, $dest);
+			}
+		}
 
-    	$sql = array();
+		$sql = array();
 
-    	return $this->_init($sql, $options);
-    }
+		return $this->_init($sql, $options);
+	}
 }
diff --git a/htdocs/core/modules/modWorkflow.class.php b/htdocs/core/modules/modWorkflow.class.php
index 601106d7f02..c7bd464b9d1 100644
--- a/htdocs/core/modules/modWorkflow.class.php
+++ b/htdocs/core/modules/modWorkflow.class.php
@@ -32,75 +32,75 @@ include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
 class modWorkflow extends DolibarrModules
 {
 
-    /**
+	/**
 	 *   Constructor. Define names, constants, directories, boxes, permissions
 	 *
 	 *   @param      DoliDB		$db      Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
+	 */
+	public function __construct($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).
-        $this->numero = 6000;
-        // Key text used to identify module (for permissions, menus, etc...)
-        $this->rights_class = 'workflow';
+		// Id for module (must be unique).
+		// Use here a free id (See in Home -> System information -> Dolibarr for list of used modules id).
+		$this->numero = 6000;
+		// Key text used to identify module (for permissions, menus, etc...)
+		$this->rights_class = 'workflow';
 
-        $this->family = "technic";
-        // 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));
-        // Module description, used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
-        $this->description = "Workflow management";
-        // Possible values for version are: 'development', 'experimental', 'dolibarr' or version
-        $this->version = 'dolibarr';
-        // Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
-        $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-        // Name of png file (without png) 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 = 'technic';
+		$this->family = "technic";
+		// 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));
+		// Module description, used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
+		$this->description = "Workflow management";
+		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
+		$this->version = 'dolibarr';
+		// Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
+		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+		// Name of png file (without png) 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 = 'technic';
 
-        // Data directories to create when module is enabled
-        $this->dirs = array("/workflow/temp");
+		// Data directories to create when module is enabled
+		$this->dirs = array("/workflow/temp");
 
-        // Config pages. Put here list of php page names stored in admmin directory used to setup module.
-        $this->config_page_url = array('workflow.php');
+		// Config pages. Put here list of php page names stored in admmin directory used to setup module.
+		$this->config_page_url = array('workflow.php');
 
-        // Dependencies
-        $this->hidden = false; // A condition to hide module
+		// Dependencies
+		$this->hidden = false; // A condition to hide module
 		$this->depends = array(); // List of module class names as string that must be enabled if this module is enabled
 		$this->requiredby = array(); // List of module ids to disable if this one is disabled
 		$this->conflictwith = array(); // List of module class names as string this module is in conflict with
 		$this->phpmin = array(5, 4); // Minimum version of PHP required by module
-        $this->need_dolibarr_version = array(2, 8); // Minimum version of Dolibarr required by module
-        $this->langfiles = array("@workflow");
+		$this->need_dolibarr_version = array(2, 8); // Minimum version of Dolibarr required by module
+		$this->langfiles = array("@workflow");
 
-        // Constants
-        // List of particular constants to add when module is enabled (key, 'chaine', value, desc, visible, 'current' or 'allentities', deleteonunactive)
-        // Example: $this->const=array(1 => array('MYMODULE_MYNEWCONST1', 'chaine', 'myvalue', 'This is a constant to add', 1),
-        //                             2 => array('MYMODULE_MYNEWCONST2', 'chaine', 'myvalue', 'This is another constant to add', 0, 'current', 1)
-        // );
-        $this->const = array(
-            //0=>array('WORKFLOW_PROPAL_AUTOCREATE_ORDER', 'chaine', '1', 'WORKFLOW_PROPAL_AUTOCREATE_ORDER', 0, 'current', 0),
-            //0=>array('WORKFLOW_ORDER_AUTOCREATE_INVOICE', 'chaine', '1', 'WORKFLOW_ORDER_AUTOCREATE_INVOICE', 0, 'current', 0),
-            0=>array('WORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL', 'chaine', '1', 'WORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL', 0, 'current', 0),
-            1=>array('WORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL', 'chaine', '1', 'WORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL', 0, 'current', 0),
-            2=>array('WORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING', 'chaine', '1', 'WORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING', 0, 'current', 0),
-            4=>array('WORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER', 'chaine', '1', 'WORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER', 0, 'current', 0),
-            5=>array('WORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL', 'chaine', '1', 'WORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL', 0, 'current', 0),
-            6=>array('WORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER', 'chaine', '1', 'WORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER', 0, 'current', 0),
-            7=>array('WORKFLOW_BILL_ON_RECEPTION', 'chaine', '1', 'WORKFLOW_BILL_ON_RECEPTION', 0, 'current', 0)
-        );
+		// Constants
+		// List of particular constants to add when module is enabled (key, 'chaine', value, desc, visible, 'current' or 'allentities', deleteonunactive)
+		// Example: $this->const=array(1 => array('MYMODULE_MYNEWCONST1', 'chaine', 'myvalue', 'This is a constant to add', 1),
+		//                             2 => array('MYMODULE_MYNEWCONST2', 'chaine', 'myvalue', 'This is another constant to add', 0, 'current', 1)
+		// );
+		$this->const = array(
+			//0=>array('WORKFLOW_PROPAL_AUTOCREATE_ORDER', 'chaine', '1', 'WORKFLOW_PROPAL_AUTOCREATE_ORDER', 0, 'current', 0),
+			//0=>array('WORKFLOW_ORDER_AUTOCREATE_INVOICE', 'chaine', '1', 'WORKFLOW_ORDER_AUTOCREATE_INVOICE', 0, 'current', 0),
+			0=>array('WORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL', 'chaine', '1', 'WORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL', 0, 'current', 0),
+			1=>array('WORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL', 'chaine', '1', 'WORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL', 0, 'current', 0),
+			2=>array('WORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING', 'chaine', '1', 'WORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING', 0, 'current', 0),
+			4=>array('WORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER', 'chaine', '1', 'WORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER', 0, 'current', 0),
+			5=>array('WORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL', 'chaine', '1', 'WORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL', 0, 'current', 0),
+			6=>array('WORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER', 'chaine', '1', 'WORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER', 0, 'current', 0),
+			7=>array('WORKFLOW_BILL_ON_RECEPTION', 'chaine', '1', 'WORKFLOW_BILL_ON_RECEPTION', 0, 'current', 0)
+		);
 
-        // Boxes
-        $this->boxes = array();
+		// Boxes
+		$this->boxes = array();
 
-        // Permissions
-        $this->rights = array();
-        $r = 0;
+		// Permissions
+		$this->rights = array();
+		$r = 0;
 
-        /*
+		/*
         $r++;
         $this->rights[$r][0] = 6001; // id de la permission
         $this->rights[$r][1] = "Lire les workflow"; // libelle de la permission
@@ -109,10 +109,10 @@ class modWorkflow extends DolibarrModules
         $this->rights[$r][4] = 'read';
         */
 
-        // Main menu entries
-        $this->menus = array(); // List of menus to add
-        $r = 0;
-        /*
+		// Main menu entries
+		$this->menus = array(); // List of menus to add
+		$r = 0;
+		/*
         $this->menu[$r]=array('fk_menu'=>0,
                                 'type'=>'top',
                                 'titre'=>'Workflow',
@@ -139,24 +139,24 @@ class modWorkflow extends DolibarrModules
                                 'user'=>0);
         $r++;
         */
-    }
+	}
 
 
-    /**
+	/**
 	 *		Function called when module is enabled.
 	 *		The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
 	 *		It also creates data directories
 	 *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
+	 *      @param      string	$options    Options when enabling module ('', 'noboxes')
 	 *      @return     int                 1 if OK, 0 if KO
-     */
-    public function init($options = '')
-    {
+	 */
+	public function init($options = '')
+	{
 		// Permissions
 		$this->remove($options);
 
 		$sql = array();
 
-        return $this->_init($sql, $options);
-    }
+		return $this->_init($sql, $options);
+	}
 }
diff --git a/htdocs/core/modules/modZapier.class.php b/htdocs/core/modules/modZapier.class.php
index 1e2f69cb2ea..9239fc99bf2 100644
--- a/htdocs/core/modules/modZapier.class.php
+++ b/htdocs/core/modules/modZapier.class.php
@@ -30,159 +30,159 @@ include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
  */
 class modZapier extends DolibarrModules
 {
-    /**
-     * Constructor. Define names, constants, directories, boxes, permissions
-     *
-     * @param DoliDB $db Database handler
-     */
-    public function __construct($db)
-    {
-        global $langs, $conf;
+	/**
+	 * Constructor. Define names, constants, directories, boxes, permissions
+	 *
+	 * @param DoliDB $db Database handler
+	 */
+	public function __construct($db)
+	{
+		global $langs, $conf;
 
-        $this->db = $db;
-        // Id for module (must be unique).
-        // Use here a free id (See in Home -> System information -> Dolibarr for list of used modules id).
-        $this->numero = 50330;
-        // Key text used to identify module (for permissions, menus, etc...)
-        $this->rights_class = 'zapier';
-        // Family can be 'base' (core modules),'crm','financial','hr','projects','products','ecm','technic' (transverse modules),'interface' (link with external tools),'other','...'
-        // It is used to group modules by family in module setup page
-        $this->family = "interface";
-        // Module position in the family on 2 digits ('01', '10', '20', ...)
-        $this->module_position = '22';
-        // Gives the possibility for the module, to provide his own family info and position of this family (Overwrite $this->family and $this->module_position. Avoid this)
-        //$this->familyinfo = array('myownfamily' => array('position' => '01', 'label' => $langs->trans("MyOwnFamily")));
-        // Module label (no space allowed), used if translation string 'ModuleZapierName' not found (Zapier is name of module).
-        $this->name = preg_replace('/^mod/i', '', get_class($this));
-        // Module description, used if translation string 'ModuleZapierDesc' not found (Zapier is name of module).
-        $this->description = "ZapierDescription";
-        // Used only if file README.md and README-LL.md not found.
-        $this->descriptionlong = "Zapier description (Long)";
-        // Possible values for version are: 'development', 'experimental', 'dolibarr', 'dolibarr_deprecated' or a version string like 'x.y.z'
-        $this->version = 'development';
-        //Url to the file with your last numberversion of this module
-        //$this->url_last_version = 'http://www.example.com/versionmodule.txt';
-        // Key used in llx_const table to save module status enabled/disabled (where ZAPIERFORDOLIBARR is value of property name of module in uppercase)
-        $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-        // Name of image file used for this module.
-        // If file is in theme/yourtheme/img directory under name object_pictovalue.png, use this->picto='pictovalue'
-        // If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module'
-        $this->picto = 'zapier';
-        // Define some features supported by module (triggers, login, substitutions, menus, css, etc...)
-        $this->module_parts = array(
-            // Set this to 1 if module has its own trigger directory (core/triggers)
-            'triggers' => 1,
-            // Set this to 1 if module has its own login method file (core/login)
-            'login' => 0,
-            // Set this to 1 if module has its own substitution function file (core/substitutions)
-            'substitutions' => 0,
-            // Set this to 1 if module has its own menus handler directory (core/menus)
-            'menus' => 0,
-            // Set this to 1 if module overwrite template dir (core/tpl)
-            'tpl' => 0,
-            // Set this to 1 if module has its own barcode directory (core/modules/barcode)
-            'barcode' => 0,
-            // Set this to 1 if module has its own models directory (core/modules/xxx)
-            'models' => 0,
-            // Set this to 1 if module has its own theme directory (theme)
-            'theme' => 0,
-            // Set this to relative path of css file if module has its own css file
-            'css' => array(
-                //    '/zapier/css/zapier.css.php',
-            ),
-            // Set this to relative path of js file if module must load a js on all pages
-            'js' => array(
-                //   '/zapier/js/zapier.js.php',
-            ),
-            // Set here all hooks context managed by module. To find available hook context, make a "grep -r '>initHooks(' *" on source code. You can also set hook context 'all'
-            'hooks' => array(
-                //   'data' => array(
-                //       'hookcontext1',
-                //       'hookcontext2',
-                //   ),
-                //   'entity' => '0',
-            ),
-            // Set this to 1 if feature of module are opened to external users
-            'moduleforexternal' => 0,
-        );
-        // Data directories to create when module is enabled.
-        // Example: this->dirs = array("/zapier/temp","/zapier/subdir");
-        $this->dirs = array("/zapier/temp");
-        // Config pages. Put here list of php page, stored into zapier/admin directory, to use to setup module.
-        $this->config_page_url = array(
-        //    "setup.php@zapier"
-        );
-        // Dependencies
-        // A condition to hide module
-        $this->hidden = false;
-        // List of module class names as string that must be enabled if this module is enabled. Example: array('always1'=>'modModuleToEnable1','always2'=>'modModuleToEnable2', 'FR1'=>'modModuleToEnableFR'...)
-        $this->depends = array();
-        // List of module class names as string to disable if this one is disabled. Example: array('modModuleToDisable1', ...)
-        $this->requiredby = array();
-        // List of module class names as string this module is in conflict with. Example: array('modModuleToDisable1', ...)
-        $this->conflictwith = array();
-        $this->langfiles = array("zapier");
-        // Minimum version of PHP required by module
-        //$this->phpmin = array(5, 5);
-        // Minimum version of Dolibarr required by module
-        $this->need_dolibarr_version = array(10, 0);
-        // Warning to show when we activate module. array('always'='text') or array('FR'='textfr','ES'='textes'...)
-        $this->warnings_activation = array();
-        // Warning to show when we activate an external module. array('always'='text') or array('FR'='textfr','ES'='textes'...)
-        $this->warnings_activation_ext = array();
-        // $this->automatic_activation = array(
-        //     'FR'=>'ZapierWasAutomaticallyActivatedBecauseOfYourCountryChoice',
-        // );
-        // If true, can't be disabled
-        // $this->always_enabled = true;
-        // Constants
-        // List of particular constants to add when module is enabled (key, 'chaine', value, desc, visible, 'current' or 'allentities', deleteonunactive)
-        // Example: $this->const=array(
-        //    1 => array('ZAPIERFORDOLIBARR_MYNEWCONST1', 'chaine', 'myvalue', 'This is a constant to add', 1),
-        //    2 => array('ZAPIERFORDOLIBARR_MYNEWCONST2', 'chaine', 'myvalue', 'This is another constant to add', 0, 'current', 1)
-        // );
-        $this->const = array(
-            // 1 => array('ZAPIERFORDOLIBARR_MYCONSTANT', 'chaine', 'avalue', 'This is a constant to add', 1, 'allentities', 1)
-        );
-        // Some keys to add into the overwriting translation tables
-        /*$this->overwrite_translation = array(
+		$this->db = $db;
+		// Id for module (must be unique).
+		// Use here a free id (See in Home -> System information -> Dolibarr for list of used modules id).
+		$this->numero = 50330;
+		// Key text used to identify module (for permissions, menus, etc...)
+		$this->rights_class = 'zapier';
+		// Family can be 'base' (core modules),'crm','financial','hr','projects','products','ecm','technic' (transverse modules),'interface' (link with external tools),'other','...'
+		// It is used to group modules by family in module setup page
+		$this->family = "interface";
+		// Module position in the family on 2 digits ('01', '10', '20', ...)
+		$this->module_position = '22';
+		// Gives the possibility for the module, to provide his own family info and position of this family (Overwrite $this->family and $this->module_position. Avoid this)
+		//$this->familyinfo = array('myownfamily' => array('position' => '01', 'label' => $langs->trans("MyOwnFamily")));
+		// Module label (no space allowed), used if translation string 'ModuleZapierName' not found (Zapier is name of module).
+		$this->name = preg_replace('/^mod/i', '', get_class($this));
+		// Module description, used if translation string 'ModuleZapierDesc' not found (Zapier is name of module).
+		$this->description = "ZapierDescription";
+		// Used only if file README.md and README-LL.md not found.
+		$this->descriptionlong = "Zapier description (Long)";
+		// Possible values for version are: 'development', 'experimental', 'dolibarr', 'dolibarr_deprecated' or a version string like 'x.y.z'
+		$this->version = 'development';
+		//Url to the file with your last numberversion of this module
+		//$this->url_last_version = 'http://www.example.com/versionmodule.txt';
+		// Key used in llx_const table to save module status enabled/disabled (where ZAPIERFORDOLIBARR is value of property name of module in uppercase)
+		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+		// Name of image file used for this module.
+		// If file is in theme/yourtheme/img directory under name object_pictovalue.png, use this->picto='pictovalue'
+		// If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module'
+		$this->picto = 'zapier';
+		// Define some features supported by module (triggers, login, substitutions, menus, css, etc...)
+		$this->module_parts = array(
+			// Set this to 1 if module has its own trigger directory (core/triggers)
+			'triggers' => 1,
+			// Set this to 1 if module has its own login method file (core/login)
+			'login' => 0,
+			// Set this to 1 if module has its own substitution function file (core/substitutions)
+			'substitutions' => 0,
+			// Set this to 1 if module has its own menus handler directory (core/menus)
+			'menus' => 0,
+			// Set this to 1 if module overwrite template dir (core/tpl)
+			'tpl' => 0,
+			// Set this to 1 if module has its own barcode directory (core/modules/barcode)
+			'barcode' => 0,
+			// Set this to 1 if module has its own models directory (core/modules/xxx)
+			'models' => 0,
+			// Set this to 1 if module has its own theme directory (theme)
+			'theme' => 0,
+			// Set this to relative path of css file if module has its own css file
+			'css' => array(
+				//    '/zapier/css/zapier.css.php',
+			),
+			// Set this to relative path of js file if module must load a js on all pages
+			'js' => array(
+				//   '/zapier/js/zapier.js.php',
+			),
+			// Set here all hooks context managed by module. To find available hook context, make a "grep -r '>initHooks(' *" on source code. You can also set hook context 'all'
+			'hooks' => array(
+				//   'data' => array(
+				//       'hookcontext1',
+				//       'hookcontext2',
+				//   ),
+				//   'entity' => '0',
+			),
+			// Set this to 1 if feature of module are opened to external users
+			'moduleforexternal' => 0,
+		);
+		// Data directories to create when module is enabled.
+		// Example: this->dirs = array("/zapier/temp","/zapier/subdir");
+		$this->dirs = array("/zapier/temp");
+		// Config pages. Put here list of php page, stored into zapier/admin directory, to use to setup module.
+		$this->config_page_url = array(
+		//    "setup.php@zapier"
+		);
+		// Dependencies
+		// A condition to hide module
+		$this->hidden = false;
+		// List of module class names as string that must be enabled if this module is enabled. Example: array('always1'=>'modModuleToEnable1','always2'=>'modModuleToEnable2', 'FR1'=>'modModuleToEnableFR'...)
+		$this->depends = array();
+		// List of module class names as string to disable if this one is disabled. Example: array('modModuleToDisable1', ...)
+		$this->requiredby = array();
+		// List of module class names as string this module is in conflict with. Example: array('modModuleToDisable1', ...)
+		$this->conflictwith = array();
+		$this->langfiles = array("zapier");
+		// Minimum version of PHP required by module
+		//$this->phpmin = array(5, 5);
+		// Minimum version of Dolibarr required by module
+		$this->need_dolibarr_version = array(10, 0);
+		// Warning to show when we activate module. array('always'='text') or array('FR'='textfr','ES'='textes'...)
+		$this->warnings_activation = array();
+		// Warning to show when we activate an external module. array('always'='text') or array('FR'='textfr','ES'='textes'...)
+		$this->warnings_activation_ext = array();
+		// $this->automatic_activation = array(
+		//     'FR'=>'ZapierWasAutomaticallyActivatedBecauseOfYourCountryChoice',
+		// );
+		// If true, can't be disabled
+		// $this->always_enabled = true;
+		// Constants
+		// List of particular constants to add when module is enabled (key, 'chaine', value, desc, visible, 'current' or 'allentities', deleteonunactive)
+		// Example: $this->const=array(
+		//    1 => array('ZAPIERFORDOLIBARR_MYNEWCONST1', 'chaine', 'myvalue', 'This is a constant to add', 1),
+		//    2 => array('ZAPIERFORDOLIBARR_MYNEWCONST2', 'chaine', 'myvalue', 'This is another constant to add', 0, 'current', 1)
+		// );
+		$this->const = array(
+			// 1 => array('ZAPIERFORDOLIBARR_MYCONSTANT', 'chaine', 'avalue', 'This is a constant to add', 1, 'allentities', 1)
+		);
+		// Some keys to add into the overwriting translation tables
+		/*$this->overwrite_translation = array(
             'en_US:ParentCompany'=>'Parent company or reseller',
             'fr_FR:ParentCompany'=>'Maison mère ou revendeur'
         )*/
-        if (!isset($conf->zapier) || !isset($conf->zapier->enabled)) {
-            $conf->zapier = new stdClass();
-            $conf->zapier->enabled = 0;
-        }
-        // Array to add new pages in new tabs
-        $this->tabs = array();
-        // Example:
-        // $this->tabs[] = array('data'=>'objecttype:+tabname1:Title1:mylangfile@zapier:$user->rights->zapier->read:/zapier/mynewtab1.php?id=__ID__');  					// To add a new tab identified by code tabname1
-        // $this->tabs[] = array('data'=>'objecttype:+tabname2:SUBSTITUTION_Title2:mylangfile@zapier:$user->rights->othermodule->read:/zapier/mynewtab2.php?id=__ID__',  	// To add another new tab identified by code tabname2. Label will be result of calling all substitution functions on 'Title2' key.
-        // $this->tabs[] = array('data'=>'objecttype:-tabname:NU:conditiontoremove');                                                     										// To remove an existing tab identified by code tabname
-        //
-        // Where objecttype can be
-        // 'categories_x'	  to add a tab in category view (replace 'x' by type of category (0=product, 1=supplier, 2=customer, 3=member)
-        // 'contact'          to add a tab in contact view
-        // 'contract'         to add a tab in contract view
-        // 'group'            to add a tab in group view
-        // 'intervention'     to add a tab in intervention view
-        // 'invoice'          to add a tab in customer invoice view
-        // 'invoice_supplier' to add a tab in supplier invoice view
-        // 'member'           to add a tab in fundation member view
-        // 'opensurveypoll'	  to add a tab in opensurvey poll view
-        // 'order'            to add a tab in customer order view
-        // 'order_supplier'   to add a tab in supplier order view
-        // 'payment'		  to add a tab in payment view
-        // 'payment_supplier' to add a tab in supplier payment view
-        // 'product'          to add a tab in product view
-        // 'propal'           to add a tab in propal view
-        // 'project'          to add a tab in project view
-        // 'stock'            to add a tab in stock view
-        // 'thirdparty'       to add a tab in third party view
-        // 'user'             to add a tab in user view
-        // Dictionaries
-        $this->dictionaries = array();
-        /* Example:
+		if (!isset($conf->zapier) || !isset($conf->zapier->enabled)) {
+			$conf->zapier = new stdClass();
+			$conf->zapier->enabled = 0;
+		}
+		// Array to add new pages in new tabs
+		$this->tabs = array();
+		// Example:
+		// $this->tabs[] = array('data'=>'objecttype:+tabname1:Title1:mylangfile@zapier:$user->rights->zapier->read:/zapier/mynewtab1.php?id=__ID__');  					// To add a new tab identified by code tabname1
+		// $this->tabs[] = array('data'=>'objecttype:+tabname2:SUBSTITUTION_Title2:mylangfile@zapier:$user->rights->othermodule->read:/zapier/mynewtab2.php?id=__ID__',  	// To add another new tab identified by code tabname2. Label will be result of calling all substitution functions on 'Title2' key.
+		// $this->tabs[] = array('data'=>'objecttype:-tabname:NU:conditiontoremove');                                                     										// To remove an existing tab identified by code tabname
+		//
+		// Where objecttype can be
+		// 'categories_x'	  to add a tab in category view (replace 'x' by type of category (0=product, 1=supplier, 2=customer, 3=member)
+		// 'contact'          to add a tab in contact view
+		// 'contract'         to add a tab in contract view
+		// 'group'            to add a tab in group view
+		// 'intervention'     to add a tab in intervention view
+		// 'invoice'          to add a tab in customer invoice view
+		// 'invoice_supplier' to add a tab in supplier invoice view
+		// 'member'           to add a tab in fundation member view
+		// 'opensurveypoll'	  to add a tab in opensurvey poll view
+		// 'order'            to add a tab in customer order view
+		// 'order_supplier'   to add a tab in supplier order view
+		// 'payment'		  to add a tab in payment view
+		// 'payment_supplier' to add a tab in supplier payment view
+		// 'product'          to add a tab in product view
+		// 'propal'           to add a tab in propal view
+		// 'project'          to add a tab in project view
+		// 'stock'            to add a tab in stock view
+		// 'thirdparty'       to add a tab in third party view
+		// 'user'             to add a tab in user view
+		// Dictionaries
+		$this->dictionaries = array();
+		/* Example:
         $this->dictionaries=array(
             'langs'=>'mylangfile@zapier',
             // List of tables we want to see into dictonnary editor
@@ -205,88 +205,88 @@ class modZapier extends DolibarrModules
             'tabcond'=>array($conf->zapier->enabled,$conf->zapier->enabled,$conf->zapier->enabled)
         );
         */
-        // Boxes/Widgets
-        // Add here list of php file(s) stored in zapier/core/boxes that contains class to show a widget.
-        $this->boxes = array(
-            //  0 => array(
-            //      'file' => 'zapierwidget1.php@zapier',
-            //      'note' => 'Widget provided by Zapier',
-            //      'enabledbydefaulton' => 'Home',
-            //  ),
-            //1=>array('file'=>'zapierwidget2.php@zapier','note'=>'Widget provided by Zapier'),
-            //2=>array('file'=>'zapierwidget3.php@zapier','note'=>'Widget provided by Zapier')
-        );
-        // Cronjobs (List of cron jobs entries to add when module is enabled)
-        // unit_frequency must be 60 for minute, 3600 for hour, 86400 for day, 604800 for week
-        $this->cronjobs = array(
-            //  0 => array(
-            //      'label' => 'MyJob label',
-            //      'jobtype' => 'method',
-            //      'class' => '/zapier/class/myobject.class.php',
-            //      'objectname' => 'MyObject',
-            //      'method' => 'doScheduledJob',
-            //      'parameters' => '',
-            //      'comment' => 'Comment',
-            //      'frequency' => 2,
-            //      'unitfrequency' => 3600,
-            //      'status' => 0,
-            //      'test' => '$conf->zapier->enabled',
-            //      'priority' => 50,
-            //  ),
-        );
-        // Example: $this->cronjobs=array(
-        //    0=>array('label'=>'My label', 'jobtype'=>'method', 'class'=>'/dir/class/file.class.php', 'objectname'=>'MyClass', 'method'=>'myMethod', 'parameters'=>'param1, param2', 'comment'=>'Comment', 'frequency'=>2, 'unitfrequency'=>3600, 'status'=>0, 'test'=>'$conf->zapier->enabled', 'priority'=>50),
-        //    1=>array('label'=>'My label', 'jobtype'=>'command', 'command'=>'', 'parameters'=>'param1, param2', 'comment'=>'Comment', 'frequency'=>1, 'unitfrequency'=>3600*24, 'status'=>0, 'test'=>'$conf->zapier->enabled', 'priority'=>50)
-        // );
-        // Permissions
-        // Permission array used by this module
-        $this->rights = array();
+		// Boxes/Widgets
+		// Add here list of php file(s) stored in zapier/core/boxes that contains class to show a widget.
+		$this->boxes = array(
+			//  0 => array(
+			//      'file' => 'zapierwidget1.php@zapier',
+			//      'note' => 'Widget provided by Zapier',
+			//      'enabledbydefaulton' => 'Home',
+			//  ),
+			//1=>array('file'=>'zapierwidget2.php@zapier','note'=>'Widget provided by Zapier'),
+			//2=>array('file'=>'zapierwidget3.php@zapier','note'=>'Widget provided by Zapier')
+		);
+		// Cronjobs (List of cron jobs entries to add when module is enabled)
+		// unit_frequency must be 60 for minute, 3600 for hour, 86400 for day, 604800 for week
+		$this->cronjobs = array(
+			//  0 => array(
+			//      'label' => 'MyJob label',
+			//      'jobtype' => 'method',
+			//      'class' => '/zapier/class/myobject.class.php',
+			//      'objectname' => 'MyObject',
+			//      'method' => 'doScheduledJob',
+			//      'parameters' => '',
+			//      'comment' => 'Comment',
+			//      'frequency' => 2,
+			//      'unitfrequency' => 3600,
+			//      'status' => 0,
+			//      'test' => '$conf->zapier->enabled',
+			//      'priority' => 50,
+			//  ),
+		);
+		// Example: $this->cronjobs=array(
+		//    0=>array('label'=>'My label', 'jobtype'=>'method', 'class'=>'/dir/class/file.class.php', 'objectname'=>'MyClass', 'method'=>'myMethod', 'parameters'=>'param1, param2', 'comment'=>'Comment', 'frequency'=>2, 'unitfrequency'=>3600, 'status'=>0, 'test'=>'$conf->zapier->enabled', 'priority'=>50),
+		//    1=>array('label'=>'My label', 'jobtype'=>'command', 'command'=>'', 'parameters'=>'param1, param2', 'comment'=>'Comment', 'frequency'=>1, 'unitfrequency'=>3600*24, 'status'=>0, 'test'=>'$conf->zapier->enabled', 'priority'=>50)
+		// );
+		// Permissions
+		// Permission array used by this module
+		$this->rights = array();
 
-        $r = 0;
-        // Permission id (must not be already used)
-        $this->rights[$r][0] = $this->numero + $r;
-        // Permission label
-        $this->rights[$r][1] = 'Read myobject of Zapier';
-        // Permission by default for new user (0/1)
-        $this->rights[$r][3] = 1;
-        // In php code, permission will be checked by test if ($user->rights->zapier->level1->level2)
-        $this->rights[$r][4] = 'read';
-        // In php code, permission will be checked by test if ($user->rights->zapier->level1->level2)
-        $this->rights[$r][5] = '';
-        $r++;
-        $this->rights[$r][0] = $this->numero + $r;
-        $this->rights[$r][1] = 'Create/Update myobject of Zapier';
-        $this->rights[$r][3] = 1;
-        $this->rights[$r][4] = 'write';
-        $this->rights[$r][5] = '';
-        $r++;
-        $this->rights[$r][0] = $this->numero + $r;
-        $this->rights[$r][1] = 'Delete myobject of Zapier';
-        $this->rights[$r][3] = 1;
-        $this->rights[$r][4] = 'delete';
-        $this->rights[$r][5] = '';
+		$r = 0;
+		// Permission id (must not be already used)
+		$this->rights[$r][0] = $this->numero + $r;
+		// Permission label
+		$this->rights[$r][1] = 'Read myobject of Zapier';
+		// Permission by default for new user (0/1)
+		$this->rights[$r][3] = 1;
+		// In php code, permission will be checked by test if ($user->rights->zapier->level1->level2)
+		$this->rights[$r][4] = 'read';
+		// In php code, permission will be checked by test if ($user->rights->zapier->level1->level2)
+		$this->rights[$r][5] = '';
+		$r++;
+		$this->rights[$r][0] = $this->numero + $r;
+		$this->rights[$r][1] = 'Create/Update myobject of Zapier';
+		$this->rights[$r][3] = 1;
+		$this->rights[$r][4] = 'write';
+		$this->rights[$r][5] = '';
+		$r++;
+		$this->rights[$r][0] = $this->numero + $r;
+		$this->rights[$r][1] = 'Delete myobject of Zapier';
+		$this->rights[$r][3] = 1;
+		$this->rights[$r][4] = 'delete';
+		$this->rights[$r][5] = '';
 
-        // Main menu entries
-        $this->menu = array(); // List of menus to add
-        $r = 0;
+		// Main menu entries
+		$this->menu = array(); // List of menus to add
+		$r = 0;
 
-        // Add here entries to declare new menus
-        // $this->menu[$r++]=array(
-        //     'fk_menu' => '',                          // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-        //     'type' => 'top',                          // This is a Top menu entry
-        //     'titre' => 'Zapier',
-        //     'mainmenu' => 'zapier',
-        //     'leftmenu' => '',
-        //     'url' => '/zapier/zapierindex.php',
-        //     'langs' => 'zapier@zapier',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-        //     'position' => 1000+$r,
-        //     'enabled' => '$conf->zapier->enabled',  // Define condition to show or hide menu entry. Use '$conf->zapier->enabled' if entry must be visible if module is enabled.
-        //     'perms' => '1',			                // Use 'perms'=>'$user->rights->zapier->level1->level2' if you want your menu with a permission rules
-        //     'target' => '',
-        //     'user' => 2,				                // 0=Menu for internal users, 1=external users, 2=both
-        // );
+		// Add here entries to declare new menus
+		// $this->menu[$r++]=array(
+		//     'fk_menu' => '',                          // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+		//     'type' => 'top',                          // This is a Top menu entry
+		//     'titre' => 'Zapier',
+		//     'mainmenu' => 'zapier',
+		//     'leftmenu' => '',
+		//     'url' => '/zapier/zapierindex.php',
+		//     'langs' => 'zapier@zapier',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+		//     'position' => 1000+$r,
+		//     'enabled' => '$conf->zapier->enabled',  // Define condition to show or hide menu entry. Use '$conf->zapier->enabled' if entry must be visible if module is enabled.
+		//     'perms' => '1',			                // Use 'perms'=>'$user->rights->zapier->level1->level2' if you want your menu with a permission rules
+		//     'target' => '',
+		//     'user' => 2,				                // 0=Menu for internal users, 1=external users, 2=both
+		// );
 
-        /*
+		/*
         $this->menu[$r++]=array(
             'fk_menu'=>'fk_mainmenu=zapier',	    // '' if this is a top menu. For left menu, 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
@@ -316,44 +316,44 @@ class modZapier extends DolibarrModules
             'user'=>2,                              // 0=Menu for internal users, 1=external users, 2=both
         );
         */
-    }
+	}
 
-    /**
-     *  Function called when module is enabled.
-     *  The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
-     *  It also creates data directories
-     *
-     *  @param      string  $options    Options when enabling module ('', 'noboxes')
-     *  @return     int                 1 if OK, 0 if KO
-     */
-    public function init($options = '')
-    {
-        $result = $this->_load_tables('/zapier/sql/');
-        if ($result < 0) return -1; // Do not activate module if not allowed errors found on module SQL queries (the _load_table run sql with run_sql with error allowed parameter to 'default')
+	/**
+	 *  Function called when module is enabled.
+	 *  The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
+	 *  It also creates data directories
+	 *
+	 *  @param      string  $options    Options when enabling module ('', 'noboxes')
+	 *  @return     int                 1 if OK, 0 if KO
+	 */
+	public function init($options = '')
+	{
+		$result = $this->_load_tables('/zapier/sql/');
+		if ($result < 0) return -1; // Do not activate module if not allowed errors found on module SQL queries (the _load_table run sql with run_sql with error allowed parameter to 'default')
 
-        // Create extrafields
-        //include_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-        //$extrafields = new ExtraFields($this->db);
-        //$result1=$extrafields->addExtraField('myattr1', "New Attr 1 label", 'boolean', 1,  3, 'thirdparty',   0, 0, '', '', 1, '', 0, 0, '', '', 'zapier@zapier', '$conf->zapier->enabled');
-        //$result2=$extrafields->addExtraField('myattr2', "New Attr 2 label", 'varchar', 1, 10, 'project',      0, 0, '', '', 1, '', 0, 0, '', '', 'zapier@zapier', '$conf->zapier->enabled');
-        //$result3=$extrafields->addExtraField('myattr3', "New Attr 3 label", 'varchar', 1, 10, 'bank_account', 0, 0, '', '', 1, '', 0, 0, '', '', 'zapier@zapier', '$conf->zapier->enabled');
-        //$result4=$extrafields->addExtraField('myattr4', "New Attr 4 label", 'select',  1,  3, 'thirdparty',   0, 1, '', array('options'=>array('code1'=>'Val1','code2'=>'Val2','code3'=>'Val3')), 1,'', 0, 0, '', '', 'zapier@zapier', '$conf->zapier->enabled');
-        //$result5=$extrafields->addExtraField('myattr5', "New Attr 5 label", 'text',    1, 10, 'user',         0, 0, '', '', 1, '', 0, 0, '', '', 'zapier@zapier', '$conf->zapier->enabled');
-        $sql = array();
-        return $this->_init($sql, $options);
-    }
+		// Create extrafields
+		//include_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+		//$extrafields = new ExtraFields($this->db);
+		//$result1=$extrafields->addExtraField('myattr1', "New Attr 1 label", 'boolean', 1,  3, 'thirdparty',   0, 0, '', '', 1, '', 0, 0, '', '', 'zapier@zapier', '$conf->zapier->enabled');
+		//$result2=$extrafields->addExtraField('myattr2', "New Attr 2 label", 'varchar', 1, 10, 'project',      0, 0, '', '', 1, '', 0, 0, '', '', 'zapier@zapier', '$conf->zapier->enabled');
+		//$result3=$extrafields->addExtraField('myattr3', "New Attr 3 label", 'varchar', 1, 10, 'bank_account', 0, 0, '', '', 1, '', 0, 0, '', '', 'zapier@zapier', '$conf->zapier->enabled');
+		//$result4=$extrafields->addExtraField('myattr4', "New Attr 4 label", 'select',  1,  3, 'thirdparty',   0, 1, '', array('options'=>array('code1'=>'Val1','code2'=>'Val2','code3'=>'Val3')), 1,'', 0, 0, '', '', 'zapier@zapier', '$conf->zapier->enabled');
+		//$result5=$extrafields->addExtraField('myattr5', "New Attr 5 label", 'text',    1, 10, 'user',         0, 0, '', '', 1, '', 0, 0, '', '', 'zapier@zapier', '$conf->zapier->enabled');
+		$sql = array();
+		return $this->_init($sql, $options);
+	}
 
-    /**
-     *  Function called when module is disabled.
-     *  Remove from database constants, boxes and permissions from Dolibarr database.
-     *  Data directories are not deleted
-     *
-     *  @param      string	$options    Options when enabling module ('', 'noboxes')
-     *  @return     int                 1 if OK, 0 if KO
-     */
-    public function remove($options = '')
-    {
-        $sql = array();
-        return $this->_remove($sql, $options);
-    }
+	/**
+	 *  Function called when module is disabled.
+	 *  Remove from database constants, boxes and permissions from Dolibarr database.
+	 *  Data directories are not deleted
+	 *
+	 *  @param      string	$options    Options when enabling module ('', 'noboxes')
+	 *  @return     int                 1 if OK, 0 if KO
+	 */
+	public function remove($options = '')
+	{
+		$sql = array();
+		return $this->_remove($sql, $options);
+	}
 }
diff --git a/htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php b/htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php
index e41b4b35adc..84f225dfb6e 100644
--- a/htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php
+++ b/htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php
@@ -47,14 +47,14 @@ class doc_generic_mo_odt extends ModelePDFMo
 	public $emetteur;
 
 	/**
-     * @var array Minimum version of PHP required by module.
-     * e.g.: PHP ≥ 5.6 = array(5, 6)
-     */
+	 * @var array Minimum version of PHP required by module.
+	 * e.g.: PHP ≥ 5.6 = array(5, 6)
+	 */
 	public $phpmin = array(5, 6);
 
 	/**
-     * @var string Dolibarr version of the loaded document
-     */
+	 * @var string Dolibarr version of the loaded document
+	 */
 	public $version = 'dolibarr';
 
 
@@ -63,12 +63,12 @@ class doc_generic_mo_odt extends ModelePDFMo
 	 *
 	 *  @param		DoliDB		$db      Database handler
 	 */
-    public function __construct($db)
+	public function __construct($db)
 	{
 		global $conf, $langs, $mysoc;
 
 		// Load translation files required by the page
-        $langs->loadLangs(array("main", "companies"));
+		$langs->loadLangs(array("main", "companies"));
 
 		$this->db = $db;
 		$this->name = "ODT templates";
@@ -108,12 +108,12 @@ class doc_generic_mo_odt extends ModelePDFMo
 	 *	@param	Translate	$langs      Lang object to use for output
 	 *	@return string       			Description
 	 */
-    public function info($langs)
+	public function info($langs)
 	{
 		global $conf, $langs;
 
 		// Load translation files required by the page
-        $langs->loadLangs(array("errors", "companies"));
+		$langs->loadLangs(array("errors", "companies"));
 
 		$form = new Form($this->db);
 
@@ -172,7 +172,7 @@ class doc_generic_mo_odt extends ModelePDFMo
    			$texte .= '<div id="div_'.get_class($this).'" class="hidden">';
    			foreach ($listoffiles as $file)
    			{
-                $texte .= $file['name'].'<br>';
+				$texte .= $file['name'].'<br>';
    			}
    			$texte .= '</div>';
 		}
@@ -190,7 +190,7 @@ class doc_generic_mo_odt extends ModelePDFMo
 		return $texte;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Function to build a document on disk using the generic odt module.
 	 *
@@ -202,9 +202,9 @@ class doc_generic_mo_odt extends ModelePDFMo
 	 *  @param		int			$hideref			Do not show ref
 	 *	@return		int         					1 if OK, <=0 if KO
 	 */
-    public function write_file($object, $outputlangs, $srctemplatepath, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
+	public function write_file($object, $outputlangs, $srctemplatepath, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $user, $langs, $conf, $mysoc, $hookmanager;
 
 		if (empty($srctemplatepath))
@@ -243,6 +243,8 @@ class doc_generic_mo_odt extends ModelePDFMo
 				}
 			}
 
+			$object->fetch_thirdparty();
+
 			$dir = $conf->mrp->multidir_output[isset($object->entity) ? $object->entity : 1];
 			$objectref = dol_sanitizeFileName($object->ref);
 			if (!preg_match('/specimen/i', $objectref)) $dir .= "/".$objectref;
@@ -270,8 +272,8 @@ class doc_generic_mo_odt extends ModelePDFMo
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
 				if (!empty($conf->global->MAIN_DOC_USE_TIMING))
 				{
-				    $format = $conf->global->MAIN_DOC_USE_TIMING;
-				    if ($format == '1') $format = '%Y%m%d%H%M%S';
+					$format = $conf->global->MAIN_DOC_USE_TIMING;
+					if ($format == '1') $format = '%Y%m%d%H%M%S';
 					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
 				} else {
 					$filename = $newfiletmp.'.'.$newfileformat;
@@ -301,10 +303,10 @@ class doc_generic_mo_odt extends ModelePDFMo
 					// On peut utiliser le nom de la societe du contact
 					if (!empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socobject = $object->contact;
 					else {
-                        $socobject = $object->thirdparty;
-               			// if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
-            			$contactobject = $object->contact;
-                    }
+						$socobject = $object->thirdparty;
+			   			// if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
+						$contactobject = $object->contact;
+					}
 				} else {
 					$socobject = $object->thirdparty;
 				}
@@ -329,7 +331,7 @@ class doc_generic_mo_odt extends ModelePDFMo
 				// Open and load template
 				require_once ODTPHP_PATH.'odf.php';
 				try {
-                    $odfHandler = new odf(
+					$odfHandler = new odf(
 						$srctemplatepath,
 						array(
 						'PATH_TO_TMP'	  => $conf->mrp->dir_temp,
@@ -356,7 +358,7 @@ class doc_generic_mo_odt extends ModelePDFMo
 					$odfHandler->setVars('free_text', $newfreetext, true, 'UTF-8');
 				} catch (OdfException $e)
 				{
-                    dol_syslog($e->getMessage(), LOG_INFO);
+					dol_syslog($e->getMessage(), LOG_INFO);
 				}
 
 				// Define substitution array
@@ -391,7 +393,7 @@ class doc_generic_mo_odt extends ModelePDFMo
 						}
 					} catch (OdfException $e)
 					{
-                        dol_syslog($e->getMessage(), LOG_INFO);
+						dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
 				// Replace tags of lines
@@ -422,10 +424,10 @@ class doc_generic_mo_odt extends ModelePDFMo
 									$listlines->setVars($key, $val, true, 'UTF-8');
 								} catch (OdfException $e)
 								{
-                                    dol_syslog($e->getMessage(), LOG_INFO);
+									dol_syslog($e->getMessage(), LOG_INFO);
 								} catch (SegmentException $e)
 								{
-                                    dol_syslog($e->getMessage(), LOG_INFO);
+									dol_syslog($e->getMessage(), LOG_INFO);
 								}
 							}
 							$listlines->merge();
@@ -447,7 +449,7 @@ class doc_generic_mo_odt extends ModelePDFMo
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
 					} catch (OdfException $e)
 					{
-                        dol_syslog($e->getMessage(), LOG_INFO);
+						dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
 
@@ -461,16 +463,16 @@ class doc_generic_mo_odt extends ModelePDFMo
 					try {
 						$odfHandler->exportAsAttachedPDF($file);
 					} catch (Exception $e) {
-                        $this->error = $e->getMessage();
-                        dol_syslog($e->getMessage(), LOG_INFO);
+						$this->error = $e->getMessage();
+						dol_syslog($e->getMessage(), LOG_INFO);
 						return -1;
 					}
 				} else {
 					try {
 						$odfHandler->saveToDisk($file);
 					} catch (Exception $e) {
-                        $this->error = $e->getMessage();
-                        dol_syslog($e->getMessage(), LOG_INFO);
+						$this->error = $e->getMessage();
+						dol_syslog($e->getMessage(), LOG_INFO);
 						return -1;
 					}
 				}
diff --git a/htdocs/core/modules/mrp/mod_mo_advanced.php b/htdocs/core/modules/mrp/mod_mo_advanced.php
index 6f8dfe92073..610346c67e2 100644
--- a/htdocs/core/modules/mrp/mod_mo_advanced.php
+++ b/htdocs/core/modules/mrp/mod_mo_advanced.php
@@ -36,9 +36,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/mrp/modules_mo.php';
 class mod_mo_advanced extends ModeleNumRefMos
 {
 	/**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
 	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 
 	/**
@@ -52,14 +52,14 @@ class mod_mo_advanced extends ModeleNumRefMos
 	public $name = 'advanced';
 
 
-    /**
-     *  Returns the description of the numbering model
-     *
-     *  @return     string      Texte descripif
-     */
-    public function info()
-    {
-    	global $conf, $langs, $db;
+	/**
+	 *  Returns the description of the numbering model
+	 *
+	 *  @return     string      Texte descripif
+	 */
+	public function info()
+	{
+		global $conf, $langs, $db;
 
 		$langs->load("bills");
 
@@ -90,22 +90,22 @@ class mod_mo_advanced extends ModeleNumRefMos
 		$texte .= '</form>';
 
 		return $texte;
-    }
+	}
 
-    /**
-     *  Return an example of numbering
-     *
-     *  @return     string      Example
-     */
-    public function getExample()
-    {
-     	global $conf, $langs, $mysoc;
+	/**
+	 *  Return an example of numbering
+	 *
+	 *  @return     string      Example
+	 */
+	public function getExample()
+	{
+	 	global $conf, $langs, $mysoc;
 
-    	$old_code_client = $mysoc->code_client;
-    	$old_code_type = $mysoc->typent_code;
-    	$mysoc->code_client = 'CCCCCCCCCC';
-    	$mysoc->typent_code = 'TTTTTTTTTT';
-     	$numExample = $this->getNextValue($mysoc, '');
+		$old_code_client = $mysoc->code_client;
+		$old_code_type = $mysoc->typent_code;
+		$mysoc->code_client = 'CCCCCCCCCC';
+		$mysoc->typent_code = 'TTTTTTTTTT';
+	 	$numExample = $this->getNextValue($mysoc, '');
 		$mysoc->code_client = $old_code_client;
 		$mysoc->typent_code = $old_code_type;
 
@@ -114,7 +114,7 @@ class mod_mo_advanced extends ModeleNumRefMos
 			$numExample = $langs->trans('NotConfigured');
 		}
 		return $numExample;
-    }
+	}
 
 	/**
 	 * 	Return next free value
@@ -123,8 +123,8 @@ class mod_mo_advanced extends ModeleNumRefMos
 	 *  @param  Object		$object		Object we need next value for
 	 *  @return string      			Value if KO, <0 if KO
 	 */
-    public function getNextValue($objprod, $object)
-    {
+	public function getNextValue($objprod, $object)
+	{
 		global $db, $conf;
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
diff --git a/htdocs/core/modules/oauth/github_oauthcallback.php b/htdocs/core/modules/oauth/github_oauthcallback.php
index d8984033a19..c92cab93aa1 100644
--- a/htdocs/core/modules/oauth/github_oauthcallback.php
+++ b/htdocs/core/modules/oauth/github_oauthcallback.php
@@ -65,17 +65,17 @@ $storage = new DoliStorage($db, $conf);
 
 // Setup the credentials for the requests
 $credentials = new Credentials(
-    $conf->global->OAUTH_GITHUB_ID,
-    $conf->global->OAUTH_GITHUB_SECRET,
-    $currentUri->getAbsoluteUri()
+	$conf->global->OAUTH_GITHUB_ID,
+	$conf->global->OAUTH_GITHUB_SECRET,
+	$currentUri->getAbsoluteUri()
 );
 
 $requestedpermissionsarray = array();
 if (GETPOST('state')) $requestedpermissionsarray = explode(',', GETPOST('state')); // Example: 'user'. 'state' parameter is standard to retrieve some parameters back
 if ($action != 'delete' && empty($requestedpermissionsarray))
 {
-    print 'Error, parameter state is not defined';
-    exit;
+	print 'Error, parameter state is not defined';
+	exit;
 }
 //var_dump($requestedpermissionsarray);exit;
 
@@ -94,12 +94,12 @@ $langs->load("oauth");
 
 if ($action == 'delete')
 {
-    $storage->clearToken('GitHub');
+	$storage->clearToken('GitHub');
 
-    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
@@ -108,55 +108,55 @@ 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');
 
-    //print dol_get_fiche_head();
-    // retrieve the CSRF state parameter
-    $state = isset($_GET['state']) ? $_GET['state'] : null;
-    //print '<table>';
+	//print dol_get_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
-    }
+	// 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
+	}
 
-    // 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/oauth/google_oauthcallback.php b/htdocs/core/modules/oauth/google_oauthcallback.php
index a9da05da636..0b76a8151cf 100644
--- a/htdocs/core/modules/oauth/google_oauthcallback.php
+++ b/htdocs/core/modules/oauth/google_oauthcallback.php
@@ -65,17 +65,17 @@ $storage = new DoliStorage($db, $conf);
 
 // Setup the credentials for the requests
 $credentials = new Credentials(
-    $conf->global->OAUTH_GOOGLE_ID,
-    $conf->global->OAUTH_GOOGLE_SECRET,
-    $currentUri->getAbsoluteUri()
+	$conf->global->OAUTH_GOOGLE_ID,
+	$conf->global->OAUTH_GOOGLE_SECRET,
+	$currentUri->getAbsoluteUri()
 );
 
 $requestedpermissionsarray = array();
 if (GETPOST('state')) $requestedpermissionsarray = explode(',', GETPOST('state')); // Example: 'userinfo_email,userinfo_profile,cloud_print'. 'state' parameter is standard to store a hash value and can be used to retrieve some parameters back
 if ($action != 'delete' && empty($requestedpermissionsarray))
 {
-    print 'Error, parameter state is not defined';
-    exit;
+	print 'Error, parameter state is not defined';
+	exit;
 }
 //var_dump($requestedpermissionsarray);exit;
 
@@ -100,12 +100,12 @@ $langs->load("oauth");
 
 if ($action == 'delete')
 {
-    $storage->clearToken('Google');
+	$storage->clearToken('Google');
 
-    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,48 +113,48 @@ if (!empty($_GET['code']))     // We are coming from oauth provider page
 	dol_syslog("We are coming from the oauth provider page");
 	//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');
 
-    //print dol_get_fiche_head();
-    // retrieve the CSRF state parameter
-    $state = isset($_GET['state']) ? $_GET['state'] : null;
-    //print '<table>';
+	//print dol_get_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\Google
+	// This was a callback request from service, get the token
+	try {
+		//var_dump($_GET['code']);
+		//var_dump($state);
+		//var_dump($apiService);      // OAuth\OAuth2\Service\Google
 
-        $token = $apiService->requestAccessToken($_GET['code'], $state);
+		$token = $apiService->requestAccessToken($_GET['code'], $state);
 
-        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
-    }
+	// 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
+	}
 
-    // 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/oauth/stripelive_oauthcallback.php b/htdocs/core/modules/oauth/stripelive_oauthcallback.php
index 9d1e1e63a0d..ef0496a8541 100644
--- a/htdocs/core/modules/oauth/stripelive_oauthcallback.php
+++ b/htdocs/core/modules/oauth/stripelive_oauthcallback.php
@@ -65,9 +65,9 @@ $storage = new DoliStorage($db, $conf);
 
 // Setup the credentials for the requests
 $credentials = new Credentials(
-    $conf->global->OAUTH_STRIPE_LIVE_ID,
+	$conf->global->OAUTH_STRIPE_LIVE_ID,
 	$conf->global->STRIPE_LIVE_SECRET_KEY,
-    $currentUri->getAbsoluteUri()
+	$currentUri->getAbsoluteUri()
 );
 
 $requestedpermissionsarray = array();
@@ -98,12 +98,12 @@ $langs->load("oauth");
 
 if ($action == 'delete')
 {
-    $storage->clearToken('StripeLive');
+	$storage->clearToken('StripeLive');
 
-    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
@@ -112,57 +112,57 @@ 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');
 
-    //print dol_get_fiche_head();
-    // retrieve the CSRF state parameter
-    $state = isset($_GET['state']) ? $_GET['state'] : null;
-    //print '<table>';
+	//print dol_get_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_LIVE_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_LIVE_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/payment/mod_payment_ant.php b/htdocs/core/modules/payment/mod_payment_ant.php
index 56cebfddc8b..b5452f994ee 100644
--- a/htdocs/core/modules/payment/mod_payment_ant.php
+++ b/htdocs/core/modules/payment/mod_payment_ant.php
@@ -31,9 +31,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/payment/modules_payment.php';
 class mod_payment_ant extends ModeleNumRefPayments
 {
 	/**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
 	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 
 	/**
@@ -54,14 +54,14 @@ class mod_payment_ant extends ModeleNumRefPayments
 	public $name = 'Ant';
 
 
-    /**
-     *  Returns the description of the numbering model
-     *
-     *  @return     string      Texte descripif
-     */
-    public function info()
-    {
-    	global $db, $conf, $langs;
+	/**
+	 *  Returns the description of the numbering model
+	 *
+	 *  @return     string      Texte descripif
+	 */
+	public function info()
+	{
+		global $db, $conf, $langs;
 
 		$langs->load("bills");
 
@@ -92,20 +92,20 @@ class mod_payment_ant extends ModeleNumRefPayments
 		$texte .= '</form>';
 
 		return $texte;
-    }
+	}
 
-    /**
-     *  Return an example of numbering
-     *
-     *  @return     string      Example
-     */
-    public function getExample()
-    {
-     	global $conf, $langs, $mysoc;
+	/**
+	 *  Return an example of numbering
+	 *
+	 *  @return     string      Example
+	 */
+	public function getExample()
+	{
+	 	global $conf, $langs, $mysoc;
 
-    	$old_code_client = $mysoc->code_client;
-    	$mysoc->code_client = 'CCCCCCCCCC';
-     	$numExample = $this->getNextValue($mysoc, '');
+		$old_code_client = $mysoc->code_client;
+		$mysoc->code_client = 'CCCCCCCCCC';
+	 	$numExample = $this->getNextValue($mysoc, '');
 		$mysoc->code_client = $old_code_client;
 
 		if (!$numExample)
@@ -113,7 +113,7 @@ class mod_payment_ant extends ModeleNumRefPayments
 			$numExample = $langs->trans('NotConfigured');
 		}
 		return $numExample;
-    }
+	}
 
 	/**
 	 * 	Return next free value
@@ -122,8 +122,8 @@ class mod_payment_ant extends ModeleNumRefPayments
 	 *  @param  Object		$object		Object we need next value for
 	 *  @return string      			Value if KO, <0 if KO
 	 */
-    public function getNextValue($objsoc, $object)
-    {
+	public function getNextValue($objsoc, $object)
+	{
 		global $db, $conf;
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
@@ -143,17 +143,17 @@ class mod_payment_ant extends ModeleNumRefPayments
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return next free value
 	 *
 	 *  @param	Societe		$objsoc     Object third party
 	 * 	@param	string		$objforref	Object for number to search
 	 *  @return string      			Next free value
-     */
-    public function commande_get_num($objsoc, $objforref)
-    {
-        // phpcs:enable
-        return $this->getNextValue($objsoc, $objforref);
-    }
+	 */
+	public function commande_get_num($objsoc, $objforref)
+	{
+		// phpcs:enable
+		return $this->getNextValue($objsoc, $objforref);
+	}
 }
diff --git a/htdocs/core/modules/printing/modules_printing.php b/htdocs/core/modules/printing/modules_printing.php
index a368a7265df..006156d37bf 100644
--- a/htdocs/core/modules/printing/modules_printing.php
+++ b/htdocs/core/modules/printing/modules_printing.php
@@ -31,40 +31,40 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
  */
 class PrintingDriver
 {
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    /**
+	/**
 	 * @var string Error code (or message)
 	 */
 	public $error = '';
 
 
-    /**
-     *  Constructor
-     *
-     *  @param      DoliDB      $db      Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-    }
+	/**
+	 *  Constructor
+	 *
+	 *  @param      DoliDB      $db      Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
 
-    /**
-     *  Return list of printing driver
-     *
-     *  @param  DoliDB  $db                 Database handler
-     *  @param  integer  $maxfilenamelength  Max length of value to show
-     *  @return array                       List of drivers
-    */
-    public static function listDrivers($db, $maxfilenamelength = 0)
-    {
-        global $conf;
+	/**
+	 *  Return list of printing driver
+	 *
+	 *  @param  DoliDB  $db                 Database handler
+	 *  @param  integer  $maxfilenamelength  Max length of value to show
+	 *  @return array                       List of drivers
+	 */
+	public static function listDrivers($db, $maxfilenamelength = 0)
+	{
+		global $conf;
 
-        $type = 'printing';
-        $list = array();
+		$type = 'printing';
+		$list = array();
 
 		$listoffiles = array();
 		$dirmodels = array_merge(array('/core/modules/printing/'), (array) $conf->modules_parts['printing']);
@@ -75,22 +75,22 @@ class PrintingDriver
 			}
 		}
 		foreach ($listoffiles as $record) {
-            $list[$record['fullname']] = str_replace('.modules.php', '', $record['name']);
+			$list[$record['fullname']] = str_replace('.modules.php', '', $record['name']);
 		}
-        return $list;
-    }
+		return $list;
+	}
 
-    /**
-     *  Return description of Printing Module
-     *
-     *  @return     string      Return translation of key PrintingModuleDescXXX where XXX is module name, or $this->desc if not exists
-     */
-    public function getDesc()
-    {
-        global $langs;
-        $langs->load("printing");
-        $transstring = "PrintingModuleDesc".$this->name;
-        if ($langs->trans($transstring) != $transstring) return $langs->trans($transstring);
-        else return $this->desc;
-    }
+	/**
+	 *  Return description of Printing Module
+	 *
+	 *  @return     string      Return translation of key PrintingModuleDescXXX where XXX is module name, or $this->desc if not exists
+	 */
+	public function getDesc()
+	{
+		global $langs;
+		$langs->load("printing");
+		$transstring = "PrintingModuleDesc".$this->name;
+		if ($langs->trans($transstring) != $transstring) return $langs->trans($transstring);
+		else return $this->desc;
+	}
 }
diff --git a/htdocs/core/modules/printing/printgcp.modules.php b/htdocs/core/modules/printing/printgcp.modules.php
index 096c633036a..9560af284b7 100644
--- a/htdocs/core/modules/printing/printgcp.modules.php
+++ b/htdocs/core/modules/printing/printgcp.modules.php
@@ -35,14 +35,14 @@ use OAuth\OAuth2\Service\Google;
  */
 class printing_printgcp extends PrintingDriver
 {
-    /**
-     * @var string module name
-     */
+	/**
+	 * @var string module name
+	 */
 	public $name = 'printgcp';
 
-    /**
-     * @var string module description
-     */
+	/**
+	 * @var string module description
+	 */
 	public $desc = 'PrintGCPDesc';
 
 	/**
@@ -50,24 +50,24 @@ class printing_printgcp extends PrintingDriver
 	 */
 	public $picto = 'printer';
 
-    /**
-     * @var string module description
-     */
+	/**
+	 * @var string module description
+	 */
 	public $active = 'PRINTING_PRINTGCP';
 
-    /**
-     * @var array module parameters
-     */
+	/**
+	 * @var array module parameters
+	 */
 	public $conf = array();
 
-    /**
-     * @var string google id
-     */
+	/**
+	 * @var string google id
+	 */
 	public $google_id = '';
 
-    /**
-     * @var string google secret
-     */
+	/**
+	 * @var string google secret
+	 */
 	public $google_secret = '';
 
 	/**
diff --git a/htdocs/core/modules/printing/printipp.modules.php b/htdocs/core/modules/printing/printipp.modules.php
index 873382ceae2..0a9cb1210ee 100644
--- a/htdocs/core/modules/printing/printipp.modules.php
+++ b/htdocs/core/modules/printing/printipp.modules.php
@@ -30,321 +30,321 @@ include_once DOL_DOCUMENT_ROOT.'/core/modules/printing/modules_printing.php';
  */
 class printing_printipp extends PrintingDriver
 {
-    /**
-     * @var string module name
-     */
-    public $name = 'printipp';
+	/**
+	 * @var string module name
+	 */
+	public $name = 'printipp';
 
-    /**
-     * @var string module description
-     */
-    public $desc = 'PrintIPPDesc';
+	/**
+	 * @var string module description
+	 */
+	public $desc = 'PrintIPPDesc';
 
-    /**
-     * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
-     */
-    public $picto = 'printer';
+	/**
+	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+	 */
+	public $picto = 'printer';
 
-    /**
-     * @var string Constant name
-     */
-    public $active = 'PRINTING_PRINTIPP';
+	/**
+	 * @var string Constant name
+	 */
+	public $active = 'PRINTING_PRINTIPP';
 
-    /**
-     * @var array array of setup value
-     */
-    public $conf = array();
+	/**
+	 * @var array array of setup value
+	 */
+	public $conf = array();
 
-    /**
-     * @var string host
-     */
-    public $host;
+	/**
+	 * @var string host
+	 */
+	public $host;
 
-    /**
-     * @var string port
-     */
-    public $port;
+	/**
+	 * @var string port
+	 */
+	public $port;
 
-    /**
-     * @var string username
-     */
-    public $userid;
+	/**
+	 * @var string username
+	 */
+	public $userid;
 
-    /**
-     * @var string login for printer host
-     */
-    public $user;
+	/**
+	 * @var string login for printer host
+	 */
+	public $user;
 
-    /**
-     * @var string password for printer host
-     */
-    public $password;
+	/**
+	 * @var string password for printer host
+	 */
+	public $password;
 
-    /**
-     * @var string Error code (or message)
-     */
-    public $error = '';
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error = '';
 
-    /**
-     * @var string[] Error codes (or messages)
-     */
-    public $errors = array();
+	/**
+	 * @var string[] Error codes (or messages)
+	 */
+	public $errors = array();
 
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    const LANGFILE = 'printipp';
+	const LANGFILE = 'printipp';
 
 
-    /**
-     *  Constructor
-     *
-     *  @param      DoliDB      $db      Database handler
-     */
-    public function __construct($db)
-    {
-        global $conf;
+	/**
+	 *  Constructor
+	 *
+	 *  @param      DoliDB      $db      Database handler
+	 */
+	public function __construct($db)
+	{
+		global $conf;
 
-        $this->db = $db;
-        $this->host = $conf->global->PRINTIPP_HOST;
-        $this->port = $conf->global->PRINTIPP_PORT;
-        $this->user = $conf->global->PRINTIPP_USER;
-        $this->password = $conf->global->PRINTIPP_PASSWORD;
-        $this->conf[] = array('varname'=>'PRINTIPP_HOST', 'required'=>1, 'example'=>'localhost', 'type'=>'text');
-        $this->conf[] = array('varname'=>'PRINTIPP_PORT', 'required'=>1, 'example'=>'631', 'type'=>'text');
-        $this->conf[] = array('varname'=>'PRINTIPP_USER', 'required'=>0, 'example'=>'', 'type'=>'text', 'moreattributes'=>'autocomplete="off"');
-        $this->conf[] = array('varname'=>'PRINTIPP_PASSWORD', 'required'=>0, 'example'=>'', 'type'=>'password', 'moreattributes'=>'autocomplete="off"');
-        $this->conf[] = array('enabled'=>1, 'type'=>'submit');
-    }
+		$this->db = $db;
+		$this->host = $conf->global->PRINTIPP_HOST;
+		$this->port = $conf->global->PRINTIPP_PORT;
+		$this->user = $conf->global->PRINTIPP_USER;
+		$this->password = $conf->global->PRINTIPP_PASSWORD;
+		$this->conf[] = array('varname'=>'PRINTIPP_HOST', 'required'=>1, 'example'=>'localhost', 'type'=>'text');
+		$this->conf[] = array('varname'=>'PRINTIPP_PORT', 'required'=>1, 'example'=>'631', 'type'=>'text');
+		$this->conf[] = array('varname'=>'PRINTIPP_USER', 'required'=>0, 'example'=>'', 'type'=>'text', 'moreattributes'=>'autocomplete="off"');
+		$this->conf[] = array('varname'=>'PRINTIPP_PASSWORD', 'required'=>0, 'example'=>'', 'type'=>'password', 'moreattributes'=>'autocomplete="off"');
+		$this->conf[] = array('enabled'=>1, 'type'=>'submit');
+	}
 
-    /**
-     *  Print selected file
-     *
-     * @param   string      $file       file
-     * @param   string      $module     module
-     * @param   string      $subdir     subdirectory of document like for expedition subdir is sendings
-     *
-     * @return  int                     0 if OK, >0 if KO
-     */
-    public function printFile($file, $module, $subdir = '')
-    {
-        global $conf, $user;
-        $error = 0;
+	/**
+	 *  Print selected file
+	 *
+	 * @param   string      $file       file
+	 * @param   string      $module     module
+	 * @param   string      $subdir     subdirectory of document like for expedition subdir is sendings
+	 *
+	 * @return  int                     0 if OK, >0 if KO
+	 */
+	public function printFile($file, $module, $subdir = '')
+	{
+		global $conf, $user;
+		$error = 0;
 
-        include_once DOL_DOCUMENT_ROOT.'/includes/printipp/CupsPrintIPP.php';
+		include_once DOL_DOCUMENT_ROOT.'/includes/printipp/CupsPrintIPP.php';
 
-        $ipp = new CupsPrintIPP();
-        $ipp->setLog(DOL_DATA_ROOT.'/dolibarr_printipp.log', 'file', 3); // logging very verbose
-        $ipp->setHost($this->host);
-        $ipp->setPort($this->port);
-        $ipp->setJobName($file, true);
-        $ipp->setUserName($this->userid);
-        if (!empty($this->user)) $ipp->setAuthentication($this->user, $this->password);
+		$ipp = new CupsPrintIPP();
+		$ipp->setLog(DOL_DATA_ROOT.'/dolibarr_printipp.log', 'file', 3); // logging very verbose
+		$ipp->setHost($this->host);
+		$ipp->setPort($this->port);
+		$ipp->setJobName($file, true);
+		$ipp->setUserName($this->userid);
+		if (!empty($this->user)) $ipp->setAuthentication($this->user, $this->password);
 
-        // select printer uri for module order, propal,...
-        $sql = "SELECT rowid,printer_id,copy FROM ".MAIN_DB_PREFIX."printing WHERE module = '".$this->db->escape($module)."' AND driver = 'printipp' AND userid = ".$user->id;
-        $result = $this->db->query($sql);
-        if ($result) {
-            $obj = $this->db->fetch_object($result);
-            if ($obj)
-            {
-                dol_syslog("Found a default printer for user ".$user->id." = ".$obj->printer_id);
-                $ipp->setPrinterURI($obj->printer_id);
-            } else {
-                if (!empty($conf->global->PRINTIPP_URI_DEFAULT))
-                {
-                    dol_syslog("Will use default printer conf->global->PRINTIPP_URI_DEFAULT = ".$conf->global->PRINTIPP_URI_DEFAULT);
-                    $ipp->setPrinterURI($conf->global->PRINTIPP_URI_DEFAULT);
-                } else {
-                    $this->errors[] = 'NoDefaultPrinterDefined';
-                    $error++;
-                    return $error;
-                }
-            }
-        } else {
-            dol_print_error($this->db);
-        }
+		// select printer uri for module order, propal,...
+		$sql = "SELECT rowid,printer_id,copy FROM ".MAIN_DB_PREFIX."printing WHERE module = '".$this->db->escape($module)."' AND driver = 'printipp' AND userid = ".$user->id;
+		$result = $this->db->query($sql);
+		if ($result) {
+			$obj = $this->db->fetch_object($result);
+			if ($obj)
+			{
+				dol_syslog("Found a default printer for user ".$user->id." = ".$obj->printer_id);
+				$ipp->setPrinterURI($obj->printer_id);
+			} else {
+				if (!empty($conf->global->PRINTIPP_URI_DEFAULT))
+				{
+					dol_syslog("Will use default printer conf->global->PRINTIPP_URI_DEFAULT = ".$conf->global->PRINTIPP_URI_DEFAULT);
+					$ipp->setPrinterURI($conf->global->PRINTIPP_URI_DEFAULT);
+				} else {
+					$this->errors[] = 'NoDefaultPrinterDefined';
+					$error++;
+					return $error;
+				}
+			}
+		} else {
+			dol_print_error($this->db);
+		}
 
-        // Set number of copy
-        $ipp->setCopies($obj->copy);
-        $fileprint = $conf->{$module}->dir_output;
-        if ($subdir != '') $fileprint .= '/'.$subdir;
-        $fileprint .= '/'.$file;
-        $ipp->setData($fileprint);
-        try {
-            $ipp->printJob();
-        } catch (Exception $e) {
-            $this->errors[] = $e->getMessage();
-            $error++;
-        }
-        if ($error == 0) $this->errors[] = 'PRINTIPP: Job added';
+		// Set number of copy
+		$ipp->setCopies($obj->copy);
+		$fileprint = $conf->{$module}->dir_output;
+		if ($subdir != '') $fileprint .= '/'.$subdir;
+		$fileprint .= '/'.$file;
+		$ipp->setData($fileprint);
+		try {
+			$ipp->printJob();
+		} catch (Exception $e) {
+			$this->errors[] = $e->getMessage();
+			$error++;
+		}
+		if ($error == 0) $this->errors[] = 'PRINTIPP: Job added';
 
-        return $error;
-    }
+		return $error;
+	}
 
-    /**
-     *  Return list of available printers
-     *
-     *  @return  int                     0 if OK, >0 if KO
-     */
-    public function listAvailablePrinters()
-    {
-        global $conf, $langs;
-        $error = 0;
+	/**
+	 *  Return list of available printers
+	 *
+	 *  @return  int                     0 if OK, >0 if KO
+	 */
+	public function listAvailablePrinters()
+	{
+		global $conf, $langs;
+		$error = 0;
 
-        $html = '<tr class="liste_titre">';
-        $html .= '<td>'.$langs->trans('IPP_Uri').'</td>';
-        $html .= '<td>'.$langs->trans('IPP_Name').'</td>';
-        $html .= '<td>'.$langs->trans('IPP_State').'</td>';
-        $html .= '<td>'.$langs->trans('IPP_State_reason').'</td>';
-        $html .= '<td>'.$langs->trans('IPP_State_reason1').'</td>';
-        $html .= '<td>'.$langs->trans('IPP_BW').'</td>';
-        $html .= '<td>'.$langs->trans('IPP_Color').'</td>';
-        //$html.= '<td>'.$langs->trans('IPP_Device').'</td>';
-        $html .= '<td>'.$langs->trans('IPP_Media').'</td>';
-        $html .= '<td>'.$langs->trans('IPP_Supported').'</td>';
-        $html .= '<td class="center">'.$langs->trans("Select").'</td>';
-        $html .= "</tr>\n";
-        $list = $this->getlistAvailablePrinters();
-        foreach ($list as $value) {
-            $printer_det = $this->getPrinterDetail($value);
-            $html .= '<tr class="oddeven">';
-            $html .= '<td>'.$value.'</td>';
-            //$html.= '<td><pre>'.print_r($printer_det,true).'</pre></td>';
-            $html .= '<td>'.$printer_det->printer_name->_value0.'</td>';
-            $html .= '<td>'.$langs->trans('STATE_IPP_'.$printer_det->printer_state->_value0).'</td>';
-            $html .= '<td>'.$langs->trans('STATE_IPP_'.$printer_det->printer_state_reasons->_value0).'</td>';
-            $html .= '<td>'.(!empty($printer_det->printer_state_reasons->_value1) ? $langs->trans('STATE_IPP_'.$printer_det->printer_state_reasons->_value1) : '').'</td>';
-            $html .= '<td>'.$langs->trans('IPP_COLOR_'.$printer_det->printer_type->_value2).'</td>';
-            $html .= '<td>'.$langs->trans('IPP_COLOR_'.$printer_det->printer_type->_value3).'</td>';
-            //$html.= '<td>'.$printer_det->device_uri->_value0.'</td>';
-            $html .= '<td>'.$printer_det->media_default->_value0.'</td>';
-            $html .= '<td>'.$langs->trans('MEDIA_IPP_'.$printer_det->media_type_supported->_value1).'</td>';
-            // Defaut
-            $html .= '<td class="center">';
-            if ($conf->global->PRINTIPP_URI_DEFAULT == $value) {
-                $html .= img_picto($langs->trans("Default"), 'on');
-            } else {
-                $html .= '<a href="'.$_SERVER["PHP_SELF"].'?action=setvalue&amp;token='.newToken().'&amp;mode=test&amp;varname=PRINTIPP_URI_DEFAULT&amp;driver=printipp&amp;value='.urlencode($value).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
-            }
-            $html .= '</td>';
-            $html .= '</tr>'."\n";
-        }
-        $this->resprint = $html;
-        return $error;
-    }
+		$html = '<tr class="liste_titre">';
+		$html .= '<td>'.$langs->trans('IPP_Uri').'</td>';
+		$html .= '<td>'.$langs->trans('IPP_Name').'</td>';
+		$html .= '<td>'.$langs->trans('IPP_State').'</td>';
+		$html .= '<td>'.$langs->trans('IPP_State_reason').'</td>';
+		$html .= '<td>'.$langs->trans('IPP_State_reason1').'</td>';
+		$html .= '<td>'.$langs->trans('IPP_BW').'</td>';
+		$html .= '<td>'.$langs->trans('IPP_Color').'</td>';
+		//$html.= '<td>'.$langs->trans('IPP_Device').'</td>';
+		$html .= '<td>'.$langs->trans('IPP_Media').'</td>';
+		$html .= '<td>'.$langs->trans('IPP_Supported').'</td>';
+		$html .= '<td class="center">'.$langs->trans("Select").'</td>';
+		$html .= "</tr>\n";
+		$list = $this->getlistAvailablePrinters();
+		foreach ($list as $value) {
+			$printer_det = $this->getPrinterDetail($value);
+			$html .= '<tr class="oddeven">';
+			$html .= '<td>'.$value.'</td>';
+			//$html.= '<td><pre>'.print_r($printer_det,true).'</pre></td>';
+			$html .= '<td>'.$printer_det->printer_name->_value0.'</td>';
+			$html .= '<td>'.$langs->trans('STATE_IPP_'.$printer_det->printer_state->_value0).'</td>';
+			$html .= '<td>'.$langs->trans('STATE_IPP_'.$printer_det->printer_state_reasons->_value0).'</td>';
+			$html .= '<td>'.(!empty($printer_det->printer_state_reasons->_value1) ? $langs->trans('STATE_IPP_'.$printer_det->printer_state_reasons->_value1) : '').'</td>';
+			$html .= '<td>'.$langs->trans('IPP_COLOR_'.$printer_det->printer_type->_value2).'</td>';
+			$html .= '<td>'.$langs->trans('IPP_COLOR_'.$printer_det->printer_type->_value3).'</td>';
+			//$html.= '<td>'.$printer_det->device_uri->_value0.'</td>';
+			$html .= '<td>'.$printer_det->media_default->_value0.'</td>';
+			$html .= '<td>'.$langs->trans('MEDIA_IPP_'.$printer_det->media_type_supported->_value1).'</td>';
+			// Defaut
+			$html .= '<td class="center">';
+			if ($conf->global->PRINTIPP_URI_DEFAULT == $value) {
+				$html .= img_picto($langs->trans("Default"), 'on');
+			} else {
+				$html .= '<a href="'.$_SERVER["PHP_SELF"].'?action=setvalue&amp;token='.newToken().'&amp;mode=test&amp;varname=PRINTIPP_URI_DEFAULT&amp;driver=printipp&amp;value='.urlencode($value).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+			}
+			$html .= '</td>';
+			$html .= '</tr>'."\n";
+		}
+		$this->resprint = $html;
+		return $error;
+	}
 
-    /**
-     *  Return list of available printers
-     *
-     *  @return array                list of printers
-     */
-    public function getlistAvailablePrinters()
-    {
-        global $conf, $db;
-        include_once DOL_DOCUMENT_ROOT.'/includes/printipp/CupsPrintIPP.php';
-        $ipp = new CupsPrintIPP();
-        $ipp->setLog(DOL_DATA_ROOT.'/dolibarr_printipp.log', 'file', 3); // logging very verbose
-        $ipp->setHost($this->host);
-        $ipp->setPort($this->port);
-        $ipp->setUserName($this->userid);
-        if (!empty($this->user)) {
-            $ipp->setAuthentication($this->user, $this->password);
-        }
-        $ipp->getPrinters();
-        return $ipp->available_printers;
-    }
+	/**
+	 *  Return list of available printers
+	 *
+	 *  @return array                list of printers
+	 */
+	public function getlistAvailablePrinters()
+	{
+		global $conf, $db;
+		include_once DOL_DOCUMENT_ROOT.'/includes/printipp/CupsPrintIPP.php';
+		$ipp = new CupsPrintIPP();
+		$ipp->setLog(DOL_DATA_ROOT.'/dolibarr_printipp.log', 'file', 3); // logging very verbose
+		$ipp->setHost($this->host);
+		$ipp->setPort($this->port);
+		$ipp->setUserName($this->userid);
+		if (!empty($this->user)) {
+			$ipp->setAuthentication($this->user, $this->password);
+		}
+		$ipp->getPrinters();
+		return $ipp->available_printers;
+	}
 
-    /**
-     *  Get printer detail
-     *
-     *  @param  string  $uri    URI
-     *  @return array           List of attributes
-     */
-    private function getPrinterDetail($uri)
-    {
-        global $conf, $db;
+	/**
+	 *  Get printer detail
+	 *
+	 *  @param  string  $uri    URI
+	 *  @return array           List of attributes
+	 */
+	private function getPrinterDetail($uri)
+	{
+		global $conf, $db;
 
-        include_once DOL_DOCUMENT_ROOT.'/includes/printipp/CupsPrintIPP.php';
-        $ipp = new CupsPrintIPP();
-        $ipp->setLog(DOL_DATA_ROOT.'/dolibarr_printipp.log', 'file', 3); // logging very verbose
-        $ipp->setHost($this->host);
-        $ipp->setPort($this->port);
-        $ipp->setUserName($this->userid);
-        if (!empty($this->user)) {
-            $ipp->setAuthentication($this->user, $this->password);
-        }
-        $ipp->setPrinterURI($uri);
-        $ipp->getPrinterAttributes();
-        return $ipp->printer_attributes;
-    }
+		include_once DOL_DOCUMENT_ROOT.'/includes/printipp/CupsPrintIPP.php';
+		$ipp = new CupsPrintIPP();
+		$ipp->setLog(DOL_DATA_ROOT.'/dolibarr_printipp.log', 'file', 3); // logging very verbose
+		$ipp->setHost($this->host);
+		$ipp->setPort($this->port);
+		$ipp->setUserName($this->userid);
+		if (!empty($this->user)) {
+			$ipp->setAuthentication($this->user, $this->password);
+		}
+		$ipp->setPrinterURI($uri);
+		$ipp->getPrinterAttributes();
+		return $ipp->printer_attributes;
+	}
 
-    /**
-     *  List jobs print
-     *
-     *  @param   string      $module     module
-     *
-     *  @return  int                     0 if OK, >0 if KO
-     */
-    public function listJobs($module)
-    {
-        global $conf;
-        $error = 0;
-        $html = '';
-        include_once DOL_DOCUMENT_ROOT.'/includes/printipp/CupsPrintIPP.php';
-        $ipp = new CupsPrintIPP();
-        $ipp->setLog(DOL_DATA_ROOT.'/dolibarr_printipp.log', 'file', 3); // logging very verbose
-        $ipp->setHost($this->host);
-        $ipp->setPort($this->port);
-        $ipp->setUserName($this->userid);
-        if (!empty($this->user)) {
-            $ipp->setAuthentication($this->user, $this->password);
-        }
-        // select printer uri for module order, propal,...
-        $sql = 'SELECT rowid,printer_uri,printer_name FROM '.MAIN_DB_PREFIX.'printer_ipp WHERE module="'.$module.'"';
-        $result = $this->db->query($sql);
-        if ($result) {
-            $obj = $this->db->fetch_object($result);
-            if ($obj) {
-                $ipp->setPrinterURI($obj->printer_uri);
-            } else {
-                // All printers
-                $ipp->setPrinterURI("ipp://localhost:631/printers/");
-            }
-        }
-        // Getting Jobs
-        try {
-            $ipp->getJobs(false, 0, 'completed', false);
-        } catch (Exception $e) {
-            $this->errors[] = $e->getMessage();
-            $error++;
-        }
-        $html .= '<table width="100%" class="noborder">';
-        $html .= '<tr class="liste_titre">';
-        $html .= '<td>Id</td>';
-        $html .= '<td>Owner</td>';
-        $html .= '<td>Printer</td>';
-        $html .= '<td>File</td>';
-        $html .= '<td>Status</td>';
-        $html .= '<td>Cancel</td>';
-        $html .= '</tr>'."\n";
-        $jobs = $ipp->jobs_attributes;
+	/**
+	 *  List jobs print
+	 *
+	 *  @param   string      $module     module
+	 *
+	 *  @return  int                     0 if OK, >0 if KO
+	 */
+	public function listJobs($module)
+	{
+		global $conf;
+		$error = 0;
+		$html = '';
+		include_once DOL_DOCUMENT_ROOT.'/includes/printipp/CupsPrintIPP.php';
+		$ipp = new CupsPrintIPP();
+		$ipp->setLog(DOL_DATA_ROOT.'/dolibarr_printipp.log', 'file', 3); // logging very verbose
+		$ipp->setHost($this->host);
+		$ipp->setPort($this->port);
+		$ipp->setUserName($this->userid);
+		if (!empty($this->user)) {
+			$ipp->setAuthentication($this->user, $this->password);
+		}
+		// select printer uri for module order, propal,...
+		$sql = 'SELECT rowid,printer_uri,printer_name FROM '.MAIN_DB_PREFIX.'printer_ipp WHERE module="'.$module.'"';
+		$result = $this->db->query($sql);
+		if ($result) {
+			$obj = $this->db->fetch_object($result);
+			if ($obj) {
+				$ipp->setPrinterURI($obj->printer_uri);
+			} else {
+				// All printers
+				$ipp->setPrinterURI("ipp://localhost:631/printers/");
+			}
+		}
+		// Getting Jobs
+		try {
+			$ipp->getJobs(false, 0, 'completed', false);
+		} catch (Exception $e) {
+			$this->errors[] = $e->getMessage();
+			$error++;
+		}
+		$html .= '<table width="100%" class="noborder">';
+		$html .= '<tr class="liste_titre">';
+		$html .= '<td>Id</td>';
+		$html .= '<td>Owner</td>';
+		$html .= '<td>Printer</td>';
+		$html .= '<td>File</td>';
+		$html .= '<td>Status</td>';
+		$html .= '<td>Cancel</td>';
+		$html .= '</tr>'."\n";
+		$jobs = $ipp->jobs_attributes;
 
-        //$html .= '<pre>'.print_r($jobs,true).'</pre>';
-        foreach ($jobs as $value) {
-            $html .= '<tr class="oddeven">';
-            $html .= '<td>'.$value->job_id->_value0.'</td>';
-            $html .= '<td>'.$value->job_originating_user_name->_value0.'</td>';
-            $html .= '<td>'.$value->printer_uri->_value0.'</td>';
-            $html .= '<td>'.$value->job_name->_value0.'</td>';
-            $html .= '<td>'.$value->job_state->_value0.'</td>';
-            $html .= '<td>'.$value->job_uri->_value0.'</td>';
-            $html .= '</tr>';
-        }
-        $html .= "</table>";
-        $this->resprint = $html;
-        return $error;
-    }
+		//$html .= '<pre>'.print_r($jobs,true).'</pre>';
+		foreach ($jobs as $value) {
+			$html .= '<tr class="oddeven">';
+			$html .= '<td>'.$value->job_id->_value0.'</td>';
+			$html .= '<td>'.$value->job_originating_user_name->_value0.'</td>';
+			$html .= '<td>'.$value->printer_uri->_value0.'</td>';
+			$html .= '<td>'.$value->job_name->_value0.'</td>';
+			$html .= '<td>'.$value->job_state->_value0.'</td>';
+			$html .= '<td>'.$value->job_uri->_value0.'</td>';
+			$html .= '</tr>';
+		}
+		$html .= "</table>";
+		$this->resprint = $html;
+		return $error;
+	}
 }
diff --git a/htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php b/htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php
index f8460b7483f..90836ca4fd9 100644
--- a/htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php
+++ b/htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php
@@ -41,12 +41,12 @@ class pdf_standardlabel extends CommonStickerGenerator
 	 * @param	array		$param			Associative array containing label content and optional parameters
 	 * @return	void
 	 */
-    public function addSticker(&$pdf, $outputlangs, $param)
-    {
+	public function addSticker(&$pdf, $outputlangs, $param)
+	{
 		// use this method in future refactoring
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Output a sticker on page at position _COUNTX, _COUNTY (_COUNTX and _COUNTY start from 0)
 	 * - %LOGO% is replace with company logo
@@ -63,7 +63,7 @@ class pdf_standardlabel extends CommonStickerGenerator
 	 */
 	public function Add_PDF_label(&$pdf, $textleft, $header, $footer, $outputlangs, $textright = '', $photo = '')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $mysoc, $conf, $langs;
 		global $forceimgscalewidth, $forceimgscaleheight;
 
@@ -219,7 +219,7 @@ class pdf_standardlabel extends CommonStickerGenerator
 
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Function to build PDF on disk, then output on HTTP strem.
 	 *
@@ -232,21 +232,21 @@ class pdf_standardlabel extends CommonStickerGenerator
 	 */
 	public function write_file($arrayofrecords, $outputlangs, $srctemplatepath, $outputdir = '', $filename = 'tmp_address_sheet.pdf')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $user, $conf, $langs, $mysoc, $_Avery_Labels;
 
 		$this->code = $srctemplatepath;
 		$this->Tformat = $_Avery_Labels[$this->code];
 		if (empty($this->Tformat)) { dol_print_error('', 'ErrorBadTypeForCard'.$this->code); exit; }
 		$this->type = 'pdf';
-        // standard format or custom
-        if ($this->Tformat['paper-size'] != 'custom') {
-            $this->format = $this->Tformat['paper-size'];
-        } else {
-            //custom
-            $resolution = array($this->Tformat['custom_x'], $this->Tformat['custom_y']);
-            $this->format = $resolution;
-        }
+		// standard format or custom
+		if ($this->Tformat['paper-size'] != 'custom') {
+			$this->format = $this->Tformat['paper-size'];
+		} else {
+			//custom
+			$resolution = array($this->Tformat['custom_x'], $this->Tformat['custom_y']);
+			$this->format = $resolution;
+		}
 
 		if (!is_object($outputlangs)) $outputlangs = $langs;
 		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
diff --git a/htdocs/core/modules/printsheet/doc/pdf_tcpdflabel.class.php b/htdocs/core/modules/printsheet/doc/pdf_tcpdflabel.class.php
index a451df3f17c..1540fc29e8e 100644
--- a/htdocs/core/modules/printsheet/doc/pdf_tcpdflabel.class.php
+++ b/htdocs/core/modules/printsheet/doc/pdf_tcpdflabel.class.php
@@ -257,7 +257,7 @@ class pdf_tcpdflabel extends CommonStickerGenerator
 
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Function to build PDF on disk, then output on HTTP strem.
 	 *
@@ -270,21 +270,21 @@ class pdf_tcpdflabel extends CommonStickerGenerator
 	 */
 	public function write_file($arrayofrecords, $outputlangs, $srctemplatepath, $outputdir = '', $filename = 'tmp_address_sheet.pdf')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $user, $conf, $langs, $mysoc, $_Avery_Labels;
 
 		$this->code = $srctemplatepath;
 		$this->Tformat = $_Avery_Labels[$this->code];
 		if (empty($this->Tformat)) { dol_print_error('', 'ErrorBadTypeForCard'.$this->code); exit; }
 		$this->type = 'pdf';
-        // standard format or custom
-        if ($this->Tformat['paper-size'] != 'custom') {
-            $this->format = $this->Tformat['paper-size'];
-        } else {
-            //custom
-            $resolution = array($this->Tformat['custom_x'], $this->Tformat['custom_y']);
-            $this->format = $resolution;
-        }
+		// standard format or custom
+		if ($this->Tformat['paper-size'] != 'custom') {
+			$this->format = $this->Tformat['paper-size'];
+		} else {
+			//custom
+			$resolution = array($this->Tformat['custom_x'], $this->Tformat['custom_y']);
+			$this->format = $resolution;
+		}
 
 		if (!is_object($outputlangs)) $outputlangs = $langs;
 		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
diff --git a/htdocs/core/modules/printsheet/modules_labels.php b/htdocs/core/modules/printsheet/modules_labels.php
index 215c3a854ad..3320b4ff928 100644
--- a/htdocs/core/modules/printsheet/modules_labels.php
+++ b/htdocs/core/modules/printsheet/modules_labels.php
@@ -40,17 +40,17 @@ class ModelePDFLabels
 	public $error = '';
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return list of active generation modules
 	 *
-     *  @param  DoliDB	$db     			Database handler
-     *  @param  integer	$maxfilenamelength  Max length of value to show
-     *  @return	array						List of templates
+	 *  @param  DoliDB	$db     			Database handler
+	 *  @param  integer	$maxfilenamelength  Max length of value to show
+	 *  @return	array						List of templates
 	 */
 	public function liste_modeles($db, $maxfilenamelength = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 		$type = 'members_labels';
@@ -79,7 +79,7 @@ class ModelePDFLabels
  */
 function doc_label_pdf_create($db, $arrayofrecords, $modele, $outputlangs, $outputdir = '', $template = 'standardlabel', $filename = 'tmp_address_sheet.pdf')
 {
-    // phpcs:enable
+	// phpcs:enable
 	global $conf, $langs;
 	$langs->load("members");
 
diff --git a/htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php b/htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php
index e1c760ccb32..d017a559b37 100644
--- a/htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php
+++ b/htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php
@@ -44,15 +44,15 @@ class doc_generic_product_odt extends ModelePDFProduct
 	public $emetteur;
 
 	/**
-     * @var array Minimum version of PHP required by module.
-     * e.g.: PHP ≥ 5.6 = array(5, 6)
-     */
+	 * @var array Minimum version of PHP required by module.
+	 * e.g.: PHP ≥ 5.6 = array(5, 6)
+	 */
 	public $phpmin = array(5, 6);
 
 	/**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
 	public $version = 'dolibarr';
 
 
@@ -66,7 +66,7 @@ class doc_generic_product_odt extends ModelePDFProduct
 		global $conf, $langs, $mysoc;
 
 		// Load translation files required by the page
-        $langs->loadLangs(array("main", "companies"));
+		$langs->loadLangs(array("main", "companies"));
 
 		$this->db = $db;
 		$this->name = "ODT templates";
@@ -111,7 +111,7 @@ class doc_generic_product_odt extends ModelePDFProduct
 		global $conf, $langs;
 
 		// Load translation files required by the page
-        $langs->loadLangs(array("errors", "companies"));
+		$langs->loadLangs(array("errors", "companies"));
 
 		$form = new Form($this->db);
 
@@ -204,7 +204,7 @@ class doc_generic_product_odt extends ModelePDFProduct
 		return $texte;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Function to build a document on disk using the generic odt module.
 	 *
@@ -218,7 +218,7 @@ class doc_generic_product_odt extends ModelePDFProduct
 	 */
 	public function write_file($object, $outputlangs, $srctemplatepath, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $product, $langs, $conf, $mysoc, $hookmanager, $user;
 
 		if (empty($srctemplatepath))
@@ -289,8 +289,8 @@ class doc_generic_product_odt extends ModelePDFProduct
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
 				if (!empty($conf->global->MAIN_DOC_USE_TIMING))
 				{
-				    $format = $conf->global->MAIN_DOC_USE_TIMING;
-				    if ($format == '1') $format = '%Y%m%d%H%M%S';
+					$format = $conf->global->MAIN_DOC_USE_TIMING;
+					if ($format == '1') $format = '%Y%m%d%H%M%S';
 					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
 				} else {
 					$filename = $newfiletmp.'.'.$newfileformat;
@@ -317,14 +317,14 @@ class doc_generic_product_odt extends ModelePDFProduct
 				$contactobject = null;
 				if (!empty($usecontact))
 				{
-                    // On peut utiliser le nom de la societe du contact
-                    if (!empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) {
-                        $socobject = $object->contact;
-                    } else {
-                        $socobject = $object->thirdparty;
-                        // if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
-                        $contactobject = $object->contact;
-                    }
+					// On peut utiliser le nom de la societe du contact
+					if (!empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) {
+						$socobject = $object->contact;
+					} else {
+						$socobject = $object->thirdparty;
+						// if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
+						$contactobject = $object->contact;
+					}
 				} else {
 					$socobject = $object->thirdparty;
 				}
@@ -352,7 +352,7 @@ class doc_generic_product_odt extends ModelePDFProduct
 				// Open and load template
 				require_once ODTPHP_PATH.'odf.php';
 				try {
-    				$odfHandler = new odf(
+					$odfHandler = new odf(
 						$srctemplatepath,
 						array(
 							'PATH_TO_TMP'	  => $conf->product->dir_temp,
@@ -415,7 +415,7 @@ class doc_generic_product_odt extends ModelePDFProduct
 						}
 					} catch (OdfException $e)
 					{
-                        dol_syslog($e->getMessage(), LOG_INFO);
+						dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
 				// Replace tags of lines
@@ -460,7 +460,7 @@ class doc_generic_product_odt extends ModelePDFProduct
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
 					} catch (OdfException $e)
 					{
-                        dol_syslog($e->getMessage(), LOG_INFO);
+						dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
 
@@ -474,7 +474,7 @@ class doc_generic_product_odt extends ModelePDFProduct
 						$odfHandler->exportAsAttachedPDF($file);
 					} catch (Exception $e) {
 						$this->error = $e->getMessage();
-                        dol_syslog($e->getMessage(), LOG_INFO);
+						dol_syslog($e->getMessage(), LOG_INFO);
 						return -1;
 					}
 				} else {
@@ -482,7 +482,7 @@ class doc_generic_product_odt extends ModelePDFProduct
 						$odfHandler->saveToDisk($file);
 					} catch (Exception $e) {
 						$this->error = $e->getMessage();
-                        dol_syslog($e->getMessage(), LOG_INFO);
+						dol_syslog($e->getMessage(), LOG_INFO);
 						return -1;
 					}
 				}
diff --git a/htdocs/core/modules/product/doc/pdf_standard.modules.php b/htdocs/core/modules/product/doc/pdf_standard.modules.php
index d5e45fa3c73..9ac05a98561 100644
--- a/htdocs/core/modules/product/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/product/doc/pdf_standard.modules.php
@@ -36,74 +36,74 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
  */
 class pdf_standard extends ModelePDFProduct
 {
-    /**
-     * @var DoliDb Database handler
-     */
-    public $db;
+	/**
+	 * @var DoliDb Database handler
+	 */
+	public $db;
 
 	/**
-     * @var string model name
-     */
-    public $name;
+	 * @var string model name
+	 */
+	public $name;
 
 	/**
-     * @var string model description (short text)
-     */
-    public $description;
+	 * @var string model description (short text)
+	 */
+	public $description;
 
 	/**
-     * @var string document type
-     */
-    public $type;
+	 * @var string document type
+	 */
+	public $type;
 
 	/**
-     * @var array Minimum version of PHP required by module.
-     * e.g.: PHP ≥ 5.6 = array(5, 6)
-     */
+	 * @var array Minimum version of PHP required by module.
+	 * e.g.: PHP ≥ 5.6 = array(5, 6)
+	 */
 	public $phpmin = array(5, 6);
 
 	/**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
 	public $version = 'dolibarr';
 
-    /**
-     * @var int page_largeur
-     */
-    public $page_largeur;
-
-    /**
-     * @var int page_hauteur
-     */
-    public $page_hauteur;
-
-    /**
-     * @var array format
-     */
-    public $format;
+	/**
+	 * @var int page_largeur
+	 */
+	public $page_largeur;
 
 	/**
-     * @var int marge_gauche
-     */
+	 * @var int page_hauteur
+	 */
+	public $page_hauteur;
+
+	/**
+	 * @var array format
+	 */
+	public $format;
+
+	/**
+	 * @var int marge_gauche
+	 */
 	public $marge_gauche;
 
 	/**
-     * @var int marge_droite
-     */
+	 * @var int marge_droite
+	 */
 	public $marge_droite;
 
 	/**
-     * @var int marge_haute
-     */
+	 * @var int marge_haute
+	 */
 	public $marge_haute;
 
 	/**
-     * @var int marge_basse
-     */
+	 * @var int marge_basse
+	 */
 	public $marge_basse;
 
-    /**
+	/**
 	 * Issuer
 	 * @var Societe
 	 */
@@ -148,7 +148,7 @@ class pdf_standard extends ModelePDFProduct
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Function to build a document on disk using the generic odt module.
 	 *
@@ -160,9 +160,9 @@ class pdf_standard extends ModelePDFProduct
 	 *  @param		int			$hideref			Do not show ref
 	 *	@return		int         					1 if OK, <=0 if KO
 	 */
-    public function write_file($object, $outputlangs, $srctemplatepath, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
-    {
-        // phpcs:enable
+	public function write_file($object, $outputlangs, $srctemplatepath, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
+	{
+		// phpcs:enable
 		global $user, $langs, $conf, $mysoc, $db, $hookmanager;
 
 		if (!is_object($outputlangs)) $outputlangs = $langs;
@@ -176,7 +176,7 @@ class pdf_standard extends ModelePDFProduct
 
 		if ($conf->product->dir_output)
 		{
-		    // Definition of $dir and $file
+			// Definition of $dir and $file
 			if ($object->specimen)
 			{
 				$dir = $conf->product->dir_output;
@@ -219,22 +219,22 @@ class pdf_standard extends ModelePDFProduct
 				$pdf->SetAutoPageBreak(1, 0);
 
 				$heightforinfotot = 40; // Height reserved to output the info and total part
-		        $heightforfreetext = (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT) ? $conf->global->MAIN_PDF_FREETEXT_HEIGHT : 5); // Height reserved to output the free text on last page
-	            $heightforfooter = $this->marge_basse + 8; // Height reserved to output the footer (value include bottom margin)
-	            if ($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS > 0) $heightforfooter += 6;
+				$heightforfreetext = (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT) ? $conf->global->MAIN_PDF_FREETEXT_HEIGHT : 5); // Height reserved to output the free text on last page
+				$heightforfooter = $this->marge_basse + 8; // Height reserved to output the footer (value include bottom margin)
+				if ($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS > 0) $heightforfooter += 6;
 
-                if (class_exists('TCPDF'))
-                {
-                    $pdf->setPrintHeader(false);
-                    $pdf->setPrintFooter(false);
-                }
-                $pdf->SetFont(pdf_getPDFFont($outputlangs));
-                // Set path to the background PDF File
-                if (!empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
-                {
-                    $pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
-                    $tplidx = $pdf->importPage(1);
-                }
+				if (class_exists('TCPDF'))
+				{
+					$pdf->setPrintHeader(false);
+					$pdf->setPrintFooter(false);
+				}
+				$pdf->SetFont(pdf_getPDFFont($outputlangs));
+				// Set path to the background PDF File
+				if (!empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
+				{
+					$pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
+					$tplidx = $pdf->importPage(1);
+				}
 
 				$pdf->Open();
 				$pagenb = 0;
@@ -278,23 +278,23 @@ class pdf_standard extends ModelePDFProduct
 
 				if ($object->weight)
 				{
-				    $pdf->writeHTMLCell(190, 3, $this->marge_gauche, $nexY, $langs->trans("Weight").': '.dol_htmlentitiesbr($object->weight), 0, 1);
-				    $nexY = $pdf->GetY();
+					$pdf->writeHTMLCell(190, 3, $this->marge_gauche, $nexY, $langs->trans("Weight").': '.dol_htmlentitiesbr($object->weight), 0, 1);
+					$nexY = $pdf->GetY();
 				}
 				if ($object->weight)
 				{
-				    $pdf->writeHTMLCell(190, 3, $this->marge_gauche, $nexY, $langs->trans("Length").' x '.$langs->trans("Width").' x '.$langs->trans("Height").': '.($object->length != '' ? $object->length : '?').' x '.($object->width != '' ? $object->width : '?').' x '.($object->height != '' ? $object->height : '?'), 0, 1);
-				    $nexY = $pdf->GetY();
+					$pdf->writeHTMLCell(190, 3, $this->marge_gauche, $nexY, $langs->trans("Length").' x '.$langs->trans("Width").' x '.$langs->trans("Height").': '.($object->length != '' ? $object->length : '?').' x '.($object->width != '' ? $object->width : '?').' x '.($object->height != '' ? $object->height : '?'), 0, 1);
+					$nexY = $pdf->GetY();
 				}
 				if ($object->surface)
 				{
-				    $pdf->writeHTMLCell(190, 3, $this->marge_gauche, $nexY, $langs->trans("Area").': '.dol_htmlentitiesbr($object->surface), 0, 1);
-				    $nexY = $pdf->GetY();
+					$pdf->writeHTMLCell(190, 3, $this->marge_gauche, $nexY, $langs->trans("Area").': '.dol_htmlentitiesbr($object->surface), 0, 1);
+					$nexY = $pdf->GetY();
 				}
 				if ($object->volume)
 				{
-    				$pdf->writeHTMLCell(190, 3, $this->marge_gauche, $nexY, $langs->trans("Volume").': '.dol_htmlentitiesbr($object->volume), 0, 1);
-	   			    $nexY = $pdf->GetY();
+					$pdf->writeHTMLCell(190, 3, $this->marge_gauche, $nexY, $langs->trans("Volume").': '.dol_htmlentitiesbr($object->volume), 0, 1);
+	   				$nexY = $pdf->GetY();
 				}
 
 
@@ -559,8 +559,8 @@ class pdf_standard extends ModelePDFProduct
 				$reshook = $hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 				if ($reshook < 0)
 				{
-				    $this->error = $hookmanager->error;
-				    $this->errors = $hookmanager->errors;
+					$this->error = $hookmanager->error;
+					$this->errors = $hookmanager->errors;
 				}
 
 				if (!empty($conf->global->MAIN_UMASK))
@@ -577,7 +577,7 @@ class pdf_standard extends ModelePDFProduct
 			$this->error = $langs->trans("ErrorConstantNotDefined", "PRODUCT_OUTPUTDIR");
 			return 0;
 		}
-    }
+	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
@@ -595,94 +595,94 @@ class pdf_standard extends ModelePDFProduct
 	 */
 	protected function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop = 0, $hidebottom = 0, $currency = '')
 	{
-	    global $conf;
+		global $conf;
 
-	    // Force to disable hidetop and hidebottom
-	    $hidebottom = 0;
-	    if ($hidetop) $hidetop = -1;
+		// Force to disable hidetop and hidebottom
+		$hidebottom = 0;
+		if ($hidetop) $hidetop = -1;
 
-	    $currency = !empty($currency) ? $currency : $conf->currency;
-	    $default_font_size = pdf_getPDFFontSize($outputlangs);
+		$currency = !empty($currency) ? $currency : $conf->currency;
+		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
-	    // Amount in (at tab_top - 1)
-	    $pdf->SetTextColor(0, 0, 0);
-	    $pdf->SetFont('', '', $default_font_size - 2);
+		// Amount in (at tab_top - 1)
+		$pdf->SetTextColor(0, 0, 0);
+		$pdf->SetFont('', '', $default_font_size - 2);
 
-	    if (empty($hidetop))
-	    {
-	        $titre = $outputlangs->transnoentities("AmountInCurrency", $outputlangs->transnoentitiesnoconv("Currency".$currency));
-	        $pdf->SetXY($this->page_largeur - $this->marge_droite - ($pdf->GetStringWidth($titre) + 3), $tab_top - 4);
-	        $pdf->MultiCell(($pdf->GetStringWidth($titre) + 3), 2, $titre);
+		if (empty($hidetop))
+		{
+			$titre = $outputlangs->transnoentities("AmountInCurrency", $outputlangs->transnoentitiesnoconv("Currency".$currency));
+			$pdf->SetXY($this->page_largeur - $this->marge_droite - ($pdf->GetStringWidth($titre) + 3), $tab_top - 4);
+			$pdf->MultiCell(($pdf->GetStringWidth($titre) + 3), 2, $titre);
 
-	        //$conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR='230,230,230';
-	        if (!empty($conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR)) $pdf->Rect($this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_droite - $this->marge_gauche, 5, 'F', null, explode(',', $conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR));
-	    }
+			//$conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR='230,230,230';
+			if (!empty($conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR)) $pdf->Rect($this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_droite - $this->marge_gauche, 5, 'F', null, explode(',', $conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR));
+		}
 
-	    $pdf->SetDrawColor(128, 128, 128);
-	    $pdf->SetFont('', '', $default_font_size - 1);
+		$pdf->SetDrawColor(128, 128, 128);
+		$pdf->SetFont('', '', $default_font_size - 1);
 
-	    // Output Rect
-	    $this->printRect($pdf, $this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_gauche - $this->marge_droite, $tab_height, $hidetop, $hidebottom); // Rect takes a length in 3rd parameter and 4th parameter
+		// Output Rect
+		$this->printRect($pdf, $this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_gauche - $this->marge_droite, $tab_height, $hidetop, $hidebottom); // Rect takes a length in 3rd parameter and 4th parameter
 
-	    if (empty($hidetop))
-	    {
-	        $pdf->line($this->marge_gauche, $tab_top + 5, $this->page_largeur - $this->marge_droite, $tab_top + 5); // line takes a position y in 2nd parameter and 4th parameter
+		if (empty($hidetop))
+		{
+			$pdf->line($this->marge_gauche, $tab_top + 5, $this->page_largeur - $this->marge_droite, $tab_top + 5); // line takes a position y in 2nd parameter and 4th parameter
 
-	        $pdf->SetXY($this->posxdesc - 1, $tab_top + 1);
-	        $pdf->MultiCell(108, 2, $outputlangs->transnoentities("Designation"), '', 'L');
-	    }
+			$pdf->SetXY($this->posxdesc - 1, $tab_top + 1);
+			$pdf->MultiCell(108, 2, $outputlangs->transnoentities("Designation"), '', 'L');
+		}
 
-	    if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) && empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN))
-	    {
-	        $pdf->line($this->posxtva - 1, $tab_top, $this->posxtva - 1, $tab_top + $tab_height);
-	        if (empty($hidetop))
-	        {
-	            $pdf->SetXY($this->posxtva - 3, $tab_top + 1);
-	            $pdf->MultiCell($this->posxup - $this->posxtva + 3, 2, $outputlangs->transnoentities("VAT"), '', 'C');
-	        }
-	    }
+		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) && empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN))
+		{
+			$pdf->line($this->posxtva - 1, $tab_top, $this->posxtva - 1, $tab_top + $tab_height);
+			if (empty($hidetop))
+			{
+				$pdf->SetXY($this->posxtva - 3, $tab_top + 1);
+				$pdf->MultiCell($this->posxup - $this->posxtva + 3, 2, $outputlangs->transnoentities("VAT"), '', 'C');
+			}
+		}
 
-	    $pdf->line($this->posxup - 1, $tab_top, $this->posxup - 1, $tab_top + $tab_height);
-	    if (empty($hidetop))
-	    {
-	        $pdf->SetXY($this->posxup - 1, $tab_top + 1);
-	        $pdf->MultiCell($this->posxqty - $this->posxup - 1, 2, $outputlangs->transnoentities("PriceUHT"), '', 'C');
-	    }
+		$pdf->line($this->posxup - 1, $tab_top, $this->posxup - 1, $tab_top + $tab_height);
+		if (empty($hidetop))
+		{
+			$pdf->SetXY($this->posxup - 1, $tab_top + 1);
+			$pdf->MultiCell($this->posxqty - $this->posxup - 1, 2, $outputlangs->transnoentities("PriceUHT"), '', 'C');
+		}
 
-	    $pdf->line($this->posxqty - 1, $tab_top, $this->posxqty - 1, $tab_top + $tab_height);
-	    if (empty($hidetop))
-	    {
-	        $pdf->SetXY($this->posxqty - 1, $tab_top + 1);
-	        $pdf->MultiCell($this->posxunit - $this->posxqty - 1, 2, $outputlangs->transnoentities("Qty"), '', 'C');
-	    }
+		$pdf->line($this->posxqty - 1, $tab_top, $this->posxqty - 1, $tab_top + $tab_height);
+		if (empty($hidetop))
+		{
+			$pdf->SetXY($this->posxqty - 1, $tab_top + 1);
+			$pdf->MultiCell($this->posxunit - $this->posxqty - 1, 2, $outputlangs->transnoentities("Qty"), '', 'C');
+		}
 
-	    if ($conf->global->PRODUCT_USE_UNITS) {
-	        $pdf->line($this->posxunit - 1, $tab_top, $this->posxunit - 1, $tab_top + $tab_height);
-	        if (empty($hidetop)) {
-	            $pdf->SetXY($this->posxunit - 1, $tab_top + 1);
-                $pdf->MultiCell($this->posxdiscount - $this->posxunit - 1, 2, $outputlangs->transnoentities("Unit"), '', 'C');
-	        }
-	    }
+		if ($conf->global->PRODUCT_USE_UNITS) {
+			$pdf->line($this->posxunit - 1, $tab_top, $this->posxunit - 1, $tab_top + $tab_height);
+			if (empty($hidetop)) {
+				$pdf->SetXY($this->posxunit - 1, $tab_top + 1);
+				$pdf->MultiCell($this->posxdiscount - $this->posxunit - 1, 2, $outputlangs->transnoentities("Unit"), '', 'C');
+			}
+		}
 
-	    $pdf->line($this->posxdiscount - 1, $tab_top, $this->posxdiscount - 1, $tab_top + $tab_height);
-	    if (empty($hidetop))
-	    {
-	        if ($this->atleastonediscount)
-	        {
-	            $pdf->SetXY($this->posxdiscount - 1, $tab_top + 1);
-	            $pdf->MultiCell($this->postotalht - $this->posxdiscount + 1, 2, $outputlangs->transnoentities("ReductionShort"), '', 'C');
-	        }
-	    }
+		$pdf->line($this->posxdiscount - 1, $tab_top, $this->posxdiscount - 1, $tab_top + $tab_height);
+		if (empty($hidetop))
+		{
+			if ($this->atleastonediscount)
+			{
+				$pdf->SetXY($this->posxdiscount - 1, $tab_top + 1);
+				$pdf->MultiCell($this->postotalht - $this->posxdiscount + 1, 2, $outputlangs->transnoentities("ReductionShort"), '', 'C');
+			}
+		}
 
-	    if ($this->atleastonediscount)
-	    {
-	        $pdf->line($this->postotalht, $tab_top, $this->postotalht, $tab_top + $tab_height);
-	    }
-	    if (empty($hidetop))
-	    {
-	        $pdf->SetXY($this->postotalht - 1, $tab_top + 1);
-	        $pdf->MultiCell(30, 2, $outputlangs->transnoentities("TotalHT"), '', 'C');
-	    }
+		if ($this->atleastonediscount)
+		{
+			$pdf->line($this->postotalht, $tab_top, $this->postotalht, $tab_top + $tab_height);
+		}
+		if (empty($hidetop))
+		{
+			$pdf->SetXY($this->postotalht - 1, $tab_top + 1);
+			$pdf->MultiCell(30, 2, $outputlangs->transnoentities("TotalHT"), '', 'C');
+		}
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
@@ -698,68 +698,68 @@ class pdf_standard extends ModelePDFProduct
 	 */
 	protected function _pagehead(&$pdf, $object, $showaddress, $outputlangs, $titlekey = "")
 	{
-	    global $conf, $langs, $hookmanager;
+		global $conf, $langs, $hookmanager;
 
-	    // Load traductions files required by page
+		// Load traductions files required by page
 		$outputlangs->loadLangs(array("main", "propal", "companies", "bills", "orders"));
 
-	    $default_font_size = pdf_getPDFFontSize($outputlangs);
+		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
-	    if ($object->type == 1) $titlekey = 'ServiceSheet';
-	    else $titlekey = 'ProductSheet';
+		if ($object->type == 1) $titlekey = 'ServiceSheet';
+		else $titlekey = 'ProductSheet';
 
-	    pdf_pagehead($pdf, $outputlangs, $this->page_hauteur);
+		pdf_pagehead($pdf, $outputlangs, $this->page_hauteur);
 
-	    // Show Draft Watermark
-	    if ($object->statut == 0 && (!empty($conf->global->COMMANDE_DRAFT_WATERMARK)))
-	    {
-	        pdf_watermark($pdf, $outputlangs, $this->page_hauteur, $this->page_largeur, 'mm', $conf->global->COMMANDE_DRAFT_WATERMARK);
-	    }
+		// Show Draft Watermark
+		if ($object->statut == 0 && (!empty($conf->global->COMMANDE_DRAFT_WATERMARK)))
+		{
+			pdf_watermark($pdf, $outputlangs, $this->page_hauteur, $this->page_largeur, 'mm', $conf->global->COMMANDE_DRAFT_WATERMARK);
+		}
 
-	    $pdf->SetTextColor(0, 0, 60);
-	    $pdf->SetFont('', 'B', $default_font_size + 3);
+		$pdf->SetTextColor(0, 0, 60);
+		$pdf->SetFont('', 'B', $default_font_size + 3);
 
-	    $posy = $this->marge_haute;
-	    $posx = $this->page_largeur - $this->marge_droite - 100;
+		$posy = $this->marge_haute;
+		$posx = $this->page_largeur - $this->marge_droite - 100;
 
-	    $pdf->SetXY($this->marge_gauche, $posy);
+		$pdf->SetXY($this->marge_gauche, $posy);
 
-	    // Logo
-	    $logo = $conf->mycompany->dir_output.'/logos/'.$this->emetteur->logo;
-	    if ($this->emetteur->logo)
-	    {
-	        if (is_readable($logo))
-	        {
-	            $height = pdf_getHeightForLogo($logo);
-	            $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
-	        } else {
-	            $pdf->SetTextColor(200, 0, 0);
-	            $pdf->SetFont('', 'B', $default_font_size - 2);
-	            $pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
-	            $pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
-	        }
-	    } else {
-	        $text = $this->emetteur->name;
-	        $pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
-	    }
+		// Logo
+		$logo = $conf->mycompany->dir_output.'/logos/'.$this->emetteur->logo;
+		if ($this->emetteur->logo)
+		{
+			if (is_readable($logo))
+			{
+				$height = pdf_getHeightForLogo($logo);
+				$pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
+			} else {
+				$pdf->SetTextColor(200, 0, 0);
+				$pdf->SetFont('', 'B', $default_font_size - 2);
+				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
+				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
+			}
+		} else {
+			$text = $this->emetteur->name;
+			$pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
+		}
 
-	    $pdf->SetFont('', 'B', $default_font_size + 3);
-	    $pdf->SetXY($posx, $posy);
-	    $pdf->SetTextColor(0, 0, 60);
-	    $title = $outputlangs->transnoentities($titlekey);
-	    $pdf->MultiCell(100, 3, $title, '', 'R');
+		$pdf->SetFont('', 'B', $default_font_size + 3);
+		$pdf->SetXY($posx, $posy);
+		$pdf->SetTextColor(0, 0, 60);
+		$title = $outputlangs->transnoentities($titlekey);
+		$pdf->MultiCell(100, 3, $title, '', 'R');
 
-	    $pdf->SetFont('', 'B', $default_font_size);
+		$pdf->SetFont('', 'B', $default_font_size);
 
-	    $posy += 5;
-	    $pdf->SetXY($posx, $posy);
-	    $pdf->SetTextColor(0, 0, 60);
-	    $pdf->MultiCell(100, 4, $outputlangs->transnoentities("Ref")." : ".$outputlangs->convToOutputCharset($object->ref), '', 'R');
+		$posy += 5;
+		$pdf->SetXY($posx, $posy);
+		$pdf->SetTextColor(0, 0, 60);
+		$pdf->MultiCell(100, 4, $outputlangs->transnoentities("Ref")." : ".$outputlangs->convToOutputCharset($object->ref), '', 'R');
 
-	    $posy += 1;
-	    $pdf->SetFont('', '', $default_font_size - 1);
+		$posy += 1;
+		$pdf->SetFont('', '', $default_font_size - 1);
 
-	    /*if ($object->ref_client)
+		/*if ($object->ref_client)
 	    {
 	        $posy+=5;
 	        $pdf->SetXY($posx,$posy);
@@ -767,14 +767,14 @@ class pdf_standard extends ModelePDFProduct
 	        $pdf->MultiCell(100, 3, $outputlangs->transnoentities("RefCustomer")." : " . $outputlangs->convToOutputCharset($object->ref_client), '', 'R');
 	    }*/
 
-	    /*$posy+=4;
+		/*$posy+=4;
 	    $pdf->SetXY($posx,$posy);
 	    $pdf->SetTextColor(0,0,60);
 	    $pdf->MultiCell(100, 3, $outputlangs->transnoentities("OrderDate")." : " . dol_print_date($object->date,"%d %b %Y",false,$outputlangs,true), '', 'R');
 	    */
 
-	    // Get contact
-	    /*
+		// Get contact
+		/*
 	    if (!empty($conf->global->DOC_SHOW_FIRST_SALES_REP))
 	    {
 	        $arrayidcontact=$object->getIdContact('internal','SALESREPFOLL');
@@ -789,14 +789,14 @@ class pdf_standard extends ModelePDFProduct
 	        }
 	    }*/
 
-	    $posy += 2;
+		$posy += 2;
 
-	    // Show list of linked objects
-	    $posy = pdf_writeLinkedObjects($pdf, $object, $outputlangs, $posx, $posy, 100, 3, 'R', $default_font_size);
+		// Show list of linked objects
+		$posy = pdf_writeLinkedObjects($pdf, $object, $outputlangs, $posx, $posy, 100, 3, 'R', $default_font_size);
 
-	    if ($showaddress)
-	    {
-	        /*
+		if ($showaddress)
+		{
+			/*
 	        // Sender properties
 	        $carac_emetteur = pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty);
 
@@ -827,25 +827,25 @@ class pdf_standard extends ModelePDFProduct
 	        $pdf->SetFont('','', $default_font_size - 1);
 	        $pdf->MultiCell(80, 4, $carac_emetteur, 0, 'L');
 	        */
-        }
+		}
 
-        $pdf->SetTextColor(0, 0, 0);
-    }
+		$pdf->SetTextColor(0, 0, 0);
+	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
-    /**
-     *  Show footer of page. Need this->emetteur object
-     *
-     *  @param	TCPDF		$pdf     			PDF
-     *  @param	Object		$object				Object to show
-     *  @param	Translate	$outputlangs		Object lang for output
-     *  @param	int			$hidefreetext		1=Hide free text
-     *  @return	int								Return height of bottom margin including footer text
-     */
+	/**
+	 *  Show footer of page. Need this->emetteur object
+	 *
+	 *  @param	TCPDF		$pdf     			PDF
+	 *  @param	Object		$object				Object to show
+	 *  @param	Translate	$outputlangs		Object lang for output
+	 *  @param	int			$hidefreetext		1=Hide free text
+	 *  @return	int								Return height of bottom margin including footer text
+	 */
 	protected function _pagefoot(&$pdf, $object, $outputlangs, $hidefreetext = 0)
-    {
-        global $conf;
-        $showdetails = $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
-        return pdf_pagefoot($pdf, $outputlangs, 'PRODUCT_FREE_TEXT', $this->emetteur, $this->marge_basse, $this->marge_gauche, $this->page_hauteur, $object, $showdetails, $hidefreetext);
-    }
+	{
+		global $conf;
+		$showdetails = $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
+		return pdf_pagefoot($pdf, $outputlangs, 'PRODUCT_FREE_TEXT', $this->emetteur, $this->marge_basse, $this->marge_gauche, $this->page_hauteur, $object, $showdetails, $hidefreetext);
+	}
 }
diff --git a/htdocs/core/modules/product/mod_codeproduct_elephant.php b/htdocs/core/modules/product/mod_codeproduct_elephant.php
index 20943a70703..2580000ca7a 100644
--- a/htdocs/core/modules/product/mod_codeproduct_elephant.php
+++ b/htdocs/core/modules/product/mod_codeproduct_elephant.php
@@ -55,9 +55,9 @@ class mod_codeproduct_elephant extends ModeleProductCode
 	public $code_null; // Code facultatif
 
 	/**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
 	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 
 	/**
@@ -86,14 +86,14 @@ class mod_codeproduct_elephant extends ModeleProductCode
 	}
 
 
-    /**
-     *  Return description of module
-     *
-     *  @param	Translate	$langs		Object langs
-     *  @return string      			Description of module
-     */
-    public function info($langs)
-    {
+	/**
+	 *  Return description of module
+	 *
+	 *  @param	Translate	$langs		Object langs
+	 *  @return string      			Description of module
+	 */
+	public function info($langs)
+	{
 		global $conf, $mc;
 		global $form;
 
@@ -131,7 +131,7 @@ class mod_codeproduct_elephant extends ModeleProductCode
 		$texte .= '</form>';
 
 		return $texte;
-    }
+	}
 
 
 	/**
@@ -142,7 +142,7 @@ class mod_codeproduct_elephant extends ModeleProductCode
 	 * @param	int			$type		Type of third party (1:customer, 2:supplier, -1:autodetect)
 	 * @return	string					Return string example
 	 */
-    public function getExample($langs, $objproduct = 0, $type = -1)
+	public function getExample($langs, $objproduct = 0, $type = -1)
 	{
 		if ($type == 0 || $type == -1)
 		{
@@ -226,7 +226,7 @@ class mod_codeproduct_elephant extends ModeleProductCode
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *   Check if mask/numbering use prefix
 	 *
@@ -234,7 +234,7 @@ class mod_codeproduct_elephant extends ModeleProductCode
 	 */
 	public function verif_prefixIsUsed()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 		$mask = $conf->global->PRODUCT_ELEPHANT_MASK_PRODUCT;
@@ -300,7 +300,7 @@ class mod_codeproduct_elephant extends ModeleProductCode
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Renvoi si un code est pris ou non (par autre tiers)
 	 *
@@ -311,7 +311,7 @@ class mod_codeproduct_elephant extends ModeleProductCode
 	 */
 	public function verif_dispo($db, $code, $product)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$sql = "SELECT ref FROM ".MAIN_DB_PREFIX."product";
 		$sql .= " WHERE ref = '".$db->escape($code)."'";
 		if ($product->id > 0) $sql .= " AND rowid <> ".$product->id;
diff --git a/htdocs/core/modules/product/mod_codeproduct_leopard.php b/htdocs/core/modules/product/mod_codeproduct_leopard.php
index cfdcbcdb404..49a3e65f9b0 100644
--- a/htdocs/core/modules/product/mod_codeproduct_leopard.php
+++ b/htdocs/core/modules/product/mod_codeproduct_leopard.php
@@ -60,9 +60,9 @@ class mod_codeproduct_leopard extends ModeleProductCode
 	public $code_null; // Code facultatif
 
 	/**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
 	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 
 	/**
@@ -85,7 +85,7 @@ class mod_codeproduct_leopard extends ModeleProductCode
 
 
 	/**
-     *  Return description of module
+	 *  Return description of module
 	 *
 	 *  @param	Translate	$langs	Object langs
 	 *  @return string      		Description of module
diff --git a/htdocs/core/modules/product_batch/modules_product_batch.class.php b/htdocs/core/modules/product_batch/modules_product_batch.class.php
index d86cacaedc8..f5ef6ac3dda 100644
--- a/htdocs/core/modules/product_batch/modules_product_batch.class.php
+++ b/htdocs/core/modules/product_batch/modules_product_batch.class.php
@@ -38,30 +38,30 @@
  */
 abstract class ModelePDFProductBatch extends CommonDocGenerator
 {
-    /**
-     * @var string Error code (or message)
-     */
-    public $error = '';
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error = '';
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Return list of active generation modules
-     *
-     *  @param  DoliDB	$db     			Database handler
-     *  @param  integer	$maxfilenamelength  Max length of value to show
-     *  @return	array						List of templates
-     */
-    public static function liste_modeles($db, $maxfilenamelength = 0)
-    {
-        // phpcs:enable
-        global $conf;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Return list of active generation modules
+	 *
+	 *  @param  DoliDB	$db     			Database handler
+	 *  @param  integer	$maxfilenamelength  Max length of value to show
+	 *  @return	array						List of templates
+	 */
+	public static function liste_modeles($db, $maxfilenamelength = 0)
+	{
+		// phpcs:enable
+		global $conf;
 
-        $type = 'product_batch';
-        $list = array();
+		$type = 'product_batch';
+		$list = array();
 
-        include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-        $list = getListOfModels($db, $type, $maxfilenamelength);
-        return $list;
-    }
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+		$list = getListOfModels($db, $type, $maxfilenamelength);
+		return $list;
+	}
 }
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 fe2b217124e..c6e07911ff7 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
@@ -61,15 +61,15 @@ class doc_generic_project_odt extends ModelePDFProjects
 	public $emetteur;
 
 	/**
-     * @var array Minimum version of PHP required by module.
-     * e.g.: PHP ≥ 5.6 = array(5, 6)
-     */
+	 * @var array Minimum version of PHP required by module.
+	 * e.g.: PHP ≥ 5.6 = array(5, 6)
+	 */
 	public $phpmin = array(5, 6);
 
 	/**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
 	public $version = 'dolibarr';
 
 
@@ -117,33 +117,33 @@ class doc_generic_project_odt extends ModelePDFProjects
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Define array with couple substitution key => substitution value
 	 *
 	 * @param   Project			$object             Main object to use as data source
 	 * @param   Translate		$outputlangs        Lang object to use for output
-     * @param   string		    $array_key	        Name of the key for return array
+	 * @param   string		    $array_key	        Name of the key for return array
 	 * @return	array								Array of substitution
 	 */
 	public function get_substitutionarray_object($object, $outputlangs, $array_key = 'object')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 		$resarray = array(
-		    $array_key.'_id'=>$object->id,
-            $array_key.'_ref'=>$object->ref,
-            $array_key.'_title'=>$object->title,
-            $array_key.'_description'=>$object->description,
-            $array_key.'_date_creation'=>dol_print_date($object->date_c, 'day'),
-            $array_key.'_date_modification'=>dol_print_date($object->date_m, 'day'),
-            $array_key.'_date_start'=>dol_print_date($object->date_start, 'day'),
-            $array_key.'_date_end'=>dol_print_date($object->date_end, 'day'),
-            $array_key.'_note_private'=>$object->note_private,
-            $array_key.'_note_public'=>$object->note_public,
-            $array_key.'_public'=>$object->public,
-            $array_key.'_statut'=>$object->getLibStatut()
+			$array_key.'_id'=>$object->id,
+			$array_key.'_ref'=>$object->ref,
+			$array_key.'_title'=>$object->title,
+			$array_key.'_description'=>$object->description,
+			$array_key.'_date_creation'=>dol_print_date($object->date_c, 'day'),
+			$array_key.'_date_modification'=>dol_print_date($object->date_m, 'day'),
+			$array_key.'_date_start'=>dol_print_date($object->date_start, 'day'),
+			$array_key.'_date_end'=>dol_print_date($object->date_end, 'day'),
+			$array_key.'_note_private'=>$object->note_private,
+			$array_key.'_note_public'=>$object->note_public,
+			$array_key.'_public'=>$object->public,
+			$array_key.'_statut'=>$object->getLibStatut()
 		);
 
 		require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
@@ -156,7 +156,7 @@ class doc_generic_project_odt extends ModelePDFProjects
 		return $resarray;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Define array with couple substitution key => substitution value
 	 *
@@ -166,7 +166,7 @@ class doc_generic_project_odt extends ModelePDFProjects
 	 */
 	public function get_substitutionarray_tasks(Task $task, $outputlangs)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 		$resarray = array(
@@ -197,7 +197,7 @@ class doc_generic_project_odt extends ModelePDFProjects
 		return $resarray;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Define array with couple substitution key => substitution value
 	 *
@@ -207,7 +207,7 @@ class doc_generic_project_odt extends ModelePDFProjects
 	 */
 	public function get_substitutionarray_project_contacts($contact, $outputlangs)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 		$pc = 'projcontacts_'; // prefix to avoid typos
 
@@ -255,7 +255,7 @@ class doc_generic_project_odt extends ModelePDFProjects
 		return $ret;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Define array with couple substitution key => substitution value
 	 *
@@ -263,19 +263,19 @@ class doc_generic_project_odt extends ModelePDFProjects
 	 *	@param  Translate		$outputlangs        Lang object to use for output
 	 *  @return	array								Return a substitution array
 	 */
-    public function get_substitutionarray_project_file($file, $outputlangs)
-    {
-        // phpcs:enable
-        global $conf;
+	public function get_substitutionarray_project_file($file, $outputlangs)
+	{
+		// phpcs:enable
+		global $conf;
 
-        return array(
-            'projfile_name'=>$file['name'],
-            'projfile_date'=>dol_print_date($file['date'], 'day'),
-            'projfile_size'=>$file['size']
-        );
-    }
+		return array(
+			'projfile_name'=>$file['name'],
+			'projfile_date'=>dol_print_date($file['date'], 'day'),
+			'projfile_size'=>$file['size']
+		);
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Define array with couple substitution key => substitution value
 	 *
@@ -283,23 +283,23 @@ class doc_generic_project_odt extends ModelePDFProjects
 	 *	@param  Translate		$outputlangs        Lang object to use for output
 	 *  @return	array								Return a substitution array
 	 */
-    public function get_substitutionarray_project_reference($refdetail, $outputlangs)
-    {
-        // phpcs:enable
-        global $conf;
+	public function get_substitutionarray_project_reference($refdetail, $outputlangs)
+	{
+		// phpcs:enable
+		global $conf;
 
-        return array(
-            'projref_type'=>$refdetail['type'],
-            'projref_ref'=>$refdetail['ref'],
-            'projref_date'=>dol_print_date($refdetail['date'], 'day'),
-            'projref_socname'=>$refdetail['socname'],
-            'projref_amountht'=>price($refdetail['amountht'], 0, $outputlangs),
-            'projref_amountttc'=>price($refdetail['amountttc'], 0, $outputlangs),
-            'projref_status'=>$refdetail['status']
-        );
-    }
+		return array(
+			'projref_type'=>$refdetail['type'],
+			'projref_ref'=>$refdetail['ref'],
+			'projref_date'=>dol_print_date($refdetail['date'], 'day'),
+			'projref_socname'=>$refdetail['socname'],
+			'projref_amountht'=>price($refdetail['amountht'], 0, $outputlangs),
+			'projref_amountttc'=>price($refdetail['amountttc'], 0, $outputlangs),
+			'projref_status'=>$refdetail['status']
+		);
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Define array with couple substitution key => substitution value
 	 *
@@ -309,7 +309,7 @@ class doc_generic_project_odt extends ModelePDFProjects
 	 */
 	public function get_substitutionarray_tasksressource($taskressource, $outputlangs)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 		//dol_syslog(get_class($this).'::get_substitutionarray_tasksressource taskressource='.var_export($taskressource,true),LOG_DEBUG);
 		return array(
@@ -323,7 +323,7 @@ class doc_generic_project_odt extends ModelePDFProjects
 		);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Define array with couple substitution key => substitution value
 	 *
@@ -333,7 +333,7 @@ class doc_generic_project_odt extends ModelePDFProjects
 	 */
 	public function get_substitutionarray_taskstime($tasktime, $outputlangs)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 		return array(
@@ -352,7 +352,7 @@ class doc_generic_project_odt extends ModelePDFProjects
 		);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Define array with couple substitution key => substitution value
 	 *
@@ -362,7 +362,7 @@ class doc_generic_project_odt extends ModelePDFProjects
 	 */
 	public function get_substitutionarray_task_file($file, $outputlangs)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 		return array(
@@ -384,7 +384,7 @@ class doc_generic_project_odt extends ModelePDFProjects
 		global $conf, $langs;
 
 		// Load translation files required by the page
-        $langs->loadLangs(array("companies", "errors"));
+		$langs->loadLangs(array("companies", "errors"));
 
 		$form = new Form($this->db);
 
@@ -443,7 +443,7 @@ class doc_generic_project_odt extends ModelePDFProjects
    			$texte .= '<div id="div_'.get_class($this).'" class="hidden">';
    			foreach ($listoffiles as $file)
    			{
-                $texte .= $file['name'].'<br>';
+				$texte .= $file['name'].'<br>';
    			}
    			$texte .= '</div>';
 		}
@@ -461,7 +461,7 @@ class doc_generic_project_odt extends ModelePDFProjects
 		return $texte;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Function to build a document on disk using the generic odt module.
 	 *
@@ -472,7 +472,7 @@ class doc_generic_project_odt extends ModelePDFProjects
 	 */
 	public function write_file($object, $outputlangs, $srctemplatepath)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $user, $langs, $conf, $mysoc, $hookmanager;
 
 		if (empty($srctemplatepath))
@@ -512,6 +512,8 @@ class doc_generic_project_odt extends ModelePDFProjects
 				}
 			}
 
+			$object->fetch_thirdparty();
+
 			$dir = $conf->projet->dir_output;
 			$objectref = dol_sanitizeFileName($object->ref);
 			if (!preg_match('/specimen/i', $objectref)) $dir .= "/".$objectref;
@@ -539,8 +541,8 @@ class doc_generic_project_odt extends ModelePDFProjects
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
 				if (!empty($conf->global->MAIN_DOC_USE_TIMING))
 				{
-				    $format = $conf->global->MAIN_DOC_USE_TIMING;
-				    if ($format == '1') $format = '%Y%m%d%H%M%S';
+					$format = $conf->global->MAIN_DOC_USE_TIMING;
+					if ($format == '1') $format = '%Y%m%d%H%M%S';
 					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
 				} else {
 					$filename = $newfiletmp.'.'.$newfileformat;
@@ -566,8 +568,8 @@ class doc_generic_project_odt extends ModelePDFProjects
 				$contactobject = null;
 				if (!empty($usecontact))
 				{
-        			// if we have a PROJECTLEADER contact and we dont use it as recipient we store the contact object for later use
-        			$contactobject = $object->contact;
+					// if we have a PROJECTLEADER contact and we dont use it as recipient we store the contact object for later use
+					$contactobject = $object->contact;
 				}
 
 				$socobject = $object->thirdparty;
@@ -585,7 +587,7 @@ class doc_generic_project_odt extends ModelePDFProjects
 				// Open and load template
 				require_once ODTPHP_PATH.'odf.php';
 				try {
-                    $odfHandler = new odf(
+					$odfHandler = new odf(
 						$srctemplatepath,
 						array(
 						'PATH_TO_TMP'	  => $conf->projet->dir_temp,
@@ -638,7 +640,7 @@ class doc_generic_project_odt extends ModelePDFProjects
 						}
 					} catch (OdfException $e)
 					{
-                        dol_syslog($e->getMessage(), LOG_INFO);
+						dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
 
@@ -1143,7 +1145,7 @@ class doc_generic_project_odt extends ModelePDFProjects
 					try {
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
 					} catch (OdfException $e) {
-                        dol_syslog($e->getMessage(), LOG_INFO);
+						dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
 
@@ -1165,7 +1167,7 @@ class doc_generic_project_odt extends ModelePDFProjects
 						$odfHandler->saveToDisk($file);
 					} catch (Exception $e) {
 						$this->error = $e->getMessage();
-                        dol_syslog($e->getMessage(), LOG_INFO);
+						dol_syslog($e->getMessage(), LOG_INFO);
 						return -1;
 					}
 				}
diff --git a/htdocs/core/modules/project/mod_project_universal.php b/htdocs/core/modules/project/mod_project_universal.php
index f833ec280d2..7c7ed786d92 100644
--- a/htdocs/core/modules/project/mod_project_universal.php
+++ b/htdocs/core/modules/project/mod_project_universal.php
@@ -31,15 +31,15 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/project/modules_project.php';
 class mod_project_universal extends ModeleNumRefProjects
 {
 	/**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
 	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 
 	/**
-     * @var string Error code (or message)
-     */
-    public $error = '';
+	 * @var string Error code (or message)
+	 */
+	public $error = '';
 
 	/**
 	 * @var string Nom du modele
@@ -54,17 +54,17 @@ class mod_project_universal extends ModeleNumRefProjects
 	public $name = 'Universal';
 
 
-    /**
-     *  Returns the description of the numbering model
-     *
-     *  @return     string      Texte descripif
-     */
-    public function info()
-    {
-    	global $conf, $langs;
+	/**
+	 *  Returns the description of the numbering model
+	 *
+	 *  @return     string      Texte descripif
+	 */
+	public function info()
+	{
+		global $conf, $langs;
 
 		// Load translation files required by the page
-        $langs->loadLangs(array("projects", "admin"));
+		$langs->loadLangs(array("projects", "admin"));
 
 		$form = new Form($this->db);
 
@@ -93,20 +93,20 @@ class mod_project_universal extends ModeleNumRefProjects
 		$texte .= '</form>';
 
 		return $texte;
-    }
+	}
 
-    /**
-     *  Return an example of numbering
-     *
-     *  @return     string      Example
-     */
-    public function getExample()
-    {
-    	global $conf, $langs, $mysoc;
+	/**
+	 *  Return an example of numbering
+	 *
+	 *  @return     string      Example
+	 */
+	public function getExample()
+	{
+		global $conf, $langs, $mysoc;
 
-    	$old_code_client = $mysoc->code_client;
-    	$mysoc->code_client = 'CCCCCCCCCC';
-    	$numExample = $this->getNextValue($mysoc, '');
+		$old_code_client = $mysoc->code_client;
+		$mysoc->code_client = 'CCCCCCCCCC';
+		$numExample = $this->getNextValue($mysoc, '');
 		$mysoc->code_client = $old_code_client;
 
 		if (!$numExample)
@@ -114,17 +114,17 @@ class mod_project_universal extends ModeleNumRefProjects
 			$numExample = $langs->trans('NotConfigured');
 		}
 		return $numExample;
-    }
+	}
 
-    /**
-     *  Return next value
-     *
-     *  @param	Societe		$objsoc		Object third party
-     *  @param   Project		$project	Object project
-     *  @return  string					Value if OK, 0 if KO
-     */
-    public function getNextValue($objsoc, $project)
-    {
+	/**
+	 *  Return next value
+	 *
+	 *  @param	Societe		$objsoc		Object third party
+	 *  @param   Project		$project	Object project
+	 *  @return  string					Value if OK, 0 if KO
+	 */
+	public function getNextValue($objsoc, $project)
+	{
 		global $db, $conf;
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
@@ -145,17 +145,17 @@ class mod_project_universal extends ModeleNumRefProjects
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Return next reference not yet used as a reference
-     *
-     *  @param	Societe		$objsoc     Object third party
-     *  @param  Project		$project	Object project
-     *  @return string      			Next not used reference
-     */
-    public function project_get_num($objsoc = 0, $project = '')
-    {
-        // phpcs:enable
-        return $this->getNextValue($objsoc, $project);
-    }
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Return next reference not yet used as a reference
+	 *
+	 *  @param	Societe		$objsoc     Object third party
+	 *  @param  Project		$project	Object project
+	 *  @return string      			Next not used reference
+	 */
+	public function project_get_num($objsoc = 0, $project = '')
+	{
+		// phpcs:enable
+		return $this->getNextValue($objsoc, $project);
+	}
 }
diff --git a/htdocs/core/modules/project/modules_project.php b/htdocs/core/modules/project/modules_project.php
index 250e760c9f6..72a86ba7ca4 100644
--- a/htdocs/core/modules/project/modules_project.php
+++ b/htdocs/core/modules/project/modules_project.php
@@ -37,17 +37,17 @@ abstract class ModelePDFProjects extends CommonDocGenerator
 	public $error = '';
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
 	 *  Return list of active generation modules
 	 *
-     *  @param  DoliDB	$db     			Database handler
-     *  @param  integer	$maxfilenamelength  Max length of value to show
-     *  @return	array						List of templates
-     */
-    public static function liste_modeles($db, $maxfilenamelength = 0)
+	 *  @param  DoliDB	$db     			Database handler
+	 *  @param  integer	$maxfilenamelength  Max length of value to show
+	 *  @return	array						List of templates
+	 */
+	public static function liste_modeles($db, $maxfilenamelength = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 		$type = 'project';
@@ -77,7 +77,7 @@ abstract class ModeleNumRefProjects
 	 *
 	 *  @return		boolean     true if module can be used
 	 */
-    public function isEnabled()
+	public function isEnabled()
 	{
 		return true;
 	}
@@ -87,7 +87,7 @@ abstract class ModeleNumRefProjects
 	 *
 	 *  @return     string      Texte descripif
 	 */
-    public function info()
+	public function info()
 	{
 		global $langs;
 		$langs->load("projects");
@@ -99,7 +99,7 @@ abstract class ModeleNumRefProjects
 	 *
 	 *  @return     string      Example
 	 */
-    public function getExample()
+	public function getExample()
 	{
 		global $langs;
 		$langs->load("projects");
@@ -112,7 +112,7 @@ abstract class ModeleNumRefProjects
 	 *
 	 *  @return     boolean     false if conflict, true if ok
 	 */
-    public function canBeActivated()
+	public function canBeActivated()
 	{
 		return true;
 	}
@@ -124,7 +124,7 @@ abstract class ModeleNumRefProjects
 	 *	@param	Project		$project	Object project
 	 *	@return	string					Valeur
 	 */
-    public function getNextValue($objsoc, $project)
+	public function getNextValue($objsoc, $project)
 	{
 		global $langs;
 		return $langs->trans("NotAvailable");
@@ -135,8 +135,8 @@ abstract class ModeleNumRefProjects
 	 *
 	 *  @return     string      Valeur
 	 */
-    public function getVersion()
-    {
+	public function getVersion()
+	{
 		global $langs;
 		$langs->load("admin");
 
@@ -145,5 +145,5 @@ abstract class ModeleNumRefProjects
 		elseif ($this->version == 'dolibarr') return DOL_VERSION;
 		elseif ($this->version) return $this->version;
 		else return $langs->trans("NotAvailable");
-    }
+	}
 }
diff --git a/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php b/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
index 70cffdf9032..edd777901ec 100644
--- a/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
+++ b/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
@@ -62,15 +62,15 @@ class doc_generic_task_odt extends ModelePDFTask
 	public $emetteur;
 
 	/**
-     * @var array Minimum version of PHP required by module.
-     * e.g.: PHP ≥ 5.6 = array(5, 6)
-     */
+	 * @var array Minimum version of PHP required by module.
+	 * e.g.: PHP ≥ 5.6 = array(5, 6)
+	 */
 	public $phpmin = array(5, 6);
 
 	/**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
 	public $version = 'dolibarr';
 
 
@@ -79,12 +79,12 @@ class doc_generic_task_odt extends ModelePDFTask
 	 *
 	 *  @param		DoliDB		$db      Database handler
 	 */
-    public function __construct($db)
+	public function __construct($db)
 	{
 		global $conf, $langs, $mysoc;
 
 		// Load translation files required by the page
-        $langs->loadLangs(array("main", "companies"));
+		$langs->loadLangs(array("main", "companies"));
 
 		$this->db = $db;
 		$this->name = "ODT templates";
@@ -118,33 +118,33 @@ class doc_generic_task_odt extends ModelePDFTask
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Define array with couple substitution key => substitution value
 	 *
 	 * @param   Project			$object             Main object to use as data source
 	 * @param   Translate		$outputlangs        Lang object to use for output
-     * @param   string		    $array_key	        Name of the key for return array
+	 * @param   string		    $array_key	        Name of the key for return array
 	 * @return	array								Array of substitution
 	 */
 	public function get_substitutionarray_object($object, $outputlangs, $array_key = 'object')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $extrafields;
 
 		$resarray = array(
-            $array_key.'_id'=>$object->id,
-            $array_key.'_ref'=>$object->ref,
-            $array_key.'_title'=>$object->title,
-            $array_key.'_description'=>$object->description,
-            $array_key.'_date_creation'=>dol_print_date($object->date_c, 'day'),
-            $array_key.'_date_modification'=>dol_print_date($object->date_m, 'day'),
-            $array_key.'_date_start'=>dol_print_date($object->date_start, 'day'),
-            $array_key.'_date_end'=>dol_print_date($object->date_end, 'day'),
-            $array_key.'_note_private'=>$object->note_private,
-            $array_key.'_note_public'=>$object->note_public,
-            $array_key.'_public'=>$object->public,
-            $array_key.'_statut'=>$object->getLibStatut()
+			$array_key.'_id'=>$object->id,
+			$array_key.'_ref'=>$object->ref,
+			$array_key.'_title'=>$object->title,
+			$array_key.'_description'=>$object->description,
+			$array_key.'_date_creation'=>dol_print_date($object->date_c, 'day'),
+			$array_key.'_date_modification'=>dol_print_date($object->date_m, 'day'),
+			$array_key.'_date_start'=>dol_print_date($object->date_start, 'day'),
+			$array_key.'_date_end'=>dol_print_date($object->date_end, 'day'),
+			$array_key.'_note_private'=>$object->note_private,
+			$array_key.'_note_public'=>$object->note_public,
+			$array_key.'_public'=>$object->public,
+			$array_key.'_statut'=>$object->getLibStatut()
 		);
 
 		// Retrieve extrafields
@@ -158,7 +158,7 @@ class doc_generic_task_odt extends ModelePDFTask
 		return $resarray;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Define array with couple substitution key => substitution value
 	 *
@@ -167,43 +167,43 @@ class doc_generic_task_odt extends ModelePDFTask
 	 *  @param  string		    $array_key	        Name of the key for return array
 	 *  @return	array								Return a substitution array
 	 */
-    public function get_substitutionarray_tasks($task, $outputlangs, $array_key = 'task')
-    {
-        // phpcs:enable
-        global $conf, $extrafields;
+	public function get_substitutionarray_tasks($task, $outputlangs, $array_key = 'task')
+	{
+		// phpcs:enable
+		global $conf, $extrafields;
 
-	    $resarray = array(
-            'task_ref'=>$task->ref,
-            'task_fk_project'=>$task->fk_project,
-            'task_projectref'=>$task->projectref,
-            'task_projectlabel'=>$task->projectlabel,
-            'task_label'=>$task->label,
-            'task_description'=>$task->description,
-            'task_fk_parent'=>$task->fk_parent,
+		$resarray = array(
+			'task_ref'=>$task->ref,
+			'task_fk_project'=>$task->fk_project,
+			'task_projectref'=>$task->projectref,
+			'task_projectlabel'=>$task->projectlabel,
+			'task_label'=>$task->label,
+			'task_description'=>$task->description,
+			'task_fk_parent'=>$task->fk_parent,
 			'task_duration'=>$task->duration_effective,
-            'task_duration_formated'=>convertSecondToTime($task->duration_effective, 'allhourmin'),
-            'task_planned_workload'=>$task->planned_workload,
-            'task_planned_workload_formated'=>convertSecondToTime($task->planned_workload, 'allhourmin'),
-            'task_progress'=>$task->progress,
-            'task_public'=>$task->public,
-            'task_date_start'=>dol_print_date($task->date_start, 'day'),
-            'task_date_end'=>dol_print_date($task->date_end, 'day'),
-            'task_note_private'=>$task->note_private,
-            'task_note_public'=>$task->note_public
-        );
+			'task_duration_formated'=>convertSecondToTime($task->duration_effective, 'allhourmin'),
+			'task_planned_workload'=>$task->planned_workload,
+			'task_planned_workload_formated'=>convertSecondToTime($task->planned_workload, 'allhourmin'),
+			'task_progress'=>$task->progress,
+			'task_public'=>$task->public,
+			'task_date_start'=>dol_print_date($task->date_start, 'day'),
+			'task_date_end'=>dol_print_date($task->date_end, 'day'),
+			'task_note_private'=>$task->note_private,
+			'task_note_public'=>$task->note_public
+		);
 
-	    // Retrieve extrafields
-	    if (is_array($task->array_options) && count($task->array_options))
-	    {
-		    $task->fetch_optionals();
+		// Retrieve extrafields
+		if (is_array($task->array_options) && count($task->array_options))
+		{
+			$task->fetch_optionals();
 
-		    $resarray = $this->fill_substitutionarray_with_extrafields($task, $resarray, $extrafields, $array_key, $outputlangs);
-	    }
+			$resarray = $this->fill_substitutionarray_with_extrafields($task, $resarray, $extrafields, $array_key, $outputlangs);
+		}
 
-	    return $resarray;
-    }
+		return $resarray;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Define array with couple substitution key => substitution value
 	 *
@@ -213,7 +213,7 @@ class doc_generic_task_odt extends ModelePDFTask
 	 */
 	public function get_substitutionarray_project_contacts($contact, $outputlangs)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 		return array(
@@ -228,7 +228,7 @@ class doc_generic_task_odt extends ModelePDFTask
 		);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Define array with couple substitution key => substitution value
 	 *
@@ -238,7 +238,7 @@ class doc_generic_task_odt extends ModelePDFTask
 	 */
 	public function get_substitutionarray_project_file($file, $outputlangs)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 		return array(
@@ -248,7 +248,7 @@ class doc_generic_task_odt extends ModelePDFTask
 		);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Define array with couple substitution key => substitution value
 	 *
@@ -258,7 +258,7 @@ class doc_generic_task_odt extends ModelePDFTask
 	 */
 	public function get_substitutionarray_project_reference($refdetail, $outputlangs)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 		return array(
@@ -272,7 +272,7 @@ class doc_generic_task_odt extends ModelePDFTask
 		);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Define array with couple substitution key => substitution value
 	 *
@@ -282,7 +282,7 @@ class doc_generic_task_odt extends ModelePDFTask
 	 */
 	public function get_substitutionarray_tasksressource($taskressource, $outputlangs)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 		//dol_syslog(get_class($this).'::get_substitutionarray_tasksressource taskressource='.var_export($taskressource,true),LOG_DEBUG);
 		return array(
@@ -296,7 +296,7 @@ class doc_generic_task_odt extends ModelePDFTask
 		);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Define array with couple substitution key => substitution value
 	 *
@@ -306,7 +306,7 @@ class doc_generic_task_odt extends ModelePDFTask
 	 */
 	public function get_substitutionarray_taskstime($tasktime, $outputlangs)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 		return array(
@@ -321,7 +321,7 @@ class doc_generic_task_odt extends ModelePDFTask
 		);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Define array with couple substitution key => substitution value
 	 *
@@ -331,7 +331,7 @@ class doc_generic_task_odt extends ModelePDFTask
 	 */
 	public function get_substitutionarray_task_file($file, $outputlangs)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 		return array(
@@ -353,7 +353,7 @@ class doc_generic_task_odt extends ModelePDFTask
 		global $conf, $langs;
 
 		// Load translation files required by the page
-        $langs->loadLangs(array("errors", "companies"));
+		$langs->loadLangs(array("errors", "companies"));
 
 		$form = new Form($this->db);
 
@@ -412,7 +412,7 @@ class doc_generic_task_odt extends ModelePDFTask
    			$texte .= '<div id="div_'.get_class($this).'" class="hidden">';
    			foreach ($listoffiles as $file)
    			{
-                $texte .= $file['name'].'<br>';
+				$texte .= $file['name'].'<br>';
    			}
    			$texte .= '</div>';
 		}
@@ -430,7 +430,7 @@ class doc_generic_task_odt extends ModelePDFTask
 		return $texte;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Function to build a document on disk using the generic odt module.
 	 *
@@ -441,7 +441,7 @@ class doc_generic_task_odt extends ModelePDFTask
 	 */
 	public function write_file($object, $outputlangs, $srctemplatepath)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $user, $langs, $conf, $mysoc, $hookmanager;
 
 		if (empty($srctemplatepath))
@@ -522,7 +522,7 @@ class doc_generic_task_odt extends ModelePDFTask
 				// Open and load template
 				require_once ODTPHP_PATH.'odf.php';
 				try {
-                    $odfHandler = new odf(
+					$odfHandler = new odf(
 						$srctemplatepath,
 						array(
 						'PATH_TO_TMP'	  => $conf->projet->dir_temp,
@@ -567,7 +567,7 @@ class doc_generic_task_odt extends ModelePDFTask
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
 					} catch (OdfException $e) {
-                        dol_syslog($e->getMessage(), LOG_INFO);
+						dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
 
@@ -828,7 +828,7 @@ class doc_generic_task_odt extends ModelePDFTask
 						$odfHandler->exportAsAttachedPDF($file);
 					} catch (Exception $e) {
 						$this->error = $e->getMessage();
-                        dol_syslog($e->getMessage(), LOG_INFO);
+						dol_syslog($e->getMessage(), LOG_INFO);
 						return -1;
 					}
 				} else {
@@ -836,7 +836,7 @@ class doc_generic_task_odt extends ModelePDFTask
 						$odfHandler->saveToDisk($file);
 					} catch (Exception $e) {
 						$this->error = $e->getMessage();
-                        dol_syslog($e->getMessage(), LOG_INFO);
+						dol_syslog($e->getMessage(), LOG_INFO);
 						return -1;
 					}
 				}
diff --git a/htdocs/core/modules/project/task/mod_task_universal.php b/htdocs/core/modules/project/task/mod_task_universal.php
index 0a15a99dfc0..011ac381254 100644
--- a/htdocs/core/modules/project/task/mod_task_universal.php
+++ b/htdocs/core/modules/project/task/mod_task_universal.php
@@ -31,15 +31,15 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/project/task/modules_task.php';
 class mod_task_universal extends ModeleNumRefTask
 {
 	/**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
 	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 
 	/**
-     * @var string Error code (or message)
-     */
-    public $error = '';
+	 * @var string Error code (or message)
+	 */
+	public $error = '';
 
 	/**
 	 * @var string
@@ -54,17 +54,17 @@ class mod_task_universal extends ModeleNumRefTask
 	public $name = 'Universal';
 
 
-    /**
-     *  Returns the description of the numbering model
-     *
-     *  @return     string      Texte descripif
-     */
-    public function info()
-    {
-    	global $conf, $langs, $db;
+	/**
+	 *  Returns the description of the numbering model
+	 *
+	 *  @return     string      Texte descripif
+	 */
+	public function info()
+	{
+		global $conf, $langs, $db;
 
 		// Load translation files required by the page
-        $langs->loadLangs(array("projects", "admin"));
+		$langs->loadLangs(array("projects", "admin"));
 
 		$form = new Form($db);
 
@@ -93,37 +93,37 @@ class mod_task_universal extends ModeleNumRefTask
 		$texte .= '</form>';
 
 		return $texte;
-    }
+	}
 
-    /**
-     *  Return an example of numbering
-     *
-     *  @return     string      Example
-     */
-    public function getExample()
-    {
-    	global $conf, $langs, $mysoc;
+	/**
+	 *  Return an example of numbering
+	 *
+	 *  @return     string      Example
+	 */
+	public function getExample()
+	{
+		global $conf, $langs, $mysoc;
 
-    	$old_code_client = $mysoc->code_client;
-    	$mysoc->code_client = 'CCCCCCCCCC';
-    	$numExample = $this->getNextValue($mysoc, '');
+		$old_code_client = $mysoc->code_client;
+		$mysoc->code_client = 'CCCCCCCCCC';
+		$numExample = $this->getNextValue($mysoc, '');
 		$mysoc->code_client = $old_code_client;
 
 		if (!$numExample) {
 			$numExample = $langs->trans('NotConfigured');
 		}
 		return $numExample;
-    }
+	}
 
-    /**
-     *  Return next value
-     *
-     *  @param	Societe		$objsoc		Object third party
-     *  @param   Task		$object	    Object task
-     *  @return  string					Value if OK, 0 if KO
-     */
-    public function getNextValue($objsoc, $object)
-    {
+	/**
+	 *  Return next value
+	 *
+	 *  @param	Societe		$objsoc		Object third party
+	 *  @param   Task		$object	    Object task
+	 *  @return  string					Value if OK, 0 if KO
+	 */
+	public function getNextValue($objsoc, $object)
+	{
 		global $db, $conf;
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
@@ -143,17 +143,17 @@ class mod_task_universal extends ModeleNumRefTask
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Return next reference not yet used as a reference
-     *
-     *  @param	Societe		$objsoc     Object third party
-     *  @param  Task		$object	    Object task
-     *  @return string      			Next not used reference
-     */
-    public function project_get_num($objsoc = 0, $object = '')
-    {
-        // phpcs:enable
-        return $this->getNextValue($objsoc, $object);
-    }
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Return next reference not yet used as a reference
+	 *
+	 *  @param	Societe		$objsoc     Object third party
+	 *  @param  Task		$object	    Object task
+	 *  @return string      			Next not used reference
+	 */
+	public function project_get_num($objsoc = 0, $object = '')
+	{
+		// phpcs:enable
+		return $this->getNextValue($objsoc, $object);
+	}
 }
diff --git a/htdocs/core/modules/project/task/modules_task.php b/htdocs/core/modules/project/task/modules_task.php
index 4bf0a5f6bb8..2600538f273 100644
--- a/htdocs/core/modules/project/task/modules_task.php
+++ b/htdocs/core/modules/project/task/modules_task.php
@@ -38,17 +38,17 @@ abstract class ModelePDFTask extends CommonDocGenerator
 	public $error = '';
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return list of active generation modules
 	 *
-     *  @param	DoliDB	$db     			Database handler
-     *  @param  integer	$maxfilenamelength  Max length of value to show
-     *  @return	array						List of templates
-     */
-    public static function liste_modeles($db, $maxfilenamelength = 0)
+	 *  @param	DoliDB	$db     			Database handler
+	 *  @param  integer	$maxfilenamelength  Max length of value to show
+	 *  @return	array						List of templates
+	 */
+	public static function liste_modeles($db, $maxfilenamelength = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 		$type = 'project_task';
@@ -78,7 +78,7 @@ abstract class ModeleNumRefTask
 	 *
 	 *  @return		boolean     true if module can be used
 	 */
-    public function isEnabled()
+	public function isEnabled()
 	{
 		return true;
 	}
@@ -88,7 +88,7 @@ abstract class ModeleNumRefTask
 	 *
 	 *  @return     string      Texte descripif
 	 */
-    public function info()
+	public function info()
 	{
 		global $langs;
 		$langs->load("projects");
@@ -100,7 +100,7 @@ abstract class ModeleNumRefTask
 	 *
 	 *  @return     string      Example
 	 */
-    public function getExample()
+	public function getExample()
 	{
 		global $langs;
 		$langs->load("projects");
@@ -113,7 +113,7 @@ abstract class ModeleNumRefTask
 	 *
 	 *  @return     boolean     false if conflict, true if ok
 	 */
-    public function canBeActivated()
+	public function canBeActivated()
 	{
 		return true;
 	}
@@ -125,7 +125,7 @@ abstract class ModeleNumRefTask
 	 *	@param	Project		$project	Object project
 	 *	@return	string					Valeur
 	 */
-    public function getNextValue($objsoc, $project)
+	public function getNextValue($objsoc, $project)
 	{
 		global $langs;
 		return $langs->trans("NotAvailable");
@@ -136,7 +136,7 @@ abstract class ModeleNumRefTask
 	 *
 	 *  @return     string      Valeur
 	 */
-    public function getVersion()
+	public function getVersion()
 	{
 		global $langs;
 		$langs->load("admin");
diff --git a/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php b/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
index 59e0e27b677..59df720269b 100644
--- a/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
+++ b/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
@@ -38,21 +38,21 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/doc.lib.php';
  */
 class doc_generic_proposal_odt extends ModelePDFPropales
 {
-    /**
-     * @var Societe Issuer object that emits
-     */
-    public $emetteur;
+	/**
+	 * @var Societe Issuer object that emits
+	 */
+	public $emetteur;
 
 	/**
-     * @var array Minimum version of PHP required by module.
-     * e.g.: PHP ≥ 5.6 = array(5, 6)
-     */
+	 * @var array Minimum version of PHP required by module.
+	 * e.g.: PHP ≥ 5.6 = array(5, 6)
+	 */
 	public $phpmin = array(5, 6);
 
-    /**
-     * @var string Dolibarr version of the loaded document
-     */
-    public $version = 'dolibarr';
+	/**
+	 * @var string Dolibarr version of the loaded document
+	 */
+	public $version = 'dolibarr';
 
 
 	/**
@@ -65,7 +65,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 		global $conf, $langs, $mysoc;
 
 		// Load translation files required by the page
-        $langs->loadLangs(array("main", "companies"));
+		$langs->loadLangs(array("main", "companies"));
 
 		$this->db = $db;
 		$this->name = "ODT templates";
@@ -110,7 +110,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 		global $conf, $langs;
 
 		// Load translation files required by the page
-        $langs->loadLangs(array("errors", "companies"));
+		$langs->loadLangs(array("errors", "companies"));
 
 		$form = new Form($this->db);
 
@@ -175,7 +175,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
    			$texte .= '<div id="div_'.get_class($this).'" class="hidden">';
    			foreach ($listoffiles as $file)
    			{
-                $texte .= $file['name'].'<br>';
+				$texte .= $file['name'].'<br>';
    			}
    			$texte .= '</div>';
 
@@ -204,11 +204,11 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 				$texte .= '</table>';
 			}
 		}
-        // Add input to upload a new template file.
-        $texte .= '<div>'.$langs->trans("UploadNewTemplate").' <input type="file" name="uploadfile">';
-        $texte .= '<input type="hidden" value="PROPALE_ADDON_PDF_ODT_PATH" name="keyforuploaddir">';
-        $texte .= '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Upload")).'" name="upload">';
-        $texte .= '</div>';
+		// Add input to upload a new template file.
+		$texte .= '<div>'.$langs->trans("UploadNewTemplate").' <input type="file" name="uploadfile">';
+		$texte .= '<input type="hidden" value="PROPALE_ADDON_PDF_ODT_PATH" name="keyforuploaddir">';
+		$texte .= '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Upload")).'" name="upload">';
+		$texte .= '</div>';
 		$texte .= '</td>';
 
 		$texte .= '<td rowspan="2" class="tdtop hideonsmartphone">';
@@ -222,7 +222,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 		return $texte;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Function to build a document on disk using the generic odt module.
 	 *
@@ -236,7 +236,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 	 */
 	public function write_file($object, $outputlangs, $srctemplatepath, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $user, $langs, $conf, $mysoc, $hookmanager;
 
 		if (empty($srctemplatepath))
@@ -276,6 +276,8 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 				}
 			}
 
+			$object->fetch_thirdparty();
+
 			$dir = $conf->propal->multidir_output[$object->entity];
 			$objectref = dol_sanitizeFileName($object->ref);
 			if (!preg_match('/specimen/i', $objectref)) $dir .= "/".$objectref;
@@ -304,8 +306,8 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
 				if (!empty($conf->global->MAIN_DOC_USE_TIMING))
 				{
-				    $format = $conf->global->MAIN_DOC_USE_TIMING;
-				    if ($format == '1') $format = '%Y%m%d%H%M%S';
+					$format = $conf->global->MAIN_DOC_USE_TIMING;
+					if ($format == '1') $format = '%Y%m%d%H%M%S';
 					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
 				} else {
 					$filename = $newfiletmp.'.'.$newfileformat;
@@ -335,10 +337,10 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 					// On peut utiliser le nom de la societe du contact
 					if (!empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socobject = $object->contact;
 					else {
-                        $socobject = $object->thirdparty;
-                        // if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
-                        $contactobject = $object->contact;
-                    }
+						$socobject = $object->thirdparty;
+						// if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
+						$contactobject = $object->contact;
+					}
 				} else {
 					$socobject = $object->thirdparty;
 				}
@@ -348,7 +350,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 				'__FROM_EMAIL__' => $this->emetteur->email,
 				'__TOTAL_TTC__' => $object->total_ttc,
 				'__TOTAL_HT__' => $object->total_ht,
-				'__TOTAL_VAT__' => $object->total_vat
+				'__TOTAL_VAT__' => $object->total_tva
 				);
 				complete_substitutions_array($substitutionarray, $langs, $object);
 				// Call the ODTSubstitution hook
@@ -366,7 +368,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 				// Open and load template
 				require_once ODTPHP_PATH.'odf.php';
 				try {
-                    $odfHandler = new odf(
+					$odfHandler = new odf(
 						$srctemplatepath,
 						array(
 						'PATH_TO_TMP'	  => $conf->propal->multidir_temp[$object->entity],
@@ -429,7 +431,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 						}
 					} catch (OdfException $e)
 					{
-                        dol_syslog($e->getMessage(), LOG_INFO);
+						dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
 				// Replace tags of lines
@@ -485,7 +487,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
 					} catch (OdfException $e)
 					{
-                        dol_syslog($e->getMessage(), LOG_INFO);
+						dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
 
@@ -499,15 +501,15 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 						$odfHandler->exportAsAttachedPDF($file);
 					} catch (Exception $e) {
 						$this->error = $e->getMessage();
-                        dol_syslog($e->getMessage(), LOG_INFO);
+						dol_syslog($e->getMessage(), LOG_INFO);
 						return -1;
 					}
 				} else {
 					try {
-					    $odfHandler->saveToDisk($file);
+						$odfHandler->saveToDisk($file);
 					} catch (Exception $e) {
 						$this->error = $e->getMessage();
-                        dol_syslog($e->getMessage(), LOG_INFO);
+						dol_syslog($e->getMessage(), LOG_INFO);
 						return -1;
 					}
 				}
diff --git a/htdocs/core/modules/propale/mod_propale_saphir.php b/htdocs/core/modules/propale/mod_propale_saphir.php
index 9c8ca9ffa24..4a2bb721591 100644
--- a/htdocs/core/modules/propale/mod_propale_saphir.php
+++ b/htdocs/core/modules/propale/mod_propale_saphir.php
@@ -34,15 +34,15 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/propale/modules_propale.php';
 class mod_propale_saphir extends ModeleNumRefPropales
 {
 	/**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
 	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 
 	/**
-     * @var string Error code (or message)
-     */
-    public $error = '';
+	 * @var string Error code (or message)
+	 */
+	public $error = '';
 
 	/**
 	 * @var string Nom du modele
@@ -57,14 +57,14 @@ class mod_propale_saphir extends ModeleNumRefPropales
 	public $name = 'Saphir';
 
 
-    /**
-     *  Return description of module
-     *
-     *  @return     string      Texte descripif
-     */
+	/**
+	 *  Return description of module
+	 *
+	 *  @return     string      Texte descripif
+	 */
 	public function info()
-    {
-    	global $conf, $langs, $db;
+	{
+		global $conf, $langs, $db;
 
 		$langs->load("bills");
 
@@ -95,22 +95,22 @@ class mod_propale_saphir extends ModeleNumRefPropales
 		$texte .= '</form>';
 
 		return $texte;
-    }
+	}
 
-    /**
-     *  Return an example of numbering
-     *
-     *  @return     string      Example
-     */
-    public function getExample()
-    {
-     	global $conf, $langs, $mysoc;
+	/**
+	 *  Return an example of numbering
+	 *
+	 *  @return     string      Example
+	 */
+	public function getExample()
+	{
+	 	global $conf, $langs, $mysoc;
 
-    	$old_code_client = $mysoc->code_client;
-    	$old_code_type = $mysoc->typent_code;
-    	$mysoc->code_client = 'CCCCCCCCCC';
-    	$mysoc->typent_code = 'TTTTTTTTTT';
-     	$numExample = $this->getNextValue($mysoc, '');
+		$old_code_client = $mysoc->code_client;
+		$old_code_type = $mysoc->typent_code;
+		$mysoc->code_client = 'CCCCCCCCCC';
+		$mysoc->typent_code = 'TTTTTTTTTT';
+	 	$numExample = $this->getNextValue($mysoc, '');
 		$mysoc->code_client = $old_code_client;
 		$mysoc->typent_code = $old_code_type;
 
@@ -119,7 +119,7 @@ class mod_propale_saphir extends ModeleNumRefPropales
 			$numExample = 'NotConfigured';
 		}
 		return $numExample;
-    }
+	}
 
 	/**
 	 *  Return next value
diff --git a/htdocs/core/modules/propale/modules_propale.php b/htdocs/core/modules/propale/modules_propale.php
index d10bc912eec..2127ff1f70c 100644
--- a/htdocs/core/modules/propale/modules_propale.php
+++ b/htdocs/core/modules/propale/modules_propale.php
@@ -42,17 +42,17 @@ abstract class ModelePDFPropales extends CommonDocGenerator
 	public $error = '';
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return list of active generation modules
 	 *
-     *  @param	DoliDB	$db     			Database handler
-     *  @param  integer	$maxfilenamelength  Max length of value to show
-     *  @return	array						List of templates
+	 *  @param	DoliDB	$db     			Database handler
+	 *  @param  integer	$maxfilenamelength  Max length of value to show
+	 *  @return	array						List of templates
 	 */
 	public static function liste_modeles($db, $maxfilenamelength = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 		$type = 'propal';
diff --git a/htdocs/core/modules/rapport/pdf_paiement.class.php b/htdocs/core/modules/rapport/pdf_paiement.class.php
index 8905f6cf2b4..fb9bfbb8809 100644
--- a/htdocs/core/modules/rapport/pdf_paiement.class.php
+++ b/htdocs/core/modules/rapport/pdf_paiement.class.php
@@ -34,16 +34,16 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 class pdf_paiement
 {
 	/**
-     *  Constructor
-     *
-     *  @param      DoliDb		$db      Database handler
+	 *  Constructor
+	 *
+	 *  @param      DoliDb		$db      Database handler
 	 */
 	public function __construct($db)
 	{
 		global $langs, $conf;
 
 		// Load translation files required by the page
-        $langs->loadLangs(array("bills", "compta", "main"));
+		$langs->loadLangs(array("bills", "compta", "main"));
 
 		$this->db = $db;
 		$this->description = $langs->transnoentities("ListOfCustomerPayments");
@@ -84,7 +84,7 @@ class pdf_paiement
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Fonction generant la rapport sur le disque
 	 *
@@ -96,7 +96,7 @@ class pdf_paiement
 	 */
 	public function write_file($_dir, $month, $year, $outputlangs)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 
 		global $conf, $hookmanager, $langs, $user;
@@ -126,14 +126,14 @@ class pdf_paiement
 		$year = sprintf("%04d", $year);
 
 		$file = $dir."/payments-".$year."-".$month.".pdf";
-        switch ($this->doc_type) {
-            case "client":
-                $file = $dir."/payments-".$year."-".$month.".pdf";
-                break;
-            case "fourn":
-                $file = $dir."/supplier_payments-".$year."-".$month.".pdf";
-                break;
-        }
+		switch ($this->doc_type) {
+			case "client":
+				$file = $dir."/payments-".$year."-".$month.".pdf";
+				break;
+			case "fourn":
+				$file = $dir."/supplier_payments-".$year."-".$month.".pdf";
+				break;
+		}
 
 
 		// Add pdfgeneration hook
@@ -147,29 +147,29 @@ class pdf_paiement
 		global $action;
 		$reshook = $hookmanager->executeHooks('beforePDFCreation', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 
-        $pdf = pdf_getInstance($this->format);
-        $default_font_size = pdf_getPDFFontSize($outputlangs); // Must be after pdf_getInstance
+		$pdf = pdf_getInstance($this->format);
+		$default_font_size = pdf_getPDFFontSize($outputlangs); // Must be after pdf_getInstance
 
-        if (class_exists('TCPDF'))
-        {
-            $pdf->setPrintHeader(false);
-            $pdf->setPrintFooter(false);
-        }
-        $pdf->SetFont(pdf_getPDFFont($outputlangs));
+		if (class_exists('TCPDF'))
+		{
+			$pdf->setPrintHeader(false);
+			$pdf->setPrintFooter(false);
+		}
+		$pdf->SetFont(pdf_getPDFFont($outputlangs));
 
-        $num = 0;
-        $lines = array();
+		$num = 0;
+		$lines = array();
 
-        // count number of lines of payment
-        $sql = "SELECT p.rowid as prowid";
-        switch ($this->doc_type) {
-            case "client":
-                $sql .= " FROM ".MAIN_DB_PREFIX."paiement as p";
-                break;
-            case "fourn":
-                $sql .= " FROM ".MAIN_DB_PREFIX."paiementfourn as p";
-                break;
-        }
+		// count number of lines of payment
+		$sql = "SELECT p.rowid as prowid";
+		switch ($this->doc_type) {
+			case "client":
+				$sql .= " FROM ".MAIN_DB_PREFIX."paiement as p";
+				break;
+			case "fourn":
+				$sql .= " FROM ".MAIN_DB_PREFIX."paiementfourn as p";
+				break;
+		}
 		$sql .= " WHERE p.datep BETWEEN '".$this->db->idate(dol_get_first_day($year, $month))."' AND '".$this->db->idate(dol_get_last_day($year, $month))."'";
 		$sql .= " AND p.entity = ".$conf->entity;
 		$result = $this->db->query($sql);
@@ -241,7 +241,7 @@ class pdf_paiement
 					$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
 				}
 				if (!empty($socid)) $sql .= " AND s.rowid = ".$socid;
-                // If global param PAYMENTS_FOURN_REPORT_GROUP_BY_MOD is set, payement fourn are ordered by paiement_code
+				// If global param PAYMENTS_FOURN_REPORT_GROUP_BY_MOD is set, payement fourn are ordered by paiement_code
 				if (!empty($conf->global->PAYMENTS_FOURN_REPORT_GROUP_BY_MOD))
 					$sql .= " ORDER BY paiement_code ASC, p.datep ASC, pf.fk_paiementfourn ASC";
 				else $sql .= " ORDER BY p.datep ASC, pf.fk_paiementfourn ASC";
@@ -331,8 +331,8 @@ class pdf_paiement
 		$reshook = $hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		if ($reshook < 0)
 		{
-		    $this->error = $hookmanager->error;
-		    $this->errors = $hookmanager->errors;
+			$this->error = $hookmanager->error;
+			$this->errors = $hookmanager->errors;
 		}
 
 		if (!empty($conf->global->MAIN_UMASK))
@@ -343,7 +343,7 @@ class pdf_paiement
 		return 1;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 *  Show top header of page.
 	 *
@@ -355,7 +355,7 @@ class pdf_paiement
 	 */
 	protected function _pagehead(&$pdf, $page, $showaddress, $outputlangs)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs, $conf;
 
 		// Do not add the BACKGROUND as this is a report
@@ -364,14 +364,14 @@ class pdf_paiement
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
 		$title = $conf->global->MAIN_INFO_SOCIETE_NOM;
-        switch ($this->doc_type) {
-            case "client":
-                $title .= ' - '.$outputlangs->transnoentities("ListOfCustomerPayments");
-                break;
-            case "fourn":
-                $title .= ' - '.$outputlangs->transnoentities("ListOfSupplierPayments");
-                break;
-        }
+		switch ($this->doc_type) {
+			case "client":
+				$title .= ' - '.$outputlangs->transnoentities("ListOfCustomerPayments");
+				break;
+			case "fourn":
+				$title .= ' - '.$outputlangs->transnoentities("ListOfSupplierPayments");
+				break;
+		}
 		$title .= ' - '.dol_print_date(dol_mktime(0, 0, 0, $this->month, 1, $this->year), "%B %Y", false, $outputlangs, true);
 		$pdf->SetFont('', 'B', $default_font_size + 1);
 		$pdf->SetXY($this->marge_gauche, 10);
@@ -379,36 +379,36 @@ class pdf_paiement
 
 		$pdf->SetFont('', '', $default_font_size);
 
-        $pdf->SetXY($this->posxdate, 16);
+		$pdf->SetXY($this->posxdate, 16);
 		$pdf->MultiCell(80, 2, $outputlangs->transnoentities("DateBuild")." : ".dol_print_date(time(), "day", false, $outputlangs, true), 0, 'L');
 
-        $pdf->SetXY($this->posxdate + 100, 16);
+		$pdf->SetXY($this->posxdate + 100, 16);
 		$pdf->MultiCell(80, 2, $outputlangs->transnoentities("Page")." : ".$page, 0, 'R');
 
 
 		// Title line
-        $pdf->SetXY($this->posxdate, $this->tab_top + 2);
+		$pdf->SetXY($this->posxdate, $this->tab_top + 2);
 		$pdf->MultiCell($this->posxpaymenttype - $this->posxdate, 2, 'Date');
 
 		$pdf->line($this->posxpaymenttype - 1, $this->tab_top, $this->posxpaymenttype - 1, $this->tab_top + $this->tab_height + 10);
-        $pdf->SetXY($this->posxpaymenttype, $this->tab_top + 2);
+		$pdf->SetXY($this->posxpaymenttype, $this->tab_top + 2);
 		$pdf->MultiCell($this->posxinvoice - $this->posxpaymenttype, 2, $outputlangs->transnoentities("PaymentMode"), 0, 'L');
 
 		$pdf->line($this->posxinvoice - 1, $this->tab_top, $this->posxinvoice - 1, $this->tab_top + $this->tab_height + 10);
-        $pdf->SetXY($this->posxinvoice, $this->tab_top + 2);
+		$pdf->SetXY($this->posxinvoice, $this->tab_top + 2);
 		$pdf->MultiCell($this->posxbankaccount - $this->posxinvoice, 2, $outputlangs->transnoentities("Invoice"), 0, 'L');
 
 		$pdf->line($this->posxbankaccount - 1, $this->tab_top, $this->posxbankaccount - 1, $this->tab_top + $this->tab_height + 10);
-        $pdf->SetXY($this->posxbankaccount, $this->tab_top + 2);
+		$pdf->SetXY($this->posxbankaccount, $this->tab_top + 2);
 		$pdf->MultiCell($this->posxinvoiceamount - $this->posxbankaccount, 2, $outputlangs->transnoentities("Account"), 0, 'L');
 
 
 		$pdf->line($this->posxinvoiceamount - 1, $this->tab_top, $this->posxinvoiceamount - 1, $this->tab_top + $this->tab_height + 10);
-        $pdf->SetXY($this->posxinvoiceamount, $this->tab_top + 2);
+		$pdf->SetXY($this->posxinvoiceamount, $this->tab_top + 2);
 		$pdf->MultiCell($this->posxpaymentamount - $this->posxinvoiceamount - 1, 2, $outputlangs->transnoentities("AmountInvoice"), 0, 'R');
 
 		$pdf->line($this->posxpaymentamount - 1, $this->tab_top, $this->posxpaymentamount - 1, $this->tab_top + $this->tab_height + 10);
-        $pdf->SetXY($this->posxpaymentamount, $this->tab_top + 2);
+		$pdf->SetXY($this->posxpaymentamount, $this->tab_top + 2);
 		$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxpaymentamount - 1, 2, $outputlangs->transnoentities("AmountPayment"), 0, 'R');
 
 		$pdf->line($this->marge_gauche, $this->tab_top + 10, $this->page_largeur - $this->marge_droite, $this->tab_top + 10);
@@ -417,7 +417,7 @@ class pdf_paiement
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Output body
 	 *
@@ -429,7 +429,7 @@ class pdf_paiement
 	 */
 	public function Body(&$pdf, $page, $lines, $outputlangs)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs, $conf;
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
@@ -460,17 +460,17 @@ class pdf_paiement
 			{
 				if ($yp > $this->tab_height - 15)
 				{
-                    $pdf->SetFillColor(255, 255, 255);
-                    $pdf->Rect($this->marge_gauche + 1, $this->tab_top + 10 + $yp, $this->posxpaymentamount - $this->marge_droite - 3, $this->line_height, 'F', array(), array());
-                    $pdf->line($this->marge_gauche, $this->tab_top + 10 + $yp, $this->page_largeur - $this->marge_droite, $this->tab_top + 10 + $yp, array('dash'=>1));
-                    $pdf->line($this->marge_gauche, $this->tab_top + 15 + $yp, $this->page_largeur - $this->marge_droite, $this->tab_top + 15 + $yp);
-                    $pdf->SetFont('', 'B', $default_font_size - 1);
-                    $pdf->SetXY($this->posxdate - 1, $this->tab_top + 10 + $yp);
-                    $pdf->MultiCell($this->posxpaymentamount - 2 - $this->marge_droite, $this->line_height, $langs->transnoentities('SubTotal')." : ", 0, 'R', 1);
-                    $pdf->SetXY($this->posxpaymentamount - 1, $this->tab_top + 10 + $yp);
-                    $pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxpaymentamount + 1, $this->line_height, price($total_page), 0, 'R', 1);
-                    $pdf->SetFont('', '', $default_font_size - 1);
-                    $pdf->SetFillColor(220, 220, 220);
+					$pdf->SetFillColor(255, 255, 255);
+					$pdf->Rect($this->marge_gauche + 1, $this->tab_top + 10 + $yp, $this->posxpaymentamount - $this->marge_droite - 3, $this->line_height, 'F', array(), array());
+					$pdf->line($this->marge_gauche, $this->tab_top + 10 + $yp, $this->page_largeur - $this->marge_droite, $this->tab_top + 10 + $yp, array('dash'=>1));
+					$pdf->line($this->marge_gauche, $this->tab_top + 15 + $yp, $this->page_largeur - $this->marge_droite, $this->tab_top + 15 + $yp);
+					$pdf->SetFont('', 'B', $default_font_size - 1);
+					$pdf->SetXY($this->posxdate - 1, $this->tab_top + 10 + $yp);
+					$pdf->MultiCell($this->posxpaymentamount - 2 - $this->marge_droite, $this->line_height, $langs->transnoentities('SubTotal')." : ", 0, 'R', 1);
+					$pdf->SetXY($this->posxpaymentamount - 1, $this->tab_top + 10 + $yp);
+					$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxpaymentamount + 1, $this->line_height, price($total_page), 0, 'R', 1);
+					$pdf->SetFont('', '', $default_font_size - 1);
+					$pdf->SetFillColor(220, 220, 220);
 					$page++;
 					$pdf->AddPage();
 					$this->_pagehead($pdf, $page, 0, $outputlangs);
@@ -518,43 +518,43 @@ class pdf_paiement
 				$oldprowid = $lines[$j][7];
 			}
 
-            // Add line to add total by payment mode if mode reglement for nex line change
-            if ((($this->doc_type == 'client' && !empty($conf->global->PAYMENTS_REPORT_GROUP_BY_MOD)) || ($this->doc_type == 'fourn' && !empty($conf->global->PAYMENTS_FOURN_REPORT_GROUP_BY_MOD))) && ($mod != $lines[$j + 1][2]))
-            {
-                $pdf->SetFillColor(245, 245, 245);
-                $pdf->Rect($this->marge_gauche + 1, $this->tab_top + 10 + $yp, $this->posxpaymentamount - $this->marge_droite - 3, $this->line_height, 'F', array(), array());
-                $pdf->line($this->marge_gauche, $this->tab_top + 10 + $yp, $this->page_largeur - $this->marge_droite, $this->tab_top + 10 + $yp, array('dash'=>1));
-                $pdf->line($this->marge_gauche, $this->tab_top + 15 + $yp, $this->page_largeur - $this->marge_droite, $this->tab_top + 15 + $yp);
-                $pdf->SetXY($this->posxdate - 1, $this->tab_top + 10 + $yp);
+			// Add line to add total by payment mode if mode reglement for nex line change
+			if ((($this->doc_type == 'client' && !empty($conf->global->PAYMENTS_REPORT_GROUP_BY_MOD)) || ($this->doc_type == 'fourn' && !empty($conf->global->PAYMENTS_FOURN_REPORT_GROUP_BY_MOD))) && ($mod != $lines[$j + 1][2]))
+			{
+				$pdf->SetFillColor(245, 245, 245);
+				$pdf->Rect($this->marge_gauche + 1, $this->tab_top + 10 + $yp, $this->posxpaymentamount - $this->marge_droite - 3, $this->line_height, 'F', array(), array());
+				$pdf->line($this->marge_gauche, $this->tab_top + 10 + $yp, $this->page_largeur - $this->marge_droite, $this->tab_top + 10 + $yp, array('dash'=>1));
+				$pdf->line($this->marge_gauche, $this->tab_top + 15 + $yp, $this->page_largeur - $this->marge_droite, $this->tab_top + 15 + $yp);
+				$pdf->SetXY($this->posxdate - 1, $this->tab_top + 10 + $yp);
 				$pdf->SetFont('', 'I', $default_font_size - 1);
-                $pdf->MultiCell($this->posxpaymentamount - 2 - $this->marge_droite, $this->line_height, $langs->transnoentities('Total').' '.$mod." : ", 0, 'R', 1);
-                $pdf->SetXY($this->posxpaymentamount - 1, $this->tab_top + 10 + $yp);
-                $pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxpaymentamount + 1, $this->line_height, price($total_mod), 0, 'R', 1);
+				$pdf->MultiCell($this->posxpaymentamount - 2 - $this->marge_droite, $this->line_height, $langs->transnoentities('Total').' '.$mod." : ", 0, 'R', 1);
+				$pdf->SetXY($this->posxpaymentamount - 1, $this->tab_top + 10 + $yp);
+				$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxpaymentamount + 1, $this->line_height, price($total_mod), 0, 'R', 1);
 				$pdf->SetFont('', '', $default_font_size - 1);
-                $mod = $lines[$j + 1][2];
-                $total_mod = 0;
+				$mod = $lines[$j + 1][2];
+				$total_mod = 0;
 				$yp = $yp + 5;
-                if ($yp > $this->tab_height - 5)
-                {
-                    $page++;
-                    $pdf->AddPage();
-                    $this->_pagehead($pdf, $page, 0, $outputlangs);
-                    $pdf->SetFont('', '', $default_font_size - 1);
-                    $yp = 0;
-                }
-                $pdf->SetFillColor(220, 220, 220);
-            }
+				if ($yp > $this->tab_height - 5)
+				{
+					$page++;
+					$pdf->AddPage();
+					$this->_pagehead($pdf, $page, 0, $outputlangs);
+					$pdf->SetFont('', '', $default_font_size - 1);
+					$yp = 0;
+				}
+				$pdf->SetFillColor(220, 220, 220);
+			}
 		}
 		$total += $total_page;
-        $pdf->SetFillColor(255, 255, 255);
-        $pdf->Rect($this->marge_gauche + 1, $this->tab_top + 10 + $yp, $this->posxpaymentamount - $this->marge_droite - 3, $this->line_height, 'F', array(), array());
-        $pdf->line($this->marge_gauche, $this->tab_top + 10 + $yp, $this->page_largeur - $this->marge_droite, $this->tab_top + 10 + $yp, array('dash'=>1));
-        $pdf->line($this->marge_gauche, $this->tab_top + 15 + $yp, $this->page_largeur - $this->marge_droite, $this->tab_top + 15 + $yp);
-        $pdf->SetXY($this->posxdate - 1, $this->tab_top + 10 + $yp);
-        $pdf->SetFont('', 'B');
-        $pdf->MultiCell($this->posxpaymentamount - 2 - $this->marge_droite, $this->line_height, $langs->transnoentities('Total')." : ", 0, 'R', 1);
-        $pdf->SetXY($this->posxpaymentamount - 1, $this->tab_top + 10 + $yp);
-        $pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxpaymentamount + 1, $this->line_height, price($total), 0, 'R', 1);
-        $pdf->SetFillColor(220, 220, 220);
+		$pdf->SetFillColor(255, 255, 255);
+		$pdf->Rect($this->marge_gauche + 1, $this->tab_top + 10 + $yp, $this->posxpaymentamount - $this->marge_droite - 3, $this->line_height, 'F', array(), array());
+		$pdf->line($this->marge_gauche, $this->tab_top + 10 + $yp, $this->page_largeur - $this->marge_droite, $this->tab_top + 10 + $yp, array('dash'=>1));
+		$pdf->line($this->marge_gauche, $this->tab_top + 15 + $yp, $this->page_largeur - $this->marge_droite, $this->tab_top + 15 + $yp);
+		$pdf->SetXY($this->posxdate - 1, $this->tab_top + 10 + $yp);
+		$pdf->SetFont('', 'B');
+		$pdf->MultiCell($this->posxpaymentamount - 2 - $this->marge_droite, $this->line_height, $langs->transnoentities('Total')." : ", 0, 'R', 1);
+		$pdf->SetXY($this->posxpaymentamount - 1, $this->tab_top + 10 + $yp);
+		$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxpaymentamount + 1, $this->line_height, price($total), 0, 'R', 1);
+		$pdf->SetFillColor(220, 220, 220);
 	}
 }
diff --git a/htdocs/core/modules/rapport/pdf_paiement_fourn.class.php b/htdocs/core/modules/rapport/pdf_paiement_fourn.class.php
index 3b723190af4..f5af4dd8776 100644
--- a/htdocs/core/modules/rapport/pdf_paiement_fourn.class.php
+++ b/htdocs/core/modules/rapport/pdf_paiement_fourn.class.php
@@ -31,9 +31,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/rapport/pdf_paiement.class.php';
 class pdf_paiement_fourn extends pdf_paiement
 {
 	/**
-     *  Constructor
-     *
-     *  @param      DoliDb		$db      Database handler
+	 *  Constructor
+	 *
+	 *  @param      DoliDb		$db      Database handler
 	 */
 	public function __construct($db)
 	{
diff --git a/htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php b/htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php
index 9676bb2ff70..45bfabe4b62 100644
--- a/htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php
+++ b/htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php
@@ -36,20 +36,20 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/doc.lib.php';
  */
 class doc_generic_reception_odt extends ModelePdfReception
 {
-    /**
-     * @var Societe Issuer object that emits
-     */
-    public $emetteur; // Objet societe qui emet
+	/**
+	 * @var Societe Issuer object that emits
+	 */
+	public $emetteur; // Objet societe qui emet
 
 	/**
-     * @var array Minimum version of PHP required by module.
-     * e.g.: PHP ≥ 5.6 = array(5, 6)
-     */
+	 * @var array Minimum version of PHP required by module.
+	 * e.g.: PHP ≥ 5.6 = array(5, 6)
+	 */
 	public $phpmin = array(5, 6);
 
-    /**
-     * @var string Dolibarr version of the loaded document
-     */
+	/**
+	 * @var string Dolibarr version of the loaded document
+	 */
 	public $version = 'dolibarr';
 
 
@@ -58,8 +58,8 @@ class doc_generic_reception_odt extends ModelePdfReception
 	 *
 	 *  @param		DoliDB		$db      Database handler
 	 */
-    public function __construct($db)
-    {
+	public function __construct($db)
+	{
 		global $conf, $langs, $mysoc;
 
 		$langs->load("main");
@@ -94,18 +94,18 @@ class doc_generic_reception_odt extends ModelePdfReception
 		// Recupere emetteur
 		$this->emetteur = $mysoc;
 		if (!$this->emetteur->country_code) $this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined
-    }
+	}
 
 
-    /**
-     *  Return description of a module
-     *
-     *  @param	Translate	$langs      Lang object to use for output
-     *  @return string       			Description
-     */
-    public function info($langs)
-    {
-        global $conf, $langs;
+	/**
+	 *  Return description of a module
+	 *
+	 *  @param	Translate	$langs      Lang object to use for output
+	 *  @return string       			Description
+	 */
+	public function info($langs)
+	{
+		global $conf, $langs;
 
 		$langs->load("companies");
 		$langs->load("errors");
@@ -166,7 +166,7 @@ class doc_generic_reception_odt extends ModelePdfReception
    			$texte .= '<div id="div_'.get_class($this).'" class="hidden">';
    			foreach ($listoffiles as $file)
    			{
-                $texte .= $file['name'].'<br>';
+				$texte .= $file['name'].'<br>';
    			}
    			$texte .= '</div>';
 		}
@@ -182,7 +182,7 @@ class doc_generic_reception_odt extends ModelePdfReception
 		$texte .= '</form>';
 
 		return $texte;
-    }
+	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
@@ -196,8 +196,8 @@ class doc_generic_reception_odt extends ModelePdfReception
 	 *  @param		int			$hideref			Do not show ref
 	 *	@return		int         					1 if OK, <=0 if KO
 	 */
-    public function write_file($object, $outputlangs, $srctemplatepath, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
-    {
+	public function write_file($object, $outputlangs, $srctemplatepath, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
+	{
 		// phpcs:enable
 		global $user, $langs, $conf, $mysoc, $hookmanager;
 
@@ -240,6 +240,8 @@ class doc_generic_reception_odt extends ModelePdfReception
 				}
 			}
 
+			$object->fetch_thirdparty();
+
 			$dir = $conf->reception->dir_output."/reception";
 			$objectref = dol_sanitizeFileName($object->ref);
 			if (!preg_match('/specimen/i', $objectref)) $dir .= "/".$objectref;
@@ -267,8 +269,8 @@ class doc_generic_reception_odt extends ModelePdfReception
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
 				if (!empty($conf->global->MAIN_DOC_USE_TIMING))
 				{
-				    $format = $conf->global->MAIN_DOC_USE_TIMING;
-				    if ($format == '1') $format = '%Y%m%d%H%M%S';
+					$format = $conf->global->MAIN_DOC_USE_TIMING;
+					if ($format == '1') $format = '%Y%m%d%H%M%S';
 					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
 				} else {
 					$filename = $newfiletmp.'.'.$newfileformat;
@@ -325,7 +327,7 @@ class doc_generic_reception_odt extends ModelePdfReception
 				// Open and load template
 				require_once ODTPHP_PATH.'odf.php';
 				try {
-                    $odfHandler = new odf(
+					$odfHandler = new odf(
 						$srctemplatepath,
 						array(
 						'PATH_TO_TMP'	  => $conf->reception->dir_temp,
@@ -351,7 +353,7 @@ class doc_generic_reception_odt extends ModelePdfReception
 					$odfHandler->setVars('free_text', $newfreetext, true, 'UTF-8');
 				} catch (OdfException $e) {
 					dol_syslog($e->getMessage(), LOG_INFO);
-                }
+				}
 
 				// Make substitutions into odt of user info
 				$tmparray = $this->get_substitutionarray_user($user, $outputlangs);
@@ -369,7 +371,7 @@ class doc_generic_reception_odt extends ModelePdfReception
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
 					} catch (OdfException $e) {
-                        dol_syslog($e->getMessage(), LOG_INFO);
+						dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
 				// Make substitutions into odt of mysoc
@@ -388,7 +390,7 @@ class doc_generic_reception_odt extends ModelePdfReception
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
 					} catch (OdfException $e) {
-                        dol_syslog($e->getMessage(), LOG_INFO);
+						dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
 				// Make substitutions into odt of thirdparty
@@ -405,7 +407,7 @@ class doc_generic_reception_odt extends ModelePdfReception
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
 					} catch (OdfException $e) {
-                        dol_syslog($e->getMessage(), LOG_INFO);
+						dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
 				// Replace tags of object + external modules
@@ -426,7 +428,7 @@ class doc_generic_reception_odt extends ModelePdfReception
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
 					} catch (OdfException $e) {
-                        dol_syslog($e->getMessage(), LOG_INFO);
+						dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
 				// Replace tags of lines
@@ -444,9 +446,9 @@ class doc_generic_reception_odt extends ModelePdfReception
 							try {
 								$listlines->setVars($key, $val, true, 'UTF-8');
 							} catch (OdfException $e) {
-                                dol_syslog($e->getMessage(), LOG_INFO);
+								dol_syslog($e->getMessage(), LOG_INFO);
 							} catch (SegmentException $e) {
-                                dol_syslog($e->getMessage(), LOG_INFO);
+								dol_syslog($e->getMessage(), LOG_INFO);
 							}
 						}
 						$listlines->merge();
@@ -466,7 +468,7 @@ class doc_generic_reception_odt extends ModelePdfReception
 					try {
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
 					} catch (OdfException $e) {
-                        dol_syslog($e->getMessage(), LOG_INFO);
+						dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
 
@@ -484,7 +486,7 @@ class doc_generic_reception_odt extends ModelePdfReception
 					}
 				} else {
 					try {
-					    $odfHandler->saveToDisk($file);
+						$odfHandler->saveToDisk($file);
 					} catch (Exception $e) {
 						$this->error = $e->getMessage();
 						return -1;
diff --git a/htdocs/core/modules/reception/mod_reception_beryl.php b/htdocs/core/modules/reception/mod_reception_beryl.php
index 2b596cc070f..7dfd46c32c7 100644
--- a/htdocs/core/modules/reception/mod_reception_beryl.php
+++ b/htdocs/core/modules/reception/mod_reception_beryl.php
@@ -28,10 +28,10 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/reception/modules_reception.php';
  */
 class mod_reception_beryl extends ModelNumRefReception
 {
-    public $version = 'dolibarr';
-    public $prefix = 'RCP';
-    public $error = '';
-    public $nom = 'Beryl';
+	public $version = 'dolibarr';
+	public $prefix = 'RCP';
+	public $error = '';
+	public $nom = 'Beryl';
 
 
 	/**
@@ -39,11 +39,11 @@ class mod_reception_beryl extends ModelNumRefReception
 	 *
 	 *	@return     string      text description
 	 */
-    public function info()
-    {
-    	global $langs;
-      	return $langs->trans("SimpleNumRefModelDesc", $this->prefix);
-    }
+	public function info()
+	{
+		global $langs;
+	  	return $langs->trans("SimpleNumRefModelDesc", $this->prefix);
+	}
 
 
 	/**
diff --git a/htdocs/core/modules/reception/mod_reception_moonstone.php b/htdocs/core/modules/reception/mod_reception_moonstone.php
index febdc3bde5f..13f8e224754 100644
--- a/htdocs/core/modules/reception/mod_reception_moonstone.php
+++ b/htdocs/core/modules/reception/mod_reception_moonstone.php
@@ -30,18 +30,18 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/reception/modules_reception.php';
  */
 class mod_reception_moonstone extends ModelNumRefReception
 {
-    public $version = 'dolibarr';
-    public $error = '';
-    public $nom = 'Moonstone';
+	public $version = 'dolibarr';
+	public $error = '';
+	public $nom = 'Moonstone';
 
-    /**
-     *  Return default description of numbering model
-     *
-     *  @return     string      text description
-     */
-    public function info()
-    {
-    	global $conf, $langs, $db;
+	/**
+	 *  Return default description of numbering model
+	 *
+	 *  @return     string      text description
+	 */
+	public function info()
+	{
+		global $conf, $langs, $db;
 
 		$langs->load("bills");
 
@@ -68,22 +68,22 @@ class mod_reception_moonstone extends ModelNumRefReception
 		$texte .= '</form>';
 
 		return $texte;
-    }
+	}
 
 	/**
 	 *	Return numbering example
 	 *
 	 *	@return     string      Example
 	 */
-    public function getExample()
-    {
-     	global $conf, $langs, $mysoc;
+	public function getExample()
+	{
+	 	global $conf, $langs, $mysoc;
 
-    	$old_code_client = $mysoc->code_client;
-    	$old_code_type = $mysoc->typent_code;
-    	$mysoc->code_client = 'CCCCCCCCCC';
-    	$mysoc->typent_code = 'TTTTTTTTTT';
-     	$numExample = $this->getNextValue($mysoc, '');
+		$old_code_client = $mysoc->code_client;
+		$old_code_type = $mysoc->typent_code;
+		$mysoc->code_client = 'CCCCCCCCCC';
+		$mysoc->typent_code = 'TTTTTTTTTT';
+	 	$numExample = $this->getNextValue($mysoc, '');
 		$mysoc->code_client = $old_code_client;
 		$mysoc->typent_code = $old_code_type;
 
@@ -92,7 +92,7 @@ class mod_reception_moonstone extends ModelNumRefReception
 			$numExample = $langs->trans('NotConfigured');
 		}
 		return $numExample;
-    }
+	}
 
 	/**
 	 *	Return next value
@@ -101,8 +101,8 @@ class mod_reception_moonstone extends ModelNumRefReception
 	 *	@param	Object		$reception	Reception object
 	 *	@return string      			Value if OK, 0 if KO
 	 */
-    public function getNextValue($objsoc, $reception)
-    {
+	public function getNextValue($objsoc, $reception)
+	{
 		global $db, $conf;
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
@@ -120,7 +120,7 @@ class mod_reception_moonstone extends ModelNumRefReception
 		$numFinal = get_next_value($db, $mask, 'reception', 'ref', '', $objsoc, $date);
 
 		return  $numFinal;
-    }
+	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
diff --git a/htdocs/core/modules/reception/modules_reception.php b/htdocs/core/modules/reception/modules_reception.php
index 6aa42a06743..28b0bce6500 100644
--- a/htdocs/core/modules/reception/modules_reception.php
+++ b/htdocs/core/modules/reception/modules_reception.php
@@ -29,16 +29,16 @@
  */
 abstract class ModelePdfReception extends CommonDocGenerator
 {
-    public $error = '';
+	public $error = '';
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
 	 *  Return list of active generation modules
 	 *
-     *  @param	DoliDB	$db     			Database handler
-     *  @param  integer	$maxfilenamelength  Max length of value to show
-     *  @return	array						List of templates
+	 *  @param	DoliDB	$db     			Database handler
+	 *  @param  integer	$maxfilenamelength  Max length of value to show
+	 *  @return	array						List of templates
 	 */
 	public static function liste_modeles($db, $maxfilenamelength = 0)
 	{
@@ -61,7 +61,7 @@ abstract class ModelePdfReception extends CommonDocGenerator
  */
 abstract class ModelNumRefReception
 {
-    public $error = '';
+	public $error = '';
 
 	/** Return if a model can be used or not
 	 *
diff --git a/htdocs/core/modules/security/generate/modGeneratePassNone.class.php b/htdocs/core/modules/security/generate/modGeneratePassNone.class.php
index 8f485e6a608..e353903b6e7 100644
--- a/htdocs/core/modules/security/generate/modGeneratePassNone.class.php
+++ b/htdocs/core/modules/security/generate/modGeneratePassNone.class.php
@@ -39,9 +39,9 @@ class modGeneratePassNone extends ModeleGenPassword
 	public $length;
 
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
 	public $conf;
 	public $lang;
@@ -70,7 +70,7 @@ class modGeneratePassNone extends ModeleGenPassword
 	/**
 	 *		Return description of module
 	 *
- 	 *      @return     string      Description of text
+	 *      @return     string      Description of text
 	 */
 	public function getDescription()
 	{
@@ -81,7 +81,7 @@ class modGeneratePassNone extends ModeleGenPassword
 	/**
 	 * 		Return an example of password generated by this module
 	 *
- 	 *      @return     string      Example of password
+	 *      @return     string      Example of password
 	 */
 	public function getExample()
 	{
@@ -91,7 +91,7 @@ class modGeneratePassNone extends ModeleGenPassword
 	/**
 	 * 		Build new password
 	 *
- 	 *      @return     string      Return a new generated password
+	 *      @return     string      Return a new generated password
 	 */
 	public function getNewGeneratedPassword()
 	{
@@ -102,7 +102,7 @@ class modGeneratePassNone extends ModeleGenPassword
 	 * 		Validate a password
 	 *
 	 *		@param		string	$password	Password to check
- 	 *      @return     int					0 if KO, >0 if OK
+	 *      @return     int					0 if KO, >0 if OK
 	 */
 	public function validatePassword($password)
 	{
diff --git a/htdocs/core/modules/security/generate/modGeneratePassPerso.class.php b/htdocs/core/modules/security/generate/modGeneratePassPerso.class.php
index 79d6865037a..7a1da5ae130 100644
--- a/htdocs/core/modules/security/generate/modGeneratePassPerso.class.php
+++ b/htdocs/core/modules/security/generate/modGeneratePassPerso.class.php
@@ -47,9 +47,9 @@ class modGeneratePassPerso extends ModeleGenPassword
 	public $WithoutAmbi;
 
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
 	public $conf;
 	public $lang;
@@ -145,22 +145,22 @@ class modGeneratePassPerso extends ModeleGenPassword
 	{
 		$pass = "";
 		for ($i = 0; $i < $this->NbMaj; $i++) {
-            // Y
+			// Y
 			$pass .= $this->Maj[mt_rand(0, strlen($this->Maj) - 1)];
 		}
 
 		for ($i = 0; $i < $this->NbNum; $i++) {
-            // X
+			// X
 			$pass .= $this->Nb[mt_rand(0, strlen($this->Nb) - 1)];
 		}
 
 		for ($i = 0; $i < $this->NbSpe; $i++) {
-            // @
+			// @
 			$pass .= $this->Spe[mt_rand(0, strlen($this->Spe) - 1)];
 		}
 
 		for ($i = strlen($pass); $i < $this->length2; $i++) {
-            // y
+			// y
 			$pass .= $this->All[mt_rand(0, strlen($this->All) - 1)];
 		}
 
@@ -211,8 +211,8 @@ class modGeneratePassPerso extends ModeleGenPassword
 	 *  @param		string	$password	Password to check
 	 *  @return     bool
 	 */
-    private function consecutiveInterationSameCharacter($password)
-    {
+	private function consecutiveInterationSameCharacter($password)
+	{
 		$last = "";
 
 		if (empty($this->NbRepeat)) return 1;
@@ -228,7 +228,7 @@ class modGeneratePassPerso extends ModeleGenPassword
 				continue;
 			}
 
-            $count++;
+			$count++;
 			if ($count > $this->NbRepeat) {
 				return false;
 			}
diff --git a/htdocs/core/modules/security/generate/modGeneratePassStandard.class.php b/htdocs/core/modules/security/generate/modGeneratePassStandard.class.php
index 0c5f2c1807c..cf49f0f063d 100644
--- a/htdocs/core/modules/security/generate/modGeneratePassStandard.class.php
+++ b/htdocs/core/modules/security/generate/modGeneratePassStandard.class.php
@@ -39,9 +39,9 @@ class modGeneratePassStandard extends ModeleGenPassword
 	public $length;
 
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
 	public $conf;
 	public $lang;
@@ -70,7 +70,7 @@ class modGeneratePassStandard extends ModeleGenPassword
 	/**
 	 *		Return description of module
 	 *
- 	 *      @return     string      Description of module
+	 *      @return     string      Description of module
 	 */
 	public function getDescription()
 	{
@@ -81,7 +81,7 @@ class modGeneratePassStandard extends ModeleGenPassword
 	/**
 	 * 		Return an example of password generated by this module
 	 *
- 	 *      @return     string      Example of password
+	 *      @return     string      Example of password
 	 */
 	public function getExample()
 	{
@@ -91,7 +91,7 @@ class modGeneratePassStandard extends ModeleGenPassword
 	/**
 	 * 		Build new password
 	 *
- 	 *      @return     string      Return a new generated password
+	 *      @return     string      Return a new generated password
 	 */
 	public function getNewGeneratedPassword()
 	{
@@ -122,15 +122,15 @@ class modGeneratePassStandard extends ModeleGenPassword
 		return $password;
 	}
 
-    /**
-     *  Validate a password
-     *
-     *  @param      string  $password   Password to check
-     *  @return     int                 0 if KO, >0 if OK
-     */
-    public function validatePassword($password)
-    {
-        if (dol_strlen($password) < $this->length) return 0;
-        return 1;
-    }
+	/**
+	 *  Validate a password
+	 *
+	 *  @param      string  $password   Password to check
+	 *  @return     int                 0 if KO, >0 if OK
+	 */
+	public function validatePassword($password)
+	{
+		if (dol_strlen($password) < $this->length) return 0;
+		return 1;
+	}
 }
diff --git a/htdocs/core/modules/security/generate/modules_genpassword.php b/htdocs/core/modules/security/generate/modules_genpassword.php
index 1df8949f242..37bb37ad092 100644
--- a/htdocs/core/modules/security/generate/modules_genpassword.php
+++ b/htdocs/core/modules/security/generate/modules_genpassword.php
@@ -30,63 +30,63 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php';
  */
 abstract class ModeleGenPassword
 {
-    /**
+	/**
 	 * @var string Error code (or message)
 	 */
 	public $error = '';
 
-    /**
-     * 		Return if a module can be used or not
-     *
-     *      @return		boolean     true if module can be used
-     */
-    public function isEnabled()
-    {
-        return true;
-    }
+	/**
+	 * 		Return if a module can be used or not
+	 *
+	 *      @return		boolean     true if module can be used
+	 */
+	public function isEnabled()
+	{
+		return true;
+	}
 
-    /**
-     *		Return description of module
-     *
-     *      @return     string      Description of text
-     */
-    public function getDescription()
-    {
-        global $langs;
-        return $langs->trans("NoDescription");
-    }
+	/**
+	 *		Return description of module
+	 *
+	 *      @return     string      Description of text
+	 */
+	public function getDescription()
+	{
+		global $langs;
+		return $langs->trans("NoDescription");
+	}
 
-    /**
-     *  Return an example of password generated by this module
-     *
-     *  @return     string      Example of password
-     */
-    public function getExample()
-    {
-        global $langs;
-        $langs->load("bills");
-        return $langs->trans("NoExample");
-    }
+	/**
+	 *  Return an example of password generated by this module
+	 *
+	 *  @return     string      Example of password
+	 */
+	public function getExample()
+	{
+		global $langs;
+		$langs->load("bills");
+		return $langs->trans("NoExample");
+	}
 
 	/**
 	 *  Build new password
 	 *
- 	 *  @return     string      Return a new generated password
+	 *  @return     string      Return a new generated password
 	 */
-    public function getNewGeneratedPassword()
-    {
-        global $langs;
-        return $langs->trans("NotAvailable");
-    }
+	public function getNewGeneratedPassword()
+	{
+		global $langs;
+		return $langs->trans("NotAvailable");
+	}
 
 	/**
 	 * 		Validate a password
 	 *
 	 *		@param		string	$password	Password to check
- 	 *      @return     int					0 if KO, >0 if OK
+	 *      @return     int					0 if KO, >0 if OK
 	 */
-    public function validatePassword($password)
-    {
-        return 1;
-    }
+	public function validatePassword($password)
+	{
+		return 1;
+	}
 }
diff --git a/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php b/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
index 9cc3adf708e..66064cc4946 100644
--- a/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
+++ b/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
@@ -43,9 +43,9 @@ class doc_generic_odt extends ModeleThirdPartyDoc
 	public $emetteur;
 
 	/**
-     * @var array Minimum version of PHP required by module.
-     * e.g.: PHP ≥ 5.6 = array(5, 6)
-     */
+	 * @var array Minimum version of PHP required by module.
+	 * e.g.: PHP ≥ 5.6 = array(5, 6)
+	 */
 	public $phpmin = array(5, 6);
 
 
@@ -59,7 +59,7 @@ class doc_generic_odt extends ModeleThirdPartyDoc
 		global $conf, $langs, $mysoc;
 
 		// Load translation files required by the page
-        $langs->loadLangs(array("main", "companies"));
+		$langs->loadLangs(array("main", "companies"));
 
 		$this->db = $db;
 		$this->name = "ODT templates";
@@ -128,16 +128,16 @@ class doc_generic_odt extends ModeleThirdPartyDoc
 		$texthelp .= $langs->transnoentitiesnoconv("FullListOnOnlineDocumentation"); // This contains an url, we don't modify it
 
 		$texte .= $form->textwithpicto($texttitle, $texthelp, 1, 'help', '', 1);
-        $texte .= '<table><tr><td>';
+		$texte .= '<table><tr><td>';
 		$texte .= '<textarea class="flat" cols="60" name="value1">';
 		$texte .= $conf->global->COMPANY_ADDON_PDF_ODT_PATH;
 		$texte .= '</textarea>';
-        $texte .= '</td>';
-        $texte .= '<td class="center">&nbsp; ';
-        $texte .= '<input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button">';
-        $texte .= '</td>';
-        $texte .= '</tr>';
-        $texte .= '</table>';
+		$texte .= '</td>';
+		$texte .= '<td class="center">&nbsp; ';
+		$texte .= '<input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button">';
+		$texte .= '</td>';
+		$texte .= '</tr>';
+		$texte .= '</table>';
 
 		// Scan directories
 		$nbofiles = count($listoffiles);
@@ -155,15 +155,15 @@ class doc_generic_odt extends ModeleThirdPartyDoc
    			$texte .= '<div id="div_'.get_class($this).'" class="hidden">';
    			foreach ($listoffiles as $file)
    			{
-                $texte .= $file['name'].'<br>';
+				$texte .= $file['name'].'<br>';
    			}
    			$texte .= '</div>';
 		}
-        // Add input to upload a new template file.
-        $texte .= '<div>'.$langs->trans("UploadNewTemplate").' <input type="file" name="uploadfile">';
-        $texte .= '<input type="hidden" value="COMPANY_ADDON_PDF_ODT_PATH" name="keyforuploaddir">';
-        $texte .= '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Upload")).'" name="upload">';
-        $texte .= '</div>';
+		// Add input to upload a new template file.
+		$texte .= '<div>'.$langs->trans("UploadNewTemplate").' <input type="file" name="uploadfile">';
+		$texte .= '<input type="hidden" value="COMPANY_ADDON_PDF_ODT_PATH" name="keyforuploaddir">';
+		$texte .= '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Upload")).'" name="upload">';
+		$texte .= '</div>';
 		$texte .= '</td>';
 
 		$texte .= '<td rowspan="2" class="tdtop hideonsmartphone">';
@@ -177,22 +177,22 @@ class doc_generic_odt extends ModeleThirdPartyDoc
 		return $texte;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Function to build a document on disk using the generic odt module.
 	 *
 	 *	@param		Societe		$object				Object source to build document
 	 *	@param		Translate	$outputlangs		Lang output object
 	 * 	@param		string		$srctemplatepath	Full path of source filename for generator using a template file
-     *  @param		int			$hidedetails		Do not show line details
-     *  @param		int			$hidedesc			Do not show desc
-     *  @param		int			$hideref			Do not show ref
+	 *  @param		int			$hidedetails		Do not show line details
+	 *  @param		int			$hidedesc			Do not show desc
+	 *  @param		int			$hideref			Do not show ref
 	 *	@return		int         					1 if OK, <=0 if KO
 	 */
 	public function write_file($object, $outputlangs, $srctemplatepath, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
 	{
-        // phpcs:enable
-        global $user, $langs, $conf, $mysoc, $hookmanager;
+		// phpcs:enable
+		global $user, $langs, $conf, $mysoc, $hookmanager;
 
 		if (empty($srctemplatepath))
 		{
@@ -200,13 +200,13 @@ class doc_generic_odt extends ModeleThirdPartyDoc
 			return -1;
 		}
 
-        // Add odtgeneration hook
-        if (!is_object($hookmanager)) {
-            include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-            $hookmanager = new HookManager($this->db);
-        }
-        $hookmanager->initHooks(array('odtgeneration'));
-        global $action;
+		// Add odtgeneration hook
+		if (!is_object($hookmanager)) {
+			include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
+			$hookmanager = new HookManager($this->db);
+		}
+		$hookmanager->initHooks(array('odtgeneration'));
+		global $action;
 
 		if (!is_object($outputlangs)) $outputlangs = $langs;
 		$sav_charset_output = $outputlangs->charset_output;
@@ -241,12 +241,12 @@ class doc_generic_odt extends ModeleThirdPartyDoc
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
 				if (!empty($conf->global->MAIN_DOC_USE_OBJECT_THIRDPARTY_NAME))
 				{
-				    $newfiletmp = dol_sanitizeFileName(dol_string_nospecial($object->name)).'-'.$newfiletmp;
+					$newfiletmp = dol_sanitizeFileName(dol_string_nospecial($object->name)).'-'.$newfiletmp;
 				}
 				if (!empty($conf->global->MAIN_DOC_USE_TIMING))
 				{
-				    $format = $conf->global->MAIN_DOC_USE_TIMING;
-				    if ($format == '1') $format = '%Y%m%d%H%M%S';
+					$format = $conf->global->MAIN_DOC_USE_TIMING;
+					if ($format == '1') $format = '%Y%m%d%H%M%S';
 					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
 				} else {
 					$filename = $newfiletmp.'.'.$newfileformat;
@@ -265,13 +265,13 @@ class doc_generic_odt extends ModeleThirdPartyDoc
 				// Open and load template
 				require_once ODTPHP_PATH.'odf.php';
 				try {
-                    $odfHandler = new odf(
-					    $srctemplatepath,
-					    array(
-	    					'PATH_TO_TMP'	  => $conf->societe->multidir_temp[$object->entity],
-	    					'ZIP_PROXY'		  => 'PclZipProxy', // PhpZipProxy or PclZipProxy. Got "bad compression method" error when using PhpZipProxy.
-	    					'DELIMITER_LEFT'  => '{',
-	    					'DELIMITER_RIGHT' => '}'
+					$odfHandler = new odf(
+						$srctemplatepath,
+						array(
+							'PATH_TO_TMP'	  => $conf->societe->multidir_temp[$object->entity],
+							'ZIP_PROXY'		  => 'PclZipProxy', // PhpZipProxy or PclZipProxy. Got "bad compression method" error when using PhpZipProxy.
+							'DELIMITER_LEFT'  => '{',
+							'DELIMITER_RIGHT' => '}'
 						)
 					);
 				} catch (Exception $e)
@@ -282,77 +282,77 @@ class doc_generic_odt extends ModeleThirdPartyDoc
 				}
 				//print $odfHandler->__toString()."\n";
 
-                // Replace tags of lines for contacts
-                $contact_arrray = array();
+				// Replace tags of lines for contacts
+				$contact_arrray = array();
 
-                $sql = "SELECT p.rowid";
-                $sql .= " FROM ".MAIN_DB_PREFIX."socpeople as p";
-                $sql .= " WHERE p.fk_soc = ".$object->id;
+				$sql = "SELECT p.rowid";
+				$sql .= " FROM ".MAIN_DB_PREFIX."socpeople as p";
+				$sql .= " WHERE p.fk_soc = ".$object->id;
 
-                $result = $this->db->query($sql);
-                $num = $this->db->num_rows($result);
+				$result = $this->db->query($sql);
+				$num = $this->db->num_rows($result);
 
-                if ($num)
-                {
-                    require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
+				if ($num)
+				{
+					require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 
-                	$i = 0;
-                	$contactstatic = new Contact($this->db);
+					$i = 0;
+					$contactstatic = new Contact($this->db);
 
-                	while ($i < $num)
-                	{
-                		$obj = $this->db->fetch_object($result);
+					while ($i < $num)
+					{
+						$obj = $this->db->fetch_object($result);
 
-                		$contact_arrray[$i] = $obj->rowid;
-                		$i++;
-                	}
-                }
-                if ((is_array($contact_arrray) && count($contact_arrray) > 0))
-                {
-                	try {
-                		$listlines = $odfHandler->setSegment('companycontacts');
+						$contact_arrray[$i] = $obj->rowid;
+						$i++;
+					}
+				}
+				if ((is_array($contact_arrray) && count($contact_arrray) > 0))
+				{
+					try {
+						$listlines = $odfHandler->setSegment('companycontacts');
 
-                		foreach ($contact_arrray as $array_key => $contact_id)
-                		{
-                			$res_contact = $contactstatic->fetch($contact_id);
-                			$tmparray = $this->get_substitutionarray_contact($contactstatic, $outputlangs, 'contact');
-                			foreach ($tmparray as $key => $val)
-                			{
-                				try {
-                					$listlines->setVars($key, $val, true, 'UTF-8');
-                				} catch (OdfException $e)
-                				{
+						foreach ($contact_arrray as $array_key => $contact_id)
+						{
+							$res_contact = $contactstatic->fetch($contact_id);
+							$tmparray = $this->get_substitutionarray_contact($contactstatic, $outputlangs, 'contact');
+							foreach ($tmparray as $key => $val)
+							{
+								try {
+									$listlines->setVars($key, $val, true, 'UTF-8');
+								} catch (OdfException $e)
+								{
 									dol_syslog($e->getMessage(), LOG_INFO);
-                				} catch (SegmentException $e)
-                				{
+								} catch (SegmentException $e)
+								{
 									dol_syslog($e->getMessage(), LOG_INFO);
-                				}
-                			}
-                			$listlines->merge();
-                		}
-                		$odfHandler->mergeSegment($listlines);
-                	} catch (OdfException $e)
-                	{
-                		$this->error = $e->getMessage();
-                		dol_syslog($this->error, LOG_WARNING);
-                		//return -1;
-                	}
-                }
+								}
+							}
+							$listlines->merge();
+						}
+						$odfHandler->mergeSegment($listlines);
+					} catch (OdfException $e)
+					{
+						$this->error = $e->getMessage();
+						dol_syslog($this->error, LOG_WARNING);
+						//return -1;
+					}
+				}
 
-                // Make substitutions into odt
-                $array_user = $this->get_substitutionarray_user($user, $outputlangs);
-                $array_soc = $this->get_substitutionarray_mysoc($mysoc, $outputlangs);
-                $array_thirdparty = $this->get_substitutionarray_thirdparty($object, $outputlangs);
-                $array_other = $this->get_substitutionarray_other($outputlangs);
+				// Make substitutions into odt
+				$array_user = $this->get_substitutionarray_user($user, $outputlangs);
+				$array_soc = $this->get_substitutionarray_mysoc($mysoc, $outputlangs);
+				$array_thirdparty = $this->get_substitutionarray_thirdparty($object, $outputlangs);
+				$array_other = $this->get_substitutionarray_other($outputlangs);
 
-                $tmparray = array_merge($array_user, $array_soc, $array_thirdparty, $array_other);
-                complete_substitutions_array($tmparray, $outputlangs, $object);
+				$tmparray = array_merge($array_user, $array_soc, $array_thirdparty, $array_other);
+				complete_substitutions_array($tmparray, $outputlangs, $object);
 
-                // Call the ODTSubstitution hook
-                $parameters = array('odfHandler'=>&$odfHandler, 'file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray);
+				// Call the ODTSubstitution hook
+				$parameters = array('odfHandler'=>&$odfHandler, 'file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray);
 				$reshook = $hookmanager->executeHooks('ODTSubstitution', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 
-                // Replace variables into document
+				// Replace variables into document
 				foreach ($tmparray as $key=>$value)
 				{
 					try {
@@ -367,7 +367,7 @@ class doc_generic_odt extends ModeleThirdPartyDoc
 					} catch (OdfException $e)
 					{
 						// setVars failed, probably because key not found
-                        dol_syslog($e->getMessage(), LOG_INFO);
+						dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
 
@@ -379,7 +379,7 @@ class doc_generic_odt extends ModeleThirdPartyDoc
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
 					} catch (OdfException $e)
 					{
-                        dol_syslog($e->getMessage(), LOG_INFO);
+						dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
 
@@ -393,24 +393,24 @@ class doc_generic_odt extends ModeleThirdPartyDoc
 						$odfHandler->exportAsAttachedPDF($file);
 					} catch (Exception $e) {
 						$this->error = $e->getMessage();
-                        dol_syslog($e->getMessage(), LOG_INFO);
+						dol_syslog($e->getMessage(), LOG_INFO);
 						return -1;
 					}
 				} else {
-				    try {
-                        $odfHandler->creator = $user->getFullName($outputlangs);
-                        $odfHandler->title = $object->builddoc_filename;
-                        $odfHandler->subject = $object->builddoc_filename;
+					try {
+						$odfHandler->creator = $user->getFullName($outputlangs);
+						$odfHandler->title = $object->builddoc_filename;
+						$odfHandler->subject = $object->builddoc_filename;
 
-                        if (!empty($conf->global->ODT_ADD_DOLIBARR_ID)) {
-                            $odfHandler->userdefined['dol_id'] = $object->id;
-                            $odfHandler->userdefined['dol_element'] = $object->element;
-                        }
+						if (!empty($conf->global->ODT_ADD_DOLIBARR_ID)) {
+							$odfHandler->userdefined['dol_id'] = $object->id;
+							$odfHandler->userdefined['dol_element'] = $object->element;
+						}
 
-                        $odfHandler->saveToDisk($file);
+						$odfHandler->saveToDisk($file);
 					} catch (Exception $e) {
 						$this->error = $e->getMessage();
-                        dol_syslog($e->getMessage(), LOG_INFO);
+						dol_syslog($e->getMessage(), LOG_INFO);
 						return -1;
 					}
 				}
diff --git a/htdocs/core/modules/societe/mod_codeclient_elephant.php b/htdocs/core/modules/societe/mod_codeclient_elephant.php
index 948be99b61a..a7d9c99f401 100644
--- a/htdocs/core/modules/societe/mod_codeclient_elephant.php
+++ b/htdocs/core/modules/societe/mod_codeclient_elephant.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2007-2012 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2011      Juanjo Menent	    <jmenent@2byte.es>
  * Copyright (C) 2013-2018 Philippe Grand      	<philippe.grand@atoo-net.com>
+ * Copyright (C) 2020		Frédéric France		<frederic.france@netlogic.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -39,18 +40,30 @@ class mod_codeclient_elephant extends ModeleThirdPartyCode
 	 */
 	public $name = 'Elephant';
 
-	public $code_modifiable; // Code modifiable
-
-	public $code_modifiable_invalide; // Code modifiable si il est invalide
-
-	public $code_modifiable_null; // Code modifiables si il est null
-
-	public $code_null; // Code facultatif
+	/**
+	 * @var int Code modifiable
+	 */
+	public $code_modifiable;
 
 	/**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	 * @var int Code modifiable si il est invalide
+	 */
+	public $code_modifiable_invalide;
+
+	/**
+	 * @var int Code modifiables si il est null
+	 */
+	public $code_modifiable_null;
+
+	/**
+	 * @var int Code facultatif
+	 */
+	public $code_null;
+
+	/**
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
 	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 
 	/**
@@ -58,11 +71,20 @@ class mod_codeclient_elephant extends ModeleThirdPartyCode
 	 */
 	public $code_auto;
 
-	public $searchcode; // String de recherche
+	/**
+	 * @var string search string
+	 */
+	public $searchcode;
 
-	public $numbitcounter; // Nombre de chiffres du compteur
+	/**
+	 * @var int Nombre de chiffres du compteur
+	 */
+	public $numbitcounter;
 
-	public $prefixIsRequired; // Le champ prefix du tiers doit etre renseigne quand on utilise {pre}
+	/**
+	 * @var int thirdparty prefix is required when using {pre}
+	 */
+	public $prefixIsRequired;
 
 
 	/**
@@ -80,7 +102,7 @@ class mod_codeclient_elephant extends ModeleThirdPartyCode
 
 
 	/**
-     *  Return description of module
+	 *  Return description of module
 	 *
 	 *  @param	Translate	$langs		Object langs
 	 *  @return string      			Description of module
@@ -138,56 +160,41 @@ class mod_codeclient_elephant extends ModeleThirdPartyCode
 	 */
 	public function getExample($langs, $objsoc = 0, $type = -1)
 	{
-		if ($type == 0 || $type == -1)
-		{
+		$examplecust = '';
+		$examplesup = '';
+		$errmsg = array(
+			"ErrorBadMask",
+			"ErrorCantUseRazIfNoYearInMask",
+			"ErrorCantUseRazInStartedYearIfNoYearMonthInMask",
+		);
+		if ($type != 1) {
 			$examplecust = $this->getNextValue($objsoc, 0);
-			if (!$examplecust)
-			{
+			if (!$examplecust) {
 				$examplecust = $langs->trans('NotConfigured');
 			}
-			if ($examplecust == "ErrorBadMask")
-			{
-				$langs->load("errors");
-				$examplecust = $langs->trans($examplecust);
-			}
-			if ($examplecust == "ErrorCantUseRazIfNoYearInMask")
-			{
-				$langs->load("errors");
-				$examplecust = $langs->trans($examplecust);
-			}
-			if ($examplecust == "ErrorCantUseRazInStartedYearIfNoYearMonthInMask")
-			{
+			if (in_array($examplecust, $errmsg)) {
 				$langs->load("errors");
 				$examplecust = $langs->trans($examplecust);
 			}
 		}
-		if ($type == 1 || $type == -1)
-		{
+		if ($type != 0) {
 			$examplesup = $this->getNextValue($objsoc, 1);
-			if (!$examplesup)
-			{
+			if (!$examplesup) {
 				$examplesup = $langs->trans('NotConfigured');
 			}
-			if ($examplesup == "ErrorBadMask")
-			{
-				$langs->load("errors");
-				$examplesup = $langs->trans($examplesup);
-			}
-			if ($examplesup == "ErrorCantUseRazIfNoYearInMask")
-			{
-				$langs->load("errors");
-				$examplesup = $langs->trans($examplesup);
-			}
-			if ($examplesup == "ErrorCantUseRazInStartedYearIfNoYearMonthInMask")
-			{
+			if (in_array($examplesup, $errmsg)) {
 				$langs->load("errors");
 				$examplesup = $langs->trans($examplesup);
 			}
 		}
 
-		if ($type == 0) return $examplecust;
-		if ($type == 1) return $examplesup;
-		return $examplecust.'<br>'.$examplesup;
+		if ($type == 0) {
+			return $examplecust;
+		} elseif ($type == 1) {
+			return $examplesup;
+		} else {
+			return $examplecust.'<br>'.$examplesup;
+		}
 	}
 
 	/**
@@ -232,7 +239,7 @@ class mod_codeclient_elephant extends ModeleThirdPartyCode
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *   Check if mask/numbering use prefix
 	 *
@@ -240,7 +247,7 @@ class mod_codeclient_elephant extends ModeleThirdPartyCode
 	 */
 	public function verif_prefixIsUsed()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 		$mask = $conf->global->COMPANY_ELEPHANT_MASK_CUSTOMER;
@@ -306,7 +313,7 @@ class mod_codeclient_elephant extends ModeleThirdPartyCode
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *		Renvoi si un code est pris ou non (par autre tiers)
 	 *
@@ -318,7 +325,7 @@ class mod_codeclient_elephant extends ModeleThirdPartyCode
 	 */
 	public function verif_dispo($db, $code, $soc, $type = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe";
 		if ($type == 1) $sql .= " WHERE code_fournisseur = '".$db->escape($code)."'";
 		else $sql .= " WHERE code_client = '".$db->escape($code)."'";
diff --git a/htdocs/core/modules/societe/mod_codeclient_leopard.php b/htdocs/core/modules/societe/mod_codeclient_leopard.php
index c3ce858ec0d..54ba73d08ef 100644
--- a/htdocs/core/modules/societe/mod_codeclient_leopard.php
+++ b/htdocs/core/modules/societe/mod_codeclient_leopard.php
@@ -52,9 +52,9 @@ class mod_codeclient_leopard extends ModeleThirdPartyCode
 	public $code_null; // Code facultatif
 
 	/**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
 	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 
 	/**
@@ -77,7 +77,7 @@ class mod_codeclient_leopard extends ModeleThirdPartyCode
 
 
 	/**
-     *  Return description of module
+	 *  Return description of module
 	 *
 	 *  @param  Translate   $langs  Object langs
 	 *  @return string              Description of module
diff --git a/htdocs/core/modules/societe/mod_codeclient_monkey.php b/htdocs/core/modules/societe/mod_codeclient_monkey.php
index a73e7db2911..1d8b543234d 100644
--- a/htdocs/core/modules/societe/mod_codeclient_monkey.php
+++ b/htdocs/core/modules/societe/mod_codeclient_monkey.php
@@ -46,9 +46,9 @@ class mod_codeclient_monkey extends ModeleThirdPartyCode
 	public $code_null; // Code facultatif
 
 	/**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
 	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 
 	/**
@@ -81,7 +81,7 @@ class mod_codeclient_monkey extends ModeleThirdPartyCode
 
 
 	/**
-     *  Return description of module
+	 *  Return description of module
 	 *
 	 *  @param	Translate	$langs	Object langs
 	 *  @return string      		Description of module
@@ -118,20 +118,20 @@ class mod_codeclient_monkey extends ModeleThirdPartyCode
 		global $db, $conf, $mc;
 
 		$field = '';
-        $prefix = '';
+		$prefix = '';
 		if ($type == 0) {
 			$field = 'code_client';
-            $prefix = $this->prefixcustomer;
+			$prefix = $this->prefixcustomer;
 		} elseif ($type == 1) {
 			$field = 'code_fournisseur';
-            $prefix = $this->prefixsupplier;
+			$prefix = $this->prefixsupplier;
 		} else {
-            return -1;
-        }
+			return -1;
+		}
 
-        // First, we get the max value (reponse immediate car champ indexe)
-        $posindice = strlen($prefix) + 6;
-        $sql = "SELECT MAX(CAST(SUBSTRING(".$field." FROM ".$posindice.") AS SIGNED)) as max"; // This is standard SQL
+		// First, we get the max value (reponse immediate car champ indexe)
+		$posindice = strlen($prefix) + 6;
+		$sql = "SELECT MAX(CAST(SUBSTRING(".$field." FROM ".$posindice.") AS SIGNED)) as max"; // This is standard SQL
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe";
 		$sql .= " WHERE ".$field." LIKE '".$db->escape($prefix)."____-%'";
 		$sql .= " AND entity IN (".getEntity('societe').")";
@@ -210,7 +210,7 @@ class mod_codeclient_monkey extends ModeleThirdPartyCode
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *		Renvoi si un code est pris ou non (par autre tiers)
 	 *
@@ -222,7 +222,7 @@ class mod_codeclient_monkey extends ModeleThirdPartyCode
 	 */
 	public function verif_dispo($db, $code, $soc, $type = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $mc;
 
 		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe";
@@ -247,7 +247,7 @@ class mod_codeclient_monkey extends ModeleThirdPartyCode
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Renvoi si un code respecte la syntaxe
 	 *
@@ -256,7 +256,7 @@ class mod_codeclient_monkey extends ModeleThirdPartyCode
 	 */
 	public function verif_syntax($code)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$res = 0;
 
 		if (dol_strlen($code) < 11)
diff --git a/htdocs/core/modules/societe/mod_codecompta_aquarium.php b/htdocs/core/modules/societe/mod_codecompta_aquarium.php
index fc993a0d671..9d8d4346efd 100644
--- a/htdocs/core/modules/societe/mod_codecompta_aquarium.php
+++ b/htdocs/core/modules/societe/mod_codecompta_aquarium.php
@@ -37,9 +37,9 @@ class mod_codecompta_aquarium extends ModeleAccountancyCode
 	public $name = 'Aquarium';
 
 	/**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
 	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 
 	public $prefixcustomeraccountancycode;
@@ -54,11 +54,11 @@ class mod_codecompta_aquarium extends ModeleAccountancyCode
 	 */
 	public function __construct()
 	{
-	    global $conf;
+		global $conf;
 		if (!isset($conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER) || trim($conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER) == '') $conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER = '411';
-        if (!isset($conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER) || trim($conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER) == '') $conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER = '401';
+		if (!isset($conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER) || trim($conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER) == '') $conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER = '401';
 		$this->prefixcustomeraccountancycode = $conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER;
-	    $this->prefixsupplieraccountancycode = $conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER;
+		$this->prefixsupplieraccountancycode = $conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER;
 	}
 
 
@@ -70,12 +70,12 @@ class mod_codecompta_aquarium extends ModeleAccountancyCode
 	 */
 	public function info($langs)
 	{
-	    global $conf;
-	    global $form;
+		global $conf;
+		global $form;
 
 		$langs->load("companies");
 
-        $tooltip = '';
+		$tooltip = '';
 		$texte = '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 		$texte .= '<input type="hidden" name="token" value="'.newToken().'">';
 		$texte .= '<input type="hidden" name="action" value="setModuleOptions">';
@@ -93,8 +93,8 @@ class mod_codecompta_aquarium extends ModeleAccountancyCode
 		if (!empty($conf->global->COMPANY_AQUARIUM_CLEAN_REGEX))  $texte .= $langs->trans('COMPANY_AQUARIUM_CLEAN_REGEX').' = '.$conf->global->COMPANY_AQUARIUM_CLEAN_REGEX."<br>\n";
 		$texte .= '</td>';
 		$texte .= '<td class="right"><input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
-        $texte .= '</tr></table>';
-        $texte .= '</form>';
+		$texte .= '</tr></table>';
+		$texte .= '</form>';
 
 		return $texte;
 	}
@@ -111,13 +111,13 @@ class mod_codecompta_aquarium extends ModeleAccountancyCode
 	{
 		$s = '';
 		$s .= $this->prefixcustomeraccountancycode.'CUSTCODE';
-	    $s .= "<br>\n";
-	    $s .= $this->prefixsupplieraccountancycode.'SUPPCODE';
-	    return $s;
+		$s .= "<br>\n";
+		$s .= $this->prefixsupplieraccountancycode.'SUPPCODE';
+		return $s;
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Set accountancy account code for a third party into this->code
 	 *
@@ -128,7 +128,7 @@ class mod_codecompta_aquarium extends ModeleAccountancyCode
 	 */
 	public function get_code($db, $societe, $type = '')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 		$i = 0;
diff --git a/htdocs/core/modules/societe/mod_codecompta_digitaria.php b/htdocs/core/modules/societe/mod_codecompta_digitaria.php
index 9835851cc7c..6752a01a906 100644
--- a/htdocs/core/modules/societe/mod_codecompta_digitaria.php
+++ b/htdocs/core/modules/societe/mod_codecompta_digitaria.php
@@ -32,30 +32,30 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/societe/modules_societe.class.php'
  */
 class mod_codecompta_digitaria extends ModeleAccountancyCode
 {
-    /**
-     * @var string model name
-     */
-    public $name = 'Digitaria';
+	/**
+	 * @var string model name
+	 */
+	public $name = 'Digitaria';
 
-    /**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
-    public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
+	/**
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
+	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 
-    /**
-     * Prefix customer accountancy code
-     * @var string
-     */
-    public $prefixcustomeraccountancycode;
+	/**
+	 * Prefix customer accountancy code
+	 * @var string
+	 */
+	public $prefixcustomeraccountancycode;
 
-    /**
-     * Prefix supplier accountancy code
-     * @var string
-     */
-    public $prefixsupplieraccountancycode;
+	/**
+	 * Prefix supplier accountancy code
+	 * @var string
+	 */
+	public $prefixsupplieraccountancycode;
 
-    public $position = 30;
+	public $position = 30;
 
 
 	/**
@@ -63,16 +63,16 @@ class mod_codecompta_digitaria extends ModeleAccountancyCode
 	 */
 	public function __construct()
 	{
-        global $conf, $langs;
-        if (!isset($conf->global->COMPANY_DIGITARIA_MASK_CUSTOMER) || trim($conf->global->COMPANY_DIGITARIA_MASK_CUSTOMER) == '') $conf->global->COMPANY_DIGITARIA_MASK_CUSTOMER = '411';
-        if (!isset($conf->global->COMPANY_DIGITARIA_MASK_SUPPLIER) || trim($conf->global->COMPANY_DIGITARIA_MASK_SUPPLIER) == '') $conf->global->COMPANY_DIGITARIA_MASK_SUPPLIER = '401';
-        $this->prefixcustomeraccountancycode = $conf->global->COMPANY_DIGITARIA_MASK_CUSTOMER;
-        $this->prefixsupplieraccountancycode = $conf->global->COMPANY_DIGITARIA_MASK_SUPPLIER;
+		global $conf, $langs;
+		if (!isset($conf->global->COMPANY_DIGITARIA_MASK_CUSTOMER) || trim($conf->global->COMPANY_DIGITARIA_MASK_CUSTOMER) == '') $conf->global->COMPANY_DIGITARIA_MASK_CUSTOMER = '411';
+		if (!isset($conf->global->COMPANY_DIGITARIA_MASK_SUPPLIER) || trim($conf->global->COMPANY_DIGITARIA_MASK_SUPPLIER) == '') $conf->global->COMPANY_DIGITARIA_MASK_SUPPLIER = '401';
+		$this->prefixcustomeraccountancycode = $conf->global->COMPANY_DIGITARIA_MASK_CUSTOMER;
+		$this->prefixsupplieraccountancycode = $conf->global->COMPANY_DIGITARIA_MASK_SUPPLIER;
 
-        if (!isset($conf->global->COMPANY_DIGITARIA_MASK_NBCHARACTER_CUSTOMER) || trim($conf->global->COMPANY_DIGITARIA_MASK_NBCHARACTER_CUSTOMER) == '') $conf->global->COMPANY_DIGITARIA_MASK_NBCHARACTER_CUSTOMER = '5';
-        if (!isset($conf->global->COMPANY_DIGITARIA_MASK_NBCHARACTER_SUPPLIER) || trim($conf->global->COMPANY_DIGITARIA_MASK_NBCHARACTER_SUPPLIER) == '') $conf->global->COMPANY_DIGITARIA_MASK_NBCHARACTER_SUPPLIER = '5';
-        $this->customeraccountancycodecharacternumber = $conf->global->COMPANY_DIGITARIA_MASK_NBCHARACTER_CUSTOMER;
-        $this->supplieraccountancycodecharacternumber = $conf->global->COMPANY_DIGITARIA_MASK_NBCHARACTER_SUPPLIER;
+		if (!isset($conf->global->COMPANY_DIGITARIA_MASK_NBCHARACTER_CUSTOMER) || trim($conf->global->COMPANY_DIGITARIA_MASK_NBCHARACTER_CUSTOMER) == '') $conf->global->COMPANY_DIGITARIA_MASK_NBCHARACTER_CUSTOMER = '5';
+		if (!isset($conf->global->COMPANY_DIGITARIA_MASK_NBCHARACTER_SUPPLIER) || trim($conf->global->COMPANY_DIGITARIA_MASK_NBCHARACTER_SUPPLIER) == '') $conf->global->COMPANY_DIGITARIA_MASK_NBCHARACTER_SUPPLIER = '5';
+		$this->customeraccountancycodecharacternumber = $conf->global->COMPANY_DIGITARIA_MASK_NBCHARACTER_CUSTOMER;
+		$this->supplieraccountancycodecharacternumber = $conf->global->COMPANY_DIGITARIA_MASK_NBCHARACTER_SUPPLIER;
 	}
 
 	/**
@@ -83,37 +83,37 @@ class mod_codecompta_digitaria extends ModeleAccountancyCode
 	 */
 	public function info($langs)
 	{
-        global $conf, $form;
+		global $conf, $form;
 
-        $tooltip = '';
-        $texte = '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-        $texte .= '<input type="hidden" name="token" value="'.newToken().'">';
-        $texte .= '<input type="hidden" name="action" value="setModuleOptions">';
-        $texte .= '<input type="hidden" name="param1" value="COMPANY_DIGITARIA_MASK_SUPPLIER">';
-        $texte .= '<input type="hidden" name="param2" value="COMPANY_DIGITARIA_MASK_CUSTOMER">';
-        $texte .= '<input type="hidden" name="param3" value="COMPANY_DIGITARIA_MASK_NBCHARACTER_SUPPLIER">';
-        $texte .= '<input type="hidden" name="param4" value="COMPANY_DIGITARIA_MASK_NBCHARACTER_CUSTOMER">';
-        $texte .= '<table class="nobordernopadding" width="100%">';
-        $s1 = $form->textwithpicto('<input type="text" class="flat" size="4" name="value1" value="'.$conf->global->COMPANY_DIGITARIA_MASK_SUPPLIER.'">', $tooltip, 1, 1);
-        $s2 = $form->textwithpicto('<input type="text" class="flat" size="4" name="value2" value="'.$conf->global->COMPANY_DIGITARIA_MASK_CUSTOMER.'">', $tooltip, 1, 1);
-        $s3 = $form->textwithpicto('<input type="text" class="flat" size="2" name="value3" value="'.$conf->global->COMPANY_DIGITARIA_MASK_NBCHARACTER_SUPPLIER.'">', $tooltip, 1, 1);
-        $s4 = $form->textwithpicto('<input type="text" class="flat" size="2" name="value4" value="'.$conf->global->COMPANY_DIGITARIA_MASK_NBCHARACTER_CUSTOMER.'">', $tooltip, 1, 1);
-        $texte .= '<tr><td>';
-        $texte .= $langs->trans("ModuleCompanyCodeCustomer".$this->name, $s2, $s4)."<br>\n";
-        $texte .= $langs->trans("ModuleCompanyCodeSupplier".$this->name, $s1, $s3)."<br>\n";
-        $texte .= "<br>\n";
-        // Remove special char if COMPANY_DIGITARIA_REMOVE_SPECIAL is set to 1 or not set (default)
-        if (!isset($conf->global->COMPANY_DIGITARIA_REMOVE_SPECIAL) || !empty($conf->global->$conf->global->COMPANY_DIGITARIA_REMOVE_SPECIAL)) $texte .= $langs->trans('RemoveSpecialChars').' = '.yn(1)."<br>\n";
-        // Apply a regex replacement pattern on code if COMPANY_DIGITARIA_CLEAN_REGEX is set. Value must be a regex with parenthesis. The part into parenthesis is kept, the rest removed.
-        if (!empty($conf->global->COMPANY_DIGITARIA_CLEAN_REGEX))  $texte .= $langs->trans('COMPANY_DIGITARIA_CLEAN_REGEX').' = '.$conf->global->COMPANY_DIGITARIA_CLEAN_REGEX."<br>\n";
-        // Unique index on code if COMPANY_DIGITARIA_UNIQUE_CODE is set to 1 or not set (default)
-        if (!isset($conf->global->COMPANY_DIGITARIA_UNIQUE_CODE) || !empty($conf->global->COMPANY_DIGITARIA_UNIQUE_CODE)) $texte .= $langs->trans('COMPANY_DIGITARIA_UNIQUE_CODE').' = '.yn(1)."<br>\n";
-        $texte .= '</td>';
-        $texte .= '<td class="right"><input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
-        $texte .= '</tr></table>';
-        $texte .= '</form>';
+		$tooltip = '';
+		$texte = '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+		$texte .= '<input type="hidden" name="token" value="'.newToken().'">';
+		$texte .= '<input type="hidden" name="action" value="setModuleOptions">';
+		$texte .= '<input type="hidden" name="param1" value="COMPANY_DIGITARIA_MASK_SUPPLIER">';
+		$texte .= '<input type="hidden" name="param2" value="COMPANY_DIGITARIA_MASK_CUSTOMER">';
+		$texte .= '<input type="hidden" name="param3" value="COMPANY_DIGITARIA_MASK_NBCHARACTER_SUPPLIER">';
+		$texte .= '<input type="hidden" name="param4" value="COMPANY_DIGITARIA_MASK_NBCHARACTER_CUSTOMER">';
+		$texte .= '<table class="nobordernopadding" width="100%">';
+		$s1 = $form->textwithpicto('<input type="text" class="flat" size="4" name="value1" value="'.$conf->global->COMPANY_DIGITARIA_MASK_SUPPLIER.'">', $tooltip, 1, 1);
+		$s2 = $form->textwithpicto('<input type="text" class="flat" size="4" name="value2" value="'.$conf->global->COMPANY_DIGITARIA_MASK_CUSTOMER.'">', $tooltip, 1, 1);
+		$s3 = $form->textwithpicto('<input type="text" class="flat" size="2" name="value3" value="'.$conf->global->COMPANY_DIGITARIA_MASK_NBCHARACTER_SUPPLIER.'">', $tooltip, 1, 1);
+		$s4 = $form->textwithpicto('<input type="text" class="flat" size="2" name="value4" value="'.$conf->global->COMPANY_DIGITARIA_MASK_NBCHARACTER_CUSTOMER.'">', $tooltip, 1, 1);
+		$texte .= '<tr><td>';
+		$texte .= $langs->trans("ModuleCompanyCodeCustomer".$this->name, $s2, $s4)."<br>\n";
+		$texte .= $langs->trans("ModuleCompanyCodeSupplier".$this->name, $s1, $s3)."<br>\n";
+		$texte .= "<br>\n";
+		// Remove special char if COMPANY_DIGITARIA_REMOVE_SPECIAL is set to 1 or not set (default)
+		if (!isset($conf->global->COMPANY_DIGITARIA_REMOVE_SPECIAL) || !empty($conf->global->$conf->global->COMPANY_DIGITARIA_REMOVE_SPECIAL)) $texte .= $langs->trans('RemoveSpecialChars').' = '.yn(1)."<br>\n";
+		// Apply a regex replacement pattern on code if COMPANY_DIGITARIA_CLEAN_REGEX is set. Value must be a regex with parenthesis. The part into parenthesis is kept, the rest removed.
+		if (!empty($conf->global->COMPANY_DIGITARIA_CLEAN_REGEX))  $texte .= $langs->trans('COMPANY_DIGITARIA_CLEAN_REGEX').' = '.$conf->global->COMPANY_DIGITARIA_CLEAN_REGEX."<br>\n";
+		// Unique index on code if COMPANY_DIGITARIA_UNIQUE_CODE is set to 1 or not set (default)
+		if (!isset($conf->global->COMPANY_DIGITARIA_UNIQUE_CODE) || !empty($conf->global->COMPANY_DIGITARIA_UNIQUE_CODE)) $texte .= $langs->trans('COMPANY_DIGITARIA_UNIQUE_CODE').' = '.yn(1)."<br>\n";
+		$texte .= '</td>';
+		$texte .= '<td class="right"><input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
+		$texte .= '</tr></table>';
+		$texte .= '</form>';
 
-        return $texte;
+		return $texte;
 	}
 
 	/**
@@ -126,21 +126,21 @@ class mod_codecompta_digitaria extends ModeleAccountancyCode
 	 */
 	public function getExample($langs, $objsoc = 0, $type = -1)
 	{
-	    global $conf, $mysoc;
+		global $conf, $mysoc;
 
-        $s = $langs->trans("ThirdPartyName").": ".$mysoc->name;
-        $s .= "<br>\n";
+		$s = $langs->trans("ThirdPartyName").": ".$mysoc->name;
+		$s .= "<br>\n";
 
-        if (!isset($conf->global->COMPANY_DIGITARIA_REMOVE_SPECIAL)) $thirdpartylabelexample = preg_replace('/([^a-z0-9])/i', '', $mysoc->name);
-        $s .= "<br>\n";
-        $s .= $this->prefixcustomeraccountancycode.strtoupper(substr($thirdpartylabelexample, 0, $this->customeraccountancycodecharacternumber));
-        $s .= "<br>\n";
-        $s .= $this->prefixsupplieraccountancycode.strtoupper(substr($thirdpartylabelexample, 0, $this->supplieraccountancycodecharacternumber));
-        return $s;
+		if (!isset($conf->global->COMPANY_DIGITARIA_REMOVE_SPECIAL)) $thirdpartylabelexample = preg_replace('/([^a-z0-9])/i', '', $mysoc->name);
+		$s .= "<br>\n";
+		$s .= $this->prefixcustomeraccountancycode.strtoupper(substr($thirdpartylabelexample, 0, $this->customeraccountancycodecharacternumber));
+		$s .= "<br>\n";
+		$s .= $this->prefixsupplieraccountancycode.strtoupper(substr($thirdpartylabelexample, 0, $this->supplieraccountancycodecharacternumber));
+		return $s;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
 	 *  Set accountancy account code for a third party into this->code
 	 *
 	 *  @param	DoliDB	$db              Database handler
@@ -150,116 +150,116 @@ class mod_codecompta_digitaria extends ModeleAccountancyCode
 	 */
 	public function get_code($db, $societe, $type = '')
 	{
-        // phpcs:enable
-        global $conf;
-        $i = 0;
-        $this->code = '';
+		// phpcs:enable
+		global $conf;
+		$i = 0;
+		$this->code = '';
 
 		if (is_object($societe))
 		{
-            dol_syslog("mod_codecompta_digitaria::get_code search code for type=".$type." & company=".(!empty($societe->name) ? $societe->name : ''));
+			dol_syslog("mod_codecompta_digitaria::get_code search code for type=".$type." & company=".(!empty($societe->name) ? $societe->name : ''));
 
 			if ($type == 'supplier') {
-                $codetouse = $societe->name;
-                $prefix = $this->prefixsupplieraccountancycode;
-                $width = $this->supplieraccountancycodecharacternumber;
+				$codetouse = $societe->name;
+				$prefix = $this->prefixsupplieraccountancycode;
+				$width = $this->supplieraccountancycodecharacternumber;
 			} elseif ($type == 'customer')
-            {
-                $codetouse = $societe->name;
-                $prefix = $this->prefixcustomeraccountancycode;
-                $width = $this->customeraccountancycodecharacternumber;
-            } else {
-                $this->error = 'Bad value for parameter type';
-                return -1;
-            }
+			{
+				$codetouse = $societe->name;
+				$prefix = $this->prefixcustomeraccountancycode;
+				$width = $this->customeraccountancycodecharacternumber;
+			} else {
+				$this->error = 'Bad value for parameter type';
+				return -1;
+			}
 
-            // Remove special char if COMPANY_DIGITARIA_REMOVE_SPECIAL is set to 1 or not set (default)
-            if (!isset($conf->global->COMPANY_DIGITARIA_REMOVE_SPECIAL) || !empty($conf->global->COMPANY_DIGITARIA_REMOVE_SPECIAL)) $codetouse = preg_replace('/([^a-z0-9])/i', '', $codetouse);
-            // Apply a regex replacement pattern on code if COMPANY_DIGITARIA_CLEAN_REGEX is set. Value must be a regex with parenthesis. The part into parenthesis is kept, the rest removed.
-            if (!empty($conf->global->COMPANY_DIGITARIA_CLEAN_REGEX))	// Example: $conf->global->COMPANY_DIGITARIA_CLEAN_REGEX='^..(..)..';
-            {
-                $codetouse = preg_replace('/'.$conf->global->COMPANY_DIGITARIA_CLEAN_REGEX.'/', '\1\2\3', $codetouse);
-            }
+			// Remove special char if COMPANY_DIGITARIA_REMOVE_SPECIAL is set to 1 or not set (default)
+			if (!isset($conf->global->COMPANY_DIGITARIA_REMOVE_SPECIAL) || !empty($conf->global->COMPANY_DIGITARIA_REMOVE_SPECIAL)) $codetouse = preg_replace('/([^a-z0-9])/i', '', $codetouse);
+			// Apply a regex replacement pattern on code if COMPANY_DIGITARIA_CLEAN_REGEX is set. Value must be a regex with parenthesis. The part into parenthesis is kept, the rest removed.
+			if (!empty($conf->global->COMPANY_DIGITARIA_CLEAN_REGEX))	// Example: $conf->global->COMPANY_DIGITARIA_CLEAN_REGEX='^..(..)..';
+			{
+				$codetouse = preg_replace('/'.$conf->global->COMPANY_DIGITARIA_CLEAN_REGEX.'/', '\1\2\3', $codetouse);
+			}
 
-            $this->code = $prefix.strtoupper(substr($codetouse, 0, $width));
-            dol_syslog("mod_codecompta_digitaria::get_code search code proposed=".$this->code);
+			$this->code = $prefix.strtoupper(substr($codetouse, 0, $width));
+			dol_syslog("mod_codecompta_digitaria::get_code search code proposed=".$this->code);
 
-            // Unique index on code if COMPANY_DIGITARIA_UNIQUE_CODE is set to 1 or not set (default)
-            if (!isset($conf->global->COMPANY_DIGITARIA_UNIQUE_CODE) || !empty($conf->global->COMPANY_DIGITARIA_UNIQUE_CODE))
-            {
-                $disponibility = $this->checkIfAccountancyCodeIsAlreadyUsed($db, $this->code, $type);
+			// Unique index on code if COMPANY_DIGITARIA_UNIQUE_CODE is set to 1 or not set (default)
+			if (!isset($conf->global->COMPANY_DIGITARIA_UNIQUE_CODE) || !empty($conf->global->COMPANY_DIGITARIA_UNIQUE_CODE))
+			{
+				$disponibility = $this->checkIfAccountancyCodeIsAlreadyUsed($db, $this->code, $type);
 
-                while ($disponibility <> 0 && $i < 100) {
-                    $widthsupplier = $this->supplieraccountancycodecharacternumber;
-                    $widthcustomer = $this->customeraccountancycodecharacternumber;
+				while ($disponibility <> 0 && $i < 100) {
+					$widthsupplier = $this->supplieraccountancycodecharacternumber;
+					$widthcustomer = $this->customeraccountancycodecharacternumber;
 
-                    if ($i <= 9) {
-                        $a = 1;
-                    }
-                    if ($i >= 10 && $i <= 99) {
-                        $a = 2;
-                    }
+					if ($i <= 9) {
+						$a = 1;
+					}
+					if ($i >= 10 && $i <= 99) {
+						$a = 2;
+					}
 
-                    if ($type == 'supplier') {
-                        $this->code = $prefix.strtoupper(substr($codetouse, 0, $widthsupplier - $a)).$i;
-                    } elseif ($type == 'customer') {
-                        $this->code = $prefix.strtoupper(substr($codetouse, 0, $widthcustomer - $a)).$i;
-                    }
-                    $disponibility = $this->checkIfAccountancyCodeIsAlreadyUsed($db, $this->code, $type);
+					if ($type == 'supplier') {
+						$this->code = $prefix.strtoupper(substr($codetouse, 0, $widthsupplier - $a)).$i;
+					} elseif ($type == 'customer') {
+						$this->code = $prefix.strtoupper(substr($codetouse, 0, $widthcustomer - $a)).$i;
+					}
+					$disponibility = $this->checkIfAccountancyCodeIsAlreadyUsed($db, $this->code, $type);
 
-                    $i++;
-                }
-            } else {
-                $disponibility == 0;
-            }
+					$i++;
+				}
+			} else {
+				$disponibility == 0;
+			}
 		}
 
-        if ($disponibility == 0)
-        {
-            return 0; // return ok
-        } else {
-            return -1; // return ko
-        }
+		if ($disponibility == 0)
+		{
+			return 0; // return ok
+		} else {
+			return -1; // return ko
+		}
 	}
 
-    /**
-     *  Check accountancy account code for a third party into this->code
-     *
-     *  @param	DoliDB	$db             Database handler
-     *  @param  string	$code           Code of third party
-     *  @param  int		$type			'customer' or 'supplier'
-     *  @return	int						>=0 if OK, <0 if KO
-     */
-    public function checkIfAccountancyCodeIsAlreadyUsed($db, $code, $type = '')
-    {
-        if ($type == 'supplier')
-        {
-            $typethirdparty = 'code_compta_fournisseur';
-        } elseif ($type == 'customer')
-        {
-            $typethirdparty = 'code_compta';
-        } else {
-            $this->error = 'Bad value for parameter type';
-            return -1;
-        }
+	/**
+	 *  Check accountancy account code for a third party into this->code
+	 *
+	 *  @param	DoliDB	$db             Database handler
+	 *  @param  string	$code           Code of third party
+	 *  @param  int		$type			'customer' or 'supplier'
+	 *  @return	int						>=0 if OK, <0 if KO
+	 */
+	public function checkIfAccountancyCodeIsAlreadyUsed($db, $code, $type = '')
+	{
+		if ($type == 'supplier')
+		{
+			$typethirdparty = 'code_compta_fournisseur';
+		} elseif ($type == 'customer')
+		{
+			$typethirdparty = 'code_compta';
+		} else {
+			$this->error = 'Bad value for parameter type';
+			return -1;
+		}
 
-        $sql = "SELECT ".$typethirdparty." FROM ".MAIN_DB_PREFIX."societe";
-        $sql .= " WHERE ".$typethirdparty." = '".$db->escape($code)."'";
+		$sql = "SELECT ".$typethirdparty." FROM ".MAIN_DB_PREFIX."societe";
+		$sql .= " WHERE ".$typethirdparty." = '".$db->escape($code)."'";
 
-        $resql = $db->query($sql);
-        if ($resql)
-        {
-            if ($db->num_rows($resql) == 0)
-            {
-                dol_syslog("mod_codecompta_digitaria::checkIfAccountancyCodeIsAlreadyUsed '".$code."' available");
-                return 0; // Available
-            } else {
-                dol_syslog("mod_codecompta_digitaria::checkIfAccountancyCodeIsAlreadyUsed '".$code."' not available");
-                return -1; // Not available
-            }
-        } else {
-            $this->error = $db->error()." sql=".$sql;
-            return -2; // Error
-        }
-    }
+		$resql = $db->query($sql);
+		if ($resql)
+		{
+			if ($db->num_rows($resql) == 0)
+			{
+				dol_syslog("mod_codecompta_digitaria::checkIfAccountancyCodeIsAlreadyUsed '".$code."' available");
+				return 0; // Available
+			} else {
+				dol_syslog("mod_codecompta_digitaria::checkIfAccountancyCodeIsAlreadyUsed '".$code."' not available");
+				return -1; // Not available
+			}
+		} else {
+			$this->error = $db->error()." sql=".$sql;
+			return -2; // Error
+		}
+	}
 }
diff --git a/htdocs/core/modules/societe/mod_codecompta_panicum.php b/htdocs/core/modules/societe/mod_codecompta_panicum.php
index 732090a9340..04ae16a1630 100644
--- a/htdocs/core/modules/societe/mod_codecompta_panicum.php
+++ b/htdocs/core/modules/societe/mod_codecompta_panicum.php
@@ -36,9 +36,9 @@ class mod_codecompta_panicum extends ModeleAccountancyCode
 	public $name = 'Panicum';
 
 	/**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
 	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 
 	public $position = 10;
@@ -76,7 +76,7 @@ class mod_codecompta_panicum extends ModeleAccountancyCode
 		return '';
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Set accountancy account code for a third party into this->code
 	 *
@@ -87,7 +87,7 @@ class mod_codecompta_panicum extends ModeleAccountancyCode
 	 */
 	public function get_code($db, $societe, $type = '')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$this->code = '';
 
 		if (is_object($societe)) {
diff --git a/htdocs/core/modules/societe/modules_societe.class.php b/htdocs/core/modules/societe/modules_societe.class.php
index df280e11679..6fc84ed0669 100644
--- a/htdocs/core/modules/societe/modules_societe.class.php
+++ b/htdocs/core/modules/societe/modules_societe.class.php
@@ -140,11 +140,17 @@ abstract class ModeleThirdPartyCode
 		global $langs;
 		$langs->load("admin");
 
-		if ($this->version == 'development') return $langs->trans("VersionDevelopment");
-		if ($this->version == 'experimental') return $langs->trans("VersionExperimental");
-		if ($this->version == 'dolibarr') return DOL_VERSION;
-		if ($this->version) return $this->version;
-		return $langs->trans("NotAvailable");
+		if ($this->version == 'development') {
+			return $langs->trans("VersionDevelopment");
+		} elseif ($this->version == 'experimental') {
+			return $langs->trans("VersionExperimental");
+		} elseif ($this->version == 'dolibarr') {
+			return DOL_VERSION;
+		} elseif ($this->version) {
+			return $this->version;
+		} else {
+			return $langs->trans("NotAvailable");
+		}
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -153,7 +159,7 @@ abstract class ModeleThirdPartyCode
 	 *
 	 *  @param	DoliDB	$db     			Database handler
 	 *  @param  integer	$maxfilenamelength  Max length of value to show
-	 *  @return	array						List of numbers
+	 *  @return	array|int					List of numbers
 	 */
 	public static function liste_modeles($db, $maxfilenamelength = 0)
 	{
@@ -193,31 +199,32 @@ abstract class ModeleThirdPartyCode
 		$langs->load("admin");
 
 		$s = '';
-		if ($type == -1) $s .= $langs->trans("Name").': <b>'.$this->getNom($langs).'</b><br>';
-		if ($type == -1) $s .= $langs->trans("Version").': <b>'.$this->getVersion().'</b><br>';
-		if ($type == 0)  $s .= $langs->trans("CustomerCodeDesc").'<br>';
-		if ($type == 1)  $s .= $langs->trans("SupplierCodeDesc").'<br>';
-		if ($type != -1) $s .= $langs->trans("ValidityControledByModule").': <b>'.$this->getNom($langs).'</b><br>';
+		if ($type == -1) {
+			$s .= $langs->trans("Name").': <b>'.$this->getNom($langs).'</b><br>';
+		} elseif ($type == -1) {
+			$s .= $langs->trans("Version").': <b>'.$this->getVersion().'</b><br>';
+		} elseif ($type == 0) {
+			$s .= $langs->trans("CustomerCodeDesc").'<br>';
+		} elseif ($type == 1) {
+			$s .= $langs->trans("SupplierCodeDesc").'<br>';
+		} elseif ($type != -1) {
+			$s .= $langs->trans("ValidityControledByModule").': <b>'.$this->getNom($langs).'</b><br>';
+		}
 		$s .= '<br>';
 		$s .= '<u>'.$langs->trans("ThisIsModuleRules").':</u><br>';
-		if ($type == 0)
-		{
+		if ($type == 0) {
 			$s .= $langs->trans("RequiredIfCustomer").': ';
 			if (!empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && !empty($this->code_null)) $s .= '<strike>';
 			$s .= yn(!$this->code_null, 1, 2);
 			if (!empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && !empty($this->code_null)) $s .= '</strike> '.yn(1, 1, 2).' ('.$langs->trans("ForcedToByAModule", $langs->transnoentities("yes")).')';
 			$s .= '<br>';
-		}
-		if ($type == 1)
-		{
+		} elseif ($type == 1) {
 			$s .= $langs->trans("RequiredIfSupplier").': ';
 			if (!empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && !empty($this->code_null)) $s .= '<strike>';
 			$s .= yn(!$this->code_null, 1, 2);
 			if (!empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && !empty($this->code_null)) $s .= '</strike> '.yn(1, 1, 2).' ('.$langs->trans("ForcedToByAModule", $langs->transnoentities("yes")).')';
 			$s .= '<br>';
-		}
-		if ($type == -1)
-		{
+		} elseif ($type == -1) {
 			$s .= $langs->trans("Required").': ';
 			if (!empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && !empty($this->code_null)) $s .= '<strike>';
 			$s .= yn(!$this->code_null, 1, 2);
@@ -230,14 +237,12 @@ abstract class ModeleThirdPartyCode
 		$s .= $langs->trans("CanBeModifiedIfKo").': '.yn($this->code_modifiable_invalide, 1, 2).'<br>';
 		$s .= $langs->trans("AutomaticCode").': '.yn($this->code_auto, 1, 2).'<br>';
 		$s .= '<br>';
-		if ($type == 0 || $type == -1)
-		{
+		if ($type == 0 || $type == -1) {
 			$nextval = $this->getNextValue($soc, 0);
 			if (empty($nextval)) $nextval = $langs->trans("Undefined");
 			$s .= $langs->trans("NextValue").($type == -1 ? ' ('.$langs->trans("Customer").')' : '').': <b>'.$nextval.'</b><br>';
 		}
-		if ($type == 1 || $type == -1)
-		{
+		if ($type == 1 || $type == -1) {
 			$nextval = $this->getNextValue($soc, 1);
 			if (empty($nextval)) $nextval = $langs->trans("Undefined");
 			$s .= $langs->trans("NextValue").($type == -1 ? ' ('.$langs->trans("Supplier").')' : '').': <b>'.$nextval.'</b>';
@@ -317,11 +322,17 @@ abstract class ModeleAccountancyCode
 		global $langs;
 		$langs->load("admin");
 
-		if ($this->version == 'development') return $langs->trans("VersionDevelopment");
-		if ($this->version == 'experimental') return $langs->trans("VersionExperimental");
-		if ($this->version == 'dolibarr') return DOL_VERSION;
-		if ($this->version) return $this->version;
-		return $langs->trans("NotAvailable");
+		if ($this->version == 'development') {
+			return $langs->trans("VersionDevelopment");
+		} elseif ($this->version == 'experimental') {
+			return $langs->trans("VersionExperimental");
+		} elseif ($this->version == 'dolibarr') {
+			return DOL_VERSION;
+		} elseif ($this->version) {
+			return $this->version;
+		} else {
+			return $langs->trans("NotAvailable");
+		}
 	}
 
 	/**
@@ -339,20 +350,20 @@ abstract class ModeleAccountancyCode
 		$langs->load("admin");
 
 		$s = '';
-		if ($type == -1) $s .= $langs->trans("Name").': <b>'.$this->name.'</b><br>';
-		if ($type == -1) $s .= $langs->trans("Version").': <b>'.$this->getVersion().'</b><br>';
+		if ($type == -1) {
+			$s .= $langs->trans("Name").': <b>'.$this->name.'</b><br>';
+			$s .= $langs->trans("Version").': <b>'.$this->getVersion().'</b><br>';
+		}
 		//$s.='<br>';
 		//$s.='<u>'.$langs->trans("ThisIsModuleRules").':</u><br>';
 		$s .= '<br>';
-		if ($type == 0 || $type == -1)
-		{
+		if ($type == 0 || $type == -1) {
 			$result = $this->get_code($db, $soc, 'customer');
 			$nextval = $this->code;
 			if (empty($nextval)) $nextval = $langs->trans("Undefined");
 			$s .= $langs->trans("NextValue").($type == -1 ? ' ('.$langs->trans("Customer").')' : '').': <b>'.$nextval.'</b><br>';
 		}
-		if ($type == 1 || $type == -1)
-		{
+		if ($type == 1 || $type == -1) {
 			$result = $this->get_code($db, $soc, 'supplier');
 			$nextval = $this->code;
 			if (empty($nextval)) $nextval = $langs->trans("Undefined");
diff --git a/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php b/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php
index 89be1983115..89a5ea9d784 100644
--- a/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php
+++ b/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php
@@ -323,7 +323,7 @@ class doc_generic_stock_odt extends ModelePDFStock
 				'__FROM_EMAIL__' => $this->emetteur->email,
 				'__TOTAL_TTC__' => $object->total_ttc,
 				'__TOTAL_HT__' => $object->total_ht,
-				'__TOTAL_VAT__' => $object->total_vat
+				'__TOTAL_VAT__' => $object->total_tva
 				);
 				complete_substitutions_array($substitutionarray, $langs, $object);
 				// Call the ODTSubstitution hook
diff --git a/htdocs/core/modules/stock/modules_stock.php b/htdocs/core/modules/stock/modules_stock.php
index 35dc1c68a72..cd4fed5665f 100644
--- a/htdocs/core/modules/stock/modules_stock.php
+++ b/htdocs/core/modules/stock/modules_stock.php
@@ -23,31 +23,31 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commondocgenerator.class.php';
  */
 abstract class ModelePDFStock extends CommonDocGenerator
 {
-    /**
-     * @var string Error code (or message)
-     */
-    public $error = '';
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error = '';
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Return list of active generation modules
-     *
-     *  @param  DoliDB      $db                 Database handler
-     *  @param  integer     $maxfilenamelength  Max length of value to show
-     *  @return array                           List of templates
-     */
-    public static function liste_modeles($db, $maxfilenamelength = 0)
-    {
-        // phpcs:enable
-        global $conf;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Return list of active generation modules
+	 *
+	 *  @param  DoliDB      $db                 Database handler
+	 *  @param  integer     $maxfilenamelength  Max length of value to show
+	 *  @return array                           List of templates
+	 */
+	public static function liste_modeles($db, $maxfilenamelength = 0)
+	{
+		// phpcs:enable
+		global $conf;
 
-        $type = 'stock';
-        $liste = array();
+		$type = 'stock';
+		$liste = array();
 
-        include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-        $liste = getListOfModels($db, $type, $maxfilenamelength);
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+		$liste = getListOfModels($db, $type, $maxfilenamelength);
 
-        return $liste;
-    }
+		return $liste;
+	}
 }
diff --git a/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_cactus.php b/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_cactus.php
index 2b528e1154f..74c487b4d25 100644
--- a/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_cactus.php
+++ b/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_cactus.php
@@ -33,16 +33,16 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_invoice/modules_facturefo
  */
 class mod_facture_fournisseur_cactus extends ModeleNumRefSuppliersInvoices
 {
-    /**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
-    public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
+	/**
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
+	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 
 	/**
-     * @var string Error code (or message)
-     */
-    public $error = '';
+	 * @var string Error code (or message)
+	 */
+	public $error = '';
 
 	/**
 	 * @var string Nom du modele
@@ -63,28 +63,28 @@ class mod_facture_fournisseur_cactus extends ModeleNumRefSuppliersInvoices
 	public $prefixdeposit = 'SD';
 
 
-    /**
-     *  Return description of numbering model
-     *
-     *  @return     string      Text with description
-     */
-    public function info()
-    {
-        global $langs;
-        $langs->load("bills");
-        return $langs->trans("CactusNumRefModelDesc1", $this->prefixinvoice, $this->prefixcreditnote, $this->prefixdeposit);
-    }
+	/**
+	 *  Return description of numbering model
+	 *
+	 *  @return     string      Text with description
+	 */
+	public function info()
+	{
+		global $langs;
+		$langs->load("bills");
+		return $langs->trans("CactusNumRefModelDesc1", $this->prefixinvoice, $this->prefixcreditnote, $this->prefixdeposit);
+	}
 
 
-    /**
-     *  Returns a numbering example
-     *
-     *  @return     string      Example
-     */
-    public function getExample()
-    {
-        return $this->prefixinvoice."1301-0001";
-    }
+	/**
+	 *  Returns a numbering example
+	 *
+	 *  @return     string      Example
+	 */
+	public function getExample()
+	{
+		return $this->prefixinvoice."1301-0001";
+	}
 
 
 	/**
@@ -160,84 +160,84 @@ class mod_facture_fournisseur_cactus extends ModeleNumRefSuppliersInvoices
 			$this->error = $langs->trans('ErrorNumRefModel', $max);
 			return false;
 		}
-    }
+	}
 
-    /**
-     * Return next value
-     *
-     * @param	Societe		$objsoc     Object third party
-     * @param  	Object		$object		Object invoice
-     * @param   string		$mode       'next' for next value or 'last' for last value
-     * @return 	string      			Value if OK, 0 if KO
-     */
-    public function getNextValue($objsoc, $object, $mode = 'next')
-    {
-        global $db, $conf;
+	/**
+	 * Return next value
+	 *
+	 * @param	Societe		$objsoc     Object third party
+	 * @param  	Object		$object		Object invoice
+	 * @param   string		$mode       'next' for next value or 'last' for last value
+	 * @return 	string      			Value if OK, 0 if KO
+	 */
+	public function getNextValue($objsoc, $object, $mode = 'next')
+	{
+		global $db, $conf;
 
-        $prefix = $this->prefixinvoice;
-        if ($object->type == 2) $prefix = $this->prefixcreditnote;
-        elseif ($object->type == 3) $prefix = $this->prefixdeposit;
+		$prefix = $this->prefixinvoice;
+		if ($object->type == 2) $prefix = $this->prefixcreditnote;
+		elseif ($object->type == 3) $prefix = $this->prefixdeposit;
 
-        // First, we get the max value
-        $posindice = strlen($prefix) + 6;
-        $sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max"; // This is standard SQL
-        $sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn";
-        $sql .= " WHERE ref LIKE '".$db->escape($prefix)."____-%'";
-        $sql .= " AND entity = ".$conf->entity;
+		// First, we get the max value
+		$posindice = strlen($prefix) + 6;
+		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max"; // This is standard SQL
+		$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn";
+		$sql .= " WHERE ref LIKE '".$db->escape($prefix)."____-%'";
+		$sql .= " AND entity = ".$conf->entity;
 
-        $resql = $db->query($sql);
-        dol_syslog(get_class($this)."::getNextValue", LOG_DEBUG);
-        if ($resql)
-        {
-        	$obj = $db->fetch_object($resql);
-        	if ($obj) $max = intval($obj->max);
-        	else $max = 0;
-        } else {
-        	return -1;
-        }
+		$resql = $db->query($sql);
+		dol_syslog(get_class($this)."::getNextValue", LOG_DEBUG);
+		if ($resql)
+		{
+			$obj = $db->fetch_object($resql);
+			if ($obj) $max = intval($obj->max);
+			else $max = 0;
+		} else {
+			return -1;
+		}
 
-        if ($mode == 'last')
-        {
-    		if ($max >= (pow(10, 4) - 1)) $num = $max; // If counter > 9999, we do not format on 4 chars, we take number as it is
-    		else $num = sprintf("%04s", $max);
+		if ($mode == 'last')
+		{
+			if ($max >= (pow(10, 4) - 1)) $num = $max; // If counter > 9999, we do not format on 4 chars, we take number as it is
+			else $num = sprintf("%04s", $max);
 
-        	$ref = '';
-        	$sql = "SELECT ref as ref";
-        	$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn";
-        	$sql .= " WHERE ref LIKE '".$db->escape($prefix)."____-".$num."'";
-        	$sql .= " AND entity = ".$conf->entity;
+			$ref = '';
+			$sql = "SELECT ref as ref";
+			$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn";
+			$sql .= " WHERE ref LIKE '".$db->escape($prefix)."____-".$num."'";
+			$sql .= " AND entity = ".$conf->entity;
 
-        	dol_syslog(get_class($this)."::getNextValue", LOG_DEBUG);
-        	$resql = $db->query($sql);
-        	if ($resql)
-        	{
-        		$obj = $db->fetch_object($resql);
-        		if ($obj) $ref = $obj->ref;
-        	} else dol_print_error($db);
+			dol_syslog(get_class($this)."::getNextValue", LOG_DEBUG);
+			$resql = $db->query($sql);
+			if ($resql)
+			{
+				$obj = $db->fetch_object($resql);
+				if ($obj) $ref = $obj->ref;
+			} else dol_print_error($db);
 
-        	return $ref;
-        } elseif ($mode == 'next')
-        {
-        	$date = $object->date; // This is invoice date (not creation date)
-        	$yymm = strftime("%y%m", $date);
+			return $ref;
+		} elseif ($mode == 'next')
+		{
+			$date = $object->date; // This is invoice date (not creation date)
+			$yymm = strftime("%y%m", $date);
 
-        	if ($max >= (pow(10, 4) - 1)) $num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
-        	else $num = sprintf("%04s", $max + 1);
+			if ($max >= (pow(10, 4) - 1)) $num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
+			else $num = sprintf("%04s", $max + 1);
 
-        	dol_syslog(get_class($this)."::getNextValue return ".$prefix.$yymm."-".$num);
-        	return $prefix.$yymm."-".$num;
-        } else dol_print_error('', 'Bad parameter for getNextValue');
-    }
+			dol_syslog(get_class($this)."::getNextValue return ".$prefix.$yymm."-".$num);
+			return $prefix.$yymm."-".$num;
+		} else dol_print_error('', 'Bad parameter for getNextValue');
+	}
 
 
-    /**
-     * Return next free value
-     *
-     * @param	Societe		$objsoc     	Object third party
-     * @param	string		$objforref		Object for number to search
-     * @param   string		$mode       	'next' for next value or 'last' for last value
-     * @return  string      				Next free value
-     */
+	/**
+	 * Return next free value
+	 *
+	 * @param	Societe		$objsoc     	Object third party
+	 * @param	string		$objforref		Object for number to search
+	 * @param   string		$mode       	'next' for next value or 'last' for last value
+	 * @return  string      				Next free value
+	 */
 	public function getNumRef($objsoc, $objforref, $mode = 'next')
 	{
 		return $this->getNextValue($objsoc, $objforref, $mode);
diff --git a/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php b/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php
index 3805a941476..db24e32280c 100644
--- a/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php
+++ b/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php
@@ -37,15 +37,15 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_invoice/modules_facturefo
 class mod_facture_fournisseur_tulip extends ModeleNumRefSuppliersInvoices
 {
 	/**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
 	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 
 	/**
-     * @var string Error code (or message)
-     */
-    public $error = '';
+	 * @var string Error code (or message)
+	 */
+	public $error = '';
 
 	/**
 	 * @var string Nom du modele
@@ -60,17 +60,17 @@ class mod_facture_fournisseur_tulip extends ModeleNumRefSuppliersInvoices
 	public $name = 'Tulip';
 
 
-    /**
-     *  Returns the description of the model numbering
-     *
-     * 	@return     string      Description Text
-     */
-    public function info()
-    {
-        global $conf, $langs;
+	/**
+	 *  Returns the description of the model numbering
+	 *
+	 * 	@return     string      Description Text
+	 */
+	public function info()
+	{
+		global $conf, $langs;
 
 		// Load translation files required by the page
-        $langs->loadLangs(array("bills", "admin"));
+		$langs->loadLangs(array("bills", "admin"));
 
 		$form = new Form($this->db);
 
@@ -79,8 +79,8 @@ class mod_facture_fournisseur_tulip extends ModeleNumRefSuppliersInvoices
 		$texte .= '<input type="hidden" name="token" value="'.newToken().'">';
 		$texte .= '<input type="hidden" name="action" value="updateMask">';
 		$texte .= '<input type="hidden" name="maskconstinvoice" value="SUPPLIER_INVOICE_TULIP_MASK">';
-        $texte .= '<input type="hidden" name="maskconstreplacement" value="SUPPLIER_REPLACEMENT_TULIP_MASK">';
-        $texte .= '<input type="hidden" name="maskconstcredit" value="SUPPLIER_CREDIT_TULIP_MASK">';
+		$texte .= '<input type="hidden" name="maskconstreplacement" value="SUPPLIER_REPLACEMENT_TULIP_MASK">';
+		$texte .= '<input type="hidden" name="maskconstcredit" value="SUPPLIER_CREDIT_TULIP_MASK">';
 		$texte .= '<input type="hidden" name="maskconstdeposit" value="SUPPLIER_DEPOSIT_TULIP_MASK">';
 		$texte .= '<table class="nobordernopadding" width="100%">';
 
@@ -106,36 +106,36 @@ class mod_facture_fournisseur_tulip extends ModeleNumRefSuppliersInvoices
 
 		if ($conf->global->MAIN_FEATURE_LEVEL >= 2)
 		{
-    		// Parametrage du prefix des replacement
-    		$texte .= '<tr><td>'.$langs->trans("Mask").' ('.$langs->trans("InvoiceReplacement").'):</td>';
-    		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskreplacement" value="'.$conf->global->SUPPLIER_REPLACEMENT_TULIP_MASK.'">', $tooltip, 1, 1).'</td>';
-    		$texte .= '</tr>';
+			// Parametrage du prefix des replacement
+			$texte .= '<tr><td>'.$langs->trans("Mask").' ('.$langs->trans("InvoiceReplacement").'):</td>';
+			$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskreplacement" value="'.$conf->global->SUPPLIER_REPLACEMENT_TULIP_MASK.'">', $tooltip, 1, 1).'</td>';
+			$texte .= '</tr>';
 
 
-    		// Parametrage du prefix des acomptes
-    		$texte .= '<tr><td>'.$langs->trans("Mask").' ('.$langs->trans("InvoiceDeposit").'):</td>';
-    		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskdeposit" value="'.$conf->global->SUPPLIER_DEPOSIT_TULIP_MASK.'">', $tooltip, 1, 1).'</td>';
-    		$texte .= '</tr>';
+			// Parametrage du prefix des acomptes
+			$texte .= '<tr><td>'.$langs->trans("Mask").' ('.$langs->trans("InvoiceDeposit").'):</td>';
+			$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskdeposit" value="'.$conf->global->SUPPLIER_DEPOSIT_TULIP_MASK.'">', $tooltip, 1, 1).'</td>';
+			$texte .= '</tr>';
 		}
 
 		$texte .= '</table>';
 		$texte .= '</form>';
 
 		return $texte;
-    }
+	}
 
-    /**
-     *  Returns a numbering example
-     *
-     *  @return     string     Example
-     */
-    public function getExample()
-    {
-    	global $conf, $langs, $mysoc;
+	/**
+	 *  Returns a numbering example
+	 *
+	 *  @return     string     Example
+	 */
+	public function getExample()
+	{
+		global $conf, $langs, $mysoc;
 
-    	$old_code_client = $mysoc->code_client;
-    	$mysoc->code_client = 'CCCCCCCCCC';
-    	$numExample = $this->getNextValue($mysoc, '');
+		$old_code_client = $mysoc->code_client;
+		$mysoc->code_client = 'CCCCCCCCCC';
+		$numExample = $this->getNextValue($mysoc, '');
 		$mysoc->code_client = $old_code_client;
 
 		if (!$numExample)
@@ -143,18 +143,18 @@ class mod_facture_fournisseur_tulip extends ModeleNumRefSuppliersInvoices
 			$numExample = $langs->trans('NotConfigured');
 		}
 		return $numExample;
-    }
+	}
 
 	/**
 	 * Return next value
 	 *
 	 * @param	Societe		$objsoc     Object third party
 	 * @param  	Object	    $object		Object invoice
-     * @param	string		$mode       'next' for next value or 'last' for last value
-     * @return 	string      			Value if OK, 0 if KO
+	 * @param	string		$mode       'next' for next value or 'last' for last value
+	 * @return 	string      			Value if OK, 0 if KO
 	 */
-    public function getNextValue($objsoc, $object, $mode = 'next')
-    {
+	public function getNextValue($objsoc, $object, $mode = 'next')
+	{
 		global $db, $conf;
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
@@ -181,18 +181,18 @@ class mod_facture_fournisseur_tulip extends ModeleNumRefSuppliersInvoices
 		$numFinal = get_next_value($db, $mask, 'facture_fourn', 'ref', '', $objsoc, $object->date);
 
 		return  $numFinal;
-    }
+	}
 
-    /**
-     * Return next free value
-     *
-     *  @param  Societe     $objsoc         Object third party
-     *  @param  string      $objforref      Object for number to search
-     *  @param  string      $mode           'next' for next value or 'last' for last value
-     *  @return string                      Next free value
-     */
-    public function getNumRef($objsoc, $objforref, $mode = 'next')
-    {
-        return $this->getNextValue($objsoc, $objforref, $mode);
-    }
+	/**
+	 * Return next free value
+	 *
+	 *  @param  Societe     $objsoc         Object third party
+	 *  @param  string      $objforref      Object for number to search
+	 *  @param  string      $mode           'next' for next value or 'last' for last value
+	 *  @return string                      Next free value
+	 */
+	public function getNumRef($objsoc, $objforref, $mode = 'next')
+	{
+		return $this->getNextValue($objsoc, $objforref, $mode);
+	}
 }
diff --git a/htdocs/core/modules/supplier_invoice/modules_facturefournisseur.php b/htdocs/core/modules/supplier_invoice/modules_facturefournisseur.php
index aeeb79a1310..855809c0a58 100644
--- a/htdocs/core/modules/supplier_invoice/modules_facturefournisseur.php
+++ b/htdocs/core/modules/supplier_invoice/modules_facturefournisseur.php
@@ -40,17 +40,17 @@ abstract class ModelePDFSuppliersInvoices extends CommonDocGenerator
 	public $error = '';
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return list of active generation models
 	 *
-     *  @param	DoliDB	$db     			Database handler
-     *  @param  integer	$maxfilenamelength  Max length of value to show
-     *  @return	array						List of numbers
+	 *  @param	DoliDB	$db     			Database handler
+	 *  @param  integer	$maxfilenamelength  Max length of value to show
+	 *  @return	array						List of numbers
 	 */
 	public static function liste_modeles($db, $maxfilenamelength = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 		$type = 'invoice_supplier';
@@ -77,7 +77,7 @@ abstract class ModeleNumRefSuppliersInvoices
 	 *
 	 *   @return	boolean     true if model can be used
 	 */
-    public function isEnabled()
+	public function isEnabled()
 	{
 		return true;
 	}
@@ -86,7 +86,7 @@ abstract class ModeleNumRefSuppliersInvoices
 	 *
 	 *   @return    string      Description Text
 	 */
-    public function info()
+	public function info()
 	{
 		global $langs;
 		$langs->load("invoices");
@@ -97,7 +97,7 @@ abstract class ModeleNumRefSuppliersInvoices
 	 *
 	 *    @return   string      Example
 	 */
-    public function getExample()
+	public function getExample()
 	{
 		global $langs;
 		$langs->load("invoices");
@@ -108,30 +108,30 @@ abstract class ModeleNumRefSuppliersInvoices
 	 *
 	 *   @return	boolean     false if conflict, true if ok
 	 */
-    public function canBeActivated()
+	public function canBeActivated()
 	{
 		return true;
 	}
 
-    /**  Returns next value assigned
-     *
-     * @param	Societe		$objsoc     Object third party
-     * @param  	Object	    $object		Object
-     * @param	string		$mode       'next' for next value or 'last' for last value
-     * @return 	string      			Value if OK, 0 if KO
-     */
-    public function getNextValue($objsoc, $object, $mode)
-    {
+	/**  Returns next value assigned
+	 *
+	 * @param	Societe		$objsoc     Object third party
+	 * @param  	Object	    $object		Object
+	 * @param	string		$mode       'next' for next value or 'last' for last value
+	 * @return 	string      			Value if OK, 0 if KO
+	 */
+	public function getNextValue($objsoc, $object, $mode)
+	{
 		global $langs;
 		return $langs->trans("NotAvailable");
-    }
+	}
 
 	/**   Returns version of the model numbering
 	 *
 	 *    @return     string      Value
 	 */
-    public function getVersion()
-    {
+	public function getVersion()
+	{
 		global $langs;
 		$langs->load("admin");
 
@@ -140,5 +140,5 @@ abstract class ModeleNumRefSuppliersInvoices
 		if ($this->version == 'dolibarr') return DOL_VERSION;
 		if ($this->version) return $this->version;
 		return $langs->trans("NotAvailable");
-    }
+	}
 }
diff --git a/htdocs/core/modules/supplier_order/doc/doc_generic_supplier_order_odt.modules.php b/htdocs/core/modules/supplier_order/doc/doc_generic_supplier_order_odt.modules.php
index 9c9e43a9475..37f773783cc 100644
--- a/htdocs/core/modules/supplier_order/doc/doc_generic_supplier_order_odt.modules.php
+++ b/htdocs/core/modules/supplier_order/doc/doc_generic_supplier_order_odt.modules.php
@@ -48,14 +48,14 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
 	public $issuer;
 
 	/**
-     * @var array Minimum version of PHP required by module.
-     * e.g.: PHP ≥ 5.6 = array(5, 6)
-     */
+	 * @var array Minimum version of PHP required by module.
+	 * e.g.: PHP ≥ 5.6 = array(5, 6)
+	 */
 	public $phpmin = array(5, 6);
 
 	/**
-     * @var string Dolibarr version of the loaded document
-     */
+	 * @var string Dolibarr version of the loaded document
+	 */
 	public $version = 'dolibarr';
 
 
@@ -64,12 +64,12 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
 	 *
 	 *  @param		DoliDB		$db      Database handler
 	 */
-    public function __construct($db)
+	public function __construct($db)
 	{
 		global $conf, $langs, $mysoc;
 
 		// Load translation files required by the page
-        $langs->loadLangs(array("main", "companies"));
+		$langs->loadLangs(array("main", "companies"));
 
 		$this->db = $db;
 		$this->name = "ODT templates";
@@ -109,12 +109,12 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
 	 *	@param	Translate	$langs      Lang object to use for output
 	 *	@return string       			Description
 	 */
-    public function info($langs)
+	public function info($langs)
 	{
 		global $conf, $langs;
 
 		// Load translation files required by the page
-        $langs->loadLangs(array("errors", "companies"));
+		$langs->loadLangs(array("errors", "companies"));
 
 		$form = new Form($this->db);
 
@@ -173,7 +173,7 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
    			$texte .= '<div id="div_'.get_class($this).'" class="hidden">';
    			foreach ($listoffiles as $file)
    			{
-                $texte .= $file['name'].'<br>';
+				$texte .= $file['name'].'<br>';
    			}
    			$texte .= '</div>';
 		}
@@ -191,7 +191,7 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
 		return $texte;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Function to build a document on disk using the generic odt module.
 	 *
@@ -203,9 +203,9 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
 	 *  @param		int			$hideref			Do not show ref
 	 *	@return		int         					1 if OK, <=0 if KO
 	 */
-    public function write_file($object, $outputlangs, $srctemplatepath, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
+	public function write_file($object, $outputlangs, $srctemplatepath, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $user, $langs, $conf, $mysoc, $hookmanager;
 
 		if (empty($srctemplatepath))
@@ -231,9 +231,9 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
 
 		if ($conf->fournisseur->commande->dir_output)
 		{
-            $object->fetch_thirdparty();
+			$object->fetch_thirdparty();
 
-            if ($object->specimen)
+			if ($object->specimen)
 			{
 				$dir = $conf->fournisseur->commande->dir_output;
 				$file = $dir."/SPECIMEN.pdf";
@@ -267,8 +267,8 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
 				if (!empty($conf->global->MAIN_DOC_USE_TIMING))
 				{
-				    $format = $conf->global->MAIN_DOC_USE_TIMING;
-				    if ($format == '1') $format = '%Y%m%d%H%M%S';
+					$format = $conf->global->MAIN_DOC_USE_TIMING;
+					if ($format == '1') $format = '%Y%m%d%H%M%S';
 					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
 				} else {
 					$filename = $newfiletmp.'.'.$newfileformat;
@@ -298,10 +298,10 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
 					// On peut utiliser le nom de la societe du contact
 					if (!empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socobject = $object->contact;
 					else {
-                        $socobject = $object->thirdparty;
-               			// if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
-            			$contactobject = $object->contact;
-                    }
+						$socobject = $object->thirdparty;
+			   			// if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
+						$contactobject = $object->contact;
+					}
 				} else {
 					$socobject = $object->thirdparty;
 				}
@@ -312,7 +312,7 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
 				'__FROM_EMAIL__' => $this->issuer->email,
 				'__TOTAL_TTC__' => $object->total_ttc,
 				'__TOTAL_HT__' => $object->total_ht,
-				'__TOTAL_VAT__' => $object->total_vat
+				'__TOTAL_VAT__' => $object->total_tva
 				);
 				complete_substitutions_array($substitutionarray, $langs, $object);
 				// Call the ODTSubstitution hook
@@ -330,7 +330,7 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
 				// Open and load template
 				require_once ODTPHP_PATH.'odf.php';
 				try {
-                    $odfHandler = new odf(
+					$odfHandler = new odf(
 						$srctemplatepath,
 						array(
 						'PATH_TO_TMP'	  => $conf->fournisseur->dir_temp,
@@ -357,7 +357,7 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
 					$odfHandler->setVars('free_text', $newfreetext, true, 'UTF-8');
 				} catch (OdfException $e)
 				{
-                    dol_syslog($e->getMessage(), LOG_INFO);
+					dol_syslog($e->getMessage(), LOG_INFO);
 				}
 
 				// Define substitution array
@@ -392,7 +392,7 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
 						}
 					} catch (OdfException $e)
 					{
-                        dol_syslog($e->getMessage(), LOG_INFO);
+						dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
 				// Replace tags of lines
@@ -423,10 +423,10 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
 									$listlines->setVars($key, $val, true, 'UTF-8');
 								} catch (OdfException $e)
 								{
-                                    dol_syslog($e->getMessage(), LOG_INFO);
+									dol_syslog($e->getMessage(), LOG_INFO);
 								} catch (SegmentException $e)
 								{
-                                    dol_syslog($e->getMessage(), LOG_INFO);
+									dol_syslog($e->getMessage(), LOG_INFO);
 								}
 							}
 							$listlines->merge();
@@ -448,7 +448,7 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
 					} catch (OdfException $e)
 					{
-                        dol_syslog($e->getMessage(), LOG_INFO);
+						dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
 
@@ -462,16 +462,16 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
 					try {
 						$odfHandler->exportAsAttachedPDF($file);
 					} catch (Exception $e) {
-                        $this->error = $e->getMessage();
-                        dol_syslog($e->getMessage(), LOG_INFO);
+						$this->error = $e->getMessage();
+						dol_syslog($e->getMessage(), LOG_INFO);
 						return -1;
 					}
 				} else {
 					try {
-					    $odfHandler->saveToDisk($file);
+						$odfHandler->saveToDisk($file);
 					} catch (Exception $e) {
-                        $this->error = $e->getMessage();
-                        dol_syslog($e->getMessage(), LOG_INFO);
+						$this->error = $e->getMessage();
+						dol_syslog($e->getMessage(), LOG_INFO);
 						return -1;
 					}
 				}
diff --git a/htdocs/core/modules/supplier_order/mod_commande_fournisseur_orchidee.php b/htdocs/core/modules/supplier_order/mod_commande_fournisseur_orchidee.php
index 82d5dffa830..7fa99bd7453 100644
--- a/htdocs/core/modules/supplier_order/mod_commande_fournisseur_orchidee.php
+++ b/htdocs/core/modules/supplier_order/mod_commande_fournisseur_orchidee.php
@@ -33,15 +33,15 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_order/modules_commandefou
 class mod_commande_fournisseur_orchidee extends ModeleNumRefSuppliersOrders
 {
 	/**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
 	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 
 	/**
-     * @var string Error code (or message)
-     */
-    public $error = '';
+	 * @var string Error code (or message)
+	 */
+	public $error = '';
 
 	/**
 	 * @var string Nom du modele
@@ -56,17 +56,17 @@ class mod_commande_fournisseur_orchidee extends ModeleNumRefSuppliersOrders
 	public $name = 'Orchidee';
 
 
-    /**
-     *  Returns the description of the numbering model
-     *
-     * 	@return     string      Texte descripif
-     */
-    public function info()
-    {
-    	global $db, $conf, $langs;
+	/**
+	 *  Returns the description of the numbering model
+	 *
+	 * 	@return     string      Texte descripif
+	 */
+	public function info()
+	{
+		global $db, $conf, $langs;
 
 		// Load translation files required by the page
-        $langs->loadLangs(array("bills", "admin"));
+		$langs->loadLangs(array("bills", "admin"));
 
 		$form = new Form($db);
 
@@ -95,20 +95,20 @@ class mod_commande_fournisseur_orchidee extends ModeleNumRefSuppliersOrders
 		$texte .= '</form>';
 
 		return $texte;
-    }
+	}
 
-    /**
-     *  Return an example of numbering
-     *
-     *  @return     string      Example
-     */
-    public function getExample()
-    {
-    	global $conf, $langs, $mysoc;
+	/**
+	 *  Return an example of numbering
+	 *
+	 *  @return     string      Example
+	 */
+	public function getExample()
+	{
+		global $conf, $langs, $mysoc;
 
-    	$old_code_client = $mysoc->code_client;
-    	$mysoc->code_client = 'CCCCCCCCCC';
-    	$numExample = $this->getNextValue($mysoc, '');
+		$old_code_client = $mysoc->code_client;
+		$mysoc->code_client = 'CCCCCCCCCC';
+		$numExample = $this->getNextValue($mysoc, '');
 		$mysoc->code_client = $old_code_client;
 
 		if (!$numExample)
@@ -116,17 +116,17 @@ class mod_commande_fournisseur_orchidee extends ModeleNumRefSuppliersOrders
 			$numExample = $langs->trans('NotConfigured');
 		}
 		return $numExample;
-    }
+	}
 
 	/**
 	 *  Return next value
 	 *
 	 *  @param	Societe		$objsoc     Object third party
 	 *  @param  Object	    $object		Object
-     *  @return string      			Value if OK, 0 if KO
-	*/
-    public function getNextValue($objsoc = 0, $object = '')
-    {
+	 *  @return string      			Value if OK, 0 if KO
+	 */
+	public function getNextValue($objsoc = 0, $object = '')
+	{
 		global $db, $conf;
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
@@ -146,17 +146,17 @@ class mod_commande_fournisseur_orchidee extends ModeleNumRefSuppliersOrders
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Renvoie la reference de commande suivante non utilisee
-     *
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Renvoie la reference de commande suivante non utilisee
+	 *
 	 *  @param	Societe		$objsoc     Object third party
 	 *  @param  Object	    $object		Object
-     *  @return string      			Texte descripif
-     */
-    public function commande_get_num($objsoc = 0, $object = '')
-    {
-        // phpcs:enable
-        return $this->getNextValue($objsoc, $object);
-    }
+	 *  @return string      			Texte descripif
+	 */
+	public function commande_get_num($objsoc = 0, $object = '')
+	{
+		// phpcs:enable
+		return $this->getNextValue($objsoc, $object);
+	}
 }
diff --git a/htdocs/core/modules/supplier_order/modules_commandefournisseur.php b/htdocs/core/modules/supplier_order/modules_commandefournisseur.php
index dd5d6e55d7a..dcd48b25913 100644
--- a/htdocs/core/modules/supplier_order/modules_commandefournisseur.php
+++ b/htdocs/core/modules/supplier_order/modules_commandefournisseur.php
@@ -43,13 +43,13 @@ abstract class ModelePDFSuppliersOrders extends CommonDocGenerator
 	public $error = '';
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return list of active generation models
 	 *
-     *  @param	DoliDB	$db     			Database handler
-     *  @param  integer	$maxfilenamelength  Max length of value to show
-     *  @return	array						List of templates
+	 *  @param	DoliDB	$db     			Database handler
+	 *  @param  integer	$maxfilenamelength  Max length of value to show
+	 *  @return	array						List of templates
 	 */
 	public static function liste_modeles($db, $maxfilenamelength = 0)
 	{
@@ -82,7 +82,7 @@ abstract class ModeleNumRefSuppliersOrders
 	 *
 	 *   @return	boolean     true if model can be used
 	 */
-    public function isEnabled()
+	public function isEnabled()
 	{
 		return true;
 	}
@@ -91,7 +91,7 @@ abstract class ModeleNumRefSuppliersOrders
 	 *
 	 *   @return    string      Description Text
 	 */
-    public function info()
+	public function info()
 	{
 		global $langs;
 		$langs->load("orders");
@@ -102,7 +102,7 @@ abstract class ModeleNumRefSuppliersOrders
 	 *
 	 *    @return   string      Example
 	 */
-    public function getExample()
+	public function getExample()
 	{
 		global $langs;
 		$langs->load("orders");
@@ -113,7 +113,7 @@ abstract class ModeleNumRefSuppliersOrders
 	 *
 	 *   @return	boolean     false if conflict, true if ok
 	 */
-    public function canBeActivated()
+	public function canBeActivated()
 	{
 		return true;
 	}
@@ -122,7 +122,7 @@ abstract class ModeleNumRefSuppliersOrders
 	 *
 	 *   @return     string      Valeur
 	 */
-    public function getNextValue()
+	public function getNextValue()
 	{
 		global $langs;
 		return $langs->trans("NotAvailable");
@@ -132,7 +132,7 @@ abstract class ModeleNumRefSuppliersOrders
 	 *
 	 *    @return     string      Value
 	 */
-    public function getVersion()
+	public function getVersion()
 	{
 		global $langs;
 		$langs->load("admin");
diff --git a/htdocs/core/modules/supplier_payment/mod_supplier_payment_brodator.php b/htdocs/core/modules/supplier_payment/mod_supplier_payment_brodator.php
index b6154d10375..394ac684485 100644
--- a/htdocs/core/modules/supplier_payment/mod_supplier_payment_brodator.php
+++ b/htdocs/core/modules/supplier_payment/mod_supplier_payment_brodator.php
@@ -31,15 +31,15 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_payment/modules_supplier_
 class mod_supplier_payment_brodator extends ModeleNumRefSupplierPayments
 {
 	/**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
 	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 
 	/**
-     * @var string Error code (or message)
-     */
-    public $error = '';
+	 * @var string Error code (or message)
+	 */
+	public $error = '';
 
 	/**
 	 * @var string Nom du modele
@@ -54,14 +54,14 @@ class mod_supplier_payment_brodator extends ModeleNumRefSupplierPayments
 	public $name = 'Brodator';
 
 
-    /**
-     *  Returns the description of the numbering model
-     *
-     *  @return     string      Texte descripif
-     */
+	/**
+	 *  Returns the description of the numbering model
+	 *
+	 *  @return     string      Texte descripif
+	 */
 	public function info()
-    {
-    	global $conf, $langs;
+	{
+		global $conf, $langs;
 
 		$langs->load("bills");
 
@@ -92,20 +92,20 @@ class mod_supplier_payment_brodator extends ModeleNumRefSupplierPayments
 		$texte .= '</form>';
 
 		return $texte;
-    }
+	}
 
-    /**
-     *  Return an example of numbering
-     *
-     *  @return     string      Example
-     */
-    public function getExample()
-    {
-     	global $conf, $langs, $mysoc;
+	/**
+	 *  Return an example of numbering
+	 *
+	 *  @return     string      Example
+	 */
+	public function getExample()
+	{
+	 	global $conf, $langs, $mysoc;
 
-    	$old_code_client = $mysoc->code_client;
-    	$mysoc->code_client = 'CCCCCCCCCC';
-     	$numExample = $this->getNextValue($mysoc, '');
+		$old_code_client = $mysoc->code_client;
+		$mysoc->code_client = 'CCCCCCCCCC';
+	 	$numExample = $this->getNextValue($mysoc, '');
 		$mysoc->code_client = $old_code_client;
 
 		if (!$numExample)
@@ -113,7 +113,7 @@ class mod_supplier_payment_brodator extends ModeleNumRefSupplierPayments
 			$numExample = $langs->trans('NotConfigured');
 		}
 		return $numExample;
-    }
+	}
 
 	/**
 	 * 	Return next free value
@@ -122,8 +122,8 @@ class mod_supplier_payment_brodator extends ModeleNumRefSupplierPayments
 	 *  @param  Object		$object		Object we need next value for
 	 *  @return string      			Value if KO, <0 if KO
 	 */
-    public function getNextValue($objsoc, $object)
-    {
+	public function getNextValue($objsoc, $object)
+	{
 		global $db, $conf;
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
@@ -143,17 +143,17 @@ class mod_supplier_payment_brodator extends ModeleNumRefSupplierPayments
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return next free value
 	 *
 	 *  @param	Societe		$objsoc     Object third party
 	 * 	@param	string		$objforref	Object for number to search
 	 *  @return string      			Next free value
-     */
-    public function commande_get_num($objsoc, $objforref)
-    {
-        // phpcs:enable
-        return $this->getNextValue($objsoc, $objforref);
-    }
+	 */
+	public function commande_get_num($objsoc, $objforref)
+	{
+		// phpcs:enable
+		return $this->getNextValue($objsoc, $objforref);
+	}
 }
diff --git a/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php b/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php
index ea6c1574149..b5efe6801ff 100644
--- a/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php
+++ b/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php
@@ -45,15 +45,15 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 	public $emetteur;
 
 	/**
-     * @var array Minimum version of PHP required by module.
-     * e.g.: PHP ≥ 5.6 = array(5, 6)
-     */
+	 * @var array Minimum version of PHP required by module.
+	 * e.g.: PHP ≥ 5.6 = array(5, 6)
+	 */
 	public $phpmin = array(5, 6);
 
 	/**
-   * Dolibarr version of the loaded document
-   * @var string
-   */
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
 	public $version = 'dolibarr';
 
 
@@ -67,7 +67,7 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 		global $conf, $langs, $mysoc;
 
 		// Load translation files required by the page
-        $langs->loadLangs(array("main", "companies"));
+		$langs->loadLangs(array("main", "companies"));
 
 		$this->db = $db;
 		$this->name = "ODT templates";
@@ -112,7 +112,7 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 		global $conf, $langs;
 
 		// Load translation files required by the page
-        $langs->loadLangs(array('companies', 'errors'));
+		$langs->loadLangs(array('companies', 'errors'));
 
 		$form = new Form($this->db);
 
@@ -177,7 +177,7 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
    			$texte .= '<div id="div_'.get_class($this).'" class="hidden">';
    			foreach ($listoffiles as $file)
    			{
-                $texte .= $file['name'].'<br>';
+				$texte .= $file['name'].'<br>';
    			}
    			$texte .= '</div>';
 
@@ -220,7 +220,7 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 		return $texte;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Function to build a document on disk using the generic odt module.
 	 *
@@ -234,7 +234,7 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 	 */
 	public function write_file($object, $outputlangs, $srctemplatepath, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $user, $langs, $conf, $mysoc, $hookmanager;
 
 		if (empty($srctemplatepath))
@@ -274,6 +274,8 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 				}
 			}
 
+			$object->fetch_thirdparty();
+
 			$dir = $conf->supplier_proposal->dir_output;
 			$objectref = dol_sanitizeFileName($object->ref);
 			if (!preg_match('/specimen/i', $objectref)) $dir .= "/".$objectref;
@@ -302,8 +304,8 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
 				if (!empty($conf->global->MAIN_DOC_USE_TIMING))
 				{
-				    $format = $conf->global->MAIN_DOC_USE_TIMING;
-				    if ($format == '1') $format = '%Y%m%d%H%M%S';
+					$format = $conf->global->MAIN_DOC_USE_TIMING;
+					if ($format == '1') $format = '%Y%m%d%H%M%S';
 					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
 				} else {
 					$filename = $newfiletmp.'.'.$newfileformat;
@@ -349,7 +351,7 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 				'__FROM_EMAIL__' => $this->emetteur->email,
 				'__TOTAL_TTC__' => $object->total_ttc,
 				'__TOTAL_HT__' => $object->total_ht,
-				'__TOTAL_VAT__' => $object->total_vat
+				'__TOTAL_VAT__' => $object->total_tva
 				);
 				complete_substitutions_array($substitutionarray, $langs, $object);
 				// Call the ODTSubstitution hook
@@ -367,7 +369,7 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 				// Open and load template
 				require_once ODTPHP_PATH.'odf.php';
 				try {
-                    $odfHandler = new odf(
+					$odfHandler = new odf(
 						$srctemplatepath,
 						array(
 							'PATH_TO_TMP'	  => $conf->supplier_proposal->dir_temp,
@@ -428,7 +430,7 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 						}
 					} catch (OdfException $e)
 					{
-                        dol_syslog($e->getMessage(), LOG_INFO);
+						dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
 				// Replace tags of lines
@@ -484,7 +486,7 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
 					} catch (OdfException $e)
 					{
-                        dol_syslog($e->getMessage(), LOG_INFO);
+						dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
 
@@ -498,7 +500,7 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 						$odfHandler->exportAsAttachedPDF($file);
 					} catch (Exception $e) {
 						$this->error = $e->getMessage();
-                        dol_syslog($e->getMessage(), LOG_INFO);
+						dol_syslog($e->getMessage(), LOG_INFO);
 						return -1;
 					}
 				} else {
@@ -506,7 +508,7 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 						$odfHandler->saveToDisk($file);
 					} catch (Exception $e) {
 						$this->error = $e->getMessage();
-                        dol_syslog($e->getMessage(), LOG_INFO);
+						dol_syslog($e->getMessage(), LOG_INFO);
 						return -1;
 					}
 				}
diff --git a/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_saphir.php b/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_saphir.php
index 036edd251dd..4abb7cb07f1 100644
--- a/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_saphir.php
+++ b/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_saphir.php
@@ -34,15 +34,15 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_proposal/modules_supplier
 class mod_supplier_proposal_saphir extends ModeleNumRefSupplierProposal
 {
 	/**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
 	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 
 	/**
-     * @var string Error code (or message)
-     */
-    public $error = '';
+	 * @var string Error code (or message)
+	 */
+	public $error = '';
 
 	/**
 	 * @var string Nom du modele
@@ -57,14 +57,14 @@ class mod_supplier_proposal_saphir extends ModeleNumRefSupplierProposal
 	public $name = 'Saphir';
 
 
-    /**
-     *  Return description of module
-     *
-     *  @return     string      Texte descripif
-     */
-    public function info()
-    {
-    	global $conf, $langs, $db;
+	/**
+	 *  Return description of module
+	 *
+	 *  @return     string      Texte descripif
+	 */
+	public function info()
+	{
+		global $conf, $langs, $db;
 
 		$langs->load("bills");
 
@@ -95,20 +95,20 @@ class mod_supplier_proposal_saphir extends ModeleNumRefSupplierProposal
 		$texte .= '</form>';
 
 		return $texte;
-    }
+	}
 
-    /**
-     *  Return an example of numbering
-     *
-     *  @return     string      Example
-     */
-    public function getExample()
-    {
-     	global $conf, $langs, $mysoc;
+	/**
+	 *  Return an example of numbering
+	 *
+	 *  @return     string      Example
+	 */
+	public function getExample()
+	{
+	 	global $conf, $langs, $mysoc;
 
-    	$old_code_client = $mysoc->code_client;
-    	$mysoc->code_client = 'CCCCCCCCCC';
-     	$numExample = $this->getNextValue($mysoc, '');
+		$old_code_client = $mysoc->code_client;
+		$mysoc->code_client = 'CCCCCCCCCC';
+	 	$numExample = $this->getNextValue($mysoc, '');
 		$mysoc->code_client = $old_code_client;
 
 		if (!$numExample)
@@ -116,7 +116,7 @@ class mod_supplier_proposal_saphir extends ModeleNumRefSupplierProposal
 			$numExample = 'NotConfigured';
 		}
 		return $numExample;
-    }
+	}
 
 	/**
 	 *  Return next value
diff --git a/htdocs/core/modules/supplier_proposal/modules_supplier_proposal.php b/htdocs/core/modules/supplier_proposal/modules_supplier_proposal.php
index b354f114be2..4e32817ff19 100644
--- a/htdocs/core/modules/supplier_proposal/modules_supplier_proposal.php
+++ b/htdocs/core/modules/supplier_proposal/modules_supplier_proposal.php
@@ -42,17 +42,17 @@ abstract class ModelePDFSupplierProposal extends CommonDocGenerator
 	public $error = '';
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Return list of active generation modules
-     *
-     *  @param	DoliDB	$db     			Database handler
-     *  @param  integer	$maxfilenamelength  Max length of value to show
-     *  @return	array						List of templates
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Return list of active generation modules
+	 *
+	 *  @param	DoliDB	$db     			Database handler
+	 *  @param  integer	$maxfilenamelength  Max length of value to show
+	 *  @return	array						List of templates
 	 */
 	public static function liste_modeles($db, $maxfilenamelength = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 		$type = 'supplier_proposal';
diff --git a/htdocs/core/modules/syslog/mod_syslog_file.php b/htdocs/core/modules/syslog/mod_syslog_file.php
index 4f70dc6544c..cac16178c92 100644
--- a/htdocs/core/modules/syslog/mod_syslog_file.php
+++ b/htdocs/core/modules/syslog/mod_syslog_file.php
@@ -7,8 +7,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/syslog/logHandler.php';
  */
 class mod_syslog_file extends LogHandler implements LogHandlerInterface
 {
-    public $code = 'file';
-    public $lastTime = 0;
+	public $code = 'file';
+	public $lastTime = 0;
 
 	/**
 	 * 	Return name of logger
@@ -51,7 +51,7 @@ class mod_syslog_file extends LogHandler implements LogHandlerInterface
 	 */
 	public function isActive()
 	{
-	    global $conf;
+		global $conf;
 		return empty($conf->global->SYSLOG_DISABLE_LOGHANDLER_FILE) ? 1 : 0; // Set SYSLOG_DISABLE_LOGHANDLER_FILE to 1 to disable this loghandler
 	}
 
@@ -103,24 +103,24 @@ class mod_syslog_file extends LogHandler implements LogHandlerInterface
 	 */
 	private function getFilename($suffixinfilename = '')
 	{
-	    global $conf;
+		global $conf;
 
-	    if (empty($conf->global->SYSLOG_FILE)) $tmp = DOL_DATA_ROOT.'/dolibarr.log';
-	    else $tmp = str_replace('DOL_DATA_ROOT', DOL_DATA_ROOT, $conf->global->SYSLOG_FILE);
+		if (empty($conf->global->SYSLOG_FILE)) $tmp = DOL_DATA_ROOT.'/dolibarr.log';
+		else $tmp = str_replace('DOL_DATA_ROOT', DOL_DATA_ROOT, $conf->global->SYSLOG_FILE);
 
-	    if (!empty($conf->global->SYSLOG_FILE_ONEPERSESSION))
-	    {
-	    	if ($conf->global->SYSLOG_FILE_ONEPERSESSION == 1)	// file depend on session key name (Note that session name is same for all users and is not a per user value)
-	    	{
-	        	$suffixinfilename .= '_'.session_name();
-	    	}
-	    	if ($conf->global->SYSLOG_FILE_ONEPERSESSION == 2)	// file depend on session value sor per user
-	    	{
-	    		$suffixinfilename .= '_'.session_name().'_'.$_SERVER["REMOTE_ADDR"];
-	    	}
-	    }
+		if (!empty($conf->global->SYSLOG_FILE_ONEPERSESSION))
+		{
+			if ($conf->global->SYSLOG_FILE_ONEPERSESSION == 1)	// file depend on session key name (Note that session name is same for all users and is not a per user value)
+			{
+				$suffixinfilename .= '_'.session_name();
+			}
+			if ($conf->global->SYSLOG_FILE_ONEPERSESSION == 2)	// file depend on session value sor per user
+			{
+				$suffixinfilename .= '_'.session_name().'_'.$_SERVER["REMOTE_ADDR"];
+			}
+		}
 
-	    return $suffixinfilename ?preg_replace('/\.log$/i', $suffixinfilename.'.log', $tmp) : $tmp;
+		return $suffixinfilename ?preg_replace('/\.log$/i', $suffixinfilename.'.log', $tmp) : $tmp;
 	}
 
 	/**
diff --git a/htdocs/core/modules/syslog/mod_syslog_syslog.php b/htdocs/core/modules/syslog/mod_syslog_syslog.php
index 58fb5f632bf..0ac23c0bda4 100644
--- a/htdocs/core/modules/syslog/mod_syslog_syslog.php
+++ b/htdocs/core/modules/syslog/mod_syslog_syslog.php
@@ -7,7 +7,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/syslog/logHandler.php';
  */
 class mod_syslog_syslog extends LogHandler implements LogHandlerInterface
 {
-    public $code = 'syslog';
+	public $code = 'syslog';
 
 	/**
 	 * 	Return name of logger
@@ -48,7 +48,7 @@ class mod_syslog_syslog extends LogHandler implements LogHandlerInterface
 	 */
 	public function isActive()
 	{
-	    global $conf;
+		global $conf;
 
 		// This function does not exists on some ISP (Ex: Free in France)
 		if (!function_exists('openlog')) return 0;
@@ -85,15 +85,15 @@ class mod_syslog_syslog extends LogHandler implements LogHandlerInterface
 
 		$errors = array();
 
-	    $facility = constant($conf->global->SYSLOG_FACILITY);
-	    if ($facility)
+		$facility = constant($conf->global->SYSLOG_FACILITY);
+		if ($facility)
 		{
 			// Only LOG_USER supported on Windows
 			if (!empty($_SERVER["WINDIR"])) $facility = constant('LOG_USER');
 
 			dol_syslog("admin/syslog: facility ".$facility);
 		} else {
-		    $errors[] = $langs->trans("ErrorUnknownSyslogConstant", $facility);
+			$errors[] = $langs->trans("ErrorUnknownSyslogConstant", $facility);
 		}
 
 		return $errors;
diff --git a/htdocs/core/modules/takepos/mod_takepos_ref_simple.php b/htdocs/core/modules/takepos/mod_takepos_ref_simple.php
index f4de0f6646e..57e87006559 100644
--- a/htdocs/core/modules/takepos/mod_takepos_ref_simple.php
+++ b/htdocs/core/modules/takepos/mod_takepos_ref_simple.php
@@ -35,7 +35,7 @@ class mod_takepos_ref_simple extends ModeleNumRefTakepos
 	 * Dolibarr version of the loaded document 'development', 'experimental', 'dolibarr'
 	 * @var string
 	 */
-    public $version = 'dolibarr';
+	public $version = 'dolibarr';
 
 	/**
 	 * Prefix
@@ -54,141 +54,141 @@ class mod_takepos_ref_simple extends ModeleNumRefTakepos
 	 */
 	public $nom = 'Simple';
 
-    /**
-     *  Return description of numbering module
-     *
-     * @return     string      Text with description
-     */
+	/**
+	 *  Return description of numbering module
+	 *
+	 * @return     string      Text with description
+	 */
 	public function info()
-    {
-        global $langs;
+	{
+		global $langs;
 
-        return $langs->trans('SimpleNumRefModelDesc', $this->prefix.'0-');
-    }
+		return $langs->trans('SimpleNumRefModelDesc', $this->prefix.'0-');
+	}
 
-    /**
-     *  Return an example of numbering module values
-     *
-     * @return     string      Example
-     */
+	/**
+	 *  Return an example of numbering module values
+	 *
+	 * @return     string      Example
+	 */
 	public function getExample()
-    {
-        return $this->prefix.'0-0501-0001';
-    }
+	{
+		return $this->prefix.'0-0501-0001';
+	}
 
-    /**
-     *  Test si les numeros deja en vigueur dans la base ne provoquent pas de
-     *  de conflits qui empechera cette numerotation de fonctionner.
-     *
-     * @return     boolean     false si conflit, true si ok
-     */
+	/**
+	 *  Test si les numeros deja en vigueur dans la base ne provoquent pas de
+	 *  de conflits qui empechera cette numerotation de fonctionner.
+	 *
+	 * @return     boolean     false si conflit, true si ok
+	 */
 	public function canBeActivated()
-    {
-        global $conf, $langs, $db;
+	{
+		global $conf, $langs, $db;
 
-        $pryymm = '';
-        $max = '';
+		$pryymm = '';
+		$max = '';
 
-        $pos_source = 0;
+		$pos_source = 0;
 
-        // First, we get the max value
-        $posindice = strlen($this->prefix.$pos_source.'-____-') + 1;
+		// First, we get the max value
+		$posindice = strlen($this->prefix.$pos_source.'-____-') + 1;
 
-        $sql  = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
-        $sql .= " FROM ".MAIN_DB_PREFIX."facture";
-        $sql .= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
-        $sql .= " AND entity = ".$conf->entity;
+		$sql  = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
+		$sql .= " FROM ".MAIN_DB_PREFIX."facture";
+		$sql .= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
+		$sql .= " AND entity = ".$conf->entity;
 
-        $resql = $db->query($sql);
-        if ($resql) {
-            $row = $db->fetch_row($resql);
-            if ($row) {
-                $pryymm = substr($row[0], 0, 6);
-                $max = $row[0];
-            }
-        }
+		$resql = $db->query($sql);
+		if ($resql) {
+			$row = $db->fetch_row($resql);
+			if ($row) {
+				$pryymm = substr($row[0], 0, 6);
+				$max = $row[0];
+			}
+		}
 
-        if (!$pryymm || preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i', $pryymm)) {
-            return true;
-        } else {
-            $langs->load("errors");
-            $this->error = $langs->trans('ErrorNumRefModel', $max);
-            return false;
-        }
-    }
+		if (!$pryymm || preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i', $pryymm)) {
+			return true;
+		} else {
+			$langs->load("errors");
+			$this->error = $langs->trans('ErrorNumRefModel', $max);
+			return false;
+		}
+	}
 
-    /**
-     *  Return next value
-     *
-     * @param   Societe     $objsoc     Object third party
-     * @param   Facture		$invoice	Object invoice
-     * @param   string		$mode       'next' for next value or 'last' for last value
-     * @return  string      Next value
-     */
+	/**
+	 *  Return next value
+	 *
+	 * @param   Societe     $objsoc     Object third party
+	 * @param   Facture		$invoice	Object invoice
+	 * @param   string		$mode       'next' for next value or 'last' for last value
+	 * @return  string      Next value
+	 */
 	public function getNextValue($objsoc = null, $invoice = null, $mode = 'next')
-    {
-        global $db;
+	{
+		global $db;
 
-        $pos_source = is_object($invoice) && $invoice->pos_source > 0 ? $invoice->pos_source : 0;
+		$pos_source = is_object($invoice) && $invoice->pos_source > 0 ? $invoice->pos_source : 0;
 
-        // First, we get the max value
-        $posindice = strlen($this->prefix.$pos_source.'-____-') + 1;
-        $sql  = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max"; // This is standard SQL
-        $sql .= " FROM ".MAIN_DB_PREFIX."facture";
-        $sql .= " WHERE ref LIKE '".$db->escape($this->prefix.$pos_source)."-____-%'";
-        $sql .= " AND entity IN (".getEntity('invoicenumber', 1, $invoice).")";
+		// First, we get the max value
+		$posindice = strlen($this->prefix.$pos_source.'-____-') + 1;
+		$sql  = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max"; // This is standard SQL
+		$sql .= " FROM ".MAIN_DB_PREFIX."facture";
+		$sql .= " WHERE ref LIKE '".$db->escape($this->prefix.$pos_source)."-____-%'";
+		$sql .= " AND entity IN (".getEntity('invoicenumber', 1, $invoice).")";
 
-        $resql = $db->query($sql);
-        if ($resql) {
-            $obj = $db->fetch_object($resql);
-            if ($obj) $max = intval($obj->max);
-            else $max = 0;
-        } else {
-            dol_syslog(get_class($this)."::getNextValue", LOG_DEBUG);
-            return -1;
-        }
+		$resql = $db->query($sql);
+		if ($resql) {
+			$obj = $db->fetch_object($resql);
+			if ($obj) $max = intval($obj->max);
+			else $max = 0;
+		} else {
+			dol_syslog(get_class($this)."::getNextValue", LOG_DEBUG);
+			return -1;
+		}
 
-        if ($mode == 'last')
-        {
-            if ($max >= (pow(10, 4) - 1)) $num = $max; // If counter > 9999, we do not format on 4 chars, we take number as it is
-            else $num = sprintf("%04s", $max);
+		if ($mode == 'last')
+		{
+			if ($max >= (pow(10, 4) - 1)) $num = $max; // If counter > 9999, we do not format on 4 chars, we take number as it is
+			else $num = sprintf("%04s", $max);
 
-            $ref = '';
-            $sql  = "SELECT ref as ref";
-            $sql .= " FROM ".MAIN_DB_PREFIX."facture";
-            $sql .= " WHERE ref LIKE '".$db->escape($this->prefix.$pos_source)."-____-".$num."'";
-            $sql .= " AND entity IN (".getEntity('invoicenumber', 1, $invoice).")";
-            $sql .= " ORDER BY ref DESC";
+			$ref = '';
+			$sql  = "SELECT ref as ref";
+			$sql .= " FROM ".MAIN_DB_PREFIX."facture";
+			$sql .= " WHERE ref LIKE '".$db->escape($this->prefix.$pos_source)."-____-".$num."'";
+			$sql .= " AND entity IN (".getEntity('invoicenumber', 1, $invoice).")";
+			$sql .= " ORDER BY ref DESC";
 
-            $resql = $db->query($sql);
-            if ($resql) {
-                $obj = $db->fetch_object($resql);
-                if ($obj) $ref = $obj->ref;
-            } else dol_print_error($db);
+			$resql = $db->query($sql);
+			if ($resql) {
+				$obj = $db->fetch_object($resql);
+				if ($obj) $ref = $obj->ref;
+			} else dol_print_error($db);
 
-            return $ref;
-        } elseif ($mode == 'next')
-        {
-            $date = $invoice->date; // This is invoice date (not creation date)
-            $yymm = strftime("%y%m", $date);
+			return $ref;
+		} elseif ($mode == 'next')
+		{
+			$date = $invoice->date; // This is invoice date (not creation date)
+			$yymm = strftime("%y%m", $date);
 
-            if ($max >= (pow(10, 4) - 1)) $num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
-            else $num = sprintf("%04s", $max + 1);
+			if ($max >= (pow(10, 4) - 1)) $num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
+			else $num = sprintf("%04s", $max + 1);
 
-            dol_syslog(get_class($this)."::getNextValue return ".$this->prefix.$pos_source.'-'.$yymm.'-'.$num);
-            return $this->prefix.$pos_source.'-'.$yymm.'-'.$num;
-        } else dol_print_error('', 'Bad parameter for getNextValue');
-    }
+			dol_syslog(get_class($this)."::getNextValue return ".$this->prefix.$pos_source.'-'.$yymm.'-'.$num);
+			return $this->prefix.$pos_source.'-'.$yymm.'-'.$num;
+		} else dol_print_error('', 'Bad parameter for getNextValue');
+	}
 
-    /**
-     *  Return next free value
-     *
-     * @param       Societe     $objsoc         Object third party
-     * @param       Object      $objforref      Object for number to search
-     * @return      string      Next free value
-     */
+	/**
+	 *  Return next free value
+	 *
+	 * @param       Societe     $objsoc         Object third party
+	 * @param       Object      $objforref      Object for number to search
+	 * @return      string      Next free value
+	 */
 	public function getNumRef($objsoc, $objforref)
-    {
-        return $this->getNextValue($objsoc, $objforref);
-    }
+	{
+		return $this->getNextValue($objsoc, $objforref);
+	}
 }
diff --git a/htdocs/core/modules/takepos/mod_takepos_ref_universal.php b/htdocs/core/modules/takepos/mod_takepos_ref_universal.php
index 405bcfc6dcb..e6487db6ed1 100644
--- a/htdocs/core/modules/takepos/mod_takepos_ref_universal.php
+++ b/htdocs/core/modules/takepos/mod_takepos_ref_universal.php
@@ -50,109 +50,109 @@ class mod_takepos_ref_universal extends ModeleNumRefTakepos
 	 */
 	public $nom = 'Universal';
 
-    /**
-     *  Renvoi la description du modele de numerotation
-     *
-     * @return     string      Texte descripif
-     */
+	/**
+	 *  Renvoi la description du modele de numerotation
+	 *
+	 * @return     string      Texte descripif
+	 */
 	public function info()
-    {
-        global $conf, $langs;
+	{
+		global $conf, $langs;
 
-        $langs->load('cashdesk@cashdesk');
+		$langs->load('cashdesk@cashdesk');
 
-        $form = new Form($this->db);
+		$form = new Form($this->db);
 
-        $texte = $langs->trans('GenericNumRefModelDesc')."<br>\n";
-        $texte .= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-        $texte .= '<input type="hidden" name="token" value="'.newToken().'">';
-        $texte .= '<input type="hidden" name="action" value="updateMask">';
-        $texte .= '<input type="hidden" name="maskconst" value="TAKEPOS_REF_UNIVERSAL_MASK">';
-        $texte .= '<table class="nobordernopadding" width="100%">';
+		$texte = $langs->trans('GenericNumRefModelDesc')."<br>\n";
+		$texte .= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+		$texte .= '<input type="hidden" name="token" value="'.newToken().'">';
+		$texte .= '<input type="hidden" name="action" value="updateMask">';
+		$texte .= '<input type="hidden" name="maskconst" value="TAKEPOS_REF_UNIVERSAL_MASK">';
+		$texte .= '<table class="nobordernopadding" width="100%">';
 
-        $tooltip = $langs->trans('GenericMaskCodes', $langs->transnoentities('CashDesk'), $langs->transnoentities('CashDesk'));
-        $tooltip .= $langs->trans('GenericMaskCodes2');
-        $tooltip .= $langs->trans('GenericMaskCodes3');
-        $tooltip .= $langs->trans('GenericMaskCodes4a', $langs->transnoentities('CashDesk'), $langs->transnoentities('CashDesk'));
-        $tooltip .= $langs->trans('GenericMaskCodes5');
-        $tooltip .= $langs->trans('CashDeskGenericMaskCodes6');
+		$tooltip = $langs->trans('GenericMaskCodes', $langs->transnoentities('CashDesk'), $langs->transnoentities('CashDesk'));
+		$tooltip .= $langs->trans('GenericMaskCodes2');
+		$tooltip .= $langs->trans('GenericMaskCodes3');
+		$tooltip .= $langs->trans('GenericMaskCodes4a', $langs->transnoentities('CashDesk'), $langs->transnoentities('CashDesk'));
+		$tooltip .= $langs->trans('GenericMaskCodes5');
+		$tooltip .= $langs->trans('CashDeskGenericMaskCodes6');
 
-        // Parametrage du prefix
-        $texte .= '<tr><td>'.$langs->trans("Mask").':</td>';
-        $texte .= '<td align="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskvalue" value="'.$conf->global->TAKEPOS_REF_UNIVERSAL_MASK.'">', $tooltip, 1, 1).'</td>';
+		// Parametrage du prefix
+		$texte .= '<tr><td>'.$langs->trans("Mask").':</td>';
+		$texte .= '<td align="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskvalue" value="'.$conf->global->TAKEPOS_REF_UNIVERSAL_MASK.'">', $tooltip, 1, 1).'</td>';
 
-        $texte .= '<td align="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
+		$texte .= '<td align="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
 
-        $texte .= '</tr>';
+		$texte .= '</tr>';
 
-        $texte .= '</table>';
-        $texte .= '</form>';
+		$texte .= '</table>';
+		$texte .= '</form>';
 
-        return $texte;
-    }
+		return $texte;
+	}
 
-    /**
-     * Renvoi un exemple de numerotation
-     *
-     * @return     string      Example
-     */
+	/**
+	 * Renvoi un exemple de numerotation
+	 *
+	 * @return     string      Example
+	 */
 	public function getExample()
-    {
-        global $conf, $langs, $mysoc;
+	{
+		global $conf, $langs, $mysoc;
 
-        $old_code_client = $mysoc->code_client;
-        $mysoc->code_client = 'CCCCCCCCCC';
-        $numExample = $this->getNextValue($mysoc, '');
-        $mysoc->code_client = $old_code_client;
+		$old_code_client = $mysoc->code_client;
+		$mysoc->code_client = 'CCCCCCCCCC';
+		$numExample = $this->getNextValue($mysoc, '');
+		$mysoc->code_client = $old_code_client;
 
-        if (!$numExample) {
-            $numExample = $langs->trans('NotConfigured');
-        }
-        return $numExample;
-    }
+		if (!$numExample) {
+			$numExample = $langs->trans('NotConfigured');
+		}
+		return $numExample;
+	}
 
-    /**
-     * Return next free value
-     *
-     * @param   Societe     $objsoc     Object thirdparty
-     * @param   Facture		$invoice	Object invoice
-     * @param   string		$mode       'next' for next value or 'last' for last value
-     * @return  string      Value if KO, <0 if KO
-     */
+	/**
+	 * Return next free value
+	 *
+	 * @param   Societe     $objsoc     Object thirdparty
+	 * @param   Facture		$invoice	Object invoice
+	 * @param   string		$mode       'next' for next value or 'last' for last value
+	 * @return  string      Value if KO, <0 if KO
+	 */
 	public function getNextValue($objsoc = 0, $invoice = null, $mode = 'next')
-    {
-        global $db, $conf;
+	{
+		global $db, $conf;
 
-        require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
-        // On defini critere recherche compteur
-        $mask = $conf->global->TAKEPOS_REF_UNIVERSAL_MASK;
+		// On defini critere recherche compteur
+		$mask = $conf->global->TAKEPOS_REF_UNIVERSAL_MASK;
 
-        if (!$mask) {
-            $this->error = 'NotConfigured';
-            return 0;
-        }
+		if (!$mask) {
+			$this->error = 'NotConfigured';
+			return 0;
+		}
 
-        // Get entities
-        $entity = getEntity('invoicenumber', 1, $invoice);
+		// Get entities
+		$entity = getEntity('invoicenumber', 1, $invoice);
 
-        $pos_source = is_object($invoice) && $invoice->pos_source > 0 ? $invoice->pos_source : 0;
-	    $mask = str_replace('{TN}', $pos_source, $mask);
-        $numFinal = get_next_value($db, $mask, 'facture', 'ref', '', $objsoc, $invoice->date, $mode, false, null, $entity);
+		$pos_source = is_object($invoice) && $invoice->pos_source > 0 ? $invoice->pos_source : 0;
+		$mask = str_replace('{TN}', $pos_source, $mask);
+		$numFinal = get_next_value($db, $mask, 'facture', 'ref', '', $objsoc, $invoice->date, $mode, false, null, $entity);
 
-        return $numFinal;
-    }
+		return $numFinal;
+	}
 
 
-    /**
-     * Return next free value
-     *
-     * @param   Societe     $objsoc         Object third party
-     * @param   Object      $objforref      Object for number to search
-     * @return  string      Next free value
-     */
+	/**
+	 * Return next free value
+	 *
+	 * @param   Societe     $objsoc         Object third party
+	 * @param   Object      $objforref      Object for number to search
+	 * @return  string      Next free value
+	 */
 	public function getNumRef($objsoc, $objforref)
-    {
-        return $this->getNextValue($objsoc, $objforref);
-    }
+	{
+		return $this->getNextValue($objsoc, $objforref);
+	}
 }
diff --git a/htdocs/core/modules/ticket/mod_ticket_simple.php b/htdocs/core/modules/ticket/mod_ticket_simple.php
index 679224c5357..2badaf4a33f 100644
--- a/htdocs/core/modules/ticket/mod_ticket_simple.php
+++ b/htdocs/core/modules/ticket/mod_ticket_simple.php
@@ -115,9 +115,9 @@ class mod_ticket_simple extends ModeleNumRefTicket
 	/**
 	 *  Return next value
 	 *
-	 *  @param  Societe $objsoc    Object third party
-	 *  @param  Project $ticket Object ticket
-	 *  @return string                Value if OK, 0 if KO
+	 *  @param  Societe $objsoc    	Object third party
+	 *  @param  Ticket 	$ticket 	Object ticket
+	 *  @return string              Value if OK, 0 if KO
 	 */
 	public function getNextValue($objsoc, $ticket)
 	{
diff --git a/htdocs/core/modules/ticket/mod_ticket_universal.php b/htdocs/core/modules/ticket/mod_ticket_universal.php
index 010eb973f9b..1a528359221 100644
--- a/htdocs/core/modules/ticket/mod_ticket_universal.php
+++ b/htdocs/core/modules/ticket/mod_ticket_universal.php
@@ -29,18 +29,18 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/ticket/modules_ticket.php';
  */
 class mod_ticket_universal extends ModeleNumRefTicket
 {
-    /**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
-    public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
+	/**
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
+	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 
-    /**
-     * @var string Error code (or message)
-     */
-    public $error = '';
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error = '';
 
-    /**
+	/**
 	 * @var string Nom du modele
 	 * @deprecated
 	 * @see $name
@@ -52,91 +52,91 @@ class mod_ticket_universal extends ModeleNumRefTicket
 	 */
 	public $name = 'Universal';
 
-    /**
-     *  Returns the description of the numbering model
-     *
-     *  @return string      Texte descripif
-     */
-    public function info()
-    {
-        global $db, $conf, $langs;
+	/**
+	 *  Returns the description of the numbering model
+	 *
+	 *  @return string      Texte descripif
+	 */
+	public function info()
+	{
+		global $db, $conf, $langs;
 
-        // Load translation files required by the page
-        $langs->loadLangs(array("ticket", "admin"));
+		// Load translation files required by the page
+		$langs->loadLangs(array("ticket", "admin"));
 
-        $form = new Form($db);
+		$form = new Form($db);
 
-        $texte = $langs->trans('GenericNumRefModelDesc')."<br>\n";
-        $texte .= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-        $texte .= '<input type="hidden" name="token" value="'.newToken().'">';
-        $texte .= '<input type="hidden" name="action" value="updateMask">';
-        $texte .= '<input type="hidden" name="maskconstticket" value="TICKET_UNIVERSAL_MASK">';
-        $texte .= '<table class="nobordernopadding" width="100%">';
+		$texte = $langs->trans('GenericNumRefModelDesc')."<br>\n";
+		$texte .= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+		$texte .= '<input type="hidden" name="token" value="'.newToken().'">';
+		$texte .= '<input type="hidden" name="action" value="updateMask">';
+		$texte .= '<input type="hidden" name="maskconstticket" value="TICKET_UNIVERSAL_MASK">';
+		$texte .= '<table class="nobordernopadding" width="100%">';
 
-        $tooltip = $langs->trans("GenericMaskCodes", $langs->transnoentities("Ticket"), $langs->transnoentities("Ticket"));
-        $tooltip .= $langs->trans("GenericMaskCodes2");
-        $tooltip .= $langs->trans("GenericMaskCodes3");
-        $tooltip .= $langs->trans("GenericMaskCodes4a", $langs->transnoentities("Ticket"), $langs->transnoentities("Ticket"));
-        $tooltip .= $langs->trans("GenericMaskCodes5");
+		$tooltip = $langs->trans("GenericMaskCodes", $langs->transnoentities("Ticket"), $langs->transnoentities("Ticket"));
+		$tooltip .= $langs->trans("GenericMaskCodes2");
+		$tooltip .= $langs->trans("GenericMaskCodes3");
+		$tooltip .= $langs->trans("GenericMaskCodes4a", $langs->transnoentities("Ticket"), $langs->transnoentities("Ticket"));
+		$tooltip .= $langs->trans("GenericMaskCodes5");
 
-        // Parametrage du prefix
-        $texte .= '<tr><td>'.$langs->trans("Mask").':</td>';
-        $texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskticket" value="'.$conf->global->TICKET_UNIVERSAL_MASK.'">', $tooltip, 1, 1).'</td>';
+		// Parametrage du prefix
+		$texte .= '<tr><td>'.$langs->trans("Mask").':</td>';
+		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskticket" value="'.$conf->global->TICKET_UNIVERSAL_MASK.'">', $tooltip, 1, 1).'</td>';
 
-        $texte .= '<td class="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
+		$texte .= '<td class="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
 
-        $texte .= '</tr>';
+		$texte .= '</tr>';
 
-        $texte .= '</table>';
-        $texte .= '</form>';
+		$texte .= '</table>';
+		$texte .= '</form>';
 
-        return $texte;
-    }
+		return $texte;
+	}
 
-    /**
-     *  Return an example of numbering
-     *
-     *  @return string      Example
-     */
-    public function getExample()
-    {
-        global $conf, $langs, $mysoc;
+	/**
+	 *  Return an example of numbering
+	 *
+	 *  @return string      Example
+	 */
+	public function getExample()
+	{
+		global $conf, $langs, $mysoc;
 
-        $old_code_client = $mysoc->code_client;
-        $mysoc->code_client = 'CCCCCCCCCC';
-        $numExample = $this->getNextValue($mysoc, '');
-        $mysoc->code_client = $old_code_client;
+		$old_code_client = $mysoc->code_client;
+		$mysoc->code_client = 'CCCCCCCCCC';
+		$numExample = $this->getNextValue($mysoc, '');
+		$mysoc->code_client = $old_code_client;
 
-        if (!$numExample) {
-            $numExample = $langs->trans('NotConfigured');
-        }
-        return $numExample;
-    }
+		if (!$numExample) {
+			$numExample = $langs->trans('NotConfigured');
+		}
+		return $numExample;
+	}
 
-    /**
-     *  Return next value
-     *
-     *  @param  Societe $objsoc    Object third party
-     *  @param  Project $ticket Object ticket
-     *  @return string                    Value if OK, 0 if KO
-     */
-    public function getNextValue($objsoc, $ticket)
-    {
-        global $db, $conf;
+	/**
+	 *  Return next value
+	 *
+	 *  @param  Societe $objsoc     Object third party
+	 *  @param  Ticket  $ticket 	Object ticket
+	 *  @return string              Value if OK, 0 if KO
+	 */
+	public function getNextValue($objsoc, $ticket)
+	{
+		global $db, $conf;
 
-        include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
-        // On defini critere recherche compteur
-        $mask = $conf->global->TICKET_UNIVERSAL_MASK;
+		// On defini critere recherche compteur
+		$mask = $conf->global->TICKET_UNIVERSAL_MASK;
 
-        if (!$mask) {
-            $this->error = 'NotConfigured';
-            return 0;
-        }
+		if (!$mask) {
+			$this->error = 'NotConfigured';
+			return 0;
+		}
 
-        $date = empty($ticket->date_c) ? dol_now() : $ticket->datec;
-        $numFinal = get_next_value($db, $mask, 'ticket', 'ref', '', $objsoc->code_client, $date);
+		$date = empty($ticket->datec) ? dol_now() : $ticket->datec;
+		$numFinal = get_next_value($db, $mask, 'ticket', 'ref', '', $objsoc->code_client, $date);
 
-        return $numFinal;
-    }
+		return $numFinal;
+	}
 }
diff --git a/htdocs/core/modules/ticket/modules_ticket.php b/htdocs/core/modules/ticket/modules_ticket.php
index 6aa027f16fc..f1d67cf5025 100644
--- a/htdocs/core/modules/ticket/modules_ticket.php
+++ b/htdocs/core/modules/ticket/modules_ticket.php
@@ -33,17 +33,17 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commondocgenerator.class.php';
 abstract class ModelePDFTicket extends CommonDocGenerator
 {
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Return list of active generation modules
-     *
-     *  @param	DoliDB	$db     			Database handler
-     *  @param  integer	$maxfilenamelength  Max length of value to show
-     *  @return	array						List of templates
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Return list of active generation modules
+	 *
+	 *  @param	DoliDB	$db     			Database handler
+	 *  @param  integer	$maxfilenamelength  Max length of value to show
+	 *  @return	array						List of templates
 	 */
 	public static function liste_modeles($db, $maxfilenamelength = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 		$type = 'ticket';
diff --git a/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php b/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php
index e71b09f8a0a..2f534f86813 100644
--- a/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php
+++ b/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php
@@ -42,15 +42,15 @@ class doc_generic_user_odt extends ModelePDFUser
 	public $emetteur;
 
 	/**
-     * @var array Minimum version of PHP required by module.
-     * e.g.: PHP ≥ 5.6 = array(5, 6)
-     */
+	 * @var array Minimum version of PHP required by module.
+	 * e.g.: PHP ≥ 5.6 = array(5, 6)
+	 */
 	public $phpmin = array(5, 6);
 
 	/**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
 	public $version = 'dolibarr';
 
 
@@ -59,12 +59,12 @@ class doc_generic_user_odt extends ModelePDFUser
 	 *
 	 *  @param		DoliDB		$db      Database handler
 	 */
-    public function __construct($db)
+	public function __construct($db)
 	{
 		global $conf, $langs, $mysoc;
 
 		// Load translation files required by the page
-        $langs->loadLangs(array("main", "companies"));
+		$langs->loadLangs(array("main", "companies"));
 
 		$this->db = $db;
 		$this->name = "ODT templates";
@@ -104,12 +104,12 @@ class doc_generic_user_odt extends ModelePDFUser
 	 *	@param	Translate	$langs      Lang object to use for output
 	 *	@return string       			Description
 	 */
-    public function info($langs)
+	public function info($langs)
 	{
 		global $conf, $langs;
 
 		// Load translation files required by the page
-        $langs->loadLangs(array('companies', 'errors'));
+		$langs->loadLangs(array('companies', 'errors'));
 
 		$form = new Form($this->db);
 
@@ -202,7 +202,7 @@ class doc_generic_user_odt extends ModelePDFUser
 		return $texte;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Function to build a document on disk using the generic odt module.
 	 *
@@ -214,9 +214,9 @@ class doc_generic_user_odt extends ModelePDFUser
 	 *  @param		int			$hideref			Do not show ref
 	 *	@return		int         					1 if OK, <=0 if KO
 	 */
-    public function write_file($object, $outputlangs, $srctemplatepath, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
+	public function write_file($object, $outputlangs, $srctemplatepath, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $user, $langs, $conf, $mysoc, $hookmanager;
 
 		if (empty($srctemplatepath))
@@ -256,6 +256,8 @@ class doc_generic_user_odt extends ModelePDFUser
 				}
 			}
 
+			$object->fetch_thirdparty();
+
 			$dir = $conf->user->dir_output;
 			$objectref = dol_sanitizeFileName($object->ref);
 			if (!preg_match('/specimen/i', $objectref)) $dir .= "/".$objectref;
@@ -284,8 +286,8 @@ class doc_generic_user_odt extends ModelePDFUser
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
 				if (!empty($conf->global->MAIN_DOC_USE_TIMING))
 				{
-				    $format = $conf->global->MAIN_DOC_USE_TIMING;
-				    if ($format == '1') $format = '%Y%m%d%H%M%S';
+					$format = $conf->global->MAIN_DOC_USE_TIMING;
+					if ($format == '1') $format = '%Y%m%d%H%M%S';
 					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
 				} else {
 					$filename = $newfiletmp.'.'.$newfileformat;
@@ -314,10 +316,10 @@ class doc_generic_user_odt extends ModelePDFUser
 					// On peut utiliser le nom de la societe du contact
 					if (!empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socobject = $object->contact;
 					else {
-                        $socobject = $object->thirdparty;
-                        // if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
-                        $contactobject = $object->contact;
-                    }
+						$socobject = $object->thirdparty;
+						// if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
+						$contactobject = $object->contact;
+					}
 				} else {
 					$socobject = $object->thirdparty;
 				}
@@ -325,7 +327,7 @@ class doc_generic_user_odt extends ModelePDFUser
 				// Open and load template
 				require_once ODTPHP_PATH.'odf.php';
 				try {
-                    $odfHandler = new odf(
+					$odfHandler = new odf(
 						$srctemplatepath,
 						array(
 							'PATH_TO_TMP'	  => $conf->user->dir_temp,
@@ -427,18 +429,18 @@ class doc_generic_user_odt extends ModelePDFUser
 		return -1;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * get substitution array for object
-     *
-     * @param User          $object         user
-     * @param Translate     $outputlangs    translation object
-     * @param string        $array_key      key for array
-     * @return array                        array of substitutions
-     */
-    public function get_substitutionarray_object($object, $outputlangs, $array_key = 'object')
-    {
-        // phpcs:enable
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * get substitution array for object
+	 *
+	 * @param User          $object         user
+	 * @param Translate     $outputlangs    translation object
+	 * @param string        $array_key      key for array
+	 * @return array                        array of substitutions
+	 */
+	public function get_substitutionarray_object($object, $outputlangs, $array_key = 'object')
+	{
+		// phpcs:enable
 		$array_other = array();
 		foreach ($object as $key => $value) {
 			if (!is_array($value) && !is_object($value)) {
diff --git a/htdocs/core/modules/user/modules_user.class.php b/htdocs/core/modules/user/modules_user.class.php
index 2ef42f07db0..2269d530c97 100644
--- a/htdocs/core/modules/user/modules_user.class.php
+++ b/htdocs/core/modules/user/modules_user.class.php
@@ -44,17 +44,17 @@ abstract class ModelePDFUser extends CommonDocGenerator
 	public $error = '';
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Return list of active generation modules
 	 *
-     *  @param	DoliDB	$db     			Database handler
-     *  @param  integer	$maxfilenamelength  Max length of value to show
-     *  @return	array						List of templates
+	 *  @param	DoliDB	$db     			Database handler
+	 *  @param  integer	$maxfilenamelength  Max length of value to show
+	 *  @return	array						List of templates
 	 */
 	public static function liste_modeles($db, $maxfilenamelength = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 		$type = 'user';
diff --git a/htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php b/htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php
index 391eab28838..3cbce44511f 100644
--- a/htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php
+++ b/htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php
@@ -45,15 +45,15 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
 	public $emetteur;
 
 	/**
-     * @var array Minimum version of PHP required by module.
-     * e.g.: PHP ≥ 5.6 = array(5, 6)
-     */
+	 * @var array Minimum version of PHP required by module.
+	 * e.g.: PHP ≥ 5.6 = array(5, 6)
+	 */
 	public $phpmin = array(5, 6);
 
 	/**
-   * Dolibarr version of the loaded document
-   * @var string
-   */
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
 	public $version = 'dolibarr';
 
 
@@ -62,12 +62,12 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
 	 *
 	 *  @param		DoliDB		$db      Database handler
 	 */
-    public function __construct($db)
+	public function __construct($db)
 	{
 		global $conf, $langs, $mysoc;
 
 		// Load translation files required by the page
-        $langs->loadLangs(array("main", "companies"));
+		$langs->loadLangs(array("main", "companies"));
 
 		$this->db = $db;
 		$this->name = "ODT templates";
@@ -107,12 +107,12 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
 	 *	@param	Translate	$langs      Lang object to use for output
 	 *	@return string       			Description
 	 */
-    public function info($langs)
+	public function info($langs)
 	{
 		global $conf, $langs;
 
 		// Load translation files required by the page
-        $langs->loadLangs(array("errors", "companies"));
+		$langs->loadLangs(array("errors", "companies"));
 
 		$form = new Form($this->db);
 
@@ -205,7 +205,7 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
 		return $texte;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Function to build a document on disk using the generic odt module.
 	 *
@@ -217,9 +217,9 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
 	 *  @param		int			$hideref			Do not show ref
 	 *	@return		int         					1 if OK, <=0 if KO
 	 */
-    public function write_file($object, $outputlangs, $srctemplatepath, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
+	public function write_file($object, $outputlangs, $srctemplatepath, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $user, $langs, $conf, $mysoc, $hookmanager;
 
 		if (empty($srctemplatepath))
@@ -287,8 +287,8 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
 				if (!empty($conf->global->MAIN_DOC_USE_TIMING))
 				{
-				    $format = $conf->global->MAIN_DOC_USE_TIMING;
-				    if ($format == '1') $format = '%Y%m%d%H%M%S';
+					$format = $conf->global->MAIN_DOC_USE_TIMING;
+					if ($format == '1') $format = '%Y%m%d%H%M%S';
 					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
 				} else {
 					$filename = $newfiletmp.'.'.$newfileformat;
@@ -317,10 +317,10 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
 					// On peut utiliser le nom de la societe du contact
 					if (!empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socobject = $object->contact;
 					else {
-                        $socobject = $object->thirdparty;
-                        // if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
-                        $contactobject = $object->contact;
-                    }
+						$socobject = $object->thirdparty;
+						// if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
+						$contactobject = $object->contact;
+					}
 				} else {
 					$socobject = $object->thirdparty;
 				}
@@ -330,7 +330,7 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
 				'__FROM_EMAIL__' => $this->emetteur->email,
 				'__TOTAL_TTC__' => $object->total_ttc,
 				'__TOTAL_HT__' => $object->total_ht,
-				'__TOTAL_VAT__' => $object->total_vat
+				'__TOTAL_VAT__' => $object->total_tva
 				);
 				complete_substitutions_array($substitutionarray, $langs, $object);
 				// Call the ODTSubstitution hook
@@ -348,7 +348,7 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
 				// Open and load template
 				require_once ODTPHP_PATH.'odf.php';
 				try {
-                    $odfHandler = new odf(
+					$odfHandler = new odf(
 						$srctemplatepath,
 						array(
 							'PATH_TO_TMP'	  => $conf->user->dir_temp,
@@ -508,6 +508,6 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
 			}
 		}
 
-        return -1;
-    }
+		return -1;
+	}
 }
diff --git a/htdocs/core/modules/usergroup/modules_usergroup.class.php b/htdocs/core/modules/usergroup/modules_usergroup.class.php
index db5f0167ef4..99ee232fdf2 100644
--- a/htdocs/core/modules/usergroup/modules_usergroup.class.php
+++ b/htdocs/core/modules/usergroup/modules_usergroup.class.php
@@ -38,30 +38,30 @@
  */
 abstract class ModelePDFUserGroup extends CommonDocGenerator
 {
-    /**
-     * @var string Error code (or message)
-     */
-    public $error = '';
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error = '';
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *	Return list of active generation modules
-     *
-     *  @param	DoliDB	$db     			Database handler
-     *  @param  integer	$maxfilenamelength  Max length of value to show
-     *  @return	array						List of templates
-     */
-    public static function liste_modeles($db, $maxfilenamelength = 0)
-    {
-        // phpcs:enable
-        global $conf;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *	Return list of active generation modules
+	 *
+	 *  @param	DoliDB	$db     			Database handler
+	 *  @param  integer	$maxfilenamelength  Max length of value to show
+	 *  @return	array						List of templates
+	 */
+	public static function liste_modeles($db, $maxfilenamelength = 0)
+	{
+		// phpcs:enable
+		global $conf;
 
-        $type = 'group';
-        $list = array();
+		$type = 'group';
+		$list = array();
 
-        include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-        $list = getListOfModels($db, $type, $maxfilenamelength);
-        return $list;
-    }
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+		$list = getListOfModels($db, $type, $maxfilenamelength);
+		return $list;
+	}
 }
diff --git a/htdocs/core/photos_resize.php b/htdocs/core/photos_resize.php
index c7a52865dc7..3ceef18d8ae 100644
--- a/htdocs/core/photos_resize.php
+++ b/htdocs/core/photos_resize.php
@@ -52,7 +52,7 @@ if ($modulepart == 'produit' || $modulepart == 'product' || $modulepart == 'serv
 	$accessallowed = 1;
 } elseif ($modulepart == 'project')
 {
-    $result = restrictedArea($user, 'projet', $id);
+	$result = restrictedArea($user, 'projet', $id);
 	if (!$user->rights->projet->lire) accessforbidden();
 	$accessallowed = 1;
 } elseif ($modulepart == 'bom')
@@ -114,14 +114,14 @@ if ($modulepart == 'produit' || $modulepart == 'product' || $modulepart == 'serv
 	}
 } elseif ($modulepart == 'project')
 {
-    require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
-    $object = new Project($db);
-    if ($id > 0)
-    {
-        $result = $object->fetch($id);
-        if ($result <= 0) dol_print_error($db, 'Failed to load object');
-        $dir = $conf->project->multidir_output[$object->entity]; // By default
-    }
+	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+	$object = new Project($db);
+	if ($id > 0)
+	{
+		$result = $object->fetch($id);
+		if ($result <= 0) dol_print_error($db, 'Failed to load object');
+		$dir = $conf->project->multidir_output[$object->entity]; // By default
+	}
 } elseif ($modulepart == 'propal')
 {
 	require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
@@ -154,34 +154,34 @@ if ($modulepart == 'produit' || $modulepart == 'product' || $modulepart == 'serv
 	}
 } elseif ($modulepart == 'societe')
 {
-    require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
-    $object = new Societe($db);
-    if ($id > 0)
-    {
-        $result = $object->fetch($id);
-        if ($result <= 0) dol_print_error($db, 'Failed to load object');
-        $dir = $conf->$modulepart->dir_output;
-    }
+	require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
+	$object = new Societe($db);
+	if ($id > 0)
+	{
+		$result = $object->fetch($id);
+		if ($result <= 0) dol_print_error($db, 'Failed to load object');
+		$dir = $conf->$modulepart->dir_output;
+	}
 } elseif ($modulepart == 'user')
 {
-    require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
-    $object = new User($db);
-    if ($id > 0)
-    {
-        $result = $object->fetch($id);
-        if ($result <= 0) dol_print_error($db, 'Failed to load object');
-        $dir = $conf->$modulepart->dir_output; // By default
-    }
+	require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
+	$object = new User($db);
+	if ($id > 0)
+	{
+		$result = $object->fetch($id);
+		if ($result <= 0) dol_print_error($db, 'Failed to load object');
+		$dir = $conf->$modulepart->dir_output; // By default
+	}
 } elseif ($modulepart == 'expensereport')
 {
-    require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
-    $object = new ExpenseReport($db);
-    if ($id > 0)
-    {
-        $result = $object->fetch($id);
-        if ($result <= 0) dol_print_error($db, 'Failed to load object');
-        $dir = $conf->expensereport->dir_output; // By default
-    }
+	require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
+	$object = new ExpenseReport($db);
+	if ($id > 0)
+	{
+		$result = $object->fetch($id);
+		if ($result <= 0) dol_print_error($db, 'Failed to load object');
+		$dir = $conf->expensereport->dir_output; // By default
+	}
 } elseif ($modulepart == 'tax')
 {
 	require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php';
@@ -240,28 +240,28 @@ if (empty($backtourl))
 {
 	$regs = array();
 
-    if (in_array($modulepart, array('product', 'produit', 'service', 'produit|service'))) $backtourl = DOL_URL_ROOT."/product/document.php?id=".$id.'&file='.urldecode($file);
-    elseif (in_array($modulepart, array('expensereport'))) $backtourl = DOL_URL_ROOT."/expensereport/document.php?id=".$id.'&file='.urldecode($file);
-    elseif (in_array($modulepart, array('holiday')))       $backtourl = DOL_URL_ROOT."/holiday/document.php?id=".$id.'&file='.urldecode($file);
-    elseif (in_array($modulepart, array('member')))        $backtourl = DOL_URL_ROOT."/adherents/document.php?id=".$id.'&file='.urldecode($file);
-    elseif (in_array($modulepart, array('project')))       $backtourl = DOL_URL_ROOT."/projet/document.php?id=".$id.'&file='.urldecode($file);
-    elseif (in_array($modulepart, array('propal')))        $backtourl = DOL_URL_ROOT."/comm/propal/document.php?id=".$id.'&file='.urldecode($file);
-    elseif (in_array($modulepart, array('societe')))       $backtourl = DOL_URL_ROOT."/societe/document.php?id=".$id.'&file='.urldecode($file);
-    elseif (in_array($modulepart, array('tax')))           $backtourl = DOL_URL_ROOT."/compta/sociales/document.php?id=".$id.'&file='.urldecode($file);
-    elseif (in_array($modulepart, array('ticket')))        $backtourl = DOL_URL_ROOT."/ticket/document.php?id=".$id.'&file='.urldecode($file);
-    elseif (in_array($modulepart, array('user')))          $backtourl = DOL_URL_ROOT."/user/document.php?id=".$id.'&file='.urldecode($file);
-    elseif (in_array($modulepart, array('bank')) && preg_match('/\/statement\/([^\/]+)\//', $file, $regs)) {
-    	$num = $regs[1];
-    	$backtourl = DOL_URL_ROOT."/compta/bank/account_statement_document.php?id=".$id.'&num='.urlencode($num).'&file='.urldecode($file);
-    } elseif (in_array($modulepart, array('bank')))          $backtourl = DOL_URL_ROOT."/compta/bank/document.php?id=".$id.'&file='.urldecode($file);
-    elseif (in_array($modulepart, array('mrp')))           $backtourl = DOL_URL_ROOT."/mrp/mo_document.php?id=".$id.'&file='.urldecode($file);
-    elseif (in_array($modulepart, array('medias'))) {
-    	$section_dir = dirname($file);
-    	if (! preg_match('/\/$/', $section_dir)) $section_dir.='/';
-    	$backtourl = DOL_URL_ROOT."/website/index.php?action=file_manager&website=".$website.'&section_dir='.urlencode($section_dir);
-    }
-    // Generic case that should work for everybody else
-    else $backtourl = DOL_URL_ROOT."/".$modulepart."/".$modulepart."_document.php?id=".$id.'&file='.urldecode($file);
+	if (in_array($modulepart, array('product', 'produit', 'service', 'produit|service'))) $backtourl = DOL_URL_ROOT."/product/document.php?id=".$id.'&file='.urldecode($file);
+	elseif (in_array($modulepart, array('expensereport'))) $backtourl = DOL_URL_ROOT."/expensereport/document.php?id=".$id.'&file='.urldecode($file);
+	elseif (in_array($modulepart, array('holiday')))       $backtourl = DOL_URL_ROOT."/holiday/document.php?id=".$id.'&file='.urldecode($file);
+	elseif (in_array($modulepart, array('member')))        $backtourl = DOL_URL_ROOT."/adherents/document.php?id=".$id.'&file='.urldecode($file);
+	elseif (in_array($modulepart, array('project')))       $backtourl = DOL_URL_ROOT."/projet/document.php?id=".$id.'&file='.urldecode($file);
+	elseif (in_array($modulepart, array('propal')))        $backtourl = DOL_URL_ROOT."/comm/propal/document.php?id=".$id.'&file='.urldecode($file);
+	elseif (in_array($modulepart, array('societe')))       $backtourl = DOL_URL_ROOT."/societe/document.php?id=".$id.'&file='.urldecode($file);
+	elseif (in_array($modulepart, array('tax')))           $backtourl = DOL_URL_ROOT."/compta/sociales/document.php?id=".$id.'&file='.urldecode($file);
+	elseif (in_array($modulepart, array('ticket')))        $backtourl = DOL_URL_ROOT."/ticket/document.php?id=".$id.'&file='.urldecode($file);
+	elseif (in_array($modulepart, array('user')))          $backtourl = DOL_URL_ROOT."/user/document.php?id=".$id.'&file='.urldecode($file);
+	elseif (in_array($modulepart, array('bank')) && preg_match('/\/statement\/([^\/]+)\//', $file, $regs)) {
+		$num = $regs[1];
+		$backtourl = DOL_URL_ROOT."/compta/bank/account_statement_document.php?id=".$id.'&num='.urlencode($num).'&file='.urldecode($file);
+	} elseif (in_array($modulepart, array('bank')))          $backtourl = DOL_URL_ROOT."/compta/bank/document.php?id=".$id.'&file='.urldecode($file);
+	elseif (in_array($modulepart, array('mrp')))           $backtourl = DOL_URL_ROOT."/mrp/mo_document.php?id=".$id.'&file='.urldecode($file);
+	elseif (in_array($modulepart, array('medias'))) {
+		$section_dir = dirname($file);
+		if (!preg_match('/\/$/', $section_dir)) $section_dir .= '/';
+		$backtourl = DOL_URL_ROOT."/website/index.php?action=file_manager&website=".$website.'&section_dir='.urlencode($section_dir);
+	}
+	// Generic case that should work for everybody else
+	else $backtourl = DOL_URL_ROOT."/".$modulepart."/".$modulepart."_document.php?id=".$id.'&file='.urldecode($file);
 }
 
 
@@ -276,8 +276,8 @@ if ($cancel)
 		header("Location: ".$backtourl);
 		exit;
 	} else {
-	    dol_print_error('', 'Cancel on photo_resize with a not supported value of modulepart='.$modulepart);
-	    exit;
+		dol_print_error('', 'Cancel on photo_resize with a not supported value of modulepart='.$modulepart);
+		exit;
 	}
 }
 
@@ -303,33 +303,33 @@ if ($action == 'confirm_resize' && GETPOSTISSET("file") && GETPOSTISSET("sizex")
 		$result = $ecmfile->fetch(0, '', $rel_filename);
 		if ($result > 0)   // If found
 		{
-		    $filename = basename($rel_filename);
-		    $rel_dir = dirname($rel_filename);
-		    $rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
-		    $rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
+			$filename = basename($rel_filename);
+			$rel_dir = dirname($rel_filename);
+			$rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
+			$rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
 
-		    $ecmfile->label = md5_file(dol_osencode($fullpath));
-		    $result = $ecmfile->update($user);
+			$ecmfile->label = md5_file(dol_osencode($fullpath));
+			$result = $ecmfile->update($user);
 		} elseif ($result == 0)   // If not found
 		{
-		    $filename = basename($rel_filename);
-		    $rel_dir = dirname($rel_filename);
-		    $rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
-		    $rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
+			$filename = basename($rel_filename);
+			$rel_dir = dirname($rel_filename);
+			$rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
+			$rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
 
-		    $ecmfile->filepath = $rel_dir;
-		    $ecmfile->filename = $filename;
-		    $ecmfile->label = md5_file(dol_osencode($fullpath)); // $fullpath is a full path to file
-		    $ecmfile->fullpath_orig = $fullpath;
-		    $ecmfile->gen_or_uploaded = 'unknown';
-		    $ecmfile->description = ''; // indexed content
-		    $ecmfile->keyword = ''; // keyword content
-		    $result = $ecmfile->create($user);
-		    if ($result < 0)
-		    {
-		        setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
-		    }
-		    $result = $ecmfile->create($user);
+			$ecmfile->filepath = $rel_dir;
+			$ecmfile->filename = $filename;
+			$ecmfile->label = md5_file(dol_osencode($fullpath)); // $fullpath is a full path to file
+			$ecmfile->fullpath_orig = $fullpath;
+			$ecmfile->gen_or_uploaded = 'unknown';
+			$ecmfile->description = ''; // indexed content
+			$ecmfile->keyword = ''; // keyword content
+			$result = $ecmfile->create($user);
+			if ($result < 0)
+			{
+				setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
+			}
+			$result = $ecmfile->create($user);
 		}
 
 		if ($backtourl)
@@ -337,8 +337,8 @@ if ($action == 'confirm_resize' && GETPOSTISSET("file") && GETPOSTISSET("sizex")
 			header("Location: ".$backtourl);
 			exit;
 		} else {
-    	    dol_print_error('', 'confirm_resize on photo_resize without backtourl defined for modulepart='.$modulepart);
-    	    exit;
+			dol_print_error('', 'confirm_resize on photo_resize without backtourl defined for modulepart='.$modulepart);
+			exit;
 		}
 	} else {
 		setEventMessages($result, null, 'errors');
@@ -370,33 +370,33 @@ if ($action == 'confirm_crop')
 		$result = $ecmfile->fetch(0, '', $rel_filename);
 		if ($result > 0)   // If found
 		{
-		    $filename = basename($rel_filename);
-		    $rel_dir = dirname($rel_filename);
-		    $rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
-		    $rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
+			$filename = basename($rel_filename);
+			$rel_dir = dirname($rel_filename);
+			$rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
+			$rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
 
-		    $ecmfile->label = md5_file(dol_osencode($fullpath));
-		    $result = $ecmfile->update($user);
+			$ecmfile->label = md5_file(dol_osencode($fullpath));
+			$result = $ecmfile->update($user);
 		} elseif ($result == 0)   // If not found
 		{
-		    $filename = basename($rel_filename);
-		    $rel_dir = dirname($rel_filename);
-		    $rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
-		    $rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
+			$filename = basename($rel_filename);
+			$rel_dir = dirname($rel_filename);
+			$rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
+			$rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
 
-		    $ecmfile->filepath = $rel_dir;
-		    $ecmfile->filename = $filename;
-		    $ecmfile->label = md5_file(dol_osencode($fullpath)); // $fullpath is a full path to file
-		    $ecmfile->fullpath_orig = $fullpath;
-		    $ecmfile->gen_or_uploaded = 'unknown';
-		    $ecmfile->description = ''; // indexed content
-		    $ecmfile->keyword = ''; // keyword content
-		    $result = $ecmfile->create($user);
-		    if ($result < 0)
-		    {
-		        setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
-		    }
-		    $result = $ecmfile->create($user);
+			$ecmfile->filepath = $rel_dir;
+			$ecmfile->filename = $filename;
+			$ecmfile->label = md5_file(dol_osencode($fullpath)); // $fullpath is a full path to file
+			$ecmfile->fullpath_orig = $fullpath;
+			$ecmfile->gen_or_uploaded = 'unknown';
+			$ecmfile->description = ''; // indexed content
+			$ecmfile->keyword = ''; // keyword content
+			$result = $ecmfile->create($user);
+			if ($result < 0)
+			{
+				setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
+			}
+			$result = $ecmfile->create($user);
 		}
 
 		if ($backtourl)
@@ -404,8 +404,8 @@ if ($action == 'confirm_crop')
 			header("Location: ".$backtourl);
 			exit;
 		} else {
-    	    dol_print_error('', 'confirm_crop on photo_resize without backtourl defined for modulepart='.$modulepart);
-    	    exit;
+			dol_print_error('', 'confirm_crop on photo_resize without backtourl defined for modulepart='.$modulepart);
+			exit;
 		}
 	} else {
 		setEventMessages($result, null, 'errors');
diff --git a/htdocs/core/tpl/admin_extrafields_add.tpl.php b/htdocs/core/tpl/admin_extrafields_add.tpl.php
index 69bf77262c8..05d0ffebc41 100644
--- a/htdocs/core/tpl/admin_extrafields_add.tpl.php
+++ b/htdocs/core/tpl/admin_extrafields_add.tpl.php
@@ -57,17 +57,17 @@ $listofexamplesforlink = 'Societe:societe/class/societe.class.php<br>Contact:con
     		var list = jQuery("#list");
             var totalizable = jQuery("#totalizable");
     		<?php
-    		if ((GETPOST('type', 'alpha') != "select") && (GETPOST('type', 'alpha') != "sellist"))
-    		{
-    			print 'jQuery("#value_choice").hide();';
-    		}
+			if ((GETPOST('type', 'alpha') != "select") && (GETPOST('type', 'alpha') != "sellist"))
+			{
+				print 'jQuery("#value_choice").hide();';
+			}
 
-    		if (GETPOST('type', 'alpha') == "separate")
-    		{
+			if (GETPOST('type', 'alpha') == "separate")
+			{
 				print "jQuery('#size, #default_value, #langfile').val('').prop('disabled', true);";
-    			print 'jQuery("#value_choice").hide();';
-    		}
-    		?>
+				print 'jQuery("#value_choice").hide();';
+			}
+			?>
 
     		// Case of computed field
     		if (type == '' || type == 'varchar' || type == 'int' || type == 'double' || type == 'price') {
@@ -211,7 +211,7 @@ $listofexamplesforlink = 'Societe:societe/class/societe.class.php<br>Contact:con
 <?php } ?>
 </table>
 
-<?php dol_fiche_end(); ?>
+<?php print dol_get_fiche_end(); ?>
 
 <div class="center"><input type="submit" name="button" class="button" value="<?php echo $langs->trans("Save"); ?>">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 <input type="submit" name="button" class="button" value="<?php echo $langs->trans("Cancel"); ?>"></div>
diff --git a/htdocs/core/tpl/admin_extrafields_edit.tpl.php b/htdocs/core/tpl/admin_extrafields_edit.tpl.php
index 396406932e7..61971945183 100644
--- a/htdocs/core/tpl/admin_extrafields_edit.tpl.php
+++ b/htdocs/core/tpl/admin_extrafields_edit.tpl.php
@@ -56,17 +56,17 @@ $listofexamplesforlink = 'Societe:societe/class/societe.class.php<br>Contact:con
     		var list = jQuery("#list");
             var totalizable = jQuery("#totalizable");
     		<?php
-    		if ((GETPOST('type', 'alpha') != "select") && (GETPOST('type', 'alpha') != "sellist"))
-    		{
-    			print 'jQuery("#value_choice").hide();';
-    		}
+			if ((GETPOST('type', 'alpha') != "select") && (GETPOST('type', 'alpha') != "sellist"))
+			{
+				print 'jQuery("#value_choice").hide();';
+			}
 
-    		if (GETPOST('type', 'alpha') == "separate")
-    		{
+			if (GETPOST('type', 'alpha') == "separate")
+			{
 				print "jQuery('#size, #default_value, #langfile').val('').prop('disabled', true);";
-    			print 'jQuery("#value_choice").hide();';
-    		}
-    		?>
+				print 'jQuery("#value_choice").hide();';
+			}
+			?>
 
     		// Case of computed field
     		if (type == 'varchar' || type == 'int' || type == 'double' || type == 'price') {
@@ -203,9 +203,9 @@ $typewecanchangeinto = array(
 	'html'=>array('text', 'html'),
 	'password'=>array('password', 'varchar'),
 	'mail'=>array('varchar', 'phone', 'mail', 'url', 'select'),
-    'url'=>array('varchar', 'phone', 'mail', 'url', 'select'),
-    'phone'=>array('varchar', 'phone', 'mail', 'url', 'select'),
-    'select'=>array('varchar', 'phone', 'mail', 'url', 'select')
+	'url'=>array('varchar', 'phone', 'mail', 'url', 'select'),
+	'phone'=>array('varchar', 'phone', 'mail', 'url', 'select'),
+	'select'=>array('varchar', 'phone', 'mail', 'url', 'select')
 );
 /* Disabled because text is text on several lines, when varchar is text on 1 line, we should not be able to convert
 if ($size <= 255 && in_array($type, array('text', 'html'))) {
@@ -214,19 +214,19 @@ if ($size <= 255 && in_array($type, array('text', 'html'))) {
 
 if (in_array($type, array_keys($typewecanchangeinto)))
 {
-    $newarray = array();
-    print '<select id="type" class="flat type" name="type">';
-    foreach ($type2label as $key => $val)
-    {
-        $selected = '';
-        if ($key == (GETPOST('type', 'alpha') ?GETPOST('type', 'alpha') : $type)) $selected = ' selected="selected"';
-        if (in_array($key, $typewecanchangeinto[$type])) print '<option value="'.$key.'"'.$selected.'>'.$val.'</option>';
-        else print '<option value="'.$key.'" disabled="disabled"'.$selected.'>'.$val.'</option>';
-    }
-    print '</select>';
+	$newarray = array();
+	print '<select id="type" class="flat type" name="type">';
+	foreach ($type2label as $key => $val)
+	{
+		$selected = '';
+		if ($key == (GETPOST('type', 'alpha') ?GETPOST('type', 'alpha') : $type)) $selected = ' selected="selected"';
+		if (in_array($key, $typewecanchangeinto[$type])) print '<option value="'.$key.'"'.$selected.'>'.$val.'</option>';
+		else print '<option value="'.$key.'" disabled="disabled"'.$selected.'>'.$val.'</option>';
+	}
+	print '</select>';
 } else {
 	print $type2label[$type];
-    print '<input type="hidden" name="type" id="type" value="'.$type.'">';
+	print '<input type="hidden" name="type" id="type" value="'.$type.'">';
 }
 ?>
 </td></tr>
@@ -298,7 +298,7 @@ if (in_array($type, array_keys($typewecanchangeinto)))
 <?php } ?>
 </table>
 
-<?php dol_fiche_end(); ?>
+<?php print dol_get_fiche_end(); ?>
 
 <div class="center"><input type="submit" name="button" class="button" value="<?php echo $langs->trans("Save"); ?>">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 <input type="submit" name="button" class="button" value="<?php echo $langs->trans("Cancel"); ?>"></div>
diff --git a/htdocs/core/tpl/advtarget.tpl.php b/htdocs/core/tpl/advtarget.tpl.php
index 8f9c8ec83e2..590a65f1286 100644
--- a/htdocs/core/tpl/advtarget.tpl.php
+++ b/htdocs/core/tpl/advtarget.tpl.php
@@ -154,11 +154,11 @@ if (!empty($array_query['cust_status'])) {
 }
 print '</td><td>';
 print $formadvtargetemaling->advMultiselectarray(
-    'cust_status', array(
+	'cust_status', array(
 		'0' => $langs->trans('ActivityCeased'),
 		'1' => $langs->trans('InActivity')
-    ),
-    $array_query['cust_status']
+	),
+	$array_query['cust_status']
 );
 print '</td><td>'."\n";
 print '</td></tr>'."\n";
@@ -300,15 +300,15 @@ if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) {
 				print '</td><td>'."\n";
 				print $form->textwithpicto('', $langs->trans("AdvTgtSearchDtHelp"), 1, 'help');
 			} elseif (($extrafields->attributes[$elementtype]['type'][$key] == 'boolean')) {
-                print $form->selectarray(
-                    'options_'.$key,
-                    array(
+				print $form->selectarray(
+					'options_'.$key,
+					array(
 						'' => '',
 						'1' => $langs->trans('Yes'),
 						'0' => $langs->trans('No')
-                    ),
-                    $array_query['options_'.$key]
-                );
+					),
+					$array_query['options_'.$key]
+				);
 				print '</td><td>'."\n";
 			} elseif (($extrafields->attributes[$elementtype]['type'][$key] == 'select')) {
 				print $formadvtargetemaling->advMultiselectarray('options_'.$key, $extrafields->attributes[$key]['param']['options'], $array_query['options_'.$key]);
@@ -346,7 +346,7 @@ if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) {
 	}
 	// Other attributes
 	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $std_soc, $action_search);
-    print $hookmanager->resPrint;
+	print $hookmanager->resPrint;
 }
 
 // State Contact
@@ -356,12 +356,12 @@ if (!empty($array_query['contact_status'])) {
 }
 print '</td><td>';
 print $formadvtargetemaling->advMultiselectarray(
-    'contact_status',
-    array(
+	'contact_status',
+	array(
 		'0' => $langs->trans('ActivityCeased'),
 		'1' => $langs->trans('InActivity')
-    ),
-    $array_query['contact_status']
+	),
+	$array_query['contact_status']
 );
 print '</td><td>'."\n";
 print $form->textwithpicto('', $langs->trans("AdvTgtContactHelp"), 1, 'help');
@@ -409,13 +409,13 @@ if (!empty($array_query['contact_no_email'])) {
 }
 print '</td><td>'."\n";
 print $form->selectarray(
-    'contact_no_email',
-    array(
+	'contact_no_email',
+	array(
 		'' => '',
 		'1' => $langs->trans('Yes'),
 		'0' => $langs->trans('No')
-    ),
-    $array_query['contact_no_email']
+	),
+	$array_query['contact_no_email']
 );
 print '</td><td>'."\n";
 print '</td></tr>'."\n";
@@ -479,57 +479,54 @@ if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) {
 	}
 	if (!empty($extrafields->attributes[$elementtype]['label'])) {
 		foreach ($extrafields->attributes[$elementtype]['label'] as $key => $val) {
-			print '<tr><td>' . $extrafields->attributes[$elementtype]['label'][$key];
-			if ($array_query['options_' . $key . '_cnct'] != '' || (is_array($array_query['options_' . $key . '_cnct']) && count($array_query['options_' . $key . '_cnct']) > 0)) {
+			print '<tr><td>'.$extrafields->attributes[$elementtype]['label'][$key];
+			if ($array_query['options_'.$key.'_cnct'] != '' || (is_array($array_query['options_'.$key.'_cnct']) && count($array_query['options_'.$key.'_cnct']) > 0)) {
 				print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
 			}
 			print '</td><td>';
 			if (($extrafields->attributes[$elementtype]['type'][$key] == 'varchar') || ($extrafields->attributes[$elementtype]['type'][$key] == 'text')) {
-				print '<input type="text" name="options_' . $key . '_cnct"/></td><td>' . "\n";
+				print '<input type="text" name="options_'.$key.'_cnct"/></td><td>'."\n";
 				print $form->textwithpicto('', $langs->trans("AdvTgtSearchTextHelp"), 1, 'help');
 			} elseif (($extrafields->attributes[$elementtype]['type'][$key] == 'int') || ($extrafields->attributes[$elementtype]['type'][$key] == 'double')) {
-				print $langs->trans("AdvTgtMinVal") . '<input type="text" name="options_' . $key . '_min_cnct"/>';
-				print $langs->trans("AdvTgtMaxVal") . '<input type="text" name="options_' . $key . '_max_cnct"/>';
-				print '</td><td>' . "\n";
+				print $langs->trans("AdvTgtMinVal").'<input type="text" name="options_'.$key.'_min_cnct"/>';
+				print $langs->trans("AdvTgtMaxVal").'<input type="text" name="options_'.$key.'_max_cnct"/>';
+				print '</td><td>'."\n";
 				print $form->textwithpicto('', $langs->trans("AdvTgtSearchIntHelp"), 1, 'help');
 			} elseif (($extrafields->attributes[$elementtype]['type'][$key] == 'date') || ($extrafields->attributes[$elementtype]['type'][$key] == 'datetime')) {
 				print '<table class="nobordernopadding"><tr>';
-				print '<td>' . $langs->trans("AdvTgtStartDt") . '</td><td>';
-				print $form->selectDate('', 'options_' . $key . '_st_dt_cnct');
-				print '</td><td>' . $langs->trans("AdvTgtEndDt") . '</td><td>';
-				print $form->selectDate('', 'options_' . $key . '_end_dt_cnct');
+				print '<td>'.$langs->trans("AdvTgtStartDt").'</td><td>';
+				print $form->selectDate('', 'options_'.$key.'_st_dt_cnct');
+				print '</td><td>'.$langs->trans("AdvTgtEndDt").'</td><td>';
+				print $form->selectDate('', 'options_'.$key.'_end_dt_cnct');
 				print '</td></tr></table>';
-				print '</td><td>' . "\n";
+				print '</td><td>'."\n";
 				print $form->textwithpicto('', $langs->trans("AdvTgtSearchDtHelp"), 1, 'help');
 			} elseif (($extrafields->attributes[$elementtype]['type'][$key] == 'boolean')) {
 				print $form->selectarray(
-					'options_' . $key . '_cnct',
+					'options_'.$key.'_cnct',
 					array(
 						''  => '',
 						'1' => $langs->trans('Yes'),
 						'0' => $langs->trans('No')
 					),
-					$array_query['options_' . $key . '_cnct']
+					$array_query['options_'.$key.'_cnct']
 				);
-				print '</td><td>' . "\n";
+				print '</td><td>'."\n";
 			} elseif (($extrafields->attributes[$elementtype]['type'][$key] == 'select')) {
-				print $formadvtargetemaling->advMultiselectarray('options_' . $key . '_cnct', $extrafields->attributes[$key]['param']['options'], $array_query['options_' . $key . '_cnct']);
-				print '</td><td>' . "\n";
+				print $formadvtargetemaling->advMultiselectarray('options_'.$key.'_cnct', $extrafields->attributes[$key]['param']['options'], $array_query['options_'.$key.'_cnct']);
+				print '</td><td>'."\n";
 			} elseif (($extrafields->attributes[$elementtype]['type'][$key] == 'sellist')) {
-				print $formadvtargetemaling->advMultiselectarraySelllist('options_' . $key . '_cnct', $extrafields->attributes[$key]['param']['options'], $array_query['options_' . $key . '_cnct']);
-				print '</td><td>' . "\n";
+				print $formadvtargetemaling->advMultiselectarraySelllist('options_'.$key.'_cnct', $extrafields->attributes[$key]['param']['options'], $array_query['options_'.$key.'_cnct']);
+				print '</td><td>'."\n";
 			} else {
-				print '<table class="nobordernopadding"><tr>';
-				print '<td></td><td>';
-				if (is_array($array_query['options_' . $key . '_cnct'])) {
-					print $extrafields->showInputField($key, implode(',', $array_query['options_' . $key . '_cnct']), '', '_cnct');
+				if (is_array($array_query['options_'.$key.'_cnct'])) {
+					print $extrafields->showInputField($key, implode(',', $array_query['options_'.$key.'_cnct']), '', '_cnct');
 				} else {
-					print $extrafields->showInputField($key, $array_query['options_' . $key . '_cnct'], '', '_cnct');
+					print $extrafields->showInputField($key, $array_query['options_'.$key.'_cnct'], '', '_cnct');
 				}
-				print '</td></tr></table>';
-				print '</td><td>' . "\n";
+				print '</td><td>'."\n";
 			}
-			print '</td></tr>' . "\n";
+			print '</td></tr>'."\n";
 		}
 	}
 }
diff --git a/htdocs/core/tpl/ajax/objectlinked_lineimport.tpl.php b/htdocs/core/tpl/ajax/objectlinked_lineimport.tpl.php
index 61bec967ecf..a12ea47fdb0 100644
--- a/htdocs/core/tpl/ajax/objectlinked_lineimport.tpl.php
+++ b/htdocs/core/tpl/ajax/objectlinked_lineimport.tpl.php
@@ -25,7 +25,7 @@ if (empty($conf) || !is_object($conf))
 $objectUrl = $object->getNomUrl(0, '', 0, 1);
 if ($object->element == 'propal')
 {
-    $objectUrl = DOL_URL_ROOT.'/comm/propal/card.php?id='.$object->id;
+	$objectUrl = DOL_URL_ROOT.'/comm/propal/card.php?id='.$object->id;
 }
 
 ?>
diff --git a/htdocs/core/tpl/ajaxrow.tpl.php b/htdocs/core/tpl/ajaxrow.tpl.php
index de837b16edf..dea5ce60d6e 100644
--- a/htdocs/core/tpl/ajaxrow.tpl.php
+++ b/htdocs/core/tpl/ajaxrow.tpl.php
@@ -80,7 +80,12 @@ $(document).ready(function(){
 						console.log("tableDND end of ajax call");
 						if (reloadpage == 1) {
 							//console.log('<?php echo $urltorefreshaftermove.' - '.$_SERVER['PHP_SELF'].' - '.dol_escape_js($_SERVER['QUERY_STRING']); ?>');
-							location.href = '<?php echo dol_escape_js(empty($urltorefreshaftermove) ? ($_SERVER['PHP_SELF'].'?'.dol_escape_js($_SERVER['QUERY_STRING'])) : $urltorefreshaftermove); ?>';
+							<?php
+							$redirectURL = empty($urltorefreshaftermove) ? ($_SERVER['PHP_SELF'].'?'.dol_escape_js($_SERVER['QUERY_STRING'])) : $urltorefreshaftermove;
+							// remove action parameter from URL
+							$redirectURL = preg_replace('/(&|\?)action=[^&#]*/', '', $redirectURL);
+							?>
+							location.href = '<?php echo dol_escape_js($redirectURL); ?>';
 						} else {
 							$("#<?php echo $tagidfortablednd; ?> .drag").each(
 									function( intIndex ) {
diff --git a/htdocs/core/tpl/card_presend.tpl.php b/htdocs/core/tpl/card_presend.tpl.php
index ea72f29607b..99f9b250306 100644
--- a/htdocs/core/tpl/card_presend.tpl.php
+++ b/htdocs/core/tpl/card_presend.tpl.php
@@ -144,7 +144,7 @@ if ($action == 'presend')
 		$formmail->fromtype = 'special';
 	}
 
-	$formmail->trackid=$trackid;
+	$formmail->trackid = $trackid;
 	if (!empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 2))	// If bit 2 is set
 	{
 		include DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
@@ -292,5 +292,5 @@ if ($action == 'presend')
 	// Show form
 	print $formmail->get_form();
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 }
diff --git a/htdocs/core/tpl/document_actions_post_headers.tpl.php b/htdocs/core/tpl/document_actions_post_headers.tpl.php
index 32f6e67cb00..80fd0d7df12 100644
--- a/htdocs/core/tpl/document_actions_post_headers.tpl.php
+++ b/htdocs/core/tpl/document_actions_post_headers.tpl.php
@@ -59,7 +59,7 @@ if (in_array($modulepart, array('product', 'produit', 'societe', 'user', 'ticket
 if ($action == 'delete')
 {
 	$langs->load("companies"); // Need for string DeleteFile+ConfirmDeleteFiles
-    print $form->formconfirm(
+	print $form->formconfirm(
 			$_SERVER["PHP_SELF"].'?id='.$object->id.'&urlfile='.urlencode(GETPOST("urlfile")).'&linkid='.GETPOST('linkid', 'int').(empty($param) ? '' : $param),
 			$langs->trans('DeleteFile'),
 			$langs->trans('ConfirmDeleteFile'),
@@ -112,13 +112,13 @@ if (!isset($savingdocmask) || !empty($conf->global->MAIN_DISABLE_SUGGEST_REF_AS_
 
 // Show upload form (document and links)
 $formfile->form_attach_new_file(
-    $_SERVER["PHP_SELF"].'?id='.$object->id.(empty($withproject) ? '' : '&withproject=1').(empty($moreparam) ? '' : $moreparam),
-    '',
-    0,
-    0,
-    $permission,
-    $conf->browser->layout == 'phone' ? 40 : 60,
-    $object,
+	$_SERVER["PHP_SELF"].'?id='.$object->id.(empty($withproject) ? '' : '&withproject=1').(empty($moreparam) ? '' : $moreparam),
+	'',
+	0,
+	0,
+	$permission,
+	$conf->browser->layout == 'phone' ? 40 : 60,
+	$object,
 	'',
 	1,
 	$savingdocmask
@@ -126,24 +126,24 @@ $formfile->form_attach_new_file(
 
 // List of document
 $formfile->list_of_documents(
-    $filearray,
-    $object,
-    $modulepart,
-    $param,
-    0,
-    $relativepathwithnofile, // relative path with no file. For example "0/1"
-    $permission,
-    0,
-    '',
-    0,
-    '',
-    '',
-    0,
-    $permtoedit,
-    $upload_dir,
-    $sortfield,
-    $sortorder,
-    $disablemove
+	$filearray,
+	$object,
+	$modulepart,
+	$param,
+	0,
+	$relativepathwithnofile, // relative path with no file. For example "0/1"
+	$permission,
+	0,
+	'',
+	0,
+	'',
+	'',
+	0,
+	$permtoedit,
+	$upload_dir,
+	$sortfield,
+	$sortorder,
+	$disablemove
 );
 
 print "<br>";
diff --git a/htdocs/core/tpl/extrafields_list_print_fields.tpl.php b/htdocs/core/tpl/extrafields_list_print_fields.tpl.php
index 95ac0d6d5ce..8c46e34b428 100644
--- a/htdocs/core/tpl/extrafields_list_print_fields.tpl.php
+++ b/htdocs/core/tpl/extrafields_list_print_fields.tpl.php
@@ -14,18 +14,18 @@ if (!empty($extrafieldsobjectkey))	// $extrafieldsobject is the $object->table_e
 {
 	if (is_array($extrafields->attributes[$extrafieldsobjectkey]['label']) && count($extrafields->attributes[$extrafieldsobjectkey]['label']))
 	{
-        if (empty($extrafieldsobjectprefix)) $extrafieldsobjectprefix = 'ef.';
+		if (empty($extrafieldsobjectprefix)) $extrafieldsobjectprefix = 'ef.';
 
-        foreach ($extrafields->attributes[$extrafieldsobjectkey]['label'] as $key => $val)
+		foreach ($extrafields->attributes[$extrafieldsobjectkey]['label'] as $key => $val)
 		{
 			if (!empty($arrayfields[$extrafieldsobjectprefix.$key]['checked']))
 			{
 				$align = $extrafields->getAlignFlag($key, $extrafieldsobjectkey);
 				print '<td';
-                if ($align) print ' class="'.$align.'"';
-                print ' data-key="'.$key.'"';
-                print '>';
-                $tmpkey = 'options_'.$key;
+				if ($align) print ' class="'.$align.'"';
+				print ' data-key="'.$key.'"';
+				print '>';
+				$tmpkey = 'options_'.$key;
 
 				if (in_array($extrafields->attributes[$extrafieldsobjectkey]['type'][$key], array('date', 'datetime', 'timestamp')) && !is_numeric($obj->$tmpkey))
 				{
@@ -53,13 +53,13 @@ if (!empty($extrafieldsobjectkey))	// $extrafieldsobject is the $object->table_e
 				print '</td>';
 				if (!$i) $totalarray['nbfield']++;
 
-                if ($extrafields->attributes[$extrafieldsobjectkey]['totalizable'][$key]) {
-                    if (!$i) {
-                        // we keep position for the first line
-                        $totalarray['totalizable'][$key]['pos'] = $totalarray['nbfield'];
-                    }
-	                if (is_numeric($obj->$tmpkey)) $totalarray['totalizable'][$key]['total'] += $obj->$tmpkey;
-                }
+				if ($extrafields->attributes[$extrafieldsobjectkey]['totalizable'][$key]) {
+					if (!$i) {
+						// we keep position for the first line
+						$totalarray['totalizable'][$key]['pos'] = $totalarray['nbfield'];
+					}
+					if (is_numeric($obj->$tmpkey)) $totalarray['totalizable'][$key]['total'] += $obj->$tmpkey;
+				}
 				if (!empty($val['isameasure']))
 				{
 					if (!$i) $totalarray['pos'][$totalarray['nbfield']] = $extrafieldsobjectprefix.$tmpkey;
diff --git a/htdocs/core/tpl/extrafields_list_search_input.tpl.php b/htdocs/core/tpl/extrafields_list_search_input.tpl.php
index 22a6135cd13..bf31ff34ad7 100644
--- a/htdocs/core/tpl/extrafields_list_search_input.tpl.php
+++ b/htdocs/core/tpl/extrafields_list_search_input.tpl.php
@@ -5,8 +5,8 @@ print '<!-- extrafields_list_search_input.tpl.php -->'."\n";
 // Protection to avoid direct call of template
 if (empty($conf) || !is_object($conf))
 {
-    print "Error, template page can't be called as URL";
-    exit;
+	print "Error, template page can't be called as URL";
+	exit;
 }
 
 if (empty($extrafieldsobjectkey) && is_object($object)) $extrafieldsobjectkey = $object->table_element;
@@ -14,37 +14,37 @@ if (empty($extrafieldsobjectkey) && is_object($object)) $extrafieldsobjectkey =
 // Loop to show all columns of extrafields for the search title line
 if (!empty($extrafieldsobjectkey))	// $extrafieldsobject is the $object->table_element like 'societe', 'socpeople', ...
 {
-    if (is_array($extrafields->attributes[$extrafieldsobjectkey]['label']) && count($extrafields->attributes[$extrafieldsobjectkey]['label']))
-    {
-        if (empty($extrafieldsobjectprefix)) $extrafieldsobjectprefix = 'ef.';
-        if (empty($search_options_pattern)) $search_options_pattern = 'search_options_';
+	if (is_array($extrafields->attributes[$extrafieldsobjectkey]['label']) && count($extrafields->attributes[$extrafieldsobjectkey]['label']))
+	{
+		if (empty($extrafieldsobjectprefix)) $extrafieldsobjectprefix = 'ef.';
+		if (empty($search_options_pattern)) $search_options_pattern = 'search_options_';
 
-        foreach ($extrafields->attributes[$extrafieldsobjectkey]['label'] as $key => $val)
-        {
-            if (!empty($arrayfields[$extrafieldsobjectprefix.$key]['checked'])) {
-                $align = $extrafields->getAlignFlag($key);
-                $typeofextrafield = $extrafields->attributes[$extrafieldsobjectkey]['type'][$key];
+		foreach ($extrafields->attributes[$extrafieldsobjectkey]['label'] as $key => $val)
+		{
+			if (!empty($arrayfields[$extrafieldsobjectprefix.$key]['checked'])) {
+				$align = $extrafields->getAlignFlag($key);
+				$typeofextrafield = $extrafields->attributes[$extrafieldsobjectkey]['type'][$key];
 
-                print '<td class="liste_titre'.($align ? ' '.$align : '').'">';
-                $tmpkey = preg_replace('/'.$search_options_pattern.'/', '', $key);
-                if (in_array($typeofextrafield, array('varchar', 'int', 'double')) && empty($extrafields->attributes[$extrafieldsobjectkey]['computed'][$key]))
-                {
-                    $searchclass = '';
-                    if (in_array($typeofextrafield, array('varchar'))) $searchclass = 'searchstring';
-                    if (in_array($typeofextrafield, array('int', 'double'))) $searchclass = 'searchnum';
-                    print '<input class="flat'.($searchclass ? ' '.$searchclass : '').'" size="4" type="text" name="'.$search_options_pattern.$tmpkey.'" value="'.dol_escape_htmltag($search_array_options[$search_options_pattern.$tmpkey]).'">';
-                } elseif (in_array($typeofextrafield, array('datetime', 'timestamp')))
-                {
-                	// TODO
-                	// Use showInputField in a particular manner to have input with a comparison operator, not input for a specific value date-hour-minutes
-                } else {
-                    // for the type as 'checkbox', 'chkbxlst', 'sellist' we should use code instead of id (example: I declare a 'chkbxlst' to have a link with dictionnairy, I have to extend it with the 'code' instead 'rowid')
-                    $morecss = '';
-                    if (in_array($typeofextrafield, array('link', 'sellist', 'text', 'html'))) $morecss = 'maxwidth200';
-                    echo $extrafields->showInputField($key, $search_array_options[$search_options_pattern.$tmpkey], '', '', $search_options_pattern, $morecss, 0, $extrafieldsobjectkey, 1);
-                }
-                print '</td>';
-            }
-        }
-    }
+				print '<td class="liste_titre'.($align ? ' '.$align : '').'">';
+				$tmpkey = preg_replace('/'.$search_options_pattern.'/', '', $key);
+				if (in_array($typeofextrafield, array('varchar', 'int', 'double')) && empty($extrafields->attributes[$extrafieldsobjectkey]['computed'][$key]))
+				{
+					$searchclass = '';
+					if (in_array($typeofextrafield, array('varchar'))) $searchclass = 'searchstring';
+					if (in_array($typeofextrafield, array('int', 'double'))) $searchclass = 'searchnum';
+					print '<input class="flat'.($searchclass ? ' '.$searchclass : '').'" size="4" type="text" name="'.$search_options_pattern.$tmpkey.'" value="'.dol_escape_htmltag($search_array_options[$search_options_pattern.$tmpkey]).'">';
+				} elseif (in_array($typeofextrafield, array('datetime', 'timestamp')))
+				{
+					// TODO
+					// Use showInputField in a particular manner to have input with a comparison operator, not input for a specific value date-hour-minutes
+				} else {
+					// for the type as 'checkbox', 'chkbxlst', 'sellist' we should use code instead of id (example: I declare a 'chkbxlst' to have a link with dictionnairy, I have to extend it with the 'code' instead 'rowid')
+					$morecss = '';
+					if (in_array($typeofextrafield, array('link', 'sellist', 'text', 'html'))) $morecss = 'maxwidth200';
+					echo $extrafields->showInputField($key, $search_array_options[$search_options_pattern.$tmpkey], '', '', $search_options_pattern, $morecss, 0, $extrafieldsobjectkey, 1);
+				}
+				print '</td>';
+			}
+		}
+	}
 }
diff --git a/htdocs/core/tpl/extrafields_list_search_param.tpl.php b/htdocs/core/tpl/extrafields_list_search_param.tpl.php
index 6e6d6305106..224066d57ce 100644
--- a/htdocs/core/tpl/extrafields_list_search_param.tpl.php
+++ b/htdocs/core/tpl/extrafields_list_search_param.tpl.php
@@ -10,12 +10,12 @@ if (empty($conf) || !is_object($conf))
 // Loop to complete $param for extrafields
 if (!empty($search_array_options) && is_array($search_array_options))	// $extrafieldsobject is the $object->table_element like 'societe', 'socpeople', ...
 {
-    if (empty($search_options_pattern)) $search_options_pattern = 'search_options_';
+	if (empty($search_options_pattern)) $search_options_pattern = 'search_options_';
 
-    foreach ($search_array_options as $key => $val)
-    {
-        $crit = $val;
-        $tmpkey = preg_replace('/'.$search_options_pattern.'/', '', $key);
-        if ($val != '') $param .= '&'.$search_options_pattern.$tmpkey.'='.urlencode($val);
-    }
+	foreach ($search_array_options as $key => $val)
+	{
+		$crit = $val;
+		$tmpkey = preg_replace('/'.$search_options_pattern.'/', '', $key);
+		if ($val != '') $param .= '&'.$search_options_pattern.$tmpkey.'='.urlencode($val);
+	}
 }
diff --git a/htdocs/core/tpl/extrafields_list_search_sql.tpl.php b/htdocs/core/tpl/extrafields_list_search_sql.tpl.php
index 42dc67d2b87..5ef86f3b79d 100644
--- a/htdocs/core/tpl/extrafields_list_search_sql.tpl.php
+++ b/htdocs/core/tpl/extrafields_list_search_sql.tpl.php
@@ -12,10 +12,10 @@ if (empty($extrafieldsobjectkey) && is_object($object)) $extrafieldsobjectkey =
 // Loop to complete the sql search criterias from extrafields
 if (!empty($extrafieldsobjectkey) && !empty($search_array_options) && is_array($search_array_options))	// $extrafieldsobject is the $object->table_element like 'societe', 'socpeople', ...
 {
-    if (empty($extrafieldsobjectprefix)) $extrafieldsobjectprefix = 'ef.';
-    if (empty($search_options_pattern)) $search_options_pattern = 'search_options_';
+	if (empty($extrafieldsobjectprefix)) $extrafieldsobjectprefix = 'ef.';
+	if (empty($search_options_pattern)) $search_options_pattern = 'search_options_';
 
-    foreach ($search_array_options as $key => $val)
+	foreach ($search_array_options as $key => $val)
 	{
 		$crit = $val;
 		$tmpkey = preg_replace('/'.$search_options_pattern.'/', '', $key);
diff --git a/htdocs/core/tpl/extrafields_list_search_title.tpl.php b/htdocs/core/tpl/extrafields_list_search_title.tpl.php
index 5db8d04e8ec..1c071ac64c1 100644
--- a/htdocs/core/tpl/extrafields_list_search_title.tpl.php
+++ b/htdocs/core/tpl/extrafields_list_search_title.tpl.php
@@ -15,7 +15,7 @@ if (!empty($extrafieldsobjectkey))	// $extrafieldsobject is the $object->table_e
 {
 	if (is_array($extrafields->attributes[$extrafieldsobjectkey]['label']) && count($extrafields->attributes[$extrafieldsobjectkey]['label']))
 	{
-        if (empty($extrafieldsobjectprefix)) $extrafieldsobjectprefix = 'ef.';
+		if (empty($extrafieldsobjectprefix)) $extrafieldsobjectprefix = 'ef.';
 
 		foreach ($extrafields->attributes[$extrafieldsobjectkey]['label'] as $key => $val)
 		{
diff --git a/htdocs/core/tpl/extrafields_view.tpl.php b/htdocs/core/tpl/extrafields_view.tpl.php
index 8cf0cca3f18..c7035298beb 100644
--- a/htdocs/core/tpl/extrafields_view.tpl.php
+++ b/htdocs/core/tpl/extrafields_view.tpl.php
@@ -51,9 +51,9 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 if (empty($reshook) && is_array($extrafields->attributes[$object->table_element]['label']))
 {
 	$lastseparatorkeyfound = '';
-    $extrafields_collapse_num = '';
-    $extrafields_collapse_num_old = '';
-    $i = 0;
+	$extrafields_collapse_num = '';
+	$extrafields_collapse_num_old = '';
+	$i = 0;
 	foreach ($extrafields->attributes[$object->table_element]['label'] as $tmpkeyextra => $tmplabelextra)
 	{
 		$i++;
@@ -94,19 +94,19 @@ if (empty($reshook) && is_array($extrafields->attributes[$object->table_element]
 		// Print line tr of extra field
 		if ($extrafields->attributes[$object->table_element]['type'][$tmpkeyextra] == 'separate')
 		{
-            $extrafields_collapse_num = '';
-            $extrafield_param = $extrafields->attributes[$object->table_element]['param'][$tmpkeyextra];
-            if (!empty($extrafield_param) && is_array($extrafield_param)) {
-                $extrafield_param_list = array_keys($extrafield_param['options']);
+			$extrafields_collapse_num = '';
+			$extrafield_param = $extrafields->attributes[$object->table_element]['param'][$tmpkeyextra];
+			if (!empty($extrafield_param) && is_array($extrafield_param)) {
+				$extrafield_param_list = array_keys($extrafield_param['options']);
 
-                if (count($extrafield_param_list) > 0) {
-                    $extrafield_collapse_display_value = intval($extrafield_param_list[0]);
+				if (count($extrafield_param_list) > 0) {
+					$extrafield_collapse_display_value = intval($extrafield_param_list[0]);
 
-                    if ($extrafield_collapse_display_value == 1 || $extrafield_collapse_display_value == 2) {
-                        $extrafields_collapse_num = $extrafields->attributes[$object->table_element]['pos'][$tmpkeyextra];
-                    }
-                }
-            }
+					if ($extrafield_collapse_display_value == 1 || $extrafield_collapse_display_value == 2) {
+						$extrafields_collapse_num = $extrafields->attributes[$object->table_element]['pos'][$tmpkeyextra];
+					}
+				}
+			}
 
 			print $extrafields->showSeparator($tmpkeyextra, $object);
 
@@ -149,11 +149,11 @@ if (empty($reshook) && is_array($extrafields->attributes[$object->table_element]
 			$isdraft = ((isset($object->statut) && $object->statut == 0) || (isset($object->status) && $object->status == 0));
 			if (($isdraft || !empty($extrafields->attributes[$object->table_element]['alwayseditable'][$tmpkeyextra]))
 				&& $permok && $enabled != 5 && ($action != 'edit_extras' || GETPOST('attribute') != $tmpkeyextra)
-			    && empty($extrafields->attributes[$object->table_element]['computed'][$tmpkeyextra]))
+				&& empty($extrafields->attributes[$object->table_element]['computed'][$tmpkeyextra]))
 			{
-			    $fieldid = 'id';
-			    if ($object->table_element == 'societe') $fieldid = 'socid';
-			    print '<td class="right"><a class="reposition editfielda" href="'.$_SERVER['PHP_SELF'].'?'.$fieldid.'='.$object->id.'&action=edit_extras&attribute='.$tmpkeyextra.'&ignorecollapsesetup=1">'.img_edit().'</a></td>';
+				$fieldid = 'id';
+				if ($object->table_element == 'societe') $fieldid = 'socid';
+				print '<td class="right"><a class="reposition editfielda" href="'.$_SERVER['PHP_SELF'].'?'.$fieldid.'='.$object->id.'&action=edit_extras&attribute='.$tmpkeyextra.'&ignorecollapsesetup=1">'.img_edit().'</a></td>';
 			}
 			print '</tr></table>';
 			print '</td>';
@@ -178,9 +178,9 @@ if (empty($reshook) && is_array($extrafields->attributes[$object->table_element]
 			//TODO Improve element and rights detection
 			if ($action == 'edit_extras' && $permok && GETPOST('attribute', 'restricthtml') == $tmpkeyextra)
 			{
-			    $fieldid = 'id';
-			    if ($object->table_element == 'societe') $fieldid = 'socid';
-			    print '<form enctype="multipart/form-data" action="'.$_SERVER["PHP_SELF"].'" method="post" name="formextra">';
+				$fieldid = 'id';
+				if ($object->table_element == 'societe') $fieldid = 'socid';
+				print '<form enctype="multipart/form-data" action="'.$_SERVER["PHP_SELF"].'" method="post" name="formextra">';
 				print '<input type="hidden" name="action" value="update_extras">';
 				print '<input type="hidden" name="attribute" value="'.$tmpkeyextra.'">';
 				print '<input type="hidden" name="token" value="'.newToken().'">';
diff --git a/htdocs/core/tpl/filemanager.tpl.php b/htdocs/core/tpl/filemanager.tpl.php
index 43ddd86fb99..a9098d60211 100644
--- a/htdocs/core/tpl/filemanager.tpl.php
+++ b/htdocs/core/tpl/filemanager.tpl.php
@@ -75,12 +75,12 @@ print '<div class="inline-block toolbarbutton centpercent">';
 if ($permtoadd)
 {
 	print '<a href="'.DOL_URL_ROOT.'/ecm/dir_add_card.php?action=create&module='.urlencode($module).($websitekey ? '&website='.$websitekey : '').($pageid ? '&pageid='.$pageid : '').'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?file_manager=1&website='.$websitekey.'&pageid='.$pageid).'" class="inline-block valignmiddle toolbarbutton paddingtop" title="'.dol_escape_htmltag($langs->trans('ECMAddSection')).'">';
-    print '<img class="toolbarbutton" border="0" src="'.DOL_URL_ROOT.'/theme/common/folder-new.png">';
-    print '</a>';
+	print '<img class="toolbarbutton" border="0" src="'.DOL_URL_ROOT.'/theme/common/folder-new.png">';
+	print '</a>';
 } else {
-    print '<a href="#" class="inline-block valignmiddle toolbarbutton paddingtop" title="'.$langs->trans("NotAllowed").'">';
-    print '<img class="toolbarbutton disabled" border="0" src="'.DOL_URL_ROOT.'/theme/common/folder-new.png">';
-    print '</a>';
+	print '<a href="#" class="inline-block valignmiddle toolbarbutton paddingtop" title="'.$langs->trans("NotAllowed").'">';
+	print '<img class="toolbarbutton disabled" border="0" src="'.DOL_URL_ROOT.'/theme/common/folder-new.png">';
+	print '</a>';
 }
 if ($module == 'ecm')
 {
@@ -112,8 +112,8 @@ if ((!empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABLE
 	$sectiondir = GETPOST('file', 'alpha') ?GETPOST('file', 'alpha') : GETPOST('section_dir', 'alpha');
 	print '<!-- Start form to attach new file in filemanager.tpl.php sectionid='.$section.' sectiondir='.$sectiondir.' -->'."\n";
 	include_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
-    $formfile = new FormFile($db);
-    $formfile->form_attach_new_file($_SERVER["PHP_SELF"], 'none', 0, ($section ? $section : -1), $permtoupload, 48, null, '', 0, '', 0, $nameforformuserfile, '', $sectiondir);
+	$formfile = new FormFile($db);
+	$formfile->form_attach_new_file($_SERVER["PHP_SELF"], 'none', 0, ($section ? $section : -1), $permtoupload, 48, null, '', 0, '', 0, $nameforformuserfile, '', $sectiondir);
 } else print '&nbsp;';
 
 print '</div>';
@@ -133,7 +133,7 @@ print '</div>';
 // Ask confirmation of deletion of directory
 if ($action == 'delete_section')
 {
-    print $form->formconfirm($_SERVER["PHP_SELF"].'?section='.$section, $langs->trans('DeleteSection'), $langs->trans('ConfirmDeleteSection', $ecmdir->label), 'confirm_deletesection', '', '', 1);
+	print $form->formconfirm($_SERVER["PHP_SELF"].'?section='.$section, $langs->trans('DeleteSection'), $langs->trans('ConfirmDeleteSection', $ecmdir->label), 'confirm_deletesection', '', '', 1);
 }
 // End confirm
 
@@ -146,54 +146,54 @@ if (empty($action) || $action == 'editfile' || $action == 'file_manager' || preg
 
 	print '<!-- Title for manual directories -->'."\n";
 	print '<tr class="liste_titre">'."\n";
-    print '<th class="liste_titre left">';
-    print '&nbsp;'.$langs->trans("ECMSections");
+	print '<th class="liste_titre left">';
+	print '&nbsp;'.$langs->trans("ECMSections");
 	print '</th></tr>';
 
-    $showonrightsize = '';
+	$showonrightsize = '';
 
 	// Manual section
 	$htmltooltip = $langs->trans("ECMAreaDesc2");
 
-    if (!empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABLE_JS))
-    {
-    	// Show the link to "Root"
-    	if ($showroot)
-    	{
-    		print '<tr><td><div style="padding-left: 5px; padding-right: 5px;"><a href="'.$_SERVER["PHP_SELF"].'?file_manager=1&pageid='.$pageid.'">';
-    		if ($module == 'medias') print $langs->trans("RootOfMedias");
-    		else print $langs->trans("Root");
-    		print '</a></div></td></tr>';
-    	}
+	if (!empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABLE_JS))
+	{
+		// Show the link to "Root"
+		if ($showroot)
+		{
+			print '<tr><td><div style="padding-left: 5px; padding-right: 5px;"><a href="'.$_SERVER["PHP_SELF"].'?file_manager=1&pageid='.$pageid.'">';
+			if ($module == 'medias') print $langs->trans("RootOfMedias");
+			else print $langs->trans("Root");
+			print '</a></div></td></tr>';
+		}
 
-    	print '<tr><td>';
+		print '<tr><td>';
 
-    	// Show filemanager tree (will be filled by a call of ajax /ecm/tpl/enablefiletreeajax.tpl.php, later, that executes ajaxdirtree.php)
-	    print '<div id="filetree" class="ecmfiletree"></div>';
+		// Show filemanager tree (will be filled by a call of ajax /ecm/tpl/enablefiletreeajax.tpl.php, later, that executes ajaxdirtree.php)
+		print '<div id="filetree" class="ecmfiletree"></div>';
 
-	    if ($action == 'deletefile') print $form->formconfirm('eeeee', $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile'), 'confirm_deletefile', '', '', 'deletefile');
+		if ($action == 'deletefile') print $form->formconfirm('eeeee', $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile'), 'confirm_deletefile', '', '', 'deletefile');
 
-	    print '</td></tr>';
-    } else { // Show filtree when ajax is disabled (rare)
-        print '<tr><td style="padding-left: 20px">';
+		print '</td></tr>';
+	} else { // Show filtree when ajax is disabled (rare)
+		print '<tr><td style="padding-left: 20px">';
 
-        $_POST['modulepart'] = $module;
-        $_POST['openeddir'] = GETPOST('openeddir');
-        $_POST['dir'] = empty($_POST['dir']) ? '/' : $_POST['dir'];
+		$_POST['modulepart'] = $module;
+		$_POST['openeddir'] = GETPOST('openeddir');
+		$_POST['dir'] = empty($_POST['dir']) ? '/' : $_POST['dir'];
 
-        // Show filemanager tree (will be filled by direct include of ajaxdirtree.php in mode noajax, this will return all dir - all levels - to show)
-        print '<div id="filetree" class="ecmfiletree">';
+		// Show filemanager tree (will be filled by direct include of ajaxdirtree.php in mode noajax, this will return all dir - all levels - to show)
+		print '<div id="filetree" class="ecmfiletree">';
 
-        // Variables that may be defined:
-        // $_GET['modulepart'], $_GET['openeddir'], $_GET['sortfield'], $_GET['sortorder']
-        // $_POST['dir']
-        $mode = 'noajax';
-        if (empty($url)) $url = DOL_URL_ROOT.'/ecm/index.php';
-        include DOL_DOCUMENT_ROOT.'/core/ajax/ajaxdirtree.php';
+		// Variables that may be defined:
+		// $_GET['modulepart'], $_GET['openeddir'], $_GET['sortfield'], $_GET['sortorder']
+		// $_POST['dir']
+		$mode = 'noajax';
+		if (empty($url)) $url = DOL_URL_ROOT.'/ecm/index.php';
+		include DOL_DOCUMENT_ROOT.'/core/ajax/ajaxdirtree.php';
 
-    	print '</div>';
-    	print '</td></tr>';
-    }
+		print '</div>';
+		print '</td></tr>';
+	}
 
 
 	print "</table>";
diff --git a/htdocs/core/tpl/login.tpl.php b/htdocs/core/tpl/login.tpl.php
index 07229bcfed8..bf0e4f57743 100644
--- a/htdocs/core/tpl/login.tpl.php
+++ b/htdocs/core/tpl/login.tpl.php
@@ -24,8 +24,8 @@ if (!defined('NOBROWSERNOTIF')) define('NOBROWSERNOTIF', 1);
 
 // Protection to avoid direct call of template
 if (empty($conf) || !is_object($conf)) {
-    print "Error, template page can't be called as URL";
-    exit;
+	print "Error, template page can't be called as URL";
+	exit;
 }
 
 
@@ -59,7 +59,7 @@ if (!empty($conf->global->MAIN_APPLICATION_TITLE)) {
 } else {
 	$titleofloginpage = $langs->trans('Login');
 }
-$titleofloginpage.= ' @ '.$titletruedolibarrversion; // $titletruedolibarrversion is defined by dol_loginfunction in security2.lib.php. We must keep the @, some tools use it to know it is login page and find true dolibarr version.
+$titleofloginpage .= ' @ '.$titletruedolibarrversion; // $titletruedolibarrversion is defined by dol_loginfunction in security2.lib.php. We must keep the @, some tools use it to know it is login page and find true dolibarr version.
 
 $disablenofollow = 1;
 if (!preg_match('/'.constant('DOL_APPLICATION_TITLE').'/', $title)) $disablenofollow = 0;
@@ -295,18 +295,18 @@ if (!empty($_SESSION['dol_loginmesg']))
 
 // Add commit strip
 if (!empty($conf->global->MAIN_EASTER_EGG_COMMITSTRIP)) {
-    include_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
+	include_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
 	if (substr($langs->defaultlang, 0, 2) == 'fr') {
-		$resgetcommitstrip = getURLContent("http://www.commitstrip.com/fr/feed/");
+		$resgetcommitstrip = getURLContent("https://www.commitstrip.com/fr/feed/");
 	} else {
-		$resgetcommitstrip = getURLContent("http://www.commitstrip.com/en/feed/");
+		$resgetcommitstrip = getURLContent("https://www.commitstrip.com/en/feed/");
+	}
+	if ($resgetcommitstrip && $resgetcommitstrip['http_code'] == '200')
+	{
+		$xml = simplexml_load_string($resgetcommitstrip['content']);
+		$little = $xml->channel->item[0]->children('content', true);
+		print preg_replace('/width="650" height="658"/', '', $little->encoded);
 	}
-    if ($resgetcommitstrip && $resgetcommitstrip['http_code'] == '200')
-    {
-        $xml = simplexml_load_string($resgetcommitstrip['content']);
-        $little = $xml->channel->item[0]->children('content', true);
-        print preg_replace('/width="650" height="658"/', '', $little->encoded);
-    }
 }
 
 ?>
diff --git a/htdocs/core/tpl/massactions_pre.tpl.php b/htdocs/core/tpl/massactions_pre.tpl.php
index d81a79d7b80..21070467f57 100644
--- a/htdocs/core/tpl/massactions_pre.tpl.php
+++ b/htdocs/core/tpl/massactions_pre.tpl.php
@@ -160,7 +160,7 @@ if ($massaction == 'presend')
 		print $formmail->get_form();
 	}
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 }
 // Allow Pre-Mass-Action hook (eg for confirmation dialog)
 $parameters = array(
@@ -170,7 +170,7 @@ $parameters = array(
 
 $reshook = $hookmanager->executeHooks('doPreMassActions', $parameters, $object, $action);
 if ($reshook < 0) {
-    setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 } else {
-    print $hookmanager->resPrint;
+	print $hookmanager->resPrint;
 }
diff --git a/htdocs/core/tpl/objectline_edit.tpl.php b/htdocs/core/tpl/objectline_edit.tpl.php
index 3798852662e..6b3639d65eb 100644
--- a/htdocs/core/tpl/objectline_edit.tpl.php
+++ b/htdocs/core/tpl/objectline_edit.tpl.php
@@ -105,8 +105,8 @@ $coldisplay++;
 	if (is_object($hookmanager))
 	{
 		$fk_parent_line = (GETPOST('fk_parent_line') ? GETPOST('fk_parent_line') : $line->fk_parent_line);
-	    $parameters = array('line'=>$line, 'fk_parent_line'=>$fk_parent_line, 'var'=>$var, 'dateSelector'=>$dateSelector, 'seller'=>$seller, 'buyer'=>$buyer);
-	    $reshook = $hookmanager->executeHooks('formEditProductOptions', $parameters, $this, $action);
+		$parameters = array('line'=>$line, 'fk_parent_line'=>$fk_parent_line, 'var'=>$var, 'dateSelector'=>$dateSelector, 'seller'=>$seller, 'buyer'=>$buyer);
+		$reshook = $hookmanager->executeHooks('formEditProductOptions', $parameters, $this, $action);
 	}
 
 	// Do not allow editing during a situation cycle
@@ -142,7 +142,7 @@ $coldisplay++;
 	<?php
 	if ($object->element == 'supplier_proposal' || $object->element == 'order_supplier' || $object->element == 'invoice_supplier')	// We must have same test in printObjectLines
 	{
-	    $coldisplay++;
+		$coldisplay++;
 		?>
 		<td class="right"><input id="fourn_ref" name="fourn_ref" class="flat minwidth50 maxwidth150" value="<?php echo ($line->ref_supplier ? $line->ref_supplier : $line->ref_fourn); ?>"></td>
 		<?php
@@ -161,7 +161,7 @@ $coldisplay++;
 	print '></td>';
 
 	if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) {
-	    $coldisplay++;
+		$coldisplay++;
 		print '<td class="right"><input rel="'.$object->multicurrency_tx.'" type="text" class="flat right" size="5" id="multicurrency_subprice" name="multicurrency_subprice" value="'.price($line->multicurrency_subprice).'" /></td>';
 	}
 
@@ -191,7 +191,7 @@ $coldisplay++;
 	<?php
 	if ($conf->global->PRODUCT_USE_UNITS)
 	{
-	    $coldisplay++;
+		$coldisplay++;
 		print '<td class="left">';
 		print $form->selectUnits($line->fk_unit, "units");
 		print '</td>';
@@ -217,10 +217,10 @@ $coldisplay++;
 	}
 	if (!empty($usemargins))
 	{
-        if (!empty($user->rights->margins->creer))
-        {
-            $coldisplay++;
-        	?>
+		if (!empty($user->rights->margins->creer))
+		{
+			$coldisplay++;
+			?>
         <td class="margininfos right">
 			<!-- For predef product -->
 			<?php if (!empty($conf->product->enabled) || !empty($conf->service->enabled)) { ?>
@@ -231,7 +231,7 @@ $coldisplay++;
 		</td>
 		<?php }
 
-        if ($user->rights->margins->creer) {
+		if ($user->rights->margins->creer) {
 			if (!empty($conf->global->DISPLAY_MARGIN_RATES))
 			{
 				$margin_rate = (isset($_POST["np_marginRate"]) ?GETPOST("np_marginRate", "alpha", 2) : (($line->pa_ht == 0) ? '' : price($line->marge_tx)));
@@ -307,20 +307,20 @@ if (!empty($extrafields))
 <script>
 
 <?php
-if (! empty($usemargins) && $user->rights->margins->creer)
+if (!empty($usemargins) && $user->rights->margins->creer)
 {
 	?>
 	/* Some js test when we click on button "Add" */
 	jQuery(document).ready(function() {
 	<?php
-	if (! empty($conf->global->DISPLAY_MARGIN_RATES)) {
+	if (!empty($conf->global->DISPLAY_MARGIN_RATES)) {
 		?>
 			$("input[name='np_marginRate']:first").blur(function(e) {
 				return checkFreeLine(e, "np_marginRate");
 			});
 		<?php
 	}
-	if (! empty($conf->global->DISPLAY_MARK_RATES)) {
+	if (!empty($conf->global->DISPLAY_MARK_RATES)) {
 		?>
 			$("input[name='np_markRate']:first").blur(function(e) {
 				return checkFreeLine(e, "np_markRate");
@@ -404,9 +404,9 @@ jQuery(document).ready(function()
 	});
 
     <?php
-    if (!empty($conf->margin->enabled))
-    {
-        ?>
+	if (!empty($conf->margin->enabled))
+	{
+		?>
 		/* Add rule to clear margin when we change some data, so when we change sell or buy price, margin will be recalculated after submitting form */
 		jQuery("#tva_tx").click(function() {						/* somtimes field is a text, sometimes a combo */
 			jQuery("input[name='np_marginRate']:first").val('');
@@ -470,8 +470,8 @@ jQuery(document).ready(function()
 		}
 		}, 'json');
         <?php
-    }
-    ?>
+	}
+	?>
 });
 
 </script>
diff --git a/htdocs/core/tpl/objectline_view.tpl.php b/htdocs/core/tpl/objectline_view.tpl.php
index 99e727c48d5..46baa6a0b83 100644
--- a/htdocs/core/tpl/objectline_view.tpl.php
+++ b/htdocs/core/tpl/objectline_view.tpl.php
@@ -78,7 +78,7 @@ $coldisplay = 0;
 	<td class="linecoldescription minwidth300imp"><?php $coldisplay++; ?><div id="line_<?php print $line->id; ?>"></div>
 <?php
 if (($line->info_bits & 2) == 2) {
-    print '<a href="'.DOL_URL_ROOT.'/comm/remx.php?id='.$this->socid.'">';
+	print '<a href="'.DOL_URL_ROOT.'/comm/remx.php?id='.$this->socid.'">';
 	$txt = '';
 	print img_object($langs->trans("ShowReduc"), 'reduc').' ';
 	if ($line->description == '(DEPOSIT)') $txt = $langs->trans("Deposit");
@@ -101,7 +101,7 @@ if (($line->info_bits & 2) == 2) {
 			print ($txt ? ' - ' : '').$langs->transnoentities("DiscountFromDeposit", $discount->getNomUrl(0));
 			// Add date of deposit
 			if (!empty($conf->global->INVOICE_ADD_DEPOSIT_DATE))
-			    print ' ('.dol_print_date($discount->datec).')';
+				print ' ('.dol_print_date($discount->datec).')';
 		} elseif ($line->description == '(EXCESS RECEIVED)' && $objp->fk_remise_except > 0)
 		{
 			$discount = new DiscountAbsolute($this->db);
@@ -119,7 +119,7 @@ if (($line->info_bits & 2) == 2) {
 } else {
 	$format = $conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE ? 'dayhour' : 'day';
 
-    if ($line->fk_product > 0)
+	if ($line->fk_product > 0)
 	{
 		print $form->textwithtooltip($text, $description, 3, '', '', $i, 0, (!empty($line->fk_parent_line) ?img_picto('', 'rightarrow') : ''));
 	} else {
@@ -162,7 +162,7 @@ if (($line->info_bits & 2) == 2) {
 
 if ($user->rights->fournisseur->lire && $line->fk_fournprice > 0)
 {
-    require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
 	$productfourn = new ProductFournisseur($this->db);
 	$productfourn->fetch_product_fournisseur_price($line->fk_fournprice);
 	print '<div class="clearboth"></div>';
@@ -246,7 +246,7 @@ if (!empty($line->remise_percent) && $line->special_code != 3) {
 // Fields for situation invoices
 if ($this->situation_cycle_ref)
 {
-    include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
+	include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
 	$coldisplay++;
 	print '<td class="linecolcycleref nowrap right">'.$line->situation_percent.'%</td>';
 	$coldisplay++;
@@ -263,7 +263,7 @@ if ($usemargins && !empty($conf->margin->enabled) && empty($user->socid))
 	if (!empty($conf->global->DISPLAY_MARGIN_RATES) && $user->rights->margins->liretous) { ?>
 		<td class="linecolmargin2 nowrap margininfos right"><?php $coldisplay++; ?><?php print (($line->pa_ht == 0) ? 'n/a' : price(price2num($line->marge_tx, 'MT')).'%'); ?></td>
 	<?php }
-    if (!empty($conf->global->DISPLAY_MARK_RATES) && $user->rights->margins->liretous) {?>
+	if (!empty($conf->global->DISPLAY_MARK_RATES) && $user->rights->margins->liretous) {?>
   	  <td class="linecolmargin2 nowrap margininfos right"><?php $coldisplay++; ?><?php print price(price2num($line->marque_tx, 'MT')).'%'; ?></td>
     <?php }
 }
@@ -300,7 +300,7 @@ if ($line->special_code == 3) { ?>
 	print price($sign * $line->total_ht);
 	if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
 	{
-	    print '</span>';
+		print '</span>';
 	}
 	print '</td>';
 	if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) {
@@ -346,7 +346,7 @@ if ($this->statut == 0 && ($object_rights->creer) && $action != 'selectlines') {
 			</a>
 		<?php }
 		print '</td>';
-    } else {
+	} else {
 		print '<td '.(($conf->browser->layout != 'phone' && empty($disablemove)) ? ' class="linecolmove tdlineupdown center"' : ' class="linecolmove center"').'></td>';
 		$coldisplay++;
 	}
diff --git a/htdocs/core/tpl/onlinepaymentlinks.tpl.php b/htdocs/core/tpl/onlinepaymentlinks.tpl.php
index dcf8e712709..959bf7fd6ad 100644
--- a/htdocs/core/tpl/onlinepaymentlinks.tpl.php
+++ b/htdocs/core/tpl/onlinepaymentlinks.tpl.php
@@ -32,126 +32,126 @@ print img_picto('', 'globe').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnFr
 print '<strong class="wordbreak">'.getOnlinePaymentUrl(1, 'free')."</strong><br><br>\n";
 if (!empty($conf->commande->enabled))
 {
-    print '<div id="order"></div>';
-    print img_picto('', 'globe').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnOrder", $servicename).':<br>';
+	print '<div id="order"></div>';
+	print img_picto('', 'globe').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnOrder", $servicename).':<br>';
 	print '<strong class="wordbreak">'.getOnlinePaymentUrl(1, 'order')."</strong><br>\n";
 	if (!empty($conf->global->PAYMENT_SECURITY_TOKEN) && !empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE))
 	{
-	    $langs->load("orders");
-	    print '<form action="'.$_SERVER["PHP_SELF"].'#order" method="POST">';
-	    print '<input type="hidden" name="token" value="'.newToken().'">';
+		$langs->load("orders");
+		print '<form action="'.$_SERVER["PHP_SELF"].'#order" method="POST">';
+		print '<input type="hidden" name="token" value="'.newToken().'">';
 
-	    print $langs->trans("EnterRefToBuildUrl", $langs->transnoentitiesnoconv("Order")).': ';
-        print '<input type="text class="flat" id="generate_order_ref" name="generate_order_ref" value="'.GETPOST('generate_order_ref', 'alpha').'" size="10">';
-        print '<input type="submit" class="none button" value="'.$langs->trans("GetSecuredUrl").'">';
-        if (GETPOST('generate_order_ref', 'alpha'))
-        {
-            print '<br> -> <strong class="wordbreak">';
-            $url = getOnlinePaymentUrl(0, 'order', GETPOST('generate_order_ref', 'alpha'));
-            print $url;
-            print "</strong><br>\n";
-        }
-        print '</form>';
+		print $langs->trans("EnterRefToBuildUrl", $langs->transnoentitiesnoconv("Order")).': ';
+		print '<input type="text class="flat" id="generate_order_ref" name="generate_order_ref" value="'.GETPOST('generate_order_ref', 'alpha').'" size="10">';
+		print '<input type="submit" class="none button" value="'.$langs->trans("GetSecuredUrl").'">';
+		if (GETPOST('generate_order_ref', 'alpha'))
+		{
+			print '<br> -> <strong class="wordbreak">';
+			$url = getOnlinePaymentUrl(0, 'order', GETPOST('generate_order_ref', 'alpha'));
+			print $url;
+			print "</strong><br>\n";
+		}
+		print '</form>';
 	}
 	print '<br>';
 }
 if (!empty($conf->facture->enabled))
 {
-    print '<div id="invoice"></div>';
-    print img_picto('', 'globe').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnInvoice", $servicename).':<br>';
+	print '<div id="invoice"></div>';
+	print img_picto('', 'globe').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnInvoice", $servicename).':<br>';
 	print '<strong class="wordbreak">'.getOnlinePaymentUrl(1, 'invoice')."</strong><br>\n";
 	if (!empty($conf->global->PAYMENT_SECURITY_TOKEN) && !empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE))
 	{
-	    $langs->load("bills");
-	    print '<form action="'.$_SERVER["PHP_SELF"].'#invoice" method="POST">';
-	    print '<input type="hidden" name="token" value="'.newToken().'">';
+		$langs->load("bills");
+		print '<form action="'.$_SERVER["PHP_SELF"].'#invoice" method="POST">';
+		print '<input type="hidden" name="token" value="'.newToken().'">';
 
-	    print $langs->trans("EnterRefToBuildUrl", $langs->transnoentitiesnoconv("Invoice")).': ';
-        print '<input type="text class="flat" id="generate_invoice_ref" name="generate_invoice_ref" value="'.GETPOST('generate_invoice_ref', 'alpha').'" size="10">';
-        print '<input type="submit" class="none button" value="'.$langs->trans("GetSecuredUrl").'">';
-        if (GETPOST('generate_invoice_ref', 'alpha'))
-        {
-            print '<br> -> <strong class="wordbreak">';
-            $url = getOnlinePaymentUrl(0, 'invoice', GETPOST('generate_invoice_ref', 'alpha'));
-            print $url;
-            print "</strong><br>\n";
-        }
-        print '</form>';
+		print $langs->trans("EnterRefToBuildUrl", $langs->transnoentitiesnoconv("Invoice")).': ';
+		print '<input type="text class="flat" id="generate_invoice_ref" name="generate_invoice_ref" value="'.GETPOST('generate_invoice_ref', 'alpha').'" size="10">';
+		print '<input type="submit" class="none button" value="'.$langs->trans("GetSecuredUrl").'">';
+		if (GETPOST('generate_invoice_ref', 'alpha'))
+		{
+			print '<br> -> <strong class="wordbreak">';
+			$url = getOnlinePaymentUrl(0, 'invoice', GETPOST('generate_invoice_ref', 'alpha'));
+			print $url;
+			print "</strong><br>\n";
+		}
+		print '</form>';
 	}
 	print '<br>';
 }
 if (!empty($conf->contrat->enabled))
 {
-    print '<div id="contractline"></div>';
-    print img_picto('', 'globe').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnContractLine", $servicename).':<br>';
+	print '<div id="contractline"></div>';
+	print img_picto('', 'globe').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnContractLine", $servicename).':<br>';
 	print '<strong class="wordbreak">'.getOnlinePaymentUrl(1, 'contractline')."</strong><br>\n";
 	if (!empty($conf->global->PAYMENT_SECURITY_TOKEN) && !empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE))
 	{
-	    $langs->load("contracts");
-	    print '<form action="'.$_SERVER["PHP_SELF"].'#contractline" method="POST">';
-	    print '<input type="hidden" name="token" value="'.newToken().'">';
+		$langs->load("contracts");
+		print '<form action="'.$_SERVER["PHP_SELF"].'#contractline" method="POST">';
+		print '<input type="hidden" name="token" value="'.newToken().'">';
 
-	    print $langs->trans("EnterRefToBuildUrl", $langs->transnoentitiesnoconv("ContractLine")).': ';
-        print '<input type="text class="flat" id="generate_contract_ref" name="generate_contract_ref" value="'.GETPOST('generate_contract_ref', 'alpha').'" size="10">';
-        print '<input type="submit" class="none button" value="'.$langs->trans("GetSecuredUrl").'">';
-        if (GETPOST('generate_contract_ref'))
-        {
-            print '<br> -> <strong class="wordbreak">';
-            $url = getOnlinePaymentUrl(0, 'contractline', GETPOST('generate_contract_ref', 'alpha'));
-            print $url;
-            print "</strong><br>\n";
-        }
-        print '</form>';
+		print $langs->trans("EnterRefToBuildUrl", $langs->transnoentitiesnoconv("ContractLine")).': ';
+		print '<input type="text class="flat" id="generate_contract_ref" name="generate_contract_ref" value="'.GETPOST('generate_contract_ref', 'alpha').'" size="10">';
+		print '<input type="submit" class="none button" value="'.$langs->trans("GetSecuredUrl").'">';
+		if (GETPOST('generate_contract_ref'))
+		{
+			print '<br> -> <strong class="wordbreak">';
+			$url = getOnlinePaymentUrl(0, 'contractline', GETPOST('generate_contract_ref', 'alpha'));
+			print $url;
+			print "</strong><br>\n";
+		}
+		print '</form>';
 	}
 	print '<br>';
 }
 if (!empty($conf->adherent->enabled))
 {
-    print '<div id="membersubscription"></div>';
-    print img_picto('', 'globe').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnMemberSubscription", $servicename).':<br>';
+	print '<div id="membersubscription"></div>';
+	print img_picto('', 'globe').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnMemberSubscription", $servicename).':<br>';
 	print '<strong class="wordbreak">'.getOnlinePaymentUrl(1, 'membersubscription')."</strong><br>\n";
 	if (!empty($conf->global->PAYMENT_SECURITY_TOKEN) && !empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE))
 	{
-	    $langs->load("members");
-	    print '<form action="'.$_SERVER["PHP_SELF"].'#membersubscription" method="POST">';
-	    print '<input type="hidden" name="token" value="'.newToken().'">';
+		$langs->load("members");
+		print '<form action="'.$_SERVER["PHP_SELF"].'#membersubscription" method="POST">';
+		print '<input type="hidden" name="token" value="'.newToken().'">';
 
-	    print $langs->trans("EnterRefToBuildUrl", $langs->transnoentitiesnoconv("Member")).': ';
-        print '<input type="text class="flat" id="generate_member_ref" name="generate_member_ref" value="'.GETPOST('generate_member_ref', 'alpha').'" size="10">';
-        print '<input type="submit" class="none reposition button" value="'.$langs->trans("GetSecuredUrl").'">';
-        if (GETPOST('generate_member_ref'))
-        {
-            print '<br> -> <strong class="wordbreak">';
-            $url = getOnlinePaymentUrl(0, 'membersubscription', GETPOST('generate_member_ref', 'alpha'));
-            print $url;
-            print "</strong><br>\n";
-        }
-        print '</form>';
+		print $langs->trans("EnterRefToBuildUrl", $langs->transnoentitiesnoconv("Member")).': ';
+		print '<input type="text class="flat" id="generate_member_ref" name="generate_member_ref" value="'.GETPOST('generate_member_ref', 'alpha').'" size="10">';
+		print '<input type="submit" class="none reposition button" value="'.$langs->trans("GetSecuredUrl").'">';
+		if (GETPOST('generate_member_ref'))
+		{
+			print '<br> -> <strong class="wordbreak">';
+			$url = getOnlinePaymentUrl(0, 'membersubscription', GETPOST('generate_member_ref', 'alpha'));
+			print $url;
+			print "</strong><br>\n";
+		}
+		print '</form>';
 	}
 	print '<br>';
 }
 if (!empty($conf->don->enabled))
 {
-    print '<div id="donation"></div>';
+	print '<div id="donation"></div>';
 	print img_picto('', 'globe').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnDonation", $servicename).':<br>';
 	print '<strong class="wordbreak">'.getOnlinePaymentUrl(1, 'donation')."</strong><br>\n";
 	if (!empty($conf->global->PAYMENT_SECURITY_TOKEN) && !empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE))
 	{
-	    $langs->load("members");
-	    print '<form action="'.$_SERVER["PHP_SELF"].'#donation" method="POST">';
-	    print '<input type="hidden" name="token" value="'.newToken().'">';
+		$langs->load("members");
+		print '<form action="'.$_SERVER["PHP_SELF"].'#donation" method="POST">';
+		print '<input type="hidden" name="token" value="'.newToken().'">';
 
-	    print $langs->trans("EnterRefToBuildUrl", $langs->transnoentitiesnoconv("Don")).': ';
-        print '<input type="text class="flat" id="generate_donation_ref" name="generate_donation_ref" value="'.GETPOST('generate_donation_ref', 'alpha').'" size="10">';
-        print '<input type="submit" class="none reposition button" value="'.$langs->trans("GetSecuredUrl").'">';
-        if (GETPOST('generate_donation_ref'))
-        {
-            print '<br> -> <strong class="wordbreak">';
-            $url = getOnlinePaymentUrl(0, 'donation', GETPOST('generate_donation_ref', 'alpha'));
-            print $url;
-            print "</strong><br>\n";
-        }
-        print '</form>';
+		print $langs->trans("EnterRefToBuildUrl", $langs->transnoentitiesnoconv("Don")).': ';
+		print '<input type="text class="flat" id="generate_donation_ref" name="generate_donation_ref" value="'.GETPOST('generate_donation_ref', 'alpha').'" size="10">';
+		print '<input type="submit" class="none reposition button" value="'.$langs->trans("GetSecuredUrl").'">';
+		if (GETPOST('generate_donation_ref'))
+		{
+			print '<br> -> <strong class="wordbreak">';
+			$url = getOnlinePaymentUrl(0, 'donation', GETPOST('generate_donation_ref', 'alpha'));
+			print $url;
+			print "</strong><br>\n";
+		}
+		print '</form>';
 	}
 	print '<br>';
 }
diff --git a/htdocs/core/tpl/resource_view.tpl.php b/htdocs/core/tpl/resource_view.tpl.php
index 9bc8447a796..1df05e6e0a1 100644
--- a/htdocs/core/tpl/resource_view.tpl.php
+++ b/htdocs/core/tpl/resource_view.tpl.php
@@ -38,9 +38,9 @@ if ((array) $linked_resources && count($linked_resources) > 0)
 
 		if ($mode == 'edit' && $linked_resource['rowid'] == GETPOST('lineid'))
 		{
-		    print '<div class="tagtr oddeven">';
-		    print '<input type="hidden" name="lineid" value="'.$linked_resource['rowid'].'" />';
-		    print '<input type="hidden" name="element" value="'.$element.'" />';
+			print '<div class="tagtr oddeven">';
+			print '<input type="hidden" name="lineid" value="'.$linked_resource['rowid'].'" />';
+			print '<input type="hidden" name="element" value="'.$element.'" />';
 			print '<input type="hidden" name="element_id" value="'.$element_id.'" />';
 
 			print '<div class="tagtd">'.$object_resource->getNomUrl(1).'</div>';
diff --git a/htdocs/core/triggers/dolibarrtriggers.class.php b/htdocs/core/triggers/dolibarrtriggers.class.php
index a06b4f89528..4db110c20da 100644
--- a/htdocs/core/triggers/dolibarrtriggers.class.php
+++ b/htdocs/core/triggers/dolibarrtriggers.class.php
@@ -90,8 +90,8 @@ abstract class DolibarrTriggers
 	 *
 	 * @param DoliDB $db Database handler
 	 */
-    public function __construct(DoliDB $db)
-    {
+	public function __construct(DoliDB $db)
+	{
 
 		$this->db = $db;
 
@@ -143,16 +143,16 @@ abstract class DolibarrTriggers
 		}
 	}
 
-    /**
-     *  Function called when a Dolibarrr business event is done.
-     *  All functions "runTrigger" are triggered if file is inside directory htdocs/core/triggers or htdocs/module/code/triggers (and declared)
-     *
-     *  @param string       $action     Event action code
-     *  @param Object       $object     Object
-     *  @param User         $user       Object user
-     *  @param Translate    $langs      Object langs
-     *  @param conf         $conf       Object conf
-     *  @return int                     <0 if KO, 0 if no triggered ran, >0 if OK
-     */
-    public abstract function runTrigger($action, $object, User $user, Translate $langs, Conf $conf);
+	/**
+	 *  Function called when a Dolibarrr business event is done.
+	 *  All functions "runTrigger" are triggered if file is inside directory htdocs/core/triggers or htdocs/module/code/triggers (and declared)
+	 *
+	 *  @param string       $action     Event action code
+	 *  @param Object       $object     Object
+	 *  @param User         $user       Object user
+	 *  @param Translate    $langs      Object langs
+	 *  @param conf         $conf       Object conf
+	 *  @return int                     <0 if KO, 0 if no triggered ran, >0 if OK
+	 */
+	public abstract function runTrigger($action, $object, User $user, Translate $langs, Conf $conf);
 }
diff --git a/htdocs/core/triggers/interface_20_all_Logevents.class.php b/htdocs/core/triggers/interface_20_all_Logevents.class.php
index d5e31c36d28..dc1ef1ab4a2 100644
--- a/htdocs/core/triggers/interface_20_all_Logevents.class.php
+++ b/htdocs/core/triggers/interface_20_all_Logevents.class.php
@@ -31,22 +31,22 @@ require_once DOL_DOCUMENT_ROOT.'/core/triggers/dolibarrtriggers.class.php';
  */
 class InterfaceLogevents extends DolibarrTriggers
 {
-    /**
-     * Constructor
-     *
-     * @param DoliDB $db Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
+	/**
+	 * Constructor
+	 *
+	 * @param DoliDB $db Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
 
-        $this->name = preg_replace('/^Interface/i', '', get_class($this));
-        $this->family = "core";
-        $this->description = "Triggers of this module allows to add security event records inside Dolibarr.";
-        // 'development', 'experimental', 'dolibarr' or version
-        $this->version = self::VERSION_DOLIBARR;
-        $this->picto = 'technic';
-    }
+		$this->name = preg_replace('/^Interface/i', '', get_class($this));
+		$this->family = "core";
+		$this->description = "Triggers of this module allows to add security event records inside Dolibarr.";
+		// 'development', 'experimental', 'dolibarr' or version
+		$this->version = self::VERSION_DOLIBARR;
+		$this->picto = 'technic';
+	}
 
 	/**
 	 * Function called when a Dolibarrr security audit event is done.
@@ -60,65 +60,65 @@ class InterfaceLogevents extends DolibarrTriggers
 	 * @return int         				<0 if KO, 0 if no triggered ran, >0 if OK
 	 */
 	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
-    {
-    	if (!empty($conf->global->MAIN_LOGEVENTS_DISABLE_ALL)) return 0; // Log events is disabled (hidden features)
+	{
+		if (!empty($conf->global->MAIN_LOGEVENTS_DISABLE_ALL)) return 0; // Log events is disabled (hidden features)
 
-    	$key = 'MAIN_LOGEVENTS_'.$action;
-    	//dol_syslog("xxxxxxxxxxx".$key);
-    	if (empty($conf->global->$key)) return 0; // Log events not enabled for this action
+		$key = 'MAIN_LOGEVENTS_'.$action;
+		//dol_syslog("xxxxxxxxxxx".$key);
+		if (empty($conf->global->$key)) return 0; // Log events not enabled for this action
 
-    	if (empty($conf->entity)) $conf->entity = $entity; // forcing of the entity if it's not defined (ex: in login form)
+		if (empty($conf->entity)) $conf->entity = $entity; // forcing of the entity if it's not defined (ex: in login form)
 
-        $date = dol_now();
+		$date = dol_now();
 
-        // Actions
-        if ($action == 'USER_LOGIN') {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+		// Actions
+		if ($action == 'USER_LOGIN') {
+			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 
-            $langs->load("users");
-            // Initialisation donnees (date,duree,texte,desc)
-            $text = "(UserLogged,".$object->login.")";
-            $text .= (empty($object->trigger_mesg) ? '' : ' - '.$object->trigger_mesg);
-            $desc = "(UserLogged,".$object->login.")";
-            $desc .= (empty($object->trigger_mesg) ? '' : ' - '.$object->trigger_mesg);
-        } elseif ($action == 'USER_LOGIN_FAILED') {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+			$langs->load("users");
+			// Initialisation donnees (date,duree,texte,desc)
+			$text = "(UserLogged,".$object->login.")";
+			$text .= (empty($object->trigger_mesg) ? '' : ' - '.$object->trigger_mesg);
+			$desc = "(UserLogged,".$object->login.")";
+			$desc .= (empty($object->trigger_mesg) ? '' : ' - '.$object->trigger_mesg);
+		} elseif ($action == 'USER_LOGIN_FAILED') {
+			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 
-            // Initialisation donnees (date,duree,texte,desc)
-            $text = $object->trigger_mesg; // Message direct
-            $desc = $object->trigger_mesg; // Message direct
-        } elseif ($action == 'USER_LOGOUT') {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+			// Initialisation donnees (date,duree,texte,desc)
+			$text = $object->trigger_mesg; // Message direct
+			$desc = $object->trigger_mesg; // Message direct
+		} elseif ($action == 'USER_LOGOUT') {
+			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 
-            $langs->load("users");
-            // Initialisation donnees (date,duree,texte,desc)
-            $text = "(UserLogoff,".$object->login.")";
-            $desc = "(UserLogoff,".$object->login.")";
-        } elseif ($action == 'USER_CREATE') {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-            $langs->load("users");
+			$langs->load("users");
+			// Initialisation donnees (date,duree,texte,desc)
+			$text = "(UserLogoff,".$object->login.")";
+			$desc = "(UserLogoff,".$object->login.")";
+		} elseif ($action == 'USER_CREATE') {
+			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+			$langs->load("users");
 
-            // Initialisation donnees (date,duree,texte,desc)
-            $text = $langs->transnoentities("NewUserCreated", $object->login);
-            $desc = $langs->transnoentities("NewUserCreated", $object->login);
+			// Initialisation donnees (date,duree,texte,desc)
+			$text = $langs->transnoentities("NewUserCreated", $object->login);
+			$desc = $langs->transnoentities("NewUserCreated", $object->login);
 		} elseif ($action == 'USER_MODIFY') {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-            $langs->load("users");
+			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+			$langs->load("users");
 
-            // Initialisation donnees (date,duree,texte,desc)
-            $text = $langs->transnoentities("EventUserModified", $object->login);
-            $desc = $langs->transnoentities("EventUserModified", $object->login);
-        } elseif ($action == 'USER_NEW_PASSWORD') {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-            $langs->load("users");
+			// Initialisation donnees (date,duree,texte,desc)
+			$text = $langs->transnoentities("EventUserModified", $object->login);
+			$desc = $langs->transnoentities("EventUserModified", $object->login);
+		} elseif ($action == 'USER_NEW_PASSWORD') {
+			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+			$langs->load("users");
 
-            // Initialisation donnees (date,duree,texte,desc)
-            $text = $langs->transnoentities("NewUserPassword", $object->login);
-            $desc = $langs->transnoentities("NewUserPassword", $object->login);
-        } elseif ($action == 'USER_ENABLEDISABLE') {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-            $langs->load("users");
-            // Initialisation donnees (date,duree,texte,desc)
+			// Initialisation donnees (date,duree,texte,desc)
+			$text = $langs->transnoentities("NewUserPassword", $object->login);
+			$desc = $langs->transnoentities("NewUserPassword", $object->login);
+		} elseif ($action == 'USER_ENABLEDISABLE') {
+			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+			$langs->load("users");
+			// Initialisation donnees (date,duree,texte,desc)
 			if ($object->statut == 0) {
 				$text = $langs->transnoentities("UserEnabled", $object->login);
 				$desc = $langs->transnoentities("UserEnabled", $object->login);
@@ -127,35 +127,35 @@ class InterfaceLogevents extends DolibarrTriggers
 				$text = $langs->transnoentities("UserDisabled", $object->login);
 				$desc = $langs->transnoentities("UserDisabled", $object->login);
 			}
-        } elseif ($action == 'USER_DELETE') {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-            $langs->load("users");
-            // Initialisation donnees (date,duree,texte,desc)
-            $text = $langs->transnoentities("UserDeleted", $object->login);
-            $desc = $langs->transnoentities("UserDeleted", $object->login);
-        } elseif ($action == 'USERGROUP_CREATE') {
-		    // Groups
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-            $langs->load("users");
-            // Initialisation donnees (date,duree,texte,desc)
-            $text = $langs->transnoentities("NewGroupCreated", $object->name);
-            $desc = $langs->transnoentities("NewGroupCreated", $object->name);
+		} elseif ($action == 'USER_DELETE') {
+			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+			$langs->load("users");
+			// Initialisation donnees (date,duree,texte,desc)
+			$text = $langs->transnoentities("UserDeleted", $object->login);
+			$desc = $langs->transnoentities("UserDeleted", $object->login);
+		} elseif ($action == 'USERGROUP_CREATE') {
+			// Groups
+			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+			$langs->load("users");
+			// Initialisation donnees (date,duree,texte,desc)
+			$text = $langs->transnoentities("NewGroupCreated", $object->name);
+			$desc = $langs->transnoentities("NewGroupCreated", $object->name);
 		} elseif ($action == 'USERGROUP_MODIFY') {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-            $langs->load("users");
-            // Initialisation donnees (date,duree,texte,desc)
-            $text = $langs->transnoentities("GroupModified", $object->name);
-            $desc = $langs->transnoentities("GroupModified", $object->name);
+			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+			$langs->load("users");
+			// Initialisation donnees (date,duree,texte,desc)
+			$text = $langs->transnoentities("GroupModified", $object->name);
+			$desc = $langs->transnoentities("GroupModified", $object->name);
 		} elseif ($action == 'USERGROUP_DELETE') {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-            $langs->load("users");
-            // Initialisation donnees (date,duree,texte,desc)
-            $text = $langs->transnoentities("GroupDeleted", $object->name);
-            $desc = $langs->transnoentities("GroupDeleted", $object->name);
+			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+			$langs->load("users");
+			// Initialisation donnees (date,duree,texte,desc)
+			$text = $langs->transnoentities("GroupDeleted", $object->name);
+			$desc = $langs->transnoentities("GroupDeleted", $object->name);
 		}
 
 		// If not found
-        /*
+		/*
         else
         {
             dol_syslog("Trigger '".$this->name."' for action '$action' was ran by ".__FILE__." but no handler found for this action.");
@@ -166,26 +166,26 @@ class InterfaceLogevents extends DolibarrTriggers
 		// Add more information into desc from the context property
 		if (!empty($desc) && !empty($object->context['audit'])) $desc .= ' - '.$object->context['audit'];
 
-        // Add entry in event table
+		// Add entry in event table
 		include_once DOL_DOCUMENT_ROOT.'/core/class/events.class.php';
 
 		$event = new Events($this->db);
-        $event->type = $action;
-        $event->dateevent = $date;
-        $event->label = $text;
-        $event->description = $desc;
+		$event->type = $action;
+		$event->dateevent = $date;
+		$event->label = $text;
+		$event->description = $desc;
 		$event->user_agent = $_SERVER["HTTP_USER_AGENT"];
 
-        $result = $event->create($user);
-        if ($result > 0) {
-            return 1;
-        } else {
-            $error = "Failed to insert security event: ".$event->error;
-            $this->errors[] = $error;
-            $this->error = $error;
+		$result = $event->create($user);
+		if ($result > 0) {
+			return 1;
+		} else {
+			$error = "Failed to insert security event: ".$event->error;
+			$this->errors[] = $error;
+			$this->error = $error;
 
-            dol_syslog(get_class($this).": ".$error, LOG_ERR);
-            return -1;
-        }
-    }
+			dol_syslog(get_class($this).": ".$error, LOG_ERR);
+			return -1;
+		}
+	}
 }
diff --git a/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php b/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
index 3b2e4fb6db0..9793022319e 100644
--- a/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
+++ b/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
@@ -32,22 +32,22 @@ require_once DOL_DOCUMENT_ROOT.'/core/triggers/dolibarrtriggers.class.php';
 
 class InterfaceWorkflowManager extends DolibarrTriggers
 {
-    /**
-     * Constructor
-     *
-     * @param DoliDB $db Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
+	/**
+	 * Constructor
+	 *
+	 * @param DoliDB $db Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
 
-        $this->name = preg_replace('/^Interface/i', '', get_class($this));
-        $this->family = "core";
-        $this->description = "Triggers of this module allows to manage workflows";
-        // 'development', 'experimental', 'dolibarr' or version
-        $this->version = self::VERSION_DOLIBARR;
-        $this->picto = 'technic';
-    }
+		$this->name = preg_replace('/^Interface/i', '', get_class($this));
+		$this->family = "core";
+		$this->description = "Triggers of this module allows to manage workflows";
+		// 'development', 'experimental', 'dolibarr' or version
+		$this->version = self::VERSION_DOLIBARR;
+		$this->picto = 'technic';
+	}
 
 	/**
 	 * Function called when a Dolibarrr business event is done.
@@ -61,267 +61,267 @@ class InterfaceWorkflowManager extends DolibarrTriggers
 	 * @return int         				<0 if KO, 0 if no triggered ran, >0 if OK
 	 */
 	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
-    {
-        if (empty($conf->workflow->enabled)) return 0; // Module not active, we do nothing
+	{
+		if (empty($conf->workflow->enabled)) return 0; // Module not active, we do nothing
 
-        // Proposals to order
-        if ($action == 'PROPAL_CLOSE_SIGNED') {
-        	dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-            if (!empty($conf->commande->enabled) && !empty($conf->global->WORKFLOW_PROPAL_AUTOCREATE_ORDER)) {
-                include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
-                $newobject = new Commande($this->db);
+		// Proposals to order
+		if ($action == 'PROPAL_CLOSE_SIGNED') {
+			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+			if (!empty($conf->commande->enabled) && !empty($conf->global->WORKFLOW_PROPAL_AUTOCREATE_ORDER)) {
+				include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
+				$newobject = new Commande($this->db);
 
-                $newobject->context['createfrompropal'] = 'createfrompropal';
-                $newobject->context['origin'] = $object->element;
-                $newobject->context['origin_id'] = $object->id;
+				$newobject->context['createfrompropal'] = 'createfrompropal';
+				$newobject->context['origin'] = $object->element;
+				$newobject->context['origin_id'] = $object->id;
 
-                $ret = $newobject->createFromProposal($object, $user);
-                if ($ret < 0) { $this->error = $newobject->error; $this->errors[] = $newobject->error; }
-                return $ret;
-            }
-        }
+				$ret = $newobject->createFromProposal($object, $user);
+				if ($ret < 0) { $this->error = $newobject->error; $this->errors[] = $newobject->error; }
+				return $ret;
+			}
+		}
 
-        // Order to invoice
-        if ($action == 'ORDER_CLOSE') {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-            if (!empty($conf->facture->enabled) && !empty($conf->global->WORKFLOW_ORDER_AUTOCREATE_INVOICE)) {
-                include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-                $newobject = new Facture($this->db);
+		// Order to invoice
+		if ($action == 'ORDER_CLOSE') {
+			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+			if (!empty($conf->facture->enabled) && !empty($conf->global->WORKFLOW_ORDER_AUTOCREATE_INVOICE)) {
+				include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+				$newobject = new Facture($this->db);
 
-                $newobject->context['createfromorder'] = 'createfromorder';
-                $newobject->context['origin'] = $object->element;
-                $newobject->context['origin_id'] = $object->id;
+				$newobject->context['createfromorder'] = 'createfromorder';
+				$newobject->context['origin'] = $object->element;
+				$newobject->context['origin_id'] = $object->id;
 
-                $ret = $newobject->createFromOrder($object, $user);
-                if ($ret < 0) { $this->error = $newobject->error; $this->errors[] = $newobject->error; }
-                return $ret;
-            }
-        }
+				$ret = $newobject->createFromOrder($object, $user);
+				if ($ret < 0) { $this->error = $newobject->error; $this->errors[] = $newobject->error; }
+				return $ret;
+			}
+		}
 
-        // Order classify billed proposal
-        if ($action == 'ORDER_CLASSIFY_BILLED') {
-        	dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        	if (!empty($conf->propal->enabled) && !empty($conf->workflow->enabled) && !empty($conf->global->WORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL)) {
-        		$object->fetchObjectLinked('', 'propal', $object->id, $object->element);
+		// Order classify billed proposal
+		if ($action == 'ORDER_CLASSIFY_BILLED') {
+			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+			if (!empty($conf->propal->enabled) && !empty($conf->workflow->enabled) && !empty($conf->global->WORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL)) {
+				$object->fetchObjectLinked('', 'propal', $object->id, $object->element);
 				if (!empty($object->linkedObjects)) {
-				    $totalonlinkedelements = 0;
+					$totalonlinkedelements = 0;
 					foreach ($object->linkedObjects['propal'] as $element) {
-					    if ($element->statut == Propal::STATUS_SIGNED || $element->statut == Propal::STATUS_BILLED) $totalonlinkedelements += $element->total_ht;
+						if ($element->statut == Propal::STATUS_SIGNED || $element->statut == Propal::STATUS_BILLED) $totalonlinkedelements += $element->total_ht;
 					}
 					dol_syslog("Amount of linked proposals = ".$totalonlinkedelements.", of order = ".$object->total_ht.", egality is ".($totalonlinkedelements == $object->total_ht));
-                    if ($this->shouldClassify($conf, $totalonlinkedelements, $object->total_ht)) {
-    					foreach ($object->linkedObjects['propal'] as $element) {
-    					    $ret = $element->classifyBilled($user);
-    					}
+					if ($this->shouldClassify($conf, $totalonlinkedelements, $object->total_ht)) {
+						foreach ($object->linkedObjects['propal'] as $element) {
+							$ret = $element->classifyBilled($user);
+						}
 					}
 				}
-        		return $ret;
-        	}
-        }
+				return $ret;
+			}
+		}
 
-        // classify billed order & billed propososal
-        if ($action == 'BILL_VALIDATE') {
-        	dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        	$ret = 0;
+		// classify billed order & billed propososal
+		if ($action == 'BILL_VALIDATE') {
+			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+			$ret = 0;
 
 			// First classify billed the order to allow the proposal classify process
 			if (!empty($conf->commande->enabled) && !empty($conf->workflow->enabled) && !empty($conf->global->WORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER)) {
-        		$object->fetchObjectLinked('', 'commande', $object->id, $object->element);
-        		if (!empty($object->linkedObjects)) {
-        		    $totalonlinkedelements = 0;
-        		    foreach ($object->linkedObjects['commande'] as $element) {
-        		        if ($element->statut == Commande::STATUS_VALIDATED || $element->statut == Commande::STATUS_SHIPMENTONPROCESS || $element->statut == Commande::STATUS_CLOSED) $totalonlinkedelements += $element->total_ht;
-        		    }
-        		    dol_syslog("Amount of linked orders = ".$totalonlinkedelements.", of invoice = ".$object->total_ht.", egality is ".($totalonlinkedelements == $object->total_ht));
-                    if ($this->shouldClassify($conf, $totalonlinkedelements, $object->total_ht)) {
-        		        foreach ($object->linkedObjects['commande'] as $element) {
-        		            $ret = $element->classifyBilled($user);
-        		        }
-        		    }
-        		}
-        	}
+				$object->fetchObjectLinked('', 'commande', $object->id, $object->element);
+				if (!empty($object->linkedObjects)) {
+					$totalonlinkedelements = 0;
+					foreach ($object->linkedObjects['commande'] as $element) {
+						if ($element->statut == Commande::STATUS_VALIDATED || $element->statut == Commande::STATUS_SHIPMENTONPROCESS || $element->statut == Commande::STATUS_CLOSED) $totalonlinkedelements += $element->total_ht;
+					}
+					dol_syslog("Amount of linked orders = ".$totalonlinkedelements.", of invoice = ".$object->total_ht.", egality is ".($totalonlinkedelements == $object->total_ht));
+					if ($this->shouldClassify($conf, $totalonlinkedelements, $object->total_ht)) {
+						foreach ($object->linkedObjects['commande'] as $element) {
+							$ret = $element->classifyBilled($user);
+						}
+					}
+				}
+			}
 
 			// Second classify billed the proposal.
-        	if (!empty($conf->propal->enabled) && !empty($conf->workflow->enabled) && !empty($conf->global->WORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL)) {
-        		$object->fetchObjectLinked('', 'propal', $object->id, $object->element);
-        		if (!empty($object->linkedObjects)) {
-        		    $totalonlinkedelements = 0;
-        		    foreach ($object->linkedObjects['propal'] as $element) {
-        		        if ($element->statut == Propal::STATUS_SIGNED || $element->statut == Propal::STATUS_BILLED) $totalonlinkedelements += $element->total_ht;
-        		    }
-        		    dol_syslog("Amount of linked proposals = ".$totalonlinkedelements.", of invoice = ".$object->total_ht.", egality is ".($totalonlinkedelements == $object->total_ht));
-                    if ($this->shouldClassify($conf, $totalonlinkedelements, $object->total_ht)) {
-        		        foreach ($object->linkedObjects['propal'] as $element) {
-        		            $ret = $element->classifyBilled($user);
-        		        }
-        		    }
-        		}
-        	}
+			if (!empty($conf->propal->enabled) && !empty($conf->workflow->enabled) && !empty($conf->global->WORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL)) {
+				$object->fetchObjectLinked('', 'propal', $object->id, $object->element);
+				if (!empty($object->linkedObjects)) {
+					$totalonlinkedelements = 0;
+					foreach ($object->linkedObjects['propal'] as $element) {
+						if ($element->statut == Propal::STATUS_SIGNED || $element->statut == Propal::STATUS_BILLED) $totalonlinkedelements += $element->total_ht;
+					}
+					dol_syslog("Amount of linked proposals = ".$totalonlinkedelements.", of invoice = ".$object->total_ht.", egality is ".($totalonlinkedelements == $object->total_ht));
+					if ($this->shouldClassify($conf, $totalonlinkedelements, $object->total_ht)) {
+						foreach ($object->linkedObjects['propal'] as $element) {
+							$ret = $element->classifyBilled($user);
+						}
+					}
+				}
+			}
 
-        	return $ret;
-        }
-
-        // classify billed order & billed propososal
-        if ($action == 'BILL_SUPPLIER_VALIDATE') {
-        	dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-
-        	// First classify billed the order to allow the proposal classify process
-        	if (!empty($conf->fournisseur->enabled) && !empty($conf->global->WORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER)) {
-        		$object->fetchObjectLinked('', 'order_supplier', $object->id, $object->element);
-        		if (!empty($object->linkedObjects)) {
-        			$totalonlinkedelements = 0;
-        			foreach ($object->linkedObjects['order_supplier'] as $element) {
-        				if ($element->statut == CommandeFournisseur::STATUS_ACCEPTED || $element->statut == CommandeFournisseur::STATUS_ORDERSENT || $element->statut == CommandeFournisseur::STATUS_RECEIVED_PARTIALLY || $element->statut == CommandeFournisseur::STATUS_RECEIVED_COMPLETELY) $totalonlinkedelements += $element->total_ht;
-        			}
-        			dol_syslog("Amount of linked orders = ".$totalonlinkedelements.", of invoice = ".$object->total_ht.", egality is ".($totalonlinkedelements == $object->total_ht));
-                    if ($this->shouldClassify($conf, $totalonlinkedelements, $object->total_ht)) {
-        				foreach ($object->linkedObjects['order_supplier'] as $element) {
-        					$ret = $element->classifyBilled($user);
-        				}
-        			}
-        		}
-        		return $ret;
-        	}
-
-        	// Second classify billed the proposal.
-        	if (!empty($conf->supplier_proposal->enabled) && !empty($conf->global->WORKFLOW_INVOICE_CLASSIFY_BILLED_SUPPLIER_PROPOSAL)) {
-        		$object->fetchObjectLinked('', 'supplier_proposal', $object->id, $object->element);
-        		if (!empty($object->linkedObjects)) {
-        			$totalonlinkedelements = 0;
-        			foreach ($object->linkedObjects['supplier_proposal'] as $element) {
-        				if ($element->statut == SupplierProposal::STATUS_SIGNED || $element->statut == SupplierProposal::STATUS_BILLED) $totalonlinkedelements += $element->total_ht;
-        			}
-        			dol_syslog("Amount of linked supplier proposals = ".$totalonlinkedelements.", of supplier invoice = ".$object->total_ht.", egality is ".($totalonlinkedelements == $object->total_ht));
-                    if ($this->shouldClassify($conf, $totalonlinkedelements, $object->total_ht)) {
-        				foreach ($object->linkedObjects['supplier_proposal'] as $element) {
-        					$ret = $element->classifyBilled($user);
-        				}
-        			}
-        		}
-        		return $ret;
-        	}
-        }
-
-        // Invoice classify billed order
-        if ($action == 'BILL_PAYED') {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-
-            if (!empty($conf->commande->enabled) && !empty($conf->global->WORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER)) {
-                $object->fetchObjectLinked('', 'commande', $object->id, $object->element);
-                if (!empty($object->linkedObjects)) {
-                    $totalonlinkedelements = 0;
-                    foreach ($object->linkedObjects['commande'] as $element) {
-                        if ($element->statut == Commande::STATUS_VALIDATED || $element->statut == Commande::STATUS_SHIPMENTONPROCESS || $element->statut == Commande::STATUS_CLOSED) $totalonlinkedelements += $element->total_ht;
-                    }
-                    dol_syslog("Amount of linked orders = ".$totalonlinkedelements.", of invoice = ".$object->total_ht.", egality is ".($totalonlinkedelements == $object->total_ht));
-                    if ($this->shouldClassify($conf, $totalonlinkedelements, $object->total_ht)) {
-                        foreach ($object->linkedObjects['commande'] as $element) {
-                            $ret = $element->classifyBilled($user);
-                        }
-                    }
-                }
-                return $ret;
-            }
-        }
-
-        if ($action == 'SHIPPING_VALIDATE') {
-        	dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-
-        	if (!empty($conf->commande->enabled) && !empty($conf->expedition->enabled) && !empty($conf->workflow->enabled) && !empty($conf->global->WORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING)) {
-        		$qtyshipped = array();
-        		$qtyordred = array();
-        		require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
-
-        		//find all shippement on order origin
-        		$order = new Commande($this->db);
-        		$ret = $order->fetch($object->origin_id);
-        		if ($ret < 0) {
-        			$this->error = $order->error; $this->errors = $order->errors;
-        			return $ret;
-        		}
-        		$ret = $order->fetchObjectLinked($order->id, 'commande', null, 'shipping');
-        		if ($ret < 0) {
-        			$this->error = $order->error; $this->errors = $order->errors;
-        			return $ret;
-        		}
-        		//Build array of quantity shipped by product for an order
-        		if (is_array($order->linkedObjects) && count($order->linkedObjects) > 0) {
-        			foreach ($order->linkedObjects as $type=>$shipping_array) {
-        				if ($type == 'shipping' && is_array($shipping_array) && count($shipping_array) > 0) {
-        					foreach ($shipping_array as $shipping) {
-		        				if (is_array($shipping->lines) && count($shipping->lines) > 0) {
-		        					foreach ($shipping->lines as $shippingline) {
-		        						$qtyshipped[$shippingline->fk_product] += $shippingline->qty;
-		        					}
-		        				}
-	        				}
-        				}
-        			}
-        		}
-
-        		//Build array of quantity ordered by product
-        		if (is_array($order->lines) && count($order->lines) > 0) {
-        			foreach ($order->lines as $orderline) {
-        				if (empty($conf->global->STOCK_SUPPORTS_SERVICES) && $orderline->product_type > 0) continue;
-        				$qtyordred[$orderline->fk_product] += $orderline->qty;
-        			}
-        		}
-        		//dol_syslog(var_export($qtyordred,true),LOG_DEBUG);
-        		//dol_syslog(var_export($qtyshipped,true),LOG_DEBUG);
-        		//Compare array
-        		$diff_array = array_diff_assoc($qtyordred, $qtyshipped);
-        		if (count($diff_array) == 0) {
-        			//No diff => mean everythings is shipped
-        			$ret = $object->setStatut(Commande::STATUS_CLOSED, $object->origin_id, $object->origin, 'ORDER_CLOSE');
-        			if ($ret < 0) {
-        				$this->error = $object->error; $this->errors = $object->errors;
-        				return $ret;
-        			}
-        		}
-        	}
-        }
-		 // classify billed reception
-        if ($action == 'BILL_SUPPLIER_VALIDATE') {
-        	dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id, LOG_DEBUG);
-
-        	if (!empty($conf->reception->enabled) && !empty($conf->global->WORKFLOW_BILL_ON_RECEPTION)) {
-        		$object->fetchObjectLinked('', 'reception', $object->id, $object->element);
-        		if (!empty($object->linkedObjects)) {
-        		    $totalonlinkedelements = 0;
-        		    foreach ($object->linkedObjects['reception'] as $element) {
-        		        if ($element->statut == Reception::STATUS_VALIDATED) $totalonlinkedelements += $element->total_ht;
-        		    }
-        		    dol_syslog("Amount of linked proposals = ".$totalonlinkedelements.", of invoice = ".$object->total_ht.", egality is ".($totalonlinkedelements == $object->total_ht), LOG_DEBUG);
-        		    if ($totalonlinkedelements == $object->total_ht) {
-        		        foreach ($object->linkedObjects['reception'] as $element) {
-        		            $ret = $element->set_billed();
-        		        }
-        		    }
-        		}
-        		return $ret;
-        	}
+			return $ret;
 		}
 
-        return 0;
-    }
+		// classify billed order & billed propososal
+		if ($action == 'BILL_SUPPLIER_VALIDATE') {
+			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 
-    /**
-     * @param Object $conf                  Dolibarr settings object
-     * @param float $totalonlinkedelements  Sum of total amounts (excl VAT) of
-     *                                      invoices linked to $object
-     * @param float $object_total_ht        The total amount (excl VAT) of the object
-     *                                      (an order, a proposal, a bill, etc.)
-     * @return bool  True if the amounts are equal (rounded on total amount)
-     *               True if the module is configured to skip the amount equality check
-     *               False otherwise.
-     */
-    private function shouldClassify($conf, $totalonlinkedelements, $object_total_ht)
-    {
-        // if the configuration allows unmatching amounts, allow classification anyway
-        if (!empty($conf->global->WORKFLOW_CLASSIFY_IF_AMOUNTS_ARE_DIFFERENTS)) {
-            return true;
-        }
-        // if the amount are same, allow classification, else deny
-        return (price2num($totalonlinkedelements, 'MT') == price2num($object_total_ht, 'MT'));
-    }
+			// First classify billed the order to allow the proposal classify process
+			if (!empty($conf->fournisseur->enabled) && !empty($conf->global->WORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER)) {
+				$object->fetchObjectLinked('', 'order_supplier', $object->id, $object->element);
+				if (!empty($object->linkedObjects)) {
+					$totalonlinkedelements = 0;
+					foreach ($object->linkedObjects['order_supplier'] as $element) {
+						if ($element->statut == CommandeFournisseur::STATUS_ACCEPTED || $element->statut == CommandeFournisseur::STATUS_ORDERSENT || $element->statut == CommandeFournisseur::STATUS_RECEIVED_PARTIALLY || $element->statut == CommandeFournisseur::STATUS_RECEIVED_COMPLETELY) $totalonlinkedelements += $element->total_ht;
+					}
+					dol_syslog("Amount of linked orders = ".$totalonlinkedelements.", of invoice = ".$object->total_ht.", egality is ".($totalonlinkedelements == $object->total_ht));
+					if ($this->shouldClassify($conf, $totalonlinkedelements, $object->total_ht)) {
+						foreach ($object->linkedObjects['order_supplier'] as $element) {
+							$ret = $element->classifyBilled($user);
+						}
+					}
+				}
+				return $ret;
+			}
+
+			// Second classify billed the proposal.
+			if (!empty($conf->supplier_proposal->enabled) && !empty($conf->global->WORKFLOW_INVOICE_CLASSIFY_BILLED_SUPPLIER_PROPOSAL)) {
+				$object->fetchObjectLinked('', 'supplier_proposal', $object->id, $object->element);
+				if (!empty($object->linkedObjects)) {
+					$totalonlinkedelements = 0;
+					foreach ($object->linkedObjects['supplier_proposal'] as $element) {
+						if ($element->statut == SupplierProposal::STATUS_SIGNED || $element->statut == SupplierProposal::STATUS_BILLED) $totalonlinkedelements += $element->total_ht;
+					}
+					dol_syslog("Amount of linked supplier proposals = ".$totalonlinkedelements.", of supplier invoice = ".$object->total_ht.", egality is ".($totalonlinkedelements == $object->total_ht));
+					if ($this->shouldClassify($conf, $totalonlinkedelements, $object->total_ht)) {
+						foreach ($object->linkedObjects['supplier_proposal'] as $element) {
+							$ret = $element->classifyBilled($user);
+						}
+					}
+				}
+				return $ret;
+			}
+		}
+
+		// Invoice classify billed order
+		if ($action == 'BILL_PAYED') {
+			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+
+			if (!empty($conf->commande->enabled) && !empty($conf->global->WORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER)) {
+				$object->fetchObjectLinked('', 'commande', $object->id, $object->element);
+				if (!empty($object->linkedObjects)) {
+					$totalonlinkedelements = 0;
+					foreach ($object->linkedObjects['commande'] as $element) {
+						if ($element->statut == Commande::STATUS_VALIDATED || $element->statut == Commande::STATUS_SHIPMENTONPROCESS || $element->statut == Commande::STATUS_CLOSED) $totalonlinkedelements += $element->total_ht;
+					}
+					dol_syslog("Amount of linked orders = ".$totalonlinkedelements.", of invoice = ".$object->total_ht.", egality is ".($totalonlinkedelements == $object->total_ht));
+					if ($this->shouldClassify($conf, $totalonlinkedelements, $object->total_ht)) {
+						foreach ($object->linkedObjects['commande'] as $element) {
+							$ret = $element->classifyBilled($user);
+						}
+					}
+				}
+				return $ret;
+			}
+		}
+
+		if ($action == 'SHIPPING_VALIDATE') {
+			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+
+			if (!empty($conf->commande->enabled) && !empty($conf->expedition->enabled) && !empty($conf->workflow->enabled) && !empty($conf->global->WORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING)) {
+				$qtyshipped = array();
+				$qtyordred = array();
+				require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
+
+				//find all shippement on order origin
+				$order = new Commande($this->db);
+				$ret = $order->fetch($object->origin_id);
+				if ($ret < 0) {
+					$this->error = $order->error; $this->errors = $order->errors;
+					return $ret;
+				}
+				$ret = $order->fetchObjectLinked($order->id, 'commande', null, 'shipping');
+				if ($ret < 0) {
+					$this->error = $order->error; $this->errors = $order->errors;
+					return $ret;
+				}
+				//Build array of quantity shipped by product for an order
+				if (is_array($order->linkedObjects) && count($order->linkedObjects) > 0) {
+					foreach ($order->linkedObjects as $type=>$shipping_array) {
+						if ($type == 'shipping' && is_array($shipping_array) && count($shipping_array) > 0) {
+							foreach ($shipping_array as $shipping) {
+								if (is_array($shipping->lines) && count($shipping->lines) > 0) {
+									foreach ($shipping->lines as $shippingline) {
+										$qtyshipped[$shippingline->fk_product] += $shippingline->qty;
+									}
+								}
+							}
+						}
+					}
+				}
+
+				//Build array of quantity ordered by product
+				if (is_array($order->lines) && count($order->lines) > 0) {
+					foreach ($order->lines as $orderline) {
+						if (empty($conf->global->STOCK_SUPPORTS_SERVICES) && $orderline->product_type > 0) continue;
+						$qtyordred[$orderline->fk_product] += $orderline->qty;
+					}
+				}
+				//dol_syslog(var_export($qtyordred,true),LOG_DEBUG);
+				//dol_syslog(var_export($qtyshipped,true),LOG_DEBUG);
+				//Compare array
+				$diff_array = array_diff_assoc($qtyordred, $qtyshipped);
+				if (count($diff_array) == 0) {
+					//No diff => mean everythings is shipped
+					$ret = $object->setStatut(Commande::STATUS_CLOSED, $object->origin_id, $object->origin, 'ORDER_CLOSE');
+					if ($ret < 0) {
+						$this->error = $object->error; $this->errors = $object->errors;
+						return $ret;
+					}
+				}
+			}
+		}
+		 // classify billed reception
+		if ($action == 'BILL_SUPPLIER_VALIDATE') {
+			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id, LOG_DEBUG);
+
+			if (!empty($conf->reception->enabled) && !empty($conf->global->WORKFLOW_BILL_ON_RECEPTION)) {
+				$object->fetchObjectLinked('', 'reception', $object->id, $object->element);
+				if (!empty($object->linkedObjects)) {
+					$totalonlinkedelements = 0;
+					foreach ($object->linkedObjects['reception'] as $element) {
+						if ($element->statut == Reception::STATUS_VALIDATED) $totalonlinkedelements += $element->total_ht;
+					}
+					dol_syslog("Amount of linked proposals = ".$totalonlinkedelements.", of invoice = ".$object->total_ht.", egality is ".($totalonlinkedelements == $object->total_ht), LOG_DEBUG);
+					if ($totalonlinkedelements == $object->total_ht) {
+						foreach ($object->linkedObjects['reception'] as $element) {
+							$ret = $element->set_billed();
+						}
+					}
+				}
+				return $ret;
+			}
+		}
+
+		return 0;
+	}
+
+	/**
+	 * @param Object $conf                  Dolibarr settings object
+	 * @param float $totalonlinkedelements  Sum of total amounts (excl VAT) of
+	 *                                      invoices linked to $object
+	 * @param float $object_total_ht        The total amount (excl VAT) of the object
+	 *                                      (an order, a proposal, a bill, etc.)
+	 * @return bool  True if the amounts are equal (rounded on total amount)
+	 *               True if the module is configured to skip the amount equality check
+	 *               False otherwise.
+	 */
+	private function shouldClassify($conf, $totalonlinkedelements, $object_total_ht)
+	{
+		// if the configuration allows unmatching amounts, allow classification anyway
+		if (!empty($conf->global->WORKFLOW_CLASSIFY_IF_AMOUNTS_ARE_DIFFERENTS)) {
+			return true;
+		}
+		// if the amount are same, allow classification, else deny
+		return (price2num($totalonlinkedelements, 'MT') == price2num($object_total_ht, 'MT'));
+	}
 }
diff --git a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
index ce5d6da1b30..6fb09f9a1b3 100644
--- a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
+++ b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
@@ -34,22 +34,22 @@ require_once DOL_DOCUMENT_ROOT.'/core/triggers/dolibarrtriggers.class.php';
  */
 class InterfaceActionsAuto extends DolibarrTriggers
 {
-    /**
-     * Constructor
-     *
-     * @param DoliDB $db Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
+	/**
+	 * Constructor
+	 *
+	 * @param DoliDB $db Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
 
-        $this->name = preg_replace('/^Interface/i', '', get_class($this));
-        $this->family = "agenda";
-        $this->description = "Triggers of this module add actions in agenda according to setup made in agenda setup.";
-        // 'development', 'experimental', 'dolibarr' or version
-        $this->version = self::VERSION_DOLIBARR;
-        $this->picto = 'action';
-    }
+		$this->name = preg_replace('/^Interface/i', '', get_class($this));
+		$this->family = "agenda";
+		$this->description = "Triggers of this module add actions in agenda according to setup made in agenda setup.";
+		// 'development', 'experimental', 'dolibarr' or version
+		$this->version = self::VERSION_DOLIBARR;
+		$this->picto = 'action';
+	}
 
 	/**
 	 * Function called when a Dolibarrr business event is done.
diff --git a/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php b/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
index 8409d96e5e0..221c1d70846 100644
--- a/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
+++ b/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
@@ -30,22 +30,22 @@ require_once DOL_DOCUMENT_ROOT.'/core/triggers/dolibarrtriggers.class.php';
  */
 class InterfaceActionsBlockedLog extends DolibarrTriggers
 {
-    /**
-     * Constructor
-     *
-     * @param DoliDB $db Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
+	/**
+	 * Constructor
+	 *
+	 * @param DoliDB $db Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
 
-        $this->name = preg_replace('/^Interface/i', '', get_class($this));
-        $this->family = "system";
-        $this->description = "Triggers of this module add action for BlockedLog module (Module of unalterable logs).";
-        // 'development', 'experimental', 'dolibarr' or version
-        $this->version = self::VERSION_DOLIBARR;
-        $this->picto = 'technic';
-    }
+		$this->name = preg_replace('/^Interface/i', '', get_class($this));
+		$this->family = "system";
+		$this->description = "Triggers of this module add action for BlockedLog module (Module of unalterable logs).";
+		// 'development', 'experimental', 'dolibarr' or version
+		$this->version = self::VERSION_DOLIBARR;
+		$this->picto = 'technic';
+	}
 
 	/**
 	 * Function called on Dolibarr payment or invoice event.
@@ -79,12 +79,12 @@ class InterfaceActionsBlockedLog extends DolibarrTriggers
 		$qualified = 0;
 		$amounts = 0;
 		if ($action === 'BILL_VALIDATE' || (($action === 'BILL_DELETE' || $action === 'BILL_SENTBYMAIL') && $object->statut != 0)
-		    || $action === 'BILL_SUPPLIER_VALIDATE' || (($action === 'BILL_SUPPLIER_DELETE' || $action === 'BILL_SUPPLIER_SENTBYMAIL') && $object->statut != 0)
-		    || $action === 'MEMBER_SUBSCRIPTION_CREATE' || $action === 'MEMBER_SUBSCRIPTION_MODIFY' || $action === 'MEMBER_SUBSCRIPTION_DELETE'
-		    || $action === 'DON_VALIDATE' || (($action === 'DON_MODIFY' || $action === 'DON_DELETE') && $object->statut != 0)
-		    || $action === 'CASHCONTROL_VALIDATE'
-		    || (in_array($object->element, array('facture', 'supplier_invoice')) && $action === 'DOC_DOWNLOAD' && $object->statut != 0)
-		    || (in_array($object->element, array('facture', 'supplier_invoice')) && $action === 'DOC_PREVIEW' && $object->statut != 0)
+			|| $action === 'BILL_SUPPLIER_VALIDATE' || (($action === 'BILL_SUPPLIER_DELETE' || $action === 'BILL_SUPPLIER_SENTBYMAIL') && $object->statut != 0)
+			|| $action === 'MEMBER_SUBSCRIPTION_CREATE' || $action === 'MEMBER_SUBSCRIPTION_MODIFY' || $action === 'MEMBER_SUBSCRIPTION_DELETE'
+			|| $action === 'DON_VALIDATE' || (($action === 'DON_MODIFY' || $action === 'DON_DELETE') && $object->statut != 0)
+			|| $action === 'CASHCONTROL_VALIDATE'
+			|| (in_array($object->element, array('facture', 'supplier_invoice')) && $action === 'DOC_DOWNLOAD' && $object->statut != 0)
+			|| (in_array($object->element, array('facture', 'supplier_invoice')) && $action === 'DOC_PREVIEW' && $object->statut != 0)
 			|| (!empty($conf->global->BLOCKEDLOG_ADD_ACTIONS_SUPPORTED) && in_array($action, explode(',', $conf->global->BLOCKEDLOG_ADD_ACTIONS_SUPPORTED)))
 		) {
 			$qualified++;
@@ -139,5 +139,5 @@ class InterfaceActionsBlockedLog extends DolibarrTriggers
 		} else {
 			return 1;
 		}
-    }
+	}
 }
diff --git a/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php b/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
index bed87b0377f..7417d07ccff 100644
--- a/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
+++ b/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
@@ -31,22 +31,22 @@ require_once DOL_DOCUMENT_ROOT.'/core/triggers/dolibarrtriggers.class.php';
  */
 class InterfaceLdapsynchro extends DolibarrTriggers
 {
-    /**
-     * Constructor
-     *
-     * @param DoliDB $db Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
+	/**
+	 * Constructor
+	 *
+	 * @param DoliDB $db Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
 
-        $this->name = preg_replace('/^Interface/i', '', get_class($this));
-        $this->family = "ldap";
-        $this->description = "Triggers of this module allows to synchronize Dolibarr toward a LDAP database.";
-        // 'development', 'experimental', 'dolibarr' or version
-        $this->version = self::VERSION_DOLIBARR;
-        $this->picto = 'technic';
-    }
+		$this->name = preg_replace('/^Interface/i', '', get_class($this));
+		$this->family = "ldap";
+		$this->description = "Triggers of this module allows to synchronize Dolibarr toward a LDAP database.";
+		// 'development', 'experimental', 'dolibarr' or version
+		$this->version = self::VERSION_DOLIBARR;
+		$this->picto = 'technic';
+	}
 
 	/**
 	 * Function called when a Dolibarrr business event is done.
diff --git a/htdocs/core/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php b/htdocs/core/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php
index e8766401219..de75b010305 100644
--- a/htdocs/core/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php
+++ b/htdocs/core/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php
@@ -29,22 +29,22 @@ require_once DOL_DOCUMENT_ROOT.'/core/triggers/dolibarrtriggers.class.php';
  */
 class InterfaceMailmanSpipsynchro extends DolibarrTriggers
 {
-    /**
-     * Constructor
-     *
-     * @param DoliDB $db Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
+	/**
+	 * Constructor
+	 *
+	 * @param DoliDB $db Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
 
-        $this->name = preg_replace('/^Interface/i', '', get_class($this));
-        $this->family = "mailmanspip";
-        $this->description = "Triggers of this module allows to synchronize Mailman an Spip.";
-        // 'development', 'experimental', 'dolibarr' or version
-        $this->version = self::VERSION_DOLIBARR;
-        $this->picto = 'technic';
-    }
+		$this->name = preg_replace('/^Interface/i', '', get_class($this));
+		$this->family = "mailmanspip";
+		$this->description = "Triggers of this module allows to synchronize Mailman an Spip.";
+		// 'development', 'experimental', 'dolibarr' or version
+		$this->version = self::VERSION_DOLIBARR;
+		$this->picto = 'technic';
+	}
 
 	/**
 	 * Function called when a Dolibarrr business event is done.
@@ -59,85 +59,45 @@ class InterfaceMailmanSpipsynchro extends DolibarrTriggers
 	 */
 	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
 	{
-        if (empty($conf->mailmanspip->enabled)) return 0; // Module not active, we do nothing
+		if (empty($conf->mailmanspip->enabled)) return 0; // Module not active, we do nothing
 
-        require_once DOL_DOCUMENT_ROOT."/mailmanspip/class/mailmanspip.class.php";
-        require_once DOL_DOCUMENT_ROOT."/user/class/usergroup.class.php";
+		require_once DOL_DOCUMENT_ROOT."/mailmanspip/class/mailmanspip.class.php";
+		require_once DOL_DOCUMENT_ROOT."/user/class/usergroup.class.php";
 
-        if ($action == 'CATEGORY_LINK') {
-        	dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+		if ($action == 'CATEGORY_LINK') {
+			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 
-        	// We add subscription if we change category (new category may means more mailing-list to subscribe)
-        	if (is_object($object->context['linkto']) && method_exists($object->context['linkto'], 'add_to_abo') && $object->context['linkto']->add_to_abo() < 0) {
-    			$this->error = $object->context['linkto']->error;
-    			$this->errors = $object->context['linkto']->errors;
-    			$return = -1;
-    		} else {
+			// We add subscription if we change category (new category may means more mailing-list to subscribe)
+			if (is_object($object->context['linkto']) && method_exists($object->context['linkto'], 'add_to_abo') && $object->context['linkto']->add_to_abo() < 0) {
+				$this->error = $object->context['linkto']->error;
+				$this->errors = $object->context['linkto']->errors;
+				$return = -1;
+			} else {
 				$return = 1;
 			}
 
-        	return $return;
-        } elseif ($action == 'CATEGORY_UNLINK') {
-        	dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+			return $return;
+		} elseif ($action == 'CATEGORY_UNLINK') {
+			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 
-        	// We remove subscription if we change category (lessw category may means less mailing-list to subscribe)
-        	if (is_object($object->context['unlinkoff']) && method_exists($object->context['unlinkoff'], 'del_to_abo') && $object->context['unlinkoff']->del_to_abo() < 0) {
-        		$this->error = $object->context['unlinkoff']->error;
-        		$this->errors = $object->context['unlinkoff']->errors;
-        		$return = -1;
-        	} else {
-        		$return = 1;
-        	}
-
-        	return $return;
-        }
-
-        // Members
-        elseif ($action == 'MEMBER_VALIDATE') {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-
-            $return = 0;
-            if ($object->add_to_abo() < 0) {
-                $this->errors = $object->errors;
-                if (!empty($object->error)) $this->errors[] = $object->error;
-                $return = -1;
-            } else {
-                $return = 1;
-            }
-
-            return $return;
-        } elseif ($action == 'MEMBER_MODIFY') {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-
-            $return = 0;
-            // Add user into some linked tools (mailman, spip, etc...)
-            if (($object->oldcopy->email != $object->email) || ($object->oldcopy->typeid != $object->typeid)) {
-                if (is_object($object->oldcopy) && (($object->oldcopy->email != $object->email) || ($object->oldcopy->typeid != $object->typeid))) {    // If email has changed or if list has changed we delete mailman subscription for old email
-					if ($object->oldcopy->del_to_abo() < 0) {
-                        $this->errors = $object->oldcopy->errors;
-                        if (!empty($object->oldcopy->error)) $this->errors[] = $object->oldcopy->error;
-                        $return = -1;
-					} else {
-                        $return = 1;
-					}
-                }
-                // We add subscription if new email or new type (new type may means more mailing-list to subscribe)
-                if ($object->add_to_abo() < 0) {
-                    $this->errors = $object->errors;
-                    if (!empty($object->error)) $this->errors[] = $object->error;
-                    $return = -1;
-                } else {
-                    $return = 1;
-                }
-            }
+			// We remove subscription if we change category (lessw category may means less mailing-list to subscribe)
+			if (is_object($object->context['unlinkoff']) && method_exists($object->context['unlinkoff'], 'del_to_abo') && $object->context['unlinkoff']->del_to_abo() < 0) {
+				$this->error = $object->context['unlinkoff']->error;
+				$this->errors = $object->context['unlinkoff']->errors;
+				$return = -1;
+			} else {
+				$return = 1;
+			}
 
 			return $return;
-        } elseif ($action == 'MEMBER_RESILIATE' || $action == 'MEMBER_DELETE') {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+		}
 
-            $return = 0;
-            // Remove from external tools (mailman, spip, etc...)
-        	if ($object->del_to_abo() < 0) {
+		// Members
+		elseif ($action == 'MEMBER_VALIDATE') {
+			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+
+			$return = 0;
+			if ($object->add_to_abo() < 0) {
 				$this->errors = $object->errors;
 				if (!empty($object->error)) $this->errors[] = $object->error;
 				$return = -1;
@@ -145,9 +105,49 @@ class InterfaceMailmanSpipsynchro extends DolibarrTriggers
 				$return = 1;
 			}
 
-	        return $return;
-        }
+			return $return;
+		} elseif ($action == 'MEMBER_MODIFY') {
+			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+
+			$return = 0;
+			// Add user into some linked tools (mailman, spip, etc...)
+			if (($object->oldcopy->email != $object->email) || ($object->oldcopy->typeid != $object->typeid)) {
+				if (is_object($object->oldcopy) && (($object->oldcopy->email != $object->email) || ($object->oldcopy->typeid != $object->typeid))) {    // If email has changed or if list has changed we delete mailman subscription for old email
+					if ($object->oldcopy->del_to_abo() < 0) {
+						$this->errors = $object->oldcopy->errors;
+						if (!empty($object->oldcopy->error)) $this->errors[] = $object->oldcopy->error;
+						$return = -1;
+					} else {
+						$return = 1;
+					}
+				}
+				// We add subscription if new email or new type (new type may means more mailing-list to subscribe)
+				if ($object->add_to_abo() < 0) {
+					$this->errors = $object->errors;
+					if (!empty($object->error)) $this->errors[] = $object->error;
+					$return = -1;
+				} else {
+					$return = 1;
+				}
+			}
+
+			return $return;
+		} elseif ($action == 'MEMBER_RESILIATE' || $action == 'MEMBER_DELETE') {
+			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+
+			$return = 0;
+			// Remove from external tools (mailman, spip, etc...)
+			if ($object->del_to_abo() < 0) {
+				$this->errors = $object->errors;
+				if (!empty($object->error)) $this->errors[] = $object->error;
+				$return = -1;
+			} else {
+				$return = 1;
+			}
+
+			return $return;
+		}
 
 		return 0;
-    }
+	}
 }
diff --git a/htdocs/core/triggers/interface_50_modNotification_Notification.class.php b/htdocs/core/triggers/interface_50_modNotification_Notification.class.php
index a0b5638dbca..c5a4f450e42 100644
--- a/htdocs/core/triggers/interface_50_modNotification_Notification.class.php
+++ b/htdocs/core/triggers/interface_50_modNotification_Notification.class.php
@@ -49,22 +49,22 @@ class InterfaceNotification extends DolibarrTriggers
 		'HOLIDAY_APPROVE'
 	);
 
-    /**
-     * Constructor
-     *
-     * @param DoliDB $db Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
+	/**
+	 * Constructor
+	 *
+	 * @param DoliDB $db Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
 
-        $this->name = preg_replace('/^Interface/i', '', get_class($this));
-        $this->family = "notification";
-        $this->description = "Triggers of this module send email notifications according to Notification module setup.";
-        // 'development', 'experimental', 'dolibarr' or version
-        $this->version = self::VERSION_DOLIBARR;
-        $this->picto = 'email';
-    }
+		$this->name = preg_replace('/^Interface/i', '', get_class($this));
+		$this->family = "notification";
+		$this->description = "Triggers of this module send email notifications according to Notification module setup.";
+		// 'development', 'experimental', 'dolibarr' or version
+		$this->version = self::VERSION_DOLIBARR;
+		$this->picto = 'email';
+	}
 
 	/**
 	 * Function called when a Dolibarrr business event is done.
diff --git a/htdocs/core/triggers/interface_80_modStripe_Stripe.class.php b/htdocs/core/triggers/interface_80_modStripe_Stripe.class.php
index 25b7f57b6a5..502a32656c8 100644
--- a/htdocs/core/triggers/interface_80_modStripe_Stripe.class.php
+++ b/htdocs/core/triggers/interface_80_modStripe_Stripe.class.php
@@ -35,21 +35,21 @@ require_once DOL_DOCUMENT_ROOT.'/core/triggers/dolibarrtriggers.class.php';
  */
 class InterfaceStripe extends DolibarrTriggers
 {
-    /**
-     *   Constructor
-     *
-     *   @param DoliDB $db Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
+	/**
+	 *   Constructor
+	 *
+	 *   @param DoliDB $db Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
 
-        $this->name = preg_replace('/^Interface/i', '', get_class($this));
-	    $this->family = 'stripe';
-        $this->description = "Triggers of the module Stripe";
-        $this->version = self::VERSION_DOLIBARR; // 'development', 'experimental', 'dolibarr' or version
-        $this->picto = 'stripe';
-    }
+		$this->name = preg_replace('/^Interface/i', '', get_class($this));
+		$this->family = 'stripe';
+		$this->description = "Triggers of the module Stripe";
+		$this->version = self::VERSION_DOLIBARR; // 'development', 'experimental', 'dolibarr' or version
+		$this->picto = 'stripe';
+	}
 
 	/**
 	 * Function called when a Dolibarrr business event is done.
@@ -157,7 +157,7 @@ class InterfaceStripe extends DolibarrTriggers
 							// Update Customer on Stripe
 							$customer->save();
 						} catch (Exception $e) {
-						    //var_dump(\Stripe\Stripe::getApiVersion());
+							//var_dump(\Stripe\Stripe::getApiVersion());
 							$this->errors[] = $e->getMessage();
 							$ok = -1;
 						}
@@ -168,7 +168,7 @@ class InterfaceStripe extends DolibarrTriggers
 		if ($action == 'COMPANY_DELETE') {
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 
-			if (! empty($conf->global->STRIPE_DELETE_STRIPE_ACCOUNT_WHEN_DELETING_THIRPARTY)) {
+			if (!empty($conf->global->STRIPE_DELETE_STRIPE_ACCOUNT_WHEN_DELETING_THIRPARTY)) {
 				// By default, we do not delete the stripe account. We may need to reuse it with its payment_intent, for example if delete is for a merge of thirdparties.
 				$stripeacc = $stripe->getStripeAccount($service); // No need of network access for this. May return '' if no Oauth defined.
 
diff --git a/htdocs/core/triggers/interface_90_modSociete_ContactRoles.class.php b/htdocs/core/triggers/interface_90_modSociete_ContactRoles.class.php
index 46cb7c56f17..ee576992865 100644
--- a/htdocs/core/triggers/interface_90_modSociete_ContactRoles.class.php
+++ b/htdocs/core/triggers/interface_90_modSociete_ContactRoles.class.php
@@ -33,22 +33,22 @@ require_once DOL_DOCUMENT_ROOT.'/core/triggers/dolibarrtriggers.class.php';
  */
 class InterfaceContactRoles extends DolibarrTriggers
 {
-    /**
-     * Constructor
-     *
-     * @param DoliDB $db Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
+	/**
+	 * Constructor
+	 *
+	 * @param DoliDB $db Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
 
-        $this->name = preg_replace('/^Interface/i', '', get_class($this));
-        $this->family = "agenda";
-        $this->description = "Triggers of this module auto link contact to company.";
-        // 'development', 'experimental', 'dolibarr' or version
-        $this->version = self::VERSION_DOLIBARR;
-        $this->picto = 'action';
-    }
+		$this->name = preg_replace('/^Interface/i', '', get_class($this));
+		$this->family = "agenda";
+		$this->description = "Triggers of this module auto link contact to company.";
+		// 'development', 'experimental', 'dolibarr' or version
+		$this->version = self::VERSION_DOLIBARR;
+		$this->picto = 'action';
+	}
 
 	/**
 	 * Function called when a Dolibarrr business event is done.
diff --git a/htdocs/core/triggers/interface_99_modZapier_ZapierTriggers.class.php b/htdocs/core/triggers/interface_99_modZapier_ZapierTriggers.class.php
index d028cf0f59f..4224b46db89 100644
--- a/htdocs/core/triggers/interface_99_modZapier_ZapierTriggers.class.php
+++ b/htdocs/core/triggers/interface_99_modZapier_ZapierTriggers.class.php
@@ -39,308 +39,308 @@ require_once DOL_DOCUMENT_ROOT.'/core/triggers/dolibarrtriggers.class.php';
  */
 class InterfaceZapierTriggers extends DolibarrTriggers
 {
-    /**
-     * Constructor
-     *
-     * @param DoliDB $db Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
+	/**
+	 * Constructor
+	 *
+	 * @param DoliDB $db Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
 
-        $this->name = preg_replace('/^Interface/i', '', get_class($this));
-        $this->family = "technic";
-        $this->description = "Zapier triggers.";
-        // 'development', 'experimental', 'dolibarr' or version
-        $this->version = self::VERSION_DEVELOPMENT;
-        $this->picto = 'zapier';
-    }
+		$this->name = preg_replace('/^Interface/i', '', get_class($this));
+		$this->family = "technic";
+		$this->description = "Zapier triggers.";
+		// 'development', 'experimental', 'dolibarr' or version
+		$this->version = self::VERSION_DEVELOPMENT;
+		$this->picto = 'zapier';
+	}
 
-    /**
-     * Function called when a Dolibarrr business event is done.
-     * All functions "runTrigger" are triggered if file
-     * is inside directory core/triggers
-     *
-     * @param string        $action     Event action code
-     * @param CommonObject  $object     Object
-     * @param User          $user       Object user
-     * @param Translate     $langs      Object langs
-     * @param Conf          $conf       Object conf
-     * @return int                      <0 if KO, 0 if no triggered ran, >0 if OK
-     */
-    public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
-    {
-        if (empty($conf->zapier->enabled)) {
-            // Module not active, we do nothing
-            return 0;
-        }
-        $logtriggeraction = false;
-        $sql = '';
-        if ($action != '') {
-            $actions = explode('_', $action);
-            $sql = 'SELECT rowid, url FROM '.MAIN_DB_PREFIX.'zapier_hook';
-            $sql .= ' WHERE module="'.$this->db->escape(strtolower($actions[0])).'" AND action="'.$this->db->escape(strtolower($actions[1])).'"';
-            //setEventMessages($sql, null);
-        }
+	/**
+	 * Function called when a Dolibarrr business event is done.
+	 * All functions "runTrigger" are triggered if file
+	 * is inside directory core/triggers
+	 *
+	 * @param string        $action     Event action code
+	 * @param CommonObject  $object     Object
+	 * @param User          $user       Object user
+	 * @param Translate     $langs      Object langs
+	 * @param Conf          $conf       Object conf
+	 * @return int                      <0 if KO, 0 if no triggered ran, >0 if OK
+	 */
+	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
+	{
+		if (empty($conf->zapier->enabled)) {
+			// Module not active, we do nothing
+			return 0;
+		}
+		$logtriggeraction = false;
+		$sql = '';
+		if ($action != '') {
+			$actions = explode('_', $action);
+			$sql = 'SELECT rowid, url FROM '.MAIN_DB_PREFIX.'zapier_hook';
+			$sql .= ' WHERE module="'.$this->db->escape(strtolower($actions[0])).'" AND action="'.$this->db->escape(strtolower($actions[1])).'"';
+			//setEventMessages($sql, null);
+		}
 
-        switch ($action) {
-            // Users
-            //case 'USER_CREATE':
-            //case 'USER_MODIFY':
-            //case 'USER_NEW_PASSWORD':
-            //case 'USER_ENABLEDISABLE':
-            //case 'USER_DELETE':
-            //case 'USER_SETINGROUP':
-            //case 'USER_REMOVEFROMGROUP':
-            // case 'USER_LOGIN':
-            // case 'USER_LOGIN_FAILED':
-            // case 'USER_LOGOUT':
-            // Warning: To increase performances, this action is triggered only if constant MAIN_ACTIVATE_UPDATESESSIONTRIGGER is set to 1.
-            // // case 'USER_UPDATE_SESSION':
+		switch ($action) {
+			// Users
+			//case 'USER_CREATE':
+			//case 'USER_MODIFY':
+			//case 'USER_NEW_PASSWORD':
+			//case 'USER_ENABLEDISABLE':
+			//case 'USER_DELETE':
+			//case 'USER_SETINGROUP':
+			//case 'USER_REMOVEFROMGROUP':
+			// case 'USER_LOGIN':
+			// case 'USER_LOGIN_FAILED':
+			// case 'USER_LOGOUT':
+			// Warning: To increase performances, this action is triggered only if constant MAIN_ACTIVATE_UPDATESESSIONTRIGGER is set to 1.
+			// // case 'USER_UPDATE_SESSION':
 
-            // Actions
-            case 'ACTION_MODIFY':
-                //$logtriggeraction = true;
-                break;
-            case 'ACTION_CREATE':
-            	$resql = $this->db->query($sql);
-                // TODO voir comment regrouper les webhooks en un post
-            	while ($resql && $obj = $this->db->fetch_array($resql)) {
-                    $cleaned = cleanObjectDatas(dol_clone($object));
-                    $cleaned = cleanAgendaEventsDatas($cleaned);
-                    $json = json_encode($cleaned);
-                    // call the zapierPostWebhook() function
-                    zapierPostWebhook($obj['url'], $json);
-                    //setEventMessages($obj['url'], null);
-                }
-                $logtriggeraction = true;
-                break;
-            case 'ACTION_DELETE':
-                //$logtriggeraction = true;
-                break;
+			// Actions
+			case 'ACTION_MODIFY':
+				//$logtriggeraction = true;
+				break;
+			case 'ACTION_CREATE':
+				$resql = $this->db->query($sql);
+				// TODO voir comment regrouper les webhooks en un post
+				while ($resql && $obj = $this->db->fetch_array($resql)) {
+					$cleaned = cleanObjectDatas(dol_clone($object));
+					$cleaned = cleanAgendaEventsDatas($cleaned);
+					$json = json_encode($cleaned);
+					// call the zapierPostWebhook() function
+					zapierPostWebhook($obj['url'], $json);
+					//setEventMessages($obj['url'], null);
+				}
+				$logtriggeraction = true;
+				break;
+			case 'ACTION_DELETE':
+				//$logtriggeraction = true;
+				break;
 
-            // Groups
-            //case 'USERGROUP_CREATE':
-            //case 'USERGROUP_MODIFY':
-            //case 'USERGROUP_DELETE':
+			// Groups
+			//case 'USERGROUP_CREATE':
+			//case 'USERGROUP_MODIFY':
+			//case 'USERGROUP_DELETE':
 
-            // Companies
-            case 'COMPANY_CREATE':
-            	$resql = $this->db->query($sql);
-            	while ($resql && $obj = $this->db->fetch_array($resql)) {
-                    $cleaned = cleanObjectDatas(dol_clone($object));
-                    $json = json_encode($cleaned);
-                    // call the zapierPostWebhook() function
-                    zapierPostWebhook($obj['url'], $json);
-                }
-                $logtriggeraction = true;
-                break;
-            case 'COMPANY_MODIFY':
-            	$resql = $this->db->query($sql);
-            	while ($resql && $obj = $this->db->fetch_array($resql)) {
-                    $cleaned = cleanObjectDatas(dol_clone($object));
-                    $json = json_encode($cleaned);
-                    // call the zapierPostWebhook() function
-                    zapierPostWebhook($obj['url'], $json);
-                }
-                $logtriggeraction = true;
-                break;
-            case 'COMPANY_DELETE':
-                //$logtriggeraction = true;
-                break;
+			// Companies
+			case 'COMPANY_CREATE':
+				$resql = $this->db->query($sql);
+				while ($resql && $obj = $this->db->fetch_array($resql)) {
+					$cleaned = cleanObjectDatas(dol_clone($object));
+					$json = json_encode($cleaned);
+					// call the zapierPostWebhook() function
+					zapierPostWebhook($obj['url'], $json);
+				}
+				$logtriggeraction = true;
+				break;
+			case 'COMPANY_MODIFY':
+				$resql = $this->db->query($sql);
+				while ($resql && $obj = $this->db->fetch_array($resql)) {
+					$cleaned = cleanObjectDatas(dol_clone($object));
+					$json = json_encode($cleaned);
+					// call the zapierPostWebhook() function
+					zapierPostWebhook($obj['url'], $json);
+				}
+				$logtriggeraction = true;
+				break;
+			case 'COMPANY_DELETE':
+				//$logtriggeraction = true;
+				break;
 
-            // Contacts
-            case 'CONTACT_CREATE':
-            case 'CONTACT_MODIFY':
-            case 'CONTACT_DELETE':
-            case 'CONTACT_ENABLEDISABLE':
-                break;
-            // Products
-            // case 'PRODUCT_CREATE':
-            // case 'PRODUCT_MODIFY':
-            // case 'PRODUCT_DELETE':
-            // case 'PRODUCT_PRICE_MODIFY':
-            // case 'PRODUCT_SET_MULTILANGS':
-            // case 'PRODUCT_DEL_MULTILANGS':
+			// Contacts
+			case 'CONTACT_CREATE':
+			case 'CONTACT_MODIFY':
+			case 'CONTACT_DELETE':
+			case 'CONTACT_ENABLEDISABLE':
+				break;
+			// Products
+			// case 'PRODUCT_CREATE':
+			// case 'PRODUCT_MODIFY':
+			// case 'PRODUCT_DELETE':
+			// case 'PRODUCT_PRICE_MODIFY':
+			// case 'PRODUCT_SET_MULTILANGS':
+			// case 'PRODUCT_DEL_MULTILANGS':
 
-            //Stock mouvement
-            // case 'STOCK_MOVEMENT':
+			//Stock mouvement
+			// case 'STOCK_MOVEMENT':
 
-            //MYECMDIR
-            // case 'MYECMDIR_DELETE':
-            // case 'MYECMDIR_CREATE':
-            // case 'MYECMDIR_MODIFY':
+			//MYECMDIR
+			// case 'MYECMDIR_DELETE':
+			// case 'MYECMDIR_CREATE':
+			// case 'MYECMDIR_MODIFY':
 
-            // Customer orders
-            case 'ORDER_CREATE':
-            	$resql = $this->db->query($sql);
-            	while ($resql && $obj = $this->db->fetch_array($resql)) {
-                    $cleaned = cleanObjectDatas(dol_clone($object));
-                    $json = json_encode($cleaned);
-                    // call the zapierPostWebhook() function
-                    zapierPostWebhook($obj['url'], $json);
-                }
-                $logtriggeraction = true;
-                break;
-            case 'ORDER_CLONE':
-                break;
-            case 'ORDER_VALIDATE':
-                break;
-            case 'ORDER_DELETE':
-            case 'ORDER_CANCEL':
-            case 'ORDER_SENTBYMAIL':
-            case 'ORDER_CLASSIFY_BILLED':
-            case 'ORDER_SETDRAFT':
-            case 'LINEORDER_INSERT':
-            case 'LINEORDER_UPDATE':
-            case 'LINEORDER_DELETE':
-                break;
-            // Supplier orders
-            // case 'ORDER_SUPPLIER_CREATE':
-            // case 'ORDER_SUPPLIER_CLONE':
-            // case 'ORDER_SUPPLIER_VALIDATE':
-            // case 'ORDER_SUPPLIER_DELETE':
-            // case 'ORDER_SUPPLIER_APPROVE':
-            // case 'ORDER_SUPPLIER_REFUSE':
-            // case 'ORDER_SUPPLIER_CANCEL':
-            // case 'ORDER_SUPPLIER_SENTBYMAIL':
-            // case 'ORDER_SUPPLIER_DISPATCH':
-            // case 'LINEORDER_SUPPLIER_DISPATCH':
-            // case 'LINEORDER_SUPPLIER_CREATE':
-            // case 'LINEORDER_SUPPLIER_UPDATE':
+			// Customer orders
+			case 'ORDER_CREATE':
+				$resql = $this->db->query($sql);
+				while ($resql && $obj = $this->db->fetch_array($resql)) {
+					$cleaned = cleanObjectDatas(dol_clone($object));
+					$json = json_encode($cleaned);
+					// call the zapierPostWebhook() function
+					zapierPostWebhook($obj['url'], $json);
+				}
+				$logtriggeraction = true;
+				break;
+			case 'ORDER_CLONE':
+				break;
+			case 'ORDER_VALIDATE':
+				break;
+			case 'ORDER_DELETE':
+			case 'ORDER_CANCEL':
+			case 'ORDER_SENTBYMAIL':
+			case 'ORDER_CLASSIFY_BILLED':
+			case 'ORDER_SETDRAFT':
+			case 'LINEORDER_INSERT':
+			case 'LINEORDER_UPDATE':
+			case 'LINEORDER_DELETE':
+				break;
+			// Supplier orders
+			// case 'ORDER_SUPPLIER_CREATE':
+			// case 'ORDER_SUPPLIER_CLONE':
+			// case 'ORDER_SUPPLIER_VALIDATE':
+			// case 'ORDER_SUPPLIER_DELETE':
+			// case 'ORDER_SUPPLIER_APPROVE':
+			// case 'ORDER_SUPPLIER_REFUSE':
+			// case 'ORDER_SUPPLIER_CANCEL':
+			// case 'ORDER_SUPPLIER_SENTBYMAIL':
+			// case 'ORDER_SUPPLIER_DISPATCH':
+			// case 'LINEORDER_SUPPLIER_DISPATCH':
+			// case 'LINEORDER_SUPPLIER_CREATE':
+			// case 'LINEORDER_SUPPLIER_UPDATE':
 
-            // Proposals
-            // case 'PROPAL_CREATE':
-            // case 'PROPAL_CLONE':
-            // case 'PROPAL_MODIFY':
-            // case 'PROPAL_VALIDATE':
-            // case 'PROPAL_SENTBYMAIL':
-            // case 'PROPAL_CLOSE_SIGNED':
-            // case 'PROPAL_CLOSE_REFUSED':
-            // case 'PROPAL_DELETE':
-            // case 'LINEPROPAL_INSERT':
-            // case 'LINEPROPAL_UPDATE':
-            // case 'LINEPROPAL_DELETE':
+			// Proposals
+			// case 'PROPAL_CREATE':
+			// case 'PROPAL_CLONE':
+			// case 'PROPAL_MODIFY':
+			// case 'PROPAL_VALIDATE':
+			// case 'PROPAL_SENTBYMAIL':
+			// case 'PROPAL_CLOSE_SIGNED':
+			// case 'PROPAL_CLOSE_REFUSED':
+			// case 'PROPAL_DELETE':
+			// case 'LINEPROPAL_INSERT':
+			// case 'LINEPROPAL_UPDATE':
+			// case 'LINEPROPAL_DELETE':
 
-            // SupplierProposal
-            // case 'SUPPLIER_PROPOSAL_CREATE':
-            // case 'SUPPLIER_PROPOSAL_CLONE':
-            // case 'SUPPLIER_PROPOSAL_MODIFY':
-            // case 'SUPPLIER_PROPOSAL_VALIDATE':
-            // case 'SUPPLIER_PROPOSAL_SENTBYMAIL':
-            // case 'SUPPLIER_PROPOSAL_CLOSE_SIGNED':
-            // case 'SUPPLIER_PROPOSAL_CLOSE_REFUSED':
-            // case 'SUPPLIER_PROPOSAL_DELETE':
-            // case 'LINESUPPLIER_PROPOSAL_INSERT':
-            // case 'LINESUPPLIER_PROPOSAL_UPDATE':
-            // case 'LINESUPPLIER_PROPOSAL_DELETE':
+			// SupplierProposal
+			// case 'SUPPLIER_PROPOSAL_CREATE':
+			// case 'SUPPLIER_PROPOSAL_CLONE':
+			// case 'SUPPLIER_PROPOSAL_MODIFY':
+			// case 'SUPPLIER_PROPOSAL_VALIDATE':
+			// case 'SUPPLIER_PROPOSAL_SENTBYMAIL':
+			// case 'SUPPLIER_PROPOSAL_CLOSE_SIGNED':
+			// case 'SUPPLIER_PROPOSAL_CLOSE_REFUSED':
+			// case 'SUPPLIER_PROPOSAL_DELETE':
+			// case 'LINESUPPLIER_PROPOSAL_INSERT':
+			// case 'LINESUPPLIER_PROPOSAL_UPDATE':
+			// case 'LINESUPPLIER_PROPOSAL_DELETE':
 
-            // Contracts
-            // case 'CONTRACT_CREATE':
-            // case 'CONTRACT_ACTIVATE':
-            // case 'CONTRACT_CANCEL':
-            // case 'CONTRACT_CLOSE':
-            // case 'CONTRACT_DELETE':
-            // case 'LINECONTRACT_INSERT':
-            // case 'LINECONTRACT_UPDATE':
-            // case 'LINECONTRACT_DELETE':
+			// Contracts
+			// case 'CONTRACT_CREATE':
+			// case 'CONTRACT_ACTIVATE':
+			// case 'CONTRACT_CANCEL':
+			// case 'CONTRACT_CLOSE':
+			// case 'CONTRACT_DELETE':
+			// case 'LINECONTRACT_INSERT':
+			// case 'LINECONTRACT_UPDATE':
+			// case 'LINECONTRACT_DELETE':
 
-            // Bills
-            // case 'BILL_CREATE':
-            // case 'BILL_CLONE':
-            // case 'BILL_MODIFY':
-            // case 'BILL_VALIDATE':
-            // case 'BILL_UNVALIDATE':
-            // case 'BILL_SENTBYMAIL':
-            // case 'BILL_CANCEL':
-            // case 'BILL_DELETE':
-            // case 'BILL_PAYED':
-            // case 'LINEBILL_INSERT':
-            // case 'LINEBILL_UPDATE':
-            // case 'LINEBILL_DELETE':
+			// Bills
+			// case 'BILL_CREATE':
+			// case 'BILL_CLONE':
+			// case 'BILL_MODIFY':
+			// case 'BILL_VALIDATE':
+			// case 'BILL_UNVALIDATE':
+			// case 'BILL_SENTBYMAIL':
+			// case 'BILL_CANCEL':
+			// case 'BILL_DELETE':
+			// case 'BILL_PAYED':
+			// case 'LINEBILL_INSERT':
+			// case 'LINEBILL_UPDATE':
+			// case 'LINEBILL_DELETE':
 
-            //Supplier Bill
-            // case 'BILL_SUPPLIER_CREATE':
-            // case 'BILL_SUPPLIER_UPDATE':
-            // case 'BILL_SUPPLIER_DELETE':
-            // case 'BILL_SUPPLIER_PAYED':
-            // case 'BILL_SUPPLIER_UNPAYED':
-            // case 'BILL_SUPPLIER_VALIDATE':
-            // case 'BILL_SUPPLIER_UNVALIDATE':
-            // case 'LINEBILL_SUPPLIER_CREATE':
-            // case 'LINEBILL_SUPPLIER_UPDATE':
-            // case 'LINEBILL_SUPPLIER_DELETE':
+			//Supplier Bill
+			// case 'BILL_SUPPLIER_CREATE':
+			// case 'BILL_SUPPLIER_UPDATE':
+			// case 'BILL_SUPPLIER_DELETE':
+			// case 'BILL_SUPPLIER_PAYED':
+			// case 'BILL_SUPPLIER_UNPAYED':
+			// case 'BILL_SUPPLIER_VALIDATE':
+			// case 'BILL_SUPPLIER_UNVALIDATE':
+			// case 'LINEBILL_SUPPLIER_CREATE':
+			// case 'LINEBILL_SUPPLIER_UPDATE':
+			// case 'LINEBILL_SUPPLIER_DELETE':
 
-            // Payments
-            // case 'PAYMENT_CUSTOMER_CREATE':
-            // case 'PAYMENT_SUPPLIER_CREATE':
-            // case 'PAYMENT_ADD_TO_BANK':
-            // case 'PAYMENT_DELETE':
+			// Payments
+			// case 'PAYMENT_CUSTOMER_CREATE':
+			// case 'PAYMENT_SUPPLIER_CREATE':
+			// case 'PAYMENT_ADD_TO_BANK':
+			// case 'PAYMENT_DELETE':
 
-            // Online
-            // case 'PAYMENT_PAYBOX_OK':
-            // case 'PAYMENT_PAYPAL_OK':
-            // case 'PAYMENT_STRIPE_OK':
+			// Online
+			// case 'PAYMENT_PAYBOX_OK':
+			// case 'PAYMENT_PAYPAL_OK':
+			// case 'PAYMENT_STRIPE_OK':
 
-            // Donation
-            // case 'DON_CREATE':
-            // case 'DON_UPDATE':
-            // case 'DON_DELETE':
+			// Donation
+			// case 'DON_CREATE':
+			// case 'DON_UPDATE':
+			// case 'DON_DELETE':
 
-            // Interventions
-            // case 'FICHINTER_CREATE':
-            // case 'FICHINTER_MODIFY':
-            // case 'FICHINTER_VALIDATE':
-            // case 'FICHINTER_DELETE':
-            // case 'LINEFICHINTER_CREATE':
-            // case 'LINEFICHINTER_UPDATE':
-            // case 'LINEFICHINTER_DELETE':
+			// Interventions
+			// case 'FICHINTER_CREATE':
+			// case 'FICHINTER_MODIFY':
+			// case 'FICHINTER_VALIDATE':
+			// case 'FICHINTER_DELETE':
+			// case 'LINEFICHINTER_CREATE':
+			// case 'LINEFICHINTER_UPDATE':
+			// case 'LINEFICHINTER_DELETE':
 
-            // Members
-            // case 'MEMBER_CREATE':
-            // case 'MEMBER_VALIDATE':
-            // case 'MEMBER_SUBSCRIPTION':
-            // case 'MEMBER_MODIFY':
-            // case 'MEMBER_NEW_PASSWORD':
-            // case 'MEMBER_RESILIATE':
-            // case 'MEMBER_DELETE':
+			// Members
+			// case 'MEMBER_CREATE':
+			// case 'MEMBER_VALIDATE':
+			// case 'MEMBER_SUBSCRIPTION':
+			// case 'MEMBER_MODIFY':
+			// case 'MEMBER_NEW_PASSWORD':
+			// case 'MEMBER_RESILIATE':
+			// case 'MEMBER_DELETE':
 
-            // Categories
-            // case 'CATEGORY_CREATE':
-            // case 'CATEGORY_MODIFY':
-            // case 'CATEGORY_DELETE':
-            // case 'CATEGORY_SET_MULTILANGS':
+			// Categories
+			// case 'CATEGORY_CREATE':
+			// case 'CATEGORY_MODIFY':
+			// case 'CATEGORY_DELETE':
+			// case 'CATEGORY_SET_MULTILANGS':
 
-            // Projects
-            // case 'PROJECT_CREATE':
-            // case 'PROJECT_MODIFY':
-            // case 'PROJECT_DELETE':
+			// Projects
+			// case 'PROJECT_CREATE':
+			// case 'PROJECT_MODIFY':
+			// case 'PROJECT_DELETE':
 
-            // Project tasks
-            // case 'TASK_CREATE':
-            // case 'TASK_MODIFY':
-            // case 'TASK_DELETE':
+			// Project tasks
+			// case 'TASK_CREATE':
+			// case 'TASK_MODIFY':
+			// case 'TASK_DELETE':
 
-            // Task time spent
-            // case 'TASK_TIMESPENT_CREATE':
-            // case 'TASK_TIMESPENT_MODIFY':
-            // case 'TASK_TIMESPENT_DELETE':
+			// Task time spent
+			// case 'TASK_TIMESPENT_CREATE':
+			// case 'TASK_TIMESPENT_MODIFY':
+			// case 'TASK_TIMESPENT_DELETE':
 
-            // Shipping
-            // case 'SHIPPING_CREATE':
-            // case 'SHIPPING_MODIFY':
-            // case 'SHIPPING_VALIDATE':
-            // case 'SHIPPING_SENTBYMAIL':
-            // case 'SHIPPING_BILLED':
-            // case 'SHIPPING_CLOSED':
-            // case 'SHIPPING_REOPEN':
-            // case 'SHIPPING_DELETE':
-        }
-        if ($logtriggeraction) {
-            dol_syslog("Trigger '".$this->name."' for action '.$action.' launched by ".__FILE__." id=".$object->id);
-        }
-        return 0;
-    }
+			// Shipping
+			// case 'SHIPPING_CREATE':
+			// case 'SHIPPING_MODIFY':
+			// case 'SHIPPING_VALIDATE':
+			// case 'SHIPPING_SENTBYMAIL':
+			// case 'SHIPPING_BILLED':
+			// case 'SHIPPING_CLOSED':
+			// case 'SHIPPING_REOPEN':
+			// case 'SHIPPING_DELETE':
+		}
+		if ($logtriggeraction) {
+			dol_syslog("Trigger '".$this->name."' for action '.$action.' launched by ".__FILE__." id=".$object->id);
+		}
+		return 0;
+	}
 }
 /**
  * Post webhook in zapier with object data
@@ -351,94 +351,94 @@ class InterfaceZapierTriggers extends DolibarrTriggers
  */
 function zapierPostWebhook($url, $json)
 {
-    $headers = array('Accept: application/json', 'Content-Type: application/json');
-    // TODO supprimer le webhook en cas de mauvaise réponse
-    $ch = curl_init();
-    curl_setopt($ch, CURLOPT_URL, $url);
-    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-    curl_setopt($ch, CURLOPT_TIMEOUT, 10);
-    curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'POST');
-    curl_setopt($ch, CURLOPT_POST, 1);
-    curl_setopt($ch, CURLOPT_POSTFIELDS, $json);
-    curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
-    $output = curl_exec($ch);
-    curl_close($ch);
+	$headers = array('Accept: application/json', 'Content-Type: application/json');
+	// TODO supprimer le webhook en cas de mauvaise réponse
+	$ch = curl_init();
+	curl_setopt($ch, CURLOPT_URL, $url);
+	curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+	curl_setopt($ch, CURLOPT_TIMEOUT, 10);
+	curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'POST');
+	curl_setopt($ch, CURLOPT_POST, 1);
+	curl_setopt($ch, CURLOPT_POSTFIELDS, $json);
+	curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
+	$output = curl_exec($ch);
+	curl_close($ch);
 }
 
 /**
  * Clean sensible object datas
  *
- * @param   object  $toclean    Object to clean
- * @return  array   Array of cleaned object properties
+ * @param   Object  $toclean    Object to clean
+ * @return  Object              Object with cleaned properties
  */
 function cleanObjectDatas($toclean)
 {
-    // Remove $db object property for object
-    unset($toclean->db);
+	// Remove $db object property for object
+	unset($toclean->db);
 
-    // Remove linkedObjects. We should already have linkedObjectIds that avoid huge responses
-    unset($toclean->linkedObjects);
+	// Remove linkedObjects. We should already have linkedObjectsIds that avoid huge responses
+	unset($toclean->linkedObjects);
 
-    unset($toclean->lines); // should be ->lines
+	unset($toclean->lines); // should be ->lines
 
-    unset($toclean->fields);
+	unset($toclean->fields);
 
-    unset($toclean->oldline);
+	unset($toclean->oldline);
 
-    unset($toclean->error);
-    unset($toclean->errors);
+	unset($toclean->error);
+	unset($toclean->errors);
 
-    unset($toclean->ref_previous);
-    unset($toclean->ref_next);
-    unset($toclean->ref_int);
+	unset($toclean->ref_previous);
+	unset($toclean->ref_next);
+	unset($toclean->ref_int);
 
-    unset($toclean->projet); // Should be fk_project
-    unset($toclean->project); // Should be fk_project
-    unset($toclean->author); // Should be fk_user_author
-    unset($toclean->timespent_old_duration);
-    unset($toclean->timespent_id);
-    unset($toclean->timespent_duration);
-    unset($toclean->timespent_date);
-    unset($toclean->timespent_datehour);
-    unset($toclean->timespent_withhour);
-    unset($toclean->timespent_fk_user);
-    unset($toclean->timespent_note);
+	unset($toclean->projet); // Should be fk_project
+	unset($toclean->project); // Should be fk_project
+	unset($toclean->author); // Should be fk_user_author
+	unset($toclean->timespent_old_duration);
+	unset($toclean->timespent_id);
+	unset($toclean->timespent_duration);
+	unset($toclean->timespent_date);
+	unset($toclean->timespent_datehour);
+	unset($toclean->timespent_withhour);
+	unset($toclean->timespent_fk_user);
+	unset($toclean->timespent_note);
 
-    unset($toclean->statuts);
-    unset($toclean->statuts_short);
-    unset($toclean->statuts_logo);
-    unset($toclean->statuts_long);
+	unset($toclean->statuts);
+	unset($toclean->statuts_short);
+	unset($toclean->statuts_logo);
+	unset($toclean->statuts_long);
 
-    unset($toclean->element);
-    unset($toclean->fk_element);
-    unset($toclean->table_element);
-    unset($toclean->table_element_line);
-    unset($toclean->picto);
+	unset($toclean->element);
+	unset($toclean->fk_element);
+	unset($toclean->table_element);
+	unset($toclean->table_element_line);
+	unset($toclean->picto);
 
-    unset($toclean->skip_update_total);
-    unset($toclean->context);
+	unset($toclean->skip_update_total);
+	unset($toclean->context);
 
-    // Remove the $oldcopy property because it is not supported by the JSON
-    // encoder. The following error is generated when trying to serialize
-    // it: "Error encoding/decoding JSON: Type is not supported"
-    // Note: Event if this property was correctly handled by the JSON
-    // encoder, it should be ignored because keeping it would let the API
-    // have a very strange behavior: calling PUT and then GET on the same
-    // resource would give different results:
-    // PUT /objects/{id} -> returns object with oldcopy = previous version of the object
-    // GET /objects/{id} -> returns object with oldcopy empty
-    unset($toclean->oldcopy);
+	// Remove the $oldcopy property because it is not supported by the JSON
+	// encoder. The following error is generated when trying to serialize
+	// it: "Error encoding/decoding JSON: Type is not supported"
+	// Note: Event if this property was correctly handled by the JSON
+	// encoder, it should be ignored because keeping it would let the API
+	// have a very strange behavior: calling PUT and then GET on the same
+	// resource would give different results:
+	// PUT /objects/{id} -> returns object with oldcopy = previous version of the object
+	// GET /objects/{id} -> returns object with oldcopy empty
+	unset($toclean->oldcopy);
 
-    // If object has lines, remove $db property
-    if (isset($toclean->lines) && count($toclean->lines) > 0) {
-        $nboflines = count($toclean->lines);
-        for ($i = 0; $i < $nboflines; $i++) {
-            cleanObjectDatas($toclean->lines[$i]);
-        }
-    }
+	// If object has lines, remove $db property
+	if (isset($toclean->lines) && count($toclean->lines) > 0) {
+		$nboflines = count($toclean->lines);
+		for ($i = 0; $i < $nboflines; $i++) {
+			cleanObjectDatas($toclean->lines[$i]);
+		}
+	}
 
-    // If object has linked objects, remove $db property
-    /*
+	// If object has linked objects, remove $db property
+	/*
     if(isset($toclean->linkedObjects) && count($toclean->linkedObjects) > 0)  {
         foreach($toclean->linkedObjects as $type_object => $linked_object) {
             foreach($linked_object as $toclean2clean) {
@@ -447,57 +447,57 @@ function cleanObjectDatas($toclean)
         }
     }*/
 
-    return $toclean;
+	return $toclean;
 }
 
 /**
  * Clean sensible object datas
  *
  * @param   object  $toclean    Object to clean
- * @return  array   Array of cleaned object properties
+ * @return  Object              Object with cleaned properties
  */
 function cleanAgendaEventsDatas($toclean)
 {
-    unset($toclean->usermod);
-    unset($toclean->libelle);
-    //unset($toclean->array_options);
-    unset($toclean->context);
-    unset($toclean->canvas);
-    unset($toclean->contact);
-    unset($toclean->contact_id);
-    unset($toclean->thirdparty);
-    unset($toclean->user);
-    unset($toclean->origin);
-    unset($toclean->origin_id);
-    unset($toclean->ref_ext);
-    unset($toclean->statut);
-    unset($toclean->country);
-    unset($toclean->country_id);
-    unset($toclean->country_code);
-    unset($toclean->barcode_type);
-    unset($toclean->barcode_type_code);
-    unset($toclean->barcode_type_label);
-    unset($toclean->barcode_type_coder);
-    unset($toclean->mode_reglement_id);
-    unset($toclean->cond_reglement_id);
-    unset($toclean->cond_reglement);
-    unset($toclean->fk_delivery_address);
-    unset($toclean->shipping_method_id);
-    unset($toclean->fk_account);
-    unset($toclean->total_ht);
-    unset($toclean->total_tva);
-    unset($toclean->total_localtax1);
-    unset($toclean->total_localtax2);
-    unset($toclean->total_ttc);
-    unset($toclean->fk_incoterms);
-    unset($toclean->libelle_incoterms);
-    unset($toclean->location_incoterms);
-    unset($toclean->name);
-    unset($toclean->lastname);
-    unset($toclean->firstname);
-    unset($toclean->civility_id);
-    unset($toclean->contact);
-    unset($toclean->societe);
+	unset($toclean->usermod);
+	unset($toclean->libelle);
+	//unset($toclean->array_options);
+	unset($toclean->context);
+	unset($toclean->canvas);
+	unset($toclean->contact);
+	unset($toclean->contact_id);
+	unset($toclean->thirdparty);
+	unset($toclean->user);
+	unset($toclean->origin);
+	unset($toclean->origin_id);
+	unset($toclean->ref_ext);
+	unset($toclean->statut);
+	unset($toclean->country);
+	unset($toclean->country_id);
+	unset($toclean->country_code);
+	unset($toclean->barcode_type);
+	unset($toclean->barcode_type_code);
+	unset($toclean->barcode_type_label);
+	unset($toclean->barcode_type_coder);
+	unset($toclean->mode_reglement_id);
+	unset($toclean->cond_reglement_id);
+	unset($toclean->cond_reglement);
+	unset($toclean->fk_delivery_address);
+	unset($toclean->shipping_method_id);
+	unset($toclean->fk_account);
+	unset($toclean->total_ht);
+	unset($toclean->total_tva);
+	unset($toclean->total_localtax1);
+	unset($toclean->total_localtax2);
+	unset($toclean->total_ttc);
+	unset($toclean->fk_incoterms);
+	unset($toclean->libelle_incoterms);
+	unset($toclean->location_incoterms);
+	unset($toclean->name);
+	unset($toclean->lastname);
+	unset($toclean->firstname);
+	unset($toclean->civility_id);
+	unset($toclean->contact);
+	unset($toclean->societe);
 
-    return $toclean;
+	return $toclean;
 }
diff --git a/htdocs/core/website.inc.php b/htdocs/core/website.inc.php
index 9d4cc3f7797..1e94b690c8f 100644
--- a/htdocs/core/website.inc.php
+++ b/htdocs/core/website.inc.php
@@ -53,7 +53,7 @@ if (!$pageid && !empty($websitepagefile))
 }
 if (!is_object($websitepage))
 {
-    $websitepage = new WebsitePage($db);
+	$websitepage = new WebsitePage($db);
 }
 // Define $weblangs
 if (!is_object($weblangs))
diff --git a/htdocs/cron/admin/cron.php b/htdocs/cron/admin/cron.php
index 5f87e640bce..fc3ca7c63b6 100644
--- a/htdocs/cron/admin/cron.php
+++ b/htdocs/cron/admin/cron.php
@@ -92,12 +92,12 @@ if (!empty($conf->global->CRON_DISABLE_KEY_CHANGE)) $disabled = ' disabled="disa
 print '<td>';
 if (empty($conf->global->CRON_DISABLE_KEY_CHANGE))
 {
-    print '<input type="text" class="flat minwidth300"'.$disabled.' id="CRON_KEY" name="CRON_KEY" value="'.(GETPOST('CRON_KEY') ?GETPOST('CRON_KEY') : (!empty($conf->global->CRON_KEY) ? $conf->global->CRON_KEY : '')).'">';
-    if (!empty($conf->use_javascript_ajax))
-    	print '&nbsp;'.img_picto($langs->trans('Generate'), 'refresh', 'id="generate_token" class="linkobject"');
+	print '<input type="text" class="flat minwidth300"'.$disabled.' id="CRON_KEY" name="CRON_KEY" value="'.(GETPOST('CRON_KEY') ?GETPOST('CRON_KEY') : (!empty($conf->global->CRON_KEY) ? $conf->global->CRON_KEY : '')).'">';
+	if (!empty($conf->use_javascript_ajax))
+		print '&nbsp;'.img_picto($langs->trans('Generate'), 'refresh', 'id="generate_token" class="linkobject"');
 } else {
-    print (!empty($conf->global->CRON_KEY) ? $conf->global->CRON_KEY : '');
-    print '<input type="hidden" id="CRON_KEY" name="CRON_KEY" value="'.(GETPOST('CRON_KEY') ?GETPOST('CRON_KEY') : (!empty($conf->global->CRON_KEY) ? $conf->global->CRON_KEY : '')).'">';
+	print (!empty($conf->global->CRON_KEY) ? $conf->global->CRON_KEY : '');
+	print '<input type="hidden" id="CRON_KEY" name="CRON_KEY" value="'.(GETPOST('CRON_KEY') ?GETPOST('CRON_KEY') : (!empty($conf->global->CRON_KEY) ? $conf->global->CRON_KEY : '')).'">';
 }
 print '</td>';
 print '<td>&nbsp;</td>';
@@ -105,7 +105,7 @@ print '</tr>';
 
 print '</table>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '<div class="center">';
 print '<input type="submit" name="save" class="button" value="'.$langs->trans("Save").'">';
diff --git a/htdocs/cron/card.php b/htdocs/cron/card.php
index bdb776a7100..9c3a2b38f02 100644
--- a/htdocs/cron/card.php
+++ b/htdocs/cron/card.php
@@ -62,18 +62,18 @@ if (!empty($id))
 
 if (!empty($cancel))
 {
-    if (!empty($id) && empty($backtourl))
+	if (!empty($id) && empty($backtourl))
 	{
 		$action = '';
 	} else {
-	    if ($backtourl)
-	    {
-	        header("Location: ".$backtourl);
-	        exit;
-	    } else {
-	        header("Location: ".DOL_URL_ROOT.'/cron/list.php');
-		    exit;
-	    }
+		if ($backtourl)
+		{
+			header("Location: ".$backtourl);
+			exit;
+		} else {
+			header("Location: ".DOL_URL_ROOT.'/cron/list.php');
+			exit;
+		}
 	}
 }
 
@@ -95,32 +95,32 @@ if ($action == 'confirm_delete' && $confirm == "yes" && $user->rights->cron->del
 // Execute jobs
 if ($action == 'confirm_execute' && $confirm == "yes" && $user->rights->cron->execute)
 {
-    if (!empty($conf->global->CRON_KEY) && $conf->global->CRON_KEY != $securitykey)
-    {
-        setEventMessages('Security key '.$securitykey.' is wrong', null, 'errors');
-        $action = '';
-    } else {
-        $now = dol_now(); // Date we start
+	if (!empty($conf->global->CRON_KEY) && $conf->global->CRON_KEY != $securitykey)
+	{
+		setEventMessages('Security key '.$securitykey.' is wrong', null, 'errors');
+		$action = '';
+	} else {
+		$now = dol_now(); // Date we start
 
-    	$result = $object->run_jobs($user->login);
+		$result = $object->run_jobs($user->login);
 
-    	if ($result < 0)
-    	{
-    		setEventMessages($object->error, $object->errors, 'errors');
-    		$action = '';
-    	} else {
-    		$res = $object->reprogram_jobs($user->login, $now);
-    		if ($res > 0)
-    		{
-    			if ($object->lastresult > 0) setEventMessages($langs->trans("JobFinished"), null, 'warnings');
-    			else setEventMessages($langs->trans("JobFinished"), null, 'mesgs');
-    			$action = '';
-    		} else {
-    			setEventMessages($object->error, $object->errors, 'errors');
-    			$action = '';
-    		}
-    	}
-    }
+		if ($result < 0)
+		{
+			setEventMessages($object->error, $object->errors, 'errors');
+			$action = '';
+		} else {
+			$res = $object->reprogram_jobs($user->login, $now);
+			if ($res > 0)
+			{
+				if ($object->lastresult > 0) setEventMessages($langs->trans("JobFinished"), null, 'warnings');
+				else setEventMessages($langs->trans("JobFinished"), null, 'mesgs');
+				$action = '';
+			} else {
+				setEventMessages($object->error, $object->errors, 'errors');
+				$action = '';
+			}
+		}
+	}
 }
 
 
@@ -395,47 +395,47 @@ if (($action == "create") || ($action == "edit"))
 	print '<select name="nbfrequency">';
 	for ($i = 1; $i <= 60; $i++)
 	{
-	    if ($object->frequency == $i)
-	    {
-	        print "<option value='".$i."' selected>".$i."</option>";
-	    } else {
-	        print "<option value='".$i."'>".$i."</option>";
-	    }
+		if ($object->frequency == $i)
+		{
+			print "<option value='".$i."' selected>".$i."</option>";
+		} else {
+			print "<option value='".$i."'>".$i."</option>";
+		}
 	}
 	print "</select>";
 	$input = " <input type=\"radio\" name=\"unitfrequency\" value=\"60\" id=\"frequency_minute\" ";
 	if ($object->unitfrequency == "60")
 	{
-	    $input .= ' checked />';
+		$input .= ' checked />';
 	} else {
-	    $input .= ' />';
+		$input .= ' />';
 	}
 	$input .= "<label for=\"frequency_minute\">".$langs->trans('Minutes')."</label>";
 	print $input;
 
 	$input = " <input type=\"radio\" name=\"unitfrequency\" value=\"3600\" id=\"frequency_heures\" ";
 	if ($object->unitfrequency == "3600") {
-	    $input .= ' checked />';
+		$input .= ' checked />';
 	} else {
-	    $input .= ' />';
+		$input .= ' />';
 	}
 	$input .= "<label for=\"frequency_heures\">".$langs->trans('Hours')."</label>";
 	print $input;
 
 	$input = " <input type=\"radio\" name=\"unitfrequency\" value=\"86400\" id=\"frequency_jours\" ";
 	if ($object->unitfrequency == "86400") {
-	    $input .= ' checked />';
+		$input .= ' checked />';
 	} else {
-	    $input .= ' />';
+		$input .= ' />';
 	}
 	$input .= "<label for=\"frequency_jours\">".$langs->trans('Days')."</label>";
 	print $input;
 
 	$input = " <input type=\"radio\" name=\"unitfrequency\" value=\"604800\" id=\"frequency_semaine\" ";
 	if ($object->unitfrequency == "604800") {
-	    $input .= ' checked />';
+		$input .= ' checked />';
 	} else {
-	    $input .= ' />';
+		$input .= ' />';
 	}
 	$input .= "<label for=\"frequency_semaine\">".$langs->trans('Weeks')."</label>";
 	print $input;
@@ -448,9 +448,9 @@ if (($action == "create") || ($action == "edit"))
 	print $langs->trans('CronDtStart')."</td><td>";
 	if (!empty($object->datestart))
 	{
-        print $form->selectDate($object->datestart, 'datestart', 1, 1, '', "cronform");
+		print $form->selectDate($object->datestart, 'datestart', 1, 1, '', "cronform");
 	} else {
-        print $form->selectDate('', 'datestart', 1, 1, '', "cronform");
+		print $form->selectDate('', 'datestart', 1, 1, '', "cronform");
 	}
 	print "</td>";
 	print "<td>";
@@ -460,9 +460,9 @@ if (($action == "create") || ($action == "edit"))
 	print "<tr><td>";
 	print $langs->trans('CronDtEnd')."</td><td>";
 	if (!empty($object->dateend)) {
-        print $form->selectDate($object->dateend, 'dateend', 1, 1, '', "cronform");
+		print $form->selectDate($object->dateend, 'dateend', 1, 1, '', "cronform");
 	} else {
-        print $form->selectDate(-1, 'dateend', 1, 1, 1, "cronform");
+		print $form->selectDate(-1, 'dateend', 1, 1, 1, "cronform");
 	}
 	print "</td>";
 	print "<td>";
@@ -473,7 +473,7 @@ if (($action == "create") || ($action == "edit"))
 	print $langs->trans('CronPriority')."</td>";
 	$priority = 0;
 	if (!empty($object->priority)) {
-	    $priority = $object->priority;
+		$priority = $object->priority;
 	}
 	print "<td><input type=\"text\" size=\"2\" name=\"priority\" value=\"".$priority."\" /> ";
 	print "</td>";
@@ -484,7 +484,7 @@ if (($action == "create") || ($action == "edit"))
 	print '<tr><td>';
 	$maxrun = '';
 	if (!empty($object->maxrun)) {
-	    $maxrun = $object->maxrun;
+		$maxrun = $object->maxrun;
 	}
 	print $langs->trans('CronMaxRun')."</td>";
 	print "<td><input type=\"text\" size=\"2\" name=\"maxrun\" value=\"".$maxrun."\" /> ";
@@ -499,18 +499,18 @@ if (($action == "create") || ($action == "edit"))
 	print "</td><td>";
 	if (!empty($object->datenextrun))
 	{
-        print $form->selectDate($object->datenextrun, 'datenextrun', 1, 1, '', "cronform");
+		print $form->selectDate($object->datenextrun, 'datenextrun', 1, 1, '', "cronform");
 	} else {
-        print $form->selectDate(-1, 'datenextrun', 1, 1, '', "cronform");
+		print $form->selectDate(-1, 'datenextrun', 1, 1, '', "cronform");
 	}
 	print "</td>";
-    print "<td>";
+	print "<td>";
 	print "</td>";
 	print "</tr>";
 
 	print '</table>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div align="center">';
 	print '<input type="submit" name="save" class="button" value="'.$langs->trans("Save").'">';
@@ -523,7 +523,7 @@ if (($action == "create") || ($action == "edit"))
 	/*
 	 * view card
 	 */
-    $now = dol_now();
+	$now = dol_now();
 
 	print dol_get_fiche_head($head, 'card', $langs->trans("CronTask"), -1, 'cron');
 
@@ -601,7 +601,7 @@ if (($action == "create") || ($action == "edit"))
 	}
 
 	print '</table>';
-    print '</div>';
+	print '</div>';
 
 	print '<br>';
 
@@ -691,9 +691,9 @@ if (($action == "create") || ($action == "edit"))
 	print "</td></tr>";
 
 	print '</table>';
-    print '</div>';
+	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 
 	print "\n\n<div class=\"tabsAction\">\n";
@@ -714,13 +714,13 @@ if (($action == "create") || ($action == "edit"))
 	}
 
 	if (!$user->rights->cron->create) {
-	    print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("CronStatusActiveBtn").'/'.$langs->trans("CronStatusInactiveBtn").'</a>';
+		print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("CronStatusActiveBtn").'/'.$langs->trans("CronStatusInactiveBtn").'</a>';
 	} else {
-	    if (empty($object->status)) {
-	        print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=activate&id='.$object->id.'">'.$langs->trans("CronStatusActiveBtn").'</a>';
-	    } else {
-	        print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?action=inactive&id='.$object->id.'">'.$langs->trans("CronStatusInactiveBtn").'</a>';
-	    }
+		if (empty($object->status)) {
+			print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=activate&id='.$object->id.'">'.$langs->trans("CronStatusActiveBtn").'</a>';
+		} else {
+			print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?action=inactive&id='.$object->id.'">'.$langs->trans("CronStatusInactiveBtn").'</a>';
+		}
 	}
 
 	if (!$user->rights->cron->delete) {
diff --git a/htdocs/cron/class/cronjob.class.php b/htdocs/cron/class/cronjob.class.php
index c5acbcf16bd..72ebb06e311 100644
--- a/htdocs/cron/class/cronjob.class.php
+++ b/htdocs/cron/class/cronjob.class.php
@@ -40,24 +40,24 @@ class Cronjob extends CommonObject
 	 */
 	public $table_element = 'cronjob';
 
-    /**
+	/**
 	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
 	 */
 	public $picto = 'cron';
 
-    /**
+	/**
 	 * @var int Entity
 	 */
 	public $entity;
 
-    public $jobtype;
+	public $jobtype;
 	public $tms = '';
 	public $datec = '';
 
 	/**
-     * @var string Cron Job label
-     */
-    public $label;
+	 * @var string Cron Job label
+	 */
+	public $label;
 
 	public $command;
 	public $classesname;
@@ -91,13 +91,13 @@ class Cronjob extends CommonObject
 	public $processing;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_user_author;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_user_mod;
 
 	public $nbrun;
@@ -109,27 +109,27 @@ class Cronjob extends CommonObject
 	const STATUS_ARCHIVED = 2;
 
 
-    /**
-     *  Constructor
-     *
-     *  @param	DoliDb		$db      Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-    }
+	/**
+	 *  Constructor
+	 *
+	 *  @param	DoliDb		$db      Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
 
 
-    /**
-     *  Create object into database
-     *
-     *  @param	User	$user        User that creates
-     *  @param  int		$notrigger   0=launch triggers after, 1=disable triggers
-     *  @return int      		   	 <0 if KO, Id of created object if OK
-     */
-    public function create($user, $notrigger = 0)
-    {
-    	global $conf, $langs;
+	/**
+	 *  Create object into database
+	 *
+	 *  @param	User	$user        User that creates
+	 *  @param  int		$notrigger   0=launch triggers after, 1=disable triggers
+	 *  @return int      		   	 <0 if KO, Id of created object if OK
+	 */
+	public function create($user, $notrigger = 0)
+	{
+		global $conf, $langs;
 		$error = 0;
 
 		$now = dol_now();
@@ -195,7 +195,7 @@ class Cronjob extends CommonObject
 			$error++;
 		}
 
-        // Insert request
+		// Insert request
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."cronjob(";
 		$sql .= "entity,";
 		$sql .= "datec,";
@@ -261,42 +261,42 @@ class Cronjob extends CommonObject
 		$this->db->begin();
 
 	   	dol_syslog(get_class($this)."::create", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-    	if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+		$resql = $this->db->query($sql);
+		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
 		if (!$error)
-        {
-            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."cronjob");
-        }
+		{
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."cronjob");
+		}
 
-        // Commit or rollback
-        if ($error)
+		// Commit or rollback
+		if ($error)
 		{
 			foreach ($this->errors as $errmsg)
 			{
-	            dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
-	            $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
+				dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
 			return -1 * $error;
 		} else {
 			$this->db->commit();
-            return $this->id;
+			return $this->id;
 		}
-    }
+	}
 
 
-    /**
-     *  Load object in memory from the database
-     *
-     *  @param	int		$id    Id object
-     *  @return int          	<0 if KO, >0 if OK
-     */
-    public function fetch($id)
-    {
-        $sql = "SELECT";
-        $sql .= " t.rowid,";
-        $sql .= " t.entity,";
+	/**
+	 *  Load object in memory from the database
+	 *
+	 *  @param	int		$id    Id object
+	 *  @return int          	<0 if KO, >0 if OK
+	 */
+	public function fetch($id)
+	{
+		$sql = "SELECT";
+		$sql .= " t.rowid,";
+		$sql .= " t.entity,";
 		$sql .= " t.tms,";
 		$sql .= " t.datec,";
 		$sql .= " t.jobtype,";
@@ -327,19 +327,19 @@ class Cronjob extends CommonObject
 		$sql .= " t.maxrun,";
 		$sql .= " t.libname,";
 		$sql .= " t.test";
-        $sql .= " FROM ".MAIN_DB_PREFIX."cronjob as t";
-        $sql .= " WHERE t.rowid = ".$id;
+		$sql .= " FROM ".MAIN_DB_PREFIX."cronjob as t";
+		$sql .= " WHERE t.rowid = ".$id;
 
-    	dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            if ($this->db->num_rows($resql))
-            {
-                $obj = $this->db->fetch_object($resql);
+		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			if ($this->db->num_rows($resql))
+			{
+				$obj = $this->db->fetch_object($resql);
 
-                $this->id = $obj->rowid;
-                $this->ref = $obj->rowid;
+				$this->id = $obj->rowid;
+				$this->ref = $obj->rowid;
 				$this->entity = $obj->entity;
 				$this->tms = $this->db->jdate($obj->tms);
 				$this->datec = $this->db->jdate($obj->datec);
@@ -371,20 +371,20 @@ class Cronjob extends CommonObject
 				$this->maxrun = $obj->maxrun;
 				$this->libname = $obj->libname;
 				$this->test = $obj->test;
-            }
-            $this->db->free($resql);
+			}
+			$this->db->free($resql);
 
-            return 1;
-        } else {
-      	    $this->error = "Error ".$this->db->lasterror();
-            return -1;
-        }
-    }
+			return 1;
+		} else {
+	  		$this->error = "Error ".$this->db->lasterror();
+			return -1;
+		}
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Load object in memory from the database
-     *
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Load object in memory from the database
+	 *
 	 *  @param	string		$sortorder      sort order
 	 *  @param	string		$sortfield      sort field
 	 *  @param	int			$limit		    limit page
@@ -392,146 +392,146 @@ class Cronjob extends CommonObject
 	 *  @param	int			$status    	    display active or not
 	 *  @param	array		$filter    	    filter output
 	 *  @param  int         $processing     Processing or not
-     *  @return int          			    <0 if KO, >0 if OK
-     */
-    public function fetch_all($sortorder = 'DESC', $sortfield = 't.rowid', $limit = 0, $offset = 0, $status = 1, $filter = '', $processing = -1)
-    {
-        // phpcs:enable
-        global $langs;
+	 *  @return int          			    <0 if KO, >0 if OK
+	 */
+	public function fetch_all($sortorder = 'DESC', $sortfield = 't.rowid', $limit = 0, $offset = 0, $status = 1, $filter = '', $processing = -1)
+	{
+		// phpcs:enable
+		global $langs;
 
-    	$this->lines = array();
+		$this->lines = array();
 
-    	$sql = "SELECT";
-    	$sql .= " t.rowid,";
-    	$sql .= " t.entity,";
-    	$sql .= " t.tms,";
-    	$sql .= " t.datec,";
-    	$sql .= " t.jobtype,";
-    	$sql .= " t.label,";
-    	$sql .= " t.command,";
-    	$sql .= " t.classesname,";
-    	$sql .= " t.objectname,";
-    	$sql .= " t.methodename,";
-    	$sql .= " t.params,";
-    	$sql .= " t.md5params,";
-    	$sql .= " t.module_name,";
-    	$sql .= " t.priority,";
-    	$sql .= " t.datelastrun,";
-    	$sql .= " t.datenextrun,";
-    	$sql .= " t.dateend,";
-    	$sql .= " t.datestart,";
-    	$sql .= " t.lastresult,";
-    	$sql .= " t.datelastresult,";
-    	$sql .= " t.lastoutput,";
-    	$sql .= " t.unitfrequency,";
-    	$sql .= " t.frequency,";
-    	$sql .= " t.status,";
-    	$sql .= " t.processing,";
-    	$sql .= " t.fk_user_author,";
-    	$sql .= " t.fk_user_mod,";
-    	$sql .= " t.note as note_private,";
-    	$sql .= " t.nbrun,";
-    	$sql .= " t.libname,";
-    	$sql .= " t.test";
-    	$sql .= " FROM ".MAIN_DB_PREFIX."cronjob as t";
-    	$sql .= " WHERE 1 = 1";
-    	if ($processing >= 0) $sql .= " AND t.processing = ".(empty($processing) ? '0' : '1');
-    	if ($status >= 0 && $status < 2) $sql .= " AND t.status = ".(empty($status) ? '0' : '1');
-    	elseif ($status == 2) $sql .= " AND t.status = 2";
-    	//Manage filter
-    	if (is_array($filter) && count($filter) > 0) {
-    		foreach ($filter as $key => $value)
-    		{
-    		    if ($key == 't.rowid') $sql .= ' AND '.$key.' = '.$this->db->escape($value);
+		$sql = "SELECT";
+		$sql .= " t.rowid,";
+		$sql .= " t.entity,";
+		$sql .= " t.tms,";
+		$sql .= " t.datec,";
+		$sql .= " t.jobtype,";
+		$sql .= " t.label,";
+		$sql .= " t.command,";
+		$sql .= " t.classesname,";
+		$sql .= " t.objectname,";
+		$sql .= " t.methodename,";
+		$sql .= " t.params,";
+		$sql .= " t.md5params,";
+		$sql .= " t.module_name,";
+		$sql .= " t.priority,";
+		$sql .= " t.datelastrun,";
+		$sql .= " t.datenextrun,";
+		$sql .= " t.dateend,";
+		$sql .= " t.datestart,";
+		$sql .= " t.lastresult,";
+		$sql .= " t.datelastresult,";
+		$sql .= " t.lastoutput,";
+		$sql .= " t.unitfrequency,";
+		$sql .= " t.frequency,";
+		$sql .= " t.status,";
+		$sql .= " t.processing,";
+		$sql .= " t.fk_user_author,";
+		$sql .= " t.fk_user_mod,";
+		$sql .= " t.note as note_private,";
+		$sql .= " t.nbrun,";
+		$sql .= " t.libname,";
+		$sql .= " t.test";
+		$sql .= " FROM ".MAIN_DB_PREFIX."cronjob as t";
+		$sql .= " WHERE 1 = 1";
+		if ($processing >= 0) $sql .= " AND t.processing = ".(empty($processing) ? '0' : '1');
+		if ($status >= 0 && $status < 2) $sql .= " AND t.status = ".(empty($status) ? '0' : '1');
+		elseif ($status == 2) $sql .= " AND t.status = 2";
+		//Manage filter
+		if (is_array($filter) && count($filter) > 0) {
+			foreach ($filter as $key => $value)
+			{
+				if ($key == 't.rowid') $sql .= ' AND '.$key.' = '.$this->db->escape($value);
    				else $sql .= ' AND '.$key.' LIKE \'%'.$this->db->escape($value).'%\'';
-    		}
-    	}
+			}
+		}
 
-    	$sql .= $this->db->order($sortfield, $sortorder);
-    	if (!empty($limit) && !empty($offset)) {
-    		$sql .= $this->db->plimit($limit + 1, $offset);
-    	}
+		$sql .= $this->db->order($sortfield, $sortorder);
+		if (!empty($limit) && !empty($offset)) {
+			$sql .= $this->db->plimit($limit + 1, $offset);
+		}
 
-    	$sqlwhere = array();
+		$sqlwhere = array();
 
-    	if (count($sqlwhere) > 0) {
-    		$sql .= " WHERE ".implode(' AND ', $sqlwhere);
-    	}
+		if (count($sqlwhere) > 0) {
+			$sql .= " WHERE ".implode(' AND ', $sqlwhere);
+		}
 
-    	dol_syslog(get_class($this)."::fetch_all", LOG_DEBUG);
-    	$resql = $this->db->query($sql);
-    	if ($resql)
-    	{
-    		$num = $this->db->num_rows($resql);
-    		$i = 0;
+		dol_syslog(get_class($this)."::fetch_all", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$num = $this->db->num_rows($resql);
+			$i = 0;
 
-    		if ($num)
-    		{
-	    		while ($i < $num)
-	    		{
-	    			$line = new Cronjobline();
+			if ($num)
+			{
+				while ($i < $num)
+				{
+					$line = new Cronjobline();
 
-	    			$obj = $this->db->fetch_object($resql);
+					$obj = $this->db->fetch_object($resql);
 
-	    			$line->id = $obj->rowid;
-	    			$line->ref = $obj->rowid;
-	    			$line->entity = $obj->entity;
-	    			$line->tms = $this->db->jdate($obj->tms);
-	    			$line->datec = $this->db->jdate($obj->datec);
-	    			$line->label = $obj->label;
-	    			$line->jobtype = $obj->jobtype;
-	    			$line->command = $obj->command;
-	    			$line->classesname = $obj->classesname;
-	    			$line->objectname = $obj->objectname;
-	    			$line->methodename = $obj->methodename;
-	    			$line->params = $obj->params;
-	    			$line->md5params = $obj->md5params;
-	    			$line->module_name = $obj->module_name;
-	    			$line->priority = $obj->priority;
-	    			$line->datelastrun = $this->db->jdate($obj->datelastrun);
-	    			$line->datenextrun = $this->db->jdate($obj->datenextrun);
-	    			$line->dateend = $this->db->jdate($obj->dateend);
-	    			$line->datestart = $this->db->jdate($obj->datestart);
-	    			$line->lastresult = $obj->lastresult;
-	    			$line->datelastresult = $this->db->jdate($obj->datelastresult);
-	    			$line->lastoutput = $obj->lastoutput;
-	    			$line->unitfrequency = $obj->unitfrequency;
-	    			$line->frequency = $obj->frequency;
-	    			$line->status = $obj->status;
-	    			$line->processing = $obj->processing;
-	    			$line->fk_user_author = $obj->fk_user_author;
-	    			$line->fk_user_mod = $obj->fk_user_mod;
-	    			$line->note_private = $obj->note_private;
-	    			$line->nbrun = $obj->nbrun;
-	    			$line->libname = $obj->libname;
-	    			$line->test = $obj->test;
-	    			$this->lines[] = $line;
+					$line->id = $obj->rowid;
+					$line->ref = $obj->rowid;
+					$line->entity = $obj->entity;
+					$line->tms = $this->db->jdate($obj->tms);
+					$line->datec = $this->db->jdate($obj->datec);
+					$line->label = $obj->label;
+					$line->jobtype = $obj->jobtype;
+					$line->command = $obj->command;
+					$line->classesname = $obj->classesname;
+					$line->objectname = $obj->objectname;
+					$line->methodename = $obj->methodename;
+					$line->params = $obj->params;
+					$line->md5params = $obj->md5params;
+					$line->module_name = $obj->module_name;
+					$line->priority = $obj->priority;
+					$line->datelastrun = $this->db->jdate($obj->datelastrun);
+					$line->datenextrun = $this->db->jdate($obj->datenextrun);
+					$line->dateend = $this->db->jdate($obj->dateend);
+					$line->datestart = $this->db->jdate($obj->datestart);
+					$line->lastresult = $obj->lastresult;
+					$line->datelastresult = $this->db->jdate($obj->datelastresult);
+					$line->lastoutput = $obj->lastoutput;
+					$line->unitfrequency = $obj->unitfrequency;
+					$line->frequency = $obj->frequency;
+					$line->status = $obj->status;
+					$line->processing = $obj->processing;
+					$line->fk_user_author = $obj->fk_user_author;
+					$line->fk_user_mod = $obj->fk_user_mod;
+					$line->note_private = $obj->note_private;
+					$line->nbrun = $obj->nbrun;
+					$line->libname = $obj->libname;
+					$line->test = $obj->test;
+					$this->lines[] = $line;
 
-	    			$i++;
-	    		}
-    		}
-    		$this->db->free($resql);
+					$i++;
+				}
+			}
+			$this->db->free($resql);
 
-    		return 1;
-    	} else {
-    		$this->error = "Error ".$this->db->lasterror();
-    		return -1;
-    	}
-    }
+			return 1;
+		} else {
+			$this->error = "Error ".$this->db->lasterror();
+			return -1;
+		}
+	}
 
 
-    /**
-     *  Update object into database
-     *
-     *  @param	User	$user        User that modifies
-     *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
-     *  @return int     		   	 <0 if KO, >0 if OK
-     */
-    public function update($user = null, $notrigger = 0)
-    {
-    	global $conf, $langs;
+	/**
+	 *  Update object into database
+	 *
+	 *  @param	User	$user        User that modifies
+	 *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
+	 *  @return int     		   	 <0 if KO, >0 if OK
+	 */
+	public function update($user = null, $notrigger = 0)
+	{
+		global $conf, $langs;
 
-    	$langs->load('cron');
+		$langs->load('cron');
 
 		$error = 0;
 
@@ -553,11 +553,11 @@ class Cronjob extends CommonObject
 		if (isset($this->status)) $this->status = trim($this->status);
 		if (isset($this->note_private)) $this->note_private = trim($this->note_private);
 		if (isset($this->nbrun)) $this->nbrun = trim($this->nbrun);
-        if (isset($this->libname)) $this->libname = trim($this->libname);
-        if (isset($this->test)) $this->test = trim($this->test);
+		if (isset($this->libname)) $this->libname = trim($this->libname);
+		if (isset($this->test)) $this->test = trim($this->test);
 
 		if (empty($this->maxrun)) $this->maxrun = 0;
-        if (empty($this->processing)) $this->processing = 0;
+		if (empty($this->processing)) $this->processing = 0;
 
 		// Check parameters
 		// Put here code to add a control on parameters values
@@ -600,9 +600,9 @@ class Cronjob extends CommonObject
 		}
 
 
-        // Update request
-        $sql = "UPDATE ".MAIN_DB_PREFIX."cronjob SET";
-        $sql .= " entity=".(isset($this->entity) ? $this->db->escape($this->entity) : $conf->entity).",";
+		// Update request
+		$sql = "UPDATE ".MAIN_DB_PREFIX."cronjob SET";
+		$sql .= " entity=".(isset($this->entity) ? $this->db->escape($this->entity) : $conf->entity).",";
 		$sql .= " label=".(isset($this->label) ? "'".$this->db->escape($this->label)."'" : "null").",";
 		$sql .= " jobtype=".(isset($this->jobtype) ? "'".$this->db->escape($this->jobtype)."'" : "null").",";
 		$sql .= " command=".(isset($this->command) ? "'".$this->db->escape($this->command)."'" : "null").",";
@@ -632,19 +632,19 @@ class Cronjob extends CommonObject
 		$sql .= " test=".(isset($this->test) ? "'".$this->db->escape($this->test)."'" : "null");
 		$sql .= " WHERE rowid=".$this->id;
 
-        $this->db->begin();
+		$this->db->begin();
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-    	if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+		$resql = $this->db->query($sql);
+		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
-        // Commit or rollback
+		// Commit or rollback
 		if ($error)
 		{
 			foreach ($this->errors as $errmsg)
 			{
-	            dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
-	            $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
+				dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
 			return -1 * $error;
@@ -652,39 +652,39 @@ class Cronjob extends CommonObject
 			$this->db->commit();
 			return 1;
 		}
-    }
+	}
 
 
  	/**
-	 *  Delete object in database
-	 *
-     *	@param  User	$user        User that deletes
-     *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
-	 *  @return	int					 <0 if KO, >0 if OK
-	 */
-    public function delete($user, $notrigger = 0)
+ 	 *  Delete object in database
+ 	 *
+ 	 *	@param  User	$user        User that deletes
+ 	 *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
+ 	 *  @return	int					 <0 if KO, >0 if OK
+ 	 */
+	public function delete($user, $notrigger = 0)
 	{
 		$error = 0;
 
 		$this->db->begin();
 
-    	$sql = "DELETE FROM ".MAIN_DB_PREFIX."cronjob";
-    	$sql .= " WHERE rowid=".$this->id;
+		$sql = "DELETE FROM ".MAIN_DB_PREFIX."cronjob";
+		$sql .= " WHERE rowid=".$this->id;
 
-    	dol_syslog(get_class($this)."::delete", LOG_DEBUG);
-    	$resql = $this->db->query($sql);
-        if (!$resql) {
-            $error++;
-            $this->errors[] = "Error ".$this->db->lasterror();
-        }
+		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if (!$resql) {
+			$error++;
+			$this->errors[] = "Error ".$this->db->lasterror();
+		}
 
-        // Commit or rollback
+		// Commit or rollback
 		if ($error)
 		{
 			foreach ($this->errors as $errmsg)
 			{
-	            dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
-	            $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
+				dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
 			return -1 * $error;
@@ -788,7 +788,7 @@ class Cronjob extends CommonObject
 		$this->note_private = '';
 		$this->nbrun = '';
 		$this->maxrun = 100;
-        $this->libname = '';
+		$this->libname = '';
 	}
 
 
@@ -888,7 +888,7 @@ class Cronjob extends CommonObject
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Run a job.
 	 * Once job is finished, status and nb of run is updated.
@@ -899,7 +899,7 @@ class Cronjob extends CommonObject
 	 */
 	public function run_jobs($userlogin)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs, $conf, $hookmanager;
 
 		$hookmanager->initHooks(array('cron'));
@@ -999,24 +999,24 @@ class Cronjob extends CommonObject
 			// test if method exists
 			if (!$error)
 			{
-			    if (!method_exists($this->objectname, $this->methodename))
-			    {
-			        $this->error = $langs->trans('CronMethodDoesNotExists', $this->objectname, $this->methodename);
-    				dol_syslog(get_class($this)."::run_jobs ".$this->error, LOG_ERR);
-    				$this->lastoutput = $this->error;
-    				$this->lastresult = -1;
-    				$retval = $this->lastresult;
-    				$error++;
-			    }
-			    if (in_array(strtolower(trim($this->methodename)), array('executecli')))
-			    {
-			    	$this->error = $langs->trans('CronMethodNotAllowed', $this->methodename, $this->objectname);
-			    	dol_syslog(get_class($this)."::run_jobs ".$this->error, LOG_ERR);
-			    	$this->lastoutput = $this->error;
-			    	$this->lastresult = -1;
-			    	$retval = $this->lastresult;
-			    	$error++;
-			    }
+				if (!method_exists($this->objectname, $this->methodename))
+				{
+					$this->error = $langs->trans('CronMethodDoesNotExists', $this->objectname, $this->methodename);
+					dol_syslog(get_class($this)."::run_jobs ".$this->error, LOG_ERR);
+					$this->lastoutput = $this->error;
+					$this->lastresult = -1;
+					$retval = $this->lastresult;
+					$error++;
+				}
+				if (in_array(strtolower(trim($this->methodename)), array('executecli')))
+				{
+					$this->error = $langs->trans('CronMethodNotAllowed', $this->methodename, $this->objectname);
+					dol_syslog(get_class($this)."::run_jobs ".$this->error, LOG_ERR);
+					$this->lastoutput = $this->error;
+					$this->lastresult = -1;
+					$retval = $this->lastresult;
+					$error++;
+				}
 			}
 
 			// Load langs
@@ -1031,8 +1031,8 @@ class Cronjob extends CommonObject
 					$this->error = $langs->error;
 					$this->lastoutput = $this->error;
 					$this->lastresult = -1;
-	                $retval = $this->lastresult;
-	                $error++;
+					$retval = $this->lastresult;
+					$error++;
 				}
 			}
 
@@ -1055,23 +1055,23 @@ class Cronjob extends CommonObject
 
 				if ($result === false || (!is_bool($result) && $result != 0))
 				{
-				    $langs->load("errors");
+					$langs->load("errors");
 
-				    $errmsg = '';
-				    if (!is_array($object->errors) || !in_array($object->error, $object->errors)) $errmsg .= $object->error;
-				    if (is_array($object->errors) && count($object->errors)) $errmsg .= (($errmsg ? ', ' : '').join(', ', $object->errors));
-				    if (empty($errmsg)) $errmsg = $langs->trans('ErrorUnknown');
+					$errmsg = '';
+					if (!is_array($object->errors) || !in_array($object->error, $object->errors)) $errmsg .= $object->error;
+					if (is_array($object->errors) && count($object->errors)) $errmsg .= (($errmsg ? ', ' : '').join(', ', $object->errors));
+					if (empty($errmsg)) $errmsg = $langs->trans('ErrorUnknown');
 
-				    dol_syslog(get_class($this)."::run_jobs END result=".$result." error=".$errmsg, LOG_ERR);
+					dol_syslog(get_class($this)."::run_jobs END result=".$result." error=".$errmsg, LOG_ERR);
 
-				    $this->error = $errmsg;
-				    $this->lastoutput = ($object->output ? $object->output."\n" : "").$errmsg;
+					$this->error = $errmsg;
+					$this->lastoutput = ($object->output ? $object->output."\n" : "").$errmsg;
 					$this->lastresult = is_numeric($result) ? $result : -1;
-		            $retval = $this->lastresult;
-		            $error++;
+					$retval = $this->lastresult;
+					$error++;
 				} else {
 					dol_syslog(get_class($this)."::run_jobs END");
-				    $this->lastoutput = $object->output;
+					$this->lastoutput = $object->output;
 					$this->lastresult = var_export($result, true);
 					$retval = $this->lastresult;
 				}
@@ -1111,17 +1111,17 @@ class Cronjob extends CommonObject
 
 			if ($result === false || (!is_bool($result) && $result != 0))
 			{
-			    $langs->load("errors");
-			    dol_syslog(get_class($this)."::run_jobs result=".$result, LOG_ERR);
-			    $this->error = $langs->trans('ErrorUnknown');
-			    $this->lastoutput = $this->error;
-			    $this->lastresult = is_numeric($result) ? $result : -1;
-			    $retval = $this->lastresult;
-			    $error++;
+				$langs->load("errors");
+				dol_syslog(get_class($this)."::run_jobs result=".$result, LOG_ERR);
+				$this->error = $langs->trans('ErrorUnknown');
+				$this->lastoutput = $this->error;
+				$this->lastresult = is_numeric($result) ? $result : -1;
+				$retval = $this->lastresult;
+				$error++;
 			} else {
-                $this->lastoutput = var_export($result, true);
-                $this->lastresult = var_export($result, true); // Return code
-                $retval = $this->lastresult;
+				$this->lastoutput = var_export($result, true);
+				$this->lastresult = var_export($result, true); // Return code
+				$retval = $this->lastresult;
 			}
 		}
 
@@ -1174,7 +1174,7 @@ class Cronjob extends CommonObject
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Reprogram a job
 	 *
@@ -1184,7 +1184,7 @@ class Cronjob extends CommonObject
 	 */
 	public function reprogram_jobs($userlogin, $now)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		dol_syslog(get_class($this)."::reprogram_jobs userlogin:$userlogin", LOG_DEBUG);
 
 		require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
@@ -1214,28 +1214,28 @@ class Cronjob extends CommonObject
 
 		if ($this->datenextrun < $now && $this->frequency > 0 && $this->unitfrequency > 0)
 		{
-		    // Loop until date is after future
-		    while ($this->datenextrun < $now)
-		    {
-		        $this->datenextrun += ($this->frequency * $this->unitfrequency);
+			// Loop until date is after future
+			while ($this->datenextrun < $now)
+			{
+				$this->datenextrun += ($this->frequency * $this->unitfrequency);
 
-		        // TODO For exact frequency (every month, every year, ...), use instead a dol_time_plus_duree($time, $duration_value, $duration_unit)
-		    }
+				// TODO For exact frequency (every month, every year, ...), use instead a dol_time_plus_duree($time, $duration_value, $duration_unit)
+			}
 		} else {
 			//$this->datenextrun=$this->datenextrun + ($this->frequency * $this->unitfrequency);
-		    dol_syslog(get_class($this)."::reprogram_jobs datenextrun is already in future, we do not change it");
+			dol_syslog(get_class($this)."::reprogram_jobs datenextrun is already in future, we do not change it");
 		}
 
 
 		// Archive job
 		if ($this->autodelete == 2)
 		{
-		    if (($this->maxrun > 0 && ($this->nbrun >= $this->maxrun))
-		        || ($this->dateend && ($this->datenextrun > $this->dateend)))
-		    {
-		        $this->status = 2;
-		        dol_syslog(get_class($this)."::reprogram_jobs Job will be set to archived", LOG_ERR);
-		    }
+			if (($this->maxrun > 0 && ($this->nbrun >= $this->maxrun))
+				|| ($this->dateend && ($this->datenextrun > $this->dateend)))
+			{
+				$this->status = 2;
+				dol_syslog(get_class($this)."::reprogram_jobs Job will be set to archived", LOG_ERR);
+			}
 		}
 
 		$result = $this->update($user);
@@ -1256,10 +1256,10 @@ class Cronjob extends CommonObject
 	 */
 	public function getLibStatut($mode = 0)
 	{
-	    return $this->LibStatut($this->status, $mode, $this->processing, $this->lastresult);
+		return $this->LibStatut($this->status, $mode, $this->processing, $this->lastresult);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Renvoi le libelle d'un statut donne
 	 *
@@ -1269,7 +1269,7 @@ class Cronjob extends CommonObject
 	 *  @param	int		$lastresult		Value of last result (0=no error, error otherwise)
 	 *  @return string 			       	Label of status
 	 */
-    public function LibStatut($status, $mode = 0, $processing = 0, $lastresult = 0)
+	public function LibStatut($status, $mode = 0, $processing = 0, $lastresult = 0)
 	{
 		// phpcs:enable
 		$this->labelStatus = array(); // Force reset o array because label depends on other fields
@@ -1296,7 +1296,7 @@ class Cronjob extends CommonObject
 		if ($this->lastresult) $statusType = 'status8';
 
 		return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode);
-    }
+	}
 }
 
 
@@ -1320,9 +1320,9 @@ class Cronjobline
 	public $datec = '';
 
 	/**
-     * @var string Cron Job Line label
-     */
-    public $label;
+	 * @var string Cron Job Line label
+	 */
+	public $label;
 
 	public $jobtype;
 	public $command;
@@ -1348,13 +1348,13 @@ class Cronjobline
 	public $status;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_user_author;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_user_mod;
 
 	public $note;
diff --git a/htdocs/cron/list.php b/htdocs/cron/list.php
index cea8ce39016..ec1143cd89a 100644
--- a/htdocs/cron/list.php
+++ b/htdocs/cron/list.php
@@ -128,47 +128,47 @@ if (empty($reshook))
 	// Execute jobs
 	if ($action == 'confirm_execute' && $confirm == "yes" && $user->rights->cron->execute)
 	{
-	    if (!empty($conf->global->CRON_KEY) && $conf->global->CRON_KEY != $securitykey)
-	    {
-	        setEventMessages('Security key '.$securitykey.' is wrong', null, 'errors');
-	        $action = '';
-	    } else {
-	        $object = new Cronjob($db);
-	    	$job = $object->fetch($id);
+		if (!empty($conf->global->CRON_KEY) && $conf->global->CRON_KEY != $securitykey)
+		{
+			setEventMessages('Security key '.$securitykey.' is wrong', null, 'errors');
+			$action = '';
+		} else {
+			$object = new Cronjob($db);
+			$job = $object->fetch($id);
 
-	        $now = dol_now(); // Date we start
+			$now = dol_now(); // Date we start
 
-	        $resrunjob = $object->run_jobs($user->login); // Return -1 if KO, 1 if OK
-	    	if ($resrunjob < 0) {
-	    		setEventMessages($object->error, $object->errors, 'errors');
-	    	}
+			$resrunjob = $object->run_jobs($user->login); // Return -1 if KO, 1 if OK
+			if ($resrunjob < 0) {
+				setEventMessages($object->error, $object->errors, 'errors');
+			}
 
-	    	// Programm next run
-	    	$res = $object->reprogram_jobs($user->login, $now);
-	    	if ($res > 0)
-	    	{
-	    		if ($resrunjob >= 0)	// We show the result of reprogram only if no error message already reported
-	    		{
-	    		    if ($object->lastresult >= 0) setEventMessages($langs->trans("JobFinished"), null, 'mesgs');
-	    		    else setEventMessages($langs->trans("JobFinished"), null, 'errors');
-	    		}
-	    		$action = '';
-	    	} else {
-	    		setEventMessages($object->error, $object->errors, 'errors');
-	    		$action = '';
-	    	}
+			// Programm next run
+			$res = $object->reprogram_jobs($user->login, $now);
+			if ($res > 0)
+			{
+				if ($resrunjob >= 0)	// We show the result of reprogram only if no error message already reported
+				{
+					if ($object->lastresult >= 0) setEventMessages($langs->trans("JobFinished"), null, 'mesgs');
+					else setEventMessages($langs->trans("JobFinished"), null, 'errors');
+				}
+				$action = '';
+			} else {
+				setEventMessages($object->error, $object->errors, 'errors');
+				$action = '';
+			}
 
-	    	$param = '&search_status='.urlencode($search_status);
-	    	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
-	    	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
-	    	if ($search_label)	  $param .= '&search_label='.urlencode($search_label);
-	    	if ($optioncss != '') $param .= '&optioncss='.urlencode($optioncss);
-	    	// Add $param from extra fields
-	    	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
+			$param = '&search_status='.urlencode($search_status);
+			if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
+			if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
+			if ($search_label)	  $param .= '&search_label='.urlencode($search_label);
+			if ($optioncss != '') $param .= '&optioncss='.urlencode($optioncss);
+			// Add $param from extra fields
+			include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 
-	    	header("Location: ".DOL_URL_ROOT.'/cron/list.php?'.$param.($sortfield ? '&sortfield='.$sortfield : '').($sortorder ? '&sortorder='.$sortorder : '')); // Make a redirect to avoid to run twice the job when using back
-	    	exit;
-	    }
+			header("Location: ".DOL_URL_ROOT.'/cron/list.php?'.$param.($sortfield ? '&sortfield='.$sortfield : '').($sortorder ? '&sortorder='.$sortorder : '')); // Make a redirect to avoid to run twice the job when using back
+			exit;
+		}
 	}
 
 	// Mass actions
@@ -273,13 +273,13 @@ $sql .= $db->order($sortfield, $sortorder);
 $nbtotalofrecords = '';
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
-    $result = $db->query($sql);
-    $nbtotalofrecords = $db->num_rows($result);
-    if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
-    {
-    	$page = 0;
-    	$offset = 0;
-    }
+	$result = $db->query($sql);
+	$nbtotalofrecords = $db->num_rows($result);
+	if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+	{
+		$page = 0;
+		$offset = 0;
+	}
 }
 
 $sql .= $db->plimit($limit + 1, $offset);
@@ -449,7 +449,7 @@ if ($num > 0)
 		print '<td>';
 		if ($obj->jobtype == 'method')
 		{
-		    $text = $langs->trans("CronClass");
+			$text = $langs->trans("CronClass");
 			$texttoshow = $langs->trans('CronModule').': '.$obj->module_name.'<br>';
 			$texttoshow .= $langs->trans('CronClass').': '.$obj->classesname.'<br>';
 			$texttoshow .= $langs->trans('CronObject').': '.$obj->objectname.'<br>';
@@ -494,8 +494,8 @@ if ($num > 0)
 		// Duration
 		print '<td class="center">';
 		if (!empty($datelastresult) && ($datelastresult >= $datelastrun)) {
-		    print convertSecondToTime(max($datelastresult - $datelastrun, 1), 'allhourminsec');
-		    //print '<br>'.($datelastresult - $datelastrun).' '.$langs->trans("seconds");
+			print convertSecondToTime(max($datelastresult - $datelastrun, 1), 'allhourminsec');
+			//print '<br>'.($datelastresult - $datelastrun).' '.$langs->trans("seconds");
 		}
 		print '</td>';
 
diff --git a/htdocs/datapolicy/admin/setup.php b/htdocs/datapolicy/admin/setup.php
index f8c38bf5b6b..0e84aa63723 100644
--- a/htdocs/datapolicy/admin/setup.php
+++ b/htdocs/datapolicy/admin/setup.php
@@ -41,25 +41,25 @@ $backtopage = GETPOST('backtopage', 'alpha');
 
 $arrayofparameters = array();
 $arrayofparameters['ThirdParty'] = array(
-    'DATAPOLICY_TIERS_CLIENT'=>array('css'=>'minwidth200'),
-    'DATAPOLICY_TIERS_PROSPECT'=>array('css'=>'minwidth200'),
-    'DATAPOLICY_TIERS_PROSPECT_CLIENT'=>array('css'=>'minwidth200'),
-    'DATAPOLICY_TIERS_NIPROSPECT_NICLIENT'=>array('css'=>'minwidth200'),
-    'DATAPOLICY_TIERS_FOURNISSEUR'=>array('css'=>'minwidth200'),
+	'DATAPOLICY_TIERS_CLIENT'=>array('css'=>'minwidth200'),
+	'DATAPOLICY_TIERS_PROSPECT'=>array('css'=>'minwidth200'),
+	'DATAPOLICY_TIERS_PROSPECT_CLIENT'=>array('css'=>'minwidth200'),
+	'DATAPOLICY_TIERS_NIPROSPECT_NICLIENT'=>array('css'=>'minwidth200'),
+	'DATAPOLICY_TIERS_FOURNISSEUR'=>array('css'=>'minwidth200'),
 );
 if (!empty($conf->global->DATAPOLICY_USE_SPECIFIC_DELAY_FOR_CONTACT)) {
-    $arrayofparameters['Contact'] = array(
-        'DATAPOLICY_CONTACT_CLIENT'=>array('css'=>'minwidth200'),
-        'DATAPOLICY_CONTACT_PROSPECT'=>array('css'=>'minwidth200'),
-        'DATAPOLICY_CONTACT_PROSPECT_CLIENT'=>array('css'=>'minwidth200'),
-        'DATAPOLICY_CONTACT_NIPROSPECT_NICLIENT'=>array('css'=>'minwidth200'),
-        'DATAPOLICY_CONTACT_FOURNISSEUR'=>array('css'=>'minwidth200'),
-    );
+	$arrayofparameters['Contact'] = array(
+		'DATAPOLICY_CONTACT_CLIENT'=>array('css'=>'minwidth200'),
+		'DATAPOLICY_CONTACT_PROSPECT'=>array('css'=>'minwidth200'),
+		'DATAPOLICY_CONTACT_PROSPECT_CLIENT'=>array('css'=>'minwidth200'),
+		'DATAPOLICY_CONTACT_NIPROSPECT_NICLIENT'=>array('css'=>'minwidth200'),
+		'DATAPOLICY_CONTACT_FOURNISSEUR'=>array('css'=>'minwidth200'),
+	);
 }
 if (!empty($conf->adherent->enabled)) {
-    $arrayofparameters['Member'] = array(
-        'DATAPOLICY_ADHERENT'=>array('css'=>'minwidth200'),
-    );
+	$arrayofparameters['Member'] = array(
+		'DATAPOLICY_ADHERENT'=>array('css'=>'minwidth200'),
+	);
 }
 
 
@@ -71,16 +71,16 @@ if (!empty($conf->adherent->enabled)) {
 include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
 
 $valTab = array(
-    '' => $langs->trans('Never'),
-    '6' => $langs->trans('NB_MONTHS', 6),
-    '12' => $langs->trans('ONE_YEAR'),
-    '24' => $langs->trans('NB_YEARS', 2),
-    '36' => $langs->trans('NB_YEARS', 3),
-    '48' => $langs->trans('NB_YEARS', 4),
-    '60' => $langs->trans('NB_YEARS', 5),
-    '120' => $langs->trans('NB_YEARS', 10),
-    '180' => $langs->trans('NB_YEARS', 15),
-    '240' => $langs->trans('NB_YEARS', 20),
+	'' => $langs->trans('Never'),
+	'6' => $langs->trans('NB_MONTHS', 6),
+	'12' => $langs->trans('ONE_YEAR'),
+	'24' => $langs->trans('NB_YEARS', 2),
+	'36' => $langs->trans('NB_YEARS', 3),
+	'48' => $langs->trans('NB_YEARS', 4),
+	'60' => $langs->trans('NB_YEARS', 5),
+	'120' => $langs->trans('NB_YEARS', 10),
+	'180' => $langs->trans('NB_YEARS', 15),
+	'240' => $langs->trans('NB_YEARS', 20),
 );
 
 
@@ -106,65 +106,65 @@ echo '<span class="opacitymedium">'.$langs->trans("datapolicySetupPage").'</span
 
 if ($action == 'edit')
 {
-    print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    print '<input type="hidden" name="action" value="update">';
+	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="action" value="update">';
 
-    print '<table class="noborder centpercent">';
-    print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
+	print '<table class="noborder centpercent">';
+	print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
 
-    foreach ($arrayofparameters as $title => $tab)
-    {
-        print '<tr class="trforbreak"><td class="titlefield trforbreak" colspan="2">'.$langs->trans($title).'</td></tr>';
-        foreach ($tab as $key => $val)
-        {
-            print '<tr class="oddeven"><td>';
-            print $form->textwithpicto($langs->trans($key), $langs->trans($key.'Tooltip'));
-            print '</td><td>';
-            print '<select name="'.$key.'"  class="flat '.(empty($val['css']) ? 'minwidth200' : $val['css']).'">';
-            foreach ($valTab as $key1 => $val1) {
-                print '<option value="'.$key1.'" '.($conf->global->$key == $key1 ? 'selected="selected"' : '').'>';
-                print $val1;
-                print '</option>';
-            }
-            print '</select>';
-            print '</td></tr>';
-        }
-    }
+	foreach ($arrayofparameters as $title => $tab)
+	{
+		print '<tr class="trforbreak"><td class="titlefield trforbreak" colspan="2">'.$langs->trans($title).'</td></tr>';
+		foreach ($tab as $key => $val)
+		{
+			print '<tr class="oddeven"><td>';
+			print $form->textwithpicto($langs->trans($key), $langs->trans($key.'Tooltip'));
+			print '</td><td>';
+			print '<select name="'.$key.'"  class="flat '.(empty($val['css']) ? 'minwidth200' : $val['css']).'">';
+			foreach ($valTab as $key1 => $val1) {
+				print '<option value="'.$key1.'" '.($conf->global->$key == $key1 ? 'selected="selected"' : '').'>';
+				print $val1;
+				print '</option>';
+			}
+			print '</select>';
+			print '</td></tr>';
+		}
+	}
 
-    print '</table>';
+	print '</table>';
 
-    print '<br><div class="center">';
-    print '<input class="button" type="submit" value="'.$langs->trans("Save").'">';
-    print '</div>';
+	print '<br><div class="center">';
+	print '<input class="button" type="submit" value="'.$langs->trans("Save").'">';
+	print '</div>';
 
-    print '</form>';
-    print '<br>';
+	print '</form>';
+	print '<br>';
 } else {
-    print '<table class="noborder centpercent">';
-    print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
+	print '<table class="noborder centpercent">';
+	print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
 
-    foreach ($arrayofparameters as $title => $tab)
-    {
-        print '<tr class="trforbreak"><td class="titlefield trforbreak" colspan="2">'.$langs->trans($title).'</td></tr>';
-        foreach ($tab as $key => $val)
-        {
-            print '<tr class="oddeven"><td>';
-            print $form->textwithpicto($langs->trans($key), $langs->trans('DATAPOLICY_Tooltip_SETUP'));
-            print '</td><td>'.($conf->global->$key == '' ? $langs->trans('None') : $valTab[$conf->global->$key]).'</td></tr>';
-        }
-    }
+	foreach ($arrayofparameters as $title => $tab)
+	{
+		print '<tr class="trforbreak"><td class="titlefield trforbreak" colspan="2">'.$langs->trans($title).'</td></tr>';
+		foreach ($tab as $key => $val)
+		{
+			print '<tr class="oddeven"><td>';
+			print $form->textwithpicto($langs->trans($key), $langs->trans('DATAPOLICY_Tooltip_SETUP'));
+			print '</td><td>'.($conf->global->$key == '' ? $langs->trans('None') : $valTab[$conf->global->$key]).'</td></tr>';
+		}
+	}
 
-    print '</table>';
+	print '</table>';
 
-    print '<div class="tabsAction">';
-    print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit">'.$langs->trans("Modify").'</a>';
-    print '</div>';
+	print '<div class="tabsAction">';
+	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit">'.$langs->trans("Modify").'</a>';
+	print '</div>';
 }
 
 
 // Page end
-dol_fiche_end();
+print dol_get_fiche_end();
 
 llxFooter();
 $db->close();
diff --git a/htdocs/datapolicy/admin/setupmail.php b/htdocs/datapolicy/admin/setupmail.php
index 241dd9dace5..7076608898e 100644
--- a/htdocs/datapolicy/admin/setupmail.php
+++ b/htdocs/datapolicy/admin/setupmail.php
@@ -153,7 +153,7 @@ print '<br><center><input type="submit" class="button" value="'.$langs->trans("M
 
 print '</form>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '<br><br>';
 
diff --git a/htdocs/datapolicy/class/actions_datapolicy.class.php b/htdocs/datapolicy/class/actions_datapolicy.class.php
index 74c254d395f..1eb2ea9701b 100644
--- a/htdocs/datapolicy/class/actions_datapolicy.class.php
+++ b/htdocs/datapolicy/class/actions_datapolicy.class.php
@@ -27,317 +27,317 @@
  */
 class ActionsDatapolicy
 {
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    /**
-     * @var string Error
-     */
-    public $error = '';
+	/**
+	 * @var string Error
+	 */
+	public $error = '';
 
-    /**
-     * @var array Errors
-     */
-    public $errors = array();
+	/**
+	 * @var array Errors
+	 */
+	public $errors = array();
 
-    /**
-     * @var array Hook results. Propagated to $hookmanager->resArray for later reuse
-     */
-    public $results = array();
+	/**
+	 * @var array Hook results. Propagated to $hookmanager->resArray for later reuse
+	 */
+	public $results = array();
 
-    /**
-     * @var string String displayed by executeHook() immediately after return
-     */
-    public $resprints;
+	/**
+	 * @var string String displayed by executeHook() immediately after return
+	 */
+	public $resprints;
 
-    /**
-     * Constructor
-     *
-     *  @param  DoliDB      $db      Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-    }
+	/**
+	 * Constructor
+	 *
+	 *  @param  DoliDB      $db      Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
 
-    /**
-     * Execute action
-     *
-     * @param   array           $parameters		Array of parameters
-     * @param   CommonObject    $object         The object to process (an invoice if you are in invoice module, a propale in propale's module, etc...)
-     * @param   string          $action      	'add', 'update', 'view'
-     * @return  int         					<0 if KO,
-     *                           				=0 if OK but we want to process standard actions too,
-     *                            				>0 if OK and we want to replace standard actions.
-     */
-    public function getNomUrl($parameters, &$object, &$action)
-    {
-        global $db, $langs, $conf, $user;
-        $this->resprints = '';
-        return 0;
-    }
+	/**
+	 * Execute action
+	 *
+	 * @param   array           $parameters		Array of parameters
+	 * @param   CommonObject    $object         The object to process (an invoice if you are in invoice module, a propale in propale's module, etc...)
+	 * @param   string          $action      	'add', 'update', 'view'
+	 * @return  int         					<0 if KO,
+	 *                           				=0 if OK but we want to process standard actions too,
+	 *                            				>0 if OK and we want to replace standard actions.
+	 */
+	public function getNomUrl($parameters, &$object, &$action)
+	{
+		global $db, $langs, $conf, $user;
+		$this->resprints = '';
+		return 0;
+	}
 
-    /**
-     * Overloading the doActions function : replacing the parent's function with the one below
-     *
-     * @param   array           $parameters     Hook metadatas (context, etc...)
-     * @param   CommonObject    $object         The object to process (an invoice if you are in invoice module, a propale in propale's module, etc...)
-     * @param   string          $action         Current action (if set). Generally create or edit or null
-     * @param   HookManager     $hookmanager    Hook manager propagated to allow calling another hook
-     * @return  int                             < 0 on error, 0 on success, 1 to replace standard code
-     */
-    public function doActions($parameters, &$object, &$action, $hookmanager)
-    {
-        global $conf, $user, $langs;
-        $langs->load('datapolicy@datapolicy');
-        $error = 0; // Error counter
+	/**
+	 * Overloading the doActions function : replacing the parent's function with the one below
+	 *
+	 * @param   array           $parameters     Hook metadatas (context, etc...)
+	 * @param   CommonObject    $object         The object to process (an invoice if you are in invoice module, a propale in propale's module, etc...)
+	 * @param   string          $action         Current action (if set). Generally create or edit or null
+	 * @param   HookManager     $hookmanager    Hook manager propagated to allow calling another hook
+	 * @return  int                             < 0 on error, 0 on success, 1 to replace standard code
+	 */
+	public function doActions($parameters, &$object, &$action, $hookmanager)
+	{
+		global $conf, $user, $langs;
+		$langs->load('datapolicy@datapolicy');
+		$error = 0; // Error counter
 
-        if (GETPOST('socid') && $parameters['currentcontext'] == 'thirdpartycard') {
-            $object->fetch(GETPOST('socid'));
-        }
+		if (GETPOST('socid') && $parameters['currentcontext'] == 'thirdpartycard') {
+			$object->fetch(GETPOST('socid'));
+		}
 
-        // FIXME Removed hard coded id, use codes
-        if ($parameters['currentcontext'] == 'thirdpartycard' && $action == 'anonymiser' && (in_array($object->forme_juridique_code, array(11, 12, 13, 15, 17, 18, 19, 35, 60, 200, 311, 312, 316, 401, 600, 700, 1005)) || $object->typent_id == 8)) {
-            // on verifie si l'objet est utilisé
-            if ($object->isObjectUsed(GETPOST('socid'))) {
-                $object->name = $langs->trans('ANONYME');
-                $object->name_bis = '';
-                $object->name_alias = '';
-                $object->address = '';
-                $object->town = '';
-                $object->zip = '';
-                $object->phone = '';
-                $object->email = '';
-                $object->url = '';
-                $object->fax = '';
-                $object->state = '';
-                $object->country = '';
-                $object->state_id = '';
-                $object->skype = '';
-                $object->country_id = '';
-                $object->note_private = $object->note_private.'<br/>'.$langs->trans('ANONYMISER_AT', dol_print_date(time()));
+		// FIXME Removed hard coded id, use codes
+		if ($parameters['currentcontext'] == 'thirdpartycard' && $action == 'anonymiser' && (in_array($object->forme_juridique_code, array(11, 12, 13, 15, 17, 18, 19, 35, 60, 200, 311, 312, 316, 401, 600, 700, 1005)) || $object->typent_id == 8)) {
+			// on verifie si l'objet est utilisé
+			if ($object->isObjectUsed(GETPOST('socid'))) {
+				$object->name = $langs->trans('ANONYME');
+				$object->name_bis = '';
+				$object->name_alias = '';
+				$object->address = '';
+				$object->town = '';
+				$object->zip = '';
+				$object->phone = '';
+				$object->email = '';
+				$object->url = '';
+				$object->fax = '';
+				$object->state = '';
+				$object->country = '';
+				$object->state_id = '';
+				$object->skype = '';
+				$object->country_id = '';
+				$object->note_private = $object->note_private.'<br/>'.$langs->trans('ANONYMISER_AT', dol_print_date(time()));
 
-                if ($object->update($object->id, $user, 0)) {
-                    // On supprime les contacts associé
-                    $sql = "DELETE FROM ".MAIN_DB_PREFIX."socpeople WHERE fk_soc = ".$object->id;
-                    $this->db->query($sql);
+				if ($object->update($object->id, $user, 0)) {
+					// On supprime les contacts associé
+					$sql = "DELETE FROM ".MAIN_DB_PREFIX."socpeople WHERE fk_soc = ".$object->id;
+					$this->db->query($sql);
 
-                    setEventMessages($langs->trans('ANONYMISER_SUCCESS'), array());
-                    header('Location:'.$_SERVER["PHP_SELF"]."?socid=".$object->id);
-                }
-            }
-        } elseif ($parameters['currentcontext'] == 'thirdpartycard' && $action == 'datapolicy_portabilite') {
-            header('Content-Type: application/csv');
-            header('Content-Disposition: attachment; filename=datapolicy_portabilite.csv');
-            header('Pragma: no-cache');
-            $object->fetch(GETPOST('socid'));
-            echo 'Name;Fistname;Civility;Thirdparty;Function;Address;ZipCode;City;Department;Country;Email;Pro Phone;Perso Phone;Mobile Phone;Instant Mail;Birthday;'.PHP_EOL;
-            echo $object->name.';';
-            echo ';';
-            echo ';';
-            echo ';';
-            echo ';';
-            echo $object->address.';';
-            echo $object->zip.';';
-            echo $object->town.';';
-            echo $object->state.';';
-            echo $object->country.';';
-            echo $object->email.';';
-            echo $object->phone.';';
-            echo ';';
-            echo ';';
-            echo $object->skype.';';
-            echo ';';
-            exit;
-        } elseif ($parameters['currentcontext'] == 'membercard' && $action == 'datapolicy_portabilite') {
-            header('Content-Type: application/csv');
-            header('Content-Disposition: attachment; filename=datapolicy_portabilite.csv');
-            header('Pragma: no-cache');
-            $soc = $object->fetch_thirdparty();
+					setEventMessages($langs->trans('ANONYMISER_SUCCESS'), array());
+					header('Location:'.$_SERVER["PHP_SELF"]."?socid=".$object->id);
+				}
+			}
+		} elseif ($parameters['currentcontext'] == 'thirdpartycard' && $action == 'datapolicy_portabilite') {
+			header('Content-Type: application/csv');
+			header('Content-Disposition: attachment; filename=datapolicy_portabilite.csv');
+			header('Pragma: no-cache');
+			$object->fetch(GETPOST('socid'));
+			echo 'Name;Fistname;Civility;Thirdparty;Function;Address;ZipCode;City;Department;Country;Email;Pro Phone;Perso Phone;Mobile Phone;Instant Mail;Birthday;'.PHP_EOL;
+			echo $object->name.';';
+			echo ';';
+			echo ';';
+			echo ';';
+			echo ';';
+			echo $object->address.';';
+			echo $object->zip.';';
+			echo $object->town.';';
+			echo $object->state.';';
+			echo $object->country.';';
+			echo $object->email.';';
+			echo $object->phone.';';
+			echo ';';
+			echo ';';
+			echo $object->skype.';';
+			echo ';';
+			exit;
+		} elseif ($parameters['currentcontext'] == 'membercard' && $action == 'datapolicy_portabilite') {
+			header('Content-Type: application/csv');
+			header('Content-Disposition: attachment; filename=datapolicy_portabilite.csv');
+			header('Pragma: no-cache');
+			$soc = $object->fetch_thirdparty();
 
-            echo 'Name;Fistname;Civility;Thirdparty;Function;Address;ZipCode;City;Department;Country;Email;Pro Phone;Perso Phone;Mobile Phone;Instant Mail;Birthday;'.PHP_EOL;
-            echo $object->lastname.';';
-            echo $object->firstname.';';
-            echo $object->getCivilityLabel().';';
-            echo ($soc != -1 ? $object->thirdparty->name : '').';';
-            echo ';';
-            echo $object->address.';';
-            echo $object->zip.';';
-            echo $object->town.';';
-            echo $object->state.';';
-            echo $object->country.';';
-            echo $object->email.';';
-            echo $object->phone.';';
-            echo $object->phone_perso.';';
-            echo $object->phone_mobile.';';
-            echo $object->skype.';';
-            echo dol_print_date($object->birth).';';
-            exit;
-        } elseif ($parameters['currentcontext'] == 'contactcard' && $action == 'datapolicy_portabilite') {
-            $object->fetch(GETPOST('id'));
-            header('Content-Type: application/csv');
-            header('Content-Disposition: attachment; filename=datapolicy_portabilite.csv');
-            header('Pragma: no-cache');
-            $soc = $object->fetch_thirdparty();
-            echo 'Name;Fistname;Civility;Thirdparty;Function;Address;ZipCode;City;Department;Country;Email;Pro Phone;Perso Phone;Mobile Phone;Instant Mail;Birthday;'.PHP_EOL;
-            echo $object->lastname.';';
-            echo $object->firstname.';';
-            echo $object->getCivilityLabel().';';
-            echo ($soc != -1 ? $object->thirdparty->name : '').';';
-            echo $object->poste.';';
-            echo $object->address.';';
-            echo $object->zip.';';
-            echo $object->town.';';
-            echo $object->state.';';
-            echo $object->country.';';
-            echo $object->email.';';
-            echo $object->phone_pro.';';
-            echo $object->phone_perso.';';
-            echo $object->phone_mobile.';';
-            echo $object->jabberid.';';
-            echo dol_print_date($object->birth).';';
-            exit;
-        } elseif ($parameters['currentcontext'] == 'contactcard' && $action == 'send_datapolicy') {
-            $object->fetch(GETPOST('id'));
+			echo 'Name;Fistname;Civility;Thirdparty;Function;Address;ZipCode;City;Department;Country;Email;Pro Phone;Perso Phone;Mobile Phone;Instant Mail;Birthday;'.PHP_EOL;
+			echo $object->lastname.';';
+			echo $object->firstname.';';
+			echo $object->getCivilityLabel().';';
+			echo ($soc != -1 ? $object->thirdparty->name : '').';';
+			echo ';';
+			echo $object->address.';';
+			echo $object->zip.';';
+			echo $object->town.';';
+			echo $object->state.';';
+			echo $object->country.';';
+			echo $object->email.';';
+			echo $object->phone.';';
+			echo $object->phone_perso.';';
+			echo $object->phone_mobile.';';
+			echo $object->skype.';';
+			echo dol_print_date($object->birth).';';
+			exit;
+		} elseif ($parameters['currentcontext'] == 'contactcard' && $action == 'datapolicy_portabilite') {
+			$object->fetch(GETPOST('id'));
+			header('Content-Type: application/csv');
+			header('Content-Disposition: attachment; filename=datapolicy_portabilite.csv');
+			header('Pragma: no-cache');
+			$soc = $object->fetch_thirdparty();
+			echo 'Name;Fistname;Civility;Thirdparty;Function;Address;ZipCode;City;Department;Country;Email;Pro Phone;Perso Phone;Mobile Phone;Instant Mail;Birthday;'.PHP_EOL;
+			echo $object->lastname.';';
+			echo $object->firstname.';';
+			echo $object->getCivilityLabel().';';
+			echo ($soc != -1 ? $object->thirdparty->name : '').';';
+			echo $object->poste.';';
+			echo $object->address.';';
+			echo $object->zip.';';
+			echo $object->town.';';
+			echo $object->state.';';
+			echo $object->country.';';
+			echo $object->email.';';
+			echo $object->phone_pro.';';
+			echo $object->phone_perso.';';
+			echo $object->phone_mobile.';';
+			echo $object->jabberid.';';
+			echo dol_print_date($object->birth).';';
+			exit;
+		} elseif ($parameters['currentcontext'] == 'contactcard' && $action == 'send_datapolicy') {
+			$object->fetch(GETPOST('id'));
 
-            require_once  DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
-            require_once  DOL_DOCUMENT_ROOT.'/datapolicy/class/datapolicy.class.php';
-            DataPolicy::sendMailDataPolicyContact($object);
-        } elseif ($parameters['currentcontext'] == 'membercard' && $action == 'send_datapolicy') {
-             $object->fetch(GETPOST('id'));
-            require_once  DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
-            require_once  DOL_DOCUMENT_ROOT.'/datapolicy/class/datapolicy.class.php';
-            DataPolicy::sendMailDataPolicyAdherent($object);
-        } elseif ($parameters['currentcontext'] == 'thirdpartycard' && $action == 'send_datapolicy') {
-            $object->fetch(GETPOST('socid'));
-            require_once  DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
-            require_once  DOL_DOCUMENT_ROOT.'/datapolicy/class/datapolicy.class.php';
-            DataPolicy::sendMailDataPolicyCompany($object);
-        }
+			require_once  DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
+			require_once  DOL_DOCUMENT_ROOT.'/datapolicy/class/datapolicy.class.php';
+			DataPolicy::sendMailDataPolicyContact($object);
+		} elseif ($parameters['currentcontext'] == 'membercard' && $action == 'send_datapolicy') {
+			 $object->fetch(GETPOST('id'));
+			require_once  DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
+			require_once  DOL_DOCUMENT_ROOT.'/datapolicy/class/datapolicy.class.php';
+			DataPolicy::sendMailDataPolicyAdherent($object);
+		} elseif ($parameters['currentcontext'] == 'thirdpartycard' && $action == 'send_datapolicy') {
+			$object->fetch(GETPOST('socid'));
+			require_once  DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
+			require_once  DOL_DOCUMENT_ROOT.'/datapolicy/class/datapolicy.class.php';
+			DataPolicy::sendMailDataPolicyCompany($object);
+		}
 
 
-        if (!$error) {
-            $this->results = array('myreturn' => 999);
-            $this->resprints = 'A text to show';
-            return 0; // or return 1 to replace standard code
-        } else {
-            $this->errors[] = 'Error message';
-            return -1;
-        }
-    }
+		if (!$error) {
+			$this->results = array('myreturn' => 999);
+			$this->resprints = 'A text to show';
+			return 0; // or return 1 to replace standard code
+		} else {
+			$this->errors[] = 'Error message';
+			return -1;
+		}
+	}
 
-    /**
-     * Overloading the doActions function : replacing the parent's function with the one below
-     *
-     * @param   array           $parameters     Hook metadatas (context, etc...)
-     * @param   CommonObject    $object         The object to process (an invoice if you are in invoice module, a propale in propale's module, etc...)
-     * @param   string          $action         Current action (if set). Generally create or edit or null
-     * @param   HookManager     $hookmanager    Hook manager propagated to allow calling another hook
-     * @return  int                             < 0 on error, 0 on success, 1 to replace standard code
-     */
-    public function doMassActions($parameters, &$object, &$action, $hookmanager)
-    {
-        global $conf, $user, $langs;
+	/**
+	 * Overloading the doActions function : replacing the parent's function with the one below
+	 *
+	 * @param   array           $parameters     Hook metadatas (context, etc...)
+	 * @param   CommonObject    $object         The object to process (an invoice if you are in invoice module, a propale in propale's module, etc...)
+	 * @param   string          $action         Current action (if set). Generally create or edit or null
+	 * @param   HookManager     $hookmanager    Hook manager propagated to allow calling another hook
+	 * @return  int                             < 0 on error, 0 on success, 1 to replace standard code
+	 */
+	public function doMassActions($parameters, &$object, &$action, $hookmanager)
+	{
+		global $conf, $user, $langs;
 
-        $error = 0; // Error counter
+		$error = 0; // Error counter
 
-        /* print_r($parameters); print_r($object); echo "action: " . $action; */
-        //if (in_array($parameters['currentcontext'], array('somecontext1', 'somecontext2'))) {
-        //    // do something only for the context 'somecontext1' or 'somecontext2'
-        //    foreach ($parameters['toselect'] as $objectid) {
-        //        // Do action on each object id
-        //    }
-        //}
+		/* print_r($parameters); print_r($object); echo "action: " . $action; */
+		//if (in_array($parameters['currentcontext'], array('somecontext1', 'somecontext2'))) {
+		//    // do something only for the context 'somecontext1' or 'somecontext2'
+		//    foreach ($parameters['toselect'] as $objectid) {
+		//        // Do action on each object id
+		//    }
+		//}
 
-        if (!$error) {
-            $this->results = array('myreturn' => 999);
-            $this->resprints = 'A text to show';
-            return 0; // or return 1 to replace standard code
-        } else {
-            $this->errors[] = 'Error message';
-            return -1;
-        }
-    }
+		if (!$error) {
+			$this->results = array('myreturn' => 999);
+			$this->resprints = 'A text to show';
+			return 0; // or return 1 to replace standard code
+		} else {
+			$this->errors[] = 'Error message';
+			return -1;
+		}
+	}
 
-    /**
-     * Overloading the addMoreMassActions function : replacing the parent's function with the one below
-     *
-     * @param   array           $parameters		Hook metadatas (context, etc...)
-     * @param   CommonObject    $object         The object to process (an invoice if you are in invoice module, a propale in propale's module, etc...)
-     * @param   string          $action         Current action (if set). Generally create or edit or null
-     * @param   HookManager     $hookmanager    Hook manager propagated to allow calling another hook
-     * @return  int                             < 0 on error, 0 on success, 1 to replace standard code
-     */
-    public function addMoreMassActions($parameters, &$object, &$action, $hookmanager)
-    {
-        global $conf, $user, $langs;
+	/**
+	 * Overloading the addMoreMassActions function : replacing the parent's function with the one below
+	 *
+	 * @param   array           $parameters		Hook metadatas (context, etc...)
+	 * @param   CommonObject    $object         The object to process (an invoice if you are in invoice module, a propale in propale's module, etc...)
+	 * @param   string          $action         Current action (if set). Generally create or edit or null
+	 * @param   HookManager     $hookmanager    Hook manager propagated to allow calling another hook
+	 * @return  int                             < 0 on error, 0 on success, 1 to replace standard code
+	 */
+	public function addMoreMassActions($parameters, &$object, &$action, $hookmanager)
+	{
+		global $conf, $user, $langs;
 
-        $error = 0; // Error counter
+		$error = 0; // Error counter
 
-        /* print_r($parameters); print_r($object); echo "action: " . $action; */
-        if (in_array($parameters['currentcontext'], array('somecontext1', 'somecontext2'))) {  // do something only for the context 'somecontext1' or 'somecontext2'
-            $this->resprints = '<option value="0"'.($disabled ? ' disabled="disabled"' : '').'>'.$langs->trans("datapolicyMassAction").'</option>';
-        }
+		/* print_r($parameters); print_r($object); echo "action: " . $action; */
+		if (in_array($parameters['currentcontext'], array('somecontext1', 'somecontext2'))) {  // do something only for the context 'somecontext1' or 'somecontext2'
+			$this->resprints = '<option value="0"'.($disabled ? ' disabled="disabled"' : '').'>'.$langs->trans("datapolicyMassAction").'</option>';
+		}
 
-        if (!$error) {
-            return 0; // or return 1 to replace standard code
-        } else {
-            $this->errors[] = 'Error message';
-            return -1;
-        }
-    }
+		if (!$error) {
+			return 0; // or return 1 to replace standard code
+		} else {
+			$this->errors[] = 'Error message';
+			return -1;
+		}
+	}
 
-    /**
-     * Execute action
-     *
-     * @param   array   $parameters     Array of parameters
-     * @param   Object  $object         Object output on PDF
-     * @param   string  $action         'add', 'update', 'view'
-     * @return  int                     <0 if KO,
-     *                                  =0 if OK but we want to process standard actions too,
-     *                                  >0 if OK and we want to replace standard actions.
-     */
-    public function beforePDFCreation($parameters, &$object, &$action)
-    {
-        global $conf, $user, $langs;
-        global $hookmanager;
+	/**
+	 * Execute action
+	 *
+	 * @param   array   $parameters     Array of parameters
+	 * @param   Object  $object         Object output on PDF
+	 * @param   string  $action         'add', 'update', 'view'
+	 * @return  int                     <0 if KO,
+	 *                                  =0 if OK but we want to process standard actions too,
+	 *                                  >0 if OK and we want to replace standard actions.
+	 */
+	public function beforePDFCreation($parameters, &$object, &$action)
+	{
+		global $conf, $user, $langs;
+		global $hookmanager;
 
-        $outputlangs = $langs;
+		$outputlangs = $langs;
 
-        $ret = 0;
-        $deltemp = array();
-        dol_syslog(get_class($this).'::executeHooks action='.$action);
+		$ret = 0;
+		$deltemp = array();
+		dol_syslog(get_class($this).'::executeHooks action='.$action);
 
-        /* print_r($parameters); print_r($object); echo "action: " . $action; */
-        if (in_array($parameters['currentcontext'], array('somecontext1', 'somecontext2'))) {  // do something only for the context 'somecontext1' or 'somecontext2'
-        }
+		/* print_r($parameters); print_r($object); echo "action: " . $action; */
+		if (in_array($parameters['currentcontext'], array('somecontext1', 'somecontext2'))) {  // do something only for the context 'somecontext1' or 'somecontext2'
+		}
 
-        return $ret;
-    }
+		return $ret;
+	}
 
 
-    /**
-     * addMoreActionsButtons
-     *
-     * @param array 		$parameters		array of parameters
-     * @param Object	 	$object			Object
-     * @param string		$action			Actions
-     * @param HookManager	$hookmanager	Hook manager
-     * @return void
-     */
-    public function addMoreActionsButtons($parameters, &$object, &$action, $hookmanager)
-    {
-        global $conf, $user, $langs;
-        $langs->load('datapolicy@datapolicy');
+	/**
+	 * addMoreActionsButtons
+	 *
+	 * @param array 		$parameters		array of parameters
+	 * @param Object	 	$object			Object
+	 * @param string		$action			Actions
+	 * @param HookManager	$hookmanager	Hook manager
+	 * @return void
+	 */
+	public function addMoreActionsButtons($parameters, &$object, &$action, $hookmanager)
+	{
+		global $conf, $user, $langs;
+		$langs->load('datapolicy@datapolicy');
 
-        if (!empty($conf->global->DATAPOLICIES_ENABLE_EMAILS))
-        {
-            $dialog = '<div id="dialogdatapolicy" style="display:none;" title="'.$langs->trans('DATAPOLICIES_PORTABILITE_TITLE').'">';
-            $dialog .= '<div class="confirmmessage">'.img_help('', '').' '.$langs->trans('DATAPOLICIES_PORTABILITE_CONFIRMATION').'</div>';
-            $dialog .= "</div>";
-            $dialog .= '<script>
+		if (!empty($conf->global->DATAPOLICIES_ENABLE_EMAILS))
+		{
+			$dialog = '<div id="dialogdatapolicy" style="display:none;" title="'.$langs->trans('DATAPOLICIES_PORTABILITE_TITLE').'">';
+			$dialog .= '<div class="confirmmessage">'.img_help('', '').' '.$langs->trans('DATAPOLICIES_PORTABILITE_CONFIRMATION').'</div>';
+			$dialog .= "</div>";
+			$dialog .= '<script>
                       $( function() {
                         $("#rpgpdbtn").on("click", function(){
                             var href = $(this).attr("href");
@@ -359,92 +359,92 @@ class ActionsDatapolicy
                         });
                       } );
                       </script>';
-            echo $dialog;
-            if ($parameters['currentcontext'] == 'thirdpartycard' && in_array($object->forme_juridique_code, array(11, 12, 13, 15, 17, 18, 19, 35, 60, 200, 311, 312, 316, 401, 600, 700, 1005)) || $object->typent_id == 8) {
-                echo '<div class="inline-block divButAction"><a target="_blank" id="rpgpdbtn" class="butAction" href="'.$_SERVER["PHP_SELF"]."?socid=".$object->id.'&action=datapolicy_portabilite" title="'.$langs->trans('DATAPOLICIES_PORTABILITE_TITLE').'">'.$langs->trans("DATAPOLICIES_PORTABILITE").'</a></div>';
-            } elseif ($parameters['currentcontext'] == 'membercard') {
-                echo '<div class="inline-block divButAction"><a target="_blank" id="rpgpdbtn" class="butAction" href="'.$_SERVER["PHP_SELF"]."?rowid=".$object->id.'&action=datapolicy_portabilite" title="'.$langs->trans('DATAPOLICIES_PORTABILITE_TITLE').'">'.$langs->trans("DATAPOLICIES_PORTABILITE").'</a></div>';
-            } elseif ($parameters['currentcontext'] == 'contactcard') {
-                echo '<div class="inline-block divButAction"><a target="_blank" id="rpgpdbtn" class="butAction" href="'.$_SERVER["PHP_SELF"]."?id=".$object->id.'&action=datapolicy_portabilite" title="'.$langs->trans('DATAPOLICIES_PORTABILITE_TITLE').'">'.$langs->trans("DATAPOLICIES_PORTABILITE").'</a></div>';
-            }
-            if (!empty($object->mail) && empty($object->array_options['options_datapolicy_send']) && $parameters['currentcontext'] == 'thirdpartycard' && in_array($object->forme_juridique_code, array(11, 12, 13, 15, 17, 18, 19, 35, 60, 200, 311, 312, 316, 401, 600, 700, 1005)) || $object->typent_id == 8) {
-                echo '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"]."?socid=".$object->id.'&action=send_datapolicy" title="'.$langs->trans('DATAPOLICIES_SEND').'">'.$langs->trans("DATAPOLICIES_SEND").'</a></div>';
-            } elseif (!empty($object->mail) && empty($object->array_options['options_datapolicy_send']) && $parameters['currentcontext'] == 'membercard') {
-                echo '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"]."?rowid=".$object->id.'&action=send_datapolicy" title="'.$langs->trans('DATAPOLICIES_SEND').'">'.$langs->trans("DATAPOLICIES_SEND").'</a></div>';
-            } elseif (!empty($object->mail) && empty($object->array_options['options_datapolicy_send']) && $parameters['currentcontext'] == 'contactcard') {
-                echo '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"]."?id=".$object->id.'&action=send_datapolicy" title="'.$langs->trans('DATAPOLICIES_SEND').'">'.$langs->trans("DATAPOLICIES_SEND").'</a></div>';
-            }
-        }
-    }
+			echo $dialog;
+			if ($parameters['currentcontext'] == 'thirdpartycard' && in_array($object->forme_juridique_code, array(11, 12, 13, 15, 17, 18, 19, 35, 60, 200, 311, 312, 316, 401, 600, 700, 1005)) || $object->typent_id == 8) {
+				echo '<div class="inline-block divButAction"><a target="_blank" id="rpgpdbtn" class="butAction" href="'.$_SERVER["PHP_SELF"]."?socid=".$object->id.'&action=datapolicy_portabilite" title="'.$langs->trans('DATAPOLICIES_PORTABILITE_TITLE').'">'.$langs->trans("DATAPOLICIES_PORTABILITE").'</a></div>';
+			} elseif ($parameters['currentcontext'] == 'membercard') {
+				echo '<div class="inline-block divButAction"><a target="_blank" id="rpgpdbtn" class="butAction" href="'.$_SERVER["PHP_SELF"]."?rowid=".$object->id.'&action=datapolicy_portabilite" title="'.$langs->trans('DATAPOLICIES_PORTABILITE_TITLE').'">'.$langs->trans("DATAPOLICIES_PORTABILITE").'</a></div>';
+			} elseif ($parameters['currentcontext'] == 'contactcard') {
+				echo '<div class="inline-block divButAction"><a target="_blank" id="rpgpdbtn" class="butAction" href="'.$_SERVER["PHP_SELF"]."?id=".$object->id.'&action=datapolicy_portabilite" title="'.$langs->trans('DATAPOLICIES_PORTABILITE_TITLE').'">'.$langs->trans("DATAPOLICIES_PORTABILITE").'</a></div>';
+			}
+			if (!empty($object->mail) && empty($object->array_options['options_datapolicy_send']) && $parameters['currentcontext'] == 'thirdpartycard' && in_array($object->forme_juridique_code, array(11, 12, 13, 15, 17, 18, 19, 35, 60, 200, 311, 312, 316, 401, 600, 700, 1005)) || $object->typent_id == 8) {
+				echo '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"]."?socid=".$object->id.'&action=send_datapolicy" title="'.$langs->trans('DATAPOLICIES_SEND').'">'.$langs->trans("DATAPOLICIES_SEND").'</a></div>';
+			} elseif (!empty($object->mail) && empty($object->array_options['options_datapolicy_send']) && $parameters['currentcontext'] == 'membercard') {
+				echo '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"]."?rowid=".$object->id.'&action=send_datapolicy" title="'.$langs->trans('DATAPOLICIES_SEND').'">'.$langs->trans("DATAPOLICIES_SEND").'</a></div>';
+			} elseif (!empty($object->mail) && empty($object->array_options['options_datapolicy_send']) && $parameters['currentcontext'] == 'contactcard') {
+				echo '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"]."?id=".$object->id.'&action=send_datapolicy" title="'.$langs->trans('DATAPOLICIES_SEND').'">'.$langs->trans("DATAPOLICIES_SEND").'</a></div>';
+			}
+		}
+	}
 
-    /**
-     * printCommonFooter
-     *
-     * @param array 		$parameters		array of parameters
-     * @param Object	 	$object			Object
-     * @param string		$action			Actions
-     * @param HookManager	$hookmanager	Hook manager
-     * @return int
-     */
-    public function printCommonFooter($parameters, &$object, &$action, $hookmanager)
-    {
-        global $conf, $user, $langs;
+	/**
+	 * printCommonFooter
+	 *
+	 * @param array 		$parameters		array of parameters
+	 * @param Object	 	$object			Object
+	 * @param string		$action			Actions
+	 * @param HookManager	$hookmanager	Hook manager
+	 * @return int
+	 */
+	public function printCommonFooter($parameters, &$object, &$action, $hookmanager)
+	{
+		global $conf, $user, $langs;
 
-        $jsscript = '';
-        if ($parameters['currentcontext'] == 'thirdpartycard') {
-            if (GETPOST('action') == 'create' || GETPOST('action') == 'edit' || GETPOST('action') == '') {
-                $jsscript .= '<script>';
-                $jsscript .= "var elementToHide = 'tr.societe_extras_datapolicy_consentement, tr.societe_extras_datapolicy_opposition_traitement, tr.societe_extras_datapolicy_opposition_prospection';".PHP_EOL;
-                $jsscript .= "var forme_juridique = [".PHP_EOL;
-                $jsscript .= "11, 12, 13, 15, 17, 18, 19, 35, 60, 200, 311, 312, 316, 401, 600, 700, 1005".PHP_EOL;
-                $jsscript .= "];".PHP_EOL;
-                $jsscript .= "function hideRgPD() {".PHP_EOL;
-                $jsscript .= " if ($('#typent_id').val() == 8 || forme_juridique.indexOf(parseInt($('#forme_juridique_code').val())) > -1) {".PHP_EOL;
-                $jsscript .= " console.log(elementToHide);".PHP_EOL;
-                $jsscript .= " $('tr.societe_extras_datapolicy_consentement, tr.societe_extras_datapolicy_opposition_traitement, tr.societe_extras_datapolicy_opposition_prospection').show(); } else { $('tr.societe_extras_datapolicy_consentement, tr.societe_extras_datapolicy_opposition_traitement, tr.societe_extras_datapolicy_opposition_prospection').hide(); }}".PHP_EOL;
-                $jsscript .= "hideRgPD();".PHP_EOL;
-                $jsscript .= "$('#forme_juridique_code, #typent_id').change(function(){ hideRgPD(); });".PHP_EOL;
-                $jsscript .= '</script>';
-            } elseif (GETPOST('action') == 'confirm_delete' && GETPOST('confirm') == 'yes' && GETPOST('socid') > 0) {
-                // La suppression n'a pas été possible
-                require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
-                $societe = new Societe($this->db);
-                $societe->fetch(GETPOST('socid'));
-                // On vérifie si il est utilisé
-                if ((in_array($object->forme_juridique_code, array(11, 12, 13, 15, 17, 18, 19, 35, 60, 200, 311, 312, 316, 401, 600, 700, 1005)) || $societe->typent_id == 8) && $societe->isObjectUsed(GETPOST('socid'))) {
-                    require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
-                    $form = new Form($this->db);
-                    echo $form->formconfirm($_SERVER["PHP_SELF"]."?socid=".GETPOST('socid'), substr($langs->trans("DATAPOLICIES_POPUP_ANONYME_TITLE"), 0, strlen($langs->trans("DATAPOLICIES_POPUP_ANONYME_TITLE")) - 2), $langs->trans("DATAPOLICIES_POPUP_ANONYME_TEXTE"), 'anonymiser', '', '', 1);
-                }
-            }
+		$jsscript = '';
+		if ($parameters['currentcontext'] == 'thirdpartycard') {
+			if (GETPOST('action') == 'create' || GETPOST('action') == 'edit' || GETPOST('action') == '') {
+				$jsscript .= '<script>';
+				$jsscript .= "var elementToHide = 'tr.societe_extras_datapolicy_consentement, tr.societe_extras_datapolicy_opposition_traitement, tr.societe_extras_datapolicy_opposition_prospection';".PHP_EOL;
+				$jsscript .= "var forme_juridique = [".PHP_EOL;
+				$jsscript .= "11, 12, 13, 15, 17, 18, 19, 35, 60, 200, 311, 312, 316, 401, 600, 700, 1005".PHP_EOL;
+				$jsscript .= "];".PHP_EOL;
+				$jsscript .= "function hideRgPD() {".PHP_EOL;
+				$jsscript .= " if ($('#typent_id').val() == 8 || forme_juridique.indexOf(parseInt($('#forme_juridique_code').val())) > -1) {".PHP_EOL;
+				$jsscript .= " console.log(elementToHide);".PHP_EOL;
+				$jsscript .= " $('tr.societe_extras_datapolicy_consentement, tr.societe_extras_datapolicy_opposition_traitement, tr.societe_extras_datapolicy_opposition_prospection').show(); } else { $('tr.societe_extras_datapolicy_consentement, tr.societe_extras_datapolicy_opposition_traitement, tr.societe_extras_datapolicy_opposition_prospection').hide(); }}".PHP_EOL;
+				$jsscript .= "hideRgPD();".PHP_EOL;
+				$jsscript .= "$('#forme_juridique_code, #typent_id').change(function(){ hideRgPD(); });".PHP_EOL;
+				$jsscript .= '</script>';
+			} elseif (GETPOST('action') == 'confirm_delete' && GETPOST('confirm') == 'yes' && GETPOST('socid') > 0) {
+				// La suppression n'a pas été possible
+				require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
+				$societe = new Societe($this->db);
+				$societe->fetch(GETPOST('socid'));
+				// On vérifie si il est utilisé
+				if ((in_array($object->forme_juridique_code, array(11, 12, 13, 15, 17, 18, 19, 35, 60, 200, 311, 312, 316, 401, 600, 700, 1005)) || $societe->typent_id == 8) && $societe->isObjectUsed(GETPOST('socid'))) {
+					require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
+					$form = new Form($this->db);
+					echo $form->formconfirm($_SERVER["PHP_SELF"]."?socid=".GETPOST('socid'), substr($langs->trans("DATAPOLICIES_POPUP_ANONYME_TITLE"), 0, strlen($langs->trans("DATAPOLICIES_POPUP_ANONYME_TITLE")) - 2), $langs->trans("DATAPOLICIES_POPUP_ANONYME_TEXTE"), 'anonymiser', '', '', 1);
+				}
+			}
 
-            if (GETPOST('socid')) {
-                require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
-                $societe = new Societe($this->db);
-                $societe->fetch(GETPOST('socid'));
+			if (GETPOST('socid')) {
+				require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
+				$societe = new Societe($this->db);
+				$societe->fetch(GETPOST('socid'));
 
-                if (!in_array($object->forme_juridique_code, array(11, 12, 13, 15, 17, 18, 19, 35, 60, 200, 311, 312, 316, 401, 600, 700, 1005)) && $societe->typent_id != 8) {
-                    require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
-                    $jsscript .= '<script>';
-                    $jsscript .= "var elementToHide = 'td.societe_extras_datapolicy_opposition_traitement, td.societe_extras_datapolicy_opposition_prospection, td.societe_extras_datapolicy_consentement';".PHP_EOL;
-                    $jsscript .= "$(elementToHide).parent('tr').hide();".PHP_EOL;
-                    $jsscript .= '</script>';
-                }
-            }
-        } elseif ($parameters['currentcontext'] == 'contactcard') {
-            if (GETPOST('action') == 'create' || GETPOST('action') == 'edit') {
-                $jsscript .= '<script>';
-                $jsscript .= "$('#options_datapolicy_opposition_traitement, #options_datapolicy_opposition_prospection, input[name=\"options_datapolicy_opposition_traitement\"], input[name=\"options_datapolicy_opposition_prospection\"]').change(function(){
+				if (!in_array($object->forme_juridique_code, array(11, 12, 13, 15, 17, 18, 19, 35, 60, 200, 311, 312, 316, 401, 600, 700, 1005)) && $societe->typent_id != 8) {
+					require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
+					$jsscript .= '<script>';
+					$jsscript .= "var elementToHide = 'td.societe_extras_datapolicy_opposition_traitement, td.societe_extras_datapolicy_opposition_prospection, td.societe_extras_datapolicy_consentement';".PHP_EOL;
+					$jsscript .= "$(elementToHide).parent('tr').hide();".PHP_EOL;
+					$jsscript .= '</script>';
+				}
+			}
+		} elseif ($parameters['currentcontext'] == 'contactcard') {
+			if (GETPOST('action') == 'create' || GETPOST('action') == 'edit') {
+				$jsscript .= '<script>';
+				$jsscript .= "$('#options_datapolicy_opposition_traitement, #options_datapolicy_opposition_prospection, input[name=\"options_datapolicy_opposition_traitement\"], input[name=\"options_datapolicy_opposition_prospection\"]').change(function(){
                     if($('#options_datapolicy_opposition_traitement').prop('checked') == true || $('input[name=options_datapolicy_opposition_traitement]').prop('checked') || $('#options_datapolicy_opposition_prospection').prop('checked') || $('input[name=options_datapolicy_opposition_prospection]').prop('checked')) {
                         $('#no_email').val(1);
                     }
                 });";
-                $jsscript .= '</script>';
-            }
-        }
+				$jsscript .= '</script>';
+			}
+		}
 
-        $this->resprint = $jsscript;
+		$this->resprint = $jsscript;
 
-        return 0;
-    }
+		return 0;
+	}
 }
diff --git a/htdocs/datapolicy/class/datapolicy.class.php b/htdocs/datapolicy/class/datapolicy.class.php
index 24490b9fb19..6d7b71129f7 100644
--- a/htdocs/datapolicy/class/datapolicy.class.php
+++ b/htdocs/datapolicy/class/datapolicy.class.php
@@ -40,332 +40,332 @@ class DataPolicy
 		$this->db = $db;
 	}
 
-    /**
-     * getAllContactNotInformed
-     *
-     * @return number
-     */
-    public function getAllContactNotInformed()
-    {
-        global $langs, $conf, $db, $user;
+	/**
+	 * getAllContactNotInformed
+	 *
+	 * @return number
+	 */
+	public function getAllContactNotInformed()
+	{
+		global $langs, $conf, $db, $user;
 
-        $langs->load("companies");
+		$langs->load("companies");
 
-        $sql = "SELECT c.rowid";
-        $sql .= " FROM ".MAIN_DB_PREFIX."socpeople as c";
-        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON c.fk_soc = s.rowid";
-        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople_extrafields as spe ON spe.fk_object = c.rowid";
-        $sql .= " WHERE (c.statut=1 AND c.no_email=0 AND (spe.datapolicy_consentement=0 OR spe.datapolicy_consentement IS NULL) AND (spe.datapolicy_opposition_traitement=0 OR spe.datapolicy_opposition_traitement IS NULL) AND (spe.datapolicy_opposition_prospection=0 OR spe.datapolicy_opposition_prospection IS NULL))";
-        $sql .= " AND spe.datapolicy_send IS NULL";
-        $sql .= " AND c.entity=".$conf->entity;
-        $resql = $this->db->query($sql);
-        if ($resql) {
-            $num = $this->db->num_rows($resql);
-            $i = 0;
-            while ($i < $num) {
-                $obj = $this->db->fetch_object($resql);
-                $contact = new Contact($db);
-                $contact->fetch($obj->rowid);
+		$sql = "SELECT c.rowid";
+		$sql .= " FROM ".MAIN_DB_PREFIX."socpeople as c";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON c.fk_soc = s.rowid";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople_extrafields as spe ON spe.fk_object = c.rowid";
+		$sql .= " WHERE (c.statut=1 AND c.no_email=0 AND (spe.datapolicy_consentement=0 OR spe.datapolicy_consentement IS NULL) AND (spe.datapolicy_opposition_traitement=0 OR spe.datapolicy_opposition_traitement IS NULL) AND (spe.datapolicy_opposition_prospection=0 OR spe.datapolicy_opposition_prospection IS NULL))";
+		$sql .= " AND spe.datapolicy_send IS NULL";
+		$sql .= " AND c.entity=".$conf->entity;
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			$num = $this->db->num_rows($resql);
+			$i = 0;
+			while ($i < $num) {
+				$obj = $this->db->fetch_object($resql);
+				$contact = new Contact($db);
+				$contact->fetch($obj->rowid);
 
-                DataPolicy::sendMailDataPolicyContact($contact);
-                $i++;
-            }
-        } else {
-            $this->error = $this->db->error();
-            return -1;
-        }
-    }
+				DataPolicy::sendMailDataPolicyContact($contact);
+				$i++;
+			}
+		} else {
+			$this->error = $this->db->error();
+			return -1;
+		}
+	}
 
-    /**
-     * getAllCompaniesNotInformed
-     *
-     * @return number
-     */
-    public function getAllCompaniesNotInformed()
-    {
-        global $langs, $conf, $db, $user;
+	/**
+	 * getAllCompaniesNotInformed
+	 *
+	 * @return number
+	 */
+	public function getAllCompaniesNotInformed()
+	{
+		global $langs, $conf, $db, $user;
 
-        $langs->load("companies");
+		$langs->load("companies");
 
-        $sql = "SELECT s.rowid";
-        $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
-        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_extrafields as se ON se.fk_object = s.rowid";
-        $sql .= " WHERE s.statut=0 AND (se.datapolicy_consentement=0 OR se.datapolicy_consentement IS NULL) AND (se.datapolicy_opposition_traitement=0 OR se.datapolicy_opposition_traitement IS NULL) AND (se.datapolicy_opposition_prospection=0 OR se.datapolicy_opposition_prospection IS NULL)";
-        $sql .= " AND se.datapolicy_send IS NULL";
-        $sql .= " AND s.entity=".$conf->entity;
-        $resql = $this->db->query($sql);
-        if ($resql) {
-            $num = $this->db->num_rows($resql);
-            $i = 0;
-            while ($i < $num) {
-                $obj = $this->db->fetch_object($resql);
-                $societe = new Societe($db);
-                $societe->fetch($obj->rowid);
+		$sql = "SELECT s.rowid";
+		$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_extrafields as se ON se.fk_object = s.rowid";
+		$sql .= " WHERE s.statut=0 AND (se.datapolicy_consentement=0 OR se.datapolicy_consentement IS NULL) AND (se.datapolicy_opposition_traitement=0 OR se.datapolicy_opposition_traitement IS NULL) AND (se.datapolicy_opposition_prospection=0 OR se.datapolicy_opposition_prospection IS NULL)";
+		$sql .= " AND se.datapolicy_send IS NULL";
+		$sql .= " AND s.entity=".$conf->entity;
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			$num = $this->db->num_rows($resql);
+			$i = 0;
+			while ($i < $num) {
+				$obj = $this->db->fetch_object($resql);
+				$societe = new Societe($db);
+				$societe->fetch($obj->rowid);
 
-                DataPolicy::sendMailDataPolicyCompany($societe);
-                $i++;
-            }
-        } else {
-            $this->error = $this->db->error();
-            return -1;
-        }
-    }
+				DataPolicy::sendMailDataPolicyCompany($societe);
+				$i++;
+			}
+		} else {
+			$this->error = $this->db->error();
+			return -1;
+		}
+	}
 
-    /**
-     * getAllAdherentsNotInformed
-     *
-     * @return number
-     */
-    public function getAllAdherentsNotInformed()
-    {
-        global $langs, $conf, $db, $user;
+	/**
+	 * getAllAdherentsNotInformed
+	 *
+	 * @return number
+	 */
+	public function getAllAdherentsNotInformed()
+	{
+		global $langs, $conf, $db, $user;
 
-        $langs->load("adherent");
+		$langs->load("adherent");
 
-        $sql = "SELECT a.rowid";
-        $sql .= " FROM ".MAIN_DB_PREFIX."adherent as a";
-        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."adherent_extrafields as ae ON ae.fk_object = a.rowid";
-        $sql .= " WHERE a.statut=0 AND (ae.datapolicy_consentement=0 OR ae.datapolicy_consentement IS NULL) AND (ae.datapolicy_opposition_traitement=0 OR ae.datapolicy_opposition_traitement IS NULL) AND (ae.datapolicy_opposition_prospection=0 OR ae.datapolicy_opposition_prospection IS NULL)";
-        $sql .= " AND ae.datapolicy_send IS NULL";
-        $sql .= " AND a.entity=".$conf->entity;
-        $resql = $this->db->query($sql);
-        if ($resql) {
-            $num = $this->db->num_rows($resql);
-            $i = 0;
-            while ($i < $num) {
-                $obj = $this->db->fetch_object($resql);
-                $adherent = new Adherent($db);
-                $adherent->fetch($obj->rowid);
+		$sql = "SELECT a.rowid";
+		$sql .= " FROM ".MAIN_DB_PREFIX."adherent as a";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."adherent_extrafields as ae ON ae.fk_object = a.rowid";
+		$sql .= " WHERE a.statut=0 AND (ae.datapolicy_consentement=0 OR ae.datapolicy_consentement IS NULL) AND (ae.datapolicy_opposition_traitement=0 OR ae.datapolicy_opposition_traitement IS NULL) AND (ae.datapolicy_opposition_prospection=0 OR ae.datapolicy_opposition_prospection IS NULL)";
+		$sql .= " AND ae.datapolicy_send IS NULL";
+		$sql .= " AND a.entity=".$conf->entity;
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			$num = $this->db->num_rows($resql);
+			$i = 0;
+			while ($i < $num) {
+				$obj = $this->db->fetch_object($resql);
+				$adherent = new Adherent($db);
+				$adherent->fetch($obj->rowid);
 
-                DataPolicy::sendMailDataPolicyAdherent($adherent);
-                $i++;
-            }
-        } else {
-            $this->error = $this->db->error();
-            return -1;
-        }
-    }
+				DataPolicy::sendMailDataPolicyAdherent($adherent);
+				$i++;
+			}
+		} else {
+			$this->error = $this->db->error();
+			return -1;
+		}
+	}
 
-    /**
-     * sendMailDataPolicyContact
-     *
-     * @param 	mixed		$contact		Contact
-     * @return	void
-     */
-    public static function sendMailDataPolicyContact($contact)
-    {
-        global $langs, $conf, $db, $user;
+	/**
+	 * sendMailDataPolicyContact
+	 *
+	 * @param 	mixed		$contact		Contact
+	 * @return	void
+	 */
+	public static function sendMailDataPolicyContact($contact)
+	{
+		global $langs, $conf, $db, $user;
 
-        $error = 0;
+		$error = 0;
 
-        $from = $user->getFullName($langs).' <'.$user->email.'>';
+		$from = $user->getFullName($langs).' <'.$user->email.'>';
 
-        $sendto = $contact->email;
-        $code = md5($contact->email);
-        if (!empty($contact->default_lang)) {
-            $l = $contact->default_lang;
-        } else {
-            $l = $langs->defaultlang;
-        }
-        // TODO Use a dolibarr email template
-        $s = "DATAPOLICIESSUBJECT_".$l;
-        $ma = "DATAPOLICIESCONTENT_".$l;
-        $la = 'TXTLINKDATAPOLICIESACCEPT_'.$l;
-        $lr = 'TXTLINKDATAPOLICIESREFUSE_'.$l;
+		$sendto = $contact->email;
+		$code = md5($contact->email);
+		if (!empty($contact->default_lang)) {
+			$l = $contact->default_lang;
+		} else {
+			$l = $langs->defaultlang;
+		}
+		// TODO Use a dolibarr email template
+		$s = "DATAPOLICIESSUBJECT_".$l;
+		$ma = "DATAPOLICIESCONTENT_".$l;
+		$la = 'TXTLINKDATAPOLICIESACCEPT_'.$l;
+		$lr = 'TXTLINKDATAPOLICIESREFUSE_'.$l;
 
-        $subject = $conf->global->$s;
-        $message = $conf->global->$ma;
-        $linka = $conf->global->$la;
-        $linkr = $conf->global->$lr;
-        $sendtocc = $sendtobcc = '';
-        $filepath = $mimetype = $filename = array();
-        $deliveryreceipt = 0;
+		$subject = $conf->global->$s;
+		$message = $conf->global->$ma;
+		$linka = $conf->global->$la;
+		$linkr = $conf->global->$lr;
+		$sendtocc = $sendtobcc = '';
+		$filepath = $mimetype = $filename = array();
+		$deliveryreceipt = 0;
 
-        $substitutionarray = array(
-            '__LINKACCEPT__' => '<a href="'.dol_buildpath('/datapolicy/public/index.php?action=1&c='.$contact->id.'&l='.$l.'&key='.$code, 3).'" target="_blank">'.$linka.'</a>',
-            '__LINKREFUSED__' => '<a href="'.dol_buildpath('/datapolicy/public/index.php?action=2&c='.$contact->id.'&l='.$l.'&key='.$code, 3).'" target="_blank">'.$linkr.'</a>',
-            '__FIRSTNAME__' => $contact->firstname,
-            '__NAME__' => $contact->lastname,
-            '__CIVILITY__' => $contact->civility,
-        );
-        $subject = make_substitutions($subject, $substitutionarray);
-        $message = make_substitutions($message, $substitutionarray);
+		$substitutionarray = array(
+			'__LINKACCEPT__' => '<a href="'.dol_buildpath('/datapolicy/public/index.php?action=1&c='.$contact->id.'&l='.$l.'&key='.$code, 3).'" target="_blank">'.$linka.'</a>',
+			'__LINKREFUSED__' => '<a href="'.dol_buildpath('/datapolicy/public/index.php?action=2&c='.$contact->id.'&l='.$l.'&key='.$code, 3).'" target="_blank">'.$linkr.'</a>',
+			'__FIRSTNAME__' => $contact->firstname,
+			'__NAME__' => $contact->lastname,
+			'__CIVILITY__' => $contact->civility,
+		);
+		$subject = make_substitutions($subject, $substitutionarray);
+		$message = make_substitutions($message, $substitutionarray);
 
-        $actiontypecode = 'AC_EMAIL';
-        $actionmsg = $langs->transnoentities('MailSentBy').' '.$from.' '.$langs->transnoentities('To').' '.$sendto;
-        if ($message) {
-            if ($sendtocc)
-                $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('Bcc').": ".$sendtocc);
-                $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('MailTopic').": ".$subject);
-                $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('TextUsedInTheMessageBody').":");
-                $actionmsg = dol_concatdesc($actionmsg, $message);
-        }
+		$actiontypecode = 'AC_EMAIL';
+		$actionmsg = $langs->transnoentities('MailSentBy').' '.$from.' '.$langs->transnoentities('To').' '.$sendto;
+		if ($message) {
+			if ($sendtocc)
+				$actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('Bcc').": ".$sendtocc);
+				$actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('MailTopic').": ".$subject);
+				$actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('TextUsedInTheMessageBody').":");
+				$actionmsg = dol_concatdesc($actionmsg, $message);
+		}
 
 
-        // Send mail
-        require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
-        $mailfile = new CMailFile($subject, $sendto, $from, $message, $filepath, $mimetype, $filename, $sendtocc, $sendtobcc, $deliveryreceipt, -1);
+		// Send mail
+		require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
+		$mailfile = new CMailFile($subject, $sendto, $from, $message, $filepath, $mimetype, $filename, $sendtocc, $sendtobcc, $deliveryreceipt, -1);
 
-        if ($mailfile->error) {
-            $resultmasssend .= '<div class="error">'.$mailfile->error.'</div>';
-        } else {
-            $result4 = $mailfile->sendfile();
-            if (!$error) {
-                $resultmasssend .= $langs->trans("MailSent").': '.$sendto."<br>";
-                $contact->array_options['options_datapolicy_send'] = date('Y-m-d', time());
-                $contact->update($contact->id);
-            } else {
-                dol_print_error($db);
-            }
-        }
-        setEventMessage($resultmasssend);
-    }
+		if ($mailfile->error) {
+			$resultmasssend .= '<div class="error">'.$mailfile->error.'</div>';
+		} else {
+			$result4 = $mailfile->sendfile();
+			if (!$error) {
+				$resultmasssend .= $langs->trans("MailSent").': '.$sendto."<br>";
+				$contact->array_options['options_datapolicy_send'] = date('Y-m-d', time());
+				$contact->update($contact->id);
+			} else {
+				dol_print_error($db);
+			}
+		}
+		setEventMessage($resultmasssend);
+	}
 
-    /**
-     * sendMailDataPolicyCompany
-     *
-     * @param Societe	$societe	Object societe
-     * @return	void
-     */
-    public static function sendMailDataPolicyCompany($societe)
-    {
-        global $langs, $conf, $db, $user;
+	/**
+	 * sendMailDataPolicyCompany
+	 *
+	 * @param Societe	$societe	Object societe
+	 * @return	void
+	 */
+	public static function sendMailDataPolicyCompany($societe)
+	{
+		global $langs, $conf, $db, $user;
 
-        $error = 0;
+		$error = 0;
 
-        $from = $user->getFullName($langs).' <'.$user->email.'>';
+		$from = $user->getFullName($langs).' <'.$user->email.'>';
 
-        $sendto = $societe->email;
+		$sendto = $societe->email;
 
-        $code = md5($societe->email);
-        if (!empty($societe->default_lang)) {
-            $l = $societe->default_lang;
-        } else {
-            $l = $langs->defaultlang;
-        }
-        // TODO Use a dolibarr email template
-        $s = "DATAPOLICIESSUBJECT_".$l;
-        $ma = "DATAPOLICIESCONTENT_".$l;
-        $la = 'TXTLINKDATAPOLICIESACCEPT_'.$l;
-        $lr = 'TXTLINKDATAPOLICIESREFUSE_'.$l;
+		$code = md5($societe->email);
+		if (!empty($societe->default_lang)) {
+			$l = $societe->default_lang;
+		} else {
+			$l = $langs->defaultlang;
+		}
+		// TODO Use a dolibarr email template
+		$s = "DATAPOLICIESSUBJECT_".$l;
+		$ma = "DATAPOLICIESCONTENT_".$l;
+		$la = 'TXTLINKDATAPOLICIESACCEPT_'.$l;
+		$lr = 'TXTLINKDATAPOLICIESREFUSE_'.$l;
 
-        $subject = $conf->global->$s;
-        $message = $conf->global->$ma;
-        $linka = $conf->global->$la;
-        $linkr = $conf->global->$lr;
-        $sendtocc = $sendtobcc = '';
-        $filepath = $mimetype = $filename = array();
-        $deliveryreceipt = 0;
+		$subject = $conf->global->$s;
+		$message = $conf->global->$ma;
+		$linka = $conf->global->$la;
+		$linkr = $conf->global->$lr;
+		$sendtocc = $sendtobcc = '';
+		$filepath = $mimetype = $filename = array();
+		$deliveryreceipt = 0;
 
-        $substitutionarray = array(
-            '__LINKACCEPT__' => '<a href="'.dol_buildpath('/datapolicy/public/index.php?action=1&s='.$societe->id.'&l='.$l.'&key='.$code, 3).'" target="_blank">'.$linka.'</a>',
-            '__LINKREFUSED__' => '<a href="'.dol_buildpath('/datapolicy/public/index.php?action=2&s='.$societe->id.'&l='.$l.'&key='.$code, 3).'" target="_blank">'.$linkr.'</a>',
-        );
-        $subject = make_substitutions($subject, $substitutionarray);
-        $message = make_substitutions($message, $substitutionarray);
+		$substitutionarray = array(
+			'__LINKACCEPT__' => '<a href="'.dol_buildpath('/datapolicy/public/index.php?action=1&s='.$societe->id.'&l='.$l.'&key='.$code, 3).'" target="_blank">'.$linka.'</a>',
+			'__LINKREFUSED__' => '<a href="'.dol_buildpath('/datapolicy/public/index.php?action=2&s='.$societe->id.'&l='.$l.'&key='.$code, 3).'" target="_blank">'.$linkr.'</a>',
+		);
+		$subject = make_substitutions($subject, $substitutionarray);
+		$message = make_substitutions($message, $substitutionarray);
 
-        $actiontypecode = 'AC_EMAIL';
-        $actionmsg = $langs->transnoentities('MailSentBy').' '.$from.' '.$langs->transnoentities('To').' '.$sendto;
-        if ($message) {
-            if ($sendtocc) {
-                 $actionmsg .= dol_concatdesc($actionmsg, $langs->transnoentities('Bcc').": ".$sendtocc);
-            }
-            $actionmsg .= dol_concatdesc($actionmsg, $langs->transnoentities('MailTopic').": ".$subject);
-            $actionmsg .= dol_concatdesc($actionmsg, $langs->transnoentities('TextUsedInTheMessageBody').":");
-            $actionmsg .= dol_concatdesc($actionmsg, $message);
-        }
+		$actiontypecode = 'AC_EMAIL';
+		$actionmsg = $langs->transnoentities('MailSentBy').' '.$from.' '.$langs->transnoentities('To').' '.$sendto;
+		if ($message) {
+			if ($sendtocc) {
+				 $actionmsg .= dol_concatdesc($actionmsg, $langs->transnoentities('Bcc').": ".$sendtocc);
+			}
+			$actionmsg .= dol_concatdesc($actionmsg, $langs->transnoentities('MailTopic').": ".$subject);
+			$actionmsg .= dol_concatdesc($actionmsg, $langs->transnoentities('TextUsedInTheMessageBody').":");
+			$actionmsg .= dol_concatdesc($actionmsg, $message);
+		}
 
-        // Send mail
-        require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
-        $mailfile = new CMailFile($subject, $sendto, $from, $message, $filepath, $mimetype, $filename, $sendtocc, $sendtobcc, $deliveryreceipt, -1);
-        if ($mailfile->error) {
-            $resultmasssend .= '<div class="error">'.$mailfile->error.'</div>';
-        } else {
-            $result4 = $mailfile->sendfile();
+		// Send mail
+		require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
+		$mailfile = new CMailFile($subject, $sendto, $from, $message, $filepath, $mimetype, $filename, $sendtocc, $sendtobcc, $deliveryreceipt, -1);
+		if ($mailfile->error) {
+			$resultmasssend .= '<div class="error">'.$mailfile->error.'</div>';
+		} else {
+			$result4 = $mailfile->sendfile();
 
-            if (!$error) {
-                $resultmasssend .= $langs->trans("MailSent").': '.$sendto."<br>";
-                $societe->array_options['options_datapolicy_send'] = date('Y-m-d', time());
-                $societe->update($societe->id);
-            } else {
-                dol_print_error($db);
-            }
-        }
-        setEventMessage($resultmasssend);
-    }
+			if (!$error) {
+				$resultmasssend .= $langs->trans("MailSent").': '.$sendto."<br>";
+				$societe->array_options['options_datapolicy_send'] = date('Y-m-d', time());
+				$societe->update($societe->id);
+			} else {
+				dol_print_error($db);
+			}
+		}
+		setEventMessage($resultmasssend);
+	}
 
-    /**
-     * sendMailDataPolicyAdherent
-     *
-     * @param Adherent	$adherent		Member
-     * @return void
-     */
-    public static function sendMailDataPolicyAdherent($adherent)
-    {
-        global $langs, $conf, $db, $user;
+	/**
+	 * sendMailDataPolicyAdherent
+	 *
+	 * @param Adherent	$adherent		Member
+	 * @return void
+	 */
+	public static function sendMailDataPolicyAdherent($adherent)
+	{
+		global $langs, $conf, $db, $user;
 
-        $error = 0;
+		$error = 0;
 
-        $from = $user->getFullName($langs).' <'.$user->email.'>';
+		$from = $user->getFullName($langs).' <'.$user->email.'>';
 
-        $sendto = $adherent->email;
+		$sendto = $adherent->email;
 
 
-        $code = md5($adherent->email);
-        if (!empty($adherent->default_lang)) {
-            $l = $adherent->default_lang;
-        } else {
-            $l = $langs->defaultlang;
-        }
-        // TODO Use a dolibarr email template
-        $s = 'TXTLINKDATAPOLICIESSUBJECT_'.$l;
-        $ma = 'TXTLINKDATAPOLICIESMESSAGE_'.$l;
-        $la = 'TXTLINKDATAPOLICIESACCEPT_'.$l;
-        $lr = 'TXTLINKDATAPOLICIESREFUSE_'.$l;
+		$code = md5($adherent->email);
+		if (!empty($adherent->default_lang)) {
+			$l = $adherent->default_lang;
+		} else {
+			$l = $langs->defaultlang;
+		}
+		// TODO Use a dolibarr email template
+		$s = 'TXTLINKDATAPOLICIESSUBJECT_'.$l;
+		$ma = 'TXTLINKDATAPOLICIESMESSAGE_'.$l;
+		$la = 'TXTLINKDATAPOLICIESACCEPT_'.$l;
+		$lr = 'TXTLINKDATAPOLICIESREFUSE_'.$l;
 
-        $subject = $conf->global->$s;
-        $message = $conf->global->$ma;
-        $linka = $conf->global->$la;
-        $linkr = $conf->global->$lr;
-        $sendtocc = $sendtobcc = '';
-        $filepath = $mimetype = $filename = array();
-        $deliveryreceipt = 0;
+		$subject = $conf->global->$s;
+		$message = $conf->global->$ma;
+		$linka = $conf->global->$la;
+		$linkr = $conf->global->$lr;
+		$sendtocc = $sendtobcc = '';
+		$filepath = $mimetype = $filename = array();
+		$deliveryreceipt = 0;
 
-        $substitutionarray = array(
-            '__LINKACCEPT__' => '<a href="'.dol_buildpath('/datapolicy/public/index.php?action=1&a='.$adherent->id.'&l='.$l.'&key='.$code, 3).'" target="_blank">'.$linka.'</a>',
-            '__LINKREFUSED__' => '<a href="'.dol_buildpath('/datapolicy/public/index.php?action=2&a='.$adherent->id.'&l='.$l.'&key='.$code, 3).'" target="_blank">'.$linkr.'</a>',
-        );
-        $subject = make_substitutions($subject, $substitutionarray);
-        $message = make_substitutions($message, $substitutionarray);
+		$substitutionarray = array(
+			'__LINKACCEPT__' => '<a href="'.dol_buildpath('/datapolicy/public/index.php?action=1&a='.$adherent->id.'&l='.$l.'&key='.$code, 3).'" target="_blank">'.$linka.'</a>',
+			'__LINKREFUSED__' => '<a href="'.dol_buildpath('/datapolicy/public/index.php?action=2&a='.$adherent->id.'&l='.$l.'&key='.$code, 3).'" target="_blank">'.$linkr.'</a>',
+		);
+		$subject = make_substitutions($subject, $substitutionarray);
+		$message = make_substitutions($message, $substitutionarray);
 
-        $actiontypecode = 'AC_EMAIL';
-        $actionmsg = $langs->transnoentities('MailSentBy').' '.$from.' '.$langs->transnoentities('To').' '.$sendto;
-        if ($message) {
-            if ($sendtocc) {
-                $actionmsg .= dol_concatdesc($actionmsg, $langs->transnoentities('Bcc').": ".$sendtocc);
-            }
-            $actionmsg .= dol_concatdesc($actionmsg, $langs->transnoentities('MailTopic').": ".$subject);
-            $actionmsg .= dol_concatdesc($actionmsg, $langs->transnoentities('TextUsedInTheMessageBody').":");
-            $actionmsg .= dol_concatdesc($actionmsg, $message);
-        }
+		$actiontypecode = 'AC_EMAIL';
+		$actionmsg = $langs->transnoentities('MailSentBy').' '.$from.' '.$langs->transnoentities('To').' '.$sendto;
+		if ($message) {
+			if ($sendtocc) {
+				$actionmsg .= dol_concatdesc($actionmsg, $langs->transnoentities('Bcc').": ".$sendtocc);
+			}
+			$actionmsg .= dol_concatdesc($actionmsg, $langs->transnoentities('MailTopic').": ".$subject);
+			$actionmsg .= dol_concatdesc($actionmsg, $langs->transnoentities('TextUsedInTheMessageBody').":");
+			$actionmsg .= dol_concatdesc($actionmsg, $message);
+		}
 
 
-        // Send mail
-        require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
-        $mailfile = new CMailFile($subject, $sendto, $from, $message, $filepath, $mimetype, $filename, $sendtocc, $sendtobcc, $deliveryreceipt, -1);
-        if ($mailfile->error) {
-            $resultmasssend .= '<div class="error">'.$mailfile->error.'</div>';
-        } else {
-            $result4 = $mailfile->sendfile();
+		// Send mail
+		require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
+		$mailfile = new CMailFile($subject, $sendto, $from, $message, $filepath, $mimetype, $filename, $sendtocc, $sendtobcc, $deliveryreceipt, -1);
+		if ($mailfile->error) {
+			$resultmasssend .= '<div class="error">'.$mailfile->error.'</div>';
+		} else {
+			$result4 = $mailfile->sendfile();
 
-            if (!$error) {
-                $resultmasssend .= $langs->trans("MailSent").': '.$sendto."<br>";
-                $adherent->array_options['options_datapolicy_send'] = date('Y-m-d', time());
-                $adherent->update($user);
-            } else {
-                dol_print_error($db);
-            }
-        }
-        setEventMessage($resultmasssend);
-    }
+			if (!$error) {
+				$resultmasssend .= $langs->trans("MailSent").': '.$sendto."<br>";
+				$adherent->array_options['options_datapolicy_send'] = date('Y-m-d', time());
+				$adherent->update($user);
+			} else {
+				dol_print_error($db);
+			}
+		}
+		setEventMessage($resultmasssend);
+	}
 }
diff --git a/htdocs/datapolicy/class/datapolicycron.class.php b/htdocs/datapolicy/class/datapolicycron.class.php
index 280f900f307..e1d8f7c36d4 100644
--- a/htdocs/datapolicy/class/datapolicycron.class.php
+++ b/htdocs/datapolicy/class/datapolicycron.class.php
@@ -38,26 +38,26 @@ class DataPolicyCron
 	}
 
 
-    /**
-     * Function exec
+	/**
+	 * Function exec
 	 * CAN BE A CRON TASK
-     *
+	 *
 	 * @return	int									0 if OK, <>0 if KO (this function is used also by cron so only 0 is OK)
-     */
+	 */
 	public function cleanDataForDataPolicy()
-    {
-        global $conf, $langs, $user;
+	{
+		global $conf, $langs, $user;
 
-        $langs->load('datapolicy@datapolicy');
+		$langs->load('datapolicy@datapolicy');
 
-        $error = 0;
-        $errormsg = '';
-        $nbupdated = $nbdeleted = 0;
+		$error = 0;
+		$errormsg = '';
+		$nbupdated = $nbdeleted = 0;
 
-        // FIXME Removed hardcoded values of id
-        $arrayofparameters = array(
-            'DATAPOLICIES_TIERS_CLIENT' => array(
-                'sql' => "
+		// FIXME Removed hardcoded values of id
+		$arrayofparameters = array(
+			'DATAPOLICIES_TIERS_CLIENT' => array(
+				'sql' => "
                     SELECT s.rowid FROM ".MAIN_DB_PREFIX."societe as s
                     WHERE (s.fk_forme_juridique IN (11, 12, 13, 15, 17, 18, 19, 35, 60, 312, 316, 401, 600, 700, 1005) OR s.fk_typent = 8)
                     AND s.entity = %d
@@ -71,28 +71,28 @@ class DataPolicyCron
                         AND a.fk_soc IS NOT NULL
                     )
                 ",
-                "class" => "Societe",
-                "file" => DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php',
-                'fields_anonym' => array(
-                    'name' => $langs->trans('ANONYME'),
-                    'name_bis' => '',
-                    'name_alias' => '',
-                    'address' => '',
-                    'town' => '',
-                    'zip' => '',
-                    'phone' => '',
-                    'email' => '',
-                    'url' => '',
-                    'fax' => '',
-                    'state' => '',
-                    'country' => '',
-                    'state_id' => '',
-                    'skype' => '',
-                    'country_id' => '',
-                )
-            ),
-            'DATAPOLICIES_TIERS_PROSPECT' => array(
-                'sql' => "
+				"class" => "Societe",
+				"file" => DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php',
+				'fields_anonym' => array(
+					'name' => $langs->trans('ANONYME'),
+					'name_bis' => '',
+					'name_alias' => '',
+					'address' => '',
+					'town' => '',
+					'zip' => '',
+					'phone' => '',
+					'email' => '',
+					'url' => '',
+					'fax' => '',
+					'state' => '',
+					'country' => '',
+					'state_id' => '',
+					'skype' => '',
+					'country_id' => '',
+				)
+			),
+			'DATAPOLICIES_TIERS_PROSPECT' => array(
+				'sql' => "
                     SELECT s.rowid FROM ".MAIN_DB_PREFIX."societe as s
                     WHERE (s.fk_forme_juridique IN (11, 12, 13, 15, 17, 18, 19, 35, 60, 312, 316, 401, 600, 700, 1005) OR s.fk_typent = 8)
                     AND s.entity = %d
@@ -106,28 +106,28 @@ class DataPolicyCron
                         AND a.fk_soc IS NOT NULL
                     )
                 ",
-                "class" => "Societe",
-                "file" => DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php',
-                'fields_anonym' => array(
-                    'name' => $langs->trans('ANONYME'),
-                    'name_bis' => '',
-                    'name_alias' => '',
-                    'address' => '',
-                    'town' => '',
-                    'zip' => '',
-                    'phone' => '',
-                    'email' => '',
-                    'url' => '',
-                    'fax' => '',
-                    'state' => '',
-                    'country' => '',
-                    'state_id' => '',
-                    'skype' => '',
-                    'country_id' => '',
-                )
-            ),
-            'DATAPOLICIES_TIERS_PROSPECT_CLIENT' => array(
-                'sql' => "
+				"class" => "Societe",
+				"file" => DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php',
+				'fields_anonym' => array(
+					'name' => $langs->trans('ANONYME'),
+					'name_bis' => '',
+					'name_alias' => '',
+					'address' => '',
+					'town' => '',
+					'zip' => '',
+					'phone' => '',
+					'email' => '',
+					'url' => '',
+					'fax' => '',
+					'state' => '',
+					'country' => '',
+					'state_id' => '',
+					'skype' => '',
+					'country_id' => '',
+				)
+			),
+			'DATAPOLICIES_TIERS_PROSPECT_CLIENT' => array(
+				'sql' => "
                     SELECT s.rowid FROM ".MAIN_DB_PREFIX."societe as s
                     WHERE (s.fk_forme_juridique  IN (11, 12, 13, 15, 17, 18, 19, 35, 60, 312, 316, 401, 600, 700, 1005) OR s.fk_typent = 8)
                     AND s.entity = %d
@@ -141,28 +141,28 @@ class DataPolicyCron
                         AND a.fk_soc IS NOT NULL
                     )
                 ",
-                "class" => "Societe",
-                "file" => DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php',
-                'fields_anonym' => array(
-                    'name' => $langs->trans('ANONYME'),
-                    'name_bis' => '',
-                    'name_alias' => '',
-                    'address' => '',
-                    'town' => '',
-                    'zip' => '',
-                    'phone' => '',
-                    'email' => '',
-                    'url' => '',
-                    'fax' => '',
-                    'state' => '',
-                    'country' => '',
-                    'state_id' => '',
-                    'skype' => '',
-                    'country_id' => '',
-                )
-            ),
-            'DATAPOLICIES_TIERS_NIPROSPECT_NICLIENT' => array(
-                'sql' => "
+				"class" => "Societe",
+				"file" => DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php',
+				'fields_anonym' => array(
+					'name' => $langs->trans('ANONYME'),
+					'name_bis' => '',
+					'name_alias' => '',
+					'address' => '',
+					'town' => '',
+					'zip' => '',
+					'phone' => '',
+					'email' => '',
+					'url' => '',
+					'fax' => '',
+					'state' => '',
+					'country' => '',
+					'state_id' => '',
+					'skype' => '',
+					'country_id' => '',
+				)
+			),
+			'DATAPOLICIES_TIERS_NIPROSPECT_NICLIENT' => array(
+				'sql' => "
                     SELECT s.rowid FROM ".MAIN_DB_PREFIX."societe as s
                     WHERE (s.fk_forme_juridique  IN (11, 12, 13, 15, 17, 18, 19, 35, 60, 312, 316, 401, 600, 700, 1005) OR s.fk_typent = 8)
                     AND s.entity = %d
@@ -176,28 +176,28 @@ class DataPolicyCron
                         AND a.fk_soc IS NOT NULL
                     )
                 ",
-                "class" => "Societe",
-                "file" => DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php',
-                'fields_anonym' => array(
-                    'name' => $langs->trans('ANONYME'),
-                    'name_bis' => '',
-                    'name_alias' => '',
-                    'address' => '',
-                    'town' => '',
-                    'zip' => '',
-                    'phone' => '',
-                    'email' => '',
-                    'url' => '',
-                    'fax' => '',
-                    'state' => '',
-                    'country' => '',
-                    'state_id' => '',
-                    'skype' => '',
-                    'country_id' => '',
-                )
-            ),
-            'DATAPOLICIES_TIERS_FOURNISSEUR' => array(
-                'sql' => "
+				"class" => "Societe",
+				"file" => DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php',
+				'fields_anonym' => array(
+					'name' => $langs->trans('ANONYME'),
+					'name_bis' => '',
+					'name_alias' => '',
+					'address' => '',
+					'town' => '',
+					'zip' => '',
+					'phone' => '',
+					'email' => '',
+					'url' => '',
+					'fax' => '',
+					'state' => '',
+					'country' => '',
+					'state_id' => '',
+					'skype' => '',
+					'country_id' => '',
+				)
+			),
+			'DATAPOLICIES_TIERS_FOURNISSEUR' => array(
+				'sql' => "
                     SELECT s.rowid FROM ".MAIN_DB_PREFIX."societe as s
                     WHERE (s.fk_forme_juridique  IN (11, 12, 13, 15, 17, 18, 19, 35, 60, 312, 316, 401, 600, 700, 1005) OR s.fk_typent = 8)
                     AND s.entity = %d
@@ -210,28 +210,28 @@ class DataPolicyCron
                         AND a.fk_contact IS NOT NULL
                     )
                 ",
-                "class" => "Societe",
-                "file" => DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php',
-                'fields_anonym' => array(
-                    'name' => $langs->trans('ANONYME'),
-                    'name_bis' => '',
-                    'name_alias' => '',
-                    'address' => '',
-                    'town' => '',
-                    'zip' => '',
-                    'phone' => '',
-                    'email' => '',
-                    'url' => '',
-                    'fax' => '',
-                    'state' => '',
-                    'country' => '',
-                    'state_id' => '',
-                    'skype' => '',
-                    'country_id' => '',
-                )
-            ),
-            'DATAPOLICIES_CONTACT_CLIENT' => array(
-                'sql' => "
+				"class" => "Societe",
+				"file" => DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php',
+				'fields_anonym' => array(
+					'name' => $langs->trans('ANONYME'),
+					'name_bis' => '',
+					'name_alias' => '',
+					'address' => '',
+					'town' => '',
+					'zip' => '',
+					'phone' => '',
+					'email' => '',
+					'url' => '',
+					'fax' => '',
+					'state' => '',
+					'country' => '',
+					'state_id' => '',
+					'skype' => '',
+					'country_id' => '',
+				)
+			),
+			'DATAPOLICIES_CONTACT_CLIENT' => array(
+				'sql' => "
                     SELECT c.rowid FROM ".MAIN_DB_PREFIX."socpeople as c
                     INNER JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = c.fk_soc
                     WHERE c.entity = %d
@@ -245,32 +245,32 @@ class DataPolicyCron
                         AND a.fk_contact IS NOT NULL
                     )
                 ",
-                "class" => "Contact",
-                "file" => DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php',
-                'fields_anonym' => array(
-                    'lastname' => $langs->trans('ANONYME'),
-                    'firstname' => '',
-                    'civility_id' => '',
-                    'poste' => '',
-                    'address' => '',
-                    'town' => '',
-                    'zip' => '',
-                    'phone_pro' => '',
-                    'phone_perso' => '',
-                    'phone_mobile' => '',
-                    'email' => '',
-                    'url' => '',
-                    'fax' => '',
-                    'state' => '',
-                    'country' => '',
-                    'state_id' => '',
-                    'skype' => '',
-                    'jabberid' => '',
-                    'country_id' => '',
-                )
-            ),
-            'DATAPOLICIES_CONTACT_PROSPECT' => array(
-                'sql' => "
+				"class" => "Contact",
+				"file" => DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php',
+				'fields_anonym' => array(
+					'lastname' => $langs->trans('ANONYME'),
+					'firstname' => '',
+					'civility_id' => '',
+					'poste' => '',
+					'address' => '',
+					'town' => '',
+					'zip' => '',
+					'phone_pro' => '',
+					'phone_perso' => '',
+					'phone_mobile' => '',
+					'email' => '',
+					'url' => '',
+					'fax' => '',
+					'state' => '',
+					'country' => '',
+					'state_id' => '',
+					'skype' => '',
+					'jabberid' => '',
+					'country_id' => '',
+				)
+			),
+			'DATAPOLICIES_CONTACT_PROSPECT' => array(
+				'sql' => "
                     SELECT c.rowid FROM ".MAIN_DB_PREFIX."socpeople as c
                     INNER JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = c.fk_soc
                     WHERE c.entity = %d
@@ -284,32 +284,32 @@ class DataPolicyCron
                         AND a.fk_contact IS NOT NULL
                     )
                 ",
-                "class" => "Contact",
-                "file" => DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php',
-                'fields_anonym' => array(
-                    'lastname' => $langs->trans('ANONYME'),
-                    'firstname' => '',
-                    'civility_id' => '',
-                    'poste' => '',
-                    'address' => '',
-                    'town' => '',
-                    'zip' => '',
-                    'phone_pro' => '',
-                    'phone_perso' => '',
-                    'phone_mobile' => '',
-                    'email' => '',
-                    'url' => '',
-                    'fax' => '',
-                    'state' => '',
-                    'country' => '',
-                    'state_id' => '',
-                    'skype' => '',
-                    'jabberid' => '',
-                    'country_id' => '',
-                )
-            ),
-            'DATAPOLICIES_CONTACT_PROSPECT_CLIENT' => array(
-                'sql' => "
+				"class" => "Contact",
+				"file" => DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php',
+				'fields_anonym' => array(
+					'lastname' => $langs->trans('ANONYME'),
+					'firstname' => '',
+					'civility_id' => '',
+					'poste' => '',
+					'address' => '',
+					'town' => '',
+					'zip' => '',
+					'phone_pro' => '',
+					'phone_perso' => '',
+					'phone_mobile' => '',
+					'email' => '',
+					'url' => '',
+					'fax' => '',
+					'state' => '',
+					'country' => '',
+					'state_id' => '',
+					'skype' => '',
+					'jabberid' => '',
+					'country_id' => '',
+				)
+			),
+			'DATAPOLICIES_CONTACT_PROSPECT_CLIENT' => array(
+				'sql' => "
                     SELECT c.rowid FROM ".MAIN_DB_PREFIX."socpeople as c
                     INNER JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = c.fk_soc
                     WHERE c.entity = %d
@@ -323,32 +323,32 @@ class DataPolicyCron
                         AND a.fk_contact IS NOT NULL
                     )
                 ",
-                "class" => "Contact",
-                "file" => DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php',
-                'fields_anonym' => array(
-                    'lastname' => $langs->trans('ANONYME'),
-                    'firstname' => '',
-                    'civility_id' => '',
-                    'poste' => '',
-                    'address' => '',
-                    'town' => '',
-                    'zip' => '',
-                    'phone_pro' => '',
-                    'phone_perso' => '',
-                    'phone_mobile' => '',
-                    'email' => '',
-                    'url' => '',
-                    'fax' => '',
-                    'state' => '',
-                    'country' => '',
-                    'state_id' => '',
-                    'skype' => '',
-                    'jabberid' => '',
-                    'country_id' => '',
-                )
-            ),
-            'DATAPOLICIES_CONTACT_NIPROSPECT_NICLIENT' => array(
-                'sql' => "
+				"class" => "Contact",
+				"file" => DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php',
+				'fields_anonym' => array(
+					'lastname' => $langs->trans('ANONYME'),
+					'firstname' => '',
+					'civility_id' => '',
+					'poste' => '',
+					'address' => '',
+					'town' => '',
+					'zip' => '',
+					'phone_pro' => '',
+					'phone_perso' => '',
+					'phone_mobile' => '',
+					'email' => '',
+					'url' => '',
+					'fax' => '',
+					'state' => '',
+					'country' => '',
+					'state_id' => '',
+					'skype' => '',
+					'jabberid' => '',
+					'country_id' => '',
+				)
+			),
+			'DATAPOLICIES_CONTACT_NIPROSPECT_NICLIENT' => array(
+				'sql' => "
                     SELECT c.rowid FROM ".MAIN_DB_PREFIX."socpeople as c
                     INNER JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = c.fk_soc
                     WHERE c.entity = %d
@@ -362,32 +362,32 @@ class DataPolicyCron
                         AND a.fk_contact IS NOT NULL
                     )
                 ",
-                "class" => "Contact",
-                "file" => DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php',
-                'fields_anonym' => array(
-                    'lastname' => $langs->trans('ANONYME'),
-                    'firstname' => '',
-                    'civility_id' => '',
-                    'poste' => '',
-                    'address' => '',
-                    'town' => '',
-                    'zip' => '',
-                    'phone_pro' => '',
-                    'phone_perso' => '',
-                    'phone_mobile' => '',
-                    'email' => '',
-                    'url' => '',
-                    'fax' => '',
-                    'state' => '',
-                    'country' => '',
-                    'state_id' => '',
-                    'skype' => '',
-                    'jabberid' => '',
-                    'country_id' => '',
-                )
-            ),
-            'DATAPOLICIES_CONTACT_FOURNISSEUR' => array(
-                'sql' => "
+				"class" => "Contact",
+				"file" => DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php',
+				'fields_anonym' => array(
+					'lastname' => $langs->trans('ANONYME'),
+					'firstname' => '',
+					'civility_id' => '',
+					'poste' => '',
+					'address' => '',
+					'town' => '',
+					'zip' => '',
+					'phone_pro' => '',
+					'phone_perso' => '',
+					'phone_mobile' => '',
+					'email' => '',
+					'url' => '',
+					'fax' => '',
+					'state' => '',
+					'country' => '',
+					'state_id' => '',
+					'skype' => '',
+					'jabberid' => '',
+					'country_id' => '',
+				)
+			),
+			'DATAPOLICIES_CONTACT_FOURNISSEUR' => array(
+				'sql' => "
                     SELECT c.rowid FROM ".MAIN_DB_PREFIX."socpeople as c
                     INNER JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = c.fk_soc
                     WHERE c.entity = %d
@@ -400,32 +400,32 @@ class DataPolicyCron
                         AND a.fk_contact IS NOT NULL
                     )
                 ",
-                "class" => "Contact",
-                "file" => DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php',
-                'fields_anonym' => array(
-                    'lastname' => $langs->trans('ANONYME'),
-                    'firstname' => '',
-                    'civility_id' => '',
-                    'poste' => '',
-                    'address' => '',
-                    'town' => '',
-                    'zip' => '',
-                    'phone_pro' => '',
-                    'phone_perso' => '',
-                    'phone_mobile' => '',
-                    'email' => '',
-                    'url' => '',
-                    'fax' => '',
-                    'state' => '',
-                    'country' => '',
-                    'state_id' => '',
-                    'skype' => '',
-                    'jabberid' => '',
-                    'country_id' => '',
-                )
-            ),
-            'DATAPOLICIES_ADHERENT' => array(
-                'sql' => "
+				"class" => "Contact",
+				"file" => DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php',
+				'fields_anonym' => array(
+					'lastname' => $langs->trans('ANONYME'),
+					'firstname' => '',
+					'civility_id' => '',
+					'poste' => '',
+					'address' => '',
+					'town' => '',
+					'zip' => '',
+					'phone_pro' => '',
+					'phone_perso' => '',
+					'phone_mobile' => '',
+					'email' => '',
+					'url' => '',
+					'fax' => '',
+					'state' => '',
+					'country' => '',
+					'state_id' => '',
+					'skype' => '',
+					'jabberid' => '',
+					'country_id' => '',
+				)
+			),
+			'DATAPOLICIES_ADHERENT' => array(
+				'sql' => "
                     SELECT a.rowid FROM ".MAIN_DB_PREFIX."adherent as a
                     WHERE a.entity = %d
                     AND a.tms < DATE_SUB(NOW(), INTERVAL %d MONTH)
@@ -437,109 +437,109 @@ class DataPolicyCron
                         AND a.fk_element IS NOT NULL
                     )
                 ",
-                "class" => "Adherent",
-                "file" => DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php',
-                'fields_anonym' => array(
-                    'lastname' => $langs->trans('ANONYME'),
-                    'firstname' => $langs->trans('ANONYME'),
-                    'civility_id' => '',
-                    'societe' => '',
-                    'address' => '',
-                    'town' => '',
-                    'zip' => '',
-                    'phone' => '',
-                    'phone_perso' => '',
-                    'phone_mobile' => '',
-                    'email' => '',
-                    'url' => '',
-                    'fax' => '',
-                    'state' => '',
-                    'country' => '',
-                    'state_id' => '',
-                    'skype' => '',
-                    'country_id' => '',
-                )
-            ),
-        );
+				"class" => "Adherent",
+				"file" => DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php',
+				'fields_anonym' => array(
+					'lastname' => $langs->trans('ANONYME'),
+					'firstname' => $langs->trans('ANONYME'),
+					'civility_id' => '',
+					'societe' => '',
+					'address' => '',
+					'town' => '',
+					'zip' => '',
+					'phone' => '',
+					'phone_perso' => '',
+					'phone_mobile' => '',
+					'email' => '',
+					'url' => '',
+					'fax' => '',
+					'state' => '',
+					'country' => '',
+					'state_id' => '',
+					'skype' => '',
+					'country_id' => '',
+				)
+			),
+		);
 
-        $this->db->begin();
+		$this->db->begin();
 
-        foreach ($arrayofparameters as $key => $params)
-        {
-            if ($conf->global->$key != '' && is_numeric($conf->global->$key) && (int) $conf->global->$key > 0)
-            {
-                $sql = sprintf($params['sql'], (int) $conf->entity, (int) $conf->global->$key, (int) $conf->global->$key);
+		foreach ($arrayofparameters as $key => $params)
+		{
+			if ($conf->global->$key != '' && is_numeric($conf->global->$key) && (int) $conf->global->$key > 0)
+			{
+				$sql = sprintf($params['sql'], (int) $conf->entity, (int) $conf->global->$key, (int) $conf->global->$key);
 
-                $resql = $this->db->query($sql);
+				$resql = $this->db->query($sql);
 
-                if ($resql && $this->db->num_rows($resql) > 0)
-                {
-                    $num = $this->db->num_rows($resql);
-                    $i = 0;
+				if ($resql && $this->db->num_rows($resql) > 0)
+				{
+					$num = $this->db->num_rows($resql);
+					$i = 0;
 
-                    require_once $params['file'];
-                    $object = new $params['class']($this->db);
+					require_once $params['file'];
+					$object = new $params['class']($this->db);
 
-                    while ($i < $num && !$error)
-                    {
-                        $obj = $this->db->fetch_object($resql);
+					while ($i < $num && !$error)
+					{
+						$obj = $this->db->fetch_object($resql);
 
-                        $object->fetch($obj->rowid);
-                        $object->id = $obj->rowid;
+						$object->fetch($obj->rowid);
+						$object->id = $obj->rowid;
 
-                        if ($object->isObjectUsed($obj->rowid) > 0)			// If object to clean is used
-                        {
-                            foreach ($params['fields_anonym'] as $fields => $val) {
-                                $object->$fields = $val;
-                            }
-                            $result = $object->update($obj->rowid, $user);
-                            if ($result > 0)
-                            {
-	                            if ($params['class'] == 'Societe') {
-	                                // We delete contacts of thirdparty
-	                                $sql = "DELETE FROM ".MAIN_DB_PREFIX."socpeople WHERE fk_soc = ".$obj->rowid;
-	                                $result = $this->db->query($sql);
-	                                if ($result < 0)
-	                                {
-	                                	$errormsg = $this->db->lasterror();
-	                                	$error++;
-	                                }
-	                            }
-                            } else {
-                            	$errormsg = $object->error;
-                            	$error++;
-                            }
-                            $nbupdated++;
-                        } else {											// If object to clean is not used
-                            if ($object->element == 'adherent') {
-                            	$result = $object->delete($obj->rowid, $user);
-                            } else {
-                            	$result = $object->delete($user);
-                            }
-                            if ($result < 0)
-                            {
-                            	$errormsg = $object->error;
-                            	$error++;
-                            }
+						if ($object->isObjectUsed($obj->rowid) > 0)			// If object to clean is used
+						{
+							foreach ($params['fields_anonym'] as $fields => $val) {
+								$object->$fields = $val;
+							}
+							$result = $object->update($obj->rowid, $user);
+							if ($result > 0)
+							{
+								if ($params['class'] == 'Societe') {
+									// We delete contacts of thirdparty
+									$sql = "DELETE FROM ".MAIN_DB_PREFIX."socpeople WHERE fk_soc = ".$obj->rowid;
+									$result = $this->db->query($sql);
+									if ($result < 0)
+									{
+										$errormsg = $this->db->lasterror();
+										$error++;
+									}
+								}
+							} else {
+								$errormsg = $object->error;
+								$error++;
+							}
+							$nbupdated++;
+						} else {											// If object to clean is not used
+							if ($object->element == 'adherent') {
+								$result = $object->delete($obj->rowid, $user);
+							} else {
+								$result = $object->delete($user);
+							}
+							if ($result < 0)
+							{
+								$errormsg = $object->error;
+								$error++;
+							}
 
-                            $nbdeleted++;
-                        }
+							$nbdeleted++;
+						}
 
-                        $i++;
-                    }
-                }
-            }
-        }
+						$i++;
+					}
+				}
+			}
+		}
 
-        $this->db->commit();
+		$this->db->commit();
 
-        if (!$error)
-        {
-        	$this->output = $nbupdated.' record updated, '.$nbdeleted.' record deleted';
-        } else {
-        	$this->error = $errormsg;
-        }
+		if (!$error)
+		{
+			$this->output = $nbupdated.' record updated, '.$nbdeleted.' record deleted';
+		} else {
+			$this->error = $errormsg;
+		}
 
-        return 0;
-    }
+		return 0;
+	}
 }
diff --git a/htdocs/datapolicy/lib/datapolicy.lib.php b/htdocs/datapolicy/lib/datapolicy.lib.php
index 57f34320d9b..02ac575047e 100644
--- a/htdocs/datapolicy/lib/datapolicy.lib.php
+++ b/htdocs/datapolicy/lib/datapolicy.lib.php
@@ -29,28 +29,28 @@
  */
 function datapolicyAdminPrepareHead()
 {
-    global $langs, $conf;
+	global $langs, $conf;
 
-    $langs->load("datapolicy@datapolicy");
+	$langs->load("datapolicy@datapolicy");
 
-    $h = 0;
-    $head = array();
+	$h = 0;
+	$head = array();
 
-    $head[$h][0] = DOL_URL_ROOT."/datapolicy/admin/setup.php";
-    $head[$h][1] = $langs->trans("Deletion");
-    $head[$h][2] = 'settings';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT."/datapolicy/admin/setup.php";
+	$head[$h][1] = $langs->trans("Deletion");
+	$head[$h][2] = 'settings';
+	$h++;
 
-    if (!empty($conf->global->DATAPOLICIES_ENABLE_EMAILS)) {
-        $head[$h][0] = DOL_URL_ROOT."/datapolicy/admin/setupmail.php";
-        $head[$h][1] = $langs->trans("DATAPOLICIESMail");
-        $head[$h][2] = 'settings';
-        $h++;
-    }
+	if (!empty($conf->global->DATAPOLICIES_ENABLE_EMAILS)) {
+		$head[$h][0] = DOL_URL_ROOT."/datapolicy/admin/setupmail.php";
+		$head[$h][1] = $langs->trans("DATAPOLICIESMail");
+		$head[$h][2] = 'settings';
+		$h++;
+	}
 
-    complete_head_from_modules($conf, $langs, null, $head, $h, 'datapolicy');
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'datapolicy');
 
-    complete_head_from_modules($conf, $langs, null, $head, $h, 'datapolicy', 'remove');
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'datapolicy', 'remove');
 
-    return $head;
+	return $head;
 }
diff --git a/htdocs/datapolicy/public/index.php b/htdocs/datapolicy/public/index.php
index 079bcd340da..0930d7d07d7 100644
--- a/htdocs/datapolicy/public/index.php
+++ b/htdocs/datapolicy/public/index.php
@@ -23,11 +23,11 @@
  */
 
 if (!defined('NOLOGIN'))
-    define("NOLOGIN", 1); // This means this output page does not require to be logged.
+	define("NOLOGIN", 1); // This means this output page does not require to be logged.
 if (!defined('NOCSRFCHECK'))
-    define('NOCSRFCHECK', '1'); // Do not check anti CSRF attack test
+	define('NOCSRFCHECK', '1'); // Do not check anti CSRF attack test
 if (!defined('NOREQUIREMENU'))
-    define('NOREQUIREMENU', '1');
+	define('NOREQUIREMENU', '1');
 
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
@@ -48,73 +48,73 @@ $ref = "DATAPOLICIESREFUSE_".$lang;
 $langs->load('datapolicy@datapolicy', 0, 0, $lang);
 
 if (empty($action) || (empty($idc) && empty($ids) && empty($ida))) {
-    return 0;
+	return 0;
 } elseif (!empty($idc)) {
-    $contact = new Contact($db);
-    $contact->fetch($idc);
-    $check = md5($contact->email);
-    if ($check != $code) {
-        $return = $langs->trans('ErrorEmailDATAPOLICIES');
-    } elseif ($action == 1) {
-        $contact->array_options['options_datapolicy_consentement'] = 1;
-        $contact->array_options['options_datapolicy_opposition_traitement'] = 0;
-        $contact->array_options['options_datapolicy_opposition_prospection'] = 0;
-        $contact->array_options['options_datapolicy_date'] = date('Y-m-d', time());
+	$contact = new Contact($db);
+	$contact->fetch($idc);
+	$check = md5($contact->email);
+	if ($check != $code) {
+		$return = $langs->trans('ErrorEmailDATAPOLICIES');
+	} elseif ($action == 1) {
+		$contact->array_options['options_datapolicy_consentement'] = 1;
+		$contact->array_options['options_datapolicy_opposition_traitement'] = 0;
+		$contact->array_options['options_datapolicy_opposition_prospection'] = 0;
+		$contact->array_options['options_datapolicy_date'] = date('Y-m-d', time());
 
-        $return = $conf->global->$acc;
-    } elseif ($action == 2) {
-        $contact->no_email = 1;
-        $contact->array_options['options_datapolicy_consentement'] = 0;
-        $contact->array_options['options_datapolicy_opposition_traitement'] = 1;
-        $contact->array_options['options_datapolicy_opposition_prospection'] = 1;
-        $contact->array_options['options_datapolicy_date'] = date('Y-m-d', time());
+		$return = $conf->global->$acc;
+	} elseif ($action == 2) {
+		$contact->no_email = 1;
+		$contact->array_options['options_datapolicy_consentement'] = 0;
+		$contact->array_options['options_datapolicy_opposition_traitement'] = 1;
+		$contact->array_options['options_datapolicy_opposition_prospection'] = 1;
+		$contact->array_options['options_datapolicy_date'] = date('Y-m-d', time());
 
-        $return = $conf->global->$ref;
-    }
-    $contact->update($idc);
+		$return = $conf->global->$ref;
+	}
+	$contact->update($idc);
 } elseif (!empty($ids)) {
-    $societe = new Societe($db);
-    $societe->fetch($ids);
-    $check = md5($societe->email);
-    if ($check != $code) {
-        $return = $langs->trans('ErrorEmailDATAPOLICIES');
-    } elseif ($action == 1) {
-        $societe->array_options['options_datapolicy_consentement'] = 1;
-        $societe->array_options['options_datapolicy_opposition_traitement'] = 0;
-        $societe->array_options['options_datapolicy_opposition_prospection'] = 0;
-        $societe->array_options['options_datapolicy_date'] = date('Y-m-d', time());
-        $return = $conf->global->$acc;
-    } elseif ($action == 2) {
-        $societe->array_options['options_datapolicy_consentement'] = 0;
-        $societe->array_options['options_datapolicy_opposition_traitement'] = 1;
-        $societe->array_options['options_datapolicy_opposition_prospection'] = 1;
-        $societe->array_options['options_datapolicy_date'] = date('Y-m-d', time());
+	$societe = new Societe($db);
+	$societe->fetch($ids);
+	$check = md5($societe->email);
+	if ($check != $code) {
+		$return = $langs->trans('ErrorEmailDATAPOLICIES');
+	} elseif ($action == 1) {
+		$societe->array_options['options_datapolicy_consentement'] = 1;
+		$societe->array_options['options_datapolicy_opposition_traitement'] = 0;
+		$societe->array_options['options_datapolicy_opposition_prospection'] = 0;
+		$societe->array_options['options_datapolicy_date'] = date('Y-m-d', time());
+		$return = $conf->global->$acc;
+	} elseif ($action == 2) {
+		$societe->array_options['options_datapolicy_consentement'] = 0;
+		$societe->array_options['options_datapolicy_opposition_traitement'] = 1;
+		$societe->array_options['options_datapolicy_opposition_prospection'] = 1;
+		$societe->array_options['options_datapolicy_date'] = date('Y-m-d', time());
 
-        $return = $conf->global->$ref;
-    }
-    $societe->update($ids);
+		$return = $conf->global->$ref;
+	}
+	$societe->update($ids);
 } elseif (!empty($ida)) {
-    $adherent = new Adherent($db);
-    $adherent->fetch($ida);
-    $check = md5($adherent->email);
-    if ($check != $code) {
-        $return = $langs->trans('ErrorEmailDATAPOLICIES');
-    } elseif ($action == 1) {
-        $adherent->array_options['options_datapolicy_consentement'] = 1;
-        $adherent->array_options['options_datapolicy_opposition_traitement'] = 0;
-        $adherent->array_options['options_datapolicy_opposition_prospection'] = 0;
-        //$adherent->array_options['options_datapolicy_date'] = date('Y-m-d', time());
-        $return = $conf->global->$acc;
-    } elseif ($action == 2) {
-        $adherent->array_options['options_datapolicy_consentement'] = 0;
-        $adherent->array_options['options_datapolicy_opposition_traitement'] = 1;
-        $adherent->array_options['options_datapolicy_opposition_prospection'] = 1;
-        //$adherent->array_options['options_datapolicy_date'] = date('Y-m-d', time());
+	$adherent = new Adherent($db);
+	$adherent->fetch($ida);
+	$check = md5($adherent->email);
+	if ($check != $code) {
+		$return = $langs->trans('ErrorEmailDATAPOLICIES');
+	} elseif ($action == 1) {
+		$adherent->array_options['options_datapolicy_consentement'] = 1;
+		$adherent->array_options['options_datapolicy_opposition_traitement'] = 0;
+		$adherent->array_options['options_datapolicy_opposition_prospection'] = 0;
+		//$adherent->array_options['options_datapolicy_date'] = date('Y-m-d', time());
+		$return = $conf->global->$acc;
+	} elseif ($action == 2) {
+		$adherent->array_options['options_datapolicy_consentement'] = 0;
+		$adherent->array_options['options_datapolicy_opposition_traitement'] = 1;
+		$adherent->array_options['options_datapolicy_opposition_prospection'] = 1;
+		//$adherent->array_options['options_datapolicy_date'] = date('Y-m-d', time());
 
-        $return = $conf->global->$ref;
-    }
-    $newuser = new User($db);
-    $adherent->update($newuser);
+		$return = $conf->global->$ref;
+	}
+	$newuser = new User($db);
+	$adherent->update($newuser);
 }
 
 header("Content-type: text/html; charset=".$conf->file->character_set_client);
diff --git a/htdocs/dav/dav.class.php b/htdocs/dav/dav.class.php
index 195f8e800a7..3a73f61c70c 100644
--- a/htdocs/dav/dav.class.php
+++ b/htdocs/dav/dav.class.php
@@ -34,14 +34,14 @@ class CdavLib
 
 	private $langs;
 
-    /**
-     * Constructor
-     *
-     * @param   User        $user   user
-     * @param   DoliDB      $db     Database handler
-     * @param   Translate   $langs  translation
-     */
-    public function __construct($user, $db, $langs)
+	/**
+	 * Constructor
+	 *
+	 * @param   User        $user   user
+	 * @param   DoliDB      $db     Database handler
+	 * @param   Translate   $langs  translation
+	 */
+	public function __construct($user, $db, $langs)
 	{
 		$this->user = $user;
 		$this->db = $db;
@@ -231,15 +231,15 @@ class CdavLib
 		return $caldata;
 	}
 
-    /**
-     * getFullCalendarObjects
-     *
-     * @param int	 	$calendarId			Calendar id
-     * @param int		$bCalendarData		Add calendar data
-     * @return array|string[][]
-     */
-    public function getFullCalendarObjects($calendarId, $bCalendarData)
-    {
+	/**
+	 * getFullCalendarObjects
+	 *
+	 * @param int	 	$calendarId			Calendar id
+	 * @param int		$bCalendarData		Add calendar data
+	 * @return array|string[][]
+	 */
+	public function getFullCalendarObjects($calendarId, $bCalendarData)
+	{
 		$calid = ($calendarId * 1);
 		$calevents = array();
 
diff --git a/htdocs/dav/fileserver.php b/htdocs/dav/fileserver.php
index 18b8bc8b07c..bd6df769553 100644
--- a/htdocs/dav/fileserver.php
+++ b/htdocs/dav/fileserver.php
@@ -194,8 +194,8 @@ $server->addPlugin($lockPlugin);
 // Support for html frontend
 if (empty($conf->global->DAV_DISABLE_BROWSER))
 {
-    $browser = new \Sabre\DAV\Browser\Plugin();
-    $server->addPlugin($browser);
+	$browser = new \Sabre\DAV\Browser\Plugin();
+	$server->addPlugin($browser);
 }
 
 // Automatically guess (some) contenttypes, based on extension
diff --git a/htdocs/debugbar/class/DataCollector/DolConfigCollector.php b/htdocs/debugbar/class/DataCollector/DolConfigCollector.php
index a21693ef327..715d20abcf9 100644
--- a/htdocs/debugbar/class/DataCollector/DolConfigCollector.php
+++ b/htdocs/debugbar/class/DataCollector/DolConfigCollector.php
@@ -76,8 +76,8 @@ class DolConfigCollector extends ConfigCollector
 	 */
 	protected function objectToArray($obj)
 	{
-	    // phpcs:enable
-	    $arr = array();
+		// phpcs:enable
+		$arr = array();
 		$_arr = is_object($obj) ? get_object_vars($obj) : $obj;
 		foreach ($_arr as $key => $val) {
 			$val = (is_array($val) || is_object($val)) ? $this->objectToArray($val) : $val;
diff --git a/htdocs/debugbar/class/DataCollector/DolLogsCollector.php b/htdocs/debugbar/class/DataCollector/DolLogsCollector.php
index 1ff336a16b8..626b4ec2613 100644
--- a/htdocs/debugbar/class/DataCollector/DolLogsCollector.php
+++ b/htdocs/debugbar/class/DataCollector/DolLogsCollector.php
@@ -76,22 +76,22 @@ class DolLogsCollector extends MessagesCollector
 
 		if ($uselogfile)
 		{
-    		$this->getStorageLogs($this->path);
+			$this->getStorageLogs($this->path);
 		} else {
-    	    $log_levels = $this->getLevels();
+			$log_levels = $this->getLevels();
 
-    	    foreach ($conf->logbuffer as $line) {
-    	        if ($this->nboflines >= $this->maxnboflines)
-    	        {
-    	            break;
-    	        }
-    	        foreach ($log_levels as $level_key => $level) {
-    	            if (strpos(strtolower($line), strtolower($level_key)) == 20) {
-    	                $this->nboflines++;
-    	                $this->addMessage($line, $level, false);
-    	            }
-    	        }
-    	    }
+			foreach ($conf->logbuffer as $line) {
+				if ($this->nboflines >= $this->maxnboflines)
+				{
+					break;
+				}
+				foreach ($log_levels as $level_key => $level) {
+					if (strpos(strtolower($line), strtolower($level_key)) == 20) {
+						$this->nboflines++;
+						$this->addMessage($line, $level, false);
+					}
+				}
+			}
 		}
 
 		return parent::collect();
@@ -104,9 +104,9 @@ class DolLogsCollector extends MessagesCollector
 	 */
 	public function getLogsFile()
 	{
-	    // default dolibarr log file
-	    $path = DOL_DATA_ROOT.'/dolibarr.log';
-	    return $path;
+		// default dolibarr log file
+		$path = DOL_DATA_ROOT.'/dolibarr.log';
+		return $path;
 	}
 
 	/**
@@ -117,16 +117,16 @@ class DolLogsCollector extends MessagesCollector
 	 */
 	public function getStorageLogs($path)
 	{
-	    if (!file_exists($path)) {
-	        return;
-	    }
+		if (!file_exists($path)) {
+			return;
+		}
 
-	    // Load the latest lines
-	    $file = implode("", $this->tailFile($path, $this->maxnboflines));
+		// Load the latest lines
+		$file = implode("", $this->tailFile($path, $this->maxnboflines));
 
-	    foreach ($this->getLogs($file) as $log) {
-	        $this->addMessage($log['line'], $log['level'], false);
-	    }
+		foreach ($this->getLogs($file) as $log) {
+			$this->addMessage($log['line'], $log['level'], false);
+		}
 	}
 
 	/**
@@ -138,32 +138,32 @@ class DolLogsCollector extends MessagesCollector
 	 */
 	protected function tailFile($file, $lines)
 	{
-	    $handle = fopen($file, "r");
-	    $linecounter = $lines;
-	    $pos = -2;
-	    $beginning = false;
-	    $text = array();
-	    while ($linecounter > 0) {
-	        $t = " ";
-	        while ($t != "\n") {
-	            if (fseek($handle, $pos, SEEK_END) == -1) {
-	                $beginning = true;
-	                break;
-	            }
-	            $t = fgetc($handle);
-	            $pos--;
-	        }
-	        $linecounter--;
-	        if ($beginning) {
-	            rewind($handle);
-	        }
-	        $text[$lines - $linecounter - 1] = fgets($handle);
-	        if ($beginning) {
-	            break;
-	        }
-	    }
-	    fclose($handle);
-	    return array_reverse($text);
+		$handle = fopen($file, "r");
+		$linecounter = $lines;
+		$pos = -2;
+		$beginning = false;
+		$text = array();
+		while ($linecounter > 0) {
+			$t = " ";
+			while ($t != "\n") {
+				if (fseek($handle, $pos, SEEK_END) == -1) {
+					$beginning = true;
+					break;
+				}
+				$t = fgetc($handle);
+				$pos--;
+			}
+			$linecounter--;
+			if ($beginning) {
+				rewind($handle);
+			}
+			$text[$lines - $linecounter - 1] = fgets($handle);
+			if ($beginning) {
+				break;
+			}
+		}
+		fclose($handle);
+		return array_reverse($text);
 	}
 
 	/**
@@ -174,21 +174,21 @@ class DolLogsCollector extends MessagesCollector
 	 */
 	public function getLogs($file)
 	{
-	    $pattern = "/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}.*/";
-	    $log_levels = $this->getLevels();
-	    preg_match_all($pattern, $file, $matches);
-	    $log = array();
-	    foreach ($matches as $lines) {
-	        foreach ($lines as $line) {
-	            foreach ($log_levels as $level_key => $level) {
-	                if (strpos(strtolower($line), strtolower($level_key)) == 20) {
-	                    $log[] = array('level' => $level, 'line' => $line);
-	                }
-	            }
-	        }
-	    }
-	    $log = array_reverse($log);
-	    return $log;
+		$pattern = "/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}.*/";
+		$log_levels = $this->getLevels();
+		preg_match_all($pattern, $file, $matches);
+		$log = array();
+		foreach ($matches as $lines) {
+			foreach ($lines as $line) {
+				foreach ($log_levels as $level_key => $level) {
+					if (strpos(strtolower($line), strtolower($level_key)) == 20) {
+						$log[] = array('level' => $level, 'line' => $line);
+					}
+				}
+			}
+		}
+		$log = array_reverse($log);
+		return $log;
 	}
 
 	/**
diff --git a/htdocs/debugbar/class/DataCollector/DolMemoryCollector.php b/htdocs/debugbar/class/DataCollector/DolMemoryCollector.php
index 6ec58ea6720..b52ac8ff8c4 100644
--- a/htdocs/debugbar/class/DataCollector/DolMemoryCollector.php
+++ b/htdocs/debugbar/class/DataCollector/DolMemoryCollector.php
@@ -8,22 +8,22 @@ use \DebugBar\DataCollector\MemoryCollector;
 
 class DolMemoryCollector extends MemoryCollector
 {
-    /**
-     *	Return value of indicator
-     *
-     *  @return void
-     */
-    public function collect()
-    {
-        global $conf, $langs;
+	/**
+	 *	Return value of indicator
+	 *
+	 *  @return void
+	 */
+	public function collect()
+	{
+		global $conf, $langs;
 
-        $this->updatePeakUsage();
-        return array(
-            'peak_usage' => $this->peakUsage,
-            //'peak_usage_str' => $this->getDataFormatter()->formatBytes($this->peakUsage, 2)
-        	'peak_usage_str' => (empty($conf->dol_optimize_smallscreen) ? dol_print_size($this->peakUsage, 0) : dol_print_size($this->peakUsage, 1))
-        );
-    }
+		$this->updatePeakUsage();
+		return array(
+			'peak_usage' => $this->peakUsage,
+			//'peak_usage_str' => $this->getDataFormatter()->formatBytes($this->peakUsage, 2)
+			'peak_usage_str' => (empty($conf->dol_optimize_smallscreen) ? dol_print_size($this->peakUsage, 0) : dol_print_size($this->peakUsage, 1))
+		);
+	}
 
 	/**
 	 *	Return widget settings
diff --git a/htdocs/debugbar/class/DataCollector/DolibarrCollector.php b/htdocs/debugbar/class/DataCollector/DolibarrCollector.php
index b1b31bc9154..2e11887360f 100644
--- a/htdocs/debugbar/class/DataCollector/DolibarrCollector.php
+++ b/htdocs/debugbar/class/DataCollector/DolibarrCollector.php
@@ -91,8 +91,8 @@ class DolibarrCollector extends DataCollector implements Renderable, AssetProvid
 		$info .= $langs->trans('Port').': <strong>'.$conf->global->MAIN_MAIL_SMTP_PORT.'</strong><br>';
 		$info .= $langs->trans('ID').': <strong>'.$conf->global->MAIN_MAIL_SMTPS_ID.'</strong><br>';
 		$info .= $langs->trans('Pwd').': <strong>'.preg_replace('/./', '*', $conf->global->MAIN_MAIL_SMTPS_PW).'</strong><br>';
-		$info .= $langs->trans('TLS/STARTTLS').': <strong>'.$conf->global->MAIN_MAIL_EMAIL_TLS.'</strong> / <strong>'.$conf->global->MAIN_MAIL_EMAIL_STARTTLS.'</strong><br>';
-		$info .= $langs->trans('MAIN_DISABLE_ALL_MAILS').': <strong>'.($conf->global->MAIN_DISABLE_ALL_MAILS ? $langs->trans('Yes') : $langs->trans('No')).'</strong><br>';
+		$info .= $langs->trans('TLS/STARTTLS').': <strong>'.(empty($conf->global->MAIN_MAIL_EMAIL_TLS) ? '' : $conf->global->MAIN_MAIL_EMAIL_TLS).'</strong> / <strong>'.(empty($conf->global->MAIN_MAIL_EMAIL_STARTTLS) ? '' : $conf->global->MAIN_MAIL_EMAIL_STARTTLS).'</strong><br>';
+		$info .= $langs->trans('MAIN_DISABLE_ALL_MAILS').': <strong>'.(empty($conf->global->MAIN_DISABLE_ALL_MAILS) ? $langs->trans('No') : $langs->trans('Yes')).'</strong><br>';
 		$info .= 'dolibarr_mailing_limit_sendbyweb = <strong>'.$dolibarr_mailing_limit_sendbyweb.'</strong><br>';
 
 		return $info;
diff --git a/htdocs/debugbar/class/TraceableDB.php b/htdocs/debugbar/class/TraceableDB.php
index 77c20325a9d..0cb380f39a1 100644
--- a/htdocs/debugbar/class/TraceableDB.php
+++ b/htdocs/debugbar/class/TraceableDB.php
@@ -72,7 +72,7 @@ class TraceableDB extends DoliDB
 	 */
 	public function fetch_row($resultset)
 	{
-	    // phpcs:enable
+		// phpcs:enable
 		return $this->db->fetch_row($resultset);
 	}
 
@@ -156,7 +156,7 @@ class TraceableDB extends DoliDB
 	 */
 	public function affected_rows($resultset)
 	{
-	    // phpcs:enable
+		// phpcs:enable
 		return $this->db->affected_rows($resultset);
 	}
 
@@ -224,7 +224,7 @@ class TraceableDB extends DoliDB
 	 */
 	public function fetch_array($resultset)
 	{
-	    // phpcs:enable
+		// phpcs:enable
 		return $this->db->fetch_array($resultset);
 	}
 
@@ -259,8 +259,8 @@ class TraceableDB extends DoliDB
 	 */
 	public function last_insert_id($tab, $fieldid = 'rowid')
 	{
-	    // phpcs:enable
-	    return $this->db->last_insert_id($tab, $fieldid);
+		// phpcs:enable
+		return $this->db->last_insert_id($tab, $fieldid);
 	}
 
 	/**
@@ -409,7 +409,7 @@ class TraceableDB extends DoliDB
 	 */
 	public function num_rows($resultset)
 	{
-	    // phpcs:enable
+		// phpcs:enable
 		return $this->db->num_rows($resultset);
 	}
 
@@ -588,7 +588,7 @@ class TraceableDB extends DoliDB
 	 */
 	public function jdate($string, $gm = false)
 	{
-	    // phpcs:enable
+		// phpcs:enable
 		return $this->db->jdate($string, $gm);
 	}
 
@@ -678,7 +678,7 @@ class TraceableDB extends DoliDB
 	 */
 	public function fetch_object($resultset)
 	{
-	    // phpcs:enable
+		// phpcs:enable
 		return $this->db->fetch_object($resultset);
 	}
 
@@ -691,7 +691,7 @@ class TraceableDB extends DoliDB
 	 */
 	public function select_db($database)
 	{
-	    // phpcs:enable
+		// phpcs:enable
 		return $this->db->select_db($database);
 	}
 }
diff --git a/htdocs/delivery/card.php b/htdocs/delivery/card.php
index 440de00499e..8b0b53bd37d 100644
--- a/htdocs/delivery/card.php
+++ b/htdocs/delivery/card.php
@@ -41,8 +41,8 @@ if (!empty($conf->expedition_bon->enabled))
 if (!empty($conf->stock->enabled))
 	require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
 if (!empty($conf->projet->enabled)) {
-    require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
-    require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 }
 
 // Load translation files required by the page
@@ -74,6 +74,8 @@ include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be includ
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('deliverycard', 'globalcard'));
 
+$error = 0;
+
 
 /*
  * Actions
@@ -86,19 +88,17 @@ if ($action == 'add')
 {
 	$db->begin();
 
-	$object->date_livraison   = time();
-	$object->note             = GETPOST("note", 'restricthtml');
-	$object->note_private     = GETPOST("note", 'restricthtml');
-	$object->commande_id      = GETPOST("commande_id", 'int');
+	$object->date_delivery = dol_now();
+	$object->note          = GETPOST("note", 'restricthtml');
+	$object->note_private  = GETPOST("note", 'restricthtml');
+	$object->commande_id   = GETPOST("commande_id", 'int');
 	$object->fk_incoterms = GETPOST('incoterm_id', 'int');
 
-	if (!$conf->expedition_bon->enabled && !empty($conf->stock->enabled))
-	{
+	if (!$conf->expedition_bon->enabled && !empty($conf->stock->enabled)) {
 		$expedition->entrepot_id = GETPOST('entrepot_id');
 	}
 
-	// On boucle sur chaque ligne de commande pour completer objet livraison
-	// avec qte a livrer
+	// We loop on each line of order to complete object delivery with qty to delivery
 	$commande = new Commande($db);
 	$commande->fetch($object->commande_id);
 	$commande->fetch_lines();
@@ -107,15 +107,15 @@ if ($action == 'add')
 	{
 		$qty = "qtyl".$i;
 		$idl = "idl".$i;
-		if ($_POST[$qty] > 0)
+		$qtytouse = price2num(GETPOST($qty));
+		if ($qtytouse > 0)
 		{
-			$object->addline($_POST[$idl], $_POST[$qty]);
+			$object->addline(GETPOST($idl), price2num($qtytouse));
 		}
 	}
 
 	$ret = $object->create($user);
-	if ($ret > 0)
-	{
+	if ($ret > 0) {
 		$db->commit();
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
@@ -123,12 +123,11 @@ if ($action == 'add')
 		setEventMessages($object->error, $object->errors, 'errors');
 		$db->rollback();
 
-		$_GET["commande_id"] = $_POST["commande_id"];
 		$action = 'create';
 	}
 } elseif ($action == 'confirm_valid' && $confirm == 'yes' &&
-    ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->expedition->delivery->creer))
-    || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->expedition->delivery_advance->validate)))
+	((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->expedition->delivery->creer))
+	|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->expedition->delivery_advance->validate)))
 )
 {
 	$result = $object->valid($user);
@@ -168,20 +167,20 @@ if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->expeditio
 	}
 }
 
-if ($action == 'setdate_livraison' && $user->rights->expedition->delivery->creer)
+if ($action == 'setdate_delivery' && $user->rights->expedition->delivery->creer)
 {
-    $datedelivery = dol_mktime(GETPOST('liv_hour', 'int'), GETPOST('liv_min', 'int'), 0, GETPOST('liv_month', 'int'), GETPOST('liv_day', 'int'), GETPOST('liv_year', 'int'));
-    $result = $object->setDeliveryDate($user, $datedelivery);
-    if ($result < 0)
-    {
-        $mesg = '<div class="error">'.$object->error.'</div>';
-    }
+	$datedelivery = dol_mktime(GETPOST('liv_hour', 'int'), GETPOST('liv_min', 'int'), 0, GETPOST('liv_month', 'int'), GETPOST('liv_day', 'int'), GETPOST('liv_year', 'int'));
+	$result = $object->setDeliveryDate($user, $datedelivery);
+	if ($result < 0)
+	{
+		$mesg = '<div class="error">'.$object->error.'</div>';
+	}
 }
 
 // Set incoterm
 elseif ($action == 'set_incoterms' && !empty($conf->incoterm->enabled))
 {
-	$result = $object->setIncoterms(GETPOST('incoterm_id', 'int'), GETPOST('location_incoterms', 'alpha'));
+	$result = $object->setIncoterms((int) GETPOST('incoterm_id', 'int'), GETPOST('location_incoterms', 'alpha'));
 }
 
 // Update extrafields
@@ -311,13 +310,13 @@ if ($action == 'create')    // Create. Seems to no be used
 
 			if ($typeobject == 'commande' && $expedition->origin_id > 0 && !empty($conf->commande->enabled))
 			{
-			    $objectsrc = new Commande($db);
-			    $objectsrc->fetch($expedition->origin_id);
+				$objectsrc = new Commande($db);
+				$objectsrc->fetch($expedition->origin_id);
 			}
 			if ($typeobject == 'propal' && $expedition->origin_id > 0 && !empty($conf->propal->enabled))
 			{
-			    $objectsrc = new Propal($db);
-			    $objectsrc->fetch($expedition->origin_id);
+				$objectsrc = new Propal($db);
+				$objectsrc->fetch($expedition->origin_id);
 			}
 
 			// Shipment card
@@ -332,35 +331,35 @@ if ($action == 'create')    // Create. Seems to no be used
 			$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$expedition->thirdparty->getNomUrl(1);
 			// Project
 			if (!empty($conf->projet->enabled)) {
-			    $langs->load("projects");
-			    $morehtmlref .= '<br>'.$langs->trans('Project').' ';
-			    if (0) {    // Do not change on shipment
-			        if ($action != 'classify') {
-			            $morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$expedition->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
-			        }
-			        if ($action == 'classify') {
-			            // $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $expedition->id, $expedition->socid, $expedition->fk_project, 'projectid', 0, 0, 1, 1);
-			            $morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$expedition->id.'">';
-			            $morehtmlref .= '<input type="hidden" name="action" value="classin">';
-			            $morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
-			            $morehtmlref .= $formproject->select_projects($expedition->socid, $expedition->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-			            $morehtmlref .= '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
-			            $morehtmlref .= '</form>';
-			        } else {
-			            $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$expedition->id, $expedition->socid, $expedition->fk_project, 'none', 0, 0, 0, 1);
-			        }
-			    } else {
-			        $morehtmlref .= ' : ';
-			        if (!empty($objectsrc->fk_project)) {
-			            $proj = new Project($db);
-			            $proj->fetch($objectsrc->fk_project);
-			            $morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$objectsrc->fk_project.'" title="'.$langs->trans('ShowProject').'">';
-			            $morehtmlref .= $proj->ref;
-			            $morehtmlref .= '</a>';
-			        } else {
-			            $morehtmlref .= '';
-			        }
-			    }
+				$langs->load("projects");
+				$morehtmlref .= '<br>'.$langs->trans('Project').' ';
+				if (0) {    // Do not change on shipment
+					if ($action != 'classify') {
+						$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$expedition->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
+					}
+					if ($action == 'classify') {
+						// $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $expedition->id, $expedition->socid, $expedition->fk_project, 'projectid', 0, 0, 1, 1);
+						$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$expedition->id.'">';
+						$morehtmlref .= '<input type="hidden" name="action" value="classin">';
+						$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
+						$morehtmlref .= $formproject->select_projects($expedition->socid, $expedition->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+						$morehtmlref .= '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+						$morehtmlref .= '</form>';
+					} else {
+						$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$expedition->id, $expedition->socid, $expedition->fk_project, 'none', 0, 0, 0, 1);
+					}
+				} else {
+					$morehtmlref .= ' : ';
+					if (!empty($objectsrc->fk_project)) {
+						$proj = new Project($db);
+						$proj->fetch($objectsrc->fk_project);
+						$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$objectsrc->fk_project.'" title="'.$langs->trans('ShowProject').'">';
+						$morehtmlref .= $proj->ref;
+						$morehtmlref .= '</a>';
+					} else {
+						$morehtmlref .= '';
+					}
+				}
 			}
 			$morehtmlref .= '</div>';
 
@@ -372,7 +371,7 @@ if ($action == 'create')    // Create. Seems to no be used
 			print '<div class="fichecenter">';
 			print '<div class="underbanner clearboth"></div>';
 
-		    print '<table class="border tableforfield" width="100%">';
+			print '<table class="border tableforfield" width="100%">';
 
 			// Shipment
 			/*
@@ -434,15 +433,15 @@ if ($action == 'create')    // Create. Seems to no be used
 			print $langs->trans('DateReceived');
 			print '</td>';
 
-			if ($action != 'editdate_livraison') print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editdate_livraison&amp;id='.$object->id.'">'.img_edit($langs->trans('SetDeliveryDate'), 1).'</a></td>';
+			if ($action != 'editdate_delivery') print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editdate_delivery&amp;id='.$object->id.'">'.img_edit($langs->trans('SetDeliveryDate'), 1).'</a></td>';
 			print '</tr></table>';
 			print '</td><td colspan="2">';
-			if ($action == 'editdate_livraison')
+			if ($action == 'editdate_delivery')
 			{
-				print '<form name="setdate_livraison" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
+				print '<form name="setdate_delivery" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
 				print '<input type="hidden" name="token" value="'.newToken().'">';
-				print '<input type="hidden" name="action" value="setdate_livraison">';
-				print $form->selectDate($object->date_delivery ? $object->date_delivery : -1, 'liv_', 1, 1, '', "setdate_livraison", 1, 1);
+				print '<input type="hidden" name="action" value="setdate_delivery">';
+				print $form->selectDate($object->date_delivery ? $object->date_delivery : -1, 'liv_', 1, 1, '', "setdate_delivery", 1, 1);
 				print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
 				print '</form>';
 			} else {
@@ -455,21 +454,21 @@ if ($action == 'create')    // Create. Seems to no be used
 			if (!empty($conf->incoterm->enabled))
 			{
 				print '<tr><td>';
-		        print '<table width="100%" class="nobordernopadding"><tr><td>';
-		        print $langs->trans('IncotermLabel');
-		        print '<td><td class="right">';
-		        if ($user->rights->expedition->delivery->creer) print '<a class="editfielda" href="'.DOL_URL_ROOT.'/delivery/card.php?id='.$object->id.'&action=editincoterm">'.img_edit().'</a>';
-		        else print '&nbsp;';
-		        print '</td></tr></table>';
-		        print '</td>';
-		        print '<td colspan="3">';
+				print '<table width="100%" class="nobordernopadding"><tr><td>';
+				print $langs->trans('IncotermLabel');
+				print '<td><td class="right">';
+				if ($user->rights->expedition->delivery->creer) print '<a class="editfielda" href="'.DOL_URL_ROOT.'/delivery/card.php?id='.$object->id.'&action=editincoterm">'.img_edit().'</a>';
+				else print '&nbsp;';
+				print '</td></tr></table>';
+				print '</td>';
+				print '<td colspan="3">';
 				if ($action != 'editincoterm')
 				{
 					print $form->textwithpicto($object->display_incoterms(), $object->label_incoterms, 1);
 				} else {
 					print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms) ? $object->location_incoterms : ''), $_SERVER['PHP_SELF'].'?id='.$object->id);
 				}
-		        print '</td></tr>';
+				print '</td></tr>';
 			}
 
 			/* A delivery note should be just more properties of a shipment, so notes are on shipment
@@ -629,7 +628,7 @@ if ($action == 'create')    // Create. Seems to no be used
 
 			print "</table>\n";
 
-            dol_fiche_end();
+			print dol_get_fiche_end();
 
 			//if ($object->statut == 0)	// only if draft
 			//	print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Save").'"></div>';
@@ -691,9 +690,9 @@ if ($action == 'create')    // Create. Seems to no be used
 				$shipment = new Expedition($db);
 				$shipment->fetch($object->origin_id);
 
-    			// Show links to link elements
-    			//$linktoelem = $form->showLinkToObjectBlock($object, null, array('order'));
-    			$somethingshown = $form->showLinkedObjectBlock($object, '');
+				// Show links to link elements
+				//$linktoelem = $form->showLinkToObjectBlock($object, null, array('order'));
+				$somethingshown = $form->showLinkedObjectBlock($object, '');
 			}
 
 
diff --git a/htdocs/delivery/class/delivery.class.php b/htdocs/delivery/class/delivery.class.php
index c8f044c9294..3c4d53f53e7 100644
--- a/htdocs/delivery/class/delivery.class.php
+++ b/htdocs/delivery/class/delivery.class.php
@@ -67,19 +67,19 @@ class Delivery extends CommonObject
 	 */
 	public $picto = 'sending';
 
-    /**
-     * @var int draft status
-     */
-    public $draft;
+	/**
+	 * @var int draft status
+	 */
+	public $draft;
 
-    /**
-     * @var int thirdparty id
-     */
-    public $socid;
+	/**
+	 * @var int thirdparty id
+	 */
+	public $socid;
 
-    /**
-     * @var string ref custome
-     */
+	/**
+	 * @var string ref custome
+	 */
 	public $ref_customer;
 
 	/**
@@ -88,8 +88,8 @@ class Delivery extends CommonObject
 	public $date_delivery;
 
 	/**
-     * @var integer|string date_creation
-     */
+	 * @var integer|string date_creation
+	 */
 	public $date_creation;
 
 	/**
@@ -97,9 +97,9 @@ class Delivery extends CommonObject
 	 */
 	public $date_valid;
 
-    /**
-     * @var string model pdf
-     */
+	/**
+	 * @var string model pdf
+	 */
 	public $model_pdf;
 
 
@@ -108,7 +108,7 @@ class Delivery extends CommonObject
 	 *
 	 * @param	DoliDB	$db		Database handler
 	 */
-    public function __construct($db)
+	public function __construct($db)
 	{
 		$this->db = $db;
 		$this->lines = array();
@@ -126,7 +126,7 @@ class Delivery extends CommonObject
 	 *  @param 	User	$user       Objet du user qui cree
 	 *  @return int         		<0 si erreur, id delivery cree si ok
 	 */
-    public function create($user)
+	public function create($user)
 	{
 		global $conf;
 
@@ -136,7 +136,7 @@ class Delivery extends CommonObject
 
 		$error = 0;
 
-        $now = dol_now();
+		$now = dol_now();
 
 		/* Delivery note as draft On positionne en mode draft le bon de livraison */
 		$this->draft = 1;
@@ -170,8 +170,8 @@ class Delivery extends CommonObject
 		$sql .= ", ".(!empty($this->note_private) ? "'".$this->db->escape($this->note_private)."'" : "null");
 		$sql .= ", ".(!empty($this->note_public) ? "'".$this->db->escape($this->note_public)."'" : "null");
 		$sql .= ", ".(!empty($this->model_pdf) ? "'".$this->db->escape($this->model_pdf)."'" : "null");
-        $sql .= ", ".(int) $this->fk_incoterms;
-        $sql .= ", '".$this->db->escape($this->location_incoterms)."'";
+		$sql .= ", ".(int) $this->fk_incoterms;
+		$sql .= ", '".$this->db->escape($this->location_incoterms)."'";
 		$sql .= ")";
 
 		dol_syslog("Delivery::create", LOG_DEBUG);
@@ -256,7 +256,7 @@ class Delivery extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Create a line
 	 *
@@ -266,9 +266,9 @@ class Delivery extends CommonObject
 	 *	@param	string	$description			Description
 	 *	@return	int								<0 if KO, >0 if OK
 	 */
-    public function create_line($origin_id, $qty, $fk_product, $description)
-    {
-        // phpcs:enable
+	public function create_line($origin_id, $qty, $fk_product, $description)
+	{
+		// phpcs:enable
 		$error = 0;
 		$idprod = $fk_product;
 		$j = 0;
@@ -298,7 +298,7 @@ class Delivery extends CommonObject
 	 * 	@param	int		$id			Id of object to load
 	 * 	@return	integer
 	 */
-    public function fetch($id)
+	public function fetch($id)
 	{
 		global $conf;
 
@@ -306,8 +306,8 @@ class Delivery extends CommonObject
 		$sql .= " l.total_ht, l.fk_statut, l.fk_user_valid, l.note_private, l.note_public";
 		$sql .= ", l.date_delivery, l.fk_address, l.model_pdf";
 		$sql .= ", el.fk_source as origin_id, el.sourcetype as origin";
-        $sql .= ', l.fk_incoterms, l.location_incoterms';
-        $sql .= ", i.libelle as label_incoterms";
+		$sql .= ', l.fk_incoterms, l.location_incoterms';
+		$sql .= ", i.libelle as label_incoterms";
 		$sql .= " FROM ".MAIN_DB_PREFIX."delivery as l";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as el ON el.fk_target = l.rowid AND el.targettype = '".$this->db->escape($this->element)."'";
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as i ON l.fk_incoterms = i.rowid';
@@ -336,7 +336,7 @@ class Delivery extends CommonObject
 				$this->note_private         = $obj->note_private;
 				$this->note_public          = $obj->note_public;
 				$this->model_pdf            = $obj->model_pdf;
-				$this->modelpdf             = $obj->model_pdf;	// deprecated
+				$this->modelpdf             = $obj->model_pdf; // deprecated
 				$this->origin               = $obj->origin; // May be 'shipping'
 				$this->origin_id            = $obj->origin_id; // May be id of shipping
 
@@ -374,14 +374,14 @@ class Delivery extends CommonObject
 	/**
 	 *  Validate object and update stock if option enabled
 	 *
-     *  @param  User    $user       Object user that validate
-     *  @param  int     $notrigger  1=Does not execute triggers, 0= execute triggers
-     *  @return int
+	 *  @param  User    $user       Object user that validate
+	 *  @param  int     $notrigger  1=Does not execute triggers, 0= execute triggers
+	 *  @return int
 	 */
-    public function valid($user, $notrigger = 0)
+	public function valid($user, $notrigger = 0)
 	{
 		global $conf, $langs;
-        require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 		dol_syslog(get_class($this)."::valid begin");
 
@@ -389,8 +389,8 @@ class Delivery extends CommonObject
 
 		$error = 0;
 
-        if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->expedition->delivery->creer))
-       	|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->expedition->delivery_advance->validate)))
+		if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->expedition->delivery->creer))
+	   	|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->expedition->delivery_advance->validate)))
 		{
 			if (!empty($conf->global->DELIVERY_ADDON_NUMBER))
 			{
@@ -409,12 +409,12 @@ class Delivery extends CommonObject
 					$soc->fetch($this->socid);
 
 					if (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref)) // empty should not happened, but when it occurs, the test save life
-		            {
-		                $numref = $objMod->delivery_get_num($soc, $this);
-		            } else {
-		                $numref = $this->ref;
-		            }
-            		$this->newref = dol_sanitizeFileName($numref);
+					{
+						$numref = $objMod->delivery_get_num($soc, $this);
+					} else {
+						$numref = $this->ref;
+					}
+					$this->newref = dol_sanitizeFileName($numref);
 
 					// Test if is not already in valid status. If so, we stop to avoid decrementing the stock twice.
 					$sql = "SELECT ref";
@@ -442,24 +442,24 @@ class Delivery extends CommonObject
 					$sql .= " AND fk_statut = 0";
 
 					$resql = $this->db->query($sql);
-			        if (!$resql)
-			        {
-			            dol_print_error($this->db);
-			            $this->error = $this->db->lasterror();
-			            $error++;
-			        }
+					if (!$resql)
+					{
+						dol_print_error($this->db);
+						$this->error = $this->db->lasterror();
+						$error++;
+					}
 
-			        if (!$error && !$notrigger)
-			        {
-			            // Call trigger
-			            $result = $this->call_trigger('DELIVERY_VALIDATE', $user);
-			            if ($result < 0) $error++;
-			            // End call triggers
-			        }
+					if (!$error && !$notrigger)
+					{
+						// Call trigger
+						$result = $this->call_trigger('DELIVERY_VALIDATE', $user);
+						if ($result < 0) $error++;
+						// End call triggers
+					}
 
 					if (!$error)
 					{
-			            $this->oldref = $this->ref;
+						$this->oldref = $this->ref;
 
 						// Rename directory if dir was a temporary ref
 						if (preg_match('/^[\(]?PROV/i', $this->ref))
@@ -481,17 +481,17 @@ class Delivery extends CommonObject
 
 								if (@rename($dirsource, $dirdest))
 								{
-			                        dol_syslog("Rename ok");
-			                        // Rename docs starting with $oldref with $newref
-			                        $listoffiles = dol_dir_list($conf->expedition->dir_output.'/receipt/'.$newref, 'files', 1, '^'.preg_quote($oldref, '/'));
-			                        foreach ($listoffiles as $fileentry)
-			                        {
-			                        	$dirsource = $fileentry['name'];
-			                        	$dirdest = preg_replace('/^'.preg_quote($oldref, '/').'/', $newref, $dirsource);
-			                        	$dirsource = $fileentry['path'].'/'.$dirsource;
-			                        	$dirdest = $fileentry['path'].'/'.$dirdest;
-			                        	@rename($dirsource, $dirdest);
-			                        }
+									dol_syslog("Rename ok");
+									// Rename docs starting with $oldref with $newref
+									$listoffiles = dol_dir_list($conf->expedition->dir_output.'/receipt/'.$newref, 'files', 1, '^'.preg_quote($oldref, '/'));
+									foreach ($listoffiles as $fileentry)
+									{
+										$dirsource = $fileentry['name'];
+										$dirdest = preg_replace('/^'.preg_quote($oldref, '/').'/', $newref, $dirsource);
+										$dirsource = $fileentry['path'].'/'.$dirsource;
+										$dirdest = $fileentry['path'].'/'.$dirdest;
+										@rename($dirsource, $dirdest);
+									}
 								}
 							}
 						}
@@ -506,14 +506,14 @@ class Delivery extends CommonObject
 						dol_syslog(get_class($this)."::valid ok");
 					}
 
-			        if (!$error)
-			        {
-			            $this->db->commit();
-			            return 1;
-			        } else {
-			            $this->db->rollback();
-			            return -1;
-			        }
+					if (!$error)
+					{
+						$this->db->commit();
+						return 1;
+					} else {
+						$this->db->rollback();
+						return -1;
+					}
 				}
 			}
 		} else {
@@ -523,7 +523,7 @@ class Delivery extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * 	Creating the delivery slip from an existing shipment
 	 *
@@ -531,9 +531,9 @@ class Delivery extends CommonObject
 	 *	@param  int		$sending_id      Id of the expedition that serves as a model
 	 *	@return	integer
 	 */
-    public function create_from_sending($user, $sending_id)
+	public function create_from_sending($user, $sending_id)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$expedition = new Expedition($this->db);
 		$result = $expedition->fetch($sending_id);
 
@@ -542,13 +542,12 @@ class Delivery extends CommonObject
 		$num = count($expedition->lines);
 		for ($i = 0; $i < $num; $i++)
 		{
-			$line = new DeliveryLigne($this->db);
+			$line = new DeliveryLine($this->db);
 			$line->origin_line_id    = $expedition->lines[$i]->origin_line_id;
-			$line->libelle           = $expedition->lines[$i]->libelle;
+			$line->label             = $expedition->lines[$i]->label;
 			$line->description       = $expedition->lines[$i]->description;
 			$line->qty               = $expedition->lines[$i]->qty_shipped;
 			$line->fk_product        = $expedition->lines[$i]->fk_product;
-			$line->ref               = $expedition->lines[$i]->ref;
 
 			$this->lines[$i] = $line;
 		}
@@ -561,7 +560,7 @@ class Delivery extends CommonObject
 		$this->date_delivery        = $expedition->date_delivery;
 		$this->fk_delivery_address  = $expedition->fk_delivery_address;
 		$this->socid                = $expedition->socid;
-		$this->ref_customer = $expedition->ref_customer;
+		$this->ref_customer         = $expedition->ref_customer;
 
 		//Incoterms
 		$this->fk_incoterms = $expedition->fk_incoterms;
@@ -570,7 +569,7 @@ class Delivery extends CommonObject
 		return $this->create($user);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Update a livraison line (only extrafields)
 	 *
@@ -578,15 +577,15 @@ class Delivery extends CommonObject
 	 * @param	array		$array_options		extrafields array
 	 * @return	int							<0 if KO, >0 if OK
 	 */
-    public function update_line($id, $array_options = 0)
+	public function update_line($id, $array_options = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 		$error = 0;
 
 		if ($id > 0 && !$error && empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($array_options) && count($array_options) > 0) // For avoid conflicts if trigger used
 		{
-			$line = new DeliveryLigne($this->db);
+			$line = new DeliveryLine($this->db);
 			$line->array_options = $array_options;
 			$line->id = $id;
 			$result = $line->insertExtraFields();
@@ -610,10 +609,10 @@ class Delivery extends CommonObject
 	 *	@param	int		$qty			Qty
 	 *	@return	void
 	 */
-    public function addline($origin_id, $qty)
+	public function addline($origin_id, $qty)
 	{
 		$num = count($this->lines);
-		$line = new DeliveryLigne($this->db);
+		$line = new DeliveryLine($this->db);
 
 		$line->origin_id = $origin_id;
 		$line->qty = $qty;
@@ -627,7 +626,7 @@ class Delivery extends CommonObject
 	 *	@param	int		$lineid		Line id
 	 *	@return	integer|null
 	 */
-    public function deleteline($lineid)
+	public function deleteline($lineid)
 	{
 		if ($this->statut == 0)
 		{
@@ -650,11 +649,11 @@ class Delivery extends CommonObject
 	 *
 	 * @return	integer
 	 */
-    public function delete()
+	public function delete()
 	{
 		global $conf, $langs, $user;
 
-        require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 		$this->db->begin();
 
 		$error = 0;
@@ -698,14 +697,14 @@ class Delivery extends CommonObject
 						}
 					}
 
-                    // Call trigger
-                    $result = $this->call_trigger('DELIVERY_DELETE', $user);
-                    if ($result < 0)
-                    {
-                        $this->db->rollback();
-                        return -4;
-                    }
-                    // End call triggers
+					// Call trigger
+					$result = $this->call_trigger('DELIVERY_DELETE', $user);
+					if ($result < 0)
+					{
+						$this->db->rollback();
+						return -4;
+					}
+					// End call triggers
 
 					return 1;
 				} else {
@@ -729,10 +728,10 @@ class Delivery extends CommonObject
 	 *	Return clicable name (with picto eventually)
 	 *
 	 *	@param	int		$withpicto					0=No picto, 1=Include picto into link, 2=Only picto
-     *  @param  int     $save_lastsearch_value		-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+	 *  @param  int     $save_lastsearch_value		-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
 	 *	@return	string								Chaine avec URL
 	 */
-    public function getNomUrl($withpicto = 0, $save_lastsearch_value = -1)
+	public function getNomUrl($withpicto = 0, $save_lastsearch_value = -1)
 	{
 		global $langs;
 
@@ -743,16 +742,16 @@ class Delivery extends CommonObject
 
 		$url = DOL_URL_ROOT.'/delivery/card.php?id='.$this->id;
 
-        //if ($option !== 'nolink')
-        //{
-        	// Add param to save lastsearch_values or not
-        	$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
-        	if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
-        	if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
-        //}
+		//if ($option !== 'nolink')
+		//{
+			// Add param to save lastsearch_values or not
+			$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
+			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
+			if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
+		//}
 
 
-        $linkstart = '<a href="'.$url.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
+		$linkstart = '<a href="'.$url.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
 		$linkend = '</a>';
 
 		if ($withpicto) $result .= ($linkstart.img_object($label, $this->picto, 'class="classfortooltip"').$linkend);
@@ -761,15 +760,15 @@ class Delivery extends CommonObject
 		return $result;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Load lines
 	 *
 	 *	@return	void
 	 */
-    public function fetch_lines()
+	public function fetch_lines()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$this->lines = array();
 
 		$sql = "SELECT ld.rowid, ld.fk_product, ld.description, ld.subprice, ld.total_ht, ld.qty as qty_shipped, ld.fk_origin_line, ";
@@ -789,7 +788,7 @@ class Delivery extends CommonObject
 			$i = 0;
 			while ($i < $num)
 			{
-				$line = new DeliveryLigne($this->db);
+				$line = new DeliveryLine($this->db);
 
 				$obj = $this->db->fetch_object($resql);
 
@@ -826,6 +825,7 @@ class Delivery extends CommonObject
 				$line->volume_units   	= $obj->volume_units;
 
 				$line->fk_unit = $obj->fk_unit;
+				$line->fetch_optionals();
 
 				$this->lines[$i] = $line;
 
@@ -844,12 +844,12 @@ class Delivery extends CommonObject
 	 *  @param	int			$mode		Mode
 	 *  @return string      			Label
 	 */
-    public function getLibStatut($mode = 0)
+	public function getLibStatut($mode = 0)
 	{
 		return $this->LibStatut($this->statut, $mode);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Renvoi le libelle d'un statut donne
 	 *
@@ -857,9 +857,9 @@ class Delivery extends CommonObject
 	 *  @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
 	 *  @return string					Label
 	 */
-    public function LibStatut($status, $mode)
+	public function LibStatut($status, $mode)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 
 		if (empty($this->labelStatus) || empty($this->labelStatusShort))
@@ -883,19 +883,19 @@ class Delivery extends CommonObject
 
 
 	/**
-     *  Initialise an instance with random values.
-     *  Used to build previews or test instances.
-     *	id must be 0 if object instance is a specimen.
-     *
-     *  @return	void
+	 *  Initialise an instance with random values.
+	 *  Used to build previews or test instances.
+	 *	id must be 0 if object instance is a specimen.
+	 *
+	 *  @return	void
 	 */
-    public function initAsSpecimen()
+	public function initAsSpecimen()
 	{
 		global $user, $langs, $conf;
 
 		$now = dol_now();
 
-        // Load array of products prodids
+		// Load array of products prodids
 		$num_prods = 0;
 		$prodids = array();
 		$sql = "SELECT rowid";
@@ -927,7 +927,7 @@ class Delivery extends CommonObject
 		$this->note_private = 'Private note';
 
 		$i = 0;
-		$line = new DeliveryLigne($this->db);
+		$line = new DeliveryLine($this->db);
 		$line->fk_product     = $prodids[0];
 		$line->qty_asked      = 10;
 		$line->qty_shipped    = 9;
@@ -946,17 +946,17 @@ class Delivery extends CommonObject
 	 *  @return     array		Product remaining to be delivered
 	 *  TODO use new function
 	 */
-    public function getRemainingDelivered()
+	public function getRemainingDelivered()
 	{
 		global $langs;
 
 		// Get the linked object
 		$this->fetchObjectLinked('', '', $this->id, $this->element);
-		//var_dump($this->linkedObjectIds);
+		//var_dump($this->linkedObjectsIds);
 		// Get the product ref and qty in source
 		$sqlSourceLine = "SELECT st.rowid, st.description, st.qty";
 		$sqlSourceLine .= ", p.ref, p.label";
-		$sqlSourceLine .= " FROM ".MAIN_DB_PREFIX.$this->linkedObjectIds[0]['type']."det as st";
+		$sqlSourceLine .= " FROM ".MAIN_DB_PREFIX.$this->linkedObjectsIds[0]['type']."det as st";
 		$sqlSourceLine .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON st.fk_product = p.rowid";
 		$sqlSourceLine .= " WHERE fk_".$this->linked_object[0]['type']." = ".$this->linked_object[0]['linkid'];
 
@@ -1012,14 +1012,14 @@ class Delivery extends CommonObject
 		}
 	}
 
-    /**
+	/**
 	 *	Set the planned delivery date
 	 *
 	 *	@param      User			$user        		Objet utilisateur qui modifie
 	 *	@param      integer 		$delivery_date     Delivery date
 	 *	@return     int         						<0 if KO, >0 if OK
 	 */
-    public function setDeliveryDate($user, $delivery_date)
+	public function setDeliveryDate($user, $delivery_date)
 	{
 		if ($user->rights->expedition->creer)
 		{
@@ -1097,25 +1097,35 @@ class Delivery extends CommonObject
 /**
  *  Management class of delivery note lines
  */
-class DeliveryLigne extends CommonObjectLine
+class DeliveryLine extends CommonObjectLine
 {
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    // From llx_expeditiondet
-    public $qty;
-    public $qty_asked;
-    public $qty_shipped;
-    public $price;
-    public $fk_product;
-    public $origin_id;
+	/**
+	 * @var string ID to identify managed object
+	 */
+	public $element = 'deliverydet';
 
-    /**
-     * @var string delivery note lines label
-     */
-    public $label;
+	/**
+	 * @var string Name of table without prefix where object is stored
+	 */
+	public $table_element = 'deliverydet';
+
+	// From llx_expeditiondet
+	public $qty;
+	public $qty_asked;
+	public $qty_shipped;
+	public $price;
+	public $fk_product;
+	public $origin_id;
+
+	/**
+	 * @var string delivery note lines label
+	 */
+	public $label;
 
 	/**
 	 * @var string product description
@@ -1133,26 +1143,18 @@ class DeliveryLigne extends CommonObjectLine
 	 */
 	public $libelle;
 
+	public $origin_line_id;
+
 	public $product_ref;
 	public $product_label;
 
 	/**
-	 * @var string ID to identify managed object
+	 *	Constructor
+	 *
+	 *	@param	DoliDB	$db		Database handler
 	 */
-	public $element = 'deliverydet';
-
-	/**
-	 * @var string Name of table without prefix where object is stored
-	 */
-	public $table_element = 'deliverydet';
-
-    /**
-     *	Constructor
-     *
-     *	@param	DoliDB	$db		Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-    }
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
 }
diff --git a/htdocs/document.php b/htdocs/document.php
index a608dfe820e..c48a0363f78 100644
--- a/htdocs/document.php
+++ b/htdocs/document.php
@@ -153,7 +153,7 @@ if (isset($_GET["attachment"])) $attachment = GETPOST("attachment", 'alpha') ?tr
 if (!empty($conf->global->MAIN_DISABLE_FORCE_SAVEAS)) $attachment = false;
 
 // Define mime type
-$type = 'application/octet-stream';	// By default
+$type = 'application/octet-stream'; // By default
 if (GETPOST('type', 'alpha')) $type = GETPOST('type', 'alpha');
 else $type = dol_mimetype($original_file);
 // Security: Force to octet-stream if file is a dangerous file. For example when it is a .noexe file
@@ -243,6 +243,23 @@ if (!file_exists($fullpath_original_file_osencoded))
 	exit;
 }
 
+// Hooks
+if (!is_object($hookmanager)) {
+	include_once DOL_DOCUMENT_ROOT . '/core/class/hookmanager.class.php';
+	$hookmanager = new HookManager($this->db);
+}
+$hookmanager->initHooks(array('document'));
+$parameters = array('ecmfile' => $ecmfile, 'modulepart' => $modulepart, 'original_file' => $original_file,
+	'entity' => $entity, 'refname' => $refname, 'fullpath_original_file' => $fullpath_original_file,
+	'filename' => $filename, 'fullpath_original_file_osencoded' => $fullpath_original_file_osencoded);
+$reshook = $hookmanager->executeHooks('downloadDocument', $parameters); // Note that $action and $object may have been
+if ($reshook < 0) {
+	$errors = $hookmanager->error . (is_array($hookmanager->errors) ? (!empty($hookmanager->error) ? ', ' : '') . join($separator, $hookmanager->errors) : '');
+	dol_syslog("document.php - Errors when executing the hook 'downloadDocument' : " . $errors);
+	print "ErrorDownloadDocumentHooks: " . $errors;
+	exit;
+}
+
 // Permissions are ok and file found, so we return it
 top_httphead($type);
 header('Content-Description: File Transfer');
diff --git a/htdocs/don/admin/donation.php b/htdocs/don/admin/donation.php
index c9a08d093ab..78a3d50dfcc 100644
--- a/htdocs/don/admin/donation.php
+++ b/htdocs/don/admin/donation.php
@@ -51,33 +51,33 @@ $type = 'donation';
 
 if ($action == 'specimen')
 {
-    $modele = GETPOST('module', 'alpha');
+	$modele = GETPOST('module', 'alpha');
 
-    $don = new Don($db);
-    $don->initAsSpecimen();
+	$don = new Don($db);
+	$don->initAsSpecimen();
 
-    // Search template files
-    $dir = DOL_DOCUMENT_ROOT."/core/modules/dons/";
-    $file = $modele.".modules.php";
-    if (file_exists($dir.$file))
-    {
-        $classname = $modele;
-        require_once $dir.$file;
+	// Search template files
+	$dir = DOL_DOCUMENT_ROOT."/core/modules/dons/";
+	$file = $modele.".modules.php";
+	if (file_exists($dir.$file))
+	{
+		$classname = $modele;
+		require_once $dir.$file;
 
-        $obj = new $classname($db);
+		$obj = new $classname($db);
 
-        if ($obj->write_file($don, $langs) > 0)
-        {
-            header("Location: ".DOL_URL_ROOT."/document.php?modulepart=donation&file=SPECIMEN.html");
-            return;
-        } else {
-            setEventMessages($obj->error, $obj->errors, 'errors');
-            dol_syslog($obj->error, LOG_ERR);
-        }
-    } else {
-        setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
-        dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
-    }
+		if ($obj->write_file($don, $langs) > 0)
+		{
+			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=donation&file=SPECIMEN.html");
+			return;
+		} else {
+			setEventMessages($obj->error, $obj->errors, 'errors');
+			dol_syslog($obj->error, LOG_ERR);
+		}
+	} else {
+		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
+		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
+	}
 }
 
 // Set default model
@@ -107,7 +107,7 @@ elseif ($action == 'set')
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0)
 	{
-        if ($conf->global->DON_ADDON_MODEL == "$value") dolibarr_del_const($db, 'DON_ADDON_MODEL', $conf->entity);
+		if ($conf->global->DON_ADDON_MODEL == "$value") dolibarr_del_const($db, 'DON_ADDON_MODEL', $conf->entity);
 	}
 }
 
@@ -116,32 +116,32 @@ if ($action == 'set_DONATION_ACCOUNTINGACCOUNT')
 {
 	$account = GETPOST('DONATION_ACCOUNTINGACCOUNT', 'alpha');
 
-    $res = dolibarr_set_const($db, "DONATION_ACCOUNTINGACCOUNT", $account, 'chaine', 0, '', $conf->entity);
+	$res = dolibarr_set_const($db, "DONATION_ACCOUNTINGACCOUNT", $account, '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');
+	}
 }
 
 if ($action == 'set_DONATION_MESSAGE')
 {
 	$freemessage = GETPOST('DONATION_MESSAGE', 'restricthtml'); // No alpha here, we want exact string
 
-    $res = dolibarr_set_const($db, "DONATION_MESSAGE", $freemessage, 'chaine', 0, '', $conf->entity);
+	$res = dolibarr_set_const($db, "DONATION_MESSAGE", $freemessage, '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');
+	}
 }
 
 /*
@@ -149,26 +149,26 @@ if ($action == 'set_DONATION_MESSAGE')
  */
 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);
+	}
 }
 
 /*
@@ -332,10 +332,10 @@ print $form->textwithpicto($langs->trans("DonationUserThirdparties"), $langs->tr
 print '</td>';
 print '<td class="center">';
 if ($conf->use_javascript_ajax) {
-    print ajax_constantonoff('DONATION_USE_THIRDPARTIES');
+	print ajax_constantonoff('DONATION_USE_THIRDPARTIES');
 } else {
-    $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
-    print $form->selectarray("DONATION_USE_THIRDPARTIES", $arrval, $conf->global->DONATION_USE_THIRDPARTIES);
+	$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+	print $form->selectarray("DONATION_USE_THIRDPARTIES", $arrval, $conf->global->DONATION_USE_THIRDPARTIES);
 }
 print "</td>\n";
 print "</tr>\n";
@@ -387,34 +387,34 @@ if (preg_match('/fr/i', $conf->global->MAIN_INFO_SOCIETE_COUNTRY))
 	print '<tr class="oddeven">';
 	print '<td width="80%">'.$langs->trans("DONATION_ART200").'</td>';
 	print '<td class="center">';
-    if ($conf->use_javascript_ajax) {
-        print ajax_constantonoff('DONATION_ART200');
-    } else {
-        $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
-        print $form->selectarray("DONATION_ART200", $arrval, $conf->global->DONATION_ART200);
-    }
+	if ($conf->use_javascript_ajax) {
+		print ajax_constantonoff('DONATION_ART200');
+	} else {
+		$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+		print $form->selectarray("DONATION_ART200", $arrval, $conf->global->DONATION_ART200);
+	}
 	print '</td></tr>';
 
 	print '<tr class="oddeven">';
 	print '<td width="80%">'.$langs->trans("DONATION_ART238").'</td>';
 	print '<td class="center">';
-    if ($conf->use_javascript_ajax) {
-        print ajax_constantonoff('DONATION_ART238');
-    } else {
-        $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
-        print $form->selectarray("DONATION_ART238", $arrval, $conf->global->DONATION_ART238);
-    }
+	if ($conf->use_javascript_ajax) {
+		print ajax_constantonoff('DONATION_ART238');
+	} else {
+		$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+		print $form->selectarray("DONATION_ART238", $arrval, $conf->global->DONATION_ART238);
+	}
 	print '</td></tr>';
 
 	print '<tr class="oddeven">';
 	print '<td width="80%">'.$langs->trans("DONATION_ART978").'</td>';
 	print '<td class="center">';
-    if ($conf->use_javascript_ajax) {
-        print ajax_constantonoff('DONATION_ART978');
-    } else {
-        $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
-        print $form->selectarray("DONATION_ART978", $arrval, $conf->global->DONATION_ART978);
-    }
+	if ($conf->use_javascript_ajax) {
+		print ajax_constantonoff('DONATION_ART978');
+	} else {
+		$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+		print $form->selectarray("DONATION_ART978", $arrval, $conf->global->DONATION_ART978);
+	}
 	print '</td></tr>';
 	print "</table>\n";
 }
diff --git a/htdocs/don/admin/donation_extrafields.php b/htdocs/don/admin/donation_extrafields.php
index d210f4399bc..6062d4fca26 100644
--- a/htdocs/don/admin/donation_extrafields.php
+++ b/htdocs/don/admin/donation_extrafields.php
@@ -70,7 +70,7 @@ print dol_get_fiche_head($head, 'attributes', $langs->trans("Donations"), -1, 'p
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 // Buttons
diff --git a/htdocs/don/card.php b/htdocs/don/card.php
index 48af083a5fb..cec185e757e 100644
--- a/htdocs/don/card.php
+++ b/htdocs/don/card.php
@@ -39,8 +39,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formmargin.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 if (!empty($conf->projet->enabled)) {
-    require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
-    require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
 require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 
@@ -49,7 +49,9 @@ $langs->loadLangs(array("bills", "companies", "donations"));
 $id = GETPOST('rowid') ?GETPOST('rowid', 'int') : GETPOST('id', 'int');
 $action = GETPOST('action', 'aZ09');
 $cancel = GETPOST('cancel', 'alpha');
-$amount = GETPOST('amount');
+$confirm = GETPOST('confirm', 'alpha');
+
+$amount = price2num(GETPOST('amount', 'alphanohtml'), 'MT');
 $donation_date = dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
 $projectid = (GETPOST('projectid') ? GETPOST('projectid', 'int') : 0);
 
@@ -65,14 +67,52 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('doncard', 'globalcard'));
 
+$upload_dir = $conf->don->dir_output;
+$permissiontoadd = $user->rights->don->creer;
+
 
 /*
  * Actions
  */
 
+$parameters = array();
+
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
+// Action reopen object
+if ($action == 'confirm_reopen' && $confirm == 'yes' && $permissiontoadd)
+{
+	$object->fetch($id);
+
+	$result = $object->reopen($user);
+	if ($result >= 0)
+	{
+		// Define output language
+		if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+			if (method_exists($object, 'generateDocument')) {
+				$outputlangs = $langs;
+				$newlang = '';
+				if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) $newlang = GETPOST('lang_id', 'aZ09');
+				if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $object->thirdparty->default_lang;
+				if (!empty($newlang)) {
+					$outputlangs = new Translate("", $conf);
+					$outputlangs->setDefaultLang($newlang);
+				}
+				$model = $object->model_pdf;
+				$ret = $object->fetch($id); // Reload to get new records
+
+				$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
+			}
+		}
+
+		header("Location: ".$_SERVER["PHP_SELF"].'?id='.$object->id);
+		exit;
+	} else {
+		setEventMessages($object->error, $object->errors, 'errors');
+	}
+}
+
 if ($action == 'update')
 {
 	if (!empty($cancel))
@@ -83,12 +123,12 @@ if ($action == 'update')
 
 	$error = 0;
 
-    if (empty($donation_date))
-    {
-    	setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Date")), null, 'errors');
-        $action = "create";
-        $error++;
-    }
+	if (empty($donation_date))
+	{
+		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Date")), null, 'errors');
+		$action = "create";
+		$error++;
+	}
 
 	if (empty($amount))
 	{
@@ -139,12 +179,12 @@ if ($action == 'add')
 
 	$error = 0;
 
-    if (empty($donation_date))
-    {
-    	setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Date")), null, 'errors');
-        $action = "create";
-        $error++;
-    }
+	if (empty($donation_date))
+	{
+		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Date")), null, 'errors');
+		$action = "create";
+		$error++;
+	}
 
 	if (empty($amount))
 	{
@@ -155,7 +195,7 @@ if ($action == 'add')
 
 	if (!$error)
 	{
-        $object->socid = GETPOST("socid", 'int');
+		$object->socid = GETPOST("socid", 'int');
 		$object->firstname = GETPOST("firstname", 'alpha');
 		$object->lastname = GETPOST("lastname", 'alpha');
 		$object->societe = GETPOST("societe", 'alpha');
@@ -165,7 +205,7 @@ if ($action == 'add')
 		$object->town = GETPOST("town", 'alpha');
 		$object->country_id = GETPOST('country_id', 'int');
 		$object->email = GETPOST('email', 'alpha');
-        $object->date = $donation_date;
+		$object->date = $donation_date;
 		$object->note_private = GETPOST("note_private", 'restricthtml');
 		$object->note_public = GETPOST("note_public", 'restricthtml');
 		$object->public = GETPOST("public", 'alpha');
@@ -173,7 +213,7 @@ if ($action == 'add')
 		$object->modepaymentid = GETPOST('modepayment', 'int');
 
 		// Fill array 'array_options' with data from add form
-        $ret = $extrafields->setOptionalsFromPost(null, $object);
+		$ret = $extrafields->setOptionalsFromPost(null, $object);
 		if ($ret < 0) $error++;
 
 		$res = $object->create($user);
@@ -188,16 +228,16 @@ if ($action == 'add')
 }
 if ($action == 'confirm_delete' && GETPOST("confirm") == "yes" && $user->rights->don->supprimer)
 {
-    $object->fetch($id);
-    $result = $object->delete($user);
-    if ($result > 0)
-    {
-        header("Location: index.php");
-        exit;
-    } else {
-        dol_syslog($object->error, LOG_DEBUG);
-        setEventMessages($object->error, $object->errors, 'errors');
-    }
+	$object->fetch($id);
+	$result = $object->delete($user);
+	if ($result > 0)
+	{
+		header("Location: index.php");
+		exit;
+	} else {
+		dol_syslog($object->error, LOG_DEBUG);
+		setEventMessages($object->error, $object->errors, 'errors');
+	}
 }
 if ($action == 'valid_promesse')
 {
@@ -209,19 +249,19 @@ if ($action == 'valid_promesse')
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
 		exit;
 	} else {
-	    setEventMessages($object->error, $object->errors, 'errors');
-    }
+		setEventMessages($object->error, $object->errors, 'errors');
+	}
 }
 if ($action == 'set_cancel')
 {
 	$object->fetch($id);
 	if ($object->set_cancel($id) >= 0)
-    {
-        header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
-        exit;
-    } else {
-	    setEventMessages($object->error, $object->errors, 'errors');
-    }
+	{
+		header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
+		exit;
+	} else {
+		setEventMessages($object->error, $object->errors, 'errors');
+	}
 }
 if ($action == 'set_paid')
 {
@@ -231,8 +271,8 @@ if ($action == 'set_paid')
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
 		exit;
 	} else {
-	    setEventMessages($object->error, $object->errors, 'errors');
-    }
+		setEventMessages($object->error, $object->errors, 'errors');
+	}
 } elseif ($action == 'classin' && $user->rights->don->creer)
 {
 	$object->fetch($id);
@@ -240,8 +280,6 @@ if ($action == 'set_paid')
 }
 
 // Actions to build doc
-$upload_dir = $conf->don->dir_output;
-$permissiontoadd = $user->rights->don->creer;
 include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
 
 
@@ -351,11 +389,12 @@ if ($action == 'create')
 			print '<td colspan="2">';
 			print $form->select_company($soc->id, 'socid', '(s.client = 1 OR s.client = 3) AND status=1', 'SelectThirdParty', 0, 0, null, 0, 'minwidth300');
 			// Option to reload page to retrieve customer informations. Note, this clear other input
-			if (!empty($conf->global->RELOAD_PAGE_ON_CUSTOMER_CHANGE))
+			if (!empty($conf->global->RELOAD_PAGE_ON_CUSTOMER_CHANGE_DISABLED))
 			{
 				print '<script type="text/javascript">
 				$(document).ready(function() {
 					$("#socid").change(function() {
+						console.log("We have changed the company - Reload page");
 						var socid = $(this).val();
 				        var fac_rec = $(\'#fac_rec\').val();
 						// reload page
@@ -418,7 +457,7 @@ if ($action == 'create')
 	print '<td class="tdtop">'.$langs->trans('NotePublic').'</td>';
 	print '<td>';
 
-    $doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
+	$doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
 	print $doleditor->Create(1);
 	print '</td></tr>';
 
@@ -434,25 +473,25 @@ 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, 0, 0, 0, '', 0, 0, 'maxwidth500');
+	{
+		print "<tr><td>".$langs->trans("Project")."</td><td>";
+		$formproject->select_projects(-1, $projectid, 'fk_project', 0, 0, 1, 1, 0, 0, 0, '', 0, 0, 'maxwidth500');
 		print "</td></tr>\n";
-    }
+	}
 
-    // Other attributes
-    $parameters = array();
-    $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-    print $hookmanager->resPrint;
-    if (empty($reshook))
-    {
+	// Other attributes
+	$parameters = array();
+	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+	print $hookmanager->resPrint;
+	if (empty($reshook))
+	{
 		print $object->showOptionals($extrafields, 'edit', $parameters);
-    }
+	}
 
-    print '</tbody>';
+	print '</tbody>';
 	print "</table>\n";
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div class="center">';
 	print '<input type="submit" class="button" name="save" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
@@ -521,69 +560,69 @@ if (!empty($id) && $action == 'edit')
 	print "</td>";
 	print "</tr>\n";
 
-    if ($object->socid && !empty($conf->societe->enabled) && !empty($conf->global->DONATION_USE_THIRDPARTIES)) {
-        $company = new Societe($db);
-        $result = $company->fetch($object->socid);
+	if ($object->socid && !empty($conf->societe->enabled) && !empty($conf->global->DONATION_USE_THIRDPARTIES)) {
+		$company = new Societe($db);
+		$result = $company->fetch($object->socid);
 
-        print '<tr><td>'.$langs->trans("LinkedToDolibarrThirdParty").'</td><td colspan="2">'.$company->getNomUrl(1).'</td></tr>';
-    } else {
-        $langs->load("companies");
-        print '<tr><td>'.$langs->trans("Company").'</td><td><input type="text" name="societe" class="maxwidth200" value="'.dol_escape_htmltag($object->societe).'"></td></tr>';
-        print '<tr><td>'.$langs->trans("Lastname").'</td><td><input type="text" name="lastname" class="maxwidth200" value="'.dol_escape_htmltag($object->lastname).'"></td></tr>';
-        print '<tr><td>'.$langs->trans("Firstname").'</td><td><input type="text" name="firstname" class="maxwidth200" value="'.dol_escape_htmltag($object->firstname).'"></td></tr>';
-        print '<tr><td>'.$langs->trans("Address").'</td><td>';
-        print '<textarea name="address" wrap="soft" class="quatrevingtpercent" rows="'.ROWS_3.'">'.dol_escape_htmltag($object->address, 0, 1).'</textarea></td></tr>';
+		print '<tr><td>'.$langs->trans("LinkedToDolibarrThirdParty").'</td><td colspan="2">'.$company->getNomUrl(1).'</td></tr>';
+	} else {
+		$langs->load("companies");
+		print '<tr><td>'.$langs->trans("Company").'</td><td><input type="text" name="societe" class="maxwidth200" value="'.dol_escape_htmltag($object->societe).'"></td></tr>';
+		print '<tr><td>'.$langs->trans("Lastname").'</td><td><input type="text" name="lastname" class="maxwidth200" value="'.dol_escape_htmltag($object->lastname).'"></td></tr>';
+		print '<tr><td>'.$langs->trans("Firstname").'</td><td><input type="text" name="firstname" class="maxwidth200" value="'.dol_escape_htmltag($object->firstname).'"></td></tr>';
+		print '<tr><td>'.$langs->trans("Address").'</td><td>';
+		print '<textarea name="address" wrap="soft" class="quatrevingtpercent" rows="'.ROWS_3.'">'.dol_escape_htmltag($object->address, 0, 1).'</textarea></td></tr>';
 
-        // Zip / Town
-        print '<tr><td>'.$langs->trans("Zip").' / '.$langs->trans("Town").'</td><td>';
-        print $formcompany->select_ziptown((isset($_POST["zipcode"]) ? $_POST["zipcode"] : $object->zip), 'zipcode', array('town', 'selectcountry_id', 'state_id'), 6);
-        print ' ';
-        print $formcompany->select_ziptown((isset($_POST["town"]) ? $_POST["town"] : $object->town), 'town', array('zipcode', 'selectcountry_id', 'state_id'));
-        print '</tr>';
+		// Zip / Town
+		print '<tr><td>'.$langs->trans("Zip").' / '.$langs->trans("Town").'</td><td>';
+		print $formcompany->select_ziptown((isset($_POST["zipcode"]) ? $_POST["zipcode"] : $object->zip), 'zipcode', array('town', 'selectcountry_id', 'state_id'), 6);
+		print ' ';
+		print $formcompany->select_ziptown((isset($_POST["town"]) ? $_POST["town"] : $object->town), 'town', array('zipcode', 'selectcountry_id', 'state_id'));
+		print '</tr>';
 
-        // Country
-        print '<tr><td class="titlefieldcreate">'.$langs->trans('Country').'</td><td>';
-        print $form->select_country((!empty($object->country_id) ? $object->country_id : $mysoc->country_code), 'country_id');
-        if ($user->admin) {
-            print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
-        }
-        print '</td></tr>';
+		// Country
+		print '<tr><td class="titlefieldcreate">'.$langs->trans('Country').'</td><td>';
+		print $form->select_country((!empty($object->country_id) ? $object->country_id : $mysoc->country_code), 'country_id');
+		if ($user->admin) {
+			print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+		}
+		print '</td></tr>';
 
-        print "<tr>".'<td>'.$langs->trans("EMail").'</td><td><input type="text" name="email" class="maxwidth200" value="'.dol_escape_htmltag($object->email).'"></td></tr>';
-    }
-    // Payment mode
-    print "<tr><td>".$langs->trans("PaymentMode")."</td><td>\n";
-    if ($object->mode_reglement_id) $selected = $object->mode_reglement_id;
-    else $selected = '';
-    $form->select_types_paiements($selected, 'modepayment', 'CRDT', 0, 1);
-    print "</td></tr>\n";
+		print "<tr>".'<td>'.$langs->trans("EMail").'</td><td><input type="text" name="email" class="maxwidth200" value="'.dol_escape_htmltag($object->email).'"></td></tr>';
+	}
+	// Payment mode
+	print "<tr><td>".$langs->trans("PaymentMode")."</td><td>\n";
+	if ($object->mode_reglement_id) $selected = $object->mode_reglement_id;
+	else $selected = '';
+	$form->select_types_paiements($selected, 'modepayment', 'CRDT', 0, 1);
+	print "</td></tr>\n";
 
-    // Status
+	// Status
 	print "<tr>".'<td>'.$langs->trans("Status").'</td><td>'.$object->getLibStatut(4).'</td></tr>';
 
-    // Project
-    if (!empty($conf->projet->enabled))
-    {
-    	$formproject = new FormProjets($db);
+	// Project
+	if (!empty($conf->projet->enabled))
+	{
+		$formproject = new FormProjets($db);
 
-        $langs->load('projects');
-        print '<tr><td>'.$langs->trans('Project').'</td><td>';
+		$langs->load('projects');
+		print '<tr><td>'.$langs->trans('Project').'</td><td>';
 		$formproject->select_projects(-1, $object->fk_project, 'fk_project', 0, 0, 1, 1, 0, 0, 0, '', 0, 0, 'maxwidth500');
-        print '</td></tr>';
-    }
+		print '</td></tr>';
+	}
 
-    // Other attributes
-    $parameters = array();
-    $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-    print $hookmanager->resPrint;
-    if (empty($reshook))
-    {
-      	print $object->showOptionals($extrafields, 'edit', $parameters);
-    }
+	// Other attributes
+	$parameters = array();
+	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+	print $hookmanager->resPrint;
+	if (empty($reshook))
+	{
+	  	print $object->showOptionals($extrafields, 'edit', $parameters);
+	}
 
 	print "</table>\n";
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div class="center"><input type="submit" class="button" name="save" value="'.$langs->trans("Save").'"> &nbsp; &nbsp; <input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'"></div>';
 
@@ -600,11 +639,11 @@ if (!empty($id) && $action == 'edit')
 if (!empty($id) && $action != 'edit')
 {
 	// Confirmation delete
-    if ($action == 'delete')
-    {
-        $text = $langs->trans("ConfirmDeleteADonation");
-        print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id, $langs->trans("DeleteADonation"), $text, "confirm_delete", '', '', 1);
-    }
+	if ($action == 'delete')
+	{
+		$text = $langs->trans("ConfirmDeleteADonation");
+		print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id, $langs->trans("DeleteADonation"), $text, "confirm_delete", '', '', 1);
+	}
 
 	$result = $object->fetch($id);
 	if ($result < 0) {
@@ -629,54 +668,54 @@ if (!empty($id) && $action != 'edit')
 	// Project
 	if (!empty($conf->projet->enabled))
 	{
-	    $langs->load("projects");
-	    $morehtmlref .= $langs->trans('Project').' ';
-	    if ($user->rights->don->creer)
-	    {
-	        if ($action != 'classify') {
-                $morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
-            }
-            if ($action == 'classify') {
-                //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-                $morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-                $morehtmlref .= '<input type="hidden" name="action" value="classin">';
-                $morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
-                $morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', 0, 0, 1, 0, 1, 0, 0, '', 1, 0, 'maxwidth500');
-                $morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-                $morehtmlref .= '</form>';
-            } else {
-                $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-            }
-	    } else {
-	        if (!empty($object->fk_project)) {
-	            $proj = new Project($db);
-	            $proj->fetch($object->fk_project);
-	            $morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
-	            $morehtmlref .= $proj->ref;
-	            $morehtmlref .= '</a>';
-	        } else {
-	            $morehtmlref .= '';
-	        }
-	    }
+		$langs->load("projects");
+		$morehtmlref .= $langs->trans('Project').' ';
+		if ($user->rights->don->creer)
+		{
+			if ($action != 'classify') {
+				$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
+			}
+			if ($action == 'classify') {
+				//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+				$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+				$morehtmlref .= '<input type="hidden" name="action" value="classin">';
+				$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
+				$morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', 0, 0, 1, 0, 1, 0, 0, '', 1, 0, 'maxwidth500');
+				$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+				$morehtmlref .= '</form>';
+			} else {
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+			}
+		} else {
+			if (!empty($object->fk_project)) {
+				$proj = new Project($db);
+				$proj->fetch($object->fk_project);
+				$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
+				$morehtmlref .= $proj->ref;
+				$morehtmlref .= '</a>';
+			} else {
+				$morehtmlref .= '';
+			}
+		}
 	}
 	$morehtmlref .= '</div>';
 
 
-    dol_banner_tab($object, 'rowid', $linkback, 1, 'rowid', 'ref', $morehtmlref);
+	dol_banner_tab($object, 'rowid', $linkback, 1, 'rowid', 'ref', $morehtmlref);
 
 
-    print '<div class="fichecenter">';
-    print '<div class="fichehalfleft">';
-    print '<div class="underbanner clearboth"></div>';
+	print '<div class="fichecenter">';
+	print '<div class="fichehalfleft">';
+	print '<div class="underbanner clearboth"></div>';
 
-    print '<table class="border tableforfield" width="100%">';
+	print '<table class="border tableforfield" width="100%">';
 
 	// Date
 	print '<tr><td class="titlefield">'.$langs->trans("Date").'</td><td colspan="2">';
 	print dol_print_date($object->date, "day");
 	print "</td>";
 
-    print '<tr><td>'.$langs->trans("Amount").'</td><td colspan="2">';
+	print '<tr><td>'.$langs->trans("Amount").'</td><td colspan="2">';
 	print price($object->amount, 0, $langs, 0, 0, -1, $conf->currency);
 	print '</td></tr>';
 
@@ -684,16 +723,16 @@ if (!empty($id) && $action != 'edit')
 	print yn($object->public);
 	print '</td></tr>';
 
-    if ($object->socid) {
-        $company = new Societe($db);
-        $result = $company->fetch($object->socid);
+	if ($object->socid) {
+		$company = new Societe($db);
+		$result = $company->fetch($object->socid);
 
-        print '<tr><td>'.$langs->trans("LinkedToDolibarrThirdParty").'</td><td colspan="2">'.$company->getNomUrl(1).'</td></tr>';
-    } else {
-        print '<tr><td>'.$langs->trans("Company").'</td><td colspan="2">'.$object->societe.'</td></tr>';
-        print '<tr><td>'.$langs->trans("Lastname").'</td><td colspan="2">'.$object->lastname.'</td></tr>';
-        print '<tr><td>'.$langs->trans("Firstname").'</td><td colspan="2">'.$object->firstname.'</td></tr>';
-    }
+		print '<tr><td>'.$langs->trans("LinkedToDolibarrThirdParty").'</td><td colspan="2">'.$company->getNomUrl(1).'</td></tr>';
+	} else {
+		print '<tr><td>'.$langs->trans("Company").'</td><td colspan="2">'.$object->societe.'</td></tr>';
+		print '<tr><td>'.$langs->trans("Lastname").'</td><td colspan="2">'.$object->lastname.'</td></tr>';
+		print '<tr><td>'.$langs->trans("Firstname").'</td><td colspan="2">'.$object->firstname.'</td></tr>';
+	}
 
 	// Payment mode
 	print "<tr><td>".$langs->trans("PaymentMode")."</td><td>";
@@ -745,8 +784,8 @@ if (!empty($id) && $action != 'edit')
 			print '<tr class="oddeven"><td>';
 			print '<a href="'.DOL_URL_ROOT.'/don/payment/card.php?id='.$objp->rowid.'">'.img_object($langs->trans("Payment"), "payment").' '.$objp->rowid.'</a></td>';
 			print '<td>'.dol_print_date($db->jdate($objp->dp), 'day')."</td>\n";
-		    $labeltype = $langs->trans("PaymentType".$objp->type_code) != ("PaymentType".$objp->type_code) ? $langs->trans("PaymentType".$objp->type_code) : $objp->paiement_type;
-            print "<td>".$labeltype.' '.$objp->num_payment."</td>\n";
+			$labeltype = $langs->trans("PaymentType".$objp->type_code) != ("PaymentType".$objp->type_code) ? $langs->trans("PaymentType".$objp->type_code) : $objp->paiement_type;
+			print "<td>".$labeltype.' '.$objp->num_payment."</td>\n";
 			print '<td class="right">'.price($objp->amount)."</td>\n";
 			print "</tr>";
 			$totalpaid += $objp->amount;
@@ -775,7 +814,7 @@ if (!empty($id) && $action != 'edit')
 
 	print '<div class="clearboth"></div>';
 
-    dol_fiche_end();
+	print dol_get_fiche_end();
 
 	$remaintopay = $object->amount - $totalpaid;
 
@@ -783,20 +822,26 @@ if (!empty($id) && $action != 'edit')
 
 	print '<div class="tabsAction">';
 
+	// Re-open
+	if ($permissiontoadd && $object->statut == $object::STATUS_CANCELED)
+	{
+		print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=confirm_reopen&confirm=yes&token='.newToken().'">'.$langs->trans("ReOpen").'</a>';
+	}
+
 	print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&rowid='.$object->id.'">'.$langs->trans('Modify').'</a></div>';
 
-	if ($object->statut == 0)
+	if ($object->statut == $object::STATUS_DRAFT)
 	{
 		print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?rowid='.$object->id.'&action=valid_promesse&token='.newToken().'">'.$langs->trans("ValidPromess").'</a></div>';
 	}
 
-    if (($object->statut == 0 || $object->statut == 1) && $totalpaid == 0 && $object->paid == 0)
-    {
-        print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?rowid='.$object->id.'&action=set_cancel&token='.newToken().'">'.$langs->trans("ClassifyCanceled")."</a></div>";
-    }
+	if (($object->statut == $object::STATUS_DRAFT || $object->statut == $object::STATUS_VALIDATED) && $totalpaid == 0 && $object->paid == 0)
+	{
+		print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?rowid='.$object->id.'&action=set_cancel&token='.newToken().'">'.$langs->trans("ClassifyCanceled")."</a></div>";
+	}
 
 	// Create payment
-	if ($object->statut == 1 && $object->paid == 0 && $user->rights->don->creer)
+	if ($object->statut == $object::STATUS_VALIDATED && $object->paid == 0 && $user->rights->don->creer)
 	{
 		if ($remaintopay == 0)
 		{
@@ -807,7 +852,7 @@ if (!empty($id) && $action != 'edit')
 	}
 
 	// Classify 'paid'
-	if ($object->statut == 1 && round($remaintopay) == 0 && $object->paid == 0 && $user->rights->don->creer)
+	if ($object->statut == $object::STATUS_VALIDATED && round($remaintopay) == 0 && $object->paid == 0 && $user->rights->don->creer)
 	{
 		print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?rowid='.$object->id.'&action=set_paid">'.$langs->trans("ClassifyPaid")."</a></div>";
 	}
@@ -815,7 +860,7 @@ if (!empty($id) && $action != 'edit')
 	// Delete
 	if ($user->rights->don->supprimer)
 	{
-		if ($object->statut == -1 || $object->statut == 0)
+		if ($object->statut == $object::STATUS_CANCELED || $object->statut == $object::STATUS_DRAFT)
 		{
 			print '<div class="inline-block divButAction"><a class="butActionDelete" href="card.php?rowid='.$object->id.'&action=delete&token='.newToken().'">'.$langs->trans("Delete")."</a></div>";
 		} else {
@@ -828,7 +873,7 @@ if (!empty($id) && $action != 'edit')
 	print "</div>";
 
 
-    print '<div class="fichecenter"><div class="fichehalfleft">';
+	print '<div class="fichecenter"><div class="fichehalfleft">';
 
 	/*
 	 * Documents generes
diff --git a/htdocs/don/class/api_donations.class.php b/htdocs/don/class/api_donations.class.php
index 2d61241c738..18a8563fd89 100644
--- a/htdocs/don/class/api_donations.class.php
+++ b/htdocs/don/class/api_donations.class.php
@@ -29,48 +29,48 @@
 class Donations extends DolibarrApi
 {
 
-    /**
-     * @var array   $FIELDS     Mandatory fields, checked when create and update object
-     */
-    static $FIELDS = array(
-        'socid'
-    );
+	/**
+	 * @var array   $FIELDS     Mandatory fields, checked when create and update object
+	 */
+	static $FIELDS = array(
+		'socid'
+	);
 
-    /**
-     * @var Don $don {@type Don}
-     */
-    public $don;
+	/**
+	 * @var Don $don {@type Don}
+	 */
+	public $don;
 
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-        global $db, $conf;
-        $this->db = $db;
-        $this->don = new Don($this->db);
-    }
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		global $db, $conf;
+		$this->db = $db;
+		$this->don = new Don($this->db);
+	}
 
-    /**
-     * Get properties of an donation object
-     *
-     * Return an array with donation informations
-     *
-     * @param       int         $id         ID of order
-     * @return 	array|mixed data without useless information
-     *
-     * @throws 	RestException
-     */
-    public function get($id)
-    {
+	/**
+	 * Get properties of an donation object
+	 *
+	 * Return an array with donation informations
+	 *
+	 * @param       int         $id         ID of order
+	 * @return 	array|mixed data without useless information
+	 *
+	 * @throws 	RestException
+	 */
+	public function get($id)
+	{
 		if (!DolibarrApiAccess::$user->rights->don->lire) {
 			throw new RestException(401);
 		}
 
-        $result = $this->don->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Donation not found');
-        }
+		$result = $this->don->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Donation not found');
+		}
 
 		if (!DolibarrApi::_checkAccessToResource('don', $this->don->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
@@ -84,107 +84,107 @@ class Donations extends DolibarrApi
 
 
 
-    /**
-     * List donations
-     *
-     * Get a list of donations
-     *
-     * @param string    $sortfield          Sort field
-     * @param string    $sortorder          Sort order
-     * @param int       $limit              Limit for list
-     * @param int       $page               Page number
-     * @param string    $thirdparty_ids     Thirdparty ids to filter orders of (example '1' or '1,2,3') {@pattern /^[0-9,]*$/i}
-     * @param string    $sqlfilters         Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"
-     * @return  array                       Array of order objects
-     *
-     * @throws RestException
-     */
-    public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $thirdparty_ids = '', $sqlfilters = '')
-    {
-        global $db, $conf;
+	/**
+	 * List donations
+	 *
+	 * Get a list of donations
+	 *
+	 * @param string    $sortfield          Sort field
+	 * @param string    $sortorder          Sort order
+	 * @param int       $limit              Limit for list
+	 * @param int       $page               Page number
+	 * @param string    $thirdparty_ids     Thirdparty ids to filter orders of (example '1' or '1,2,3') {@pattern /^[0-9,]*$/i}
+	 * @param string    $sqlfilters         Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"
+	 * @return  array                       Array of order objects
+	 *
+	 * @throws RestException
+	 */
+	public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $thirdparty_ids = '', $sqlfilters = '')
+	{
+		global $db, $conf;
 
-        $obj_ret = array();
+		$obj_ret = array();
 
-        // case of external user, $thirdparty_ids param is ignored and replaced by user's socid
-        $socids = DolibarrApiAccess::$user->socid ? DolibarrApiAccess::$user->socid : $thirdparty_ids;
+		// case of external user, $thirdparty_ids param is ignored and replaced by user's socid
+		$socids = DolibarrApiAccess::$user->socid ? DolibarrApiAccess::$user->socid : $thirdparty_ids;
 
-        $sql = "SELECT t.rowid";
-        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids)) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
-        $sql .= " FROM ".MAIN_DB_PREFIX."don as t";
+		$sql = "SELECT t.rowid";
+		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids)) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
+		$sql .= " FROM ".MAIN_DB_PREFIX."don as t";
 
-        $sql .= ' WHERE t.entity IN ('.getEntity('don').')';
-        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids)) $sql .= " AND t.fk_soc = sc.fk_soc";
-        if ($thirdparty_ids) $sql .= " AND t.fk_soc = ".$thirdparty_ids." ";
+		$sql .= ' WHERE t.entity IN ('.getEntity('don').')';
+		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids)) $sql .= " AND t.fk_soc = sc.fk_soc";
+		if ($thirdparty_ids) $sql .= " AND t.fk_soc = ".$thirdparty_ids." ";
 
-        // Add sql filters
-        if ($sqlfilters)
-        {
-            if (!DolibarrApi::_checkFilters($sqlfilters))
-            {
-                throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
-            }
-	        $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-        }
+		// Add sql filters
+		if ($sqlfilters)
+		{
+			if (!DolibarrApi::_checkFilters($sqlfilters))
+			{
+				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+			}
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
 
-        $sql .= $this->db->order($sortfield, $sortorder);
-        if ($limit) {
-            if ($page < 0)
-            {
-                $page = 0;
-            }
-            $offset = $limit * $page;
+		$sql .= $this->db->order($sortfield, $sortorder);
+		if ($limit) {
+			if ($page < 0)
+			{
+				$page = 0;
+			}
+			$offset = $limit * $page;
 
-            $sql .= $this->db->plimit($limit + 1, $offset);
-        }
+			$sql .= $this->db->plimit($limit + 1, $offset);
+		}
 
-        dol_syslog("API Rest request");
-        $result = $this->db->query($sql);
+		dol_syslog("API Rest request");
+		$result = $this->db->query($sql);
 
-        if ($result)
-        {
-        	$num = $this->db->num_rows($result);
-            $min = min($num, ($limit <= 0 ? $num : $limit));
-            $i = 0;
-            while ($i < $min)
-            {
-            	$obj = $this->db->fetch_object($result);
-            	$don_static = new Don($this->db);
-                if ($don_static->fetch($obj->rowid)) {
-                    // Add external contacts ids
-                    //$don_static->contacts_ids = $don_static->liste_contact(-1, 'external', 1);
-                    $obj_ret[] = $this->_cleanObjectDatas($don_static);
-                }
-                $i++;
-            }
-        } else {
-        	throw new RestException(503, 'Error when retrieve donation list : '.$this->db->lasterror());
-        }
-        if (!count($obj_ret)) {
-            throw new RestException(404, 'No donation found');
-        }
+		if ($result)
+		{
+			$num = $this->db->num_rows($result);
+			$min = min($num, ($limit <= 0 ? $num : $limit));
+			$i = 0;
+			while ($i < $min)
+			{
+				$obj = $this->db->fetch_object($result);
+				$don_static = new Don($this->db);
+				if ($don_static->fetch($obj->rowid)) {
+					// Add external contacts ids
+					//$don_static->contacts_ids = $don_static->liste_contact(-1, 'external', 1);
+					$obj_ret[] = $this->_cleanObjectDatas($don_static);
+				}
+				$i++;
+			}
+		} else {
+			throw new RestException(503, 'Error when retrieve donation list : '.$this->db->lasterror());
+		}
+		if (!count($obj_ret)) {
+			throw new RestException(404, 'No donation found');
+		}
 
 		return $obj_ret;
-    }
+	}
 
-    /**
-     * Create donation object
-     *
-     * @param   array   $request_data   Request data
-     * @return  int     ID of order
-     */
-    public function post($request_data = null)
-    {
-        if (!DolibarrApiAccess::$user->rights->don->creer) {
-            throw new RestException(401, "Insuffisant rights");
-        }
-        // Check mandatory fields
-        $result = $this->_validate($request_data);
+	/**
+	 * Create donation object
+	 *
+	 * @param   array   $request_data   Request data
+	 * @return  int     ID of order
+	 */
+	public function post($request_data = null)
+	{
+		if (!DolibarrApiAccess::$user->rights->don->creer) {
+			throw new RestException(401, "Insuffisant rights");
+		}
+		// Check mandatory fields
+		$result = $this->_validate($request_data);
 
-        foreach ($request_data as $field => $value) {
-            $this->don->$field = $value;
-        }
-        /*if (isset($request_data["lines"])) {
+		foreach ($request_data as $field => $value) {
+			$this->don->$field = $value;
+		}
+		/*if (isset($request_data["lines"])) {
           $lines = array();
           foreach ($request_data["lines"] as $line) {
             array_push($lines, (object) $line);
@@ -192,111 +192,111 @@ class Donations extends DolibarrApi
           $this->don->lines = $lines;
         }*/
 
-        if ($this->don->create(DolibarrApiAccess::$user) < 0) {
-            throw new RestException(500, "Error creating order", array_merge(array($this->don->error), $this->don->errors));
-        }
+		if ($this->don->create(DolibarrApiAccess::$user) < 0) {
+			throw new RestException(500, "Error creating order", array_merge(array($this->don->error), $this->don->errors));
+		}
 
-        return $this->don->id;
-    }
+		return $this->don->id;
+	}
 
-    /**
-     * Update order general fields (won't touch lines of order)
-     *
-     * @param int   $id             Id of order to update
-     * @param array $request_data   Datas
-     *
-     * @return int
-     */
-    public function put($id, $request_data = null)
-    {
-        if (!DolibarrApiAccess::$user->rights->don->creer) {
+	/**
+	 * Update order general fields (won't touch lines of order)
+	 *
+	 * @param int   $id             Id of order to update
+	 * @param array $request_data   Datas
+	 *
+	 * @return int
+	 */
+	public function put($id, $request_data = null)
+	{
+		if (!DolibarrApiAccess::$user->rights->don->creer) {
 			throw new RestException(401);
 		}
 
-        $result = $this->don->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Donation not found');
-        }
+		$result = $this->don->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Donation not found');
+		}
 
 		if (!DolibarrApi::_checkAccessToResource('donation', $this->don->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
-        foreach ($request_data as $field => $value) {
-            if ($field == 'id') continue;
-            $this->don->$field = $value;
-        }
+		foreach ($request_data as $field => $value) {
+			if ($field == 'id') continue;
+			$this->don->$field = $value;
+		}
 
-        if ($this->don->update(DolibarrApiAccess::$user) > 0)
-        {
-            return $this->get($id);
-        } else {
-        	throw new RestException(500, $this->don->error);
-        }
-    }
+		if ($this->don->update(DolibarrApiAccess::$user) > 0)
+		{
+			return $this->get($id);
+		} else {
+			throw new RestException(500, $this->don->error);
+		}
+	}
 
-    /**
-     * Delete donation
-     *
-     * @param   int     $id         Order ID
-     * @return  array
-     */
-    public function delete($id)
-    {
-        if (!DolibarrApiAccess::$user->rights->don->supprimer) {
+	/**
+	 * Delete donation
+	 *
+	 * @param   int     $id         Order ID
+	 * @return  array
+	 */
+	public function delete($id)
+	{
+		if (!DolibarrApiAccess::$user->rights->don->supprimer) {
 			throw new RestException(401);
 		}
-        $result = $this->don->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Donation not found');
-        }
+		$result = $this->don->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Donation not found');
+		}
 
 		if (!DolibarrApi::_checkAccessToResource('donation', $this->don->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
-        if (!$this->don->delete(DolibarrApiAccess::$user)) {
-            throw new RestException(500, 'Error when delete donation : '.$this->don->error);
-        }
+		if (!$this->don->delete(DolibarrApiAccess::$user)) {
+			throw new RestException(500, 'Error when delete donation : '.$this->don->error);
+		}
 
-        return array(
-            'success' => array(
-                'code' => 200,
-                'message' => 'Donation deleted'
-            )
-        );
-    }
+		return array(
+			'success' => array(
+				'code' => 200,
+				'message' => 'Donation deleted'
+			)
+		);
+	}
 
-    /**
-     * Validate an donation
-     *
+	/**
+	 * Validate an donation
+	 *
 	 * If you get a bad value for param notrigger check, provide this in body
-     * {
-     *   "idwarehouse": 0,
-     *   "notrigger": 0
-     * }
-     *
-     * @param   int $id             Order ID
-     * @param   int $idwarehouse    Warehouse ID
-     * @param   int $notrigger      1=Does not execute triggers, 0= execute triggers
-     *
-     * @url POST    {id}/validate
-     *
+	 * {
+	 *   "idwarehouse": 0,
+	 *   "notrigger": 0
+	 * }
+	 *
+	 * @param   int $id             Order ID
+	 * @param   int $idwarehouse    Warehouse ID
+	 * @param   int $notrigger      1=Does not execute triggers, 0= execute triggers
+	 *
+	 * @url POST    {id}/validate
+	 *
 	 * @throws RestException 304
-     * @throws RestException 401
-     * @throws RestException 404
-     * @throws RestException 500
-     *
-     * @return  array
-     */
-    public function validate($id, $idwarehouse = 0, $notrigger = 0)
-    {
-        if (!DolibarrApiAccess::$user->rights->don->creer) {
+	 * @throws RestException 401
+	 * @throws RestException 404
+	 * @throws RestException 500
+	 *
+	 * @return  array
+	 */
+	public function validate($id, $idwarehouse = 0, $notrigger = 0)
+	{
+		if (!DolibarrApiAccess::$user->rights->don->creer) {
 			throw new RestException(401);
 		}
-        $result = $this->don->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Donation not found');
-        }
+		$result = $this->don->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Donation not found');
+		}
 
 		if (!DolibarrApi::_checkAccessToResource('don', $this->don->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
@@ -304,62 +304,62 @@ class Donations extends DolibarrApi
 
 		$result = $this->don->valid(DolibarrApiAccess::$user, $idwarehouse, $notrigger);
 		if ($result == 0) {
-		    throw new RestException(304, 'Error nothing done. May be object is already validated');
+			throw new RestException(304, 'Error nothing done. May be object is already validated');
 		}
 		if ($result < 0) {
-		    throw new RestException(500, 'Error when validating Order: '.$this->don->error);
+			throw new RestException(500, 'Error when validating Order: '.$this->don->error);
+		}
+		$result = $this->don->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Order not found');
 		}
-        $result = $this->don->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Order not found');
-        }
 
-        if (!DolibarrApi::_checkAccessToResource('don', $this->don->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('don', $this->don->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        $this->don->fetchObjectLinked();
+		$this->don->fetchObjectLinked();
 
-        return $this->_cleanObjectDatas($this->don);
-    }
+		return $this->_cleanObjectDatas($this->don);
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
-    /**
-     * Clean sensible object datas
-     *
-     * @param   object  $object    Object to clean
-     * @return    array    Array of cleaned object properties
-     */
-    protected function _cleanObjectDatas($object)
-    {
-        // phpcs:enable
-        $object = parent::_cleanObjectDatas($object);
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	/**
+	 * Clean sensible object datas
+	 *
+	 * @param   Object  $object     Object to clean
+	 * @return  Object              Object with cleaned properties
+	 */
+	protected function _cleanObjectDatas($object)
+	{
+		// phpcs:enable
+		$object = parent::_cleanObjectDatas($object);
 
-        unset($object->note);
-        unset($object->address);
-        unset($object->barcode_type);
-        unset($object->barcode_type_code);
-        unset($object->barcode_type_label);
-        unset($object->barcode_type_coder);
+		unset($object->note);
+		unset($object->address);
+		unset($object->barcode_type);
+		unset($object->barcode_type_code);
+		unset($object->barcode_type_label);
+		unset($object->barcode_type_coder);
 
-        return $object;
-    }
+		return $object;
+	}
 
-    /**
-     * Validate fields before create or update object
-     *
-     * @param   array           $data   Array with data to verify
-     * @return  array
-     * @throws  RestException
-     */
-    private function _validate($data)
-    {
-        $don = array();
-        foreach (Orders::$FIELDS as $field) {
-            if (!isset($data[$field]))
-                throw new RestException(400, $field." field missing");
-            $don[$field] = $data[$field];
-        }
-        return $don;
-    }
+	/**
+	 * Validate fields before create or update object
+	 *
+	 * @param   array           $data   Array with data to verify
+	 * @return  array
+	 * @throws  RestException
+	 */
+	private function _validate($data)
+	{
+		$don = array();
+		foreach (Orders::$FIELDS as $field) {
+			if (!isset($data[$field]))
+				throw new RestException(400, $field." field missing");
+			$don[$field] = $data[$field];
+		}
+		return $don;
+	}
 }
diff --git a/htdocs/don/class/don.class.php b/htdocs/don/class/don.class.php
index a6fa9fa987d..bb4f0717a5a 100644
--- a/htdocs/don/class/don.class.php
+++ b/htdocs/don/class/don.class.php
@@ -98,9 +98,9 @@ class Don extends CommonObject
 	 */
 	public $email;
 
-    /**
-     * @var int 0 or 1
-     */
+	/**
+	 * @var int 0 or 1
+	 */
 	public $public;
 
 	/**
@@ -116,10 +116,10 @@ class Don extends CommonObject
 	public $num_payment;
 	public $date_valid;
 
-    /**
-     * @var int payment mode id
-     */
-    public $modepaymentid = 0;
+	/**
+	 * @var int payment mode id
+	 */
+	public $modepaymentid = 0;
 
 	/**
 	 * @var array Array of status label
@@ -247,8 +247,8 @@ class Don extends CommonObject
 		$this->note_private = 'Private note';
 		$this->note_public = 'Public note';
 		$this->email = 'email@email.com';
-        $this->phone = '0123456789';
-        $this->phone_mobile = '0606060606';
+		$this->phone = '0123456789';
+		$this->phone_mobile = '0606060606';
 		$this->statut = 1;
 	}
 
@@ -685,7 +685,7 @@ class Don extends CommonObject
 				$this->note_private	      = $obj->note_private;
 				$this->note_public = $obj->note_public;
 				$this->model_pdf          = $obj->model_pdf;
-				$this->modelpdf           = $obj->model_pdf;	// deprecated
+				$this->modelpdf           = $obj->model_pdf; // deprecated
 
 				// Retrieve all extrafield
 				// fetch optionals attributes and labels
@@ -818,6 +818,31 @@ class Don extends CommonObject
 		}
 	}
 
+	/**
+	 *	Set cancel status
+	 *
+	 *	@param	User	$user			Object user that modify
+	 *  @param	int		$notrigger		1=Does not execute triggers, 0=Execute triggers
+	 *	@return	int						<0 if KO, 0=Nothing done, >0 if OK
+	 */
+	public function reopen($user, $notrigger = 0)
+	{
+		// Protection
+		if ($this->statut != self::STATUS_CANCELED)
+		{
+			return 0;
+		}
+
+		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->bom->write))
+		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->bom->bom_advance->validate))))
+		 {
+		 $this->error='Permission denied';
+		 return -1;
+		 }*/
+
+		return $this->setStatusCommon($user, self::STATUS_VALIDATED, $notrigger, 'DON_REOPEN');
+	}
+
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Sum of donations
@@ -900,6 +925,7 @@ class Don extends CommonObject
 		$label = img_picto('', $this->picto).' <u>'.$langs->trans("Donation").'</u>';
 		if (!empty($this->id)) {
 			$label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->id;
+			$label .= '<br><b>'.$langs->trans('Date').':</b> '.dol_print_date($this->date, 'day');
 		}
 		if ($moretitle) $label .= ' - '.$moretitle;
 
diff --git a/htdocs/don/class/donstats.class.php b/htdocs/don/class/donstats.class.php
index 5370bdcaf73..684c04ead44 100644
--- a/htdocs/don/class/donstats.class.php
+++ b/htdocs/don/class/donstats.class.php
@@ -40,43 +40,43 @@ class DonationStats extends Stats
 	public $table_element;
 
 	public $socid;
-    public $userid;
+	public $userid;
 
-    /**
-     * @var string FROM
-     */
-    public $from;
+	/**
+	 * @var string FROM
+	 */
+	public $from;
 
-    /**
-     * @var string field
-     */
+	/**
+	 * @var string field
+	 */
 	public $field;
 
 	/**
 	 * @var string WHERE
 	 */
-    public $where;
+	public $where;
 
 
-    /**
-     * Constructor
-     *
-     * @param	DoliDB	$db      	Database handler
+	/**
+	 * Constructor
+	 *
+	 * @param	DoliDB	$db      	Database handler
 	 * @param 	int		$socid	   	Id third party for filter
 	 * @param 	string	$mode	   	Option (not used)
 	 * @param   int		$userid    	Id user for filter (creation user)
-     */
-    public function __construct($db, $socid, $mode, $userid = 0)
-    {
+	 */
+	public function __construct($db, $socid, $mode, $userid = 0)
+	{
 		global $user, $conf;
 
 		$this->db = $db;
 
 		$this->socid = ($socid > 0 ? $socid : 0);
-        $this->userid = $userid;
+		$this->userid = $userid;
 		$this->cachefilesuffix = $mode;
 
-        $object = new Don($this->db);
+		$object = new Don($this->db);
 		$this->from = MAIN_DB_PREFIX.$object->table_element." as d";
 		//$this->from.= ", ".MAIN_DB_PREFIX."societe as s";
 		//$this->field='weight';	// Warning, unit of weight is NOT USED AND MUST BE
@@ -85,29 +85,29 @@ class DonationStats extends Stats
 		//$this->where.= " AND c.fk_soc = s.rowid AND c.entity = ".$conf->entity;
 		$this->where .= " AND d.entity = ".$conf->entity;
 		if ($this->userid > 0) $this->where .= ' WHERE c.fk_user_author = '.$this->userid;
-    }
+	}
 
-    /**
-     *  Return shipment number by month for a year
-     *
+	/**
+	 *  Return shipment number by month for a year
+	 *
 	 *  @param	int		$year		Year to scan
-     *  @param	int		$format		0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
+	 *  @param	int		$format		0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
 	 *  @return	array				Array with number by month
-     */
-    public function getNbByMonth($year, $format = 0)
-    {
-        global $user;
+	 */
+	public function getNbByMonth($year, $format = 0)
+	{
+		global $user;
 
-        $sql = "SELECT date_format(d.datedon,'%m') as dm, COUNT(*) as nb";
+		$sql = "SELECT date_format(d.datedon,'%m') as dm, COUNT(*) as nb";
 		$sql .= " FROM ".$this->from;
 		$sql .= " WHERE d.datedon BETWEEN '".$this->db->idate(dol_get_first_day($year))."' AND '".$this->db->idate(dol_get_last_day($year))."'";
 		$sql .= " AND ".$this->where;
 		$sql .= " GROUP BY dm";
-        $sql .= $this->db->order('dm', 'DESC');
+		$sql .= $this->db->order('dm', 'DESC');
 
 		$res = $this->_getNbByMonth($year, $sql, $format);
 		return $res;
-    }
+	}
 
 	/**
 	 * Return shipments number per year
@@ -123,26 +123,26 @@ class DonationStats extends Stats
 		$sql .= " FROM ".$this->from;
 		$sql .= " WHERE ".$this->where;
 		$sql .= " GROUP BY dm";
-        $sql .= $this->db->order('dm', 'DESC');
+		$sql .= $this->db->order('dm', 'DESC');
 
 		return $this->_getNbByYear($sql);
 	}
 
-    /**
-     *  Return nb, total and average
-     *
-     *  @return	array	Array of values
-     */
-    public function getAllByYear()
-    {
-        global $user;
+	/**
+	 *  Return nb, total and average
+	 *
+	 *  @return	array	Array of values
+	 */
+	public function getAllByYear()
+	{
+		global $user;
 
-        $sql = "SELECT date_format(d.datedon,'%Y') as year, COUNT(*) as nb, SUM(d.".$this->field.") as total, AVG(".$this->field.") as avg";
-        $sql .= " FROM ".$this->from;
-        $sql .= " WHERE ".$this->where;
-        $sql .= " GROUP BY year";
-        $sql .= $this->db->order('year', 'DESC');
+		$sql = "SELECT date_format(d.datedon,'%Y') as year, COUNT(*) as nb, SUM(d.".$this->field.") as total, AVG(".$this->field.") as avg";
+		$sql .= " FROM ".$this->from;
+		$sql .= " WHERE ".$this->where;
+		$sql .= " GROUP BY year";
+		$sql .= $this->db->order('year', 'DESC');
 
-        return $this->_getAllByYear($sql);
-    }
+		return $this->_getAllByYear($sql);
+	}
 }
diff --git a/htdocs/don/class/paymentdonation.class.php b/htdocs/don/class/paymentdonation.class.php
index e9a38c50bef..710e21f76b7 100644
--- a/htdocs/don/class/paymentdonation.class.php
+++ b/htdocs/don/class/paymentdonation.class.php
@@ -39,7 +39,7 @@ class PaymentDonation extends CommonObject
 	 */
 	public $table_element = 'payment_donation';
 
-    /**
+	/**
 	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
 	 */
 	public $picto = 'payment';
@@ -50,8 +50,8 @@ class PaymentDonation extends CommonObject
 	public $rowid;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_donation;
 
 	public $datec = '';
@@ -69,18 +69,18 @@ class PaymentDonation extends CommonObject
 	public $num_payment;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_bank;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_user_creat;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_user_modif;
 
 	/**
@@ -105,8 +105,8 @@ class PaymentDonation extends CommonObject
 
 	/**
 	 *  Create payment of donation into database.
-     *  Use this->amounts to have list of lines for the payment
-     *
+	 *  Use this->amounts to have list of lines for the payment
+	 *
 	 *  @param      User		$user			User making payment
 	 *  @param      bool 		$notrigger 		false=launch triggers after, true=disable triggers
 	 *  @return     int     					<0 if KO, id of payment if OK
@@ -117,9 +117,9 @@ class PaymentDonation extends CommonObject
 
 		$error = 0;
 
-        $now = dol_now();
+		$now = dol_now();
 
-        // Validate parameters
+		// Validate parameters
 		if (!$this->datepaid)
 		{
 			$this->error = 'ErrorBadValueForParameterCreatePaymentDonation';
@@ -127,26 +127,26 @@ class PaymentDonation extends CommonObject
 		}
 
 		// Clean parameters
-		if (isset($this->fk_donation)) 		$this->fk_donation    = (int) $this->fk_donation;
-		if (isset($this->amount))			$this->amount         = trim($this->amount);
+		if (isset($this->fk_donation)) 		$this->fk_donation = (int) $this->fk_donation;
+		if (isset($this->amount))			$this->amount = trim($this->amount);
 		if (isset($this->fk_typepayment))   $this->fk_typepayment = trim($this->fk_typepayment);
 		if (isset($this->num_payment))      $this->num_payment    = trim($this->num_payment);
-		if (isset($this->note_public))		$this->note_public    = trim($this->note_public);
-		if (isset($this->fk_bank))			$this->fk_bank        = (int) $this->fk_bank;
+		if (isset($this->note_public))		$this->note_public = trim($this->note_public);
+		if (isset($this->fk_bank))			$this->fk_bank = (int) $this->fk_bank;
 		if (isset($this->fk_user_creat))	$this->fk_user_creat  = (int) $this->fk_user_creat;
 		if (isset($this->fk_user_modif))	$this->fk_user_modif  = (int) $this->fk_user_modif;
 
-        $totalamount = 0;
-        foreach ($this->amounts as $key => $value)  // How payment is dispatch
-        {
-            $newvalue = price2num($value, 'MT');
-            $this->amounts[$key] = $newvalue;
-            $totalamount += $newvalue;
-        }
-        $totalamount = price2num($totalamount);
+		$totalamount = 0;
+		foreach ($this->amounts as $key => $value)  // How payment is dispatch
+		{
+			$newvalue = price2num($value, 'MT');
+			$this->amounts[$key] = $newvalue;
+			$totalamount += $newvalue;
+		}
+		$totalamount = price2num($totalamount);
 
-        // Check parameters
-        if ($totalamount == 0) return -1; // On accepte les montants negatifs pour les rejets de prelevement mais pas null
+		// Check parameters
+		if ($totalamount == 0) return -1; // On accepte les montants negatifs pour les rejets de prelevement mais pas null
 
 
 		$this->db->begin();
@@ -182,9 +182,9 @@ class PaymentDonation extends CommonObject
 
 		if ($totalamount != 0 && !$error)
 		{
-		    $this->amount = $totalamount;
-            $this->total = $totalamount; // deprecated
-		    $this->db->commit();
+			$this->amount = $totalamount;
+			$this->total = $totalamount; // deprecated
+			$this->db->commit();
 			return $this->id;
 		} else {
 			$this->error = $this->db->error();
@@ -307,9 +307,9 @@ class PaymentDonation extends CommonObject
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if (!$resql) {
-            $error++;
-            $this->errors[] = "Error ".$this->db->lasterror();
-        }
+			$error++;
+			$this->errors[] = "Error ".$this->db->lasterror();
+		}
 
 		if (!$error)
 		{
@@ -356,15 +356,15 @@ class PaymentDonation extends CommonObject
 
 		$this->db->begin();
 
-	    if (!$error)
-        {
-            $sql = "DELETE FROM ".MAIN_DB_PREFIX."bank_url";
-            $sql .= " WHERE type='payment_donation' AND url_id=".(int) $this->id;
+		if (!$error)
+		{
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX."bank_url";
+			$sql .= " WHERE type='payment_donation' AND url_id=".(int) $this->id;
 
-            dol_syslog(get_class($this)."::delete", LOG_DEBUG);
-            $resql = $this->db->query($sql);
-            if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
-        }
+			dol_syslog(get_class($this)."::delete", LOG_DEBUG);
+			$resql = $this->db->query($sql);
+			if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+		}
 
 		if (!$error)
 		{
@@ -471,10 +471,10 @@ class PaymentDonation extends CommonObject
 	 */
 	public function getLibStatut($mode = 0)
 	{
-	    return '';
+		return '';
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Renvoi le libelle d'un statut donne
 	 *
@@ -482,21 +482,21 @@ class PaymentDonation extends CommonObject
 	 *  @param  int		$mode          	0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
 	 *  @return string 			       	Libelle du statut
 	 */
-    public function LibStatut($status, $mode = 0)
-    {
-        // phpcs:enable
-        global $langs;
+	public function LibStatut($status, $mode = 0)
+	{
+		// phpcs:enable
+		global $langs;
 
-        return '';
-    }
+		return '';
+	}
 
 
 	/**
-     *  Initialise an instance with random values.
-     *  Used to build previews or test instances.
-     *	id must be 0 if object instance is a specimen.
-     *
-     *  @return	void
+	 *  Initialise an instance with random values.
+	 *  Used to build previews or test instances.
+	 *	id must be 0 if object instance is a specimen.
+	 *
+	 *  @return	void
 	 */
 	public function initAsSpecimen()
 	{
@@ -516,87 +516,87 @@ class PaymentDonation extends CommonObject
 	}
 
 
-    /**
-     *      Add record into bank for payment with links between this bank record and invoices of payment.
-     *      All payment properties must have been set first like after a call to create().
-     *
-     *      @param	User	$user               Object of user making payment
-     *      @param  string	$mode               'payment_donation'
-     *      @param  string	$label              Label to use in bank record
-     *      @param  int		$accountid          Id of bank account to do link with
-     *      @param  string	$emetteur_nom       Name of transmitter
-     *      @param  string	$emetteur_banque    Name of bank
-     *      @return int                 		<0 if KO, >0 if OK
-     */
-    public function addPaymentToBank($user, $mode, $label, $accountid, $emetteur_nom, $emetteur_banque)
-    {
-        global $conf;
+	/**
+	 *      Add record into bank for payment with links between this bank record and invoices of payment.
+	 *      All payment properties must have been set first like after a call to create().
+	 *
+	 *      @param	User	$user               Object of user making payment
+	 *      @param  string	$mode               'payment_donation'
+	 *      @param  string	$label              Label to use in bank record
+	 *      @param  int		$accountid          Id of bank account to do link with
+	 *      @param  string	$emetteur_nom       Name of transmitter
+	 *      @param  string	$emetteur_banque    Name of bank
+	 *      @return int                 		<0 if KO, >0 if OK
+	 */
+	public function addPaymentToBank($user, $mode, $label, $accountid, $emetteur_nom, $emetteur_banque)
+	{
+		global $conf;
 
-        $error = 0;
+		$error = 0;
 
-        if (!empty($conf->banque->enabled))
-        {
-            require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+		if (!empty($conf->banque->enabled))
+		{
+			require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 
-            $acc = new Account($this->db);
-            $acc->fetch($accountid);
+			$acc = new Account($this->db);
+			$acc->fetch($accountid);
 
-            $total = $this->total;
-            if ($mode == 'payment_donation') $amount = $total;
+			$total = $this->total;
+			if ($mode == 'payment_donation') $amount = $total;
 
-            // Insert payment into llx_bank
-            $bank_line_id = $acc->addline(
-                $this->datepaid,
-                $this->paymenttype, // Payment mode id or code ("CHQ or VIR for example")
-                $label,
-                $amount,
-                $this->num_payment,
-                '',
-                $user,
-                $emetteur_nom,
-                $emetteur_banque
-            );
+			// Insert payment into llx_bank
+			$bank_line_id = $acc->addline(
+				$this->datepaid,
+				$this->paymenttype, // Payment mode id or code ("CHQ or VIR for example")
+				$label,
+				$amount,
+				$this->num_payment,
+				'',
+				$user,
+				$emetteur_nom,
+				$emetteur_banque
+			);
 
-            // Update fk_bank in llx_paiement.
-            // On connait ainsi le paiement qui a genere l'ecriture bancaire
-            if ($bank_line_id > 0)
-            {
-                $result = $this->update_fk_bank($bank_line_id);
-                if ($result <= 0)
-                {
-                    $error++;
-                    dol_print_error($this->db);
-                }
+			// Update fk_bank in llx_paiement.
+			// On connait ainsi le paiement qui a genere l'ecriture bancaire
+			if ($bank_line_id > 0)
+			{
+				$result = $this->update_fk_bank($bank_line_id);
+				if ($result <= 0)
+				{
+					$error++;
+					dol_print_error($this->db);
+				}
 
-                // Add link 'payment', 'payment_supplier', 'payment_donation' in bank_url between payment and bank transaction
-                $url = '';
-                if ($mode == 'payment_donation') $url = DOL_URL_ROOT.'/don/payment/card.php?rowid=';
-                if ($url)
-                {
-                    $result = $acc->add_url_line($bank_line_id, $this->id, $url, '(paiement)', $mode);
-                    if ($result <= 0)
-                    {
-                        $error++;
-                        dol_print_error($this->db);
-                    }
-                }
-            } else {
-                $this->error = $acc->error;
-                $error++;
-            }
-        }
+				// Add link 'payment', 'payment_supplier', 'payment_donation' in bank_url between payment and bank transaction
+				$url = '';
+				if ($mode == 'payment_donation') $url = DOL_URL_ROOT.'/don/payment/card.php?rowid=';
+				if ($url)
+				{
+					$result = $acc->add_url_line($bank_line_id, $this->id, $url, '(paiement)', $mode);
+					if ($result <= 0)
+					{
+						$error++;
+						dol_print_error($this->db);
+					}
+				}
+			} else {
+				$this->error = $acc->error;
+				$error++;
+			}
+		}
 
-        if (!$error)
-        {
-            return 1;
-        } else {
-            return -1;
-        }
-    }
+		if (!$error)
+		{
+			return 1;
+		} else {
+			return -1;
+		}
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
 	 *  Update link between the donation payment and the generated line in llx_bank
 	 *
 	 *  @param	int		$id_bank         Id if bank
@@ -604,7 +604,7 @@ class PaymentDonation extends CommonObject
 	 */
 	public function update_fk_bank($id_bank)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$sql = "UPDATE ".MAIN_DB_PREFIX."payment_donation SET fk_bank = ".(int) $id_bank." WHERE rowid = ".(int) $this->id;
 
 		dol_syslog(get_class($this)."::update_fk_bank", LOG_DEBUG);
@@ -622,8 +622,8 @@ class PaymentDonation extends CommonObject
 	 *  Return clicable name (with picto eventually)
 	 *
 	 *	@param	int		$withpicto		0=No picto, 1=Include picto into link, 2=Only picto
-	 * 	@param	int		$maxlen			Longueur max libelle
-	 *	@return	string					Chaine avec URL
+	 * 	@param	int		$maxlen			Max length
+	 *	@return	string					String with URL
 	 */
 	public function getNomUrl($withpicto = 0, $maxlen = 0)
 	{
@@ -631,14 +631,16 @@ class PaymentDonation extends CommonObject
 
 		$result = '';
 
-        $label = $langs->trans("ShowPayment").': '.$this->ref;
+		$label = '<u>'.$langs->trans("DonationPayment").'</u>';
+		$label .= '<br>';
+		$label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref;
 
 		if (!empty($this->id))
 		{
 			$link = '<a href="'.DOL_URL_ROOT.'/don/payment/card.php?id='.$this->id.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
 			$linkend = '</a>';
 
-            if ($withpicto) $result .= ($link.img_object($label, 'payment', 'class="classfortooltip"').$linkend.' ');
+			if ($withpicto) $result .= ($link.img_object($label, 'payment', 'class="classfortooltip"').$linkend.' ');
 			if ($withpicto && $withpicto != 2) $result .= ' ';
 			if ($withpicto != 2) $result .= $link.($maxlen ?dol_trunc($this->ref, $maxlen) : $this->ref).$linkend;
 		}
diff --git a/htdocs/don/document.php b/htdocs/don/document.php
index 4b7a7f052dc..9ff1fa98ea2 100644
--- a/htdocs/don/document.php
+++ b/htdocs/don/document.php
@@ -36,8 +36,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/donation.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/don/class/don.class.php';
 if (!empty($conf->projet->enabled))
 {
-    require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
-    require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
 
 // Load translation files required by the page
@@ -121,35 +121,35 @@ if ($object->id)
 	// Project
 	if (!empty($conf->projet->enabled))
 	{
-	    $langs->load("projects");
-	    $morehtmlref .= $langs->trans('Project').' ';
-	    if ($user->rights->don->creer)
-	    {
-            if ($action != 'classify') {
-                // $morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
-            }
-            if ($action == 'classify') {
-                //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-                $morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-                $morehtmlref .= '<input type="hidden" name="action" value="classin">';
-                $morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
-                $morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-                $morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-                $morehtmlref .= '</form>';
-            } else {
-                $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-            }
-	    } else {
-	        if (!empty($object->fk_project)) {
-	            $proj = new Project($db);
-	            $proj->fetch($object->fk_project);
-	            $morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
-	            $morehtmlref .= $proj->ref;
-	            $morehtmlref .= '</a>';
-	        } else {
-	            $morehtmlref .= '';
-	        }
-	    }
+		$langs->load("projects");
+		$morehtmlref .= $langs->trans('Project').' ';
+		if ($user->rights->don->creer)
+		{
+			if ($action != 'classify') {
+				// $morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+			}
+			if ($action == 'classify') {
+				//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+				$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+				$morehtmlref .= '<input type="hidden" name="action" value="classin">';
+				$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
+				$morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+				$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+				$morehtmlref .= '</form>';
+			} else {
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+			}
+		} else {
+			if (!empty($object->fk_project)) {
+				$proj = new Project($db);
+				$proj->fetch($object->fk_project);
+				$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
+				$morehtmlref .= $proj->ref;
+				$morehtmlref .= '</a>';
+			} else {
+				$morehtmlref .= '';
+			}
+		}
 	}
 	$morehtmlref .= '</div>';
 
@@ -159,7 +159,7 @@ if ($object->id)
 	print '<div class="fichecenter">';
 	print '<div class="underbanner clearboth"></div>';
 
-    print '<table class="border tableforfield centpercent">';
+	print '<table class="border tableforfield centpercent">';
 
 	// Ref
 	/*
@@ -171,21 +171,21 @@ if ($object->id)
 	// Societe
 	//print "<tr><td>".$langs->trans("Company")."</td><td>".$object->client->getNomUrl(1)."</td></tr>";
 
-    print '<tr><td class="titlefield">'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
-    print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.dol_print_size($totalsize, 1, 1).'</td></tr>';
-    print '</table>';
+	print '<tr><td class="titlefield">'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
+	print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.dol_print_size($totalsize, 1, 1).'</td></tr>';
+	print '</table>';
 
-    print '</div>';
+	print '</div>';
 
-    print '<div class="clearboth"></div>';
+	print '<div class="clearboth"></div>';
 
-    dol_fiche_end();
+	print dol_get_fiche_end();
 
-    $modulepart = 'don';
-    $permission = $user->rights->don->lire;
-    $permtoedit = $user->rights->don->creer;
-    $param = '&id='.$object->id;
-    include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
+	$modulepart = 'don';
+	$permission = $user->rights->don->lire;
+	$permtoedit = $user->rights->don->creer;
+	$param = '&id='.$object->id;
+	include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
 } else {
 	print $langs->trans("ErrorUnknown");
 }
diff --git a/htdocs/don/index.php b/htdocs/don/index.php
index 030d61d03de..ce47e6ca89b 100644
--- a/htdocs/don/index.php
+++ b/htdocs/don/index.php
@@ -69,20 +69,20 @@ $result = $db->query($sql);
 if ($result)
 {
 	$i = 0;
-    $num = $db->num_rows($result);
-    while ($i < $num)
-    {
-        $objp = $db->fetch_object($result);
+	$num = $db->num_rows($result);
+	while ($i < $num)
+	{
+		$objp = $db->fetch_object($result);
 
-        $somme[$objp->fk_statut] = $objp->somme;
-        $nb[$objp->fk_statut] = $objp->nb;
-        $total += $objp->somme;
+		$somme[$objp->fk_statut] = $objp->somme;
+		$nb[$objp->fk_statut] = $objp->nb;
+		$total += $objp->somme;
 
-        $i++;
-    }
-    $db->free($result);
+		$i++;
+	}
+	$db->free($result);
 } else {
-    dol_print_error($db);
+	dol_print_error($db);
 }
 
 print load_fiche_titre($langs->trans("DonationsArea"), '', 'object_donation');
@@ -92,30 +92,30 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
 
 if (!empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is useless due to the global search combo
 {
-    if (!empty($conf->don->enabled) && $user->rights->don->lire)
-    {
-    	$listofsearchfields['search_donation'] = array('text'=>'Donation');
-    }
+	if (!empty($conf->don->enabled) && $user->rights->don->lire)
+	{
+		$listofsearchfields['search_donation'] = array('text'=>'Donation');
+	}
 
-    if (count($listofsearchfields))
-    {
-    	print '<form method="post" action="'.DOL_URL_ROOT.'/core/search.php">';
-    	print '<input type="hidden" name="token" value="'.newToken().'">';
-    	print '<table class="noborder nohover centpercent">';
-    	$i = 0;
-    	foreach ($listofsearchfields as $key => $value)
-    	{
-    		if ($i == 0) print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
-    		print '<tr '.$bc[false].'>';
-    		print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label></td><td><input type="text" class="flat inputsearch" name="'.$key.'" id="'.$key.'"></td>';
-    		if ($i == 0) print '<td rowspan="'.count($listofsearchfields).'"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
-    		print '</tr>';
-    		$i++;
-    	}
-    	print '</table>';
-    	print '</form>';
-    	print '<br>';
-    }
+	if (count($listofsearchfields))
+	{
+		print '<form method="post" action="'.DOL_URL_ROOT.'/core/search.php">';
+		print '<input type="hidden" name="token" value="'.newToken().'">';
+		print '<table class="noborder nohover centpercent">';
+		$i = 0;
+		foreach ($listofsearchfields as $key => $value)
+		{
+			if ($i == 0) print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
+			print '<tr '.$bc[false].'>';
+			print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label></td><td><input type="text" class="flat inputsearch" name="'.$key.'" id="'.$key.'"></td>';
+			if ($i == 0) print '<td rowspan="'.count($listofsearchfields).'"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
+			print '</tr>';
+			$i++;
+		}
+		print '</table>';
+		print '</form>';
+		print '<br>';
+	}
 }
 
 $dataseries = array();
@@ -131,29 +131,29 @@ print "</tr>\n";
 $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;
+	$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)
 {
-    print '<tr><td class="center" colspan="4">';
+	print '<tr><td class="center" colspan="4">';
 
-    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);
+	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);
 
-    print '</td></tr>';
+	print '</td></tr>';
 }
 
 print '<tr class="liste_titre">';
@@ -167,14 +167,14 @@ $total = 0;
 $totalnb = 0;
 foreach ($listofstatus as $status)
 {
-    print '<tr class="oddeven">';
-    print '<td><a href="list.php?search_status='.$status.'">'.$donstatic->LibStatut($status, 4).'</a></td>';
-    print '<td class="right">'.(!empty($nb[$status]) ? $nb[$status] : '&nbsp;').'</td>';
-    print '<td class="right">'.(!empty($nb[$status]) ?price($somme[$status], 'MT') : '&nbsp;').'</td>';
-    print '<td class="right">'.(!empty($nb[$status]) ?price(price2num($somme[$status] / $nb[$status], 'MT')) : '&nbsp;').'</td>';
-    $totalnb += (!empty($nb[$status]) ? $nb[$status] : 0);
-    $total += (!empty($somme[$status]) ? $somme[$status] : 0);
-    print "</tr>";
+	print '<tr class="oddeven">';
+	print '<td><a href="list.php?search_status='.$status.'">'.$donstatic->LibStatut($status, 4).'</a></td>';
+	print '<td class="right">'.(!empty($nb[$status]) ? $nb[$status] : '&nbsp;').'</td>';
+	print '<td class="right">'.(!empty($nb[$status]) ?price($somme[$status], 'MT') : '&nbsp;').'</td>';
+	print '<td class="right">'.(!empty($nb[$status]) ?price(price2num($somme[$status] / $nb[$status], 'MT')) : '&nbsp;').'</td>';
+	$totalnb += (!empty($nb[$status]) ? $nb[$status] : 0);
+	$total += (!empty($somme[$status]) ? $somme[$status] : 0);
+	print "</tr>";
 }
 
 print '<tr class="liste_total">';
@@ -205,47 +205,47 @@ $sql .= $db->plimit($max, 0);
 $resql = $db->query($sql);
 if ($resql)
 {
-    print '<table class="noborder centpercent">';
-    print '<tr class="liste_titre">';
-    print '<th colspan="5">'.$langs->trans("LastModifiedDonations", $max).'</th></tr>';
+	print '<table class="noborder centpercent">';
+	print '<tr class="liste_titre">';
+	print '<th colspan="5">'.$langs->trans("LastModifiedDonations", $max).'</th></tr>';
 
-    $num = $db->num_rows($resql);
-    if ($num)
-    {
-        $i = 0;
-        while ($i < $num)
-        {
-            $obj = $db->fetch_object($resql);
+	$num = $db->num_rows($resql);
+	if ($num)
+	{
+		$i = 0;
+		while ($i < $num)
+		{
+			$obj = $db->fetch_object($resql);
 
-            print '<tr class="oddeven">';
+			print '<tr class="oddeven">';
 
-            $donation_static->id = $obj->rowid;
-            $donation_static->ref = $obj->ref ? $obj->ref : $obj->rowid;
+			$donation_static->id = $obj->rowid;
+			$donation_static->ref = $obj->ref ? $obj->ref : $obj->rowid;
 
-            print '<td width="96" class="nobordernopadding nowrap">';
-            print $donation_static->getNomUrl(1);
-            print '</td>';
+			print '<td width="96" class="nobordernopadding nowrap">';
+			print $donation_static->getNomUrl(1);
+			print '</td>';
 
-            print '<td class="nobordernopadding">';
-            print $obj->societe;
-            print ($obj->societe && ($obj->lastname || $obj->firstname) ? ' / ' : '');
-            print dolGetFirstLastname($obj->lastname, $obj->firstname);
-            print '</td>';
+			print '<td class="nobordernopadding">';
+			print $obj->societe;
+			print ($obj->societe && ($obj->lastname || $obj->firstname) ? ' / ' : '');
+			print dolGetFirstLastname($obj->lastname, $obj->firstname);
+			print '</td>';
 
-            print '<td class="right nobordernopadding">';
-            print price($obj->amount, 1);
-            print '</td>';
+			print '<td class="right nobordernopadding">';
+			print price($obj->amount, 1);
+			print '</td>';
 
-            // Date
-            print '<td class="center">'.dol_print_date($db->jdate($obj->datem), 'day').'</td>';
+			// Date
+			print '<td class="center">'.dol_print_date($db->jdate($obj->datem), 'day').'</td>';
 
-            print '<td class="right">'.$donation_static->LibStatut($obj->fk_statut, 5).'</td>';
+			print '<td class="right">'.$donation_static->LibStatut($obj->fk_statut, 5).'</td>';
 
-            print '</tr>';
-            $i++;
-        }
-    }
-    print "</table><br>";
+			print '</tr>';
+			$i++;
+		}
+	}
+	print "</table><br>";
 } else dol_print_error($db);
 
 
diff --git a/htdocs/don/info.php b/htdocs/don/info.php
index ead0f354646..1e7e18c9baf 100644
--- a/htdocs/don/info.php
+++ b/htdocs/don/info.php
@@ -27,8 +27,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/don/class/don.class.php';
 if (!empty($conf->projet->enabled))
 {
-    require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
-    require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
 
 $langs->load("donations");
@@ -75,35 +75,35 @@ $morehtmlref = '<div class="refidno">';
 // Project
 if (!empty($conf->projet->enabled))
 {
-    $langs->load("projects");
-    $morehtmlref .= $langs->trans('Project').' ';
-    if ($user->rights->don->creer)
-    {
-        if ($action != 'classify') {
-            // $morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
-        }
-        if ($action == 'classify') {
-            //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-            $morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-            $morehtmlref .= '<input type="hidden" name="action" value="classin">';
-            $morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
-            $morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-            $morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-            $morehtmlref .= '</form>';
-        } else {
-            $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-        }
-    } else {
-        if (!empty($object->fk_project)) {
-            $proj = new Project($db);
-            $proj->fetch($object->fk_project);
-            $morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
-            $morehtmlref .= $proj->ref;
-            $morehtmlref .= '</a>';
-        } else {
-            $morehtmlref .= '';
-        }
-    }
+	$langs->load("projects");
+	$morehtmlref .= $langs->trans('Project').' ';
+	if ($user->rights->don->creer)
+	{
+		if ($action != 'classify') {
+			// $morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+		}
+		if ($action == 'classify') {
+			//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+			$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+			$morehtmlref .= '<input type="hidden" name="action" value="classin">';
+			$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
+			$morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+			$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+			$morehtmlref .= '</form>';
+		} else {
+			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+		}
+	} else {
+		if (!empty($object->fk_project)) {
+			$proj = new Project($db);
+			$proj->fetch($object->fk_project);
+			$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
+			$morehtmlref .= $proj->ref;
+			$morehtmlref .= '</a>';
+		} else {
+			$morehtmlref .= '';
+		}
+	}
 }
 $morehtmlref .= '</div>';
 
@@ -120,7 +120,7 @@ print '</td></tr></table>';
 
 print '</div>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 llxFooter();
 $db->close();
diff --git a/htdocs/don/list.php b/htdocs/don/list.php
index c98f2f8a000..b81b5eaa231 100644
--- a/htdocs/don/list.php
+++ b/htdocs/don/list.php
@@ -58,7 +58,7 @@ if (!$user->rights->don->lire) accessforbidden();
 if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // Both test are required to be compatible with all browsers
 {
 	$search_all = "";
-    $search_ref = "";
+	$search_ref = "";
 	$search_company = "";
 	$search_name = "";
 	$search_amount = "";
@@ -71,10 +71,10 @@ $hookmanager->initHooks(array('orderlist'));
 
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array(
-    'd.rowid'=>'Id',
-    'd.ref'=>'Ref',
-    'd.lastname'=>'Lastname',
-    'd.firstname'=>'Firstname',
+	'd.rowid'=>'Id',
+	'd.ref'=>'Ref',
+	'd.lastname'=>'Lastname',
+	'd.firstname'=>'Firstname',
 );
 
 
@@ -100,19 +100,19 @@ if ($search_status != '' && $search_status != '-4')
 }
 if (trim($search_ref) != '')
 {
-    $sql .= natural_search('d.ref', $search_ref);
+	$sql .= natural_search('d.ref', $search_ref);
 }
 if (trim($search_all) != '')
 {
-    $sql .= natural_search(array_keys($fieldstosearchall), $search_all);
+	$sql .= natural_search(array_keys($fieldstosearchall), $search_all);
 }
 if (trim($search_company) != '')
 {
-    $sql .= natural_search('d.societe', $search_company);
+	$sql .= natural_search('d.societe', $search_company);
 }
 if (trim($search_name) != '')
 {
-    $sql .= natural_search(array('d.lastname', 'd.firstname'), $search_name);
+	$sql .= natural_search(array('d.lastname', 'd.firstname'), $search_name);
 }
 if ($search_amount) $sql .= natural_search('d.amount', $search_amount, 1);
 
@@ -151,84 +151,84 @@ if ($resql)
 	$newcardbutton = '';
 	if ($user->rights->don->creer)
 	{
-        $newcardbutton .= dolGetButtonTitle($langs->trans('NewDonation'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/don/card.php?action=create');
+		$newcardbutton .= dolGetButtonTitle($langs->trans('NewDonation'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/don/card.php?action=create');
 	}
 
 	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">'."\n";
-    if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+	if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="list">';
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-    print '<input type="hidden" name="page" value="'.$page.'">';
-    print '<input type="hidden" name="type" value="'.$type.'">';
+	print '<input type="hidden" name="page" value="'.$page.'">';
+	print '<input type="hidden" name="type" value="'.$type.'">';
 
 	print_barre_liste($langs->trans("Donations"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'object_donation', 0, $newcardbutton, '', $limit, 0, 0, 1);
 
 	if ($search_all)
-    {
-        foreach ($fieldstosearchall as $key => $val) $fieldstosearchall[$key] = $langs->trans($val);
-        print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $search_all).join(', ', $fieldstosearchall).'</div>';
-    }
+	{
+		foreach ($fieldstosearchall as $key => $val) $fieldstosearchall[$key] = $langs->trans($val);
+		print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $search_all).join(', ', $fieldstosearchall).'</div>';
+	}
 
-    print '<div class="div-table-responsive">';
-    print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
+	print '<div class="div-table-responsive">';
+	print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
-    // Filters lines
-    print '<tr class="liste_titre_filter">';
-    print '<td class="liste_titre">';
-    print '<input class="flat" size="10" type="text" name="search_ref" value="'.$search_ref.'">';
-    print '</td>';
-    if (!empty($conf->global->DONATION_USE_THIRDPARTIES)) {
-        print '<td class="liste_titre">';
-        print '<input class="flat" size="10" type="text" name="search_thirdparty" value="'.$search_thirdparty.'">';
-        print '</td>';
-    } else {
-        print '<td class="liste_titre">';
-        print '<input class="flat" size="10" type="text" name="search_company" value="'.$search_company.'">';
-        print '</td>';
-    }
-    print '<td class="liste_titre">';
-    print '<input class="flat" size="10" type="text" name="search_name" value="'.$search_name.'">';
-    print '</td>';
-    print '<td class="liste_titre left">';
-    print '&nbsp;';
-    print '</td>';
-    if (!empty($conf->projet->enabled))
-    {
-        print '<td class="liste_titre right">';
-        print '&nbsp;';
-        print '</td>';
-    }
-    print '<td class="liste_titre right"><input name="search_amount" class="flat" type="text" size="8" value="'.$search_amount.'"></td>';
-    print '<td class="liste_titre right">';
-    $liststatus = array(
-    	Don::STATUS_DRAFT=>$langs->trans("DonationStatusPromiseNotValidated"),
-    	Don::STATUS_VALIDATED=>$langs->trans("DonationStatusPromiseValidated"),
-    	Don::STATUS_PAID=>$langs->trans("DonationStatusPaid"),
-    	Don::STATUS_CANCELED=>$langs->trans("Canceled")
-    );
-    print $form->selectarray('search_status', $liststatus, $search_status, -4, 0, 0, '', 0, 0, 0, '', 'maxwidth100');
-    print '</td>';
-    print '<td class="liste_titre maxwidthsearch">';
-    $searchpicto = $form->showFilterAndCheckAddButtons(0);
-    print $searchpicto;
-    print '</td>';
-    print "</tr>\n";
+	// Filters lines
+	print '<tr class="liste_titre_filter">';
+	print '<td class="liste_titre">';
+	print '<input class="flat" size="10" type="text" name="search_ref" value="'.$search_ref.'">';
+	print '</td>';
+	if (!empty($conf->global->DONATION_USE_THIRDPARTIES)) {
+		print '<td class="liste_titre">';
+		print '<input class="flat" size="10" type="text" name="search_thirdparty" value="'.$search_thirdparty.'">';
+		print '</td>';
+	} else {
+		print '<td class="liste_titre">';
+		print '<input class="flat" size="10" type="text" name="search_company" value="'.$search_company.'">';
+		print '</td>';
+	}
+	print '<td class="liste_titre">';
+	print '<input class="flat" size="10" type="text" name="search_name" value="'.$search_name.'">';
+	print '</td>';
+	print '<td class="liste_titre left">';
+	print '&nbsp;';
+	print '</td>';
+	if (!empty($conf->projet->enabled))
+	{
+		print '<td class="liste_titre right">';
+		print '&nbsp;';
+		print '</td>';
+	}
+	print '<td class="liste_titre right"><input name="search_amount" class="flat" type="text" size="8" value="'.$search_amount.'"></td>';
+	print '<td class="liste_titre right">';
+	$liststatus = array(
+		Don::STATUS_DRAFT=>$langs->trans("DonationStatusPromiseNotValidated"),
+		Don::STATUS_VALIDATED=>$langs->trans("DonationStatusPromiseValidated"),
+		Don::STATUS_PAID=>$langs->trans("DonationStatusPaid"),
+		Don::STATUS_CANCELED=>$langs->trans("Canceled")
+	);
+	print $form->selectarray('search_status', $liststatus, $search_status, -4, 0, 0, '', 0, 0, 0, '', 'maxwidth100');
+	print '</td>';
+	print '<td class="liste_titre maxwidthsearch">';
+	$searchpicto = $form->showFilterAndCheckAddButtons(0);
+	print $searchpicto;
+	print '</td>';
+	print "</tr>\n";
 
-    print '<tr class="liste_titre">';
+	print '<tr class="liste_titre">';
 	print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "d.rowid", "", $param, "", $sortfield, $sortorder);
-    if (!empty($conf->global->DONATION_USE_THIRDPARTIES)) {
-        print_liste_field_titre("ThirdParty", $_SERVER["PHP_SELF"], "d.fk_soc", "", $param, "", $sortfield, $sortorder);
-    } else {
-        print_liste_field_titre("Company", $_SERVER["PHP_SELF"], "d.societe", "", $param, "", $sortfield, $sortorder);
-    }
+	if (!empty($conf->global->DONATION_USE_THIRDPARTIES)) {
+		print_liste_field_titre("ThirdParty", $_SERVER["PHP_SELF"], "d.fk_soc", "", $param, "", $sortfield, $sortorder);
+	} else {
+		print_liste_field_titre("Company", $_SERVER["PHP_SELF"], "d.societe", "", $param, "", $sortfield, $sortorder);
+	}
 	print_liste_field_titre("Name", $_SERVER["PHP_SELF"], "d.lastname", "", $param, "", $sortfield, $sortorder);
 	print_liste_field_titre("Date", $_SERVER["PHP_SELF"], "d.datedon", "", $param, '', $sortfield, $sortorder, 'center ');
 	if (!empty($conf->projet->enabled))
 	{
-	    $langs->load("projects");
-	    print_liste_field_titre("Project", $_SERVER["PHP_SELF"], "d.fk_projet", "", $param, "", $sortfield, $sortorder);
+		$langs->load("projects");
+		print_liste_field_titre("Project", $_SERVER["PHP_SELF"], "d.fk_projet", "", $param, "", $sortfield, $sortorder);
 	}
 	print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], "d.amount", "", $param, '', $sortfield, $sortorder, 'right ');
 	print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "d.fk_statut", "", $param, '', $sortfield, $sortorder, 'right ');
@@ -245,17 +245,17 @@ if ($resql)
 		$donationstatic->lastname = $objp->lastname;
 		$donationstatic->firstname = $objp->firstname;
 		print "<td>".$donationstatic->getNomUrl(1)."</td>";
-        if (!empty($conf->global->DONATION_USE_THIRDPARTIES)) {
-            $company = new Societe($db);
-            $result = $company->fetch($objp->socid);
-            if (!empty($objp->socid) && $company->id > 0) {
-                print "<td>".$company->getNomUrl(1)."</td>";
-            } else {
-                print "<td>".$objp->societe."</td>";
-            }
-        } else {
-            print "<td>".$objp->societe."</td>";
-        }
+		if (!empty($conf->global->DONATION_USE_THIRDPARTIES)) {
+			$company = new Societe($db);
+			$result = $company->fetch($objp->socid);
+			if (!empty($objp->socid) && $company->id > 0) {
+				print "<td>".$company->getNomUrl(1)."</td>";
+			} else {
+				print "<td>".$objp->societe."</td>";
+			}
+		} else {
+			print "<td>".$objp->societe."</td>";
+		}
 		print "<td>".$donationstatic->getFullName($langs)."</td>";
 		print '<td class="center">'.dol_print_date($db->jdate($objp->datedon), 'day').'</td>';
 		if (!empty($conf->projet->enabled))
@@ -274,16 +274,16 @@ if ($resql)
 		}
 		print '<td class="right">'.price($objp->amount).'</td>';
 		print '<td class="right">'.$donationstatic->LibStatut($objp->status, 5).'</td>';
-        print '<td></td>';
+		print '<td></td>';
 		print "</tr>";
 		$i++;
 	}
-    print "</table>";
-    print '</div>';
-    print "</form>\n";
-    $db->free($resql);
+	print "</table>";
+	print '</div>';
+	print "</form>\n";
+	$db->free($resql);
 } else {
-    dol_print_error($db);
+	dol_print_error($db);
 }
 
 llxFooter();
diff --git a/htdocs/don/note.php b/htdocs/don/note.php
index ff25b704dd3..d1bbd0642d9 100644
--- a/htdocs/don/note.php
+++ b/htdocs/don/note.php
@@ -31,8 +31,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/donation.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 if (!empty($conf->projet->enabled))
 {
-    require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
-    require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
 
 // Load translation files required by the page
@@ -91,35 +91,35 @@ if ($id > 0 || !empty($ref))
 	// Project
 	if (!empty($conf->projet->enabled))
 	{
-	    $langs->load("projects");
-	    $morehtmlref .= $langs->trans('Project').' ';
-	    if ($user->rights->don->creer)
-	    {
-            if ($action != 'classify') {
-                // $morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
-            }
-            if ($action == 'classify') {
-                //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-                $morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-                $morehtmlref .= '<input type="hidden" name="action" value="classin">';
-                $morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
-                $morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-                $morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-                $morehtmlref .= '</form>';
-            } else {
-                $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-            }
-	    } else {
-	        if (!empty($object->fk_project)) {
-	            $proj = new Project($db);
-	            $proj->fetch($object->fk_project);
-	            $morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
-	            $morehtmlref .= $proj->ref;
-	            $morehtmlref .= '</a>';
-	        } else {
-	            $morehtmlref .= '';
-	        }
-	    }
+		$langs->load("projects");
+		$morehtmlref .= $langs->trans('Project').' ';
+		if ($user->rights->don->creer)
+		{
+			if ($action != 'classify') {
+				// $morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+			}
+			if ($action == 'classify') {
+				//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+				$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+				$morehtmlref .= '<input type="hidden" name="action" value="classin">';
+				$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
+				$morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+				$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+				$morehtmlref .= '</form>';
+			} else {
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+			}
+		} else {
+			if (!empty($object->fk_project)) {
+				$proj = new Project($db);
+				$proj->fetch($object->fk_project);
+				$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
+				$morehtmlref .= $proj->ref;
+				$morehtmlref .= '</a>';
+			} else {
+				$morehtmlref .= '';
+			}
+		}
 	}
 	$morehtmlref .= '</div>';
 
@@ -131,7 +131,7 @@ if ($id > 0 || !empty($ref))
 	$cssclass = "titlefield";
 	include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 }
 
 llxFooter();
diff --git a/htdocs/don/payment/card.php b/htdocs/don/payment/card.php
index 15146932055..c7c16ee970b 100644
--- a/htdocs/don/payment/card.php
+++ b/htdocs/don/payment/card.php
@@ -30,7 +30,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/facture/modules_facture.php';
 if (!empty($conf->banque->enabled)) require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array("bills", "banks", "companies"));
+$langs->loadLangs(array("bills", "banks", "companies", "donations"));
 
 // Security check
 $id = GETPOST('rowid') ? GETPOST('rowid', 'int') : GETPOST('id', 'int');
@@ -60,16 +60,17 @@ if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->don->supp
 	$result = $object->delete($user);
 	if ($result > 0)
 	{
-        $db->commit();
-        header("Location: ".DOL_URL_ROOT."/don/index.php");
-        exit;
+		$db->commit();
+		header("Location: ".DOL_URL_ROOT."/don/index.php");
+		exit;
 	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
-        $db->rollback();
+		$db->rollback();
 	}
 }
 
 
+
 /*
  * View
  */
@@ -81,6 +82,7 @@ $form = new Form($db);
 
 $h = 0;
 
+$head = array();
 $head[$h][0] = DOL_URL_ROOT.'/don/payment/card.php?id='.$id;
 $head[$h][1] = $langs->trans("DonationPayment");
 $hselected = $h;
@@ -111,7 +113,7 @@ print '<tr><td class="titlefield">'.$langs->trans('Date').'</td><td>'.dol_print_
 print '<tr><td>'.$langs->trans('Mode').'</td><td>'.$langs->trans("PaymentType".$object->type_code).'</td></tr>';
 
 // Number
-print '<tr><td>'.$langs->trans('Number').'</td><td>'.$object->num_payment.'</td></tr>';
+print '<tr><td>'.$langs->trans('Numero').'</td><td>'.$object->num_payment.'</td></tr>';
 
 // Amount
 print '<tr><td>'.$langs->trans('Amount').'</td><td>'.price($object->amount, 0, $outputlangs, 1, -1, -1, $conf->currency).'</td></tr>';
@@ -122,18 +124,18 @@ print '<tr><td>'.$langs->trans('Note').'</td><td>'.nl2br($object->note_public).'
 // Bank account
 if (!empty($conf->banque->enabled))
 {
-    if ($object->bank_account)
-    {
-    	$bankline = new AccountLine($db);
-    	$bankline->fetch($object->bank_line);
+	if ($object->bank_account)
+	{
+		$bankline = new AccountLine($db);
+		$bankline->fetch($object->bank_line);
 
-    	print '<tr>';
-    	print '<td>'.$langs->trans('BankTransactionLine').'</td>';
+		print '<tr>';
+		print '<td>'.$langs->trans('BankTransactionLine').'</td>';
 		print '<td>';
 		print $bankline->getNomUrl(1, 0, 'showall');
-    	print '</td>';
-    	print '</tr>';
-    }
+		print '</td>';
+		print '</tr>';
+	}
 }
 
 print '</table>';
@@ -161,7 +163,7 @@ if ($resql)
 	print '<br><table class="noborder centpercent">';
 	print '<tr class="liste_titre">';
 	print '<td>'.$langs->trans('Donation').'</td>';
-    print '<td class="right">'.$langs->trans('ExpectedToPay').'</td>';
+	print '<td class="right">'.$langs->trans('ExpectedToPay').'</td>';
 	print '<td class="center">'.$langs->trans('Status').'</td>';
 	print '<td class="right">'.$langs->trans('PayedByThisPayment').'</td>';
 	print "</tr>\n";
@@ -186,7 +188,7 @@ if ($resql)
 			print '<td class="right">'.price($objp->amount).'</td>';
 			print "</tr>\n";
 			if ($objp->paid == 1) {
-                // If at least one invoice is paid, disable delete
+				// If at least one invoice is paid, disable delete
 				$disable_delete = 1;
 			}
 			$total = $total + $objp->amount;
@@ -203,7 +205,7 @@ if ($resql)
 
 print '</div>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 /*
diff --git a/htdocs/don/payment/payment.php b/htdocs/don/payment/payment.php
index d8f373cbd37..7cb21033b2d 100644
--- a/htdocs/don/payment/payment.php
+++ b/htdocs/don/payment/payment.php
@@ -69,11 +69,11 @@ if ($action == 'add_payment')
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Date")), null, 'errors');
 		$error++;
 	}
-    if (!empty($conf->banque->enabled) && !$_POST["accountid"] > 0)
-    {
-    	setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("AccountToCredit")), null, 'errors');
-        $error++;
-    }
+	if (!empty($conf->banque->enabled) && !$_POST["accountid"] > 0)
+	{
+		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("AccountToCredit")), null, 'errors');
+		$error++;
+	}
 
 	if (!$error)
 	{
@@ -89,58 +89,58 @@ if ($action == 'add_payment')
 			}
 		}
 
-        if (count($amounts) <= 0)
-        {
-            $error++;
-            $errmsg = 'ErrorNoPaymentDefined';
-            setEventMessages($errmsg, null, 'errors');
-        }
+		if (count($amounts) <= 0)
+		{
+			$error++;
+			$errmsg = 'ErrorNoPaymentDefined';
+			setEventMessages($errmsg, null, 'errors');
+		}
 
-        if (!$error)
-        {
-    		$db->begin();
+		if (!$error)
+		{
+			$db->begin();
 
-    		// Create a line of payments
-    		$payment = new PaymentDonation($db);
-    		$payment->chid         = $chid;
-    		$payment->datepaid     = $datepaid;
-    		$payment->amounts      = $amounts; // Tableau de montant
-    		$payment->paymenttype  = GETPOST("paymenttype", 'int');
-    		$payment->num_payment  = GETPOST("num_payment", 'alphanohtml');
-    		$payment->note_public  = GETPOST("note_public", 'restricthtml');
+			// Create a line of payments
+			$payment = new PaymentDonation($db);
+			$payment->chid         = $chid;
+			$payment->datepaid     = $datepaid;
+			$payment->amounts      = $amounts; // Tableau de montant
+			$payment->paymenttype  = GETPOST("paymenttype", 'int');
+			$payment->num_payment  = GETPOST("num_payment", 'alphanohtml');
+			$payment->note_public  = GETPOST("note_public", 'restricthtml');
 
-    		if (!$error)
-    		{
-    		    $paymentid = $payment->create($user);
-                if ($paymentid < 0)
-                {
-                    $errmsg = $payment->error;
-                    setEventMessages($errmsg, null, 'errors');
-                    $error++;
-                }
-    		}
+			if (!$error)
+			{
+				$paymentid = $payment->create($user);
+				if ($paymentid < 0)
+				{
+					$errmsg = $payment->error;
+					setEventMessages($errmsg, null, 'errors');
+					$error++;
+				}
+			}
 
-            if (!$error)
-            {
-                $result = $payment->addPaymentToBank($user, 'payment_donation', '(DonationPayment)', $_POST['accountid'], '', '');
-                if (!$result > 0)
-                {
-                    $errmsg = $payment->error;
-                    setEventMessages($errmsg, null, 'errors');
-                    $error++;
-                }
-            }
+			if (!$error)
+			{
+				$result = $payment->addPaymentToBank($user, 'payment_donation', '(DonationPayment)', $_POST['accountid'], '', '');
+				if (!$result > 0)
+				{
+					$errmsg = $payment->error;
+					setEventMessages($errmsg, null, 'errors');
+					$error++;
+				}
+			}
 
-    	    if (!$error)
-            {
-                $db->commit();
-                $loc = DOL_URL_ROOT.'/don/card.php?rowid='.$chid;
-                header('Location: '.$loc);
-                exit;
-            } else {
-                $db->rollback();
-            }
-        }
+			if (!$error)
+			{
+				$db->commit();
+				$loc = DOL_URL_ROOT.'/don/card.php?rowid='.$chid;
+				header('Location: '.$loc);
+				exit;
+			} else {
+				$db->rollback();
+			}
+		}
 	}
 
 	$action = 'create';
@@ -196,7 +196,7 @@ if ($action == 'create')
 	print '<input type="hidden" name="chid" value="'.$chid.'">';
 	print '<input type="hidden" name="action" value="add_payment">';
 
-    print dol_get_fiche_head();
+	print dol_get_fiche_head();
 
 	print '<table class="border centpercent tableforfieldcreate">';
 
@@ -231,7 +231,7 @@ if ($action == 'create')
 
 	print '</table>';
 
-    dol_fiche_end();
+	print dol_get_fiche_end();
 
 	/*
  	 * List of payments on donation
diff --git a/htdocs/don/stats/index.php b/htdocs/don/stats/index.php
index 998de2b7793..1f500207898 100644
--- a/htdocs/don/stats/index.php
+++ b/htdocs/don/stats/index.php
@@ -37,8 +37,8 @@ $socid = GETPOST('socid', 'int');
 // Security check
 if ($user->socid > 0)
 {
-    $action = '';
-    $socid = $user->socid;
+	$action = '';
+	$socid = $user->socid;
 }
 
 $nowyear = strftime("%Y", dol_now());
@@ -74,34 +74,34 @@ $data = $stats->getNbByMonthWithPrevYear($endyear, $startyear);
 
 if (!$user->rights->societe->client->voir || $user->socid)
 {
-    $filenamenb = $dir.'/shipmentsnbinyear-'.$user->id.'-'.$year.'.png';
+	$filenamenb = $dir.'/shipmentsnbinyear-'.$user->id.'-'.$year.'.png';
 } else {
-    $filenamenb = $dir.'/shipmentsnbinyear-'.$year.'.png';
+	$filenamenb = $dir.'/shipmentsnbinyear-'.$year.'.png';
 }
 
 $px1 = new DolGraph();
 $mesg = $px1->isGraphKo();
 if (!$mesg)
 {
-    $px1->SetData($data);
-    $i = $startyear; $legend = array();
-    while ($i <= $endyear)
-    {
-        $legend[] = $i;
-        $i++;
-    }
-    $px1->SetLegend($legend);
-    $px1->SetMaxValue($px1->GetCeilMaxValue());
-    $px1->SetMinValue(min(0, $px1->GetFloorMinValue()));
-    $px1->SetWidth($WIDTH);
-    $px1->SetHeight($HEIGHT);
-    $px1->SetYLabel($langs->trans("NbOfSendings"));
-    $px1->SetShading(3);
-    $px1->SetHorizTickIncrement(1);
-    $px1->mode = 'depth';
-    $px1->SetTitle($langs->trans("NumberOfShipmentsByMonth"));
+	$px1->SetData($data);
+	$i = $startyear; $legend = array();
+	while ($i <= $endyear)
+	{
+		$legend[] = $i;
+		$i++;
+	}
+	$px1->SetLegend($legend);
+	$px1->SetMaxValue($px1->GetCeilMaxValue());
+	$px1->SetMinValue(min(0, $px1->GetFloorMinValue()));
+	$px1->SetWidth($WIDTH);
+	$px1->SetHeight($HEIGHT);
+	$px1->SetYLabel($langs->trans("NbOfSendings"));
+	$px1->SetShading(3);
+	$px1->SetHorizTickIncrement(1);
+	$px1->mode = 'depth';
+	$px1->SetTitle($langs->trans("NumberOfShipmentsByMonth"));
 
-    $px1->draw($filenamenb, $fileurlnb);
+	$px1->draw($filenamenb, $fileurlnb);
 }
 
 // Build graphic amount of object
@@ -284,9 +284,9 @@ print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 // Show graphs
 print '<table class="border centpercent"><tr class="pair nohover"><td class="center">';
 if ($mesg) { print $mesg; } else {
-    print $px1->show();
-    print "<br>\n";
-    /*print $px2->show();
+	print $px1->show();
+	print "<br>\n";
+	/*print $px2->show();
     print "<br>\n";
     print $px3->show();*/
 }
@@ -296,7 +296,7 @@ print '</td></tr></table>';
 print '</div></div></div>';
 print '<div style="clear:both"></div>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 
diff --git a/htdocs/don/tpl/linkedobjectblock.tpl.php b/htdocs/don/tpl/linkedobjectblock.tpl.php
index 18c410ba4d0..9e2525b82b2 100644
--- a/htdocs/don/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/don/tpl/linkedobjectblock.tpl.php
@@ -32,18 +32,18 @@ $langs->load("donations");
 $total = 0;
 $ilink = 0;
 foreach ($linkedObjectBlock as $key => $objectlink) {
-    $ilink++;
+	$ilink++;
 
-    $trclass = 'oddeven';
-    if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass .= ' liste_sub_total';
-    print '<tr class="'.$trclass.'">';
-    print '<td>'.$langs->trans("Donation").'</td>';
-    print '<td>'.$objectlink->getNomUrl(1).'</td>';
-    print '<td class="center">'.$objectlink->ref_client.'</td>';
-    print '<td class="center">'.dol_print_date($objectlink->date, 'day').'</td>';
-    print '<td class="right">';
-    $total = $total + $objectlink->total_ht;
-    echo price($objectlink->total_ht);
+	$trclass = 'oddeven';
+	if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass .= ' liste_sub_total';
+	print '<tr class="'.$trclass.'">';
+	print '<td>'.$langs->trans("Donation").'</td>';
+	print '<td>'.$objectlink->getNomUrl(1).'</td>';
+	print '<td class="center">'.$objectlink->ref_client.'</td>';
+	print '<td class="center">'.dol_print_date($objectlink->date, 'day').'</td>';
+	print '<td class="right">';
+	$total = $total + $objectlink->total_ht;
+	echo price($objectlink->total_ht);
 }
 print '</td>';
 print '<td class="right">'.$objectlink->getLibStatut(3).'</td>';
@@ -51,7 +51,7 @@ print '</tr>';
 
 if (count($linkedObjectBlock) > 1)
 {
-    ?>
+	?>
     <tr class="liste_total <?php echo (empty($noMoreLinkedObjectBlockAfter) ? 'liste_sub_total' : ''); ?>">
         <td><?php echo $langs->trans("Total"); ?></td>
         <td></td>
diff --git a/htdocs/ecm/class/ecmdirectory.class.php b/htdocs/ecm/class/ecmdirectory.class.php
index dc39550c0cf..f2b87382c76 100644
--- a/htdocs/ecm/class/ecmdirectory.class.php
+++ b/htdocs/ecm/class/ecmdirectory.class.php
@@ -48,13 +48,13 @@ class EcmDirectory extends CommonObject
 	public $id;
 
 	/**
-     * @var string ECM directories label
-     */
-    public $label;
+	 * @var string ECM directories label
+	 */
+	public $label;
 
-    /**
-     * @var int ID
-     */
+	/**
+	 * @var int ID
+	 */
 	public $fk_parent;
 
 	/**
@@ -67,13 +67,13 @@ class EcmDirectory extends CommonObject
 	public $date_m;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_user_m;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_user_c;
 
 	/**
@@ -196,10 +196,10 @@ class EcmDirectory extends CommonObject
 				$result = dol_mkdir($dir);
 				if ($result < 0) { $error++; $this->error = "ErrorFailedToCreateDir"; }
 
-                // Call trigger
-                $result = $this->call_trigger('MYECMDIR_CREATE', $user);
-                if ($result < 0) { $error++; }
-                // End call triggers
+				// Call trigger
+				$result = $this->call_trigger('MYECMDIR_CREATE', $user);
+				if ($result < 0) { $error++; }
+				// End call triggers
 
 				if (!$error)
 				{
@@ -257,10 +257,10 @@ class EcmDirectory extends CommonObject
 
 		if (!$error && !$notrigger)
 		{
-            // Call trigger
-            $result = $this->call_trigger('MYECMDIR_MODIFY', $user);
-            if ($result < 0) { $error++; }
-            // End call triggers
+			// Call trigger
+			$result = $this->call_trigger('MYECMDIR_MODIFY', $user);
+			if ($result < 0) { $error++; }
+			// End call triggers
 		}
 
 		if (!$error)
@@ -295,9 +295,9 @@ class EcmDirectory extends CommonObject
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		} else {
-		    if (preg_match('/[0-9]+/', $value)) $this->cachenbofdoc = (int) $value;
-		    elseif ($value == '+') $this->cachenbofdoc++;
-		    elseif ($value == '-') $this->cachenbofdoc--;
+			if (preg_match('/[0-9]+/', $value)) $this->cachenbofdoc = (int) $value;
+			elseif ($value == '+') $this->cachenbofdoc++;
+			elseif ($value == '-') $this->cachenbofdoc--;
 		}
 
 		return 1;
@@ -370,7 +370,7 @@ class EcmDirectory extends CommonObject
 	public function delete($user, $mode = 'all', $deletedirrecursive = 0)
 	{
 		global $conf, $langs;
-        require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 		$error = 0;
 
@@ -391,14 +391,14 @@ class EcmDirectory extends CommonObject
 			$this->error = "Error ".$this->db->lasterror();
 			return -2;
 		} else {
-            // Call trigger
-            $result = $this->call_trigger('MYECMDIR_DELETE', $user);
-            if ($result < 0)
-            {
-            	$this->db->rollback();
-            	return -2;
-            }
-            // End call triggers
+			// Call trigger
+			$result = $this->call_trigger('MYECMDIR_DELETE', $user);
+			if ($result < 0)
+			{
+				$this->db->rollback();
+				return -2;
+			}
+			// End call triggers
 		}
 
 		if ($mode != 'databaseonly')
@@ -428,11 +428,11 @@ class EcmDirectory extends CommonObject
 
 
 	/**
-     *  Initialise an instance with random values.
-     *  Used to build previews or test instances.
-     *	id must be 0 if object instance is a specimen.
-     *
-     *  @return	void
+	 *  Initialise an instance with random values.
+	 *  Used to build previews or test instances.
+	 *	id must be 0 if object instance is a specimen.
+	 *
+	 *  @return	void
 	 */
 	public function initAsSpecimen()
 	{
@@ -451,7 +451,7 @@ class EcmDirectory extends CommonObject
 	 *  @param	string	$option			Sur quoi pointe le lien
 	 *  @param	int		$max			Max length
 	 *  @param	string	$more			Add more param on a link
-     *  @param	int		$notooltip		1=Disable tooltip
+	 *  @param	int		$notooltip		1=Disable tooltip
 	 *  @return	string					Chaine avec URL
 	 */
 	public function getNomUrl($withpicto = 0, $option = '', $max = 0, $more = '', $notooltip = 0)
@@ -459,16 +459,16 @@ class EcmDirectory extends CommonObject
 		global $langs;
 
 		$result = '';
-        //$newref=str_replace('_',' ',$this->ref);
-        $newref = $this->ref;
-        $label = $langs->trans("ShowECMSection").': '.$newref;
-        $linkclose = '"'.($more ? ' '.$more : '').' title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
+		//$newref=str_replace('_',' ',$this->ref);
+		$newref = $this->ref;
+		$label = $langs->trans("ShowECMSection").': '.$newref;
+		$linkclose = '"'.($more ? ' '.$more : '').' title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
 
-        $linkstart = '<a href="'.DOL_URL_ROOT.'/ecm/dir_card.php?section='.$this->id.$linkclose;
-        if ($option == 'index') $linkstart = '<a href="'.DOL_URL_ROOT.'/ecm/index.php?section='.$this->id.'&amp;sectionexpand=true'.$linkclose;
-        if ($option == 'indexexpanded') $linkstart = '<a href="'.DOL_URL_ROOT.'/ecm/index.php?section='.$this->id.'&amp;sectionexpand=false'.$linkclose;
-        if ($option == 'indexnotexpanded') $linkstart = '<a href="'.DOL_URL_ROOT.'/ecm/index.php?section='.$this->id.'&amp;sectionexpand=true'.$linkclose;
-        $linkend = '</a>';
+		$linkstart = '<a href="'.DOL_URL_ROOT.'/ecm/dir_card.php?section='.$this->id.$linkclose;
+		if ($option == 'index') $linkstart = '<a href="'.DOL_URL_ROOT.'/ecm/index.php?section='.$this->id.'&amp;sectionexpand=true'.$linkclose;
+		if ($option == 'indexexpanded') $linkstart = '<a href="'.DOL_URL_ROOT.'/ecm/index.php?section='.$this->id.'&amp;sectionexpand=false'.$linkclose;
+		if ($option == 'indexnotexpanded') $linkstart = '<a href="'.DOL_URL_ROOT.'/ecm/index.php?section='.$this->id.'&amp;sectionexpand=true'.$linkclose;
+		$linkend = '</a>';
 
 		//$picto=DOL_URL_ROOT.'/theme/common/treemenu/folder.gif';
 		$picto = 'dir';
@@ -520,7 +520,7 @@ class EcmDirectory extends CommonObject
 		return $ret;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * 	Load this->motherof that is array(id_son=>id_parent, ...)
 	 *
@@ -528,7 +528,7 @@ class EcmDirectory extends CommonObject
 	 */
 	public function load_motherof()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 		$this->motherof = array();
@@ -567,7 +567,7 @@ class EcmDirectory extends CommonObject
 		return $this->LibStatut($this->status, $mode);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return the status
 	 *
@@ -577,13 +577,13 @@ class EcmDirectory extends CommonObject
 	 */
 	public static function LibStatut($status, $mode = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 		return '';
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * 	Reconstruit l'arborescence des categories sous la forme d'un tableau à partir de la base de donnée
 	 *	Renvoi un tableau de tableau('id','id_mere',...) trie selon arbre et avec:
@@ -596,7 +596,7 @@ class EcmDirectory extends CommonObject
 	 * 				fk_user_c           User creation
 	 *  			login_c             Login creation
 	 * 				fullpath	        Full path of id (Added by build_path_from_id_categ call)
-     *              fullrelativename    Full path name (Added by build_path_from_id_categ call)
+	 *              fullrelativename    Full path name (Added by build_path_from_id_categ call)
 	 * 				fulllabel	        Full label (Added by build_path_from_id_categ call)
 	 * 				level		        Level of line (Added by build_path_from_id_categ call)
 	 *
@@ -605,7 +605,7 @@ class EcmDirectory extends CommonObject
 	 */
 	public function get_full_arbo($force = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 		if (empty($force) && !empty($this->full_arbo_loaded))
@@ -680,7 +680,7 @@ class EcmDirectory extends CommonObject
 		return $this->cats;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Define properties fullpath, fullrelativename, fulllabel of a directory of array this->cats and all its childs.
 	 *  Separator between directories is always '/', whatever is OS.
@@ -691,19 +691,19 @@ class EcmDirectory extends CommonObject
 	 */
 	public function build_path_from_id_categ($id_categ, $protection = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		// Define fullpath
 		if (!empty($this->cats[$id_categ]['id_mere']))
 		{
 			$this->cats[$id_categ]['fullpath'] = $this->cats[$this->cats[$id_categ]['id_mere']]['fullpath'];
 			$this->cats[$id_categ]['fullpath'] .= '_'.$id_categ;
-            $this->cats[$id_categ]['fullrelativename'] = $this->cats[$this->cats[$id_categ]['id_mere']]['fullrelativename'];
-            $this->cats[$id_categ]['fullrelativename'] .= '/'.$this->cats[$id_categ]['label'];
+			$this->cats[$id_categ]['fullrelativename'] = $this->cats[$this->cats[$id_categ]['id_mere']]['fullrelativename'];
+			$this->cats[$id_categ]['fullrelativename'] .= '/'.$this->cats[$id_categ]['label'];
 			$this->cats[$id_categ]['fulllabel'] = $this->cats[$this->cats[$id_categ]['id_mere']]['fulllabel'];
 			$this->cats[$id_categ]['fulllabel'] .= ' >> '.$this->cats[$id_categ]['label'];
 		} else {
 			$this->cats[$id_categ]['fullpath'] = '_'.$id_categ;
-            $this->cats[$id_categ]['fullrelativename'] = $this->cats[$id_categ]['label'];
+			$this->cats[$id_categ]['fullrelativename'] = $this->cats[$id_categ]['label'];
 			$this->cats[$id_categ]['fulllabel'] = $this->cats[$id_categ]['label'];
 		}
 		// We count number of _ to have level (we use strlen that is faster than dol_strlen)
@@ -760,35 +760,35 @@ class EcmDirectory extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-     * Call trigger based on this instance.
-     * We implement it here because this class doe not extend CommonObject.
-     *
-     * NB1: Error from trigger are stacked in errors
-     * NB2: if trigger fail, action should be canceled.
-     * NB3: Should be deleted if EcmDirectory extend CommonObject
-     *
-     * @param   string    $triggerName   trigger's name to execute
-     * @param   User      $user           Object user
-     * @return  int                       Result of run_triggers
-     */
-    public function call_trigger($triggerName, $user)
-    {
-        // phpcs:enable
-        global $langs, $conf;
+	 * Call trigger based on this instance.
+	 * We implement it here because this class doe not extend CommonObject.
+	 *
+	 * NB1: Error from trigger are stacked in errors
+	 * NB2: if trigger fail, action should be canceled.
+	 * NB3: Should be deleted if EcmDirectory extend CommonObject
+	 *
+	 * @param   string    $triggerName   trigger's name to execute
+	 * @param   User      $user           Object user
+	 * @return  int                       Result of run_triggers
+	 */
+	public function call_trigger($triggerName, $user)
+	{
+		// phpcs:enable
+		global $langs, $conf;
 
-        include_once DOL_DOCUMENT_ROOT.'/core/class/interfaces.class.php';
-        $interface = new Interfaces($this->db);
-        $result = $interface->run_triggers($triggerName, $this, $user, $langs, $conf);
-        if ($result < 0) {
-            if (!empty($this->errors))
-            {
-                $this->errors = array_merge($this->errors, $interface->errors);
-            } else {
-                $this->errors = $interface->errors;
-            }
-        }
-        return $result;
-    }
+		include_once DOL_DOCUMENT_ROOT.'/core/class/interfaces.class.php';
+		$interface = new Interfaces($this->db);
+		$result = $interface->run_triggers($triggerName, $this, $user, $langs, $conf);
+		if ($result < 0) {
+			if (!empty($this->errors))
+			{
+				$this->errors = array_merge($this->errors, $interface->errors);
+			} else {
+				$this->errors = $interface->errors;
+			}
+		}
+		return $result;
+	}
 }
diff --git a/htdocs/ecm/class/ecmfiles.class.php b/htdocs/ecm/class/ecmfiles.class.php
index daa14aa365f..e229663e55f 100644
--- a/htdocs/ecm/class/ecmfiles.class.php
+++ b/htdocs/ecm/class/ecmfiles.class.php
@@ -67,7 +67,7 @@ class EcmFiles extends CommonObject
 	 */
 	public $entity;
 
-	public $filename;			// Note: Into ecm database record, the entry $filename never ends with .noexe
+	public $filename; // Note: Into ecm database record, the entry $filename never ends with .noexe
 	public $filepath;
 	public $fullpath_orig;
 
@@ -346,7 +346,7 @@ class EcmFiles extends CommonObject
 		 $sql .= " AND entity IN (" . getEntity('ecmfiles') . ")";
 		 }*/
 		if ($relativepath) {
-			$relativepathwithnoexe = preg_replace('/\.noexe$/', '', $relativepath);		// We must never have the .noexe into the database
+			$relativepathwithnoexe = preg_replace('/\.noexe$/', '', $relativepath); // We must never have the .noexe into the database
 			$sql .= " AND t.filepath = '".$this->db->escape(dirname($relativepath))."'";
 			$filename = basename($relativepathwithnoexe);
 			if ($filename != '*') {
@@ -563,7 +563,7 @@ class EcmFiles extends CommonObject
 		}
 		if (isset($this->filepath)) {
 			$this->filepath = trim($this->filepath);
-			$this->filepath = preg_replace('/[\\/]+$/', '', $this->filepath);		// Remove last /
+			$this->filepath = preg_replace('/[\\/]+$/', '', $this->filepath); // Remove last /
 		}
 		if (isset($this->fullpath_orig)) {
 			$this->fullpath_orig = trim($this->fullpath_orig);
diff --git a/htdocs/ecm/class/htmlecm.form.class.php b/htdocs/ecm/class/htmlecm.form.class.php
index 5c84cade8e4..5866ba16893 100644
--- a/htdocs/ecm/class/htmlecm.form.class.php
+++ b/htdocs/ecm/class/htmlecm.form.class.php
@@ -27,15 +27,15 @@ require_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmdirectory.class.php';
  */
 class FormEcm
 {
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    /**
-     * @var string Error code (or message)
-     */
-    public $error = '';
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error = '';
 
 
 	/**
diff --git a/htdocs/ecm/dir_add_card.php b/htdocs/ecm/dir_add_card.php
index d63ef0397fe..436e87714a2 100644
--- a/htdocs/ecm/dir_add_card.php
+++ b/htdocs/ecm/dir_add_card.php
@@ -46,8 +46,8 @@ if (empty($module)) $module = 'ecm';
 // Security check
 if ($user->socid > 0)
 {
-    $action = '';
-    $socid = $user->socid;
+	$action = '';
+	$socid = $user->socid;
 }
 
 $section = $urlsection = GETPOST('section', 'alpha');
@@ -251,7 +251,7 @@ if ($action == 'create')
 
 	print '</table>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div class="center">';
 	print '<input type="submit" class="button" name="create" value="'.$langs->trans("Create").'">';
@@ -270,7 +270,7 @@ if (empty($action) || $action == 'delete_section')
 	print load_fiche_titre($langs->trans("ECMSectionOfDocuments"));
 	print '<br>';
 
-    /*
+	/*
 	$ecmdir->ref=$ecmdir->label;
 	print $langs->trans("ECMSection").': ';
 	print img_picto('','object_dir').' ';
diff --git a/htdocs/ecm/dir_card.php b/htdocs/ecm/dir_card.php
index 9a084da6cc9..8c1c0162692 100644
--- a/htdocs/ecm/dir_card.php
+++ b/htdocs/ecm/dir_card.php
@@ -448,7 +448,7 @@ if ($action == 'edit')
 	print '</form>';
 }
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 
diff --git a/htdocs/ecm/file_card.php b/htdocs/ecm/file_card.php
index 69cac4d1449..cecc62e3fde 100644
--- a/htdocs/ecm/file_card.php
+++ b/htdocs/ecm/file_card.php
@@ -146,7 +146,7 @@ if ($action == 'update')
 	$newfile = $newdir.$newlabel;
 	$newfileformove = $newfile;
 	// If old file end with .noexe, new file must also end with .noexe
-	if (preg_match('/\.noexe$/', $oldfile) && ! preg_match('/\.noexe$/', $newfileformove)) {
+	if (preg_match('/\.noexe$/', $oldfile) && !preg_match('/\.noexe$/', $newfileformove)) {
 		$newfileformove .= '.noexe';
 	}
 	//var_dump($oldfile);var_dump($newfile);exit;
@@ -388,7 +388,7 @@ print '</div>';
 print ajax_autoselect('downloadinternallink');
 print ajax_autoselect('downloadlink');
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 if ($action == 'edit')
 {
diff --git a/htdocs/ecm/index.php b/htdocs/ecm/index.php
index eb65d9a997b..a5050889e09 100644
--- a/htdocs/ecm/index.php
+++ b/htdocs/ecm/index.php
@@ -86,7 +86,7 @@ $error = 0;
 if (GETPOST("sendit", 'alphanohtml') && !empty($conf->global->MAIN_UPLOAD_DOC))
 {
 	// Define relativepath and upload_dir
-    $relativepath = '';
+	$relativepath = '';
 	if ($ecmdir->id) $relativepath = $ecmdir->getRelativePath();
 	else $relativepath = $section_dir;
 	$upload_dir = $conf->ecm->dir_output.'/'.$relativepath;
@@ -111,10 +111,10 @@ if (GETPOST("sendit", 'alphanohtml') && !empty($conf->global->MAIN_UPLOAD_DOC))
 	{
 		$generatethumbs = 0;
 		$res = dol_add_file_process($upload_dir, 0, 1, 'userfile', '', null, '', $generatethumbs);
-	    if ($res > 0)
-	    {
-	        $result = $ecmdir->changeNbOfFiles('+');
-	    }
+		if ($res > 0)
+		{
+			$result = $ecmdir->changeNbOfFiles('+');
+		}
 	}
 }
 
@@ -169,7 +169,7 @@ if ($action == 'confirm_deletesection' && GETPOST('confirm', 'alpha') == 'yes')
 	$result = $ecmdir->delete($user);
 	setEventMessages($langs->trans("ECMSectionWasRemoved", $ecmdir->label), null, 'mesgs');
 
-    clearstatcache();
+	clearstatcache();
 }
 
 // Refresh directory view
@@ -177,130 +177,130 @@ if ($action == 'confirm_deletesection' && GETPOST('confirm', 'alpha') == 'yes')
 // To refresh content of dir with cache, just open the dir in edit mode.
 if ($action == 'refreshmanual')
 {
-    $ecmdirtmp = new EcmDirectory($db);
+	$ecmdirtmp = new EcmDirectory($db);
 
 	// This part of code is same than into file ecm/ajax/ecmdatabase.php TODO Remove duplicate
 	clearstatcache();
 
-    $diroutputslash = str_replace('\\', '/', $conf->ecm->dir_output);
-    $diroutputslash .= '/';
+	$diroutputslash = str_replace('\\', '/', $conf->ecm->dir_output);
+	$diroutputslash .= '/';
 
-    // Scan directory tree on disk
-    $disktree = dol_dir_list($conf->ecm->dir_output, 'directories', 1, '', '^temp$', '', '', 0);
+	// Scan directory tree on disk
+	$disktree = dol_dir_list($conf->ecm->dir_output, 'directories', 1, '', '^temp$', '', '', 0);
 
-    // Scan directory tree in database
-    $sqltree = $ecmdirstatic->get_full_arbo(0);
+	// Scan directory tree in database
+	$sqltree = $ecmdirstatic->get_full_arbo(0);
 
-    $adirwascreated = 0;
+	$adirwascreated = 0;
 
-    // Now we compare both trees to complete missing trees into database
-    //var_dump($disktree);
-    //var_dump($sqltree);
-    foreach ($disktree as $dirdesc)    // Loop on tree onto disk
-    {
-        $dirisindatabase = 0;
-        foreach ($sqltree as $dirsqldesc)
-        {
-            if ($conf->ecm->dir_output.'/'.$dirsqldesc['fullrelativename'] == $dirdesc['fullname'])
-            {
-                $dirisindatabase = 1;
-                break;
-            }
-        }
+	// Now we compare both trees to complete missing trees into database
+	//var_dump($disktree);
+	//var_dump($sqltree);
+	foreach ($disktree as $dirdesc)    // Loop on tree onto disk
+	{
+		$dirisindatabase = 0;
+		foreach ($sqltree as $dirsqldesc)
+		{
+			if ($conf->ecm->dir_output.'/'.$dirsqldesc['fullrelativename'] == $dirdesc['fullname'])
+			{
+				$dirisindatabase = 1;
+				break;
+			}
+		}
 
-        if (!$dirisindatabase)
-        {
-            $txt = "Directory found on disk ".$dirdesc['fullname'].", not found into database so we add it";
-            dol_syslog($txt);
-            //print $txt."<br>\n";
+		if (!$dirisindatabase)
+		{
+			$txt = "Directory found on disk ".$dirdesc['fullname'].", not found into database so we add it";
+			dol_syslog($txt);
+			//print $txt."<br>\n";
 
-            // We must first find the fk_parent of directory to create $dirdesc['fullname']
-            $fk_parent = -1;
-            $relativepathmissing = str_replace($diroutputslash, '', $dirdesc['fullname']);
-            $relativepathtosearchparent = $relativepathmissing;
-            //dol_syslog("Try to find parent id for directory ".$relativepathtosearchparent);
-            if (preg_match('/\//', $relativepathtosearchparent))
-            //while (preg_match('/\//',$relativepathtosearchparent))
-            {
-                $relativepathtosearchparent = preg_replace('/\/[^\/]*$/', '', $relativepathtosearchparent);
-                $txt = "Is relative parent path ".$relativepathtosearchparent." for ".$relativepathmissing." found in sql tree ?";
-                dol_syslog($txt);
-                //print $txt." -> ";
-                $parentdirisindatabase = 0;
-                foreach ($sqltree as $dirsqldesc)
-                {
-                    if ($dirsqldesc['fullrelativename'] == $relativepathtosearchparent)
-                    {
-                        $parentdirisindatabase = $dirsqldesc['id'];
-                        break;
-                    }
-                }
-                if ($parentdirisindatabase > 0)
-                {
-                    dol_syslog("Yes with id ".$parentdirisindatabase);
-                    //print "Yes with id ".$parentdirisindatabase."<br>\n";
-                    $fk_parent = $parentdirisindatabase;
-                    //break;  // We found parent, we can stop the while loop
-                } else {
-                    dol_syslog("No");
-                    //print "No<br>\n";
-                }
-            } else {
-                dol_syslog("Parent is root");
-                $fk_parent = 0; // Parent is root
-            }
+			// We must first find the fk_parent of directory to create $dirdesc['fullname']
+			$fk_parent = -1;
+			$relativepathmissing = str_replace($diroutputslash, '', $dirdesc['fullname']);
+			$relativepathtosearchparent = $relativepathmissing;
+			//dol_syslog("Try to find parent id for directory ".$relativepathtosearchparent);
+			if (preg_match('/\//', $relativepathtosearchparent))
+			//while (preg_match('/\//',$relativepathtosearchparent))
+			{
+				$relativepathtosearchparent = preg_replace('/\/[^\/]*$/', '', $relativepathtosearchparent);
+				$txt = "Is relative parent path ".$relativepathtosearchparent." for ".$relativepathmissing." found in sql tree ?";
+				dol_syslog($txt);
+				//print $txt." -> ";
+				$parentdirisindatabase = 0;
+				foreach ($sqltree as $dirsqldesc)
+				{
+					if ($dirsqldesc['fullrelativename'] == $relativepathtosearchparent)
+					{
+						$parentdirisindatabase = $dirsqldesc['id'];
+						break;
+					}
+				}
+				if ($parentdirisindatabase > 0)
+				{
+					dol_syslog("Yes with id ".$parentdirisindatabase);
+					//print "Yes with id ".$parentdirisindatabase."<br>\n";
+					$fk_parent = $parentdirisindatabase;
+					//break;  // We found parent, we can stop the while loop
+				} else {
+					dol_syslog("No");
+					//print "No<br>\n";
+				}
+			} else {
+				dol_syslog("Parent is root");
+				$fk_parent = 0; // Parent is root
+			}
 
-            if ($fk_parent >= 0)
-            {
-                $ecmdirtmp->ref                = 'NOTUSEDYET';
-                $ecmdirtmp->label              = dol_basename($dirdesc['fullname']);
-                $ecmdirtmp->description        = '';
-                $ecmdirtmp->fk_parent          = $fk_parent;
+			if ($fk_parent >= 0)
+			{
+				$ecmdirtmp->ref                = 'NOTUSEDYET';
+				$ecmdirtmp->label              = dol_basename($dirdesc['fullname']);
+				$ecmdirtmp->description        = '';
+				$ecmdirtmp->fk_parent          = $fk_parent;
 
-                $txt = "We create directory ".$ecmdirtmp->label." with parent ".$fk_parent;
-                dol_syslog($txt);
-                //print $ecmdirtmp->cachenbofdoc."<br>\n";exit;
-                $id = $ecmdirtmp->create($user);
-                if ($id > 0)
-                {
-                    $newdirsql = array('id'=>$id,
-                                     'id_mere'=>$ecmdirtmp->fk_parent,
-                                     'label'=>$ecmdirtmp->label,
-                                     'description'=>$ecmdirtmp->description,
-                                     'fullrelativename'=>$relativepathmissing);
-                    $sqltree[] = $newdirsql; // We complete fulltree for following loops
-                    //var_dump($sqltree);
-                    $adirwascreated = 1;
-                } else {
-                    dol_syslog("Failed to create directory ".$ecmdirtmp->label, LOG_ERR);
-                }
-            } else {
-                $txt = "Parent of ".$dirdesc['fullname']." not found";
-                dol_syslog($txt);
-                //print $txt."<br>\n";
-            }
-        }
-    }
+				$txt = "We create directory ".$ecmdirtmp->label." with parent ".$fk_parent;
+				dol_syslog($txt);
+				//print $ecmdirtmp->cachenbofdoc."<br>\n";exit;
+				$id = $ecmdirtmp->create($user);
+				if ($id > 0)
+				{
+					$newdirsql = array('id'=>$id,
+									 'id_mere'=>$ecmdirtmp->fk_parent,
+									 'label'=>$ecmdirtmp->label,
+									 'description'=>$ecmdirtmp->description,
+									 'fullrelativename'=>$relativepathmissing);
+					$sqltree[] = $newdirsql; // We complete fulltree for following loops
+					//var_dump($sqltree);
+					$adirwascreated = 1;
+				} else {
+					dol_syslog("Failed to create directory ".$ecmdirtmp->label, LOG_ERR);
+				}
+			} else {
+				$txt = "Parent of ".$dirdesc['fullname']." not found";
+				dol_syslog($txt);
+				//print $txt."<br>\n";
+			}
+		}
+	}
 
-    // 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->ecm->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->ecm->dir_output.'/'.$dirdesc['fullrelativename'];
 		if (!dol_is_dir($dirtotest))
 		{
 			$ecmdirtmp->id = $dirdesc['id'];
 			$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);
-    $db->query($sql);
+	$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);
+	$db->query($sql);
 
-    // If a directory was added, the fulltree array is not correctly completed and sorted, so we clean
-    // it to be sure that fulltree array is not used without reloading it.
-    if ($adirwascreated) $sqltree = null;
+	// If a directory was added, the fulltree array is not correctly completed and sorted, so we clean
+	// it to be sure that fulltree array is not used without reloading it.
+	if ($adirwascreated) $sqltree = null;
 }
 
 
@@ -335,7 +335,7 @@ $module = 'ecm';
 include DOL_DOCUMENT_ROOT.'/core/tpl/filemanager.tpl.php';
 
 // End of page
-dol_fiche_end();
+print dol_get_fiche_end();
 
 llxFooter();
 
diff --git a/htdocs/ecm/index_auto.php b/htdocs/ecm/index_auto.php
index f3708fbe6df..94ddecc48ba 100644
--- a/htdocs/ecm/index_auto.php
+++ b/htdocs/ecm/index_auto.php
@@ -113,30 +113,30 @@ if ($action == 'add' && $user->rights->ecm->setup)
 // Remove file
 if ($action == 'confirm_deletefile')
 {
-    if (GETPOST('confirm') == 'yes')
-    {
-    	$langs->load("other");
-    	if ($section)
-    	{
-	    	$result = $ecmdir->fetch($section);
-	    	if (!($result > 0))
-	    	{
-	    		dol_print_error($db, $ecmdir->error);
-	    		exit;
-	    	}
-	    	$relativepath = $ecmdir->getRelativePath();
-    	} else $relativepath = '';
-    	$upload_dir = $conf->ecm->dir_output.($relativepath ? '/'.$relativepath : '');
-    	$file = $upload_dir."/".GETPOST('urlfile'); // Do not use urldecode here ($_GET and $_POST are already decoded by PHP).
+	if (GETPOST('confirm') == 'yes')
+	{
+		$langs->load("other");
+		if ($section)
+		{
+			$result = $ecmdir->fetch($section);
+			if (!($result > 0))
+			{
+				dol_print_error($db, $ecmdir->error);
+				exit;
+			}
+			$relativepath = $ecmdir->getRelativePath();
+		} else $relativepath = '';
+		$upload_dir = $conf->ecm->dir_output.($relativepath ? '/'.$relativepath : '');
+		$file = $upload_dir."/".GETPOST('urlfile'); // Do not use urldecode here ($_GET and $_POST 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');
+		$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('-');
 
-    	clearstatcache();
-    }
+		clearstatcache();
+	}
    	$action = 'file_manager';
 }
 
@@ -146,7 +146,7 @@ if ($action == 'confirm_deletesection' && GETPOST('confirm') == 'yes')
 	$result = $ecmdir->delete($user);
 	setEventMessages($langs->trans("ECMSectionWasRemoved", $ecmdir->label), null, 'mesgs');
 
-    clearstatcache();
+	clearstatcache();
 }
 
 // Refresh directory view
@@ -154,130 +154,130 @@ if ($action == 'confirm_deletesection' && GETPOST('confirm') == 'yes')
 // To refresh content of dir with cache, just open the dir in edit mode.
 if ($action == 'refreshmanual')
 {
-    $ecmdirtmp = new EcmDirectory($db);
+	$ecmdirtmp = new EcmDirectory($db);
 
 	// This part of code is same than into file ecm/ajax/ecmdatabase.php TODO Remove duplicate
 	clearstatcache();
 
-    $diroutputslash = str_replace('\\', '/', $conf->ecm->dir_output);
-    $diroutputslash .= '/';
+	$diroutputslash = str_replace('\\', '/', $conf->ecm->dir_output);
+	$diroutputslash .= '/';
 
-    // Scan directory tree on disk
-    $disktree = dol_dir_list($conf->ecm->dir_output, 'directories', 1, '', '^temp$', '', '', 0);
+	// Scan directory tree on disk
+	$disktree = dol_dir_list($conf->ecm->dir_output, 'directories', 1, '', '^temp$', '', '', 0);
 
-    // Scan directory tree in database
-    $sqltree = $ecmdirstatic->get_full_arbo(0);
+	// Scan directory tree in database
+	$sqltree = $ecmdirstatic->get_full_arbo(0);
 
-    $adirwascreated = 0;
+	$adirwascreated = 0;
 
-    // Now we compare both trees to complete missing trees into database
-    //var_dump($disktree);
-    //var_dump($sqltree);
-    foreach ($disktree as $dirdesc)    // Loop on tree onto disk
-    {
-        $dirisindatabase = 0;
-        foreach ($sqltree as $dirsqldesc)
-        {
-            if ($conf->ecm->dir_output.'/'.$dirsqldesc['fullrelativename'] == $dirdesc['fullname'])
-            {
-                $dirisindatabase = 1;
-                break;
-            }
-        }
+	// Now we compare both trees to complete missing trees into database
+	//var_dump($disktree);
+	//var_dump($sqltree);
+	foreach ($disktree as $dirdesc)    // Loop on tree onto disk
+	{
+		$dirisindatabase = 0;
+		foreach ($sqltree as $dirsqldesc)
+		{
+			if ($conf->ecm->dir_output.'/'.$dirsqldesc['fullrelativename'] == $dirdesc['fullname'])
+			{
+				$dirisindatabase = 1;
+				break;
+			}
+		}
 
-        if (!$dirisindatabase)
-        {
-            $txt = "Directory found on disk ".$dirdesc['fullname'].", not found into database so we add it";
-            dol_syslog($txt);
-            //print $txt."<br>\n";
+		if (!$dirisindatabase)
+		{
+			$txt = "Directory found on disk ".$dirdesc['fullname'].", not found into database so we add it";
+			dol_syslog($txt);
+			//print $txt."<br>\n";
 
-            // We must first find the fk_parent of directory to create $dirdesc['fullname']
-            $fk_parent = -1;
-            $relativepathmissing = str_replace($diroutputslash, '', $dirdesc['fullname']);
-            $relativepathtosearchparent = $relativepathmissing;
-            //dol_syslog("Try to find parent id for directory ".$relativepathtosearchparent);
-            if (preg_match('/\//', $relativepathtosearchparent))
-            //while (preg_match('/\//',$relativepathtosearchparent))
-            {
-                $relativepathtosearchparent = preg_replace('/\/[^\/]*$/', '', $relativepathtosearchparent);
-                $txt = "Is relative parent path ".$relativepathtosearchparent." for ".$relativepathmissing." found in sql tree ?";
-                dol_syslog($txt);
-                //print $txt." -> ";
-                $parentdirisindatabase = 0;
-                foreach ($sqltree as $dirsqldesc)
-                {
-                    if ($dirsqldesc['fullrelativename'] == $relativepathtosearchparent)
-                    {
-                        $parentdirisindatabase = $dirsqldesc['id'];
-                        break;
-                    }
-                }
-                if ($parentdirisindatabase > 0)
-                {
-                    dol_syslog("Yes with id ".$parentdirisindatabase);
-                    //print "Yes with id ".$parentdirisindatabase."<br>\n";
-                    $fk_parent = $parentdirisindatabase;
-                    //break;  // We found parent, we can stop the while loop
-                } else {
-                    dol_syslog("No");
-                    //print "No<br>\n";
-                }
-            } else {
-                dol_syslog("Parent is root");
-                $fk_parent = 0; // Parent is root
-            }
+			// We must first find the fk_parent of directory to create $dirdesc['fullname']
+			$fk_parent = -1;
+			$relativepathmissing = str_replace($diroutputslash, '', $dirdesc['fullname']);
+			$relativepathtosearchparent = $relativepathmissing;
+			//dol_syslog("Try to find parent id for directory ".$relativepathtosearchparent);
+			if (preg_match('/\//', $relativepathtosearchparent))
+			//while (preg_match('/\//',$relativepathtosearchparent))
+			{
+				$relativepathtosearchparent = preg_replace('/\/[^\/]*$/', '', $relativepathtosearchparent);
+				$txt = "Is relative parent path ".$relativepathtosearchparent." for ".$relativepathmissing." found in sql tree ?";
+				dol_syslog($txt);
+				//print $txt." -> ";
+				$parentdirisindatabase = 0;
+				foreach ($sqltree as $dirsqldesc)
+				{
+					if ($dirsqldesc['fullrelativename'] == $relativepathtosearchparent)
+					{
+						$parentdirisindatabase = $dirsqldesc['id'];
+						break;
+					}
+				}
+				if ($parentdirisindatabase > 0)
+				{
+					dol_syslog("Yes with id ".$parentdirisindatabase);
+					//print "Yes with id ".$parentdirisindatabase."<br>\n";
+					$fk_parent = $parentdirisindatabase;
+					//break;  // We found parent, we can stop the while loop
+				} else {
+					dol_syslog("No");
+					//print "No<br>\n";
+				}
+			} else {
+				dol_syslog("Parent is root");
+				$fk_parent = 0; // Parent is root
+			}
 
-            if ($fk_parent >= 0)
-            {
-                $ecmdirtmp->ref                = 'NOTUSEDYET';
-                $ecmdirtmp->label              = dol_basename($dirdesc['fullname']);
-                $ecmdirtmp->description        = '';
-                $ecmdirtmp->fk_parent          = $fk_parent;
+			if ($fk_parent >= 0)
+			{
+				$ecmdirtmp->ref                = 'NOTUSEDYET';
+				$ecmdirtmp->label              = dol_basename($dirdesc['fullname']);
+				$ecmdirtmp->description        = '';
+				$ecmdirtmp->fk_parent          = $fk_parent;
 
-                $txt = "We create directory ".$ecmdirtmp->label." with parent ".$fk_parent;
-                dol_syslog($txt);
-                //print $ecmdirtmp->cachenbofdoc."<br>\n";exit;
-                $id = $ecmdirtmp->create($user);
-                if ($id > 0)
-                {
-                    $newdirsql = array('id'=>$id,
-                                     'id_mere'=>$ecmdirtmp->fk_parent,
-                                     'label'=>$ecmdirtmp->label,
-                                     'description'=>$ecmdirtmp->description,
-                                     'fullrelativename'=>$relativepathmissing);
-                    $sqltree[] = $newdirsql; // We complete fulltree for following loops
-                    //var_dump($sqltree);
-                    $adirwascreated = 1;
-                } else {
-                    dol_syslog("Failed to create directory ".$ecmdirtmp->label, LOG_ERR);
-                }
-            } else {
-                $txt = "Parent of ".$dirdesc['fullname']." not found";
-                dol_syslog($txt);
-                //print $txt."<br>\n";
-            }
-        }
-    }
+				$txt = "We create directory ".$ecmdirtmp->label." with parent ".$fk_parent;
+				dol_syslog($txt);
+				//print $ecmdirtmp->cachenbofdoc."<br>\n";exit;
+				$id = $ecmdirtmp->create($user);
+				if ($id > 0)
+				{
+					$newdirsql = array('id'=>$id,
+									 'id_mere'=>$ecmdirtmp->fk_parent,
+									 'label'=>$ecmdirtmp->label,
+									 'description'=>$ecmdirtmp->description,
+									 'fullrelativename'=>$relativepathmissing);
+					$sqltree[] = $newdirsql; // We complete fulltree for following loops
+					//var_dump($sqltree);
+					$adirwascreated = 1;
+				} else {
+					dol_syslog("Failed to create directory ".$ecmdirtmp->label, LOG_ERR);
+				}
+			} else {
+				$txt = "Parent of ".$dirdesc['fullname']." not found";
+				dol_syslog($txt);
+				//print $txt."<br>\n";
+			}
+		}
+	}
 
-    // 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->ecm->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->ecm->dir_output.'/'.$dirdesc['fullrelativename'];
 		if (!dol_is_dir($dirtotest))
 		{
 			$ecmdirtmp->id = $dirdesc['id'];
 			$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);
-    $db->query($sql);
+	$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);
+	$db->query($sql);
 
-    // If a directory was added, the fulltree array is not correctly completed and sorted, so we clean
-    // it to be sure that fulltree array is not used without reloading it.
-    if ($adirwascreated) $sqltree = null;
+	// If a directory was added, the fulltree array is not correctly completed and sorted, so we clean
+	// it to be sure that fulltree array is not used without reloading it.
+	if ($adirwascreated) $sqltree = null;
 }
 
 
@@ -369,7 +369,7 @@ print '</div>';
 // Confirmation de la suppression d'une ligne categorie
 if ($action == 'delete_section')
 {
-    print $form->formconfirm($_SERVER["PHP_SELF"].'?section='.$section, $langs->trans('DeleteSection'), $langs->trans('ConfirmDeleteSection', $ecmdir->label), 'confirm_deletesection', '', '', 1);
+	print $form->formconfirm($_SERVER["PHP_SELF"].'?section='.$section, $langs->trans('DeleteSection'), $langs->trans('ConfirmDeleteSection', $ecmdir->label), 'confirm_deletesection', '', '', 1);
 }
 // End confirm
 
@@ -380,12 +380,12 @@ if (empty($action) || $action == 'file_manager' || preg_match('/refresh/i', $act
 
 	print '<!-- Title for auto directories -->'."\n";
 	print '<tr class="liste_titre">'."\n";
-    print '<th class="liste_titre" align="left" colspan="6">';
-    print '&nbsp;'.$langs->trans("ECMSections");
+	print '<th class="liste_titre" align="left" colspan="6">';
+	print '&nbsp;'.$langs->trans("ECMSections");
 	print '</th></tr>';
 
-    $showonrightsize = '';
-    // Auto section
+	$showonrightsize = '';
+	// Auto section
 	if (count($sectionauto))
 	{
 		$htmltooltip = $langs->trans("ECMAreaDesc2");
@@ -393,8 +393,8 @@ if (empty($action) || $action == 'file_manager' || preg_match('/refresh/i', $act
 		$sectionauto = dol_sort_array($sectionauto, 'label', 'ASC', true, false);
 
 		print '<tr>';
-    	print '<td colspan="6">';
-	    print '<div id="filetreeauto" class="ecmfiletree"><ul class="ecmjqft">';
+		print '<td colspan="6">';
+		print '<div id="filetreeauto" class="ecmfiletree"><ul class="ecmjqft">';
 
 		$nbofentries = 0;
 		$oldvallevel = 0;
@@ -404,32 +404,32 @@ if (empty($action) || $action == 'file_manager' || preg_match('/refresh/i', $act
 
 			$var = false;
 
-		    print '<li class="directory collapsed">';
+			print '<li class="directory collapsed">';
 			if (!empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABLE_JS))
 			{
-			    print '<a class="fmdirlia jqft ecmjqft" href="'.$_SERVER["PHP_SELF"].'?module='.$val['module'].'">';
-			    print $val['label'];
-   			    print '</a>';
+				print '<a class="fmdirlia jqft ecmjqft" href="'.$_SERVER["PHP_SELF"].'?module='.$val['module'].'">';
+				print $val['label'];
+   				print '</a>';
 			} else {
-			    print '<a class="fmdirlia jqft ecmjqft" href="'.$_SERVER["PHP_SELF"].'?module='.$val['module'].'">';
-			    print $val['label'];
-			    print '</a>';
+				print '<a class="fmdirlia jqft ecmjqft" href="'.$_SERVER["PHP_SELF"].'?module='.$val['module'].'">';
+				print $val['label'];
+				print '</a>';
 			}
 
-		    print '<div class="ecmjqft">';
-		    // Info
-		    $htmltooltip = '<b>'.$langs->trans("ECMSection").'</b>: '.$val['label'].'<br>';
-		    $htmltooltip = '<b>'.$langs->trans("Type").'</b>: '.$langs->trans("ECMSectionAuto").'<br>';
-		    $htmltooltip .= '<b>'.$langs->trans("ECMCreationUser").'</b>: '.$langs->trans("ECMTypeAuto").'<br>';
-		    $htmltooltip .= '<b>'.$langs->trans("Description").'</b>: '.$val['desc'];
-		    print $form->textwithpicto('', $htmltooltip, 1, 'info');
-		    print '</div>';
-		    print '</li>';
+			print '<div class="ecmjqft">';
+			// Info
+			$htmltooltip = '<b>'.$langs->trans("ECMSection").'</b>: '.$val['label'].'<br>';
+			$htmltooltip = '<b>'.$langs->trans("Type").'</b>: '.$langs->trans("ECMSectionAuto").'<br>';
+			$htmltooltip .= '<b>'.$langs->trans("ECMCreationUser").'</b>: '.$langs->trans("ECMTypeAuto").'<br>';
+			$htmltooltip .= '<b>'.$langs->trans("Description").'</b>: '.$val['desc'];
+			print $form->textwithpicto('', $htmltooltip, 1, 'info');
+			print '</div>';
+			print '</li>';
 
-		    $nbofentries++;
+			$nbofentries++;
 		}
 
-	    print '</ul></div></td></tr>';
+		print '</ul></div></td></tr>';
 	}
 
 	print "</table>";
@@ -466,7 +466,7 @@ if (!empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABLE_
 }
 
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 llxFooter();
 
diff --git a/htdocs/emailcollector/class/emailcollector.class.php b/htdocs/emailcollector/class/emailcollector.class.php
index 943b7c73fb3..aed02f40531 100644
--- a/htdocs/emailcollector/class/emailcollector.class.php
+++ b/htdocs/emailcollector/class/emailcollector.class.php
@@ -227,7 +227,7 @@ class EmailCollector extends CommonObject
 		// Translate some data of arrayofkeyval
 		foreach ($this->fields as $key => $val)
 		{
-			if (is_array($val['arrayofkeyval']))
+			if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval']))
 			{
 				foreach ($val['arrayofkeyval'] as $key2 => $val2)
 				{
diff --git a/htdocs/emailcollector/class/emailcollectoraction.class.php b/htdocs/emailcollector/class/emailcollectoraction.class.php
index ed6942f34d6..9b7c8bbca49 100644
--- a/htdocs/emailcollector/class/emailcollectoraction.class.php
+++ b/htdocs/emailcollector/class/emailcollectoraction.class.php
@@ -32,259 +32,259 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
  */
 class EmailCollectorAction extends CommonObject
 {
-    /**
-     * @var string ID to identify managed object
-     */
-    public $element = 'emailcollectoraction';
+	/**
+	 * @var string ID to identify managed object
+	 */
+	public $element = 'emailcollectoraction';
 
-    /**
-     * @var string Name of table without prefix where object is stored
-     */
-    public $table_element = 'emailcollector_emailcollectoraction';
+	/**
+	 * @var string Name of table without prefix where object is stored
+	 */
+	public $table_element = 'emailcollector_emailcollectoraction';
 
-    /**
-     * @var int  Does emailcollectoraction support multicompany module ? 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
-     */
-    public $ismultientitymanaged = 0;
+	/**
+	 * @var int  Does emailcollectoraction support multicompany module ? 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
+	 */
+	public $ismultientitymanaged = 0;
 
-    /**
-     * @var int  Does emailcollectoraction support extrafields ? 0=No, 1=Yes
-     */
-    public $isextrafieldmanaged = 0;
+	/**
+	 * @var int  Does emailcollectoraction support extrafields ? 0=No, 1=Yes
+	 */
+	public $isextrafieldmanaged = 0;
 
-    /**
-     * @var string String with name of icon for emailcollectoraction. Must be the part after the 'object_' into object_emailcollectoraction.png
-     */
-    public $picto = 'emailcollectoraction@emailcollector';
+	/**
+	 * @var string String with name of icon for emailcollectoraction. Must be the part after the 'object_' into object_emailcollectoraction.png
+	 */
+	public $picto = 'emailcollectoraction@emailcollector';
 
 
-    /**
-     *  'type' if the field format.
-     *  'label' the translation key.
-     *  'enabled' is a condition when the field must be managed.
-     *  'visible' says if field is visible in list (Examples: 0=Not visible, 1=Visible on list and create/update/view forms, 2=Visible on list only. Using a negative value means field is not shown by default on list but can be selected for viewing)
-     *  'notnull' is set to 1 if not null in database. Set to -1 if we must set data to null if empty ('' or 0).
-     *  'default' is a default value for creation (can still be replaced by the global setup of default values)
-     *  'index' if we want an index in database.
-     *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
-     *  'position' is the sort order of field.
-     *  'searchall' is 1 if we want to search in this field when making a search from the quick search button.
-     *  'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
-     *  'css' is the CSS style to use on field. For example: 'maxwidth200'
-     *  'help' is a string visible as a tooltip on field
-     *  'comment' is not used. You can store here any text of your choice. It is not used by application.
-     *  'showoncombobox' if value of the field must be visible into the label of the combobox that list record
-     *  'arraykeyval' to set list of value if type is a list of predefined values. For example: array("0"=>"Draft","1"=>"Active","-1"=>"Cancel")
-     */
+	/**
+	 *  'type' if the field format.
+	 *  'label' the translation key.
+	 *  'enabled' is a condition when the field must be managed.
+	 *  'visible' says if field is visible in list (Examples: 0=Not visible, 1=Visible on list and create/update/view forms, 2=Visible on list only. Using a negative value means field is not shown by default on list but can be selected for viewing)
+	 *  'notnull' is set to 1 if not null in database. Set to -1 if we must set data to null if empty ('' or 0).
+	 *  'default' is a default value for creation (can still be replaced by the global setup of default values)
+	 *  'index' if we want an index in database.
+	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
+	 *  'position' is the sort order of field.
+	 *  'searchall' is 1 if we want to search in this field when making a search from the quick search button.
+	 *  'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
+	 *  'css' is the CSS style to use on field. For example: 'maxwidth200'
+	 *  'help' is a string visible as a tooltip on field
+	 *  'comment' is not used. You can store here any text of your choice. It is not used by application.
+	 *  'showoncombobox' if value of the field must be visible into the label of the combobox that list record
+	 *  'arraykeyval' to set list of value if type is a list of predefined values. For example: array("0"=>"Draft","1"=>"Active","-1"=>"Cancel")
+	 */
 
-    // BEGIN MODULEBUILDER PROPERTIES
-    /**
-     * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
-     */
-    public $fields = array(
-        'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-1, 'position'=>1, 'notnull'=>1, 'index'=>1, 'comment'=>"Id",),
-        'fk_emailcollector' => array('type'=>'integer', 'label'=>'Id of emailcollector', 'foreignkey'=>'emailcollector.rowid'),
-        'type' => array('type'=>'varchar(128)', 'label'=>'Type', 'enabled'=>1, 'visible'=>1, 'position'=>10, 'notnull'=>1, 'index'=>1),
-        'actionparam' => array('type'=>'varchar(255)', 'label'=>'ParamForAction', 'enabled'=>1, 'visible'=>1, 'position'=>40, 'notnull'=>-1),
-        'date_creation' => array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-2, 'position'=>500, 'notnull'=>1,),
-        'tms' => array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>1, 'visible'=>-2, 'position'=>501, 'notnull'=>1,),
-        'fk_user_creat' => array('type'=>'integer', 'label'=>'UserAuthor', 'enabled'=>1, 'visible'=>-2, 'position'=>510, 'notnull'=>1, 'foreignkey'=>'llx_user.rowid',),
-        'fk_user_modif' => array('type'=>'integer', 'label'=>'UserModif', 'enabled'=>1, 'visible'=>-2, 'position'=>511, 'notnull'=>-1,),
-        'position' => array('type'=>'integer', 'label'=>'Position', 'enabled'=>1, 'visible'=>1, 'position'=>600, 'default'=>'0',),
-        'import_key' => array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>-2, 'position'=>1000, 'notnull'=>-1,),
-        'status' => array('type'=>'integer', 'label'=>'Status', 'enabled'=>1, 'visible'=>1, 'position'=>1000, 'notnull'=>1, 'default'=>1, 'arrayofkeyval'=>array('0'=>'Disabled', '1'=>'Enabled')),
-    );
-    public $rowid;
-    public $fk_emailcollector;
-    public $type;
-    public $actionparam;
+	// BEGIN MODULEBUILDER PROPERTIES
+	/**
+	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 */
+	public $fields = array(
+		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-1, 'position'=>1, 'notnull'=>1, 'index'=>1, 'comment'=>"Id",),
+		'fk_emailcollector' => array('type'=>'integer', 'label'=>'Id of emailcollector', 'foreignkey'=>'emailcollector.rowid'),
+		'type' => array('type'=>'varchar(128)', 'label'=>'Type', 'enabled'=>1, 'visible'=>1, 'position'=>10, 'notnull'=>1, 'index'=>1),
+		'actionparam' => array('type'=>'varchar(255)', 'label'=>'ParamForAction', 'enabled'=>1, 'visible'=>1, 'position'=>40, 'notnull'=>-1),
+		'date_creation' => array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-2, 'position'=>500, 'notnull'=>1,),
+		'tms' => array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>1, 'visible'=>-2, 'position'=>501, 'notnull'=>1,),
+		'fk_user_creat' => array('type'=>'integer', 'label'=>'UserAuthor', 'enabled'=>1, 'visible'=>-2, 'position'=>510, 'notnull'=>1, 'foreignkey'=>'llx_user.rowid',),
+		'fk_user_modif' => array('type'=>'integer', 'label'=>'UserModif', 'enabled'=>1, 'visible'=>-2, 'position'=>511, 'notnull'=>-1,),
+		'position' => array('type'=>'integer', 'label'=>'Position', 'enabled'=>1, 'visible'=>1, 'position'=>600, 'default'=>'0',),
+		'import_key' => array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>-2, 'position'=>1000, 'notnull'=>-1,),
+		'status' => array('type'=>'integer', 'label'=>'Status', 'enabled'=>1, 'visible'=>1, 'position'=>1000, 'notnull'=>1, 'default'=>1, 'arrayofkeyval'=>array('0'=>'Disabled', '1'=>'Enabled')),
+	);
+	public $rowid;
+	public $fk_emailcollector;
+	public $type;
+	public $actionparam;
 
-    /**
-     * @var integer|string date_creation
-     */
-    public $date_creation;
+	/**
+	 * @var integer|string date_creation
+	 */
+	public $date_creation;
 
 
-    public $tms;
-    public $fk_user_creat;
-    public $fk_user_modif;
-    public $position;
-    public $import_key;
-    public $status;
-    // END MODULEBUILDER PROPERTIES
+	public $tms;
+	public $fk_user_creat;
+	public $fk_user_modif;
+	public $position;
+	public $import_key;
+	public $status;
+	// END MODULEBUILDER PROPERTIES
 
 
 
-    // If this object has a subtable with lines
+	// If this object has a subtable with lines
 
-    // /**
-    //  * @var int    Name of subtable line
-    //  */
-    //public $table_element_line = 'emailcollectoractiondet';
+	// /**
+	//  * @var int    Name of subtable line
+	//  */
+	//public $table_element_line = 'emailcollectoractiondet';
 
-    // /**
-    //  * @var int    Field with ID of parent key if this field has a parent
-    //  */
-    //public $fk_element = 'fk_emailcollectoraction';
+	// /**
+	//  * @var int    Field with ID of parent key if this field has a parent
+	//  */
+	//public $fk_element = 'fk_emailcollectoraction';
 
-    // /**
-    //  * @var int    Name of subtable class that manage subtable lines
-    //  */
-    //public $class_element_line = 'EmailcollectorActionline';
+	// /**
+	//  * @var int    Name of subtable class that manage subtable lines
+	//  */
+	//public $class_element_line = 'EmailcollectorActionline';
 
-    // /**
-    //	* @var array	List of child tables. To test if we can delete object.
-    //  */
-    //protected $childtables=array();
+	// /**
+	//	* @var array	List of child tables. To test if we can delete object.
+	//  */
+	//protected $childtables=array();
 
-    // /**
-    //  * @var EmailcollectorActionLine[]     Array of subtable lines
-    //  */
-    //public $lines = array();
+	// /**
+	//  * @var EmailcollectorActionLine[]     Array of subtable lines
+	//  */
+	//public $lines = array();
 
 
 
-    /**
-     * Constructor
-     *
-     * @param DoliDb $db Database handler
-     */
-    public function __construct(DoliDB $db)
-    {
-        global $conf, $langs;
+	/**
+	 * Constructor
+	 *
+	 * @param DoliDb $db Database handler
+	 */
+	public function __construct(DoliDB $db)
+	{
+		global $conf, $langs;
 
-        $this->db = $db;
+		$this->db = $db;
 
-        if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) $this->fields['rowid']['visible'] = 0;
-        if (empty($conf->multicompany->enabled) && isset($this->fields['entity'])) $this->fields['entity']['enabled'] = 0;
+		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) $this->fields['rowid']['visible'] = 0;
+		if (empty($conf->multicompany->enabled) && isset($this->fields['entity'])) $this->fields['entity']['enabled'] = 0;
 
-        // Unset fields that are disabled
-        foreach ($this->fields as $key => $val)
-        {
-            if (isset($val['enabled']) && empty($val['enabled']))
-            {
-                unset($this->fields[$key]);
-            }
-        }
+		// Unset fields that are disabled
+		foreach ($this->fields as $key => $val)
+		{
+			if (isset($val['enabled']) && empty($val['enabled']))
+			{
+				unset($this->fields[$key]);
+			}
+		}
 
-        // Translate some data of arrayofkeyval
-        foreach ($this->fields as $key => $val)
-        {
-            if (is_array($val['arrayofkeyval']))
-            {
-                foreach ($val['arrayofkeyval'] as $key2 => $val2)
-                {
-                	$this->fields[$key]['arrayofkeyval'][$key2] = $langs->trans($val2);
-                }
-            }
-        }
-    }
+		// Translate some data of arrayofkeyval
+		foreach ($this->fields as $key => $val)
+		{
+			if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval']))
+			{
+				foreach ($val['arrayofkeyval'] as $key2 => $val2)
+				{
+					$this->fields[$key]['arrayofkeyval'][$key2] = $langs->trans($val2);
+				}
+			}
+		}
+	}
 
-    /**
-     * Create object into database
-     *
-     * @param  User $user      User that creates
-     * @param  bool $notrigger false=launch triggers after, true=disable triggers
-     * @return int             <0 if KO, Id of created object if OK
-     */
-    public function create(User $user, $notrigger = false)
-    {
-        global $langs;
-        if (empty($this->type))
-        {
-            $langs->load("errors");
-            $this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Type"));
-            return -1;
-        }
+	/**
+	 * Create object into database
+	 *
+	 * @param  User $user      User that creates
+	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @return int             <0 if KO, Id of created object if OK
+	 */
+	public function create(User $user, $notrigger = false)
+	{
+		global $langs;
+		if (empty($this->type))
+		{
+			$langs->load("errors");
+			$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Type"));
+			return -1;
+		}
 
-        return $this->createCommon($user, $notrigger);
-    }
+		return $this->createCommon($user, $notrigger);
+	}
 
-    /**
-     * Clone and object into another one
-     *
-     * @param  	User 	$user      	User that creates
-     * @param  	int 	$fromid     Id of object to clone
-     * @return 	mixed 				New object created, <0 if KO
-     */
-    public function createFromClone(User $user, $fromid)
-    {
-        global $langs, $hookmanager, $extrafields;
-        $error = 0;
+	/**
+	 * Clone and object into another one
+	 *
+	 * @param  	User 	$user      	User that creates
+	 * @param  	int 	$fromid     Id of object to clone
+	 * @return 	mixed 				New object created, <0 if KO
+	 */
+	public function createFromClone(User $user, $fromid)
+	{
+		global $langs, $hookmanager, $extrafields;
+		$error = 0;
 
-        dol_syslog(__METHOD__, LOG_DEBUG);
+		dol_syslog(__METHOD__, LOG_DEBUG);
 
-        $object = new self($this->db);
+		$object = new self($this->db);
 
-        $this->db->begin();
+		$this->db->begin();
 
-        // Load source object
-        $object->fetchCommon($fromid);
-        // Reset some properties
-        unset($object->id);
-        unset($object->fk_user_creat);
-        unset($object->import_key);
+		// Load source object
+		$object->fetchCommon($fromid);
+		// Reset some properties
+		unset($object->id);
+		unset($object->fk_user_creat);
+		unset($object->import_key);
 
-        // Clear fields
-        $object->ref = "copy_of_".$object->ref;
-        $object->title = $langs->trans("CopyOf")." ".$object->title;
-        // ...
-        // Clear extrafields that are unique
-        if (is_array($object->array_options) && count($object->array_options) > 0)
-        {
-            $extrafields->fetch_name_optionals_label($this->table_element);
-            foreach ($object->array_options as $key => $option)
-            {
-                $shortkey = preg_replace('/options_/', '', $key);
-                if (!empty($extrafields->attributes[$this->element]['unique'][$shortkey]))
-                {
-                    //var_dump($key); var_dump($clonedObj->array_options[$key]); exit;
-                    unset($object->array_options[$key]);
-                }
-            }
-        }
+		// Clear fields
+		$object->ref = "copy_of_".$object->ref;
+		$object->title = $langs->trans("CopyOf")." ".$object->title;
+		// ...
+		// Clear extrafields that are unique
+		if (is_array($object->array_options) && count($object->array_options) > 0)
+		{
+			$extrafields->fetch_name_optionals_label($this->table_element);
+			foreach ($object->array_options as $key => $option)
+			{
+				$shortkey = preg_replace('/options_/', '', $key);
+				if (!empty($extrafields->attributes[$this->element]['unique'][$shortkey]))
+				{
+					//var_dump($key); var_dump($clonedObj->array_options[$key]); exit;
+					unset($object->array_options[$key]);
+				}
+			}
+		}
 
-        // Create clone
-        $object->context['createfromclone'] = 'createfromclone';
-        $result = $object->createCommon($user);
-        if ($result < 0) {
-            $error++;
-            $this->error = $object->error;
-            $this->errors = $object->errors;
-        }
+		// Create clone
+		$object->context['createfromclone'] = 'createfromclone';
+		$result = $object->createCommon($user);
+		if ($result < 0) {
+			$error++;
+			$this->error = $object->error;
+			$this->errors = $object->errors;
+		}
 
-        unset($object->context['createfromclone']);
+		unset($object->context['createfromclone']);
 
-        // End
-        if (!$error) {
-            $this->db->commit();
-            return $object;
-        } else {
-            $this->db->rollback();
-            return -1;
-        }
-    }
+		// End
+		if (!$error) {
+			$this->db->commit();
+			return $object;
+		} else {
+			$this->db->rollback();
+			return -1;
+		}
+	}
 
-    /**
-     * Load object in memory from the database
-     *
-     * @param int    $id   Id object
-     * @param string $ref  Ref
-     * @return int         <0 if KO, 0 if not found, >0 if OK
-     */
-    public function fetch($id, $ref = null)
-    {
-        $result = $this->fetchCommon($id, $ref);
-        if ($result > 0 && !empty($this->table_element_line)) $this->fetchLines();
-        return $result;
-    }
+	/**
+	 * Load object in memory from the database
+	 *
+	 * @param int    $id   Id object
+	 * @param string $ref  Ref
+	 * @return int         <0 if KO, 0 if not found, >0 if OK
+	 */
+	public function fetch($id, $ref = null)
+	{
+		$result = $this->fetchCommon($id, $ref);
+		if ($result > 0 && !empty($this->table_element_line)) $this->fetchLines();
+		return $result;
+	}
 
-    /**
-     * Load object lines in memory from the database
-     *
-     * @return int         <0 if KO, 0 if not found, >0 if OK
-     */
-    /*public function fetchLines()
+	/**
+	 * Load object lines in memory from the database
+	 *
+	 * @return int         <0 if KO, 0 if not found, >0 if OK
+	 */
+	/*public function fetchLines()
     {
         $this->lines=array();
 
@@ -293,222 +293,222 @@ class EmailCollectorAction extends CommonObject
         return count($this->lines)?1:0;
     }*/
 
-    /**
-     * Update object into database
-     *
-     * @param  User $user      User that modifies
-     * @param  bool $notrigger false=launch triggers after, true=disable triggers
-     * @return int             <0 if KO, >0 if OK
-     */
-    public function update(User $user, $notrigger = false)
-    {
-        return $this->updateCommon($user, $notrigger);
-    }
+	/**
+	 * Update object into database
+	 *
+	 * @param  User $user      User that modifies
+	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @return int             <0 if KO, >0 if OK
+	 */
+	public function update(User $user, $notrigger = false)
+	{
+		return $this->updateCommon($user, $notrigger);
+	}
 
-    /**
-     * Delete object in database
-     *
-     * @param User $user       User that deletes
-     * @param bool $notrigger  false=launch triggers after, true=disable triggers
-     * @return int             <0 if KO, >0 if OK
-     */
-    public function delete(User $user, $notrigger = false)
-    {
-        return $this->deleteCommon($user, $notrigger);
-    }
+	/**
+	 * Delete object in database
+	 *
+	 * @param User $user       User that deletes
+	 * @param bool $notrigger  false=launch triggers after, true=disable triggers
+	 * @return int             <0 if KO, >0 if OK
+	 */
+	public function delete(User $user, $notrigger = false)
+	{
+		return $this->deleteCommon($user, $notrigger);
+	}
 
-    /**
-     *  Return a link to the object card (with optionaly the picto)
-     *
-     *	@param	int		$withpicto					Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
-     *	@param	string	$option						On what the link point to ('nolink', ...)
-     *  @param	int  	$notooltip					1=Disable tooltip
-     *  @param  string  $morecss            		Add more css on link
-     *  @param  int     $save_lastsearch_value    	-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
-     *	@return	string								String with URL
-     */
-    public function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $morecss = '', $save_lastsearch_value = -1)
-    {
-        global $db, $conf, $langs, $hookmanager;
-        global $dolibarr_main_authentication, $dolibarr_main_demo;
-        global $menumanager;
+	/**
+	 *  Return a link to the object card (with optionaly the picto)
+	 *
+	 *	@param	int		$withpicto					Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
+	 *	@param	string	$option						On what the link point to ('nolink', ...)
+	 *  @param	int  	$notooltip					1=Disable tooltip
+	 *  @param  string  $morecss            		Add more css on link
+	 *  @param  int     $save_lastsearch_value    	-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+	 *	@return	string								String with URL
+	 */
+	public function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $morecss = '', $save_lastsearch_value = -1)
+	{
+		global $db, $conf, $langs, $hookmanager;
+		global $dolibarr_main_authentication, $dolibarr_main_demo;
+		global $menumanager;
 
-        if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
+		if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
 
-        $result = '';
-        $companylink = '';
+		$result = '';
+		$companylink = '';
 
-        $label = '<u>'.$langs->trans("EmailcollectorAction").'</u>';
-        $label .= '<br>';
-        $label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref;
+		$label = '<u>'.$langs->trans("EmailcollectorAction").'</u>';
+		$label .= '<br>';
+		$label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref;
 
-        $url = dol_buildpath('/emailcollector/emailcollectoraction_card.php', 1).'?id='.$this->id;
+		$url = dol_buildpath('/emailcollector/emailcollectoraction_card.php', 1).'?id='.$this->id;
 
-        if ($option != 'nolink')
-        {
-            // Add param to save lastsearch_values or not
-            $add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
-            if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
-            if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
-        }
+		if ($option != 'nolink')
+		{
+			// Add param to save lastsearch_values or not
+			$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
+			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
+			if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
+		}
 
-        $linkclose = '';
-        if (empty($notooltip))
-        {
-            if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-            {
-                $label = $langs->trans("ShowEmailcollectorAction");
-                $linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
-            }
-            $linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
-            $linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
+		$linkclose = '';
+		if (empty($notooltip))
+		{
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+			{
+				$label = $langs->trans("ShowEmailcollectorAction");
+				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
+			}
+			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
+			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
 
-            /*
+			/*
              $hookmanager->initHooks(array('emailcollectoractiondao'));
              $parameters=array('id'=>$this->id);
              $reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
              if ($reshook > 0) $linkclose = $hookmanager->resPrint;
              */
-        } else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+		} else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
-        $linkstart = '<a href="'.$url.'"';
-        $linkstart .= $linkclose.'>';
-        $linkend = '</a>';
+		$linkstart = '<a href="'.$url.'"';
+		$linkstart .= $linkclose.'>';
+		$linkend = '</a>';
 
-        $result .= $linkstart;
-        if ($withpicto) $result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
-        if ($withpicto != 2) $result .= $this->ref;
-        $result .= $linkend;
-        //if ($withpicto != 2) $result.=(($addlabel && $this->label) ? $sep . dol_trunc($this->label, ($addlabel > 1 ? $addlabel : 0)) : '');
+		$result .= $linkstart;
+		if ($withpicto) $result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+		if ($withpicto != 2) $result .= $this->ref;
+		$result .= $linkend;
+		//if ($withpicto != 2) $result.=(($addlabel && $this->label) ? $sep . dol_trunc($this->label, ($addlabel > 1 ? $addlabel : 0)) : '');
 
-        global $action, $hookmanager;
-        $hookmanager->initHooks(array('emailcollectoractiondao'));
-        $parameters = array('id'=>$this->id, 'getnomurl'=>$result);
-        $reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-        if ($reshook > 0) $result = $hookmanager->resPrint;
-        else $result .= $hookmanager->resPrint;
+		global $action, $hookmanager;
+		$hookmanager->initHooks(array('emailcollectoractiondao'));
+		$parameters = array('id'=>$this->id, 'getnomurl'=>$result);
+		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
+		if ($reshook > 0) $result = $hookmanager->resPrint;
+		else $result .= $hookmanager->resPrint;
 
-        return $result;
-    }
+		return $result;
+	}
 
-    /**
-     *  Return label of the status
-     *
-     *  @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
-     *  @return	string 			       Label of status
-     */
-    public function getLibStatut($mode = 0)
-    {
-        return $this->LibStatut($this->status, $mode);
-    }
+	/**
+	 *  Return label of the status
+	 *
+	 *  @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
+	 *  @return	string 			       Label of status
+	 */
+	public function getLibStatut($mode = 0)
+	{
+		return $this->LibStatut($this->status, $mode);
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Return the status
-     *
-     *  @param	int		$status        Id status
-     *  @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
-     *  @return string 			       Label of status
-     */
-    public function LibStatut($status, $mode = 0)
-    {
-        // phpcs:enable
-        if (empty($this->labelStatus))
-        {
-            global $langs;
-            //$langs->load("emailcollector");
-            $this->labelStatus[1] = $langs->trans('Enabled');
-            $this->labelStatus[0] = $langs->trans('Disabled');
-        }
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Return the status
+	 *
+	 *  @param	int		$status        Id status
+	 *  @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
+	 *  @return string 			       Label of status
+	 */
+	public function LibStatut($status, $mode = 0)
+	{
+		// phpcs:enable
+		if (empty($this->labelStatus))
+		{
+			global $langs;
+			//$langs->load("emailcollector");
+			$this->labelStatus[1] = $langs->trans('Enabled');
+			$this->labelStatus[0] = $langs->trans('Disabled');
+		}
 
-        if ($mode == 0)
-        {
-            return $this->labelStatus[$status];
-        } elseif ($mode == 1)
-        {
-            return $this->labelStatus[$status];
-        } elseif ($mode == 2)
-        {
-            if ($status == 1) return img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelStatus[$status];
-            elseif ($status == 0) return img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelStatus[$status];
-        } elseif ($mode == 3)
-        {
-            if ($status == 1) return img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle');
-            elseif ($status == 0) return img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle');
-        } elseif ($mode == 4)
-        {
-            if ($status == 1) return img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelStatus[$status];
-            elseif ($status == 0) return img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelStatus[$status];
-        } elseif ($mode == 5)
-        {
-            if ($status == 1) return $this->labelStatus[$status].' '.img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle');
-            elseif ($status == 0) return $this->labelStatus[$status].' '.img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle');
-        } elseif ($mode == 6)
-        {
-            if ($status == 1) return $this->labelStatus[$status].' '.img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle');
-            elseif ($status == 0) return $this->labelStatus[$status].' '.img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle');
-        }
-    }
+		if ($mode == 0)
+		{
+			return $this->labelStatus[$status];
+		} elseif ($mode == 1)
+		{
+			return $this->labelStatus[$status];
+		} elseif ($mode == 2)
+		{
+			if ($status == 1) return img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelStatus[$status];
+			elseif ($status == 0) return img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelStatus[$status];
+		} elseif ($mode == 3)
+		{
+			if ($status == 1) return img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle');
+			elseif ($status == 0) return img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle');
+		} elseif ($mode == 4)
+		{
+			if ($status == 1) return img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelStatus[$status];
+			elseif ($status == 0) return img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelStatus[$status];
+		} elseif ($mode == 5)
+		{
+			if ($status == 1) return $this->labelStatus[$status].' '.img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle');
+			elseif ($status == 0) return $this->labelStatus[$status].' '.img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle');
+		} elseif ($mode == 6)
+		{
+			if ($status == 1) return $this->labelStatus[$status].' '.img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle');
+			elseif ($status == 0) return $this->labelStatus[$status].' '.img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle');
+		}
+	}
 
-    /**
-     *	Charge les informations d'ordre info dans l'objet commande
-     *
-     *	@param  int		$id       Id of order
-     *	@return	void
-     */
-    public function info($id)
-    {
-        $sql = 'SELECT rowid, date_creation as datec, tms as datem,';
-        $sql .= ' fk_user_creat, fk_user_modif';
-        $sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
-        $sql .= ' WHERE t.rowid = '.$id;
-        $result = $this->db->query($sql);
-        if ($result)
-        {
-            if ($this->db->num_rows($result))
-            {
-                $obj = $this->db->fetch_object($result);
-                $this->id = $obj->rowid;
-                if ($obj->fk_user_author)
-                {
-                    $cuser = new User($this->db);
-                    $cuser->fetch($obj->fk_user_author);
-                    $this->user_creation = $cuser;
-                }
+	/**
+	 *	Charge les informations d'ordre info dans l'objet commande
+	 *
+	 *	@param  int		$id       Id of order
+	 *	@return	void
+	 */
+	public function info($id)
+	{
+		$sql = 'SELECT rowid, date_creation as datec, tms as datem,';
+		$sql .= ' fk_user_creat, fk_user_modif';
+		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
+		$sql .= ' WHERE t.rowid = '.$id;
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+			if ($this->db->num_rows($result))
+			{
+				$obj = $this->db->fetch_object($result);
+				$this->id = $obj->rowid;
+				if ($obj->fk_user_author)
+				{
+					$cuser = new User($this->db);
+					$cuser->fetch($obj->fk_user_author);
+					$this->user_creation = $cuser;
+				}
 
-                if ($obj->fk_user_valid)
-                {
-                    $vuser = new User($this->db);
-                    $vuser->fetch($obj->fk_user_valid);
-                    $this->user_validation = $vuser;
-                }
+				if ($obj->fk_user_valid)
+				{
+					$vuser = new User($this->db);
+					$vuser->fetch($obj->fk_user_valid);
+					$this->user_validation = $vuser;
+				}
 
-                if ($obj->fk_user_cloture)
-                {
-                    $cluser = new User($this->db);
-                    $cluser->fetch($obj->fk_user_cloture);
-                    $this->user_cloture = $cluser;
-                }
+				if ($obj->fk_user_cloture)
+				{
+					$cluser = new User($this->db);
+					$cluser->fetch($obj->fk_user_cloture);
+					$this->user_cloture = $cluser;
+				}
 
-                $this->date_creation     = $this->db->jdate($obj->datec);
-                $this->date_modification = $this->db->jdate($obj->datem);
-                $this->date_validation   = $this->db->jdate($obj->datev);
-            }
+				$this->date_creation     = $this->db->jdate($obj->datec);
+				$this->date_modification = $this->db->jdate($obj->datem);
+				$this->date_validation   = $this->db->jdate($obj->datev);
+			}
 
-            $this->db->free($result);
-        } else {
-            dol_print_error($this->db);
-        }
-    }
+			$this->db->free($result);
+		} else {
+			dol_print_error($this->db);
+		}
+	}
 
-    /**
-     * Initialise object with example values
-     * Id must be 0 if object instance is a specimen
-     *
-     * @return void
-     */
-    public function initAsSpecimen()
-    {
-        $this->initAsSpecimenCommon();
-    }
+	/**
+	 * Initialise object with example values
+	 * Id must be 0 if object instance is a specimen
+	 *
+	 * @return void
+	 */
+	public function initAsSpecimen()
+	{
+		$this->initAsSpecimenCommon();
+	}
 }
diff --git a/htdocs/emailcollector/class/emailcollectorfilter.class.php b/htdocs/emailcollector/class/emailcollectorfilter.class.php
index cb8db05fa34..71edce42d94 100644
--- a/htdocs/emailcollector/class/emailcollectorfilter.class.php
+++ b/htdocs/emailcollector/class/emailcollectorfilter.class.php
@@ -99,8 +99,8 @@ class EmailCollectorFilter extends CommonObject
 	public $rulevalue;
 
 	/**
-     * @var integer|string date_creation
-     */
+	 * @var integer|string date_creation
+	 */
 	public $date_creation;
 
 
@@ -139,7 +139,7 @@ class EmailCollectorFilter extends CommonObject
 		// Translate some data of arrayofkeyval
 		foreach ($this->fields as $key => $val)
 		{
-			if (is_array($val['arrayofkeyval']))
+			if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval']))
 			{
 				foreach ($val['arrayofkeyval'] as $key2 => $val2)
 				{
@@ -185,59 +185,59 @@ class EmailCollectorFilter extends CommonObject
 	public function createFromClone(User $user, $fromid)
 	{
 		global $langs, $hookmanager, $extrafields;
-	    $error = 0;
+		$error = 0;
 
-	    dol_syslog(__METHOD__, LOG_DEBUG);
+		dol_syslog(__METHOD__, LOG_DEBUG);
 
-	    $object = new self($this->db);
+		$object = new self($this->db);
 
-	    $this->db->begin();
+		$this->db->begin();
 
-	    // Load source object
-	    $object->fetchCommon($fromid);
-	    // Reset some properties
-	    unset($object->id);
-	    unset($object->fk_user_creat);
-	    unset($object->import_key);
+		// Load source object
+		$object->fetchCommon($fromid);
+		// Reset some properties
+		unset($object->id);
+		unset($object->fk_user_creat);
+		unset($object->import_key);
 
-	    // Clear fields
-	    $object->ref = "copy_of_".$object->ref;
-	    $object->title = $langs->trans("CopyOf")." ".$object->title;
-	    // ...
-	    // Clear extrafields that are unique
-	    if (is_array($object->array_options) && count($object->array_options) > 0)
-	    {
-	    	$extrafields->fetch_name_optionals_label($this->table_element);
-	    	foreach ($object->array_options as $key => $option)
-	    	{
-	    		$shortkey = preg_replace('/options_/', '', $key);
-	    		if (!empty($extrafields->attributes[$this->element]['unique'][$shortkey]))
-	    		{
-	    			//var_dump($key); var_dump($clonedObj->array_options[$key]); exit;
-	    			unset($object->array_options[$key]);
-	    		}
-	    	}
-	    }
+		// Clear fields
+		$object->ref = "copy_of_".$object->ref;
+		$object->title = $langs->trans("CopyOf")." ".$object->title;
+		// ...
+		// Clear extrafields that are unique
+		if (is_array($object->array_options) && count($object->array_options) > 0)
+		{
+			$extrafields->fetch_name_optionals_label($this->table_element);
+			foreach ($object->array_options as $key => $option)
+			{
+				$shortkey = preg_replace('/options_/', '', $key);
+				if (!empty($extrafields->attributes[$this->element]['unique'][$shortkey]))
+				{
+					//var_dump($key); var_dump($clonedObj->array_options[$key]); exit;
+					unset($object->array_options[$key]);
+				}
+			}
+		}
 
-	    // Create clone
+		// Create clone
 		$object->context['createfromclone'] = 'createfromclone';
-	    $result = $object->createCommon($user);
-	    if ($result < 0) {
-	        $error++;
-	        $this->error = $object->error;
-	        $this->errors = $object->errors;
-	    }
+		$result = $object->createCommon($user);
+		if ($result < 0) {
+			$error++;
+			$this->error = $object->error;
+			$this->errors = $object->errors;
+		}
 
-	    unset($object->context['createfromclone']);
+		unset($object->context['createfromclone']);
 
-	    // End
-	    if (!$error) {
-	        $this->db->commit();
-	        return $object;
-	    } else {
-	        $this->db->rollback();
-	        return -1;
-	    }
+		// End
+		if (!$error) {
+			$this->db->commit();
+			return $object;
+		} else {
+			$this->db->rollback();
+			return -1;
+		}
 	}
 
 	/**
@@ -297,54 +297,54 @@ class EmailCollectorFilter extends CommonObject
 	 *
 	 *	@param	int		$withpicto					Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
 	 *	@param	string	$option						On what the link point to ('nolink', ...)
-     *  @param	int  	$notooltip					1=Disable tooltip
-     *  @param  string  $morecss            		Add more css on link
-     *  @param  int     $save_lastsearch_value    	-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+	 *  @param	int  	$notooltip					1=Disable tooltip
+	 *  @param  string  $morecss            		Add more css on link
+	 *  @param  int     $save_lastsearch_value    	-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
 	 *	@return	string								String with URL
 	 */
-    public function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $morecss = '', $save_lastsearch_value = -1)
+	public function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $morecss = '', $save_lastsearch_value = -1)
 	{
 		global $db, $conf, $langs, $hookmanager;
-        global $dolibarr_main_authentication, $dolibarr_main_demo;
-        global $menumanager;
+		global $dolibarr_main_authentication, $dolibarr_main_demo;
+		global $menumanager;
 
-        if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
+		if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
 
-        $result = '';
-        $companylink = '';
+		$result = '';
+		$companylink = '';
 
-        $label = '<u>'.$langs->trans("EmailcollectorFilter").'</u>';
-        $label .= '<br>';
-        $label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref;
+		$label = '<u>'.$langs->trans("EmailcollectorFilter").'</u>';
+		$label .= '<br>';
+		$label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref;
 
-        $url = dol_buildpath('/emailcollector/emailcollectorfilter_card.php', 1).'?id='.$this->id;
+		$url = dol_buildpath('/emailcollector/emailcollectorfilter_card.php', 1).'?id='.$this->id;
 
-        if ($option != 'nolink')
-        {
-	        // Add param to save lastsearch_values or not
-	        $add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
-	        if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
-	        if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
-        }
+		if ($option != 'nolink')
+		{
+			// Add param to save lastsearch_values or not
+			$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
+			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
+			if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
+		}
 
-        $linkclose = '';
-        if (empty($notooltip))
-        {
-            if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-            {
-                $label = $langs->trans("ShowEmailcollectorFilter");
-                $linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
-            }
-            $linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
-            $linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
+		$linkclose = '';
+		if (empty($notooltip))
+		{
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+			{
+				$label = $langs->trans("ShowEmailcollectorFilter");
+				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
+			}
+			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
+			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
 
-            /*
+			/*
              $hookmanager->initHooks(array('emailcollectorfilterdao'));
              $parameters=array('id'=>$this->id);
              $reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
              if ($reshook > 0) $linkclose = $hookmanager->resPrint;
              */
-        } else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+		} else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
 		$linkstart = '<a href="'.$url.'"';
 		$linkstart .= $linkclose.'>';
@@ -377,7 +377,7 @@ class EmailCollectorFilter extends CommonObject
 		return $this->LibStatut($this->status, $mode);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return the status
 	 *
diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index d89d08bc1b2..77e25704a6b 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -1030,7 +1030,7 @@ if ($action == 'create')
 
 			print "</table>";
 
-			dol_fiche_end();
+			print dol_get_fiche_end();
 
 
 			// Shipment lines
@@ -2403,7 +2403,7 @@ if ($action == 'create')
 	}
 
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 
 	$object->fetchObjectLinked($object->id, $object->element);
diff --git a/htdocs/expedition/class/api_shipments.class.php b/htdocs/expedition/class/api_shipments.class.php
index 1f85ade883b..22acaeaa26b 100644
--- a/htdocs/expedition/class/api_shipments.class.php
+++ b/htdocs/expedition/class/api_shipments.class.php
@@ -29,194 +29,194 @@
 class Shipments extends DolibarrApi
 {
 
-    /**
-     * @var array   $FIELDS     Mandatory fields, checked when create and update object
-     */
-    static $FIELDS = array(
-        'socid',
-        'origin_id',
-        'origin_type',
-    );
+	/**
+	 * @var array   $FIELDS     Mandatory fields, checked when create and update object
+	 */
+	static $FIELDS = array(
+		'socid',
+		'origin_id',
+		'origin_type',
+	);
 
-    /**
-     * @var Expedition $shipment {@type Expedition}
-     */
-    public $shipment;
+	/**
+	 * @var Expedition $shipment {@type Expedition}
+	 */
+	public $shipment;
 
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-        global $db, $conf;
-        $this->db = $db;
-        $this->shipment = new Expedition($this->db);
-    }
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		global $db, $conf;
+		$this->db = $db;
+		$this->shipment = new Expedition($this->db);
+	}
 
-    /**
-     * Get properties of a shipment object
-     *
-     * Return an array with shipment informations
-     *
-     * @param       int         $id         ID of shipment
-     * @return 	array|mixed data without useless information
-     *
-     * @throws 	RestException
-     */
-    public function get($id)
-    {
-        if (!DolibarrApiAccess::$user->rights->expedition->lire) {
-            throw new RestException(401);
-        }
+	/**
+	 * Get properties of a shipment object
+	 *
+	 * Return an array with shipment informations
+	 *
+	 * @param       int         $id         ID of shipment
+	 * @return 	array|mixed data without useless information
+	 *
+	 * @throws 	RestException
+	 */
+	public function get($id)
+	{
+		if (!DolibarrApiAccess::$user->rights->expedition->lire) {
+			throw new RestException(401);
+		}
 
-        $result = $this->shipment->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Shipment not found');
-        }
+		$result = $this->shipment->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Shipment not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('expedition', $this->shipment->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('expedition', $this->shipment->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        $this->shipment->fetchObjectLinked();
-        return $this->_cleanObjectDatas($this->shipment);
-    }
+		$this->shipment->fetchObjectLinked();
+		return $this->_cleanObjectDatas($this->shipment);
+	}
 
 
 
-    /**
-     * List shipments
-     *
-     * Get a list of shipments
-     *
-     * @param string	       $sortfield	        Sort field
-     * @param string	       $sortorder	        Sort order
-     * @param int		       $limit		        Limit for list
-     * @param int		       $page		        Page number
-     * @param string   	       $thirdparty_ids	    Thirdparty ids to filter shipments of (example '1' or '1,2,3') {@pattern /^[0-9,]*$/i}
-     * @param string           $sqlfilters          Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"
-     * @return  array                               Array of shipment objects
-     *
-     * @throws RestException
-     */
-    public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $thirdparty_ids = '', $sqlfilters = '')
-    {
-        global $db, $conf;
+	/**
+	 * List shipments
+	 *
+	 * Get a list of shipments
+	 *
+	 * @param string	       $sortfield	        Sort field
+	 * @param string	       $sortorder	        Sort order
+	 * @param int		       $limit		        Limit for list
+	 * @param int		       $page		        Page number
+	 * @param string   	       $thirdparty_ids	    Thirdparty ids to filter shipments of (example '1' or '1,2,3') {@pattern /^[0-9,]*$/i}
+	 * @param string           $sqlfilters          Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"
+	 * @return  array                               Array of shipment objects
+	 *
+	 * @throws RestException
+	 */
+	public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $thirdparty_ids = '', $sqlfilters = '')
+	{
+		global $db, $conf;
 
-        $obj_ret = array();
+		$obj_ret = array();
 
-        // case of external user, $thirdparty_ids param is ignored and replaced by user's socid
-        $socids = DolibarrApiAccess::$user->socid ? DolibarrApiAccess::$user->socid : $thirdparty_ids;
+		// case of external user, $thirdparty_ids param is ignored and replaced by user's socid
+		$socids = DolibarrApiAccess::$user->socid ? DolibarrApiAccess::$user->socid : $thirdparty_ids;
 
-        // If the internal user must only see his customers, force searching by him
-        $search_sale = 0;
-        if (!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) $search_sale = DolibarrApiAccess::$user->id;
+		// If the internal user must only see his customers, force searching by him
+		$search_sale = 0;
+		if (!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) $search_sale = DolibarrApiAccess::$user->id;
 
-        $sql = "SELECT t.rowid";
-        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
-        $sql .= " FROM ".MAIN_DB_PREFIX."expedition as t";
+		$sql = "SELECT t.rowid";
+		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
+		$sql .= " FROM ".MAIN_DB_PREFIX."expedition as t";
 
-        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
+		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
 
-        $sql .= ' WHERE t.entity IN ('.getEntity('expedition').')';
-        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= " AND t.fk_soc = sc.fk_soc";
-        if ($socids) $sql .= " AND t.fk_soc IN (".$socids.")";
-        if ($search_sale > 0) $sql .= " AND t.rowid = sc.fk_soc"; // Join for the needed table to filter by sale
-        // Insert sale filter
-        if ($search_sale > 0)
-        {
-            $sql .= " AND sc.fk_user = ".$search_sale;
-        }
-        // Add sql filters
-        if ($sqlfilters)
-        {
-            if (!DolibarrApi::_checkFilters($sqlfilters))
-            {
-                throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
-            }
-            $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-        }
+		$sql .= ' WHERE t.entity IN ('.getEntity('expedition').')';
+		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= " AND t.fk_soc = sc.fk_soc";
+		if ($socids) $sql .= " AND t.fk_soc IN (".$socids.")";
+		if ($search_sale > 0) $sql .= " AND t.rowid = sc.fk_soc"; // Join for the needed table to filter by sale
+		// Insert sale filter
+		if ($search_sale > 0)
+		{
+			$sql .= " AND sc.fk_user = ".$search_sale;
+		}
+		// Add sql filters
+		if ($sqlfilters)
+		{
+			if (!DolibarrApi::_checkFilters($sqlfilters))
+			{
+				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+			}
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
 
-        $sql .= $this->db->order($sortfield, $sortorder);
-        if ($limit) {
-            if ($page < 0)
-            {
-                $page = 0;
-            }
-            $offset = $limit * $page;
+		$sql .= $this->db->order($sortfield, $sortorder);
+		if ($limit) {
+			if ($page < 0)
+			{
+				$page = 0;
+			}
+			$offset = $limit * $page;
 
-            $sql .= $this->db->plimit($limit + 1, $offset);
-        }
+			$sql .= $this->db->plimit($limit + 1, $offset);
+		}
 
-        dol_syslog("API Rest request");
-        $result = $this->db->query($sql);
+		dol_syslog("API Rest request");
+		$result = $this->db->query($sql);
 
-        if ($result)
-        {
-        	$num = $this->db->num_rows($result);
-            $min = min($num, ($limit <= 0 ? $num : $limit));
-            $i = 0;
-            while ($i < $min)
-            {
-            	$obj = $this->db->fetch_object($result);
-            	$shipment_static = new Expedition($this->db);
-                if ($shipment_static->fetch($obj->rowid)) {
-                    $obj_ret[] = $this->_cleanObjectDatas($shipment_static);
-                }
-                $i++;
-            }
-        } else {
-        	throw new RestException(503, 'Error when retrieve commande list : '.$this->db->lasterror());
-        }
-        if (!count($obj_ret)) {
-            throw new RestException(404, 'No shipment found');
-        }
-        return $obj_ret;
-    }
+		if ($result)
+		{
+			$num = $this->db->num_rows($result);
+			$min = min($num, ($limit <= 0 ? $num : $limit));
+			$i = 0;
+			while ($i < $min)
+			{
+				$obj = $this->db->fetch_object($result);
+				$shipment_static = new Expedition($this->db);
+				if ($shipment_static->fetch($obj->rowid)) {
+					$obj_ret[] = $this->_cleanObjectDatas($shipment_static);
+				}
+				$i++;
+			}
+		} else {
+			throw new RestException(503, 'Error when retrieve commande list : '.$this->db->lasterror());
+		}
+		if (!count($obj_ret)) {
+			throw new RestException(404, 'No shipment found');
+		}
+		return $obj_ret;
+	}
 
-    /**
-     * Create shipment object
-     *
-     * @param   array   $request_data   Request data
-     * @return  int     ID of shipment
-     */
-    public function post($request_data = null)
-    {
-        if (!DolibarrApiAccess::$user->rights->expedition->creer) {
-            throw new RestException(401, "Insuffisant rights");
-        }
-        // Check mandatory fields
-        $result = $this->_validate($request_data);
+	/**
+	 * Create shipment object
+	 *
+	 * @param   array   $request_data   Request data
+	 * @return  int     ID of shipment
+	 */
+	public function post($request_data = null)
+	{
+		if (!DolibarrApiAccess::$user->rights->expedition->creer) {
+			throw new RestException(401, "Insuffisant rights");
+		}
+		// Check mandatory fields
+		$result = $this->_validate($request_data);
 
-        foreach ($request_data as $field => $value) {
-            $this->shipment->$field = $value;
-        }
-        if (isset($request_data["lines"])) {
-            $lines = array();
-            foreach ($request_data["lines"] as $line) {
-                array_push($lines, (object) $line);
-            }
-            $this->shipment->lines = $lines;
-        }
+		foreach ($request_data as $field => $value) {
+			$this->shipment->$field = $value;
+		}
+		if (isset($request_data["lines"])) {
+			$lines = array();
+			foreach ($request_data["lines"] as $line) {
+				array_push($lines, (object) $line);
+			}
+			$this->shipment->lines = $lines;
+		}
 
-        if ($this->shipment->create(DolibarrApiAccess::$user) < 0) {
-            throw new RestException(500, "Error creating shipment", array_merge(array($this->shipment->error), $this->shipment->errors));
-        }
+		if ($this->shipment->create(DolibarrApiAccess::$user) < 0) {
+			throw new RestException(500, "Error creating shipment", array_merge(array($this->shipment->error), $this->shipment->errors));
+		}
 
-        return $this->shipment->id;
-    }
+		return $this->shipment->id;
+	}
 
-    // /**
-    //  * Get lines of an shipment
-    //  *
-    //  * @param int   $id             Id of shipment
-    //  *
-    //  * @url	GET {id}/lines
-    //  *
-    //  * @return int
-    //  */
-    /*
+	// /**
+	//  * Get lines of an shipment
+	//  *
+	//  * @param int   $id             Id of shipment
+	//  *
+	//  * @url	GET {id}/lines
+	//  *
+	//  * @return int
+	//  */
+	/*
     public function getLines($id)
     {
         if(! DolibarrApiAccess::$user->rights->expedition->lire) {
@@ -240,17 +240,17 @@ class Shipments extends DolibarrApi
     }
     */
 
-    // /**
-    //  * Add a line to given shipment
-    //  *
-    //  * @param int   $id             Id of shipment to update
-    //  * @param array $request_data   ShipmentLine data
-    //  *
-    //  * @url	POST {id}/lines
-    //  *
-    //  * @return int
-    //  */
-    /*
+	// /**
+	//  * Add a line to given shipment
+	//  *
+	//  * @param int   $id             Id of shipment to update
+	//  * @param array $request_data   ShipmentLine data
+	//  *
+	//  * @url	POST {id}/lines
+	//  *
+	//  * @return int
+	//  */
+	/*
     public function postLine($id, $request_data = null)
     {
         if(! DolibarrApiAccess::$user->rights->expedition->creer) {
@@ -302,18 +302,18 @@ class Shipments extends DolibarrApi
         return false;
     }*/
 
-    // /**
-    //  * Update a line to given shipment
-    //  *
-    //  * @param int   $id             Id of shipment to update
-    //  * @param int   $lineid         Id of line to update
-    //  * @param array $request_data   ShipmentLine data
-    //  *
-    //  * @url	PUT {id}/lines/{lineid}
-    //  *
-    //  * @return object
-    //  */
-    /*
+	// /**
+	//  * Update a line to given shipment
+	//  *
+	//  * @param int   $id             Id of shipment to update
+	//  * @param int   $lineid         Id of line to update
+	//  * @param array $request_data   ShipmentLine data
+	//  *
+	//  * @url	PUT {id}/lines/{lineid}
+	//  *
+	//  * @return object
+	//  */
+	/*
     public function putLine($id, $lineid, $request_data = null)
     {
         if (! DolibarrApiAccess::$user->rights->expedition->creer) {
@@ -362,183 +362,183 @@ class Shipments extends DolibarrApi
         return false;
     }*/
 
-    /**
-     * Delete a line to given shipment
-     *
-     *
-     * @param int   $id             Id of shipment to update
-     * @param int   $lineid         Id of line to delete
-     *
-     * @url	DELETE {id}/lines/{lineid}
-     *
-     * @return int
-     *
-     * @throws RestException 401
-     * @throws RestException 404
-     */
-    public function deleteLine($id, $lineid)
-    {
-        if (!DolibarrApiAccess::$user->rights->expedition->creer) {
-            throw new RestException(401);
-        }
+	/**
+	 * Delete a line to given shipment
+	 *
+	 *
+	 * @param int   $id             Id of shipment to update
+	 * @param int   $lineid         Id of line to delete
+	 *
+	 * @url	DELETE {id}/lines/{lineid}
+	 *
+	 * @return int
+	 *
+	 * @throws RestException 401
+	 * @throws RestException 404
+	 */
+	public function deleteLine($id, $lineid)
+	{
+		if (!DolibarrApiAccess::$user->rights->expedition->creer) {
+			throw new RestException(401);
+		}
 
-        $result = $this->shipment->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Shipment not found');
-        }
+		$result = $this->shipment->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Shipment not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('expedition', $this->shipment->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('expedition', $this->shipment->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        // TODO Check the lineid $lineid is a line of ojbect
+		// TODO Check the lineid $lineid is a line of ojbect
 
-        $request_data = (object) $request_data;
-        $updateRes = $this->shipment->deleteline(DolibarrApiAccess::$user, $lineid);
-        if ($updateRes > 0) {
-            return $this->get($id);
-        } else {
-            throw new RestException(405, $this->shipment->error);
-        }
-    }
+		$request_data = (object) $request_data;
+		$updateRes = $this->shipment->deleteline(DolibarrApiAccess::$user, $lineid);
+		if ($updateRes > 0) {
+			return $this->get($id);
+		} else {
+			throw new RestException(405, $this->shipment->error);
+		}
+	}
 
-    /**
-     * Update shipment general fields (won't touch lines of shipment)
-     *
-     * @param int   $id             Id of shipment to update
-     * @param array $request_data   Datas
-     *
-     * @return int
-     */
-    public function put($id, $request_data = null)
-    {
-        if (!DolibarrApiAccess::$user->rights->expedition->creer) {
-            throw new RestException(401);
-        }
+	/**
+	 * Update shipment general fields (won't touch lines of shipment)
+	 *
+	 * @param int   $id             Id of shipment to update
+	 * @param array $request_data   Datas
+	 *
+	 * @return int
+	 */
+	public function put($id, $request_data = null)
+	{
+		if (!DolibarrApiAccess::$user->rights->expedition->creer) {
+			throw new RestException(401);
+		}
 
-        $result = $this->shipment->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Shipment not found');
-        }
+		$result = $this->shipment->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Shipment not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('expedition', $this->shipment->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
-        foreach ($request_data as $field => $value) {
-            if ($field == 'id') continue;
-            $this->shipment->$field = $value;
-        }
+		if (!DolibarrApi::_checkAccessToResource('expedition', $this->shipment->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+		foreach ($request_data as $field => $value) {
+			if ($field == 'id') continue;
+			$this->shipment->$field = $value;
+		}
 
-        if ($this->shipment->update(DolibarrApiAccess::$user) > 0)
-        {
-            return $this->get($id);
-        } else {
-            throw new RestException(500, $this->shipment->error);
-        }
-    }
+		if ($this->shipment->update(DolibarrApiAccess::$user) > 0)
+		{
+			return $this->get($id);
+		} else {
+			throw new RestException(500, $this->shipment->error);
+		}
+	}
 
-    /**
-     * Delete shipment
-     *
-     * @param   int     $id         Shipment ID
-     *
-     * @return  array
-     */
-    public function delete($id)
-    {
-    	if (!DolibarrApiAccess::$user->rights->expedition->supprimer) {
-            throw new RestException(401);
-        }
-        $result = $this->shipment->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Shipment not found');
-        }
+	/**
+	 * Delete shipment
+	 *
+	 * @param   int     $id         Shipment ID
+	 *
+	 * @return  array
+	 */
+	public function delete($id)
+	{
+		if (!DolibarrApiAccess::$user->rights->expedition->supprimer) {
+			throw new RestException(401);
+		}
+		$result = $this->shipment->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Shipment not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('expedition', $this->shipment->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('expedition', $this->shipment->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        if (!$this->shipment->delete(DolibarrApiAccess::$user)) {
-            throw new RestException(500, 'Error when deleting shipment : '.$this->shipment->error);
-        }
+		if (!$this->shipment->delete(DolibarrApiAccess::$user)) {
+			throw new RestException(500, 'Error when deleting shipment : '.$this->shipment->error);
+		}
 
-        return array(
-            'success' => array(
-                'code' => 200,
-                'message' => 'Shipment deleted'
-            )
-        );
-    }
+		return array(
+			'success' => array(
+				'code' => 200,
+				'message' => 'Shipment deleted'
+			)
+		);
+	}
 
-    /**
-     * Validate a shipment
-     *
-     * This may record stock movements if module stock is enabled and option to
-     * decrease stock on shipment is on.
-     *
-     * @param   int $id             Shipment ID
-     * @param   int $notrigger      1=Does not execute triggers, 0= execute triggers
-     *
-     * @url POST    {id}/validate
-     *
-     * @return  array
-     * \todo An error 403 is returned if the request has an empty body.
-     * Error message: "Forbidden: Content type `text/plain` is not supported."
-     * Workaround: send this in the body
-     * {
-     *   "notrigger": 0
-     * }
-     */
-    public function validate($id, $notrigger = 0)
-    {
-        if (!DolibarrApiAccess::$user->rights->expedition->creer) {
-            throw new RestException(401);
-        }
-        $result = $this->shipment->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Shipment not found');
-        }
+	/**
+	 * Validate a shipment
+	 *
+	 * This may record stock movements if module stock is enabled and option to
+	 * decrease stock on shipment is on.
+	 *
+	 * @param   int $id             Shipment ID
+	 * @param   int $notrigger      1=Does not execute triggers, 0= execute triggers
+	 *
+	 * @url POST    {id}/validate
+	 *
+	 * @return  array
+	 * \todo An error 403 is returned if the request has an empty body.
+	 * Error message: "Forbidden: Content type `text/plain` is not supported."
+	 * Workaround: send this in the body
+	 * {
+	 *   "notrigger": 0
+	 * }
+	 */
+	public function validate($id, $notrigger = 0)
+	{
+		if (!DolibarrApiAccess::$user->rights->expedition->creer) {
+			throw new RestException(401);
+		}
+		$result = $this->shipment->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Shipment not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('expedition', $this->shipment->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('expedition', $this->shipment->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        $result = $this->shipment->valid(DolibarrApiAccess::$user, $notrigger);
-        if ($result == 0) {
-            throw new RestException(304, 'Error nothing done. May be object is already validated');
-        }
-        if ($result < 0) {
-            throw new RestException(500, 'Error when validating Shipment: '.$this->shipment->error);
-        }
-        $result = $this->shipment->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Shipment not found');
-        }
+		$result = $this->shipment->valid(DolibarrApiAccess::$user, $notrigger);
+		if ($result == 0) {
+			throw new RestException(304, 'Error nothing done. May be object is already validated');
+		}
+		if ($result < 0) {
+			throw new RestException(500, 'Error when validating Shipment: '.$this->shipment->error);
+		}
+		$result = $this->shipment->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Shipment not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('expedition', $this->shipment->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('expedition', $this->shipment->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        $this->shipment->fetchObjectLinked();
-        return $this->_cleanObjectDatas($this->shipment);
-    }
+		$this->shipment->fetchObjectLinked();
+		return $this->_cleanObjectDatas($this->shipment);
+	}
 
 
-    // /**
-    //  *  Classify the shipment as invoiced
-    //  *
-    //  * @param int   $id           Id of the shipment
-    //  *
-    //  * @url     POST {id}/setinvoiced
-    //  *
-    //  * @return int
-    //  *
-    //  * @throws RestException 400
-    //  * @throws RestException 401
-    //  * @throws RestException 404
-    //  * @throws RestException 405
-    //  */
-     /*
+	// /**
+	//  *  Classify the shipment as invoiced
+	//  *
+	//  * @param int   $id           Id of the shipment
+	//  *
+	//  * @url     POST {id}/setinvoiced
+	//  *
+	//  * @return int
+	//  *
+	//  * @throws RestException 400
+	//  * @throws RestException 401
+	//  * @throws RestException 404
+	//  * @throws RestException 405
+	//  */
+	 /*
     public function setinvoiced($id)
     {
 
@@ -562,20 +562,20 @@ class Shipments extends DolibarrApi
     */
 
 
-    //  /**
-    //  * Create a shipment using an existing order.
-    //  *
-    //  * @param int   $orderid       Id of the order
-    //  *
-    //  * @url     POST /createfromorder/{orderid}
-    //  *
-    //  * @return int
-    //  * @throws RestException 400
-    //  * @throws RestException 401
-    //  * @throws RestException 404
-    //  * @throws RestException 405
-    //  */
-    /*
+	//  /**
+	//  * Create a shipment using an existing order.
+	//  *
+	//  * @param int   $orderid       Id of the order
+	//  *
+	//  * @url     POST /createfromorder/{orderid}
+	//  *
+	//  * @return int
+	//  * @throws RestException 400
+	//  * @throws RestException 401
+	//  * @throws RestException 404
+	//  * @throws RestException 405
+	//  */
+	/*
     public function createShipmentFromOrder($orderid)
     {
 
@@ -606,60 +606,60 @@ class Shipments extends DolibarrApi
     }
     */
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
-    /**
-     * Clean sensible object datas
-     *
-     * @param   object  $object    Object to clean
-     * @return    array    Array of cleaned object properties
-     */
-    protected function _cleanObjectDatas($object)
-    {
-        // phpcs:enable
-        $object = parent::_cleanObjectDatas($object);
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	/**
+	 * Clean sensible object datas
+	 *
+	 * @param   Object  $object     Object to clean
+	 * @return  Object              Object with cleaned properties
+	 */
+	protected function _cleanObjectDatas($object)
+	{
+		// phpcs:enable
+		$object = parent::_cleanObjectDatas($object);
 
-        unset($object->thirdparty); // id already returned
+		unset($object->thirdparty); // id already returned
 
-        unset($object->note);
-        unset($object->address);
-        unset($object->barcode_type);
-        unset($object->barcode_type_code);
-        unset($object->barcode_type_label);
-        unset($object->barcode_type_coder);
+		unset($object->note);
+		unset($object->address);
+		unset($object->barcode_type);
+		unset($object->barcode_type_code);
+		unset($object->barcode_type_label);
+		unset($object->barcode_type_coder);
 
-        if (!empty($object->lines) && is_array($object->lines))
-        {
-            foreach ($object->lines as $line)
-            {
-                unset($line->tva_tx);
-                unset($line->vat_src_code);
-                unset($line->total_ht);
-                unset($line->total_ttc);
-                unset($line->total_tva);
-                unset($line->total_localtax1);
-                unset($line->total_localtax2);
-                unset($line->remise_percent);
-            }
-        }
+		if (!empty($object->lines) && is_array($object->lines))
+		{
+			foreach ($object->lines as $line)
+			{
+				unset($line->tva_tx);
+				unset($line->vat_src_code);
+				unset($line->total_ht);
+				unset($line->total_ttc);
+				unset($line->total_tva);
+				unset($line->total_localtax1);
+				unset($line->total_localtax2);
+				unset($line->remise_percent);
+			}
+		}
 
-        return $object;
-    }
+		return $object;
+	}
 
-    /**
-     * Validate fields before create or update object
-     *
-     * @param   array           $data   Array with data to verify
-     * @return  array
-     * @throws  RestException
-     */
-    private function _validate($data)
-    {
-        $shipment = array();
-        foreach (Shipments::$FIELDS as $field) {
-            if (!isset($data[$field]))
-                throw new RestException(400, "$field field missing");
-            $shipment[$field] = $data[$field];
-        }
-        return $shipment;
-    }
+	/**
+	 * Validate fields before create or update object
+	 *
+	 * @param   array           $data   Array with data to verify
+	 * @return  array
+	 * @throws  RestException
+	 */
+	private function _validate($data)
+	{
+		$shipment = array();
+		foreach (Shipments::$FIELDS as $field) {
+			if (!isset($data[$field]))
+				throw new RestException(400, "$field field missing");
+			$shipment[$field] = $data[$field];
+		}
+		return $shipment;
+	}
 }
diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index 6ac3b4a5290..018269632ef 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -159,8 +159,8 @@ class Expedition extends CommonObject
 	public $date_shipping;
 
 	/**
-     * @var integer|string date_creation
-     */
+	 * @var integer|string date_creation
+	 */
 	public $date_creation;
 
 	/**
@@ -171,7 +171,7 @@ class Expedition extends CommonObject
 	public $meths;
 	public $listmeths; // List of carriers
 
-    /**
+	/**
 	 * Draft status
 	 */
 	const STATUS_DRAFT = 0;
@@ -338,10 +338,10 @@ class Expedition extends CommonObject
 		$sql .= ", ".($this->fk_delivery_address > 0 ? $this->fk_delivery_address : "null");
 		$sql .= ", ".($this->shipping_method_id > 0 ? $this->shipping_method_id : "null");
 		$sql .= ", '".$this->db->escape($this->tracking_number)."'";
-		$sql.= ", ".(is_numeric($this->weight)?$this->weight:'NULL');
-		$sql.= ", ".(is_numeric($this->sizeS)?$this->sizeS:'NULL');	// TODO Should use this->trueDepth
-		$sql.= ", ".(is_numeric($this->sizeW)?$this->sizeW:'NULL');	// TODO Should use this->trueWidth
-		$sql.= ", ".(is_numeric($this->sizeH)?$this->sizeH:'NULL');	// TODO Should use this->trueHeight
+		$sql .= ", ".(is_numeric($this->weight) ? $this->weight : 'NULL');
+		$sql .= ", ".(is_numeric($this->sizeS) ? $this->sizeS : 'NULL'); // TODO Should use this->trueDepth
+		$sql .= ", ".(is_numeric($this->sizeW) ? $this->sizeW : 'NULL'); // TODO Should use this->trueWidth
+		$sql .= ", ".(is_numeric($this->sizeH) ? $this->sizeH : 'NULL'); // TODO Should use this->trueHeight
 		$sql .= ", ".($this->weight_units != '' ? (int) $this->weight_units : 'NULL');
 		$sql .= ", ".($this->size_units != '' ? (int) $this->size_units : 'NULL');
 		$sql .= ", ".(!empty($this->note_private) ? "'".$this->db->escape($this->note_private)."'" : "null");
@@ -441,7 +441,7 @@ class Expedition extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Create a expedition line
 	 *
@@ -473,7 +473,7 @@ class Expedition extends CommonObject
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Create the detail (eat-by date) of the expedition line
 	 *
@@ -483,7 +483,7 @@ class Expedition extends CommonObject
 	 */
 	public function create_line_batch($line_ext, $array_options = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$error = 0;
 		$stockLocationQty = array(); // associated array with batch qty in stock location
 
@@ -537,7 +537,7 @@ class Expedition extends CommonObject
 		if (empty($id) && empty($ref) && empty($ref_ext)) return -1;
 
 		$sql = "SELECT e.rowid, e.entity, e.ref, e.fk_soc as socid, e.date_creation, e.ref_customer, e.ref_ext, e.ref_int, e.fk_user_author, e.fk_statut, e.fk_projet as fk_project, e.billed";
-        $sql .= ", e.date_valid";
+		$sql .= ", e.date_valid";
 		$sql .= ", e.weight, e.weight_units, e.size, e.size_units, e.width, e.height";
 		$sql .= ", e.date_expedition as date_expedition, e.model_pdf, e.fk_address, e.date_delivery";
 		$sql .= ", e.fk_shipping_method, e.tracking_number";
@@ -574,7 +574,7 @@ class Expedition extends CommonObject
 				$this->statut               = $obj->fk_statut;
 				$this->user_author_id       = $obj->fk_user_author;
 				$this->date_creation        = $this->db->jdate($obj->date_creation);
-                $this->date_valid = $this->db->jdate($obj->date_valid);
+				$this->date_valid = $this->db->jdate($obj->date_valid);
 				$this->date                 = $this->db->jdate($obj->date_expedition); // TODO deprecated
 				$this->date_expedition      = $this->db->jdate($obj->date_expedition); // TODO deprecated
 				$this->date_shipping        = $this->db->jdate($obj->date_expedition); // Date real
@@ -868,7 +868,7 @@ class Expedition extends CommonObject
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Create a delivery receipt from a shipment
 	 *
@@ -877,7 +877,7 @@ class Expedition extends CommonObject
 	 */
 	public function create_delivery($user)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 		if ($conf->delivery_note->enabled)
@@ -974,7 +974,7 @@ class Expedition extends CommonObject
 		$this->lines[$num] = $line;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Add a shipment line with batch record
 	 *
@@ -984,7 +984,7 @@ class Expedition extends CommonObject
 	 */
 	public function addline_batch($dbatch, $array_options = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $langs;
 
 		$num = count($this->lines);
@@ -1154,7 +1154,7 @@ class Expedition extends CommonObject
 	 * 	Cancel shipment.
 	 *
 	 *  @param  int  $notrigger 			Disable triggers
-     *  @param  bool $also_update_stock  	true if the stock should be increased back (false by default)
+	 *  @param  bool $also_update_stock  	true if the stock should be increased back (false by default)
 	 * 	@return	int							>0 if OK, 0 if deletion done but failed to delete files, <0 if KO
 	 */
 	public function cancel($notrigger = 0, $also_update_stock = false)
@@ -1164,32 +1164,32 @@ class Expedition extends CommonObject
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 		require_once DOL_DOCUMENT_ROOT.'/expedition/class/expeditionbatch.class.php';
 
-		$error=0;
-		$this->error='';
+		$error = 0;
+		$this->error = '';
 
 		$this->db->begin();
 
 		// Add a protection to refuse deleting if shipment has at least one delivery
-		$this->fetchObjectLinked($this->id, 'shipping', 0, 'delivery');	// Get deliveries linked to this shipment
+		$this->fetchObjectLinked($this->id, 'shipping', 0, 'delivery'); // Get deliveries linked to this shipment
 		if (count($this->linkedObjectsIds) > 0)
 		{
-			$this->error='ErrorThereIsSomeDeliveries';
+			$this->error = 'ErrorThereIsSomeDeliveries';
 			$error++;
 		}
 
-		if (! $error)
+		if (!$error)
 		{
-			if (! $notrigger)
+			if (!$notrigger)
 			{
 				// Call trigger
-				$result=$this->call_trigger('SHIPPING_CANCEL', $user);
+				$result = $this->call_trigger('SHIPPING_CANCEL', $user);
 				if ($result < 0) { $error++; }
 				// End call triggers
 			}
 		}
 
 		// Stock control
-		if (! $error && $conf->stock->enabled &&
+		if (!$error && $conf->stock->enabled &&
 			(($conf->global->STOCK_CALCULATE_ON_SHIPMENT && $this->statut > self::STATUS_DRAFT) ||
 			 ($conf->global->STOCK_CALCULATE_ON_SHIPMENT_CLOSE && $this->statut == self::STATUS_CLOSED && $also_update_stock)))
 		{
@@ -1360,7 +1360,7 @@ class Expedition extends CommonObject
 	 * 	Warning, do not delete a shipment if a delivery is linked to (with table llx_element_element)
 	 *
 	 *  @param  int  $notrigger 			Disable triggers
-     *  @param  bool $also_update_stock  	true if the stock should be increased back (false by default)
+	 *  @param  bool $also_update_stock  	true if the stock should be increased back (false by default)
 	 * 	@return	int							>0 if OK, 0 if deletion done but failed to delete files, <0 if KO
 	 */
 	public function delete($notrigger = 0, $also_update_stock = false)
@@ -1474,9 +1474,9 @@ class Expedition extends CommonObject
 
 		if (!$error)
 		{
-                    $main = MAIN_DB_PREFIX.'expeditiondet';
-                    $ef = $main."_extrafields";
-                    $sqlef = "DELETE FROM $ef WHERE fk_object IN (SELECT rowid FROM $main WHERE fk_expedition = ".$this->id.")";
+					$main = MAIN_DB_PREFIX.'expeditiondet';
+					$ef = $main."_extrafields";
+					$sqlef = "DELETE FROM $ef WHERE fk_object IN (SELECT rowid FROM $main WHERE fk_expedition = ".$this->id.")";
 
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."expeditiondet";
 			$sql .= " WHERE fk_expedition = ".$this->id;
@@ -1487,9 +1487,9 @@ class Expedition extends CommonObject
 				$res = $this->deleteObjectLinked();
 				if ($res < 0) $error++;
 
-                                // delete extrafields
-                                $res = $this->deleteExtraFields();
-                                if ($res < 0) $error++;
+								// delete extrafields
+								$res = $this->deleteExtraFields();
+								if ($res < 0) $error++;
 
 				if (!$error)
 				{
@@ -1570,7 +1570,7 @@ class Expedition extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Load lines
 	 *
@@ -1578,7 +1578,7 @@ class Expedition extends CommonObject
 	 */
 	public function fetch_lines()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $mysoc;
 		// TODO: recuperer les champs du document associe a part
 		$this->lines = array();
@@ -1738,7 +1738,7 @@ class Expedition extends CommonObject
 					$line->total_ttc	 	+= $tabprice[2];
 					$line->total_tva	 	+= $tabprice[1];
 				}
-
+				$line->fetch_optionals();
 				$i++;
 				$originline = $obj->fk_origin_line;
 			}
@@ -1854,7 +1854,7 @@ class Expedition extends CommonObject
 		return $this->LibStatut($this->statut, $mode);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Return label of a status
 	 *
@@ -1864,8 +1864,8 @@ class Expedition extends CommonObject
 	 */
 	public function LibStatut($status, $mode)
 	{
-        // phpcs:enable
-        global $langs;
+		// phpcs:enable
+		global $langs;
 
 		$labelStatus = $langs->trans($this->statuts[$status]);
 		$labelStatusShort = $langs->trans($this->statutshorts[$status]);
@@ -1972,7 +1972,7 @@ class Expedition extends CommonObject
 		return $this->setDeliveryDate($user, $delivery_date);
 	}
 
-    /**
+	/**
 	 *	Set the planned delivery date
 	 *
 	 *	@param      User			$user        		Objet user that modify
@@ -2002,7 +2002,7 @@ class Expedition extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Fetch deliveries method and return an array. Load array this->meths(rowid=>label).
 	 *
@@ -2010,7 +2010,7 @@ class Expedition extends CommonObject
 	 */
 	public function fetch_delivery_methods()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 		$this->meths = array();
 
@@ -2030,7 +2030,7 @@ class Expedition extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Fetch all deliveries method and return an array. Load array this->listmeths.
 	 *
@@ -2039,7 +2039,7 @@ class Expedition extends CommonObject
 	 */
 	public function list_delivery_methods($id = '')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 
 		$this->listmeths = array();
@@ -2066,7 +2066,7 @@ class Expedition extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Update/create delivery method.
 	 *
@@ -2076,7 +2076,7 @@ class Expedition extends CommonObject
 	 */
 	public function update_delivery_method($id = '')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		if ($id == '')
 		{
 			$sql = "INSERT INTO ".MAIN_DB_PREFIX."c_shipment_mode (code, libelle, description, tracking)";
@@ -2094,7 +2094,7 @@ class Expedition extends CommonObject
 		if ($resql < 0) dol_print_error($this->db, '');
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Activate delivery method.
 	 *
@@ -2103,14 +2103,14 @@ class Expedition extends CommonObject
 	 */
 	public function activ_delivery_method($id)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.'c_shipment_mode SET active=1';
 		$sql .= ' WHERE rowid='.$id;
 
 		$resql = $this->db->query($sql);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  DesActivate delivery method.
 	 *
@@ -2120,7 +2120,7 @@ class Expedition extends CommonObject
 	 */
 	public function disable_delivery_method($id)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.'c_shipment_mode SET active=0';
 		$sql .= ' WHERE rowid='.$id;
 
@@ -2308,7 +2308,7 @@ class Expedition extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Classify the shipping as invoiced (used when WORKFLOW_BILL_ON_SHIPMENT is on)
 	 *
@@ -2316,7 +2316,7 @@ class Expedition extends CommonObject
 	 */
 	public function set_billed()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $user;
 		$error = 0;
 
@@ -2450,13 +2450,13 @@ class Expedition extends CommonObject
 				}
 			}
 
-            if (!$error) {
+			if (!$error) {
 				// Call trigger
 				$result = $this->call_trigger('SHIPPING_REOPEN', $user);
 				if ($result < 0) {
 					$error++;
 				}
-            }
+			}
 		} else {
 			$error++;
 			$this->errors[] = $this->db->lasterror();
@@ -2482,7 +2482,7 @@ class Expedition extends CommonObject
 	 *  @param      int			$hidedetails    Hide details of lines
 	 *  @param      int			$hidedesc       Hide description
 	 *  @param      int			$hideref        Hide ref
-     *  @param      null|array  $moreparams     Array to provide more information
+	 *  @param      null|array  $moreparams     Array to provide more information
 	 *  @return     int         				0 if KO, 1 if OK
 	 */
 	public function generateDocument($modele, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0, $moreparams = null)
@@ -2550,8 +2550,8 @@ class ExpeditionLigne extends CommonObjectLine
 	public $origin_line_id;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_origin_line;
 
 	/**
@@ -2560,42 +2560,42 @@ class ExpeditionLigne extends CommonObjectLine
 	public $fk_expedition;
 
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    /**
-     * @var float qty asked From llx_expeditiondet
-     */
-    public $qty;
+	/**
+	 * @var float qty asked From llx_expeditiondet
+	 */
+	public $qty;
 
-    /**
-     * @var float qty shipped
-     */
-    public $qty_shipped;
+	/**
+	 * @var float qty shipped
+	 */
+	public $qty_shipped;
 
-    /**
-     * @var int Id of product
-     */
-    public $fk_product;
-    public $detail_batch;
+	/**
+	 * @var int Id of product
+	 */
+	public $fk_product;
+	public $detail_batch;
 
-    /**
-     * @var int Id of warehouse
-     */
+	/**
+	 * @var int Id of warehouse
+	 */
 	public $entrepot_id;
 
 
-    /**
-     * @var float qty asked From llx_commandedet or llx_propaldet
-     */
+	/**
+	 * @var float qty asked From llx_commandedet or llx_propaldet
+	 */
 	public $qty_asked;
 
-    /**
-     * @deprecated
-     * @see $product_ref
-     */
-    public $ref;
+	/**
+	 * @deprecated
+	 * @see $product_ref
+	 */
+	public $ref;
 
 	/**
 	 * @var string product ref
@@ -2608,87 +2608,87 @@ class ExpeditionLigne extends CommonObjectLine
 	 */
 	public $libelle;
 
-    /**
-     * @var string product label
-     */
+	/**
+	 * @var string product label
+	 */
 	public $product_label;
 
-    /**
-     * @var string product description
-     * @deprecated
-     * @see $product_desc
-     */
-    public $desc;
+	/**
+	 * @var string product description
+	 * @deprecated
+	 * @see $product_desc
+	 */
+	public $desc;
 
-    /**
-     * @var string product description
-     */
+	/**
+	 * @var string product description
+	 */
 	public $product_desc;
 
-    /**
-     * @var int rang of line
-     */
-    public $rang;
+	/**
+	 * @var int rang of line
+	 */
+	public $rang;
 
-    /**
-     * @var float weight
-     */
-    public $weight;
-    public $weight_units;
+	/**
+	 * @var float weight
+	 */
+	public $weight;
+	public $weight_units;
 
-    /**
-     * @var float weight
-     */
-    public $length;
-    public $length_units;
+	/**
+	 * @var float weight
+	 */
+	public $length;
+	public $length_units;
 
-    /**
-     * @var float weight
-     */
-    public $surface;
-    public $surface_units;
+	/**
+	 * @var float weight
+	 */
+	public $surface;
+	public $surface_units;
 
-    /**
-     * @var float weight
-     */
-    public $volume;
-    public $volume_units;
+	/**
+	 * @var float weight
+	 */
+	public $volume;
+	public $volume_units;
 
 	// Invoicing
 	public $remise_percent;
-    public $tva_tx;
+	public $tva_tx;
 
-    /**
-     * @var float total without tax
-     */
-    public $total_ht;
+	/**
+	 * @var float total without tax
+	 */
+	public $total_ht;
 
-    /**
-     * @var float total with tax
-     */
-    public $total_ttc;
+	/**
+	 * @var float total with tax
+	 */
+	public $total_ttc;
 
-    /**
-     * @var float total vat
-     */
-    public $total_tva;
+	/**
+	 * @var float total vat
+	 */
+	public $total_tva;
 
-    /**
-     * @var float total localtax 1
-     */
-    public $total_localtax1;
+	/**
+	 * @var float total localtax 1
+	 */
+	public $total_localtax1;
 
-    /**
-     * @var float total localtax 2
-     */
-    public $total_localtax2;
+	/**
+	 * @var float total localtax 2
+	 */
+	public $total_localtax2;
 
 
-    /**
-     *	Constructor
-     *
-     *  @param		DoliDB		$db      Database handler
-     */
+	/**
+	 *	Constructor
+	 *
+	 *  @param		DoliDB		$db      Database handler
+	 */
 	public function __construct($db)
 	{
 		$this->db = $db;
diff --git a/htdocs/expedition/class/expeditionbatch.class.php b/htdocs/expedition/class/expeditionbatch.class.php
index 703d44e6896..637f9dd749c 100644
--- a/htdocs/expedition/class/expeditionbatch.class.php
+++ b/htdocs/expedition/class/expeditionbatch.class.php
@@ -44,15 +44,15 @@ class ExpeditionLineBatch extends CommonObject
 	public $fk_origin_stock;
 	public $fk_expeditiondet;
 
-    /**
-     *  Constructor
-     *
-     *  @param	DoliDb		$db      Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-    }
+	/**
+	 *  Constructor
+	 *
+	 *  @param	DoliDb		$db      Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
 
 	/**
 	 * Fill object based on a product-warehouse-batch's record
@@ -130,14 +130,14 @@ class ExpeditionLineBatch extends CommonObject
 
 		if (!$error)
 		{
-            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.self::$_table_element);
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.self::$_table_element);
 			$this->fk_expeditiondet = $id_line_expdet;
 			return $this->id;
 		} else {
 			foreach ($this->errors as $errmsg)
 			{
-	            dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
-	            $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
+				dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
 			return -1 * $error;
diff --git a/htdocs/expedition/class/expeditionstats.class.php b/htdocs/expedition/class/expeditionstats.class.php
index 82f619946b0..49d37179eda 100644
--- a/htdocs/expedition/class/expeditionstats.class.php
+++ b/htdocs/expedition/class/expeditionstats.class.php
@@ -34,38 +34,38 @@ include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
  */
 class ExpeditionStats extends Stats
 {
-    /**
-     * @var string Name of table without prefix where object is stored
-     */
-    public $table_element;
+	/**
+	 * @var string Name of table without prefix where object is stored
+	 */
+	public $table_element;
 
-    public $socid;
-    public $userid;
+	public $socid;
+	public $userid;
 
-    public $from;
-    public $field;
-    public $where;
+	public $from;
+	public $field;
+	public $where;
 
 
-    /**
-     * Constructor
-     *
-     * @param	DoliDB	$db      	Database handler
+	/**
+	 * Constructor
+	 *
+	 * @param	DoliDB	$db      	Database handler
 	 * @param 	int		$socid	   	Id third party for filter
 	 * @param 	string	$mode	   	Option (not used)
 	 * @param   int		$userid    	Id user for filter (creation user)
-     */
-    public function __construct($db, $socid, $mode, $userid = 0)
-    {
+	 */
+	public function __construct($db, $socid, $mode, $userid = 0)
+	{
 		global $user, $conf;
 
 		$this->db = $db;
 
 		$this->socid = ($socid > 0 ? $socid : 0);
-        $this->userid = $userid;
+		$this->userid = $userid;
 		$this->cachefilesuffix = $mode;
 
-        $object = new Expedition($this->db);
+		$object = new Expedition($this->db);
 		$this->from = MAIN_DB_PREFIX.$object->table_element." as c";
 		//$this->from.= ", ".MAIN_DB_PREFIX."societe as s";
 		$this->field = 'weight'; // Warning, unit of weight is NOT USED AND MUST BE
@@ -78,31 +78,31 @@ class ExpeditionStats extends Stats
 		{
 			$this->where .= " AND c.fk_soc = ".$this->socid;
 		}
-        if ($this->userid > 0) $this->where .= ' AND c.fk_user_author = '.$this->userid;
-    }
+		if ($this->userid > 0) $this->where .= ' AND c.fk_user_author = '.$this->userid;
+	}
 
-    /**
-     * Return shipment number by month for a year
-     *
+	/**
+	 * Return shipment number by month for a year
+	 *
 	 * @param	int		$year		Year to scan
-     *	@param	int		$format		0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
+	 *	@param	int		$format		0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
 	 * @return	array				Array with number by month
-     */
-    public function getNbByMonth($year, $format = 0)
-    {
-        global $user;
+	 */
+	public function getNbByMonth($year, $format = 0)
+	{
+		global $user;
 
-        $sql = "SELECT date_format(c.date_valid,'%m') as dm, COUNT(*) as nb";
+		$sql = "SELECT date_format(c.date_valid,'%m') as dm, COUNT(*) as nb";
 		$sql .= " FROM ".$this->from;
 		if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		$sql .= " WHERE c.date_valid BETWEEN '".$this->db->idate(dol_get_first_day($year))."' AND '".$this->db->idate(dol_get_last_day($year))."'";
 		$sql .= " AND ".$this->where;
 		$sql .= " GROUP BY dm";
-        $sql .= $this->db->order('dm', 'DESC');
+		$sql .= $this->db->order('dm', 'DESC');
 
 		$res = $this->_getNbByMonth($year, $sql, $format);
 		return $res;
-    }
+	}
 
 	/**
 	 * Return shipments number per year
@@ -119,7 +119,7 @@ class ExpeditionStats extends Stats
 		if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		$sql .= " WHERE ".$this->where;
 		$sql .= " GROUP BY dm";
-        $sql .= $this->db->order('dm', 'DESC');
+		$sql .= $this->db->order('dm', 'DESC');
 
 		return $this->_getNbByYear($sql);
 	}
@@ -138,7 +138,7 @@ class ExpeditionStats extends Stats
 		if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		$sql .= " WHERE ".$this->where;
 		$sql .= " GROUP BY year";
-        $sql .= $this->db->order('year', 'DESC');
+		$sql .= $this->db->order('year', 'DESC');
 
 		return $this->_getAllByYear($sql);
 	}
diff --git a/htdocs/expedition/contact.php b/htdocs/expedition/contact.php
index d2adaadf484..c6b10bd6967 100644
--- a/htdocs/expedition/contact.php
+++ b/htdocs/expedition/contact.php
@@ -30,8 +30,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/sendings.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 if (!empty($conf->projet->enabled)) {
-    require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
-    require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 }
 
 // Load translation files required by the page
@@ -48,27 +48,27 @@ $result = restrictedArea($user, 'expedition', $id, '');
 $object = new Expedition($db);
 if ($id > 0 || !empty($ref))
 {
-    $object->fetch($id, $ref);
-    $object->fetch_thirdparty();
+	$object->fetch($id, $ref);
+	$object->fetch_thirdparty();
 
-    if (!empty($object->origin))
-    {
-        $typeobject = $object->origin;
-        $origin = $object->origin;
-        $object->fetch_origin();
-    }
+	if (!empty($object->origin))
+	{
+		$typeobject = $object->origin;
+		$origin = $object->origin;
+		$object->fetch_origin();
+	}
 
-    // Linked documents
-    if ($typeobject == 'commande' && $object->$typeobject->id && !empty($conf->commande->enabled))
-    {
-        $objectsrc = new Commande($db);
-        $objectsrc->fetch($object->$typeobject->id);
-    }
-    if ($typeobject == 'propal' && $object->$typeobject->id && !empty($conf->propal->enabled))
-    {
-        $objectsrc = new Propal($db);
-        $objectsrc->fetch($object->$typeobject->id);
-    }
+	// Linked documents
+	if ($typeobject == 'commande' && $object->$typeobject->id && !empty($conf->commande->enabled))
+	{
+		$objectsrc = new Commande($db);
+		$objectsrc->fetch($object->$typeobject->id);
+	}
+	if ($typeobject == 'propal' && $object->$typeobject->id && !empty($conf->propal->enabled))
+	{
+		$objectsrc = new Propal($db);
+		$objectsrc->fetch($object->$typeobject->id);
+	}
 }
 
 
@@ -78,10 +78,10 @@ if ($id > 0 || !empty($ref))
 
 if ($action == 'addcontact' && $user->rights->expedition->creer)
 {
-    if ($result > 0 && $id > 0)
-    {
+	if ($result > 0 && $id > 0)
+	{
   		$result = $objectsrc->add_contact(GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid'), $_POST["type"], $_POST["source"]);
-    }
+	}
 
 	if ($result >= 0)
 	{
@@ -103,7 +103,7 @@ if ($action == 'addcontact' && $user->rights->expedition->creer)
 // bascule du statut d'un contact
 elseif ($action == 'swapstatut' && $user->rights->expedition->creer)
 {
-    $result = $objectsrc->swapContactStatus(GETPOST('ligne'));
+	$result = $objectsrc->swapContactStatus(GETPOST('ligne'));
 }
 
 // Efface un contact
@@ -163,41 +163,41 @@ if ($id > 0 || !empty($ref))
 	$morehtmlref .= $form->editfieldkey("RefCustomer", '', $object->ref_customer, $object, $user->rights->expedition->creer, 'string', '', 0, 1);
 	$morehtmlref .= $form->editfieldval("RefCustomer", '', $object->ref_customer, $object, $user->rights->expedition->creer, 'string', '', null, null, '', 1);
 	// Thirdparty
-    $morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
-    // Project
-    if (!empty($conf->projet->enabled)) {
-        $langs->load("projects");
-        $morehtmlref .= '<br>'.$langs->trans('Project').' ';
-        if (0) {    // Do not change on shipment
-            if ($action != 'classify') {
-                $morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
-            }
-            if ($action == 'classify') {
-                // $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-                $morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-                $morehtmlref .= '<input type="hidden" name="action" value="classin">';
-                $morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
-                $morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-                $morehtmlref .= '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
-                $morehtmlref .= '</form>';
-            } else {
-                $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-            }
-        } else {
-            // We don't have project on shipment, so we will use the project or source object instead
-            // TODO Add project on shipment
-            $morehtmlref .= ' : ';
-            if (!empty($objectsrc->fk_project)) {
-                $proj = new Project($db);
-                $proj->fetch($objectsrc->fk_project);
-                $morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$objectsrc->fk_project.'" title="'.$langs->trans('ShowProject').'">';
-                $morehtmlref .= $proj->ref;
-                $morehtmlref .= '</a>';
-            } else {
-                $morehtmlref .= '';
-            }
-        }
-    }
+	$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
+	// Project
+	if (!empty($conf->projet->enabled)) {
+		$langs->load("projects");
+		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
+		if (0) {    // Do not change on shipment
+			if ($action != 'classify') {
+				$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
+			}
+			if ($action == 'classify') {
+				// $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+				$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+				$morehtmlref .= '<input type="hidden" name="action" value="classin">';
+				$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
+				$morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+				$morehtmlref .= '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+				$morehtmlref .= '</form>';
+			} else {
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+			}
+		} else {
+			// We don't have project on shipment, so we will use the project or source object instead
+			// TODO Add project on shipment
+			$morehtmlref .= ' : ';
+			if (!empty($objectsrc->fk_project)) {
+				$proj = new Project($db);
+				$proj->fetch($objectsrc->fk_project);
+				$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$objectsrc->fk_project.'" title="'.$langs->trans('ShowProject').'">';
+				$morehtmlref .= $proj->ref;
+				$morehtmlref .= '</a>';
+			} else {
+				$morehtmlref .= '';
+			}
+		}
+	}
 	$morehtmlref .= '</div>';
 
 
@@ -205,33 +205,33 @@ if ($id > 0 || !empty($ref))
 
 
 	print '<div class="fichecenter">';
-    //print '<div class="fichehalfleft">';
+	//print '<div class="fichehalfleft">';
 	print '<div class="underbanner clearboth"></div>';
 
-    print '<table class="border centpercent tableforfield">';
+	print '<table class="border centpercent tableforfield">';
 
-    // Linked documents
+	// Linked documents
 	if ($typeobject == 'commande' && $object->$typeobject->id && !empty($conf->commande->enabled))
 	{
-	    print '<tr><td class="titlefield">';
-	    $objectsrc = new Commande($db);
-	    $objectsrc->fetch($object->$typeobject->id);
-	    print $langs->trans("RefOrder").'</td>';
-	    print '<td colspan="3">';
-	    print $objectsrc->getNomUrl(1, 'commande');
-	    print "</td>\n";
-	    print '</tr>';
+		print '<tr><td class="titlefield">';
+		$objectsrc = new Commande($db);
+		$objectsrc->fetch($object->$typeobject->id);
+		print $langs->trans("RefOrder").'</td>';
+		print '<td colspan="3">';
+		print $objectsrc->getNomUrl(1, 'commande');
+		print "</td>\n";
+		print '</tr>';
 	}
 	if ($typeobject == 'propal' && $object->$typeobject->id && !empty($conf->propal->enabled))
 	{
-	    print '<tr><td class="titlefield">';
-	    $objectsrc = new Propal($db);
-	    $objectsrc->fetch($object->$typeobject->id);
-	    print $langs->trans("RefProposal").'</td>';
-	    print '<td colspan="3">';
-	    print $objectsrc->getNomUrl(1, 'expedition');
-	    print "</td>\n";
-	    print '</tr>';
+		print '<tr><td class="titlefield">';
+		$objectsrc = new Propal($db);
+		$objectsrc->fetch($object->$typeobject->id);
+		print $langs->trans("RefProposal").'</td>';
+		print '<td colspan="3">';
+		print $objectsrc->getNomUrl(1, 'expedition');
+		print "</td>\n";
+		print '</tr>';
 	}
 
 	print "</table>";
@@ -250,7 +250,7 @@ if ($id > 0 || !empty($ref))
 	print '<div class="clearboth"></div>';
 
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	// Lines of contacts
 	echo '<br>';
@@ -260,8 +260,8 @@ if ($id > 0 || !empty($ref))
 	$preselectedtypeofcontact = dol_getIdFromCode($db, 'SHIPPING', 'c_type_contact', 'code', 'rowid');
 	foreach ($dirtpls as $reldir)
 	{
-	    $res = @include dol_buildpath($reldir.'/contacts.tpl.php');
-	    if ($res) break;
+		$res = @include dol_buildpath($reldir.'/contacts.tpl.php');
+		if ($res) break;
 	}
 }
 
diff --git a/htdocs/expedition/document.php b/htdocs/expedition/document.php
index ede667279e6..a9b19ede7c3 100644
--- a/htdocs/expedition/document.php
+++ b/htdocs/expedition/document.php
@@ -101,7 +101,7 @@ if ($id > 0 || !empty($ref)) {
 		$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
 		$totalsize = 0;
 		foreach ($filearray as $key => $file) {
-		    $totalsize += $file['size'];
+			$totalsize += $file['size'];
 		}
 
 		// Shipment card
@@ -169,7 +169,7 @@ if ($id > 0 || !empty($ref)) {
 
 		print "</div>\n";
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 		$modulepart = 'expedition';
 		$permission = $user->rights->expedition->creer;
diff --git a/htdocs/expedition/index.php b/htdocs/expedition/index.php
index 6f21683cc69..4a84bfc6718 100644
--- a/htdocs/expedition/index.php
+++ b/htdocs/expedition/index.php
@@ -56,14 +56,14 @@ 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
 {
-    print '<form method="post" action="list.php">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    print '<div class="div-table-responsive-no-min">';
-    print '<table class="noborder nohover centpercent">';
-    print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
-    print '<tr class="oddeven"><td>';
-    print $langs->trans("Shipment").':</td><td><input type="text" class="flat" name="sall" size="18"></td><td><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
-    print "</table></div></form><br>\n";
+	print '<form method="post" action="list.php">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<div class="div-table-responsive-no-min">';
+	print '<table class="noborder nohover centpercent">';
+	print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
+	print '<tr class="oddeven"><td>';
+	print $langs->trans("Shipment").':</td><td><input type="text" class="flat" name="sall" size="18"></td><td><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
+	print "</table></div></form><br>\n";
 }
 
 /*
@@ -250,13 +250,13 @@ if ($resql)
 		{
 			$obj = $db->fetch_object($resql);
 
-		    $orderstatic->id = $obj->rowid;
+			$orderstatic->id = $obj->rowid;
 			$orderstatic->ref = $obj->ref;
 			$orderstatic->ref_customer = $obj->ref_customer;
 			$orderstatic->statut = $obj->status;
-            $orderstatic->billed = $obj->billed;
+			$orderstatic->billed = $obj->billed;
 
-            $companystatic->name = $obj->name;
+			$companystatic->name = $obj->name;
 			$companystatic->id = $obj->socid;
 
 			print '<tr class="oddeven"><td>';
@@ -265,10 +265,10 @@ if ($resql)
 			print '<td>';
 			print $companystatic->getNomUrl(1, 'customer', 32);
 			print '</td>';
-            print '<td class="right">';
-            print $orderstatic->getLibStatut(3);
-            print '</td>';
-            print '</tr>';
+			print '<td class="right">';
+			print $orderstatic->getLibStatut(3);
+			print '</td>';
+			print '</tr>';
 			$i++;
 		}
 
diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php
index b4e8047341b..61ecf46708f 100644
--- a/htdocs/expedition/list.php
+++ b/htdocs/expedition/list.php
@@ -175,7 +175,7 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
 	$search_state = "";
 	$search_type = '';
 	$search_country = '';
-	$search_tracking='';
+	$search_tracking = '';
 	$search_type_thirdparty = '';
 	$search_billed = '';
 	$search_datedelivery_start = '';
@@ -183,7 +183,7 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
 	$search_datereceipt_start = '';
 	$search_datereceipt_end = '';
 	$search_status = '';
-    $toselect = '';
+	$toselect = '';
 	$search_array_options = array();
 	$search_categ_cus = 0;
 }
@@ -277,7 +277,7 @@ if ($search_town)  $sql .= natural_search('s.town', $search_town);
 if ($search_zip)   $sql .= natural_search("s.zip", $search_zip);
 if ($search_state) $sql .= natural_search("state.nom", $search_state);
 if ($search_country) $sql .= " AND s.fk_pays IN (".$search_country.')';
-if ($search_tracking)   $sql.= natural_search("e.tracking_number", $search_tracking);
+if ($search_tracking)   $sql .= natural_search("e.tracking_number", $search_tracking);
 if ($search_type_thirdparty) $sql .= " AND s.fk_typent IN (".$search_type_thirdparty.')';
 if ($search_sale > 0)                        $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$search_sale;
 if ($search_ref_exp) $sql .= natural_search('e.ref', $search_ref_exp);
@@ -335,7 +335,7 @@ if ($resql)
 	if ($search_user > 0) 			$param .= '&search_user='.urlencode($search_user);
 	if ($search_sale > 0) 			$param .= '&search_sale='.urlencode($search_sale);
 	if ($search_company)   $param .= "&amp;search_company=".urlencode($search_company);
-	if ($search_tracking)   $param.= "&amp;search_tracking=".urlencode($search_tracking);
+	if ($search_tracking)   $param .= "&amp;search_tracking=".urlencode($search_tracking);
 	if ($search_town)      $param .= '&search_town='.urlencode($search_town);
 	if ($search_zip)       $param .= '&search_zip='.urlencode($search_zip);
 
@@ -514,7 +514,7 @@ if ($resql)
 		print '</td>';
 	}
 	// Tracking number
-	if (! empty($arrayfields['e.tracking_number']['checked']))
+	if (!empty($arrayfields['e.tracking_number']['checked']))
 	{
 		print '<td class="liste_titre center">';
 		print '<input class="flat" size="6" type="text" name="search_tracking" value="'.dol_escape_htmltag($search_tracking).'">';
@@ -592,7 +592,7 @@ if ($resql)
 	if (!empty($arrayfields['typent.code']['checked']))      print_liste_field_titre($arrayfields['typent.code']['label'], $_SERVER["PHP_SELF"], "typent.code", "", $param, '', $sortfield, $sortorder, 'center ');
 	if (!empty($arrayfields['e.weight']['checked']))         print_liste_field_titre($arrayfields['e.weight']['label'], $_SERVER["PHP_SELF"], "e.weight", "", $param, '', $sortfield, $sortorder, 'center ');
 	if (!empty($arrayfields['e.date_delivery']['checked']))  print_liste_field_titre($arrayfields['e.date_delivery']['label'], $_SERVER["PHP_SELF"], "e.date_delivery", "", $param, '', $sortfield, $sortorder, 'center ');
-	if (! empty($arrayfields['e.tracking_number']['checked']))  print_liste_field_titre($arrayfields['e.tracking_number']['label'], $_SERVER["PHP_SELF"], "e.tracking_number", "", $param, '', $sortfield, $sortorder, 'center ');
+	if (!empty($arrayfields['e.tracking_number']['checked']))  print_liste_field_titre($arrayfields['e.tracking_number']['label'], $_SERVER["PHP_SELF"], "e.tracking_number", "", $param, '', $sortfield, $sortorder, 'center ');
 	if (!empty($arrayfields['l.ref']['checked']))            print_liste_field_titre($arrayfields['l.ref']['label'], $_SERVER["PHP_SELF"], "l.ref", "", $param, '', $sortfield, $sortorder);
 	if (!empty($arrayfields['l.date_delivery']['checked']))  print_liste_field_titre($arrayfields['l.date_delivery']['label'], $_SERVER["PHP_SELF"], "l.date_delivery", "", $param, '', $sortfield, $sortorder, 'center ');
 	// Extra fields
@@ -719,10 +719,10 @@ if ($resql)
 			print "</td>\n";
 		}
 		// Tracking number
-		if (! empty($arrayfields['e.tracking_number']['checked']))
+		if (!empty($arrayfields['e.tracking_number']['checked']))
 		{
 			print '<td class="center">'.$obj->tracking_number."</td>\n";
-			if (! $i) $totalarray['nbfield']++;
+			if (!$i) $totalarray['nbfield']++;
 		}
 
 		if (!empty($arrayfields['l.ref']['checked']) || !empty($arrayfields['l.date_delivery']['checked']))
diff --git a/htdocs/expedition/note.php b/htdocs/expedition/note.php
index 64aa415c4ce..6397a301e59 100644
--- a/htdocs/expedition/note.php
+++ b/htdocs/expedition/note.php
@@ -28,8 +28,8 @@ require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/sendings.lib.php';
 if (!empty($conf->projet->enabled)) {
-    require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
-    require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 }
 
 // Load translation files required by the page
@@ -47,27 +47,27 @@ $result = restrictedArea($user, $origin, $origin_id);
 $object = new Expedition($db);
 if ($id > 0 || !empty($ref))
 {
-    $object->fetch($id, $ref);
-    $object->fetch_thirdparty();
+	$object->fetch($id, $ref);
+	$object->fetch_thirdparty();
 
-    if (!empty($object->origin))
-    {
-        $typeobject = $object->origin;
-        $origin = $object->origin;
-        $object->fetch_origin();
-    }
+	if (!empty($object->origin))
+	{
+		$typeobject = $object->origin;
+		$origin = $object->origin;
+		$object->fetch_origin();
+	}
 
-    // Linked documents
-    if ($typeobject == 'commande' && $object->$typeobject->id && !empty($conf->commande->enabled))
-    {
-        $objectsrc = new Commande($db);
-        $objectsrc->fetch($object->$typeobject->id);
-    }
-    if ($typeobject == 'propal' && $object->$typeobject->id && !empty($conf->propal->enabled))
-    {
-        $objectsrc = new Propal($db);
-        $objectsrc->fetch($object->$typeobject->id);
-    }
+	// Linked documents
+	if ($typeobject == 'commande' && $object->$typeobject->id && !empty($conf->commande->enabled))
+	{
+		$objectsrc = new Commande($db);
+		$objectsrc->fetch($object->$typeobject->id);
+	}
+	if ($typeobject == 'propal' && $object->$typeobject->id && !empty($conf->propal->enabled))
+	{
+		$objectsrc = new Propal($db);
+		$objectsrc->fetch($object->$typeobject->id);
+	}
 }
 
 $permissionnote = $user->rights->expedition->creer; // Used by the include of actions_setnotes.inc.php
@@ -103,52 +103,52 @@ if ($id > 0 || !empty($ref))
 	$morehtmlref .= $form->editfieldval("RefCustomer", '', $object->ref_customer, $object, $user->rights->expedition->creer, 'string', '', null, null, '', 1);
 	// Thirdparty
 	$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
-    // Project
-    if (!empty($conf->projet->enabled)) {
-        $langs->load("projects");
-        $morehtmlref .= '<br>'.$langs->trans('Project').' ';
-        if (0) {    // Do not change on shipment
-            if ($action != 'classify') {
-                $morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
-            }
-            if ($action == 'classify') {
-                // $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-                $morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-                $morehtmlref .= '<input type="hidden" name="action" value="classin">';
-                $morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
-                $morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-                $morehtmlref .= '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
-                $morehtmlref .= '</form>';
-            } else {
-                $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-            }
-        } else {
-            // We don't have project on shipment, so we will use the project or source object instead
-            // TODO Add project on shipment
-            $morehtmlref .= ' : ';
-            if (!empty($objectsrc->fk_project)) {
-                $proj = new Project($db);
-                $proj->fetch($objectsrc->fk_project);
-                $morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$objectsrc->fk_project.'" title="'.$langs->trans('ShowProject').'">';
-                $morehtmlref .= $proj->ref;
-                $morehtmlref .= '</a>';
-            } else {
-                $morehtmlref .= '';
-            }
-        }
-    }
-    $morehtmlref .= '</div>';
+	// Project
+	if (!empty($conf->projet->enabled)) {
+		$langs->load("projects");
+		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
+		if (0) {    // Do not change on shipment
+			if ($action != 'classify') {
+				$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
+			}
+			if ($action == 'classify') {
+				// $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+				$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+				$morehtmlref .= '<input type="hidden" name="action" value="classin">';
+				$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
+				$morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+				$morehtmlref .= '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+				$morehtmlref .= '</form>';
+			} else {
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+			}
+		} else {
+			// We don't have project on shipment, so we will use the project or source object instead
+			// TODO Add project on shipment
+			$morehtmlref .= ' : ';
+			if (!empty($objectsrc->fk_project)) {
+				$proj = new Project($db);
+				$proj->fetch($objectsrc->fk_project);
+				$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$objectsrc->fk_project.'" title="'.$langs->trans('ShowProject').'">';
+				$morehtmlref .= $proj->ref;
+				$morehtmlref .= '</a>';
+			} else {
+				$morehtmlref .= '';
+			}
+		}
+	}
+	$morehtmlref .= '</div>';
 
 
-    dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
 
 
-    print '<div class="underbanner clearboth"></div>';
+	print '<div class="underbanner clearboth"></div>';
 
 	$cssclass = 'titlefield';
 	include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 }
 
 // End of page
diff --git a/htdocs/expedition/shipment.php b/htdocs/expedition/shipment.php
index 4d4dd365c5f..62e6181abcf 100644
--- a/htdocs/expedition/shipment.php
+++ b/htdocs/expedition/shipment.php
@@ -78,43 +78,43 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 
 if (empty($reshook))
 {
-    // Categorisation dans projet
-    if ($action == 'classin')
-    {
-    	$object = new Commande($db);
-    	$object->fetch($id);
-    	$object->setProject(GETPOST('projectid', 'int'));
-    }
-
-    if ($action == 'confirm_cloture' && GETPOST('confirm', 'alpha') == 'yes')
-    {
-    	$object = new Commande($db);
-    	$object->fetch($id);
-    	$result = $object->cloture($user);
-    }
-
-    // Positionne ref commande client
-    elseif ($action == 'setref_client' && $user->rights->commande->creer) {
-        $result = $object->set_ref_client($user, GETPOST('ref_client'));
-        if ($result < 0)
-        {
-            setEventMessages($object->error, $object->errors, 'errors');
-        }
-    }
-
-    if ($action == 'setdatedelivery' && $user->rights->commande->creer)
+	// Categorisation dans projet
+	if ($action == 'classin')
 	{
-	    //print "x ".$_POST['liv_month'].", ".$_POST['liv_day'].", ".$_POST['liv_year'];
-	    $datedelivery = dol_mktime(GETPOST('liv_hour', 'int'), GETPOST('liv_min', 'int'), 0, GETPOST('liv_month', 'int'), GETPOST('liv_day', 'int'), GETPOST('liv_year', 'int'));
-
-	    $object->fetch($id);
-	    $result = $object->setDeliveryDate($user, $datedelivery);
-	    if ($result < 0)
-	    {
-	        setEventMessages($object->error, $object->errors, 'errors');
-	    }
+		$object = new Commande($db);
+		$object->fetch($id);
+		$object->setProject(GETPOST('projectid', 'int'));
 	}
-    /*
+
+	if ($action == 'confirm_cloture' && GETPOST('confirm', 'alpha') == 'yes')
+	{
+		$object = new Commande($db);
+		$object->fetch($id);
+		$result = $object->cloture($user);
+	}
+
+	// Positionne ref commande client
+	elseif ($action == 'setref_client' && $user->rights->commande->creer) {
+		$result = $object->set_ref_client($user, GETPOST('ref_client'));
+		if ($result < 0)
+		{
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
+	}
+
+	if ($action == 'setdatedelivery' && $user->rights->commande->creer)
+	{
+		//print "x ".$_POST['liv_month'].", ".$_POST['liv_day'].", ".$_POST['liv_year'];
+		$datedelivery = dol_mktime(GETPOST('liv_hour', 'int'), GETPOST('liv_min', 'int'), 0, GETPOST('liv_month', 'int'), GETPOST('liv_day', 'int'), GETPOST('liv_year', 'int'));
+
+		$object->fetch($id);
+		$result = $object->setDeliveryDate($user, $datedelivery);
+		if ($result < 0)
+		{
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
+	}
+	/*
     if ($action == 'setdeliveryaddress' && $user->rights->commande->creer)
     {
     	$object = new Commande($db);
@@ -124,100 +124,100 @@ if (empty($reshook))
     		setEventMessages($object->error, $object->errors, 'errors');
     }
     */
-    if ($action == 'setmode' && $user->rights->commande->creer)
-    {
-    	$object = new Commande($db);
-    	$object->fetch($id);
-    	$result = $object->setPaymentMethods(GETPOST('mode_reglement_id', 'int'));
-    	if ($result < 0)
-    		setEventMessages($object->error, $object->errors, 'errors');
-    }
+	if ($action == 'setmode' && $user->rights->commande->creer)
+	{
+		$object = new Commande($db);
+		$object->fetch($id);
+		$result = $object->setPaymentMethods(GETPOST('mode_reglement_id', 'int'));
+		if ($result < 0)
+			setEventMessages($object->error, $object->errors, 'errors');
+	}
 
-    if ($action == 'setavailability' && $user->rights->commande->creer) {
-        $object = new Commande($db);
-        $object->fetch($id);
-        $result = $object->availability(GETPOST('availability_id'));
-        if ($result < 0)
-            setEventMessages($object->error, $object->errors, 'errors');
-    }
+	if ($action == 'setavailability' && $user->rights->commande->creer) {
+		$object = new Commande($db);
+		$object->fetch($id);
+		$result = $object->availability(GETPOST('availability_id'));
+		if ($result < 0)
+			setEventMessages($object->error, $object->errors, 'errors');
+	}
 
-    if ($action == 'setdemandreason' && $user->rights->commande->creer) {
-        $object = new Commande($db);
-        $object->fetch($id);
-        $result = $object->demand_reason(GETPOST('demand_reason_id'));
-        if ($result < 0)
-            setEventMessages($object->error, $object->errors, 'errors');
-    }
+	if ($action == 'setdemandreason' && $user->rights->commande->creer) {
+		$object = new Commande($db);
+		$object->fetch($id);
+		$result = $object->demand_reason(GETPOST('demand_reason_id'));
+		if ($result < 0)
+			setEventMessages($object->error, $object->errors, 'errors');
+	}
 
-    if ($action == 'setconditions' && $user->rights->commande->creer)
-    {
-    	$object = new Commande($db);
-    	$object->fetch($id);
-    	$result = $object->setPaymentTerms(GETPOST('cond_reglement_id', 'int'));
-    	if ($result < 0)
-    		setEventMessages($object->error, $object->errors, 'errors');
-    }
+	if ($action == 'setconditions' && $user->rights->commande->creer)
+	{
+		$object = new Commande($db);
+		$object->fetch($id);
+		$result = $object->setPaymentTerms(GETPOST('cond_reglement_id', 'int'));
+		if ($result < 0)
+			setEventMessages($object->error, $object->errors, 'errors');
+	}
 
-    // Set incoterm
-    elseif ($action == 'set_incoterms' && !empty($conf->incoterm->enabled))
-    {
-    	$result = $object->setIncoterms(GETPOST('incoterm_id', 'int'), GETPOST('location_incoterms', 'alpha'));
-    	if ($result < 0) {
-    		setEventMessages($object->error, $object->errors, 'errors');
-    	}
-    }
+	// Set incoterm
+	elseif ($action == 'set_incoterms' && !empty($conf->incoterm->enabled))
+	{
+		$result = $object->setIncoterms(GETPOST('incoterm_id', 'int'), GETPOST('location_incoterms', 'alpha'));
+		if ($result < 0) {
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
+	}
 
-    // shipping method
-    if ($action == 'setshippingmethod' && $user->rights->commande->creer) {
-        $object = new Commande($db);
-        $object->fetch($id);
-        $result = $object->setShippingMethod(GETPOST('shipping_method_id', 'int'));
-    	if ($result < 0)
-    		setEventMessages($object->error, $object->errors, 'errors');
-    }
+	// shipping method
+	if ($action == 'setshippingmethod' && $user->rights->commande->creer) {
+		$object = new Commande($db);
+		$object->fetch($id);
+		$result = $object->setShippingMethod(GETPOST('shipping_method_id', 'int'));
+		if ($result < 0)
+			setEventMessages($object->error, $object->errors, 'errors');
+	}
 
-    // warehouse
-    if ($action == 'setwarehouse' && $user->rights->commande->creer) {
-        $object = new Commande($db);
-        $object->fetch($id);
-        $result = $object->setWarehouse(GETPOST('warehouse_id', 'int'));
-        if ($result < 0)
-            setEventMessages($object->error, $object->errors, 'errors');
-    }
+	// warehouse
+	if ($action == 'setwarehouse' && $user->rights->commande->creer) {
+		$object = new Commande($db);
+		$object->fetch($id);
+		$result = $object->setWarehouse(GETPOST('warehouse_id', 'int'));
+		if ($result < 0)
+			setEventMessages($object->error, $object->errors, 'errors');
+	}
 
-    if ($action == 'update_extras')
-    {
-    	$object->oldcopy = dol_clone($object);
+	if ($action == 'update_extras')
+	{
+		$object->oldcopy = dol_clone($object);
 
-    	// Fill array 'array_options' with data from update form
-        $ret = $extrafields->setOptionalsFromPost(null, $object, GETPOST('attribute', 'restricthtml'));
-        if ($ret < 0) $error++;
+		// Fill array 'array_options' with data from update form
+		$ret = $extrafields->setOptionalsFromPost(null, $object, GETPOST('attribute', 'restricthtml'));
+		if ($ret < 0) $error++;
 
-        if (!$error)
-        {
-            // Actions on extra fields
-            $result = $object->insertExtraFields('SHIPMENT_MODIFY');
+		if (!$error)
+		{
+			// Actions on extra fields
+			$result = $object->insertExtraFields('SHIPMENT_MODIFY');
 			if ($result < 0)
 			{
 				setEventMessages($object->error, $object->errors, 'errors');
 				$error++;
 			}
-        }
+		}
 
-        if ($error)
-            $action = 'edit_extras';
-    }
+		if ($error)
+			$action = 'edit_extras';
+	}
 
-    if ($action == 'set_thirdparty' && $user->rights->commande->creer)
-    {
-        $object->fetch($id);
-        $object->setValueFrom('fk_soc', $socid, '', '', 'date', '', $user, 'ORDER_MODIFY');
+	if ($action == 'set_thirdparty' && $user->rights->commande->creer)
+	{
+		$object->fetch($id);
+		$object->setValueFrom('fk_soc', $socid, '', '', 'date', '', $user, 'ORDER_MODIFY');
 
-        header('Location: '.$_SERVER["PHP_SELF"].'?id='.$id);
-        exit();
-    }
+		header('Location: '.$_SERVER["PHP_SELF"].'?id='.$id);
+		exit();
+	}
 
-    include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
+	include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
 }
 
 /*
@@ -280,61 +280,61 @@ if ($id > 0 || !empty($ref))
 		// Ref customer
 		$morehtmlref .= $form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, $user->rights->commande->creer, 'string', '', 0, 1);
 		$morehtmlref .= $form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, $user->rights->commande->creer, 'string', '', null, null, '', 1);
-	    // Thirdparty
-	    $morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$soc->getNomUrl(1);
-	    // Project
-	    if (!empty($conf->projet->enabled))
-	    {
-	        $langs->load("projects");
-	        $morehtmlref .= '<br>'.$langs->trans('Project').' ';
-	        if ($user->rights->commande->creer)
-	        {
-	            if ($action != 'classify') {
+		// Thirdparty
+		$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$soc->getNomUrl(1);
+		// Project
+		if (!empty($conf->projet->enabled))
+		{
+			$langs->load("projects");
+			$morehtmlref .= '<br>'.$langs->trans('Project').' ';
+			if ($user->rights->commande->creer)
+			{
+				if ($action != 'classify') {
 					$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
-                }
-                if ($action == 'classify') {
-                    //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-                    $morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-                    $morehtmlref .= '<input type="hidden" name="action" value="classin">';
-                    $morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
-                    $morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-                    $morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-                    $morehtmlref .= '</form>';
-                } else {
-                    $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-                }
-	        } else {
-	            if (!empty($object->fk_project)) {
-	                $proj = new Project($db);
-	                $proj->fetch($object->fk_project);
-	                $morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
-	                $morehtmlref .= $proj->ref;
-	                $morehtmlref .= '</a>';
-	            } else {
-	                $morehtmlref .= '';
-	            }
-	        }
-	    }
-	    $morehtmlref .= '</div>';
+				}
+				if ($action == 'classify') {
+					//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+					$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+					$morehtmlref .= '<input type="hidden" name="action" value="classin">';
+					$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
+					$morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+					$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+					$morehtmlref .= '</form>';
+				} else {
+					$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+				}
+			} else {
+				if (!empty($object->fk_project)) {
+					$proj = new Project($db);
+					$proj->fetch($object->fk_project);
+					$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
+					$morehtmlref .= $proj->ref;
+					$morehtmlref .= '</a>';
+				} else {
+					$morehtmlref .= '';
+				}
+			}
+		}
+		$morehtmlref .= '</div>';
 
 
-	    dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+		dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
 
 
-	    print '<div class="fichecenter">';
-	    print '<div class="fichehalfleft">';
-	    print '<div class="underbanner clearboth"></div>';
+		print '<div class="fichecenter">';
+		print '<div class="fichehalfleft">';
+		print '<div class="underbanner clearboth"></div>';
 
-	    print '<table class="border centpercent tableforfield">';
+		print '<table class="border centpercent tableforfield">';
 
 		// Discounts for third party
-	    if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
-	    	$filterabsolutediscount = "fk_facture_source IS NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
-	    	$filtercreditnote = "fk_facture_source IS NOT NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
-	    } else {
-	    	$filterabsolutediscount = "fk_facture_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS RECEIVED)%')";
-	    	$filtercreditnote = "fk_facture_source IS NOT NULL AND (description NOT LIKE '(DEPOSIT)%' OR description LIKE '(EXCESS RECEIVED)%')";
-	    }
+		if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
+			$filterabsolutediscount = "fk_facture_source IS NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
+			$filtercreditnote = "fk_facture_source IS NOT NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
+		} else {
+			$filterabsolutediscount = "fk_facture_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS RECEIVED)%')";
+			$filtercreditnote = "fk_facture_source IS NOT NULL AND (description NOT LIKE '(DEPOSIT)%' OR description LIKE '(EXCESS RECEIVED)%')";
+		}
 
 		print '<tr><td class="titlefield">'.$langs->trans('Discounts').'</td><td colspan="3">';
 
@@ -355,7 +355,7 @@ if ($id > 0 || !empty($ref))
 		print '<td colspan="2">';
 		print dol_print_date($object->date, 'day');
 		if ($object->hasDelay() && empty($object->date_livraison)) {
-		    print ' '.img_picto($langs->trans("Late").' : '.$object->showDelay(), "warning");
+			print ' '.img_picto($langs->trans("Late").' : '.$object->showDelay(), "warning");
 		}
 		print '</td>';
 		print '</tr>';
@@ -380,7 +380,7 @@ if ($id > 0 || !empty($ref))
 		} else {
 			print dol_print_date($object->date_livraison, 'dayhour');
 			if ($object->hasDelay() && !empty($object->date_livraison)) {
-			    print ' '.img_picto($langs->trans("Late").' : '.$object->showDelay(), "warning");
+				print ' '.img_picto($langs->trans("Late").' : '.$object->showDelay(), "warning");
 			}
 		}
 		print '</td>';
@@ -390,43 +390,43 @@ if ($id > 0 || !empty($ref))
 		//print '</td>';
 		print '</tr>';
 
-        // Shipping Method
-        print '<tr><td>';
-        print '<table width="100%" class="nobordernopadding"><tr><td>';
-        print $langs->trans('SendingMethod');
-        print '</td>';
-        if ($action != 'editshippingmethod' && $user->rights->expedition->creer)
-            print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editshippingmethod&amp;id='.$object->id.'">'.img_edit($langs->trans('SetShippingMode'), 1).'</a></td>';
-        print '</tr></table>';
-        print '</td><td colspan="2">';
-        if ($action == 'editshippingmethod') {
-            $form->formSelectShippingMethod($_SERVER['PHP_SELF'].'?id='.$object->id, $object->shipping_method_id, 'shipping_method_id', 1);
-        } else {
-            $form->formSelectShippingMethod($_SERVER['PHP_SELF'].'?id='.$object->id, $object->shipping_method_id, 'none');
-        }
-        print '</td>';
-        print '</tr>';
+		// Shipping Method
+		print '<tr><td>';
+		print '<table width="100%" class="nobordernopadding"><tr><td>';
+		print $langs->trans('SendingMethod');
+		print '</td>';
+		if ($action != 'editshippingmethod' && $user->rights->expedition->creer)
+			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editshippingmethod&amp;id='.$object->id.'">'.img_edit($langs->trans('SetShippingMode'), 1).'</a></td>';
+		print '</tr></table>';
+		print '</td><td colspan="2">';
+		if ($action == 'editshippingmethod') {
+			$form->formSelectShippingMethod($_SERVER['PHP_SELF'].'?id='.$object->id, $object->shipping_method_id, 'shipping_method_id', 1);
+		} else {
+			$form->formSelectShippingMethod($_SERVER['PHP_SELF'].'?id='.$object->id, $object->shipping_method_id, 'none');
+		}
+		print '</td>';
+		print '</tr>';
 
-        // Warehouse
-        if (!empty($conf->stock->enabled) && !empty($conf->global->WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER)) {
-            require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
-            $formproduct = new FormProduct($db);
-            print '<tr><td>';
-            print '<table width="100%" class="nobordernopadding"><tr><td>';
-            print $langs->trans('Warehouse');
-            print '</td>';
-            if ($action != 'editwarehouse' && $user->rights->commande->creer)
-                print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editwarehouse&amp;id='.$object->id.'">'.img_edit($langs->trans('SetWarehouse'), 1).'</a></td>';
-            print '</tr></table>';
-            print '</td><td colspan="2">';
-            if ($action == 'editwarehouse') {
-                $formproduct->formSelectWarehouses($_SERVER['PHP_SELF'].'?id='.$object->id, $object->warehouse_id, 'warehouse_id', 1);
-            } else {
-                $formproduct->formSelectWarehouses($_SERVER['PHP_SELF'].'?id='.$object->id, $object->warehouse_id, 'none');
-            }
-            print '</td>';
-            print '</tr>';
-        }
+		// Warehouse
+		if (!empty($conf->stock->enabled) && !empty($conf->global->WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER)) {
+			require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
+			$formproduct = new FormProduct($db);
+			print '<tr><td>';
+			print '<table width="100%" class="nobordernopadding"><tr><td>';
+			print $langs->trans('Warehouse');
+			print '</td>';
+			if ($action != 'editwarehouse' && $user->rights->commande->creer)
+				print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editwarehouse&amp;id='.$object->id.'">'.img_edit($langs->trans('SetWarehouse'), 1).'</a></td>';
+			print '</tr></table>';
+			print '</td><td colspan="2">';
+			if ($action == 'editwarehouse') {
+				$formproduct->formSelectWarehouses($_SERVER['PHP_SELF'].'?id='.$object->id, $object->warehouse_id, 'warehouse_id', 1);
+			} else {
+				$formproduct->formSelectWarehouses($_SERVER['PHP_SELF'].'?id='.$object->id, $object->warehouse_id, 'none');
+			}
+			print '</td>';
+			print '</tr>';
+		}
 
 		// Terms of payment
 		/*
@@ -502,14 +502,14 @@ if ($id > 0 || !empty($ref))
 		$totalVolume = $tmparray['volume'];
 		if ($totalWeight || $totalVolume)
 		{
-		    print '<tr><td>'.$langs->trans("CalculatedWeight").'</td>';
-		    print '<td>';
-		    print showDimensionInBestUnit($totalWeight, 0, "weight", $langs, isset($conf->global->MAIN_WEIGHT_DEFAULT_ROUND) ? $conf->global->MAIN_WEIGHT_DEFAULT_ROUND : -1, isset($conf->global->MAIN_WEIGHT_DEFAULT_UNIT) ? $conf->global->MAIN_WEIGHT_DEFAULT_UNIT : 'no');
-		    print '</td></tr>';
-		    print '<tr><td>'.$langs->trans("CalculatedVolume").'</td>';
-		    print '<td>';
-		    print showDimensionInBestUnit($totalVolume, 0, "volume", $langs, isset($conf->global->MAIN_VOLUME_DEFAULT_ROUND) ? $conf->global->MAIN_VOLUME_DEFAULT_ROUND : -1, isset($conf->global->MAIN_VOLUME_DEFAULT_UNIT) ? $conf->global->MAIN_VOLUME_DEFAULT_UNIT : 'no');
-		    print '</td></tr>';
+			print '<tr><td>'.$langs->trans("CalculatedWeight").'</td>';
+			print '<td>';
+			print showDimensionInBestUnit($totalWeight, 0, "weight", $langs, isset($conf->global->MAIN_WEIGHT_DEFAULT_ROUND) ? $conf->global->MAIN_WEIGHT_DEFAULT_ROUND : -1, isset($conf->global->MAIN_WEIGHT_DEFAULT_UNIT) ? $conf->global->MAIN_WEIGHT_DEFAULT_UNIT : 'no');
+			print '</td></tr>';
+			print '<tr><td>'.$langs->trans("CalculatedVolume").'</td>';
+			print '<td>';
+			print showDimensionInBestUnit($totalVolume, 0, "volume", $langs, isset($conf->global->MAIN_VOLUME_DEFAULT_ROUND) ? $conf->global->MAIN_VOLUME_DEFAULT_ROUND : -1, isset($conf->global->MAIN_VOLUME_DEFAULT_UNIT) ? $conf->global->MAIN_VOLUME_DEFAULT_UNIT : 'no');
+			print '</td></tr>';
 		}
 
 		// TODO How record was recorded OrderMode (llx_c_input_method)
@@ -517,22 +517,22 @@ if ($id > 0 || !empty($ref))
 		// Incoterms
 		if (!empty($conf->incoterm->enabled))
 		{
-		    print '<tr><td>';
-		    print '<table width="100%" class="nobordernopadding"><tr><td>';
-		    print $langs->trans('IncotermLabel');
-		    print '<td><td class="right">';
-		    if ($user->rights->commande->creer) print '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'/expedition/shipment.php?id='.$object->id.'&action=editincoterm">'.img_edit().'</a>';
-		    else print '&nbsp;';
-		    print '</td></tr></table>';
-		    print '</td>';
-		    print '<td colspan="3">';
-		    if ($action != 'editincoterm')
-		    {
-		        print $form->textwithpicto($object->display_incoterms(), $object->label_incoterms, 1);
-		    } else {
-		        print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms) ? $object->location_incoterms : ''), $_SERVER['PHP_SELF'].'?id='.$object->id);
-		    }
-		    print '</td></tr>';
+			print '<tr><td>';
+			print '<table width="100%" class="nobordernopadding"><tr><td>';
+			print $langs->trans('IncotermLabel');
+			print '<td><td class="right">';
+			if ($user->rights->commande->creer) print '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'/expedition/shipment.php?id='.$object->id.'&action=editincoterm">'.img_edit().'</a>';
+			else print '&nbsp;';
+			print '</td></tr></table>';
+			print '</td>';
+			print '<td colspan="3">';
+			if ($action != 'editincoterm')
+			{
+				print $form->textwithpicto($object->display_incoterms(), $object->label_incoterms, 1);
+			} else {
+				print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms) ? $object->location_incoterms : ''), $_SERVER['PHP_SELF'].'?id='.$object->id);
+			}
+			print '</td></tr>';
 		}
 
 		$expe = new Expedition($db);
@@ -553,20 +553,20 @@ if ($id > 0 || !empty($ref))
 
 		if (!empty($conf->multicurrency->enabled) && ($object->multicurrency_code != $conf->currency))
 		{
-		    // Multicurrency Amount HT
-		    print '<tr><td class="titlefieldmiddle">'.$form->editfieldkey('MulticurrencyAmountHT', 'multicurrency_total_ht', '', $object, 0).'</td>';
-		    print '<td class="nowrap">'.price($object->multicurrency_total_ht, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).'</td>';
-		    print '</tr>';
+			// Multicurrency Amount HT
+			print '<tr><td class="titlefieldmiddle">'.$form->editfieldkey('MulticurrencyAmountHT', 'multicurrency_total_ht', '', $object, 0).'</td>';
+			print '<td class="nowrap">'.price($object->multicurrency_total_ht, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).'</td>';
+			print '</tr>';
 
-		    // Multicurrency Amount VAT
-		    print '<tr><td>'.$form->editfieldkey('MulticurrencyAmountVAT', 'multicurrency_total_tva', '', $object, 0).'</td>';
-		    print '<td class="nowrap">'.price($object->multicurrency_total_tva, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).'</td>';
-		    print '</tr>';
+			// Multicurrency Amount VAT
+			print '<tr><td>'.$form->editfieldkey('MulticurrencyAmountVAT', 'multicurrency_total_tva', '', $object, 0).'</td>';
+			print '<td class="nowrap">'.price($object->multicurrency_total_tva, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).'</td>';
+			print '</tr>';
 
-		    // Multicurrency Amount TTC
-		    print '<tr><td>'.$form->editfieldkey('MulticurrencyAmountTTC', 'multicurrency_total_ttc', '', $object, 0).'</td>';
-		    print '<td class="nowrap">'.price($object->multicurrency_total_ttc, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).'</td>';
-		    print '</tr>';
+			// Multicurrency Amount TTC
+			print '<tr><td>'.$form->editfieldkey('MulticurrencyAmountTTC', 'multicurrency_total_ttc', '', $object, 0).'</td>';
+			print '<td class="nowrap">'.price($object->multicurrency_total_ttc, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).'</td>';
+			print '</tr>';
 		}
 
 		// Total HT
@@ -581,13 +581,13 @@ if ($id > 0 || !empty($ref))
 		// Amount Local Taxes
 		if ($mysoc->localtax1_assuj == "1" || $object->total_localtax1 != 0) 		// Localtax1
 		{
-		    print '<tr><td>'.$langs->transcountry("AmountLT1", $mysoc->country_code).'</td>';
-		    print '<td>'.price($object->total_localtax1, 1, '', 1, - 1, - 1, $conf->currency).'</td></tr>';
+			print '<tr><td>'.$langs->transcountry("AmountLT1", $mysoc->country_code).'</td>';
+			print '<td>'.price($object->total_localtax1, 1, '', 1, - 1, - 1, $conf->currency).'</td></tr>';
 		}
 		if ($mysoc->localtax2_assuj == "1" || $object->total_localtax2 != 0) 		// Localtax2 IRPF
 		{
-		    print '<tr><td>'.$langs->transcountry("AmountLT2", $mysoc->country_code).'</td>';
-		    print '<td>'.price($object->total_localtax2, 1, '', 1, - 1, - 1, $conf->currency).'</td></tr>';
+			print '<tr><td>'.$langs->transcountry("AmountLT2", $mysoc->country_code).'</td>';
+			print '<td>'.price($object->total_localtax2, 1, '', 1, - 1, - 1, $conf->currency).'</td></tr>';
 		}
 
 		// Total TTC
@@ -676,8 +676,8 @@ if ($id > 0 || !empty($ref))
 							$object->fetch_thirdparty();
 
 							$prod = new Product($db);
-	                        $prod->id = $objp->fk_product;
-	                        $prod->entity = $objp->entity;
+							$prod->id = $objp->fk_product;
+							$prod->entity = $objp->entity;
 							$prod->getMultiLangs();
 
 							$outputlangs = $langs;
@@ -700,25 +700,25 @@ if ($id > 0 || !empty($ref))
 						$product_static->type = $type;
 						$product_static->id = $objp->fk_product;
 						$product_static->ref = $objp->ref;
-	                    $product_static->entity = $objp->entity;
+						$product_static->entity = $objp->entity;
 
-	                    $product_static->weight = $objp->weight;
-	                    $product_static->weight_units = $objp->weight_units;
-	                    $product_static->length = $objp->length;
-	                    $product_static->length_units = $objp->length_units;
-	                    $product_static->width = $objp->width;
-	                    $product_static->width_units = $objp->width_units;
-	                    $product_static->height = $objp->height;
-	                    $product_static->height_units = $objp->height_units;
-	                    $product_static->surface = $objp->surface;
-	                    $product_static->surface_units = $objp->surface_units;
-	                    $product_static->volume = $objp->volume;
-	                    $product_static->volume_units = $objp->volume_units;
+						$product_static->weight = $objp->weight;
+						$product_static->weight_units = $objp->weight_units;
+						$product_static->length = $objp->length;
+						$product_static->length_units = $objp->length_units;
+						$product_static->width = $objp->width;
+						$product_static->width_units = $objp->width_units;
+						$product_static->height = $objp->height;
+						$product_static->height_units = $objp->height_units;
+						$product_static->surface = $objp->surface;
+						$product_static->surface_units = $objp->surface_units;
+						$product_static->volume = $objp->volume;
+						$product_static->volume_units = $objp->volume_units;
 
 						$text = $product_static->getNomUrl(1);
 						$text .= ' - '.$label;
 						$description = ($conf->global->PRODUIT_DESC_IN_FORM ? '' : dol_htmlentitiesbr($objp->description)).'<br>';
-	                    $description .= $product_static->show_photos('product', $conf->product->multidir_output[$product_static->entity], 1, 1, 0, 0, 0, 80);
+						$description .= $product_static->show_photos('product', $conf->product->multidir_output[$product_static->entity], 1, 1, 0, 0, 0, 80);
 						print $form->textwithtooltip($text, $description, 3, '', '', $i);
 
 						// Show range
@@ -845,8 +845,8 @@ if ($id > 0 || !empty($ref))
 		{
 			print '<div class="tabsAction">';
 
-            // Bouton expedier sans gestion des stocks
-            if (empty($conf->stock->enabled) && ($object->statut > Commande::STATUS_DRAFT && $object->statut < Commande::STATUS_CLOSED))
+			// Bouton expedier sans gestion des stocks
+			if (empty($conf->stock->enabled) && ($object->statut > Commande::STATUS_DRAFT && $object->statut < Commande::STATUS_CLOSED))
 			{
 				if ($user->rights->expedition->creer)
 				{
@@ -863,24 +863,24 @@ if ($id > 0 || !empty($ref))
 		}
 
 
-        // Bouton expedier avec gestion des stocks
+		// Bouton expedier avec gestion des stocks
 
-        if (!empty($conf->stock->enabled) && $object->statut == Commande::STATUS_DRAFT)
-        {
-            print $langs->trans("ValidateOrderFirstBeforeShipment");
-        }
+		if (!empty($conf->stock->enabled) && $object->statut == Commande::STATUS_DRAFT)
+		{
+			print $langs->trans("ValidateOrderFirstBeforeShipment");
+		}
 
 		if (!empty($conf->stock->enabled) && ($object->statut > Commande::STATUS_DRAFT && $object->statut < Commande::STATUS_CLOSED))
 		{
 			if ($user->rights->expedition->creer)
 			{
 				//print load_fiche_titre($langs->trans("CreateShipment"));
-                print '<div class="tabsAction">';
+				print '<div class="tabsAction">';
 
 				print '<form method="GET" action="'.DOL_URL_ROOT.'/expedition/card.php">';
 				print '<input type="hidden" name="action" value="create">';
 				//print '<input type="hidden" name="id" value="'.$object->id.'">';
-                print '<input type="hidden" name="shipping_method_id" value="'.$object->shipping_method_id.'">';
+				print '<input type="hidden" name="shipping_method_id" value="'.$object->shipping_method_id.'">';
 				print '<input type="hidden" name="origin" value="commande">';
 				print '<input type="hidden" name="origin_id" value="'.$object->id.'">';
 				print '<input type="hidden" name="projectid" value="'.$object->fk_project.'">';
diff --git a/htdocs/expedition/stats/index.php b/htdocs/expedition/stats/index.php
index d500a97ab71..fcc0d26f81c 100644
--- a/htdocs/expedition/stats/index.php
+++ b/htdocs/expedition/stats/index.php
@@ -36,8 +36,8 @@ $socid = GETPOST('socid', 'int');
 // Security check
 if ($user->socid > 0)
 {
-    $action = '';
-    $socid = $user->socid;
+	$action = '';
+	$socid = $user->socid;
 }
 
 $nowyear = strftime("%Y", dol_now());
@@ -73,34 +73,34 @@ $data = $stats->getNbByMonthWithPrevYear($endyear, $startyear);
 
 if (!$user->rights->societe->client->voir || $user->socid)
 {
-    $filenamenb = $dir.'/shipmentsnbinyear-'.$user->id.'-'.$year.'.png';
+	$filenamenb = $dir.'/shipmentsnbinyear-'.$user->id.'-'.$year.'.png';
 } else {
-    $filenamenb = $dir.'/shipmentsnbinyear-'.$year.'.png';
+	$filenamenb = $dir.'/shipmentsnbinyear-'.$year.'.png';
 }
 
 $px1 = new DolGraph();
 $mesg = $px1->isGraphKo();
 if (!$mesg)
 {
-    $px1->SetData($data);
-    $i = $startyear; $legend = array();
-    while ($i <= $endyear)
-    {
-        $legend[] = $i;
-        $i++;
-    }
-    $px1->SetLegend($legend);
-    $px1->SetMaxValue($px1->GetCeilMaxValue());
-    $px1->SetMinValue(min(0, $px1->GetFloorMinValue()));
-    $px1->SetWidth($WIDTH);
-    $px1->SetHeight($HEIGHT);
-    $px1->SetYLabel($langs->trans("NbOfSendings"));
-    $px1->SetShading(3);
-    $px1->SetHorizTickIncrement(1);
-    $px1->mode = 'depth';
-    $px1->SetTitle($langs->trans("NumberOfShipmentsByMonth"));
+	$px1->SetData($data);
+	$i = $startyear; $legend = array();
+	while ($i <= $endyear)
+	{
+		$legend[] = $i;
+		$i++;
+	}
+	$px1->SetLegend($legend);
+	$px1->SetMaxValue($px1->GetCeilMaxValue());
+	$px1->SetMinValue(min(0, $px1->GetFloorMinValue()));
+	$px1->SetWidth($WIDTH);
+	$px1->SetHeight($HEIGHT);
+	$px1->SetYLabel($langs->trans("NbOfSendings"));
+	$px1->SetShading(3);
+	$px1->SetHorizTickIncrement(1);
+	$px1->mode = 'depth';
+	$px1->SetTitle($langs->trans("NumberOfShipmentsByMonth"));
 
-    $px1->draw($filenamenb, $fileurlnb);
+	$px1->draw($filenamenb, $fileurlnb);
 }
 
 // Build graphic amount of object
@@ -293,9 +293,9 @@ print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 // Show graphs
 print '<table class="border centpercent"><tr class="pair nohover"><td class="center">';
 if ($mesg) { print $mesg; } else {
-    print $px1->show();
-    print "<br>\n";
-    /*print $px2->show();
+	print $px1->show();
+	print "<br>\n";
+	/*print $px2->show();
     print "<br>\n";
     print $px3->show();*/
 }
@@ -305,7 +305,7 @@ print '</td></tr></table>';
 print '</div></div></div>';
 print '<div style="clear:both"></div>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 
diff --git a/htdocs/expedition/stats/month.php b/htdocs/expedition/stats/month.php
index e24480a3e0d..74455d7dca2 100644
--- a/htdocs/expedition/stats/month.php
+++ b/htdocs/expedition/stats/month.php
@@ -54,14 +54,14 @@ $fileurl = DOL_URL_ROOT.'/viewimage.php?modulepart=expeditionstats&file=expediti
 $px = new DolGraph();
 $mesg = $px->isGraphKo();
 if (!$mesg) {
-    $px->SetData($data);
-    $px->SetMaxValue($px->GetCeilMaxValue());
-    $px->SetWidth($WIDTH);
-    $px->SetHeight($HEIGHT);
-    $px->SetYLabel($langs->trans("NbOfSendings"));
-    $px->SetShading(3);
-    $px->SetHorizTickIncrement(1);
-    $px->draw($filename, $fileurl);
+	$px->SetData($data);
+	$px->SetMaxValue($px->GetCeilMaxValue());
+	$px->SetWidth($WIDTH);
+	$px->SetHeight($HEIGHT);
+	$px->SetYLabel($langs->trans("NbOfSendings"));
+	$px->SetShading(3);
+	$px->SetHorizTickIncrement(1);
+	$px->draw($filename, $fileurl);
 }
 
 print '<table class="border centpercent">';
diff --git a/htdocs/expedition/tpl/linkedobjectblock.tpl.php b/htdocs/expedition/tpl/linkedobjectblock.tpl.php
index fbc1763beb3..897e35b8813 100644
--- a/htdocs/expedition/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/expedition/tpl/linkedobjectblock.tpl.php
@@ -39,36 +39,36 @@ $total = 0;
 $ilink = 0;
 foreach ($linkedObjectBlock as $key => $objectlink)
 {
-    $ilink++;
+	$ilink++;
 
-    $trclass = 'oddeven';
-    if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass .= ' liste_sub_total';
-    ?>
+	$trclass = 'oddeven';
+	if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass .= ' liste_sub_total';
+	?>
     <tr class="<?php echo $trclass; ?>">
         <td><?php echo $langs->trans("Shipment"); ?></td>
         <td><?php echo $objectlink->getNomUrl(1); ?></td>
         <td></td>
     	<td class="center"><?php echo dol_print_date($objectlink->date_delivery, 'day'); ?></td>
     	<td class="right"><?php
-    	if ($user->rights->expedition->lire) {
-    		$total = $total + $objectlink->total_ht;
-    		echo price($objectlink->total_ht);
-    	} ?></td>
+		if ($user->rights->expedition->lire) {
+			$total = $total + $objectlink->total_ht;
+			echo price($objectlink->total_ht);
+		} ?></td>
     	<td class="right"><?php echo $objectlink->getLibStatut(3); ?></td>
     	<td class="right">
     		<?php
-    		// For now, shipments must stay linked to order, so link is not deletable
-    		if ($object->element != 'commande') {
-    			?>
+			// For now, shipments must stay linked to order, so link is not deletable
+			if ($object->element != 'commande') {
+				?>
     			<a class="reposition" href="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key; ?>"><?php echo img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink'); ?></a></td>
     			<?php
-    		}
-    		?>
+			}
+			?>
     </tr>
     <?php
 }
 if (count($linkedObjectBlock) > 1) {
-    ?>
+	?>
     <tr class="liste_total <?php echo (empty($noMoreLinkedObjectBlockAfter) ? 'liste_sub_total' : ''); ?>">
         <td><?php echo $langs->trans("Total"); ?></td>
         <td></td>
diff --git a/htdocs/expensereport/ajax/ajaxprojet.php b/htdocs/expensereport/ajax/ajaxprojet.php
index 49a7bd4201e..62ceb504dac 100644
--- a/htdocs/expensereport/ajax/ajaxprojet.php
+++ b/htdocs/expensereport/ajax/ajaxprojet.php
@@ -67,18 +67,18 @@ if (GETPOST('fk_projet') != '')
 	{
 		while ($row = $db->fetch_array($resql))
 		{
-		    $label = $row['ref'].' - '.$row['title'];
-		    $row_array['label'] = $label;
+			$label = $row['ref'].' - '.$row['title'];
+			$row_array['label'] = $label;
 			$row_array['value'] = $label;
-	        $row_array['key'] = $row['rowid'];
+			$row_array['key'] = $row['rowid'];
 
-	        array_push($return_arr, $row_array);
-	    }
+			array_push($return_arr, $row_array);
+		}
 
-	    echo json_encode($return_arr);
+		echo json_encode($return_arr);
 	} else {
-	    echo json_encode(array('nom'=>'Error', 'label'=>'Error', 'key'=>'Error', 'value'=>'Error'));
+		echo json_encode(array('nom'=>'Error', 'label'=>'Error', 'key'=>'Error', 'value'=>'Error'));
 	}
 } else {
-    echo json_encode(array('nom'=>'ErrorBadParameter', 'label'=>'ErrorBadParameter', 'key'=>'ErrorBadParameter', 'value'=>'ErrorBadParameter'));
+	echo json_encode(array('nom'=>'ErrorBadParameter', 'label'=>'ErrorBadParameter', 'key'=>'ErrorBadParameter', 'value'=>'ErrorBadParameter'));
 }
diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index c0896151284..baf77227163 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -230,7 +230,7 @@ if (empty($reshook))
 			setEventMessages($langs->trans("NotEnoughPermission"), null, 'errors');
 		} else {
 			if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || empty($user->rights->expensereport->writeall_advance)) {
-				if (! in_array($object->fk_user_author, $childids)) {
+				if (!in_array($object->fk_user_author, $childids)) {
 					$error++;
 					setEventMessages($langs->trans("UserNotInHierachy"), null, 'errors');
 				}
@@ -1483,7 +1483,7 @@ if ($action == 'create')
 	print '<tbody>';
 	print '</table>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div class="center">';
 	print '<input type="submit" value="'.$langs->trans("AddTrip").'" name="bouton" class="button" />';
@@ -1616,7 +1616,7 @@ if ($action == 'create')
 
 				print '</table>';
 
-				dol_fiche_end();
+				print dol_get_fiche_end();
 
 				print '<div class="center">';
 				print '<input type="submit" value="'.$langs->trans("Modify").'" name="bouton" class="button">';
@@ -2543,7 +2543,7 @@ if ($action == 'create')
 
 				print '</form>';
 
-				dol_fiche_end();
+				print dol_get_fiche_end();
 			} // end edit or not edit
 		}	// end of if result
 		else {
diff --git a/htdocs/expensereport/class/api_expensereports.class.php b/htdocs/expensereport/class/api_expensereports.class.php
index 405ba52be93..aa892e50fc0 100644
--- a/htdocs/expensereport/class/api_expensereports.class.php
+++ b/htdocs/expensereport/class/api_expensereports.class.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2015   Jean-François Ferry     <jfefe@aternatik.fr>
  * Copyright (C) 2016   Laurent Destailleur     <eldy@users.sourceforge.net>
+ * Copyright (C) 2020		Frédéric France		<frederic.france@netlogic.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -29,172 +30,171 @@
 class ExpenseReports extends DolibarrApi
 {
 
-    /**
-     * @var array   $FIELDS     Mandatory fields, checked when create and update object
-     */
-    static $FIELDS = array(
-        'fk_user_author'
-    );
+	/**
+	 * @var array   $FIELDS     Mandatory fields, checked when create and update object
+	 */
+	static $FIELDS = array(
+		'fk_user_author'
+	);
 
-    /**
-     * @var ExpenseReport $expensereport {@type ExpenseReport}
-     */
-    public $expensereport;
+	/**
+	 * @var ExpenseReport $expensereport {@type ExpenseReport}
+	 */
+	public $expensereport;
 
 
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-        global $db, $conf;
-        $this->db = $db;
-        $this->expensereport = new ExpenseReport($this->db);
-    }
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		global $db, $conf;
+		$this->db = $db;
+		$this->expensereport = new ExpenseReport($this->db);
+	}
 
-    /**
-     * Get properties of a Expense Report object
-     *
-     * Return an array with Expense Report informations
-     *
-     * @param       int         $id         ID of Expense Report
-     * @return 	    array|mixed             Data without useless information
-     *
-     * @throws 	RestException
-     */
-    public function get($id)
-    {
-        if (!DolibarrApiAccess::$user->rights->expensereport->lire) {
-            throw new RestException(401);
-        }
+	/**
+	 * Get properties of a Expense Report object
+	 *
+	 * Return an array with Expense Report informations
+	 *
+	 * @param       int         $id         ID of Expense Report
+	 * @return 	    array|mixed             Data without useless information
+	 *
+	 * @throws 	RestException
+	 */
+	public function get($id)
+	{
+		if (!DolibarrApiAccess::$user->rights->expensereport->lire) {
+			throw new RestException(401);
+		}
 
-        $result = $this->expensereport->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Expense report not found');
-        }
+		$result = $this->expensereport->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Expense report not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('expensereport', $this->expensereport->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('expensereport', $this->expensereport->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        $this->expensereport->fetchObjectLinked();
-        return $this->_cleanObjectDatas($this->expensereport);
-    }
+		$this->expensereport->fetchObjectLinked();
+		return $this->_cleanObjectDatas($this->expensereport);
+	}
 
-    /**
-     * List Expense Reports
-     *
-     * Get a list of Expense Reports
-     *
-     * @param string	$sortfield	Sort field
-     * @param string	$sortorder	Sort order
-     * @param int		$limit		Limit for list
-     * @param int		$page		Page number
-     * @param string   	$user_ids   User ids filter field. Example: '1' or '1,2,3'          {@pattern /^[0-9,]*$/i}
-     * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"
-     * @return  array               Array of Expense Report objects
-     */
-    public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $user_ids = 0, $sqlfilters = '')
-    {
-        global $db, $conf;
+	/**
+	 * List Expense Reports
+	 *
+	 * Get a list of Expense Reports
+	 *
+	 * @param string	$sortfield	Sort field
+	 * @param string	$sortorder	Sort order
+	 * @param int		$limit		Limit for list
+	 * @param int		$page		Page number
+	 * @param string   	$user_ids   User ids filter field. Example: '1' or '1,2,3'          {@pattern /^[0-9,]*$/i}
+	 * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"
+	 * @return  array               Array of Expense Report objects
+	 */
+	public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $user_ids = 0, $sqlfilters = '')
+	{
+		global $db, $conf;
 
-        $obj_ret = array();
+		$obj_ret = array();
 
-        // case of external user, $societe param is ignored and replaced by user's socid
-        //$socid = DolibarrApiAccess::$user->socid ? DolibarrApiAccess::$user->socid : $societe;
+		// case of external user, $societe param is ignored and replaced by user's socid
+		//$socid = DolibarrApiAccess::$user->socid ? DolibarrApiAccess::$user->socid : $societe;
 
-        $sql = "SELECT t.rowid";
-        $sql .= " FROM ".MAIN_DB_PREFIX."expensereport as t";
-        $sql .= ' WHERE t.entity IN ('.getEntity('expensereport').')';
-        if ($user_ids) $sql .= " AND t.fk_user_author IN (".$user_ids.")";
+		$sql = "SELECT t.rowid";
+		$sql .= " FROM ".MAIN_DB_PREFIX."expensereport as t";
+		$sql .= ' WHERE t.entity IN ('.getEntity('expensereport').')';
+		if ($user_ids) $sql .= " AND t.fk_user_author IN (".$user_ids.")";
 
-        // Add sql filters
-        if ($sqlfilters)
-        {
-            if (!DolibarrApi::_checkFilters($sqlfilters))
-            {
-                throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
-            }
-            $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-        }
+		// Add sql filters
+		if ($sqlfilters)
+		{
+			if (!DolibarrApi::_checkFilters($sqlfilters)) {
+				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+			}
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
 
-        $sql .= $this->db->order($sortfield, $sortorder);
-        if ($limit) {
-            if ($page < 0)
-            {
-                $page = 0;
-            }
-            $offset = $limit * $page;
+		$sql .= $this->db->order($sortfield, $sortorder);
+		if ($limit) {
+			if ($page < 0) {
+				$page = 0;
+			}
+			$offset = $limit * $page;
 
-            $sql .= $this->db->plimit($limit + 1, $offset);
-        }
+			$sql .= $this->db->plimit($limit + 1, $offset);
+		}
 
-        $result = $this->db->query($sql);
+		$result = $this->db->query($sql);
 
-        if ($result)
-        {
-        	$num = $this->db->num_rows($result);
-            $min = min($num, ($limit <= 0 ? $num : $limit));
-            while ($i < $min)
-            {
-            	$obj = $this->db->fetch_object($result);
-                $expensereport_static = new ExpenseReport($this->db);
-                if ($expensereport_static->fetch($obj->rowid)) {
-                    $obj_ret[] = $this->_cleanObjectDatas($expensereport_static);
-                }
-                $i++;
-            }
-        } else {
-        	throw new RestException(503, 'Error when retrieve Expense Report list : '.$this->db->lasterror());
-        }
-        if (!count($obj_ret)) {
-            throw new RestException(404, 'No Expense Report found');
-        }
-        return $obj_ret;
-    }
+		if ($result)
+		{
+			$num = $this->db->num_rows($result);
+			$min = min($num, ($limit <= 0 ? $num : $limit));
+			$i = 0;
+			while ($i < $min)
+			{
+				$obj = $this->db->fetch_object($result);
+				$expensereport_static = new ExpenseReport($this->db);
+				if ($expensereport_static->fetch($obj->rowid)) {
+					$obj_ret[] = $this->_cleanObjectDatas($expensereport_static);
+				}
+				$i++;
+			}
+		} else {
+			throw new RestException(503, 'Error when retrieve Expense Report list : '.$this->db->lasterror());
+		}
+		if (!count($obj_ret)) {
+			throw new RestException(404, 'No Expense Report found');
+		}
+		return $obj_ret;
+	}
 
-    /**
-     * Create Expense Report object
-     *
-     * @param   array   $request_data   Request data
-     * @return  int                     ID of Expense Report
-     */
-    public function post($request_data = null)
-    {
-        if (!DolibarrApiAccess::$user->rights->expensereport->creer) {
-            throw new RestException(401, "Insuffisant rights");
-        }
-        // Check mandatory fields
-        $result = $this->_validate($request_data);
+	/**
+	 * Create Expense Report object
+	 *
+	 * @param   array   $request_data   Request data
+	 * @return  int                     ID of Expense Report
+	 */
+	public function post($request_data = null)
+	{
+		if (!DolibarrApiAccess::$user->rights->expensereport->creer) {
+			throw new RestException(401, "Insuffisant rights");
+		}
+		// Check mandatory fields
+		$result = $this->_validate($request_data);
 
-        foreach ($request_data as $field => $value) {
-            $this->expensereport->$field = $value;
-        }
-        /*if (isset($request_data["lines"])) {
+		foreach ($request_data as $field => $value) {
+			$this->expensereport->$field = $value;
+		}
+		/*if (isset($request_data["lines"])) {
           $lines = array();
           foreach ($request_data["lines"] as $line) {
             array_push($lines, (object) $line);
           }
           $this->expensereport->lines = $lines;
         }*/
-        if ($this->expensereport->create(DolibarrApiAccess::$user) < 0) {
-            throw new RestException(500, "Error creating expensereport", array_merge(array($this->expensereport->error), $this->expensereport->errors));
-        }
+		if ($this->expensereport->create(DolibarrApiAccess::$user) < 0) {
+			throw new RestException(500, "Error creating expensereport", array_merge(array($this->expensereport->error), $this->expensereport->errors));
+		}
 
-        return $this->expensereport->id;
-    }
+		return $this->expensereport->id;
+	}
 
-    /**
-     * Get lines of an Expense Report
-     *
-     * @param int   $id             Id of Expense Report
-     *
-     * @url	GET {id}/lines
-     *
-     * @return int
-     */
-    /*
+	/**
+	 * Get lines of an Expense Report
+	 *
+	 * @param int   $id             Id of Expense Report
+	 *
+	 * @url	GET {id}/lines
+	 *
+	 * @return int
+	 */
+	/*
     public function getLines($id)
     {
         if(! DolibarrApiAccess::$user->rights->expensereport->lire) {
@@ -218,17 +218,17 @@ class ExpenseReports extends DolibarrApi
     }
     */
 
-    /**
-     * Add a line to given Expense Report
-     *
-     * @param int   $id             Id of Expense Report to update
-     * @param array $request_data   Expense Report data
-     *
-     * @url	POST {id}/lines
-     *
-     * @return int
-     */
-    /*
+	/**
+	 * Add a line to given Expense Report
+	 *
+	 * @param int   $id             Id of Expense Report to update
+	 * @param array $request_data   Expense Report data
+	 *
+	 * @url	POST {id}/lines
+	 *
+	 * @return int
+	 */
+	/*
     public function postLine($id, $request_data = null)
     {
       if(! DolibarrApiAccess::$user->rights->expensereport->creer) {
@@ -280,18 +280,18 @@ class ExpenseReports extends DolibarrApi
     }
     */
 
-    /**
-     * Update a line to given Expense Report
-     *
-     * @param int   $id             Id of Expense Report to update
-     * @param int   $lineid         Id of line to update
-     * @param array $request_data   Expense Report data
-     *
-     * @url	PUT {id}/lines/{lineid}
-     *
-     * @return object
-     */
-    /*
+	/**
+	 * Update a line to given Expense Report
+	 *
+	 * @param int   $id             Id of Expense Report to update
+	 * @param int   $lineid         Id of line to update
+	 * @param array $request_data   Expense Report data
+	 *
+	 * @url	PUT {id}/lines/{lineid}
+	 *
+	 * @return object
+	 */
+	/*
     public function putLine($id, $lineid, $request_data = null)
     {
         if(! DolibarrApiAccess::$user->rights->expensereport->creer) {
@@ -340,17 +340,17 @@ class ExpenseReports extends DolibarrApi
     }
     */
 
-    /**
-     * Delete a line of given Expense Report
-     *
-     * @param int   $id             Id of Expense Report to update
-     * @param int   $lineid         Id of line to delete
-     *
-     * @url	DELETE {id}/lines/{lineid}
-     *
-     * @return int
-     */
-    /*
+	/**
+	 * Delete a line of given Expense Report
+	 *
+	 * @param int   $id             Id of Expense Report to update
+	 * @param int   $lineid         Id of line to delete
+	 *
+	 * @url	DELETE {id}/lines/{lineid}
+	 *
+	 * @return int
+	 */
+	/*
     public function deleteLine($id, $lineid)
     {
       if(! DolibarrApiAccess::$user->rights->expensereport->creer) {
@@ -376,94 +376,94 @@ class ExpenseReports extends DolibarrApi
     }
     */
 
-    /**
-     * Update Expense Report general fields (won't touch lines of expensereport)
-     *
-     * @param int   $id             Id of Expense Report to update
-     * @param array $request_data   Datas
-     *
-     * @return int
-     *
-     * @throws	RestException	401		Not allowed
-     * @throws  RestException	404		Expense report not found
-     * @throws	RestException	500
-     */
-    public function put($id, $request_data = null)
-    {
-        if (!DolibarrApiAccess::$user->rights->expensereport->creer) {
-            throw new RestException(401);
-        }
+	/**
+	 * Update Expense Report general fields (won't touch lines of expensereport)
+	 *
+	 * @param int   $id             Id of Expense Report to update
+	 * @param array $request_data   Datas
+	 *
+	 * @return int
+	 *
+	 * @throws	RestException	401		Not allowed
+	 * @throws  RestException	404		Expense report not found
+	 * @throws	RestException	500
+	 */
+	public function put($id, $request_data = null)
+	{
+		if (!DolibarrApiAccess::$user->rights->expensereport->creer) {
+			throw new RestException(401);
+		}
 
-        $result = $this->expensereport->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'expensereport not found');
-        }
+		$result = $this->expensereport->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'expensereport not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('expensereport', $this->expensereport->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
-        foreach ($request_data as $field => $value) {
-            if ($field == 'id') continue;
-            $this->expensereport->$field = $value;
-        }
+		if (!DolibarrApi::_checkAccessToResource('expensereport', $this->expensereport->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+		foreach ($request_data as $field => $value) {
+			if ($field == 'id') continue;
+			$this->expensereport->$field = $value;
+		}
 
-        if ($this->expensereport->update(DolibarrApiAccess::$user) > 0)
-        {
-            return $this->get($id);
-        } else {
-            throw new RestException(500, $this->expensereport->error);
-        }
-    }
+		if ($this->expensereport->update(DolibarrApiAccess::$user) > 0)
+		{
+			return $this->get($id);
+		} else {
+			throw new RestException(500, $this->expensereport->error);
+		}
+	}
 
-    /**
-     * Delete Expense Report
-     *
-     * @param   int     $id         Expense Report ID
-     *
-     * @return  array
-     */
-    public function delete($id)
-    {
-        if (!DolibarrApiAccess::$user->rights->expensereport->supprimer) {
-            throw new RestException(401);
-        }
-        $result = $this->expensereport->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Expense Report not found');
-        }
+	/**
+	 * Delete Expense Report
+	 *
+	 * @param   int     $id         Expense Report ID
+	 *
+	 * @return  array
+	 */
+	public function delete($id)
+	{
+		if (!DolibarrApiAccess::$user->rights->expensereport->supprimer) {
+			throw new RestException(401);
+		}
+		$result = $this->expensereport->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Expense Report not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('expensereport', $this->expensereport->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('expensereport', $this->expensereport->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        if (!$this->expensereport->delete(DolibarrApiAccess::$user)) {
-            throw new RestException(500, 'Error when delete Expense Report : '.$this->expensereport->error);
-        }
+		if (!$this->expensereport->delete(DolibarrApiAccess::$user)) {
+			throw new RestException(500, 'Error when delete Expense Report : '.$this->expensereport->error);
+		}
 
-        return array(
-            'success' => array(
-                'code' => 200,
-                'message' => 'Expense Report deleted'
-            )
-        );
-    }
+		return array(
+			'success' => array(
+				'code' => 200,
+				'message' => 'Expense Report deleted'
+			)
+		);
+	}
 
-    /**
-     * Validate an Expense Report
-     *
-     * @param   int $id             Expense Report ID
-     *
-     * @url POST    {id}/validate
-     *
-     * @return  array
-     * FIXME An error 403 is returned if the request has an empty body.
-     * Error message: "Forbidden: Content type `text/plain` is not supported."
-     * Workaround: send this in the body
-     * {
-     *   "idwarehouse": 0
-     * }
-     */
-    /*
+	/**
+	 * Validate an Expense Report
+	 *
+	 * @param   int $id             Expense Report ID
+	 *
+	 * @url POST    {id}/validate
+	 *
+	 * @return  array
+	 * FIXME An error 403 is returned if the request has an empty body.
+	 * Error message: "Forbidden: Content type `text/plain` is not supported."
+	 * Workaround: send this in the body
+	 * {
+	 *   "idwarehouse": 0
+	 * }
+	 */
+	/*
     public function validate($id, $idwarehouse=0)
     {
         if(! DolibarrApiAccess::$user->rights->expensereport->creer) {
@@ -490,75 +490,75 @@ class ExpenseReports extends DolibarrApi
         );
     }*/
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
-    /**
-     * Clean sensible object datas
-     *
-     * @param   object  $object    Object to clean
-     * @return    array    Array of cleaned object properties
-     */
-    protected function _cleanObjectDatas($object)
-    {
-        // phpcs:enable
-        $object = parent::_cleanObjectDatas($object);
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	/**
+	 * Clean sensible object datas
+	 *
+	 * @param   Object  $object     Object to clean
+	 * @return  Object              Object with cleaned properties
+	 */
+	protected function _cleanObjectDatas($object)
+	{
+		// phpcs:enable
+		$object = parent::_cleanObjectDatas($object);
 
-        unset($object->fk_statut);
-        unset($object->statut);
-        unset($object->user);
-        unset($object->thirdparty);
+		unset($object->fk_statut);
+		unset($object->statut);
+		unset($object->user);
+		unset($object->thirdparty);
 
-        unset($object->cond_reglement);
-        unset($object->shipping_method_id);
+		unset($object->cond_reglement);
+		unset($object->shipping_method_id);
 
-        unset($object->barcode_type);
-        unset($object->barcode_type_code);
-        unset($object->barcode_type_label);
-        unset($object->barcode_type_coder);
+		unset($object->barcode_type);
+		unset($object->barcode_type_code);
+		unset($object->barcode_type_label);
+		unset($object->barcode_type_coder);
 
-        unset($object->code_paiement);
-        unset($object->code_statut);
-        unset($object->fk_c_paiement);
-        unset($object->fk_incoterms);
-        unset($object->label_incoterms);
-        unset($object->location_incoterms);
-        unset($object->mode_reglement_id);
-        unset($object->cond_reglement_id);
+		unset($object->code_paiement);
+		unset($object->code_statut);
+		unset($object->fk_c_paiement);
+		unset($object->fk_incoterms);
+		unset($object->label_incoterms);
+		unset($object->location_incoterms);
+		unset($object->mode_reglement_id);
+		unset($object->cond_reglement_id);
 
-        unset($object->name);
-        unset($object->lastname);
-        unset($object->firstname);
-        unset($object->civility_id);
-        unset($object->cond_reglement_id);
-        unset($object->contact);
-        unset($object->contact_id);
+		unset($object->name);
+		unset($object->lastname);
+		unset($object->firstname);
+		unset($object->civility_id);
+		unset($object->cond_reglement_id);
+		unset($object->contact);
+		unset($object->contact_id);
 
-        unset($object->state);
-        unset($object->state_id);
-        unset($object->state_code);
-        unset($object->country);
-        unset($object->country_id);
-        unset($object->country_code);
+		unset($object->state);
+		unset($object->state_id);
+		unset($object->state_code);
+		unset($object->country);
+		unset($object->country_id);
+		unset($object->country_code);
 
-        unset($object->note); // We already use note_public and note_pricate
+		unset($object->note); // We already use note_public and note_pricate
 
-        return $object;
-    }
+		return $object;
+	}
 
-    /**
-     * Validate fields before create or update object
-     *
-     * @param   array           $data   Array with data to verify
-     * @return  array
-     * @throws  RestException
-     */
-    private function _validate($data)
-    {
-        $expensereport = array();
-        foreach (ExpenseReports::$FIELDS as $field) {
-            if (!isset($data[$field]))
-                throw new RestException(400, "$field field missing");
-            $expensereport[$field] = $data[$field];
-        }
-        return $expensereport;
-    }
+	/**
+	 * Validate fields before create or update object
+	 *
+	 * @param   array           $data   Array with data to verify
+	 * @return  array
+	 * @throws  RestException
+	 */
+	private function _validate($data)
+	{
+		$expensereport = array();
+		foreach (ExpenseReports::$FIELDS as $field) {
+			if (!isset($data[$field]))
+				throw new RestException(400, "$field field missing");
+			$expensereport[$field] = $data[$field];
+		}
+		return $expensereport;
+	}
 }
diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index d4dd0a9cb2e..611cf72593a 100644
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -1085,49 +1085,49 @@ class ExpenseReport extends CommonObject
 
 		$rowid = $this->id;
 
-        $error = 0;
+		$error = 0;
 
-        // Delete lines
-        $sql = 'DELETE FROM '.MAIN_DB_PREFIX.$this->table_element_line.' WHERE '.$this->fk_element.' = '.$rowid;
-        if (!$error && !$this->db->query($sql))
-        {
-        	$this->error = $this->db->error()." sql=".$sql;
-        	dol_syslog(get_class($this)."::delete ".$this->error, LOG_ERR);
-        	$error++;
-        }
+		// Delete lines
+		$sql = 'DELETE FROM '.MAIN_DB_PREFIX.$this->table_element_line.' WHERE '.$this->fk_element.' = '.$rowid;
+		if (!$error && !$this->db->query($sql))
+		{
+			$this->error = $this->db->error()." sql=".$sql;
+			dol_syslog(get_class($this)."::delete ".$this->error, LOG_ERR);
+			$error++;
+		}
 
-        // Delete llx_ecm_files
-        if (!$error) {
-        	$sql = 'DELETE FROM '.MAIN_DB_PREFIX."ecm_files WHERE src_object_type = '".$this->db->escape($this->table_element.(empty($this->module) ? '' : '@'.$this->module))."' AND src_object_id = ".$this->id;
-        	$resql = $this->db->query($sql);
-        	if (!$resql)
-        	{
-        		$this->error = $this->db->lasterror();
-        		$this->errors[] = $this->error;
-        		$error++;
-        	}
-        }
+		// Delete llx_ecm_files
+		if (!$error) {
+			$sql = 'DELETE FROM '.MAIN_DB_PREFIX."ecm_files WHERE src_object_type = '".$this->db->escape($this->table_element.(empty($this->module) ? '' : '@'.$this->module))."' AND src_object_id = ".$this->id;
+			$resql = $this->db->query($sql);
+			if (!$resql)
+			{
+				$this->error = $this->db->lasterror();
+				$this->errors[] = $this->error;
+				$error++;
+			}
+		}
 
-        // Delete main record
-        if (!$error) {
-            $sql = 'DELETE FROM '.MAIN_DB_PREFIX.$this->table_element.' WHERE rowid = '.$rowid;
-            $resql = $this->db->query($sql);
-            if (!$resql)
-            {
-                $this->error = $this->db->error()." sql=".$sql;
-                dol_syslog(get_class($this)."::delete ".$this->error, LOG_ERR);
-            }
-        }
+		// Delete main record
+		if (!$error) {
+			$sql = 'DELETE FROM '.MAIN_DB_PREFIX.$this->table_element.' WHERE rowid = '.$rowid;
+			$resql = $this->db->query($sql);
+			if (!$resql)
+			{
+				$this->error = $this->db->error()." sql=".$sql;
+				dol_syslog(get_class($this)."::delete ".$this->error, LOG_ERR);
+			}
+		}
 
-        // Commit or rollback
-        if ($error) {
-        	$this->db->rollback();
-        	return -1;
-        } else {
-        	$this->db->commit();
-        	return 1;
-        }
-    }
+		// Commit or rollback
+		if ($error) {
+			$this->db->rollback();
+			return -1;
+		} else {
+			$this->db->commit();
+			return 1;
+		}
+	}
 
 	/**
 	 * Set to status validate
@@ -1594,7 +1594,10 @@ class ExpenseReport extends CommonObject
 
 		if ($short) return $url;
 
-		$label = img_picto('', $this->picto).' <u>'.$langs->trans("ExpenseReport").'</u>';
+		$label = img_picto('', $this->picto).' <u class="paddingrightonly">'.$langs->trans("ExpenseReport").'</u>';
+		if (isset($this->status)) {
+			$label .= ' '.$this->getLibStatut(5);
+		}
 		if (!empty($this->ref))
 			$label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
 		if (!empty($this->total_ht))
@@ -1603,9 +1606,6 @@ class ExpenseReport extends CommonObject
 			$label .= '<br><b>'.$langs->trans('VAT').':</b> '.price($this->total_tva, 0, $langs, 0, -1, -1, $conf->currency);
 		if (!empty($this->total_ttc))
 			$label .= '<br><b>'.$langs->trans('AmountTTC').':</b> '.price($this->total_ttc, 0, $langs, 0, -1, -1, $conf->currency);
-		if (isset($this->status)) {
-				$label .= '<br><b>'.$langs->trans("Status").":</b> ".$this->getLibStatut(5);
-		}
 		if ($moretitle) $label .= ' - '.$moretitle;
 
 		//if ($option != 'nolink')
@@ -2206,13 +2206,13 @@ class ExpenseReport extends CommonObject
 
 		$langs->load("trips");
 
-	    if (!dol_strlen($modele)) {
-		    if ($this->modelpdf) {
-			    $modele = $this->modelpdf;
-		    } elseif (!empty($conf->global->EXPENSEREPORT_ADDON_PDF)) {
-			    $modele = $conf->global->EXPENSEREPORT_ADDON_PDF;
-		    }
-	    }
+		if (!dol_strlen($modele)) {
+			if ($this->modelpdf) {
+				$modele = $this->modelpdf;
+			} elseif (!empty($conf->global->EXPENSEREPORT_ADDON_PDF)) {
+				$modele = $conf->global->EXPENSEREPORT_ADDON_PDF;
+			}
+		}
 
 		if (!empty($modele)) {
 			$modelpath = "core/modules/expensereport/doc/";
@@ -2221,7 +2221,7 @@ class ExpenseReport extends CommonObject
 		} else {
 			return 0;
 		}
-    }
+	}
 
 	/**
 	 * List of types
diff --git a/htdocs/expensereport/class/expensereport_ik.class.php b/htdocs/expensereport/class/expensereport_ik.class.php
index 59de531a662..489b2671cf5 100644
--- a/htdocs/expensereport/class/expensereport_ik.class.php
+++ b/htdocs/expensereport/class/expensereport_ik.class.php
@@ -68,28 +68,28 @@ class ExpenseReportIk extends CoreObject
 	 */
 	public $ikoffset;
 
-    /**
-     * Attribute object linked with database
-     * @var array
-     */
+	/**
+	 * Attribute object linked with database
+	 * @var array
+	 */
 	public $fields = array(
 		'rowid'=>array('type'=>'integer', 'index'=>true)
 		,'fk_c_exp_tax_cat'=>array('type'=>'integer', 'index'=>true)
-	    ,'fk_range'=>array('type'=>'integer', 'index'=>true)
+		,'fk_range'=>array('type'=>'integer', 'index'=>true)
 		,'coef'=>array('type'=>'double')
 		,'ikoffset'=>array('type'=>'double')
 	);
 
-    /**
-     *  Constructor
-     *
-     *  @param      DoliDB		$db      Database handler
-     */
+	/**
+	 *  Constructor
+	 *
+	 *  @param      DoliDB		$db      Database handler
+	 */
 	public function __construct(DoliDB &$db)
 	{
 		global $conf;
 
-        parent::__construct($db);
+		parent::__construct($db);
 		parent::init();
 
 		$this->errors = array();
@@ -129,15 +129,15 @@ class ExpenseReportIk extends CoreObject
 		return $categories;
 	}
 
-    /**
-     * Return an array of ranges for a user
-     *
-     * @param User  $userauthor         user author id
-     * @param int   $fk_c_exp_tax_cat   category
-     * @return boolean|array
-     */
-    public static function getRangeByUser(User $userauthor, $fk_c_exp_tax_cat)
-    {
+	/**
+	 * Return an array of ranges for a user
+	 *
+	 * @param User  $userauthor         user author id
+	 * @param int   $fk_c_exp_tax_cat   category
+	 * @return boolean|array
+	 */
+	public static function getRangeByUser(User $userauthor, $fk_c_exp_tax_cat)
+	{
 		$default_range = (int) $userauthor->default_range; // if not defined, then 0
 		$ranges = self::getRangesByCategory($fk_c_exp_tax_cat);
 
diff --git a/htdocs/expensereport/class/expensereportstats.class.php b/htdocs/expensereport/class/expensereportstats.class.php
index 174c2be4ccf..c4167e3002f 100644
--- a/htdocs/expensereport/class/expensereportstats.class.php
+++ b/htdocs/expensereport/class/expensereportstats.class.php
@@ -30,19 +30,19 @@ require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
  */
 class ExpenseReportStats extends Stats
 {
-    /**
+	/**
 	 * @var string Name of table without prefix where object is stored
 	 */
 	public $table_element;
 
-    public $socid;
-    public $userid;
+	public $socid;
+	public $userid;
 
-    public $from;
-    public $field;
-    public $where;
+	public $from;
+	public $field;
+	public $where;
 
-    private $datetouse = 'date_valid';
+	private $datetouse = 'date_valid';
 
 
 	/**
@@ -50,7 +50,7 @@ class ExpenseReportStats extends Stats
 	 *
 	 * @param 	DoliDB		$db		   Database handler
 	 * @param 	int			$socid	   Id third party
-     * @param   int			$userid    Id user for filter
+	 * @param   int			$userid    Id user for filter
 	 * @return 	void
 	 */
 	public function __construct($db, $socid = 0, $userid = 0)
@@ -58,8 +58,8 @@ class ExpenseReportStats extends Stats
 		global $conf, $user;
 
 		$this->db = $db;
-        $this->socid = $socid;
-        $this->userid = $userid;
+		$this->socid = $socid;
+		$this->userid = $userid;
 
 		$object = new ExpenseReport($this->db);
 		$this->from = MAIN_DB_PREFIX.$object->table_element." as e";
@@ -107,7 +107,7 @@ class ExpenseReportStats extends Stats
 	 * 	Renvoie le nombre de facture par mois pour une annee donnee
 	 *
 	 *	@param	string	$year		Year to scan
-     *	@param	int		$format		0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
+	 *	@param	int		$format		0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
 	 *	@return	array				Array of values
 	 */
 	public function getNbByMonth($year, $format = 0)
@@ -117,7 +117,7 @@ class ExpenseReportStats extends Stats
 		$sql .= " WHERE YEAR(e.".$this->datetouse.") = ".$year;
 		$sql .= " AND ".$this->where;
 		$sql .= " GROUP BY dm";
-        $sql .= $this->db->order('dm', 'DESC');
+		$sql .= $this->db->order('dm', 'DESC');
 
 		$res = $this->_getNbByMonth($year, $sql, $format);
 		//var_dump($res);print '<br>';
@@ -129,7 +129,7 @@ class ExpenseReportStats extends Stats
 	 * 	Renvoie le montant de facture par mois pour une annee donnee
 	 *
 	 *	@param	int		$year		Year to scan
-     *	@param	int		$format		0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
+	 *	@param	int		$format		0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
 	 *	@return	array				Array of values
 	 */
 	public function getAmountByMonth($year, $format = 0)
@@ -159,7 +159,7 @@ class ExpenseReportStats extends Stats
 		$sql .= " WHERE date_format(".$this->db->ifsql('e.'.$this->datetouse.' IS NULL', 'e.date_create', 'e.'.$this->datetouse).",'%Y') = '".$this->db->escape($year)."'";
 		$sql .= " AND ".$this->where;
 		$sql .= " GROUP BY dm";
-        $sql .= $this->db->order('dm', 'DESC');
+		$sql .= $this->db->order('dm', 'DESC');
 
 		return $this->_getAverageByMonth($year, $sql);
 	}
@@ -175,8 +175,8 @@ class ExpenseReportStats extends Stats
 		$sql .= " FROM ".$this->from;
 		$sql .= " WHERE ".$this->where;
 		$sql .= " GROUP BY year";
-        $sql .= $this->db->order('year', 'DESC');
+		$sql .= $this->db->order('year', 'DESC');
 
-        return $this->_getAllByYear($sql);
-    }
+		return $this->_getAllByYear($sql);
+	}
 }
diff --git a/htdocs/expensereport/class/paymentexpensereport.class.php b/htdocs/expensereport/class/paymentexpensereport.class.php
index cad3d62420e..be8693f223e 100644
--- a/htdocs/expensereport/class/paymentexpensereport.class.php
+++ b/htdocs/expensereport/class/paymentexpensereport.class.php
@@ -40,7 +40,7 @@ class PaymentExpenseReport extends CommonObject
 	 */
 	public $table_element = 'payment_expensereport';
 
-    /**
+	/**
 	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
 	 */
 	public $picto = 'payment';
@@ -51,40 +51,40 @@ class PaymentExpenseReport extends CommonObject
 	public $rowid;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_expensereport;
 
 	public $datec = '';
 	public $tms = '';
 	public $datep = '';
-    public $amount; // Total amount of payment
-    public $amounts = array(); // Array of amounts
+	public $amount; // Total amount of payment
+	public $amounts = array(); // Array of amounts
 
-    /**
-     * @var int ID
-     */
+	/**
+	 * @var int ID
+	 */
 	public $fk_typepayment;
 
 	public $num_payment;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_bank;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_user_creat;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_user_modif;
 
-    public $type_code;
-    public $type_label;
+	public $type_code;
+	public $type_label;
 
 
 	/**
@@ -99,8 +99,8 @@ class PaymentExpenseReport extends CommonObject
 
 	/**
 	 *  Create payment of expense report into database.
-     *  Use this->amounts to have list of lines for the payment
-     *
+	 *  Use this->amounts to have list of lines for the payment
+	 *
 	 *  @param      User		$user   User making payment
 	 *  @return     int     			<0 if KO, id of payment if OK
 	 */
@@ -110,9 +110,9 @@ class PaymentExpenseReport extends CommonObject
 
 		$error = 0;
 
-        $now = dol_now();
+		$now = dol_now();
 
-        // Validate parameters
+		// Validate parameters
 		if (!$this->datepaid) {
 			$this->error = 'ErrorBadValueForParameterCreatePaymentExpenseReport';
 			return -1;
@@ -129,17 +129,17 @@ class PaymentExpenseReport extends CommonObject
 		if (isset($this->fk_user_creat))	$this->fk_user_creat = trim($this->fk_user_creat);
 		if (isset($this->fk_user_modif))	$this->fk_user_modif = trim($this->fk_user_modif);
 
-        $totalamount = 0;
-        foreach ($this->amounts as $key => $value)  // How payment is dispatch
-        {
-            $newvalue = price2num($value, 'MT');
-            $this->amounts[$key] = $newvalue;
-            $totalamount += $newvalue;
-        }
-        $totalamount = price2num($totalamount);
+		$totalamount = 0;
+		foreach ($this->amounts as $key => $value)  // How payment is dispatch
+		{
+			$newvalue = price2num($value, 'MT');
+			$this->amounts[$key] = $newvalue;
+			$totalamount += $newvalue;
+		}
+		$totalamount = price2num($totalamount);
 
-        // Check parameters
-        if ($totalamount == 0) return -1; // On accepte les montants negatifs pour les rejets de prelevement mais pas null
+		// Check parameters
+		if ($totalamount == 0) return -1; // On accepte les montants negatifs pour les rejets de prelevement mais pas null
 
 
 		$this->db->begin();
@@ -166,8 +166,8 @@ class PaymentExpenseReport extends CommonObject
 
 		if ($totalamount != 0 && !$error)
 		{
-		    $this->amount = $totalamount;
-		    $this->db->commit();
+			$this->amount = $totalamount;
+			$this->db->commit();
 			return $this->id;
 		} else {
 			$this->error = $this->db->error();
@@ -242,7 +242,7 @@ class PaymentExpenseReport extends CommonObject
 		}
 	}
 
-    // phpcs:disable Generic.CodeAnalysis.UnusedFunctionParameter
+	// phpcs:disable Generic.CodeAnalysis.UnusedFunctionParameter
 	/**
 	 *  Update database
 	 *
@@ -311,7 +311,7 @@ class PaymentExpenseReport extends CommonObject
 		}
 	}
 
-    // phpcs:disable Generic.CodeAnalysis.UnusedFunctionParameter
+	// phpcs:disable Generic.CodeAnalysis.UnusedFunctionParameter
 	/**
 	 *  Delete object in database
 	 *
@@ -327,15 +327,15 @@ class PaymentExpenseReport extends CommonObject
 
 		$this->db->begin();
 
-	    if (!$error)
-        {
-            $sql = "DELETE FROM ".MAIN_DB_PREFIX."bank_url";
-            $sql .= " WHERE type='payment_expensereport' AND url_id=".$this->id;
+		if (!$error)
+		{
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX."bank_url";
+			$sql .= " WHERE type='payment_expensereport' AND url_id=".$this->id;
 
-            dol_syslog(get_class($this)."::delete", LOG_DEBUG);
-            $resql = $this->db->query($sql);
-            if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
-        }
+			dol_syslog(get_class($this)."::delete", LOG_DEBUG);
+			$resql = $this->db->query($sql);
+			if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+		}
 
 		if (!$error)
 		{
@@ -345,9 +345,9 @@ class PaymentExpenseReport extends CommonObject
 			dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 			$resql = $this->db->query($sql);
 			if (!$resql) {
-                $error++;
-                $this->errors[] = "Error ".$this->db->lasterror();
-            }
+				$error++;
+				$this->errors[] = "Error ".$this->db->lasterror();
+			}
 		}
 
 		// Commit or rollback
@@ -424,10 +424,10 @@ class PaymentExpenseReport extends CommonObject
 	 */
 	public function getLibStatut($mode = 0)
 	{
-	    return '';
+		return '';
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Renvoi le libelle d'un statut donne
 	 *
@@ -435,21 +435,21 @@ class PaymentExpenseReport extends CommonObject
 	 *  @param  int		$mode          	0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
 	 *  @return string 			       	Libelle du statut
 	 */
-    public function LibStatut($status, $mode = 0)
-    {
-        // phpcs:enable
-        global $langs;
+	public function LibStatut($status, $mode = 0)
+	{
+		// phpcs:enable
+		global $langs;
 
-        return '';
-    }
+		return '';
+	}
 
 
 	/**
-     *  Initialise an instance with random values.
-     *  Used to build previews or test instances.
-     *	id must be 0 if object instance is a specimen.
-     *
-     *  @return	void
+	 *  Initialise an instance with random values.
+	 *  Used to build previews or test instances.
+	 *	id must be 0 if object instance is a specimen.
+	 *
+	 *  @return	void
 	 */
 	public function initAsSpecimen()
 	{
@@ -469,115 +469,115 @@ class PaymentExpenseReport extends CommonObject
 	}
 
 
-    /**
-     *      Add record into bank for payment with links between this bank record and invoices of payment.
-     *      All payment properties must have been set first like after a call to create().
-     *
-     *      @param	User	$user               Object of user making payment
-     *      @param  string	$mode               'payment_expensereport'
-     *      @param  string	$label              Label to use in bank record
-     *      @param  int		$accountid          Id of bank account to do link with
-     *      @param  string	$emetteur_nom       Name of transmitter
-     *      @param  string	$emetteur_banque    Name of bank
-     *      @return int                 		<0 if KO, >0 if OK
-     */
-    public function addPaymentToBank($user, $mode, $label, $accountid, $emetteur_nom, $emetteur_banque)
-    {
-        global $langs, $conf;
+	/**
+	 *      Add record into bank for payment with links between this bank record and invoices of payment.
+	 *      All payment properties must have been set first like after a call to create().
+	 *
+	 *      @param	User	$user               Object of user making payment
+	 *      @param  string	$mode               'payment_expensereport'
+	 *      @param  string	$label              Label to use in bank record
+	 *      @param  int		$accountid          Id of bank account to do link with
+	 *      @param  string	$emetteur_nom       Name of transmitter
+	 *      @param  string	$emetteur_banque    Name of bank
+	 *      @return int                 		<0 if KO, >0 if OK
+	 */
+	public function addPaymentToBank($user, $mode, $label, $accountid, $emetteur_nom, $emetteur_banque)
+	{
+		global $langs, $conf;
 
-        $error = 0;
+		$error = 0;
 
-        if (!empty($conf->banque->enabled))
-        {
-            include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+		if (!empty($conf->banque->enabled))
+		{
+			include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 
-            $acc = new Account($this->db);
-            $acc->fetch($accountid);
+			$acc = new Account($this->db);
+			$acc->fetch($accountid);
 
-            //Fix me field
-            $total = $this->amount;
+			//Fix me field
+			$total = $this->amount;
 
-            if ($mode == 'payment_expensereport') $amount = $total;
+			if ($mode == 'payment_expensereport') $amount = $total;
 
-            // Insert payment into llx_bank
-            $bank_line_id = $acc->addline(
-                $this->datepaid,
-                $this->fk_typepayment, // Payment mode id or code ("CHQ or VIR for example")
-                $label,
-                -$amount,
-                $this->num_payment,
-                '',
-                $user,
-                $emetteur_nom,
-                $emetteur_banque
-            );
+			// Insert payment into llx_bank
+			$bank_line_id = $acc->addline(
+				$this->datepaid,
+				$this->fk_typepayment, // Payment mode id or code ("CHQ or VIR for example")
+				$label,
+				-$amount,
+				$this->num_payment,
+				'',
+				$user,
+				$emetteur_nom,
+				$emetteur_banque
+			);
 
-            // Update fk_bank in llx_paiement.
-            // On connait ainsi le paiement qui a genere l'ecriture bancaire
-            if ($bank_line_id > 0)
-            {
-                $result = $this->update_fk_bank($bank_line_id);
-                if ($result <= 0)
-                {
-                    $error++;
-                    dol_print_error($this->db);
-                }
+			// Update fk_bank in llx_paiement.
+			// On connait ainsi le paiement qui a genere l'ecriture bancaire
+			if ($bank_line_id > 0)
+			{
+				$result = $this->update_fk_bank($bank_line_id);
+				if ($result <= 0)
+				{
+					$error++;
+					dol_print_error($this->db);
+				}
 
-                // Add link 'payment', 'payment_supplier', 'payment_expensereport' in bank_url between payment and bank transaction
-                $url = '';
-                if ($mode == 'payment_expensereport') $url = DOL_URL_ROOT.'/expensereport/payment/card.php?rowid=';
-                if ($url)
-                {
-                    $result = $acc->add_url_line($bank_line_id, $this->id, $url, '(paiement)', $mode);
-                    if ($result <= 0)
-                    {
-                        $error++;
-                        dol_print_error($this->db);
-                    }
-                }
+				// Add link 'payment', 'payment_supplier', 'payment_expensereport' in bank_url between payment and bank transaction
+				$url = '';
+				if ($mode == 'payment_expensereport') $url = DOL_URL_ROOT.'/expensereport/payment/card.php?rowid=';
+				if ($url)
+				{
+					$result = $acc->add_url_line($bank_line_id, $this->id, $url, '(paiement)', $mode);
+					if ($result <= 0)
+					{
+						$error++;
+						dol_print_error($this->db);
+					}
+				}
 
-                // Add link 'user' in bank_url between user and bank transaction
-                if (!$error)
-                {
-                    foreach ($this->amounts as $key => $value)  // We should have always same user but we loop in case of.
-                    {
-                    	if ($mode == 'payment_expensereport')
-                        {
-                        	$fuser = new User($this->db);
-                            $fuser->fetch($key);
+				// Add link 'user' in bank_url between user and bank transaction
+				if (!$error)
+				{
+					foreach ($this->amounts as $key => $value)  // We should have always same user but we loop in case of.
+					{
+						if ($mode == 'payment_expensereport')
+						{
+							$fuser = new User($this->db);
+							$fuser->fetch($key);
 
-                            $result = $acc->add_url_line(
-                                $bank_line_id,
-                                $fuser->id,
-                                DOL_URL_ROOT.'/user/card.php?id=',
-                                $fuser->getFullName($langs),
-                                'user'
-                            );
-                            if ($result <= 0)
-                            {
-                            	$this->error = $this->db->lasterror();
-                            	dol_syslog(get_class($this).'::addPaymentToBank '.$this->error);
-                            	$error++;
-                            }
-                        }
-                    }
-                }
-            } else {
-                $this->error = $acc->error;
-                $error++;
-            }
-        }
+							$result = $acc->add_url_line(
+								$bank_line_id,
+								$fuser->id,
+								DOL_URL_ROOT.'/user/card.php?id=',
+								$fuser->getFullName($langs),
+								'user'
+							);
+							if ($result <= 0)
+							{
+								$this->error = $this->db->lasterror();
+								dol_syslog(get_class($this).'::addPaymentToBank '.$this->error);
+								$error++;
+							}
+						}
+					}
+				}
+			} else {
+				$this->error = $acc->error;
+				$error++;
+			}
+		}
 
-        if (!$error)
-        {
-            return 1;
-        } else {
-            return -1;
-        }
-    }
+		if (!$error)
+		{
+			return 1;
+		} else {
+			return -1;
+		}
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Update link between the expense report payment and the generated line in llx_bank
 	 *
@@ -586,7 +586,7 @@ class PaymentExpenseReport extends CommonObject
 	 */
 	public function update_fk_bank($id_bank)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$sql = "UPDATE ".MAIN_DB_PREFIX."payment_expensereport SET fk_bank = ".$id_bank." WHERE rowid = ".$this->id;
 
 		dol_syslog(get_class($this)."::update_fk_bank", LOG_DEBUG);
@@ -614,14 +614,14 @@ class PaymentExpenseReport extends CommonObject
 		$result = '';
 
 		if (empty($this->ref)) $this->ref = $this->label;
-        $label = $langs->trans("ShowPayment").': '.$this->ref;
+		$label = $langs->trans("ShowPayment").': '.$this->ref;
 
 		if (!empty($this->id))
 		{
 			$link = '<a href="'.DOL_URL_ROOT.'/expensereport/payment/card.php?id='.$this->id.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
 			$linkend = '</a>';
 
-            if ($withpicto) $result .= ($link.img_object($label, 'payment', 'class="classfortooltip"').$linkend.' ');
+			if ($withpicto) $result .= ($link.img_object($label, 'payment', 'class="classfortooltip"').$linkend.' ');
 			if ($withpicto && $withpicto != 2) $result .= ' ';
 			if ($withpicto != 2) $result .= $link.($maxlen ?dol_trunc($this->ref, $maxlen) : $this->ref).$linkend;
 		}
@@ -635,8 +635,8 @@ class PaymentExpenseReport extends CommonObject
 	 *    @param   int     $id      Payment id
 	 *    @return  void
 	 */
-    public function info($id)
-    {
+	public function info($id)
+	{
 		$sql = 'SELECT e.rowid, e.datec, e.fk_user_creat, e.fk_user_modif, e.tms';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'payment_expensereport as e';
 		$sql .= ' WHERE e.rowid = '.$id;
@@ -669,5 +669,5 @@ class PaymentExpenseReport extends CommonObject
 		} else {
 			dol_print_error($this->db);
 		}
-    }
+	}
 }
diff --git a/htdocs/expensereport/document.php b/htdocs/expensereport/document.php
index 531140e1b2a..55799b10589 100644
--- a/htdocs/expensereport/document.php
+++ b/htdocs/expensereport/document.php
@@ -132,24 +132,24 @@ if ($object->id)
 	print '<div class="fichecenter">';
 	print '<div class="underbanner clearboth"></div>';
 
-    print '<table class="border tableforfield centpercent">';
+	print '<table class="border tableforfield centpercent">';
 
-    $linkback = '<a href="'.DOL_URL_ROOT.'/expensereport/list.php'.(!empty($socid) ? '?socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
+	$linkback = '<a href="'.DOL_URL_ROOT.'/expensereport/list.php'.(!empty($socid) ? '?socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
-    print '<tr><td class="titlefield">'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
-    print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.dol_print_size($totalsize, 1, 1).'</td></tr>';
-    print '</table>';
+	print '<tr><td class="titlefield">'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
+	print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.dol_print_size($totalsize, 1, 1).'</td></tr>';
+	print '</table>';
 
-    print '</div>';
+	print '</div>';
 
-    dol_fiche_end();
+	print dol_get_fiche_end();
 
 
-    $modulepart = 'expensereport';
-    $permission = $user->rights->expensereport->creer;
-    $permtoedit = $user->rights->expensereport->creer;
-    $param = '&id='.$object->id;
-    include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
+	$modulepart = 'expensereport';
+	$permission = $user->rights->expensereport->creer;
+	$permtoedit = $user->rights->expensereport->creer;
+	$param = '&id='.$object->id;
+	include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
 } else {
 	print $langs->trans("ErrorUnknown");
 }
diff --git a/htdocs/expensereport/index.php b/htdocs/expensereport/index.php
index 3c30154f7f1..046bde4efa1 100644
--- a/htdocs/expensereport/index.php
+++ b/htdocs/expensereport/index.php
@@ -80,11 +80,11 @@ $sql .= " FROM ".MAIN_DB_PREFIX."expensereport as d, ".MAIN_DB_PREFIX."expensere
 $sql .= " WHERE de.fk_expensereport = d.rowid AND d.entity IN (".getEntity('expensereport').") AND de.fk_c_type_fees = tf.id";
 // RESTRICT RIGHTS
 if (empty($user->rights->expensereport->readall) && empty($user->rights->expensereport->lire_tous)
-    && (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || empty($user->rights->expensereport->writeall_advance)))
+	&& (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || empty($user->rights->expensereport->writeall_advance)))
 {
-    $childids = $user->getAllChildIds();
-    $childids[] = $user->id;
-    $sql .= " AND d.fk_user_author IN (".join(',', $childids).")\n";
+	$childids = $user->getAllChildIds();
+	$childids[] = $user->id;
+	$sql .= " AND d.fk_user_author IN (".join(',', $childids).")\n";
 }
 
 $sql .= " GROUP BY tf.code, tf.label";
@@ -92,22 +92,22 @@ $sql .= " GROUP BY tf.code, tf.label";
 $result = $db->query($sql);
 if ($result)
 {
-    $num = $db->num_rows($result);
-    $i = 0;
-    while ($i < $num)
-    {
-        $objp = $db->fetch_object($result);
+	$num = $db->num_rows($result);
+	$i = 0;
+	while ($i < $num)
+	{
+		$objp = $db->fetch_object($result);
 
-        $somme[$objp->code] = $objp->km;
-        $nb[$objp->code] = $objp->nb;
-        $label[$objp->code] = $objp->label;
-        $totalnb += $objp->nb;
-        $totalsum += $objp->km;
-        $i++;
-    }
-    $db->free($result);
+		$somme[$objp->code] = $objp->km;
+		$nb[$objp->code] = $objp->nb;
+		$label[$objp->code] = $objp->label;
+		$totalnb += $objp->nb;
+		$totalsum += $objp->km;
+		$i++;
+	}
+	$db->free($result);
 } else {
-    dol_print_error($db);
+	dol_print_error($db);
 }
 
 
@@ -125,26 +125,26 @@ print "</tr>\n";
 $listoftype = $tripandexpense_static->listOfTypes();
 foreach ($listoftype as $code => $label)
 {
-    $dataseries[] = array($label, (isset($somme[$code]) ? (int) $somme[$code] : 0));
+	$dataseries[] = array($label, (isset($somme[$code]) ? (int) $somme[$code] : 0));
 }
 
 if ($conf->use_javascript_ajax)
 {
-    print '<tr><td class="center" colspan="4">';
+	print '<tr><td class="center" colspan="4">';
 
-    include_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
-    $dolgraph = new DolGraph();
-    $dolgraph->SetData($dataseries);
-    $dolgraph->setHeight(350);
-    $dolgraph->combine = empty($conf->global->MAIN_EXPENSEREPORT_COMBINE_GRAPH_STAT) ? 0.05 : $conf->global->MAIN_EXPENSEREPORT_COMBINE_GRAPH_STAT;
-    $dolgraph->setShowLegend(2);
-    $dolgraph->setShowPercent(1);
-    $dolgraph->SetType(array('pie'));
-    $dolgraph->setHeight('200');
-    $dolgraph->draw('idgraphstatus');
-    print $dolgraph->show($totalnb ? 0 : 1);
+	include_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
+	$dolgraph = new DolGraph();
+	$dolgraph->SetData($dataseries);
+	$dolgraph->setHeight(350);
+	$dolgraph->combine = empty($conf->global->MAIN_EXPENSEREPORT_COMBINE_GRAPH_STAT) ? 0.05 : $conf->global->MAIN_EXPENSEREPORT_COMBINE_GRAPH_STAT;
+	$dolgraph->setShowLegend(2);
+	$dolgraph->setShowPercent(1);
+	$dolgraph->SetType(array('pie'));
+	$dolgraph->setHeight('200');
+	$dolgraph->draw('idgraphstatus');
+	print $dolgraph->show($totalnb ? 0 : 1);
 
-    print '</td></tr>';
+	print '</td></tr>';
 }
 
 print '<tr class="liste_total">';
@@ -165,18 +165,18 @@ $max = 10;
 
 $langs->load("boxes");
 
-$sql = "SELECT u.rowid as uid, u.lastname, u.firstname, u.login, u.statut, u.photo, u.email, u.admin";
-$sql .= ", d.rowid, d.ref, d.date_debut as dated, d.date_fin as datef, d.date_create as dm, d.total_ht, d.total_ttc, d.fk_statut as fk_status";
+$sql = "SELECT u.rowid as uid, u.lastname, u.firstname, u.login, u.statut as user_status, u.photo, u.email, u.admin,";
+$sql .= " d.rowid, d.ref, d.date_debut as dated, d.date_fin as datef, d.date_create as dm, d.total_ht, d.total_ttc, d.fk_statut as status";
 $sql .= " FROM ".MAIN_DB_PREFIX."expensereport as d, ".MAIN_DB_PREFIX."user as u";
 if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 $sql .= " WHERE u.rowid = d.fk_user_author";
 // RESTRICT RIGHTS
 if (empty($user->rights->expensereport->readall) && empty($user->rights->expensereport->lire_tous)
-    && (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || empty($user->rights->expensereport->writeall_advance)))
+	&& (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || empty($user->rights->expensereport->writeall_advance)))
 {
-    $childids = $user->getAllChildIds();
-    $childids[] = $user->id;
-    $sql .= " AND d.fk_user_author IN (".join(',', $childids).")\n";
+	$childids = $user->getAllChildIds();
+	$childids[] = $user->id;
+	$sql .= " AND d.fk_user_author IN (".join(',', $childids).")\n";
 }
 $sql .= ' AND d.entity IN ('.getEntity('expensereport').')';
 if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND d.fk_user_author = s.rowid AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
@@ -187,56 +187,60 @@ $sql .= $db->plimit($max, 0);
 $result = $db->query($sql);
 if ($result)
 {
-    $var = false;
-    $num = $db->num_rows($result);
+	$var = false;
+	$num = $db->num_rows($result);
 
-    $i = 0;
+	$i = 0;
 
 	print '<div class="div-table-responsive-no-min">';
 	print '<table class="noborder centpercent">';
-    print '<tr class="liste_titre">';
-    print '<th colspan="2">'.$langs->trans("BoxTitleLastModifiedExpenses", min($max, $num)).'</th>';
-    print '<th class="right">'.$langs->trans("AmountHT").'</th>';
-    print '<th class="right">'.$langs->trans("AmountTTC").'</th>';
-    print '<th class="right">'.$langs->trans("DateModificationShort").'</th>';
-    print '<th>&nbsp;</th>';
-    print '</tr>';
-    if ($num)
-    {
-        $total_ttc = $totalam = $total = 0;
+	print '<tr class="liste_titre">';
+	print '<th colspan="2">'.$langs->trans("BoxTitleLastModifiedExpenses", min($max, $num)).'</th>';
+	print '<th class="right">'.$langs->trans("AmountHT").'</th>';
+	print '<th class="right">'.$langs->trans("AmountTTC").'</th>';
+	print '<th class="right">'.$langs->trans("DateModificationShort").'</th>';
+	print '<th>&nbsp;</th>';
+	print '</tr>';
+	if ($num)
+	{
+		$total_ttc = $totalam = $total = 0;
 
-        $expensereportstatic = new ExpenseReport($db);
-        $userstatic = new User($db);
-        while ($i < $num && $i < $max)
-        {
-            $obj = $db->fetch_object($result);
-            $expensereportstatic->id = $obj->rowid;
-            $expensereportstatic->ref = $obj->ref;
-            $userstatic->id = $obj->uid;
-            $userstatic->admin = $obj->admin;
-            $userstatic->email = $obj->email;
-            $userstatic->lastname = $obj->lastname;
-            $userstatic->firstname = $obj->firstname;
-            $userstatic->login = $obj->login;
-            $userstatic->statut = $obj->statut;
-            $userstatic->photo = $obj->photo;
-            print '<tr class="oddeven">';
-            print '<td>'.$expensereportstatic->getNomUrl(1).'</td>';
-            print '<td>'.$userstatic->getNomUrl(-1).'</td>';
-            print '<td class="right">'.price($obj->total_ht).'</td>';
-            print '<td class="right">'.price($obj->total_ttc).'</td>';
-            print '<td class="right">'.dol_print_date($db->jdate($obj->dm), 'day').'</td>';
-            print '<td class="right">';
-			print $expensereportstatic->LibStatut($obj->fk_status, 3);
-            print '</td>';
-            print '</tr>';
+		$expensereportstatic = new ExpenseReport($db);
+		$userstatic = new User($db);
+		while ($i < $num && $i < $max)
+		{
+			$obj = $db->fetch_object($result);
 
-            $i++;
-        }
-    } else {
-        print '<tr class="oddeven"><td colspan="6" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
-    }
-    print '</table></div><br>';
+			$expensereportstatic->id = $obj->rowid;
+			$expensereportstatic->ref = $obj->ref;
+			$expensereportstatic->status = $obj->status;
+
+			$userstatic->id = $obj->uid;
+			$userstatic->admin = $obj->admin;
+			$userstatic->email = $obj->email;
+			$userstatic->lastname = $obj->lastname;
+			$userstatic->firstname = $obj->firstname;
+			$userstatic->login = $obj->login;
+			$userstatic->statut = $obj->user_status;
+			$userstatic->photo = $obj->photo;
+
+			print '<tr class="oddeven">';
+			print '<td>'.$expensereportstatic->getNomUrl(1).'</td>';
+			print '<td>'.$userstatic->getNomUrl(-1).'</td>';
+			print '<td class="right">'.price($obj->total_ht).'</td>';
+			print '<td class="right">'.price($obj->total_ttc).'</td>';
+			print '<td class="right">'.dol_print_date($db->jdate($obj->dm), 'day').'</td>';
+			print '<td class="right">';
+			print $expensereportstatic->getLibStatut(3);
+			print '</td>';
+			print '</tr>';
+
+			$i++;
+		}
+	} else {
+		print '<tr class="oddeven"><td colspan="6" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
+	}
+	print '</table></div><br>';
 } else dol_print_error($db);
 
 print '</div></div></div>';
diff --git a/htdocs/expensereport/info.php b/htdocs/expensereport/info.php
index 00510e4e5fd..53d1531f4b9 100644
--- a/htdocs/expensereport/info.php
+++ b/htdocs/expensereport/info.php
@@ -98,7 +98,7 @@ if ($id > 0 || !empty($ref))
 
 	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 }
 
 // End of page
diff --git a/htdocs/expensereport/list.php b/htdocs/expensereport/list.php
index 0186bd08103..a36e3fa5ed2 100644
--- a/htdocs/expensereport/list.php
+++ b/htdocs/expensereport/list.php
@@ -60,14 +60,14 @@ $id = GETPOST('id', 'int');
 // If we are on the view of a specific user
 if ($id > 0)
 {
-    $canread = 0;
-    if ($id == $user->id) $canread = 1;
-    if (!empty($user->rights->expensereport->readall)) $canread = 1;
-    if (!empty($user->rights->expensereport->lire) && in_array($id, $childids)) $canread = 1;
-    if (!$canread)
-    {
-        accessforbidden();
-    }
+	$canread = 0;
+	if ($id == $user->id) $canread = 1;
+	if (!empty($user->rights->expensereport->readall)) $canread = 1;
+	if (!empty($user->rights->expensereport->lire) && in_array($id, $childids)) $canread = 1;
+	if (!$canread)
+	{
+		accessforbidden();
+	}
 }
 
 $diroutputmassaction = $conf->expensereport->dir_output.'/temp/massgeneration/'.$user->id;
@@ -117,27 +117,27 @@ $search_array_options = $extrafields->getOptionalsFromPost($object->table_elemen
 
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array(
-    'd.ref'=>'Ref',
-    'd.note_public'=>"NotePublic",
-    'u.lastname'=>'Lastname',
-    'u.firstname'=>"Firstname",
-    'u.login'=>"Login",
+	'd.ref'=>'Ref',
+	'd.note_public'=>"NotePublic",
+	'u.lastname'=>'Lastname',
+	'u.firstname'=>"Firstname",
+	'u.login'=>"Login",
 );
 if (empty($user->socid)) $fieldstosearchall["d.note_private"] = "NotePrivate";
 
 $arrayfields = array(
-    'd.ref'=>array('label'=>$langs->trans("Ref"), 'checked'=>1),
-    'user'=>array('label'=>$langs->trans("User"), 'checked'=>1),
-    'd.date_debut'=>array('label'=>$langs->trans("DateStart"), 'checked'=>1),
-    'd.date_fin'=>array('label'=>$langs->trans("DateEnd"), 'checked'=>1),
-    'd.date_valid'=>array('label'=>$langs->trans("DateValidation"), 'checked'=>1),
-    'd.date_approve'=>array('label'=>$langs->trans("DateApprove"), 'checked'=>1),
-    'd.total_ht'=>array('label'=>$langs->trans("AmountHT"), 'checked'=>1),
-    'd.total_vat'=>array('label'=>$langs->trans("AmountVAT"), 'checked'=>1),
-    'd.total_ttc'=>array('label'=>$langs->trans("AmountTTC"), 'checked'=>1),
-    'd.date_create'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0, 'position'=>500),
-    'd.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500),
-    'd.fk_statut'=>array('label'=>$langs->trans("Status"), 'checked'=>1, 'position'=>1000),
+	'd.ref'=>array('label'=>$langs->trans("Ref"), 'checked'=>1),
+	'user'=>array('label'=>$langs->trans("User"), 'checked'=>1),
+	'd.date_debut'=>array('label'=>$langs->trans("DateStart"), 'checked'=>1),
+	'd.date_fin'=>array('label'=>$langs->trans("DateEnd"), 'checked'=>1),
+	'd.date_valid'=>array('label'=>$langs->trans("DateValidation"), 'checked'=>1),
+	'd.date_approve'=>array('label'=>$langs->trans("DateApprove"), 'checked'=>1),
+	'd.total_ht'=>array('label'=>$langs->trans("AmountHT"), 'checked'=>1),
+	'd.total_vat'=>array('label'=>$langs->trans("AmountVAT"), 'checked'=>1),
+	'd.total_ttc'=>array('label'=>$langs->trans("AmountTTC"), 'checked'=>1),
+	'd.date_create'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0, 'position'=>500),
+	'd.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500),
+	'd.fk_statut'=>array('label'=>$langs->trans("Status"), 'checked'=>1, 'position'=>1000),
 );
 // Extra fields
 if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0)
@@ -173,19 +173,19 @@ if (empty($reshook))
 	// Purge search criteria
 	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
 	{
-	    $search_ref = "";
-	    $search_user = "";
-	    $search_amount_ht = "";
-	    $search_amount_vat = "";
-	    $search_amount_ttc = "";
-	    $search_status = "";
-	    $month_start = "";
-	    $year_start = "";
-	    $month_end = "";
-	    $year_end = "";
-	    $day_end = "";
-	    $toselect = '';
-	    $search_array_options = array();
+		$search_ref = "";
+		$search_user = "";
+		$search_amount_ht = "";
+		$search_amount_vat = "";
+		$search_amount_ttc = "";
+		$search_status = "";
+		$month_start = "";
+		$year_start = "";
+		$month_end = "";
+		$year_end = "";
+		$day_end = "";
+		$toselect = '';
+		$search_array_options = array();
 	}
 	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')
 		|| GETPOST('button_search_x', 'alpha') || GETPOST('button_search.x', 'alpha') || GETPOST('button_search', 'alpha'))
@@ -194,12 +194,12 @@ if (empty($reshook))
 	}
 
 	// Mass actions
-    $objectclass = 'ExpenseReport';
-    $objectlabel = 'ExpenseReport';
-    $permissiontoread = $user->rights->expensereport->lire;
-    $permissiontodelete = $user->rights->expensereport->supprimer;
-    $uploaddir = $conf->expensereport->dir_output;
-    include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
+	$objectclass = 'ExpenseReport';
+	$objectlabel = 'ExpenseReport';
+	$permissiontoread = $user->rights->expensereport->lire;
+	$permissiontodelete = $user->rights->expensereport->supprimer;
+	$uploaddir = $conf->expensereport->dir_output;
+	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }
 
 
@@ -265,7 +265,7 @@ if ($search_user != '' && $search_user >= 0) $sql .= " AND u.rowid = '".$db->esc
 if ($search_status != '' && $search_status >= 0) $sql .= " AND d.fk_statut IN (".$db->sanitize($db->escape($search_status)).")";
 // RESTRICT RIGHTS
 if (empty($user->rights->expensereport->readall) && empty($user->rights->expensereport->lire_tous)
-    && (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || empty($user->rights->expensereport->writeall_advance)))
+	&& (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || empty($user->rights->expensereport->writeall_advance)))
 {
 	$sql .= " AND d.fk_user_author IN (".join(',', $childids).")\n";
 }
@@ -282,13 +282,13 @@ $sql .= $db->order($sortfield, $sortorder);
 $nbtotalofrecords = '';
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
-    $result = $db->query($sql);
-    $nbtotalofrecords = $db->num_rows($result);
-    if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
-    {
-    	$page = 0;
-    	$offset = 0;
-    }
+	$result = $db->query($sql);
+	$nbtotalofrecords = $db->num_rows($result);
+	if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+	{
+		$page = 0;
+		$offset = 0;
+	}
 }
 
 $sql .= $db->plimit($limit + 1, $offset);
@@ -302,7 +302,7 @@ if ($resql)
 	$arrayofselected = is_array($toselect) ? $toselect : array();
 
 	$param = '';
-    if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
+	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
 	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
 	if ($sall)					$param .= "&sall=".urlencode($sall);
 	if ($search_ref)			$param .= "&search_ref=".urlencode($search_ref);
@@ -317,8 +317,8 @@ if ($resql)
 	// List of mass actions available
 	$arrayofmassactions = array(
 		'generate_doc'=>$langs->trans("ReGeneratePDF"),
-	    'builddoc'=>$langs->trans("PDFMerge"),
-	    'presend'=>$langs->trans("SendByMail"),
+		'builddoc'=>$langs->trans("PDFMerge"),
+		'presend'=>$langs->trans("SendByMail"),
 	);
 	if ($user->rights->expensereport->supprimer) $arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
 	if (in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
@@ -326,12 +326,12 @@ if ($resql)
 
 	// Lines of title fields
 	print '<form id="searchFormList" action="'.$_SERVER["PHP_SELF"].'" method="POST">'."\n";
-    if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+	if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 	print '<input type="hidden" name="action" value="'.($action == 'edit' ? 'update' : 'list').'">';
 	print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
-    print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 	if ($id > 0) print '<input type="hidden" name="id" value="'.$id.'">';
 
@@ -345,7 +345,7 @@ if ($resql)
 
 		dol_banner_tab($fuser, 'id', $linkback, $user->rights->user->user->lire || $user->admin);
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 		if ($action != 'edit')
 		{
@@ -386,10 +386,10 @@ if ($resql)
 	include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
 	if ($sall)
-    {
-        foreach ($fieldstosearchall as $key => $val) $fieldstosearchall[$key] = $langs->trans($val);
-        print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall).join(', ', $fieldstosearchall).'</div>';
-    }
+	{
+		foreach ($fieldstosearchall as $key => $val) $fieldstosearchall[$key] = $langs->trans($val);
+		print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall).join(', ', $fieldstosearchall).'</div>';
+	}
 
 	$moreforfilter = '';
 
@@ -400,90 +400,90 @@ if ($resql)
 
 	if (!empty($moreforfilter))
 	{
-	    print '<div class="liste_titre liste_titre_bydiv centpercent">';
-	    print $moreforfilter;
-	    print '</div>';
+		print '<div class="liste_titre liste_titre_bydiv centpercent">';
+		print $moreforfilter;
+		print '</div>';
 	}
 
 	$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 	$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
 	$selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
-    print '<div class="div-table-responsive">';
+	print '<div class="div-table-responsive">';
 	print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 	// Filters
 	print '<tr class="liste_titre_filter">';
 	if (!empty($arrayfields['d.ref']['checked']))
 	{
-    	print '<td class="liste_titre" align="left">';
-    	print '<input class="flat" size="15" type="text" name="search_ref" value="'.$search_ref.'">';
-        print '</td>';
+		print '<td class="liste_titre" align="left">';
+		print '<input class="flat" size="15" type="text" name="search_ref" value="'.$search_ref.'">';
+		print '</td>';
 	}
 	// User
 	if (!empty($arrayfields['user']['checked']))
 	{
-        if ($user->rights->expensereport->readall || $user->rights->expensereport->lire_tous)
-    	{
-    		print '<td class="liste_titre maxwidthonspartphone" align="left">';
-    		print $form->select_dolusers($search_user, 'search_user', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth200');
-    		print '</td>';
-    	} else {
-    		print '<td class="liste_titre">&nbsp;</td>';
-    	}
+		if ($user->rights->expensereport->readall || $user->rights->expensereport->lire_tous)
+		{
+			print '<td class="liste_titre maxwidthonspartphone" align="left">';
+			print $form->select_dolusers($search_user, 'search_user', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth200');
+			print '</td>';
+		} else {
+			print '<td class="liste_titre">&nbsp;</td>';
+		}
 	}
 	// Date start
 	if (!empty($arrayfields['d.date_debut']['checked']))
 	{
-    	print '<td class="liste_titre" align="center">';
-        if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) {
-            print '<input class="flat width25" type="text" maxlength="2" name="day_start" value="'.dol_escape_htmltag($day_start).'">';
-        }
+		print '<td class="liste_titre" align="center">';
+		if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) {
+			print '<input class="flat width25" type="text" maxlength="2" name="day_start" value="'.dol_escape_htmltag($day_start).'">';
+		}
 
-    	print '<input class="flat valignmiddle" type="text" size="1" maxlength="2" name="month_start" value="'.$month_start.'">';
-    	$formother->select_year($year_start, 'year_start', 1, $min_year, $max_year);
-    	print '</td>';
+		print '<input class="flat valignmiddle" type="text" size="1" maxlength="2" name="month_start" value="'.$month_start.'">';
+		$formother->select_year($year_start, 'year_start', 1, $min_year, $max_year);
+		print '</td>';
 	}
 	// Date end
 	if (!empty($arrayfields['d.date_fin']['checked']))
 	{
-    	print '<td class="liste_titre" align="center">';
+		print '<td class="liste_titre" align="center">';
 		if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) {
 			print '<input class="flat width25" type="text" maxlength="2" name="day_end" value="'.dol_escape_htmltag($day_end).'">';
 		}
 		print '<input class="flat valignmiddle" type="text" size="1" maxlength="2" name="month_end" value="'.$month_end.'">';
-    	$formother->select_year($year_end, 'year_end', 1, $min_year, $max_year);
-    	print '</td>';
-    }
+		$formother->select_year($year_end, 'year_end', 1, $min_year, $max_year);
+		print '</td>';
+	}
 	// Date valid
 	if (!empty($arrayfields['d.date_valid']['checked']))
 	{
-    	print '<td class="liste_titre" align="center">';
-    	//print '<input class="flat" type="text" size="1" maxlength="2" name="month_end" value="'.$month_end.'">';
-    	//$formother->select_year($year_end,'year_end',1, $min_year, $max_year);
-    	print '</td>';
-    }
+		print '<td class="liste_titre" align="center">';
+		//print '<input class="flat" type="text" size="1" maxlength="2" name="month_end" value="'.$month_end.'">';
+		//$formother->select_year($year_end,'year_end',1, $min_year, $max_year);
+		print '</td>';
+	}
 	// Date approve
 	if (!empty($arrayfields['d.date_approve']['checked']))
 	{
-    	print '<td class="liste_titre" align="center">';
-    	//print '<input class="flat" type="text" size="1" maxlength="2" name="month_end" value="'.$month_end.'">';
-    	//$formother->select_year($year_end,'year_end',1, $min_year, $max_year);
-    	print '</td>';
-    }
-    // Amount with no tax
+		print '<td class="liste_titre" align="center">';
+		//print '<input class="flat" type="text" size="1" maxlength="2" name="month_end" value="'.$month_end.'">';
+		//$formother->select_year($year_end,'year_end',1, $min_year, $max_year);
+		print '</td>';
+	}
+	// Amount with no tax
 	if (!empty($arrayfields['d.total_ht']['checked']))
 	{
-    	print '<td class="liste_titre right"><input class="flat" type="text" size="5" name="search_amount_ht" value="'.$search_amount_ht.'"></td>';
+		print '<td class="liste_titre right"><input class="flat" type="text" size="5" name="search_amount_ht" value="'.$search_amount_ht.'"></td>';
 	}
 	if (!empty($arrayfields['d.total_vat']['checked']))
 	{
-	    print '<td class="liste_titre right"><input class="flat" type="text" size="5" name="search_amount_vat" value="'.$search_amount_vat.'"></td>';
+		print '<td class="liste_titre right"><input class="flat" type="text" size="5" name="search_amount_vat" value="'.$search_amount_vat.'"></td>';
 	}
 	// Amount with all taxes
 	if (!empty($arrayfields['d.total_ttc']['checked']))
 	{
-	    print '<td class="liste_titre right"><input class="flat" type="text" size="5" name="search_amount_ttc" value="'.$search_amount_ttc.'"></td>';
+		print '<td class="liste_titre right"><input class="flat" type="text" size="5" name="search_amount_ttc" value="'.$search_amount_ttc.'"></td>';
 	}
 	// Extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
@@ -495,21 +495,21 @@ if ($resql)
 	// Date creation
 	if (!empty($arrayfields['d.date_create']['checked']))
 	{
-	    print '<td class="liste_titre">';
-	    print '</td>';
+		print '<td class="liste_titre">';
+		print '</td>';
 	}
 	// Date modification
 	if (!empty($arrayfields['d.tms']['checked']))
 	{
-	    print '<td class="liste_titre">';
-	    print '</td>';
+		print '<td class="liste_titre">';
+		print '</td>';
 	}
 	// Status
 	if (!empty($arrayfields['d.fk_statut']['checked']))
 	{
-    	print '<td class="liste_titre right">';
-    	$formexpensereport->selectExpensereportStatus($search_status, 'search_status', 1, 1);
-    	print '</td>';
+		print '<td class="liste_titre right">';
+		$formexpensereport->selectExpensereportStatus($search_status, 'search_status', 1, 1);
+		print '</td>';
 	}
 	// Action column
 	print '<td class="liste_titre maxwidthsearch">';
@@ -550,9 +550,9 @@ if ($resql)
 
 	if ($num > 0)
 	{
-        $i = 0;
-    	$totalarray = array();
- 	    while ($i < min($num, $limit))
+		$i = 0;
+		$totalarray = array();
+ 		while ($i < min($num, $limit))
 		{
 			$obj = $db->fetch_object($resql);
 
@@ -572,130 +572,130 @@ if ($resql)
 			print '<tr class="oddeven">';
 			// Ref
 			if (!empty($arrayfields['d.ref']['checked'])) {
-    			print '<td>';
-                print '<table class="nobordernopadding"><tr class="nocellnopadd">';
-                print '<td class="nobordernopadding nowrap">';
-    			print $expensereportstatic->getNomUrl(1);
-    			print '</td>';
-    			// Warning late icon and note
-        		print '<td class="nobordernopadding nowrap">';
-    			if ($expensereportstatic->status == 2 && $expensereportstatic->hasDelay('toappove')) print img_warning($langs->trans("Late"));
-    			if ($expensereportstatic->status == 5 && $expensereportstatic->hasDelay('topay')) print img_warning($langs->trans("Late"));
-    			if (!empty($obj->note_private) || !empty($obj->note_public))
-    			{
-    			    print ' <span class="note">';
-    			    print '<a href="'.DOL_URL_ROOT.'/expensereport/note.php?id='.$obj->rowid.'">'.img_picto($langs->trans("ViewPrivateNote"), 'object_generic').'</a>';
-    			    print '</span>';
-    			}
-    			print '</td>';
-    			print '<td width="16" class="nobordernopadding hideonsmartphone right">';
-    			$filename = dol_sanitizeFileName($obj->ref);
-    			$filedir = $conf->expensereport->dir_output.'/'.dol_sanitizeFileName($obj->ref);
-    			$urlsource = $_SERVER['PHP_SELF'].'?id='.$obj->rowid;
-    			print $formfile->getDocumentsLink($expensereportstatic->element, $filename, $filedir);
-    			print '</td>';
-    			print '</tr></table>';
-    			print '</td>';
-    			if (!$i) $totalarray['nbfield']++;
+				print '<td>';
+				print '<table class="nobordernopadding"><tr class="nocellnopadd">';
+				print '<td class="nobordernopadding nowrap">';
+				print $expensereportstatic->getNomUrl(1);
+				print '</td>';
+				// Warning late icon and note
+				print '<td class="nobordernopadding nowrap">';
+				if ($expensereportstatic->status == 2 && $expensereportstatic->hasDelay('toappove')) print img_warning($langs->trans("Late"));
+				if ($expensereportstatic->status == 5 && $expensereportstatic->hasDelay('topay')) print img_warning($langs->trans("Late"));
+				if (!empty($obj->note_private) || !empty($obj->note_public))
+				{
+					print ' <span class="note">';
+					print '<a href="'.DOL_URL_ROOT.'/expensereport/note.php?id='.$obj->rowid.'">'.img_picto($langs->trans("ViewPrivateNote"), 'object_generic').'</a>';
+					print '</span>';
+				}
+				print '</td>';
+				print '<td width="16" class="nobordernopadding hideonsmartphone right">';
+				$filename = dol_sanitizeFileName($obj->ref);
+				$filedir = $conf->expensereport->dir_output.'/'.dol_sanitizeFileName($obj->ref);
+				$urlsource = $_SERVER['PHP_SELF'].'?id='.$obj->rowid;
+				print $formfile->getDocumentsLink($expensereportstatic->element, $filename, $filedir);
+				print '</td>';
+				print '</tr></table>';
+				print '</td>';
+				if (!$i) $totalarray['nbfield']++;
 			}
 			// User
 			if (!empty($arrayfields['user']['checked'])) {
-			    print '<td class="left">';
-    			$usertmp->id = $obj->id_user;
-    			$usertmp->lastname = $obj->lastname;
-    			$usertmp->firstname = $obj->firstname;
-    			$usertmp->login = $obj->login;
-    			$usertmp->statut = $obj->statut;
-    			$usertmp->photo = $obj->photo;
-    			$usertmp->email = $obj->email;
-    			print $usertmp->getNomUrl(-1);
-    			print '</td>';
-    			if (!$i) $totalarray['nbfield']++;
+				print '<td class="left">';
+				$usertmp->id = $obj->id_user;
+				$usertmp->lastname = $obj->lastname;
+				$usertmp->firstname = $obj->firstname;
+				$usertmp->login = $obj->login;
+				$usertmp->statut = $obj->statut;
+				$usertmp->photo = $obj->photo;
+				$usertmp->email = $obj->email;
+				print $usertmp->getNomUrl(-1);
+				print '</td>';
+				if (!$i) $totalarray['nbfield']++;
 			}
 			// Start date
 			if (!empty($arrayfields['d.date_debut']['checked'])) {
-                print '<td class="center">'.($obj->date_debut > 0 ? dol_print_date($db->jdate($obj->date_debut), 'day') : '').'</td>';
-                if (!$i) $totalarray['nbfield']++;
-            }
-            // End date
+				print '<td class="center">'.($obj->date_debut > 0 ? dol_print_date($db->jdate($obj->date_debut), 'day') : '').'</td>';
+				if (!$i) $totalarray['nbfield']++;
+			}
+			// End date
 			if (!empty($arrayfields['d.date_fin']['checked'])) {
-			    print '<td class="center">'.($obj->date_fin > 0 ? dol_print_date($db->jdate($obj->date_fin), 'day') : '').'</td>';
-			    if (!$i) $totalarray['nbfield']++;
+				print '<td class="center">'.($obj->date_fin > 0 ? dol_print_date($db->jdate($obj->date_fin), 'day') : '').'</td>';
+				if (!$i) $totalarray['nbfield']++;
 			}
 			// Date validation
 			if (!empty($arrayfields['d.date_valid']['checked'])) {
-			    print '<td class="center">'.($obj->date_valid > 0 ? dol_print_date($db->jdate($obj->date_valid), 'day') : '').'</td>';
-			    if (!$i) $totalarray['nbfield']++;
+				print '<td class="center">'.($obj->date_valid > 0 ? dol_print_date($db->jdate($obj->date_valid), 'day') : '').'</td>';
+				if (!$i) $totalarray['nbfield']++;
 			}
 			// Date approval
 			if (!empty($arrayfields['d.date_approve']['checked'])) {
-			    print '<td class="center">'.($obj->date_approve > 0 ? dol_print_date($db->jdate($obj->date_approve), 'day') : '').'</td>';
-			    if (!$i) $totalarray['nbfield']++;
+				print '<td class="center">'.($obj->date_approve > 0 ? dol_print_date($db->jdate($obj->date_approve), 'day') : '').'</td>';
+				if (!$i) $totalarray['nbfield']++;
 			}
 			// Amount HT
-            if (!empty($arrayfields['d.total_ht']['checked']))
-            {
-    		      print '<td class="right">'.price($obj->total_ht)."</td>\n";
-    		      if (!$i) $totalarray['nbfield']++;
-    		      if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'd.total_ht';
-    		      $totalarray['val']['d.total_ht'] += $obj->total_ht;
-            }
-            // Amount VAT
-            if (!empty($arrayfields['d.total_vat']['checked']))
-            {
-                print '<td class="right">'.price($obj->total_tva)."</td>\n";
-                if (!$i) $totalarray['nbfield']++;
-                if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'd.total_tva';
-                $totalarray['val']['d.total_tva'] += $obj->total_tva;
-            }
-            // Amount TTC
-            if (!empty($arrayfields['d.total_ttc']['checked']))
-            {
-                print '<td class="right">'.price($obj->total_ttc)."</td>\n";
-                if (!$i) $totalarray['nbfield']++;
-                if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'd.total_ttc';
-                $totalarray['val']['d.total_ttc'] += $obj->total_ttc;
-            }
+			if (!empty($arrayfields['d.total_ht']['checked']))
+			{
+				  print '<td class="right">'.price($obj->total_ht)."</td>\n";
+				  if (!$i) $totalarray['nbfield']++;
+				  if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'd.total_ht';
+				  $totalarray['val']['d.total_ht'] += $obj->total_ht;
+			}
+			// Amount VAT
+			if (!empty($arrayfields['d.total_vat']['checked']))
+			{
+				print '<td class="right">'.price($obj->total_tva)."</td>\n";
+				if (!$i) $totalarray['nbfield']++;
+				if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'd.total_tva';
+				$totalarray['val']['d.total_tva'] += $obj->total_tva;
+			}
+			// Amount TTC
+			if (!empty($arrayfields['d.total_ttc']['checked']))
+			{
+				print '<td class="right">'.price($obj->total_ttc)."</td>\n";
+				if (!$i) $totalarray['nbfield']++;
+				if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'd.total_ttc';
+				$totalarray['val']['d.total_ttc'] += $obj->total_ttc;
+			}
 
-            // Extra fields
-            include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
-            // Fields from hook
-            $parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
-            $reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
-            print $hookmanager->resPrint;
+			// Extra fields
+			include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
+			// Fields from hook
+			$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
+			$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
+			print $hookmanager->resPrint;
 
-            // Date creation
-            if (!empty($arrayfields['d.date_create']['checked']))
-            {
-                print '<td class="nowrap center">';
-                print dol_print_date($db->jdate($obj->date_create), 'dayhour');
-                print '</td>';
-                if (!$i) $totalarray['nbfield']++;
-            }
-            // Date modification
-            if (!empty($arrayfields['d.tms']['checked']))
-            {
-                print '<td class="nowrap center">';
-                print dol_print_date($db->jdate($obj->date_modif), 'dayhour');
-                print '</td>';
-                if (!$i) $totalarray['nbfield']++;
-            }
-            // Status
-            if (!empty($arrayfields['d.fk_statut']['checked']))
-            {
-                print '<td class="nowrap right">'.$expensereportstatic->getLibStatut(5).'</td>';
-                if (!$i) $totalarray['nbfield']++;
-            }
-            // Action column
-            print '<td class="nowrap center">';
-            if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-            {
-                $selected = 0;
-                if (in_array($obj->rowid, $arrayofselected)) $selected = 1;
-                print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
-            }
-            print '</td>';
-            if (!$i) $totalarray['nbfield']++;
+			// Date creation
+			if (!empty($arrayfields['d.date_create']['checked']))
+			{
+				print '<td class="nowrap center">';
+				print dol_print_date($db->jdate($obj->date_create), 'dayhour');
+				print '</td>';
+				if (!$i) $totalarray['nbfield']++;
+			}
+			// Date modification
+			if (!empty($arrayfields['d.tms']['checked']))
+			{
+				print '<td class="nowrap center">';
+				print dol_print_date($db->jdate($obj->date_modif), 'dayhour');
+				print '</td>';
+				if (!$i) $totalarray['nbfield']++;
+			}
+			// Status
+			if (!empty($arrayfields['d.fk_statut']['checked']))
+			{
+				print '<td class="nowrap right">'.$expensereportstatic->getLibStatut(5).'</td>';
+				if (!$i) $totalarray['nbfield']++;
+			}
+			// Action column
+			print '<td class="nowrap center">';
+			if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+			{
+				$selected = 0;
+				if (in_array($obj->rowid, $arrayofselected)) $selected = 1;
+				print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
+			}
+			print '</td>';
+			if (!$i) $totalarray['nbfield']++;
 
 			print "</tr>\n";
 
@@ -721,7 +721,7 @@ if ($resql)
 	print $hookmanager->resPrint;
 
 	print '</table>'."\n";
-    print '</div>';
+	print '</div>';
 
 	print '</form>'."\n";
 
diff --git a/htdocs/expensereport/note.php b/htdocs/expensereport/note.php
index 31667d74a4e..ebb66ce42fd 100644
--- a/htdocs/expensereport/note.php
+++ b/htdocs/expensereport/note.php
@@ -108,7 +108,7 @@ if ($id > 0 || !empty($ref))
 
 	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 }
 
 // End of page
diff --git a/htdocs/expensereport/payment/card.php b/htdocs/expensereport/payment/card.php
index 4a5099cc03a..14c95f2d68a 100644
--- a/htdocs/expensereport/payment/card.php
+++ b/htdocs/expensereport/payment/card.php
@@ -61,12 +61,12 @@ if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->expensere
 	$result = $object->delete($user);
 	if ($result > 0)
 	{
-        $db->commit();
-        header("Location: ".DOL_URL_ROOT."/expensereport/index.php");
-        exit;
+		$db->commit();
+		header("Location: ".DOL_URL_ROOT."/expensereport/index.php");
+		exit;
 	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
-        $db->rollback();
+		$db->rollback();
 	}
 }
 
@@ -120,39 +120,39 @@ $disable_delete = 0;
 // Bank account
 if (!empty($conf->banque->enabled))
 {
-    if ($object->bank_account)
-    {
-    	$bankline = new AccountLine($db);
-    	$bankline->fetch($object->bank_line);
-        if ($bankline->rappro)
-        {
-            $disable_delete = 1;
-            $title_button = dol_escape_htmltag($langs->transnoentitiesnoconv("CantRemoveConciliatedPayment"));
-        }
+	if ($object->bank_account)
+	{
+		$bankline = new AccountLine($db);
+		$bankline->fetch($object->bank_line);
+		if ($bankline->rappro)
+		{
+			$disable_delete = 1;
+			$title_button = dol_escape_htmltag($langs->transnoentitiesnoconv("CantRemoveConciliatedPayment"));
+		}
 
-    	print '<tr>';
-    	print '<td>'.$langs->trans('BankTransactionLine').'</td>';
+		print '<tr>';
+		print '<td>'.$langs->trans('BankTransactionLine').'</td>';
 		print '<td colspan="3">';
 		print $bankline->getNomUrl(1, 0, 'showconciliated');
-    	print '</td>';
-    	print '</tr>';
+		print '</td>';
+		print '</tr>';
 
-    	print '<tr>';
-    	print '<td>'.$langs->trans('BankAccount').'</td>';
+		print '<tr>';
+		print '<td>'.$langs->trans('BankAccount').'</td>';
 		print '<td colspan="3">';
 		$accountstatic = new Account($db);
 		$accountstatic->fetch($bankline->fk_account);
-        print $accountstatic->getNomUrl(1);
-    	print '</td>';
-    	print '</tr>';
-    }
+		print $accountstatic->getNomUrl(1);
+		print '</td>';
+		print '</tr>';
+	}
 }
 
 print '</table>';
 
 print '</div>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 /*
diff --git a/htdocs/expensereport/payment/info.php b/htdocs/expensereport/payment/info.php
index 281e760684d..a654c77b6cd 100644
--- a/htdocs/expensereport/payment/info.php
+++ b/htdocs/expensereport/payment/info.php
@@ -75,7 +75,7 @@ print '</td></tr></table>';
 
 print '</div>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // End of page
 llxFooter();
diff --git a/htdocs/expensereport/payment/payment.php b/htdocs/expensereport/payment/payment.php
index 68c43a99ad1..fd327a0fcb1 100644
--- a/htdocs/expensereport/payment/payment.php
+++ b/htdocs/expensereport/payment/payment.php
@@ -80,11 +80,11 @@ if ($action == 'add_payment')
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Date")), null, 'errors');
 		$error++;
 	}
-    if (!empty($conf->banque->enabled) && !($accountid > 0))
-    {
-        setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("AccountToDebit")), null, 'errors');
-        $error++;
-    }
+	if (!empty($conf->banque->enabled) && !($accountid > 0))
+	{
+		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("AccountToDebit")), null, 'errors');
+		$error++;
+	}
 
 	if (!$error)
 	{
@@ -101,67 +101,67 @@ if ($action == 'add_payment')
 			}
 		}
 
-        if (count($amounts) <= 0)
-        {
-            $error++;
-            $errmsg = 'ErrorNoPaymentDefined';
-        }
+		if (count($amounts) <= 0)
+		{
+			$error++;
+			$errmsg = 'ErrorNoPaymentDefined';
+		}
 
-        if (!$error)
-        {
-    		$db->begin();
+		if (!$error)
+		{
+			$db->begin();
 
-    		// Create a line of payments
-    		$payment = new PaymentExpenseReport($db);
-    		$payment->fk_expensereport = $expensereport->id;
-    		$payment->datepaid       = $datepaid;
-    		$payment->amounts        = $amounts; // Tableau de montant
-    		$payment->total          = $total;
-    		$payment->fk_typepayment = GETPOST("fk_typepayment", 'int');
-    		$payment->num_payment    = GETPOST("num_payment", 'alphanothtml');
-    		$payment->note_public    = GETPOST("note_public", 'restricthtml');
+			// Create a line of payments
+			$payment = new PaymentExpenseReport($db);
+			$payment->fk_expensereport = $expensereport->id;
+			$payment->datepaid       = $datepaid;
+			$payment->amounts        = $amounts; // Tableau de montant
+			$payment->total          = $total;
+			$payment->fk_typepayment = GETPOST("fk_typepayment", 'int');
+			$payment->num_payment    = GETPOST("num_payment", 'alphanothtml');
+			$payment->note_public    = GETPOST("note_public", 'restricthtml');
 
-    		if (!$error)
-    		{
-    		    $paymentid = $payment->create($user);
-                if ($paymentid < 0)
-                {
-                	setEventMessages($payment->error, $payment->errors, 'errors');
-                    $error++;
-                }
-    		}
+			if (!$error)
+			{
+				$paymentid = $payment->create($user);
+				if ($paymentid < 0)
+				{
+					setEventMessages($payment->error, $payment->errors, 'errors');
+					$error++;
+				}
+			}
 
-            if (!$error)
-            {
-                $result = $payment->addPaymentToBank($user, 'payment_expensereport', '(ExpenseReportPayment)', $accountid, '', '');
-                if (!$result > 0)
-                {
-                	setEventMessages($payment->error, $payment->errors, 'errors');
-                    $error++;
-                }
-            }
+			if (!$error)
+			{
+				$result = $payment->addPaymentToBank($user, 'payment_expensereport', '(ExpenseReportPayment)', $accountid, '', '');
+				if (!$result > 0)
+				{
+					setEventMessages($payment->error, $payment->errors, 'errors');
+					$error++;
+				}
+			}
 
-            if (!$error) {
-                $payment->fetch($paymentid);
-                if ($expensereport->total_ttc - $payment->amount == 0) {
-                    $result = $expensereport->set_paid($expensereport->id, $user);
-                    if (!$result > 0) {
-                    	setEventMessages($payment->error, $payment->errors, 'errors');
-                        $error++;
-                    }
-                }
-            }
+			if (!$error) {
+				$payment->fetch($paymentid);
+				if ($expensereport->total_ttc - $payment->amount == 0) {
+					$result = $expensereport->set_paid($expensereport->id, $user);
+					if (!$result > 0) {
+						setEventMessages($payment->error, $payment->errors, 'errors');
+						$error++;
+					}
+				}
+			}
 
-    	    if (!$error)
-            {
-                $db->commit();
-                $loc = DOL_URL_ROOT.'/expensereport/card.php?id='.$id;
-                header('Location: '.$loc);
-                exit;
-            } else {
-                $db->rollback();
-            }
-        }
+			if (!$error)
+			{
+				$db->commit();
+				$loc = DOL_URL_ROOT.'/expensereport/card.php?id='.$id;
+				header('Location: '.$loc);
+				exit;
+			} else {
+				$db->rollback();
+			}
+		}
 	}
 
 	$action = 'create';
@@ -194,9 +194,9 @@ if ($action == 'create' || empty($action))
                         var amount = $(this).data("value");
 						document.getElementById($(this).data(\'rowid\')).value = amount ;
 					});';
-        print "\t});\n";
-        print "</script>\n";
-    }
+		print "\t});\n";
+		print "</script>\n";
+	}
 
 	print load_fiche_titre($langs->trans("DoPayment"));
 
@@ -206,17 +206,17 @@ if ($action == 'create' || empty($action))
 	print '<input type="hidden" name="chid" value="'.$expensereport->id.'">';
 	print '<input type="hidden" name="action" value="add_payment">';
 
-    print dol_get_fiche_head(null, '0', '', -1);
+	print dol_get_fiche_head(null, '0', '', -1);
 
-    $linkback = '';
-    // $linkback = '<a href="' . DOL_URL_ROOT . '/expensereport/payment/list.php">' . $langs->trans("BackToList") . '</a>';
+	$linkback = '';
+	// $linkback = '<a href="' . DOL_URL_ROOT . '/expensereport/payment/list.php">' . $langs->trans("BackToList") . '</a>';
 
-    dol_banner_tab($expensereport, 'ref', $linkback, 1, 'ref', 'ref', '');
+	dol_banner_tab($expensereport, 'ref', $linkback, 1, 'ref', 'ref', '');
 
-    print '<div class="fichecenter">';
-    print '<div class="underbanner clearboth"></div>';
+	print '<div class="fichecenter">';
+	print '<div class="underbanner clearboth"></div>';
 
-    print '<table class="border centpercent">'."\n";
+	print '<table class="border centpercent">'."\n";
 
 	print '<tr><td class="titlefield">'.$langs->trans("Period").'</td><td>'.get_date_range($expensereport->date_debut, $expensereport->date_fin, "", $langs, 0).'</td></tr>';
 	print '<tr><td>'.$langs->trans("Amount").'</td><td>'.price($expensereport->total_ttc, 0, $outputlangs, 1, -1, -1, $conf->currency).'</td></tr>';
@@ -224,7 +224,7 @@ if ($action == 'create' || empty($action))
 	$sql = "SELECT sum(p.amount) as total";
 	$sql .= " FROM ".MAIN_DB_PREFIX."payment_expensereport as p, ".MAIN_DB_PREFIX."expensereport as e";
 	$sql .= " WHERE p.fk_expensereport = e.rowid AND p.fk_expensereport = ".$id;
-    $sql .= ' AND e.entity IN ('.getEntity('expensereport').')';
+	$sql .= ' AND e.entity IN ('.getEntity('expensereport').')';
 	$resql = $db->query($sql);
 	if ($resql)
 	{
@@ -235,17 +235,17 @@ if ($action == 'create' || empty($action))
 	print '<tr><td>'.$langs->trans("AlreadyPaid").'</td><td>'.price($sumpaid, 0, $outputlangs, 1, -1, -1, $conf->currency).'</td></tr>';
 	print '<tr><td class="tdtop">'.$langs->trans("RemainderToPay").'</td><td>'.price($total - $sumpaid, 0, $outputlangs, 1, -1, -1, $conf->currency).'</td></tr>';
 
-    print '</table>';
+	print '</table>';
 
-    print '</div>';
+	print '</div>';
 
-    dol_fiche_end();
+	print dol_get_fiche_end();
 
-    print dol_get_fiche_head();
+	print dol_get_fiche_head();
 
-    print '<table class="border centpercent">'."\n";
+	print '<table class="border centpercent">'."\n";
 
-    print '<tr><td class="titlefield fieldrequired">'.$langs->trans("Date").'</td><td colspan="2">';
+	print '<tr><td class="titlefield fieldrequired">'.$langs->trans("Date").'</td><td colspan="2">';
 	$datepaid = dol_mktime(12, 0, 0, GETPOST("remonth", 'int'), GETPOST("reday", 'int'), GETPOST("reyear", 'int'));
 	$datepayment = ($datepaid == '' ? (empty($conf->global->MAIN_AUTOFILL_DATE) ?-1 : '') : $datepaid);
 	print $form->selectDate($datepayment, '', '', '', 0, "add_payment", 1, 1);
@@ -259,11 +259,11 @@ if ($action == 'create' || empty($action))
 
 	if (!empty($conf->banque->enabled))
 	{
-    	print '<tr>';
-    	print '<td class="fieldrequired">'.$langs->trans('AccountToDebit').'</td>';
-    	print '<td colspan="2">';
-    	$form->select_comptes(GETPOSTISSET("accountid") ? GETPOST("accountid", "int") : $expensereport->accountid, "accountid", 0, '', 2); // Show open bank account list
-    	print '</td></tr>';
+		print '<tr>';
+		print '<td class="fieldrequired">'.$langs->trans('AccountToDebit').'</td>';
+		print '<td colspan="2">';
+		$form->select_comptes(GETPOSTISSET("accountid") ? GETPOST("accountid", "int") : $expensereport->accountid, "accountid", 0, '', 2); // Show open bank account list
+		print '</td></tr>';
 	}
 
 	// Number
@@ -279,7 +279,7 @@ if ($action == 'create' || empty($action))
 
 	print '</table>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<br>';
 
diff --git a/htdocs/expensereport/stats/index.php b/htdocs/expensereport/stats/index.php
index b789fc57345..b0e5c7aed95 100644
--- a/htdocs/expensereport/stats/index.php
+++ b/htdocs/expensereport/stats/index.php
@@ -148,38 +148,38 @@ $data = $stats->getAverageByMonthWithPrevYear($endyear, $startyear);
 
 if (!$user->rights->societe->client->voir || $user->socid)
 {
-    $filename_avg = $dir.'/ordersaverage-'.$user->id.'-'.$year.'.png';
-    if ($mode == 'customer') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersaverage-'.$user->id.'-'.$year.'.png';
-    if ($mode == 'supplier') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersaverage-'.$user->id.'-'.$year.'.png';
+	$filename_avg = $dir.'/ordersaverage-'.$user->id.'-'.$year.'.png';
+	if ($mode == 'customer') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersaverage-'.$user->id.'-'.$year.'.png';
+	if ($mode == 'supplier') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersaverage-'.$user->id.'-'.$year.'.png';
 } else {
-    $filename_avg = $dir.'/ordersaverage-'.$year.'.png';
-    if ($mode == 'customer') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersaverage-'.$year.'.png';
-    if ($mode == 'supplier') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersaverage-'.$year.'.png';
+	$filename_avg = $dir.'/ordersaverage-'.$year.'.png';
+	if ($mode == 'customer') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersaverage-'.$year.'.png';
+	if ($mode == 'supplier') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersaverage-'.$year.'.png';
 }
 
 $px3 = new DolGraph();
 $mesg = $px3->isGraphKo();
 if (!$mesg)
 {
-    $px3->SetData($data);
-    $i = $startyear; $legend = array();
-    while ($i <= $endyear)
-    {
-        $legend[] = $i;
-        $i++;
-    }
-    $px3->SetLegend($legend);
-    $px3->SetYLabel($langs->trans("AmountAverage"));
-    $px3->SetMaxValue($px3->GetCeilMaxValue());
-    $px3->SetMinValue($px3->GetFloorMinValue());
-    $px3->SetWidth($WIDTH);
-    $px3->SetHeight($HEIGHT);
-    $px3->SetShading(3);
-    $px3->SetHorizTickIncrement(1);
-    $px3->mode = 'depth';
-    $px3->SetTitle($langs->trans("AmountAverage"));
+	$px3->SetData($data);
+	$i = $startyear; $legend = array();
+	while ($i <= $endyear)
+	{
+		$legend[] = $i;
+		$i++;
+	}
+	$px3->SetLegend($legend);
+	$px3->SetYLabel($langs->trans("AmountAverage"));
+	$px3->SetMaxValue($px3->GetCeilMaxValue());
+	$px3->SetMinValue($px3->GetFloorMinValue());
+	$px3->SetWidth($WIDTH);
+	$px3->SetHeight($HEIGHT);
+	$px3->SetShading(3);
+	$px3->SetHorizTickIncrement(1);
+	$px3->mode = 'depth';
+	$px3->SetTitle($langs->trans("AmountAverage"));
 
-    $px3->draw($filename_avg, $fileurl_avg);
+	$px3->draw($filename_avg, $fileurl_avg);
 }
 
 
@@ -187,7 +187,7 @@ if (!$mesg)
 $data = $stats->getAllByYear();
 $arrayyears = array();
 foreach ($data as $val) {
-    $arrayyears[$val['year']] = $val['year'];
+	$arrayyears[$val['year']] = $val['year'];
 }
 if (!count($arrayyears)) $arrayyears[$nowyear] = $nowyear;
 
@@ -288,11 +288,11 @@ print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 // Show graphs
 print '<table class="border centpercent"><tr class="pair nohover"><td class="center">';
 if ($mesg) { print $mesg; } else {
-    print $px1->show();
+	print $px1->show();
 	print "<br>\n";
 	print $px2->show();
-    print "<br>\n";
-    print $px3->show();
+	print "<br>\n";
+	print $px3->show();
 }
 print '</td></tr></table>';
 
@@ -301,7 +301,7 @@ print '</div></div></div>';
 print '<div style="clear:both"></div>';
 
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // End of page
 llxFooter();
diff --git a/htdocs/expensereport/tpl/expensereport_addfile.tpl.php b/htdocs/expensereport/tpl/expensereport_addfile.tpl.php
index c1e9a4e0d90..9b2cd49faec 100644
--- a/htdocs/expensereport/tpl/expensereport_addfile.tpl.php
+++ b/htdocs/expensereport/tpl/expensereport_addfile.tpl.php
@@ -11,30 +11,30 @@ $permission = $user->rights->expensereport->creer;
 $savingdocmask = '';
 if (empty($conf->global->MAIN_DISABLE_SUGGEST_REF_AS_PREFIX))
 {
-    //var_dump($modulepart);
-    if (in_array($modulepart, array('facture_fournisseur', 'commande_fournisseur', 'facture', 'commande', 'propal', 'supplier_proposal', 'ficheinter', 'contract', 'expedition', 'project', 'project_task', 'expensereport', 'tax', 'produit', 'product_batch')))
-    {
-        $savingdocmask = dol_sanitizeFileName($object->ref).'-__file__';
-    }
+	//var_dump($modulepart);
+	if (in_array($modulepart, array('facture_fournisseur', 'commande_fournisseur', 'facture', 'commande', 'propal', 'supplier_proposal', 'ficheinter', 'contract', 'expedition', 'project', 'project_task', 'expensereport', 'tax', 'produit', 'product_batch')))
+	{
+		$savingdocmask = dol_sanitizeFileName($object->ref).'-__file__';
+	}
 }
 
 // Show upload form (document and links)
 $formfile->form_attach_new_file(
-    $_SERVER["PHP_SELF"].'?id='.$object->id,
-    'none',
-    0,
-    0,
-    $permission,
-    $conf->browser->layout == 'phone' ? 40 : 60,
-    $object,
-    '',
-    1,
-    $savingdocmask,
-    0,
-    'formuserfile',
-    'accept',
-    '',
-    1
-    );
+	$_SERVER["PHP_SELF"].'?id='.$object->id,
+	'none',
+	0,
+	0,
+	$permission,
+	$conf->browser->layout == 'phone' ? 40 : 60,
+	$object,
+	'',
+	1,
+	$savingdocmask,
+	0,
+	'formuserfile',
+	'accept',
+	'',
+	1
+	);
 
 print '</td></tr>';
diff --git a/htdocs/expensereport/tpl/expensereport_linktofile.tpl.php b/htdocs/expensereport/tpl/expensereport_linktofile.tpl.php
index f4f460719a0..04bb2a71990 100644
--- a/htdocs/expensereport/tpl/expensereport_linktofile.tpl.php
+++ b/htdocs/expensereport/tpl/expensereport_linktofile.tpl.php
@@ -2,137 +2,137 @@
 // Add line to select existing file
 if (empty($conf->global->EXPENSEREPORT_DISABLE_ATTACHMENT_ON_LINES))
 {
-    print '<!-- expensereport_linktofile.tpl.php -->'."\n";
+	print '<!-- expensereport_linktofile.tpl.php -->'."\n";
 
-    require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-    require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
-    require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-    $upload_dir = $conf->expensereport->dir_output."/".dol_sanitizeFileName($object->ref);
-    $arrayoffiles = dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png|'.preg_quote(dol_sanitizeFileName($object->ref.'.pdf'), '/').')$');
-    $nbFiles = count($arrayoffiles);
-    $nbLinks = Link::count($db, $object->element, $object->id);
+	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
+	$upload_dir = $conf->expensereport->dir_output."/".dol_sanitizeFileName($object->ref);
+	$arrayoffiles = dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png|'.preg_quote(dol_sanitizeFileName($object->ref.'.pdf'), '/').')$');
+	$nbFiles = count($arrayoffiles);
+	$nbLinks = Link::count($db, $object->element, $object->id);
 
-    if ($nbFiles > 0)
-    {
-        print '<tr class="trattachnewfilenow'.(empty($tredited) ? ' oddeven nohover' : ' '.$tredited).'"'.(!GETPOSTISSET('sendit') && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? ' style="display: none"' : '').'>';
-        print '<td colspan="'.$colspan.'">';
-        //print '<span class="opacitymedium">'.$langs->trans("AttachTheNewLineToTheDocument").'</span><br>';
-        $modulepart = 'expensereport'; $maxheightmini = 48;
-        $relativepath = (!empty($object->ref) ?dol_sanitizeFileName($object->ref) : '').'/';
-        $filei = 0;
-        foreach ($arrayoffiles as $file)
-        {
-            $urlforhref = array();
-            $filei++;
+	if ($nbFiles > 0)
+	{
+		print '<tr class="trattachnewfilenow'.(empty($tredited) ? ' oddeven nohover' : ' '.$tredited).'"'.(!GETPOSTISSET('sendit') && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? ' style="display: none"' : '').'>';
+		print '<td colspan="'.$colspan.'">';
+		//print '<span class="opacitymedium">'.$langs->trans("AttachTheNewLineToTheDocument").'</span><br>';
+		$modulepart = 'expensereport'; $maxheightmini = 48;
+		$relativepath = (!empty($object->ref) ?dol_sanitizeFileName($object->ref) : '').'/';
+		$filei = 0;
+		foreach ($arrayoffiles as $file)
+		{
+			$urlforhref = array();
+			$filei++;
 
-            print '<div class="inline-block margintoponly marginleftonly marginrightonly center valigntop">';
-            $fileinfo = pathinfo($file['fullname']);
-            if (image_format_supported($file['name']) > 0)
-            {
-                $minifile = getImageFileNameForSize($file['name'], '_mini'); // For new thumbs using same ext (in lower case however) than original
-                //print $file['path'].'/'.$minifile.'<br>';
-                $urlforhref = getAdvancedPreviewUrl($modulepart, $relativepath.$fileinfo['filename'].'.'.strtolower($fileinfo['extension']), 1, '&entity='.(!empty($object->entity) ? $object->entity : $conf->entity));
-                if (empty($urlforhref)) {
-                    $urlforhref = DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.(!empty($object->entity) ? $object->entity : $conf->entity).'&file='.urlencode($fileinfo['relativename'].'.'.strtolower($fileinfo['extension']));
-                    print '<a href="'.$urlforhref.'" class="aphoto" target="_blank">';
-                } else {
-                    print '<a href="'.$urlforhref['url'].'" class="'.$urlforhref['css'].'" target="'.$urlforhref['target'].'" mime="'.$urlforhref['mime'].'">';
-                }
-                print '<div class="photoref backgroundblank">';
-                print '<img class="photoexpensereport photorefcenter" height="'.$maxheightmini.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.(!empty($object->entity) ? $object->entity : $conf->entity).'&file='.urlencode($relativepath.$minifile).'" title="">';
-                print '</div>';
-                print '</a>';
-            } else {
-                $error = 0;
-                $thumbshown = '';
+			print '<div class="inline-block margintoponly marginleftonly marginrightonly center valigntop">';
+			$fileinfo = pathinfo($file['fullname']);
+			if (image_format_supported($file['name']) > 0)
+			{
+				$minifile = getImageFileNameForSize($file['name'], '_mini'); // For new thumbs using same ext (in lower case however) than original
+				//print $file['path'].'/'.$minifile.'<br>';
+				$urlforhref = getAdvancedPreviewUrl($modulepart, $relativepath.$fileinfo['filename'].'.'.strtolower($fileinfo['extension']), 1, '&entity='.(!empty($object->entity) ? $object->entity : $conf->entity));
+				if (empty($urlforhref)) {
+					$urlforhref = DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.(!empty($object->entity) ? $object->entity : $conf->entity).'&file='.urlencode($fileinfo['relativename'].'.'.strtolower($fileinfo['extension']));
+					print '<a href="'.$urlforhref.'" class="aphoto" target="_blank">';
+				} else {
+					print '<a href="'.$urlforhref['url'].'" class="'.$urlforhref['css'].'" target="'.$urlforhref['target'].'" mime="'.$urlforhref['mime'].'">';
+				}
+				print '<div class="photoref backgroundblank">';
+				print '<img class="photoexpensereport photorefcenter" height="'.$maxheightmini.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.(!empty($object->entity) ? $object->entity : $conf->entity).'&file='.urlencode($relativepath.$minifile).'" title="">';
+				print '</div>';
+				print '</a>';
+			} else {
+				$error = 0;
+				$thumbshown = '';
 
-                if (preg_match('/\.pdf$/i', $file['name']))
-                {
-                    $urlforhref = getAdvancedPreviewUrl($modulepart, $relativepath.$fileinfo['filename'].'.'.strtolower($fileinfo['extension']), 1, '&entity='.(!empty($object->entity) ? $object->entity : $conf->entity));
+				if (preg_match('/\.pdf$/i', $file['name']))
+				{
+					$urlforhref = getAdvancedPreviewUrl($modulepart, $relativepath.$fileinfo['filename'].'.'.strtolower($fileinfo['extension']), 1, '&entity='.(!empty($object->entity) ? $object->entity : $conf->entity));
 
-                    $filepdf = $conf->expensereport->dir_output.'/'.$relativepath.$file['name'];
-                    $fileimage = $conf->expensereport->dir_output.'/'.$relativepath.$file['name'].'_preview.png';
-                    $relativepathimage = $relativepath.$file['name'].'_preview.png';
+					$filepdf = $conf->expensereport->dir_output.'/'.$relativepath.$file['name'];
+					$fileimage = $conf->expensereport->dir_output.'/'.$relativepath.$file['name'].'_preview.png';
+					$relativepathimage = $relativepath.$file['name'].'_preview.png';
 
-                    $pdfexists = file_exists($filepdf);
+					$pdfexists = file_exists($filepdf);
 
-                    if ($pdfexists)
-                    {
-                        // Conversion du PDF en image png si fichier png non existant
-                        if (!file_exists($fileimage) || (filemtime($fileimage) < filemtime($filepdf)))
-                        {
-                            if (empty($conf->global->MAIN_DISABLE_PDF_THUMBS))		// If you experience trouble with pdf thumb generation and imagick, you can disable here.
-                            {
-                                include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-                                $ret = dol_convert_file($filepdf, 'png', $fileimage, '0'); // Convert first page of PDF into a file _preview.png
-                                if ($ret < 0) $error++;
-                            }
-                        }
-                    }
+					if ($pdfexists)
+					{
+						// Conversion du PDF en image png si fichier png non existant
+						if (!file_exists($fileimage) || (filemtime($fileimage) < filemtime($filepdf)))
+						{
+							if (empty($conf->global->MAIN_DISABLE_PDF_THUMBS))		// If you experience trouble with pdf thumb generation and imagick, you can disable here.
+							{
+								include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+								$ret = dol_convert_file($filepdf, 'png', $fileimage, '0'); // Convert first page of PDF into a file _preview.png
+								if ($ret < 0) $error++;
+							}
+						}
+					}
 
-                    if ($pdfexists && !$error)
-                    {
-                        $heightforphotref = 70;
-                        if (!empty($conf->dol_optimize_smallscreen)) $heightforphotref = 60;
-                        // If the preview file is found
-                        if (file_exists($fileimage))
-                        {
-                            $thumbshown = '<img height="'.$heightforphotref.'" class="photo photowithmargin photowithborder" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=apercu'.$modulepart.'&amp;file='.urlencode($relativepathimage).'">';
-                        }
-                    }
-                }
+					if ($pdfexists && !$error)
+					{
+						$heightforphotref = 70;
+						if (!empty($conf->dol_optimize_smallscreen)) $heightforphotref = 60;
+						// If the preview file is found
+						if (file_exists($fileimage))
+						{
+							$thumbshown = '<img height="'.$heightforphotref.'" class="photo photowithmargin photowithborder" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=apercu'.$modulepart.'&amp;file='.urlencode($relativepathimage).'">';
+						}
+					}
+				}
 
-                if (empty($urlforhref) || empty($thumbshown)) {
-                    print '<a href="#" class="aphoto" target="_blank">';
-                } else {
-                    print '<a href="'.$urlforhref['url'].'" class="'.$urlforhref['css'].'" target="'.$urlforhref['target'].'" mime="'.$urlforhref['mime'].'">';
-                }
-                print '<div class="photoref backgroundblank">';
+				if (empty($urlforhref) || empty($thumbshown)) {
+					print '<a href="#" class="aphoto" target="_blank">';
+				} else {
+					print '<a href="'.$urlforhref['url'].'" class="'.$urlforhref['css'].'" target="'.$urlforhref['target'].'" mime="'.$urlforhref['mime'].'">';
+				}
+				print '<div class="photoref backgroundblank">';
 
-                print $thumbshown ? $thumbshown : img_mime($minifile);
+				print $thumbshown ? $thumbshown : img_mime($minifile);
 
-                print '</div></a>';
-            }
-            print '<br>';
-            $checked = '';
-            //var_dump(GETPOST($file['relativename'])); var_dump($file['relativename']); var_dump($_FILES['userfile']['name']);
-            // If a file was just uploaded, we check to preselect it
-            if (is_array($_FILES['userfile']['name'])) {
-	            foreach ($_FILES['userfile']['name'] as $tmpfile)
-	            {
-	                if ($file['relativename'] == (GETPOST('savingdocmask', 'alpha') ? dol_sanitizeFileName($object->ref.'-') : '').$tmpfile)
-	                {
-	                    $checked = ' checked';
-	                    break;
-	                } elseif ($file['relativename'] && in_array($file['relativename'], GETPOST('attachfile', 'array'))) {
-	                    $checked = ' checked';
-	                    break;
-	                }
-	            }
-            }
-            // If we edit a line already linked, then $filenamelinked is defined to the filename (without path) of linked file
-            if (!empty($filenamelinked) && $filenamelinked == $file['relativename'])
-            {
-                $checked = ' checked';
-            }
-            print '<div class="margintoponly maxwidth150"><input type="checkbox"'.$checked.' id="radio'.$filei.'" name="attachfile[]" class="checkboxattachfile" value="'.$file['relativename'].'">';
-            print '<label class="wordbreak checkboxattachfilelabel" for="radio'.$filei.'"> '.$file['relativename'].'</label>';
-            print '</div>';
+				print '</div></a>';
+			}
+			print '<br>';
+			$checked = '';
+			//var_dump(GETPOST($file['relativename'])); var_dump($file['relativename']); var_dump($_FILES['userfile']['name']);
+			// If a file was just uploaded, we check to preselect it
+			if (is_array($_FILES['userfile']['name'])) {
+				foreach ($_FILES['userfile']['name'] as $tmpfile)
+				{
+					if ($file['relativename'] == (GETPOST('savingdocmask', 'alpha') ? dol_sanitizeFileName($object->ref.'-') : '').$tmpfile)
+					{
+						$checked = ' checked';
+						break;
+					} elseif ($file['relativename'] && in_array($file['relativename'], GETPOST('attachfile', 'array'))) {
+						$checked = ' checked';
+						break;
+					}
+				}
+			}
+			// If we edit a line already linked, then $filenamelinked is defined to the filename (without path) of linked file
+			if (!empty($filenamelinked) && $filenamelinked == $file['relativename'])
+			{
+				$checked = ' checked';
+			}
+			print '<div class="margintoponly maxwidth150"><input type="checkbox"'.$checked.' id="radio'.$filei.'" name="attachfile[]" class="checkboxattachfile" value="'.$file['relativename'].'">';
+			print '<label class="wordbreak checkboxattachfilelabel" for="radio'.$filei.'"> '.$file['relativename'].'</label>';
+			print '</div>';
 
-            print '</div>';
-        }
+			print '</div>';
+		}
 
-        print '<script>';
-        print '$(document).ready(function() {';
-        print "$('.checkboxattachfile').on('change', function() { $('.checkboxattachfile').not(this).prop('checked', false); });";
-        print '});';
-        print '</script>';
+		print '<script>';
+		print '$(document).ready(function() {';
+		print "$('.checkboxattachfile').on('change', function() { $('.checkboxattachfile').not(this).prop('checked', false); });";
+		print '});';
+		print '</script>';
 
-        print '</td></tr>';
-    } else {
-        print '<tr class="oddeven nohover trattachnewfilenow"'.(!GETPOSTISSET('sendit') && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? ' style="display: none"' : '').'>';
-        print '<td colspan="'.$colspan.'">';
-        print '<span class="opacitymedium">'.$langs->trans("NoFilesUploadedYet").'</span>';
-        print '</td></tr>';
-    }
+		print '</td></tr>';
+	} else {
+		print '<tr class="oddeven nohover trattachnewfilenow"'.(!GETPOSTISSET('sendit') && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? ' style="display: none"' : '').'>';
+		print '<td colspan="'.$colspan.'">';
+		print '<span class="opacitymedium">'.$langs->trans("NoFilesUploadedYet").'</span>';
+		print '</td></tr>';
+	}
 }
diff --git a/htdocs/exports/class/export.class.php b/htdocs/exports/class/export.class.php
index 89ae2103476..9b666af779c 100644
--- a/htdocs/exports/class/export.class.php
+++ b/htdocs/exports/class/export.class.php
@@ -31,33 +31,33 @@
 class Export
 {
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $array_export_code = array(); // Tableau de "idmodule_numlot"
-    public $array_export_module = array(); // Tableau de "nom de modules"
-    public $array_export_label = array(); // Tableau de "libelle de lots"
-    public $array_export_sql_start = array(); // Tableau des "requetes sql"
-    public $array_export_sql_end = array(); // Tableau des "requetes sql"
-    public $array_export_sql_order = array(); // Tableau des "requetes sql"
+	public $array_export_code = array(); // Tableau de "idmodule_numlot"
+	public $array_export_module = array(); // Tableau de "nom de modules"
+	public $array_export_label = array(); // Tableau de "libelle de lots"
+	public $array_export_sql_start = array(); // Tableau des "requetes sql"
+	public $array_export_sql_end = array(); // Tableau des "requetes sql"
+	public $array_export_sql_order = array(); // Tableau des "requetes sql"
 
-    public $array_export_fields = array(); // Tableau des listes de champ+libelle a exporter
-    public $array_export_TypeFields = array(); // Tableau des listes de champ+Type de filtre
-    public $array_export_FilterValue = array(); // Tableau des listes de champ+Valeur a filtrer
-    public $array_export_entities = array(); // Tableau des listes de champ+alias a exporter
-    public $array_export_dependencies = array(); // array of list of entities that must take care of the DISTINCT if a field is added into export
-    public $array_export_special = array(); // array of special operations to do on field
-    public $array_export_examplevalues = array(); // array with examples for fields
+	public $array_export_fields = array(); // Tableau des listes de champ+libelle a exporter
+	public $array_export_TypeFields = array(); // Tableau des listes de champ+Type de filtre
+	public $array_export_FilterValue = array(); // Tableau des listes de champ+Valeur a filtrer
+	public $array_export_entities = array(); // Tableau des listes de champ+alias a exporter
+	public $array_export_dependencies = array(); // array of list of entities that must take care of the DISTINCT if a field is added into export
+	public $array_export_special = array(); // array of special operations to do on field
+	public $array_export_examplevalues = array(); // array with examples for fields
 	public $array_export_help = array(); // array with tooltip help for fields
 
-    // To store export modules
-    public $hexa; // List of fields in the export profile
-    public $hexafiltervalue; // List of search criteria in the export profile
-    public $datatoexport;
-    public $model_name; // Name of export profile
+	// To store export modules
+	public $hexa; // List of fields in the export profile
+	public $hexafiltervalue; // List of search criteria in the export profile
+	public $datatoexport;
+	public $model_name; // Name of export profile
 
-    public $sqlusedforexport;
+	public $sqlusedforexport;
 
 
 	/**
@@ -65,13 +65,13 @@ class Export
 	 *
 	 *    @param  	DoliDB		$db		Database handler
 	 */
-    public function __construct($db)
-    {
-        $this->db = $db;
-    }
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *    Load an exportable dataset
 	 *
@@ -79,19 +79,19 @@ class Export
 	 *    @param  	string		$filter    	Load a particular dataset only
 	 *    @return	int						<0 if KO, >0 if OK
 	 */
-    public function load_arrays($user, $filter = '')
-    {
-        // phpcs:enable
-        global $langs, $conf, $mysoc;
+	public function load_arrays($user, $filter = '')
+	{
+		// phpcs:enable
+		global $langs, $conf, $mysoc;
 
-        dol_syslog(get_class($this)."::load_arrays user=".$user->id." filter=".$filter);
+		dol_syslog(get_class($this)."::load_arrays user=".$user->id." filter=".$filter);
 
-        $i = 0;
+		$i = 0;
 
-        // Define list of modules directories into modulesdir
-        require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+		// Define list of modules directories into modulesdir
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
-        $modulesdir = dolGetModulesDirs();
+		$modulesdir = dolGetModulesDirs();
 
 		foreach ($modulesdir as $dir)
 		{
@@ -99,8 +99,8 @@ class Export
 			$handle = @opendir(dol_osencode($dir));
 			if (is_resource($handle))
 			{
-                // Search module files
-			    while (($file = readdir($handle)) !== false)
+				// Search module files
+				while (($file = readdir($handle)) !== false)
 				{
 					if (is_readable($dir.$file) && preg_match("/^(mod.*)\.class\.php$/i", $file, $reg))
 					{
@@ -122,30 +122,30 @@ class Export
 
 							if (isset($module->export_code) && is_array($module->export_code))
 							{
-							    foreach ($module->export_code as $r => $value)
+								foreach ($module->export_code as $r => $value)
 								{
-                                    //print $i.'-'.$filter.'-'.$modulename.'-'.join(',',$module->export_code).'<br>';
-								    if ($filter && ($filter != $module->export_code[$r])) continue;
+									//print $i.'-'.$filter.'-'.$modulename.'-'.join(',',$module->export_code).'<br>';
+									if ($filter && ($filter != $module->export_code[$r])) continue;
 
-                                    // Test if condition to show are ok
-                                    if (!empty($module->export_enabled[$r]) && !verifCond($module->export_enabled[$r])) continue;
+									// Test if condition to show are ok
+									if (!empty($module->export_enabled[$r]) && !verifCond($module->export_enabled[$r])) continue;
 
-                                    // Test if permissions are ok
+									// Test if permissions are ok
 									$bool = true;
 									if (isset($module->export_permission))
 									{
 										foreach ($module->export_permission[$r] as $val)
 										{
-	    									$perm = $val;
-	    									//print_r("$perm[0]-$perm[1]-$perm[2]<br>");
-	    									if (!empty($perm[2]))
-	    									{
-	    										$bool = $user->rights->{$perm[0]}->{$perm[1]}->{$perm[2]};
-	    									} else {
-	    										$bool = $user->rights->{$perm[0]}->{$perm[1]};
-	    									}
-	    									if ($perm[0] == 'user' && $user->admin) $bool = true;
-	    									if (!$bool) break;
+											$perm = $val;
+											//print_r("$perm[0]-$perm[1]-$perm[2]<br>");
+											if (!empty($perm[2]))
+											{
+												$bool = $user->rights->{$perm[0]}->{$perm[1]}->{$perm[2]};
+											} else {
+												$bool = $user->rights->{$perm[0]}->{$perm[1]};
+											}
+											if ($perm[0] == 'user' && $user->admin) $bool = true;
+											if (!$bool) break;
 										}
 									}
 									//print $bool." $perm[0]"."<br>";
@@ -183,10 +183,10 @@ class Export
 									$this->array_export_dependencies[$i] = (!empty($module->export_dependencies_array[$r]) ? $module->export_dependencies_array[$r] : '');
 									// Tableau des operations speciales sur champ
 									$this->array_export_special[$i] = (!empty($module->export_special_array[$r]) ? $module->export_special_array[$r] : '');
-            						// Array of examples
-            						$this->array_export_examplevalues[$i] = $module->export_examplevalues_array[$r];
-            						// Array of help tooltips
-            						$this->array_export_help[$i] = (!empty($module->export_help_array[$r]) ? $module->export_help_array[$r] : '');
+									// Array of examples
+									$this->array_export_examplevalues[$i] = $module->export_examplevalues_array[$r];
+									// Array of help tooltips
+									$this->array_export_help[$i] = (!empty($module->export_help_array[$r]) ? $module->export_help_array[$r] : '');
 
 									// Requete sql du dataset
 									$this->array_export_sql_start[$i] = $module->export_sql_start[$r];
@@ -202,15 +202,15 @@ class Export
 						}
 					}
 				}
-                closedir($handle);
+				closedir($handle);
 			}
 		}
 
 		return 1;
-    }
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *      Build the sql export request.
 	 *      Arrays this->array_export_xxx are already loaded for required datatoexport
@@ -220,9 +220,9 @@ class Export
 	 *      @param      array	$array_filterValue  Filter records on array of value for fields
 	 *      @return		string						SQL String. Example "select s.rowid as r_rowid, s.status as s_status from ..."
 	 */
-    public function build_sql($indice, $array_selected, $array_filterValue)
-    {
-        // phpcs:enable
+	public function build_sql($indice, $array_selected, $array_filterValue)
+	{
+		// phpcs:enable
 		// Build the sql request
 		$sql = $this->array_export_sql_start[$indice];
 		$i = 0;
@@ -231,7 +231,7 @@ class Export
 		foreach ($this->array_export_fields[$indice] as $key => $value)
 		{
 			if (!array_key_exists($key, $array_selected)) continue; // Field not selected
-            if (preg_match('/^none\./', $key)) continue; // A field that must not appears into SQL
+			if (preg_match('/^none\./', $key)) continue; // A field that must not appears into SQL
 			if ($i > 0) $sql .= ', ';
 			else $i++;
 
@@ -252,7 +252,7 @@ class Export
 			// Loop on each condition to add
 			foreach ($array_filterValue as $key => $value)
 			{
-			    if (preg_match('/GROUP_CONCAT/i', $key)) continue;
+				if (preg_match('/GROUP_CONCAT/i', $key)) continue;
 				if ($value != '') $sqlWhere .= " and ".$this->build_filterQuery($this->array_export_TypeFields[$indice][$key], $key, $array_filterValue[$key]);
 			}
 			$sql .= $sqlWhere;
@@ -264,17 +264,17 @@ class Export
 		// Add the HAVING part.
 		if (is_array($array_filterValue) && !empty($array_filterValue))
 		{
-		    // Loop on each condition to add
-		    foreach ($array_filterValue as $key => $value)
-		    {
-		        if (preg_match('/GROUP_CONCAT/i', $key) and $value != '') $sql .= " HAVING ".$this->build_filterQuery($this->array_export_TypeFields[$indice][$key], $key, $array_filterValue[$key]);
-		    }
+			// Loop on each condition to add
+			foreach ($array_filterValue as $key => $value)
+			{
+				if (preg_match('/GROUP_CONCAT/i', $key) and $value != '') $sql .= " HAVING ".$this->build_filterQuery($this->array_export_TypeFields[$indice][$key], $key, $array_filterValue[$key]);
+			}
 		}
 
 		return $sql;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *      Build the conditionnal string from filter the query
 	 *
@@ -283,9 +283,9 @@ class Export
 	 *      @param		string	$ValueField		Value of the field for filter. Must not be ''
 	 *      @return		string					sql string of then field ex : "field='xxx'>"
 	 */
-    public function build_filterQuery($TypeField, $NameField, $ValueField)
-    {
-        // phpcs:enable
+	public function build_filterQuery($TypeField, $NameField, $ValueField)
+	{
+		// phpcs:enable
 		//print $TypeField." ".$NameField." ".$ValueField;
 		$InfoFieldList = explode(":", $TypeField);
 		// build the input field on depend of the type of file
@@ -332,13 +332,13 @@ class Export
 				if (is_numeric($ValueField))
 					$szFilterQuery = " ".$NameField."=".$ValueField;
 				else {
-                    if (!(strpos($ValueField, '%') === false))
-                        $szFilterQuery = " ".$NameField." LIKE '".$ValueField."'";
-                    else $szFilterQuery = " ".$NameField." = '".$ValueField."'";
+					if (!(strpos($ValueField, '%') === false))
+						$szFilterQuery = " ".$NameField." LIKE '".$ValueField."'";
+					else $szFilterQuery = " ".$NameField." = '".$ValueField."'";
 				}
 				break;
 			default:
-			    dol_syslog("Error we try to forge an sql export request with a condition on a field with type ".$InfoFieldList[0]." (defined into module descriptor) but this type is unknown/not supported. It looks like a bug into module descriptor.", LOG_ERR);
+				dol_syslog("Error we try to forge an sql export request with a condition on a field with type ".$InfoFieldList[0]." (defined into module descriptor) but this type is unknown/not supported. It looks like a bug into module descriptor.", LOG_ERR);
 		}
 
 		return $szFilterQuery;
@@ -352,16 +352,16 @@ class Export
 	 *  @param 	string	$Sens		Comparison operator
 	 *  @return string
 	 */
-    public function conditionDate($Field, $Value, $Sens)
-    {
+	public function conditionDate($Field, $Value, $Sens)
+	{
 		// TODO date_format is forbidden, not performant and not portable. Use instead BETWEEN
 		if (strlen($Value) == 4) $Condition = " date_format(".$Field.",'%Y') ".$Sens." '".$Value."'";
 		elseif (strlen($Value) == 6) $Condition = " date_format(".$Field.",'%Y%m') ".$Sens." '".$Value."'";
 		else $Condition = " date_format(".$Field.",'%Y%m%d') ".$Sens." ".$Value;
 		return $Condition;
-    }
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *      Build an input field used to filter the query
 	 *
@@ -370,9 +370,9 @@ class Export
 	 *      @param		string	$ValueField		Initial value of the field to filter
 	 *      @return		string					html string of the input field ex : "<input type=text name=... value=...>"
 	 */
-    public function build_filterField($TypeField, $NameField, $ValueField)
-    {
-        // phpcs:enable
+	public function build_filterField($TypeField, $NameField, $ValueField)
+	{
+		// phpcs:enable
 		global $conf, $langs;
 
 		$szFilterField = '';
@@ -389,7 +389,7 @@ class Export
 			case 'Numeric':
 			case 'Number':
 				// Must be a string text to allow to use comparison strings like "<= 999"
-			    $szFilterField = '<input type="text" size="6" name="'.$NameField.'" value="'.$ValueField.'">';
+				$szFilterField = '<input type="text" size="6" name="'.$NameField.'" value="'.$ValueField.'">';
 				break;
 			case 'Status':
 				$szFilterField = '<input type="number" size="6" name="'.$NameField.'" value="'.$ValueField.'">';
@@ -476,17 +476,17 @@ class Export
 		}
 
 		return $szFilterField;
-    }
+	}
 
-    /**
-     *  Build an input field used to filter the query
-     *
-     *  @param      string  $TypeField      Type of Field to filter
-     *  @return     string                  html string of the input field ex : "<input type=text name=... value=...>"
-     */
-    public function genDocFilter($TypeField)
-    {
-        global $langs;
+	/**
+	 *  Build an input field used to filter the query
+	 *
+	 *  @param      string  $TypeField      Type of Field to filter
+	 *  @return     string                  html string of the input field ex : "<input type=text name=... value=...>"
+	 */
+	public function genDocFilter($TypeField)
+	{
+		global $langs;
 
 		$szMsg = '';
 		$InfoFieldList = explode(":", $TypeField);
@@ -511,7 +511,7 @@ class Export
 		return $szMsg;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *      Build export file.
 	 *      File is built into directory $conf->export->dir_temp.'/'.$user->id
@@ -525,9 +525,9 @@ class Export
 	 *      @param		string		$sqlquery			If set, transmit the sql request for select (otherwise, sql request is generated from arrays)
 	 *      @return		int								<0 if KO, >0 if OK
 	 */
-    public function build_file($user, $model, $datatoexport, $array_selected, $array_filterValue, $sqlquery = '')
-    {
-        // phpcs:enable
+	public function build_file($user, $model, $datatoexport, $array_selected, $array_filterValue, $sqlquery = '')
+	{
+		// phpcs:enable
 		global $conf, $langs, $mysoc;
 
 		$indice = 0;
@@ -551,7 +551,7 @@ class Export
 		$objmodel = new $classname($this->db);
 
 		if (!empty($sqlquery)) $sql = $sqlquery;
-        else {
+		else {
 			// Define value for indice from $datatoexport
 			$foundindice = 0;
 			foreach ($this->array_export_code as $key => $dataset)
@@ -569,7 +569,7 @@ class Export
 				$this->error = "ErrorBadParameter can't find dataset ".$datatoexport." into preload arrays this->array_export_code";
 				return -1;
 			}
-        	$sql = $this->build_sql($indice, $array_selected, $array_filterValue);
+			$sql = $this->build_sql($indice, $array_selected, $array_filterValue);
 		}
 
 		// Run the sql
@@ -637,26 +637,26 @@ class Export
 								$remaintopay = '';
 								if ($obj->f_rowid > 0)
 								{
-								    global $tmpobjforcomputecall;
-								    if (!is_object($tmpobjforcomputecall))
-								    {
-								        include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-								        $tmpobjforcomputecall = new Facture($this->db);
-								    }
-								    $tmpobjforcomputecall->id = $obj->f_rowid;
-								    $tmpobjforcomputecall->total_ttc = $obj->f_total_ttc;
-								    $tmpobjforcomputecall->close_code = $obj->f_close_code;
-								    $remaintopay = $tmpobjforcomputecall->getRemainToPay();
+									global $tmpobjforcomputecall;
+									if (!is_object($tmpobjforcomputecall))
+									{
+										include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+										$tmpobjforcomputecall = new Facture($this->db);
+									}
+									$tmpobjforcomputecall->id = $obj->f_rowid;
+									$tmpobjforcomputecall->total_ttc = $obj->f_total_ttc;
+									$tmpobjforcomputecall->close_code = $obj->f_close_code;
+									$remaintopay = $tmpobjforcomputecall->getRemainToPay();
 								}
 								$obj->$alias = $remaintopay;
 							} else {
-							    // TODO FIXME Export of compute field does not work. $obj containt $obj->alias_field and formulat will contains $obj->field
-							    $computestring = $this->array_export_special[$indice][$key];
-							    $tmp = dol_eval($computestring, 1, 0);
-							    $obj->$alias = $tmp;
+								// TODO FIXME Export of compute field does not work. $obj containt $obj->alias_field and formulat will contains $obj->field
+								$computestring = $this->array_export_special[$indice][$key];
+								$tmp = dol_eval($computestring, 1, 0);
+								$obj->$alias = $tmp;
 
-							    $this->error = "ERROPNOTSUPPORTED. Operation ".$this->array_export_special[$indice][$key]." not supported. Export of 'computed' extrafields is not yet supported, please remove field.";
-							    return -1;
+								$this->error = "ERROPNOTSUPPORTED. Operation ".$this->array_export_special[$indice][$key]." not supported. Export of 'computed' extrafields is not yet supported, please remove field.";
+								return -1;
 							}
 						}
 					}
@@ -670,7 +670,7 @@ class Export
 				// Close file
 				$objmodel->close_file();
 
-        		return 1;
+				return 1;
 			} else {
 				$this->error = $objmodel->error;
 				dol_syslog("Export::build_file Error: ".$this->error, LOG_ERR);
@@ -688,7 +688,7 @@ class Export
 	 *  @param		User	$user 	Object user that save
 	 *  @return		int				<0 if KO, >0 if OK
 	 */
-    public function create($user)
+	public function create($user)
 	{
 		global $conf;
 
@@ -732,8 +732,8 @@ class Export
 	 *  @param      int		$id		Id of profil to load
 	 *  @return     int				<0 if KO, >0 if OK
 	 */
-    public function fetch($id)
-    {
+	public function fetch($id)
+	{
 		$sql = 'SELECT em.rowid, em.label, em.type, em.field, em.filter';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'export_model as em';
 		$sql .= ' WHERE em.rowid = '.((int) $id);
@@ -801,16 +801,16 @@ class Export
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Output list all export models
 	 *  TODO Move this into a class htmlxxx.class.php
 	 *
 	 *	@return	void
 	 */
-    public function list_export_model()
-    {
-        // phpcs:enable
+	public function list_export_model()
+	{
+		// phpcs:enable
 		global $conf, $langs;
 
 		$sql = "SELECT em.rowid, em.field, em.label, em.type, em.filter";
@@ -852,8 +852,8 @@ class Export
 
 				$i++;
 			}
-        } else {
-            dol_print_error($this->db);
-        }
-    }
+		} else {
+			dol_print_error($this->db);
+		}
+	}
 }
diff --git a/htdocs/exports/export.php b/htdocs/exports/export.php
index 412167c55f2..2889e383817 100644
--- a/htdocs/exports/export.php
+++ b/htdocs/exports/export.php
@@ -41,24 +41,24 @@ $langs->loadlangs(array('admin', 'exports', 'other', 'users', 'companies', 'proj
 
 $entitytoicon = array(
 	'invoice'      => 'bill',
-    'invoice_line' => 'bill',
+	'invoice_line' => 'bill',
 	'order'        => 'order',
-    'order_line'   => 'order',
+	'order_line'   => 'order',
 	'propal'       => 'propal',
-    'propal_line'  => 'propal',
+	'propal_line'  => 'propal',
 	'intervention' => 'intervention',
-    'inter_line'   => 'intervention',
+	'inter_line'   => 'intervention',
 	'member'       => 'user',
-    'member_type'  => 'group',
-    'subscription' => 'payment',
-    'payment'      => 'payment',
+	'member_type'  => 'group',
+	'subscription' => 'payment',
+	'payment'      => 'payment',
 	'tax'          => 'generic',
-    'tax_type'     => 'generic',
-    'stock'        => 'generic',
-    'other'        => 'generic',
+	'tax_type'     => 'generic',
+	'stock'        => 'generic',
+	'other'        => 'generic',
 	'account'      => 'account',
 	'product'      => 'product',
-    'virtualproduct'=>'product',
+	'virtualproduct'=>'product',
 	'subproduct'   => 'product',
 	'product_supplier_ref'      => 'product',
 	'warehouse'    => 'stock',
@@ -66,36 +66,36 @@ $entitytoicon = array(
 	'stockbatch'   => 'stock',
 	'category'     => 'category',
 	'shipment'     => 'sending',
-    'shipment_line'=> 'sending',
-    'reception'=> 'sending',
-    'reception_line'=> 'sending',
+	'shipment_line'=> 'sending',
+	'reception'=> 'sending',
+	'reception_line'=> 'sending',
 	'expensereport'=> 'trip',
-    'expensereport_line'=> 'trip',
+	'expensereport_line'=> 'trip',
 	'holiday'      => 'holiday',
-    'contract_line' => 'contract',
-    'translation'  => 'generic',
-    'bomm'         => 'bom',
-    'bomline'      => 'bom'
+	'contract_line' => 'contract',
+	'translation'  => 'generic',
+	'bomm'         => 'bom',
+	'bomline'      => 'bom'
 );
 
 // Translation code
 $entitytolang = array(
 	'user'         => 'User',
 	'company'      => 'Company',
-    'contact'      => 'Contact',
+	'contact'      => 'Contact',
 	'invoice'      => 'Bill',
-    'invoice_line' => 'InvoiceLine',
+	'invoice_line' => 'InvoiceLine',
 	'order'        => 'Order',
-    'order_line'   => 'OrderLine',
-    'propal'       => 'Proposal',
-    'propal_line'  => 'ProposalLine',
+	'order_line'   => 'OrderLine',
+	'propal'       => 'Proposal',
+	'propal_line'  => 'ProposalLine',
 	'intervention' => 'Intervention',
-    'inter_line'   => 'InterLine',
+	'inter_line'   => 'InterLine',
 	'member'       => 'Member',
-    'member_type'  => 'MemberType',
-    'subscription' => 'Subscription',
+	'member_type'  => 'MemberType',
+	'subscription' => 'Subscription',
 	'tax'          => 'SocialContribution',
-    'tax_type'     => 'DictionarySocialContributions',
+	'tax_type'     => 'DictionarySocialContributions',
 	'account'      => 'BankTransactions',
 	'payment'      => 'Payment',
 	'product'      => 'Product',
@@ -103,28 +103,28 @@ $entitytolang = array(
 	'subproduct'      => 'SubProduct',
 	'product_supplier_ref'      => 'SupplierPrices',
 	'service'      => 'Service',
-    'stock'        => 'Stock',
+	'stock'        => 'Stock',
 	'movement'	   => 'StockMovement',
 	'batch'        => 'Batch',
 	'stockbatch'   => 'StockDetailPerBatch',
 	'warehouse'    => 'Warehouse',
 	'category'     => 'Category',
 	'other'        => 'Other',
-    'trip'         => 'TripsAndExpenses',
-    'shipment'     => 'Shipments',
-    'shipment_line'=> 'ShipmentLine',
-    'project'      => 'Projects',
-    'projecttask'  => 'Tasks',
-    'task_time'    => 'TaskTimeSpent',
+	'trip'         => 'TripsAndExpenses',
+	'shipment'     => 'Shipments',
+	'shipment_line'=> 'ShipmentLine',
+	'project'      => 'Projects',
+	'projecttask'  => 'Tasks',
+	'task_time'    => 'TaskTimeSpent',
 	'action'       => 'Event',
 	'expensereport'=> 'ExpenseReport',
 	'expensereport_line'=> 'ExpenseReportLine',
 	'holiday'      => 'TitreRequestCP',
 	'contract'     => 'Contract',
-    'contract_line'=> 'ContractLine',
-    'translation'  => 'Translation',
-    'bom'          => 'BOM',
-    'bomline'      => 'BOMLine'
+	'contract_line'=> 'ContractLine',
+	'translation'  => 'Translation',
+	'bom'          => 'BOM',
+	'bomline'      => 'BOMLine'
 );
 
 $array_selected = isset($_SESSION["export_selected_fields"]) ? $_SESSION["export_selected_fields"] : array();
@@ -162,121 +162,121 @@ if ($action == 'selectfield')     // Selection of field at step 2
 {
 	$fieldsarray = $objexport->array_export_fields[0];
 	$fieldsentitiesarray = $objexport->array_export_entities[0];
-    $fieldsdependenciesarray = $objexport->array_export_dependencies[0];
+	$fieldsdependenciesarray = $objexport->array_export_dependencies[0];
 
-    if ($field == 'all')
-    {
+	if ($field == 'all')
+	{
 		foreach ($fieldsarray as $key=>$val)
 		{
 			if (!empty($array_selected[$key])) continue; // If already selected, check next
 			$array_selected[$key] = count($array_selected) + 1;
-		    //print_r($array_selected);
-		    $_SESSION["export_selected_fields"] = $array_selected;
+			//print_r($array_selected);
+			$_SESSION["export_selected_fields"] = $array_selected;
 		}
-    } else {
-        $warnings = array();
+	} else {
+		$warnings = array();
 
-        $array_selected[$field] = count($array_selected) + 1; // We tag the key $field as "selected"
-        // We check if there is a dependency to activate
-        /*var_dump($field);
+		$array_selected[$field] = count($array_selected) + 1; // We tag the key $field as "selected"
+		// We check if there is a dependency to activate
+		/*var_dump($field);
         var_dump($fieldsentitiesarray[$field]);
         var_dump($fieldsdependenciesarray);*/
-        $listofdependencies = array();
-        if (!empty($fieldsentitiesarray[$field]) && !empty($fieldsdependenciesarray[$fieldsentitiesarray[$field]]))
-        {
-            // We found a dependency on the type of field
-            $tmp = $fieldsdependenciesarray[$fieldsentitiesarray[$field]]; // $fieldsdependenciesarray=array('element'=>'fd.rowid') or array('element'=>array('fd.rowid','ab.rowid'))
-            if (is_array($tmp)) $listofdependencies = $tmp;
-            else $listofdependencies = array($tmp);
-        } elseif (!empty($field) && !empty($fieldsdependenciesarray[$field]))
-        {
-            // We found a dependency on a dedicated field
-            $tmp = $fieldsdependenciesarray[$field]; // $fieldsdependenciesarray=array('fd.fieldx'=>'fd.rowid') or array('fd.fieldx'=>array('fd.rowid','ab.rowid'))
-            if (is_array($tmp)) $listofdependencies = $tmp;
-            else $listofdependencies = array($tmp);
-        }
+		$listofdependencies = array();
+		if (!empty($fieldsentitiesarray[$field]) && !empty($fieldsdependenciesarray[$fieldsentitiesarray[$field]]))
+		{
+			// We found a dependency on the type of field
+			$tmp = $fieldsdependenciesarray[$fieldsentitiesarray[$field]]; // $fieldsdependenciesarray=array('element'=>'fd.rowid') or array('element'=>array('fd.rowid','ab.rowid'))
+			if (is_array($tmp)) $listofdependencies = $tmp;
+			else $listofdependencies = array($tmp);
+		} elseif (!empty($field) && !empty($fieldsdependenciesarray[$field]))
+		{
+			// We found a dependency on a dedicated field
+			$tmp = $fieldsdependenciesarray[$field]; // $fieldsdependenciesarray=array('fd.fieldx'=>'fd.rowid') or array('fd.fieldx'=>array('fd.rowid','ab.rowid'))
+			if (is_array($tmp)) $listofdependencies = $tmp;
+			else $listofdependencies = array($tmp);
+		}
 
-        if (count($listofdependencies))
-        {
-            foreach ($listofdependencies as $fieldid)
-            {
-                if (empty($array_selected[$fieldid]))
-                {
-                    $array_selected[$fieldid] = count($array_selected) + 1; // We tag the key $fieldid as "selected"
-                    $warnings[] = $langs->trans("ExportFieldAutomaticallyAdded", $langs->transnoentitiesnoconv($fieldsarray[$fieldid]));
-                }
-            }
-        }
-	    //print_r($array_selected);
-	    $_SESSION["export_selected_fields"] = $array_selected;
+		if (count($listofdependencies))
+		{
+			foreach ($listofdependencies as $fieldid)
+			{
+				if (empty($array_selected[$fieldid]))
+				{
+					$array_selected[$fieldid] = count($array_selected) + 1; // We tag the key $fieldid as "selected"
+					$warnings[] = $langs->trans("ExportFieldAutomaticallyAdded", $langs->transnoentitiesnoconv($fieldsarray[$fieldid]));
+				}
+			}
+		}
+		//print_r($array_selected);
+		$_SESSION["export_selected_fields"] = $array_selected;
 
-	    setEventMessages($warnings, null, 'warnings');
-    }
+		setEventMessages($warnings, null, 'warnings');
+	}
 }
 if ($action == 'unselectfield')
 {
-    if ($_GET["field"] == 'all')
-    {
+	if ($_GET["field"] == 'all')
+	{
 		$array_selected = array();
 		$_SESSION["export_selected_fields"] = $array_selected;
-    } else {
-	    unset($array_selected[$_GET["field"]]);
-	    // Renumber fields of array_selected (from 1 to nb_elements)
-	    asort($array_selected);
-	    $i = 0;
-	    $array_selected_save = $array_selected;
-	    foreach ($array_selected as $code=>$value)
-	    {
-	        $i++;
-	        $array_selected[$code] = $i;
-	        //print "x $code x $i y<br>";
-	    }
-	    $_SESSION["export_selected_fields"] = $array_selected;
-    }
+	} else {
+		unset($array_selected[$_GET["field"]]);
+		// Renumber fields of array_selected (from 1 to nb_elements)
+		asort($array_selected);
+		$i = 0;
+		$array_selected_save = $array_selected;
+		foreach ($array_selected as $code=>$value)
+		{
+			$i++;
+			$array_selected[$code] = $i;
+			//print "x $code x $i y<br>";
+		}
+		$_SESSION["export_selected_fields"] = $array_selected;
+	}
 }
 
 if ($action == 'downfield' || $action == 'upfield')
 {
-    $pos = $array_selected[$_GET["field"]];
-    if ($action == 'downfield') $newpos = $pos + 1;
-    if ($action == 'upfield') $newpos = $pos - 1;
-    // Recherche code avec qui switcher
-    $newcode = "";
-    foreach ($array_selected as $code=>$value)
-    {
-        if ($value == $newpos)
-        {
-            $newcode = $code;
-            break;
-        }
-    }
-    //print("Switch pos=$pos (code=".$_GET["field"].") and newpos=$newpos (code=$newcode)");
-    if ($newcode)   // Si newcode trouve (protection contre resoumission de page)
-    {
-        $array_selected[$_GET["field"]] = $newpos;
-        $array_selected[$newcode] = $pos;
-        $_SESSION["export_selected_fields"] = $array_selected;
-    }
+	$pos = $array_selected[$_GET["field"]];
+	if ($action == 'downfield') $newpos = $pos + 1;
+	if ($action == 'upfield') $newpos = $pos - 1;
+	// Recherche code avec qui switcher
+	$newcode = "";
+	foreach ($array_selected as $code=>$value)
+	{
+		if ($value == $newpos)
+		{
+			$newcode = $code;
+			break;
+		}
+	}
+	//print("Switch pos=$pos (code=".$_GET["field"].") and newpos=$newpos (code=$newcode)");
+	if ($newcode)   // Si newcode trouve (protection contre resoumission de page)
+	{
+		$array_selected[$_GET["field"]] = $newpos;
+		$array_selected[$newcode] = $pos;
+		$_SESSION["export_selected_fields"] = $array_selected;
+	}
 }
 
 if ($step == 1 || $action == 'cleanselect')
 {
-    $_SESSION["export_selected_fields"] = array();
-    $_SESSION["export_filtered_fields"] = array();
-    $array_selected = array();
-    $array_filtervalue = array();
+	$_SESSION["export_selected_fields"] = array();
+	$_SESSION["export_filtered_fields"] = array();
+	$array_selected = array();
+	$array_filtervalue = array();
 }
 
 if ($action == 'builddoc')
 {
-    $max_execution_time_for_export = (empty($conf->global->EXPORT_MAX_EXECUTION_TIME) ? 300 : $conf->global->EXPORT_MAX_EXECUTION_TIME); // 5mn if not defined
-    $max_time = @ini_get("max_execution_time");
-    if ($max_time && $max_time < $max_execution_time_for_export)
-    {
-        @ini_set("max_execution_time", $max_execution_time_for_export); // This work only if safe mode is off. also web servers has timeout of 300
-    }
+	$max_execution_time_for_export = (empty($conf->global->EXPORT_MAX_EXECUTION_TIME) ? 300 : $conf->global->EXPORT_MAX_EXECUTION_TIME); // 5mn if not defined
+	$max_time = @ini_get("max_execution_time");
+	if ($max_time && $max_time < $max_execution_time_for_export)
+	{
+		@ini_set("max_execution_time", $max_execution_time_for_export); // This work only if safe mode is off. also web servers has timeout of 300
+	}
 
-    // Build export file
+	// Build export file
 	$result = $objexport->build_file($user, GETPOST('model', 'alpha'), $datatoexport, $array_selected, $array_filtervalue);
 	if ($result < 0)
 	{
@@ -284,8 +284,8 @@ if ($action == 'builddoc')
 		$sqlusedforexport = $objexport->sqlusedforexport;
 	} else {
 		setEventMessages($langs->trans("FileSuccessfullyBuilt"), null, 'mesgs');
-	    $sqlusedforexport = $objexport->sqlusedforexport;
-    }
+		$sqlusedforexport = $objexport->sqlusedforexport;
+	}
 }
 
 // Delete file
@@ -334,12 +334,12 @@ if ($action == 'add_export_model')
 			}
 		}
 
-	    $objexport->model_name = $export_name;
-	    $objexport->datatoexport = $datatoexport;
-	    $objexport->hexa = $hexa;
-	    $objexport->hexafiltervalue = $hexafiltervalue;
+		$objexport->model_name = $export_name;
+		$objexport->datatoexport = $datatoexport;
+		$objexport->hexa = $hexa;
+		$objexport->hexafiltervalue = $hexafiltervalue;
 
-	    $result = $objexport->create($user);
+		$result = $objexport->create($user);
 		if ($result >= 0)
 		{
 			setEventMessages($langs->trans("ExportModelSaved", $objexport->model_name), null, 'mesgs');
@@ -357,15 +357,15 @@ if ($action == 'add_export_model')
 // Reload a predefined export model
 if ($step == 2 && $action == 'select_model')
 {
-    $_SESSION["export_selected_fields"] = array();
-    $_SESSION["export_filtered_fields"] = array();
+	$_SESSION["export_selected_fields"] = array();
+	$_SESSION["export_filtered_fields"] = array();
 
-    $array_selected = array();
-    $array_filtervalue = array();
+	$array_selected = array();
+	$array_filtervalue = array();
 
-    $result = $objexport->fetch($exportmodelid);
-    if ($result > 0)
-    {
+	$result = $objexport->fetch($exportmodelid);
+	if ($result > 0)
+	{
 		$fieldsarray = preg_split("/,(?! [^(]*\))/", $objexport->hexa);
 		$i = 1;
 		foreach ($fieldsarray as $val)
@@ -384,7 +384,7 @@ if ($step == 2 && $action == 'select_model')
 			$i++;
 		}
 		$_SESSION["export_filtered_fields"] = $array_filtervalue;
-    }
+	}
 }
 
 // Get form with filters
@@ -419,143 +419,143 @@ if ($step == 4 && $action == 'submitFormField')
 
 if ($step == 1 || !$datatoexport)
 {
-    llxHeader('', $langs->trans("NewExport"), 'EN:Module_Exports_En|FR:Module_Exports|ES:M&oacute;dulo_Exportaciones');
+	llxHeader('', $langs->trans("NewExport"), 'EN:Module_Exports_En|FR:Module_Exports|ES:M&oacute;dulo_Exportaciones');
 
-    $h = 0;
+	$h = 0;
 
-    $head[$h][0] = DOL_URL_ROOT.'/exports/export.php?step=1';
-    $head[$h][1] = $langs->trans("Step")." 1";
-    $hselected = $h;
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT.'/exports/export.php?step=1';
+	$head[$h][1] = $langs->trans("Step")." 1";
+	$hselected = $h;
+	$h++;
 
-    print dol_get_fiche_head($head, $hselected, $langs->trans("NewExport"), -1);
+	print dol_get_fiche_head($head, $hselected, $langs->trans("NewExport"), -1);
 
 
-    print '<div class="opacitymedium">'.$langs->trans("SelectExportDataSet").'</div><br>';
+	print '<div class="opacitymedium">'.$langs->trans("SelectExportDataSet").'</div><br>';
 
-    // Affiche les modules d'exports
-    print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
-    print '<table class="noborder centpercent">';
-    print '<tr class="liste_titre">';
-    print '<td>'.$langs->trans("Module").'</td>';
-    print '<td>'.$langs->trans("ExportableDatas").'</td>';
-    print '<td>&nbsp;</td>';
-    print '</tr>';
+	// Affiche les modules d'exports
+	print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+	print '<table class="noborder centpercent">';
+	print '<tr class="liste_titre">';
+	print '<td>'.$langs->trans("Module").'</td>';
+	print '<td>'.$langs->trans("ExportableDatas").'</td>';
+	print '<td>&nbsp;</td>';
+	print '</tr>';
 
-    if (count($objexport->array_export_module))
-    {
-    	$sortedarrayofmodules = dol_sort_array($objexport->array_export_module, 'module_position', 'asc', 0, 0, 1);
-    	foreach ($sortedarrayofmodules as $key => $value)
-        {
-            print '<tr class="oddeven"><td nospan="nospan">';
-	        //print img_object($objexport->array_export_module[$key]->getName(),$export->array_export_module[$key]->picto).' ';
-            print $objexport->array_export_module[$key]->getName();
-            print '</td><td>';
+	if (count($objexport->array_export_module))
+	{
+		$sortedarrayofmodules = dol_sort_array($objexport->array_export_module, 'module_position', 'asc', 0, 0, 1);
+		foreach ($sortedarrayofmodules as $key => $value)
+		{
+			print '<tr class="oddeven"><td nospan="nospan">';
+			//print img_object($objexport->array_export_module[$key]->getName(),$export->array_export_module[$key]->picto).' ';
+			print $objexport->array_export_module[$key]->getName();
+			print '</td><td>';
 			$icon = preg_replace('/:.*$/', '', $objexport->array_export_icon[$key]);
 			$label = $objexport->array_export_label[$key];
-            //print $value.'-'.$icon.'-'.$label."<br>";
+			//print $value.'-'.$icon.'-'.$label."<br>";
 			print img_object($objexport->array_export_module[$key]->getName(), $icon).' ';
-            print $label;
-            print '</td><td class="right">';
-            if ($objexport->array_export_perms[$key])
-            {
-            	print '<a href="'.DOL_URL_ROOT.'/exports/export.php?step=2&module_position='.$objexport->array_export_module[$key]->module_position.'&datatoexport='.$objexport->array_export_code[$key].'">'.img_picto($langs->trans("NewExport"), 'next', 'class="fa-15x"').'</a>';
-            } else {
-            	print $langs->trans("NotEnoughPermissions");
-            }
-           	print '</td></tr>';
-        }
-    } else {
-        print '<tr><td class="oddeven" colspan="3">'.$langs->trans("NoExportableData").'</td></tr>';
-    }
-    print '</table>';
-    print '</div>';
+			print $label;
+			print '</td><td class="right">';
+			if ($objexport->array_export_perms[$key])
+			{
+				print '<a href="'.DOL_URL_ROOT.'/exports/export.php?step=2&module_position='.$objexport->array_export_module[$key]->module_position.'&datatoexport='.$objexport->array_export_code[$key].'">'.img_picto($langs->trans("NewExport"), 'next', 'class="fa-15x"').'</a>';
+			} else {
+				print $langs->trans("NotEnoughPermissions");
+			}
+		   	print '</td></tr>';
+		}
+	} else {
+		print '<tr><td class="oddeven" colspan="3">'.$langs->trans("NoExportableData").'</td></tr>';
+	}
+	print '</table>';
+	print '</div>';
 
-    print '</div>';
+	print '</div>';
 }
 
 if ($step == 2 && $datatoexport)
 {
-    llxHeader('', $langs->trans("NewExport"), 'EN:Module_Exports_En|FR:Module_Exports|ES:M&oacute;dulo_Exportaciones');
+	llxHeader('', $langs->trans("NewExport"), 'EN:Module_Exports_En|FR:Module_Exports|ES:M&oacute;dulo_Exportaciones');
 
-    $h = 0;
+	$h = 0;
 
-    $head[$h][0] = DOL_URL_ROOT.'/exports/export.php?step=1';
-    $head[$h][1] = $langs->trans("Step")." 1";
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT.'/exports/export.php?step=1';
+	$head[$h][1] = $langs->trans("Step")." 1";
+	$h++;
 
-    $head[$h][0] = DOL_URL_ROOT.'/exports/export.php?step=2&datatoexport='.$datatoexport;
-    $head[$h][1] = $langs->trans("Step")." 2";
-    $hselected = $h;
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT.'/exports/export.php?step=2&datatoexport='.$datatoexport;
+	$head[$h][1] = $langs->trans("Step")." 2";
+	$hselected = $h;
+	$h++;
 
-    print dol_get_fiche_head($head, $hselected, $langs->trans("NewExport"), -2);
+	print dol_get_fiche_head($head, $hselected, $langs->trans("NewExport"), -2);
 
-    print '<div class="fichecenter">';
-    print '<div class="underbanner clearboth"></div>';
+	print '<div class="fichecenter">';
+	print '<div class="underbanner clearboth"></div>';
 
-    print '<table width="100%" class="border tableforfield">';
+	print '<table width="100%" class="border tableforfield">';
 
-    // Module
-    print '<tr><td class="titlefield">'.$langs->trans("Module").'</td>';
-    print '<td>';
-    //print img_object($objexport->array_export_module[0]->getName(),$objexport->array_export_module[0]->picto).' ';
-    print $objexport->array_export_module[0]->getName();
-    print '</td></tr>';
+	// Module
+	print '<tr><td class="titlefield">'.$langs->trans("Module").'</td>';
+	print '<td>';
+	//print img_object($objexport->array_export_module[0]->getName(),$objexport->array_export_module[0]->picto).' ';
+	print $objexport->array_export_module[0]->getName();
+	print '</td></tr>';
 
-    // Lot de donnees a exporter
-    print '<tr><td>'.$langs->trans("DatasetToExport").'</td>';
-    print '<td>';
+	// Lot de donnees a exporter
+	print '<tr><td>'.$langs->trans("DatasetToExport").'</td>';
+	print '<td>';
 	$icon = preg_replace('/:.*$/', '', $objexport->array_export_icon[0]);
-    $label = $objexport->array_export_label[0];
-    //print $value.'-'.$icon.'-'.$label."<br>";
-    print img_object($objexport->array_export_module[0]->getName(), $icon).' ';
-    print $label;
-    print '</td></tr>';
+	$label = $objexport->array_export_label[0];
+	//print $value.'-'.$icon.'-'.$label."<br>";
+	print img_object($objexport->array_export_module[0]->getName(), $icon).' ';
+	print $label;
+	print '</td></tr>';
 
-    print '</table>';
-    print '</div>';
+	print '</table>';
+	print '</div>';
 
-    dol_fiche_end();
+	print dol_get_fiche_end();
 
-    print '<br>';
+	print '<br>';
 
-    // Combo list of export models
-    print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    print '<input type="hidden" name="action" value="select_model">';
-    print '<input type="hidden" name="step" value="2">';
-    print '<input type="hidden" name="datatoexport" value="'.$datatoexport.'">';
-    print '<div class="valignmiddle marginbottomonly">';
-    print '<span class="opacitymedium">'.$langs->trans("SelectExportFields").'</span> ';
-    if (empty($conf->global->EXPORTS_SHARE_MODELS)) {
-    	$htmlother->select_export_model($exportmodelid, 'exportmodelid', $datatoexport, 1, $user->id);
-    } else {
-    	$htmlother->select_export_model($exportmodelid, 'exportmodelid', $datatoexport, 1);
-    }
-    print ' ';
-    print '<input type="submit" class="button" value="'.$langs->trans("Select").'">';
-    print '</div>';
-    print '</form>';
+	// Combo list of export models
+	print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="action" value="select_model">';
+	print '<input type="hidden" name="step" value="2">';
+	print '<input type="hidden" name="datatoexport" value="'.$datatoexport.'">';
+	print '<div class="valignmiddle marginbottomonly">';
+	print '<span class="opacitymedium">'.$langs->trans("SelectExportFields").'</span> ';
+	if (empty($conf->global->EXPORTS_SHARE_MODELS)) {
+		$htmlother->select_export_model($exportmodelid, 'exportmodelid', $datatoexport, 1, $user->id);
+	} else {
+		$htmlother->select_export_model($exportmodelid, 'exportmodelid', $datatoexport, 1);
+	}
+	print ' ';
+	print '<input type="submit" class="button" value="'.$langs->trans("Select").'">';
+	print '</div>';
+	print '</form>';
 
 
-    print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
-    print '<table class="noborder centpercent">';
-    print '<tr class="liste_titre">';
+	print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+	print '<table class="noborder centpercent">';
+	print '<tr class="liste_titre">';
 	print '<td>'.$langs->trans("Entities").'</td>';
-    print '<td>'.$langs->trans("ExportableFields").'</td>';
-    print '<td width="100" class="center">';
-    print '<a class="liste_titre commonlink" title='.$langs->trans("All").' alt='.$langs->trans("All").' href="'.$_SERVER["PHP_SELF"].'?step=2&datatoexport='.$datatoexport.'&action=selectfield&field=all">'.$langs->trans("All")."</a>";
-    print ' / ';
-    print '<a class="liste_titre commonlink" title='.$langs->trans("None").' alt='.$langs->trans("None").' href="'.$_SERVER["PHP_SELF"].'?step=2&datatoexport='.$datatoexport.'&action=unselectfield&field=all">'.$langs->trans("None")."</a>";
-    print '</td>';
-    print '<td width="44%">'.$langs->trans("ExportedFields").'</td>';
-    print '</tr>';
+	print '<td>'.$langs->trans("ExportableFields").'</td>';
+	print '<td width="100" class="center">';
+	print '<a class="liste_titre commonlink" title='.$langs->trans("All").' alt='.$langs->trans("All").' href="'.$_SERVER["PHP_SELF"].'?step=2&datatoexport='.$datatoexport.'&action=selectfield&field=all">'.$langs->trans("All")."</a>";
+	print ' / ';
+	print '<a class="liste_titre commonlink" title='.$langs->trans("None").' alt='.$langs->trans("None").' href="'.$_SERVER["PHP_SELF"].'?step=2&datatoexport='.$datatoexport.'&action=unselectfield&field=all">'.$langs->trans("None")."</a>";
+	print '</td>';
+	print '<td width="44%">'.$langs->trans("ExportedFields").'</td>';
+	print '</tr>';
 
-    // Champs exportables
-    $fieldsarray = $objexport->array_export_fields[0];
-    // Select request if all fields are selected
-    $sqlmaxforexport = $objexport->build_sql(0, array(), array());
+	// Champs exportables
+	$fieldsarray = $objexport->array_export_fields[0];
+	// Select request if all fields are selected
+	$sqlmaxforexport = $objexport->build_sql(0, array(), array());
 
 	//    $this->array_export_module[0]=$module;
 	//    $this->array_export_code[0]=$module->export_code[$r];
@@ -565,48 +565,48 @@ if ($step == 2 && $datatoexport)
 	//    $this->array_export_entities[0]=$module->export_fields_entities[$r];
 	//    $this->array_export_alias[0]=$module->export_fields_alias[$r];
 
-    $i = 0;
+	$i = 0;
 
-    foreach ($fieldsarray as $code=>$label)
-    {
-        print '<tr class="oddeven">';
+	foreach ($fieldsarray as $code=>$label)
+	{
+		print '<tr class="oddeven">';
 
-        $i++;
+		$i++;
 
-        $entity = (!empty($objexport->array_export_entities[0][$code]) ? $objexport->array_export_entities[0][$code] : $objexport->array_export_icon[0]);
-        $entityicon = strtolower(!empty($entitytoicon[$entity]) ? $entitytoicon[$entity] : $entity);
-        $entitylang = (!empty($entitytolang[$entity]) ? $entitytolang[$entity] : $entity);
+		$entity = (!empty($objexport->array_export_entities[0][$code]) ? $objexport->array_export_entities[0][$code] : $objexport->array_export_icon[0]);
+		$entityicon = strtolower(!empty($entitytoicon[$entity]) ? $entitytoicon[$entity] : $entity);
+		$entitylang = (!empty($entitytolang[$entity]) ? $entitytolang[$entity] : $entity);
 
-        print '<td class="nowrap">';
-        // If value of entityicon=entitylang='icon:Label'
-        //print $code.'-'.$label.'-'.$entity;
+		print '<td class="nowrap">';
+		// If value of entityicon=entitylang='icon:Label'
+		//print $code.'-'.$label.'-'.$entity;
 
-        $tmparray = explode(':', $entityicon);
-        if (count($tmparray) >= 2)
-        {
-            $entityicon = $tmparray[0];
-            $entitylang = $tmparray[1];
-        }
-        print img_object('', $entityicon).' '.$langs->trans($entitylang);
-        print '</td>';
+		$tmparray = explode(':', $entityicon);
+		if (count($tmparray) >= 2)
+		{
+			$entityicon = $tmparray[0];
+			$entitylang = $tmparray[1];
+		}
+		print img_object('', $entityicon).' '.$langs->trans($entitylang);
+		print '</td>';
 
-        $text = (empty($objexport->array_export_special[0][$code]) ? '' : '<i>').$langs->trans($label).(empty($objexport->array_export_special[0][$code]) ? '' : '</i>');
+		$text = (empty($objexport->array_export_special[0][$code]) ? '' : '<i>').$langs->trans($label).(empty($objexport->array_export_special[0][$code]) ? '' : '</i>');
 
-        $tablename = getablenamefromfield($code, $sqlmaxforexport);
-        $htmltext = '<b>'.$langs->trans("Name").":</b> ".$text.'<br>';
-        if (!empty($objexport->array_export_special[0][$code]))
-        {
-            $htmltext .= '<b>'.$langs->trans("ComputedField")." -> ".$langs->trans("Method")." :</b> ".$objexport->array_export_special[0][$code]."<br>";
-        } else {
-            $htmltext .= '<b>'.$langs->trans("Table")." -> ".$langs->trans("Field").":</b> ".$tablename." -> ".preg_replace('/^.*\./', '', $code)."<br>";
-        }
+		$tablename = getablenamefromfield($code, $sqlmaxforexport);
+		$htmltext = '<b>'.$langs->trans("Name").":</b> ".$text.'<br>';
+		if (!empty($objexport->array_export_special[0][$code]))
+		{
+			$htmltext .= '<b>'.$langs->trans("ComputedField")." -> ".$langs->trans("Method")." :</b> ".$objexport->array_export_special[0][$code]."<br>";
+		} else {
+			$htmltext .= '<b>'.$langs->trans("Table")." -> ".$langs->trans("Field").":</b> ".$tablename." -> ".preg_replace('/^.*\./', '', $code)."<br>";
+		}
    		if (!empty($objexport->array_export_examplevalues[0][$code]))
 		{
-		    $htmltext .= '<b>'.$langs->trans("SourceExample").':</b> '.$objexport->array_export_examplevalues[0][$code].'<br>';
+			$htmltext .= '<b>'.$langs->trans("SourceExample").':</b> '.$objexport->array_export_examplevalues[0][$code].'<br>';
 		}
-    	if (!empty($objexport->array_export_TypeFields[0][$code]))
+		if (!empty($objexport->array_export_TypeFields[0][$code]))
 		{
-		    $htmltext .= '<b>'.$langs->trans("Type").':</b> '.$objexport->array_export_TypeFields[0][$code].'<br>';
+			$htmltext .= '<b>'.$langs->trans("Type").':</b> '.$objexport->array_export_TypeFields[0][$code].'<br>';
 		}
 		if (!empty($objexport->array_export_help[0][$code]))
 		{
@@ -614,38 +614,38 @@ if ($step == 2 && $datatoexport)
 		}
 
 		if (isset($array_selected[$code]) && $array_selected[$code])
-        {
-            // Selected fields
-            print '<td>&nbsp;</td>';
-            print '<td class="center"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?step=2&datatoexport='.$datatoexport.'&action=unselectfield&field='.$code.'">'.img_left('default', 0, 'style="max-width: 20px"').'</a></td>';
-            print '<td>';
-            //print $text.'-'.$htmltext."<br>";
-            print $form->textwithpicto($text, $htmltext);
-			//print ' ('.$code.')';
-            print '</td>';
-        } else {
-        	// Fields not selected
-            print '<td>';
+		{
+			// Selected fields
+			print '<td>&nbsp;</td>';
+			print '<td class="center"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?step=2&datatoexport='.$datatoexport.'&action=unselectfield&field='.$code.'">'.img_left('default', 0, 'style="max-width: 20px"').'</a></td>';
+			print '<td>';
 			//print $text.'-'.$htmltext."<br>";
 			print $form->textwithpicto($text, $htmltext);
 			//print ' ('.$code.')';
-            print '</td>';
-            print '<td class="center"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?step=2&datatoexport='.$datatoexport.'&action=selectfield&field='.$code.'">'.img_right('default', 0, 'style="max-width: 20px"').'</a></td>';
-            print '<td>&nbsp;</td>';
-        }
+			print '</td>';
+		} else {
+			// Fields not selected
+			print '<td>';
+			//print $text.'-'.$htmltext."<br>";
+			print $form->textwithpicto($text, $htmltext);
+			//print ' ('.$code.')';
+			print '</td>';
+			print '<td class="center"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?step=2&datatoexport='.$datatoexport.'&action=selectfield&field='.$code.'">'.img_right('default', 0, 'style="max-width: 20px"').'</a></td>';
+			print '<td>&nbsp;</td>';
+		}
 
-        print '</tr>';
-    }
+		print '</tr>';
+	}
 
-    print '</table>';
-    print '</div>';
+	print '</table>';
+	print '</div>';
 
-    /*
+	/*
      * Barre d'action
      */
-    print '<div class="tabsAction tabsActionNoBottom">';
+	print '<div class="tabsAction tabsActionNoBottom">';
 
-    if (count($array_selected))
+	if (count($array_selected))
 	{
 		// If filters exist
 		if ($usefilters && isset($objexport->array_export_TypeFields[0]) && is_array($objexport->array_export_TypeFields[0]))
@@ -658,19 +658,19 @@ if ($step == 2 && $datatoexport)
 		print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("SelectAtLeastOneField")).'">'.$langs->trans("NextStep").'</a>';
 	}
 
-    print '</div>';
+	print '</div>';
 }
 
 if ($step == 3 && $datatoexport)
 {
-    if (count($array_selected) < 1)      // This occurs when going back to page after sessecion expired
-    {
-        // Switch to step 2
-        header("Location: ".DOL_URL_ROOT.'/exports/export.php?step=2&datatoexport='.$datatoexport);
-        exit;
-    }
+	if (count($array_selected) < 1)      // This occurs when going back to page after sessecion expired
+	{
+		// Switch to step 2
+		header("Location: ".DOL_URL_ROOT.'/exports/export.php?step=2&datatoexport='.$datatoexport);
+		exit;
+	}
 
-    llxHeader('', $langs->trans("NewExport"), 'EN:Module_Exports_En|FR:Module_Exports|ES:M&oacute;dulo_Exportaciones');
+	llxHeader('', $langs->trans("NewExport"), 'EN:Module_Exports_En|FR:Module_Exports|ES:M&oacute;dulo_Exportaciones');
 
 	$h = 0;
 
@@ -689,8 +689,8 @@ if ($step == 3 && $datatoexport)
 
 	print dol_get_fiche_head($head, $hselected, $langs->trans("NewExport"), -2);
 
-    print '<div class="fichecenter">';
-    print '<div class="underbanner clearboth"></div>';
+	print '<div class="fichecenter">';
+	print '<div class="underbanner clearboth"></div>';
 	print '<table width="100%" class="border tableforfield">';
 
 	// Module
@@ -735,7 +735,7 @@ if ($step == 3 && $datatoexport)
 
 	print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
 
-    print '<table class="noborder centpercent">';
+	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre">';
 	print '<td>'.$langs->trans("Entities").'</td>';
 	//print '<td>'.$langs->trans("ExportableFields").'</td>';
@@ -782,19 +782,19 @@ if ($step == 3 && $datatoexport)
 
 		$tablename = getablenamefromfield($code, $sqlmaxforexport);
 		$htmltext = '<b>'.$langs->trans("Name").':</b> '.$text.'<br>';
-        if (!empty($objexport->array_export_special[0][$code]))
+		if (!empty($objexport->array_export_special[0][$code]))
 		{
-		    $htmltext .= '<b>'.$langs->trans("ComputedField")." -> ".$langs->trans("Method")." :</b> ".$objexport->array_export_special[0][$code]."<br>";
+			$htmltext .= '<b>'.$langs->trans("ComputedField")." -> ".$langs->trans("Method")." :</b> ".$objexport->array_export_special[0][$code]."<br>";
 		} else {
-		    $htmltext .= '<b>'.$langs->trans("Table")." -> ".$langs->trans("Field").":</b> ".$tablename." -> ".preg_replace('/^.*\./', '', $code)."<br>";
+			$htmltext .= '<b>'.$langs->trans("Table")." -> ".$langs->trans("Field").":</b> ".$tablename." -> ".preg_replace('/^.*\./', '', $code)."<br>";
 		}
 		if (!empty($objexport->array_export_examplevalues[0][$code]))
 		{
-		    $htmltext .= '<b>'.$langs->trans("SourceExample").':</b> '.$objexport->array_export_examplevalues[0][$code].'<br>';
+			$htmltext .= '<b>'.$langs->trans("SourceExample").':</b> '.$objexport->array_export_examplevalues[0][$code].'<br>';
 		}
 		if (!empty($objexport->array_export_TypeFields[0][$code]))
 		{
-		    $htmltext .= '<b>'.$langs->trans("Type").':</b> '.$objexport->array_export_TypeFields[0][$code].'<br>';
+			$htmltext .= '<b>'.$langs->trans("Type").':</b> '.$objexport->array_export_TypeFields[0][$code].'<br>';
 		}
 		if (!empty($objexport->array_export_help[0][$code]))
 		{
@@ -824,7 +824,7 @@ if ($step == 3 && $datatoexport)
 	}
 
 	print '</table>';
-    print '</div>';
+	print '</div>';
 
 	print '</div>';
 
@@ -839,214 +839,214 @@ if ($step == 3 && $datatoexport)
 
 if ($step == 4 && $datatoexport)
 {
-    if (count($array_selected) < 1)     // This occurs when going back to page after sessecion expired
-    {
-        // Switch to step 2
-        header("Location: ".DOL_URL_ROOT.'/exports/export.php?step=2&datatoexport='.$datatoexport);
-        exit;
-    }
+	if (count($array_selected) < 1)     // This occurs when going back to page after sessecion expired
+	{
+		// Switch to step 2
+		header("Location: ".DOL_URL_ROOT.'/exports/export.php?step=2&datatoexport='.$datatoexport);
+		exit;
+	}
 
-    asort($array_selected);
+	asort($array_selected);
 
-    llxHeader('', $langs->trans("NewExport"), 'EN:Module_Exports_En|FR:Module_Exports|ES:M&oacute;dulo_Exportaciones');
+	llxHeader('', $langs->trans("NewExport"), 'EN:Module_Exports_En|FR:Module_Exports|ES:M&oacute;dulo_Exportaciones');
 
-    $stepoffset = 0;
-    $h = 0;
+	$stepoffset = 0;
+	$h = 0;
 
-    $head[$h][0] = DOL_URL_ROOT.'/exports/export.php?step=1';
-    $head[$h][1] = $langs->trans("Step")." 1";
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT.'/exports/export.php?step=1';
+	$head[$h][1] = $langs->trans("Step")." 1";
+	$h++;
 
-    $head[$h][0] = DOL_URL_ROOT.'/exports/export.php?step=2&datatoexport='.$datatoexport;
-    $head[$h][1] = $langs->trans("Step")." 2";
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT.'/exports/export.php?step=2&datatoexport='.$datatoexport;
+	$head[$h][1] = $langs->trans("Step")." 2";
+	$h++;
 
-    // If filters exist
-    if ($usefilters && isset($objexport->array_export_TypeFields[0]) && is_array($objexport->array_export_TypeFields[0]))
-    {
-    	$head[$h][0] = DOL_URL_ROOT.'/exports/export.php?step=3&datatoexport='.$datatoexport;
-    	$head[$h][1] = $langs->trans("Step")." 3";
-    	$h++;
-    	$stepoffset++;
-    }
+	// If filters exist
+	if ($usefilters && isset($objexport->array_export_TypeFields[0]) && is_array($objexport->array_export_TypeFields[0]))
+	{
+		$head[$h][0] = DOL_URL_ROOT.'/exports/export.php?step=3&datatoexport='.$datatoexport;
+		$head[$h][1] = $langs->trans("Step")." 3";
+		$h++;
+		$stepoffset++;
+	}
 
-    $head[$h][0] = DOL_URL_ROOT.'/exports/export.php?step=4&datatoexport='.$datatoexport;
-    $head[$h][1] = $langs->trans("Step")." ".(3 + $stepoffset);
-    $hselected = $h;
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT.'/exports/export.php?step=4&datatoexport='.$datatoexport;
+	$head[$h][1] = $langs->trans("Step")." ".(3 + $stepoffset);
+	$hselected = $h;
+	$h++;
 
-    print dol_get_fiche_head($head, $hselected, $langs->trans("NewExport"), -2);
+	print dol_get_fiche_head($head, $hselected, $langs->trans("NewExport"), -2);
 
-    print '<div class="fichecenter">';
-    print '<div class="underbanner clearboth"></div>';
-    print '<table width="100%" class="border tableforfield">';
+	print '<div class="fichecenter">';
+	print '<div class="underbanner clearboth"></div>';
+	print '<table width="100%" class="border tableforfield">';
 
-    // Module
-    print '<tr><td class="titlefield tableforfield">'.$langs->trans("Module").'</td>';
-    print '<td>';
-    //print img_object($objexport->array_export_module[0]->getName(),$objexport->array_export_module[0]->picto).' ';
-    print $objexport->array_export_module[0]->getName();
-    print '</td></tr>';
+	// Module
+	print '<tr><td class="titlefield tableforfield">'.$langs->trans("Module").'</td>';
+	print '<td>';
+	//print img_object($objexport->array_export_module[0]->getName(),$objexport->array_export_module[0]->picto).' ';
+	print $objexport->array_export_module[0]->getName();
+	print '</td></tr>';
 
-    // Lot de donnees a exporter
-    print '<tr><td>'.$langs->trans("DatasetToExport").'</td>';
-    print '<td>';
+	// Lot de donnees a exporter
+	print '<tr><td>'.$langs->trans("DatasetToExport").'</td>';
+	print '<td>';
 	$icon = preg_replace('/:.*$/', '', $objexport->array_export_icon[0]);
-    print img_object($objexport->array_export_module[0]->getName(), $icon).' ';
-    print $objexport->array_export_label[0];
-    print '</td></tr>';
+	print img_object($objexport->array_export_module[0]->getName(), $icon).' ';
+	print $objexport->array_export_label[0];
+	print '</td></tr>';
 
-    // List of exported fields
-    print '<tr><td>'.$langs->trans("ExportedFields").'</td>';
-    $list = '';
-    foreach ($array_selected as $code=>$value)
-    {
-        $list .= (!empty($list) ? ', ' : '');
-        $list .= $langs->trans($objexport->array_export_fields[0][$code]);
-    }
-    print '<td>'.$list.'</td>';
-    print '</tr>';
+	// List of exported fields
+	print '<tr><td>'.$langs->trans("ExportedFields").'</td>';
+	$list = '';
+	foreach ($array_selected as $code=>$value)
+	{
+		$list .= (!empty($list) ? ', ' : '');
+		$list .= $langs->trans($objexport->array_export_fields[0][$code]);
+	}
+	print '<td>'.$list.'</td>';
+	print '</tr>';
 
-    // List of filtered fiels
-    if (isset($objexport->array_export_TypeFields[0]) && is_array($objexport->array_export_TypeFields[0]))
-    {
-    	print '<tr><td>'.$langs->trans("FilteredFields").'</td>';
-    	$list = '';
-    	if (!empty($array_filtervalue))
-    	{
-    		foreach ($array_filtervalue as $code=>$value)
-    		{
-    			if (isset($objexport->array_export_fields[0][$code]))
-    			{
-    				$list .= ($list ? ', ' : '');
-    				if (isset($array_filtervalue[$code]) && preg_match('/^\s*[<>]/', $array_filtervalue[$code])) $list .= $langs->trans($objexport->array_export_fields[0][$code]).(isset($array_filtervalue[$code]) ? $array_filtervalue[$code] : '');
-    				else $list .= $langs->trans($objexport->array_export_fields[0][$code])."='".(isset($array_filtervalue[$code]) ? $array_filtervalue[$code] : '')."'";
-    			}
-    		}
-    	}
-    	print '<td>'.(!empty($list) ? $list : '<span class="opacitymedium">'.$langs->trans("None").'</span>').'</td>';
-    	print '</tr>';
-    }
+	// List of filtered fiels
+	if (isset($objexport->array_export_TypeFields[0]) && is_array($objexport->array_export_TypeFields[0]))
+	{
+		print '<tr><td>'.$langs->trans("FilteredFields").'</td>';
+		$list = '';
+		if (!empty($array_filtervalue))
+		{
+			foreach ($array_filtervalue as $code=>$value)
+			{
+				if (isset($objexport->array_export_fields[0][$code]))
+				{
+					$list .= ($list ? ', ' : '');
+					if (isset($array_filtervalue[$code]) && preg_match('/^\s*[<>]/', $array_filtervalue[$code])) $list .= $langs->trans($objexport->array_export_fields[0][$code]).(isset($array_filtervalue[$code]) ? $array_filtervalue[$code] : '');
+					else $list .= $langs->trans($objexport->array_export_fields[0][$code])."='".(isset($array_filtervalue[$code]) ? $array_filtervalue[$code] : '')."'";
+				}
+			}
+		}
+		print '<td>'.(!empty($list) ? $list : '<span class="opacitymedium">'.$langs->trans("None").'</span>').'</td>';
+		print '</tr>';
+	}
 
-    print '</table>';
-    print '</div>';
+	print '</table>';
+	print '</div>';
 
-    print '<br>';
+	print '<br>';
 
-    // Select request if all fields are selected
-    $sqlmaxforexport = $objexport->build_sql(0, array(), array());
+	// Select request if all fields are selected
+	$sqlmaxforexport = $objexport->build_sql(0, array(), array());
 
-    print '<div class="marginbottomonly"><span class="opacitymedium">'.$langs->trans("ChooseFieldsOrdersAndTitle").'</span></div>';
+	print '<div class="marginbottomonly"><span class="opacitymedium">'.$langs->trans("ChooseFieldsOrdersAndTitle").'</span></div>';
 
-    print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
-    print '<table class="noborder centpercent">';
-    print '<tr class="liste_titre">';
-    print '<td>'.$langs->trans("Entities").'</td>';
-    print '<td>'.$langs->trans("ExportedFields").'</td>';
-    print '<td class="right" colspan="2">'.$langs->trans("Position").'</td>';
-    //print '<td>&nbsp;</td>';
-    //print '<td>'.$langs->trans("FieldsTitle").'</td>';
-    print '</tr>';
+	print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+	print '<table class="noborder centpercent">';
+	print '<tr class="liste_titre">';
+	print '<td>'.$langs->trans("Entities").'</td>';
+	print '<td>'.$langs->trans("ExportedFields").'</td>';
+	print '<td class="right" colspan="2">'.$langs->trans("Position").'</td>';
+	//print '<td>&nbsp;</td>';
+	//print '<td>'.$langs->trans("FieldsTitle").'</td>';
+	print '</tr>';
 
-    foreach ($array_selected as $code=>$value)
-    {
-        print '<tr class="oddeven">';
+	foreach ($array_selected as $code=>$value)
+	{
+		print '<tr class="oddeven">';
 
-        $entity = (!empty($objexport->array_export_entities[0][$code]) ? $objexport->array_export_entities[0][$code] : $objexport->array_export_icon[0]);
-        $entityicon = strtolower(!empty($entitytoicon[$entity]) ? $entitytoicon[$entity] : $entity);
-        $entitylang = (!empty($entitytolang[$entity]) ? $entitytolang[$entity] : $entity);
+		$entity = (!empty($objexport->array_export_entities[0][$code]) ? $objexport->array_export_entities[0][$code] : $objexport->array_export_icon[0]);
+		$entityicon = strtolower(!empty($entitytoicon[$entity]) ? $entitytoicon[$entity] : $entity);
+		$entitylang = (!empty($entitytolang[$entity]) ? $entitytolang[$entity] : $entity);
 
-        print '<td class="nowrap">';
-        // If value of entityicon=entitylang='icon:Label'
-        $tmparray = explode(':', $entityicon);
-        if (count($tmparray) >= 2)
-        {
-            $entityicon = $tmparray[0];
-            $entitylang = $tmparray[1];
-        }
-        print img_object('', $entityicon).' '.$langs->trans($entitylang);
-        print '</td>';
+		print '<td class="nowrap">';
+		// If value of entityicon=entitylang='icon:Label'
+		$tmparray = explode(':', $entityicon);
+		if (count($tmparray) >= 2)
+		{
+			$entityicon = $tmparray[0];
+			$entitylang = $tmparray[1];
+		}
+		print img_object('', $entityicon).' '.$langs->trans($entitylang);
+		print '</td>';
 
-        $labelName = $objexport->array_export_fields[0][$code];
+		$labelName = $objexport->array_export_fields[0][$code];
 
 		$text = (empty($objexport->array_export_special[0][$code]) ? '' : '<i>').$langs->trans($labelName).(empty($objexport->array_export_special[0][$code]) ? '' : '</i>');
 
-        $tablename = getablenamefromfield($code, $sqlmaxforexport);
-        $htmltext = '<b>'.$langs->trans("Name").':</b> '.$text.'<br>';
-        if (!empty($objexport->array_export_special[0][$code]))
-        {
-            $htmltext .= '<b>'.$langs->trans("ComputedField")." -> ".$langs->trans("Method")." :</b> ".$objexport->array_export_special[0][$code]."<br>";
-        } else {
-            $htmltext .= '<b>'.$langs->trans("Table")." -> ".$langs->trans("Field").":</b> ".$tablename." -> ".preg_replace('/^.*\./', '', $code)."<br>";
-        }
-        if (!empty($objexport->array_export_examplevalues[0][$code]))
-        {
-            $htmltext .= '<b>'.$langs->trans("SourceExample").':</b> '.$objexport->array_export_examplevalues[0][$code].'<br>';
-        }
-        if (!empty($objexport->array_export_TypeFields[0][$code]))
-        {
-            $htmltext .= '<b>'.$langs->trans("Type").':</b> '.$objexport->array_export_TypeFields[0][$code].'<br>';
-        }
-        if (!empty($objexport->array_export_help[0][$code]))
-        {
-        	$htmltext .= '<b>'.$langs->trans("Help").':</b> '.$langs->trans($objexport->array_export_help[0][$code]).'<br>';
-        }
+		$tablename = getablenamefromfield($code, $sqlmaxforexport);
+		$htmltext = '<b>'.$langs->trans("Name").':</b> '.$text.'<br>';
+		if (!empty($objexport->array_export_special[0][$code]))
+		{
+			$htmltext .= '<b>'.$langs->trans("ComputedField")." -> ".$langs->trans("Method")." :</b> ".$objexport->array_export_special[0][$code]."<br>";
+		} else {
+			$htmltext .= '<b>'.$langs->trans("Table")." -> ".$langs->trans("Field").":</b> ".$tablename." -> ".preg_replace('/^.*\./', '', $code)."<br>";
+		}
+		if (!empty($objexport->array_export_examplevalues[0][$code]))
+		{
+			$htmltext .= '<b>'.$langs->trans("SourceExample").':</b> '.$objexport->array_export_examplevalues[0][$code].'<br>';
+		}
+		if (!empty($objexport->array_export_TypeFields[0][$code]))
+		{
+			$htmltext .= '<b>'.$langs->trans("Type").':</b> '.$objexport->array_export_TypeFields[0][$code].'<br>';
+		}
+		if (!empty($objexport->array_export_help[0][$code]))
+		{
+			$htmltext .= '<b>'.$langs->trans("Help").':</b> '.$langs->trans($objexport->array_export_help[0][$code]).'<br>';
+		}
 
-        print '<td>';
-        print $form->textwithpicto($text, $htmltext);
+		print '<td>';
+		print $form->textwithpicto($text, $htmltext);
 		//print ' ('.$code.')';
-        print '</td>';
+		print '</td>';
 
-        print '<td class="right" width="100">';
-        print $value.' ';
-        print '</td><td class="center nowraponall" width="40">';
-        if ($value < count($array_selected)) print '<a href="'.$_SERVER["PHP_SELF"].'?step='.$step.'&datatoexport='.$datatoexport.'&action=downfield&field='.$code.'">'.img_down().'</a>';
-        if ($value > 1) print '<a href="'.$_SERVER["PHP_SELF"].'?step='.$step.'&datatoexport='.$datatoexport.'&action=upfield&field='.$code.'">'.img_up().'</a>';
-        print '</td>';
+		print '<td class="right" width="100">';
+		print $value.' ';
+		print '</td><td class="center nowraponall" width="40">';
+		if ($value < count($array_selected)) print '<a href="'.$_SERVER["PHP_SELF"].'?step='.$step.'&datatoexport='.$datatoexport.'&action=downfield&field='.$code.'">'.img_down().'</a>';
+		if ($value > 1) print '<a href="'.$_SERVER["PHP_SELF"].'?step='.$step.'&datatoexport='.$datatoexport.'&action=upfield&field='.$code.'">'.img_up().'</a>';
+		print '</td>';
 
-        //print '<td>&nbsp;</td>';
-        //print '<td>'.$langs->trans($objexport->array_export_fields[0][$code]).'</td>';
+		//print '<td>&nbsp;</td>';
+		//print '<td>'.$langs->trans($objexport->array_export_fields[0][$code]).'</td>';
 
-        print '</tr>';
-    }
+		print '</tr>';
+	}
 
-    print '</table>';
-    print '</div>';
+	print '</table>';
+	print '</div>';
 
-    print '</div>';
+	print '</div>';
 
-    /*
+	/*
      * Barre d'action
      *
      */
-    print '<div class="tabsAction">';
+	print '<div class="tabsAction">';
 
-    if (count($array_selected))
-    {
-        print '<a class="butAction" href="export.php?step='.($step + 1).'&datatoexport='.$datatoexport.'">'.$langs->trans("NextStep").'</a>';
-    }
+	if (count($array_selected))
+	{
+		print '<a class="butAction" href="export.php?step='.($step + 1).'&datatoexport='.$datatoexport.'">'.$langs->trans("NextStep").'</a>';
+	}
 
-    print '</div>';
+	print '</div>';
 
 
 	// Area for profils export
 	if (count($array_selected))
-    {
+	{
 		print '<br>';
 
 		print '<div class="marginbottomonly">';
-        print '<span class="opacitymedium">'.$langs->trans("SaveExportModel").'</span>';
-        print '</div>';
+		print '<span class="opacitymedium">'.$langs->trans("SaveExportModel").'</span>';
+		print '</div>';
 
 		print '<form class="nocellnopadd" action="export.php" method="post">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
-        print '<input type="hidden" name="action" value="add_export_model">';
-        print '<input type="hidden" name="step" value="'.$step.'">';
-        print '<input type="hidden" name="datatoexport" value="'.$datatoexport.'">';
-        print '<input type="hidden" name="hexa" value="'.$hexa.'">';
+		print '<input type="hidden" name="action" value="add_export_model">';
+		print '<input type="hidden" name="step" value="'.$step.'">';
+		print '<input type="hidden" name="datatoexport" value="'.$datatoexport.'">';
+		print '<input type="hidden" name="hexa" value="'.$hexa.'">';
 
-        print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
-        print '<table class="noborder centpercent">';
+		print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+		print '<table class="noborder centpercent">';
 		print '<tr class="liste_titre">';
 		print '<td>'.$langs->trans("ExportModelName").'</td>';
 		print '<td>&nbsp;</td>';
@@ -1054,11 +1054,11 @@ if ($step == 4 && $datatoexport)
 
 		print '<tr class="oddeven">';
 		print '<td><input name="export_name" size="32" value=""></td><td class="right">';
-        print '<input type="submit" class="button reposition" value="'.$langs->trans("Save").'">';
-        print '</td></tr>';
+		print '<input type="submit" class="button reposition" value="'.$langs->trans("Save").'">';
+		print '</td></tr>';
 
-        // List of existing export profils
-    	$sql = "SELECT rowid, label";
+		// List of existing export profils
+		$sql = "SELECT rowid, label";
 		$sql .= " FROM ".MAIN_DB_PREFIX."export_model";
 		$sql .= " WHERE type = '".$db->escape($datatoexport)."'";
 		if (empty($conf->global->EXPORTS_SHARE_MODELS))$sql .= " AND fk_user=".$user->id;
@@ -1084,168 +1084,168 @@ if ($step == 4 && $datatoexport)
 			dol_print_error($db);
 		}
 
-        print '</table>';
-        print '</div>';
+		print '</table>';
+		print '</div>';
 
-        print '</form>';
-    }
+		print '</form>';
+	}
 }
 
 if ($step == 5 && $datatoexport)
 {
-    if (count($array_selected) < 1)      // This occurs when going back to page after sessecion expired
-    {
-        // Switch to step 2
-        header("Location: ".DOL_URL_ROOT.'/exports/export.php?step=2&datatoexport='.$datatoexport);
-        exit;
-    }
+	if (count($array_selected) < 1)      // This occurs when going back to page after sessecion expired
+	{
+		// Switch to step 2
+		header("Location: ".DOL_URL_ROOT.'/exports/export.php?step=2&datatoexport='.$datatoexport);
+		exit;
+	}
 
 	asort($array_selected);
 
-    llxHeader('', $langs->trans("NewExport"), 'EN:Module_Exports_En|FR:Module_Exports|ES:M&oacute;dulo_Exportaciones');
+	llxHeader('', $langs->trans("NewExport"), 'EN:Module_Exports_En|FR:Module_Exports|ES:M&oacute;dulo_Exportaciones');
 
-    $h = 0;
-    $stepoffset = 0;
+	$h = 0;
+	$stepoffset = 0;
 
-    $head[$h][0] = DOL_URL_ROOT.'/exports/export.php?step=1';
-    $head[$h][1] = $langs->trans("Step")." 1";
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT.'/exports/export.php?step=1';
+	$head[$h][1] = $langs->trans("Step")." 1";
+	$h++;
 
-    $head[$h][0] = DOL_URL_ROOT.'/exports/export.php?step=2&datatoexport='.$datatoexport;
-    $head[$h][1] = $langs->trans("Step")." 2";
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT.'/exports/export.php?step=2&datatoexport='.$datatoexport;
+	$head[$h][1] = $langs->trans("Step")." 2";
+	$h++;
 
-    // si le filtrage est parametre pour l'export ou pas
-    if ($usefilters && isset($objexport->array_export_TypeFields[0]) && is_array($objexport->array_export_TypeFields[0]))
-    {
-    	$head[$h][0] = DOL_URL_ROOT.'/exports/export.php?step=3&datatoexport='.$datatoexport;
-    	$head[$h][1] = $langs->trans("Step")." 3";
-    	$h++;
-    	$stepoffset++;
-    }
+	// si le filtrage est parametre pour l'export ou pas
+	if ($usefilters && isset($objexport->array_export_TypeFields[0]) && is_array($objexport->array_export_TypeFields[0]))
+	{
+		$head[$h][0] = DOL_URL_ROOT.'/exports/export.php?step=3&datatoexport='.$datatoexport;
+		$head[$h][1] = $langs->trans("Step")." 3";
+		$h++;
+		$stepoffset++;
+	}
 
-    $head[$h][0] = DOL_URL_ROOT.'/exports/export.php?step=4&datatoexport='.$datatoexport;
-    $head[$h][1] = $langs->trans("Step")." ".(3 + $stepoffset);
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT.'/exports/export.php?step=4&datatoexport='.$datatoexport;
+	$head[$h][1] = $langs->trans("Step")." ".(3 + $stepoffset);
+	$h++;
 
-    $head[$h][0] = DOL_URL_ROOT.'/exports/export.php?step=5&datatoexport='.$datatoexport;
-    $head[$h][1] = $langs->trans("Step")." ".(4 + $stepoffset);
-    $hselected = $h;
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT.'/exports/export.php?step=5&datatoexport='.$datatoexport;
+	$head[$h][1] = $langs->trans("Step")." ".(4 + $stepoffset);
+	$hselected = $h;
+	$h++;
 
-    print dol_get_fiche_head($head, $hselected, $langs->trans("NewExport"), -2);
+	print dol_get_fiche_head($head, $hselected, $langs->trans("NewExport"), -2);
 
-    /*
+	/*
      * Confirmation suppression fichier
      */
-    if ($action == 'remove_file')
-    {
-    	print $form->formconfirm($_SERVER["PHP_SELF"].'?step=5&datatoexport='.$datatoexport.'&file='.urlencode(GETPOST("file")), $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile'), 'confirm_deletefile', '', 0, 1);
-    }
+	if ($action == 'remove_file')
+	{
+		print $form->formconfirm($_SERVER["PHP_SELF"].'?step=5&datatoexport='.$datatoexport.'&file='.urlencode(GETPOST("file")), $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile'), 'confirm_deletefile', '', 0, 1);
+	}
 
-    print '<div class="fichecenter">';
-    print '<div class="underbanner clearboth"></div>';
+	print '<div class="fichecenter">';
+	print '<div class="underbanner clearboth"></div>';
 
-    print '<table width="100%" class="border tableforfield">';
+	print '<table width="100%" class="border tableforfield">';
 
-    // Module
-    print '<tr><td class="titlefield">'.$langs->trans("Module").'</td>';
-    print '<td>';
-    //print img_object($objexport->array_export_module[0]->getName(),$objexport->array_export_module[0]->picto).' ';
-    print $objexport->array_export_module[0]->getName();
-    print '</td></tr>';
+	// Module
+	print '<tr><td class="titlefield">'.$langs->trans("Module").'</td>';
+	print '<td>';
+	//print img_object($objexport->array_export_module[0]->getName(),$objexport->array_export_module[0]->picto).' ';
+	print $objexport->array_export_module[0]->getName();
+	print '</td></tr>';
 
-    // Dataset to export
-    print '<tr><td>'.$langs->trans("DatasetToExport").'</td>';
-    print '<td>';
+	// Dataset to export
+	print '<tr><td>'.$langs->trans("DatasetToExport").'</td>';
+	print '<td>';
 	$icon = preg_replace('/:.*$/', '', $objexport->array_export_icon[0]);
-    print img_object($objexport->array_export_module[0]->getName(), $icon).' ';
-    print $objexport->array_export_label[0];
-    print '</td></tr>';
+	print img_object($objexport->array_export_module[0]->getName(), $icon).' ';
+	print $objexport->array_export_label[0];
+	print '</td></tr>';
 
-    // List of exported fields
-    print '<tr><td>'.$langs->trans("ExportedFields").'</td>';
-    $list = '';
-    foreach ($array_selected as $code=>$label)
-    {
-        $list .= (!empty($list) ? ', ' : '');
-        $list .= $langs->trans($objexport->array_export_fields[0][$code]);
-    }
-    print '<td>'.$list.'</td></tr>';
+	// List of exported fields
+	print '<tr><td>'.$langs->trans("ExportedFields").'</td>';
+	$list = '';
+	foreach ($array_selected as $code=>$label)
+	{
+		$list .= (!empty($list) ? ', ' : '');
+		$list .= $langs->trans($objexport->array_export_fields[0][$code]);
+	}
+	print '<td>'.$list.'</td></tr>';
 
-    // List of filtered fields
-    if (isset($objexport->array_export_TypeFields[0]) && is_array($objexport->array_export_TypeFields[0]))
-    {
-    	print '<tr><td>'.$langs->trans("FilteredFields").'</td>';
-    	$list = '';
-    	if (!empty($array_filtervalue))
-    	{
-    		foreach ($array_filtervalue as $code=>$value)
-    		{
-    			if (isset($objexport->array_export_fields[0][$code]))
-    			{
-    				$list .= ($list ? ', ' : '');
-    				if (isset($array_filtervalue[$code]) && preg_match('/^\s*[<>]/', $array_filtervalue[$code])) $list .= $langs->trans($objexport->array_export_fields[0][$code]).(isset($array_filtervalue[$code]) ? $array_filtervalue[$code] : '');
-    				else $list .= $langs->trans($objexport->array_export_fields[0][$code])."='".(isset($array_filtervalue[$code]) ? $array_filtervalue[$code] : '')."'";
-    			}
-    		}
-    	}
-    	print '<td>'.(!empty($list) ? $list : '<span class="opacitymedium">'.$langs->trans("None").'</span>').'</td>';
-    	print '</tr>';
-    }
+	// List of filtered fields
+	if (isset($objexport->array_export_TypeFields[0]) && is_array($objexport->array_export_TypeFields[0]))
+	{
+		print '<tr><td>'.$langs->trans("FilteredFields").'</td>';
+		$list = '';
+		if (!empty($array_filtervalue))
+		{
+			foreach ($array_filtervalue as $code=>$value)
+			{
+				if (isset($objexport->array_export_fields[0][$code]))
+				{
+					$list .= ($list ? ', ' : '');
+					if (isset($array_filtervalue[$code]) && preg_match('/^\s*[<>]/', $array_filtervalue[$code])) $list .= $langs->trans($objexport->array_export_fields[0][$code]).(isset($array_filtervalue[$code]) ? $array_filtervalue[$code] : '');
+					else $list .= $langs->trans($objexport->array_export_fields[0][$code])."='".(isset($array_filtervalue[$code]) ? $array_filtervalue[$code] : '')."'";
+				}
+			}
+		}
+		print '<td>'.(!empty($list) ? $list : '<span class="opacitymedium">'.$langs->trans("None").'</span>').'</td>';
+		print '</tr>';
+	}
 
-    print '</table>';
-    print '</div>';
+	print '</table>';
+	print '</div>';
 
-    print '<br>';
+	print '<br>';
 
-    // List of available export formats
-    $htmltabloflibs = '<table class="noborder centpercent">';
-    $htmltabloflibs .= '<tr class="liste_titre">';
-    $htmltabloflibs .= '<td>'.$langs->trans("AvailableFormats").'</td>';
-    $htmltabloflibs .= '<td>'.$langs->trans("LibraryUsed").'</td>';
-    $htmltabloflibs .= '<td class="right">'.$langs->trans("LibraryVersion").'</td>';
-    $htmltabloflibs .= '</tr>'."\n";
+	// List of available export formats
+	$htmltabloflibs = '<table class="noborder centpercent">';
+	$htmltabloflibs .= '<tr class="liste_titre">';
+	$htmltabloflibs .= '<td>'.$langs->trans("AvailableFormats").'</td>';
+	$htmltabloflibs .= '<td>'.$langs->trans("LibraryUsed").'</td>';
+	$htmltabloflibs .= '<td class="right">'.$langs->trans("LibraryVersion").'</td>';
+	$htmltabloflibs .= '</tr>'."\n";
 
-    $liste = $objmodelexport->liste_modeles($db);
-    $listeall = $liste;
-    foreach ($listeall as $key => $val)
-    {
-    	if (preg_match('/__\(Disabled\)__/', $listeall[$key]))
-    	{
-    		$listeall[$key] = preg_replace('/__\(Disabled\)__/', '('.$langs->transnoentitiesnoconv("Disabled").')', $listeall[$key]);
-    		unset($liste[$key]);
-    	}
+	$liste = $objmodelexport->liste_modeles($db);
+	$listeall = $liste;
+	foreach ($listeall as $key => $val)
+	{
+		if (preg_match('/__\(Disabled\)__/', $listeall[$key]))
+		{
+			$listeall[$key] = preg_replace('/__\(Disabled\)__/', '('.$langs->transnoentitiesnoconv("Disabled").')', $listeall[$key]);
+			unset($liste[$key]);
+		}
 
-    	$htmltabloflibs .= '<tr class="oddeven">';
-    	$htmltabloflibs .= '<td>'.img_picto_common($key, $objmodelexport->getPictoForKey($key)).' ';
-	    $text = $objmodelexport->getDriverDescForKey($key);
-	    $label = $listeall[$key];
-	    $htmltabloflibs .= $form->textwithpicto($label, $text).'</td>';
-	    $htmltabloflibs .= '<td>'.$objmodelexport->getLibLabelForKey($key).'</td>';
-	    $htmltabloflibs .= '<td class="right">'.$objmodelexport->getLibVersionForKey($key).'</td>';
-	    $htmltabloflibs .= '</tr>'."\n";
-    }
-    $htmltabloflibs .= '</table>';
+		$htmltabloflibs .= '<tr class="oddeven">';
+		$htmltabloflibs .= '<td>'.img_picto_common($key, $objmodelexport->getPictoForKey($key)).' ';
+		$text = $objmodelexport->getDriverDescForKey($key);
+		$label = $listeall[$key];
+		$htmltabloflibs .= $form->textwithpicto($label, $text).'</td>';
+		$htmltabloflibs .= '<td>'.$objmodelexport->getLibLabelForKey($key).'</td>';
+		$htmltabloflibs .= '<td class="right">'.$objmodelexport->getLibVersionForKey($key).'</td>';
+		$htmltabloflibs .= '</tr>'."\n";
+	}
+	$htmltabloflibs .= '</table>';
 
-    print '<span class="opacitymedium">'.$form->textwithpicto($langs->trans("NowClickToGenerateToBuildExportFile"), $htmltabloflibs, 1, 'help', '', 0, 2, 'helphonformat').'</span>';
-    //print $htmltabloflibs;
-    print '<br>';
+	print '<span class="opacitymedium">'.$form->textwithpicto($langs->trans("NowClickToGenerateToBuildExportFile"), $htmltabloflibs, 1, 'help', '', 0, 2, 'helphonformat').'</span>';
+	//print $htmltabloflibs;
+	print '<br>';
 
-    print '</div>';
+	print '</div>';
 
 
-    if ($sqlusedforexport && $user->admin)
-    {
-    	print info_admin($langs->trans("SQLUsedForExport").':<br> '.$sqlusedforexport, 0, 0, 1, '', 'TechnicalInformation');
-    }
+	if ($sqlusedforexport && $user->admin)
+	{
+		print info_admin($langs->trans("SQLUsedForExport").':<br> '.$sqlusedforexport, 0, 0, 1, '', 'TechnicalInformation');
+	}
 
 
-    if (!is_dir($conf->export->dir_temp)) dol_mkdir($conf->export->dir_temp);
+	if (!is_dir($conf->export->dir_temp)) dol_mkdir($conf->export->dir_temp);
 
-    // Show existing generated documents
-    // NB: La fonction show_documents rescanne les modules qd genallowed=1, sinon prend $liste
-    print $formfile->showdocuments('export', '', $upload_dir, $_SERVER["PHP_SELF"].'?step=5&datatoexport='.$datatoexport, $liste, 1, (!empty($_POST['model']) ? $_POST['model'] : 'csv'), 1, 1, 0, 0, 0, '', 'none', '', '', '');
+	// Show existing generated documents
+	// NB: La fonction show_documents rescanne les modules qd genallowed=1, sinon prend $liste
+	print $formfile->showdocuments('export', '', $upload_dir, $_SERVER["PHP_SELF"].'?step=5&datatoexport='.$datatoexport, $liste, 1, (!empty($_POST['model']) ? $_POST['model'] : 'csv'), 1, 1, 0, 0, 0, '', 'none', '', '', '');
 }
 
 llxFooter();
diff --git a/htdocs/exports/index.php b/htdocs/exports/index.php
index 0210ee608b0..79655a19b2f 100644
--- a/htdocs/exports/index.php
+++ b/htdocs/exports/index.php
@@ -50,7 +50,7 @@ print '<br>';
 print '<div class="center">';
 if (count($export->array_export_code))
 {
-    print dolGetButtonTitle($langs->trans('NewExport'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/exports/export.php?leftmenu=export', '', $user->rights->export->creer);
+	print dolGetButtonTitle($langs->trans('NewExport'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/exports/export.php?leftmenu=export', '', $user->rights->export->creer);
 }
 print '</div>';
 print '<br>';
@@ -73,10 +73,10 @@ $liste = $model->liste_modeles($db); // This is not a static method for exports
 
 foreach ($liste as $key => $val)
 {
-    if (preg_match('/__\(Disabled\)__/', $liste[$key]))
-    {
-    	$liste[$key] = preg_replace('/__\(Disabled\)__/', '('.$langs->transnoentitiesnoconv("Disabled").')', $liste[$key]);
-    }
+	if (preg_match('/__\(Disabled\)__/', $liste[$key]))
+	{
+		$liste[$key] = preg_replace('/__\(Disabled\)__/', '('.$langs->transnoentitiesnoconv("Disabled").')', $liste[$key]);
+	}
 
 	print '<tr class="oddeven">';
 	print '<td width="16">'.img_picto_common($model->getDriverLabelForKey($key), $model->getPictoForKey($key)).'</td>';
diff --git a/htdocs/fichinter/admin/fichinter_extrafields.php b/htdocs/fichinter/admin/fichinter_extrafields.php
index 84dfeb7cfd3..0fa5a930f05 100644
--- a/htdocs/fichinter/admin/fichinter_extrafields.php
+++ b/htdocs/fichinter/admin/fichinter_extrafields.php
@@ -73,7 +73,7 @@ print dol_get_fiche_head($head, 'attributes', $langs->trans("Interventions"), -1
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 // Buttons
diff --git a/htdocs/fichinter/admin/fichinterdet_extrafields.php b/htdocs/fichinter/admin/fichinterdet_extrafields.php
index 5a13bdb4b32..f648548c3b4 100644
--- a/htdocs/fichinter/admin/fichinterdet_extrafields.php
+++ b/htdocs/fichinter/admin/fichinterdet_extrafields.php
@@ -74,15 +74,15 @@ print dol_get_fiche_head($head, 'attributesdet', $langs->trans("Interventions"),
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_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/fichinter/card-rec.php b/htdocs/fichinter/card-rec.php
index 0a4bbfe922f..975a5dc9698 100644
--- a/htdocs/fichinter/card-rec.php
+++ b/htdocs/fichinter/card-rec.php
@@ -277,7 +277,7 @@ if ($action == 'create') {
 
 		// Title
 		print '<tr><td class="fieldrequired">'.$langs->trans("Title").'</td><td>';
-		print '<input class="flat" type="text" name="titre" size="24" value="'.$_POST["titre"].'">';
+		print '<input class="flat quatrevingtpercent" type="text" name="titre" value="'.dol_escape_htmltag(GETPOST("titre", "alphanohtml")).'">';
 		print '</td>';
 
 		// Note
@@ -417,7 +417,7 @@ if ($action == 'create') {
 
 		print "</table>\n";
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 		print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Create").'">';
 		print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
@@ -438,7 +438,7 @@ if ($action == 'create') {
 	print '</td></tr>';
 	print '</table>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div class="center">';
 	print '<input type="hidden" name="action" value="createfrommodel">';
@@ -484,11 +484,11 @@ if ($action == 'create') {
 						$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', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
 						$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
 						$morehtmlref .= '</form>';
 					} else {
-                        $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+						$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
 					}
 				} else {
 					if (!empty($object->fk_project)) {
@@ -543,15 +543,15 @@ if ($action == 'create') {
 				print '</td><td>';
 				if ($action == 'contrat') {
 					$formcontract = new Formcontract($db);
-                    $formcontract->formSelectContract($_SERVER["PHP_SELF"].'?id='.$object->id, $object->socid, $object->fk_contrat, 'contratid', 0, 1);
+					$formcontract->formSelectContract($_SERVER["PHP_SELF"].'?id='.$object->id, $object->socid, $object->fk_contrat, 'contratid', 0, 1);
 				} else {
 					if ($object->fk_contrat) {
 						$contratstatic = new Contrat($db);
 						$contratstatic->fetch($object->fk_contrat);
 						print $contratstatic->getNomUrl(0, '', 1);
 					} else {
-                        print "&nbsp;";
-                    }
+						print "&nbsp;";
+					}
 				}
 				print '</td>';
 				print '</tr>';
@@ -633,7 +633,7 @@ if ($action == 'create') {
 			if ($object->frequency > 0) {
 				print '<br>';
 				if (empty($conf->cron->enabled)) {
-    				$txtinfoadmin = $langs->trans("EnableAndSetupModuleCron", $langs->transnoentitiesnoconv("Module2300Name"));
+					$txtinfoadmin = $langs->trans("EnableAndSetupModuleCron", $langs->transnoentitiesnoconv("Module2300Name"));
 					print info_admin($txtinfoadmin);
 				}
 				print '<div class="underbanner clearboth"></div>';
@@ -765,20 +765,20 @@ if ($action == 'create') {
 			$i = 0;
 			print '<table class="noborder centpercent">';
 			print '<tr class="liste_titre">';
-            print_liste_field_titre("Ref", $_SERVER['PHP_SELF'], "f.titre", "", "", 'width="200px"', $sortfield, $sortorder, 'left ');
-            print_liste_field_titre("Company", $_SERVER['PHP_SELF'], "s.nom", "", "", 'width="200px"', $sortfield, $sortorder, 'left ');
-            if (!empty($conf->contrat->enabled)) {
-                print_liste_field_titre("Contract", $_SERVER['PHP_SELF'], "f.fk_contrat", "", "", 'width="100px"', $sortfield, $sortorder, 'left ');
-            }
-            if (!empty($conf->projet->enabled)) {
-                print_liste_field_titre("Project", $_SERVER['PHP_SELF'], "f.fk_project", "", "", 'width="100px"', $sortfield, $sortorder, 'left ');
-            }
-            print_liste_field_titre("Duration", $_SERVER['PHP_SELF'], 'f.duree', '', '', 'width="50px"', $sortfield, $sortorder, 'right ');
-            // Recurring or not
-            print_liste_field_titre("Frequency", $_SERVER['PHP_SELF'], "f.frequency", "", "", 'width="100px"', $sortfield, $sortorder, 'center ');
-            print_liste_field_titre("NbOfGenerationDone", $_SERVER['PHP_SELF'], "f.nb_gen_done", "", "", 'width="100px"', $sortfield, $sortorder, 'center ');
-            print_liste_field_titre("DateLastGeneration", $_SERVER['PHP_SELF'], "f.date_last_gen", "", "", 'width="100px"', $sortfield, $sortorder, 'center ');
-            print_liste_field_titre("NextDateToIntervention", $_SERVER['PHP_SELF'], "f.date_when", "", "", 'width="100px"', $sortfield, $sortorder, 'center ');
+			print_liste_field_titre("Ref", $_SERVER['PHP_SELF'], "f.titre", "", "", 'width="200px"', $sortfield, $sortorder, 'left ');
+			print_liste_field_titre("Company", $_SERVER['PHP_SELF'], "s.nom", "", "", 'width="200px"', $sortfield, $sortorder, 'left ');
+			if (!empty($conf->contrat->enabled)) {
+				print_liste_field_titre("Contract", $_SERVER['PHP_SELF'], "f.fk_contrat", "", "", 'width="100px"', $sortfield, $sortorder, 'left ');
+			}
+			if (!empty($conf->projet->enabled)) {
+				print_liste_field_titre("Project", $_SERVER['PHP_SELF'], "f.fk_project", "", "", 'width="100px"', $sortfield, $sortorder, 'left ');
+			}
+			print_liste_field_titre("Duration", $_SERVER['PHP_SELF'], 'f.duree', '', '', 'width="50px"', $sortfield, $sortorder, 'right ');
+			// Recurring or not
+			print_liste_field_titre("Frequency", $_SERVER['PHP_SELF'], "f.frequency", "", "", 'width="100px"', $sortfield, $sortorder, 'center ');
+			print_liste_field_titre("NbOfGenerationDone", $_SERVER['PHP_SELF'], "f.nb_gen_done", "", "", 'width="100px"', $sortfield, $sortorder, 'center ');
+			print_liste_field_titre("DateLastGeneration", $_SERVER['PHP_SELF'], "f.date_last_gen", "", "", 'width="100px"', $sortfield, $sortorder, 'center ');
+			print_liste_field_titre("NextDateToIntervention", $_SERVER['PHP_SELF'], "f.date_when", "", "", 'width="100px"', $sortfield, $sortorder, 'center ');
 			print '<th width="100px"></th>';
 			print "</tr>\n";
 
diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php
index 720e6fe71f3..da1de06cc16 100644
--- a/htdocs/fichinter/card.php
+++ b/htdocs/fichinter/card.php
@@ -1012,7 +1012,7 @@ if ($action == 'create')
 			print '<input type="hidden" name="projectid" value="'.$projectid.'">';
 		}
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 		print '<div class="center">';
 		print '<input type="submit" class="button" value="'.$langs->trans("CreateDraftIntervention").'">';
@@ -1053,7 +1053,7 @@ if ($action == 'create')
 		print '</td></tr>';
 		print '</table>';
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 		print '<div class="center">';
 		print '<input type="hidden" name="action" value="create">';
@@ -1588,7 +1588,7 @@ if ($action == 'create')
 		print '</form>'."\n";
  	}
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print "\n";
 
diff --git a/htdocs/fichinter/class/api_interventions.class.php b/htdocs/fichinter/class/api_interventions.class.php
index c2328e5cfd3..7046a61e2d5 100644
--- a/htdocs/fichinter/class/api_interventions.class.php
+++ b/htdocs/fichinter/class/api_interventions.class.php
@@ -29,193 +29,193 @@
 class Interventions extends DolibarrApi
 {
 
-    /**
-     * @var array   $FIELDS     Mandatory fields, checked when create and update object
-     */
-    static $FIELDS = array(
-      'socid',
-      'fk_project',
-      'description',
-    );
+	/**
+	 * @var array   $FIELDS     Mandatory fields, checked when create and update object
+	 */
+	static $FIELDS = array(
+	  'socid',
+	  'fk_project',
+	  'description',
+	);
 
-    /**
-     * @var array   $FIELDS     Mandatory fields, checked when create and update object
-     */
-    static $FIELDSLINE = array(
-      'description',
-      'date',
-      'duree',
-    );
+	/**
+	 * @var array   $FIELDS     Mandatory fields, checked when create and update object
+	 */
+	static $FIELDSLINE = array(
+	  'description',
+	  'date',
+	  'duree',
+	);
 
-    /**
-     * @var fichinter $fichinter {@type fichinter}
-     */
-    public $fichinter;
+	/**
+	 * @var fichinter $fichinter {@type fichinter}
+	 */
+	public $fichinter;
 
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-        global $db, $conf;
-        $this->db = $db;
-        $this->fichinter = new Fichinter($this->db);
-    }
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		global $db, $conf;
+		$this->db = $db;
+		$this->fichinter = new Fichinter($this->db);
+	}
 
-    /**
-     * Get properties of a Expense Report object
-     *
-     * Return an array with Expense Report information
-     *
-     * @param       int         $id         ID of Expense Report
-     * @return 	    array|mixed             Data without useless information
-     *
-     * @throws 	RestException
-     */
-    public function get($id)
-    {
-        if (!DolibarrApiAccess::$user->rights->ficheinter->lire) {
-            throw new RestException(401);
-        }
+	/**
+	 * Get properties of a Expense Report object
+	 *
+	 * Return an array with Expense Report information
+	 *
+	 * @param       int         $id         ID of Expense Report
+	 * @return 	    array|mixed             Data without useless information
+	 *
+	 * @throws 	RestException
+	 */
+	public function get($id)
+	{
+		if (!DolibarrApiAccess::$user->rights->ficheinter->lire) {
+			throw new RestException(401);
+		}
 
-        $result = $this->fichinter->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Intervention not found');
-        }
+		$result = $this->fichinter->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Intervention not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('fichinter', $this->fichinter->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('fichinter', $this->fichinter->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        $this->fichinter->fetchObjectLinked();
-        return $this->_cleanObjectDatas($this->fichinter);
-    }
+		$this->fichinter->fetchObjectLinked();
+		return $this->_cleanObjectDatas($this->fichinter);
+	}
 
-    /**
-     * List of interventions
-     *
-     * Return a list of interventions
-     *
-     * @param string	       $sortfield	        Sort field
-     * @param string	       $sortorder	        Sort order
-     * @param int	       $limit		        Limit for list
-     * @param int	       $page		        Page number
-     * @param string   	       $thirdparty_ids	        Thirdparty ids to filter orders of (example '1' or '1,2,3') {@pattern /^[0-9,]*$/i}
-     * @param string           $sqlfilters              Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"
-     * @return  array                                   Array of order objects
-     *
-     * @throws RestException
-     */
-    public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $thirdparty_ids = '', $sqlfilters = '')
-    {
-        global $db, $conf;
+	/**
+	 * List of interventions
+	 *
+	 * Return a list of interventions
+	 *
+	 * @param string	       $sortfield	        Sort field
+	 * @param string	       $sortorder	        Sort order
+	 * @param int	       $limit		        Limit for list
+	 * @param int	       $page		        Page number
+	 * @param string   	       $thirdparty_ids	        Thirdparty ids to filter orders of (example '1' or '1,2,3') {@pattern /^[0-9,]*$/i}
+	 * @param string           $sqlfilters              Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"
+	 * @return  array                                   Array of order objects
+	 *
+	 * @throws RestException
+	 */
+	public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $thirdparty_ids = '', $sqlfilters = '')
+	{
+		global $db, $conf;
 
-        $obj_ret = array();
+		$obj_ret = array();
 
-        // case of external user, $thirdparty_ids param is ignored and replaced by user's socid
-        $socids = DolibarrApiAccess::$user->socid ? DolibarrApiAccess::$user->socid : $thirdparty_ids;
+		// case of external user, $thirdparty_ids param is ignored and replaced by user's socid
+		$socids = DolibarrApiAccess::$user->socid ? DolibarrApiAccess::$user->socid : $thirdparty_ids;
 
-        // If the internal user must only see his customers, force searching by him
-        $search_sale = 0;
-        if (!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) $search_sale = DolibarrApiAccess::$user->id;
+		// If the internal user must only see his customers, force searching by him
+		$search_sale = 0;
+		if (!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) $search_sale = DolibarrApiAccess::$user->id;
 
-        $sql = "SELECT t.rowid";
-        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
-        $sql .= " FROM ".MAIN_DB_PREFIX."fichinter as t";
+		$sql = "SELECT t.rowid";
+		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
+		$sql .= " FROM ".MAIN_DB_PREFIX."fichinter as t";
 
-        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
+		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
 
-        $sql .= ' WHERE t.entity IN ('.getEntity('intervention').')';
-        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= " AND t.fk_soc = sc.fk_soc";
-        if ($socids) $sql .= " AND t.fk_soc IN (".$socids.")";
-        if ($search_sale > 0) $sql .= " AND t.rowid = sc.fk_soc"; // Join for the needed table to filter by sale
-        // Insert sale filter
-        if ($search_sale > 0) {
-            $sql .= " AND sc.fk_user = ".$search_sale;
-        }
-        // Add sql filters
-        if ($sqlfilters)
-        {
-            if (!DolibarrApi::_checkFilters($sqlfilters))
-            {
-                throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
-            }
-            $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-        }
+		$sql .= ' WHERE t.entity IN ('.getEntity('intervention').')';
+		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= " AND t.fk_soc = sc.fk_soc";
+		if ($socids) $sql .= " AND t.fk_soc IN (".$socids.")";
+		if ($search_sale > 0) $sql .= " AND t.rowid = sc.fk_soc"; // Join for the needed table to filter by sale
+		// Insert sale filter
+		if ($search_sale > 0) {
+			$sql .= " AND sc.fk_user = ".$search_sale;
+		}
+		// Add sql filters
+		if ($sqlfilters)
+		{
+			if (!DolibarrApi::_checkFilters($sqlfilters))
+			{
+				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+			}
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
 
-        $sql .= $this->db->order($sortfield, $sortorder);
-        if ($limit) {
-            if ($page < 0)
-            {
-                $page = 0;
-            }
-            $offset = $limit * $page;
+		$sql .= $this->db->order($sortfield, $sortorder);
+		if ($limit) {
+			if ($page < 0)
+			{
+				$page = 0;
+			}
+			$offset = $limit * $page;
 
-            $sql .= $this->db->plimit($limit + 1, $offset);
-        }
+			$sql .= $this->db->plimit($limit + 1, $offset);
+		}
 
-        dol_syslog("API Rest request");
-        $result = $this->db->query($sql);
+		dol_syslog("API Rest request");
+		$result = $this->db->query($sql);
 
-        if ($result)
-        {
-        	$num = $this->db->num_rows($result);
-            $min = min($num, ($limit <= 0 ? $num : $limit));
-            $i = 0;
-            while ($i < $min)
-            {
-            	$obj = $this->db->fetch_object($result);
-            	$fichinter_static = new Fichinter($this->db);
-                if ($fichinter_static->fetch($obj->rowid)) {
-                    $obj_ret[] = $this->_cleanObjectDatas($fichinter_static);
-                }
-                $i++;
-            }
-        } else {
-        	throw new RestException(503, 'Error when retrieve intervention list : '.$this->db->lasterror());
-        }
-        if (!count($obj_ret)) {
-            throw new RestException(404, 'No intervention found');
-        }
-        return $obj_ret;
-    }
+		if ($result)
+		{
+			$num = $this->db->num_rows($result);
+			$min = min($num, ($limit <= 0 ? $num : $limit));
+			$i = 0;
+			while ($i < $min)
+			{
+				$obj = $this->db->fetch_object($result);
+				$fichinter_static = new Fichinter($this->db);
+				if ($fichinter_static->fetch($obj->rowid)) {
+					$obj_ret[] = $this->_cleanObjectDatas($fichinter_static);
+				}
+				$i++;
+			}
+		} else {
+			throw new RestException(503, 'Error when retrieve intervention list : '.$this->db->lasterror());
+		}
+		if (!count($obj_ret)) {
+			throw new RestException(404, 'No intervention found');
+		}
+		return $obj_ret;
+	}
 
-    /**
-     * Create intervention object
-     *
-     * @param   array   $request_data   Request data
-     * @return  int     ID of intervention
-     */
-    public function post($request_data = null)
-    {
-        if (!DolibarrApiAccess::$user->rights->ficheinter->creer) {
-            throw new RestException(401, "Insuffisant rights");
-        }
-        // Check mandatory fields
-        $result = $this->_validate($request_data);
-        foreach ($request_data as $field => $value) {
-            $this->fichinter->$field = $value;
-        }
+	/**
+	 * Create intervention object
+	 *
+	 * @param   array   $request_data   Request data
+	 * @return  int     ID of intervention
+	 */
+	public function post($request_data = null)
+	{
+		if (!DolibarrApiAccess::$user->rights->ficheinter->creer) {
+			throw new RestException(401, "Insuffisant rights");
+		}
+		// Check mandatory fields
+		$result = $this->_validate($request_data);
+		foreach ($request_data as $field => $value) {
+			$this->fichinter->$field = $value;
+		}
 
-        if ($this->fichinter->create(DolibarrApiAccess::$user) < 0) {
-            throw new RestException(500, "Error creating intervention", array_merge(array($this->fichinter->error), $this->fichinter->errors));
-        }
+		if ($this->fichinter->create(DolibarrApiAccess::$user) < 0) {
+			throw new RestException(500, "Error creating intervention", array_merge(array($this->fichinter->error), $this->fichinter->errors));
+		}
 
-        return $this->fichinter->id;
-    }
+		return $this->fichinter->id;
+	}
 
 
-    /**
-     * Get lines of an intervention
-     *
-     * @param int   $id             Id of intervention
-     *
-     * @url	GET {id}/lines
-     *
-     * @return int
-     */
-    /* TODO
+	/**
+	 * Get lines of an intervention
+	 *
+	 * @param int   $id             Id of intervention
+	 *
+	 * @url	GET {id}/lines
+	 *
+	 * @return int
+	 */
+	/* TODO
     public function getLines($id)
     {
         if(! DolibarrApiAccess::$user->rights->ficheinter->lire) {
@@ -239,218 +239,218 @@ class Interventions extends DolibarrApi
     }
     */
 
-    /**
-     * Add a line to given intervention
-     *
-     * @param 	int   	$id             Id of intervention to update
-     * @param   array   $request_data   Request data
-     *
-     * @url     POST {id}/lines
-     *
-     * @return  int
-     */
-    public function postLine($id, $request_data = null)
-    {
-        if (!DolibarrApiAccess::$user->rights->ficheinter->creer) {
-            throw new RestException(401, "Insuffisant rights");
-        }
-        // Check mandatory fields
-        $result = $this->_validateLine($request_data);
+	/**
+	 * Add a line to given intervention
+	 *
+	 * @param 	int   	$id             Id of intervention to update
+	 * @param   array   $request_data   Request data
+	 *
+	 * @url     POST {id}/lines
+	 *
+	 * @return  int
+	 */
+	public function postLine($id, $request_data = null)
+	{
+		if (!DolibarrApiAccess::$user->rights->ficheinter->creer) {
+			throw new RestException(401, "Insuffisant rights");
+		}
+		// Check mandatory fields
+		$result = $this->_validateLine($request_data);
 
-        foreach ($request_data as $field => $value) {
-            $this->fichinter->$field = $value;
-        }
+		foreach ($request_data as $field => $value) {
+			$this->fichinter->$field = $value;
+		}
 
-        if (!$result) {
-            throw new RestException(404, 'Intervention not found');
-        }
+		if (!$result) {
+			throw new RestException(404, 'Intervention not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('fichinter', $this->fichinter->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('fichinter', $this->fichinter->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        $updateRes = $this->fichinter->addLine(
-                DolibarrApiAccess::$user,
-                $id,
-                $this->fichinter->description,
-                $this->fichinter->date,
-                $this->fichinter->duree
-        );
+		$updateRes = $this->fichinter->addLine(
+				DolibarrApiAccess::$user,
+				$id,
+				$this->fichinter->description,
+				$this->fichinter->date,
+				$this->fichinter->duree
+		);
 
-        if ($updateRes > 0) {
-            return $updateRes;
-        } else {
-            throw new RestException(400, $this->fichinter->error);
-        }
-    }
+		if ($updateRes > 0) {
+			return $updateRes;
+		} else {
+			throw new RestException(400, $this->fichinter->error);
+		}
+	}
 
-    /**
-     * Delete order
-     *
-     * @param   int     $id         Order ID
-     * @return  array
-     */
-    public function delete($id)
-    {
-        if (!DolibarrApiAccess::$user->rights->ficheinter->supprimer) {
-            throw new RestException(401);
-        }
-        $result = $this->fichinter->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Intervention not found');
-        }
+	/**
+	 * Delete order
+	 *
+	 * @param   int     $id         Order ID
+	 * @return  array
+	 */
+	public function delete($id)
+	{
+		if (!DolibarrApiAccess::$user->rights->ficheinter->supprimer) {
+			throw new RestException(401);
+		}
+		$result = $this->fichinter->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Intervention not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('fichinter', $this->fichinter->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('fichinter', $this->fichinter->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        if (!$this->fichinter->delete(DolibarrApiAccess::$user)) {
-            throw new RestException(500, 'Error when delete intervention : '.$this->fichinter->error);
-        }
+		if (!$this->fichinter->delete(DolibarrApiAccess::$user)) {
+			throw new RestException(500, 'Error when delete intervention : '.$this->fichinter->error);
+		}
 
-        return array(
-            'success' => array(
-                'code' => 200,
-                'message' => 'Intervention deleted'
-            )
-        );
-    }
+		return array(
+			'success' => array(
+				'code' => 200,
+				'message' => 'Intervention deleted'
+			)
+		);
+	}
 
-    /**
-     * Validate an intervention
-     *
-     * If you get a bad value for param notrigger check, provide this in body
-     * {
-     *   "notrigger": 0
-     * }
-     *
-     * @param   int $id             Intervention ID
-     * @param   int $notrigger      1=Does not execute triggers, 0= execute triggers
-     *
-     * @url POST    {id}/validate
-     *
-     * @return  array
-     */
-    public function validate($id, $notrigger = 0)
-    {
-        if (!DolibarrApiAccess::$user->rights->ficheinter->creer) {
-            throw new RestException(401, "Insuffisant rights");
-        }
-        $result = $this->fichinter->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Intervention not found');
-        }
+	/**
+	 * Validate an intervention
+	 *
+	 * If you get a bad value for param notrigger check, provide this in body
+	 * {
+	 *   "notrigger": 0
+	 * }
+	 *
+	 * @param   int $id             Intervention ID
+	 * @param   int $notrigger      1=Does not execute triggers, 0= execute triggers
+	 *
+	 * @url POST    {id}/validate
+	 *
+	 * @return  array
+	 */
+	public function validate($id, $notrigger = 0)
+	{
+		if (!DolibarrApiAccess::$user->rights->ficheinter->creer) {
+			throw new RestException(401, "Insuffisant rights");
+		}
+		$result = $this->fichinter->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Intervention not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('fichinter', $this->fichinter->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('fichinter', $this->fichinter->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        $result = $this->fichinter->setValid(DolibarrApiAccess::$user, $notrigger);
-        if ($result == 0) {
-            throw new RestException(304, 'Error nothing done. May be object is already validated');
-        }
-        if ($result < 0) {
-            throw new RestException(500, 'Error when validating Intervention: '.$this->commande->error);
-        }
+		$result = $this->fichinter->setValid(DolibarrApiAccess::$user, $notrigger);
+		if ($result == 0) {
+			throw new RestException(304, 'Error nothing done. May be object is already validated');
+		}
+		if ($result < 0) {
+			throw new RestException(500, 'Error when validating Intervention: '.$this->commande->error);
+		}
 
-        $this->fichinter->fetchObjectLinked();
+		$this->fichinter->fetchObjectLinked();
 
-        return $this->_cleanObjectDatas($this->fichinter);
-    }
+		return $this->_cleanObjectDatas($this->fichinter);
+	}
 
-    /**
-     * Close an intervention
-     *
-     * @param   int 	$id             Intervention ID
-     *
-     * @url POST    {id}/close
-     *
-     * @return  array
-     */
-    public function closeFichinter($id)
-    {
-        if (!DolibarrApiAccess::$user->rights->ficheinter->creer)
-        {
-            throw new RestException(401, "Insuffisant rights");
-        }
-        $result = $this->fichinter->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Intervention not found');
-        }
+	/**
+	 * Close an intervention
+	 *
+	 * @param   int 	$id             Intervention ID
+	 *
+	 * @url POST    {id}/close
+	 *
+	 * @return  array
+	 */
+	public function closeFichinter($id)
+	{
+		if (!DolibarrApiAccess::$user->rights->ficheinter->creer)
+		{
+			throw new RestException(401, "Insuffisant rights");
+		}
+		$result = $this->fichinter->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Intervention not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('fichinter', $this->fichinter->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('fichinter', $this->fichinter->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        $result = $this->fichinter->setStatut(3);
+		$result = $this->fichinter->setStatut(3);
 
-        if ($result == 0) {
-            throw new RestException(304, 'Error nothing done. May be object is already closed');
-        }
-        if ($result < 0) {
-            throw new RestException(500, 'Error when closing Intervention: '.$this->fichinter->error);
-        }
+		if ($result == 0) {
+			throw new RestException(304, 'Error nothing done. May be object is already closed');
+		}
+		if ($result < 0) {
+			throw new RestException(500, 'Error when closing Intervention: '.$this->fichinter->error);
+		}
 
-        $this->fichinter->fetchObjectLinked();
+		$this->fichinter->fetchObjectLinked();
 
-        return $this->_cleanObjectDatas($this->fichinter);
-    }
+		return $this->_cleanObjectDatas($this->fichinter);
+	}
 
-    /**
-     * Validate fields before create or update object
-     *
-     * @param array $data   Data to validate
-     * @return array
-     *
-     * @throws RestException
-     */
-    private function _validate($data)
-    {
-        $fichinter = array();
-        foreach (Interventions::$FIELDS as $field) {
-            if (!isset($data[$field]))
-                throw new RestException(400, "$field field missing");
-            $fichinter[$field] = $data[$field];
-        }
-        return $fichinter;
-    }
+	/**
+	 * Validate fields before create or update object
+	 *
+	 * @param array $data   Data to validate
+	 * @return array
+	 *
+	 * @throws RestException
+	 */
+	private function _validate($data)
+	{
+		$fichinter = array();
+		foreach (Interventions::$FIELDS as $field) {
+			if (!isset($data[$field]))
+				throw new RestException(400, "$field field missing");
+			$fichinter[$field] = $data[$field];
+		}
+		return $fichinter;
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
-    /**
-     * Clean sensible object datas
-     *
-     * @param   object  $object    Object to clean
-     * @return    array    Array of cleaned object properties
-     */
-    protected function _cleanObjectDatas($object)
-    {
-        // phpcs:enable
-        $object = parent::_cleanObjectDatas($object);
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	/**
+	 * Clean sensible object datas
+	 *
+	 * @param   Object  $object     Object to clean
+	 * @return  Object              Object with cleaned properties
+	 */
+	protected function _cleanObjectDatas($object)
+	{
+		// phpcs:enable
+		$object = parent::_cleanObjectDatas($object);
 
-        unset($object->statuts_short);
-        unset($object->statuts_logo);
-        unset($object->statuts);
+		unset($object->statuts_short);
+		unset($object->statuts_logo);
+		unset($object->statuts);
 
-        return $object;
-    }
+		return $object;
+	}
 
-    /**
-     * Validate fields before create or update object
-     *
-     * @param array $data   Data to validate
-     * @return array
-     *
-     * @throws RestException
-     */
-    private function _validateLine($data)
-    {
-        $fichinter = array();
-        foreach (Interventions::$FIELDSLINE as $field) {
-            if (!isset($data[$field]))
-                throw new RestException(400, "$field field missing");
-            $fichinter[$field] = $data[$field];
-        }
-        return $fichinter;
-    }
+	/**
+	 * Validate fields before create or update object
+	 *
+	 * @param array $data   Data to validate
+	 * @return array
+	 *
+	 * @throws RestException
+	 */
+	private function _validateLine($data)
+	{
+		$fichinter = array();
+		foreach (Interventions::$FIELDSLINE as $field) {
+			if (!isset($data[$field]))
+				throw new RestException(400, "$field field missing");
+			$fichinter[$field] = $data[$field];
+		}
+		return $fichinter;
+	}
 }
diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php
index 2e79edd8b9e..71cc3c40da5 100644
--- a/htdocs/fichinter/class/fichinter.class.php
+++ b/htdocs/fichinter/class/fichinter.class.php
@@ -6,7 +6,7 @@
  * Copyright (C) 2015      Marcos García        <marcosgdf@gmail.com>
  * Copyright (C) 2015-2020 Charlene Benke       <charlie@patas-monkey.com>
  * Copyright (C) 2018      Nicolas ZABOURI	    <info@inovea-conseil.com>
- * Copyright (C) 2018-2019 Frédéric France      <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2020 Frédéric France      <frederic.france@netlogic.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -100,11 +100,11 @@ class Fichinter extends CommonObject
 	public $author;
 
 	/**
-     * Date creation record (datec)
-     *
-     * @var integer
-     */
-    public $datec;
+	 * Date creation record (datec)
+	 *
+	 * @var integer
+	 */
+	public $datec;
 
 	public $datev;
 	public $dateo;
@@ -112,11 +112,11 @@ class Fichinter extends CommonObject
 	public $datet;
 
 	/**
-     * Date modification record (tms)
-     *
-     * @var integer
-     */
-    public $datem;
+	 * Date modification record (tms)
+	 *
+	 * @var integer
+	 */
+	public $datem;
 
 	public $duration;
 	public $statut = 0; // 0=draft, 1=validated, 2=invoiced, 3=Terminate
@@ -127,13 +127,13 @@ class Fichinter extends CommonObject
 	public $description;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_contrat = 0;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_project = 0;
 
 	public $extraparams = array();
@@ -165,22 +165,22 @@ class Fichinter extends CommonObject
 	 *
 	 *  @param	DoliDB	$db		Database handler
 	 */
-    public function __construct($db)
-    {
+	public function __construct($db)
+	{
 		$this->db = $db;
 
 		$this->products = array();
-    }
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Load indicators into this->nb for board
 	 *
 	 *  @return     int         <0 if KO, >0 if OK
 	 */
-    public function load_state_board()
+	public function load_state_board()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $user;
 
 		$this->nb = array();
@@ -220,11 +220,11 @@ class Fichinter extends CommonObject
 	 *	@param		int		$notrigger	Disable all triggers
 	 *	@return		int		<0 if KO, >0 if OK
 	 */
-    public function create($user, $notrigger = 0)
+	public function create($user, $notrigger = 0)
 	{
 		global $conf, $langs;
 
-        $error = 0;
+		$error = 0;
 
 		dol_syslog(get_class($this)."::create ref=".$this->ref);
 
@@ -352,9 +352,9 @@ class Fichinter extends CommonObject
 	 *	@param		int		$notrigger	Disable all triggers
 	 *	@return		int		<0 if KO, >0 if OK
 	 */
-    public function update($user, $notrigger = 0)
+	public function update($user, $notrigger = 0)
 	{
-        global $conf;
+		global $conf;
 
 	 	if (!is_numeric($this->duration)) {
 	 		$this->duration = 0;
@@ -412,7 +412,7 @@ class Fichinter extends CommonObject
 	 *	@param		string	$ref		Ref of intervention
 	 *	@return		int					<0 if KO, >0 if OK
 	 */
-    public function fetch($rowid, $ref = '')
+	public function fetch($rowid, $ref = '')
 	{
 		$sql = "SELECT f.rowid, f.ref, f.description, f.fk_soc, f.fk_statut,";
 		$sql .= " f.datec, f.dateo, f.datee, f.datet, f.fk_user_author,";
@@ -449,7 +449,7 @@ class Fichinter extends CommonObject
 				$this->note_public  = $obj->note_public;
 				$this->note_private = $obj->note_private;
 				$this->model_pdf    = $obj->model_pdf;
-				$this->modelpdf     = $obj->model_pdf;	// deprecated
+				$this->modelpdf     = $obj->model_pdf; // deprecated
 				$this->fk_contrat = $obj->fk_contrat;
 
 				$this->user_creation = $obj->fk_user_author;
@@ -484,7 +484,7 @@ class Fichinter extends CommonObject
 	 *	@param		User	$user	User that set draft
 	 *	@return		int			    <0 if KO, >0 if OK
 	 */
-    public function setDraft($user)
+	public function setDraft($user)
 	{
 		global $langs, $conf;
 
@@ -493,7 +493,7 @@ class Fichinter extends CommonObject
 		// Protection
 		if ($this->statut <= self::STATUS_DRAFT)
 		{
-		    return 0;
+			return 0;
 		}
 
 		dol_syslog(get_class($this)."::setDraft", LOG_DEBUG);
@@ -507,23 +507,23 @@ class Fichinter extends CommonObject
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
-		    if (!$error) {
-		        $this->oldcopy = clone $this;
-		    }
-
-		    if (!$error) {
-		        // Call trigger
-		        $result = $this->call_trigger('FICHINTER_UNVALIDATE', $user);
-		        if ($result < 0) $error++;
-		    }
+			if (!$error) {
+				$this->oldcopy = clone $this;
+			}
 
 			if (!$error) {
-			    $this->statut = self::STATUS_DRAFT;
-			    $this->db->commit();
-			    return 1;
+				// Call trigger
+				$result = $this->call_trigger('FICHINTER_UNVALIDATE', $user);
+				if ($result < 0) $error++;
+			}
+
+			if (!$error) {
+				$this->statut = self::STATUS_DRAFT;
+				$this->db->commit();
+				return 1;
 			} else {
-			    $this->db->rollback();
-			    return -1;
+				$this->db->rollback();
+				return -1;
 			}
 		} else {
 			$this->db->rollback();
@@ -539,7 +539,7 @@ class Fichinter extends CommonObject
 	 *  @param		int			$notrigger	1=Does not execute triggers, 0= execute triggers
 	 *	@return		int						<0 if KO, >0 if OK
 	 */
-    public function setValid($user, $notrigger = 0)
+	public function setValid($user, $notrigger = 0)
 	{
 		global $conf;
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
@@ -635,10 +635,6 @@ class Fichinter extends CommonObject
 				$this->statut = 1;
 				$this->brouillon = 0;
 				$this->date_validation = $now;
-			}
-
-			if (!$error)
-			{
 				$this->db->commit();
 				return 1;
 			} else {
@@ -681,7 +677,7 @@ class Fichinter extends CommonObject
 	 *  @param      int                     $hidedetails    Hide details of lines
 	 *  @param      int                     $hidedesc       Hide description
 	 *  @param      int                     $hideref        Hide ref
-         *  @param   null|array  $moreparams     Array to provide more information
+	 *  @param   null|array  $moreparams     Array to provide more information
 	 *  @return     int                                     0 if KO, 1 if OK
 	 */
 	public function generateDocument($modele, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0, $moreparams = null)
@@ -716,7 +712,7 @@ class Fichinter extends CommonObject
 		return $this->LibStatut((isset($this->statut) ? $this->statut : $this->status), $mode);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Returns the label of a status
 	 *
@@ -726,7 +722,7 @@ class Fichinter extends CommonObject
 	 */
 	public function LibStatut($status, $mode = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		// Init/load array of translation of status
 		if (empty($this->statuts) || empty($this->statuts_short) || empty($this->statuts_logo))
 		{
@@ -765,11 +761,11 @@ class Fichinter extends CommonObject
 
 		$result = '';
 
-		$label = img_picto('', $this->picto).' <u>'.$langs->trans("Intervention").'</u>';
-		$label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
+		$label = img_picto('', $this->picto).' <u class="paddingrightonly">'.$langs->trans("Intervention").'</u>';
 		if (isset($this->status)) {
-			$label .= '<br><b>'.$langs->trans("Status").":</b> ".$this->getLibStatut(5);
+			$label .= ' '.$this->getLibStatut(5);
 		}
+		$label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
 
 		$url = DOL_URL_ROOT.'/fichinter/card.php?id='.$this->id;
 
@@ -970,14 +966,13 @@ class Fichinter extends CommonObject
 			}
 		}
 
-		if (!$error)
-                {
-				$main = MAIN_DB_PREFIX.'fichinterdet';
-				$ef = $main."_extrafields";
-				$sql = "DELETE FROM $ef WHERE fk_object IN (SELECT rowid FROM $main WHERE fk_fichinter = ".$this->id.")";
+		if (!$error) {
+			$main = MAIN_DB_PREFIX.'fichinterdet';
+			$ef = $main."_extrafields";
+			$sql = "DELETE FROM $ef WHERE fk_object IN (SELECT rowid FROM $main WHERE fk_fichinter = ".$this->id.")";
 
-				$resql = $this->db->query($sql);
-				if (!$resql) $error++;
+			$resql = $this->db->query($sql);
+			if (!$resql) $error++;
 		}
 
 		if (!$error)
@@ -1051,17 +1046,17 @@ class Fichinter extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Defines a delivery date of intervention
 	 *
 	 *  @param      User	$user				Object user who define
 	 *  @param      integer	$date_delivery   	date of delivery
 	 *  @return     int							<0 if ko, >0 if ok
-     */
-    public function set_date_delivery($user, $date_delivery)
-    {
-        // phpcs:enable
+	 */
+	public function set_date_delivery($user, $date_delivery)
+	{
+		// phpcs:enable
 		global $conf;
 
 		if ($user->rights->ficheinter->creer)
@@ -1083,7 +1078,7 @@ class Fichinter extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Define the label of the intervention
 	 *
@@ -1091,9 +1086,9 @@ class Fichinter extends CommonObject
 	 *	@param      string	$description    description
 	 *	@return     int						<0 if KO, >0 if OK
 	 */
-    public function set_description($user, $description)
+	public function set_description($user, $description)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 		if ($user->rights->ficheinter->creer)
@@ -1116,7 +1111,7 @@ class Fichinter extends CommonObject
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Link intervention to a contract
 	 *
@@ -1124,9 +1119,9 @@ class Fichinter extends CommonObject
 	 *	@param      int		$contractid		Description
 	 *	@return     int						<0 if ko, >0 if ok
 	 */
-    public function set_contrat($user, $contractid)
-    {
-        // phpcs:enable
+	public function set_contrat($user, $contractid)
+	{
+		// phpcs:enable
 		global $conf;
 
 		if ($user->rights->ficheinter->creer)
@@ -1320,15 +1315,15 @@ class Fichinter extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Load array lines ->lines
 	 *
 	 *	@return		int		<0 if KO, >0 if OK
 	 */
-    public function fetch_lines()
-    {
-        // phpcs:enable
+	public function fetch_lines()
+	{
+		// phpcs:enable
 		$this->lines = array();
 
 		$sql = 'SELECT rowid, fk_fichinter, description, duree, date, rang';
@@ -1356,6 +1351,7 @@ class Fichinter extends CommonObject
 				$line->datei = $this->db->jdate($objp->date);
 				$line->rang	= $objp->rang;
 				$line->product_type = 1;
+				$line->fetch_optionals();
 
 				$this->lines[$i] = $line;
 
@@ -1394,9 +1390,9 @@ class Fichinter extends CommonObject
 class FichinterLigne extends CommonObjectLine
 {
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
 	/**
 	 * @var string Error code (or message)
@@ -1405,8 +1401,8 @@ class FichinterLigne extends CommonObjectLine
 
 	// From llx_fichinterdet
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_fichinter;
 
 	public $desc; // Description ligne
@@ -1484,7 +1480,7 @@ class FichinterLigne extends CommonObjectLine
 	{
 		global $langs, $conf;
 
-        $error = 0;
+		$error = 0;
 
 		dol_syslog("FichinterLigne::insert rang=".$this->rang);
 
@@ -1576,9 +1572,9 @@ class FichinterLigne extends CommonObjectLine
 	{
 		global $langs, $conf;
 
-        $error = 0;
+		$error = 0;
 
-        $this->db->begin();
+		$this->db->begin();
 
 		// Mise a jour ligne en base
 		$sql = "UPDATE ".MAIN_DB_PREFIX."fichinterdet SET";
@@ -1629,7 +1625,7 @@ class FichinterLigne extends CommonObjectLine
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Update total duration into llx_fichinter
 	 *
@@ -1637,7 +1633,7 @@ class FichinterLigne extends CommonObjectLine
 	 */
 	public function update_total()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 		$this->db->begin();
@@ -1696,7 +1692,7 @@ class FichinterLigne extends CommonObjectLine
 			dol_syslog(get_class($this)."::deleteline lineid=".$this->id);
 			$this->db->begin();
 
-                        $result = $this->deleteExtraFields();
+						$result = $this->deleteExtraFields();
 			if ($result < 0) {
 				$error++;
 				$this->db->rollback();
diff --git a/htdocs/fichinter/class/fichinterstats.class.php b/htdocs/fichinter/class/fichinterstats.class.php
index 608b7d75f25..5df841bf6f2 100644
--- a/htdocs/fichinter/class/fichinterstats.class.php
+++ b/htdocs/fichinter/class/fichinterstats.class.php
@@ -33,183 +33,183 @@ include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
  */
 class FichinterStats extends Stats
 {
-    /**
-     * @var string Name of table without prefix where object is stored
-     */
-    public $table_element;
+	/**
+	 * @var string Name of table without prefix where object is stored
+	 */
+	public $table_element;
 
-    public $socid;
-    public $userid;
+	public $socid;
+	public $userid;
 
-    public $from;
-    public $field;
-    public $where;
+	public $from;
+	public $field;
+	public $where;
 
 
-    /**
-     * Constructor
-     *
-     * @param 	DoliDB	$db		   Database handler
-     * @param 	int		$socid	   Id third party for filter. This value must be forced during the new to external user company if user is an external user.
-     * @param 	string	$mode	   Option ('customer', 'supplier')
-     * @param   int		$userid    Id user for filter (creation user)
-     */
-    public function __construct($db, $socid, $mode, $userid = 0)
-    {
-        global $user, $conf;
+	/**
+	 * Constructor
+	 *
+	 * @param 	DoliDB	$db		   Database handler
+	 * @param 	int		$socid	   Id third party for filter. This value must be forced during the new to external user company if user is an external user.
+	 * @param 	string	$mode	   Option ('customer', 'supplier')
+	 * @param   int		$userid    Id user for filter (creation user)
+	 */
+	public function __construct($db, $socid, $mode, $userid = 0)
+	{
+		global $user, $conf;
 
-        $this->db = $db;
+		$this->db = $db;
 
-        $this->socid = ($socid > 0 ? $socid : 0);
-        $this->userid = $userid;
-        $this->cachefilesuffix = $mode;
+		$this->socid = ($socid > 0 ? $socid : 0);
+		$this->userid = $userid;
+		$this->cachefilesuffix = $mode;
 
-        if ($mode == 'customer')
-        {
-            $object = new Fichinter($this->db);
-            $this->from = MAIN_DB_PREFIX.$object->table_element." as c";
-            $this->from_line = MAIN_DB_PREFIX.$object->table_element_line." as tl";
-            $this->field = '0';
-            $this->field_line = '0';
-            //$this->where.= " AND c.fk_statut > 0";    // Not draft and not cancelled
-        }
-        if (!$user->rights->societe->client->voir && !$this->socid) $this->where .= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
-        $this->where .= ($this->where ? ' AND ' : '')."c.entity IN (".getEntity('fichinter').')';
+		if ($mode == 'customer')
+		{
+			$object = new Fichinter($this->db);
+			$this->from = MAIN_DB_PREFIX.$object->table_element." as c";
+			$this->from_line = MAIN_DB_PREFIX.$object->table_element_line." as tl";
+			$this->field = '0';
+			$this->field_line = '0';
+			//$this->where.= " AND c.fk_statut > 0";    // Not draft and not cancelled
+		}
+		if (!$user->rights->societe->client->voir && !$this->socid) $this->where .= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
+		$this->where .= ($this->where ? ' AND ' : '')."c.entity IN (".getEntity('fichinter').')';
 
-        if ($this->socid)
-        {
-            $this->where .= " AND c.fk_soc = ".$this->socid;
-        }
-        if ($this->userid > 0) $this->where .= ' AND c.fk_user_author = '.$this->userid;
-    }
+		if ($this->socid)
+		{
+			$this->where .= " AND c.fk_soc = ".$this->socid;
+		}
+		if ($this->userid > 0) $this->where .= ' AND c.fk_user_author = '.$this->userid;
+	}
 
-    /**
-     * Return intervention number by month for a year
-     *
-     * @param	int		$year		Year to scan
-     *	@param	int		$format		0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
-     * @return	array				Array with number by month
-     */
-    public function getNbByMonth($year, $format = 0)
-    {
-        global $user;
+	/**
+	 * Return intervention number by month for a year
+	 *
+	 * @param	int		$year		Year to scan
+	 *	@param	int		$format		0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
+	 * @return	array				Array with number by month
+	 */
+	public function getNbByMonth($year, $format = 0)
+	{
+		global $user;
 
-        $sql = "SELECT date_format(c.date_valid,'%m') as dm, COUNT(*) as nb";
-        $sql .= " FROM ".$this->from;
-        if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-        $sql .= " WHERE c.date_valid BETWEEN '".$this->db->idate(dol_get_first_day($year))."' AND '".$this->db->idate(dol_get_last_day($year))."'";
-        $sql .= " AND ".$this->where;
-        $sql .= " GROUP BY dm";
-        $sql .= $this->db->order('dm', 'DESC');
+		$sql = "SELECT date_format(c.date_valid,'%m') as dm, COUNT(*) as nb";
+		$sql .= " FROM ".$this->from;
+		if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		$sql .= " WHERE c.date_valid BETWEEN '".$this->db->idate(dol_get_first_day($year))."' AND '".$this->db->idate(dol_get_last_day($year))."'";
+		$sql .= " AND ".$this->where;
+		$sql .= " GROUP BY dm";
+		$sql .= $this->db->order('dm', 'DESC');
 
-        $res = $this->_getNbByMonth($year, $sql, $format);
-        return $res;
-    }
+		$res = $this->_getNbByMonth($year, $sql, $format);
+		return $res;
+	}
 
-    /**
-     * Return interventions number per year
-     *
-     * @return	array	Array with number by year
-     *
-     */
-    public function getNbByYear()
-    {
-        global $user;
+	/**
+	 * Return interventions number per year
+	 *
+	 * @return	array	Array with number by year
+	 *
+	 */
+	public function getNbByYear()
+	{
+		global $user;
 
-        $sql = "SELECT date_format(c.date_valid,'%Y') as dm, COUNT(*) as nb, 0";
-        $sql .= " FROM ".$this->from;
-        if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-        $sql .= " WHERE ".$this->where;
-        $sql .= " GROUP BY dm";
-        $sql .= $this->db->order('dm', 'DESC');
+		$sql = "SELECT date_format(c.date_valid,'%Y') as dm, COUNT(*) as nb, 0";
+		$sql .= " FROM ".$this->from;
+		if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		$sql .= " WHERE ".$this->where;
+		$sql .= " GROUP BY dm";
+		$sql .= $this->db->order('dm', 'DESC');
 
-        return $this->_getNbByYear($sql);
-    }
+		return $this->_getNbByYear($sql);
+	}
 
-    /**
-     * Return the intervention amount by month for a year
-     *
-     * @param	int		$year		Year to scan
-     *	@param	int		$format		0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
-     * @return	array				Array with amount by month
-     */
-    public function getAmountByMonth($year, $format = 0)
-    {
-        global $user;
+	/**
+	 * Return the intervention amount by month for a year
+	 *
+	 * @param	int		$year		Year to scan
+	 *	@param	int		$format		0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
+	 * @return	array				Array with amount by month
+	 */
+	public function getAmountByMonth($year, $format = 0)
+	{
+		global $user;
 
-        $sql = "SELECT date_format(c.date_valid,'%m') as dm, 0";
-        $sql .= " FROM ".$this->from;
-        if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-        $sql .= " WHERE c.date_valid BETWEEN '".$this->db->idate(dol_get_first_day($year))."' AND '".$this->db->idate(dol_get_last_day($year))."'";
-        $sql .= " AND ".$this->where;
-        $sql .= " GROUP BY dm";
-        $sql .= $this->db->order('dm', 'DESC');
+		$sql = "SELECT date_format(c.date_valid,'%m') as dm, 0";
+		$sql .= " FROM ".$this->from;
+		if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		$sql .= " WHERE c.date_valid BETWEEN '".$this->db->idate(dol_get_first_day($year))."' AND '".$this->db->idate(dol_get_last_day($year))."'";
+		$sql .= " AND ".$this->where;
+		$sql .= " GROUP BY dm";
+		$sql .= $this->db->order('dm', 'DESC');
 
-        $res = $this->_getAmountByMonth($year, $sql, $format);
-        return $res;
-    }
+		$res = $this->_getAmountByMonth($year, $sql, $format);
+		return $res;
+	}
 
-    /**
-     * Return the intervention amount average by month for a year
-     *
-     * @param	int		$year	year for stats
-     * @return	array			array with number by month
-     */
-    public function getAverageByMonth($year)
-    {
-        global $user;
+	/**
+	 * Return the intervention amount average by month for a year
+	 *
+	 * @param	int		$year	year for stats
+	 * @return	array			array with number by month
+	 */
+	public function getAverageByMonth($year)
+	{
+		global $user;
 
-        $sql = "SELECT date_format(c.date_valid,'%m') as dm, 0";
-        $sql .= " FROM ".$this->from;
-        if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-        $sql .= " WHERE c.date_valid BETWEEN '".$this->db->idate(dol_get_first_day($year))."' AND '".$this->db->idate(dol_get_last_day($year))."'";
-        $sql .= " AND ".$this->where;
-        $sql .= " GROUP BY dm";
-        $sql .= $this->db->order('dm', 'DESC');
+		$sql = "SELECT date_format(c.date_valid,'%m') as dm, 0";
+		$sql .= " FROM ".$this->from;
+		if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		$sql .= " WHERE c.date_valid BETWEEN '".$this->db->idate(dol_get_first_day($year))."' AND '".$this->db->idate(dol_get_last_day($year))."'";
+		$sql .= " AND ".$this->where;
+		$sql .= " GROUP BY dm";
+		$sql .= $this->db->order('dm', 'DESC');
 
-        return $this->_getAverageByMonth($year, $sql);
-    }
+		return $this->_getAverageByMonth($year, $sql);
+	}
 
-    /**
-     *	Return nb, total and average
-     *
-     *	@return	array	Array of values
-     */
-    public function getAllByYear()
-    {
-        global $user;
+	/**
+	 *	Return nb, total and average
+	 *
+	 *	@return	array	Array of values
+	 */
+	public function getAllByYear()
+	{
+		global $user;
 
-        $sql = "SELECT date_format(c.date_valid,'%Y') as year, COUNT(*) as nb, 0 as total, 0 as avg";
-        $sql .= " FROM ".$this->from;
-        if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-        $sql .= " WHERE ".$this->where;
-        $sql .= " GROUP BY year";
-        $sql .= $this->db->order('year', 'DESC');
+		$sql = "SELECT date_format(c.date_valid,'%Y') as year, COUNT(*) as nb, 0 as total, 0 as avg";
+		$sql .= " FROM ".$this->from;
+		if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		$sql .= " WHERE ".$this->where;
+		$sql .= " GROUP BY year";
+		$sql .= $this->db->order('year', 'DESC');
 
-        return $this->_getAllByYear($sql);
-    }
+		return $this->_getAllByYear($sql);
+	}
 
-    /**
-     *  Return nb, amount of predefined product for year
-     *
-     *  @param	int		$year			Year to scan
-     *  @param  int     $limit      	Limit
-     *  @return	array					Array of values
-     */
-    public function getAllByProduct($year, $limit = 0)
-    {
-        global $user;
+	/**
+	 *  Return nb, amount of predefined product for year
+	 *
+	 *  @param	int		$year			Year to scan
+	 *  @param  int     $limit      	Limit
+	 *  @return	array					Array of values
+	 */
+	public function getAllByProduct($year, $limit = 0)
+	{
+		global $user;
 
-        $sql = "SELECT product.ref, COUNT(product.ref) as nb, 0 as total, 0 as avg";
-        $sql .= " FROM ".$this->from.", ".$this->from_line.", ".MAIN_DB_PREFIX."product as product";
-        //if (!$user->rights->societe->client->voir && !$user->socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-        $sql .= " WHERE ".$this->where;
-        $sql .= " AND c.rowid = tl.fk_fichinter AND tl.fk_product = product.rowid";
-        $sql .= " AND c.date_valid BETWEEN '".$this->db->idate(dol_get_first_day($year, 1, false))."' AND '".$this->db->idate(dol_get_last_day($year, 12, false))."'";
-        $sql .= " GROUP BY product.ref";
-        $sql .= $this->db->order('nb', 'DESC');
-        //$sql.= $this->db->plimit(20);
+		$sql = "SELECT product.ref, COUNT(product.ref) as nb, 0 as total, 0 as avg";
+		$sql .= " FROM ".$this->from.", ".$this->from_line.", ".MAIN_DB_PREFIX."product as product";
+		//if (!$user->rights->societe->client->voir && !$user->socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		$sql .= " WHERE ".$this->where;
+		$sql .= " AND c.rowid = tl.fk_fichinter AND tl.fk_product = product.rowid";
+		$sql .= " AND c.date_valid BETWEEN '".$this->db->idate(dol_get_first_day($year, 1, false))."' AND '".$this->db->idate(dol_get_last_day($year, 12, false))."'";
+		$sql .= " GROUP BY product.ref";
+		$sql .= $this->db->order('nb', 'DESC');
+		//$sql.= $this->db->plimit(20);
 
-        return $this->_getAllByProduct($sql, $limit);
-    }
+		return $this->_getAllByProduct($sql, $limit);
+	}
 }
diff --git a/htdocs/fichinter/contact.php b/htdocs/fichinter/contact.php
index 8dd498d5242..9b617d06f1b 100644
--- a/htdocs/fichinter/contact.php
+++ b/htdocs/fichinter/contact.php
@@ -46,8 +46,8 @@ $object = new Fichinter($db);
 $result = $object->fetch($id, $ref);
 if (!$result)
 {
-    print 'Record not found';
-    exit;
+	print 'Record not found';
+	exit;
 }
 
 /*
@@ -56,11 +56,11 @@ if (!$result)
 
 if ($action == 'addcontact' && $user->rights->ficheinter->creer)
 {
-    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)
 	{
@@ -81,7 +81,7 @@ if ($action == 'addcontact' && $user->rights->ficheinter->creer)
 // Toggle the status of a contact
 elseif ($action == 'swapstatut' && $user->rights->ficheinter->creer)
 {
-    $result = $object->swapContactStatus(GETPOST('ligne', 'int'));
+	$result = $object->swapContactStatus(GETPOST('ligne', 'int'));
 }
 
 // Deletes a contact
@@ -134,42 +134,42 @@ if ($id > 0 || !empty($ref))
 	// Project
 	if (!empty($conf->projet->enabled))
 	{
-	    $langs->load("projects");
-	    $morehtmlref .= '<br>'.$langs->trans('Project').' ';
-	    if ($user->rights->ficheinter->creer)
-	    {
-	        if ($action != 'classify') {
-                //$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
-                $morehtmlref .= ' : ';
-            }
-            if ($action == 'classify') {
-                //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-                $morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-                $morehtmlref .= '<input type="hidden" name="action" value="classin">';
-                $morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
-                $morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-                $morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-                $morehtmlref .= '</form>';
-            } else {
-                $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-            }
-	    } else {
-	        if (!empty($object->fk_project)) {
-	            $proj = new Project($db);
-	            $proj->fetch($object->fk_project);
-	            $morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
-	            $morehtmlref .= $proj->ref;
-	            $morehtmlref .= '</a>';
-	        } else {
-	            $morehtmlref .= '';
-	        }
-	    }
+		$langs->load("projects");
+		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
+		if ($user->rights->ficheinter->creer)
+		{
+			if ($action != 'classify') {
+				//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+				$morehtmlref .= ' : ';
+			}
+			if ($action == 'classify') {
+				//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+				$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+				$morehtmlref .= '<input type="hidden" name="action" value="classin">';
+				$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
+				$morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+				$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+				$morehtmlref .= '</form>';
+			} else {
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+			}
+		} else {
+			if (!empty($object->fk_project)) {
+				$proj = new Project($db);
+				$proj->fetch($object->fk_project);
+				$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
+				$morehtmlref .= $proj->ref;
+				$morehtmlref .= '</a>';
+			} else {
+				$morehtmlref .= '';
+			}
+		}
 	}
 	$morehtmlref .= '</div>';
 
-    dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '', 0, '', '', 1);
+	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '', 0, '', '', 1);
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<br>';
 
@@ -180,8 +180,8 @@ if ($id > 0 || !empty($ref))
 	$dirtpls = array_merge($conf->modules_parts['tpl'], array('/core/tpl'));
 	foreach ($dirtpls as $reldir)
 	{
-	    $res = @include dol_buildpath($reldir.'/contacts.tpl.php');
-	    if ($res) break;
+		$res = @include dol_buildpath($reldir.'/contacts.tpl.php');
+		if ($res) break;
 	}
 }
 
diff --git a/htdocs/fichinter/document.php b/htdocs/fichinter/document.php
index e28345534d7..1b9326468f4 100644
--- a/htdocs/fichinter/document.php
+++ b/htdocs/fichinter/document.php
@@ -117,59 +117,59 @@ if ($object->id)
 	// Project
 	if (!empty($conf->projet->enabled))
 	{
-	    $langs->load("projects");
-	    $morehtmlref .= '<br>'.$langs->trans('Project').' ';
-	    if ($user->rights->commande->creer)
-	    {
-            if ($action != 'classify') {
-                //$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
-                $morehtmlref .= ' : ';
-            }
-            if ($action == 'classify') {
-                //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-                $morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-                $morehtmlref .= '<input type="hidden" name="action" value="classin">';
-                $morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
-                $morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-                $morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-                $morehtmlref .= '</form>';
-            } else {
-                $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-            }
-        } else {
-	        if (!empty($object->fk_project)) {
-	            $proj = new Project($db);
-	            $proj->fetch($object->fk_project);
-	            $morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
-	            $morehtmlref .= $proj->ref;
-	            $morehtmlref .= '</a>';
-	        } else {
-	            $morehtmlref .= '';
-	        }
-	    }
+		$langs->load("projects");
+		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
+		if ($user->rights->commande->creer)
+		{
+			if ($action != 'classify') {
+				//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+				$morehtmlref .= ' : ';
+			}
+			if ($action == 'classify') {
+				//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+				$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+				$morehtmlref .= '<input type="hidden" name="action" value="classin">';
+				$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
+				$morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+				$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+				$morehtmlref .= '</form>';
+			} else {
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+			}
+		} else {
+			if (!empty($object->fk_project)) {
+				$proj = new Project($db);
+				$proj->fetch($object->fk_project);
+				$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
+				$morehtmlref .= $proj->ref;
+				$morehtmlref .= '</a>';
+			} else {
+				$morehtmlref .= '';
+			}
+		}
 	}
 	$morehtmlref .= '</div>';
 
-    dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
 
 
-    print '<div class="fichecenter">';
-    print '<div class="underbanner clearboth"></div>';
+	print '<div class="fichecenter">';
+	print '<div class="underbanner clearboth"></div>';
 
-    print '<table class="border tableforfield centpercent">';
-    print '<tr><td class="titlefield">'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
-    print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.dol_print_size($totalsize, 1, 1).'</td></tr>';
-    print '</table>';
+	print '<table class="border tableforfield centpercent">';
+	print '<tr><td class="titlefield">'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
+	print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.dol_print_size($totalsize, 1, 1).'</td></tr>';
+	print '</table>';
 
-    print '</div>';
+	print '</div>';
 
-    dol_fiche_end();
+	print dol_get_fiche_end();
 
-    $modulepart = 'ficheinter';
-    $permission = $user->rights->ficheinter->creer;
-    $permtoedit = $user->rights->ficheinter->creer;
-    $param = '&id='.$object->id;
-    include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
+	$modulepart = 'ficheinter';
+	$permission = $user->rights->ficheinter->creer;
+	$permtoedit = $user->rights->ficheinter->creer;
+	$param = '&id='.$object->id;
+	include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
 } else {
 	print $langs->trans("ErrorUnknown");
 }
diff --git a/htdocs/fichinter/index.php b/htdocs/fichinter/index.php
index ccadf89f1e4..3ea69f8d185 100644
--- a/htdocs/fichinter/index.php
+++ b/htdocs/fichinter/index.php
@@ -68,16 +68,16 @@ 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 ficheinter
-    $var = false;
-    print '<form method="post" action="'.DOL_URL_ROOT.'/fichinter/list.php">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    print '<div class="div-table-responsive-no-min">';
-    print '<table class="noborder nohover centpercent">';
-    print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
-    print '<tr class="oddeven"><td>';
-    print $langs->trans("Intervention").':</td><td><input type="text" class="flat" name="sall" size="18"></td><td><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
-    print "</table></div></form><br>\n";
+	// Search ficheinter
+	$var = false;
+	print '<form method="post" action="'.DOL_URL_ROOT.'/fichinter/list.php">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<div class="div-table-responsive-no-min">';
+	print '<table class="noborder nohover centpercent">';
+	print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
+	print '<tr class="oddeven"><td>';
+	print $langs->trans("Intervention").':</td><td><input type="text" class="flat" name="sall" size="18"></td><td><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
+	print "</table></div></form><br>\n";
 }
 
 
@@ -97,90 +97,90 @@ $sql .= " GROUP BY f.fk_statut";
 $resql = $db->query($sql);
 if ($resql)
 {
-    $num = $db->num_rows($resql);
-    $i = 0;
+	$num = $db->num_rows($resql);
+	$i = 0;
 
-    $total = 0;
-    $totalinprocess = 0;
-    $dataseries = array();
-    $vals = array();
-    $bool = false;
-    // -1=Canceled, 0=Draft, 1=Validated, 2=Accepted/On process, 3=Closed (Sent/Received, billed or not)
-    while ($i < $num)
-    {
-        $row = $db->fetch_row($resql);
-        if ($row)
-        {
-            //if ($row[1]!=-1 && ($row[1]!=3 || $row[2]!=1))
-            {
-                $bool = (!empty($row[2]) ?true:false);
-                if (!isset($vals[$row[1].$bool])) $vals[$row[1].$bool] = 0;
-                $vals[$row[1].$bool] += $row[0];
-                $totalinprocess += $row[0];
-            }
-            $total += $row[0];
-        }
-        $i++;
-    }
-    $db->free($resql);
+	$total = 0;
+	$totalinprocess = 0;
+	$dataseries = array();
+	$vals = array();
+	$bool = false;
+	// -1=Canceled, 0=Draft, 1=Validated, 2=Accepted/On process, 3=Closed (Sent/Received, billed or not)
+	while ($i < $num)
+	{
+		$row = $db->fetch_row($resql);
+		if ($row)
+		{
+			//if ($row[1]!=-1 && ($row[1]!=3 || $row[2]!=1))
+			{
+				$bool = (!empty($row[2]) ?true:false);
+				if (!isset($vals[$row[1].$bool])) $vals[$row[1].$bool] = 0;
+				$vals[$row[1].$bool] += $row[0];
+				$totalinprocess += $row[0];
+			}
+			$total += $row[0];
+		}
+		$i++;
+	}
+	$db->free($resql);
 
-    include_once DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/theme_vars.inc.php';
+	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, 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;
+	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, 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)
-    {
-        print '<tr class="impair"><td class="center" colspan="2">';
+		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)
+	{
+		print '<tr class="impair"><td class="center" colspan="2">';
 
-        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);
+		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);
 
-        print '</td></tr>';
-    }
-    $bool = false;
-    foreach ($listofstatus as $status)
-    {
-        if (!$conf->use_javascript_ajax)
-        {
-            print '<tr class="oddeven">';
-            print '<td>'.$fichinterstatic->LibStatut($status, $bool, 0).'</td>';
-            print '<td class="right"><a href="list.php?search_status='.$status.'">'.(isset($vals[$status.$bool]) ? $vals[$status.$bool] : 0).' ';
-            print $fichinterstatic->LibStatut($status, $bool, 3);
-            print '</a>';
-            print '</td>';
-            print "</tr>\n";
-            if ($status == 3 && !$bool) $bool = true;
-            else $bool = false;
-        }
-    }
-    //if ($totalinprocess != $total)
-    //print '<tr class="liste_total"><td>'.$langs->trans("Total").' ('.$langs->trans("CustomersOrdersRunning").')</td><td class="right">'.$totalinprocess.'</td></tr>';
-    print '<tr class="liste_total"><td>'.$langs->trans("Total").'</td><td class="right">'.$total.'</td></tr>';
-    print "</table></div><br>";
+		print '</td></tr>';
+	}
+	$bool = false;
+	foreach ($listofstatus as $status)
+	{
+		if (!$conf->use_javascript_ajax)
+		{
+			print '<tr class="oddeven">';
+			print '<td>'.$fichinterstatic->LibStatut($status, $bool, 0).'</td>';
+			print '<td class="right"><a href="list.php?search_status='.$status.'">'.(isset($vals[$status.$bool]) ? $vals[$status.$bool] : 0).' ';
+			print $fichinterstatic->LibStatut($status, $bool, 3);
+			print '</a>';
+			print '</td>';
+			print "</tr>\n";
+			if ($status == 3 && !$bool) $bool = true;
+			else $bool = false;
+		}
+	}
+	//if ($totalinprocess != $total)
+	//print '<tr class="liste_total"><td>'.$langs->trans("Total").' ('.$langs->trans("CustomersOrdersRunning").')</td><td class="right">'.$totalinprocess.'</td></tr>';
+	print '<tr class="liste_total"><td>'.$langs->trans("Total").'</td><td class="right">'.$total.'</td></tr>';
+	print "</table></div><br>";
 } else {
-    dol_print_error($db);
+	dol_print_error($db);
 }
 
 
@@ -202,7 +202,7 @@ if (!empty($conf->ficheinter->enabled))
 	$resql = $db->query($sql);
 	if ($resql)
 	{
-        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="2">'.$langs->trans("DraftFichinter").'</th></tr>';
@@ -251,7 +251,7 @@ $sql .= $db->plimit($max, 0);
 $resql = $db->query($sql);
 if ($resql)
 {
-    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="4">'.$langs->trans("LastModifiedInterventions", $max).'</th></tr>';
@@ -321,7 +321,7 @@ if (!empty($conf->ficheinter->enabled))
 	{
 		$num = $db->num_rows($resql);
 
-        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("FichinterToProcess").' <a href="'.DOL_URL_ROOT.'/fichinter/list.php?search_status=1"><span class="badge">'.$num.'</span></a></th></tr>';
diff --git a/htdocs/fichinter/info.php b/htdocs/fichinter/info.php
index 320a29f4171..a53c69b77bd 100644
--- a/htdocs/fichinter/info.php
+++ b/htdocs/fichinter/info.php
@@ -124,7 +124,7 @@ print '</td></tr></table>';
 
 print '</div>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 llxFooter();
 $db->close();
diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php
index f6b95678f9d..bdf60e121e7 100644
--- a/htdocs/fichinter/list.php
+++ b/htdocs/fichinter/list.php
@@ -180,10 +180,10 @@ $formfile = new FormFile($db);
 $objectstatic = new Fichinter($db);
 $companystatic = new Societe($db);
 if (!empty($conf->projet->enabled)) {
-    $projetstatic = new Project($db);
+	$projetstatic = new Project($db);
 }
 if (!empty($conf->contrat->enabled)) {
-    $contratstatic = new Contrat($db);
+	$contratstatic = new Contrat($db);
 }
 
 $title = $langs->trans("ListOfInterventions");
@@ -195,11 +195,11 @@ $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfi
 $atleastonefieldinlines = 0;
 foreach ($arrayfields as $tmpkey => $tmpval)
 {
-    if (preg_match('/^fd\./', $tmpkey) && !empty($arrayfields[$tmpkey]['checked']))
-    {
-        $atleastonefieldinlines++;
-        break;
-    }
+	if (preg_match('/^fd\./', $tmpkey) && !empty($arrayfields[$tmpkey]['checked']))
+	{
+		$atleastonefieldinlines++;
+		break;
+	}
 }
 
 $sql = "SELECT";
@@ -207,10 +207,10 @@ $sql .= " f.ref, f.rowid, f.fk_statut as status, f.description, f.datec as date_
 if (empty($conf->global->FICHINTER_DISABLE_DETAILS) && $atleastonefieldinlines) $sql .= " fd.rowid as lineid, fd.description as descriptiondetail, fd.date as dp, fd.duree,";
 $sql .= " s.nom as name, s.rowid as socid, s.client, s.fournisseur, s.email, s.status as thirdpartystatus";
 if (!empty($conf->projet->enabled)) {
-    $sql .= ", pr.rowid as projet_id, pr.ref as projet_ref, pr.title as projet_title";
+	$sql .= ", pr.rowid as projet_id, pr.ref as projet_ref, pr.title as projet_title";
 }
 if (!empty($conf->contrat->enabled)) {
-    $sql .= ", c.rowid as contrat_id, c.ref as contrat_ref, c.ref_customer as contrat_ref_supplier, c.ref_supplier as contrat_ref_supplier";
+	$sql .= ", c.rowid as contrat_id, c.ref as contrat_ref, c.ref_customer as contrat_ref_supplier, c.ref_supplier as contrat_ref_supplier";
 }
 // Add fields from extrafields
 if (!empty($extrafields->attributes[$object->table_element]['label'])) {
@@ -222,10 +222,10 @@ $reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters); // N
 $sql .= $hookmanager->resPrint;
 $sql .= " FROM ".MAIN_DB_PREFIX."fichinter as f";
 if (!empty($conf->projet->enabled)) {
-    $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."projet as pr on f.fk_projet = pr.rowid";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."projet as pr on f.fk_projet = pr.rowid";
 }
 if (!empty($conf->contrat->enabled)) {
-    $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."contrat as c on f.fk_contrat = c.rowid";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."contrat as c on f.fk_contrat = c.rowid";
 }
 if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (f.rowid = ef.fk_object)";
 if (empty($conf->global->FICHINTER_DISABLE_DETAILS) && $atleastonefieldinlines) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."fichinterdet as fd ON fd.fk_fichinter = f.rowid";
@@ -240,10 +240,10 @@ if ($search_company) {
 	$sql .= natural_search('s.nom', $search_company);
 }
 if ($search_projet_ref) {
-    $sql .= natural_search('pr.ref', $search_projet_ref);
+	$sql .= natural_search('pr.ref', $search_projet_ref);
 }
 if ($search_contrat_ref) {
-    $sql .= natural_search('c.ref', $search_contrat_ref);
+	$sql .= natural_search('c.ref', $search_contrat_ref);
 }
 if ($search_desc) {
 	if (empty($conf->global->FICHINTER_DISABLE_DETAILS) && $atleastonefieldinlines) $sql .= natural_search(array('f.description', 'fd.description'), $search_desc);
@@ -315,7 +315,7 @@ if ($resql)
 	$arrayofmassactions = array(
 		'generate_doc'=>$langs->trans("ReGeneratePDF"),
 		'builddoc'=>$langs->trans("PDFMerge"),
-	    //'presend'=>$langs->trans("SendByMail"),
+		//'presend'=>$langs->trans("SendByMail"),
 	);
 	if ($user->rights->ficheinter->supprimer) $arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
 	if (in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
@@ -383,18 +383,18 @@ if ($resql)
 		print '<input type="text" class="flat" name="search_company" value="'.$search_company.'" size="10">';
 		print '</td>';
 	}
-    if (!empty($arrayfields['pr.ref']['checked']))
-    {
-        print '<td class="liste_titre">';
-        print '<input type="text" class="flat" name="search_projet_ref" value="'.$search_projet_ref.'" size="8">';
-        print '</td>';
-    }
-    if (!empty($arrayfields['c.ref']['checked']))
-    {
-        print '<td class="liste_titre">';
-        print '<input type="text" class="flat" name="search_contrat_ref" value="'.$search_contrat_ref.'" size="8">';
-        print '</td>';
-    }
+	if (!empty($arrayfields['pr.ref']['checked']))
+	{
+		print '<td class="liste_titre">';
+		print '<input type="text" class="flat" name="search_projet_ref" value="'.$search_projet_ref.'" size="8">';
+		print '</td>';
+	}
+	if (!empty($arrayfields['c.ref']['checked']))
+	{
+		print '<td class="liste_titre">';
+		print '<input type="text" class="flat" name="search_contrat_ref" value="'.$search_contrat_ref.'" size="8">';
+		print '</td>';
+	}
 	if (!empty($arrayfields['f.description']['checked']))
 	{
 		print '<td class="liste_titre">';
@@ -442,18 +442,18 @@ if ($resql)
 		print $form->selectarray('search_status', $liststatus, $search_status, 1, 0, 0, '', 1);
 		print '</td>';
 	}
-    // Fields of detail line
+	// Fields of detail line
 	if (!empty($arrayfields['fd.description']['checked']))
 	{
-	    print '<td class="liste_titre">&nbsp;</td>';
+		print '<td class="liste_titre">&nbsp;</td>';
 	}
 	if (!empty($arrayfields['fd.date']['checked']))
 	{
-	    print '<td class="liste_titre">&nbsp;</td>';
+		print '<td class="liste_titre">&nbsp;</td>';
 	}
 	if (!empty($arrayfields['fd.duree']['checked']))
 	{
-	    print '<td class="liste_titre">&nbsp;</td>';
+		print '<td class="liste_titre">&nbsp;</td>';
 	}
 	print '<td class="liste_titre maxwidthsearch">';
 	$searchpicto = $form->showFilterButtons();
@@ -550,31 +550,31 @@ if ($resql)
 			print '</td>';
 			if (!$i) $totalarray['nbfield']++;
 		}
-        if (!empty($arrayfields['pr.ref']['checked']))
-        {
-            print '<td>';
-            $projetstatic->id = $obj->projet_id;
-            $projetstatic->ref = $obj->projet_ref;
-            $projetstatic->title = $obj->projet_title;
-            if ($projetstatic->id > 0) {
-                print $projetstatic->getNomUrl(1, '');
-            }
-            print '</td>';
-            if (!$i) $totalarray['nbfield']++;
-        }
-        if (!empty($arrayfields['c.ref']['checked']))
-        {
-            print '<td>';
-            $contratstatic->id = $obj->contrat_id;
-            $contratstatic->ref = $obj->contrat_ref;
-            $contratstatic->ref_customer = $obj->contrat_ref_customer;
-            $contratstatic->ref_supplier = $obj->contrat_ref_supplier;
-            if ($contratstatic->id > 0) {
-                print $contratstatic->getNomUrl(1, '');
-                print '</td>';
-            }
-            if (!$i) $totalarray['nbfield']++;
-        }
+		if (!empty($arrayfields['pr.ref']['checked']))
+		{
+			print '<td>';
+			$projetstatic->id = $obj->projet_id;
+			$projetstatic->ref = $obj->projet_ref;
+			$projetstatic->title = $obj->projet_title;
+			if ($projetstatic->id > 0) {
+				print $projetstatic->getNomUrl(1, '');
+			}
+			print '</td>';
+			if (!$i) $totalarray['nbfield']++;
+		}
+		if (!empty($arrayfields['c.ref']['checked']))
+		{
+			print '<td>';
+			$contratstatic->id = $obj->contrat_id;
+			$contratstatic->ref = $obj->contrat_ref;
+			$contratstatic->ref_customer = $obj->contrat_ref_customer;
+			$contratstatic->ref_supplier = $obj->contrat_ref_supplier;
+			if ($contratstatic->id > 0) {
+				print $contratstatic->getNomUrl(1, '');
+				print '</td>';
+			}
+			if (!$i) $totalarray['nbfield']++;
+		}
 		if (!empty($arrayfields['f.description']['checked']))
 		{
 			print '<td>'.dol_trunc(dolGetFirstLineOfText($obj->description), 48).'</td>';
@@ -628,20 +628,20 @@ if ($resql)
 		// Fields of detail of line
 		if (!empty($arrayfields['fd.description']['checked']))
 		{
-		    print '<td>'.dolGetFirstLineOfText($obj->descriptiondetail).'</td>';
-		    if (!$i) $totalarray['nbfield']++;
+			print '<td>'.dolGetFirstLineOfText($obj->descriptiondetail).'</td>';
+			if (!$i) $totalarray['nbfield']++;
 		}
 		if (!empty($arrayfields['fd.date']['checked']))
 		{
-		    print '<td class="center">'.dol_print_date($db->jdate($obj->dp), 'dayhour')."</td>\n";
-		    if (!$i) $totalarray['nbfield']++;
+			print '<td class="center">'.dol_print_date($db->jdate($obj->dp), 'dayhour')."</td>\n";
+			if (!$i) $totalarray['nbfield']++;
 		}
 		if (!empty($arrayfields['fd.duree']['checked']))
 		{
-		    print '<td class="right">'.convertSecondToTime($obj->duree, 'allhourmin').'</td>';
-		    if (!$i) $totalarray['nbfield']++;
-		    if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'fd.duree';
-		    $totalarray['val']['fd.duree'] += $obj->duree;
+			print '<td class="right">'.convertSecondToTime($obj->duree, 'allhourmin').'</td>';
+			if (!$i) $totalarray['nbfield']++;
+			if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'fd.duree';
+			$totalarray['val']['fd.duree'] += $obj->duree;
 		}
 		// Action column
 		print '<td class="nowrap center">';
diff --git a/htdocs/fichinter/note.php b/htdocs/fichinter/note.php
index fd18040d037..dddbe79e33e 100644
--- a/htdocs/fichinter/note.php
+++ b/htdocs/fichinter/note.php
@@ -82,40 +82,40 @@ if ($id > 0 || !empty($ref))
 	// Project
 	if (!empty($conf->projet->enabled))
 	{
-	    $langs->load("projects");
-	    $morehtmlref .= '<br>'.$langs->trans('Project').' ';
-	    if ($user->rights->commande->creer)
-	    {
-            if ($action != 'classify') {
-                //$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
-                $morehtmlref .= ' : ';
-            }
-            if ($action == 'classify') {
-                //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-                $morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-                $morehtmlref .= '<input type="hidden" name="action" value="classin">';
-                $morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
-                $morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-                $morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-                $morehtmlref .= '</form>';
-            } else {
-                $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-            }
-	    } else {
-	        if (!empty($object->fk_project)) {
-	            $proj = new Project($db);
-	            $proj->fetch($object->fk_project);
-	            $morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
-	            $morehtmlref .= $proj->ref;
-	            $morehtmlref .= '</a>';
-	        } else {
-	            $morehtmlref .= '';
-	        }
-	    }
+		$langs->load("projects");
+		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
+		if ($user->rights->commande->creer)
+		{
+			if ($action != 'classify') {
+				//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+				$morehtmlref .= ' : ';
+			}
+			if ($action == 'classify') {
+				//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+				$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+				$morehtmlref .= '<input type="hidden" name="action" value="classin">';
+				$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
+				$morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+				$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+				$morehtmlref .= '</form>';
+			} else {
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+			}
+		} else {
+			if (!empty($object->fk_project)) {
+				$proj = new Project($db);
+				$proj->fetch($object->fk_project);
+				$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
+				$morehtmlref .= $proj->ref;
+				$morehtmlref .= '</a>';
+			} else {
+				$morehtmlref .= '';
+			}
+		}
 	}
 	$morehtmlref .= '</div>';
 
-    dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
 
 	print '<div class="fichecenter">';
 	print '<div class="underbanner clearboth"></div>';
@@ -125,7 +125,7 @@ if ($id > 0 || !empty($ref))
 
 	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 }
 
 llxFooter();
diff --git a/htdocs/fichinter/stats/index.php b/htdocs/fichinter/stats/index.php
index 45d4c2c2c7d..093e0e4e73d 100644
--- a/htdocs/fichinter/stats/index.php
+++ b/htdocs/fichinter/stats/index.php
@@ -37,8 +37,8 @@ $socid = GETPOST('socid', 'int');
 // Security check
 if ($user->socid > 0)
 {
-    $action = '';
-    $socid = $user->socid;
+	$action = '';
+	$socid = $user->socid;
 }
 
 $nowyear = strftime("%Y", dol_now());
@@ -79,36 +79,36 @@ $data = $stats->getNbByMonthWithPrevYear($endyear, $startyear);
 
 if (!$user->rights->societe->client->voir || $user->socid)
 {
-    $filenamenb = $dir.'/interventionsnbinyear-'.$user->id.'-'.$year.'.png';
-    $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=interventionstats&file=interventionsnbinyear-'.$user->id.'-'.$year.'.png';
+	$filenamenb = $dir.'/interventionsnbinyear-'.$user->id.'-'.$year.'.png';
+	$fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=interventionstats&file=interventionsnbinyear-'.$user->id.'-'.$year.'.png';
 } else {
-    $filenamenb = $dir.'/interventionsnbinyear-'.$year.'.png';
-    $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=interventionstats&file=interventionsnbinyear-'.$year.'.png';
+	$filenamenb = $dir.'/interventionsnbinyear-'.$year.'.png';
+	$fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=interventionstats&file=interventionsnbinyear-'.$year.'.png';
 }
 
 $px1 = new DolGraph();
 $mesg = $px1->isGraphKo();
 if (!$mesg)
 {
-    $px1->SetData($data);
-    $i = $startyear; $legend = array();
-    while ($i <= $endyear)
-    {
-        $legend[] = $i;
-        $i++;
-    }
-    $px1->SetLegend($legend);
-    $px1->SetMaxValue($px1->GetCeilMaxValue());
-    $px1->SetMinValue(min(0, $px1->GetFloorMinValue()));
-    $px1->SetWidth($WIDTH);
-    $px1->SetHeight($HEIGHT);
-    $px1->SetYLabel($langs->trans("NbOfIntervention"));
-    $px1->SetShading(3);
-    $px1->SetHorizTickIncrement(1);
-    $px1->mode = 'depth';
-    $px1->SetTitle($langs->trans("NumberOfInterventionsByMonth"));
+	$px1->SetData($data);
+	$i = $startyear; $legend = array();
+	while ($i <= $endyear)
+	{
+		$legend[] = $i;
+		$i++;
+	}
+	$px1->SetLegend($legend);
+	$px1->SetMaxValue($px1->GetCeilMaxValue());
+	$px1->SetMinValue(min(0, $px1->GetFloorMinValue()));
+	$px1->SetWidth($WIDTH);
+	$px1->SetHeight($HEIGHT);
+	$px1->SetYLabel($langs->trans("NbOfIntervention"));
+	$px1->SetShading(3);
+	$px1->SetHorizTickIncrement(1);
+	$px1->mode = 'depth';
+	$px1->SetTitle($langs->trans("NumberOfInterventionsByMonth"));
 
-    $px1->draw($filenamenb, $fileurlnb);
+	$px1->draw($filenamenb, $fileurlnb);
 }
 
 // Build graphic amount of object
@@ -117,36 +117,36 @@ $data = $stats->getAmountByMonthWithPrevYear($endyear, $startyear);
 
 if (!$user->rights->societe->client->voir || $user->socid)
 {
-    $filenameamount = $dir.'/interventionsamountinyear-'.$user->id.'-'.$year.'.png';
-    $fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=interventionstats&file=interventionsamountinyear-'.$user->id.'-'.$year.'.png';
+	$filenameamount = $dir.'/interventionsamountinyear-'.$user->id.'-'.$year.'.png';
+	$fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=interventionstats&file=interventionsamountinyear-'.$user->id.'-'.$year.'.png';
 } else {
-    $filenameamount = $dir.'/interventionsamountinyear-'.$year.'.png';
-    $fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=interventionstats&file=interventionsamountinyear-'.$year.'.png';
+	$filenameamount = $dir.'/interventionsamountinyear-'.$year.'.png';
+	$fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=interventionstats&file=interventionsamountinyear-'.$year.'.png';
 }
 
 $px2 = new DolGraph();
 $mesg = $px2->isGraphKo();
 if (!$mesg)
 {
-    $px2->SetData($data);
-    $i = $startyear; $legend = array();
-    while ($i <= $endyear)
-    {
-        $legend[] = $i;
-        $i++;
-    }
-    $px2->SetLegend($legend);
-    $px2->SetMaxValue($px2->GetCeilMaxValue());
-    $px2->SetMinValue(min(0, $px2->GetFloorMinValue()));
-    $px2->SetWidth($WIDTH);
-    $px2->SetHeight($HEIGHT);
-    $px2->SetYLabel($langs->trans("AmountOfinterventions"));
-    $px2->SetShading(3);
-    $px2->SetHorizTickIncrement(1);
-    $px2->mode = 'depth';
-    $px2->SetTitle($langs->trans("AmountOfinterventionsByMonthHT"));
+	$px2->SetData($data);
+	$i = $startyear; $legend = array();
+	while ($i <= $endyear)
+	{
+		$legend[] = $i;
+		$i++;
+	}
+	$px2->SetLegend($legend);
+	$px2->SetMaxValue($px2->GetCeilMaxValue());
+	$px2->SetMinValue(min(0, $px2->GetFloorMinValue()));
+	$px2->SetWidth($WIDTH);
+	$px2->SetHeight($HEIGHT);
+	$px2->SetYLabel($langs->trans("AmountOfinterventions"));
+	$px2->SetShading(3);
+	$px2->SetHorizTickIncrement(1);
+	$px2->mode = 'depth';
+	$px2->SetTitle($langs->trans("AmountOfinterventionsByMonthHT"));
 
-    $px2->draw($filenameamount, $fileurlamount);
+	$px2->draw($filenameamount, $fileurlamount);
 }
 
 
@@ -154,36 +154,36 @@ $data = $stats->getAverageByMonthWithPrevYear($endyear, $startyear);
 
 if (!$user->rights->societe->client->voir || $user->socid)
 {
-    $filename_avg = $dir.'/interventionsaverage-'.$user->id.'-'.$year.'.png';
-    $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=interventionstats&file=interventionsaverage-'.$user->id.'-'.$year.'.png';
+	$filename_avg = $dir.'/interventionsaverage-'.$user->id.'-'.$year.'.png';
+	$fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=interventionstats&file=interventionsaverage-'.$user->id.'-'.$year.'.png';
 } else {
-    $filename_avg = $dir.'/interventionsaverage-'.$year.'.png';
-    $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=interventionstats&file=interventionsaverage-'.$year.'.png';
+	$filename_avg = $dir.'/interventionsaverage-'.$year.'.png';
+	$fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=interventionstats&file=interventionsaverage-'.$year.'.png';
 }
 
 $px3 = new DolGraph();
 $mesg = $px3->isGraphKo();
 if (!$mesg)
 {
-    $px3->SetData($data);
-    $i = $startyear; $legend = array();
-    while ($i <= $endyear)
-    {
-        $legend[] = $i;
-        $i++;
-    }
-    $px3->SetLegend($legend);
-    $px3->SetYLabel($langs->trans("AmountAverage"));
-    $px3->SetMaxValue($px3->GetCeilMaxValue());
-    $px3->SetMinValue($px3->GetFloorMinValue());
-    $px3->SetWidth($WIDTH);
-    $px3->SetHeight($HEIGHT);
-    $px3->SetShading(3);
-    $px3->SetHorizTickIncrement(1);
-    $px3->mode = 'depth';
-    $px3->SetTitle($langs->trans("AmountAverage"));
+	$px3->SetData($data);
+	$i = $startyear; $legend = array();
+	while ($i <= $endyear)
+	{
+		$legend[] = $i;
+		$i++;
+	}
+	$px3->SetLegend($legend);
+	$px3->SetYLabel($langs->trans("AmountAverage"));
+	$px3->SetMaxValue($px3->GetCeilMaxValue());
+	$px3->SetMinValue($px3->GetFloorMinValue());
+	$px3->SetWidth($WIDTH);
+	$px3->SetHeight($HEIGHT);
+	$px3->SetShading(3);
+	$px3->SetHorizTickIncrement(1);
+	$px3->mode = 'depth';
+	$px3->SetTitle($langs->trans("AmountAverage"));
 
-    $px3->draw($filename_avg, $fileurl_avg);
+	$px3->draw($filename_avg, $fileurl_avg);
 }
 
 
@@ -226,7 +226,7 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
 	print '<tr class="liste_titre"><td class="liste_titre" colspan="2">'.$langs->trans("Filter").'</td></tr>';
 	// Company
 	print '<tr><td class="left">'.$langs->trans("ThirdParty").'</td><td class="left">';
-    $filter = 's.client IN (1,2,3)';
+	$filter = 's.client IN (1,2,3)';
 	print $form->select_company($socid, 'socid', $filter, 1, 0, 0, array(), 0, '', 'style="width: 95%"');
 	print '</td></tr>';
 	// User
@@ -270,7 +270,7 @@ foreach ($data as $val)
 	$year = $val['year'];
 	while (!empty($year) && $oldyear > $year + 1)
 	{
-        // If we have empty year
+		// If we have empty year
 		$oldyear--;
 
 		print '<tr class="oddeven" height="24">';
@@ -308,8 +308,8 @@ print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 // Show graphs
 print '<table class="border centpercent"><tr class="pair nohover"><td class="center">';
 if ($mesg) { print $mesg; } else {
-    print $px1->show();
-    /*print "<br>\n";
+	print $px1->show();
+	/*print "<br>\n";
     print $px2->show();
     print "<br>\n";
     print $px3->show();*/
@@ -320,7 +320,7 @@ print '</td></tr></table>';
 print '</div></div></div>';
 print '<div style="clear:both"></div>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 llxFooter();
diff --git a/htdocs/fichinter/tpl/linkedobjectblock.tpl.php b/htdocs/fichinter/tpl/linkedobjectblock.tpl.php
index b9a4399200d..b483e877e5e 100644
--- a/htdocs/fichinter/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/fichinter/tpl/linkedobjectblock.tpl.php
@@ -38,10 +38,10 @@ $linkedObjectBlock = dol_sort_array($linkedObjectBlock, 'date', 'desc', 0, 0, 1)
 $ilink = 0;
 foreach ($linkedObjectBlock as $key => $objectlink)
 {
-    $ilink++;
+	$ilink++;
 
-    $trclass = 'oddeven';
-    if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass .= ' liste_sub_total';
+	$trclass = 'oddeven';
+	if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass .= ' liste_sub_total';
 	?>
     <tr class="<?php echo $trclass; ?>">
 		<td><?php echo $langs->trans("Intervention"); ?></td>
diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php
index 45dfd4b8760..1942ecd35a7 100644
--- a/htdocs/filefunc.inc.php
+++ b/htdocs/filefunc.inc.php
@@ -75,34 +75,34 @@ $result = @include_once $conffile; // Keep @ because with some error reporting t
 
 if (!$result && !empty($_SERVER["GATEWAY_INTERFACE"]))    // If install not done and we are in a web session
 {
-    if (!empty($_SERVER["CONTEXT_PREFIX"]))    // CONTEXT_PREFIX and CONTEXT_DOCUMENT_ROOT are not defined on all apache versions
-    {
-        $path = $_SERVER["CONTEXT_PREFIX"]; // example '/dolibarr/' when using an apache alias.
-        if (!preg_match('/\/$/', $path)) $path .= '/';
-    }
-    elseif (preg_match('/index\.php/', $_SERVER['PHP_SELF']))
-    {
-        // When we ask index.php, we MUST BE SURE that $path is '' at the end. This is required to make install process
-        // when using apache alias like '/dolibarr/' that point to htdocs.
-    	// Note: If calling page was an index.php not into htdocs (ie comm/index.php, ...), then this redirect will fails,
-    	// but we don't want to change this because when URL is correct, we must be sure the redirect to install/index.php will be correct.
-        $path = '';
-    } else {
-        // If what we look is not index.php, we can try to guess location of root. May not work all the time.
-    	// There is no real solution, because the only way to know the apache url relative path is to have it into conf file.
-    	// If it fails to find correct $path, then only solution is to ask user to enter the correct URL to index.php or install/index.php
-        $TDir = explode('/', $_SERVER['PHP_SELF']);
-    	$path = '';
-    	$i = count($TDir);
-    	while ($i--)
-    	{
-    		if (empty($TDir[$i]) || $TDir[$i] == 'htdocs') break;
-            if ($TDir[$i] == 'dolibarr') break;
-            if (substr($TDir[$i], -4, 4) == '.php') continue;
+	if (!empty($_SERVER["CONTEXT_PREFIX"]))    // CONTEXT_PREFIX and CONTEXT_DOCUMENT_ROOT are not defined on all apache versions
+	{
+		$path = $_SERVER["CONTEXT_PREFIX"]; // example '/dolibarr/' when using an apache alias.
+		if (!preg_match('/\/$/', $path)) $path .= '/';
+	}
+	elseif (preg_match('/index\.php/', $_SERVER['PHP_SELF']))
+	{
+		// When we ask index.php, we MUST BE SURE that $path is '' at the end. This is required to make install process
+		// when using apache alias like '/dolibarr/' that point to htdocs.
+		// Note: If calling page was an index.php not into htdocs (ie comm/index.php, ...), then this redirect will fails,
+		// but we don't want to change this because when URL is correct, we must be sure the redirect to install/index.php will be correct.
+		$path = '';
+	} else {
+		// If what we look is not index.php, we can try to guess location of root. May not work all the time.
+		// There is no real solution, because the only way to know the apache url relative path is to have it into conf file.
+		// If it fails to find correct $path, then only solution is to ask user to enter the correct URL to index.php or install/index.php
+		$TDir = explode('/', $_SERVER['PHP_SELF']);
+		$path = '';
+		$i = count($TDir);
+		while ($i--)
+		{
+			if (empty($TDir[$i]) || $TDir[$i] == 'htdocs') break;
+			if ($TDir[$i] == 'dolibarr') break;
+			if (substr($TDir[$i], -4, 4) == '.php') continue;
 
-    		$path .= '../';
-    	}
-    }
+			$path .= '../';
+		}
+	}
 
 	header("Location: ".$path."install/index.php");
 	exit;
@@ -149,24 +149,24 @@ if (empty($dolibarr_strict_mode)) $dolibarr_strict_mode = 0; // For debug in php
 if (!defined('NOCSRFCHECK') && empty($dolibarr_nocsrfcheck))
 {
 	if (!empty($_SERVER['REQUEST_METHOD']) && !in_array($_SERVER['REQUEST_METHOD'], array('GET', 'HEAD')) && !empty($_SERVER['HTTP_HOST']))
-    {
-    	$csrfattack = false;
-    	if (empty($_SERVER['HTTP_REFERER'])) $csrfattack = true; // An evil browser was used
-    	else {
-    		$tmpa = parse_url($_SERVER['HTTP_HOST']);
-    		$tmpb = parse_url($_SERVER['HTTP_REFERER']);
-    		if ((empty($tmpa['host']) ? $tmpa['path'] : $tmpa['host']) != (empty($tmpb['host']) ? $tmpb['path'] : $tmpb['host'])) $csrfattack = true;
-    	}
-    	if ($csrfattack)
-    	{
-    		//print 'NOCSRFCHECK='.defined('NOCSRFCHECK').' REQUEST_METHOD='.$_SERVER['REQUEST_METHOD'].' HTTP_HOST='.$_SERVER['HTTP_HOST'].' HTTP_REFERER='.$_SERVER['HTTP_REFERER'];
-    		// Note: We can't use dol_escape_htmltag here to escape output because lib functions.lib.ph is not yet loaded.
-    		print "Access refused by CSRF protection in main.inc.php. Referer of form (".htmlentities($_SERVER['HTTP_REFERER'], ENT_COMPAT, 'UTF-8').") is outside the server that serve this page (with method = ".htmlentities($_SERVER['REQUEST_METHOD'], ENT_COMPAT, 'UTF-8').").\n";
-        	print "If you access your server behind a proxy using url rewriting, you might check that all HTTP headers are propagated (or add the line \$dolibarr_nocsrfcheck=1 into your conf.php file to remove this security check).\n";
-    		die;
-    	}
-    }
-    // Another test is done later on token if option MAIN_SECURITY_CSRF_WITH_TOKEN is on.
+	{
+		$csrfattack = false;
+		if (empty($_SERVER['HTTP_REFERER'])) $csrfattack = true; // An evil browser was used
+		else {
+			$tmpa = parse_url($_SERVER['HTTP_HOST']);
+			$tmpb = parse_url($_SERVER['HTTP_REFERER']);
+			if ((empty($tmpa['host']) ? $tmpa['path'] : $tmpa['host']) != (empty($tmpb['host']) ? $tmpb['path'] : $tmpb['host'])) $csrfattack = true;
+		}
+		if ($csrfattack)
+		{
+			//print 'NOCSRFCHECK='.defined('NOCSRFCHECK').' REQUEST_METHOD='.$_SERVER['REQUEST_METHOD'].' HTTP_HOST='.$_SERVER['HTTP_HOST'].' HTTP_REFERER='.$_SERVER['HTTP_REFERER'];
+			// Note: We can't use dol_escape_htmltag here to escape output because lib functions.lib.ph is not yet loaded.
+			print "Access refused by CSRF protection in main.inc.php. Referer of form (".htmlentities($_SERVER['HTTP_REFERER'], ENT_COMPAT, 'UTF-8').") is outside the server that serve this page (with method = ".htmlentities($_SERVER['REQUEST_METHOD'], ENT_COMPAT, 'UTF-8').").\n";
+			print "If you access your server behind a proxy using url rewriting, you might check that all HTTP headers are propagated (or add the line \$dolibarr_nocsrfcheck=1 into your conf.php file to remove this security check).\n";
+			die;
+		}
+	}
+	// Another test is done later on token if option MAIN_SECURITY_CSRF_WITH_TOKEN is on.
 }
 if (empty($dolibarr_main_db_host))
 {
@@ -197,27 +197,27 @@ $tmp = '';
 $found = 0;
 $real_dolibarr_main_document_root = str_replace('\\', '/', realpath($dolibarr_main_document_root)); // A) Value found into config file, to say where are store htdocs files. Ex: C:/xxx/dolibarr, C:/xxx/dolibarr/htdocs
 if (!empty($_SERVER["DOCUMENT_ROOT"])) {
-    $pathroot = $_SERVER["DOCUMENT_ROOT"]; // B) Value reported by web server setup (not defined on CLI mode), to say where is root of web server instance. Ex: C:/xxx/dolibarr, C:/xxx/dolibarr/htdocs
+	$pathroot = $_SERVER["DOCUMENT_ROOT"]; // B) Value reported by web server setup (not defined on CLI mode), to say where is root of web server instance. Ex: C:/xxx/dolibarr, C:/xxx/dolibarr/htdocs
 } else {
-    $pathroot = 'NOTDEFINED';
+	$pathroot = 'NOTDEFINED';
 }
 $paths = explode('/', str_replace('\\', '/', $_SERVER["SCRIPT_NAME"])); // C) Value reported by web server, to say full path on filesystem of a file. Ex: /dolibarr/htdocs/admin/system/phpinfo.php
 // Try to detect if $_SERVER["DOCUMENT_ROOT"]+start of $_SERVER["SCRIPT_NAME"] is $dolibarr_main_document_root. If yes, relative url to add before dol files is this start part.
 $concatpath = '';
 foreach ($paths as $tmppath)	// We check to find (B+start of C)=A
 {
-    if (empty($tmppath)) continue;
-    $concatpath .= '/'.$tmppath;
-    //if ($tmppath) $concatpath.='/'.$tmppath;
-    //print $_SERVER["SCRIPT_NAME"].'-'.$pathroot.'-'.$concatpath.'-'.$real_dolibarr_main_document_root.'-'.realpath($pathroot.$concatpath).'<br>';
-    if ($real_dolibarr_main_document_root == @realpath($pathroot.$concatpath))    // @ avoid warning when safe_mode is on.
-    {
-        //print "Found relative url = ".$concatpath;
-    	$tmp3 = $concatpath;
-        $found = 1;
-        break;
-    }
-    //else print "Not found yet for concatpath=".$concatpath."<br>\n";
+	if (empty($tmppath)) continue;
+	$concatpath .= '/'.$tmppath;
+	//if ($tmppath) $concatpath.='/'.$tmppath;
+	//print $_SERVER["SCRIPT_NAME"].'-'.$pathroot.'-'.$concatpath.'-'.$real_dolibarr_main_document_root.'-'.realpath($pathroot.$concatpath).'<br>';
+	if ($real_dolibarr_main_document_root == @realpath($pathroot.$concatpath))    // @ avoid warning when safe_mode is on.
+	{
+		//print "Found relative url = ".$concatpath;
+		$tmp3 = $concatpath;
+		$found = 1;
+		break;
+	}
+	//else print "Not found yet for concatpath=".$concatpath."<br>\n";
 }
 //print "found=".$found." dolibarr_main_url_root=".$dolibarr_main_url_root."\n";
 if (!$found) $tmp = $dolibarr_main_url_root; // If autodetect fails (Ie: when using apache alias that point outside default DOCUMENT_ROOT).
diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php
index e6a1a6a5a8c..85ab93d17ec 100644
--- a/htdocs/fourn/card.php
+++ b/htdocs/fourn/card.php
@@ -85,8 +85,8 @@ if (empty($reshook))
 	{
 		$result = $object->fetch($id);
    		$object->code_compta_fournisseur = $_POST["supplieraccountancycode"];
-	    $result = $object->update($object->id, $user, 1, 0, 1);
-	    if ($result < 0)	setEventMessages($object->error, $object->errors, 'errors');
+		$result = $object->update($object->id, $user, 1, 0, 1);
+		if ($result < 0)	setEventMessages($object->error, $object->errors, 'errors');
 	}
 	// terms of the settlement
 	if ($action == 'setconditions' && $user->rights->societe->creer)
@@ -113,23 +113,23 @@ if (empty($reshook))
 	}
 
 	if ($action == 'update_extras') {
-        $object->fetch($id);
+		$object->fetch($id);
 
-        $object->oldcopy = dol_clone($object);
+		$object->oldcopy = dol_clone($object);
 
-        // Fill array 'array_options' with data from update form
-        $ret = $extrafields->setOptionalsFromPost(null, $object, GETPOST('attribute', 'restricthtml'));
+		// Fill array 'array_options' with data from update form
+		$ret = $extrafields->setOptionalsFromPost(null, $object, GETPOST('attribute', 'restricthtml'));
 
-        if ($ret < 0) $error++;
+		if ($ret < 0) $error++;
 
-        if (!$error)
-        {
-            $result = $object->insertExtraFields('COMPANY_MODIFY');
-            if ($result < 0) $error++;
-        }
+		if (!$error)
+		{
+			$result = $object->insertExtraFields('COMPANY_MODIFY');
+			if ($result < 0) $error++;
+		}
 
-        if ($error) $action = 'edit_extras';
-    }
+		if ($error) $action = 'edit_extras';
+	}
 }
 
 
@@ -167,31 +167,31 @@ if ($object->id > 0)
 
 	print '<div class="fichecenter"><div class="fichehalfleft">';
 
-    print '<div class="underbanner clearboth"></div>';
+	print '<div class="underbanner clearboth"></div>';
 	print '<table width="100%" class="border">';
 
-    if (!empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
-    {
-        print '<tr><td>'.$langs->trans('Prefix').'</td><td colspan="3">'.$object->prefix_comm.'</td></tr>';
-    }
+	if (!empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
+	{
+		print '<tr><td>'.$langs->trans('Prefix').'</td><td colspan="3">'.$object->prefix_comm.'</td></tr>';
+	}
 
 	if ($object->fournisseur)
 	{
 		print '<tr>';
-        print '<td class="titlefield">'.$langs->trans("SupplierCode").'</td><td>';
-        print $object->code_fournisseur;
-        if ($object->check_codefournisseur() <> 0) print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
-        print '</td>';
-        print '</tr>';
+		print '<td class="titlefield">'.$langs->trans("SupplierCode").'</td><td>';
+		print $object->code_fournisseur;
+		if ($object->check_codefournisseur() <> 0) print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
+		print '</td>';
+		print '</tr>';
 
 		$langs->load('compta');
-        print '<tr>';
-        print '<td>';
-        print $form->editfieldkey("SupplierAccountancyCode", 'supplieraccountancycode', $object->code_compta_fournisseur, $object, $user->rights->societe->creer);
-        print '</td><td>';
-        print $form->editfieldval("SupplierAccountancyCode", 'supplieraccountancycode', $object->code_compta_fournisseur, $object, $user->rights->societe->creer);
-        print '</td>';
-        print '</tr>';
+		print '<tr>';
+		print '<td>';
+		print $form->editfieldkey("SupplierAccountancyCode", 'supplieraccountancycode', $object->code_compta_fournisseur, $object, $user->rights->societe->creer);
+		print '</td><td>';
+		print $form->editfieldval("SupplierAccountancyCode", 'supplieraccountancycode', $object->code_compta_fournisseur, $object, $user->rights->societe->creer);
+		print '</td>';
+		print '</tr>';
 	}
 
 	// Assujetti a TVA ou pas
@@ -217,10 +217,10 @@ if ($object->id > 0)
 		print '</td></tr>';
 	}
 
-    // TVA Intra
-    print '<tr><td class="nowrap">'.$langs->trans('VATIntra').'</td><td>';
-    print $object->tva_intra;
-    print '</td></tr>';
+	// TVA Intra
+	print '<tr><td class="nowrap">'.$langs->trans('VATIntra').'</td><td>';
+	print $object->tva_intra;
+	print '</td></tr>';
 
 	// Default terms of the settlement
 	$langs->load('bills');
@@ -306,11 +306,11 @@ if ($object->id > 0)
 	// Categories
 	if (!empty($conf->categorie->enabled))
 	{
-	    $langs->load("categories");
-    	print '<tr><td>'.$langs->trans("SuppliersCategoriesShort").'</td>';
-    	print '<td>';
-    	print $form->showCategories($object->id, Categorie::TYPE_SUPPLIER, 1);
-    	print "</td></tr>";
+		$langs->load("categories");
+		print '<tr><td>'.$langs->trans("SuppliersCategoriesShort").'</td>';
+		print '<td>';
+		print $form->showCategories($object->id, Categorie::TYPE_SUPPLIER, 1);
+		print "</td></tr>";
 	}
 
 	// Other attributes
@@ -318,24 +318,24 @@ if ($object->id > 0)
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
 
 	// Module Adherent
-    if (!empty($conf->adherent->enabled))
-    {
-        $langs->load("members");
-        $langs->load("users");
-        print '<tr><td>'.$langs->trans("LinkedToDolibarrMember").'</td>';
-        print '<td>';
-        $adh = new Adherent($db);
-        $result = $adh->fetch('', '', $object->id);
-        if ($result > 0)
-        {
-            $adh->ref = $adh->getFullName($langs);
-            print $adh->getNomUrl(1);
-        } else {
-            print $langs->trans("ThirdpartyNotLinkedToMember");
-        }
-        print '</td>';
-        print "</tr>\n";
-    }
+	if (!empty($conf->adherent->enabled))
+	{
+		$langs->load("members");
+		$langs->load("users");
+		print '<tr><td>'.$langs->trans("LinkedToDolibarrMember").'</td>';
+		print '<td>';
+		$adh = new Adherent($db);
+		$result = $adh->fetch('', '', $object->id);
+		if ($result > 0)
+		{
+			$adh->ref = $adh->getFullName($langs);
+			print $adh->getNomUrl(1);
+		} else {
+			print $langs->trans("ThirdpartyNotLinkedToMember");
+		}
+		print '</td>';
+		print "</tr>\n";
+	}
 
 	print '</table>';
 
@@ -356,67 +356,67 @@ if ($object->id > 0)
 
 	if ($conf->supplier_proposal->enabled)
 	{
-	    // Box proposals
-	    $tmp = $object->getOutstandingProposals('supplier');
-	    $outstandingOpened = $tmp['opened'];
-	    $outstandingTotal = $tmp['total_ht'];
-	    $outstandingTotalIncTax = $tmp['total_ttc'];
-	    $text = $langs->trans("OverAllSupplierProposals");
-	    $link = DOL_URL_ROOT.'/supplier_proposal/list.php?socid='.$object->id;
-	    $icon = 'bill';
-	    if ($link) $boxstat .= '<a href="'.$link.'" class="boxstatsindicator thumbstat nobold nounderline">';
-	    $boxstat .= '<div class="boxstats" title="'.dol_escape_htmltag($text).'">';
-	    $boxstat .= '<span class="boxstatstext">'.img_object("", $icon).' <span>'.$text.'</span></span><br>';
-	    $boxstat .= '<span class="boxstatsindicator">'.price($outstandingTotal, 1, $langs, 1, -1, -1, $conf->currency).'</span>';
-	    $boxstat .= '</div>';
-	    if ($link) $boxstat .= '</a>';
+		// Box proposals
+		$tmp = $object->getOutstandingProposals('supplier');
+		$outstandingOpened = $tmp['opened'];
+		$outstandingTotal = $tmp['total_ht'];
+		$outstandingTotalIncTax = $tmp['total_ttc'];
+		$text = $langs->trans("OverAllSupplierProposals");
+		$link = DOL_URL_ROOT.'/supplier_proposal/list.php?socid='.$object->id;
+		$icon = 'bill';
+		if ($link) $boxstat .= '<a href="'.$link.'" class="boxstatsindicator thumbstat nobold nounderline">';
+		$boxstat .= '<div class="boxstats" title="'.dol_escape_htmltag($text).'">';
+		$boxstat .= '<span class="boxstatstext">'.img_object("", $icon).' <span>'.$text.'</span></span><br>';
+		$boxstat .= '<span class="boxstatsindicator">'.price($outstandingTotal, 1, $langs, 1, -1, -1, $conf->currency).'</span>';
+		$boxstat .= '</div>';
+		if ($link) $boxstat .= '</a>';
 	}
 
 	if (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled))
 	{
-	    // Box proposals
-	    $tmp = $object->getOutstandingOrders('supplier');
-	    $outstandingOpened = $tmp['opened'];
-	    $outstandingTotal = $tmp['total_ht'];
-	    $outstandingTotalIncTax = $tmp['total_ttc'];
-	    $text = $langs->trans("OverAllOrders");
-	    $link = DOL_URL_ROOT.'/fourn/commande/list.php?socid='.$object->id;
-	    $icon = 'bill';
-	    if ($link) $boxstat .= '<a href="'.$link.'" class="boxstatsindicator thumbstat nobold nounderline">';
-	    $boxstat .= '<div class="boxstats" title="'.dol_escape_htmltag($text).'">';
-	    $boxstat .= '<span class="boxstatstext">'.img_object("", $icon).' <span>'.$text.'</span></span><br>';
-	    $boxstat .= '<span class="boxstatsindicator">'.price($outstandingTotal, 1, $langs, 1, -1, -1, $conf->currency).'</span>';
-	    $boxstat .= '</div>';
-	    if ($link) $boxstat .= '</a>';
+		// Box proposals
+		$tmp = $object->getOutstandingOrders('supplier');
+		$outstandingOpened = $tmp['opened'];
+		$outstandingTotal = $tmp['total_ht'];
+		$outstandingTotalIncTax = $tmp['total_ttc'];
+		$text = $langs->trans("OverAllOrders");
+		$link = DOL_URL_ROOT.'/fourn/commande/list.php?socid='.$object->id;
+		$icon = 'bill';
+		if ($link) $boxstat .= '<a href="'.$link.'" class="boxstatsindicator thumbstat nobold nounderline">';
+		$boxstat .= '<div class="boxstats" title="'.dol_escape_htmltag($text).'">';
+		$boxstat .= '<span class="boxstatstext">'.img_object("", $icon).' <span>'.$text.'</span></span><br>';
+		$boxstat .= '<span class="boxstatsindicator">'.price($outstandingTotal, 1, $langs, 1, -1, -1, $conf->currency).'</span>';
+		$boxstat .= '</div>';
+		if ($link) $boxstat .= '</a>';
 	}
 
 	if (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled))
 	{
-	    $tmp = $object->getOutstandingBills('supplier');
-	    $outstandingOpened = $tmp['opened'];
-	    $outstandingTotal = $tmp['total_ht'];
-	    $outstandingTotalIncTax = $tmp['total_ttc'];
+		$tmp = $object->getOutstandingBills('supplier');
+		$outstandingOpened = $tmp['opened'];
+		$outstandingTotal = $tmp['total_ht'];
+		$outstandingTotalIncTax = $tmp['total_ttc'];
 
-	    $text = $langs->trans("OverAllInvoices");
-	    $link = DOL_URL_ROOT.'/fourn/facture/list.php?socid='.$object->id;
-	    $icon = 'bill';
-	    if ($link) $boxstat .= '<a href="'.$link.'" class="boxstatsindicator thumbstat nobold nounderline">';
-	    $boxstat .= '<div class="boxstats" title="'.dol_escape_htmltag($text).'">';
-	    $boxstat .= '<span class="boxstatstext">'.img_object("", $icon).' <span>'.$text.'</span></span><br>';
-	    $boxstat .= '<span class="boxstatsindicator">'.price($outstandingTotal, 1, $langs, 1, -1, -1, $conf->currency).'</span>';
-	    $boxstat .= '</div>';
-	    if ($link) $boxstat .= '</a>';
+		$text = $langs->trans("OverAllInvoices");
+		$link = DOL_URL_ROOT.'/fourn/facture/list.php?socid='.$object->id;
+		$icon = 'bill';
+		if ($link) $boxstat .= '<a href="'.$link.'" class="boxstatsindicator thumbstat nobold nounderline">';
+		$boxstat .= '<div class="boxstats" title="'.dol_escape_htmltag($text).'">';
+		$boxstat .= '<span class="boxstatstext">'.img_object("", $icon).' <span>'.$text.'</span></span><br>';
+		$boxstat .= '<span class="boxstatsindicator">'.price($outstandingTotal, 1, $langs, 1, -1, -1, $conf->currency).'</span>';
+		$boxstat .= '</div>';
+		if ($link) $boxstat .= '</a>';
 
-	    // Box outstanding bill
-	    $text = $langs->trans("CurrentOutstandingBill");
-	    $link = DOL_URL_ROOT.'/fourn/recap-fourn.php?socid='.$object->id;
-	    $icon = 'bill';
-	    if ($link) $boxstat .= '<a href="'.$link.'" class="boxstatsindicator thumbstat nobold nounderline">';
-	    $boxstat .= '<div class="boxstats" title="'.dol_escape_htmltag($text).'">';
-	    $boxstat .= '<span class="boxstatstext">'.img_object("", $icon).' <span>'.$text.'</span></span><br>';
-	    $boxstat .= '<span class="boxstatsindicator'.($outstandingOpened > 0 ? ' amountremaintopay' : '').'">'.price($outstandingOpened, 1, $langs, 1, -1, -1, $conf->currency).$warn.'</span>';
-	    $boxstat .= '</div>';
-	    if ($link) $boxstat .= '</a>';
+		// Box outstanding bill
+		$text = $langs->trans("CurrentOutstandingBill");
+		$link = DOL_URL_ROOT.'/fourn/recap-fourn.php?socid='.$object->id;
+		$icon = 'bill';
+		if ($link) $boxstat .= '<a href="'.$link.'" class="boxstatsindicator thumbstat nobold nounderline">';
+		$boxstat .= '<div class="boxstats" title="'.dol_escape_htmltag($text).'">';
+		$boxstat .= '<span class="boxstatstext">'.img_object("", $icon).' <span>'.$text.'</span></span><br>';
+		$boxstat .= '<span class="boxstatsindicator'.($outstandingOpened > 0 ? ' amountremaintopay' : '').'">'.price($outstandingOpened, 1, $langs, 1, -1, -1, $conf->currency).$warn.'</span>';
+		$boxstat .= '</div>';
+		if ($link) $boxstat .= '</a>';
 
 		$tmp = $object->getOutstandingBills('supplier', 1);
 		$outstandingOpenedLate = $tmp['opened'];
@@ -425,9 +425,9 @@ if ($object->id > 0)
 			$link = DOL_URL_ROOT.'/fourn/recap-fourn.php?socid='.$object->id;
 			$icon = 'bill';
 			if ($link) $boxstat .= '<a href="'.$link.'" class="boxstatsindicator thumbstat nobold nounderline">';
-			$boxstat .= '<div class="boxstats" title="' . dol_escape_htmltag($text) . '">';
-			$boxstat .= '<span class="boxstatstext">' . img_object("", $icon) . ' <span>' . $text . '</span></span><br>';
-			$boxstat .= '<span class="boxstatsindicator' . ($outstandingOpenedLate > 0 ? ' amountremaintopay' : '') . '">'.price($outstandingOpenedLate, 1, $langs, 1, -1, -1, $conf->currency) . $warn . '</span>';
+			$boxstat .= '<div class="boxstats" title="'.dol_escape_htmltag($text).'">';
+			$boxstat .= '<span class="boxstatstext">'.img_object("", $icon).' <span>'.$text.'</span></span><br>';
+			$boxstat .= '<span class="boxstatsindicator'.($outstandingOpenedLate > 0 ? ' amountremaintopay' : '').'">'.price($outstandingOpenedLate, 1, $langs, 1, -1, -1, $conf->currency).$warn.'</span>';
 			$boxstat .= '</div>';
 			if ($link) $boxstat .= '</a>';
 		}
@@ -470,15 +470,15 @@ if ($object->id > 0)
 		$sql .= $db->plimit($MAXLIST);
 
 		$query = $db->query($sql);
-        if (!$query) dol_print_error($db);
+		if (!$query) dol_print_error($db);
 
-        $num = $db->num_rows($query);
+		$num = $db->num_rows($query);
 
-        print '<table class="noborder centpercent lastrecordtable">';
-        print '<tr class="liste_titre'.(($num == 0) ? ' nobottom' : '').'">';
-        print '<td colspan="3">'.$langs->trans("ProductsAndServices").'</td><td class="right">';
-        print '<a class="notasortlink" href="'.DOL_URL_ROOT.'/fourn/product/list.php?fourn_id='.$object->id.'">'.$langs->trans("AllProductReferencesOfSupplier").'<span class="badge marginleftonlyshort">'.$object->nbOfProductRefs().'</span>';
-        print '</a></td></tr>';
+		print '<table class="noborder centpercent lastrecordtable">';
+		print '<tr class="liste_titre'.(($num == 0) ? ' nobottom' : '').'">';
+		print '<td colspan="3">'.$langs->trans("ProductsAndServices").'</td><td class="right">';
+		print '<a class="notasortlink" href="'.DOL_URL_ROOT.'/fourn/product/list.php?fourn_id='.$object->id.'">'.$langs->trans("AllProductReferencesOfSupplier").'<span class="badge marginleftonlyshort">'.$object->nbOfProductRefs().'</span>';
+		print '</a></td></tr>';
 
 		$return = array();
 		if ($num > 0)
@@ -508,12 +508,12 @@ if ($object->id > 0)
 				//print (isset($objp->unitprice) ? price($objp->unitprice) : '');
 				if (isset($objp->price))
 				{
-    				print price($objp->price);
-				    if ($objp->quantity > 1)
-				    {
-    				    print ' / ';
-    				    print $objp->quantity;
-				    }
+					print price($objp->price);
+					if ($objp->quantity > 1)
+					{
+						print ' / ';
+						print $objp->quantity;
+					}
 				}
 				print '</td>';
 				print '</tr>';
@@ -531,63 +531,63 @@ if ($object->id > 0)
 
 	if ($user->rights->supplier_proposal->lire)
 	{
-	    $sql = "SELECT p.rowid, p.ref, p.date_valid as dc, p.fk_statut, p.total_ht, p.tva as total_tva, p.total as total_ttc";
-	    $sql .= " FROM ".MAIN_DB_PREFIX."supplier_proposal as p ";
-	    $sql .= " WHERE p.fk_soc =".$object->id;
-	    $sql .= " AND p.entity IN (".getEntity('supplier_proposal').")";
-	    $sql .= " ORDER BY p.date_valid DESC";
-	    $sql .= " ".$db->plimit($MAXLIST);
+		$sql = "SELECT p.rowid, p.ref, p.date_valid as dc, p.fk_statut, p.total_ht, p.tva as total_tva, p.total as total_ttc";
+		$sql .= " FROM ".MAIN_DB_PREFIX."supplier_proposal as p ";
+		$sql .= " WHERE p.fk_soc =".$object->id;
+		$sql .= " AND p.entity IN (".getEntity('supplier_proposal').")";
+		$sql .= " ORDER BY p.date_valid DESC";
+		$sql .= " ".$db->plimit($MAXLIST);
 
-	    $resql = $db->query($sql);
-	    if ($resql)
-	    {
-	        $i = 0;
-	        $num = $db->num_rows($resql);
+		$resql = $db->query($sql);
+		if ($resql)
+		{
+			$i = 0;
+			$num = $db->num_rows($resql);
 
-	        if ($num > 0)
-	        {
-	            print '<table class="noborder centpercent lastrecordtable">';
+			if ($num > 0)
+			{
+				print '<table class="noborder centpercent lastrecordtable">';
 
-	            print '<tr class="liste_titre">';
-	            print '<td colspan="3">';
-	            print '<table class="nobordernopadding centpercent"><tr><td>'.$langs->trans("LastSupplierProposals", ($num < $MAXLIST ? "" : $MAXLIST)).'</td>';
-	            print '<td class="right"><a class="notasortlink" href="'.DOL_URL_ROOT.'/supplier_proposal/list.php?socid='.$object->id.'">'.$langs->trans("AllPriceRequests").'<span class="badge marginleftonlyshort">'.$num.'</span></td>';
-	            print '<td width="20px" class="right"><a href="'.DOL_URL_ROOT.'/supplier_proposal/stats/index.php?mode=supplier&socid='.$object->id.'">'.img_picto($langs->trans("Statistics"), 'stats').'</a></td>';
-	            print '</tr></table>';
-	            print '</td></tr>';
-	        }
+				print '<tr class="liste_titre">';
+				print '<td colspan="3">';
+				print '<table class="nobordernopadding centpercent"><tr><td>'.$langs->trans("LastSupplierProposals", ($num < $MAXLIST ? "" : $MAXLIST)).'</td>';
+				print '<td class="right"><a class="notasortlink" href="'.DOL_URL_ROOT.'/supplier_proposal/list.php?socid='.$object->id.'">'.$langs->trans("AllPriceRequests").'<span class="badge marginleftonlyshort">'.$num.'</span></td>';
+				print '<td width="20px" class="right"><a href="'.DOL_URL_ROOT.'/supplier_proposal/stats/index.php?mode=supplier&socid='.$object->id.'">'.img_picto($langs->trans("Statistics"), 'stats').'</a></td>';
+				print '</tr></table>';
+				print '</td></tr>';
+			}
 
-	        while ($i < $num && $i <= $MAXLIST)
-	        {
-	            $obj = $db->fetch_object($resql);
+			while ($i < $num && $i <= $MAXLIST)
+			{
+				$obj = $db->fetch_object($resql);
 
-	            print '<tr class="oddeven">';
-	            print '<td class="nowrap">';
-	            $proposalstatic->id = $obj->rowid;
-	            $proposalstatic->ref = $obj->ref;
-	            $proposalstatic->total_ht = $obj->total_ht;
-	            $proposalstatic->total_tva = $obj->total_tva;
-	            $proposalstatic->total_ttc = $obj->total_ttc;
-	            print $proposalstatic->getNomUrl(1);
-	            print '</td>';
-	            print '<td class="center" width="80">';
-	            if ($obj->dc)
-	            {
-	                print dol_print_date($db->jdate($obj->dc), 'day');
-	            } else {
-	                print "-";
-	            }
-	            print '</td>';
-	            print '<td class="right" class="nowrap">'.$proposalstatic->LibStatut($obj->fk_statut, 5).'</td>';
-	            print '</tr>';
-	            $i++;
-	        }
-	        $db->free($resql);
+				print '<tr class="oddeven">';
+				print '<td class="nowrap">';
+				$proposalstatic->id = $obj->rowid;
+				$proposalstatic->ref = $obj->ref;
+				$proposalstatic->total_ht = $obj->total_ht;
+				$proposalstatic->total_tva = $obj->total_tva;
+				$proposalstatic->total_ttc = $obj->total_ttc;
+				print $proposalstatic->getNomUrl(1);
+				print '</td>';
+				print '<td class="center" width="80">';
+				if ($obj->dc)
+				{
+					print dol_print_date($db->jdate($obj->dc), 'day');
+				} else {
+					print "-";
+				}
+				print '</td>';
+				print '<td class="right" class="nowrap">'.$proposalstatic->LibStatut($obj->fk_statut, 5).'</td>';
+				print '</tr>';
+				$i++;
+			}
+			$db->free($resql);
 
-	        if ($num > 0) print "</table>";
-	    } else {
-	        dol_print_error($db);
-	    }
+			if ($num > 0) print "</table>";
+		} else {
+			dol_print_error($db);
+		}
 	}
 
 	/*
@@ -651,15 +651,15 @@ if ($object->id > 0)
 
 			if ($num > 0)
 			{
-			    print '<table class="noborder centpercent lastrecordtable">';
+				print '<table class="noborder centpercent lastrecordtable">';
 
-			    print '<tr class="liste_titre">';
-    			print '<td colspan="3">';
-    			print '<table class="nobordernopadding" width="100%"><tr><td>'.$langs->trans("LastSupplierOrders", ($num < $MAXLIST ? "" : $MAXLIST)).'</td>';
-    			print '<td class="right"><a class="notasortlink" href="'.DOL_URL_ROOT.'/fourn/commande/list.php?socid='.$object->id.'">'.$langs->trans("AllOrders").'<span class="badge marginleftonlyshort">'.$num.'</span></td>';
-                print '<td width="20px" class="right"><a href="'.DOL_URL_ROOT.'/commande/stats/index.php?mode=supplier&socid='.$object->id.'">'.img_picto($langs->trans("Statistics"), 'stats').'</a></td>';
-    			print '</tr></table>';
-    			print '</td></tr>';
+				print '<tr class="liste_titre">';
+				print '<td colspan="3">';
+				print '<table class="nobordernopadding" width="100%"><tr><td>'.$langs->trans("LastSupplierOrders", ($num < $MAXLIST ? "" : $MAXLIST)).'</td>';
+				print '<td class="right"><a class="notasortlink" href="'.DOL_URL_ROOT.'/fourn/commande/list.php?socid='.$object->id.'">'.$langs->trans("AllOrders").'<span class="badge marginleftonlyshort">'.$num.'</span></td>';
+				print '<td width="20px" class="right"><a href="'.DOL_URL_ROOT.'/commande/stats/index.php?mode=supplier&socid='.$object->id.'">'.img_picto($langs->trans("Statistics"), 'stats').'</a></td>';
+				print '</tr></table>';
+				print '</td></tr>';
 			}
 
 			while ($i < $num && $i < $MAXLIST)
@@ -667,14 +667,14 @@ if ($object->id > 0)
 				$obj = $db->fetch_object($resql);
 
 				print '<tr class="oddeven">';
-                print '<td class="nowrap">';
-                $orderstatic->id = $obj->rowid;
-                $orderstatic->ref = $obj->ref;
-                $orderstatic->total_ht = $obj->total_ht;
-                $orderstatic->total_tva = $obj->total_tva;
-                $orderstatic->total_ttc = $obj->total_ttc;
-                print $orderstatic->getNomUrl(1);
-                print '</td>';
+				print '<td class="nowrap">';
+				$orderstatic->id = $obj->rowid;
+				$orderstatic->ref = $obj->ref;
+				$orderstatic->total_ht = $obj->total_ht;
+				$orderstatic->total_tva = $obj->total_tva;
+				$orderstatic->total_ttc = $obj->total_ttc;
+				print $orderstatic->getNomUrl(1);
+				print '</td>';
 				print '<td class="center" width="80">';
 				if ($obj->dc)
 				{
@@ -720,14 +720,14 @@ if ($object->id > 0)
 			$num = $db->num_rows($resql);
 			if ($num > 0)
 			{
-			    print '<table class="noborder centpercent lastrecordtable">';
+				print '<table class="noborder centpercent lastrecordtable">';
 
-			    print '<tr class="liste_titre">';
-    			print '<td colspan="4">';
-    			print '<table class="nobordernopadding" width="100%"><tr><td>'.$langs->trans('LastSuppliersBills', ($num <= $MAXLIST ? "" : $MAXLIST)).'</td><td class="right"><a class="notasortlink" href="'.DOL_URL_ROOT.'/fourn/facture/list.php?socid='.$object->id.'">'.$langs->trans('AllBills').'<span class="badge marginleftonlyshort">'.$num.'</span></td>';
-                print '<td width="20px" class="right"><a href="'.DOL_URL_ROOT.'/compta/facture/stats/index.php?mode=supplier&socid='.$object->id.'">'.img_picto($langs->trans("Statistics"), 'stats').'</a></td>';
-    			print '</tr></table>';
-    			print '</td></tr>';
+				print '<tr class="liste_titre">';
+				print '<td colspan="4">';
+				print '<table class="nobordernopadding" width="100%"><tr><td>'.$langs->trans('LastSuppliersBills', ($num <= $MAXLIST ? "" : $MAXLIST)).'</td><td class="right"><a class="notasortlink" href="'.DOL_URL_ROOT.'/fourn/facture/list.php?socid='.$object->id.'">'.$langs->trans('AllBills').'<span class="badge marginleftonlyshort">'.$num.'</span></td>';
+				print '<td width="20px" class="right"><a href="'.DOL_URL_ROOT.'/compta/facture/stats/index.php?mode=supplier&socid='.$object->id.'">'.img_picto($langs->trans("Statistics"), 'stats').'</a></td>';
+				print '</tr></table>';
+				print '</td></tr>';
 			}
 
 			while ($i < min($num, $MAXLIST))
@@ -743,8 +743,8 @@ if ($object->id > 0)
 				$facturestatic->libelle = $obj->label; // deprecated
 				$facturestatic->label = $obj->label;
 				$facturestatic->total_ht = $obj->total_ht;
-                $facturestatic->total_tva = $obj->total_tva;
-                $facturestatic->total_ttc = $obj->total_ttc;
+				$facturestatic->total_tva = $obj->total_tva;
+				$facturestatic->total_ttc = $obj->total_ttc;
 				print $facturestatic->getNomUrl(1);
 				print $obj->ref_supplier ? ' - '.$obj->ref_supplier : '';
 				print ($obj->label ? ' - ' : '').dol_trunc($obj->label, 14);
@@ -767,7 +767,7 @@ if ($object->id > 0)
 	print '</div></div></div>';
 	print '<div style="clear:both"></div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 
 	/*
@@ -780,29 +780,29 @@ if ($object->id > 0)
 	// modified by hook
 	if (empty($reshook))
 	{
-	    if ($object->status != 1)
-        {
-            print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" title="'.dol_escape_js($langs->trans("ThirdPartyIsClosed")).'" href="#">'.$langs->trans("ThirdPartyIsClosed").'</a></div>';
-        }
+		if ($object->status != 1)
+		{
+			print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" title="'.dol_escape_js($langs->trans("ThirdPartyIsClosed")).'" href="#">'.$langs->trans("ThirdPartyIsClosed").'</a></div>';
+		}
 
 		if ($conf->supplier_proposal->enabled && $user->rights->supplier_proposal->creer)
 		{
 			$langs->load("supplier_proposal");
-	        if ($object->status == 1) {
-	            print '<a class="butAction" href="'.DOL_URL_ROOT.'/supplier_proposal/card.php?action=create&socid='.$object->id.'">'.$langs->trans("AddSupplierProposal").'</a>';
-	        } else {
-	            print '<a class="butActionRefused classfortooltip" title="'.dol_escape_js($langs->trans("ThirdPartyIsClosed")).'" href="#">'.$langs->trans("AddSupplierProposal").'</a>';
-	        }
+			if ($object->status == 1) {
+				print '<a class="butAction" href="'.DOL_URL_ROOT.'/supplier_proposal/card.php?action=create&socid='.$object->id.'">'.$langs->trans("AddSupplierProposal").'</a>';
+			} else {
+				print '<a class="butActionRefused classfortooltip" title="'.dol_escape_js($langs->trans("ThirdPartyIsClosed")).'" href="#">'.$langs->trans("AddSupplierProposal").'</a>';
+			}
 		}
 
-	    if ($user->rights->fournisseur->commande->creer)
+		if ($user->rights->fournisseur->commande->creer)
 		{
 			$langs->load("orders");
-	        if ($object->status == 1) {
-	            print '<a class="butAction" href="'.DOL_URL_ROOT.'/fourn/commande/card.php?action=create&socid='.$object->id.'">'.$langs->trans("AddOrder").'</a>';
-	        } else {
-	            print '<a class="butActionRefused classfortooltip" title="'.dol_escape_js($langs->trans("ThirdPartyIsClosed")).'" href="#">'.$langs->trans("AddOrder").'</a>';
-	        }
+			if ($object->status == 1) {
+				print '<a class="butAction" href="'.DOL_URL_ROOT.'/fourn/commande/card.php?action=create&socid='.$object->id.'">'.$langs->trans("AddOrder").'</a>';
+			} else {
+				print '<a class="butActionRefused classfortooltip" title="'.dol_escape_js($langs->trans("ThirdPartyIsClosed")).'" href="#">'.$langs->trans("AddOrder").'</a>';
+			}
 		}
 
 		if ($user->rights->fournisseur->facture->creer)
@@ -821,23 +821,23 @@ if ($object->id > 0)
 		if ($user->rights->fournisseur->facture->creer)
 		{
 			$langs->load("bills");
-	        if ($object->status == 1) {
-	            print '<a class="butAction" href="'.DOL_URL_ROOT.'/fourn/facture/card.php?action=create&socid='.$object->id.'">'.$langs->trans("AddBill").'</a>';
-	        } else {
-	            print '<a class="butActionRefused classfortooltip" title="'.dol_escape_js($langs->trans("ThirdPartyIsClosed")).'" href="#">'.$langs->trans("AddBill").'</a>';
-	        }
+			if ($object->status == 1) {
+				print '<a class="butAction" href="'.DOL_URL_ROOT.'/fourn/facture/card.php?action=create&socid='.$object->id.'">'.$langs->trans("AddBill").'</a>';
+			} else {
+				print '<a class="butActionRefused classfortooltip" title="'.dol_escape_js($langs->trans("ThirdPartyIsClosed")).'" href="#">'.$langs->trans("AddBill").'</a>';
+			}
 		}
 
-    	// Add action
-    	if (!empty($conf->agenda->enabled) && !empty($conf->global->MAIN_REPEATTASKONEACHTAB) && $object->status == 1)
-    	{
-        	if ($user->rights->agenda->myactions->create)
-        	{
-            	print '<a class="butAction" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&socid='.$object->id.'">'.$langs->trans("AddAction").'</a>';
-        	} else {
-            	print '<a class="butAction" title="'.dol_escape_js($langs->trans("NotAllowed")).'" href="#">'.$langs->trans("AddAction").'</a>';
-        	}
-    	}
+		// Add action
+		if (!empty($conf->agenda->enabled) && !empty($conf->global->MAIN_REPEATTASKONEACHTAB) && $object->status == 1)
+		{
+			if ($user->rights->agenda->myactions->create)
+			{
+				print '<a class="butAction" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&socid='.$object->id.'">'.$langs->trans("AddAction").'</a>';
+			} else {
+				print '<a class="butAction" title="'.dol_escape_js($langs->trans("NotAllowed")).'" href="#">'.$langs->trans("AddAction").'</a>';
+			}
+		}
 	}
 
 	print '</div>';
@@ -845,20 +845,20 @@ if ($object->id > 0)
 
 	if (!empty($conf->global->MAIN_DUPLICATE_CONTACTS_TAB_ON_MAIN_CARD))
 	{
-    	print '<br>';
-    	// List of contacts
-    	show_contacts($conf, $langs, $db, $object, $_SERVER["PHP_SELF"].'?socid='.$object->id);
+		print '<br>';
+		// List of contacts
+		show_contacts($conf, $langs, $db, $object, $_SERVER["PHP_SELF"].'?socid='.$object->id);
 	}
 
 	if (!empty($conf->global->MAIN_REPEATTASKONEACHTAB))
 	{
-    	print load_fiche_titre($langs->trans("ActionsOnCompany"), '', '');
+		print load_fiche_titre($langs->trans("ActionsOnCompany"), '', '');
 
-    	// List of todo actions
-    	show_actions_todo($conf, $langs, $db, $object);
+		// List of todo actions
+		show_actions_todo($conf, $langs, $db, $object);
 
-    	// List of done actions
-    	show_actions_done($conf, $langs, $db, $object);
+		// List of done actions
+		show_actions_done($conf, $langs, $db, $object);
 	}
 } else {
 	dol_print_error($db);
diff --git a/htdocs/fourn/class/api_supplier_invoices.class.php b/htdocs/fourn/class/api_supplier_invoices.class.php
index 8c3ca0108e3..247434be7a8 100644
--- a/htdocs/fourn/class/api_supplier_invoices.class.php
+++ b/htdocs/fourn/class/api_supplier_invoices.class.php
@@ -677,8 +677,8 @@ class SupplierInvoices extends DolibarrApi
 	/**
 	 * Clean sensible object datas
 	 *
-	 * @param   Object  $object    Object to clean
-	 * @return  array              Array of cleaned object properties
+	 * @param   Object  $object     Object to clean
+	 * @return  Object              Object with cleaned properties
 	 */
 	protected function _cleanObjectDatas($object)
 	{
diff --git a/htdocs/fourn/class/api_supplier_orders.class.php b/htdocs/fourn/class/api_supplier_orders.class.php
index 0fd06790011..254e577f2f2 100644
--- a/htdocs/fourn/class/api_supplier_orders.class.php
+++ b/htdocs/fourn/class/api_supplier_orders.class.php
@@ -108,18 +108,18 @@ class SupplierOrders extends DolibarrApi
 
 		// If the internal user must only see his customers, force searching by him
 		$search_sale = 0;
-		if (!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) $search_sale = DolibarrApiAccess::$user->id;
+		if (!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) $search_sale = DolibarrApiAccess::$user->id;
 
 		$sql = "SELECT t.rowid";
-		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
+		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
 		$sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as t";
 
-		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
+		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
 
   		if (!empty($product_ids)) $sql .= ", ".MAIN_DB_PREFIX."commande_fournisseurdet as cd"; // We need this table joined to the select in order to filter by product
 
 		$sql .= ' WHERE t.entity IN ('.getEntity('supplier_order').')';
-		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql .= " AND t.fk_soc = sc.fk_soc";
+		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= " AND t.fk_soc = sc.fk_soc";
 		if (!empty($product_ids)) $sql .= " AND cd.fk_commande = t.rowid AND cd.fk_product IN (".$product_ids.")";
 		if ($socids) $sql .= " AND t.fk_soc IN (".$socids.")";
 		if ($search_sale > 0) $sql .= " AND t.rowid = sc.fk_soc"; // Join for the needed table to filter by sale
@@ -339,8 +339,8 @@ class SupplierOrders extends DolibarrApi
 	/**
 	 * Clean sensible object datas
 	 *
-	 * @param   Object  $object    Object to clean
-	 * @return  array              Array of cleaned object properties
+	 * @param   Object  $object     Object to clean
+	 * @return  Object              Object with cleaned properties
 	 */
 	protected function _cleanObjectDatas($object)
 	{
diff --git a/htdocs/fourn/class/fournisseur.class.php b/htdocs/fourn/class/fournisseur.class.php
index e9ba334313c..4ca073a38c7 100644
--- a/htdocs/fourn/class/fournisseur.class.php
+++ b/htdocs/fourn/class/fournisseur.class.php
@@ -100,7 +100,7 @@ class Fournisseur extends Societe
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Load statistics indicators
 	 *
@@ -108,7 +108,7 @@ class Fournisseur extends Societe
 	 */
 	public function load_state_board()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $user;
 
 		$this->nb = array();
@@ -132,7 +132,7 @@ class Fournisseur extends Societe
 			{
 				$this->nb["suppliers"] = $obj->nb;
 			}
-            $this->db->free($resql);
+			$this->db->free($resql);
 			return 1;
 		} else {
 			dol_print_error($this->db);
@@ -141,7 +141,7 @@ class Fournisseur extends Societe
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Create a supplier category
 	 *
@@ -151,7 +151,7 @@ class Fournisseur extends Societe
 	 */
 	public function CreateCategory($user, $name)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."categorie (label,visible,type)";
 		$sql .= " VALUES ";
 		$sql .= " ('".$this->db->escape($name)."',1,1)";
@@ -169,7 +169,7 @@ class Fournisseur extends Societe
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * 	Return the suppliers list
 	 *
@@ -177,7 +177,7 @@ class Fournisseur extends Societe
 	 */
 	public function ListArray()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 		global $user;
 
diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index 383e5ba4d07..9b927360025 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -388,7 +388,7 @@ class CommandeFournisseur extends CommonOrder
 			$this->note_private = $obj->note_private;
 			$this->note_public = $obj->note_public;
 			$this->model_pdf = $obj->model_pdf;
-			$this->modelpdf = $obj->model_pdf;	// deprecated
+			$this->modelpdf = $obj->model_pdf; // deprecated
 
 			//Incoterms
 			$this->fk_incoterms = $obj->fk_incoterms;
@@ -763,17 +763,25 @@ class CommandeFournisseur extends CommonOrder
 		global $langs, $conf, $user;
 
 		$result = '';
-		$label = '<u>'.$langs->trans("PurchaseOrder").'</u>';
-		if (!empty($this->ref))
-			$label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
-		if (!empty($this->ref_supplier))
-			$label .= '<br><b>'.$langs->trans('RefSupplier').':</b> '.$this->ref_supplier;
-		if (!empty($this->total_ht))
-			$label .= '<br><b>'.$langs->trans('AmountHT').':</b> '.price($this->total_ht, 0, $langs, 0, -1, -1, $conf->currency);
-		if (!empty($this->total_tva))
-			$label .= '<br><b>'.$langs->trans('VAT').':</b> '.price($this->total_tva, 0, $langs, 0, -1, -1, $conf->currency);
-		if (!empty($this->total_ttc))
-			$label .= '<br><b>'.$langs->trans('AmountTTC').':</b> '.price($this->total_ttc, 0, $langs, 0, -1, -1, $conf->currency);
+
+		$label = '';
+
+		if ($user->rights->fournisseur->commande->lire) {
+			$label = '<u class="paddingrightonly">'.$langs->trans("SupplierOrder").'</u>';
+			if (isset($this->statut)) {
+				$label .= ' '.$this->getLibStatut(5);
+			}
+			if (!empty($this->ref))
+				$label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
+			if (!empty($this->ref_supplier))
+				$label .= '<br><b>'.$langs->trans('RefSupplier').':</b> '.$this->ref_supplier;
+			if (!empty($this->total_ht))
+				$label .= '<br><b>'.$langs->trans('AmountHT').':</b> '.price($this->total_ht, 0, $langs, 0, -1, -1, $conf->currency);
+			if (!empty($this->total_tva))
+				$label .= '<br><b>'.$langs->trans('VAT').':</b> '.price($this->total_tva, 0, $langs, 0, -1, -1, $conf->currency);
+			if (!empty($this->total_ttc))
+				$label .= '<br><b>'.$langs->trans('AmountTTC').':</b> '.price($this->total_ttc, 0, $langs, 0, -1, -1, $conf->currency);
+		}
 
 		$picto = 'order';
 		$url = DOL_URL_ROOT.'/fourn/commande/card.php?id='.$this->id;
@@ -2020,8 +2028,8 @@ class CommandeFournisseur extends CommonOrder
 
 		if (!$error)
 		{
-        	// Delete record into ECM index (Note that delete is also done when deleting files with the dol_delete_dir_recursive
-        	$this->deleteEcmFiles();
+			// Delete record into ECM index (Note that delete is also done when deleting files with the dol_delete_dir_recursive
+			$this->deleteEcmFiles();
 
 			// We remove directory
 			$ref = dol_sanitizeFileName($this->ref);
@@ -2210,9 +2218,9 @@ class CommandeFournisseur extends CommonOrder
 
 			// TODO LDR01 Add a control test to accept only if ALL predefined products are received (same qty).
 
-            if (empty($error))
-            {
-                $this->db->begin();
+			if (empty($error))
+			{
+				$this->db->begin();
 
 				$sql = "UPDATE ".MAIN_DB_PREFIX."commande_fournisseur";
 				$sql .= " SET fk_statut = ".$statut;
@@ -2228,10 +2236,10 @@ class CommandeFournisseur extends CommonOrder
 					$this->statut = $statut;
 					$this->actionmsg2 = $comment;
 
-                    // Call trigger
-                    $result_trigger = $this->call_trigger('ORDER_SUPPLIER_RECEIVE', $user);
-                    if ($result_trigger < 0) $error++;
-                    // End call triggers
+					// Call trigger
+					$result_trigger = $this->call_trigger('ORDER_SUPPLIER_RECEIVE', $user);
+					if ($result_trigger < 0) $error++;
+					// End call triggers
 
 					if (empty($error))
 					{
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index d3780d412ea..1bf32782bdb 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -2219,37 +2219,37 @@ class FactureFournisseur extends CommonInvoice
 		if ($user->socid) $sql .= ' AND ff.fk_soc = '.$user->socid;
 		if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND ff.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
 
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-	        $langs->load("bills");
-	        $now = dol_now();
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$langs->load("bills");
+			$now = dol_now();
 
-	        $response = new WorkboardResponse();
-	        $response->warning_delay = $conf->facture->fournisseur->warning_delay / 60 / 60 / 24;
-	        $response->label = $langs->trans("SupplierBillsToPay");
-	        $response->labelShort = $langs->trans("StatusToPay");
+			$response = new WorkboardResponse();
+			$response->warning_delay = $conf->facture->fournisseur->warning_delay / 60 / 60 / 24;
+			$response->label = $langs->trans("SupplierBillsToPay");
+			$response->labelShort = $langs->trans("StatusToPay");
 
-	        $response->url = DOL_URL_ROOT.'/fourn/facture/list.php?search_status=1&amp;mainmenu=billing&amp;leftmenu=suppliers_bills';
-	        $response->img = img_object($langs->trans("Bills"), "bill");
+			$response->url = DOL_URL_ROOT.'/fourn/facture/list.php?search_status=1&amp;mainmenu=billing&amp;leftmenu=suppliers_bills';
+			$response->img = img_object($langs->trans("Bills"), "bill");
 
-            $facturestatic = new FactureFournisseur($this->db);
+			$facturestatic = new FactureFournisseur($this->db);
 
-            while ($obj = $this->db->fetch_object($resql))
-            {
-                $response->nbtodo++;
+			while ($obj = $this->db->fetch_object($resql))
+			{
+				$response->nbtodo++;
 
-                $facturestatic->date_echeance = $this->db->jdate($obj->datefin);
-                $facturestatic->statut = $obj->fk_statut;
+				$facturestatic->date_echeance = $this->db->jdate($obj->datefin);
+				$facturestatic->statut = $obj->fk_statut;
 
-                if ($facturestatic->hasDelay()) {
-	                $response->nbtodolate++;
+				if ($facturestatic->hasDelay()) {
+					$response->nbtodolate++;
 					$response->url_late = DOL_URL_ROOT.'/fourn/facture/list.php?option=late&mainmenu=billing&leftmenu=suppliers_bills';
-                }
-            }
-            $this->db->free($resql);
-            return $response;
-        } else {
+				}
+			}
+			$this->db->free($resql);
+			return $response;
+		} else {
 			dol_print_error($this->db);
 			$this->error = $this->db->error();
 			return -1;
@@ -2295,10 +2295,10 @@ class FactureFournisseur extends CommonInvoice
 		if ($this->type == self::TYPE_CREDIT_NOTE) $picto .= 'a'; // Credit note
 		if ($this->type == self::TYPE_DEPOSIT)     $picto .= 'd'; // Deposit invoice
 
-		$label = img_picto('', $this->picto).' <u>'.$langs->trans("SupplierInvoice").'</u>';
-		if ($this->type == self::TYPE_REPLACEMENT) $label = '<u>'.$langs->transnoentitiesnoconv("InvoiceReplace").'</u>';
-		elseif ($this->type == self::TYPE_CREDIT_NOTE) $label = '<u>'.$langs->transnoentitiesnoconv("CreditNote").'</u>';
-		elseif ($this->type == self::TYPE_DEPOSIT)     $label = '<u>'.$langs->transnoentitiesnoconv("Deposit").'</u>';
+		$label = img_picto('', $this->picto).' <u class="paddingrightonly">'.$langs->trans("SupplierInvoice").'</u>';
+		if ($this->type == self::TYPE_REPLACEMENT) $label = '<u class="paddingrightonly">'.$langs->transnoentitiesnoconv("InvoiceReplace").'</u>';
+		elseif ($this->type == self::TYPE_CREDIT_NOTE) $label = '<u class="paddingrightonly">'.$langs->transnoentitiesnoconv("CreditNote").'</u>';
+		elseif ($this->type == self::TYPE_DEPOSIT)     $label = '<u class="paddingrightonly">'.$langs->transnoentitiesnoconv("Deposit").'</u>';
 		if (!empty($this->ref))
 			$label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
 		if (!empty($this->ref_supplier))
diff --git a/htdocs/fourn/class/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php
index ad7c9a1f238..264e015298d 100644
--- a/htdocs/fourn/class/fournisseur.product.class.php
+++ b/htdocs/fourn/class/fournisseur.product.class.php
@@ -39,238 +39,238 @@ require_once DOL_DOCUMENT_ROOT.'/product/dynamic_price/class/price_parser.class.
  */
 class ProductFournisseur extends Product
 {
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    /**
-     * @var string Error code (or message)
-     */
-    public $error = '';
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error = '';
 
-    public $product_fourn_price_id; // id of ligne product-supplier
+	public $product_fourn_price_id; // id of ligne product-supplier
 
-    /**
-     * @var int ID
-     */
-    public $id;
+	/**
+	 * @var int ID
+	 */
+	public $id;
 
-    /**
-     * @deprecated
-     * @see $ref_supplier
-     */
-    public $fourn_ref;
-    public $delivery_time_days;
-    public $ref_supplier; // ref supplier (can be set by get_buyprice)
-    public $desc_supplier;
-    public $vatrate_supplier; // default vat rate for this supplier/qty/product (can be set by get_buyprice)
+	/**
+	 * @deprecated
+	 * @see $ref_supplier
+	 */
+	public $fourn_ref;
+	public $delivery_time_days;
+	public $ref_supplier; // ref supplier (can be set by get_buyprice)
+	public $desc_supplier;
+	public $vatrate_supplier; // default vat rate for this supplier/qty/product (can be set by get_buyprice)
 
-    public $fourn_id; //supplier id
-    public $fourn_qty; // quantity for price (can be set by get_buyprice)
-    public $fourn_pu; // unit price for quantity (can be set by get_buyprice)
+	public $fourn_id; //supplier id
+	public $fourn_qty; // quantity for price (can be set by get_buyprice)
+	public $fourn_pu; // unit price for quantity (can be set by get_buyprice)
 
-    public $fourn_price; // price for quantity
-    public $fourn_remise_percent; // discount for quantity (percent)
-    public $fourn_remise; // discount for quantity (amount)
-    public $product_fourn_id; // product-supplier id
+	public $fourn_price; // price for quantity
+	public $fourn_remise_percent; // discount for quantity (percent)
+	public $fourn_remise; // discount for quantity (amount)
+	public $product_fourn_id; // product-supplier id
 
-    /**
-     * @var int ID user_id - user who created/updated supplier price
-     */
-    public $user_id;
+	/**
+	 * @var int ID user_id - user who created/updated supplier price
+	 */
+	public $user_id;
 
-    /**
-     * @var int ID availability delay - visible/used if option FOURN_PRODUCT_AVAILABILITY is on (duplicate information compared to delivery delay)
-     */
-    public $fk_availability;
+	/**
+	 * @var int ID availability delay - visible/used if option FOURN_PRODUCT_AVAILABILITY is on (duplicate information compared to delivery delay)
+	 */
+	public $fk_availability;
 
-    public $fourn_unitprice;
-    public $fourn_tva_tx;
-    public $fourn_tva_npr;
+	public $fourn_unitprice;
+	public $fourn_tva_tx;
+	public $fourn_tva_npr;
 
-    /**
-     * @var int ID
-     */
-    public $fk_supplier_price_expression;
+	/**
+	 * @var int ID
+	 */
+	public $fk_supplier_price_expression;
 
-    public $supplier_reputation; // reputation of supplier
-    public $reputations = array(); // list of available supplier reputations
+	public $supplier_reputation; // reputation of supplier
+	public $reputations = array(); // list of available supplier reputations
 
-    // Multicurreny
-    public $fourn_multicurrency_id;
-    public $fourn_multicurrency_code;
-    public $fourn_multicurrency_tx;
-    public $fourn_multicurrency_price;
-    public $fourn_multicurrency_unitprice;
+	// Multicurreny
+	public $fourn_multicurrency_id;
+	public $fourn_multicurrency_code;
+	public $fourn_multicurrency_tx;
+	public $fourn_multicurrency_price;
+	public $fourn_multicurrency_unitprice;
 
-    /**
-     *	Constructor
-     *
-     *  @param		DoliDB		$db      Database handler
-     */
-    public function __construct($db)
-    {
-        global $langs;
+	/**
+	 *	Constructor
+	 *
+	 *  @param		DoliDB		$db      Database handler
+	 */
+	public function __construct($db)
+	{
+		global $langs;
 
-        $this->db = $db;
-        $langs->load("suppliers");
-        $this->reputations = array('-1'=>'', 'FAVORITE'=>$langs->trans('Favorite'), 'NOTTHGOOD'=>$langs->trans('NotTheGoodQualitySupplier'), 'DONOTORDER'=>$langs->trans('DoNotOrderThisProductToThisSupplier'));
-    }
+		$this->db = $db;
+		$langs->load("suppliers");
+		$this->reputations = array('-1'=>'', 'FAVORITE'=>$langs->trans('Favorite'), 'NOTTHGOOD'=>$langs->trans('NotTheGoodQualitySupplier'), 'DONOTORDER'=>$langs->trans('DoNotOrderThisProductToThisSupplier'));
+	}
 
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *    Remove all prices for this couple supplier-product
-     *
-     *    @param	int		$id_fourn   Supplier Id
-     *    @return   int         		< 0 if error, > 0 if ok
-     */
-    public function remove_fournisseur($id_fourn)
-    {
-        // phpcs:enable
-        $ok = 1;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *    Remove all prices for this couple supplier-product
+	 *
+	 *    @param	int		$id_fourn   Supplier Id
+	 *    @return   int         		< 0 if error, > 0 if ok
+	 */
+	public function remove_fournisseur($id_fourn)
+	{
+		// phpcs:enable
+		$ok = 1;
 
-        $this->db->begin();
+		$this->db->begin();
 
-        $sql = "DELETE FROM ".MAIN_DB_PREFIX."product_fournisseur_price";
-        $sql .= " WHERE fk_product = ".$this->id." AND fk_soc = ".$id_fourn;
+		$sql = "DELETE FROM ".MAIN_DB_PREFIX."product_fournisseur_price";
+		$sql .= " WHERE fk_product = ".$this->id." AND fk_soc = ".$id_fourn;
 
-        dol_syslog(get_class($this)."::remove_fournisseur", LOG_DEBUG);
-        $resql2 = $this->db->query($sql);
-        if (!$resql2)
-        {
-            $this->error = $this->db->lasterror();
-            $ok = 0;
-        }
+		dol_syslog(get_class($this)."::remove_fournisseur", LOG_DEBUG);
+		$resql2 = $this->db->query($sql);
+		if (!$resql2)
+		{
+			$this->error = $this->db->lasterror();
+			$ok = 0;
+		}
 
-        if ($ok)
-        {
-            $this->db->commit();
-            return 1;
-        } else {
-            $this->db->rollback();
-            return -1;
-        }
-    }
+		if ($ok)
+		{
+			$this->db->commit();
+			return 1;
+		} else {
+			$this->db->rollback();
+			return -1;
+		}
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * 	Remove a price for a couple supplier-product
-     *
-     * 	@param	int		$rowid		Line id of price
-     *	@return	int					<0 if KO, >0 if OK
-     */
-    public function remove_product_fournisseur_price($rowid)
-    {
-        // phpcs:enable
-        global $conf, $user;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * 	Remove a price for a couple supplier-product
+	 *
+	 * 	@param	int		$rowid		Line id of price
+	 *	@return	int					<0 if KO, >0 if OK
+	 */
+	public function remove_product_fournisseur_price($rowid)
+	{
+		// phpcs:enable
+		global $conf, $user;
 
-        $error = 0;
+		$error = 0;
 
-        $this->db->begin();
+		$this->db->begin();
 
-        // Call trigger
-        $result = $this->call_trigger('SUPPLIER_PRODUCT_BUYPRICE_DELETE', $user);
-        if ($result < 0) $error++;
-        // End call triggers
+		// Call trigger
+		$result = $this->call_trigger('SUPPLIER_PRODUCT_BUYPRICE_DELETE', $user);
+		if ($result < 0) $error++;
+		// End call triggers
 
-        if (empty($error))
-        {
-            $sql = "DELETE FROM ".MAIN_DB_PREFIX."product_fournisseur_price";
-            $sql .= " WHERE rowid = ".$rowid;
+		if (empty($error))
+		{
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX."product_fournisseur_price";
+			$sql .= " WHERE rowid = ".$rowid;
 
-            dol_syslog(get_class($this)."::remove_product_fournisseur_price", LOG_DEBUG);
-            $resql = $this->db->query($sql);
-            if (!$resql)
-            {
-                $this->error = $this->db->lasterror();
-                $error++;
-            }
-        }
+			dol_syslog(get_class($this)."::remove_product_fournisseur_price", LOG_DEBUG);
+			$resql = $this->db->query($sql);
+			if (!$resql)
+			{
+				$this->error = $this->db->lasterror();
+				$error++;
+			}
+		}
 
-        if (empty($error)) {
-            $this->db->commit();
-            return 1;
-        } else {
-            $this->db->rollback();
-            return -1;
-        }
-    }
+		if (empty($error)) {
+			$this->db->commit();
+			return 1;
+		} else {
+			$this->db->rollback();
+			return -1;
+		}
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *    Modify the purchase price for a supplier
-     *
-     *    @param  	float		$qty				            Min quantity for which price is valid
-     *    @param  	float		$buyprice			            Purchase price for the quantity min
-     *    @param  	User		$user				            Object user user made changes
-     *    @param  	string		$price_base_type	            HT or TTC
-     *    @param  	Societe		$fourn				            Supplier
-     *    @param  	int			$availability		            Product availability
-     *    @param	string		$ref_fourn			            Supplier ref
-     *    @param	float		$tva_tx				            New VAT Rate (For example 8.5. Should not be a string)
-     *    @param  	string		$charges			            costs affering to product
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *    Modify the purchase price for a supplier
+	 *
+	 *    @param  	float		$qty				            Min quantity for which price is valid
+	 *    @param  	float		$buyprice			            Purchase price for the quantity min
+	 *    @param  	User		$user				            Object user user made changes
+	 *    @param  	string		$price_base_type	            HT or TTC
+	 *    @param  	Societe		$fourn				            Supplier
+	 *    @param  	int			$availability		            Product availability
+	 *    @param	string		$ref_fourn			            Supplier ref
+	 *    @param	float		$tva_tx				            New VAT Rate (For example 8.5. Should not be a string)
+	 *    @param  	string		$charges			            costs affering to product
 	 *    @param  	float		$remise_percent		            Discount  regarding qty (percent)
 	 *    @param  	float		$remise				            Discount  regarding qty (amount)
 	 *    @param  	int			$newnpr				            Set NPR or not
 	 *    @param	int			$delivery_time_days	            Delay in days for delivery (max). May be '' if not defined.
 	 * 	  @param    string      $supplier_reputation            Reputation with this product to the defined supplier (empty, FAVORITE, DONOTORDER)
-     *	  @param    array		$localtaxes_array	            Array with localtaxes info array('0'=>type1,'1'=>rate1,'2'=>type2,'3'=>rate2) (loaded by getLocalTaxesFromRate(vatrate, 0, ...) function).
-     *    @param    string  	$newdefaultvatcode              Default vat code
-     *    @param  	float		$multicurrency_buyprice 	    Purchase price for the quantity min in currency
-     *    @param  	string		$multicurrency_price_base_type	HT or TTC in currency
-     *    @param  	float		$multicurrency_tx	            Rate currency
-     *    @param  	string		$multicurrency_code	            Currency code
-     *    @param  	string		$desc_fourn     	            Custom description for product_fourn_price
-     *    @param  	string		$barcode     	                Barcode
-     *    @param  	int		    $fk_barcode_type     	        Barcode type
-     *    @return	int											<0 if KO, >=0 if OK
-     */
-    public function update_buyprice($qty, $buyprice, $user, $price_base_type, $fourn, $availability, $ref_fourn, $tva_tx, $charges = 0, $remise_percent = 0, $remise = 0, $newnpr = 0, $delivery_time_days = 0, $supplier_reputation = '', $localtaxes_array = array(), $newdefaultvatcode = '', $multicurrency_buyprice = 0, $multicurrency_price_base_type = 'HT', $multicurrency_tx = 1, $multicurrency_code = '', $desc_fourn = '', $barcode = '', $fk_barcode_type = '')
-    {
-        // phpcs:enable
-        global $conf, $langs;
-        //global $mysoc;
+	 *	  @param    array		$localtaxes_array	            Array with localtaxes info array('0'=>type1,'1'=>rate1,'2'=>type2,'3'=>rate2) (loaded by getLocalTaxesFromRate(vatrate, 0, ...) function).
+	 *    @param    string  	$newdefaultvatcode              Default vat code
+	 *    @param  	float		$multicurrency_buyprice 	    Purchase price for the quantity min in currency
+	 *    @param  	string		$multicurrency_price_base_type	HT or TTC in currency
+	 *    @param  	float		$multicurrency_tx	            Rate currency
+	 *    @param  	string		$multicurrency_code	            Currency code
+	 *    @param  	string		$desc_fourn     	            Custom description for product_fourn_price
+	 *    @param  	string		$barcode     	                Barcode
+	 *    @param  	int		    $fk_barcode_type     	        Barcode type
+	 *    @return	int											<0 if KO, >=0 if OK
+	 */
+	public function update_buyprice($qty, $buyprice, $user, $price_base_type, $fourn, $availability, $ref_fourn, $tva_tx, $charges = 0, $remise_percent = 0, $remise = 0, $newnpr = 0, $delivery_time_days = 0, $supplier_reputation = '', $localtaxes_array = array(), $newdefaultvatcode = '', $multicurrency_buyprice = 0, $multicurrency_price_base_type = 'HT', $multicurrency_tx = 1, $multicurrency_code = '', $desc_fourn = '', $barcode = '', $fk_barcode_type = '')
+	{
+		// phpcs:enable
+		global $conf, $langs;
+		//global $mysoc;
 
-        // Clean parameter
-        if (empty($qty)) $qty = 0;
-        if (empty($buyprice)) $buyprice = 0;
-        if (empty($charges)) $charges = 0;
-        if (empty($availability)) $availability = 0;
-        if (empty($remise_percent)) $remise_percent = 0;
-	    if (empty($supplier_reputation) || $supplier_reputation == -1) $supplier_reputation = '';
-        if ($delivery_time_days != '' && !is_numeric($delivery_time_days)) $delivery_time_days = '';
-        if ($price_base_type == 'TTC')
-        {
-            $ttx = $tva_tx;
-            $buyprice = $buyprice / (1 + ($ttx / 100));
-        }
+		// Clean parameter
+		if (empty($qty)) $qty = 0;
+		if (empty($buyprice)) $buyprice = 0;
+		if (empty($charges)) $charges = 0;
+		if (empty($availability)) $availability = 0;
+		if (empty($remise_percent)) $remise_percent = 0;
+		if (empty($supplier_reputation) || $supplier_reputation == -1) $supplier_reputation = '';
+		if ($delivery_time_days != '' && !is_numeric($delivery_time_days)) $delivery_time_days = '';
+		if ($price_base_type == 'TTC')
+		{
+			$ttx = $tva_tx;
+			$buyprice = $buyprice / (1 + ($ttx / 100));
+		}
 
 		// Multicurrency
-        if ($conf->multicurrency->enabled) {
-            if (empty($multicurrency_tx)) $multicurrency_tx = 1;
-            if (empty($multicurrency_buyprice)) $multicurrency_buyprice = 0;
+		if ($conf->multicurrency->enabled) {
+			if (empty($multicurrency_tx)) $multicurrency_tx = 1;
+			if (empty($multicurrency_buyprice)) $multicurrency_buyprice = 0;
 
-            if (empty($multicurrency_buyprice)) $multicurrency_buyprice = 0;
-            if ($multicurrency_price_base_type == 'TTC')
-            {
-                $ttx = $tva_tx;
-                $multicurrency_buyprice = $multicurrency_buyprice / (1 + ($ttx / 100));
-            }
-            $multicurrency_buyprice = price2num($multicurrency_buyprice, 'MU');
-            $multicurrency_unitBuyPrice = price2num($multicurrency_buyprice / $qty, 'MU');
+			if (empty($multicurrency_buyprice)) $multicurrency_buyprice = 0;
+			if ($multicurrency_price_base_type == 'TTC')
+			{
+				$ttx = $tva_tx;
+				$multicurrency_buyprice = $multicurrency_buyprice / (1 + ($ttx / 100));
+			}
+			$multicurrency_buyprice = price2num($multicurrency_buyprice, 'MU');
+			$multicurrency_unitBuyPrice = price2num($multicurrency_buyprice / $qty, 'MU');
 
-            $buyprice = $multicurrency_buyprice / $multicurrency_tx;
-            $fk_multicurrency = MultiCurrency::getIdFromCode($this->db, $multicurrency_code);
-        }
+			$buyprice = $multicurrency_buyprice / $multicurrency_tx;
+			$fk_multicurrency = MultiCurrency::getIdFromCode($this->db, $multicurrency_code);
+		}
 
-        $buyprice = price2num($buyprice, 'MU');
+		$buyprice = price2num($buyprice, 'MU');
 		$charges = price2num($charges, 'MU');
-        $qty = price2num($qty, 'MS');
+		$qty = price2num($qty, 'MS');
 		$unitBuyPrice = price2num($buyprice / $qty, 'MU');
 		$packaging = price2num((($this->packaging < $qty) ? $qty : $this->packaging), 'MS');
 
@@ -300,50 +300,50 @@ class ProductFournisseur extends Product
 		{
 		}
 
-        $this->db->begin();
+		$this->db->begin();
 
-        if ($this->product_fourn_price_id > 0)
-        {
-            // check if price already logged, if not first log current price
-            $logPrices = $this->listProductFournisseurPriceLog($this->product_fourn_price_id);
-            if (is_array($logPrices) && count($logPrices) == 0)
-            {
-                $currentPfp = new self($this->db);
-                $result = $currentPfp->fetch_product_fournisseur_price($this->product_fourn_price_id);
-                if ($result > 0 && $currentPfp->fourn_price != 0)
-                {
-                    $currentPfpUser = new User($this->db);
-                    $result = $currentPfpUser->fetch($currentPfp->user_id);
-                    if ($result > 0) {
-                        $currentPfp->logPrice(
-                            $currentPfpUser,
-                            $currentPfp->date_creation,
-                            $currentPfp->fourn_price,
-                            $currentPfp->fourn_qty,
-                            $currentPfp->fourn_multicurrency_price,
-                            $currentPfp->fourn_multicurrency_unitprice,
-                            $currentPfp->fourn_multicurrency_tx,
-                            $currentPfp->fourn_multicurrency_id,
-                            $currentPfp->fourn_multicurrency_code
-                        );
-                    }
-                }
-            }
-            $sql = "UPDATE ".MAIN_DB_PREFIX."product_fournisseur_price";
+		if ($this->product_fourn_price_id > 0)
+		{
+			// check if price already logged, if not first log current price
+			$logPrices = $this->listProductFournisseurPriceLog($this->product_fourn_price_id);
+			if (is_array($logPrices) && count($logPrices) == 0)
+			{
+				$currentPfp = new self($this->db);
+				$result = $currentPfp->fetch_product_fournisseur_price($this->product_fourn_price_id);
+				if ($result > 0 && $currentPfp->fourn_price != 0)
+				{
+					$currentPfpUser = new User($this->db);
+					$result = $currentPfpUser->fetch($currentPfp->user_id);
+					if ($result > 0) {
+						$currentPfp->logPrice(
+							$currentPfpUser,
+							$currentPfp->date_creation,
+							$currentPfp->fourn_price,
+							$currentPfp->fourn_qty,
+							$currentPfp->fourn_multicurrency_price,
+							$currentPfp->fourn_multicurrency_unitprice,
+							$currentPfp->fourn_multicurrency_tx,
+							$currentPfp->fourn_multicurrency_id,
+							$currentPfp->fourn_multicurrency_code
+						);
+					}
+				}
+			}
+			$sql = "UPDATE ".MAIN_DB_PREFIX."product_fournisseur_price";
 			$sql .= " SET fk_user = ".$user->id." ,";
-            $sql .= " ref_fourn = '".$this->db->escape($ref_fourn)."',";
-            $sql .= " desc_fourn = '".$this->db->escape($desc_fourn)."',";
+			$sql .= " ref_fourn = '".$this->db->escape($ref_fourn)."',";
+			$sql .= " desc_fourn = '".$this->db->escape($desc_fourn)."',";
 			$sql .= " price = ".$buyprice.",";
 			$sql .= " quantity = ".$qty.",";
 			$sql .= " remise_percent = ".$remise_percent.",";
 			$sql .= " remise = ".$remise.",";
 			$sql .= " unitprice = ".$unitBuyPrice.",";
 			$sql .= " fk_availability = ".$availability.",";
-            $sql .= " multicurrency_price = ".(isset($multicurrency_buyprice) ? "'".$this->db->escape(price2num($multicurrency_buyprice))."'" : 'null').",";
-            $sql .= " multicurrency_unitprice = ".(isset($multicurrency_unitBuyPrice) ? "'".$this->db->escape(price2num($multicurrency_unitBuyPrice))."'" : 'null').",";
-            $sql .= " multicurrency_tx = ".(isset($multicurrency_tx) ? "'".$this->db->escape($multicurrency_tx)."'" : '1').",";
-            $sql .= " fk_multicurrency = ".(isset($fk_multicurrency) ? "'".$this->db->escape($fk_multicurrency)."'" : 'null').",";
-            $sql .= " multicurrency_code = ".(isset($multicurrency_code) ? "'".$this->db->escape($multicurrency_code)."'" : 'null').",";
+			$sql .= " multicurrency_price = ".(isset($multicurrency_buyprice) ? "'".$this->db->escape(price2num($multicurrency_buyprice))."'" : 'null').",";
+			$sql .= " multicurrency_unitprice = ".(isset($multicurrency_unitBuyPrice) ? "'".$this->db->escape(price2num($multicurrency_unitBuyPrice))."'" : 'null').",";
+			$sql .= " multicurrency_tx = ".(isset($multicurrency_tx) ? "'".$this->db->escape($multicurrency_tx)."'" : '1').",";
+			$sql .= " fk_multicurrency = ".(isset($fk_multicurrency) ? "'".$this->db->escape($fk_multicurrency)."'" : 'null').",";
+			$sql .= " multicurrency_code = ".(isset($multicurrency_code) ? "'".$this->db->escape($multicurrency_code)."'" : 'null').",";
 			$sql .= " entity = ".$conf->entity.",";
 			$sql .= " tva_tx = ".price2num($tva_tx).",";
 			// TODO Add localtax1 and localtax2
@@ -356,8 +356,8 @@ class ProductFournisseur extends Product
 			$sql .= " charges = ".$charges.","; // deprecated
 			$sql .= " delivery_time_days = ".($delivery_time_days != '' ? $delivery_time_days : 'null').",";
 			$sql .= " supplier_reputation = ".(empty($supplier_reputation) ? 'NULL' : "'".$this->db->escape($supplier_reputation)."'").",";
-            $sql .= " barcode = ".(empty($barcode) ? 'NULL' : "'".$this->db->escape($barcode)."'").",";
-            $sql .= " fk_barcode_type = ".(empty($fk_barcode_type) ? 'NULL' : "'".$this->db->escape($fk_barcode_type)."'");
+			$sql .= " barcode = ".(empty($barcode) ? 'NULL' : "'".$this->db->escape($barcode)."'").",";
+			$sql .= " fk_barcode_type = ".(empty($fk_barcode_type) ? 'NULL' : "'".$this->db->escape($fk_barcode_type)."'");
 			if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING)) $sql .= ", packaging = ".(empty($packaging) ? 1 : $packaging);
 			$sql .= " WHERE rowid = ".$this->product_fourn_price_id;
 			// TODO Add price_base_type and price_ttc
@@ -366,17 +366,17 @@ class ProductFournisseur extends Product
 			$resql = $this->db->query($sql);
 			if ($resql)
 			{
-                // Call trigger
-                $result = $this->call_trigger('SUPPLIER_PRODUCT_BUYPRICE_UPDATE', $user);
-                if ($result < 0) $error++;
-                // End call triggers
-                if (!$error && empty($conf->global->PRODUCT_PRICE_SUPPLIER_NO_LOG))
-                {
-                    $result = $this->logPrice($user, $now, $buyprice, $qty, $multicurrency_buyprice, $multicurrency_unitBuyPrice, $multicurrency_tx, $fk_multicurrency, $multicurrency_code);
-                    if ($result < 0) {
-                        $error++;
-                    }
-                }
+				// Call trigger
+				$result = $this->call_trigger('SUPPLIER_PRODUCT_BUYPRICE_UPDATE', $user);
+				if ($result < 0) $error++;
+				// End call triggers
+				if (!$error && empty($conf->global->PRODUCT_PRICE_SUPPLIER_NO_LOG))
+				{
+					$result = $this->logPrice($user, $now, $buyprice, $qty, $multicurrency_buyprice, $multicurrency_unitBuyPrice, $multicurrency_tx, $fk_multicurrency, $multicurrency_code);
+					if ($result < 0) {
+						$error++;
+					}
+				}
 				if (empty($error))
 				{
 					$this->db->commit();
@@ -390,727 +390,727 @@ class ProductFournisseur extends Product
 				$this->db->rollback();
 				return -2;
 			}
-        } else {
-            dol_syslog(get_class($this).'::update_buyprice without knowing id of line, so we delete from company, quantity and supplier_ref and insert again', LOG_DEBUG);
+		} else {
+			dol_syslog(get_class($this).'::update_buyprice without knowing id of line, so we delete from company, quantity and supplier_ref and insert again', LOG_DEBUG);
 
-            // Delete price for this quantity
-            $sql = "DELETE FROM  ".MAIN_DB_PREFIX."product_fournisseur_price";
-            $sql .= " WHERE fk_soc = ".$fourn->id." AND ref_fourn = '".$this->db->escape($ref_fourn)."' AND quantity = ".$qty." AND entity = ".$conf->entity;
-            $resql = $this->db->query($sql);
-            if ($resql) {
-                // Add price for this quantity to supplier
-                $sql = "INSERT INTO ".MAIN_DB_PREFIX."product_fournisseur_price(";
-                $sql .= " multicurrency_price, multicurrency_unitprice, multicurrency_tx, fk_multicurrency, multicurrency_code,";
-                $sql .= "datec, fk_product, fk_soc, ref_fourn, desc_fourn, fk_user, price, quantity, remise_percent, remise, unitprice, tva_tx, charges, fk_availability, default_vat_code, info_bits, entity, delivery_time_days, supplier_reputation, barcode, fk_barcode_type)";
+			// Delete price for this quantity
+			$sql = "DELETE FROM  ".MAIN_DB_PREFIX."product_fournisseur_price";
+			$sql .= " WHERE fk_soc = ".$fourn->id." AND ref_fourn = '".$this->db->escape($ref_fourn)."' AND quantity = ".$qty." AND entity = ".$conf->entity;
+			$resql = $this->db->query($sql);
+			if ($resql) {
+				// Add price for this quantity to supplier
+				$sql = "INSERT INTO ".MAIN_DB_PREFIX."product_fournisseur_price(";
+				$sql .= " multicurrency_price, multicurrency_unitprice, multicurrency_tx, fk_multicurrency, multicurrency_code,";
+				$sql .= "datec, fk_product, fk_soc, ref_fourn, desc_fourn, fk_user, price, quantity, remise_percent, remise, unitprice, tva_tx, charges, fk_availability, default_vat_code, info_bits, entity, delivery_time_days, supplier_reputation, barcode, fk_barcode_type)";
 				if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING)) $sql .= ", packaging";
-                $sql .= " values(";
-                $sql .= (isset($multicurrency_buyprice) ? "'".$this->db->escape(price2num($multicurrency_buyprice))."'" : 'null').",";
-                $sql .= (isset($multicurrency_unitBuyPrice) ? "'".$this->db->escape(price2num($multicurrency_unitBuyPrice))."'" : 'null').",";
-                $sql .= (isset($multicurrency_tx) ? "'".$this->db->escape($multicurrency_tx)."'" : '1').",";
-                $sql .= (isset($fk_multicurrency) ? "'".$this->db->escape($fk_multicurrency)."'" : 'null').",";
-                $sql .= (isset($multicurrency_code) ? "'".$this->db->escape($multicurrency_code)."'" : 'null').",";
-                $sql .= " '".$this->db->idate($now)."',";
-                $sql .= " ".$this->id.",";
-                $sql .= " ".$fourn->id.",";
-                $sql .= " '".$this->db->escape($ref_fourn)."',";
-                $sql .= " '".$this->db->escape($desc_fourn)."',";
-                $sql .= " ".$user->id.",";
-                $sql .= " ".$buyprice.",";
-                $sql .= " ".$qty.",";
-                $sql .= " ".$remise_percent.",";
-                $sql .= " ".$remise.",";
-                $sql .= " ".$unitBuyPrice.",";
-                $sql .= " ".$tva_tx.",";
-                $sql .= " ".$charges.",";
-                $sql .= " ".$availability.",";
-                $sql .= " ".($newdefaultvatcode ? "'".$this->db->escape($newdefaultvatcode)."'" : "null").",";
-                $sql .= " ".$newnpr.",";
-                $sql .= $conf->entity.",";
-                $sql .= ($delivery_time_days != '' ? $delivery_time_days : 'null').",";
-                $sql .= (empty($supplier_reputation) ? 'NULL' : "'".$this->db->escape($supplier_reputation)."'").",";
-                $sql .= (empty($barcode) ? 'NULL' : "'".$this->db->escape($barcode)."'").",";
-                $sql .= (empty($fk_barcode_type) ? 'NULL' : "'".$this->db->escape($fk_barcode_type)."'");
+				$sql .= " values(";
+				$sql .= (isset($multicurrency_buyprice) ? "'".$this->db->escape(price2num($multicurrency_buyprice))."'" : 'null').",";
+				$sql .= (isset($multicurrency_unitBuyPrice) ? "'".$this->db->escape(price2num($multicurrency_unitBuyPrice))."'" : 'null').",";
+				$sql .= (isset($multicurrency_tx) ? "'".$this->db->escape($multicurrency_tx)."'" : '1').",";
+				$sql .= (isset($fk_multicurrency) ? "'".$this->db->escape($fk_multicurrency)."'" : 'null').",";
+				$sql .= (isset($multicurrency_code) ? "'".$this->db->escape($multicurrency_code)."'" : 'null').",";
+				$sql .= " '".$this->db->idate($now)."',";
+				$sql .= " ".$this->id.",";
+				$sql .= " ".$fourn->id.",";
+				$sql .= " '".$this->db->escape($ref_fourn)."',";
+				$sql .= " '".$this->db->escape($desc_fourn)."',";
+				$sql .= " ".$user->id.",";
+				$sql .= " ".$buyprice.",";
+				$sql .= " ".$qty.",";
+				$sql .= " ".$remise_percent.",";
+				$sql .= " ".$remise.",";
+				$sql .= " ".$unitBuyPrice.",";
+				$sql .= " ".$tva_tx.",";
+				$sql .= " ".$charges.",";
+				$sql .= " ".$availability.",";
+				$sql .= " ".($newdefaultvatcode ? "'".$this->db->escape($newdefaultvatcode)."'" : "null").",";
+				$sql .= " ".$newnpr.",";
+				$sql .= $conf->entity.",";
+				$sql .= ($delivery_time_days != '' ? $delivery_time_days : 'null').",";
+				$sql .= (empty($supplier_reputation) ? 'NULL' : "'".$this->db->escape($supplier_reputation)."'").",";
+				$sql .= (empty($barcode) ? 'NULL' : "'".$this->db->escape($barcode)."'").",";
+				$sql .= (empty($fk_barcode_type) ? 'NULL' : "'".$this->db->escape($fk_barcode_type)."'");
 				if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING)) $sql .= ", ".(empty($this->packaging) ? 1 : $this->db->escape($this->packaging));
-                $sql .= ")";
+				$sql .= ")";
 
 				$this->product_fourn_price_id = 0;
 
-                $resql = $this->db->query($sql);
-                if ($resql) {
-                    $this->product_fourn_price_id = $this->db->last_insert_id(MAIN_DB_PREFIX."product_fournisseur_price");
-                } else {
-                    $error++;
-                }
+				$resql = $this->db->query($sql);
+				if ($resql) {
+					$this->product_fourn_price_id = $this->db->last_insert_id(MAIN_DB_PREFIX."product_fournisseur_price");
+				} else {
+					$error++;
+				}
 
-                if (!$error && empty($conf->global->PRODUCT_PRICE_SUPPLIER_NO_LOG)) {
-                    // Add record into log table
+				if (!$error && empty($conf->global->PRODUCT_PRICE_SUPPLIER_NO_LOG)) {
+					// Add record into log table
 					// $this->product_fourn_price_id must be set
-                    $result = $this->logPrice($user, $now, $buyprice, $qty, $multicurrency_buyprice, $multicurrency_unitBuyPrice, $multicurrency_tx, $fk_multicurrency, $multicurrency_code);
-                    if ($result < 0) {
-                        $error++;
-                    }
-                }
+					$result = $this->logPrice($user, $now, $buyprice, $qty, $multicurrency_buyprice, $multicurrency_unitBuyPrice, $multicurrency_tx, $fk_multicurrency, $multicurrency_code);
+					if ($result < 0) {
+						$error++;
+					}
+				}
 
-                if (!$error) {
-                    // Call trigger
-                    $result = $this->call_trigger('SUPPLIER_PRODUCT_BUYPRICE_CREATE', $user);
-                    if ($result < 0)
-                        $error++;
-                        // End call triggers
+				if (!$error) {
+					// Call trigger
+					$result = $this->call_trigger('SUPPLIER_PRODUCT_BUYPRICE_CREATE', $user);
+					if ($result < 0)
+						$error++;
+						// End call triggers
 
-                    if (empty($error)) {
-                        $this->db->commit();
-                        return $this->product_fourn_price_id;
-                    } else {
-                        $this->db->rollback();
-                        return -1;
-                    }
-                } else {
-                    $this->error = $this->db->lasterror()." sql=".$sql;
-                    $this->db->rollback();
-                    return -2;
-                }
-            } else {
-                $this->error = $this->db->lasterror()." sql=".$sql;
-                $this->db->rollback();
-                return -1;
-            }
-        }
-    }
+					if (empty($error)) {
+						$this->db->commit();
+						return $this->product_fourn_price_id;
+					} else {
+						$this->db->rollback();
+						return -1;
+					}
+				} else {
+					$this->error = $this->db->lasterror()." sql=".$sql;
+					$this->db->rollback();
+					return -2;
+				}
+			} else {
+				$this->error = $this->db->lasterror()." sql=".$sql;
+				$this->db->rollback();
+				return -1;
+			}
+		}
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *    Loads the price information of a provider
-     *
-     *    @param    int     $rowid              Line id
-     *    @param    int     $ignore_expression  Ignores the math expression for calculating price and uses the db value instead
-     *    @return   int 					    < 0 if KO, 0 if OK but not found, > 0 if OK
-     */
-    public function fetch_product_fournisseur_price($rowid, $ignore_expression = 0)
-    {
-        // phpcs:enable
-        global $conf;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *    Loads the price information of a provider
+	 *
+	 *    @param    int     $rowid              Line id
+	 *    @param    int     $ignore_expression  Ignores the math expression for calculating price and uses the db value instead
+	 *    @return   int 					    < 0 if KO, 0 if OK but not found, > 0 if OK
+	 */
+	public function fetch_product_fournisseur_price($rowid, $ignore_expression = 0)
+	{
+		// phpcs:enable
+		global $conf;
 
-        $sql = "SELECT pfp.rowid, pfp.price, pfp.quantity, pfp.unitprice, pfp.remise_percent, pfp.remise, pfp.tva_tx, pfp.default_vat_code, pfp.info_bits as fourn_tva_npr, pfp.fk_availability,";
-        $sql .= " pfp.fk_soc, pfp.ref_fourn, pfp.desc_fourn, pfp.fk_product, pfp.charges, pfp.fk_supplier_price_expression, pfp.delivery_time_days,";
-        $sql .= " pfp.supplier_reputation, pfp.fk_user, pfp.datec,";
-        $sql .= " pfp.multicurrency_price, pfp.multicurrency_unitprice, pfp.multicurrency_tx, pfp.fk_multicurrency, pfp.multicurrency_code,";
-        $sql .= "  pfp.barcode, pfp.fk_barcode_type";
+		$sql = "SELECT pfp.rowid, pfp.price, pfp.quantity, pfp.unitprice, pfp.remise_percent, pfp.remise, pfp.tva_tx, pfp.default_vat_code, pfp.info_bits as fourn_tva_npr, pfp.fk_availability,";
+		$sql .= " pfp.fk_soc, pfp.ref_fourn, pfp.desc_fourn, pfp.fk_product, pfp.charges, pfp.fk_supplier_price_expression, pfp.delivery_time_days,";
+		$sql .= " pfp.supplier_reputation, pfp.fk_user, pfp.datec,";
+		$sql .= " pfp.multicurrency_price, pfp.multicurrency_unitprice, pfp.multicurrency_tx, pfp.fk_multicurrency, pfp.multicurrency_code,";
+		$sql .= "  pfp.barcode, pfp.fk_barcode_type";
 		if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING)) $sql .= ", pfp.packaging";
-        $sql .= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price as pfp";
-        $sql .= " WHERE pfp.rowid = ".(int) $rowid;
+		$sql .= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price as pfp";
+		$sql .= " WHERE pfp.rowid = ".(int) $rowid;
 
-        dol_syslog(get_class($this)."::fetch_product_fournisseur_price", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            $obj = $this->db->fetch_object($resql);
-            if ($obj)
-            {
-            	$this->product_fourn_price_id = $rowid;
-            	$this->id = $obj->fk_product;
-            	$this->fk_product				= $obj->fk_product;
-            	$this->product_id				= $obj->fk_product; // deprecated
-            	$this->fourn_id					= $obj->fk_soc;
-            	$this->fourn_ref				= $obj->ref_fourn; // deprecated
-	            $this->ref_supplier             = $obj->ref_fourn;
-	            $this->desc_supplier            = $obj->desc_fourn;
-            	$this->fourn_price = $obj->price;
-            	$this->fourn_charges            = $obj->charges; // deprecated
-            	$this->fourn_qty                = $obj->quantity;
-            	$this->fourn_remise_percent     = $obj->remise_percent;
-            	$this->fourn_remise             = $obj->remise;
-            	$this->fourn_unitprice          = $obj->unitprice;
-            	$this->fourn_tva_tx				= $obj->tva_tx;
-            	$this->fourn_tva_npr			= $obj->fourn_tva_npr;
-            	// Add also localtaxes
-            	$this->fk_availability = $obj->fk_availability;
+		dol_syslog(get_class($this)."::fetch_product_fournisseur_price", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$obj = $this->db->fetch_object($resql);
+			if ($obj)
+			{
+				$this->product_fourn_price_id = $rowid;
+				$this->id = $obj->fk_product;
+				$this->fk_product				= $obj->fk_product;
+				$this->product_id				= $obj->fk_product; // deprecated
+				$this->fourn_id					= $obj->fk_soc;
+				$this->fourn_ref				= $obj->ref_fourn; // deprecated
+				$this->ref_supplier             = $obj->ref_fourn;
+				$this->desc_supplier            = $obj->desc_fourn;
+				$this->fourn_price = $obj->price;
+				$this->fourn_charges            = $obj->charges; // deprecated
+				$this->fourn_qty                = $obj->quantity;
+				$this->fourn_remise_percent     = $obj->remise_percent;
+				$this->fourn_remise             = $obj->remise;
+				$this->fourn_unitprice          = $obj->unitprice;
+				$this->fourn_tva_tx				= $obj->tva_tx;
+				$this->fourn_tva_npr			= $obj->fourn_tva_npr;
+				// Add also localtaxes
+				$this->fk_availability = $obj->fk_availability;
 				$this->delivery_time_days = $obj->delivery_time_days;
-                $this->fk_supplier_price_expression = $obj->fk_supplier_price_expression;
-                $this->supplier_reputation      = $obj->supplier_reputation;
-                $this->default_vat_code         = $obj->default_vat_code;
-                $this->user_id                  = $obj->fk_user;
-                $this->date_creation            = $this->db->jdate($obj->datec);
-                $this->fourn_multicurrency_price       = $obj->multicurrency_price;
-                $this->fourn_multicurrency_unitprice   = $obj->multicurrency_unitprice;
-                $this->fourn_multicurrency_tx          = $obj->multicurrency_tx;
-                $this->fourn_multicurrency_id          = $obj->fk_multicurrency;
-                $this->fourn_multicurrency_code        = $obj->multicurrency_code;
-                if ($conf->barcode->enabled) {
-                    $this->fourn_barcode = $obj->barcode;
-                    $this->fourn_fk_barcode_type = $obj->fk_barcode_type;
-                }
+				$this->fk_supplier_price_expression = $obj->fk_supplier_price_expression;
+				$this->supplier_reputation      = $obj->supplier_reputation;
+				$this->default_vat_code         = $obj->default_vat_code;
+				$this->user_id                  = $obj->fk_user;
+				$this->date_creation            = $this->db->jdate($obj->datec);
+				$this->fourn_multicurrency_price       = $obj->multicurrency_price;
+				$this->fourn_multicurrency_unitprice   = $obj->multicurrency_unitprice;
+				$this->fourn_multicurrency_tx          = $obj->multicurrency_tx;
+				$this->fourn_multicurrency_id          = $obj->fk_multicurrency;
+				$this->fourn_multicurrency_code        = $obj->multicurrency_code;
+				if ($conf->barcode->enabled) {
+					$this->fourn_barcode = $obj->barcode;
+					$this->fourn_fk_barcode_type = $obj->fk_barcode_type;
+				}
 
 				if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING)) {
 					$this->packaging = $obj->packaging;
 					if ($this->packaging < $this->fourn_qty) $this->packaging = $this->fourn_qty;
 				}
 
-                if (empty($ignore_expression) && !empty($this->fk_supplier_price_expression))
-                {
-                    $priceparser = new PriceParser($this->db);
-                    $price_result = $priceparser->parseProductSupplier($this);
-                    if ($price_result >= 0) {
-                    	$this->fourn_price = $price_result;
-                    	//recalculation of unitprice, as probably the price changed...
-	                    if ($this->fourn_qty != 0)
-	                    {
-	                        $this->fourn_unitprice = price2num($this->fourn_price / $this->fourn_qty, 'MU');
-	                    } else {
-	                        $this->fourn_unitprice = "";
-	                    }
-                    }
-                }
+				if (empty($ignore_expression) && !empty($this->fk_supplier_price_expression))
+				{
+					$priceparser = new PriceParser($this->db);
+					$price_result = $priceparser->parseProductSupplier($this);
+					if ($price_result >= 0) {
+						$this->fourn_price = $price_result;
+						//recalculation of unitprice, as probably the price changed...
+						if ($this->fourn_qty != 0)
+						{
+							$this->fourn_unitprice = price2num($this->fourn_price / $this->fourn_qty, 'MU');
+						} else {
+							$this->fourn_unitprice = "";
+						}
+					}
+				}
 
-            	return 1;
-            } else {
-                return 0;
-            }
-        } else {
-            $this->error = $this->db->error();
-            return -1;
-        }
-    }
+				return 1;
+			} else {
+				return 0;
+			}
+		} else {
+			$this->error = $this->db->error();
+			return -1;
+		}
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *    List all supplier prices of a product
-     *
-     *    @param    int		$prodid	    Id of product
-     *    @param	string	$sortfield	Sort field
-     *    @param	string	$sortorder	Sort order
-     *    @param	int		$limit		Limit
-     *    @param	int		$offset		Offset
-     *    @return	array				Array of Products with new properties to define supplier price
-     */
-    public function list_product_fournisseur_price($prodid, $sortfield = '', $sortorder = '', $limit = 0, $offset = 0)
-    {
-        // phpcs:enable
-        global $conf;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *    List all supplier prices of a product
+	 *
+	 *    @param    int		$prodid	    Id of product
+	 *    @param	string	$sortfield	Sort field
+	 *    @param	string	$sortorder	Sort order
+	 *    @param	int		$limit		Limit
+	 *    @param	int		$offset		Offset
+	 *    @return	array				Array of Products with new properties to define supplier price
+	 */
+	public function list_product_fournisseur_price($prodid, $sortfield = '', $sortorder = '', $limit = 0, $offset = 0)
+	{
+		// phpcs:enable
+		global $conf;
 
-        $sql = "SELECT s.nom as supplier_name, s.rowid as fourn_id,";
-        $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";
+		$sql = "SELECT s.nom as supplier_name, s.rowid as fourn_id,";
+		$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";
 		if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING)) $sql .= ", pfp.packaging";
 		$sql .= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price as pfp, ".MAIN_DB_PREFIX."societe as s";
-        $sql .= " WHERE pfp.entity IN (".getEntity('productsupplierprice').")";
-        $sql .= " AND pfp.fk_soc = s.rowid";
-        $sql .= " AND s.status=1"; // only enabled company selected
-        $sql .= " AND pfp.fk_product = ".$prodid;
-        if (empty($sortfield)) $sql .= " ORDER BY s.nom, pfp.quantity, pfp.price";
-        else $sql .= $this->db->order($sortfield, $sortorder);
-        $sql .= $this->db->plimit($limit, $offset);
-        dol_syslog(get_class($this)."::list_product_fournisseur_price", LOG_DEBUG);
+		$sql .= " WHERE pfp.entity IN (".getEntity('productsupplierprice').")";
+		$sql .= " AND pfp.fk_soc = s.rowid";
+		$sql .= " AND s.status=1"; // only enabled company selected
+		$sql .= " AND pfp.fk_product = ".$prodid;
+		if (empty($sortfield)) $sql .= " ORDER BY s.nom, pfp.quantity, pfp.price";
+		else $sql .= $this->db->order($sortfield, $sortorder);
+		$sql .= $this->db->plimit($limit, $offset);
+		dol_syslog(get_class($this)."::list_product_fournisseur_price", LOG_DEBUG);
 
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            $retarray = array();
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$retarray = array();
 
-            while ($record = $this->db->fetch_array($resql))
-            {
-                //define base attribute
-                $prodfourn = new ProductFournisseur($this->db);
+			while ($record = $this->db->fetch_array($resql))
+			{
+				//define base attribute
+				$prodfourn = new ProductFournisseur($this->db);
 
-                $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"];
-                $prodfourn->fourn_price				= $record["price"];
-                $prodfourn->fourn_qty = $record["quantity"];
+				$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"];
+				$prodfourn->fourn_price				= $record["price"];
+				$prodfourn->fourn_qty = $record["quantity"];
 				$prodfourn->fourn_remise_percent = $record["remise_percent"];
 				$prodfourn->fourn_remise = $record["remise"];
 				$prodfourn->fourn_unitprice = $record["unitprice"];
-				$prodfourn->fourn_charges           = $record["charges"]; // deprecated
-                $prodfourn->fourn_tva_tx = $record["tva_tx"];
-                $prodfourn->fourn_id				= $record["fourn_id"];
-                $prodfourn->fourn_name = $record["supplier_name"];
-                $prodfourn->fk_availability			= $record["fk_availability"];
-				$prodfourn->delivery_time_days		= $record["delivery_time_days"];
-                $prodfourn->id						= $prodid;
-                $prodfourn->fourn_tva_npr					= $record["info_bits"];
-                $prodfourn->fk_supplier_price_expression = $record["fk_supplier_price_expression"];
+				$prodfourn->fourn_charges = $record["charges"]; // deprecated
+				$prodfourn->fourn_tva_tx = $record["tva_tx"];
+				$prodfourn->fourn_id = $record["fourn_id"];
+				$prodfourn->fourn_name = $record["supplier_name"];
+				$prodfourn->fk_availability			= $record["fk_availability"];
+				$prodfourn->delivery_time_days = $record["delivery_time_days"];
+				$prodfourn->id = $prodid;
+				$prodfourn->fourn_tva_npr					= $record["info_bits"];
+				$prodfourn->fk_supplier_price_expression = $record["fk_supplier_price_expression"];
 				$prodfourn->supplier_reputation = $record["supplier_reputation"];
 				$prodfourn->fourn_date_creation          = $this->db->jdate($record['datec']);
 				$prodfourn->fourn_date_modification      = $this->db->jdate($record['tms']);
 
-                $prodfourn->fourn_multicurrency_price       = $record["multicurrency_price"];
-                $prodfourn->fourn_multicurrency_unitprice   = $record["multicurrency_unitprice"];
-                $prodfourn->fourn_multicurrency_tx          = $record["multicurrency_tx"];
-                $prodfourn->fourn_multicurrency_id          = $record["fk_multicurrency"];
-                $prodfourn->fourn_multicurrency_code        = $record["multicurrency_code"];
+				$prodfourn->fourn_multicurrency_price       = $record["multicurrency_price"];
+				$prodfourn->fourn_multicurrency_unitprice   = $record["multicurrency_unitprice"];
+				$prodfourn->fourn_multicurrency_tx          = $record["multicurrency_tx"];
+				$prodfourn->fourn_multicurrency_id          = $record["fk_multicurrency"];
+				$prodfourn->fourn_multicurrency_code        = $record["multicurrency_code"];
 
 				if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING)) {
 					$prodfourn->packaging = $record["packaging"];
 					if ($prodfourn->packaging < $prodfourn->fourn_qty) $prodfourn->packaging = $prodfourn->fourn_qty;
 				}
 
-                if ($conf->barcode->enabled) {
-                    $prodfourn->barcode = $record["barcode"];
-                    $prodfourn->fk_barcode_type = $record["fk_barcode_type"];
-                }
+				if ($conf->barcode->enabled) {
+					$prodfourn->barcode = $record["barcode"];
+					$prodfourn->fk_barcode_type = $record["fk_barcode_type"];
+				}
 
-                if (!empty($conf->dynamicprices->enabled) && !empty($prodfourn->fk_supplier_price_expression)) {
-                    $priceparser = new PriceParser($this->db);
-                    $price_result = $priceparser->parseProductSupplier($prodfourn);
-                    if ($price_result >= 0) {
-                    	$prodfourn->fourn_price = $price_result;
-                    	$prodfourn->fourn_unitprice = null; //force recalculation of unitprice, as probably the price changed...
-                    }
-                }
+				if (!empty($conf->dynamicprices->enabled) && !empty($prodfourn->fk_supplier_price_expression)) {
+					$priceparser = new PriceParser($this->db);
+					$price_result = $priceparser->parseProductSupplier($prodfourn);
+					if ($price_result >= 0) {
+						$prodfourn->fourn_price = $price_result;
+						$prodfourn->fourn_unitprice = null; //force recalculation of unitprice, as probably the price changed...
+					}
+				}
 
-                if (!isset($prodfourn->fourn_unitprice))
-                {
-                    if ($prodfourn->fourn_qty != 0)
-                    {
-                        $prodfourn->fourn_unitprice = price2num($prodfourn->fourn_price / $prodfourn->fourn_qty, 'MU');
-                    } else {
-                        $prodfourn->fourn_unitprice = "";
-                    }
-                }
+				if (!isset($prodfourn->fourn_unitprice))
+				{
+					if ($prodfourn->fourn_qty != 0)
+					{
+						$prodfourn->fourn_unitprice = price2num($prodfourn->fourn_price / $prodfourn->fourn_qty, 'MU');
+					} else {
+						$prodfourn->fourn_unitprice = "";
+					}
+				}
 
-                $retarray[] = $prodfourn;
-            }
+				$retarray[] = $prodfourn;
+			}
 
-            $this->db->free($resql);
-            return $retarray;
-        } else {
-            $this->error = $this->db->error();
-            return -1;
-        }
-    }
+			$this->db->free($resql);
+			return $retarray;
+		} else {
+			$this->error = $this->db->error();
+			return -1;
+		}
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Load properties for minimum price
-     *
-     *  @param	int		$prodid	    Product id
-     *  @param	int		$qty		Minimum quantity
-     *  @param	int		$socid		get min price for specific supplier
-     *  @return int					<0 if KO, 0=Not found of no product id provided, >0 if OK
-     */
-    public function find_min_price_product_fournisseur($prodid, $qty = 0, $socid = 0)
-    {
-        // phpcs:enable
-        global $conf;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Load properties for minimum price
+	 *
+	 *  @param	int		$prodid	    Product id
+	 *  @param	int		$qty		Minimum quantity
+	 *  @param	int		$socid		get min price for specific supplier
+	 *  @return int					<0 if KO, 0=Not found of no product id provided, >0 if OK
+	 */
+	public function find_min_price_product_fournisseur($prodid, $qty = 0, $socid = 0)
+	{
+		// phpcs:enable
+		global $conf;
 
-        if (empty($prodid))
-        {
-        	dol_syslog("Warning function find_min_price_product_fournisseur were called with prodid empty. May be a bug.", LOG_WARNING);
-        	return 0;
-        }
+		if (empty($prodid))
+		{
+			dol_syslog("Warning function find_min_price_product_fournisseur were called with prodid empty. May be a bug.", LOG_WARNING);
+			return 0;
+		}
 
-        $this->product_fourn_price_id = '';
-        $this->product_fourn_id       = '';
-        $this->fourn_ref              = '';
-        $this->fourn_price            = '';
-        $this->fourn_qty              = '';
-        $this->fourn_remise_percent   = '';
-        $this->fourn_remise           = '';
-        $this->fourn_unitprice        = '';
-        $this->fourn_id               = '';
-        $this->fourn_name             = '';
+		$this->product_fourn_price_id = '';
+		$this->product_fourn_id       = '';
+		$this->fourn_ref              = '';
+		$this->fourn_price            = '';
+		$this->fourn_qty              = '';
+		$this->fourn_remise_percent   = '';
+		$this->fourn_remise           = '';
+		$this->fourn_unitprice        = '';
+		$this->fourn_id               = '';
+		$this->fourn_name             = '';
 		$this->delivery_time_days = '';
-        $this->id                     = '';
+		$this->id                     = '';
 
-        $this->fourn_multicurrency_price       = '';
-        $this->fourn_multicurrency_unitprice   = '';
-        $this->fourn_multicurrency_tx          = '';
-        $this->fourn_multicurrency_id          = '';
-        $this->fourn_multicurrency_code        = '';
+		$this->fourn_multicurrency_price       = '';
+		$this->fourn_multicurrency_unitprice   = '';
+		$this->fourn_multicurrency_tx          = '';
+		$this->fourn_multicurrency_id          = '';
+		$this->fourn_multicurrency_code        = '';
 
-        $sql = "SELECT s.nom as supplier_name, s.rowid as fourn_id,";
-        $sql .= " pfp.rowid as product_fourn_price_id, pfp.ref_fourn,";
-        $sql .= " pfp.price, pfp.quantity, pfp.unitprice, pfp.tva_tx, pfp.charges,";
-        $sql .= " pfp.remise, pfp.remise_percent, pfp.fk_supplier_price_expression, pfp.delivery_time_days";
-        $sql .= " ,pfp.multicurrency_price, pfp.multicurrency_unitprice, pfp.multicurrency_tx, pfp.fk_multicurrency, pfp.multicurrency_code";
-        $sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."product_fournisseur_price as pfp";
-        $sql .= " WHERE s.entity IN (".getEntity('societe').")";
-        $sql .= " AND pfp.entity = ".$conf->entity; // only current entity
-        $sql .= " AND pfp.fk_product = ".$prodid;
-        $sql .= " AND pfp.fk_soc = s.rowid";
-        $sql .= " AND s.status = 1"; // only enabled society
-        if ($qty > 0) $sql .= " AND pfp.quantity <= ".$qty;
+		$sql = "SELECT s.nom as supplier_name, s.rowid as fourn_id,";
+		$sql .= " pfp.rowid as product_fourn_price_id, pfp.ref_fourn,";
+		$sql .= " pfp.price, pfp.quantity, pfp.unitprice, pfp.tva_tx, pfp.charges,";
+		$sql .= " pfp.remise, pfp.remise_percent, pfp.fk_supplier_price_expression, pfp.delivery_time_days";
+		$sql .= " ,pfp.multicurrency_price, pfp.multicurrency_unitprice, pfp.multicurrency_tx, pfp.fk_multicurrency, pfp.multicurrency_code";
+		$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."product_fournisseur_price as pfp";
+		$sql .= " WHERE s.entity IN (".getEntity('societe').")";
+		$sql .= " AND pfp.entity = ".$conf->entity; // only current entity
+		$sql .= " AND pfp.fk_product = ".$prodid;
+		$sql .= " AND pfp.fk_soc = s.rowid";
+		$sql .= " AND s.status = 1"; // only enabled society
+		if ($qty > 0) $sql .= " AND pfp.quantity <= ".$qty;
 		if ($socid > 0) $sql .= ' AND pfp.fk_soc = '.$socid;
 
-        dol_syslog(get_class($this)."::find_min_price_product_fournisseur", LOG_DEBUG);
+		dol_syslog(get_class($this)."::find_min_price_product_fournisseur", LOG_DEBUG);
 
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            $record_array = array();
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$record_array = array();
 
-            //Store each record to array for later search of min
-            while ($record = $this->db->fetch_array($resql))
-            {
-                $record_array[] = $record;
-            }
+			//Store each record to array for later search of min
+			while ($record = $this->db->fetch_array($resql))
+			{
+				$record_array[] = $record;
+			}
 
-            if (count($record_array) == 0)
-            {
-                $this->db->free($resql);
-                return 0;
-            } else {
-                $min = -1;
-                foreach ($record_array as $record)
-                {
-                    $fourn_price = $record["price"];
-                    // discount calculated buy price
-                    $fourn_unitprice = $record["unitprice"] * (1 - $record["remise_percent"] / 100) - $record["remise"];
-                    if (!empty($conf->dynamicprices->enabled) && !empty($record["fk_supplier_price_expression"])) {
-                        $prod_supplier = new ProductFournisseur($this->db);
-                        $prod_supplier->product_fourn_price_id = $record["product_fourn_price_id"];
-                        $prod_supplier->id = $prodid;
-                        $prod_supplier->fourn_qty = $record["quantity"];
-                        $prod_supplier->fourn_tva_tx = $record["tva_tx"];
-                        $prod_supplier->fk_supplier_price_expression = $record["fk_supplier_price_expression"];
-                        $priceparser = new PriceParser($this->db);
-                        $price_result = $priceparser->parseProductSupplier($prod_supplier);
-                        if ($price_result >= 0) {
-                            $fourn_price = price2num($price_result, 'MU');
-                            if ($record["quantity"] != 0)
-                            {
-                                $fourn_unitprice = price2num($fourn_price / $record["quantity"], 'MU');
-                            } else {
-                                $fourn_unitprice = $fourn_price;
-                            }
-                        }
-                    }
-                    if ($fourn_unitprice < $min || $min == -1)
-                    {
-                        $this->product_fourn_price_id   = $record["product_fourn_price_id"];
-                        $this->ref_supplier             = $record["ref_fourn"];
-                        $this->ref_fourn                = $record["ref_fourn"]; // deprecated
-                        $this->fourn_ref                = $record["ref_fourn"]; // deprecated
-                        $this->fourn_price              = $fourn_price;
-                        $this->fourn_qty                = $record["quantity"];
-                        $this->fourn_remise_percent     = $record["remise_percent"];
-                        $this->fourn_remise             = $record["remise"];
-                        $this->fourn_unitprice          = $record["unitprice"];
-                        $this->fourn_charges            = $record["charges"]; // deprecated
-                        $this->fourn_tva_tx             = $record["tva_tx"];
-                        $this->fourn_id                 = $record["fourn_id"];
-                        $this->fourn_name               = $record["supplier_name"];
+			if (count($record_array) == 0)
+			{
+				$this->db->free($resql);
+				return 0;
+			} else {
+				$min = -1;
+				foreach ($record_array as $record)
+				{
+					$fourn_price = $record["price"];
+					// discount calculated buy price
+					$fourn_unitprice = $record["unitprice"] * (1 - $record["remise_percent"] / 100) - $record["remise"];
+					if (!empty($conf->dynamicprices->enabled) && !empty($record["fk_supplier_price_expression"])) {
+						$prod_supplier = new ProductFournisseur($this->db);
+						$prod_supplier->product_fourn_price_id = $record["product_fourn_price_id"];
+						$prod_supplier->id = $prodid;
+						$prod_supplier->fourn_qty = $record["quantity"];
+						$prod_supplier->fourn_tva_tx = $record["tva_tx"];
+						$prod_supplier->fk_supplier_price_expression = $record["fk_supplier_price_expression"];
+						$priceparser = new PriceParser($this->db);
+						$price_result = $priceparser->parseProductSupplier($prod_supplier);
+						if ($price_result >= 0) {
+							$fourn_price = price2num($price_result, 'MU');
+							if ($record["quantity"] != 0)
+							{
+								$fourn_unitprice = price2num($fourn_price / $record["quantity"], 'MU');
+							} else {
+								$fourn_unitprice = $fourn_price;
+							}
+						}
+					}
+					if ($fourn_unitprice < $min || $min == -1)
+					{
+						$this->product_fourn_price_id   = $record["product_fourn_price_id"];
+						$this->ref_supplier             = $record["ref_fourn"];
+						$this->ref_fourn                = $record["ref_fourn"]; // deprecated
+						$this->fourn_ref                = $record["ref_fourn"]; // deprecated
+						$this->fourn_price              = $fourn_price;
+						$this->fourn_qty                = $record["quantity"];
+						$this->fourn_remise_percent     = $record["remise_percent"];
+						$this->fourn_remise             = $record["remise"];
+						$this->fourn_unitprice          = $record["unitprice"];
+						$this->fourn_charges            = $record["charges"]; // deprecated
+						$this->fourn_tva_tx             = $record["tva_tx"];
+						$this->fourn_id                 = $record["fourn_id"];
+						$this->fourn_name               = $record["supplier_name"];
 						$this->delivery_time_days = $record["delivery_time_days"];
-                        $this->fk_supplier_price_expression = $record["fk_supplier_price_expression"];
-                        $this->id                       = $prodid;
-                        $this->fourn_multicurrency_price       = $record["multicurrency_price"];
-                        $this->fourn_multicurrency_unitprice   = $record["multicurrency_unitprice"];
-                        $this->fourn_multicurrency_tx          = $record["multicurrency_tx"];
-                        $this->fourn_multicurrency_id          = $record["fk_multicurrency"];
-                        $this->fourn_multicurrency_code        = $record["multicurrency_code"];
-                        $min = $fourn_unitprice;
-                    }
-                }
-            }
+						$this->fk_supplier_price_expression = $record["fk_supplier_price_expression"];
+						$this->id                       = $prodid;
+						$this->fourn_multicurrency_price       = $record["multicurrency_price"];
+						$this->fourn_multicurrency_unitprice   = $record["multicurrency_unitprice"];
+						$this->fourn_multicurrency_tx          = $record["multicurrency_tx"];
+						$this->fourn_multicurrency_id          = $record["fk_multicurrency"];
+						$this->fourn_multicurrency_code        = $record["multicurrency_code"];
+						$min = $fourn_unitprice;
+					}
+				}
+			}
 
-            $this->db->free($resql);
-            return 1;
-        } else {
-            $this->error = $this->db->error();
-            return -1;
-        }
-    }
+			$this->db->free($resql);
+			return 1;
+		} else {
+			$this->error = $this->db->error();
+			return -1;
+		}
+	}
 
-    /**
-     *  Sets the supplier price expression
-     *
-     *  @param  int     $expression_id	Expression
-     *  @return int                 	<0 if KO, >0 if OK
-     */
-    public function setSupplierPriceExpression($expression_id)
-    {
-        global $conf;
+	/**
+	 *  Sets the supplier price expression
+	 *
+	 *  @param  int     $expression_id	Expression
+	 *  @return int                 	<0 if KO, >0 if OK
+	 */
+	public function setSupplierPriceExpression($expression_id)
+	{
+		global $conf;
 
-        // Clean parameters
-        $this->db->begin();
-        $expression_id = $expression_id != 0 ? $expression_id : 'NULL';
+		// Clean parameters
+		$this->db->begin();
+		$expression_id = $expression_id != 0 ? $expression_id : 'NULL';
 
-        $sql = "UPDATE ".MAIN_DB_PREFIX."product_fournisseur_price";
-        $sql .= " SET fk_supplier_price_expression = ".$expression_id;
-        $sql .= " WHERE rowid = ".$this->product_fourn_price_id;
+		$sql = "UPDATE ".MAIN_DB_PREFIX."product_fournisseur_price";
+		$sql .= " SET fk_supplier_price_expression = ".$expression_id;
+		$sql .= " WHERE rowid = ".$this->product_fourn_price_id;
 
-        dol_syslog(get_class($this)."::setSupplierPriceExpression", LOG_DEBUG);
+		dol_syslog(get_class($this)."::setSupplierPriceExpression", LOG_DEBUG);
 
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            $this->db->commit();
-            return 1;
-        } else {
-            $this->error = $this->db->error()." sql=".$sql;
-            $this->db->rollback();
-            return -1;
-        }
-    }
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$this->db->commit();
+			return 1;
+		} else {
+			$this->error = $this->db->error()." sql=".$sql;
+			$this->db->rollback();
+			return -1;
+		}
+	}
 
-    /**
-     *	Display supplier of product
-     *
-     *	@param	int		$withpicto		Add picto
-     *	@param	string	$option			Target of link ('', 'customer', 'prospect', 'supplier')
-     *	@param	int		$maxlen			Max length of name
-     *  @param	integer	$notooltip		1=Disable tooltip
-     *	@return	string					String with supplier price
+	/**
+	 *	Display supplier of product
+	 *
+	 *	@param	int		$withpicto		Add picto
+	 *	@param	string	$option			Target of link ('', 'customer', 'prospect', 'supplier')
+	 *	@param	int		$maxlen			Max length of name
+	 *  @param	integer	$notooltip		1=Disable tooltip
+	 *	@return	string					String with supplier price
 	 *  TODO Remove this method. Use getNomUrl directly.
-     */
-    public function getSocNomUrl($withpicto = 0, $option = 'supplier', $maxlen = 0, $notooltip = 0)
-    {
-        $thirdparty = new Fournisseur($this->db);
-        $thirdparty->fetch($this->fourn_id);
+	 */
+	public function getSocNomUrl($withpicto = 0, $option = 'supplier', $maxlen = 0, $notooltip = 0)
+	{
+		$thirdparty = new Fournisseur($this->db);
+		$thirdparty->fetch($this->fourn_id);
 
-        return $thirdparty->getNomUrl($withpicto, $option, $maxlen, $notooltip);
-    }
+		return $thirdparty->getNomUrl($withpicto, $option, $maxlen, $notooltip);
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *	Display price of product
-     *
-     *  @param  int     $showunitprice    Show "Unit price" into output string
-     *  @param  int     $showsuptitle     Show "Supplier" into output string
-     *  @param  int     $maxlen           Max length of name
-     *  @param  integer $notooltip        1=Disable tooltip
-     *  @param  array   $productFournList list of ProductFournisseur objects
-     *                                    to display in table format.
-     *  @return string                    String with supplier price
-     */
-    public function display_price_product_fournisseur($showunitprice = 1, $showsuptitle = 1, $maxlen = 0, $notooltip = 0, $productFournList = array())
-    {
-        // phpcs:enable
-        global $langs;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *	Display price of product
+	 *
+	 *  @param  int     $showunitprice    Show "Unit price" into output string
+	 *  @param  int     $showsuptitle     Show "Supplier" into output string
+	 *  @param  int     $maxlen           Max length of name
+	 *  @param  integer $notooltip        1=Disable tooltip
+	 *  @param  array   $productFournList list of ProductFournisseur objects
+	 *                                    to display in table format.
+	 *  @return string                    String with supplier price
+	 */
+	public function display_price_product_fournisseur($showunitprice = 1, $showsuptitle = 1, $maxlen = 0, $notooltip = 0, $productFournList = array())
+	{
+		// phpcs:enable
+		global $langs;
 
-        $out = '';
-        $langs->load("suppliers");
-        if (count($productFournList) > 0) {
-            $out .= '<table class="nobordernopadding" width="100%">';
-            $out .= '<tr><td class="liste_titre right">'.($showunitprice ? $langs->trans("Price").' '.$langs->trans("HT") : '').'</td>';
-            $out .= '<td class="liste_titre right">'.($showunitprice ? $langs->trans("QtyMin") : '').'</td>';
-            $out .= '<td class="liste_titre">'.$langs->trans("Supplier").'</td>';
-            $out .= '<td class="liste_titre">'.$langs->trans("SupplierRef").'</td></tr>';
-            foreach ($productFournList as $productFourn) {
-                $out .= '<tr><td class="right">'.($showunitprice ?price($productFourn->fourn_unitprice * (1 - $productFourn->fourn_remise_percent / 100) - $productFourn->fourn_remise) : '').'</td>';
-                $out .= '<td class="right">'.($showunitprice ? $productFourn->fourn_qty : '').'</td>';
-                $out .= '<td>'.$productFourn->getSocNomUrl(1, 'supplier', $maxlen, $notooltip).'</td>';
-                $out .= '<td>'.$productFourn->fourn_ref.'<td></tr>';
-            }
-            $out .= '</table>';
-        } else {
-            $out = ($showunitprice ?price($this->fourn_unitprice * (1 - $this->fourn_remise_percent / 100) + $this->fourn_remise).' '.$langs->trans("HT").' &nbsp; (' : '').($showsuptitle ? $langs->trans("Supplier").': ' : '').$this->getSocNomUrl(1, 'supplier', $maxlen, $notooltip).' / '.$langs->trans("SupplierRef").': '.$this->fourn_ref.($showunitprice ? ')' : '');
-        }
-        return $out;
-    }
+		$out = '';
+		$langs->load("suppliers");
+		if (count($productFournList) > 0) {
+			$out .= '<table class="nobordernopadding" width="100%">';
+			$out .= '<tr><td class="liste_titre right">'.($showunitprice ? $langs->trans("Price").' '.$langs->trans("HT") : '').'</td>';
+			$out .= '<td class="liste_titre right">'.($showunitprice ? $langs->trans("QtyMin") : '').'</td>';
+			$out .= '<td class="liste_titre">'.$langs->trans("Supplier").'</td>';
+			$out .= '<td class="liste_titre">'.$langs->trans("SupplierRef").'</td></tr>';
+			foreach ($productFournList as $productFourn) {
+				$out .= '<tr><td class="right">'.($showunitprice ?price($productFourn->fourn_unitprice * (1 - $productFourn->fourn_remise_percent / 100) - $productFourn->fourn_remise) : '').'</td>';
+				$out .= '<td class="right">'.($showunitprice ? $productFourn->fourn_qty : '').'</td>';
+				$out .= '<td>'.$productFourn->getSocNomUrl(1, 'supplier', $maxlen, $notooltip).'</td>';
+				$out .= '<td>'.$productFourn->fourn_ref.'<td></tr>';
+			}
+			$out .= '</table>';
+		} else {
+			$out = ($showunitprice ?price($this->fourn_unitprice * (1 - $this->fourn_remise_percent / 100) + $this->fourn_remise).' '.$langs->trans("HT").' &nbsp; (' : '').($showsuptitle ? $langs->trans("Supplier").': ' : '').$this->getSocNomUrl(1, 'supplier', $maxlen, $notooltip).' / '.$langs->trans("SupplierRef").': '.$this->fourn_ref.($showunitprice ? ')' : '');
+		}
+		return $out;
+	}
 
-    /**
-     * Function used to replace a thirdparty id with another one.
-     *
-     * @param DoliDB $db Database handler
-     * @param int $origin_id Old thirdparty id
-     * @param int $dest_id New thirdparty id
-     * @return bool
-     */
-    public static function replaceThirdparty(DoliDB $db, $origin_id, $dest_id)
-    {
-        $tables = array(
-            'product_fournisseur_price'
-        );
+	/**
+	 * Function used to replace a thirdparty id with another one.
+	 *
+	 * @param DoliDB $db Database handler
+	 * @param int $origin_id Old thirdparty id
+	 * @param int $dest_id New thirdparty id
+	 * @return bool
+	 */
+	public static function replaceThirdparty(DoliDB $db, $origin_id, $dest_id)
+	{
+		$tables = array(
+			'product_fournisseur_price'
+		);
 
-        return CommonObject::commonReplaceThirdparty($db, $origin_id, $dest_id, $tables);
-    }
+		return CommonObject::commonReplaceThirdparty($db, $origin_id, $dest_id, $tables);
+	}
 
-    /**
-     *    List supplier prices log of a supplier price
-     *
-     *    @param    int     $product_fourn_price_id Id of supplier price
-     *    @param	string  $sortfield	            Sort field
-     *    @param	string  $sortorder              Sort order
-     *    @param	int     $limit                  Limit
-     *    @param	int     $offset                 Offset
-     *    @return	array   Array of Log prices
-     */
-    public function listProductFournisseurPriceLog($product_fourn_price_id, $sortfield = '', $sortorder = '', $limit = 0, $offset = 0)
-    {
-        $sql = "SELECT";
-        $sql .= " pfpl.rowid, pfp.ref_fourn as supplier_ref, pfpl.datec, u.lastname,";
-        $sql .= " pfpl.price, pfpl.quantity";
-        $sql .= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price_log as pfpl";
-        $sql .= ", ".MAIN_DB_PREFIX."product_fournisseur_price as pfp";
-        $sql .= ", ".MAIN_DB_PREFIX."user as u";
-        $sql .= " WHERE pfp.entity IN (".getEntity('productprice').")";
-        $sql .= " AND pfpl.fk_user = u.rowid";
-        $sql .= " AND pfp.rowid = pfpl.fk_product_fournisseur";
-        $sql .= " AND pfpl.fk_product_fournisseur = ".$product_fourn_price_id;
-        if (empty($sortfield)) $sql .= " ORDER BY pfpl.datec";
-        else $sql .= $this->db->order($sortfield, $sortorder);
-        $sql .= $this->db->plimit($limit, $offset);
-        dol_syslog(get_class($this)."::list_product_fournisseur_price_log", LOG_DEBUG);
+	/**
+	 *    List supplier prices log of a supplier price
+	 *
+	 *    @param    int     $product_fourn_price_id Id of supplier price
+	 *    @param	string  $sortfield	            Sort field
+	 *    @param	string  $sortorder              Sort order
+	 *    @param	int     $limit                  Limit
+	 *    @param	int     $offset                 Offset
+	 *    @return	array   Array of Log prices
+	 */
+	public function listProductFournisseurPriceLog($product_fourn_price_id, $sortfield = '', $sortorder = '', $limit = 0, $offset = 0)
+	{
+		$sql = "SELECT";
+		$sql .= " pfpl.rowid, pfp.ref_fourn as supplier_ref, pfpl.datec, u.lastname,";
+		$sql .= " pfpl.price, pfpl.quantity";
+		$sql .= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price_log as pfpl";
+		$sql .= ", ".MAIN_DB_PREFIX."product_fournisseur_price as pfp";
+		$sql .= ", ".MAIN_DB_PREFIX."user as u";
+		$sql .= " WHERE pfp.entity IN (".getEntity('productprice').")";
+		$sql .= " AND pfpl.fk_user = u.rowid";
+		$sql .= " AND pfp.rowid = pfpl.fk_product_fournisseur";
+		$sql .= " AND pfpl.fk_product_fournisseur = ".$product_fourn_price_id;
+		if (empty($sortfield)) $sql .= " ORDER BY pfpl.datec";
+		else $sql .= $this->db->order($sortfield, $sortorder);
+		$sql .= $this->db->plimit($limit, $offset);
+		dol_syslog(get_class($this)."::list_product_fournisseur_price_log", LOG_DEBUG);
 
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            $retarray = array();
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$retarray = array();
 
-            while ($obj = $this->db->fetch_object($resql))
-            {
-                $tmparray = array();
-                $tmparray['rowid'] = $obj->rowid;
-                $tmparray['supplier_ref'] = $obj->supplier_ref;
-                $tmparray['datec'] = $this->db->jdate($obj->datec);
-                $tmparray['lastname'] = $obj->lastname;
-                $tmparray['price'] = $obj->price;
-                $tmparray['quantity'] = $obj->quantity;
+			while ($obj = $this->db->fetch_object($resql))
+			{
+				$tmparray = array();
+				$tmparray['rowid'] = $obj->rowid;
+				$tmparray['supplier_ref'] = $obj->supplier_ref;
+				$tmparray['datec'] = $this->db->jdate($obj->datec);
+				$tmparray['lastname'] = $obj->lastname;
+				$tmparray['price'] = $obj->price;
+				$tmparray['quantity'] = $obj->quantity;
 
-            	$retarray[] = $tmparray;
-            }
+				$retarray[] = $tmparray;
+			}
 
-            $this->db->free($resql);
-            return $retarray;
-        } else {
-            $this->error = $this->db->error();
-            return -1;
-        }
-    }
+			$this->db->free($resql);
+			return $retarray;
+		} else {
+			$this->error = $this->db->error();
+			return -1;
+		}
+	}
 
-    /**
-     *	Display log price of product supplier price
-     *
-     *  @param  array   $productFournLogList    list of ProductFournisseur price log objects
-     *                                          to display in table format.
-     *  @return string  HTML String with supplier price
-     */
-    public function displayPriceProductFournisseurLog($productFournLogList = array())
-    {
-        global $langs;
+	/**
+	 *	Display log price of product supplier price
+	 *
+	 *  @param  array   $productFournLogList    list of ProductFournisseur price log objects
+	 *                                          to display in table format.
+	 *  @return string  HTML String with supplier price
+	 */
+	public function displayPriceProductFournisseurLog($productFournLogList = array())
+	{
+		global $langs;
 
-        $out = '';
-        $langs->load("suppliers");
-        if (count($productFournLogList) > 0) {
-            $out .= '<table class="nobordernopadding" width="100%">';
-            $out .= '<tr class="liste_titre"><td class="liste_titre">'.$langs->trans("Date").'</td>';
-            $out .= '<td class="liste_titre right">'.$langs->trans("Price").'</td>';
-            //$out .= '<td class="liste_titre right">'.$langs->trans("QtyMin").'</td>';
-            $out .= '<td class="liste_titre">'.$langs->trans("User").'</td></tr>';
-            foreach ($productFournLogList as $productFournLog) {
-                $out .= '<tr><td class="right">'.dol_print_date($productFournLog['datec'], 'dayhour', 'tzuser').'</td>';
-                $out .= '<td class="right">'.price($productFournLog['price']).'</td>';
-                //$out.= '<td class="right">'.$productFournLog['quantity'].'</td>';
-                $out .= '<td>'.$productFournLog['lastname'].'</td></tr>';
-            }
-            $out .= '</table>';
-        }
-        return $out;
-    }
+		$out = '';
+		$langs->load("suppliers");
+		if (count($productFournLogList) > 0) {
+			$out .= '<table class="nobordernopadding" width="100%">';
+			$out .= '<tr class="liste_titre"><td class="liste_titre">'.$langs->trans("Date").'</td>';
+			$out .= '<td class="liste_titre right">'.$langs->trans("Price").'</td>';
+			//$out .= '<td class="liste_titre right">'.$langs->trans("QtyMin").'</td>';
+			$out .= '<td class="liste_titre">'.$langs->trans("User").'</td></tr>';
+			foreach ($productFournLogList as $productFournLog) {
+				$out .= '<tr><td class="right">'.dol_print_date($productFournLog['datec'], 'dayhour', 'tzuser').'</td>';
+				$out .= '<td class="right">'.price($productFournLog['price']).'</td>';
+				//$out.= '<td class="right">'.$productFournLog['quantity'].'</td>';
+				$out .= '<td>'.$productFournLog['lastname'].'</td></tr>';
+			}
+			$out .= '</table>';
+		}
+		return $out;
+	}
 
 
-    /**
-     *  Return a link to the object card (with optionaly the picto).
-     *  Used getNomUrl of ProductFournisseur if a specific supplier ref is loaded. Otherwise use Product->getNomUrl().
-     *
-     *	@param	int		$withpicto					Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
-     *	@param	string	$option						On what the link point to ('nolink', ...)
-     *  @param	int  	$notooltip					1=Disable tooltip
-     *  @param  string  $morecss            		Add more css on link
-     *  @param  int     $save_lastsearch_value    	-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
-     *	@return	string								String with URL
-     */
-    public function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $morecss = '', $save_lastsearch_value = -1)
-    {
-        global $db, $conf, $langs;
+	/**
+	 *  Return a link to the object card (with optionaly the picto).
+	 *  Used getNomUrl of ProductFournisseur if a specific supplier ref is loaded. Otherwise use Product->getNomUrl().
+	 *
+	 *	@param	int		$withpicto					Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
+	 *	@param	string	$option						On what the link point to ('nolink', ...)
+	 *  @param	int  	$notooltip					1=Disable tooltip
+	 *  @param  string  $morecss            		Add more css on link
+	 *  @param  int     $save_lastsearch_value    	-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+	 *	@return	string								String with URL
+	 */
+	public function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $morecss = '', $save_lastsearch_value = -1)
+	{
+		global $db, $conf, $langs;
 
-        if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
+		if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
 
-        $result = '';
+		$result = '';
 
-        $label = '<u>'.$langs->trans("SupplierRef").'</u>';
-        $label .= '<br>';
-        $label .= '<b>'.$langs->trans('Product').':</b> '.$this->ref;
-        $label .= '<br><b>'.$langs->trans('RefSupplier').':</b> '.$this->ref_supplier;
+		$label = '<u>'.$langs->trans("SupplierRef").'</u>';
+		$label .= '<br>';
+		$label .= '<b>'.$langs->trans('Product').':</b> '.$this->ref;
+		$label .= '<br><b>'.$langs->trans('RefSupplier').':</b> '.$this->ref_supplier;
 
-        $logPrices = $this->listProductFournisseurPriceLog($this->product_fourn_price_id, 'pfpl.datec', 'DESC'); // set sort order here
-        if (is_array($logPrices) && count($logPrices) > 0) {
-            $label .= '<br><br>';
-            $label .= '<u>'.$langs->trans("History").'</u>';
-            $label .= $this->displayPriceProductFournisseurLog($logPrices);
-        }
+		$logPrices = $this->listProductFournisseurPriceLog($this->product_fourn_price_id, 'pfpl.datec', 'DESC'); // set sort order here
+		if (is_array($logPrices) && count($logPrices) > 0) {
+			$label .= '<br><br>';
+			$label .= '<u>'.$langs->trans("History").'</u>';
+			$label .= $this->displayPriceProductFournisseurLog($logPrices);
+		}
 
-        $url = dol_buildpath('/product/fournisseurs.php', 1).'?id='.$this->id.'&action=add_price&socid='.$this->fourn_id.'&rowid='.$this->product_fourn_price_id;
+		$url = dol_buildpath('/product/fournisseurs.php', 1).'?id='.$this->id.'&action=add_price&socid='.$this->fourn_id.'&rowid='.$this->product_fourn_price_id;
 
-        if ($option != 'nolink')
-        {
-            // Add param to save lastsearch_values or not
-            $add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
-            if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
-            if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
-        }
+		if ($option != 'nolink')
+		{
+			// Add param to save lastsearch_values or not
+			$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
+			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
+			if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
+		}
 
-        $linkclose = '';
-        if (empty($notooltip))
-        {
-            if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-            {
-                $label = $langs->trans("SupplierRef");
-                $linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
-            }
-            $linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
-            $linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
-        } else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+		$linkclose = '';
+		if (empty($notooltip))
+		{
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+			{
+				$label = $langs->trans("SupplierRef");
+				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
+			}
+			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
+			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
+		} else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
-        $linkstart = '<a href="'.$url.'"';
-        $linkstart .= $linkclose.'>';
-        $linkend = '</a>';
+		$linkstart = '<a href="'.$url.'"';
+		$linkstart .= $linkclose.'>';
+		$linkend = '</a>';
 
-        $result .= $linkstart;
-        if ($withpicto) $result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
-        if ($withpicto != 2) $result .= $this->ref.($this->ref_supplier ? ' ('.$this->ref_supplier.')' : '');
-        $result .= $linkend;
-        //if ($withpicto != 2) $result.=(($addlabel && $this->label) ? $sep . dol_trunc($this->label, ($addlabel > 1 ? $addlabel : 0)) : '');
+		$result .= $linkstart;
+		if ($withpicto) $result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+		if ($withpicto != 2) $result .= $this->ref.($this->ref_supplier ? ' ('.$this->ref_supplier.')' : '');
+		$result .= $linkend;
+		//if ($withpicto != 2) $result.=(($addlabel && $this->label) ? $sep . dol_trunc($this->label, ($addlabel > 1 ? $addlabel : 0)) : '');
 
-        return $result;
-    }
+		return $result;
+	}
 
-    /**
-     * Private function to log price history
-     *
-     * @param User      $user                           Object user who adds/changes price
-     * @param integer   $datec                          date create
-     * @param float     $buyprice                       price for qty
-     * @param float     $qty                            qty for price
-     * @param float     $multicurrency_buyprice         Purchase price for the quantity min in currency
-     * @param float     $multicurrency_unitBuyPrice     Unit Purchase price in currency
-     * @param float     $multicurrency_tx               Rate currency
-     * @param int       $fk_multicurrency               key multi currency
-     * @param string    $multicurrency_code	            Currency code
-     *
-     * @return int < 0 NOK > 0 OK
-     */
-    private function logPrice($user, $datec, $buyprice, $qty, $multicurrency_buyprice = null, $multicurrency_unitBuyPrice = null, $multicurrency_tx = null, $fk_multicurrency = null, $multicurrency_code = null)
-    {
-        // Add record into log table
-        $sql = "INSERT INTO ".MAIN_DB_PREFIX."product_fournisseur_price_log(";
-        $sql .= " multicurrency_price, multicurrency_unitprice, multicurrency_tx, fk_multicurrency, multicurrency_code,";
-        $sql .= "datec, fk_product_fournisseur,fk_user,price,quantity)";
-        $sql .= "values(";
-        $sql .= (isset($multicurrency_buyprice) ? "'".$this->db->escape(price2num($multicurrency_buyprice))."'" : 'null').",";
-        $sql .= (isset($multicurrency_unitBuyPrice) ? "'".$this->db->escape(price2num($multicurrency_unitBuyPrice))."'" : 'null').",";
-        $sql .= (isset($multicurrency_tx) ? "'".$this->db->escape($multicurrency_tx)."'" : '1').",";
-        $sql .= (isset($fk_multicurrency) ? "'".$this->db->escape($fk_multicurrency)."'" : 'null').",";
-        $sql .= (isset($multicurrency_code) ? "'".$this->db->escape($multicurrency_code)."'" : 'null').",";
-        $sql .= "'".$this->db->idate($datec)."',";
-        $sql .= " ".$this->product_fourn_price_id.",";
-        $sql .= " ".$user->id.",";
-        $sql .= " ".price2num($buyprice).",";
-        $sql .= " ".$qty;
-        $sql .= ")";
+	/**
+	 * Private function to log price history
+	 *
+	 * @param User      $user                           Object user who adds/changes price
+	 * @param integer   $datec                          date create
+	 * @param float     $buyprice                       price for qty
+	 * @param float     $qty                            qty for price
+	 * @param float     $multicurrency_buyprice         Purchase price for the quantity min in currency
+	 * @param float     $multicurrency_unitBuyPrice     Unit Purchase price in currency
+	 * @param float     $multicurrency_tx               Rate currency
+	 * @param int       $fk_multicurrency               key multi currency
+	 * @param string    $multicurrency_code	            Currency code
+	 *
+	 * @return int < 0 NOK > 0 OK
+	 */
+	private function logPrice($user, $datec, $buyprice, $qty, $multicurrency_buyprice = null, $multicurrency_unitBuyPrice = null, $multicurrency_tx = null, $fk_multicurrency = null, $multicurrency_code = null)
+	{
+		// Add record into log table
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."product_fournisseur_price_log(";
+		$sql .= " multicurrency_price, multicurrency_unitprice, multicurrency_tx, fk_multicurrency, multicurrency_code,";
+		$sql .= "datec, fk_product_fournisseur,fk_user,price,quantity)";
+		$sql .= "values(";
+		$sql .= (isset($multicurrency_buyprice) ? "'".$this->db->escape(price2num($multicurrency_buyprice))."'" : 'null').",";
+		$sql .= (isset($multicurrency_unitBuyPrice) ? "'".$this->db->escape(price2num($multicurrency_unitBuyPrice))."'" : 'null').",";
+		$sql .= (isset($multicurrency_tx) ? "'".$this->db->escape($multicurrency_tx)."'" : '1').",";
+		$sql .= (isset($fk_multicurrency) ? "'".$this->db->escape($fk_multicurrency)."'" : 'null').",";
+		$sql .= (isset($multicurrency_code) ? "'".$this->db->escape($multicurrency_code)."'" : 'null').",";
+		$sql .= "'".$this->db->idate($datec)."',";
+		$sql .= " ".$this->product_fourn_price_id.",";
+		$sql .= " ".$user->id.",";
+		$sql .= " ".price2num($buyprice).",";
+		$sql .= " ".$qty;
+		$sql .= ")";
 
-        $resql = $this->db->query($sql);
-        if (!$resql) {
-            return -1;
-        } else {
-            return 1;
-        }
-    }
+		$resql = $this->db->query($sql);
+		if (!$resql) {
+			return -1;
+		} else {
+			return 1;
+		}
+	}
 }
diff --git a/htdocs/fourn/class/paiementfourn.class.php b/htdocs/fourn/class/paiementfourn.class.php
index 67133ed97b2..8689801e543 100644
--- a/htdocs/fourn/class/paiementfourn.class.php
+++ b/htdocs/fourn/class/paiementfourn.class.php
@@ -123,7 +123,7 @@ class PaiementFourn extends Paiement
 				$this->bank_account   = $obj->fk_account;
 				$this->fk_account     = $obj->fk_account;
 				$this->bank_line      = $obj->fk_bank;
-				$this->montant        = $obj->amount;		// deprecated
+				$this->montant        = $obj->amount; // deprecated
 				$this->amount         = $obj->amount;
 				$this->multicurrency_amount = $obj->multicurrency_amount;
 				$this->note           = $obj->note;
@@ -176,7 +176,7 @@ class PaiementFourn extends Paiement
 
 		foreach ($amounts as $key => $value)
 		{
-			$value_converted = Multicurrency::getAmountConversionFromInvoiceRate($key, $value? $value : 0, $way, 'facture_fourn');
+			$value_converted = Multicurrency::getAmountConversionFromInvoiceRate($key, $value ? $value : 0, $way, 'facture_fourn');
 			$totalamount_converted += $value_converted;
 			$amounts_to_update[$key] = price2num($value_converted, 'MT');
 
@@ -191,7 +191,7 @@ class PaiementFourn extends Paiement
 
 		if ($totalamount <> 0) // On accepte les montants negatifs
 		{
-		    $ref = $this->getNextNumRef(is_object($thirdparty) ? $thirdparty : '');
+			$ref = $this->getNextNumRef(is_object($thirdparty) ? $thirdparty : '');
 			$now = dol_now();
 
 			if ($way == 'dolibarr')
@@ -247,8 +247,8 @@ class PaiementFourn extends Paiement
 							// Regenerate documents of invoices
 							if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
 							{
-							    $newlang = '';
-							    $outputlangs = $langs;
+								$newlang = '';
+								$outputlangs = $langs;
 								if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $invoice->thirdparty->default_lang;
 								if (!empty($newlang)) {
 									$outputlangs = new Translate("", $conf);
@@ -491,7 +491,7 @@ class PaiementFourn extends Paiement
 		return $this->LibStatut($this->statut, $mode);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Renvoi le libelle d'un statut donne
 	 *
@@ -501,7 +501,7 @@ class PaiementFourn extends Paiement
 	 */
 	public function LibStatut($status, $mode = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 
 		$langs->load('compta');
@@ -550,7 +550,7 @@ class PaiementFourn extends Paiement
 	 *	@param		int		$withpicto		0=No picto, 1=Include picto into link, 2=Only picto
 	 *	@param		string	$option			Sur quoi pointe le lien
 	 *  @param		string  $mode           'withlistofinvoices'=Include list of invoices into tooltip
-     *  @param		int  	$notooltip		1=Disable tooltip
+	 *  @param		int  	$notooltip		1=Disable tooltip
 	 *	@return		string					Chaine avec URL
 	 */
 	public function getNomUrl($withpicto = 0, $option = '', $mode = 'withlistofinvoices', $notooltip = 0)
@@ -695,7 +695,7 @@ class PaiementFourn extends Paiement
 	 *  @param      int			$hidedetails    Hide details of lines
 	 *  @param      int			$hidedesc       Hide description
 	 *  @param      int			$hideref        Hide ref
-         *  @param   null|array  $moreparams     Array to provide more information
+	 *  @param   null|array  $moreparams     Array to provide more information
 	 *  @return     int         				<0 if KO, 0 if nothing done, >0 if OK
 	 */
 	public function generateDocument($modele, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0, $moreparams = null)
@@ -753,7 +753,7 @@ class PaiementFourn extends Paiement
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Load the third party of object, from id into this->thirdparty
 	 *
@@ -762,7 +762,7 @@ class PaiementFourn extends Paiement
 	 */
 	public function fetch_thirdparty($force_thirdparty_id = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
 
 		if (empty($force_thirdparty_id))
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index 524d67e55b9..b5a0111e4f4 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -110,7 +110,7 @@ if ($id > 0 || !empty($ref))
 }
 
 // Common permissions
-$usercanread			= $user->rights->fournisseur->commande->lire;
+$usercanread = $user->rights->fournisseur->commande->lire;
 $usercancreate			= $user->rights->fournisseur->commande->creer;
 $usercandelete			= $user->rights->fournisseur->commande->supprimer;
 
@@ -119,14 +119,14 @@ $usercanvalidate		= ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($u
 
 // Additional area permissions
 $usercanapprove			= $user->rights->fournisseur->commande->approuver;
-$usercanapprovesecond	= $user->rights->fournisseur->commande->approve2;
-$usercanorder			= $user->rights->fournisseur->commande->commander;
+$usercanapprovesecond = $user->rights->fournisseur->commande->approve2;
+$usercanorder = $user->rights->fournisseur->commande->commander;
 $usercanreceived		= $user->rights->fournisseur->commande->receptionner;
 
 // Permissions for includes
 $permissionnote			= $usercancreate; // Used by the include of actions_setnotes.inc.php
-$permissiondellink		= $usercancreate; // Used by the include of actions_dellink.inc.php
-$permissiontoedit		= $usercancreate; // Used by the include of actions_lineupdown.inc.php
+$permissiondellink = $usercancreate; // Used by the include of actions_dellink.inc.php
+$permissiontoedit = $usercancreate; // Used by the include of actions_lineupdown.inc.php
 $permissiontoadd		= $usercancreate; // Used by the include of actions_addupdatedelete.inc.php
 
 
@@ -872,7 +872,7 @@ if (empty($reshook))
 			$action = 'confirm_approve'; // can make standard or first level approval also if permission is set
 		}
 
-		if (! $error) {
+		if (!$error) {
 			$db->commit();
 		} else {
 			$db->rollback();
@@ -1059,7 +1059,7 @@ if (empty($reshook))
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Delivery")), null, 'errors');
 		}
 
-		if (! $error) {
+		if (!$error) {
 			$db->commit();
 		} else {
 			$db->rollback();
@@ -1684,8 +1684,8 @@ if ($action == 'create')
 	// Incoterms
 	if (!empty($conf->incoterm->enabled))
 	{
-        $fkincoterms = (!empty($object->fk_incoterms) ? $object->fk_incoterms : ($socid > 0 ? $societe->fk_incoterms : ''));
-        $locincoterms = (!empty($object->location_incoterms) ? $object->location_incoterms : ($socid > 0 ? $societe->location_incoterms : ''));
+		$fkincoterms = (!empty($object->fk_incoterms) ? $object->fk_incoterms : ($socid > 0 ? $societe->fk_incoterms : ''));
+		$locincoterms = (!empty($object->location_incoterms) ? $object->location_incoterms : ($socid > 0 ? $societe->location_incoterms : ''));
 		print '<tr>';
 		print '<td><label for="incoterm_id">'.$form->textwithpicto($langs->trans("IncotermLabel"), $object->label_incoterms, 1).'</label></td>';
 		print '<td class="maxwidthonsmartphone">';
@@ -1765,7 +1765,7 @@ if ($action == 'create')
 	// Bouton "Create Draft"
 	print "</table>\n";
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div class="center">';
 	print '<input type="submit" class="button" name="bouton" value="'.$langs->trans('CreateDraft').'">';
@@ -2339,7 +2339,7 @@ if ($action == 'create')
 	print '</div>';
 	print '</form>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	/**
 	 * Boutons actions
diff --git a/htdocs/fourn/commande/contact.php b/htdocs/fourn/commande/contact.php
index 45178a656ba..08a40ad52b8 100644
--- a/htdocs/fourn/commande/contact.php
+++ b/htdocs/fourn/commande/contact.php
@@ -55,11 +55,11 @@ if ($action == 'addcontact' && $user->rights->fournisseur->commande->creer)
 {
 	$result = $object->fetch($id);
 
-    if ($result > 0 && $id > 0)
-    {
-    	$contactid = (GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid'));
+	if ($result > 0 && $id > 0)
+	{
+		$contactid = (GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid'));
   		$result = $object->add_contact($contactid, $_POST["type"], $_POST["source"]);
-    }
+	}
 
 	if ($result >= 0)
 	{
@@ -81,7 +81,7 @@ elseif ($action == 'swapstatut' && $user->rights->fournisseur->commande->creer)
 {
 	if ($object->fetch($id))
 	{
-	    $result = $object->swapContactStatus(GETPOST('ligne'));
+		$result = $object->swapContactStatus(GETPOST('ligne'));
 	} else {
 		dol_print_error($db);
 	}
@@ -146,43 +146,43 @@ if ($id > 0 || !empty($ref))
 		// Project
 		if (!empty($conf->projet->enabled))
 		{
-		    $langs->load("projects");
-		    $morehtmlref .= '<br>'.$langs->trans('Project').' ';
-		    if ($user->rights->fournisseur->commande->creer)
-		    {
-		        if ($action != 'classify') {
-		        	//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+			$langs->load("projects");
+			$morehtmlref .= '<br>'.$langs->trans('Project').' ';
+			if ($user->rights->fournisseur->commande->creer)
+			{
+				if ($action != 'classify') {
+					//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
 					$morehtmlref .= ' : ';
-                }
-	        	if ($action == 'classify') {
-	                //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-	                $morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-	                $morehtmlref .= '<input type="hidden" name="action" value="classin">';
-	                $morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
-	                $morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-	                $morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-	                $morehtmlref .= '</form>';
-	            } else {
-	                $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-	            }
-		    } else {
-		        if (!empty($object->fk_project)) {
-		            $proj = new Project($db);
-		            $proj->fetch($object->fk_project);
-		            $morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
-		            $morehtmlref .= $proj->ref;
-		            $morehtmlref .= '</a>';
-		        } else {
-		            $morehtmlref .= '';
-		        }
-		    }
+				}
+				if ($action == 'classify') {
+					//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+					$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+					$morehtmlref .= '<input type="hidden" name="action" value="classin">';
+					$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
+					$morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+					$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+					$morehtmlref .= '</form>';
+				} else {
+					$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+				}
+			} else {
+				if (!empty($object->fk_project)) {
+					$proj = new Project($db);
+					$proj->fetch($object->fk_project);
+					$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
+					$morehtmlref .= $proj->ref;
+					$morehtmlref .= '</a>';
+				} else {
+					$morehtmlref .= '';
+				}
+			}
 		}
 		$morehtmlref .= '</div>';
 
 
 		dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '', 0, '', '', 1);
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 		// Contacts lines
 		include DOL_DOCUMENT_ROOT.'/core/tpl/contacts.tpl.php';
diff --git a/htdocs/fourn/commande/dispatch.php b/htdocs/fourn/commande/dispatch.php
index 6f6678b57de..a924ca03270 100644
--- a/htdocs/fourn/commande/dispatch.php
+++ b/htdocs/fourn/commande/dispatch.php
@@ -38,7 +38,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.dispatch.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
-require_once DOL_DOCUMENT_ROOT . '/product/stock/class/mouvementstock.class.php';
+require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
 
 if (!empty($conf->projet->enabled))
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
@@ -276,7 +276,7 @@ if ($action == 'dispatch' && $user->rights->fournisseur->commande->receptionner)
 								$sql = "UPDATE ".MAIN_DB_PREFIX."product_fournisseur_price";
 								$sql .= " SET unitprice='".GETPOST($pu)."'";
 								$sql .= ", price=".GETPOST($pu)."*quantity";
-								$sql .= ", remise_percent='".(!empty($dto)?$dto:0)."'";
+								$sql .= ", remise_percent='".(!empty($dto) ? $dto : 0)."'";
 								$sql .= " WHERE fk_soc=".$object->socid;
 								$sql .= " AND fk_product=".GETPOST($prod, 'int');
 
@@ -348,7 +348,7 @@ if ($action == 'dispatch' && $user->rights->fournisseur->commande->receptionner)
 								$sql = "UPDATE ".MAIN_DB_PREFIX."product_fournisseur_price";
 								$sql .= " SET unitprice='".GETPOST($pu)."'";
 								$sql .= ", price=".GETPOST($pu)."*quantity";
-								$sql .= ", remise_percent='".(!empty($dto)?$dto:0)."'";
+								$sql .= ", remise_percent='".(!empty($dto) ? $dto : 0)."'";
 								$sql .= " WHERE fk_soc=".$object->socid;
 								$sql .= " AND fk_product=".GETPOST($prod, 'int');
 
@@ -419,16 +419,16 @@ if ($action == 'confirm_deleteline' && $confirm == 'yes' && $user->rights->fourn
 	}
 	else {
 		// If module stock is enabled and the stock increase is done on purchase order dispatching
-		if ($entrepot > 0 && ! empty($conf->stock->enabled) && ! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER))
+		if ($entrepot > 0 && !empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER))
 		{
 			$mouv = new MouvementStock($db);
 			if ($product > 0)
 			{
 				$mouv->origin = &$object;
-				$result=$mouv->livraison($user, $product, $entrepot, $qty, $price, $comment, '', $eatby, $sellby, $batch);
+				$result = $mouv->livraison($user, $product, $entrepot, $qty, $price, $comment, '', $eatby, $sellby, $batch);
 				if ($result < 0)
 				{
-					$errors=$mouv->errors;
+					$errors = $mouv->errors;
 					$error++;
 				}
 			}
@@ -470,28 +470,28 @@ if ($action == 'updateline' && $user->rights->fournisseur->commande->receptionne
 	if ($result < 0)
 	{
 		$error++;
-		$errors=$supplierorderdispatch->errors;
+		$errors = $supplierorderdispatch->errors;
 	}
 	else {
 		// If module stock is enabled and the stock increase is done on purchase order dispatching
-		if ($entrepot > 0 && ! empty($conf->stock->enabled) && ! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER))
+		if ($entrepot > 0 && !empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER))
 		{
 			$mouv = new MouvementStock($db);
 			if ($product > 0)
 			{
 				$mouv->origin = &$object;
-				$result=$mouv->livraison($user, $product, $entrepot, $qty, $price, $comment, '', $eatby, $sellby, $batch);
+				$result = $mouv->livraison($user, $product, $entrepot, $qty, $price, $comment, '', $eatby, $sellby, $batch);
 				if ($result < 0)
 				{
-					$errors=$mouv->errors;
+					$errors = $mouv->errors;
 					$error++;
 				}
 				else {
 					$mouv->origin = &$object;
-					$result=$mouv->reception($user, $product, $supplierorderdispatch->fk_entrepot, $supplierorderdispatch->qty, $price, $comment, $eatby, $sellby, $batch);
+					$result = $mouv->reception($user, $product, $supplierorderdispatch->fk_entrepot, $supplierorderdispatch->qty, $price, $comment, $eatby, $sellby, $batch);
 					if ($result < 0)
 					{
-						$errors=$mouv->errors;
+						$errors = $mouv->errors;
 						$error++;
 					}
 				}
@@ -534,20 +534,20 @@ if ($id > 0 || !empty($ref)) {
 	$title = $langs->trans("SupplierOrder");
 	print dol_get_fiche_head($head, 'dispatch', $title, -1, 'order');
 
-	$formconfirm='';
+	$formconfirm = '';
 
 	// Confirmation to delete line
 	if ($action == 'ask_deleteline')
 	{
-		$formconfirm=$form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&lineid='.$lineid, $langs->trans('DeleteLine'), $langs->trans('ConfirmDeleteLine'), 'confirm_deleteline', '', 0, 1);
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&lineid='.$lineid, $langs->trans('DeleteLine'), $langs->trans('ConfirmDeleteLine'), 'confirm_deleteline', '', 0, 1);
 	}
 
 	// Call Hook formConfirm
 	$parameters = array('lineid' => $lineid);
 	// Note that $action and $object may be modified by hook
 	$reshook = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action);
-	if (empty($reshook)) $formconfirm.=$hookmanager->resPrint;
-	elseif ($reshook > 0) $formconfirm=$hookmanager->resPrint;
+	if (empty($reshook)) $formconfirm .= $hookmanager->resPrint;
+	elseif ($reshook > 0) $formconfirm = $hookmanager->resPrint;
 
 	// Print form confirm
 	print $formconfirm;
@@ -652,7 +652,7 @@ if ($id > 0 || !empty($ref)) {
 		$formproduct = new FormProduct($db);
 		$formproduct->loadWarehouses();
 		$entrepot = new Entrepot($db);
-		$listwarehouses=$entrepot->list_array(1);
+		$listwarehouses = $entrepot->list_array(1);
 
 
 		if (empty($conf->reception->enabled))print '<form method="POST" action="dispatch.php?id='.$object->id.'">';
@@ -910,8 +910,8 @@ if ($id > 0 || !empty($ref)) {
 							print '</td>';
 							if (empty($conf->global->PRODUCT_DISABLE_EATBY)) {
 								print '<td class="nowraponall">';
-								$dlcdatesuffix = dol_mktime(0, 0, 0, GETPOST('dlc' . $suffix . 'month'), GETPOST('dlc' . $suffix . 'day'), GETPOST('dlc' . $suffix . 'year'));
-								print $form->selectDate($dlcdatesuffix, 'dlc' . $suffix, '', '', 1, '');
+								$dlcdatesuffix = dol_mktime(0, 0, 0, GETPOST('dlc'.$suffix.'month'), GETPOST('dlc'.$suffix.'day'), GETPOST('dlc'.$suffix.'year'));
+								print $form->selectDate($dlcdatesuffix, 'dlc'.$suffix, '', '', 1, '');
 								print '</td>';
 							}
 							if (empty($conf->global->PRODUCT_DISABLE_EATBY)) {
@@ -991,7 +991,7 @@ if ($id > 0 || !empty($ref)) {
 
 								// Discount
 								print '<td class="right">';
-								print '<input id="dto' . $suffix . '" name="dto' . $suffix . '" type="text" size="8" value="' . (GETPOST('dto' . $suffix) != '' ? GETPOST('dto' . $suffix) : '') . '">';
+								print '<input id="dto'.$suffix.'" name="dto'.$suffix.'" type="text" size="8" value="'.(GETPOST('dto'.$suffix) != '' ? GETPOST('dto'.$suffix) : '').'">';
 								print '</td>';
 
 								// Save price
@@ -1080,7 +1080,7 @@ if ($id > 0 || !empty($ref)) {
 		print '</form>';
 	}
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	// traitement entrepot par défaut
 	print '<script type="text/javascript">
@@ -1105,11 +1105,11 @@ if ($id > 0 || !empty($ref)) {
 	$sql = "SELECT p.rowid as pid, p.ref, p.label,";
 	$sql .= " e.rowid as warehouse_id, e.ref as entrepot,";
 	$sql .= " cfd.rowid as dispatchlineid, cfd.fk_product, cfd.qty, cfd.eatby, cfd.sellby, cfd.batch, cfd.comment, cfd.status, cfd.datec";
-	$sql.=" ,cd.rowid, cd.subprice";
+	$sql .= " ,cd.rowid, cd.subprice";
 	if ($conf->reception->enabled)$sql .= " ,cfd.fk_reception, r.date_delivery";
 	$sql .= " FROM ".MAIN_DB_PREFIX."product as p,";
 	$sql .= " ".MAIN_DB_PREFIX."commande_fournisseur_dispatch as cfd";
-	$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "commande_fournisseurdet as cd ON cd.rowid = cfd.fk_commandefourndet";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."commande_fournisseurdet as cd ON cd.rowid = cfd.fk_commandefourndet";
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."entrepot as e ON cfd.fk_entrepot = e.rowid";
 	if ($conf->reception->enabled)$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."reception as r ON cfd.fk_reception = r.rowid";
 	$sql .= " WHERE cfd.fk_commande = ".$object->id;
@@ -1138,10 +1138,10 @@ if ($id > 0 || !empty($ref)) {
 			if (!empty($conf->productbatch->enabled)) {
 				print '<td class="dispatch_batch_number_title">'.$langs->trans("batch_number").'</td>';
 				if (empty($conf->global->PRODUCT_DISABLE_EATBY)) {
-					print '<td class="dispatch_dluo_title">' . $langs->trans("EatByDate") . '</td>';
+					print '<td class="dispatch_dluo_title">'.$langs->trans("EatByDate").'</td>';
 				}
 				if (empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
-					print '<td class="dispatch_dlc_title">' . $langs->trans("SellByDate") . '</td>';
+					print '<td class="dispatch_dlc_title">'.$langs->trans("SellByDate").'</td>';
 				}
 			}
 			print '<td class="right">'.$langs->trans("QtyDispatched").'</td>';
@@ -1164,7 +1164,7 @@ if ($id > 0 || !empty($ref)) {
 
 				if ($action == 'editline' && $lineid == $objp->dispatchlineid)
 				{
-					print '<form name="editdispatchedlines" id="editdispatchedlines" action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '#line_' . GETPOST('lineid') . '" method="POST">
+					print '<form name="editdispatchedlines" id="editdispatchedlines" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'#line_'.GETPOST('lineid').'" method="POST">
 					<input type="hidden" name="token" value="'.newToken().'">
 					<input type="hidden" name="action" value="updateline">
 					<input type="hidden" name="mode" value="">
@@ -1194,14 +1194,14 @@ if ($id > 0 || !empty($ref)) {
 				if (!empty($conf->productbatch->enabled)) {
 					if ($objp->batch) {
 						include_once DOL_DOCUMENT_ROOT.'/product/stock/class/productlot.class.php';
-						$lot=new Productlot($db);
+						$lot = new Productlot($db);
 						$lot->fetch(0, $objp->pid, $objp->batch);
 						print '<td class="dispatch_batch_number">'.$lot->getNomUrl(1).'</td>';
 						if (empty($conf->global->PRODUCT_DISABLE_EATBY)) {
-							print '<td class="dispatch_dluo">' . dol_print_date($lot->eatby, 'day') . '</td>';
+							print '<td class="dispatch_dluo">'.dol_print_date($lot->eatby, 'day').'</td>';
 						}
 						if (empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
-							print '<td class="dispatch_dlc">' . dol_print_date($lot->sellby, 'day') . '</td>';
+							print '<td class="dispatch_dlc">'.dol_print_date($lot->sellby, 'day').'</td>';
 						}
 					} else {
 						print '<td class="dispatch_batch_number"></td>';
@@ -1214,7 +1214,7 @@ if ($id > 0 || !empty($ref)) {
 				print '<td class="right">';
 				if ($action == 'editline' && $lineid == $objp->dispatchlineid)
 				{
-					print '<input style="width: 50px;" type="number" min="1" name="qty" value="' . $objp->qty . '" />';
+					print '<input style="width: 50px;" type="number" min="1" name="qty" value="'.$objp->qty.'" />';
 				}
 				else {
 					print $objp->qty;
@@ -1227,9 +1227,9 @@ if ($id > 0 || !empty($ref)) {
 				if ($action == 'editline' && $lineid == $objp->dispatchlineid)
 				{
 					if (count($listwarehouses) > 1) {
-						print $formproduct->selectWarehouses(GETPOST("fk_entrepot")?GETPOST("fk_entrepot"):($objp->warehouse_id?$objp->warehouse_id:''), "fk_entrepot", '', 1, 0, $objp->fk_product, '', 1, 1, null, 'csswarehouse');
+						print $formproduct->selectWarehouses(GETPOST("fk_entrepot") ?GETPOST("fk_entrepot") : ($objp->warehouse_id ? $objp->warehouse_id : ''), "fk_entrepot", '', 1, 0, $objp->fk_product, '', 1, 1, null, 'csswarehouse');
 					} elseif (count($listwarehouses) == 1) {
-						print $formproduct->selectWarehouses(GETPOST("fk_entrepot")?GETPOST("fk_entrepot"):($objp->warehouse_id?$objp->warehouse_id:''), "fk_entrepot", '', 0, 0, $objp->fk_product, '', 1, 1, null, 'csswarehouse');
+						print $formproduct->selectWarehouses(GETPOST("fk_entrepot") ?GETPOST("fk_entrepot") : ($objp->warehouse_id ? $objp->warehouse_id : ''), "fk_entrepot", '', 0, 0, $objp->fk_product, '', 1, 1, null, 'csswarehouse');
 					} else {
 						$langs->load("errors");
 						print $langs->trans("ErrorNoWarehouseDefined");
@@ -1293,13 +1293,13 @@ if ($id > 0 || !empty($ref)) {
 				if ($action != 'editline' || $lineid != $objp->dispatchlineid)
 				{
 					print '<td class="linecoledit center">';
-					print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=editline&amp;lineid=' . $objp->dispatchlineid .'#line_'. $objp->dispatchlineid . '">';
+					print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=editline&amp;lineid='.$objp->dispatchlineid.'#line_'.$objp->dispatchlineid.'">';
 					print img_edit();
 					print '</a>';
 					print '</td>';
 
 					print '<td class="linecoldelete center">';
-					print '<a href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=ask_deleteline&amp;lineid=' . $objp->dispatchlineid . '#dispatch_received_products">';
+					print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=ask_deleteline&amp;lineid='.$objp->dispatchlineid.'#dispatch_received_products">';
 					print img_delete();
 					print '</a>';
 					print '</td>';
@@ -1309,7 +1309,7 @@ if ($id > 0 || !empty($ref)) {
 					print '<input type="submit" class="button" id="savelinebutton" name="save" value="'.$langs->trans("Save").'" />';
 					print '</td>';
 					print '<td class="center valignmiddle">';
-					print '<input type="submit" class="button" id="cancellinebutton" name="cancel" value="'. $langs->trans("Cancel").'" />';
+					print '<input type="submit" class="button" id="cancellinebutton" name="cancel" value="'.$langs->trans("Cancel").'" />';
 					print '</td>';
 				}
 
diff --git a/htdocs/fourn/commande/document.php b/htdocs/fourn/commande/document.php
index bf79f5fa431..d5a4455db06 100644
--- a/htdocs/fourn/commande/document.php
+++ b/htdocs/fourn/commande/document.php
@@ -123,36 +123,36 @@ if ($object->id > 0)
 	// Project
 	if (!empty($conf->projet->enabled))
 	{
-	    $langs->load("projects");
-	    $morehtmlref .= '<br>'.$langs->trans('Project').' ';
-	    if ($user->rights->fournisseur->commande->creer)
-	    {
-	        if ($action != 'classify') {
-	        	//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+		$langs->load("projects");
+		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
+		if ($user->rights->fournisseur->commande->creer)
+		{
+			if ($action != 'classify') {
+				//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
 				$morehtmlref .= ' : ';
-            }
-            if ($action == 'classify') {
-                //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-                $morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-                $morehtmlref .= '<input type="hidden" name="action" value="classin">';
-                $morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
-                $morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-                $morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-                $morehtmlref .= '</form>';
-            } else {
-                $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-            }
-	    } else {
-	        if (!empty($object->fk_project)) {
-	            $proj = new Project($db);
-	            $proj->fetch($object->fk_project);
-	            $morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
-	            $morehtmlref .= $proj->ref;
-	            $morehtmlref .= '</a>';
-	        } else {
-	            $morehtmlref .= '';
-	        }
-	    }
+			}
+			if ($action == 'classify') {
+				//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+				$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+				$morehtmlref .= '<input type="hidden" name="action" value="classin">';
+				$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
+				$morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+				$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+				$morehtmlref .= '</form>';
+			} else {
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+			}
+		} else {
+			if (!empty($object->fk_project)) {
+				$proj = new Project($db);
+				$proj->fetch($object->fk_project);
+				$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
+				$morehtmlref .= $proj->ref;
+				$morehtmlref .= '</a>';
+			} else {
+				$morehtmlref .= '';
+			}
+		}
 	}
 	$morehtmlref .= '</div>';
 
@@ -169,7 +169,7 @@ if ($object->id > 0)
 
 	print "</div>\n";
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 
 	$modulepart = 'commande_fournisseur';
diff --git a/htdocs/fourn/commande/index.php b/htdocs/fourn/commande/index.php
index 6891e3bdf92..1e9e69fb8cd 100644
--- a/htdocs/fourn/commande/index.php
+++ b/htdocs/fourn/commande/index.php
@@ -61,14 +61,14 @@ 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
 {
-    print '<form method="post" action="list.php">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    print '<div class="div-table-responsive-no-min">';
-    print '<table class="noborder nohover centpercent">';
-    print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
-    print '<tr class="oddeven"><td>';
-    print $langs->trans("SupplierOrder").':</td><td><input type="text" class="flat" name="search_all" size="18"></td><td><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
-    print "</table></div></form><br>\n";
+	print '<form method="post" action="list.php">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<div class="div-table-responsive-no-min">';
+	print '<table class="noborder nohover centpercent">';
+	print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
+	print '<tr class="oddeven"><td>';
+	print $langs->trans("SupplierOrder").':</td><td><input type="text" class="flat" name="search_all" size="18"></td><td><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
+	print "</table></div></form><br>\n";
 }
 
 
diff --git a/htdocs/fourn/commande/info.php b/htdocs/fourn/commande/info.php
index 696a07db0b9..a50cbbdad39 100644
--- a/htdocs/fourn/commande/info.php
+++ b/htdocs/fourn/commande/info.php
@@ -53,10 +53,10 @@ if (!$sortorder) $sortorder = 'DESC,DESC';
 
 if (GETPOST('actioncode', 'array'))
 {
-    $actioncode = GETPOST('actioncode', 'array', 3);
-    if (!count($actioncode)) $actioncode = '0';
+	$actioncode = GETPOST('actioncode', 'array', 3);
+	if (!count($actioncode)) $actioncode = '0';
 } else {
-    $actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECTS) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECTS));
+	$actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECTS) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECTS));
 }
 $search_agenda_label = GETPOST('search_agenda_label');
 
@@ -81,8 +81,8 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 // Purge search criteria
 if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All test are required to be compatible with all browsers
 {
-    $actioncode = '';
-    $search_agenda_label = '';
+	$actioncode = '';
+	$search_agenda_label = '';
 }
 
 
@@ -96,9 +96,9 @@ $object = new CommandeFournisseur($db);
 
 if ($id > 0 || !empty($ref))
 {
-    $object->fetch($id, $ref);
-    $object->fetch_thirdparty();
-    $object->info($object->id);
+	$object->fetch($id, $ref);
+	$object->fetch_thirdparty();
+	$object->info($object->id);
 }
 
 $title = $langs->trans("SupplierOrder").' - '.$object->ref.' '.$object->name;
@@ -127,36 +127,36 @@ $morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->ge
 // Project
 if (!empty($conf->projet->enabled))
 {
-    $langs->load("projects");
-    $morehtmlref .= '<br>'.$langs->trans('Project').' ';
-    if ($user->rights->fournisseur->commande->creer)
-    {
-        if ($action != 'classify') {
-            //$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
-            $morehtmlref .= ' : ';
-        }
-        if ($action == 'classify') {
-            //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-            $morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-            $morehtmlref .= '<input type="hidden" name="action" value="classin">';
-            $morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
-            $morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-            $morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-            $morehtmlref .= '</form>';
-        } else {
-            $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-        }
-    } else {
-        if (!empty($object->fk_project)) {
-            $proj = new Project($db);
-            $proj->fetch($object->fk_project);
-            $morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
-            $morehtmlref .= $proj->ref;
-            $morehtmlref .= '</a>';
-        } else {
-            $morehtmlref .= '';
-        }
-    }
+	$langs->load("projects");
+	$morehtmlref .= '<br>'.$langs->trans('Project').' ';
+	if ($user->rights->fournisseur->commande->creer)
+	{
+		if ($action != 'classify') {
+			//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+			$morehtmlref .= ' : ';
+		}
+		if ($action == 'classify') {
+			//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+			$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+			$morehtmlref .= '<input type="hidden" name="action" value="classin">';
+			$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
+			$morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+			$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+			$morehtmlref .= '</form>';
+		} else {
+			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+		}
+	} else {
+		if (!empty($object->fk_project)) {
+			$proj = new Project($db);
+			$proj->fetch($object->fk_project);
+			$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
+			$morehtmlref .= $proj->ref;
+			$morehtmlref .= '</a>';
+		} else {
+			$morehtmlref .= '';
+		}
+	}
 }
 $morehtmlref .= '</div>';
 
@@ -172,7 +172,7 @@ print '</div>';
 
 print '<div class="clearboth"></div>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 
@@ -183,7 +183,7 @@ $out = '';
 $permok = $user->rights->agenda->myactions->create;
 if ($permok)
 {
-    $out .= '&originid='.$object->id.'&origin=order_supplier';
+	$out .= '&originid='.$object->id.'&origin=order_supplier';
 }
 
 
@@ -191,12 +191,12 @@ print '<div class="tabsAction">';
 
 if (!empty($conf->agenda->enabled))
 {
-    if (!empty($user->rights->agenda->myactions->create) || !empty($user->rights->agenda->allactions->create))
-    {
-        print '<a class="butAction" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create'.$out.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?id='.$object->id).'">'.$langs->trans("AddAction").'</a>';
-    } else {
-        print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans("AddAction").'</a>';
-    }
+	if (!empty($user->rights->agenda->myactions->create) || !empty($user->rights->agenda->allactions->create))
+	{
+		print '<a class="butAction" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create'.$out.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?id='.$object->id).'">'.$langs->trans("AddAction").'</a>';
+	} else {
+		print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans("AddAction").'</a>';
+	}
 }
 
 print '</div>';
@@ -204,27 +204,27 @@ print '</div>';
 
 if (!empty($object->id))
 {
-    $param = '&id='.$object->id;
-    if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
-    if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
+	$param = '&id='.$object->id;
+	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
+	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
 
-    print load_fiche_titre($langs->trans("ActionsOnOrder"), '', '');
+	print load_fiche_titre($langs->trans("ActionsOnOrder"), '', '');
 
-    // List of actions on element
-    /*include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
+	// List of actions on element
+	/*include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
     $formactions=new FormActions($db);
     $somethingshown = $formactions->showactions($object,'project',0);*/
 
-    // List of todo actions
-    //show_actions_todo($conf,$langs,$db,$object,null,0,$actioncode);
+	// List of todo actions
+	//show_actions_todo($conf,$langs,$db,$object,null,0,$actioncode);
 
-    // List of done actions
-    //show_actions_done($conf,$langs,$db,$object,null,0,$actioncode, '', $filters, $sortfield, $sortorder);
+	// List of done actions
+	//show_actions_done($conf,$langs,$db,$object,null,0,$actioncode, '', $filters, $sortfield, $sortorder);
 
-    // List of all actions
-    $filters = array();
-    $filters['search_agenda_label'] = $search_agenda_label;
-    show_actions_done($conf, $langs, $db, $object, null, 0, $actioncode, '', $filters, $sortfield, $sortorder);
+	// List of all actions
+	$filters = array();
+	$filters['search_agenda_label'] = $search_agenda_label;
+	show_actions_done($conf, $langs, $db, $object, null, 0, $actioncode, '', $filters, $sortfield, $sortorder);
 }
 
 // End of page
diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
index 830d391ad9c..e62e2399901 100644
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@@ -93,7 +93,6 @@ $search_btn = GETPOST('button_search', 'alpha');
 $search_remove_btn = GETPOST('button_removefilter', 'alpha');
 
 $status = GETPOST('statut', 'alpha');
-$search_status = GETPOST('search_status');
 
 // Security check
 $orderid = GETPOST('orderid', 'int');
diff --git a/htdocs/fourn/commande/note.php b/htdocs/fourn/commande/note.php
index 4bc11647151..dea5ad69afa 100644
--- a/htdocs/fourn/commande/note.php
+++ b/htdocs/fourn/commande/note.php
@@ -74,17 +74,17 @@ $now = dol_now();
 
 if ($id > 0 || !empty($ref))
 {
-    if ($result >= 0)
-    {
-        $object->fetch_thirdparty();
+	if ($result >= 0)
+	{
+		$object->fetch_thirdparty();
 
-        $author = new User($db);
-        $author->fetch($object->user_author_id);
+		$author = new User($db);
+		$author->fetch($object->user_author_id);
 
-        $head = ordersupplier_prepare_head($object);
+		$head = ordersupplier_prepare_head($object);
 
-        $title = $langs->trans("SupplierOrder");
-        print dol_get_fiche_head($head, 'note', $title, -1, 'order');
+		$title = $langs->trans("SupplierOrder");
+		print dol_get_fiche_head($head, 'note', $title, -1, 'order');
 
 		// Supplier order card
 
@@ -99,36 +99,36 @@ if ($id > 0 || !empty($ref))
 		// Project
 		if (!empty($conf->projet->enabled))
 		{
-		    $langs->load("projects");
-		    $morehtmlref .= '<br>'.$langs->trans('Project').' ';
-		    if ($user->rights->fournisseur->commande->creer)
-		    {
-		        if ($action != 'classify') {
-		        	//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+			$langs->load("projects");
+			$morehtmlref .= '<br>'.$langs->trans('Project').' ';
+			if ($user->rights->fournisseur->commande->creer)
+			{
+				if ($action != 'classify') {
+					//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
 					$morehtmlref .= ' : ';
-                }
-	            if ($action == 'classify') {
-	                //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-	                $morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-	                $morehtmlref .= '<input type="hidden" name="action" value="classin">';
-	                $morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
-	                $morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-	                $morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-	                $morehtmlref .= '</form>';
-	            } else {
-	                $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-	            }
-		    } else {
-		        if (!empty($object->fk_project)) {
-		            $proj = new Project($db);
-		            $proj->fetch($object->fk_project);
-		            $morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
-		            $morehtmlref .= $proj->ref;
-		            $morehtmlref .= '</a>';
-		        } else {
-		            $morehtmlref .= '';
-		        }
-		    }
+				}
+				if ($action == 'classify') {
+					//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+					$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+					$morehtmlref .= '<input type="hidden" name="action" value="classin">';
+					$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
+					$morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+					$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+					$morehtmlref .= '</form>';
+				} else {
+					$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+				}
+			} else {
+				if (!empty($object->fk_project)) {
+					$proj = new Project($db);
+					$proj->fetch($object->fk_project);
+					$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
+					$morehtmlref .= $proj->ref;
+					$morehtmlref .= '</a>';
+				} else {
+					$morehtmlref .= '';
+				}
+			}
 		}
 		$morehtmlref .= '</div>';
 
@@ -140,16 +140,16 @@ if ($id > 0 || !empty($ref))
 
 
 		$cssclass = "titlefield";
-        include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
+		include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
 
-        print '</div>';
+		print '</div>';
 
-        dol_fiche_end();
-    } else {
-        /* Order not found */
-        $langs->load("errors");
-        print $langs->trans("ErrorRecordNotFound");
-    }
+		print dol_get_fiche_end();
+	} else {
+		/* Order not found */
+		$langs->load("errors");
+		print $langs->trans("ErrorRecordNotFound");
+	}
 }
 
 // End of page
diff --git a/htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php b/htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php
index 375cf10caa2..57dfb90e3fd 100644
--- a/htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php
@@ -39,10 +39,10 @@ $total = 0;
 $ilink = 0;
 foreach ($linkedObjectBlock as $key => $objectlink)
 {
-    $ilink++;
+	$ilink++;
 
-    $trclass = 'oddeven';
-    if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass .= ' liste_sub_total';
+	$trclass = 'oddeven';
+	if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass .= ' liste_sub_total';
 	?>
     <tr class="<?php echo $trclass; ?>">
         <td><?php echo $langs->trans("SupplierOrder"); ?></td>
@@ -50,10 +50,10 @@ foreach ($linkedObjectBlock as $key => $objectlink)
     	<td class="left"><?php echo $objectlink->ref_supplier; ?></td>
     	<td class="center"><?php echo dol_print_date($objectlink->date, 'day'); ?></td>
     	<td class="right"><?php
-    	if ($user->rights->fournisseur->commande->lire) {
-    		$total = $total + $objectlink->total_ht;
-    		echo price($objectlink->total_ht);
-    	} ?></td>
+		if ($user->rights->fournisseur->commande->lire) {
+			$total = $total + $objectlink->total_ht;
+			echo price($objectlink->total_ht);
+		} ?></td>
     	<td class="right"><?php echo $objectlink->getLibStatut(3); ?></td>
     	<td class="right"><a class="reposition" href="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key; ?>"><?php echo img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink'); ?></a></td>
     </tr>
@@ -61,7 +61,7 @@ foreach ($linkedObjectBlock as $key => $objectlink)
 }
 if (count($linkedObjectBlock) > 1)
 {
-    ?>
+	?>
     <tr class="liste_total <?php echo (empty($noMoreLinkedObjectBlockAfter) ? 'liste_sub_total' : ''); ?>">
         <td><?php echo $langs->trans("Total"); ?></td>
         <td></td>
diff --git a/htdocs/fourn/contact.php b/htdocs/fourn/contact.php
index edcccbc6a88..781fd4b6e9a 100644
--- a/htdocs/fourn/contact.php
+++ b/htdocs/fourn/contact.php
@@ -37,8 +37,8 @@ llxHeader();
 // Security check
 if ($user->socid > 0)
 {
-    $action = '';
-    $socid = $user->socid;
+	$action = '';
+	$socid = $user->socid;
 }
 
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
@@ -69,21 +69,21 @@ $sql .= " AND s.entity IN (".getEntity('societe').")";
 if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
 
 if (dol_strlen($stcomm)) {
-    $sql .= " AND s.fk_stcomm=$stcomm";
+	$sql .= " AND s.fk_stcomm=$stcomm";
 }
 
 if (dol_strlen($begin)) {
-    $sql .= " AND p.name LIKE '$begin%'";
+	$sql .= " AND p.name LIKE '$begin%'";
 }
 
 if ($contactname) {
-    $sql .= " AND p.name LIKE '%".strtolower($contactname)."%'";
-    $sortfield = "p.name";
-    $sortorder = "ASC";
+	$sql .= " AND p.name LIKE '%".strtolower($contactname)."%'";
+	$sortfield = "p.name";
+	$sortorder = "ASC";
 }
 
 if ($socid) {
-    $sql .= " AND s.rowid = ".$socid;
+	$sql .= " AND s.rowid = ".$socid;
 }
 
 $sql .= " ORDER BY $sortfield $sortorder ";
@@ -92,40 +92,40 @@ $sql .= $db->plimit($limit, $offset);
 $result = $db->query($sql);
 if ($result)
 {
-    $num = $db->num_rows($result);
+	$num = $db->num_rows($result);
 
-    $title = (!empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("ListOfContacts") : $langs->trans("ListOfContactsAddresses"));
-    print_barre_liste($title." (".$langs->trans("Suppliers").")", $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, "", $num);
+	$title = (!empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("ListOfContacts") : $langs->trans("ListOfContactsAddresses"));
+	print_barre_liste($title." (".$langs->trans("Suppliers").")", $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, "", $num);
 
-    print '<table class="liste centpercent">';
-    print '<tr class="liste_titre">';
-    print_liste_field_titre("Lastname", $_SERVER["PHP_SELF"], "p.name", $begin, "", "", $sortfield, $sortorder);
-    print_liste_field_titre("Firstname", $_SERVER["PHP_SELF"], "p.firstname", $begin, "", "", $sortfield, $sortorder);
-    print_liste_field_titre("Company", $_SERVER["PHP_SELF"], "s.nom", $begin, "", "", $sortfield, $sortorder);
-    print_liste_field_titre("Email");
-    print_liste_field_titre("Phone");
-    print "</tr>\n";
+	print '<table class="liste centpercent">';
+	print '<tr class="liste_titre">';
+	print_liste_field_titre("Lastname", $_SERVER["PHP_SELF"], "p.name", $begin, "", "", $sortfield, $sortorder);
+	print_liste_field_titre("Firstname", $_SERVER["PHP_SELF"], "p.firstname", $begin, "", "", $sortfield, $sortorder);
+	print_liste_field_titre("Company", $_SERVER["PHP_SELF"], "s.nom", $begin, "", "", $sortfield, $sortorder);
+	print_liste_field_titre("Email");
+	print_liste_field_titre("Phone");
+	print "</tr>\n";
 
-    $i = 0;
-    while ($i < min($num, $limit))
-    {
-        $obj = $db->fetch_object($result);
+	$i = 0;
+	while ($i < min($num, $limit))
+	{
+		$obj = $db->fetch_object($result);
 
-        print '<tr class="oddeven">';
+		print '<tr class="oddeven">';
 
-        print '<td><a href="'.DOL_URL_ROOT.'/contact/card.php?id='.$obj->cidp.'">'.img_object($langs->trans("ShowContact"), "contact").' '.$obj->lastname.'</a></td>';
-        print '<td>'.$obj->firstname.'</td>';
-        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>'.$obj->email.'</td>';
-        print '<td>'.$obj->phone.'</td>';
+		print '<td><a href="'.DOL_URL_ROOT.'/contact/card.php?id='.$obj->cidp.'">'.img_object($langs->trans("ShowContact"), "contact").' '.$obj->lastname.'</a></td>';
+		print '<td>'.$obj->firstname.'</td>';
+		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>'.$obj->email.'</td>';
+		print '<td>'.$obj->phone.'</td>';
 
-        print "</tr>\n";
-        $i++;
-    }
-    print "</table>";
-    $db->free($result);
+		print "</tr>\n";
+		$i++;
+	}
+	print "</table>";
+	$db->free($result);
 } else {
-    dol_print_error($db);
+	dol_print_error($db);
 }
 
 // End of page
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index d52552bf87e..af963952765 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -101,18 +101,18 @@ $isdraft = (($object->statut == FactureFournisseur::STATUS_DRAFT) ? 1 : 0);
 $result = restrictedArea($user, 'fournisseur', $id, 'facture_fourn', 'facture', 'fk_soc', 'rowid', $isdraft);
 
 // Common permissions
-$usercanread		= $user->rights->fournisseur->facture->lire;
+$usercanread = $user->rights->fournisseur->facture->lire;
 $usercancreate		= $user->rights->fournisseur->facture->creer;
 $usercandelete		= $user->rights->fournisseur->facture->supprimer;
 
 // Advanced permissions
-$usercanvalidate	= ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($usercancreate)) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->fournisseur->supplier_invoice_advance->validate)));
-$usercansend		= (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->fournisseur->supplier_invoice_advance->send);
+$usercanvalidate = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($usercancreate)) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->fournisseur->supplier_invoice_advance->validate)));
+$usercansend = (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->fournisseur->supplier_invoice_advance->send);
 
 // Permissions for includes
 $permissionnote		= $usercancreate; // Used by the include of actions_setnotes.inc.php
-$permissiondellink	= $usercancreate; // Used by the include of actions_dellink.inc.php
-$permissiontoedit	= $usercancreate; // Used by the include of actions_lineupdown.inc.php
+$permissiondellink = $usercancreate; // Used by the include of actions_dellink.inc.php
+$permissiontoedit = $usercancreate; // Used by the include of actions_lineupdown.inc.php
 $permissiontoadd	= $usercancreate; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
 
 
@@ -227,7 +227,7 @@ if (empty($reshook))
 
 		$isErasable = $object->is_erasable();
 
-		if (($usercandelete && $isErasable > 0)	|| ($usercancreate && $isErasable == 1))
+		if (($usercandelete && $isErasable > 0) || ($usercancreate && $isErasable == 1))
 		{
 			$result = $object->delete($user);
 			if ($result > 0)
@@ -317,39 +317,39 @@ if (empty($reshook))
 	// payments conditions
 	if ($action == 'setconditions' && $usercancreate)
 	{
-	    $object->fetch($id);
-	    $object->cond_reglement_code = 0; // To clean property
-	    $object->cond_reglement_id = 0; // To clean property
+		$object->fetch($id);
+		$object->cond_reglement_code = 0; // To clean property
+		$object->cond_reglement_id = 0; // To clean property
 
-	    $error = 0;
+		$error = 0;
 
-	    $db->begin();
+		$db->begin();
 
-	    if (! $error) {
-		    $result = $object->setPaymentTerms(GETPOST('cond_reglement_id', 'int'));
-		    if ($result < 0) {
-	    		$error++;
-	        	setEventMessages($object->error, $object->errors, 'errors');
-	    	}
-	    }
+		if (!$error) {
+			$result = $object->setPaymentTerms(GETPOST('cond_reglement_id', 'int'));
+			if ($result < 0) {
+				$error++;
+				setEventMessages($object->error, $object->errors, 'errors');
+			}
+		}
 
-	    if (! $error) {
-		    $old_date_echeance = $object->date_echeance;
-	    	$new_date_echeance = $object->calculate_date_lim_reglement();
-	    	if ($new_date_echeance > $old_date_echeance) $object->date_echeance = $new_date_echeance;
-	    	if ($object->date_echeance < $object->date) $object->date_echeance = $object->date;
-	    	$result = $object->update($user);
-	    	if ($result < 0) {
-	    		$error++;
-	    		setEventMessages($object->error, $object->errors, 'errors');
-	    	}
-	    }
+		if (!$error) {
+			$old_date_echeance = $object->date_echeance;
+			$new_date_echeance = $object->calculate_date_lim_reglement();
+			if ($new_date_echeance > $old_date_echeance) $object->date_echeance = $new_date_echeance;
+			if ($object->date_echeance < $object->date) $object->date_echeance = $object->date;
+			$result = $object->update($user);
+			if ($result < 0) {
+				$error++;
+				setEventMessages($object->error, $object->errors, 'errors');
+			}
+		}
 
-	    if ($error) {
-	    	$db->rollback();
-	    } else {
-	    	$db->commit();
-	    }
+		if ($error) {
+			$db->rollback();
+		} else {
+			$db->commit();
+		}
 	}
 
 	// Set incoterm
@@ -379,11 +379,11 @@ if (empty($reshook))
 		$result = $object->setBankAccount(GETPOST('fk_account', 'int'));
 	}
 
-    // transport mode
-    if ($action == 'settransportmode' && $user->rights->fournisseur->facture->creer)
-    {
-        $result=$object->setTransportMode(GETPOST('transport_mode_id', 'int'));
-    }
+	// transport mode
+	if ($action == 'settransportmode' && $user->rights->fournisseur->facture->creer)
+	{
+		$result = $object->setTransportMode(GETPOST('transport_mode_id', 'int'));
+	}
 
 	// Set label
 	elseif ($action == 'setlabel' && $usercancreate)
@@ -698,7 +698,7 @@ if (empty($reshook))
 				$object->fk_incoterms = GETPOST('incoterm_id', 'int');
 				$object->location_incoterms	= GETPOST('location_incoterms', 'alpha');
 				$object->multicurrency_code	= GETPOST('multicurrency_code', 'alpha');
-				$object->multicurrency_tx	= GETPOST('originmulticurrency_tx', 'int');
+				$object->multicurrency_tx = GETPOST('originmulticurrency_tx', 'int');
 				$object->transport_mode_id	= GETPOST('transport_mode_id', 'int');
 
 				// Proprietes particulieres a facture de remplacement
@@ -764,7 +764,7 @@ if (empty($reshook))
 				$object->fk_incoterms = GETPOST('incoterm_id', 'int');
 				$object->location_incoterms	= GETPOST('location_incoterms', 'alpha');
 				$object->multicurrency_code	= GETPOST('multicurrency_code', 'alpha');
-				$object->multicurrency_tx	= GETPOST('originmulticurrency_tx', 'int');
+				$object->multicurrency_tx = GETPOST('originmulticurrency_tx', 'int');
 				$object->transport_mode_id	= GETPOST('transport_mode_id', 'int');
 
 				// Proprietes particulieres a facture avoir
@@ -878,7 +878,7 @@ if (empty($reshook))
 				$object->location_incoterms = GETPOST('location_incoterms', 'alpha');
 				$object->multicurrency_code = GETPOST('multicurrency_code', 'alpha');
 				$object->multicurrency_tx = GETPOST('originmulticurrency_tx', 'int');
-				$object->transport_mode_id	= GETPOST('transport_mode_id');
+				$object->transport_mode_id = GETPOST('transport_mode_id');
 
 				// Auto calculation of date due if not filled by user
 				if (empty($object->date_echeance)) $object->date_echeance = $object->calculate_date_lim_reglement();
@@ -1728,7 +1728,7 @@ if ($action == 'create')
 		$remise_percent 	= (!empty($objectsrc->remise_percent) ? $objectsrc->remise_percent : (!empty($soc->remise_supplier_percent) ? $soc->remise_supplier_percent : 0));
 		$remise_absolue 	= (!empty($objectsrc->remise_absolue) ? $objectsrc->remise_absolue : (!empty($soc->remise_absolue) ? $soc->remise_absolue : 0));
 		$dateinvoice = empty($conf->global->MAIN_AUTOFILL_DATE) ?-1 : '';
-		$transport_mode_id  = (!empty($objectsrc->transport_mode_id) ? $objectsrc->transport_mode_id : (!empty($soc->transport_mode_id) ? $soc->transport_mode_id : 0));
+		$transport_mode_id = (!empty($objectsrc->transport_mode_id) ? $objectsrc->transport_mode_id : (!empty($soc->transport_mode_id) ? $soc->transport_mode_id : 0));
 
 		if (!empty($conf->multicurrency->enabled))
 		{
@@ -1747,7 +1747,7 @@ if ($action == 'create')
 	} else {
 		$cond_reglement_id 	= $societe->cond_reglement_supplier_id;
 		$mode_reglement_id 	= $societe->mode_reglement_supplier_id;
-		$transport_mode_id	= $societe->transport_mode_supplier_id;
+		$transport_mode_id = $societe->transport_mode_supplier_id;
 		$fk_account         = $societe->fk_account;
 		$datetmp = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
 		$dateinvoice = ($datetmp == '' ? (empty($conf->global->MAIN_AUTOFILL_DATE) ?-1 : '') : $datetmp);
@@ -1767,8 +1767,8 @@ if ($action == 'create')
 		$mode_reglement_id = GETPOST("mode_reglement_id");
 	}
 
-	$note_public = $object->getDefaultCreateValueFor('note_public', ((! empty($origin) && ! empty($originid) && is_object($objectsrc) && !empty($conf->global->FACTUREFOURN_REUSE_NOTES_ON_CREATE_FROM))?$objectsrc->note_public:null));
-	$note_private = $object->getDefaultCreateValueFor('note_private', ((! empty($origin) && ! empty($originid) && is_object($objectsrc) && !empty($conf->global->FACTUREFOURN_REUSE_NOTES_ON_CREATE_FROM))?$objectsrc->note_private:null));
+	$note_public = $object->getDefaultCreateValueFor('note_public', ((!empty($origin) && !empty($originid) && is_object($objectsrc) && !empty($conf->global->FACTUREFOURN_REUSE_NOTES_ON_CREATE_FROM)) ? $objectsrc->note_public : null));
+	$note_private = $object->getDefaultCreateValueFor('note_private', ((!empty($origin) && !empty($originid) && is_object($objectsrc) && !empty($conf->global->FACTUREFOURN_REUSE_NOTES_ON_CREATE_FROM)) ? $objectsrc->note_private : null));
 
 	print '<form name="add" action="'.$_SERVER["PHP_SELF"].'" method="post">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -2096,14 +2096,14 @@ if ($action == 'create')
 		print '</td></tr>';
 	}
 
-    // Intracomm report
-    if (!empty($conf->intracommreport->enabled))
-    {
-        $langs->loadLangs(array("intracommreport"));
-        print '<tr><td>' . $langs->trans('IntracommReportTransportMode') . '</td><td>';
-        $form->selectModeTransport(isset($_POST['transport_mode_id']) ? $_POST['transport_mode_id'] : $transport_mode_id, 'transport_mode_id');
-        print '</td></tr>';
-    }
+	// Intracomm report
+	if (!empty($conf->intracommreport->enabled))
+	{
+		$langs->loadLangs(array("intracommreport"));
+		print '<tr><td>'.$langs->trans('IntracommReportTransportMode').'</td><td>';
+		$form->selectModeTransport(isset($_POST['transport_mode_id']) ? $_POST['transport_mode_id'] : $transport_mode_id, 'transport_mode_id');
+		print '</td></tr>';
+	}
 
 	// Public note
 	print '<tr><td>'.$langs->trans('NotePublic').'</td>';
@@ -2191,7 +2191,7 @@ if ($action == 'create')
 	// Bouton "Create Draft"
 	print "</table>\n";
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div class="center">';
 	print '<input type="submit" class="button" name="bouton" value="'.$langs->trans('CreateDraft').'">';
@@ -2305,7 +2305,7 @@ if ($action == 'create')
 		{
 			// We check if number is temporary number
 			if (preg_match('/^[\(]?PROV/i', $object->ref) || empty($object->ref)) {
-                // empty should not happened, but when it occurs, the test save life
+				// empty should not happened, but when it occurs, the test save life
 				$numref = $object->getNextNumRef($societe);
 			} else {
 				$numref = $object->ref;
@@ -2688,26 +2688,26 @@ if ($action == 'create')
 
 		// Intracomm report
 		if (!empty($conf->intracommreport->enabled)) {
-	        $langs->loadLangs(array("intracommreport"));
-	        print '<tr><td class="nowrap">';
-	        print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
-	        print $langs->trans('IntracommReportTransportMode');
-	        print '</td>';
-	        if ($action != 'editmode' && $user->rights->fournisseur->facture->creer) {
-	            print '<td class="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editmode&amp;id='.$object->id.'">'.img_edit($langs->trans('SetMode'), 1).'</a></td>';
-	        }
-	        print '</tr></table>';
-	        print '</td>';
+			$langs->loadLangs(array("intracommreport"));
+			print '<tr><td class="nowrap">';
+			print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
+			print $langs->trans('IntracommReportTransportMode');
+			print '</td>';
+			if ($action != 'editmode' && $user->rights->fournisseur->facture->creer) {
+				print '<td class="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editmode&amp;id='.$object->id.'">'.img_edit($langs->trans('SetMode'), 1).'</a></td>';
+			}
+			print '</tr></table>';
+			print '</td>';
 
-	        print '<td>';
-	        if ($action == 'editmode')
-	        {
-	            $form->formSelectTransportMode($_SERVER['PHP_SELF'].'?id='.$object->id, $object->transport_mode_id, 'transport_mode_id', 1, 1);
-	        }
-	        else {
-	            $form->formSelectTransportMode($_SERVER['PHP_SELF'].'?id='.$object->id, $object->transport_mode_id, 'none');
-	        }
-	        print '</td></tr>';
+			print '<td>';
+			if ($action == 'editmode')
+			{
+				$form->formSelectTransportMode($_SERVER['PHP_SELF'].'?id='.$object->id, $object->transport_mode_id, 'transport_mode_id', 1, 1);
+			}
+			else {
+				$form->formSelectTransportMode($_SERVER['PHP_SELF'].'?id='.$object->id, $object->transport_mode_id, 'none');
+			}
+			print '</td></tr>';
 		}
 
 		// Other attributes
@@ -3095,7 +3095,7 @@ if ($action == 'create')
 		print '</div>';
 		print '</form>';
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 
 		if ($action != 'presend')
diff --git a/htdocs/fourn/facture/contact.php b/htdocs/fourn/facture/contact.php
index 82b6a7777e5..83f145c4c6b 100644
--- a/htdocs/fourn/facture/contact.php
+++ b/htdocs/fourn/facture/contact.php
@@ -55,11 +55,11 @@ if ($action == 'addcontact' && $user->rights->fournisseur->facture->creer)
 {
 	$result = $object->fetch($id, $ref);
 
-    if ($result > 0 && $id > 0)
-    {
-    	$contactid = (GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid'));
+	if ($result > 0 && $id > 0)
+	{
+		$contactid = (GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid'));
   		$result = $object->add_contact($contactid, $_POST["type"], $_POST["source"]);
-    }
+	}
 
 	if ($result >= 0)
 	{
@@ -81,7 +81,7 @@ elseif ($action == 'swapstatut' && $user->rights->fournisseur->facture->creer)
 {
 	if ($object->fetch($id))
 	{
-	    $result = $object->swapContactStatus(GETPOST('ligne'));
+		$result = $object->swapContactStatus(GETPOST('ligne'));
 	} else {
 		dol_print_error($db);
 	}
@@ -138,13 +138,13 @@ if ($id > 0 || !empty($ref))
 		$linkback = '<a href="'.DOL_URL_ROOT.'/compta/facture/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
 		$morehtmlref = '<div class="refidno">';
-    	// Ref supplier
-    	$morehtmlref .= $form->editfieldkey("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', 0, 1);
-    	$morehtmlref .= $form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', null, null, '', 1);
-    	// Thirdparty
-    	$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
-    	if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0) $morehtmlref .= ' (<a href="'.DOL_URL_ROOT.'/fourn/facture/list.php?socid='.$object->thirdparty->id.'&search_company='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherBills").'</a>)';
-    	// Project
+		// Ref supplier
+		$morehtmlref .= $form->editfieldkey("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', 0, 1);
+		$morehtmlref .= $form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', null, null, '', 1);
+		// Thirdparty
+		$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
+		if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0) $morehtmlref .= ' (<a href="'.DOL_URL_ROOT.'/fourn/facture/list.php?socid='.$object->thirdparty->id.'&search_company='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherBills").'</a>)';
+		// Project
 		if (!empty($conf->projet->enabled))
 		{
 			$langs->load("projects");
@@ -232,29 +232,29 @@ if ($id > 0 || !empty($ref))
 		print $form->editfieldval("Label", 'label', $object->label, $object, 0);
 		print '</td></tr>';
 
-        // Amount
-        print '<tr><td>'.$langs->trans('AmountHT').'</td><td>'.price($object->total_ht, 1, $langs, 0, -1, -1, $conf->currency).'</td></tr>';
-        print '<tr><td>'.$langs->trans('AmountVAT').'</td><td>'.price($object->total_tva, 1, $langs, 0, -1, -1, $conf->currency).'</td></tr>';
+		// Amount
+		print '<tr><td>'.$langs->trans('AmountHT').'</td><td>'.price($object->total_ht, 1, $langs, 0, -1, -1, $conf->currency).'</td></tr>';
+		print '<tr><td>'.$langs->trans('AmountVAT').'</td><td>'.price($object->total_tva, 1, $langs, 0, -1, -1, $conf->currency).'</td></tr>';
 
-        // Amount Local Taxes
-        //TODO: Place into a function to control showing by country or study better option
-        if ($societe->localtax1_assuj == "1") //Localtax1
-        {
-            print '<tr><td>'.$langs->transcountry("AmountLT1", $societe->country_code).'</td>';
-            print '<td>'.price($object->total_localtax1, 1, $langs, 0, -1, -1, $conf->currency).'</td>';
-            print '</tr>';
-        }
-        if ($societe->localtax2_assuj == "1") //Localtax2
-        {
-            print '<tr><td>'.$langs->transcountry("AmountLT2", $societe->country_code).'</td>';
-            print '<td>'.price($object->total_localtax2, 1, $langs, 0, -1, -1, $conf->currency).'</td>';
-            print '</tr>';
-        }
-        print '<tr><td>'.$langs->trans('AmountTTC').'</td><td>'.price($object->total_ttc, 1, $langs, 0, -1, -1, $conf->currency).'</td></tr>';
+		// Amount Local Taxes
+		//TODO: Place into a function to control showing by country or study better option
+		if ($societe->localtax1_assuj == "1") //Localtax1
+		{
+			print '<tr><td>'.$langs->transcountry("AmountLT1", $societe->country_code).'</td>';
+			print '<td>'.price($object->total_localtax1, 1, $langs, 0, -1, -1, $conf->currency).'</td>';
+			print '</tr>';
+		}
+		if ($societe->localtax2_assuj == "1") //Localtax2
+		{
+			print '<tr><td>'.$langs->transcountry("AmountLT2", $societe->country_code).'</td>';
+			print '<td>'.price($object->total_localtax2, 1, $langs, 0, -1, -1, $conf->currency).'</td>';
+			print '</tr>';
+		}
+		print '<tr><td>'.$langs->trans('AmountTTC').'</td><td>'.price($object->total_ttc, 1, $langs, 0, -1, -1, $conf->currency).'</td></tr>';
 
 		print "</table>";
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 		print '<br>';
 
diff --git a/htdocs/fourn/facture/document.php b/htdocs/fourn/facture/document.php
index c8bccb4872e..d57abc67644 100644
--- a/htdocs/fourn/facture/document.php
+++ b/htdocs/fourn/facture/document.php
@@ -245,7 +245,7 @@ if ($object->id > 0)
 
 	print '<div class="clearboth"></div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 
 	$modulepart = 'facture_fournisseur';
diff --git a/htdocs/fourn/facture/impayees.php b/htdocs/fourn/facture/impayees.php
index 804a78079d3..18c4bff9036 100644
--- a/htdocs/fourn/facture/impayees.php
+++ b/htdocs/fourn/facture/impayees.php
@@ -175,7 +175,7 @@ if ($user->rights->fournisseur->facture->lire)
 		$titre = ($socid ? $langs->trans("BillsSuppliersUnpaidForCompany", $soc->name) : $langs->trans("BillsSuppliersUnpaid"));
 
 		if ($option == 'late') $titre .= ' ('.$langs->trans("Late").')';
-	    else $titre .= ' ('.$langs->trans("All").')';
+		else $titre .= ' ('.$langs->trans("All").')';
 
 		$link = '';
 		if (empty($option)) $link = '<a href="'.$_SERVER["PHP_SELF"].'?option=late'.($socid ? '&socid='.$socid : '').'">'.$langs->trans("ShowUnpaidLateOnly").'</a>';
@@ -214,10 +214,10 @@ if ($user->rights->fournisseur->facture->lire)
 		print '</td><td class="liste_titre right">';
 		print '<input class="flat" type="text" size="8" name="search_amount_all_tax" value="'.$search_amount_all_tax.'">';
 		print '</td>';
-        print '<td class="liste_titre maxwidthsearch">';
-        $searchpicto = $form->showFilterAndCheckAddButtons(0);
-        print $searchpicto;
-        print '</td>';
+		print '<td class="liste_titre maxwidthsearch">';
+		$searchpicto = $form->showFilterAndCheckAddButtons(0);
+		print $searchpicto;
+		print '</td>';
 		print "</tr>\n";
 
 		if ($num > 0)
diff --git a/htdocs/fourn/facture/index.php b/htdocs/fourn/facture/index.php
index c3272544371..3c223ce0837 100644
--- a/htdocs/fourn/facture/index.php
+++ b/htdocs/fourn/facture/index.php
@@ -41,9 +41,9 @@ if (isset($user->socid) && $user->socid > 0)
 }
 
 // Maximum elements of the tables
-$maxDraftCount		= empty($conf->global->MAIN_MAXLIST_OVERLOAD) ? 500 : $conf->global->MAIN_MAXLIST_OVERLOAD;
-$maxLatestEditCount	= 5;
-$maxOpenCount		= empty($conf->global->MAIN_MAXLIST_OVERLOAD) ? 500 : $conf->global->MAIN_MAXLIST_OVERLOAD;
+$maxDraftCount = empty($conf->global->MAIN_MAXLIST_OVERLOAD) ? 500 : $conf->global->MAIN_MAXLIST_OVERLOAD;
+$maxLatestEditCount = 5;
+$maxOpenCount = empty($conf->global->MAIN_MAXLIST_OVERLOAD) ? 500 : $conf->global->MAIN_MAXLIST_OVERLOAD;
 
 /*
 * View
@@ -265,11 +265,11 @@ function getDraftTable($maxCount = 500, $socid = 0)
 		return $result;
 	}
 
-	$objectstatic	= new FactureFournisseur($db);
-	$companystatic	= new Societe($db);
-	$nbofloop		= min($num, $maxCount);
-	$total			= 0;
-	$i				= 0;
+	$objectstatic = new FactureFournisseur($db);
+	$companystatic = new Societe($db);
+	$nbofloop = min($num, $maxCount);
+	$total = 0;
+	$i = 0;
 
 	while ($i < $nbofloop)
 	{
@@ -357,10 +357,10 @@ function getLatestEditTable($maxCount = 5, $socid = 0)
 		return $result;
 	}
 
-	$objectstatic	= new FactureFournisseur($db);
-	$companystatic	= new Societe($db);
-	$formfile		= new FormFile($db);
-	$i				= 0;
+	$objectstatic = new FactureFournisseur($db);
+	$companystatic = new Societe($db);
+	$formfile = new FormFile($db);
+	$i = 0;
 
 	while ($i < $num)
 	{
@@ -459,13 +459,13 @@ function getOpenTable($maxCount = 500, $socid = 0)
 		return $result;
 	}
 
-	$objectstatic	= new FactureFournisseur($db);
-	$companystatic	= new Societe($db);
+	$objectstatic = new FactureFournisseur($db);
+	$companystatic = new Societe($db);
 	$formfile		= new FormFile($db);
 	$nbofloop		= min($num, $maxCount);
-	$now			= dol_now();
-	$total			= 0;
-	$i				= 0;
+	$now = dol_now();
+	$total = 0;
+	$i = 0;
 
 	while ($i < $nbofloop)
 	{
diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index ff2da87d716..06b12e3afaa 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -505,7 +505,7 @@ if ($resql)
 		'validate'=>$langs->trans("Validate"),
 		'generate_doc'=>$langs->trans("ReGeneratePDF"),
 		//'builddoc'=>$langs->trans("PDFMerge"),
-	    //'presend'=>$langs->trans("SendByMail"),
+		//'presend'=>$langs->trans("SendByMail"),
 	);
 	//if($user->rights->fournisseur->facture->creer) $arrayofmassactions['createbills']=$langs->trans("CreateInvoiceForThisCustomer");
 	if ($user->rights->fournisseur->facture->supprimer) $arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
@@ -653,7 +653,7 @@ if ($resql)
 				FactureFournisseur::TYPE_CREDIT_NOTE=>$langs->trans("InvoiceAvoir"),
 				FactureFournisseur::TYPE_DEPOSIT=>$langs->trans("InvoiceDeposit"),
 		);
-        /*
+		/*
 		if (! empty($conf->global->INVOICE_USE_SITUATION))
 		{
 			$listtype[Facture::TYPE_SITUATION] = $langs->trans("InvoiceSituation");
@@ -969,12 +969,12 @@ if ($resql)
 			$facturestatic->type = $obj->type;
 
 
-            //If invoice has been converted and the conversion has been used, we dont have remain to pay on invoice
-            if ($facturestatic->type == FactureFournisseur::TYPE_CREDIT_NOTE) {
-                if ($facturestatic->isCreditNoteUsed()) {
-                    $remaintopay = -$facturestatic->getSumFromThisCreditNotesNotUsed();
-                }
-            }
+			//If invoice has been converted and the conversion has been used, we dont have remain to pay on invoice
+			if ($facturestatic->type == FactureFournisseur::TYPE_CREDIT_NOTE) {
+				if ($facturestatic->isCreditNoteUsed()) {
+					$remaintopay = -$facturestatic->getSumFromThisCreditNotesNotUsed();
+				}
+			}
 
 			print '<tr class="oddeven">';
 			if (!empty($arrayfields['f.ref']['checked']))
@@ -1308,16 +1308,16 @@ if ($resql)
 	$hidegeneratedfilelistifempty = 1;
 	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) $hidegeneratedfilelistifempty = 0;
 
-    // Show list of available documents
-    $urlsource = $_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
-    $urlsource .= str_replace('&amp;', '&', $param);
+	// Show list of available documents
+	$urlsource = $_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
+	$urlsource .= str_replace('&amp;', '&', $param);
 
-    $filedir = $diroutputmassaction;
-    $genallowed = $user->rights->facture->lire;
-    $delallowed = $user->rights->facture->creer;
-    $title = '';
+	$filedir = $diroutputmassaction;
+	$genallowed = $user->rights->facture->lire;
+	$delallowed = $user->rights->facture->creer;
+	$title = '';
 
-    print $formfile->showdocuments('massfilesarea_supplier_invoice', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
+	print $formfile->showdocuments('massfilesarea_supplier_invoice', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
 } else {
 	dol_print_error($db);
 }
diff --git a/htdocs/fourn/facture/note.php b/htdocs/fourn/facture/note.php
index 2ca9c077391..c72e7b72710 100644
--- a/htdocs/fourn/facture/note.php
+++ b/htdocs/fourn/facture/note.php
@@ -86,61 +86,61 @@ if ($object->id > 0)
 
 
 	// Supplier invoice card
-    $linkback = '<a href="'.DOL_URL_ROOT.'/fourn/facture/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
+	$linkback = '<a href="'.DOL_URL_ROOT.'/fourn/facture/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
-    $morehtmlref = '<div class="refidno">';
-    // Ref supplier
-    $morehtmlref .= $form->editfieldkey("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', 0, 1);
-    $morehtmlref .= $form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', null, null, '', 1);
-    // Thirdparty
-    $morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
-    if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0) $morehtmlref .= ' (<a href="'.DOL_URL_ROOT.'/fourn/facture/list.php?socid='.$object->thirdparty->id.'&search_company='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherBills").'</a>)';
-    // Project
-    if (!empty($conf->projet->enabled))
-    {
-        $langs->load("projects");
-        $morehtmlref .= '<br>'.$langs->trans('Project').' ';
-    	if ($user->rights->fournisseur->commande->creer)
-    	{
-    	    if ($action != 'classify') {
-    	    	// $morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+	$morehtmlref = '<div class="refidno">';
+	// Ref supplier
+	$morehtmlref .= $form->editfieldkey("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', 0, 1);
+	$morehtmlref .= $form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', null, null, '', 1);
+	// Thirdparty
+	$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
+	if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0) $morehtmlref .= ' (<a href="'.DOL_URL_ROOT.'/fourn/facture/list.php?socid='.$object->thirdparty->id.'&search_company='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherBills").'</a>)';
+	// Project
+	if (!empty($conf->projet->enabled))
+	{
+		$langs->load("projects");
+		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
+		if ($user->rights->fournisseur->commande->creer)
+		{
+			if ($action != 'classify') {
+				// $morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
 				$morehtmlref .= ' : ';
 			}
 			if ($action == 'classify') {
-                //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-                $morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-                $morehtmlref .= '<input type="hidden" name="action" value="classin">';
-                $morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
-                $morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-                $morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-                $morehtmlref .= '</form>';
-            } else {
-                $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-            }
-    	} else {
-    	    if (!empty($object->fk_project)) {
-    	        $proj = new Project($db);
-    	        $proj->fetch($object->fk_project);
-    	        $morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
-    	        $morehtmlref .= $proj->ref;
-    	        $morehtmlref .= '</a>';
-    	    } else {
-    	        $morehtmlref .= '';
-    	    }
-    	}
-    }
-    $morehtmlref .= '</div>';
+				//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+				$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+				$morehtmlref .= '<input type="hidden" name="action" value="classin">';
+				$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
+				$morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+				$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+				$morehtmlref .= '</form>';
+			} else {
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+			}
+		} else {
+			if (!empty($object->fk_project)) {
+				$proj = new Project($db);
+				$proj->fetch($object->fk_project);
+				$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
+				$morehtmlref .= $proj->ref;
+				$morehtmlref .= '</a>';
+			} else {
+				$morehtmlref .= '';
+			}
+		}
+	}
+	$morehtmlref .= '</div>';
 
-    $object->totalpaye = $alreadypaid; // To give a chance to dol_banner_tab to use already paid amount to show correct status
+	$object->totalpaye = $alreadypaid; // To give a chance to dol_banner_tab to use already paid amount to show correct status
 
-    dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
 
-    print '<div class="fichecenter">';
-    print '<div class="underbanner clearboth"></div>';
+	print '<div class="fichecenter">';
+	print '<div class="underbanner clearboth"></div>';
 
 	print '<table class="border centpercent tableforfield">';
 
-    // Type
+	// Type
 	print '<tr><td class="titlefield">'.$langs->trans('Type').'</td><td>';
 	print $object->getLibType();
 	if ($object->type == FactureFournisseur::TYPE_REPLACEMENT)
@@ -208,11 +208,11 @@ if ($object->id > 0)
 
 	print '<br>';
 
-    print '<div class="underbanner clearboth"></div>';
+	print '<div class="underbanner clearboth"></div>';
 	$cssclass = "titlefield";
 	include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 }
 
 // End of page
diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php
index 35d13496471..c94a1f95272 100644
--- a/htdocs/fourn/facture/paiement.php
+++ b/htdocs/fourn/facture/paiement.php
@@ -80,7 +80,7 @@ $multicurrency_amountsresttopay = array();
 // Security check
 if ($user->socid > 0)
 {
-    $socid = $user->socid;
+	$socid = $user->socid;
 }
 
 $object = new PaiementFourn($db);
@@ -104,16 +104,16 @@ $arrayfields = array();
 
 if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
 {
-    $search_ref = "";
-    $search_account = "";
-    $search_amount = "";
-    $search_paymenttype = "";
-    $search_payment_num = "";
-    $search_company = "";
-    $day = '';
-    $year = '';
-    $month = '';
-    $search_array_options = array();
+	$search_ref = "";
+	$search_account = "";
+	$search_amount = "";
+	$search_paymenttype = "";
+	$search_payment_num = "";
+	$search_company = "";
+	$day = '';
+	$year = '';
+	$month = '';
+	$search_array_options = array();
 }
 
 $parameters = array('socid'=>$socid);
@@ -124,115 +124,115 @@ if (empty($reshook))
 {
 	if ($action == 'add_paiement' || ($action == 'confirm_paiement' && $confirm == 'yes'))
 	{
-	    $error = 0;
+		$error = 0;
 
-	    $datepaye = dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
-	    $paiement_id = 0;
-	    $totalpayment = 0;
+		$datepaye = dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
+		$paiement_id = 0;
+		$totalpayment = 0;
 		$atleastonepaymentnotnull = 0;
 		$multicurrency_totalpayment = 0;
 
-	    // Generate payment array and check if there is payment higher than invoice and payment date before invoice date
-	    $tmpinvoice = new FactureFournisseur($db);
-	    foreach ($_POST as $key => $value)
-	    {
-	        if (substr($key, 0, 7) == 'amount_')
-	        {
-	            $cursorfacid = substr($key, 7);
-	            $amounts[$cursorfacid] = price2num(GETPOST($key));
-	            if (!empty($amounts[$cursorfacid])) {
-	            	$atleastonepaymentnotnull++;
-	            	if (is_numeric($amounts[$cursorfacid])) {
-	            		$totalpayment = $totalpayment + $amounts[$cursorfacid];
-	            	} else {
-	            		setEventMessages($langs->transnoentities("InputValueIsNotAnNumber", GETPOST($key)), null, 'warnings');
-	            	}
-	            }
-	            $result = $tmpinvoice->fetch($cursorfacid);
-	            if ($result <= 0) dol_print_error($db);
-	            $amountsresttopay[$cursorfacid] = price2num($tmpinvoice->total_ttc - $tmpinvoice->getSommePaiement());
-	            if ($amounts[$cursorfacid])
-	            {
-		            // Check amount
-		            if ($amounts[$cursorfacid] && (abs($amounts[$cursorfacid]) > abs($amountsresttopay[$cursorfacid])))
-		            {
-		                $addwarning = 1;
-		                $formquestion['text'] = img_warning($langs->trans("PaymentHigherThanReminderToPaySupplier")).' '.$langs->trans("HelpPaymentHigherThanReminderToPaySupplier");
-		            }
-		            // Check date
-		            if ($datepaye && ($datepaye < $tmpinvoice->date))
-		            {
-		            	$langs->load("errors");
-		                //$error++;
-		                setEventMessages($langs->transnoentities("WarningPaymentDateLowerThanInvoiceDate", dol_print_date($datepaye, 'day'), dol_print_date($tmpinvoice->date, 'day'), $tmpinvoice->ref), null, 'warnings');
-		            }
-	            }
+		// Generate payment array and check if there is payment higher than invoice and payment date before invoice date
+		$tmpinvoice = new FactureFournisseur($db);
+		foreach ($_POST as $key => $value)
+		{
+			if (substr($key, 0, 7) == 'amount_')
+			{
+				$cursorfacid = substr($key, 7);
+				$amounts[$cursorfacid] = price2num(GETPOST($key));
+				if (!empty($amounts[$cursorfacid])) {
+					$atleastonepaymentnotnull++;
+					if (is_numeric($amounts[$cursorfacid])) {
+						$totalpayment = $totalpayment + $amounts[$cursorfacid];
+					} else {
+						setEventMessages($langs->transnoentities("InputValueIsNotAnNumber", GETPOST($key)), null, 'warnings');
+					}
+				}
+				$result = $tmpinvoice->fetch($cursorfacid);
+				if ($result <= 0) dol_print_error($db);
+				$amountsresttopay[$cursorfacid] = price2num($tmpinvoice->total_ttc - $tmpinvoice->getSommePaiement());
+				if ($amounts[$cursorfacid])
+				{
+					// Check amount
+					if ($amounts[$cursorfacid] && (abs($amounts[$cursorfacid]) > abs($amountsresttopay[$cursorfacid])))
+					{
+						$addwarning = 1;
+						$formquestion['text'] = img_warning($langs->trans("PaymentHigherThanReminderToPaySupplier")).' '.$langs->trans("HelpPaymentHigherThanReminderToPaySupplier");
+					}
+					// Check date
+					if ($datepaye && ($datepaye < $tmpinvoice->date))
+					{
+						$langs->load("errors");
+						//$error++;
+						setEventMessages($langs->transnoentities("WarningPaymentDateLowerThanInvoiceDate", dol_print_date($datepaye, 'day'), dol_print_date($tmpinvoice->date, 'day'), $tmpinvoice->ref), null, 'warnings');
+					}
+				}
 
-	            $formquestion[$i++] = array('type' => 'hidden', 'name' => $key, 'value' => $_POST[$key]);
-	        } elseif (substr($key, 0, 21) == 'multicurrency_amount_')
+				$formquestion[$i++] = array('type' => 'hidden', 'name' => $key, 'value' => $_POST[$key]);
+			} elseif (substr($key, 0, 21) == 'multicurrency_amount_')
 			{
 				$cursorfacid = substr($key, 21);
-	            $multicurrency_amounts[$cursorfacid] = (GETPOST($key) ? price2num(GETPOST($key)) : 0);
-	            $multicurrency_totalpayment += $multicurrency_amounts[$cursorfacid];
-	            if (!empty($multicurrency_amounts[$cursorfacid])) $atleastonepaymentnotnull++;
-	            $result = $tmpinvoice->fetch($cursorfacid);
-	            if ($result <= 0) dol_print_error($db);
-	            $multicurrency_amountsresttopay[$cursorfacid] = price2num($tmpinvoice->total_ttc - $tmpinvoice->getSommePaiement(1));
-	            if ($multicurrency_amounts[$cursorfacid])
-	            {
-		            // Check amount
-		            if ($multicurrency_amounts[$cursorfacid] && (abs($multicurrency_amounts[$cursorfacid]) > abs($multicurrency_amountsresttopay[$cursorfacid])))
-		            {
-		                $addwarning = 1;
-		                $formquestion['text'] = img_warning($langs->trans("PaymentHigherThanReminderToPaySupplier")).' '.$langs->trans("HelpPaymentHigherThanReminderToPaySupplier");
-		            }
-		            // Check date
-		            if ($datepaye && ($datepaye < $tmpinvoice->date))
-		            {
-		            	$langs->load("errors");
-		                //$error++;
-		                setEventMessages($langs->transnoentities("WarningPaymentDateLowerThanInvoiceDate", dol_print_date($datepaye, 'day'), dol_print_date($tmpinvoice->date, 'day'), $tmpinvoice->ref), null, 'warnings');
-		            }
-	            }
+				$multicurrency_amounts[$cursorfacid] = (GETPOST($key) ? price2num(GETPOST($key)) : 0);
+				$multicurrency_totalpayment += $multicurrency_amounts[$cursorfacid];
+				if (!empty($multicurrency_amounts[$cursorfacid])) $atleastonepaymentnotnull++;
+				$result = $tmpinvoice->fetch($cursorfacid);
+				if ($result <= 0) dol_print_error($db);
+				$multicurrency_amountsresttopay[$cursorfacid] = price2num($tmpinvoice->total_ttc - $tmpinvoice->getSommePaiement(1));
+				if ($multicurrency_amounts[$cursorfacid])
+				{
+					// Check amount
+					if ($multicurrency_amounts[$cursorfacid] && (abs($multicurrency_amounts[$cursorfacid]) > abs($multicurrency_amountsresttopay[$cursorfacid])))
+					{
+						$addwarning = 1;
+						$formquestion['text'] = img_warning($langs->trans("PaymentHigherThanReminderToPaySupplier")).' '.$langs->trans("HelpPaymentHigherThanReminderToPaySupplier");
+					}
+					// Check date
+					if ($datepaye && ($datepaye < $tmpinvoice->date))
+					{
+						$langs->load("errors");
+						//$error++;
+						setEventMessages($langs->transnoentities("WarningPaymentDateLowerThanInvoiceDate", dol_print_date($datepaye, 'day'), dol_print_date($tmpinvoice->date, 'day'), $tmpinvoice->ref), null, 'warnings');
+					}
+				}
 
-	            $formquestion[$i++] = array('type' => 'hidden', 'name' => $key, 'value' => GETPOST($key, 'int'));
+				$formquestion[$i++] = array('type' => 'hidden', 'name' => $key, 'value' => GETPOST($key, 'int'));
 			}
-	    }
+		}
 
-	    // Check parameters
-	    if ($_POST['paiementid'] <= 0)
-	    {
-	    	setEventMessages($langs->transnoentities('ErrorFieldRequired', $langs->transnoentities('PaymentMode')), null, 'errors');
-	        $error++;
-	    }
+		// Check parameters
+		if ($_POST['paiementid'] <= 0)
+		{
+			setEventMessages($langs->transnoentities('ErrorFieldRequired', $langs->transnoentities('PaymentMode')), null, 'errors');
+			$error++;
+		}
 
-	    if (!empty($conf->banque->enabled))
-	    {
-	        // If bank module is on, account is required to enter a payment
-	        if (GETPOST('accountid') <= 0)
-	        {
-	        	setEventMessages($langs->transnoentities('ErrorFieldRequired', $langs->transnoentities('AccountToCredit')), null, 'errors');
-	            $error++;
-	        }
-	    }
+		if (!empty($conf->banque->enabled))
+		{
+			// If bank module is on, account is required to enter a payment
+			if (GETPOST('accountid') <= 0)
+			{
+				setEventMessages($langs->transnoentities('ErrorFieldRequired', $langs->transnoentities('AccountToCredit')), null, 'errors');
+				$error++;
+			}
+		}
 
-	    if (empty($totalpayment) && empty($multicurrency_totalpayment) && empty($atleastonepaymentnotnull))
-	    {
-	    	setEventMessages($langs->transnoentities('ErrorFieldRequired', $langs->trans('PaymentAmount')), null, 'errors');
-	        $error++;
-	    }
+		if (empty($totalpayment) && empty($multicurrency_totalpayment) && empty($atleastonepaymentnotnull))
+		{
+			setEventMessages($langs->transnoentities('ErrorFieldRequired', $langs->trans('PaymentAmount')), null, 'errors');
+			$error++;
+		}
 
-	    if (empty($datepaye))
-	    {
-	    	setEventMessages($langs->transnoentities('ErrorFieldRequired', $langs->transnoentities('Date')), null, 'errors');
-	        $error++;
-	    }
+		if (empty($datepaye))
+		{
+			setEventMessages($langs->transnoentities('ErrorFieldRequired', $langs->transnoentities('Date')), null, 'errors');
+			$error++;
+		}
 
 		// Check if payments in both currency
 		if ($totalpayment > 0 && $multicurrency_totalpayment > 0)
 		{
 			setEventMessages($langs->transnoentities('ErrorPaymentInBothCurrency'), null, 'errors');
-	        $error++;
+			$error++;
 		}
 	}
 
@@ -241,11 +241,11 @@ if (empty($reshook))
 	 */
 	if ($action == 'add_paiement')
 	{
-	    if ($error)
-	    {
-	        $action = 'create';
-	    }
-	    // All the next of this action is displayed at the page's bottom.
+		if ($error)
+		{
+			$action = 'create';
+		}
+		// All the next of this action is displayed at the page's bottom.
 	}
 
 
@@ -254,99 +254,99 @@ if (empty($reshook))
 	 */
 	if ($action == 'confirm_paiement' && $confirm == 'yes')
 	{
-	    $error = 0;
+		$error = 0;
 
-	    $datepaye = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
+		$datepaye = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
 
-        // Clean parameters amount if payment is for a credit note
-        foreach ($amounts as $key => $value)	// How payment is dispatched
-        {
-            $tmpinvoice = new FactureFournisseur($db);
-            $tmpinvoice->fetch($key);
-            if ($tmpinvoice->type == FactureFournisseur::TYPE_CREDIT_NOTE)
-            {
-                $newvalue = price2num($value, 'MT');
-                $amounts[$key] = - abs($newvalue);
-            }
-        }
+		// Clean parameters amount if payment is for a credit note
+		foreach ($amounts as $key => $value)	// How payment is dispatched
+		{
+			$tmpinvoice = new FactureFournisseur($db);
+			$tmpinvoice->fetch($key);
+			if ($tmpinvoice->type == FactureFournisseur::TYPE_CREDIT_NOTE)
+			{
+				$newvalue = price2num($value, 'MT');
+				$amounts[$key] = - abs($newvalue);
+			}
+		}
 
-        foreach ($multicurrency_amounts as $key => $value)	// How payment is dispatched
-        {
-            $tmpinvoice = new FactureFournisseur($db);
-            $tmpinvoice->fetch($key);
-            if ($tmpinvoice->type == FactureFournisseur::TYPE_CREDIT_NOTE)
-            {
-                $newvalue = price2num($value, 'MT');
-                $multicurrency_amounts[$key] = - abs($newvalue);
-            }
-        }
+		foreach ($multicurrency_amounts as $key => $value)	// How payment is dispatched
+		{
+			$tmpinvoice = new FactureFournisseur($db);
+			$tmpinvoice->fetch($key);
+			if ($tmpinvoice->type == FactureFournisseur::TYPE_CREDIT_NOTE)
+			{
+				$newvalue = price2num($value, 'MT');
+				$multicurrency_amounts[$key] = - abs($newvalue);
+			}
+		}
 
 		//var_dump($amounts);
-        //var_dump($multicurrency_amounts);
-        //exit;
+		//var_dump($multicurrency_amounts);
+		//exit;
 
-	    if (!$error)
-	    {
-	        $db->begin();
+		if (!$error)
+		{
+			$db->begin();
 
-	        $thirdparty = new Societe($db);
-            if ($socid > 0) $thirdparty->fetch($socid);
+			$thirdparty = new Societe($db);
+			if ($socid > 0) $thirdparty->fetch($socid);
 
-	        // Creation of payment line
-	        $paiement = new PaiementFourn($db);
-	        $paiement->datepaye     = $datepaye;
-	        $paiement->amounts      = $amounts; // Array of amounts
-	        $paiement->multicurrency_amounts = $multicurrency_amounts;
-	        $paiement->paiementid   = GETPOST('paiementid', 'int');
+			// Creation of payment line
+			$paiement = new PaiementFourn($db);
+			$paiement->datepaye     = $datepaye;
+			$paiement->amounts      = $amounts; // Array of amounts
+			$paiement->multicurrency_amounts = $multicurrency_amounts;
+			$paiement->paiementid   = GETPOST('paiementid', 'int');
 
-	        $paiement->num_payment  = GETPOST('num_paiement', 'alphanohtml');
-	        $paiement->note_private = GETPOST('comment', 'alpha');
-	        $paiement->num_payment = $paiement->num_payment;
-	        $paiement->note_private = $paiement->note_private;
+			$paiement->num_payment  = GETPOST('num_paiement', 'alphanohtml');
+			$paiement->note_private = GETPOST('comment', 'alpha');
+			$paiement->num_payment = $paiement->num_payment;
+			$paiement->note_private = $paiement->note_private;
 
-	        if (!$error)
-	        {
-	            $paiement_id = $paiement->create($user, (GETPOST('closepaidinvoices') == 'on' ? 1 : 0), $thirdparty);
-	            if ($paiement_id < 0)
-	            {
-	            	setEventMessages($paiement->error, $paiement->errors, 'errors');
-	                $error++;
-	            }
-	        }
+			if (!$error)
+			{
+				$paiement_id = $paiement->create($user, (GETPOST('closepaidinvoices') == 'on' ? 1 : 0), $thirdparty);
+				if ($paiement_id < 0)
+				{
+					setEventMessages($paiement->error, $paiement->errors, 'errors');
+					$error++;
+				}
+			}
 
-	        if (!$error)
-	        {
-	            $result = $paiement->addPaymentToBank($user, 'payment_supplier', '(SupplierInvoicePayment)', $accountid, '', '');
-	            if ($result < 0)
-	            {
-	            	setEventMessages($paiement->error, $paiement->errors, 'errors');
-	                $error++;
-	            }
-	        }
+			if (!$error)
+			{
+				$result = $paiement->addPaymentToBank($user, 'payment_supplier', '(SupplierInvoicePayment)', $accountid, '', '');
+				if ($result < 0)
+				{
+					setEventMessages($paiement->error, $paiement->errors, 'errors');
+					$error++;
+				}
+			}
 
-	        if (!$error)
-	        {
-	            $db->commit();
+			if (!$error)
+			{
+				$db->commit();
 
-	            // If payment dispatching on more than one invoice, we stay on summary page, otherwise go on invoice card
-	            $invoiceid = 0;
-	            foreach ($paiement->amounts as $key => $amount)
-	            {
-	                $facid = $key;
-	                if (is_numeric($amount) && $amount <> 0)
-	                {
-	                    if ($invoiceid != 0) $invoiceid = -1; // There is more than one invoice payed by this payment
-	                    else $invoiceid = $facid;
-	                }
-	            }
-	            if ($invoiceid > 0) $loc = DOL_URL_ROOT.'/fourn/facture/card.php?facid='.$invoiceid;
-	            else $loc = DOL_URL_ROOT.'/fourn/paiement/card.php?id='.$paiement_id;
-	            header('Location: '.$loc);
-	            exit;
-	        } else {
-	            $db->rollback();
-	        }
-	    }
+				// If payment dispatching on more than one invoice, we stay on summary page, otherwise go on invoice card
+				$invoiceid = 0;
+				foreach ($paiement->amounts as $key => $amount)
+				{
+					$facid = $key;
+					if (is_numeric($amount) && $amount <> 0)
+					{
+						if ($invoiceid != 0) $invoiceid = -1; // There is more than one invoice payed by this payment
+						else $invoiceid = $facid;
+					}
+				}
+				if ($invoiceid > 0) $loc = DOL_URL_ROOT.'/fourn/facture/card.php?facid='.$invoiceid;
+				else $loc = DOL_URL_ROOT.'/fourn/paiement/card.php?id='.$paiement_id;
+				header('Location: '.$loc);
+				exit;
+			} else {
+				$db->rollback();
+			}
+		}
 	}
 }
 
@@ -365,36 +365,36 @@ llxHeader('', $langs->trans('ListPayment'));
 
 if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paiement')
 {
-    $object = new FactureFournisseur($db);
-    $result = $object->fetch($facid);
+	$object = new FactureFournisseur($db);
+	$result = $object->fetch($facid);
 
-    $datefacture = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
-    $dateinvoice = ($datefacture == '' ? (empty($conf->global->MAIN_AUTOFILL_DATE) ?-1 : '') : $datefacture);
+	$datefacture = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
+	$dateinvoice = ($datefacture == '' ? (empty($conf->global->MAIN_AUTOFILL_DATE) ?-1 : '') : $datefacture);
 
-    $sql = 'SELECT s.nom as name, s.rowid as socid,';
-    $sql .= ' f.rowid, f.ref, f.ref_supplier, f.total_ttc as total, f.fk_mode_reglement, f.fk_account';
-    if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user ";
-    $sql .= ' FROM '.MAIN_DB_PREFIX.'societe as s, '.MAIN_DB_PREFIX.'facture_fourn as f';
-    if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-    $sql .= ' WHERE f.fk_soc = s.rowid';
-    $sql .= ' AND f.rowid = '.$facid;
-    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)
-    {
-        $num = $db->num_rows($resql);
-        if ($num)
-        {
-            $obj = $db->fetch_object($resql);
-            $total = $obj->total;
+	$sql = 'SELECT s.nom as name, s.rowid as socid,';
+	$sql .= ' f.rowid, f.ref, f.ref_supplier, f.total_ttc as total, f.fk_mode_reglement, f.fk_account';
+	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user ";
+	$sql .= ' FROM '.MAIN_DB_PREFIX.'societe as s, '.MAIN_DB_PREFIX.'facture_fourn as f';
+	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	$sql .= ' WHERE f.fk_soc = s.rowid';
+	$sql .= ' AND f.rowid = '.$facid;
+	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)
+	{
+		$num = $db->num_rows($resql);
+		if ($num)
+		{
+			$obj = $db->fetch_object($resql);
+			$total = $obj->total;
 
-            print load_fiche_titre($langs->trans('DoPayment'));
+			print load_fiche_titre($langs->trans('DoPayment'));
 
-            // Add realtime total information
-            if (!empty($conf->use_javascript_ajax))
-            {
-            	print "\n".'<script type="text/javascript" language="javascript">';
-            	print '$(document).ready(function () {
+			// Add realtime total information
+			if (!empty($conf->use_javascript_ajax))
+			{
+				print "\n".'<script type="text/javascript" language="javascript">';
+				print '$(document).ready(function () {
 
 						function _elemToJson(selector)
 						{
@@ -452,56 +452,56 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 						});
 			';
 
-            	print '	});'."\n";
+				print '	});'."\n";
 
-            	//Add js for AutoFill
-            	print ' $(document).ready(function () {';
-            	print ' 	$(".AutoFillAmout").on(\'click touchstart\', function(){
+				//Add js for AutoFill
+				print ' $(document).ready(function () {';
+				print ' 	$(".AutoFillAmout").on(\'click touchstart\', function(){
 							$("input[name="+$(this).data(\'rowname\')+"]").val($(this).data("value")).trigger("change");
 						});';
-            	print '	});'."\n";
+				print '	});'."\n";
 
-            	print '	</script>'."\n";
-            }
+				print '	</script>'."\n";
+			}
 
-            print '<form id="payment_form" name="addpaiement" action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-            print '<input type="hidden" name="token" value="'.newToken().'">';
-            print '<input type="hidden" name="action" value="add_paiement">';
-            print '<input type="hidden" name="facid" value="'.$facid.'">';
-            print '<input type="hidden" name="ref_supplier" value="'.$obj->ref_supplier.'">';
-            print '<input type="hidden" name="socid" value="'.$obj->socid.'">';
-            print '<input type="hidden" name="type" id="invoice_type" value="'.$object->type.'">';
-            print '<input type="hidden" name="societe" value="'.$obj->name.'">';
+			print '<form id="payment_form" name="addpaiement" action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+			print '<input type="hidden" name="token" value="'.newToken().'">';
+			print '<input type="hidden" name="action" value="add_paiement">';
+			print '<input type="hidden" name="facid" value="'.$facid.'">';
+			print '<input type="hidden" name="ref_supplier" value="'.$obj->ref_supplier.'">';
+			print '<input type="hidden" name="socid" value="'.$obj->socid.'">';
+			print '<input type="hidden" name="type" id="invoice_type" value="'.$object->type.'">';
+			print '<input type="hidden" name="societe" value="'.$obj->name.'">';
 
-            print dol_get_fiche_head(null);
+			print dol_get_fiche_head(null);
 
-            print '<table class="border centpercent">';
+			print '<table class="border centpercent">';
 
-            print '<tr><td class="fieldrequired titlefieldcreate">'.$langs->trans('Company').'</td><td>';
-            $supplierstatic->id = $obj->socid;
-            $supplierstatic->name = $obj->name;
-            print $supplierstatic->getNomUrl(1, 'supplier');
-            print '</td></tr>';
-            print '<tr><td class="fieldrequired">'.$langs->trans('Date').'</td><td>';
-            print $form->selectDate($dateinvoice, '', '', '', 0, "addpaiement", 1, 1, 0, '', '', $object->date);
-            print '</td></tr>';
-            print '<tr><td class="fieldrequired">'.$langs->trans('PaymentMode').'</td><td>';
-            $form->select_types_paiements(empty($_POST['paiementid']) ? $obj->fk_mode_reglement : $_POST['paiementid'], 'paiementid');
-            print '</td>';
-            if (!empty($conf->banque->enabled))
-            {
-                print '<tr><td class="fieldrequired">'.$langs->trans('Account').'</td><td>';
-                $form->select_comptes(empty($accountid) ? $obj->fk_account : $accountid, 'accountid', 0, '', 2);
-                print '</td></tr>';
-            } else {
-                print '<tr><td>&nbsp;</td></tr>';
-            }
-            print '<tr><td>'.$langs->trans('Numero').'</td><td><input name="num_paiement" type="text" value="'.(empty($_POST['num_paiement']) ? '' : $_POST['num_paiement']).'"></td></tr>';
-            print '<tr><td>'.$langs->trans('Comments').'</td>';
-            print '<td class="tdtop">';
-            print '<textarea name="comment" wrap="soft" class="quatrevingtpercent" rows="'.ROWS_3.'">'.(empty($_POST['comment']) ? '' : $_POST['comment']).'</textarea></td></tr>';
-            print '</table>';
-            dol_fiche_end();
+			print '<tr><td class="fieldrequired titlefieldcreate">'.$langs->trans('Company').'</td><td>';
+			$supplierstatic->id = $obj->socid;
+			$supplierstatic->name = $obj->name;
+			print $supplierstatic->getNomUrl(1, 'supplier');
+			print '</td></tr>';
+			print '<tr><td class="fieldrequired">'.$langs->trans('Date').'</td><td>';
+			print $form->selectDate($dateinvoice, '', '', '', 0, "addpaiement", 1, 1, 0, '', '', $object->date);
+			print '</td></tr>';
+			print '<tr><td class="fieldrequired">'.$langs->trans('PaymentMode').'</td><td>';
+			$form->select_types_paiements(empty($_POST['paiementid']) ? $obj->fk_mode_reglement : $_POST['paiementid'], 'paiementid');
+			print '</td>';
+			if (!empty($conf->banque->enabled))
+			{
+				print '<tr><td class="fieldrequired">'.$langs->trans('Account').'</td><td>';
+				$form->select_comptes(empty($accountid) ? $obj->fk_account : $accountid, 'accountid', 0, '', 2);
+				print '</td></tr>';
+			} else {
+				print '<tr><td>&nbsp;</td></tr>';
+			}
+			print '<tr><td>'.$langs->trans('Numero').'</td><td><input name="num_paiement" type="text" value="'.(empty($_POST['num_paiement']) ? '' : $_POST['num_paiement']).'"></td></tr>';
+			print '<tr><td>'.$langs->trans('Comments').'</td>';
+			print '<td class="tdtop">';
+			print '<textarea name="comment" wrap="soft" class="quatrevingtpercent" rows="'.ROWS_3.'">'.(empty($_POST['comment']) ? '' : $_POST['comment']).'</textarea></td></tr>';
+			print '</table>';
+			print dol_get_fiche_end();
 
 
 			$parameters = array('facid'=>$facid, 'ref'=>$ref, 'objcanvas'=>$objcanvas);
@@ -512,37 +512,37 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 				/*
 	             * All unpayed supplier invoices
 	             */
-	            $sql = 'SELECT f.rowid as facid, f.ref, f.ref_supplier, f.type, f.total_ht, f.total_ttc,';
-	            $sql .= ' f.multicurrency_code, f.multicurrency_tx, f.multicurrency_total_ht, f.multicurrency_total_tva, f.multicurrency_total_ttc,';
-	            $sql .= ' f.datef as df, f.date_lim_reglement as dlr,';
-	            $sql .= ' SUM(pf.amount) as am, SUM(pf.multicurrency_amount) as multicurrency_am';
-	            $sql .= ' FROM '.MAIN_DB_PREFIX.'facture_fourn as f';
-	            $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'paiementfourn_facturefourn as pf ON pf.fk_facturefourn = f.rowid';
-	            $sql .= " WHERE f.entity = ".$conf->entity;
-	            $sql .= ' AND f.fk_soc = '.$object->socid;
-	            $sql .= ' AND f.paye = 0';
-	            $sql .= ' AND f.fk_statut = 1'; // Status=0 => unvalidated, Status=2 => canceled
-	            if ($object->type != FactureFournisseur::TYPE_CREDIT_NOTE)
-	            {
-	                $sql .= ' AND f.type IN (0,1,3,5)'; // Standard invoice, replacement, deposit, situation
-	            } else {
-	                $sql .= ' AND f.type = 2'; // If paying back a credit note, we show all credit notes
-	            }
-                // Group by because we have a total
-	            $sql .= ' GROUP BY f.datef, f.ref, f.ref_supplier, f.rowid, f.type, f.total_ht, f.total_ttc, f.multicurrency_total_ttc, f.datef, f.date_lim_reglement';
-	            // Sort invoices by date and serial number: the older one comes first
-	            $sql .= ' ORDER BY f.datef ASC, f.ref ASC';
+				$sql = 'SELECT f.rowid as facid, f.ref, f.ref_supplier, f.type, f.total_ht, f.total_ttc,';
+				$sql .= ' f.multicurrency_code, f.multicurrency_tx, f.multicurrency_total_ht, f.multicurrency_total_tva, f.multicurrency_total_ttc,';
+				$sql .= ' f.datef as df, f.date_lim_reglement as dlr,';
+				$sql .= ' SUM(pf.amount) as am, SUM(pf.multicurrency_amount) as multicurrency_am';
+				$sql .= ' FROM '.MAIN_DB_PREFIX.'facture_fourn as f';
+				$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'paiementfourn_facturefourn as pf ON pf.fk_facturefourn = f.rowid';
+				$sql .= " WHERE f.entity = ".$conf->entity;
+				$sql .= ' AND f.fk_soc = '.$object->socid;
+				$sql .= ' AND f.paye = 0';
+				$sql .= ' AND f.fk_statut = 1'; // Status=0 => unvalidated, Status=2 => canceled
+				if ($object->type != FactureFournisseur::TYPE_CREDIT_NOTE)
+				{
+					$sql .= ' AND f.type IN (0,1,3,5)'; // Standard invoice, replacement, deposit, situation
+				} else {
+					$sql .= ' AND f.type = 2'; // If paying back a credit note, we show all credit notes
+				}
+				// Group by because we have a total
+				$sql .= ' GROUP BY f.datef, f.ref, f.ref_supplier, f.rowid, f.type, f.total_ht, f.total_ttc, f.multicurrency_total_ttc, f.datef, f.date_lim_reglement';
+				// Sort invoices by date and serial number: the older one comes first
+				$sql .= ' ORDER BY f.datef ASC, f.ref ASC';
 
-	            $resql = $db->query($sql);
-	            if ($resql)
-	            {
-	                $num = $db->num_rows($resql);
-	                if ($num > 0)
-	                {
-	                    $i = 0;
-	                    print '<br>';
+				$resql = $db->query($sql);
+				if ($resql)
+				{
+					$num = $db->num_rows($resql);
+					if ($num > 0)
+					{
+						$i = 0;
+						print '<br>';
 
-	                    if (!empty($conf->use_javascript_ajax)) {
+						if (!empty($conf->use_javascript_ajax)) {
 							//Add js for AutoFill
 							print "\n".'<script type="text/javascript" language="javascript">';
 							print ' $(document).ready(function () {';
@@ -553,145 +553,145 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 							print '	</script>'."\n";
 						}
 
-                        print '<div class="div-table-responsive-no-min">';
-                        print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
+						print '<div class="div-table-responsive-no-min">';
+						print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 						print '<tr class="liste_titre">';
-	                    print '<td>'.$langs->trans('Invoice').'</td>';
-	                    print '<td>'.$langs->trans('RefSupplier').'</td>';
-	                    print '<td class="center">'.$langs->trans('Date').'</td>';
-	                    print '<td class="center">'.$langs->trans('DateMaxPayment').'</td>';
-	                    if (!empty($conf->multicurrency->enabled)) print '<td>'.$langs->trans('Currency').'</td>';
+						print '<td>'.$langs->trans('Invoice').'</td>';
+						print '<td>'.$langs->trans('RefSupplier').'</td>';
+						print '<td class="center">'.$langs->trans('Date').'</td>';
+						print '<td class="center">'.$langs->trans('DateMaxPayment').'</td>';
+						if (!empty($conf->multicurrency->enabled)) print '<td>'.$langs->trans('Currency').'</td>';
 						if (!empty($conf->multicurrency->enabled)) print '<td class="right">'.$langs->trans('MulticurrencyAmountTTC').'</td>';
 						if (!empty($conf->multicurrency->enabled)) print '<td class="right">'.$langs->trans('MulticurrencyAlreadyPaid').'</td>';
 						if (!empty($conf->multicurrency->enabled)) print '<td class="right">'.$langs->trans('MulticurrencyRemainderToPay').'</td>';
-	                    print '<td class="right">'.$langs->trans('AmountTTC').'</td>';
-	                    print '<td class="right">'.$langs->trans('AlreadyPaid').'</td>';
-	                    print '<td class="right">'.$langs->trans('RemainderToPay').'</td>';
+						print '<td class="right">'.$langs->trans('AmountTTC').'</td>';
+						print '<td class="right">'.$langs->trans('AlreadyPaid').'</td>';
+						print '<td class="right">'.$langs->trans('RemainderToPay').'</td>';
 						print '<td class="center">'.$langs->trans('PaymentAmount').'</td>';
 						if (!empty($conf->multicurrency->enabled)) print '<td class="center">'.$langs->trans('MulticurrencyPaymentAmount').'</td>';
-	                    print '</tr>';
+						print '</tr>';
 
-	                    $total = 0;
-	                    $total_ttc = 0;
-	                    $totalrecu = 0;
-	                    while ($i < $num)
-	                    {
-	                        $objp = $db->fetch_object($resql);
+						$total = 0;
+						$total_ttc = 0;
+						$totalrecu = 0;
+						while ($i < $num)
+						{
+							$objp = $db->fetch_object($resql);
 
-	                        $sign = 1;
-	                        if ($objp->type == FactureFournisseur::TYPE_CREDIT_NOTE) $sign = -1;
+							$sign = 1;
+							if ($objp->type == FactureFournisseur::TYPE_CREDIT_NOTE) $sign = -1;
 
-	                        $invoice = new FactureFournisseur($db);
-	                        $invoice->fetch($objp->facid);
+							$invoice = new FactureFournisseur($db);
+							$invoice->fetch($objp->facid);
 
-	                        $invoicesupplierstatic->ref = $objp->ref;
-	                        $invoicesupplierstatic->id = $objp->facid;
+							$invoicesupplierstatic->ref = $objp->ref;
+							$invoicesupplierstatic->id = $objp->facid;
 
-	                        $paiement = $invoice->getSommePaiement();
-	                        $creditnotes = $invoice->getSumCreditNotesUsed();
-	                        $deposits = $invoice->getSumDepositsUsed();
-	                        $alreadypayed = price2num($paiement + $creditnotes + $deposits, 'MT');
-	                        $remaintopay = price2num($invoice->total_ttc - $paiement - $creditnotes - $deposits, 'MT');
+							$paiement = $invoice->getSommePaiement();
+							$creditnotes = $invoice->getSumCreditNotesUsed();
+							$deposits = $invoice->getSumDepositsUsed();
+							$alreadypayed = price2num($paiement + $creditnotes + $deposits, 'MT');
+							$remaintopay = price2num($invoice->total_ttc - $paiement - $creditnotes - $deposits, 'MT');
 
-	                        // Multicurrency Price
-	                        if (!empty($conf->multicurrency->enabled))
-	                        {
-	                        	$multicurrency_payment = $invoice->getSommePaiement(1);
-	                        	$multicurrency_creditnotes = $invoice->getSumCreditNotesUsed(1);
-	                        	$multicurrency_deposits = $invoice->getSumDepositsUsed(1);
-	                        	$multicurrency_alreadypayed = price2num($multicurrency_payment + $multicurrency_creditnotes + $multicurrency_deposits, 'MT');
-	                        	$multicurrency_remaintopay = price2num($invoice->multicurrency_total_ttc - $multicurrency_payment - $multicurrency_creditnotes - $multicurrency_deposits, 'MT');
-	                        }
+							// Multicurrency Price
+							if (!empty($conf->multicurrency->enabled))
+							{
+								$multicurrency_payment = $invoice->getSommePaiement(1);
+								$multicurrency_creditnotes = $invoice->getSumCreditNotesUsed(1);
+								$multicurrency_deposits = $invoice->getSumDepositsUsed(1);
+								$multicurrency_alreadypayed = price2num($multicurrency_payment + $multicurrency_creditnotes + $multicurrency_deposits, 'MT');
+								$multicurrency_remaintopay = price2num($invoice->multicurrency_total_ttc - $multicurrency_payment - $multicurrency_creditnotes - $multicurrency_deposits, 'MT');
+							}
 
-	                        print '<tr class="oddeven'.(($invoice->id == $facid) ? ' highlight' : '').'">';
+							print '<tr class="oddeven'.(($invoice->id == $facid) ? ' highlight' : '').'">';
 
-	                        // Ref
-	                        print '<td class="nowraponall">';
-	                        print $invoicesupplierstatic->getNomUrl(1);
-	                        print '</td>';
+							// Ref
+							print '<td class="nowraponall">';
+							print $invoicesupplierstatic->getNomUrl(1);
+							print '</td>';
 
-	                        // Ref supplier
-	                        print '<td>'.$objp->ref_supplier.'</td>';
+							// Ref supplier
+							print '<td>'.$objp->ref_supplier.'</td>';
 
-	                        // Date
-	                        if ($objp->df > 0)
-	                        {
-	                            print '<td class="center nowraponall">';
-	                            print dol_print_date($db->jdate($objp->df), 'day').'</td>';
-	                        } else {
-	                            print '<td class="center"><b>!!!</b></td>';
-	                        }
+							// Date
+							if ($objp->df > 0)
+							{
+								print '<td class="center nowraponall">';
+								print dol_print_date($db->jdate($objp->df), 'day').'</td>';
+							} else {
+								print '<td class="center"><b>!!!</b></td>';
+							}
 
-	                        // Date Max Payment
-	                        if ($objp->dlr > 0)
-	                        {
-	                            print '<td class="center nowraponall">';
-	                            print dol_print_date($db->jdate($objp->dlr), 'day');
+							// Date Max Payment
+							if ($objp->dlr > 0)
+							{
+								print '<td class="center nowraponall">';
+								print dol_print_date($db->jdate($objp->dlr), 'day');
 
-	                            if ($invoice->hasDelay())
-	                            {
-	                                print img_warning($langs->trans('Late'));
-	                            }
+								if ($invoice->hasDelay())
+								{
+									print img_warning($langs->trans('Late'));
+								}
 
-	                            print '</td>';
-	                        } else {
-	                            print '<td class="center"><b>--</b></td>';
-	                        }
+								print '</td>';
+							} else {
+								print '<td class="center"><b>--</b></td>';
+							}
 
-	                        // Multicurrency
-	                        if (!empty($conf->multicurrency->enabled))
-	                        {
-    	                        // Currency
-	                            print '<td class="center">'.$objp->multicurrency_code."</td>\n";
+							// Multicurrency
+							if (!empty($conf->multicurrency->enabled))
+							{
+								// Currency
+								print '<td class="center">'.$objp->multicurrency_code."</td>\n";
 
-	                            print '<td class="right">';
-	                            if ($objp->multicurrency_code && $objp->multicurrency_code != $conf->currency)
-	                            {
-	                                print price($objp->multicurrency_total_ttc);
-	                            }
-	                            print '</td>';
+								print '<td class="right">';
+								if ($objp->multicurrency_code && $objp->multicurrency_code != $conf->currency)
+								{
+									print price($objp->multicurrency_total_ttc);
+								}
+								print '</td>';
 
-							    print '<td class="right">';
-							    if ($objp->multicurrency_code && $objp->multicurrency_code != $conf->currency)
-						        {
-						            print price($objp->multicurrency_am);
-							    }
-							    print '</td>';
+								print '<td class="right">';
+								if ($objp->multicurrency_code && $objp->multicurrency_code != $conf->currency)
+								{
+									print price($objp->multicurrency_am);
+								}
+								print '</td>';
 
-							    print '<td class="right">';
-							    if ($objp->multicurrency_code && $objp->multicurrency_code != $conf->currency)
-						        {
-						            print price($objp->multicurrency_total_ttc - $objp->multicurrency_am);
-							    }
-							    print '</td>';
-	                        }
+								print '<td class="right">';
+								if ($objp->multicurrency_code && $objp->multicurrency_code != $conf->currency)
+								{
+									print price($objp->multicurrency_total_ttc - $objp->multicurrency_am);
+								}
+								print '</td>';
+							}
 
-	                        print '<td class="right">'.price($sign * $objp->total_ttc).'</td>';
+							print '<td class="right">'.price($sign * $objp->total_ttc).'</td>';
 
-	                        print '<td class="right">'.price($sign * $objp->am);
+							print '<td class="right">'.price($sign * $objp->am);
 							if ($creditnotes) print '+'.price($creditnotes);
 							if ($deposits) print '+'.price($deposits);
 							print '</td>';
 
-	                        print '<td class="right">'.price($sign * $remaintopay).'</td>';
+							print '<td class="right">'.price($sign * $remaintopay).'</td>';
 
-	                        // Amount
-	                        print '<td class="center nowraponall">';
+							// Amount
+							print '<td class="center nowraponall">';
 
-	                        $namef = 'amount_'.$objp->facid;
-	                        $nameRemain = 'remain_'.$objp->facid;
+							$namef = 'amount_'.$objp->facid;
+							$nameRemain = 'remain_'.$objp->facid;
 
-	                        if ($action != 'add_paiement')
-	                        {
-	                        	if (!empty($conf->use_javascript_ajax))
-	                        		print img_picto("Auto fill", 'rightarrow', "class='AutoFillAmout' data-rowname='".$namef."' data-value='".($sign * $remaintopay)."'");
-	                        		print '<input type="hidden" class="remain" name="'.$nameRemain.'" value="'.$remaintopay.'">';
-	                        		print '<input type="text" size="8" class="amount" name="'.$namef.'" value="'.dol_escape_htmltag(GETPOST($namef)).'">';
-	                        } else {
-	                        	print '<input type="text" size="8" name="'.$namef.'_disabled" value="'.dol_escape_htmltag(GETPOST($namef)).'" disabled>';
-	                        	print '<input type="hidden" name="'.$namef.'" value="'.dol_escape_htmltag(GETPOST($namef)).'">';
-	                        }
+							if ($action != 'add_paiement')
+							{
+								if (!empty($conf->use_javascript_ajax))
+									print img_picto("Auto fill", 'rightarrow', "class='AutoFillAmout' data-rowname='".$namef."' data-value='".($sign * $remaintopay)."'");
+									print '<input type="hidden" class="remain" name="'.$nameRemain.'" value="'.$remaintopay.'">';
+									print '<input type="text" size="8" class="amount" name="'.$namef.'" value="'.dol_escape_htmltag(GETPOST($namef)).'">';
+							} else {
+								print '<input type="text" size="8" name="'.$namef.'_disabled" value="'.dol_escape_htmltag(GETPOST($namef)).'" disabled>';
+								print '<input type="hidden" name="'.$namef.'" value="'.dol_escape_htmltag(GETPOST($namef)).'">';
+							}
 							print "</td>";
 
 							// Multicurrency Price
@@ -720,18 +720,18 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 							}
 
 							print "</tr>\n";
-	                        $total += $objp->total_ht;
-	                        $total_ttc += $objp->total_ttc;
-	                        $totalrecu += $objp->am;
+							$total += $objp->total_ht;
+							$total_ttc += $objp->total_ttc;
+							$totalrecu += $objp->am;
 							$totalrecucreditnote += $creditnotes;
 							$totalrecudeposits += $deposits;
-	                        $i++;
-	                    }
-	                    if ($i > 1)
-	                    {
-	                        // Print total
-	                        print '<tr class="liste_total">';
-	                        print '<td colspan="4" class="left">'.$langs->trans('TotalTTC').':</td>';
+							$i++;
+						}
+						if ($i > 1)
+						{
+							// Print total
+							print '<tr class="liste_total">';
+							print '<td colspan="4" class="left">'.$langs->trans('TotalTTC').':</td>';
 							if (!empty($conf->multicurrency->enabled)) print '<td>&nbsp;</td>';
 							if (!empty($conf->multicurrency->enabled)) print '<td>&nbsp;</td>';
 							if (!empty($conf->multicurrency->enabled)) print '<td>&nbsp;</td>';
@@ -742,49 +742,49 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 							if ($totalrecudeposits) print '+'.price($totalrecudeposits);
 							print	'</b></td>';
 							print '<td class="right"><b>'.price($sign * price2num($total_ttc - $totalrecu - $totalrecucreditnote - $totalrecudeposits, 'MT')).'</b></td>';
-	                        print '<td class="center" id="result" style="font-weight: bold;"></td>'; // Autofilled
+							print '<td class="center" id="result" style="font-weight: bold;"></td>'; // Autofilled
 							if (!empty($conf->multicurrency->enabled)) print '<td class="right" id="multicurrency_result" style="font-weight: bold;"></td>';
-	                        print "</tr>\n";
-	                    }
-	                    print "</table>\n";
+							print "</tr>\n";
+						}
+						print "</table>\n";
 
-	                    print "</div>";
-	                }
-	                $db->free($resql);
-	            } else {
-	                dol_print_error($db);
-	            }
+						print "</div>";
+					}
+					$db->free($resql);
+				} else {
+					dol_print_error($db);
+				}
 			}
 
-	        // Save Button
-	        if ($action != 'add_paiement')
-	        {
+			// Save Button
+			if ($action != 'add_paiement')
+			{
 				print '<br><div class="center"><input type="checkbox" checked name="closepaidinvoices"> '.$langs->trans("ClosePaidInvoicesAutomatically");
 				print '<br><input type="submit" class="button" value="'.$langs->trans('ToMakePayment').'"></div>';
-	        }
+			}
 
-            // Form to confirm payment
-	        if ($action == 'add_paiement')
-	        {
-	            $preselectedchoice = $addwarning ? 'no' : 'yes';
+			// Form to confirm payment
+			if ($action == 'add_paiement')
+			{
+				$preselectedchoice = $addwarning ? 'no' : 'yes';
 
-	            print '<br>';
-	            if (!empty($totalpayment)) $text = $langs->trans('ConfirmSupplierPayment', price($totalpayment), $langs->trans("Currency".$conf->currency));
+				print '<br>';
+				if (!empty($totalpayment)) $text = $langs->trans('ConfirmSupplierPayment', price($totalpayment), $langs->trans("Currency".$conf->currency));
 				if (!empty($multicurrency_totalpayment))
 				{
 					$text .= '<br>'.$langs->trans('ConfirmSupplierPayment', price($multicurrency_totalpayment), $langs->trans("paymentInInvoiceCurrency"));
 				}
-	            if (GETPOST('closepaidinvoices'))
-	            {
-	                $text .= '<br>'.$langs->trans("AllCompletelyPayedInvoiceWillBeClosed");
-	                print '<input type="hidden" name="closepaidinvoices" value="'.GETPOST('closepaidinvoices').'">';
-	            }
-	            print $form->formconfirm($_SERVER['PHP_SELF'].'?facid='.$facture->id.'&socid='.$facture->socid.'&type='.$facture->type, $langs->trans('PayedSuppliersPayments'), $text, 'confirm_paiement', $formquestion, $preselectedchoice);
-	        }
+				if (GETPOST('closepaidinvoices'))
+				{
+					$text .= '<br>'.$langs->trans("AllCompletelyPayedInvoiceWillBeClosed");
+					print '<input type="hidden" name="closepaidinvoices" value="'.GETPOST('closepaidinvoices').'">';
+				}
+				print $form->formconfirm($_SERVER['PHP_SELF'].'?facid='.$facture->id.'&socid='.$facture->socid.'&type='.$facture->type, $langs->trans('PayedSuppliersPayments'), $text, 'confirm_paiement', $formquestion, $preselectedchoice);
+			}
 
-            print '</form>';
-        }
-    } else dol_print_error($db);
+			print '</form>';
+		}
+	} else dol_print_error($db);
 }
 
 // End of page
diff --git a/htdocs/fourn/facture/rapport.php b/htdocs/fourn/facture/rapport.php
index 1c068e19b7d..9ae7970d7db 100644
--- a/htdocs/fourn/facture/rapport.php
+++ b/htdocs/fourn/facture/rapport.php
@@ -40,8 +40,8 @@ $action = GETPOST('action', 'aZ09');
 $socid = 0;
 if ($user->socid > 0)
 {
-    $action = '';
-    $socid = $user->socid;
+	$action = '';
+	$socid = $user->socid;
 }
 
 $dir = $conf->fournisseur->facture->dir_output.'/payments';
@@ -57,27 +57,27 @@ if (!$year) { $year = date("Y"); }
 
 if ($action == 'builddoc')
 {
-    $rap = new pdf_paiement_fourn($db);
+	$rap = new pdf_paiement_fourn($db);
 
-    $outputlangs = $langs;
-    if (GETPOST('lang_id', 'aZ09'))
-    {
-        $outputlangs = new Translate("", $conf);
-        $outputlangs->setDefaultLang(GETPOST('lang_id', 'aZ09'));
-    }
+	$outputlangs = $langs;
+	if (GETPOST('lang_id', 'aZ09'))
+	{
+		$outputlangs = new Translate("", $conf);
+		$outputlangs->setDefaultLang(GETPOST('lang_id', 'aZ09'));
+	}
 
-    // We save charset_output to restore it because write_file can change it if needed for
-    // output format that does not support UTF8.
-    $sav_charset_output = $outputlangs->charset_output;
-    if ($rap->write_file($dir, GETPOST("remonth", 'int'), GETPOST("reyear", 'int'), $outputlangs) > 0)
-    {
-        $outputlangs->charset_output = $sav_charset_output;
-    } else {
-        $outputlangs->charset_output = $sav_charset_output;
-        dol_print_error($db, $obj->error);
-    }
+	// We save charset_output to restore it because write_file can change it if needed for
+	// output format that does not support UTF8.
+	$sav_charset_output = $outputlangs->charset_output;
+	if ($rap->write_file($dir, GETPOST("remonth", 'int'), GETPOST("reyear", 'int'), $outputlangs) > 0)
+	{
+		$outputlangs->charset_output = $sav_charset_output;
+	} else {
+		$outputlangs->charset_output = $sav_charset_output;
+		dol_print_error($db, $obj->error);
+	}
 
-    $year = GETPOST("reyear", 'int');
+	$year = GETPOST("reyear", 'int');
 }
 
 
@@ -116,58 +116,58 @@ $linkforyear = array();
 $found = 0;
 if (is_dir($dir))
 {
-    $handle = opendir($dir);
-    if (is_resource($handle))
-    {
-        while (($file = readdir($handle)) !== false)
-        {
-            if (is_dir($dir.'/'.$file) && !preg_match('/^\./', $file) && is_numeric($file))
-            {
-                $found = 1;
-                $linkforyear[] = $file;
-            }
-        }
-    }
+	$handle = opendir($dir);
+	if (is_resource($handle))
+	{
+		while (($file = readdir($handle)) !== false)
+		{
+			if (is_dir($dir.'/'.$file) && !preg_match('/^\./', $file) && is_numeric($file))
+			{
+				$found = 1;
+				$linkforyear[] = $file;
+			}
+		}
+	}
 }
 asort($linkforyear);
 foreach ($linkforyear as $cursoryear)
 {
-    print '<a href="'.$_SERVER["PHP_SELF"].'?year='.$cursoryear.'">'.$cursoryear.'</a> &nbsp;';
+	print '<a href="'.$_SERVER["PHP_SELF"].'?year='.$cursoryear.'">'.$cursoryear.'</a> &nbsp;';
 }
 
 if ($year)
 {
-    if (is_dir($dir.'/'.$year))
-    {
-        $handle = opendir($dir.'/'.$year);
+	if (is_dir($dir.'/'.$year))
+	{
+		$handle = opendir($dir.'/'.$year);
 
-        if ($found) print '<br>';
-        print '<br>';
-        print '<table width="100%" class="noborder">';
-        print '<tr class="liste_titre">';
-        print '<td>'.$langs->trans("Reporting").'</td>';
-        print '<td class="right">'.$langs->trans("Size").'</td>';
-        print '<td class="right">'.$langs->trans("Date").'</td>';
-        print '</tr>';
+		if ($found) print '<br>';
+		print '<br>';
+		print '<table width="100%" class="noborder">';
+		print '<tr class="liste_titre">';
+		print '<td>'.$langs->trans("Reporting").'</td>';
+		print '<td class="right">'.$langs->trans("Size").'</td>';
+		print '<td class="right">'.$langs->trans("Date").'</td>';
+		print '</tr>';
 
-        if (is_resource($handle))
-        {
-            while (($file = readdir($handle)) !== false)
-            {
-                if (preg_match('/^supplier_payment/i', $file))
-                {
-                    $tfile = $dir.'/'.$year.'/'.$file;
-                    $relativepath = $year.'/'.$file;
-                    print '<tr class="oddeven"><td><a data-ajax="false" href="'.DOL_URL_ROOT.'/document.php?modulepart=facture_fournisseur&amp;file=payments/'.urlencode($relativepath).'">'.img_pdf().' '.$file.'</a>'.$formfile->showPreview($file, 'facture_fournisseur', 'payments/'.$relativepath, 0).'</td>';
-                    print '<td class="right">'.dol_print_size(dol_filesize($tfile)).'</td>';
-                    print '<td class="right">'.dol_print_date(dol_filemtime($tfile), "dayhour").'</td></tr>';
-                }
-            }
-            closedir($handle);
-        }
+		if (is_resource($handle))
+		{
+			while (($file = readdir($handle)) !== false)
+			{
+				if (preg_match('/^supplier_payment/i', $file))
+				{
+					$tfile = $dir.'/'.$year.'/'.$file;
+					$relativepath = $year.'/'.$file;
+					print '<tr class="oddeven"><td><a data-ajax="false" href="'.DOL_URL_ROOT.'/document.php?modulepart=facture_fournisseur&amp;file=payments/'.urlencode($relativepath).'">'.img_pdf().' '.$file.'</a>'.$formfile->showPreview($file, 'facture_fournisseur', 'payments/'.$relativepath, 0).'</td>';
+					print '<td class="right">'.dol_print_size(dol_filesize($tfile)).'</td>';
+					print '<td class="right">'.dol_print_date(dol_filemtime($tfile), "dayhour").'</td></tr>';
+				}
+			}
+			closedir($handle);
+		}
 
-        print '</table>';
-    }
+		print '</table>';
+	}
 }
 
 // End of page
diff --git a/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php b/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
index 0826a4ab200..4456d27c539 100644
--- a/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
@@ -40,29 +40,29 @@ $langs->load("bills");
 $total = 0; $ilink = 0;
 foreach ($linkedObjectBlock as $key => $objectlink)
 {
-    $ilink++;
+	$ilink++;
 
-    $trclass = 'oddeven';
-    if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass .= ' liste_sub_total';
-    ?>
+	$trclass = 'oddeven';
+	if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass .= ' liste_sub_total';
+	?>
     <tr class="<?php echo $trclass; ?>">
         <td><?php echo $langs->trans("SupplierInvoice"); ?></td>
     	<td><a href="<?php echo DOL_URL_ROOT.'/fourn/facture/card.php?facid='.$objectlink->id ?>"><?php echo img_object($langs->trans("ShowBill"), "bill").' '.$objectlink->ref; ?></a></td>
     	<td class="left"><?php echo $objectlink->ref_supplier; ?></td>
     	<td class="center"><?php echo dol_print_date($objectlink->date, 'day'); ?></td>
     	<td class="right"><?php
-    	if ($user->rights->fournisseur->facture->lire) {
-    	    $sign = 1;
-    		if ($object->type == FactureFournisseur::TYPE_CREDIT_NOTE) $sign = -1;
-    		if ($objectlink->statut != 3)
-    		{
+		if ($user->rights->fournisseur->facture->lire) {
+			$sign = 1;
+			if ($object->type == FactureFournisseur::TYPE_CREDIT_NOTE) $sign = -1;
+			if ($objectlink->statut != 3)
+			{
 				// If not abandonned
-    			$total = $total + $sign * $objectlink->total_ht;
-    			echo price($objectlink->total_ht);
-    		} else {
-    			echo '<strike>'.price($objectlink->total_ht).'</strike>';
-    		}
-    	} ?></td>
+				$total = $total + $sign * $objectlink->total_ht;
+				echo price($objectlink->total_ht);
+			} else {
+				echo '<strike>'.price($objectlink->total_ht).'</strike>';
+			}
+		} ?></td>
     	<td class="right"><?php echo $objectlink->getLibStatut(3); ?></td>
     	<td class="right"><a class="reposition" href="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key; ?>"><?php echo img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink'); ?></a></td>
     </tr>
@@ -70,7 +70,7 @@ foreach ($linkedObjectBlock as $key => $objectlink)
 }
 if (count($linkedObjectBlock) > 1)
 {
-    ?>
+	?>
     <tr class="liste_total <?php echo (empty($noMoreLinkedObjectBlockAfter) ? 'liste_sub_total' : ''); ?>">
         <td><?php echo $langs->trans("Total"); ?></td>
         <td></td>
diff --git a/htdocs/fourn/paiement/card.php b/htdocs/fourn/paiement/card.php
index cfd65a631da..80f6d2eed5e 100644
--- a/htdocs/fourn/paiement/card.php
+++ b/htdocs/fourn/paiement/card.php
@@ -292,7 +292,7 @@ if ($result > 0)
 				$facturestatic->total_tva = $objp->total_tva;
 				$facturestatic->total_ttc = $objp->total_ttc;
 				$facturestatic->statut = $objp->status;
-				$facturestatic->alreadypaid = -1;	// unknown
+				$facturestatic->alreadypaid = -1; // unknown
 
 				print '<tr class="oddeven">';
 				// Ref
@@ -396,7 +396,7 @@ if ($result > 0)
 	print $langs->trans("ErrorRecordNotFound");
 }
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // End of page
 llxFooter();
diff --git a/htdocs/fourn/paiement/info.php b/htdocs/fourn/paiement/info.php
index 1ca4c113612..97ac2343c23 100644
--- a/htdocs/fourn/paiement/info.php
+++ b/htdocs/fourn/paiement/info.php
@@ -49,7 +49,7 @@ print dol_get_fiche_head($head, 'info', $langs->trans("SupplierPayment"), 0, 'pa
 
 dol_banner_tab($object, 'id', $linkback, -1, 'rowid', 'ref');
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '<table width="100%"><tr><td>';
 dol_print_object_info($object);
diff --git a/htdocs/fourn/paiement/list.php b/htdocs/fourn/paiement/list.php
index 0310a75fe57..3fca286eff0 100644
--- a/htdocs/fourn/paiement/list.php
+++ b/htdocs/fourn/paiement/list.php
@@ -56,29 +56,29 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array('companies', 'bills', 'banks', 'compta'));
 
-$action					= GETPOST('action', 'alpha');
+$action = GETPOST('action', 'alpha');
 $massaction				= GETPOST('massaction', 'alpha');
-$optioncss				= GETPOST('optioncss', 'alpha');
+$optioncss = GETPOST('optioncss', 'alpha');
 $contextpage			= GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'vendorpaymentlist';
 
-$socid					= GETPOST('socid', 'int');
+$socid = GETPOST('socid', 'int');
 
 $search_ref				= GETPOST('search_ref', 'alpha');
 $search_day				= GETPOST('search_day', 'int');
-$search_month			= GETPOST('search_month', 'int');
+$search_month = GETPOST('search_month', 'int');
 $search_year			= GETPOST('search_year', 'int');
-$search_company			= GETPOST('search_company', 'alpha');
+$search_company = GETPOST('search_company', 'alpha');
 $search_payment_type	= GETPOST('search_payment_type');
-$search_cheque_num		= GETPOST('search_cheque_num', 'alpha');
+$search_cheque_num = GETPOST('search_cheque_num', 'alpha');
 $search_bank_account	= GETPOST('search_bank_account', 'int');
-$search_amount			= GETPOST('search_amount', 'alpha');		// alpha because we must be able to search on '< x'
+$search_amount = GETPOST('search_amount', 'alpha'); // alpha because we must be able to search on '< x'
 
-$limit					= GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield				= GETPOST('sortfield', 'alpha');
 $sortorder				= GETPOST('sortorder', 'alpha');
-$page					= GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST('page', 'int');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST('page', 'int');
 
-if (empty($page) || $page == -1) $page = 0;		// If $page is not defined, or '' or -1
+if (empty($page) || $page == -1) $page = 0; // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
@@ -86,7 +86,7 @@ $pagenext = $page + 1;
 if (!$sortorder) $sortorder = "DESC";
 if (!$sortfield) $sortfield = "p.datep";
 
-$search_all = trim(GETPOSTISSET("search_all") ? GETPOSTISSET("search_all", 'alpha') : GETPOST('sall'));
+$search_all = trim(GETPOSTISSET("search_all") ? GETPOST("search_all", 'alpha') : GETPOST('sall'));
 
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array(
diff --git a/htdocs/fourn/product/list.php b/htdocs/fourn/product/list.php
index e3d2b5b91d2..04310945cf7 100644
--- a/htdocs/fourn/product/list.php
+++ b/htdocs/fourn/product/list.php
@@ -81,22 +81,22 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 
 if (empty($reshook))
 {
-    // Selection of new fields
-    include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
+	// Selection of new fields
+	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
-    // Purge search criteria
-    if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
-    {
-    	$sref = '';
-    	$sRefSupplier = '';
-    	$snom = '';
-        $search_field1 = '';
-        $search_field2 = '';
-        $search_date_creation = '';
-        $search_date_update = '';
-        $toselect = '';
-        $search_array_options = array();
-    }
+	// Purge search criteria
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
+	{
+		$sref = '';
+		$sRefSupplier = '';
+		$snom = '';
+		$search_field1 = '';
+		$search_field2 = '';
+		$search_date_creation = '';
+		$search_date_update = '';
+		$toselect = '';
+		$search_array_options = array();
+	}
 }
 
 /*
@@ -119,8 +119,8 @@ if ($fourn_id)
 
 $arrayofmassactions = array(
 	'generate_doc'=>$langs->trans("ReGeneratePDF"),
-    'builddoc'=>$langs->trans("PDFMerge"),
-    'presend'=>$langs->trans("SendByMail"),
+	'builddoc'=>$langs->trans("PDFMerge"),
+	'presend'=>$langs->trans("SendByMail"),
 );
 if ($user->rights->mymodule->supprimer) $arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
 if (in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
@@ -177,13 +177,13 @@ $sql .= $db->order($sortfield, $sortorder);
 $nbtotalofrecords = '';
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
-    $result = $db->query($sql);
-    $nbtotalofrecords = $db->num_rows($result);
-    if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
-    {
-    	$page = 0;
-    	$offset = 0;
-    }
+	$result = $db->query($sql);
+	$nbtotalofrecords = $db->num_rows($result);
+	if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+	{
+		$page = 0;
+		$offset = 0;
+	}
 }
 
 $sql .= $db->plimit($limit + 1, $offset);
@@ -224,12 +224,12 @@ if ($resql)
 	}
 
 	print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
-    if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+	if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	if ($fourn_id > 0) print '<input type="hidden" name="fourn_id" value="'.$fourn_id.'">';
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-    print '<input type="hidden" name="page" value="'.$page.'">';
+	print '<input type="hidden" name="page" value="'.$page.'">';
 	print '<input type="hidden" name="type" value="'.$type.'">';
 
 	$topicmail = "Information";
@@ -255,11 +255,11 @@ if ($resql)
 	print '<td></td>';
 	print '<td></td>';
 	print '<td></td>';
-    // add filters from hooks
-    $parameters = array();
-    $reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters, $object, $action);
-    if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-    print $hookmanager->resPrint;
+	// add filters from hooks
+	$parameters = array();
+	$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters, $object, $action);
+	if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+	print $hookmanager->resPrint;
 	print '<td class="liste_titre maxwidthsearch">';
 	$searchpicto = $form->showFilterButtons();
 	print $searchpicto;
@@ -276,10 +276,10 @@ if ($resql)
 	print_liste_field_titre("QtyMin", $_SERVER["PHP_SELF"], "ppf.quantity", $param, "", '', $sortfield, $sortorder, 'right ');
 	print_liste_field_titre("UnitPrice", $_SERVER["PHP_SELF"], "ppf.unitprice", $param, "", '', $sortfield, $sortorder, 'right ');
 	// add header cells from hooks
-    $parameters = array();
-    $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object, $action);
-    if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-    print $hookmanager->resPrint;
+	$parameters = array();
+	$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object, $action);
+	if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+	print $hookmanager->resPrint;
 	print_liste_field_titre('', $_SERVER["PHP_SELF"]);
 	print "</tr>\n";
 
@@ -318,10 +318,10 @@ if ($resql)
 		print '<td class="right">'.(isset($objp->unitprice) ? price($objp->unitprice) : '').'</td>';
 
 		// add additional columns from hooks
-        $parameters = array();
-        $reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $objp, $action);
-        if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-        print $hookmanager->resPrint;
+		$parameters = array();
+		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $objp, $action);
+		if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+		print $hookmanager->resPrint;
 
 		print '<td class="right"></td>';
 
diff --git a/htdocs/fourn/recap-fourn.php b/htdocs/fourn/recap-fourn.php
index e75151fb54a..736a7bf4f90 100644
--- a/htdocs/fourn/recap-fourn.php
+++ b/htdocs/fourn/recap-fourn.php
@@ -34,8 +34,8 @@ $langs->loadLangs(array('bills', 'companies'));
 $socid = GETPOST("socid", 'int');
 if ($user->socid > 0)
 {
-    $action = '';
-    $socid = $user->socid;
+	$action = '';
+	$socid = $user->socid;
 }
 
 
@@ -53,138 +53,138 @@ llxHeader();
 
 if ($socid > 0)
 {
-    $societe = new Societe($db);
-    $societe->fetch($socid);
+	$societe = new Societe($db);
+	$societe->fetch($socid);
 
-    /*
+	/*
      * Affichage onglets
      */
-    $head = societe_prepare_head($societe);
+	$head = societe_prepare_head($societe);
 
-    print dol_get_fiche_head($head, 'supplier', $langs->trans("ThirdParty"), 0, 'company');
+	print dol_get_fiche_head($head, 'supplier', $langs->trans("ThirdParty"), 0, 'company');
 	dol_banner_tab($societe, 'socid', '', ($user->socid ? 0 : 1), 'rowid', 'nom');
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
-    if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_invoice->enabled)) && $user->rights->facture->lire)
-    {
-        // Invoice list
-        print load_fiche_titre($langs->trans("SupplierPreview"));
+	if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_invoice->enabled)) && $user->rights->facture->lire)
+	{
+		// Invoice list
+		print load_fiche_titre($langs->trans("SupplierPreview"));
 
-        print '<table class="noborder tagtable liste centpercent">';
+		print '<table class="noborder tagtable liste centpercent">';
 
-        $sql = "SELECT s.nom, s.rowid as socid, f.ref_supplier, f.datef as df,";
-        $sql .= " f.paye as paye, f.fk_statut as statut, f.rowid as facid,";
-        $sql .= " u.login, u.rowid as userid";
-        $sql .= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture_fourn as f,".MAIN_DB_PREFIX."user as u";
-        $sql .= " WHERE f.fk_soc = s.rowid AND s.rowid = ".$societe->id;
-        $sql .= " AND f.entity IN (".getEntity("facture_fourn").")"; // Recognition of the entity attributed to this invoice for Multicompany
-        $sql .= " AND f.fk_user_valid = u.rowid";
-        $sql .= " ORDER BY f.datef DESC";
+		$sql = "SELECT s.nom, s.rowid as socid, f.ref_supplier, f.datef as df,";
+		$sql .= " f.paye as paye, f.fk_statut as statut, f.rowid as facid,";
+		$sql .= " u.login, u.rowid as userid";
+		$sql .= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture_fourn as f,".MAIN_DB_PREFIX."user as u";
+		$sql .= " WHERE f.fk_soc = s.rowid AND s.rowid = ".$societe->id;
+		$sql .= " AND f.entity IN (".getEntity("facture_fourn").")"; // Recognition of the entity attributed to this invoice for Multicompany
+		$sql .= " AND f.fk_user_valid = u.rowid";
+		$sql .= " ORDER BY f.datef DESC";
 
-        $resql = $db->query($sql);
-        if ($resql)
-        {
-            $num = $db->num_rows($resql);
+		$resql = $db->query($sql);
+		if ($resql)
+		{
+			$num = $db->num_rows($resql);
 
-            print '<tr class="liste_titre">';
-            print '<td width="100" class="center">'.$langs->trans("Date").'</td>';
-            print '<td>&nbsp;</td>';
-            print '<td>'.$langs->trans("Status").'</td>';
-            print '<td class="right">'.$langs->trans("Debit").'</td>';
-            print '<td class="right">'.$langs->trans("Credit").'</td>';
-            print '<td class="right">'.$langs->trans("Balance").'</td>';
-            print '<td>&nbsp;</td>';
-            print '</tr>';
+			print '<tr class="liste_titre">';
+			print '<td width="100" class="center">'.$langs->trans("Date").'</td>';
+			print '<td>&nbsp;</td>';
+			print '<td>'.$langs->trans("Status").'</td>';
+			print '<td class="right">'.$langs->trans("Debit").'</td>';
+			print '<td class="right">'.$langs->trans("Credit").'</td>';
+			print '<td class="right">'.$langs->trans("Balance").'</td>';
+			print '<td>&nbsp;</td>';
+			print '</tr>';
 
-            if (!$num > 0)
-            {
-                print '<tr><td colspan="7">'.$langs->trans("NoInvoice").'</td></tr>';
-            }
+			if (!$num > 0)
+			{
+				print '<tr><td colspan="7">'.$langs->trans("NoInvoice").'</td></tr>';
+			}
 
-            $solde = 0;
+			$solde = 0;
 
-            // Boucle sur chaque facture
-            for ($i = 0; $i < $num; $i++)
-            {
-                $objf = $db->fetch_object($resql);
+			// Boucle sur chaque facture
+			for ($i = 0; $i < $num; $i++)
+			{
+				$objf = $db->fetch_object($resql);
 
-                $fac = new FactureFournisseur($db);
-                $ret = $fac->fetch($objf->facid);
-                if ($ret < 0)
-                {
-                    print $fac->error."<br>";
-                    continue;
-                }
-                $totalpaye = $fac->getSommePaiement();
+				$fac = new FactureFournisseur($db);
+				$ret = $fac->fetch($objf->facid);
+				if ($ret < 0)
+				{
+					print $fac->error."<br>";
+					continue;
+				}
+				$totalpaye = $fac->getSommePaiement();
 
-                print '<tr class="oddeven">';
+				print '<tr class="oddeven">';
 
-                print "<td class=\"center\">".dol_print_date($fac->date)."</td>\n";
-                print "<td><a href=\"facture/card.php?facid=$fac->id\">".img_object($langs->trans("ShowBill"), "bill")." ".$fac->ref."</a></td>\n";
+				print "<td class=\"center\">".dol_print_date($fac->date)."</td>\n";
+				print "<td><a href=\"facture/card.php?facid=$fac->id\">".img_object($langs->trans("ShowBill"), "bill")." ".$fac->ref."</a></td>\n";
 
-                print '<td class="left">'.$fac->getLibStatut(2, $totalpaye).'</td>';
-                print '<td class="right">'.price($fac->total_ttc)."</td>\n";
-                $solde = $solde + $fac->total_ttc;
+				print '<td class="left">'.$fac->getLibStatut(2, $totalpaye).'</td>';
+				print '<td class="right">'.price($fac->total_ttc)."</td>\n";
+				$solde = $solde + $fac->total_ttc;
 
-                print '<td class="right">&nbsp;</td>';
-                print '<td class="right">'.price($solde)."</td>\n";
+				print '<td class="right">&nbsp;</td>';
+				print '<td class="right">'.price($solde)."</td>\n";
 
-                // Author
-                print '<td class="nowrap" width="50"><a href="'.DOL_URL_ROOT.'/user/card.php?id='.$objf->userid.'">'.img_object($langs->trans("ShowUser"), 'user').' '.$objf->login.'</a></td>';
+				// Author
+				print '<td class="nowrap" width="50"><a href="'.DOL_URL_ROOT.'/user/card.php?id='.$objf->userid.'">'.img_object($langs->trans("ShowUser"), 'user').' '.$objf->login.'</a></td>';
 
-                print "</tr>\n";
+				print "</tr>\n";
 
-                // Payments
-                $sql = "SELECT p.rowid, p.datep as dp, pf.amount, p.statut,";
-                $sql .= " p.fk_user_author, u.login, u.rowid as userid";
-                $sql .= " FROM ".MAIN_DB_PREFIX."paiementfourn_facturefourn as pf,";
-                $sql .= " ".MAIN_DB_PREFIX."paiementfourn as p";
-                $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as u ON p.fk_user_author = u.rowid";
-                $sql .= " WHERE pf.fk_paiementfourn = p.rowid";
-                $sql .= " AND pf.fk_facturefourn = ".$fac->id;
+				// Payments
+				$sql = "SELECT p.rowid, p.datep as dp, pf.amount, p.statut,";
+				$sql .= " p.fk_user_author, u.login, u.rowid as userid";
+				$sql .= " FROM ".MAIN_DB_PREFIX."paiementfourn_facturefourn as pf,";
+				$sql .= " ".MAIN_DB_PREFIX."paiementfourn as p";
+				$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as u ON p.fk_user_author = u.rowid";
+				$sql .= " WHERE pf.fk_paiementfourn = p.rowid";
+				$sql .= " AND pf.fk_facturefourn = ".$fac->id;
 
-                $resqlp = $db->query($sql);
-                if ($resqlp)
-                {
-                    $nump = $db->num_rows($resqlp);
-                    $j = 0;
+				$resqlp = $db->query($sql);
+				if ($resqlp)
+				{
+					$nump = $db->num_rows($resqlp);
+					$j = 0;
 
-                    while ($j < $nump)
-                    {
-                        $objp = $db->fetch_object($resqlp);
-                        //
-                        print '<tr class="oddeven">';
-                        print '<td class="center">'.dol_print_date($db->jdate($objp->dp))."</td>\n";
-                        print '<td>';
-                        print '&nbsp; &nbsp; &nbsp; '; // Decalage
-                        print '<a href="paiement/card.php?id='.$objp->rowid.'">'.img_object($langs->trans("ShowPayment"), "payment").' '.$langs->trans("Payment").' '.$objp->rowid.'</td>';
-                        print "<td>&nbsp;</td>\n";
-                        print "<td>&nbsp;</td>\n";
-                        print '<td class="right">'.price($objp->amount).'</td>';
-                        $solde = $solde - $objp->amount;
-                        print '<td class="right">'.price($solde)."</td>\n";
+					while ($j < $nump)
+					{
+						$objp = $db->fetch_object($resqlp);
+						//
+						print '<tr class="oddeven">';
+						print '<td class="center">'.dol_print_date($db->jdate($objp->dp))."</td>\n";
+						print '<td>';
+						print '&nbsp; &nbsp; &nbsp; '; // Decalage
+						print '<a href="paiement/card.php?id='.$objp->rowid.'">'.img_object($langs->trans("ShowPayment"), "payment").' '.$langs->trans("Payment").' '.$objp->rowid.'</td>';
+						print "<td>&nbsp;</td>\n";
+						print "<td>&nbsp;</td>\n";
+						print '<td class="right">'.price($objp->amount).'</td>';
+						$solde = $solde - $objp->amount;
+						print '<td class="right">'.price($solde)."</td>\n";
 
-                        // Auteur
-                        print '<td class="nowrap" width="50"><a href="'.DOL_URL_ROOT.'/user/card.php?id='.$objp->userid.'">'.img_object($langs->trans("ShowUser"), 'user').' '.$objp->login.'</a></td>';
+						// Auteur
+						print '<td class="nowrap" width="50"><a href="'.DOL_URL_ROOT.'/user/card.php?id='.$objp->userid.'">'.img_object($langs->trans("ShowUser"), 'user').' '.$objp->login.'</a></td>';
 
-                        print '</tr>';
+						print '</tr>';
 
-                        $j++;
-                    }
+						$j++;
+					}
 
-                    $db->free($resqlp);
-                } else {
-                    dol_print_error($db);
-                }
-            }
-        } else {
-            dol_print_error($db);
-        }
+					$db->free($resqlp);
+				} else {
+					dol_print_error($db);
+				}
+			}
+		} else {
+			dol_print_error($db);
+		}
 
-        print "</table>";
-    }
+		print "</table>";
+	}
 } else {
-    dol_print_error($db);
+	dol_print_error($db);
 }
 
 // End of page
diff --git a/htdocs/ftp/admin/ftpclient.php b/htdocs/ftp/admin/ftpclient.php
index 70a96546fc2..6a51d6d0a88 100644
--- a/htdocs/ftp/admin/ftpclient.php
+++ b/htdocs/ftp/admin/ftpclient.php
@@ -114,16 +114,16 @@ if (GETPOST('delete', 'alpha'))
 		if ($result4) $result5 = dolibarr_del_const($db, "FTP_NAME_".$entry, $conf->entity);
 		if ($result4) $result6 = dolibarr_del_const($db, "FTP_PASSIVE_".$entry, $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);
+		}
+	}
 }
 
 
diff --git a/htdocs/ftp/index.php b/htdocs/ftp/index.php
index 7c0eab0f352..51a8028e1f3 100644
--- a/htdocs/ftp/index.php
+++ b/htdocs/ftp/index.php
@@ -108,7 +108,7 @@ if (GETPOST("sendit") && !empty($conf->global->MAIN_UPLOAD_DOC))
 			{
 				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
 			{
@@ -158,10 +158,10 @@ if ($action == 'confirm_deletefile' && GETPOST('confirm') == 'yes')
 		$newsection = $section;
 		if (!empty($conf->global->FTP_CONNECT_WITH_SFTP))
 		{
-			$newsection = ssh2_sftp_realpath($conn_id, ".").'/./';		// workaround for bug https://bugs.php.net/bug.php?id=64169
+			$newsection = ssh2_sftp_realpath($conn_id, ".").'/./'; // workaround for bug https://bugs.php.net/bug.php?id=64169
 		}
 
-	    $langs->load("other");
+		$langs->load("other");
 
 		// Remote file
 		$filename = $file;
@@ -210,14 +210,14 @@ if (GETPOST("const", 'array') && GETPOST("delete") && GETPOST("delete") == $lang
 		{
 			if ($const["check"])	// Is checkbox checked
 			{
-			    $langs->load("other");
+				$langs->load("other");
 
 				// Remote file
 				$file = $const["file"];
 				$newsection = $const["section"];
 				if (!empty($conf->global->FTP_CONNECT_WITH_SFTP))
 				{
-					$newsection = ssh2_sftp_realpath($conn_id, ".").'/./';		// workaround for bug https://bugs.php.net/bug.php?id=64169
+					$newsection = ssh2_sftp_realpath($conn_id, ".").'/./'; // workaround for bug https://bugs.php.net/bug.php?id=64169
 				}
 				$remotefile = $newsection.(preg_match('@[\\\/]$@', $newsection) ? '' : '/').$file;
 				$newremotefileiso = utf8_decode($remotefile);
@@ -265,7 +265,7 @@ if ($action == 'confirm_deletesection' && $confirm == 'yes')
 		$newsection = $section;
 		if (!empty($conf->global->FTP_CONNECT_WITH_SFTP))
 		{
-			$newsection = ssh2_sftp_realpath($conn_id, ".").'/./';		// workaround for bug https://bugs.php.net/bug.php?id=64169
+			$newsection = ssh2_sftp_realpath($conn_id, ".").'/./'; // workaround for bug https://bugs.php.net/bug.php?id=64169
 		}
 
 		// Remote file
@@ -314,7 +314,7 @@ if ($action == 'download')
 		$newsection = $section;
 		if (!empty($conf->global->FTP_CONNECT_WITH_SFTP))
 		{
-			$newsection = ssh2_sftp_realpath($conn_id, ".").'/./';		// workaround for bug https://bugs.php.net/bug.php?id=64169
+			$newsection = ssh2_sftp_realpath($conn_id, ".").'/./'; // workaround for bug https://bugs.php.net/bug.php?id=64169
 		}
 
 		// Remote file
@@ -323,7 +323,7 @@ if ($action == 'download')
 		$newremotefileiso = utf8_decode($remotefile);
 
 		if (!empty($conf->global->FTP_CONNECT_WITH_SFTP)) {
-			$result = fopen('ssh2.sftp://' . intval($conn_id) . $newremotefileiso, 'r');
+			$result = fopen('ssh2.sftp://'.intval($conn_id).$newremotefileiso, 'r');
 		} else {
 			$result = ftp_get($conn_id, $localfile, $newremotefileiso, FTP_BINARY);
 		}
@@ -415,7 +415,7 @@ if (!function_exists('ftp_connect'))
 {
 	print $langs->trans("FTPFeatureNotSupportedByYourPHP");
 } else {
-    if (!empty($ftp_server))
+	if (!empty($ftp_server))
 	{
 		// Confirm remove file
 		if ($action == 'delete')
@@ -432,9 +432,9 @@ if (!function_exists('ftp_connect'))
 		print $langs->trans("Server").': <b>'.$ftp_server.'</b><br>';
 		print $langs->trans("Port").': <b>'.$ftp_port.'</b> '.($ftp_passive ? "(Passive)" : "(Active)").'<br>';
 		print $langs->trans("User").': <b>'.$ftp_user.'</b><br>';
-        print $langs->trans("FTPs (FTP over SSH)").': <b>'.yn($conf->global->FTP_CONNECT_WITH_SSL).'</b><br>';
-        print $langs->trans("SFTP (FTP as a subsytem of SSH)").': <b>'.yn($conf->global->FTP_CONNECT_WITH_SFTP).'</b><br>';
-        print $langs->trans("Directory").': ';
+		print $langs->trans("FTPs (FTP over SSH)").': <b>'.yn($conf->global->FTP_CONNECT_WITH_SSL).'</b><br>';
+		print $langs->trans("SFTP (FTP as a subsytem of SSH)").': <b>'.yn($conf->global->FTP_CONNECT_WITH_SFTP).'</b><br>';
+		print $langs->trans("Directory").': ';
 		$sectionarray = preg_split('|[\/]|', $section);
 		// For /
 		$newsection = '/';
@@ -461,7 +461,7 @@ if (!function_exists('ftp_connect'))
 		print "<br>\n";
 
 		print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-        print '<input type="hidden" name="numero_ftp" value="'.$numero_ftp.'">';
+		print '<input type="hidden" name="numero_ftp" value="'.$numero_ftp.'">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 
 
@@ -496,7 +496,7 @@ if (!function_exists('ftp_connect'))
 			//$type = ftp_systype($conn_id);
 
 			$newsection = $section;
-		    $newsectioniso = utf8_decode($section);
+			$newsectioniso = utf8_decode($section);
 			//$newsection='/home';
 
 			// List content of directory ($newsection = '/', '/home', ...)
@@ -504,23 +504,23 @@ if (!function_exists('ftp_connect'))
 			{
 				if ($newsection == '/') {
 					//$newsection = '/./';
-					$newsection = ssh2_sftp_realpath($conn_id, ".").'/./';		// workaround for bug https://bugs.php.net/bug.php?id=64169
+					$newsection = ssh2_sftp_realpath($conn_id, ".").'/./'; // workaround for bug https://bugs.php.net/bug.php?id=64169
 				}
-			    //$newsection='/';
-			    //$dirHandle = opendir("ssh2.sftp://$conn_id".$newsection);
+				//$newsection='/';
+				//$dirHandle = opendir("ssh2.sftp://$conn_id".$newsection);
 				//$dirHandle = opendir("ssh2.sftp://".intval($conn_id).ssh2_sftp_realpath($conn_id, ".").'/./');
-                $contents = scandir('ssh2.sftp://'.intval($conn_id).$newsection);
-                $buff = array();
-                foreach ($contents as $i => $key)
-                {
-                    $buff[$i] = "---------- - root root 1234 Aug 01 2000 ".$key;
-                }
-    		} else {
-                $buff = ftp_rawlist($conn_id, $newsectioniso);
-                $contents = ftp_nlist($conn_id, $newsectioniso); // Sometimes rawlist fails but never nlist
-        		//var_dump($contents);
-		        //var_dump($buff);
-    		}
+				$contents = scandir('ssh2.sftp://'.intval($conn_id).$newsection);
+				$buff = array();
+				foreach ($contents as $i => $key)
+				{
+					$buff[$i] = "---------- - root root 1234 Aug 01 2000 ".$key;
+				}
+			} else {
+				$buff = ftp_rawlist($conn_id, $newsectioniso);
+				$contents = ftp_nlist($conn_id, $newsectioniso); // Sometimes rawlist fails but never nlist
+				//var_dump($contents);
+				//var_dump($buff);
+			}
 
 			$nboflines = count($contents);
 			$rawlisthasfailed = false;
@@ -626,8 +626,8 @@ if (!function_exists('ftp_connect'))
 
 		if (!$ok)
 		{
-		      print $mesg.'<br>'."\n";
-		      setEventMessages($mesg, null, 'errors');
+			  print $mesg.'<br>'."\n";
+			  setEventMessages($mesg, null, 'errors');
 		}
 
 
@@ -661,12 +661,12 @@ if (!function_exists('ftp_connect'))
 			}
 			$i++;
 		}
-	    if (!$foundsetup)
-	    {
-            print $langs->trans("SetupOfFTPClientModuleNotComplete");
-	    } else {
-	        print $langs->trans("ChooseAFTPEntryIntoMenu");
-	    }
+		if (!$foundsetup)
+		{
+			print $langs->trans("SetupOfFTPClientModuleNotComplete");
+		} else {
+			print $langs->trans("ChooseAFTPEntryIntoMenu");
+		}
 	}
 }
 
@@ -675,14 +675,14 @@ print '<br>';
 // Close FTP connection
 if ($conn_id)
 {
-    if (!empty($conf->global->FTP_CONNECT_WITH_SFTP))
-    {
-    } elseif (!empty($conf->global->FTP_CONNECT_WITH_SSL))
-    {
-        ftp_close($conn_id);
-    } else {
-        ftp_close($conn_id);
-    }
+	if (!empty($conf->global->FTP_CONNECT_WITH_SFTP))
+	{
+	} elseif (!empty($conf->global->FTP_CONNECT_WITH_SSL))
+	{
+		ftp_close($conn_id);
+	} else {
+		ftp_close($conn_id);
+	}
 }
 
 // End of page
@@ -707,7 +707,7 @@ function dol_ftp_connect($ftp_server, $ftp_port, $ftp_user, $ftp_password, $sect
 	global $langs, $conf;
 
 	$ok = 1;
-    $conn_id = null;
+	$conn_id = null;
 
 	if (!is_numeric($ftp_port))
 	{
@@ -719,14 +719,14 @@ function dol_ftp_connect($ftp_server, $ftp_port, $ftp_user, $ftp_password, $sect
 	{
 		$connecttimeout = (empty($conf->global->FTP_CONNECT_TIMEOUT) ? 40 : $conf->global->FTP_CONNECT_TIMEOUT);
 		if (!empty($conf->global->FTP_CONNECT_WITH_SFTP)) {
-		    dol_syslog('Try to connect with ssh2_ftp');
-		    $tmp_conn_id = ssh2_connect($ftp_server, $ftp_port);
+			dol_syslog('Try to connect with ssh2_ftp');
+			$tmp_conn_id = ssh2_connect($ftp_server, $ftp_port);
 		} elseif (!empty($conf->global->FTP_CONNECT_WITH_SSL)) {
-		    dol_syslog('Try to connect with ftp_ssl_connect');
-		    $conn_id = ftp_ssl_connect($ftp_server, $ftp_port, $connecttimeout);
+			dol_syslog('Try to connect with ftp_ssl_connect');
+			$conn_id = ftp_ssl_connect($ftp_server, $ftp_port, $connecttimeout);
 		} else {
-		    dol_syslog('Try to connect with ftp_connect');
-		    $conn_id = ftp_connect($ftp_server, $ftp_port, $connecttimeout);
+			dol_syslog('Try to connect with ftp_connect');
+			$conn_id = ftp_connect($ftp_server, $ftp_port, $connecttimeout);
 		}
 		if ($conn_id || $tmp_conn_id)
 		{
@@ -735,46 +735,46 @@ function dol_ftp_connect($ftp_server, $ftp_port, $ftp_user, $ftp_password, $sect
 				if (!empty($conf->global->FTP_CONNECT_WITH_SFTP))
 				{
 					dol_syslog('Try to authenticate with ssh2_auth_password');
-				    if (ssh2_auth_password($tmp_conn_id, $ftp_user, $ftp_password))
-    				{
-    					// Turn on passive mode transfers (must be after a successful login
-    					//if ($ftp_passive) ftp_pasv($conn_id, true);
+					if (ssh2_auth_password($tmp_conn_id, $ftp_user, $ftp_password))
+					{
+						// Turn on passive mode transfers (must be after a successful login
+						//if ($ftp_passive) ftp_pasv($conn_id, true);
 
-    					// Change the dir
-    					$newsectioniso = utf8_decode($section);
-    					//ftp_chdir($conn_id, $newsectioniso);
-		                $conn_id = ssh2_sftp($tmp_conn_id);
-		                if (!$conn_id)
-		                {
-		                	dol_syslog('Failed to connect to SFTP after sssh authentication', LOG_DEBUG);
-        					$mesg = $langs->transnoentitiesnoconv("FailedToConnectToSFTPAfterSSHAuthentication");
-    	   				    $ok = 0;
-        				    $error++;
-		                }
-    				} else {
-    					dol_syslog('Failed to connect to FTP with login '.$ftp_user, LOG_DEBUG);
-    					$mesg = $langs->transnoentitiesnoconv("FailedToConnectToFTPServerWithCredentials");
-	   				    $ok = 0;
-    				    $error++;
-    				}
+						// Change the dir
+						$newsectioniso = utf8_decode($section);
+						//ftp_chdir($conn_id, $newsectioniso);
+						$conn_id = ssh2_sftp($tmp_conn_id);
+						if (!$conn_id)
+						{
+							dol_syslog('Failed to connect to SFTP after sssh authentication', LOG_DEBUG);
+							$mesg = $langs->transnoentitiesnoconv("FailedToConnectToSFTPAfterSSHAuthentication");
+		   					$ok = 0;
+							$error++;
+						}
+					} else {
+						dol_syslog('Failed to connect to FTP with login '.$ftp_user, LOG_DEBUG);
+						$mesg = $langs->transnoentitiesnoconv("FailedToConnectToFTPServerWithCredentials");
+	   					$ok = 0;
+						$error++;
+					}
 				} else {
-				    if (ftp_login($conn_id, $ftp_user, $ftp_password))
-    				{
-    					// Turn on passive mode transfers (must be after a successful login
-    					if ($ftp_passive) ftp_pasv($conn_id, true);
+					if (ftp_login($conn_id, $ftp_user, $ftp_password))
+					{
+						// Turn on passive mode transfers (must be after a successful login
+						if ($ftp_passive) ftp_pasv($conn_id, true);
 
-    					// Change the dir
-    					$newsectioniso = utf8_decode($section);
-    					ftp_chdir($conn_id, $newsectioniso);
-    				} else {
-    					$mesg = $langs->transnoentitiesnoconv("FailedToConnectToFTPServerWithCredentials");
-	   				    $ok = 0;
-    				    $error++;
-    				}
+						// Change the dir
+						$newsectioniso = utf8_decode($section);
+						ftp_chdir($conn_id, $newsectioniso);
+					} else {
+						$mesg = $langs->transnoentitiesnoconv("FailedToConnectToFTPServerWithCredentials");
+	   					$ok = 0;
+						$error++;
+					}
 				}
 			}
 		} else {
-		    dol_syslog('FailedToConnectToFTPServer '.$ftp_server.' '.$ftp_port, LOG_ERR);
+			dol_syslog('FailedToConnectToFTPServer '.$ftp_server.' '.$ftp_port, LOG_ERR);
 			$mesg = $langs->transnoentitiesnoconv("FailedToConnectToFTPServer", $ftp_server, $ftp_port);
 			$ok = 0;
 		}
diff --git a/htdocs/holiday/card.php b/htdocs/holiday/card.php
index 1aac890c458..5cd43424760 100644
--- a/htdocs/holiday/card.php
+++ b/htdocs/holiday/card.php
@@ -153,7 +153,7 @@ if (empty($reshook))
 				setEventMessages($langs->trans("NotEnoughPermission"), null, 'errors');
 			} else {
 				if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || empty($user->rights->expensereport->writeall_advance)) {
-					if (! in_array($fuserid, $childids)) {
+					if (!in_array($fuserid, $childids)) {
 						$error++;
 						setEventMessages($langs->trans("UserNotInHierachy"), null, 'errors');
 						$action = 'create';
@@ -204,7 +204,7 @@ if (empty($reshook))
 			$nbopenedday = num_open_day($date_debut_gmt, $date_fin_gmt, 0, 1, $halfday);
 			if ($nbopenedday < 0.5)
 			{
-				setEventMessages($langs->trans("ErrorDureeCP"), null, 'errors');		// No working day
+				setEventMessages($langs->trans("ErrorDureeCP"), null, 'errors'); // No working day
 				$error++;
 				$action = 'create';
 			}
@@ -979,7 +979,7 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add')
 			print $langs->trans('SoldeCPUser', round($nb_holiday, 5)).'<br>';
 			print $out;
 
-			dol_fiche_end();
+			print dol_get_fiche_end();
 		} elseif (!is_numeric($conf->global->HOLIDAY_HIDE_BALANCE))
 		{
 			print $langs->trans($conf->global->HOLIDAY_HIDE_BALANCE).'<br>';
@@ -1094,7 +1094,7 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add')
 		print '</tbody>';
 		print '</table>';
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 		print '<div class="center">';
 		print '<input type="submit" value="'.$langs->trans("SendRequestCP").'" name="bouton" class="button">';
@@ -1394,7 +1394,7 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add')
 
 				print '<div class="clearboth"></div>';
 
-				dol_fiche_end();
+				print dol_get_fiche_end();
 
 
 				// Confirmation messages
diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php
index b702bbf5353..a0f640f0cd3 100644
--- a/htdocs/holiday/class/holiday.class.php
+++ b/htdocs/holiday/class/holiday.class.php
@@ -85,36 +85,36 @@ class Holiday extends CommonObject
 	public $statut = ''; // 1=draft, 2=validated, 3=approved
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_validator;
 
 	public $date_valid = '';
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_user_valid;
 
 	public $date_refuse = '';
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_user_refuse;
 
 	public $date_cancel = '';
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_user_cancel;
 
 	public $detail_refuse = '';
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_type;
 
 	public $holiday = array();
@@ -1178,11 +1178,11 @@ class Holiday extends CommonObject
 
 		$result = '';
 
-		$label = img_picto('', $this->picto).' <u>'.$langs->trans("Holiday").'</u>';
-		$label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
+		$label = img_picto('', $this->picto).' <u class="paddingrightonly">'.$langs->trans("Holiday").'</u>';
 		if (isset($this->statut)) {
-			$label .= '<br><b>'.$langs->trans("Status").":</b> ".$this->getLibStatut(5);
+			$label .= ' '.$this->getLibStatut(5);
 		}
+		$label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
 
 		$url = DOL_URL_ROOT.'/holiday/card.php?id='.$this->id;
 
@@ -1217,7 +1217,7 @@ class Holiday extends CommonObject
 		return $this->LibStatut($this->statut, $mode, $this->date_debut);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Returns the label of a status
 	 *
@@ -1263,8 +1263,8 @@ class Holiday extends CommonObject
 	 *   @param		string	$htmlname		Name of HTML select field
 	 *   @return    string					Show select of status
 	 */
-    public function selectStatutCP($selected = '', $htmlname = 'select_statut')
-    {
+	public function selectStatutCP($selected = '', $htmlname = 'select_statut')
+	{
 
 		global $langs;
 
@@ -1298,8 +1298,8 @@ class Holiday extends CommonObject
 	 *  @param	string	$value      vrai si mise à jour OK sinon faux
 	 *  @return boolean				ok or ko
 	 */
-    public function updateConfCP($name, $value)
-    {
+	public function updateConfCP($name, $value)
+	{
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."holiday_config SET";
 		$sql .= " value = '".$this->db->escape($value)."'";
@@ -1493,8 +1493,8 @@ class Holiday extends CommonObject
 	 *  @param	string	$name       name du paramètre de configuration
 	 *  @return string      		retourne checked si > 0
 	 */
-    public function getCheckOption($name)
-    {
+	public function getCheckOption($name)
+	{
 
 		$sql = "SELECT value";
 		$sql .= " FROM ".MAIN_DB_PREFIX."holiday_config";
@@ -1553,8 +1553,8 @@ class Holiday extends CommonObject
 	 *  @param	int		$user_id        ID de l'utilisateur à supprimer
 	 *  @return boolean      			Vrai si pas d'erreur, faut si Erreur
 	 */
-    public function deleteCPuser($user_id)
-    {
+	public function deleteCPuser($user_id)
+	{
 
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."holiday_users";
 		$sql .= " WHERE fk_user = ".((int) $user_id);
@@ -1800,7 +1800,7 @@ class Holiday extends CommonObject
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Return list of people with permission to validate leave requests.
 	 * Search for permission "approve leave requests"
@@ -1809,7 +1809,7 @@ class Holiday extends CommonObject
 	 */
 	public function fetch_users_approver_holiday()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$users_validator = array();
 
 		$sql = "SELECT DISTINCT ur.fk_user";
@@ -1862,8 +1862,8 @@ class Holiday extends CommonObject
 	 *
 	 *  @return     int      retourne le nombre d'utilisateur
 	 */
-    public function countActiveUsersWithoutCP()
-    {
+	public function countActiveUsersWithoutCP()
+	{
 
 		$sql = "SELECT count(u.rowid) as compteur";
 		$sql .= " FROM ".MAIN_DB_PREFIX."user as u LEFT OUTER JOIN ".MAIN_DB_PREFIX."holiday_users hu ON (hu.fk_user=u.rowid)";
@@ -2097,95 +2097,95 @@ class Holiday extends CommonObject
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-     *      Load this->nb for dashboard
-     *
-     *      @return     int         <0 if KO, >0 if OK
-     */
-    public function load_state_board()
-    {
-        // phpcs:enable
+	 *      Load this->nb for dashboard
+	 *
+	 *      @return     int         <0 if KO, >0 if OK
+	 */
+	public function load_state_board()
+	{
+		// phpcs:enable
 		global $user;
 
-        $this->nb = array();
+		$this->nb = array();
 
-        $sql = "SELECT count(h.rowid) as nb";
-        $sql .= " FROM ".MAIN_DB_PREFIX."holiday as h";
-        $sql .= " WHERE h.statut > 1";
-        $sql .= " AND h.entity IN (".getEntity('holiday').")";
+		$sql = "SELECT count(h.rowid) as nb";
+		$sql .= " FROM ".MAIN_DB_PREFIX."holiday as h";
+		$sql .= " WHERE h.statut > 1";
+		$sql .= " AND h.entity IN (".getEntity('holiday').")";
 		if (empty($user->rights->expensereport->read_all))
 		{
 			$userchildids = $user->getAllChildIds(1);
-			$sql.= " AND (h.fk_user IN (".join(',', $userchildids).")";
-			$sql.= " OR h.fk_validator IN (".join(',', $userchildids)."))";
+			$sql .= " AND (h.fk_user IN (".join(',', $userchildids).")";
+			$sql .= " OR h.fk_validator IN (".join(',', $userchildids)."))";
 		}
 
-        $resql = $this->db->query($sql);
-        if ($resql) {
-            while ($obj = $this->db->fetch_object($resql)) {
-                $this->nb["holidays"] = $obj->nb;
-            }
-            $this->db->free($resql);
-            return 1;
-        } else {
-            dol_print_error($this->db);
-            $this->error = $this->db->error();
-            return -1;
-        }
-    }
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			while ($obj = $this->db->fetch_object($resql)) {
+				$this->nb["holidays"] = $obj->nb;
+			}
+			$this->db->free($resql);
+			return 1;
+		} else {
+			dol_print_error($this->db);
+			$this->error = $this->db->error();
+			return -1;
+		}
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *      Load indicators for dashboard (this->nbtodo and this->nbtodolate)
-     *
-     *      @param	User	$user   		Objet user
-     *      @return WorkboardResponse|int 	<0 if KO, WorkboardResponse if OK
-     */
-    public function load_board($user)
-    {
-        // phpcs:enable
-        global $conf, $langs;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *      Load indicators for dashboard (this->nbtodo and this->nbtodolate)
+	 *
+	 *      @param	User	$user   		Objet user
+	 *      @return WorkboardResponse|int 	<0 if KO, WorkboardResponse if OK
+	 */
+	public function load_board($user)
+	{
+		// phpcs:enable
+		global $conf, $langs;
 
-        if ($user->socid) return -1; // protection pour eviter appel par utilisateur externe
+		if ($user->socid) return -1; // protection pour eviter appel par utilisateur externe
 
-        $now = dol_now();
+		$now = dol_now();
 
-        $sql = "SELECT h.rowid, h.date_debut";
-        $sql .= " FROM ".MAIN_DB_PREFIX."holiday as h";
-        $sql .= " WHERE h.statut = 2";
-        $sql .= " AND h.entity IN (".getEntity('holiday').")";
+		$sql = "SELECT h.rowid, h.date_debut";
+		$sql .= " FROM ".MAIN_DB_PREFIX."holiday as h";
+		$sql .= " WHERE h.statut = 2";
+		$sql .= " AND h.entity IN (".getEntity('holiday').")";
 		if (empty($user->rights->expensereport->read_all))
 		{
 			$userchildids = $user->getAllChildIds(1);
-			$sql.= " AND (h.fk_user IN (".join(',', $userchildids).")";
-			$sql.= " OR h.fk_validator IN (".join(',', $userchildids)."))";
+			$sql .= " AND (h.fk_user IN (".join(',', $userchildids).")";
+			$sql .= " OR h.fk_validator IN (".join(',', $userchildids)."))";
 		}
 
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            $langs->load("members");
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$langs->load("members");
 
-            $response = new WorkboardResponse();
-            $response->warning_delay = $conf->holiday->approve->warning_delay / 60 / 60 / 24;
-            $response->label = $langs->trans("HolidaysToApprove");
-            $response->labelShort = $langs->trans("ToApprove");
-            $response->url = DOL_URL_ROOT.'/holiday/list.php?search_statut=2&amp;mainmenu=hrm&amp;leftmenu=holiday';
-            $response->img = img_object('', "holiday");
+			$response = new WorkboardResponse();
+			$response->warning_delay = $conf->holiday->approve->warning_delay / 60 / 60 / 24;
+			$response->label = $langs->trans("HolidaysToApprove");
+			$response->labelShort = $langs->trans("ToApprove");
+			$response->url = DOL_URL_ROOT.'/holiday/list.php?search_statut=2&amp;mainmenu=hrm&amp;leftmenu=holiday';
+			$response->img = img_object('', "holiday");
 
-            while ($obj = $this->db->fetch_object($resql))
-            {
-                $response->nbtodo++;
+			while ($obj = $this->db->fetch_object($resql))
+			{
+				$response->nbtodo++;
 
-                if ($this->db->jdate($obj->date_debut) < ($now - $conf->holiday->approve->warning_delay)) {
-                    $response->nbtodolate++;
-                }
-            }
+				if ($this->db->jdate($obj->date_debut) < ($now - $conf->holiday->approve->warning_delay)) {
+					$response->nbtodolate++;
+				}
+			}
 
-            return $response;
-        } else {
-            dol_print_error($this->db);
-            $this->error = $this->db->error();
-            return -1;
-        }
-    }
+			return $response;
+		} else {
+			dol_print_error($this->db);
+			$this->error = $this->db->error();
+			return -1;
+		}
+	}
 }
diff --git a/htdocs/holiday/common.inc.php b/htdocs/holiday/common.inc.php
index 5fbab2c2700..f8a09e85ad5 100644
--- a/htdocs/holiday/common.inc.php
+++ b/htdocs/holiday/common.inc.php
@@ -33,10 +33,10 @@ $langs->loadLangs(array('user', 'other', 'holiday'));
 
 if (empty($conf->holiday->enabled))
 {
-    llxHeader('', $langs->trans('CPTitreMenu'));
-    print '<div class="tabBar">';
-    print '<span style="color: #FF0000;">'.$langs->trans('NotActiveModCP').'</span>';
-    print '</div>';
-    llxFooter();
-    exit();
+	llxHeader('', $langs->trans('CPTitreMenu'));
+	print '<div class="tabBar">';
+	print '<span style="color: #FF0000;">'.$langs->trans('NotActiveModCP').'</span>';
+	print '</div>';
+	llxFooter();
+	exit();
 }
diff --git a/htdocs/holiday/define_holiday.php b/htdocs/holiday/define_holiday.php
index af646984045..47f6eeda550 100644
--- a/htdocs/holiday/define_holiday.php
+++ b/htdocs/holiday/define_holiday.php
@@ -79,20 +79,20 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 
 if (empty($reshook))
 {
-    // Selection of new fields
-    include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
+	// Selection of new fields
+	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
-    // Purge search criteria
-    if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
-    {
-        $search_name = '';
-        $search_supervisor = '';
-        $toselect = '';
-        $search_array_options = array();
-    }
+	// Purge search criteria
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
+	{
+		$search_name = '';
+		$search_supervisor = '';
+		$toselect = '';
+		$search_array_options = array();
+	}
 
-    // Mass actions
-    /*
+	// Mass actions
+	/*
     $objectclass='Skeleton';
     $objectlabel='Skeleton';
     $permissiontoread = $user->rights->skeleton->read;
@@ -101,52 +101,52 @@ if (empty($reshook))
     include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
     */
 
-    // Si il y a une action de mise à jour
-    if ($action == 'update' && isset($_POST['update_cp']))
-    {
-    	$error = 0;
+	// Si il y a une action de mise à jour
+	if ($action == 'update' && isset($_POST['update_cp']))
+	{
+		$error = 0;
 
-    	$typeleaves = $holiday->getTypes(1, 1);
+		$typeleaves = $holiday->getTypes(1, 1);
 
-        $userID = array_keys($_POST['update_cp']);
-        $userID = $userID[0];
+		$userID = array_keys($_POST['update_cp']);
+		$userID = $userID[0];
 
-        foreach ($typeleaves as $key => $val)
-        {
-    	    $userValue = $_POST['nb_holiday_'.$val['rowid']];
-    	    $userValue = $userValue[$userID];
+		foreach ($typeleaves as $key => $val)
+		{
+			$userValue = $_POST['nb_holiday_'.$val['rowid']];
+			$userValue = $userValue[$userID];
 
-    	    if (!empty($userValue) || (string) $userValue == '0')
-    	    {
-    	        $userValue = price2num($userValue, 5);
-    	    } else {
-    	        $userValue = '';
-    	    }
+			if (!empty($userValue) || (string) $userValue == '0')
+			{
+				$userValue = price2num($userValue, 5);
+			} else {
+				$userValue = '';
+			}
 
-    	    //If the user set a comment, we add it to the log comment
-    	    $comment = ((isset($_POST['note_holiday'][$userID]) && !empty($_POST['note_holiday'][$userID])) ? ' ('.$_POST['note_holiday'][$userID].')' : '');
+			//If the user set a comment, we add it to the log comment
+			$comment = ((isset($_POST['note_holiday'][$userID]) && !empty($_POST['note_holiday'][$userID])) ? ' ('.$_POST['note_holiday'][$userID].')' : '');
 
-    	    //print 'holiday: '.$val['rowid'].'-'.$userValue;
-    		if ($userValue != '')
-    		{
-    			// We add the modification to the log (must be before update of sold because we read current value of sold)
-    		    $result = $holiday->addLogCP($user->id, $userID, $langs->transnoentitiesnoconv('ManualUpdate').$comment, $userValue, $val['rowid']);
-    			if ($result < 0)
-    			{
-    				setEventMessages($holiday->error, $holiday->errors, 'errors');
-    				$error++;
-    			}
+			//print 'holiday: '.$val['rowid'].'-'.$userValue;
+			if ($userValue != '')
+			{
+				// We add the modification to the log (must be before update of sold because we read current value of sold)
+				$result = $holiday->addLogCP($user->id, $userID, $langs->transnoentitiesnoconv('ManualUpdate').$comment, $userValue, $val['rowid']);
+				if ($result < 0)
+				{
+					setEventMessages($holiday->error, $holiday->errors, 'errors');
+					$error++;
+				}
 
-    			// Update of the days of the employee
-    		    $result = $holiday->updateSoldeCP($userID, $userValue, $val['rowid']);
-    			if ($result < 0)
-    			{
-    				setEventMessages($holiday->error, $holiday->errors, 'errors');
-    				$error++;
-    			}
+				// Update of the days of the employee
+				$result = $holiday->updateSoldeCP($userID, $userValue, $val['rowid']);
+				if ($result < 0)
+				{
+					setEventMessages($holiday->error, $holiday->errors, 'errors');
+					$error++;
+				}
 
-    		    // If it first update of balance, we set date to avoid to have sold incremented by new month
-    		    /*
+				// If it first update of balance, we set date to avoid to have sold incremented by new month
+				/*
     			$now=dol_now();
     		    $sql = "UPDATE ".MAIN_DB_PREFIX."holiday_config SET";
     		    $sql.= " value = '".dol_print_date($now,'%Y%m%d%H%M%S')."'";
@@ -154,11 +154,11 @@ if (empty($reshook))
     		    dol_syslog('define_holiday update lastUpdate entry', LOG_DEBUG);
     		    $result = $db->query($sql);
     		    */
-    		}
-        }
+			}
+		}
 
-        if (!$error) setEventMessages('UpdateConfCPOK', '', 'mesgs');
-    }
+		if (!$error) setEventMessages('UpdateConfCPOK', '', 'mesgs');
+	}
 }
 
 
@@ -194,10 +194,10 @@ print load_fiche_titre($langs->trans('MenuConfCP'), '', 'title_hrm.png');
 print '<div class="info">'.$langs->trans('LastUpdateCP').': '."\n";
 $lastUpdate = $holiday->getConfCP('lastUpdate');
 if ($lastUpdate) {
-    print '<strong>'.dol_print_date($db->jdate($lastUpdate), 'dayhour').'</strong>';
-    print '<br>'.$langs->trans("MonthOfLastMonthlyUpdate").': <strong>'.$langs->trans('Month'.substr($lastUpdate, 4, 2)).' '.substr($lastUpdate, 0, 4).'</strong>'."\n";
+	print '<strong>'.dol_print_date($db->jdate($lastUpdate), 'dayhour').'</strong>';
+	print '<br>'.$langs->trans("MonthOfLastMonthlyUpdate").': <strong>'.$langs->trans('Month'.substr($lastUpdate, 4, 2)).' '.substr($lastUpdate, 0, 4).'</strong>'."\n";
 } else {
-    print $langs->trans('None');
+	print $langs->trans('None');
 }
 print "</div><br>\n";
 
@@ -220,7 +220,7 @@ $filters .= ' AND employee = 1'; // Only employee users are visible
 $listUsers = $holiday->fetchUsers(false, true, $filters);
 if (is_numeric($listUsers) && $listUsers < 0)
 {
-    setEventMessages($holiday->error, $holiday->errors, 'errors');
+	setEventMessages($holiday->error, $holiday->errors, 'errors');
 }
 
 $i = 0;
@@ -228,137 +228,137 @@ $i = 0;
 
 if (count($typeleaves) == 0)
 {
-    //print '<div class="info">';
-    print $langs->trans("NoLeaveWithCounterDefined")."<br>\n";
-    print $langs->trans("GoIntoDictionaryHolidayTypes");
-    //print '</div>';
+	//print '<div class="info">';
+	print $langs->trans("NoLeaveWithCounterDefined")."<br>\n";
+	print $langs->trans("GoIntoDictionaryHolidayTypes");
+	//print '</div>';
 } else {
-    $canedit = 0;
-    if (!empty($user->rights->holiday->define_holiday)) $canedit = 1;
+	$canedit = 0;
+	if (!empty($user->rights->holiday->define_holiday)) $canedit = 1;
 
-    $moreforfilter = '';
+	$moreforfilter = '';
 
-    print '<div class="div-table-responsive">';
-    print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'" id="tablelines3">'."\n";
+	print '<div class="div-table-responsive">';
+	print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'" id="tablelines3">'."\n";
 
-    print '<tr class="liste_titre_filter">';
+	print '<tr class="liste_titre_filter">';
 
-    // User
-    print '<td class="liste_titre"><input type="text" name="search_name" value="'.dol_escape_htmltag($search_name).'"></td>';
+	// User
+	print '<td class="liste_titre"><input type="text" name="search_name" value="'.dol_escape_htmltag($search_name).'"></td>';
 
-    // Supervisor
-    print '<td class="liste_titre">';
-    print $form->select_dolusers($search_supervisor, 'search_supervisor', 1, null, 0, null, null, 0, 0, 0, '', 0, '', 'maxwidth200');
-    print '</td>';
+	// Supervisor
+	print '<td class="liste_titre">';
+	print $form->select_dolusers($search_supervisor, 'search_supervisor', 1, null, 0, null, null, 0, 0, 0, '', 0, '', 'maxwidth200');
+	print '</td>';
 
-    // Type of leave request
-    if (count($typeleaves))
-    {
-        foreach ($typeleaves as $key => $val)
-        {
-            print '<td class="liste_titre" style="text-align:center"></td>';
-        }
-    } else {
-        print '<td class="liste_titre"></td>';
-    }
-    print '<td class="liste_titre"></td>';
+	// Type of leave request
+	if (count($typeleaves))
+	{
+		foreach ($typeleaves as $key => $val)
+		{
+			print '<td class="liste_titre" style="text-align:center"></td>';
+		}
+	} else {
+		print '<td class="liste_titre"></td>';
+	}
+	print '<td class="liste_titre"></td>';
 
-    // Action column
-    print '<td class="liste_titre maxwidthsearch center">';
-    $searchpicto = $form->showFilterButtons();
-    print $searchpicto;
-    print '</td>';
+	// Action column
+	print '<td class="liste_titre maxwidthsearch center">';
+	$searchpicto = $form->showFilterButtons();
+	print $searchpicto;
+	print '</td>';
 
-    print '</tr>';
+	print '</tr>';
 
-    print '<tr class="liste_titre">';
-    print_liste_field_titre('Employee', $_SERVER["PHP_SELF"]);
-    print_liste_field_titre('Supervisor', $_SERVER["PHP_SELF"]);
-    if (count($typeleaves))
-    {
-        foreach ($typeleaves as $key => $val)
-        {
-        	$labeltype = ($langs->trans($val['code']) != $val['code']) ? $langs->trans($val['code']) : $langs->trans($val['label']);
-        	print_liste_field_titre($labeltype, $_SERVER["PHP_SELF"], '', '', '', '', '', '', 'center ');
-        }
-    } else {
-        print_liste_field_titre('NoLeaveWithCounterDefined', $_SERVER["PHP_SELF"], '', '', '', '');
-    }
-    print_liste_field_titre((empty($user->rights->holiday->define_holiday) ? '' : 'Note'), $_SERVER["PHP_SELF"]);
-    print_liste_field_titre('');
-    print '</tr>';
+	print '<tr class="liste_titre">';
+	print_liste_field_titre('Employee', $_SERVER["PHP_SELF"]);
+	print_liste_field_titre('Supervisor', $_SERVER["PHP_SELF"]);
+	if (count($typeleaves))
+	{
+		foreach ($typeleaves as $key => $val)
+		{
+			$labeltype = ($langs->trans($val['code']) != $val['code']) ? $langs->trans($val['code']) : $langs->trans($val['label']);
+			print_liste_field_titre($labeltype, $_SERVER["PHP_SELF"], '', '', '', '', '', '', 'center ');
+		}
+	} else {
+		print_liste_field_titre('NoLeaveWithCounterDefined', $_SERVER["PHP_SELF"], '', '', '', '');
+	}
+	print_liste_field_titre((empty($user->rights->holiday->define_holiday) ? '' : 'Note'), $_SERVER["PHP_SELF"]);
+	print_liste_field_titre('');
+	print '</tr>';
 
-    $usersupervisor = new User($db);
+	$usersupervisor = new User($db);
 
-    foreach ($listUsers as $users)
-    {
-        // If user has not permission to edit/read all, we must see only subordinates
-        if (empty($user->rights->holiday->read_all))
-        {
-            if (($users['rowid'] != $user->id) && (!in_array($users['rowid'], $userchilds))) continue; // This user is not into hierarchy of current user, we hide it.
-        }
+	foreach ($listUsers as $users)
+	{
+		// If user has not permission to edit/read all, we must see only subordinates
+		if (empty($user->rights->holiday->read_all))
+		{
+			if (($users['rowid'] != $user->id) && (!in_array($users['rowid'], $userchilds))) continue; // This user is not into hierarchy of current user, we hide it.
+		}
 
-        $userstatic->id = $users['rowid'];
-        $userstatic->lastname = $users['lastname'];
-        $userstatic->firstname = $users['firstname'];
-        $userstatic->gender = $users['gender'];
-        $userstatic->photo = $users['photo'];
-        $userstatic->statut = $users['status'];
-        $userstatic->employee = $users['employee'];
-        $userstatic->fk_user = $users['fk_user'];
+		$userstatic->id = $users['rowid'];
+		$userstatic->lastname = $users['lastname'];
+		$userstatic->firstname = $users['firstname'];
+		$userstatic->gender = $users['gender'];
+		$userstatic->photo = $users['photo'];
+		$userstatic->statut = $users['status'];
+		$userstatic->employee = $users['employee'];
+		$userstatic->fk_user = $users['fk_user'];
 
-        if ($userstatic->fk_user > 0) $usersupervisor->fetch($userstatic->fk_user);
+		if ($userstatic->fk_user > 0) $usersupervisor->fetch($userstatic->fk_user);
 
-        print '<tr class="oddeven">';
+		print '<tr class="oddeven">';
 
-        // User
-        print '<td>';
-        print $userstatic->getNomUrl(-1);
-        print '</td>';
+		// User
+		print '<td>';
+		print $userstatic->getNomUrl(-1);
+		print '</td>';
 
-        // Supervisor
-        print '<td>';
-        if ($userstatic->fk_user > 0) print $usersupervisor->getNomUrl(-1);
-        print '</td>';
+		// Supervisor
+		print '<td>';
+		if ($userstatic->fk_user > 0) print $usersupervisor->getNomUrl(-1);
+		print '</td>';
 
-        // Amount for each type
-        if (count($typeleaves))
-        {
-        	foreach ($typeleaves as $key => $val)
-        	{
-        		$nbtoshow = '';
-        		if ($holiday->getCPforUser($users['rowid'], $val['rowid']) != '') $nbtoshow = price2num($holiday->getCPforUser($users['rowid'], $val['rowid']), 5);
+		// Amount for each type
+		if (count($typeleaves))
+		{
+			foreach ($typeleaves as $key => $val)
+			{
+				$nbtoshow = '';
+				if ($holiday->getCPforUser($users['rowid'], $val['rowid']) != '') $nbtoshow = price2num($holiday->getCPforUser($users['rowid'], $val['rowid']), 5);
 
-        		//var_dump($users['rowid'].' - '.$val['rowid']);
-            	print '<td style="text-align:center">';
-            	if ($canedit) print '<input type="text"'.($canedit ? '' : ' disabled="disabled"').' value="'.$nbtoshow.'" name="nb_holiday_'.$val['rowid'].'['.$users['rowid'].']" size="5" style="text-align: center;"/>';
-            	else print $nbtoshow;
-        	    //print ' '.$langs->trans('days');
-            	print '</td>'."\n";
-        	}
-        } else {
-            print '<td></td>';
-        }
+				//var_dump($users['rowid'].' - '.$val['rowid']);
+				print '<td style="text-align:center">';
+				if ($canedit) print '<input type="text"'.($canedit ? '' : ' disabled="disabled"').' value="'.$nbtoshow.'" name="nb_holiday_'.$val['rowid'].'['.$users['rowid'].']" size="5" style="text-align: center;"/>';
+				else print $nbtoshow;
+				//print ' '.$langs->trans('days');
+				print '</td>'."\n";
+			}
+		} else {
+			print '<td></td>';
+		}
 
-        // Note
-        print '<td>';
-        if ($canedit) print '<input type="text"'.($canedit ? '' : ' disabled="disabled"').' class="maxwidthonsmartphone" value="" name="note_holiday['.$users['rowid'].']" size="30"/>';
-        print '</td>';
+		// Note
+		print '<td>';
+		if ($canedit) print '<input type="text"'.($canedit ? '' : ' disabled="disabled"').' class="maxwidthonsmartphone" value="" name="note_holiday['.$users['rowid'].']" size="30"/>';
+		print '</td>';
 
-        // Button modify
-        print '<td>';
-        if (!empty($user->rights->holiday->define_holiday))	// Allowed to set the balance of any user
-        {
-            print '<input type="submit" name="update_cp['.$users['rowid'].']" value="'.dol_escape_htmltag($langs->trans("Update")).'" class="button"/>';
-        }
-        print '</td>'."\n";
-        print '</tr>';
+		// Button modify
+		print '<td>';
+		if (!empty($user->rights->holiday->define_holiday))	// Allowed to set the balance of any user
+		{
+			print '<input type="submit" name="update_cp['.$users['rowid'].']" value="'.dol_escape_htmltag($langs->trans("Update")).'" class="button"/>';
+		}
+		print '</td>'."\n";
+		print '</tr>';
 
-        $i++;
-    }
+		$i++;
+	}
 
-    print '</table>';
-    print '</div>';
+	print '</table>';
+	print '</div>';
 }
 
 print '</form>';
diff --git a/htdocs/holiday/document.php b/htdocs/holiday/document.php
index c37f403be4d..192c7d24e33 100644
--- a/htdocs/holiday/document.php
+++ b/htdocs/holiday/document.php
@@ -119,114 +119,114 @@ if ($object->id)
 
 	print '<table class="border tableforfield centpercent">';
 
-    print '<tr>';
-    print '<td class="titlefield">'.$langs->trans("User").'</td>';
+	print '<tr>';
+	print '<td class="titlefield">'.$langs->trans("User").'</td>';
 	print '<td>';
 	print $userRequest->getNomUrl(-1, 'leave');
 	print '</td></tr>';
 
-    // Type
-    print '<tr>';
-    print '<td>'.$langs->trans("Type").'</td>';
-    print '<td>';
-    $typeleaves = $object->getTypes(1, -1);
-    $labeltoshow = (($typeleaves[$object->fk_type]['code'] && $langs->trans($typeleaves[$object->fk_type]['code']) != $typeleaves[$object->fk_type]['code']) ? $langs->trans($typeleaves[$object->fk_type]['code']) : $typeleaves[$object->fk_type]['label']);
-    print empty($labeltoshow) ? $langs->trans("TypeWasDisabledOrRemoved", $object->fk_type) : $labeltoshow;
-    print '</td>';
-    print '</tr>';
+	// Type
+	print '<tr>';
+	print '<td>'.$langs->trans("Type").'</td>';
+	print '<td>';
+	$typeleaves = $object->getTypes(1, -1);
+	$labeltoshow = (($typeleaves[$object->fk_type]['code'] && $langs->trans($typeleaves[$object->fk_type]['code']) != $typeleaves[$object->fk_type]['code']) ? $langs->trans($typeleaves[$object->fk_type]['code']) : $typeleaves[$object->fk_type]['label']);
+	print empty($labeltoshow) ? $langs->trans("TypeWasDisabledOrRemoved", $object->fk_type) : $labeltoshow;
+	print '</td>';
+	print '</tr>';
 
-    $starthalfday = ($object->halfday == -1 || $object->halfday == 2) ? 'afternoon' : 'morning';
-    $endhalfday = ($object->halfday == 1 || $object->halfday == 2) ? 'morning' : 'afternoon';
+	$starthalfday = ($object->halfday == -1 || $object->halfday == 2) ? 'afternoon' : 'morning';
+	$endhalfday = ($object->halfday == 1 || $object->halfday == 2) ? 'morning' : 'afternoon';
 
-    if (!$edit)
-    {
-        print '<tr>';
-        print '<td>';
-        print $form->textwithpicto($langs->trans('DateDebCP'), $langs->trans("FirstDayOfHoliday"));
-        print '</td>';
-        print '<td>'.dol_print_date($object->date_debut, 'day');
-        print ' &nbsp; &nbsp; ';
-        print '<span class="opacitymedium">'.$langs->trans($listhalfday[$starthalfday]).'</span>';
-        print '</td>';
-        print '</tr>';
-    } else {
-        print '<tr>';
-        print '<td>';
-        print $form->textwithpicto($langs->trans('DateDebCP'), $langs->trans("FirstDayOfHoliday"));
-        print '</td>';
-        print '<td>';
-        print $form->selectDate($object->date_debut, 'date_debut_');
-        print ' &nbsp; &nbsp; ';
+	if (!$edit)
+	{
+		print '<tr>';
+		print '<td>';
+		print $form->textwithpicto($langs->trans('DateDebCP'), $langs->trans("FirstDayOfHoliday"));
+		print '</td>';
+		print '<td>'.dol_print_date($object->date_debut, 'day');
+		print ' &nbsp; &nbsp; ';
+		print '<span class="opacitymedium">'.$langs->trans($listhalfday[$starthalfday]).'</span>';
+		print '</td>';
+		print '</tr>';
+	} else {
+		print '<tr>';
+		print '<td>';
+		print $form->textwithpicto($langs->trans('DateDebCP'), $langs->trans("FirstDayOfHoliday"));
+		print '</td>';
+		print '<td>';
+		print $form->selectDate($object->date_debut, 'date_debut_');
+		print ' &nbsp; &nbsp; ';
 		print $form->selectarray('starthalfday', $listhalfday, (GETPOST('starthalfday') ?GETPOST('starthalfday') : $starthalfday));
-        print '</td>';
-        print '</tr>';
-    }
+		print '</td>';
+		print '</tr>';
+	}
 
-    if (!$edit)
-    {
-        print '<tr>';
-        print '<td>';
-        print $form->textwithpicto($langs->trans('DateFinCP'), $langs->trans("LastDayOfHoliday"));
-        print '</td>';
-        print '<td>'.dol_print_date($object->date_fin, 'day');
-        print ' &nbsp; &nbsp; ';
-        print '<span class="opacitymedium">'.$langs->trans($listhalfday[$endhalfday]).'</span>';
-        print '</td>';
-        print '</tr>';
-    } else {
-        print '<tr>';
-        print '<td>';
-        print $form->textwithpicto($langs->trans('DateFinCP'), $langs->trans("LastDayOfHoliday"));
-        print '</td>';
-        print '<td>';
-        print $form->selectDate($object->date_fin, 'date_fin_');
-        print ' &nbsp; &nbsp; ';
-        print $form->selectarray('endhalfday', $listhalfday, (GETPOST('endhalfday') ?GETPOST('endhalfday') : $endhalfday));
-        print '</td>';
-        print '</tr>';
-    }
+	if (!$edit)
+	{
+		print '<tr>';
+		print '<td>';
+		print $form->textwithpicto($langs->trans('DateFinCP'), $langs->trans("LastDayOfHoliday"));
+		print '</td>';
+		print '<td>'.dol_print_date($object->date_fin, 'day');
+		print ' &nbsp; &nbsp; ';
+		print '<span class="opacitymedium">'.$langs->trans($listhalfday[$endhalfday]).'</span>';
+		print '</td>';
+		print '</tr>';
+	} else {
+		print '<tr>';
+		print '<td>';
+		print $form->textwithpicto($langs->trans('DateFinCP'), $langs->trans("LastDayOfHoliday"));
+		print '</td>';
+		print '<td>';
+		print $form->selectDate($object->date_fin, 'date_fin_');
+		print ' &nbsp; &nbsp; ';
+		print $form->selectarray('endhalfday', $listhalfday, (GETPOST('endhalfday') ?GETPOST('endhalfday') : $endhalfday));
+		print '</td>';
+		print '</tr>';
+	}
 
-    // Nb days consumed
-    print '<tr>';
-    print '<td>';
-    $htmlhelp = $langs->trans('NbUseDaysCPHelp');
-    $includesaturday = (isset($conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_SATURDAY) ? $conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_SATURDAY : 1);
-    $includesunday   = (isset($conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_SUNDAY) ? $conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_SUNDAY : 1);
-    if ($includesaturday) $htmlhelp .= '<br>'.$langs->trans("DayIsANonWorkingDay", $langs->trans("Saturday"));
-    if ($includesunday) $htmlhelp .= '<br>'.$langs->trans("DayIsANonWorkingDay", $langs->trans("Sunday"));
-    print $form->textwithpicto($langs->trans('NbUseDaysCP'), $htmlhelp);
-    print '</td>';
-    print '<td>'.num_open_day($object->date_debut_gmt, $object->date_fin_gmt, 0, 1, $object->halfday).'</td>';
-    print '</tr>';
+	// Nb days consumed
+	print '<tr>';
+	print '<td>';
+	$htmlhelp = $langs->trans('NbUseDaysCPHelp');
+	$includesaturday = (isset($conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_SATURDAY) ? $conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_SATURDAY : 1);
+	$includesunday   = (isset($conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_SUNDAY) ? $conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_SUNDAY : 1);
+	if ($includesaturday) $htmlhelp .= '<br>'.$langs->trans("DayIsANonWorkingDay", $langs->trans("Saturday"));
+	if ($includesunday) $htmlhelp .= '<br>'.$langs->trans("DayIsANonWorkingDay", $langs->trans("Sunday"));
+	print $form->textwithpicto($langs->trans('NbUseDaysCP'), $htmlhelp);
+	print '</td>';
+	print '<td>'.num_open_day($object->date_debut_gmt, $object->date_fin_gmt, 0, 1, $object->halfday).'</td>';
+	print '</tr>';
 
-    if ($object->statut == 5)
-    {
-    	print '<tr>';
-    	print '<td>'.$langs->trans('DetailRefusCP').'</td>';
-    	print '<td>'.$object->detail_refuse.'</td>';
-    	print '</tr>';
-    }
+	if ($object->statut == 5)
+	{
+		print '<tr>';
+		print '<td>'.$langs->trans('DetailRefusCP').'</td>';
+		print '<td>'.$object->detail_refuse.'</td>';
+		print '</tr>';
+	}
 
-    // Description
-    if (!$edit)
-    {
-        print '<tr>';
-        print '<td>'.$langs->trans('DescCP').'</td>';
-        print '<td>'.nl2br($object->description).'</td>';
-        print '</tr>';
-    } else {
-        print '<tr>';
-        print '<td>'.$langs->trans('DescCP').'</td>';
-        print '<td><textarea name="description" class="flat" rows="'.ROWS_3.'" cols="70">'.$object->description.'</textarea></td>';
-        print '</tr>';
-    }
+	// Description
+	if (!$edit)
+	{
+		print '<tr>';
+		print '<td>'.$langs->trans('DescCP').'</td>';
+		print '<td>'.nl2br($object->description).'</td>';
+		print '</tr>';
+	} else {
+		print '<tr>';
+		print '<td>'.$langs->trans('DescCP').'</td>';
+		print '<td><textarea name="description" class="flat" rows="'.ROWS_3.'" cols="70">'.$object->description.'</textarea></td>';
+		print '</tr>';
+	}
 
-    print '<tr><td>'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
-    print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.dol_print_size($totalsize, 1, 1).'</td></tr>';
+	print '<tr><td>'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
+	print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.dol_print_size($totalsize, 1, 1).'</td></tr>';
 
-    print '</tbody>';
-    print '</table>'."\n";
-    /*
+	print '</tbody>';
+	print '</table>'."\n";
+	/*
     print '</div>';
     print '<div class="fichehalfright">';
     print '<div class="ficheaddleft">';
@@ -288,19 +288,19 @@ if ($object->id)
 
     print '</div>';
     print '</div>'; */
-    print '</div>';
+	print '</div>';
 
-    print '<div class="clearboth"></div>';
+	print '<div class="clearboth"></div>';
 
-    dol_fiche_end();
+	print dol_get_fiche_end();
 
 
 
-    $modulepart = 'holiday';
-    $permission = $user->rights->holiday->write;
-    $permtoedit = $user->rights->holiday->write;
-    $param = '&id='.$object->id;
-    include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
+	$modulepart = 'holiday';
+	$permission = $user->rights->holiday->write;
+	$permtoedit = $user->rights->holiday->write;
+	$param = '&id='.$object->id;
+	include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
 } else {
 	print $langs->trans("ErrorUnknown");
 }
diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php
index 78e838ae058..f16375209e1 100644
--- a/htdocs/holiday/list.php
+++ b/htdocs/holiday/list.php
@@ -68,14 +68,14 @@ $result = restrictedArea($user, 'holiday', '', '');
 // If we are on the view of a specific user
 if ($id > 0)
 {
-    $canread = 0;
-    if ($id == $user->id) $canread = 1;
-    if (!empty($user->rights->holiday->read_all)) $canread = 1;
-    if (!empty($user->rights->holiday->read) && in_array($id, $childids)) $canread = 1;
-    if (!$canread)
-    {
-        accessforbidden();
-    }
+	$canread = 0;
+	if ($id == $user->id) $canread = 1;
+	if (!empty($user->rights->holiday->read_all)) $canread = 1;
+	if (!empty($user->rights->holiday->read) && in_array($id, $childids)) $canread = 1;
+	if (!$canread)
+	{
+		accessforbidden();
+	}
 }
 
 $diroutputmassaction = $conf->holiday->dir_output.'/temp/massgeneration/'.$user->id;
@@ -122,9 +122,9 @@ $search_array_options = $extrafields->getOptionalsFromPost($object->table_elemen
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array(
 	'cp.ref'=>'Ref',
-    'cp.description'=>'Description',
-    'uu.lastname'=>'EmployeeLastname',
-    'uu.firstname'=>'EmployeeFirstname',
+	'cp.description'=>'Description',
+	'uu.lastname'=>'EmployeeLastname',
+	'uu.firstname'=>'EmployeeFirstname',
 	'uu.login'=>'Login'
 );
 
@@ -176,7 +176,7 @@ if (empty($reshook))
 		$search_ref = "";
 		$search_month_create = "";
 		$search_year_create = "";
-	    $search_month_start = "";
+		$search_month_start = "";
 		$search_year_start = "";
 		$search_month_end = "";
 		$search_year_end = "";
@@ -404,18 +404,18 @@ if ($resql)
 
 		print dol_get_fiche_head($head, 'paidholidays', $title, -1, 'user');
 
-	    dol_banner_tab($fuser, 'id', $linkback, $user->rights->user->user->lire || $user->admin);
+		dol_banner_tab($fuser, 'id', $linkback, $user->rights->user->user->lire || $user->admin);
 
 		if (empty($conf->global->HOLIDAY_HIDE_BALANCE))
 		{
-		    print '<div class="underbanner clearboth"></div>';
+			print '<div class="underbanner clearboth"></div>';
 
-		    print '<br>';
+			print '<br>';
 
-		    showMyBalance($object, $user_id);
+			showMyBalance($object, $user_id);
 		}
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 		// Buttons for actions
 
@@ -445,8 +445,8 @@ if ($resql)
 
 	if ($sall)
 	{
-	    foreach ($fieldstosearchall as $key => $val) $fieldstosearchall[$key] = $langs->trans($val);
-	    print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall).join(', ', $fieldstosearchall).'</div>';
+		foreach ($fieldstosearchall as $key => $val) $fieldstosearchall[$key] = $langs->trans($val);
+		print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall).join(', ', $fieldstosearchall).'</div>';
 	}
 
 	$moreforfilter = '';
@@ -509,16 +509,16 @@ if ($resql)
 	{
 		if ($user->rights->holiday->read_all)
 		{
-		    print '<td class="liste_titre maxwidthonsmartphone left">';
-		    $validator = new UserGroup($db);
-		    $excludefilter = $user->admin ? '' : 'u.rowid <> '.$user->id;
-		    $valideurobjects = $validator->listUsersForGroup($excludefilter);
-		    $valideurarray = array();
-		    foreach ($valideurobjects as $val) $valideurarray[$val->id] = $val->id;
-		    print $form->select_dolusers($search_valideur, "search_valideur", 1, "", 0, $valideurarray, '', 0, 0, 0, $morefilter, 0, '', 'maxwidth150');
-		    print '</td>';
+			print '<td class="liste_titre maxwidthonsmartphone left">';
+			$validator = new UserGroup($db);
+			$excludefilter = $user->admin ? '' : 'u.rowid <> '.$user->id;
+			$valideurobjects = $validator->listUsersForGroup($excludefilter);
+			$valideurarray = array();
+			foreach ($valideurobjects as $val) $valideurarray[$val->id] = $val->id;
+			print $form->select_dolusers($search_valideur, "search_valideur", 1, "", 0, $valideurarray, '', 0, 0, 0, $morefilter, 0, '', 'maxwidth150');
+			print '</td>';
 		} else {
-		    print '<td class="liste_titre">&nbsp;</td>';
+			print '<td class="liste_titre">&nbsp;</td>';
 		}
 	}
 
@@ -637,9 +637,9 @@ if ($resql)
 		$result = 0;
 	} elseif ($num > 0 && !empty($mysoc->country_id))
 	{
-	    // Lines
-	    $userstatic = new User($db);
-	    $approbatorstatic = new User($db);
+		// Lines
+		$userstatic = new User($db);
+		$approbatorstatic = new User($db);
 
 		$typeleaves = $object->getTypes(1, -1);
 
@@ -756,14 +756,14 @@ if ($resql)
 				if (!$i) $totalarray['nbfield']++;
 			}
 
-		    // Action column
-		    print '<td class="nowrap center">';
+			// Action column
+			print '<td class="nowrap center">';
 			if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-		    {
-			    $selected = 0;
+			{
+				$selected = 0;
 				if (in_array($obj->rowid, $arrayofselected)) $selected = 1;
 				print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
-		    }
+			}
 			print '</td>';
 			if (!$i) $totalarray['nbfield']++;
 
diff --git a/htdocs/holiday/month_report.php b/htdocs/holiday/month_report.php
index 7e7e7ed29f9..5108c97f54a 100644
--- a/htdocs/holiday/month_report.php
+++ b/htdocs/holiday/month_report.php
@@ -57,8 +57,8 @@ $limit       = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_
 $sortfield   = GETPOST('sortfield', 'aZ09comma');
 $sortorder   = GETPOST('sortorder', 'alpha');
 
-if (! $sortfield) $sortfield = "cp.rowid";
-if (! $sortorder) $sortorder = "ASC";
+if (!$sortfield) $sortfield = "cp.rowid";
+if (!$sortorder) $sortorder = "ASC";
 
 $hookmanager->initHooks(array('leavemovementlist'));
 
@@ -78,42 +78,42 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 
 if (empty($reshook))
 {
-    // Selection of new fields
-    include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
+	// Selection of new fields
+	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
-    // Purge search criteria
-    if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
-    {
-        $search_ref = '';
-        $search_employee = '';
-        $search_type = '';
-        $search_description = '';
-        $toselect = '';
-        $search_array_options = array();
-    }
+	// Purge search criteria
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
+	{
+		$search_ref = '';
+		$search_employee = '';
+		$search_type = '';
+		$search_description = '';
+		$toselect = '';
+		$search_array_options = array();
+	}
 
-    if (GETPOST('button_removefilter_x', 'alpha')
-        || GETPOST('button_removefilter.x', 'alpha')
-        || GETPOST('button_removefilter', 'alpha')
-        || GETPOST('button_search_x', 'alpha')
-        || GETPOST('button_search.x', 'alpha')
-        || GETPOST('button_search', 'alpha'))
-    {
-        $massaction = '';
-    }
+	if (GETPOST('button_removefilter_x', 'alpha')
+		|| GETPOST('button_removefilter.x', 'alpha')
+		|| GETPOST('button_removefilter', 'alpha')
+		|| GETPOST('button_search_x', 'alpha')
+		|| GETPOST('button_search.x', 'alpha')
+		|| GETPOST('button_search', 'alpha'))
+	{
+		$massaction = '';
+	}
 }
 
 $arrayfields = array(
-    'cp.ref'=>array('label'=>$langs->trans('Ref'), 'checked'=>1),
-    'cp.fk_user'=>array('label'=>$langs->trans('Employee'), 'checked'=>1),
-    'ct.label'=>array('label'=>$langs->trans('Type'), 'checked'=>1),
-    'cp.date_debut'=>array('label'=>$langs->trans('DateDebCP'), 'checked'=>1),
-    'cp.date_fin'=>array('label'=>$langs->trans('DateFinCP'), 'checked'=>1),
-    'used_days'=>array('label'=>$langs->trans('NbUseDaysCPShort'), 'checked'=>1),
-    'date_start_month'=>array('label'=>$langs->trans('DateStartInMonth'), 'checked'=>1),
-    'date_end_month'=>array('label'=>$langs->trans('DateEndInMonth'), 'checked'=>1),
-    'used_days_month'=>array('label'=>$langs->trans('NbUseDaysCPShortInMonth'), 'checked'=>1),
-    'cp.description'=>array('label'=>$langs->trans('DescCP'), 'checked'=>1),
+	'cp.ref'=>array('label'=>$langs->trans('Ref'), 'checked'=>1),
+	'cp.fk_user'=>array('label'=>$langs->trans('Employee'), 'checked'=>1),
+	'ct.label'=>array('label'=>$langs->trans('Type'), 'checked'=>1),
+	'cp.date_debut'=>array('label'=>$langs->trans('DateDebCP'), 'checked'=>1),
+	'cp.date_fin'=>array('label'=>$langs->trans('DateFinCP'), 'checked'=>1),
+	'used_days'=>array('label'=>$langs->trans('NbUseDaysCPShort'), 'checked'=>1),
+	'date_start_month'=>array('label'=>$langs->trans('DateStartInMonth'), 'checked'=>1),
+	'date_end_month'=>array('label'=>$langs->trans('DateEndInMonth'), 'checked'=>1),
+	'used_days_month'=>array('label'=>$langs->trans('NbUseDaysCPShortInMonth'), 'checked'=>1),
+	'cp.description'=>array('label'=>$langs->trans('DescCP'), 'checked'=>1),
 );
 
 
@@ -134,19 +134,19 @@ $search_year = GETPOST("reyear", 'int') ?GETPOST("reyear", 'int') : date("Y", ti
 $year_month = sprintf("%04d", $search_year).'-'.sprintf("%02d", $search_month);
 
 $sql = "SELECT cp.rowid, cp.ref, cp.fk_user, cp.date_debut, cp.date_fin, ct.label, cp.description, cp.halfday";
-$sql.= " FROM ".MAIN_DB_PREFIX."holiday cp";
-$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."user u ON cp.fk_user = u.rowid";
-$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_holiday_types ct ON cp.fk_type = ct.rowid";
-$sql.= " WHERE cp.rowid > 0";
-$sql.= " AND cp.statut = 3"; // 3 = Approved
-$sql.= " AND (date_format(cp.date_debut, '%Y-%m') = '".$db->escape($year_month)."' OR date_format(cp.date_fin, '%Y-%m') = '".$db->escape($year_month)."')";
+$sql .= " FROM ".MAIN_DB_PREFIX."holiday cp";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user u ON cp.fk_user = u.rowid";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_holiday_types ct ON cp.fk_type = ct.rowid";
+$sql .= " WHERE cp.rowid > 0";
+$sql .= " AND cp.statut = 3"; // 3 = Approved
+$sql .= " AND (date_format(cp.date_debut, '%Y-%m') = '".$db->escape($year_month)."' OR date_format(cp.date_fin, '%Y-%m') = '".$db->escape($year_month)."')";
 
 if (!empty($search_ref))            $sql .= natural_search('cp.ref', $search_ref);
 if (!empty($search_employee))       $sql .= " AND cp.fk_user = '".$db->escape($search_employee)."'";
 if (!empty($search_type))           $sql .= ' AND cp.fk_type IN ('.$db->escape($search_type).')';
-if (!empty($search_description))    $sql.= natural_search('cp.description', $search_description);
+if (!empty($search_description))    $sql .= natural_search('cp.description', $search_description);
 
-$sql.= $db->order($sortfield, $sortorder);
+$sql .= $db->order($sortfield, $sortorder);
 
 $resql = $db->query($sql);
 if (empty($resql))
@@ -158,7 +158,7 @@ if (empty($resql))
 $num = $db->num_rows($resql);
 
 $param = '';
-if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"])   $param.= '&contextpage='.urlencode($contextpage);
+if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"])   $param .= '&contextpage='.urlencode($contextpage);
 if ($limit > 0 && $limit != $conf->liste_limit)                     $param .= '&limit='.urlencode($limit);
 if (!empty($search_ref))                                            $param .= '&search_ref='.urlencode($search_ref);
 if (!empty($search_employee))                                       $param .= '&search_employee='.urlencode($search_employee);
@@ -190,7 +190,7 @@ $moreforfilter = '';
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 $selectedfields = '';
 $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
-$selectedfields.= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
+$selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
 print '<div class="div-table-responsive">';
 print '<table class="noborder centpercent">';
@@ -199,31 +199,31 @@ print '<tr class="liste_titre">';
 
 // Filter: Ref
 if (!empty($arrayfields['cp.ref']['checked'])) {
-    print '<td class="liste_titre">';
-    print '<input class="flat maxwidth100" type="text" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
-    print '</td>';
+	print '<td class="liste_titre">';
+	print '<input class="flat maxwidth100" type="text" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
+	print '</td>';
 }
 
 // Filter: Employee
 if (!empty($arrayfields['cp.fk_user']['checked'])) {
-    print '<td class="liste_titre">';
-    print $form->select_dolusers($search_employee, "search_employee", 1, null, 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth200');
-    print '</td>';
+	print '<td class="liste_titre">';
+	print $form->select_dolusers($search_employee, "search_employee", 1, null, 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth200');
+	print '</td>';
 }
 
 // Filter: Type
 if (!empty($arrayfields['ct.label']['checked'])) {
-    $typeleaves = $holidaystatic->getTypes(1, -1);
-    $arraytypeleaves = array();
-    foreach ($typeleaves as $key => $val)
-    {
-        $labeltoshow = ($langs->trans($val['code']) != $val['code'] ? $langs->trans($val['code']) : $val['label']);
-        $arraytypeleaves[$val['rowid']] = $labeltoshow;
-    }
+	$typeleaves = $holidaystatic->getTypes(1, -1);
+	$arraytypeleaves = array();
+	foreach ($typeleaves as $key => $val)
+	{
+		$labeltoshow = ($langs->trans($val['code']) != $val['code'] ? $langs->trans($val['code']) : $val['label']);
+		$arraytypeleaves[$val['rowid']] = $labeltoshow;
+	}
 
-    print '<td class="liste_titre">';
-    print $form->selectarray('search_type', $arraytypeleaves, $search_type, 1, 0, 0, '', 0, 0, 0, '', '', 1);
-    print '</td>';
+	print '<td class="liste_titre">';
+	print $form->selectarray('search_type', $arraytypeleaves, $search_type, 1, 0, 0, '', 0, 0, 0, '', '', 1);
+	print '</td>';
 }
 
 if (!empty($arrayfields['cp.date_debut']['checked'])) print '<td class="liste_titre"></td>';
@@ -235,9 +235,9 @@ if (!empty($arrayfields['used_days_month']['checked'])) print '<td class="liste_
 
 // Filter: Description
 if (!empty($arrayfields['cp.description']['checked'])) {
-    print '<td class="liste_titre">';
-    print '<input type="text" class="maxwidth100" name="search_description" value="'.$search_description.'">';
-    print '</td>';
+	print '<td class="liste_titre">';
+	print '<input type="text" class="maxwidth100" name="search_description" value="'.$search_description.'">';
+	print '</td>';
 }
 
 // Action column
@@ -263,93 +263,93 @@ print '</tr>';
 
 if ($num == 0)
 {
-    print '<tr><td colspan="10" class="opacitymedium">'.$langs->trans('None').'</td></tr>';
+	print '<tr><td colspan="10" class="opacitymedium">'.$langs->trans('None').'</td></tr>';
 }
 else {
-    while ($obj = $db->fetch_object($resql))
-    {
-        $user = new User($db);
-        $user->fetch($obj->fk_user);
+	while ($obj = $db->fetch_object($resql))
+	{
+		$user = new User($db);
+		$user->fetch($obj->fk_user);
 
-        $date_start = $db->jdate($obj->date_debut, true);
-        $date_end = $db->jdate($obj->date_fin, true);
+		$date_start = $db->jdate($obj->date_debut, true);
+		$date_end = $db->jdate($obj->date_fin, true);
 
-        $tmpstart = dol_getdate($date_start);
-        $tmpend = dol_getdate($date_end);
+		$tmpstart = dol_getdate($date_start);
+		$tmpend = dol_getdate($date_end);
 
-        $starthalfday = ($obj->halfday == -1 || $obj->halfday == 2) ? 'afternoon' : 'morning';
-        $endhalfday = ($obj->halfday == 1 || $obj->halfday == 2) ? 'morning' : 'afternoon';
+		$starthalfday = ($obj->halfday == -1 || $obj->halfday == 2) ? 'afternoon' : 'morning';
+		$endhalfday = ($obj->halfday == 1 || $obj->halfday == 2) ? 'morning' : 'afternoon';
 
-        $halfdayinmonth = $obj->halfday;
-        $starthalfdayinmonth = $starthalfday;
-        $endhalfdayinmonth = $endhalfday;
+		$halfdayinmonth = $obj->halfday;
+		$starthalfdayinmonth = $starthalfday;
+		$endhalfdayinmonth = $endhalfday;
 
-        //0:Full days, 2:Start afternoon end morning, -1:Start afternoon end afternoon, 1:Start morning end morning
+		//0:Full days, 2:Start afternoon end morning, -1:Start afternoon end afternoon, 1:Start morning end morning
 
-        // Set date_start_gmt and date_end_gmt that are date to show for the selected month
-        $date_start_inmonth = $db->jdate($obj->date_debut, true);
-        $date_end_inmonth = $db->jdate($obj->date_fin, true);
-        if ($tmpstart['year'] < $search_year || $tmpstart['mon'] < $search_month)
-        {
-            $date_start_inmonth = dol_get_first_day($search_year, $search_month, true);
-            $starthalfdayinmonth = 'morning';
-            if ($halfdayinmonth == 2) $halfdayinmonth = 1;
-            if ($halfdayinmonth == -1) $halfdayinmonth = 0;
-        }
-        if ($tmpend['year'] > $search_year || $tmpend['mon'] > $search_month)
-        {
-            $date_end_inmonth = dol_get_last_day($search_year, $search_month, true) - ((24 * 3600) - 1);
-            $endhalfdayinmonth = 'afternoon';
-            if ($halfdayinmonth == 2) $halfdayinmonth = -1;
-            if ($halfdayinmonth == 1) $halfdayinmonth = 0;
-        }
+		// Set date_start_gmt and date_end_gmt that are date to show for the selected month
+		$date_start_inmonth = $db->jdate($obj->date_debut, true);
+		$date_end_inmonth = $db->jdate($obj->date_fin, true);
+		if ($tmpstart['year'] < $search_year || $tmpstart['mon'] < $search_month)
+		{
+			$date_start_inmonth = dol_get_first_day($search_year, $search_month, true);
+			$starthalfdayinmonth = 'morning';
+			if ($halfdayinmonth == 2) $halfdayinmonth = 1;
+			if ($halfdayinmonth == -1) $halfdayinmonth = 0;
+		}
+		if ($tmpend['year'] > $search_year || $tmpend['mon'] > $search_month)
+		{
+			$date_end_inmonth = dol_get_last_day($search_year, $search_month, true) - ((24 * 3600) - 1);
+			$endhalfdayinmonth = 'afternoon';
+			if ($halfdayinmonth == 2) $halfdayinmonth = -1;
+			if ($halfdayinmonth == 1) $halfdayinmonth = 0;
+		}
 
-        // Leave request
-        $holidaystatic->id = $obj->rowid;
-        $holidaystatic->ref = $obj->ref;
+		// Leave request
+		$holidaystatic->id = $obj->rowid;
+		$holidaystatic->ref = $obj->ref;
 
-        print '<tr class="oddeven">';
+		print '<tr class="oddeven">';
 
-        if (!empty($arrayfields['cp.ref']['checked'])) print '<td>'.$holidaystatic->getNomUrl(1, 1).'</td>';
-        if (!empty($arrayfields['cp.fk_user']['checked'])) print '<td>'.$user->getFullName($langs).'</td>';
-        if (!empty($arrayfields['ct.label']['checked'])) print '<td>'.$obj->label.'</td>';
+		if (!empty($arrayfields['cp.ref']['checked'])) print '<td>'.$holidaystatic->getNomUrl(1, 1).'</td>';
+		if (!empty($arrayfields['cp.fk_user']['checked'])) print '<td>'.$user->getFullName($langs).'</td>';
+		if (!empty($arrayfields['ct.label']['checked'])) print '<td>'.$obj->label.'</td>';
 
-        if (!empty($arrayfields['cp.date_debut']['checked']))
-        {
-            print '<td class="center">'.dol_print_date($db->jdate($obj->date_debut), 'day');
-            print ' <span class="opacitymedium">('.$langs->trans($listhalfday[$starthalfday]).')</span>';
-            print '</td>';
-        }
+		if (!empty($arrayfields['cp.date_debut']['checked']))
+		{
+			print '<td class="center">'.dol_print_date($db->jdate($obj->date_debut), 'day');
+			print ' <span class="opacitymedium">('.$langs->trans($listhalfday[$starthalfday]).')</span>';
+			print '</td>';
+		}
 
-        if (!empty($arrayfields['cp.date_fin']['checked']))
-        {
-            print '<td class="center">'.dol_print_date($db->jdate($obj->date_fin), 'day');
-            print ' <span class="opacitymedium">('.$langs->trans($listhalfday[$endhalfday]).')</span>';
-            print '</td>';
-        }
+		if (!empty($arrayfields['cp.date_fin']['checked']))
+		{
+			print '<td class="center">'.dol_print_date($db->jdate($obj->date_fin), 'day');
+			print ' <span class="opacitymedium">('.$langs->trans($listhalfday[$endhalfday]).')</span>';
+			print '</td>';
+		}
 
-        if (!empty($arrayfields['used_days']['checked'])) print '<td class="right">'.num_open_day($date_start, $date_end, 0, 1, $obj->halfday).'</td>';
+		if (!empty($arrayfields['used_days']['checked'])) print '<td class="right">'.num_open_day($date_start, $date_end, 0, 1, $obj->halfday).'</td>';
 
-        if (!empty($arrayfields['date_start_month']['checked']))
-        {
-            print '<td class="center">'.dol_print_date($date_start_inmonth, 'day');
-            print ' <span class="opacitymedium">('.$langs->trans($listhalfday[$starthalfdayinmonth]).')</span>';
-            print '</td>';
-        }
+		if (!empty($arrayfields['date_start_month']['checked']))
+		{
+			print '<td class="center">'.dol_print_date($date_start_inmonth, 'day');
+			print ' <span class="opacitymedium">('.$langs->trans($listhalfday[$starthalfdayinmonth]).')</span>';
+			print '</td>';
+		}
 
-        if (!empty($arrayfields['date_end_month']['checked']))
-        {
-            print '<td class="center">'.dol_print_date($date_end_inmonth, 'day');
-            print ' <span class="opacitymedium">('.$langs->trans($listhalfday[$endhalfdayinmonth]).')</span>';
-            print '</td>';
-        }
+		if (!empty($arrayfields['date_end_month']['checked']))
+		{
+			print '<td class="center">'.dol_print_date($date_end_inmonth, 'day');
+			print ' <span class="opacitymedium">('.$langs->trans($listhalfday[$endhalfdayinmonth]).')</span>';
+			print '</td>';
+		}
 
-        if (!empty($arrayfields['used_days_month']['checked'])) print '<td class="right">'.num_open_day($date_start_inmonth, $date_end_inmonth, 0, 1, $halfdayinmonth).'</td>';
-        if (!empty($arrayfields['cp.description']['checked'])) print '<td class="maxwidth300">'.dol_escape_htmltag(dolGetFirstLineOfText($obj->description)).'</td>';
+		if (!empty($arrayfields['used_days_month']['checked'])) print '<td class="right">'.num_open_day($date_start_inmonth, $date_end_inmonth, 0, 1, $halfdayinmonth).'</td>';
+		if (!empty($arrayfields['cp.description']['checked'])) print '<td class="maxwidth300">'.dol_escape_htmltag(dolGetFirstLineOfText($obj->description)).'</td>';
 
-        print '<td></td>';
-        print '</tr>';
-    }
+		print '<td></td>';
+		print '</tr>';
+	}
 }
 print '</table>';
 print '</div>';
diff --git a/htdocs/holiday/view_log.php b/htdocs/holiday/view_log.php
index 7043f436e87..669bb9aa32f 100644
--- a/htdocs/holiday/view_log.php
+++ b/htdocs/holiday/view_log.php
@@ -36,15 +36,15 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
 require_once DOL_DOCUMENT_ROOT.'/holiday/common.inc.php';
 
-$action             = GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'view';				// The action 'add', 'create', 'edit', 'update', 'view', ...
-$massaction         = GETPOST('massaction', 'alpha');												// The bulk action (combo box choice into lists)
-$show_files         = GETPOST('show_files', 'int');													// Show files area generated by bulk actions ?
-$confirm            = GETPOST('confirm', 'alpha');													// Result of a confirmation
-$cancel             = GETPOST('cancel', 'alpha');													// We click on a Cancel button
-$toselect           = GETPOST('toselect', 'array');													// Array of ids of elements selected into a list
-$contextpage        = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'myobjectlist';	// To manage different context of search
-$backtopage         = GETPOST('backtopage', 'alpha');												// Go back to a dedicated page
-$optioncss          = GETPOST('optioncss', 'aZ');													// Option for the css output (always '' except when 'print')
+$action             = GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ...
+$massaction         = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists)
+$show_files         = GETPOST('show_files', 'int'); // Show files area generated by bulk actions ?
+$confirm            = GETPOST('confirm', 'alpha'); // Result of a confirmation
+$cancel             = GETPOST('cancel', 'alpha'); // We click on a Cancel button
+$toselect           = GETPOST('toselect', 'array'); // Array of ids of elements selected into a list
+$contextpage        = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'myobjectlist'; // To manage different context of search
+$backtopage         = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page
+$optioncss          = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
 
 $search_id          = GETPOST('search_id', 'alphanohtml');
 $search_month       = GETPOST('search_month', 'int');
@@ -65,8 +65,8 @@ if (empty($page) || $page == -1 || GETPOST('button_search', 'alpha') || GETPOST(
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (! $sortfield) $sortfield="cpl.rowid";
-if (! $sortorder) $sortorder="DESC";
+if (!$sortfield) $sortfield = "cpl.rowid";
+if (!$sortorder) $sortorder = "DESC";
 
 // Si l'utilisateur n'a pas le droit de lire cette page
 if (!$user->rights->holiday->read_all) accessforbidden();
@@ -174,13 +174,13 @@ if (!empty($search_year) && $search_year > 0) {
 	$sqlwhere .= "AND date_action BETWEEN '".$db->idate($from_date)."' AND '".$db->idate($to_date)."'";
 }
 
-if (!empty($search_id) && $search_id > 0)                   $sqlwhere.= natural_search('rowid', $search_id, 1);
-if (!empty($search_validator) && $search_validator > 0)     $sqlwhere.= natural_search('fk_user_action', $search_validator, 1);
-if (!empty($search_employee) && $search_employee > 0)       $sqlwhere.= natural_search('fk_user_update', $search_employee, 1);
-if (!empty($search_description))                            $sqlwhere.= natural_search('type_action', $search_description);
-if (!empty($search_type) && $search_type > 0)               $sqlwhere.= natural_search('fk_type', $search_type, 1);
-if (!empty($search_prev_solde))                             $sqlwhere.= natural_search('prev_solde', $search_prev_solde, 1);
-if (!empty($search_new_solde))                              $sqlwhere.= natural_search('new_solde', $search_new_solde, 1);
+if (!empty($search_id) && $search_id > 0)                   $sqlwhere .= natural_search('rowid', $search_id, 1);
+if (!empty($search_validator) && $search_validator > 0)     $sqlwhere .= natural_search('fk_user_action', $search_validator, 1);
+if (!empty($search_employee) && $search_employee > 0)       $sqlwhere .= natural_search('fk_user_update', $search_employee, 1);
+if (!empty($search_description))                            $sqlwhere .= natural_search('type_action', $search_description);
+if (!empty($search_type) && $search_type > 0)               $sqlwhere .= natural_search('fk_type', $search_type, 1);
+if (!empty($search_prev_solde))                             $sqlwhere .= natural_search('prev_solde', $search_prev_solde, 1);
+if (!empty($search_new_solde))                              $sqlwhere .= natural_search('new_solde', $search_new_solde, 1);
 
 $sqlorder = $db->order($sortfield, $sortorder);
 
@@ -248,8 +248,8 @@ $moreforfilter = '';
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 $selectedfields = '';
-$selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);	// This also change content of $arrayfields
-$selectedfields.=(count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
+$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
+$selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
 print '<div class="div-table-responsive">';
 print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'" id="tablelines3">';
@@ -358,13 +358,13 @@ while ($i < min($num, $limit))
 	//TODO: $obj = $db->fetch_object($resql);
 	$obj = next($object->logs);
 
-	$holidaylogstatic->id				= $obj['rowid'];
-	$holidaylogstatic->date				= $obj['date_action'];
+	$holidaylogstatic->id = $obj['rowid'];
+	$holidaylogstatic->date = $obj['date_action'];
 	$holidaylogstatic->validator		= $obj['fk_user_action'];
 	$holidaylogstatic->employee			= $obj['fk_user_update'];
 	$holidaylogstatic->description		= $obj['type_action'];
-	$holidaylogstatic->type				= $obj['fk_type'];
-	$holidaylogstatic->balance_previous	= $obj['prev_solde'];
+	$holidaylogstatic->type = $obj['fk_type'];
+	$holidaylogstatic->balance_previous = $obj['prev_solde'];
 	$holidaylogstatic->balance_new		= $obj['new_solde'];
 
 	print '<tr class="oddeven">';
diff --git a/htdocs/hrm/admin/admin_establishment.php b/htdocs/hrm/admin/admin_establishment.php
index b169354bef7..a777ada50f9 100644
--- a/htdocs/hrm/admin/admin_establishment.php
+++ b/htdocs/hrm/admin/admin_establishment.php
@@ -131,7 +131,7 @@ if ($result)
 	dol_print_error($db);
 }
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // Buttons
 print '<div class="tabsAction">';
diff --git a/htdocs/hrm/admin/admin_hrm.php b/htdocs/hrm/admin/admin_hrm.php
index f51bb373f62..4648c2d690a 100644
--- a/htdocs/hrm/admin/admin_hrm.php
+++ b/htdocs/hrm/admin/admin_hrm.php
@@ -104,7 +104,7 @@ foreach ($list as $key) {
 
 print "</table>\n";
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '<div class="center"><input type="submit" class="button" value="'.$langs->trans('Modify').'" name="button"></div>';
 
diff --git a/htdocs/hrm/class/establishment.class.php b/htdocs/hrm/class/establishment.class.php
index d2b53337abe..02083ccd819 100644
--- a/htdocs/hrm/class/establishment.class.php
+++ b/htdocs/hrm/class/establishment.class.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2015		Alexandre Spangaro	<aspangaro@open-dsi.fr>
- * Copyright (C) 2018       Frédéric France     <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2020  Frédéric France     <frederic.france@netlogic.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -75,6 +75,9 @@ class Establishment extends CommonObject
 	 */
 	public $rowid;
 
+	/**
+	 * @var string Label
+	 */
 	public $label;
 
 	/**
@@ -82,9 +85,21 @@ class Establishment extends CommonObject
 	 */
 	public $address;
 
+	/**
+	 * @var string Zip
+	 */
 	public $zip;
+
+	/**
+	 * @var string Town
+	 */
 	public $town;
 
+	/**
+	 * @var int country id
+	 */
+	public $country_id;
+
 	/**
 	 * @var int Status 0=open, 1=closed
 	 */
@@ -95,8 +110,20 @@ class Establishment extends CommonObject
 	 */
 	public $entity;
 
-	public $country_id;
+	/**
+	 * @var int user mod id
+	 */
+	public $fk_user_mod;
 
+	/**
+	 * @var int user author id
+	 */
+	public $fk_user_author;
+
+	/**
+	 * @var int date create
+	 */
+	public $datec;
 
 	const STATUS_OPEN = 1;
 	const STATUS_CLOSED = 0;
@@ -148,6 +175,7 @@ class Establishment extends CommonObject
 		$now = dol_now();
 
 		// Clean parameters
+		$this->label = trim($this->label);
 		$this->address = trim($this->address);
 		$this->zip = trim($this->zip);
 		$this->town = trim($this->town);
@@ -189,10 +217,6 @@ class Establishment extends CommonObject
 			$this->errors[] = "Error ".$this->db->lasterror();
 		}
 
-		if (!$error) {
-			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."establishment");
-		}
-
 		// Commit or rollback
 		if ($error) {
 			foreach ($this->errors as $errmsg) {
diff --git a/htdocs/hrm/establishment/card.php b/htdocs/hrm/establishment/card.php
index 11dba56a5d7..20d61334579 100644
--- a/htdocs/hrm/establishment/card.php
+++ b/htdocs/hrm/establishment/card.php
@@ -241,7 +241,7 @@ if ($action == 'create')
 
 	print '</table>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div class="center">';
 	print '<input class="button" type="submit" value="'.$langs->trans("Save").'">';
@@ -324,7 +324,7 @@ if (($id || $ref) && $action == 'edit')
 
 			print '</table>';
 
-			dol_fiche_end();
+			print dol_get_fiche_end();
 
 			print '<div class="center">';
 			print '<input type="submit" class="button" value="'.$langs->trans("Save").'">';
@@ -418,7 +418,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 	print '<div class="clearboth"></div><br>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	/*
      * Barre d'actions
diff --git a/htdocs/hrm/establishment/info.php b/htdocs/hrm/establishment/info.php
index bb4d04d7d00..3185f897958 100644
--- a/htdocs/hrm/establishment/info.php
+++ b/htdocs/hrm/establishment/info.php
@@ -175,7 +175,7 @@ if ($object->id > 0)
 
 	 print '</div>';
 
-	 dol_fiche_end();
+	 print dol_get_fiche_end();
 }
 
 
diff --git a/htdocs/imports/class/import.class.php b/htdocs/imports/class/import.class.php
index 3684d4d2d7e..19b71cb8cd3 100644
--- a/htdocs/imports/class/import.class.php
+++ b/htdocs/imports/class/import.class.php
@@ -28,21 +28,21 @@
  */
 class Import
 {
-    public $array_import_module;
-    public $array_import_perms;
-    public $array_import_icon;
-    public $array_import_code;
-    public $array_import_label;
-    public $array_import_tables;
-    public $array_import_tables_creator;
-    public $array_import_fields;
-    public $array_import_fieldshidden;
-    public $array_import_entities;
-    public $array_import_regex;
-    public $array_import_updatekeys;
-    public $array_import_examplevalues;
-    public $array_import_convertvalue;
-    public $array_import_run_sql_after;
+	public $array_import_module;
+	public $array_import_perms;
+	public $array_import_icon;
+	public $array_import_code;
+	public $array_import_label;
+	public $array_import_tables;
+	public $array_import_tables_creator;
+	public $array_import_fields;
+	public $array_import_fieldshidden;
+	public $array_import_entities;
+	public $array_import_regex;
+	public $array_import_updatekeys;
+	public $array_import_examplevalues;
+	public $array_import_convertvalue;
+	public $array_import_run_sql_after;
 
 	/**
 	 * @var string Error code (or message)
@@ -55,40 +55,40 @@ class Import
 	public $errors = array();
 
 
-    /**
-     *    Constructor
-     *
-     *    @param  	DoliDB		$db		Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-    }
+	/**
+	 *    Constructor
+	 *
+	 *    @param  	DoliDB		$db		Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Load description int this->array_import_module, this->array_import_fields, ... of an importable dataset
 	 *
 	 *  @param		User	$user      	Object user making import
 	 *  @param  	string	$filter		Load a particular dataset only. Index will start to 0.
- 	 *  @return		int					<0 if KO, >0 if OK
+	 *  @return		int					<0 if KO, >0 if OK
 	 */
-    public function load_arrays($user, $filter = '')
+	public function load_arrays($user, $filter = '')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs, $conf;
 
 		dol_syslog(get_class($this)."::load_arrays user=".$user->id." filter=".$filter);
 
-        $i = 0;
+		$i = 0;
 
-        require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-        $modulesdir = dolGetModulesDirs();
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+		$modulesdir = dolGetModulesDirs();
 
-        // Load list of modules
-        foreach ($modulesdir as $dir)
-        {
+		// Load list of modules
+		foreach ($modulesdir as $dir)
+		{
 			$handle = @opendir(dol_osencode($dir));
 			if (!is_resource($handle)) continue;
 
@@ -181,14 +181,14 @@ class Import
 					}
 				}
 			}
-	        closedir($handle);
+			closedir($handle);
 		}
 		return 1;
 	}
 
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Build an import example file.
 	 *  Arrays this->array_export_xxx are already loaded for required datatoexport
@@ -199,9 +199,9 @@ class Import
 	 *  @param		string	$datatoimport		Dataset to import
 	 *  @return		string						<0 if KO, >0 if OK
 	 */
-    public function build_example_file($model, $headerlinefields, $contentlinevalues, $datatoimport)
+	public function build_example_file($model, $headerlinefields, $contentlinevalues, $datatoimport)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $langs;
 
 		$indice = 0;
@@ -239,7 +239,7 @@ class Import
 	 *  @param		User	$user 	Object user that save
 	 *  @return		int				<0 if KO, >0 if OK
 	 */
-    public function create($user)
+	public function create($user)
 	{
 		global $conf;
 
@@ -277,7 +277,7 @@ class Import
 	 *  @param		int		$id		Id of profil to load
 	 *  @return		int				<0 if KO, >0 if OK
 	 */
-    public function fetch($id)
+	public function fetch($id)
 	{
 		$sql = 'SELECT em.rowid, em.field, em.label, em.type';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'import_model as em';
@@ -313,7 +313,7 @@ class Import
 	 *  @param      int		$notrigger	    0=launch triggers after, 1=disable triggers
 	 *	@return		int						<0 if KO, >0 if OK
 	 */
-    public function delete($user, $notrigger = 0)
+	public function delete($user, $notrigger = 0)
 	{
 		global $conf, $langs;
 		$error = 0;
diff --git a/htdocs/imports/emptyexample.php b/htdocs/imports/emptyexample.php
index 9c5d8c12a0d..7e7cec1707e 100644
--- a/htdocs/imports/emptyexample.php
+++ b/htdocs/imports/emptyexample.php
@@ -21,7 +21,7 @@
  *      \brief      Show example of import file
  */
 
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1');				// Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
+if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1'); // Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
 
 
 /**
@@ -32,7 +32,7 @@ if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1');				// Do not rol
  */
 function llxHeader()
 {
-    print '<html><title>Build an import example file</title><body>';
+	print '<html><title>Build an import example file</title><body>';
 }
 
 /**
@@ -43,7 +43,7 @@ function llxHeader()
  */
 function llxFooter()
 {
-    print '</body></html>';
+	print '</body></html>';
 }
 
 require '../main.inc.php';
diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php
index 0ef716b0c50..e9ee3d0bece 100644
--- a/htdocs/imports/import.php
+++ b/htdocs/imports/import.php
@@ -328,7 +328,7 @@ if ($step == 1 || !$datatoimport)
 
 	llxHeader('', $langs->trans("NewImport"), 'EN:Module_Imports_En|FR:Module_Imports|ES:M&oacute;dulo_Importaciones');
 
-    $head = import_prepare_head($param, 1);
+	$head = import_prepare_head($param, 1);
 
 	print dol_get_fiche_head($head, 'step1', $langs->trans("NewImport"), -1);
 
@@ -358,7 +358,7 @@ if ($step == 1 || !$datatoimport)
 			print '</td><td>';
 			print img_object($objimport->array_import_module[$key]['module']->getName(), $objimport->array_import_icon[$key]).' ';
 			print $objimport->array_import_label[$key];
-            print '</td><td style="text-align: right">';
+			print '</td><td style="text-align: right">';
 			if ($objimport->array_import_perms[$key])
 			{
 				print '<a href="'.DOL_URL_ROOT.'/imports/import.php?step=2&datatoimport='.$objimport->array_import_code[$key].$param.'">'.img_picto($langs->trans("NewImport"), 'next', 'class="fa-15x"').'</a>';
@@ -371,9 +371,9 @@ if ($step == 1 || !$datatoimport)
 		print '<tr><td class="oddeven" colspan="3">'.$langs->trans("NoImportableData").'</td></tr>';
 	}
 	print '</table>';
-    print '</div>';
+	print '</div>';
 
-    dol_fiche_end();
+	print dol_get_fiche_end();
 }
 
 
@@ -388,7 +388,7 @@ if ($step == 2 && $datatoimport)
 
 	llxHeader('', $langs->trans("NewImport"), 'EN:Module_Imports_En|FR:Module_Imports|ES:M&oacute;dulo_Importaciones');
 
-    $head = import_prepare_head($param, 2);
+	$head = import_prepare_head($param, 2);
 
 	print dol_get_fiche_head($head, 'step2', $langs->trans("NewImport"), -2);
 
@@ -417,7 +417,7 @@ if ($step == 2 && $datatoimport)
 
 	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 
 	print '<form name="userfile" action="'.$_SERVER["PHP_SELF"].'" enctype="multipart/form-data" METHOD="POST">';
@@ -440,8 +440,8 @@ if ($step == 2 && $datatoimport)
 	{
 		print '<tr class="oddeven">';
 		print '<td width="16">'.img_picto_common($key, $objmodelimport->getPictoForKey($key)).'</td>';
-    	$text = $objmodelimport->getDriverDescForKey($key);
-    	print '<td>'.$form->textwithpicto($objmodelimport->getDriverLabelForKey($key), $text).'</td>';
+		$text = $objmodelimport->getDriverDescForKey($key);
+		print '<td>'.$form->textwithpicto($objmodelimport->getDriverLabelForKey($key), $text).'</td>';
 		print '<td style="text-align:center"><a href="'.DOL_URL_ROOT.'/imports/emptyexample.php?format='.$key.$param.'" target="_blank">'.$langs->trans("DownloadEmptyExample").'</a></td>';
 		// Action button
 		print '<td style="text-align:right">';
@@ -470,7 +470,7 @@ if ($step == 3 && $datatoimport)
 
 	llxHeader('', $langs->trans("NewImport"), 'EN:Module_Imports_En|FR:Module_Imports|ES:M&oacute;dulo_Importaciones');
 
-    $head = import_prepare_head($param, 3);
+	$head = import_prepare_head($param, 3);
 
 	print dol_get_fiche_head($head, 'step3', $langs->trans("NewImport"), -2);
 
@@ -517,16 +517,16 @@ if ($step == 3 && $datatoimport)
 	// Source file format
 	print '<tr><td class="titlefield">'.$langs->trans("SourceFileFormat").'</td>';
 	print '<td>';
-    $text = $objmodelimport->getDriverDescForKey($format);
-    print $form->textwithpicto($objmodelimport->getDriverLabelForKey($format), $text);
-    print '</td><td style="text-align:right" class="nowrap"><a href="'.DOL_URL_ROOT.'/imports/emptyexample.php?format='.$format.$param.'" target="_blank">'.$langs->trans("DownloadEmptyExample").'</a>';
+	$text = $objmodelimport->getDriverDescForKey($format);
+	print $form->textwithpicto($objmodelimport->getDriverLabelForKey($format), $text);
+	print '</td><td style="text-align:right" class="nowrap"><a href="'.DOL_URL_ROOT.'/imports/emptyexample.php?format='.$format.$param.'" target="_blank">'.$langs->trans("DownloadEmptyExample").'</a>';
 
 	print '</td></tr>';
 
 	print '</table>';
 	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 
 	if ($format == 'xlsx' && !class_exists('XMLWriter')) {
@@ -535,7 +535,7 @@ if ($step == 3 && $datatoimport)
 	}
 
 
-    print '<br>';
+	print '<br>';
 
 	print '<form name="userfile" action="'.$_SERVER["PHP_SELF"].'" enctype="multipart/form-data" METHOD="POST">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -596,11 +596,11 @@ if ($step == 3 && $datatoimport)
 			}
 		}
 
-        $langs->load('other');
-        $out .= ' ';
-        $out .= info_admin($langs->trans("ThisLimitIsDefinedInSetup", $max, $maxphptoshow), 1);
+		$langs->load('other');
+		$out .= ' ';
+		$out .= info_admin($langs->trans("ThisLimitIsDefinedInSetup", $max, $maxphptoshow), 1);
 	} else {
-	    $out .= ' ('.$langs->trans("UploadDisabled").')';
+		$out .= ' ('.$langs->trans("UploadDisabled").')';
 	}
 	print $out;
 	print '</td>';
@@ -616,7 +616,7 @@ if ($step == 3 && $datatoimport)
 		$i = 0;
 		foreach ($filearray as $key => $val)
 		{
-		    $file = $val['name'];
+			$file = $val['name'];
 
 			// readdir return value in ISO and we want UTF8 in memory
 			if (!utf8_check($file)) $file = utf8_encode($file);
@@ -630,9 +630,9 @@ if ($step == 3 && $datatoimport)
 			print '<tr class="oddeven">';
 			print '<td width="16">'.img_mime($file).'</td>';
 			print '<td>';
-    		print '<a data-ajax="false" href="'.DOL_URL_ROOT.'/document.php?modulepart='.$modulepart.'&file='.urlencode($relativepath).'&step=3'.$param.'" target="_blank">';
-    		print $file;
-    		print '</a>';
+			print '<a data-ajax="false" href="'.DOL_URL_ROOT.'/document.php?modulepart='.$modulepart.'&file='.urlencode($relativepath).'&step=3'.$param.'" target="_blank">';
+			print $file;
+			print '</a>';
 			print '</td>';
 			// Affiche taille fichier
 			print '<td style="text-align:right">'.dol_print_size(dol_filesize($dir.'/'.$file)).'</td>';
@@ -670,19 +670,19 @@ if ($step == 4 && $datatoimport)
 	$obj = new $classname($db, $datatoimport);
 	if ($model == 'csv')
 	{
-	    $obj->separator = $separator;
-	    $obj->enclosure = $enclosure;
+		$obj->separator = $separator;
+		$obj->enclosure = $enclosure;
+	}
+	if ($model == 'xlsx') {
+		if (!preg_match('/\.xlsx$/i', $filetoimport))
+		{
+			$langs->load("errors");
+			$param = '&datatoimport='.$datatoimport.'&format='.$format;
+			setEventMessages($langs->trans("ErrorFileMustHaveFormat", $model), null, 'errors');
+			header("Location: ".$_SERVER["PHP_SELF"].'?step=3'.$param.'&filetoimport='.urlencode($relativepath));
+			exit;
+		}
 	}
-    if ($model == 'xlsx') {
-        if (!preg_match('/\.xlsx$/i', $filetoimport))
-        {
-            $langs->load("errors");
-            $param = '&datatoimport='.$datatoimport.'&format='.$format;
-            setEventMessages($langs->trans("ErrorFileMustHaveFormat", $model), null, 'errors');
-            header("Location: ".$_SERVER["PHP_SELF"].'?step=3'.$param.'&filetoimport='.urlencode($relativepath));
-            exit;
-        }
-    }
 
 	if (GETPOST('update')) {
 		$array_match_file_to_database = array();
@@ -761,7 +761,7 @@ if ($step == 4 && $datatoimport)
 
 	llxHeader('', $langs->trans("NewImport"), 'EN:Module_Imports_En|FR:Module_Imports|ES:M&oacute;dulo_Importaciones');
 
-    $head = import_prepare_head($param, 4);
+	$head = import_prepare_head($param, 4);
 
 	print dol_get_fiche_head($head, 'step4', $langs->trans("NewImport"), -2);
 
@@ -799,12 +799,12 @@ if ($step == 4 && $datatoimport)
 	// Source file format
 	print '<tr><td class="titlefield">'.$langs->trans("SourceFileFormat").'</td>';
 	print '<td>';
-    $text = $objmodelimport->getDriverDescForKey($format);
-    print $form->textwithpicto($objmodelimport->getDriverLabelForKey($format), $text);
+	$text = $objmodelimport->getDriverDescForKey($format);
+	print $form->textwithpicto($objmodelimport->getDriverLabelForKey($format), $text);
 	print '</td></tr>';
 
 	// Separator and enclosure
-    if ($model == 'csv') {
+	if ($model == 'csv') {
 		print '<tr><td>'.$langs->trans("CsvOptions").'</td>';
 		print '<td>';
 		print '<form>';
@@ -822,50 +822,50 @@ if ($step == 4 && $datatoimport)
 		print '<input name="update" type="submit" value="'.$langs->trans('Update').'" class="button" />';
 		print '</form>';
 		print '</td></tr>';
-    }
+	}
 
 	// File to import
 	print '<tr><td>'.$langs->trans("FileToImport").'</td>';
 	print '<td>';
 	$modulepart = 'import';
 	$relativepath = GETPOST('filetoimport');
-    print '<a data-ajax="false" href="'.DOL_URL_ROOT.'/document.php?modulepart='.$modulepart.'&file='.urlencode($relativepath).'&step=4'.$param.'" target="_blank">';
-    print $filetoimport;
-    print '</a>';
+	print '<a data-ajax="false" href="'.DOL_URL_ROOT.'/document.php?modulepart='.$modulepart.'&file='.urlencode($relativepath).'&step=4'.$param.'" target="_blank">';
+	print $filetoimport;
+	print '</a>';
 	print '</td></tr>';
 
 	print '</table>';
 	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<br>'."\n";
 
 
-    // List of source fields
-    print '<!-- List of source fields -->'."\n";
-    print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    print '<input type="hidden" name="action" value="select_model">';
-    print '<input type="hidden" name="step" value="4">';
-    print '<input type="hidden" name="format" value="'.$format.'">';
-    print '<input type="hidden" name="datatoimport" value="'.$datatoimport.'">';
-    print '<input type="hidden" name="filetoimport" value="'.$filetoimport.'">';
-    print '<input type="hidden" name="excludefirstline" value="'.$excludefirstline.'">';
-    print '<input type="hidden" name="endatlinenb" value="'.$endatlinenb.'">';
-    print '<input type="hidden" name="separator" value="'.dol_escape_htmltag($separator).'">';
-    print '<input type="hidden" name="enclosure" value="'.dol_escape_htmltag($enclosure).'">';
+	// List of source fields
+	print '<!-- List of source fields -->'."\n";
+	print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="action" value="select_model">';
+	print '<input type="hidden" name="step" value="4">';
+	print '<input type="hidden" name="format" value="'.$format.'">';
+	print '<input type="hidden" name="datatoimport" value="'.$datatoimport.'">';
+	print '<input type="hidden" name="filetoimport" value="'.$filetoimport.'">';
+	print '<input type="hidden" name="excludefirstline" value="'.$excludefirstline.'">';
+	print '<input type="hidden" name="endatlinenb" value="'.$endatlinenb.'">';
+	print '<input type="hidden" name="separator" value="'.dol_escape_htmltag($separator).'">';
+	print '<input type="hidden" name="enclosure" value="'.dol_escape_htmltag($enclosure).'">';
 
-    print '<div class="marginbottomonly">';
-    print '<span class="opacitymedium">'.$langs->trans("SelectImportFields", img_picto('', 'grip_title', '', false, 0, 0, '', '', 0)).'</span> ';
-    $htmlother->select_import_model($importmodelid, 'importmodelid', $datatoimport, 1);
-    print '<input type="submit" class="button" value="'.$langs->trans("Select").'">';
-    print '</div>';
-    print '</form>';
+	print '<div class="marginbottomonly">';
+	print '<span class="opacitymedium">'.$langs->trans("SelectImportFields", img_picto('', 'grip_title', '', false, 0, 0, '', '', 0)).'</span> ';
+	$htmlother->select_import_model($importmodelid, 'importmodelid', $datatoimport, 1);
+	print '<input type="submit" class="button" value="'.$langs->trans("Select").'">';
+	print '</div>';
+	print '</form>';
 
 	// Title of array with fields
-    print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
-    print '<table class="noborder centpercent">';
+	print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre">';
 	print '<td>'.$langs->trans("FieldsInSourceFile").'</td>';
 	print '<td>'.$langs->trans("FieldsInTargetDatabase").'</td>';
@@ -978,11 +978,11 @@ if ($step == 4 && $datatoimport)
 		// Example
 		if (empty($objimport->array_import_convertvalue[0][$code]))	// If source file does not need convertion
 		{
-		    if ($example) $htmltext .= $langs->trans("SourceExample").': <b>'.$example.'</b><br>';
+			if ($example) $htmltext .= $langs->trans("SourceExample").': <b>'.$example.'</b><br>';
 		} else {
-		    if ($objimport->array_import_convertvalue[0][$code]['rule'] == 'fetchidfromref')        $htmltext .= $langs->trans("SourceExample").': <b>'.$langs->transnoentitiesnoconv("ExampleAnyRefFoundIntoElement", $entitylang).($example ? ' ('.$langs->transnoentitiesnoconv("Example").': '.$example.')' : '').'</b><br>';
-		    elseif ($objimport->array_import_convertvalue[0][$code]['rule'] == 'fetchidfromcodeid') $htmltext .= $langs->trans("SourceExample").': <b>'.$langs->trans("ExampleAnyCodeOrIdFoundIntoDictionary", $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$code]['dict'])).($example ? ' ('.$langs->transnoentitiesnoconv("Example").': '.$example.')' : '').'</b><br>';
-		    elseif ($example) $htmltext .= $langs->trans("SourceExample").': <b>'.$example.'</b><br>';
+			if ($objimport->array_import_convertvalue[0][$code]['rule'] == 'fetchidfromref')        $htmltext .= $langs->trans("SourceExample").': <b>'.$langs->transnoentitiesnoconv("ExampleAnyRefFoundIntoElement", $entitylang).($example ? ' ('.$langs->transnoentitiesnoconv("Example").': '.$example.')' : '').'</b><br>';
+			elseif ($objimport->array_import_convertvalue[0][$code]['rule'] == 'fetchidfromcodeid') $htmltext .= $langs->trans("SourceExample").': <b>'.$langs->trans("ExampleAnyCodeOrIdFoundIntoDictionary", $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$code]['dict'])).($example ? ' ('.$langs->transnoentitiesnoconv("Example").': '.$example.')' : '').'</b><br>';
+			elseif ($example) $htmltext .= $langs->trans("SourceExample").': <b>'.$example.'</b><br>';
 		}
 		// Format control rule
 		if (!empty($objimport->array_import_regex[0][$code]))
@@ -1055,13 +1055,13 @@ if ($step == 4 && $datatoimport)
 	print '</td></tr>';
 
 	print '</table>';
-    print '</div>';
+	print '</div>';
 
 
 	if ($conf->use_javascript_ajax)
 	{
-        print '<script type="text/javascript" language="javascript">';
-        print 'jQuery(function() {
+		print '<script type="text/javascript" language="javascript">';
+		print 'jQuery(function() {
                     jQuery("#left, #right").sortable({
                         /* placeholder: \'ui-state-highlight\', */
                         handle: \'.boxhandle\',
@@ -1075,24 +1075,24 @@ if ($step == 4 && $datatoimport)
                     });
                 });
         ';
-        print "\n";
-        print 'function updateOrder(){'."\n";
-        print 'var left_list = cleanSerialize(jQuery("#left").sortable("serialize" ));'."\n";
-        //print 'var right_list = cleanSerialize(jQuery("#right").sortable("serialize" ));'."\n";
-        print 'var boxorder = \'A:\' + left_list;'."\n";
-        //print 'var boxorder = \'A:\' + left_list + \'-B:\' + right_list;'."\n";
-        //print 'alert(\'boxorder=\' + boxorder);';
-        //print 'var userid = \''.$user->id.'\';'."\n";
-        //print 'var datatoimport = "'.$datatoimport.'";'."\n";
-        // print 'jQuery.ajax({ url: "ajaximport.php?step=4&boxorder=" + boxorder + "&userid=" + userid + "&datatoimport=" + datatoimport,
-        //                    async: false
-        //        });'."\n";
-        // Now reload page
-        print 'var newlocation= \''.$_SERVER["PHP_SELF"].'?step=4'.$param.'&action=saveorder&boxorder=\' + boxorder;'."\n";
-        //print 'alert(newlocation);';
-        print 'window.location.href=newlocation;'."\n";
-        print '}'."\n";
-        print '</script>'."\n";
+		print "\n";
+		print 'function updateOrder(){'."\n";
+		print 'var left_list = cleanSerialize(jQuery("#left").sortable("serialize" ));'."\n";
+		//print 'var right_list = cleanSerialize(jQuery("#right").sortable("serialize" ));'."\n";
+		print 'var boxorder = \'A:\' + left_list;'."\n";
+		//print 'var boxorder = \'A:\' + left_list + \'-B:\' + right_list;'."\n";
+		//print 'alert(\'boxorder=\' + boxorder);';
+		//print 'var userid = \''.$user->id.'\';'."\n";
+		//print 'var datatoimport = "'.$datatoimport.'";'."\n";
+		// print 'jQuery.ajax({ url: "ajaximport.php?step=4&boxorder=" + boxorder + "&userid=" + userid + "&datatoimport=" + datatoimport,
+		//                    async: false
+		//        });'."\n";
+		// Now reload page
+		print 'var newlocation= \''.$_SERVER["PHP_SELF"].'?step=4'.$param.'&action=saveorder&boxorder=\' + boxorder;'."\n";
+		//print 'alert(newlocation);';
+		print 'window.location.href=newlocation;'."\n";
+		print '}'."\n";
+		print '</script>'."\n";
 	}
 
 	/*
@@ -1126,12 +1126,12 @@ if ($step == 4 && $datatoimport)
 		print '<input type="hidden" name="step" value="'.$step.'">';
 		print '<input type="hidden" name="format" value="'.$format.'">';
 		print '<input type="hidden" name="datatoimport" value="'.$datatoimport.'">';
-    	print '<input type="hidden" name="filetoimport" value="'.$filetoimport.'">';
+		print '<input type="hidden" name="filetoimport" value="'.$filetoimport.'">';
 		print '<input type="hidden" name="hexa" value="'.$hexa.'">';
-    	print '<input type="hidden" name="excludefirstline" value="'.$excludefirstline.'">';
-    	print '<input type="hidden" name="endatlinenb" value="'.$endatlinenb.'">';
-    	print '<input type="hidden" value="'.dol_escape_htmltag($separator).'" name="separator">';
-    	print '<input type="hidden" value="'.dol_escape_htmltag($enclosure).'" name="enclosure">';
+		print '<input type="hidden" name="excludefirstline" value="'.$excludefirstline.'">';
+		print '<input type="hidden" name="endatlinenb" value="'.$endatlinenb.'">';
+		print '<input type="hidden" value="'.dol_escape_htmltag($separator).'" name="separator">';
+		print '<input type="hidden" value="'.dol_escape_htmltag($enclosure).'" name="enclosure">';
 
 		print '<table summary="selectofimportprofil" class="noborder centpercent">';
 		print '<tr class="liste_titre">';
@@ -1189,8 +1189,8 @@ if ($step == 5 && $datatoimport)
 	require_once $dir.$file;
 	$obj = new $classname($db, $datatoimport);
 	if ($model == 'csv') {
-	    $obj->separator = $separator;
-	    $obj->enclosure = $enclosure;
+		$obj->separator = $separator;
+		$obj->enclosure = $enclosure;
 	}
 
 	// Load source fields in input file
@@ -1221,13 +1221,13 @@ if ($step == 5 && $datatoimport)
 
 	llxHeader('', $langs->trans("NewImport"), 'EN:Module_Imports_En|FR:Module_Imports|ES:M&oacute;dulo_Importaciones');
 
-    $head = import_prepare_head($param, 5);
+	$head = import_prepare_head($param, 5);
 
 
-    print '<form action="'.$_SERVER["PHP_SELF"].'?'.$param2.'" method="POST">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    print '<input type="hidden" name="step" value="5">'; // step 5
-    print '<input type="hidden" name="action" value="launchsimu">'; // step 5
+	print '<form action="'.$_SERVER["PHP_SELF"].'?'.$param2.'" method="POST">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="step" value="5">'; // step 5
+	print '<input type="hidden" name="action" value="launchsimu">'; // step 5
 
 	print dol_get_fiche_head($head, 'step5', $langs->trans("NewImport"), -2);
 
@@ -1265,17 +1265,17 @@ if ($step == 5 && $datatoimport)
 	// Source file format
 	print '<tr><td class="titlefield">'.$langs->trans("SourceFileFormat").'</td>';
 	print '<td>';
-    $text = $objmodelimport->getDriverDescForKey($format);
-    print $form->textwithpicto($objmodelimport->getDriverLabelForKey($format), $text);
+	$text = $objmodelimport->getDriverDescForKey($format);
+	print $form->textwithpicto($objmodelimport->getDriverLabelForKey($format), $text);
 	print '</td></tr>';
 
 	// Separator and enclosure
 	if ($model == 'csv') {
-	    print '<tr><td>'.$langs->trans("CsvOptions").'</td>';
-	    print '<td>';
-	    print $langs->trans("Separator").' : '.dol_escape_htmltag($separator);
-	    print '&nbsp;&nbsp;&nbsp;&nbsp;'.$langs->trans("Enclosure").' : '.dol_escape_htmltag($enclosure);
-	    print '</td></tr>';
+		print '<tr><td>'.$langs->trans("CsvOptions").'</td>';
+		print '<td>';
+		print $langs->trans("Separator").' : '.dol_escape_htmltag($separator);
+		print '&nbsp;&nbsp;&nbsp;&nbsp;'.$langs->trans("Enclosure").' : '.dol_escape_htmltag($enclosure);
+		print '</td></tr>';
 	}
 
 	// File to import
@@ -1283,10 +1283,10 @@ if ($step == 5 && $datatoimport)
 	print '<td>';
 	$modulepart = 'import';
 	$relativepath = GETPOST('filetoimport');
-    print '<a data-ajax="false" href="'.DOL_URL_ROOT.'/document.php?modulepart='.$modulepart.'&file='.urlencode($relativepath).'&step=4'.$param.'" target="_blank">';
-    print $filetoimport;
-    print '</a>';
-    print '</td></tr>';
+	print '<a data-ajax="false" href="'.DOL_URL_ROOT.'/document.php?modulepart='.$modulepart.'&file='.urlencode($relativepath).'&step=4'.$param.'" target="_blank">';
+	print $filetoimport;
+	print '</a>';
+	print '</td></tr>';
 
 	// Total lines in source file
 	print '<tr><td>';
@@ -1301,22 +1301,22 @@ if ($step == 5 && $datatoimport)
 	print '</td><td>';
 	if ($action == 'launchsimu')
 	{
-	    print '<input type="number" class="maxwidth50" name="excludefirstlinebis" disabled="disabled" value="'.$excludefirstline.'">';
-	    print '<input type="hidden" name="excludefirstline" value="'.$excludefirstline.'">';
+		print '<input type="number" class="maxwidth50" name="excludefirstlinebis" disabled="disabled" value="'.$excludefirstline.'">';
+		print '<input type="hidden" name="excludefirstline" value="'.$excludefirstline.'">';
 	} else {
-	    print '<input type="number" class="maxwidth50" name="excludefirstline" value="'.$excludefirstline.'">';
-	    print $form->textwithpicto("", $langs->trans("SetThisValueTo2ToExcludeFirstLine"));
+		print '<input type="number" class="maxwidth50" name="excludefirstline" value="'.$excludefirstline.'">';
+		print $form->textwithpicto("", $langs->trans("SetThisValueTo2ToExcludeFirstLine"));
 	}
 	print ' - ';
 	if ($action == 'launchsimu')
 	{
-	    print '<input type="text" class="maxwidth50" name="endatlinenbbis" disabled="disabled" value="'.$endatlinenb.'">';
-	    print '<input type="hidden" name="endatlinenb" value="'.$endatlinenb.'">';
+		print '<input type="text" class="maxwidth50" name="endatlinenbbis" disabled="disabled" value="'.$endatlinenb.'">';
+		print '<input type="hidden" name="endatlinenb" value="'.$endatlinenb.'">';
 	} else {
-	    print '<input type="text" class="maxwidth50" name="endatlinenb" value="'.$endatlinenb.'">';
-	    print $form->textwithpicto("", $langs->trans("KeepEmptyToGoToEndOfFile"));
+		print '<input type="text" class="maxwidth50" name="endatlinenb" value="'.$endatlinenb.'">';
+		print $form->textwithpicto("", $langs->trans("KeepEmptyToGoToEndOfFile"));
 	}
-    if ($action == 'launchsimu') print ' &nbsp; <a href="'.$_SERVER["PHP_SELF"].'?step=5'.$param.'">'.$langs->trans("Modify").'</a>';
+	if ($action == 'launchsimu') print ' &nbsp; <a href="'.$_SERVER["PHP_SELF"].'?step=5'.$param.'">'.$langs->trans("Modify").'</a>';
 	print '</td></tr>';
 
 	// Keys for data UPDATE (not INSERT of new data)
@@ -1336,7 +1336,7 @@ if ($step == 5 && $datatoimport)
 		print ' &nbsp; <a href="'.$_SERVER["PHP_SELF"].'?step=5'.$param.'">'.$langs->trans("Modify").'</a>';
 	} else {
    		if (is_array($objimport->array_import_updatekeys[0]) && count($objimport->array_import_updatekeys[0]))
-        {   //TODO dropdown UL is created inside nested SPANS
+		{   //TODO dropdown UL is created inside nested SPANS
 			print $form->multiselectarray('updatekeys', $objimport->array_import_updatekeys[0], $updatekeys, 0, 0, '', 1, '80%');
 			print $form->textwithpicto("", $langs->trans("SelectPrimaryColumnsForUpdateAttempt"));
 		} else {
@@ -1421,186 +1421,186 @@ if ($step == 5 && $datatoimport)
 	print '</table>';
 	print '</div>';
 
-    dol_fiche_end();
+	print dol_get_fiche_end();
 
 
-    if ($action != 'launchsimu')
-    {
-        // Show import id
-        print '<br><span class="opacitymedium">';
-        print $langs->trans("NowClickToTestTheImport", $langs->transnoentitiesnoconv("RunSimulateImportFile")).'</span><br>';
-        print '<br>';
+	if ($action != 'launchsimu')
+	{
+		// Show import id
+		print '<br><span class="opacitymedium">';
+		print $langs->trans("NowClickToTestTheImport", $langs->transnoentitiesnoconv("RunSimulateImportFile")).'</span><br>';
+		print '<br>';
 
-        // Actions
-        print '<div class="center">';
-        if ($user->rights->import->run)
-        {
-            print '<input type="submit" class="butAction" value="'.$langs->trans("RunSimulateImportFile").'">';
-        } else {
-            print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("RunSimulateImportFile").'</a>';
-        }
-        print '</div>';
-    } else {
-        // Launch import
-        $arrayoferrors = array();
-        $arrayofwarnings = array();
-        $maxnboferrors = empty($conf->global->IMPORT_MAX_NB_OF_ERRORS) ? 50 : $conf->global->IMPORT_MAX_NB_OF_ERRORS;
-        $maxnbofwarnings = empty($conf->global->IMPORT_MAX_NB_OF_WARNINGS) ? 50 : $conf->global->IMPORT_MAX_NB_OF_WARNINGS;
-        $nboferrors = 0;
-        $nbofwarnings = 0;
+		// Actions
+		print '<div class="center">';
+		if ($user->rights->import->run)
+		{
+			print '<input type="submit" class="butAction" value="'.$langs->trans("RunSimulateImportFile").'">';
+		} else {
+			print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("RunSimulateImportFile").'</a>';
+		}
+		print '</div>';
+	} else {
+		// Launch import
+		$arrayoferrors = array();
+		$arrayofwarnings = array();
+		$maxnboferrors = empty($conf->global->IMPORT_MAX_NB_OF_ERRORS) ? 50 : $conf->global->IMPORT_MAX_NB_OF_ERRORS;
+		$maxnbofwarnings = empty($conf->global->IMPORT_MAX_NB_OF_WARNINGS) ? 50 : $conf->global->IMPORT_MAX_NB_OF_WARNINGS;
+		$nboferrors = 0;
+		$nbofwarnings = 0;
 
-        $importid = dol_print_date(dol_now(), '%Y%m%d%H%M%S');
+		$importid = dol_print_date(dol_now(), '%Y%m%d%H%M%S');
 
-        //var_dump($array_match_file_to_database);
+		//var_dump($array_match_file_to_database);
 
-        $db->begin();
+		$db->begin();
 
-        // Open input file
-        $nbok = 0;
-        $pathfile = $conf->import->dir_temp.'/'.$filetoimport;
-        $result = $obj->import_open_file($pathfile, $langs);
-        if ($result > 0)
-        {
-            global $tablewithentity_cache;
-            $tablewithentity_cache = array();
-        	$sourcelinenb = 0; $endoffile = 0;
+		// Open input file
+		$nbok = 0;
+		$pathfile = $conf->import->dir_temp.'/'.$filetoimport;
+		$result = $obj->import_open_file($pathfile, $langs);
+		if ($result > 0)
+		{
+			global $tablewithentity_cache;
+			$tablewithentity_cache = array();
+			$sourcelinenb = 0; $endoffile = 0;
 
-            // Loop on each input file record
-            while (($sourcelinenb < $nboflines) && !$endoffile)
-            {
-                $sourcelinenb++;
-                // Read line and store it into $arrayrecord
-                //dol_syslog("line ".$sourcelinenb.' - '.$nboflines.' - '.$excludefirstline.' - '.$endatlinenb);
-                $arrayrecord = $obj->import_read_record();
-                if ($arrayrecord === false)
-                {
+			// Loop on each input file record
+			while (($sourcelinenb < $nboflines) && !$endoffile)
+			{
+				$sourcelinenb++;
+				// Read line and store it into $arrayrecord
+				//dol_syslog("line ".$sourcelinenb.' - '.$nboflines.' - '.$excludefirstline.' - '.$endatlinenb);
+				$arrayrecord = $obj->import_read_record();
+				if ($arrayrecord === false)
+				{
 					$arrayofwarnings[$sourcelinenb][0] = array('lib'=>'File has '.$nboflines.' lines. However we reach end of file after record '.$sourcelinenb.'. This may occurs when some records are split onto several lines. Ensure the complete string is delimited correctly when there is a separator character in the text string.', 'type'=>'EOF_RECORD_ON_SEVERAL_LINES');
-                	$endoffile++;
-                	continue;
-                }
-                if ($excludefirstline && ($sourcelinenb < $excludefirstline)) continue;
-                if ($endatlinenb && ($sourcelinenb > $endatlinenb)) break;
+					$endoffile++;
+					continue;
+				}
+				if ($excludefirstline && ($sourcelinenb < $excludefirstline)) continue;
+				if ($endatlinenb && ($sourcelinenb > $endatlinenb)) break;
 
-                // Run import
-                $result = $obj->import_insert($arrayrecord, $array_match_file_to_database, $objimport, count($fieldssource), $importid, $updatekeys);
+				// Run import
+				$result = $obj->import_insert($arrayrecord, $array_match_file_to_database, $objimport, count($fieldssource), $importid, $updatekeys);
 
-                if (count($obj->errors))   $arrayoferrors[$sourcelinenb] = $obj->errors;
-                if (count($obj->warnings)) $arrayofwarnings[$sourcelinenb] = $obj->warnings;
-                if (!count($obj->errors) && !count($obj->warnings)) $nbok++;
-            }
-            // Close file
-            $obj->import_close_file();
-        } else {
-            print $langs->trans("ErrorFailedToOpenFile", $pathfile);
-        }
+				if (count($obj->errors))   $arrayoferrors[$sourcelinenb] = $obj->errors;
+				if (count($obj->warnings)) $arrayofwarnings[$sourcelinenb] = $obj->warnings;
+				if (!count($obj->errors) && !count($obj->warnings)) $nbok++;
+			}
+			// Close file
+			$obj->import_close_file();
+		} else {
+			print $langs->trans("ErrorFailedToOpenFile", $pathfile);
+		}
 
-	    $error = 0;
+		$error = 0;
 
-	    // Run the sql after import if defined
-	    //var_dump($objimport->array_import_run_sql_after[0]);
-	    if (!empty($objimport->array_import_run_sql_after[0]) && is_array($objimport->array_import_run_sql_after[0]))
-	    {
-	        $i = 0;
-	        foreach ($objimport->array_import_run_sql_after[0] as $sqlafterimport)
-	        {
-	            $i++;
-	            $resqlafterimport = $db->query($sqlafterimport);
-	            if (!$resqlafterimport)
-	            {
-			        $arrayoferrors['none'][] = array('lib'=>$langs->trans("Error running final request: ".$sqlafterimport));
-	                $error++;
-	            }
-	        }
-	    }
+		// Run the sql after import if defined
+		//var_dump($objimport->array_import_run_sql_after[0]);
+		if (!empty($objimport->array_import_run_sql_after[0]) && is_array($objimport->array_import_run_sql_after[0]))
+		{
+			$i = 0;
+			foreach ($objimport->array_import_run_sql_after[0] as $sqlafterimport)
+			{
+				$i++;
+				$resqlafterimport = $db->query($sqlafterimport);
+				if (!$resqlafterimport)
+				{
+					$arrayoferrors['none'][] = array('lib'=>$langs->trans("Error running final request: ".$sqlafterimport));
+					$error++;
+				}
+			}
+		}
 
-        $db->rollback(); // We force rollback because this was just a simulation.
+		$db->rollback(); // We force rollback because this was just a simulation.
 
-        // Show OK
-        if (!count($arrayoferrors) && !count($arrayofwarnings)) {
-        	print '<div class="center">'.img_picto($langs->trans("OK"), 'tick').' <b>'.$langs->trans("NoError").'</b></div><br><br>';
+		// Show OK
+		if (!count($arrayoferrors) && !count($arrayofwarnings)) {
+			print '<div class="center">'.img_picto($langs->trans("OK"), 'tick').' <b>'.$langs->trans("NoError").'</b></div><br><br>';
 			print $langs->trans("NbInsert", $obj->nbinsert).'<br>';
 			print $langs->trans("NbUpdate", $obj->nbupdate).'<br><br>';
 		} else print $langs->trans("NbOfLinesOK", $nbok).'<br><br>';
 
-        // Show Errors
-        //var_dump($arrayoferrors);
-        if (count($arrayoferrors))
-        {
-            print img_error().' <b>'.$langs->trans("ErrorsOnXLines", count($arrayoferrors)).'</b><br>';
-            print '<table width="100%" class="border"><tr><td>';
-            foreach ($arrayoferrors as $key => $val)
-            {
-                $nboferrors++;
-                if ($nboferrors > $maxnboferrors)
-                {
-                    print $langs->trans("TooMuchErrors", (count($arrayoferrors) - $nboferrors))."<br>";
-                    break;
-                }
-                print '* '.$langs->trans("Line").' '.$key.'<br>';
-                foreach ($val as $i => $err)
-                {
-                    print ' &nbsp; &nbsp; > '.$err['lib'].'<br>';
-                }
-            }
-            print '</td></tr></table>';
-            print '<br>';
-        }
+		// Show Errors
+		//var_dump($arrayoferrors);
+		if (count($arrayoferrors))
+		{
+			print img_error().' <b>'.$langs->trans("ErrorsOnXLines", count($arrayoferrors)).'</b><br>';
+			print '<table width="100%" class="border"><tr><td>';
+			foreach ($arrayoferrors as $key => $val)
+			{
+				$nboferrors++;
+				if ($nboferrors > $maxnboferrors)
+				{
+					print $langs->trans("TooMuchErrors", (count($arrayoferrors) - $nboferrors))."<br>";
+					break;
+				}
+				print '* '.$langs->trans("Line").' '.$key.'<br>';
+				foreach ($val as $i => $err)
+				{
+					print ' &nbsp; &nbsp; > '.$err['lib'].'<br>';
+				}
+			}
+			print '</td></tr></table>';
+			print '<br>';
+		}
 
-        // Show Warnings
-        //var_dump($arrayoferrors);
-        if (count($arrayofwarnings))
-        {
-            print img_warning().' <b>'.$langs->trans("WarningsOnXLines", count($arrayofwarnings)).'</b><br>';
-            print '<table width="100%" class="border"><tr><td>';
-            foreach ($arrayofwarnings as $key => $val)
-            {
-                $nbofwarnings++;
-                if ($nbofwarnings > $maxnbofwarnings)
-                {
-                    print $langs->trans("TooMuchWarnings", (count($arrayofwarnings) - $nbofwarnings))."<br>";
-                    break;
-                }
-                print ' * '.$langs->trans("Line").' '.$key.'<br>';
-                foreach ($val as $i => $err)
-                {
-                    print ' &nbsp; &nbsp; > '.$err['lib'].'<br>';
-                }
-            }
-            print '</td></tr></table>';
-            print '<br>';
-        }
+		// Show Warnings
+		//var_dump($arrayoferrors);
+		if (count($arrayofwarnings))
+		{
+			print img_warning().' <b>'.$langs->trans("WarningsOnXLines", count($arrayofwarnings)).'</b><br>';
+			print '<table width="100%" class="border"><tr><td>';
+			foreach ($arrayofwarnings as $key => $val)
+			{
+				$nbofwarnings++;
+				if ($nbofwarnings > $maxnbofwarnings)
+				{
+					print $langs->trans("TooMuchWarnings", (count($arrayofwarnings) - $nbofwarnings))."<br>";
+					break;
+				}
+				print ' * '.$langs->trans("Line").' '.$key.'<br>';
+				foreach ($val as $i => $err)
+				{
+					print ' &nbsp; &nbsp; > '.$err['lib'].'<br>';
+				}
+			}
+			print '</td></tr></table>';
+			print '<br>';
+		}
 
-        // Show import id
-        $importid = dol_print_date(dol_now(), '%Y%m%d%H%M%S');
+		// Show import id
+		$importid = dol_print_date(dol_now(), '%Y%m%d%H%M%S');
 
-        print '<div class="center">';
-        print '<span class="opacitymedium">'.$langs->trans("NowClickToRunTheImport", $langs->transnoentitiesnoconv("RunImportFile")).'</span><br>';
-        if (empty($nboferrors)) print $langs->trans("DataLoadedWithId", $importid).'<br>';
-        print '</div>';
+		print '<div class="center">';
+		print '<span class="opacitymedium">'.$langs->trans("NowClickToRunTheImport", $langs->transnoentitiesnoconv("RunImportFile")).'</span><br>';
+		if (empty($nboferrors)) print $langs->trans("DataLoadedWithId", $importid).'<br>';
+		print '</div>';
 
-        print '<br>';
+		print '<br>';
 
-        // Actions
-        print '<div class="center">';
-        if ($user->rights->import->run)
-        {
-            if (empty($nboferrors))
-            {
-                print '<a class="butAction" href="'.DOL_URL_ROOT.'/imports/import.php?leftmenu=import&step=6&importid='.$importid.$param.'">'.$langs->trans("RunImportFile").'</a>';
-            } else {
-                //print '<input type="submit" class="butAction" value="'.dol_escape_htmltag($langs->trans("RunSimulateImportFile")).'">';
+		// Actions
+		print '<div class="center">';
+		if ($user->rights->import->run)
+		{
+			if (empty($nboferrors))
+			{
+				print '<a class="butAction" href="'.DOL_URL_ROOT.'/imports/import.php?leftmenu=import&step=6&importid='.$importid.$param.'">'.$langs->trans("RunImportFile").'</a>';
+			} else {
+				//print '<input type="submit" class="butAction" value="'.dol_escape_htmltag($langs->trans("RunSimulateImportFile")).'">';
 
-                print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("CorrectErrorBeforeRunningImport")).'">'.$langs->trans("RunImportFile").'</a>';
-            }
-        } else {
-            print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("RunSimulateImportFile").'</a>';
+				print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("CorrectErrorBeforeRunningImport")).'">'.$langs->trans("RunImportFile").'</a>';
+			}
+		} else {
+			print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("RunSimulateImportFile").'</a>';
 
-            print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("RunImportFile").'</a>';
-        }
-        print '</div>';
-    }
+			print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("RunImportFile").'</a>';
+		}
+		print '</div>';
+	}
 
-    print '</form>';
+	print '</form>';
 }
 
 
@@ -1619,8 +1619,8 @@ if ($step == 6 && $datatoimport)
 	require_once $dir.$file;
 	$obj = new $classname($db, $datatoimport);
 	if ($model == 'csv') {
-	    $obj->separator = $separator;
-	    $obj->enclosure = $enclosure;
+		$obj->separator = $separator;
+		$obj->enclosure = $enclosure;
 	}
 
 	// Load source fields in input file
@@ -1650,7 +1650,7 @@ if ($step == 6 && $datatoimport)
 
 	llxHeader('', $langs->trans("NewImport"), 'EN:Module_Imports_En|FR:Module_Imports|ES:M&oacute;dulo_Importaciones');
 
-    $head = import_prepare_head($param, 6);
+	$head = import_prepare_head($param, 6);
 
 	print dol_get_fiche_head($head, 'step6', $langs->trans("NewImport"), -1);
 
@@ -1688,29 +1688,29 @@ if ($step == 6 && $datatoimport)
 	// Source file format
 	print '<tr><td class="titlefield">'.$langs->trans("SourceFileFormat").'</td>';
 	print '<td>';
-    $text = $objmodelimport->getDriverDescForKey($format);
-    print $form->textwithpicto($objmodelimport->getDriverLabelForKey($format), $text);
+	$text = $objmodelimport->getDriverDescForKey($format);
+	print $form->textwithpicto($objmodelimport->getDriverLabelForKey($format), $text);
 	print '</td></tr>';
 
 	// Separator and enclosure
 	if ($model == 'csv') {
-	    print '<tr><td>'.$langs->trans("CsvOptions").'</td>';
-	    print '<td>';
-	    print $langs->trans("Separator").' : ';
-	    print htmlentities($separator);
-	    print '&nbsp;&nbsp;&nbsp;&nbsp;'.$langs->trans("Enclosure").' : ';
-	    print htmlentities($enclosure);
-	    print '</td></tr>';
+		print '<tr><td>'.$langs->trans("CsvOptions").'</td>';
+		print '<td>';
+		print $langs->trans("Separator").' : ';
+		print htmlentities($separator);
+		print '&nbsp;&nbsp;&nbsp;&nbsp;'.$langs->trans("Enclosure").' : ';
+		print htmlentities($enclosure);
+		print '</td></tr>';
 	}
 
 	// File to import
 	print '<tr><td>'.$langs->trans("FileToImport").'</td>';
 	print '<td>';
 	$modulepart = 'import';
-    $relativepath = GETPOST('filetoimport');
-    print '<a data-ajax="false" href="'.DOL_URL_ROOT.'/document.php?modulepart='.$modulepart.'&file='.urlencode($relativepath).'&step=4'.$param.'" target="_blank">';
-    print $filetoimport;
-    print '</a>';
+	$relativepath = GETPOST('filetoimport');
+	print '<a data-ajax="false" href="'.DOL_URL_ROOT.'/document.php?modulepart='.$modulepart.'&file='.urlencode($relativepath).'&step=4'.$param.'" target="_blank">';
+	print $filetoimport;
+	print '</a>';
 	print '</td></tr>';
 
 	// Nb of fields
@@ -1731,7 +1731,7 @@ if ($step == 6 && $datatoimport)
 	print '<tr><td>';
 	print $langs->trans("EndAtLineNb");
 	print '</td><td>';
-    print '<input type="text" size="4" name="endatlinenb" disabled="disabled" value="'.$endatlinenb.'">';
+	print '<input type="text" size="4" name="endatlinenb" disabled="disabled" value="'.$endatlinenb.'">';
 	print '</td></tr>';
 
 	print '</table>';
@@ -1824,8 +1824,8 @@ if ($step == 6 && $datatoimport)
 	$result = $obj->import_open_file($pathfile, $langs);
 	if ($result > 0)
 	{
-        global $tablewithentity_cache;
-        $tablewithentity_cache = array();
+		global $tablewithentity_cache;
+		$tablewithentity_cache = array();
 		$sourcelinenb = 0; $endoffile = 0;
 
 		while ($sourcelinenb < $nboflines && !$endoffile)
@@ -1856,30 +1856,30 @@ if ($step == 6 && $datatoimport)
 
 	if (count($arrayoferrors) > 0) $db->rollback(); // We force rollback because this was errors.
 	else {
-	    $error = 0;
+		$error = 0;
 
 		// Run the sql after import if defined
-	    //var_dump($objimport->array_import_run_sql_after[0]);
-	    if (!empty($objimport->array_import_run_sql_after[0]) && is_array($objimport->array_import_run_sql_after[0]))
-	    {
-	        $i = 0;
-	        foreach ($objimport->array_import_run_sql_after[0] as $sqlafterimport)
-	        {
-	            $i++;
-	            $resqlafterimport = $db->query($sqlafterimport);
-	            if (!$resqlafterimport)
-	            {
-			        $arrayoferrors['none'][] = array('lib'=>$langs->trans("Error running final request: ".$sqlafterimport));
-	                $error++;
-	            }
-	        }
-	    }
+		//var_dump($objimport->array_import_run_sql_after[0]);
+		if (!empty($objimport->array_import_run_sql_after[0]) && is_array($objimport->array_import_run_sql_after[0]))
+		{
+			$i = 0;
+			foreach ($objimport->array_import_run_sql_after[0] as $sqlafterimport)
+			{
+				$i++;
+				$resqlafterimport = $db->query($sqlafterimport);
+				if (!$resqlafterimport)
+				{
+					$arrayoferrors['none'][] = array('lib'=>$langs->trans("Error running final request: ".$sqlafterimport));
+					$error++;
+				}
+			}
+		}
 
-	    if (!$error) $db->commit(); // We can commit if no errors.
-	    else $db->rollback();
+		if (!$error) $db->commit(); // We can commit if no errors.
+		else $db->rollback();
 	}
 
-    dol_fiche_end();
+	print dol_get_fiche_end();
 
 
 	// Show result
@@ -1918,17 +1918,17 @@ function show_elem($fieldssource, $pos, $key, $var, $nostyle = '')
 
 	$height = '24px';
 
-    if ($key == 'none') {
-        //stop multiple duplicate ids with no number
-        print "\n\n<!-- Box_no-key start-->\n";
-        print '<div class="box boximport" style="padding:0;">'."\n";
-        print '<table summary="boxtable_no-key" width="100%" class="nobordernopadding">'."\n";
-    } else {
-        print "\n\n<!-- Box ".$pos." start -->\n";
-        print '<div class="box boximport" style="padding: 0;" id="boxto_'.$pos.'">'."\n";
+	if ($key == 'none') {
+		//stop multiple duplicate ids with no number
+		print "\n\n<!-- Box_no-key start-->\n";
+		print '<div class="box boximport" style="padding:0;">'."\n";
+		print '<table summary="boxtable_no-key" width="100%" class="nobordernopadding">'."\n";
+	} else {
+		print "\n\n<!-- Box ".$pos." start -->\n";
+		print '<div class="box boximport" style="padding: 0;" id="boxto_'.$pos.'">'."\n";
 
-        print '<table summary="boxtable'.$pos.'" width="100%" class="nobordernopadding">'."\n";
-    }
+		print '<table summary="boxtable'.$pos.'" width="100%" class="nobordernopadding">'."\n";
+	}
 
 	if ($pos && $pos > count($fieldssource))	// No fields
 	{
@@ -1962,8 +1962,8 @@ function show_elem($fieldssource, $pos, $key, $var, $nostyle = '')
 		$example = $fieldssource[$pos]['example1'];
 		if ($example)
 		{
-		    if (!utf8_check($example)) $example = utf8_encode($example);
-		    print ' (<i>'.$example.'</i>)';
+			if (!utf8_check($example)) $example = utf8_encode($example);
+			print ' (<i>'.$example.'</i>)';
 		}
 		print '</td>';
 		print '</tr>';
diff --git a/htdocs/imports/index.php b/htdocs/imports/index.php
index bc68b53cfd0..4c556325b05 100644
--- a/htdocs/imports/index.php
+++ b/htdocs/imports/index.php
@@ -51,7 +51,7 @@ print '<br>';
 print '<div class="center">';
 if (count($import->array_import_code))
 {
-    print dolGetButtonTitle($langs->trans('NewImport'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/imports/import.php?leftmenu=import');
+	print dolGetButtonTitle($langs->trans('NewImport'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/imports/import.php?leftmenu=import');
 }
 print '</div>';
 print '<br>';
diff --git a/htdocs/includes/odtphp/zip/pclzip/LICENSE b/htdocs/includes/odtphp/zip/pclzip/LICENSE
new file mode 100644
index 00000000000..dbbe3558157
--- /dev/null
+++ b/htdocs/includes/odtphp/zip/pclzip/LICENSE
@@ -0,0 +1,661 @@
+                    GNU AFFERO GENERAL PUBLIC LICENSE
+                       Version 3, 19 November 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+our General Public Licenses are intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
+
+  A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate.  Many developers of free software are heartened and
+encouraged by the resulting cooperation.  However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
+
+  The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community.  It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server.  Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
+
+  An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals.  This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU Affero General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Remote Network Interaction; Use with the GNU General Public License.
+
+  Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software.  This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the work with which it is combined will remain governed by version
+3 of the GNU General Public License.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU Affero General Public License from time to time.  Such new versions
+will be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU Affero General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU Affero General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU Affero General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source.  For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code.  There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU AGPL, see
+<http://www.gnu.org/licenses/>.
diff --git a/htdocs/includes/odtphp/zip/pclzip/composer.json b/htdocs/includes/odtphp/zip/pclzip/composer.json
new file mode 100644
index 00000000000..fd36bfbfed3
--- /dev/null
+++ b/htdocs/includes/odtphp/zip/pclzip/composer.json
@@ -0,0 +1,20 @@
+{
+    "name": "chamilo/pclzip",
+    "type": "library",
+    "description": "A PHP library that offers compression and extraction functions for Zip formatted archives",
+    "keywords": ["php", "zip"],
+    "homepage": "https://github.com/chamilo/pclzip",
+    "license": ["LGPL-2.1"],
+    "authors": [
+        {
+            "name": "Vincent Blavet"
+        }
+    ],
+    "replace": {
+        "pclzip/pclzip": "^2.8"
+    },
+    "autoload": {
+        "classmap": ["pclzip.lib.php"]
+    }
+}
+
diff --git a/htdocs/includes/odtphp/zip/pclzip/gnu-lgpl.txt b/htdocs/includes/odtphp/zip/pclzip/gnu-lgpl.txt
index 82fc70b870e..583509c7efb 100644
--- a/htdocs/includes/odtphp/zip/pclzip/gnu-lgpl.txt
+++ b/htdocs/includes/odtphp/zip/pclzip/gnu-lgpl.txt
@@ -1,8 +1,8 @@
-		  GNU LESSER GENERAL PUBLIC LICENSE
-		       Version 2.1, February 1999
+          GNU LESSER GENERAL PUBLIC LICENSE
+               Version 2.1, February 1999
 
  Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -10,7 +10,7 @@
  as the successor of the GNU Library Public License, version 2, hence
  the version number 2.1.]
 
-			    Preamble
+                Preamble
 
   The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
@@ -55,7 +55,7 @@ modified by someone else and passed on, the recipients should know
 that what they have is not the original version, so that the original
 author's reputation will not be affected by problems that might be
 introduced by others.
-
+
   Finally, software patents pose a constant threat to the existence of
 any free program.  We wish to make sure that a company cannot
 effectively restrict the users of a free program by obtaining a
@@ -111,8 +111,8 @@ modification follow.  Pay close attention to the difference between a
 "work based on the library" and a "work that uses the library".  The
 former contains code derived from the library, whereas the latter must
 be combined with the library in order to run.
-
-		  GNU LESSER GENERAL PUBLIC LICENSE
+
+          GNU LESSER GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
   0. This License Agreement applies to any software library or other
@@ -146,7 +146,7 @@ such a program is covered only if its contents constitute a work based
 on the Library (independent of the use of the Library in a tool for
 writing it).  Whether that is true depends on what the Library does
 and what the program that uses the Library does.
-  
+
   1. You may copy and distribute verbatim copies of the Library's
 complete source code as you receive it, in any medium, provided that
 you conspicuously and appropriately publish on each copy an
@@ -158,7 +158,7 @@ Library.
   You may charge a fee for the physical act of transferring a copy,
 and you may at your option offer warranty protection in exchange for a
 fee.
-
+
   2. You may modify your copy or copies of the Library or any portion
 of it, thus forming a work based on the Library, and copy and
 distribute such modifications or work under the terms of Section 1
@@ -216,7 +216,7 @@ instead of to this License.  (If a newer version than version 2 of the
 ordinary GNU General Public License has appeared, then you can specify
 that version instead if you wish.)  Do not make any other change in
 these notices.
-
+
   Once this change is made in a given copy, it is irreversible for
 that copy, so the ordinary GNU General Public License applies to all
 subsequent copies and derivative works made from that copy.
@@ -267,7 +267,7 @@ Library will still fall under Section 6.)
 distribute the object code for the work under the terms of Section 6.
 Any executables containing that work also fall under Section 6,
 whether or not they are linked directly with the Library itself.
-
+
   6. As an exception to the Sections above, you may also combine or
 link a "work that uses the Library" with the Library to produce a
 work containing portions of the Library, and distribute that work
@@ -329,7 +329,7 @@ restrictions of other proprietary libraries that do not normally
 accompany the operating system.  Such a contradiction means you cannot
 use both them and the Library together in an executable that you
 distribute.
-
+
   7. You may place library facilities that are a work based on the
 Library side-by-side in a single library together with other library
 facilities not covered by this License, and distribute such a combined
@@ -370,7 +370,7 @@ subject to these terms and conditions.  You may not impose any further
 restrictions on the recipients' exercise of the rights granted herein.
 You are not responsible for enforcing compliance by third parties with
 this License.
-
+
   11. If, as a consequence of a court judgment or allegation of patent
 infringement or for any other reason (not limited to patent issues),
 conditions are imposed on you (whether by court order, agreement or
@@ -422,7 +422,7 @@ conditions either of that version or of any later version published by
 the Free Software Foundation.  If the Library does not specify a
 license version number, you may choose any version ever published by
 the Free Software Foundation.
-
+
   14. If you wish to incorporate parts of the Library into other free
 programs whose distribution conditions are incompatible with these,
 write to the author to ask for permission.  For software which is
@@ -432,7 +432,7 @@ decision will be guided by the two goals of preserving the free status
 of all derivatives of our free software and of promoting the sharing
 and reuse of software generally.
 
-			    NO WARRANTY
+                NO WARRANTY
 
   15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
 WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
@@ -455,8 +455,8 @@ FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
 SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
 DAMAGES.
 
-		     END OF TERMS AND CONDITIONS
-
+             END OF TERMS AND CONDITIONS
+
            How to Apply These Terms to Your New Libraries
 
   If you develop a new library, and you want it to be of the greatest
@@ -484,7 +484,8 @@ convey the exclusion of warranty; and each file should have at least the
     Lesser General Public License for more details.
 
     You should have received a copy of the GNU Lesser General Public
-    License along with this library; If not, see <https://www.gnu.org/licenses/>.
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 Also add information on how to contact you by electronic and paper mail.
 
diff --git a/htdocs/includes/odtphp/zip/pclzip/pclzip.lib.php b/htdocs/includes/odtphp/zip/pclzip/pclzip.lib.php
index 8cc5ca828bf..2a1a2b8d798 100644
--- a/htdocs/includes/odtphp/zip/pclzip/pclzip.lib.php
+++ b/htdocs/includes/odtphp/zip/pclzip/pclzip.lib.php
@@ -1,9 +1,10 @@
 <?php
 // --------------------------------------------------------------------------------
-// PhpConcept Library - Zip Module 2.8.2
+// PhpConcept Library - Zip Module 2.8.4
 // --------------------------------------------------------------------------------
 // License GNU/LGPL - Vincent Blavet - August 2009
-// http://www.phpconcept.net
+// Originaly http://www.phpconcept.net
+// Now       https://github.com/chamilo/pclzip
 // --------------------------------------------------------------------------------
 //
 // Presentation :
@@ -24,4926 +25,2241 @@
 // --------------------------------------------------------------------------------
 // --------------------------------------------------------------------------------
 
-  // ----- Constants
-  if (!defined('PCLZIP_READ_BLOCK_SIZE')) {
-    define( 'PCLZIP_READ_BLOCK_SIZE', 2048 );
-  }
-  
-  // ----- File list separator
-  // In version 1.x of PclZip, the separator for file list is a space
-  // (which is not a very smart choice, specifically for windows paths !).
-  // A better separator should be a comma (,). This constant gives you the
-  // abilty to change that.
-  // However notice that changing this value, may have impact on existing
-  // scripts, using space separated filenames.
-  // Recommanded values for compatibility with older versions :
-  //define( 'PCLZIP_SEPARATOR', ' ' );
-  // Recommanded values for smart separation of filenames.
-  if (!defined('PCLZIP_SEPARATOR')) {
-    define( 'PCLZIP_SEPARATOR', ',' );
-  }
+// ----- Constants
+if (!defined('PCLZIP_READ_BLOCK_SIZE')) {
+    define('PCLZIP_READ_BLOCK_SIZE', 2048);
+}
 
-  // ----- Error configuration
-  // 0 : PclZip Class integrated error handling
-  // 1 : PclError external library error handling. By enabling this
-  //     you must ensure that you have included PclError library.
-  // [2,...] : reserved for futur use
-  if (!defined('PCLZIP_ERROR_EXTERNAL')) {
-    define( 'PCLZIP_ERROR_EXTERNAL', 0 );
-  }
+// ----- File list separator
+// In version 1.x of PclZip, the separator for file list is a space
+// (which is not a very smart choice, specifically for windows paths !).
+// A better separator should be a comma (,). This constant gives you the
+// abilty to change that.
+// However notice that changing this value, may have impact on existing
+// scripts, using space separated filenames.
+// Recommanded values for compatibility with older versions :
+//define( 'PCLZIP_SEPARATOR', ' ' );
+// Recommanded values for smart separation of filenames.
+if (!defined('PCLZIP_SEPARATOR')) {
+    define('PCLZIP_SEPARATOR', ',');
+}
 
-  // ----- Optional static temporary directory
-  //       By default temporary files are generated in the script current
-  //       path.
-  //       If defined :
-  //       - MUST BE terminated by a '/'.
-  //       - MUST be a valid, already created directory
-  //       Samples :
-  // define( 'PCLZIP_TEMPORARY_DIR', '/temp/' );
-  // define( 'PCLZIP_TEMPORARY_DIR', 'C:/Temp/' );
-  if (!defined('PCLZIP_TEMPORARY_DIR')) {
-    define( 'PCLZIP_TEMPORARY_DIR', '' );
-  }
+// ----- Error configuration
+// 0 : PclZip Class integrated error handling
+// 1 : PclError external library error handling. By enabling this
+//     you must ensure that you have included PclError library.
+// [2,...] : reserved for futur use
+if (!defined('PCLZIP_ERROR_EXTERNAL')) {
+    define('PCLZIP_ERROR_EXTERNAL', 0);
+}
 
-  // ----- Optional threshold ratio for use of temporary files
-  //       Pclzip sense the size of the file to add/extract and decide to
-  //       use or not temporary file. The algorythm is looking for 
-  //       memory_limit of PHP and apply a ratio.
-  //       threshold = memory_limit * ratio.
-  //       Recommended values are under 0.5. Default 0.47.
-  //       Samples :
-  // define( 'PCLZIP_TEMPORARY_FILE_RATIO', 0.5 );
-  if (!defined('PCLZIP_TEMPORARY_FILE_RATIO')) {
-    define( 'PCLZIP_TEMPORARY_FILE_RATIO', 0.47 );
-  }
+// ----- Optional static temporary directory
+//       By default temporary files are generated in the script current
+//       path.
+//       If defined :
+//       - MUST BE terminated by a '/'.
+//       - MUST be a valid, already created directory
+//       Samples :
+// define( 'PCLZIP_TEMPORARY_DIR', '/temp/' );
+// define( 'PCLZIP_TEMPORARY_DIR', 'C:/Temp/' );
+if (!defined('PCLZIP_TEMPORARY_DIR')) {
+    define('PCLZIP_TEMPORARY_DIR', '');
+}
+
+// ----- Optional threshold ratio for use of temporary files
+//       Pclzip sense the size of the file to add/extract and decide to
+//       use or not temporary file. The algorythm is looking for
+//       memory_limit of PHP and apply a ratio.
+//       threshold = memory_limit * ratio.
+//       Recommended values are under 0.5. Default 0.47.
+//       Samples :
+// define( 'PCLZIP_TEMPORARY_FILE_RATIO', 0.5 );
+if (!defined('PCLZIP_TEMPORARY_FILE_RATIO')) {
+    define('PCLZIP_TEMPORARY_FILE_RATIO', 0.47);
+}
 
 // --------------------------------------------------------------------------------
 // ***** UNDER THIS LINE NOTHING NEEDS TO BE MODIFIED *****
 // --------------------------------------------------------------------------------
 
-  // ----- Global variables
-  $g_pclzip_version = "2.8.2";
+// ----- Global variables
+$g_pclzip_version = "2.8.2";
 
-  // ----- Error codes
-  //   -1 : Unable to open file in binary write mode
-  //   -2 : Unable to open file in binary read mode
-  //   -3 : Invalid parameters
-  //   -4 : File does not exist
-  //   -5 : Filename is too long (max. 255)
-  //   -6 : Not a valid zip file
-  //   -7 : Invalid extracted file size
-  //   -8 : Unable to create directory
-  //   -9 : Invalid archive extension
-  //  -10 : Invalid archive format
-  //  -11 : Unable to delete file (unlink)
-  //  -12 : Unable to rename file (rename)
-  //  -13 : Invalid header checksum
-  //  -14 : Invalid archive size
-  define( 'PCLZIP_ERR_USER_ABORTED', 2 );
-  define( 'PCLZIP_ERR_NO_ERROR', 0 );
-  define( 'PCLZIP_ERR_WRITE_OPEN_FAIL', -1 );
-  define( 'PCLZIP_ERR_READ_OPEN_FAIL', -2 );
-  define( 'PCLZIP_ERR_INVALID_PARAMETER', -3 );
-  define( 'PCLZIP_ERR_MISSING_FILE', -4 );
-  define( 'PCLZIP_ERR_FILENAME_TOO_LONG', -5 );
-  define( 'PCLZIP_ERR_INVALID_ZIP', -6 );
-  define( 'PCLZIP_ERR_BAD_EXTRACTED_FILE', -7 );
-  define( 'PCLZIP_ERR_DIR_CREATE_FAIL', -8 );
-  define( 'PCLZIP_ERR_BAD_EXTENSION', -9 );
-  define( 'PCLZIP_ERR_BAD_FORMAT', -10 );
-  define( 'PCLZIP_ERR_DELETE_FILE_FAIL', -11 );
-  define( 'PCLZIP_ERR_RENAME_FILE_FAIL', -12 );
-  define( 'PCLZIP_ERR_BAD_CHECKSUM', -13 );
-  define( 'PCLZIP_ERR_INVALID_ARCHIVE_ZIP', -14 );
-  define( 'PCLZIP_ERR_MISSING_OPTION_VALUE', -15 );
-  define( 'PCLZIP_ERR_INVALID_OPTION_VALUE', -16 );
-  define( 'PCLZIP_ERR_ALREADY_A_DIRECTORY', -17 );
-  define( 'PCLZIP_ERR_UNSUPPORTED_COMPRESSION', -18 );
-  define( 'PCLZIP_ERR_UNSUPPORTED_ENCRYPTION', -19 );
-  define( 'PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE', -20 );
-  define( 'PCLZIP_ERR_DIRECTORY_RESTRICTION', -21 );
+// ----- Error codes
+//   -1 : Unable to open file in binary write mode
+//   -2 : Unable to open file in binary read mode
+//   -3 : Invalid parameters
+//   -4 : File does not exist
+//   -5 : Filename is too long (max. 255)
+//   -6 : Not a valid zip file
+//   -7 : Invalid extracted file size
+//   -8 : Unable to create directory
+//   -9 : Invalid archive extension
+//  -10 : Invalid archive format
+//  -11 : Unable to delete file (unlink)
+//  -12 : Unable to rename file (rename)
+//  -13 : Invalid header checksum
+//  -14 : Invalid archive size
+define('PCLZIP_ERR_USER_ABORTED', 2);
+define('PCLZIP_ERR_NO_ERROR', 0);
+define('PCLZIP_ERR_WRITE_OPEN_FAIL', -1);
+define('PCLZIP_ERR_READ_OPEN_FAIL', -2);
+define('PCLZIP_ERR_INVALID_PARAMETER', -3);
+define('PCLZIP_ERR_MISSING_FILE', -4);
+define('PCLZIP_ERR_FILENAME_TOO_LONG', -5);
+define('PCLZIP_ERR_INVALID_ZIP', -6);
+define('PCLZIP_ERR_BAD_EXTRACTED_FILE', -7);
+define('PCLZIP_ERR_DIR_CREATE_FAIL', -8);
+define('PCLZIP_ERR_BAD_EXTENSION', -9);
+define('PCLZIP_ERR_BAD_FORMAT', -10);
+define('PCLZIP_ERR_DELETE_FILE_FAIL', -11);
+define('PCLZIP_ERR_RENAME_FILE_FAIL', -12);
+define('PCLZIP_ERR_BAD_CHECKSUM', -13);
+define('PCLZIP_ERR_INVALID_ARCHIVE_ZIP', -14);
+define('PCLZIP_ERR_MISSING_OPTION_VALUE', -15);
+define('PCLZIP_ERR_INVALID_OPTION_VALUE', -16);
+define('PCLZIP_ERR_ALREADY_A_DIRECTORY', -17);
+define('PCLZIP_ERR_UNSUPPORTED_COMPRESSION', -18);
+define('PCLZIP_ERR_UNSUPPORTED_ENCRYPTION', -19);
+define('PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE', -20);
+define('PCLZIP_ERR_DIRECTORY_RESTRICTION', -21);
 
-  // ----- Options values
-  define( 'PCLZIP_OPT_PATH', 77001 );
-  define( 'PCLZIP_OPT_ADD_PATH', 77002 );
-  define( 'PCLZIP_OPT_REMOVE_PATH', 77003 );
-  define( 'PCLZIP_OPT_REMOVE_ALL_PATH', 77004 );
-  define( 'PCLZIP_OPT_SET_CHMOD', 77005 );
-  define( 'PCLZIP_OPT_EXTRACT_AS_STRING', 77006 );
-  define( 'PCLZIP_OPT_NO_COMPRESSION', 77007 );
-  define( 'PCLZIP_OPT_BY_NAME', 77008 );
-  define( 'PCLZIP_OPT_BY_INDEX', 77009 );
-  define( 'PCLZIP_OPT_BY_EREG', 77010 );
-  define( 'PCLZIP_OPT_BY_PREG', 77011 );
-  define( 'PCLZIP_OPT_COMMENT', 77012 );
-  define( 'PCLZIP_OPT_ADD_COMMENT', 77013 );
-  define( 'PCLZIP_OPT_PREPEND_COMMENT', 77014 );
-  define( 'PCLZIP_OPT_EXTRACT_IN_OUTPUT', 77015 );
-  define( 'PCLZIP_OPT_REPLACE_NEWER', 77016 );
-  define( 'PCLZIP_OPT_STOP_ON_ERROR', 77017 );
-  // Having big trouble with crypt. Need to multiply 2 long int
-  // which is not correctly supported by PHP ...
-  //define( 'PCLZIP_OPT_CRYPT', 77018 );
-  define( 'PCLZIP_OPT_EXTRACT_DIR_RESTRICTION', 77019 );
-  define( 'PCLZIP_OPT_TEMP_FILE_THRESHOLD', 77020 );
-  define( 'PCLZIP_OPT_ADD_TEMP_FILE_THRESHOLD', 77020 ); // alias
-  define( 'PCLZIP_OPT_TEMP_FILE_ON', 77021 );
-  define( 'PCLZIP_OPT_ADD_TEMP_FILE_ON', 77021 ); // alias
-  define( 'PCLZIP_OPT_TEMP_FILE_OFF', 77022 );
-  define( 'PCLZIP_OPT_ADD_TEMP_FILE_OFF', 77022 ); // alias
-  
-  // ----- File description attributes
-  define( 'PCLZIP_ATT_FILE_NAME', 79001 );
-  define( 'PCLZIP_ATT_FILE_NEW_SHORT_NAME', 79002 );
-  define( 'PCLZIP_ATT_FILE_NEW_FULL_NAME', 79003 );
-  define( 'PCLZIP_ATT_FILE_MTIME', 79004 );
-  define( 'PCLZIP_ATT_FILE_CONTENT', 79005 );
-  define( 'PCLZIP_ATT_FILE_COMMENT', 79006 );
+// ----- Options values
+define('PCLZIP_OPT_PATH', 77001);
+define('PCLZIP_OPT_ADD_PATH', 77002);
+define('PCLZIP_OPT_REMOVE_PATH', 77003);
+define('PCLZIP_OPT_REMOVE_ALL_PATH', 77004);
+define('PCLZIP_OPT_SET_CHMOD', 77005);
+define('PCLZIP_OPT_EXTRACT_AS_STRING', 77006);
+define('PCLZIP_OPT_NO_COMPRESSION', 77007);
+define('PCLZIP_OPT_BY_NAME', 77008);
+define('PCLZIP_OPT_BY_INDEX', 77009);
+define('PCLZIP_OPT_BY_EREG', 77010);
+define('PCLZIP_OPT_BY_PREG', 77011);
+define('PCLZIP_OPT_COMMENT', 77012);
+define('PCLZIP_OPT_ADD_COMMENT', 77013);
+define('PCLZIP_OPT_PREPEND_COMMENT', 77014);
+define('PCLZIP_OPT_EXTRACT_IN_OUTPUT', 77015);
+define('PCLZIP_OPT_REPLACE_NEWER', 77016);
+define('PCLZIP_OPT_STOP_ON_ERROR', 77017);
+// Having big trouble with crypt. Need to multiply 2 long int
+// which is not correctly supported by PHP ...
+//define( 'PCLZIP_OPT_CRYPT', 77018 );
+define('PCLZIP_OPT_EXTRACT_DIR_RESTRICTION', 77019);
+define('PCLZIP_OPT_TEMP_FILE_THRESHOLD', 77020);
+define('PCLZIP_OPT_ADD_TEMP_FILE_THRESHOLD', 77020); // alias
+define('PCLZIP_OPT_TEMP_FILE_ON', 77021);
+define('PCLZIP_OPT_ADD_TEMP_FILE_ON', 77021); // alias
+define('PCLZIP_OPT_TEMP_FILE_OFF', 77022);
+define('PCLZIP_OPT_ADD_TEMP_FILE_OFF', 77022); // alias
 
-  // ----- Call backs values
-  define( 'PCLZIP_CB_PRE_EXTRACT', 78001 );
-  define( 'PCLZIP_CB_POST_EXTRACT', 78002 );
-  define( 'PCLZIP_CB_PRE_ADD', 78003 );
-  define( 'PCLZIP_CB_POST_ADD', 78004 );
-  /* For futur use
-  define( 'PCLZIP_CB_PRE_LIST', 78005 );
-  define( 'PCLZIP_CB_POST_LIST', 78006 );
-  define( 'PCLZIP_CB_PRE_DELETE', 78007 );
-  define( 'PCLZIP_CB_POST_DELETE', 78008 );
-  */
+// ----- File description attributes
+define('PCLZIP_ATT_FILE_NAME', 79001);
+define('PCLZIP_ATT_FILE_NEW_SHORT_NAME', 79002);
+define('PCLZIP_ATT_FILE_NEW_FULL_NAME', 79003);
+define('PCLZIP_ATT_FILE_MTIME', 79004);
+define('PCLZIP_ATT_FILE_CONTENT', 79005);
+define('PCLZIP_ATT_FILE_COMMENT', 79006);
 
-  // --------------------------------------------------------------------------------
-  // Class : PclZip
-  // Description :
-  //   PclZip is the class that represent a Zip archive.
-  //   The public methods allow the manipulation of the archive.
-  // Attributes :
-  //   Attributes must not be accessed directly.
-  // Methods :
-  //   PclZip() : Object creator
-  //   create() : Creates the Zip archive
-  //   listContent() : List the content of the Zip archive
-  //   extract() : Extract the content of the archive
-  //   properties() : List the properties of the archive
-  // --------------------------------------------------------------------------------
-  class PclZip
-  {
+// ----- Call backs values
+define('PCLZIP_CB_PRE_EXTRACT', 78001);
+define('PCLZIP_CB_POST_EXTRACT', 78002);
+define('PCLZIP_CB_PRE_ADD', 78003);
+define('PCLZIP_CB_POST_ADD', 78004);
+/* For futur use
+define( 'PCLZIP_CB_PRE_LIST', 78005 );
+define( 'PCLZIP_CB_POST_LIST', 78006 );
+define( 'PCLZIP_CB_PRE_DELETE', 78007 );
+define( 'PCLZIP_CB_POST_DELETE', 78008 );
+*/
+
+// --------------------------------------------------------------------------------
+// Class : PclZip
+// Description :
+//   PclZip is the class that represent a Zip archive.
+//   The public methods allow the manipulation of the archive.
+// Attributes :
+//   Attributes must not be accessed directly.
+// Methods :
+//   PclZip() : Object creator
+//   create() : Creates the Zip archive
+//   listContent() : List the content of the Zip archive
+//   extract() : Extract the content of the archive
+//   properties() : List the properties of the archive
+// --------------------------------------------------------------------------------
+class PclZip
+{
     // ----- Filename of the zip file
-    var $zipname = '';
+    public $zipname = '';
 
     // ----- File descriptor of the zip file
-    var $zip_fd = 0;
+    public $zip_fd = 0;
 
     // ----- Internal error handling
-    var $error_code = 1;
-    var $error_string = '';
-    
+    public $error_code = 1;
+    public $error_string = '';
+
     // ----- Current status of the magic_quotes_runtime
     // This value store the php configuration for magic_quotes
     // The class can then disable the magic_quotes and reset it after
-    var $magic_quotes_status;
+    public $magic_quotes_status;
 
-  // --------------------------------------------------------------------------------
-  // Function : PclZip()
-  // Description :
-  //   Creates a PclZip object and set the name of the associated Zip archive
-  //   filename.
-  //   Note that no real action is taken, if the archive does not exist it is not
-  //   created. Use create() for that.
-  // --------------------------------------------------------------------------------
-  function PclZip($p_zipname)
-  {
-
-    // ----- Tests the zlib
-    if (!function_exists('gzopen'))
+    // --------------------------------------------------------------------------------
+    // Function : PclZip()
+    // Description :
+    //   Creates a PclZip object and set the name of the associated Zip archive
+    //   filename.
+    //   Note that no real action is taken, if the archive does not exist it is not
+    //   created. Use create() for that.
+    // --------------------------------------------------------------------------------
+    public function __construct($p_zipname)
     {
-      die('Abort '.basename(__FILE__).' : Missing zlib extensions');
-    }
 
-    // ----- Set the attributes
-    $this->zipname = $p_zipname;
-    $this->zip_fd = 0;
-    $this->magic_quotes_status = -1;
-
-    // ----- Return
-    return;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function :
-  //   create($p_filelist, $p_add_dir="", $p_remove_dir="")
-  //   create($p_filelist, $p_option, $p_option_value, ...)
-  // Description :
-  //   This method supports two different synopsis. The first one is historical.
-  //   This method creates a Zip Archive. The Zip file is created in the
-  //   filesystem. The files and directories indicated in $p_filelist
-  //   are added in the archive. See the parameters description for the
-  //   supported format of $p_filelist.
-  //   When a directory is in the list, the directory and its content is added
-  //   in the archive.
-  //   In this synopsis, the function takes an optional variable list of
-  //   options. See bellow the supported options.
-  // Parameters :
-  //   $p_filelist : An array containing file or directory names, or
-  //                 a string containing one filename or one directory name, or
-  //                 a string containing a list of filenames and/or directory
-  //                 names separated by spaces.
-  //   $p_add_dir : A path to add before the real path of the archived file,
-  //                in order to have it memorized in the archive.
-  //   $p_remove_dir : A path to remove from the real path of the file to archive,
-  //                   in order to have a shorter path memorized in the archive.
-  //                   When $p_add_dir and $p_remove_dir are set, $p_remove_dir
-  //                   is removed first, before $p_add_dir is added.
-  // Options :
-  //   PCLZIP_OPT_ADD_PATH :
-  //   PCLZIP_OPT_REMOVE_PATH :
-  //   PCLZIP_OPT_REMOVE_ALL_PATH :
-  //   PCLZIP_OPT_COMMENT :
-  //   PCLZIP_CB_PRE_ADD :
-  //   PCLZIP_CB_POST_ADD :
-  // Return Values :
-  //   0 on failure,
-  //   The list of the added files, with a status of the add action.
-  //   (see PclZip::listContent() for list entry format)
-  // --------------------------------------------------------------------------------
-  function create($p_filelist)
-  {
-    $v_result=1;
-
-    // ----- Reset the error handler
-    $this->privErrorReset();
-
-    // ----- Set default values
-    $v_options = array();
-    $v_options[PCLZIP_OPT_NO_COMPRESSION] = FALSE;
-
-    // ----- Look for variable options arguments
-    $v_size = func_num_args();
-
-    // ----- Look for arguments
-    if ($v_size > 1) {
-      // ----- Get the arguments
-      $v_arg_list = func_get_args();
-
-      // ----- Remove from the options list the first argument
-      array_shift($v_arg_list);
-      $v_size--;
-
-      // ----- Look for first arg
-      if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
-
-        // ----- Parse the options
-        $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
-                                            array (PCLZIP_OPT_REMOVE_PATH => 'optional',
-                                                   PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
-                                                   PCLZIP_OPT_ADD_PATH => 'optional',
-                                                   PCLZIP_CB_PRE_ADD => 'optional',
-                                                   PCLZIP_CB_POST_ADD => 'optional',
-                                                   PCLZIP_OPT_NO_COMPRESSION => 'optional',
-                                                   PCLZIP_OPT_COMMENT => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_THRESHOLD => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_ON => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_OFF => 'optional'
-                                                   //, PCLZIP_OPT_CRYPT => 'optional'
-                                             ));
-        if ($v_result != 1) {
-          return 0;
-        }
-      }
-
-      // ----- Look for 2 args
-      // Here we need to support the first historic synopsis of the
-      // method.
-      else {
-
-        // ----- Get the first argument
-        $v_options[PCLZIP_OPT_ADD_PATH] = $v_arg_list[0];
-
-        // ----- Look for the optional second argument
-        if ($v_size == 2) {
-          $v_options[PCLZIP_OPT_REMOVE_PATH] = $v_arg_list[1];
-        }
-        else if ($v_size > 2) {
-          PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER,
-		                       "Invalid number / type of arguments");
-          return 0;
-        }
-      }
-    }
-    
-    // ----- Look for default option values
-    $this->privOptionDefaultThreshold($v_options);
-
-    // ----- Init
-    $v_string_list = array();
-    $v_att_list = array();
-    $v_filedescr_list = array();
-    $p_result_list = array();
-    
-    // ----- Look if the $p_filelist is really an array
-    if (is_array($p_filelist)) {
-    
-      // ----- Look if the first element is also an array
-      //       This will mean that this is a file description entry
-      if (isset($p_filelist[0]) && is_array($p_filelist[0])) {
-        $v_att_list = $p_filelist;
-      }
-      
-      // ----- The list is a list of string names
-      else {
-        $v_string_list = $p_filelist;
-      }
-    }
-
-    // ----- Look if the $p_filelist is a string
-    else if (is_string($p_filelist)) {
-      // ----- Create a list from the string
-      $v_string_list = explode(PCLZIP_SEPARATOR, $p_filelist);
-    }
-
-    // ----- Invalid variable type for $p_filelist
-    else {
-      PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type p_filelist");
-      return 0;
-    }
-    
-    // ----- Reformat the string list
-    if (sizeof($v_string_list) != 0) {
-      foreach ($v_string_list as $v_string) {
-        if ($v_string != '') {
-          $v_att_list[][PCLZIP_ATT_FILE_NAME] = $v_string;
-        }
-        else {
-        }
-      }
-    }
-    
-    // ----- For each file in the list check the attributes
-    $v_supported_attributes
-    = array ( PCLZIP_ATT_FILE_NAME => 'mandatory'
-             ,PCLZIP_ATT_FILE_NEW_SHORT_NAME => 'optional'
-             ,PCLZIP_ATT_FILE_NEW_FULL_NAME => 'optional'
-             ,PCLZIP_ATT_FILE_MTIME => 'optional'
-             ,PCLZIP_ATT_FILE_CONTENT => 'optional'
-             ,PCLZIP_ATT_FILE_COMMENT => 'optional'
-						);
-    foreach ($v_att_list as $v_entry) {
-      $v_result = $this->privFileDescrParseAtt($v_entry,
-                                               $v_filedescr_list[],
-                                               $v_options,
-                                               $v_supported_attributes);
-      if ($v_result != 1) {
-        return 0;
-      }
-    }
-
-    // ----- Expand the filelist (expand directories)
-    $v_result = $this->privFileDescrExpand($v_filedescr_list, $v_options);
-    if ($v_result != 1) {
-      return 0;
-    }
-
-    // ----- Call the create fct
-    $v_result = $this->privCreate($v_filedescr_list, $p_result_list, $v_options);
-    if ($v_result != 1) {
-      return 0;
-    }
-
-    // ----- Return
-    return $p_result_list;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function :
-  //   add($p_filelist, $p_add_dir="", $p_remove_dir="")
-  //   add($p_filelist, $p_option, $p_option_value, ...)
-  // Description :
-  //   This method supports two synopsis. The first one is historical.
-  //   This methods add the list of files in an existing archive.
-  //   If a file with the same name already exists, it is added at the end of the
-  //   archive, the first one is still present.
-  //   If the archive does not exist, it is created.
-  // Parameters :
-  //   $p_filelist : An array containing file or directory names, or
-  //                 a string containing one filename or one directory name, or
-  //                 a string containing a list of filenames and/or directory
-  //                 names separated by spaces.
-  //   $p_add_dir : A path to add before the real path of the archived file,
-  //                in order to have it memorized in the archive.
-  //   $p_remove_dir : A path to remove from the real path of the file to archive,
-  //                   in order to have a shorter path memorized in the archive.
-  //                   When $p_add_dir and $p_remove_dir are set, $p_remove_dir
-  //                   is removed first, before $p_add_dir is added.
-  // Options :
-  //   PCLZIP_OPT_ADD_PATH :
-  //   PCLZIP_OPT_REMOVE_PATH :
-  //   PCLZIP_OPT_REMOVE_ALL_PATH :
-  //   PCLZIP_OPT_COMMENT :
-  //   PCLZIP_OPT_ADD_COMMENT :
-  //   PCLZIP_OPT_PREPEND_COMMENT :
-  //   PCLZIP_CB_PRE_ADD :
-  //   PCLZIP_CB_POST_ADD :
-  // Return Values :
-  //   0 on failure,
-  //   The list of the added files, with a status of the add action.
-  //   (see PclZip::listContent() for list entry format)
-  // --------------------------------------------------------------------------------
-  function add($p_filelist)
-  {
-    $v_result=1;
-
-    // ----- Reset the error handler
-    $this->privErrorReset();
-
-    // ----- Set default values
-    $v_options = array();
-    $v_options[PCLZIP_OPT_NO_COMPRESSION] = FALSE;
-
-    // ----- Look for variable options arguments
-    $v_size = func_num_args();
-
-    // ----- Look for arguments
-    if ($v_size > 1) {
-      // ----- Get the arguments
-      $v_arg_list = func_get_args();
-
-      // ----- Remove form the options list the first argument
-      array_shift($v_arg_list);
-      $v_size--;
-
-      // ----- Look for first arg
-      if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
-
-        // ----- Parse the options
-        $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
-                                            array (PCLZIP_OPT_REMOVE_PATH => 'optional',
-                                                   PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
-                                                   PCLZIP_OPT_ADD_PATH => 'optional',
-                                                   PCLZIP_CB_PRE_ADD => 'optional',
-                                                   PCLZIP_CB_POST_ADD => 'optional',
-                                                   PCLZIP_OPT_NO_COMPRESSION => 'optional',
-                                                   PCLZIP_OPT_COMMENT => 'optional',
-                                                   PCLZIP_OPT_ADD_COMMENT => 'optional',
-                                                   PCLZIP_OPT_PREPEND_COMMENT => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_THRESHOLD => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_ON => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_OFF => 'optional'
-                                                   //, PCLZIP_OPT_CRYPT => 'optional'
-												   ));
-        if ($v_result != 1) {
-          return 0;
-        }
-      }
-
-      // ----- Look for 2 args
-      // Here we need to support the first historic synopsis of the
-      // method.
-      else {
-
-        // ----- Get the first argument
-        $v_options[PCLZIP_OPT_ADD_PATH] = $v_add_path = $v_arg_list[0];
-
-        // ----- Look for the optional second argument
-        if ($v_size == 2) {
-          $v_options[PCLZIP_OPT_REMOVE_PATH] = $v_arg_list[1];
-        }
-        else if ($v_size > 2) {
-          // ----- Error log
-          PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / type of arguments");
-
-          // ----- Return
-          return 0;
-        }
-      }
-    }
-
-    // ----- Look for default option values
-    $this->privOptionDefaultThreshold($v_options);
-
-    // ----- Init
-    $v_string_list = array();
-    $v_att_list = array();
-    $v_filedescr_list = array();
-    $p_result_list = array();
-    
-    // ----- Look if the $p_filelist is really an array
-    if (is_array($p_filelist)) {
-    
-      // ----- Look if the first element is also an array
-      //       This will mean that this is a file description entry
-      if (isset($p_filelist[0]) && is_array($p_filelist[0])) {
-        $v_att_list = $p_filelist;
-      }
-      
-      // ----- The list is a list of string names
-      else {
-        $v_string_list = $p_filelist;
-      }
-    }
-
-    // ----- Look if the $p_filelist is a string
-    else if (is_string($p_filelist)) {
-      // ----- Create a list from the string
-      $v_string_list = explode(PCLZIP_SEPARATOR, $p_filelist);
-    }
-
-    // ----- Invalid variable type for $p_filelist
-    else {
-      PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type '".gettype($p_filelist)."' for p_filelist");
-      return 0;
-    }
-    
-    // ----- Reformat the string list
-    if (sizeof($v_string_list) != 0) {
-      foreach ($v_string_list as $v_string) {
-        $v_att_list[][PCLZIP_ATT_FILE_NAME] = $v_string;
-      }
-    }
-    
-    // ----- For each file in the list check the attributes
-    $v_supported_attributes
-    = array ( PCLZIP_ATT_FILE_NAME => 'mandatory'
-             ,PCLZIP_ATT_FILE_NEW_SHORT_NAME => 'optional'
-             ,PCLZIP_ATT_FILE_NEW_FULL_NAME => 'optional'
-             ,PCLZIP_ATT_FILE_MTIME => 'optional'
-             ,PCLZIP_ATT_FILE_CONTENT => 'optional'
-             ,PCLZIP_ATT_FILE_COMMENT => 'optional'
-						);
-    foreach ($v_att_list as $v_entry) {
-      $v_result = $this->privFileDescrParseAtt($v_entry,
-                                               $v_filedescr_list[],
-                                               $v_options,
-                                               $v_supported_attributes);
-      if ($v_result != 1) {
-        return 0;
-      }
-    }
-
-    // ----- Expand the filelist (expand directories)
-    $v_result = $this->privFileDescrExpand($v_filedescr_list, $v_options);
-    if ($v_result != 1) {
-      return 0;
-    }
-
-    // ----- Call the create fct
-    $v_result = $this->privAdd($v_filedescr_list, $p_result_list, $v_options);
-    if ($v_result != 1) {
-      return 0;
-    }
-
-    // ----- Return
-    return $p_result_list;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : listContent()
-  // Description :
-  //   This public method, gives the list of the files and directories, with their
-  //   properties.
-  //   The properties of each entries in the list are (used also in other functions) :
-  //     filename : Name of the file. For a create or add action it is the filename
-  //                given by the user. For an extract function it is the filename
-  //                of the extracted file.
-  //     stored_filename : Name of the file / directory stored in the archive.
-  //     size : Size of the stored file.
-  //     compressed_size : Size of the file's data compressed in the archive
-  //                       (without the headers overhead)
-  //     mtime : Last known modification date of the file (UNIX timestamp)
-  //     comment : Comment associated with the file
-  //     folder : true | false
-  //     index : index of the file in the archive
-  //     status : status of the action (depending of the action) :
-  //              Values are :
-  //                ok : OK !
-  //                filtered : the file / dir is not extracted (filtered by user)
-  //                already_a_directory : the file can not be extracted because a
-  //                                      directory with the same name already exists
-  //                write_protected : the file can not be extracted because a file
-  //                                  with the same name already exists and is
-  //                                  write protected
-  //                newer_exist : the file was not extracted because a newer file exists
-  //                path_creation_fail : the file is not extracted because the folder
-  //                                     does not exist and can not be created
-  //                write_error : the file was not extracted because there was a
-  //                              error while writing the file
-  //                read_error : the file was not extracted because there was a error
-  //                             while reading the file
-  //                invalid_header : the file was not extracted because of an archive
-  //                                 format error (bad file header)
-  //   Note that each time a method can continue operating when there
-  //   is an action error on a file, the error is only logged in the file status.
-  // Return Values :
-  //   0 on an unrecoverable failure,
-  //   The list of the files in the archive.
-  // --------------------------------------------------------------------------------
-  function listContent()
-  {
-    $v_result=1;
-
-    // ----- Reset the error handler
-    $this->privErrorReset();
-
-    // ----- Check archive
-    if (!$this->privCheckFormat()) {
-      return(0);
-    }
-
-    // ----- Call the extracting fct
-    $p_list = array();
-    if (($v_result = $this->privList($p_list)) != 1)
-    {
-      unset($p_list);
-      return(0);
-    }
-
-    // ----- Return
-    return $p_list;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function :
-  //   extract($p_path="./", $p_remove_path="")
-  //   extract([$p_option, $p_option_value, ...])
-  // Description :
-  //   This method supports two synopsis. The first one is historical.
-  //   This method extract all the files / directories from the archive to the
-  //   folder indicated in $p_path.
-  //   If you want to ignore the 'root' part of path of the memorized files
-  //   you can indicate this in the optional $p_remove_path parameter.
-  //   By default, if a newer file with the same name already exists, the
-  //   file is not extracted.
-  //
-  //   If both PCLZIP_OPT_PATH and PCLZIP_OPT_ADD_PATH aoptions
-  //   are used, the path indicated in PCLZIP_OPT_ADD_PATH is append
-  //   at the end of the path value of PCLZIP_OPT_PATH.
-  // Parameters :
-  //   $p_path : Path where the files and directories are to be extracted
-  //   $p_remove_path : First part ('root' part) of the memorized path
-  //                    (if any similar) to remove while extracting.
-  // Options :
-  //   PCLZIP_OPT_PATH :
-  //   PCLZIP_OPT_ADD_PATH :
-  //   PCLZIP_OPT_REMOVE_PATH :
-  //   PCLZIP_OPT_REMOVE_ALL_PATH :
-  //   PCLZIP_CB_PRE_EXTRACT :
-  //   PCLZIP_CB_POST_EXTRACT :
-  // Return Values :
-  //   0 or a negative value on failure,
-  //   The list of the extracted files, with a status of the action.
-  //   (see PclZip::listContent() for list entry format)
-  // --------------------------------------------------------------------------------
-  function extract()
-  {
-    $v_result=1;
-
-    // ----- Reset the error handler
-    $this->privErrorReset();
-
-    // ----- Check archive
-    if (!$this->privCheckFormat()) {
-      return(0);
-    }
-
-    // ----- Set default values
-    $v_options = array();
-//    $v_path = "./";
-    $v_path = '';
-    $v_remove_path = "";
-    $v_remove_all_path = false;
-
-    // ----- Look for variable options arguments
-    $v_size = func_num_args();
-
-    // ----- Default values for option
-    $v_options[PCLZIP_OPT_EXTRACT_AS_STRING] = FALSE;
-
-    // ----- Look for arguments
-    if ($v_size > 0) {
-      // ----- Get the arguments
-      $v_arg_list = func_get_args();
-
-      // ----- Look for first arg
-      if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
-
-        // ----- Parse the options
-        $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
-                                            array (PCLZIP_OPT_PATH => 'optional',
-                                                   PCLZIP_OPT_REMOVE_PATH => 'optional',
-                                                   PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
-                                                   PCLZIP_OPT_ADD_PATH => 'optional',
-                                                   PCLZIP_CB_PRE_EXTRACT => 'optional',
-                                                   PCLZIP_CB_POST_EXTRACT => 'optional',
-                                                   PCLZIP_OPT_SET_CHMOD => 'optional',
-                                                   PCLZIP_OPT_BY_NAME => 'optional',
-                                                   PCLZIP_OPT_BY_EREG => 'optional',
-                                                   PCLZIP_OPT_BY_PREG => 'optional',
-                                                   PCLZIP_OPT_BY_INDEX => 'optional',
-                                                   PCLZIP_OPT_EXTRACT_AS_STRING => 'optional',
-                                                   PCLZIP_OPT_EXTRACT_IN_OUTPUT => 'optional',
-                                                   PCLZIP_OPT_REPLACE_NEWER => 'optional'
-                                                   ,PCLZIP_OPT_STOP_ON_ERROR => 'optional'
-                                                   ,PCLZIP_OPT_EXTRACT_DIR_RESTRICTION => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_THRESHOLD => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_ON => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_OFF => 'optional'
-												    ));
-        if ($v_result != 1) {
-          return 0;
+        // ----- Tests the zlib
+        if (!function_exists('gzopen')) {
+            die('Abort ' . basename(__FILE__) . ' : Missing zlib extensions');
         }
 
-        // ----- Set the arguments
-        if (isset($v_options[PCLZIP_OPT_PATH])) {
-          $v_path = $v_options[PCLZIP_OPT_PATH];
-        }
-        if (isset($v_options[PCLZIP_OPT_REMOVE_PATH])) {
-          $v_remove_path = $v_options[PCLZIP_OPT_REMOVE_PATH];
-        }
-        if (isset($v_options[PCLZIP_OPT_REMOVE_ALL_PATH])) {
-          $v_remove_all_path = $v_options[PCLZIP_OPT_REMOVE_ALL_PATH];
-        }
-        if (isset($v_options[PCLZIP_OPT_ADD_PATH])) {
-          // ----- Check for '/' in last path char
-          if ((strlen($v_path) > 0) && (substr($v_path, -1) != '/')) {
-            $v_path .= '/';
-          }
-          $v_path .= $v_options[PCLZIP_OPT_ADD_PATH];
-        }
-      }
-
-      // ----- Look for 2 args
-      // Here we need to support the first historic synopsis of the
-      // method.
-      else {
-
-        // ----- Get the first argument
-        $v_path = $v_arg_list[0];
-
-        // ----- Look for the optional second argument
-        if ($v_size == 2) {
-          $v_remove_path = $v_arg_list[1];
-        }
-        else if ($v_size > 2) {
-          // ----- Error log
-          PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / type of arguments");
-
-          // ----- Return
-          return 0;
-        }
-      }
-    }
-
-    // ----- Look for default option values
-    $this->privOptionDefaultThreshold($v_options);
-
-    // ----- Trace
-
-    // ----- Call the extracting fct
-    $p_list = array();
-    $v_result = $this->privExtractByRule($p_list, $v_path, $v_remove_path,
-	                                     $v_remove_all_path, $v_options);
-    if ($v_result < 1) {
-      unset($p_list);
-      return(0);
-    }
-
-    // ----- Return
-    return $p_list;
-  }
-  // --------------------------------------------------------------------------------
-
-
-  // --------------------------------------------------------------------------------
-  // Function :
-  //   extractByIndex($p_index, $p_path="./", $p_remove_path="")
-  //   extractByIndex($p_index, [$p_option, $p_option_value, ...])
-  // Description :
-  //   This method supports two synopsis. The first one is historical.
-  //   This method is doing a partial extract of the archive.
-  //   The extracted files or folders are identified by their index in the
-  //   archive (from 0 to n).
-  //   Note that if the index identify a folder, only the folder entry is
-  //   extracted, not all the files included in the archive.
-  // Parameters :
-  //   $p_index : A single index (integer) or a string of indexes of files to
-  //              extract. The form of the string is "0,4-6,8-12" with only numbers
-  //              and '-' for range or ',' to separate ranges. No spaces or ';'
-  //              are allowed.
-  //   $p_path : Path where the files and directories are to be extracted
-  //   $p_remove_path : First part ('root' part) of the memorized path
-  //                    (if any similar) to remove while extracting.
-  // Options :
-  //   PCLZIP_OPT_PATH :
-  //   PCLZIP_OPT_ADD_PATH :
-  //   PCLZIP_OPT_REMOVE_PATH :
-  //   PCLZIP_OPT_REMOVE_ALL_PATH :
-  //   PCLZIP_OPT_EXTRACT_AS_STRING : The files are extracted as strings and
-  //     not as files.
-  //     The resulting content is in a new field 'content' in the file
-  //     structure.
-  //     This option must be used alone (any other options are ignored).
-  //   PCLZIP_CB_PRE_EXTRACT :
-  //   PCLZIP_CB_POST_EXTRACT :
-  // Return Values :
-  //   0 on failure,
-  //   The list of the extracted files, with a status of the action.
-  //   (see PclZip::listContent() for list entry format)
-  // --------------------------------------------------------------------------------
-  //function extractByIndex($p_index, options...)
-  function extractByIndex($p_index)
-  {
-    $v_result=1;
-
-    // ----- Reset the error handler
-    $this->privErrorReset();
-
-    // ----- Check archive
-    if (!$this->privCheckFormat()) {
-      return(0);
-    }
-
-    // ----- Set default values
-    $v_options = array();
-//    $v_path = "./";
-    $v_path = '';
-    $v_remove_path = "";
-    $v_remove_all_path = false;
-
-    // ----- Look for variable options arguments
-    $v_size = func_num_args();
-
-    // ----- Default values for option
-    $v_options[PCLZIP_OPT_EXTRACT_AS_STRING] = FALSE;
-
-    // ----- Look for arguments
-    if ($v_size > 1) {
-      // ----- Get the arguments
-      $v_arg_list = func_get_args();
-
-      // ----- Remove form the options list the first argument
-      array_shift($v_arg_list);
-      $v_size--;
-
-      // ----- Look for first arg
-      if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
-
-        // ----- Parse the options
-        $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
-                                            array (PCLZIP_OPT_PATH => 'optional',
-                                                   PCLZIP_OPT_REMOVE_PATH => 'optional',
-                                                   PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
-                                                   PCLZIP_OPT_EXTRACT_AS_STRING => 'optional',
-                                                   PCLZIP_OPT_ADD_PATH => 'optional',
-                                                   PCLZIP_CB_PRE_EXTRACT => 'optional',
-                                                   PCLZIP_CB_POST_EXTRACT => 'optional',
-                                                   PCLZIP_OPT_SET_CHMOD => 'optional',
-                                                   PCLZIP_OPT_REPLACE_NEWER => 'optional'
-                                                   ,PCLZIP_OPT_STOP_ON_ERROR => 'optional'
-                                                   ,PCLZIP_OPT_EXTRACT_DIR_RESTRICTION => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_THRESHOLD => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_ON => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_OFF => 'optional'
-												   ));
-        if ($v_result != 1) {
-          return 0;
-        }
-
-        // ----- Set the arguments
-        if (isset($v_options[PCLZIP_OPT_PATH])) {
-          $v_path = $v_options[PCLZIP_OPT_PATH];
-        }
-        if (isset($v_options[PCLZIP_OPT_REMOVE_PATH])) {
-          $v_remove_path = $v_options[PCLZIP_OPT_REMOVE_PATH];
-        }
-        if (isset($v_options[PCLZIP_OPT_REMOVE_ALL_PATH])) {
-          $v_remove_all_path = $v_options[PCLZIP_OPT_REMOVE_ALL_PATH];
-        }
-        if (isset($v_options[PCLZIP_OPT_ADD_PATH])) {
-          // ----- Check for '/' in last path char
-          if ((strlen($v_path) > 0) && (substr($v_path, -1) != '/')) {
-            $v_path .= '/';
-          }
-          $v_path .= $v_options[PCLZIP_OPT_ADD_PATH];
-        }
-        if (!isset($v_options[PCLZIP_OPT_EXTRACT_AS_STRING])) {
-          $v_options[PCLZIP_OPT_EXTRACT_AS_STRING] = FALSE;
-        }
-        else {
-        }
-      }
-
-      // ----- Look for 2 args
-      // Here we need to support the first historic synopsis of the
-      // method.
-      else {
-
-        // ----- Get the first argument
-        $v_path = $v_arg_list[0];
-
-        // ----- Look for the optional second argument
-        if ($v_size == 2) {
-          $v_remove_path = $v_arg_list[1];
-        }
-        else if ($v_size > 2) {
-          // ----- Error log
-          PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / type of arguments");
-
-          // ----- Return
-          return 0;
-        }
-      }
-    }
-
-    // ----- Trace
-
-    // ----- Trick
-    // Here I want to reuse extractByRule(), so I need to parse the $p_index
-    // with privParseOptions()
-    $v_arg_trick = array (PCLZIP_OPT_BY_INDEX, $p_index);
-    $v_options_trick = array();
-    $v_result = $this->privParseOptions($v_arg_trick, sizeof($v_arg_trick), $v_options_trick,
-                                        array (PCLZIP_OPT_BY_INDEX => 'optional' ));
-    if ($v_result != 1) {
-        return 0;
-    }
-    $v_options[PCLZIP_OPT_BY_INDEX] = $v_options_trick[PCLZIP_OPT_BY_INDEX];
-
-    // ----- Look for default option values
-    $this->privOptionDefaultThreshold($v_options);
-
-    // ----- Call the extracting fct
-    if (($v_result = $this->privExtractByRule($p_list, $v_path, $v_remove_path, $v_remove_all_path, $v_options)) < 1) {
-        return(0);
-    }
-
-    // ----- Return
-    return $p_list;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function :
-  //   delete([$p_option, $p_option_value, ...])
-  // Description :
-  //   This method removes files from the archive.
-  //   If no parameters are given, then all the archive is emptied.
-  // Parameters :
-  //   None or optional arguments.
-  // Options :
-  //   PCLZIP_OPT_BY_INDEX :
-  //   PCLZIP_OPT_BY_NAME :
-  //   PCLZIP_OPT_BY_EREG : 
-  //   PCLZIP_OPT_BY_PREG :
-  // Return Values :
-  //   0 on failure,
-  //   The list of the files which are still present in the archive.
-  //   (see PclZip::listContent() for list entry format)
-  // --------------------------------------------------------------------------------
-  function delete()
-  {
-    $v_result=1;
-
-    // ----- Reset the error handler
-    $this->privErrorReset();
-
-    // ----- Check archive
-    if (!$this->privCheckFormat()) {
-      return(0);
-    }
-
-    // ----- Set default values
-    $v_options = array();
-
-    // ----- Look for variable options arguments
-    $v_size = func_num_args();
-
-    // ----- Look for arguments
-    if ($v_size > 0) {
-      // ----- Get the arguments
-      $v_arg_list = func_get_args();
-
-      // ----- Parse the options
-      $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
-                                        array (PCLZIP_OPT_BY_NAME => 'optional',
-                                               PCLZIP_OPT_BY_EREG => 'optional',
-                                               PCLZIP_OPT_BY_PREG => 'optional',
-                                               PCLZIP_OPT_BY_INDEX => 'optional' ));
-      if ($v_result != 1) {
-          return 0;
-      }
-    }
-
-    // ----- Magic quotes trick
-    $this->privDisableMagicQuotes();
-
-    // ----- Call the delete fct
-    $v_list = array();
-    if (($v_result = $this->privDeleteByRule($v_list, $v_options)) != 1) {
-      $this->privSwapBackMagicQuotes();
-      unset($v_list);
-      return(0);
-    }
-
-    // ----- Magic quotes trick
-    $this->privSwapBackMagicQuotes();
-
-    // ----- Return
-    return $v_list;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : deleteByIndex()
-  // Description :
-  //   ***** Deprecated *****
-  //   delete(PCLZIP_OPT_BY_INDEX, $p_index) should be prefered.
-  // --------------------------------------------------------------------------------
-  function deleteByIndex($p_index)
-  {
-    
-    $p_list = $this->delete(PCLZIP_OPT_BY_INDEX, $p_index);
-
-    // ----- Return
-    return $p_list;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : properties()
-  // Description :
-  //   This method gives the properties of the archive.
-  //   The properties are :
-  //     nb : Number of files in the archive
-  //     comment : Comment associated with the archive file
-  //     status : not_exist, ok
-  // Parameters :
-  //   None
-  // Return Values :
-  //   0 on failure,
-  //   An array with the archive properties.
-  // --------------------------------------------------------------------------------
-  function properties()
-  {
-
-    // ----- Reset the error handler
-    $this->privErrorReset();
-
-    // ----- Magic quotes trick
-    $this->privDisableMagicQuotes();
-
-    // ----- Check archive
-    if (!$this->privCheckFormat()) {
-      $this->privSwapBackMagicQuotes();
-      return(0);
-    }
-
-    // ----- Default properties
-    $v_prop = array();
-    $v_prop['comment'] = '';
-    $v_prop['nb'] = 0;
-    $v_prop['status'] = 'not_exist';
-
-    // ----- Look if file exists
-    if (@is_file($this->zipname))
-    {
-      // ----- Open the zip file
-      if (($this->zip_fd = @fopen($this->zipname, 'rb')) == 0)
-      {
-        $this->privSwapBackMagicQuotes();
-        
-        // ----- Error log
-        PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \''.$this->zipname.'\' in binary read mode');
+        // ----- Set the attributes
+        $this->zipname             = $p_zipname;
+        $this->zip_fd              = 0;
+        $this->magic_quotes_status = -1;
 
         // ----- Return
-        return 0;
-      }
-
-      // ----- Read the central directory informations
-      $v_central_dir = array();
-      if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
-      {
-        $this->privSwapBackMagicQuotes();
-        return 0;
-      }
-
-      // ----- Close the zip file
-      $this->privCloseFd();
-
-      // ----- Set the user attributes
-      $v_prop['comment'] = $v_central_dir['comment'];
-      $v_prop['nb'] = $v_central_dir['entries'];
-      $v_prop['status'] = 'ok';
+        return;
     }
+    // --------------------------------------------------------------------------------
 
-    // ----- Magic quotes trick
-    $this->privSwapBackMagicQuotes();
-
-    // ----- Return
-    return $v_prop;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : duplicate()
-  // Description :
-  //   This method creates an archive by copying the content of an other one. If
-  //   the archive already exist, it is replaced by the new one without any warning.
-  // Parameters :
-  //   $p_archive : The filename of a valid archive, or
-  //                a valid PclZip object.
-  // Return Values :
-  //   1 on success.
-  //   0 or a negative value on error (error code).
-  // --------------------------------------------------------------------------------
-  function duplicate($p_archive)
-  {
-    $v_result = 1;
-
-    // ----- Reset the error handler
-    $this->privErrorReset();
-
-    // ----- Look if the $p_archive is a PclZip object
-    if ((is_object($p_archive)) && (get_class($p_archive) == 'pclzip'))
+    // --------------------------------------------------------------------------------
+    // Function :
+    //   create($p_filelist, $p_add_dir="", $p_remove_dir="")
+    //   create($p_filelist, $p_option, $p_option_value, ...)
+    // Description :
+    //   This method supports two different synopsis. The first one is historical.
+    //   This method creates a Zip Archive. The Zip file is created in the
+    //   filesystem. The files and directories indicated in $p_filelist
+    //   are added in the archive. See the parameters description for the
+    //   supported format of $p_filelist.
+    //   When a directory is in the list, the directory and its content is added
+    //   in the archive.
+    //   In this synopsis, the function takes an optional variable list of
+    //   options. See bellow the supported options.
+    // Parameters :
+    //   $p_filelist : An array containing file or directory names, or
+    //                 a string containing one filename or one directory name, or
+    //                 a string containing a list of filenames and/or directory
+    //                 names separated by spaces.
+    //   $p_add_dir : A path to add before the real path of the archived file,
+    //                in order to have it memorized in the archive.
+    //   $p_remove_dir : A path to remove from the real path of the file to archive,
+    //                   in order to have a shorter path memorized in the archive.
+    //                   When $p_add_dir and $p_remove_dir are set, $p_remove_dir
+    //                   is removed first, before $p_add_dir is added.
+    // Options :
+    //   PCLZIP_OPT_ADD_PATH :
+    //   PCLZIP_OPT_REMOVE_PATH :
+    //   PCLZIP_OPT_REMOVE_ALL_PATH :
+    //   PCLZIP_OPT_COMMENT :
+    //   PCLZIP_CB_PRE_ADD :
+    //   PCLZIP_CB_POST_ADD :
+    // Return Values :
+    //   0 on failure,
+    //   The list of the added files, with a status of the add action.
+    //   (see PclZip::listContent() for list entry format)
+    // --------------------------------------------------------------------------------
+    public function create($p_filelist)
     {
-
-      // ----- Duplicate the archive
-      $v_result = $this->privDuplicate($p_archive->zipname);
-    }
-
-    // ----- Look if the $p_archive is a string (so a filename)
-    else if (is_string($p_archive))
-    {
-
-      // ----- Check that $p_archive is a valid zip file
-      // TBC : Should also check the archive format
-      if (!is_file($p_archive)) {
-        // ----- Error log
-        PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "No file with filename '".$p_archive."'");
-        $v_result = PCLZIP_ERR_MISSING_FILE;
-      }
-      else {
-        // ----- Duplicate the archive
-        $v_result = $this->privDuplicate($p_archive);
-      }
-    }
-
-    // ----- Invalid variable
-    else
-    {
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type p_archive_to_add");
-      $v_result = PCLZIP_ERR_INVALID_PARAMETER;
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : merge()
-  // Description :
-  //   This method merge the $p_archive_to_add archive at the end of the current
-  //   one ($this).
-  //   If the archive ($this) does not exist, the merge becomes a duplicate.
-  //   If the $p_archive_to_add archive does not exist, the merge is a success.
-  // Parameters :
-  //   $p_archive_to_add : It can be directly the filename of a valid zip archive,
-  //                       or a PclZip object archive.
-  // Return Values :
-  //   1 on success,
-  //   0 or negative values on error (see below).
-  // --------------------------------------------------------------------------------
-  function merge($p_archive_to_add)
-  {
-    $v_result = 1;
-
-    // ----- Reset the error handler
-    $this->privErrorReset();
-
-    // ----- Check archive
-    if (!$this->privCheckFormat()) {
-      return(0);
-    }
-
-    // ----- Look if the $p_archive_to_add is a PclZip object
-    if ((is_object($p_archive_to_add)) && (get_class($p_archive_to_add) == 'pclzip'))
-    {
-
-      // ----- Merge the archive
-      $v_result = $this->privMerge($p_archive_to_add);
-    }
-
-    // ----- Look if the $p_archive_to_add is a string (so a filename)
-    else if (is_string($p_archive_to_add))
-    {
-
-      // ----- Create a temporary archive
-      $v_object_archive = new PclZip($p_archive_to_add);
-
-      // ----- Merge the archive
-      $v_result = $this->privMerge($v_object_archive);
-    }
-
-    // ----- Invalid variable
-    else
-    {
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type p_archive_to_add");
-      $v_result = PCLZIP_ERR_INVALID_PARAMETER;
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-
-
-  // --------------------------------------------------------------------------------
-  // Function : errorCode()
-  // Description :
-  // Parameters :
-  // --------------------------------------------------------------------------------
-  function errorCode()
-  {
-    if (PCLZIP_ERROR_EXTERNAL == 1) {
-      return(PclErrorCode());
-    }
-    else {
-      return($this->error_code);
-    }
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : errorName()
-  // Description :
-  // Parameters :
-  // --------------------------------------------------------------------------------
-  function errorName($p_with_code=false)
-  {
-    $v_name = array ( PCLZIP_ERR_NO_ERROR => 'PCLZIP_ERR_NO_ERROR',
-                      PCLZIP_ERR_WRITE_OPEN_FAIL => 'PCLZIP_ERR_WRITE_OPEN_FAIL',
-                      PCLZIP_ERR_READ_OPEN_FAIL => 'PCLZIP_ERR_READ_OPEN_FAIL',
-                      PCLZIP_ERR_INVALID_PARAMETER => 'PCLZIP_ERR_INVALID_PARAMETER',
-                      PCLZIP_ERR_MISSING_FILE => 'PCLZIP_ERR_MISSING_FILE',
-                      PCLZIP_ERR_FILENAME_TOO_LONG => 'PCLZIP_ERR_FILENAME_TOO_LONG',
-                      PCLZIP_ERR_INVALID_ZIP => 'PCLZIP_ERR_INVALID_ZIP',
-                      PCLZIP_ERR_BAD_EXTRACTED_FILE => 'PCLZIP_ERR_BAD_EXTRACTED_FILE',
-                      PCLZIP_ERR_DIR_CREATE_FAIL => 'PCLZIP_ERR_DIR_CREATE_FAIL',
-                      PCLZIP_ERR_BAD_EXTENSION => 'PCLZIP_ERR_BAD_EXTENSION',
-                      PCLZIP_ERR_BAD_FORMAT => 'PCLZIP_ERR_BAD_FORMAT',
-                      PCLZIP_ERR_DELETE_FILE_FAIL => 'PCLZIP_ERR_DELETE_FILE_FAIL',
-                      PCLZIP_ERR_RENAME_FILE_FAIL => 'PCLZIP_ERR_RENAME_FILE_FAIL',
-                      PCLZIP_ERR_BAD_CHECKSUM => 'PCLZIP_ERR_BAD_CHECKSUM',
-                      PCLZIP_ERR_INVALID_ARCHIVE_ZIP => 'PCLZIP_ERR_INVALID_ARCHIVE_ZIP',
-                      PCLZIP_ERR_MISSING_OPTION_VALUE => 'PCLZIP_ERR_MISSING_OPTION_VALUE',
-                      PCLZIP_ERR_INVALID_OPTION_VALUE => 'PCLZIP_ERR_INVALID_OPTION_VALUE',
-                      PCLZIP_ERR_UNSUPPORTED_COMPRESSION => 'PCLZIP_ERR_UNSUPPORTED_COMPRESSION',
-                      PCLZIP_ERR_UNSUPPORTED_ENCRYPTION => 'PCLZIP_ERR_UNSUPPORTED_ENCRYPTION'
-                      ,PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE => 'PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE'
-                      ,PCLZIP_ERR_DIRECTORY_RESTRICTION => 'PCLZIP_ERR_DIRECTORY_RESTRICTION'
-                    );
-
-    if (isset($v_name[$this->error_code])) {
-      $v_value = $v_name[$this->error_code];
-    }
-    else {
-      $v_value = 'NoName';
-    }
-
-    if ($p_with_code) {
-      return($v_value.' ('.$this->error_code.')');
-    }
-    else {
-      return($v_value);
-    }
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : errorInfo()
-  // Description :
-  // Parameters :
-  // --------------------------------------------------------------------------------
-  function errorInfo($p_full=false)
-  {
-    if (PCLZIP_ERROR_EXTERNAL == 1) {
-      return(PclErrorString());
-    }
-    else {
-      if ($p_full) {
-        return($this->errorName(true)." : ".$this->error_string);
-      }
-      else {
-        return($this->error_string." [code ".$this->error_code."]");
-      }
-    }
-  }
-  // --------------------------------------------------------------------------------
-
-
-// --------------------------------------------------------------------------------
-// ***** UNDER THIS LINE ARE DEFINED PRIVATE INTERNAL FUNCTIONS *****
-// *****                                                        *****
-// *****       THESES FUNCTIONS MUST NOT BE USED DIRECTLY       *****
-// --------------------------------------------------------------------------------
-
-
-
-  // --------------------------------------------------------------------------------
-  // Function : privCheckFormat()
-  // Description :
-  //   This method check that the archive exists and is a valid zip archive.
-  //   Several level of check exists. (futur)
-  // Parameters :
-  //   $p_level : Level of check. Default 0.
-  //              0 : Check the first bytes (magic codes) (default value))
-  //              1 : 0 + Check the central directory (futur)
-  //              2 : 1 + Check each file header (futur)
-  // Return Values :
-  //   true on success,
-  //   false on error, the error code is set.
-  // --------------------------------------------------------------------------------
-  function privCheckFormat($p_level=0)
-  {
-    $v_result = true;
-
-	// ----- Reset the file system cache
-    clearstatcache();
-
-    // ----- Reset the error handler
-    $this->privErrorReset();
-
-    // ----- Look if the file exits
-    if (!is_file($this->zipname)) {
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "Missing archive file '".$this->zipname."'");
-      return(false);
-    }
-
-    // ----- Check that the file is readeable
-    if (!is_readable($this->zipname)) {
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, "Unable to read archive '".$this->zipname."'");
-      return(false);
-    }
-
-    // ----- Check the magic code
-    // TBC
-
-    // ----- Check the central header
-    // TBC
-
-    // ----- Check each file header
-    // TBC
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privParseOptions()
-  // Description :
-  //   This internal methods reads the variable list of arguments ($p_options_list,
-  //   $p_size) and generate an array with the options and values ($v_result_list).
-  //   $v_requested_options contains the options that can be present and those that
-  //   must be present.
-  //   $v_requested_options is an array, with the option value as key, and 'optional',
-  //   or 'mandatory' as value.
-  // Parameters :
-  //   See above.
-  // Return Values :
-  //   1 on success.
-  //   0 on failure.
-  // --------------------------------------------------------------------------------
-  function privParseOptions(&$p_options_list, $p_size, &$v_result_list, $v_requested_options=false)
-  {
-    $v_result=1;
-    
-    // ----- Read the options
-    $i=0;
-    while ($i<$p_size) {
-
-      // ----- Check if the option is supported
-      if (!isset($v_requested_options[$p_options_list[$i]])) {
-        // ----- Error log
-        PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid optional parameter '".$p_options_list[$i]."' for this method");
-
-        // ----- Return
-        return PclZip::errorCode();
-      }
-
-      // ----- Look for next option
-      switch ($p_options_list[$i]) {
-        // ----- Look for options that request a path value
-        case PCLZIP_OPT_PATH :
-        case PCLZIP_OPT_REMOVE_PATH :
-        case PCLZIP_OPT_ADD_PATH :
-          // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-            // ----- Return
-            return PclZip::errorCode();
-          }
-
-          // ----- Get the value
-          $v_result_list[$p_options_list[$i]] = PclZipUtilTranslateWinPath($p_options_list[$i+1], FALSE);
-          $i++;
-        break;
-
-        case PCLZIP_OPT_TEMP_FILE_THRESHOLD :
-          // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
-            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-            return PclZip::errorCode();
-          }
-          
-          // ----- Check for incompatible options
-          if (isset($v_result_list[PCLZIP_OPT_TEMP_FILE_OFF])) {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '".PclZipUtilOptionText($p_options_list[$i])."' can not be used with option 'PCLZIP_OPT_TEMP_FILE_OFF'");
-            return PclZip::errorCode();
-          }
-          
-          // ----- Check the value
-          $v_value = $p_options_list[$i+1];
-          if ((!is_integer($v_value)) || ($v_value<0)) {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Integer expected for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-            return PclZip::errorCode();
-          }
-
-          // ----- Get the value (and convert it in bytes)
-          $v_result_list[$p_options_list[$i]] = $v_value*1048576;
-          $i++;
-        break;
-
-        case PCLZIP_OPT_TEMP_FILE_ON :
-          // ----- Check for incompatible options
-          if (isset($v_result_list[PCLZIP_OPT_TEMP_FILE_OFF])) {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '".PclZipUtilOptionText($p_options_list[$i])."' can not be used with option 'PCLZIP_OPT_TEMP_FILE_OFF'");
-            return PclZip::errorCode();
-          }
-          
-          $v_result_list[$p_options_list[$i]] = true;
-        break;
-
-        case PCLZIP_OPT_TEMP_FILE_OFF :
-          // ----- Check for incompatible options
-          if (isset($v_result_list[PCLZIP_OPT_TEMP_FILE_ON])) {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '".PclZipUtilOptionText($p_options_list[$i])."' can not be used with option 'PCLZIP_OPT_TEMP_FILE_ON'");
-            return PclZip::errorCode();
-          }
-          // ----- Check for incompatible options
-          if (isset($v_result_list[PCLZIP_OPT_TEMP_FILE_THRESHOLD])) {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '".PclZipUtilOptionText($p_options_list[$i])."' can not be used with option 'PCLZIP_OPT_TEMP_FILE_THRESHOLD'");
-            return PclZip::errorCode();
-          }
-          
-          $v_result_list[$p_options_list[$i]] = true;
-        break;
-
-        case PCLZIP_OPT_EXTRACT_DIR_RESTRICTION :
-          // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-            // ----- Return
-            return PclZip::errorCode();
-          }
-
-          // ----- Get the value
-          if (   is_string($p_options_list[$i+1])
-              && ($p_options_list[$i+1] != '')) {
-            $v_result_list[$p_options_list[$i]] = PclZipUtilTranslateWinPath($p_options_list[$i+1], FALSE);
-            $i++;
-          }
-          else {
-          }
-        break;
-
-        // ----- Look for options that request an array of string for value
-        case PCLZIP_OPT_BY_NAME :
-          // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-            // ----- Return
-            return PclZip::errorCode();
-          }
-
-          // ----- Get the value
-          if (is_string($p_options_list[$i+1])) {
-              $v_result_list[$p_options_list[$i]][0] = $p_options_list[$i+1];
-          }
-          else if (is_array($p_options_list[$i+1])) {
-              $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];
-          }
-          else {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Wrong parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-            // ----- Return
-            return PclZip::errorCode();
-          }
-          $i++;
-        break;
-
-        // ----- Look for options that request an EREG or PREG expression
-        case PCLZIP_OPT_BY_EREG :
-          // ereg() is deprecated starting with PHP 5.3. Move PCLZIP_OPT_BY_EREG
-          // to PCLZIP_OPT_BY_PREG
-          $p_options_list[$i] = PCLZIP_OPT_BY_PREG;
-        case PCLZIP_OPT_BY_PREG :
-        //case PCLZIP_OPT_CRYPT :
-          // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-            // ----- Return
-            return PclZip::errorCode();
-          }
-
-          // ----- Get the value
-          if (is_string($p_options_list[$i+1])) {
-              $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];
-          }
-          else {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Wrong parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-            // ----- Return
-            return PclZip::errorCode();
-          }
-          $i++;
-        break;
-
-        // ----- Look for options that takes a string
-        case PCLZIP_OPT_COMMENT :
-        case PCLZIP_OPT_ADD_COMMENT :
-        case PCLZIP_OPT_PREPEND_COMMENT :
-          // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE,
-			                     "Missing parameter value for option '"
-								 .PclZipUtilOptionText($p_options_list[$i])
-								 ."'");
-
-            // ----- Return
-            return PclZip::errorCode();
-          }
-
-          // ----- Get the value
-          if (is_string($p_options_list[$i+1])) {
-              $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];
-          }
-          else {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE,
-			                     "Wrong parameter value for option '"
-								 .PclZipUtilOptionText($p_options_list[$i])
-								 ."'");
-
-            // ----- Return
-            return PclZip::errorCode();
-          }
-          $i++;
-        break;
-
-        // ----- Look for options that request an array of index
-        case PCLZIP_OPT_BY_INDEX :
-          // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-            // ----- Return
-            return PclZip::errorCode();
-          }
-
-          // ----- Get the value
-          $v_work_list = array();
-          if (is_string($p_options_list[$i+1])) {
-
-              // ----- Remove spaces
-              $p_options_list[$i+1] = strtr($p_options_list[$i+1], ' ', '');
-
-              // ----- Parse items
-              $v_work_list = explode(",", $p_options_list[$i+1]);
-          }
-          else if (is_integer($p_options_list[$i+1])) {
-              $v_work_list[0] = $p_options_list[$i+1].'-'.$p_options_list[$i+1];
-          }
-          else if (is_array($p_options_list[$i+1])) {
-              $v_work_list = $p_options_list[$i+1];
-          }
-          else {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Value must be integer, string or array for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-            // ----- Return
-            return PclZip::errorCode();
-          }
-          
-          // ----- Reduce the index list
-          // each index item in the list must be a couple with a start and
-          // an end value : [0,3], [5-5], [8-10], ...
-          // ----- Check the format of each item
-          $v_sort_flag=false;
-          $v_sort_value=0;
-          for ($j=0; $j<sizeof($v_work_list); $j++) {
-              // ----- Explode the item
-              $v_item_list = explode("-", $v_work_list[$j]);
-              $v_size_item_list = sizeof($v_item_list);
-              
-              // ----- TBC : Here we might check that each item is a
-              // real integer ...
-              
-              // ----- Look for single value
-              if ($v_size_item_list == 1) {
-                  // ----- Set the option value
-                  $v_result_list[$p_options_list[$i]][$j]['start'] = $v_item_list[0];
-                  $v_result_list[$p_options_list[$i]][$j]['end'] = $v_item_list[0];
-              }
-              elseif ($v_size_item_list == 2) {
-                  // ----- Set the option value
-                  $v_result_list[$p_options_list[$i]][$j]['start'] = $v_item_list[0];
-                  $v_result_list[$p_options_list[$i]][$j]['end'] = $v_item_list[1];
-              }
-              else {
-                  // ----- Error log
-                  PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Too many values in index range for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-                  // ----- Return
-                  return PclZip::errorCode();
-              }
-
-
-              // ----- Look for list sort
-              if ($v_result_list[$p_options_list[$i]][$j]['start'] < $v_sort_value) {
-                  $v_sort_flag=true;
-
-                  // ----- TBC : An automatic sort should be writen ...
-                  // ----- Error log
-                  PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Invalid order of index range for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-                  // ----- Return
-                  return PclZip::errorCode();
-              }
-              $v_sort_value = $v_result_list[$p_options_list[$i]][$j]['start'];
-          }
-          
-          // ----- Sort the items
-          if ($v_sort_flag) {
-              // TBC : To Be Completed
-          }
-
-          // ----- Next option
-          $i++;
-        break;
-
-        // ----- Look for options that request no value
-        case PCLZIP_OPT_REMOVE_ALL_PATH :
-        case PCLZIP_OPT_EXTRACT_AS_STRING :
-        case PCLZIP_OPT_NO_COMPRESSION :
-        case PCLZIP_OPT_EXTRACT_IN_OUTPUT :
-        case PCLZIP_OPT_REPLACE_NEWER :
-        case PCLZIP_OPT_STOP_ON_ERROR :
-          $v_result_list[$p_options_list[$i]] = true;
-        break;
-
-        // ----- Look for options that request an octal value
-        case PCLZIP_OPT_SET_CHMOD :
-          // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-            // ----- Return
-            return PclZip::errorCode();
-          }
-
-          // ----- Get the value
-          $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];
-          $i++;
-        break;
-
-        // ----- Look for options that request a call-back
-        case PCLZIP_CB_PRE_EXTRACT :
-        case PCLZIP_CB_POST_EXTRACT :
-        case PCLZIP_CB_PRE_ADD :
-        case PCLZIP_CB_POST_ADD :
-        /* for futur use
-        case PCLZIP_CB_PRE_DELETE :
-        case PCLZIP_CB_POST_DELETE :
-        case PCLZIP_CB_PRE_LIST :
-        case PCLZIP_CB_POST_LIST :
-        */
-          // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-            // ----- Return
-            return PclZip::errorCode();
-          }
-
-          // ----- Get the value
-          $v_function_name = $p_options_list[$i+1];
-
-          // ----- Check that the value is a valid existing function
-          if (!function_exists($v_function_name)) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Function '".$v_function_name."()' is not an existing function for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-            // ----- Return
-            return PclZip::errorCode();
-          }
-
-          // ----- Set the attribute
-          $v_result_list[$p_options_list[$i]] = $v_function_name;
-          $i++;
-        break;
-
-        default :
-          // ----- Error log
-          PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER,
-		                       "Unknown parameter '"
-							   .$p_options_list[$i]."'");
-
-          // ----- Return
-          return PclZip::errorCode();
-      }
-
-      // ----- Next options
-      $i++;
-    }
-
-    // ----- Look for mandatory options
-    if ($v_requested_options !== false) {
-      for ($key=reset($v_requested_options); $key=key($v_requested_options); $key=next($v_requested_options)) {
-        // ----- Look for mandatory option
-        if ($v_requested_options[$key] == 'mandatory') {
-          // ----- Look if present
-          if (!isset($v_result_list[$key])) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Missing mandatory parameter ".PclZipUtilOptionText($key)."(".$key.")");
-
-            // ----- Return
-            return PclZip::errorCode();
-          }
-        }
-      }
-    }
-    
-    // ----- Look for default values
-    if (!isset($v_result_list[PCLZIP_OPT_TEMP_FILE_THRESHOLD])) {
-      
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privOptionDefaultThreshold()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privOptionDefaultThreshold(&$p_options)
-  {
-    $v_result=1;
-    
-    if (isset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD])
-        || isset($p_options[PCLZIP_OPT_TEMP_FILE_OFF])) {
-      return $v_result;
-    }
-    
-    // ----- Get 'memory_limit' configuration value
-    $v_memory_limit = ini_get('memory_limit');
-    $v_memory_limit = trim($v_memory_limit);
-    $last = strtolower(substr($v_memory_limit, -1));
- 
-    if($last == 'g')
-        //$v_memory_limit = $v_memory_limit*1024*1024*1024;
-        $v_memory_limit = $v_memory_limit*1073741824;
-    if($last == 'm')
-        //$v_memory_limit = $v_memory_limit*1024*1024;
-        $v_memory_limit = $v_memory_limit*1048576;
-    if($last == 'k')
-        $v_memory_limit = $v_memory_limit*1024;
-            
-    $p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] = floor($v_memory_limit*PCLZIP_TEMPORARY_FILE_RATIO);
-    
-
-    // ----- Sanity check : No threshold if value lower than 1M
-    if ($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] < 1048576) {
-      unset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD]);
-    }
-          
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privFileDescrParseAtt()
-  // Description :
-  // Parameters :
-  // Return Values :
-  //   1 on success.
-  //   0 on failure.
-  // --------------------------------------------------------------------------------
-  function privFileDescrParseAtt(&$p_file_list, &$p_filedescr, $v_options, $v_requested_options=false)
-  {
-    $v_result=1;
-    
-    // ----- For each file in the list check the attributes
-    foreach ($p_file_list as $v_key => $v_value) {
-    
-      // ----- Check if the option is supported
-      if (!isset($v_requested_options[$v_key])) {
-        // ----- Error log
-        PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid file attribute '".$v_key."' for this file");
-
-        // ----- Return
-        return PclZip::errorCode();
-      }
-
-      // ----- Look for attribute
-      switch ($v_key) {
-        case PCLZIP_ATT_FILE_NAME :
-          if (!is_string($v_value)) {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type ".gettype($v_value).". String expected for attribute '".PclZipUtilOptionText($v_key)."'");
-            return PclZip::errorCode();
-          }
-
-          $p_filedescr['filename'] = PclZipUtilPathReduction($v_value);
-          
-          if ($p_filedescr['filename'] == '') {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid empty filename for attribute '".PclZipUtilOptionText($v_key)."'");
-            return PclZip::errorCode();
-          }
-
-        break;
-
-        case PCLZIP_ATT_FILE_NEW_SHORT_NAME :
-          if (!is_string($v_value)) {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type ".gettype($v_value).". String expected for attribute '".PclZipUtilOptionText($v_key)."'");
-            return PclZip::errorCode();
-          }
-
-          $p_filedescr['new_short_name'] = PclZipUtilPathReduction($v_value);
-
-          if ($p_filedescr['new_short_name'] == '') {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid empty short filename for attribute '".PclZipUtilOptionText($v_key)."'");
-            return PclZip::errorCode();
-          }
-        break;
-
-        case PCLZIP_ATT_FILE_NEW_FULL_NAME :
-          if (!is_string($v_value)) {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type ".gettype($v_value).". String expected for attribute '".PclZipUtilOptionText($v_key)."'");
-            return PclZip::errorCode();
-          }
-
-          $p_filedescr['new_full_name'] = PclZipUtilPathReduction($v_value);
-
-          if ($p_filedescr['new_full_name'] == '') {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid empty full filename for attribute '".PclZipUtilOptionText($v_key)."'");
-            return PclZip::errorCode();
-          }
-        break;
-
-        // ----- Look for options that takes a string
-        case PCLZIP_ATT_FILE_COMMENT :
-          if (!is_string($v_value)) {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type ".gettype($v_value).". String expected for attribute '".PclZipUtilOptionText($v_key)."'");
-            return PclZip::errorCode();
-          }
-
-          $p_filedescr['comment'] = $v_value;
-        break;
-
-        case PCLZIP_ATT_FILE_MTIME :
-          if (!is_integer($v_value)) {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type ".gettype($v_value).". Integer expected for attribute '".PclZipUtilOptionText($v_key)."'");
-            return PclZip::errorCode();
-          }
-
-          $p_filedescr['mtime'] = $v_value;
-        break;
-
-        case PCLZIP_ATT_FILE_CONTENT :
-          $p_filedescr['content'] = $v_value;
-        break;
-
-        default :
-          // ----- Error log
-          PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER,
-		                           "Unknown parameter '".$v_key."'");
-
-          // ----- Return
-          return PclZip::errorCode();
-      }
-
-      // ----- Look for mandatory options
-      if ($v_requested_options !== false) {
-        for ($key=reset($v_requested_options); $key=key($v_requested_options); $key=next($v_requested_options)) {
-          // ----- Look for mandatory option
-          if ($v_requested_options[$key] == 'mandatory') {
-            // ----- Look if present
-            if (!isset($p_file_list[$key])) {
-              PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Missing mandatory parameter ".PclZipUtilOptionText($key)."(".$key.")");
-              return PclZip::errorCode();
-            }
-          }
-        }
-      }
-    
-    // end foreach
-    }
-    
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privFileDescrExpand()
-  // Description :
-  //   This method look for each item of the list to see if its a file, a folder
-  //   or a string to be added as file. For any other type of files (link, other)
-  //   just ignore the item.
-  //   Then prepare the information that will be stored for that file.
-  //   When its a folder, expand the folder with all the files that are in that 
-  //   folder (recursively).
-  // Parameters :
-  // Return Values :
-  //   1 on success.
-  //   0 on failure.
-  // --------------------------------------------------------------------------------
-  function privFileDescrExpand(&$p_filedescr_list, &$p_options)
-  {
-    $v_result=1;
-    
-    // ----- Create a result list
-    $v_result_list = array();
-    
-    // ----- Look each entry
-    for ($i=0; $i<sizeof($p_filedescr_list); $i++) {
-      
-      // ----- Get filedescr
-      $v_descr = $p_filedescr_list[$i];
-      
-      // ----- Reduce the filename
-      $v_descr['filename'] = PclZipUtilTranslateWinPath($v_descr['filename'], false);
-      $v_descr['filename'] = PclZipUtilPathReduction($v_descr['filename']);
-      
-      // ----- Look for real file or folder
-      if (file_exists($v_descr['filename'])) {
-        if (@is_file($v_descr['filename'])) {
-          $v_descr['type'] = 'file';
-        }
-        else if (@is_dir($v_descr['filename'])) {
-          $v_descr['type'] = 'folder';
-        }
-        else if (@is_link($v_descr['filename'])) {
-          // skip
-          continue;
-        }
-        else {
-          // skip
-          continue;
-        }
-      }
-      
-      // ----- Look for string added as file
-      else if (isset($v_descr['content'])) {
-        $v_descr['type'] = 'virtual_file';
-      }
-      
-      // ----- Missing file
-      else {
-        // ----- Error log
-        PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "File '".$v_descr['filename']."' does not exist");
-
-        // ----- Return
-        return PclZip::errorCode();
-      }
-      
-      // ----- Calculate the stored filename
-      $this->privCalculateStoredFilename($v_descr, $p_options);
-      
-      // ----- Add the descriptor in result list
-      $v_result_list[sizeof($v_result_list)] = $v_descr;
-      
-      // ----- Look for folder
-      if ($v_descr['type'] == 'folder') {
-        // ----- List of items in folder
-        $v_dirlist_descr = array();
-        $v_dirlist_nb = 0;
-        if ($v_folder_handler = @opendir($v_descr['filename'])) {
-          while (($v_item_handler = @readdir($v_folder_handler)) !== false) {
-
-            // ----- Skip '.' and '..'
-            if (($v_item_handler == '.') || ($v_item_handler == '..')) {
-                continue;
-            }
-            
-            // ----- Compose the full filename
-            $v_dirlist_descr[$v_dirlist_nb]['filename'] = $v_descr['filename'].'/'.$v_item_handler;
-            
-            // ----- Look for different stored filename
-            // Because the name of the folder was changed, the name of the
-            // files/sub-folders also change
-            if (($v_descr['stored_filename'] != $v_descr['filename'])
-                 && (!isset($p_options[PCLZIP_OPT_REMOVE_ALL_PATH]))) {
-              if ($v_descr['stored_filename'] != '') {
-                $v_dirlist_descr[$v_dirlist_nb]['new_full_name'] = $v_descr['stored_filename'].'/'.$v_item_handler;
-              }
-              else {
-                $v_dirlist_descr[$v_dirlist_nb]['new_full_name'] = $v_item_handler;
-              }
-            }
-      
-            $v_dirlist_nb++;
-          }
-          
-          @closedir($v_folder_handler);
-        }
-        else {
-          // TBC : unable to open folder in read mode
-        }
-        
-        // ----- Expand each element of the list
-        if ($v_dirlist_nb != 0) {
-          // ----- Expand
-          if (($v_result = $this->privFileDescrExpand($v_dirlist_descr, $p_options)) != 1) {
-            return $v_result;
-          }
-          
-          // ----- Concat the resulting list
-          $v_result_list = array_merge($v_result_list, $v_dirlist_descr);
-        }
-        else {
-        }
-          
-        // ----- Free local array
-        unset($v_dirlist_descr);
-      }
-    }
-    
-    // ----- Get the result list
-    $p_filedescr_list = $v_result_list;
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privCreate()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privCreate($p_filedescr_list, &$p_result_list, &$p_options)
-  {
-    $v_result=1;
-    $v_list_detail = array();
-    
-    // ----- Magic quotes trick
-    $this->privDisableMagicQuotes();
-
-    // ----- Open the file in write mode
-    if (($v_result = $this->privOpenFd('wb')) != 1)
-    {
-      // ----- Return
-      return $v_result;
-    }
-
-    // ----- Add the list of files
-    $v_result = $this->privAddList($p_filedescr_list, $p_result_list, $p_options);
-
-    // ----- Close
-    $this->privCloseFd();
-
-    // ----- Magic quotes trick
-    $this->privSwapBackMagicQuotes();
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privAdd()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privAdd($p_filedescr_list, &$p_result_list, &$p_options)
-  {
-    $v_result=1;
-    $v_list_detail = array();
-
-    // ----- Look if the archive exists or is empty
-    if ((!is_file($this->zipname)) || (filesize($this->zipname) == 0))
-    {
-
-      // ----- Do a create
-      $v_result = $this->privCreate($p_filedescr_list, $p_result_list, $p_options);
-
-      // ----- Return
-      return $v_result;
-    }
-    // ----- Magic quotes trick
-    $this->privDisableMagicQuotes();
-
-    // ----- Open the zip file
-    if (($v_result=$this->privOpenFd('rb')) != 1)
-    {
-      // ----- Magic quotes trick
-      $this->privSwapBackMagicQuotes();
-
-      // ----- Return
-      return $v_result;
-    }
-
-    // ----- Read the central directory informations
-    $v_central_dir = array();
-    if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
-    {
-      $this->privCloseFd();
-      $this->privSwapBackMagicQuotes();
-      return $v_result;
-    }
-
-    // ----- Go to beginning of File
-    @rewind($this->zip_fd);
-
-    // ----- Creates a temporay file
-    $v_zip_temp_name = PCLZIP_TEMPORARY_DIR.uniqid('pclzip-').'.tmp';
-
-    // ----- Open the temporary file in write mode
-    if (($v_zip_temp_fd = @fopen($v_zip_temp_name, 'wb')) == 0)
-    {
-      $this->privCloseFd();
-      $this->privSwapBackMagicQuotes();
-
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_zip_temp_name.'\' in binary write mode');
-
-      // ----- Return
-      return PclZip::errorCode();
-    }
-
-    // ----- Copy the files from the archive to the temporary file
-    // TBC : Here I should better append the file and go back to erase the central dir
-    $v_size = $v_central_dir['offset'];
-    while ($v_size != 0)
-    {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      $v_buffer = fread($this->zip_fd, $v_read_size);
-      @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
-
-    // ----- Swap the file descriptor
-    // Here is a trick : I swap the temporary fd with the zip fd, in order to use
-    // the following methods on the temporary fil and not the real archive
-    $v_swap = $this->zip_fd;
-    $this->zip_fd = $v_zip_temp_fd;
-    $v_zip_temp_fd = $v_swap;
-
-    // ----- Add the files
-    $v_header_list = array();
-    if (($v_result = $this->privAddFileList($p_filedescr_list, $v_header_list, $p_options)) != 1)
-    {
-      fclose($v_zip_temp_fd);
-      $this->privCloseFd();
-      @unlink($v_zip_temp_name);
-      $this->privSwapBackMagicQuotes();
-
-      // ----- Return
-      return $v_result;
-    }
-
-    // ----- Store the offset of the central dir
-    $v_offset = @ftell($this->zip_fd);
-
-    // ----- Copy the block of file headers from the old archive
-    $v_size = $v_central_dir['size'];
-    while ($v_size != 0)
-    {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      $v_buffer = @fread($v_zip_temp_fd, $v_read_size);
-      @fwrite($this->zip_fd, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
-
-    // ----- Create the Central Dir files header
-    for ($i=0, $v_count=0; $i<sizeof($v_header_list); $i++)
-    {
-      // ----- Create the file header
-      if ($v_header_list[$i]['status'] == 'ok') {
-        if (($v_result = $this->privWriteCentralFileHeader($v_header_list[$i])) != 1) {
-          fclose($v_zip_temp_fd);
-          $this->privCloseFd();
-          @unlink($v_zip_temp_name);
-          $this->privSwapBackMagicQuotes();
-
-          // ----- Return
-          return $v_result;
-        }
-        $v_count++;
-      }
-
-      // ----- Transform the header to a 'usable' info
-      $this->privConvertHeader2FileInfo($v_header_list[$i], $p_result_list[$i]);
-    }
-
-    // ----- Zip file comment
-    $v_comment = $v_central_dir['comment'];
-    if (isset($p_options[PCLZIP_OPT_COMMENT])) {
-      $v_comment = $p_options[PCLZIP_OPT_COMMENT];
-    }
-    if (isset($p_options[PCLZIP_OPT_ADD_COMMENT])) {
-      $v_comment = $v_comment.$p_options[PCLZIP_OPT_ADD_COMMENT];
-    }
-    if (isset($p_options[PCLZIP_OPT_PREPEND_COMMENT])) {
-      $v_comment = $p_options[PCLZIP_OPT_PREPEND_COMMENT].$v_comment;
-    }
-
-    // ----- Calculate the size of the central header
-    $v_size = @ftell($this->zip_fd)-$v_offset;
-
-    // ----- Create the central dir footer
-    if (($v_result = $this->privWriteCentralHeader($v_count+$v_central_dir['entries'], $v_size, $v_offset, $v_comment)) != 1)
-    {
-      // ----- Reset the file list
-      unset($v_header_list);
-      $this->privSwapBackMagicQuotes();
-
-      // ----- Return
-      return $v_result;
-    }
-
-    // ----- Swap back the file descriptor
-    $v_swap = $this->zip_fd;
-    $this->zip_fd = $v_zip_temp_fd;
-    $v_zip_temp_fd = $v_swap;
-
-    // ----- Close
-    $this->privCloseFd();
-
-    // ----- Close the temporary file
-    @fclose($v_zip_temp_fd);
-
-    // ----- Magic quotes trick
-    $this->privSwapBackMagicQuotes();
-
-    // ----- Delete the zip file
-    // TBC : I should test the result ...
-    @unlink($this->zipname);
-
-    // ----- Rename the temporary file
-    // TBC : I should test the result ...
-    //@rename($v_zip_temp_name, $this->zipname);
-    PclZipUtilRename($v_zip_temp_name, $this->zipname);
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privOpenFd()
-  // Description :
-  // Parameters :
-  // --------------------------------------------------------------------------------
-  function privOpenFd($p_mode)
-  {
-    $v_result=1;
-
-    // ----- Look if already open
-    if ($this->zip_fd != 0)
-    {
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Zip file \''.$this->zipname.'\' already open');
-
-      // ----- Return
-      return PclZip::errorCode();
-    }
-
-    // ----- Open the zip file
-    if (($this->zip_fd = @fopen($this->zipname, $p_mode)) == 0)
-    {
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \''.$this->zipname.'\' in '.$p_mode.' mode');
-
-      // ----- Return
-      return PclZip::errorCode();
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privCloseFd()
-  // Description :
-  // Parameters :
-  // --------------------------------------------------------------------------------
-  function privCloseFd()
-  {
-    $v_result=1;
-
-    if ($this->zip_fd != 0)
-      @fclose($this->zip_fd);
-    $this->zip_fd = 0;
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privAddList()
-  // Description :
-  //   $p_add_dir and $p_remove_dir will give the ability to memorize a path which is
-  //   different from the real path of the file. This is usefull if you want to have PclTar
-  //   running in any directory, and memorize relative path from an other directory.
-  // Parameters :
-  //   $p_list : An array containing the file or directory names to add in the tar
-  //   $p_result_list : list of added files with their properties (specially the status field)
-  //   $p_add_dir : Path to add in the filename path archived
-  //   $p_remove_dir : Path to remove in the filename path archived
-  // Return Values :
-  // --------------------------------------------------------------------------------
-//  function privAddList($p_list, &$p_result_list, $p_add_dir, $p_remove_dir, $p_remove_all_dir, &$p_options)
-  function privAddList($p_filedescr_list, &$p_result_list, &$p_options)
-  {
-    $v_result=1;
-
-    // ----- Add the files
-    $v_header_list = array();
-    if (($v_result = $this->privAddFileList($p_filedescr_list, $v_header_list, $p_options)) != 1)
-    {
-      // ----- Return
-      return $v_result;
-    }
-
-    // ----- Store the offset of the central dir
-    $v_offset = @ftell($this->zip_fd);
-
-    // ----- Create the Central Dir files header
-    for ($i=0,$v_count=0; $i<sizeof($v_header_list); $i++)
-    {
-      // ----- Create the file header
-      if ($v_header_list[$i]['status'] == 'ok') {
-        if (($v_result = $this->privWriteCentralFileHeader($v_header_list[$i])) != 1) {
-          // ----- Return
-          return $v_result;
-        }
-        $v_count++;
-      }
-
-      // ----- Transform the header to a 'usable' info
-      $this->privConvertHeader2FileInfo($v_header_list[$i], $p_result_list[$i]);
-    }
-
-    // ----- Zip file comment
-    $v_comment = '';
-    if (isset($p_options[PCLZIP_OPT_COMMENT])) {
-      $v_comment = $p_options[PCLZIP_OPT_COMMENT];
-    }
-
-    // ----- Calculate the size of the central header
-    $v_size = @ftell($this->zip_fd)-$v_offset;
-
-    // ----- Create the central dir footer
-    if (($v_result = $this->privWriteCentralHeader($v_count, $v_size, $v_offset, $v_comment)) != 1)
-    {
-      // ----- Reset the file list
-      unset($v_header_list);
-
-      // ----- Return
-      return $v_result;
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privAddFileList()
-  // Description :
-  // Parameters :
-  //   $p_filedescr_list : An array containing the file description 
-  //                      or directory names to add in the zip
-  //   $p_result_list : list of added files with their properties (specially the status field)
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privAddFileList($p_filedescr_list, &$p_result_list, &$p_options)
-  {
-    $v_result=1;
-    $v_header = array();
-
-    // ----- Recuperate the current number of elt in list
-    $v_nb = sizeof($p_result_list);
-
-    // ----- Loop on the files
-    for ($j=0; ($j<sizeof($p_filedescr_list)) && ($v_result==1); $j++) {
-      // ----- Format the filename
-      $p_filedescr_list[$j]['filename']
-      = PclZipUtilTranslateWinPath($p_filedescr_list[$j]['filename'], false);
-      
-
-      // ----- Skip empty file names
-      // TBC : Can this be possible ? not checked in DescrParseAtt ?
-      if ($p_filedescr_list[$j]['filename'] == "") {
-        continue;
-      }
-
-      // ----- Check the filename
-      if (   ($p_filedescr_list[$j]['type'] != 'virtual_file')
-          && (!file_exists($p_filedescr_list[$j]['filename']))) {
-        PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "File '".$p_filedescr_list[$j]['filename']."' does not exist");
-        return PclZip::errorCode();
-      }
-
-      // ----- Look if it is a file or a dir with no all path remove option
-      // or a dir with all its path removed
-//      if (   (is_file($p_filedescr_list[$j]['filename']))
-//          || (   is_dir($p_filedescr_list[$j]['filename'])
-      if (   ($p_filedescr_list[$j]['type'] == 'file')
-          || ($p_filedescr_list[$j]['type'] == 'virtual_file')
-          || (   ($p_filedescr_list[$j]['type'] == 'folder')
-              && (   !isset($p_options[PCLZIP_OPT_REMOVE_ALL_PATH])
-                  || !$p_options[PCLZIP_OPT_REMOVE_ALL_PATH]))
-          ) {
-
-        // ----- Add the file
-        $v_result = $this->privAddFile($p_filedescr_list[$j], $v_header,
-                                       $p_options);
-        if ($v_result != 1) {
-          return $v_result;
-        }
-
-        // ----- Store the file infos
-        $p_result_list[$v_nb++] = $v_header;
-      }
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privAddFile()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privAddFile($p_filedescr, &$p_header, &$p_options)
-  {
-    $v_result=1;
-    
-    // ----- Working variable
-    $p_filename = $p_filedescr['filename'];
-
-    // TBC : Already done in the fileAtt check ... ?
-    if ($p_filename == "") {
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid file list parameter (invalid or empty list)");
-
-      // ----- Return
-      return PclZip::errorCode();
-    }
-  
-    // ----- Look for a stored different filename 
-    /* TBC : Removed
-    if (isset($p_filedescr['stored_filename'])) {
-      $v_stored_filename = $p_filedescr['stored_filename'];
-    }
-    else {
-      $v_stored_filename = $p_filedescr['stored_filename'];
-    }
-    */
-
-    // ----- Set the file properties
-    clearstatcache();
-    $p_header['version'] = 20;
-    $p_header['version_extracted'] = 10;
-    $p_header['flag'] = 0;
-    $p_header['compression'] = 0;
-    $p_header['crc'] = 0;
-    $p_header['compressed_size'] = 0;
-    $p_header['filename_len'] = strlen($p_filename);
-    $p_header['extra_len'] = 0;
-    $p_header['disk'] = 0;
-    $p_header['internal'] = 0;
-    $p_header['offset'] = 0;
-    $p_header['filename'] = $p_filename;
-// TBC : Removed    $p_header['stored_filename'] = $v_stored_filename;
-    $p_header['stored_filename'] = $p_filedescr['stored_filename'];
-    $p_header['extra'] = '';
-    $p_header['status'] = 'ok';
-    $p_header['index'] = -1;
-
-    // ----- Look for regular file
-    if ($p_filedescr['type']=='file') {
-      $p_header['external'] = 0x00000000;
-      $p_header['size'] = filesize($p_filename);
-    }
-    
-    // ----- Look for regular folder
-    else if ($p_filedescr['type']=='folder') {
-      $p_header['external'] = 0x00000010;
-      $p_header['mtime'] = filemtime($p_filename);
-      $p_header['size'] = filesize($p_filename);
-    }
-    
-    // ----- Look for virtual file
-    else if ($p_filedescr['type'] == 'virtual_file') {
-      $p_header['external'] = 0x00000000;
-      $p_header['size'] = strlen($p_filedescr['content']);
-    }
-    
-
-    // ----- Look for filetime
-    if (isset($p_filedescr['mtime'])) {
-      $p_header['mtime'] = $p_filedescr['mtime'];
-    }
-    else if ($p_filedescr['type'] == 'virtual_file') {
-      $p_header['mtime'] = time();
-    }
-    else {
-      $p_header['mtime'] = filemtime($p_filename);
-    }
-
-    // ------ Look for file comment
-    if (isset($p_filedescr['comment'])) {
-      $p_header['comment_len'] = strlen($p_filedescr['comment']);
-      $p_header['comment'] = $p_filedescr['comment'];
-    }
-    else {
-      $p_header['comment_len'] = 0;
-      $p_header['comment'] = '';
-    }
-
-    // ----- Look for pre-add callback
-    if (isset($p_options[PCLZIP_CB_PRE_ADD])) {
-
-      // ----- Generate a local information
-      $v_local_header = array();
-      $this->privConvertHeader2FileInfo($p_header, $v_local_header);
-
-      // ----- Call the callback
-      // Here I do not use call_user_func() because I need to send a reference to the
-      // header.
-//      eval('$v_result = '.$p_options[PCLZIP_CB_PRE_ADD].'(PCLZIP_CB_PRE_ADD, $v_local_header);');
-      $v_result = $p_options[PCLZIP_CB_PRE_ADD](PCLZIP_CB_PRE_ADD, $v_local_header);
-      if ($v_result == 0) {
-        // ----- Change the file status
-        $p_header['status'] = "skipped";
         $v_result = 1;
-      }
 
-      // ----- Update the informations
-      // Only some fields can be modified
-      if ($p_header['stored_filename'] != $v_local_header['stored_filename']) {
-        $p_header['stored_filename'] = PclZipUtilPathReduction($v_local_header['stored_filename']);
-      }
-    }
+        // ----- Reset the error handler
+        $this->privErrorReset();
 
-    // ----- Look for empty stored filename
-    if ($p_header['stored_filename'] == "") {
-      $p_header['status'] = "filtered";
-    }
-    
-    // ----- Check the path length
-    if (strlen($p_header['stored_filename']) > 0xFF) {
-      $p_header['status'] = 'filename_too_long';
-    }
+        // ----- Set default values
+        $v_options                            = array();
+        $v_options[PCLZIP_OPT_NO_COMPRESSION] = false;
 
-    // ----- Look if no error, or file not skipped
-    if ($p_header['status'] == 'ok') {
+        // ----- Look for variable options arguments
+        $v_size = func_num_args();
 
-      // ----- Look for a file
-      if ($p_filedescr['type'] == 'file') {
-        // ----- Look for using temporary file to zip
-        if ( (!isset($p_options[PCLZIP_OPT_TEMP_FILE_OFF])) 
-            && (isset($p_options[PCLZIP_OPT_TEMP_FILE_ON])
-                || (isset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD])
-                    && ($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] <= $p_header['size'])) ) ) {
-          $v_result = $this->privAddFileUsingTempFile($p_filedescr, $p_header, $p_options);
-          if ($v_result < PCLZIP_ERR_NO_ERROR) {
-            return $v_result;
-          }
-        }
-        
-        // ----- Use "in memory" zip algo
-        else {
+        // ----- Look for arguments
+        if ($v_size > 1) {
+            // ----- Get the arguments
+            $v_arg_list = func_get_args();
 
-        // ----- Open the source file
-        if (($v_file = @fopen($p_filename, "rb")) == 0) {
-          PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, "Unable to open file '$p_filename' in binary read mode");
-          return PclZip::errorCode();
+            // ----- Remove from the options list the first argument
+            array_shift($v_arg_list);
+            $v_size--;
+
+            // ----- Look for first arg
+            if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
+
+                // ----- Parse the options
+                $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options, array(
+                    PCLZIP_OPT_REMOVE_PATH => 'optional',
+                    PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
+                    PCLZIP_OPT_ADD_PATH => 'optional',
+                    PCLZIP_CB_PRE_ADD => 'optional',
+                    PCLZIP_CB_POST_ADD => 'optional',
+                    PCLZIP_OPT_NO_COMPRESSION => 'optional',
+                    PCLZIP_OPT_COMMENT => 'optional',
+                    PCLZIP_OPT_TEMP_FILE_THRESHOLD => 'optional',
+                    PCLZIP_OPT_TEMP_FILE_ON => 'optional',
+                    PCLZIP_OPT_TEMP_FILE_OFF => 'optional'
+                    //, PCLZIP_OPT_CRYPT => 'optional'
+                ));
+                if ($v_result != 1) {
+                    return 0;
+                }
+
+            // ----- Look for 2 args
+            // Here we need to support the first historic synopsis of the
+            // method.
+            } else {
+
+                // ----- Get the first argument
+                $v_options[PCLZIP_OPT_ADD_PATH] = $v_arg_list[0];
+
+                // ----- Look for the optional second argument
+                if ($v_size == 2) {
+                    $v_options[PCLZIP_OPT_REMOVE_PATH] = $v_arg_list[1];
+                } elseif ($v_size > 2) {
+                    PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / type of arguments");
+
+                    return 0;
+                }
+            }
         }
 
-        // ----- Read the file content
-        $v_content = @fread($v_file, $p_header['size']);
+        // ----- Look for default option values
+        $this->privOptionDefaultThreshold($v_options);
 
-        // ----- Close the file
-        @fclose($v_file);
+        // ----- Init
+        $v_string_list    = array();
+        $v_att_list       = array();
+        $v_filedescr_list = array();
+        $p_result_list    = array();
 
-        // ----- Calculate the CRC
-        $p_header['crc'] = @crc32($v_content);
-        
-        // ----- Look for no compression
-        if ($p_options[PCLZIP_OPT_NO_COMPRESSION]) {
-          // ----- Set header parameters
-          $p_header['compressed_size'] = $p_header['size'];
-          $p_header['compression'] = 0;
-        }
-        
-        // ----- Look for normal compression
-        else {
-          // ----- Compress the content
-          $v_content = @gzdeflate($v_content);
+        // ----- Look if the $p_filelist is really an array
+        if (is_array($p_filelist)) {
 
-          // ----- Set header parameters
-          $p_header['compressed_size'] = strlen($v_content);
-          $p_header['compression'] = 8;
-        }
-        
-        // ----- Call the header generation
-        if (($v_result = $this->privWriteFileHeader($p_header)) != 1) {
-          @fclose($v_file);
-          return $v_result;
+            // ----- Look if the first element is also an array
+            //       This will mean that this is a file description entry
+            if (isset($p_filelist[0]) && is_array($p_filelist[0])) {
+                $v_att_list = $p_filelist;
+
+            // ----- The list is a list of string names
+            } else {
+                $v_string_list = $p_filelist;
+            }
+
+        // ----- Look if the $p_filelist is a string
+        } elseif (is_string($p_filelist)) {
+            // ----- Create a list from the string
+            $v_string_list = explode(PCLZIP_SEPARATOR, $p_filelist);
+
+        // ----- Invalid variable type for $p_filelist
+        } else {
+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type p_filelist");
+
+            return 0;
         }
 
-        // ----- Write the compressed (or not) content
-        @fwrite($this->zip_fd, $v_content, $p_header['compressed_size']);
-
+        // ----- Reformat the string list
+        if (sizeof($v_string_list) != 0) {
+            foreach ($v_string_list as $v_string) {
+                if ($v_string != '') {
+                    $v_att_list[][PCLZIP_ATT_FILE_NAME] = $v_string;
+                } else {
+                }
+            }
         }
 
-      }
-
-      // ----- Look for a virtual file (a file from string)
-      else if ($p_filedescr['type'] == 'virtual_file') {
-          
-        $v_content = $p_filedescr['content'];
-
-        // ----- Calculate the CRC
-        $p_header['crc'] = @crc32($v_content);
-        
-        // ----- Look for no compression
-        if ($p_options[PCLZIP_OPT_NO_COMPRESSION]) {
-          // ----- Set header parameters
-          $p_header['compressed_size'] = $p_header['size'];
-          $p_header['compression'] = 0;
-        }
-        
-        // ----- Look for normal compression
-        else {
-          // ----- Compress the content
-          $v_content = @gzdeflate($v_content);
-
-          // ----- Set header parameters
-          $p_header['compressed_size'] = strlen($v_content);
-          $p_header['compression'] = 8;
-        }
-        
-        // ----- Call the header generation
-        if (($v_result = $this->privWriteFileHeader($p_header)) != 1) {
-          @fclose($v_file);
-          return $v_result;
+        // ----- For each file in the list check the attributes
+        $v_supported_attributes = array(
+            PCLZIP_ATT_FILE_NAME => 'mandatory',
+            PCLZIP_ATT_FILE_NEW_SHORT_NAME => 'optional',
+            PCLZIP_ATT_FILE_NEW_FULL_NAME => 'optional',
+            PCLZIP_ATT_FILE_MTIME => 'optional',
+            PCLZIP_ATT_FILE_CONTENT => 'optional',
+            PCLZIP_ATT_FILE_COMMENT => 'optional'
+        );
+        foreach ($v_att_list as $v_entry) {
+            $v_result = $this->privFileDescrParseAtt($v_entry, $v_filedescr_list[], $v_options, $v_supported_attributes);
+            if ($v_result != 1) {
+                return 0;
+            }
         }
 
-        // ----- Write the compressed (or not) content
-        @fwrite($this->zip_fd, $v_content, $p_header['compressed_size']);
-      }
-
-      // ----- Look for a directory
-      else if ($p_filedescr['type'] == 'folder') {
-        // ----- Look for directory last '/'
-        if (@substr($p_header['stored_filename'], -1) != '/') {
-          $p_header['stored_filename'] .= '/';
+        // ----- Expand the filelist (expand directories)
+        $v_result = $this->privFileDescrExpand($v_filedescr_list, $v_options);
+        if ($v_result != 1) {
+            return 0;
         }
 
-        // ----- Set the file properties
-        $p_header['size'] = 0;
-        //$p_header['external'] = 0x41FF0010;   // Value for a folder : to be checked
-        $p_header['external'] = 0x00000010;   // Value for a folder : to be checked
-
-        // ----- Call the header generation
-        if (($v_result = $this->privWriteFileHeader($p_header)) != 1)
-        {
-          return $v_result;
+        // ----- Call the create fct
+        $v_result = $this->privCreate($v_filedescr_list, $p_result_list, $v_options);
+        if ($v_result != 1) {
+            return 0;
         }
-      }
-    }
-
-    // ----- Look for post-add callback
-    if (isset($p_options[PCLZIP_CB_POST_ADD])) {
-
-      // ----- Generate a local information
-      $v_local_header = array();
-      $this->privConvertHeader2FileInfo($p_header, $v_local_header);
-
-      // ----- Call the callback
-      // Here I do not use call_user_func() because I need to send a reference to the
-      // header.
-//      eval('$v_result = '.$p_options[PCLZIP_CB_POST_ADD].'(PCLZIP_CB_POST_ADD, $v_local_header);');
-      $v_result = $p_options[PCLZIP_CB_POST_ADD](PCLZIP_CB_POST_ADD, $v_local_header);
-      if ($v_result == 0) {
-        // ----- Ignored
-        $v_result = 1;
-      }
-
-      // ----- Update the informations
-      // Nothing can be modified
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privAddFileUsingTempFile()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privAddFileUsingTempFile($p_filedescr, &$p_header, &$p_options)
-  {
-    $v_result=PCLZIP_ERR_NO_ERROR;
-    
-    // ----- Working variable
-    $p_filename = $p_filedescr['filename'];
-
-
-    // ----- Open the source file
-    if (($v_file = @fopen($p_filename, "rb")) == 0) {
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, "Unable to open file '$p_filename' in binary read mode");
-      return PclZip::errorCode();
-    }
-
-    // ----- Creates a compressed temporary file
-    $v_gzip_temp_name = PCLZIP_TEMPORARY_DIR.uniqid('pclzip-').'.gz';
-    if (($v_file_compressed = @gzopen($v_gzip_temp_name, "wb")) == 0) {
-      fclose($v_file);
-      PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL, 'Unable to open temporary file \''.$v_gzip_temp_name.'\' in binary write mode');
-      return PclZip::errorCode();
-    }
-
-    // ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks
-    $v_size = filesize($p_filename);
-    while ($v_size != 0) {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      $v_buffer = @fread($v_file, $v_read_size);
-      //$v_binary_data = pack('a'.$v_read_size, $v_buffer);
-      @gzputs($v_file_compressed, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
-
-    // ----- Close the file
-    @fclose($v_file);
-    @gzclose($v_file_compressed);
-
-    // ----- Check the minimum file size
-    if (filesize($v_gzip_temp_name) < 18) {
-      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'gzip temporary file \''.$v_gzip_temp_name.'\' has invalid filesize - should be minimum 18 bytes');
-      return PclZip::errorCode();
-    }
-
-    // ----- Extract the compressed attributes
-    if (($v_file_compressed = @fopen($v_gzip_temp_name, "rb")) == 0) {
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_gzip_temp_name.'\' in binary read mode');
-      return PclZip::errorCode();
-    }
-
-    // ----- Read the gzip file header
-    $v_binary_data = @fread($v_file_compressed, 10);
-    $v_data_header = unpack('a1id1/a1id2/a1cm/a1flag/Vmtime/a1xfl/a1os', $v_binary_data);
-
-    // ----- Check some parameters
-    $v_data_header['os'] = bin2hex($v_data_header['os']);
-
-    // ----- Read the gzip file footer
-    @fseek($v_file_compressed, filesize($v_gzip_temp_name)-8);
-    $v_binary_data = @fread($v_file_compressed, 8);
-    $v_data_footer = unpack('Vcrc/Vcompressed_size', $v_binary_data);
-
-    // ----- Set the attributes
-    $p_header['compression'] = ord($v_data_header['cm']);
-    //$p_header['mtime'] = $v_data_header['mtime'];
-    $p_header['crc'] = $v_data_footer['crc'];
-    $p_header['compressed_size'] = filesize($v_gzip_temp_name)-18;
-
-    // ----- Close the file
-    @fclose($v_file_compressed);
-
-    // ----- Call the header generation
-    if (($v_result = $this->privWriteFileHeader($p_header)) != 1) {
-      return $v_result;
-    }
-
-    // ----- Add the compressed data
-    if (($v_file_compressed = @fopen($v_gzip_temp_name, "rb")) == 0)
-    {
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_gzip_temp_name.'\' in binary read mode');
-      return PclZip::errorCode();
-    }
-
-    // ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks
-    fseek($v_file_compressed, 10);
-    $v_size = $p_header['compressed_size'];
-    while ($v_size != 0)
-    {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      $v_buffer = @fread($v_file_compressed, $v_read_size);
-      //$v_binary_data = pack('a'.$v_read_size, $v_buffer);
-      @fwrite($this->zip_fd, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
-
-    // ----- Close the file
-    @fclose($v_file_compressed);
-
-    // ----- Unlink the temporary file
-    @unlink($v_gzip_temp_name);
-    
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privCalculateStoredFilename()
-  // Description :
-  //   Based on file descriptor properties and global options, this method
-  //   calculate the filename that will be stored in the archive.
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privCalculateStoredFilename(&$p_filedescr, &$p_options)
-  {
-    $v_result=1;
-    
-    // ----- Working variables
-    $p_filename = $p_filedescr['filename'];
-    if (isset($p_options[PCLZIP_OPT_ADD_PATH])) {
-      $p_add_dir = $p_options[PCLZIP_OPT_ADD_PATH];
-    }
-    else {
-      $p_add_dir = '';
-    }
-    if (isset($p_options[PCLZIP_OPT_REMOVE_PATH])) {
-      $p_remove_dir = $p_options[PCLZIP_OPT_REMOVE_PATH];
-    }
-    else {
-      $p_remove_dir = '';
-    }
-    if (isset($p_options[PCLZIP_OPT_REMOVE_ALL_PATH])) {
-      $p_remove_all_dir = $p_options[PCLZIP_OPT_REMOVE_ALL_PATH];
-    }
-    else {
-      $p_remove_all_dir = 0;
-    }
-
-
-    // ----- Look for full name change
-    if (isset($p_filedescr['new_full_name'])) {
-      // ----- Remove drive letter if any
-      $v_stored_filename = PclZipUtilTranslateWinPath($p_filedescr['new_full_name']);
-    }
-    
-    // ----- Look for path and/or short name change
-    else {
-
-      // ----- Look for short name change
-      // Its when we cahnge just the filename but not the path
-      if (isset($p_filedescr['new_short_name'])) {
-        $v_path_info = pathinfo($p_filename);
-        $v_dir = '';
-        if ($v_path_info['dirname'] != '') {
-          $v_dir = $v_path_info['dirname'].'/';
-        }
-        $v_stored_filename = $v_dir.$p_filedescr['new_short_name'];
-      }
-      else {
-        // ----- Calculate the stored filename
-        $v_stored_filename = $p_filename;
-      }
-
-      // ----- Look for all path to remove
-      if ($p_remove_all_dir) {
-        $v_stored_filename = basename($p_filename);
-      }
-      // ----- Look for partial path remove
-      else if ($p_remove_dir != "") {
-        if (substr($p_remove_dir, -1) != '/')
-          $p_remove_dir .= "/";
-
-        if (   (substr($p_filename, 0, 2) == "./")
-            || (substr($p_remove_dir, 0, 2) == "./")) {
-            
-          if (   (substr($p_filename, 0, 2) == "./")
-              && (substr($p_remove_dir, 0, 2) != "./")) {
-            $p_remove_dir = "./".$p_remove_dir;
-          }
-          if (   (substr($p_filename, 0, 2) != "./")
-              && (substr($p_remove_dir, 0, 2) == "./")) {
-            $p_remove_dir = substr($p_remove_dir, 2);
-          }
-        }
-
-        $v_compare = PclZipUtilPathInclusion($p_remove_dir,
-                                             $v_stored_filename);
-        if ($v_compare > 0) {
-          if ($v_compare == 2) {
-            $v_stored_filename = "";
-          }
-          else {
-            $v_stored_filename = substr($v_stored_filename,
-                                        strlen($p_remove_dir));
-          }
-        }
-      }
-      
-      // ----- Remove drive letter if any
-      $v_stored_filename = PclZipUtilTranslateWinPath($v_stored_filename);
-      
-      // ----- Look for path to add
-      if ($p_add_dir != "") {
-        if (substr($p_add_dir, -1) == "/")
-          $v_stored_filename = $p_add_dir.$v_stored_filename;
-        else
-          $v_stored_filename = $p_add_dir."/".$v_stored_filename;
-      }
-    }
-
-    // ----- Filename (reduce the path of stored name)
-    $v_stored_filename = PclZipUtilPathReduction($v_stored_filename);
-    $p_filedescr['stored_filename'] = $v_stored_filename;
-    
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privWriteFileHeader()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privWriteFileHeader(&$p_header)
-  {
-    $v_result=1;
-
-    // ----- Store the offset position of the file
-    $p_header['offset'] = ftell($this->zip_fd);
-
-    // ----- Transform UNIX mtime to DOS format mdate/mtime
-    $v_date = getdate($p_header['mtime']);
-    $v_mtime = ($v_date['hours']<<11) + ($v_date['minutes']<<5) + $v_date['seconds']/2;
-    $v_mdate = (($v_date['year']-1980)<<9) + ($v_date['mon']<<5) + $v_date['mday'];
-
-    // ----- Packed data
-    $v_binary_data = pack("VvvvvvVVVvv", 0x04034b50,
-	                      $p_header['version_extracted'], $p_header['flag'],
-                          $p_header['compression'], $v_mtime, $v_mdate,
-                          $p_header['crc'], $p_header['compressed_size'],
-						  $p_header['size'],
-                          strlen($p_header['stored_filename']),
-						  $p_header['extra_len']);
-
-    // ----- Write the first 148 bytes of the header in the archive
-    fputs($this->zip_fd, $v_binary_data, 30);
-
-    // ----- Write the variable fields
-    if (strlen($p_header['stored_filename']) != 0)
-    {
-      fputs($this->zip_fd, $p_header['stored_filename'], strlen($p_header['stored_filename']));
-    }
-    if ($p_header['extra_len'] != 0)
-    {
-      fputs($this->zip_fd, $p_header['extra'], $p_header['extra_len']);
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privWriteCentralFileHeader()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privWriteCentralFileHeader(&$p_header)
-  {
-    $v_result=1;
-
-    // TBC
-    //for(reset($p_header); $key = key($p_header); next($p_header)) {
-    //}
-
-    // ----- Transform UNIX mtime to DOS format mdate/mtime
-    $v_date = getdate($p_header['mtime']);
-    $v_mtime = ($v_date['hours']<<11) + ($v_date['minutes']<<5) + $v_date['seconds']/2;
-    $v_mdate = (($v_date['year']-1980)<<9) + ($v_date['mon']<<5) + $v_date['mday'];
-
-
-    // ----- Packed data
-    $v_binary_data = pack("VvvvvvvVVVvvvvvVV", 0x02014b50,
-	                      $p_header['version'], $p_header['version_extracted'],
-                          $p_header['flag'], $p_header['compression'],
-						  $v_mtime, $v_mdate, $p_header['crc'],
-                          $p_header['compressed_size'], $p_header['size'],
-                          strlen($p_header['stored_filename']),
-						  $p_header['extra_len'], $p_header['comment_len'],
-                          $p_header['disk'], $p_header['internal'],
-						  $p_header['external'], $p_header['offset']);
-
-    // ----- Write the 42 bytes of the header in the zip file
-    fputs($this->zip_fd, $v_binary_data, 46);
-
-    // ----- Write the variable fields
-    if (strlen($p_header['stored_filename']) != 0)
-    {
-      fputs($this->zip_fd, $p_header['stored_filename'], strlen($p_header['stored_filename']));
-    }
-    if ($p_header['extra_len'] != 0)
-    {
-      fputs($this->zip_fd, $p_header['extra'], $p_header['extra_len']);
-    }
-    if ($p_header['comment_len'] != 0)
-    {
-      fputs($this->zip_fd, $p_header['comment'], $p_header['comment_len']);
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privWriteCentralHeader()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privWriteCentralHeader($p_nb_entries, $p_size, $p_offset, $p_comment)
-  {
-    $v_result=1;
-
-    // ----- Packed data
-    $v_binary_data = pack("VvvvvVVv", 0x06054b50, 0, 0, $p_nb_entries,
-	                      $p_nb_entries, $p_size,
-						  $p_offset, strlen($p_comment));
-
-    // ----- Write the 22 bytes of the header in the zip file
-    fputs($this->zip_fd, $v_binary_data, 22);
-
-    // ----- Write the variable fields
-    if (strlen($p_comment) != 0)
-    {
-      fputs($this->zip_fd, $p_comment, strlen($p_comment));
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privList()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privList(&$p_list)
-  {
-    $v_result=1;
-
-    // ----- Magic quotes trick
-    $this->privDisableMagicQuotes();
-
-    // ----- Open the zip file
-    if (($this->zip_fd = @fopen($this->zipname, 'rb')) == 0)
-    {
-      // ----- Magic quotes trick
-      $this->privSwapBackMagicQuotes();
-      
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \''.$this->zipname.'\' in binary read mode');
-
-      // ----- Return
-      return PclZip::errorCode();
-    }
-
-    // ----- Read the central directory informations
-    $v_central_dir = array();
-    if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
-    {
-      $this->privSwapBackMagicQuotes();
-      return $v_result;
-    }
-
-    // ----- Go to beginning of Central Dir
-    @rewind($this->zip_fd);
-    if (@fseek($this->zip_fd, $v_central_dir['offset']))
-    {
-      $this->privSwapBackMagicQuotes();
-
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
-
-      // ----- Return
-      return PclZip::errorCode();
-    }
-
-    // ----- Read each entry
-    for ($i=0; $i<$v_central_dir['entries']; $i++)
-    {
-      // ----- Read the file header
-      if (($v_result = $this->privReadCentralFileHeader($v_header)) != 1)
-      {
-        $this->privSwapBackMagicQuotes();
-        return $v_result;
-      }
-      $v_header['index'] = $i;
-
-      // ----- Get the only interesting attributes
-      $this->privConvertHeader2FileInfo($v_header, $p_list[$i]);
-      unset($v_header);
-    }
-
-    // ----- Close the zip file
-    $this->privCloseFd();
-
-    // ----- Magic quotes trick
-    $this->privSwapBackMagicQuotes();
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privConvertHeader2FileInfo()
-  // Description :
-  //   This function takes the file informations from the central directory
-  //   entries and extract the interesting parameters that will be given back.
-  //   The resulting file infos are set in the array $p_info
-  //     $p_info['filename'] : Filename with full path. Given by user (add),
-  //                           extracted in the filesystem (extract).
-  //     $p_info['stored_filename'] : Stored filename in the archive.
-  //     $p_info['size'] = Size of the file.
-  //     $p_info['compressed_size'] = Compressed size of the file.
-  //     $p_info['mtime'] = Last modification date of the file.
-  //     $p_info['comment'] = Comment associated with the file.
-  //     $p_info['folder'] = true/false : indicates if the entry is a folder or not.
-  //     $p_info['status'] = status of the action on the file.
-  //     $p_info['crc'] = CRC of the file content.
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privConvertHeader2FileInfo($p_header, &$p_info)
-  {
-    $v_result=1;
-
-    // ----- Get the interesting attributes
-    $v_temp_path = PclZipUtilPathReduction($p_header['filename']);
-    $p_info['filename'] = $v_temp_path;
-    $v_temp_path = PclZipUtilPathReduction($p_header['stored_filename']);
-    $p_info['stored_filename'] = $v_temp_path;
-    $p_info['size'] = $p_header['size'];
-    $p_info['compressed_size'] = $p_header['compressed_size'];
-    $p_info['mtime'] = $p_header['mtime'];
-    $p_info['comment'] = $p_header['comment'];
-    $p_info['folder'] = (($p_header['external']&0x00000010)==0x00000010);
-    $p_info['index'] = $p_header['index'];
-    $p_info['status'] = $p_header['status'];
-    $p_info['crc'] = $p_header['crc'];
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privExtractByRule()
-  // Description :
-  //   Extract a file or directory depending of rules (by index, by name, ...)
-  // Parameters :
-  //   $p_file_list : An array where will be placed the properties of each
-  //                  extracted file
-  //   $p_path : Path to add while writing the extracted files
-  //   $p_remove_path : Path to remove (from the file memorized path) while writing the
-  //                    extracted files. If the path does not match the file path,
-  //                    the file is extracted with its memorized path.
-  //                    $p_remove_path does not apply to 'list' mode.
-  //                    $p_path and $p_remove_path are commulative.
-  // Return Values :
-  //   1 on success,0 or less on error (see error code list)
-  // --------------------------------------------------------------------------------
-  function privExtractByRule(&$p_file_list, $p_path, $p_remove_path, $p_remove_all_path, &$p_options)
-  {
-    $v_result=1;
-
-    // ----- Magic quotes trick
-    $this->privDisableMagicQuotes();
-
-    // ----- Check the path
-    if (   ($p_path == "")
-	    || (   (substr($p_path, 0, 1) != "/")
-		    && (substr($p_path, 0, 3) != "../")
-			&& (substr($p_path,1,2)!=":/")))
-      $p_path = "./".$p_path;
-
-    // ----- Reduce the path last (and duplicated) '/'
-    if (($p_path != "./") && ($p_path != "/"))
-    {
-      // ----- Look for the path end '/'
-      while (substr($p_path, -1) == "/")
-      {
-        $p_path = substr($p_path, 0, strlen($p_path)-1);
-      }
-    }
-
-    // ----- Look for path to remove format (should end by /)
-    if (($p_remove_path != "") && (substr($p_remove_path, -1) != '/'))
-    {
-      $p_remove_path .= '/';
-    }
-    $p_remove_path_size = strlen($p_remove_path);
-
-    // ----- Open the zip file
-    if (($v_result = $this->privOpenFd('rb')) != 1)
-    {
-      $this->privSwapBackMagicQuotes();
-      return $v_result;
-    }
-
-    // ----- Read the central directory informations
-    $v_central_dir = array();
-    if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
-    {
-      // ----- Close the zip file
-      $this->privCloseFd();
-      $this->privSwapBackMagicQuotes();
-
-      return $v_result;
-    }
-
-    // ----- Start at beginning of Central Dir
-    $v_pos_entry = $v_central_dir['offset'];
-
-    // ----- Read each entry
-    $j_start = 0;
-    for ($i=0, $v_nb_extracted=0; $i<$v_central_dir['entries']; $i++)
-    {
-
-      // ----- Read next Central dir entry
-      @rewind($this->zip_fd);
-      if (@fseek($this->zip_fd, $v_pos_entry))
-      {
-        // ----- Close the zip file
-        $this->privCloseFd();
-        $this->privSwapBackMagicQuotes();
-
-        // ----- Error log
-        PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
 
         // ----- Return
-        return PclZip::errorCode();
-      }
-
-      // ----- Read the file header
-      $v_header = array();
-      if (($v_result = $this->privReadCentralFileHeader($v_header)) != 1)
-      {
-        // ----- Close the zip file
-        $this->privCloseFd();
-        $this->privSwapBackMagicQuotes();
-
-        return $v_result;
-      }
-
-      // ----- Store the index
-      $v_header['index'] = $i;
-
-      // ----- Store the file position
-      $v_pos_entry = ftell($this->zip_fd);
-
-      // ----- Look for the specific extract rules
-      $v_extract = false;
-
-      // ----- Look for extract by name rule
-      if (   (isset($p_options[PCLZIP_OPT_BY_NAME]))
-          && ($p_options[PCLZIP_OPT_BY_NAME] != 0)) {
-
-          // ----- Look if the filename is in the list
-          for ($j=0; ($j<sizeof($p_options[PCLZIP_OPT_BY_NAME])) && (!$v_extract); $j++) {
-
-              // ----- Look for a directory
-              if (substr($p_options[PCLZIP_OPT_BY_NAME][$j], -1) == "/") {
-
-                  // ----- Look if the directory is in the filename path
-                  if (   (strlen($v_header['stored_filename']) > strlen($p_options[PCLZIP_OPT_BY_NAME][$j]))
-                      && (substr($v_header['stored_filename'], 0, strlen($p_options[PCLZIP_OPT_BY_NAME][$j])) == $p_options[PCLZIP_OPT_BY_NAME][$j])) {
-                      $v_extract = true;
-                  }
-              }
-              // ----- Look for a filename
-              elseif ($v_header['stored_filename'] == $p_options[PCLZIP_OPT_BY_NAME][$j]) {
-                  $v_extract = true;
-              }
-          }
-      }
-
-      // ----- Look for extract by ereg rule
-      // ereg() is deprecated with PHP 5.3
-      /* 
-      else if (   (isset($p_options[PCLZIP_OPT_BY_EREG]))
-               && ($p_options[PCLZIP_OPT_BY_EREG] != "")) {
-
-          if (ereg($p_options[PCLZIP_OPT_BY_EREG], $v_header['stored_filename'])) {
-              $v_extract = true;
-          }
-      }
-      */
-
-      // ----- Look for extract by preg rule
-      else if (   (isset($p_options[PCLZIP_OPT_BY_PREG]))
-               && ($p_options[PCLZIP_OPT_BY_PREG] != "")) {
-
-          if (preg_match($p_options[PCLZIP_OPT_BY_PREG], $v_header['stored_filename'])) {
-              $v_extract = true;
-          }
-      }
-
-      // ----- Look for extract by index rule
-      else if (   (isset($p_options[PCLZIP_OPT_BY_INDEX]))
-               && ($p_options[PCLZIP_OPT_BY_INDEX] != 0)) {
-          
-          // ----- Look if the index is in the list
-          for ($j=$j_start; ($j<sizeof($p_options[PCLZIP_OPT_BY_INDEX])) && (!$v_extract); $j++) {
-
-              if (($i>=$p_options[PCLZIP_OPT_BY_INDEX][$j]['start']) && ($i<=$p_options[PCLZIP_OPT_BY_INDEX][$j]['end'])) {
-                  $v_extract = true;
-              }
-              if ($i>=$p_options[PCLZIP_OPT_BY_INDEX][$j]['end']) {
-                  $j_start = $j+1;
-              }
-
-              if ($p_options[PCLZIP_OPT_BY_INDEX][$j]['start']>$i) {
-                  break;
-              }
-          }
-      }
-
-      // ----- Look for no rule, which means extract all the archive
-      else {
-          $v_extract = true;
-      }
-
-	  // ----- Check compression method
-	  if (   ($v_extract)
-	      && (   ($v_header['compression'] != 8)
-		      && ($v_header['compression'] != 0))) {
-          $v_header['status'] = 'unsupported_compression';
-
-          // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
-          if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
-		      && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
-
-              $this->privSwapBackMagicQuotes();
-              
-              PclZip::privErrorLog(PCLZIP_ERR_UNSUPPORTED_COMPRESSION,
-			                       "Filename '".$v_header['stored_filename']."' is "
-				  	    	  	   ."compressed by an unsupported compression "
-				  	    	  	   ."method (".$v_header['compression'].") ");
-
-              return PclZip::errorCode();
-		  }
-	  }
-	  
-	  // ----- Check encrypted files
-	  if (($v_extract) && (($v_header['flag'] & 1) == 1)) {
-          $v_header['status'] = 'unsupported_encryption';
-
-          // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
-          if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
-		      && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
-
-              $this->privSwapBackMagicQuotes();
-
-              PclZip::privErrorLog(PCLZIP_ERR_UNSUPPORTED_ENCRYPTION,
-			                       "Unsupported encryption for "
-				  	    	  	   ." filename '".$v_header['stored_filename']
-								   ."'");
-
-              return PclZip::errorCode();
-		  }
+        return $p_result_list;
     }
+    // --------------------------------------------------------------------------------
 
-      // ----- Look for real extraction
-      if (($v_extract) && ($v_header['status'] != 'ok')) {
-          $v_result = $this->privConvertHeader2FileInfo($v_header,
-		                                        $p_file_list[$v_nb_extracted++]);
-          if ($v_result != 1) {
-              $this->privCloseFd();
-              $this->privSwapBackMagicQuotes();
-              return $v_result;
-          }
-
-          $v_extract = false;
-      }
-      
-      // ----- Look for real extraction
-      if ($v_extract)
-      {
-
-        // ----- Go to the file position
-        @rewind($this->zip_fd);
-        if (@fseek($this->zip_fd, $v_header['offset']))
-        {
-          // ----- Close the zip file
-          $this->privCloseFd();
-
-          $this->privSwapBackMagicQuotes();
-
-          // ----- Error log
-          PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
-
-          // ----- Return
-          return PclZip::errorCode();
-        }
-
-        // ----- Look for extraction as string
-        if ($p_options[PCLZIP_OPT_EXTRACT_AS_STRING]) {
-
-          $v_string = '';
-
-          // ----- Extracting the file
-          $v_result1 = $this->privExtractFileAsString($v_header, $v_string, $p_options);
-          if ($v_result1 < 1) {
-            $this->privCloseFd();
-            $this->privSwapBackMagicQuotes();
-            return $v_result1;
-          }
-
-          // ----- Get the only interesting attributes
-          if (($v_result = $this->privConvertHeader2FileInfo($v_header, $p_file_list[$v_nb_extracted])) != 1)
-          {
-            // ----- Close the zip file
-            $this->privCloseFd();
-            $this->privSwapBackMagicQuotes();
-
-            return $v_result;
-          }
-
-          // ----- Set the file content
-          $p_file_list[$v_nb_extracted]['content'] = $v_string;
-
-          // ----- Next extracted file
-          $v_nb_extracted++;
-          
-          // ----- Look for user callback abort
-          if ($v_result1 == 2) {
-          	break;
-          }
-        }
-        // ----- Look for extraction in standard output
-        elseif (   (isset($p_options[PCLZIP_OPT_EXTRACT_IN_OUTPUT]))
-		        && ($p_options[PCLZIP_OPT_EXTRACT_IN_OUTPUT])) {
-          // ----- Extracting the file in standard output
-          $v_result1 = $this->privExtractFileInOutput($v_header, $p_options);
-          if ($v_result1 < 1) {
-            $this->privCloseFd();
-            $this->privSwapBackMagicQuotes();
-            return $v_result1;
-          }
-
-          // ----- Get the only interesting attributes
-          if (($v_result = $this->privConvertHeader2FileInfo($v_header, $p_file_list[$v_nb_extracted++])) != 1) {
-            $this->privCloseFd();
-            $this->privSwapBackMagicQuotes();
-            return $v_result;
-          }
-
-          // ----- Look for user callback abort
-          if ($v_result1 == 2) {
-          	break;
-          }
-        }
-        // ----- Look for normal extraction
-        else {
-          // ----- Extracting the file
-          $v_result1 = $this->privExtractFile($v_header,
-		                                      $p_path, $p_remove_path,
-											  $p_remove_all_path,
-											  $p_options);
-          if ($v_result1 < 1) {
-            $this->privCloseFd();
-            $this->privSwapBackMagicQuotes();
-            return $v_result1;
-          }
-
-          // ----- Get the only interesting attributes
-          if (($v_result = $this->privConvertHeader2FileInfo($v_header, $p_file_list[$v_nb_extracted++])) != 1)
-          {
-            // ----- Close the zip file
-            $this->privCloseFd();
-            $this->privSwapBackMagicQuotes();
-
-            return $v_result;
-          }
-
-          // ----- Look for user callback abort
-          if ($v_result1 == 2) {
-          	break;
-          }
-        }
-      }
-    }
-
-    // ----- Close the zip file
-    $this->privCloseFd();
-    $this->privSwapBackMagicQuotes();
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privExtractFile()
-  // Description :
-  // Parameters :
-  // Return Values :
-  //
-  // 1 : ... ?
-  // PCLZIP_ERR_USER_ABORTED(2) : User ask for extraction stop in callback
-  // --------------------------------------------------------------------------------
-  function privExtractFile(&$p_entry, $p_path, $p_remove_path, $p_remove_all_path, &$p_options)
-  {
-    $v_result=1;
-
-    // ----- Read the file header
-    if (($v_result = $this->privReadFileHeader($v_header)) != 1)
+    // --------------------------------------------------------------------------------
+    // Function :
+    //   add($p_filelist, $p_add_dir="", $p_remove_dir="")
+    //   add($p_filelist, $p_option, $p_option_value, ...)
+    // Description :
+    //   This method supports two synopsis. The first one is historical.
+    //   This methods add the list of files in an existing archive.
+    //   If a file with the same name already exists, it is added at the end of the
+    //   archive, the first one is still present.
+    //   If the archive does not exist, it is created.
+    // Parameters :
+    //   $p_filelist : An array containing file or directory names, or
+    //                 a string containing one filename or one directory name, or
+    //                 a string containing a list of filenames and/or directory
+    //                 names separated by spaces.
+    //   $p_add_dir : A path to add before the real path of the archived file,
+    //                in order to have it memorized in the archive.
+    //   $p_remove_dir : A path to remove from the real path of the file to archive,
+    //                   in order to have a shorter path memorized in the archive.
+    //                   When $p_add_dir and $p_remove_dir are set, $p_remove_dir
+    //                   is removed first, before $p_add_dir is added.
+    // Options :
+    //   PCLZIP_OPT_ADD_PATH :
+    //   PCLZIP_OPT_REMOVE_PATH :
+    //   PCLZIP_OPT_REMOVE_ALL_PATH :
+    //   PCLZIP_OPT_COMMENT :
+    //   PCLZIP_OPT_ADD_COMMENT :
+    //   PCLZIP_OPT_PREPEND_COMMENT :
+    //   PCLZIP_CB_PRE_ADD :
+    //   PCLZIP_CB_POST_ADD :
+    // Return Values :
+    //   0 on failure,
+    //   The list of the added files, with a status of the add action.
+    //   (see PclZip::listContent() for list entry format)
+    // --------------------------------------------------------------------------------
+    public function add($p_filelist)
     {
-      // ----- Return
-      return $v_result;
-    }
+        $v_result = 1;
 
+        // ----- Reset the error handler
+        $this->privErrorReset();
 
-    // ----- Check that the file header is coherent with $p_entry info
-    if ($this->privCheckFileHeaders($v_header, $p_entry) != 1) {
-        // TBC
-    }
+        // ----- Set default values
+        $v_options                            = array();
+        $v_options[PCLZIP_OPT_NO_COMPRESSION] = false;
 
-    // ----- Look for all path to remove
-    if ($p_remove_all_path == true) {
-        // ----- Look for folder entry that not need to be extracted
-        if (($p_entry['external']&0x00000010)==0x00000010) {
+        // ----- Look for variable options arguments
+        $v_size = func_num_args();
 
-            $p_entry['status'] = "filtered";
+        // ----- Look for arguments
+        if ($v_size > 1) {
+            // ----- Get the arguments
+            $v_arg_list = func_get_args();
 
-            return $v_result;
+            // ----- Remove form the options list the first argument
+            array_shift($v_arg_list);
+            $v_size--;
+
+            // ----- Look for first arg
+            if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
+
+                // ----- Parse the options
+                $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options, array(
+                    PCLZIP_OPT_REMOVE_PATH => 'optional',
+                    PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
+                    PCLZIP_OPT_ADD_PATH => 'optional',
+                    PCLZIP_CB_PRE_ADD => 'optional',
+                    PCLZIP_CB_POST_ADD => 'optional',
+                    PCLZIP_OPT_NO_COMPRESSION => 'optional',
+                    PCLZIP_OPT_COMMENT => 'optional',
+                    PCLZIP_OPT_ADD_COMMENT => 'optional',
+                    PCLZIP_OPT_PREPEND_COMMENT => 'optional',
+                    PCLZIP_OPT_TEMP_FILE_THRESHOLD => 'optional',
+                    PCLZIP_OPT_TEMP_FILE_ON => 'optional',
+                    PCLZIP_OPT_TEMP_FILE_OFF => 'optional'
+                    //, PCLZIP_OPT_CRYPT => 'optional'
+                ));
+                if ($v_result != 1) {
+                    return 0;
+                }
+
+            // ----- Look for 2 args
+            // Here we need to support the first historic synopsis of the
+            // method.
+            } else {
+
+                // ----- Get the first argument
+                $v_options[PCLZIP_OPT_ADD_PATH] = $v_add_path = $v_arg_list[0];
+
+                // ----- Look for the optional second argument
+                if ($v_size == 2) {
+                    $v_options[PCLZIP_OPT_REMOVE_PATH] = $v_arg_list[1];
+                } elseif ($v_size > 2) {
+                    // ----- Error log
+                    PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / type of arguments");
+
+                    // ----- Return
+                    return 0;
+                }
+            }
         }
 
-        // ----- Get the basename of the path
-        $p_entry['filename'] = basename($p_entry['filename']);
-    }
+        // ----- Look for default option values
+        $this->privOptionDefaultThreshold($v_options);
 
-    // ----- Look for path to remove
-    else if ($p_remove_path != "")
-    {
-      if (PclZipUtilPathInclusion($p_remove_path, $p_entry['filename']) == 2)
-      {
+        // ----- Init
+        $v_string_list    = array();
+        $v_att_list       = array();
+        $v_filedescr_list = array();
+        $p_result_list    = array();
 
-        // ----- Change the file status
-        $p_entry['status'] = "filtered";
+        // ----- Look if the $p_filelist is really an array
+        if (is_array($p_filelist)) {
+
+            // ----- Look if the first element is also an array
+            //       This will mean that this is a file description entry
+            if (isset($p_filelist[0]) && is_array($p_filelist[0])) {
+                $v_att_list = $p_filelist;
+
+            // ----- The list is a list of string names
+            } else {
+                $v_string_list = $p_filelist;
+            }
+
+        // ----- Look if the $p_filelist is a string
+        } elseif (is_string($p_filelist)) {
+            // ----- Create a list from the string
+            $v_string_list = explode(PCLZIP_SEPARATOR, $p_filelist);
+
+        // ----- Invalid variable type for $p_filelist
+        } else {
+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type '" . gettype($p_filelist) . "' for p_filelist");
+
+            return 0;
+        }
+
+        // ----- Reformat the string list
+        if (sizeof($v_string_list) != 0) {
+            foreach ($v_string_list as $v_string) {
+                $v_att_list[][PCLZIP_ATT_FILE_NAME] = $v_string;
+            }
+        }
+
+        // ----- For each file in the list check the attributes
+        $v_supported_attributes = array(
+            PCLZIP_ATT_FILE_NAME => 'mandatory',
+            PCLZIP_ATT_FILE_NEW_SHORT_NAME => 'optional',
+            PCLZIP_ATT_FILE_NEW_FULL_NAME => 'optional',
+            PCLZIP_ATT_FILE_MTIME => 'optional',
+            PCLZIP_ATT_FILE_CONTENT => 'optional',
+            PCLZIP_ATT_FILE_COMMENT => 'optional'
+        );
+        foreach ($v_att_list as $v_entry) {
+            $v_result = $this->privFileDescrParseAtt($v_entry, $v_filedescr_list[], $v_options, $v_supported_attributes);
+            if ($v_result != 1) {
+                return 0;
+            }
+        }
+
+        // ----- Expand the filelist (expand directories)
+        $v_result = $this->privFileDescrExpand($v_filedescr_list, $v_options);
+        if ($v_result != 1) {
+            return 0;
+        }
+
+        // ----- Call the create fct
+        $v_result = $this->privAdd($v_filedescr_list, $p_result_list, $v_options);
+        if ($v_result != 1) {
+            return 0;
+        }
 
         // ----- Return
-        return $v_result;
-      }
-
-      $p_remove_path_size = strlen($p_remove_path);
-      if (substr($p_entry['filename'], 0, $p_remove_path_size) == $p_remove_path)
-      {
-
-        // ----- Remove the path
-        $p_entry['filename'] = substr($p_entry['filename'], $p_remove_path_size);
-
-      }
+        return $p_result_list;
     }
+    // --------------------------------------------------------------------------------
 
-    // ----- Add the path
-    if ($p_path != '') {
-      $p_entry['filename'] = $p_path."/".$p_entry['filename'];
-    }
-    
-    // ----- Check a base_dir_restriction
-    if (isset($p_options[PCLZIP_OPT_EXTRACT_DIR_RESTRICTION])) {
-      $v_inclusion
-      = PclZipUtilPathInclusion($p_options[PCLZIP_OPT_EXTRACT_DIR_RESTRICTION],
-                                $p_entry['filename']); 
-      if ($v_inclusion == 0) {
-
-        PclZip::privErrorLog(PCLZIP_ERR_DIRECTORY_RESTRICTION,
-			                     "Filename '".$p_entry['filename']."' is "
-								 ."outside PCLZIP_OPT_EXTRACT_DIR_RESTRICTION");
-
-        return PclZip::errorCode();
-      }
-    }
-
-    // ----- Look for pre-extract callback
-    if (isset($p_options[PCLZIP_CB_PRE_EXTRACT])) {
-
-      // ----- Generate a local information
-      $v_local_header = array();
-      $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
-
-      // ----- Call the callback
-      // Here I do not use call_user_func() because I need to send a reference to the
-      // header.
-//      eval('$v_result = '.$p_options[PCLZIP_CB_PRE_EXTRACT].'(PCLZIP_CB_PRE_EXTRACT, $v_local_header);');
-      $v_result = $p_options[PCLZIP_CB_PRE_EXTRACT](PCLZIP_CB_PRE_EXTRACT, $v_local_header);
-      if ($v_result == 0) {
-        // ----- Change the file status
-        $p_entry['status'] = "skipped";
-        $v_result = 1;
-      }
-      
-      // ----- Look for abort result
-      if ($v_result == 2) {
-        // ----- This status is internal and will be changed in 'skipped'
-        $p_entry['status'] = "aborted";
-      	$v_result = PCLZIP_ERR_USER_ABORTED;
-      }
-
-      // ----- Update the informations
-      // Only some fields can be modified
-      $p_entry['filename'] = $v_local_header['filename'];
-    }
-
-
-    // ----- Look if extraction should be done
-    if ($p_entry['status'] == 'ok') {
-
-    // ----- Look for specific actions while the file exist
-    if (file_exists($p_entry['filename']))
+    // --------------------------------------------------------------------------------
+    // Function : listContent()
+    // Description :
+    //   This public method, gives the list of the files and directories, with their
+    //   properties.
+    //   The properties of each entries in the list are (used also in other functions) :
+    //     filename : Name of the file. For a create or add action it is the filename
+    //                given by the user. For an extract function it is the filename
+    //                of the extracted file.
+    //     stored_filename : Name of the file / directory stored in the archive.
+    //     size : Size of the stored file.
+    //     compressed_size : Size of the file's data compressed in the archive
+    //                       (without the headers overhead)
+    //     mtime : Last known modification date of the file (UNIX timestamp)
+    //     comment : Comment associated with the file
+    //     folder : true | false
+    //     index : index of the file in the archive
+    //     status : status of the action (depending of the action) :
+    //              Values are :
+    //                ok : OK !
+    //                filtered : the file / dir is not extracted (filtered by user)
+    //                already_a_directory : the file can not be extracted because a
+    //                                      directory with the same name already exists
+    //                write_protected : the file can not be extracted because a file
+    //                                  with the same name already exists and is
+    //                                  write protected
+    //                newer_exist : the file was not extracted because a newer file exists
+    //                path_creation_fail : the file is not extracted because the folder
+    //                                     does not exist and can not be created
+    //                write_error : the file was not extracted because there was a
+    //                              error while writing the file
+    //                read_error : the file was not extracted because there was a error
+    //                             while reading the file
+    //                invalid_header : the file was not extracted because of an archive
+    //                                 format error (bad file header)
+    //   Note that each time a method can continue operating when there
+    //   is an action error on a file, the error is only logged in the file status.
+    // Return Values :
+    //   0 on an unrecoverable failure,
+    //   The list of the files in the archive.
+    // --------------------------------------------------------------------------------
+    public function listContent()
     {
-
-      // ----- Look if file is a directory
-      if (is_dir($p_entry['filename']))
-      {
-
-        // ----- Change the file status
-        $p_entry['status'] = "already_a_directory";
-        
-        // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
-        // For historical reason first PclZip implementation does not stop
-        // when this kind of error occurs.
-        if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
-		    && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
-
-            PclZip::privErrorLog(PCLZIP_ERR_ALREADY_A_DIRECTORY,
-			                     "Filename '".$p_entry['filename']."' is "
-								 ."already used by an existing directory");
-
-            return PclZip::errorCode();
-		    }
-      }
-      // ----- Look if file is write protected
-      else if (!is_writeable($p_entry['filename']))
-      {
-
-        // ----- Change the file status
-        $p_entry['status'] = "write_protected";
-
-        // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
-        // For historical reason first PclZip implementation does not stop
-        // when this kind of error occurs.
-        if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
-		    && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
-
-            PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL,
-			                     "Filename '".$p_entry['filename']."' exists "
-								 ."and is write protected");
-
-            return PclZip::errorCode();
-		    }
-      }
-
-      // ----- Look if the extracted file is older
-      else if (filemtime($p_entry['filename']) > $p_entry['mtime'])
-      {
-        // ----- Change the file status
-        if (   (isset($p_options[PCLZIP_OPT_REPLACE_NEWER]))
-		    && ($p_options[PCLZIP_OPT_REPLACE_NEWER]===true)) {
-	  	  }
-		    else {
-            $p_entry['status'] = "newer_exist";
-
-            // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
-            // For historical reason first PclZip implementation does not stop
-            // when this kind of error occurs.
-            if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
-		        && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
-
-                PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL,
-			             "Newer version of '".$p_entry['filename']."' exists "
-					    ."and option PCLZIP_OPT_REPLACE_NEWER is not selected");
-
-                return PclZip::errorCode();
-		      }
-		    }
-      }
-      else {
-      }
-    }
-
-    // ----- Check the directory availability and create it if necessary
-    else {
-      if ((($p_entry['external']&0x00000010)==0x00000010) || (substr($p_entry['filename'], -1) == '/'))
-        $v_dir_to_check = $p_entry['filename'];
-      else if (!strstr($p_entry['filename'], "/"))
-        $v_dir_to_check = "";
-      else
-        $v_dir_to_check = dirname($p_entry['filename']);
-
-        if (($v_result = $this->privDirCheck($v_dir_to_check, (($p_entry['external']&0x00000010)==0x00000010))) != 1) {
-  
-          // ----- Change the file status
-          $p_entry['status'] = "path_creation_fail";
-  
-          // ----- Return
-          //return $v_result;
-          $v_result = 1;
-        }
-      }
-    }
-
-    // ----- Look if extraction should be done
-    if ($p_entry['status'] == 'ok') {
-
-      // ----- Do the extraction (if not a folder)
-      if (!(($p_entry['external']&0x00000010)==0x00000010))
-      {
-        // ----- Look for not compressed file
-        if ($p_entry['compression'] == 0) {
-
-    		  // ----- Opening destination file
-          if (($v_dest_file = @fopen($p_entry['filename'], 'wb')) == 0)
-          {
-
-            // ----- Change the file status
-            $p_entry['status'] = "write_error";
-
-            // ----- Return
-            return $v_result;
-          }
-
-
-          // ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks
-          $v_size = $p_entry['compressed_size'];
-          while ($v_size != 0)
-          {
-            $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-            $v_buffer = @fread($this->zip_fd, $v_read_size);
-            /* Try to speed up the code
-            $v_binary_data = pack('a'.$v_read_size, $v_buffer);
-            @fwrite($v_dest_file, $v_binary_data, $v_read_size);
-            */
-            @fwrite($v_dest_file, $v_buffer, $v_read_size);            
-            $v_size -= $v_read_size;
-          }
-
-          // ----- Closing the destination file
-          fclose($v_dest_file);
-
-          // ----- Change the file mtime
-          touch($p_entry['filename'], $p_entry['mtime']);
-          
-
-        }
-        else {
-          // ----- TBC
-          // Need to be finished
-          if (($p_entry['flag'] & 1) == 1) {
-            PclZip::privErrorLog(PCLZIP_ERR_UNSUPPORTED_ENCRYPTION, 'File \''.$p_entry['filename'].'\' is encrypted. Encrypted files are not supported.');
-            return PclZip::errorCode();
-          }
-
-
-          // ----- Look for using temporary file to unzip
-          if ( (!isset($p_options[PCLZIP_OPT_TEMP_FILE_OFF])) 
-              && (isset($p_options[PCLZIP_OPT_TEMP_FILE_ON])
-                  || (isset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD])
-                      && ($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] <= $p_entry['size'])) ) ) {
-            $v_result = $this->privExtractFileUsingTempFile($p_entry, $p_options);
-            if ($v_result < PCLZIP_ERR_NO_ERROR) {
-              return $v_result;
-            }
-          }
-          
-          // ----- Look for extract in memory
-          else {
-
-          
-            // ----- Read the compressed file in a buffer (one shot)
-            $v_buffer = @fread($this->zip_fd, $p_entry['compressed_size']);
-            
-            // ----- Decompress the file
-            $v_file_content = @gzinflate($v_buffer);
-            unset($v_buffer);
-            if ($v_file_content === FALSE) {
-  
-              // ----- Change the file status
-              // TBC
-              $p_entry['status'] = "error";
-              
-              return $v_result;
-            }
-            
-            // ----- Opening destination file
-            if (($v_dest_file = @fopen($p_entry['filename'], 'wb')) == 0) {
-  
-              // ----- Change the file status
-              $p_entry['status'] = "write_error";
-  
-              return $v_result;
-            }
-  
-            // ----- Write the uncompressed data
-            @fwrite($v_dest_file, $v_file_content, $p_entry['size']);
-            unset($v_file_content);
-  
-            // ----- Closing the destination file
-            @fclose($v_dest_file);
-            
-          }
-
-          // ----- Change the file mtime
-          @touch($p_entry['filename'], $p_entry['mtime']);
-        }
-
-        // ----- Look for chmod option
-        if (isset($p_options[PCLZIP_OPT_SET_CHMOD])) {
-
-          // ----- Change the mode of the file
-          @chmod($p_entry['filename'], $p_options[PCLZIP_OPT_SET_CHMOD]);
-        }
-
-      }
-    }
-
-  	// ----- Change abort status
-  	if ($p_entry['status'] == "aborted") {
-        $p_entry['status'] = "skipped";
-  	}
-	
-    // ----- Look for post-extract callback
-    elseif (isset($p_options[PCLZIP_CB_POST_EXTRACT])) {
-
-      // ----- Generate a local information
-      $v_local_header = array();
-      $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
-
-      // ----- Call the callback
-      // Here I do not use call_user_func() because I need to send a reference to the
-      // header.
-//      eval('$v_result = '.$p_options[PCLZIP_CB_POST_EXTRACT].'(PCLZIP_CB_POST_EXTRACT, $v_local_header);');
-      $v_result = $p_options[PCLZIP_CB_POST_EXTRACT](PCLZIP_CB_POST_EXTRACT, $v_local_header);
-
-      // ----- Look for abort result
-      if ($v_result == 2) {
-      	$v_result = PCLZIP_ERR_USER_ABORTED;
-      }
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privExtractFileUsingTempFile()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privExtractFileUsingTempFile(&$p_entry, &$p_options)
-  {
-    $v_result=1;
-        
-    // ----- Creates a temporary file
-    $v_gzip_temp_name = PCLZIP_TEMPORARY_DIR.uniqid('pclzip-').'.gz';
-    if (($v_dest_file = @fopen($v_gzip_temp_name, "wb")) == 0) {
-      fclose($v_file);
-      PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL, 'Unable to open temporary file \''.$v_gzip_temp_name.'\' in binary write mode');
-      return PclZip::errorCode();
-    }
-
-
-    // ----- Write gz file format header
-    $v_binary_data = pack('va1a1Va1a1', 0x8b1f, Chr($p_entry['compression']), Chr(0x00), time(), Chr(0x00), Chr(3));
-    @fwrite($v_dest_file, $v_binary_data, 10);
-
-    // ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks
-    $v_size = $p_entry['compressed_size'];
-    while ($v_size != 0)
-    {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      $v_buffer = @fread($this->zip_fd, $v_read_size);
-      //$v_binary_data = pack('a'.$v_read_size, $v_buffer);
-      @fwrite($v_dest_file, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
-
-    // ----- Write gz file format footer
-    $v_binary_data = pack('VV', $p_entry['crc'], $p_entry['size']);
-    @fwrite($v_dest_file, $v_binary_data, 8);
-
-    // ----- Close the temporary file
-    @fclose($v_dest_file);
-
-    // ----- Opening destination file
-    if (($v_dest_file = @fopen($p_entry['filename'], 'wb')) == 0) {
-      $p_entry['status'] = "write_error";
-      return $v_result;
-    }
-
-    // ----- Open the temporary gz file
-    if (($v_src_file = @gzopen($v_gzip_temp_name, 'rb')) == 0) {
-      @fclose($v_dest_file);
-      $p_entry['status'] = "read_error";
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_gzip_temp_name.'\' in binary read mode');
-      return PclZip::errorCode();
-    }
-
-
-    // ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks
-    $v_size = $p_entry['size'];
-    while ($v_size != 0) {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      $v_buffer = @gzread($v_src_file, $v_read_size);
-      //$v_binary_data = pack('a'.$v_read_size, $v_buffer);
-      @fwrite($v_dest_file, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
-    @fclose($v_dest_file);
-    @gzclose($v_src_file);
-
-    // ----- Delete the temporary file
-    @unlink($v_gzip_temp_name);
-    
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privExtractFileInOutput()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privExtractFileInOutput(&$p_entry, &$p_options)
-  {
-    $v_result=1;
-
-    // ----- Read the file header
-    if (($v_result = $this->privReadFileHeader($v_header)) != 1) {
-      return $v_result;
-    }
-
-
-    // ----- Check that the file header is coherent with $p_entry info
-    if ($this->privCheckFileHeaders($v_header, $p_entry) != 1) {
-        // TBC
-    }
-
-    // ----- Look for pre-extract callback
-    if (isset($p_options[PCLZIP_CB_PRE_EXTRACT])) {
-
-      // ----- Generate a local information
-      $v_local_header = array();
-      $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
-
-      // ----- Call the callback
-      // Here I do not use call_user_func() because I need to send a reference to the
-      // header.
-//      eval('$v_result = '.$p_options[PCLZIP_CB_PRE_EXTRACT].'(PCLZIP_CB_PRE_EXTRACT, $v_local_header);');
-      $v_result = $p_options[PCLZIP_CB_PRE_EXTRACT](PCLZIP_CB_PRE_EXTRACT, $v_local_header);
-      if ($v_result == 0) {
-        // ----- Change the file status
-        $p_entry['status'] = "skipped";
         $v_result = 1;
-      }
 
-      // ----- Look for abort result
-      if ($v_result == 2) {
-        // ----- This status is internal and will be changed in 'skipped'
-        $p_entry['status'] = "aborted";
-      	$v_result = PCLZIP_ERR_USER_ABORTED;
-      }
+        // ----- Reset the error handler
+        $this->privErrorReset();
 
-      // ----- Update the informations
-      // Only some fields can be modified
-      $p_entry['filename'] = $v_local_header['filename'];
-    }
-
-    // ----- Trace
-
-    // ----- Look if extraction should be done
-    if ($p_entry['status'] == 'ok') {
-
-      // ----- Do the extraction (if not a folder)
-      if (!(($p_entry['external']&0x00000010)==0x00000010)) {
-        // ----- Look for not compressed file
-        if ($p_entry['compressed_size'] == $p_entry['size']) {
-
-          // ----- Read the file in a buffer (one shot)
-          $v_buffer = @fread($this->zip_fd, $p_entry['compressed_size']);
-
-          // ----- Send the file to the output
-          echo $v_buffer;
-          unset($v_buffer);
+        // ----- Check archive
+        if (!$this->privCheckFormat()) {
+            return (0);
         }
-        else {
 
-          // ----- Read the compressed file in a buffer (one shot)
-          $v_buffer = @fread($this->zip_fd, $p_entry['compressed_size']);
-          
-          // ----- Decompress the file
-          $v_file_content = gzinflate($v_buffer);
-          unset($v_buffer);
+        // ----- Call the extracting fct
+        $p_list = array();
+        if (($v_result = $this->privList($p_list)) != 1) {
+            unset($p_list);
 
-          // ----- Send the file to the output
-          echo $v_file_content;
-          unset($v_file_content);
+            return (0);
         }
-      }
+
+        // ----- Return
+        return $p_list;
     }
+    // --------------------------------------------------------------------------------
 
-	// ----- Change abort status
-	if ($p_entry['status'] == "aborted") {
-      $p_entry['status'] = "skipped";
-	}
-
-    // ----- Look for post-extract callback
-    elseif (isset($p_options[PCLZIP_CB_POST_EXTRACT])) {
-
-      // ----- Generate a local information
-      $v_local_header = array();
-      $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
-
-      // ----- Call the callback
-      // Here I do not use call_user_func() because I need to send a reference to the
-      // header.
-//      eval('$v_result = '.$p_options[PCLZIP_CB_POST_EXTRACT].'(PCLZIP_CB_POST_EXTRACT, $v_local_header);');
-      $v_result = $p_options[PCLZIP_CB_POST_EXTRACT](PCLZIP_CB_POST_EXTRACT, $v_local_header);
-
-      // ----- Look for abort result
-      if ($v_result == 2) {
-      	$v_result = PCLZIP_ERR_USER_ABORTED;
-      }
-    }
-
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privExtractFileAsString()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privExtractFileAsString(&$p_entry, &$p_string, &$p_options)
-  {
-    $v_result=1;
-
-    // ----- Read the file header
-    $v_header = array();
-    if (($v_result = $this->privReadFileHeader($v_header)) != 1)
+    // --------------------------------------------------------------------------------
+    // Function :
+    //   extract($p_path="./", $p_remove_path="")
+    //   extract([$p_option, $p_option_value, ...])
+    // Description :
+    //   This method supports two synopsis. The first one is historical.
+    //   This method extract all the files / directories from the archive to the
+    //   folder indicated in $p_path.
+    //   If you want to ignore the 'root' part of path of the memorized files
+    //   you can indicate this in the optional $p_remove_path parameter.
+    //   By default, if a newer file with the same name already exists, the
+    //   file is not extracted.
+    //
+    //   If both PCLZIP_OPT_PATH and PCLZIP_OPT_ADD_PATH aoptions
+    //   are used, the path indicated in PCLZIP_OPT_ADD_PATH is append
+    //   at the end of the path value of PCLZIP_OPT_PATH.
+    // Parameters :
+    //   $p_path : Path where the files and directories are to be extracted
+    //   $p_remove_path : First part ('root' part) of the memorized path
+    //                    (if any similar) to remove while extracting.
+    // Options :
+    //   PCLZIP_OPT_PATH :
+    //   PCLZIP_OPT_ADD_PATH :
+    //   PCLZIP_OPT_REMOVE_PATH :
+    //   PCLZIP_OPT_REMOVE_ALL_PATH :
+    //   PCLZIP_CB_PRE_EXTRACT :
+    //   PCLZIP_CB_POST_EXTRACT :
+    // Return Values :
+    //   0 or a negative value on failure,
+    //   The list of the extracted files, with a status of the action.
+    //   (see PclZip::listContent() for list entry format)
+    // --------------------------------------------------------------------------------
+    public function extract()
     {
-      // ----- Return
-      return $v_result;
-    }
-
-
-    // ----- Check that the file header is coherent with $p_entry info
-    if ($this->privCheckFileHeaders($v_header, $p_entry) != 1) {
-        // TBC
-    }
-
-    // ----- Look for pre-extract callback
-    if (isset($p_options[PCLZIP_CB_PRE_EXTRACT])) {
-
-      // ----- Generate a local information
-      $v_local_header = array();
-      $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
-
-      // ----- Call the callback
-      // Here I do not use call_user_func() because I need to send a reference to the
-      // header.
-//      eval('$v_result = '.$p_options[PCLZIP_CB_PRE_EXTRACT].'(PCLZIP_CB_PRE_EXTRACT, $v_local_header);');
-      $v_result = $p_options[PCLZIP_CB_PRE_EXTRACT](PCLZIP_CB_PRE_EXTRACT, $v_local_header);
-      if ($v_result == 0) {
-        // ----- Change the file status
-        $p_entry['status'] = "skipped";
         $v_result = 1;
-      }
-      
-      // ----- Look for abort result
-      if ($v_result == 2) {
-        // ----- This status is internal and will be changed in 'skipped'
-        $p_entry['status'] = "aborted";
-      	$v_result = PCLZIP_ERR_USER_ABORTED;
-      }
 
-      // ----- Update the informations
-      // Only some fields can be modified
-      $p_entry['filename'] = $v_local_header['filename'];
-    }
+        // ----- Reset the error handler
+        $this->privErrorReset();
 
-
-    // ----- Look if extraction should be done
-    if ($p_entry['status'] == 'ok') {
-
-      // ----- Do the extraction (if not a folder)
-      if (!(($p_entry['external']&0x00000010)==0x00000010)) {
-        // ----- Look for not compressed file
-  //      if ($p_entry['compressed_size'] == $p_entry['size'])
-        if ($p_entry['compression'] == 0) {
-  
-          // ----- Reading the file
-          $p_string = @fread($this->zip_fd, $p_entry['compressed_size']);
+        // ----- Check archive
+        if (!$this->privCheckFormat()) {
+            return (0);
         }
-        else {
-  
-          // ----- Reading the file
-          $v_data = @fread($this->zip_fd, $p_entry['compressed_size']);
-          
-          // ----- Decompress the file
-          if (($p_string = @gzinflate($v_data)) === FALSE) {
-              // TBC
-          }
+
+        // ----- Set default values
+        $v_options         = array();
+        //    $v_path = "./";
+        $v_path            = '';
+        $v_remove_path     = "";
+        $v_remove_all_path = false;
+
+        // ----- Look for variable options arguments
+        $v_size = func_num_args();
+
+        // ----- Default values for option
+        $v_options[PCLZIP_OPT_EXTRACT_AS_STRING] = false;
+
+        // ----- Look for arguments
+        if ($v_size > 0) {
+            // ----- Get the arguments
+            $v_arg_list = func_get_args();
+
+            // ----- Look for first arg
+            if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
+
+                // ----- Parse the options
+                $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options, array(
+                    PCLZIP_OPT_PATH => 'optional',
+                    PCLZIP_OPT_REMOVE_PATH => 'optional',
+                    PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
+                    PCLZIP_OPT_ADD_PATH => 'optional',
+                    PCLZIP_CB_PRE_EXTRACT => 'optional',
+                    PCLZIP_CB_POST_EXTRACT => 'optional',
+                    PCLZIP_OPT_SET_CHMOD => 'optional',
+                    PCLZIP_OPT_BY_NAME => 'optional',
+                    PCLZIP_OPT_BY_EREG => 'optional',
+                    PCLZIP_OPT_BY_PREG => 'optional',
+                    PCLZIP_OPT_BY_INDEX => 'optional',
+                    PCLZIP_OPT_EXTRACT_AS_STRING => 'optional',
+                    PCLZIP_OPT_EXTRACT_IN_OUTPUT => 'optional',
+                    PCLZIP_OPT_REPLACE_NEWER => 'optional',
+                    PCLZIP_OPT_STOP_ON_ERROR => 'optional',
+                    PCLZIP_OPT_EXTRACT_DIR_RESTRICTION => 'optional',
+                    PCLZIP_OPT_TEMP_FILE_THRESHOLD => 'optional',
+                    PCLZIP_OPT_TEMP_FILE_ON => 'optional',
+                    PCLZIP_OPT_TEMP_FILE_OFF => 'optional'
+                ));
+                if ($v_result != 1) {
+                    return 0;
+                }
+
+                // ----- Set the arguments
+                if (isset($v_options[PCLZIP_OPT_PATH])) {
+                    $v_path = $v_options[PCLZIP_OPT_PATH];
+                }
+                if (isset($v_options[PCLZIP_OPT_REMOVE_PATH])) {
+                    $v_remove_path = $v_options[PCLZIP_OPT_REMOVE_PATH];
+                }
+                if (isset($v_options[PCLZIP_OPT_REMOVE_ALL_PATH])) {
+                    $v_remove_all_path = $v_options[PCLZIP_OPT_REMOVE_ALL_PATH];
+                }
+                if (isset($v_options[PCLZIP_OPT_ADD_PATH])) {
+                    // ----- Check for '/' in last path char
+                    if ((strlen($v_path) > 0) && (substr($v_path, -1) != '/')) {
+                        $v_path .= '/';
+                    }
+                    $v_path .= $v_options[PCLZIP_OPT_ADD_PATH];
+                }
+
+            // ----- Look for 2 args
+            // Here we need to support the first historic synopsis of the
+            // method.
+            } else {
+
+                // ----- Get the first argument
+                $v_path = $v_arg_list[0];
+
+                // ----- Look for the optional second argument
+                if ($v_size == 2) {
+                    $v_remove_path = $v_arg_list[1];
+                } elseif ($v_size > 2) {
+                    // ----- Error log
+                    PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / type of arguments");
+
+                    // ----- Return
+                    return 0;
+                }
+            }
         }
-  
+
+        // ----- Look for default option values
+        $this->privOptionDefaultThreshold($v_options);
+
         // ----- Trace
-      }
-      else {
-          // TBC : error : can not extract a folder in a string
-      }
-      
-    }
 
-  	// ----- Change abort status
-  	if ($p_entry['status'] == "aborted") {
-        $p_entry['status'] = "skipped";
-  	}
-	
-    // ----- Look for post-extract callback
-    elseif (isset($p_options[PCLZIP_CB_POST_EXTRACT])) {
+        // ----- Call the extracting fct
+        $p_list   = array();
+        $v_result = $this->privExtractByRule($p_list, $v_path, $v_remove_path, $v_remove_all_path, $v_options);
+        if ($v_result < 1) {
+            unset($p_list);
 
-      // ----- Generate a local information
-      $v_local_header = array();
-      $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
-      
-      // ----- Swap the content to header
-      $v_local_header['content'] = $p_string;
-      $p_string = '';
-
-      // ----- Call the callback
-      // Here I do not use call_user_func() because I need to send a reference to the
-      // header.
-//      eval('$v_result = '.$p_options[PCLZIP_CB_POST_EXTRACT].'(PCLZIP_CB_POST_EXTRACT, $v_local_header);');
-      $v_result = $p_options[PCLZIP_CB_POST_EXTRACT](PCLZIP_CB_POST_EXTRACT, $v_local_header);
-
-      // ----- Swap back the content to header
-      $p_string = $v_local_header['content'];
-      unset($v_local_header['content']);
-
-      // ----- Look for abort result
-      if ($v_result == 2) {
-      	$v_result = PCLZIP_ERR_USER_ABORTED;
-      }
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privReadFileHeader()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privReadFileHeader(&$p_header)
-  {
-    $v_result=1;
-
-    // ----- Read the 4 bytes signature
-    $v_binary_data = @fread($this->zip_fd, 4);
-    $v_data = unpack('Vid', $v_binary_data);
-
-    // ----- Check signature
-    if ($v_data['id'] != 0x04034b50)
-    {
-
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Invalid archive structure');
-
-      // ----- Return
-      return PclZip::errorCode();
-    }
-
-    // ----- Read the first 42 bytes of the header
-    $v_binary_data = fread($this->zip_fd, 26);
-
-    // ----- Look for invalid block size
-    if (strlen($v_binary_data) != 26)
-    {
-      $p_header['filename'] = "";
-      $p_header['status'] = "invalid_header";
-
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Invalid block size : ".strlen($v_binary_data));
-
-      // ----- Return
-      return PclZip::errorCode();
-    }
-
-    // ----- Extract the values
-    $v_data = unpack('vversion/vflag/vcompression/vmtime/vmdate/Vcrc/Vcompressed_size/Vsize/vfilename_len/vextra_len', $v_binary_data);
-
-    // ----- Get filename
-    $p_header['filename'] = fread($this->zip_fd, $v_data['filename_len']);
-
-    // ----- Get extra_fields
-    if ($v_data['extra_len'] != 0) {
-      $p_header['extra'] = fread($this->zip_fd, $v_data['extra_len']);
-    }
-    else {
-      $p_header['extra'] = '';
-    }
-
-    // ----- Extract properties
-    $p_header['version_extracted'] = $v_data['version'];
-    $p_header['compression'] = $v_data['compression'];
-    $p_header['size'] = $v_data['size'];
-    $p_header['compressed_size'] = $v_data['compressed_size'];
-    $p_header['crc'] = $v_data['crc'];
-    $p_header['flag'] = $v_data['flag'];
-    $p_header['filename_len'] = $v_data['filename_len'];
-
-    // ----- Recuperate date in UNIX format
-    $p_header['mdate'] = $v_data['mdate'];
-    $p_header['mtime'] = $v_data['mtime'];
-    if ($p_header['mdate'] && $p_header['mtime'])
-    {
-      // ----- Extract time
-      $v_hour = ($p_header['mtime'] & 0xF800) >> 11;
-      $v_minute = ($p_header['mtime'] & 0x07E0) >> 5;
-      $v_seconde = ($p_header['mtime'] & 0x001F)*2;
-
-      // ----- Extract date
-      $v_year = (($p_header['mdate'] & 0xFE00) >> 9) + 1980;
-      $v_month = ($p_header['mdate'] & 0x01E0) >> 5;
-      $v_day = $p_header['mdate'] & 0x001F;
-
-      // ----- Get UNIX date format
-      $p_header['mtime'] = @mktime($v_hour, $v_minute, $v_seconde, $v_month, $v_day, $v_year);
-
-    }
-    else
-    {
-      $p_header['mtime'] = time();
-    }
-
-    // TBC
-    //for(reset($v_data); $key = key($v_data); next($v_data)) {
-    //}
-
-    // ----- Set the stored filename
-    $p_header['stored_filename'] = $p_header['filename'];
-
-    // ----- Set the status field
-    $p_header['status'] = "ok";
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privReadCentralFileHeader()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privReadCentralFileHeader(&$p_header)
-  {
-    $v_result=1;
-
-    // ----- Read the 4 bytes signature
-    $v_binary_data = @fread($this->zip_fd, 4);
-    $v_data = unpack('Vid', $v_binary_data);
-
-    // ----- Check signature
-    if ($v_data['id'] != 0x02014b50)
-    {
-
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Invalid archive structure');
-
-      // ----- Return
-      return PclZip::errorCode();
-    }
-
-    // ----- Read the first 42 bytes of the header
-    $v_binary_data = fread($this->zip_fd, 42);
-
-    // ----- Look for invalid block size
-    if (strlen($v_binary_data) != 42)
-    {
-      $p_header['filename'] = "";
-      $p_header['status'] = "invalid_header";
-
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Invalid block size : ".strlen($v_binary_data));
-
-      // ----- Return
-      return PclZip::errorCode();
-    }
-
-    // ----- Extract the values
-    $p_header = unpack('vversion/vversion_extracted/vflag/vcompression/vmtime/vmdate/Vcrc/Vcompressed_size/Vsize/vfilename_len/vextra_len/vcomment_len/vdisk/vinternal/Vexternal/Voffset', $v_binary_data);
-
-    // ----- Get filename
-    if ($p_header['filename_len'] != 0)
-      $p_header['filename'] = fread($this->zip_fd, $p_header['filename_len']);
-    else
-      $p_header['filename'] = '';
-
-    // ----- Get extra
-    if ($p_header['extra_len'] != 0)
-      $p_header['extra'] = fread($this->zip_fd, $p_header['extra_len']);
-    else
-      $p_header['extra'] = '';
-
-    // ----- Get comment
-    if ($p_header['comment_len'] != 0)
-      $p_header['comment'] = fread($this->zip_fd, $p_header['comment_len']);
-    else
-      $p_header['comment'] = '';
-
-    // ----- Extract properties
-
-    // ----- Recuperate date in UNIX format
-    //if ($p_header['mdate'] && $p_header['mtime'])
-    // TBC : bug : this was ignoring time with 0/0/0
-    if (1)
-    {
-      // ----- Extract time
-      $v_hour = ($p_header['mtime'] & 0xF800) >> 11;
-      $v_minute = ($p_header['mtime'] & 0x07E0) >> 5;
-      $v_seconde = ($p_header['mtime'] & 0x001F)*2;
-
-      // ----- Extract date
-      $v_year = (($p_header['mdate'] & 0xFE00) >> 9) + 1980;
-      $v_month = ($p_header['mdate'] & 0x01E0) >> 5;
-      $v_day = $p_header['mdate'] & 0x001F;
-
-      // ----- Get UNIX date format
-      $p_header['mtime'] = @mktime($v_hour, $v_minute, $v_seconde, $v_month, $v_day, $v_year);
-
-    }
-    else
-    {
-      $p_header['mtime'] = time();
-    }
-
-    // ----- Set the stored filename
-    $p_header['stored_filename'] = $p_header['filename'];
-
-    // ----- Set default status to ok
-    $p_header['status'] = 'ok';
-
-    // ----- Look if it is a directory
-    if (substr($p_header['filename'], -1) == '/') {
-      //$p_header['external'] = 0x41FF0010;
-      $p_header['external'] = 0x00000010;
-    }
-
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privCheckFileHeaders()
-  // Description :
-  // Parameters :
-  // Return Values :
-  //   1 on success,
-  //   0 on error;
-  // --------------------------------------------------------------------------------
-  function privCheckFileHeaders(&$p_local_header, &$p_central_header)
-  {
-    $v_result=1;
-
-  	// ----- Check the static values
-  	// TBC
-  	if ($p_local_header['filename'] != $p_central_header['filename']) {
-  	}
-  	if ($p_local_header['version_extracted'] != $p_central_header['version_extracted']) {
-  	}
-  	if ($p_local_header['flag'] != $p_central_header['flag']) {
-  	}
-  	if ($p_local_header['compression'] != $p_central_header['compression']) {
-  	}
-  	if ($p_local_header['mtime'] != $p_central_header['mtime']) {
-  	}
-  	if ($p_local_header['filename_len'] != $p_central_header['filename_len']) {
-  	}
-  
-  	// ----- Look for flag bit 3
-  	if (($p_local_header['flag'] & 8) == 8) {
-          $p_local_header['size'] = $p_central_header['size'];
-          $p_local_header['compressed_size'] = $p_central_header['compressed_size'];
-          $p_local_header['crc'] = $p_central_header['crc'];
-  	}
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privReadEndCentralDir()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privReadEndCentralDir(&$p_central_dir)
-  {
-    $v_result=1;
-
-    // ----- Go to the end of the zip file
-    $v_size = filesize($this->zipname);
-    @fseek($this->zip_fd, $v_size);
-    if (@ftell($this->zip_fd) != $v_size)
-    {
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Unable to go to the end of the archive \''.$this->zipname.'\'');
-
-      // ----- Return
-      return PclZip::errorCode();
-    }
-
-    // ----- First try : look if this is an archive with no commentaries (most of the time)
-    // in this case the end of central dir is at 22 bytes of the file end
-    $v_found = 0;
-    if ($v_size > 26) {
-      @fseek($this->zip_fd, $v_size-22);
-      if (($v_pos = @ftell($this->zip_fd)) != ($v_size-22))
-      {
-        // ----- Error log
-        PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Unable to seek back to the middle of the archive \''.$this->zipname.'\'');
-
-        // ----- Return
-        return PclZip::errorCode();
-      }
-
-      // ----- Read for bytes
-      $v_binary_data = @fread($this->zip_fd, 4);
-      $v_data = @unpack('Vid', $v_binary_data);
-
-      // ----- Check signature
-      if ($v_data['id'] == 0x06054b50) {
-        $v_found = 1;
-      }
-
-      $v_pos = ftell($this->zip_fd);
-    }
-
-    // ----- Go back to the maximum possible size of the Central Dir End Record
-    if (!$v_found) {
-      $v_maximum_size = 65557; // 0xFFFF + 22;
-      if ($v_maximum_size > $v_size)
-        $v_maximum_size = $v_size;
-      @fseek($this->zip_fd, $v_size-$v_maximum_size);
-      if (@ftell($this->zip_fd) != ($v_size-$v_maximum_size))
-      {
-        // ----- Error log
-        PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Unable to seek back to the middle of the archive \''.$this->zipname.'\'');
-
-        // ----- Return
-        return PclZip::errorCode();
-      }
-
-      // ----- Read byte per byte in order to find the signature
-      $v_pos = ftell($this->zip_fd);
-      $v_bytes = 0x00000000;
-      while ($v_pos < $v_size)
-      {
-        // ----- Read a byte
-        $v_byte = @fread($this->zip_fd, 1);
-
-        // -----  Add the byte
-        //$v_bytes = ($v_bytes << 8) | Ord($v_byte);
-        // Note we mask the old value down such that once shifted we can never end up with more than a 32bit number 
-        // Otherwise on systems where we have 64bit integers the check below for the magic number will fail. 
-        $v_bytes = ( ($v_bytes & 0xFFFFFF) << 8) | Ord($v_byte); 
-
-        // ----- Compare the bytes
-        if ($v_bytes == 0x504b0506)
-        {
-          $v_pos++;
-          break;
+            return (0);
         }
 
-        $v_pos++;
-      }
-
-      // ----- Look if not found end of central dir
-      if ($v_pos == $v_size)
-      {
-
-        // ----- Error log
-        PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Unable to find End of Central Dir Record signature");
-
         // ----- Return
-        return PclZip::errorCode();
-      }
+        return $p_list;
     }
+    // --------------------------------------------------------------------------------
 
-    // ----- Read the first 18 bytes of the header
-    $v_binary_data = fread($this->zip_fd, 18);
 
-    // ----- Look for invalid block size
-    if (strlen($v_binary_data) != 18)
+    // --------------------------------------------------------------------------------
+    // Function :
+    //   extractByIndex($p_index, $p_path="./", $p_remove_path="")
+    //   extractByIndex($p_index, [$p_option, $p_option_value, ...])
+    // Description :
+    //   This method supports two synopsis. The first one is historical.
+    //   This method is doing a partial extract of the archive.
+    //   The extracted files or folders are identified by their index in the
+    //   archive (from 0 to n).
+    //   Note that if the index identify a folder, only the folder entry is
+    //   extracted, not all the files included in the archive.
+    // Parameters :
+    //   $p_index : A single index (integer) or a string of indexes of files to
+    //              extract. The form of the string is "0,4-6,8-12" with only numbers
+    //              and '-' for range or ',' to separate ranges. No spaces or ';'
+    //              are allowed.
+    //   $p_path : Path where the files and directories are to be extracted
+    //   $p_remove_path : First part ('root' part) of the memorized path
+    //                    (if any similar) to remove while extracting.
+    // Options :
+    //   PCLZIP_OPT_PATH :
+    //   PCLZIP_OPT_ADD_PATH :
+    //   PCLZIP_OPT_REMOVE_PATH :
+    //   PCLZIP_OPT_REMOVE_ALL_PATH :
+    //   PCLZIP_OPT_EXTRACT_AS_STRING : The files are extracted as strings and
+    //     not as files.
+    //     The resulting content is in a new field 'content' in the file
+    //     structure.
+    //     This option must be used alone (any other options are ignored).
+    //   PCLZIP_CB_PRE_EXTRACT :
+    //   PCLZIP_CB_POST_EXTRACT :
+    // Return Values :
+    //   0 on failure,
+    //   The list of the extracted files, with a status of the action.
+    //   (see PclZip::listContent() for list entry format)
+    // --------------------------------------------------------------------------------
+    //function extractByIndex($p_index, options...)
+    public function extractByIndex($p_index)
     {
+        $v_result = 1;
 
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Invalid End of Central Dir Record size : ".strlen($v_binary_data));
+        // ----- Reset the error handler
+        $this->privErrorReset();
 
-      // ----- Return
-      return PclZip::errorCode();
-    }
-
-    // ----- Extract the values
-    $v_data = unpack('vdisk/vdisk_start/vdisk_entries/ventries/Vsize/Voffset/vcomment_size', $v_binary_data);
-
-    // ----- Check the global size
-    if (($v_pos + $v_data['comment_size'] + 18) != $v_size) {
-
-	  // ----- Removed in release 2.2 see readme file
-	  // The check of the file size is a little too strict.
-	  // Some bugs where found when a zip is encrypted/decrypted with 'crypt'.
-	  // While decrypted, zip has training 0 bytes
-	  if (0) {
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT,
-	                       'The central dir is not at the end of the archive.'
-						   .' Some trailing bytes exists after the archive.');
-
-      // ----- Return
-      return PclZip::errorCode();
-	  }
-    }
-
-    // ----- Get comment
-    if ($v_data['comment_size'] != 0) {
-      $p_central_dir['comment'] = fread($this->zip_fd, $v_data['comment_size']);
-    }
-    else
-      $p_central_dir['comment'] = '';
-
-    $p_central_dir['entries'] = $v_data['entries'];
-    $p_central_dir['disk_entries'] = $v_data['disk_entries'];
-    $p_central_dir['offset'] = $v_data['offset'];
-    $p_central_dir['size'] = $v_data['size'];
-    $p_central_dir['disk'] = $v_data['disk'];
-    $p_central_dir['disk_start'] = $v_data['disk_start'];
-
-    // TBC
-    //for(reset($p_central_dir); $key = key($p_central_dir); next($p_central_dir)) {
-    //}
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privDeleteByRule()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privDeleteByRule(&$p_result_list, &$p_options)
-  {
-    $v_result=1;
-    $v_list_detail = array();
-
-    // ----- Open the zip file
-    if (($v_result=$this->privOpenFd('rb')) != 1)
-    {
-      // ----- Return
-      return $v_result;
-    }
-
-    // ----- Read the central directory informations
-    $v_central_dir = array();
-    if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
-    {
-      $this->privCloseFd();
-      return $v_result;
-    }
-
-    // ----- Go to beginning of File
-    @rewind($this->zip_fd);
-
-    // ----- Scan all the files
-    // ----- Start at beginning of Central Dir
-    $v_pos_entry = $v_central_dir['offset'];
-    @rewind($this->zip_fd);
-    if (@fseek($this->zip_fd, $v_pos_entry))
-    {
-      // ----- Close the zip file
-      $this->privCloseFd();
-
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
-
-      // ----- Return
-      return PclZip::errorCode();
-    }
-
-    // ----- Read each entry
-    $v_header_list = array();
-    $j_start = 0;
-    for ($i=0, $v_nb_extracted=0; $i<$v_central_dir['entries']; $i++)
-    {
-
-      // ----- Read the file header
-      $v_header_list[$v_nb_extracted] = array();
-      if (($v_result = $this->privReadCentralFileHeader($v_header_list[$v_nb_extracted])) != 1)
-      {
-        // ----- Close the zip file
-        $this->privCloseFd();
-
-        return $v_result;
-      }
-
-
-      // ----- Store the index
-      $v_header_list[$v_nb_extracted]['index'] = $i;
-
-      // ----- Look for the specific extract rules
-      $v_found = false;
-
-      // ----- Look for extract by name rule
-      if (   (isset($p_options[PCLZIP_OPT_BY_NAME]))
-          && ($p_options[PCLZIP_OPT_BY_NAME] != 0)) {
-
-          // ----- Look if the filename is in the list
-          for ($j=0; ($j<sizeof($p_options[PCLZIP_OPT_BY_NAME])) && (!$v_found); $j++) {
-
-              // ----- Look for a directory
-              if (substr($p_options[PCLZIP_OPT_BY_NAME][$j], -1) == "/") {
-
-                  // ----- Look if the directory is in the filename path
-                  if (   (strlen($v_header_list[$v_nb_extracted]['stored_filename']) > strlen($p_options[PCLZIP_OPT_BY_NAME][$j]))
-                      && (substr($v_header_list[$v_nb_extracted]['stored_filename'], 0, strlen($p_options[PCLZIP_OPT_BY_NAME][$j])) == $p_options[PCLZIP_OPT_BY_NAME][$j])) {
-                      $v_found = true;
-                  }
-                  elseif (   (($v_header_list[$v_nb_extracted]['external']&0x00000010)==0x00000010) /* Indicates a folder */
-                          && ($v_header_list[$v_nb_extracted]['stored_filename'].'/' == $p_options[PCLZIP_OPT_BY_NAME][$j])) {
-                      $v_found = true;
-                  }
-              }
-              // ----- Look for a filename
-              elseif ($v_header_list[$v_nb_extracted]['stored_filename'] == $p_options[PCLZIP_OPT_BY_NAME][$j]) {
-                  $v_found = true;
-              }
-          }
-      }
-
-      // ----- Look for extract by ereg rule
-      // ereg() is deprecated with PHP 5.3
-      /*
-      else if (   (isset($p_options[PCLZIP_OPT_BY_EREG]))
-               && ($p_options[PCLZIP_OPT_BY_EREG] != "")) {
-
-          if (ereg($p_options[PCLZIP_OPT_BY_EREG], $v_header_list[$v_nb_extracted]['stored_filename'])) {
-              $v_found = true;
-          }
-      }
-      */
-
-      // ----- Look for extract by preg rule
-      else if (   (isset($p_options[PCLZIP_OPT_BY_PREG]))
-               && ($p_options[PCLZIP_OPT_BY_PREG] != "")) {
-
-          if (preg_match($p_options[PCLZIP_OPT_BY_PREG], $v_header_list[$v_nb_extracted]['stored_filename'])) {
-              $v_found = true;
-          }
-      }
-
-      // ----- Look for extract by index rule
-      else if (   (isset($p_options[PCLZIP_OPT_BY_INDEX]))
-               && ($p_options[PCLZIP_OPT_BY_INDEX] != 0)) {
-
-          // ----- Look if the index is in the list
-          for ($j=$j_start; ($j<sizeof($p_options[PCLZIP_OPT_BY_INDEX])) && (!$v_found); $j++) {
-
-              if (($i>=$p_options[PCLZIP_OPT_BY_INDEX][$j]['start']) && ($i<=$p_options[PCLZIP_OPT_BY_INDEX][$j]['end'])) {
-                  $v_found = true;
-              }
-              if ($i>=$p_options[PCLZIP_OPT_BY_INDEX][$j]['end']) {
-                  $j_start = $j+1;
-              }
-
-              if ($p_options[PCLZIP_OPT_BY_INDEX][$j]['start']>$i) {
-                  break;
-              }
-          }
-      }
-      else {
-      	$v_found = true;
-      }
-
-      // ----- Look for deletion
-      if ($v_found)
-      {
-        unset($v_header_list[$v_nb_extracted]);
-      }
-      else
-      {
-        $v_nb_extracted++;
-      }
-    }
-
-    // ----- Look if something need to be deleted
-    if ($v_nb_extracted > 0) {
-
-        // ----- Creates a temporay file
-        $v_zip_temp_name = PCLZIP_TEMPORARY_DIR.uniqid('pclzip-').'.tmp';
-
-        // ----- Creates a temporary zip archive
-        $v_temp_zip = new PclZip($v_zip_temp_name);
-
-        // ----- Open the temporary zip file in write mode
-        if (($v_result = $v_temp_zip->privOpenFd('wb')) != 1) {
-            $this->privCloseFd();
-
-            // ----- Return
-            return $v_result;
+        // ----- Check archive
+        if (!$this->privCheckFormat()) {
+            return (0);
         }
 
-        // ----- Look which file need to be kept
-        for ($i=0; $i<sizeof($v_header_list); $i++) {
+        // ----- Set default values
+        $v_options         = array();
+        //    $v_path = "./";
+        $v_path            = '';
+        $v_remove_path     = "";
+        $v_remove_all_path = false;
 
-            // ----- Calculate the position of the header
-            @rewind($this->zip_fd);
-            if (@fseek($this->zip_fd,  $v_header_list[$i]['offset'])) {
-                // ----- Close the zip file
-                $this->privCloseFd();
-                $v_temp_zip->privCloseFd();
-                @unlink($v_zip_temp_name);
+        // ----- Look for variable options arguments
+        $v_size = func_num_args();
+
+        // ----- Default values for option
+        $v_options[PCLZIP_OPT_EXTRACT_AS_STRING] = false;
+
+        // ----- Look for arguments
+        if ($v_size > 1) {
+            // ----- Get the arguments
+            $v_arg_list = func_get_args();
+
+            // ----- Remove form the options list the first argument
+            array_shift($v_arg_list);
+            $v_size--;
+
+            // ----- Look for first arg
+            if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
+
+                // ----- Parse the options
+                $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options, array(
+                    PCLZIP_OPT_PATH => 'optional',
+                    PCLZIP_OPT_REMOVE_PATH => 'optional',
+                    PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
+                    PCLZIP_OPT_EXTRACT_AS_STRING => 'optional',
+                    PCLZIP_OPT_ADD_PATH => 'optional',
+                    PCLZIP_CB_PRE_EXTRACT => 'optional',
+                    PCLZIP_CB_POST_EXTRACT => 'optional',
+                    PCLZIP_OPT_SET_CHMOD => 'optional',
+                    PCLZIP_OPT_REPLACE_NEWER => 'optional',
+                    PCLZIP_OPT_STOP_ON_ERROR => 'optional',
+                    PCLZIP_OPT_EXTRACT_DIR_RESTRICTION => 'optional',
+                    PCLZIP_OPT_TEMP_FILE_THRESHOLD => 'optional',
+                    PCLZIP_OPT_TEMP_FILE_ON => 'optional',
+                    PCLZIP_OPT_TEMP_FILE_OFF => 'optional'
+                ));
+                if ($v_result != 1) {
+                    return 0;
+                }
+
+                // ----- Set the arguments
+                if (isset($v_options[PCLZIP_OPT_PATH])) {
+                    $v_path = $v_options[PCLZIP_OPT_PATH];
+                }
+                if (isset($v_options[PCLZIP_OPT_REMOVE_PATH])) {
+                    $v_remove_path = $v_options[PCLZIP_OPT_REMOVE_PATH];
+                }
+                if (isset($v_options[PCLZIP_OPT_REMOVE_ALL_PATH])) {
+                    $v_remove_all_path = $v_options[PCLZIP_OPT_REMOVE_ALL_PATH];
+                }
+                if (isset($v_options[PCLZIP_OPT_ADD_PATH])) {
+                    // ----- Check for '/' in last path char
+                    if ((strlen($v_path) > 0) && (substr($v_path, -1) != '/')) {
+                        $v_path .= '/';
+                    }
+                    $v_path .= $v_options[PCLZIP_OPT_ADD_PATH];
+                }
+                if (!isset($v_options[PCLZIP_OPT_EXTRACT_AS_STRING])) {
+                    $v_options[PCLZIP_OPT_EXTRACT_AS_STRING] = false;
+                } else {
+                }
+
+            // ----- Look for 2 args
+            // Here we need to support the first historic synopsis of the
+            // method.
+            } else {
+
+                // ----- Get the first argument
+                $v_path = $v_arg_list[0];
+
+                // ----- Look for the optional second argument
+                if ($v_size == 2) {
+                    $v_remove_path = $v_arg_list[1];
+                } elseif ($v_size > 2) {
+                    // ----- Error log
+                    PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / type of arguments");
+
+                    // ----- Return
+                    return 0;
+                }
+            }
+        }
+
+        // ----- Trace
+
+        // ----- Trick
+        // Here I want to reuse extractByRule(), so I need to parse the $p_index
+        // with privParseOptions()
+        $v_arg_trick     = array(
+            PCLZIP_OPT_BY_INDEX,
+            $p_index
+        );
+        $v_options_trick = array();
+        $v_result        = $this->privParseOptions($v_arg_trick, sizeof($v_arg_trick), $v_options_trick, array(
+            PCLZIP_OPT_BY_INDEX => 'optional'
+        ));
+        if ($v_result != 1) {
+            return 0;
+        }
+        $v_options[PCLZIP_OPT_BY_INDEX] = $v_options_trick[PCLZIP_OPT_BY_INDEX];
+
+        // ----- Look for default option values
+        $this->privOptionDefaultThreshold($v_options);
+
+        // ----- Call the extracting fct
+        if (($v_result = $this->privExtractByRule($p_list, $v_path, $v_remove_path, $v_remove_all_path, $v_options)) < 1) {
+            return (0);
+        }
+
+        // ----- Return
+        return $p_list;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function :
+    //   delete([$p_option, $p_option_value, ...])
+    // Description :
+    //   This method removes files from the archive.
+    //   If no parameters are given, then all the archive is emptied.
+    // Parameters :
+    //   None or optional arguments.
+    // Options :
+    //   PCLZIP_OPT_BY_INDEX :
+    //   PCLZIP_OPT_BY_NAME :
+    //   PCLZIP_OPT_BY_EREG :
+    //   PCLZIP_OPT_BY_PREG :
+    // Return Values :
+    //   0 on failure,
+    //   The list of the files which are still present in the archive.
+    //   (see PclZip::listContent() for list entry format)
+    // --------------------------------------------------------------------------------
+    public function delete()
+    {
+        $v_result = 1;
+
+        // ----- Reset the error handler
+        $this->privErrorReset();
+
+        // ----- Check archive
+        if (!$this->privCheckFormat()) {
+            return (0);
+        }
+
+        // ----- Set default values
+        $v_options = array();
+
+        // ----- Look for variable options arguments
+        $v_size = func_num_args();
+
+        // ----- Look for arguments
+        if ($v_size > 0) {
+            // ----- Get the arguments
+            $v_arg_list = func_get_args();
+
+            // ----- Parse the options
+            $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options, array(
+                PCLZIP_OPT_BY_NAME => 'optional',
+                PCLZIP_OPT_BY_EREG => 'optional',
+                PCLZIP_OPT_BY_PREG => 'optional',
+                PCLZIP_OPT_BY_INDEX => 'optional'
+            ));
+            if ($v_result != 1) {
+                return 0;
+            }
+        }
+
+        // ----- Magic quotes trick
+        $this->privDisableMagicQuotes();
+
+        // ----- Call the delete fct
+        $v_list = array();
+        if (($v_result = $this->privDeleteByRule($v_list, $v_options)) != 1) {
+            $this->privSwapBackMagicQuotes();
+            unset($v_list);
+
+            return (0);
+        }
+
+        // ----- Magic quotes trick
+        $this->privSwapBackMagicQuotes();
+
+        // ----- Return
+        return $v_list;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : deleteByIndex()
+    // Description :
+    //   ***** Deprecated *****
+    //   delete(PCLZIP_OPT_BY_INDEX, $p_index) should be prefered.
+    // --------------------------------------------------------------------------------
+    public function deleteByIndex($p_index)
+    {
+
+        $p_list = $this->delete(PCLZIP_OPT_BY_INDEX, $p_index);
+
+        // ----- Return
+        return $p_list;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : properties()
+    // Description :
+    //   This method gives the properties of the archive.
+    //   The properties are :
+    //     nb : Number of files in the archive
+    //     comment : Comment associated with the archive file
+    //     status : not_exist, ok
+    // Parameters :
+    //   None
+    // Return Values :
+    //   0 on failure,
+    //   An array with the archive properties.
+    // --------------------------------------------------------------------------------
+    public function properties()
+    {
+
+        // ----- Reset the error handler
+        $this->privErrorReset();
+
+        // ----- Magic quotes trick
+        $this->privDisableMagicQuotes();
+
+        // ----- Check archive
+        if (!$this->privCheckFormat()) {
+            $this->privSwapBackMagicQuotes();
+
+            return (0);
+        }
+
+        // ----- Default properties
+        $v_prop            = array();
+        $v_prop['comment'] = '';
+        $v_prop['nb']      = 0;
+        $v_prop['status']  = 'not_exist';
+
+        // ----- Look if file exists
+        if (@is_file($this->zipname)) {
+            // ----- Open the zip file
+            if (($this->zip_fd = @fopen($this->zipname, 'rb')) == 0) {
+                $this->privSwapBackMagicQuotes();
 
                 // ----- Error log
-                PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
+                PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \'' . $this->zipname . '\' in binary read mode');
+
+                // ----- Return
+                return 0;
+            }
+
+            // ----- Read the central directory informations
+            $v_central_dir = array();
+            if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1) {
+                $this->privSwapBackMagicQuotes();
+
+                return 0;
+            }
+
+            // ----- Close the zip file
+            $this->privCloseFd();
+
+            // ----- Set the user attributes
+            $v_prop['comment'] = $v_central_dir['comment'];
+            $v_prop['nb']      = $v_central_dir['entries'];
+            $v_prop['status']  = 'ok';
+        }
+
+        // ----- Magic quotes trick
+        $this->privSwapBackMagicQuotes();
+
+        // ----- Return
+        return $v_prop;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : duplicate()
+    // Description :
+    //   This method creates an archive by copying the content of an other one. If
+    //   the archive already exist, it is replaced by the new one without any warning.
+    // Parameters :
+    //   $p_archive : The filename of a valid archive, or
+    //                a valid PclZip object.
+    // Return Values :
+    //   1 on success.
+    //   0 or a negative value on error (error code).
+    // --------------------------------------------------------------------------------
+    public function duplicate($p_archive)
+    {
+        $v_result = 1;
+
+        // ----- Reset the error handler
+        $this->privErrorReset();
+
+        // ----- Look if the $p_archive is a PclZip object
+        if ((is_object($p_archive)) && (get_class($p_archive) == 'pclzip')) {
+
+            // ----- Duplicate the archive
+            $v_result = $this->privDuplicate($p_archive->zipname);
+
+        // ----- Look if the $p_archive is a string (so a filename)
+        } elseif (is_string($p_archive)) {
+
+            // ----- Check that $p_archive is a valid zip file
+            // TBC : Should also check the archive format
+            if (!is_file($p_archive)) {
+                // ----- Error log
+                PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "No file with filename '" . $p_archive . "'");
+                $v_result = PCLZIP_ERR_MISSING_FILE;
+            } else {
+                // ----- Duplicate the archive
+                $v_result = $this->privDuplicate($p_archive);
+            }
+
+        // ----- Invalid variable
+        } else {
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type p_archive_to_add");
+            $v_result = PCLZIP_ERR_INVALID_PARAMETER;
+        }
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : merge()
+    // Description :
+    //   This method merge the $p_archive_to_add archive at the end of the current
+    //   one ($this).
+    //   If the archive ($this) does not exist, the merge becomes a duplicate.
+    //   If the $p_archive_to_add archive does not exist, the merge is a success.
+    // Parameters :
+    //   $p_archive_to_add : It can be directly the filename of a valid zip archive,
+    //                       or a PclZip object archive.
+    // Return Values :
+    //   1 on success,
+    //   0 or negative values on error (see below).
+    // --------------------------------------------------------------------------------
+    public function merge($p_archive_to_add)
+    {
+        $v_result = 1;
+
+        // ----- Reset the error handler
+        $this->privErrorReset();
+
+        // ----- Check archive
+        if (!$this->privCheckFormat()) {
+            return (0);
+        }
+
+        // ----- Look if the $p_archive_to_add is a PclZip object
+        if ((is_object($p_archive_to_add)) && (get_class($p_archive_to_add) == 'pclzip')) {
+
+            // ----- Merge the archive
+            $v_result = $this->privMerge($p_archive_to_add);
+
+        // ----- Look if the $p_archive_to_add is a string (so a filename)
+        } elseif (is_string($p_archive_to_add)) {
+
+            // ----- Create a temporary archive
+            $v_object_archive = new PclZip($p_archive_to_add);
+
+            // ----- Merge the archive
+            $v_result = $this->privMerge($v_object_archive);
+
+        // ----- Invalid variable
+        } else {
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type p_archive_to_add");
+            $v_result = PCLZIP_ERR_INVALID_PARAMETER;
+        }
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : errorCode()
+    // Description :
+    // Parameters :
+    // --------------------------------------------------------------------------------
+    public function errorCode()
+    {
+        if (PCLZIP_ERROR_EXTERNAL == 1) {
+            return (PclErrorCode());
+        } else {
+            return ($this->error_code);
+        }
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : errorName()
+    // Description :
+    // Parameters :
+    // --------------------------------------------------------------------------------
+    public function errorName($p_with_code = false)
+    {
+        $v_name = array(
+            PCLZIP_ERR_NO_ERROR => 'PCLZIP_ERR_NO_ERROR',
+            PCLZIP_ERR_WRITE_OPEN_FAIL => 'PCLZIP_ERR_WRITE_OPEN_FAIL',
+            PCLZIP_ERR_READ_OPEN_FAIL => 'PCLZIP_ERR_READ_OPEN_FAIL',
+            PCLZIP_ERR_INVALID_PARAMETER => 'PCLZIP_ERR_INVALID_PARAMETER',
+            PCLZIP_ERR_MISSING_FILE => 'PCLZIP_ERR_MISSING_FILE',
+            PCLZIP_ERR_FILENAME_TOO_LONG => 'PCLZIP_ERR_FILENAME_TOO_LONG',
+            PCLZIP_ERR_INVALID_ZIP => 'PCLZIP_ERR_INVALID_ZIP',
+            PCLZIP_ERR_BAD_EXTRACTED_FILE => 'PCLZIP_ERR_BAD_EXTRACTED_FILE',
+            PCLZIP_ERR_DIR_CREATE_FAIL => 'PCLZIP_ERR_DIR_CREATE_FAIL',
+            PCLZIP_ERR_BAD_EXTENSION => 'PCLZIP_ERR_BAD_EXTENSION',
+            PCLZIP_ERR_BAD_FORMAT => 'PCLZIP_ERR_BAD_FORMAT',
+            PCLZIP_ERR_DELETE_FILE_FAIL => 'PCLZIP_ERR_DELETE_FILE_FAIL',
+            PCLZIP_ERR_RENAME_FILE_FAIL => 'PCLZIP_ERR_RENAME_FILE_FAIL',
+            PCLZIP_ERR_BAD_CHECKSUM => 'PCLZIP_ERR_BAD_CHECKSUM',
+            PCLZIP_ERR_INVALID_ARCHIVE_ZIP => 'PCLZIP_ERR_INVALID_ARCHIVE_ZIP',
+            PCLZIP_ERR_MISSING_OPTION_VALUE => 'PCLZIP_ERR_MISSING_OPTION_VALUE',
+            PCLZIP_ERR_INVALID_OPTION_VALUE => 'PCLZIP_ERR_INVALID_OPTION_VALUE',
+            PCLZIP_ERR_UNSUPPORTED_COMPRESSION => 'PCLZIP_ERR_UNSUPPORTED_COMPRESSION',
+            PCLZIP_ERR_UNSUPPORTED_ENCRYPTION => 'PCLZIP_ERR_UNSUPPORTED_ENCRYPTION',
+            PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE => 'PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE',
+            PCLZIP_ERR_DIRECTORY_RESTRICTION => 'PCLZIP_ERR_DIRECTORY_RESTRICTION'
+        );
+
+        if (isset($v_name[$this->error_code])) {
+            $v_value = $v_name[$this->error_code];
+        } else {
+            $v_value = 'NoName';
+        }
+
+        if ($p_with_code) {
+            return ($v_value . ' (' . $this->error_code . ')');
+        } else {
+            return ($v_value);
+        }
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : errorInfo()
+    // Description :
+    // Parameters :
+    // --------------------------------------------------------------------------------
+    public function errorInfo($p_full = false)
+    {
+        if (PCLZIP_ERROR_EXTERNAL == 1) {
+            return (PclErrorString());
+        } else {
+            if ($p_full) {
+                return ($this->errorName(true) . " : " . $this->error_string);
+            } else {
+                return ($this->error_string . " [code " . $this->error_code . "]");
+            }
+        }
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // ***** UNDER THIS LINE ARE DEFINED PRIVATE INTERNAL FUNCTIONS *****
+    // *****                                                        *****
+    // *****       THESES FUNCTIONS MUST NOT BE USED DIRECTLY       *****
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privCheckFormat()
+    // Description :
+    //   This method check that the archive exists and is a valid zip archive.
+    //   Several level of check exists. (futur)
+    // Parameters :
+    //   $p_level : Level of check. Default 0.
+    //              0 : Check the first bytes (magic codes) (default value))
+    //              1 : 0 + Check the central directory (futur)
+    //              2 : 1 + Check each file header (futur)
+    // Return Values :
+    //   true on success,
+    //   false on error, the error code is set.
+    // --------------------------------------------------------------------------------
+    public function privCheckFormat($p_level = 0)
+    {
+        $v_result = true;
+
+        // ----- Reset the file system cache
+        clearstatcache();
+
+        // ----- Reset the error handler
+        $this->privErrorReset();
+
+        // ----- Look if the file exits
+        if (!is_file($this->zipname)) {
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "Missing archive file '" . $this->zipname . "'");
+
+            return (false);
+        }
+
+        // ----- Check that the file is readeable
+        if (!is_readable($this->zipname)) {
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, "Unable to read archive '" . $this->zipname . "'");
+
+            return (false);
+        }
+
+        // ----- Check the magic code
+        // TBC
+
+        // ----- Check the central header
+        // TBC
+
+        // ----- Check each file header
+        // TBC
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privParseOptions()
+    // Description :
+    //   This internal methods reads the variable list of arguments ($p_options_list,
+    //   $p_size) and generate an array with the options and values ($v_result_list).
+    //   $v_requested_options contains the options that can be present and those that
+    //   must be present.
+    //   $v_requested_options is an array, with the option value as key, and 'optional',
+    //   or 'mandatory' as value.
+    // Parameters :
+    //   See above.
+    // Return Values :
+    //   1 on success.
+    //   0 on failure.
+    // --------------------------------------------------------------------------------
+    public function privParseOptions(&$p_options_list, $p_size, &$v_result_list, $v_requested_options = false)
+    {
+        $v_result = 1;
+
+        // ----- Read the options
+        $i = 0;
+        while ($i < $p_size) {
+
+            // ----- Check if the option is supported
+            if (!isset($v_requested_options[$p_options_list[$i]])) {
+                // ----- Error log
+                PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid optional parameter '" . $p_options_list[$i] . "' for this method");
 
                 // ----- Return
                 return PclZip::errorCode();
             }
 
-            // ----- Read the file header
-            $v_local_header = array();
-            if (($v_result = $this->privReadFileHeader($v_local_header)) != 1) {
-                // ----- Close the zip file
-                $this->privCloseFd();
-                $v_temp_zip->privCloseFd();
-                @unlink($v_zip_temp_name);
+            // ----- Look for next option
+            switch ($p_options_list[$i]) {
+                // ----- Look for options that request a path value
+                case PCLZIP_OPT_PATH:
+                case PCLZIP_OPT_REMOVE_PATH:
+                case PCLZIP_OPT_ADD_PATH:
+                    // ----- Check the number of parameters
+                    if (($i + 1) >= $p_size) {
+                        // ----- Error log
+                        PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
+
+                        // ----- Return
+                        return PclZip::errorCode();
+                    }
+
+                    // ----- Get the value
+                    $v_result_list[$p_options_list[$i]] = PclZipUtilTranslateWinPath($p_options_list[$i + 1], false);
+                    $i++;
+                    break;
+
+                case PCLZIP_OPT_TEMP_FILE_THRESHOLD:
+                    // ----- Check the number of parameters
+                    if (($i + 1) >= $p_size) {
+                        PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
+
+                        return PclZip::errorCode();
+                    }
+
+                    // ----- Check for incompatible options
+                    if (isset($v_result_list[PCLZIP_OPT_TEMP_FILE_OFF])) {
+                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '" . PclZipUtilOptionText($p_options_list[$i]) . "' can not be used with option 'PCLZIP_OPT_TEMP_FILE_OFF'");
+
+                        return PclZip::errorCode();
+                    }
+
+                    // ----- Check the value
+                    $v_value = $p_options_list[$i + 1];
+                    if ((!is_integer($v_value)) || ($v_value < 0)) {
+                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Integer expected for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
+
+                        return PclZip::errorCode();
+                    }
+
+                    // ----- Get the value (and convert it in bytes)
+                    $v_result_list[$p_options_list[$i]] = $v_value * 1048576;
+                    $i++;
+                    break;
+
+                case PCLZIP_OPT_TEMP_FILE_ON:
+                    // ----- Check for incompatible options
+                    if (isset($v_result_list[PCLZIP_OPT_TEMP_FILE_OFF])) {
+                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '" . PclZipUtilOptionText($p_options_list[$i]) . "' can not be used with option 'PCLZIP_OPT_TEMP_FILE_OFF'");
+
+                        return PclZip::errorCode();
+                    }
+
+                    $v_result_list[$p_options_list[$i]] = true;
+                    break;
+
+                case PCLZIP_OPT_TEMP_FILE_OFF:
+                    // ----- Check for incompatible options
+                    if (isset($v_result_list[PCLZIP_OPT_TEMP_FILE_ON])) {
+                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '" . PclZipUtilOptionText($p_options_list[$i]) . "' can not be used with option 'PCLZIP_OPT_TEMP_FILE_ON'");
+
+                        return PclZip::errorCode();
+                    }
+                    // ----- Check for incompatible options
+                    if (isset($v_result_list[PCLZIP_OPT_TEMP_FILE_THRESHOLD])) {
+                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '" . PclZipUtilOptionText($p_options_list[$i]) . "' can not be used with option 'PCLZIP_OPT_TEMP_FILE_THRESHOLD'");
+
+                        return PclZip::errorCode();
+                    }
+
+                    $v_result_list[$p_options_list[$i]] = true;
+                    break;
+
+                case PCLZIP_OPT_EXTRACT_DIR_RESTRICTION:
+                    // ----- Check the number of parameters
+                    if (($i + 1) >= $p_size) {
+                        // ----- Error log
+                        PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
+
+                        // ----- Return
+                        return PclZip::errorCode();
+                    }
+
+                    // ----- Get the value
+                    if (is_string($p_options_list[$i + 1]) && ($p_options_list[$i + 1] != '')) {
+                        $v_result_list[$p_options_list[$i]] = PclZipUtilTranslateWinPath($p_options_list[$i + 1], false);
+                        $i++;
+                    } else {
+                    }
+                    break;
+
+                // ----- Look for options that request an array of string for value
+                case PCLZIP_OPT_BY_NAME:
+                    // ----- Check the number of parameters
+                    if (($i + 1) >= $p_size) {
+                        // ----- Error log
+                        PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
+
+                        // ----- Return
+                        return PclZip::errorCode();
+                    }
+
+                    // ----- Get the value
+                    if (is_string($p_options_list[$i + 1])) {
+                        $v_result_list[$p_options_list[$i]][0] = $p_options_list[$i + 1];
+                    } elseif (is_array($p_options_list[$i + 1])) {
+                        $v_result_list[$p_options_list[$i]] = $p_options_list[$i + 1];
+                    } else {
+                        // ----- Error log
+                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Wrong parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
+
+                        // ----- Return
+                        return PclZip::errorCode();
+                    }
+                    $i++;
+                    break;
+
+                // ----- Look for options that request an EREG or PREG expression
+                case PCLZIP_OPT_BY_EREG:
+                    $p_options_list[$i] = PCLZIP_OPT_BY_PREG;
+                    // ereg() is deprecated starting with PHP 5.3. Move PCLZIP_OPT_BY_EREG
+                    // to PCLZIP_OPT_BY_PREG
+                case PCLZIP_OPT_BY_PREG:
+                    //case PCLZIP_OPT_CRYPT :
+                    // ----- Check the number of parameters
+                    if (($i + 1) >= $p_size) {
+                        // ----- Error log
+                        PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
+
+                        // ----- Return
+                        return PclZip::errorCode();
+                    }
+
+                    // ----- Get the value
+                    if (is_string($p_options_list[$i + 1])) {
+                        $v_result_list[$p_options_list[$i]] = $p_options_list[$i + 1];
+                    } else {
+                        // ----- Error log
+                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Wrong parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
+
+                        // ----- Return
+                        return PclZip::errorCode();
+                    }
+                    $i++;
+                    break;
+
+                // ----- Look for options that takes a string
+                case PCLZIP_OPT_COMMENT:
+                case PCLZIP_OPT_ADD_COMMENT:
+                case PCLZIP_OPT_PREPEND_COMMENT:
+                    // ----- Check the number of parameters
+                    if (($i + 1) >= $p_size) {
+                        // ----- Error log
+                        PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
+
+                        // ----- Return
+                        return PclZip::errorCode();
+                    }
+
+                    // ----- Get the value
+                    if (is_string($p_options_list[$i + 1])) {
+                        $v_result_list[$p_options_list[$i]] = $p_options_list[$i + 1];
+                    } else {
+                        // ----- Error log
+                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Wrong parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
+
+                        // ----- Return
+                        return PclZip::errorCode();
+                    }
+                    $i++;
+                    break;
+
+                // ----- Look for options that request an array of index
+                case PCLZIP_OPT_BY_INDEX:
+                    // ----- Check the number of parameters
+                    if (($i + 1) >= $p_size) {
+                        // ----- Error log
+                        PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
+
+                        // ----- Return
+                        return PclZip::errorCode();
+                    }
+
+                    // ----- Get the value
+                    $v_work_list = array();
+                    if (is_string($p_options_list[$i + 1])) {
+
+                        // ----- Remove spaces
+                        $p_options_list[$i + 1] = strtr($p_options_list[$i + 1], ' ', '');
+
+                        // ----- Parse items
+                        $v_work_list = explode(",", $p_options_list[$i + 1]);
+                    } elseif (is_integer($p_options_list[$i + 1])) {
+                        $v_work_list[0] = $p_options_list[$i + 1] . '-' . $p_options_list[$i + 1];
+                    } elseif (is_array($p_options_list[$i + 1])) {
+                        $v_work_list = $p_options_list[$i + 1];
+                    } else {
+                        // ----- Error log
+                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Value must be integer, string or array for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
+
+                        // ----- Return
+                        return PclZip::errorCode();
+                    }
+
+                    // ----- Reduce the index list
+                    // each index item in the list must be a couple with a start and
+                    // an end value : [0,3], [5-5], [8-10], ...
+                    // ----- Check the format of each item
+                    $v_sort_flag  = false;
+                    $v_sort_value = 0;
+                    for ($j = 0; $j < sizeof($v_work_list); $j++) {
+                        // ----- Explode the item
+                        $v_item_list      = explode("-", $v_work_list[$j]);
+                        $v_size_item_list = sizeof($v_item_list);
+
+                        // ----- TBC : Here we might check that each item is a
+                        // real integer ...
+
+                        // ----- Look for single value
+                        if ($v_size_item_list == 1) {
+                            // ----- Set the option value
+                            $v_result_list[$p_options_list[$i]][$j]['start'] = $v_item_list[0];
+                            $v_result_list[$p_options_list[$i]][$j]['end']   = $v_item_list[0];
+                        } elseif ($v_size_item_list == 2) {
+                            // ----- Set the option value
+                            $v_result_list[$p_options_list[$i]][$j]['start'] = $v_item_list[0];
+                            $v_result_list[$p_options_list[$i]][$j]['end']   = $v_item_list[1];
+                        } else {
+                            // ----- Error log
+                            PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Too many values in index range for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
+
+                            // ----- Return
+                            return PclZip::errorCode();
+                        }
+
+                        // ----- Look for list sort
+                        if ($v_result_list[$p_options_list[$i]][$j]['start'] < $v_sort_value) {
+                            $v_sort_flag = true;
+
+                            // ----- TBC : An automatic sort should be writen ...
+                            // ----- Error log
+                            PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Invalid order of index range for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
+
+                            // ----- Return
+                            return PclZip::errorCode();
+                        }
+                        $v_sort_value = $v_result_list[$p_options_list[$i]][$j]['start'];
+                    }
+
+                    // ----- Sort the items
+                    if ($v_sort_flag) {
+                        // TBC : To Be Completed
+                    }
+
+                    // ----- Next option
+                    $i++;
+                    break;
+
+                // ----- Look for options that request no value
+                case PCLZIP_OPT_REMOVE_ALL_PATH:
+                case PCLZIP_OPT_EXTRACT_AS_STRING:
+                case PCLZIP_OPT_NO_COMPRESSION:
+                case PCLZIP_OPT_EXTRACT_IN_OUTPUT:
+                case PCLZIP_OPT_REPLACE_NEWER:
+                case PCLZIP_OPT_STOP_ON_ERROR:
+                    $v_result_list[$p_options_list[$i]] = true;
+                    break;
+
+                // ----- Look for options that request an octal value
+                case PCLZIP_OPT_SET_CHMOD:
+                    // ----- Check the number of parameters
+                    if (($i + 1) >= $p_size) {
+                        // ----- Error log
+                        PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
+
+                        // ----- Return
+                        return PclZip::errorCode();
+                    }
+
+                    // ----- Get the value
+                    $v_result_list[$p_options_list[$i]] = $p_options_list[$i + 1];
+                    $i++;
+                    break;
+
+                // ----- Look for options that request a call-back
+                case PCLZIP_CB_PRE_EXTRACT:
+                case PCLZIP_CB_POST_EXTRACT:
+                case PCLZIP_CB_PRE_ADD:
+                case PCLZIP_CB_POST_ADD:
+                    /* for futur use
+                    case PCLZIP_CB_PRE_DELETE :
+                    case PCLZIP_CB_POST_DELETE :
+                    case PCLZIP_CB_PRE_LIST :
+                    case PCLZIP_CB_POST_LIST :
+                    */
+                    // ----- Check the number of parameters
+                    if (($i + 1) >= $p_size) {
+                        // ----- Error log
+                        PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
+
+                        // ----- Return
+                        return PclZip::errorCode();
+                    }
+
+                    // ----- Get the value
+                    $v_function_name = $p_options_list[$i + 1];
+
+                    // ----- Check that the value is a valid existing function
+                    if (!function_exists($v_function_name)) {
+                        // ----- Error log
+                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Function '" . $v_function_name . "()' is not an existing function for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
+
+                        // ----- Return
+                        return PclZip::errorCode();
+                    }
+
+                    // ----- Set the attribute
+                    $v_result_list[$p_options_list[$i]] = $v_function_name;
+                    $i++;
+                    break;
+
+                default:
+                    // ----- Error log
+                    PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Unknown parameter '" . $p_options_list[$i] . "'");
+
+                    // ----- Return
+                    return PclZip::errorCode();
+            }
+
+            // ----- Next options
+            $i++;
+        }
+
+        // ----- Look for mandatory options
+        if ($v_requested_options !== false) {
+            for ($key = reset($v_requested_options); $key = key($v_requested_options); $key = next($v_requested_options)) {
+                // ----- Look for mandatory option
+                if ($v_requested_options[$key] == 'mandatory') {
+                    // ----- Look if present
+                    if (!isset($v_result_list[$key])) {
+                        // ----- Error log
+                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Missing mandatory parameter " . PclZipUtilOptionText($key) . "(" . $key . ")");
+
+                        // ----- Return
+                        return PclZip::errorCode();
+                    }
+                }
+            }
+        }
+
+        // ----- Look for default values
+        if (!isset($v_result_list[PCLZIP_OPT_TEMP_FILE_THRESHOLD])) {
+
+        }
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privOptionDefaultThreshold()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privOptionDefaultThreshold(&$p_options)
+    {
+        $v_result = 1;
+
+        if (isset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD]) || isset($p_options[PCLZIP_OPT_TEMP_FILE_OFF])) {
+            return $v_result;
+        }
+
+        // ----- Get 'memory_limit' configuration value
+        $v_memory_limit = ini_get('memory_limit');
+        $v_memory_limit = trim($v_memory_limit);
+        $last           = strtolower(substr($v_memory_limit, -1));
+        $v_memory_limit = preg_replace('/\s*[KkMmGg]$/', '', $v_memory_limit);
+
+        if ($last == 'g') {
+            //$v_memory_limit = $v_memory_limit*1024*1024*1024;
+            $v_memory_limit = $v_memory_limit * 1073741824;
+        }
+        if ($last == 'm') {
+            //$v_memory_limit = $v_memory_limit*1024*1024;
+            $v_memory_limit = $v_memory_limit * 1048576;
+        }
+        if ($last == 'k') {
+            $v_memory_limit = $v_memory_limit * 1024;
+        }
+
+        $p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] = floor($v_memory_limit * PCLZIP_TEMPORARY_FILE_RATIO);
+
+        // ----- Sanity check : No threshold if value lower than 1M
+        if ($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] < 1048576) {
+            unset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD]);
+        }
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privFileDescrParseAtt()
+    // Description :
+    // Parameters :
+    // Return Values :
+    //   1 on success.
+    //   0 on failure.
+    // --------------------------------------------------------------------------------
+    public function privFileDescrParseAtt(&$p_file_list, &$p_filedescr, $v_options, $v_requested_options = false)
+    {
+        $v_result = 1;
+
+        // ----- For each file in the list check the attributes
+        foreach ($p_file_list as $v_key => $v_value) {
+
+            // ----- Check if the option is supported
+            if (!isset($v_requested_options[$v_key])) {
+                // ----- Error log
+                PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid file attribute '" . $v_key . "' for this file");
 
                 // ----- Return
-                return $v_result;
+                return PclZip::errorCode();
             }
-            
-            // ----- Check that local file header is same as central file header
-            if ($this->privCheckFileHeaders($v_local_header,
-			                                $v_header_list[$i]) != 1) {
-                // TBC
-            }
-            unset($v_local_header);
 
-            // ----- Write the file header
-            if (($v_result = $v_temp_zip->privWriteFileHeader($v_header_list[$i])) != 1) {
-                // ----- Close the zip file
-                $this->privCloseFd();
-                $v_temp_zip->privCloseFd();
-                @unlink($v_zip_temp_name);
+            // ----- Look for attribute
+            switch ($v_key) {
+                case PCLZIP_ATT_FILE_NAME:
+                    if (!is_string($v_value)) {
+                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type " . gettype($v_value) . ". String expected for attribute '" . PclZipUtilOptionText($v_key) . "'");
+
+                        return PclZip::errorCode();
+                    }
+
+                    $p_filedescr['filename'] = PclZipUtilPathReduction($v_value);
+
+                    if ($p_filedescr['filename'] == '') {
+                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid empty filename for attribute '" . PclZipUtilOptionText($v_key) . "'");
+
+                        return PclZip::errorCode();
+                    }
+
+                    break;
+
+                case PCLZIP_ATT_FILE_NEW_SHORT_NAME:
+                    if (!is_string($v_value)) {
+                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type " . gettype($v_value) . ". String expected for attribute '" . PclZipUtilOptionText($v_key) . "'");
+
+                        return PclZip::errorCode();
+                    }
+
+                    $p_filedescr['new_short_name'] = PclZipUtilPathReduction($v_value);
+
+                    if ($p_filedescr['new_short_name'] == '') {
+                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid empty short filename for attribute '" . PclZipUtilOptionText($v_key) . "'");
+
+                        return PclZip::errorCode();
+                    }
+                    break;
+
+                case PCLZIP_ATT_FILE_NEW_FULL_NAME:
+                    if (!is_string($v_value)) {
+                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type " . gettype($v_value) . ". String expected for attribute '" . PclZipUtilOptionText($v_key) . "'");
+
+                        return PclZip::errorCode();
+                    }
+
+                    $p_filedescr['new_full_name'] = PclZipUtilPathReduction($v_value);
+
+                    if ($p_filedescr['new_full_name'] == '') {
+                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid empty full filename for attribute '" . PclZipUtilOptionText($v_key) . "'");
+
+                        return PclZip::errorCode();
+                    }
+                    break;
+
+                // ----- Look for options that takes a string
+                case PCLZIP_ATT_FILE_COMMENT:
+                    if (!is_string($v_value)) {
+                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type " . gettype($v_value) . ". String expected for attribute '" . PclZipUtilOptionText($v_key) . "'");
+
+                        return PclZip::errorCode();
+                    }
+
+                    $p_filedescr['comment'] = $v_value;
+                    break;
+
+                case PCLZIP_ATT_FILE_MTIME:
+                    if (!is_integer($v_value)) {
+                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type " . gettype($v_value) . ". Integer expected for attribute '" . PclZipUtilOptionText($v_key) . "'");
+
+                        return PclZip::errorCode();
+                    }
+
+                    $p_filedescr['mtime'] = $v_value;
+                    break;
+
+                case PCLZIP_ATT_FILE_CONTENT:
+                    $p_filedescr['content'] = $v_value;
+                    break;
+
+                default:
+                    // ----- Error log
+                    PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Unknown parameter '" . $v_key . "'");
+
+                    // ----- Return
+                    return PclZip::errorCode();
+            }
+
+            // ----- Look for mandatory options
+            if ($v_requested_options !== false) {
+                for ($key = reset($v_requested_options); $key = key($v_requested_options); $key = next($v_requested_options)) {
+                    // ----- Look for mandatory option
+                    if ($v_requested_options[$key] == 'mandatory') {
+                        // ----- Look if present
+                        if (!isset($p_file_list[$key])) {
+                            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Missing mandatory parameter " . PclZipUtilOptionText($key) . "(" . $key . ")");
+
+                            return PclZip::errorCode();
+                        }
+                    }
+                }
+            }
+
+            // end foreach
+        }
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privFileDescrExpand()
+    // Description :
+    //   This method look for each item of the list to see if its a file, a folder
+    //   or a string to be added as file. For any other type of files (link, other)
+    //   just ignore the item.
+    //   Then prepare the information that will be stored for that file.
+    //   When its a folder, expand the folder with all the files that are in that
+    //   folder (recursively).
+    // Parameters :
+    // Return Values :
+    //   1 on success.
+    //   0 on failure.
+    // --------------------------------------------------------------------------------
+    public function privFileDescrExpand(&$p_filedescr_list, &$p_options)
+    {
+        $v_result = 1;
+
+        // ----- Create a result list
+        $v_result_list = array();
+
+        // ----- Look each entry
+        for ($i = 0; $i < sizeof($p_filedescr_list); $i++) {
+
+            // ----- Get filedescr
+            $v_descr = $p_filedescr_list[$i];
+
+            // ----- Reduce the filename
+            $v_descr['filename'] = PclZipUtilTranslateWinPath($v_descr['filename'], false);
+            $v_descr['filename'] = PclZipUtilPathReduction($v_descr['filename']);
+
+            // ----- Look for real file or folder
+            if (file_exists($v_descr['filename'])) {
+                if (@is_file($v_descr['filename'])) {
+                    $v_descr['type'] = 'file';
+                } elseif (@is_dir($v_descr['filename'])) {
+                    $v_descr['type'] = 'folder';
+                } elseif (@is_link($v_descr['filename'])) {
+                    // skip
+                    continue;
+                } else {
+                    // skip
+                    continue;
+                }
+
+            // ----- Look for string added as file
+            } elseif (isset($v_descr['content'])) {
+                $v_descr['type'] = 'virtual_file';
+
+            // ----- Missing file
+            } else {
+                // ----- Error log
+                PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "File '" . $v_descr['filename'] . "' does not exist");
 
                 // ----- Return
-                return $v_result;
+                return PclZip::errorCode();
             }
 
-            // ----- Read/write the data block
-            if (($v_result = PclZipUtilCopyBlock($this->zip_fd, $v_temp_zip->zip_fd, $v_header_list[$i]['compressed_size'])) != 1) {
-                // ----- Close the zip file
-                $this->privCloseFd();
-                $v_temp_zip->privCloseFd();
-                @unlink($v_zip_temp_name);
+            // ----- Calculate the stored filename
+            $this->privCalculateStoredFilename($v_descr, $p_options);
 
-                // ----- Return
-                return $v_result;
+            // ----- Add the descriptor in result list
+            $v_result_list[sizeof($v_result_list)] = $v_descr;
+
+            // ----- Look for folder
+            if ($v_descr['type'] == 'folder') {
+                // ----- List of items in folder
+                $v_dirlist_descr = array();
+                $v_dirlist_nb    = 0;
+                if ($v_folder_handler = @opendir($v_descr['filename'])) {
+                    while (($v_item_handler = @readdir($v_folder_handler)) !== false) {
+
+                        // ----- Skip '.' and '..'
+                        if (($v_item_handler == '.') || ($v_item_handler == '..')) {
+                            continue;
+                        }
+
+                        // ----- Compose the full filename
+                        $v_dirlist_descr[$v_dirlist_nb]['filename'] = $v_descr['filename'] . '/' . $v_item_handler;
+
+                        // ----- Look for different stored filename
+                        // Because the name of the folder was changed, the name of the
+                        // files/sub-folders also change
+                        if (($v_descr['stored_filename'] != $v_descr['filename']) && (!isset($p_options[PCLZIP_OPT_REMOVE_ALL_PATH]))) {
+                            if ($v_descr['stored_filename'] != '') {
+                                $v_dirlist_descr[$v_dirlist_nb]['new_full_name'] = $v_descr['stored_filename'] . '/' . $v_item_handler;
+                            } else {
+                                $v_dirlist_descr[$v_dirlist_nb]['new_full_name'] = $v_item_handler;
+                            }
+                        }
+
+                        $v_dirlist_nb++;
+                    }
+
+                    @closedir($v_folder_handler);
+                } else {
+                    // TBC : unable to open folder in read mode
+                }
+
+                // ----- Expand each element of the list
+                if ($v_dirlist_nb != 0) {
+                    // ----- Expand
+                    if (($v_result = $this->privFileDescrExpand($v_dirlist_descr, $p_options)) != 1) {
+                        return $v_result;
+                    }
+
+                    // ----- Concat the resulting list
+                    $v_result_list = array_merge($v_result_list, $v_dirlist_descr);
+                } else {
+                }
+
+                // ----- Free local array
+                unset($v_dirlist_descr);
             }
         }
 
+        // ----- Get the result list
+        $p_filedescr_list = $v_result_list;
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privCreate()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privCreate($p_filedescr_list, &$p_result_list, &$p_options)
+    {
+        $v_result      = 1;
+        $v_list_detail = array();
+
+        // ----- Magic quotes trick
+        $this->privDisableMagicQuotes();
+
+        // ----- Open the file in write mode
+        if (($v_result = $this->privOpenFd('wb')) != 1) {
+            // ----- Return
+            return $v_result;
+        }
+
+        // ----- Add the list of files
+        $v_result = $this->privAddList($p_filedescr_list, $p_result_list, $p_options);
+
+        // ----- Close
+        $this->privCloseFd();
+
+        // ----- Magic quotes trick
+        $this->privSwapBackMagicQuotes();
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privAdd()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privAdd($p_filedescr_list, &$p_result_list, &$p_options)
+    {
+        $v_result      = 1;
+        $v_list_detail = array();
+
+        // ----- Look if the archive exists or is empty
+        if ((!is_file($this->zipname)) || (filesize($this->zipname) == 0)) {
+
+            // ----- Do a create
+            $v_result = $this->privCreate($p_filedescr_list, $p_result_list, $p_options);
+
+            // ----- Return
+            return $v_result;
+        }
+        // ----- Magic quotes trick
+        $this->privDisableMagicQuotes();
+
+        // ----- Open the zip file
+        if (($v_result = $this->privOpenFd('rb')) != 1) {
+            // ----- Magic quotes trick
+            $this->privSwapBackMagicQuotes();
+
+            // ----- Return
+            return $v_result;
+        }
+
+        // ----- Read the central directory informations
+        $v_central_dir = array();
+        if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1) {
+            $this->privCloseFd();
+            $this->privSwapBackMagicQuotes();
+
+            return $v_result;
+        }
+
+        // ----- Go to beginning of File
+        @rewind($this->zip_fd);
+
+        // ----- Creates a temporay file
+        $v_zip_temp_name = PCLZIP_TEMPORARY_DIR . uniqid('pclzip-') . '.tmp';
+
+        // ----- Open the temporary file in write mode
+        if (($v_zip_temp_fd = @fopen($v_zip_temp_name, 'wb')) == 0) {
+            $this->privCloseFd();
+            $this->privSwapBackMagicQuotes();
+
+            PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \'' . $v_zip_temp_name . '\' in binary write mode');
+
+            // ----- Return
+            return PclZip::errorCode();
+        }
+
+        // ----- Copy the files from the archive to the temporary file
+        // TBC : Here I should better append the file and go back to erase the central dir
+        $v_size = $v_central_dir['offset'];
+        while ($v_size != 0) {
+            $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+            $v_buffer    = fread($this->zip_fd, $v_read_size);
+            @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
+            $v_size -= $v_read_size;
+        }
+
+        // ----- Swap the file descriptor
+        // Here is a trick : I swap the temporary fd with the zip fd, in order to use
+        // the following methods on the temporary fil and not the real archive
+        $v_swap        = $this->zip_fd;
+        $this->zip_fd  = $v_zip_temp_fd;
+        $v_zip_temp_fd = $v_swap;
+
+        // ----- Add the files
+        $v_header_list = array();
+        if (($v_result = $this->privAddFileList($p_filedescr_list, $v_header_list, $p_options)) != 1) {
+            fclose($v_zip_temp_fd);
+            $this->privCloseFd();
+            @unlink($v_zip_temp_name);
+            $this->privSwapBackMagicQuotes();
+
+            // ----- Return
+            return $v_result;
+        }
+
         // ----- Store the offset of the central dir
-        $v_offset = @ftell($v_temp_zip->zip_fd);
+        $v_offset = @ftell($this->zip_fd);
 
-        // ----- Re-Create the Central Dir files header
-        for ($i=0; $i<sizeof($v_header_list); $i++) {
+        // ----- Copy the block of file headers from the old archive
+        $v_size = $v_central_dir['size'];
+        while ($v_size != 0) {
+            $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+            $v_buffer    = @fread($v_zip_temp_fd, $v_read_size);
+            @fwrite($this->zip_fd, $v_buffer, $v_read_size);
+            $v_size -= $v_read_size;
+        }
+
+        // ----- Create the Central Dir files header
+        for ($i = 0, $v_count = 0; $i < sizeof($v_header_list); $i++) {
             // ----- Create the file header
-            if (($v_result = $v_temp_zip->privWriteCentralFileHeader($v_header_list[$i])) != 1) {
-                $v_temp_zip->privCloseFd();
-                $this->privCloseFd();
-                @unlink($v_zip_temp_name);
+            if ($v_header_list[$i]['status'] == 'ok') {
+                if (($v_result = $this->privWriteCentralFileHeader($v_header_list[$i])) != 1) {
+                    fclose($v_zip_temp_fd);
+                    $this->privCloseFd();
+                    @unlink($v_zip_temp_name);
+                    $this->privSwapBackMagicQuotes();
 
-                // ----- Return
-                return $v_result;
+                    // ----- Return
+                    return $v_result;
+                }
+                $v_count++;
             }
 
             // ----- Transform the header to a 'usable' info
-            $v_temp_zip->privConvertHeader2FileInfo($v_header_list[$i], $p_result_list[$i]);
+            $this->privConvertHeader2FileInfo($v_header_list[$i], $p_result_list[$i]);
         }
 
-
         // ----- Zip file comment
-        $v_comment = '';
+        $v_comment = $v_central_dir['comment'];
         if (isset($p_options[PCLZIP_OPT_COMMENT])) {
-          $v_comment = $p_options[PCLZIP_OPT_COMMENT];
+            $v_comment = $p_options[PCLZIP_OPT_COMMENT];
+        }
+        if (isset($p_options[PCLZIP_OPT_ADD_COMMENT])) {
+            $v_comment = $v_comment . $p_options[PCLZIP_OPT_ADD_COMMENT];
+        }
+        if (isset($p_options[PCLZIP_OPT_PREPEND_COMMENT])) {
+            $v_comment = $p_options[PCLZIP_OPT_PREPEND_COMMENT] . $v_comment;
         }
 
         // ----- Calculate the size of the central header
-        $v_size = @ftell($v_temp_zip->zip_fd)-$v_offset;
+        $v_size = @ftell($this->zip_fd) - $v_offset;
 
         // ----- Create the central dir footer
-        if (($v_result = $v_temp_zip->privWriteCentralHeader(sizeof($v_header_list), $v_size, $v_offset, $v_comment)) != 1) {
+        if (($v_result = $this->privWriteCentralHeader($v_count + $v_central_dir['entries'], $v_size, $v_offset, $v_comment)) != 1) {
             // ----- Reset the file list
             unset($v_header_list);
-            $v_temp_zip->privCloseFd();
-            $this->privCloseFd();
-            @unlink($v_zip_temp_name);
+            $this->privSwapBackMagicQuotes();
 
             // ----- Return
             return $v_result;
         }
 
+        // ----- Swap back the file descriptor
+        $v_swap        = $this->zip_fd;
+        $this->zip_fd  = $v_zip_temp_fd;
+        $v_zip_temp_fd = $v_swap;
+
         // ----- Close
-        $v_temp_zip->privCloseFd();
         $this->privCloseFd();
 
+        // ----- Close the temporary file
+        @fclose($v_zip_temp_fd);
+
+        // ----- Magic quotes trick
+        $this->privSwapBackMagicQuotes();
+
         // ----- Delete the zip file
         // TBC : I should test the result ...
         @unlink($this->zipname);
@@ -4952,545 +2268,2965 @@
         // TBC : I should test the result ...
         //@rename($v_zip_temp_name, $this->zipname);
         PclZipUtilRename($v_zip_temp_name, $this->zipname);
-    
-        // ----- Destroy the temporary archive
-        unset($v_temp_zip);
+
+        // ----- Return
+        return $v_result;
     }
-    
-    // ----- Remove every files : reset the file
-    else if ($v_central_dir['entries'] != 0) {
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privOpenFd()
+    // Description :
+    // Parameters :
+    // --------------------------------------------------------------------------------
+    public function privOpenFd($p_mode)
+    {
+        $v_result = 1;
+
+        // ----- Look if already open
+        if ($this->zip_fd != 0) {
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Zip file \'' . $this->zipname . '\' already open');
+
+            // ----- Return
+            return PclZip::errorCode();
+        }
+
+        // ----- Open the zip file
+        if (($this->zip_fd = @fopen($this->zipname, $p_mode)) == 0) {
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \'' . $this->zipname . '\' in ' . $p_mode . ' mode');
+
+            // ----- Return
+            return PclZip::errorCode();
+        }
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privCloseFd()
+    // Description :
+    // Parameters :
+    // --------------------------------------------------------------------------------
+    public function privCloseFd()
+    {
+        $v_result = 1;
+
+        if ($this->zip_fd != 0) {
+            @fclose($this->zip_fd);
+        }
+        $this->zip_fd = 0;
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privAddList()
+    // Description :
+    //   $p_add_dir and $p_remove_dir will give the ability to memorize a path which is
+    //   different from the real path of the file. This is usefull if you want to have PclTar
+    //   running in any directory, and memorize relative path from an other directory.
+    // Parameters :
+    //   $p_list : An array containing the file or directory names to add in the tar
+    //   $p_result_list : list of added files with their properties (specially the status field)
+    //   $p_add_dir : Path to add in the filename path archived
+    //   $p_remove_dir : Path to remove in the filename path archived
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    //  function privAddList($p_list, &$p_result_list, $p_add_dir, $p_remove_dir, $p_remove_all_dir, &$p_options)
+    public function privAddList($p_filedescr_list, &$p_result_list, &$p_options)
+    {
+        $v_result = 1;
+
+        // ----- Add the files
+        $v_header_list = array();
+        if (($v_result = $this->privAddFileList($p_filedescr_list, $v_header_list, $p_options)) != 1) {
+            // ----- Return
+            return $v_result;
+        }
+
+        // ----- Store the offset of the central dir
+        $v_offset = @ftell($this->zip_fd);
+
+        // ----- Create the Central Dir files header
+        for ($i = 0, $v_count = 0; $i < sizeof($v_header_list); $i++) {
+            // ----- Create the file header
+            if ($v_header_list[$i]['status'] == 'ok') {
+                if (($v_result = $this->privWriteCentralFileHeader($v_header_list[$i])) != 1) {
+                    // ----- Return
+                    return $v_result;
+                }
+                $v_count++;
+            }
+
+            // ----- Transform the header to a 'usable' info
+            $this->privConvertHeader2FileInfo($v_header_list[$i], $p_result_list[$i]);
+        }
+
+        // ----- Zip file comment
+        $v_comment = '';
+        if (isset($p_options[PCLZIP_OPT_COMMENT])) {
+            $v_comment = $p_options[PCLZIP_OPT_COMMENT];
+        }
+
+        // ----- Calculate the size of the central header
+        $v_size = @ftell($this->zip_fd) - $v_offset;
+
+        // ----- Create the central dir footer
+        if (($v_result = $this->privWriteCentralHeader($v_count, $v_size, $v_offset, $v_comment)) != 1) {
+            // ----- Reset the file list
+            unset($v_header_list);
+
+            // ----- Return
+            return $v_result;
+        }
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privAddFileList()
+    // Description :
+    // Parameters :
+    //   $p_filedescr_list : An array containing the file description
+    //                      or directory names to add in the zip
+    //   $p_result_list : list of added files with their properties (specially the status field)
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privAddFileList($p_filedescr_list, &$p_result_list, &$p_options)
+    {
+        $v_result = 1;
+        $v_header = array();
+
+        // ----- Recuperate the current number of elt in list
+        $v_nb = sizeof($p_result_list);
+
+        // ----- Loop on the files
+        for ($j = 0; ($j < sizeof($p_filedescr_list)) && ($v_result == 1); $j++) {
+            // ----- Format the filename
+            $p_filedescr_list[$j]['filename'] = PclZipUtilTranslateWinPath($p_filedescr_list[$j]['filename'], false);
+
+            // ----- Skip empty file names
+            // TBC : Can this be possible ? not checked in DescrParseAtt ?
+            if ($p_filedescr_list[$j]['filename'] == "") {
+                continue;
+            }
+
+            // ----- Check the filename
+            if (($p_filedescr_list[$j]['type'] != 'virtual_file') && (!file_exists($p_filedescr_list[$j]['filename']))) {
+                PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "File '" . $p_filedescr_list[$j]['filename'] . "' does not exist");
+
+                return PclZip::errorCode();
+            }
+
+            // ----- Look if it is a file or a dir with no all path remove option
+            // or a dir with all its path removed
+            //      if (   (is_file($p_filedescr_list[$j]['filename']))
+            //          || (   is_dir($p_filedescr_list[$j]['filename'])
+            if (($p_filedescr_list[$j]['type'] == 'file') || ($p_filedescr_list[$j]['type'] == 'virtual_file') || (($p_filedescr_list[$j]['type'] == 'folder') && (!isset($p_options[PCLZIP_OPT_REMOVE_ALL_PATH]) || !$p_options[PCLZIP_OPT_REMOVE_ALL_PATH]))) {
+
+                // ----- Add the file
+                $v_result = $this->privAddFile($p_filedescr_list[$j], $v_header, $p_options);
+                if ($v_result != 1) {
+                    return $v_result;
+                }
+
+                // ----- Store the file infos
+                $p_result_list[$v_nb++] = $v_header;
+            }
+        }
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privAddFile()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privAddFile($p_filedescr, &$p_header, &$p_options)
+    {
+        $v_result = 1;
+
+        // ----- Working variable
+        $p_filename = $p_filedescr['filename'];
+
+        // TBC : Already done in the fileAtt check ... ?
+        if ($p_filename == "") {
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid file list parameter (invalid or empty list)");
+
+            // ----- Return
+            return PclZip::errorCode();
+        }
+
+        // ----- Look for a stored different filename
+        /* TBC : Removed
+        if (isset($p_filedescr['stored_filename'])) {
+        $v_stored_filename = $p_filedescr['stored_filename'];
+        } else {
+        $v_stored_filename = $p_filedescr['stored_filename'];
+        }
+        */
+
+        // ----- Set the file properties
+        clearstatcache();
+        $p_header['version']           = 20;
+        $p_header['version_extracted'] = 10;
+        $p_header['flag']              = 0;
+        $p_header['compression']       = 0;
+        $p_header['crc']               = 0;
+        $p_header['compressed_size']   = 0;
+        $p_header['filename_len']      = strlen($p_filename);
+        $p_header['extra_len']         = 0;
+        $p_header['disk']              = 0;
+        $p_header['internal']          = 0;
+        $p_header['offset']            = 0;
+        $p_header['filename']          = $p_filename;
+        // TBC : Removed    $p_header['stored_filename'] = $v_stored_filename;
+        $p_header['stored_filename']   = $p_filedescr['stored_filename'];
+        $p_header['extra']             = '';
+        $p_header['status']            = 'ok';
+        $p_header['index']             = -1;
+
+        // ----- Look for regular file
+        if ($p_filedescr['type'] == 'file') {
+            $p_header['external'] = 0x00000000;
+            $p_header['size']     = filesize($p_filename);
+
+        // ----- Look for regular folder
+        } elseif ($p_filedescr['type'] == 'folder') {
+            $p_header['external'] = 0x00000010;
+            $p_header['mtime']    = filemtime($p_filename);
+            $p_header['size']     = filesize($p_filename);
+
+        // ----- Look for virtual file
+        } elseif ($p_filedescr['type'] == 'virtual_file') {
+            $p_header['external'] = 0x00000000;
+            $p_header['size']     = strlen($p_filedescr['content']);
+        }
+
+        // ----- Look for filetime
+        if (isset($p_filedescr['mtime'])) {
+            $p_header['mtime'] = $p_filedescr['mtime'];
+        } elseif ($p_filedescr['type'] == 'virtual_file') {
+            $p_header['mtime'] = time();
+        } else {
+            $p_header['mtime'] = filemtime($p_filename);
+        }
+
+        // ------ Look for file comment
+        if (isset($p_filedescr['comment'])) {
+            $p_header['comment_len'] = strlen($p_filedescr['comment']);
+            $p_header['comment']     = $p_filedescr['comment'];
+        } else {
+            $p_header['comment_len'] = 0;
+            $p_header['comment']     = '';
+        }
+
+        // ----- Look for pre-add callback
+        if (isset($p_options[PCLZIP_CB_PRE_ADD])) {
+
+            // ----- Generate a local information
+            $v_local_header = array();
+            $this->privConvertHeader2FileInfo($p_header, $v_local_header);
+
+            // ----- Call the callback
+            // Here I do not use call_user_func() because I need to send a reference to the
+            // header.
+            //      eval('$v_result = '.$p_options[PCLZIP_CB_PRE_ADD].'(PCLZIP_CB_PRE_ADD, $v_local_header);');
+            $v_result = $p_options[PCLZIP_CB_PRE_ADD](PCLZIP_CB_PRE_ADD, $v_local_header);
+            if ($v_result == 0) {
+                // ----- Change the file status
+                $p_header['status'] = "skipped";
+                $v_result           = 1;
+            }
+
+            // ----- Update the informations
+            // Only some fields can be modified
+            if ($p_header['stored_filename'] != $v_local_header['stored_filename']) {
+                $p_header['stored_filename'] = PclZipUtilPathReduction($v_local_header['stored_filename']);
+            }
+        }
+
+        // ----- Look for empty stored filename
+        if ($p_header['stored_filename'] == "") {
+            $p_header['status'] = "filtered";
+        }
+
+        // ----- Check the path length
+        if (strlen($p_header['stored_filename']) > 0xFF) {
+            $p_header['status'] = 'filename_too_long';
+        }
+
+        // ----- Look if no error, or file not skipped
+        if ($p_header['status'] == 'ok') {
+
+            // ----- Look for a file
+            if ($p_filedescr['type'] == 'file') {
+                // ----- Look for using temporary file to zip
+                if ((!isset($p_options[PCLZIP_OPT_TEMP_FILE_OFF])) && (isset($p_options[PCLZIP_OPT_TEMP_FILE_ON]) || (isset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD]) && ($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] <= $p_header['size'])))) {
+                    $v_result = $this->privAddFileUsingTempFile($p_filedescr, $p_header, $p_options);
+                    if ($v_result < PCLZIP_ERR_NO_ERROR) {
+                        return $v_result;
+                    }
+
+                // ----- Use "in memory" zip algo
+                } else {
+
+                    // ----- Open the source file
+                    if (($v_file = @fopen($p_filename, "rb")) == 0) {
+                        PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, "Unable to open file '$p_filename' in binary read mode");
+
+                        return PclZip::errorCode();
+                    }
+
+                    // ----- Read the file content
+                    $v_content = @fread($v_file, $p_header['size']);
+
+                    // ----- Close the file
+                    @fclose($v_file);
+
+                    // ----- Calculate the CRC
+                    $p_header['crc'] = @crc32($v_content);
+
+                    // ----- Look for no compression
+                    if ($p_options[PCLZIP_OPT_NO_COMPRESSION]) {
+                        // ----- Set header parameters
+                        $p_header['compressed_size'] = $p_header['size'];
+                        $p_header['compression']     = 0;
+
+                    // ----- Look for normal compression
+                    } else {
+                        // ----- Compress the content
+                        $v_content = @gzdeflate($v_content);
+
+                        // ----- Set header parameters
+                        $p_header['compressed_size'] = strlen($v_content);
+                        $p_header['compression']     = 8;
+                    }
+
+                    // ----- Call the header generation
+                    if (($v_result = $this->privWriteFileHeader($p_header)) != 1) {
+                        @fclose($v_file);
+
+                        return $v_result;
+                    }
+
+                    // ----- Write the compressed (or not) content
+                    @fwrite($this->zip_fd, $v_content, $p_header['compressed_size']);
+
+                }
+
+            // ----- Look for a virtual file (a file from string)
+            } elseif ($p_filedescr['type'] == 'virtual_file') {
+
+                $v_content = $p_filedescr['content'];
+
+                // ----- Calculate the CRC
+                $p_header['crc'] = @crc32($v_content);
+
+                // ----- Look for no compression
+                if ($p_options[PCLZIP_OPT_NO_COMPRESSION]) {
+                    // ----- Set header parameters
+                    $p_header['compressed_size'] = $p_header['size'];
+                    $p_header['compression']     = 0;
+
+                // ----- Look for normal compression
+                } else {
+                    // ----- Compress the content
+                    $v_content = @gzdeflate($v_content);
+
+                    // ----- Set header parameters
+                    $p_header['compressed_size'] = strlen($v_content);
+                    $p_header['compression']     = 8;
+                }
+
+                // ----- Call the header generation
+                if (($v_result = $this->privWriteFileHeader($p_header)) != 1) {
+                    @fclose($v_file);
+
+                    return $v_result;
+                }
+
+                // ----- Write the compressed (or not) content
+                @fwrite($this->zip_fd, $v_content, $p_header['compressed_size']);
+
+            // ----- Look for a directory
+            } elseif ($p_filedescr['type'] == 'folder') {
+                // ----- Look for directory last '/'
+                if (@substr($p_header['stored_filename'], -1) != '/') {
+                    $p_header['stored_filename'] .= '/';
+                }
+
+                // ----- Set the file properties
+                $p_header['size']     = 0;
+                //$p_header['external'] = 0x41FF0010;   // Value for a folder : to be checked
+                $p_header['external'] = 0x00000010; // Value for a folder : to be checked
+
+                // ----- Call the header generation
+                if (($v_result = $this->privWriteFileHeader($p_header)) != 1) {
+                    return $v_result;
+                }
+            }
+        }
+
+        // ----- Look for post-add callback
+        if (isset($p_options[PCLZIP_CB_POST_ADD])) {
+
+            // ----- Generate a local information
+            $v_local_header = array();
+            $this->privConvertHeader2FileInfo($p_header, $v_local_header);
+
+            // ----- Call the callback
+            // Here I do not use call_user_func() because I need to send a reference to the
+            // header.
+            //      eval('$v_result = '.$p_options[PCLZIP_CB_POST_ADD].'(PCLZIP_CB_POST_ADD, $v_local_header);');
+            $v_result = $p_options[PCLZIP_CB_POST_ADD](PCLZIP_CB_POST_ADD, $v_local_header);
+            if ($v_result == 0) {
+                // ----- Ignored
+                $v_result = 1;
+            }
+
+            // ----- Update the informations
+            // Nothing can be modified
+        }
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privAddFileUsingTempFile()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privAddFileUsingTempFile($p_filedescr, &$p_header, &$p_options)
+    {
+        $v_result = PCLZIP_ERR_NO_ERROR;
+
+        // ----- Working variable
+        $p_filename = $p_filedescr['filename'];
+
+        // ----- Open the source file
+        if (($v_file = @fopen($p_filename, "rb")) == 0) {
+            PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, "Unable to open file '$p_filename' in binary read mode");
+
+            return PclZip::errorCode();
+        }
+
+        // ----- Creates a compressed temporary file
+        $v_gzip_temp_name = PCLZIP_TEMPORARY_DIR . uniqid('pclzip-') . '.gz';
+        if (($v_file_compressed = @gzopen($v_gzip_temp_name, "wb")) == 0) {
+            fclose($v_file);
+            PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL, 'Unable to open temporary file \'' . $v_gzip_temp_name . '\' in binary write mode');
+
+            return PclZip::errorCode();
+        }
+
+        // ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks
+        $v_size = filesize($p_filename);
+        while ($v_size != 0) {
+            $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+            $v_buffer    = @fread($v_file, $v_read_size);
+            //$v_binary_data = pack('a'.$v_read_size, $v_buffer);
+            @gzputs($v_file_compressed, $v_buffer, $v_read_size);
+            $v_size -= $v_read_size;
+        }
+
+        // ----- Close the file
+        @fclose($v_file);
+        @gzclose($v_file_compressed);
+
+        // ----- Check the minimum file size
+        if (filesize($v_gzip_temp_name) < 18) {
+            PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'gzip temporary file \'' . $v_gzip_temp_name . '\' has invalid filesize - should be minimum 18 bytes');
+
+            return PclZip::errorCode();
+        }
+
+        // ----- Extract the compressed attributes
+        if (($v_file_compressed = @fopen($v_gzip_temp_name, "rb")) == 0) {
+            PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \'' . $v_gzip_temp_name . '\' in binary read mode');
+
+            return PclZip::errorCode();
+        }
+
+        // ----- Read the gzip file header
+        $v_binary_data = @fread($v_file_compressed, 10);
+        $v_data_header = unpack('a1id1/a1id2/a1cm/a1flag/Vmtime/a1xfl/a1os', $v_binary_data);
+
+        // ----- Check some parameters
+        $v_data_header['os'] = bin2hex($v_data_header['os']);
+
+        // ----- Read the gzip file footer
+        @fseek($v_file_compressed, filesize($v_gzip_temp_name) - 8);
+        $v_binary_data = @fread($v_file_compressed, 8);
+        $v_data_footer = unpack('Vcrc/Vcompressed_size', $v_binary_data);
+
+        // ----- Set the attributes
+        $p_header['compression']     = ord($v_data_header['cm']);
+        //$p_header['mtime'] = $v_data_header['mtime'];
+        $p_header['crc']             = $v_data_footer['crc'];
+        $p_header['compressed_size'] = filesize($v_gzip_temp_name) - 18;
+
+        // ----- Close the file
+        @fclose($v_file_compressed);
+
+        // ----- Call the header generation
+        if (($v_result = $this->privWriteFileHeader($p_header)) != 1) {
+            return $v_result;
+        }
+
+        // ----- Add the compressed data
+        if (($v_file_compressed = @fopen($v_gzip_temp_name, "rb")) == 0) {
+            PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \'' . $v_gzip_temp_name . '\' in binary read mode');
+
+            return PclZip::errorCode();
+        }
+
+        // ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks
+        fseek($v_file_compressed, 10);
+        $v_size = $p_header['compressed_size'];
+        while ($v_size != 0) {
+            $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+            $v_buffer    = @fread($v_file_compressed, $v_read_size);
+            //$v_binary_data = pack('a'.$v_read_size, $v_buffer);
+            @fwrite($this->zip_fd, $v_buffer, $v_read_size);
+            $v_size -= $v_read_size;
+        }
+
+        // ----- Close the file
+        @fclose($v_file_compressed);
+
+        // ----- Unlink the temporary file
+        @unlink($v_gzip_temp_name);
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privCalculateStoredFilename()
+    // Description :
+    //   Based on file descriptor properties and global options, this method
+    //   calculate the filename that will be stored in the archive.
+    // Parameters :
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privCalculateStoredFilename(&$p_filedescr, &$p_options)
+    {
+        $v_result = 1;
+
+        // ----- Working variables
+        $p_filename = $p_filedescr['filename'];
+        if (isset($p_options[PCLZIP_OPT_ADD_PATH])) {
+            $p_add_dir = $p_options[PCLZIP_OPT_ADD_PATH];
+        } else {
+            $p_add_dir = '';
+        }
+        if (isset($p_options[PCLZIP_OPT_REMOVE_PATH])) {
+            $p_remove_dir = $p_options[PCLZIP_OPT_REMOVE_PATH];
+        } else {
+            $p_remove_dir = '';
+        }
+        if (isset($p_options[PCLZIP_OPT_REMOVE_ALL_PATH])) {
+            $p_remove_all_dir = $p_options[PCLZIP_OPT_REMOVE_ALL_PATH];
+        } else {
+            $p_remove_all_dir = 0;
+        }
+
+        // ----- Look for full name change
+        if (isset($p_filedescr['new_full_name'])) {
+            // ----- Remove drive letter if any
+            $v_stored_filename = PclZipUtilTranslateWinPath($p_filedescr['new_full_name']);
+
+        // ----- Look for path and/or short name change
+        } else {
+
+            // ----- Look for short name change
+            // Its when we cahnge just the filename but not the path
+            if (isset($p_filedescr['new_short_name'])) {
+                $v_path_info = pathinfo($p_filename);
+                $v_dir       = '';
+                if ($v_path_info['dirname'] != '') {
+                    $v_dir = $v_path_info['dirname'] . '/';
+                }
+                $v_stored_filename = $v_dir . $p_filedescr['new_short_name'];
+            } else {
+                // ----- Calculate the stored filename
+                $v_stored_filename = $p_filename;
+            }
+
+            // ----- Look for all path to remove
+            if ($p_remove_all_dir) {
+                $v_stored_filename = basename($p_filename);
+
+            // ----- Look for partial path remove
+            } elseif ($p_remove_dir != "") {
+                if (substr($p_remove_dir, -1) != '/') {
+                    $p_remove_dir .= "/";
+                }
+
+                if ((substr($p_filename, 0, 2) == "./") || (substr($p_remove_dir, 0, 2) == "./")) {
+
+                    if ((substr($p_filename, 0, 2) == "./") && (substr($p_remove_dir, 0, 2) != "./")) {
+                        $p_remove_dir = "./" . $p_remove_dir;
+                    }
+                    if ((substr($p_filename, 0, 2) != "./") && (substr($p_remove_dir, 0, 2) == "./")) {
+                        $p_remove_dir = substr($p_remove_dir, 2);
+                    }
+                }
+
+                $v_compare = PclZipUtilPathInclusion($p_remove_dir, $v_stored_filename);
+                if ($v_compare > 0) {
+                    if ($v_compare == 2) {
+                        $v_stored_filename = "";
+                    } else {
+                        $v_stored_filename = substr($v_stored_filename, strlen($p_remove_dir));
+                    }
+                }
+            }
+
+            // ----- Remove drive letter if any
+            $v_stored_filename = PclZipUtilTranslateWinPath($v_stored_filename);
+
+            // ----- Look for path to add
+            if ($p_add_dir != "") {
+                if (substr($p_add_dir, -1) == "/") {
+                    $v_stored_filename = $p_add_dir . $v_stored_filename;
+                } else {
+                    $v_stored_filename = $p_add_dir . "/" . $v_stored_filename;
+                }
+            }
+        }
+
+        // ----- Filename (reduce the path of stored name)
+        $v_stored_filename              = PclZipUtilPathReduction($v_stored_filename);
+        $p_filedescr['stored_filename'] = $v_stored_filename;
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privWriteFileHeader()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privWriteFileHeader(&$p_header)
+    {
+        $v_result = 1;
+
+        // ----- Store the offset position of the file
+        $p_header['offset'] = ftell($this->zip_fd);
+
+        // ----- Transform UNIX mtime to DOS format mdate/mtime
+        $v_date  = getdate($p_header['mtime']);
+        $v_mtime = ($v_date['hours'] << 11) + ($v_date['minutes'] << 5) + $v_date['seconds'] / 2;
+        $v_mdate = (($v_date['year'] - 1980) << 9) + ($v_date['mon'] << 5) + $v_date['mday'];
+
+        // ----- Packed data
+        $v_binary_data = pack("VvvvvvVVVvv", 0x04034b50, $p_header['version_extracted'], $p_header['flag'], $p_header['compression'], $v_mtime, $v_mdate, $p_header['crc'], $p_header['compressed_size'], $p_header['size'], strlen($p_header['stored_filename']), $p_header['extra_len']);
+
+        // ----- Write the first 148 bytes of the header in the archive
+        fputs($this->zip_fd, $v_binary_data, 30);
+
+        // ----- Write the variable fields
+        if (strlen($p_header['stored_filename']) != 0) {
+            fputs($this->zip_fd, $p_header['stored_filename'], strlen($p_header['stored_filename']));
+        }
+        if ($p_header['extra_len'] != 0) {
+            fputs($this->zip_fd, $p_header['extra'], $p_header['extra_len']);
+        }
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privWriteCentralFileHeader()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privWriteCentralFileHeader(&$p_header)
+    {
+        $v_result = 1;
+
+        // TBC
+        //for (reset($p_header); $key = key($p_header); next($p_header)) {
+        //}
+
+        // ----- Transform UNIX mtime to DOS format mdate/mtime
+        $v_date  = getdate($p_header['mtime']);
+        $v_mtime = ($v_date['hours'] << 11) + ($v_date['minutes'] << 5) + $v_date['seconds'] / 2;
+        $v_mdate = (($v_date['year'] - 1980) << 9) + ($v_date['mon'] << 5) + $v_date['mday'];
+
+        // ----- Packed data
+        $v_binary_data = pack("VvvvvvvVVVvvvvvVV", 0x02014b50, $p_header['version'], $p_header['version_extracted'], $p_header['flag'], $p_header['compression'], $v_mtime, $v_mdate, $p_header['crc'], $p_header['compressed_size'], $p_header['size'], strlen($p_header['stored_filename']), $p_header['extra_len'], $p_header['comment_len'], $p_header['disk'], $p_header['internal'], $p_header['external'], $p_header['offset']);
+
+        // ----- Write the 42 bytes of the header in the zip file
+        fputs($this->zip_fd, $v_binary_data, 46);
+
+        // ----- Write the variable fields
+        if (strlen($p_header['stored_filename']) != 0) {
+            fputs($this->zip_fd, $p_header['stored_filename'], strlen($p_header['stored_filename']));
+        }
+        if ($p_header['extra_len'] != 0) {
+            fputs($this->zip_fd, $p_header['extra'], $p_header['extra_len']);
+        }
+        if ($p_header['comment_len'] != 0) {
+            fputs($this->zip_fd, $p_header['comment'], $p_header['comment_len']);
+        }
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privWriteCentralHeader()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privWriteCentralHeader($p_nb_entries, $p_size, $p_offset, $p_comment)
+    {
+        $v_result = 1;
+
+        // ----- Packed data
+        $v_binary_data = pack("VvvvvVVv", 0x06054b50, 0, 0, $p_nb_entries, $p_nb_entries, $p_size, $p_offset, strlen($p_comment));
+
+        // ----- Write the 22 bytes of the header in the zip file
+        fputs($this->zip_fd, $v_binary_data, 22);
+
+        // ----- Write the variable fields
+        if (strlen($p_comment) != 0) {
+            fputs($this->zip_fd, $p_comment, strlen($p_comment));
+        }
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privList()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privList(&$p_list)
+    {
+        $v_result = 1;
+
+        // ----- Magic quotes trick
+        $this->privDisableMagicQuotes();
+
+        // ----- Open the zip file
+        if (($this->zip_fd = @fopen($this->zipname, 'rb')) == 0) {
+            // ----- Magic quotes trick
+            $this->privSwapBackMagicQuotes();
+
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \'' . $this->zipname . '\' in binary read mode');
+
+            // ----- Return
+            return PclZip::errorCode();
+        }
+
+        // ----- Read the central directory informations
+        $v_central_dir = array();
+        if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1) {
+            $this->privSwapBackMagicQuotes();
+
+            return $v_result;
+        }
+
+        // ----- Go to beginning of Central Dir
+        @rewind($this->zip_fd);
+        if (@fseek($this->zip_fd, $v_central_dir['offset'])) {
+            $this->privSwapBackMagicQuotes();
+
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
+
+            // ----- Return
+            return PclZip::errorCode();
+        }
+
+        // ----- Read each entry
+        for ($i = 0; $i < $v_central_dir['entries']; $i++) {
+            // ----- Read the file header
+            if (($v_result = $this->privReadCentralFileHeader($v_header)) != 1) {
+                $this->privSwapBackMagicQuotes();
+
+                return $v_result;
+            }
+            $v_header['index'] = $i;
+
+            // ----- Get the only interesting attributes
+            $this->privConvertHeader2FileInfo($v_header, $p_list[$i]);
+            unset($v_header);
+        }
+
+        // ----- Close the zip file
         $this->privCloseFd();
 
+        // ----- Magic quotes trick
+        $this->privSwapBackMagicQuotes();
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privConvertHeader2FileInfo()
+    // Description :
+    //   This function takes the file informations from the central directory
+    //   entries and extract the interesting parameters that will be given back.
+    //   The resulting file infos are set in the array $p_info
+    //     $p_info['filename'] : Filename with full path. Given by user (add),
+    //                           extracted in the filesystem (extract).
+    //     $p_info['stored_filename'] : Stored filename in the archive.
+    //     $p_info['size'] = Size of the file.
+    //     $p_info['compressed_size'] = Compressed size of the file.
+    //     $p_info['mtime'] = Last modification date of the file.
+    //     $p_info['comment'] = Comment associated with the file.
+    //     $p_info['folder'] = true/false : indicates if the entry is a folder or not.
+    //     $p_info['status'] = status of the action on the file.
+    //     $p_info['crc'] = CRC of the file content.
+    // Parameters :
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privConvertHeader2FileInfo($p_header, &$p_info)
+    {
+        $v_result = 1;
+
+        // ----- Get the interesting attributes
+        $v_temp_path               = PclZipUtilPathReduction($p_header['filename']);
+        $p_info['filename']        = $v_temp_path;
+        $v_temp_path               = PclZipUtilPathReduction($p_header['stored_filename']);
+        $p_info['stored_filename'] = $v_temp_path;
+        $p_info['size']            = $p_header['size'];
+        $p_info['compressed_size'] = $p_header['compressed_size'];
+        $p_info['mtime']           = $p_header['mtime'];
+        $p_info['comment']         = $p_header['comment'];
+        $p_info['folder']          = (($p_header['external'] & 0x00000010) == 0x00000010);
+        $p_info['index']           = $p_header['index'];
+        $p_info['status']          = $p_header['status'];
+        $p_info['crc']             = $p_header['crc'];
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privExtractByRule()
+    // Description :
+    //   Extract a file or directory depending of rules (by index, by name, ...)
+    // Parameters :
+    //   $p_file_list : An array where will be placed the properties of each
+    //                  extracted file
+    //   $p_path : Path to add while writing the extracted files
+    //   $p_remove_path : Path to remove (from the file memorized path) while writing the
+    //                    extracted files. If the path does not match the file path,
+    //                    the file is extracted with its memorized path.
+    //                    $p_remove_path does not apply to 'list' mode.
+    //                    $p_path and $p_remove_path are commulative.
+    // Return Values :
+    //   1 on success,0 or less on error (see error code list)
+    // --------------------------------------------------------------------------------
+    public function privExtractByRule(&$p_file_list, $p_path, $p_remove_path, $p_remove_all_path, &$p_options)
+    {
+        $v_result = 1;
+
+        // ----- Magic quotes trick
+        $this->privDisableMagicQuotes();
+
+        // ----- Check the path
+        if (($p_path == "") || ((substr($p_path, 0, 1) != "/") && (substr($p_path, 0, 3) != "../") && (substr($p_path, 1, 2) != ":/"))) {
+            $p_path = "./" . $p_path;
+        }
+
+        // ----- Reduce the path last (and duplicated) '/'
+        if (($p_path != "./") && ($p_path != "/")) {
+            // ----- Look for the path end '/'
+            while (substr($p_path, -1) == "/") {
+                $p_path = substr($p_path, 0, strlen($p_path) - 1);
+            }
+        }
+
+        // ----- Look for path to remove format (should end by /)
+        if (($p_remove_path != "") && (substr($p_remove_path, -1) != '/')) {
+            $p_remove_path .= '/';
+        }
+        $p_remove_path_size = strlen($p_remove_path);
+
+        // ----- Open the zip file
+        if (($v_result = $this->privOpenFd('rb')) != 1) {
+            $this->privSwapBackMagicQuotes();
+
+            return $v_result;
+        }
+
+        // ----- Read the central directory informations
+        $v_central_dir = array();
+        if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1) {
+            // ----- Close the zip file
+            $this->privCloseFd();
+            $this->privSwapBackMagicQuotes();
+
+            return $v_result;
+        }
+
+        // ----- Start at beginning of Central Dir
+        $v_pos_entry = $v_central_dir['offset'];
+
+        // ----- Read each entry
+        $j_start = 0;
+        for ($i = 0, $v_nb_extracted = 0; $i < $v_central_dir['entries']; $i++) {
+
+            // ----- Read next Central dir entry
+            @rewind($this->zip_fd);
+            if (@fseek($this->zip_fd, $v_pos_entry)) {
+                // ----- Close the zip file
+                $this->privCloseFd();
+                $this->privSwapBackMagicQuotes();
+
+                // ----- Error log
+                PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
+
+                // ----- Return
+                return PclZip::errorCode();
+            }
+
+            // ----- Read the file header
+            $v_header = array();
+            if (($v_result = $this->privReadCentralFileHeader($v_header)) != 1) {
+                // ----- Close the zip file
+                $this->privCloseFd();
+                $this->privSwapBackMagicQuotes();
+
+                return $v_result;
+            }
+
+            // ----- Store the index
+            $v_header['index'] = $i;
+
+            // ----- Store the file position
+            $v_pos_entry = ftell($this->zip_fd);
+
+            // ----- Look for the specific extract rules
+            $v_extract = false;
+
+            // ----- Look for extract by name rule
+            if ((isset($p_options[PCLZIP_OPT_BY_NAME])) && ($p_options[PCLZIP_OPT_BY_NAME] != 0)) {
+
+                // ----- Look if the filename is in the list
+                for ($j = 0; ($j < sizeof($p_options[PCLZIP_OPT_BY_NAME])) && (!$v_extract); $j++) {
+
+                    // ----- Look for a directory
+                    if (substr($p_options[PCLZIP_OPT_BY_NAME][$j], -1) == "/") {
+
+                        // ----- Look if the directory is in the filename path
+                        if ((strlen($v_header['stored_filename']) > strlen($p_options[PCLZIP_OPT_BY_NAME][$j])) && (substr($v_header['stored_filename'], 0, strlen($p_options[PCLZIP_OPT_BY_NAME][$j])) == $p_options[PCLZIP_OPT_BY_NAME][$j])) {
+                            $v_extract = true;
+                        }
+
+                    // ----- Look for a filename
+                    } elseif ($v_header['stored_filename'] == $p_options[PCLZIP_OPT_BY_NAME][$j]) {
+                        $v_extract = true;
+                    }
+                }
+            // ----- Look for extract by ereg rule
+            // ereg() is deprecated with PHP 5.3
+            /*
+            elseif (   (isset($p_options[PCLZIP_OPT_BY_EREG]))
+            && ($p_options[PCLZIP_OPT_BY_EREG] != "")) {
+
+            if (ereg($p_options[PCLZIP_OPT_BY_EREG], $v_header['stored_filename'])) {
+            $v_extract = true;
+            }
+            }
+            */
+
+            // ----- Look for extract by preg rule
+            } elseif ((isset($p_options[PCLZIP_OPT_BY_PREG])) && ($p_options[PCLZIP_OPT_BY_PREG] != "")) {
+
+                if (preg_match($p_options[PCLZIP_OPT_BY_PREG], $v_header['stored_filename'])) {
+                    $v_extract = true;
+                }
+
+            // ----- Look for extract by index rule
+            } elseif ((isset($p_options[PCLZIP_OPT_BY_INDEX])) && ($p_options[PCLZIP_OPT_BY_INDEX] != 0)) {
+
+                // ----- Look if the index is in the list
+                for ($j = $j_start; ($j < sizeof($p_options[PCLZIP_OPT_BY_INDEX])) && (!$v_extract); $j++) {
+
+                    if (($i >= $p_options[PCLZIP_OPT_BY_INDEX][$j]['start']) && ($i <= $p_options[PCLZIP_OPT_BY_INDEX][$j]['end'])) {
+                        $v_extract = true;
+                    }
+                    if ($i >= $p_options[PCLZIP_OPT_BY_INDEX][$j]['end']) {
+                        $j_start = $j + 1;
+                    }
+
+                    if ($p_options[PCLZIP_OPT_BY_INDEX][$j]['start'] > $i) {
+                        break;
+                    }
+                }
+
+            // ----- Look for no rule, which means extract all the archive
+            } else {
+                $v_extract = true;
+            }
+
+            // ----- Check compression method
+            if (($v_extract) && (($v_header['compression'] != 8) && ($v_header['compression'] != 0))) {
+                $v_header['status'] = 'unsupported_compression';
+
+                // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
+                if ((isset($p_options[PCLZIP_OPT_STOP_ON_ERROR])) && ($p_options[PCLZIP_OPT_STOP_ON_ERROR] === true)) {
+
+                    $this->privSwapBackMagicQuotes();
+
+                    PclZip::privErrorLog(PCLZIP_ERR_UNSUPPORTED_COMPRESSION, "Filename '" . $v_header['stored_filename'] . "' is " . "compressed by an unsupported compression " . "method (" . $v_header['compression'] . ") ");
+
+                    return PclZip::errorCode();
+                }
+            }
+
+            // ----- Check encrypted files
+            if (($v_extract) && (($v_header['flag'] & 1) == 1)) {
+                $v_header['status'] = 'unsupported_encryption';
+
+                // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
+                if ((isset($p_options[PCLZIP_OPT_STOP_ON_ERROR])) && ($p_options[PCLZIP_OPT_STOP_ON_ERROR] === true)) {
+
+                    $this->privSwapBackMagicQuotes();
+
+                    PclZip::privErrorLog(PCLZIP_ERR_UNSUPPORTED_ENCRYPTION, "Unsupported encryption for " . " filename '" . $v_header['stored_filename'] . "'");
+
+                    return PclZip::errorCode();
+                }
+            }
+
+            // ----- Look for real extraction
+            if (($v_extract) && ($v_header['status'] != 'ok')) {
+                $v_result = $this->privConvertHeader2FileInfo($v_header, $p_file_list[$v_nb_extracted++]);
+                if ($v_result != 1) {
+                    $this->privCloseFd();
+                    $this->privSwapBackMagicQuotes();
+
+                    return $v_result;
+                }
+
+                $v_extract = false;
+            }
+
+            // ----- Look for real extraction
+            if ($v_extract) {
+
+                // ----- Go to the file position
+                @rewind($this->zip_fd);
+                if (@fseek($this->zip_fd, $v_header['offset'])) {
+                    // ----- Close the zip file
+                    $this->privCloseFd();
+
+                    $this->privSwapBackMagicQuotes();
+
+                    // ----- Error log
+                    PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
+
+                    // ----- Return
+                    return PclZip::errorCode();
+                }
+
+                // ----- Look for extraction as string
+                if ($p_options[PCLZIP_OPT_EXTRACT_AS_STRING]) {
+
+                    $v_string = '';
+
+                    // ----- Extracting the file
+                    $v_result1 = $this->privExtractFileAsString($v_header, $v_string, $p_options);
+                    if ($v_result1 < 1) {
+                        $this->privCloseFd();
+                        $this->privSwapBackMagicQuotes();
+
+                        return $v_result1;
+                    }
+
+                    // ----- Get the only interesting attributes
+                    if (($v_result = $this->privConvertHeader2FileInfo($v_header, $p_file_list[$v_nb_extracted])) != 1) {
+                        // ----- Close the zip file
+                        $this->privCloseFd();
+                        $this->privSwapBackMagicQuotes();
+
+                        return $v_result;
+                    }
+
+                    // ----- Set the file content
+                    $p_file_list[$v_nb_extracted]['content'] = $v_string;
+
+                    // ----- Next extracted file
+                    $v_nb_extracted++;
+
+                    // ----- Look for user callback abort
+                    if ($v_result1 == 2) {
+                        break;
+                    }
+
+                // ----- Look for extraction in standard output
+                } elseif ((isset($p_options[PCLZIP_OPT_EXTRACT_IN_OUTPUT])) && ($p_options[PCLZIP_OPT_EXTRACT_IN_OUTPUT])) {
+                    // ----- Extracting the file in standard output
+                    $v_result1 = $this->privExtractFileInOutput($v_header, $p_options);
+                    if ($v_result1 < 1) {
+                        $this->privCloseFd();
+                        $this->privSwapBackMagicQuotes();
+
+                        return $v_result1;
+                    }
+
+                    // ----- Get the only interesting attributes
+                    if (($v_result = $this->privConvertHeader2FileInfo($v_header, $p_file_list[$v_nb_extracted++])) != 1) {
+                        $this->privCloseFd();
+                        $this->privSwapBackMagicQuotes();
+
+                        return $v_result;
+                    }
+
+                    // ----- Look for user callback abort
+                    if ($v_result1 == 2) {
+                        break;
+                    }
+
+                // ----- Look for normal extraction
+                } else {
+                    // ----- Extracting the file
+                    $v_result1 = $this->privExtractFile($v_header, $p_path, $p_remove_path, $p_remove_all_path, $p_options);
+                    if ($v_result1 < 1) {
+                        $this->privCloseFd();
+                        $this->privSwapBackMagicQuotes();
+
+                        return $v_result1;
+                    }
+
+                    // ----- Get the only interesting attributes
+                    if (($v_result = $this->privConvertHeader2FileInfo($v_header, $p_file_list[$v_nb_extracted++])) != 1) {
+                        // ----- Close the zip file
+                        $this->privCloseFd();
+                        $this->privSwapBackMagicQuotes();
+
+                        return $v_result;
+                    }
+
+                    // ----- Look for user callback abort
+                    if ($v_result1 == 2) {
+                        break;
+                    }
+                }
+            }
+        }
+
+        // ----- Close the zip file
+        $this->privCloseFd();
+        $this->privSwapBackMagicQuotes();
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privExtractFile()
+    // Description :
+    // Parameters :
+    // Return Values :
+    //
+    // 1 : ... ?
+    // PCLZIP_ERR_USER_ABORTED(2) : User ask for extraction stop in callback
+    // --------------------------------------------------------------------------------
+    public function privExtractFile(&$p_entry, $p_path, $p_remove_path, $p_remove_all_path, &$p_options)
+    {
+        $v_result = 1;
+
+        // ----- Read the file header
+        if (($v_result = $this->privReadFileHeader($v_header)) != 1) {
+            // ----- Return
+            return $v_result;
+        }
+
+        // ----- Check that the file header is coherent with $p_entry info
+        if ($this->privCheckFileHeaders($v_header, $p_entry) != 1) {
+            // TBC
+        }
+
+        // ----- Look for all path to remove
+        if ($p_remove_all_path == true) {
+            // ----- Look for folder entry that not need to be extracted
+            if (($p_entry['external'] & 0x00000010) == 0x00000010) {
+
+                $p_entry['status'] = "filtered";
+
+                return $v_result;
+            }
+
+            // ----- Get the basename of the path
+            $p_entry['filename'] = basename($p_entry['filename']);
+
+        // ----- Look for path to remove
+        } elseif ($p_remove_path != "") {
+            if (PclZipUtilPathInclusion($p_remove_path, $p_entry['filename']) == 2) {
+
+                // ----- Change the file status
+                $p_entry['status'] = "filtered";
+
+                // ----- Return
+                return $v_result;
+            }
+
+            $p_remove_path_size = strlen($p_remove_path);
+            if (substr($p_entry['filename'], 0, $p_remove_path_size) == $p_remove_path) {
+
+                // ----- Remove the path
+                $p_entry['filename'] = substr($p_entry['filename'], $p_remove_path_size);
+
+            }
+        }
+
+        // ----- Add the path
+        if ($p_path != '') {
+            $p_entry['filename'] = $p_path . "/" . $p_entry['filename'];
+        }
+
+        // ----- Check a base_dir_restriction
+        if (isset($p_options[PCLZIP_OPT_EXTRACT_DIR_RESTRICTION])) {
+            $v_inclusion = PclZipUtilPathInclusion($p_options[PCLZIP_OPT_EXTRACT_DIR_RESTRICTION], $p_entry['filename']);
+            if ($v_inclusion == 0) {
+
+                PclZip::privErrorLog(PCLZIP_ERR_DIRECTORY_RESTRICTION, "Filename '" . $p_entry['filename'] . "' is " . "outside PCLZIP_OPT_EXTRACT_DIR_RESTRICTION");
+
+                return PclZip::errorCode();
+            }
+        }
+
+        // ----- Look for pre-extract callback
+        if (isset($p_options[PCLZIP_CB_PRE_EXTRACT])) {
+
+            // ----- Generate a local information
+            $v_local_header = array();
+            $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
+
+            // ----- Call the callback
+            // Here I do not use call_user_func() because I need to send a reference to the
+            // header.
+            //      eval('$v_result = '.$p_options[PCLZIP_CB_PRE_EXTRACT].'(PCLZIP_CB_PRE_EXTRACT, $v_local_header);');
+            $v_result = $p_options[PCLZIP_CB_PRE_EXTRACT](PCLZIP_CB_PRE_EXTRACT, $v_local_header);
+            if ($v_result == 0) {
+                // ----- Change the file status
+                $p_entry['status'] = "skipped";
+                $v_result          = 1;
+            }
+
+            // ----- Look for abort result
+            if ($v_result == 2) {
+                // ----- This status is internal and will be changed in 'skipped'
+                $p_entry['status'] = "aborted";
+                $v_result          = PCLZIP_ERR_USER_ABORTED;
+            }
+
+            // ----- Update the informations
+            // Only some fields can be modified
+            $p_entry['filename'] = $v_local_header['filename'];
+        }
+
+        // ----- Look if extraction should be done
+        if ($p_entry['status'] == 'ok') {
+
+            // ----- Look for specific actions while the file exist
+            if (file_exists($p_entry['filename'])) {
+
+                // ----- Look if file is a directory
+                if (is_dir($p_entry['filename'])) {
+
+                    // ----- Change the file status
+                    $p_entry['status'] = "already_a_directory";
+
+                    // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
+                    // For historical reason first PclZip implementation does not stop
+                    // when this kind of error occurs.
+                    if ((isset($p_options[PCLZIP_OPT_STOP_ON_ERROR])) && ($p_options[PCLZIP_OPT_STOP_ON_ERROR] === true)) {
+
+                        PclZip::privErrorLog(PCLZIP_ERR_ALREADY_A_DIRECTORY, "Filename '" . $p_entry['filename'] . "' is " . "already used by an existing directory");
+
+                        return PclZip::errorCode();
+                    }
+
+                // ----- Look if file is write protected
+                } elseif (!is_writeable($p_entry['filename'])) {
+
+                    // ----- Change the file status
+                    $p_entry['status'] = "write_protected";
+
+                    // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
+                    // For historical reason first PclZip implementation does not stop
+                    // when this kind of error occurs.
+                    if ((isset($p_options[PCLZIP_OPT_STOP_ON_ERROR])) && ($p_options[PCLZIP_OPT_STOP_ON_ERROR] === true)) {
+
+                        PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL, "Filename '" . $p_entry['filename'] . "' exists " . "and is write protected");
+
+                        return PclZip::errorCode();
+                    }
+
+                // ----- Look if the extracted file is older
+                } elseif (filemtime($p_entry['filename']) > $p_entry['mtime']) {
+                    // ----- Change the file status
+                    if ((isset($p_options[PCLZIP_OPT_REPLACE_NEWER])) && ($p_options[PCLZIP_OPT_REPLACE_NEWER] === true)) {
+                    } else {
+                        $p_entry['status'] = "newer_exist";
+
+                        // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
+                        // For historical reason first PclZip implementation does not stop
+                        // when this kind of error occurs.
+                        if ((isset($p_options[PCLZIP_OPT_STOP_ON_ERROR])) && ($p_options[PCLZIP_OPT_STOP_ON_ERROR] === true)) {
+
+                            PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL, "Newer version of '" . $p_entry['filename'] . "' exists " . "and option PCLZIP_OPT_REPLACE_NEWER is not selected");
+
+                            return PclZip::errorCode();
+                        }
+                    }
+                } else {
+                }
+
+            // ----- Check the directory availability and create it if necessary
+            } else {
+                if ((($p_entry['external'] & 0x00000010) == 0x00000010) || (substr($p_entry['filename'], -1) == '/')) {
+                    $v_dir_to_check = $p_entry['filename'];
+                } elseif (!strstr($p_entry['filename'], "/")) {
+                    $v_dir_to_check = "";
+                } else {
+                    $v_dir_to_check = dirname($p_entry['filename']);
+                }
+
+                if (($v_result = $this->privDirCheck($v_dir_to_check, (($p_entry['external'] & 0x00000010) == 0x00000010))) != 1) {
+
+                    // ----- Change the file status
+                    $p_entry['status'] = "path_creation_fail";
+
+                    // ----- Return
+                    //return $v_result;
+                    $v_result = 1;
+                }
+            }
+        }
+
+        // ----- Look if extraction should be done
+        if ($p_entry['status'] == 'ok') {
+
+            // ----- Do the extraction (if not a folder)
+            if (!(($p_entry['external'] & 0x00000010) == 0x00000010)) {
+                // ----- Look for not compressed file
+                if ($p_entry['compression'] == 0) {
+
+                    // ----- Opening destination file
+                    if (($v_dest_file = @fopen($p_entry['filename'], 'wb')) == 0) {
+
+                        // ----- Change the file status
+                        $p_entry['status'] = "write_error";
+
+                        // ----- Return
+                        return $v_result;
+                    }
+
+                    // ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks
+                    $v_size = $p_entry['compressed_size'];
+                    while ($v_size != 0) {
+                        $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+                        $v_buffer    = @fread($this->zip_fd, $v_read_size);
+                        /* Try to speed up the code
+                        $v_binary_data = pack('a'.$v_read_size, $v_buffer);
+                        @fwrite($v_dest_file, $v_binary_data, $v_read_size);
+                        */
+                        @fwrite($v_dest_file, $v_buffer, $v_read_size);
+                        $v_size -= $v_read_size;
+                    }
+
+                    // ----- Closing the destination file
+                    fclose($v_dest_file);
+
+                    // ----- Change the file mtime
+                    touch($p_entry['filename'], $p_entry['mtime']);
+
+                } else {
+                    // ----- TBC
+                    // Need to be finished
+                    if (($p_entry['flag'] & 1) == 1) {
+                        PclZip::privErrorLog(PCLZIP_ERR_UNSUPPORTED_ENCRYPTION, 'File \'' . $p_entry['filename'] . '\' is encrypted. Encrypted files are not supported.');
+
+                        return PclZip::errorCode();
+                    }
+
+                    // ----- Look for using temporary file to unzip
+                    if ((!isset($p_options[PCLZIP_OPT_TEMP_FILE_OFF])) && (isset($p_options[PCLZIP_OPT_TEMP_FILE_ON]) || (isset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD]) && ($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] <= $p_entry['size'])))) {
+                        $v_result = $this->privExtractFileUsingTempFile($p_entry, $p_options);
+                        if ($v_result < PCLZIP_ERR_NO_ERROR) {
+                            return $v_result;
+                        }
+
+                    // ----- Look for extract in memory
+                    } else {
+
+                        // ----- Read the compressed file in a buffer (one shot)
+                        $v_buffer = @fread($this->zip_fd, $p_entry['compressed_size']);
+
+                        // ----- Decompress the file
+                        $v_file_content = @gzinflate($v_buffer);
+                        unset($v_buffer);
+                        if ($v_file_content === false) {
+
+                            // ----- Change the file status
+                            // TBC
+                            $p_entry['status'] = "error";
+
+                            return $v_result;
+                        }
+
+                        // ----- Opening destination file
+                        if (($v_dest_file = @fopen($p_entry['filename'], 'wb')) == 0) {
+
+                            // ----- Change the file status
+                            $p_entry['status'] = "write_error";
+
+                            return $v_result;
+                        }
+
+                        // ----- Write the uncompressed data
+                        @fwrite($v_dest_file, $v_file_content, $p_entry['size']);
+                        unset($v_file_content);
+
+                        // ----- Closing the destination file
+                        @fclose($v_dest_file);
+
+                    }
+
+                    // ----- Change the file mtime
+                    @touch($p_entry['filename'], $p_entry['mtime']);
+                }
+
+                // ----- Look for chmod option
+                if (isset($p_options[PCLZIP_OPT_SET_CHMOD])) {
+
+                    // ----- Change the mode of the file
+                    @chmod($p_entry['filename'], $p_options[PCLZIP_OPT_SET_CHMOD]);
+                }
+
+            }
+        }
+
+        // ----- Change abort status
+        if ($p_entry['status'] == "aborted") {
+            $p_entry['status'] = "skipped";
+
+        // ----- Look for post-extract callback
+        } elseif (isset($p_options[PCLZIP_CB_POST_EXTRACT])) {
+
+            // ----- Generate a local information
+            $v_local_header = array();
+            $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
+
+            // ----- Call the callback
+            // Here I do not use call_user_func() because I need to send a reference to the
+            // header.
+            //      eval('$v_result = '.$p_options[PCLZIP_CB_POST_EXTRACT].'(PCLZIP_CB_POST_EXTRACT, $v_local_header);');
+            $v_result = $p_options[PCLZIP_CB_POST_EXTRACT](PCLZIP_CB_POST_EXTRACT, $v_local_header);
+
+            // ----- Look for abort result
+            if ($v_result == 2) {
+                $v_result = PCLZIP_ERR_USER_ABORTED;
+            }
+        }
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privExtractFileUsingTempFile()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privExtractFileUsingTempFile(&$p_entry, &$p_options)
+    {
+        $v_result = 1;
+
+        // ----- Creates a temporary file
+        $v_gzip_temp_name = PCLZIP_TEMPORARY_DIR . uniqid('pclzip-') . '.gz';
+        if (($v_dest_file = @fopen($v_gzip_temp_name, "wb")) == 0) {
+            fclose($v_file);
+            PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL, 'Unable to open temporary file \'' . $v_gzip_temp_name . '\' in binary write mode');
+
+            return PclZip::errorCode();
+        }
+
+        // ----- Write gz file format header
+        $v_binary_data = pack('va1a1Va1a1', 0x8b1f, Chr($p_entry['compression']), Chr(0x00), time(), Chr(0x00), Chr(3));
+        @fwrite($v_dest_file, $v_binary_data, 10);
+
+        // ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks
+        $v_size = $p_entry['compressed_size'];
+        while ($v_size != 0) {
+            $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+            $v_buffer    = @fread($this->zip_fd, $v_read_size);
+            //$v_binary_data = pack('a'.$v_read_size, $v_buffer);
+            @fwrite($v_dest_file, $v_buffer, $v_read_size);
+            $v_size -= $v_read_size;
+        }
+
+        // ----- Write gz file format footer
+        $v_binary_data = pack('VV', $p_entry['crc'], $p_entry['size']);
+        @fwrite($v_dest_file, $v_binary_data, 8);
+
+        // ----- Close the temporary file
+        @fclose($v_dest_file);
+
+        // ----- Opening destination file
+        if (($v_dest_file = @fopen($p_entry['filename'], 'wb')) == 0) {
+            $p_entry['status'] = "write_error";
+
+            return $v_result;
+        }
+
+        // ----- Open the temporary gz file
+        if (($v_src_file = @gzopen($v_gzip_temp_name, 'rb')) == 0) {
+            @fclose($v_dest_file);
+            $p_entry['status'] = "read_error";
+            PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \'' . $v_gzip_temp_name . '\' in binary read mode');
+
+            return PclZip::errorCode();
+        }
+
+        // ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks
+        $v_size = $p_entry['size'];
+        while ($v_size != 0) {
+            $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+            $v_buffer    = @gzread($v_src_file, $v_read_size);
+            //$v_binary_data = pack('a'.$v_read_size, $v_buffer);
+            @fwrite($v_dest_file, $v_buffer, $v_read_size);
+            $v_size -= $v_read_size;
+        }
+        @fclose($v_dest_file);
+        @gzclose($v_src_file);
+
+        // ----- Delete the temporary file
+        @unlink($v_gzip_temp_name);
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privExtractFileInOutput()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privExtractFileInOutput(&$p_entry, &$p_options)
+    {
+        $v_result = 1;
+
+        // ----- Read the file header
+        if (($v_result = $this->privReadFileHeader($v_header)) != 1) {
+            return $v_result;
+        }
+
+        // ----- Check that the file header is coherent with $p_entry info
+        if ($this->privCheckFileHeaders($v_header, $p_entry) != 1) {
+            // TBC
+        }
+
+        // ----- Look for pre-extract callback
+        if (isset($p_options[PCLZIP_CB_PRE_EXTRACT])) {
+
+            // ----- Generate a local information
+            $v_local_header = array();
+            $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
+
+            // ----- Call the callback
+            // Here I do not use call_user_func() because I need to send a reference to the
+            // header.
+            //      eval('$v_result = '.$p_options[PCLZIP_CB_PRE_EXTRACT].'(PCLZIP_CB_PRE_EXTRACT, $v_local_header);');
+            $v_result = $p_options[PCLZIP_CB_PRE_EXTRACT](PCLZIP_CB_PRE_EXTRACT, $v_local_header);
+            if ($v_result == 0) {
+                // ----- Change the file status
+                $p_entry['status'] = "skipped";
+                $v_result          = 1;
+            }
+
+            // ----- Look for abort result
+            if ($v_result == 2) {
+                // ----- This status is internal and will be changed in 'skipped'
+                $p_entry['status'] = "aborted";
+                $v_result          = PCLZIP_ERR_USER_ABORTED;
+            }
+
+            // ----- Update the informations
+            // Only some fields can be modified
+            $p_entry['filename'] = $v_local_header['filename'];
+        }
+
+        // ----- Trace
+
+        // ----- Look if extraction should be done
+        if ($p_entry['status'] == 'ok') {
+
+            // ----- Do the extraction (if not a folder)
+            if (!(($p_entry['external'] & 0x00000010) == 0x00000010)) {
+                // ----- Look for not compressed file
+                if ($p_entry['compressed_size'] == $p_entry['size']) {
+
+                    // ----- Read the file in a buffer (one shot)
+                    $v_buffer = @fread($this->zip_fd, $p_entry['compressed_size']);
+
+                    // ----- Send the file to the output
+                    echo $v_buffer;
+                    unset($v_buffer);
+                } else {
+
+                    // ----- Read the compressed file in a buffer (one shot)
+                    $v_buffer = @fread($this->zip_fd, $p_entry['compressed_size']);
+
+                    // ----- Decompress the file
+                    $v_file_content = gzinflate($v_buffer);
+                    unset($v_buffer);
+
+                    // ----- Send the file to the output
+                    echo $v_file_content;
+                    unset($v_file_content);
+                }
+            }
+        }
+
+        // ----- Change abort status
+        if ($p_entry['status'] == "aborted") {
+            $p_entry['status'] = "skipped";
+
+        // ----- Look for post-extract callback
+        } elseif (isset($p_options[PCLZIP_CB_POST_EXTRACT])) {
+
+            // ----- Generate a local information
+            $v_local_header = array();
+            $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
+
+            // ----- Call the callback
+            // Here I do not use call_user_func() because I need to send a reference to the
+            // header.
+            //      eval('$v_result = '.$p_options[PCLZIP_CB_POST_EXTRACT].'(PCLZIP_CB_POST_EXTRACT, $v_local_header);');
+            $v_result = $p_options[PCLZIP_CB_POST_EXTRACT](PCLZIP_CB_POST_EXTRACT, $v_local_header);
+
+            // ----- Look for abort result
+            if ($v_result == 2) {
+                $v_result = PCLZIP_ERR_USER_ABORTED;
+            }
+        }
+
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privExtractFileAsString()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privExtractFileAsString(&$p_entry, &$p_string, &$p_options)
+    {
+        $v_result = 1;
+
+        // ----- Read the file header
+        $v_header = array();
+        if (($v_result = $this->privReadFileHeader($v_header)) != 1) {
+            // ----- Return
+            return $v_result;
+        }
+
+        // ----- Check that the file header is coherent with $p_entry info
+        if ($this->privCheckFileHeaders($v_header, $p_entry) != 1) {
+            // TBC
+        }
+
+        // ----- Look for pre-extract callback
+        if (isset($p_options[PCLZIP_CB_PRE_EXTRACT])) {
+
+            // ----- Generate a local information
+            $v_local_header = array();
+            $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
+
+            // ----- Call the callback
+            // Here I do not use call_user_func() because I need to send a reference to the
+            // header.
+            //      eval('$v_result = '.$p_options[PCLZIP_CB_PRE_EXTRACT].'(PCLZIP_CB_PRE_EXTRACT, $v_local_header);');
+            $v_result = $p_options[PCLZIP_CB_PRE_EXTRACT](PCLZIP_CB_PRE_EXTRACT, $v_local_header);
+            if ($v_result == 0) {
+                // ----- Change the file status
+                $p_entry['status'] = "skipped";
+                $v_result          = 1;
+            }
+
+            // ----- Look for abort result
+            if ($v_result == 2) {
+                // ----- This status is internal and will be changed in 'skipped'
+                $p_entry['status'] = "aborted";
+                $v_result          = PCLZIP_ERR_USER_ABORTED;
+            }
+
+            // ----- Update the informations
+            // Only some fields can be modified
+            $p_entry['filename'] = $v_local_header['filename'];
+        }
+
+        // ----- Look if extraction should be done
+        if ($p_entry['status'] == 'ok') {
+
+            // ----- Do the extraction (if not a folder)
+            if (!(($p_entry['external'] & 0x00000010) == 0x00000010)) {
+                // ----- Look for not compressed file
+                //      if ($p_entry['compressed_size'] == $p_entry['size'])
+                if ($p_entry['compression'] == 0) {
+
+                    // ----- Reading the file
+                    $p_string = @fread($this->zip_fd, $p_entry['compressed_size']);
+                } else {
+
+                    // ----- Reading the file
+                    $v_data = @fread($this->zip_fd, $p_entry['compressed_size']);
+
+                    // ----- Decompress the file
+                    if (($p_string = @gzinflate($v_data)) === false) {
+                        // TBC
+                    }
+                }
+
+                // ----- Trace
+            } else {
+                // TBC : error : can not extract a folder in a string
+            }
+
+        }
+
+        // ----- Change abort status
+        if ($p_entry['status'] == "aborted") {
+            $p_entry['status'] = "skipped";
+
+        // ----- Look for post-extract callback
+        } elseif (isset($p_options[PCLZIP_CB_POST_EXTRACT])) {
+
+            // ----- Generate a local information
+            $v_local_header = array();
+            $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
+
+            // ----- Swap the content to header
+            $v_local_header['content'] = $p_string;
+            $p_string                  = '';
+
+            // ----- Call the callback
+            // Here I do not use call_user_func() because I need to send a reference to the
+            // header.
+            //      eval('$v_result = '.$p_options[PCLZIP_CB_POST_EXTRACT].'(PCLZIP_CB_POST_EXTRACT, $v_local_header);');
+            $v_result = $p_options[PCLZIP_CB_POST_EXTRACT](PCLZIP_CB_POST_EXTRACT, $v_local_header);
+
+            // ----- Swap back the content to header
+            $p_string = $v_local_header['content'];
+            unset($v_local_header['content']);
+
+            // ----- Look for abort result
+            if ($v_result == 2) {
+                $v_result = PCLZIP_ERR_USER_ABORTED;
+            }
+        }
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privReadFileHeader()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privReadFileHeader(&$p_header)
+    {
+        $v_result = 1;
+
+        // ----- Read the 4 bytes signature
+        $v_binary_data = @fread($this->zip_fd, 4);
+        $v_data        = unpack('Vid', $v_binary_data);
+
+        // ----- Check signature
+        if ($v_data['id'] != 0x04034b50) {
+
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Invalid archive structure');
+
+            // ----- Return
+            return PclZip::errorCode();
+        }
+
+        // ----- Read the first 42 bytes of the header
+        $v_binary_data = fread($this->zip_fd, 26);
+
+        // ----- Look for invalid block size
+        if (strlen($v_binary_data) != 26) {
+            $p_header['filename'] = "";
+            $p_header['status']   = "invalid_header";
+
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Invalid block size : " . strlen($v_binary_data));
+
+            // ----- Return
+            return PclZip::errorCode();
+        }
+
+        // ----- Extract the values
+        $v_data = unpack('vversion/vflag/vcompression/vmtime/vmdate/Vcrc/Vcompressed_size/Vsize/vfilename_len/vextra_len', $v_binary_data);
+
+        // ----- Get filename
+        $p_header['filename'] = fread($this->zip_fd, $v_data['filename_len']);
+
+        // ----- Get extra_fields
+        if ($v_data['extra_len'] != 0) {
+            $p_header['extra'] = fread($this->zip_fd, $v_data['extra_len']);
+        } else {
+            $p_header['extra'] = '';
+        }
+
+        // ----- Extract properties
+        $p_header['version_extracted'] = $v_data['version'];
+        $p_header['compression']       = $v_data['compression'];
+        $p_header['size']              = $v_data['size'];
+        $p_header['compressed_size']   = $v_data['compressed_size'];
+        $p_header['crc']               = $v_data['crc'];
+        $p_header['flag']              = $v_data['flag'];
+        $p_header['filename_len']      = $v_data['filename_len'];
+
+        // ----- Recuperate date in UNIX format
+        $p_header['mdate'] = $v_data['mdate'];
+        $p_header['mtime'] = $v_data['mtime'];
+        if ($p_header['mdate'] && $p_header['mtime']) {
+            // ----- Extract time
+            $v_hour    = ($p_header['mtime'] & 0xF800) >> 11;
+            $v_minute  = ($p_header['mtime'] & 0x07E0) >> 5;
+            $v_seconde = ($p_header['mtime'] & 0x001F) * 2;
+
+            // ----- Extract date
+            $v_year  = (($p_header['mdate'] & 0xFE00) >> 9) + 1980;
+            $v_month = ($p_header['mdate'] & 0x01E0) >> 5;
+            $v_day   = $p_header['mdate'] & 0x001F;
+
+            // ----- Get UNIX date format
+            $p_header['mtime'] = @mktime($v_hour, $v_minute, $v_seconde, $v_month, $v_day, $v_year);
+
+        } else {
+            $p_header['mtime'] = time();
+        }
+
+        // TBC
+        //for (reset($v_data); $key = key($v_data); next($v_data)) {
+        //}
+
+        // ----- Set the stored filename
+        $p_header['stored_filename'] = $p_header['filename'];
+
+        // ----- Set the status field
+        $p_header['status'] = "ok";
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privReadCentralFileHeader()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privReadCentralFileHeader(&$p_header)
+    {
+        $v_result = 1;
+
+        // ----- Read the 4 bytes signature
+        $v_binary_data = @fread($this->zip_fd, 4);
+        $v_data        = unpack('Vid', $v_binary_data);
+
+        // ----- Check signature
+        if ($v_data['id'] != 0x02014b50) {
+
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Invalid archive structure');
+
+            // ----- Return
+            return PclZip::errorCode();
+        }
+
+        // ----- Read the first 42 bytes of the header
+        $v_binary_data = fread($this->zip_fd, 42);
+
+        // ----- Look for invalid block size
+        if (strlen($v_binary_data) != 42) {
+            $p_header['filename'] = "";
+            $p_header['status']   = "invalid_header";
+
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Invalid block size : " . strlen($v_binary_data));
+
+            // ----- Return
+            return PclZip::errorCode();
+        }
+
+        // ----- Extract the values
+        $p_header = unpack('vversion/vversion_extracted/vflag/vcompression/vmtime/vmdate/Vcrc/Vcompressed_size/Vsize/vfilename_len/vextra_len/vcomment_len/vdisk/vinternal/Vexternal/Voffset', $v_binary_data);
+
+        // ----- Get filename
+        if ($p_header['filename_len'] != 0) {
+            $p_header['filename'] = fread($this->zip_fd, $p_header['filename_len']);
+        } else {
+            $p_header['filename'] = '';
+        }
+
+        // ----- Get extra
+        if ($p_header['extra_len'] != 0) {
+            $p_header['extra'] = fread($this->zip_fd, $p_header['extra_len']);
+        } else {
+            $p_header['extra'] = '';
+        }
+
+        // ----- Get comment
+        if ($p_header['comment_len'] != 0) {
+            $p_header['comment'] = fread($this->zip_fd, $p_header['comment_len']);
+        } else {
+            $p_header['comment'] = '';
+        }
+
+        // ----- Extract properties
+
+        // ----- Recuperate date in UNIX format
+        //if ($p_header['mdate'] && $p_header['mtime'])
+        // TBC : bug : this was ignoring time with 0/0/0
+        if (1) {
+            // ----- Extract time
+            $v_hour    = ($p_header['mtime'] & 0xF800) >> 11;
+            $v_minute  = ($p_header['mtime'] & 0x07E0) >> 5;
+            $v_seconde = ($p_header['mtime'] & 0x001F) * 2;
+
+            // ----- Extract date
+            $v_year  = (($p_header['mdate'] & 0xFE00) >> 9) + 1980;
+            $v_month = ($p_header['mdate'] & 0x01E0) >> 5;
+            $v_day   = $p_header['mdate'] & 0x001F;
+
+            // ----- Get UNIX date format
+            $p_header['mtime'] = @mktime($v_hour, $v_minute, $v_seconde, $v_month, $v_day, $v_year);
+
+        } else {
+            $p_header['mtime'] = time();
+        }
+
+        // ----- Set the stored filename
+        $p_header['stored_filename'] = $p_header['filename'];
+
+        // ----- Set default status to ok
+        $p_header['status'] = 'ok';
+
+        // ----- Look if it is a directory
+        if (substr($p_header['filename'], -1) == '/') {
+            //$p_header['external'] = 0x41FF0010;
+            $p_header['external'] = 0x00000010;
+        }
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privCheckFileHeaders()
+    // Description :
+    // Parameters :
+    // Return Values :
+    //   1 on success,
+    //   0 on error;
+    // --------------------------------------------------------------------------------
+    public function privCheckFileHeaders(&$p_local_header, &$p_central_header)
+    {
+        $v_result = 1;
+
+        // ----- Check the static values
+        // TBC
+        if ($p_local_header['filename'] != $p_central_header['filename']) {
+        }
+        if ($p_local_header['version_extracted'] != $p_central_header['version_extracted']) {
+        }
+        if ($p_local_header['flag'] != $p_central_header['flag']) {
+        }
+        if ($p_local_header['compression'] != $p_central_header['compression']) {
+        }
+        if ($p_local_header['mtime'] != $p_central_header['mtime']) {
+        }
+        if ($p_local_header['filename_len'] != $p_central_header['filename_len']) {
+        }
+
+        // ----- Look for flag bit 3
+        if (($p_local_header['flag'] & 8) == 8) {
+            $p_local_header['size']            = $p_central_header['size'];
+            $p_local_header['compressed_size'] = $p_central_header['compressed_size'];
+            $p_local_header['crc']             = $p_central_header['crc'];
+        }
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privReadEndCentralDir()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privReadEndCentralDir(&$p_central_dir)
+    {
+        $v_result = 1;
+
+        // ----- Go to the end of the zip file
+        $v_size = filesize($this->zipname);
+        @fseek($this->zip_fd, $v_size);
+        if (@ftell($this->zip_fd) != $v_size) {
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Unable to go to the end of the archive \'' . $this->zipname . '\'');
+
+            // ----- Return
+            return PclZip::errorCode();
+        }
+
+        // ----- First try : look if this is an archive with no commentaries (most of the time)
+        // in this case the end of central dir is at 22 bytes of the file end
+        $v_found = 0;
+        if ($v_size > 26) {
+            @fseek($this->zip_fd, $v_size - 22);
+            if (($v_pos = @ftell($this->zip_fd)) != ($v_size - 22)) {
+                // ----- Error log
+                PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Unable to seek back to the middle of the archive \'' . $this->zipname . '\'');
+
+                // ----- Return
+                return PclZip::errorCode();
+            }
+
+            // ----- Read for bytes
+            $v_binary_data = @fread($this->zip_fd, 4);
+            $v_data        = @unpack('Vid', $v_binary_data);
+
+            // ----- Check signature
+            if ($v_data['id'] == 0x06054b50) {
+                $v_found = 1;
+            }
+
+            $v_pos = ftell($this->zip_fd);
+        }
+
+        // ----- Go back to the maximum possible size of the Central Dir End Record
+        if (!$v_found) {
+            $v_maximum_size = 65557; // 0xFFFF + 22;
+            if ($v_maximum_size > $v_size) {
+                $v_maximum_size = $v_size;
+            }
+            @fseek($this->zip_fd, $v_size - $v_maximum_size);
+            if (@ftell($this->zip_fd) != ($v_size - $v_maximum_size)) {
+                // ----- Error log
+                PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Unable to seek back to the middle of the archive \'' . $this->zipname . '\'');
+
+                // ----- Return
+                return PclZip::errorCode();
+            }
+
+            // ----- Read byte per byte in order to find the signature
+            $v_pos   = ftell($this->zip_fd);
+            $v_bytes = 0x00000000;
+            while ($v_pos < $v_size) {
+                // ----- Read a byte
+                $v_byte = @fread($this->zip_fd, 1);
+
+                // -----  Add the byte
+                //$v_bytes = ($v_bytes << 8) | Ord($v_byte);
+                // Note we mask the old value down such that once shifted we can never end up with more than a 32bit number
+                // Otherwise on systems where we have 64bit integers the check below for the magic number will fail.
+                $v_bytes = (($v_bytes & 0xFFFFFF) << 8) | Ord($v_byte);
+
+                // ----- Compare the bytes
+                if ($v_bytes == 0x504b0506) {
+                    $v_pos++;
+                    break;
+                }
+
+                $v_pos++;
+            }
+
+            // ----- Look if not found end of central dir
+            if ($v_pos == $v_size) {
+
+                // ----- Error log
+                PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Unable to find End of Central Dir Record signature");
+
+                // ----- Return
+                return PclZip::errorCode();
+            }
+        }
+
+        // ----- Read the first 18 bytes of the header
+        $v_binary_data = fread($this->zip_fd, 18);
+
+        // ----- Look for invalid block size
+        if (strlen($v_binary_data) != 18) {
+
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Invalid End of Central Dir Record size : " . strlen($v_binary_data));
+
+            // ----- Return
+            return PclZip::errorCode();
+        }
+
+        // ----- Extract the values
+        $v_data = unpack('vdisk/vdisk_start/vdisk_entries/ventries/Vsize/Voffset/vcomment_size', $v_binary_data);
+
+        // ----- Check the global size
+        if (($v_pos + $v_data['comment_size'] + 18) != $v_size) {
+
+            // ----- Removed in release 2.2 see readme file
+            // The check of the file size is a little too strict.
+            // Some bugs where found when a zip is encrypted/decrypted with 'crypt'.
+            // While decrypted, zip has training 0 bytes
+            if (0) {
+                // ----- Error log
+                PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'The central dir is not at the end of the archive.' . ' Some trailing bytes exists after the archive.');
+
+                // ----- Return
+                return PclZip::errorCode();
+            }
+        }
+
+        // ----- Get comment
+        if ($v_data['comment_size'] != 0) {
+            $p_central_dir['comment'] = fread($this->zip_fd, $v_data['comment_size']);
+        } else {
+            $p_central_dir['comment'] = '';
+        }
+
+        $p_central_dir['entries']      = $v_data['entries'];
+        $p_central_dir['disk_entries'] = $v_data['disk_entries'];
+        $p_central_dir['offset']       = $v_data['offset'];
+        $p_central_dir['size']         = $v_data['size'];
+        $p_central_dir['disk']         = $v_data['disk'];
+        $p_central_dir['disk_start']   = $v_data['disk_start'];
+
+        // TBC
+        //for (reset($p_central_dir); $key = key($p_central_dir); next($p_central_dir)) {
+        //}
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privDeleteByRule()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privDeleteByRule(&$p_result_list, &$p_options)
+    {
+        $v_result      = 1;
+        $v_list_detail = array();
+
+        // ----- Open the zip file
+        if (($v_result = $this->privOpenFd('rb')) != 1) {
+            // ----- Return
+            return $v_result;
+        }
+
+        // ----- Read the central directory informations
+        $v_central_dir = array();
+        if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1) {
+            $this->privCloseFd();
+
+            return $v_result;
+        }
+
+        // ----- Go to beginning of File
+        @rewind($this->zip_fd);
+
+        // ----- Scan all the files
+        // ----- Start at beginning of Central Dir
+        $v_pos_entry = $v_central_dir['offset'];
+        @rewind($this->zip_fd);
+        if (@fseek($this->zip_fd, $v_pos_entry)) {
+            // ----- Close the zip file
+            $this->privCloseFd();
+
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
+
+            // ----- Return
+            return PclZip::errorCode();
+        }
+
+        // ----- Read each entry
+        $v_header_list = array();
+        $j_start       = 0;
+        for ($i = 0, $v_nb_extracted = 0; $i < $v_central_dir['entries']; $i++) {
+
+            // ----- Read the file header
+            $v_header_list[$v_nb_extracted] = array();
+            if (($v_result = $this->privReadCentralFileHeader($v_header_list[$v_nb_extracted])) != 1) {
+                // ----- Close the zip file
+                $this->privCloseFd();
+
+                return $v_result;
+            }
+
+            // ----- Store the index
+            $v_header_list[$v_nb_extracted]['index'] = $i;
+
+            // ----- Look for the specific extract rules
+            $v_found = false;
+
+            // ----- Look for extract by name rule
+            if ((isset($p_options[PCLZIP_OPT_BY_NAME])) && ($p_options[PCLZIP_OPT_BY_NAME] != 0)) {
+
+                // ----- Look if the filename is in the list
+                for ($j = 0; ($j < sizeof($p_options[PCLZIP_OPT_BY_NAME])) && (!$v_found); $j++) {
+
+                    // ----- Look for a directory
+                    if (substr($p_options[PCLZIP_OPT_BY_NAME][$j], -1) == "/") {
+
+                        // ----- Look if the directory is in the filename path
+                        if ((strlen($v_header_list[$v_nb_extracted]['stored_filename']) > strlen($p_options[PCLZIP_OPT_BY_NAME][$j])) && (substr($v_header_list[$v_nb_extracted]['stored_filename'], 0, strlen($p_options[PCLZIP_OPT_BY_NAME][$j])) == $p_options[PCLZIP_OPT_BY_NAME][$j])) {
+                            $v_found = true;
+                        } elseif ((($v_header_list[$v_nb_extracted]['external'] & 0x00000010) == 0x00000010) /* Indicates a folder */ && ($v_header_list[$v_nb_extracted]['stored_filename'] . '/' == $p_options[PCLZIP_OPT_BY_NAME][$j])) {
+                            $v_found = true;
+                        }
+
+                    // ----- Look for a filename
+                    } elseif ($v_header_list[$v_nb_extracted]['stored_filename'] == $p_options[PCLZIP_OPT_BY_NAME][$j]) {
+                        $v_found = true;
+                    }
+                }
+
+            // ----- Look for extract by ereg rule
+            // ereg() is deprecated with PHP 5.3
+            /*
+            elseif (   (isset($p_options[PCLZIP_OPT_BY_EREG]))
+            && ($p_options[PCLZIP_OPT_BY_EREG] != "")) {
+
+            if (ereg($p_options[PCLZIP_OPT_BY_EREG], $v_header_list[$v_nb_extracted]['stored_filename'])) {
+            $v_found = true;
+            }
+            }
+            */
+
+            // ----- Look for extract by preg rule
+            } elseif ((isset($p_options[PCLZIP_OPT_BY_PREG])) && ($p_options[PCLZIP_OPT_BY_PREG] != "")) {
+
+                if (preg_match($p_options[PCLZIP_OPT_BY_PREG], $v_header_list[$v_nb_extracted]['stored_filename'])) {
+                    $v_found = true;
+                }
+
+            // ----- Look for extract by index rule
+            } elseif ((isset($p_options[PCLZIP_OPT_BY_INDEX])) && ($p_options[PCLZIP_OPT_BY_INDEX] != 0)) {
+
+                // ----- Look if the index is in the list
+                for ($j = $j_start; ($j < sizeof($p_options[PCLZIP_OPT_BY_INDEX])) && (!$v_found); $j++) {
+
+                    if (($i >= $p_options[PCLZIP_OPT_BY_INDEX][$j]['start']) && ($i <= $p_options[PCLZIP_OPT_BY_INDEX][$j]['end'])) {
+                        $v_found = true;
+                    }
+                    if ($i >= $p_options[PCLZIP_OPT_BY_INDEX][$j]['end']) {
+                        $j_start = $j + 1;
+                    }
+
+                    if ($p_options[PCLZIP_OPT_BY_INDEX][$j]['start'] > $i) {
+                        break;
+                    }
+                }
+            } else {
+                $v_found = true;
+            }
+
+            // ----- Look for deletion
+            if ($v_found) {
+                unset($v_header_list[$v_nb_extracted]);
+            } else {
+                $v_nb_extracted++;
+            }
+        }
+
+        // ----- Look if something need to be deleted
+        if ($v_nb_extracted > 0) {
+
+            // ----- Creates a temporay file
+            $v_zip_temp_name = PCLZIP_TEMPORARY_DIR . uniqid('pclzip-') . '.tmp';
+
+            // ----- Creates a temporary zip archive
+            $v_temp_zip = new PclZip($v_zip_temp_name);
+
+            // ----- Open the temporary zip file in write mode
+            if (($v_result = $v_temp_zip->privOpenFd('wb')) != 1) {
+                $this->privCloseFd();
+
+                // ----- Return
+                return $v_result;
+            }
+
+            // ----- Look which file need to be kept
+            for ($i = 0; $i < sizeof($v_header_list); $i++) {
+
+                // ----- Calculate the position of the header
+                @rewind($this->zip_fd);
+                if (@fseek($this->zip_fd, $v_header_list[$i]['offset'])) {
+                    // ----- Close the zip file
+                    $this->privCloseFd();
+                    $v_temp_zip->privCloseFd();
+                    @unlink($v_zip_temp_name);
+
+                    // ----- Error log
+                    PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
+
+                    // ----- Return
+                    return PclZip::errorCode();
+                }
+
+                // ----- Read the file header
+                $v_local_header = array();
+                if (($v_result = $this->privReadFileHeader($v_local_header)) != 1) {
+                    // ----- Close the zip file
+                    $this->privCloseFd();
+                    $v_temp_zip->privCloseFd();
+                    @unlink($v_zip_temp_name);
+
+                    // ----- Return
+                    return $v_result;
+                }
+
+                // ----- Check that local file header is same as central file header
+                if ($this->privCheckFileHeaders($v_local_header, $v_header_list[$i]) != 1) {
+                    // TBC
+                }
+                unset($v_local_header);
+
+                // ----- Write the file header
+                if (($v_result = $v_temp_zip->privWriteFileHeader($v_header_list[$i])) != 1) {
+                    // ----- Close the zip file
+                    $this->privCloseFd();
+                    $v_temp_zip->privCloseFd();
+                    @unlink($v_zip_temp_name);
+
+                    // ----- Return
+                    return $v_result;
+                }
+
+                // ----- Read/write the data block
+                if (($v_result = PclZipUtilCopyBlock($this->zip_fd, $v_temp_zip->zip_fd, $v_header_list[$i]['compressed_size'])) != 1) {
+                    // ----- Close the zip file
+                    $this->privCloseFd();
+                    $v_temp_zip->privCloseFd();
+                    @unlink($v_zip_temp_name);
+
+                    // ----- Return
+                    return $v_result;
+                }
+            }
+
+            // ----- Store the offset of the central dir
+            $v_offset = @ftell($v_temp_zip->zip_fd);
+
+            // ----- Re-Create the Central Dir files header
+            for ($i = 0; $i < sizeof($v_header_list); $i++) {
+                // ----- Create the file header
+                if (($v_result = $v_temp_zip->privWriteCentralFileHeader($v_header_list[$i])) != 1) {
+                    $v_temp_zip->privCloseFd();
+                    $this->privCloseFd();
+                    @unlink($v_zip_temp_name);
+
+                    // ----- Return
+                    return $v_result;
+                }
+
+                // ----- Transform the header to a 'usable' info
+                $v_temp_zip->privConvertHeader2FileInfo($v_header_list[$i], $p_result_list[$i]);
+            }
+
+            // ----- Zip file comment
+            $v_comment = '';
+            if (isset($p_options[PCLZIP_OPT_COMMENT])) {
+                $v_comment = $p_options[PCLZIP_OPT_COMMENT];
+            }
+
+            // ----- Calculate the size of the central header
+            $v_size = @ftell($v_temp_zip->zip_fd) - $v_offset;
+
+            // ----- Create the central dir footer
+            if (($v_result = $v_temp_zip->privWriteCentralHeader(sizeof($v_header_list), $v_size, $v_offset, $v_comment)) != 1) {
+                // ----- Reset the file list
+                unset($v_header_list);
+                $v_temp_zip->privCloseFd();
+                $this->privCloseFd();
+                @unlink($v_zip_temp_name);
+
+                // ----- Return
+                return $v_result;
+            }
+
+            // ----- Close
+            $v_temp_zip->privCloseFd();
+            $this->privCloseFd();
+
+            // ----- Delete the zip file
+            // TBC : I should test the result ...
+            @unlink($this->zipname);
+
+            // ----- Rename the temporary file
+            // TBC : I should test the result ...
+            //@rename($v_zip_temp_name, $this->zipname);
+            PclZipUtilRename($v_zip_temp_name, $this->zipname);
+
+            // ----- Destroy the temporary archive
+            unset($v_temp_zip);
+
+        // ----- Remove every files : reset the file
+        } elseif ($v_central_dir['entries'] != 0) {
+            $this->privCloseFd();
+
+            if (($v_result = $this->privOpenFd('wb')) != 1) {
+                return $v_result;
+            }
+
+            if (($v_result = $this->privWriteCentralHeader(0, 0, 0, '')) != 1) {
+                return $v_result;
+            }
+
+            $this->privCloseFd();
+        }
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privDirCheck()
+    // Description :
+    //   Check if a directory exists, if not it creates it and all the parents directory
+    //   which may be useful.
+    // Parameters :
+    //   $p_dir : Directory path to check.
+    // Return Values :
+    //    1 : OK
+    //   -1 : Unable to create directory
+    // --------------------------------------------------------------------------------
+    public function privDirCheck($p_dir, $p_is_dir = false)
+    {
+        $v_result = 1;
+
+        // ----- Remove the final '/'
+        if (($p_is_dir) && (substr($p_dir, -1) == '/')) {
+            $p_dir = substr($p_dir, 0, strlen($p_dir) - 1);
+        }
+
+        // ----- Check the directory availability
+        if ((is_dir($p_dir)) || ($p_dir == "")) {
+            return 1;
+        }
+
+        // ----- Extract parent directory
+        $p_parent_dir = dirname($p_dir);
+
+        // ----- Just a check
+        if ($p_parent_dir != $p_dir) {
+            // ----- Look for parent directory
+            if ($p_parent_dir != "") {
+                if (($v_result = $this->privDirCheck($p_parent_dir)) != 1) {
+                    return $v_result;
+                }
+            }
+        }
+
+        // ----- Create the directory
+        if (!@mkdir($p_dir, 0777)) {
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_DIR_CREATE_FAIL, "Unable to create directory '$p_dir'");
+
+            // ----- Return
+            return PclZip::errorCode();
+        }
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privMerge()
+    // Description :
+    //   If $p_archive_to_add does not exist, the function exit with a success result.
+    // Parameters :
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privMerge(&$p_archive_to_add)
+    {
+        $v_result = 1;
+
+        // ----- Look if the archive_to_add exists
+        if (!is_file($p_archive_to_add->zipname)) {
+
+            // ----- Nothing to merge, so merge is a success
+            $v_result = 1;
+
+            // ----- Return
+            return $v_result;
+        }
+
+        // ----- Look if the archive exists
+        if (!is_file($this->zipname)) {
+
+            // ----- Do a duplicate
+            $v_result = $this->privDuplicate($p_archive_to_add->zipname);
+
+            // ----- Return
+            return $v_result;
+        }
+
+        // ----- Open the zip file
+        if (($v_result = $this->privOpenFd('rb')) != 1) {
+            // ----- Return
+            return $v_result;
+        }
+
+        // ----- Read the central directory informations
+        $v_central_dir = array();
+        if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1) {
+            $this->privCloseFd();
+
+            return $v_result;
+        }
+
+        // ----- Go to beginning of File
+        @rewind($this->zip_fd);
+
+        // ----- Open the archive_to_add file
+        if (($v_result = $p_archive_to_add->privOpenFd('rb')) != 1) {
+            $this->privCloseFd();
+
+            // ----- Return
+            return $v_result;
+        }
+
+        // ----- Read the central directory informations
+        $v_central_dir_to_add = array();
+        if (($v_result = $p_archive_to_add->privReadEndCentralDir($v_central_dir_to_add)) != 1) {
+            $this->privCloseFd();
+            $p_archive_to_add->privCloseFd();
+
+            return $v_result;
+        }
+
+        // ----- Go to beginning of File
+        @rewind($p_archive_to_add->zip_fd);
+
+        // ----- Creates a temporay file
+        $v_zip_temp_name = PCLZIP_TEMPORARY_DIR . uniqid('pclzip-') . '.tmp';
+
+        // ----- Open the temporary file in write mode
+        if (($v_zip_temp_fd = @fopen($v_zip_temp_name, 'wb')) == 0) {
+            $this->privCloseFd();
+            $p_archive_to_add->privCloseFd();
+
+            PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \'' . $v_zip_temp_name . '\' in binary write mode');
+
+            // ----- Return
+            return PclZip::errorCode();
+        }
+
+        // ----- Copy the files from the archive to the temporary file
+        // TBC : Here I should better append the file and go back to erase the central dir
+        $v_size = $v_central_dir['offset'];
+        while ($v_size != 0) {
+            $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+            $v_buffer    = fread($this->zip_fd, $v_read_size);
+            @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
+            $v_size -= $v_read_size;
+        }
+
+        // ----- Copy the files from the archive_to_add into the temporary file
+        $v_size = $v_central_dir_to_add['offset'];
+        while ($v_size != 0) {
+            $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+            $v_buffer    = fread($p_archive_to_add->zip_fd, $v_read_size);
+            @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
+            $v_size -= $v_read_size;
+        }
+
+        // ----- Store the offset of the central dir
+        $v_offset = @ftell($v_zip_temp_fd);
+
+        // ----- Copy the block of file headers from the old archive
+        $v_size = $v_central_dir['size'];
+        while ($v_size != 0) {
+            $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+            $v_buffer    = @fread($this->zip_fd, $v_read_size);
+            @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
+            $v_size -= $v_read_size;
+        }
+
+        // ----- Copy the block of file headers from the archive_to_add
+        $v_size = $v_central_dir_to_add['size'];
+        while ($v_size != 0) {
+            $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+            $v_buffer    = @fread($p_archive_to_add->zip_fd, $v_read_size);
+            @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
+            $v_size -= $v_read_size;
+        }
+
+        // ----- Merge the file comments
+        $v_comment = $v_central_dir['comment'] . ' ' . $v_central_dir_to_add['comment'];
+
+        // ----- Calculate the size of the (new) central header
+        $v_size = @ftell($v_zip_temp_fd) - $v_offset;
+
+        // ----- Swap the file descriptor
+        // Here is a trick : I swap the temporary fd with the zip fd, in order to use
+        // the following methods on the temporary fil and not the real archive fd
+        $v_swap        = $this->zip_fd;
+        $this->zip_fd  = $v_zip_temp_fd;
+        $v_zip_temp_fd = $v_swap;
+
+        // ----- Create the central dir footer
+        if (($v_result = $this->privWriteCentralHeader($v_central_dir['entries'] + $v_central_dir_to_add['entries'], $v_size, $v_offset, $v_comment)) != 1) {
+            $this->privCloseFd();
+            $p_archive_to_add->privCloseFd();
+            @fclose($v_zip_temp_fd);
+            $this->zip_fd = null;
+
+            // ----- Reset the file list
+            unset($v_header_list);
+
+            // ----- Return
+            return $v_result;
+        }
+
+        // ----- Swap back the file descriptor
+        $v_swap        = $this->zip_fd;
+        $this->zip_fd  = $v_zip_temp_fd;
+        $v_zip_temp_fd = $v_swap;
+
+        // ----- Close
+        $this->privCloseFd();
+        $p_archive_to_add->privCloseFd();
+
+        // ----- Close the temporary file
+        @fclose($v_zip_temp_fd);
+
+        // ----- Delete the zip file
+        // TBC : I should test the result ...
+        @unlink($this->zipname);
+
+        // ----- Rename the temporary file
+        // TBC : I should test the result ...
+        //@rename($v_zip_temp_name, $this->zipname);
+        PclZipUtilRename($v_zip_temp_name, $this->zipname);
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privDuplicate()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privDuplicate($p_archive_filename)
+    {
+        $v_result = 1;
+
+        // ----- Look if the $p_archive_filename exists
+        if (!is_file($p_archive_filename)) {
+
+            // ----- Nothing to duplicate, so duplicate is a success.
+            $v_result = 1;
+
+            // ----- Return
+            return $v_result;
+        }
+
+        // ----- Open the zip file
         if (($v_result = $this->privOpenFd('wb')) != 1) {
-          return $v_result;
+            // ----- Return
+            return $v_result;
         }
 
-        if (($v_result = $this->privWriteCentralHeader(0, 0, 0, '')) != 1) {
-          return $v_result;
+        // ----- Open the temporary file in write mode
+        if (($v_zip_temp_fd = @fopen($p_archive_filename, 'rb')) == 0) {
+            $this->privCloseFd();
+
+            PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive file \'' . $p_archive_filename . '\' in binary write mode');
+
+            // ----- Return
+            return PclZip::errorCode();
         }
 
+        // ----- Copy the files from the archive to the temporary file
+        // TBC : Here I should better append the file and go back to erase the central dir
+        $v_size = filesize($p_archive_filename);
+        while ($v_size != 0) {
+            $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+            $v_buffer    = fread($v_zip_temp_fd, $v_read_size);
+            @fwrite($this->zip_fd, $v_buffer, $v_read_size);
+            $v_size -= $v_read_size;
+        }
+
+        // ----- Close
         $this->privCloseFd();
+
+        // ----- Close the temporary file
+        @fclose($v_zip_temp_fd);
+
+        // ----- Return
+        return $v_result;
     }
+    // --------------------------------------------------------------------------------
 
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privDirCheck()
-  // Description :
-  //   Check if a directory exists, if not it creates it and all the parents directory
-  //   which may be useful.
-  // Parameters :
-  //   $p_dir : Directory path to check.
-  // Return Values :
-  //    1 : OK
-  //   -1 : Unable to create directory
-  // --------------------------------------------------------------------------------
-  function privDirCheck($p_dir, $p_is_dir=false)
-  {
-    $v_result = 1;
-
-
-    // ----- Remove the final '/'
-    if (($p_is_dir) && (substr($p_dir, -1)=='/'))
+    // --------------------------------------------------------------------------------
+    // Function : privErrorLog()
+    // Description :
+    // Parameters :
+    // --------------------------------------------------------------------------------
+    public function privErrorLog($p_error_code = 0, $p_error_string = '')
     {
-      $p_dir = substr($p_dir, 0, strlen($p_dir)-1);
-    }
-
-    // ----- Check the directory availability
-    if ((is_dir($p_dir)) || ($p_dir == ""))
-    {
-      return 1;
-    }
-
-    // ----- Extract parent directory
-    $p_parent_dir = dirname($p_dir);
-
-    // ----- Just a check
-    if ($p_parent_dir != $p_dir)
-    {
-      // ----- Look for parent directory
-      if ($p_parent_dir != "")
-      {
-        if (($v_result = $this->privDirCheck($p_parent_dir)) != 1)
-        {
-          return $v_result;
+        if (PCLZIP_ERROR_EXTERNAL == 1) {
+            PclError($p_error_code, $p_error_string);
+        } else {
+            $this->error_code   = $p_error_code;
+            $this->error_string = $p_error_string;
         }
-      }
     }
+    // --------------------------------------------------------------------------------
 
-    // ----- Create the directory
-    if (!@mkdir($p_dir, 0777))
+    // --------------------------------------------------------------------------------
+    // Function : privErrorReset()
+    // Description :
+    // Parameters :
+    // --------------------------------------------------------------------------------
+    public function privErrorReset()
     {
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_DIR_CREATE_FAIL, "Unable to create directory '$p_dir'");
-
-      // ----- Return
-      return PclZip::errorCode();
+        if (PCLZIP_ERROR_EXTERNAL == 1) {
+            PclErrorReset();
+        } else {
+            $this->error_code   = 0;
+            $this->error_string = '';
+        }
     }
+    // --------------------------------------------------------------------------------
 
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privMerge()
-  // Description :
-  //   If $p_archive_to_add does not exist, the function exit with a success result.
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privMerge(&$p_archive_to_add)
-  {
-    $v_result=1;
-
-    // ----- Look if the archive_to_add exists
-    if (!is_file($p_archive_to_add->zipname))
+    // --------------------------------------------------------------------------------
+    // Function : privDisableMagicQuotes()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privDisableMagicQuotes()
     {
+        $v_result = 1;
 
-      // ----- Nothing to merge, so merge is a success
-      $v_result = 1;
+        // ----- Look if function exists
+        if ((!function_exists("get_magic_quotes_runtime")) || (!function_exists("set_magic_quotes_runtime"))) {
+            return $v_result;
+        }
 
-      // ----- Return
-      return $v_result;
+        // ----- Look if already done
+        if ($this->magic_quotes_status != -1) {
+            return $v_result;
+        }
+
+        // ----- Get and memorize the magic_quote value
+        $this->magic_quotes_status = @get_magic_quotes_runtime();
+
+        // ----- Disable magic_quotes
+        if ($this->magic_quotes_status == 1) {
+            @set_magic_quotes_runtime(0);
+        }
+
+        // ----- Return
+        return $v_result;
     }
+    // --------------------------------------------------------------------------------
 
-    // ----- Look if the archive exists
-    if (!is_file($this->zipname))
+    // --------------------------------------------------------------------------------
+    // Function : privSwapBackMagicQuotes()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privSwapBackMagicQuotes()
     {
+        $v_result = 1;
 
-      // ----- Do a duplicate
-      $v_result = $this->privDuplicate($p_archive_to_add->zipname);
+        // ----- Look if function exists
+        if ((!function_exists("get_magic_quotes_runtime")) || (!function_exists("set_magic_quotes_runtime"))) {
+            return $v_result;
+        }
 
-      // ----- Return
-      return $v_result;
+        // ----- Look if something to do
+        if ($this->magic_quotes_status != -1) {
+            return $v_result;
+        }
+
+        // ----- Swap back magic_quotes
+        if ($this->magic_quotes_status == 1) {
+            @set_magic_quotes_runtime($this->magic_quotes_status);
+        }
+
+        // ----- Return
+        return $v_result;
     }
+    // --------------------------------------------------------------------------------
+}
 
-    // ----- Open the zip file
-    if (($v_result=$this->privOpenFd('rb')) != 1)
-    {
-      // ----- Return
-      return $v_result;
-    }
+// End of class
+// --------------------------------------------------------------------------------
 
-    // ----- Read the central directory informations
-    $v_central_dir = array();
-    if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
-    {
-      $this->privCloseFd();
-      return $v_result;
-    }
-
-    // ----- Go to beginning of File
-    @rewind($this->zip_fd);
-
-    // ----- Open the archive_to_add file
-    if (($v_result=$p_archive_to_add->privOpenFd('rb')) != 1)
-    {
-      $this->privCloseFd();
-
-      // ----- Return
-      return $v_result;
-    }
-
-    // ----- Read the central directory informations
-    $v_central_dir_to_add = array();
-    if (($v_result = $p_archive_to_add->privReadEndCentralDir($v_central_dir_to_add)) != 1)
-    {
-      $this->privCloseFd();
-      $p_archive_to_add->privCloseFd();
-
-      return $v_result;
-    }
-
-    // ----- Go to beginning of File
-    @rewind($p_archive_to_add->zip_fd);
-
-    // ----- Creates a temporay file
-    $v_zip_temp_name = PCLZIP_TEMPORARY_DIR.uniqid('pclzip-').'.tmp';
-
-    // ----- Open the temporary file in write mode
-    if (($v_zip_temp_fd = @fopen($v_zip_temp_name, 'wb')) == 0)
-    {
-      $this->privCloseFd();
-      $p_archive_to_add->privCloseFd();
-
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_zip_temp_name.'\' in binary write mode');
-
-      // ----- Return
-      return PclZip::errorCode();
-    }
-
-    // ----- Copy the files from the archive to the temporary file
-    // TBC : Here I should better append the file and go back to erase the central dir
-    $v_size = $v_central_dir['offset'];
-    while ($v_size != 0)
-    {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      $v_buffer = fread($this->zip_fd, $v_read_size);
-      @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
-
-    // ----- Copy the files from the archive_to_add into the temporary file
-    $v_size = $v_central_dir_to_add['offset'];
-    while ($v_size != 0)
-    {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      $v_buffer = fread($p_archive_to_add->zip_fd, $v_read_size);
-      @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
-
-    // ----- Store the offset of the central dir
-    $v_offset = @ftell($v_zip_temp_fd);
-
-    // ----- Copy the block of file headers from the old archive
-    $v_size = $v_central_dir['size'];
-    while ($v_size != 0)
-    {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      $v_buffer = @fread($this->zip_fd, $v_read_size);
-      @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
-
-    // ----- Copy the block of file headers from the archive_to_add
-    $v_size = $v_central_dir_to_add['size'];
-    while ($v_size != 0)
-    {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      $v_buffer = @fread($p_archive_to_add->zip_fd, $v_read_size);
-      @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
-
-    // ----- Merge the file comments
-    $v_comment = $v_central_dir['comment'].' '.$v_central_dir_to_add['comment'];
-
-    // ----- Calculate the size of the (new) central header
-    $v_size = @ftell($v_zip_temp_fd)-$v_offset;
-
-    // ----- Swap the file descriptor
-    // Here is a trick : I swap the temporary fd with the zip fd, in order to use
-    // the following methods on the temporary fil and not the real archive fd
-    $v_swap = $this->zip_fd;
-    $this->zip_fd = $v_zip_temp_fd;
-    $v_zip_temp_fd = $v_swap;
-
-    // ----- Create the central dir footer
-    if (($v_result = $this->privWriteCentralHeader($v_central_dir['entries']+$v_central_dir_to_add['entries'], $v_size, $v_offset, $v_comment)) != 1)
-    {
-      $this->privCloseFd();
-      $p_archive_to_add->privCloseFd();
-      @fclose($v_zip_temp_fd);
-      $this->zip_fd = null;
-
-      // ----- Reset the file list
-      unset($v_header_list);
-
-      // ----- Return
-      return $v_result;
-    }
-
-    // ----- Swap back the file descriptor
-    $v_swap = $this->zip_fd;
-    $this->zip_fd = $v_zip_temp_fd;
-    $v_zip_temp_fd = $v_swap;
-
-    // ----- Close
-    $this->privCloseFd();
-    $p_archive_to_add->privCloseFd();
-
-    // ----- Close the temporary file
-    @fclose($v_zip_temp_fd);
-
-    // ----- Delete the zip file
-    // TBC : I should test the result ...
-    @unlink($this->zipname);
-
-    // ----- Rename the temporary file
-    // TBC : I should test the result ...
-    //@rename($v_zip_temp_name, $this->zipname);
-    PclZipUtilRename($v_zip_temp_name, $this->zipname);
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privDuplicate()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privDuplicate($p_archive_filename)
-  {
-    $v_result=1;
-
-    // ----- Look if the $p_archive_filename exists
-    if (!is_file($p_archive_filename))
-    {
-
-      // ----- Nothing to duplicate, so duplicate is a success.
-      $v_result = 1;
-
-      // ----- Return
-      return $v_result;
-    }
-
-    // ----- Open the zip file
-    if (($v_result=$this->privOpenFd('wb')) != 1)
-    {
-      // ----- Return
-      return $v_result;
-    }
-
-    // ----- Open the temporary file in write mode
-    if (($v_zip_temp_fd = @fopen($p_archive_filename, 'rb')) == 0)
-    {
-      $this->privCloseFd();
-
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive file \''.$p_archive_filename.'\' in binary write mode');
-
-      // ----- Return
-      return PclZip::errorCode();
-    }
-
-    // ----- Copy the files from the archive to the temporary file
-    // TBC : Here I should better append the file and go back to erase the central dir
-    $v_size = filesize($p_archive_filename);
-    while ($v_size != 0)
-    {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      $v_buffer = fread($v_zip_temp_fd, $v_read_size);
-      @fwrite($this->zip_fd, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
-
-    // ----- Close
-    $this->privCloseFd();
-
-    // ----- Close the temporary file
-    @fclose($v_zip_temp_fd);
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privErrorLog()
-  // Description :
-  // Parameters :
-  // --------------------------------------------------------------------------------
-  function privErrorLog($p_error_code=0, $p_error_string='')
-  {
-    if (PCLZIP_ERROR_EXTERNAL == 1) {
-      PclError($p_error_code, $p_error_string);
-    }
-    else {
-      $this->error_code = $p_error_code;
-      $this->error_string = $p_error_string;
-    }
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privErrorReset()
-  // Description :
-  // Parameters :
-  // --------------------------------------------------------------------------------
-  function privErrorReset()
-  {
-    if (PCLZIP_ERROR_EXTERNAL == 1) {
-      PclErrorReset();
-    }
-    else {
-      $this->error_code = 0;
-      $this->error_string = '';
-    }
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privDisableMagicQuotes()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privDisableMagicQuotes()
-  {
-    $v_result=1;
-
-    // ----- Look if function exists
-    if (   (!function_exists("get_magic_quotes_runtime"))
-	    || (!function_exists("set_magic_quotes_runtime"))) {
-      return $v_result;
-	}
-
-    // ----- Look if already done
-    if ($this->magic_quotes_status != -1) {
-      return $v_result;
-	}
-
-	// ----- Get and memorize the magic_quote value
-	$this->magic_quotes_status = @get_magic_quotes_runtime();
-
-	// ----- Disable magic_quotes
-	if ($this->magic_quotes_status == 1) {
-	  @set_magic_quotes_runtime(0);
-	}
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privSwapBackMagicQuotes()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privSwapBackMagicQuotes()
-  {
-    $v_result=1;
-
-    // ----- Look if function exists
-    if (   (!function_exists("get_magic_quotes_runtime"))
-	    || (!function_exists("set_magic_quotes_runtime"))) {
-      return $v_result;
-	}
-
-    // ----- Look if something to do
-    if ($this->magic_quotes_status != -1) {
-      return $v_result;
-	}
-
-	// ----- Swap back magic_quotes
-	if ($this->magic_quotes_status == 1) {
-  	  @set_magic_quotes_runtime($this->magic_quotes_status);
-	}
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  }
-  // End of class
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : PclZipUtilPathReduction()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function PclZipUtilPathReduction($p_dir)
-  {
+// --------------------------------------------------------------------------------
+// Function : PclZipUtilPathReduction()
+// Description :
+// Parameters :
+// Return Values :
+// --------------------------------------------------------------------------------
+function PclZipUtilPathReduction($p_dir)
+{
     $v_result = "";
 
     // ----- Look for not empty path
     if ($p_dir != "") {
-      // ----- Explode path by directory names
-      $v_list = explode("/", $p_dir);
+        // ----- Explode path by directory names
+        $v_list = explode("/", $p_dir);
 
-      // ----- Study directories from last to first
-      $v_skip = 0;
-      for ($i=sizeof($v_list)-1; $i>=0; $i--) {
-        // ----- Look for current path
-        if ($v_list[$i] == ".") {
-          // ----- Ignore this directory
-          // Should be the first $i=0, but no check is done
+        // ----- Study directories from last to first
+        $v_skip = 0;
+        for ($i = sizeof($v_list) - 1; $i >= 0; $i--) {
+            // ----- Look for current path
+            if ($v_list[$i] == ".") {
+                // ----- Ignore this directory
+                // Should be the first $i=0, but no check is done
+            } elseif ($v_list[$i] == "..") {
+                $v_skip++;
+            } elseif ($v_list[$i] == "") {
+                // ----- First '/' i.e. root slash
+                if ($i == 0) {
+                    $v_result = "/" . $v_result;
+                    if ($v_skip > 0) {
+                        // ----- It is an invalid path, so the path is not modified
+                        // TBC
+                        $v_result = $p_dir;
+                        $v_skip   = 0;
+                    }
+
+                // ----- Last '/' i.e. indicates a directory
+                } elseif ($i == (sizeof($v_list) - 1)) {
+                    $v_result = $v_list[$i];
+
+                // ----- Double '/' inside the path
+                } else {
+                    // ----- Ignore only the double '//' in path,
+                    // but not the first and last '/'
+                }
+            } else {
+                // ----- Look for item to skip
+                if ($v_skip > 0) {
+                    $v_skip--;
+                } else {
+                    $v_result = $v_list[$i] . ($i != (sizeof($v_list) - 1) ? "/" . $v_result : "");
+                }
+            }
         }
-        else if ($v_list[$i] == "..") {
-		  $v_skip++;
+
+        // ----- Look for skip
+        if ($v_skip > 0) {
+            while ($v_skip > 0) {
+                $v_result = '../' . $v_result;
+                $v_skip--;
+            }
         }
-        else if ($v_list[$i] == "") {
-		  // ----- First '/' i.e. root slash
-		  if ($i == 0) {
-            $v_result = "/".$v_result;
-		    if ($v_skip > 0) {
-		        // ----- It is an invalid path, so the path is not modified
-		        // TBC
-		        $v_result = $p_dir;
-                $v_skip = 0;
-		    }
-		  }
-		  // ----- Last '/' i.e. indicates a directory
-		  else if ($i == (sizeof($v_list)-1)) {
-            $v_result = $v_list[$i];
-		  }
-		  // ----- Double '/' inside the path
-		  else {
-            // ----- Ignore only the double '//' in path,
-            // but not the first and last '/'
-		  }
-        }
-        else {
-		  // ----- Look for item to skip
-		  if ($v_skip > 0) {
-		    $v_skip--;
-		  }
-		  else {
-            $v_result = $v_list[$i].($i!=(sizeof($v_list)-1)?"/".$v_result:"");
-		  }
-        }
-      }
-      
-      // ----- Look for skip
-      if ($v_skip > 0) {
-        while ($v_skip > 0) {
-            $v_result = '../'.$v_result;
-            $v_skip--;
-        }
-      }
     }
 
     // ----- Return
     return $v_result;
-  }
-  // --------------------------------------------------------------------------------
+}
+// --------------------------------------------------------------------------------
 
-  // --------------------------------------------------------------------------------
-  // Function : PclZipUtilPathInclusion()
-  // Description :
-  //   This function indicates if the path $p_path is under the $p_dir tree. Or,
-  //   said in an other way, if the file or sub-dir $p_path is inside the dir
-  //   $p_dir.
-  //   The function indicates also if the path is exactly the same as the dir.
-  //   This function supports path with duplicated '/' like '//', but does not
-  //   support '.' or '..' statements.
-  // Parameters :
-  // Return Values :
-  //   0 if $p_path is not inside directory $p_dir
-  //   1 if $p_path is inside directory $p_dir
-  //   2 if $p_path is exactly the same as $p_dir
-  // --------------------------------------------------------------------------------
-  function PclZipUtilPathInclusion($p_dir, $p_path)
-  {
+// --------------------------------------------------------------------------------
+// Function : PclZipUtilPathInclusion()
+// Description :
+//   This function indicates if the path $p_path is under the $p_dir tree. Or,
+//   said in an other way, if the file or sub-dir $p_path is inside the dir
+//   $p_dir.
+//   The function indicates also if the path is exactly the same as the dir.
+//   This function supports path with duplicated '/' like '//', but does not
+//   support '.' or '..' statements.
+// Parameters :
+// Return Values :
+//   0 if $p_path is not inside directory $p_dir
+//   1 if $p_path is inside directory $p_dir
+//   2 if $p_path is exactly the same as $p_dir
+// --------------------------------------------------------------------------------
+function PclZipUtilPathInclusion($p_dir, $p_path)
+{
     $v_result = 1;
-    
+
     // ----- Look for path beginning by ./
-    if (   ($p_dir == '.')
-        || ((strlen($p_dir) >=2) && (substr($p_dir, 0, 2) == './'))) {
-      $p_dir = PclZipUtilTranslateWinPath(getcwd(), FALSE).'/'.substr($p_dir, 1);
+    if (($p_dir == '.') || ((strlen($p_dir) >= 2) && (substr($p_dir, 0, 2) == './'))) {
+        $p_dir = PclZipUtilTranslateWinPath(getcwd(), false) . '/' . substr($p_dir, 1);
     }
-    if (   ($p_path == '.')
-        || ((strlen($p_path) >=2) && (substr($p_path, 0, 2) == './'))) {
-      $p_path = PclZipUtilTranslateWinPath(getcwd(), FALSE).'/'.substr($p_path, 1);
+    if (($p_path == '.') || ((strlen($p_path) >= 2) && (substr($p_path, 0, 2) == './'))) {
+        $p_path = PclZipUtilTranslateWinPath(getcwd(), false) . '/' . substr($p_path, 1);
     }
 
     // ----- Explode dir and path by directory separator
-    $v_list_dir = explode("/", $p_dir);
-    $v_list_dir_size = sizeof($v_list_dir);
-    $v_list_path = explode("/", $p_path);
+    $v_list_dir       = explode("/", $p_dir);
+    $v_list_dir_size  = sizeof($v_list_dir);
+    $v_list_path      = explode("/", $p_path);
     $v_list_path_size = sizeof($v_list_path);
 
     // ----- Study directories paths
@@ -5498,196 +5234,182 @@
     $j = 0;
     while (($i < $v_list_dir_size) && ($j < $v_list_path_size) && ($v_result)) {
 
-      // ----- Look for empty dir (path reduction)
-      if ($v_list_dir[$i] == '') {
+        // ----- Look for empty dir (path reduction)
+        if ($v_list_dir[$i] == '') {
+            $i++;
+            continue;
+        }
+        if ($v_list_path[$j] == '') {
+            $j++;
+            continue;
+        }
+
+        // ----- Compare the items
+        if (($v_list_dir[$i] != $v_list_path[$j]) && ($v_list_dir[$i] != '') && ($v_list_path[$j] != '')) {
+            $v_result = 0;
+        }
+
+        // ----- Next items
         $i++;
-        continue;
-      }
-      if ($v_list_path[$j] == '') {
         $j++;
-        continue;
-      }
-
-      // ----- Compare the items
-      if (($v_list_dir[$i] != $v_list_path[$j]) && ($v_list_dir[$i] != '') && ( $v_list_path[$j] != ''))  {
-        $v_result = 0;
-      }
-
-      // ----- Next items
-      $i++;
-      $j++;
     }
 
     // ----- Look if everything seems to be the same
     if ($v_result) {
-      // ----- Skip all the empty items
-      while (($j < $v_list_path_size) && ($v_list_path[$j] == '')) $j++;
-      while (($i < $v_list_dir_size) && ($v_list_dir[$i] == '')) $i++;
+        // ----- Skip all the empty items
+        while (($j < $v_list_path_size) && ($v_list_path[$j] == '')) {
+            $j++;
+        }
+        while (($i < $v_list_dir_size) && ($v_list_dir[$i] == '')) {
+            $i++;
+        }
 
-      if (($i >= $v_list_dir_size) && ($j >= $v_list_path_size)) {
-        // ----- There are exactly the same
-        $v_result = 2;
-      }
-      else if ($i < $v_list_dir_size) {
-        // ----- The path is shorter than the dir
-        $v_result = 0;
-      }
+        if (($i >= $v_list_dir_size) && ($j >= $v_list_path_size)) {
+            // ----- There are exactly the same
+            $v_result = 2;
+        } elseif ($i < $v_list_dir_size) {
+            // ----- The path is shorter than the dir
+            $v_result = 0;
+        }
     }
 
     // ----- Return
     return $v_result;
-  }
-  // --------------------------------------------------------------------------------
+}
+// --------------------------------------------------------------------------------
 
-  // --------------------------------------------------------------------------------
-  // Function : PclZipUtilCopyBlock()
-  // Description :
-  // Parameters :
-  //   $p_mode : read/write compression mode
-  //             0 : src & dest normal
-  //             1 : src gzip, dest normal
-  //             2 : src normal, dest gzip
-  //             3 : src & dest gzip
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function PclZipUtilCopyBlock($p_src, $p_dest, $p_size, $p_mode=0)
-  {
+// --------------------------------------------------------------------------------
+// Function : PclZipUtilCopyBlock()
+// Description :
+// Parameters :
+//   $p_mode : read/write compression mode
+//             0 : src & dest normal
+//             1 : src gzip, dest normal
+//             2 : src normal, dest gzip
+//             3 : src & dest gzip
+// Return Values :
+// --------------------------------------------------------------------------------
+function PclZipUtilCopyBlock($p_src, $p_dest, $p_size, $p_mode = 0)
+{
     $v_result = 1;
 
-    if ($p_mode==0)
-    {
-      while ($p_size != 0)
-      {
-        $v_read_size = ($p_size < PCLZIP_READ_BLOCK_SIZE ? $p_size : PCLZIP_READ_BLOCK_SIZE);
-        $v_buffer = @fread($p_src, $v_read_size);
-        @fwrite($p_dest, $v_buffer, $v_read_size);
-        $p_size -= $v_read_size;
-      }
-    }
-    else if ($p_mode==1)
-    {
-      while ($p_size != 0)
-      {
-        $v_read_size = ($p_size < PCLZIP_READ_BLOCK_SIZE ? $p_size : PCLZIP_READ_BLOCK_SIZE);
-        $v_buffer = @gzread($p_src, $v_read_size);
-        @fwrite($p_dest, $v_buffer, $v_read_size);
-        $p_size -= $v_read_size;
-      }
-    }
-    else if ($p_mode==2)
-    {
-      while ($p_size != 0)
-      {
-        $v_read_size = ($p_size < PCLZIP_READ_BLOCK_SIZE ? $p_size : PCLZIP_READ_BLOCK_SIZE);
-        $v_buffer = @fread($p_src, $v_read_size);
-        @gzwrite($p_dest, $v_buffer, $v_read_size);
-        $p_size -= $v_read_size;
-      }
-    }
-    else if ($p_mode==3)
-    {
-      while ($p_size != 0)
-      {
-        $v_read_size = ($p_size < PCLZIP_READ_BLOCK_SIZE ? $p_size : PCLZIP_READ_BLOCK_SIZE);
-        $v_buffer = @gzread($p_src, $v_read_size);
-        @gzwrite($p_dest, $v_buffer, $v_read_size);
-        $p_size -= $v_read_size;
-      }
+    if ($p_mode == 0) {
+        while ($p_size != 0) {
+            $v_read_size = ($p_size < PCLZIP_READ_BLOCK_SIZE ? $p_size : PCLZIP_READ_BLOCK_SIZE);
+            $v_buffer    = @fread($p_src, $v_read_size);
+            @fwrite($p_dest, $v_buffer, $v_read_size);
+            $p_size -= $v_read_size;
+        }
+    } elseif ($p_mode == 1) {
+        while ($p_size != 0) {
+            $v_read_size = ($p_size < PCLZIP_READ_BLOCK_SIZE ? $p_size : PCLZIP_READ_BLOCK_SIZE);
+            $v_buffer    = @gzread($p_src, $v_read_size);
+            @fwrite($p_dest, $v_buffer, $v_read_size);
+            $p_size -= $v_read_size;
+        }
+    } elseif ($p_mode == 2) {
+        while ($p_size != 0) {
+            $v_read_size = ($p_size < PCLZIP_READ_BLOCK_SIZE ? $p_size : PCLZIP_READ_BLOCK_SIZE);
+            $v_buffer    = @fread($p_src, $v_read_size);
+            @gzwrite($p_dest, $v_buffer, $v_read_size);
+            $p_size -= $v_read_size;
+        }
+    } elseif ($p_mode == 3) {
+        while ($p_size != 0) {
+            $v_read_size = ($p_size < PCLZIP_READ_BLOCK_SIZE ? $p_size : PCLZIP_READ_BLOCK_SIZE);
+            $v_buffer    = @gzread($p_src, $v_read_size);
+            @gzwrite($p_dest, $v_buffer, $v_read_size);
+            $p_size -= $v_read_size;
+        }
     }
 
     // ----- Return
     return $v_result;
-  }
-  // --------------------------------------------------------------------------------
+}
+// --------------------------------------------------------------------------------
 
-  // --------------------------------------------------------------------------------
-  // Function : PclZipUtilRename()
-  // Description :
-  //   This function tries to do a simple rename() function. If it fails, it
-  //   tries to copy the $p_src file in a new $p_dest file and then unlink the
-  //   first one.
-  // Parameters :
-  //   $p_src : Old filename
-  //   $p_dest : New filename
-  // Return Values :
-  //   1 on success, 0 on failure.
-  // --------------------------------------------------------------------------------
-  function PclZipUtilRename($p_src, $p_dest)
-  {
+// --------------------------------------------------------------------------------
+// Function : PclZipUtilRename()
+// Description :
+//   This function tries to do a simple rename() function. If it fails, it
+//   tries to copy the $p_src file in a new $p_dest file and then unlink the
+//   first one.
+// Parameters :
+//   $p_src : Old filename
+//   $p_dest : New filename
+// Return Values :
+//   1 on success, 0 on failure.
+// --------------------------------------------------------------------------------
+function PclZipUtilRename($p_src, $p_dest)
+{
     $v_result = 1;
 
     // ----- Try to rename the files
     if (!@rename($p_src, $p_dest)) {
 
-      // ----- Try to copy & unlink the src
-      if (!@copy($p_src, $p_dest)) {
-        $v_result = 0;
-      }
-      else if (!@unlink($p_src)) {
-        $v_result = 0;
-      }
+        // ----- Try to copy & unlink the src
+        if (!@copy($p_src, $p_dest)) {
+            $v_result = 0;
+        } elseif (!@unlink($p_src)) {
+            $v_result = 0;
+        }
     }
 
     // ----- Return
     return $v_result;
-  }
-  // --------------------------------------------------------------------------------
+}
+// --------------------------------------------------------------------------------
+
+// --------------------------------------------------------------------------------
+// Function : PclZipUtilOptionText()
+// Description :
+//   Translate option value in text. Mainly for debug purpose.
+// Parameters :
+//   $p_option : the option value.
+// Return Values :
+//   The option text value.
+// --------------------------------------------------------------------------------
+function PclZipUtilOptionText($p_option)
+{
 
-  // --------------------------------------------------------------------------------
-  // Function : PclZipUtilOptionText()
-  // Description :
-  //   Translate option value in text. Mainly for debug purpose.
-  // Parameters :
-  //   $p_option : the option value.
-  // Return Values :
-  //   The option text value.
-  // --------------------------------------------------------------------------------
-  function PclZipUtilOptionText($p_option)
-  {
-    
     $v_list = get_defined_constants();
     for (reset($v_list); $v_key = key($v_list); next($v_list)) {
-	    $v_prefix = substr($v_key, 0, 10);
-	    if ((   ($v_prefix == 'PCLZIP_OPT')
-           || ($v_prefix == 'PCLZIP_CB_')
-           || ($v_prefix == 'PCLZIP_ATT'))
-	        && ($v_list[$v_key] == $p_option)) {
-        return $v_key;
-	    }
+        $v_prefix = substr($v_key, 0, 10);
+        if ((($v_prefix == 'PCLZIP_OPT') || ($v_prefix == 'PCLZIP_CB_') || ($v_prefix == 'PCLZIP_ATT')) && ($v_list[$v_key] == $p_option)) {
+            return $v_key;
+        }
     }
-    
+
     $v_result = 'Unknown';
 
     return $v_result;
-  }
-  // --------------------------------------------------------------------------------
+}
+// --------------------------------------------------------------------------------
 
-  // --------------------------------------------------------------------------------
-  // Function : PclZipUtilTranslateWinPath()
-  // Description :
-  //   Translate windows path by replacing '\' by '/' and optionally removing
-  //   drive letter.
-  // Parameters :
-  //   $p_path : path to translate.
-  //   $p_remove_disk_letter : true | false
-  // Return Values :
-  //   The path translated.
-  // --------------------------------------------------------------------------------
-  function PclZipUtilTranslateWinPath($p_path, $p_remove_disk_letter=true)
-  {
+// --------------------------------------------------------------------------------
+// Function : PclZipUtilTranslateWinPath()
+// Description :
+//   Translate windows path by replacing '\' by '/' and optionally removing
+//   drive letter.
+// Parameters :
+//   $p_path : path to translate.
+//   $p_remove_disk_letter : true | false
+// Return Values :
+//   The path translated.
+// --------------------------------------------------------------------------------
+function PclZipUtilTranslateWinPath($p_path, $p_remove_disk_letter = true)
+{
     if (stristr(php_uname(), 'windows')) {
-      // ----- Look for potential disk letter
-      if (($p_remove_disk_letter) && (($v_position = strpos($p_path, ':')) != false)) {
-          $p_path = substr($p_path, $v_position+1);
-      }
-      // ----- Change potential windows directory separator
-      if ((strpos($p_path, '\\') > 0) || (substr($p_path, 0,1) == '\\')) {
-          $p_path = strtr($p_path, '\\', '/');
-      }
+        // ----- Look for potential disk letter
+        if (($p_remove_disk_letter) && (($v_position = strpos($p_path, ':')) != false)) {
+            $p_path = substr($p_path, $v_position + 1);
+        }
+        // ----- Change potential windows directory separator
+        if ((strpos($p_path, '\\') > 0) || (substr($p_path, 0, 1) == '\\')) {
+            $p_path = strtr($p_path, '\\', '/');
+        }
     }
+
     return $p_path;
-  }
-  // --------------------------------------------------------------------------------
-
-
-?>
+}
+// --------------------------------------------------------------------------------
diff --git a/htdocs/includes/odtphp/zip/pclzip/readme.txt b/htdocs/includes/odtphp/zip/pclzip/readme.txt
index c5d2486d3ef..f0281349345 100644
--- a/htdocs/includes/odtphp/zip/pclzip/readme.txt
+++ b/htdocs/includes/odtphp/zip/pclzip/readme.txt
@@ -1,15 +1,14 @@
 // --------------------------------------------------------------------------------
-// PclZip 2.8.2 - readme.txt
+// PclZip 2.8.4 - readme.txt
 // --------------------------------------------------------------------------------
 // License GNU/LGPL - August 2009
 // Vincent Blavet - vincent@phpconcept.net
 // http://www.phpconcept.net
 // --------------------------------------------------------------------------------
-// --------------------------------------------------------------------------------
 
 
 
-0 - Sommaire
+0 - Summary
 ============
     1 - Introduction
     2 - What's new
@@ -31,12 +30,18 @@
 2 - What's new
 ==============
 
+  Version 2.8.4 :
+    - Update composer.json to indicate that pclzip/pclzip is replaced
+
+  Version 2.8.3 :
+    - Fix compatibility with PHP v7.1
+    
   Version 2.8.2 :
-    - PCLZIP_CB_PRE_EXTRACT and PCLZIP_CB_POST_EXTRACT are now supported with 
+    - PCLZIP_CB_PRE_EXTRACT and PCLZIP_CB_POST_EXTRACT are now supported with
       extraction as a string (PCLZIP_OPT_EXTRACT_AS_STRING). The string
       can also be modified in the post-extract call back.
     **Bugs correction :
-    - PCLZIP_OPT_REMOVE_ALL_PATH was not working correctly    
+    - PCLZIP_OPT_REMOVE_ALL_PATH was not working correctly
     - Remove use of eval() and do direct call to callback functions
     - Correct support of 64bits systems (Thanks to WordPress team)
 
@@ -44,7 +49,7 @@
     - Move option PCLZIP_OPT_BY_EREG to PCLZIP_OPT_BY_PREG because ereg() is
       deprecated in PHP 5.3. When using option PCLZIP_OPT_BY_EREG, PclZip will
       automatically replace it by PCLZIP_OPT_BY_PREG.
-  
+
   Version 2.8 :
     - Improve extraction of zip archive for large files by using temporary files
       This feature is working like the one defined in r2.7.
@@ -61,7 +66,7 @@
       when large file is suspected.
       This feature can also ne triggered by manual options in create() and add()
       methods. 'PCLZIP_OPT_ADD_TEMP_FILE_ON' force the use of temporary files,
-      'PCLZIP_OPT_ADD_TEMP_FILE_OFF' disable the autosense technic, 
+      'PCLZIP_OPT_ADD_TEMP_FILE_OFF' disable the autosense technic,
       'PCLZIP_OPT_ADD_TEMP_FILE_THRESHOLD' allow for configuration of a size
       threshold to use temporary files.
       Using "temporary files" rather than "memory" might take more time, but
@@ -78,7 +83,7 @@
     - Code optimisation
     - New attributes PCLZIP_ATT_FILE_COMMENT gives the ability to
       add a comment for a specific file. (Don't really know if this is usefull)
-    - New attribute PCLZIP_ATT_FILE_CONTENT gives the ability to add a string 
+    - New attribute PCLZIP_ATT_FILE_CONTENT gives the ability to add a string
       as a file.
     - New attribute PCLZIP_ATT_FILE_MTIME modify the timestamp associated with
       a file.
@@ -88,12 +93,12 @@
       action.
     - Add missing closedir() statement.
     - When adding a folder, and removing the path of this folder, files were
-      incorrectly added with a '/' at the beginning. Which means files are 
+      incorrectly added with a '/' at the beginning. Which means files are
       related to root in unix systems. Corrected.
     - Add conditional if before constant definition. This will allow users
       to redefine constants without changing the file, and then improve
       upgrade of pclzip code for new versions.
-  
+
   Version 2.5 :
     - Introduce the ability to add file/folder with individual properties (file descriptor).
       This gives for example the ability to change the filename of a zipped file.
@@ -111,19 +116,19 @@
     - New error code : PCLZIP_ERR_DIRECTORY_RESTRICTION
     - Modification in PclZipUtilPathInclusion() : dir and path beginning with ./ will be prepend
       by current path (getcwd())
-  
+
   Version 2.4 :
     - Code improvment : try to speed up the code by removing unusefull call to pack()
     - Correct bug in delete() : delete() should be called with no argument. This was not
       the case in 2.3. This is corrected in 2.4.
     - Correct a bug in path_inclusion function. When the path has several '../../', the
       result was bad.
-    - Add a check for magic_quotes_runtime configuration. If enabled, PclZip will 
+    - Add a check for magic_quotes_runtime configuration. If enabled, PclZip will
       disable it while working and det it back to its original value.
       This resolve a lots of bad formated archive errors.
     - Bug correction : PclZip now correctly unzip file in some specific situation,
       when compressed content has same size as uncompressed content.
-    - Bug correction : When selecting option 'PCLZIP_OPT_REMOVE_ALL_PATH', 
+    - Bug correction : When selecting option 'PCLZIP_OPT_REMOVE_ALL_PATH',
       directories are not any more created.
     - Code improvment : correct unclosed opendir(), better handling of . and .. in
       loops.
@@ -174,7 +179,7 @@
     - Add support for parameters PCLZIP_OPT_COMMENT, PCLZIP_OPT_ADD_COMMENT,
       PCLZIP_OPT_PREPEND_COMMENT. This will create, replace, add, or prepend comments
       in the zip archive.
-    - When merging two archives, the comments are not any more lost, but merged, with a 
+    - When merging two archives, the comments are not any more lost, but merged, with a
       blank space separator.
     - Corrected bug : Files are not deleted when all files are asked to be deleted.
     - Corrected bug : Folders with name '0' made PclZip to abort the create or add feature.
@@ -183,12 +188,12 @@
   Version 2.0 :
     ***** Warning : Some new features may break the backward compatibility for your scripts.
                     Please carefully read the readme file.
-    - Add the ability to delete by Index, name and regular expression. This feature is 
+    - Add the ability to delete by Index, name and regular expression. This feature is
       performed by the method delete(), which uses the optional parameters
       PCLZIP_OPT_BY_INDEX, PCLZIP_OPT_BY_NAME, PCLZIP_OPT_BY_EREG or PCLZIP_OPT_BY_PREG.
     - Add the ability to extract by regular expression. To extract by regexp you must use the method
-      extract(), with the option PCLZIP_OPT_BY_EREG or PCLZIP_OPT_BY_PREG 
-      (depending if you want to use ereg() or preg_match() syntax) followed by the 
+      extract(), with the option PCLZIP_OPT_BY_EREG or PCLZIP_OPT_BY_PREG
+      (depending if you want to use ereg() or preg_match() syntax) followed by the
       regular expression pattern.
     - Add the ability to extract by index, directly with the extract() method. This is a
       code improvment of the extractByIndex() method.
@@ -204,7 +209,7 @@
       The default separator is now a comma (,) and not any more a blank space.
       THIS BREAK THE BACKWARD COMPATIBILITY : Please check if this may have an impact with
       your script.
-    - Improve algorythm performance by removing the use of temporary files when adding or 
+    - Improve algorythm performance by removing the use of temporary files when adding or
       extracting files in an archive.
     - Add (correct) detection of empty filename zipping. This can occurs when the removed
       path is the same
@@ -299,7 +304,7 @@
 
   Corrected in Version 2.0 :
     - Corrected : During an extraction, if a call-back fucntion is used and try to skip
-                  a file, all the extraction process is stopped. 
+                  a file, all the extraction process is stopped.
 
   Corrected in Version 1.3 :
     - Corrected : Support of static synopsis for method extract() is broken.
@@ -344,7 +349,7 @@
   In Version 2.x :
     - PclZip does only support file uncompressed or compressed with deflate (compression method 8)
     - PclZip does not support password protected zip archive
-    - Some concern were seen when changing mtime of a file while archiving. 
+    - Some concern were seen when changing mtime of a file while archiving.
       Seems to be linked to Daylight Saving Time (PclTest_changing_mtime).
 
   In Version 1.2 :
diff --git a/htdocs/index.php b/htdocs/index.php
index ebc343b5e8d..5290e2623a2 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -68,7 +68,7 @@ if (GETPOST('addbox'))	// Add box (when submit is done from a form when ajax dis
  * View
  */
 
-if (!is_object($form)) $form = new Form($db);
+if (!isset($form) || !is_object($form)) $form = new Form($db);
 
 // Title
 $title = $langs->trans("HomeArea").' - Dolibarr '.DOL_VERSION;
@@ -295,7 +295,7 @@ if (empty($user->socid) && empty($conf->global->MAIN_DISABLE_GLOBAL_BOXSTATS))
 				$class = $classes[$val];
 				// Search in cache if load_state_board is already realized
 				$classkeyforcache = $class;
-				if ($classkeyforcache == 'ProductService') $classkeyforcache = 'Product';	// ProductService use same load_state_board than Product
+				if ($classkeyforcache == 'ProductService') $classkeyforcache = 'Product'; // ProductService use same load_state_board than Product
 
 				if (!isset($boardloaded[$classkeyforcache]) || !is_object($boardloaded[$classkeyforcache]))
 				{
diff --git a/htdocs/install/check.php b/htdocs/install/check.php
index 267e1629f36..bd34a0ac30c 100644
--- a/htdocs/install/check.php
+++ b/htdocs/install/check.php
@@ -68,10 +68,10 @@ print '<h3><img class="valigntextbottom" src="../theme/common/octicons/build/svg
 $useragent = $_SERVER['HTTP_USER_AGENT'];
 if (!empty($useragent))
 {
-    $tmp = getBrowserInfo($_SERVER["HTTP_USER_AGENT"]);
-    $browserversion = $tmp['browserversion'];
-    $browsername = $tmp['browsername'];
-    if ($browsername == 'ie' && $browserversion < 7) print '<img src="../theme/eldy/img/warning.png" alt="Error"> '.$langs->trans("WarningBrowserTooOld")."<br>\n";
+	$tmp = getBrowserInfo($_SERVER["HTTP_USER_AGENT"]);
+	$browserversion = $tmp['browserversion'];
+	$browsername = $tmp['browsername'];
+	if ($browsername == 'ie' && $browserversion < 7) print '<img src="../theme/eldy/img/warning.png" alt="Error"> '.$langs->trans("WarningBrowserTooOld")."<br>\n";
 }
 
 
@@ -84,8 +84,8 @@ if (versioncompare(versionphparray(), $arrayphpminversionerror) < 0)        // M
 	$checksok = 0; // 0=error, 1=warning
 } elseif (versioncompare(versionphparray(), $arrayphpminversionwarning) < 0)    // Minimum supported (warning if lower)
 {
-    print '<img src="../theme/eldy/img/warning.png" alt="Error"> '.$langs->trans("ErrorPHPVersionTooLow", versiontostring($arrayphpminversionwarning));
-    $checksok = 0; // 0=error, 1=warning
+	print '<img src="../theme/eldy/img/warning.png" alt="Error"> '.$langs->trans("ErrorPHPVersionTooLow", versiontostring($arrayphpminversionwarning));
+	$checksok = 0; // 0=error, 1=warning
 } else {
 	print '<img src="../theme/eldy/img/tick.png" alt="Ok"> '.$langs->trans("PHPVersion")." ".versiontostring(versionphparray());
 }
@@ -129,19 +129,19 @@ if (!function_exists("imagecreate"))
 // Check if Curl supported
 if (!function_exists("curl_init"))
 {
-    $langs->load("errors");
-    print '<img src="../theme/eldy/img/warning.png" alt="Error"> '.$langs->trans("ErrorPHPDoesNotSupportCurl")."<br>\n";
-    // $checksok = 0;		// If ko, just warning. So check must still be 1 (otherwise no way to install)
+	$langs->load("errors");
+	print '<img src="../theme/eldy/img/warning.png" alt="Error"> '.$langs->trans("ErrorPHPDoesNotSupportCurl")."<br>\n";
+	// $checksok = 0;		// If ko, just warning. So check must still be 1 (otherwise no way to install)
 } else {
-    print '<img src="../theme/eldy/img/tick.png" alt="Ok"> '.$langs->trans("PHPSupportCurl")."<br>\n";
+	print '<img src="../theme/eldy/img/tick.png" alt="Ok"> '.$langs->trans("PHPSupportCurl")."<br>\n";
 }
 
 // Check if PHP calendar extension is available
 if (!function_exists("easter_date"))
 {
-    print '<img src="../theme/eldy/img/warning.png" alt="Error"> '.$langs->trans("ErrorPHPDoesNotSupportCalendar")."<br>\n";
+	print '<img src="../theme/eldy/img/warning.png" alt="Error"> '.$langs->trans("ErrorPHPDoesNotSupportCalendar")."<br>\n";
 } else {
-    print '<img src="../theme/eldy/img/tick.png" alt="Ok"> '.$langs->trans("PHPSupportCalendar")."<br>\n";
+	print '<img src="../theme/eldy/img/tick.png" alt="Ok"> '.$langs->trans("PHPSupportCalendar")."<br>\n";
 }
 
 
@@ -161,11 +161,11 @@ if (empty($_SERVER["SERVER_ADMIN"]) || $_SERVER["SERVER_ADMIN"] != 'doliwamp@loc
 {
 	if (!function_exists("locale_get_primary_language") || !function_exists("locale_get_region"))
 	{
-	    $langs->load("errors");
-	    print '<img src="../theme/eldy/img/warning.png" alt="Error"> '.$langs->trans("ErrorPHPDoesNotSupportIntl")."<br>\n";
-	    // $checksok = 0;		// If ko, just warning. So check must still be 1 (otherwise no way to install)
+		$langs->load("errors");
+		print '<img src="../theme/eldy/img/warning.png" alt="Error"> '.$langs->trans("ErrorPHPDoesNotSupportIntl")."<br>\n";
+		// $checksok = 0;		// If ko, just warning. So check must still be 1 (otherwise no way to install)
 	} else {
-	    print '<img src="../theme/eldy/img/tick.png" alt="Ok"> '.$langs->trans("PHPSupportIntl")."<br>\n";
+		print '<img src="../theme/eldy/img/tick.png" alt="Ok"> '.$langs->trans("PHPSupportIntl")."<br>\n";
 	}
 }
 
@@ -307,35 +307,35 @@ if (!file_exists($conffile))
 			{
 				if (!file_exists($dolibarr_main_document_root."/core/lib/admin.lib.php"))
 				{
-                    print '<span class="error">A '.$conffiletoshow.' file exists with a dolibarr_main_document_root to '.$dolibarr_main_document_root.' that seems wrong. Try to fix or remove the '.$conffiletoshow.' file.</span><br>'."\n";
-				    dol_syslog("A '".$conffiletoshow."' file exists with a dolibarr_main_document_root to ".$dolibarr_main_document_root." that seems wrong. Try to fix or remove the '".$conffiletoshow."' file.", LOG_WARNING);
+					print '<span class="error">A '.$conffiletoshow.' file exists with a dolibarr_main_document_root to '.$dolibarr_main_document_root.' that seems wrong. Try to fix or remove the '.$conffiletoshow.' file.</span><br>'."\n";
+					dol_syslog("A '".$conffiletoshow."' file exists with a dolibarr_main_document_root to ".$dolibarr_main_document_root." that seems wrong. Try to fix or remove the '".$conffiletoshow."' file.", LOG_WARNING);
 				} else {
-                    require_once $dolibarr_main_document_root.'/core/lib/admin.lib.php';
+					require_once $dolibarr_main_document_root.'/core/lib/admin.lib.php';
 
-                    // 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_encrypted_pass = preg_replace('/crypted:/i', '', $dolibarr_main_db_pass); // We need to set this as it is used to know the password was initially crypted
-                            $dolibarr_main_db_pass = dol_decode($dolibarr_main_db_encrypted_pass);
-                        } 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_encrypted_pass = preg_replace('/crypted:/i', '', $dolibarr_main_db_pass); // We need to set this as it is used to know the password was initially crypted
+							$dolibarr_main_db_pass = dol_decode($dolibarr_main_db_encrypted_pass);
+						} else $dolibarr_main_db_pass = dol_decode($dolibarr_main_db_encrypted_pass);
+					}
 
-    				// $conf already created in inc.php
-    				$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;
-                    $db = getDoliDBInstance($conf->db->type, $conf->db->host, $conf->db->user, $conf->db->pass, $conf->db->name, $conf->db->port);
-    				if ($db->connected && $db->database_selected)
-    				{
-    					$ok = true;
-    				}
-                }
+					// $conf already created in inc.php
+					$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;
+					$db = getDoliDBInstance($conf->db->type, $conf->db->host, $conf->db->user, $conf->db->pass, $conf->db->name, $conf->db->port);
+					if ($db->connected && $db->database_selected)
+					{
+						$ok = true;
+					}
+				}
 			}
 		}
 
@@ -361,8 +361,8 @@ if (!file_exists($conffile))
 		// Show title
 		if (!empty($conf->global->MAIN_VERSION_LAST_UPGRADE) || !empty($conf->global->MAIN_VERSION_LAST_INSTALL))
 		{
-            print $langs->trans("VersionLastUpgrade").': <b><span class="ok">'.(empty($conf->global->MAIN_VERSION_LAST_UPGRADE) ? $conf->global->MAIN_VERSION_LAST_INSTALL : $conf->global->MAIN_VERSION_LAST_UPGRADE).'</span></b> - ';
-            print $langs->trans("VersionProgram").': <b><span class="ok">'.DOL_VERSION.'</span></b>';
+			print $langs->trans("VersionLastUpgrade").': <b><span class="ok">'.(empty($conf->global->MAIN_VERSION_LAST_UPGRADE) ? $conf->global->MAIN_VERSION_LAST_INSTALL : $conf->global->MAIN_VERSION_LAST_UPGRADE).'</span></b> - ';
+			print $langs->trans("VersionProgram").': <b><span class="ok">'.DOL_VERSION.'</span></b>';
 			//print ' '.img_warning($langs->trans("RunningUpdateProcessMayBeRequired"));
 			print '<br>';
 			print '<br>';
@@ -373,19 +373,19 @@ if (!file_exists($conffile))
 
 		$foundrecommandedchoice = 0;
 
-        $available_choices = array();
-        $notavailable_choices = array();
+		$available_choices = array();
+		$notavailable_choices = array();
 
-        if (empty($dolibarr_main_db_host))	// This means install process was not run
-        {
-        	$foundrecommandedchoice = 1; // To show only once
-        }
+		if (empty($dolibarr_main_db_host))	// This means install process was not run
+		{
+			$foundrecommandedchoice = 1; // To show only once
+		}
 
-        // Show line of first install choice
-        $choice  = '<tr class="trlineforchoice'.($foundrecommandedchoice ? ' choiceselected' : '').'">'."\n";
-        $choice .= '<td class="nowrap center"><b>'.$langs->trans("FreshInstall").'</b>';
+		// Show line of first install choice
+		$choice  = '<tr class="trlineforchoice'.($foundrecommandedchoice ? ' choiceselected' : '').'">'."\n";
+		$choice .= '<td class="nowrap center"><b>'.$langs->trans("FreshInstall").'</b>';
 		$choice .= '</td>';
-        $choice .= '<td class="listofchoicesdesc">';
+		$choice .= '<td class="listofchoicesdesc">';
 		$choice .= $langs->trans("FreshInstallDesc");
 		if (empty($dolibarr_main_db_host))	// This means install process was not run
 		{
@@ -395,23 +395,23 @@ if (!file_exists($conffile))
 			// <img src="../theme/eldy/img/tick.png" alt="Ok"> ';
 		}
 
-        $choice .= '</td>';
-        $choice .= '<td class="center">';
+		$choice .= '</td>';
+		$choice .= '<td class="center">';
 		if ($allowinstall)
 		{
-            $choice .= '<a class="button" href="fileconf.php?selectlang='.$setuplang.'">'.$langs->trans("Start").'</a>';
+			$choice .= '<a class="button" href="fileconf.php?selectlang='.$setuplang.'">'.$langs->trans("Start").'</a>';
 		} else {
 			$choice .= ($foundrecommandedchoice ? '<span class="warning">' : '').$langs->trans("InstallNotAllowed").($foundrecommandedchoice ? '</span>' : '');
 		}
-        $choice .= '</td>'."\n";
-        $choice .= '</tr>'."\n";
+		$choice .= '</td>'."\n";
+		$choice .= '</tr>'."\n";
 
-        $positionkey = ($foundrecommandedchoice ? 999 : 0);
-        if ($allowinstall) {
-        	$available_choices[$positionkey] = $choice;
-        } else {
-        	$notavailable_choices[$positionkey] = $choice;
-        }
+		$positionkey = ($foundrecommandedchoice ? 999 : 0);
+		if ($allowinstall) {
+			$available_choices[$positionkey] = $choice;
+		} else {
+			$notavailable_choices[$positionkey] = $choice;
+		}
 
 		// Show upgrade lines
 		$allowupgrade = true;
@@ -445,64 +445,64 @@ if (!file_exists($conffile))
 		$count = 0;
 		foreach ($migrationscript as $migarray)
 		{
-            $choice = '';
+			$choice = '';
 
 			$count++;
-            $recommended_choice = false;
-            $version = DOL_VERSION;
+			$recommended_choice = false;
+			$version = DOL_VERSION;
 			$versionfrom = $migarray['from'];
-            $versionto = $migarray['to'];
-            $versionarray = preg_split('/[\.-]/', $version);
-            $dolibarrversionfromarray = preg_split('/[\.-]/', $versionfrom);
-            $dolibarrversiontoarray = preg_split('/[\.-]/', $versionto);
-            // Define string newversionxxx that are used for text to show
-            $newversionfrom = preg_replace('/(\.[0-9]+)$/i', '.*', $versionfrom);
-            $newversionto = preg_replace('/(\.[0-9]+)$/i', '.*', $versionto);
-            $newversionfrombis = '';
-            if (versioncompare($dolibarrversiontoarray, $versionarray) < -2)	// From x.y.z -> x.y.z+1
-            {
-            	$newversionfrombis = ' '.$langs->trans("or").' '.$versionto;
-            }
+			$versionto = $migarray['to'];
+			$versionarray = preg_split('/[\.-]/', $version);
+			$dolibarrversionfromarray = preg_split('/[\.-]/', $versionfrom);
+			$dolibarrversiontoarray = preg_split('/[\.-]/', $versionto);
+			// Define string newversionxxx that are used for text to show
+			$newversionfrom = preg_replace('/(\.[0-9]+)$/i', '.*', $versionfrom);
+			$newversionto = preg_replace('/(\.[0-9]+)$/i', '.*', $versionto);
+			$newversionfrombis = '';
+			if (versioncompare($dolibarrversiontoarray, $versionarray) < -2)	// From x.y.z -> x.y.z+1
+			{
+				$newversionfrombis = ' '.$langs->trans("or").' '.$versionto;
+			}
 
-            if ($ok)
-            {
-                if (count($dolibarrlastupgradeversionarray) >= 2)	// If database access is available and last upgrade version is known
-                {
-                    // Now we check if this is the first qualified choice
-                    if ($allowupgrade && empty($foundrecommandedchoice) &&
-                        (versioncompare($dolibarrversiontoarray, $dolibarrlastupgradeversionarray) > 0 || versioncompare($dolibarrversiontoarray, $versionarray) < -2)
-                    )
-                    {
-                        $foundrecommandedchoice = 1; // To show only once
-                        $recommended_choice = true;
-                    }
-                } else {
-                    // We cannot recommend a choice.
-                    // A version of install may be known, but we need last upgrade.
-                }
-            }
+			if ($ok)
+			{
+				if (count($dolibarrlastupgradeversionarray) >= 2)	// If database access is available and last upgrade version is known
+				{
+					// Now we check if this is the first qualified choice
+					if ($allowupgrade && empty($foundrecommandedchoice) &&
+						(versioncompare($dolibarrversiontoarray, $dolibarrlastupgradeversionarray) > 0 || versioncompare($dolibarrversiontoarray, $versionarray) < -2)
+					)
+					{
+						$foundrecommandedchoice = 1; // To show only once
+						$recommended_choice = true;
+					}
+				} else {
+					// We cannot recommend a choice.
+					// A version of install may be known, but we need last upgrade.
+				}
+			}
 
-            $choice .= "\n".'<!-- choice '.$count.' -->'."\n";
-            $choice .= '<tr'.($recommended_choice ? ' class="choiceselected"' : '').'>';
-            $choice .= '<td class="nowrap center"><b>'.$langs->trans("Upgrade").'<br>'.$newversionfrom.$newversionfrombis.' -> '.$newversionto.'</b></td>';
-            $choice .= '<td class="listofchoicesdesc">';
-            $choice .= $langs->trans("UpgradeDesc");
+			$choice .= "\n".'<!-- choice '.$count.' -->'."\n";
+			$choice .= '<tr'.($recommended_choice ? ' class="choiceselected"' : '').'>';
+			$choice .= '<td class="nowrap center"><b>'.$langs->trans("Upgrade").'<br>'.$newversionfrom.$newversionfrombis.' -> '.$newversionto.'</b></td>';
+			$choice .= '<td class="listofchoicesdesc">';
+			$choice .= $langs->trans("UpgradeDesc");
 
-            if ($recommended_choice)
-            {
-                $choice .= '<br>';
-                //print $langs->trans("InstallChoiceRecommanded",DOL_VERSION,$conf->global->MAIN_VERSION_LAST_UPGRADE);
-                $choice .= '<div class="center">';
-                $choice .= '<div class="ok suggestedchoice">'.$langs->trans("InstallChoiceSuggested").'</div>';
-                if ($count < count($migarray))	// There are other choices after
-                {
-                    print $langs->trans("MigrateIsDoneStepByStep", DOL_VERSION);
-                }
-                $choice .= '</div>';
-            }
+			if ($recommended_choice)
+			{
+				$choice .= '<br>';
+				//print $langs->trans("InstallChoiceRecommanded",DOL_VERSION,$conf->global->MAIN_VERSION_LAST_UPGRADE);
+				$choice .= '<div class="center">';
+				$choice .= '<div class="ok suggestedchoice">'.$langs->trans("InstallChoiceSuggested").'</div>';
+				if ($count < count($migarray))	// There are other choices after
+				{
+					print $langs->trans("MigrateIsDoneStepByStep", DOL_VERSION);
+				}
+				$choice .= '</div>';
+			}
 
-            $choice .= '</td>';
-            $choice .= '<td class="center">';
+			$choice .= '</td>';
+			$choice .= '<td class="center">';
 			if ($allowupgrade)
 			{
 				$disabled = false;
@@ -515,22 +515,22 @@ if (!file_exists($conffile))
 					$foundrecommandedchoice = 2;
 				}
 				if ($disabled)
-                {
-                    $choice .= '<span class="opacitymedium">'.$langs->trans("NotYetAvailable").'</span>';
-                } else {
-                    $choice .= '<a class="button runupgrade" href="upgrade.php?action=upgrade'.($count < count($migrationscript) ? '_'.$versionto : '').'&amp;selectlang='.$setuplang.'&amp;versionfrom='.$versionfrom.'&amp;versionto='.$versionto.'">'.$langs->trans("Start").'</a>';
-                }
+				{
+					$choice .= '<span class="opacitymedium">'.$langs->trans("NotYetAvailable").'</span>';
+				} else {
+					$choice .= '<a class="button runupgrade" href="upgrade.php?action=upgrade'.($count < count($migrationscript) ? '_'.$versionto : '').'&amp;selectlang='.$setuplang.'&amp;versionfrom='.$versionfrom.'&amp;versionto='.$versionto.'">'.$langs->trans("Start").'</a>';
+				}
 			} else {
-                $choice .= $langs->trans("NotAvailable");
+				$choice .= $langs->trans("NotAvailable");
 			}
-            $choice .= '</td>';
-            $choice .= '</tr>'."\n";
+			$choice .= '</td>';
+			$choice .= '</tr>'."\n";
 
-            if ($allowupgrade) {
-                $available_choices[$count] = $choice;
-            } else {
-                $notavailable_choices[$count] = $choice;
-            }
+			if ($allowupgrade) {
+				$available_choices[$count] = $choice;
+			} else {
+				$notavailable_choices[$count] = $choice;
+			}
 		}
 
 		// If there is no choice at all, we show all of them.
@@ -540,32 +540,32 @@ if (!file_exists($conffile))
 			$notavailable_choices = array();
 		}
 
-        // Array of install choices
+		// Array of install choices
 		krsort($available_choices, SORT_NATURAL);
-        print"\n";
-        print '<table width="100%" class="listofchoices">';
-        foreach ($available_choices as $choice) {
-            print $choice;
-        }
+		print"\n";
+		print '<table width="100%" class="listofchoices">';
+		foreach ($available_choices as $choice) {
+			print $choice;
+		}
 
-        print '</table>'."\n";
+		print '</table>'."\n";
 
-        if (count($notavailable_choices)) {
-            print '<br><div id="AShowChoices" style="opacity: 0.5">';
-            print '> '.$langs->trans('ShowNotAvailableOptions').'...';
-            print '</div>';
+		if (count($notavailable_choices)) {
+			print '<br><div id="AShowChoices" style="opacity: 0.5">';
+			print '> '.$langs->trans('ShowNotAvailableOptions').'...';
+			print '</div>';
 
-            print '<div id="navail_choices" style="display:none">';
-            print "<br>\n";
-            print '<table width="100%" class="listofchoices">';
-            foreach ($notavailable_choices as $choice) {
-                print $choice;
-            }
+			print '<div id="navail_choices" style="display:none">';
+			print "<br>\n";
+			print '<table width="100%" class="listofchoices">';
+			foreach ($notavailable_choices as $choice) {
+				print $choice;
+			}
 
-            print '</table>'."\n";
-            print '</div>';
-        }
-    }
+			print '</table>'."\n";
+			print '</div>';
+		}
+	}
 }
 
 print '<script type="text/javascript">
diff --git a/htdocs/install/fileconf.php b/htdocs/install/fileconf.php
index 4e914e1a4f3..ec626a79903 100644
--- a/htdocs/install/fileconf.php
+++ b/htdocs/install/fileconf.php
@@ -60,8 +60,8 @@ $useforcedwizard = false;
 $forcedfile = "./install.forced.php";
 if ($conffile == "/etc/dolibarr/conf.php") $forcedfile = "/etc/dolibarr/install.forced.php"; // Must be after inc.php
 if (@file_exists($forcedfile)) {
-    $useforcedwizard = true;
-    include_once $forcedfile;
+	$useforcedwizard = true;
+	include_once $forcedfile;
 }
 
 
@@ -77,18 +77,18 @@ pHeader($langs->trans("ConfigurationFile"), "step1", "set", "", (empty($force_do
 // Test if we can run a first install process
 if (!is_writable($conffile))
 {
-    print $langs->trans("ConfFileIsNotWritable", $conffiletoshow);
-    dolibarr_install_syslog("fileconf: config file is not writable", LOG_WARNING);
-    dolibarr_install_syslog("- fileconf: end");
-    pFooter(1, $setuplang, 'jscheckparam');
-    exit;
+	print $langs->trans("ConfFileIsNotWritable", $conffiletoshow);
+	dolibarr_install_syslog("fileconf: config file is not writable", LOG_WARNING);
+	dolibarr_install_syslog("- fileconf: end");
+	pFooter(1, $setuplang, 'jscheckparam');
+	exit;
 }
 
 if (!empty($force_install_message))
 {
-    print '<div><br>'.$langs->trans($force_install_message).'</div>';
+	print '<div><br>'.$langs->trans($force_install_message).'</div>';
 
-    /*print '<script type="text/javascript">';
+	/*print '<script type="text/javascript">';
     print '	jQuery(document).ready(function() {
 				jQuery("#linktoshowtechnicalparam").click(function() {
 					jQuery(".hidewhenedit").hide();
@@ -210,7 +210,7 @@ if (!empty($force_install_noedit)) {
 
 	<?php
 	if (!empty($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == 'on') {   // Enabled if the installation process is "https://"
-	    ?>
+		?>
 	<tr>
                     <td class="label"><label for="main_force_https"><?php echo $langs->trans("ForceHttps"); ?></label></td>
                     <td class="label">
@@ -254,7 +254,7 @@ if (!empty($force_install_noedit)) {
 	<?php
 	if (!isset($dolibarr_main_db_host))
 	{
-	    $dolibarr_main_db_host = "localhost";
+		$dolibarr_main_db_host = "localhost";
 	}
 	?>
 	<tr>
@@ -275,48 +275,48 @@ if (!empty($force_install_noedit)) {
 		$handle = opendir($dir);
 		if (is_resource($handle))
 		{
-		    while (($file = readdir($handle)) !== false)
-		    {
-		        if (is_readable($dir."/".$file) && preg_match('/^(.*)\.class\.php$/i', $file, $reg))
-		        {
-		            $type = $reg[1];
-                    if ($type === 'DoliDB') continue; // Skip abstract class
-                    $class = 'DoliDB'.ucfirst($type);
-                    include_once $dir."/".$file;
+			while (($file = readdir($handle)) !== false)
+			{
+				if (is_readable($dir."/".$file) && preg_match('/^(.*)\.class\.php$/i', $file, $reg))
+				{
+					$type = $reg[1];
+					if ($type === 'DoliDB') continue; // Skip abstract class
+					$class = 'DoliDB'.ucfirst($type);
+					include_once $dir."/".$file;
 
-                    if ($type == 'sqlite') continue; // We hide sqlite because support can't be complete until sqlite does not manage foreign key creation after table creation (ALTER TABLE child ADD CONSTRAINT not supported)
-                    if ($type == 'sqlite3') continue; // We hide sqlite3 because support can't be complete until sqlite does not manage foreign key creation after table creation (ALTER TABLE child ADD CONSTRAINT not supported)
+					if ($type == 'sqlite') continue; // We hide sqlite because support can't be complete until sqlite does not manage foreign key creation after table creation (ALTER TABLE child ADD CONSTRAINT not supported)
+					if ($type == 'sqlite3') continue; // We hide sqlite3 because support can't be complete until sqlite does not manage foreign key creation after table creation (ALTER TABLE child ADD CONSTRAINT not supported)
 
-		            // Version min of database
-                    $versionbasemin = explode('.', $class::VERSIONMIN);
-                    $note = '('.$class::LABEL.' >= '.$class::VERSIONMIN.')';
+					// Version min of database
+					$versionbasemin = explode('.', $class::VERSIONMIN);
+					$note = '('.$class::LABEL.' >= '.$class::VERSIONMIN.')';
 
-		            // Switch to mysql if mysqli is not present
-		            if ($defaultype == 'mysqli' && !function_exists('mysqli_connect')) $defaultype = 'mysql';
+					// Switch to mysql if mysqli is not present
+					if ($defaultype == 'mysqli' && !function_exists('mysqli_connect')) $defaultype = 'mysql';
 
-		            // Show line into list
-		            if ($type == 'mysql') { $testfunction = 'mysql_connect'; $testclass = ''; }
-		            if ($type == 'mysqli') { $testfunction = 'mysqli_connect'; $testclass = ''; }
-		            if ($type == 'pgsql') { $testfunction = 'pg_connect'; $testclass = ''; }
-		            if ($type == 'mssql') { $testfunction = 'mssql_connect'; $testclass = ''; }
-		        	if ($type == 'sqlite') { $testfunction = ''; $testclass = 'PDO'; }
-		            if ($type == 'sqlite3') { $testfunction = ''; $testclass = 'SQLite3'; }
-		            $option .= '<option value="'.$type.'"'.($defaultype == $type ? ' selected' : '');
-		            if ($testfunction && !function_exists($testfunction)) $option .= ' disabled';
-		            if ($testclass && !class_exists($testclass)) $option .= ' disabled';
-		            $option .= '>';
-		            $option .= $type.'&nbsp; &nbsp;';
-		            if ($note) $option .= ' '.$note;
-		            // Deprecated and experimental
+					// Show line into list
+					if ($type == 'mysql') { $testfunction = 'mysql_connect'; $testclass = ''; }
+					if ($type == 'mysqli') { $testfunction = 'mysqli_connect'; $testclass = ''; }
+					if ($type == 'pgsql') { $testfunction = 'pg_connect'; $testclass = ''; }
+					if ($type == 'mssql') { $testfunction = 'mssql_connect'; $testclass = ''; }
+					if ($type == 'sqlite') { $testfunction = ''; $testclass = 'PDO'; }
+					if ($type == 'sqlite3') { $testfunction = ''; $testclass = 'SQLite3'; }
+					$option .= '<option value="'.$type.'"'.($defaultype == $type ? ' selected' : '');
+					if ($testfunction && !function_exists($testfunction)) $option .= ' disabled';
+					if ($testclass && !class_exists($testclass)) $option .= ' disabled';
+					$option .= '>';
+					$option .= $type.'&nbsp; &nbsp;';
+					if ($note) $option .= ' '.$note;
+					// Deprecated and experimental
 					if ($type == 'mysql') $option .= ' '.$langs->trans("Deprecated");
-		            elseif ($type == 'mssql')  $option .= ' '.$langs->trans("VersionExperimental");
-		            elseif ($type == 'sqlite') $option .= ' '.$langs->trans("VersionExperimental");
-		            elseif ($type == 'sqlite3') $option .= ' '.$langs->trans("VersionExperimental");
-		            // No available
-		            elseif (!function_exists($testfunction)) $option .= ' - '.$langs->trans("FunctionNotAvailableInThisPHP");
-		            $option .= '</option>';
-		        }
-		    }
+					elseif ($type == 'mssql')  $option .= ' '.$langs->trans("VersionExperimental");
+					elseif ($type == 'sqlite') $option .= ' '.$langs->trans("VersionExperimental");
+					elseif ($type == 'sqlite3') $option .= ' '.$langs->trans("VersionExperimental");
+					// No available
+					elseif (!function_exists($testfunction)) $option .= ' - '.$langs->trans("FunctionNotAvailableInThisPHP");
+					$option .= '</option>';
+				}
+			}
 		}
 		?>
 			<select id="db_type"
@@ -409,13 +409,13 @@ if (!empty($force_install_noedit)) {
 			       name="db_pass"
 			       value="
 				<?php
-			    // If $force_install_databasepass is on, we don't want to set password, we just show '***'. Real value will be extracted from the forced install file at step1.
-			    $autofill = ((!empty($_SESSION['dol_save_pass'])) ? $_SESSION['dol_save_pass'] : str_pad('', strlen($force_install_databasepass), '*'));
-			    if (!empty($dolibarr_main_prod)) {
-				    $autofill = '';
-			    }
-			    print dol_escape_htmltag($autofill);
-			    ?>"
+				// If $force_install_databasepass is on, we don't want to set password, we just show '***'. Real value will be extracted from the forced install file at step1.
+				$autofill = ((!empty($_SESSION['dol_save_pass'])) ? $_SESSION['dol_save_pass'] : str_pad('', strlen($force_install_databasepass), '*'));
+				if (!empty($dolibarr_main_prod)) {
+					$autofill = '';
+				}
+				print dol_escape_htmltag($autofill);
+				?>"
 				<?php if ($force_install_noedit == 2 && $force_install_databasepass !== null) { print ' disabled'; } ?>
 			>
 		</td>
@@ -479,19 +479,19 @@ if (!empty($force_install_noedit)) {
 			       name="db_pass_root"
 			       class="needroot"
 			       value="<?php
-			        // If $force_install_databaserootpass is on, we don't want to set password here, we just show '***'. Real value will be extracted from the forced install file at step1.
-			        $autofill = ((!empty($force_install_databaserootpass)) ? str_pad('', strlen($force_install_databaserootpass), '*') : @$db_pass_root);
-			        if (!empty($dolibarr_main_prod)) {
-				        $autofill = '';
-			        }
-				    // Do not autofill password if instance is a production instance
-                    if (!empty($_SERVER["SERVER_NAME"]) && !in_array($_SERVER["SERVER_NAME"],
-					    array('127.0.0.1', 'localhost', 'localhostgit'))
-			        ) {
-				        $autofill = '';
-			        }    // Do not autofill password for remote access
-			        print dol_escape_htmltag($autofill);
-			        ?>"
+					// If $force_install_databaserootpass is on, we don't want to set password here, we just show '***'. Real value will be extracted from the forced install file at step1.
+					$autofill = ((!empty($force_install_databaserootpass)) ? str_pad('', strlen($force_install_databaserootpass), '*') : @$db_pass_root);
+					if (!empty($dolibarr_main_prod)) {
+						$autofill = '';
+					}
+					// Do not autofill password if instance is a production instance
+					if (!empty($_SERVER["SERVER_NAME"]) && !in_array($_SERVER["SERVER_NAME"],
+						array('127.0.0.1', 'localhost', 'localhostgit'))
+					) {
+						$autofill = '';
+					}    // Do not autofill password for remote access
+					print dol_escape_htmltag($autofill);
+					?>"
 				<?php if ($force_install_noedit > 0 && !empty($force_install_databaserootpass)) { print ' disabled'; /* May be removed by javascript*/ } ?>
 			>
 		</td>
diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php
index ff983618c41..e770e41e89c 100644
--- a/htdocs/install/inc.php
+++ b/htdocs/install/inc.php
@@ -36,9 +36,9 @@ require_once '../filefunc.inc.php';
 if (!defined('DOL_DOCUMENT_ROOT'))	    define('DOL_DOCUMENT_ROOT', '..');
 if (!defined('ADODB_PATH'))
 {
-    $foundpath = DOL_DOCUMENT_ROOT.'/includes/adodbtime/';
-    if (!is_dir($foundpath)) $foundpath = '/usr/share/php/adodb/';
-    define('ADODB_PATH', $foundpath);
+	$foundpath = DOL_DOCUMENT_ROOT.'/includes/adodbtime/';
+	if (!is_dir($foundpath)) $foundpath = '/usr/share/php/adodb/';
+	define('ADODB_PATH', $foundpath);
 }
 
 require_once DOL_DOCUMENT_ROOT.'/core/class/translate.class.php';
@@ -61,7 +61,7 @@ $_REQUEST["logtohtml"] = 1;
 // et non path absolu.
 if (isset($_SERVER["DOCUMENT_URI"]) && $_SERVER["DOCUMENT_URI"])
 {
-    $_SERVER["PHP_SELF"] = $_SERVER["DOCUMENT_URI"];
+	$_SERVER["PHP_SELF"] = $_SERVER["DOCUMENT_URI"];
 }
 
 
@@ -81,54 +81,54 @@ $conffiletoshow = "htdocs/conf/conf.php";
 // Load conf file if it is already defined
 if (!defined('DONOTLOADCONF') && file_exists($conffile) && filesize($conffile) > 8) // Test on filesize is to ensure that conf file is more that an empty template with just <?php in first line
 {
-    $result = include_once $conffile; // Load conf file
-    if ($result)
-    {
+	$result = include_once $conffile; // Load conf file
+	if ($result)
+	{
 		if (empty($dolibarr_main_db_type)) $dolibarr_main_db_type = 'mysqli'; // For backward compatibility
 
-        //Mysql driver support has been removed in favor of mysqli
-        if ($dolibarr_main_db_type == 'mysql') {
-            $dolibarr_main_db_type = 'mysqli';
-        }
+		//Mysql driver support has been removed in favor of mysqli
+		if ($dolibarr_main_db_type == 'mysql') {
+			$dolibarr_main_db_type = 'mysqli';
+		}
 
 		if (empty($dolibarr_main_db_port) && ($dolibarr_main_db_type == 'mysqli')) $dolibarr_main_db_port = '3306'; // For backward compatibility
 
 		// Clean parameters
 		$dolibarr_main_data_root = isset($dolibarr_main_data_root) ?trim($dolibarr_main_data_root) : DOL_DOCUMENT_ROOT.'/../documents';
-    	$dolibarr_main_url_root         = isset($dolibarr_main_url_root) ?trim($dolibarr_main_url_root) : '';
-    	$dolibarr_main_url_root_alt     = isset($dolibarr_main_url_root_alt) ?trim($dolibarr_main_url_root_alt) : '';
-    	$dolibarr_main_document_root    = isset($dolibarr_main_document_root) ?trim($dolibarr_main_document_root) : '';
-    	$dolibarr_main_document_root_alt = isset($dolibarr_main_document_root_alt) ?trim($dolibarr_main_document_root_alt) : '';
+		$dolibarr_main_url_root         = isset($dolibarr_main_url_root) ?trim($dolibarr_main_url_root) : '';
+		$dolibarr_main_url_root_alt     = isset($dolibarr_main_url_root_alt) ?trim($dolibarr_main_url_root_alt) : '';
+		$dolibarr_main_document_root    = isset($dolibarr_main_document_root) ?trim($dolibarr_main_document_root) : '';
+		$dolibarr_main_document_root_alt = isset($dolibarr_main_document_root_alt) ?trim($dolibarr_main_document_root_alt) : '';
 
-        // Remove last / or \ on directories or url value
-        if (!empty($dolibarr_main_document_root) && !preg_match('/^[\\/]+$/', $dolibarr_main_document_root))		$dolibarr_main_document_root = preg_replace('/[\\/]+$/', '', $dolibarr_main_document_root);
-        if (!empty($dolibarr_main_url_root) && !preg_match('/^[\\/]+$/', $dolibarr_main_url_root))			$dolibarr_main_url_root = preg_replace('/[\\/]+$/', '', $dolibarr_main_url_root);
-        if (!empty($dolibarr_main_data_root) && !preg_match('/^[\\/]+$/', $dolibarr_main_data_root))			$dolibarr_main_data_root = preg_replace('/[\\/]+$/', '', $dolibarr_main_data_root);
-        if (!empty($dolibarr_main_document_root_alt) && !preg_match('/^[\\/]+$/', $dolibarr_main_document_root_alt))	$dolibarr_main_document_root_alt = preg_replace('/[\\/]+$/', '', $dolibarr_main_document_root_alt);
-        if (!empty($dolibarr_main_url_root_alt) && !preg_match('/^[\\/]+$/', $dolibarr_main_url_root_alt))		$dolibarr_main_url_root_alt = preg_replace('/[\\/]+$/', '', $dolibarr_main_url_root_alt);
+		// Remove last / or \ on directories or url value
+		if (!empty($dolibarr_main_document_root) && !preg_match('/^[\\/]+$/', $dolibarr_main_document_root))		$dolibarr_main_document_root = preg_replace('/[\\/]+$/', '', $dolibarr_main_document_root);
+		if (!empty($dolibarr_main_url_root) && !preg_match('/^[\\/]+$/', $dolibarr_main_url_root))			$dolibarr_main_url_root = preg_replace('/[\\/]+$/', '', $dolibarr_main_url_root);
+		if (!empty($dolibarr_main_data_root) && !preg_match('/^[\\/]+$/', $dolibarr_main_data_root))			$dolibarr_main_data_root = preg_replace('/[\\/]+$/', '', $dolibarr_main_data_root);
+		if (!empty($dolibarr_main_document_root_alt) && !preg_match('/^[\\/]+$/', $dolibarr_main_document_root_alt))	$dolibarr_main_document_root_alt = preg_replace('/[\\/]+$/', '', $dolibarr_main_document_root_alt);
+		if (!empty($dolibarr_main_url_root_alt) && !preg_match('/^[\\/]+$/', $dolibarr_main_url_root_alt))		$dolibarr_main_url_root_alt = preg_replace('/[\\/]+$/', '', $dolibarr_main_url_root_alt);
 
-        // Create conf object
-        if (!empty($dolibarr_main_document_root))
-        {
-            $result = conf($dolibarr_main_document_root);
-        }
-        // Load database driver
-        if ($result)
-        {
-            if (!empty($dolibarr_main_document_root) && !empty($dolibarr_main_db_type))
-            {
-                $result = include_once $dolibarr_main_document_root."/core/db/".$dolibarr_main_db_type.'.class.php';
-                if (!$result)
-                {
-                    $includeconferror = 'ErrorBadValueForDolibarrMainDBType';
-                }
-            }
-        } else {
-            $includeconferror = 'ErrorBadValueForDolibarrMainDocumentRoot';
-        }
-    } else {
-        $includeconferror = 'ErrorBadFormatForConfFile';
-    }
+		// Create conf object
+		if (!empty($dolibarr_main_document_root))
+		{
+			$result = conf($dolibarr_main_document_root);
+		}
+		// Load database driver
+		if ($result)
+		{
+			if (!empty($dolibarr_main_document_root) && !empty($dolibarr_main_db_type))
+			{
+				$result = include_once $dolibarr_main_document_root."/core/db/".$dolibarr_main_db_type.'.class.php';
+				if (!$result)
+				{
+					$includeconferror = 'ErrorBadValueForDolibarrMainDBType';
+				}
+			}
+		} else {
+			$includeconferror = 'ErrorBadValueForDolibarrMainDocumentRoot';
+		}
+	} else {
+		$includeconferror = 'ErrorBadFormatForConfFile';
+	}
 }
 $conf->global->MAIN_ENABLE_LOG_TO_HTML = 1;
 
@@ -156,12 +156,12 @@ if (empty($conf->db->user)) $conf->db->user = '';
 $conf->file->dol_document_root = array(DOL_DOCUMENT_ROOT);
 if (!empty($dolibarr_main_document_root_alt))
 {
-    // dolibarr_main_document_root_alt contains several directories
-    $values = preg_split('/[;,]/', $dolibarr_main_document_root_alt);
-    foreach ($values as $value)
-    {
-        $conf->file->dol_document_root[] = $value;
-    }
+	// dolibarr_main_document_root_alt contains several directories
+	$values = preg_split('/[;,]/', $dolibarr_main_document_root_alt);
+	foreach ($values as $value)
+	{
+		$conf->file->dol_document_root[] = $value;
+	}
 }
 
 
@@ -175,13 +175,13 @@ if (preg_match('/install\.lock/i', $_SERVER["SCRIPT_FILENAME"]))
 	}
 	$langs->load("install");
 	print $langs->trans("YouTryInstallDisabledByDirLock");
-    if (!empty($dolibarr_main_url_root))
-    {
-        print 'Click on following link, <a href="'.$dolibarr_main_url_root.'/admin/index.php?mainmenu=home&leftmenu=setup'.(isset($_POST["login"]) ? '&username='.urlencode($_POST["login"]) : '').'">';
-        print $langs->trans("ClickHereToGoToApp");
-        print '</a>';
-    }
-    exit;
+	if (!empty($dolibarr_main_url_root))
+	{
+		print 'Click on following link, <a href="'.$dolibarr_main_url_root.'/admin/index.php?mainmenu=home&leftmenu=setup'.(isset($_POST["login"]) ? '&username='.urlencode($_POST["login"]) : '').'">';
+		print $langs->trans("ClickHereToGoToApp");
+		print '</a>';
+	}
+	exit;
 }
 
 $lockfile = DOL_DATA_ROOT.'/install.lock';
@@ -199,16 +199,16 @@ if (@file_exists($lockfile))
 	}
 	$langs->load("install");
 	print $langs->trans("YouTryInstallDisabledByFileLock");
-    if (!empty($dolibarr_main_url_root))
-    {
-        print $langs->trans("ClickOnLinkOrRemoveManualy").'<br>';
-        print '<a href="'.$dolibarr_main_url_root.'/admin/index.php?mainmenu=home&leftmenu=setup'.(isset($_POST["login"]) ? '&username='.urlencode($_POST["login"]) : '').'">';
-        print $langs->trans("ClickHereToGoToApp");
-        print '</a>';
-    } else {
-        print 'If you always reach this page, you must remove install.lock file manually.<br>';
-    }
-    exit;
+	if (!empty($dolibarr_main_url_root))
+	{
+		print $langs->trans("ClickOnLinkOrRemoveManualy").'<br>';
+		print '<a href="'.$dolibarr_main_url_root.'/admin/index.php?mainmenu=home&leftmenu=setup'.(isset($_POST["login"]) ? '&username='.urlencode($_POST["login"]) : '').'">';
+		print $langs->trans("ClickHereToGoToApp");
+		print '</a>';
+	} else {
+		print 'If you always reach this page, you must remove install.lock file manually.<br>';
+	}
+	exit;
 }
 
 
@@ -261,75 +261,75 @@ else $langs->setDefaultLang('auto');
  */
 function conf($dolibarr_main_document_root)
 {
-    global $conf;
-    global $dolibarr_main_db_type;
-    global $dolibarr_main_db_host;
-    global $dolibarr_main_db_port;
-    global $dolibarr_main_db_name;
-    global $dolibarr_main_db_user;
-    global $dolibarr_main_db_pass;
-    global $character_set_client;
+	global $conf;
+	global $dolibarr_main_db_type;
+	global $dolibarr_main_db_host;
+	global $dolibarr_main_db_port;
+	global $dolibarr_main_db_name;
+	global $dolibarr_main_db_user;
+	global $dolibarr_main_db_pass;
+	global $character_set_client;
 
-    $return = include_once $dolibarr_main_document_root.'/core/class/conf.class.php';
-    if (!$return) return -1;
+	$return = include_once $dolibarr_main_document_root.'/core/class/conf.class.php';
+	if (!$return) return -1;
 
-    $conf = new Conf();
-    $conf->db->type = trim($dolibarr_main_db_type);
-    $conf->db->host = trim($dolibarr_main_db_host);
-    $conf->db->port = trim($dolibarr_main_db_port);
-    $conf->db->name = trim($dolibarr_main_db_name);
-    $conf->db->user = trim($dolibarr_main_db_user);
-    $conf->db->pass = trim($dolibarr_main_db_pass);
+	$conf = new Conf();
+	$conf->db->type = trim($dolibarr_main_db_type);
+	$conf->db->host = trim($dolibarr_main_db_host);
+	$conf->db->port = trim($dolibarr_main_db_port);
+	$conf->db->name = trim($dolibarr_main_db_name);
+	$conf->db->user = trim($dolibarr_main_db_user);
+	$conf->db->pass = trim($dolibarr_main_db_pass);
 
-    // Mysql driver support has been removed in favor of mysqli
-    if ($conf->db->type == 'mysql') $conf->db->type = 'mysqli';
-    if (empty($character_set_client)) $character_set_client = "UTF-8";
-    $conf->file->character_set_client = strtoupper($character_set_client);
-    if (empty($dolibarr_main_db_character_set)) $dolibarr_main_db_character_set = ($conf->db->type == 'mysqli' ? 'utf8' : '');
-    $conf->db->character_set = $dolibarr_main_db_character_set;
-    if (empty($dolibarr_main_db_collation)) $dolibarr_main_db_collation = ($conf->db->type == 'mysqli' ? 'utf8_unicode_ci' : '');
-    $conf->db->dolibarr_main_db_collation = $dolibarr_main_db_collation;
-    if (empty($dolibarr_main_db_encryption)) $dolibarr_main_db_encryption = 0;
-    $conf->db->dolibarr_main_db_encryption = $dolibarr_main_db_encryption;
-    if (empty($dolibarr_main_db_cryptkey)) $dolibarr_main_db_cryptkey = '';
-    $conf->db->dolibarr_main_db_cryptkey = $dolibarr_main_db_cryptkey;
+	// Mysql driver support has been removed in favor of mysqli
+	if ($conf->db->type == 'mysql') $conf->db->type = 'mysqli';
+	if (empty($character_set_client)) $character_set_client = "UTF-8";
+	$conf->file->character_set_client = strtoupper($character_set_client);
+	if (empty($dolibarr_main_db_character_set)) $dolibarr_main_db_character_set = ($conf->db->type == 'mysqli' ? 'utf8' : '');
+	$conf->db->character_set = $dolibarr_main_db_character_set;
+	if (empty($dolibarr_main_db_collation)) $dolibarr_main_db_collation = ($conf->db->type == 'mysqli' ? 'utf8_unicode_ci' : '');
+	$conf->db->dolibarr_main_db_collation = $dolibarr_main_db_collation;
+	if (empty($dolibarr_main_db_encryption)) $dolibarr_main_db_encryption = 0;
+	$conf->db->dolibarr_main_db_encryption = $dolibarr_main_db_encryption;
+	if (empty($dolibarr_main_db_cryptkey)) $dolibarr_main_db_cryptkey = '';
+	$conf->db->dolibarr_main_db_cryptkey = $dolibarr_main_db_cryptkey;
 
-    // Force usage of log file for install and upgrades
-    $conf->syslog->enabled = 1;
-    $conf->global->SYSLOG_LEVEL = constant('LOG_DEBUG');
-    if (!defined('SYSLOG_HANDLERS')) define('SYSLOG_HANDLERS', '["mod_syslog_file"]');
-    if (!defined('SYSLOG_FILE'))	// To avoid warning on systems with constant already defined
-    {
-        if (@is_writable('/tmp')) define('SYSLOG_FILE', '/tmp/dolibarr_install.log');
-        elseif (!empty($_ENV["TMP"]) && @is_writable($_ENV["TMP"]))  define('SYSLOG_FILE', $_ENV["TMP"].'/dolibarr_install.log');
-        elseif (!empty($_ENV["TEMP"]) && @is_writable($_ENV["TEMP"])) define('SYSLOG_FILE', $_ENV["TEMP"].'/dolibarr_install.log');
-        elseif (@is_writable('../../../../') && @file_exists('../../../../startdoliwamp.bat')) define('SYSLOG_FILE', '../../../../dolibarr_install.log'); // For DoliWamp
-        elseif (@is_writable('../../')) define('SYSLOG_FILE', '../../dolibarr_install.log'); // For others
-        //print 'SYSLOG_FILE='.SYSLOG_FILE;exit;
-    }
-    if (defined('SYSLOG_FILE')) $conf->global->SYSLOG_FILE = constant('SYSLOG_FILE');
-    if (!defined('SYSLOG_FILE_NO_ERROR')) define('SYSLOG_FILE_NO_ERROR', 1);
-    // We init log handler for install
-    $handlers = array('mod_syslog_file');
-    foreach ($handlers as $handler)
-    {
-    	$file = DOL_DOCUMENT_ROOT.'/core/modules/syslog/'.$handler.'.php';
-    	if (!file_exists($file))
-    	{
-    		throw new Exception('Missing log handler file '.$handler.'.php');
-    	}
+	// Force usage of log file for install and upgrades
+	$conf->syslog->enabled = 1;
+	$conf->global->SYSLOG_LEVEL = constant('LOG_DEBUG');
+	if (!defined('SYSLOG_HANDLERS')) define('SYSLOG_HANDLERS', '["mod_syslog_file"]');
+	if (!defined('SYSLOG_FILE'))	// To avoid warning on systems with constant already defined
+	{
+		if (@is_writable('/tmp')) define('SYSLOG_FILE', '/tmp/dolibarr_install.log');
+		elseif (!empty($_ENV["TMP"]) && @is_writable($_ENV["TMP"]))  define('SYSLOG_FILE', $_ENV["TMP"].'/dolibarr_install.log');
+		elseif (!empty($_ENV["TEMP"]) && @is_writable($_ENV["TEMP"])) define('SYSLOG_FILE', $_ENV["TEMP"].'/dolibarr_install.log');
+		elseif (@is_writable('../../../../') && @file_exists('../../../../startdoliwamp.bat')) define('SYSLOG_FILE', '../../../../dolibarr_install.log'); // For DoliWamp
+		elseif (@is_writable('../../')) define('SYSLOG_FILE', '../../dolibarr_install.log'); // For others
+		//print 'SYSLOG_FILE='.SYSLOG_FILE;exit;
+	}
+	if (defined('SYSLOG_FILE')) $conf->global->SYSLOG_FILE = constant('SYSLOG_FILE');
+	if (!defined('SYSLOG_FILE_NO_ERROR')) define('SYSLOG_FILE_NO_ERROR', 1);
+	// We init log handler for install
+	$handlers = array('mod_syslog_file');
+	foreach ($handlers as $handler)
+	{
+		$file = DOL_DOCUMENT_ROOT.'/core/modules/syslog/'.$handler.'.php';
+		if (!file_exists($file))
+		{
+			throw new Exception('Missing log handler file '.$handler.'.php');
+		}
 
-    	require_once $file;
-    	$loghandlerinstance = new $handler();
-    	if (!$loghandlerinstance instanceof LogHandlerInterface)
-    	{
-    		throw new Exception('Log handler does not extend LogHandlerInterface');
-    	}
+		require_once $file;
+		$loghandlerinstance = new $handler();
+		if (!$loghandlerinstance instanceof LogHandlerInterface)
+		{
+			throw new Exception('Log handler does not extend LogHandlerInterface');
+		}
 
 		if (empty($conf->loghandlers[$handler])) $conf->loghandlers[$handler] = $loghandlerinstance;
-    }
+	}
 
-    return 1;
+	return 1;
 }
 
 
@@ -346,70 +346,70 @@ function conf($dolibarr_main_document_root)
  */
 function pHeader($subtitle, $next, $action = 'set', $param = '', $forcejqueryurl = '', $csstable = 'main-inside')
 {
-    global $conf;
-    global $langs;
-    $langs->load("main");
-    $langs->load("admin");
+	global $conf;
+	global $langs;
+	$langs->load("main");
+	$langs->load("admin");
 	$langs->load("install");
 
-    $jquerytheme = 'base';
+	$jquerytheme = 'base';
 
-    if ($forcejqueryurl)
-    {
-        $jQueryCustomPath = $forcejqueryurl;
-        $jQueryUiCustomPath = $forcejqueryurl;
-    } else {
-        $jQueryCustomPath = (defined('JS_JQUERY') && constant('JS_JQUERY')) ? JS_JQUERY : false;
-        $jQueryUiCustomPath = (defined('JS_JQUERY_UI') && constant('JS_JQUERY_UI')) ? JS_JQUERY_UI : false;
-    }
+	if ($forcejqueryurl)
+	{
+		$jQueryCustomPath = $forcejqueryurl;
+		$jQueryUiCustomPath = $forcejqueryurl;
+	} else {
+		$jQueryCustomPath = (defined('JS_JQUERY') && constant('JS_JQUERY')) ? JS_JQUERY : false;
+		$jQueryUiCustomPath = (defined('JS_JQUERY_UI') && constant('JS_JQUERY_UI')) ? JS_JQUERY_UI : false;
+	}
 
-    // We force the content charset
-    header("Content-type: text/html; charset=".$conf->file->character_set_client);
-    header("X-Content-Type-Options: nosniff");
+	// We force the content charset
+	header("Content-type: text/html; charset=".$conf->file->character_set_client);
+	header("X-Content-Type-Options: nosniff");
 
-    print '<!DOCTYPE HTML>'."\n";
-    print '<html>'."\n";
-    print '<head>'."\n";
-    print '<meta charset="'.$conf->file->character_set_client.'">'."\n";
-    print '<meta name="viewport" content="width=device-width, initial-scale=1.0">'."\n";
-    print '<meta name="generator" content="Dolibarr installer">'."\n";
-    print '<link rel="stylesheet" type="text/css" href="default.css">'."\n";
+	print '<!DOCTYPE HTML>'."\n";
+	print '<html>'."\n";
+	print '<head>'."\n";
+	print '<meta charset="'.$conf->file->character_set_client.'">'."\n";
+	print '<meta name="viewport" content="width=device-width, initial-scale=1.0">'."\n";
+	print '<meta name="generator" content="Dolibarr installer">'."\n";
+	print '<link rel="stylesheet" type="text/css" href="default.css">'."\n";
 
-    print '<!-- Includes CSS for JQuery -->'."\n";
-    if ($jQueryUiCustomPath) print '<link rel="stylesheet" type="text/css" href="'.$jQueryUiCustomPath.'css/'.$jquerytheme.'/jquery-ui.min.css" />'."\n"; // JQuery
-    else print '<link rel="stylesheet" type="text/css" href="../includes/jquery/css/'.$jquerytheme.'/jquery-ui.min.css" />'."\n"; // JQuery
+	print '<!-- Includes CSS for JQuery -->'."\n";
+	if ($jQueryUiCustomPath) print '<link rel="stylesheet" type="text/css" href="'.$jQueryUiCustomPath.'css/'.$jquerytheme.'/jquery-ui.min.css" />'."\n"; // JQuery
+	else print '<link rel="stylesheet" type="text/css" href="../includes/jquery/css/'.$jquerytheme.'/jquery-ui.min.css" />'."\n"; // JQuery
 
-    print '<!-- Includes JS for JQuery -->'."\n";
-    if ($jQueryCustomPath) print '<script type="text/javascript" src="'.$jQueryCustomPath.'jquery.min.js"></script>'."\n";
-    else print '<script type="text/javascript" src="../includes/jquery/js/jquery.min.js"></script>'."\n";
-    if ($jQueryUiCustomPath) print '<script type="text/javascript" src="'.$jQueryUiCustomPath.'jquery-ui.min.js"></script>'."\n";
-    else print '<script type="text/javascript" src="../includes/jquery/js/jquery-ui.min.js"></script>'."\n";
+	print '<!-- Includes JS for JQuery -->'."\n";
+	if ($jQueryCustomPath) print '<script type="text/javascript" src="'.$jQueryCustomPath.'jquery.min.js"></script>'."\n";
+	else print '<script type="text/javascript" src="../includes/jquery/js/jquery.min.js"></script>'."\n";
+	if ($jQueryUiCustomPath) print '<script type="text/javascript" src="'.$jQueryUiCustomPath.'jquery-ui.min.js"></script>'."\n";
+	else print '<script type="text/javascript" src="../includes/jquery/js/jquery-ui.min.js"></script>'."\n";
 
-    print '<title>'.$langs->trans("DolibarrSetup").'</title>'."\n";
-    print '</head>'."\n";
+	print '<title>'.$langs->trans("DolibarrSetup").'</title>'."\n";
+	print '</head>'."\n";
 
-    print '<body>'."\n";
+	print '<body>'."\n";
 
-    print '<div class="divlogoinstall" style="text-align:center">';
-    print '<img class="imglogoinstall" src="../theme/dolibarr_logo.svg" alt="Dolibarr logo" width="300px"><br>';
-    print DOL_VERSION;
-    print '</div><br>';
+	print '<div class="divlogoinstall" style="text-align:center">';
+	print '<img class="imglogoinstall" src="../theme/dolibarr_logo.svg" alt="Dolibarr logo" width="300px"><br>';
+	print DOL_VERSION;
+	print '</div><br>';
 
-    print '<span class="titre">'.$langs->trans("DolibarrSetup");
-    if ($subtitle) {
-        print ' - '.$subtitle;
-    }
-    print '</span>'."\n";
+	print '<span class="titre">'.$langs->trans("DolibarrSetup");
+	if ($subtitle) {
+		print ' - '.$subtitle;
+	}
+	print '</span>'."\n";
 
-    print '<form name="forminstall" style="width: 100%" action="'.$next.'.php'.($param ? '?'.$param : '').'" method="POST"';
-    if ($next == 'step5') print ' autocomplete="off"';
-    print '>'."\n";
-    print '<input type="hidden" name="testpost" value="ok">'."\n";
-    print '<input type="hidden" name="action" value="'.$action.'">'."\n";
+	print '<form name="forminstall" style="width: 100%" action="'.$next.'.php'.($param ? '?'.$param : '').'" method="POST"';
+	if ($next == 'step5') print ' autocomplete="off"';
+	print '>'."\n";
+	print '<input type="hidden" name="testpost" value="ok">'."\n";
+	print '<input type="hidden" name="action" value="'.$action.'">'."\n";
 
-    print '<table class="main" width="100%"><tr><td>'."\n";
+	print '<table class="main" width="100%"><tr><td>'."\n";
 
-    print '<table class="'.$csstable.'" width="100%"><tr><td>'."\n";
+	print '<table class="'.$csstable.'" width="100%"><tr><td>'."\n";
 }
 
 /**
@@ -423,52 +423,52 @@ function pHeader($subtitle, $next, $action = 'set', $param = '', $forcejqueryurl
  */
 function pFooter($nonext = 0, $setuplang = '', $jscheckfunction = '', $withpleasewait = 0)
 {
-    global $conf, $langs;
+	global $conf, $langs;
 
-    $langs->load("main");
-    $langs->load("other");
-    $langs->load("admin");
+	$langs->load("main");
+	$langs->load("other");
+	$langs->load("admin");
 
-    print '</td></tr></table>'."\n";
-    print '</td></tr></table>'."\n";
+	print '</td></tr></table>'."\n";
+	print '</td></tr></table>'."\n";
 
-    if (!$nonext || ($nonext == '2'))
-    {
-        print '<div class="nextbutton" id="nextbutton">';
-        if ($nonext == '2')
+	if (!$nonext || ($nonext == '2'))
+	{
+		print '<div class="nextbutton" id="nextbutton">';
+		if ($nonext == '2')
 		{
 			print $langs->trans("ErrorFoundDuringMigration", isset($_SERVER["REQUEST_URI"]) ? $_SERVER["REQUEST_URI"].'&ignoreerrors=1' : '').'<br><br>';
 		}
 
-        print '<input type="submit" '.($nonext == '2' ? 'disabled="disabled" ' : '').'value="'.$langs->trans("NextStep").' ->"';
-        if ($jscheckfunction) print ' onClick="return '.$jscheckfunction.'();"';
-        print '></div>';
-        if ($withpleasewait) print '<div style="visibility: hidden;" class="pleasewait" id="pleasewait"><br>'.$langs->trans("NextStepMightLastALongTime").'<br><br><div class="blinkwait">'.$langs->trans("PleaseBePatient").'</div></div>';
-    }
-    if ($setuplang)
-    {
-        print '<input type="hidden" name="selectlang" value="'.$setuplang.'">';
-    }
+		print '<input type="submit" '.($nonext == '2' ? 'disabled="disabled" ' : '').'value="'.$langs->trans("NextStep").' ->"';
+		if ($jscheckfunction) print ' onClick="return '.$jscheckfunction.'();"';
+		print '></div>';
+		if ($withpleasewait) print '<div style="visibility: hidden;" class="pleasewait" id="pleasewait"><br>'.$langs->trans("NextStepMightLastALongTime").'<br><br><div class="blinkwait">'.$langs->trans("PleaseBePatient").'</div></div>';
+	}
+	if ($setuplang)
+	{
+		print '<input type="hidden" name="selectlang" value="'.$setuplang.'">';
+	}
 
-    print '</form>'."\n";
+	print '</form>'."\n";
 
-    // If there is some logs in buffer to show
-    if (isset($conf->logbuffer) && count($conf->logbuffer))
-    {
-        print "\n";
-        print "<!-- Start of log output\n";
-        //print '<div class="hidden">'."\n";
-        foreach ($conf->logbuffer as $logline)
-        {
-            print $logline."<br>\n";
-        }
-        //print '</div>'."\n";
-        print "End of log output -->\n";
-        print "\n";
-    }
+	// If there is some logs in buffer to show
+	if (isset($conf->logbuffer) && count($conf->logbuffer))
+	{
+		print "\n";
+		print "<!-- Start of log output\n";
+		//print '<div class="hidden">'."\n";
+		foreach ($conf->logbuffer as $logline)
+		{
+			print $logline."<br>\n";
+		}
+		//print '</div>'."\n";
+		print "End of log output -->\n";
+		print "\n";
+	}
 
-    print '</body>'."\n";
-    print '</html>'."\n";
+	print '</body>'."\n";
+	print '</html>'."\n";
 }
 
 /**
@@ -480,8 +480,8 @@ function pFooter($nonext = 0, $setuplang = '', $jscheckfunction = '', $withpleas
  */
 function dolibarr_install_syslog($message, $level = LOG_DEBUG)
 {
-    if (!defined('LOG_DEBUG')) define('LOG_DEBUG', 6);
-    dol_syslog($message, $level);
+	if (!defined('LOG_DEBUG')) define('LOG_DEBUG', 6);
+	dol_syslog($message, $level);
 }
 
 /**
diff --git a/htdocs/install/mysql/data/llx_c_type_contact.sql b/htdocs/install/mysql/data/llx_c_type_contact.sql
index d7ec13f5833..f16cf5ca5df 100644
--- a/htdocs/install/mysql/data/llx_c_type_contact.sql
+++ b/htdocs/install/mysql/data/llx_c_type_contact.sql
@@ -74,13 +74,13 @@ insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) v
 insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (150, 'dolresource','internal', 'USERINCHARGE',     'In charge of resource', 1);
 insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (151, 'dolresource','external', 'THIRDINCHARGE',    'In charge of resource', 1);
 
--- All project code must start with 'PROJECT'
+-- All project code can start with 'PROJECT'
 insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (160, 'project',  'internal', 'PROJECTLEADER', 'Chef de Projet', 1);
 insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (161, 'project',  'internal', 'PROJECTCONTRIBUTOR', 'Intervenant', 1);
 insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (170, 'project',  'external', 'PROJECTLEADER', 'Chef de Projet', 1);
 insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (171, 'project',  'external', 'PROJECTCONTRIBUTOR', 'Intervenant', 1);
 
--- All task code must start with 'TASK'
+-- All task code can start with 'TASK'
 insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (180, 'project_task',  'internal', 'TASKEXECUTIVE', 'Responsable', 1);
 insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (181, 'project_task',  'internal', 'TASKCONTRIBUTOR', 'Intervenant', 1);
 insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (190, 'project_task',  'external', 'TASKEXECUTIVE', 'Responsable', 1);
diff --git a/htdocs/install/mysql/tables/llx_facturedet.sql b/htdocs/install/mysql/tables/llx_facturedet.sql
index 73e64fa1c6a..3b1ea86cc0e 100644
--- a/htdocs/install/mysql/tables/llx_facturedet.sql
+++ b/htdocs/install/mysql/tables/llx_facturedet.sql
@@ -36,7 +36,7 @@ create table llx_facturedet
   localtax1_type			 	varchar(10)	 NULL, 				 	-- localtax1 type
   localtax2_tx               	double(6,3)  DEFAULT 0,    		 	-- localtax2 rate
   localtax2_type			 	varchar(10)	 NULL, 				 	-- localtax2 type
-  qty							real,								-- Quantity (exemple 2)
+  qty							real,								-- Quantity (exemple 2). Note: for credit note, the price is negative, not the quantity. Like for discount, price is negative, not quantity.
   remise_percent				real       DEFAULT 0,				-- % de la remise ligne (exemple 20%)
   remise						real       DEFAULT 0,				-- Montant calcule de la remise % sur PU HT (exemple 20)
   fk_remise_except				integer    NULL,					-- Lien vers table des remises fixes
diff --git a/htdocs/install/step1.php b/htdocs/install/step1.php
index 9d0d0a99038..fb8e0b9c615 100644
--- a/htdocs/install/step1.php
+++ b/htdocs/install/step1.php
@@ -64,6 +64,8 @@ $main_use_alt_dir = ((GETPOST("main_use_alt_dir", 'alpha') == '' || (GETPOST("ma
 // Alternative root directory name
 $main_alt_dir_name = ((GETPOST("main_alt_dir_name", 'alpha') && GETPOST("main_alt_dir_name", 'alpha') != '') ? GETPOST("main_alt_dir_name", 'alpha') : 'custom');
 
+$dolibarr_main_distrib = 'standard';
+
 session_start(); // To be able to keep info into session (used for not losing password during navigation. The password must not transit through parameters)
 
 // Save a flag to tell to restore input value if we go back
@@ -127,6 +129,10 @@ if (@file_exists($forcedfile)) {
 			$main_force_https = $force_install_mainforcehttps;
 		}
 	}
+
+	if (!empty($force_install_distrib)) {
+		$dolibarr_main_distrib = $force_install_distrib;
+	}
 }
 
 
@@ -144,9 +150,9 @@ pHeader($langs->trans("ConfigurationFile"), "step2");
 // Test if we can run a first install process
 if (!is_writable($conffile))
 {
-    print $langs->trans("ConfFileIsNotWritable", $conffiletoshow);
-    pFooter(1, $setuplang, 'jscheckparam');
-    exit;
+	print $langs->trans("ConfFileIsNotWritable", $conffiletoshow);
+	pFooter(1, $setuplang, 'jscheckparam');
+	exit;
 }
 
 
@@ -154,30 +160,30 @@ if (!is_writable($conffile))
 $is_sqlite = false;
 if (empty($db_type))
 {
-    print '<div class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentities("DatabaseType")).'</div>';
-    $error++;
+	print '<div class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentities("DatabaseType")).'</div>';
+	$error++;
 } else {
 	$is_sqlite = ($db_type === 'sqlite' || $db_type === 'sqlite3');
 }
 if (empty($db_host) && !$is_sqlite)
 {
-    print '<div class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentities("Server")).'</div>';
-    $error++;
+	print '<div class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentities("Server")).'</div>';
+	$error++;
 }
 if (empty($db_name))
 {
-    print '<div class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentities("DatabaseName")).'</div>';
-    $error++;
+	print '<div class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentities("DatabaseName")).'</div>';
+	$error++;
 }
 if (empty($db_user) && !$is_sqlite)
 {
-    print '<div class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentities("Login")).'</div>';
-    $error++;
+	print '<div class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentities("Login")).'</div>';
+	$error++;
 }
 if (!empty($db_port) && !is_numeric($db_port))
 {
-    print '<div class="error">'.$langs->trans("ErrorBadValueForParameter", $db_port, $langs->transnoentities("Port")).'</div>';
-    $error++;
+	print '<div class="error">'.$langs->trans("ErrorBadValueForParameter", $db_port, $langs->transnoentities("Port")).'</div>';
+	$error++;
 }
 if (!empty($db_prefix) && !preg_match('/^[a-z0-9]+_$/i', $db_prefix))
 {
@@ -189,563 +195,563 @@ if (!empty($db_prefix) && !preg_match('/^[a-z0-9]+_$/i', $db_prefix))
 // Remove last / into dans main_dir
 if (substr($main_dir, dol_strlen($main_dir) - 1) == "/")
 {
-    $main_dir = substr($main_dir, 0, dol_strlen($main_dir) - 1);
+	$main_dir = substr($main_dir, 0, dol_strlen($main_dir) - 1);
 }
 
 // Remove last / into dans main_url
 if (!empty($main_url) && substr($main_url, dol_strlen($main_url) - 1) == "/")
 {
-    $main_url = substr($main_url, 0, dol_strlen($main_url) - 1);
+	$main_url = substr($main_url, 0, dol_strlen($main_url) - 1);
 }
 
 // Test database connection
 if (!$error) {
-    $result = @include_once $main_dir."/core/db/".$db_type.'.class.php';
-    if ($result)
-    {
-        // If we require database or user creation we need to connect as root, so we need root login credentials
-        if (!empty($db_create_database) && !$userroot) {
-            print '<div class="error">'.$langs->trans("YouAskDatabaseCreationSoDolibarrNeedToConnect", $db_name).'</div>';
-            print '<br>';
-            print $langs->trans("BecauseConnectionFailedParametersMayBeWrong").'<br><br>';
-            print $langs->trans("ErrorGoBackAndCorrectParameters");
-            $error++;
-        }
-        if (!empty($db_create_user) && !$userroot) {
-            print '<div class="error">'.$langs->trans("YouAskLoginCreationSoDolibarrNeedToConnect", $db_user).'</div>';
-            print '<br>';
-            print $langs->trans("BecauseConnectionFailedParametersMayBeWrong").'<br><br>';
-            print $langs->trans("ErrorGoBackAndCorrectParameters");
-            $error++;
-        }
+	$result = @include_once $main_dir."/core/db/".$db_type.'.class.php';
+	if ($result)
+	{
+		// If we require database or user creation we need to connect as root, so we need root login credentials
+		if (!empty($db_create_database) && !$userroot) {
+			print '<div class="error">'.$langs->trans("YouAskDatabaseCreationSoDolibarrNeedToConnect", $db_name).'</div>';
+			print '<br>';
+			print $langs->trans("BecauseConnectionFailedParametersMayBeWrong").'<br><br>';
+			print $langs->trans("ErrorGoBackAndCorrectParameters");
+			$error++;
+		}
+		if (!empty($db_create_user) && !$userroot) {
+			print '<div class="error">'.$langs->trans("YouAskLoginCreationSoDolibarrNeedToConnect", $db_user).'</div>';
+			print '<br>';
+			print $langs->trans("BecauseConnectionFailedParametersMayBeWrong").'<br><br>';
+			print $langs->trans("ErrorGoBackAndCorrectParameters");
+			$error++;
+		}
 
-        // If we need root access
-        if (!$error && (!empty($db_create_database) || !empty($db_create_user))) {
-            $databasefortest = $db_name;
-            if (!empty($db_create_database)) {
-                if ($db_type == 'mysql' || $db_type == 'mysqli')
-                {
-                    $databasefortest = 'mysql';
-                } elseif ($db_type == 'pgsql')
-                {
-                    $databasefortest = 'postgres';
-                } else {
-                    $databasefortest = 'master';
-                }
-            }
-            //print $_POST["db_type"].",".$_POST["db_host"].",$userroot,$passroot,$databasefortest,".$_POST["db_port"];
+		// If we need root access
+		if (!$error && (!empty($db_create_database) || !empty($db_create_user))) {
+			$databasefortest = $db_name;
+			if (!empty($db_create_database)) {
+				if ($db_type == 'mysql' || $db_type == 'mysqli')
+				{
+					$databasefortest = 'mysql';
+				} elseif ($db_type == 'pgsql')
+				{
+					$databasefortest = 'postgres';
+				} else {
+					$databasefortest = 'master';
+				}
+			}
+			//print $_POST["db_type"].",".$_POST["db_host"].",$userroot,$passroot,$databasefortest,".$_POST["db_port"];
 
-            $db = getDoliDBInstance($db_type, $db_host, $userroot, $passroot, $databasefortest, $db_port);
+			$db = getDoliDBInstance($db_type, $db_host, $userroot, $passroot, $databasefortest, $db_port);
 
-            dol_syslog("databasefortest=".$databasefortest." connected=".$db->connected." database_selected=".$db->database_selected, LOG_DEBUG);
-            //print "databasefortest=".$databasefortest." connected=".$db->connected." database_selected=".$db->database_selected;
+			dol_syslog("databasefortest=".$databasefortest." connected=".$db->connected." database_selected=".$db->database_selected, LOG_DEBUG);
+			//print "databasefortest=".$databasefortest." connected=".$db->connected." database_selected=".$db->database_selected;
 
 			if (empty($db_create_database) && $db->connected && !$db->database_selected) {
-                print '<div class="error">'.$langs->trans("ErrorConnectedButDatabaseNotFound", $db_name).'</div>';
-                print '<br>';
-                if (!$db->connected) print $langs->trans("IfDatabaseNotExistsGoBackAndUncheckCreate").'<br><br>';
-                print $langs->trans("ErrorGoBackAndCorrectParameters");
-                $error++;
-            } elseif ($db->error && !(!empty($db_create_database) && $db->connected)) {
-            	// Note: you may experience error here with message "No such file or directory" when mysql was installed for the first time but not yet launched.
-                if ($db->error == "No such file or directory") print '<div class="error">'.$langs->trans("ErrorToConnectToMysqlCheckInstance").'</div>';
-                else print '<div class="error">'.$db->error.'</div>';
-                if (!$db->connected) print $langs->trans("BecauseConnectionFailedParametersMayBeWrong").'<br><br>';
-                //print '<a href="#" onClick="javascript: history.back();">';
-                print $langs->trans("ErrorGoBackAndCorrectParameters");
-                //print '</a>';
-                $error++;
-            }
-        }
-        // If we need simple access
-        if (!$error && (empty($db_create_database) && empty($db_create_user))) {
-            $db = getDoliDBInstance($db_type, $db_host, $db_user, $db_pass, $db_name, $db_port);
+				print '<div class="error">'.$langs->trans("ErrorConnectedButDatabaseNotFound", $db_name).'</div>';
+				print '<br>';
+				if (!$db->connected) print $langs->trans("IfDatabaseNotExistsGoBackAndUncheckCreate").'<br><br>';
+				print $langs->trans("ErrorGoBackAndCorrectParameters");
+				$error++;
+			} elseif ($db->error && !(!empty($db_create_database) && $db->connected)) {
+				// Note: you may experience error here with message "No such file or directory" when mysql was installed for the first time but not yet launched.
+				if ($db->error == "No such file or directory") print '<div class="error">'.$langs->trans("ErrorToConnectToMysqlCheckInstance").'</div>';
+				else print '<div class="error">'.$db->error.'</div>';
+				if (!$db->connected) print $langs->trans("BecauseConnectionFailedParametersMayBeWrong").'<br><br>';
+				//print '<a href="#" onClick="javascript: history.back();">';
+				print $langs->trans("ErrorGoBackAndCorrectParameters");
+				//print '</a>';
+				$error++;
+			}
+		}
+		// If we need simple access
+		if (!$error && (empty($db_create_database) && empty($db_create_user))) {
+			$db = getDoliDBInstance($db_type, $db_host, $db_user, $db_pass, $db_name, $db_port);
 
-            if ($db->error)
-            {
-                print '<div class="error">'.$db->error.'</div>';
-                if (!$db->connected) print $langs->trans("BecauseConnectionFailedParametersMayBeWrong").'<br><br>';
-                //print '<a href="#" onClick="javascript: history.back();">';
-                print $langs->trans("ErrorGoBackAndCorrectParameters");
-                //print '</a>';
-                $error++;
-            }
-        }
-    } else {
-        print "<br>\nFailed to include_once(\"".$main_dir."/core/db/".$db_type.".class.php\")<br>\n";
-        print '<div class="error">'.$langs->trans("ErrorWrongValueForParameter", $langs->transnoentities("WebPagesDirectory")).'</div>';
-        //print '<a href="#" onClick="javascript: history.back();">';
-        print $langs->trans("ErrorGoBackAndCorrectParameters");
-        //print '</a>';
-        $error++;
-    }
+			if ($db->error)
+			{
+				print '<div class="error">'.$db->error.'</div>';
+				if (!$db->connected) print $langs->trans("BecauseConnectionFailedParametersMayBeWrong").'<br><br>';
+				//print '<a href="#" onClick="javascript: history.back();">';
+				print $langs->trans("ErrorGoBackAndCorrectParameters");
+				//print '</a>';
+				$error++;
+			}
+		}
+	} else {
+		print "<br>\nFailed to include_once(\"".$main_dir."/core/db/".$db_type.".class.php\")<br>\n";
+		print '<div class="error">'.$langs->trans("ErrorWrongValueForParameter", $langs->transnoentities("WebPagesDirectory")).'</div>';
+		//print '<a href="#" onClick="javascript: history.back();">';
+		print $langs->trans("ErrorGoBackAndCorrectParameters");
+		//print '</a>';
+		$error++;
+	}
 } else {
-    if (isset($db)) print $db->lasterror();
-    if (isset($db) && !$db->connected) print '<br>'.$langs->trans("BecauseConnectionFailedParametersMayBeWrong").'<br><br>';
-    print $langs->trans("ErrorGoBackAndCorrectParameters");
-    $error++;
+	if (isset($db)) print $db->lasterror();
+	if (isset($db) && !$db->connected) print '<br>'.$langs->trans("BecauseConnectionFailedParametersMayBeWrong").'<br><br>';
+	print $langs->trans("ErrorGoBackAndCorrectParameters");
+	$error++;
 }
 
 if (!$error && $db->connected)
 {
-    if (!empty($db_create_database)) {
-        $result = $db->select_db($db_name);
-        if ($result)
-        {
-            print '<div class="error">'.$langs->trans("ErrorDatabaseAlreadyExists", $db_name).'</div>';
-            print $langs->trans("IfDatabaseExistsGoBackAndCheckCreate").'<br><br>';
-            print $langs->trans("ErrorGoBackAndCorrectParameters");
-            $error++;
-        }
-    }
+	if (!empty($db_create_database)) {
+		$result = $db->select_db($db_name);
+		if ($result)
+		{
+			print '<div class="error">'.$langs->trans("ErrorDatabaseAlreadyExists", $db_name).'</div>';
+			print $langs->trans("IfDatabaseExistsGoBackAndCheckCreate").'<br><br>';
+			print $langs->trans("ErrorGoBackAndCorrectParameters");
+			$error++;
+		}
+	}
 }
 
 // Define $defaultCharacterSet and $defaultDBSortingCollation
 if (!$error && $db->connected)
 {
-    if (!empty($db_create_database))    // If we create database, we force default value
-    {
-        // Default values come from the database handler
+	if (!empty($db_create_database))    // If we create database, we force default value
+	{
+		// Default values come from the database handler
 
-        $defaultCharacterSet = $db->forcecharset;
-    	$defaultDBSortingCollation = $db->forcecollate;
-    } else // If already created, we take current value
-    {
-        $defaultCharacterSet = $db->getDefaultCharacterSetDatabase();
-        $defaultDBSortingCollation = $db->getDefaultCollationDatabase();
-    }
+		$defaultCharacterSet = $db->forcecharset;
+		$defaultDBSortingCollation = $db->forcecollate;
+	} else // If already created, we take current value
+	{
+		$defaultCharacterSet = $db->getDefaultCharacterSetDatabase();
+		$defaultDBSortingCollation = $db->getDefaultCollationDatabase();
+	}
 
-    // Force to avoid utf8mb4 because index on field char 255 reach limit of 767 char for indexes (example with mysql 5.6.34 = mariadb 10.0.29)
-    // TODO Remove this when utf8mb4 is supported
-    if ($defaultCharacterSet == 'utf8mb4' || $defaultDBSortingCollation == 'utf8mb4_unicode_ci')
-    {
-        $defaultCharacterSet = 'utf8';
-        $defaultDBSortingCollation = 'utf8_unicode_ci';
-    }
+	// Force to avoid utf8mb4 because index on field char 255 reach limit of 767 char for indexes (example with mysql 5.6.34 = mariadb 10.0.29)
+	// TODO Remove this when utf8mb4 is supported
+	if ($defaultCharacterSet == 'utf8mb4' || $defaultDBSortingCollation == 'utf8mb4_unicode_ci')
+	{
+		$defaultCharacterSet = 'utf8';
+		$defaultDBSortingCollation = 'utf8_unicode_ci';
+	}
 
-    print '<input type="hidden" name="dolibarr_main_db_character_set" value="'.$defaultCharacterSet.'">';
-    print '<input type="hidden" name="dolibarr_main_db_collation" value="'.$defaultDBSortingCollation.'">';
-    $db_character_set = $defaultCharacterSet;
-    $db_collation = $defaultDBSortingCollation;
-    dolibarr_install_syslog("step1: db_character_set=".$db_character_set." db_collation=".$db_collation);
+	print '<input type="hidden" name="dolibarr_main_db_character_set" value="'.$defaultCharacterSet.'">';
+	print '<input type="hidden" name="dolibarr_main_db_collation" value="'.$defaultDBSortingCollation.'">';
+	$db_character_set = $defaultCharacterSet;
+	$db_collation = $defaultDBSortingCollation;
+	dolibarr_install_syslog("step1: db_character_set=".$db_character_set." db_collation=".$db_collation);
 }
 
 
 // Create config file
 if (!$error && $db->connected && $action == "set")
 {
-    umask(0);
-    if (is_array($_POST))
-    {
-        foreach ($_POST as $key => $value)
-        {
-            if (!preg_match('/^db_pass/i', $key)) {
-    			dolibarr_install_syslog("step1: choice for ".$key." = ".$value);
-    		}
-        }
-    }
+	umask(0);
+	if (is_array($_POST))
+	{
+		foreach ($_POST as $key => $value)
+		{
+			if (!preg_match('/^db_pass/i', $key)) {
+				dolibarr_install_syslog("step1: choice for ".$key." = ".$value);
+			}
+		}
+	}
 
-    // Show title of step
-    print '<h3><img class="valigntextbottom" src="../theme/common/octicons/build/svg/gear.svg" width="20" alt="Configuration"> '.$langs->trans("ConfigurationFile").'</h3>';
-    print '<table cellspacing="0" width="100%" cellpadding="1" border="0">';
+	// Show title of step
+	print '<h3><img class="valigntextbottom" src="../theme/common/octicons/build/svg/gear.svg" width="20" alt="Configuration"> '.$langs->trans("ConfigurationFile").'</h3>';
+	print '<table cellspacing="0" width="100%" cellpadding="1" border="0">';
 
-    // Check parameter main_dir
-    if (!$error)
-    {
-        if (!is_dir($main_dir))
-        {
-            dolibarr_install_syslog("step1: directory '".$main_dir."' is unavailable or can't be accessed");
+	// Check parameter main_dir
+	if (!$error)
+	{
+		if (!is_dir($main_dir))
+		{
+			dolibarr_install_syslog("step1: directory '".$main_dir."' is unavailable or can't be accessed");
 
-            print "<tr><td>";
-            print $langs->trans("ErrorDirDoesNotExists", $main_dir).'<br>';
-            print $langs->trans("ErrorWrongValueForParameter", $langs->transnoentitiesnoconv("WebPagesDirectory")).'<br>';
-            print $langs->trans("ErrorGoBackAndCorrectParameters").'<br><br>';
-            print '</td><td>';
-            print $langs->trans("Error");
-            print "</td></tr>";
-            $error++;
-        }
-    }
+			print "<tr><td>";
+			print $langs->trans("ErrorDirDoesNotExists", $main_dir).'<br>';
+			print $langs->trans("ErrorWrongValueForParameter", $langs->transnoentitiesnoconv("WebPagesDirectory")).'<br>';
+			print $langs->trans("ErrorGoBackAndCorrectParameters").'<br><br>';
+			print '</td><td>';
+			print $langs->trans("Error");
+			print "</td></tr>";
+			$error++;
+		}
+	}
 
-    if (!$error)
-    {
-        dolibarr_install_syslog("step1: directory '".$main_dir."' exists");
-    }
+	if (!$error)
+	{
+		dolibarr_install_syslog("step1: directory '".$main_dir."' exists");
+	}
 
 
-    // Create subdirectory main_data_dir
-    if (!$error)
-    {
-        // Create directory for documents
-        if (!is_dir($main_data_dir))
-        {
-            dol_mkdir($main_data_dir);
-        }
+	// Create subdirectory main_data_dir
+	if (!$error)
+	{
+		// Create directory for documents
+		if (!is_dir($main_data_dir))
+		{
+			dol_mkdir($main_data_dir);
+		}
 
-        if (!is_dir($main_data_dir))
-        {
-            print "<tr><td>".$langs->trans("ErrorDirDoesNotExists", $main_data_dir);
-            print ' '.$langs->trans("YouMustCreateItAndAllowServerToWrite");
-            print '</td><td>';
-            print '<span class="error">'.$langs->trans("Error").'</span>';
-            print "</td></tr>";
-            print '<tr><td colspan="2"><br>'.$langs->trans("CorrectProblemAndReloadPage", $_SERVER['PHP_SELF'].'?testget=ok').'</td></tr>';
-            $error++;
-        } else {
-            // Create .htaccess file in document directory
-            $pathhtaccess = $main_data_dir.'/.htaccess';
-            if (!file_exists($pathhtaccess))
-            {
-                dolibarr_install_syslog("step1: .htaccess file did not exist, we created it in '".$main_data_dir."'");
-                $handlehtaccess = @fopen($pathhtaccess, 'w');
-                if ($handlehtaccess)
-                {
-                    fwrite($handlehtaccess, 'Order allow,deny'."\n");
-                    fwrite($handlehtaccess, 'Deny from all'."\n");
+		if (!is_dir($main_data_dir))
+		{
+			print "<tr><td>".$langs->trans("ErrorDirDoesNotExists", $main_data_dir);
+			print ' '.$langs->trans("YouMustCreateItAndAllowServerToWrite");
+			print '</td><td>';
+			print '<span class="error">'.$langs->trans("Error").'</span>';
+			print "</td></tr>";
+			print '<tr><td colspan="2"><br>'.$langs->trans("CorrectProblemAndReloadPage", $_SERVER['PHP_SELF'].'?testget=ok').'</td></tr>';
+			$error++;
+		} else {
+			// Create .htaccess file in document directory
+			$pathhtaccess = $main_data_dir.'/.htaccess';
+			if (!file_exists($pathhtaccess))
+			{
+				dolibarr_install_syslog("step1: .htaccess file did not exist, we created it in '".$main_data_dir."'");
+				$handlehtaccess = @fopen($pathhtaccess, 'w');
+				if ($handlehtaccess)
+				{
+					fwrite($handlehtaccess, 'Order allow,deny'."\n");
+					fwrite($handlehtaccess, 'Deny from all'."\n");
 
-                    fclose($handlehtaccess);
-                    dolibarr_install_syslog("step1: .htaccess file created");
-                }
-            }
+					fclose($handlehtaccess);
+					dolibarr_install_syslog("step1: .htaccess file created");
+				}
+			}
 
-            // Documents are stored above the web pages root to prevent being downloaded without authentification
-            $dir = array();
-            $dir[] = $main_data_dir."/mycompany";
-            $dir[] = $main_data_dir."/medias";
-            $dir[] = $main_data_dir."/users";
-            $dir[] = $main_data_dir."/facture";
-            $dir[] = $main_data_dir."/propale";
-            $dir[] = $main_data_dir."/ficheinter";
-            $dir[] = $main_data_dir."/produit";
-            $dir[] = $main_data_dir."/doctemplates";
+			// Documents are stored above the web pages root to prevent being downloaded without authentification
+			$dir = array();
+			$dir[] = $main_data_dir."/mycompany";
+			$dir[] = $main_data_dir."/medias";
+			$dir[] = $main_data_dir."/users";
+			$dir[] = $main_data_dir."/facture";
+			$dir[] = $main_data_dir."/propale";
+			$dir[] = $main_data_dir."/ficheinter";
+			$dir[] = $main_data_dir."/produit";
+			$dir[] = $main_data_dir."/doctemplates";
 
-            // Loop on each directory of dir [] to create them if they do not exist
-            $num = count($dir);
-            for ($i = 0; $i < $num; $i++)
-            {
-                if (is_dir($dir[$i]))
-                {
-                    dolibarr_install_syslog("step1: directory '".$dir[$i]."' exists");
-                } else {
-                    if (dol_mkdir($dir[$i]) < 0)
-                    {
-                        print "<tr><td>";
-                        print "Failed to create directory: ".$dir[$i];
-                        print '</td><td>';
-                        print $langs->trans("Error");
-                        print "</td></tr>";
-                        $error++;
-                    } else {
-                        dolibarr_install_syslog("step1: directory '".$dir[$i]."' created");
-                    }
-                }
-            }
+			// Loop on each directory of dir [] to create them if they do not exist
+			$num = count($dir);
+			for ($i = 0; $i < $num; $i++)
+			{
+				if (is_dir($dir[$i]))
+				{
+					dolibarr_install_syslog("step1: directory '".$dir[$i]."' exists");
+				} else {
+					if (dol_mkdir($dir[$i]) < 0)
+					{
+						print "<tr><td>";
+						print "Failed to create directory: ".$dir[$i];
+						print '</td><td>';
+						print $langs->trans("Error");
+						print "</td></tr>";
+						$error++;
+					} else {
+						dolibarr_install_syslog("step1: directory '".$dir[$i]."' created");
+					}
+				}
+			}
 
-            require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+			require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-            // Copy directory medias
-            $srcroot = $main_dir.'/install/medias';
-            $destroot = $main_data_dir.'/medias';
-            dolCopyDir($srcroot, $destroot, 0, 0);
+			// Copy directory medias
+			$srcroot = $main_dir.'/install/medias';
+			$destroot = $main_data_dir.'/medias';
+			dolCopyDir($srcroot, $destroot, 0, 0);
 
-            if ($error)
-            {
-                print "<tr><td>".$langs->trans("ErrorDirDoesNotExists", $main_data_dir);
-                print ' '.$langs->trans("YouMustCreateItAndAllowServerToWrite");
-                print '</td><td>';
-                print '<span class="error">'.$langs->trans("Error").'</span>';
-                print "</td></tr>";
-                print '<tr><td colspan="2"><br>'.$langs->trans("CorrectProblemAndReloadPage", $_SERVER['PHP_SELF'].'?testget=ok').'</td></tr>';
-            } else {
-            	//ODT templates
-            	$srcroot = $main_dir.'/install/doctemplates';
-            	$destroot = $main_data_dir.'/doctemplates';
-            	$docs = array(
-            		'contracts' => 'contract',
-            		'invoices' => 'invoice',
-            		'orders' => 'order',
-            		'products' => 'product',
-            		'projects' => 'project',
-            		'proposals' => 'proposal',
-            		'shipments' => 'shipment',
-            		'supplier_proposals' => 'supplier_proposal',
-            		'tasks' => 'task_summary',
-            		'thirdparties' => 'thirdparty',
-            		'usergroups' => 'usergroups',
-            		'users' => 'user',
-            	);
-            	foreach ($docs as $cursordir => $cursorfile)
-            	{
-            		$src = $srcroot.'/'.$cursordir.'/template_'.$cursorfile.'.odt';
-            		$dirodt = $destroot.'/'.$cursordir;
-            		$dest = $dirodt.'/template_'.$cursorfile.'.odt';
+			if ($error)
+			{
+				print "<tr><td>".$langs->trans("ErrorDirDoesNotExists", $main_data_dir);
+				print ' '.$langs->trans("YouMustCreateItAndAllowServerToWrite");
+				print '</td><td>';
+				print '<span class="error">'.$langs->trans("Error").'</span>';
+				print "</td></tr>";
+				print '<tr><td colspan="2"><br>'.$langs->trans("CorrectProblemAndReloadPage", $_SERVER['PHP_SELF'].'?testget=ok').'</td></tr>';
+			} else {
+				//ODT templates
+				$srcroot = $main_dir.'/install/doctemplates';
+				$destroot = $main_data_dir.'/doctemplates';
+				$docs = array(
+					'contracts' => 'contract',
+					'invoices' => 'invoice',
+					'orders' => 'order',
+					'products' => 'product',
+					'projects' => 'project',
+					'proposals' => 'proposal',
+					'shipments' => 'shipment',
+					'supplier_proposals' => 'supplier_proposal',
+					'tasks' => 'task_summary',
+					'thirdparties' => 'thirdparty',
+					'usergroups' => 'usergroups',
+					'users' => 'user',
+				);
+				foreach ($docs as $cursordir => $cursorfile)
+				{
+					$src = $srcroot.'/'.$cursordir.'/template_'.$cursorfile.'.odt';
+					$dirodt = $destroot.'/'.$cursordir;
+					$dest = $dirodt.'/template_'.$cursorfile.'.odt';
 
-            		dol_mkdir($dirodt);
-            		$result = dol_copy($src, $dest, 0, 0);
-            		if ($result < 0)
-            		{
-            			print '<tr><td colspan="2"><br>'.$langs->trans('ErrorFailToCopyFile', $src, $dest).'</td></tr>';
-            		}
-            	}
-            }
-        }
-    }
+					dol_mkdir($dirodt);
+					$result = dol_copy($src, $dest, 0, 0);
+					if ($result < 0)
+					{
+						print '<tr><td colspan="2"><br>'.$langs->trans('ErrorFailToCopyFile', $src, $dest).'</td></tr>';
+					}
+				}
+			}
+		}
+	}
 
-    // Table prefix
-    $main_db_prefix = (!empty($db_prefix) ? $db_prefix : 'llx_');
+	// Table prefix
+	$main_db_prefix = (!empty($db_prefix) ? $db_prefix : 'llx_');
 
-    // Write conf file on disk
-    if (!$error)
-    {
-        // Save old conf file on disk
-        if (file_exists("$conffile"))
-        {
-            // We must ignore errors as an existing old file may already exist and not be replaceable or
-            // the installer (like for ubuntu) may not have permission to create another file than conf.php.
-            // Also no other process must be able to read file or we expose the new file, so content with password.
-            @dol_copy($conffile, $conffile.'.old', '0400');
-        }
+	// Write conf file on disk
+	if (!$error)
+	{
+		// Save old conf file on disk
+		if (file_exists("$conffile"))
+		{
+			// We must ignore errors as an existing old file may already exist and not be replaceable or
+			// the installer (like for ubuntu) may not have permission to create another file than conf.php.
+			// Also no other process must be able to read file or we expose the new file, so content with password.
+			@dol_copy($conffile, $conffile.'.old', '0400');
+		}
 
-        $error += write_conf_file($conffile);
-    }
+		$error += write_conf_file($conffile);
+	}
 
-    // Create database and admin user database
-    if (!$error)
-    {
-        // We reload configuration file
-        conf($dolibarr_main_document_root);
+	// Create database and admin user database
+	if (!$error)
+	{
+		// We reload configuration file
+		conf($dolibarr_main_document_root);
 
-        print '<tr><td>';
-        print $langs->trans("ConfFileReload");
-        print '</td>';
-        print '<td><img src="../theme/eldy/img/tick.png" alt="Ok"></td></tr>';
+		print '<tr><td>';
+		print $langs->trans("ConfFileReload");
+		print '</td>';
+		print '<td><img src="../theme/eldy/img/tick.png" alt="Ok"></td></tr>';
 
-        // Create database user if requested
-        if (isset($db_create_user) && ($db_create_user == "1" || $db_create_user == "on")) {
-            dolibarr_install_syslog("step1: create database user: ".$dolibarr_main_db_user);
+		// Create database user if requested
+		if (isset($db_create_user) && ($db_create_user == "1" || $db_create_user == "on")) {
+			dolibarr_install_syslog("step1: create database user: ".$dolibarr_main_db_user);
 
-            //print $conf->db->host." , ".$conf->db->name." , ".$conf->db->user." , ".$conf->db->port;
-            $databasefortest = $conf->db->name;
-            if ($conf->db->type == 'mysql' || $conf->db->type == 'mysqli')
-            {
-                $databasefortest = 'mysql';
-            } elseif ($conf->db->type == 'pgsql')
-            {
-                $databasefortest = 'postgres';
-            } elseif ($conf->db->type == 'mssql')
-            {
-                $databasefortest = 'master';
-            }
+			//print $conf->db->host." , ".$conf->db->name." , ".$conf->db->user." , ".$conf->db->port;
+			$databasefortest = $conf->db->name;
+			if ($conf->db->type == 'mysql' || $conf->db->type == 'mysqli')
+			{
+				$databasefortest = 'mysql';
+			} elseif ($conf->db->type == 'pgsql')
+			{
+				$databasefortest = 'postgres';
+			} elseif ($conf->db->type == 'mssql')
+			{
+				$databasefortest = 'master';
+			}
 
-            // Check database connection
+			// Check database connection
 
-            $db = getDoliDBInstance($conf->db->type, $conf->db->host, $userroot, $passroot, $databasefortest, $conf->db->port);
+			$db = getDoliDBInstance($conf->db->type, $conf->db->host, $userroot, $passroot, $databasefortest, $conf->db->port);
 
-            if ($db->error)
-            {
-                print '<div class="error">'.$db->error.'</div>';
-                $error++;
-            }
+			if ($db->error)
+			{
+				print '<div class="error">'.$db->error.'</div>';
+				$error++;
+			}
 
-            if (!$error)
-            {
-                if ($db->connected)
-                {
-                    $resultbis = 1;
+			if (!$error)
+			{
+				if ($db->connected)
+				{
+					$resultbis = 1;
 
-                    // Create user
-                    $result = $db->DDLCreateUser($dolibarr_main_db_host, $dolibarr_main_db_user, $dolibarr_main_db_pass, $dolibarr_main_db_name);
+					// Create user
+					$result = $db->DDLCreateUser($dolibarr_main_db_host, $dolibarr_main_db_user, $dolibarr_main_db_pass, $dolibarr_main_db_name);
 
-                    // Create user bis
-                    if ($databasefortest == 'mysql')
-                    {
-                        if (!in_array($dolibarr_main_db_host, array('127.0.0.1', '::1', 'localhost', 'localhost.local')))
-                        {
-                            $resultbis = $db->DDLCreateUser('%', $dolibarr_main_db_user, $dolibarr_main_db_pass, $dolibarr_main_db_name);
-                        }
-                    }
+					// Create user bis
+					if ($databasefortest == 'mysql')
+					{
+						if (!in_array($dolibarr_main_db_host, array('127.0.0.1', '::1', 'localhost', 'localhost.local')))
+						{
+							$resultbis = $db->DDLCreateUser('%', $dolibarr_main_db_user, $dolibarr_main_db_pass, $dolibarr_main_db_name);
+						}
+					}
 
-                    if ($result > 0 && $resultbis > 0)
-                    {
-                        print '<tr><td>';
-                        print $langs->trans("UserCreation").' : ';
-                        print $dolibarr_main_db_user;
-                        print '</td>';
-                        print '<td><img src="../theme/eldy/img/tick.png" alt="Ok"></td></tr>';
-                    } else {
-                        if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS'
-                        || $db->errno() == 'DB_ERROR_KEY_NAME_ALREADY_EXISTS'
-                        || $db->errno() == 'DB_ERROR_USER_ALREADY_EXISTS')
-                        {
-                            dolibarr_install_syslog("step1: user already exists");
-                            print '<tr><td>';
-                            print $langs->trans("UserCreation").' : ';
-                            print $dolibarr_main_db_user;
-                            print '</td>';
-                            print '<td>'.$langs->trans("LoginAlreadyExists").'</td></tr>';
-                        } else {
-                            dolibarr_install_syslog("step1: failed to create user", LOG_ERR);
-                            print '<tr><td>';
-                            print $langs->trans("UserCreation").' : ';
-                            print $dolibarr_main_db_user;
-                            print '</td>';
-                            print '<td>'.$langs->trans("Error").': '.$db->errno().' '.$db->error().($db->error ? '. '.$db->error : '')."</td></tr>";
-                        }
-                    }
+					if ($result > 0 && $resultbis > 0)
+					{
+						print '<tr><td>';
+						print $langs->trans("UserCreation").' : ';
+						print $dolibarr_main_db_user;
+						print '</td>';
+						print '<td><img src="../theme/eldy/img/tick.png" alt="Ok"></td></tr>';
+					} else {
+						if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS'
+						|| $db->errno() == 'DB_ERROR_KEY_NAME_ALREADY_EXISTS'
+						|| $db->errno() == 'DB_ERROR_USER_ALREADY_EXISTS')
+						{
+							dolibarr_install_syslog("step1: user already exists");
+							print '<tr><td>';
+							print $langs->trans("UserCreation").' : ';
+							print $dolibarr_main_db_user;
+							print '</td>';
+							print '<td>'.$langs->trans("LoginAlreadyExists").'</td></tr>';
+						} else {
+							dolibarr_install_syslog("step1: failed to create user", LOG_ERR);
+							print '<tr><td>';
+							print $langs->trans("UserCreation").' : ';
+							print $dolibarr_main_db_user;
+							print '</td>';
+							print '<td>'.$langs->trans("Error").': '.$db->errno().' '.$db->error().($db->error ? '. '.$db->error : '')."</td></tr>";
+						}
+					}
 
-                    $db->close();
-                } else {
-                    print '<tr><td>';
-                    print $langs->trans("UserCreation").' : ';
-                    print $dolibarr_main_db_user;
-                    print '</td>';
-                    print '<td><img src="../theme/eldy/img/error.png" alt="Error"></td>';
-                    print '</tr>';
+					$db->close();
+				} else {
+					print '<tr><td>';
+					print $langs->trans("UserCreation").' : ';
+					print $dolibarr_main_db_user;
+					print '</td>';
+					print '<td><img src="../theme/eldy/img/error.png" alt="Error"></td>';
+					print '</tr>';
 
-                    // warning message due to connection failure
-                    print '<tr><td colspan="2"><br>';
-                    print $langs->trans("YouAskDatabaseCreationSoDolibarrNeedToConnect", $dolibarr_main_db_user, $dolibarr_main_db_host, $userroot);
-                    print '<br>';
-                    print $langs->trans("BecauseConnectionFailedParametersMayBeWrong").'<br><br>';
-                    print $langs->trans("ErrorGoBackAndCorrectParameters").'<br><br>';
-                    print '</td></tr>';
+					// warning message due to connection failure
+					print '<tr><td colspan="2"><br>';
+					print $langs->trans("YouAskDatabaseCreationSoDolibarrNeedToConnect", $dolibarr_main_db_user, $dolibarr_main_db_host, $userroot);
+					print '<br>';
+					print $langs->trans("BecauseConnectionFailedParametersMayBeWrong").'<br><br>';
+					print $langs->trans("ErrorGoBackAndCorrectParameters").'<br><br>';
+					print '</td></tr>';
 
-                    $error++;
-                }
-            }
-        }   // end of user account creation
+					$error++;
+				}
+			}
+		}   // end of user account creation
 
 
-        // If database creation was asked, we create it
-        if (!$error && (isset($db_create_database) && ($db_create_database == "1" || $db_create_database == "on"))) {
-            dolibarr_install_syslog("step1: create database: ".$dolibarr_main_db_name." ".$dolibarr_main_db_character_set." ".$dolibarr_main_db_collation." ".$dolibarr_main_db_user);
-        	$newdb = getDoliDBInstance($conf->db->type, $conf->db->host, $userroot, $passroot, '', $conf->db->port);
-            //print 'eee'.$conf->db->type." ".$conf->db->host." ".$userroot." ".$passroot." ".$conf->db->port." ".$newdb->connected." ".$newdb->forcecharset;exit;
+		// If database creation was asked, we create it
+		if (!$error && (isset($db_create_database) && ($db_create_database == "1" || $db_create_database == "on"))) {
+			dolibarr_install_syslog("step1: create database: ".$dolibarr_main_db_name." ".$dolibarr_main_db_character_set." ".$dolibarr_main_db_collation." ".$dolibarr_main_db_user);
+			$newdb = getDoliDBInstance($conf->db->type, $conf->db->host, $userroot, $passroot, '', $conf->db->port);
+			//print 'eee'.$conf->db->type." ".$conf->db->host." ".$userroot." ".$passroot." ".$conf->db->port." ".$newdb->connected." ".$newdb->forcecharset;exit;
 
-            if ($newdb->connected)
-            {
-                $result = $newdb->DDLCreateDb($dolibarr_main_db_name, $dolibarr_main_db_character_set, $dolibarr_main_db_collation, $dolibarr_main_db_user);
+			if ($newdb->connected)
+			{
+				$result = $newdb->DDLCreateDb($dolibarr_main_db_name, $dolibarr_main_db_character_set, $dolibarr_main_db_collation, $dolibarr_main_db_user);
 
-                if ($result)
-                {
-                    print '<tr><td>';
-                    print $langs->trans("DatabaseCreation")." (".$langs->trans("User")." ".$userroot.") : ";
-                    print $dolibarr_main_db_name;
-                    print '</td>';
-                    print '<td><img src="../theme/eldy/img/tick.png" alt="Ok"></td></tr>';
+				if ($result)
+				{
+					print '<tr><td>';
+					print $langs->trans("DatabaseCreation")." (".$langs->trans("User")." ".$userroot.") : ";
+					print $dolibarr_main_db_name;
+					print '</td>';
+					print '<td><img src="../theme/eldy/img/tick.png" alt="Ok"></td></tr>';
 
-                    $newdb->select_db($dolibarr_main_db_name);
-                    $check1 = $newdb->getDefaultCharacterSetDatabase();
-                    $check2 = $newdb->getDefaultCollationDatabase();
-                    dolibarr_install_syslog('step1: new database is using charset='.$check1.' collation='.$check2);
+					$newdb->select_db($dolibarr_main_db_name);
+					$check1 = $newdb->getDefaultCharacterSetDatabase();
+					$check2 = $newdb->getDefaultCollationDatabase();
+					dolibarr_install_syslog('step1: new database is using charset='.$check1.' collation='.$check2);
 
-                    // If values differs, we save conf file again
-                    //if ($check1 != $dolibarr_main_db_character_set) dolibarr_install_syslog('step1: value for character_set is not the one asked for database creation', LOG_WARNING);
-                    //if ($check2 != $dolibarr_main_db_collation)     dolibarr_install_syslog('step1: value for collation is not the one asked for database creation', LOG_WARNING);
-                } else {
-                    // warning message
-                    print '<tr><td colspan="2"><br>';
-                    print $langs->trans("ErrorFailedToCreateDatabase", $dolibarr_main_db_name).'<br>';
-                    print $newdb->lasterror().'<br>';
-                    print $langs->trans("IfDatabaseExistsGoBackAndCheckCreate");
-                    print '<br>';
-                    print '</td></tr>';
+					// If values differs, we save conf file again
+					//if ($check1 != $dolibarr_main_db_character_set) dolibarr_install_syslog('step1: value for character_set is not the one asked for database creation', LOG_WARNING);
+					//if ($check2 != $dolibarr_main_db_collation)     dolibarr_install_syslog('step1: value for collation is not the one asked for database creation', LOG_WARNING);
+				} else {
+					// warning message
+					print '<tr><td colspan="2"><br>';
+					print $langs->trans("ErrorFailedToCreateDatabase", $dolibarr_main_db_name).'<br>';
+					print $newdb->lasterror().'<br>';
+					print $langs->trans("IfDatabaseExistsGoBackAndCheckCreate");
+					print '<br>';
+					print '</td></tr>';
 
-                    dolibarr_install_syslog('step1: failed to create database '.$dolibarr_main_db_name.' '.$newdb->lasterrno().' '.$newdb->lasterror(), LOG_ERR);
-                    $error++;
-                }
-                $newdb->close();
-            } else {
-                print '<tr><td>';
-                print $langs->trans("DatabaseCreation")." (".$langs->trans("User")." ".$userroot.") : ";
-                print $dolibarr_main_db_name;
-                print '</td>';
-                print '<td><img src="../theme/eldy/img/error.png" alt="Error"></td>';
-                print '</tr>';
+					dolibarr_install_syslog('step1: failed to create database '.$dolibarr_main_db_name.' '.$newdb->lasterrno().' '.$newdb->lasterror(), LOG_ERR);
+					$error++;
+				}
+				$newdb->close();
+			} else {
+				print '<tr><td>';
+				print $langs->trans("DatabaseCreation")." (".$langs->trans("User")." ".$userroot.") : ";
+				print $dolibarr_main_db_name;
+				print '</td>';
+				print '<td><img src="../theme/eldy/img/error.png" alt="Error"></td>';
+				print '</tr>';
 
-                // warning message
-                print '<tr><td colspan="2"><br>';
-                print $langs->trans("YouAskDatabaseCreationSoDolibarrNeedToConnect", $dolibarr_main_db_user, $dolibarr_main_db_host, $userroot);
-                print '<br>';
-                print $langs->trans("BecauseConnectionFailedParametersMayBeWrong").'<br><br>';
-                print $langs->trans("ErrorGoBackAndCorrectParameters").'<br><br>';
-                print '</td></tr>';
+				// warning message
+				print '<tr><td colspan="2"><br>';
+				print $langs->trans("YouAskDatabaseCreationSoDolibarrNeedToConnect", $dolibarr_main_db_user, $dolibarr_main_db_host, $userroot);
+				print '<br>';
+				print $langs->trans("BecauseConnectionFailedParametersMayBeWrong").'<br><br>';
+				print $langs->trans("ErrorGoBackAndCorrectParameters").'<br><br>';
+				print '</td></tr>';
 
-                $error++;
-            }
-        }   // end of create database
+				$error++;
+			}
+		}   // end of create database
 
 
-        // We test access with dolibarr database user (not admin)
-        if (!$error)
-        {
-            dolibarr_install_syslog("step1: connection type=".$conf->db->type." on host=".$conf->db->host." port=".$conf->db->port." user=".$conf->db->user." name=".$conf->db->name);
-            //print "connexion de type=".$conf->db->type." sur host=".$conf->db->host." port=".$conf->db->port." user=".$conf->db->user." name=".$conf->db->name;
+		// We test access with dolibarr database user (not admin)
+		if (!$error)
+		{
+			dolibarr_install_syslog("step1: connection type=".$conf->db->type." on host=".$conf->db->host." port=".$conf->db->port." user=".$conf->db->user." name=".$conf->db->name);
+			//print "connexion de type=".$conf->db->type." sur host=".$conf->db->host." port=".$conf->db->port." user=".$conf->db->user." name=".$conf->db->name;
 
-            $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);
 
-            if ($db->connected)
-            {
-                dolibarr_install_syslog("step1: connection to server by user ".$conf->db->user." ok");
-                print "<tr><td>";
-                print $langs->trans("ServerConnection")." (".$langs->trans("User")." ".$conf->db->user.") : ";
-                print $dolibarr_main_db_host;
-                print "</td><td>";
-                print '<img src="../theme/eldy/img/tick.png" alt="Ok">';
-                print "</td></tr>";
+			if ($db->connected)
+			{
+				dolibarr_install_syslog("step1: connection to server by user ".$conf->db->user." ok");
+				print "<tr><td>";
+				print $langs->trans("ServerConnection")." (".$langs->trans("User")." ".$conf->db->user.") : ";
+				print $dolibarr_main_db_host;
+				print "</td><td>";
+				print '<img src="../theme/eldy/img/tick.png" alt="Ok">';
+				print "</td></tr>";
 
-                // server access ok, basic access ok
-                if ($db->database_selected)
-                {
-                    dolibarr_install_syslog("step1: connection to database ".$conf->db->name." by user ".$conf->db->user." ok");
-                    print "<tr><td>";
-                    print $langs->trans("DatabaseConnection")." (".$langs->trans("User")." ".$conf->db->user.") : ";
-                    print $dolibarr_main_db_name;
-                    print "</td><td>";
-                    print '<img src="../theme/eldy/img/tick.png" alt="Ok">';
-                    print "</td></tr>";
+				// server access ok, basic access ok
+				if ($db->database_selected)
+				{
+					dolibarr_install_syslog("step1: connection to database ".$conf->db->name." by user ".$conf->db->user." ok");
+					print "<tr><td>";
+					print $langs->trans("DatabaseConnection")." (".$langs->trans("User")." ".$conf->db->user.") : ";
+					print $dolibarr_main_db_name;
+					print "</td><td>";
+					print '<img src="../theme/eldy/img/tick.png" alt="Ok">';
+					print "</td></tr>";
 
-                    $error = 0;
-                } else {
-                    dolibarr_install_syslog("step1: connection to database ".$conf->db->name." by user ".$conf->db->user." failed", LOG_ERR);
-                    print "<tr><td>";
-                    print $langs->trans("DatabaseConnection")." (".$langs->trans("User")." ".$conf->db->user.") : ";
-                    print $dolibarr_main_db_name;
-                    print '</td><td>';
-                    print '<img src="../theme/eldy/img/error.png" alt="Error">';
-                    print "</td></tr>";
+					$error = 0;
+				} else {
+					dolibarr_install_syslog("step1: connection to database ".$conf->db->name." by user ".$conf->db->user." failed", LOG_ERR);
+					print "<tr><td>";
+					print $langs->trans("DatabaseConnection")." (".$langs->trans("User")." ".$conf->db->user.") : ";
+					print $dolibarr_main_db_name;
+					print '</td><td>';
+					print '<img src="../theme/eldy/img/error.png" alt="Error">';
+					print "</td></tr>";
 
-                    // warning message
-                    print '<tr><td colspan="2"><br>';
-                    print $langs->trans('CheckThatDatabasenameIsCorrect', $dolibarr_main_db_name).'<br>';
-                    print $langs->trans('IfAlreadyExistsCheckOption').'<br>';
-                    print $langs->trans("ErrorGoBackAndCorrectParameters").'<br><br>';
-                    print '</td></tr>';
+					// warning message
+					print '<tr><td colspan="2"><br>';
+					print $langs->trans('CheckThatDatabasenameIsCorrect', $dolibarr_main_db_name).'<br>';
+					print $langs->trans('IfAlreadyExistsCheckOption').'<br>';
+					print $langs->trans("ErrorGoBackAndCorrectParameters").'<br><br>';
+					print '</td></tr>';
 
-                    $error++;
-                }
-            } else {
-                dolibarr_install_syslog("step1: connection to server by user ".$conf->db->user." failed", LOG_ERR);
-                print "<tr><td>";
-                print $langs->trans("ServerConnection")." (".$langs->trans("User")." ".$conf->db->user.") : ";
-                print $dolibarr_main_db_host;
-                print '</td><td>';
-                print '<img src="../theme/eldy/img/error.png" alt="Error">';
-                print "</td></tr>";
+					$error++;
+				}
+			} else {
+				dolibarr_install_syslog("step1: connection to server by user ".$conf->db->user." failed", LOG_ERR);
+				print "<tr><td>";
+				print $langs->trans("ServerConnection")." (".$langs->trans("User")." ".$conf->db->user.") : ";
+				print $dolibarr_main_db_host;
+				print '</td><td>';
+				print '<img src="../theme/eldy/img/error.png" alt="Error">';
+				print "</td></tr>";
 
-                // warning message
-                print '<tr><td colspan="2"><br>';
-                print $langs->trans("ErrorConnection", $conf->db->host, $conf->db->name, $conf->db->user);
-                print $langs->trans('IfLoginDoesNotExistsCheckCreateUser').'<br>';
-                print $langs->trans("ErrorGoBackAndCorrectParameters").'<br><br>';
-                print '</td></tr>';
+				// warning message
+				print '<tr><td colspan="2"><br>';
+				print $langs->trans("ErrorConnection", $conf->db->host, $conf->db->name, $conf->db->user);
+				print $langs->trans('IfLoginDoesNotExistsCheckCreateUser').'<br>';
+				print $langs->trans("ErrorGoBackAndCorrectParameters").'<br><br>';
+				print '</td></tr>';
 
-                $error++;
-            }
-        }
-    }
+				$error++;
+			}
+		}
+	}
 
-    print '</table>';
+	print '</table>';
 }
 
 ?>
@@ -787,15 +793,15 @@ if ($ret) exit($ret);
  */
 function write_main_file($mainfile, $main_dir)
 {
-    $fp = @fopen("$mainfile", "w");
-    if ($fp)
-    {
-        clearstatcache();
-        fputs($fp, '<?php'."\n");
-        fputs($fp, "// Wrapper to include main into htdocs\n");
-        fputs($fp, "include_once '".$main_dir."/main.inc.php';\n");
-        fclose($fp);
-    }
+	$fp = @fopen("$mainfile", "w");
+	if ($fp)
+	{
+		clearstatcache();
+		fputs($fp, '<?php'."\n");
+		fputs($fp, "// Wrapper to include main into htdocs\n");
+		fputs($fp, "include_once '".$main_dir."/main.inc.php';\n");
+		fclose($fp);
+	}
 }
 
 
@@ -808,15 +814,15 @@ function write_main_file($mainfile, $main_dir)
  */
 function write_master_file($masterfile, $main_dir)
 {
-    $fp = @fopen("$masterfile", "w");
-    if ($fp)
-    {
-        clearstatcache();
-        fputs($fp, '<?php'."\n");
-        fputs($fp, "// Wrapper to include master into htdocs\n");
-        fputs($fp, "include_once '".$main_dir."/master.inc.php';\n");
-        fclose($fp);
-    }
+	$fp = @fopen("$masterfile", "w");
+	if ($fp)
+	{
+		clearstatcache();
+		fputs($fp, '<?php'."\n");
+		fputs($fp, "// Wrapper to include master into htdocs\n");
+		fputs($fp, "include_once '".$main_dir."/master.inc.php';\n");
+		fclose($fp);
+	}
 }
 
 
@@ -828,47 +834,48 @@ function write_master_file($masterfile, $main_dir)
  */
 function write_conf_file($conffile)
 {
-    global $conf, $langs;
-    global $main_url, $main_dir, $main_data_dir, $main_force_https, $main_use_alt_dir, $main_alt_dir_name, $main_db_prefix;
-    global $dolibarr_main_url_root, $dolibarr_main_document_root, $dolibarr_main_data_root, $dolibarr_main_db_host;
-    global $dolibarr_main_db_port, $dolibarr_main_db_name, $dolibarr_main_db_user, $dolibarr_main_db_pass;
-    global $dolibarr_main_db_type, $dolibarr_main_db_character_set, $dolibarr_main_db_collation, $dolibarr_main_authentication;
-    global $db_host, $db_port, $db_name, $db_user, $db_pass, $db_type, $db_character_set, $db_collation;
-    global $conffile, $conffiletoshow, $conffiletoshowshort;
-    global $force_dolibarr_lib_ADODB_PATH, $force_dolibarr_lib_NUSOAP_PATH;
-    global $force_dolibarr_lib_TCPDF_PATH, $force_dolibarr_lib_FPDI_PATH;
-    global $force_dolibarr_lib_PHPEXCEL_PATH, $force_dolibarr_lib_GEOIP_PATH;
-    global $force_dolibarr_lib_ODTPHP_PATH, $force_dolibarr_lib_ODTPHP_PATHTOPCLZIP;
-    global $force_dolibarr_js_CKEDITOR, $force_dolibarr_js_JQUERY, $force_dolibarr_js_JQUERY_UI;
-    global $force_dolibarr_font_DOL_DEFAULT_TTF, $force_dolibarr_font_DOL_DEFAULT_TTF_BOLD;
+	global $conf, $langs;
+	global $main_url, $main_dir, $main_data_dir, $main_force_https, $main_use_alt_dir, $main_alt_dir_name, $main_db_prefix;
+	global $dolibarr_main_url_root, $dolibarr_main_document_root, $dolibarr_main_data_root, $dolibarr_main_db_host;
+	global $dolibarr_main_db_port, $dolibarr_main_db_name, $dolibarr_main_db_user, $dolibarr_main_db_pass;
+	global $dolibarr_main_db_type, $dolibarr_main_db_character_set, $dolibarr_main_db_collation, $dolibarr_main_authentication;
+	global $dolibarr_main_distrib;
+	global $db_host, $db_port, $db_name, $db_user, $db_pass, $db_type, $db_character_set, $db_collation;
+	global $conffile, $conffiletoshow, $conffiletoshowshort;
+	global $force_dolibarr_lib_ADODB_PATH, $force_dolibarr_lib_NUSOAP_PATH;
+	global $force_dolibarr_lib_TCPDF_PATH, $force_dolibarr_lib_FPDI_PATH;
+	global $force_dolibarr_lib_PHPEXCEL_PATH, $force_dolibarr_lib_GEOIP_PATH;
+	global $force_dolibarr_lib_ODTPHP_PATH, $force_dolibarr_lib_ODTPHP_PATHTOPCLZIP;
+	global $force_dolibarr_js_CKEDITOR, $force_dolibarr_js_JQUERY, $force_dolibarr_js_JQUERY_UI;
+	global $force_dolibarr_font_DOL_DEFAULT_TTF, $force_dolibarr_font_DOL_DEFAULT_TTF_BOLD;
 
-    $error = 0;
+	$error = 0;
 
-    $key = md5(uniqid(mt_rand(), true)); // Generate random hash
+	$key = md5(uniqid(mt_rand(), true)); // Generate random hash
 
-    $fp = fopen("$conffile", "w");
-    if ($fp)
-    {
-        clearstatcache();
+	$fp = fopen("$conffile", "w");
+	if ($fp)
+	{
+		clearstatcache();
 
-        fputs($fp, '<?php'."\n");
-        fputs($fp, '//'."\n");
-        fputs($fp, '// File generated by Dolibarr installer '.DOL_VERSION.' on '.dol_print_date(dol_now(), '')."\n");
-        fputs($fp, '//'."\n");
-        fputs($fp, '// Take a look at conf.php.example file for an example of '.$conffiletoshowshort.' file'."\n");
-        fputs($fp, '// and explanations for all possibles parameters.'."\n");
-        fputs($fp, '//'."\n");
+		fputs($fp, '<?php'."\n");
+		fputs($fp, '//'."\n");
+		fputs($fp, '// File generated by Dolibarr installer '.DOL_VERSION.' on '.dol_print_date(dol_now(), '')."\n");
+		fputs($fp, '//'."\n");
+		fputs($fp, '// Take a look at conf.php.example file for an example of '.$conffiletoshowshort.' file'."\n");
+		fputs($fp, '// and explanations for all possibles parameters.'."\n");
+		fputs($fp, '//'."\n");
 
-        fputs($fp, '$dolibarr_main_url_root=\''.str_replace("'", "\'", trim($main_url)).'\';');
-        fputs($fp, "\n");
+		fputs($fp, '$dolibarr_main_url_root=\''.str_replace("'", "\'", trim($main_url)).'\';');
+		fputs($fp, "\n");
 
-        fputs($fp, '$dolibarr_main_document_root=\''.str_replace("'", "\'", trim($main_dir)).'\';');
-        fputs($fp, "\n");
+		fputs($fp, '$dolibarr_main_document_root=\''.str_replace("'", "\'", trim($main_dir)).'\';');
+		fputs($fp, "\n");
 
-        fputs($fp, $main_use_alt_dir.'$dolibarr_main_url_root_alt=\''.str_replace("'", "\'", trim("/".$main_alt_dir_name)).'\';');
-        fputs($fp, "\n");
+		fputs($fp, $main_use_alt_dir.'$dolibarr_main_url_root_alt=\''.str_replace("'", "\'", trim("/".$main_alt_dir_name)).'\';');
+		fputs($fp, "\n");
 
-        fputs($fp, $main_use_alt_dir.'$dolibarr_main_document_root_alt=\''.str_replace("'", "\'", trim($main_dir."/".$main_alt_dir_name)).'\';');
+		fputs($fp, $main_use_alt_dir.'$dolibarr_main_document_root_alt=\''.str_replace("'", "\'", trim($main_dir."/".$main_alt_dir_name)).'\';');
 		fputs($fp, "\n");
 
 		fputs($fp, '$dolibarr_main_data_root=\''.str_replace("'", "\'", trim($main_data_dir)).'\';');
@@ -900,87 +907,91 @@ function write_conf_file($conffile)
 		fputs($fp, '$dolibarr_main_db_collation=\''.str_replace("'", "\'", trim($db_collation)).'\';');
 		fputs($fp, "\n");
 
-		/* Authentication */
+		// Authentication
 		fputs($fp, '// Authentication settings');
-        fputs($fp, "\n");
+		fputs($fp, "\n");
 
 		fputs($fp, '$dolibarr_main_authentication=\'dolibarr\';');
 		fputs($fp, "\n\n");
 
-        fputs($fp, '//$dolibarr_main_demo=\'autologin,autopass\';');
-        fputs($fp, "\n");
+		fputs($fp, '//$dolibarr_main_demo=\'autologin,autopass\';');
+		fputs($fp, "\n");
 
 		fputs($fp, '// Security settings');
-        fputs($fp, "\n");
-
-        fputs($fp, '$dolibarr_main_prod=\'0\';');
-        fputs($fp, "\n");
-
-        fputs($fp, '$dolibarr_main_force_https=\''.$main_force_https.'\';');
 		fputs($fp, "\n");
 
-        fputs($fp, '$dolibarr_main_restrict_os_commands=\'mysqldump, mysql, pg_dump, pgrestore\';');
+		fputs($fp, '$dolibarr_main_prod=\'0\';');
 		fputs($fp, "\n");
 
-        fputs($fp, '$dolibarr_nocsrfcheck=\'0\';');
-        fputs($fp, "\n");
+		fputs($fp, '$dolibarr_main_force_https=\''.$main_force_https.'\';');
+		fputs($fp, "\n");
+
+		fputs($fp, '$dolibarr_main_restrict_os_commands=\'mysqldump, mysql, pg_dump, pgrestore\';');
+		fputs($fp, "\n");
+
+		fputs($fp, '$dolibarr_nocsrfcheck=\'0\';');
+		fputs($fp, "\n");
 
 		fputs($fp, '$dolibarr_main_instance_unique_id=\''.$key.'\';');
 		fputs($fp, "\n");
 
 		fputs($fp, '$dolibarr_mailing_limit_sendbyweb=\'0\';');
-        fputs($fp, "\n");
+		fputs($fp, "\n");
 
-        // Write params to overwrites default lib path
-        fputs($fp, "\n");
-        if (empty($force_dolibarr_lib_FPDF_PATH)) { fputs($fp, '//'); $force_dolibarr_lib_FPDF_PATH = ''; }
-        fputs($fp, '$dolibarr_lib_FPDF_PATH=\''.$force_dolibarr_lib_FPDF_PATH.'\';');
-        fputs($fp, "\n");
-        if (empty($force_dolibarr_lib_TCPDF_PATH)) { fputs($fp, '//'); $force_dolibarr_lib_TCPDF_PATH = ''; }
-        fputs($fp, '$dolibarr_lib_TCPDF_PATH=\''.$force_dolibarr_lib_TCPDF_PATH.'\';');
-        fputs($fp, "\n");
-        if (empty($force_dolibarr_lib_FPDI_PATH)) { fputs($fp, '//'); $force_dolibarr_lib_FPDI_PATH = ''; }
-        fputs($fp, '$dolibarr_lib_FPDI_PATH=\''.$force_dolibarr_lib_FPDI_PATH.'\';');
-        fputs($fp, "\n");
-        if (empty($force_dolibarr_lib_TCPDI_PATH)) { fputs($fp, '//'); $force_dolibarr_lib_TCPDI_PATH = ''; }
-        fputs($fp, '$dolibarr_lib_TCPDI_PATH=\''.$force_dolibarr_lib_TCPDI_PATH.'\';');
-        fputs($fp, "\n");
-        if (empty($force_dolibarr_lib_ADODB_PATH)) { fputs($fp, '//'); $force_dolibarr_lib_ADODB_PATH = ''; }
-        fputs($fp, '$dolibarr_lib_ADODB_PATH=\''.$force_dolibarr_lib_ADODB_PATH.'\';');
-        fputs($fp, "\n");
-        if (empty($force_dolibarr_lib_GEOIP_PATH)) { fputs($fp, '//'); $force_dolibarr_lib_GEOIP_PATH = ''; }
-        fputs($fp, '$dolibarr_lib_GEOIP_PATH=\''.$force_dolibarr_lib_GEOIP_PATH.'\';');
-        fputs($fp, "\n");
-        if (empty($force_dolibarr_lib_NUSOAP_PATH)) { fputs($fp, '//'); $force_dolibarr_lib_NUSOAP_PATH = ''; }
-        fputs($fp, '$dolibarr_lib_NUSOAP_PATH=\''.$force_dolibarr_lib_NUSOAP_PATH.'\';');
-        fputs($fp, "\n");
-        if (empty($force_dolibarr_lib_PHPEXCEL_PATH)) { fputs($fp, '//'); $force_dolibarr_lib_PHPEXCEL_PATH = ''; }
-        fputs($fp, '$dolibarr_lib_PHPEXCEL_PATH=\''.$force_dolibarr_lib_PHPEXCEL_PATH.'\';');
-        fputs($fp, "\n");
-        if (empty($force_dolibarr_lib_ODTPHP_PATH)) { fputs($fp, '//'); $force_dolibarr_lib_ODTPHP_PATH = ''; }
-        fputs($fp, '$dolibarr_lib_ODTPHP_PATH=\''.$force_dolibarr_lib_ODTPHP_PATH.'\';');
-        fputs($fp, "\n");
-        if (empty($force_dolibarr_lib_ODTPHP_PATHTOPCLZIP)) { fputs($fp, '//'); $force_dolibarr_lib_ODTPHP_PATHTOPCLZIP = ''; }
-        fputs($fp, '$dolibarr_lib_ODTPHP_PATHTOPCLZIP=\''.$force_dolibarr_lib_ODTPHP_PATHTOPCLZIP.'\';');
-        fputs($fp, "\n");
-        if (empty($force_dolibarr_js_CKEDITOR)) { fputs($fp, '//'); $force_dolibarr_js_CKEDITOR = ''; }
-        fputs($fp, '$dolibarr_js_CKEDITOR=\''.$force_dolibarr_js_CKEDITOR.'\';');
-        fputs($fp, "\n");
-        if (empty($force_dolibarr_js_JQUERY)) { fputs($fp, '//'); $force_dolibarr_js_JQUERY = ''; }
-        fputs($fp, '$dolibarr_js_JQUERY=\''.$force_dolibarr_js_JQUERY.'\';');
-        fputs($fp, "\n");
-        if (empty($force_dolibarr_js_JQUERY_UI)) { fputs($fp, '//'); $force_dolibarr_js_JQUERY_UI = ''; }
-        fputs($fp, '$dolibarr_js_JQUERY_UI=\''.$force_dolibarr_js_JQUERY_UI.'\';');
-        fputs($fp, "\n");
+		// Write params to overwrites default lib path
+		fputs($fp, "\n");
+		if (empty($force_dolibarr_lib_FPDF_PATH)) { fputs($fp, '//'); $force_dolibarr_lib_FPDF_PATH = ''; }
+		fputs($fp, '$dolibarr_lib_FPDF_PATH=\''.$force_dolibarr_lib_FPDF_PATH.'\';');
+		fputs($fp, "\n");
+		if (empty($force_dolibarr_lib_TCPDF_PATH)) { fputs($fp, '//'); $force_dolibarr_lib_TCPDF_PATH = ''; }
+		fputs($fp, '$dolibarr_lib_TCPDF_PATH=\''.$force_dolibarr_lib_TCPDF_PATH.'\';');
+		fputs($fp, "\n");
+		if (empty($force_dolibarr_lib_FPDI_PATH)) { fputs($fp, '//'); $force_dolibarr_lib_FPDI_PATH = ''; }
+		fputs($fp, '$dolibarr_lib_FPDI_PATH=\''.$force_dolibarr_lib_FPDI_PATH.'\';');
+		fputs($fp, "\n");
+		if (empty($force_dolibarr_lib_TCPDI_PATH)) { fputs($fp, '//'); $force_dolibarr_lib_TCPDI_PATH = ''; }
+		fputs($fp, '$dolibarr_lib_TCPDI_PATH=\''.$force_dolibarr_lib_TCPDI_PATH.'\';');
+		fputs($fp, "\n");
+		if (empty($force_dolibarr_lib_ADODB_PATH)) { fputs($fp, '//'); $force_dolibarr_lib_ADODB_PATH = ''; }
+		fputs($fp, '$dolibarr_lib_ADODB_PATH=\''.$force_dolibarr_lib_ADODB_PATH.'\';');
+		fputs($fp, "\n");
+		if (empty($force_dolibarr_lib_GEOIP_PATH)) { fputs($fp, '//'); $force_dolibarr_lib_GEOIP_PATH = ''; }
+		fputs($fp, '$dolibarr_lib_GEOIP_PATH=\''.$force_dolibarr_lib_GEOIP_PATH.'\';');
+		fputs($fp, "\n");
+		if (empty($force_dolibarr_lib_NUSOAP_PATH)) { fputs($fp, '//'); $force_dolibarr_lib_NUSOAP_PATH = ''; }
+		fputs($fp, '$dolibarr_lib_NUSOAP_PATH=\''.$force_dolibarr_lib_NUSOAP_PATH.'\';');
+		fputs($fp, "\n");
+		if (empty($force_dolibarr_lib_PHPEXCEL_PATH)) { fputs($fp, '//'); $force_dolibarr_lib_PHPEXCEL_PATH = ''; }
+		fputs($fp, '$dolibarr_lib_PHPEXCEL_PATH=\''.$force_dolibarr_lib_PHPEXCEL_PATH.'\';');
+		fputs($fp, "\n");
+		if (empty($force_dolibarr_lib_ODTPHP_PATH)) { fputs($fp, '//'); $force_dolibarr_lib_ODTPHP_PATH = ''; }
+		fputs($fp, '$dolibarr_lib_ODTPHP_PATH=\''.$force_dolibarr_lib_ODTPHP_PATH.'\';');
+		fputs($fp, "\n");
+		if (empty($force_dolibarr_lib_ODTPHP_PATHTOPCLZIP)) { fputs($fp, '//'); $force_dolibarr_lib_ODTPHP_PATHTOPCLZIP = ''; }
+		fputs($fp, '$dolibarr_lib_ODTPHP_PATHTOPCLZIP=\''.$force_dolibarr_lib_ODTPHP_PATHTOPCLZIP.'\';');
+		fputs($fp, "\n");
+		if (empty($force_dolibarr_js_CKEDITOR)) { fputs($fp, '//'); $force_dolibarr_js_CKEDITOR = ''; }
+		fputs($fp, '$dolibarr_js_CKEDITOR=\''.$force_dolibarr_js_CKEDITOR.'\';');
+		fputs($fp, "\n");
+		if (empty($force_dolibarr_js_JQUERY)) { fputs($fp, '//'); $force_dolibarr_js_JQUERY = ''; }
+		fputs($fp, '$dolibarr_js_JQUERY=\''.$force_dolibarr_js_JQUERY.'\';');
+		fputs($fp, "\n");
+		if (empty($force_dolibarr_js_JQUERY_UI)) { fputs($fp, '//'); $force_dolibarr_js_JQUERY_UI = ''; }
+		fputs($fp, '$dolibarr_js_JQUERY_UI=\''.$force_dolibarr_js_JQUERY_UI.'\';');
+		fputs($fp, "\n");
 
-        // Write params to overwrites default font path
-        fputs($fp, "\n");
-        if (empty($force_dolibarr_font_DOL_DEFAULT_TTF)) { fputs($fp, '//'); $force_dolibarr_font_DOL_DEFAULT_TTF = ''; }
+		// Write params to overwrites default font path
+		fputs($fp, "\n");
+		if (empty($force_dolibarr_font_DOL_DEFAULT_TTF)) { fputs($fp, '//'); $force_dolibarr_font_DOL_DEFAULT_TTF = ''; }
    		fputs($fp, '$dolibarr_font_DOL_DEFAULT_TTF=\''.$force_dolibarr_font_DOL_DEFAULT_TTF.'\';');
-        fputs($fp, "\n");
-        if (empty($force_dolibarr_font_DOL_DEFAULT_TTF_BOLD)) { fputs($fp, '//'); $force_dolibarr_font_DOL_DEFAULT_TTF_BOLD = ''; }
-        fputs($fp, '$dolibarr_font_DOL_DEFAULT_TTF_BOLD=\''.$force_dolibarr_font_DOL_DEFAULT_TTF_BOLD.'\';');
-        fputs($fp, "\n");
+		fputs($fp, "\n");
+		if (empty($force_dolibarr_font_DOL_DEFAULT_TTF_BOLD)) { fputs($fp, '//'); $force_dolibarr_font_DOL_DEFAULT_TTF_BOLD = ''; }
+		fputs($fp, '$dolibarr_font_DOL_DEFAULT_TTF_BOLD=\''.$force_dolibarr_font_DOL_DEFAULT_TTF_BOLD.'\';');
+		fputs($fp, "\n");
+
+		// Other
+		fputs($fp, '$dolibarr_main_distrib=\''.str_replace("'", "\'", trim($dolibarr_main_distrib)).'\';');
+		fputs($fp, "\n");
 
 		fclose($fp);
 
diff --git a/htdocs/install/step2.php b/htdocs/install/step2.php
index 25fde52dd58..20c57cb0ccf 100644
--- a/htdocs/install/step2.php
+++ b/htdocs/install/step2.php
@@ -80,517 +80,517 @@ pHeader($langs->trans("CreateDatabaseObjects"), "step4");
 // Test if we can run a first install process
 if (!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")
 {
-    print '<h3><img class="valigntextbottom" src="../theme/common/octicons/build/svg/database.svg" width="20" alt="Database"> '.$langs->trans("Database").'</h3>';
+	print '<h3><img class="valigntextbottom" src="../theme/common/octicons/build/svg/database.svg" width="20" alt="Database"> '.$langs->trans("Database").'</h3>';
 
-    print '<table cellspacing="0" style="padding: 4px 4px 4px 0" border="0" width="100%">';
-    $error = 0;
+	print '<table cellspacing="0" style="padding: 4px 4px 4px 0" border="0" width="100%">';
+	$error = 0;
 
-    $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);
 
-    if ($db->connected)
-    {
-        print "<tr><td>";
-        print $langs->trans("ServerConnection")." : ".$conf->db->host.'</td><td><img src="../theme/eldy/img/tick.png" alt="Ok"></td></tr>';
-        $ok = 1;
-    } else {
-        print "<tr><td>Failed to connect to server : ".$conf->db->host.'</td><td><img src="../theme/eldy/img/error.png" alt="Error"></td></tr>';
-    }
+	if ($db->connected)
+	{
+		print "<tr><td>";
+		print $langs->trans("ServerConnection")." : ".$conf->db->host.'</td><td><img src="../theme/eldy/img/tick.png" alt="Ok"></td></tr>';
+		$ok = 1;
+	} else {
+		print "<tr><td>Failed to connect to server : ".$conf->db->host.'</td><td><img src="../theme/eldy/img/error.png" alt="Error"></td></tr>';
+	}
 
-    if ($ok)
-    {
-        if ($db->database_selected)
-        {
-            dolibarr_install_syslog("step2: successful connection to database: ".$conf->db->name);
-        } else {
-            dolibarr_install_syslog("step2: failed connection to database :".$conf->db->name, LOG_ERR);
-            print "<tr><td>Failed to select database ".$conf->db->name.'</td><td><img src="../theme/eldy/img/error.png" alt="Error"></td></tr>';
-            $ok = 0;
-        }
-    }
+	if ($ok)
+	{
+		if ($db->database_selected)
+		{
+			dolibarr_install_syslog("step2: successful connection to database: ".$conf->db->name);
+		} else {
+			dolibarr_install_syslog("step2: failed connection to database :".$conf->db->name, LOG_ERR);
+			print "<tr><td>Failed to select database ".$conf->db->name.'</td><td><img src="../theme/eldy/img/error.png" alt="Error"></td></tr>';
+			$ok = 0;
+		}
+	}
 
 
-    // Affiche version
-    if ($ok)
-    {
-        $version = $db->getVersion();
-        $versionarray = $db->getVersionArray();
-        print '<tr><td>'.$langs->trans("DatabaseVersion").'</td>';
-        print '<td>'.$version.'</td></tr>';
-        //print '<td class="right">'.join('.',$versionarray).'</td></tr>';
+	// Affiche version
+	if ($ok)
+	{
+		$version = $db->getVersion();
+		$versionarray = $db->getVersionArray();
+		print '<tr><td>'.$langs->trans("DatabaseVersion").'</td>';
+		print '<td>'.$version.'</td></tr>';
+		//print '<td class="right">'.join('.',$versionarray).'</td></tr>';
 
-        print '<tr><td>'.$langs->trans("DatabaseName").'</td>';
-        print '<td>'.$db->database_name.'</td></tr>';
-        //print '<td class="right">'.join('.',$versionarray).'</td></tr>';
-    }
+		print '<tr><td>'.$langs->trans("DatabaseName").'</td>';
+		print '<td>'.$db->database_name.'</td></tr>';
+		//print '<td class="right">'.join('.',$versionarray).'</td></tr>';
+	}
 
-    $requestnb = 0;
+	$requestnb = 0;
 
-    // To disable some code, so you can call step2 with url like
-    // http://localhost/dolibarrnew/install/step2.php?action=set&createtables=0&createkeys=0&createfunctions=0&createdata=llx_20_c_departements
-    $createtables = isset($_GET['createtables']) ?GETPOST('createtables') : 1;
-    $createkeys = isset($_GET['createkeys']) ?GETPOST('createkeys') : 1;
-    $createfunctions = isset($_GET['createfunctions']) ?GETPOST('createfunction') : 1;
-    $createdata = isset($_GET['createdata']) ?GETPOST('createdata') : 1;
+	// To disable some code, so you can call step2 with url like
+	// http://localhost/dolibarrnew/install/step2.php?action=set&createtables=0&createkeys=0&createfunctions=0&createdata=llx_20_c_departements
+	$createtables = isset($_GET['createtables']) ?GETPOST('createtables') : 1;
+	$createkeys = isset($_GET['createkeys']) ?GETPOST('createkeys') : 1;
+	$createfunctions = isset($_GET['createfunctions']) ?GETPOST('createfunction') : 1;
+	$createdata = isset($_GET['createdata']) ?GETPOST('createdata') : 1;
 
 
-    // To say sql requests are escaped for mysql so we need to unescape them
-    $db->unescapeslashquot = true;
+	// To say sql requests are escaped for mysql so we need to unescape them
+	$db->unescapeslashquot = true;
 
 
-    /**************************************************************************************
+	/**************************************************************************************
      *
      * Chargement fichiers tables/*.sql (non *.key.sql)
      * A faire avant les fichiers *.key.sql
      *
      ***************************************************************************************/
-    if ($ok && $createtables)
-    {
-        // We always choose in mysql directory (Conversion is done by driver to translate SQL syntax)
-        $dir = "mysql/tables/";
+	if ($ok && $createtables)
+	{
+		// We always choose in mysql directory (Conversion is done by driver to translate SQL syntax)
+		$dir = "mysql/tables/";
 
-        $ok = 0;
-        $handle = opendir($dir);
-        dolibarr_install_syslog("step2: open tables directory ".$dir." handle=".$handle);
-        $tablefound = 0;
-        $tabledata = array();
-        if (is_resource($handle))
-        {
-            while (($file = readdir($handle)) !== false)
-            {
-                if (preg_match('/\.sql$/i', $file) && preg_match('/^llx_/i', $file) && !preg_match('/\.key\.sql$/i', $file))
-                {
-                    $tablefound++;
-                    $tabledata[] = $file;
-                }
-            }
-            closedir($handle);
-        }
+		$ok = 0;
+		$handle = opendir($dir);
+		dolibarr_install_syslog("step2: open tables directory ".$dir." handle=".$handle);
+		$tablefound = 0;
+		$tabledata = array();
+		if (is_resource($handle))
+		{
+			while (($file = readdir($handle)) !== false)
+			{
+				if (preg_match('/\.sql$/i', $file) && preg_match('/^llx_/i', $file) && !preg_match('/\.key\.sql$/i', $file))
+				{
+					$tablefound++;
+					$tabledata[] = $file;
+				}
+			}
+			closedir($handle);
+		}
 
-        // Sort list of sql files on alphabetical order (load order is important)
-        sort($tabledata);
-        foreach ($tabledata as $file)
-        {
-            $name = substr($file, 0, dol_strlen($file) - 4);
-            $buffer = '';
-            $fp = fopen($dir.$file, "r");
-            if ($fp)
-            {
-                while (!feof($fp))
-                {
-                    $buf = fgets($fp, 4096);
-                    if (substr($buf, 0, 2) <> '--')
-                    {
-                        $buf = preg_replace('/--(.+)*/', '', $buf);
-                        $buffer .= $buf;
-                    }
-                }
-                fclose($fp);
+		// Sort list of sql files on alphabetical order (load order is important)
+		sort($tabledata);
+		foreach ($tabledata as $file)
+		{
+			$name = substr($file, 0, dol_strlen($file) - 4);
+			$buffer = '';
+			$fp = fopen($dir.$file, "r");
+			if ($fp)
+			{
+				while (!feof($fp))
+				{
+					$buf = fgets($fp, 4096);
+					if (substr($buf, 0, 2) <> '--')
+					{
+						$buf = preg_replace('/--(.+)*/', '', $buf);
+						$buffer .= $buf;
+					}
+				}
+				fclose($fp);
 
-                $buffer = trim($buffer);
-                if ($conf->db->type == 'mysql' || $conf->db->type == 'mysqli')	// For Mysql 5.5+, we must replace type=innodb with ENGINE=innodb
-                {
-                    $buffer = preg_replace('/type=innodb/i', 'ENGINE=innodb', $buffer);
-                } else {
-                    // Keyword ENGINE is MySQL-specific, so scrub it for
-                    // other database types (mssql, pgsql)
-                    $buffer = preg_replace('/type=innodb/i', '', $buffer);
-                    $buffer = preg_replace('/ENGINE=innodb/i', '', $buffer);
-                }
+				$buffer = trim($buffer);
+				if ($conf->db->type == 'mysql' || $conf->db->type == 'mysqli')	// For Mysql 5.5+, we must replace type=innodb with ENGINE=innodb
+				{
+					$buffer = preg_replace('/type=innodb/i', 'ENGINE=innodb', $buffer);
+				} else {
+					// Keyword ENGINE is MySQL-specific, so scrub it for
+					// other database types (mssql, pgsql)
+					$buffer = preg_replace('/type=innodb/i', '', $buffer);
+					$buffer = preg_replace('/ENGINE=innodb/i', '', $buffer);
+				}
 
-                // Replace the prefix tables
-                if ($dolibarr_main_db_prefix != 'llx_')
-                {
-                	$buffer = preg_replace('/llx_/i', $dolibarr_main_db_prefix, $buffer);
-                }
+				// Replace the prefix tables
+				if ($dolibarr_main_db_prefix != 'llx_')
+				{
+					$buffer = preg_replace('/llx_/i', $dolibarr_main_db_prefix, $buffer);
+				}
 
-                //print "<tr><td>Creation de la table $name/td>";
-                $requestnb++;
+				//print "<tr><td>Creation de la table $name/td>";
+				$requestnb++;
 
-                dolibarr_install_syslog("step2: request: ".$buffer);
-                $resql = $db->query($buffer, 0, 'dml');
-                if ($resql)
-                {
-                    // print "<td>OK requete ==== $buffer</td></tr>";
-                    $db->free($resql);
-                } else {
-                    if ($db->errno() == 'DB_ERROR_TABLE_ALREADY_EXISTS' ||
-                    $db->errno() == 'DB_ERROR_TABLE_OR_KEY_ALREADY_EXISTS')
-                    {
-                        //print "<td>Deja existante</td></tr>";
-                    } else {
-                        print "<tr><td>".$langs->trans("CreateTableAndPrimaryKey", $name);
-                        print "<br>\n".$langs->trans("Request").' '.$requestnb.' : '.$buffer.' <br>Executed query : '.$db->lastquery;
-                        print "\n</td>";
-                        print '<td><span class="error">'.$langs->trans("ErrorSQL")." ".$db->errno()." ".$db->error().'</span></td></tr>';
-                        $error++;
-                    }
-                }
-            } else {
-                print "<tr><td>".$langs->trans("CreateTableAndPrimaryKey", $name);
-                print "</td>";
-                print '<td><span class="error">'.$langs->trans("Error").' Failed to open file '.$dir.$file.'</span></td></tr>';
-                $error++;
-                dolibarr_install_syslog("step2: failed to open file ".$dir.$file, LOG_ERR);
-            }
-        }
+				dolibarr_install_syslog("step2: request: ".$buffer);
+				$resql = $db->query($buffer, 0, 'dml');
+				if ($resql)
+				{
+					// print "<td>OK requete ==== $buffer</td></tr>";
+					$db->free($resql);
+				} else {
+					if ($db->errno() == 'DB_ERROR_TABLE_ALREADY_EXISTS' ||
+					$db->errno() == 'DB_ERROR_TABLE_OR_KEY_ALREADY_EXISTS')
+					{
+						//print "<td>Deja existante</td></tr>";
+					} else {
+						print "<tr><td>".$langs->trans("CreateTableAndPrimaryKey", $name);
+						print "<br>\n".$langs->trans("Request").' '.$requestnb.' : '.$buffer.' <br>Executed query : '.$db->lastquery;
+						print "\n</td>";
+						print '<td><span class="error">'.$langs->trans("ErrorSQL")." ".$db->errno()." ".$db->error().'</span></td></tr>';
+						$error++;
+					}
+				}
+			} else {
+				print "<tr><td>".$langs->trans("CreateTableAndPrimaryKey", $name);
+				print "</td>";
+				print '<td><span class="error">'.$langs->trans("Error").' Failed to open file '.$dir.$file.'</span></td></tr>';
+				$error++;
+				dolibarr_install_syslog("step2: failed to open file ".$dir.$file, LOG_ERR);
+			}
+		}
 
-        if ($tablefound)
-        {
-            if ($error == 0)
-            {
-                print '<tr><td>';
-                print $langs->trans("TablesAndPrimaryKeysCreation").'</td><td><img src="../theme/eldy/img/tick.png" alt="Ok"></td></tr>';
-                $ok = 1;
-            }
-        } else {
-            print '<tr><td>'.$langs->trans("ErrorFailedToFindSomeFiles", $dir).'</td><td><img src="../theme/eldy/img/error.png" alt="Error"></td></tr>';
-            dolibarr_install_syslog("step2: failed to find files to create database in directory ".$dir, LOG_ERR);
-        }
-    }
+		if ($tablefound)
+		{
+			if ($error == 0)
+			{
+				print '<tr><td>';
+				print $langs->trans("TablesAndPrimaryKeysCreation").'</td><td><img src="../theme/eldy/img/tick.png" alt="Ok"></td></tr>';
+				$ok = 1;
+			}
+		} else {
+			print '<tr><td>'.$langs->trans("ErrorFailedToFindSomeFiles", $dir).'</td><td><img src="../theme/eldy/img/error.png" alt="Error"></td></tr>';
+			dolibarr_install_syslog("step2: failed to find files to create database in directory ".$dir, LOG_ERR);
+		}
+	}
 
 
-    /***************************************************************************************
+	/***************************************************************************************
      *
      * Chargement fichiers tables/*.key.sql
      * A faire apres les fichiers *.sql
      *
      ***************************************************************************************/
-    if ($ok && $createkeys)
-    {
-        // We always choose in mysql directory (Conversion is done by driver to translate SQL syntax)
-        $dir = "mysql/tables/";
+	if ($ok && $createkeys)
+	{
+		// We always choose in mysql directory (Conversion is done by driver to translate SQL syntax)
+		$dir = "mysql/tables/";
 
-        $okkeys = 0;
-        $handle = opendir($dir);
-        dolibarr_install_syslog("step2: open keys directory ".$dir." handle=".$handle);
-        $tablefound = 0;
-        $tabledata = array();
-        if (is_resource($handle))
-        {
-            while (($file = readdir($handle)) !== false)
-            {
-                if (preg_match('/\.sql$/i', $file) && preg_match('/^llx_/i', $file) && preg_match('/\.key\.sql$/i', $file))
-                {
-                    $tablefound++;
-                    $tabledata[] = $file;
-                }
-            }
-            closedir($handle);
-        }
+		$okkeys = 0;
+		$handle = opendir($dir);
+		dolibarr_install_syslog("step2: open keys directory ".$dir." handle=".$handle);
+		$tablefound = 0;
+		$tabledata = array();
+		if (is_resource($handle))
+		{
+			while (($file = readdir($handle)) !== false)
+			{
+				if (preg_match('/\.sql$/i', $file) && preg_match('/^llx_/i', $file) && preg_match('/\.key\.sql$/i', $file))
+				{
+					$tablefound++;
+					$tabledata[] = $file;
+				}
+			}
+			closedir($handle);
+		}
 
-        // Sort list of sql files on alphabetical order (load order is important)
-        sort($tabledata);
-        foreach ($tabledata as $file)
-        {
-            $name = substr($file, 0, dol_strlen($file) - 4);
-            //print "<tr><td>Creation de la table $name</td>";
-            $buffer = '';
-            $fp = fopen($dir.$file, "r");
-            if ($fp)
-            {
-                while (!feof($fp))
-                {
-                    $buf = fgets($fp, 4096);
+		// Sort list of sql files on alphabetical order (load order is important)
+		sort($tabledata);
+		foreach ($tabledata as $file)
+		{
+			$name = substr($file, 0, dol_strlen($file) - 4);
+			//print "<tr><td>Creation de la table $name</td>";
+			$buffer = '';
+			$fp = fopen($dir.$file, "r");
+			if ($fp)
+			{
+				while (!feof($fp))
+				{
+					$buf = fgets($fp, 4096);
 
-                    // Special case of lines allowed for some version only
-                    if ($choix == 1 && preg_match('/^--\sV([0-9\.]+)/i', $buf, $reg))
-                    {
-                        $versioncommande = explode('.', $reg[1]);
-                        //print var_dump($versioncommande);
-                        //print var_dump($versionarray);
-                        if (count($versioncommande) && count($versionarray)
-                        && versioncompare($versioncommande, $versionarray) <= 0)
-                        {
-                            // Version qualified, delete SQL comments
-                            $buf = preg_replace('/^--\sV([0-9\.]+)/i', '', $buf);
-                            //print "Ligne $i qualifiee par version: ".$buf.'<br>';
-                        }
-                    }
-                    if ($choix == 2 && preg_match('/^--\sPOSTGRESQL\sV([0-9\.]+)/i', $buf, $reg))
-                    {
-                        $versioncommande = explode('.', $reg[1]);
-                        //print var_dump($versioncommande);
-                        //print var_dump($versionarray);
-                        if (count($versioncommande) && count($versionarray)
-                        && versioncompare($versioncommande, $versionarray) <= 0)
-                        {
-                            // Version qualified, delete SQL comments
-                            $buf = preg_replace('/^--\sPOSTGRESQL\sV([0-9\.]+)/i', '', $buf);
-                            //print "Ligne $i qualifiee par version: ".$buf.'<br>';
-                        }
-                    }
+					// Special case of lines allowed for some version only
+					if ($choix == 1 && preg_match('/^--\sV([0-9\.]+)/i', $buf, $reg))
+					{
+						$versioncommande = explode('.', $reg[1]);
+						//print var_dump($versioncommande);
+						//print var_dump($versionarray);
+						if (count($versioncommande) && count($versionarray)
+						&& versioncompare($versioncommande, $versionarray) <= 0)
+						{
+							// Version qualified, delete SQL comments
+							$buf = preg_replace('/^--\sV([0-9\.]+)/i', '', $buf);
+							//print "Ligne $i qualifiee par version: ".$buf.'<br>';
+						}
+					}
+					if ($choix == 2 && preg_match('/^--\sPOSTGRESQL\sV([0-9\.]+)/i', $buf, $reg))
+					{
+						$versioncommande = explode('.', $reg[1]);
+						//print var_dump($versioncommande);
+						//print var_dump($versionarray);
+						if (count($versioncommande) && count($versionarray)
+						&& versioncompare($versioncommande, $versionarray) <= 0)
+						{
+							// Version qualified, delete SQL comments
+							$buf = preg_replace('/^--\sPOSTGRESQL\sV([0-9\.]+)/i', '', $buf);
+							//print "Ligne $i qualifiee par version: ".$buf.'<br>';
+						}
+					}
 
-                    // Ajout ligne si non commentaire
-                    if (!preg_match('/^--/i', $buf)) $buffer .= $buf;
-                }
-                fclose($fp);
+					// Ajout ligne si non commentaire
+					if (!preg_match('/^--/i', $buf)) $buffer .= $buf;
+				}
+				fclose($fp);
 
-                // Si plusieurs requetes, on boucle sur chaque
-                $listesql = explode(';', $buffer);
-                foreach ($listesql as $req)
-                {
-                    $buffer = trim($req);
-                    if ($buffer)
-                    {
-                    	// Replace the prefix tables
-                    	if ($dolibarr_main_db_prefix != 'llx_')
-                    	{
-                    		$buffer = preg_replace('/llx_/i', $dolibarr_main_db_prefix, $buffer);
-                    	}
+				// Si plusieurs requetes, on boucle sur chaque
+				$listesql = explode(';', $buffer);
+				foreach ($listesql as $req)
+				{
+					$buffer = trim($req);
+					if ($buffer)
+					{
+						// Replace the prefix tables
+						if ($dolibarr_main_db_prefix != 'llx_')
+						{
+							$buffer = preg_replace('/llx_/i', $dolibarr_main_db_prefix, $buffer);
+						}
 
-                        //print "<tr><td>Creation des cles et index de la table $name: '$buffer'</td>";
-                        $requestnb++;
+						//print "<tr><td>Creation des cles et index de la table $name: '$buffer'</td>";
+						$requestnb++;
 
-                        dolibarr_install_syslog("step2: request: ".$buffer);
-                        $resql = $db->query($buffer, 0, 'dml');
-                        if ($resql)
-                        {
-                            //print "<td>OK requete ==== $buffer</td></tr>";
-                            $db->free($resql);
-                        } else {
-                            if ($db->errno() == 'DB_ERROR_KEY_NAME_ALREADY_EXISTS' ||
-                            $db->errno() == 'DB_ERROR_CANNOT_CREATE' ||
-                            $db->errno() == 'DB_ERROR_PRIMARY_KEY_ALREADY_EXISTS' ||
-                            $db->errno() == 'DB_ERROR_TABLE_OR_KEY_ALREADY_EXISTS' ||
-                            preg_match('/duplicate key name/i', $db->error()))
-                            {
-                                //print "<td>Deja existante</td></tr>";
-                                $key_exists = 1;
-                            } else {
-                                print "<tr><td>".$langs->trans("CreateOtherKeysForTable", $name);
-                                print "<br>\n".$langs->trans("Request").' '.$requestnb.' : '.$db->lastqueryerror();
-                                print "\n</td>";
-                                print '<td><span class="error">'.$langs->trans("ErrorSQL")." ".$db->errno()." ".$db->error().'</span></td></tr>';
-                                $error++;
-                            }
-                        }
-                    }
-                }
-            } else {
-                print "<tr><td>".$langs->trans("CreateOtherKeysForTable", $name);
-                print "</td>";
-                print '<td><span class="error">'.$langs->trans("Error")." Failed to open file ".$dir.$file."</span></td></tr>";
-                $error++;
-                dolibarr_install_syslog("step2: failed to open file ".$dir.$file, LOG_ERR);
-            }
-        }
+						dolibarr_install_syslog("step2: request: ".$buffer);
+						$resql = $db->query($buffer, 0, 'dml');
+						if ($resql)
+						{
+							//print "<td>OK requete ==== $buffer</td></tr>";
+							$db->free($resql);
+						} else {
+							if ($db->errno() == 'DB_ERROR_KEY_NAME_ALREADY_EXISTS' ||
+							$db->errno() == 'DB_ERROR_CANNOT_CREATE' ||
+							$db->errno() == 'DB_ERROR_PRIMARY_KEY_ALREADY_EXISTS' ||
+							$db->errno() == 'DB_ERROR_TABLE_OR_KEY_ALREADY_EXISTS' ||
+							preg_match('/duplicate key name/i', $db->error()))
+							{
+								//print "<td>Deja existante</td></tr>";
+								$key_exists = 1;
+							} else {
+								print "<tr><td>".$langs->trans("CreateOtherKeysForTable", $name);
+								print "<br>\n".$langs->trans("Request").' '.$requestnb.' : '.$db->lastqueryerror();
+								print "\n</td>";
+								print '<td><span class="error">'.$langs->trans("ErrorSQL")." ".$db->errno()." ".$db->error().'</span></td></tr>';
+								$error++;
+							}
+						}
+					}
+				}
+			} else {
+				print "<tr><td>".$langs->trans("CreateOtherKeysForTable", $name);
+				print "</td>";
+				print '<td><span class="error">'.$langs->trans("Error")." Failed to open file ".$dir.$file."</span></td></tr>";
+				$error++;
+				dolibarr_install_syslog("step2: failed to open file ".$dir.$file, LOG_ERR);
+			}
+		}
 
-        if ($tablefound && $error == 0)
-        {
-            print '<tr><td>';
-            print $langs->trans("OtherKeysCreation").'</td><td><img src="../theme/eldy/img/tick.png" alt="Ok"></td></tr>';
-            $okkeys = 1;
-        }
-    }
+		if ($tablefound && $error == 0)
+		{
+			print '<tr><td>';
+			print $langs->trans("OtherKeysCreation").'</td><td><img src="../theme/eldy/img/tick.png" alt="Ok"></td></tr>';
+			$okkeys = 1;
+		}
+	}
 
 
-    /***************************************************************************************
+	/***************************************************************************************
      *
      * Chargement fichier functions.sql
      *
      ***************************************************************************************/
-    if ($ok && $createfunctions)
-    {
-        // For this file, we use a directory according to database type
-        if ($choix == 1) $dir = "mysql/functions/";
-        elseif ($choix == 2) $dir = "pgsql/functions/";
-        elseif ($choix == 3) $dir = "mssql/functions/";
+	if ($ok && $createfunctions)
+	{
+		// For this file, we use a directory according to database type
+		if ($choix == 1) $dir = "mysql/functions/";
+		elseif ($choix == 2) $dir = "pgsql/functions/";
+		elseif ($choix == 3) $dir = "mssql/functions/";
 		elseif ($choix == 4) { $dir = "sqlite3/functions/"; }
 
-        // Creation donnees
-        $file = "functions.sql";
-        if (file_exists($dir.$file))
-        {
-            $fp = fopen($dir.$file, "r");
-            dolibarr_install_syslog("step2: open function file ".$dir.$file." handle=".$fp);
-            if ($fp)
-            {
-                $buffer = '';
-                while (!feof($fp))
-                {
-                    $buf = fgets($fp, 4096);
-                    if (substr($buf, 0, 2) <> '--')
-                    {
-                        $buffer .= $buf."§";
-                    }
-                }
-                fclose($fp);
-            }
-            //$buffer=preg_replace('/;\';/',";'§",$buffer);
+		// Creation donnees
+		$file = "functions.sql";
+		if (file_exists($dir.$file))
+		{
+			$fp = fopen($dir.$file, "r");
+			dolibarr_install_syslog("step2: open function file ".$dir.$file." handle=".$fp);
+			if ($fp)
+			{
+				$buffer = '';
+				while (!feof($fp))
+				{
+					$buf = fgets($fp, 4096);
+					if (substr($buf, 0, 2) <> '--')
+					{
+						$buffer .= $buf."§";
+					}
+				}
+				fclose($fp);
+			}
+			//$buffer=preg_replace('/;\';/',";'§",$buffer);
 
-            // If several requests, we loop on each of them
-            $listesql = explode('§', $buffer);
-            foreach ($listesql as $buffer)
-            {
-                $buffer = trim($buffer);
-                if ($buffer)
-                {
-                    // Replace the prefix in table names
-                    if ($dolibarr_main_db_prefix != 'llx_')
-                    {
-                        $buffer = preg_replace('/llx_/i', $dolibarr_main_db_prefix, $buffer);
-                    }
-                    dolibarr_install_syslog("step2: request: ".$buffer);
-                    print "<!-- Insert line : ".$buffer."<br>-->\n";
-                    $resql = $db->query($buffer, 0, 'dml');
-                    if ($resql)
-                    {
-                        $ok = 1;
-                        $db->free($resql);
-                    } else {
-                        if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS'
-                        || $db->errno() == 'DB_ERROR_KEY_NAME_ALREADY_EXISTS')
-                        {
-                            //print "Insert line : ".$buffer."<br>\n";
-                        } else {
-                            $ok = 0;
+			// If several requests, we loop on each of them
+			$listesql = explode('§', $buffer);
+			foreach ($listesql as $buffer)
+			{
+				$buffer = trim($buffer);
+				if ($buffer)
+				{
+					// Replace the prefix in table names
+					if ($dolibarr_main_db_prefix != 'llx_')
+					{
+						$buffer = preg_replace('/llx_/i', $dolibarr_main_db_prefix, $buffer);
+					}
+					dolibarr_install_syslog("step2: request: ".$buffer);
+					print "<!-- Insert line : ".$buffer."<br>-->\n";
+					$resql = $db->query($buffer, 0, 'dml');
+					if ($resql)
+					{
+						$ok = 1;
+						$db->free($resql);
+					} else {
+						if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS'
+						|| $db->errno() == 'DB_ERROR_KEY_NAME_ALREADY_EXISTS')
+						{
+							//print "Insert line : ".$buffer."<br>\n";
+						} else {
+							$ok = 0;
 
-                            print "<tr><td>".$langs->trans("FunctionsCreation");
-                            print "<br>\n".$langs->trans("Request").' '.$requestnb.' : '.$buffer;
-                            print "\n</td>";
-                            print '<td><span class="error">'.$langs->trans("ErrorSQL")." ".$db->errno()." ".$db->error().'</span></td></tr>';
-                            $error++;
-                        }
-                    }
-                }
-            }
+							print "<tr><td>".$langs->trans("FunctionsCreation");
+							print "<br>\n".$langs->trans("Request").' '.$requestnb.' : '.$buffer;
+							print "\n</td>";
+							print '<td><span class="error">'.$langs->trans("ErrorSQL")." ".$db->errno()." ".$db->error().'</span></td></tr>';
+							$error++;
+						}
+					}
+				}
+			}
 
-            print "<tr><td>".$langs->trans("FunctionsCreation")."</td>";
-            if ($ok)
-            {
-                print '<td><img src="../theme/eldy/img/tick.png" alt="Ok"></td></tr>';
-            } else {
-                print '<td><img src="../theme/eldy/img/error.png" alt="Error"></td></tr>';
-                $ok = 1;
-            }
-        }
-    }
+			print "<tr><td>".$langs->trans("FunctionsCreation")."</td>";
+			if ($ok)
+			{
+				print '<td><img src="../theme/eldy/img/tick.png" alt="Ok"></td></tr>';
+			} else {
+				print '<td><img src="../theme/eldy/img/error.png" alt="Error"></td></tr>';
+				$ok = 1;
+			}
+		}
+	}
 
 
-    /***************************************************************************************
+	/***************************************************************************************
      *
      * Load files data/*.sql
      *
      ***************************************************************************************/
-    if ($ok && $createdata)
-    {
-        // We always choose in mysql directory (Conversion is done by driver to translate SQL syntax)
-        $dir = "mysql/data/";
+	if ($ok && $createdata)
+	{
+		// We always choose in mysql directory (Conversion is done by driver to translate SQL syntax)
+		$dir = "mysql/data/";
 
-        // Insert data
-        $handle = opendir($dir);
-        dolibarr_install_syslog("step2: open directory data ".$dir." handle=".$handle);
-        $tablefound = 0;
-        $tabledata = array();
-        if (is_resource($handle))
-        {
-            while (($file = readdir($handle)) !== false)
-            {
-                if (preg_match('/\.sql$/i', $file) && preg_match('/^llx_/i', $file))
-                {
-                	if (preg_match('/^llx_accounting_account_/', $file)) continue; // We discard data file of chart of account. Will be loaded when a chart is selected.
+		// Insert data
+		$handle = opendir($dir);
+		dolibarr_install_syslog("step2: open directory data ".$dir." handle=".$handle);
+		$tablefound = 0;
+		$tabledata = array();
+		if (is_resource($handle))
+		{
+			while (($file = readdir($handle)) !== false)
+			{
+				if (preg_match('/\.sql$/i', $file) && preg_match('/^llx_/i', $file))
+				{
+					if (preg_match('/^llx_accounting_account_/', $file)) continue; // We discard data file of chart of account. Will be loaded when a chart is selected.
 
-                    //print 'x'.$file.'-'.$createdata.'<br>';
-                    if (is_numeric($createdata) || preg_match('/'.preg_quote($createdata).'/i', $file))
-                    {
-                        $tablefound++;
-                        $tabledata[] = $file;
-                    }
-                }
-            }
-            closedir($handle);
-        }
+					//print 'x'.$file.'-'.$createdata.'<br>';
+					if (is_numeric($createdata) || preg_match('/'.preg_quote($createdata).'/i', $file))
+					{
+						$tablefound++;
+						$tabledata[] = $file;
+					}
+				}
+			}
+			closedir($handle);
+		}
 
-        // Sort list of data files on alphabetical order (load order is important)
-        sort($tabledata);
-        foreach ($tabledata as $file)
-        {
-            $name = substr($file, 0, dol_strlen($file) - 4);
-            $fp = fopen($dir.$file, "r");
-            dolibarr_install_syslog("step2: open data file ".$dir.$file." handle=".$fp);
-            if ($fp)
-            {
-                $arrayofrequests = array();
-                $linefound = 0;
-                $linegroup = 0;
-                $sizeofgroup = 1; // Grouping request to have 1 query for several requests does not works with mysql, so we use 1.
+		// Sort list of data files on alphabetical order (load order is important)
+		sort($tabledata);
+		foreach ($tabledata as $file)
+		{
+			$name = substr($file, 0, dol_strlen($file) - 4);
+			$fp = fopen($dir.$file, "r");
+			dolibarr_install_syslog("step2: open data file ".$dir.$file." handle=".$fp);
+			if ($fp)
+			{
+				$arrayofrequests = array();
+				$linefound = 0;
+				$linegroup = 0;
+				$sizeofgroup = 1; // Grouping request to have 1 query for several requests does not works with mysql, so we use 1.
 
-                // Load all requests
-                while (!feof($fp))
-                {
-                    $buffer = fgets($fp, 4096);
-                    $buffer = trim($buffer);
-                    if ($buffer)
-                    {
-                        if (substr($buffer, 0, 2) == '--') continue;
+				// Load all requests
+				while (!feof($fp))
+				{
+					$buffer = fgets($fp, 4096);
+					$buffer = trim($buffer);
+					if ($buffer)
+					{
+						if (substr($buffer, 0, 2) == '--') continue;
 
-                        if ($linefound && ($linefound % $sizeofgroup) == 0)
-                        {
-                            $linegroup++;
-                        }
-                        if (empty($arrayofrequests[$linegroup])) $arrayofrequests[$linegroup] = $buffer;
-                        else $arrayofrequests[$linegroup] .= " ".$buffer;
+						if ($linefound && ($linefound % $sizeofgroup) == 0)
+						{
+							$linegroup++;
+						}
+						if (empty($arrayofrequests[$linegroup])) $arrayofrequests[$linegroup] = $buffer;
+						else $arrayofrequests[$linegroup] .= " ".$buffer;
 
-                        $linefound++;
-                    }
-                }
-                fclose($fp);
+						$linefound++;
+					}
+				}
+				fclose($fp);
 
-                dolibarr_install_syslog("step2: found ".$linefound." records, defined ".count($arrayofrequests)." group(s).");
+				dolibarr_install_syslog("step2: found ".$linefound." records, defined ".count($arrayofrequests)." group(s).");
 
-                $okallfile = 1;
-                $db->begin();
+				$okallfile = 1;
+				$db->begin();
 
-                // We loop on each requests of file
-                foreach ($arrayofrequests as $buffer)
-                {
-                	// Replace the prefix tables
-                	if ($dolibarr_main_db_prefix != 'llx_')
-                	{
-                		$buffer = preg_replace('/llx_/i', $dolibarr_main_db_prefix, $buffer);
-                	}
+				// We loop on each requests of file
+				foreach ($arrayofrequests as $buffer)
+				{
+					// Replace the prefix tables
+					if ($dolibarr_main_db_prefix != 'llx_')
+					{
+						$buffer = preg_replace('/llx_/i', $dolibarr_main_db_prefix, $buffer);
+					}
 
-                    //dolibarr_install_syslog("step2: request: " . $buffer);
-                    $resql = $db->query($buffer, 1);
-                    if ($resql)
-                    {
-                        //$db->free($resql);     // Not required as request we launch here does not return memory needs.
-                    } else {
-                        if ($db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
-                        {
-                            //print "<tr><td>Insertion ligne : $buffer</td><td>";
-                        } else {
-                            $ok = 0;
-                            $okallfile = 0;
-                            print '<span class="error">'.$langs->trans("ErrorSQL")." : ".$db->lasterrno()." - ".$db->lastqueryerror()." - ".$db->lasterror()."</span><br>";
-                        }
-                    }
-                }
+					//dolibarr_install_syslog("step2: request: " . $buffer);
+					$resql = $db->query($buffer, 1);
+					if ($resql)
+					{
+						//$db->free($resql);     // Not required as request we launch here does not return memory needs.
+					} else {
+						if ($db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
+						{
+							//print "<tr><td>Insertion ligne : $buffer</td><td>";
+						} else {
+							$ok = 0;
+							$okallfile = 0;
+							print '<span class="error">'.$langs->trans("ErrorSQL")." : ".$db->lasterrno()." - ".$db->lastqueryerror()." - ".$db->lasterror()."</span><br>";
+						}
+					}
+				}
 
-                if ($okallfile) $db->commit();
-                else $db->rollback();
-            }
-        }
+				if ($okallfile) $db->commit();
+				else $db->rollback();
+			}
+		}
 
-        print "<tr><td>".$langs->trans("ReferenceDataLoading")."</td>";
-        if ($ok)
-        {
-            print '<td><img src="../theme/eldy/img/tick.png" alt="Ok"></td></tr>';
-        } else {
-            print '<td><img src="../theme/eldy/img/error.png" alt="Error"></td></tr>';
-            $ok = 1; // Data loading are not blocking errors
-        }
-    }
-    print '</table>';
+		print "<tr><td>".$langs->trans("ReferenceDataLoading")."</td>";
+		if ($ok)
+		{
+			print '<td><img src="../theme/eldy/img/tick.png" alt="Ok"></td></tr>';
+		} else {
+			print '<td><img src="../theme/eldy/img/error.png" alt="Error"></td></tr>';
+			$ok = 1; // Data loading are not blocking errors
+		}
+	}
+	print '</table>';
 } else {
-    print 'Parameter action=set not defined';
+	print 'Parameter action=set not defined';
 }
 
 
diff --git a/htdocs/install/step4.php b/htdocs/install/step4.php
index b780f9d3b0f..ca188ae4d5b 100644
--- a/htdocs/install/step4.php
+++ b/htdocs/install/step4.php
@@ -62,9 +62,9 @@ pHeader($langs->trans("AdminAccountCreation"), "step5");
 // Test if we can run a first install process
 if (!is_writable($conffile))
 {
-    print $langs->trans("ConfFileIsNotWritable", $conffiletoshow);
-    pFooter(1, $setuplang, 'jscheckparam');
-    exit;
+	print $langs->trans("ConfFileIsNotWritable", $conffiletoshow);
+	pFooter(1, $setuplang, 'jscheckparam');
+	exit;
 }
 
 
@@ -79,36 +79,36 @@ $db = getDoliDBInstance($conf->db->type, $conf->db->host, $conf->db->user, $conf
 
 if ($db->ok)
 {
-    print '<tr><td><label for="login">'.$langs->trans("Login").' :</label></td><td>';
+	print '<tr><td><label for="login">'.$langs->trans("Login").' :</label></td><td>';
 	print '<input id="login" name="login" type="text" value="'.(!empty($_GET["login"]) ? GETPOST("login", 'alpha') : (isset($force_install_dolibarrlogin) ? $force_install_dolibarrlogin : '')).'"'.(@$force_install_noedit == 2 && $force_install_dolibarrlogin !== null ? ' disabled' : '').'></td></tr>';
-    print '<tr><td><label for="pass">'.$langs->trans("Password").' :</label></td><td>';
-    print '<input type="password" id="pass" name="pass" autocomplete="new-password"></td></tr>';
-    print '<tr><td><label for="pass_verif">'.$langs->trans("PasswordAgain").' :</label></td><td>';
-    print '<input type="password" id="pass_verif" name="pass_verif" autocomplete="new-password"></td></tr>';
-    print '</table>';
+	print '<tr><td><label for="pass">'.$langs->trans("Password").' :</label></td><td>';
+	print '<input type="password" id="pass" name="pass" autocomplete="new-password"></td></tr>';
+	print '<tr><td><label for="pass_verif">'.$langs->trans("PasswordAgain").' :</label></td><td>';
+	print '<input type="password" id="pass_verif" name="pass_verif" autocomplete="new-password"></td></tr>';
+	print '</table>';
 
-    if (isset($_GET["error"]) && $_GET["error"] == 1)
-    {
-        print '<br>';
-        print '<div class="error">'.$langs->trans("PasswordsMismatch").'</div>';
-        $error = 0; // We show button
-    }
+	if (isset($_GET["error"]) && $_GET["error"] == 1)
+	{
+		print '<br>';
+		print '<div class="error">'.$langs->trans("PasswordsMismatch").'</div>';
+		$error = 0; // We show button
+	}
 
-    if (isset($_GET["error"]) && $_GET["error"] == 2)
-    {
-        print '<br>';
-        print '<div class="error">';
-        print $langs->trans("PleaseTypePassword");
-        print '</div>';
-        $error = 0; // We show button
-    }
+	if (isset($_GET["error"]) && $_GET["error"] == 2)
+	{
+		print '<br>';
+		print '<div class="error">';
+		print $langs->trans("PleaseTypePassword");
+		print '</div>';
+		$error = 0; // We show button
+	}
 
-    if (isset($_GET["error"]) && $_GET["error"] == 3)
-    {
-        print '<br>';
-        print '<div class="error">'.$langs->trans("PleaseTypeALogin").'</div>';
-        $error = 0; // We show button
-    }
+	if (isset($_GET["error"]) && $_GET["error"] == 3)
+	{
+		print '<br>';
+		print '<div class="error">'.$langs->trans("PleaseTypeALogin").'</div>';
+		$error = 0; // We show button
+	}
 }
 
 $ret = 0;
diff --git a/htdocs/install/upgrade.php b/htdocs/install/upgrade.php
index af05fb374d2..a7addd98547 100644
--- a/htdocs/install/upgrade.php
+++ b/htdocs/install/upgrade.php
@@ -39,7 +39,7 @@
 include_once 'inc.php';
 if (!file_exists($conffile))
 {
-    print 'Error: Dolibarr config file was not found. This may means that Dolibarr is not installed yet. Please call the page "/install/index.php" instead of "/install/upgrade.php").';
+	print 'Error: Dolibarr config file was not found. This may means that Dolibarr is not installed yet. Please call the page "/install/index.php" instead of "/install/upgrade.php").';
 }
 require_once $conffile;
 require_once $dolibarr_main_document_root.'/core/lib/admin.lib.php';
@@ -104,106 +104,106 @@ $actiondone = 0;
 // Action to launch the migrate script
 if (!GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'aZ09')))
 {
-    $actiondone = 1;
+	$actiondone = 1;
 
-    print '<h3><img class="valigntextbottom" src="../theme/common/octicons/build/svg/database.svg" width="20" alt="Database"> '.$langs->trans("DatabaseMigration").'</h3>';
+	print '<h3><img class="valigntextbottom" src="../theme/common/octicons/build/svg/database.svg" width="20" alt="Database"> '.$langs->trans("DatabaseMigration").'</h3>';
 
-    print '<table cellspacing="0" cellpadding="1" border="0" width="100%">';
-    $error = 0;
+	print '<table cellspacing="0" cellpadding="1" border="0" width="100%">';
+	$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 is already instancied inside inc.php
-    $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 is already instancied inside inc.php
+	$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;
 
-    // Load type and crypt key
-    if (empty($dolibarr_main_db_encryption)) $dolibarr_main_db_encryption = 0;
-    $conf->db->dolibarr_main_db_encryption = $dolibarr_main_db_encryption;
-    if (empty($dolibarr_main_db_cryptkey)) $dolibarr_main_db_cryptkey = '';
-    $conf->db->dolibarr_main_db_cryptkey = $dolibarr_main_db_cryptkey;
+	// Load type and crypt key
+	if (empty($dolibarr_main_db_encryption)) $dolibarr_main_db_encryption = 0;
+	$conf->db->dolibarr_main_db_encryption = $dolibarr_main_db_encryption;
+	if (empty($dolibarr_main_db_cryptkey)) $dolibarr_main_db_cryptkey = '';
+	$conf->db->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);
 
-    if ($db->connected)
-    {
-        print '<tr><td class="nowrap">';
-        print $langs->trans("ServerConnection")." : $dolibarr_main_db_host</td><td align=\"right\">".$langs->trans("OK")."</td></tr>\n";
-        dolibarr_install_syslog("upgrade: ".$langs->transnoentities("ServerConnection").": $dolibarr_main_db_host ".$langs->transnoentities("OK"));
-        $ok = 1;
-    } else {
-        print "<tr><td>".$langs->trans("ErrorFailedToConnectToDatabase", $dolibarr_main_db_name)."</td><td align=\"right\">".$langs->transnoentities("Error")."</td></tr>\n";
-        dolibarr_install_syslog("upgrade: ".$langs->transnoentities("ErrorFailedToConnectToDatabase", $dolibarr_main_db_name));
-        $ok = 0;
-    }
+	if ($db->connected)
+	{
+		print '<tr><td class="nowrap">';
+		print $langs->trans("ServerConnection")." : ".$dolibarr_main_db_host.'</td><td class="right">'.$langs->trans("OK").'</td></tr>'."\n";
+		dolibarr_install_syslog("upgrade: ".$langs->transnoentities("ServerConnection").": $dolibarr_main_db_host ".$langs->transnoentities("OK"));
+		$ok = 1;
+	} else {
+		print "<tr><td>".$langs->trans("ErrorFailedToConnectToDatabase", $dolibarr_main_db_name).'</td><td class="right">'.$langs->transnoentities("Error")."</td></tr>\n";
+		dolibarr_install_syslog("upgrade: ".$langs->transnoentities("ErrorFailedToConnectToDatabase", $dolibarr_main_db_name));
+		$ok = 0;
+	}
 
-    if ($ok)
-    {
-        if ($db->database_selected)
-        {
-            print '<tr><td class="nowrap">';
-            print $langs->trans("DatabaseConnection")." : ".$dolibarr_main_db_name."</td><td align=\"right\">".$langs->trans("OK")."</td></tr>\n";
-            dolibarr_install_syslog("upgrade: Database connection successful: ".$dolibarr_main_db_name);
-            $ok = 1;
-        } else {
-            print "<tr><td>".$langs->trans("ErrorFailedToConnectToDatabase", $dolibarr_main_db_name)."</td><td align=\"right\">".$langs->trans("Error")."</td></tr>\n";
-            dolibarr_install_syslog("upgrade: ".$langs->transnoentities("ErrorFailedToConnectToDatabase", $dolibarr_main_db_name));
-            $ok = 0;
-        }
-    }
+	if ($ok)
+	{
+		if ($db->database_selected)
+		{
+			print '<tr><td class="nowrap">';
+			print $langs->trans("DatabaseConnection")." : ".$dolibarr_main_db_name.'</td><td class="right">'.$langs->trans("OK")."</td></tr>\n";
+			dolibarr_install_syslog("upgrade: Database connection successful: ".$dolibarr_main_db_name);
+			$ok = 1;
+		} else {
+			print "<tr><td>".$langs->trans("ErrorFailedToConnectToDatabase", $dolibarr_main_db_name).'</td><td class="right">'.$langs->trans("Error")."</td></tr>\n";
+			dolibarr_install_syslog("upgrade: ".$langs->transnoentities("ErrorFailedToConnectToDatabase", $dolibarr_main_db_name));
+			$ok = 0;
+		}
+	}
 
-    // Affiche version
-    if ($ok)
-    {
-        $version = $db->getVersion();
-        $versionarray = $db->getVersionArray();
-        print '<tr><td>'.$langs->trans("ServerVersion").'</td>';
-        print '<td class="right">'.$version.'</td></tr>';
-        dolibarr_install_syslog("upgrade: ".$langs->transnoentities("ServerVersion").": ".$version);
-        if ($db->type == 'mysqli' && function_exists('mysqli_get_charset'))
-        {
-        	$tmparray = $db->db->get_charset();
-        	print '<tr><td>'.$langs->trans("ClientCharset").'</td>';
-        	print '<td class="right">'.$tmparray->charset.'</td></tr>';
-        	dolibarr_install_syslog("upgrade: ".$langs->transnoentities("ClientCharset").": ".$tmparray->charset);
-        	print '<tr><td>'.$langs->trans("ClientSortingCharset").'</td>';
-        	print '<td class="right">'.$tmparray->collation.'</td></tr>';
-        	dolibarr_install_syslog("upgrade: ".$langs->transnoentities("ClientCollation").": ".$tmparray->collation);
-        }
+	// Affiche version
+	if ($ok)
+	{
+		$version = $db->getVersion();
+		$versionarray = $db->getVersionArray();
+		print '<tr><td>'.$langs->trans("ServerVersion").'</td>';
+		print '<td class="right">'.$version.'</td></tr>';
+		dolibarr_install_syslog("upgrade: ".$langs->transnoentities("ServerVersion").": ".$version);
+		if ($db->type == 'mysqli' && function_exists('mysqli_get_charset'))
+		{
+			$tmparray = $db->db->get_charset();
+			print '<tr><td>'.$langs->trans("ClientCharset").'</td>';
+			print '<td class="right">'.$tmparray->charset.'</td></tr>';
+			dolibarr_install_syslog("upgrade: ".$langs->transnoentities("ClientCharset").": ".$tmparray->charset);
+			print '<tr><td>'.$langs->trans("ClientSortingCharset").'</td>';
+			print '<td class="right">'.$tmparray->collation.'</td></tr>';
+			dolibarr_install_syslog("upgrade: ".$langs->transnoentities("ClientCollation").": ".$tmparray->collation);
+		}
 
-        // Test database version requirement
-        $versionmindb = explode('.', $db::VERSIONMIN);
-        //print join('.',$versionarray).' - '.join('.',$versionmindb);
-        if (count($versionmindb) && count($versionarray)
-        	&& versioncompare($versionarray, $versionmindb) < 0)
-        {
-        	// Warning: database version too low.
-        	print "<tr><td>".$langs->trans("ErrorDatabaseVersionTooLow", join('.', $versionarray), join('.', $versionmindb))."</td><td class=\"right\">".$langs->trans("Error")."</td></tr>\n";
-        	dolibarr_install_syslog("upgrade: ".$langs->transnoentities("ErrorDatabaseVersionTooLow", join('.', $versionarray), join('.', $versionmindb)));
-        	$ok = 0;
-        }
+		// Test database version requirement
+		$versionmindb = explode('.', $db::VERSIONMIN);
+		//print join('.',$versionarray).' - '.join('.',$versionmindb);
+		if (count($versionmindb) && count($versionarray)
+			&& versioncompare($versionarray, $versionmindb) < 0)
+		{
+			// Warning: database version too low.
+			print "<tr><td>".$langs->trans("ErrorDatabaseVersionTooLow", join('.', $versionarray), join('.', $versionmindb))."</td><td class=\"right\">".$langs->trans("Error")."</td></tr>\n";
+			dolibarr_install_syslog("upgrade: ".$langs->transnoentities("ErrorDatabaseVersionTooLow", join('.', $versionarray), join('.', $versionmindb)));
+			$ok = 0;
+		}
 
-        // Test database version is not forbidden for migration
-        if (empty($ignoredbversion))
-        {
+		// Test database version is not forbidden for migration
+		if (empty($ignoredbversion))
+		{
 			$dbversion_disallowed = array(
 				array('type'=>'mysql', 'version'=>array(5, 5, 40)),
 				array('type'=>'mysqli', 'version'=>array(5, 5, 40)) //,
@@ -217,196 +217,196 @@ if (!GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'aZ
 			}
 			foreach ($dbversion_disallowed as $dbversion_totest)
 			{
-		        //print $db->type.' - '.join('.',$versionarray).' - '.versioncompare($dbversion_totest['version'],$versionarray)."<br>\n";
-		        if ($dbversion_totest['type'] == $db->type
-		        	&& (versioncompare($dbversion_totest['version'], $versionarray) == 0 || versioncompare($dbversion_totest['version'], $versionarray) <= -4 || versioncompare($dbversion_totest['version'], $versionarray) >= 4)
-		        )
-		        {
-		        	// Warning: database version too low.
-		        	print '<tr><td><div class="warning">'.$langs->trans("ErrorDatabaseVersionForbiddenForMigration", join('.', $versionarray), $listofforbiddenversion)."</div></td><td class=\"right\">".$langs->trans("Error")."</td></tr>\n";
-		        	dolibarr_install_syslog("upgrade: ".$langs->transnoentities("ErrorDatabaseVersionForbiddenForMigration", join('.', $versionarray), $listofforbiddenversion));
-		        	$ok = 0;
-		        	break;
-		        }
+				//print $db->type.' - '.join('.',$versionarray).' - '.versioncompare($dbversion_totest['version'],$versionarray)."<br>\n";
+				if ($dbversion_totest['type'] == $db->type
+					&& (versioncompare($dbversion_totest['version'], $versionarray) == 0 || versioncompare($dbversion_totest['version'], $versionarray) <= -4 || versioncompare($dbversion_totest['version'], $versionarray) >= 4)
+				)
+				{
+					// Warning: database version too low.
+					print '<tr><td><div class="warning">'.$langs->trans("ErrorDatabaseVersionForbiddenForMigration", join('.', $versionarray), $listofforbiddenversion)."</div></td><td class=\"right\">".$langs->trans("Error")."</td></tr>\n";
+					dolibarr_install_syslog("upgrade: ".$langs->transnoentities("ErrorDatabaseVersionForbiddenForMigration", join('.', $versionarray), $listofforbiddenversion));
+					$ok = 0;
+					break;
+				}
 			}
-        }
-    }
+		}
+	}
 
-    // Force l'affichage de la progression
-    if ($ok)
-    {
-	    print '<tr><td colspan="2">'.$langs->trans("PleaseBePatient").'</td></tr>';
-	    flush();
-    }
+	// Force l'affichage de la progression
+	if ($ok)
+	{
+		print '<tr><td colspan="2">'.$langs->trans("PleaseBePatient").'</td></tr>';
+		flush();
+	}
 
 
 	/*
 	 * Remove deprecated indexes and constraints for Mysql
 	 */
-    if ($ok && preg_match('/mysql/', $db->type))
-    {
-        $versioncommande = array(4, 0, 0);
-        if (count($versioncommande) && count($versionarray)
-        && versioncompare($versioncommande, $versionarray) <= 0)	// Si mysql >= 4.0
-        {
-        	dolibarr_install_syslog("Clean database from bad named constraints");
+	if ($ok && preg_match('/mysql/', $db->type))
+	{
+		$versioncommande = array(4, 0, 0);
+		if (count($versioncommande) && count($versionarray)
+		&& versioncompare($versioncommande, $versionarray) <= 0)	// Si mysql >= 4.0
+		{
+			dolibarr_install_syslog("Clean database from bad named constraints");
 
-            // Suppression vieilles contraintes sans noms et en doubles
-            // Les contraintes indesirables ont un nom qui commence par 0_ ou se termine par ibfk_999
-            $listtables = array(
-            					MAIN_DB_PREFIX.'adherent_options',
-            					MAIN_DB_PREFIX.'bank_class',
-            					MAIN_DB_PREFIX.'c_ecotaxe',
-            					MAIN_DB_PREFIX.'c_methode_commande_fournisseur', // table renamed
-    		                    MAIN_DB_PREFIX.'c_input_method'
-            );
+			// Suppression vieilles contraintes sans noms et en doubles
+			// Les contraintes indesirables ont un nom qui commence par 0_ ou se termine par ibfk_999
+			$listtables = array(
+								MAIN_DB_PREFIX.'adherent_options',
+								MAIN_DB_PREFIX.'bank_class',
+								MAIN_DB_PREFIX.'c_ecotaxe',
+								MAIN_DB_PREFIX.'c_methode_commande_fournisseur', // table renamed
+								MAIN_DB_PREFIX.'c_input_method'
+			);
 
-            $listtables = $db->DDLListTables($conf->db->name, '');
-            foreach ($listtables as $val)
-            {
-            	// Database prefix filter
-            	if (preg_match('/^'.MAIN_DB_PREFIX.'/', $val))
-            	{
-            		//print "x".$val."<br>";
-            		$sql = "SHOW CREATE TABLE ".$val;
-            		$resql = $db->query($sql);
-            		if ($resql)
-            		{
-            			$values = $db->fetch_array($resql);
-            			$i = 0;
-            			$createsql = $values[1];
-            			while (preg_match('/CONSTRAINT `(0_[0-9a-zA-Z]+|[_0-9a-zA-Z]+_ibfk_[0-9]+)`/i', $createsql, $reg) && $i < 100)
-            			{
-            				$sqldrop = "ALTER TABLE ".$val." DROP FOREIGN KEY ".$reg[1];
-            				$resqldrop = $db->query($sqldrop);
-            				if ($resqldrop)
-            				{
-            					print '<tr><td colspan="2">'.$sqldrop.";</td></tr>\n";
-            				}
-            				$createsql = preg_replace('/CONSTRAINT `'.$reg[1].'`/i', 'XXX', $createsql);
-            				$i++;
-            			}
-            			$db->free($resql);
-            		} else {
-            			if ($db->lasterrno() != 'DB_ERROR_NOSUCHTABLE')
-            			{
-            				print '<tr><td colspan="2"><span class="error">'.$sql.' : '.$db->lasterror()."</font></td></tr>\n";
-            			}
-            		}
-            	}
-            }
-        }
-    }
+			$listtables = $db->DDLListTables($conf->db->name, '');
+			foreach ($listtables as $val)
+			{
+				// Database prefix filter
+				if (preg_match('/^'.MAIN_DB_PREFIX.'/', $val))
+				{
+					//print "x".$val."<br>";
+					$sql = "SHOW CREATE TABLE ".$val;
+					$resql = $db->query($sql);
+					if ($resql)
+					{
+						$values = $db->fetch_array($resql);
+						$i = 0;
+						$createsql = $values[1];
+						while (preg_match('/CONSTRAINT `(0_[0-9a-zA-Z]+|[_0-9a-zA-Z]+_ibfk_[0-9]+)`/i', $createsql, $reg) && $i < 100)
+						{
+							$sqldrop = "ALTER TABLE ".$val." DROP FOREIGN KEY ".$reg[1];
+							$resqldrop = $db->query($sqldrop);
+							if ($resqldrop)
+							{
+								print '<tr><td colspan="2">'.$sqldrop.";</td></tr>\n";
+							}
+							$createsql = preg_replace('/CONSTRAINT `'.$reg[1].'`/i', 'XXX', $createsql);
+							$i++;
+						}
+						$db->free($resql);
+					} else {
+						if ($db->lasterrno() != 'DB_ERROR_NOSUCHTABLE')
+						{
+							print '<tr><td colspan="2"><span class="error">'.$sql.' : '.$db->lasterror()."</font></td></tr>\n";
+						}
+					}
+				}
+			}
+		}
+	}
 
-    /*
+	/*
      *	Load sql files
      */
-    if ($ok)
-    {
-        $dir = "mysql/migration/"; // We use mysql migration scripts whatever is database driver
+	if ($ok)
+	{
+		$dir = "mysql/migration/"; // We use mysql migration scripts whatever is database driver
 		if (!empty($dirmodule)) $dir = dol_buildpath('/'.$dirmodule.'/sql/', 0);
 		dolibarr_install_syslog("Scan sql files for migration files in ".$dir);
 
 		// Clean last part to exclude minor version x.y.z -> x.y
-        $newversionfrom = preg_replace('/(\.[0-9]+)$/i', '.0', $versionfrom);
-        $newversionto = preg_replace('/(\.[0-9]+)$/i', '.0', $versionto);
+		$newversionfrom = preg_replace('/(\.[0-9]+)$/i', '.0', $versionfrom);
+		$newversionto = preg_replace('/(\.[0-9]+)$/i', '.0', $versionto);
 
-        $filelist = array();
-        $i = 0;
-        $ok = 0;
-        $from = '^'.$newversionfrom;
-        $to = $newversionto.'\.sql$';
+		$filelist = array();
+		$i = 0;
+		$ok = 0;
+		$from = '^'.$newversionfrom;
+		$to = $newversionto.'\.sql$';
 
-        // Get files list
-        $filesindir = array();
-        $handle = opendir($dir);
-        if (is_resource($handle))
-        {
-            while (($file = readdir($handle)) !== false)
-            {
-            	if (preg_match('/\.sql$/i', $file)) $filesindir[] = $file;
-            }
-            sort($filesindir);
-        } else {
-            print '<div class="error">'.$langs->trans("ErrorCanNotReadDir", $dir).'</div>';
-        }
+		// Get files list
+		$filesindir = array();
+		$handle = opendir($dir);
+		if (is_resource($handle))
+		{
+			while (($file = readdir($handle)) !== false)
+			{
+				if (preg_match('/\.sql$/i', $file)) $filesindir[] = $file;
+			}
+			sort($filesindir);
+		} else {
+			print '<div class="error">'.$langs->trans("ErrorCanNotReadDir", $dir).'</div>';
+		}
 
-        // Define which file to run
-        foreach ($filesindir as $file)
-        {
-            if (preg_match('/'.$from.'/i', $file))
-            {
-                $filelist[] = $file;
-            } elseif (preg_match('/'.$to.'/i', $file))	// First test may be false if we migrate from x.y.* to x.y.*
-            {
-                $filelist[] = $file;
-            }
-        }
+		// Define which file to run
+		foreach ($filesindir as $file)
+		{
+			if (preg_match('/'.$from.'/i', $file))
+			{
+				$filelist[] = $file;
+			} elseif (preg_match('/'.$to.'/i', $file))	// First test may be false if we migrate from x.y.* to x.y.*
+			{
+				$filelist[] = $file;
+			}
+		}
 
-        if (count($filelist) == 0)
-        {
-        	print '<div class="error">'.$langs->trans("ErrorNoMigrationFilesFoundForParameters").'</div>';
-        } else {
+		if (count($filelist) == 0)
+		{
+			print '<div class="error">'.$langs->trans("ErrorNoMigrationFilesFoundForParameters").'</div>';
+		} else {
 			$listoffileprocessed = array(); // Protection to avoid to process twice the same file
 
-	        // Loop on each migrate files
-	        foreach ($filelist as $file)
-	        {
-	        	if (in_array($dir.$file, $listoffileprocessed)) continue;
+			// Loop on each migrate files
+			foreach ($filelist as $file)
+			{
+				if (in_array($dir.$file, $listoffileprocessed)) continue;
 
-	        	print '<tr><td colspan="2"><hr></td></tr>';
-	            print '<tr><td class="nowrap">'.$langs->trans("ChoosedMigrateScript").'</td><td class="right">'.$file.'</td></tr>'."\n";
+				print '<tr><td colspan="2"><hr style="border-color: #ccc; border-top-style: none;"></td></tr>';
+				print '<tr><td class="nowrap">'.$langs->trans("ChoosedMigrateScript").'</td><td class="right">'.$file.'</td></tr>'."\n";
 
-	            // Run sql script
-	            $ok = run_sql($dir.$file, 0, '', 1);
-	            $listoffileprocessed[$dir.$file] = $dir.$file;
+				// Run sql script
+				$ok = run_sql($dir.$file, 0, '', 1);
+				$listoffileprocessed[$dir.$file] = $dir.$file;
 
-	            // Scan if there is migration scripts that depends of Dolibarr version
-	            // for modules htdocs/module/sql or htdocs/custom/module/sql (files called "dolibarr_x.y.z-a.b.c.sql")
-	            $modulesfile = array();
-	            foreach ($conf->file->dol_document_root as $type => $dirroot)
-	            {
-	            	$handlemodule = @opendir($dirroot); // $dirroot may be '..'
-	            	if (is_resource($handlemodule))
-	            	{
-	            		while (($filemodule = readdir($handlemodule)) !== false)
-	            		{
-	            			if (!preg_match('/\./', $filemodule) && is_dir($dirroot.'/'.$filemodule.'/sql'))	// We exclude filemodule that contains . (are not directories) and are not directories.
-	            			{
-	            				//print "Scan for ".$dirroot . '/' . $filemodule . '/sql/'.$file;
-	            				if (is_file($dirroot.'/'.$filemodule.'/sql/dolibarr_'.$file))
-	            				{
-	            					$modulesfile[$dirroot.'/'.$filemodule.'/sql/dolibarr_'.$file] = '/'.$filemodule.'/sql/dolibarr_'.$file;
-	            				}
-	            			}
-	            		}
-	            		closedir($handlemodule);
-	            	}
-	            }
+				// Scan if there is migration scripts that depends of Dolibarr version
+				// for modules htdocs/module/sql or htdocs/custom/module/sql (files called "dolibarr_x.y.z-a.b.c.sql")
+				$modulesfile = array();
+				foreach ($conf->file->dol_document_root as $type => $dirroot)
+				{
+					$handlemodule = @opendir($dirroot); // $dirroot may be '..'
+					if (is_resource($handlemodule))
+					{
+						while (($filemodule = readdir($handlemodule)) !== false)
+						{
+							if (!preg_match('/\./', $filemodule) && is_dir($dirroot.'/'.$filemodule.'/sql'))	// We exclude filemodule that contains . (are not directories) and are not directories.
+							{
+								//print "Scan for ".$dirroot . '/' . $filemodule . '/sql/'.$file;
+								if (is_file($dirroot.'/'.$filemodule.'/sql/dolibarr_'.$file))
+								{
+									$modulesfile[$dirroot.'/'.$filemodule.'/sql/dolibarr_'.$file] = '/'.$filemodule.'/sql/dolibarr_'.$file;
+								}
+							}
+						}
+						closedir($handlemodule);
+					}
+				}
 
-	            foreach ($modulesfile as $modulefilelong => $modulefileshort)
-	            {
-	            	if (in_array($modulefilelong, $listoffileprocessed)) continue;
+				foreach ($modulesfile as $modulefilelong => $modulefileshort)
+				{
+					if (in_array($modulefilelong, $listoffileprocessed)) continue;
 
-	            	print '<tr><td colspan="2"><hr></td></tr>';
-	            	print '<tr><td class="nowrap">'.$langs->trans("ChoosedMigrateScript").' (external modules)</td><td class="right">'.$modulefileshort.'</td></tr>'."\n";
+					print '<tr><td colspan="2"><hr></td></tr>';
+					print '<tr><td class="nowrap">'.$langs->trans("ChoosedMigrateScript").' (external modules)</td><td class="right">'.$modulefileshort.'</td></tr>'."\n";
 
-		            // Run sql script
-	            	$okmodule = run_sql($modulefilelong, 0, '', 1); // Note: Result of migration of external module should not decide if we continue migration of Dolibarr or not.
-	            	$listoffileprocessed[$modulefilelong] = $modulefilelong;
-	            }
-	        }
+					// Run sql script
+					$okmodule = run_sql($modulefilelong, 0, '', 1); // Note: Result of migration of external module should not decide if we continue migration of Dolibarr or not.
+					$listoffileprocessed[$modulefilelong] = $modulefilelong;
+				}
+			}
 		}
-    }
+	}
 
-    print '</table>';
+	print '</table>';
 
-    if ($db->connected) $db->close();
+	if ($db->connected) $db->close();
 }
 
 if (empty($actiondone))
 {
-    print '<div class="error">'.$langs->trans("ErrorWrongParameters").'</div>';
+	print '<div class="error">'.$langs->trans("ErrorWrongParameters").'</div>';
 }
 
 $ret = 0;
diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php
index c6208f1dd1b..7b41e7030b1 100644
--- a/htdocs/install/upgrade2.php
+++ b/htdocs/install/upgrade2.php
@@ -41,7 +41,7 @@
 include_once 'inc.php';
 if (!file_exists($conffile))
 {
-    print 'Error: Dolibarr config file was not found. This may means that Dolibarr is not installed yet. Please call the page "/install/index.php" instead of "/install/upgrade.php").';
+	print 'Error: Dolibarr config file was not found. This may means that Dolibarr is not installed yet. Please call the page "/install/index.php" instead of "/install/upgrade.php").';
 }
 require_once $conffile;
 require_once $dolibarr_main_document_root.'/compta/facture/class/facture.class.php';
@@ -111,353 +111,353 @@ pHeader('', 'step5', GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'upg
 
 if (!GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'aZ09')))
 {
-    print '<h3><img class="valigntextbottom" src="../theme/common/octicons/build/svg/database.svg" width="20" alt="Database"> '.$langs->trans('DataMigration').'</h3>';
+	print '<h3><img class="valigntextbottom" src="../theme/common/octicons/build/svg/database.svg" width="20" alt="Database"> '.$langs->trans('DataMigration').'</h3>';
 
-    print '<table cellspacing="0" cellpadding="1" border="0" width="100%">';
+	print '<table cellspacing="0" cellpadding="1" border="0" width="100%">';
 
-    // 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 is already instancied inside inc.php
-    $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 is already instancied inside inc.php
+	$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;
 
-    $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);
-    $hookmanager->initHooks(array('upgrade'));
+	// Create the global $hookmanager object
+	include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
+	$hookmanager = new HookManager($db);
+	$hookmanager->initHooks(array('upgrade'));
 
-    if (!$db->connected)
-    {
-        print '<tr><td colspan="4">'.$langs->trans("ErrorFailedToConnectToDatabase", $conf->db->name).'</td><td class="right">'.$langs->trans('Error').'</td></tr>';
-        dolibarr_install_syslog('upgrade2: failed to connect to database :'.$conf->db->name.' on '.$conf->db->host.' for user '.$conf->db->user, LOG_ERR);
-        $error++;
-    }
+	if (!$db->connected)
+	{
+		print '<tr><td colspan="4">'.$langs->trans("ErrorFailedToConnectToDatabase", $conf->db->name).'</td><td class="right">'.$langs->trans('Error').'</td></tr>';
+		dolibarr_install_syslog('upgrade2: failed to connect to database :'.$conf->db->name.' on '.$conf->db->host.' for user '.$conf->db->user, LOG_ERR);
+		$error++;
+	}
 
-    if (!$error)
-    {
-        if ($db->database_selected)
-        {
-            dolibarr_install_syslog('upgrade2: database connection successful :'.$dolibarr_main_db_name);
-        } else {
-            $error++;
-        }
-    }
+	if (!$error)
+	{
+		if ($db->database_selected)
+		{
+			dolibarr_install_syslog('upgrade2: database connection successful :'.$dolibarr_main_db_name);
+		} else {
+			$error++;
+		}
+	}
 
-    if (empty($dolibarr_main_db_encryption)) $dolibarr_main_db_encryption = 0;
-    $conf->db->dolibarr_main_db_encryption = $dolibarr_main_db_encryption;
-    if (empty($dolibarr_main_db_cryptkey)) $dolibarr_main_db_cryptkey = '';
-    $conf->db->dolibarr_main_db_cryptkey = $dolibarr_main_db_cryptkey;
+	if (empty($dolibarr_main_db_encryption)) $dolibarr_main_db_encryption = 0;
+	$conf->db->dolibarr_main_db_encryption = $dolibarr_main_db_encryption;
+	if (empty($dolibarr_main_db_cryptkey)) $dolibarr_main_db_cryptkey = '';
+	$conf->db->dolibarr_main_db_cryptkey = $dolibarr_main_db_cryptkey;
 
-    // Chargement config
-    if (!$error)
-    {
-    	$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;
-    }
+	// Chargement config
+	if (!$error)
+	{
+		$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;
+	}
 
 
-    /***************************************************************************************
+	/***************************************************************************************
      *
      * Migration of data
      *
      ***************************************************************************************/
-    $db->begin();
+	$db->begin();
 
-    if (!$error)
-    {
-        // Current version is $conf->global->MAIN_VERSION_LAST_UPGRADE
-        // Version to install is DOL_VERSION
-        $dolibarrlastupgradeversionarray = preg_split('/[\.-]/', isset($conf->global->MAIN_VERSION_LAST_UPGRADE) ? $conf->global->MAIN_VERSION_LAST_UPGRADE : (isset($conf->global->MAIN_VERSION_LAST_INSTALL) ? $conf->global->MAIN_VERSION_LAST_INSTALL : ''));
+	if (!$error)
+	{
+		// Current version is $conf->global->MAIN_VERSION_LAST_UPGRADE
+		// Version to install is DOL_VERSION
+		$dolibarrlastupgradeversionarray = preg_split('/[\.-]/', isset($conf->global->MAIN_VERSION_LAST_UPGRADE) ? $conf->global->MAIN_VERSION_LAST_UPGRADE : (isset($conf->global->MAIN_VERSION_LAST_INSTALL) ? $conf->global->MAIN_VERSION_LAST_INSTALL : ''));
 
-        // Chaque action de migration doit renvoyer une ligne sur 4 colonnes avec
-        // dans la 1ere colonne, la description de l'action a faire
-        // dans la 4eme colonne, le texte 'OK' si fait ou 'AlreadyDone' si rien n'est fait ou 'Error'
+		// Chaque action de migration doit renvoyer une ligne sur 4 colonnes avec
+		// dans la 1ere colonne, la description de l'action a faire
+		// dans la 4eme colonne, le texte 'OK' si fait ou 'AlreadyDone' si rien n'est fait ou 'Error'
 
-        $versiontoarray = explode('.', $versionto);
-        $versionranarray = explode('.', DOL_VERSION);
+		$versiontoarray = explode('.', $versionto);
+		$versionranarray = explode('.', DOL_VERSION);
 
 
-        // Force to execute this at begin to avoid the new core code into Dolibarr to be broken.
-        $sql = 'ALTER TABLE '.MAIN_DB_PREFIX.'user ADD COLUMN birth date';
-        $db->query($sql, 1);
-        $sql = 'ALTER TABLE '.MAIN_DB_PREFIX.'user ADD COLUMN dateemployment date';
-        $db->query($sql, 1);
-        $sql = 'ALTER TABLE '.MAIN_DB_PREFIX.'user ADD COLUMN dateemploymentend date';
-        $db->query($sql, 1);
-        $sql = 'ALTER TABLE '.MAIN_DB_PREFIX.'user ADD COLUMN default_range integer';
-        $db->query($sql, 1);
-        $sql = 'ALTER TABLE '.MAIN_DB_PREFIX.'user ADD COLUMN default_c_exp_tax_cat integer';
-        $db->query($sql, 1);
-        $sql = 'ALTER TABLE '.MAIN_DB_PREFIX.'extrafields ADD COLUMN langs varchar(24)';
-        $db->query($sql, 1);
-        $sql = 'ALTER TABLE '.MAIN_DB_PREFIX.'extrafields ADD COLUMN fieldcomputed text';
-        $db->query($sql, 1);
-        $sql = 'ALTER TABLE '.MAIN_DB_PREFIX.'extrafields ADD COLUMN fielddefault varchar(255)';
-        $db->query($sql, 1);
-        $sql = 'ALTER TABLE '.MAIN_DB_PREFIX."extrafields ADD COLUMN enabled varchar(255) DEFAULT '1'";
-        $db->query($sql, 1);
-        $sql = 'ALTER TABLE '.MAIN_DB_PREFIX.'extrafields ADD COLUMN help text';
-        $db->query($sql, 1);
-        $sql = 'ALTER TABLE '.MAIN_DB_PREFIX.'user_rights ADD COLUMN entity integer DEFAULT 1 NOT NULL';
-        $db->query($sql, 1);
+		// Force to execute this at begin to avoid the new core code into Dolibarr to be broken.
+		$sql = 'ALTER TABLE '.MAIN_DB_PREFIX.'user ADD COLUMN birth date';
+		$db->query($sql, 1);
+		$sql = 'ALTER TABLE '.MAIN_DB_PREFIX.'user ADD COLUMN dateemployment date';
+		$db->query($sql, 1);
+		$sql = 'ALTER TABLE '.MAIN_DB_PREFIX.'user ADD COLUMN dateemploymentend date';
+		$db->query($sql, 1);
+		$sql = 'ALTER TABLE '.MAIN_DB_PREFIX.'user ADD COLUMN default_range integer';
+		$db->query($sql, 1);
+		$sql = 'ALTER TABLE '.MAIN_DB_PREFIX.'user ADD COLUMN default_c_exp_tax_cat integer';
+		$db->query($sql, 1);
+		$sql = 'ALTER TABLE '.MAIN_DB_PREFIX.'extrafields ADD COLUMN langs varchar(24)';
+		$db->query($sql, 1);
+		$sql = 'ALTER TABLE '.MAIN_DB_PREFIX.'extrafields ADD COLUMN fieldcomputed text';
+		$db->query($sql, 1);
+		$sql = 'ALTER TABLE '.MAIN_DB_PREFIX.'extrafields ADD COLUMN fielddefault varchar(255)';
+		$db->query($sql, 1);
+		$sql = 'ALTER TABLE '.MAIN_DB_PREFIX."extrafields ADD COLUMN enabled varchar(255) DEFAULT '1'";
+		$db->query($sql, 1);
+		$sql = 'ALTER TABLE '.MAIN_DB_PREFIX.'extrafields ADD COLUMN help text';
+		$db->query($sql, 1);
+		$sql = 'ALTER TABLE '.MAIN_DB_PREFIX.'user_rights ADD COLUMN entity integer DEFAULT 1 NOT NULL';
+		$db->query($sql, 1);
 
 
-        $afterversionarray = explode('.', '2.0.0');
-        $beforeversionarray = explode('.', '2.7.9');
-        if (versioncompare($versiontoarray, $afterversionarray) >= 0 && versioncompare($versiontoarray, $beforeversionarray) <= 0)
-        {
-            // Script pour V2 -> V2.1
-            migrate_paiements($db, $langs, $conf);
+		$afterversionarray = explode('.', '2.0.0');
+		$beforeversionarray = explode('.', '2.7.9');
+		if (versioncompare($versiontoarray, $afterversionarray) >= 0 && versioncompare($versiontoarray, $beforeversionarray) <= 0)
+		{
+			// Script pour V2 -> V2.1
+			migrate_paiements($db, $langs, $conf);
 
-            migrate_contracts_det($db, $langs, $conf);
+			migrate_contracts_det($db, $langs, $conf);
 
-            migrate_contracts_date1($db, $langs, $conf);
+			migrate_contracts_date1($db, $langs, $conf);
 
-            migrate_contracts_date2($db, $langs, $conf);
+			migrate_contracts_date2($db, $langs, $conf);
 
-            migrate_contracts_date3($db, $langs, $conf);
+			migrate_contracts_date3($db, $langs, $conf);
 
-            migrate_contracts_open($db, $langs, $conf);
+			migrate_contracts_open($db, $langs, $conf);
 
-            migrate_modeles($db, $langs, $conf);
+			migrate_modeles($db, $langs, $conf);
 
-            migrate_price_propal($db, $langs, $conf);
+			migrate_price_propal($db, $langs, $conf);
 
-            migrate_price_commande($db, $langs, $conf);
+			migrate_price_commande($db, $langs, $conf);
 
-            migrate_price_commande_fournisseur($db, $langs, $conf);
+			migrate_price_commande_fournisseur($db, $langs, $conf);
 
-            migrate_price_contrat($db, $langs, $conf);
+			migrate_price_contrat($db, $langs, $conf);
 
-            migrate_paiementfourn_facturefourn($db, $langs, $conf);
+			migrate_paiementfourn_facturefourn($db, $langs, $conf);
 
 
-            // Script pour V2.1 -> V2.2
-            migrate_paiements_orphelins_1($db, $langs, $conf);
+			// Script pour V2.1 -> V2.2
+			migrate_paiements_orphelins_1($db, $langs, $conf);
 
-            migrate_paiements_orphelins_2($db, $langs, $conf);
+			migrate_paiements_orphelins_2($db, $langs, $conf);
 
-            migrate_links_transfert($db, $langs, $conf);
+			migrate_links_transfert($db, $langs, $conf);
 
 
-            // Script pour V2.2 -> V2.4
-            migrate_commande_expedition($db, $langs, $conf);
+			// Script pour V2.2 -> V2.4
+			migrate_commande_expedition($db, $langs, $conf);
 
-            migrate_commande_livraison($db, $langs, $conf);
+			migrate_commande_livraison($db, $langs, $conf);
 
-            migrate_detail_livraison($db, $langs, $conf);
+			migrate_detail_livraison($db, $langs, $conf);
 
 
-            // Script pour V2.5 -> V2.6
-            migrate_stocks($db, $langs, $conf);
+			// Script pour V2.5 -> V2.6
+			migrate_stocks($db, $langs, $conf);
 
 
-            // Script pour V2.6 -> V2.7
-            migrate_menus($db, $langs, $conf);
+			// Script pour V2.6 -> V2.7
+			migrate_menus($db, $langs, $conf);
 
-            migrate_commande_deliveryaddress($db, $langs, $conf);
+			migrate_commande_deliveryaddress($db, $langs, $conf);
 
-            migrate_restore_missing_links($db, $langs, $conf);
+			migrate_restore_missing_links($db, $langs, $conf);
 
-            migrate_rename_directories($db, $langs, $conf, '/compta', '/banque');
+			migrate_rename_directories($db, $langs, $conf, '/compta', '/banque');
 
-            migrate_rename_directories($db, $langs, $conf, '/societe', '/mycompany');
-        }
+			migrate_rename_directories($db, $langs, $conf, '/societe', '/mycompany');
+		}
 
-        // Script for 2.8
-        $afterversionarray = explode('.', '2.7.9');
-        $beforeversionarray = explode('.', '2.8.9');
-        //print $versionto.' '.versioncompare($versiontoarray,$afterversionarray).' '.versioncompare($versiontoarray,$beforeversionarray);
-        if (versioncompare($versiontoarray, $afterversionarray) >= 0 && versioncompare($versiontoarray, $beforeversionarray) <= 0)
-        {
-            migrate_price_facture($db, $langs, $conf); // Code of this function works for 2.8+ because need a field tva_tx
+		// Script for 2.8
+		$afterversionarray = explode('.', '2.7.9');
+		$beforeversionarray = explode('.', '2.8.9');
+		//print $versionto.' '.versioncompare($versiontoarray,$afterversionarray).' '.versioncompare($versiontoarray,$beforeversionarray);
+		if (versioncompare($versiontoarray, $afterversionarray) >= 0 && versioncompare($versiontoarray, $beforeversionarray) <= 0)
+		{
+			migrate_price_facture($db, $langs, $conf); // Code of this function works for 2.8+ because need a field tva_tx
 
-            migrate_relationship_tables($db, $langs, $conf, 'co_exp', 'fk_commande', 'commande', 'fk_expedition', 'shipping');
+			migrate_relationship_tables($db, $langs, $conf, 'co_exp', 'fk_commande', 'commande', 'fk_expedition', 'shipping');
 
-            migrate_relationship_tables($db, $langs, $conf, 'pr_exp', 'fk_propal', 'propal', 'fk_expedition', 'shipping');
+			migrate_relationship_tables($db, $langs, $conf, 'pr_exp', 'fk_propal', 'propal', 'fk_expedition', 'shipping');
 
-            migrate_relationship_tables($db, $langs, $conf, 'pr_liv', 'fk_propal', 'propal', 'fk_livraison', 'delivery');
+			migrate_relationship_tables($db, $langs, $conf, 'pr_liv', 'fk_propal', 'propal', 'fk_livraison', 'delivery');
 
-            migrate_relationship_tables($db, $langs, $conf, 'co_liv', 'fk_commande', 'commande', 'fk_livraison', 'delivery');
+			migrate_relationship_tables($db, $langs, $conf, 'co_liv', 'fk_commande', 'commande', 'fk_livraison', 'delivery');
 
-            migrate_relationship_tables($db, $langs, $conf, 'co_pr', 'fk_propale', 'propal', 'fk_commande', 'commande');
+			migrate_relationship_tables($db, $langs, $conf, 'co_pr', 'fk_propale', 'propal', 'fk_commande', 'commande');
 
-            migrate_relationship_tables($db, $langs, $conf, 'fa_pr', 'fk_propal', 'propal', 'fk_facture', 'facture');
+			migrate_relationship_tables($db, $langs, $conf, 'fa_pr', 'fk_propal', 'propal', 'fk_facture', 'facture');
 
-            migrate_relationship_tables($db, $langs, $conf, 'co_fa', 'fk_commande', 'commande', 'fk_facture', 'facture');
+			migrate_relationship_tables($db, $langs, $conf, 'co_fa', 'fk_commande', 'commande', 'fk_facture', 'facture');
 
-            migrate_project_user_resp($db, $langs, $conf);
+			migrate_project_user_resp($db, $langs, $conf);
 
-            migrate_project_task_actors($db, $langs, $conf);
-        }
+			migrate_project_task_actors($db, $langs, $conf);
+		}
 
-        // Script for 2.9
-        $afterversionarray = explode('.', '2.8.9');
-        $beforeversionarray = explode('.', '2.9.9');
-        if (versioncompare($versiontoarray, $afterversionarray) >= 0 && versioncompare($versiontoarray, $beforeversionarray) <= 0)
-        {
-            migrate_project_task_time($db, $langs, $conf);
+		// Script for 2.9
+		$afterversionarray = explode('.', '2.8.9');
+		$beforeversionarray = explode('.', '2.9.9');
+		if (versioncompare($versiontoarray, $afterversionarray) >= 0 && versioncompare($versiontoarray, $beforeversionarray) <= 0)
+		{
+			migrate_project_task_time($db, $langs, $conf);
 
-            migrate_customerorder_shipping($db, $langs, $conf);
+			migrate_customerorder_shipping($db, $langs, $conf);
 
-            migrate_shipping_delivery($db, $langs, $conf);
+			migrate_shipping_delivery($db, $langs, $conf);
 
-            migrate_shipping_delivery2($db, $langs, $conf);
-        }
+			migrate_shipping_delivery2($db, $langs, $conf);
+		}
 
-        // Script for 3.0
-        $afterversionarray = explode('.', '2.9.9');
-        $beforeversionarray = explode('.', '3.0.9');
-        if (versioncompare($versiontoarray, $afterversionarray) >= 0 && versioncompare($versiontoarray, $beforeversionarray) <= 0)
-        {
-            // No particular code
-        }
+		// Script for 3.0
+		$afterversionarray = explode('.', '2.9.9');
+		$beforeversionarray = explode('.', '3.0.9');
+		if (versioncompare($versiontoarray, $afterversionarray) >= 0 && versioncompare($versiontoarray, $beforeversionarray) <= 0)
+		{
+			// No particular code
+		}
 
-        // Script for 3.1
-        $afterversionarray = explode('.', '3.0.9');
-        $beforeversionarray = explode('.', '3.1.9');
-        if (versioncompare($versiontoarray, $afterversionarray) >= 0 && versioncompare($versiontoarray, $beforeversionarray) <= 0)
-        {
-            migrate_rename_directories($db, $langs, $conf, '/rss', '/externalrss');
+		// Script for 3.1
+		$afterversionarray = explode('.', '3.0.9');
+		$beforeversionarray = explode('.', '3.1.9');
+		if (versioncompare($versiontoarray, $afterversionarray) >= 0 && versioncompare($versiontoarray, $beforeversionarray) <= 0)
+		{
+			migrate_rename_directories($db, $langs, $conf, '/rss', '/externalrss');
 
-            migrate_actioncomm_element($db, $langs, $conf);
-        }
+			migrate_actioncomm_element($db, $langs, $conf);
+		}
 
-        // Script for 3.2
-        $afterversionarray = explode('.', '3.1.9');
-        $beforeversionarray = explode('.', '3.2.9');
-        if (versioncompare($versiontoarray, $afterversionarray) >= 0 && versioncompare($versiontoarray, $beforeversionarray) <= 0)
-        {
-            migrate_price_contrat($db, $langs, $conf);
+		// Script for 3.2
+		$afterversionarray = explode('.', '3.1.9');
+		$beforeversionarray = explode('.', '3.2.9');
+		if (versioncompare($versiontoarray, $afterversionarray) >= 0 && versioncompare($versiontoarray, $beforeversionarray) <= 0)
+		{
+			migrate_price_contrat($db, $langs, $conf);
 
-        	migrate_mode_reglement($db, $langs, $conf);
+			migrate_mode_reglement($db, $langs, $conf);
 
-        	migrate_clean_association($db, $langs, $conf);
-        }
+			migrate_clean_association($db, $langs, $conf);
+		}
 
-        // Script for 3.3
-        $afterversionarray = explode('.', '3.2.9');
-        $beforeversionarray = explode('.', '3.3.9');
-        if (versioncompare($versiontoarray, $afterversionarray) >= 0 && versioncompare($versiontoarray, $beforeversionarray) <= 0)
-        {
-        	migrate_categorie_association($db, $langs, $conf);
-        }
+		// Script for 3.3
+		$afterversionarray = explode('.', '3.2.9');
+		$beforeversionarray = explode('.', '3.3.9');
+		if (versioncompare($versiontoarray, $afterversionarray) >= 0 && versioncompare($versiontoarray, $beforeversionarray) <= 0)
+		{
+			migrate_categorie_association($db, $langs, $conf);
+		}
 
 		// Script for 3.4
 		// No specific scripts
 
-        // Tasks to do always and only into last targeted version
-        $afterversionarray = explode('.', '3.6.9'); // target is after this
-        $beforeversionarray = explode('.', '3.7.9'); // target is before this
-        if (versioncompare($versiontoarray, $afterversionarray) >= 0 && versioncompare($versiontoarray, $beforeversionarray) <= 0)
-        {
-       	    migrate_event_assignement($db, $langs, $conf);
-        }
+		// Tasks to do always and only into last targeted version
+		$afterversionarray = explode('.', '3.6.9'); // target is after this
+		$beforeversionarray = explode('.', '3.7.9'); // target is before this
+		if (versioncompare($versiontoarray, $afterversionarray) >= 0 && versioncompare($versiontoarray, $beforeversionarray) <= 0)
+		{
+	   		migrate_event_assignement($db, $langs, $conf);
+		}
 
-        // Scripts for 3.9
-        $afterversionarray = explode('.', '3.7.9');
-        $beforeversionarray = explode('.', '3.8.9');
-        if (versioncompare($versiontoarray, $afterversionarray) >= 0 && versioncompare($versiontoarray, $beforeversionarray) <= 0)
-        {
-        	// No particular code
-        }
+		// Scripts for 3.9
+		$afterversionarray = explode('.', '3.7.9');
+		$beforeversionarray = explode('.', '3.8.9');
+		if (versioncompare($versiontoarray, $afterversionarray) >= 0 && versioncompare($versiontoarray, $beforeversionarray) <= 0)
+		{
+			// No particular code
+		}
 
-        // Scripts for 4.0
-        $afterversionarray = explode('.', '3.9.9');
-        $beforeversionarray = explode('.', '4.0.9');
-        if (versioncompare($versiontoarray, $afterversionarray) >= 0 && versioncompare($versiontoarray, $beforeversionarray) <= 0)
-        {
-            migrate_rename_directories($db, $langs, $conf, '/fckeditor', '/medias');
-        }
+		// Scripts for 4.0
+		$afterversionarray = explode('.', '3.9.9');
+		$beforeversionarray = explode('.', '4.0.9');
+		if (versioncompare($versiontoarray, $afterversionarray) >= 0 && versioncompare($versiontoarray, $beforeversionarray) <= 0)
+		{
+			migrate_rename_directories($db, $langs, $conf, '/fckeditor', '/medias');
+		}
 
-        // Scripts for 5.0
-        $afterversionarray = explode('.', '4.0.9');
-        $beforeversionarray = explode('.', '5.0.9');
-        if (versioncompare($versiontoarray, $afterversionarray) >= 0 && versioncompare($versiontoarray, $beforeversionarray) <= 0)
-        {
-            // Migrate to add entity value into llx_societe_remise
-            migrate_remise_entity($db, $langs, $conf);
+		// Scripts for 5.0
+		$afterversionarray = explode('.', '4.0.9');
+		$beforeversionarray = explode('.', '5.0.9');
+		if (versioncompare($versiontoarray, $afterversionarray) >= 0 && versioncompare($versiontoarray, $beforeversionarray) <= 0)
+		{
+			// Migrate to add entity value into llx_societe_remise
+			migrate_remise_entity($db, $langs, $conf);
 
-            // Migrate to add entity value into llx_societe_remise_except
-            migrate_remise_except_entity($db, $langs, $conf);
-        }
+			// Migrate to add entity value into llx_societe_remise_except
+			migrate_remise_except_entity($db, $langs, $conf);
+		}
 
-        // Scripts for 6.0
-        $afterversionarray = explode('.', '5.0.9');
-        $beforeversionarray = explode('.', '6.0.9');
-        if (versioncompare($versiontoarray, $afterversionarray) >= 0 && versioncompare($versiontoarray, $beforeversionarray) <= 0)
-        {
-        	if (!empty($conf->multicompany->enabled))
-        	{
-        		global $multicompany_transverse_mode;
+		// Scripts for 6.0
+		$afterversionarray = explode('.', '5.0.9');
+		$beforeversionarray = explode('.', '6.0.9');
+		if (versioncompare($versiontoarray, $afterversionarray) >= 0 && versioncompare($versiontoarray, $beforeversionarray) <= 0)
+		{
+			if (!empty($conf->multicompany->enabled))
+			{
+				global $multicompany_transverse_mode;
 
-        		// Only if the transverse mode is not used
-        		if (empty($multicompany_transverse_mode))
-        		{
-        			// Migrate to add entity value into llx_user_rights
-        			migrate_user_rights_entity($db, $langs, $conf);
+				// Only if the transverse mode is not used
+				if (empty($multicompany_transverse_mode))
+				{
+					// Migrate to add entity value into llx_user_rights
+					migrate_user_rights_entity($db, $langs, $conf);
 
-        			// Migrate to add entity value into llx_usergroup_rights
-        			migrate_usergroup_rights_entity($db, $langs, $conf);
-        		}
-        	}
-        }
+					// Migrate to add entity value into llx_usergroup_rights
+					migrate_usergroup_rights_entity($db, $langs, $conf);
+				}
+			}
+		}
 
-        // Scripts for 7.0
-        $afterversionarray = explode('.', '6.0.9');
-        $beforeversionarray = explode('.', '7.0.9');
-        if (versioncompare($versiontoarray, $afterversionarray) >= 0 && versioncompare($versiontoarray, $beforeversionarray) <= 0)
-        {
-            // Migrate contact association
-        	migrate_event_assignement_contact($db, $langs, $conf);
+		// Scripts for 7.0
+		$afterversionarray = explode('.', '6.0.9');
+		$beforeversionarray = explode('.', '7.0.9');
+		if (versioncompare($versiontoarray, $afterversionarray) >= 0 && versioncompare($versiontoarray, $beforeversionarray) <= 0)
+		{
+			// Migrate contact association
+			migrate_event_assignement_contact($db, $langs, $conf);
 
-        	migrate_reset_blocked_log($db, $langs, $conf);
-        }
+			migrate_reset_blocked_log($db, $langs, $conf);
+		}
 
-        // Scripts for 8.0
-        $afterversionarray = explode('.', '7.0.9');
-        $beforeversionarray = explode('.', '8.0.9');
-        if (versioncompare($versiontoarray, $afterversionarray) >= 0 && versioncompare($versiontoarray, $beforeversionarray) <= 0)
-        {
-        	migrate_rename_directories($db, $langs, $conf, '/contracts', '/contract');
-        }
+		// Scripts for 8.0
+		$afterversionarray = explode('.', '7.0.9');
+		$beforeversionarray = explode('.', '8.0.9');
+		if (versioncompare($versiontoarray, $afterversionarray) >= 0 && versioncompare($versiontoarray, $beforeversionarray) <= 0)
+		{
+			migrate_rename_directories($db, $langs, $conf, '/contracts', '/contract');
+		}
 
-        // Scripts for 9.0
-        $afterversionarray = explode('.', '8.0.9');
-        $beforeversionarray = explode('.', '9.0.9');
-        if (versioncompare($versiontoarray, $afterversionarray) >= 0 && versioncompare($versiontoarray, $beforeversionarray) <= 0)
-        {
-        	migrate_user_photospath();
-        }
+		// Scripts for 9.0
+		$afterversionarray = explode('.', '8.0.9');
+		$beforeversionarray = explode('.', '9.0.9');
+		if (versioncompare($versiontoarray, $afterversionarray) >= 0 && versioncompare($versiontoarray, $beforeversionarray) <= 0)
+		{
+			migrate_user_photospath();
+		}
 
-        // Scripts for 11.0
-        $afterversionarray = explode('.', '10.0.9');
-        $beforeversionarray = explode('.', '11.0.9');
-        if (versioncompare($versiontoarray, $afterversionarray) >= 0 && versioncompare($versiontoarray, $beforeversionarray) <= 0) {
-            migrate_users_socialnetworks();
-            migrate_members_socialnetworks();
-            migrate_contacts_socialnetworks();
-            migrate_thirdparties_socialnetworks();
-        }
-    }
+		// Scripts for 11.0
+		$afterversionarray = explode('.', '10.0.9');
+		$beforeversionarray = explode('.', '11.0.9');
+		if (versioncompare($versiontoarray, $afterversionarray) >= 0 && versioncompare($versiontoarray, $beforeversionarray) <= 0) {
+			migrate_users_socialnetworks();
+			migrate_members_socialnetworks();
+			migrate_contacts_socialnetworks();
+			migrate_thirdparties_socialnetworks();
+		}
+	}
 
 	// Code executed only if migration is LAST ONE. Must always be done.
 	if (versioncompare($versiontoarray, $versionranarray) >= 0 || versioncompare($versiontoarray, $versionranarray) <= -3)
@@ -497,86 +497,86 @@ if (!GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'aZ
 		migrate_reload_menu($db, $langs, $conf);
 	}
 
-    // Can force activation of some module during migration with parameter 'enablemodules=MAIN_MODULE_XXX,MAIN_MODULE_YYY,...'
-    // In most cases (online install or upgrade) $enablemodules is empty. Can be forced when ran from command line.
-    if (!$error && $enablemodules)
-    {
-        // Reload modules (this must be always done and only into last targeted version)
-        $listofmodules = array();
-        $enablemodules = preg_replace('/enablemodules=/', '', $enablemodules);
-        $tmplistofmodules = explode(',', $enablemodules);
-        foreach ($tmplistofmodules as $value)
-        {
-            $listofmodules[$value] = 'forceactivate';
-        }
-        migrate_reload_modules($db, $langs, $conf, $listofmodules, 1);
-    }
+	// Can force activation of some module during migration with parameter 'enablemodules=MAIN_MODULE_XXX,MAIN_MODULE_YYY,...'
+	// In most cases (online install or upgrade) $enablemodules is empty. Can be forced when ran from command line.
+	if (!$error && $enablemodules)
+	{
+		// Reload modules (this must be always done and only into last targeted version)
+		$listofmodules = array();
+		$enablemodules = preg_replace('/enablemodules=/', '', $enablemodules);
+		$tmplistofmodules = explode(',', $enablemodules);
+		foreach ($tmplistofmodules as $value)
+		{
+			$listofmodules[$value] = 'forceactivate';
+		}
+		migrate_reload_modules($db, $langs, $conf, $listofmodules, 1);
+	}
 
 
-    // Can call a dedicated external upgrade process
-    if (!$error)
-    {
-        $parameters = array('versionfrom'=>$versionfrom, 'versionto='.$versionto);
-        $object = new stdClass();
-        $action = "upgrade";
-        $reshook = $hookmanager->executeHooks('doUpgrade2', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
-        if ($hookmanager->resNbOfHooks > 0)
-        {
-            if ($reshook < 0)
-            {
-                print '<tr><td colspan="4">';
-                print '<b>'.$langs->trans('UpgradeExternalModule').'</b>: ';
-                print $hookmanager->error;
-                print "<!-- (".$reshook.") -->";
-                print '</td></tr>';
-            } else {
-                print '<tr><td colspan="4">';
-                print '<b>'.$langs->trans('UpgradeExternalModule').'</b>: OK';
-                print "<!-- (".$reshook.") -->";
-                print '</td></tr>';
-            }
-        } else {
-            //if (! empty($conf->modules))
-            if (!empty($conf->modules_parts['hooks']))     // If there is at least one module with one hook, we show message to say nothing was done
-            {
-                print '<tr><td colspan="4">';
-                print '<b>'.$langs->trans('UpgradeExternalModule').'</b>: '.$langs->trans("None");
-                print '</td></tr>';
-            }
-        }
-    }
+	// Can call a dedicated external upgrade process
+	if (!$error)
+	{
+		$parameters = array('versionfrom'=>$versionfrom, 'versionto='.$versionto);
+		$object = new stdClass();
+		$action = "upgrade";
+		$reshook = $hookmanager->executeHooks('doUpgrade2', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+		if ($hookmanager->resNbOfHooks > 0)
+		{
+			if ($reshook < 0)
+			{
+				print '<tr><td colspan="4">';
+				print '<b>'.$langs->trans('UpgradeExternalModule').'</b>: ';
+				print $hookmanager->error;
+				print "<!-- (".$reshook.") -->";
+				print '</td></tr>';
+			} else {
+				print '<tr><td colspan="4">';
+				print '<b>'.$langs->trans('UpgradeExternalModule').'</b>: OK';
+				print "<!-- (".$reshook.") -->";
+				print '</td></tr>';
+			}
+		} else {
+			//if (! empty($conf->modules))
+			if (!empty($conf->modules_parts['hooks']))     // If there is at least one module with one hook, we show message to say nothing was done
+			{
+				print '<tr><td colspan="4">';
+				print '<b>'.$langs->trans('UpgradeExternalModule').'</b>: '.$langs->trans("None");
+				print '</td></tr>';
+			}
+		}
+	}
 
-    print '</table>';
+	print '</table>';
 
 
-    $sql = 'UPDATE '.MAIN_DB_PREFIX."const SET VALUE = 'torefresh' WHERE name = 'MAIN_FIRST_PING_OK_ID'";
-    $db->query($sql, 1);
+	$sql = 'UPDATE '.MAIN_DB_PREFIX."const SET VALUE = 'torefresh' WHERE name = 'MAIN_FIRST_PING_OK_ID'";
+	$db->query($sql, 1);
 
 
-    // We always commit.
-    // Process is designed so we can run it several times whatever is situation.
-    $db->commit();
-    $db->close();
+	// We always commit.
+	// Process is designed so we can run it several times whatever is situation.
+	$db->commit();
+	$db->close();
 
 
-    // Copy directory medias
-    $srcroot = DOL_DOCUMENT_ROOT.'/install/medias';
-    $destroot = DOL_DATA_ROOT.'/medias';
-    dolCopyDir($srcroot, $destroot, 0, 0);
+	// Copy directory medias
+	$srcroot = DOL_DOCUMENT_ROOT.'/install/medias';
+	$destroot = DOL_DATA_ROOT.'/medias';
+	dolCopyDir($srcroot, $destroot, 0, 0);
 
 
-    // Actions for all versions (no database change but delete some files and directories)
-    migrate_delete_old_files($db, $langs, $conf);
-    migrate_delete_old_dir($db, $langs, $conf);
-    // Actions for all versions (no database change but create some directories)
-    dol_mkdir(DOL_DATA_ROOT.'/bank');
-    // Actions for all versions (no database change but rename some directories)
-    migrate_rename_directories($db, $langs, $conf, '/banque/bordereau', '/bank/checkdeposits');
+	// Actions for all versions (no database change but delete some files and directories)
+	migrate_delete_old_files($db, $langs, $conf);
+	migrate_delete_old_dir($db, $langs, $conf);
+	// Actions for all versions (no database change but create some directories)
+	dol_mkdir(DOL_DATA_ROOT.'/bank');
+	// Actions for all versions (no database change but rename some directories)
+	migrate_rename_directories($db, $langs, $conf, '/banque/bordereau', '/bank/checkdeposits');
 
-    print '<div><br>'.$langs->trans("MigrationFinished").'</div>';
+	print '<div><br>'.$langs->trans("MigrationFinished").'</div>';
 } else {
-    print '<div class="error">'.$langs->trans('ErrorWrongParameters').'</div>';
-    $error++;
+	print '<div class="error">'.$langs->trans('ErrorWrongParameters').'</div>';
+	$error++;
 }
 
 $ret = 0;
@@ -603,78 +603,78 @@ if ($ret) exit($ret);
  */
 function migrate_paiements($db, $langs, $conf)
 {
-    print '<tr><td colspan="4">';
+	print '<tr><td colspan="4">';
 
-    print '<br>';
-    print '<b>'.$langs->trans('MigrationPaymentsUpdate')."</b><br>\n";
+	print '<br>';
+	print '<b>'.$langs->trans('MigrationPaymentsUpdate')."</b><br>\n";
 
-    $result = $db->DDLDescTable(MAIN_DB_PREFIX."paiement", "fk_facture");
-    $obj = $db->fetch_object($result);
-    if ($obj)
-    {
-        $sql = "SELECT p.rowid, p.fk_facture, p.amount";
-        $sql .= " FROM ".MAIN_DB_PREFIX."paiement as p";
-        $sql .= " WHERE p.fk_facture > 0";
+	$result = $db->DDLDescTable(MAIN_DB_PREFIX."paiement", "fk_facture");
+	$obj = $db->fetch_object($result);
+	if ($obj)
+	{
+		$sql = "SELECT p.rowid, p.fk_facture, p.amount";
+		$sql .= " FROM ".MAIN_DB_PREFIX."paiement as p";
+		$sql .= " WHERE p.fk_facture > 0";
 
-        $resql = $db->query($sql);
+		$resql = $db->query($sql);
 
-        dolibarr_install_syslog("upgrade2::migrate_paiements");
-        if ($resql)
-        {
-            $i = 0;
-            $row = array();
-            $num = $db->num_rows($resql);
+		dolibarr_install_syslog("upgrade2::migrate_paiements");
+		if ($resql)
+		{
+			$i = 0;
+			$row = array();
+			$num = $db->num_rows($resql);
 
-            while ($i < $num)
-            {
-                $obj = $db->fetch_object($resql);
-                $row[$i][0] = $obj->rowid;
-                $row[$i][1] = $obj->fk_facture;
-                $row[$i][2] = $obj->amount;
-                $i++;
-            }
-        } else {
-            dol_print_error($db);
-        }
+			while ($i < $num)
+			{
+				$obj = $db->fetch_object($resql);
+				$row[$i][0] = $obj->rowid;
+				$row[$i][1] = $obj->fk_facture;
+				$row[$i][2] = $obj->amount;
+				$i++;
+			}
+		} else {
+			dol_print_error($db);
+		}
 
-        if ($num)
-        {
-            print $langs->trans('MigrationPaymentsNumberToUpdate', $num)."<br>\n";
-            if ($db->begin())
-            {
-                $res = 0;
-                $num = count($row);
-                for ($i = 0; $i < $num; $i++)
-                {
-                    $sql = "INSERT INTO ".MAIN_DB_PREFIX."paiement_facture (fk_facture, fk_paiement, amount)";
-                    $sql .= " VALUES (".$row[$i][1].",".$row[$i][0].",".$row[$i][2].")";
+		if ($num)
+		{
+			print $langs->trans('MigrationPaymentsNumberToUpdate', $num)."<br>\n";
+			if ($db->begin())
+			{
+				$res = 0;
+				$num = count($row);
+				for ($i = 0; $i < $num; $i++)
+				{
+					$sql = "INSERT INTO ".MAIN_DB_PREFIX."paiement_facture (fk_facture, fk_paiement, amount)";
+					$sql .= " VALUES (".$row[$i][1].",".$row[$i][0].",".$row[$i][2].")";
 
-                    $res += $db->query($sql);
+					$res += $db->query($sql);
 
-                    $sql = "UPDATE ".MAIN_DB_PREFIX."paiement SET fk_facture = 0 WHERE rowid = ".$row[$i][0];
+					$sql = "UPDATE ".MAIN_DB_PREFIX."paiement SET fk_facture = 0 WHERE rowid = ".$row[$i][0];
 
-                    $res += $db->query($sql);
+					$res += $db->query($sql);
 
-                    print $langs->trans('MigrationProcessPaymentUpdate', $row[$i][0])."<br>\n";
-                }
-            }
+					print $langs->trans('MigrationProcessPaymentUpdate', $row[$i][0])."<br>\n";
+				}
+			}
 
-            if ($res == (2 * count($row)))
-            {
-                $db->commit();
-                print $langs->trans('MigrationSuccessfullUpdate')."<br>";
-            } else {
-                $db->rollback();
-                print $langs->trans('MigrationUpdateFailed').'<br>';
-            }
-        } else {
-            print $langs->trans('MigrationPaymentsNothingToUpdate')."<br>\n";
-        }
-    } else {
-        print $langs->trans('MigrationPaymentsNothingToUpdate')."<br>\n";
-    }
+			if ($res == (2 * count($row)))
+			{
+				$db->commit();
+				print $langs->trans('MigrationSuccessfullUpdate')."<br>";
+			} else {
+				$db->rollback();
+				print $langs->trans('MigrationUpdateFailed').'<br>';
+			}
+		} else {
+			print $langs->trans('MigrationPaymentsNothingToUpdate')."<br>\n";
+		}
+	} else {
+		print $langs->trans('MigrationPaymentsNothingToUpdate')."<br>\n";
+	}
 
-    print '</td></tr>';
+	print '</td></tr>';
 }
 
 /**
@@ -689,109 +689,109 @@ function migrate_paiements($db, $langs, $conf)
  */
 function migrate_paiements_orphelins_1($db, $langs, $conf)
 {
-    print '<tr><td colspan="4">';
+	print '<tr><td colspan="4">';
 
-    print '<br>';
-    print '<b>'.$langs->trans('MigrationPaymentsUpdate')."</b><br>\n";
+	print '<br>';
+	print '<b>'.$langs->trans('MigrationPaymentsUpdate')."</b><br>\n";
 
-    $result = $db->DDLDescTable(MAIN_DB_PREFIX."paiement", "fk_facture");
-    $obj = $db->fetch_object($result);
-    if ($obj)
-    {
-        // Tous les enregistrements qui sortent de cette requete devrait avoir un pere dans llx_paiement_facture
-        $sql = "SELECT distinct p.rowid, p.datec, p.amount as pamount, bu.fk_bank, b.amount as bamount,";
-        $sql .= " bu2.url_id as socid";
-        $sql .= " FROM (".MAIN_DB_PREFIX."paiement as p, ".MAIN_DB_PREFIX."bank_url as bu, ".MAIN_DB_PREFIX."bank as b)";
-        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON pf.fk_paiement = p.rowid";
-        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank_url as bu2 ON (bu.fk_bank=bu2.fk_bank AND bu2.type = 'company')";
-        $sql .= " WHERE pf.rowid IS NULL AND (p.rowid=bu.url_id AND bu.type='payment') AND bu.fk_bank = b.rowid";
-        $sql .= " AND b.rappro = 1";
-        $sql .= " AND (p.fk_facture = 0 OR p.fk_facture IS NULL)";
+	$result = $db->DDLDescTable(MAIN_DB_PREFIX."paiement", "fk_facture");
+	$obj = $db->fetch_object($result);
+	if ($obj)
+	{
+		// Tous les enregistrements qui sortent de cette requete devrait avoir un pere dans llx_paiement_facture
+		$sql = "SELECT distinct p.rowid, p.datec, p.amount as pamount, bu.fk_bank, b.amount as bamount,";
+		$sql .= " bu2.url_id as socid";
+		$sql .= " FROM (".MAIN_DB_PREFIX."paiement as p, ".MAIN_DB_PREFIX."bank_url as bu, ".MAIN_DB_PREFIX."bank as b)";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON pf.fk_paiement = p.rowid";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank_url as bu2 ON (bu.fk_bank=bu2.fk_bank AND bu2.type = 'company')";
+		$sql .= " WHERE pf.rowid IS NULL AND (p.rowid=bu.url_id AND bu.type='payment') AND bu.fk_bank = b.rowid";
+		$sql .= " AND b.rappro = 1";
+		$sql .= " AND (p.fk_facture = 0 OR p.fk_facture IS NULL)";
 
-        $resql = $db->query($sql);
+		$resql = $db->query($sql);
 
-        dolibarr_install_syslog("upgrade2::migrate_paiements_orphelins_1");
-        $row = array();
-        if ($resql)
-        {
-            $i = $j = 0;
-            $num = $db->num_rows($resql);
+		dolibarr_install_syslog("upgrade2::migrate_paiements_orphelins_1");
+		$row = array();
+		if ($resql)
+		{
+			$i = $j = 0;
+			$num = $db->num_rows($resql);
 
-            while ($i < $num)
-            {
-                $obj = $db->fetch_object($resql);
-                if ($obj->pamount == $obj->bamount && $obj->socid)	// Pour etre sur d'avoir bon cas
-                {
-                    $row[$j]['paymentid'] = $obj->rowid; // paymentid
-                    $row[$j]['pamount'] = $obj->pamount;
-                    $row[$j]['fk_bank'] = $obj->fk_bank;
-                    $row[$j]['bamount'] = $obj->bamount;
-                    $row[$j]['socid'] = $obj->socid;
-                    $row[$j]['datec'] = $obj->datec;
-                    $j++;
-                }
-                $i++;
-            }
-        } else {
-            dol_print_error($db);
-        }
+			while ($i < $num)
+			{
+				$obj = $db->fetch_object($resql);
+				if ($obj->pamount == $obj->bamount && $obj->socid)	// Pour etre sur d'avoir bon cas
+				{
+					$row[$j]['paymentid'] = $obj->rowid; // paymentid
+					$row[$j]['pamount'] = $obj->pamount;
+					$row[$j]['fk_bank'] = $obj->fk_bank;
+					$row[$j]['bamount'] = $obj->bamount;
+					$row[$j]['socid'] = $obj->socid;
+					$row[$j]['datec'] = $obj->datec;
+					$j++;
+				}
+				$i++;
+			}
+		} else {
+			dol_print_error($db);
+		}
 
-        if (count($row))
-        {
-            print $langs->trans('OrphelinsPaymentsDetectedByMethod', 1).': '.count($row)."<br>\n";
-            $db->begin();
+		if (count($row))
+		{
+			print $langs->trans('OrphelinsPaymentsDetectedByMethod', 1).': '.count($row)."<br>\n";
+			$db->begin();
 
-            $res = 0;
-            $num = count($row);
-            for ($i = 0; $i < $num; $i++)
-            {
-                if ($conf->global->MAIN_FEATURES_LEVEL == 2) print '* '.$row[$i]['datec'].' paymentid='.$row[$i]['paymentid'].' pamount='.$row[$i]['pamount'].' fk_bank='.$row[$i]['fk_bank'].' bamount='.$row[$i]['bamount'].' socid='.$row[$i]['socid'].'<br>';
+			$res = 0;
+			$num = count($row);
+			for ($i = 0; $i < $num; $i++)
+			{
+				if ($conf->global->MAIN_FEATURES_LEVEL == 2) print '* '.$row[$i]['datec'].' paymentid='.$row[$i]['paymentid'].' pamount='.$row[$i]['pamount'].' fk_bank='.$row[$i]['fk_bank'].' bamount='.$row[$i]['bamount'].' socid='.$row[$i]['socid'].'<br>';
 
-                // On cherche facture sans lien paiement et du meme montant et pour meme societe.
-                $sql = " SELECT distinct f.rowid from ".MAIN_DB_PREFIX."facture as f";
-                $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON f.rowid = pf.fk_facture";
-                $sql .= " WHERE f.fk_statut in (2,3) AND fk_soc = ".$row[$i]['socid']." AND total_ttc = ".$row[$i]['pamount'];
-                $sql .= " AND pf.fk_facture IS NULL";
-                $sql .= " ORDER BY f.fk_statut";
-                //print $sql.'<br>';
-                $resql = $db->query($sql);
-                if ($resql)
-                {
-                    $num = $db->num_rows($resql);
-                    //print 'Nb of invoice found for this amount and company :'.$num.'<br>';
-                    if ($num >= 1)
-                    {
-                        $obj = $db->fetch_object($resql);
-                        $facid = $obj->rowid;
+				// On cherche facture sans lien paiement et du meme montant et pour meme societe.
+				$sql = " SELECT distinct f.rowid from ".MAIN_DB_PREFIX."facture as f";
+				$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON f.rowid = pf.fk_facture";
+				$sql .= " WHERE f.fk_statut in (2,3) AND fk_soc = ".$row[$i]['socid']." AND total_ttc = ".$row[$i]['pamount'];
+				$sql .= " AND pf.fk_facture IS NULL";
+				$sql .= " ORDER BY f.fk_statut";
+				//print $sql.'<br>';
+				$resql = $db->query($sql);
+				if ($resql)
+				{
+					$num = $db->num_rows($resql);
+					//print 'Nb of invoice found for this amount and company :'.$num.'<br>';
+					if ($num >= 1)
+					{
+						$obj = $db->fetch_object($resql);
+						$facid = $obj->rowid;
 
-                        $sql = "INSERT INTO ".MAIN_DB_PREFIX."paiement_facture (fk_facture, fk_paiement, amount)";
-                        $sql .= " VALUES (".$facid.",".$row[$i]['paymentid'].",".$row[$i]['pamount'].")";
+						$sql = "INSERT INTO ".MAIN_DB_PREFIX."paiement_facture (fk_facture, fk_paiement, amount)";
+						$sql .= " VALUES (".$facid.",".$row[$i]['paymentid'].",".$row[$i]['pamount'].")";
 
-                        $res += $db->query($sql);
+						$res += $db->query($sql);
 
-                        print $langs->trans('MigrationProcessPaymentUpdate', 'facid='.$facid.'-paymentid='.$row[$i]['paymentid'].'-amount='.$row[$i]['pamount'])."<br>\n";
-                    }
-                } else {
-                    print 'ERROR';
-                }
-            }
+						print $langs->trans('MigrationProcessPaymentUpdate', 'facid='.$facid.'-paymentid='.$row[$i]['paymentid'].'-amount='.$row[$i]['pamount'])."<br>\n";
+					}
+				} else {
+					print 'ERROR';
+				}
+			}
 
-            if ($res > 0)
-            {
-                print $langs->trans('MigrationSuccessfullUpdate')."<br>";
-            } else {
-                print $langs->trans('MigrationPaymentsNothingUpdatable')."<br>\n";
-            }
+			if ($res > 0)
+			{
+				print $langs->trans('MigrationSuccessfullUpdate')."<br>";
+			} else {
+				print $langs->trans('MigrationPaymentsNothingUpdatable')."<br>\n";
+			}
 
-            $db->commit();
-        } else {
-            print $langs->trans('MigrationPaymentsNothingUpdatable')."<br>\n";
-        }
-    } else {
-        print $langs->trans('MigrationPaymentsNothingUpdatable')."<br>\n";
-    }
+			$db->commit();
+		} else {
+			print $langs->trans('MigrationPaymentsNothingUpdatable')."<br>\n";
+		}
+	} else {
+		print $langs->trans('MigrationPaymentsNothingUpdatable')."<br>\n";
+	}
 
-    print '</td></tr>';
+	print '</td></tr>';
 }
 
 /**
@@ -806,124 +806,124 @@ function migrate_paiements_orphelins_1($db, $langs, $conf)
  */
 function migrate_paiements_orphelins_2($db, $langs, $conf)
 {
-    print '<tr><td colspan="4">';
+	print '<tr><td colspan="4">';
 
-    print '<br>';
-    print '<b>'.$langs->trans('MigrationPaymentsUpdate')."</b><br>\n";
+	print '<br>';
+	print '<b>'.$langs->trans('MigrationPaymentsUpdate')."</b><br>\n";
 
-    $result = $db->DDLDescTable(MAIN_DB_PREFIX."paiement", "fk_facture");
-    $obj = $db->fetch_object($result);
-    if ($obj)
-    {
-        // Tous les enregistrements qui sortent de cette requete devrait avoir un pere dans llx_paiement_facture
-        $sql = "SELECT distinct p.rowid, p.datec, p.amount as pamount, bu.fk_bank, b.amount as bamount,";
-        $sql .= " bu2.url_id as socid";
-        $sql .= " FROM (".MAIN_DB_PREFIX."paiement as p, ".MAIN_DB_PREFIX."bank_url as bu, ".MAIN_DB_PREFIX."bank as b)";
-        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON pf.fk_paiement = p.rowid";
-        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank_url as bu2 ON (bu.fk_bank = bu2.fk_bank AND bu2.type = 'company')";
-        $sql .= " WHERE pf.rowid IS NULL AND (p.fk_bank = bu.fk_bank AND bu.type = 'payment') AND bu.fk_bank = b.rowid";
-        $sql .= " AND (p.fk_facture = 0 OR p.fk_facture IS NULL)";
+	$result = $db->DDLDescTable(MAIN_DB_PREFIX."paiement", "fk_facture");
+	$obj = $db->fetch_object($result);
+	if ($obj)
+	{
+		// Tous les enregistrements qui sortent de cette requete devrait avoir un pere dans llx_paiement_facture
+		$sql = "SELECT distinct p.rowid, p.datec, p.amount as pamount, bu.fk_bank, b.amount as bamount,";
+		$sql .= " bu2.url_id as socid";
+		$sql .= " FROM (".MAIN_DB_PREFIX."paiement as p, ".MAIN_DB_PREFIX."bank_url as bu, ".MAIN_DB_PREFIX."bank as b)";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON pf.fk_paiement = p.rowid";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank_url as bu2 ON (bu.fk_bank = bu2.fk_bank AND bu2.type = 'company')";
+		$sql .= " WHERE pf.rowid IS NULL AND (p.fk_bank = bu.fk_bank AND bu.type = 'payment') AND bu.fk_bank = b.rowid";
+		$sql .= " AND (p.fk_facture = 0 OR p.fk_facture IS NULL)";
 
-        $resql = $db->query($sql);
+		$resql = $db->query($sql);
 
-        dolibarr_install_syslog("upgrade2::migrate_paiements_orphelins_2");
-        $row = array();
-        if ($resql)
-        {
-            $i = $j = 0;
-            $num = $db->num_rows($resql);
+		dolibarr_install_syslog("upgrade2::migrate_paiements_orphelins_2");
+		$row = array();
+		if ($resql)
+		{
+			$i = $j = 0;
+			$num = $db->num_rows($resql);
 
-            while ($i < $num)
-            {
-                $obj = $db->fetch_object($resql);
-                if ($obj->pamount == $obj->bamount && $obj->socid)	// Pour etre sur d'avoir bon cas
-                {
-                    $row[$j]['paymentid'] = $obj->rowid; // paymentid
-                    $row[$j]['pamount'] = $obj->pamount;
-                    $row[$j]['fk_bank'] = $obj->fk_bank;
-                    $row[$j]['bamount'] = $obj->bamount;
-                    $row[$j]['socid'] = $obj->socid;
-                    $row[$j]['datec'] = $obj->datec;
-                    $j++;
-                }
-                $i++;
-            }
-        } else {
-            dol_print_error($db);
-        }
+			while ($i < $num)
+			{
+				$obj = $db->fetch_object($resql);
+				if ($obj->pamount == $obj->bamount && $obj->socid)	// Pour etre sur d'avoir bon cas
+				{
+					$row[$j]['paymentid'] = $obj->rowid; // paymentid
+					$row[$j]['pamount'] = $obj->pamount;
+					$row[$j]['fk_bank'] = $obj->fk_bank;
+					$row[$j]['bamount'] = $obj->bamount;
+					$row[$j]['socid'] = $obj->socid;
+					$row[$j]['datec'] = $obj->datec;
+					$j++;
+				}
+				$i++;
+			}
+		} else {
+			dol_print_error($db);
+		}
 
-        $nberr = 0;
+		$nberr = 0;
 
-        $num = count($row);
-        if ($num)
-        {
-            print $langs->trans('OrphelinsPaymentsDetectedByMethod', 2).': '.count($row)."<br>\n";
-            $db->begin();
+		$num = count($row);
+		if ($num)
+		{
+			print $langs->trans('OrphelinsPaymentsDetectedByMethod', 2).': '.count($row)."<br>\n";
+			$db->begin();
 
-            $res = 0;
-            for ($i = 0; $i < $num; $i++)
-            {
-                if ($conf->global->MAIN_FEATURES_LEVEL == 2) print '* '.$row[$i]['datec'].' paymentid='.$row[$i]['paymentid'].' '.$row[$i]['pamount'].' fk_bank='.$row[$i]['fk_bank'].' '.$row[$i]['bamount'].' socid='.$row[$i]['socid'].'<br>';
+			$res = 0;
+			for ($i = 0; $i < $num; $i++)
+			{
+				if ($conf->global->MAIN_FEATURES_LEVEL == 2) print '* '.$row[$i]['datec'].' paymentid='.$row[$i]['paymentid'].' '.$row[$i]['pamount'].' fk_bank='.$row[$i]['fk_bank'].' '.$row[$i]['bamount'].' socid='.$row[$i]['socid'].'<br>';
 
-                // On cherche facture sans lien paiement et du meme montant et pour meme societe.
-                $sql = " SELECT distinct f.rowid from ".MAIN_DB_PREFIX."facture as f";
-                $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON f.rowid = pf.fk_facture";
-                $sql .= " WHERE f.fk_statut in (2,3) AND fk_soc = ".$row[$i]['socid']." AND total_ttc = ".$row[$i]['pamount'];
-                $sql .= " AND pf.fk_facture IS NULL";
-                $sql .= " ORDER BY f.fk_statut";
-                //print $sql.'<br>';
-                $resql = $db->query($sql);
-                if ($resql)
-                {
-                    $num = $db->num_rows($resql);
-                    //print 'Nb of invoice found for this amount and company :'.$num.'<br>';
-                    if ($num >= 1)
-                    {
-                        $obj = $db->fetch_object($resql);
-                        $facid = $obj->rowid;
+				// On cherche facture sans lien paiement et du meme montant et pour meme societe.
+				$sql = " SELECT distinct f.rowid from ".MAIN_DB_PREFIX."facture as f";
+				$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON f.rowid = pf.fk_facture";
+				$sql .= " WHERE f.fk_statut in (2,3) AND fk_soc = ".$row[$i]['socid']." AND total_ttc = ".$row[$i]['pamount'];
+				$sql .= " AND pf.fk_facture IS NULL";
+				$sql .= " ORDER BY f.fk_statut";
+				//print $sql.'<br>';
+				$resql = $db->query($sql);
+				if ($resql)
+				{
+					$num = $db->num_rows($resql);
+					//print 'Nb of invoice found for this amount and company :'.$num.'<br>';
+					if ($num >= 1)
+					{
+						$obj = $db->fetch_object($resql);
+						$facid = $obj->rowid;
 
-                        $sql = "INSERT INTO ".MAIN_DB_PREFIX."paiement_facture (fk_facture, fk_paiement, amount)";
-                        $sql .= " VALUES (".$facid.",".$row[$i]['paymentid'].",".$row[$i]['pamount'].")";
-                        $res += $db->query($sql);
+						$sql = "INSERT INTO ".MAIN_DB_PREFIX."paiement_facture (fk_facture, fk_paiement, amount)";
+						$sql .= " VALUES (".$facid.",".$row[$i]['paymentid'].",".$row[$i]['pamount'].")";
+						$res += $db->query($sql);
 
-                        print $langs->trans('MigrationProcessPaymentUpdate', 'facid='.$facid.'-paymentid='.$row[$i]['paymentid'].'-amount='.$row[$i]['pamount'])."<br>\n";
-                    }
-                } else {
-                    print 'ERROR';
-                    $nberr++;
-                }
-            }
+						print $langs->trans('MigrationProcessPaymentUpdate', 'facid='.$facid.'-paymentid='.$row[$i]['paymentid'].'-amount='.$row[$i]['pamount'])."<br>\n";
+					}
+				} else {
+					print 'ERROR';
+					$nberr++;
+				}
+			}
 
-            if ($res > 0)
-            {
-                print $langs->trans('MigrationSuccessfullUpdate')."<br>";
-            } else {
-                print $langs->trans('MigrationPaymentsNothingUpdatable')."<br>\n";
-            }
+			if ($res > 0)
+			{
+				print $langs->trans('MigrationSuccessfullUpdate')."<br>";
+			} else {
+				print $langs->trans('MigrationPaymentsNothingUpdatable')."<br>\n";
+			}
 
-            $db->commit();
-        } else {
-            print $langs->trans('MigrationPaymentsNothingUpdatable')."<br>\n";
-        }
+			$db->commit();
+		} else {
+			print $langs->trans('MigrationPaymentsNothingUpdatable')."<br>\n";
+		}
 
-        // Delete obsolete fields fk_facture
-        $db->begin();
+		// Delete obsolete fields fk_facture
+		$db->begin();
 
-        $sql = "ALTER TABLE ".MAIN_DB_PREFIX."paiement DROP COLUMN fk_facture";
-        $db->query($sql);
+		$sql = "ALTER TABLE ".MAIN_DB_PREFIX."paiement DROP COLUMN fk_facture";
+		$db->query($sql);
 
-        if (!$nberr)
-        {
-            $db->commit();
-        } else {
-            print 'ERROR';
-            $db->rollback();
-        }
-    } else {
-        print $langs->trans('MigrationPaymentsNothingUpdatable')."<br>\n";
-    }
+		if (!$nberr)
+		{
+			$db->commit();
+		} else {
+			print 'ERROR';
+			$db->rollback();
+		}
+	} else {
+		print $langs->trans('MigrationPaymentsNothingUpdatable')."<br>\n";
+	}
 
-    print '</td></tr>';
+	print '</td></tr>';
 }
 
 
@@ -937,84 +937,84 @@ function migrate_paiements_orphelins_2($db, $langs, $conf)
  */
 function migrate_contracts_det($db, $langs, $conf)
 {
-    print '<tr><td colspan="4">';
+	print '<tr><td colspan="4">';
 
-    $nberr = 0;
+	$nberr = 0;
 
-    print '<br>';
-    print '<b>'.$langs->trans('MigrationContractsUpdate')."</b><br>\n";
+	print '<br>';
+	print '<b>'.$langs->trans('MigrationContractsUpdate')."</b><br>\n";
 
-    $sql = "SELECT c.rowid as cref, c.date_contrat, c.statut, c.fk_product, c.fk_facture, c.fk_user_author,";
-    $sql .= " p.ref, p.label, p.description, p.price, p.tva_tx, p.duration, cd.rowid";
-    $sql .= " FROM ".MAIN_DB_PREFIX."contrat as c";
-    $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p";
-    $sql .= " ON c.fk_product = p.rowid";
-    $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."contratdet as cd";
-    $sql .= " ON c.rowid=cd.fk_contrat";
-    $sql .= " WHERE cd.rowid IS NULL AND p.rowid IS NOT NULL";
-    $resql = $db->query($sql);
+	$sql = "SELECT c.rowid as cref, c.date_contrat, c.statut, c.fk_product, c.fk_facture, c.fk_user_author,";
+	$sql .= " p.ref, p.label, p.description, p.price, p.tva_tx, p.duration, cd.rowid";
+	$sql .= " FROM ".MAIN_DB_PREFIX."contrat as c";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p";
+	$sql .= " ON c.fk_product = p.rowid";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."contratdet as cd";
+	$sql .= " ON c.rowid=cd.fk_contrat";
+	$sql .= " WHERE cd.rowid IS NULL AND p.rowid IS NOT NULL";
+	$resql = $db->query($sql);
 
-    dolibarr_install_syslog("upgrade2::migrate_contracts_det");
-    if ($resql)
-    {
-        $i = 0;
-        $row = array();
-        $num = $db->num_rows($resql);
+	dolibarr_install_syslog("upgrade2::migrate_contracts_det");
+	if ($resql)
+	{
+		$i = 0;
+		$row = array();
+		$num = $db->num_rows($resql);
 
-        if ($num)
-        {
-            print $langs->trans('MigrationContractsNumberToUpdate', $num)."<br>\n";
-            $db->begin();
+		if ($num)
+		{
+			print $langs->trans('MigrationContractsNumberToUpdate', $num)."<br>\n";
+			$db->begin();
 
-            while ($i < $num)
-            {
-                $obj = $db->fetch_object($resql);
+			while ($i < $num)
+			{
+				$obj = $db->fetch_object($resql);
 
-                $sql = "INSERT INTO ".MAIN_DB_PREFIX."contratdet (";
-                $sql .= "fk_contrat, fk_product, statut, label, description,";
-                $sql .= "date_ouverture_prevue, date_ouverture, date_fin_validite, tva_tx, qty,";
-                $sql .= "subprice, price_ht, fk_user_author, fk_user_ouverture)";
-                $sql .= " VALUES (";
-                $sql .= $obj->cref.", ".($obj->fk_product ? $obj->fk_product : 0).", ";
-                $sql .= "0, ";
-                $sql .= "'".$db->escape($obj->label)."', null, ";
-                $sql .= ($obj->date_contrat ? "'".$db->escape($obj->date_contrat)."'" : "null").", ";
-                $sql .= "null, ";
-                $sql .= "null, ";
-                $sql .= "'".$db->escape($obj->tva_tx)."' , 1, ";
-                $sql .= "'".$db->escape($obj->price)."', '".$db->escape($obj->price)."', ".$obj->fk_user_author.",";
-                $sql .= "null";
-                $sql .= ")";
+				$sql = "INSERT INTO ".MAIN_DB_PREFIX."contratdet (";
+				$sql .= "fk_contrat, fk_product, statut, label, description,";
+				$sql .= "date_ouverture_prevue, date_ouverture, date_fin_validite, tva_tx, qty,";
+				$sql .= "subprice, price_ht, fk_user_author, fk_user_ouverture)";
+				$sql .= " VALUES (";
+				$sql .= $obj->cref.", ".($obj->fk_product ? $obj->fk_product : 0).", ";
+				$sql .= "0, ";
+				$sql .= "'".$db->escape($obj->label)."', null, ";
+				$sql .= ($obj->date_contrat ? "'".$db->escape($obj->date_contrat)."'" : "null").", ";
+				$sql .= "null, ";
+				$sql .= "null, ";
+				$sql .= "'".$db->escape($obj->tva_tx)."' , 1, ";
+				$sql .= "'".$db->escape($obj->price)."', '".$db->escape($obj->price)."', ".$obj->fk_user_author.",";
+				$sql .= "null";
+				$sql .= ")";
 
-                if ($db->query($sql))
-                {
-                    print $langs->trans('MigrationContractsLineCreation', $obj->cref)."<br>\n";
-                } else {
-                    dol_print_error($db);
-                    $nberr++;
-                }
+				if ($db->query($sql))
+				{
+					print $langs->trans('MigrationContractsLineCreation', $obj->cref)."<br>\n";
+				} else {
+					dol_print_error($db);
+					$nberr++;
+				}
 
-                $i++;
-            }
+				$i++;
+			}
 
-            if (!$nberr)
-            {
-                //      $db->rollback();
-                $db->commit();
-                print $langs->trans('MigrationSuccessfullUpdate')."<br>";
-            } else {
-                $db->rollback();
-                print $langs->trans('MigrationUpdateFailed').'<br>';
-            }
-        } else {
-            print $langs->trans('MigrationContractsNothingToUpdate')."<br>\n";
-        }
-    } else {
-        print $langs->trans('MigrationContractsFieldDontExist')."<br>\n";
-        //    dol_print_error($db);
-    }
+			if (!$nberr)
+			{
+				//      $db->rollback();
+				$db->commit();
+				print $langs->trans('MigrationSuccessfullUpdate')."<br>";
+			} else {
+				$db->rollback();
+				print $langs->trans('MigrationUpdateFailed').'<br>';
+			}
+		} else {
+			print $langs->trans('MigrationContractsNothingToUpdate')."<br>\n";
+		}
+	} else {
+		print $langs->trans('MigrationContractsFieldDontExist')."<br>\n";
+		//    dol_print_error($db);
+	}
 
-    print '</td></tr>';
+	print '</td></tr>';
 }
 
 /**
@@ -1027,73 +1027,73 @@ function migrate_contracts_det($db, $langs, $conf)
  */
 function migrate_links_transfert($db, $langs, $conf)
 {
-    print '<tr><td colspan="4">';
+	print '<tr><td colspan="4">';
 
-    $nberr = 0;
+	$nberr = 0;
 
-    print '<br>';
-    print '<b>'.$langs->trans('MigrationBankTransfertsUpdate')."</b><br>\n";
+	print '<br>';
+	print '<b>'.$langs->trans('MigrationBankTransfertsUpdate')."</b><br>\n";
 
-    $sql = "SELECT ba.rowid as barowid, bb.rowid as bbrowid";
-    $sql .= " FROM ".MAIN_DB_PREFIX."bank as bb, ".MAIN_DB_PREFIX."bank as ba";
-    $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank_url as bu ON bu.fk_bank = ba.rowid";
-    $sql .= " WHERE ba.amount = -bb.amount AND ba.fk_account <> bb.fk_account";
-    $sql .= " AND ba.datev = bb.datev AND ba.datec = bb.datec";
-    $sql .= " AND bu.fk_bank IS NULL";
-    $resql = $db->query($sql);
+	$sql = "SELECT ba.rowid as barowid, bb.rowid as bbrowid";
+	$sql .= " FROM ".MAIN_DB_PREFIX."bank as bb, ".MAIN_DB_PREFIX."bank as ba";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank_url as bu ON bu.fk_bank = ba.rowid";
+	$sql .= " WHERE ba.amount = -bb.amount AND ba.fk_account <> bb.fk_account";
+	$sql .= " AND ba.datev = bb.datev AND ba.datec = bb.datec";
+	$sql .= " AND bu.fk_bank IS NULL";
+	$resql = $db->query($sql);
 
-    dolibarr_install_syslog("upgrade2::migrate_links_transfert");
-    if ($resql)
-    {
-        $i = 0;
-        $row = array();
-        $num = $db->num_rows($resql);
+	dolibarr_install_syslog("upgrade2::migrate_links_transfert");
+	if ($resql)
+	{
+		$i = 0;
+		$row = array();
+		$num = $db->num_rows($resql);
 
-        if ($num)
-        {
-            print $langs->trans('MigrationBankTransfertsToUpdate', $num)."<br>\n";
-            $db->begin();
+		if ($num)
+		{
+			print $langs->trans('MigrationBankTransfertsToUpdate', $num)."<br>\n";
+			$db->begin();
 
-            while ($i < $num)
-            {
-                $obj = $db->fetch_object($resql);
+			while ($i < $num)
+			{
+				$obj = $db->fetch_object($resql);
 
-                $sql = "INSERT INTO ".MAIN_DB_PREFIX."bank_url (";
-                $sql .= "fk_bank, url_id, url, label, type";
-                $sql .= ")";
-                $sql .= " VALUES (";
-                $sql .= $obj->barowid.",".$obj->bbrowid.", '/compta/bank/line.php?rowid=', '(banktransfert)', 'banktransfert'";
-                $sql .= ")";
+				$sql = "INSERT INTO ".MAIN_DB_PREFIX."bank_url (";
+				$sql .= "fk_bank, url_id, url, label, type";
+				$sql .= ")";
+				$sql .= " VALUES (";
+				$sql .= $obj->barowid.",".$obj->bbrowid.", '/compta/bank/line.php?rowid=', '(banktransfert)', 'banktransfert'";
+				$sql .= ")";
 
-                print $sql.'<br>';
-                dolibarr_install_syslog("migrate_links_transfert");
+				print $sql.'<br>';
+				dolibarr_install_syslog("migrate_links_transfert");
 
-                if (!$db->query($sql))
-                {
-                    dol_print_error($db);
-                    $nberr++;
-                }
+				if (!$db->query($sql))
+				{
+					dol_print_error($db);
+					$nberr++;
+				}
 
-                $i++;
-            }
+				$i++;
+			}
 
-            if (!$nberr)
-            {
-                //      $db->rollback();
-                $db->commit();
-                print $langs->trans('MigrationSuccessfullUpdate')."<br>";
-            } else {
-                $db->rollback();
-                print $langs->trans('MigrationUpdateFailed').'<br>';
-            }
-        } else {
-            print $langs->trans('MigrationBankTransfertsNothingToUpdate')."<br>\n";
-        }
-    } else {
-        dol_print_error($db);
-    }
+			if (!$nberr)
+			{
+				//      $db->rollback();
+				$db->commit();
+				print $langs->trans('MigrationSuccessfullUpdate')."<br>";
+			} else {
+				$db->rollback();
+				print $langs->trans('MigrationUpdateFailed').'<br>';
+			}
+		} else {
+			print $langs->trans('MigrationBankTransfertsNothingToUpdate')."<br>\n";
+		}
+	} else {
+		dol_print_error($db);
+	}
 
-    print '</td></tr>';
+	print '</td></tr>';
 }
 
 /**
@@ -1106,28 +1106,28 @@ function migrate_links_transfert($db, $langs, $conf)
  */
 function migrate_contracts_date1($db, $langs, $conf)
 {
-    print '<tr><td colspan="4">';
+	print '<tr><td colspan="4">';
 
-    print '<br>';
-    print '<b>'.$langs->trans('MigrationContractsEmptyDatesUpdate')."</b><br>\n";
+	print '<br>';
+	print '<b>'.$langs->trans('MigrationContractsEmptyDatesUpdate')."</b><br>\n";
 
-    $sql = "update ".MAIN_DB_PREFIX."contrat set date_contrat=tms where date_contrat is null";
-    dolibarr_install_syslog("upgrade2::migrate_contracts_date1");
-    $resql = $db->query($sql);
-    if (!$resql) dol_print_error($db);
-    if ($db->affected_rows($resql) > 0)
-    print $langs->trans('MigrationContractsEmptyDatesUpdateSuccess')."<br>\n";
-    else print $langs->trans('MigrationContractsEmptyDatesNothingToUpdate')."<br>\n";
+	$sql = "update ".MAIN_DB_PREFIX."contrat set date_contrat=tms where date_contrat is null";
+	dolibarr_install_syslog("upgrade2::migrate_contracts_date1");
+	$resql = $db->query($sql);
+	if (!$resql) dol_print_error($db);
+	if ($db->affected_rows($resql) > 0)
+	print $langs->trans('MigrationContractsEmptyDatesUpdateSuccess')."<br>\n";
+	else print $langs->trans('MigrationContractsEmptyDatesNothingToUpdate')."<br>\n";
 
-    $sql = "update ".MAIN_DB_PREFIX."contrat set datec=tms where datec is null";
-    dolibarr_install_syslog("upgrade2::migrate_contracts_date1");
-    $resql = $db->query($sql);
-    if (!$resql) dol_print_error($db);
-    if ($db->affected_rows($resql) > 0)
-    print $langs->trans('MigrationContractsEmptyCreationDatesUpdateSuccess')."<br>\n";
-    else print $langs->trans('MigrationContractsEmptyCreationDatesNothingToUpdate')."<br>\n";
+	$sql = "update ".MAIN_DB_PREFIX."contrat set datec=tms where datec is null";
+	dolibarr_install_syslog("upgrade2::migrate_contracts_date1");
+	$resql = $db->query($sql);
+	if (!$resql) dol_print_error($db);
+	if ($db->affected_rows($resql) > 0)
+	print $langs->trans('MigrationContractsEmptyCreationDatesUpdateSuccess')."<br>\n";
+	else print $langs->trans('MigrationContractsEmptyCreationDatesNothingToUpdate')."<br>\n";
 
-    print '</td></tr>';
+	print '</td></tr>';
 }
 
 /**
@@ -1140,62 +1140,62 @@ function migrate_contracts_date1($db, $langs, $conf)
  */
 function migrate_contracts_date2($db, $langs, $conf)
 {
-    print '<tr><td colspan="4">';
+	print '<tr><td colspan="4">';
 
-    $nberr = 0;
+	$nberr = 0;
 
-    print '<br>';
-    print '<b>'.$langs->trans('MigrationContractsInvalidDatesUpdate')."</b><br>\n";
+	print '<br>';
+	print '<b>'.$langs->trans('MigrationContractsInvalidDatesUpdate')."</b><br>\n";
 
-    $sql = "SELECT c.rowid as cref, c.datec, c.date_contrat, MIN(cd.date_ouverture) as datemin";
-    $sql .= " FROM ".MAIN_DB_PREFIX."contrat as c,";
-    $sql .= " ".MAIN_DB_PREFIX."contratdet as cd";
-    $sql .= " WHERE c.rowid=cd.fk_contrat AND cd.date_ouverture IS NOT NULL";
-    $sql .= " GROUP BY c.rowid, c.date_contrat";
-    $resql = $db->query($sql);
+	$sql = "SELECT c.rowid as cref, c.datec, c.date_contrat, MIN(cd.date_ouverture) as datemin";
+	$sql .= " FROM ".MAIN_DB_PREFIX."contrat as c,";
+	$sql .= " ".MAIN_DB_PREFIX."contratdet as cd";
+	$sql .= " WHERE c.rowid=cd.fk_contrat AND cd.date_ouverture IS NOT NULL";
+	$sql .= " GROUP BY c.rowid, c.date_contrat";
+	$resql = $db->query($sql);
 
-    dolibarr_install_syslog("upgrade2::migrate_contracts_date2");
-    if ($resql)
-    {
-        $i = 0;
-        $row = array();
-        $num = $db->num_rows($resql);
+	dolibarr_install_syslog("upgrade2::migrate_contracts_date2");
+	if ($resql)
+	{
+		$i = 0;
+		$row = array();
+		$num = $db->num_rows($resql);
 
-        if ($num)
-        {
-            $nbcontratsmodifie = 0;
-            $db->begin();
+		if ($num)
+		{
+			$nbcontratsmodifie = 0;
+			$db->begin();
 
-            while ($i < $num)
-            {
-                $obj = $db->fetch_object($resql);
-                if ($obj->date_contrat > $obj->datemin)
-                {
-                	$datemin = $db->jdate($obj->datemin);
+			while ($i < $num)
+			{
+				$obj = $db->fetch_object($resql);
+				if ($obj->date_contrat > $obj->datemin)
+				{
+					$datemin = $db->jdate($obj->datemin);
 
-                    print $langs->trans('MigrationContractsInvalidDateFix', $obj->cref, $obj->date_contrat, $obj->datemin)."<br>\n";
-                    $sql = "UPDATE ".MAIN_DB_PREFIX."contrat";
-                    $sql .= " SET date_contrat='".$db->idate($datemin)."'";
-                    $sql .= " WHERE rowid=".$obj->cref;
-                    $resql2 = $db->query($sql);
-                    if (!$resql2) dol_print_error($db);
+					print $langs->trans('MigrationContractsInvalidDateFix', $obj->cref, $obj->date_contrat, $obj->datemin)."<br>\n";
+					$sql = "UPDATE ".MAIN_DB_PREFIX."contrat";
+					$sql .= " SET date_contrat='".$db->idate($datemin)."'";
+					$sql .= " WHERE rowid=".$obj->cref;
+					$resql2 = $db->query($sql);
+					if (!$resql2) dol_print_error($db);
 
-                    $nbcontratsmodifie++;
-                }
-                $i++;
-            }
+					$nbcontratsmodifie++;
+				}
+				$i++;
+			}
 
-            $db->commit();
+			$db->commit();
 
-            if ($nbcontratsmodifie)
-            print $langs->trans('MigrationContractsInvalidDatesNumber', $nbcontratsmodifie)."<br>\n";
-            else print  $langs->trans('MigrationContractsInvalidDatesNothingToUpdate')."<br>\n";
-        }
-    } else {
-        dol_print_error($db);
-    }
+			if ($nbcontratsmodifie)
+			print $langs->trans('MigrationContractsInvalidDatesNumber', $nbcontratsmodifie)."<br>\n";
+			else print  $langs->trans('MigrationContractsInvalidDatesNothingToUpdate')."<br>\n";
+		}
+	} else {
+		dol_print_error($db);
+	}
 
-    print '</td></tr>';
+	print '</td></tr>';
 }
 
 /**
@@ -1208,20 +1208,20 @@ function migrate_contracts_date2($db, $langs, $conf)
  */
 function migrate_contracts_date3($db, $langs, $conf)
 {
-    print '<tr><td colspan="4">';
+	print '<tr><td colspan="4">';
 
-    print '<br>';
-    print '<b>'.$langs->trans('MigrationContractsIncoherentCreationDateUpdate')."</b><br>\n";
+	print '<br>';
+	print '<b>'.$langs->trans('MigrationContractsIncoherentCreationDateUpdate')."</b><br>\n";
 
-    $sql = "update ".MAIN_DB_PREFIX."contrat set datec=date_contrat where datec is null or datec > date_contrat";
-    dolibarr_install_syslog("upgrade2::migrate_contracts_date3");
-    $resql = $db->query($sql);
-    if (!$resql) dol_print_error($db);
-    if ($db->affected_rows($resql) > 0)
-    print $langs->trans('MigrationContractsIncoherentCreationDateUpdateSuccess')."<br>\n";
-    else print $langs->trans('MigrationContractsIncoherentCreationDateNothingToUpdate')."<br>\n";
+	$sql = "update ".MAIN_DB_PREFIX."contrat set datec=date_contrat where datec is null or datec > date_contrat";
+	dolibarr_install_syslog("upgrade2::migrate_contracts_date3");
+	$resql = $db->query($sql);
+	if (!$resql) dol_print_error($db);
+	if ($db->affected_rows($resql) > 0)
+	print $langs->trans('MigrationContractsIncoherentCreationDateUpdateSuccess')."<br>\n";
+	else print $langs->trans('MigrationContractsIncoherentCreationDateNothingToUpdate')."<br>\n";
 
-    print '</td></tr>';
+	print '</td></tr>';
 }
 
 /**
@@ -1234,51 +1234,51 @@ function migrate_contracts_date3($db, $langs, $conf)
  */
 function migrate_contracts_open($db, $langs, $conf)
 {
-    print '<tr><td colspan="4">';
+	print '<tr><td colspan="4">';
 
-    print '<br>';
-    print '<b>'.$langs->trans('MigrationReopeningContracts')."</b><br>\n";
+	print '<br>';
+	print '<b>'.$langs->trans('MigrationReopeningContracts')."</b><br>\n";
 
-    $sql = "SELECT c.rowid as cref FROM ".MAIN_DB_PREFIX."contrat as c, ".MAIN_DB_PREFIX."contratdet as cd";
-    $sql .= " WHERE cd.statut = 4 AND c.statut=2 AND c.rowid=cd.fk_contrat";
-    dolibarr_install_syslog("upgrade2::migrate_contracts_open");
-    $resql = $db->query($sql);
-    if (!$resql) dol_print_error($db);
-    if ($db->affected_rows($resql) > 0) {
-        $i = 0;
-        $row = array();
-        $num = $db->num_rows($resql);
+	$sql = "SELECT c.rowid as cref FROM ".MAIN_DB_PREFIX."contrat as c, ".MAIN_DB_PREFIX."contratdet as cd";
+	$sql .= " WHERE cd.statut = 4 AND c.statut=2 AND c.rowid=cd.fk_contrat";
+	dolibarr_install_syslog("upgrade2::migrate_contracts_open");
+	$resql = $db->query($sql);
+	if (!$resql) dol_print_error($db);
+	if ($db->affected_rows($resql) > 0) {
+		$i = 0;
+		$row = array();
+		$num = $db->num_rows($resql);
 
-        if ($num)
-        {
-            $nbcontratsmodifie = 0;
-            $db->begin();
+		if ($num)
+		{
+			$nbcontratsmodifie = 0;
+			$db->begin();
 
-            while ($i < $num)
-            {
-                $obj = $db->fetch_object($resql);
+			while ($i < $num)
+			{
+				$obj = $db->fetch_object($resql);
 
-                print $langs->trans('MigrationReopenThisContract', $obj->cref)."<br>\n";
-                $sql = "UPDATE ".MAIN_DB_PREFIX."contrat";
-                $sql .= " SET statut=1";
-                $sql .= " WHERE rowid=".$obj->cref;
-                $resql2 = $db->query($sql);
-                if (!$resql2) dol_print_error($db);
+				print $langs->trans('MigrationReopenThisContract', $obj->cref)."<br>\n";
+				$sql = "UPDATE ".MAIN_DB_PREFIX."contrat";
+				$sql .= " SET statut=1";
+				$sql .= " WHERE rowid=".$obj->cref;
+				$resql2 = $db->query($sql);
+				if (!$resql2) dol_print_error($db);
 
-                $nbcontratsmodifie++;
+				$nbcontratsmodifie++;
 
-                $i++;
-            }
+				$i++;
+			}
 
-            $db->commit();
+			$db->commit();
 
-            if ($nbcontratsmodifie)
-            print $langs->trans('MigrationReopenedContractsNumber', $nbcontratsmodifie)."<br>\n";
-            else print $langs->trans('MigrationReopeningContractsNothingToUpdate')."<br>\n";
-        }
-    } else print $langs->trans('MigrationReopeningContractsNothingToUpdate')."<br>\n";
+			if ($nbcontratsmodifie)
+			print $langs->trans('MigrationReopenedContractsNumber', $nbcontratsmodifie)."<br>\n";
+			else print $langs->trans('MigrationReopeningContractsNothingToUpdate')."<br>\n";
+		}
+	} else print $langs->trans('MigrationReopeningContractsNothingToUpdate')."<br>\n";
 
-    print '</td></tr>';
+	print '</td></tr>';
 }
 
 /**
@@ -1291,101 +1291,101 @@ function migrate_contracts_open($db, $langs, $conf)
  */
 function migrate_paiementfourn_facturefourn($db, $langs, $conf)
 {
-    global $bc;
+	global $bc;
 
-    print '<tr><td colspan="4">';
-    print '<br>';
-    print '<b>'.$langs->trans('SuppliersInvoices')."</b><br>\n";
-    print '</td></tr>';
+	print '<tr><td colspan="4">';
+	print '<br>';
+	print '<b>'.$langs->trans('SuppliersInvoices')."</b><br>\n";
+	print '</td></tr>';
 
-    $result = $db->DDLDescTable(MAIN_DB_PREFIX."paiementfourn", "fk_facture_fourn");
-    $obj = $db->fetch_object($result);
-    if ($obj)
-    {
-        $error = 0;
-        $nb = 0;
+	$result = $db->DDLDescTable(MAIN_DB_PREFIX."paiementfourn", "fk_facture_fourn");
+	$obj = $db->fetch_object($result);
+	if ($obj)
+	{
+		$error = 0;
+		$nb = 0;
 
-        $select_sql = 'SELECT rowid, fk_facture_fourn, amount';
-        $select_sql .= ' FROM '.MAIN_DB_PREFIX.'paiementfourn';
-        $select_sql .= ' WHERE fk_facture_fourn IS NOT NULL';
+		$select_sql = 'SELECT rowid, fk_facture_fourn, amount';
+		$select_sql .= ' FROM '.MAIN_DB_PREFIX.'paiementfourn';
+		$select_sql .= ' WHERE fk_facture_fourn IS NOT NULL';
 
-        dolibarr_install_syslog("upgrade2::migrate_paiementfourn_facturefourn");
-        $select_resql = $db->query($select_sql);
-        if ($select_resql)
-        {
-            $select_num = $db->num_rows($select_resql);
-            $i = 0;
-            $var = true;
+		dolibarr_install_syslog("upgrade2::migrate_paiementfourn_facturefourn");
+		$select_resql = $db->query($select_sql);
+		if ($select_resql)
+		{
+			$select_num = $db->num_rows($select_resql);
+			$i = 0;
+			$var = true;
 
-            // Pour chaque paiement fournisseur, on insere une ligne dans paiementfourn_facturefourn
-            while (($i < $select_num) && (!$error))
-            {
-                $var = !$var;
-                $select_obj = $db->fetch_object($select_resql);
+			// Pour chaque paiement fournisseur, on insere une ligne dans paiementfourn_facturefourn
+			while (($i < $select_num) && (!$error))
+			{
+				$var = !$var;
+				$select_obj = $db->fetch_object($select_resql);
 
-                // Verifier si la ligne est deja dans la nouvelle table. On ne veut pas inserer de doublons.
-                $check_sql = 'SELECT fk_paiementfourn, fk_facturefourn';
-                $check_sql .= ' FROM '.MAIN_DB_PREFIX.'paiementfourn_facturefourn';
-                $check_sql .= ' WHERE fk_paiementfourn = '.$select_obj->rowid.' AND fk_facturefourn = '.$select_obj->fk_facture_fourn;
-                $check_resql = $db->query($check_sql);
-                if ($check_resql)
-                {
-                    $check_num = $db->num_rows($check_resql);
-                    if ($check_num == 0)
-                    {
-                        $db->begin();
+				// Verifier si la ligne est deja dans la nouvelle table. On ne veut pas inserer de doublons.
+				$check_sql = 'SELECT fk_paiementfourn, fk_facturefourn';
+				$check_sql .= ' FROM '.MAIN_DB_PREFIX.'paiementfourn_facturefourn';
+				$check_sql .= ' WHERE fk_paiementfourn = '.$select_obj->rowid.' AND fk_facturefourn = '.$select_obj->fk_facture_fourn;
+				$check_resql = $db->query($check_sql);
+				if ($check_resql)
+				{
+					$check_num = $db->num_rows($check_resql);
+					if ($check_num == 0)
+					{
+						$db->begin();
 
-                        if ($nb == 0)
-                        {
-                            print '<tr><td colspan="4" class="nowrap"><b>'.$langs->trans('SuppliersInvoices').'</b></td></tr>';
-                            print '<tr><td>fk_paiementfourn</td><td>fk_facturefourn</td><td>'.$langs->trans('Amount').'</td><td>&nbsp;</td></tr>';
-                        }
+						if ($nb == 0)
+						{
+							print '<tr><td colspan="4" class="nowrap"><b>'.$langs->trans('SuppliersInvoices').'</b></td></tr>';
+							print '<tr><td>fk_paiementfourn</td><td>fk_facturefourn</td><td>'.$langs->trans('Amount').'</td><td>&nbsp;</td></tr>';
+						}
 
-                        print '<tr class="oddeven">';
-                        print '<td>'.$select_obj->rowid.'</td><td>'.$select_obj->fk_facture_fourn.'</td><td>'.$select_obj->amount.'</td>';
+						print '<tr class="oddeven">';
+						print '<td>'.$select_obj->rowid.'</td><td>'.$select_obj->fk_facture_fourn.'</td><td>'.$select_obj->amount.'</td>';
 
-                        $insert_sql = 'INSERT INTO '.MAIN_DB_PREFIX.'paiementfourn_facturefourn SET ';
-                        $insert_sql .= ' fk_paiementfourn = \''.$select_obj->rowid.'\',';
-                        $insert_sql .= ' fk_facturefourn  = \''.$select_obj->fk_facture_fourn.'\',';
-                        $insert_sql .= ' amount           = \''.$select_obj->amount.'\'';
-                        $insert_resql = $db->query($insert_sql);
+						$insert_sql = 'INSERT INTO '.MAIN_DB_PREFIX.'paiementfourn_facturefourn SET ';
+						$insert_sql .= ' fk_paiementfourn = \''.$select_obj->rowid.'\',';
+						$insert_sql .= ' fk_facturefourn  = \''.$select_obj->fk_facture_fourn.'\',';
+						$insert_sql .= ' amount           = \''.$select_obj->amount.'\'';
+						$insert_resql = $db->query($insert_sql);
 
-                        if ($insert_resql)
-                        {
-                            $nb++;
-                            print '<td><span style="color:green">'.$langs->trans("OK").'</span></td>';
-                        } else {
-                            print '<td><span style="color:red">Error on insert</span></td>';
-                            $error++;
-                        }
-                        print '</tr>';
-                    }
-                } else {
-                    $error++;
-                }
-                $i++;
-            }
-        } else {
-            $error++;
-        }
+						if ($insert_resql)
+						{
+							$nb++;
+							print '<td><span style="color:green">'.$langs->trans("OK").'</span></td>';
+						} else {
+							print '<td><span style="color:red">Error on insert</span></td>';
+							$error++;
+						}
+						print '</tr>';
+					}
+				} else {
+					$error++;
+				}
+				$i++;
+			}
+		} else {
+			$error++;
+		}
 
-        if (!$error)
-        {
-            if (!$nb)
-            {
-                print '<tr><td>'.$langs->trans("AlreadyDone").'</td></tr>';
-            }
-            $db->commit();
+		if (!$error)
+		{
+			if (!$nb)
+			{
+				print '<tr><td>'.$langs->trans("AlreadyDone").'</td></tr>';
+			}
+			$db->commit();
 
-            $sql = "ALTER TABLE ".MAIN_DB_PREFIX."paiementfourn DROP COLUMN fk_facture_fourn";
-            $db->query($sql);
-        } else {
-            print '<tr><td>'.$langs->trans("Error").'</td></tr>';
-            $db->rollback();
-        }
-    } else {
-        print '<tr><td>'.$langs->trans("AlreadyDone").'</td></tr>';
-    }
+			$sql = "ALTER TABLE ".MAIN_DB_PREFIX."paiementfourn DROP COLUMN fk_facture_fourn";
+			$db->query($sql);
+		} else {
+			print '<tr><td>'.$langs->trans("Error").'</td></tr>';
+			$db->rollback();
+		}
+	} else {
+		print '<tr><td>'.$langs->trans("AlreadyDone").'</td></tr>';
+	}
 }
 
 /**
@@ -1398,105 +1398,105 @@ function migrate_paiementfourn_facturefourn($db, $langs, $conf)
  */
 function migrate_price_facture($db, $langs, $conf)
 {
-    $err = 0;
+	$err = 0;
 
-    $tmpmysoc = new Societe($db);
-    $tmpmysoc->setMysoc($conf);
+	$tmpmysoc = new Societe($db);
+	$tmpmysoc->setMysoc($conf);
 
-    $db->begin();
+	$db->begin();
 
-    print '<tr><td colspan="4">';
+	print '<tr><td colspan="4">';
 
-    print '<br>';
-    print '<b>'.$langs->trans('MigrationInvoice')."</b><br>\n";
+	print '<br>';
+	print '<b>'.$langs->trans('MigrationInvoice')."</b><br>\n";
 
-    // List of invoice lines not up to date
-    $sql = "SELECT fd.rowid, fd.qty, fd.subprice, fd.remise_percent, fd.tva_tx as vatrate, fd.total_ttc, fd.info_bits,";
-    $sql .= " f.rowid as facid, f.remise_percent as remise_percent_global, f.total_ttc as total_ttc_f";
-    $sql .= " FROM ".MAIN_DB_PREFIX."facturedet as fd, ".MAIN_DB_PREFIX."facture as f";
-    $sql .= " WHERE fd.fk_facture = f.rowid";
-    $sql .= " AND (((fd.total_ttc = 0 AND fd.remise_percent != 100) or fd.total_ttc IS NULL) or f.total_ttc IS NULL)";
-    //print $sql;
+	// List of invoice lines not up to date
+	$sql = "SELECT fd.rowid, fd.qty, fd.subprice, fd.remise_percent, fd.tva_tx as vatrate, fd.total_ttc, fd.info_bits,";
+	$sql .= " f.rowid as facid, f.remise_percent as remise_percent_global, f.total_ttc as total_ttc_f";
+	$sql .= " FROM ".MAIN_DB_PREFIX."facturedet as fd, ".MAIN_DB_PREFIX."facture as f";
+	$sql .= " WHERE fd.fk_facture = f.rowid";
+	$sql .= " AND (((fd.total_ttc = 0 AND fd.remise_percent != 100) or fd.total_ttc IS NULL) or f.total_ttc IS NULL)";
+	//print $sql;
 
-    dolibarr_install_syslog("upgrade2::migrate_price_facture");
-    $resql = $db->query($sql);
-    if ($resql)
-    {
-        $num = $db->num_rows($resql);
-        $i = 0;
-        if ($num)
-        {
-            while ($i < $num)
-            {
-                $obj = $db->fetch_object($resql);
+	dolibarr_install_syslog("upgrade2::migrate_price_facture");
+	$resql = $db->query($sql);
+	if ($resql)
+	{
+		$num = $db->num_rows($resql);
+		$i = 0;
+		if ($num)
+		{
+			while ($i < $num)
+			{
+				$obj = $db->fetch_object($resql);
 
-                $rowid = $obj->rowid;
-                $qty = $obj->qty;
-                $pu = $obj->subprice;
-                $vatrate = $obj->vatrate;
-                $remise_percent = $obj->remise_percent;
-                $remise_percent_global = $obj->remise_percent_global;
-                $total_ttc_f = $obj->total_ttc_f;
-                $info_bits = $obj->info_bits;
+				$rowid = $obj->rowid;
+				$qty = $obj->qty;
+				$pu = $obj->subprice;
+				$vatrate = $obj->vatrate;
+				$remise_percent = $obj->remise_percent;
+				$remise_percent_global = $obj->remise_percent_global;
+				$total_ttc_f = $obj->total_ttc_f;
+				$info_bits = $obj->info_bits;
 
-                // On met a jour les 3 nouveaux champs
-                $facligne = new FactureLigne($db);
-                $facligne->fetch($rowid);
+				// On met a jour les 3 nouveaux champs
+				$facligne = new FactureLigne($db);
+				$facligne->fetch($rowid);
 
-                $result = calcul_price_total($qty, $pu, $remise_percent, $vatrate, 0, 0, $remise_percent_global, 'HT', $info_bits, $facligne->product_type, $tmpmysoc);
-                $total_ht  = $result[0];
-                $total_tva = $result[1];
-                $total_ttc = $result[2];
+				$result = calcul_price_total($qty, $pu, $remise_percent, $vatrate, 0, 0, $remise_percent_global, 'HT', $info_bits, $facligne->product_type, $tmpmysoc);
+				$total_ht  = $result[0];
+				$total_tva = $result[1];
+				$total_ttc = $result[2];
 
-                $facligne->total_ht  = $total_ht;
-                $facligne->total_tva = $total_tva;
-                $facligne->total_ttc = $total_ttc;
+				$facligne->total_ht  = $total_ht;
+				$facligne->total_tva = $total_tva;
+				$facligne->total_ttc = $total_ttc;
 
-                dolibarr_install_syslog("upgrade2: line ".$rowid.": facid=".$obj->facid." pu=".$pu." qty=".$qty." vatrate=".$vatrate." remise_percent=".$remise_percent." remise_global=".$remise_percent_global." -> ".$total_ht.", ".$total_tva.", ".$total_ttc);
-                print ". ";
-                $facligne->update_total();
+				dolibarr_install_syslog("upgrade2: line ".$rowid.": facid=".$obj->facid." pu=".$pu." qty=".$qty." vatrate=".$vatrate." remise_percent=".$remise_percent." remise_global=".$remise_percent_global." -> ".$total_ht.", ".$total_tva.", ".$total_ttc);
+				print ". ";
+				$facligne->update_total();
 
 
-                /* On touche a facture mere uniquement si total_ttc = 0 */
-                if (!$total_ttc_f)
-                {
-                    $facture = new Facture($db);
-                    $facture->id = $obj->facid;
+				/* On touche a facture mere uniquement si total_ttc = 0 */
+				if (!$total_ttc_f)
+				{
+					$facture = new Facture($db);
+					$facture->id = $obj->facid;
 
-                    if ($facture->fetch($facture->id) >= 0)
-                    {
-                        if ($facture->update_price() > 0)
-                        {
-                            //print $facture->id;
-                        } else {
-                            print "Error id=".$facture->id;
-                            $err++;
-                        }
-                    } else {
-                        print "Error #3";
-                        $err++;
-                    }
-                }
-                print " ";
+					if ($facture->fetch($facture->id) >= 0)
+					{
+						if ($facture->update_price() > 0)
+						{
+							//print $facture->id;
+						} else {
+							print "Error id=".$facture->id;
+							$err++;
+						}
+					} else {
+						print "Error #3";
+						$err++;
+					}
+				}
+				print " ";
 
-                $i++;
-            }
-        } else {
-            print $langs->trans("AlreadyDone");
-        }
-        $db->free($resql);
+				$i++;
+			}
+		} else {
+			print $langs->trans("AlreadyDone");
+		}
+		$db->free($resql);
 
-        $db->commit();
-    } else {
-        print "Error #1 ".$db->error();
-        $err++;
+		$db->commit();
+	} else {
+		print "Error #1 ".$db->error();
+		$err++;
 
-        $db->rollback();
-    }
+		$db->rollback();
+	}
 
-    print '<br>';
+	print '<br>';
 
-    print '</td></tr>';
+	print '</td></tr>';
 }
 
 /**
@@ -1512,59 +1512,59 @@ function migrate_price_propal($db, $langs, $conf)
    	$tmpmysoc = new Societe($db);
 	$tmpmysoc->setMysoc($conf);
 
-    $db->begin();
+	$db->begin();
 
-    print '<tr><td colspan="4">';
+	print '<tr><td colspan="4">';
 
-    print '<br>';
-    print '<b>'.$langs->trans('MigrationProposal')."</b><br>\n";
+	print '<br>';
+	print '<b>'.$langs->trans('MigrationProposal')."</b><br>\n";
 
-    // List of proposal lines not up to date
-    $sql = "SELECT pd.rowid, pd.qty, pd.subprice, pd.remise_percent, pd.tva_tx as vatrate, pd.info_bits,";
-    $sql .= " p.rowid as propalid, p.remise_percent as remise_percent_global";
-    $sql .= " FROM ".MAIN_DB_PREFIX."propaldet as pd, ".MAIN_DB_PREFIX."propal as p";
-    $sql .= " WHERE pd.fk_propal = p.rowid";
-    $sql .= " AND ((pd.total_ttc = 0 AND pd.remise_percent != 100) or pd.total_ttc IS NULL)";
+	// List of proposal lines not up to date
+	$sql = "SELECT pd.rowid, pd.qty, pd.subprice, pd.remise_percent, pd.tva_tx as vatrate, pd.info_bits,";
+	$sql .= " p.rowid as propalid, p.remise_percent as remise_percent_global";
+	$sql .= " FROM ".MAIN_DB_PREFIX."propaldet as pd, ".MAIN_DB_PREFIX."propal as p";
+	$sql .= " WHERE pd.fk_propal = p.rowid";
+	$sql .= " AND ((pd.total_ttc = 0 AND pd.remise_percent != 100) or pd.total_ttc IS NULL)";
 
-    dolibarr_install_syslog("upgrade2::migrate_price_propal");
-    $resql = $db->query($sql);
-    if ($resql)
-    {
-        $num = $db->num_rows($resql);
-        $i = 0;
-        if ($num)
-        {
-            while ($i < $num)
-            {
-                $obj = $db->fetch_object($resql);
+	dolibarr_install_syslog("upgrade2::migrate_price_propal");
+	$resql = $db->query($sql);
+	if ($resql)
+	{
+		$num = $db->num_rows($resql);
+		$i = 0;
+		if ($num)
+		{
+			while ($i < $num)
+			{
+				$obj = $db->fetch_object($resql);
 
-                $rowid = $obj->rowid;
-                $qty = $obj->qty;
-                $pu = $obj->subprice;
-                $vatrate = $obj->vatrate;
-                $remise_percent = $obj->remise_percent;
-                $remise_percent_global = $obj->remise_percent_global;
-                $info_bits = $obj->info_bits;
+				$rowid = $obj->rowid;
+				$qty = $obj->qty;
+				$pu = $obj->subprice;
+				$vatrate = $obj->vatrate;
+				$remise_percent = $obj->remise_percent;
+				$remise_percent_global = $obj->remise_percent_global;
+				$info_bits = $obj->info_bits;
 
-                // On met a jour les 3 nouveaux champs
-                $propalligne = new PropaleLigne($db);
-                $propalligne->fetch($rowid);
+				// On met a jour les 3 nouveaux champs
+				$propalligne = new PropaleLigne($db);
+				$propalligne->fetch($rowid);
 
-                $result = calcul_price_total($qty, $pu, $remise_percent, $vatrate, 0, 0, $remise_percent_global, 'HT', $info_bits, $propalligne->product_type, $tmpmysoc);
-                $total_ht  = $result[0];
-                $total_tva = $result[1];
-                $total_ttc = $result[2];
+				$result = calcul_price_total($qty, $pu, $remise_percent, $vatrate, 0, 0, $remise_percent_global, 'HT', $info_bits, $propalligne->product_type, $tmpmysoc);
+				$total_ht  = $result[0];
+				$total_tva = $result[1];
+				$total_ttc = $result[2];
 
-                $propalligne->total_ht  = $total_ht;
-                $propalligne->total_tva = $total_tva;
-                $propalligne->total_ttc = $total_ttc;
+				$propalligne->total_ht  = $total_ht;
+				$propalligne->total_tva = $total_tva;
+				$propalligne->total_ttc = $total_ttc;
 
-                dolibarr_install_syslog("upgrade2: Line ".$rowid.": propalid=".$obj->rowid." pu=".$pu." qty=".$qty." vatrate=".$vatrate." remise_percent=".$remise_percent." remise_global=".$remise_percent_global." -> ".$total_ht.", ".$total_tva.", ".$total_ttc);
-                print ". ";
-                $propalligne->update_total();
+				dolibarr_install_syslog("upgrade2: Line ".$rowid.": propalid=".$obj->rowid." pu=".$pu." qty=".$qty." vatrate=".$vatrate." remise_percent=".$remise_percent." remise_global=".$remise_percent_global." -> ".$total_ht.", ".$total_tva.", ".$total_ttc);
+				print ". ";
+				$propalligne->update_total();
 
 
-                /* On touche pas a propal mere
+				/* On touche pas a propal mere
                  $propal = new Propal($db);
                  $propal->id=$obj->rowid;
                  if ( $propal->fetch($propal->id) >= 0 )
@@ -1583,24 +1583,24 @@ function migrate_price_propal($db, $langs, $conf)
                  print "Error #3";
                  }
                  */
-                $i++;
-            }
-        } else {
-            print $langs->trans("AlreadyDone");
-        }
+				$i++;
+			}
+		} else {
+			print $langs->trans("AlreadyDone");
+		}
 
-        $db->free($resql);
+		$db->free($resql);
 
-        $db->commit();
-    } else {
-        print "Error #1 ".$db->error();
+		$db->commit();
+	} else {
+		print "Error #1 ".$db->error();
 
-        $db->rollback();
-    }
+		$db->rollback();
+	}
 
-    print '<br>';
+	print '<br>';
 
-    print '</td></tr>';
+	print '</td></tr>';
 }
 
 /**
@@ -1613,79 +1613,79 @@ function migrate_price_propal($db, $langs, $conf)
  */
 function migrate_price_contrat($db, $langs, $conf)
 {
-    $db->begin();
+	$db->begin();
 
    	$tmpmysoc = new Societe($db);
 	$tmpmysoc->setMysoc($conf);
-    if (empty($tmpmysoc->country_id)) $tmpmysoc->country_id = 0; // Ti not have this set to '' or will make sql syntax error.
+	if (empty($tmpmysoc->country_id)) $tmpmysoc->country_id = 0; // Ti not have this set to '' or will make sql syntax error.
 
-    print '<tr><td colspan="4">';
+	print '<tr><td colspan="4">';
 
-    print '<br>';
-    print '<b>'.$langs->trans('MigrationContract')."</b><br>\n";
+	print '<br>';
+	print '<b>'.$langs->trans('MigrationContract')."</b><br>\n";
 
-    // List of contract lines not up to date
-    $sql = "SELECT cd.rowid, cd.qty, cd.subprice, cd.remise_percent, cd.tva_tx as vatrate, cd.info_bits,";
-    $sql .= " c.rowid as contratid";
-    $sql .= " FROM ".MAIN_DB_PREFIX."contratdet as cd, ".MAIN_DB_PREFIX."contrat as c";
-    $sql .= " WHERE cd.fk_contrat = c.rowid";
-    $sql .= " AND ((cd.total_ttc = 0 AND cd.remise_percent != 100 AND cd.subprice > 0) or cd.total_ttc IS NULL)";
+	// List of contract lines not up to date
+	$sql = "SELECT cd.rowid, cd.qty, cd.subprice, cd.remise_percent, cd.tva_tx as vatrate, cd.info_bits,";
+	$sql .= " c.rowid as contratid";
+	$sql .= " FROM ".MAIN_DB_PREFIX."contratdet as cd, ".MAIN_DB_PREFIX."contrat as c";
+	$sql .= " WHERE cd.fk_contrat = c.rowid";
+	$sql .= " AND ((cd.total_ttc = 0 AND cd.remise_percent != 100 AND cd.subprice > 0) or cd.total_ttc IS NULL)";
 
-    dolibarr_install_syslog("upgrade2::migrate_price_contrat");
-    $resql = $db->query($sql);
-    if ($resql)
-    {
-        $num = $db->num_rows($resql);
-        $i = 0;
-        if ($num)
-        {
-            while ($i < $num)
-            {
-                $obj = $db->fetch_object($resql);
+	dolibarr_install_syslog("upgrade2::migrate_price_contrat");
+	$resql = $db->query($sql);
+	if ($resql)
+	{
+		$num = $db->num_rows($resql);
+		$i = 0;
+		if ($num)
+		{
+			while ($i < $num)
+			{
+				$obj = $db->fetch_object($resql);
 
-                $rowid = $obj->rowid;
-                $qty = $obj->qty;
-                $pu = $obj->subprice;
-                $vatrate = $obj->vatrate;
-                $remise_percent = $obj->remise_percent;
-                $info_bits = $obj->info_bits;
+				$rowid = $obj->rowid;
+				$qty = $obj->qty;
+				$pu = $obj->subprice;
+				$vatrate = $obj->vatrate;
+				$remise_percent = $obj->remise_percent;
+				$info_bits = $obj->info_bits;
 
-                // On met a jour les 3 nouveaux champs
-                $contratligne = new ContratLigne($db);
-                //$contratligne->fetch($rowid); Non requis car le update_total ne met a jour que chp redefinis
-                $contratligne->fetch($rowid);
+				// On met a jour les 3 nouveaux champs
+				$contratligne = new ContratLigne($db);
+				//$contratligne->fetch($rowid); Non requis car le update_total ne met a jour que chp redefinis
+				$contratligne->fetch($rowid);
 
-                $result = calcul_price_total($qty, $pu, $remise_percent, $vatrate, 0, 0, 0, 'HT', $info_bits, $contratligne->product_type, $tmpmysoc);
-                $total_ht  = $result[0];
-                $total_tva = $result[1];
-                $total_ttc = $result[2];
+				$result = calcul_price_total($qty, $pu, $remise_percent, $vatrate, 0, 0, 0, 'HT', $info_bits, $contratligne->product_type, $tmpmysoc);
+				$total_ht  = $result[0];
+				$total_tva = $result[1];
+				$total_ttc = $result[2];
 
-                $contratligne->total_ht  = $total_ht;
-                $contratligne->total_tva = $total_tva;
-                $contratligne->total_ttc = $total_ttc;
+				$contratligne->total_ht  = $total_ht;
+				$contratligne->total_tva = $total_tva;
+				$contratligne->total_ttc = $total_ttc;
 
-                dolibarr_install_syslog("upgrade2: Line ".$rowid.": contratdetid=".$obj->rowid." pu=".$pu." qty=".$qty." vatrate=".$vatrate." remise_percent=".$remise_percent."  -> ".$total_ht.", ".$total_tva." , ".$total_ttc);
-                print ". ";
-                $contratligne->update_total();
+				dolibarr_install_syslog("upgrade2: Line ".$rowid.": contratdetid=".$obj->rowid." pu=".$pu." qty=".$qty." vatrate=".$vatrate." remise_percent=".$remise_percent."  -> ".$total_ht.", ".$total_tva." , ".$total_ttc);
+				print ". ";
+				$contratligne->update_total();
 
-                $i++;
-            }
-        } else {
-            print $langs->trans("AlreadyDone");
-        }
+				$i++;
+			}
+		} else {
+			print $langs->trans("AlreadyDone");
+		}
 
-        $db->free($resql);
+		$db->free($resql);
 
-        $db->commit();
-    } else {
-        print "Error #1 ".$db->error();
+		$db->commit();
+	} else {
+		print "Error #1 ".$db->error();
 
-        $db->rollback();
-    }
+		$db->rollback();
+	}
 
-    print '<br>';
+	print '<br>';
 
-    print '</td></tr>';
+	print '</td></tr>';
 }
 
 /**
@@ -1698,61 +1698,61 @@ function migrate_price_contrat($db, $langs, $conf)
  */
 function migrate_price_commande($db, $langs, $conf)
 {
-    $db->begin();
+	$db->begin();
 
-    $tmpmysoc = new Societe($db);
-    $tmpmysoc->setMysoc($conf);
+	$tmpmysoc = new Societe($db);
+	$tmpmysoc->setMysoc($conf);
 
-    print '<tr><td colspan="4">';
+	print '<tr><td colspan="4">';
 
-    print '<br>';
-    print '<b>'.$langs->trans('MigrationOrder')."</b><br>\n";
+	print '<br>';
+	print '<b>'.$langs->trans('MigrationOrder')."</b><br>\n";
 
-    // List of sales orders lines not up to date
-    $sql = "SELECT cd.rowid, cd.qty, cd.subprice, cd.remise_percent, cd.tva_tx as vatrate, cd.info_bits,";
-    $sql .= " c.rowid as commandeid, c.remise_percent as remise_percent_global";
-    $sql .= " FROM ".MAIN_DB_PREFIX."commandedet as cd, ".MAIN_DB_PREFIX."commande as c";
-    $sql .= " WHERE cd.fk_commande = c.rowid";
-    $sql .= " AND ((cd.total_ttc = 0 AND cd.remise_percent != 100) or cd.total_ttc IS NULL)";
+	// List of sales orders lines not up to date
+	$sql = "SELECT cd.rowid, cd.qty, cd.subprice, cd.remise_percent, cd.tva_tx as vatrate, cd.info_bits,";
+	$sql .= " c.rowid as commandeid, c.remise_percent as remise_percent_global";
+	$sql .= " FROM ".MAIN_DB_PREFIX."commandedet as cd, ".MAIN_DB_PREFIX."commande as c";
+	$sql .= " WHERE cd.fk_commande = c.rowid";
+	$sql .= " AND ((cd.total_ttc = 0 AND cd.remise_percent != 100) or cd.total_ttc IS NULL)";
 
-    dolibarr_install_syslog("upgrade2::migrate_price_commande");
-    $resql = $db->query($sql);
-    if ($resql)
-    {
-        $num = $db->num_rows($resql);
-        $i = 0;
-        if ($num)
-        {
-            while ($i < $num)
-            {
-                $obj = $db->fetch_object($resql);
+	dolibarr_install_syslog("upgrade2::migrate_price_commande");
+	$resql = $db->query($sql);
+	if ($resql)
+	{
+		$num = $db->num_rows($resql);
+		$i = 0;
+		if ($num)
+		{
+			while ($i < $num)
+			{
+				$obj = $db->fetch_object($resql);
 
-                $rowid = $obj->rowid;
-                $qty = $obj->qty;
-                $pu = $obj->subprice;
-                $vatrate = $obj->vatrate;
-                $remise_percent = $obj->remise_percent;
-                $remise_percent_global = $obj->remise_percent_global;
-                $info_bits = $obj->info_bits;
+				$rowid = $obj->rowid;
+				$qty = $obj->qty;
+				$pu = $obj->subprice;
+				$vatrate = $obj->vatrate;
+				$remise_percent = $obj->remise_percent;
+				$remise_percent_global = $obj->remise_percent_global;
+				$info_bits = $obj->info_bits;
 
-                // On met a jour les 3 nouveaux champs
-                $commandeligne = new OrderLine($db);
-                $commandeligne->fetch($rowid);
+				// On met a jour les 3 nouveaux champs
+				$commandeligne = new OrderLine($db);
+				$commandeligne->fetch($rowid);
 
-                $result = calcul_price_total($qty, $pu, $remise_percent, $vatrate, 0, 0, $remise_percent_global, 'HT', $info_bits, $commandeligne->product_type, $tmpmysoc);
-                $total_ht  = $result[0];
-                $total_tva = $result[1];
-                $total_ttc = $result[2];
+				$result = calcul_price_total($qty, $pu, $remise_percent, $vatrate, 0, 0, $remise_percent_global, 'HT', $info_bits, $commandeligne->product_type, $tmpmysoc);
+				$total_ht  = $result[0];
+				$total_tva = $result[1];
+				$total_ttc = $result[2];
 
-                $commandeligne->total_ht  = $total_ht;
-                $commandeligne->total_tva = $total_tva;
-                $commandeligne->total_ttc = $total_ttc;
+				$commandeligne->total_ht  = $total_ht;
+				$commandeligne->total_tva = $total_tva;
+				$commandeligne->total_ttc = $total_ttc;
 
-                dolibarr_install_syslog("upgrade2: Line ".$rowid." : commandeid=".$obj->rowid." pu=".$pu." qty=".$qty." vatrate=".$vatrate." remise_percent=".$remise_percent." remise_global=".$remise_percent_global."  -> ".$total_ht.", ".$total_tva.", ".$total_ttc);
-                print ". ";
-                $commandeligne->update_total();
+				dolibarr_install_syslog("upgrade2: Line ".$rowid." : commandeid=".$obj->rowid." pu=".$pu." qty=".$qty." vatrate=".$vatrate." remise_percent=".$remise_percent." remise_global=".$remise_percent_global."  -> ".$total_ht.", ".$total_tva.", ".$total_ttc);
+				print ". ";
+				$commandeligne->update_total();
 
-                /* On touche pas a facture mere
+				/* On touche pas a facture mere
                  $commande = new Commande($db);
                  $commande->id = $obj->rowid;
                  if ( $commande->fetch($commande->id) >= 0 )
@@ -1771,15 +1771,15 @@ function migrate_price_commande($db, $langs, $conf)
                  print "Error #3";
                  }
                  */
-                $i++;
-            }
-        } else {
-            print $langs->trans("AlreadyDone");
-        }
+				$i++;
+			}
+		} else {
+			print $langs->trans("AlreadyDone");
+		}
 
-        $db->free($resql);
+		$db->free($resql);
 
-        /*
+		/*
          $sql = "DELETE FROM ".MAIN_DB_PREFIX."commandedet";
          $sql.= " WHERE price = 0 and total_ttc = 0 and total_tva = 0 and total_ht = 0 AND remise_percent = 0";
          $resql=$db->query($sql);
@@ -1789,16 +1789,16 @@ function migrate_price_commande($db, $langs, $conf)
          }
          */
 
-        $db->commit();
-    } else {
-        print "Error #1 ".$db->error();
+		$db->commit();
+	} else {
+		print "Error #1 ".$db->error();
 
-        $db->rollback();
-    }
+		$db->rollback();
+	}
 
-    print '<br>';
+	print '<br>';
 
-    print '</td></tr>';
+	print '</td></tr>';
 }
 
 /**
@@ -1811,61 +1811,61 @@ function migrate_price_commande($db, $langs, $conf)
  */
 function migrate_price_commande_fournisseur($db, $langs, $conf)
 {
-    $db->begin();
+	$db->begin();
 
-    $tmpmysoc = new Societe($db);
-    $tmpmysoc->setMysoc($conf);
+	$tmpmysoc = new Societe($db);
+	$tmpmysoc->setMysoc($conf);
 
-    print '<tr><td colspan="4">';
+	print '<tr><td colspan="4">';
 
-    print '<br>';
-    print '<b>'.$langs->trans('MigrationSupplierOrder')."</b><br>\n";
+	print '<br>';
+	print '<b>'.$langs->trans('MigrationSupplierOrder')."</b><br>\n";
 
-    // List of purchase order lines not up to date
-    $sql = "SELECT cd.rowid, cd.qty, cd.subprice, cd.remise_percent, cd.tva_tx as vatrate, cd.info_bits,";
-    $sql .= " c.rowid as commandeid, c.remise_percent as remise_percent_global";
-    $sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseurdet as cd, ".MAIN_DB_PREFIX."commande_fournisseur as c";
-    $sql .= " WHERE cd.fk_commande = c.rowid";
-    $sql .= " AND ((cd.total_ttc = 0 AND cd.remise_percent != 100) or cd.total_ttc IS NULL)";
+	// List of purchase order lines not up to date
+	$sql = "SELECT cd.rowid, cd.qty, cd.subprice, cd.remise_percent, cd.tva_tx as vatrate, cd.info_bits,";
+	$sql .= " c.rowid as commandeid, c.remise_percent as remise_percent_global";
+	$sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseurdet as cd, ".MAIN_DB_PREFIX."commande_fournisseur as c";
+	$sql .= " WHERE cd.fk_commande = c.rowid";
+	$sql .= " AND ((cd.total_ttc = 0 AND cd.remise_percent != 100) or cd.total_ttc IS NULL)";
 
-    dolibarr_install_syslog("upgrade2::migrate_price_commande_fournisseur");
-    $resql = $db->query($sql);
-    if ($resql)
-    {
-        $num = $db->num_rows($resql);
-        $i = 0;
-        if ($num)
-        {
-            while ($i < $num)
-            {
-                $obj = $db->fetch_object($resql);
+	dolibarr_install_syslog("upgrade2::migrate_price_commande_fournisseur");
+	$resql = $db->query($sql);
+	if ($resql)
+	{
+		$num = $db->num_rows($resql);
+		$i = 0;
+		if ($num)
+		{
+			while ($i < $num)
+			{
+				$obj = $db->fetch_object($resql);
 
-                $rowid = $obj->rowid;
-                $qty = $obj->qty;
-                $pu = $obj->subprice;
-                $vatrate = $obj->vatrate;
-                $remise_percent = $obj->remise_percent;
-                $remise_percent_global = $obj->remise_percent_global;
-                $info_bits = $obj->info_bits;
+				$rowid = $obj->rowid;
+				$qty = $obj->qty;
+				$pu = $obj->subprice;
+				$vatrate = $obj->vatrate;
+				$remise_percent = $obj->remise_percent;
+				$remise_percent_global = $obj->remise_percent_global;
+				$info_bits = $obj->info_bits;
 
-                // On met a jour les 3 nouveaux champs
-                $commandeligne = new CommandeFournisseurLigne($db);
-                $commandeligne->fetch($rowid);
+				// On met a jour les 3 nouveaux champs
+				$commandeligne = new CommandeFournisseurLigne($db);
+				$commandeligne->fetch($rowid);
 
-                $result = calcul_price_total($qty, $pu, $remise_percent, $vatrate, 0, 0, $remise_percent_global, 'HT', $info_bits, $commandeligne->product_type, $tmpsoc);
-                $total_ht  = $result[0];
-                $total_tva = $result[1];
-                $total_ttc = $result[2];
+				$result = calcul_price_total($qty, $pu, $remise_percent, $vatrate, 0, 0, $remise_percent_global, 'HT', $info_bits, $commandeligne->product_type, $tmpsoc);
+				$total_ht  = $result[0];
+				$total_tva = $result[1];
+				$total_ttc = $result[2];
 
-                $commandeligne->total_ht  = $total_ht;
-                $commandeligne->total_tva = $total_tva;
-                $commandeligne->total_ttc = $total_ttc;
+				$commandeligne->total_ht  = $total_ht;
+				$commandeligne->total_tva = $total_tva;
+				$commandeligne->total_ttc = $total_ttc;
 
-                dolibarr_install_syslog("upgrade2: Line ".$rowid.": commandeid=".$obj->rowid." pu=".$pu."  qty=".$qty." vatrate=".$vatrate." remise_percent=".$remise_percent." remise_global=".$remise_percent_global." -> ".$total_ht.", ".$total_tva.", ".$total_ttc);
-                print ". ";
-                $commandeligne->update_total();
+				dolibarr_install_syslog("upgrade2: Line ".$rowid.": commandeid=".$obj->rowid." pu=".$pu."  qty=".$qty." vatrate=".$vatrate." remise_percent=".$remise_percent." remise_global=".$remise_percent_global." -> ".$total_ht.", ".$total_tva.", ".$total_ttc);
+				print ". ";
+				$commandeligne->update_total();
 
-                /* On touche pas a facture mere
+				/* On touche pas a facture mere
                  $commande = new Commande($db);
                  $commande->id = $obj->rowid;
                  if ( $commande->fetch($commande->id) >= 0 )
@@ -1884,15 +1884,15 @@ function migrate_price_commande_fournisseur($db, $langs, $conf)
                  print "Error #3";
                  }
                  */
-                $i++;
-            }
-        } else {
-            print $langs->trans("AlreadyDone");
-        }
+				$i++;
+			}
+		} else {
+			print $langs->trans("AlreadyDone");
+		}
 
-        $db->free($resql);
+		$db->free($resql);
 
-        /*
+		/*
          $sql = "DELETE FROM ".MAIN_DB_PREFIX."commande_fournisseurdet";
          $sql.= " WHERE subprice = 0 and total_ttc = 0 and total_tva = 0 and total_ht = 0";
          $resql=$db->query($sql);
@@ -1902,16 +1902,16 @@ function migrate_price_commande_fournisseur($db, $langs, $conf)
          }
          */
 
-        $db->commit();
-    } else {
-        print "Error #1 ".$db->error();
+		$db->commit();
+	} else {
+		print "Error #1 ".$db->error();
 
-        $db->rollback();
-    }
+		$db->rollback();
+	}
 
-    print '<br>';
+	print '<br>';
 
-    print '</td></tr>';
+	print '</td></tr>';
 }
 
 /**
@@ -1924,51 +1924,51 @@ function migrate_price_commande_fournisseur($db, $langs, $conf)
  */
 function migrate_modeles($db, $langs, $conf)
 {
-    //print '<br>';
-    //print '<b>'.$langs->trans('UpdateModelsTable')."</b><br>\n";
+	//print '<br>';
+	//print '<b>'.$langs->trans('UpdateModelsTable')."</b><br>\n";
 
-    dolibarr_install_syslog("upgrade2::migrate_modeles");
+	dolibarr_install_syslog("upgrade2::migrate_modeles");
 
-    if (!empty($conf->facture->enabled))
-    {
-        include_once DOL_DOCUMENT_ROOT.'/core/modules/facture/modules_facture.php';
-        $modellist = ModelePDFFactures::liste_modeles($db);
-        if (count($modellist) == 0)
-        {
-            // Aucun model par defaut.
-            $sql = " insert into ".MAIN_DB_PREFIX."document_model(nom,type) values('crabe','invoice')";
-            $resql = $db->query($sql);
-            if (!$resql) dol_print_error($db);
-        }
-    }
+	if (!empty($conf->facture->enabled))
+	{
+		include_once DOL_DOCUMENT_ROOT.'/core/modules/facture/modules_facture.php';
+		$modellist = ModelePDFFactures::liste_modeles($db);
+		if (count($modellist) == 0)
+		{
+			// Aucun model par defaut.
+			$sql = " insert into ".MAIN_DB_PREFIX."document_model(nom,type) values('crabe','invoice')";
+			$resql = $db->query($sql);
+			if (!$resql) dol_print_error($db);
+		}
+	}
 
-    if (!empty($conf->commande->enabled))
-    {
-        include_once DOL_DOCUMENT_ROOT.'/core/modules/commande/modules_commande.php';
-        $modellist = ModelePDFCommandes::liste_modeles($db);
-        if (count($modellist) == 0)
-        {
-            // Aucun model par defaut.
-            $sql = " insert into ".MAIN_DB_PREFIX."document_model(nom,type) values('einstein','order')";
-            $resql = $db->query($sql);
-            if (!$resql) dol_print_error($db);
-        }
-    }
+	if (!empty($conf->commande->enabled))
+	{
+		include_once DOL_DOCUMENT_ROOT.'/core/modules/commande/modules_commande.php';
+		$modellist = ModelePDFCommandes::liste_modeles($db);
+		if (count($modellist) == 0)
+		{
+			// Aucun model par defaut.
+			$sql = " insert into ".MAIN_DB_PREFIX."document_model(nom,type) values('einstein','order')";
+			$resql = $db->query($sql);
+			if (!$resql) dol_print_error($db);
+		}
+	}
 
-    if (!empty($conf->expedition->enabled))
-    {
-        include_once DOL_DOCUMENT_ROOT.'/core/modules/expedition/modules_expedition.php';
-        $modellist = ModelePDFExpedition::liste_modeles($db);
-        if (count($modellist) == 0)
-        {
-            // Aucun model par defaut.
-            $sql = " insert into ".MAIN_DB_PREFIX."document_model(nom,type) values('rouget','shipping')";
-            $resql = $db->query($sql);
-            if (!$resql) dol_print_error($db);
-        }
-    }
+	if (!empty($conf->expedition->enabled))
+	{
+		include_once DOL_DOCUMENT_ROOT.'/core/modules/expedition/modules_expedition.php';
+		$modellist = ModelePDFExpedition::liste_modeles($db);
+		if (count($modellist) == 0)
+		{
+			// Aucun model par defaut.
+			$sql = " insert into ".MAIN_DB_PREFIX."document_model(nom,type) values('rouget','shipping')";
+			$resql = $db->query($sql);
+			if (!$resql) dol_print_error($db);
+		}
+	}
 
-    //print $langs->trans("AlreadyDone");
+	//print $langs->trans("AlreadyDone");
 }
 
 
@@ -1982,65 +1982,65 @@ function migrate_modeles($db, $langs, $conf)
  */
 function migrate_commande_expedition($db, $langs, $conf)
 {
-    dolibarr_install_syslog("upgrade2::migrate_commande_expedition");
+	dolibarr_install_syslog("upgrade2::migrate_commande_expedition");
 
-    print '<tr><td colspan="4">';
+	print '<tr><td colspan="4">';
 
-    print '<br>';
-    print '<b>'.$langs->trans('MigrationShipmentOrderMatching')."</b><br>\n";
+	print '<br>';
+	print '<b>'.$langs->trans('MigrationShipmentOrderMatching')."</b><br>\n";
 
-    $result = $db->DDLDescTable(MAIN_DB_PREFIX."expedition", "fk_commande");
-    $obj = $db->fetch_object($result);
-    if ($obj)
-    {
-        $error = 0;
+	$result = $db->DDLDescTable(MAIN_DB_PREFIX."expedition", "fk_commande");
+	$obj = $db->fetch_object($result);
+	if ($obj)
+	{
+		$error = 0;
 
-        $db->begin();
+		$db->begin();
 
-        $sql = "SELECT e.rowid, e.fk_commande FROM ".MAIN_DB_PREFIX."expedition as e";
-        $resql = $db->query($sql);
-        if ($resql)
-        {
-            $i = 0;
-            $num = $db->num_rows($resql);
+		$sql = "SELECT e.rowid, e.fk_commande FROM ".MAIN_DB_PREFIX."expedition as e";
+		$resql = $db->query($sql);
+		if ($resql)
+		{
+			$i = 0;
+			$num = $db->num_rows($resql);
 
-            if ($num)
-            {
-                while ($i < $num)
-                {
-                    $obj = $db->fetch_object($resql);
+			if ($num)
+			{
+				while ($i < $num)
+				{
+					$obj = $db->fetch_object($resql);
 
-                    $sql = "INSERT INTO ".MAIN_DB_PREFIX."co_exp (fk_expedition,fk_commande)";
-                    $sql .= " VALUES (".$obj->rowid.",".$obj->fk_commande.")";
-                    $resql2 = $db->query($sql);
+					$sql = "INSERT INTO ".MAIN_DB_PREFIX."co_exp (fk_expedition,fk_commande)";
+					$sql .= " VALUES (".$obj->rowid.",".$obj->fk_commande.")";
+					$resql2 = $db->query($sql);
 
-                    if (!$resql2)
-                    {
-                        $error++;
-                        dol_print_error($db);
-                    }
-                    print ". ";
-                    $i++;
-                }
-            }
+					if (!$resql2)
+					{
+						$error++;
+						dol_print_error($db);
+					}
+					print ". ";
+					$i++;
+				}
+			}
 
-            if ($error == 0)
-            {
-                $db->commit();
-                $sql = "ALTER TABLE ".MAIN_DB_PREFIX."expedition DROP COLUMN fk_commande";
-                print $langs->trans('FieldRenamed')."<br>\n";
-                $db->query($sql);
-            } else {
-                $db->rollback();
-            }
-        } else {
-            dol_print_error($db);
-            $db->rollback();
-        }
-    } else {
-        print $langs->trans('AlreadyDone')."<br>\n";
-    }
-    print '</td></tr>';
+			if ($error == 0)
+			{
+				$db->commit();
+				$sql = "ALTER TABLE ".MAIN_DB_PREFIX."expedition DROP COLUMN fk_commande";
+				print $langs->trans('FieldRenamed')."<br>\n";
+				$db->query($sql);
+			} else {
+				$db->rollback();
+			}
+		} else {
+			dol_print_error($db);
+			$db->rollback();
+		}
+	} else {
+		print $langs->trans('AlreadyDone')."<br>\n";
+	}
+	print '</td></tr>';
 }
 
 /**
@@ -2053,81 +2053,81 @@ function migrate_commande_expedition($db, $langs, $conf)
  */
 function migrate_commande_livraison($db, $langs, $conf)
 {
-    dolibarr_install_syslog("upgrade2::migrate_commande_livraison");
+	dolibarr_install_syslog("upgrade2::migrate_commande_livraison");
 
-    print '<tr><td colspan="4">';
+	print '<tr><td colspan="4">';
 
-    print '<br>';
-    print '<b>'.$langs->trans('MigrationDeliveryOrderMatching')."</b><br>\n";
+	print '<br>';
+	print '<b>'.$langs->trans('MigrationDeliveryOrderMatching')."</b><br>\n";
 
-    $result = $db->DDLDescTable(MAIN_DB_PREFIX."livraison", "fk_commande");
-    $obj = $db->fetch_object($result);
-    if ($obj)
-    {
-        $error = 0;
+	$result = $db->DDLDescTable(MAIN_DB_PREFIX."livraison", "fk_commande");
+	$obj = $db->fetch_object($result);
+	if ($obj)
+	{
+		$error = 0;
 
-        $db->begin();
+		$db->begin();
 
-        $sql = "SELECT l.rowid, l.fk_commande";
-        $sql .= ", c.ref_client, c.date_livraison";
-        $sql .= " FROM ".MAIN_DB_PREFIX."livraison as l, ".MAIN_DB_PREFIX."commande as c";
-        $sql .= " WHERE c.rowid = l.fk_commande";
-        $resql = $db->query($sql);
-        if ($resql)
-        {
-            $i = 0;
-            $num = $db->num_rows($resql);
+		$sql = "SELECT l.rowid, l.fk_commande";
+		$sql .= ", c.ref_client, c.date_livraison";
+		$sql .= " FROM ".MAIN_DB_PREFIX."livraison as l, ".MAIN_DB_PREFIX."commande as c";
+		$sql .= " WHERE c.rowid = l.fk_commande";
+		$resql = $db->query($sql);
+		if ($resql)
+		{
+			$i = 0;
+			$num = $db->num_rows($resql);
 
-            if ($num)
-            {
-                while ($i < $num)
-                {
-                    $obj = $db->fetch_object($resql);
+			if ($num)
+			{
+				while ($i < $num)
+				{
+					$obj = $db->fetch_object($resql);
 
-                    $sql = "INSERT INTO ".MAIN_DB_PREFIX."co_liv (fk_livraison,fk_commande)";
-                    $sql .= " VALUES (".$obj->rowid.",".$obj->fk_commande.")";
-                    $resql2 = $db->query($sql);
+					$sql = "INSERT INTO ".MAIN_DB_PREFIX."co_liv (fk_livraison,fk_commande)";
+					$sql .= " VALUES (".$obj->rowid.",".$obj->fk_commande.")";
+					$resql2 = $db->query($sql);
 
-                    if ($resql2)
-                    {
-                    	$delivery_date = $db->jdate($obj->date_livraison);
+					if ($resql2)
+					{
+						$delivery_date = $db->jdate($obj->date_livraison);
 
-                        $sqlu = "UPDATE ".MAIN_DB_PREFIX."livraison SET";
-                        $sqlu .= " ref_client='".$db->escape($obj->ref_client)."'";
-                        $sqlu .= ", date_livraison='".$db->idate($delivery_date)."'";
-                        $sqlu .= " WHERE rowid = ".$obj->rowid;
-                        $resql3 = $db->query($sqlu);
-                        if (!$resql3)
-                        {
-                            $error++;
-                            dol_print_error($db);
-                        }
-                    } else {
-                        $error++;
-                        dol_print_error($db);
-                    }
-                    print ". ";
-                    $i++;
-                }
-            }
+						$sqlu = "UPDATE ".MAIN_DB_PREFIX."livraison SET";
+						$sqlu .= " ref_client='".$db->escape($obj->ref_client)."'";
+						$sqlu .= ", date_livraison='".$db->idate($delivery_date)."'";
+						$sqlu .= " WHERE rowid = ".$obj->rowid;
+						$resql3 = $db->query($sqlu);
+						if (!$resql3)
+						{
+							$error++;
+							dol_print_error($db);
+						}
+					} else {
+						$error++;
+						dol_print_error($db);
+					}
+					print ". ";
+					$i++;
+				}
+			}
 
-            if ($error == 0)
-            {
-                $db->commit();
-                $sql = "ALTER TABLE ".MAIN_DB_PREFIX."livraison DROP COLUMN fk_commande";
-                print $langs->trans('FieldRenamed')."<br>\n";
-                $db->query($sql);
-            } else {
-                $db->rollback();
-            }
-        } else {
-            dol_print_error($db);
-            $db->rollback();
-        }
-    } else {
-        print $langs->trans('AlreadyDone')."<br>\n";
-    }
-    print '</td></tr>';
+			if ($error == 0)
+			{
+				$db->commit();
+				$sql = "ALTER TABLE ".MAIN_DB_PREFIX."livraison DROP COLUMN fk_commande";
+				print $langs->trans('FieldRenamed')."<br>\n";
+				$db->query($sql);
+			} else {
+				$db->rollback();
+			}
+		} else {
+			dol_print_error($db);
+			$db->rollback();
+		}
+	} else {
+		print $langs->trans('AlreadyDone')."<br>\n";
+	}
+	print '</td></tr>';
 }
 
 /**
@@ -2140,105 +2140,105 @@ function migrate_commande_livraison($db, $langs, $conf)
  */
 function migrate_detail_livraison($db, $langs, $conf)
 {
-    dolibarr_install_syslog("upgrade2::migrate_detail_livraison");
+	dolibarr_install_syslog("upgrade2::migrate_detail_livraison");
 
-    print '<tr><td colspan="4">';
+	print '<tr><td colspan="4">';
 
-    print '<br>';
-    print '<b>'.$langs->trans('MigrationDeliveryDetail')."</b><br>\n";
+	print '<br>';
+	print '<b>'.$langs->trans('MigrationDeliveryDetail')."</b><br>\n";
 
-    // This is done if field fk_commande_ligne exists.
-    // If not this means migration was already done.
-    $result = $db->DDLDescTable(MAIN_DB_PREFIX."livraisondet", "fk_commande_ligne");
-    $obj = $db->fetch_object($result);
-    if ($obj)
-    {
-        $error = 0;
+	// This is done if field fk_commande_ligne exists.
+	// If not this means migration was already done.
+	$result = $db->DDLDescTable(MAIN_DB_PREFIX."livraisondet", "fk_commande_ligne");
+	$obj = $db->fetch_object($result);
+	if ($obj)
+	{
+		$error = 0;
 
-        $db->begin();
+		$db->begin();
 
-        $sql = "SELECT cd.rowid, cd.fk_product, cd.description, cd.subprice, cd.total_ht";
-        $sql .= ", ld.fk_livraison";
-        $sql .= " FROM ".MAIN_DB_PREFIX."commandedet as cd, ".MAIN_DB_PREFIX."livraisondet as ld";
-        $sql .= " WHERE ld.fk_commande_ligne = cd.rowid";
-        $resql = $db->query($sql);
-        if ($resql)
-        {
-            $i = 0;
-            $num = $db->num_rows($resql);
+		$sql = "SELECT cd.rowid, cd.fk_product, cd.description, cd.subprice, cd.total_ht";
+		$sql .= ", ld.fk_livraison";
+		$sql .= " FROM ".MAIN_DB_PREFIX."commandedet as cd, ".MAIN_DB_PREFIX."livraisondet as ld";
+		$sql .= " WHERE ld.fk_commande_ligne = cd.rowid";
+		$resql = $db->query($sql);
+		if ($resql)
+		{
+			$i = 0;
+			$num = $db->num_rows($resql);
 
-            if ($num)
-            {
-                while ($i < $num)
-                {
-                    $obj = $db->fetch_object($resql);
+			if ($num)
+			{
+				while ($i < $num)
+				{
+					$obj = $db->fetch_object($resql);
 
-                    $sql = "UPDATE ".MAIN_DB_PREFIX."livraisondet SET";
-                    $sql .= " fk_product=".$obj->fk_product;
-                    $sql .= ",description='".$db->escape($obj->description)."'";
-                    $sql .= ",subprice='".$db->escape($obj->subprice)."'";
-                    $sql .= ",total_ht='".$db->escape($obj->total_ht)."'";
-                    $sql .= " WHERE fk_commande_ligne = ".$obj->rowid;
-                    $resql2 = $db->query($sql);
+					$sql = "UPDATE ".MAIN_DB_PREFIX."livraisondet SET";
+					$sql .= " fk_product=".$obj->fk_product;
+					$sql .= ",description='".$db->escape($obj->description)."'";
+					$sql .= ",subprice='".$db->escape($obj->subprice)."'";
+					$sql .= ",total_ht='".$db->escape($obj->total_ht)."'";
+					$sql .= " WHERE fk_commande_ligne = ".$obj->rowid;
+					$resql2 = $db->query($sql);
 
-                    if ($resql2)
-                    {
-                        $sql = "SELECT total_ht";
-                        $sql .= " FROM ".MAIN_DB_PREFIX."livraison";
-                        $sql .= " WHERE rowid = ".$obj->fk_livraison;
-                        $resql3 = $db->query($sql);
+					if ($resql2)
+					{
+						$sql = "SELECT total_ht";
+						$sql .= " FROM ".MAIN_DB_PREFIX."livraison";
+						$sql .= " WHERE rowid = ".$obj->fk_livraison;
+						$resql3 = $db->query($sql);
 
-                        if ($resql3)
-                        {
-                            $obju = $db->fetch_object($resql3);
-                            $total_ht = $obju->total_ht + $obj->total_ht;
+						if ($resql3)
+						{
+							$obju = $db->fetch_object($resql3);
+							$total_ht = $obju->total_ht + $obj->total_ht;
 
-                            $sqlu = "UPDATE ".MAIN_DB_PREFIX."livraison SET";
-                            $sqlu .= " total_ht='".$db->escape($total_ht)."'";
-                            $sqlu .= " WHERE rowid=".$obj->fk_livraison;
-                            $resql4 = $db->query($sqlu);
-                            if (!$resql4)
-                            {
-                                $error++;
-                                dol_print_error($db);
-                            }
-                        } else {
-                            $error++;
-                            dol_print_error($db);
-                        }
-                    } else {
-                        $error++;
-                        dol_print_error($db);
-                    }
-                    print ". ";
-                    $i++;
-                }
-            }
+							$sqlu = "UPDATE ".MAIN_DB_PREFIX."livraison SET";
+							$sqlu .= " total_ht='".$db->escape($total_ht)."'";
+							$sqlu .= " WHERE rowid=".$obj->fk_livraison;
+							$resql4 = $db->query($sqlu);
+							if (!$resql4)
+							{
+								$error++;
+								dol_print_error($db);
+							}
+						} else {
+							$error++;
+							dol_print_error($db);
+						}
+					} else {
+						$error++;
+						dol_print_error($db);
+					}
+					print ". ";
+					$i++;
+				}
+			}
 
-            if ($error == 0)
-            {
-                $db->commit();
-                $sql = "ALTER TABLE ".MAIN_DB_PREFIX."livraisondet CHANGE fk_commande_ligne fk_origin_line integer";
-                print $langs->trans('FieldRenamed')."<br>\n";
-                $db->query($sql);
-            } else {
-                $db->rollback();
-            }
-        } else {
-            dol_print_error($db);
-            $db->rollback();
-        }
-    } else {
-        $result = $db->DDLDescTable(MAIN_DB_PREFIX."livraisondet", "fk_origin_line");
-        $obj = $db->fetch_object($result);
-        if (!$obj)
-        {
-            $sql = "ALTER TABLE ".MAIN_DB_PREFIX."livraisondet ADD COLUMN fk_origin_line integer after fk_livraison";
-            $db->query($sql);
-        }
-        print $langs->trans('AlreadyDone')."<br>\n";
-    }
-    print '</td></tr>';
+			if ($error == 0)
+			{
+				$db->commit();
+				$sql = "ALTER TABLE ".MAIN_DB_PREFIX."livraisondet CHANGE fk_commande_ligne fk_origin_line integer";
+				print $langs->trans('FieldRenamed')."<br>\n";
+				$db->query($sql);
+			} else {
+				$db->rollback();
+			}
+		} else {
+			dol_print_error($db);
+			$db->rollback();
+		}
+	} else {
+		$result = $db->DDLDescTable(MAIN_DB_PREFIX."livraisondet", "fk_origin_line");
+		$obj = $db->fetch_object($result);
+		if (!$obj)
+		{
+			$sql = "ALTER TABLE ".MAIN_DB_PREFIX."livraisondet ADD COLUMN fk_origin_line integer after fk_livraison";
+			$db->query($sql);
+		}
+		print $langs->trans('AlreadyDone')."<br>\n";
+	}
+	print '</td></tr>';
 }
 
 /**
@@ -2251,60 +2251,60 @@ function migrate_detail_livraison($db, $langs, $conf)
  */
 function migrate_stocks($db, $langs, $conf)
 {
-    dolibarr_install_syslog("upgrade2::migrate_stocks");
+	dolibarr_install_syslog("upgrade2::migrate_stocks");
 
-    print '<tr><td colspan="4">';
+	print '<tr><td colspan="4">';
 
-    print '<br>';
-    print '<b>'.$langs->trans('MigrationStockDetail')."</b><br>\n";
+	print '<br>';
+	print '<b>'.$langs->trans('MigrationStockDetail')."</b><br>\n";
 
-    $error = 0;
+	$error = 0;
 
-    $db->begin();
+	$db->begin();
 
-    $sql = "SELECT SUM(reel) as total, fk_product";
-    $sql .= " FROM ".MAIN_DB_PREFIX."product_stock as ps";
-    $sql .= " GROUP BY fk_product";
-    $resql = $db->query($sql);
-    if ($resql)
-    {
-        $i = 0;
-        $num = $db->num_rows($resql);
+	$sql = "SELECT SUM(reel) as total, fk_product";
+	$sql .= " FROM ".MAIN_DB_PREFIX."product_stock as ps";
+	$sql .= " GROUP BY fk_product";
+	$resql = $db->query($sql);
+	if ($resql)
+	{
+		$i = 0;
+		$num = $db->num_rows($resql);
 
-        if ($num)
-        {
-            while ($i < $num)
-            {
-                $obj = $db->fetch_object($resql);
+		if ($num)
+		{
+			while ($i < $num)
+			{
+				$obj = $db->fetch_object($resql);
 
-                $sql = "UPDATE ".MAIN_DB_PREFIX."product SET";
-                $sql .= " stock = '".$db->escape($obj->total)."'";
-                $sql .= " WHERE rowid=".$obj->fk_product;
+				$sql = "UPDATE ".MAIN_DB_PREFIX."product SET";
+				$sql .= " stock = '".$db->escape($obj->total)."'";
+				$sql .= " WHERE rowid=".$obj->fk_product;
 
-                $resql2 = $db->query($sql);
-                if ($resql2)
-                {
-                } else {
-                    $error++;
-                    dol_print_error($db);
-                }
-                print ". ";
-                $i++;
-            }
-        }
+				$resql2 = $db->query($sql);
+				if ($resql2)
+				{
+				} else {
+					$error++;
+					dol_print_error($db);
+				}
+				print ". ";
+				$i++;
+			}
+		}
 
-        if ($error == 0)
-        {
-            $db->commit();
-        } else {
-            $db->rollback();
-        }
-    } else {
-        dol_print_error($db);
-        $db->rollback();
-    }
+		if ($error == 0)
+		{
+			$db->commit();
+		} else {
+			$db->rollback();
+		}
+	} else {
+		dol_print_error($db);
+		$db->rollback();
+	}
 
-    print '</td></tr>';
+	print '</td></tr>';
 }
 
 /**
@@ -2318,66 +2318,66 @@ function migrate_stocks($db, $langs, $conf)
  */
 function migrate_menus($db, $langs, $conf)
 {
-    dolibarr_install_syslog("upgrade2::migrate_menus");
+	dolibarr_install_syslog("upgrade2::migrate_menus");
 
-    print '<tr><td colspan="4">';
+	print '<tr><td colspan="4">';
 
-    print '<br>';
-    print '<b>'.$langs->trans('MigrationMenusDetail')."</b><br>\n";
+	print '<br>';
+	print '<b>'.$langs->trans('MigrationMenusDetail')."</b><br>\n";
 
-    $error = 0;
+	$error = 0;
 
-    if ($db->DDLInfoTable(MAIN_DB_PREFIX."menu_constraint"))
-    {
-        $db->begin();
+	if ($db->DDLInfoTable(MAIN_DB_PREFIX."menu_constraint"))
+	{
+		$db->begin();
 
-        $sql = "SELECT m.rowid, mc.action";
-        $sql .= " FROM ".MAIN_DB_PREFIX."menu_constraint as mc, ".MAIN_DB_PREFIX."menu_const as md, ".MAIN_DB_PREFIX."menu as m";
-        $sql .= " WHERE md.fk_menu = m.rowid AND md.fk_constraint = mc.rowid";
-        $sql .= " AND m.enabled = '1'";
-        $resql = $db->query($sql);
-        if ($resql)
-        {
-            $i = 0;
-            $num = $db->num_rows($resql);
-            if ($num)
-            {
-                while ($i < $num)
-                {
-                    $obj = $db->fetch_object($resql);
+		$sql = "SELECT m.rowid, mc.action";
+		$sql .= " FROM ".MAIN_DB_PREFIX."menu_constraint as mc, ".MAIN_DB_PREFIX."menu_const as md, ".MAIN_DB_PREFIX."menu as m";
+		$sql .= " WHERE md.fk_menu = m.rowid AND md.fk_constraint = mc.rowid";
+		$sql .= " AND m.enabled = '1'";
+		$resql = $db->query($sql);
+		if ($resql)
+		{
+			$i = 0;
+			$num = $db->num_rows($resql);
+			if ($num)
+			{
+				while ($i < $num)
+				{
+					$obj = $db->fetch_object($resql);
 
-                    $sql = "UPDATE ".MAIN_DB_PREFIX."menu SET";
-                    $sql .= " enabled = '".$db->escape($obj->action)."'";
-                    $sql .= " WHERE rowid=".$obj->rowid;
-                    $sql .= " AND enabled = '1'";
+					$sql = "UPDATE ".MAIN_DB_PREFIX."menu SET";
+					$sql .= " enabled = '".$db->escape($obj->action)."'";
+					$sql .= " WHERE rowid=".$obj->rowid;
+					$sql .= " AND enabled = '1'";
 
-                    $resql2 = $db->query($sql);
-                    if ($resql2)
-                    {
-                    } else {
-                        $error++;
-                        dol_print_error($db);
-                    }
-                    print ". ";
-                    $i++;
-                }
-            }
+					$resql2 = $db->query($sql);
+					if ($resql2)
+					{
+					} else {
+						$error++;
+						dol_print_error($db);
+					}
+					print ". ";
+					$i++;
+				}
+			}
 
-            if ($error == 0)
-            {
-                $db->commit();
-            } else {
-                $db->rollback();
-            }
-        } else {
-            dol_print_error($db);
-            $db->rollback();
-        }
-    } else {
-        print $langs->trans('AlreadyDone')."<br>\n";
-    }
+			if ($error == 0)
+			{
+				$db->commit();
+			} else {
+				$db->rollback();
+			}
+		} else {
+			dol_print_error($db);
+			$db->rollback();
+		}
+	} else {
+		print $langs->trans('AlreadyDone')."<br>\n";
+	}
 
-    print '</td></tr>';
+	print '</td></tr>';
 }
 
 /**
@@ -2391,69 +2391,69 @@ function migrate_menus($db, $langs, $conf)
  */
 function migrate_commande_deliveryaddress($db, $langs, $conf)
 {
-    dolibarr_install_syslog("upgrade2::migrate_commande_deliveryaddress");
+	dolibarr_install_syslog("upgrade2::migrate_commande_deliveryaddress");
 
-    print '<tr><td colspan="4">';
+	print '<tr><td colspan="4">';
 
-    print '<br>';
-    print '<b>'.$langs->trans('MigrationDeliveryAddress')."</b><br>\n";
+	print '<br>';
+	print '<b>'.$langs->trans('MigrationDeliveryAddress')."</b><br>\n";
 
-    $error = 0;
+	$error = 0;
 
-    if ($db->DDLInfoTable(MAIN_DB_PREFIX."co_exp"))
-    {
-        $db->begin();
+	if ($db->DDLInfoTable(MAIN_DB_PREFIX."co_exp"))
+	{
+		$db->begin();
 
-        $sql = "SELECT c.fk_adresse_livraison, ce.fk_expedition";
-        $sql .= " FROM ".MAIN_DB_PREFIX."commande as c";
-        $sql .= ", ".MAIN_DB_PREFIX."co_exp as ce";
-        $sql .= " WHERE c.rowid = ce.fk_commande";
-        $sql .= " AND c.fk_adresse_livraison IS NOT NULL AND c.fk_adresse_livraison != 0";
+		$sql = "SELECT c.fk_adresse_livraison, ce.fk_expedition";
+		$sql .= " FROM ".MAIN_DB_PREFIX."commande as c";
+		$sql .= ", ".MAIN_DB_PREFIX."co_exp as ce";
+		$sql .= " WHERE c.rowid = ce.fk_commande";
+		$sql .= " AND c.fk_adresse_livraison IS NOT NULL AND c.fk_adresse_livraison != 0";
 
-        $resql = $db->query($sql);
-        if ($resql)
-        {
-            $i = 0;
-            $num = $db->num_rows($resql);
+		$resql = $db->query($sql);
+		if ($resql)
+		{
+			$i = 0;
+			$num = $db->num_rows($resql);
 
-            if ($num)
-            {
-                while ($i < $num)
-                {
-                    $obj = $db->fetch_object($resql);
+			if ($num)
+			{
+				while ($i < $num)
+				{
+					$obj = $db->fetch_object($resql);
 
-                    $sql = "UPDATE ".MAIN_DB_PREFIX."expedition SET";
-                    $sql .= " fk_adresse_livraison = '".$db->escape($obj->fk_adresse_livraison)."'";
-                    $sql .= " WHERE rowid=".$obj->fk_expedition;
+					$sql = "UPDATE ".MAIN_DB_PREFIX."expedition SET";
+					$sql .= " fk_adresse_livraison = '".$db->escape($obj->fk_adresse_livraison)."'";
+					$sql .= " WHERE rowid=".$obj->fk_expedition;
 
-                    $resql2 = $db->query($sql);
-                    if (!$resql2)
-                    {
-                        $error++;
-                        dol_print_error($db);
-                    }
-                    print ". ";
-                    $i++;
-                }
-            } else {
-                print $langs->trans('AlreadyDone')."<br>\n";
-            }
+					$resql2 = $db->query($sql);
+					if (!$resql2)
+					{
+						$error++;
+						dol_print_error($db);
+					}
+					print ". ";
+					$i++;
+				}
+			} else {
+				print $langs->trans('AlreadyDone')."<br>\n";
+			}
 
-            if ($error == 0)
-            {
-                $db->commit();
-            } else {
-                $db->rollback();
-            }
-        } else {
-            dol_print_error($db);
-            $db->rollback();
-        }
-    } else {
-        print $langs->trans('AlreadyDone')."<br>\n";
-    }
+			if ($error == 0)
+			{
+				$db->commit();
+			} else {
+				$db->rollback();
+			}
+		} else {
+			dol_print_error($db);
+			$db->rollback();
+		}
+	} else {
+		print $langs->trans('AlreadyDone')."<br>\n";
+	}
 
-    print '</td></tr>';
+	print '</td></tr>';
 }
 
 /**
@@ -2467,139 +2467,139 @@ function migrate_commande_deliveryaddress($db, $langs, $conf)
  */
 function migrate_restore_missing_links($db, $langs, $conf)
 {
-    dolibarr_install_syslog("upgrade2::migrate_restore_missing_links");
+	dolibarr_install_syslog("upgrade2::migrate_restore_missing_links");
 
-    if (($db->type == 'mysql' || $db->type == 'mysqli'))
-    {
-        if (versioncompare($db->getVersionArray(), array(4, 0)) < 0)
-        {
-            dolibarr_install_syslog("upgrade2::migrate_restore_missing_links Version of database too old to make this migrate action");
-            return 0;
-        }
-    }
-    print '<tr><td colspan="4">';
+	if (($db->type == 'mysql' || $db->type == 'mysqli'))
+	{
+		if (versioncompare($db->getVersionArray(), array(4, 0)) < 0)
+		{
+			dolibarr_install_syslog("upgrade2::migrate_restore_missing_links Version of database too old to make this migrate action");
+			return 0;
+		}
+	}
+	print '<tr><td colspan="4">';
 
-    print '<br>';
-    print '<b>'.$langs->trans('MigrationFixData')."</b> (1)<br>\n";
+	print '<br>';
+	print '<b>'.$langs->trans('MigrationFixData')."</b> (1)<br>\n";
 
-    $error = 0;
+	$error = 0;
 
 
-    // Restore missing link for this cross foreign key (link 1 <=> 1). Direction 1.
-    $table1 = 'facturedet'; $field1 = 'fk_remise_except';
-    $table2 = 'societe_remise_except'; $field2 = 'fk_facture_line';
+	// Restore missing link for this cross foreign key (link 1 <=> 1). Direction 1.
+	$table1 = 'facturedet'; $field1 = 'fk_remise_except';
+	$table2 = 'societe_remise_except'; $field2 = 'fk_facture_line';
 
-    $db->begin();
+	$db->begin();
 
-    $sql = "SELECT t1.rowid, t1.".$field1." as field";
-    $sql .= " FROM ".MAIN_DB_PREFIX.$table1." as t1";
-    $sql .= " WHERE t1.".$field1." IS NOT NULL AND t1.".$field1." NOT IN";
-    $sql .= " (SELECT t2.rowid FROM ".MAIN_DB_PREFIX.$table2." as t2";
-    $sql .= " WHERE t1.rowid = t2.".$field2.")";
+	$sql = "SELECT t1.rowid, t1.".$field1." as field";
+	$sql .= " FROM ".MAIN_DB_PREFIX.$table1." as t1";
+	$sql .= " WHERE t1.".$field1." IS NOT NULL AND t1.".$field1." NOT IN";
+	$sql .= " (SELECT t2.rowid FROM ".MAIN_DB_PREFIX.$table2." as t2";
+	$sql .= " WHERE t1.rowid = t2.".$field2.")";
 
-    dolibarr_install_syslog("upgrade2::migrate_restore_missing_links DIRECTION 1");
-    $resql = $db->query($sql);
-    if ($resql)
-    {
-        $i = 0;
-        $num = $db->num_rows($resql);
+	dolibarr_install_syslog("upgrade2::migrate_restore_missing_links DIRECTION 1");
+	$resql = $db->query($sql);
+	if ($resql)
+	{
+		$i = 0;
+		$num = $db->num_rows($resql);
 
-        if ($num)
-        {
-            while ($i < $num)
-            {
-                $obj = $db->fetch_object($resql);
+		if ($num)
+		{
+			while ($i < $num)
+			{
+				$obj = $db->fetch_object($resql);
 
-                print 'Line '.$obj->rowid.' in '.$table1.' is linked to record '.$obj->field.' in '.$table2.' that has no link to '.$table1.'. We fix this.<br>';
-                $sql = "UPDATE ".MAIN_DB_PREFIX.$table2." SET";
-                $sql .= " ".$field2." = '".$db->escape($obj->rowid)."'";
-                $sql .= " WHERE rowid=".$obj->field;
+				print 'Line '.$obj->rowid.' in '.$table1.' is linked to record '.$obj->field.' in '.$table2.' that has no link to '.$table1.'. We fix this.<br>';
+				$sql = "UPDATE ".MAIN_DB_PREFIX.$table2." SET";
+				$sql .= " ".$field2." = '".$db->escape($obj->rowid)."'";
+				$sql .= " WHERE rowid=".$obj->field;
 
-                $resql2 = $db->query($sql);
-                if (!$resql2)
-                {
-                    $error++;
-                    dol_print_error($db);
-                }
-                //print ". ";
-                $i++;
-            }
-        } else print $langs->trans('AlreadyDone')."<br>\n";
+				$resql2 = $db->query($sql);
+				if (!$resql2)
+				{
+					$error++;
+					dol_print_error($db);
+				}
+				//print ". ";
+				$i++;
+			}
+		} else print $langs->trans('AlreadyDone')."<br>\n";
 
-        if ($error == 0)
-        {
-            $db->commit();
-        } else {
-            $db->rollback();
-        }
-    } else {
-        dol_print_error($db);
-        $db->rollback();
-    }
+		if ($error == 0)
+		{
+			$db->commit();
+		} else {
+			$db->rollback();
+		}
+	} else {
+		dol_print_error($db);
+		$db->rollback();
+	}
 
-    print '</td></tr>';
+	print '</td></tr>';
 
 
-    print '<tr><td colspan="4">';
+	print '<tr><td colspan="4">';
 
-    print '<br>';
-    print '<b>'.$langs->trans('MigrationFixData')."</b> (2)<br>\n";
+	print '<br>';
+	print '<b>'.$langs->trans('MigrationFixData')."</b> (2)<br>\n";
 
-    // Restore missing link for this cross foreign key (link 1 <=> 1). Direction 2.
-    $table2 = 'facturedet'; $field2 = 'fk_remise_except';
-    $table1 = 'societe_remise_except'; $field1 = 'fk_facture_line';
+	// Restore missing link for this cross foreign key (link 1 <=> 1). Direction 2.
+	$table2 = 'facturedet'; $field2 = 'fk_remise_except';
+	$table1 = 'societe_remise_except'; $field1 = 'fk_facture_line';
 
-    $db->begin();
+	$db->begin();
 
-    $sql = "SELECT t1.rowid, t1.".$field1." as field";
-    $sql .= " FROM ".MAIN_DB_PREFIX.$table1." as t1";
-    $sql .= " WHERE t1.".$field1." IS NOT NULL AND t1.".$field1." NOT IN";
-    $sql .= " (SELECT t2.rowid FROM ".MAIN_DB_PREFIX.$table2." as t2";
-    $sql .= " WHERE t1.rowid = t2.".$field2.")";
+	$sql = "SELECT t1.rowid, t1.".$field1." as field";
+	$sql .= " FROM ".MAIN_DB_PREFIX.$table1." as t1";
+	$sql .= " WHERE t1.".$field1." IS NOT NULL AND t1.".$field1." NOT IN";
+	$sql .= " (SELECT t2.rowid FROM ".MAIN_DB_PREFIX.$table2." as t2";
+	$sql .= " WHERE t1.rowid = t2.".$field2.")";
 
-    dolibarr_install_syslog("upgrade2::migrate_restore_missing_links DIRECTION 2");
-    $resql = $db->query($sql);
-    if ($resql)
-    {
-        $i = 0;
-        $num = $db->num_rows($resql);
+	dolibarr_install_syslog("upgrade2::migrate_restore_missing_links DIRECTION 2");
+	$resql = $db->query($sql);
+	if ($resql)
+	{
+		$i = 0;
+		$num = $db->num_rows($resql);
 
-        if ($num)
-        {
-            while ($i < $num)
-            {
-                $obj = $db->fetch_object($resql);
+		if ($num)
+		{
+			while ($i < $num)
+			{
+				$obj = $db->fetch_object($resql);
 
-                print 'Line '.$obj->rowid.' in '.$table1.' is linked to record '.$obj->field.' in '.$table2.' that has no link to '.$table1.'. We fix this.<br>';
-                $sql = "UPDATE ".MAIN_DB_PREFIX.$table2." SET";
-                $sql .= " ".$field2." = '".$db->escape($obj->rowid)."'";
-                $sql .= " WHERE rowid=".$obj->field;
+				print 'Line '.$obj->rowid.' in '.$table1.' is linked to record '.$obj->field.' in '.$table2.' that has no link to '.$table1.'. We fix this.<br>';
+				$sql = "UPDATE ".MAIN_DB_PREFIX.$table2." SET";
+				$sql .= " ".$field2." = '".$db->escape($obj->rowid)."'";
+				$sql .= " WHERE rowid=".$obj->field;
 
-                $resql2 = $db->query($sql);
-                if (!$resql2)
-                {
-                    $error++;
-                    dol_print_error($db);
-                }
-                //print ". ";
-                $i++;
-            }
-        } else {
-            print $langs->trans('AlreadyDone')."<br>\n";
-        }
+				$resql2 = $db->query($sql);
+				if (!$resql2)
+				{
+					$error++;
+					dol_print_error($db);
+				}
+				//print ". ";
+				$i++;
+			}
+		} else {
+			print $langs->trans('AlreadyDone')."<br>\n";
+		}
 
-        if ($error == 0)
-        {
-            $db->commit();
-        } else {
-            $db->rollback();
-        }
-    } else {
-        dol_print_error($db);
-        $db->rollback();
-    }
+		if ($error == 0)
+		{
+			$db->commit();
+		} else {
+			$db->rollback();
+		}
+	} else {
+		dol_print_error($db);
+		$db->rollback();
+	}
 
-    print '</td></tr>';
+	print '</td></tr>';
 }
 
 /**
@@ -2612,83 +2612,83 @@ function migrate_restore_missing_links($db, $langs, $conf)
  */
 function migrate_project_user_resp($db, $langs, $conf)
 {
-    dolibarr_install_syslog("upgrade2::migrate_project_user_resp");
+	dolibarr_install_syslog("upgrade2::migrate_project_user_resp");
 
-    print '<tr><td colspan="4">';
+	print '<tr><td colspan="4">';
 
-    print '<br>';
-    print '<b>'.$langs->trans('MigrationProjectUserResp')."</b><br>\n";
+	print '<br>';
+	print '<b>'.$langs->trans('MigrationProjectUserResp')."</b><br>\n";
 
-    $result = $db->DDLDescTable(MAIN_DB_PREFIX."projet", "fk_user_resp");
-    $obj = $db->fetch_object($result);
-    if ($obj)
-    {
-        $error = 0;
+	$result = $db->DDLDescTable(MAIN_DB_PREFIX."projet", "fk_user_resp");
+	$obj = $db->fetch_object($result);
+	if ($obj)
+	{
+		$error = 0;
 
-        $db->begin();
+		$db->begin();
 
-        $sql = "SELECT rowid, fk_user_resp FROM ".MAIN_DB_PREFIX."projet";
-        $resql = $db->query($sql);
-        if ($resql)
-        {
-            $i = 0;
-            $num = $db->num_rows($resql);
+		$sql = "SELECT rowid, fk_user_resp FROM ".MAIN_DB_PREFIX."projet";
+		$resql = $db->query($sql);
+		if ($resql)
+		{
+			$i = 0;
+			$num = $db->num_rows($resql);
 
-            if ($num)
-            {
-                while ($i < $num)
-                {
-                    $obj = $db->fetch_object($resql);
+			if ($num)
+			{
+				while ($i < $num)
+				{
+					$obj = $db->fetch_object($resql);
 
-                    $sql2 = "INSERT INTO ".MAIN_DB_PREFIX."element_contact (";
-                    $sql2 .= "datecreate";
-                    $sql2 .= ", statut";
-                    $sql2 .= ", element_id";
-                    $sql2 .= ", fk_c_type_contact";
-                    $sql2 .= ", fk_socpeople";
-                    $sql2 .= ") VALUES (";
-                    $sql2 .= "'".$db->idate(dol_now())."'";
-                    $sql2 .= ", '4'";
-                    $sql2 .= ", ".$obj->rowid;
-                    $sql2 .= ", '160'";
-                    $sql2 .= ", ".$obj->fk_user_resp;
-                    $sql2 .= ")";
+					$sql2 = "INSERT INTO ".MAIN_DB_PREFIX."element_contact (";
+					$sql2 .= "datecreate";
+					$sql2 .= ", statut";
+					$sql2 .= ", element_id";
+					$sql2 .= ", fk_c_type_contact";
+					$sql2 .= ", fk_socpeople";
+					$sql2 .= ") VALUES (";
+					$sql2 .= "'".$db->idate(dol_now())."'";
+					$sql2 .= ", '4'";
+					$sql2 .= ", ".$obj->rowid;
+					$sql2 .= ", '160'";
+					$sql2 .= ", ".$obj->fk_user_resp;
+					$sql2 .= ")";
 
-                    if ($obj->fk_user_resp > 0)
-                    {
-                        $resql2 = $db->query($sql2);
-                        if (!$resql2)
-                        {
-                            $error++;
-                            dol_print_error($db);
-                        }
-                    }
-                    print ". ";
+					if ($obj->fk_user_resp > 0)
+					{
+						$resql2 = $db->query($sql2);
+						if (!$resql2)
+						{
+							$error++;
+							dol_print_error($db);
+						}
+					}
+					print ". ";
 
-                    $i++;
-                }
-            }
+					$i++;
+				}
+			}
 
-            if ($error == 0)
-            {
-                $sqlDrop = "ALTER TABLE ".MAIN_DB_PREFIX."projet DROP COLUMN fk_user_resp";
-                if ($db->query($sqlDrop))
-                {
-                    $db->commit();
-                } else {
-                    $db->rollback();
-                }
-            } else {
-                $db->rollback();
-            }
-        } else {
-            dol_print_error($db);
-            $db->rollback();
-        }
-    } else {
-        print $langs->trans('AlreadyDone')."<br>\n";
-    }
-    print '</td></tr>';
+			if ($error == 0)
+			{
+				$sqlDrop = "ALTER TABLE ".MAIN_DB_PREFIX."projet DROP COLUMN fk_user_resp";
+				if ($db->query($sqlDrop))
+				{
+					$db->commit();
+				} else {
+					$db->rollback();
+				}
+			} else {
+				$db->rollback();
+			}
+		} else {
+			dol_print_error($db);
+			$db->rollback();
+		}
+	} else {
+		print $langs->trans('AlreadyDone')."<br>\n";
+	}
+	print '</td></tr>';
 }
 
 /**
@@ -2701,78 +2701,78 @@ function migrate_project_user_resp($db, $langs, $conf)
  */
 function migrate_project_task_actors($db, $langs, $conf)
 {
-    dolibarr_install_syslog("upgrade2::migrate_project_task_actors");
+	dolibarr_install_syslog("upgrade2::migrate_project_task_actors");
 
-    print '<tr><td colspan="4">';
+	print '<tr><td colspan="4">';
 
-    print '<br>';
-    print '<b>'.$langs->trans('MigrationProjectTaskActors')."</b><br>\n";
+	print '<br>';
+	print '<b>'.$langs->trans('MigrationProjectTaskActors')."</b><br>\n";
 
-    if ($db->DDLInfoTable(MAIN_DB_PREFIX."projet_task_actors"))
-    {
-        $error = 0;
+	if ($db->DDLInfoTable(MAIN_DB_PREFIX."projet_task_actors"))
+	{
+		$error = 0;
 
-        $db->begin();
+		$db->begin();
 
-        $sql = "SELECT fk_projet_task as fk_project_task, fk_user FROM ".MAIN_DB_PREFIX."projet_task_actors";
-        $resql = $db->query($sql);
-        if ($resql)
-        {
-            $i = 0;
-            $num = $db->num_rows($resql);
+		$sql = "SELECT fk_projet_task as fk_project_task, fk_user FROM ".MAIN_DB_PREFIX."projet_task_actors";
+		$resql = $db->query($sql);
+		if ($resql)
+		{
+			$i = 0;
+			$num = $db->num_rows($resql);
 
-            if ($num)
-            {
-                while ($i < $num)
-                {
-                    $obj = $db->fetch_object($resql);
+			if ($num)
+			{
+				while ($i < $num)
+				{
+					$obj = $db->fetch_object($resql);
 
-                    $sql2 = "INSERT INTO ".MAIN_DB_PREFIX."element_contact (";
-                    $sql2 .= "datecreate";
-                    $sql2 .= ", statut";
-                    $sql2 .= ", element_id";
-                    $sql2 .= ", fk_c_type_contact";
-                    $sql2 .= ", fk_socpeople";
-                    $sql2 .= ") VALUES (";
-                    $sql2 .= "'".$db->idate(dol_now())."'";
-                    $sql2 .= ", '4'";
-                    $sql2 .= ", ".$obj->fk_project_task;
-                    $sql2 .= ", '180'";
-                    $sql2 .= ", ".$obj->fk_user;
-                    $sql2 .= ")";
+					$sql2 = "INSERT INTO ".MAIN_DB_PREFIX."element_contact (";
+					$sql2 .= "datecreate";
+					$sql2 .= ", statut";
+					$sql2 .= ", element_id";
+					$sql2 .= ", fk_c_type_contact";
+					$sql2 .= ", fk_socpeople";
+					$sql2 .= ") VALUES (";
+					$sql2 .= "'".$db->idate(dol_now())."'";
+					$sql2 .= ", '4'";
+					$sql2 .= ", ".$obj->fk_project_task;
+					$sql2 .= ", '180'";
+					$sql2 .= ", ".$obj->fk_user;
+					$sql2 .= ")";
 
-                    $resql2 = $db->query($sql2);
+					$resql2 = $db->query($sql2);
 
-                    if (!$resql2)
-                    {
-                        $error++;
-                        dol_print_error($db);
-                    }
-                    print ". ";
-                    $i++;
-                }
-            }
+					if (!$resql2)
+					{
+						$error++;
+						dol_print_error($db);
+					}
+					print ". ";
+					$i++;
+				}
+			}
 
-            if ($error == 0)
-            {
-                $sqlDrop = "DROP TABLE ".MAIN_DB_PREFIX."projet_task_actors";
-                if ($db->query($sqlDrop))
-                {
-                    $db->commit();
-                } else {
-                    $db->rollback();
-                }
-            } else {
-                $db->rollback();
-            }
-        } else {
-            dol_print_error($db);
-            $db->rollback();
-        }
-    } else {
-        print $langs->trans('AlreadyDone')."<br>\n";
-    }
-    print '</td></tr>';
+			if ($error == 0)
+			{
+				$sqlDrop = "DROP TABLE ".MAIN_DB_PREFIX."projet_task_actors";
+				if ($db->query($sqlDrop))
+				{
+					$db->commit();
+				} else {
+					$db->rollback();
+				}
+			} else {
+				$db->rollback();
+			}
+		} else {
+			dol_print_error($db);
+			$db->rollback();
+		}
+	} else {
+		print $langs->trans('AlreadyDone')."<br>\n";
+	}
+	print '</td></tr>';
 }
 
 /**
@@ -2790,80 +2790,80 @@ function migrate_project_task_actors($db, $langs, $conf)
  */
 function migrate_relationship_tables($db, $langs, $conf, $table, $fk_source, $sourcetype, $fk_target, $targettype)
 {
-    print '<tr><td colspan="4">';
+	print '<tr><td colspan="4">';
 
-    print '<br>';
-    print '<b>'.$langs->trans('MigrationRelationshipTables', MAIN_DB_PREFIX.$table)."</b><br>\n";
+	print '<br>';
+	print '<b>'.$langs->trans('MigrationRelationshipTables', MAIN_DB_PREFIX.$table)."</b><br>\n";
 
-    $error = 0;
+	$error = 0;
 
-    if ($db->DDLInfoTable(MAIN_DB_PREFIX.$table))
-    {
-        dolibarr_install_syslog("upgrade2::migrate_relationship_tables table = ".MAIN_DB_PREFIX.$table);
+	if ($db->DDLInfoTable(MAIN_DB_PREFIX.$table))
+	{
+		dolibarr_install_syslog("upgrade2::migrate_relationship_tables table = ".MAIN_DB_PREFIX.$table);
 
-        $db->begin();
+		$db->begin();
 
-        $sqlSelect = "SELECT ".$fk_source.", ".$fk_target;
-        $sqlSelect .= " FROM ".MAIN_DB_PREFIX.$table;
+		$sqlSelect = "SELECT ".$fk_source.", ".$fk_target;
+		$sqlSelect .= " FROM ".MAIN_DB_PREFIX.$table;
 
-        $resql = $db->query($sqlSelect);
-        if ($resql)
-        {
-            $i = 0;
-            $num = $db->num_rows($resql);
+		$resql = $db->query($sqlSelect);
+		if ($resql)
+		{
+			$i = 0;
+			$num = $db->num_rows($resql);
 
-            if ($num)
-            {
-                while ($i < $num)
-                {
-                    $obj = $db->fetch_object($resql);
+			if ($num)
+			{
+				while ($i < $num)
+				{
+					$obj = $db->fetch_object($resql);
 
-                    $sqlInsert = "INSERT INTO ".MAIN_DB_PREFIX."element_element (";
-                    $sqlInsert .= "fk_source";
-                    $sqlInsert .= ", sourcetype";
-                    $sqlInsert .= ", fk_target";
-                    $sqlInsert .= ", targettype";
-                    $sqlInsert .= ") VALUES (";
-                    $sqlInsert .= $obj->$fk_source;
-                    $sqlInsert .= ", '".$db->escape($sourcetype)."'";
-                    $sqlInsert .= ", ".$obj->$fk_target;
-                    $sqlInsert .= ", '".$db->escape($targettype)."'";
-                    $sqlInsert .= ")";
+					$sqlInsert = "INSERT INTO ".MAIN_DB_PREFIX."element_element (";
+					$sqlInsert .= "fk_source";
+					$sqlInsert .= ", sourcetype";
+					$sqlInsert .= ", fk_target";
+					$sqlInsert .= ", targettype";
+					$sqlInsert .= ") VALUES (";
+					$sqlInsert .= $obj->$fk_source;
+					$sqlInsert .= ", '".$db->escape($sourcetype)."'";
+					$sqlInsert .= ", ".$obj->$fk_target;
+					$sqlInsert .= ", '".$db->escape($targettype)."'";
+					$sqlInsert .= ")";
 
-                    $result = $db->query($sqlInsert);
-                    if (!$result)
-                    {
-                        $error++;
-                        dol_print_error($db);
-                    }
-                    print ". ";
-                    $i++;
-                }
-            } else {
-                print $langs->trans('AlreadyDone')."<br>\n";
-            }
+					$result = $db->query($sqlInsert);
+					if (!$result)
+					{
+						$error++;
+						dol_print_error($db);
+					}
+					print ". ";
+					$i++;
+				}
+			} else {
+				print $langs->trans('AlreadyDone')."<br>\n";
+			}
 
-            if ($error == 0)
-            {
-                $sqlDrop = "DROP TABLE ".MAIN_DB_PREFIX.$table;
-                if ($db->query($sqlDrop))
-                {
-                    $db->commit();
-                } else {
-                    $db->rollback();
-                }
-            } else {
-                $db->rollback();
-            }
-        } else {
-            dol_print_error($db);
-            $db->rollback();
-        }
-    } else {
-        print $langs->trans('AlreadyDone')."<br>\n";
-    }
+			if ($error == 0)
+			{
+				$sqlDrop = "DROP TABLE ".MAIN_DB_PREFIX.$table;
+				if ($db->query($sqlDrop))
+				{
+					$db->commit();
+				} else {
+					$db->rollback();
+				}
+			} else {
+				$db->rollback();
+			}
+		} else {
+			dol_print_error($db);
+			$db->rollback();
+		}
+	} else {
+		print $langs->trans('AlreadyDone')."<br>\n";
+	}
 
-    print '</td></tr>';
+	print '</td></tr>';
 }
 
 /**
@@ -2876,103 +2876,103 @@ function migrate_relationship_tables($db, $langs, $conf, $table, $fk_source, $so
  */
 function migrate_project_task_time($db, $langs, $conf)
 {
-    dolibarr_install_syslog("upgrade2::migrate_project_task_time");
+	dolibarr_install_syslog("upgrade2::migrate_project_task_time");
 
-    print '<tr><td colspan="4">';
+	print '<tr><td colspan="4">';
 
-    print '<br>';
-    print '<b>'.$langs->trans('MigrationProjectTaskTime')."</b><br>\n";
+	print '<br>';
+	print '<b>'.$langs->trans('MigrationProjectTaskTime')."</b><br>\n";
 
-    $error = 0;
+	$error = 0;
 
-    $db->begin();
+	$db->begin();
 
-    $sql = "SELECT rowid, fk_task, task_duration";
-    $sql .= " FROM ".MAIN_DB_PREFIX."projet_task_time";
-    $resql = $db->query($sql);
-    if ($resql)
-    {
-        $i = 0;
-        $num = $db->num_rows($resql);
+	$sql = "SELECT rowid, fk_task, task_duration";
+	$sql .= " FROM ".MAIN_DB_PREFIX."projet_task_time";
+	$resql = $db->query($sql);
+	if ($resql)
+	{
+		$i = 0;
+		$num = $db->num_rows($resql);
 
-        if ($num)
-        {
-            $totaltime = array();
-            $oldtime = 0;
+		if ($num)
+		{
+			$totaltime = array();
+			$oldtime = 0;
 
-            while ($i < $num)
-            {
-                $obj = $db->fetch_object($resql);
+			while ($i < $num)
+			{
+				$obj = $db->fetch_object($resql);
 
-                if ($obj->task_duration > 0)
-                {
-                    // convert to second
-                    // only for int time and float time ex: 1,75 for 1h45
-                    list($hour, $min) = explode('.', $obj->task_duration);
-                    $hour = $hour * 60 * 60;
-                    $min = ($min / 100) * 60 * 60;
-                    $newtime = $hour + $min;
+				if ($obj->task_duration > 0)
+				{
+					// convert to second
+					// only for int time and float time ex: 1,75 for 1h45
+					list($hour, $min) = explode('.', $obj->task_duration);
+					$hour = $hour * 60 * 60;
+					$min = ($min / 100) * 60 * 60;
+					$newtime = $hour + $min;
 
-                    $sql2 = "UPDATE ".MAIN_DB_PREFIX."projet_task_time SET";
-                    $sql2 .= " task_duration = ".$newtime;
-                    $sql2 .= " WHERE rowid = ".$obj->rowid;
+					$sql2 = "UPDATE ".MAIN_DB_PREFIX."projet_task_time SET";
+					$sql2 .= " task_duration = ".$newtime;
+					$sql2 .= " WHERE rowid = ".$obj->rowid;
 
-                    $resql2 = $db->query($sql2);
-                    if (!$resql2)
-                    {
-                        $error++;
-                        dol_print_error($db);
-                    }
-                    print ". ";
-                    $oldtime++;
-                    if (!empty($totaltime[$obj->fk_task])) $totaltime[$obj->fk_task] += $newtime;
-                    else $totaltime[$obj->fk_task] = $newtime;
-                } else {
-                    if (!empty($totaltime[$obj->fk_task])) $totaltime[$obj->fk_task] += $obj->task_duration;
-                    else $totaltime[$obj->fk_task] = $obj->task_duration;
-                }
+					$resql2 = $db->query($sql2);
+					if (!$resql2)
+					{
+						$error++;
+						dol_print_error($db);
+					}
+					print ". ";
+					$oldtime++;
+					if (!empty($totaltime[$obj->fk_task])) $totaltime[$obj->fk_task] += $newtime;
+					else $totaltime[$obj->fk_task] = $newtime;
+				} else {
+					if (!empty($totaltime[$obj->fk_task])) $totaltime[$obj->fk_task] += $obj->task_duration;
+					else $totaltime[$obj->fk_task] = $obj->task_duration;
+				}
 
-                $i++;
-            }
+				$i++;
+			}
 
-            if ($error == 0)
-            {
-                if ($oldtime > 0)
-                {
-                    foreach ($totaltime as $taskid => $total_duration)
-                    {
-                        $sql = "UPDATE ".MAIN_DB_PREFIX."projet_task SET";
-                        $sql .= " duration_effective = ".$total_duration;
-                        $sql .= " WHERE rowid = ".$taskid;
+			if ($error == 0)
+			{
+				if ($oldtime > 0)
+				{
+					foreach ($totaltime as $taskid => $total_duration)
+					{
+						$sql = "UPDATE ".MAIN_DB_PREFIX."projet_task SET";
+						$sql .= " duration_effective = ".$total_duration;
+						$sql .= " WHERE rowid = ".$taskid;
 
-                        $resql = $db->query($sql);
-                        if (!$resql)
-                        {
-                            $error++;
-                            dol_print_error($db);
-                        }
-                    }
-                } else {
-                    print $langs->trans('AlreadyDone')."<br>\n";
-                }
-            } else {
-                dol_print_error($db);
-            }
-        } else {
-            print $langs->trans('AlreadyDone')."<br>\n";
-        }
-    } else {
-        dol_print_error($db);
-    }
+						$resql = $db->query($sql);
+						if (!$resql)
+						{
+							$error++;
+							dol_print_error($db);
+						}
+					}
+				} else {
+					print $langs->trans('AlreadyDone')."<br>\n";
+				}
+			} else {
+				dol_print_error($db);
+			}
+		} else {
+			print $langs->trans('AlreadyDone')."<br>\n";
+		}
+	} else {
+		dol_print_error($db);
+	}
 
-    if ($error == 0)
-    {
-        $db->commit();
-    } else {
-        $db->rollback();
-    }
+	if ($error == 0)
+	{
+		$db->commit();
+	} else {
+		$db->rollback();
+	}
 
-    print '</td></tr>';
+	print '</td></tr>';
 }
 
 /**
@@ -2985,85 +2985,85 @@ function migrate_project_task_time($db, $langs, $conf)
  */
 function migrate_customerorder_shipping($db, $langs, $conf)
 {
-    print '<tr><td colspan="4">';
+	print '<tr><td colspan="4">';
 
-    print '<br>';
-    print '<b>'.$langs->trans('MigrationCustomerOrderShipping')."</b><br>\n";
+	print '<br>';
+	print '<b>'.$langs->trans('MigrationCustomerOrderShipping')."</b><br>\n";
 
-    $error = 0;
+	$error = 0;
 
-    $result1 = $db->DDLDescTable(MAIN_DB_PREFIX."expedition", "ref_customer");
-    $result2 = $db->DDLDescTable(MAIN_DB_PREFIX."expedition", "date_delivery");
-    $obj1 = $db->fetch_object($result1);
-    $obj2 = $db->fetch_object($result2);
-    if (!$obj1 && !$obj2)
-    {
-        dolibarr_install_syslog("upgrade2::migrate_customerorder_shipping");
+	$result1 = $db->DDLDescTable(MAIN_DB_PREFIX."expedition", "ref_customer");
+	$result2 = $db->DDLDescTable(MAIN_DB_PREFIX."expedition", "date_delivery");
+	$obj1 = $db->fetch_object($result1);
+	$obj2 = $db->fetch_object($result2);
+	if (!$obj1 && !$obj2)
+	{
+		dolibarr_install_syslog("upgrade2::migrate_customerorder_shipping");
 
-        $db->begin();
+		$db->begin();
 
-        $sqlAdd1 = "ALTER TABLE ".MAIN_DB_PREFIX."expedition ADD COLUMN ref_customer varchar(30) AFTER entity";
-        $sqlAdd2 = "ALTER TABLE ".MAIN_DB_PREFIX."expedition ADD COLUMN date_delivery date DEFAULT NULL AFTER date_expedition";
+		$sqlAdd1 = "ALTER TABLE ".MAIN_DB_PREFIX."expedition ADD COLUMN ref_customer varchar(30) AFTER entity";
+		$sqlAdd2 = "ALTER TABLE ".MAIN_DB_PREFIX."expedition ADD COLUMN date_delivery date DEFAULT NULL AFTER date_expedition";
 
-        if ($db->query($sqlAdd1) && $db->query($sqlAdd2))
-        {
-            $sqlSelect = "SELECT e.rowid as shipping_id, c.ref_client, c.date_livraison";
-            $sqlSelect .= " FROM ".MAIN_DB_PREFIX."expedition as e";
-            $sqlSelect .= ", ".MAIN_DB_PREFIX."element_element as el";
-            $sqlSelect .= " LEFT JOIN ".MAIN_DB_PREFIX."commande as c ON c.rowid = el.fk_source AND el.sourcetype = 'commande'";
-            $sqlSelect .= " WHERE e.rowid = el.fk_target";
-            $sqlSelect .= " AND el.targettype = 'shipping'";
+		if ($db->query($sqlAdd1) && $db->query($sqlAdd2))
+		{
+			$sqlSelect = "SELECT e.rowid as shipping_id, c.ref_client, c.date_livraison";
+			$sqlSelect .= " FROM ".MAIN_DB_PREFIX."expedition as e";
+			$sqlSelect .= ", ".MAIN_DB_PREFIX."element_element as el";
+			$sqlSelect .= " LEFT JOIN ".MAIN_DB_PREFIX."commande as c ON c.rowid = el.fk_source AND el.sourcetype = 'commande'";
+			$sqlSelect .= " WHERE e.rowid = el.fk_target";
+			$sqlSelect .= " AND el.targettype = 'shipping'";
 
-            $resql = $db->query($sqlSelect);
-            if ($resql)
-            {
-                $i = 0;
-                $num = $db->num_rows($resql);
+			$resql = $db->query($sqlSelect);
+			if ($resql)
+			{
+				$i = 0;
+				$num = $db->num_rows($resql);
 
-                if ($num)
-                {
-                    while ($i < $num)
-                    {
-                        $obj = $db->fetch_object($resql);
+				if ($num)
+				{
+					while ($i < $num)
+					{
+						$obj = $db->fetch_object($resql);
 
-                        $sqlUpdate = "UPDATE ".MAIN_DB_PREFIX."expedition SET";
-                        $sqlUpdate .= " ref_customer = '".$db->escape($obj->ref_client)."'";
-                        $sqlUpdate .= ", date_delivery = '".$db->escape($obj->date_livraison ? $obj->date_livraison : 'null')."'";
-                        $sqlUpdate .= " WHERE rowid = ".$obj->shipping_id;
+						$sqlUpdate = "UPDATE ".MAIN_DB_PREFIX."expedition SET";
+						$sqlUpdate .= " ref_customer = '".$db->escape($obj->ref_client)."'";
+						$sqlUpdate .= ", date_delivery = '".$db->escape($obj->date_livraison ? $obj->date_livraison : 'null')."'";
+						$sqlUpdate .= " WHERE rowid = ".$obj->shipping_id;
 
-                        $result = $db->query($sqlUpdate);
-                        if (!$result)
-                        {
-                            $error++;
-                            dol_print_error($db);
-                        }
-                        print ". ";
-                        $i++;
-                    }
-                } else {
-                    print $langs->trans('AlreadyDone')."<br>\n";
-                }
+						$result = $db->query($sqlUpdate);
+						if (!$result)
+						{
+							$error++;
+							dol_print_error($db);
+						}
+						print ". ";
+						$i++;
+					}
+				} else {
+					print $langs->trans('AlreadyDone')."<br>\n";
+				}
 
-                if ($error == 0)
-                {
-                    $db->commit();
-                } else {
-                    dol_print_error($db);
-                    $db->rollback();
-                }
-            } else {
-                dol_print_error($db);
-                $db->rollback();
-            }
-        } else {
-            dol_print_error($db);
-            $db->rollback();
-        }
-    } else {
-        print $langs->trans('AlreadyDone')."<br>\n";
-    }
+				if ($error == 0)
+				{
+					$db->commit();
+				} else {
+					dol_print_error($db);
+					$db->rollback();
+				}
+			} else {
+				dol_print_error($db);
+				$db->rollback();
+			}
+		} else {
+			dol_print_error($db);
+			$db->rollback();
+		}
+	} else {
+		print $langs->trans('AlreadyDone')."<br>\n";
+	}
 
-    print '</td></tr>';
+	print '</td></tr>';
 }
 
 /**
@@ -3076,95 +3076,95 @@ function migrate_customerorder_shipping($db, $langs, $conf)
  */
 function migrate_shipping_delivery($db, $langs, $conf)
 {
-    print '<tr><td colspan="4">';
+	print '<tr><td colspan="4">';
 
-    print '<br>';
-    print '<b>'.$langs->trans('MigrationShippingDelivery')."</b><br>\n";
+	print '<br>';
+	print '<b>'.$langs->trans('MigrationShippingDelivery')."</b><br>\n";
 
-    $error = 0;
+	$error = 0;
 
-    $result = $db->DDLDescTable(MAIN_DB_PREFIX."livraison", "fk_expedition");
-    $obj = $db->fetch_object($result);
-    if ($obj)
-    {
-        dolibarr_install_syslog("upgrade2::migrate_shipping_delivery");
+	$result = $db->DDLDescTable(MAIN_DB_PREFIX."livraison", "fk_expedition");
+	$obj = $db->fetch_object($result);
+	if ($obj)
+	{
+		dolibarr_install_syslog("upgrade2::migrate_shipping_delivery");
 
-        $db->begin();
+		$db->begin();
 
-        $sqlSelect = "SELECT rowid, fk_expedition";
-        $sqlSelect .= " FROM ".MAIN_DB_PREFIX."livraison";
-        $sqlSelect .= " WHERE fk_expedition is not null";
+		$sqlSelect = "SELECT rowid, fk_expedition";
+		$sqlSelect .= " FROM ".MAIN_DB_PREFIX."livraison";
+		$sqlSelect .= " WHERE fk_expedition is not null";
 
-        $resql = $db->query($sqlSelect);
-        if ($resql)
-        {
-            $i = 0;
-            $num = $db->num_rows($resql);
+		$resql = $db->query($sqlSelect);
+		if ($resql)
+		{
+			$i = 0;
+			$num = $db->num_rows($resql);
 
-            if ($num)
-            {
-                while ($i < $num)
-                {
-                    $obj = $db->fetch_object($resql);
+			if ($num)
+			{
+				while ($i < $num)
+				{
+					$obj = $db->fetch_object($resql);
 
-                    $sqlInsert = "INSERT INTO ".MAIN_DB_PREFIX."element_element (";
-                    $sqlInsert .= "fk_source";
-                    $sqlInsert .= ", sourcetype";
-                    $sqlInsert .= ", fk_target";
-                    $sqlInsert .= ", targettype";
-                    $sqlInsert .= ") VALUES (";
-                    $sqlInsert .= $obj->fk_expedition;
-                    $sqlInsert .= ", 'shipping'";
-                    $sqlInsert .= ", ".$obj->rowid;
-                    $sqlInsert .= ", 'delivery'";
-                    $sqlInsert .= ")";
+					$sqlInsert = "INSERT INTO ".MAIN_DB_PREFIX."element_element (";
+					$sqlInsert .= "fk_source";
+					$sqlInsert .= ", sourcetype";
+					$sqlInsert .= ", fk_target";
+					$sqlInsert .= ", targettype";
+					$sqlInsert .= ") VALUES (";
+					$sqlInsert .= $obj->fk_expedition;
+					$sqlInsert .= ", 'shipping'";
+					$sqlInsert .= ", ".$obj->rowid;
+					$sqlInsert .= ", 'delivery'";
+					$sqlInsert .= ")";
 
-                    $result = $db->query($sqlInsert);
-                    if ($result)
-                    {
-                        $sqlUpdate = "UPDATE ".MAIN_DB_PREFIX."livraison SET fk_expedition = NULL";
-                        $sqlUpdate .= " WHERE rowid = ".$obj->rowid;
+					$result = $db->query($sqlInsert);
+					if ($result)
+					{
+						$sqlUpdate = "UPDATE ".MAIN_DB_PREFIX."livraison SET fk_expedition = NULL";
+						$sqlUpdate .= " WHERE rowid = ".$obj->rowid;
 
-                        $result = $db->query($sqlUpdate);
-                        if (!$result)
-                        {
-                            $error++;
-                            dol_print_error($db);
-                        }
-                        print ". ";
-                    } else {
-                        $error++;
-                        dol_print_error($db);
-                    }
-                    $i++;
-                }
-            } else {
-                print $langs->trans('AlreadyDone')."<br>\n";
-            }
+						$result = $db->query($sqlUpdate);
+						if (!$result)
+						{
+							$error++;
+							dol_print_error($db);
+						}
+						print ". ";
+					} else {
+						$error++;
+						dol_print_error($db);
+					}
+					$i++;
+				}
+			} else {
+				print $langs->trans('AlreadyDone')."<br>\n";
+			}
 
-            if ($error == 0)
-            {
-                $sqlDelete = "DELETE FROM ".MAIN_DB_PREFIX."element_element WHERE sourcetype = 'commande' AND targettype = 'delivery'";
-                $db->query($sqlDelete);
+			if ($error == 0)
+			{
+				$sqlDelete = "DELETE FROM ".MAIN_DB_PREFIX."element_element WHERE sourcetype = 'commande' AND targettype = 'delivery'";
+				$db->query($sqlDelete);
 
-                $db->commit();
+				$db->commit();
 
-                // DDL commands must not be inside a transaction
-                $sqlDrop = "ALTER TABLE ".MAIN_DB_PREFIX."livraison DROP COLUMN fk_expedition";
-                $db->query($sqlDrop);
-            } else {
-                dol_print_error($db);
-                $db->rollback();
-            }
-        } else {
-            dol_print_error($db);
-            $db->rollback();
-        }
-    } else {
-        print $langs->trans('AlreadyDone')."<br>\n";
-    }
+				// DDL commands must not be inside a transaction
+				$sqlDrop = "ALTER TABLE ".MAIN_DB_PREFIX."livraison DROP COLUMN fk_expedition";
+				$db->query($sqlDrop);
+			} else {
+				dol_print_error($db);
+				$db->rollback();
+			}
+		} else {
+			dol_print_error($db);
+			$db->rollback();
+		}
+	} else {
+		print $langs->trans('AlreadyDone')."<br>\n";
+	}
 
-    print '</td></tr>';
+	print '</td></tr>';
 }
 
 /**
@@ -3178,72 +3178,72 @@ function migrate_shipping_delivery($db, $langs, $conf)
  */
 function migrate_shipping_delivery2($db, $langs, $conf)
 {
-    print '<tr><td colspan="4">';
+	print '<tr><td colspan="4">';
 
-    print '<br>';
-    print '<b>'.$langs->trans('MigrationShippingDelivery2')."</b><br>\n";
+	print '<br>';
+	print '<b>'.$langs->trans('MigrationShippingDelivery2')."</b><br>\n";
 
-    $error = 0;
+	$error = 0;
 
-    dolibarr_install_syslog("upgrade2::migrate_shipping_delivery2");
+	dolibarr_install_syslog("upgrade2::migrate_shipping_delivery2");
 
-    $db->begin();
+	$db->begin();
 
-    $sqlSelect = "SELECT l.rowid as delivery_id, e.ref_customer, e.date_delivery";
-    $sqlSelect .= " FROM ".MAIN_DB_PREFIX."livraison as l,";
-    $sqlSelect .= " ".MAIN_DB_PREFIX."element_element as el,";
-    $sqlSelect .= " ".MAIN_DB_PREFIX."expedition as e";
-    $sqlSelect .= " WHERE l.rowid = el.fk_target";
-    $sqlSelect .= " AND el.targettype = 'delivery'";
-    $sqlSelect .= " AND e.rowid = el.fk_source AND el.sourcetype = 'shipping'";
-    $sqlSelect .= " AND (e.ref_customer IS NOT NULL OR e.date_delivery IS NOT NULL)"; // Useless to process this record if both are null
-    // Add condition to know if we never migrate this record
-    $sqlSelect .= " AND (l.ref_customer IS NULL".($db->type != 'pgsql' ? " or l.ref_customer = ''" : "").")";
-    $sqlSelect .= " AND (l.date_delivery IS NULL".($db->type != 'pgsql' ? " or l.date_delivery = ''" : "").")";
+	$sqlSelect = "SELECT l.rowid as delivery_id, e.ref_customer, e.date_delivery";
+	$sqlSelect .= " FROM ".MAIN_DB_PREFIX."livraison as l,";
+	$sqlSelect .= " ".MAIN_DB_PREFIX."element_element as el,";
+	$sqlSelect .= " ".MAIN_DB_PREFIX."expedition as e";
+	$sqlSelect .= " WHERE l.rowid = el.fk_target";
+	$sqlSelect .= " AND el.targettype = 'delivery'";
+	$sqlSelect .= " AND e.rowid = el.fk_source AND el.sourcetype = 'shipping'";
+	$sqlSelect .= " AND (e.ref_customer IS NOT NULL OR e.date_delivery IS NOT NULL)"; // Useless to process this record if both are null
+	// Add condition to know if we never migrate this record
+	$sqlSelect .= " AND (l.ref_customer IS NULL".($db->type != 'pgsql' ? " or l.ref_customer = ''" : "").")";
+	$sqlSelect .= " AND (l.date_delivery IS NULL".($db->type != 'pgsql' ? " or l.date_delivery = ''" : "").")";
 
-    $resql = $db->query($sqlSelect);
-    if ($resql)
-    {
-        $i = 0;
-        $num = $db->num_rows($resql);
+	$resql = $db->query($sqlSelect);
+	if ($resql)
+	{
+		$i = 0;
+		$num = $db->num_rows($resql);
 
-        if ($num)
-        {
-            while ($i < $num)
-            {
-                $obj = $db->fetch_object($resql);
+		if ($num)
+		{
+			while ($i < $num)
+			{
+				$obj = $db->fetch_object($resql);
 
-                $sqlUpdate = "UPDATE ".MAIN_DB_PREFIX."livraison SET";
-                $sqlUpdate .= " ref_customer = '".$db->escape($obj->ref_customer)."',";
-                $sqlUpdate .= " date_delivery = ".($obj->date_delivery ? "'".$db->escape($obj->date_delivery)."'" : 'null');
-                $sqlUpdate .= " WHERE rowid = ".$obj->delivery_id;
+				$sqlUpdate = "UPDATE ".MAIN_DB_PREFIX."livraison SET";
+				$sqlUpdate .= " ref_customer = '".$db->escape($obj->ref_customer)."',";
+				$sqlUpdate .= " date_delivery = ".($obj->date_delivery ? "'".$db->escape($obj->date_delivery)."'" : 'null');
+				$sqlUpdate .= " WHERE rowid = ".$obj->delivery_id;
 
-                $result = $db->query($sqlUpdate);
-                if (!$result)
-                {
-                    $error++;
-                    dol_print_error($db);
-                }
-                print ". ";
-                $i++;
-            }
-        } else {
-            print $langs->trans('AlreadyDone')."<br>\n";
-        }
+				$result = $db->query($sqlUpdate);
+				if (!$result)
+				{
+					$error++;
+					dol_print_error($db);
+				}
+				print ". ";
+				$i++;
+			}
+		} else {
+			print $langs->trans('AlreadyDone')."<br>\n";
+		}
 
-        if ($error == 0)
-        {
-            $db->commit();
-        } else {
-            dol_print_error($db);
-            $db->rollback();
-        }
-    } else {
-        dol_print_error($db);
-        $db->rollback();
-    }
+		if ($error == 0)
+		{
+			$db->commit();
+		} else {
+			dol_print_error($db);
+			$db->rollback();
+		}
+	} else {
+		dol_print_error($db);
+		$db->rollback();
+	}
 
-    print '</td></tr>';
+	print '</td></tr>';
 }
 
 /**
@@ -3413,76 +3413,76 @@ function migrate_mode_reglement($db, $langs, $conf)
  */
 function migrate_clean_association($db, $langs, $conf)
 {
-    $result = $db->DDLDescTable(MAIN_DB_PREFIX."categorie_association");
-    if ($result)	// result defined for version 3.2 or -
-    {
-        $obj = $db->fetch_object($result);
-        if ($obj)	// It table categorie_association exists
-        {
-            $couples = array();
-            $filles = array();
-            $sql = "SELECT fk_categorie_mere, fk_categorie_fille";
-            $sql .= " FROM ".MAIN_DB_PREFIX."categorie_association";
-            dolibarr_install_syslog("upgrade: search duplicate");
-            $resql = $db->query($sql);
-            if ($resql)
-            {
-                $num = $db->num_rows($resql);
-                while ($obj = $db->fetch_object($resql))
-                {
-                    if (!isset($filles[$obj->fk_categorie_fille]))	// Only one record as child (a child has only on parent).
-                    {
-                        if ($obj->fk_categorie_mere != $obj->fk_categorie_fille)
-                        {
-                            $filles[$obj->fk_categorie_fille] = 1; // Set record for this child
-                            $couples[$obj->fk_categorie_mere.'_'.$obj->fk_categorie_fille] = array('mere'=>$obj->fk_categorie_mere, 'fille'=>$obj->fk_categorie_fille);
-                        }
-                    }
-                }
+	$result = $db->DDLDescTable(MAIN_DB_PREFIX."categorie_association");
+	if ($result)	// result defined for version 3.2 or -
+	{
+		$obj = $db->fetch_object($result);
+		if ($obj)	// It table categorie_association exists
+		{
+			$couples = array();
+			$filles = array();
+			$sql = "SELECT fk_categorie_mere, fk_categorie_fille";
+			$sql .= " FROM ".MAIN_DB_PREFIX."categorie_association";
+			dolibarr_install_syslog("upgrade: search duplicate");
+			$resql = $db->query($sql);
+			if ($resql)
+			{
+				$num = $db->num_rows($resql);
+				while ($obj = $db->fetch_object($resql))
+				{
+					if (!isset($filles[$obj->fk_categorie_fille]))	// Only one record as child (a child has only on parent).
+					{
+						if ($obj->fk_categorie_mere != $obj->fk_categorie_fille)
+						{
+							$filles[$obj->fk_categorie_fille] = 1; // Set record for this child
+							$couples[$obj->fk_categorie_mere.'_'.$obj->fk_categorie_fille] = array('mere'=>$obj->fk_categorie_mere, 'fille'=>$obj->fk_categorie_fille);
+						}
+					}
+				}
 
-                dolibarr_install_syslog("upgrade: result is num=".$num." count(couples)=".count($couples));
+				dolibarr_install_syslog("upgrade: result is num=".$num." count(couples)=".count($couples));
 
-                // If there is duplicates couples or child with two parents
-                if (count($couples) > 0 && $num > count($couples))
-                {
-                    $error = 0;
+				// If there is duplicates couples or child with two parents
+				if (count($couples) > 0 && $num > count($couples))
+				{
+					$error = 0;
 
-                    $db->begin();
+					$db->begin();
 
-                    // We delete all
-                    $sql = "DELETE FROM ".MAIN_DB_PREFIX."categorie_association";
-                    dolibarr_install_syslog("upgrade: delete association");
-                    $resqld = $db->query($sql);
-                    if ($resqld)
-                    {
-                        // And we insert only each record once
-                        foreach ($couples as $key => $val)
-                        {
-                            $sql = "INSERT INTO ".MAIN_DB_PREFIX."categorie_association(fk_categorie_mere,fk_categorie_fille)";
-                            $sql .= " VALUES(".$val['mere'].", ".$val['fille'].")";
-                            dolibarr_install_syslog("upgrade: insert association");
-                            $resqli = $db->query($sql);
-                            if (!$resqli) $error++;
-                        }
-                    }
+					// We delete all
+					$sql = "DELETE FROM ".MAIN_DB_PREFIX."categorie_association";
+					dolibarr_install_syslog("upgrade: delete association");
+					$resqld = $db->query($sql);
+					if ($resqld)
+					{
+						// And we insert only each record once
+						foreach ($couples as $key => $val)
+						{
+							$sql = "INSERT INTO ".MAIN_DB_PREFIX."categorie_association(fk_categorie_mere,fk_categorie_fille)";
+							$sql .= " VALUES(".$val['mere'].", ".$val['fille'].")";
+							dolibarr_install_syslog("upgrade: insert association");
+							$resqli = $db->query($sql);
+							if (!$resqli) $error++;
+						}
+					}
 
-                    if (!$error)
-                    {
-                        print '<tr><td>'.$langs->trans("MigrationCategorieAssociation").'</td>';
-                        print '<td class="right">'.$langs->trans("RemoveDuplicates").' '.$langs->trans("Success").' ('.$num.'=>'.count($couples).')</td></tr>';
-                        $db->commit();
-                    } else {
-                        print '<tr><td>'.$langs->trans("MigrationCategorieAssociation").'</td>';
-                        print '<td class="right">'.$langs->trans("RemoveDuplicates").' '.$langs->trans("Failed").'</td></tr>';
-                        $db->rollback();
-                    }
-                }
-            } else {
-                print '<tr><td>'.$langs->trans("Error").'</td>';
-                print '<td class="right"><div class="error">'.$db->lasterror().'</div></td></tr>';
-            }
-        }
-    }
+					if (!$error)
+					{
+						print '<tr><td>'.$langs->trans("MigrationCategorieAssociation").'</td>';
+						print '<td class="right">'.$langs->trans("RemoveDuplicates").' '.$langs->trans("Success").' ('.$num.'=>'.count($couples).')</td></tr>';
+						$db->commit();
+					} else {
+						print '<tr><td>'.$langs->trans("MigrationCategorieAssociation").'</td>';
+						print '<td class="right">'.$langs->trans("RemoveDuplicates").' '.$langs->trans("Failed").'</td></tr>';
+						$db->rollback();
+					}
+				}
+			} else {
+				print '<tr><td>'.$langs->trans("Error").'</td>';
+				print '<td class="right"><div class="error">'.$db->lasterror().'</div></td></tr>';
+			}
+		}
+	}
 }
 
 
@@ -4144,13 +4144,13 @@ function migrate_usergroup_rights_entity($db, $langs, $conf)
  */
 function migrate_rename_directories($db, $langs, $conf, $oldname, $newname)
 {
-    dolibarr_install_syslog("upgrade2::migrate_rename_directories");
+	dolibarr_install_syslog("upgrade2::migrate_rename_directories");
 
-    if (is_dir(DOL_DATA_ROOT.$oldname) && !file_exists(DOL_DATA_ROOT.$newname))
-    {
-        dolibarr_install_syslog("upgrade2::migrate_rename_directories move ".DOL_DATA_ROOT.$oldname.' into '.DOL_DATA_ROOT.$newname);
-        @rename(DOL_DATA_ROOT.$oldname, DOL_DATA_ROOT.$newname);
-    }
+	if (is_dir(DOL_DATA_ROOT.$oldname) && !file_exists(DOL_DATA_ROOT.$newname))
+	{
+		dolibarr_install_syslog("upgrade2::migrate_rename_directories move ".DOL_DATA_ROOT.$oldname.' into '.DOL_DATA_ROOT.$newname);
+		@rename(DOL_DATA_ROOT.$oldname, DOL_DATA_ROOT.$newname);
+	}
 }
 
 
@@ -4164,78 +4164,78 @@ function migrate_rename_directories($db, $langs, $conf, $oldname, $newname)
  */
 function migrate_delete_old_files($db, $langs, $conf)
 {
-    $result = true;
+	$result = true;
 
-    dolibarr_install_syslog("upgrade2::migrate_delete_old_files");
+	dolibarr_install_syslog("upgrade2::migrate_delete_old_files");
 
-    // List of files to delete
-    $filetodeletearray = array(
-        '/core/triggers/interface_demo.class.php',
-        '/core/menus/barre_left/default.php',
-        '/core/menus/barre_top/default.php',
-        '/core/modules/modComptabiliteExpert.class.php',
-        '/core/modules/modCommercial.class.php',
-        '/core/modules/modProduit.class.php',
-        '/core/modules/modSkype.class.php',
-        '/phenix/inc/triggers/interface_modPhenix_Phenixsynchro.class.php',
-        '/webcalendar/inc/triggers/interface_modWebcalendar_webcalsynchro.class.php',
-        '/core/triggers/interface_modWebcalendar_Webcalsynchro.class.php',
-        '/core/triggers/interface_modCommande_Ecotax.class.php',
-        '/core/triggers/interface_modCommande_fraisport.class.php',
-        '/core/triggers/interface_modPropale_PropalWorkflow.class.php',
-        '/core/menus/smartphone/iphone.lib.php',
-        '/core/menus/smartphone/iphone_backoffice.php',
-        '/core/menus/smartphone/iphone_frontoffice.php',
-        '/core/menus/standard/auguria_backoffice.php',
-        '/core/menus/standard/auguria_frontoffice.php',
-        '/core/menus/standard/eldy_backoffice.php',
-        '/core/menus/standard/eldy_frontoffice.php',
-        '/core/modules/mailings/contacts2.modules.php',
-        '/core/modules/mailings/contacts3.modules.php',
-        '/core/modules/mailings/contacts4.modules.php',
-        '/core/modules/mailings/framboise.modules.php',
-        '/core/modules/mailings/dolibarr_services_expired.modules.php',
-        '/core/modules/mailings/peche.modules.php',
-        '/core/modules/mailings/poire.modules.php',
-        '/core/modules/mailings/kiwi.modules.php',
-        '/core/modules/facture/pdf_crabe.modules.php',
-        '/core/modules/facture/pdf_oursin.modules.php',
+	// List of files to delete
+	$filetodeletearray = array(
+		'/core/triggers/interface_demo.class.php',
+		'/core/menus/barre_left/default.php',
+		'/core/menus/barre_top/default.php',
+		'/core/modules/modComptabiliteExpert.class.php',
+		'/core/modules/modCommercial.class.php',
+		'/core/modules/modProduit.class.php',
+		'/core/modules/modSkype.class.php',
+		'/phenix/inc/triggers/interface_modPhenix_Phenixsynchro.class.php',
+		'/webcalendar/inc/triggers/interface_modWebcalendar_webcalsynchro.class.php',
+		'/core/triggers/interface_modWebcalendar_Webcalsynchro.class.php',
+		'/core/triggers/interface_modCommande_Ecotax.class.php',
+		'/core/triggers/interface_modCommande_fraisport.class.php',
+		'/core/triggers/interface_modPropale_PropalWorkflow.class.php',
+		'/core/menus/smartphone/iphone.lib.php',
+		'/core/menus/smartphone/iphone_backoffice.php',
+		'/core/menus/smartphone/iphone_frontoffice.php',
+		'/core/menus/standard/auguria_backoffice.php',
+		'/core/menus/standard/auguria_frontoffice.php',
+		'/core/menus/standard/eldy_backoffice.php',
+		'/core/menus/standard/eldy_frontoffice.php',
+		'/core/modules/mailings/contacts2.modules.php',
+		'/core/modules/mailings/contacts3.modules.php',
+		'/core/modules/mailings/contacts4.modules.php',
+		'/core/modules/mailings/framboise.modules.php',
+		'/core/modules/mailings/dolibarr_services_expired.modules.php',
+		'/core/modules/mailings/peche.modules.php',
+		'/core/modules/mailings/poire.modules.php',
+		'/core/modules/mailings/kiwi.modules.php',
+		'/core/modules/facture/pdf_crabe.modules.php',
+		'/core/modules/facture/pdf_oursin.modules.php',
 
-    	'/api/class/api_generic.class.php',
-    	'/categories/class/api_category.class.php',
-    	'/categories/class/api_deprecated_category.class.php',
-    	'/compta/facture/class/api_invoice.class.php',
-        '/commande/class/api_commande.class.php',
-        '/user/class/api_user.class.php',
-        '/product/class/api_product.class.php',
-        '/societe/class/api_contact.class.php',
-        '/societe/class/api_thirdparty.class.php',
-        '/support/online.php',
-        '/takepos/class/actions_takepos.class.php',
+		'/api/class/api_generic.class.php',
+		'/categories/class/api_category.class.php',
+		'/categories/class/api_deprecated_category.class.php',
+		'/compta/facture/class/api_invoice.class.php',
+		'/commande/class/api_commande.class.php',
+		'/user/class/api_user.class.php',
+		'/product/class/api_product.class.php',
+		'/societe/class/api_contact.class.php',
+		'/societe/class/api_thirdparty.class.php',
+		'/support/online.php',
+		'/takepos/class/actions_takepos.class.php',
 
-    	'/install/mysql/tables/llx_c_ticketsup_category.key.sql',
-    	'/install/mysql/tables/llx_c_ticketsup_category.sql',
-    	'/install/mysql/tables/llx_c_ticketsup_severity.key.sql',
-    	'/install/mysql/tables/llx_c_ticketsup_severity.sql',
-    	'/install/mysql/tables/llx_c_ticketsup_type.key.sql',
-    	'/install/mysql/tables/llx_c_ticketsup_type.sql'
-    );
+		'/install/mysql/tables/llx_c_ticketsup_category.key.sql',
+		'/install/mysql/tables/llx_c_ticketsup_category.sql',
+		'/install/mysql/tables/llx_c_ticketsup_severity.key.sql',
+		'/install/mysql/tables/llx_c_ticketsup_severity.sql',
+		'/install/mysql/tables/llx_c_ticketsup_type.key.sql',
+		'/install/mysql/tables/llx_c_ticketsup_type.sql'
+	);
 
-    foreach ($filetodeletearray as $filetodelete) {
-        //print '<b>'DOL_DOCUMENT_ROOT.$filetodelete."</b><br>\n";
-        $result = 1;
-        if (file_exists(DOL_DOCUMENT_ROOT.$filetodelete)) {
-            $result = dol_delete_file(DOL_DOCUMENT_ROOT.$filetodelete, 0, 0, 0, null, true, false);
-            if (!$result) {
-                $langs->load("errors");
-                print '<div class="error">'.$langs->trans("Error").': '.$langs->trans("ErrorFailToDeleteFile", DOL_DOCUMENT_ROOT.$filetodelete);
-                print ' '.$langs->trans("RemoveItManuallyAndPressF5ToContinue").'</div>';
-            } else {
-                //print $langs->trans("FileWasRemoved", $filetodelete).'<br>';
-            }
-        }
-    }
-    return $result;
+	foreach ($filetodeletearray as $filetodelete) {
+		//print '<b>'DOL_DOCUMENT_ROOT.$filetodelete."</b><br>\n";
+		$result = 1;
+		if (file_exists(DOL_DOCUMENT_ROOT.$filetodelete)) {
+			$result = dol_delete_file(DOL_DOCUMENT_ROOT.$filetodelete, 0, 0, 0, null, true, false);
+			if (!$result) {
+				$langs->load("errors");
+				print '<div class="error">'.$langs->trans("Error").': '.$langs->trans("ErrorFailToDeleteFile", DOL_DOCUMENT_ROOT.$filetodelete);
+				print ' '.$langs->trans("RemoveItManuallyAndPressF5ToContinue").'</div>';
+			} else {
+				//print $langs->trans("FileWasRemoved", $filetodelete).'<br>';
+			}
+		}
+	}
+	return $result;
 }
 
 /**
@@ -4248,28 +4248,28 @@ function migrate_delete_old_files($db, $langs, $conf)
  */
 function migrate_delete_old_dir($db, $langs, $conf)
 {
-    $result = true;
+	$result = true;
 
-    dolibarr_install_syslog("upgrade2::migrate_delete_old_dir");
+	dolibarr_install_syslog("upgrade2::migrate_delete_old_dir");
 
-    // List of files to delete
-    $filetodeletearray = array(
-        DOL_DOCUMENT_ROOT.'/core/modules/facture/terre',
-        DOL_DOCUMENT_ROOT.'/core/modules/facture/mercure',
-    );
+	// List of files to delete
+	$filetodeletearray = array(
+		DOL_DOCUMENT_ROOT.'/core/modules/facture/terre',
+		DOL_DOCUMENT_ROOT.'/core/modules/facture/mercure',
+	);
 
-    foreach ($filetodeletearray as $filetodelete) {
-        //print '<b>'.$filetodelete."</b><br>\n";
-        if (file_exists($filetodelete)) {
-            $result = dol_delete_dir_recursive($filetodelete);
-        }
-        if (!$result) {
-            $langs->load("errors");
-            print '<div class="error">'.$langs->trans("Error").': '.$langs->trans("ErrorFailToDeleteDir", $filetodelete);
-            print ' '.$langs->trans("RemoveItManuallyAndPressF5ToContinue").'</div>';
-        }
-    }
-    return $result;
+	foreach ($filetodeletearray as $filetodelete) {
+		//print '<b>'.$filetodelete."</b><br>\n";
+		if (file_exists($filetodelete)) {
+			$result = dol_delete_dir_recursive($filetodelete);
+		}
+		if (!$result) {
+			$langs->load("errors");
+			print '<div class="error">'.$langs->trans("Error").': '.$langs->trans("ErrorFailToDeleteDir", $filetodelete);
+			print ' '.$langs->trans("RemoveItManuallyAndPressF5ToContinue").'</div>';
+		}
+	}
+	return $result;
 }
 
 
@@ -4530,35 +4530,35 @@ function migrate_reload_modules($db, $langs, $conf, $listofmodule = array(), $fo
  */
 function migrate_reload_menu($db, $langs, $conf)
 {
-    global $conf;
-    dolibarr_install_syslog("upgrade2::migrate_reload_menu");
+	global $conf;
+	dolibarr_install_syslog("upgrade2::migrate_reload_menu");
 
-    // Define list of menu handlers to initialize
-    $listofmenuhandler = array();
-    if ($conf->global->MAIN_MENU_STANDARD == 'auguria_menu' || $conf->global->MAIN_MENU_SMARTPHONE == 'auguria_menu'
-    	|| $conf->global->MAIN_MENUFRONT_STANDARD == 'auguria_menu' || $conf->global->MAIN_MENUFRONT_SMARTPHONE == 'auguria_menu')
-    {
-    	$listofmenuhandler['auguria'] = 1; // We set here only dynamic menu handlers
-    }
+	// Define list of menu handlers to initialize
+	$listofmenuhandler = array();
+	if ($conf->global->MAIN_MENU_STANDARD == 'auguria_menu' || $conf->global->MAIN_MENU_SMARTPHONE == 'auguria_menu'
+		|| $conf->global->MAIN_MENUFRONT_STANDARD == 'auguria_menu' || $conf->global->MAIN_MENUFRONT_SMARTPHONE == 'auguria_menu')
+	{
+		$listofmenuhandler['auguria'] = 1; // We set here only dynamic menu handlers
+	}
 
-    foreach ($listofmenuhandler as $key => $val)
-    {
-        print '<tr><td colspan="4">';
+	foreach ($listofmenuhandler as $key => $val)
+	{
+		print '<tr><td colspan="4">';
 
-        //print "x".$key;
-        print '<br>';
-        print '<b>'.$langs->trans('Upgrade').'</b>: '.$langs->trans('MenuHandler')." ".$key."<br>\n";
+		//print "x".$key;
+		print '<br>';
+		print '<b>'.$langs->trans('Upgrade').'</b>: '.$langs->trans('MenuHandler')." ".$key."<br>\n";
 
-        // Load sql ini_menu_handler.sql file
-        $dir = DOL_DOCUMENT_ROOT."/core/menus/";
-        $file = 'init_menu_'.$key.'.sql';
-        if (file_exists($dir.$file))
-        {
-            $result = run_sql($dir.$file, 1, '', 1, $key);
-        }
+		// Load sql ini_menu_handler.sql file
+		$dir = DOL_DOCUMENT_ROOT."/core/menus/";
+		$file = 'init_menu_'.$key.'.sql';
+		if (file_exists($dir.$file))
+		{
+			$result = run_sql($dir.$file, 1, '', 1, $key);
+		}
 
-        print '</td></tr>';
-    }
+		print '</td></tr>';
+	}
 }
 
 /**
@@ -4608,44 +4608,44 @@ function migrate_user_photospath()
 				if (dol_is_dir($origin))
 				{
 					$handle = opendir($origin_osencoded);
-			        if (is_resource($handle))
-			        {
-			        	while (($file = readdir($handle)) !== false)
-			    		{
-			    			if ($file == '.' || $file == '..') continue;
+					if (is_resource($handle))
+					{
+						while (($file = readdir($handle)) !== false)
+						{
+							if ($file == '.' || $file == '..') continue;
 
-			     			if (dol_is_dir($origin.'/'.$file))	// it is a dir (like 'thumbs')
-			    			{
-			    				$thumbs = opendir($origin_osencoded.'/'.$file);
-			    				if (is_resource($thumbs))
-			        			{
-				     				dol_mkdir($destin.'/'.$file);
-				     				while (($thumb = readdir($thumbs)) !== false)
-					    			{
-					    				if (!dol_is_file($destin.'/'.$file.'/'.$thumb))
-					    				{
-					    					if ($thumb == '.' || $thumb == '..') continue;
+				 			if (dol_is_dir($origin.'/'.$file))	// it is a dir (like 'thumbs')
+							{
+								$thumbs = opendir($origin_osencoded.'/'.$file);
+								if (is_resource($thumbs))
+								{
+					 				dol_mkdir($destin.'/'.$file);
+					 				while (($thumb = readdir($thumbs)) !== false)
+									{
+										if (!dol_is_file($destin.'/'.$file.'/'.$thumb))
+										{
+											if ($thumb == '.' || $thumb == '..') continue;
 
-					    					//print $origin.'/'.$file.'/'.$thumb.' -> '.$destin.'/'.$file.'/'.$thumb.'<br>'."\n";
-					    					print '.';
-					    					dol_copy($origin.'/'.$file.'/'.$thumb, $destin.'/'.$file.'/'.$thumb, 0, 0);
-					    					//var_dump('aaa');exit;
-					    				}
-					    			}
+											//print $origin.'/'.$file.'/'.$thumb.' -> '.$destin.'/'.$file.'/'.$thumb.'<br>'."\n";
+											print '.';
+											dol_copy($origin.'/'.$file.'/'.$thumb, $destin.'/'.$file.'/'.$thumb, 0, 0);
+											//var_dump('aaa');exit;
+										}
+									}
 									// dol_delete_dir($origin.'/'.$file);
-			        			}
-			    			} else // it is a file
-			    			{
-			    				if (!dol_is_file($destin.'/'.$file))
-			    				{
-			    					//print $origin.'/'.$file.' -> '.$destin.'/'.$file.'<br>'."\n";
-			    					print '.';
-			    					dol_copy($origin.'/'.$file, $destin.'/'.$file, 0, 0);
-			    					//var_dump('eee');exit;
-			    				}
-			    			}
-			    		}
-			        }
+								}
+							} else // it is a file
+							{
+								if (!dol_is_file($destin.'/'.$file))
+								{
+									//print $origin.'/'.$file.' -> '.$destin.'/'.$file.'<br>'."\n";
+									print '.';
+									dol_copy($origin.'/'.$file, $destin.'/'.$file, 0, 0);
+									//var_dump('eee');exit;
+								}
+							}
+						}
+					}
 				}
 			}
 		}
@@ -4673,87 +4673,87 @@ and rowid in (...)
  */
 function migrate_users_socialnetworks()
 {
-    global $db, $langs;
-    // skype,twitter,facebook,linkedin,instagram,snapchat,googleplus,youtube,whatsapp
-    $error = 0;
-    $db->begin();
-    print '<tr><td colspan="4">';
-    $sql = 'SELECT rowid, socialnetworks';
-    $sql .= ', skype, twitter, facebook, linkedin, instagram, snapchat, googleplus, youtube, whatsapp FROM '.MAIN_DB_PREFIX.'user WHERE';
-    $sql .= " skype IS NOT NULL OR skype <> ''";
-    $sql .= " OR twitter IS NOT NULL OR twitter <> ''";
-    $sql .= " OR facebook IS NOT NULL OR facebook <> ''";
-    $sql .= " OR linkedin IS NOT NULL OR linkedin <> ''";
-    $sql .= " OR instagram IS NOT NULL OR instagram <> ''";
-    $sql .= " OR snapchat IS NOT NULL OR snapchat <> ''";
-    $sql .= " OR googleplus IS NOT NULL OR googleplus <> ''";
-    $sql .= " OR youtube IS NOT NULL OR youtube <> ''";
-    $sql .= " OR whatsapp IS NOT NULL OR whatsapp <> ''";
-    //print $sql;
-    $resql = $db->query($sql);
-    if ($resql) {
-        while ($obj = $db->fetch_object($resql)) {
-            $arraysocialnetworks = array();
-            if (!empty($obj->skype)) {
-                $arraysocialnetworks['skype'] = $obj->skype;
-            }
-            if (!empty($obj->twitter)) {
-                $arraysocialnetworks['twitter'] = $obj->twitter;
-            }
-            if (!empty($obj->facebook)) {
-                $arraysocialnetworks['facebook'] = $obj->facebook;
-            }
-            if (!empty($obj->linkedin)) {
-                $arraysocialnetworks['linkedin'] = $obj->linkedin;
-            }
-            if (!empty($obj->instagram)) {
-                $arraysocialnetworks['instagram'] = $obj->instagram;
-            }
-            if (!empty($obj->snapchat)) {
-                $arraysocialnetworks['snapchat'] = $obj->snapchat;
-            }
-            if (!empty($obj->googleplus)) {
-                $arraysocialnetworks['googleplus'] = $obj->googleplus;
-            }
-            if (!empty($obj->youtube)) {
-                $arraysocialnetworks['youtube'] = $obj->youtube;
-            }
-            if (!empty($obj->whatsapp)) {
-                $arraysocialnetworks['whatsapp'] = $obj->whatsapp;
-            }
-            if ($obj->socialnetworks == '' || is_null($obj->socialnetworks)) {
-                $obj->socialnetworks = '[]';
-            }
-            $socialnetworks = array_merge($arraysocialnetworks, json_decode($obj->socialnetworks, true));
-            $sqlupd = 'UPDATE '.MAIN_DB_PREFIX."user SET socialnetworks='".$db->escape(json_encode($socialnetworks, true))."'";
-            $sqlupd .= ', skype=null';
-            $sqlupd .= ', twitter=null';
-            $sqlupd .= ', facebook=null';
-            $sqlupd .= ', linkedin=null';
-            $sqlupd .= ', instagram=null';
-            $sqlupd .= ', snapchat=null';
-            $sqlupd .= ', googleplus=null';
-            $sqlupd .= ', youtube=null';
-            $sqlupd .= ', whatsapp=null';
-            $sqlupd .= ' WHERE rowid='.$obj->rowid;
-            //print $sqlupd."<br>";
-            $resqlupd = $db->query($sqlupd);
-            if (!$resqlupd) {
-                dol_print_error($db);
-                $error++;
-            }
-        }
-    } else {
-        $error++;
-    }
-    if (!$error) {
-        $db->commit();
-    } else {
-        dol_print_error($db);
-        $db->rollback();
-    }
-    print '<b>'.$langs->trans('MigrationFieldsSocialNetworks', 'Users')."</b><br>\n";
-    print '</td></tr>';
+	global $db, $langs;
+	// skype,twitter,facebook,linkedin,instagram,snapchat,googleplus,youtube,whatsapp
+	$error = 0;
+	$db->begin();
+	print '<tr><td colspan="4">';
+	$sql = 'SELECT rowid, socialnetworks';
+	$sql .= ', skype, twitter, facebook, linkedin, instagram, snapchat, googleplus, youtube, whatsapp FROM '.MAIN_DB_PREFIX.'user WHERE';
+	$sql .= " skype IS NOT NULL OR skype <> ''";
+	$sql .= " OR twitter IS NOT NULL OR twitter <> ''";
+	$sql .= " OR facebook IS NOT NULL OR facebook <> ''";
+	$sql .= " OR linkedin IS NOT NULL OR linkedin <> ''";
+	$sql .= " OR instagram IS NOT NULL OR instagram <> ''";
+	$sql .= " OR snapchat IS NOT NULL OR snapchat <> ''";
+	$sql .= " OR googleplus IS NOT NULL OR googleplus <> ''";
+	$sql .= " OR youtube IS NOT NULL OR youtube <> ''";
+	$sql .= " OR whatsapp IS NOT NULL OR whatsapp <> ''";
+	//print $sql;
+	$resql = $db->query($sql);
+	if ($resql) {
+		while ($obj = $db->fetch_object($resql)) {
+			$arraysocialnetworks = array();
+			if (!empty($obj->skype)) {
+				$arraysocialnetworks['skype'] = $obj->skype;
+			}
+			if (!empty($obj->twitter)) {
+				$arraysocialnetworks['twitter'] = $obj->twitter;
+			}
+			if (!empty($obj->facebook)) {
+				$arraysocialnetworks['facebook'] = $obj->facebook;
+			}
+			if (!empty($obj->linkedin)) {
+				$arraysocialnetworks['linkedin'] = $obj->linkedin;
+			}
+			if (!empty($obj->instagram)) {
+				$arraysocialnetworks['instagram'] = $obj->instagram;
+			}
+			if (!empty($obj->snapchat)) {
+				$arraysocialnetworks['snapchat'] = $obj->snapchat;
+			}
+			if (!empty($obj->googleplus)) {
+				$arraysocialnetworks['googleplus'] = $obj->googleplus;
+			}
+			if (!empty($obj->youtube)) {
+				$arraysocialnetworks['youtube'] = $obj->youtube;
+			}
+			if (!empty($obj->whatsapp)) {
+				$arraysocialnetworks['whatsapp'] = $obj->whatsapp;
+			}
+			if ($obj->socialnetworks == '' || is_null($obj->socialnetworks)) {
+				$obj->socialnetworks = '[]';
+			}
+			$socialnetworks = array_merge($arraysocialnetworks, json_decode($obj->socialnetworks, true));
+			$sqlupd = 'UPDATE '.MAIN_DB_PREFIX."user SET socialnetworks='".$db->escape(json_encode($socialnetworks, true))."'";
+			$sqlupd .= ', skype=null';
+			$sqlupd .= ', twitter=null';
+			$sqlupd .= ', facebook=null';
+			$sqlupd .= ', linkedin=null';
+			$sqlupd .= ', instagram=null';
+			$sqlupd .= ', snapchat=null';
+			$sqlupd .= ', googleplus=null';
+			$sqlupd .= ', youtube=null';
+			$sqlupd .= ', whatsapp=null';
+			$sqlupd .= ' WHERE rowid='.$obj->rowid;
+			//print $sqlupd."<br>";
+			$resqlupd = $db->query($sqlupd);
+			if (!$resqlupd) {
+				dol_print_error($db);
+				$error++;
+			}
+		}
+	} else {
+		$error++;
+	}
+	if (!$error) {
+		$db->commit();
+	} else {
+		dol_print_error($db);
+		$db->rollback();
+	}
+	print '<b>'.$langs->trans('MigrationFieldsSocialNetworks', 'Users')."</b><br>\n";
+	print '</td></tr>';
 }
 
 /**
@@ -4763,88 +4763,88 @@ function migrate_users_socialnetworks()
  */
 function migrate_members_socialnetworks()
 {
-    global $db, $langs;
+	global $db, $langs;
 
-    print '<tr><td colspan="4">';
-    $error = 0;
-    $db->begin();
-    print '<tr><td colspan="4">';
-    $sql = 'SELECT rowid, socialnetworks';
-    $sql .= ', skype, twitter, facebook, linkedin, instagram, snapchat, googleplus, youtube, whatsapp FROM '.MAIN_DB_PREFIX.'adherent WHERE ';
-    $sql .= " skype IS NOT NULL OR skype <> ''";
-    $sql .= " OR twitter IS NOT NULL OR twitter <> ''";
-    $sql .= " OR facebook IS NOT NULL OR facebook <> ''";
-    $sql .= " OR linkedin IS NOT NULL OR linkedin <> ''";
-    $sql .= " OR instagram IS NOT NULL OR instagram <> ''";
-    $sql .= " OR snapchat IS NOT NULL OR snapchat <> ''";
-    $sql .= " OR googleplus IS NOT NULL OR googleplus <> ''";
-    $sql .= " OR youtube IS NOT NULL OR youtube <> ''";
-    $sql .= " OR whatsapp IS NOT NULL OR whatsapp <> ''";
-    //print $sql;
-    $resql = $db->query($sql);
-    if ($resql) {
-        while ($obj = $db->fetch_object($resql)) {
-            $arraysocialnetworks = array();
-            if (!empty($obj->skype)) {
-                $arraysocialnetworks['skype'] = $obj->skype;
-            }
-            if (!empty($obj->twitter)) {
-                $arraysocialnetworks['twitter'] = $obj->twitter;
-            }
-            if (!empty($obj->facebook)) {
-                $arraysocialnetworks['facebook'] = $obj->facebook;
-            }
-            if (!empty($obj->linkedin)) {
-                $arraysocialnetworks['linkedin'] = $obj->linkedin;
-            }
-            if (!empty($obj->instagram)) {
-                $arraysocialnetworks['instagram'] = $obj->instagram;
-            }
-            if (!empty($obj->snapchat)) {
-                $arraysocialnetworks['snapchat'] = $obj->snapchat;
-            }
-            if (!empty($obj->googleplus)) {
-                $arraysocialnetworks['googleplus'] = $obj->googleplus;
-            }
-            if (!empty($obj->youtube)) {
-                $arraysocialnetworks['youtube'] = $obj->youtube;
-            }
-            if (!empty($obj->whatsapp)) {
-                $arraysocialnetworks['whatsapp'] = $obj->whatsapp;
-            }
-            if ($obj->socialnetworks == '' || is_null($obj->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 .= ', skype=null';
-            $sqlupd .= ', twitter=null';
-            $sqlupd .= ', facebook=null';
-            $sqlupd .= ', linkedin=null';
-            $sqlupd .= ', instagram=null';
-            $sqlupd .= ', snapchat=null';
-            $sqlupd .= ', googleplus=null';
-            $sqlupd .= ', youtube=null';
-            $sqlupd .= ', whatsapp=null';
-            $sqlupd .= ' WHERE rowid='.$obj->rowid;
-            //print $sqlupd."<br>";
-            $resqlupd = $db->query($sqlupd);
-            if (!$resqlupd) {
-                dol_print_error($db);
-                $error++;
-            }
-        }
-    } else {
-        $error++;
-    }
-    if (!$error) {
-        $db->commit();
-    } else {
-        dol_print_error($db);
-        $db->rollback();
-    }
-    print '<b>'.$langs->trans('MigrationFieldsSocialNetworks', 'Members')."</b><br>\n";
-    print '</td></tr>';
+	print '<tr><td colspan="4">';
+	$error = 0;
+	$db->begin();
+	print '<tr><td colspan="4">';
+	$sql = 'SELECT rowid, socialnetworks';
+	$sql .= ', skype, twitter, facebook, linkedin, instagram, snapchat, googleplus, youtube, whatsapp FROM '.MAIN_DB_PREFIX.'adherent WHERE ';
+	$sql .= " skype IS NOT NULL OR skype <> ''";
+	$sql .= " OR twitter IS NOT NULL OR twitter <> ''";
+	$sql .= " OR facebook IS NOT NULL OR facebook <> ''";
+	$sql .= " OR linkedin IS NOT NULL OR linkedin <> ''";
+	$sql .= " OR instagram IS NOT NULL OR instagram <> ''";
+	$sql .= " OR snapchat IS NOT NULL OR snapchat <> ''";
+	$sql .= " OR googleplus IS NOT NULL OR googleplus <> ''";
+	$sql .= " OR youtube IS NOT NULL OR youtube <> ''";
+	$sql .= " OR whatsapp IS NOT NULL OR whatsapp <> ''";
+	//print $sql;
+	$resql = $db->query($sql);
+	if ($resql) {
+		while ($obj = $db->fetch_object($resql)) {
+			$arraysocialnetworks = array();
+			if (!empty($obj->skype)) {
+				$arraysocialnetworks['skype'] = $obj->skype;
+			}
+			if (!empty($obj->twitter)) {
+				$arraysocialnetworks['twitter'] = $obj->twitter;
+			}
+			if (!empty($obj->facebook)) {
+				$arraysocialnetworks['facebook'] = $obj->facebook;
+			}
+			if (!empty($obj->linkedin)) {
+				$arraysocialnetworks['linkedin'] = $obj->linkedin;
+			}
+			if (!empty($obj->instagram)) {
+				$arraysocialnetworks['instagram'] = $obj->instagram;
+			}
+			if (!empty($obj->snapchat)) {
+				$arraysocialnetworks['snapchat'] = $obj->snapchat;
+			}
+			if (!empty($obj->googleplus)) {
+				$arraysocialnetworks['googleplus'] = $obj->googleplus;
+			}
+			if (!empty($obj->youtube)) {
+				$arraysocialnetworks['youtube'] = $obj->youtube;
+			}
+			if (!empty($obj->whatsapp)) {
+				$arraysocialnetworks['whatsapp'] = $obj->whatsapp;
+			}
+			if ($obj->socialnetworks == '' || is_null($obj->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 .= ', skype=null';
+			$sqlupd .= ', twitter=null';
+			$sqlupd .= ', facebook=null';
+			$sqlupd .= ', linkedin=null';
+			$sqlupd .= ', instagram=null';
+			$sqlupd .= ', snapchat=null';
+			$sqlupd .= ', googleplus=null';
+			$sqlupd .= ', youtube=null';
+			$sqlupd .= ', whatsapp=null';
+			$sqlupd .= ' WHERE rowid='.$obj->rowid;
+			//print $sqlupd."<br>";
+			$resqlupd = $db->query($sqlupd);
+			if (!$resqlupd) {
+				dol_print_error($db);
+				$error++;
+			}
+		}
+	} else {
+		$error++;
+	}
+	if (!$error) {
+		$db->commit();
+	} else {
+		dol_print_error($db);
+		$db->rollback();
+	}
+	print '<b>'.$langs->trans('MigrationFieldsSocialNetworks', 'Members')."</b><br>\n";
+	print '</td></tr>';
 }
 
 /**
@@ -4854,92 +4854,92 @@ function migrate_members_socialnetworks()
  */
 function migrate_contacts_socialnetworks()
 {
-    global $db, $langs;
-    // jabberid,skype,twitter,facebook,linkedin,instagram,snapchat,googleplus,youtube,whatsapp
-    $error = 0;
-    $db->begin();
-    print '<tr><td colspan="4">';
-    $sql = 'SELECT rowid, socialnetworks';
-    $sql .= ', jabberid, skype, twitter, facebook, linkedin, instagram, snapchat, googleplus, youtube, whatsapp FROM '.MAIN_DB_PREFIX.'socpeople WHERE ';
-    $sql .= " jabberid IS NOT NULL OR jabberid <> ''";
-    $sql .= " OR skype IS NOT NULL OR skype <> ''";
-    $sql .= " OR twitter IS NOT NULL OR twitter <> ''";
-    $sql .= " OR facebook IS NOT NULL OR facebook <> ''";
-    $sql .= " OR linkedin IS NOT NULL OR linkedin <> ''";
-    $sql .= " OR instagram IS NOT NULL OR instagram <> ''";
-    $sql .= " OR snapchat IS NOT NULL OR snapchat <> ''";
-    $sql .= " OR googleplus IS NOT NULL OR googleplus <> ''";
-    $sql .= " OR youtube IS NOT NULL OR youtube <> ''";
-    $sql .= " OR whatsapp IS NOT NULL OR whatsapp <> ''";
-    //print $sql;
-    $resql = $db->query($sql);
-    if ($resql) {
-        while ($obj = $db->fetch_object($resql)) {
-            $arraysocialnetworks = array();
-            if (!empty($obj->jabberid)) {
-                $arraysocialnetworks['jabber'] = $obj->jabberid;
-            }
-            if (!empty($obj->skype)) {
-                $arraysocialnetworks['skype'] = $obj->skype;
-            }
-            if (!empty($obj->twitter)) {
-                $arraysocialnetworks['twitter'] = $obj->twitter;
-            }
-            if (!empty($obj->facebook)) {
-                $arraysocialnetworks['facebook'] = $obj->facebook;
-            }
-            if (!empty($obj->linkedin)) {
-                $arraysocialnetworks['linkedin'] = $obj->linkedin;
-            }
-            if (!empty($obj->instagram)) {
-                $arraysocialnetworks['instagram'] = $obj->instagram;
-            }
-            if (!empty($obj->snapchat)) {
-                $arraysocialnetworks['snapchat'] = $obj->snapchat;
-            }
-            if (!empty($obj->googleplus)) {
-                $arraysocialnetworks['googleplus'] = $obj->googleplus;
-            }
-            if (!empty($obj->youtube)) {
-                $arraysocialnetworks['youtube'] = $obj->youtube;
-            }
-            if (!empty($obj->whatsapp)) {
-                $arraysocialnetworks['whatsapp'] = $obj->whatsapp;
-            }
-            if ($obj->socialnetworks == '' || is_null($obj->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 .= ', jabberid=null';
-            $sqlupd .= ', skype=null';
-            $sqlupd .= ', twitter=null';
-            $sqlupd .= ', facebook=null';
-            $sqlupd .= ', linkedin=null';
-            $sqlupd .= ', instagram=null';
-            $sqlupd .= ', snapchat=null';
-            $sqlupd .= ', googleplus=null';
-            $sqlupd .= ', youtube=null';
-            $sqlupd .= ', whatsapp=null';
-            $sqlupd .= ' WHERE rowid='.$obj->rowid;
-            //print $sqlupd."<br>";
-            $resqlupd = $db->query($sqlupd);
-            if (!$resqlupd) {
-                dol_print_error($db);
-                $error++;
-            }
-        }
-    } else {
-        $error++;
-    }
-    if (!$error) {
-        $db->commit();
-    } else {
-        dol_print_error($db);
-        $db->rollback();
-    }
-    print '<b>'.$langs->trans('MigrationFieldsSocialNetworks', 'Contacts')."</b><br>\n";
-    print '</td></tr>';
+	global $db, $langs;
+	// jabberid,skype,twitter,facebook,linkedin,instagram,snapchat,googleplus,youtube,whatsapp
+	$error = 0;
+	$db->begin();
+	print '<tr><td colspan="4">';
+	$sql = 'SELECT rowid, socialnetworks';
+	$sql .= ', jabberid, skype, twitter, facebook, linkedin, instagram, snapchat, googleplus, youtube, whatsapp FROM '.MAIN_DB_PREFIX.'socpeople WHERE ';
+	$sql .= " jabberid IS NOT NULL OR jabberid <> ''";
+	$sql .= " OR skype IS NOT NULL OR skype <> ''";
+	$sql .= " OR twitter IS NOT NULL OR twitter <> ''";
+	$sql .= " OR facebook IS NOT NULL OR facebook <> ''";
+	$sql .= " OR linkedin IS NOT NULL OR linkedin <> ''";
+	$sql .= " OR instagram IS NOT NULL OR instagram <> ''";
+	$sql .= " OR snapchat IS NOT NULL OR snapchat <> ''";
+	$sql .= " OR googleplus IS NOT NULL OR googleplus <> ''";
+	$sql .= " OR youtube IS NOT NULL OR youtube <> ''";
+	$sql .= " OR whatsapp IS NOT NULL OR whatsapp <> ''";
+	//print $sql;
+	$resql = $db->query($sql);
+	if ($resql) {
+		while ($obj = $db->fetch_object($resql)) {
+			$arraysocialnetworks = array();
+			if (!empty($obj->jabberid)) {
+				$arraysocialnetworks['jabber'] = $obj->jabberid;
+			}
+			if (!empty($obj->skype)) {
+				$arraysocialnetworks['skype'] = $obj->skype;
+			}
+			if (!empty($obj->twitter)) {
+				$arraysocialnetworks['twitter'] = $obj->twitter;
+			}
+			if (!empty($obj->facebook)) {
+				$arraysocialnetworks['facebook'] = $obj->facebook;
+			}
+			if (!empty($obj->linkedin)) {
+				$arraysocialnetworks['linkedin'] = $obj->linkedin;
+			}
+			if (!empty($obj->instagram)) {
+				$arraysocialnetworks['instagram'] = $obj->instagram;
+			}
+			if (!empty($obj->snapchat)) {
+				$arraysocialnetworks['snapchat'] = $obj->snapchat;
+			}
+			if (!empty($obj->googleplus)) {
+				$arraysocialnetworks['googleplus'] = $obj->googleplus;
+			}
+			if (!empty($obj->youtube)) {
+				$arraysocialnetworks['youtube'] = $obj->youtube;
+			}
+			if (!empty($obj->whatsapp)) {
+				$arraysocialnetworks['whatsapp'] = $obj->whatsapp;
+			}
+			if ($obj->socialnetworks == '' || is_null($obj->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 .= ', jabberid=null';
+			$sqlupd .= ', skype=null';
+			$sqlupd .= ', twitter=null';
+			$sqlupd .= ', facebook=null';
+			$sqlupd .= ', linkedin=null';
+			$sqlupd .= ', instagram=null';
+			$sqlupd .= ', snapchat=null';
+			$sqlupd .= ', googleplus=null';
+			$sqlupd .= ', youtube=null';
+			$sqlupd .= ', whatsapp=null';
+			$sqlupd .= ' WHERE rowid='.$obj->rowid;
+			//print $sqlupd."<br>";
+			$resqlupd = $db->query($sqlupd);
+			if (!$resqlupd) {
+				dol_print_error($db);
+				$error++;
+			}
+		}
+	} else {
+		$error++;
+	}
+	if (!$error) {
+		$db->commit();
+	} else {
+		dol_print_error($db);
+		$db->rollback();
+	}
+	print '<b>'.$langs->trans('MigrationFieldsSocialNetworks', 'Contacts')."</b><br>\n";
+	print '</td></tr>';
 }
 
 /**
@@ -4949,85 +4949,85 @@ function migrate_contacts_socialnetworks()
  */
 function migrate_thirdparties_socialnetworks()
 {
-    global $db, $langs;
-    // skype,twitter,facebook,linkedin,instagram,snapchat,googleplus,youtube,whatsapp
-    $error = 0;
-    $db->begin();
-    print '<tr><td colspan="4">';
-    $sql = 'SELECT rowid, socialnetworks';
-    $sql .= ', skype, twitter, facebook, linkedin, instagram, snapchat, googleplus, youtube, whatsapp FROM '.MAIN_DB_PREFIX.'societe WHERE ';
-    $sql .= " skype IS NOT NULL OR skype <> ''";
-    $sql .= " OR twitter IS NOT NULL OR twitter <> ''";
-    $sql .= " OR facebook IS NOT NULL OR facebook <> ''";
-    $sql .= " OR linkedin IS NOT NULL OR linkedin <> ''";
-    $sql .= " OR instagram IS NOT NULL OR instagram <> ''";
-    $sql .= " OR snapchat IS NOT NULL OR snapchat <> ''";
-    $sql .= " OR googleplus IS NOT NULL OR googleplus <> ''";
-    $sql .= " OR youtube IS NOT NULL OR youtube <> ''";
-    $sql .= " OR whatsapp IS NOT NULL OR whatsapp <> ''";
-    //print $sql;
-    $resql = $db->query($sql);
-    if ($resql) {
-        while ($obj = $db->fetch_object($resql)) {
-            $arraysocialnetworks = array();
-            if (!empty($obj->skype)) {
-                $arraysocialnetworks['skype'] = $obj->skype;
-            }
-            if (!empty($obj->twitter)) {
-                $arraysocialnetworks['twitter'] = $obj->twitter;
-            }
-            if (!empty($obj->facebook)) {
-                $arraysocialnetworks['facebook'] = $obj->facebook;
-            }
-            if (!empty($obj->linkedin)) {
-                $arraysocialnetworks['linkedin'] = $obj->linkedin;
-            }
-            if (!empty($obj->instagram)) {
-                $arraysocialnetworks['instagram'] = $obj->instagram;
-            }
-            if (!empty($obj->snapchat)) {
-                $arraysocialnetworks['snapchat'] = $obj->snapchat;
-            }
-            if (!empty($obj->googleplus)) {
-                $arraysocialnetworks['googleplus'] = $obj->googleplus;
-            }
-            if (!empty($obj->youtube)) {
-                $arraysocialnetworks['youtube'] = $obj->youtube;
-            }
-            if (!empty($obj->whatsapp)) {
-                $arraysocialnetworks['whatsapp'] = $obj->whatsapp;
-            }
-            if ($obj->socialnetworks == '' || is_null($obj->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 .= ', skype=null';
-            $sqlupd .= ', twitter=null';
-            $sqlupd .= ', facebook=null';
-            $sqlupd .= ', linkedin=null';
-            $sqlupd .= ', instagram=null';
-            $sqlupd .= ', snapchat=null';
-            $sqlupd .= ', googleplus=null';
-            $sqlupd .= ', youtube=null';
-            $sqlupd .= ', whatsapp=null';
-            $sqlupd .= ' WHERE rowid='.$obj->rowid;
-            //print $sqlupd."<br>";
-            $resqlupd = $db->query($sqlupd);
-            if (!$resqlupd) {
-                dol_print_error($db);
-                $error++;
-            }
-        }
-    } else {
-        $error++;
-    }
-    if (!$error) {
-        $db->commit();
-    } else {
-        dol_print_error($db);
-        $db->rollback();
-    }
-    print '<b>'.$langs->trans('MigrationFieldsSocialNetworks', 'Thirdparties')."</b><br>\n";
-    print '</td></tr>';
+	global $db, $langs;
+	// skype,twitter,facebook,linkedin,instagram,snapchat,googleplus,youtube,whatsapp
+	$error = 0;
+	$db->begin();
+	print '<tr><td colspan="4">';
+	$sql = 'SELECT rowid, socialnetworks';
+	$sql .= ', skype, twitter, facebook, linkedin, instagram, snapchat, googleplus, youtube, whatsapp FROM '.MAIN_DB_PREFIX.'societe WHERE ';
+	$sql .= " skype IS NOT NULL OR skype <> ''";
+	$sql .= " OR twitter IS NOT NULL OR twitter <> ''";
+	$sql .= " OR facebook IS NOT NULL OR facebook <> ''";
+	$sql .= " OR linkedin IS NOT NULL OR linkedin <> ''";
+	$sql .= " OR instagram IS NOT NULL OR instagram <> ''";
+	$sql .= " OR snapchat IS NOT NULL OR snapchat <> ''";
+	$sql .= " OR googleplus IS NOT NULL OR googleplus <> ''";
+	$sql .= " OR youtube IS NOT NULL OR youtube <> ''";
+	$sql .= " OR whatsapp IS NOT NULL OR whatsapp <> ''";
+	//print $sql;
+	$resql = $db->query($sql);
+	if ($resql) {
+		while ($obj = $db->fetch_object($resql)) {
+			$arraysocialnetworks = array();
+			if (!empty($obj->skype)) {
+				$arraysocialnetworks['skype'] = $obj->skype;
+			}
+			if (!empty($obj->twitter)) {
+				$arraysocialnetworks['twitter'] = $obj->twitter;
+			}
+			if (!empty($obj->facebook)) {
+				$arraysocialnetworks['facebook'] = $obj->facebook;
+			}
+			if (!empty($obj->linkedin)) {
+				$arraysocialnetworks['linkedin'] = $obj->linkedin;
+			}
+			if (!empty($obj->instagram)) {
+				$arraysocialnetworks['instagram'] = $obj->instagram;
+			}
+			if (!empty($obj->snapchat)) {
+				$arraysocialnetworks['snapchat'] = $obj->snapchat;
+			}
+			if (!empty($obj->googleplus)) {
+				$arraysocialnetworks['googleplus'] = $obj->googleplus;
+			}
+			if (!empty($obj->youtube)) {
+				$arraysocialnetworks['youtube'] = $obj->youtube;
+			}
+			if (!empty($obj->whatsapp)) {
+				$arraysocialnetworks['whatsapp'] = $obj->whatsapp;
+			}
+			if ($obj->socialnetworks == '' || is_null($obj->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 .= ', skype=null';
+			$sqlupd .= ', twitter=null';
+			$sqlupd .= ', facebook=null';
+			$sqlupd .= ', linkedin=null';
+			$sqlupd .= ', instagram=null';
+			$sqlupd .= ', snapchat=null';
+			$sqlupd .= ', googleplus=null';
+			$sqlupd .= ', youtube=null';
+			$sqlupd .= ', whatsapp=null';
+			$sqlupd .= ' WHERE rowid='.$obj->rowid;
+			//print $sqlupd."<br>";
+			$resqlupd = $db->query($sqlupd);
+			if (!$resqlupd) {
+				dol_print_error($db);
+				$error++;
+			}
+		}
+	} else {
+		$error++;
+	}
+	if (!$error) {
+		$db->commit();
+	} else {
+		dol_print_error($db);
+		$db->rollback();
+	}
+	print '<b>'.$langs->trans('MigrationFieldsSocialNetworks', 'Thirdparties')."</b><br>\n";
+	print '</td></tr>';
 }
diff --git a/htdocs/intracommreport/admin/intracommreport.php b/htdocs/intracommreport/admin/intracommreport.php
index 0560809e5a9..c9968c14215 100644
--- a/htdocs/intracommreport/admin/intracommreport.php
+++ b/htdocs/intracommreport/admin/intracommreport.php
@@ -28,70 +28,70 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/intracommreport.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array("admin","intracommreport"));
+$langs->loadLangs(array("admin", "intracommreport"));
 
-if (! $user->admin) accessforbidden();
+if (!$user->admin) accessforbidden();
 
 $action = GETPOST('action', 'aZ09');
 
 // Parameters INTRACOMMREPORT_* and others
-$list_DEB = array (
-    'INTRACOMMREPORT_NUM_AGREMENT',
+$list_DEB = array(
+	'INTRACOMMREPORT_NUM_AGREMENT',
 );
 
-$list_DES = array (
-    'INTRACOMMREPORT_NUM_DECLARATION',
+$list_DES = array(
+	'INTRACOMMREPORT_NUM_DECLARATION',
 );
 
 if ($action == 'update') {
-    $error = 0;
+	$error = 0;
 
-    if (! $error)
-    {
-        foreach ($list_DEB as $constname)
-        {
-            $constvalue = GETPOST($constname, 'alpha');
+	if (!$error)
+	{
+		foreach ($list_DEB as $constname)
+		{
+			$constvalue = GETPOST($constname, 'alpha');
 
-            if (! dolibarr_set_const($db, $constname, $constvalue, 'chaine', 0, '', $conf->entity)) {
-                $error++;
-            }
-        }
+			if (!dolibarr_set_const($db, $constname, $constvalue, 'chaine', 0, '', $conf->entity)) {
+				$error++;
+			}
+		}
 
-        foreach ($list_DES as $constname)
-        {
-            $constvalue = GETPOST($constname, 'alpha');
+		foreach ($list_DES as $constname)
+		{
+			$constvalue = GETPOST($constname, 'alpha');
 
-            if (! dolibarr_set_const($db, $constname, $constvalue, 'chaine', 0, '', $conf->entity)) {
-                $error++;
-            }
-        }
+			if (!dolibarr_set_const($db, $constname, $constvalue, 'chaine', 0, '', $conf->entity)) {
+				$error++;
+			}
+		}
 
-        dolibarr_set_const($db, "INTRACOMMREPORT_TYPE_ACTEUR", GETPOST("INTRACOMMREPORT_TYPE_ACTEUR", 'alpha'), 'chaine', 0, '', $conf->entity);
-        dolibarr_set_const($db, "INTRACOMMREPORT_ROLE_ACTEUR", GETPOST("INTRACOMMREPORT_ROLE_ACTEUR", 'alpha'), 'chaine', 0, '', $conf->entity);
-        dolibarr_set_const($db, "INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION", GETPOST("INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION", 'alpha'), 'chaine', 0, '', $conf->entity);
-        dolibarr_set_const($db, "INTRACOMMREPORT_NIV_OBLIGATION_EXPEDITION", GETPOST("INTRACOMMREPORT_NIV_OBLIGATION_EXPEDITION", 'alpha'), 'chaine', 0, '', $conf->entity);
-        dolibarr_set_const($db, "INTRACOMMREPORT_CATEG_FRAISDEPORT", GETPOST("INTRACOMMREPORT_CATEG_FRAISDEPORT", 'alpha'), 'chaine', 0, '', $conf->entity);
+		dolibarr_set_const($db, "INTRACOMMREPORT_TYPE_ACTEUR", GETPOST("INTRACOMMREPORT_TYPE_ACTEUR", 'alpha'), 'chaine', 0, '', $conf->entity);
+		dolibarr_set_const($db, "INTRACOMMREPORT_ROLE_ACTEUR", GETPOST("INTRACOMMREPORT_ROLE_ACTEUR", 'alpha'), 'chaine', 0, '', $conf->entity);
+		dolibarr_set_const($db, "INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION", GETPOST("INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION", 'alpha'), 'chaine', 0, '', $conf->entity);
+		dolibarr_set_const($db, "INTRACOMMREPORT_NIV_OBLIGATION_EXPEDITION", GETPOST("INTRACOMMREPORT_NIV_OBLIGATION_EXPEDITION", 'alpha'), 'chaine', 0, '', $conf->entity);
+		dolibarr_set_const($db, "INTRACOMMREPORT_CATEG_FRAISDEPORT", GETPOST("INTRACOMMREPORT_CATEG_FRAISDEPORT", 'alpha'), 'chaine', 0, '', $conf->entity);
 
-        if ($error) {
-            setEventMessages($langs->trans("Error"), null, 'errors');
-        }
-    }
+		if ($error) {
+			setEventMessages($langs->trans("Error"), null, 'errors');
+		}
+	}
 
-    if (! $error) {
-        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
+	if (!$error) {
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	}
 }
 
 /*
  * View
  */
 
-$form=new Form($db);
-$formother=new FormOther($db);
+$form = new Form($db);
+$formother = new FormOther($db);
 
 llxHeader('', $langs->trans("IntracommReportSetup"));
 
-$linkback = '<a href="' . DOL_URL_ROOT . '/admin/modules.php?restore_lastsearch_values=1">' . $langs->trans("BackToModuleList") . '</a>';
+$linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
 print load_fiche_titre($langs->trans("IntracommReportSetup"), $linkback, 'title_setup');
 
 $head = intracommReportAdminPrepareHead();
@@ -112,22 +112,22 @@ print '</tr>';
 
 foreach ($list_DEB as $key)
 {
-    print '<tr class="oddeven value">';
+	print '<tr class="oddeven value">';
 
-    // Param
-    $label = $langs->trans($key);
-    print '<td>'.$label.'</td>';
-    // Value
-    print '<td class="left">';
-    print '<input type="text" class="maxwidth100" id="' . $key . '" name="' . $key . '" value="' . $conf->global->$key . '">';
-    print '</td>';
+	// Param
+	$label = $langs->trans($key);
+	print '<td>'.$label.'</td>';
+	// Value
+	print '<td class="left">';
+	print '<input type="text" class="maxwidth100" id="'.$key.'" name="'.$key.'" value="'.$conf->global->$key.'">';
+	print '</td>';
 
-    print '</tr>';
+	print '</tr>';
 }
 
 print '<tr class="oddeven">';
 print '<td>'.$langs->trans("INTRACOMMREPORT_TYPE_ACTEUR").'</td>';
-$arraychoices=array(''=>$langs->trans("None"), 'PSI'=>'Déclarant pour son compte', 'TDP'=>'Tiers déclarant');
+$arraychoices = array(''=>$langs->trans("None"), 'PSI'=>'Déclarant pour son compte', 'TDP'=>'Tiers déclarant');
 print '<td>';
 print $form->selectarray('INTRACOMMREPORT_TYPE_ACTEUR', $arraychoices, $conf->global->INTRACOMMREPORT_TYPE_ACTEUR, 0);
 print '</td>';
@@ -135,7 +135,7 @@ print "</tr>\n";
 
 print '<tr class="oddeven">';
 print '<td>'.$langs->trans("INTRACOMMREPORT_ROLE_ACTEUR").'</td>';
-$arraychoices=array(''=>$langs->trans("None"), 'sender'=>'Emetteur', 'PSI'=>'Déclarant');
+$arraychoices = array(''=>$langs->trans("None"), 'sender'=>'Emetteur', 'PSI'=>'Déclarant');
 print '<td>';
 print $form->selectarray('INTRACOMMREPORT_ROLE_ACTEUR', $arraychoices, $conf->global->INTRACOMMREPORT_ROLE_ACTEUR, 0);
 print '</td>';
@@ -143,7 +143,7 @@ print "</tr>\n";
 
 print '<tr class="oddeven">';
 print '<td>'.$langs->trans("INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION").'</td>';
-$arraychoices=array(1=>'Seuil de 460 000 €', 2=>'En dessous de 460 000 €');
+$arraychoices = array(1=>'Seuil de 460 000 €', 2=>'En dessous de 460 000 €');
 print '<td>';
 print $form->selectarray('INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION', $arraychoices, $conf->global->INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION, 0);
 print '</td>';
@@ -151,7 +151,7 @@ print "</tr>\n";
 
 print '<tr class="oddeven">';
 print '<td>'.$langs->trans("INTRACOMMREPORT_NIV_OBLIGATION_EXPEDITION").'</td>';
-$arraychoices=array(3=>'Seuil de 460 000 €', 4=>'En dessous de 460 000 €');
+$arraychoices = array(3=>'Seuil de 460 000 €', 4=>'En dessous de 460 000 €');
 print '<td>';
 print $form->selectarray('INTRACOMMREPORT_NIV_OBLIGATION_EXPEDITION', $arraychoices, $conf->global->INTRACOMMREPORT_NIV_OBLIGATION_EXPEDITION, 0);
 print '</td>';
@@ -159,7 +159,7 @@ print "</tr>\n";
 
 print '<tr class="oddeven">';
 print '<td>'.$langs->trans("INTRACOMMREPORT_CATEG_FRAISDEPORT").'</td>';
-$arraychoices=array(3=>'Seuil de 460 000 €', 4=>'En dessous de 460 000 €');
+$arraychoices = array(3=>'Seuil de 460 000 €', 4=>'En dessous de 460 000 €');
 print '<td>';
 print $formother->select_categories(0, $conf->global->INTRACOMMREPORT_CATEG_FRAISDEPORT, 'INTRACOMMREPORT_CATEG_FRAISDEPORT');
 print '</td>';
@@ -178,17 +178,17 @@ print '</tr>';
 
 foreach ($list_DES as $key)
 {
-    print '<tr class="oddeven value">';
+	print '<tr class="oddeven value">';
 
-    // Param
-    $label = $langs->trans($key);
-    print '<td>'.$label.'</td>';
-    // Value
-    print '<td class="left">';
-    print '<input type="text" class="maxwidth100" id="' . $key . '" name="' . $key . '" value="' . $conf->global->$key . '">';
-    print '</td>';
+	// Param
+	$label = $langs->trans($key);
+	print '<td>'.$label.'</td>';
+	// Value
+	print '<td class="left">';
+	print '<input type="text" class="maxwidth100" id="'.$key.'" name="'.$key.'" value="'.$conf->global->$key.'">';
+	print '</td>';
 
-    print '</tr>';
+	print '</tr>';
 }
 
 print '</table>';
@@ -201,7 +201,7 @@ print '</div>';
 
 print '</form>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // End of page
 llxFooter();
diff --git a/htdocs/intracommreport/card.php b/htdocs/intracommreport/card.php
index 46fcce91caa..25099a9bd54 100644
--- a/htdocs/intracommreport/card.php
+++ b/htdocs/intracommreport/card.php
@@ -22,9 +22,9 @@
  *	\brief      Page to manage intracomm report export
  */
 require '../main.inc.php';
-require_once DOL_DOCUMENT_ROOT . '/core/class/html.formother.class.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/functions.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/intracommreport/class/intracommreport.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/intracommreport/class/intracommreport.class.php';
 
 $langs->loadLangs(array("intracommreport"));
 
@@ -37,7 +37,7 @@ $formother = new FormOther($db);
 $year = GETPOST('year');
 $month = GETPOST('month');
 $type_declaration = GETPOST('type');
-$backtopage=GETPOST('backtopage', 'alpha');
+$backtopage = GETPOST('backtopage', 'alpha');
 
 /*
  * 	Actions
@@ -45,67 +45,67 @@ $backtopage=GETPOST('backtopage', 'alpha');
 
 if ($user->rights->intracommreport->delete && $action == 'confirm_delete' && $confirm == 'yes')
 {
-    $result=$object->delete($id, $user);
-    if ($result > 0)
-    {
-        if (! empty($backtopage))
-        {
-            header("Location: ".$backtopage);
-            exit;
-        }
-        else {
-            header("Location: list.php");
-            exit;
-        }
-    }
-    else {
-        $errmesg=$object->error;
-    }
+	$result = $object->delete($id, $user);
+	if ($result > 0)
+	{
+		if (!empty($backtopage))
+		{
+			header("Location: ".$backtopage);
+			exit;
+		}
+		else {
+			header("Location: list.php");
+			exit;
+		}
+	}
+	else {
+		$errmesg = $object->error;
+	}
 }
 
 if ($action == 'add' && $user->rights->intracommreport->write) {
-    $object->label			    = trim($label);
-    $object->type               = trim($type);
-    $object->type_declaration   = (int) $statut;
-    $object->subscription       = (int) $subscription;
+	$object->label = trim($label);
+	$object->type               = trim($type);
+	$object->type_declaration   = (int) $statut;
+	$object->subscription       = (int) $subscription;
 
-    // Fill array 'array_options' with data from add form
-    $ret = $extrafields->setOptionalsFromPost($extralabels, $object);
-    if ($ret < 0) $error++;
+	// Fill array 'array_options' with data from add form
+	$ret = $extrafields->setOptionalsFromPost($extralabels, $object);
+	if ($ret < 0) $error++;
 
-    if (empty($object->label)) {
-        $error++;
-        setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Label")), null, 'errors');
-    }
-    else {
-        $sql = "SELECT libelle FROM ".MAIN_DB_PREFIX."adherent_type WHERE libelle='".$db->escape($object->label)."'";
-        $result = $db->query($sql);
-        if ($result) {
-            $num = $db->num_rows($result);
-        }
-        if ($num) {
-            $error++;
-            $langs->load("errors");
-            setEventMessages($langs->trans("ErrorLabelAlreadyExists", $login), null, 'errors');
-        }
-    }
+	if (empty($object->label)) {
+		$error++;
+		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Label")), null, 'errors');
+	}
+	else {
+		$sql = "SELECT libelle FROM ".MAIN_DB_PREFIX."adherent_type WHERE libelle='".$db->escape($object->label)."'";
+		$result = $db->query($sql);
+		if ($result) {
+			$num = $db->num_rows($result);
+		}
+		if ($num) {
+			$error++;
+			$langs->load("errors");
+			setEventMessages($langs->trans("ErrorLabelAlreadyExists", $login), null, 'errors');
+		}
+	}
 
-    if (! $error)
-    {
-        $id=$object->create($user);
-        if ($id > 0)
-        {
-            header("Location: ".$_SERVER["PHP_SELF"]);
-            exit;
-        }
-        else {
-            setEventMessages($object->error, $object->errors, 'errors');
-            $action = 'create';
-        }
-    }
-    else {
-        $action = 'create';
-    }
+	if (!$error)
+	{
+		$id = $object->create($user);
+		if ($id > 0)
+		{
+			header("Location: ".$_SERVER["PHP_SELF"]);
+			exit;
+		}
+		else {
+			setEventMessages($object->error, $object->errors, 'errors');
+			$action = 'create';
+		}
+	}
+	else {
+		$action = 'create';
+	}
 }
 
 /*
@@ -115,120 +115,120 @@ if ($action == 'add' && $user->rights->intracommreport->write) {
 // Creation mode
 if ($action == 'create')
 {
-    $title = $langs->trans("IntracommReportTitle");
-    llxHeader("", $title);
-    print load_fiche_titre($langs->trans("IntracommReportTitle"));
+	$title = $langs->trans("IntracommReportTitle");
+	llxHeader("", $title);
+	print load_fiche_titre($langs->trans("IntracommReportTitle"));
 
-    print '<form name="charge" method="post" action="'.$_SERVER["PHP_SELF"].'">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    print '<input type="hidden" name="action" value="export" />';
+	print '<form name="charge" method="post" action="'.$_SERVER["PHP_SELF"].'">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="action" value="export" />';
 
-    print dol_get_fiche_head();
+	print dol_get_fiche_head();
 
-    print '<table class="border" width="100%">';
+	print '<table class="border" width="100%">';
 
-    // Label
-    print '<tr><td class="titlefieldcreate">'.$langs->trans("Label").'</td><td><input type="text" class="minwidth200" name="label" autofocus="autofocus"></td></tr>';
+	// Label
+	print '<tr><td class="titlefieldcreate">'.$langs->trans("Label").'</td><td><input type="text" class="minwidth200" name="label" autofocus="autofocus"></td></tr>';
 
-    // Declaration
-    $declaration["deb"] = $langs->trans("DEB");
-    $declaration["des"] = $langs->trans("DES");
-    print '<tr><td class="fieldrequired">'.$langs->trans("Declaration")."</td><td>\n";
-    print $form->selectarray("declaration", $declaration, GETPOST('declaration', 'alpha')?GETPOST('declaration', 'alpha'):$object->declaration, 0);
-    print "</td>\n";
+	// Declaration
+	$declaration["deb"] = $langs->trans("DEB");
+	$declaration["des"] = $langs->trans("DES");
+	print '<tr><td class="fieldrequired">'.$langs->trans("Declaration")."</td><td>\n";
+	print $form->selectarray("declaration", $declaration, GETPOST('declaration', 'alpha') ?GETPOST('declaration', 'alpha') : $object->declaration, 0);
+	print "</td>\n";
 
-    // Analysis period
-    print '<tr>';
-    print '<td class="titlefieldcreate fieldrequired">';
-    print $langs->trans("AnalysisPeriod");
-    print '</td>';
-    print '<td>';
-    print $formother->select_month($month ? date('M') : $month, 'month', 0, 1, 'widthauto valignmiddle ');
-    print $formother->select_year($year ? date('Y') : $year, 'year', 0, 3, 3);
-    print '</td>';
-    print '</tr>';
+	// Analysis period
+	print '<tr>';
+	print '<td class="titlefieldcreate fieldrequired">';
+	print $langs->trans("AnalysisPeriod");
+	print '</td>';
+	print '<td>';
+	print $formother->select_month($month ? date('M') : $month, 'month', 0, 1, 'widthauto valignmiddle ');
+	print $formother->select_year($year ? date('Y') : $year, 'year', 0, 3, 3);
+	print '</td>';
+	print '</tr>';
 
-    // Type of declaration
-    $typeOfDeclaration["introduction"] = $langs->trans("Introduction");
-    $typeOfDeclaration["expedition"] = $langs->trans("Expedition");
-    print '<tr><td class="fieldrequired">'.$langs->trans("TypeOfDeclaration")."</td><td>\n";
-    print $form->selectarray("type_declaration", $typeOfDeclaration, GETPOST('type_declaration', 'alpha')?GETPOST('type_declaration', 'alpha'):$object->type_declaration, 0);
-    print "</td>\n";
+	// Type of declaration
+	$typeOfDeclaration["introduction"] = $langs->trans("Introduction");
+	$typeOfDeclaration["expedition"] = $langs->trans("Expedition");
+	print '<tr><td class="fieldrequired">'.$langs->trans("TypeOfDeclaration")."</td><td>\n";
+	print $form->selectarray("type_declaration", $typeOfDeclaration, GETPOST('type_declaration', 'alpha') ?GETPOST('type_declaration', 'alpha') : $object->type_declaration, 0);
+	print "</td>\n";
 
-    print '</table>';
+	print '</table>';
 
-    dol_fiche_end();
+	print dol_get_fiche_end();
 
-    print '<div class="center"><input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
-    print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type="button" class="button" value="' . $langs->trans("Cancel") . '" onClick="javascript:history.go(-1)">';
-    print '</div>';
+	print '<div class="center"><input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
+	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type="button" class="button" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)">';
+	print '</div>';
 
-    print '</form>';
+	print '</form>';
 }
 
 if ($id > 0 && $action != 'edit') {
-    /* ************************************************************************** */
-    /*                                                                            */
-    /* View mode                                                                  */
-    /*                                                                            */
-    /* ************************************************************************** */
-    $res = $object->fetch($id);
-    if ($res < 0) {
-        dol_print_error($db, $object->error);
-        exit;
-    }
+	/* ************************************************************************** */
+	/*                                                                            */
+	/* View mode                                                                  */
+	/*                                                                            */
+	/* ************************************************************************** */
+	$res = $object->fetch($id);
+	if ($res < 0) {
+		dol_print_error($db, $object->error);
+		exit;
+	}
 
-    /*
+	/*
      * Show tabs
      */
-    $head = intracommreport_prepare_head($object);
+	$head = intracommreport_prepare_head($object);
 
-    print dol_get_fiche_head($head, 'general', $langs->trans("IntracommReport"), -1, 'user');
+	print dol_get_fiche_head($head, 'general', $langs->trans("IntracommReport"), -1, 'user');
 
-    // Confirm remove report
-    if ($action == 'delete') {
-        $formquestion = array();
-        if ($backtopage) {
-            $formquestion[] = array(
-                'type' => 'hidden',
-                'name' => 'backtopage',
-                'value' => ($backtopage != '1' ? $backtopage : $_SERVER["HTTP_REFERER"])
-            );
-        }
-        print $form->formconfirm("card.php?rowid=" . $id, $langs->trans("DeleteReport"),
-            $langs->trans("ConfirmDeleteReport"), "confirm_delete", $formquestion, 'no', 1);
-    }
+	// Confirm remove report
+	if ($action == 'delete') {
+		$formquestion = array();
+		if ($backtopage) {
+			$formquestion[] = array(
+				'type' => 'hidden',
+				'name' => 'backtopage',
+				'value' => ($backtopage != '1' ? $backtopage : $_SERVER["HTTP_REFERER"])
+			);
+		}
+		print $form->formconfirm("card.php?rowid=".$id, $langs->trans("DeleteReport"),
+			$langs->trans("ConfirmDeleteReport"), "confirm_delete", $formquestion, 'no', 1);
+	}
 
-    $linkback = '<a href="' . DOL_URL_ROOT . '/intracommreport/list.php?restore_lastsearch_values=1">' . $langs->trans("BackToList") . '</a>';
+	$linkback = '<a href="'.DOL_URL_ROOT.'/intracommreport/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-    dol_banner_tab($object, 'rowid', $linkback);
+	dol_banner_tab($object, 'rowid', $linkback);
 
-    print '<div class="fichecenter">';
-    print '<div class="fichehalfleft">';
+	print '<div class="fichecenter">';
+	print '<div class="fichehalfleft">';
 
-    print '<div class="underbanner clearboth"></div>';
-    print '<table class="border tableforfield centpercent">';
+	print '<div class="underbanner clearboth"></div>';
+	print '<table class="border tableforfield centpercent">';
 
-    // Type
-    print '<tr><td class="titlefield">' . $langs->trans("Type") . '</td><td class="valeur">' . $object->declaration . "</td></tr>\n";
+	// Type
+	print '<tr><td class="titlefield">'.$langs->trans("Type").'</td><td class="valeur">'.$object->declaration."</td></tr>\n";
 
-    // Analysis Period
-    print '<tr><td>' . $langs->trans("AnalysisPeriod") . '</td><td class="valeur">' . $object->period . '</td>';
-    print '</tr>';
+	// Analysis Period
+	print '<tr><td>'.$langs->trans("AnalysisPeriod").'</td><td class="valeur">'.$object->period.'</td>';
+	print '</tr>';
 
-    // Type of Declaration
-    print '<tr><td>' . $langs->trans("TypeOfDeclaration") . '</td><td class="valeur">' . $object->type_declaration . '</td>';
-    print '</tr>';
+	// Type of Declaration
+	print '<tr><td>'.$langs->trans("TypeOfDeclaration").'</td><td class="valeur">'.$object->type_declaration.'</td>';
+	print '</tr>';
 
-    print "</table>\n";
+	print "</table>\n";
 
-    print "</div></div></div>\n";
-    print '<div style="clear:both"></div>';
+	print "</div></div></div>\n";
+	print '<div style="clear:both"></div>';
 
-    dol_fiche_end();
+	print dol_get_fiche_end();
 }
 
-    /*
+	/*
     switch($action) {
         case 'generateXML':
             $obj = new TDebProdouane($PDOdb);
diff --git a/htdocs/intracommreport/class/intracommreport.class.php b/htdocs/intracommreport/class/intracommreport.class.php
index 4ed78234fbc..dc12427ec33 100644
--- a/htdocs/intracommreport/class/intracommreport.class.php
+++ b/htdocs/intracommreport/class/intracommreport.class.php
@@ -29,55 +29,55 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
  */
 class IntracommReport extends CommonObject
 {
-    /**
-     * @var string ID to identify managed object
-     */
-    public $element='intracommreport';
+	/**
+	 * @var string ID to identify managed object
+	 */
+	public $element = 'intracommreport';
 
-    /**
-     * @var string Name of table without prefix where object is stored
-     */
-    public $table_element='intracommreport';
+	/**
+	 * @var string Name of table without prefix where object is stored
+	 */
+	public $table_element = 'intracommreport';
 
-    /**
-     * @var int Field with ID of parent key if this field has a parent
-     */
-    public $fk_element='fk_intracommreport';
+	/**
+	 * @var int Field with ID of parent key if this field has a parent
+	 */
+	public $fk_element = 'fk_intracommreport';
 
 	/**
 	 * @var string declaration number
 	 */
 	public $declaration_number;
 
-    /**
-     * 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
-     * @var int
-     */
-    public $ismultientitymanaged = 1;
+	/**
+	 * 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
+	 * @var int
+	 */
+	public $ismultientitymanaged = 1;
 
-    /**
-     * DEB - Product
-     */
-    const TYPE_DEB = 0;
+	/**
+	 * DEB - Product
+	 */
+	const TYPE_DEB = 0;
 
-    /**
-     * DES - Service
-     */
-    const TYPE_DES = 1;
+	/**
+	 * DES - Service
+	 */
+	const TYPE_DES = 1;
 
 	static $type = array(
-	    'introduction'=>'Introduction'
+		'introduction'=>'Introduction'
 		,'expedition'=>'Expédition'
-    );
+	);
 
-    /**
-     * Constructor
-     *
-     * @param DoliDB $db Database handle
-     */
-    public function __construct(DoliDB $db)
-    {
-        $this->db = $db;
+	/**
+	 * Constructor
+	 *
+	 * @param DoliDB $db Database handle
+	 */
+	public function __construct(DoliDB $db)
+	{
+		$this->db = $db;
 		$this->exporttype = 'deb';
 	}
 
@@ -180,14 +180,14 @@ class IntracommReport extends CommonObject
 	{
 		global $conf;
 
-		require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 
 		$sql = $this->getSQLFactLines($type, $period_reference, $exporttype);
 
 		$resql = $this->db->query($sql);
 
 		if ($resql) {
-			$i=1;
+			$i = 1;
 
 			if (empty($resql->num_rows)) {
 				$this->errors[] = 'No data for this period';
@@ -238,7 +238,7 @@ class IntracommReport extends CommonObject
 	{
 		global $mysoc, $conf;
 
-		if ($type=='expedition' || $exporttype=='des') {
+		if ($type == 'expedition' || $exporttype == 'des') {
 			$sql = 'SELECT f.facnumber, f.total as total_ht';
 			$table = 'facture';
 			$table_extraf = 'facture_extrafields';
@@ -252,7 +252,7 @@ class IntracommReport extends CommonObject
 			$tabledet = 'facture_fourn_det';
 			$field_link = 'fk_facture_fourn';
 		}
-		$sql.= ', l.fk_product, l.qty
+		$sql .= ', l.fk_product, l.qty
 				, p.weight, p.rowid as id_prod, p.customcode
 				, s.rowid as id_client, s.nom, s.zip, s.fk_pays, s.tva_intra
 				, c.code
@@ -334,7 +334,7 @@ class IntracommReport extends CommonObject
 
 		global $conf;
 
-		if ($type=='expedition') {
+		if ($type == 'expedition') {
 			$table = 'facture';
 			$tabledet = 'facturedet';
 			$field_link = 'fk_facture';
@@ -417,13 +417,13 @@ class IntracommReport extends CommonObject
 		fclose($f);
 
 		header('Content-Description: File Transfer');
-	    header('Content-Type: application/xml');
-	    header('Content-Disposition: attachment; filename="'.$name.'"');
-	    header('Expires: 0');
-	    header('Cache-Control: must-revalidate');
-	    header('Pragma: public');
-	    header('Content-Length: ' . filesize($fname));
-	    readfile($fname);
+		header('Content-Type: application/xml');
+		header('Content-Disposition: attachment; filename="'.$name.'"');
+		header('Expires: 0');
+		header('Cache-Control: must-revalidate');
+		header('Pragma: public');
+		header('Content-Length: '.filesize($fname));
+		readfile($fname);
 		exit;
 	}
 }
diff --git a/htdocs/intracommreport/list.php b/htdocs/intracommreport/list.php
index 6f7ecbc2580..a8703b7407d 100644
--- a/htdocs/intracommreport/list.php
+++ b/htdocs/intracommreport/list.php
@@ -30,43 +30,43 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array('intracommreport'));
 
-$action=GETPOST('action', 'alpha');
-$massaction=GETPOST('massaction', 'alpha');
-$show_files=GETPOST('show_files', 'int');
-$confirm=GETPOST('confirm', 'alpha');
+$action = GETPOST('action', 'alpha');
+$massaction = GETPOST('massaction', 'alpha');
+$show_files = GETPOST('show_files', 'int');
+$confirm = GETPOST('confirm', 'alpha');
 $toselect = GETPOST('toselect', 'array');
 
-$sall=trim((GETPOST('search_all', 'alphanohtml')!='')?GETPOST('search_all', 'alphanohtml'):GETPOST('sall', 'alphanohtml'));
-$search_ref=GETPOST("search_ref", 'alpha');
+$sall = trim((GETPOST('search_all', 'alphanohtml') != '') ?GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
+$search_ref = GETPOST("search_ref", 'alpha');
 $search_type = GETPOST("search_type", 'int');
 $fourn_id = GETPOST("fourn_id", 'int');
 $catid = GETPOST('catid', 'int');
 $optioncss = GETPOST('optioncss', 'alpha');
-$type=GETPOST("type", "int");
+$type = GETPOST("type", "int");
 
-$diroutputmassaction=$conf->product->dir_output . '/temp/massgeneration/'.$user->id;
+$diroutputmassaction = $conf->product->dir_output.'/temp/massgeneration/'.$user->id;
 
-$limit = GETPOST('limit', 'int')?GETPOST('limit', 'int'):$conf->liste_limit;
+$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
-$page = (GETPOST("page", 'int')?GETPOST("page", 'int'):0);
+$page = (GETPOST("page", 'int') ?GETPOST("page", 'int') : 0);
 if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (! $sortfield) $sortfield="i.ref";
-if (! $sortorder) $sortorder="ASC";
+if (!$sortfield) $sortfield = "i.ref";
+if (!$sortorder) $sortorder = "ASC";
 
 // Initialize context for list
-$contextpage=GETPOST('contextpage', 'aZ')?GETPOST('contextpage', 'aZ'):'intracommreportlist';
-if ((string) $type == '1') { $contextpage='DESlist'; if ($search_type=='') $search_type='1'; }
-if ((string) $type == '0') { $contextpage='DEBlist'; if ($search_type=='') $search_type='0'; }
+$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'intracommreportlist';
+if ((string) $type == '1') { $contextpage = 'DESlist'; if ($search_type == '') $search_type = '1'; }
+if ((string) $type == '0') { $contextpage = 'DEBlist'; if ($search_type == '') $search_type = '0'; }
 
 // Initialize technical object to manage hooks. Note that conf->hooks_modules contains array of hooks
-$object=new IntracommReport($db);
+$object = new IntracommReport($db);
 $hookmanager->initHooks(array('intracommreportlist'));
 $extrafields = new ExtraFields($db);
-$form=new Form($db);
+$form = new Form($db);
 
 /*
 // fetch optionals attributes and labels
@@ -74,16 +74,16 @@ $extralabels = $extrafields->fetch_name_optionals_label('intracommreport');
 $search_array_options=$extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
 */
 
-if (empty($action)) $action='list';
+if (empty($action)) $action = 'list';
 
 // Get object canvas (By default, this is not defined, so standard usage of dolibarr)
-$canvas=GETPOST("canvas");
-$objcanvas=null;
-if (! empty($canvas))
+$canvas = GETPOST("canvas");
+$objcanvas = null;
+if (!empty($canvas))
 {
-    require_once DOL_DOCUMENT_ROOT.'/core/class/canvas.class.php';
-    $objcanvas = new Canvas($db, $action);
-    $objcanvas->getCanvas('product', 'list', $canvas);
+	require_once DOL_DOCUMENT_ROOT.'/core/class/canvas.class.php';
+	$objcanvas = new Canvas($db, $action);
+	$objcanvas->getCanvas('product', 'list', $canvas);
 }
 
 // Security check
@@ -95,20 +95,20 @@ else $result=restrictedArea($user, 'produit|service', '', '', '', '', '', $objca
 
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array(
-    'i.ref'=>"Ref",
-    'pfi.ref_fourn'=>"RefSupplier",
-    'i.label'=>"ProductLabel",
-    'i.description'=>"Description",
-    "i.note"=>"Note",
+	'i.ref'=>"Ref",
+	'pfi.ref_fourn'=>"RefSupplier",
+	'i.label'=>"ProductLabel",
+	'i.description'=>"Description",
+	"i.note"=>"Note",
 );
 
-$isInEEC=isInEEC($mysoc);
+$isInEEC = isInEEC($mysoc);
 
 // Definition of fields for lists
-$arrayfields=array(
-    'i.ref'=>array('label'=>$langs->trans("Ref"), 'checked'=>1),
-    'i.label'=>array('label'=>$langs->trans("Label"), 'checked'=>1),
-    'i.fk_product_type'=>array('label'=>$langs->trans("Type"), 'checked'=>0, 'enabled'=>(! empty($conf->produit->enabled) && ! empty($conf->service->enabled))),
+$arrayfields = array(
+	'i.ref'=>array('label'=>$langs->trans("Ref"), 'checked'=>1),
+	'i.label'=>array('label'=>$langs->trans("Label"), 'checked'=>1),
+	'i.fk_product_type'=>array('label'=>$langs->trans("Type"), 'checked'=>0, 'enabled'=>(!empty($conf->produit->enabled) && !empty($conf->service->enabled))),
 );
 /*
 // Extra fields
@@ -130,48 +130,48 @@ $arrayfields = dol_sort_array($arrayfields, 'position');
  * Actions
  */
 
-if (GETPOST('cancel', 'alpha')) { $action='list'; $massaction=''; }
-if (! GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction=''; }
+if (GETPOST('cancel', 'alpha')) { $action = 'list'; $massaction = ''; }
+if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction = ''; }
 
-$parameters=array();
-$reshook=$hookmanager->executeHooks('doActions', $parameters, $object, $action);    // Note that $action and $object may have been modified by some hooks
+$parameters = array();
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
 if (empty($reshook))
 {
-    // Selection of new fields
-    include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
+	// Selection of new fields
+	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
-    // Purge search criteria
-    if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
-    {
-        $sall="";
-        $search_ref="";
-        $search_label="";
-        //$search_type='';						// There is 2 types of list: a list of product and a list of services. No list with both. So when we clear search criteria, we must keep the filter on type.
+	// Purge search criteria
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
+	{
+		$sall = "";
+		$search_ref = "";
+		$search_label = "";
+		//$search_type='';						// There is 2 types of list: a list of product and a list of services. No list with both. So when we clear search criteria, we must keep the filter on type.
 
-        $show_childproducts = '';
-        $search_array_options=array();
-    }
+		$show_childproducts = '';
+		$search_array_options = array();
+	}
 
-    // Mass actions
-    $objectclass='Product';
-    if ((string) $search_type == '1') { $objectlabel='Services'; }
-    if ((string) $search_type == '0') { $objectlabel='Products'; }
+	// Mass actions
+	$objectclass = 'Product';
+	if ((string) $search_type == '1') { $objectlabel = 'Services'; }
+	if ((string) $search_type == '0') { $objectlabel = 'Products'; }
 
-    $permtoread = $user->rights->produit->lire;
-    $permtodelete = $user->rights->produit->supprimer;
-    $uploaddir = $conf->product->dir_output;
-    include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
+	$permtoread = $user->rights->produit->lire;
+	$permtodelete = $user->rights->produit->supprimer;
+	$uploaddir = $conf->product->dir_output;
+	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }
 
 
 /*
  * View
  */
-$formother=new FormOther($db);
+$formother = new FormOther($db);
 
-$title=$langs->trans('IntracommReportList'.$type);
+$title = $langs->trans('IntracommReportList'.$type);
 
 $sql = 'SELECT DISTINCT i.rowid, i.type_declaration, i.type_export, i.period, i.mode, i.entity';
 /*
@@ -181,22 +181,22 @@ if (! empty($extrafields->attributes[$object->table_element]['label'])) {
 }
 */
 // Add fields from hooks
-$parameters=array();
-$reshook=$hookmanager->executeHooks('printFieldListSelect', $parameters);    // Note that $action and $object may have been modified by hook
-$sql.=$hookmanager->resPrint;
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters); // Note that $action and $object may have been modified by hook
+$sql .= $hookmanager->resPrint;
 
-$sql.= ' FROM '.MAIN_DB_PREFIX.'intracommreport as i';
+$sql .= ' FROM '.MAIN_DB_PREFIX.'intracommreport as i';
 
 // if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."intracommreport_extrafields as ef on (i.rowid = ef.fk_object)";
 
-$sql.= ' WHERE i.entity IN ('.getEntity('intracommreport').')';
+$sql .= ' WHERE i.entity IN ('.getEntity('intracommreport').')';
 
 if ($sall) $sql .= natural_search(array_keys($fieldstosearchall), $sall);
 // if the type is not 1, we show all products (type = 0,2,3)
 if (dol_strlen($search_type) && $search_type != '-1')
 {
-    if ($search_type == 1) $sql.= " AND i.type = 1";
-    else $sql.= " AND i.type = 0";
+	if ($search_type == 1) $sql .= " AND i.type = 1";
+	else $sql .= " AND i.type = 0";
 }
 
 /*
@@ -213,11 +213,11 @@ if (dol_strlen($canvas) > 0)                    $sql.= " AND i.canvas = '".$db->
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
 */
 // Add where from hooks
-$parameters=array();
-$reshook=$hookmanager->executeHooks('printFieldListWhere', $parameters);    // Note that $action and $object may have been modified by hook
-$sql.=$hookmanager->resPrint;
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook
+$sql .= $hookmanager->resPrint;
 
-$sql.= " GROUP BY i.rowid";
+$sql .= " GROUP BY i.rowid";
 
 /*
 // Add fields from extrafields
@@ -227,127 +227,127 @@ if (! empty($extrafields->attributes[$object->table_element]['label'])) {
 */
 
 // Add fields from hooks
-$parameters=array();
-$reshook=$hookmanager->executeHooks('printFieldSelect', $parameters);    // Note that $action and $object may have been modified by hook
-$sql.=$hookmanager->resPrint;
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldSelect', $parameters); // Note that $action and $object may have been modified by hook
+$sql .= $hookmanager->resPrint;
 
-$sql.= $db->order($sortfield, $sortorder);
+$sql .= $db->order($sortfield, $sortorder);
 
 $nbtotalofrecords = '';
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
-    $result = $db->query($sql);
-    $nbtotalofrecords = $db->num_rows($result);
-    if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
-    {
-        $page = 0;
-        $offset = 0;
-    }
+	$result = $db->query($sql);
+	$nbtotalofrecords = $db->num_rows($result);
+	if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+	{
+		$page = 0;
+		$offset = 0;
+	}
 }
 
-$sql.= $db->plimit($limit + 1, $offset);
+$sql .= $db->plimit($limit + 1, $offset);
 
 $resql = $db->query($sql);
 
 if ($resql)
 {
-    $num = $db->num_rows($resql);
+	$num = $db->num_rows($resql);
 
-    $arrayofselected=is_array($toselect)?$toselect:array();
+	$arrayofselected = is_array($toselect) ? $toselect : array();
 
-    $helpurl='EN:Module_IntracommReport|FR:Module_ProDouane';
-    llxHeader('', $title, $helpurl, '');
+	$helpurl = 'EN:Module_IntracommReport|FR:Module_ProDouane';
+	llxHeader('', $title, $helpurl, '');
 
-    // Displays product removal confirmation
-    if (GETPOST('delreport'))	{
-        setEventMessages($langs->trans("IntracommReportDeleted", GETPOST('delreport')), null, 'mesgs');
-    }
+	// Displays product removal confirmation
+	if (GETPOST('delreport')) {
+		setEventMessages($langs->trans("IntracommReportDeleted", GETPOST('delreport')), null, 'mesgs');
+	}
 
-    $param='';
-    if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.urlencode($contextpage);
-    if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.urlencode($limit);
-    if ($sall) $param.="&sall=".urlencode($sall);
-    if ($search_ref) $param="&search_ref=".urlencode($search_ref);
-    if ($search_label) $param.="&search_label=".urlencode($search_label);
+	$param = '';
+	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
+	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
+	if ($sall) $param .= "&sall=".urlencode($sall);
+	if ($search_ref) $param = "&search_ref=".urlencode($search_ref);
+	if ($search_label) $param .= "&search_label=".urlencode($search_label);
 
-    // Add $param from extra fields
-    include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
+	// Add $param from extra fields
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 
-    // List of mass actions available
-    $arrayofmassactions =  array(
-        'generate_doc'=>$langs->trans("ReGeneratePDF"),
-        //'builddoc'=>$langs->trans("PDFMerge"),
-        //'presend'=>$langs->trans("SendByMail"),
-    );
-    if ($user->rights->intracommreport->delete) $arrayofmassactions['predelete']="<span class='fa fa-trash paddingrightonly'></span>".$langs->trans("Delete");
-    if (in_array($massaction, array('presend','predelete'))) $arrayofmassactions=array();
-    $massactionbutton=$form->selectMassAction('', $arrayofmassactions);
+	// List of mass actions available
+	$arrayofmassactions = array(
+		'generate_doc'=>$langs->trans("ReGeneratePDF"),
+		//'builddoc'=>$langs->trans("PDFMerge"),
+		//'presend'=>$langs->trans("SendByMail"),
+	);
+	if ($user->rights->intracommreport->delete) $arrayofmassactions['predelete'] = "<span class='fa fa-trash paddingrightonly'></span>".$langs->trans("Delete");
+	if (in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
+	$massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
-    $newcardbutton='';
-    if ($user->rights->intracommreport->write)
-    {
-        $newcardbutton.= dolGetButtonTitle($langs->trans("NewDeclaration"), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/intracommreport/card.php?action=create&amp;type='.$type);
-    }
+	$newcardbutton = '';
+	if ($user->rights->intracommreport->write)
+	{
+		$newcardbutton .= dolGetButtonTitle($langs->trans("NewDeclaration"), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/intracommreport/card.php?action=create&amp;type='.$type);
+	}
 
-    print '<form action="'.$_SERVER["PHP_SELF"].'" method="post" name="formulaire">';
-    if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
-    print '<input type="hidden" name="action" value="list">';
-    print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
-    print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-    print '<input type="hidden" name="page" value="'.$page.'">';
-    print '<input type="hidden" name="type" value="'.$type.'">';
-    if (empty($arrayfields['i.fk_product_type']['checked'])) print '<input type="hidden" name="search_type" value="'.dol_escape_htmltag($search_type).'">';
+	print '<form action="'.$_SERVER["PHP_SELF"].'" method="post" name="formulaire">';
+	if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
+	print '<input type="hidden" name="action" value="list">';
+	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+	print '<input type="hidden" name="page" value="'.$page.'">';
+	print '<input type="hidden" name="type" value="'.$type.'">';
+	if (empty($arrayfields['i.fk_product_type']['checked'])) print '<input type="hidden" name="search_type" value="'.dol_escape_htmltag($search_type).'">';
 
-    print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_products.png', 0, $newcardbutton, '', $limit);
+	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_products.png', 0, $newcardbutton, '', $limit);
 
-    $topicmail="Information";
-    $modelmail="product";
-    $objecttmp=new IntracommReport($db);
-    $trackid='prod'.$object->id;
-    include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
+	$topicmail = "Information";
+	$modelmail = "product";
+	$objecttmp = new IntracommReport($db);
+	$trackid = 'prod'.$object->id;
+	include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
-    if ($sall)
-    {
-        foreach ($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
-        print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall) . join(', ', $fieldstosearchall).'</div>';
-    }
+	if ($sall)
+	{
+		foreach ($fieldstosearchall as $key => $val) $fieldstosearchall[$key] = $langs->trans($val);
+		print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall).join(', ', $fieldstosearchall).'</div>';
+	}
 
-    $parameters=array();
-    $reshook=$hookmanager->executeHooks('printFieldPreListTitle', $parameters);    // Note that $action and $object may have been modified by hook
-    if (empty($reshook)) $moreforfilter.=$hookmanager->resPrint;
-    else $moreforfilter=$hookmanager->resPrint;
+	$parameters = array();
+	$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters); // Note that $action and $object may have been modified by hook
+	if (empty($reshook)) $moreforfilter .= $hookmanager->resPrint;
+	else $moreforfilter = $hookmanager->resPrint;
 
-    if ($moreforfilter)
-    {
-        print '<div class="liste_titre liste_titre_bydiv centpercent">';
-        print $moreforfilter;
-        print '</div>';
-    }
+	if ($moreforfilter)
+	{
+		print '<div class="liste_titre liste_titre_bydiv centpercent">';
+		print $moreforfilter;
+		print '</div>';
+	}
 
-    $varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
-    $selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);	// This also change content of $arrayfields
-    if ($massactionbutton) $selectedfields.=$form->showCheckAddButtons('checkforselect', 1);
+	$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
+	$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
+	if ($massactionbutton) $selectedfields .= $form->showCheckAddButtons('checkforselect', 1);
 
-    print '<div class="div-table-responsive">';
-    print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
+	print '<div class="div-table-responsive">';
+	print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
-    // Lines with input filters
-    print '<tr class="liste_titre_filter">';
-    if (! empty($arrayfields['i.ref']['checked']))
-    {
-        print '<td class="liste_titre left">';
-        print '<input class="flat" type="text" name="search_ref" size="8" value="'.dol_escape_htmltag($search_ref).'">';
-        print '</td>';
-    }
-    if (! empty($arrayfields['i.label']['checked']))
-    {
-        print '<td class="liste_titre left">';
-        print '<input class="flat" type="text" name="search_label" size="12" value="'.dol_escape_htmltag($search_label).'">';
-        print '</td>';
-    }
-    // Type
+	// Lines with input filters
+	print '<tr class="liste_titre_filter">';
+	if (!empty($arrayfields['i.ref']['checked']))
+	{
+		print '<td class="liste_titre left">';
+		print '<input class="flat" type="text" name="search_ref" size="8" value="'.dol_escape_htmltag($search_ref).'">';
+		print '</td>';
+	}
+	if (!empty($arrayfields['i.label']['checked']))
+	{
+		print '<td class="liste_titre left">';
+		print '<input class="flat" type="text" name="search_label" size="12" value="'.dol_escape_htmltag($search_label).'">';
+		print '</td>';
+	}
+	// Type
 	// Type (customer/prospect/supplier)
 	if (!empty($arrayfields['customerorsupplier']['checked']))
 	{
@@ -357,134 +357,134 @@ if ($resql)
 		print '</select></td>';
 	}
 
-	if (! empty($arrayfields['i.fk_product_type']['checked']))
-    {
-        print '<td class="liste_titre left">';
-        $array=array('-1'=>'&nbsp;', '0'=>$langs->trans('Product'), '1'=>$langs->trans('Service'));
-        print $form->selectarray('search_type', $array, $search_type);
-        print '</td>';
-    }
+	if (!empty($arrayfields['i.fk_product_type']['checked']))
+	{
+		print '<td class="liste_titre left">';
+		$array = array('-1'=>'&nbsp;', '0'=>$langs->trans('Product'), '1'=>$langs->trans('Service'));
+		print $form->selectarray('search_type', $array, $search_type);
+		print '</td>';
+	}
 
-    /*
+	/*
     // Extra fields
     include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
     */
-    // Fields from hook
-    $parameters=array('arrayfields'=>$arrayfields);
-    $reshook=$hookmanager->executeHooks('printFieldListOption', $parameters);    // Note that $action and $object may have been modified by hook
-    print $hookmanager->resPrint;
-    // Date creation
-    if (! empty($arrayfields['i.datec']['checked']))
-    {
-        print '<td class="liste_titre">';
-        print '</td>';
-    }
-    // Date modification
-    if (! empty($arrayfields['i.tms']['checked']))
-    {
-        print '<td class="liste_titre">';
-        print '</td>';
-    }
-    print '<td class="liste_titre center maxwidthsearch">';
-    $searchpicto=$form->showFilterButtons();
-    print $searchpicto;
-    print '</td>';
+	// Fields from hook
+	$parameters = array('arrayfields'=>$arrayfields);
+	$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook
+	print $hookmanager->resPrint;
+	// Date creation
+	if (!empty($arrayfields['i.datec']['checked']))
+	{
+		print '<td class="liste_titre">';
+		print '</td>';
+	}
+	// Date modification
+	if (!empty($arrayfields['i.tms']['checked']))
+	{
+		print '<td class="liste_titre">';
+		print '</td>';
+	}
+	print '<td class="liste_titre center maxwidthsearch">';
+	$searchpicto = $form->showFilterButtons();
+	print $searchpicto;
+	print '</td>';
 
-    print '</tr>';
+	print '</tr>';
 
-    print '<tr class="liste_titre">';
-    if (! empty($arrayfields['i.ref']['checked'])) {
-        print_liste_field_titre($arrayfields['i.ref']['label'], $_SERVER["PHP_SELF"], "i.ref", "", $param, "", $sortfield, $sortorder);
-    }
-    if (! empty($arrayfields['i.label']['checked'])) {
-        print_liste_field_titre($arrayfields['i.label']['label'], $_SERVER["PHP_SELF"], "i.label", "", $param, "", $sortfield, $sortorder);
-    }
-    if (! empty($arrayfields['i.fk_product_type']['checked'])) {
-        print_liste_field_titre($arrayfields['i.fk_product_type']['label'], $_SERVER["PHP_SELF"], "i.fk_product_type", "", $param, "", $sortfield, $sortorder);
-    }
+	print '<tr class="liste_titre">';
+	if (!empty($arrayfields['i.ref']['checked'])) {
+		print_liste_field_titre($arrayfields['i.ref']['label'], $_SERVER["PHP_SELF"], "i.ref", "", $param, "", $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['i.label']['checked'])) {
+		print_liste_field_titre($arrayfields['i.label']['label'], $_SERVER["PHP_SELF"], "i.label", "", $param, "", $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['i.fk_product_type']['checked'])) {
+		print_liste_field_titre($arrayfields['i.fk_product_type']['label'], $_SERVER["PHP_SELF"], "i.fk_product_type", "", $param, "", $sortfield, $sortorder);
+	}
 
 	/*
     // Extra fields
     include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
     */
-    // Hook fields
-    $parameters=array('arrayfields'=>$arrayfields,'param'=>$param,'sortfield'=>$sortfield,'sortorder'=>$sortorder);
-    $reshook=$hookmanager->executeHooks('printFieldListTitle', $parameters);    // Note that $action and $object may have been modified by hook
-    print $hookmanager->resPrint;
-    if (! empty($arrayfields['i.datec']['checked'])) {
-        print_liste_field_titre($arrayfields['i.datec']['label'], $_SERVER["PHP_SELF"], "i.datec", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
-    }
-    if (! empty($arrayfields['i.tms']['checked'])) {
-        print_liste_field_titre($arrayfields['i.tms']['label'], $_SERVER["PHP_SELF"], "i.tms", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
-    }
+	// Hook fields
+	$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
+	$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
+	print $hookmanager->resPrint;
+	if (!empty($arrayfields['i.datec']['checked'])) {
+		print_liste_field_titre($arrayfields['i.datec']['label'], $_SERVER["PHP_SELF"], "i.datec", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+	}
+	if (!empty($arrayfields['i.tms']['checked'])) {
+		print_liste_field_titre($arrayfields['i.tms']['label'], $_SERVER["PHP_SELF"], "i.tms", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+	}
 
-    print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
-    print "</tr>\n";
+	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
+	print "</tr>\n";
 
 
-    $intracommreport_static = new IntracommReport($db);
+	$intracommreport_static = new IntracommReport($db);
 
-    $i = 0;
-    $totalarray=array();
-    while ($i < min($num, $limit))
-    {
-        $obj = $db->fetch_object($resql);
+	$i = 0;
+	$totalarray = array();
+	while ($i < min($num, $limit))
+	{
+		$obj = $db->fetch_object($resql);
 
-        $intracommreport_static->id = $obj->rowid;
-        $intracommreport_static->ref = $obj->ref;
-        $intracommreport_static->ref_fourn = $obj->ref_supplier;
-        $intracommreport_static->label = $obj->label;
-        $intracommreport_static->type = $obj->fk_product_type;
-        $intracommreport_static->status_buy = $obj->tobuy;
-        $intracommreport_static->status     = $obj->tosell;
-        $intracommreport_static->status_batch = $obj->tobatch;
-        $intracommreport_static->entity = $obj->entity;
+		$intracommreport_static->id = $obj->rowid;
+		$intracommreport_static->ref = $obj->ref;
+		$intracommreport_static->ref_fourn = $obj->ref_supplier;
+		$intracommreport_static->label = $obj->label;
+		$intracommreport_static->type = $obj->fk_product_type;
+		$intracommreport_static->status_buy = $obj->tobuy;
+		$intracommreport_static->status     = $obj->tosell;
+		$intracommreport_static->status_batch = $obj->tobatch;
+		$intracommreport_static->entity = $obj->entity;
 
-        print '<tr class="oddeven">';
+		print '<tr class="oddeven">';
 
-        // Ref
-        if (! empty($arrayfields['i.ref']['checked']))
-        {
-            print '<td class="tdoverflowmax200">';
-            print $intracommreport_static->getNomUrl(1);
-            print "</td>\n";
-            if (! $i) $totalarray['nbfield']++;
-        }
-        // Label
-        if (! empty($arrayfields['i.label']['checked']))
-        {
-            print '<td class="tdoverflowmax200">'.dol_trunc($obj->label, 80).'</td>';
-            if (! $i) $totalarray['nbfield']++;
-        }
-        // Type
-        if (! empty($arrayfields['i.fk_product_type']['checked']))
-        {
-            print '<td>'.$obj->fk_product_type.'</td>';
-            if (! $i) $totalarray['nbfield']++;
-        }
-        // Action
-        print '<td class="nowrap center">';
-        if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-        {
-            $selected=0;
-            if (in_array($obj->rowid, $arrayofselected)) $selected=1;
-            print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected?' checked="checked"':'').'>';
-        }
-        print '</td>';
-        if (! $i) $totalarray['nbfield']++;
+		// Ref
+		if (!empty($arrayfields['i.ref']['checked']))
+		{
+			print '<td class="tdoverflowmax200">';
+			print $intracommreport_static->getNomUrl(1);
+			print "</td>\n";
+			if (!$i) $totalarray['nbfield']++;
+		}
+		// Label
+		if (!empty($arrayfields['i.label']['checked']))
+		{
+			print '<td class="tdoverflowmax200">'.dol_trunc($obj->label, 80).'</td>';
+			if (!$i) $totalarray['nbfield']++;
+		}
+		// Type
+		if (!empty($arrayfields['i.fk_product_type']['checked']))
+		{
+			print '<td>'.$obj->fk_product_type.'</td>';
+			if (!$i) $totalarray['nbfield']++;
+		}
+		// Action
+		print '<td class="nowrap center">';
+		if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+		{
+			$selected = 0;
+			if (in_array($obj->rowid, $arrayofselected)) $selected = 1;
+			print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
+		}
+		print '</td>';
+		if (!$i) $totalarray['nbfield']++;
 
-        print "</tr>\n";
-        $i++;
-    }
+		print "</tr>\n";
+		$i++;
+	}
 
-    $db->free($resql);
+	$db->free($resql);
 
-    print "</table>";
-    print "</div>";
-    print '</form>';
+	print "</table>";
+	print "</div>";
+	print '</form>';
 }
 else {
-    dol_print_error($db);
+	dol_print_error($db);
 }
 
 // End of page
diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang
index 82119366b2b..3211a0b62df 100644
--- a/htdocs/langs/en_US/accountancy.lang
+++ b/htdocs/langs/en_US/accountancy.lang
@@ -118,6 +118,7 @@ UpdateMvts=Modification of a transaction
 ValidTransaction=Validate transaction
 WriteBookKeeping=Register transactions in accounting
 Bookkeeping=Ledger
+BookkeepingSubAccount=Subledger
 AccountBalance=Account balance
 ObjectsRef=Source object ref
 CAHTF=Total purchase vendor before tax
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index e47390b9ce0..3da5c3aff62 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -37,6 +37,8 @@ UnlockNewSessions=Remove connection lock
 YourSession=Your session
 Sessions=Users Sessions
 WebUserGroup=Web server user/group
+PermissionsOnFilesInWebRoot=Permissions on files in web root directory
+PermissionsOnFile=Permissions on file %s
 NoSessionFound=Your PHP configuration seems to not allow listing of active sessions. The directory used to save sessions (<b>%s</b>) may be protected (for example by OS permissions or by PHP directive open_basedir).
 DBStoringCharset=Database charset to store data
 DBSortingCharset=Database charset to sort data
@@ -80,6 +82,7 @@ AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a
 JavascriptDisabled=JavaScript disabled
 UsePreviewTabs=Use preview tabs
 ShowPreview=Show preview
+ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Preview not available
 ThemeCurrentlyActive=Theme currently active
 CurrentTimeZone=TimeZone PHP (server)
@@ -450,7 +453,7 @@ LinkToTestClickToDial=Enter a phone number to call to show a link to test the Cl
 RefreshPhoneLink=Refresh link
 LinkToTest=Clickable link generated for user <strong>%s</strong> (click phone number to test)
 KeepEmptyToUseDefault=Keep empty to use default value
-KeepThisEmptyInMostCases=In most cases, you can keep this field empy. 
+KeepThisEmptyInMostCases=In most cases, you can keep this field empy.
 DefaultLink=Default link
 SetAsDefault=Set as default
 ValueOverwrittenByUserSetup=Warning, this value may be overwritten by user specific setup (each user can set his own clicktodial url)
@@ -1178,6 +1181,7 @@ InfoWebServer=About Web Server
 InfoDatabase=About Database
 InfoPHP=About PHP
 InfoPerf=About Performances
+InfoSecurity=About Security
 BrowserName=Browser name
 BrowserOS=Browser OS
 ListOfSecurityEvents=List of Dolibarr security events
@@ -1228,7 +1232,7 @@ RestoreDesc2=Restore the backup file (zip file for example) of the "documents" d
 RestoreDesc3=Restore the database structure and data from a backup dump file into the database of the new Dolibarr installation or into the database of this current installation (<b>%s</b>). Warning, once the restore is complete, you must use a login/password, that existed from the backup time/installation to connect again.<br>To restore a backup database into this current installation, you can follow this assistant.
 RestoreMySQL=MySQL import
 ForcedToByAModule=This rule is forced to <b>%s</b> by an activated module
-ValueIsForcedBySystem=This value is forced by the system. You can't change it. 
+ValueIsForcedBySystem=This value is forced by the system. You can't change it.
 PreviousDumpFiles=Existing backup files
 PreviousArchiveFiles=Existing archive files
 WeekStartOnDay=First day of the week
@@ -1327,8 +1331,8 @@ DisableForgetPasswordLinkOnLogonPage=Do not show the "Password Forgotten" link o
 UsersSetup=Users module setup
 UserMailRequired=Email required to create a new user
 UserHideInactive=Hide inactive users from all combo lists of users (Not recommended: this may means you won't be able to filter or search on old users on some pages)
-UsersDocModules=Document templates for documents generated from user record 
-GroupsDocModules=Document templates for documents generated from a group record 
+UsersDocModules=Document templates for documents generated from user record
+GroupsDocModules=Document templates for documents generated from a group record
 ##### HRM setup #####
 HRMSetup=HRM module setup
 ##### Company setup #####
@@ -1557,7 +1561,9 @@ LDAPDescValues=Example values are designed for <b>OpenLDAP</b> with following lo
 ForANonAnonymousAccess=For an authenticated access (for a write access for example)
 PerfDolibarr=Performance setup/optimizing report
 YouMayFindPerfAdviceHere=This page provides some checks or advice related to performance.
-NotInstalled=Not installed, so your server is not slowed down by this.
+NotInstalled=Not installed.
+NotSlowedDownByThis=Not slowed down by this.
+NotRiskOfLeakWithThis=Not risk of leak with this.
 ApplicativeCache=Applicative cache
 MemcachedNotAvailable=No applicative cache found. You can enhance performance by installing a cache server Memcached and a module able to use this cache server.<br>More information here <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<br>Note that a lot of web hosting provider does not provide such cache server.
 MemcachedModuleAvailableButNotSetup=Module memcached for applicative cache found but setup of module is not complete.
@@ -1673,11 +1679,11 @@ StockSetup=Stock module setup
 IfYouUsePointOfSaleCheckModule=If you use the Point of Sale module (POS) provided by default or an external module, this setup may be ignored by your POS module. Most POS modules are designed by default to create an invoice immediately and decrease stock irrespective of the options here. So if you need or not to have a stock decrease when registering a sale from your POS, check also your POS module setup.
 ##### Menu #####
 MenuDeleted=Menu deleted
+Menu=Menu
 Menus=Menus
 TreeMenuPersonalized=Personalized menus
 NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
 NewMenu=New menu
-Menu=Selection of menu
 MenuHandler=Menu handler
 MenuModule=Source module
 HideUnauthorizedMenu= Hide unauthorized menus (gray)
@@ -2031,6 +2037,8 @@ UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
 ModuleActivated=Module %s is activated and slows the interface
+IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
+AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Setup of module Export
 ImportSetup=Setup of module Import
@@ -2040,7 +2048,7 @@ LargerThan=Larger than
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\s([^\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body. 
+EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\s([^\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
 EndPointFor=End point for %s : %s
 DeleteEmailCollector=Delete email collector
 ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
@@ -2067,4 +2075,7 @@ TemplateDeleted=Template deleted
 MailToSendEventPush=Event reminder email
 SwitchThisForABetterSecurity=Switching this value to %s is recommended for more security
 DictionaryProductNature= Nature of product
-CountryIfSpecificToOneCountry=Country (if specific to a given country)
\ No newline at end of file
+CountryIfSpecificToOneCountry=Country (if specific to a given country)
+YouMayFindSecurityAdviceHere=You may find security advisory here
+ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
+ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
\ No newline at end of file
diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang
index 7336f2b1e57..76ea80b53c8 100644
--- a/htdocs/langs/en_US/bills.lang
+++ b/htdocs/langs/en_US/bills.lang
@@ -577,3 +577,6 @@ UnitPriceXQtyLessDiscount=Unit price x Qty - Discount
 CustomersInvoicesArea=Customer billing area
 SupplierInvoicesArea=Supplier billing area
 FacParentLine=Invoice Line Parent
+SituationTotalRayToRest=Remainder to pay without taxe
+PDFSituationTitle=Situation n° %d
+SituationTotalProgress=Total progress %d %%
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 1096b9857f1..2068a37af2b 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -884,6 +884,8 @@ Miscellaneous=Miscellaneous
 Calendar=Calendar
 GroupBy=Group by...
 ViewFlatList=View flat list
+ViewAccountList=View ledger
+ViewSubAccountList=View subaccount ledger
 RemoveString=Remove string '%s'
 SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
 DirectDownloadLink=Direct download link (public/external)
@@ -1099,4 +1101,4 @@ DateOfBirth=Date of birth
 SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has expired, so action has been canceled. Please try again.
 UpToDate=Up-to-date
 OutOfDate=Out-of-date
-EventReminder=Event Reminder
\ No newline at end of file
+EventReminder=Event Reminder
diff --git a/htdocs/langs/en_US/members.lang b/htdocs/langs/en_US/members.lang
index 1a1419aa6da..5812248b129 100644
--- a/htdocs/langs/en_US/members.lang
+++ b/htdocs/langs/en_US/members.lang
@@ -80,7 +80,7 @@ DeleteType=Delete
 VoteAllowed=Vote allowed
 Physical=Physical
 Moral=Moral
-MorPhy=Nature
+MorAndPhy=Moral and Physical
 Reenable=Reenable
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
@@ -177,6 +177,7 @@ MenuMembersStats=Statistics
 LastMemberDate=Latest member date
 LatestSubscriptionDate=Latest subscription date
 MemberNature=Nature of member
+MembersNature=Nature of members
 Public=Information are public
 NewMemberbyWeb=New member added. Awaiting approval
 NewMemberForm=New member form
diff --git a/htdocs/langs/en_US/multicurrency.lang b/htdocs/langs/en_US/multicurrency.lang
index bfcbd11fb7c..26313c6bfb9 100644
--- a/htdocs/langs/en_US/multicurrency.lang
+++ b/htdocs/langs/en_US/multicurrency.lang
@@ -20,3 +20,19 @@ 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
+TabTitleMulticurrencyRate=Rate list
+ListCurrencyRate=List of exchange rates for the currency
+CreateRate=Create a rate
+FormCreateRate=Rate creation
+FormUpdateRate=Rate modification
+successRateCreate=Rate for currency %s has been added to the database
+ConfirmDeleteLineRate=Are you sure you want to remove the %s rate for currency %s on %s date?
+DeleteLineRate=Clear rate
+successRateDelete=Rate deleted
+errorRateDelete=Error when deleting the rate
+successUpdateRate=Modification made
+ErrorUpdateRate=Error when changing the rate
+Codemulticurrency=currency code
+UpdateRate=change the rate
+CancelUpdate=cancel
+NoEmptyRate=The rate field must not be empty
diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang
index 3077021aad6..97db059594f 100644
--- a/htdocs/langs/en_US/products.lang
+++ b/htdocs/langs/en_US/products.lang
@@ -287,6 +287,7 @@ PriceExpressionEditorHelp5=Available global values:
 PriceMode=Price mode
 PriceNumeric=Number
 DefaultPrice=Default price
+DefaultPriceLog=Log of previous default prices
 ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Child products
 MinSupplierPrice=Minimum buying price
diff --git a/htdocs/langs/en_US/recruitment.lang b/htdocs/langs/en_US/recruitment.lang
index 52290baf926..a50fa92ec9f 100644
--- a/htdocs/langs/en_US/recruitment.lang
+++ b/htdocs/langs/en_US/recruitment.lang
@@ -45,28 +45,29 @@ DateExpected=Expected date
 FutureManager=Future manager
 ResponsibleOfRecruitement=Responsible of recruitment
 IfJobIsLocatedAtAPartner=If job is located at a partner place
-PositionToBeFilled=Job offer to be filled
-PositionsToBeFilled=Job offers to be filled
-ListOfPositionsToBeFilled=List of job offers to be filled
-NewPositionToBeFilled=New job offers to be filled
+PositionToBeFilled=Job position
+PositionsToBeFilled=Job positions
+ListOfPositionsToBeFilled=List of job positions
+NewPositionToBeFilled=New job positions
 
-JobOfferToBeFilled=Job offer to be filled
+JobOfferToBeFilled=Job position to be filled
 ThisIsInformationOnJobPosition=Information of the job position to be filled
 ContactForRecruitment=Contact for recruitment
 EmailRecruiter=Email recruiter
 ToUseAGenericEmail=To use a generic email. If not defined, the email of the responsible of recruitment will be used
-NewCandidature=New candidature
-ListOfCandidatures=List of candidatures
+NewCandidature=New application
+ListOfCandidatures=List of applications
 RequestedRemuneration=Requested remuneration
 ProposedRemuneration=Proposed remuneration
 ContractProposed=Contract proposed
 ContractSigned=Contract signed
-RecruitmentCandidature=Candidature
+ContractRefused=Contract refused
+RecruitmentCandidature=Application
 JobPositions=Job positions
-RecruitmentCandidatures=Candidatures
+RecruitmentCandidatures=Applications
 InterviewToDo=Interview to do
-AnswerCandidature=Candidature answer
-YourCandidature=Your candidature
-YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
-JobClosedTextCandidateFound=The job offer is closed. The position has been filled.
-JobClosedTextCanceled=The job offer is closed.
+AnswerCandidature=Application answer
+YourCandidature=Your application
+YourCandidatureAnswerMessage=Thanks you for your application.<br>...
+JobClosedTextCandidateFound=The job position is closed. The position has been filled.
+JobClosedTextCanceled=The job position is closed.
diff --git a/htdocs/langs/fr_FR/bills.lang b/htdocs/langs/fr_FR/bills.lang
index 37745a85490..4feda723c18 100644
--- a/htdocs/langs/fr_FR/bills.lang
+++ b/htdocs/langs/fr_FR/bills.lang
@@ -575,3 +575,6 @@ BILL_SUPPLIER_DELETEInDolibarr=Facture fournisseur supprimée
 UnitPriceXQtyLessDiscount=Prix unitaire x Qté - Remise
 CustomersInvoicesArea=Zone de facturation client
 SupplierInvoicesArea=Zone de facturation fournisseur
+SituationTotalRayToRest=Reste à payer total HT
+PDFSituationTitle=Situation n° %d
+SituationTotalProgress=Total progression %d %%
diff --git a/htdocs/loan/card.php b/htdocs/loan/card.php
index acaa2469ee1..789c26140f9 100644
--- a/htdocs/loan/card.php
+++ b/htdocs/loan/card.php
@@ -179,7 +179,7 @@ if (empty($reshook))
 				$object->capital	        = $capital;
 				$object->nbterm		        = GETPOST("nbterm", 'int');
 				$object->rate = price2num(GETPOST("rate", 'alpha'));
-                $object->insurance_amount = price2num(GETPOST('insurance_amount', 'int'));
+				$object->insurance_amount = price2num(GETPOST('insurance_amount', 'int'));
 
 				$accountancy_account_capital = GETPOST('accountancy_account_capital');
 				$accountancy_account_insurance = GETPOST('accountancy_account_insurance');
@@ -367,7 +367,7 @@ if ($action == 'create')
 	}
 	print '</table>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div class="center">';
 	print '<input type="submit" class="button" value="'.$langs->trans("Add").'">';
@@ -478,11 +478,11 @@ if ($id > 0)
 		// Insurance
 		if ($action == 'edit')
 		{
-		    print '<tr><td class="titlefield">'.$langs->trans("Insurance").'</td><td>';
-		    print '<input name="insurance_amount" size="10" value="'.$object->insurance_amount.'"></td></tr>';
-		    print '</td></tr>';
+			print '<tr><td class="titlefield">'.$langs->trans("Insurance").'</td><td>';
+			print '<input name="insurance_amount" size="10" value="'.$object->insurance_amount.'"></td></tr>';
+			print '</td></tr>';
 		} else {
-		    print '<tr><td class="titlefield">'.$langs->trans("Insurance").'</td><td>'.price($object->insurance_amount, 0, $outputlangs, 1, -1, -1, $conf->currency).'</td></tr>';
+			print '<tr><td class="titlefield">'.$langs->trans("Insurance").'</td><td>'.price($object->insurance_amount, 0, $outputlangs, 1, -1, -1, $conf->currency).'</td></tr>';
 		}
 
 		// Date start
@@ -716,7 +716,7 @@ if ($id > 0)
 
 		print '<div class="clearboth"></div>';
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 		if ($action == 'edit')
 		{
diff --git a/htdocs/loan/class/loan.class.php b/htdocs/loan/class/loan.class.php
index 33f3d789806..ae683c829a5 100644
--- a/htdocs/loan/class/loan.class.php
+++ b/htdocs/loan/class/loan.class.php
@@ -54,10 +54,10 @@ class Loan extends CommonObject
 	public $datestart;
 	public $dateend;
 
-    /**
-     * @var string Loan label
-     */
-    public $label;
+	/**
+	 * @var string Loan label
+	 */
+	public $label;
 
 	public $capital;
 	public $nbterm;
@@ -68,8 +68,8 @@ class Loan extends CommonObject
 	public $account_interest;
 
 	/**
-     * @var integer|string date_creation
-     */
+	 * @var integer|string date_creation
+	 */
 	public $date_creation;
 
 	/**
@@ -85,29 +85,29 @@ class Loan extends CommonObject
 	public $insurance_amount;
 
 	/**
-     * @var int Bank ID
-     */
+	 * @var int Bank ID
+	 */
 	public $fk_bank;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_user_creat;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_user_modif;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_project;
 
 
 	const STATUS_UNPAID = 0;
 	const STATUS_PAID = 1;
-    const STATUS_STARTED = 2;
+	const STATUS_STARTED = 2;
 
 
 	/**
@@ -375,7 +375,7 @@ class Loan extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Tag loan as payed completely
 	 *
@@ -384,7 +384,7 @@ class Loan extends CommonObject
 	 */
 	public function set_paid($user)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$sql = "UPDATE ".MAIN_DB_PREFIX."loan SET";
 		$sql .= " paid = ".$this::STATUS_PAID;
 		$sql .= " WHERE rowid = ".$this->id;
@@ -397,7 +397,7 @@ class Loan extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Tag loan as payement started
 	 *
@@ -406,7 +406,7 @@ class Loan extends CommonObject
 	 */
 	public function set_started($user)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$sql = "UPDATE ".MAIN_DB_PREFIX."loan SET";
 		$sql .= " paid = ".$this::STATUS_STARTED;
 		$sql .= " WHERE rowid = ".$this->id;
@@ -419,7 +419,7 @@ class Loan extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Tag loan as payement as unpaid
 	 *
@@ -428,7 +428,7 @@ class Loan extends CommonObject
 	 */
 	public function set_unpaid($user)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$sql = "UPDATE ".MAIN_DB_PREFIX."loan SET";
 		$sql .= " paid = ".$this::STATUS_UNPAID;
 		$sql .= " WHERE rowid = ".$this->id;
@@ -453,7 +453,7 @@ class Loan extends CommonObject
 		return $this->LibStatut($this->paid, $mode, $alreadypaid);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return label for given status
 	 *
@@ -476,11 +476,11 @@ class Loan extends CommonObject
 			global $langs;
 			$this->labelStatus[self::STATUS_UNPAID] = $langs->trans('Unpaid');
 			$this->labelStatus[self::STATUS_PAID] = $langs->trans('Paid');
-            $this->labelStatus[self::STATUS_STARTED] = $langs->trans("BillStatusStarted");
+			$this->labelStatus[self::STATUS_STARTED] = $langs->trans("BillStatusStarted");
 			if ($status == 0 && $alreadypaid > 0) $this->labelStatus[self::STATUS_UNPAID] = $langs->trans("BillStatusStarted");
 			$this->labelStatusShort[self::STATUS_UNPAID] = $langs->trans('Unpaid');
 			$this->labelStatusShort[self::STATUS_PAID] = $langs->trans('Enabled');
-            $this->labelStatusShort[self::STATUS_STARTED] = $langs->trans("BillStatusStarted");
+			$this->labelStatusShort[self::STATUS_STARTED] = $langs->trans("BillStatusStarted");
 			if ($status == 0 && $alreadypaid > 0) $this->labelStatusShort[self::STATUS_UNPAID] = $langs->trans("BillStatusStarted");
 		}
 
@@ -497,10 +497,10 @@ class Loan extends CommonObject
 	 *
 	 *  @param	int		$withpicto					0=No picto, 1=Include picto into link, 2=Only picto
 	 *  @param	int		$maxlen						Label max length
-     *  @param  string  $option        				On what the link point to ('nolink', ...)
-     *  @param  int     $notooltip                  1=Disable tooltip
-     *  @param  string  $morecss                    Add more css on link
-     *  @param  int     $save_lastsearch_value      -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+	 *  @param  string  $option        				On what the link point to ('nolink', ...)
+	 *  @param  int     $notooltip                  1=Disable tooltip
+	 *  @param  string  $morecss                    Add more css on link
+	 *  @param  int     $save_lastsearch_value      -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
 	 *  @return	string								Chaine with URL
 	 */
 	public function getNomUrl($withpicto = 0, $maxlen = 0, $option = '', $notooltip = 0, $morecss = '', $save_lastsearch_value = -1)
@@ -560,25 +560,25 @@ class Loan extends CommonObject
 	 */
 	public function initAsSpecimen()
 	{
-	    global $user, $langs, $conf;
+		global $user, $langs, $conf;
 
-	    $now = dol_now();
+		$now = dol_now();
 
-	    // Initialise parameters
-	    $this->id = 0;
-	    $this->fk_bank = 1;
-	    $this->label = 'SPECIMEN';
-	    $this->specimen = 1;
-	    $this->socid = 1;
-	    $this->account_capital = 16;
-	    $this->account_insurance = 616;
-	    $this->account_interest = 518;
-	    $this->datestart = $now;
-	    $this->dateend = $now + (3600 * 24 * 365);
-	    $this->note_public = 'SPECIMEN';
-	    $this->capital = 20000;
-	    $this->nbterm = 48;
-	    $this->rate = 4.3;
+		// Initialise parameters
+		$this->id = 0;
+		$this->fk_bank = 1;
+		$this->label = 'SPECIMEN';
+		$this->specimen = 1;
+		$this->socid = 1;
+		$this->account_capital = 16;
+		$this->account_insurance = 616;
+		$this->account_interest = 518;
+		$this->datestart = $now;
+		$this->dateend = $now + (3600 * 24 * 365);
+		$this->note_public = 'SPECIMEN';
+		$this->capital = 20000;
+		$this->nbterm = 48;
+		$this->rate = 4.3;
 	}
 
 	/**
@@ -659,5 +659,5 @@ class Loan extends CommonObject
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
-    }
+	}
 }
diff --git a/htdocs/loan/class/loanschedule.class.php b/htdocs/loan/class/loanschedule.class.php
index 4fd4b526d25..50339359a9d 100644
--- a/htdocs/loan/class/loanschedule.class.php
+++ b/htdocs/loan/class/loanschedule.class.php
@@ -40,56 +40,56 @@ class LoanSchedule extends CommonObject
 	 */
 	public $table_element = 'loan_schedule';
 
-    /**
-     * @var int Loan ID
-     */
-    public $fk_loan;
+	/**
+	 * @var int Loan ID
+	 */
+	public $fk_loan;
 
-    /**
-     * @var string Create date
-     */
-    public $datec;
+	/**
+	 * @var string Create date
+	 */
+	public $datec;
 	public $tms;
 
-    /**
-     * @var string Payment date
-     */
-    public $datep;
+	/**
+	 * @var string Payment date
+	 */
+	public $datep;
 
-    public $amounts = array(); // Array of amounts
-    public $amount_capital; // Total amount of payment
+	public $amounts = array(); // Array of amounts
+	public $amount_capital; // Total amount of payment
 	public $amount_insurance;
 	public $amount_interest;
 
-    /**
-     * @var int Payment Type ID
-     */
-    public $fk_typepayment;
+	/**
+	 * @var int Payment Type ID
+	 */
+	public $fk_typepayment;
 
-    /**
-     * @var int Payment ID
-     */
-    public $num_payment;
+	/**
+	 * @var int Payment ID
+	 */
+	public $num_payment;
 
-    /**
-     * @var int Bank ID
-     */
-    public $fk_bank;
+	/**
+	 * @var int Bank ID
+	 */
+	public $fk_bank;
 
-    /**
-     * @var int Loan Payment ID
-     */
-    public $fk_payment_loan;
+	/**
+	 * @var int Loan Payment ID
+	 */
+	public $fk_payment_loan;
 
-    /**
-     * @var int Bank ID
-     */
-    public $fk_user_creat;
+	/**
+	 * @var int Bank ID
+	 */
+	public $fk_user_creat;
 
-    /**
-     * @var int User ID
-     */
-    public $fk_user_modif;
+	/**
+	 * @var int User ID
+	 */
+	public $fk_user_modif;
 
 	public $lines = array();
 
@@ -115,8 +115,8 @@ class LoanSchedule extends CommonObject
 
 	/**
 	 *  Create payment of loan into database.
-     *  Use this->amounts to have list of lines for the payment
-     *
+	 *  Use this->amounts to have list of lines for the payment
+	 *
 	 *  @param      User		$user   User making payment
 	 *  @return     int     			<0 if KO, id of payment if OK
 	 */
@@ -126,9 +126,9 @@ class LoanSchedule extends CommonObject
 
 		$error = 0;
 
-        $now = dol_now();
+		$now = dol_now();
 
-        // Validate parameters
+		// Validate parameters
 		if (!$this->datep)
 		{
 			$this->error = 'ErrorBadValueForParameter';
@@ -145,14 +145,14 @@ class LoanSchedule extends CommonObject
 		if (isset($this->fk_user_creat)) $this->fk_user_creat = (int) $this->fk_user_creat;
 		if (isset($this->fk_user_modif)) $this->fk_user_modif = (int) $this->fk_user_modif;
 
-        $totalamount = $this->amount_capital + $this->amount_insurance + $this->amount_interest;
-        $totalamount = price2num($totalamount);
+		$totalamount = $this->amount_capital + $this->amount_insurance + $this->amount_interest;
+		$totalamount = price2num($totalamount);
 
-        // Check parameters
-        if ($totalamount == 0) {
-        	$this->errors[] = 'step1';
-        	return -1; // Negative amounts are accepted for reject prelevement but not null
-        }
+		// Check parameters
+		if ($totalamount == 0) {
+			$this->errors[] = 'step1';
+			return -1; // Negative amounts are accepted for reject prelevement but not null
+		}
 
 
 		$this->db->begin();
@@ -176,15 +176,15 @@ class LoanSchedule extends CommonObject
 			{
 				$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."payment_loan");
 			} else {
-                $this->error = $this->db->lasterror();
+				$this->error = $this->db->lasterror();
 				$error++;
 			}
 		}
 
 		if ($totalamount != 0 && !$error)
 		{
-		    $this->amount_capital = $totalamount;
-		    $this->db->commit();
+			$this->amount_capital = $totalamount;
+			$this->db->commit();
 			return $this->id;
 		} else {
 			$this->errors[] = $this->db->lasterror();
@@ -203,61 +203,61 @@ class LoanSchedule extends CommonObject
 	{
 		global $langs;
 		$sql = "SELECT";
-		$sql.= " t.rowid,";
-		$sql.= " t.fk_loan,";
-		$sql.= " t.datec,";
-		$sql.= " t.tms,";
-		$sql.= " t.datep,";
-		$sql.= " t.amount_capital,";
-		$sql.= " t.amount_insurance,";
-		$sql.= " t.amount_interest,";
-		$sql.= " t.fk_typepayment,";
-		$sql.= " t.num_payment,";
-        $sql.= " t.note_private,";
-        $sql.= " t.note_public,";
-		$sql.= " t.fk_bank,";
-		$sql.= " t.fk_payment_loan,";
-		$sql.= " t.fk_user_creat,";
-		$sql.= " t.fk_user_modif,";
-		$sql.= " pt.code as type_code, pt.libelle as type_label,";
-		$sql.= ' b.fk_account';
-		$sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element." as t";
-		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as pt ON t.fk_typepayment = pt.id";
-		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank as b ON t.fk_bank = b.rowid';
-		$sql.= " WHERE t.rowid = ".$id;
+		$sql .= " t.rowid,";
+		$sql .= " t.fk_loan,";
+		$sql .= " t.datec,";
+		$sql .= " t.tms,";
+		$sql .= " t.datep,";
+		$sql .= " t.amount_capital,";
+		$sql .= " t.amount_insurance,";
+		$sql .= " t.amount_interest,";
+		$sql .= " t.fk_typepayment,";
+		$sql .= " t.num_payment,";
+		$sql .= " t.note_private,";
+		$sql .= " t.note_public,";
+		$sql .= " t.fk_bank,";
+		$sql .= " t.fk_payment_loan,";
+		$sql .= " t.fk_user_creat,";
+		$sql .= " t.fk_user_modif,";
+		$sql .= " pt.code as type_code, pt.libelle as type_label,";
+		$sql .= ' b.fk_account';
+		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element." as t";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as pt ON t.fk_typepayment = pt.id";
+		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank as b ON t.fk_bank = b.rowid';
+		$sql .= " WHERE t.rowid = ".$id;
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql) {
-            if ($this->db->num_rows($resql)) {
-                $obj = $this->db->fetch_object($resql);
+			if ($this->db->num_rows($resql)) {
+				$obj = $this->db->fetch_object($resql);
 
-                $this->id = $obj->rowid;
-                $this->ref = $obj->rowid;
+				$this->id = $obj->rowid;
+				$this->ref = $obj->rowid;
 
-                $this->fk_loan = $obj->fk_loan;
-                $this->datec = $this->db->jdate($obj->datec);
-                $this->tms = $this->db->jdate($obj->tms);
-                $this->datep = $this->db->jdate($obj->datep);
-                $this->amount_capital = $obj->amount_capital;
-                $this->amount_insurance = $obj->amount_insurance;
-                $this->amount_interest = $obj->amount_interest;
-                $this->fk_typepayment = $obj->fk_typepayment;
-                $this->num_payment = $obj->num_payment;
-                $this->note_private = $obj->note_private;
-                $this->note_public = $obj->note_public;
-                $this->fk_bank = $obj->fk_bank;
+				$this->fk_loan = $obj->fk_loan;
+				$this->datec = $this->db->jdate($obj->datec);
+				$this->tms = $this->db->jdate($obj->tms);
+				$this->datep = $this->db->jdate($obj->datep);
+				$this->amount_capital = $obj->amount_capital;
+				$this->amount_insurance = $obj->amount_insurance;
+				$this->amount_interest = $obj->amount_interest;
+				$this->fk_typepayment = $obj->fk_typepayment;
+				$this->num_payment = $obj->num_payment;
+				$this->note_private = $obj->note_private;
+				$this->note_public = $obj->note_public;
+				$this->fk_bank = $obj->fk_bank;
 				$this->fk_payment_loan = $obj->fk_payment_loan;
-                $this->fk_user_creat = $obj->fk_user_creat;
-                $this->fk_user_modif = $obj->fk_user_modif;
+				$this->fk_user_creat = $obj->fk_user_creat;
+				$this->fk_user_modif = $obj->fk_user_modif;
 
-                $this->type_code = $obj->type_code;
-                $this->type_label = $obj->type_label;
+				$this->type_code = $obj->type_code;
+				$this->type_label = $obj->type_label;
 
-                $this->bank_account = $obj->fk_account;
-                $this->bank_line = $obj->fk_bank;
-            }
-            $this->db->free($resql);
+				$this->bank_account = $obj->fk_account;
+				$this->bank_line = $obj->fk_bank;
+			}
+			$this->db->free($resql);
 
 			return 1;
 		} else {
@@ -280,13 +280,13 @@ class LoanSchedule extends CommonObject
 		$error = 0;
 
 		// Clean parameters
-		if (isset($this->amount_capital)) $this->amount_capital=trim($this->amount_capital);
-		if (isset($this->amount_insurance)) $this->amount_insurance=trim($this->amount_insurance);
-		if (isset($this->amount_interest)) $this->amount_interest=trim($this->amount_interest);
-		if (isset($this->num_payment)) $this->num_payment=trim($this->num_payment);
-		if (isset($this->note_private)) $this->note_private=trim($this->note_private);
-		if (isset($this->note_public)) $this->note_public=trim($this->note_public);
-		if (isset($this->fk_bank)) $this->fk_bank=trim($this->fk_bank);
+		if (isset($this->amount_capital)) $this->amount_capital = trim($this->amount_capital);
+		if (isset($this->amount_insurance)) $this->amount_insurance = trim($this->amount_insurance);
+		if (isset($this->amount_interest)) $this->amount_interest = trim($this->amount_interest);
+		if (isset($this->num_payment)) $this->num_payment = trim($this->num_payment);
+		if (isset($this->note_private)) $this->note_private = trim($this->note_private);
+		if (isset($this->note_public)) $this->note_public = trim($this->note_public);
+		if (isset($this->fk_bank)) $this->fk_bank = trim($this->fk_bank);
 		if (isset($this->fk_payment_loan)) $this->fk_payment_loan = (int) $this->fk_payment_loan;
 
 		// Check parameters
@@ -338,21 +338,21 @@ class LoanSchedule extends CommonObject
 	 *  @param  int		$notrigger		0=launch triggers after, 1=disable triggers
 	 *  @return int						<0 if KO, >0 if OK
 	 */
-    public function delete($user, $notrigger = 0)
+	public function delete($user, $notrigger = 0)
 	{
 		global $conf, $langs;
 		$error = 0;
 
 		$this->db->begin();
 
-        if (!$error) {
+		if (!$error) {
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX.$this->table_element;
 			$sql .= " WHERE rowid=".$this->id;
 
 			dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 			$resql = $this->db->query($sql);
 			if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
-        }
+		}
 
 		// Commit or rollback
 		if ($error)
@@ -368,7 +368,7 @@ class LoanSchedule extends CommonObject
 			$this->db->commit();
 			return 1;
 		}
-    }
+	}
 
 	/**
 	 * Calculate Monthly Payments
diff --git a/htdocs/loan/document.php b/htdocs/loan/document.php
index 599fd386f02..91bfaf1f921 100644
--- a/htdocs/loan/document.php
+++ b/htdocs/loan/document.php
@@ -49,7 +49,7 @@ $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
-    $page = 0;
+	$page = 0;
 }
 $offset = $limit * $page;
 $pageprev = $page - 1;
@@ -85,9 +85,9 @@ if ($object->id)
 {
 	$totalpaid = $object->getSumPayment();
 
-    $head = loan_prepare_head($object);
+	$head = loan_prepare_head($object);
 
-    print dol_get_fiche_head($head, 'documents', $langs->trans("Loan"), -1, 'bill');
+	print dol_get_fiche_head($head, 'documents', $langs->trans("Loan"), -1, 'bill');
 
 	$morehtmlref = '<div class="refidno">';
 	// Ref loan
@@ -135,31 +135,31 @@ if ($object->id)
 	print '<div class="underbanner clearboth"></div>';
 
 
-    // Build file list
-    $filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
-    $totalsize = 0;
-    foreach ($filearray as $key => $file)
-    {
-        $totalsize += $file['size'];
-    }
+	// Build file list
+	$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
+	$totalsize = 0;
+	foreach ($filearray as $key => $file)
+	{
+		$totalsize += $file['size'];
+	}
 
 
-    print '<table class="border tableforfield centpercent">';
-    print '<tr><td class="titlefield">'.$langs->trans("NbOfAttachedFiles").'</td><td>'.count($filearray).'</td></tr>';
-    print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td>'.dol_print_size($totalsize, 1, 1).'</td></tr>';
-    print "</table>\n";
+	print '<table class="border tableforfield centpercent">';
+	print '<tr><td class="titlefield">'.$langs->trans("NbOfAttachedFiles").'</td><td>'.count($filearray).'</td></tr>';
+	print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td>'.dol_print_size($totalsize, 1, 1).'</td></tr>';
+	print "</table>\n";
 
-    print "</div>\n";
+	print "</div>\n";
 
-    dol_fiche_end();
+	print dol_get_fiche_end();
 
-    $modulepart = 'loan';
-    $permission = $user->rights->loan->write;
-    $permtoedit = $user->rights->loan->write;
-    $param = '&id='.$object->id;
-    include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
+	$modulepart = 'loan';
+	$permission = $user->rights->loan->write;
+	$permtoedit = $user->rights->loan->write;
+	$param = '&id='.$object->id;
+	include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
 } else {
-    print $langs->trans("ErrorUnknown");
+	print $langs->trans("ErrorUnknown");
 }
 
 // End of page
diff --git a/htdocs/loan/note.php b/htdocs/loan/note.php
index e9a266eb0c0..91f32679699 100644
--- a/htdocs/loan/note.php
+++ b/htdocs/loan/note.php
@@ -68,14 +68,14 @@ llxHeader("", $title, $help_url);
 
 if ($id > 0)
 {
-    /*
+	/*
      * Affichage onglets
      */
 	$totalpaid = $object->getSumPayment();
 
-    $head = loan_prepare_head($object);
+	$head = loan_prepare_head($object);
 
-    print dol_get_fiche_head($head, 'note', $langs->trans("Loan"), -1, 'bill');
+	print dol_get_fiche_head($head, 'note', $langs->trans("Loan"), -1, 'bill');
 
 	$morehtmlref = '<div class="refidno">';
 	// Ref loan
@@ -122,11 +122,11 @@ if ($id > 0)
 	print '<div class="fichecenter">';
 	print '<div class="underbanner clearboth"></div>';
 
-    $cssclass = 'titlefield';
-    $permission = $user->rights->loan->write; // Used by the include of notes.tpl.php
-    include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
+	$cssclass = 'titlefield';
+	$permission = $user->rights->loan->write; // Used by the include of notes.tpl.php
+	include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
 
-    dol_fiche_end();
+	print dol_get_fiche_end();
 }
 
 // End of page
diff --git a/htdocs/loan/payment/card.php b/htdocs/loan/payment/card.php
index e0da043e2e8..6aebd9fb33d 100644
--- a/htdocs/loan/payment/card.php
+++ b/htdocs/loan/payment/card.php
@@ -57,7 +57,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->loan->del
 	$sql = "UPDATE ".MAIN_DB_PREFIX."loan_schedule SET fk_bank = 0 WHERE fk_bank = ".$payment->fk_bank;
 	$db->query($sql);
 
-    $fk_loan = $payment->fk_loan;
+	$fk_loan = $payment->fk_loan;
 
 	$result = $payment->delete($user);
 	if ($result > 0)
diff --git a/htdocs/loan/payment/payment.php b/htdocs/loan/payment/payment.php
index 5aa83ff4321..2638d336eb0 100644
--- a/htdocs/loan/payment/payment.php
+++ b/htdocs/loan/payment/payment.php
@@ -32,9 +32,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/loan.lib.php';
 
 $langs->loadLangs(array("bills", "loan"));
 
-$chid=GETPOST('id', 'int');
-$action=GETPOST('action', 'aZ09');
-$cancel=GETPOST('cancel', 'alpha');
+$chid = GETPOST('id', 'int');
+$action = GETPOST('action', 'aZ09');
+$cancel = GETPOST('cancel', 'alpha');
 $datepaid = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
 
 // Security check
@@ -53,34 +53,34 @@ $ls = new LoanSchedule($db);
 $res = $ls->fetchAll($chid);
 if ($res > 0)
 {
-    foreach ($ls->lines as $l)
-    {
-        $echance++; // Count term pos
-        // last unpaid term
-        if (empty($l->fk_bank))
-        {
-            $line_id = $l->id;
-            break;
-        }
-        // If line_id provided, only count temp pos
-        elseif ($line_id == $l->id)
-        {
-            break;
-        }
-    }
+	foreach ($ls->lines as $l)
+	{
+		$echance++; // Count term pos
+		// last unpaid term
+		if (empty($l->fk_bank))
+		{
+			$line_id = $l->id;
+			break;
+		}
+		// If line_id provided, only count temp pos
+		elseif ($line_id == $l->id)
+		{
+			break;
+		}
+	}
 }
 
 // Set current line with last unpaid line (only if shedule is used)
 if (!empty($line_id))
 {
-    $line = new LoanSchedule($db);
-    $res = $line->fetch($line_id);
-    if ($res > 0) {
-        $amount_capital = price($line->amount_capital);
-        $amount_insurance = price($line->amount_insurance);
-        $amount_interest = price($line->amount_interest);
-        if (empty($datepaid)) $ts_temppaid = $line->datep;
-    }
+	$line = new LoanSchedule($db);
+	$res = $line->fetch($line_id);
+	if ($res > 0) {
+		$amount_capital = price($line->amount_capital);
+		$amount_insurance = price($line->amount_insurance);
+		$amount_interest = price($line->amount_interest);
+		if (empty($datepaid)) $ts_temppaid = $line->datep;
+	}
 }
 
 
@@ -99,7 +99,7 @@ if ($action == 'add_payment')
 		exit;
 	}
 
-	if (! GETPOST('paymenttype', 'int') > 0)
+	if (!GETPOST('paymenttype', 'int') > 0)
 	{
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("PaymentMode")), null, 'errors');
 		$error++;
@@ -119,26 +119,26 @@ if ($action == 'add_payment')
 	{
 		$paymentid = 0;
 
-        $pay_amount_capital = price2num(GETPOST('amount_capital'));
-        $pay_amount_insurance = price2num(GETPOST('amount_insurance'));
-        // User can't set interest him self if schedule is set (else value in schedule can be incoherent)
-        if (!empty($line)) $pay_amount_interest = $line->amount_interest;
-        else $pay_amount_interest = price2num(GETPOST('amount_interest'));
-        $remaindertopay = price2num(GETPOST('remaindertopay'));
-		$amount =  $pay_amount_capital + $pay_amount_insurance + $pay_amount_interest;
+		$pay_amount_capital = price2num(GETPOST('amount_capital'));
+		$pay_amount_insurance = price2num(GETPOST('amount_insurance'));
+		// User can't set interest him self if schedule is set (else value in schedule can be incoherent)
+		if (!empty($line)) $pay_amount_interest = $line->amount_interest;
+		else $pay_amount_interest = price2num(GETPOST('amount_interest'));
+		$remaindertopay = price2num(GETPOST('remaindertopay'));
+		$amount = $pay_amount_capital + $pay_amount_insurance + $pay_amount_interest;
 
-        // This term is allready paid
-        if (!empty($line) && !empty($line->fk_bank))
-        {
-            setEventMessages($langs->trans('TermPaidAllreadyPaid'), null, 'errors');
-            $error++;
-        }
+		// This term is allready paid
+		if (!empty($line) && !empty($line->fk_bank))
+		{
+			setEventMessages($langs->trans('TermPaidAllreadyPaid'), null, 'errors');
+			$error++;
+		}
 
-        if (empty($remaindertopay))
-        {
+		if (empty($remaindertopay))
+		{
 			setEventMessages('Empty sumpaid', null, 'errors');
 			$error++;
-        }
+		}
 
 		if ($amount == 0)
 		{
@@ -152,14 +152,14 @@ if ($action == 'add_payment')
 
 			// Create a line of payments
 			$payment = new PaymentLoan($db);
-			$payment->chid				= $chid;
+			$payment->chid = $chid;
 			$payment->datep             = $datepaid;
 			$payment->label             = $loan->label;
-			$payment->amount_capital	= $pay_amount_capital;
-			$payment->amount_insurance	= $pay_amount_interest;
-			$payment->amount_interest	= $pay_amount_insurance;
+			$payment->amount_capital = $pay_amount_capital;
+			$payment->amount_insurance = $pay_amount_interest;
+			$payment->amount_interest = $pay_amount_insurance;
 			$payment->paymenttype       = GETPOST('paymenttype', 'int');
-			$payment->num_payment		= GETPOST('num_payment');
+			$payment->num_payment = GETPOST('num_payment');
 			$payment->note_private      = GETPOST('note_private', 'restricthtml');
 			$payment->note_public       = GETPOST('note_public', 'restricthtml');
 
@@ -183,48 +183,48 @@ if ($action == 'add_payment')
 				}
 			}
 
-            // Update loan schedule with payment value
-            if (! $error && !empty($line))
-            {
-                // If payment values are modified, recalculate schedule
-                if (($line->amount_capital <> $pay_amount_capital) || ($line->amount_insurance <> $pay_amount_insurance) || ($line->amount_interest <> $pay_amount_interest))
-                {
-                    $arr_term = loanCalcMonthlyPayment(($pay_amount_capital + $pay_amount_interest), $remaindertopay, ($loan->rate / 100), $echance, $loan->nbterm);
-                    foreach ($arr_term as $k=>$v)
-                    {
-                        // Update fk_bank for current line
-                        if ($k == $echance)
-                        {
-                            $ls->lines[$k-1]->fk_bank = $payment->fk_bank;
-                            $ls->lines[$k-1]->fk_payment_loan = $payment->id;
-                        }
-                        $ls->lines[$k-1]->amount_capital = $v['mens'] - $v['interet'];
-                        $ls->lines[$k-1]->amount_interest = $v['interet'];
-                        $ls->lines[$k-1]->tms = dol_now();
-                        $ls->lines[$k-1]->fk_user_modif = $user->id;
-                        $result = $ls->lines[$k-1]->update($user, 0);
-                        if ($result < 1)
-                        {
-                            setEventMessages(null, $ls->errors, 'errors');
-                            $error++;
-                            break;
-                        }
-                    }
-                }
-                else // Only add fk_bank bank to schedule line (mark as paid)
-                {
-                    $line->fk_bank = $payment->fk_bank;
-                    $line->fk_payment_loan = $payment->id;
-                    $result = $line->update($user, 0);
-                    if ($result < 1)
-                    {
-                        setEventMessages(null, $line->errors, 'errors');
-                        $error++;
-                    }
-                }
-            }
+			// Update loan schedule with payment value
+			if (!$error && !empty($line))
+			{
+				// If payment values are modified, recalculate schedule
+				if (($line->amount_capital <> $pay_amount_capital) || ($line->amount_insurance <> $pay_amount_insurance) || ($line->amount_interest <> $pay_amount_interest))
+				{
+					$arr_term = loanCalcMonthlyPayment(($pay_amount_capital + $pay_amount_interest), $remaindertopay, ($loan->rate / 100), $echance, $loan->nbterm);
+					foreach ($arr_term as $k=>$v)
+					{
+						// Update fk_bank for current line
+						if ($k == $echance)
+						{
+							$ls->lines[$k - 1]->fk_bank = $payment->fk_bank;
+							$ls->lines[$k - 1]->fk_payment_loan = $payment->id;
+						}
+						$ls->lines[$k - 1]->amount_capital = $v['mens'] - $v['interet'];
+						$ls->lines[$k - 1]->amount_interest = $v['interet'];
+						$ls->lines[$k - 1]->tms = dol_now();
+						$ls->lines[$k - 1]->fk_user_modif = $user->id;
+						$result = $ls->lines[$k - 1]->update($user, 0);
+						if ($result < 1)
+						{
+							setEventMessages(null, $ls->errors, 'errors');
+							$error++;
+							break;
+						}
+					}
+				}
+				else // Only add fk_bank bank to schedule line (mark as paid)
+				{
+					$line->fk_bank = $payment->fk_bank;
+					$line->fk_payment_loan = $payment->id;
+					$result = $line->update($user, 0);
+					if ($result < 1)
+					{
+						setEventMessages(null, $line->errors, 'errors');
+						$error++;
+					}
+				}
+			}
 
-			if (! $error)
+			if (!$error)
 			{
 				$db->commit();
 				$loc = DOL_URL_ROOT.'/loan/card.php?id='.$chid;
@@ -257,12 +257,12 @@ if ($action == 'create')
 	print load_fiche_titre($langs->trans("DoPayment"));
 
 	$sql = "SELECT SUM(amount_capital) as total";
-	$sql.= " FROM ".MAIN_DB_PREFIX."payment_loan";
-	$sql.= " WHERE fk_loan = ".$chid;
+	$sql .= " FROM ".MAIN_DB_PREFIX."payment_loan";
+	$sql .= " WHERE fk_loan = ".$chid;
 	$resql = $db->query($sql);
 	if ($resql)
 	{
-		$obj=$db->fetch_object($resql);
+		$obj = $db->fetch_object($resql);
 		$sumpaid = $obj->total;
 		$db->free();
 	}
@@ -299,10 +299,10 @@ if ($action == 'create')
 	print '<table class="border centpercent">';
 
 	print '<tr><td class="titlefield fieldrequired">'.$langs->trans("Date").'</td><td colspan="2">';
-    if (empty($datepaid))
-        if (empty($ts_temppaid)) $datepayment = empty($conf->global->MAIN_AUTOFILL_DATE)?-1:dol_now();
+	if (empty($datepaid))
+		if (empty($ts_temppaid)) $datepayment = empty($conf->global->MAIN_AUTOFILL_DATE) ?-1 : dol_now();
 	else $datepayment = $ts_temppaid;
-    else $datepayment = $datepaid;
+	else $datepayment = $datepaid;
 	print $form->selectDate($datepayment, '', '', '', '', "add_payment", 1, 1);
 	print "</td>";
 	print '</tr>';
@@ -315,7 +315,7 @@ if ($action == 'create')
 	print '<tr>';
 	print '<td class="fieldrequired">'.$langs->trans('AccountToDebit').'</td>';
 	print '<td colspan="2">';
-	$form->select_comptes(GETPOSTISSET("accountid") ? GETPOST("accountid", 'int') : $loan->accountid, "accountid", 0, 'courant = '.Account::TYPE_CURRENT, 1);  // Show opend bank account list
+	$form->select_comptes(GETPOSTISSET("accountid") ? GETPOST("accountid", 'int') : $loan->accountid, "accountid", 0, 'courant = '.Account::TYPE_CURRENT, 1); // Show opend bank account list
 	print '</td></tr>';
 
 	// Number
@@ -337,7 +337,7 @@ if ($action == 'create')
 
 	print '</table>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 
 	print '<table class="noborder centpercent">';
@@ -367,7 +367,7 @@ if ($action == 'create')
 	print '<td class="right">';
 	if ($sumpaid < $loan->capital)
 	{
-        print $langs->trans("LoanCapital") .': <input type="text" size="8" name="amount_capital" value="'.(GETPOSTISSET('amount_capital')?GETPOST('amount_capital'):$amount_capital).'">';
+		print $langs->trans("LoanCapital").': <input type="text" size="8" name="amount_capital" value="'.(GETPOSTISSET('amount_capital') ?GETPOST('amount_capital') : $amount_capital).'">';
 	}
 	else {
 		print '-';
@@ -375,7 +375,7 @@ if ($action == 'create')
 	print '<br>';
 	if ($sumpaid < $loan->capital)
 	{
-		print $langs->trans("Insurance") .': <input type="text" size="8" name="amount_insurance" value="'.(GETPOSTISSET('amount_insurance')?GETPOST('amount_insurance'):$amount_insurance).'">';
+		print $langs->trans("Insurance").': <input type="text" size="8" name="amount_insurance" value="'.(GETPOSTISSET('amount_insurance') ?GETPOST('amount_insurance') : $amount_insurance).'">';
 	}
 	else {
 		print '-';
@@ -383,7 +383,7 @@ if ($action == 'create')
 	print '<br>';
 	if ($sumpaid < $loan->capital)
 	{
-		print $langs->trans("Interest") .': <input type="text" size="8" name="amount_interest" value="'.(GETPOSTISSET('amount_interest')?GETPOST('amount_interest'):$amount_interest).'" '.(!empty($line)?'disabled title="'.$langs->trans('CantModifyInterestIfScheduleIsUsed').'"':'').'>';
+		print $langs->trans("Interest").': <input type="text" size="8" name="amount_interest" value="'.(GETPOSTISSET('amount_interest') ?GETPOST('amount_interest') : $amount_interest).'" '.(!empty($line) ? 'disabled title="'.$langs->trans('CantModifyInterestIfScheduleIsUsed').'"' : '').'>';
 	}
 	else {
 		print '-';
diff --git a/htdocs/loan/schedule.php b/htdocs/loan/schedule.php
index 24492ebcab0..5e27a48fa02 100644
--- a/htdocs/loan/schedule.php
+++ b/htdocs/loan/schedule.php
@@ -36,7 +36,7 @@ $action = GETPOST('action', 'aZ09');
 // Security check
 $socid = 0;
 if (GETPOSTISSET('socid')) $socid = GETPOST('socid', 'int');
-if ($user->socid) $socid=$user->socid;
+if ($user->socid) $socid = $user->socid;
 if (empty($user->rights->loan->calc)) accessforbidden();
 
 // Load translation files required by the page
@@ -55,69 +55,69 @@ if ($object->paid > 0 && count($echeances->lines) == 0) $pay_without_schedule =
  */
 
 if ($action == 'createecheancier' && empty($pay_without_schedule)) {
-    $db->begin();
-    $i = 1;
-    while ($i < $object->nbterm + 1) {
-        $date = GETPOST('hi_date'.$i, 'int');
-        $mens = price2num(GETPOST('mens'.$i));
-        $int = price2num(GETPOST('hi_interets'.$i));
-        $insurance = price2num(GETPOST('hi_insurance'.$i));
+	$db->begin();
+	$i = 1;
+	while ($i < $object->nbterm + 1) {
+		$date = GETPOST('hi_date'.$i, 'int');
+		$mens = price2num(GETPOST('mens'.$i));
+		$int = price2num(GETPOST('hi_interets'.$i));
+		$insurance = price2num(GETPOST('hi_insurance'.$i));
 
-        $new_echeance = new LoanSchedule($db);
+		$new_echeance = new LoanSchedule($db);
 
-        $new_echeance->fk_loan = $object->id;
-        $new_echeance->datec = dol_now();
-        $new_echeance->tms = dol_now();
-        $new_echeance->datep = $date;
-        $new_echeance->amount_capital = $mens - $int;
-        $new_echeance->amount_insurance = $insurance;
-        $new_echeance->amount_interest = $int;
-        $new_echeance->fk_typepayment = 3;
-        $new_echeance->fk_bank = 0;
-        $new_echeance->fk_user_creat = $user->id;
-        $new_echeance->fk_user_modif = $user->id;
-        $result = $new_echeance->create($user);
-        if ($result < 0) {
-            setEventMessages($new_echeance->error, $echeance->errors, 'errors');
-            $db->rollback();
-            unset($echeances->lines);
-            break;
-        }
-        $echeances->lines[] = $new_echeance;
-        $i++;
-    }
-    var_dump($result);
-    if ($result > 0) $db->commit();
+		$new_echeance->fk_loan = $object->id;
+		$new_echeance->datec = dol_now();
+		$new_echeance->tms = dol_now();
+		$new_echeance->datep = $date;
+		$new_echeance->amount_capital = $mens - $int;
+		$new_echeance->amount_insurance = $insurance;
+		$new_echeance->amount_interest = $int;
+		$new_echeance->fk_typepayment = 3;
+		$new_echeance->fk_bank = 0;
+		$new_echeance->fk_user_creat = $user->id;
+		$new_echeance->fk_user_modif = $user->id;
+		$result = $new_echeance->create($user);
+		if ($result < 0) {
+			setEventMessages($new_echeance->error, $echeance->errors, 'errors');
+			$db->rollback();
+			unset($echeances->lines);
+			break;
+		}
+		$echeances->lines[] = $new_echeance;
+		$i++;
+	}
+	var_dump($result);
+	if ($result > 0) $db->commit();
 }
 
 if ($action == 'updateecheancier' && empty($pay_without_schedule)) {
-    $db->begin();
-    $i = 1;
-    while ($i < $object->nbterm + 1) {
-        $mens = price2num(GETPOST('mens'.$i));
-        $int = price2num(GETPOST('hi_interets'.$i));
-        $id = GETPOST('hi_rowid'.$i);
-        $insurance = price2num(GETPOST('hi_insurance'.$i));
+	$db->begin();
+	$i = 1;
+	while ($i < $object->nbterm + 1) {
+		$mens = price2num(GETPOST('mens'.$i));
+		$int = price2num(GETPOST('hi_interets'.$i));
+		$id = GETPOST('hi_rowid'.$i);
+		$insurance = price2num(GETPOST('hi_insurance'.$i));
 
-        $new_echeance = new LoanSchedule($db);
-        $new_echeance->fetch($id);
-        $new_echeance->tms = dol_now();
-        $new_echeance->amount_capital = $mens - $int;
-        $new_echeance->amount_insurance = $insurance;
-        $new_echeance->amount_interest = $int;
-        $new_echeance->fk_user_modif = $user->id;
-        $result = $new_echeance->update($user, 0);
-        if ($result < 0) {
-            setEventMessages(null, $new_echeance->errors, 'errors');
-            $db->rollback();
-            $echeances->fetchAll($object->id);
-            break;
-        }
+		$new_echeance = new LoanSchedule($db);
+		$new_echeance->fetch($id);
+		$new_echeance->tms = dol_now();
+		$new_echeance->amount_capital = $mens - $int;
+		$new_echeance->amount_insurance = $insurance;
+		$new_echeance->amount_interest = $int;
+		$new_echeance->fk_user_modif = $user->id;
+		$result = $new_echeance->update($user, 0);
+		if ($result < 0) {
+			setEventMessages(null, $new_echeance->errors, 'errors');
+			$db->rollback();
+			$echeances->fetchAll($object->id);
+			break;
+		}
 
-        $echeances->lines[$i-1] = $new_echeance;
-        $i++;
-    }
-    if ($result > 0) $db->commit();
+		$echeances->lines[$i - 1] = $new_echeance;
+		$i++;
+	}
+	if ($result > 0) $db->commit();
 }
 
 /*
@@ -210,7 +210,7 @@ $(document).ready(function() {
 <?php
 
 if ($pay_without_schedule == 1)
-    print '<div class="warning">'.$langs->trans('CantUseScheduleWithLoanStartedToPaid').'</div>'."\n";
+	print '<div class="warning">'.$langs->trans('CantUseScheduleWithLoanStartedToPaid').'</div>'."\n";
 
 print '<form name="createecheancier" action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -298,15 +298,15 @@ if ($object->nbterm > 0 && count($echeances->lines) == 0)
 		print '<td class="center" id="capital'.$i.'">'.price($cap_rest, 0, '', 1, -1, -1, $conf->currency).'</td><input type="hidden" name="hi_capital'.$i.'" id ="hi_capital'.$i.'" value="'.$cap_rest.'">';
 		print '<td class="center">';
 		if (!empty($line->fk_bank))
-        {
-            print $langs->trans('Paid');
-            if (!empty($line->fk_payment_loan))
-                print '&nbsp;<a href="'.DOL_URL_ROOT.'/loan/payment/card.php?id='.$line->fk_payment_loan.'">('.img_object($langs->trans("Payment"), "payment").' '.$line->fk_payment_loan.')</a>';
-        }
+		{
+			print $langs->trans('Paid');
+			if (!empty($line->fk_payment_loan))
+				print '&nbsp;<a href="'.DOL_URL_ROOT.'/loan/payment/card.php?id='.$line->fk_payment_loan.'">('.img_object($langs->trans("Payment"), "payment").' '.$line->fk_payment_loan.')</a>';
+		}
 		elseif (!$printed)
 		{
-		    print '<a class="butAction" href="'.DOL_URL_ROOT.'/loan/payment/payment.php?id='.$object->id.'&amp;action=create">'.$langs->trans('DoPayment').'</a>';
-		    $printed = true;
+			print '<a class="butAction" href="'.DOL_URL_ROOT.'/loan/payment/payment.php?id='.$object->id.'&amp;action=create">'.$langs->trans('DoPayment').'</a>';
+			$printed = true;
 		}
 		print '</td>';
 		print '</tr>'."\n";
@@ -322,7 +322,7 @@ print '</br>';
 
 if (count($echeances->lines) == 0) $label = $langs->trans("Create");
 else $label = $langs->trans("Save");
-print '<div class="center"><input class="button" type="submit" value="'.$label.'" '.(($pay_without_schedule == 1)?'disabled title="'.$langs->trans('CantUseScheduleWithLoanStartedToPaid').'"':'').'title=""></div>';
+print '<div class="center"><input class="button" type="submit" value="'.$label.'" '.(($pay_without_schedule == 1) ? 'disabled title="'.$langs->trans('CantUseScheduleWithLoanStartedToPaid').'"' : '').'title=""></div>';
 print '</form>';
 
 // End of page
diff --git a/htdocs/mailmanspip/class/mailmanspip.class.php b/htdocs/mailmanspip/class/mailmanspip.class.php
index 46e8d017eca..a0a636dd136 100644
--- a/htdocs/mailmanspip/class/mailmanspip.class.php
+++ b/htdocs/mailmanspip/class/mailmanspip.class.php
@@ -39,403 +39,403 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
  */
 class MailmanSpip
 {
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    /**
+	/**
 	 * @var string Error code (or message)
 	 */
 	public $error = '';
 
-    /**
-     * @var string[]	Array of error strings
-     */
-    public $errors = array();
+	/**
+	 * @var string[]	Array of error strings
+	 */
+	public $errors = array();
 
-    public $mladded_ok;
-    public $mladded_ko;
-    public $mlremoved_ok;
-    public $mlremoved_ko;
+	public $mladded_ok;
+	public $mladded_ko;
+	public $mlremoved_ok;
+	public $mlremoved_ko;
 
 
-    /**
+	/**
 	 *	Constructor
 	 *
 	 *	@param 		DoliDB		$db		Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-    }
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
 
-    /**
-     * Function used to check if SPIP is enabled on the system
-     *
-     * @return boolean
-     */
-    public function isSpipEnabled()
-    {
-        if (defined("ADHERENT_USE_SPIP") && (ADHERENT_USE_SPIP == 1))
-        {
-            return true;
-        }
+	/**
+	 * Function used to check if SPIP is enabled on the system
+	 *
+	 * @return boolean
+	 */
+	public function isSpipEnabled()
+	{
+		if (defined("ADHERENT_USE_SPIP") && (ADHERENT_USE_SPIP == 1))
+		{
+			return true;
+		}
 
-        return false;
-    }
+		return false;
+	}
 
-    /**
-     * Function used to check if the SPIP config is correct
-     *
-     * @return boolean
-     */
-    public function checkSpipConfig()
-    {
-        if (defined('ADHERENT_SPIP_SERVEUR') && defined('ADHERENT_SPIP_USER') && defined('ADHERENT_SPIP_PASS') && defined('ADHERENT_SPIP_DB'))
-        {
-            if (ADHERENT_SPIP_SERVEUR != '' && ADHERENT_SPIP_USER != '' && ADHERENT_SPIP_PASS != '' && ADHERENT_SPIP_DB != '')
-            {
-                return true;
-            }
-        }
+	/**
+	 * Function used to check if the SPIP config is correct
+	 *
+	 * @return boolean
+	 */
+	public function checkSpipConfig()
+	{
+		if (defined('ADHERENT_SPIP_SERVEUR') && defined('ADHERENT_SPIP_USER') && defined('ADHERENT_SPIP_PASS') && defined('ADHERENT_SPIP_DB'))
+		{
+			if (ADHERENT_SPIP_SERVEUR != '' && ADHERENT_SPIP_USER != '' && ADHERENT_SPIP_PASS != '' && ADHERENT_SPIP_DB != '')
+			{
+				return true;
+			}
+		}
 
-        return false;
-    }
+		return false;
+	}
 
-    /**
-     * Function used to connect to SPIP
-     *
-     * @return boolean|DoliDB		Boolean of DoliDB
-     */
-    public function connectSpip()
-    {
-        $resource = getDoliDBInstance('mysql', ADHERENT_SPIP_SERVEUR, ADHERENT_SPIP_USER, ADHERENT_SPIP_PASS, ADHERENT_SPIP_DB, ADHERENT_SPIP_PORT);
+	/**
+	 * Function used to connect to SPIP
+	 *
+	 * @return boolean|DoliDB		Boolean of DoliDB
+	 */
+	public function connectSpip()
+	{
+		$resource = getDoliDBInstance('mysql', ADHERENT_SPIP_SERVEUR, ADHERENT_SPIP_USER, ADHERENT_SPIP_PASS, ADHERENT_SPIP_DB, ADHERENT_SPIP_PORT);
 
-        if ($resource->ok)
-        {
-            return $resource;
-        }
+		if ($resource->ok)
+		{
+			return $resource;
+		}
 
-        dol_syslog('Error when connecting to SPIP '.ADHERENT_SPIP_SERVEUR.' '.ADHERENT_SPIP_USER.' '.ADHERENT_SPIP_PASS.' '.ADHERENT_SPIP_DB, LOG_ERR);
+		dol_syslog('Error when connecting to SPIP '.ADHERENT_SPIP_SERVEUR.' '.ADHERENT_SPIP_USER.' '.ADHERENT_SPIP_PASS.' '.ADHERENT_SPIP_DB, LOG_ERR);
 
-        return false;
-    }
+		return false;
+	}
 
-    /**
-     * Function used to connect to Mailman
-     *
-     * @param	Adherent 	$object 	Object with the data
-     * @param	string 	$url    	Mailman URL to be called with patterns
-     * @param	string	$list		Name of mailing-list
-     * @return 	mixed				Boolean or string
-     */
-    private function callMailman($object, $url, $list)
-    {
-        global $conf;
+	/**
+	 * Function used to connect to Mailman
+	 *
+	 * @param	Adherent 	$object 	Object with the data
+	 * @param	string 	$url    	Mailman URL to be called with patterns
+	 * @param	string	$list		Name of mailing-list
+	 * @return 	mixed				Boolean or string
+	 */
+	private function callMailman($object, $url, $list)
+	{
+		global $conf;
 
-        //Patterns that are going to be replaced with their original value
-        $patterns = array(
-            '%LISTE%',
-            '%EMAIL%',
-            '%PASSWORD%',
-            '%MAILMAN_ADMINPW%'
-        );
-        $replace = array(
-            $list,
-            $object->email,
-            $object->pass,
-            $conf->global->ADHERENT_MAILMAN_ADMINPW
-        );
+		//Patterns that are going to be replaced with their original value
+		$patterns = array(
+			'%LISTE%',
+			'%EMAIL%',
+			'%PASSWORD%',
+			'%MAILMAN_ADMINPW%'
+		);
+		$replace = array(
+			$list,
+			$object->email,
+			$object->pass,
+			$conf->global->ADHERENT_MAILMAN_ADMINPW
+		);
 
-        $curl_url = str_replace($patterns, $replace, $url);
-        dol_syslog('Calling Mailman: '.$curl_url);
+		$curl_url = str_replace($patterns, $replace, $url);
+		dol_syslog('Calling Mailman: '.$curl_url);
 
-        $ch = curl_init($curl_url);
+		$ch = curl_init($curl_url);
 
-        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-        curl_setopt($ch, CURLOPT_FAILONERROR, true);
-        @curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1);
-        curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, empty($conf->global->MAIN_USE_CONNECT_TIMEOUT) ? 5 : $conf->global->MAIN_USE_CONNECT_TIMEOUT);
-        curl_setopt($ch, CURLOPT_TIMEOUT, empty($conf->global->MAIN_USE_RESPONSE_TIMEOUT) ? 30 : $conf->global->MAIN_USE_RESPONSE_TIMEOUT);
-        curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
-        curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
+		curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+		curl_setopt($ch, CURLOPT_FAILONERROR, true);
+		@curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1);
+		curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, empty($conf->global->MAIN_USE_CONNECT_TIMEOUT) ? 5 : $conf->global->MAIN_USE_CONNECT_TIMEOUT);
+		curl_setopt($ch, CURLOPT_TIMEOUT, empty($conf->global->MAIN_USE_RESPONSE_TIMEOUT) ? 30 : $conf->global->MAIN_USE_RESPONSE_TIMEOUT);
+		curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
+		curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
 
-        $result = curl_exec($ch);
-        dol_syslog('result curl_exec='.$result);
+		$result = curl_exec($ch);
+		dol_syslog('result curl_exec='.$result);
 
-        //An error was found, we store it in $this->error for later
-        if ($result === false || curl_errno($ch) > 0)
-        {
-            $this->error = curl_errno($ch).' '.curl_error($ch);
-            dol_syslog('Error using curl '.$this->error, LOG_ERR);
-        }
+		//An error was found, we store it in $this->error for later
+		if ($result === false || curl_errno($ch) > 0)
+		{
+			$this->error = curl_errno($ch).' '.curl_error($ch);
+			dol_syslog('Error using curl '.$this->error, LOG_ERR);
+		}
 
-        curl_close($ch);
+		curl_close($ch);
 
-        return $result;
-    }
+		return $result;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Fonction qui donne les droits redacteurs dans spip
-     *
-     *	@param	Adherent	$object		Object with data (->firstname, ->lastname, ->email and ->login)
-     *  @return	int					=0 if KO, >0 if OK
-     */
-    public function add_to_spip($object)
-    {
-        // phpcs:enable
-        dol_syslog(get_class($this)."::add_to_spip");
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Fonction qui donne les droits redacteurs dans spip
+	 *
+	 *	@param	Adherent	$object		Object with data (->firstname, ->lastname, ->email and ->login)
+	 *  @return	int					=0 if KO, >0 if OK
+	 */
+	public function add_to_spip($object)
+	{
+		// phpcs:enable
+		dol_syslog(get_class($this)."::add_to_spip");
 
-        if ($this->isSpipEnabled())
-        {
-            if ($this->checkSpipConfig())
-            {
-                $mydb = $this->connectSpip();
+		if ($this->isSpipEnabled())
+		{
+			if ($this->checkSpipConfig())
+			{
+				$mydb = $this->connectSpip();
 
-                if ($mydb)
-                {
-                    require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
-                    $mdpass = dol_hash($object->pass);
-                    $htpass = crypt($object->pass, makesalt());
-                    $query = "INSERT INTO spip_auteurs (nom, email, login, pass, htpass, alea_futur, statut) VALUES(\"".dolGetFirstLastname($object->firstname, $object->lastname)."\",\"".$object->email."\",\"".$object->login."\",\"$mdpass\",\"$htpass\",FLOOR(32000*RAND()),\"1comite\")";
+				if ($mydb)
+				{
+					require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
+					$mdpass = dol_hash($object->pass);
+					$htpass = crypt($object->pass, makesalt());
+					$query = "INSERT INTO spip_auteurs (nom, email, login, pass, htpass, alea_futur, statut) VALUES(\"".dolGetFirstLastname($object->firstname, $object->lastname)."\",\"".$object->email."\",\"".$object->login."\",\"$mdpass\",\"$htpass\",FLOOR(32000*RAND()),\"1comite\")";
 
-                    $result = $mydb->query($query);
+					$result = $mydb->query($query);
 
-                    $mydb->close();
+					$mydb->close();
 
-                    if ($result)
-                    {
-                        return 1;
-                    } else $this->error = $mydb->lasterror();
-                } else $this->error = 'Failed to connect to SPIP';
-            } else $this->error = 'BadSPIPConfiguration';
-        } else $this->error = 'SPIPNotEnabled';
+					if ($result)
+					{
+						return 1;
+					} else $this->error = $mydb->lasterror();
+				} else $this->error = 'Failed to connect to SPIP';
+			} else $this->error = 'BadSPIPConfiguration';
+		} else $this->error = 'SPIPNotEnabled';
 
-        return 0;
-    }
+		return 0;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Fonction qui enleve les droits redacteurs dans spip
-     *
-     *	@param	Adherent	$object		Object with data (->login)
-     *  @return	int					=0 if KO, >0 if OK
-     */
-    public function del_to_spip($object)
-    {
-        // phpcs:enable
-        dol_syslog(get_class($this)."::del_to_spip");
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Fonction qui enleve les droits redacteurs dans spip
+	 *
+	 *	@param	Adherent	$object		Object with data (->login)
+	 *  @return	int					=0 if KO, >0 if OK
+	 */
+	public function del_to_spip($object)
+	{
+		// phpcs:enable
+		dol_syslog(get_class($this)."::del_to_spip");
 
-        if ($this->isSpipEnabled())
-        {
-            if ($this->checkSpipConfig())
-            {
-                $mydb = $this->connectSpip();
+		if ($this->isSpipEnabled())
+		{
+			if ($this->checkSpipConfig())
+			{
+				$mydb = $this->connectSpip();
 
-                if ($mydb)
-                {
-                    $query = "DELETE FROM spip_auteurs WHERE login='".$object->login."'";
+				if ($mydb)
+				{
+					$query = "DELETE FROM spip_auteurs WHERE login='".$object->login."'";
 
-                    $result = $mydb->query($query);
+					$result = $mydb->query($query);
 
-                    $mydb->close();
+					$mydb->close();
 
-                    if ($result)
-                    {
-                        return 1;
-                    } else $this->error = $mydb->lasterror();
-                } else $this->error = 'Failed to connect to SPIP';
-            } else $this->error = 'BadSPIPConfiguration';
-        } else $this->error = 'SPIPNotEnabled';
+					if ($result)
+					{
+						return 1;
+					} else $this->error = $mydb->lasterror();
+				} else $this->error = 'Failed to connect to SPIP';
+			} else $this->error = 'BadSPIPConfiguration';
+		} else $this->error = 'SPIPNotEnabled';
 
-        return 0;
-    }
+		return 0;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Fonction qui dit si cet utilisateur est un redacteur existant dans spip
-     *
-     *	@param	object	$object		Object with data (->login)
-     *  @return int     			1=exists, 0=does not exists, -1=error
-     */
-    public function is_in_spip($object)
-    {
-        // phpcs:enable
-        if ($this->isSpipEnabled())
-        {
-            if ($this->checkSpipConfig())
-            {
-                $mydb = $this->connectSpip();
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Fonction qui dit si cet utilisateur est un redacteur existant dans spip
+	 *
+	 *	@param	object	$object		Object with data (->login)
+	 *  @return int     			1=exists, 0=does not exists, -1=error
+	 */
+	public function is_in_spip($object)
+	{
+		// phpcs:enable
+		if ($this->isSpipEnabled())
+		{
+			if ($this->checkSpipConfig())
+			{
+				$mydb = $this->connectSpip();
 
-                if ($mydb)
-                {
-                    $query = "SELECT login FROM spip_auteurs WHERE login='".$object->login."'";
+				if ($mydb)
+				{
+					$query = "SELECT login FROM spip_auteurs WHERE login='".$object->login."'";
 
-                    $result = $mydb->query($query);
+					$result = $mydb->query($query);
 
-                    if ($result)
-                    {
-                        if ($mydb->num_rows($result))
-                        {
-                            // nous avons au moins une reponse
-                            $mydb->close($result);
-                            return 1;
-                        } else {
-                            // nous n'avons pas de reponse => n'existe pas
-                            $mydb->close($result);
-                            return 0;
-                        }
-                    } else {
-                        $this->error = $mydb->lasterror();
-                        $mydb->close();
-                    }
-                } else $this->error = 'Failed to connect to SPIP';
-            } else $this->error = 'BadSPIPConfiguration';
-        } else $this->error = 'SPIPNotEnabled';
+					if ($result)
+					{
+						if ($mydb->num_rows($result))
+						{
+							// nous avons au moins une reponse
+							$mydb->close($result);
+							return 1;
+						} else {
+							// nous n'avons pas de reponse => n'existe pas
+							$mydb->close($result);
+							return 0;
+						}
+					} else {
+						$this->error = $mydb->lasterror();
+						$mydb->close();
+					}
+				} else $this->error = 'Failed to connect to SPIP';
+			} else $this->error = 'BadSPIPConfiguration';
+		} else $this->error = 'SPIPNotEnabled';
 
-        return -1;
-    }
+		return -1;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Subscribe an email to all mailing-lists
-     *
-     *	@param	Adherent	$object		Object with data (->email, ->pass, ->element, ->type)
-     *  @param	array	$listes    	To force mailing-list (string separated with ,)
-     *  @return	int		  			<0 if KO, >=0 if OK
-     */
-    public function add_to_mailman($object, $listes = '')
-    {
-        // phpcs:enable
-        global $conf, $langs, $user;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Subscribe an email to all mailing-lists
+	 *
+	 *	@param	Adherent	$object		Object with data (->email, ->pass, ->element, ->type)
+	 *  @param	array	$listes    	To force mailing-list (string separated with ,)
+	 *  @return	int		  			<0 if KO, >=0 if OK
+	 */
+	public function add_to_mailman($object, $listes = '')
+	{
+		// phpcs:enable
+		global $conf, $langs, $user;
 
-        dol_syslog(get_class($this)."::add_to_mailman");
+		dol_syslog(get_class($this)."::add_to_mailman");
 
-        $this->mladded_ok = array();
-        $this->mladded_ko = array();
+		$this->mladded_ok = array();
+		$this->mladded_ko = array();
 
-        if (!function_exists("curl_init"))
-        {
-            $langs->load("errors");
-            $this->error = $langs->trans("ErrorFunctionNotAvailableInPHP", "curl_init");
-            return -1;
-        }
+		if (!function_exists("curl_init"))
+		{
+			$langs->load("errors");
+			$this->error = $langs->trans("ErrorFunctionNotAvailableInPHP", "curl_init");
+			return -1;
+		}
 
-        if ($conf->adherent->enabled)	// Synchro for members
-        {
-	        if (!empty($conf->global->ADHERENT_MAILMAN_URL))
-	        {
-	            if ($listes == '' && !empty($conf->global->ADHERENT_MAILMAN_LISTS)) $lists = explode(',', $conf->global->ADHERENT_MAILMAN_LISTS);
-	            else $lists = explode(',', $listes);
+		if ($conf->adherent->enabled)	// Synchro for members
+		{
+			if (!empty($conf->global->ADHERENT_MAILMAN_URL))
+			{
+				if ($listes == '' && !empty($conf->global->ADHERENT_MAILMAN_LISTS)) $lists = explode(',', $conf->global->ADHERENT_MAILMAN_LISTS);
+				else $lists = explode(',', $listes);
 
-	            $categstatic = new Categorie($this->db);
+				$categstatic = new Categorie($this->db);
 
-	            foreach ($lists as $list)
-	            {
-	                // Filter on type something (ADHERENT_MAILMAN_LISTS = "mailinglist0,TYPE:typevalue:mailinglist1,CATEG:categvalue:mailinglist2")
-	                $tmp = explode(':', $list);
-	                if (!empty($tmp[2]))
-	                {
-	                    $list = $tmp[2];
-	                    if ($object->element == 'member' && $tmp[0] == 'TYPE' && $object->type != $tmp[1])    // Filter on member type label
-	                    {
-	                        dol_syslog("We ignore list ".$list." because object member type ".$object->type." does not match ".$tmp[1], LOG_DEBUG);
-	                        continue;
-	                    }
-	                    if ($object->element == 'member' && $tmp[0] == 'CATEG' && !in_array($tmp[1], $categstatic->containing($object->id, 'member', 'label')))    // Filter on member category
-	                    {
-	                        dol_syslog("We ignore list ".$list." because object member is not into category ".$tmp[1], LOG_DEBUG);
-	                        continue;
-	                    }
-	                }
+				foreach ($lists as $list)
+				{
+					// Filter on type something (ADHERENT_MAILMAN_LISTS = "mailinglist0,TYPE:typevalue:mailinglist1,CATEG:categvalue:mailinglist2")
+					$tmp = explode(':', $list);
+					if (!empty($tmp[2]))
+					{
+						$list = $tmp[2];
+						if ($object->element == 'member' && $tmp[0] == 'TYPE' && $object->type != $tmp[1])    // Filter on member type label
+						{
+							dol_syslog("We ignore list ".$list." because object member type ".$object->type." does not match ".$tmp[1], LOG_DEBUG);
+							continue;
+						}
+						if ($object->element == 'member' && $tmp[0] == 'CATEG' && !in_array($tmp[1], $categstatic->containing($object->id, 'member', 'label')))    // Filter on member category
+						{
+							dol_syslog("We ignore list ".$list." because object member is not into category ".$tmp[1], LOG_DEBUG);
+							continue;
+						}
+					}
 
-	                //We call Mailman to subscribe the user
-	                $result = $this->callMailman($object, $conf->global->ADHERENT_MAILMAN_URL, $list);
+					//We call Mailman to subscribe the user
+					$result = $this->callMailman($object, $conf->global->ADHERENT_MAILMAN_URL, $list);
 
 					if ($result === false)
 					{
 						$this->mladded_ko[$list] = $object->email;
-					    return -2;
+						return -2;
 					} else $this->mladded_ok[$list] = $object->email;
-	            }
-	            return count($lists);
-	        } else {
-	            $this->error = "ADHERENT_MAILMAN_URL not defined";
-	            return -1;
-	        }
-        }
-    }
+				}
+				return count($lists);
+			} else {
+				$this->error = "ADHERENT_MAILMAN_URL not defined";
+				return -1;
+			}
+		}
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Unsubscribe an email from all mailing-lists
-     *  Used when a user is resiliated
-     *
-     *	@param	Adherent	$object		Object with data (->email, ->pass, ->element, ->type)
-     *  @param	array	$listes     To force mailing-list (string separated with ,)
-     *  @return int         		<0 if KO, >=0 if OK
-     */
-    public function del_to_mailman($object, $listes = '')
-    {
-        // phpcs:enable
-        global $conf, $langs, $user;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Unsubscribe an email from all mailing-lists
+	 *  Used when a user is resiliated
+	 *
+	 *	@param	Adherent	$object		Object with data (->email, ->pass, ->element, ->type)
+	 *  @param	array	$listes     To force mailing-list (string separated with ,)
+	 *  @return int         		<0 if KO, >=0 if OK
+	 */
+	public function del_to_mailman($object, $listes = '')
+	{
+		// phpcs:enable
+		global $conf, $langs, $user;
 
-        dol_syslog(get_class($this)."::del_to_mailman");
+		dol_syslog(get_class($this)."::del_to_mailman");
 
-        $this->mlremoved_ok = array();
-        $this->mlremoved_ko = array();
+		$this->mlremoved_ok = array();
+		$this->mlremoved_ko = array();
 
-        if (!function_exists("curl_init"))
-        {
-            $langs->load("errors");
-            $this->error = $langs->trans("ErrorFunctionNotAvailableInPHP", "curl_init");
-            return -1;
-        }
+		if (!function_exists("curl_init"))
+		{
+			$langs->load("errors");
+			$this->error = $langs->trans("ErrorFunctionNotAvailableInPHP", "curl_init");
+			return -1;
+		}
 
-        if ($conf->adherent->enabled)	// Synchro for members
-        {
-	        if (!empty($conf->global->ADHERENT_MAILMAN_UNSUB_URL))
-	        {
-	            if ($listes == '' && !empty($conf->global->ADHERENT_MAILMAN_LISTS)) $lists = explode(',', $conf->global->ADHERENT_MAILMAN_LISTS);
-	            else $lists = explode(',', $listes);
+		if ($conf->adherent->enabled)	// Synchro for members
+		{
+			if (!empty($conf->global->ADHERENT_MAILMAN_UNSUB_URL))
+			{
+				if ($listes == '' && !empty($conf->global->ADHERENT_MAILMAN_LISTS)) $lists = explode(',', $conf->global->ADHERENT_MAILMAN_LISTS);
+				else $lists = explode(',', $listes);
 
-	            $categstatic = new Categorie($this->db);
+				$categstatic = new Categorie($this->db);
 
-	            foreach ($lists as $list)
-	            {
-	            	// Filter on type something (ADHERENT_MAILMAN_LISTS = "mailinglist0,TYPE:typevalue:mailinglist1,CATEG:categvalue:mailinglist2")
-	            	$tmp = explode(':', $list);
-	            	if (!empty($tmp[2]))
-	            	{
-	            		$list = $tmp[2];
-	            		if ($object->element == 'member' && $tmp[0] == 'TYPE' && $object->type != $tmp[1])    // Filter on member type label
-	            		{
-	            			dol_syslog("We ignore list ".$list." because object member type ".$object->type." does not match ".$tmp[1], LOG_DEBUG);
-	            			continue;
-	            		}
-	            		if ($object->element == 'member' && $tmp[0] == 'CATEG' && !in_array($tmp[1], $categstatic->containing($object->id, 'member', 'label')))    // Filter on member category
-	            		{
-	            			dol_syslog("We ignore list ".$list." because object member is not into category ".$tmp[1], LOG_DEBUG);
-	            			continue;
-	            		}
-	            	}
+				foreach ($lists as $list)
+				{
+					// Filter on type something (ADHERENT_MAILMAN_LISTS = "mailinglist0,TYPE:typevalue:mailinglist1,CATEG:categvalue:mailinglist2")
+					$tmp = explode(':', $list);
+					if (!empty($tmp[2]))
+					{
+						$list = $tmp[2];
+						if ($object->element == 'member' && $tmp[0] == 'TYPE' && $object->type != $tmp[1])    // Filter on member type label
+						{
+							dol_syslog("We ignore list ".$list." because object member type ".$object->type." does not match ".$tmp[1], LOG_DEBUG);
+							continue;
+						}
+						if ($object->element == 'member' && $tmp[0] == 'CATEG' && !in_array($tmp[1], $categstatic->containing($object->id, 'member', 'label')))    // Filter on member category
+						{
+							dol_syslog("We ignore list ".$list." because object member is not into category ".$tmp[1], LOG_DEBUG);
+							continue;
+						}
+					}
 
-	                //We call Mailman to unsubscribe the user
-	                $result = $this->callMailman($object, $conf->global->ADHERENT_MAILMAN_UNSUB_URL, $list);
+					//We call Mailman to unsubscribe the user
+					$result = $this->callMailman($object, $conf->global->ADHERENT_MAILMAN_UNSUB_URL, $list);
 
 					if ($result === false)
 					{
 						$this->mlremoved_ko[$list] = $object->email;
-					    return -2;
+						return -2;
 					} else $this->mlremoved_ok[$list] = $object->email;
-	            }
-	            return count($lists);
-	        } else {
-	            $this->error = "ADHERENT_MAILMAN_UNSUB_URL not defined";
-	            return -1;
-	        }
-        }
-    }
+				}
+				return count($lists);
+			} else {
+				$this->error = "ADHERENT_MAILMAN_UNSUB_URL not defined";
+				return -1;
+			}
+		}
+	}
 }
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 06cfa6edfac..d580029a5cc 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -61,13 +61,13 @@ function testSqlAndScriptInject($val, $type)
 	// Decode string first
 	// So <svg o&#110;load='console.log(&quot;123&quot;)' become <svg onload='console.log(&quot;123&quot;)'
 	// So "&colon;&apos;" become ":'" (due to ENT_HTML5)
-	$val = html_entity_decode($val, ENT_QUOTES|ENT_HTML5);
+	$val = html_entity_decode($val, ENT_QUOTES | ENT_HTML5);
 
 	// TODO loop to decode until no more thing to decode ?
 
 	// We clean string because some hacks try to obfuscate evil strings by inserting non printable chars. Example: 'java(ascci09)scr(ascii00)ipt' is processed like 'javascript' (whatever is place of evil ascii char)
 	// We should use dol_string_nounprintableascii but function is not yet loaded/available
-	$val = preg_replace('/[\x00-\x1F\x7F]/u', '', $val);	// /u operator makes UTF8 valid characters being ignored so are not included into the replace
+	$val = preg_replace('/[\x00-\x1F\x7F]/u', '', $val); // /u operator makes UTF8 valid characters being ignored so are not included into the replace
 
 	$inj = 0;
 	// For SQL Injection (only GET are used to be included into bad escaped SQL requests)
@@ -80,7 +80,7 @@ function testSqlAndScriptInject($val, $type)
 		$inj += preg_match('/into\s+(outfile|dumpfile)/i', $val);
 		$inj += preg_match('/user\s*\(/i', $val); // avoid to use function user() that return current database login
 		$inj += preg_match('/information_schema/i', $val); // avoid to use request that read information_schema database
-		$inj += preg_match('/<svg/i', $val);	// <svg can be allowed in POST
+		$inj += preg_match('/<svg/i', $val); // <svg can be allowed in POST
 	}
 	if ($type == 3)
 	{
@@ -124,7 +124,7 @@ function testSqlAndScriptInject($val, $type)
 	$inj += preg_match('/vbscript\s*:/i', $val);
 	// For XSS Injection done by adding javascript closing html tags like with onmousemove, etc... (closing a src or href tag with not cleaned param)
 	if ($type == 1) {
-		$val = str_replace('enclosure="', 'enclosure=X', $val);		// We accept enclosure="
+		$val = str_replace('enclosure="', 'enclosure=X', $val); // We accept enclosure="
 		$inj += preg_match('/"/i', $val); // We refused " in GET parameters value.
 	}
 	if ($type == 2) $inj += preg_match('/[;"]/', $val); // PHP_SELF is a file system path. It can contains spaces.
@@ -232,7 +232,7 @@ require_once 'master.inc.php';
 // Init session. Name of session is specific to Dolibarr instance.
 // Must be done after the include of master.inc.php so $conf file is loaded and vars like $dolibarr_main_force_https are set.
 // Note: the function dol_getprefix may have been redefined to return a different key to manage another area to protect.
-$prefix = dol_getprefix('');		// This uses the $conf file
+$prefix = dol_getprefix(''); // This uses the $conf file
 $sessionname = 'DOLSESSID_'.$prefix;
 $sessiontimeout = 'DOLSESSTIMEOUT_'.$prefix;
 if (!empty($_COOKIE[$sessiontimeout])) ini_set('session.gc_maxlifetime', $_COOKIE[$sessiontimeout]);
@@ -251,13 +251,14 @@ register_shutdown_function('dol_shutdown');
 // Load debugbar
 if (!empty($conf->debugbar->enabled) && !GETPOST('dol_use_jmobile') && empty($_SESSION['dol_use_jmobile']))
 {
-    global $debugbar;
-    include_once DOL_DOCUMENT_ROOT.'/debugbar/class/DebugBar.php';
-    $debugbar = new DolibarrDebugBar();
-    $renderer = $debugbar->getRenderer();
-    $conf->global->MAIN_HTML_HEADER .= $renderer->renderHead();
+	global $debugbar;
+	include_once DOL_DOCUMENT_ROOT.'/debugbar/class/DebugBar.php';
+	$debugbar = new DolibarrDebugBar();
+	$renderer = $debugbar->getRenderer();
+	if (empty($conf->global->MAIN_HTML_HEADER)) $conf->global->MAIN_HTML_HEADER = '';
+	$conf->global->MAIN_HTML_HEADER .= $renderer->renderHead();
 
-    $debugbar['time']->startMeasure('pageaftermaster', 'Page generation (after environment init)');
+	$debugbar['time']->startMeasure('pageaftermaster', 'Page generation (after environment init)');
 }
 
 // Detection browser
@@ -420,7 +421,7 @@ if ((!defined('NOCSRFCHECK') && empty($dolibarr_nocsrfcheck) && !empty($conf->gl
 if (GETPOSTISSET('disablemodules'))  $_SESSION["disablemodules"] = GETPOST('disablemodules', 'alpha');
 if (!empty($_SESSION["disablemodules"]))
 {
-    $modulepartkeys = array('css', 'js', 'tabs', 'triggers', 'login', 'substitutions', 'menus', 'theme', 'sms', 'tpl', 'barcode', 'models', 'societe', 'hooks', 'dir', 'syslog', 'tpllinkable', 'contactelement', 'moduleforexternal');
+	$modulepartkeys = array('css', 'js', 'tabs', 'triggers', 'login', 'substitutions', 'menus', 'theme', 'sms', 'tpl', 'barcode', 'models', 'societe', 'hooks', 'dir', 'syslog', 'tpllinkable', 'contactelement', 'moduleforexternal');
 
 	$disabled_modules = explode(',', $_SESSION["disablemodules"]);
 	foreach ($disabled_modules as $module)
@@ -431,7 +432,7 @@ if (!empty($_SESSION["disablemodules"]))
 			$conf->$module->enabled = false;
 			foreach ($modulepartkeys as $modulepartkey)
 			{
-			    unset($conf->modules_parts[$modulepartkey][$module]);
+				unset($conf->modules_parts[$modulepartkey][$module]);
 			}
 			if ($module == 'fournisseur')		// Special case
 			{
@@ -451,7 +452,7 @@ if (is_array($modulepart) && count($modulepart) > 0)
 		if (in_array($module, $modulepart))
 		{
 			$conf->modulepart = $module;
-            break;
+			break;
 		}
 	}
 }
@@ -649,14 +650,14 @@ if (!defined('NOLOGIN'))
 			if (defined('NOREDIRECTBYMAINTOLOGIN')) return 'ERROR_NOT_LOGGED';
 			else {
 				if ($_SERVER["HTTP_USER_AGENT"] == 'securitytest') {
-					http_response_code(401);		// It makes easier to understand if session was broken during security tests
+					http_response_code(401); // It makes easier to understand if session was broken during security tests
 				}
 				dol_loginfunction($langs, $conf, (!empty($mysoc) ? $mysoc : ''));
 			}
 			exit;
 		}
 
-		$resultFetchUser = $user->fetch('', $login, '', 1, ($entitytotest > 0 ? $entitytotest : -1));	// login was retrieved previously when checking password.
+		$resultFetchUser = $user->fetch('', $login, '', 1, ($entitytotest > 0 ? $entitytotest : -1)); // login was retrieved previously when checking password.
 		if ($resultFetchUser <= 0)
 		{
 			dol_syslog('User not found, connexion refused');
@@ -757,48 +758,48 @@ if (!defined('NOLOGIN'))
 			header('Location: '.DOL_URL_ROOT.'/index.php'.(count($paramsurl) ? '?'.implode('&', $paramsurl) : ''));
 			exit;
 		} else {
-		    // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
-		    $hookmanager->initHooks(array('main'));
+			// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+			$hookmanager->initHooks(array('main'));
 
-		    // Code for search criteria persistence.
-		    if (!empty($_GET['save_lastsearch_values']))    // We must use $_GET here
-		    {
-			    $relativepathstring = preg_replace('/\?.*$/', '', $_SERVER["HTTP_REFERER"]);
-			    $relativepathstring = preg_replace('/^https?:\/\/[^\/]*/', '', $relativepathstring); // Get full path except host server
-			    // Clean $relativepathstring
-   			    if (constant('DOL_URL_ROOT')) $relativepathstring = preg_replace('/^'.preg_quote(constant('DOL_URL_ROOT'), '/').'/', '', $relativepathstring);
-			    $relativepathstring = preg_replace('/^\//', '', $relativepathstring);
-			    $relativepathstring = preg_replace('/^custom\//', '', $relativepathstring);
-			    //var_dump($relativepathstring);
+			// Code for search criteria persistence.
+			if (!empty($_GET['save_lastsearch_values']))    // We must use $_GET here
+			{
+				$relativepathstring = preg_replace('/\?.*$/', '', $_SERVER["HTTP_REFERER"]);
+				$relativepathstring = preg_replace('/^https?:\/\/[^\/]*/', '', $relativepathstring); // Get full path except host server
+				// Clean $relativepathstring
+   				if (constant('DOL_URL_ROOT')) $relativepathstring = preg_replace('/^'.preg_quote(constant('DOL_URL_ROOT'), '/').'/', '', $relativepathstring);
+				$relativepathstring = preg_replace('/^\//', '', $relativepathstring);
+				$relativepathstring = preg_replace('/^custom\//', '', $relativepathstring);
+				//var_dump($relativepathstring);
 
-			    // We click on a link that leave a page we have to save search criteria, contextpage, limit and page. We save them from tmp to no tmp
-			    if (!empty($_SESSION['lastsearch_values_tmp_'.$relativepathstring]))
-			    {
-			    	$_SESSION['lastsearch_values_'.$relativepathstring] = $_SESSION['lastsearch_values_tmp_'.$relativepathstring];
-				    unset($_SESSION['lastsearch_values_tmp_'.$relativepathstring]);
-			    }
-			    if (!empty($_SESSION['lastsearch_contextpage_tmp_'.$relativepathstring]))
-			    {
-			    	$_SESSION['lastsearch_contextpage_'.$relativepathstring] = $_SESSION['lastsearch_contextpage_tmp_'.$relativepathstring];
-			    	unset($_SESSION['lastsearch_contextpage_tmp_'.$relativepathstring]);
-			    }
-			    if (!empty($_SESSION['lastsearch_page_tmp_'.$relativepathstring]) && $_SESSION['lastsearch_page_tmp_'.$relativepathstring] > 0)
-			    {
-			    	$_SESSION['lastsearch_page_'.$relativepathstring] = $_SESSION['lastsearch_page_tmp_'.$relativepathstring];
-			    	unset($_SESSION['lastsearch_page_tmp_'.$relativepathstring]);
-			    }
-			    if (!empty($_SESSION['lastsearch_limit_tmp_'.$relativepathstring]) && $_SESSION['lastsearch_limit_tmp_'.$relativepathstring] != $conf->liste_limit)
-			    {
-			    	$_SESSION['lastsearch_limit_'.$relativepathstring] = $_SESSION['lastsearch_limit_tmp_'.$relativepathstring];
-			    	unset($_SESSION['lastsearch_limit_tmp_'.$relativepathstring]);
-			    }
-		    }
+				// We click on a link that leave a page we have to save search criteria, contextpage, limit and page. We save them from tmp to no tmp
+				if (!empty($_SESSION['lastsearch_values_tmp_'.$relativepathstring]))
+				{
+					$_SESSION['lastsearch_values_'.$relativepathstring] = $_SESSION['lastsearch_values_tmp_'.$relativepathstring];
+					unset($_SESSION['lastsearch_values_tmp_'.$relativepathstring]);
+				}
+				if (!empty($_SESSION['lastsearch_contextpage_tmp_'.$relativepathstring]))
+				{
+					$_SESSION['lastsearch_contextpage_'.$relativepathstring] = $_SESSION['lastsearch_contextpage_tmp_'.$relativepathstring];
+					unset($_SESSION['lastsearch_contextpage_tmp_'.$relativepathstring]);
+				}
+				if (!empty($_SESSION['lastsearch_page_tmp_'.$relativepathstring]) && $_SESSION['lastsearch_page_tmp_'.$relativepathstring] > 0)
+				{
+					$_SESSION['lastsearch_page_'.$relativepathstring] = $_SESSION['lastsearch_page_tmp_'.$relativepathstring];
+					unset($_SESSION['lastsearch_page_tmp_'.$relativepathstring]);
+				}
+				if (!empty($_SESSION['lastsearch_limit_tmp_'.$relativepathstring]) && $_SESSION['lastsearch_limit_tmp_'.$relativepathstring] != $conf->liste_limit)
+				{
+					$_SESSION['lastsearch_limit_'.$relativepathstring] = $_SESSION['lastsearch_limit_tmp_'.$relativepathstring];
+					unset($_SESSION['lastsearch_limit_tmp_'.$relativepathstring]);
+				}
+			}
 
-		    $action = '';
-		    $reshook = $hookmanager->executeHooks('updateSession', array(), $user, $action);
-		    if ($reshook < 0) {
-			    setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-		    }
+			$action = '';
+			$reshook = $hookmanager->executeHooks('updateSession', array(), $user, $action);
+			if ($reshook < 0) {
+				setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+			}
 		}
 	}
 
@@ -925,7 +926,7 @@ if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) && !empty($user->conf->MAI
 }
 
 // set MAIN_OPTIMIZEFORCOLORBLIND for user
-$conf->global->MAIN_OPTIMIZEFORCOLORBLIND = $user->conf->MAIN_OPTIMIZEFORCOLORBLIND;
+$conf->global->MAIN_OPTIMIZEFORCOLORBLIND = empty($user->conf->MAIN_OPTIMIZEFORCOLORBLIND) ? '' : $user->conf->MAIN_OPTIMIZEFORCOLORBLIND;
 
 // Set terminal output option according to conf->browser.
 if (GETPOST('dol_hide_leftmenu', 'int') || !empty($_SESSION['dol_hide_leftmenu']))               $conf->dol_hide_leftmenu = 1;
@@ -1104,8 +1105,8 @@ if (!function_exists("llxHeader"))
 		// If theme MD and classic layer, we open the menulayer by default.
 		if ($conf->theme == 'md' && !in_array($conf->browser->layout, array('phone', 'tablet')) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
 		{
-		    global $mainmenu;
-		    if ($mainmenu != 'website') $tmpcsstouse = $morecssonbody; // We do not use sidebar-collpase by default to have menuhider open by default.
+			global $mainmenu;
+			if ($mainmenu != 'website') $tmpcsstouse = $morecssonbody; // We do not use sidebar-collpase by default to have menuhider open by default.
 		}
 
 		if (!empty($conf->global->MAIN_OPTIMIZEFORCOLORBLIND)) {
@@ -1162,8 +1163,8 @@ function top_httphead($contenttype = 'text/html', $forcenocache = 0)
 		//	// A default security policy that keep usage of js external component like ckeditor, stripe, google, working
 		//	$contentsecuritypolicy = "font-src *; img-src *; style-src * 'unsafe-inline' 'unsafe-eval'; default-src 'self' *.stripe.com 'unsafe-inline' 'unsafe-eval'; script-src 'self' *.stripe.com 'unsafe-inline' 'unsafe-eval'; frame-src 'self' *.stripe.com; connect-src 'self';";
 		//}
-		//else $contentsecuritypolicy = $conf->global->MAIN_HTTP_CONTENT_SECURITY_POLICY;
-		$contentsecuritypolicy = $conf->global->MAIN_HTTP_CONTENT_SECURITY_POLICY;
+		//else
+		$contentsecuritypolicy = empty($conf->global->MAIN_HTTP_CONTENT_SECURITY_POLICY) ? '' : $conf->global->MAIN_HTTP_CONTENT_SECURITY_POLICY;
 
 		if (!is_object($hookmanager)) $hookmanager = new HookManager($db);
 		$hookmanager->initHooks(array("main"));
@@ -1224,10 +1225,10 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
 	//print '<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr">'."\n";
 	if (empty($disablehead))
 	{
-	    if (!is_object($hookmanager)) $hookmanager = new HookManager($db);
-	    $hookmanager->initHooks(array("main"));
+		if (!is_object($hookmanager)) $hookmanager = new HookManager($db);
+		$hookmanager->initHooks(array("main"));
 
-	    $ext = 'layout='.$conf->browser->layout.'&amp;version='.urlencode(DOL_VERSION);
+		$ext = 'layout='.$conf->browser->layout.'&amp;version='.urlencode(DOL_VERSION);
 
 		print "<head>\n";
 
@@ -1249,16 +1250,16 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
 		//if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) print '<link rel="copyright" title="GNU General Public License" href="https://www.gnu.org/copyleft/gpl.html#SEC1">'."\n";
 		//if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) print '<link rel="author" title="Dolibarr Development Team" href="https://www.dolibarr.org">'."\n";
 
-        // Mobile appli like icon
-        $manifest = DOL_URL_ROOT.'/theme/'.$conf->theme.'/manifest.json.php';
-        if (!empty($manifest)) {
-            print '<link rel="manifest" href="'.$manifest.'" />'."\n";
-        }
+		// Mobile appli like icon
+		$manifest = DOL_URL_ROOT.'/theme/'.$conf->theme.'/manifest.json.php';
+		if (!empty($manifest)) {
+			print '<link rel="manifest" href="'.$manifest.'" />'."\n";
+		}
 
-        if (!empty($conf->global->THEME_ELDY_TOPMENU_BACK1)) {
-            // TODO: use auto theme color switch
-            print '<meta name="theme-color" content="rgb('.$conf->global->THEME_ELDY_TOPMENU_BACK1.')">'."\n";
-        }
+		if (!empty($conf->global->THEME_ELDY_TOPMENU_BACK1)) {
+			// TODO: use auto theme color switch
+			print '<meta name="theme-color" content="rgb('.$conf->global->THEME_ELDY_TOPMENU_BACK1.')">'."\n";
+		}
 
 		// Auto refresh page
 		if (GETPOST('autorefresh', 'int') > 0) print '<meta http-equiv="refresh" content="'.GETPOST('autorefresh', 'int').'">';
@@ -1314,8 +1315,8 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
 		if (!defined('DISABLE_FONT_AWSOME'))
 		{
 			print '<!-- Includes CSS for font awesome -->'."\n";
-            print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/theme/common/fontawesome-5/css/all.min.css'.($ext ? '?'.$ext : '').'">'."\n";
-            print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/theme/common/fontawesome-5/css/v4-shims.min.css'.($ext ? '?'.$ext : '').'">'."\n";
+			print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/theme/common/fontawesome-5/css/all.min.css'.($ext ? '?'.$ext : '').'">'."\n";
+			print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/theme/common/fontawesome-5/css/v4-shims.min.css'.($ext ? '?'.$ext : '').'">'."\n";
 		}
 
 		print '<!-- Includes CSS for Dolibarr theme -->'."\n";
@@ -1362,12 +1363,12 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
 		{
 			foreach ($arrayofcss as $cssfile)
 			{
-			    if (preg_match('/^(http|\/\/)/i', $cssfile))
-			    {
-			        $urltofile = $cssfile;
-			    } else {
-			        $urltofile = dol_buildpath($cssfile, 1);
-			    }
+				if (preg_match('/^(http|\/\/)/i', $cssfile))
+				{
+					$urltofile = $cssfile;
+				} else {
+					$urltofile = dol_buildpath($cssfile, 1);
+				}
 				print '<!-- Includes CSS added by page -->'."\n".'<link rel="stylesheet" type="text/css" title="default" href="'.$urltofile;
 				// We add params only if page is not static, because some web server setup does not return content type text/css if url has parameters and browser cache is not used.
 				if (!preg_match('/\.css$/i', $cssfile)) print $themeparam;
@@ -1418,108 +1419,108 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
 				print '<script src="'.DOL_URL_ROOT.'/core/js/editinplace.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
 				print '<script src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jeditable/jquery.jeditable.ckeditor.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
 			}
-            // jQuery Timepicker
-            if (!empty($conf->global->MAIN_USE_JQUERY_TIMEPICKER) || defined('REQUIRE_JQUERY_TIMEPICKER')) {
-            	print '<script src="'.DOL_URL_ROOT.'/includes/jquery/plugins/timepicker/jquery-ui-timepicker-addon.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
-            	print '<script src="'.DOL_URL_ROOT.'/core/js/timepicker.js.php?lang='.$langs->defaultlang.($ext ? '&amp;'.$ext : '').'"></script>'."\n";
-            }
-            if (!defined('DISABLE_SELECT2') && (!empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) || defined('REQUIRE_JQUERY_MULTISELECT'))) {
-                // jQuery plugin "mutiselect", "multiple-select", "select2", ...
-            	$tmpplugin = empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) ?constant('REQUIRE_JQUERY_MULTISELECT') : $conf->global->MAIN_USE_JQUERY_MULTISELECT;
-            	print '<script src="'.DOL_URL_ROOT.'/includes/jquery/plugins/'.$tmpplugin.'/dist/js/'.$tmpplugin.'.full.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n"; // We include full because we need the support of containerCssClass
-            }
-            if (! defined('DISABLE_MULTISELECT'))     // jQuery plugin "mutiselect" to select with checkboxes. Can be removed once we have an enhanced search tool
-            {
-            	print '<script src="'.DOL_URL_ROOT.'/includes/jquery/plugins/multiselect/jquery.multi-select.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-            }
+			// jQuery Timepicker
+			if (!empty($conf->global->MAIN_USE_JQUERY_TIMEPICKER) || defined('REQUIRE_JQUERY_TIMEPICKER')) {
+				print '<script src="'.DOL_URL_ROOT.'/includes/jquery/plugins/timepicker/jquery-ui-timepicker-addon.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
+				print '<script src="'.DOL_URL_ROOT.'/core/js/timepicker.js.php?lang='.$langs->defaultlang.($ext ? '&amp;'.$ext : '').'"></script>'."\n";
+			}
+			if (!defined('DISABLE_SELECT2') && (!empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) || defined('REQUIRE_JQUERY_MULTISELECT'))) {
+				// jQuery plugin "mutiselect", "multiple-select", "select2", ...
+				$tmpplugin = empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) ?constant('REQUIRE_JQUERY_MULTISELECT') : $conf->global->MAIN_USE_JQUERY_MULTISELECT;
+				print '<script src="'.DOL_URL_ROOT.'/includes/jquery/plugins/'.$tmpplugin.'/dist/js/'.$tmpplugin.'.full.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n"; // We include full because we need the support of containerCssClass
+			}
+			if (!defined('DISABLE_MULTISELECT'))     // jQuery plugin "mutiselect" to select with checkboxes. Can be removed once we have an enhanced search tool
+			{
+				print '<script src="'.DOL_URL_ROOT.'/includes/jquery/plugins/multiselect/jquery.multi-select.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
+			}
 		}
 
-        if (!$disablejs && !empty($conf->use_javascript_ajax)) {
-            // CKEditor
-        	if ((!empty($conf->fckeditor->enabled) && (empty($conf->global->FCKEDITOR_EDITORNAME) || $conf->global->FCKEDITOR_EDITORNAME == 'ckeditor') && !defined('DISABLE_CKEDITOR')) || defined('FORCE_CKEDITOR'))
-            {
-                print '<!-- Includes JS for CKEditor -->'."\n";
-                $pathckeditor = DOL_URL_ROOT.'/includes/ckeditor/ckeditor/';
-                $jsckeditor = 'ckeditor.js';
-                if (constant('JS_CKEDITOR')) {
-                    // To use external ckeditor 4 js lib
-                	$pathckeditor = constant('JS_CKEDITOR');
-                }
-                print '<script><!-- enable ckeditor by main.inc.php -->';
-                print 'var CKEDITOR_BASEPATH = \''.$pathckeditor.'\';'."\n";
-                print 'var ckeditorConfig = \''.dol_buildpath($themesubdir.'/theme/'.$conf->theme.'/ckeditor/config.js'.($ext ? '?'.$ext : ''), 1).'\';'."\n"; // $themesubdir='' in standard usage
-                print 'var ckeditorFilebrowserBrowseUrl = \''.DOL_URL_ROOT.'/core/filemanagerdol/browser/default/browser.php?Connector='.DOL_URL_ROOT.'/core/filemanagerdol/connectors/php/connector.php\';'."\n";
-                print 'var ckeditorFilebrowserImageBrowseUrl = \''.DOL_URL_ROOT.'/core/filemanagerdol/browser/default/browser.php?Type=Image&Connector='.DOL_URL_ROOT.'/core/filemanagerdol/connectors/php/connector.php\';'."\n";
-                print '</script>'."\n";
-                print '<script src="'.$pathckeditor.$jsckeditor.($ext ? '?'.$ext : '').'"></script>'."\n";
-                print '<script>';
-                if (GETPOST('mode', 'aZ09') == 'Full_inline')
-                {
-                	print 'CKEDITOR.disableAutoInline = false;'."\n";
-                } else {
-                	print 'CKEDITOR.disableAutoInline = true;'."\n";
-                }
-                print '</script>'."\n";
-            }
+		if (!$disablejs && !empty($conf->use_javascript_ajax)) {
+			// CKEditor
+			if ((!empty($conf->fckeditor->enabled) && (empty($conf->global->FCKEDITOR_EDITORNAME) || $conf->global->FCKEDITOR_EDITORNAME == 'ckeditor') && !defined('DISABLE_CKEDITOR')) || defined('FORCE_CKEDITOR'))
+			{
+				print '<!-- Includes JS for CKEditor -->'."\n";
+				$pathckeditor = DOL_URL_ROOT.'/includes/ckeditor/ckeditor/';
+				$jsckeditor = 'ckeditor.js';
+				if (constant('JS_CKEDITOR')) {
+					// To use external ckeditor 4 js lib
+					$pathckeditor = constant('JS_CKEDITOR');
+				}
+				print '<script><!-- enable ckeditor by main.inc.php -->';
+				print 'var CKEDITOR_BASEPATH = \''.$pathckeditor.'\';'."\n";
+				print 'var ckeditorConfig = \''.dol_buildpath($themesubdir.'/theme/'.$conf->theme.'/ckeditor/config.js'.($ext ? '?'.$ext : ''), 1).'\';'."\n"; // $themesubdir='' in standard usage
+				print 'var ckeditorFilebrowserBrowseUrl = \''.DOL_URL_ROOT.'/core/filemanagerdol/browser/default/browser.php?Connector='.DOL_URL_ROOT.'/core/filemanagerdol/connectors/php/connector.php\';'."\n";
+				print 'var ckeditorFilebrowserImageBrowseUrl = \''.DOL_URL_ROOT.'/core/filemanagerdol/browser/default/browser.php?Type=Image&Connector='.DOL_URL_ROOT.'/core/filemanagerdol/connectors/php/connector.php\';'."\n";
+				print '</script>'."\n";
+				print '<script src="'.$pathckeditor.$jsckeditor.($ext ? '?'.$ext : '').'"></script>'."\n";
+				print '<script>';
+				if (GETPOST('mode', 'aZ09') == 'Full_inline')
+				{
+					print 'CKEDITOR.disableAutoInline = false;'."\n";
+				} else {
+					print 'CKEDITOR.disableAutoInline = true;'."\n";
+				}
+				print '</script>'."\n";
+			}
 
-            // Browser notifications (if NOREQUIREMENU is on, it is mostly a page for popup, so we do not enable notif too. We hide also for public pages).
-            if (!defined('NOBROWSERNOTIF') && !defined('NOREQUIREMENU') && !defined('NOLOGIN'))
-            {
-                $enablebrowsernotif = false;
-                if (!empty($conf->agenda->enabled) && !empty($conf->global->AGENDA_REMINDER_BROWSER)) $enablebrowsernotif = true;
-                if ($conf->browser->layout == 'phone') $enablebrowsernotif = false;
-                if ($enablebrowsernotif)
-                {
-                    print '<!-- Includes JS of Dolibarr (browser layout = '.$conf->browser->layout.')-->'."\n";
-                    print '<script src="'.DOL_URL_ROOT.'/core/js/lib_notification.js.php'.($ext ? '?'.$ext : '').'"></script>'."\n";
-                }
-            }
+			// Browser notifications (if NOREQUIREMENU is on, it is mostly a page for popup, so we do not enable notif too. We hide also for public pages).
+			if (!defined('NOBROWSERNOTIF') && !defined('NOREQUIREMENU') && !defined('NOLOGIN'))
+			{
+				$enablebrowsernotif = false;
+				if (!empty($conf->agenda->enabled) && !empty($conf->global->AGENDA_REMINDER_BROWSER)) $enablebrowsernotif = true;
+				if ($conf->browser->layout == 'phone') $enablebrowsernotif = false;
+				if ($enablebrowsernotif)
+				{
+					print '<!-- Includes JS of Dolibarr (browser layout = '.$conf->browser->layout.')-->'."\n";
+					print '<script src="'.DOL_URL_ROOT.'/core/js/lib_notification.js.php'.($ext ? '?'.$ext : '').'"></script>'."\n";
+				}
+			}
 
-            // Global js function
-            print '<!-- Includes JS of Dolibarr -->'."\n";
-            print '<script src="'.DOL_URL_ROOT.'/core/js/lib_head.js.php?lang='.$langs->defaultlang.($ext ? '&'.$ext : '').'"></script>'."\n";
+			// Global js function
+			print '<!-- Includes JS of Dolibarr -->'."\n";
+			print '<script src="'.DOL_URL_ROOT.'/core/js/lib_head.js.php?lang='.$langs->defaultlang.($ext ? '&'.$ext : '').'"></script>'."\n";
 
-            // JS forced by modules (relative url starting with /)
-            if (!empty($conf->modules_parts['js']))		// $conf->modules_parts['js'] is array('module'=>array('file1','file2'))
-        	{
-        		$arrayjs = (array) $conf->modules_parts['js'];
-	            foreach ($arrayjs as $modjs => $filesjs)
-	            {
-        			$filesjs = (array) $filesjs; // To be sure filejs is an array
-		            foreach ($filesjs as $jsfile)
-		            {
-	    	    		// jsfile is a relative path
-	        	    	print '<!-- Include JS added by module '.$modjs.'-->'."\n".'<script src="'.dol_buildpath($jsfile, 1).'"></script>'."\n";
-		            }
-	            }
-        	}
-            // JS forced by page in top_htmlhead (relative url starting with /)
-            if (is_array($arrayofjs))
-            {
-                print '<!-- Includes JS added by page -->'."\n";
-                foreach ($arrayofjs as $jsfile)
-                {
-                    if (preg_match('/^(http|\/\/)/i', $jsfile))
-                    {
-                        print '<script src="'.$jsfile.'"></script>'."\n";
-                    } else {
-                        print '<script src="'.dol_buildpath($jsfile, 1).'"></script>'."\n";
-                    }
-                }
-            }
-        }
+			// JS forced by modules (relative url starting with /)
+			if (!empty($conf->modules_parts['js']))		// $conf->modules_parts['js'] is array('module'=>array('file1','file2'))
+			{
+				$arrayjs = (array) $conf->modules_parts['js'];
+				foreach ($arrayjs as $modjs => $filesjs)
+				{
+					$filesjs = (array) $filesjs; // To be sure filejs is an array
+					foreach ($filesjs as $jsfile)
+					{
+						// jsfile is a relative path
+						print '<!-- Include JS added by module '.$modjs.'-->'."\n".'<script src="'.dol_buildpath($jsfile, 1).'"></script>'."\n";
+					}
+				}
+			}
+			// JS forced by page in top_htmlhead (relative url starting with /)
+			if (is_array($arrayofjs))
+			{
+				print '<!-- Includes JS added by page -->'."\n";
+				foreach ($arrayofjs as $jsfile)
+				{
+					if (preg_match('/^(http|\/\/)/i', $jsfile))
+					{
+						print '<script src="'.$jsfile.'"></script>'."\n";
+					} else {
+						print '<script src="'.dol_buildpath($jsfile, 1).'"></script>'."\n";
+					}
+				}
+			}
+		}
 
-        if (!empty($head)) print $head."\n";
-        if (!empty($conf->global->MAIN_HTML_HEADER)) print $conf->global->MAIN_HTML_HEADER."\n";
+		if (!empty($head)) print $head."\n";
+		if (!empty($conf->global->MAIN_HTML_HEADER)) print $conf->global->MAIN_HTML_HEADER."\n";
 
-        $parameters = array();
-        $result = $hookmanager->executeHooks('addHtmlHeader', $parameters); // Note that $action and $object may have been modified by some hooks
-        print $hookmanager->resPrint; // Replace Title to show
+		$parameters = array();
+		$result = $hookmanager->executeHooks('addHtmlHeader', $parameters); // Note that $action and $object may have been modified by some hooks
+		print $hookmanager->resPrint; // Replace Title to show
 
-        print "</head>\n\n";
-    }
+		print "</head>\n\n";
+	}
 
-    $conf->headerdone = 1; // To tell header was output
+	$conf->headerdone = 1; // To tell header was output
 }
 
 
@@ -1565,6 +1566,11 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead
      */
 	if ((empty($conf->dol_hide_topmenu) || GETPOST('dol_invisible_topmenu', 'int')) && (!defined('NOREQUIREMENU') || !constant('NOREQUIREMENU')))
 	{
+		if (!isset($form) || !is_object($form)) {
+			include_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
+			$form = new Form($db);
+		}
+
 		print "\n".'<!-- Start top horizontal -->'."\n";
 
 		print '<div class="side-nav-vert'.(GETPOST('dol_invisible_topmenu', 'int') ? ' hidden' : '').'"><div id="id-top">'; // dol_invisible_topmenu differs from dol_hide_topmenu: dol_invisible_topmenu means we output menu but we make it invisible.
@@ -1631,7 +1637,7 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead
 			//$text.= img_picto(":".$langs->trans("ModuleBuilder"), 'printer_top.png', 'class="printer"');
 			$text .= '<span class="fa fa-bug atoplogin valignmiddle"></span>';
 			$text .= '</a>';
-			$toprightmenu .= @Form::textwithtooltip('', $langs->trans("ModuleBuilder"), 2, 1, $text, 'login_block_elem', 2);
+			$toprightmenu .= $form->textwithtooltip('', $langs->trans("ModuleBuilder"), 2, 1, $text, 'login_block_elem', 2);
 		}
 
 		// Link to print main content area
@@ -1650,7 +1656,7 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead
 			//$text.= img_picto(":".$langs->trans("PrintContentArea"), 'printer_top.png', 'class="printer"');
 			$text .= '<span class="fa fa-print atoplogin valignmiddle"></span>';
 			$text .= '</a>';
-			$toprightmenu .= @Form::textwithtooltip('', $langs->trans("PrintContentArea"), 2, 1, $text, 'login_block_elem', 2);
+			$toprightmenu .= $form->textwithtooltip('', $langs->trans("PrintContentArea"), 2, 1, $text, 'login_block_elem', 2);
 		}
 
 		// Link to Dolibarr wiki pages
@@ -1687,7 +1693,7 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead
 				$text .= '">';
 				$text .= '<span class="fa fa-question-circle atoplogin valignmiddle'.($helppresent ? ' '.$helppresent : '').'"></span>';
 				$text .= '</a>';
-				$toprightmenu .= @Form::textwithtooltip('', $title, 2, 1, $text, 'login_block_elem', 2);
+				$toprightmenu .= $form->textwithtooltip('', $title, 2, 1, $text, 'login_block_elem', 2);
 			}
 
 			// Version
@@ -1699,11 +1705,11 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead
 
 		if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
 			$text = '<span href="#" class="aversion"><span class="hideonsmartphone small">'.DOL_VERSION.'</span></span>';
-			$toprightmenu .= @Form::textwithtooltip('', $appli, 2, 1, $text, 'login_block_elem', 2);
+			$toprightmenu .= $form->textwithtooltip('', $appli, 2, 1, $text, 'login_block_elem', 2);
 		}
 
 		// Logout link
-		$toprightmenu .= @Form::textwithtooltip('', $logouthtmltext, 2, 1, $logouttext, 'login_block_elem logout-btn', 2);
+		$toprightmenu .= $form->textwithtooltip('', $logouthtmltext, 2, 1, $logouttext, 'login_block_elem logout-btn', 2);
 
 		$toprightmenu .= '</div>'; // end div class="login_block_other"
 
@@ -1746,7 +1752,7 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead
 		print "<!-- End top horizontal menu -->\n\n";
 	}
 
-	if (empty($conf->dol_hide_leftmenu) && empty($conf->dol_use_jmobile)) print '<!-- Begin div id-container --><div id="id-container" class="id-container'.($morecss ? ' '.$morecss : '').'">';
+	if (empty($conf->dol_hide_leftmenu) && empty($conf->dol_use_jmobile)) print '<!-- Begin div id-container --><div id="id-container" class="id-container">';
 }
 
 
@@ -1759,99 +1765,99 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead
  */
 function top_menu_user($hideloginname = 0, $urllogout = '')
 {
-    global $langs, $conf, $db, $hookmanager, $user;
-    global $dolibarr_main_authentication, $dolibarr_main_demo;
-    global $menumanager;
+	global $langs, $conf, $db, $hookmanager, $user;
+	global $dolibarr_main_authentication, $dolibarr_main_demo;
+	global $menumanager;
 
-    $userImage = $userDropDownImage = '';
-    if (!empty($user->photo))
-    {
-        $userImage          = Form::showphoto('userphoto', $user, 0, 0, 0, 'photouserphoto userphoto', 'small', 0, 1);
-        $userDropDownImage  = Form::showphoto('userphoto', $user, 0, 0, 0, 'dropdown-user-image', 'small', 0, 1);
-    } else {
-        $nophoto = '/public/theme/common/user_anonymous.png';
-        if ($user->gender == 'man') $nophoto = '/public/theme/common/user_man.png';
-        if ($user->gender == 'woman') $nophoto = '/public/theme/common/user_woman.png';
+	$userImage = $userDropDownImage = '';
+	if (!empty($user->photo))
+	{
+		$userImage          = Form::showphoto('userphoto', $user, 0, 0, 0, 'photouserphoto userphoto', 'small', 0, 1);
+		$userDropDownImage  = Form::showphoto('userphoto', $user, 0, 0, 0, 'dropdown-user-image', 'small', 0, 1);
+	} else {
+		$nophoto = '/public/theme/common/user_anonymous.png';
+		if ($user->gender == 'man') $nophoto = '/public/theme/common/user_man.png';
+		if ($user->gender == 'woman') $nophoto = '/public/theme/common/user_woman.png';
 
-        $userImage = '<img class="photo photouserphoto userphoto" alt="No photo" src="'.DOL_URL_ROOT.$nophoto.'">';
-        $userDropDownImage = '<img class="photo dropdown-user-image" alt="No photo" src="'.DOL_URL_ROOT.$nophoto.'">';
-    }
+		$userImage = '<img class="photo photouserphoto userphoto" alt="No photo" src="'.DOL_URL_ROOT.$nophoto.'">';
+		$userDropDownImage = '<img class="photo dropdown-user-image" alt="No photo" src="'.DOL_URL_ROOT.$nophoto.'">';
+	}
 
-    $dropdownBody = '';
-    $dropdownBody .= '<span id="topmenuloginmoreinfo-btn"><i class="fa fa-caret-right"></i> '.$langs->trans("ShowMoreInfos").'</span>';
-    $dropdownBody .= '<div id="topmenuloginmoreinfo" >';
+	$dropdownBody = '';
+	$dropdownBody .= '<span id="topmenuloginmoreinfo-btn"><i class="fa fa-caret-right"></i> '.$langs->trans("ShowMoreInfos").'</span>';
+	$dropdownBody .= '<div id="topmenuloginmoreinfo" >';
 
-    // login infos
-    if (!empty($user->admin)) {
-        $dropdownBody .= '<br><b>'.$langs->trans("Administrator").'</b>: '.yn($user->admin);
-    }
-    if (!empty($user->socid))	// Add thirdparty for external users
-    {
-        $thirdpartystatic = new Societe($db);
-        $thirdpartystatic->fetch($user->socid);
-        $companylink = ' '.$thirdpartystatic->getNomUrl(2); // picto only of company
-        $company = ' ('.$langs->trans("Company").': '.$thirdpartystatic->name.')';
-    }
-    $type = ($user->socid ? $langs->trans("External").$company : $langs->trans("Internal"));
-    $dropdownBody .= '<br><b>'.$langs->trans("Type").':</b> '.$type;
-    $dropdownBody .= '<br><b>'.$langs->trans("Status").'</b>: '.$user->getLibStatut(0);
-    $dropdownBody .= '<br>';
+	// login infos
+	if (!empty($user->admin)) {
+		$dropdownBody .= '<br><b>'.$langs->trans("Administrator").'</b>: '.yn($user->admin);
+	}
+	if (!empty($user->socid))	// Add thirdparty for external users
+	{
+		$thirdpartystatic = new Societe($db);
+		$thirdpartystatic->fetch($user->socid);
+		$companylink = ' '.$thirdpartystatic->getNomUrl(2); // picto only of company
+		$company = ' ('.$langs->trans("Company").': '.$thirdpartystatic->name.')';
+	}
+	$type = ($user->socid ? $langs->trans("External").$company : $langs->trans("Internal"));
+	$dropdownBody .= '<br><b>'.$langs->trans("Type").':</b> '.$type;
+	$dropdownBody .= '<br><b>'.$langs->trans("Status").'</b>: '.$user->getLibStatut(0);
+	$dropdownBody .= '<br>';
 
-    $dropdownBody .= '<br><u>'.$langs->trans("Session").'</u>';
-    $dropdownBody .= '<br><b>'.$langs->trans("IPAddress").'</b>: '.dol_escape_htmltag($_SERVER["REMOTE_ADDR"]);
-    if (!empty($conf->global->MAIN_MODULE_MULTICOMPANY)) $dropdownBody .= '<br><b>'.$langs->trans("ConnectedOnMultiCompany").':</b> '.$conf->entity.' (user entity '.$user->entity.')';
-    $dropdownBody .= '<br><b>'.$langs->trans("AuthenticationMode").':</b> '.$_SESSION["dol_authmode"].(empty($dolibarr_main_demo) ? '' : ' (demo)');
-    $dropdownBody .= '<br><b>'.$langs->trans("ConnectedSince").':</b> '.dol_print_date($user->datelastlogin, "dayhour", 'tzuser');
-    $dropdownBody .= '<br><b>'.$langs->trans("PreviousConnexion").':</b> '.dol_print_date($user->datepreviouslogin, "dayhour", 'tzuser');
-    $dropdownBody .= '<br><b>'.$langs->trans("CurrentTheme").':</b> '.$conf->theme;
-    $dropdownBody .= '<br><b>'.$langs->trans("CurrentMenuManager").':</b> '.$menumanager->name;
-    $langFlag = picto_from_langcode($langs->getDefaultLang());
-    $dropdownBody .= '<br><b>'.$langs->trans("CurrentUserLanguage").':</b> '.($langFlag ? $langFlag.' ' : '').$langs->getDefaultLang();
-    $dropdownBody .= '<br><b>'.$langs->trans("Browser").':</b> '.$conf->browser->name.($conf->browser->version ? ' '.$conf->browser->version : '').' ('.dol_escape_htmltag($_SERVER['HTTP_USER_AGENT']).')';
-    $dropdownBody .= '<br><b>'.$langs->trans("Layout").':</b> '.$conf->browser->layout;
-    $dropdownBody .= '<br><b>'.$langs->trans("Screen").':</b> '.$_SESSION['dol_screenwidth'].' x '.$_SESSION['dol_screenheight'];
-    if ($conf->browser->layout == 'phone') $dropdownBody .= '<br><b>'.$langs->trans("Phone").':</b> '.$langs->trans("Yes");
-    if (!empty($_SESSION["disablemodules"])) $dropdownBody .= '<br><b>'.$langs->trans("DisabledModules").':</b> <br>'.join(', ', explode(',', $_SESSION["disablemodules"]));
-    $dropdownBody .= '</div>';
+	$dropdownBody .= '<br><u>'.$langs->trans("Session").'</u>';
+	$dropdownBody .= '<br><b>'.$langs->trans("IPAddress").'</b>: '.dol_escape_htmltag($_SERVER["REMOTE_ADDR"]);
+	if (!empty($conf->global->MAIN_MODULE_MULTICOMPANY)) $dropdownBody .= '<br><b>'.$langs->trans("ConnectedOnMultiCompany").':</b> '.$conf->entity.' (user entity '.$user->entity.')';
+	$dropdownBody .= '<br><b>'.$langs->trans("AuthenticationMode").':</b> '.$_SESSION["dol_authmode"].(empty($dolibarr_main_demo) ? '' : ' (demo)');
+	$dropdownBody .= '<br><b>'.$langs->trans("ConnectedSince").':</b> '.dol_print_date($user->datelastlogin, "dayhour", 'tzuser');
+	$dropdownBody .= '<br><b>'.$langs->trans("PreviousConnexion").':</b> '.dol_print_date($user->datepreviouslogin, "dayhour", 'tzuser');
+	$dropdownBody .= '<br><b>'.$langs->trans("CurrentTheme").':</b> '.$conf->theme;
+	$dropdownBody .= '<br><b>'.$langs->trans("CurrentMenuManager").':</b> '.$menumanager->name;
+	$langFlag = picto_from_langcode($langs->getDefaultLang());
+	$dropdownBody .= '<br><b>'.$langs->trans("CurrentUserLanguage").':</b> '.($langFlag ? $langFlag.' ' : '').$langs->getDefaultLang();
+	$dropdownBody .= '<br><b>'.$langs->trans("Browser").':</b> '.$conf->browser->name.($conf->browser->version ? ' '.$conf->browser->version : '').' ('.dol_escape_htmltag($_SERVER['HTTP_USER_AGENT']).')';
+	$dropdownBody .= '<br><b>'.$langs->trans("Layout").':</b> '.$conf->browser->layout;
+	$dropdownBody .= '<br><b>'.$langs->trans("Screen").':</b> '.$_SESSION['dol_screenwidth'].' x '.$_SESSION['dol_screenheight'];
+	if ($conf->browser->layout == 'phone') $dropdownBody .= '<br><b>'.$langs->trans("Phone").':</b> '.$langs->trans("Yes");
+	if (!empty($_SESSION["disablemodules"])) $dropdownBody .= '<br><b>'.$langs->trans("DisabledModules").':</b> <br>'.join(', ', explode(',', $_SESSION["disablemodules"]));
+	$dropdownBody .= '</div>';
 
-    // Execute hook
-    $parameters = array('user'=>$user, 'langs' => $langs);
-    $result = $hookmanager->executeHooks('printTopRightMenuLoginDropdownBody', $parameters); // Note that $action and $object may have been modified by some hooks
-    if (is_numeric($result))
-    {
-        if ($result == 0) {
-            $dropdownBody .= $hookmanager->resPrint; // add
-        } else {
-            $dropdownBody = $hookmanager->resPrint; // replace
-        }
-    }
+	// Execute hook
+	$parameters = array('user'=>$user, 'langs' => $langs);
+	$result = $hookmanager->executeHooks('printTopRightMenuLoginDropdownBody', $parameters); // Note that $action and $object may have been modified by some hooks
+	if (is_numeric($result))
+	{
+		if ($result == 0) {
+			$dropdownBody .= $hookmanager->resPrint; // add
+		} else {
+			$dropdownBody = $hookmanager->resPrint; // replace
+		}
+	}
 
-    if (empty($urllogout)) {
-    	$urllogout = DOL_URL_ROOT.'/user/logout.php';
-    }
-    $logoutLink = '<a accesskey="l" href="'.$urllogout.'" class="button-top-menu-dropdown" ><i class="fa fa-sign-out-alt"></i> '.$langs->trans("Logout").'</a>';
-    $profilLink = '<a accesskey="l" href="'.DOL_URL_ROOT.'/user/card.php?id='.$user->id.'" class="button-top-menu-dropdown" ><i class="fa fa-user"></i>  '.$langs->trans("Card").'</a>';
+	if (empty($urllogout)) {
+		$urllogout = DOL_URL_ROOT.'/user/logout.php';
+	}
+	$logoutLink = '<a accesskey="l" href="'.$urllogout.'" class="button-top-menu-dropdown" ><i class="fa fa-sign-out-alt"></i> '.$langs->trans("Logout").'</a>';
+	$profilLink = '<a accesskey="l" href="'.DOL_URL_ROOT.'/user/card.php?id='.$user->id.'" class="button-top-menu-dropdown" ><i class="fa fa-user"></i>  '.$langs->trans("Card").'</a>';
 
 
-    $profilName = $user->getFullName($langs).' ('.$user->login.')';
+	$profilName = $user->getFullName($langs).' ('.$user->login.')';
 
-    if (!empty($user->admin)) {
-        $profilName = '<i class="far fa-star classfortooltip" title="'.$langs->trans("Administrator").'" ></i> '.$profilName;
-    }
+	if (!empty($user->admin)) {
+		$profilName = '<i class="far fa-star classfortooltip" title="'.$langs->trans("Administrator").'" ></i> '.$profilName;
+	}
 
-    // Define version to show
-    $appli = constant('DOL_APPLICATION_TITLE');
-    if (!empty($conf->global->MAIN_APPLICATION_TITLE))
-    {
-    	$appli = $conf->global->MAIN_APPLICATION_TITLE;
-    	if (preg_match('/\d\.\d/', $appli))
-    	{
-    		if (!preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli .= " (".DOL_VERSION.")"; // If new title contains a version that is different than core
-    	} else $appli .= " ".DOL_VERSION;
-    } else $appli .= " ".DOL_VERSION;
+	// Define version to show
+	$appli = constant('DOL_APPLICATION_TITLE');
+	if (!empty($conf->global->MAIN_APPLICATION_TITLE))
+	{
+		$appli = $conf->global->MAIN_APPLICATION_TITLE;
+		if (preg_match('/\d\.\d/', $appli))
+		{
+			if (!preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli .= " (".DOL_VERSION.")"; // If new title contains a version that is different than core
+		} else $appli .= " ".DOL_VERSION;
+	} else $appli .= " ".DOL_VERSION;
 
-    if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
-	    $btnUser = '<!-- div for user link -->
+	if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+		$btnUser = '<!-- div for user link -->
 	    <div id="topmenu-login-dropdown" class="userimg atoplogin dropdown user user-menu inline-block">
 	        <a href="'.DOL_URL_ROOT.'/user/card.php?id='.$user->id.'" class="dropdown-toggle login-dropdown-a" data-toggle="dropdown">
 	            '.$userImage.'
@@ -1887,19 +1893,19 @@ function top_menu_user($hideloginname = 0, $urllogout = '')
 
 	        </div>
 	    </div>';
-    } else {
-    	$btnUser = '<!-- div for user link -->
+	} else {
+		$btnUser = '<!-- div for user link -->
 	    <div id="topmenu-login-dropdown" class="userimg atoplogin dropdown user user-menu  inline-block">
 	    	<a href="'.DOL_URL_ROOT.'/user/card.php?id='.$user->id.'">
 	    	'.$userImage.'
 	    		<span class="hidden-xs maxwidth200 atoploginusername hideonsmartphone">'.dol_trunc($user->firstname ? $user->firstname : $user->login, 10).'</span>
 	    		</a>
 		</div>';
-    }
+	}
 
-    if (!defined('JS_JQUERY_DISABLE_DROPDOWN') && !empty($conf->use_javascript_ajax))    // This may be set by some pages that use different jquery version to avoid errors
-    {
-        $btnUser .= '
+	if (!defined('JS_JQUERY_DISABLE_DROPDOWN') && !empty($conf->use_javascript_ajax))    // This may be set by some pages that use different jquery version to avoid errors
+	{
+		$btnUser .= '
         <!-- Code to show/hide the user drop-down -->
         <script>
         $( document ).ready(function() {
@@ -1912,8 +1918,8 @@ function top_menu_user($hideloginname = 0, $urllogout = '')
             });
 			';
 
-        if ($conf->theme != 'md') {
-	        $btnUser .= '
+		if ($conf->theme != 'md') {
+			$btnUser .= '
 	            $("#topmenu-login-dropdown .dropdown-toggle").on("click", function(event) {
 					console.log("toggle login dropdown");
 					event.preventDefault();
@@ -1923,15 +1929,15 @@ function top_menu_user($hideloginname = 0, $urllogout = '')
 	            $("#topmenuloginmoreinfo-btn").on("click", function() {
 	                $("#topmenuloginmoreinfo").slideToggle();
 	            });';
-        }
+		}
 
-        $btnUser .= '
+		$btnUser .= '
         });
         </script>
         ';
-    }
+	}
 
-    return $btnUser;
+	return $btnUser;
 }
 
 /**
@@ -2160,24 +2166,24 @@ function top_menu_quickadd()
  */
 function top_menu_bookmark()
 {
-    global $langs, $conf, $db, $user;
+	global $langs, $conf, $db, $user;
 
 	$html = '';
 
-    // Define $bookmarks
+	// Define $bookmarks
 	if (empty($conf->bookmark->enabled) || empty($user->rights->bookmark->lire)) return $html;
 
 	if (!defined('JS_JQUERY_DISABLE_DROPDOWN') && !empty($conf->use_javascript_ajax))	    // This may be set by some pages that use different jquery version to avoid errors
-    {
-        include_once DOL_DOCUMENT_ROOT.'/bookmarks/bookmarks.lib.php';
-        $langs->load("bookmarks");
+	{
+		include_once DOL_DOCUMENT_ROOT.'/bookmarks/bookmarks.lib.php';
+		$langs->load("bookmarks");
 
-        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 -->
+		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>
@@ -2187,7 +2193,7 @@ function top_menu_bookmark()
 	            </div>
 	        </div>';
 
-	        $html .= '
+			$html .= '
 	        <!-- Code to show/hide the bookmark drop-down -->
 	        <script>
 	        $( document ).ready(function() {
@@ -2222,9 +2228,9 @@ function top_menu_bookmark()
 	        });
 	        </script>
 	        ';
-        }
-    }
-    return $html;
+		}
+	}
+	return $html;
 }
 
 /**
@@ -2234,51 +2240,51 @@ function top_menu_bookmark()
  */
 function top_menu_search()
 {
-    global $langs, $conf, $db, $user, $hookmanager;
+	global $langs, $conf, $db, $user, $hookmanager;
 
 	$html = '';
 
-    $usedbyinclude = 1;
-    $arrayresult = null;
-    include DOL_DOCUMENT_ROOT.'/core/ajax/selectsearchbox.php'; // This set $arrayresult
+	$usedbyinclude = 1;
+	$arrayresult = null;
+	include DOL_DOCUMENT_ROOT.'/core/ajax/selectsearchbox.php'; // This set $arrayresult
 
-    $defaultAction = '';
-    $buttonList = '<div class="dropdown-global-search-button-list" >';
-    // Menu with all searchable items
-    foreach ($arrayresult as $keyItem => $item)
-    {
-        if (empty($defaultAction)) {
-            $defaultAction = $item['url'];
-        }
-        $buttonList .= '<button class="dropdown-item global-search-item" data-target="'.dol_escape_htmltag($item['url']).'" >';
-        $buttonList .= $item['text'];
-        $buttonList .= '</button>';
-    }
-    $buttonList .= '</div>';
+	$defaultAction = '';
+	$buttonList = '<div class="dropdown-global-search-button-list" >';
+	// Menu with all searchable items
+	foreach ($arrayresult as $keyItem => $item)
+	{
+		if (empty($defaultAction)) {
+			$defaultAction = $item['url'];
+		}
+		$buttonList .= '<button class="dropdown-item global-search-item" data-target="'.dol_escape_htmltag($item['url']).'" >';
+		$buttonList .= $item['text'];
+		$buttonList .= '</button>';
+	}
+	$buttonList .= '</div>';
 
 
-    $searchInput = '<input name="sall" id="top-global-search-input" class="dropdown-search-input" placeholder="'.$langs->trans('Search').'" autocomplete="off" >';
+	$searchInput = '<input name="sall" id="top-global-search-input" class="dropdown-search-input" placeholder="'.$langs->trans('Search').'" autocomplete="off" >';
 
-    $dropDownHtml = '<form id="top-menu-action-search" name="actionsearch" method="GET" action="'.$defaultAction.'" >';
+	$dropDownHtml = '<form id="top-menu-action-search" name="actionsearch" method="GET" action="'.$defaultAction.'" >';
 
-    $dropDownHtml .= '
+	$dropDownHtml .= '
         <!-- search input -->
         <div class="dropdown-header search-dropdown-header">
             ' . $searchInput.'
         </div>
     ';
 
-    $dropDownHtml .= '
+	$dropDownHtml .= '
         <!-- Menu Body -->
         <div class="dropdown-body search-dropdown-body">
         '.$buttonList.'
         </div>
         ';
 
-    $dropDownHtml .= '</form>';
+	$dropDownHtml .= '</form>';
 
 
-    $html .= '<!-- div for Global Search -->
+	$html .= '<!-- div for Global Search -->
     <div id="topmenu-global-search-dropdown" class="atoplogin dropdown inline-block">
         <a class="dropdown-toggle login-dropdown-a" data-toggle="dropdown" href="#" title="'.$langs->trans('Search').' ('.$langs->trans('SearchMenuShortCut').')">
             <i class="fa fa-search" ></i>
@@ -2288,7 +2294,7 @@ function top_menu_search()
         </div>
     </div>';
 
-    $html .= '
+	$html .= '
     <!-- Code to show/hide the user drop-down -->
     <script>
     $( document ).ready(function() {
@@ -2346,7 +2352,7 @@ function top_menu_search()
     </script>
     ';
 
-    return $html;
+	return $html;
 }
 
 /**
@@ -2386,44 +2392,44 @@ function left_menu($menu_array_before, $helppagename = '', $notused = '', $menu_
 
 		if (!is_object($form)) $form = new Form($db);
 		$selected = -1;
-        if (empty($conf->global->MAIN_USE_TOP_MENU_SEARCH_DROPDOWN)) {
-            $usedbyinclude = 1;
-            $arrayresult = null;
-            include DOL_DOCUMENT_ROOT.'/core/ajax/selectsearchbox.php'; // This set $arrayresult
+		if (empty($conf->global->MAIN_USE_TOP_MENU_SEARCH_DROPDOWN)) {
+			$usedbyinclude = 1;
+			$arrayresult = null;
+			include DOL_DOCUMENT_ROOT.'/core/ajax/selectsearchbox.php'; // This set $arrayresult
 
-            if ($conf->use_javascript_ajax && empty($conf->global->MAIN_USE_OLD_SEARCH_FORM)) {
-                $searchform .= $form->selectArrayFilter('searchselectcombo', $arrayresult, $selected, '', 1, 0, (empty($conf->global->MAIN_SEARCHBOX_CONTENT_LOADED_BEFORE_KEY) ? 1 : 0), 'vmenusearchselectcombo', 1, $langs->trans("Search"), 1);
-            } else {
-                if (is_array($arrayresult)) {
-                    foreach ($arrayresult as $key => $val) {
-                        $searchform .= printSearchForm($val['url'], $val['url'], $val['label'], 'maxwidth125', 'sall', $val['shortcut'], 'searchleft'.$key, $val['img']);
-                    }
-                }
-            }
+			if ($conf->use_javascript_ajax && empty($conf->global->MAIN_USE_OLD_SEARCH_FORM)) {
+				$searchform .= $form->selectArrayFilter('searchselectcombo', $arrayresult, $selected, '', 1, 0, (empty($conf->global->MAIN_SEARCHBOX_CONTENT_LOADED_BEFORE_KEY) ? 1 : 0), 'vmenusearchselectcombo', 1, $langs->trans("Search"), 1);
+			} else {
+				if (is_array($arrayresult)) {
+					foreach ($arrayresult as $key => $val) {
+						$searchform .= printSearchForm($val['url'], $val['url'], $val['label'], 'maxwidth125', 'sall', $val['shortcut'], 'searchleft'.$key, $val['img']);
+					}
+				}
+			}
 
-            // Execute hook printSearchForm
-            $parameters = array('searchform' => $searchform);
-            $reshook = $hookmanager->executeHooks('printSearchForm', $parameters); // Note that $action and $object may have been modified by some hooks
-            if (empty($reshook)) {
-                $searchform .= $hookmanager->resPrint;
-            } else $searchform = $hookmanager->resPrint;
+			// Execute hook printSearchForm
+			$parameters = array('searchform' => $searchform);
+			$reshook = $hookmanager->executeHooks('printSearchForm', $parameters); // Note that $action and $object may have been modified by some hooks
+			if (empty($reshook)) {
+				$searchform .= $hookmanager->resPrint;
+			} else $searchform = $hookmanager->resPrint;
 
-            // Force special value for $searchform
-            if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) || empty($conf->use_javascript_ajax)) {
-                $urltosearch = DOL_URL_ROOT.'/core/search_page.php?showtitlebefore=1';
-                $searchform = '<div class="blockvmenuimpair blockvmenusearchphone"><div id="divsearchforms1"><a href="'.$urltosearch.'" accesskey="s" alt="'.dol_escape_htmltag($langs->trans("ShowSearchFields")).'">'.$langs->trans("Search").'...</a></div></div>';
-            } elseif ($conf->use_javascript_ajax && !empty($conf->global->MAIN_USE_OLD_SEARCH_FORM)) {
-                $searchform = '<div class="blockvmenuimpair blockvmenusearchphone"><div id="divsearchforms1"><a href="#" alt="'.dol_escape_htmltag($langs->trans("ShowSearchFields")).'">'.$langs->trans("Search").'...</a></div><div id="divsearchforms2" style="display: none">'.$searchform.'</div>';
-                $searchform .= '<script>
+			// Force special value for $searchform
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) || empty($conf->use_javascript_ajax)) {
+				$urltosearch = DOL_URL_ROOT.'/core/search_page.php?showtitlebefore=1';
+				$searchform = '<div class="blockvmenuimpair blockvmenusearchphone"><div id="divsearchforms1"><a href="'.$urltosearch.'" accesskey="s" alt="'.dol_escape_htmltag($langs->trans("ShowSearchFields")).'">'.$langs->trans("Search").'...</a></div></div>';
+			} elseif ($conf->use_javascript_ajax && !empty($conf->global->MAIN_USE_OLD_SEARCH_FORM)) {
+				$searchform = '<div class="blockvmenuimpair blockvmenusearchphone"><div id="divsearchforms1"><a href="#" alt="'.dol_escape_htmltag($langs->trans("ShowSearchFields")).'">'.$langs->trans("Search").'...</a></div><div id="divsearchforms2" style="display: none">'.$searchform.'</div>';
+				$searchform .= '<script>
             	jQuery(document).ready(function () {
             		jQuery("#divsearchforms1").click(function(){
 	                   jQuery("#divsearchforms2").toggle();
 	               });
             	});
                 </script>' . "\n";
-                $searchform .= '</div>';
-            }
-        }
+				$searchform .= '</div>';
+			}
+		}
 
 		// Left column
 		print '<!-- Begin left menu -->'."\n";
@@ -2474,37 +2480,37 @@ function left_menu($menu_array_before, $helppagename = '', $notused = '', $menu_
 		{
 			require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
-            $bugbaseurl = 'https://github.com/Dolibarr/dolibarr/issues/new?labels=Bug';
+			$bugbaseurl = 'https://github.com/Dolibarr/dolibarr/issues/new?labels=Bug';
 			$bugbaseurl .= '&title=';
 			$bugbaseurl .= urlencode("Bug: ");
-            $bugbaseurl .= '&body=';
-            $bugbaseurl .= urlencode("# Instructions\n");
-            $bugbaseurl .= urlencode("*This is a template to help you report good issues. You may use [Github Markdown](https://help.github.com/articles/getting-started-with-writing-and-formatting-on-github/) syntax to format your issue report.*\n");
-            $bugbaseurl .= urlencode("*Please:*\n");
-            $bugbaseurl .= urlencode("- *replace the bracket enclosed texts with meaningful information*\n");
-            $bugbaseurl .= urlencode("- *remove any unused sub-section*\n");
-            $bugbaseurl .= urlencode("\n");
-            $bugbaseurl .= urlencode("\n");
-            $bugbaseurl .= urlencode("# Bug\n");
-            $bugbaseurl .= urlencode("[*Short description*]\n");
-            $bugbaseurl .= urlencode("\n");
-            $bugbaseurl .= urlencode("## Environment\n");
-            $bugbaseurl .= urlencode("- **Version**: ".DOL_VERSION."\n");
-            $bugbaseurl .= urlencode("- **OS**: ".php_uname('s')."\n");
-            $bugbaseurl .= urlencode("- **Web server**: ".$_SERVER["SERVER_SOFTWARE"]."\n");
-            $bugbaseurl .= urlencode("- **PHP**: ".php_sapi_name().' '.phpversion()."\n");
-            $bugbaseurl .= urlencode("- **Database**: ".$db::LABEL.' '.$db->getVersion()."\n");
-            $bugbaseurl .= urlencode("- **URL(s)**: ".$_SERVER["REQUEST_URI"]."\n");
-            $bugbaseurl .= urlencode("\n");
-            $bugbaseurl .= urlencode("## Expected and actual behavior\n");
-            $bugbaseurl .= urlencode("[*Verbose description*]\n");
-            $bugbaseurl .= urlencode("\n");
-            $bugbaseurl .= urlencode("## Steps to reproduce the behavior\n");
-            $bugbaseurl .= urlencode("[*Verbose description*]\n");
-            $bugbaseurl .= urlencode("\n");
-            $bugbaseurl .= urlencode("## [Attached files](https://help.github.com/articles/issue-attachments) (Screenshots, screencasts, dolibarr.log, debugging informations…)\n");
-            $bugbaseurl .= urlencode("[*Files*]\n");
-            $bugbaseurl .= urlencode("\n");
+			$bugbaseurl .= '&body=';
+			$bugbaseurl .= urlencode("# Instructions\n");
+			$bugbaseurl .= urlencode("*This is a template to help you report good issues. You may use [Github Markdown](https://help.github.com/articles/getting-started-with-writing-and-formatting-on-github/) syntax to format your issue report.*\n");
+			$bugbaseurl .= urlencode("*Please:*\n");
+			$bugbaseurl .= urlencode("- *replace the bracket enclosed texts with meaningful information*\n");
+			$bugbaseurl .= urlencode("- *remove any unused sub-section*\n");
+			$bugbaseurl .= urlencode("\n");
+			$bugbaseurl .= urlencode("\n");
+			$bugbaseurl .= urlencode("# Bug\n");
+			$bugbaseurl .= urlencode("[*Short description*]\n");
+			$bugbaseurl .= urlencode("\n");
+			$bugbaseurl .= urlencode("## Environment\n");
+			$bugbaseurl .= urlencode("- **Version**: ".DOL_VERSION."\n");
+			$bugbaseurl .= urlencode("- **OS**: ".php_uname('s')."\n");
+			$bugbaseurl .= urlencode("- **Web server**: ".$_SERVER["SERVER_SOFTWARE"]."\n");
+			$bugbaseurl .= urlencode("- **PHP**: ".php_sapi_name().' '.phpversion()."\n");
+			$bugbaseurl .= urlencode("- **Database**: ".$db::LABEL.' '.$db->getVersion()."\n");
+			$bugbaseurl .= urlencode("- **URL(s)**: ".$_SERVER["REQUEST_URI"]."\n");
+			$bugbaseurl .= urlencode("\n");
+			$bugbaseurl .= urlencode("## Expected and actual behavior\n");
+			$bugbaseurl .= urlencode("[*Verbose description*]\n");
+			$bugbaseurl .= urlencode("\n");
+			$bugbaseurl .= urlencode("## Steps to reproduce the behavior\n");
+			$bugbaseurl .= urlencode("[*Verbose description*]\n");
+			$bugbaseurl .= urlencode("\n");
+			$bugbaseurl .= urlencode("## [Attached files](https://help.github.com/articles/issue-attachments) (Screenshots, screencasts, dolibarr.log, debugging informations…)\n");
+			$bugbaseurl .= urlencode("[*Files*]\n");
+			$bugbaseurl .= urlencode("\n");
 
 
 			// Execute hook printBugtrackInfo
@@ -2563,35 +2569,35 @@ function main_area($title = '')
 
 	if (!empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED)) print info_admin($langs->trans("WarningYouAreInMaintenanceMode", $conf->global->MAIN_ONLY_LOGIN_ALLOWED));
 
-    // Permit to add user company information on each printed document by set SHOW_SOCINFO_ON_PRINT
-    if (!empty($conf->global->SHOW_SOCINFO_ON_PRINT) && GETPOST('optioncss', 'aZ09') == 'print' && empty(GETPOST('disable_show_socinfo_on_print', 'az09')))
-    {
-        global $hookmanager;
-        $hookmanager->initHooks(array('showsocinfoonprint'));
-        $parameters = array();
-        $reshook = $hookmanager->executeHooks('showSocinfoOnPrint', $parameters);
-        if (empty($reshook))
-        {
-            print '<!-- Begin show mysoc info header -->'."\n";
-            print '<div id="mysoc-info-header">'."\n";
-            print '<table class="centpercent div-table-responsive">'."\n";
-            print '<tbody>';
-            print '<tr><td rowspan="0" class="width20p">';
-            if ($conf->global->MAIN_SHOW_LOGO && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) && !empty($conf->global->MAIN_INFO_SOCIETE_LOGO)) {
-                print '<img id="mysoc-info-header-logo" style="max-width:100%" alt="" src="'.DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=mycompany&amp;file='.urlencode('logos/'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_LOGO)).'">';
-            }
-            print '</td><td  rowspan="0" class="width50p"></td></tr>'."\n";
-            print '<tr><td class="titre bold">'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_NOM).'</td></tr>'."\n";
-            print '<tr><td>'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_ADDRESS).'<br>'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_ZIP).' '.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_TOWN).'</td></tr>'."\n";
-            if (!empty($conf->global->MAIN_INFO_SOCIETE_TEL)) print '<tr><td style="padding-left: 1em" class="small">'.$langs->trans("Phone").' : '.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_TEL).'</td></tr>';
-            if (!empty($conf->global->MAIN_INFO_SOCIETE_MAIL)) print '<tr><td style="padding-left: 1em" class="small">'.$langs->trans("Email").' : '.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_MAIL).'</td></tr>';
-            if (!empty($conf->global->MAIN_INFO_SOCIETE_WEB)) print '<tr><td style="padding-left: 1em" class="small">'.$langs->trans("Web").' : '.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_WEB).'</td></tr>';
-            print '</tbody>';
-            print '</table>'."\n";
-            print '</div>'."\n";
-            print '<!-- End show mysoc info header -->'."\n";
-        }
-    }
+	// Permit to add user company information on each printed document by set SHOW_SOCINFO_ON_PRINT
+	if (!empty($conf->global->SHOW_SOCINFO_ON_PRINT) && GETPOST('optioncss', 'aZ09') == 'print' && empty(GETPOST('disable_show_socinfo_on_print', 'az09')))
+	{
+		global $hookmanager;
+		$hookmanager->initHooks(array('showsocinfoonprint'));
+		$parameters = array();
+		$reshook = $hookmanager->executeHooks('showSocinfoOnPrint', $parameters);
+		if (empty($reshook))
+		{
+			print '<!-- Begin show mysoc info header -->'."\n";
+			print '<div id="mysoc-info-header">'."\n";
+			print '<table class="centpercent div-table-responsive">'."\n";
+			print '<tbody>';
+			print '<tr><td rowspan="0" class="width20p">';
+			if ($conf->global->MAIN_SHOW_LOGO && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) && !empty($conf->global->MAIN_INFO_SOCIETE_LOGO)) {
+				print '<img id="mysoc-info-header-logo" style="max-width:100%" alt="" src="'.DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=mycompany&amp;file='.urlencode('logos/'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_LOGO)).'">';
+			}
+			print '</td><td  rowspan="0" class="width50p"></td></tr>'."\n";
+			print '<tr><td class="titre bold">'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_NOM).'</td></tr>'."\n";
+			print '<tr><td>'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_ADDRESS).'<br>'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_ZIP).' '.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_TOWN).'</td></tr>'."\n";
+			if (!empty($conf->global->MAIN_INFO_SOCIETE_TEL)) print '<tr><td style="padding-left: 1em" class="small">'.$langs->trans("Phone").' : '.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_TEL).'</td></tr>';
+			if (!empty($conf->global->MAIN_INFO_SOCIETE_MAIL)) print '<tr><td style="padding-left: 1em" class="small">'.$langs->trans("Email").' : '.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_MAIL).'</td></tr>';
+			if (!empty($conf->global->MAIN_INFO_SOCIETE_WEB)) print '<tr><td style="padding-left: 1em" class="small">'.$langs->trans("Web").' : '.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_WEB).'</td></tr>';
+			print '</tbody>';
+			print '</table>'."\n";
+			print '</div>'."\n";
+			print '<!-- End show mysoc info header -->'."\n";
+		}
+	}
 }
 
 
@@ -2698,6 +2704,7 @@ if (!function_exists("llxFooter"))
 		global $conf, $db, $langs, $user, $mysoc, $object;
 		global $delayedhtmlcontent;
 		global $contextpage, $page, $limit;
+		global $dolibarr_distrib;
 
 		$ext = 'layout='.$conf->browser->layout.'&version='.urlencode(DOL_VERSION);
 
@@ -2858,35 +2865,35 @@ if (!function_exists("llxFooter"))
 			    					  timeout: 500,     // timeout milliseconds
 			    					  cache: false,
 			    					  data: {
-				    					  hash_algo: "md5",
-				    					  hash_unique_id: "<?php echo dol_escape_js($hash_unique_id); ?>",
-				    					  action: "dolibarrping",
-				    					  version: "<?php echo (float) DOL_VERSION; ?>",
-				    					  entity: "<?php echo (int) $conf->entity; ?>",
-				    					  dbtype: "<?php echo dol_escape_js($db->type); ?>",
-				    					  country_code: "<?php echo dol_escape_js($mysoc->country_code); ?>",
-				    					  php_version: "<?php echo phpversion(); ?>",
-				    					  os_version: "<?php echo version_os('smr'); ?>",
-				    					  distrib: "<?php echo $distrib ? $distrib : 'unknown'; ?>"
+				    					  hash_algo: 'md5',
+				    					  hash_unique_id: '<?php echo dol_escape_js($hash_unique_id); ?>',
+				    					  action: 'dolibarrping',
+				    					  version: '<?php echo (float) DOL_VERSION; ?>',
+				    					  entity: '<?php echo (int) $conf->entity; ?>',
+				    					  dbtype: '<?php echo dol_escape_js($db->type); ?>',
+				    					  country_code: '<?php echo $mysoc->country_code ? dol_escape_js($mysoc->country_code) : 'unknown'; ?>',
+				    					  php_version: '<?php echo dol_escape_js(phpversion()); ?>',
+				    					  os_version: '<?php echo dol_escape_js(version_os('smr')); ?>',
+				    					  distrib: '<?php echo $distrib ? dol_escape_js($distrib) : 'unknown'; ?>'
 				    				  },
 			    					  success: function (data, status, xhr) {   // success callback function (data contains body of response)
 			      					    	console.log("Ping ok");
 			        	    				$.ajax({
-			      	    					  method: "GET",
-			      	    					  url: "<?php echo DOL_URL_ROOT.'/core/ajax/pingresult.php'; ?>",
+			      	    					  method: 'GET',
+			      	    					  url: '<?php echo DOL_URL_ROOT.'/core/ajax/pingresult.php'; ?>',
 			      	    					  timeout: 500,     // timeout milliseconds
 			      	    					  cache: false,
-			      	        				  data: { hash_algo: "md5", hash_unique_id: "<?php echo dol_escape_js($hash_unique_id); ?>", action: "firstpingok" },	// to update
+			      	        				  data: { hash_algo: 'md5', hash_unique_id: '<?php echo dol_escape_js($hash_unique_id); ?>', action: 'firstpingok' },	// for update
 			    					  		});
 			    					  },
 			    					  error: function (data,status,xhr) {   // error callback function
 			        					    console.log("Ping ko: " + data);
 			        	    				$.ajax({
-			        	    					  method: "GET",
-			        	    					  url: "<?php echo DOL_URL_ROOT.'/core/ajax/pingresult.php'; ?>",
+			        	    					  method: 'GET',
+			        	    					  url: '<?php echo DOL_URL_ROOT.'/core/ajax/pingresult.php'; ?>',
 			        	    					  timeout: 500,     // timeout milliseconds
 			        	    					  cache: false,
-			        	        				  data: { hash_algo: "md5", hash_unique_id: "<?php echo dol_escape_js($hash_unique_id); ?>", action: "firstpingko" },
+			        	        				  data: { hash_algo: 'md5', hash_unique_id: '<?php echo dol_escape_js($hash_unique_id); ?>', action: 'firstpingko' },
 			      					  		});
 			    					  }
 			    				});
@@ -2906,5 +2913,5 @@ if (!function_exists("llxFooter"))
 
 		print "</body>\n";
 		print "</html>\n";
-    }
+	}
 }
diff --git a/htdocs/margin/admin/margin.php b/htdocs/margin/admin/margin.php
index 466c40a4e49..d9c470b7acd 100644
--- a/htdocs/margin/admin/margin.php
+++ b/htdocs/margin/admin/margin.php
@@ -249,7 +249,7 @@ print '</form>';
 
 print '</table>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '<br>';
 
diff --git a/htdocs/margin/agentMargins.php b/htdocs/margin/agentMargins.php
index 220715e6f72..9c8ff72681b 100644
--- a/htdocs/margin/agentMargins.php
+++ b/htdocs/margin/agentMargins.php
@@ -61,15 +61,15 @@ $enddatemonth   = GETPOST('enddatemonth', 'int');
 $enddateyear    = GETPOST('enddateyear', 'int');
 
 if (!empty($startdatemonth))
-    $startdate  = dol_mktime(0, 0, 0, $startdatemonth, $startdateday, $startdateyear);
+	$startdate = dol_mktime(0, 0, 0, $startdatemonth, $startdateday, $startdateyear);
 if (!empty($enddatemonth))
-    $enddate = dol_mktime(23, 59, 59, $enddatemonth, $enddateday, $enddateyear);
+	$enddate = dol_mktime(23, 59, 59, $enddatemonth, $enddateday, $enddateyear);
 
 // Security check
 if ($user->rights->margins->read->all) {
-    $agentid = GETPOST('agentid', 'int');
+	$agentid = GETPOST('agentid', 'int');
 } else {
-    $agentid = $user->id;
+	$agentid = $user->id;
 }
 $result = restrictedArea($user, 'margins');
 
@@ -130,7 +130,7 @@ print '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->t
 print '</td></tr>';
 print "</table>";
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '</form>';
 
@@ -201,9 +201,9 @@ if ($result)
 	print_barre_liste($langs->trans("MarginDetails"), $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, '', $num, $num, '', 0, '', '', 0, 1);
 
 	if ($conf->global->MARGIN_TYPE == "1")
-	    $labelcostprice = 'BuyingPrice';
+		$labelcostprice = 'BuyingPrice';
 	else // value is 'costprice' or 'pmp'
-	    $labelcostprice = 'CostPrice';
+		$labelcostprice = 'CostPrice';
 
 	$moreforfilter = '';
 
@@ -225,82 +225,82 @@ if ($result)
 		print_liste_field_titre("MarkRate", $_SERVER["PHP_SELF"], "", "", $param, '', $sortfield, $sortorder, 'right ');
 	print "</tr>\n";
 
-    if ($num > 0)
-    {
-        $group_list = array();
-        while ($objp = $db->fetch_object($result)) {
-            if ($agentid > 0) {
-                $group_id = $objp->socid;
-            } else {
-                $group_id = $objp->agent;
-            }
+	if ($num > 0)
+	{
+		$group_list = array();
+		while ($objp = $db->fetch_object($result)) {
+			if ($agentid > 0) {
+				$group_id = $objp->socid;
+			} else {
+				$group_id = $objp->agent;
+			}
 
-            if (!isset($group_list[$group_id])) {
-                if ($agentid > 0) {
-                    $group_name = $objp->name;
-                    $companystatic->id = $objp->socid;
-                    $companystatic->name = $objp->name;
-                    $companystatic->client = $objp->client;
-                    $group_htmlname = $companystatic->getNomUrl(1, 'customer');
-                } else {
-                    $group_name = $objp->lastname;
-                    $userstatic->fetch($objp->agent);
-                    $group_htmlname = $userstatic->getFullName($langs, 0, 0, 0);
-                }
-                $group_list[$group_id] = array('name' => $group_name, 'htmlname' => $group_htmlname, 'selling_price' => 0, 'buying_price' => 0, 'marge' => 0);
-            }
+			if (!isset($group_list[$group_id])) {
+				if ($agentid > 0) {
+					$group_name = $objp->name;
+					$companystatic->id = $objp->socid;
+					$companystatic->name = $objp->name;
+					$companystatic->client = $objp->client;
+					$group_htmlname = $companystatic->getNomUrl(1, 'customer');
+				} else {
+					$group_name = $objp->lastname;
+					$userstatic->fetch($objp->agent);
+					$group_htmlname = $userstatic->getFullName($langs, 0, 0, 0);
+				}
+				$group_list[$group_id] = array('name' => $group_name, 'htmlname' => $group_htmlname, 'selling_price' => 0, 'buying_price' => 0, 'marge' => 0);
+			}
 
-            $seller_nb = 1;
-            if ($objp->socid > 0) {
-                // sql nb sellers
-                $sql_seller  = "SELECT COUNT(sc.rowid) as nb";
-                $sql_seller .= " FROM ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-                $sql_seller .= " WHERE sc.fk_soc = ".$objp->socid;
-                $sql_seller .= " LIMIT 1";
+			$seller_nb = 1;
+			if ($objp->socid > 0) {
+				// sql nb sellers
+				$sql_seller  = "SELECT COUNT(sc.rowid) as nb";
+				$sql_seller .= " FROM ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+				$sql_seller .= " WHERE sc.fk_soc = ".$objp->socid;
+				$sql_seller .= " LIMIT 1";
 
-                $resql_seller = $db->query($sql_seller);
-                if (!$resql_seller) {
-                    dol_print_error($db);
-                } else {
-                    if ($obj_seller = $db->fetch_object($resql_seller)) {
-                        if ($obj_seller->nb > 0) {
-                            $seller_nb = $obj_seller->nb;
-                        }
-                    }
-                }
-            }
+				$resql_seller = $db->query($sql_seller);
+				if (!$resql_seller) {
+					dol_print_error($db);
+				} else {
+					if ($obj_seller = $db->fetch_object($resql_seller)) {
+						if ($obj_seller->nb > 0) {
+							$seller_nb = $obj_seller->nb;
+						}
+					}
+				}
+			}
 
-            $group_list[$group_id]['selling_price'] += $objp->selling_price / $seller_nb;
-            $group_list[$group_id]['buying_price'] += $objp->buying_price / $seller_nb;
-            $group_list[$group_id]['marge'] += $objp->marge / $seller_nb;
-        }
+			$group_list[$group_id]['selling_price'] += $objp->selling_price / $seller_nb;
+			$group_list[$group_id]['buying_price'] += $objp->buying_price / $seller_nb;
+			$group_list[$group_id]['marge'] += $objp->marge / $seller_nb;
+		}
 
-        // sort group array by sortfield
-        if ($sortfield == 'u.lastname' || $sortfield == 's.nom') {
-            $sortfield = 'name';
-        }
-        $group_list = dol_sort_array($group_list, $sortfield, $sortorder);
+		// sort group array by sortfield
+		if ($sortfield == 'u.lastname' || $sortfield == 's.nom') {
+			$sortfield = 'name';
+		}
+		$group_list = dol_sort_array($group_list, $sortfield, $sortorder);
 
-        foreach ($group_list as $group_id => $group_array) {
-            $pa = $group_array['buying_price'];
-            $pv = $group_array['selling_price'];
-            $marge = $group_array['marge'];
+		foreach ($group_list as $group_id => $group_array) {
+			$pa = $group_array['buying_price'];
+			$pv = $group_array['selling_price'];
+			$marge = $group_array['marge'];
 
-            $marginRate = ($pa != 0) ? (100 * $marge / $pa) : '';
-            $markRate = ($pv != 0) ? (100 * $marge / $pv) : '';
+			$marginRate = ($pa != 0) ? (100 * $marge / $pa) : '';
+			$markRate = ($pv != 0) ? (100 * $marge / $pv) : '';
 
-            print '<tr class="oddeven">';
-            print "<td>".$group_array['htmlname']."</td>\n";
-            print "<td class=\"right\">".price(price2num($pv, 'MT'))."</td>\n";
-            print "<td class=\"right\">".price(price2num($pa, 'MT'))."</td>\n";
-            print "<td class=\"right\">".price(price2num($marge, 'MT'))."</td>\n";
-            if (!empty($conf->global->DISPLAY_MARGIN_RATES))
-            	print "<td class=\"right\">".(($marginRate === '') ? 'n/a' : price(price2num($marginRate, 'MT'))."%")."</td>\n";
-            if (!empty($conf->global->DISPLAY_MARK_RATES))
-            	print "<td class=\"right\">".(($markRate === '') ? 'n/a' : price(price2num($markRate, 'MT'))."%")."</td>\n";
-            print "</tr>\n";
-        }
-    }
+			print '<tr class="oddeven">';
+			print "<td>".$group_array['htmlname']."</td>\n";
+			print "<td class=\"right\">".price(price2num($pv, 'MT'))."</td>\n";
+			print "<td class=\"right\">".price(price2num($pa, 'MT'))."</td>\n";
+			print "<td class=\"right\">".price(price2num($marge, 'MT'))."</td>\n";
+			if (!empty($conf->global->DISPLAY_MARGIN_RATES))
+				print "<td class=\"right\">".(($marginRate === '') ? 'n/a' : price(price2num($marginRate, 'MT'))."%")."</td>\n";
+			if (!empty($conf->global->DISPLAY_MARK_RATES))
+				print "<td class=\"right\">".(($markRate === '') ? 'n/a' : price(price2num($markRate, 'MT'))."%")."</td>\n";
+			print "</tr>\n";
+		}
+	}
 	print "</table>";
 	print '</div>';
 } else {
diff --git a/htdocs/margin/checkMargins.php b/htdocs/margin/checkMargins.php
index 22d23967ebd..5d019b2693a 100644
--- a/htdocs/margin/checkMargins.php
+++ b/htdocs/margin/checkMargins.php
@@ -63,9 +63,9 @@ $result = restrictedArea($user, 'margins');
 
 // Both test are required to be compatible with all browsers
 if (GETPOST("button_search_x") || GETPOST("button_search")) {
-    $action = 'search';
+	$action = 'search';
 } elseif (GETPOST("button_updatemagins_x") || GETPOST("button_updatemagins")) {
-    $action = 'update';
+	$action = 'update';
 }
 
 
@@ -82,40 +82,40 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 
 if (empty($reshook))
 {
-    // Selection of new fields
-    include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
+	// Selection of new fields
+	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
-    if ($action == 'update') {
-        $datapost = $_POST;
+	if ($action == 'update') {
+		$datapost = $_POST;
 
-        foreach ($datapost as $key => $value) {
-            if (strpos($key, 'buyingprice_') !== false) {
-                $tmp_array = explode('_', $key);
-                if (count($tmp_array) > 0) {
-                    $invoicedet_id = $tmp_array[1];
-                    if (!empty($invoicedet_id)) {
-                        $sql = 'UPDATE '.MAIN_DB_PREFIX.'facturedet';
-                        $sql .= ' SET buy_price_ht=\''.price2num($value).'\'';
-                        $sql .= ' WHERE rowid='.$invoicedet_id;
-                        $result = $db->query($sql);
-                        if (!$result) {
-                            setEventMessages($db->lasterror, null, 'errors');
-                        }
-                    }
-                }
-            }
-        }
-    }
+		foreach ($datapost as $key => $value) {
+			if (strpos($key, 'buyingprice_') !== false) {
+				$tmp_array = explode('_', $key);
+				if (count($tmp_array) > 0) {
+					$invoicedet_id = $tmp_array[1];
+					if (!empty($invoicedet_id)) {
+						$sql = 'UPDATE '.MAIN_DB_PREFIX.'facturedet';
+						$sql .= ' SET buy_price_ht=\''.price2num($value).'\'';
+						$sql .= ' WHERE rowid='.$invoicedet_id;
+						$result = $db->query($sql);
+						if (!$result) {
+							setEventMessages($db->lasterror, null, 'errors');
+						}
+					}
+				}
+			}
+		}
+	}
 
-    // Purge search criteria
-    if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
-    {
-        $search_ref = '';
-        $search_array_options = array();
-    }
+	// Purge search criteria
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
+	{
+		$search_ref = '';
+		$search_array_options = array();
+	}
 
-    // Mass actions
-    /*
+	// Mass actions
+	/*
     $objectclass='Product';
     if ((string) $type == '1') { $objectlabel='Services'; }
     if ((string) $type == '0') { $objectlabel='Products'; }
@@ -178,7 +178,7 @@ print '</td>';
 print '</tr>';
 print "</table>";
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 $arrayfields = array();
@@ -222,9 +222,9 @@ if ($result) {
 	print_barre_liste($langs->trans("MarginDetails"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, '', 0, '', '', $limit);
 
 	if ($conf->global->MARGIN_TYPE == "1")
-	    $labelcostprice = 'BuyingPrice';
+		$labelcostprice = 'BuyingPrice';
 	else // value is 'costprice' or 'pmp'
-	    $labelcostprice = 'CostPrice';
+		$labelcostprice = 'CostPrice';
 
 	$moreforfilter = '';
 
@@ -233,8 +233,8 @@ if ($result) {
 	//if ($massactionbutton) $selectedfields.=$form->showCheckAddButtons('checkforselect', 1);
 	$selectedfields = '';
 
-    print '<div class="div-table-responsive">';
-    print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
+	print '<div class="div-table-responsive">';
+	print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 	print '<tr class="liste_titre liste_titre_search">';
 	print '<td><input type="text" name="search_ref" value="'.dol_escape_htmltag($search_ref).'"></td>';
@@ -243,10 +243,10 @@ if ($result) {
 	print '<td></td>';
 	print '<td></td>';
 	print '<td></td>';
-    print '<td class="liste_titre" align="middle">';
-    $searchpitco = $form->showFilterButtons();
-    print $searchpitco;
-    print '</td>';
+	print '<td class="liste_titre" align="middle">';
+	$searchpitco = $form->showFilterButtons();
+	print $searchpitco;
+	print '</td>';
 	print "</tr>\n";
 
 	print '<tr class="liste_titre">';
@@ -259,10 +259,10 @@ if ($result) {
 	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', $param, 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
 	print "</tr>\n";
 
-    $i = 0;
+	$i = 0;
 	while ($i < min($num, $limit))
 	{
-	    $objp = $db->fetch_object($result);
+		$objp = $db->fetch_object($result);
 
 		print '<tr class="oddeven">';
 		print '<td>';
diff --git a/htdocs/margin/customerMargins.php b/htdocs/margin/customerMargins.php
index 1a8a253994b..ec05d59b07f 100644
--- a/htdocs/margin/customerMargins.php
+++ b/htdocs/margin/customerMargins.php
@@ -125,8 +125,8 @@ if (!$sortfield)
 		$sortfield = "f.datef";
 		$sortorder = "DESC";
 	} else {
-	    $sortfield = "s.nom";
-	    $sortorder = "ASC";
+		$sortfield = "s.nom";
+		$sortorder = "ASC";
 	}
 }
 
@@ -193,7 +193,7 @@ if (!empty($conf->global->DISPLAY_MARK_RATES)) {
 
 print "</table>";
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '</form>';
 
@@ -251,9 +251,9 @@ if ($result)
 	print_barre_liste($langs->trans("MarginDetails"), $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, '', $num, $num, '', 0, '', '', 0, 1);
 
 	if ($conf->global->MARGIN_TYPE == "1")
-	    $labelcostprice = 'BuyingPrice';
+		$labelcostprice = 'BuyingPrice';
 	else // value is 'costprice' or 'pmp'
-	    $labelcostprice = 'CostPrice';
+		$labelcostprice = 'CostPrice';
 
 	$moreforfilter = '';
 
@@ -299,7 +299,7 @@ if ($result)
 
 			print '<tr class="oddeven">';
 			if ($client) {
-		        print '<td>';
+				print '<td>';
 				$invoicestatic->id = $objp->facid;
 				$invoicestatic->ref = $objp->ref;
 				print $invoicestatic->getNomUrl(1);
@@ -344,7 +344,7 @@ if ($result)
 
 	print '<tr class="liste_total">';
 	if ($client)
-	    print '<td colspan=2>';
+		print '<td colspan=2>';
   	else print '<td>';
   	print $langs->trans('TotalMargin')."</td>";
 	print "<td class=\"right\">".price($cumul_vente, null, null, null, null, $rounding)."</td>\n";
diff --git a/htdocs/margin/productMargins.php b/htdocs/margin/productMargins.php
index 7deeffe92bd..d3af8726d89 100644
--- a/htdocs/margin/productMargins.php
+++ b/htdocs/margin/productMargins.php
@@ -63,8 +63,8 @@ if (!$sortfield)
 		$sortfield = "f.datef";
 		$sortorder = "DESC";
 	} else {
-	    $sortfield = "p.ref";
-	    $sortorder = "ASC";
+		$sortfield = "p.ref";
+		$sortorder = "ASC";
 	}
 }
 
@@ -105,13 +105,13 @@ print dol_get_fiche_head($head, 'productMargins', $titre, 0, $picto);
 print '<table class="border centpercent">';
 
 if ($id > 0) {
-    print '<tr><td class="titlefield">'.$langs->trans('ChooseProduct/Service').'</td>';
-    print '<td class="maxwidthonsmartpone" colspan="4">';
-    $form->select_produits($id, 'id', '', 20, 0, 1, 2, '', 1, array(), 0, 'All');
-    print '</td></tr>';
+	print '<tr><td class="titlefield">'.$langs->trans('ChooseProduct/Service').'</td>';
+	print '<td class="maxwidthonsmartpone" colspan="4">';
+	$form->select_produits($id, 'id', '', 20, 0, 1, 2, '', 1, array(), 0, 'All');
+	print '</td></tr>';
 
-    if (!$sortorder) $sortorder = "DESC";
-    if (!$sortfield) $sortfield = "f.datef";
+	if (!$sortorder) $sortorder = "DESC";
+	if (!$sortfield) $sortfield = "f.datef";
 } else {
 	print '<tr><td class="titlefield">'.$langs->trans('ChooseProduct/Service').'</td>';
 	print '<td class="maxwidthonsmartphone" colspan="4">';
@@ -170,7 +170,7 @@ if (!empty($conf->global->DISPLAY_MARK_RATES)) {
 
 print "</table>";
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '</form>';
 
@@ -224,15 +224,15 @@ if ($result)
 
 	//var_dump($conf->global->MARGIN_TYPE);
 	if ($conf->global->MARGIN_TYPE == "1")
-	    $labelcostprice = 'BuyingPrice';
+		$labelcostprice = 'BuyingPrice';
 	else // value is 'costprice' or 'pmp'
-	    $labelcostprice = 'CostPrice';
+		$labelcostprice = 'CostPrice';
 
 	$moreforfilter = '';
 
 	$i = 0;
-    print '<div class="div-table-responsive">';
-    print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
+	print '<div class="div-table-responsive">';
+	print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 	print '<tr class="liste_titre">';
 	if ($id > 0) {
@@ -287,15 +287,15 @@ if ($result)
 				print '<td>';
 				if ($objp->rowid > 0)
 				{
-    				$product_static->type = $objp->fk_product_type;
-    				$product_static->id = $objp->rowid;
-    				$product_static->ref = $objp->ref;
-    				$product_static->label = $objp->label;
-    				$product_static->entity = $objp->pentity;
-    				$text = $product_static->getNomUrl(1);
-    				print $text .= ' - '.$objp->label;
+					$product_static->type = $objp->fk_product_type;
+					$product_static->id = $objp->rowid;
+					$product_static->ref = $objp->ref;
+					$product_static->label = $objp->label;
+					$product_static->entity = $objp->pentity;
+					$text = $product_static->getNomUrl(1);
+					print $text .= ' - '.$objp->label;
 				} else {
-				    print img_object('', 'product').' '.$langs->trans("NotPredefinedProducts");
+					print img_object('', 'product').' '.$langs->trans("NotPredefinedProducts");
 				}
 				print "</td>\n";
 				//print "<td>".$product_static->getNomUrl(1)."</td>\n";
diff --git a/htdocs/margin/tabs/productMargins.php b/htdocs/margin/tabs/productMargins.php
index a8ec93df400..5fcec11c93b 100644
--- a/htdocs/margin/tabs/productMargins.php
+++ b/htdocs/margin/tabs/productMargins.php
@@ -64,9 +64,9 @@ $form = new Form($db);
 
 if ($id > 0 || !empty($ref))
 {
-    $result = $object->fetch($id, $ref);
+	$result = $object->fetch($id, $ref);
 
-    $title = $langs->trans('ProductServiceCard');
+	$title = $langs->trans('ProductServiceCard');
 	$helpurl = '';
 	$shortlabel = dol_trunc($object->label, 16);
 	if (GETPOST("type") == '0' || ($object->type == Product::TYPE_PRODUCT))
@@ -94,13 +94,13 @@ if ($id > 0 || !empty($ref))
 
 		$linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-        dol_banner_tab($object, 'ref', $linkback, ($user->socid ? 0 : 1), 'ref');
+		dol_banner_tab($object, 'ref', $linkback, ($user->socid ? 0 : 1), 'ref');
 
 
-        print '<div class="fichecenter">';
+		print '<div class="fichecenter">';
 
-        print '<div class="underbanner clearboth"></div>';
-        print '<table class="border tableforfield" width="100%">';
+		print '<div class="underbanner clearboth"></div>';
+		print '<table class="border tableforfield" width="100%">';
 
 		// Total Margin
 		print '<tr><td class="titlefield">'.$langs->trans("TotalMargin").'</td><td colspan="3">';
@@ -123,86 +123,86 @@ if ($id > 0 || !empty($ref))
 
 		print "</table>";
 
-        print '</div>';
-        print '<div style="clear:both"></div>';
+		print '</div>';
+		print '<div style="clear:both"></div>';
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 
-        if ($user->rights->facture->lire) {
-            $sql = "SELECT s.nom as name, s.rowid as socid, s.code_client,";
-            $sql .= " f.rowid as facid, f.ref, f.total as total_ht,";
-            $sql .= " f.datef, f.paye, f.fk_statut as statut, f.type,";
-            if (!$user->rights->societe->client->voir && !$socid) $sql .= " sc.fk_soc, sc.fk_user,";
-            $sql .= " sum(d.total_ht) as selling_price,"; // may be negative or positive
-            $sql .= " ".$db->ifsql('f.type = 2', -1, 1)." * sum(d.qty) as qty,"; // not always positive in case of Credit note
-            $sql .= " ".$db->ifsql('f.type = 2', -1, 1)." * sum(d.qty * d.buy_price_ht * (d.situation_percent / 100)) as buying_price,"; // not always positive in case of Credit note
-            $sql .= " ".$db->ifsql('f.type = 2', -1, 1)." * sum(abs(d.total_ht) - (d.buy_price_ht * d.qty * (d.situation_percent / 100))) as marge"; // not always positive in case of Credit note
-            $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
-            $sql .= ", ".MAIN_DB_PREFIX."facture as f";
-            $sql .= ", ".MAIN_DB_PREFIX."facturedet as d";
-            if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-            $sql .= " WHERE f.fk_soc = s.rowid";
-            $sql .= " AND f.fk_statut > 0";
-            $sql .= " AND f.entity IN (".getEntity('invoice').")";
-            $sql .= " AND d.fk_facture = f.rowid";
-            $sql .= " AND d.fk_product =".$object->id;
-            if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
-            if (!empty($socid)) $sql .= " AND f.fk_soc = $socid";
-            $sql .= " AND d.buy_price_ht IS NOT NULL";
-            if (isset($conf->global->ForceBuyingPriceIfNull) && $conf->global->ForceBuyingPriceIfNull == 1) $sql .= " AND d.buy_price_ht <> 0";
-            $sql .= " GROUP BY s.nom, s.rowid, s.code_client, f.rowid, f.ref, f.total, f.datef, f.paye, f.fk_statut, f.type";
-            if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user";
-            $sql .= $db->order($sortfield, $sortorder);
-            // TODO: calculate total to display then restore pagination
-            //$sql.= $db->plimit($conf->liste_limit +1, $offset);
-            dol_syslog('margin:tabs:productMargins.php', LOG_DEBUG);
-            $result = $db->query($sql);
-            if ($result) {
-                $num = $db->num_rows($result);
+		if ($user->rights->facture->lire) {
+			$sql = "SELECT s.nom as name, s.rowid as socid, s.code_client,";
+			$sql .= " f.rowid as facid, f.ref, f.total as total_ht,";
+			$sql .= " f.datef, f.paye, f.fk_statut as statut, f.type,";
+			if (!$user->rights->societe->client->voir && !$socid) $sql .= " sc.fk_soc, sc.fk_user,";
+			$sql .= " sum(d.total_ht) as selling_price,"; // may be negative or positive
+			$sql .= " ".$db->ifsql('f.type = 2', -1, 1)." * sum(d.qty) as qty,"; // not always positive in case of Credit note
+			$sql .= " ".$db->ifsql('f.type = 2', -1, 1)." * sum(d.qty * d.buy_price_ht * (d.situation_percent / 100)) as buying_price,"; // not always positive in case of Credit note
+			$sql .= " ".$db->ifsql('f.type = 2', -1, 1)." * sum(abs(d.total_ht) - (d.buy_price_ht * d.qty * (d.situation_percent / 100))) as marge"; // not always positive in case of Credit note
+			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+			$sql .= ", ".MAIN_DB_PREFIX."facture as f";
+			$sql .= ", ".MAIN_DB_PREFIX."facturedet as d";
+			if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+			$sql .= " WHERE f.fk_soc = s.rowid";
+			$sql .= " AND f.fk_statut > 0";
+			$sql .= " AND f.entity IN (".getEntity('invoice').")";
+			$sql .= " AND d.fk_facture = f.rowid";
+			$sql .= " AND d.fk_product =".$object->id;
+			if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+			if (!empty($socid)) $sql .= " AND f.fk_soc = $socid";
+			$sql .= " AND d.buy_price_ht IS NOT NULL";
+			if (isset($conf->global->ForceBuyingPriceIfNull) && $conf->global->ForceBuyingPriceIfNull == 1) $sql .= " AND d.buy_price_ht <> 0";
+			$sql .= " GROUP BY s.nom, s.rowid, s.code_client, f.rowid, f.ref, f.total, f.datef, f.paye, f.fk_statut, f.type";
+			if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user";
+			$sql .= $db->order($sortfield, $sortorder);
+			// TODO: calculate total to display then restore pagination
+			//$sql.= $db->plimit($conf->liste_limit +1, $offset);
+			dol_syslog('margin:tabs:productMargins.php', LOG_DEBUG);
+			$result = $db->query($sql);
+			if ($result) {
+				$num = $db->num_rows($result);
 
-                print_barre_liste($langs->trans("MarginDetails"), $page, $_SERVER["PHP_SELF"], "&amp;id=$object->id", $sortfield, $sortorder, '', 0, 0, '');
+				print_barre_liste($langs->trans("MarginDetails"), $page, $_SERVER["PHP_SELF"], "&amp;id=$object->id", $sortfield, $sortorder, '', 0, 0, '');
 
-                $i = 0;
+				$i = 0;
 
-                print '<div class="div-table-responsive">';
-                print '<table class="noborder centpercent">';
+				print '<div class="div-table-responsive">';
+				print '<table class="noborder centpercent">';
 
-                print '<tr class="liste_titre">';
-                print_liste_field_titre("Invoice", $_SERVER["PHP_SELF"], "f.ref", "", "&amp;id=".$object->id, '', $sortfield, $sortorder);
-                print_liste_field_titre("Company", $_SERVER["PHP_SELF"], "s.nom", "", "&amp;id=".$object->id, '', $sortfield, $sortorder);
-                print_liste_field_titre("CustomerCode", $_SERVER["PHP_SELF"], "s.code_client", "", "&amp;id=".$object->id, '', $sortfield, $sortorder);
-                print_liste_field_titre("DateInvoice", $_SERVER["PHP_SELF"], "f.datef", "", "&amp;id=".$object->id, '', $sortfield, $sortorder, 'left ');
-                print_liste_field_titre("SellingPrice", $_SERVER["PHP_SELF"], "selling_price", "", "&amp;id=".$object->id, '', $sortfield, $sortorder, 'right ');
-                print_liste_field_titre("BuyingPrice", $_SERVER["PHP_SELF"], "buying_price", "", "&amp;id=".$object->id, '', $sortfield, $sortorder, 'right ');
-                print_liste_field_titre("Qty", $_SERVER["PHP_SELF"], "d.qty", "", "&amp;id=".$object->id, '', $sortfield, $sortorder, 'right ');
-                print_liste_field_titre("Margin", $_SERVER["PHP_SELF"], "marge", "", "&amp;id=".$object->id, '', $sortfield, $sortorder, 'right ');
-                if (!empty($conf->global->DISPLAY_MARGIN_RATES))
-                    print_liste_field_titre("MarginRate", $_SERVER["PHP_SELF"], "", "", "&amp;id=".$object->id, '', $sortfield, $sortorder, 'right ');
-                if (!empty($conf->global->DISPLAY_MARK_RATES))
-                    print_liste_field_titre("MarkRate", $_SERVER["PHP_SELF"], "", "", "&amp;id=".$object->id, '', $sortfield, $sortorder, 'right ');
-                print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "f.paye,f.fk_statut", "", "&amp;id=".$object->id, '', $sortfield, $sortorder, 'right ');
-                print "</tr>\n";
+				print '<tr class="liste_titre">';
+				print_liste_field_titre("Invoice", $_SERVER["PHP_SELF"], "f.ref", "", "&amp;id=".$object->id, '', $sortfield, $sortorder);
+				print_liste_field_titre("Company", $_SERVER["PHP_SELF"], "s.nom", "", "&amp;id=".$object->id, '', $sortfield, $sortorder);
+				print_liste_field_titre("CustomerCode", $_SERVER["PHP_SELF"], "s.code_client", "", "&amp;id=".$object->id, '', $sortfield, $sortorder);
+				print_liste_field_titre("DateInvoice", $_SERVER["PHP_SELF"], "f.datef", "", "&amp;id=".$object->id, '', $sortfield, $sortorder, 'left ');
+				print_liste_field_titre("SellingPrice", $_SERVER["PHP_SELF"], "selling_price", "", "&amp;id=".$object->id, '', $sortfield, $sortorder, 'right ');
+				print_liste_field_titre("BuyingPrice", $_SERVER["PHP_SELF"], "buying_price", "", "&amp;id=".$object->id, '', $sortfield, $sortorder, 'right ');
+				print_liste_field_titre("Qty", $_SERVER["PHP_SELF"], "d.qty", "", "&amp;id=".$object->id, '', $sortfield, $sortorder, 'right ');
+				print_liste_field_titre("Margin", $_SERVER["PHP_SELF"], "marge", "", "&amp;id=".$object->id, '', $sortfield, $sortorder, 'right ');
+				if (!empty($conf->global->DISPLAY_MARGIN_RATES))
+					print_liste_field_titre("MarginRate", $_SERVER["PHP_SELF"], "", "", "&amp;id=".$object->id, '', $sortfield, $sortorder, 'right ');
+				if (!empty($conf->global->DISPLAY_MARK_RATES))
+					print_liste_field_titre("MarkRate", $_SERVER["PHP_SELF"], "", "", "&amp;id=".$object->id, '', $sortfield, $sortorder, 'right ');
+				print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "f.paye,f.fk_statut", "", "&amp;id=".$object->id, '', $sortfield, $sortorder, 'right ');
+				print "</tr>\n";
 
-                $cumul_achat = 0;
-                $cumul_vente = 0;
-                $cumul_qty = 0;
+				$cumul_achat = 0;
+				$cumul_vente = 0;
+				$cumul_qty = 0;
 
-                if ($num > 0) {
-                    while ($i < $num /*&& $i < $conf->liste_limit*/) {
-                        $objp = $db->fetch_object($result);
+				if ($num > 0) {
+					while ($i < $num /*&& $i < $conf->liste_limit*/) {
+						$objp = $db->fetch_object($result);
 
 						$marginRate = ($objp->buying_price != 0) ? (100 * $objp->marge / $objp->buying_price) : '';
 						$markRate = ($objp->selling_price != 0) ? (100 * $objp->marge / $objp->selling_price) : '';
 
-                        print '<tr class="oddeven">';
-                        print '<td>';
-                        $invoicestatic->id = $objp->facid;
-                        $invoicestatic->ref = $objp->ref;
-                        print $invoicestatic->getNomUrl(1);
-                        print "</td>\n";
-                        print '<td><a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$objp->socid.'">'.img_object($langs->trans("ShowCompany"), "company").' '.dol_trunc($objp->name, 44).'</a></td>';
-                        print "<td>".$objp->code_client."</td>\n";
+						print '<tr class="oddeven">';
+						print '<td>';
+						$invoicestatic->id = $objp->facid;
+						$invoicestatic->ref = $objp->ref;
+						print $invoicestatic->getNomUrl(1);
+						print "</td>\n";
+						print '<td><a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$objp->socid.'">'.img_object($langs->trans("ShowCompany"), "company").' '.dol_trunc($objp->name, 44).'</a></td>';
+						print "<td>".$objp->code_client."</td>\n";
 						print "<td class=\"center\">";
 						print dol_print_date($db->jdate($objp->datef), 'day')."</td>";
 						print "<td class=\"right\">".price(price2num($objp->selling_price, 'MT'))."</td>\n";
@@ -214,47 +214,47 @@ if ($id > 0 || !empty($ref))
 						if (!empty($conf->global->DISPLAY_MARK_RATES))
 							print "<td class=\"right\">".(($markRate === '') ? 'n/a' : price(price2num($markRate, 'MT'))."%")."</td>\n";
 						print '<td class="right">'.$invoicestatic->LibStatut($objp->paye, $objp->statut, 5).'</td>';
-                        print "</tr>\n";
-                        $i++;
-                        $cumul_achat += $objp->buying_price;
-                        $cumul_vente += $objp->selling_price;
-                        $cumul_qty += $objp->qty;
-                    }
-                }
+						print "</tr>\n";
+						$i++;
+						$cumul_achat += $objp->buying_price;
+						$cumul_vente += $objp->selling_price;
+						$cumul_qty += $objp->qty;
+					}
+				}
 
-                // affichage totaux marges
+				// affichage totaux marges
 
-                $totalMargin = $cumul_vente - $cumul_achat;
-                if ($totalMargin < 0)
-                {
-                    $marginRate = ($cumul_achat != 0) ?-1 * (100 * $totalMargin / $cumul_achat) : '';
-                    $markRate = ($cumul_vente != 0) ?-1 * (100 * $totalMargin / $cumul_vente) : '';
-                } else {
-                    $marginRate = ($cumul_achat != 0) ? (100 * $totalMargin / $cumul_achat) : '';
-                    $markRate = ($cumul_vente != 0) ? (100 * $totalMargin / $cumul_vente) : '';
-                }
-                print '<tr class="liste_total">';
-                print '<td colspan=4>'.$langs->trans('TotalMargin')."</td>";
-                print '<td class="right">'.price(price2num($cumul_vente, 'MT'))."</td>\n";
-                print '<td class="right">'.price(price2num($cumul_achat, 'MT'))."</td>\n";
-                print '<td class="right">'.price(price2num($cumul_qty, 'MT'))."</td>\n";
-                print '<td class="right">'.price(price2num($totalMargin, 'MT'))."</td>\n";
-                if (!empty($conf->global->DISPLAY_MARGIN_RATES))
-                	print '<td class="right">'.(($marginRate === '') ? 'n/a' : price(price2num($marginRate, 'MT'))."%")."</td>\n";
-                if (!empty($conf->global->DISPLAY_MARK_RATES))
-                	print "<td class=\"right\">".(($markRate === '') ? 'n/a' : price(price2num($markRate, 'MT'))."%")."</td>\n";
-                print '<td class="right">&nbsp;</td>';
-                print "</tr>\n";
-                print "</table>";
-                print '</div>';
-            } else {
-                dol_print_error($db);
-            }
-            $db->free($result);
-        }
-    }
+				$totalMargin = $cumul_vente - $cumul_achat;
+				if ($totalMargin < 0)
+				{
+					$marginRate = ($cumul_achat != 0) ?-1 * (100 * $totalMargin / $cumul_achat) : '';
+					$markRate = ($cumul_vente != 0) ?-1 * (100 * $totalMargin / $cumul_vente) : '';
+				} else {
+					$marginRate = ($cumul_achat != 0) ? (100 * $totalMargin / $cumul_achat) : '';
+					$markRate = ($cumul_vente != 0) ? (100 * $totalMargin / $cumul_vente) : '';
+				}
+				print '<tr class="liste_total">';
+				print '<td colspan=4>'.$langs->trans('TotalMargin')."</td>";
+				print '<td class="right">'.price(price2num($cumul_vente, 'MT'))."</td>\n";
+				print '<td class="right">'.price(price2num($cumul_achat, 'MT'))."</td>\n";
+				print '<td class="right">'.price(price2num($cumul_qty, 'MT'))."</td>\n";
+				print '<td class="right">'.price(price2num($totalMargin, 'MT'))."</td>\n";
+				if (!empty($conf->global->DISPLAY_MARGIN_RATES))
+					print '<td class="right">'.(($marginRate === '') ? 'n/a' : price(price2num($marginRate, 'MT'))."%")."</td>\n";
+				if (!empty($conf->global->DISPLAY_MARK_RATES))
+					print "<td class=\"right\">".(($markRate === '') ? 'n/a' : price(price2num($markRate, 'MT'))."%")."</td>\n";
+				print '<td class="right">&nbsp;</td>';
+				print "</tr>\n";
+				print "</table>";
+				print '</div>';
+			} else {
+				dol_print_error($db);
+			}
+			$db->free($result);
+		}
+	}
 } else {
-    dol_print_error();
+	dol_print_error();
 }
 
 print '
diff --git a/htdocs/margin/tabs/thirdpartyMargins.php b/htdocs/margin/tabs/thirdpartyMargins.php
index a31f6007062..683bc433c29 100644
--- a/htdocs/margin/tabs/thirdpartyMargins.php
+++ b/htdocs/margin/tabs/thirdpartyMargins.php
@@ -76,190 +76,190 @@ llxHeader('', $title, $help_url);
 
 if ($socid > 0)
 {
-    $object = new Societe($db);
-    $object->fetch($socid);
+	$object = new Societe($db);
+	$object->fetch($socid);
 
-    /*
+	/*
      * Affichage onglets
      */
 
-    $head = societe_prepare_head($object);
+	$head = societe_prepare_head($object);
 
-    print dol_get_fiche_head($head, 'margin', $langs->trans("ThirdParty"), -1, 'company');
+	print dol_get_fiche_head($head, 'margin', $langs->trans("ThirdParty"), -1, 'company');
 
-    $linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+	$linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-    dol_banner_tab($object, 'socid', $linkback, ($user->socid ? 0 : 1), 'rowid', 'nom');
+	dol_banner_tab($object, 'socid', $linkback, ($user->socid ? 0 : 1), 'rowid', 'nom');
 
-    print '<div class="fichecenter">';
+	print '<div class="fichecenter">';
 
-    print '<div class="underbanner clearboth"></div>';
-    print '<table class="border tableforfield" width="100%">';
+	print '<div class="underbanner clearboth"></div>';
+	print '<table class="border tableforfield" width="100%">';
 
-    if ($object->client)
-    {
-        print '<tr><td class="titlefield">';
-        print $langs->trans('CustomerCode').'</td><td colspan="3">';
-        print $object->code_client;
-        if ($object->check_codeclient() <> 0) print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
-        print '</td></tr>';
-    }
+	if ($object->client)
+	{
+		print '<tr><td class="titlefield">';
+		print $langs->trans('CustomerCode').'</td><td colspan="3">';
+		print $object->code_client;
+		if ($object->check_codeclient() <> 0) print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
+		print '</td></tr>';
+	}
 
-    if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || ! empty($conf->supplier_order->enabled) || ! empty($conf->supplier_invoice->enabled)) && $object->fournisseur && !empty($user->rights->fournisseur->lire))
-    {
-        print '<tr><td class="titlefield">';
-        print $langs->trans('SupplierCode').'</td><td colspan="3">';
-        print $object->code_fournisseur;
-        if ($object->check_codefournisseur() <> 0) print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
-        print '</td></tr>';
-    }
+	if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) && $object->fournisseur && !empty($user->rights->fournisseur->lire))
+	{
+		print '<tr><td class="titlefield">';
+		print $langs->trans('SupplierCode').'</td><td colspan="3">';
+		print $object->code_fournisseur;
+		if ($object->check_codefournisseur() <> 0) print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
+		print '</td></tr>';
+	}
 
-    // Total Margin
-    print '<tr><td class="titlefield">'.$langs->trans("TotalMargin").'</td><td colspan="3">';
-    print '<span id="totalMargin"></span>'; // set by jquery (see below)
-    print '</td></tr>';
+	// Total Margin
+	print '<tr><td class="titlefield">'.$langs->trans("TotalMargin").'</td><td colspan="3">';
+	print '<span id="totalMargin"></span>'; // set by jquery (see below)
+	print '</td></tr>';
 
-    // Margin Rate
-    if (!empty($conf->global->DISPLAY_MARGIN_RATES)) {
-    	print '<tr><td>'.$langs->trans("MarginRate").'</td><td colspan="3">';
-    	print '<span id="marginRate"></span>'; // set by jquery (see below)
-    	print '</td></tr>';
-    }
+	// Margin Rate
+	if (!empty($conf->global->DISPLAY_MARGIN_RATES)) {
+		print '<tr><td>'.$langs->trans("MarginRate").'</td><td colspan="3">';
+		print '<span id="marginRate"></span>'; // set by jquery (see below)
+		print '</td></tr>';
+	}
 
-    // Mark Rate
-    if (!empty($conf->global->DISPLAY_MARK_RATES)) {
-    	print '<tr><td>'.$langs->trans("MarkRate").'</td><td colspan="3">';
-    	print '<span id="markRate"></span>'; // set by jquery (see below)
-    	print '</td></tr>';
-    }
+	// Mark Rate
+	if (!empty($conf->global->DISPLAY_MARK_RATES)) {
+		print '<tr><td>'.$langs->trans("MarkRate").'</td><td colspan="3">';
+		print '<span id="markRate"></span>'; // set by jquery (see below)
+		print '</td></tr>';
+	}
 
-    print "</table>";
+	print "</table>";
 
-    print '</div>';
-    print '<div style="clear:both"></div>';
+	print '</div>';
+	print '<div style="clear:both"></div>';
 
-    dol_fiche_end();
+	print dol_get_fiche_end();
 
-    print '<br>';
+	print '<br>';
 
-    $sql = "SELECT distinct s.nom, s.rowid as socid, s.code_client,";
-    $sql .= " f.rowid as facid, f.ref, f.total as total_ht,";
-    $sql .= " f.datef, f.paye, f.fk_statut as statut, f.type,";
-    $sql .= " sum(d.total_ht) as selling_price,"; // may be negative or positive
-    $sql .= " sum(d.qty * d.buy_price_ht * (d.situation_percent / 100)) as buying_price,"; // always positive
-    $sql .= " sum(abs(d.total_ht) - (d.buy_price_ht * d.qty * (d.situation_percent / 100))) as marge"; // always positive
-    $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
-    $sql .= ", ".MAIN_DB_PREFIX."facture as f";
-    $sql .= ", ".MAIN_DB_PREFIX."facturedet as d";
-    $sql .= " WHERE f.fk_soc = s.rowid";
-    $sql .= " AND f.fk_statut > 0";
-    $sql .= " AND f.entity IN (".getEntity('invoice').")";
-    $sql .= " AND d.fk_facture = f.rowid";
-    $sql .= " AND f.fk_soc = $socid";
-    $sql .= " AND d.buy_price_ht IS NOT NULL";
-    if (isset($conf->global->ForceBuyingPriceIfNull) && $conf->global->ForceBuyingPriceIfNull == 1) $sql .= " AND d.buy_price_ht <> 0";
-    $sql .= " GROUP BY s.nom, s.rowid, s.code_client, f.rowid, f.ref, f.total, f.datef, f.paye, f.fk_statut, f.type";
-    $sql .= $db->order($sortfield, $sortorder);
-    // TODO: calculate total to display then restore pagination
-    //$sql.= $db->plimit($conf->liste_limit +1, $offset);
+	$sql = "SELECT distinct s.nom, s.rowid as socid, s.code_client,";
+	$sql .= " f.rowid as facid, f.ref, f.total as total_ht,";
+	$sql .= " f.datef, f.paye, f.fk_statut as statut, f.type,";
+	$sql .= " sum(d.total_ht) as selling_price,"; // may be negative or positive
+	$sql .= " sum(d.qty * d.buy_price_ht * (d.situation_percent / 100)) as buying_price,"; // always positive
+	$sql .= " sum(abs(d.total_ht) - (d.buy_price_ht * d.qty * (d.situation_percent / 100))) as marge"; // always positive
+	$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+	$sql .= ", ".MAIN_DB_PREFIX."facture as f";
+	$sql .= ", ".MAIN_DB_PREFIX."facturedet as d";
+	$sql .= " WHERE f.fk_soc = s.rowid";
+	$sql .= " AND f.fk_statut > 0";
+	$sql .= " AND f.entity IN (".getEntity('invoice').")";
+	$sql .= " AND d.fk_facture = f.rowid";
+	$sql .= " AND f.fk_soc = $socid";
+	$sql .= " AND d.buy_price_ht IS NOT NULL";
+	if (isset($conf->global->ForceBuyingPriceIfNull) && $conf->global->ForceBuyingPriceIfNull == 1) $sql .= " AND d.buy_price_ht <> 0";
+	$sql .= " GROUP BY s.nom, s.rowid, s.code_client, f.rowid, f.ref, f.total, f.datef, f.paye, f.fk_statut, f.type";
+	$sql .= $db->order($sortfield, $sortorder);
+	// TODO: calculate total to display then restore pagination
+	//$sql.= $db->plimit($conf->liste_limit +1, $offset);
 
-    dol_syslog('margin:tabs:thirdpartyMargins.php', LOG_DEBUG);
-    $result = $db->query($sql);
-    if ($result)
-    {
-    	$num = $db->num_rows($result);
+	dol_syslog('margin:tabs:thirdpartyMargins.php', LOG_DEBUG);
+	$result = $db->query($sql);
+	if ($result)
+	{
+		$num = $db->num_rows($result);
 
-    	print_barre_liste($langs->trans("MarginDetails"), $page, $_SERVER["PHP_SELF"], "&amp;socid=".$object->id, $sortfield, $sortorder, '', $num, $num, '');
+		print_barre_liste($langs->trans("MarginDetails"), $page, $_SERVER["PHP_SELF"], "&amp;socid=".$object->id, $sortfield, $sortorder, '', $num, $num, '');
 
-    	$i = 0;
-    	print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
-    	print "<table class=\"noborder\" width=\"100%\">";
+		$i = 0;
+		print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+		print "<table class=\"noborder\" width=\"100%\">";
 
-    	print '<tr class="liste_titre">';
-    	print_liste_field_titre("Invoice", $_SERVER["PHP_SELF"], "f.ref", "", "&amp;socid=".$_REQUEST["socid"], '', $sortfield, $sortorder);
-    	print_liste_field_titre("DateInvoice", $_SERVER["PHP_SELF"], "f.datef", "", "&amp;socid=".$_REQUEST["socid"], '', $sortfield, $sortorder, 'center ');
-    	print_liste_field_titre("SoldAmount", $_SERVER["PHP_SELF"], "selling_price", "", "&amp;socid=".$_REQUEST["socid"], '', $sortfield, $sortorder, 'right ');
-    	print_liste_field_titre("PurchasedAmount", $_SERVER["PHP_SELF"], "buying_price", "", "&amp;socid=".$_REQUEST["socid"], '', $sortfield, $sortorder, 'right ');
-    	print_liste_field_titre("Margin", $_SERVER["PHP_SELF"], "marge", "", "&amp;socid=".$_REQUEST["socid"], '', $sortfield, $sortorder, 'right ');
-    	if (!empty($conf->global->DISPLAY_MARGIN_RATES))
-    		print_liste_field_titre("MarginRate", $_SERVER["PHP_SELF"], "", "", "&amp;socid=".$_REQUEST["socid"], '', $sortfield, $sortorder, 'right ');
-    	if (!empty($conf->global->DISPLAY_MARK_RATES))
-    		print_liste_field_titre("MarkRate", $_SERVER["PHP_SELF"], "", "", "&amp;socid=".$_REQUEST["socid"], '', $sortfield, $sortorder, 'right ');
-    	print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "f.paye,f.fk_statut", "", "&amp;socid=".$_REQUEST["socid"], '', $sortfield, $sortorder, 'right ');
-    	print "</tr>\n";
+		print '<tr class="liste_titre">';
+		print_liste_field_titre("Invoice", $_SERVER["PHP_SELF"], "f.ref", "", "&amp;socid=".$_REQUEST["socid"], '', $sortfield, $sortorder);
+		print_liste_field_titre("DateInvoice", $_SERVER["PHP_SELF"], "f.datef", "", "&amp;socid=".$_REQUEST["socid"], '', $sortfield, $sortorder, 'center ');
+		print_liste_field_titre("SoldAmount", $_SERVER["PHP_SELF"], "selling_price", "", "&amp;socid=".$_REQUEST["socid"], '', $sortfield, $sortorder, 'right ');
+		print_liste_field_titre("PurchasedAmount", $_SERVER["PHP_SELF"], "buying_price", "", "&amp;socid=".$_REQUEST["socid"], '', $sortfield, $sortorder, 'right ');
+		print_liste_field_titre("Margin", $_SERVER["PHP_SELF"], "marge", "", "&amp;socid=".$_REQUEST["socid"], '', $sortfield, $sortorder, 'right ');
+		if (!empty($conf->global->DISPLAY_MARGIN_RATES))
+			print_liste_field_titre("MarginRate", $_SERVER["PHP_SELF"], "", "", "&amp;socid=".$_REQUEST["socid"], '', $sortfield, $sortorder, 'right ');
+		if (!empty($conf->global->DISPLAY_MARK_RATES))
+			print_liste_field_titre("MarkRate", $_SERVER["PHP_SELF"], "", "", "&amp;socid=".$_REQUEST["socid"], '', $sortfield, $sortorder, 'right ');
+		print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "f.paye,f.fk_statut", "", "&amp;socid=".$_REQUEST["socid"], '', $sortfield, $sortorder, 'right ');
+		print "</tr>\n";
 
-    	$cumul_achat = 0;
-    	$cumul_vente = 0;
+		$cumul_achat = 0;
+		$cumul_vente = 0;
 
-    	if ($num > 0)
-    	{
-    		while ($i < $num /*&& $i < $conf->liste_limit*/)
-    		{
-    			$objp = $db->fetch_object($result);
+		if ($num > 0)
+		{
+			while ($i < $num /*&& $i < $conf->liste_limit*/)
+			{
+				$objp = $db->fetch_object($result);
 
-    			$marginRate = ($objp->buying_price != 0) ? (100 * $objp->marge / $objp->buying_price) : '';
-    			$markRate = ($objp->selling_price != 0) ? (100 * $objp->marge / $objp->selling_price) : '';
+				$marginRate = ($objp->buying_price != 0) ? (100 * $objp->marge / $objp->buying_price) : '';
+				$markRate = ($objp->selling_price != 0) ? (100 * $objp->marge / $objp->selling_price) : '';
 
-    			$sign = '';
-    			if ($objp->type == Facture::TYPE_CREDIT_NOTE) {
-    			    $sign = '-';
-    			}
+				$sign = '';
+				if ($objp->type == Facture::TYPE_CREDIT_NOTE) {
+					$sign = '-';
+				}
 
-    			print '<tr class="oddeven">';
-    			print '<td>';
-    			$invoicestatic->id = $objp->facid;
-    			$invoicestatic->ref = $objp->ref;
-    			print $invoicestatic->getNomUrl(1);
-    			print "</td>\n";
-    			print "<td class=\"center\">";
-    			print dol_print_date($db->jdate($objp->datef), 'day')."</td>";
-    			print "<td class=\"right\">".price(price2num($objp->selling_price, 'MT'))."</td>\n";
-    			print "<td class=\"right\">".price(price2num(($objp->type == 2 ? -1 : 1) * $objp->buying_price, 'MT'))."</td>\n";
-    			print "<td class=\"right\">".$sign.price(price2num($objp->marge, 'MT'))."</td>\n";
-    			if (!empty($conf->global->DISPLAY_MARGIN_RATES))
-    				print "<td class=\"right\">".(($marginRate === '') ? 'n/a' : $sign.price(price2num($marginRate, 'MT'))."%")."</td>\n";
-    			if (!empty($conf->global->DISPLAY_MARK_RATES))
-    				print "<td class=\"right\">".(($markRate === '') ? 'n/a' : price(price2num($markRate, 'MT'))."%")."</td>\n";
-    			print '<td class="right">'.$invoicestatic->LibStatut($objp->paye, $objp->statut, 5).'</td>';
-    			print "</tr>\n";
-    			$i++;
-    			$cumul_vente += $objp->selling_price;
-    			$cumul_achat += ($objp->type == 2 ? -1 : 1) * $objp->buying_price;
-    		}
-    	}
+				print '<tr class="oddeven">';
+				print '<td>';
+				$invoicestatic->id = $objp->facid;
+				$invoicestatic->ref = $objp->ref;
+				print $invoicestatic->getNomUrl(1);
+				print "</td>\n";
+				print "<td class=\"center\">";
+				print dol_print_date($db->jdate($objp->datef), 'day')."</td>";
+				print "<td class=\"right\">".price(price2num($objp->selling_price, 'MT'))."</td>\n";
+				print "<td class=\"right\">".price(price2num(($objp->type == 2 ? -1 : 1) * $objp->buying_price, 'MT'))."</td>\n";
+				print "<td class=\"right\">".$sign.price(price2num($objp->marge, 'MT'))."</td>\n";
+				if (!empty($conf->global->DISPLAY_MARGIN_RATES))
+					print "<td class=\"right\">".(($marginRate === '') ? 'n/a' : $sign.price(price2num($marginRate, 'MT'))."%")."</td>\n";
+				if (!empty($conf->global->DISPLAY_MARK_RATES))
+					print "<td class=\"right\">".(($markRate === '') ? 'n/a' : price(price2num($markRate, 'MT'))."%")."</td>\n";
+				print '<td class="right">'.$invoicestatic->LibStatut($objp->paye, $objp->statut, 5).'</td>';
+				print "</tr>\n";
+				$i++;
+				$cumul_vente += $objp->selling_price;
+				$cumul_achat += ($objp->type == 2 ? -1 : 1) * $objp->buying_price;
+			}
+		}
 
-    	// affichage totaux marges
+		// affichage totaux marges
 
-    	$totalMargin = $cumul_vente - $cumul_achat;
-    	if ($totalMargin < 0)
-    	{
-    		$marginRate = ($cumul_achat != 0) ?-1 * (100 * $totalMargin / $cumul_achat) : '';
-    		$markRate = ($cumul_vente != 0) ?-1 * (100 * $totalMargin / $cumul_vente) : '';
-    	} else {
-    		$marginRate = ($cumul_achat != 0) ? (100 * $totalMargin / $cumul_achat) : '';
-    		$markRate = ($cumul_vente != 0) ? (100 * $totalMargin / $cumul_vente) : '';
-    	}
+		$totalMargin = $cumul_vente - $cumul_achat;
+		if ($totalMargin < 0)
+		{
+			$marginRate = ($cumul_achat != 0) ?-1 * (100 * $totalMargin / $cumul_achat) : '';
+			$markRate = ($cumul_vente != 0) ?-1 * (100 * $totalMargin / $cumul_vente) : '';
+		} else {
+			$marginRate = ($cumul_achat != 0) ? (100 * $totalMargin / $cumul_achat) : '';
+			$markRate = ($cumul_vente != 0) ? (100 * $totalMargin / $cumul_vente) : '';
+		}
 
-    	// Total
-    	print '<tr class="liste_total">';
-    	print '<td colspan=2>'.$langs->trans('TotalMargin')."</td>";
-    	print "<td class=\"right\">".price(price2num($cumul_vente, 'MT'))."</td>\n";
-    	print "<td class=\"right\">".price(price2num($cumul_achat, 'MT'))."</td>\n";
-    	print "<td class=\"right\">".price(price2num($totalMargin, 'MT'))."</td>\n";
-    	if (!empty($conf->global->DISPLAY_MARGIN_RATES))
-    		print "<td class=\"right\">".(($marginRate === '') ? 'n/a' : price(price2num($marginRate, 'MT'))."%")."</td>\n";
-    	if (!empty($conf->global->DISPLAY_MARK_RATES))
-    		print "<td class=\"right\">".(($markRate === '') ? 'n/a' : price(price2num($markRate, 'MT'))."%")."</td>\n";
-    	print '<td class="right">&nbsp;</td>';
-    	print "</tr>\n";
-    } else {
-    	dol_print_error($db);
-    }
-    print "</table>";
-    print '</div>';
+		// Total
+		print '<tr class="liste_total">';
+		print '<td colspan=2>'.$langs->trans('TotalMargin')."</td>";
+		print "<td class=\"right\">".price(price2num($cumul_vente, 'MT'))."</td>\n";
+		print "<td class=\"right\">".price(price2num($cumul_achat, 'MT'))."</td>\n";
+		print "<td class=\"right\">".price(price2num($totalMargin, 'MT'))."</td>\n";
+		if (!empty($conf->global->DISPLAY_MARGIN_RATES))
+			print "<td class=\"right\">".(($marginRate === '') ? 'n/a' : price(price2num($marginRate, 'MT'))."%")."</td>\n";
+		if (!empty($conf->global->DISPLAY_MARK_RATES))
+			print "<td class=\"right\">".(($markRate === '') ? 'n/a' : price(price2num($markRate, 'MT'))."%")."</td>\n";
+		print '<td class="right">&nbsp;</td>';
+		print "</tr>\n";
+	} else {
+		dol_print_error($db);
+	}
+	print "</table>";
+	print '</div>';
 
-    print '<br>';
-    $db->free($result);
+	print '<br>';
+	$db->free($result);
 } else {
 	dol_print_error('', 'Parameter socid not defined');
 }
diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php
index 4f56652b3da..5c6f2d9359e 100644
--- a/htdocs/master.inc.php
+++ b/htdocs/master.inc.php
@@ -49,7 +49,7 @@ $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							= empty($dolibarr_main_db_pass)?'':$dolibarr_main_db_pass;
+$conf->db->pass							= empty($dolibarr_main_db_pass) ? '' : $dolibarr_main_db_pass;
 $conf->db->type							= $dolibarr_main_db_type;
 $conf->db->prefix = $dolibarr_main_db_prefix;
 $conf->db->character_set = $dolibarr_main_db_character_set;
@@ -117,7 +117,7 @@ if (!defined('NOREQUIRETRAN'))
  */
 if (!defined('NOREQUIREDB'))
 {
-    $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);
 
 	if ($db->error)
 	{
@@ -192,15 +192,15 @@ if (!empty($conf->file->mailing_limit_sendbyweb))
 }
 if (empty($conf->global->MAILING_LIMIT_SENDBYWEB))
 {
-    $conf->global->MAILING_LIMIT_SENDBYWEB = 25;
+	$conf->global->MAILING_LIMIT_SENDBYWEB = 25;
 }
 if (!empty($conf->file->mailing_limit_sendbycli))
 {
-    $conf->global->MAILING_LIMIT_SENDBYCLI = $conf->file->mailing_limit_sendbycli;
+	$conf->global->MAILING_LIMIT_SENDBYCLI = $conf->file->mailing_limit_sendbycli;
 }
 if (empty($conf->global->MAILING_LIMIT_SENDBYCLI))
 {
-    $conf->global->MAILING_LIMIT_SENDBYCLI = 0;
+	$conf->global->MAILING_LIMIT_SENDBYCLI = 0;
 }
 
 // If software has been locked. Only login $conf->global->MAIN_ONLY_LOGIN_ALLOWED is allowed.
@@ -245,9 +245,9 @@ if (!defined('NOREQUIREDB') && !defined('NOREQUIRESOC'))
 // Set default language (must be after the setValues setting global $conf->global->MAIN_LANG_DEFAULT. Page main.inc.php will overwrite langs->defaultlang with user value later)
 if (!defined('NOREQUIRETRAN'))
 {
-    $langcode = (GETPOST('lang', 'aZ09') ?GETPOST('lang', 'aZ09', 1) : (empty($conf->global->MAIN_LANG_DEFAULT) ? 'auto' : $conf->global->MAIN_LANG_DEFAULT));
-    if (defined('MAIN_LANG_DEFAULT')) $langcode = constant('MAIN_LANG_DEFAULT');
-    $langs->setDefaultLang($langcode);
+	$langcode = (GETPOST('lang', 'aZ09') ?GETPOST('lang', 'aZ09', 1) : (empty($conf->global->MAIN_LANG_DEFAULT) ? 'auto' : $conf->global->MAIN_LANG_DEFAULT));
+	if (defined('MAIN_LANG_DEFAULT')) $langcode = constant('MAIN_LANG_DEFAULT');
+	$langs->setDefaultLang($langcode);
 }
 
 
diff --git a/htdocs/modulebuilder/admin/setup.php b/htdocs/modulebuilder/admin/setup.php
index 112ed71ea82..220ecd1b5b1 100644
--- a/htdocs/modulebuilder/admin/setup.php
+++ b/htdocs/modulebuilder/admin/setup.php
@@ -194,7 +194,7 @@ print '</table>';
 print '<center><input type="submit" class="button" value="'.$langs->trans("Save").'" name="Button"></center>';
 
 if (GETPOST('withtab', 'alpha')) {
-	dol_fiche_end();
+	print dol_get_fiche_end();
 }
 
 print '<br>';
diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index 347202215b7..dfa8b5adef6 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -173,7 +173,7 @@ foreach ($dirsrootforscan as $dirread)
 	$textforlistofdirs .= '<strong class="wordbreakimp">'.$dirread.'</strong>';
 	if ($dirread == DOL_DOCUMENT_ROOT) {
 		if ($conf->global->MAIN_FEATURES_LEVEL >= 2) $textforlistofdirs .= $form->textwithpicto('', $langs->trans("ConstantIsOn", "MAIN_FEATURES_LEVEL"));
-		if (! empty($conf->global->MODULEBUILDER_ADD_DOCUMENT_ROOT)) $textforlistofdirs .= $form->textwithpicto('', $langs->trans("ConstantIsOn", "MODULEBUILDER_ADD_DOCUMENT_ROOT"));
+		if (!empty($conf->global->MODULEBUILDER_ADD_DOCUMENT_ROOT)) $textforlistofdirs .= $form->textwithpicto('', $langs->trans("ConstantIsOn", "MODULEBUILDER_ADD_DOCUMENT_ROOT"));
 	}
 	$i++;
 }
@@ -709,7 +709,7 @@ if ($dirins && $action == 'confirm_removefile' && !empty($module))
 		$dirtodelete  = $dirins.'/'.$dirnametodelete;
 
 		$result = dol_delete_file($filetodelete);
-		if (! $result) {
+		if (!$result) {
 			setEventMessages($langs->trans("ErrorFailToDeleteFile", basename($filetodelete)), null, 'errors');
 		} else {
 			if (dol_is_dir_empty($dirtodelete)) dol_delete_dir($dirtodelete);
@@ -783,9 +783,9 @@ if ($dirins && $action == 'initobject' && $module && GETPOST('createtablearray',
 			$fieldname = $obj->Field;
 			// type
 			$type = $obj->Type;
-			if ($type == 'int(11)') $type='integer';
-			if ($type == 'float') $type='real';
-			if (strstr($type, 'tinyint')) $type='integer';
+			if ($type == 'int(11)') $type = 'integer';
+			if ($type == 'float') $type = 'real';
+			if (strstr($type, 'tinyint')) $type = 'integer';
 			if ($obj->Field == 'fk_soc') $type = 'integer:Societe:societe/class/societe.class.php';
 			if (preg_match('/^fk_proj/', $obj->Field)) $type = 'integer:Project:projet/class/project.class.php:1:fk_statut=1';
 			if (preg_match('/^fk_prod/', $obj->Field)) $type = 'integer:Product:product/class/product.class.php:1';
@@ -1628,7 +1628,7 @@ if (!empty($module) && $module != 'initmodule' && $module != 'deletemodule')
 
 		$class = 'mod'.$module;
 	} catch (Throwable $e) {		// This is called in PHP 7 only. Never called with PHP 5.6
-		$loadclasserrormessage = $e->getMessage()."<br>\n";;
+		$loadclasserrormessage = $e->getMessage()."<br>\n";
 		$loadclasserrormessage .= 'File: '.$e->getFile()."<br>\n";
 		$loadclasserrormessage .= 'Line: '.$e->getLine()."<br>\n";
 	}
@@ -1637,8 +1637,7 @@ if (!empty($module) && $module != 'initmodule' && $module != 'deletemodule')
 	{
 		try {
 			$moduleobj = new $class($db);
-		} catch (Exception $e)
-		{
+		} catch (Exception $e) {
 			$error++;
 			print $e->getMessage();
 		}
@@ -1989,7 +1988,7 @@ if ($module == 'initmodule')
 					else print '<span class="opacitymedium">'.$langs->trans("ErrorFileNotFound", $pathtochangelog).'</span>';
 				}
 
-				dol_fiche_end();
+				print dol_get_fiche_end();
 			} else {	// Edit text file
 				$fullpathoffile = dol_buildpath($file, 0, 1); // Description - level 2
 
@@ -2011,7 +2010,7 @@ if ($module == 'initmodule')
 				$doleditor = new DolEditor('editfilecontent', $content, '', '300', 'Full', 'In', true, false, 'ace', 0, '99%', '');
 				print $doleditor->Create(1, '', false, $langs->trans("File").' : '.$file, (GETPOST('format', 'aZ09') ?GETPOST('format', 'aZ09') : 'html'));
 
-				dol_fiche_end();
+				print dol_get_fiche_end();
 
 				print '<center>';
 				print '<input type="submit" class="button buttonforacesave" id="savefile" name="savefile" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
@@ -2812,7 +2811,7 @@ if ($module == 'initmodule')
 				}
 			}
 
-			dol_fiche_end(); // Level 3
+			print dol_get_fiche_end(); // Level 3
 		}
 
 		if ($tab == 'menus')
@@ -3696,12 +3695,12 @@ if ($module == 'initmodule')
 
 		if ($tab != 'description')
 		{
-			dol_fiche_end();
+			print dol_get_fiche_end();
 		}
 	}
 }
 
-dol_fiche_end(); // End modules
+print dol_get_fiche_end(); // End modules
 
 // End of page
 llxFooter();
diff --git a/htdocs/modulebuilder/template/admin/about.php b/htdocs/modulebuilder/template/admin/about.php
index df122c43268..518920592f4 100644
--- a/htdocs/modulebuilder/template/admin/about.php
+++ b/htdocs/modulebuilder/template/admin/about.php
@@ -82,6 +82,6 @@ $tmpmodule = new modMyModule($db);
 print $tmpmodule->getDescLong();
 
 // Page end
-dol_fiche_end();
+print dol_get_fiche_end();
 llxFooter();
 $db->close();
diff --git a/htdocs/modulebuilder/template/admin/myobject_extrafields.php b/htdocs/modulebuilder/template/admin/myobject_extrafields.php
index 65353f905e6..fdc2161f504 100644
--- a/htdocs/modulebuilder/template/admin/myobject_extrafields.php
+++ b/htdocs/modulebuilder/template/admin/myobject_extrafields.php
@@ -74,15 +74,15 @@ print dol_get_fiche_head($head, 'myobject_extrafields', $langs->trans("MyObjectE
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_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>";
 }
 
 
@@ -92,9 +92,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';
 }
 
 /*
@@ -102,10 +102,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/modulebuilder/template/admin/setup.php b/htdocs/modulebuilder/template/admin/setup.php
index 77eed6681e3..ef64d46f502 100644
--- a/htdocs/modulebuilder/template/admin/setup.php
+++ b/htdocs/modulebuilder/template/admin/setup.php
@@ -252,7 +252,7 @@ if ($action == 'edit')
 
 $moduledir = 'mymodule';
 $myTmpObjects = array();
-$myTmpObjects['MyObject']=array('includerefgeneration'=>0, 'includedocgeneration'=>0);
+$myTmpObjects['MyObject'] = array('includerefgeneration'=>0, 'includedocgeneration'=>0);
 
 
 foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
@@ -518,7 +518,7 @@ if (empty($setupnotempty)) {
 }
 
 // Page end
-dol_fiche_end();
+print dol_get_fiche_end();
 
 llxFooter();
 $db->close();
diff --git a/htdocs/modulebuilder/template/class/api_mymodule.class.php b/htdocs/modulebuilder/template/class/api_mymodule.class.php
index 32113b71ef0..05ca7f27d16 100644
--- a/htdocs/modulebuilder/template/class/api_mymodule.class.php
+++ b/htdocs/modulebuilder/template/class/api_mymodule.class.php
@@ -290,8 +290,8 @@ class MyModuleApi extends DolibarrApi
 	/**
 	 * Clean sensible object datas
 	 *
-	 * @param   object  $object    Object to clean
-	 * @return    array    Array of cleaned object properties
+	 * @param   Object  $object     Object to clean
+	 * @return  Object              Object with cleaned properties
 	 */
 	protected function _cleanObjectDatas($object)
 	{
diff --git a/htdocs/modulebuilder/template/class/myobject.class.php b/htdocs/modulebuilder/template/class/myobject.class.php
index 2c03c3dd2a9..f3564a3ff20 100644
--- a/htdocs/modulebuilder/template/class/myobject.class.php
+++ b/htdocs/modulebuilder/template/class/myobject.class.php
@@ -83,7 +83,7 @@ class MyObject extends CommonObject
 	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
 	 *  'searchall' is 1 if we want to search in this field when making a search from the quick search button.
 	 *  'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
-	 *  'css' and 'cssview' is the CSS style to use on field. 'css' is used in creation and update. 'cssview' is used in view mode. For example: 'maxwidth200', 'wordbreak'
+	 *  'css' and 'cssview' and 'csslist' is the CSS style to use on field. 'css' is used in creation and update. 'cssview' is used in view mode. 'csslist' is used for columns in lists. For example: 'maxwidth200', 'wordbreak', 'tdoverflowmax200'
 	 *  'help' is a string visible as a tooltip on field
 	 *  'showoncombobox' if value of the field must be visible into the label of the combobox that list record
 	 *  'disabled' is 1 if we want to have the field locked by a 'disabled' attribute. In most cases, this is never set into the definition of $fields into class, but is set dynamically by some part of code.
@@ -254,7 +254,7 @@ class MyObject extends CommonObject
 		{
 			foreach ($this->fields as $key => $val)
 			{
-				if (is_array($val['arrayofkeyval']))
+				if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval']))
 				{
 					foreach ($val['arrayofkeyval'] as $key2 => $val2)
 					{
diff --git a/htdocs/modulebuilder/template/core/modules/modMyModule.class.php b/htdocs/modulebuilder/template/core/modules/modMyModule.class.php
index 8922bc00eb5..4917074dad0 100644
--- a/htdocs/modulebuilder/template/core/modules/modMyModule.class.php
+++ b/htdocs/modulebuilder/template/core/modules/modMyModule.class.php
@@ -90,8 +90,8 @@ class modMyModule extends DolibarrModules
 			'barcode' => 0,
 			// Set this to 1 if module has its own models directory (core/modules/xxx)
 			'models' => 0,
-            // Set this to 1 if module has its own printing directory (core/modules/printing)
-            'printing' => 0,
+			// Set this to 1 if module has its own printing directory (core/modules/printing)
+			'printing' => 0,
 			// Set this to 1 if module has its own theme directory (theme)
 			'theme' => 0,
 			// Set this to relative path of css file if module has its own css file
@@ -409,24 +409,24 @@ class modMyModule extends DolibarrModules
 		// Document templates
 		$moduledir = 'mymodule';
 		$myTmpObjects = array();
-		$myTmpObjects['MyObject']=array('includerefgeneration'=>0, 'includedocgeneration'=>0);
+		$myTmpObjects['MyObject'] = array('includerefgeneration'=>0, 'includedocgeneration'=>0);
 
 		foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 			if ($myTmpObjectKey == 'MyObject') continue;
 			if ($myTmpObjectArray['includerefgeneration']) {
-				$src=DOL_DOCUMENT_ROOT.'/install/doctemplates/mymodule/template_myobjects.odt';
-				$dirodt=DOL_DATA_ROOT.'/doctemplates/mymodule';
-				$dest=$dirodt.'/template_myobjects.odt';
+				$src = DOL_DOCUMENT_ROOT.'/install/doctemplates/mymodule/template_myobjects.odt';
+				$dirodt = DOL_DATA_ROOT.'/doctemplates/mymodule';
+				$dest = $dirodt.'/template_myobjects.odt';
 
-				if (file_exists($src) && ! file_exists($dest))
+				if (file_exists($src) && !file_exists($dest))
 				{
 					require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 					dol_mkdir($dirodt);
-					$result=dol_copy($src, $dest, 0, 0);
+					$result = dol_copy($src, $dest, 0, 0);
 					if ($result < 0)
 					{
 						$langs->load("errors");
-						$this->error=$langs->trans('ErrorFailToCopyFile', $src, $dest);
+						$this->error = $langs->trans('ErrorFailToCopyFile', $src, $dest);
 						return 0;
 					}
 				}
diff --git a/htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php b/htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php
index d585815e805..80b4f4ecb5a 100644
--- a/htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php
+++ b/htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php
@@ -47,9 +47,9 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
 	public $emetteur;
 
 	/**
-     * @var array Minimum version of PHP required by module.
-     * e.g.: PHP ≥ 5.6 = array(5, 6)
-     */
+	 * @var array Minimum version of PHP required by module.
+	 * e.g.: PHP ≥ 5.6 = array(5, 6)
+	 */
 	public $phpmin = array(5, 6);
 
 	/**
@@ -316,7 +316,7 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
 					'__FROM_EMAIL__' => $this->emetteur->email,
 					'__TOTAL_TTC__' => $object->total_ttc,
 					'__TOTAL_HT__' => $object->total_ht,
-					'__TOTAL_VAT__' => $object->total_vat
+					'__TOTAL_VAT__' => $object->total_tva
 				);
 				complete_substitutions_array($substitutionarray, $langs, $object);
 				// Call the ODTSubstitution hook
diff --git a/htdocs/modulebuilder/template/core/triggers/interface_99_modMyModule_MyModuleTriggers.class.php b/htdocs/modulebuilder/template/core/triggers/interface_99_modMyModule_MyModuleTriggers.class.php
index 4c661f42a24..8c0f39927bd 100644
--- a/htdocs/modulebuilder/template/core/triggers/interface_99_modMyModule_MyModuleTriggers.class.php
+++ b/htdocs/modulebuilder/template/core/triggers/interface_99_modMyModule_MyModuleTriggers.class.php
@@ -103,7 +103,7 @@ class InterfaceMyModuleTriggers extends DolibarrTriggers
 		$callback = array($this, $methodName);
 		if (is_callable($callback)) {
 			dol_syslog(
-				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+				"Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
 			);
 
 			return call_user_func($callback, $action, $object, $user, $langs, $conf);
diff --git a/htdocs/modulebuilder/template/myobject_agenda.php b/htdocs/modulebuilder/template/myobject_agenda.php
index 43253c90362..8db58b7ad4e 100644
--- a/htdocs/modulebuilder/template/myobject_agenda.php
+++ b/htdocs/modulebuilder/template/myobject_agenda.php
@@ -215,7 +215,7 @@ if ($object->id > 0)
 
 	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 
 
diff --git a/htdocs/modulebuilder/template/myobject_card.php b/htdocs/modulebuilder/template/myobject_card.php
index 685253385fb..83d84451d0e 100644
--- a/htdocs/modulebuilder/template/myobject_card.php
+++ b/htdocs/modulebuilder/template/myobject_card.php
@@ -139,6 +139,7 @@ if (empty($reshook))
 			else $backtopage = dol_buildpath('/mymodule/myobject_card.php', 1).'?id='.($id > 0 ? $id : '__ID__');
 		}
 	}
+
 	$triggermodname = 'MYMODULE_MYOBJECT_MODIFY'; // Name of trigger action code to execute when we modify record
 
 	// Actions cancel, add, update, update_extras, confirm_validate, confirm_delete, confirm_deleteline, confirm_clone, confirm_close, confirm_setdraft, confirm_reopen
@@ -231,7 +232,7 @@ if ($action == 'create')
 
 	print '</table>'."\n";
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div class="center">';
 	print '<input type="submit" class="button" name="add" value="'.dol_escape_htmltag($langs->trans("Create")).'">';
@@ -268,7 +269,7 @@ if (($id || $ref) && $action == 'edit')
 
 	print '</table>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div class="center"><input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
 	print ' &nbsp; <input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
@@ -396,7 +397,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 	print '<div class="clearboth"></div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 
 	/*
@@ -546,11 +547,11 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		// Documents
 		if ($includedocgeneration) {
 			$objref = dol_sanitizeFileName($object->ref);
-			$relativepath = $objref . '/' . $objref . '.pdf';
+			$relativepath = $objref.'/'.$objref.'.pdf';
 			$filedir = $conf->mymodule->dir_output.'/'.$object->element.'/'.$objref;
-			$urlsource = $_SERVER["PHP_SELF"] . "?id=" . $object->id;
-			$genallowed = $user->rights->mymodule->myobject->read;	// If you can read, you can build the PDF to read content
-			$delallowed = $user->rights->mymodule->myobject->write;	// If you can create/edit, you can remove a file on card
+			$urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
+			$genallowed = $user->rights->mymodule->myobject->read; // If you can read, you can build the PDF to read content
+			$delallowed = $user->rights->mymodule->myobject->write; // If you can create/edit, you can remove a file on card
 			print $formfile->showdocuments('mymodule:MyObject', $object->element.'/'.$objref, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 1, 0, 0, 28, 0, '', '', '', $langs->defaultlang);
 		}
 
diff --git a/htdocs/modulebuilder/template/myobject_document.php b/htdocs/modulebuilder/template/myobject_document.php
index 6a417e32372..b2158ac34ad 100644
--- a/htdocs/modulebuilder/template/myobject_document.php
+++ b/htdocs/modulebuilder/template/myobject_document.php
@@ -207,7 +207,7 @@ if ($object->id)
 
 	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	$modulepart = 'mymodule';
 	//$permission = $user->rights->mymodule->myobject->write;
diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index 4e21ea4f46c..a750ae9fdd6 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -445,9 +445,9 @@ foreach ($object->fields as $key => $val)
 	if (!empty($arrayfields['t.'.$key]['checked']))
 	{
 		print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
-		if (is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
+		if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
 		elseif (strpos($val['type'], 'integer:') === 0) {
-			print $object->showInputField($val, $key, $search[$key], '', '', 'search_', 'maxwidth150', 1);
+			print $object->showInputField($val, $key, $search[$key], '', '', 'search_', 'maxwidth125', 1);
 		} 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>';
 	}
@@ -472,7 +472,7 @@ print '</tr>'."\n";
 print '<tr class="liste_titre">';
 foreach ($object->fields as $key => $val)
 {
-	$cssforfield = (empty($val['css']) ? '' : $val['css']);
+	$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
 	if ($key == 'status') $cssforfield .= ($cssforfield ? ' ' : '').'center';
 	elseif (in_array($val['type'], array('date', 'datetime', 'timestamp'))) $cssforfield .= ($cssforfield ? ' ' : '').'center';
 	elseif (in_array($val['type'], array('timestamp'))) $cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
diff --git a/htdocs/modulebuilder/template/myobject_note.php b/htdocs/modulebuilder/template/myobject_note.php
index e83531b2445..f56585497ea 100644
--- a/htdocs/modulebuilder/template/myobject_note.php
+++ b/htdocs/modulebuilder/template/myobject_note.php
@@ -175,7 +175,7 @@ if ($id > 0 || !empty($ref))
 
 	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 }
 
 // End of page
diff --git a/htdocs/modulebuilder/template/test/phpunit/MyObjectTest.php b/htdocs/modulebuilder/template/test/phpunit/MyObjectTest.php
index 169bfeb92f6..fd05890ff48 100644
--- a/htdocs/modulebuilder/template/test/phpunit/MyObjectTest.php
+++ b/htdocs/modulebuilder/template/test/phpunit/MyObjectTest.php
@@ -22,7 +22,7 @@
  * \brief   PHPUnit test for MyObject class.
  */
 
-global $conf,$user,$langs,$db;
+global $conf, $user, $langs, $db;
 //define('TEST_DB_FORCE_TYPE','mysql');	// This is to force using mysql driver
 //require_once 'PHPUnit/Autoload.php';
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
@@ -33,7 +33,7 @@ if (empty($user->id)) {
 	$user->fetch(1);
 	$user->getrights();
 }
-$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
 
 $langs->load("main");
 
@@ -60,11 +60,11 @@ class MyObjectTest extends \PHPUnit_Framework_TestCase
 		parent::__construct();
 
 		//$this->sharedFixture
-		global $conf,$user,$langs,$db;
-		$this->savconf=$conf;
-		$this->savuser=$user;
-		$this->savlangs=$langs;
-		$this->savdb=$db;
+		global $conf, $user, $langs, $db;
+		$this->savconf = $conf;
+		$this->savuser = $user;
+		$this->savlangs = $langs;
+		$this->savdb = $db;
 
 		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
 		//print " - db ".$db->db;
@@ -77,7 +77,7 @@ class MyObjectTest extends \PHPUnit_Framework_TestCase
 	 */
 	public static function setUpBeforeClass()
 	{
-		global $conf,$user,$langs,$db;
+		global $conf, $user, $langs, $db;
 		$db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
 
 		print __METHOD__."\n";
@@ -89,11 +89,11 @@ class MyObjectTest extends \PHPUnit_Framework_TestCase
 	 */
 	protected function setUp()
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
 		print __METHOD__."\n";
 	}
@@ -113,7 +113,7 @@ class MyObjectTest extends \PHPUnit_Framework_TestCase
 	 */
 	public static function tearDownAfterClass()
 	{
-		global $conf,$user,$langs,$db;
+		global $conf, $user, $langs, $db;
 		$db->rollback();
 
 		print __METHOD__."\n";
@@ -126,11 +126,11 @@ class MyObjectTest extends \PHPUnit_Framework_TestCase
 	 */
 	public function testSomething()
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
 		$result = true;
 
diff --git a/htdocs/mrp/class/api_mos.class.php b/htdocs/mrp/class/api_mos.class.php
index d502e5cc99d..1d37e73adad 100644
--- a/htdocs/mrp/class/api_mos.class.php
+++ b/htdocs/mrp/class/api_mos.class.php
@@ -270,8 +270,8 @@ class Mos extends DolibarrApi
 	/**
 	 * Clean sensible object datas
 	 *
-	 * @param   object  $object     Object to clean
-	 * @return  array               Array of cleaned object properties
+	 * @param   Object  $object     Object to clean
+	 * @return  Object              Object with cleaned properties
 	 */
 	protected function _cleanObjectDatas($object)
 	{
diff --git a/htdocs/mrp/class/mo.class.php b/htdocs/mrp/class/mo.class.php
index cf4b4ccddd1..ee10229bfdc 100644
--- a/htdocs/mrp/class/mo.class.php
+++ b/htdocs/mrp/class/mo.class.php
@@ -102,12 +102,12 @@ class Mo extends CommonObject
 		'label' => array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>1, 'visible'=>1, 'position'=>42, 'notnull'=>-1, 'searchall'=>1, 'showoncombobox'=>'1',),
 		'fk_soc' => array('type'=>'integer:Societe:societe/class/societe.class.php:1', 'label'=>'ThirdParty', 'enabled'=>1, 'visible'=>-1, 'position'=>50, 'notnull'=>-1, 'index'=>1, 'css'=>'maxwidth300'),
 		'fk_project' => array('type'=>'integer:Project:projet/class/project.class.php:1:fk_statut=1', 'label'=>'Project', 'enabled'=>1, 'visible'=>-1, 'position'=>51, 'notnull'=>-1, 'index'=>1,),
-		'fk_warehouse' => array('type'=>'integer:Entrepot:product/stock/class/entrepot.class.php:0', 'label'=>'WarehouseForProduction', 'enabled'=>1, 'visible'=>-1, 'position'=>52, 'css'=>'maxwidth300'),
-	    'note_public' => array('type'=>'html', 'label'=>'NotePublic', 'enabled'=>1, 'visible'=>0, 'position'=>61, 'notnull'=>-1,),
+		'fk_warehouse' => array('type'=>'integer:Entrepot:product/stock/class/entrepot.class.php:0', 'label'=>'WarehouseForProduction', 'enabled'=>1, 'visible'=>1, 'position'=>52, 'css'=>'maxwidth300'),
+		'note_public' => array('type'=>'html', 'label'=>'NotePublic', 'enabled'=>1, 'visible'=>0, 'position'=>61, 'notnull'=>-1,),
 		'note_private' => array('type'=>'html', 'label'=>'NotePrivate', 'enabled'=>1, 'visible'=>0, 'position'=>62, 'notnull'=>-1,),
 		'date_creation' => array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-2, 'position'=>500, 'notnull'=>1,),
 		'tms' => array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>1, 'visible'=>-2, 'position'=>501, 'notnull'=>-1,),
-		'date_valid' => array('type'=>'datetime', 'label'=>'DateValidation', 'enabled'=>1, 'visible'=>2, 'position'=>502,),
+		'date_valid' => array('type'=>'datetime', 'label'=>'DateValidation', 'enabled'=>1, 'visible'=>-2, 'position'=>502,),
 		'fk_user_creat' => array('type'=>'integer', 'label'=>'UserAuthor', 'enabled'=>1, 'visible'=>-2, 'position'=>510, 'notnull'=>1, 'foreignkey'=>'user.rowid',),
 		'fk_user_modif' => array('type'=>'integer', 'label'=>'UserModif', 'enabled'=>1, 'visible'=>-2, 'position'=>511, 'notnull'=>-1,),
 		'date_start_planned' => array('type'=>'datetime', 'label'=>'DateStartPlannedMo', 'enabled'=>1, 'visible'=>1, 'position'=>55, 'notnull'=>-1, 'index'=>1, 'help'=>'KeepEmptyForAsap'),
@@ -223,7 +223,7 @@ class Mo extends CommonObject
 		// Translate some data of arrayofkeyval
 		foreach ($this->fields as $key => $val)
 		{
-			if (is_array($val['arrayofkeyval']))
+			if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval']))
 			{
 				foreach ($val['arrayofkeyval'] as $key2 => $val2)
 				{
@@ -282,85 +282,85 @@ class Mo extends CommonObject
 	public function createFromClone(User $user, $fromid)
 	{
 		global $langs, $extrafields;
-	    $error = 0;
+		$error = 0;
 
-	    dol_syslog(__METHOD__, LOG_DEBUG);
+		dol_syslog(__METHOD__, LOG_DEBUG);
 
-	    $object = new self($this->db);
+		$object = new self($this->db);
 
-	    $this->db->begin();
+		$this->db->begin();
 
-	    // Load source object
-	    $result = $object->fetchCommon($fromid);
-	    if ($result > 0 && !empty($object->table_element_line)) $object->fetchLines();
+		// Load source object
+		$result = $object->fetchCommon($fromid);
+		if ($result > 0 && !empty($object->table_element_line)) $object->fetchLines();
 
-	    // get lines so they will be clone
-	    //foreach($this->lines as $line)
-	    //	$line->fetch_optionals();
+		// get lines so they will be clone
+		//foreach($this->lines as $line)
+		//	$line->fetch_optionals();
 
-	    // Reset some properties
-	    unset($object->id);
-	    unset($object->fk_user_creat);
-	    unset($object->import_key);
+		// Reset some properties
+		unset($object->id);
+		unset($object->fk_user_creat);
+		unset($object->import_key);
 
-	    // Clear fields
-	    $object->ref = empty($this->fields['ref']['default']) ? "copy_of_".$object->ref : $this->fields['ref']['default'];
-	    $object->label = empty($this->fields['label']['default']) ? $langs->trans("CopyOf")." ".$object->label : $this->fields['label']['default'];
-	    $object->status = self::STATUS_DRAFT;
-	    // ...
-	    // Clear extrafields that are unique
-	    if (is_array($object->array_options) && count($object->array_options) > 0)
-	    {
-	    	$extrafields->fetch_name_optionals_label($this->table_element);
-	    	foreach ($object->array_options as $key => $option)
-	    	{
-	    		$shortkey = preg_replace('/options_/', '', $key);
-	    		if (!empty($extrafields->attributes[$this->element]['unique'][$shortkey]))
-	    		{
-	    			//var_dump($key); var_dump($clonedObj->array_options[$key]); exit;
-	    			unset($object->array_options[$key]);
-	    		}
-	    	}
-	    }
+		// Clear fields
+		$object->ref = empty($this->fields['ref']['default']) ? "copy_of_".$object->ref : $this->fields['ref']['default'];
+		$object->label = empty($this->fields['label']['default']) ? $langs->trans("CopyOf")." ".$object->label : $this->fields['label']['default'];
+		$object->status = self::STATUS_DRAFT;
+		// ...
+		// Clear extrafields that are unique
+		if (is_array($object->array_options) && count($object->array_options) > 0)
+		{
+			$extrafields->fetch_name_optionals_label($this->table_element);
+			foreach ($object->array_options as $key => $option)
+			{
+				$shortkey = preg_replace('/options_/', '', $key);
+				if (!empty($extrafields->attributes[$this->element]['unique'][$shortkey]))
+				{
+					//var_dump($key); var_dump($clonedObj->array_options[$key]); exit;
+					unset($object->array_options[$key]);
+				}
+			}
+		}
 
-	    // Create clone
+		// Create clone
 		$object->context['createfromclone'] = 'createfromclone';
-	    $result = $object->createCommon($user);
-	    if ($result < 0) {
-	        $error++;
-	        $this->error = $object->error;
-	        $this->errors = $object->errors;
-	    }
+		$result = $object->createCommon($user);
+		if ($result < 0) {
+			$error++;
+			$this->error = $object->error;
+			$this->errors = $object->errors;
+		}
 
-	    if (!$error)
-	    {
-	    	// copy internal contacts
-	    	if ($this->copy_linked_contact($object, 'internal') < 0)
-	    	{
-	    		$error++;
-	    	}
-	    }
+		if (!$error)
+		{
+			// copy internal contacts
+			if ($this->copy_linked_contact($object, 'internal') < 0)
+			{
+				$error++;
+			}
+		}
 
-	    if (!$error)
-	    {
-	    	// copy external contacts if same company
-	    	if (property_exists($this, 'socid') && $this->socid == $object->socid)
-	    	{
-	    		if ($this->copy_linked_contact($object, 'external') < 0)
-	    			$error++;
-	    	}
-	    }
+		if (!$error)
+		{
+			// copy external contacts if same company
+			if (property_exists($this, 'socid') && $this->socid == $object->socid)
+			{
+				if ($this->copy_linked_contact($object, 'external') < 0)
+					$error++;
+			}
+		}
 
-	    unset($object->context['createfromclone']);
+		unset($object->context['createfromclone']);
 
-	    // End
-	    if (!$error) {
-	        $this->db->commit();
-	        return $object;
-	    } else {
-	        $this->db->rollback();
-	        return -1;
-	    }
+		// End
+		if (!$error) {
+			$this->db->commit();
+			return $object;
+		} else {
+			$this->db->rollback();
+			return -1;
+		}
 	}
 
 	/**
@@ -444,10 +444,10 @@ class Mo extends CommonObject
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			$num = $this->db->num_rows($resql);
-            $i = 0;
+			$i = 0;
 			while ($i < min($limit, $num))
 			{
-			    $obj = $this->db->fetch_object($resql);
+				$obj = $this->db->fetch_object($resql);
 
 				$record = new self($this->db);
 				$record->setVarsFromFetchObj($obj);
@@ -969,53 +969,53 @@ class Mo extends CommonObject
 		return $this->setStatusCommon($user, self::STATUS_VALIDATED, $notrigger, 'MRP_MO_REOPEN');
 	}
 
-    /**
-     *  Return a link to the object card (with optionaly the picto)
-     *
-     *  @param  int     $withpicto                  Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
-     *  @param  string  $option                     On what the link point to ('nolink', '', 'production', ...)
-     *  @param  int     $notooltip                  1=Disable tooltip
-     *  @param  string  $morecss                    Add more css on link
-     *  @param  int     $save_lastsearch_value      -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
-     *  @return	string                              String with URL
-     */
-    public function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $morecss = '', $save_lastsearch_value = -1)
-    {
-        global $conf, $langs, $hookmanager;
+	/**
+	 *  Return a link to the object card (with optionaly the picto)
+	 *
+	 *  @param  int     $withpicto                  Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
+	 *  @param  string  $option                     On what the link point to ('nolink', '', 'production', ...)
+	 *  @param  int     $notooltip                  1=Disable tooltip
+	 *  @param  string  $morecss                    Add more css on link
+	 *  @param  int     $save_lastsearch_value      -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+	 *  @return	string                              String with URL
+	 */
+	public function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $morecss = '', $save_lastsearch_value = -1)
+	{
+		global $conf, $langs, $hookmanager;
 
-        if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
+		if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
 
-        $result = '';
+		$result = '';
 
-        $label = img_picto('', $this->picto).' <u>'.$langs->trans("ManufacturingOrder").'</u>';
-        $label .= '<br>';
-        $label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref;
-        if (isset($this->status)) {
-        	$label .= '<br><b>'.$langs->trans("Status").":</b> ".$this->getLibStatut(5);
-        }
+		$label = img_picto('', $this->picto).' <u>'.$langs->trans("ManufacturingOrder").'</u>';
+		$label .= '<br>';
+		$label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref;
+		if (isset($this->status)) {
+			$label .= '<br><b>'.$langs->trans("Status").":</b> ".$this->getLibStatut(5);
+		}
 
-        $url = dol_buildpath('/mrp/mo_card.php', 1).'?id='.$this->id;
-        if ($option == 'production') $url = dol_buildpath('/mrp/mo_production.php', 1).'?id='.$this->id;
+		$url = dol_buildpath('/mrp/mo_card.php', 1).'?id='.$this->id;
+		if ($option == 'production') $url = dol_buildpath('/mrp/mo_production.php', 1).'?id='.$this->id;
 
-        if ($option != 'nolink')
-        {
-            // Add param to save lastsearch_values or not
-            $add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
-            if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
-            if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
-        }
+		if ($option != 'nolink')
+		{
+			// Add param to save lastsearch_values or not
+			$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
+			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
+			if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
+		}
 
-        $linkclose = '';
-        if (empty($notooltip))
-        {
-            if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-            {
-                $label = $langs->trans("ShowMo");
-                $linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
-            }
-            $linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
-            $linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
-        } else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+		$linkclose = '';
+		if (empty($notooltip))
+		{
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+			{
+				$label = $langs->trans("ShowMo");
+				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
+			}
+			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
+			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
+		} else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
 		$linkstart = '<a href="'.$url.'"';
 		$linkstart .= $linkclose.'>';
@@ -1035,7 +1035,7 @@ class Mo extends CommonObject
 		else $result .= $hookmanager->resPrint;
 
 		return $result;
-    }
+	}
 
 	/**
 	 *  Return label of the status
@@ -1048,7 +1048,7 @@ class Mo extends CommonObject
 		return $this->LibStatut($this->status, $mode);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return the status
 	 *
@@ -1154,20 +1154,20 @@ class Mo extends CommonObject
 	 */
 	public function getLinesArray()
 	{
-	    $this->lines = array();
+		$this->lines = array();
 
-	    $objectline = new MoLine($this->db);
-	    $result = $objectline->fetchAll('ASC', 'position', 0, 0, array('customsql'=>'fk_mo = '.$this->id));
+		$objectline = new MoLine($this->db);
+		$result = $objectline->fetchAll('ASC', 'position', 0, 0, array('customsql'=>'fk_mo = '.$this->id));
 
-	    if (is_numeric($result))
-	    {
-	        $this->error = $this->error;
-	        $this->errors = $this->errors;
-	        return $result;
-	    } else {
-	        $this->lines = $result;
-	        return $this->lines;
-	    }
+		if (is_numeric($result))
+		{
+			$this->error = $this->error;
+			$this->errors = $this->errors;
+			return $result;
+		} else {
+			$this->lines = $result;
+			return $this->lines;
+		}
 	}
 
 	/**
@@ -1436,7 +1436,7 @@ class MoLine extends CommonObjectLine
 		{
 			foreach ($this->fields as $key => $val)
 			{
-				if (is_array($val['arrayofkeyval']))
+				if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval']))
 				{
 					foreach ($val['arrayofkeyval'] as $key2 => $val2)
 					{
diff --git a/htdocs/mrp/index.php b/htdocs/mrp/index.php
index b7b96319a16..b84a77c2288 100644
--- a/htdocs/mrp/index.php
+++ b/htdocs/mrp/index.php
@@ -63,82 +63,82 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
 
 if ($conf->use_javascript_ajax)
 {
-    $sql = "SELECT COUNT(t.rowid) as nb, status";
-    $sql .= " FROM ".MAIN_DB_PREFIX."mrp_mo as t";
+	$sql = "SELECT COUNT(t.rowid) as nb, status";
+	$sql .= " FROM ".MAIN_DB_PREFIX."mrp_mo as t";
 	$sql .= " GROUP BY t.status";
 	$sql .= " ORDER BY t.status ASC";
-    $resql = $db->query($sql);
+	$resql = $db->query($sql);
 
-    if ($resql)
-    {
-    	$num = $db->num_rows($resql);
-    	$i = 0;
+	if ($resql)
+	{
+		$num = $db->num_rows($resql);
+		$i = 0;
 
-    	$totalnb = 0;
-    	$dataseries = array();
+		$totalnb = 0;
+		$dataseries = array();
 		$colorseries = array();
 		$vals = array();
 
 		include_once DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/theme_vars.inc.php';
 
-    	while ($i < $num)
-    	{
-    		$obj = $db->fetch_object($resql);
-    		if ($obj)
-    		{
-    			$vals[$obj->status] = $obj->nb;
+		while ($i < $num)
+		{
+			$obj = $db->fetch_object($resql);
+			if ($obj)
+			{
+				$vals[$obj->status] = $obj->nb;
 
    				$totalnb += $obj->nb;
-    		}
-    		$i++;
-    	}
-    	$db->free($resql);
+			}
+			$i++;
+		}
+		$db->free($resql);
 
-    	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("ManufacturingOrder") . '</th></tr>' . "\n";
-    	$listofstatus = array(0, 1, 2, 3, 9);
-    	foreach ($listofstatus as $status)
-    	{
-    		$dataseries[] = array($staticmo->LibStatut($status, 1), (isset($vals[$status]) ? (int) $vals[$status] : 0));
-    		if ($status == Mo::STATUS_DRAFT) $colorseries[$status] = '-'.$badgeStatus0;
-    		if ($status == Mo::STATUS_VALIDATED) $colorseries[$status] = $badgeStatus1;
-    		if ($status == Mo::STATUS_INPROGRESS) $colorseries[$status] = $badgeStatus4;
-    		if ($status == Mo::STATUS_PRODUCED) $colorseries[$status] = $badgeStatus6;
-    		if ($status == Mo::STATUS_CANCELED) $colorseries[$status] = $badgeStatus9;
+		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("ManufacturingOrder").'</th></tr>'."\n";
+		$listofstatus = array(0, 1, 2, 3, 9);
+		foreach ($listofstatus as $status)
+		{
+			$dataseries[] = array($staticmo->LibStatut($status, 1), (isset($vals[$status]) ? (int) $vals[$status] : 0));
+			if ($status == Mo::STATUS_DRAFT) $colorseries[$status] = '-'.$badgeStatus0;
+			if ($status == Mo::STATUS_VALIDATED) $colorseries[$status] = $badgeStatus1;
+			if ($status == Mo::STATUS_INPROGRESS) $colorseries[$status] = $badgeStatus4;
+			if ($status == Mo::STATUS_PRODUCED) $colorseries[$status] = $badgeStatus6;
+			if ($status == Mo::STATUS_CANCELED) $colorseries[$status] = $badgeStatus9;
 
-    		if (empty($conf->use_javascript_ajax))
-    		{
-    			print '<tr class="oddeven">';
-    			print '<td>'.$staticmo->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)
-    	{
-    		print '<tr><td class="center" colspan="2">';
+			if (empty($conf->use_javascript_ajax))
+			{
+				print '<tr class="oddeven">';
+				print '<td>'.$staticmo->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)
+		{
+			print '<tr><td class="center" colspan="2">';
 
-    		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($totalnb ? 0 : 1);
+			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($totalnb ? 0 : 1);
 
-    		print '</td></tr>';
-    	}
-    	print "</table>";
-    	print "</div>";
+			print '</td></tr>';
+		}
+		print "</table>";
+		print "</div>";
 
-    	print "<br>";
-    } else {
-    	dol_print_error($db);
-    }
+		print "<br>";
+	} else {
+		dol_print_error($db);
+	}
 }
 
 print '<br>';
@@ -212,47 +212,47 @@ $sql .= $db->plimit($max, 0);
 $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="4">'.$langs->trans("LatestMOModified", $max).'</th></tr>';
+	print '<div class="div-table-responsive-no-min">';
+	print '<table class="noborder centpercent">';
+	print '<tr class="liste_titre">';
+	print '<th colspan="4">'.$langs->trans("LatestMOModified", $max).'</th></tr>';
 
-    $num = $db->num_rows($resql);
-    if ($num)
-    {
-        $i = 0;
-        while ($i < $num)
-        {
-            $obj = $db->fetch_object($resql);
+	$num = $db->num_rows($resql);
+	if ($num)
+	{
+		$i = 0;
+		while ($i < $num)
+		{
+			$obj = $db->fetch_object($resql);
 
-            $staticmo->id = $obj->rowid;
-            $staticmo->ref = $obj->ref;
-            $staticmo->date_modification = $obj->datem;
-            $staticmo->status = $obj->status;
+			$staticmo->id = $obj->rowid;
+			$staticmo->ref = $obj->ref;
+			$staticmo->date_modification = $obj->datem;
+			$staticmo->status = $obj->status;
 
-            print '<tr class="oddeven">';
-            print '<td>'.$staticmo->getNomUrl(1, 32).'</td>';
-            print '<td>'.dol_print_date($db->jdate($obj->datem), 'dayhour').'</td>';
-            print '<td class="right">'.$staticmo->getLibStatut(3).'</td>';
-            print '</tr>';
-            $i++;
-        }
-    } else {
-        print '<tr class="oddeven">';
-        print '<td><span class="opacitymedium">'.$langs->trans("None").'</span></td>';
-        print '</tr>';
-    }
-    print "</table></div>";
-    print "<br>";
+			print '<tr class="oddeven">';
+			print '<td>'.$staticmo->getNomUrl(1, 32).'</td>';
+			print '<td>'.dol_print_date($db->jdate($obj->datem), 'dayhour').'</td>';
+			print '<td class="right">'.$staticmo->getLibStatut(3).'</td>';
+			print '</tr>';
+			$i++;
+		}
+	} else {
+		print '<tr class="oddeven">';
+		print '<td><span class="opacitymedium">'.$langs->trans("None").'</span></td>';
+		print '</tr>';
+	}
+	print "</table></div>";
+	print "<br>";
 } else {
-    dol_print_error($db);
+	dol_print_error($db);
 }
 
 print '</div></div></div>';
 
 $parameters = array(
-    //'type' => $type,
-    'user' => $user,
+	//'type' => $type,
+	'user' => $user,
 );
 $reshook = $hookmanager->executeHooks('dashboardMRP', $parameters);
 
diff --git a/htdocs/mrp/mo_agenda.php b/htdocs/mrp/mo_agenda.php
index d8031015064..0fe9ba63e08 100644
--- a/htdocs/mrp/mo_agenda.php
+++ b/htdocs/mrp/mo_agenda.php
@@ -46,10 +46,10 @@ $backtopage = GETPOST('backtopage', 'alpha');
 
 if (GETPOST('actioncode', 'array'))
 {
-    $actioncode = GETPOST('actioncode', 'array', 3);
-    if (!count($actioncode)) $actioncode = '0';
+	$actioncode = GETPOST('actioncode', 'array', 3);
+	if (!count($actioncode)) $actioncode = '0';
 } else {
-    $actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT));
+	$actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT));
 }
 $search_agenda_label = GETPOST('search_agenda_label');
 
@@ -94,19 +94,19 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 
 if (empty($reshook))
 {
-    // Cancel
-    if (GETPOST('cancel', 'alpha') && !empty($backtopage))
-    {
-        header("Location: ".$backtopage);
-        exit;
-    }
+	// Cancel
+	if (GETPOST('cancel', 'alpha') && !empty($backtopage))
+	{
+		header("Location: ".$backtopage);
+		exit;
+	}
 
-    // Purge search criteria
-    if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
-    {
-        $actioncode = '';
-        $search_agenda_label = '';
-    }
+	// Purge search criteria
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
+	{
+		$actioncode = '';
+		$search_agenda_label = '';
+	}
 }
 
 
@@ -177,66 +177,66 @@ if ($object->id > 0)
 
 	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>';
 
-    $object->info($object->id);
+	$object->info($object->id);
 	dol_print_object_info($object, 1);
 
 	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 
 
 	// Actions buttons
 
-    $objthirdparty = $object;
-    $objcon = new stdClass();
+	$objthirdparty = $object;
+	$objcon = new stdClass();
 
-    $out = '&origin='.$object->element.'&originid='.$object->id;
-    $permok = $user->rights->agenda->myactions->create;
-    if ((!empty($objthirdparty->id) || !empty($objcon->id)) && $permok)
-    {
-        //$out.='<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create';
-        if (get_class($objthirdparty) == 'Societe') $out .= '&amp;socid='.$objthirdparty->id;
-        $out .= (!empty($objcon->id) ? '&amp;contactid='.$objcon->id : '').'&amp;backtopage=1&amp;percentage=-1';
-    	//$out.=$langs->trans("AddAnAction").' ';
-    	//$out.=img_picto($langs->trans("AddAnAction"),'filenew');
-    	//$out.="</a>";
+	$out = '&origin='.$object->element.'&originid='.$object->id;
+	$permok = $user->rights->agenda->myactions->create;
+	if ((!empty($objthirdparty->id) || !empty($objcon->id)) && $permok)
+	{
+		//$out.='<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create';
+		if (get_class($objthirdparty) == 'Societe') $out .= '&amp;socid='.$objthirdparty->id;
+		$out .= (!empty($objcon->id) ? '&amp;contactid='.$objcon->id : '').'&amp;backtopage=1&amp;percentage=-1';
+		//$out.=$langs->trans("AddAnAction").' ';
+		//$out.=img_picto($langs->trans("AddAnAction"),'filenew');
+		//$out.="</a>";
 	}
 
 
 	print '<div class="tabsAction">';
 
-    if (!empty($conf->agenda->enabled))
-    {
-    	if (!empty($user->rights->agenda->myactions->create) || !empty($user->rights->agenda->allactions->create))
-    	{
-        	print '<a class="butAction" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create'.$out.'">'.$langs->trans("AddAction").'</a>';
-    	} else {
-        	print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans("AddAction").'</a>';
-    	}
-    }
+	if (!empty($conf->agenda->enabled))
+	{
+		if (!empty($user->rights->agenda->myactions->create) || !empty($user->rights->agenda->allactions->create))
+		{
+			print '<a class="butAction" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create'.$out.'">'.$langs->trans("AddAction").'</a>';
+		} else {
+			print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans("AddAction").'</a>';
+		}
+	}
 
-    print '</div>';
+	print '</div>';
 
-    if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read)))
-    {
-        $param = '&id='.$object->id.'&socid='.$socid;
-        if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
-        if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
+	if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read)))
+	{
+		$param = '&id='.$object->id.'&socid='.$socid;
+		if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
+		if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
 
 
 		//print load_fiche_titre($langs->trans("ActionsOnMo"), '', '');
 
-        // List of all actions
+		// List of all actions
 		$filters = array();
-        $filters['search_agenda_label'] = $search_agenda_label;
+		$filters['search_agenda_label'] = $search_agenda_label;
 
-        // TODO Replace this with same code than into list.php
-        show_actions_done($conf, $langs, $db, $object, null, 0, $actioncode, '', $filters, $sortfield, $sortorder);
-    }
+		// TODO Replace this with same code than into list.php
+		show_actions_done($conf, $langs, $db, $object, null, 0, $actioncode, '', $filters, $sortfield, $sortorder);
+	}
 }
 
 // End of page
diff --git a/htdocs/mrp/mo_card.php b/htdocs/mrp/mo_card.php
index 952d0dedab4..84484956df8 100644
--- a/htdocs/mrp/mo_card.php
+++ b/htdocs/mrp/mo_card.php
@@ -230,7 +230,7 @@ if ($action == 'create')
 
 	print '</table>'."\n";
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	?>
 	<script>
@@ -337,7 +337,7 @@ if (($id || $ref) && $action == 'edit')
 
 	print '</table>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div class="center"><input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
 	print ' &nbsp; <input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
@@ -493,7 +493,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 	print '<div class="clearboth"></div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 
 	/*
diff --git a/htdocs/mrp/mo_document.php b/htdocs/mrp/mo_document.php
index a83feb54aea..7ddf92c5cd1 100644
--- a/htdocs/mrp/mo_document.php
+++ b/htdocs/mrp/mo_document.php
@@ -157,9 +157,9 @@ if ($object->id)
 
 	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
 
-    print '<div class="fichecenter">';
+	print '<div class="fichecenter">';
 
-    print '<div class="underbanner clearboth"></div>';
+	print '<div class="underbanner clearboth"></div>';
 	print '<table class="border centpercent tableforfield">';
 
 	// Number of files
@@ -172,7 +172,7 @@ if ($object->id)
 
 	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	$modulepart = 'mrp';
 	$permission = $user->rights->mrp->write;
diff --git a/htdocs/mrp/mo_list.php b/htdocs/mrp/mo_list.php
index 7734e992d48..3c9312d50f6 100644
--- a/htdocs/mrp/mo_list.php
+++ b/htdocs/mrp/mo_list.php
@@ -310,8 +310,8 @@ if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&co
 if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
 foreach ($search as $key => $val)
 {
-    if (is_array($search[$key]) && count($search[$key])) foreach ($search[$key] as $skey) $param .= '&search_'.$key.'[]='.urlencode($skey);
-    else $param .= '&search_'.$key.'='.urlencode($search[$key]);
+	if (is_array($search[$key]) && count($search[$key])) foreach ($search[$key] as $skey) $param .= '&search_'.$key.'[]='.urlencode($skey);
+	else $param .= '&search_'.$key.'='.urlencode($search[$key]);
 }
 if ($optioncss != '')     $param .= '&optioncss='.urlencode($optioncss);
 // Add $param from extra fields
@@ -319,10 +319,10 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 
 // List of mass actions available
 $arrayofmassactions = array(
-    //'validate'=>$langs->trans("Validate"),
-    //'generate_doc'=>$langs->trans("ReGeneratePDF"),
-    //'builddoc'=>$langs->trans("PDFMerge"),
-    //'presend'=>$langs->trans("SendByMail"),
+	//'validate'=>$langs->trans("Validate"),
+	//'generate_doc'=>$langs->trans("ReGeneratePDF"),
+	//'builddoc'=>$langs->trans("PDFMerge"),
+	//'presend'=>$langs->trans("SendByMail"),
 );
 if ($permissiontodelete) $arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
 if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
@@ -392,9 +392,9 @@ foreach ($object->fields as $key => $val)
 	if (!empty($arrayfields['t.'.$key]['checked']))
 	{
 		print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
-		if (is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
+		if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
 		elseif (strpos($val['type'], 'integer:') === 0) {
-			print $object->showInputField($val, $key, $search[$key], '', '', 'search_', 'maxwidth150', 1);
+			print $object->showInputField($val, $key, $search[$key], '', '', 'search_', 'maxwidth125', 1);
 		} 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>';
 	}
@@ -468,16 +468,16 @@ while ($i < ($limit ? min($num, $limit) : $num))
 	foreach ($object->fields as $key => $val)
 	{
 		$cssforfield = (empty($val['css']) ? '' : $val['css']);
-	    if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) $cssforfield .= ($cssforfield ? ' ' : '').'center';
-	    elseif ($key == 'status') $cssforfield .= ($cssforfield ? ' ' : '').'center';
+		if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) $cssforfield .= ($cssforfield ? ' ' : '').'center';
+		elseif ($key == 'status') $cssforfield .= ($cssforfield ? ' ' : '').'center';
 
-	    if (in_array($val['type'], array('timestamp'))) $cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
-	    elseif ($key == 'ref') $cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+		if (in_array($val['type'], array('timestamp'))) $cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+		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 (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']))
+		if (!empty($arrayfields['t.'.$key]['checked']))
 		{
 			print '<td'.($cssforfield ? ' class="'.$cssforfield.'"' : '').'>';
 			if ($key == 'status') print $object->getLibStatut(5);
diff --git a/htdocs/mrp/mo_movements.php b/htdocs/mrp/mo_movements.php
index 522c740e58f..b4dbed059bc 100644
--- a/htdocs/mrp/mo_movements.php
+++ b/htdocs/mrp/mo_movements.php
@@ -105,21 +105,21 @@ $objectlist = new MouvementStock($db);
 
 // Definition of fields for list
 $arrayfields = array(
-	'm.rowid'=>array('label'=>$langs->trans("Ref"), 'checked'=>1),
-	'm.datem'=>array('label'=>$langs->trans("Date"), 'checked'=>1),
-	'p.ref'=>array('label'=>$langs->trans("ProductRef"), 'checked'=>1, 'css'=>'maxwidth100'),
-	'p.label'=>array('label'=>$langs->trans("ProductLabel"), 'checked'=>1),
-	'm.batch'=>array('label'=>$langs->trans("BatchNumberShort"), 'checked'=>1, 'enabled'=>(!empty($conf->productbatch->enabled))),
-	'pl.eatby'=>array('label'=>$langs->trans("EatByDate"), 'checked'=>0, 'position'=>10, 'enabled'=>(!empty($conf->productbatch->enabled))),
-	'pl.sellby'=>array('label'=>$langs->trans("SellByDate"), 'checked'=>0, 'position'=>10, 'enabled'=>(!empty($conf->productbatch->enabled))),
-	'e.ref'=>array('label'=>$langs->trans("Warehouse"), 'checked'=>1),
-	'm.fk_user_author'=>array('label'=>$langs->trans("Author"), 'checked'=>0),
-	'm.inventorycode'=>array('label'=>$langs->trans("InventoryCodeShort"), 'checked'=>1),
-	'm.label'=>array('label'=>$langs->trans("MovementLabel"), 'checked'=>1),
-	'm.type_mouvement'=>array('label'=>$langs->trans("TypeMovement"), 'checked'=>1),
-	'origin'=>array('label'=>$langs->trans("Origin"), 'enabled'=>0, 'checked'=>0),
-	'm.value'=>array('label'=>$langs->trans("Qty"), 'checked'=>1),
-	'm.price'=>array('label'=>$langs->trans("UnitPurchaseValue"), 'enabled'=>0, 'checked'=>0),
+	'm.rowid'=>array('label'=>$langs->trans("Ref"), 'checked'=>1, 'position'=>1),
+	'm.datem'=>array('label'=>$langs->trans("Date"), 'checked'=>1, 'position'=>2),
+	'p.ref'=>array('label'=>$langs->trans("ProductRef"), 'checked'=>1, 'css'=>'maxwidth100', 'position'=>10),
+	'p.label'=>array('label'=>$langs->trans("ProductLabel"), 'checked'=>1, 'position'=>15),
+	'm.batch'=>array('label'=>$langs->trans("BatchNumberShort"), 'checked'=>1, 'enabled'=>(!empty($conf->productbatch->enabled)), 'position'=>20),
+	'pl.eatby'=>array('label'=>$langs->trans("EatByDate"), 'checked'=>0, 'position'=>10, 'enabled'=>(!empty($conf->productbatch->enabled)), 'position'=>21),
+	'pl.sellby'=>array('label'=>$langs->trans("SellByDate"), 'checked'=>0, 'position'=>10, 'enabled'=>(!empty($conf->productbatch->enabled)), 'position'=>22),
+	'e.ref'=>array('label'=>$langs->trans("Warehouse"), 'checked'=>1, 'position'=>30),
+	'm.fk_user_author'=>array('label'=>$langs->trans("Author"), 'checked'=>0, 'position'=>40),
+	'm.inventorycode'=>array('label'=>$langs->trans("InventoryCodeShort"), 'checked'=>1, 'position'=>42),
+	'm.label'=>array('label'=>$langs->trans("MovementLabel"), 'checked'=>1, 'position'=>45),
+	'm.type_mouvement'=>array('label'=>$langs->trans("TypeMovement"), 'checked'=>1, 'position'=>48),
+	'origin'=>array('label'=>$langs->trans("Origin"), 'enabled'=>0, 'checked'=>0, 'position'=>50),
+	'm.value'=>array('label'=>$langs->trans("Qty"), 'checked'=>1, 'position'=>60),
+	'm.price'=>array('label'=>$langs->trans("UnitPurchaseValue"), 'enabled'=>0, 'checked'=>0, 'position'=>62),
 	//'m.datec'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0, 'position'=>500),
 	//'m.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500)
 );
@@ -176,47 +176,47 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
 
 if (empty($reshook))
 {
-    $error = 0;
+	$error = 0;
 
-    $backurlforlist = dol_buildpath('/mrp/mo_list.php', 1);
+	$backurlforlist = dol_buildpath('/mrp/mo_list.php', 1);
 
-    if (empty($backtopage) || ($cancel && empty($id))) {
-    	//var_dump($backurlforlist);exit;
-    	if (empty($id) && (($action != 'add' && $action != 'create') || $cancel)) $backtopage = $backurlforlist;
-    	else $backtopage = DOL_URL_ROOT.'/mrp/mo_production.php?id='.($id > 0 ? $id : '__ID__');
-    }
-    $triggermodname = 'MRP_MO_MODIFY'; // Name of trigger action code to execute when we modify record
+	if (empty($backtopage) || ($cancel && empty($id))) {
+		//var_dump($backurlforlist);exit;
+		if (empty($id) && (($action != 'add' && $action != 'create') || $cancel)) $backtopage = $backurlforlist;
+		else $backtopage = DOL_URL_ROOT.'/mrp/mo_production.php?id='.($id > 0 ? $id : '__ID__');
+	}
+	$triggermodname = 'MRP_MO_MODIFY'; // Name of trigger action code to execute when we modify record
 
-    // Actions cancel, add, update, delete or clone
-    include DOL_DOCUMENT_ROOT.'/core/actions_addupdatedelete.inc.php';
+	// Actions cancel, add, update, delete or clone
+	include DOL_DOCUMENT_ROOT.'/core/actions_addupdatedelete.inc.php';
 
-    // Actions when linking object each other
-    include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php';
+	// Actions when linking object each other
+	include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php';
 
-    // Actions when printing a doc from card
-    include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
+	// Actions when printing a doc from card
+	include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
 
-    // Actions to send emails
-    $triggersendname = 'MO_SENTBYMAIL';
-    $autocopy = 'MAIN_MAIL_AUTOCOPY_MO_TO';
-    $trackid = 'mo'.$object->id;
-    include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
+	// Actions to send emails
+	$triggersendname = 'MO_SENTBYMAIL';
+	$autocopy = 'MAIN_MAIL_AUTOCOPY_MO_TO';
+	$trackid = 'mo'.$object->id;
+	include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
 
-    // Action to move up and down lines of object
-    //include DOL_DOCUMENT_ROOT.'/core/actions_lineupdown.inc.php';	// Must be include, not include_once
+	// Action to move up and down lines of object
+	//include DOL_DOCUMENT_ROOT.'/core/actions_lineupdown.inc.php';	// Must be include, not include_once
 
-    if ($action == 'set_thirdparty' && $permissiontoadd)
-    {
-    	$object->setValueFrom('fk_soc', GETPOST('fk_soc', 'int'), '', '', 'date', '', $user, 'MO_MODIFY');
-    }
-    if ($action == 'classin' && $permissiontoadd)
-    {
-    	$object->setProject(GETPOST('projectid', 'int'));
-    }
+	if ($action == 'set_thirdparty' && $permissiontoadd)
+	{
+		$object->setValueFrom('fk_soc', GETPOST('fk_soc', 'int'), '', '', 'date', '', $user, 'MO_MODIFY');
+	}
+	if ($action == 'classin' && $permissiontoadd)
+	{
+		$object->setProject(GETPOST('projectid', 'int'));
+	}
 
-    if ($action == 'confirm_reopen') {
-    	$result = $object->setStatut($object::STATUS_INPROGRESS, 0, '', 'MRP_REOPEN');
-    }
+	if ($action == 'confirm_reopen') {
+		$result = $object->setStatut($object::STATUS_INPROGRESS, 0, '', 'MRP_REOPEN');
+	}
 }
 
 
@@ -250,7 +250,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	// Confirmation to delete
 	if ($action == 'delete')
 	{
-	    $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteMo'), $langs->trans('ConfirmDeleteMo'), 'confirm_delete', '', 0, 1);
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteMo'), $langs->trans('ConfirmDeleteMo'), 'confirm_delete', '', 0, 1);
 	}
 	// Confirmation to delete line
 	if ($action == 'deleteline')
@@ -268,7 +268,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	if ($action == 'xxx')
 	{
 		$formquestion = array();
-	    /*
+		/*
 		$forcecombo=0;
 		if ($conf->browser->name == 'ie') $forcecombo = 1;	// There is a bug in IE10 that make combo inside popup crazy
 	    $formquestion = array(
@@ -278,7 +278,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	        // array('type' => 'other',    'name' => 'idwarehouse',   'label' => $langs->trans("SelectWarehouseForStockDecrease"), 'value' => $formproduct->selectWarehouses(GETPOST('idwarehouse')?GETPOST('idwarehouse'):'ifone', 'idwarehouse', '', 1, 0, 0, '', 0, $forcecombo))
         );
 	    */
-	    $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('XXX'), $text, 'confirm_xxx', $formquestion, 0, 1, 220);
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('XXX'), $text, 'confirm_xxx', $formquestion, 0, 1, 220);
 	}
 
 	// Call Hook formConfirm
@@ -305,32 +305,32 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	// Project
 	if (!empty($conf->projet->enabled))
 	{
-	    $langs->load("projects");
-	    $morehtmlref .= '<br>'.$langs->trans('Project').' ';
-	    if ($permissiontoadd)
-	    {
-	        if ($action != 'classify')
-	            $morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
-            if ($action == 'classify') {
-            	//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->fk_soc, $object->fk_project, 'projectid', 0, 0, 1, 1);
-                $morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-                $morehtmlref .= '<input type="hidden" name="action" value="classin">';
-                $morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
-                $morehtmlref .= $formproject->select_projects($object->fk_soc, $object->fk_project, 'projectid', 0, 0, 1, 0, 1, 0, 0, '', 1);
-                $morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-                $morehtmlref .= '</form>';
-            } else {
-            	$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_soc, $object->fk_project, 'none', 0, 0, 0, 1);
-	        }
-	    } else {
-	        if (!empty($object->fk_project)) {
-	            $proj = new Project($db);
-	            $proj->fetch($object->fk_project);
-	            $morehtmlref .= $proj->getNomUrl();
-	        } else {
-	            $morehtmlref .= '';
-	        }
-	    }
+		$langs->load("projects");
+		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
+		if ($permissiontoadd)
+		{
+			if ($action != 'classify')
+				$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
+			if ($action == 'classify') {
+				//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->fk_soc, $object->fk_project, 'projectid', 0, 0, 1, 1);
+				$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+				$morehtmlref .= '<input type="hidden" name="action" value="classin">';
+				$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
+				$morehtmlref .= $formproject->select_projects($object->fk_soc, $object->fk_project, 'projectid', 0, 0, 1, 0, 1, 0, 0, '', 1);
+				$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+				$morehtmlref .= '</form>';
+			} else {
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_soc, $object->fk_project, 'none', 0, 0, 0, 1);
+			}
+		} else {
+			if (!empty($object->fk_project)) {
+				$proj = new Project($db);
+				$proj->fetch($object->fk_project);
+				$morehtmlref .= $proj->getNomUrl();
+			} else {
+				$morehtmlref .= '';
+			}
+		}
 	}
 	$morehtmlref .= '</div>';
 
@@ -358,7 +358,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 	print '<div class="clearboth"></div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	/*
 		print '<div class="tabsAction">';
diff --git a/htdocs/mrp/mo_note.php b/htdocs/mrp/mo_note.php
index 7a9cb5b8eae..564361c4b90 100644
--- a/htdocs/mrp/mo_note.php
+++ b/htdocs/mrp/mo_note.php
@@ -143,7 +143,7 @@ if ($id > 0 || !empty($ref))
 
 	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 }
 
 // End of page
diff --git a/htdocs/mrp/mo_production.php b/htdocs/mrp/mo_production.php
index 058aeeacf39..53b1dfa6f8c 100644
--- a/htdocs/mrp/mo_production.php
+++ b/htdocs/mrp/mo_production.php
@@ -100,295 +100,295 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 
 if (empty($reshook))
 {
-    $error = 0;
+	$error = 0;
 
-    $backurlforlist = dol_buildpath('/mrp/mo_list.php', 1);
+	$backurlforlist = dol_buildpath('/mrp/mo_list.php', 1);
 
-    if (empty($backtopage) || ($cancel && empty($id))) {
-    	//var_dump($backurlforlist);exit;
-    	if (empty($id) && (($action != 'add' && $action != 'create') || $cancel)) $backtopage = $backurlforlist;
-    	else $backtopage = DOL_URL_ROOT.'/mrp/mo_production.php?id='.($id > 0 ? $id : '__ID__');
-    }
-    $triggermodname = 'MRP_MO_MODIFY'; // Name of trigger action code to execute when we modify record
+	if (empty($backtopage) || ($cancel && empty($id))) {
+		//var_dump($backurlforlist);exit;
+		if (empty($id) && (($action != 'add' && $action != 'create') || $cancel)) $backtopage = $backurlforlist;
+		else $backtopage = DOL_URL_ROOT.'/mrp/mo_production.php?id='.($id > 0 ? $id : '__ID__');
+	}
+	$triggermodname = 'MRP_MO_MODIFY'; // Name of trigger action code to execute when we modify record
 
-    // Actions cancel, add, update, delete or clone
-    include DOL_DOCUMENT_ROOT.'/core/actions_addupdatedelete.inc.php';
+	// Actions cancel, add, update, delete or clone
+	include DOL_DOCUMENT_ROOT.'/core/actions_addupdatedelete.inc.php';
 
-    // Actions when linking object each other
-    include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php';
+	// Actions when linking object each other
+	include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php';
 
-    // Actions when printing a doc from card
-    include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
+	// Actions when printing a doc from card
+	include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
 
-    // Actions to send emails
-    $triggersendname = 'MO_SENTBYMAIL';
-    $autocopy = 'MAIN_MAIL_AUTOCOPY_MO_TO';
-    $trackid = 'mo'.$object->id;
-    include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
+	// Actions to send emails
+	$triggersendname = 'MO_SENTBYMAIL';
+	$autocopy = 'MAIN_MAIL_AUTOCOPY_MO_TO';
+	$trackid = 'mo'.$object->id;
+	include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
 
-    // Action to move up and down lines of object
-    //include DOL_DOCUMENT_ROOT.'/core/actions_lineupdown.inc.php';	// Must be include, not include_once
+	// Action to move up and down lines of object
+	//include DOL_DOCUMENT_ROOT.'/core/actions_lineupdown.inc.php';	// Must be include, not include_once
 
-    if ($action == 'set_thirdparty' && $permissiontoadd)
-    {
-    	$object->setValueFrom('fk_soc', GETPOST('fk_soc', 'int'), '', '', 'date', '', $user, 'MO_MODIFY');
-    }
-    if ($action == 'classin' && $permissiontoadd)
-    {
-    	$object->setProject(GETPOST('projectid', 'int'));
-    }
+	if ($action == 'set_thirdparty' && $permissiontoadd)
+	{
+		$object->setValueFrom('fk_soc', GETPOST('fk_soc', 'int'), '', '', 'date', '', $user, 'MO_MODIFY');
+	}
+	if ($action == 'classin' && $permissiontoadd)
+	{
+		$object->setProject(GETPOST('projectid', 'int'));
+	}
 
-    if ($action == 'confirm_reopen') {
-    	$result = $object->setStatut($object::STATUS_INPROGRESS, 0, '', 'MRP_REOPEN');
-    }
+	if ($action == 'confirm_reopen') {
+		$result = $object->setStatut($object::STATUS_INPROGRESS, 0, '', 'MRP_REOPEN');
+	}
 
-    if ($action == 'confirm_addconsumeline' && GETPOST('addconsumelinebutton')) {
-    	$moline = new MoLine($db);
+	if ($action == 'confirm_addconsumeline' && GETPOST('addconsumelinebutton')) {
+		$moline = new MoLine($db);
 
-    	// Line to produce
-    	$moline->fk_mo = $object->id;
-    	$moline->qty = GETPOST('qtytoadd', 'int'); ;
-    	$moline->fk_product = GETPOST('productidtoadd', 'int');
-    	$moline->role = 'toconsume';
-    	$moline->position = 0;
+		// Line to produce
+		$moline->fk_mo = $object->id;
+		$moline->qty = GETPOST('qtytoadd', 'int'); ;
+		$moline->fk_product = GETPOST('productidtoadd', 'int');
+		$moline->role = 'toconsume';
+		$moline->position = 0;
 
-    	$resultline = $moline->create($user, false); // Never use triggers here
-    	if ($resultline <= 0) {
-    		$error++;
-    		setEventMessages($moline->error, $molines->errors, 'errors');
-    	}
+		$resultline = $moline->create($user, false); // Never use triggers here
+		if ($resultline <= 0) {
+			$error++;
+			setEventMessages($moline->error, $molines->errors, 'errors');
+		}
 
-    	$action = '';
-    }
+		$action = '';
+	}
 
-    if (in_array($action, array('confirm_consumeorproduce', 'confirm_consumeandproduceall'))) {
-    	$stockmove = new MouvementStock($db);
+	if (in_array($action, array('confirm_consumeorproduce', 'confirm_consumeandproduceall'))) {
+		$stockmove = new MouvementStock($db);
 
-    	$labelmovement = GETPOST('inventorylabel', 'alphanohtml');
-    	$codemovement  = GETPOST('inventorycode', 'alphanohtml');
+		$labelmovement = GETPOST('inventorylabel', 'alphanohtml');
+		$codemovement  = GETPOST('inventorycode', 'alphanohtml');
 
-    	$db->begin();
+		$db->begin();
 
-    	// Process line to consume
-    	foreach ($object->lines as $line) {
-    		if ($line->role == 'toconsume') {
-    			$tmpproduct = new Product($db);
-    			$tmpproduct->fetch($line->fk_product);
+		// Process line to consume
+		foreach ($object->lines as $line) {
+			if ($line->role == 'toconsume') {
+				$tmpproduct = new Product($db);
+				$tmpproduct->fetch($line->fk_product);
 
-    			$i = 1;
-    			while (GETPOSTISSET('qty-'.$line->id.'-'.$i)) {
-    				$qtytoprocess = price2num(GETPOST('qty-'.$line->id.'-'.$i));
+				$i = 1;
+				while (GETPOSTISSET('qty-'.$line->id.'-'.$i)) {
+					$qtytoprocess = price2num(GETPOST('qty-'.$line->id.'-'.$i));
 
-    				if ($qtytoprocess != 0) {
+					if ($qtytoprocess != 0) {
 						// Check warehouse is set if we should have to
-	    				if (GETPOSTISSET('idwarehouse-'.$line->id.'-'.$i)) {	// If there is a warehouse to set
-	    					if (!(GETPOST('idwarehouse-'.$line->id.'-'.$i) > 0)) {	// If there is no warehouse set.
-		    					$langs->load("errors");
-	    						setEventMessages($langs->trans("ErrorFieldRequiredForProduct", $langs->transnoentitiesnoconv("Warehouse"), $tmpproduct->ref), null, 'errors');
-	    						$error++;
-	    					}
-	    					if ($tmpproduct->status_batch && (!GETPOST('batch-'.$line->id.'-'.$i))) {
-	    						$langs->load("errors");
-	    						setEventMessages($langs->trans("ErrorFieldRequiredForProduct", $langs->transnoentitiesnoconv("Batch"), $tmpproduct->ref), null, 'errors');
-	    						$error++;
-	    					}
-	    				}
+						if (GETPOSTISSET('idwarehouse-'.$line->id.'-'.$i)) {	// If there is a warehouse to set
+							if (!(GETPOST('idwarehouse-'.$line->id.'-'.$i) > 0)) {	// If there is no warehouse set.
+								$langs->load("errors");
+								setEventMessages($langs->trans("ErrorFieldRequiredForProduct", $langs->transnoentitiesnoconv("Warehouse"), $tmpproduct->ref), null, 'errors');
+								$error++;
+							}
+							if ($tmpproduct->status_batch && (!GETPOST('batch-'.$line->id.'-'.$i))) {
+								$langs->load("errors");
+								setEventMessages($langs->trans("ErrorFieldRequiredForProduct", $langs->transnoentitiesnoconv("Batch"), $tmpproduct->ref), null, 'errors');
+								$error++;
+							}
+						}
 
-	    				$idstockmove = 0;
-	    				if (!$error && GETPOST('idwarehouse-'.$line->id.'-'.$i) > 0) {
-	    					// Record stock movement
-	    					$id_product_batch = 0;
-	    					$stockmove->origin = $object;
-	    					$idstockmove = $stockmove->livraison($user, $line->fk_product, GETPOST('idwarehouse-'.$line->id.'-'.$i), $qtytoprocess, 0, $labelmovement, dol_now(), '', '', GETPOST('batch-'.$line->id.'-'.$i), $id_product_batch, $codemovement);
-	    					if ($idstockmove < 0) {
-	    						$error++;
-	    						setEventMessages($stockmove->error, $stockmove->errors, 'errors');
-	    					}
-	    				}
+						$idstockmove = 0;
+						if (!$error && GETPOST('idwarehouse-'.$line->id.'-'.$i) > 0) {
+							// Record stock movement
+							$id_product_batch = 0;
+							$stockmove->origin = $object;
+							$idstockmove = $stockmove->livraison($user, $line->fk_product, GETPOST('idwarehouse-'.$line->id.'-'.$i), $qtytoprocess, 0, $labelmovement, dol_now(), '', '', GETPOST('batch-'.$line->id.'-'.$i), $id_product_batch, $codemovement);
+							if ($idstockmove < 0) {
+								$error++;
+								setEventMessages($stockmove->error, $stockmove->errors, 'errors');
+							}
+						}
 
-	    				if (!$error) {
-	    					$pos = 0;
-	    					// Record consumption
-	    					$moline = new MoLine($db);
-	    					$moline->fk_mo = $object->id;
-	    					$moline->position = $pos;
-	    					$moline->fk_product = $line->fk_product;
-	    					$moline->fk_warehouse = GETPOST('idwarehouse-'.$line->id.'-'.$i);
-	    					$moline->qty = $qtytoprocess;
-	    					$moline->batch = GETPOST('batch-'.$line->id.'-'.$i);
-	    					$moline->role = 'consumed';
-	    					$moline->fk_mrp_production = $line->id;
-	    					$moline->fk_stock_movement = $idstockmove;
-	    					$moline->fk_user_creat = $user->id;
+						if (!$error) {
+							$pos = 0;
+							// Record consumption
+							$moline = new MoLine($db);
+							$moline->fk_mo = $object->id;
+							$moline->position = $pos;
+							$moline->fk_product = $line->fk_product;
+							$moline->fk_warehouse = GETPOST('idwarehouse-'.$line->id.'-'.$i);
+							$moline->qty = $qtytoprocess;
+							$moline->batch = GETPOST('batch-'.$line->id.'-'.$i);
+							$moline->role = 'consumed';
+							$moline->fk_mrp_production = $line->id;
+							$moline->fk_stock_movement = $idstockmove;
+							$moline->fk_user_creat = $user->id;
 
-	    					$resultmoline = $moline->create($user);
-	    					if ($resultmoline <= 0) {
-	    						$error++;
-	    						setEventMessages($moline->error, $moline->errors, 'errors');
-	    					}
+							$resultmoline = $moline->create($user);
+							if ($resultmoline <= 0) {
+								$error++;
+								setEventMessages($moline->error, $moline->errors, 'errors');
+							}
 
-	    					$pos++;
-	    				}
-	    			}
+							$pos++;
+						}
+					}
 
-    				$i++;
-    			}
-    		}
-    	}
+					$i++;
+				}
+			}
+		}
 
-    	// Process line to produce
-    	foreach ($object->lines as $line) {
-    		if ($line->role == 'toproduce') {
-    			$tmpproduct = new Product($db);
-    			$tmpproduct->fetch($line->fk_product);
+		// Process line to produce
+		foreach ($object->lines as $line) {
+			if ($line->role == 'toproduce') {
+				$tmpproduct = new Product($db);
+				$tmpproduct->fetch($line->fk_product);
 
-    			$i = 1;
-    			while (GETPOSTISSET('qtytoproduce-'.$line->id.'-'.$i)) {
-    				$qtytoprocess = price2num(GETPOST('qtytoproduce-'.$line->id.'-'.$i));
+				$i = 1;
+				while (GETPOSTISSET('qtytoproduce-'.$line->id.'-'.$i)) {
+					$qtytoprocess = price2num(GETPOST('qtytoproduce-'.$line->id.'-'.$i));
 
-    				if ($qtytoprocess != 0) {
-	    				// Check warehouse is set if we should have to
-	    				if (GETPOSTISSET('idwarehousetoproduce-'.$line->id.'-'.$i)) {	// If there is a warehouse to set
-	    					if (!(GETPOST('idwarehousetoproduce-'.$line->id.'-'.$i) > 0)) {	// If there is no warehouse set.
-	    						$langs->load("errors");
-	    						setEventMessages($langs->trans("ErrorFieldRequiredForProduct", $langs->transnoentitiesnoconv("Warehouse"), $tmpproduct->ref), null, 'errors');
-	    						$error++;
-	    					}
-	    					if (!empty($conf->productbatch->enabled) && $tmpproduct->status_batch && (!GETPOST('batchtoproduce-'.$line->id.'-'.$i))) {
-	    						$langs->load("errors");
-	    						setEventMessages($langs->trans("ErrorFieldRequiredForProduct", $langs->transnoentitiesnoconv("Batch"), $tmpproduct->ref), null, 'errors');
-	    						$error++;
-	    					}
-	    				}
+					if ($qtytoprocess != 0) {
+						// Check warehouse is set if we should have to
+						if (GETPOSTISSET('idwarehousetoproduce-'.$line->id.'-'.$i)) {	// If there is a warehouse to set
+							if (!(GETPOST('idwarehousetoproduce-'.$line->id.'-'.$i) > 0)) {	// If there is no warehouse set.
+								$langs->load("errors");
+								setEventMessages($langs->trans("ErrorFieldRequiredForProduct", $langs->transnoentitiesnoconv("Warehouse"), $tmpproduct->ref), null, 'errors');
+								$error++;
+							}
+							if (!empty($conf->productbatch->enabled) && $tmpproduct->status_batch && (!GETPOST('batchtoproduce-'.$line->id.'-'.$i))) {
+								$langs->load("errors");
+								setEventMessages($langs->trans("ErrorFieldRequiredForProduct", $langs->transnoentitiesnoconv("Batch"), $tmpproduct->ref), null, 'errors');
+								$error++;
+							}
+						}
 
-	    				$idstockmove = 0;
-	    				if (!$error && GETPOST('idwarehousetoproduce-'.$line->id.'-'.$i) > 0) {
-	    					// Record stock movement
-	    					$id_product_batch = 0;
-	    					$stockmove->origin = $object;
-	    					$idstockmove = $stockmove->reception($user, $line->fk_product, GETPOST('idwarehousetoproduce-'.$line->id.'-'.$i), $qtytoprocess, 0, $labelmovement, '', '', GETPOST('batchtoproduce-'.$line->id.'-'.$i), dol_now(), $id_product_batch, $codemovement);
-	    					if ($idstockmove < 0) {
-	    						$error++;
-	    						setEventMessages($stockmove->error, $stockmove->errors, 'errors');
-	    					}
-	    				}
+						$idstockmove = 0;
+						if (!$error && GETPOST('idwarehousetoproduce-'.$line->id.'-'.$i) > 0) {
+							// Record stock movement
+							$id_product_batch = 0;
+							$stockmove->origin = $object;
+							$idstockmove = $stockmove->reception($user, $line->fk_product, GETPOST('idwarehousetoproduce-'.$line->id.'-'.$i), $qtytoprocess, 0, $labelmovement, '', '', GETPOST('batchtoproduce-'.$line->id.'-'.$i), dol_now(), $id_product_batch, $codemovement);
+							if ($idstockmove < 0) {
+								$error++;
+								setEventMessages($stockmove->error, $stockmove->errors, 'errors');
+							}
+						}
 
-	    				if (!$error) {
-	    					$pos = 0;
+						if (!$error) {
+							$pos = 0;
 							// Record production
-	    					$moline = new MoLine($db);
-	    					$moline->fk_mo = $object->id;
-	    					$moline->position = $pos;
-	    					$moline->fk_product = $line->fk_product;
-	    					$moline->fk_warehouse = GETPOST('idwarehousetoproduce-'.$line->id.'-'.$i);
-	    					$moline->qty = $qtytoprocess;
-	    					$moline->batch = GETPOST('batchtoproduce-'.$line->id.'-'.$i);
-	    					$moline->role = 'produced';
-	    					$moline->fk_mrp_production = $line->id;
-	    					$moline->fk_stock_movement = $idstockmove;
-	    					$moline->fk_user_creat = $user->id;
+							$moline = new MoLine($db);
+							$moline->fk_mo = $object->id;
+							$moline->position = $pos;
+							$moline->fk_product = $line->fk_product;
+							$moline->fk_warehouse = GETPOST('idwarehousetoproduce-'.$line->id.'-'.$i);
+							$moline->qty = $qtytoprocess;
+							$moline->batch = GETPOST('batchtoproduce-'.$line->id.'-'.$i);
+							$moline->role = 'produced';
+							$moline->fk_mrp_production = $line->id;
+							$moline->fk_stock_movement = $idstockmove;
+							$moline->fk_user_creat = $user->id;
 
-	    					$resultmoline = $moline->create($user);
-	    					if ($resultmoline <= 0) {
-	    						$error++;
-	    						setEventMessages($moline->error, $moline->errors, 'errors');
-	    					}
+							$resultmoline = $moline->create($user);
+							if ($resultmoline <= 0) {
+								$error++;
+								setEventMessages($moline->error, $moline->errors, 'errors');
+							}
 
-	    					$pos++;
-	    				}
-    				}
+							$pos++;
+						}
+					}
 
-    				$i++;
-    			}
-    		}
-    	}
+					$i++;
+				}
+			}
+		}
 
-    	if (!$error) {
-    		$consumptioncomplete = true;
-    		$productioncomplete = true;
+		if (!$error) {
+			$consumptioncomplete = true;
+			$productioncomplete = true;
 
-    		if (GETPOST('autoclose', 'int')) {
-	    		foreach ($object->lines as $line) {
-	    			if ($line->role == 'toconsume') {
-	    				$arrayoflines = $object->fetchLinesLinked('consumed', $line->id);
-	    				$alreadyconsumed = 0;
-	    				foreach ($arrayoflines as $line2) {
-	    					$alreadyconsumed += $line2['qty'];
-	    				}
+			if (GETPOST('autoclose', 'int')) {
+				foreach ($object->lines as $line) {
+					if ($line->role == 'toconsume') {
+						$arrayoflines = $object->fetchLinesLinked('consumed', $line->id);
+						$alreadyconsumed = 0;
+						foreach ($arrayoflines as $line2) {
+							$alreadyconsumed += $line2['qty'];
+						}
 
-	    				if ($alreadyconsumed < $line->qty) {
-	    					$consumptioncomplete = false;
-	    				}
-	    			}
-	    			if ($line->role == 'toproduce') {
-	    				$arrayoflines = $object->fetchLinesLinked('produced', $line->id);
-	    				$alreadyproduced = 0;
-	    				foreach ($arrayoflines as $line2) {
-	    					$alreadyproduced += $line2['qty'];
-	    				}
+						if ($alreadyconsumed < $line->qty) {
+							$consumptioncomplete = false;
+						}
+					}
+					if ($line->role == 'toproduce') {
+						$arrayoflines = $object->fetchLinesLinked('produced', $line->id);
+						$alreadyproduced = 0;
+						foreach ($arrayoflines as $line2) {
+							$alreadyproduced += $line2['qty'];
+						}
 
-	    				if ($alreadyproduced < $line->qty) {
-	    					$productioncomplete = false;
-	    				}
-	    			}
-	    		}
-    		} else {
-    			$consumptioncomplete = false;
-    			$productioncomplete = false;
-    		}
+						if ($alreadyproduced < $line->qty) {
+							$productioncomplete = false;
+						}
+					}
+				}
+			} else {
+				$consumptioncomplete = false;
+				$productioncomplete = false;
+			}
 
-    		// Update status of MO
-    		dol_syslog("consumptioncomplete = ".$consumptioncomplete." productioncomplete = ".$productioncomplete);
-    		//var_dump("consumptioncomplete = ".$consumptioncomplete." productioncomplete = ".$productioncomplete);
-    		if ($consumptioncomplete && $productioncomplete) {
-    			$result = $object->setStatut($object::STATUS_PRODUCED, 0, '', 'MRP_MO_PRODUCED');
-    		} else {
-    			$result = $object->setStatut($object::STATUS_INPROGRESS, 0, '', 'MRP_MO_PRODUCED');
-    		}
-    		if ($result <= 0) {
-    			$error++;
-    			setEventMessages($object->error, $object->errors, 'errors');
-    		}
-    	}
+			// Update status of MO
+			dol_syslog("consumptioncomplete = ".$consumptioncomplete." productioncomplete = ".$productioncomplete);
+			//var_dump("consumptioncomplete = ".$consumptioncomplete." productioncomplete = ".$productioncomplete);
+			if ($consumptioncomplete && $productioncomplete) {
+				$result = $object->setStatut($object::STATUS_PRODUCED, 0, '', 'MRP_MO_PRODUCED');
+			} else {
+				$result = $object->setStatut($object::STATUS_INPROGRESS, 0, '', 'MRP_MO_PRODUCED');
+			}
+			if ($result <= 0) {
+				$error++;
+				setEventMessages($object->error, $object->errors, 'errors');
+			}
+		}
 
-    	if ($error) {
-    		$action = str_replace('confirm_', '', $action);
-    		$db->rollback();
-    	} else {
-    		$db->commit();
+		if ($error) {
+			$action = str_replace('confirm_', '', $action);
+			$db->rollback();
+		} else {
+			$db->commit();
 
-    		// Redirect to avoid to action done a second time if we make a back from browser
-    		header("Location: ".$_SERVER["PHP_SELF"].'?id='.$object->id);
-    		exit;
-    	}
-    }
+			// Redirect to avoid to action done a second time if we make a back from browser
+			header("Location: ".$_SERVER["PHP_SELF"].'?id='.$object->id);
+			exit;
+		}
+	}
 
-    // Action close produced
-    if ($action == 'confirm_produced' && $confirm == 'yes' && $permissiontoadd)
-    {
-    	$result = $object->setStatut($object::STATUS_PRODUCED, 0, '', 'MRP_MO_PRODUCED');
-    	if ($result >= 0)
-    	{
-    		// Define output language
-    		if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
-    		{
-    			$outputlangs = $langs;
-    			$newlang = '';
-    			if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) $newlang = GETPOST('lang_id', 'aZ09');
-    			if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $object->thirdparty->default_lang;
-    			if (!empty($newlang)) {
-    				$outputlangs = new Translate("", $conf);
-    				$outputlangs->setDefaultLang($newlang);
-    			}
-    			$model = $object->model_pdf;
-    			$ret = $object->fetch($id); // Reload to get new records
+	// Action close produced
+	if ($action == 'confirm_produced' && $confirm == 'yes' && $permissiontoadd)
+	{
+		$result = $object->setStatut($object::STATUS_PRODUCED, 0, '', 'MRP_MO_PRODUCED');
+		if ($result >= 0)
+		{
+			// Define output language
+			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
+			{
+				$outputlangs = $langs;
+				$newlang = '';
+				if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) $newlang = GETPOST('lang_id', 'aZ09');
+				if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $object->thirdparty->default_lang;
+				if (!empty($newlang)) {
+					$outputlangs = new Translate("", $conf);
+					$outputlangs->setDefaultLang($newlang);
+				}
+				$model = $object->model_pdf;
+				$ret = $object->fetch($id); // Reload to get new records
 
-    			$object->generateDocument($model, $outputlangs, 0, 0, 0);
-    		}
-    	} else {
-    		setEventMessages($object->error, $object->errors, 'errors');
-    	}
-    }
+				$object->generateDocument($model, $outputlangs, 0, 0, 0);
+			}
+		} else {
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
+	}
 }
 
 
@@ -421,7 +421,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	// Confirmation to delete
 	if ($action == 'delete')
 	{
-	    $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteMo'), $langs->trans('ConfirmDeleteMo'), 'confirm_delete', '', 0, 1);
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteMo'), $langs->trans('ConfirmDeleteMo'), 'confirm_delete', '', 0, 1);
 	}
 	// Confirmation to delete line
 	if ($action == 'deleteline')
@@ -498,32 +498,32 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	// Project
 	if (!empty($conf->projet->enabled))
 	{
-	    $langs->load("projects");
-	    $morehtmlref .= '<br>'.$langs->trans('Project').' ';
-	    if ($permissiontoadd)
-	    {
-	        if ($action != 'classify')
-	            $morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
-            if ($action == 'classify') {
-            	//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->fk_soc, $object->fk_project, 'projectid', 0, 0, 1, 1);
-                $morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-                $morehtmlref .= '<input type="hidden" name="action" value="classin">';
-                $morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
-                $morehtmlref .= $formproject->select_projects($object->fk_soc, $object->fk_project, 'projectid', 0, 0, 1, 0, 1, 0, 0, '', 1);
-                $morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-                $morehtmlref .= '</form>';
-            } else {
-            	$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_soc, $object->fk_project, 'none', 0, 0, 0, 1);
-	        }
-	    } else {
-	        if (!empty($object->fk_project)) {
-	            $proj = new Project($db);
-	            $proj->fetch($object->fk_project);
-	            $morehtmlref .= $proj->getNomUrl();
-	        } else {
-	            $morehtmlref .= '';
-	        }
-	    }
+		$langs->load("projects");
+		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
+		if ($permissiontoadd)
+		{
+			if ($action != 'classify')
+				$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
+			if ($action == 'classify') {
+				//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->fk_soc, $object->fk_project, 'projectid', 0, 0, 1, 1);
+				$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+				$morehtmlref .= '<input type="hidden" name="action" value="classin">';
+				$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
+				$morehtmlref .= $formproject->select_projects($object->fk_soc, $object->fk_project, 'projectid', 0, 0, 1, 0, 1, 0, 0, '', 1);
+				$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+				$morehtmlref .= '</form>';
+			} else {
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_soc, $object->fk_project, 'none', 0, 0, 0, 1);
+			}
+		} else {
+			if (!empty($object->fk_project)) {
+				$proj = new Project($db);
+				$proj->fetch($object->fk_project);
+				$morehtmlref .= $proj->getNomUrl();
+			} else {
+				$morehtmlref .= '';
+			}
+		}
 	}
 	$morehtmlref .= '</div>';
 
@@ -551,7 +551,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 	print '<div class="clearboth"></div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 
 	if (!in_array($action, array('consumeorproduce', 'consumeandproduceall')))
@@ -674,343 +674,343 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 	if (!empty($object->table_element_line))
 	{
-    	// Show object lines
-    	$object->fetchLines();
+		// Show object lines
+		$object->fetchLines();
 
-    	print '<div class="fichecenter">';
-    	print '<div class="fichehalfleft">';
-    	print '<div class="clearboth"></div>';
+		print '<div class="fichecenter">';
+		print '<div class="fichehalfleft">';
+		print '<div class="clearboth"></div>';
 
-    	$newlinetext = '';
-    	if ($action != 'consumeorproduce' && $action != 'consumeandproduceall') {
-    		$newlinetext = '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=addconsumeline">'.$langs->trans("AddNewConsumeLines").'</a>';
-    	}
-    	print load_fiche_titre($langs->trans('Consumption'), '', '', 0, '', '', $newlinetext);
+		$newlinetext = '';
+		if ($action != 'consumeorproduce' && $action != 'consumeandproduceall') {
+			$newlinetext = '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=addconsumeline">'.$langs->trans("AddNewConsumeLines").'</a>';
+		}
+		print load_fiche_titre($langs->trans('Consumption'), '', '', 0, '', '', $newlinetext);
 
-    	print '<div class="div-table-responsive-no-min">';
-    	print '<table class="noborder noshadow centpercent nobottom">';
+		print '<div class="div-table-responsive-no-min">';
+		print '<table class="noborder noshadow centpercent nobottom">';
 
-    	print '<tr class="liste_titre">';
-    	print '<td>'.$langs->trans("Product").'</td>';
-    	print '<td class="right">'.$langs->trans("Qty").'</td>';
-    	print '<td class="right">'.$langs->trans("QtyAlreadyConsumed").'</td>';
-    	print '<td>';
-    	if ($collapse || in_array($action, array('consumeorproduce', 'consumeandproduceall'))) print $langs->trans("Warehouse");
-    	print '</td>';
-    	if ($conf->productbatch->enabled) {
-    		print '<td>';
-    		if ($collapse || in_array($action, array('consumeorproduce', 'consumeandproduceall'))) print $langs->trans("Batch");
-    		print '</td>';
-    	}
-    	print '</tr>';
+		print '<tr class="liste_titre">';
+		print '<td>'.$langs->trans("Product").'</td>';
+		print '<td class="right">'.$langs->trans("Qty").'</td>';
+		print '<td class="right">'.$langs->trans("QtyAlreadyConsumed").'</td>';
+		print '<td>';
+		if ($collapse || in_array($action, array('consumeorproduce', 'consumeandproduceall'))) print $langs->trans("Warehouse");
+		print '</td>';
+		if ($conf->productbatch->enabled) {
+			print '<td>';
+			if ($collapse || in_array($action, array('consumeorproduce', 'consumeandproduceall'))) print $langs->trans("Batch");
+			print '</td>';
+		}
+		print '</tr>';
 
-    	if ($action == 'addconsumeline') {
-    		print '<!-- Add line to consume -->'."\n";
-    		print '<tr class="liste_titre">';
-    		print '<td>';
-    		print $form->select_produits('', 'productidtoadd', '', 0, 0, -1, 2, '', 0, array(), 0, '1', 0, 'maxwidth300');
-    		print '</td>';
-    		print '<td class="right"><input type="text" name="qtytoadd" value="1" class="width50 right"></td>';
-    		print '<td class="right"></td>';
-    		print '<td>';
-    		print '<input type="submit" class="button buttongen" name="addconsumelinebutton" value="'.$langs->trans("Add").'">';
-    		print '</td>';
-    		if ($conf->productbatch->enabled) {
-    			print '<td></td>';
-    		}
-    		print '</tr>';
-    	}
+		if ($action == 'addconsumeline') {
+			print '<!-- Add line to consume -->'."\n";
+			print '<tr class="liste_titre">';
+			print '<td>';
+			print $form->select_produits('', 'productidtoadd', '', 0, 0, -1, 2, '', 0, array(), 0, '1', 0, 'maxwidth300');
+			print '</td>';
+			print '<td class="right"><input type="text" name="qtytoadd" value="1" class="width50 right"></td>';
+			print '<td class="right"></td>';
+			print '<td>';
+			print '<input type="submit" class="button buttongen" name="addconsumelinebutton" value="'.$langs->trans("Add").'">';
+			print '</td>';
+			if ($conf->productbatch->enabled) {
+				print '<td></td>';
+			}
+			print '</tr>';
+		}
 
-    	// Lines to consume
+		// Lines to consume
 
-    	if (!empty($object->lines))
-    	{
-    		$nblinetoconsume = 0;
-    		foreach ($object->lines as $line) {
-    			if ($line->role == 'toconsume') {
-    				$nblinetoconsume++;
-    			}
-    		}
+		if (!empty($object->lines))
+		{
+			$nblinetoconsume = 0;
+			foreach ($object->lines as $line) {
+				if ($line->role == 'toconsume') {
+					$nblinetoconsume++;
+				}
+			}
 
-    		$nblinetoconsumecursor = 0;
-    		foreach ($object->lines as $line) {
-    	    	if ($line->role == 'toconsume') {
-    	    		$nblinetoconsumecursor++;
+			$nblinetoconsumecursor = 0;
+			foreach ($object->lines as $line) {
+				if ($line->role == 'toconsume') {
+					$nblinetoconsumecursor++;
 
-    	    		$tmpproduct = new Product($db);
-    	    		$tmpproduct->fetch($line->fk_product);
+					$tmpproduct = new Product($db);
+					$tmpproduct->fetch($line->fk_product);
 
-    	    		$arrayoflines = $object->fetchLinesLinked('consumed', $line->id);
-    	    		$alreadyconsumed = 0;
-    	    		foreach ($arrayoflines as $line2) {
-    	    			$alreadyconsumed += $line2['qty'];
-    	    		}
+					$arrayoflines = $object->fetchLinesLinked('consumed', $line->id);
+					$alreadyconsumed = 0;
+					foreach ($arrayoflines as $line2) {
+						$alreadyconsumed += $line2['qty'];
+					}
 
-    	    		print '<tr>';
-    	    		print '<td>'.$tmpproduct->getNomUrl(1);
-    	    		print '<br><span class="opacitymedium small">'.$tmpproduct->label.'</span>';
-    	    		print '</td>';
-    	    		print '<td class="right nowraponall">';
-    	    		$help = '';
-    	    		if ($line->qty_frozen) $help .= ($help ? '<br>' : '').'<strong>'.$langs->trans("QuantityFrozen").'</strong>: '.yn(1).' ('.$langs->trans("QuantityConsumedInvariable").')';
-    	    		if ($line->disable_stock_change) $help .= ($help ? '<br>' : '').'<strong>'.$langs->trans("DisableStockChange").'</strong>: '.yn(1).' ('.(($tmpproduct->type == Product::TYPE_SERVICE && empty($conf->global->STOCK_SUPPORTS_SERVICES)) ? $langs->trans("NoStockChangeOnServices") : $langs->trans("DisableStockChangeHelp")).')';
-    	    		if ($help) {
-    	    			print $form->textwithpicto($line->qty, $help, -1);
-    	    		} else {
-    	    			print $line->qty;
-    	    		}
-    	    		print '</td>';
-    	    		print '<td class="right">';
-    	    		if ($alreadyconsumed) {
-    	    			print '<script>';
-    	    			print 'jQuery(document).ready(function() {
+					print '<tr>';
+					print '<td>'.$tmpproduct->getNomUrl(1);
+					print '<br><span class="opacitymedium small">'.$tmpproduct->label.'</span>';
+					print '</td>';
+					print '<td class="right nowraponall">';
+					$help = '';
+					if ($line->qty_frozen) $help .= ($help ? '<br>' : '').'<strong>'.$langs->trans("QuantityFrozen").'</strong>: '.yn(1).' ('.$langs->trans("QuantityConsumedInvariable").')';
+					if ($line->disable_stock_change) $help .= ($help ? '<br>' : '').'<strong>'.$langs->trans("DisableStockChange").'</strong>: '.yn(1).' ('.(($tmpproduct->type == Product::TYPE_SERVICE && empty($conf->global->STOCK_SUPPORTS_SERVICES)) ? $langs->trans("NoStockChangeOnServices") : $langs->trans("DisableStockChangeHelp")).')';
+					if ($help) {
+						print $form->textwithpicto($line->qty, $help, -1);
+					} else {
+						print $line->qty;
+					}
+					print '</td>';
+					print '<td class="right">';
+					if ($alreadyconsumed) {
+						print '<script>';
+						print 'jQuery(document).ready(function() {
 								jQuery("#expandtoproduce'.$line->id.'").click(function() {
 									console.log("Expand mrp_production line '.$line->id.'");
 									jQuery(".expanddetail'.$line->id.'").toggle();';
-    	    			if ($nblinetoconsume == $nblinetoconsumecursor) {	// If it is the last line
-    	    				print 'if (jQuery("#tablelines").hasClass("nobottom")) { jQuery("#tablelines").removeClass("nobottom"); } else { jQuery("#tablelines").addClass("nobottom"); }';
-    	    			}
-    	    			print '
+						if ($nblinetoconsume == $nblinetoconsumecursor) {	// If it is the last line
+							print 'if (jQuery("#tablelines").hasClass("nobottom")) { jQuery("#tablelines").removeClass("nobottom"); } else { jQuery("#tablelines").addClass("nobottom"); }';
+						}
+						print '
 								});
 							});';
-    	    			print '</script>';
-    	    			if (empty($conf->use_javascript_ajax)) print '<a href="'.$_SERVER["PHP_SELF"].'?collapse='.$collapse.','.$line->id.'">';
-    	    			print img_picto($langs->trans("ShowDetails"), "chevron-down", 'id="expandtoproduce'.$line->id.'"');
-    	    			if (empty($conf->use_javascript_ajax)) print '</a>';
-    	    		} else {
-    	    			if ($nblinetoconsume == $nblinetoconsumecursor) {	// If it is the last line
-    	    				print '<script>jQuery("#tablelines").removeClass("nobottom");</script>';
-    	    			}
-    	    		}
-    	    		print ' '.$alreadyconsumed;
-    	    		print '</td>';
-    	    		print '<td>'; // Warehouse
-    	    		print '</td>';
-    	    		if ($conf->productbatch->enabled) {
-    	    			print '<td></td>'; // Lot
-    	    		}
-    	    		print '</tr>';
+						print '</script>';
+						if (empty($conf->use_javascript_ajax)) print '<a href="'.$_SERVER["PHP_SELF"].'?collapse='.$collapse.','.$line->id.'">';
+						print img_picto($langs->trans("ShowDetails"), "chevron-down", 'id="expandtoproduce'.$line->id.'"');
+						if (empty($conf->use_javascript_ajax)) print '</a>';
+					} else {
+						if ($nblinetoconsume == $nblinetoconsumecursor) {	// If it is the last line
+							print '<script>jQuery("#tablelines").removeClass("nobottom");</script>';
+						}
+					}
+					print ' '.$alreadyconsumed;
+					print '</td>';
+					print '<td>'; // Warehouse
+					print '</td>';
+					if ($conf->productbatch->enabled) {
+						print '<td></td>'; // Lot
+					}
+					print '</tr>';
 
-    	    		// Show detailed of already consumed with js code to collapse
-    	    		foreach ($arrayoflines as $line2) {
-    	    			print '<tr class="expanddetail'.$line->id.' hideobject opacitylow">';
-    	    			print '<td>';
-    	    			print dol_print_date($line2['date'], 'dayhour');
-    	    			print '</td>';
-    	    			print '<td></td>';
-    	    			print '<td class="right">'.$line2['qty'].'</td>';
-    	    			print '<td class="tdoverflowmax150">';
-    	    			if ($line2['fk_warehouse'] > 0) {
-    	    				$result = $tmpwarehouse->fetch($line2['fk_warehouse']);
-    	    				if ($result > 0) print $tmpwarehouse->getNomUrl(1);
-    	    			}
-    	    			print '</td>';
-    	    			// Lot Batch
-    	    			print '<td>';
-    	    			if ($line2['batch'] != '') {
-    	    				$tmpbatch->fetch(0, $line2['fk_product'], $line2['batch']);
-    	    				print $tmpbatch->getNomUrl(1);
-    	    			}
-    	    			print '</td>';
-    	    			print '</tr>';
-    	    		}
+					// Show detailed of already consumed with js code to collapse
+					foreach ($arrayoflines as $line2) {
+						print '<tr class="expanddetail'.$line->id.' hideobject opacitylow">';
+						print '<td>';
+						print dol_print_date($line2['date'], 'dayhour');
+						print '</td>';
+						print '<td></td>';
+						print '<td class="right">'.$line2['qty'].'</td>';
+						print '<td class="tdoverflowmax150">';
+						if ($line2['fk_warehouse'] > 0) {
+							$result = $tmpwarehouse->fetch($line2['fk_warehouse']);
+							if ($result > 0) print $tmpwarehouse->getNomUrl(1);
+						}
+						print '</td>';
+						// Lot Batch
+						print '<td>';
+						if ($line2['batch'] != '') {
+							$tmpbatch->fetch(0, $line2['fk_product'], $line2['batch']);
+							print $tmpbatch->getNomUrl(1);
+						}
+						print '</td>';
+						print '</tr>';
+					}
 
-    	    		if (in_array($action, array('consumeorproduce', 'consumeandproduceall'))) {
-    	    			$i = 1;
-    	    			print '<!-- Enter line to consume -->'."\n";
-    	    			print '<tr>';
-    	    			print '<td><span class="opacitymedium">'.$langs->trans("ToConsume").'</span></td>';
-    	    			$preselected = (GETPOSTISSET('qty-'.$line->id.'-'.$i) ? GETPOST('qty-'.$line->id.'-'.$i) : max(0, $line->qty - $alreadyconsumed));
-    	    			if ($action == 'consumeorproduce' && !GETPOSTISSET('qty-'.$line->id.'-'.$i)) $preselected = 0;
-    	    			print '<td class="right"><input type="text" class="width50 right" name="qty-'.$line->id.'-'.$i.'" value="'.$preselected.'"></td>';
-    	    			print '<td></td>';
-    	    			print '<td>';
-    	    			if ($tmpproduct->type == Product::TYPE_PRODUCT || !empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
-    	    				if (empty($line->disable_stock_change)) {
-    	    					$preselected = (GETPOSTISSET('idwarehouse-'.$line->id.'-'.$i) ? GETPOST('idwarehouse-'.$line->id.'-'.$i) : ($tmpproduct->fk_default_warehouse > 0 ? $tmpproduct->fk_default_warehouse : 'ifone'));
-    	    					print $formproduct->selectWarehouses($preselected, 'idwarehouse-'.$line->id.'-'.$i, '', 1, 0, $line->fk_product, '', 1, 0, null, 'maxwidth300');
-    	    				} else {
-    	    					print '<span class="opacitymedium">'.$langs->trans("DisableStockChange").'</span>';
-    	    				}
-    	    			} else {
-    	    				print '<span class="opacitymedium">'.$langs->trans("NoStockChangeOnServices").'</span>';
-    	    			}
-    	    			// Lot / Batch
-    	    			print '</td>';
-    	    			if ($conf->productbatch->enabled) {
-	    	    			print '<td>';
-	    	    			if ($tmpproduct->status_batch) {
-	    	    				$preselected = (GETPOSTISSET('batch-'.$line->id.'-'.$i) ? GETPOST('batch-'.$line->id.'-'.$i) : '');
-	    	    				print '<input type="text" class="width50" name="batch-'.$line->id.'-'.$i.'" value="'.$preselected.'">';
-	    	    			}
-	    	    			print '</td>';
-    	    			}
-    	    			print '</tr>';
-    	    		}
-    	    	}
-    	    }
-    	}
+					if (in_array($action, array('consumeorproduce', 'consumeandproduceall'))) {
+						$i = 1;
+						print '<!-- Enter line to consume -->'."\n";
+						print '<tr>';
+						print '<td><span class="opacitymedium">'.$langs->trans("ToConsume").'</span></td>';
+						$preselected = (GETPOSTISSET('qty-'.$line->id.'-'.$i) ? GETPOST('qty-'.$line->id.'-'.$i) : max(0, $line->qty - $alreadyconsumed));
+						if ($action == 'consumeorproduce' && !GETPOSTISSET('qty-'.$line->id.'-'.$i)) $preselected = 0;
+						print '<td class="right"><input type="text" class="width50 right" name="qty-'.$line->id.'-'.$i.'" value="'.$preselected.'"></td>';
+						print '<td></td>';
+						print '<td>';
+						if ($tmpproduct->type == Product::TYPE_PRODUCT || !empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
+							if (empty($line->disable_stock_change)) {
+								$preselected = (GETPOSTISSET('idwarehouse-'.$line->id.'-'.$i) ? GETPOST('idwarehouse-'.$line->id.'-'.$i) : ($tmpproduct->fk_default_warehouse > 0 ? $tmpproduct->fk_default_warehouse : 'ifone'));
+								print $formproduct->selectWarehouses($preselected, 'idwarehouse-'.$line->id.'-'.$i, '', 1, 0, $line->fk_product, '', 1, 0, null, 'maxwidth300');
+							} else {
+								print '<span class="opacitymedium">'.$langs->trans("DisableStockChange").'</span>';
+							}
+						} else {
+							print '<span class="opacitymedium">'.$langs->trans("NoStockChangeOnServices").'</span>';
+						}
+						// Lot / Batch
+						print '</td>';
+						if ($conf->productbatch->enabled) {
+							print '<td>';
+							if ($tmpproduct->status_batch) {
+								$preselected = (GETPOSTISSET('batch-'.$line->id.'-'.$i) ? GETPOST('batch-'.$line->id.'-'.$i) : '');
+								print '<input type="text" class="width50" name="batch-'.$line->id.'-'.$i.'" value="'.$preselected.'">';
+							}
+							print '</td>';
+						}
+						print '</tr>';
+					}
+				}
+			}
+		}
 
-   	    print '</table>';
-    	print '</div>';
+   		print '</table>';
+		print '</div>';
 
-    	// Lines to produce
+		// Lines to produce
 
 		print '</div>';
-    	print '<div class="fichehalfright">';
-    	print '<div class="clearboth"></div>';
+		print '<div class="fichehalfright">';
+		print '<div class="clearboth"></div>';
 
-    	print load_fiche_titre($langs->trans('Production'), '', '');
+		print load_fiche_titre($langs->trans('Production'), '', '');
 
-    	print '<div class="div-table-responsive-no-min">';
-    	print '<table id="tablelinestoproduce" class="noborder noshadow nobottom centpercent">';
+		print '<div class="div-table-responsive-no-min">';
+		print '<table id="tablelinestoproduce" class="noborder noshadow nobottom centpercent">';
 
-    	print '<tr class="liste_titre">';
-    	print '<td>'.$langs->trans("Product").'</td>';
-    	print '<td class="right">'.$langs->trans("Qty").'</td>';
-    	print '<td class="right">'.$langs->trans("QtyAlreadyProduced").'</td>';
-    	print '<td>';
-    	if ($collapse || in_array($action, array('consumeorproduce', 'consumeandproduceall'))) print $langs->trans("Warehouse");
-    	print '</td>';
-    	if ($conf->productbatch->enabled) {
-    		print '<td>';
-    		if ($collapse || in_array($action, array('consumeorproduce', 'consumeandproduceall'))) print $langs->trans("Batch");
-    		print '</td>';
-    		print '<td></td>';
-    	}
-    	print '</tr>';
+		print '<tr class="liste_titre">';
+		print '<td>'.$langs->trans("Product").'</td>';
+		print '<td class="right">'.$langs->trans("Qty").'</td>';
+		print '<td class="right">'.$langs->trans("QtyAlreadyProduced").'</td>';
+		print '<td>';
+		if ($collapse || in_array($action, array('consumeorproduce', 'consumeandproduceall'))) print $langs->trans("Warehouse");
+		print '</td>';
+		if ($conf->productbatch->enabled) {
+			print '<td>';
+			if ($collapse || in_array($action, array('consumeorproduce', 'consumeandproduceall'))) print $langs->trans("Batch");
+			print '</td>';
+			print '<td></td>';
+		}
+		print '</tr>';
 
-    	if (!empty($object->lines))
-    	{
-    		$nblinetoproduce = 0;
-    		foreach ($object->lines as $line) {
-    			if ($line->role == 'toproduce') {
-    				$nblinetoproduce++;
-    			}
-    		}
+		if (!empty($object->lines))
+		{
+			$nblinetoproduce = 0;
+			foreach ($object->lines as $line) {
+				if ($line->role == 'toproduce') {
+					$nblinetoproduce++;
+				}
+			}
 
-    		$nblinetoproducecursor = 0;
-    		foreach ($object->lines as $line) {
-    			if ($line->role == 'toproduce') {
-    				$i = 1;
+			$nblinetoproducecursor = 0;
+			foreach ($object->lines as $line) {
+				if ($line->role == 'toproduce') {
+					$i = 1;
 
-    				$nblinetoproducecursor++;
+					$nblinetoproducecursor++;
 
-    				$tmpproduct = new Product($db);
-    				$tmpproduct->fetch($line->fk_product);
+					$tmpproduct = new Product($db);
+					$tmpproduct->fetch($line->fk_product);
 
-    				$arrayoflines = $object->fetchLinesLinked('produced', $line->id);
-    				$alreadyproduced = 0;
-    				foreach ($arrayoflines as $line2) {
-    					$alreadyproduced += $line2['qty'];
-    				}
+					$arrayoflines = $object->fetchLinesLinked('produced', $line->id);
+					$alreadyproduced = 0;
+					foreach ($arrayoflines as $line2) {
+						$alreadyproduced += $line2['qty'];
+					}
 
-    				$suffix = '_'.$line->id;
-    				print '<!-- Line to dispatch '.$suffix.' -->'."\n";
-    				// hidden fields for js function
-    				print '<input id="qty_ordered'.$suffix.'" type="hidden" value="'.$line->qty.'">';
-    				print '<input id="qty_dispatched'.$suffix.'" type="hidden" value="'.$alreadyproduced.'">';
+					$suffix = '_'.$line->id;
+					print '<!-- Line to dispatch '.$suffix.' -->'."\n";
+					// hidden fields for js function
+					print '<input id="qty_ordered'.$suffix.'" type="hidden" value="'.$line->qty.'">';
+					print '<input id="qty_dispatched'.$suffix.'" type="hidden" value="'.$alreadyproduced.'">';
 
-    				print '<tr>';
-    				print '<td>'.$tmpproduct->getNomUrl(1);
-    				print '<br><span class="opacitymedium small">'.$tmpproduct->label.'</span>';
-    				print '</td>';
-    				print '<td class="right">'.$line->qty.'</td>';
-    				print '<td class="right nowraponall">';
-    				if ($alreadyproduced) {
-    					print '<script>';
-    					print 'jQuery(document).ready(function() {
+					print '<tr>';
+					print '<td>'.$tmpproduct->getNomUrl(1);
+					print '<br><span class="opacitymedium small">'.$tmpproduct->label.'</span>';
+					print '</td>';
+					print '<td class="right">'.$line->qty.'</td>';
+					print '<td class="right nowraponall">';
+					if ($alreadyproduced) {
+						print '<script>';
+						print 'jQuery(document).ready(function() {
 							jQuery("#expandtoproduce'.$line->id.'").click(function() {
 								console.log("Expand mrp_production line '.$line->id.'");
 								jQuery(".expanddetailtoproduce'.$line->id.'").toggle();';
-    					if ($nblinetoproduce == $nblinetoproducecursor) {
-    						print 'if (jQuery("#tablelinestoproduce").hasClass("nobottom")) { jQuery("#tablelinestoproduce").removeClass("nobottom"); } else { jQuery("#tablelinestoproduce").addClass("nobottom"); }';
-    					}
-    					print '
+						if ($nblinetoproduce == $nblinetoproducecursor) {
+							print 'if (jQuery("#tablelinestoproduce").hasClass("nobottom")) { jQuery("#tablelinestoproduce").removeClass("nobottom"); } else { jQuery("#tablelinestoproduce").addClass("nobottom"); }';
+						}
+						print '
 							});
 						});';
-    					print '</script>';
-    					if (empty($conf->use_javascript_ajax)) print '<a href="'.$_SERVER["PHP_SELF"].'?collapse='.$collapse.','.$line->id.'">';
-    					print img_picto($langs->trans("ShowDetails"), "chevron-down", 'id="expandtoproduce'.$line->id.'"');
-    					if (empty($conf->use_javascript_ajax)) print '</a>';
-    				}
-    				print ' '.$alreadyproduced;
-    				print '</td>';
-    				print '<td>'; // Warehouse
-    				print '</td>';
-    				if ($conf->productbatch->enabled) {
-    					print '<td></td>'; // Lot
-    					print '<td></td>';
-    				}
-    				print '</tr>';
+						print '</script>';
+						if (empty($conf->use_javascript_ajax)) print '<a href="'.$_SERVER["PHP_SELF"].'?collapse='.$collapse.','.$line->id.'">';
+						print img_picto($langs->trans("ShowDetails"), "chevron-down", 'id="expandtoproduce'.$line->id.'"');
+						if (empty($conf->use_javascript_ajax)) print '</a>';
+					}
+					print ' '.$alreadyproduced;
+					print '</td>';
+					print '<td>'; // Warehouse
+					print '</td>';
+					if ($conf->productbatch->enabled) {
+						print '<td></td>'; // Lot
+						print '<td></td>';
+					}
+					print '</tr>';
 
-    				// Show detailed of already consumed with js code to collapse
-    				foreach ($arrayoflines as $line2) {
-    					print '<tr class="expanddetailtoproduce'.$line->id.' hideobject opacitylow">';
-    					print '<td>';
-    					print dol_print_date($line2['date'], 'dayhour');
-    					print '</td>';
-    					print '<td></td>';
-    					print '<td class="right">'.$line2['qty'].'</td>';
-    					print '<td class="tdoverflowmax150">';
-    					if ($line2['fk_warehouse'] > 0) {
-    						$result = $tmpwarehouse->fetch($line2['fk_warehouse']);
-    						if ($result > 0) print $tmpwarehouse->getNomUrl(1);
-    					}
-    					print '</td>';
-    					if ($conf->productbatch->enabled) {
-    						print '<td>';
-	    					if ($line2['batch'] != '') {
-	    						$tmpbatch->fetch(0, $line2['fk_product'], $line2['batch']);
-	    						print $tmpbatch->getNomUrl(1);
-	    					}
-	    					print '</td>';
-	    					print '<td></td>';
-    					}
-    					print '</tr>';
-    				}
+					// Show detailed of already consumed with js code to collapse
+					foreach ($arrayoflines as $line2) {
+						print '<tr class="expanddetailtoproduce'.$line->id.' hideobject opacitylow">';
+						print '<td>';
+						print dol_print_date($line2['date'], 'dayhour');
+						print '</td>';
+						print '<td></td>';
+						print '<td class="right">'.$line2['qty'].'</td>';
+						print '<td class="tdoverflowmax150">';
+						if ($line2['fk_warehouse'] > 0) {
+							$result = $tmpwarehouse->fetch($line2['fk_warehouse']);
+							if ($result > 0) print $tmpwarehouse->getNomUrl(1);
+						}
+						print '</td>';
+						if ($conf->productbatch->enabled) {
+							print '<td>';
+							if ($line2['batch'] != '') {
+								$tmpbatch->fetch(0, $line2['fk_product'], $line2['batch']);
+								print $tmpbatch->getNomUrl(1);
+							}
+							print '</td>';
+							print '<td></td>';
+						}
+						print '</tr>';
+					}
 
-    				if (in_array($action, array('consumeorproduce', 'consumeandproduceall'))) {
-    					print '<!-- Enter line to produce -->'."\n";
-    					print '<tr name="batch_'.$line->id.'_'.$i.'">';
-    					print '<td><span class="opacitymedium">'.$langs->trans("ToProduce").'</span></td>';
-    					$preselected = (GETPOSTISSET('qtytoproduce-'.$line->id.'-'.$i) ? GETPOST('qtytoproduce-'.$line->id.'-'.$i) : max(0, $line->qty - $alreadyproduced));
-    					if ($action == 'consumeorproduce' && !GETPOSTISSET('qtytoproduce-'.$line->id.'-'.$i)) $preselected = 0;
-    					print '<td class="right"><input type="text" class="width50 right" id="qtytoproduce-'.$line->id.'-'.$i.'" name="qtytoproduce-'.$line->id.'-'.$i.'" value="'.$preselected.'"></td>';
-    					print '<td></td>';
-    					print '<td>';
-    					if ($tmpproduct->type == Product::TYPE_PRODUCT || !empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
-    						$preselected = (GETPOSTISSET('idwarehousetoproduce-'.$line->id.'-'.$i) ? GETPOST('idwarehousetoproduce-'.$line->id.'-'.$i) : ($object->fk_warehouse > 0 ? $object->fk_warehouse : 'ifone'));
-    						print $formproduct->selectWarehouses($preselected, 'idwarehousetoproduce-'.$line->id.'-'.$i, '', 1, 0, $line->fk_product, '', 1, 0, null, 'maxwidth300 csswarehouse_'.$line->id.'_'.$i);
-    					} else {
-    						print '<span class="opacitymedium">'.$langs->trans("NoStockChangeOnServices").'</span>';
-    					}
-    					print '</td>';
-    					if ($conf->productbatch->enabled) {
-    						print '<td>';
-    						if ($tmpproduct->status_batch) {
-    							$preselected = (GETPOSTISSET('batchtoproduce-'.$line->id.'-'.$i) ? GETPOST('batchtoproduce-'.$line->id.'-'.$i) : '');
-    							print '<input type="text" class="width50" name="batchtoproduce-'.$line->id.'-'.$i.'" value="'.$preselected.'">';
-    						}
-    						print '</td>';
-    						print '<td>';
-    						if ($tmpproduct->status_batch) {
-    							$type = 'batch';
-    							print img_picto($langs->trans('AddStockLocationLine'), 'split.png', 'class="splitbutton" onClick="addDispatchLine('.$line->id.', \''.$type.'\', \'qtymissing\')"');
-    						}
-    						print '</td>';
-    					}
-    					print '</tr>';
-    				}
-    			}
-    		}
-    	}
+					if (in_array($action, array('consumeorproduce', 'consumeandproduceall'))) {
+						print '<!-- Enter line to produce -->'."\n";
+						print '<tr name="batch_'.$line->id.'_'.$i.'">';
+						print '<td><span class="opacitymedium">'.$langs->trans("ToProduce").'</span></td>';
+						$preselected = (GETPOSTISSET('qtytoproduce-'.$line->id.'-'.$i) ? GETPOST('qtytoproduce-'.$line->id.'-'.$i) : max(0, $line->qty - $alreadyproduced));
+						if ($action == 'consumeorproduce' && !GETPOSTISSET('qtytoproduce-'.$line->id.'-'.$i)) $preselected = 0;
+						print '<td class="right"><input type="text" class="width50 right" id="qtytoproduce-'.$line->id.'-'.$i.'" name="qtytoproduce-'.$line->id.'-'.$i.'" value="'.$preselected.'"></td>';
+						print '<td></td>';
+						print '<td>';
+						if ($tmpproduct->type == Product::TYPE_PRODUCT || !empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
+							$preselected = (GETPOSTISSET('idwarehousetoproduce-'.$line->id.'-'.$i) ? GETPOST('idwarehousetoproduce-'.$line->id.'-'.$i) : ($object->fk_warehouse > 0 ? $object->fk_warehouse : 'ifone'));
+							print $formproduct->selectWarehouses($preselected, 'idwarehousetoproduce-'.$line->id.'-'.$i, '', 1, 0, $line->fk_product, '', 1, 0, null, 'maxwidth300 csswarehouse_'.$line->id.'_'.$i);
+						} else {
+							print '<span class="opacitymedium">'.$langs->trans("NoStockChangeOnServices").'</span>';
+						}
+						print '</td>';
+						if ($conf->productbatch->enabled) {
+							print '<td>';
+							if ($tmpproduct->status_batch) {
+								$preselected = (GETPOSTISSET('batchtoproduce-'.$line->id.'-'.$i) ? GETPOST('batchtoproduce-'.$line->id.'-'.$i) : '');
+								print '<input type="text" class="width50" name="batchtoproduce-'.$line->id.'-'.$i.'" value="'.$preselected.'">';
+							}
+							print '</td>';
+							print '<td>';
+							if ($tmpproduct->status_batch) {
+								$type = 'batch';
+								print img_picto($langs->trans('AddStockLocationLine'), 'split.png', 'class="splitbutton" onClick="addDispatchLine('.$line->id.', \''.$type.'\', \'qtymissing\')"');
+							}
+							print '</td>';
+						}
+						print '</tr>';
+					}
+				}
+			}
+		}
 
-    	print '</table>';
-    	print '</div>';
+		print '</table>';
+		print '</div>';
 
-    	print '</div>';
-    	print '</div>';
+		print '</div>';
+		print '</div>';
 	}
 
 	if (in_array($action, array('consumeorproduce', 'consumeandproduceall', 'addconsumeline')))
diff --git a/htdocs/multicurrency/class/multicurrency.class.php b/htdocs/multicurrency/class/multicurrency.class.php
index 2ce3277ae89..ec4b55f39dc 100644
--- a/htdocs/multicurrency/class/multicurrency.class.php
+++ b/htdocs/multicurrency/class/multicurrency.class.php
@@ -634,7 +634,7 @@ class MultiCurrency extends CommonObject
 
 		dol_syslog("Call url endpoint ".$urlendpoint);
 
-		// TODO Use getURLContent() function instead.
+		// FIXME Use getURLContent() function instead.
 		$ch = curl_init($urlendpoint);
 		curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
 		$response = curl_exec($ch);
@@ -687,6 +687,7 @@ class MultiCurrency extends CommonObject
 	}
 }
 
+
 /**
  * Class CurrencyRate
  */
@@ -727,6 +728,7 @@ class CurrencyRate extends CommonObjectLine
 	 */
 	public $entity;
 
+
 	/**
 	 * Constructor
 	 *
@@ -744,8 +746,7 @@ class CurrencyRate extends CommonObjectLine
 	 *
 	 * @param  int	$fk_multicurrency	Id of currency
 	 * @param  bool	$trigger			true=launch triggers after, false=disable triggers
-	 *
-	 * @return int <0 if KO, Id of created object if OK
+	 * @return int 						<0 if KO, Id of created object if OK
 	 */
 	public function create($fk_multicurrency, $trigger = true)
 	{
@@ -756,7 +757,7 @@ class CurrencyRate extends CommonObjectLine
 		$error = 0;
 		$this->rate = price2num($this->rate);
 		if (empty($this->entity) || $this->entity <= 0) $this->entity = $conf->entity;
-		$now = date('Y-m-d H:i:s');
+		$now = empty($this->date_sync) ? dol_now() : $this->date_sync;
 
 		// Insert request
 		$sql = 'INSERT INTO '.MAIN_DB_PREFIX.$this->table_element.'(';
@@ -766,9 +767,9 @@ class CurrencyRate extends CommonObjectLine
 		$sql .= ' entity';
 		$sql .= ') VALUES (';
 		$sql .= ' '.$this->rate.',';
-		$sql .= ' \''.$now.'\',';
-		$sql .= ' \''.$fk_multicurrency.'\',';
-		$sql .= ' \''.$this->entity.'\'';
+		$sql .= " '".$this->db->idate($now)."',";
+		$sql .= " ".((int) $fk_multicurrency).",";
+		$sql .= " ".((int) $this->entity);
 		$sql .= ')';
 
 		$this->db->begin();
@@ -806,9 +807,8 @@ class CurrencyRate extends CommonObjectLine
 	/**
 	 * Load object in memory from the database
 	 *
-	 * @param int    $id  Id object
-	 *
-	 * @return int <0 if KO, 0 if not found, >0 if OK
+	 * @param 	int    $id  Id object
+	 * @return 	int 		<0 if KO, 0 if not found, >0 if OK
 	 */
 	public function fetch($id)
 	{
@@ -827,7 +827,7 @@ class CurrencyRate extends CommonObjectLine
 
 				$this->id = $obj->rowid;
 				$this->rate = $obj->rate;
-				$this->date_sync = $obj->date_sync;
+				$this->date_sync = $this->db->jdate($obj->date_sync);
 				$this->fk_multicurrency = $obj->fk_multicurrency;
 				$this->entity = $obj->entity;
 			}
@@ -849,9 +849,8 @@ class CurrencyRate extends CommonObjectLine
 	/**
 	 * Update object into database
 	 *
-	 * @param  bool $trigger true=launch triggers after, false=disable triggers
-	 *
-	 * @return int <0 if KO, >0 if OK
+	 * @param  bool $trigger	true=launch triggers after, false=disable triggers
+	 * @return int 				<0 if KO, >0 if OK
 	 */
 	public function update($trigger = true)
 	{
@@ -866,6 +865,8 @@ class CurrencyRate extends CommonObjectLine
 		// Update request
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element.' SET';
 		$sql .= ' rate='.$this->rate;
+		if (!empty($this->date_sync)) $sql .= ", date_sync='".$this->db->idate($this->date_sync)."'";
+		if (!empty($this->fk_multicurrency)) $sql .= ', fk_multicurrency='.$this->fk_multicurrency;
 		$sql .= ' WHERE rowid='.$this->id;
 
 		$this->db->begin();
@@ -898,9 +899,8 @@ class CurrencyRate extends CommonObjectLine
 	/**
 	 * Delete object in database
 	 *
-	 * @param bool $trigger true=launch triggers after, false=disable triggers
-	 *
-	 * @return int <0 if KO, >0 if OK
+	 * @param 	bool $trigger 	true=launch triggers after, false=disable triggers
+	 * @return 	int 			<0 if KO, >0 if OK
 	 */
 	public function delete($trigger = true)
 	{
diff --git a/htdocs/multicurrency/multicurrency_rate.php b/htdocs/multicurrency/multicurrency_rate.php
new file mode 100644
index 00000000000..ad2b0e8ddf6
--- /dev/null
+++ b/htdocs/multicurrency/multicurrency_rate.php
@@ -0,0 +1,548 @@
+<?php
+/* Copyright (C) 2001-2006  Rodolphe Quiedeville    <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2018  Laurent Destailleur     <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2012  Regis Houssin           <regis.houssin@capnetworks.com>
+ * Copyright (C) 2012-2016  Marcos García           <marcosgdf@gmail.com>
+ * Copyright (C) 2013-2019	Juanjo Menent           <jmenent@2byte.es>
+ * Copyright (C) 2013-2015  Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>
+ * Copyright (C) 2013       Jean Heimburger         <jean@tiaris.info>
+ * Copyright (C) 2013       Cédric Salvador         <csalvador@gpcsolutions.fr>
+ * Copyright (C) 2013       Florian Henry           <florian.henry@open-concept.pro>
+ * Copyright (C) 2013       Adolfo segura           <adolfo.segura@gmail.com>
+ * Copyright (C) 2015       Jean-François Ferry     <jfefe@aternatik.fr>
+ * Copyright (C) 2016       Ferran Marcet		    <fmarcet@2byte.es>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *  \file       htdocs/multicurrency/multicurrency_rate.php
+ *  \ingroup    multicurrency
+ *  \brief      Page to list multicurrency rate
+ */
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/multicurrency.lib.php';
+
+// Load translation files required by the page
+$langs->loadLangs(array('multicurrency'));
+
+$action				= GETPOST('action', 'alpha');
+$massaction			= GETPOST('massaction', 'alpha');
+$show_files			= GETPOST('show_files', 'int');
+$confirm			= GETPOST('confirm', 'alpha');
+$toselect = GETPOST('toselect', 'array');
+$id_rate_selected = GETPOST('id_rate', 'int');
+$sall = trim((GETPOST('search_all', 'alphanohtml') != '') ?GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
+$search_date_sync = GETPOST('search_date_sync', 'alpha');
+$search_rate		= GETPOST('search_rate', 'alpha');
+$search_code		= GETPOST('search_code', 'alpha');
+$multicurrency_code = GETPOST('multicurrency_code', 'alpha');
+$dateinput 			= dol_mktime(0, 0, 0, GETPOST('dateinputmonth', 'int'), GETPOST('dateinputday', 'int'), GETPOST('dateinputyear', 'int'));
+$rateinput 			= price2num(GETPOST('rateinput', 'alpha'));
+$optioncss 			= GETPOST('optioncss', 'alpha');
+$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$sortfield 			= GETPOST("sortfield", 'alpha');
+$sortorder 			= GETPOST("sortorder", 'alpha');
+$page = (GETPOST("page", 'int') ?GETPOST("page", 'int') : 0);
+
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+$offset = $limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+if (!$sortfield) $sortfield = "cr.date_sync";
+if (!$sortorder) $sortorder = "ASC";
+
+
+// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array of hooks
+$object = new CurrencyRate($db);
+
+$extrafields = new ExtraFields($db);
+$form = new Form($db);
+
+$hookmanager->initHooks(array('EditorRatelist', 'globallist'));
+
+if (empty($action)) $action = 'list';
+
+// List of fields to search into when doing a "search in all"
+$fieldstosearchall = array(
+	'cr.date_sync'=>"date_sync",
+	'cr.rate'=>"rate",
+	'm.code'=>"code",
+);
+
+// Definition of fields for lists
+$arrayfields = array(
+	'cr.date_sync'=>array('label'=>'Date', 'checked'=>1),
+	'cr.rate'=>array('label'=>'Rate', 'checked'=>1),
+	'm.code'=>array('label'=>'Code', 'checked'=>1),
+);
+
+
+$object->fields = dol_sort_array($object->fields, 'position');
+$arrayfields = dol_sort_array($arrayfields, 'position');
+
+
+
+/*
+ * Actions
+ */
+if ($action == "create") {
+	if (!empty($rateinput)) {
+		$currencyRate_static = new CurrencyRate($db);
+		$currency_static = new MultiCurrency($db);
+		$fk_currency = $currency_static->getIdFromCode($db, $multicurrency_code);
+
+		$currencyRate_static->fk_multicurrency = $fk_currency;
+		$currencyRate_static->entity = $conf->entity;
+		$currencyRate_static->date_sync = $dateinput;
+		$currencyRate_static->rate = $rateinput;
+
+		$result = $currencyRate_static->create(intval($fk_currency));
+		if ($result > 0) {
+			setEventMessages($langs->trans('successRateCreate', $multicurrency_code), null);
+		} else {
+			dol_syslog("currencyRate:createRate", LOG_WARNING);
+			setEventMessages($currencyRate_static->error, $currencyRate_static->errors, 'errors');
+		}
+	} else {
+		setEventMessages($langs->trans('NoEmptyRate'), null, "errors");
+	}
+}
+
+if ($action == 'update') {
+	$currencyRate = new CurrencyRate($db);
+	$result = $currencyRate->fetch($id_rate_selected);
+	if ($result > 0) {
+		$currency_static = new MultiCurrency($db);
+		$fk_currency = $currency_static->getIdFromCode($db, $multicurrency_code);
+		$currencyRate->date_sync = $dateinput;
+		$currencyRate->fk_multicurrency = $fk_currency;
+		$currencyRate->rate = $rateinput;
+		$res = $currencyRate->update();
+		if ($res) {
+			setEventMessages($langs->trans('successUpdateRate'), null);
+		} else {
+			setEventMessages($currencyRate->error, $currencyRate->errors, "errors");
+		}
+	} else {
+		setEventMessages($langs->trans('Error'), null, "warnings");
+	}
+}
+
+if ($action == "deleteRate") {
+	$current_rate = new CurrencyRate($db);
+	$current_rate->fetch(intval($id_rate_selected));
+
+	if ($current_rate) {
+		$current_currency = new MultiCurrency($db);
+		$current_currency->fetch($current_rate->fk_multicurrency);
+		if ($current_currency) {
+			$delayedhtmlcontent = $form->formconfirm(
+				$_SERVER["PHP_SELF"].'?id_rate='.$id_rate_selected,
+				$langs->trans('DeleteLineRate'),
+				$langs->trans('ConfirmDeleteLineRate', $current_rate->rate, $current_currency->name, $current_rate->date_sync),
+				'confirm_delete',
+				'',
+				0,
+				1
+			);
+		} else {
+			dol_syslog("Multicurrency::fetch", LOG_WARNING);
+		}
+	} else {
+		setEventMessage($langs->trans('NoCurrencyRateSelected'), "warnings");
+	}
+}
+
+if ($action == "confirm_delete") {
+	$current_rate = new CurrencyRate($db);
+	$current_rate->fetch(intval($id_rate_selected));
+	if ($current_rate) {
+		$result = $current_rate->delete();
+		if ($result) {
+			setEventMessages($langs->trans('successRateDelete'), null);
+		} else {
+			setEventMessages($current_rate->error, $current_rate->errors, 'errors');
+		}
+	} else {
+		setEventMessages($langs->trans('NoCurrencyRateSelected'), null, "warnings");
+		dol_syslog($langs->trans('NoCurrencyRateSelected'), LOG_WARNING);
+	}
+}
+
+
+if (GETPOST('cancel', 'alpha')) { $action = 'list'; $massaction = ''; }
+if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction = ''; }
+
+$parameters = array();
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+if (empty($reshook))
+{
+	// Selection of new fields
+	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
+
+	// Purge search criteria
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
+	{
+		$sall = "";
+		$search_date_sync = "";
+		$search_rate = "";
+		$search_code = "";
+		$search_array_options = array();
+	}
+
+	// Mass actions
+	$objectclass = "CurrencyRate";
+	$uploaddir = $conf->multicurrency->multidir_output; // define only because core/actions_massactions.inc.php want it
+	$permtoread = $user->admin;
+	$permtodelete = $user->admin;
+	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
+}
+
+/*
+ * View
+ */
+
+$htmlother = new FormOther($db);
+
+$title = $langs->trans("CurrencyRate");
+$page_name = "ListCurrencyRate";
+
+llxHeader('', $title, $helpurl, '');
+// Subheader
+$linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
+print load_fiche_titre($langs->trans($page_name), $linkback);
+
+// Configuration header
+$head = multicurrencyAdminPrepareHead();
+print dol_get_fiche_head($head, 'ratelist', $langs->trans("ModuleSetup"), -1, "multicurrency");
+
+// ACTION
+
+if ($action != "updateRate" && $action != "deleteRate") {
+	print '<table class="noborder centpercent">';
+	print '<tr class="liste_titre">';
+	print '<td>'.$langs->trans("FormCreateRate").'</td>'."\n";
+	print '</tr></table>';
+
+	$form = new Form($db);
+	print '<form action="'.$_SERVER["PHP_SELF"].'" method="post" name="formulaire">';
+	print '<table><tr>';
+
+	print ' <td>'.$langs->trans('Date').'</td>';
+	print ' <td>';
+	print $form->selectDate($dateinput, 'dateinput');
+	print '</td>';
+
+	print '<td> '.$langs->trans('Currency').'</td>';
+	print '<td>'.$form->selectMultiCurrency((GETPOSTISSET('multicurrency_code') ? GETPOST('multicurrency_code', 'alpha') : $multicurrency_code), 'multicurrency_code', 0, " code != '".$conf->currency."'", true).'</td>';
+
+	print ' <td>'.$langs->trans('Rate').'</td>';
+	print ' <td><input type="number" min ="0" step="any" class="minwidth200" name="rateinput" value="'.dol_escape_htmltag($rateinput).'"></td>';
+
+	print '<td>';
+	print '<input type="hidden" name="action" value="create">';
+	print '<input type="submit" class="butAction" name="btnCreateCurrencyRate" value="'.$langs->trans('CreateRate').'">';
+	print '</td>';
+
+	print '</tr></table>';
+	print '</form>';
+
+	print '<br>';
+}
+
+if ($action == "updateRate") {
+	$current_rate = new CurrencyRate($db);
+	$current_rate->fetch(intval($id_rate_selected));
+
+	if ($current_rate) {
+		$curr = new MultiCurrency($db);
+		$resultcurrentCurrency = $curr->fetch($current_rate->fk_multicurrency);
+
+		if ($resultcurrentCurrency) {
+			$currency_code = $curr->code;
+		} else {
+			$currency_code = '';
+		}
+
+		print '<table class="noborder centpercent">';
+		print '<tr class="liste_titre">';
+		print '<td>'.$langs->trans("FormUpdateRate").'</td>'."\n";
+		print '</tr></table>';
+
+		$form = new Form($db);
+		print '<form action="'.$_SERVER["PHP_SELF"].'" method="post" name="formtoupdaterate">';
+		print '<table><tr>';
+		print ' <td>'.$langs->trans('Date').'</td>';
+		print '<td>';
+		print $form->selectDate($current_rate->date_sync, 'dateinput');
+		print '</td>';
+
+		print '<td> '.$langs->trans('Currency').'</td>';
+		print '<td>'.$form->selectMultiCurrency($currency_code, 'multicurrency_code', 0, " code != '".$conf->currency."'", true).'</td>';
+
+		print '<td>'.$langs->trans('Rate').'</td>';
+		print '<td><input class="minwidth200" name="rateinput" value="'.dol_escape_htmltag($current_rate->rate).'" type="text"></td>';
+
+		print '<td>';
+		print '<input type="hidden" name="action" value="update">';
+		print '<input type="hidden" name="id_rate" value="'.$current_rate->id.'">';
+		print '<input type="submit" class="butAction" name="btnupdateCurrencyRate" value="'.$langs->trans('UpdateRate').'">';
+		print '<a href="'.$_SERVER["PHP_SELF"].'" class="butAction">'.$langs->trans('CancelUpdate').'</a>';
+
+		print '</td>';
+		print '</tr></table>';
+		print '</form>';
+	} else {
+		dol_syslog("currency_rate:list:update", LOG_WARNING);
+	}
+}
+
+
+$sql = 'SELECT cr.rowid, cr.date_sync, cr.rate, cr.entity, m.code, m.name ';
+// Add fields from hooks
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters); // Note that $action and $object may have been modified by hook
+$sql .= $hookmanager->resPrint;
+$sql .= ' FROM '.MAIN_DB_PREFIX.'multicurrency_rate as cr ';
+$sql .= " INNER JOIN ".MAIN_DB_PREFIX."multicurrency AS m ON cr.fk_multicurrency = m.rowid";
+if ($sall) $sql .= natural_search(array_keys($fieldstosearchall), $sall);
+if ($search_date_sync) $sql .= natural_search('cr.date_sync', $search_date_sync);
+if ($search_rate) $sql .= natural_search('cr.rate', $search_rate);
+if ($search_code) $sql .= natural_search('m.code', $search_code);
+$sql .= " WHERE m.code <> '".$db->escape($conf->currency)."'";
+
+// Add where from hooks
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook
+$sql .= $hookmanager->resPrint;
+$sql .= " GROUP BY cr.rowid, cr.date_sync, cr.rate, m.code, cr.entity, m.code, m.name";
+
+// Add fields from hooks
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldSelect', $parameters); // Note that $action and $object may have been modified by hook
+$sql .= $hookmanager->resPrint;
+
+$sql .= $db->order($sortfield, $sortorder);
+
+
+$nbtotalofrecords = '';
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
+{
+	$result = $db->query($sql);
+
+	if ($result) {
+		$nbtotalofrecords = $db->num_rows($result);
+		if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+		{
+			$page = 0;
+			$offset = 0;
+		}
+	} else {
+		setEventMessage($langs->trans('No_record_on_multicurrency_rate'), 'warnings');
+	}
+}
+
+$sql .= $db->plimit($limit + 1, $offset);
+
+$resql = $db->query($sql);
+if ($resql)
+{
+	$num = $db->num_rows($resql);
+	$arrayofselected = is_array($toselect) ? $toselect : array();
+
+	$param = '';
+	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
+	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
+	if ($sall) $param .= "&sall=".urlencode($sall);
+
+	if ($search_date_sync) $param = "&search_date_sync=".urlencode($search_date_sync);
+	if ($search_rate) $param = "&search_rate=".urlencode($search_rate);
+	if ($search_code != '') $param .= "&search_code=".urlencode($search_code);
+
+	// Add $param from extra fields
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
+
+	if ($user->admin) $arrayofmassactions['predelete'] = $langs->trans("Delete");
+	if (in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
+	$massactionbutton = $form->selectMassAction('', $arrayofmassactions);
+
+	print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST" name="formulaire">';
+	if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
+	print '<input type="hidden" name="action" value="list">';
+	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+	print '<input type="hidden" name="page" value="'.$page.'">';
+	print '<input type="hidden" name="type" value="'.$type.'">';
+
+	print_barre_liste($texte, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_currency.png', 0, $newcardbutton, '', $limit);
+
+	include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
+
+	if ($sall)
+	{
+		foreach ($fieldstosearchall as $key => $val) $fieldstosearchall[$key] = $langs->trans($val);
+		print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall).join(', ', $fieldstosearchall).'</div>';
+	}
+
+	// Filter on categories
+	$moreforfilter = '';
+
+
+	$parameters = array();
+	$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters); // Note that $action and $object may have been modified by hook
+	if (empty($reshook)) $moreforfilter .= $hookmanager->resPrint;
+	else $moreforfilter = $hookmanager->resPrint;
+
+	if ($moreforfilter)
+	{
+		print '<div class="liste_titre liste_titre_bydiv centpercent">';
+		print $moreforfilter;
+		print '</div>';
+	}
+
+	$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
+	$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
+	if ($massactionbutton) $selectedfields .= $form->showCheckAddButtons('checkforselect', 1);
+
+	print '<div class="div-table-responsive">';
+	print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
+
+	// Lines with input filters
+	print '<tr class="liste_titre_filter">';
+
+	// date
+	if (!empty($arrayfields['cr.date_sync']['checked']))
+	{
+		print '<td class="liste_titre" align="left">';
+		print '<input class="flat" type="text" name="search_date_sync" size="8" value="'.dol_escape_htmltag($search_date_sync).'">';
+		print '</td>';
+	}
+	// code
+	if (!empty($arrayfields['m.code']['checked']))
+	{
+		print '<td class="liste_titre" align="left">';
+		print '<input class="flat" type="text" name="search_code" size="12" value="'.dol_escape_htmltag($search_code).'">';
+		print '</td>';
+	}
+	// rate
+	if (!empty($arrayfields['cr.rate']['checked']))
+	{
+		print '<td class="liste_titre" align="left">';
+		print '<input class="flat" type="text" name="search_rate" size="8" value="'.dol_escape_htmltag($search_rate).'">';
+		print '</td>';
+	}
+
+	// Fields from hook
+	$parameters = array('arrayfields'=>$arrayfields);
+	$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook
+	print $hookmanager->resPrint;
+
+	print '<td class="liste_titre" align="middle">';
+	$searchpicto = $form->showFilterButtons();
+	print $searchpicto;
+	print '</td>';
+
+	print '</tr>';
+
+	print '<tr class="liste_titre">';
+	if (!empty($arrayfields['cr.date_sync']['checked']))  print_liste_field_titre($arrayfields['cr.date_sync']['label'], $_SERVER["PHP_SELF"], "cr.date_sync", "", $param, "", $sortfield, $sortorder);
+	if (!empty($arrayfields['m.code']['checked']))  print_liste_field_titre($arrayfields['m.code']['label'], $_SERVER["PHP_SELF"], "m.code", "", $param, "", $sortfield, $sortorder);
+	if (!empty($arrayfields['cr.rate']['checked']))  print_liste_field_titre($arrayfields['cr.rate']['label'], $_SERVER["PHP_SELF"], "cr.rate", "", $param, "", $sortfield, $sortorder);
+
+	// Hook fields
+	$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
+	$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
+	print $hookmanager->resPrint;
+
+	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
+	print "</tr>\n";
+
+	$i = 0;
+	$totalarray = array();
+	while ($i < min($num, $limit))
+	{
+		$obj = $db->fetch_object($resql);
+
+		print '<tr class="oddeven">';
+
+		// date_sync
+		if (!empty($arrayfields['cr.date_sync']['checked']))
+		{
+			print '<td class="tdoverflowmax200">';
+			print $obj->date_sync;
+			print "</td>\n";
+			if (!$i) $totalarray['nbfield']++;
+		}
+
+		// code
+		if (!empty($arrayfields['m.code']['checked']))
+		{
+			print '<td class="tdoverflowmax200">';
+			print $obj->code." ".$obj->name;
+			print "</td>\n";
+
+			if (!$i) $totalarray['nbfield']++;
+		}
+
+		// rate
+		if (!empty($arrayfields['cr.rate']['checked']))
+		{
+			print '<td class="tdoverflowmax200">';
+			print $obj->rate;
+			print "</td>\n";
+			if (!$i) $totalarray['nbfield']++;
+		}
+
+		// Fields from hook
+		$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj);
+		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
+		print $hookmanager->resPrint;
+
+		// Action
+		print '<td class="nowrap" align="center">';
+		if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+		{
+			$selected = 0;
+			if (in_array($obj->rowid, $arrayofselected)) $selected = 1;
+			print '<a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=updateRate&amp;id_rate='.$obj->rowid.'" class="like-link " style="margin-right:15px;important">'.img_picto('edit', 'edit').'</a>';
+			print '<a href="'.$_SERVER["PHP_SELF"].'?action=deleteRate&amp;id_rate='.$obj->rowid.'" class="like-link" style="margin-right:45px;important">'.img_picto('delete', 'delete').'</a>';
+			print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
+		}
+		print '</td>';
+		if (!$i) $totalarray['nbfield']++;
+
+		print "</tr>\n";
+		$i++;
+	}
+
+	$db->free($resql);
+
+	print "</table>";
+	print "</div>";
+
+	print '</form>';
+}
+else {
+	dol_print_error($db);
+}
+
+
+llxFooter();
+$db->close();
diff --git a/htdocs/opensurvey/card.php b/htdocs/opensurvey/card.php
index 909587ff9bf..96bcd2af739 100644
--- a/htdocs/opensurvey/card.php
+++ b/htdocs/opensurvey/card.php
@@ -335,7 +335,7 @@ print '</table>';
 
 print '</div>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 if ($action == 'edit')
 {
diff --git a/htdocs/opensurvey/list.php b/htdocs/opensurvey/list.php
index 77e7feed460..dbc38b7b197 100644
--- a/htdocs/opensurvey/list.php
+++ b/htdocs/opensurvey/list.php
@@ -77,15 +77,15 @@ if (!$user->rights->opensurvey->read) accessforbidden();
 $arrayfields = array();
 foreach ($arrayfields as $key => $val)
 {
-    // If $val['visible']==0, then we never show the field
-    if (!empty($val['visible'])) $arrayfields['t.'.$key] = array('label'=>$val['label'], 'checked'=>(($val['visible'] < 0) ? 0 : 1), 'enabled'=>$val['enabled'], 'position'=>$val['position']);
+	// If $val['visible']==0, then we never show the field
+	if (!empty($val['visible'])) $arrayfields['t.'.$key] = array('label'=>$val['label'], 'checked'=>(($val['visible'] < 0) ? 0 : 1), 'enabled'=>$val['enabled'], 'position'=>$val['position']);
 }
 // Extra fields
 if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0)
 {
-    foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val)
-    {
-        if (!empty($extrafields->attributes[$object->table_element]['list'][$key])) {
+	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val)
+	{
+		if (!empty($extrafields->attributes[$object->table_element]['list'][$key])) {
 			$arrayfields["ef.".$key] = array(
 				'label'=>$extrafields->attributes[$object->table_element]['label'][$key],
 				'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1),
@@ -93,7 +93,7 @@ if (is_array($extrafields->attributes[$object->table_element]['label']) && count
 				'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key])
 			);
 		}
-    }
+	}
 }
 $object->fields = dol_sort_array($object->fields, 'position');
 $arrayfields = dol_sort_array($arrayfields, 'position');
@@ -116,29 +116,29 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 
 if (empty($reshook))
 {
-    // Selection of new fields
-    include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
+	// Selection of new fields
+	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
-    // Purge search criteria
-    if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
-    {
-        $search_status = '';
-        $search_title = '';
-        $search_ref = '';
-        $toselect = '';
-        $search_array_options = array();
-    }
-    if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')
-        || GETPOST('button_search_x', 'alpha') || GETPOST('button_search.x', 'alpha') || GETPOST('button_search', 'alpha'))
-    {
-        $massaction = ''; // Protection to avoid mass action if we force a new search during a mass action confirmation
-    }
+	// Purge search criteria
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
+	{
+		$search_status = '';
+		$search_title = '';
+		$search_ref = '';
+		$toselect = '';
+		$search_array_options = array();
+	}
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')
+		|| GETPOST('button_search_x', 'alpha') || GETPOST('button_search.x', 'alpha') || GETPOST('button_search', 'alpha'))
+	{
+		$massaction = ''; // Protection to avoid mass action if we force a new search during a mass action confirmation
+	}
 
-    // Mass actions
-    $objectclass = 'Opensurveysondage';
-    $objectlabel = 'Opensurveysondage';
-    $uploaddir = $conf->opensurvey->dir_output;
-    include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
+	// Mass actions
+	$objectclass = 'Opensurveysondage';
+	$objectlabel = 'Opensurveysondage';
+	$uploaddir = $conf->opensurvey->dir_output;
+	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }
 
 
@@ -191,16 +191,16 @@ if (is_numeric($nbtotalofrecords) && $limit > $nbtotalofrecords)
 {
 	$num = $nbtotalofrecords;
 } else {
-    $sql .= $db->plimit($limit + 1, $offset);
+	$sql .= $db->plimit($limit + 1, $offset);
 
-    $resql = $db->query($sql);
-    if (!$resql)
-    {
-        dol_print_error($db);
-        exit;
-    }
+	$resql = $db->query($sql);
+	if (!$resql)
+	{
+		dol_print_error($db);
+		exit;
+	}
 
-    $num = $db->num_rows($resql);
+	$num = $db->num_rows($resql);
 }
 
 // Direct jump if only one record found
@@ -231,8 +231,8 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 
 // List of mass actions available
 $arrayofmassactions = array(
-    //'presend'=>$langs->trans("SendByMail"),
-    //'builddoc'=>$langs->trans("PDFMerge"),
+	//'presend'=>$langs->trans("SendByMail"),
+	//'builddoc'=>$langs->trans("PDFMerge"),
 );
 if ($permissiontodelete) $arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
 if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
@@ -263,8 +263,8 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
 if ($sall)
 {
-    foreach ($fieldstosearchall as $key => $val) $fieldstosearchall[$key] = $langs->trans($val);
-    print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall).join(', ', $fieldstosearchall).'</div>';
+	foreach ($fieldstosearchall as $key => $val) $fieldstosearchall[$key] = $langs->trans($val);
+	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall).join(', ', $fieldstosearchall).'</div>';
 }
 
 $moreforfilter = '';
@@ -422,9 +422,9 @@ while ($i < min($num, $limit))
 	print '<td class="nowrap center">';
 	if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
 	{
-	    $selected = 0;
-	    if (in_array($obj->rowid, $arrayofselected)) $selected = 1;
-	    print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
+		$selected = 0;
+		if (in_array($obj->rowid, $arrayofselected)) $selected = 1;
+		print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
 	}
 	print '</td>';
 	if (!$i) $totalarray['nbfield']++;
@@ -459,21 +459,21 @@ print '</form>'."\n";
 
 if (in_array('builddoc', $arrayofmassactions) && ($nbtotalofrecords === '' || $nbtotalofrecords))
 {
-    $hidegeneratedfilelistifempty = 1;
-    if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) $hidegeneratedfilelistifempty = 0;
+	$hidegeneratedfilelistifempty = 1;
+	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) $hidegeneratedfilelistifempty = 0;
 
-    require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
-    $formfile = new FormFile($db);
+	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
+	$formfile = new FormFile($db);
 
-    // Show list of available documents
-    $urlsource = $_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
-    $urlsource .= str_replace('&amp;', '&', $param);
+	// Show list of available documents
+	$urlsource = $_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
+	$urlsource .= str_replace('&amp;', '&', $param);
 
-    $filedir = $diroutputmassaction;
-    $genallowed = $permissiontoread;
-    $delallowed = $permissiontoadd;
+	$filedir = $diroutputmassaction;
+	$genallowed = $permissiontoread;
+	$delallowed = $permissiontoadd;
 
-    print $formfile->showdocuments('massfilesarea_mymodule', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
+	print $formfile->showdocuments('massfilesarea_mymodule', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
 }
 
 // End of page
diff --git a/htdocs/opensurvey/results.php b/htdocs/opensurvey/results.php
index ffdeaf329dc..2592be1fc9c 100644
--- a/htdocs/opensurvey/results.php
+++ b/htdocs/opensurvey/results.php
@@ -494,7 +494,7 @@ print '</table>';
 
 print '</div>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '</form>'."\n";
 
@@ -1048,7 +1048,7 @@ for ($i = 0; $i < $nbcolonnes; $i++)
 		if ($object->format == "D") {
 			$meilleursujetexport = $toutsujet[$i];
 			//var_dump($toutsujet);
-            if (strpos($toutsujet[$i], '@') !== false) {
+			if (strpos($toutsujet[$i], '@') !== false) {
 				$toutsujetdate = explode("@", $toutsujet[$i]);
 				$meilleursujet .= dol_print_date($toutsujetdate[0], 'daytext').($toutsujetdate[0] ? ' ('.dol_print_date($toutsujetdate[0], '%A').')' : '').' - '.$toutsujetdate[1];
 			} else {
diff --git a/htdocs/opensurvey/wizard/choix_autre.php b/htdocs/opensurvey/wizard/choix_autre.php
index 6b39a70d5e9..248c44aeddd 100644
--- a/htdocs/opensurvey/wizard/choix_autre.php
+++ b/htdocs/opensurvey/wizard/choix_autre.php
@@ -97,7 +97,7 @@ if (GETPOSTISSET("confirmecreation"))
 	}
 }
 
-var_dump($_SESSION);exit;
+var_dump($_SESSION); exit;
 
 
 /*
diff --git a/htdocs/opensurvey/wizard/choix_date.php b/htdocs/opensurvey/wizard/choix_date.php
index 9ed44ae55c3..b20a97afdad 100644
--- a/htdocs/opensurvey/wizard/choix_date.php
+++ b/htdocs/opensurvey/wizard/choix_date.php
@@ -482,7 +482,7 @@ for ($i = 0; $i < $nbrejourmois + $premierjourmois; $i++) {
 			if (($numerojour >= $jourAJ && $_SESSION["mois"] == $moisAJ && $_SESSION["annee"] == $anneeAJ) || ($_SESSION["mois"] > $moisAJ && $_SESSION["annee"] == $anneeAJ) || $_SESSION["annee"] > $anneeAJ) {
 				print '<td align="center" class="libre"><input type="submit" class="bouton ON" name="choixjourajout[]" value="'.$numerojour.'"></td>'."\n";
 			} else {
-                // grey button
+				// grey button
 				print '<td align="center" class="avant">'.$numerojour.'</td>'."\n";
 			}
 		}
diff --git a/htdocs/opensurvey/wizard/create_survey.php b/htdocs/opensurvey/wizard/create_survey.php
index 9d8a895b4ab..1ae5699500b 100644
--- a/htdocs/opensurvey/wizard/create_survey.php
+++ b/htdocs/opensurvey/wizard/create_survey.php
@@ -161,7 +161,7 @@ print $form->selectDate($champdatefin ? $champdatefin : -1, 'champdatefin', '',
 print '</tr>'."\n";
 print '</table>'."\n";
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 //focus javascript sur le premier champ
 print '<script type="text/javascript">'."\n";
diff --git a/htdocs/paybox/admin/paybox.php b/htdocs/paybox/admin/paybox.php
index 7e90dedbd90..a342e58b971 100644
--- a/htdocs/paybox/admin/paybox.php
+++ b/htdocs/paybox/admin/paybox.php
@@ -71,18 +71,18 @@ if ($action == 'setvalue' && $user->admin)
 	if (!$result > 0) $error++;
 	$result = dolibarr_set_const($db, "PAYMENT_SECURITY_TOKEN_UNIQUE", GETPOST('PAYMENT_SECURITY_TOKEN_UNIQUE', 'alpha'), 'chaine', 0, '', $conf->entity);
 	if (!$result > 0) $error++;
-        $result = dolibarr_set_const($db, "PAYBOX_HMAC_KEY", dol_encode(GETPOST('PAYBOX_HMAC_KEY', 'alpha')), 'chaine', 0, '', $conf->entity);
+		$result = dolibarr_set_const($db, "PAYBOX_HMAC_KEY", dol_encode(GETPOST('PAYBOX_HMAC_KEY', 'alpha')), 'chaine', 0, '', $conf->entity);
 	if (!$result > 0) $error++;
 
 
-    if (!$error)
+	if (!$error)
   	{
   		$db->commit();
-	    setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
   	} else {
   		$db->rollback();
 		dol_print_error($db);
-    }
+	}
 }
 
 
@@ -248,7 +248,7 @@ print '</td></tr>';
 
 print '</table>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></div>';
 
diff --git a/htdocs/paybox/lib/paybox.lib.php b/htdocs/paybox/lib/paybox.lib.php
index faf4b291338..d1f27bc0b0f 100644
--- a/htdocs/paybox/lib/paybox.lib.php
+++ b/htdocs/paybox/lib/paybox.lib.php
@@ -82,126 +82,126 @@ function print_paybox_redirect($PRICE, $CURRENCY, $EMAIL, $urlok, $urlko, $TAG)
 
 	// Definition des parametres vente produit pour paybox
 	$IBS_CMD = $TAG;
-    $IBS_TOTAL = $PRICE * 100; // En centimes
-    $IBS_MODE = 1; // Mode formulaire
-    $IBS_PORTEUR = $EMAIL;
+	$IBS_TOTAL = $PRICE * 100; // En centimes
+	$IBS_MODE = 1; // Mode formulaire
+	$IBS_PORTEUR = $EMAIL;
 	$IBS_RETOUR = "montant:M;ref:R;auto:A;trans:T"; // Format des parametres du get de validation en reponse (url a definir sous paybox)
-    $IBS_TXT = ' '; // Use a space
-    $IBS_EFFECTUE = $urlok;
-    $IBS_ANNULE = $urlko;
-    $IBS_REFUSE = $urlko;
-    $IBS_BKGD = "#FFFFFF";
-    $IBS_WAIT = "2000";
-    $IBS_LANG = "GBR"; // By default GBR=english (FRA, GBR, ESP, ITA et DEU...)
-    if (preg_match('/^FR/i', $langs->defaultlang)) $IBS_LANG = "FRA";
-    if (preg_match('/^ES/i', $langs->defaultlang)) $IBS_LANG = "ESP";
-    if (preg_match('/^IT/i', $langs->defaultlang)) $IBS_LANG = "ITA";
-    if (preg_match('/^DE/i', $langs->defaultlang)) $IBS_LANG = "DEU";
-    if (preg_match('/^NL/i', $langs->defaultlang)) $IBS_LANG = "NLD";
-    if (preg_match('/^SE/i', $langs->defaultlang)) $IBS_LANG = "SWE";
-    $IBS_OUTPUT = 'E';
-    $PBX_SOURCE = 'HTML';
-    $PBX_TYPEPAIEMENT = 'CARTE';
-    $PBX_HASH = $conf->global->PAYBOX_HASH;
-    $PBX_TIME = dol_print_date(dol_now(), 'dayhourrfc', 'gmt');
+	$IBS_TXT = ' '; // Use a space
+	$IBS_EFFECTUE = $urlok;
+	$IBS_ANNULE = $urlko;
+	$IBS_REFUSE = $urlko;
+	$IBS_BKGD = "#FFFFFF";
+	$IBS_WAIT = "2000";
+	$IBS_LANG = "GBR"; // By default GBR=english (FRA, GBR, ESP, ITA et DEU...)
+	if (preg_match('/^FR/i', $langs->defaultlang)) $IBS_LANG = "FRA";
+	if (preg_match('/^ES/i', $langs->defaultlang)) $IBS_LANG = "ESP";
+	if (preg_match('/^IT/i', $langs->defaultlang)) $IBS_LANG = "ITA";
+	if (preg_match('/^DE/i', $langs->defaultlang)) $IBS_LANG = "DEU";
+	if (preg_match('/^NL/i', $langs->defaultlang)) $IBS_LANG = "NLD";
+	if (preg_match('/^SE/i', $langs->defaultlang)) $IBS_LANG = "SWE";
+	$IBS_OUTPUT = 'E';
+	$PBX_SOURCE = 'HTML';
+	$PBX_TYPEPAIEMENT = 'CARTE';
+	$PBX_HASH = $conf->global->PAYBOX_HASH;
+	$PBX_TIME = dol_print_date(dol_now(), 'dayhourrfc', 'gmt');
 
-    $msg = "PBX_IDENTIFIANT=".$PBX_IDENTIFIANT.
-           "&PBX_MODE=".$IBS_MODE.
-           "&PBX_SITE=".$IBS_SITE.
-           "&PBX_RANG=".$IBS_RANG.
-           "&PBX_TOTAL=".$IBS_TOTAL.
-           "&PBX_DEVISE=".$IBS_DEVISE.
-           "&PBX_CMD=".$IBS_CMD.
-           "&PBX_PORTEUR=".$IBS_PORTEUR.
-           "&PBX_RETOUR=".$IBS_RETOUR.
-           "&PBX_EFFECTUE=".$IBS_EFFECTUE.
-           "&PBX_ANNULE=".$IBS_ANNULE.
-           "&PBX_REFUSE=".$IBS_REFUSE.
-           "&PBX_TXT=".$IBS_TXT.
-           "&PBX_BKGD=".$IBS_BKGD.
-           "&PBX_WAIT=".$IBS_WAIT.
-           "&PBX_LANGUE=".$IBS_LANG.
-           "&PBX_OUTPUT=".$IBS_OUTPUT.
-           "&PBX_SOURCE=".$PBX_SOURCE.
-           "&PBX_TYPEPAIEMENT=".$PBX_TYPEPAIEMENT;
-    	   "&PBX_HASH=".$PBX_HASH;
-    	   "&PBX_TIME=".$PBX_TIME;
+	$msg = "PBX_IDENTIFIANT=".$PBX_IDENTIFIANT.
+		   "&PBX_MODE=".$IBS_MODE.
+		   "&PBX_SITE=".$IBS_SITE.
+		   "&PBX_RANG=".$IBS_RANG.
+		   "&PBX_TOTAL=".$IBS_TOTAL.
+		   "&PBX_DEVISE=".$IBS_DEVISE.
+		   "&PBX_CMD=".$IBS_CMD.
+		   "&PBX_PORTEUR=".$IBS_PORTEUR.
+		   "&PBX_RETOUR=".$IBS_RETOUR.
+		   "&PBX_EFFECTUE=".$IBS_EFFECTUE.
+		   "&PBX_ANNULE=".$IBS_ANNULE.
+		   "&PBX_REFUSE=".$IBS_REFUSE.
+		   "&PBX_TXT=".$IBS_TXT.
+		   "&PBX_BKGD=".$IBS_BKGD.
+		   "&PBX_WAIT=".$IBS_WAIT.
+		   "&PBX_LANGUE=".$IBS_LANG.
+		   "&PBX_OUTPUT=".$IBS_OUTPUT.
+		   "&PBX_SOURCE=".$PBX_SOURCE.
+		   "&PBX_TYPEPAIEMENT=".$PBX_TYPEPAIEMENT;
+		   "&PBX_HASH=".$PBX_HASH;
+		   "&PBX_TIME=".$PBX_TIME;
 
-    $binKey = pack("H*", dol_decode($conf->global->PAYBOX_HMAC_KEY));
+	$binKey = pack("H*", dol_decode($conf->global->PAYBOX_HMAC_KEY));
 
-    $hmac = strtoupper(hash_hmac($PBX_HASH, $msg, $binKey));
+	$hmac = strtoupper(hash_hmac($PBX_HASH, $msg, $binKey));
 
 
-    dol_syslog("Soumission Paybox", LOG_DEBUG);
-    dol_syslog("IBS_MODE: $IBS_MODE", LOG_DEBUG);
-    dol_syslog("IBS_SITE: $IBS_SITE", LOG_DEBUG);
-    dol_syslog("IBS_RANG: $IBS_RANG", LOG_DEBUG);
-    dol_syslog("IBS_TOTAL: $IBS_TOTAL", LOG_DEBUG);
-    dol_syslog("IBS_DEVISE: $IBS_DEVISE", LOG_DEBUG);
-    dol_syslog("IBS_CMD: $IBS_CMD", LOG_DEBUG);
-    dol_syslog("IBS_PORTEUR: $IBS_PORTEUR", LOG_DEBUG);
-    dol_syslog("IBS_RETOUR: $IBS_RETOUR", LOG_DEBUG);
-    dol_syslog("IBS_EFFECTUE: $IBS_EFFECTUE", LOG_DEBUG);
-    dol_syslog("IBS_ANNULE: $IBS_ANNULE", LOG_DEBUG);
-    dol_syslog("IBS_REFUSE: $IBS_REFUSE", LOG_DEBUG);
-    dol_syslog("IBS_BKGD: $IBS_BKGD", LOG_DEBUG);
-    dol_syslog("IBS_WAIT: $IBS_WAIT", LOG_DEBUG);
-    dol_syslog("IBS_LANG: $IBS_LANG", LOG_DEBUG);
-    dol_syslog("IBS_OUTPUT: $IBS_OUTPUT", LOG_DEBUG);
-    dol_syslog("PBX_IDENTIFIANT: $PBX_IDENTIFIANT", LOG_DEBUG);
-    dol_syslog("PBX_SOURCE: $PBX_SOURCE", LOG_DEBUG);
-    dol_syslog("PBX_TYPEPAIEMENT: $PBX_TYPEPAIEMENT", LOG_DEBUG);
-    dol_syslog("PBX_HASH: $PBX_HASH", LOG_DEBUG);
-    dol_syslog("PBX_TIME: $PBX_TIME", LOG_DEBUG);
+	dol_syslog("Soumission Paybox", LOG_DEBUG);
+	dol_syslog("IBS_MODE: $IBS_MODE", LOG_DEBUG);
+	dol_syslog("IBS_SITE: $IBS_SITE", LOG_DEBUG);
+	dol_syslog("IBS_RANG: $IBS_RANG", LOG_DEBUG);
+	dol_syslog("IBS_TOTAL: $IBS_TOTAL", LOG_DEBUG);
+	dol_syslog("IBS_DEVISE: $IBS_DEVISE", LOG_DEBUG);
+	dol_syslog("IBS_CMD: $IBS_CMD", LOG_DEBUG);
+	dol_syslog("IBS_PORTEUR: $IBS_PORTEUR", LOG_DEBUG);
+	dol_syslog("IBS_RETOUR: $IBS_RETOUR", LOG_DEBUG);
+	dol_syslog("IBS_EFFECTUE: $IBS_EFFECTUE", LOG_DEBUG);
+	dol_syslog("IBS_ANNULE: $IBS_ANNULE", LOG_DEBUG);
+	dol_syslog("IBS_REFUSE: $IBS_REFUSE", LOG_DEBUG);
+	dol_syslog("IBS_BKGD: $IBS_BKGD", LOG_DEBUG);
+	dol_syslog("IBS_WAIT: $IBS_WAIT", LOG_DEBUG);
+	dol_syslog("IBS_LANG: $IBS_LANG", LOG_DEBUG);
+	dol_syslog("IBS_OUTPUT: $IBS_OUTPUT", LOG_DEBUG);
+	dol_syslog("PBX_IDENTIFIANT: $PBX_IDENTIFIANT", LOG_DEBUG);
+	dol_syslog("PBX_SOURCE: $PBX_SOURCE", LOG_DEBUG);
+	dol_syslog("PBX_TYPEPAIEMENT: $PBX_TYPEPAIEMENT", LOG_DEBUG);
+	dol_syslog("PBX_HASH: $PBX_HASH", LOG_DEBUG);
+	dol_syslog("PBX_TIME: $PBX_TIME", LOG_DEBUG);
 
-    header("Content-type: text/html; charset=".$conf->file->character_set_client);
-    header("X-Content-Type-Options: nosniff");
+	header("Content-type: text/html; charset=".$conf->file->character_set_client);
+	header("X-Content-Type-Options: nosniff");
 
-    print '<html>'."\n";
-    print '<head>'."\n";
-    print "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=".$conf->file->character_set_client."\">\n";
-    print '</head>'."\n";
-    print '<body>'."\n";
-    print "\n";
+	print '<html>'."\n";
+	print '<head>'."\n";
+	print "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=".$conf->file->character_set_client."\">\n";
+	print '</head>'."\n";
+	print '<body>'."\n";
+	print "\n";
 
-    // Formulaire pour module Paybox
-    print '<form action="'.$URLPAYBOX.'" NAME="Submit" method="POST">'."\n";
+	// Formulaire pour module Paybox
+	print '<form action="'.$URLPAYBOX.'" NAME="Submit" method="POST">'."\n";
 
-    // For Paybox V2 (PBX_xxx)
-    print '<!-- Param for Paybox v2 -->'."\n";
-    print '<input type="hidden" name="PBX_IDENTIFIANT" value="'.$PBX_IDENTIFIANT.'">'."\n";
-    print '<input type="hidden" name="PBX_MODE" value="'.$IBS_MODE.'">'."\n";
-    print '<input type="hidden" name="PBX_SITE" value="'.$IBS_SITE.'">'."\n";
-    print '<input type="hidden" name="PBX_RANG" value="'.$IBS_RANG.'">'."\n";
-    print '<input type="hidden" name="PBX_TOTAL" value="'.$IBS_TOTAL.'">'."\n";
-    print '<input type="hidden" name="PBX_DEVISE" value="'.$IBS_DEVISE.'">'."\n";
-    print '<input type="hidden" name="PBX_CMD" value="'.$IBS_CMD.'">'."\n";
-    print '<input type="hidden" name="PBX_PORTEUR" value="'.$IBS_PORTEUR.'">'."\n";
-    print '<input type="hidden" name="PBX_RETOUR" value="'.$IBS_RETOUR.'">'."\n";
-    print '<input type="hidden" name="PBX_EFFECTUE" value="'.$IBS_EFFECTUE.'">'."\n";
-    print '<input type="hidden" name="PBX_ANNULE" value="'.$IBS_ANNULE.'">'."\n";
-    print '<input type="hidden" name="PBX_REFUSE" value="'.$IBS_REFUSE.'">'."\n";
-    print '<input type="hidden" name="PBX_TXT" value="'.$IBS_TXT.'">'."\n";
-    print '<input type="hidden" name="PBX_BKGD" value="'.$IBS_BKGD.'">'."\n";
-    print '<input type="hidden" name="PBX_WAIT" value="'.$IBS_WAIT.'">'."\n";
-    print '<input type="hidden" name="PBX_LANGUE" value="'.$IBS_LANG.'">'."\n";
-    print '<input type="hidden" name="PBX_OUTPUT" value="'.$IBS_OUTPUT.'">'."\n";
-    print '<input type="hidden" name="PBX_SOURCE" value="'.$PBX_SOURCE.'">'."\n";
-    print '<input type="hidden" name="PBX_TYPEPAIEMENT" value="'.$PBX_TYPEPAIEMENT.'">'."\n";
-    print '<input type="hidden" name="PBX_HASH" value="'.$PBX_HASH.'">'."\n";
-    print '<input type="hidden" name="PBX_TIME" value="'.$PBX_TIME.'">'."\n";
-    // Footprint of parameters
-    print '<input type="hidden" name="PBX_HMAC" value="'.$hmac.'">'."\n";
-    print '</form>'."\n";
+	// For Paybox V2 (PBX_xxx)
+	print '<!-- Param for Paybox v2 -->'."\n";
+	print '<input type="hidden" name="PBX_IDENTIFIANT" value="'.$PBX_IDENTIFIANT.'">'."\n";
+	print '<input type="hidden" name="PBX_MODE" value="'.$IBS_MODE.'">'."\n";
+	print '<input type="hidden" name="PBX_SITE" value="'.$IBS_SITE.'">'."\n";
+	print '<input type="hidden" name="PBX_RANG" value="'.$IBS_RANG.'">'."\n";
+	print '<input type="hidden" name="PBX_TOTAL" value="'.$IBS_TOTAL.'">'."\n";
+	print '<input type="hidden" name="PBX_DEVISE" value="'.$IBS_DEVISE.'">'."\n";
+	print '<input type="hidden" name="PBX_CMD" value="'.$IBS_CMD.'">'."\n";
+	print '<input type="hidden" name="PBX_PORTEUR" value="'.$IBS_PORTEUR.'">'."\n";
+	print '<input type="hidden" name="PBX_RETOUR" value="'.$IBS_RETOUR.'">'."\n";
+	print '<input type="hidden" name="PBX_EFFECTUE" value="'.$IBS_EFFECTUE.'">'."\n";
+	print '<input type="hidden" name="PBX_ANNULE" value="'.$IBS_ANNULE.'">'."\n";
+	print '<input type="hidden" name="PBX_REFUSE" value="'.$IBS_REFUSE.'">'."\n";
+	print '<input type="hidden" name="PBX_TXT" value="'.$IBS_TXT.'">'."\n";
+	print '<input type="hidden" name="PBX_BKGD" value="'.$IBS_BKGD.'">'."\n";
+	print '<input type="hidden" name="PBX_WAIT" value="'.$IBS_WAIT.'">'."\n";
+	print '<input type="hidden" name="PBX_LANGUE" value="'.$IBS_LANG.'">'."\n";
+	print '<input type="hidden" name="PBX_OUTPUT" value="'.$IBS_OUTPUT.'">'."\n";
+	print '<input type="hidden" name="PBX_SOURCE" value="'.$PBX_SOURCE.'">'."\n";
+	print '<input type="hidden" name="PBX_TYPEPAIEMENT" value="'.$PBX_TYPEPAIEMENT.'">'."\n";
+	print '<input type="hidden" name="PBX_HASH" value="'.$PBX_HASH.'">'."\n";
+	print '<input type="hidden" name="PBX_TIME" value="'.$PBX_TIME.'">'."\n";
+	// Footprint of parameters
+	print '<input type="hidden" name="PBX_HMAC" value="'.$hmac.'">'."\n";
+	print '</form>'."\n";
 
 
-    print "\n";
-    print '<script type="text/javascript" language="javascript">'."\n";
-    print '	document.Submit.submit();'."\n";
-    print '</script>'."\n";
-    print "\n";
-    print '</body></html>'."\n";
-    print "\n";
+	print "\n";
+	print '<script type="text/javascript" language="javascript">'."\n";
+	print '	document.Submit.submit();'."\n";
+	print '</script>'."\n";
+	print "\n";
+	print '</body></html>'."\n";
+	print "\n";
 
 	return;
 }
diff --git a/htdocs/paypal/admin/paypal.php b/htdocs/paypal/admin/paypal.php
index 4cf06288730..04ee6dbe228 100644
--- a/htdocs/paypal/admin/paypal.php
+++ b/htdocs/paypal/admin/paypal.php
@@ -43,29 +43,29 @@ if ($action == 'setvalue' && $user->admin)
 {
 	$db->begin();
 
-    $result = dolibarr_set_const($db, "PAYPAL_API_USER", GETPOST('PAYPAL_API_USER', 'alpha'), 'chaine', 0, '', $conf->entity);
-    if (!$result > 0) $error++;
-    $result = dolibarr_set_const($db, "PAYPAL_API_PASSWORD", GETPOST('PAYPAL_API_PASSWORD', 'alpha'), 'chaine', 0, '', $conf->entity);
-    if (!$result > 0) $error++;
-    $result = dolibarr_set_const($db, "PAYPAL_API_SIGNATURE", GETPOST('PAYPAL_API_SIGNATURE', 'alpha'), 'chaine', 0, '', $conf->entity);
-    if (!$result > 0) $error++;
-    $result = dolibarr_set_const($db, "PAYPAL_SSLVERSION", GETPOST('PAYPAL_SSLVERSION', '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, "PAYPAL_BANK_ACCOUNT_FOR_PAYMENTS", GETPOST('PAYPAL_BANK_ACCOUNT_FOR_PAYMENTS', 'int'), 'chaine', 0, '', $conf->entity);
-    if (!$result > 0) $error++;
-    $result = dolibarr_set_const($db, "PAYPAL_API_INTEGRAL_OR_PAYPALONLY", GETPOST('PAYPAL_API_INTEGRAL_OR_PAYPALONLY', 'alpha'), '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, "PAYPAL_ADD_PAYMENT_URL", GETPOST('PAYPAL_ADD_PAYMENT_URL', 'alpha'), 'chaine', 0, '', $conf->entity);
-    if (!$result > 0) $error++;
-    $result = dolibarr_set_const($db, "ONLINE_PAYMENT_MESSAGE_FORM", GETPOST('ONLINE_PAYMENT_MESSAGE_FORM'), 'chaine', 0, '', $conf->entity);
-    if (!$result > 0) $error++;
-    $result = dolibarr_set_const($db, "ONLINE_PAYMENT_MESSAGE_OK", GETPOST('ONLINE_PAYMENT_MESSAGE_OK'), 'chaine', 0, '', $conf->entity);
-    if (!$result > 0) $error++;
-    $result = dolibarr_set_const($db, "ONLINE_PAYMENT_MESSAGE_KO", GETPOST('ONLINE_PAYMENT_MESSAGE_KO'), 'chaine', 0, '', $conf->entity);
+	$result = dolibarr_set_const($db, "PAYPAL_API_USER", GETPOST('PAYPAL_API_USER', 'alpha'), 'chaine', 0, '', $conf->entity);
+	if (!$result > 0) $error++;
+	$result = dolibarr_set_const($db, "PAYPAL_API_PASSWORD", GETPOST('PAYPAL_API_PASSWORD', 'alpha'), 'chaine', 0, '', $conf->entity);
+	if (!$result > 0) $error++;
+	$result = dolibarr_set_const($db, "PAYPAL_API_SIGNATURE", GETPOST('PAYPAL_API_SIGNATURE', 'alpha'), 'chaine', 0, '', $conf->entity);
+	if (!$result > 0) $error++;
+	$result = dolibarr_set_const($db, "PAYPAL_SSLVERSION", GETPOST('PAYPAL_SSLVERSION', '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, "PAYPAL_BANK_ACCOUNT_FOR_PAYMENTS", GETPOST('PAYPAL_BANK_ACCOUNT_FOR_PAYMENTS', 'int'), 'chaine', 0, '', $conf->entity);
+	if (!$result > 0) $error++;
+	$result = dolibarr_set_const($db, "PAYPAL_API_INTEGRAL_OR_PAYPALONLY", GETPOST('PAYPAL_API_INTEGRAL_OR_PAYPALONLY', 'alpha'), '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, "PAYPAL_ADD_PAYMENT_URL", GETPOST('PAYPAL_ADD_PAYMENT_URL', 'alpha'), 'chaine', 0, '', $conf->entity);
+	if (!$result > 0) $error++;
+	$result = dolibarr_set_const($db, "ONLINE_PAYMENT_MESSAGE_FORM", GETPOST('ONLINE_PAYMENT_MESSAGE_FORM'), 'chaine', 0, '', $conf->entity);
+	if (!$result > 0) $error++;
+	$result = dolibarr_set_const($db, "ONLINE_PAYMENT_MESSAGE_OK", GETPOST('ONLINE_PAYMENT_MESSAGE_OK'), 'chaine', 0, '', $conf->entity);
+	if (!$result > 0) $error++;
+	$result = dolibarr_set_const($db, "ONLINE_PAYMENT_MESSAGE_KO", GETPOST('ONLINE_PAYMENT_MESSAGE_KO'), '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++;
@@ -85,20 +85,20 @@ if ($action == 'setvalue' && $user->admin)
   	} else {
   		$db->rollback();
 		dol_print_error($db);
-    }
+	}
 }
 
 if ($action == "setlive")
 {
-    $liveenable = GETPOST('value', 'int') ? 0 : 1;
-    $res = dolibarr_set_const($db, "PAYPAL_API_SANDBOX", $liveenable, 'yesno', 0, '', $conf->entity);
-    if (!$res > 0) $error++;
-    if (!$error)
-    {
-        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    } else {
-        setEventMessages($langs->trans("Error"), null, 'errors');
-    }
+	$liveenable = GETPOST('value', 'int') ? 0 : 1;
+	$res = dolibarr_set_const($db, "PAYPAL_API_SANDBOX", $liveenable, 'yesno', 0, '', $conf->entity);
+	if (!$res > 0) $error++;
+	if (!$error)
+	{
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
+		setEventMessages($langs->trans("Error"), null, 'errors');
+	}
 }
 
 
@@ -148,11 +148,11 @@ print '<td class="titlefield">';
 print $langs->trans("PaypalLiveEnabled").'</td><td>';
 if (empty($conf->global->PAYPAL_API_SANDBOX))
 {
-    print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setlive&token='.newToken().'&value=0">';
-    print img_picto($langs->trans("Activated"), 'switch_on');
+	print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setlive&token='.newToken().'&value=0">';
+	print img_picto($langs->trans("Activated"), 'switch_on');
 } else {
-    print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setlive&token='.newToken().'&value=1">';
-    print img_picto($langs->trans("Disabled"), 'switch_off');
+	print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setlive&token='.newToken().'&value=1">';
+	print img_picto($langs->trans("Disabled"), 'switch_off');
 }
 print '</td></tr>';
 
@@ -267,7 +267,7 @@ print '<input class="minwidth300" type="text" id="PAYMENT_SECURITY_TOKEN" name="
 if (!empty($conf->use_javascript_ajax)) {
 	print '&nbsp;'.img_picto($langs->trans('Generate'), 'refresh', 'id="generate_token" class="linkobject"');
 }
-if (! empty($conf->global->PAYMENT_SECURITY_ACCEPT_ANY_TOKEN)) {
+if (!empty($conf->global->PAYMENT_SECURITY_ACCEPT_ANY_TOKEN)) {
 	$langs->load("errors");
 	print img_warning($langs->trans("WarningTheHiddenOptionIsOn", 'PAYMENT_SECURITY_ACCEPT_ANY_TOKEN'), '', 'pictowarning marginleftonly');
 }
@@ -285,7 +285,7 @@ print '</td></tr>';
 
 print '</table>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></div>';
 
diff --git a/htdocs/paypal/lib/paypal.lib.php b/htdocs/paypal/lib/paypal.lib.php
index f0833fd5f3e..00db8797a1f 100644
--- a/htdocs/paypal/lib/paypal.lib.php
+++ b/htdocs/paypal/lib/paypal.lib.php
@@ -42,15 +42,15 @@ function paypaladmin_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, 'paypaladmin');
 
 	complete_head_from_modules($conf, $langs, $object, $head, $h, 'paypaladmin', 'remove');
 
-    return $head;
+	return $head;
 }
 
 
@@ -67,14 +67,14 @@ function showPaypalPaymentUrl($type, $ref)
 	global $conf, $langs;
 
 	$langs->load("paypal");
-    $langs->load("paybox");
-    $servicename = 'PayPal';
-    $out = '<br><br>';
-    $out .= img_picto('', 'globe').' '.$langs->trans("ToOfferALinkForOnlinePayment", $servicename).'<br>';
-    $url = getPaypalPaymentUrl(0, $type, $ref);
-    $out .= '<input type="text" id="paypalurl" class="quatrevingtpercent" value="'.$url.'">';
-    $out .= ajax_autoselect("paypalurl", 0);
-    return $out;
+	$langs->load("paybox");
+	$servicename = 'PayPal';
+	$out = '<br><br>';
+	$out .= img_picto('', 'globe').' '.$langs->trans("ToOfferALinkForOnlinePayment", $servicename).'<br>';
+	$url = getPaypalPaymentUrl(0, $type, $ref);
+	$out .= '<input type="text" id="paypalurl" class="quatrevingtpercent" value="'.$url.'">';
+	$out .= ajax_autoselect("paypalurl", 0);
+	return $out;
 }
 
 
@@ -94,88 +94,88 @@ function getPaypalPaymentUrl($mode, $type, $ref = '', $amount = '9.99', $freetag
 
 	$ref = str_replace(' ', '', $ref);
 
-    if ($type == 'free')
-    {
-	    $out = DOL_MAIN_URL_ROOT.'/public/paypal/newpayment.php?amount='.($mode ? '<font color="#666666">' : '').$amount.($mode ? '</font>' : '').'&tag='.($mode ? '<font color="#666666">' : '').$freetag.($mode ? '</font>' : '');
-	    if (!empty($conf->global->PAYPAL_SECURITY_TOKEN))
-	    {
-	    	if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $out .= '&securekey='.$conf->global->PAYPAL_SECURITY_TOKEN;
-	    	else $out .= '&securekey='.dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
-	    }
-    }
-    if ($type == 'order')
-    {
-        $out = DOL_MAIN_URL_ROOT.'/public/paypal/newpayment.php?source=order&ref='.($mode ? '<font color="#666666">' : '');
-        if ($mode == 1) $out .= 'order_ref';
-        if ($mode == 0) $out .= urlencode($ref);
-	    $out .= ($mode ? '</font>' : '');
-        if (!empty($conf->global->PAYPAL_SECURITY_TOKEN))
-        {
-    	    if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $out .= '&securekey='.$conf->global->PAYPAL_SECURITY_TOKEN;
-            else {
-                $out .= '&securekey='.($mode ? '<font color="#666666">' : '');
-                if ($mode == 1) $out .= "hash('".$conf->global->PAYPAL_SECURITY_TOKEN."' + '".$type."' + order_ref)";
-                if ($mode == 0) $out .= dol_hash($conf->global->PAYPAL_SECURITY_TOKEN.$type.$ref, 2);
-                $out .= ($mode ? '</font>' : '');
-            }
-        }
-    }
-    if ($type == 'invoice')
-    {
-        $out = DOL_MAIN_URL_ROOT.'/public/paypal/newpayment.php?source=invoice&ref='.($mode ? '<font color="#666666">' : '');
-        if ($mode == 1) $out .= 'invoice_ref';
-        if ($mode == 0) $out .= urlencode($ref);
-	    $out .= ($mode ? '</font>' : '');
-        if (!empty($conf->global->PAYPAL_SECURITY_TOKEN))
-        {
-    	    if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $out .= '&securekey='.$conf->global->PAYPAL_SECURITY_TOKEN;
-            else {
-                $out .= '&securekey='.($mode ? '<font color="#666666">' : '');
-                if ($mode == 1) $out .= "hash('".$conf->global->PAYPAL_SECURITY_TOKEN."' + '".$type."' + invoice_ref)";
-                if ($mode == 0) $out .= dol_hash($conf->global->PAYPAL_SECURITY_TOKEN.$type.$ref, 2);
-                $out .= ($mode ? '</font>' : '');
-            }
-        }
-    }
-    if ($type == 'contractline')
-    {
-        $out = DOL_MAIN_URL_ROOT.'/public/paypal/newpayment.php?source=contractline&ref='.($mode ? '<font color="#666666">' : '');
-        if ($mode == 1) $out .= 'contractline_ref';
-        if ($mode == 0) $out .= urlencode($ref);
-	    $out .= ($mode ? '</font>' : '');
-        if (!empty($conf->global->PAYPAL_SECURITY_TOKEN))
-        {
-    	    if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $out .= '&securekey='.$conf->global->PAYPAL_SECURITY_TOKEN;
-            else {
-                $out .= '&securekey='.($mode ? '<font color="#666666">' : '');
-                if ($mode == 1) $out .= "hash('".$conf->global->PAYPAL_SECURITY_TOKEN."' + '".$type."' + contractline_ref)";
-                if ($mode == 0) $out .= dol_hash($conf->global->PAYPAL_SECURITY_TOKEN.$type.$ref, 2);
-                $out .= ($mode ? '</font>' : '');
-            }
-        }
-    }
-    if ($type == 'membersubscription')
-    {
-        $out = DOL_MAIN_URL_ROOT.'/public/paypal/newpayment.php?source=membersubscription&ref='.($mode ? '<font color="#666666">' : '');
-        if ($mode == 1) $out .= 'member_ref';
-        if ($mode == 0) $out .= urlencode($ref);
-	    $out .= ($mode ? '</font>' : '');
-        if (!empty($conf->global->PAYPAL_SECURITY_TOKEN))
-        {
-    	    if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $out .= '&securekey='.$conf->global->PAYPAL_SECURITY_TOKEN;
-            else {
-                $out .= '&securekey='.($mode ? '<font color="#666666">' : '');
-                if ($mode == 1) $out .= "hash('".$conf->global->PAYPAL_SECURITY_TOKEN."' + '".$type."' + member_ref)";
-                if ($mode == 0) $out .= dol_hash($conf->global->PAYPAL_SECURITY_TOKEN.$type.$ref, 2);
-                $out .= ($mode ? '</font>' : '');
-            }
-        }
-    }
+	if ($type == 'free')
+	{
+		$out = DOL_MAIN_URL_ROOT.'/public/paypal/newpayment.php?amount='.($mode ? '<font color="#666666">' : '').$amount.($mode ? '</font>' : '').'&tag='.($mode ? '<font color="#666666">' : '').$freetag.($mode ? '</font>' : '');
+		if (!empty($conf->global->PAYPAL_SECURITY_TOKEN))
+		{
+			if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $out .= '&securekey='.$conf->global->PAYPAL_SECURITY_TOKEN;
+			else $out .= '&securekey='.dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
+		}
+	}
+	if ($type == 'order')
+	{
+		$out = DOL_MAIN_URL_ROOT.'/public/paypal/newpayment.php?source=order&ref='.($mode ? '<font color="#666666">' : '');
+		if ($mode == 1) $out .= 'order_ref';
+		if ($mode == 0) $out .= urlencode($ref);
+		$out .= ($mode ? '</font>' : '');
+		if (!empty($conf->global->PAYPAL_SECURITY_TOKEN))
+		{
+			if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $out .= '&securekey='.$conf->global->PAYPAL_SECURITY_TOKEN;
+			else {
+				$out .= '&securekey='.($mode ? '<font color="#666666">' : '');
+				if ($mode == 1) $out .= "hash('".$conf->global->PAYPAL_SECURITY_TOKEN."' + '".$type."' + order_ref)";
+				if ($mode == 0) $out .= dol_hash($conf->global->PAYPAL_SECURITY_TOKEN.$type.$ref, 2);
+				$out .= ($mode ? '</font>' : '');
+			}
+		}
+	}
+	if ($type == 'invoice')
+	{
+		$out = DOL_MAIN_URL_ROOT.'/public/paypal/newpayment.php?source=invoice&ref='.($mode ? '<font color="#666666">' : '');
+		if ($mode == 1) $out .= 'invoice_ref';
+		if ($mode == 0) $out .= urlencode($ref);
+		$out .= ($mode ? '</font>' : '');
+		if (!empty($conf->global->PAYPAL_SECURITY_TOKEN))
+		{
+			if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $out .= '&securekey='.$conf->global->PAYPAL_SECURITY_TOKEN;
+			else {
+				$out .= '&securekey='.($mode ? '<font color="#666666">' : '');
+				if ($mode == 1) $out .= "hash('".$conf->global->PAYPAL_SECURITY_TOKEN."' + '".$type."' + invoice_ref)";
+				if ($mode == 0) $out .= dol_hash($conf->global->PAYPAL_SECURITY_TOKEN.$type.$ref, 2);
+				$out .= ($mode ? '</font>' : '');
+			}
+		}
+	}
+	if ($type == 'contractline')
+	{
+		$out = DOL_MAIN_URL_ROOT.'/public/paypal/newpayment.php?source=contractline&ref='.($mode ? '<font color="#666666">' : '');
+		if ($mode == 1) $out .= 'contractline_ref';
+		if ($mode == 0) $out .= urlencode($ref);
+		$out .= ($mode ? '</font>' : '');
+		if (!empty($conf->global->PAYPAL_SECURITY_TOKEN))
+		{
+			if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $out .= '&securekey='.$conf->global->PAYPAL_SECURITY_TOKEN;
+			else {
+				$out .= '&securekey='.($mode ? '<font color="#666666">' : '');
+				if ($mode == 1) $out .= "hash('".$conf->global->PAYPAL_SECURITY_TOKEN."' + '".$type."' + contractline_ref)";
+				if ($mode == 0) $out .= dol_hash($conf->global->PAYPAL_SECURITY_TOKEN.$type.$ref, 2);
+				$out .= ($mode ? '</font>' : '');
+			}
+		}
+	}
+	if ($type == 'membersubscription')
+	{
+		$out = DOL_MAIN_URL_ROOT.'/public/paypal/newpayment.php?source=membersubscription&ref='.($mode ? '<font color="#666666">' : '');
+		if ($mode == 1) $out .= 'member_ref';
+		if ($mode == 0) $out .= urlencode($ref);
+		$out .= ($mode ? '</font>' : '');
+		if (!empty($conf->global->PAYPAL_SECURITY_TOKEN))
+		{
+			if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $out .= '&securekey='.$conf->global->PAYPAL_SECURITY_TOKEN;
+			else {
+				$out .= '&securekey='.($mode ? '<font color="#666666">' : '');
+				if ($mode == 1) $out .= "hash('".$conf->global->PAYPAL_SECURITY_TOKEN."' + '".$type."' + member_ref)";
+				if ($mode == 0) $out .= dol_hash($conf->global->PAYPAL_SECURITY_TOKEN.$type.$ref, 2);
+				$out .= ($mode ? '</font>' : '');
+			}
+		}
+	}
 
-    // For multicompany
-    $out .= "&entity=".$conf->entity; // Check the entity because He may be the same reference in several entities
+	// For multicompany
+	$out .= "&entity=".$conf->entity; // Check the entity because He may be the same reference in several entities
 
-    return $out;
+	return $out;
 }
 
 
@@ -192,93 +192,93 @@ function getPaypalPaymentUrl($mode, $type, $ref = '', $amount = '9.99', $freetag
  */
 function print_paypal_redirect($paymentAmount, $currencyCodeType, $paymentType, $returnURL, $cancelURL, $tag)
 {
-    //declaring of global variables
-    global $conf, $langs;
-    global $API_Endpoint, $API_Url, $API_version, $USE_PROXY, $PROXY_HOST, $PROXY_PORT;
-    global $PAYPAL_API_USER, $PAYPAL_API_PASSWORD, $PAYPAL_API_SIGNATURE;
+	//declaring of global variables
+	global $conf, $langs;
+	global $API_Endpoint, $API_Url, $API_version, $USE_PROXY, $PROXY_HOST, $PROXY_PORT;
+	global $PAYPAL_API_USER, $PAYPAL_API_PASSWORD, $PAYPAL_API_SIGNATURE;
 
-    global $shipToName, $shipToStreet, $shipToCity, $shipToState, $shipToCountryCode, $shipToZip, $shipToStreet2, $phoneNum;
-    global $email, $desc;
+	global $shipToName, $shipToStreet, $shipToCity, $shipToState, $shipToCountryCode, $shipToZip, $shipToStreet2, $phoneNum;
+	global $email, $desc;
 
-    //'------------------------------------
-    //' Calls the SetExpressCheckout API call
-    //'
-    //'-------------------------------------------------
+	//'------------------------------------
+	//' Calls the SetExpressCheckout API call
+	//'
+	//'-------------------------------------------------
 
-    if (empty($conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY)) $conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY = 'integral';
+	if (empty($conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY)) $conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY = 'integral';
 
-    $solutionType = 'Sole';
-    $landingPage = 'Billing';
-    // For payment with Paypal only
-    if ($conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY == 'paypalonly')
-    {
-        $solutionType = 'Mark';
-        $landingPage = 'Login';
-    }
-    // For payment with Credit card or Paypal
-    if ($conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY == 'integral')
-    {
-        $solutionType = 'Sole';
-        $landingPage = 'Billing';
-    }
-    // For payment with Credit card
-    if ($conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY == 'cconly')
-    {
-        $solutionType = 'Sole';
-        $landingPage = 'Billing';
-    }
+	$solutionType = 'Sole';
+	$landingPage = 'Billing';
+	// For payment with Paypal only
+	if ($conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY == 'paypalonly')
+	{
+		$solutionType = 'Mark';
+		$landingPage = 'Login';
+	}
+	// For payment with Credit card or Paypal
+	if ($conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY == 'integral')
+	{
+		$solutionType = 'Sole';
+		$landingPage = 'Billing';
+	}
+	// For payment with Credit card
+	if ($conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY == 'cconly')
+	{
+		$solutionType = 'Sole';
+		$landingPage = 'Billing';
+	}
 
-    dol_syslog("expresscheckout redirect with callSetExpressCheckout $paymentAmount, $currencyCodeType, $paymentType, $returnURL, $cancelURL, $tag, $solutionType, $landingPage, $shipToName, $shipToStreet, $shipToCity, $shipToState, $shipToCountryCode, $shipToZip, $shipToStreet2, $phoneNum");
-    $resArray = callSetExpressCheckout(
-        $paymentAmount,
-        $currencyCodeType,
-        $paymentType,
-        $returnURL,
-        $cancelURL,
-        $tag,
-        $solutionType,
-        $landingPage,
-        $shipToName,
-        $shipToStreet,
-        $shipToCity,
-        $shipToState,
-        $shipToCountryCode,
-        $shipToZip,
-        $shipToStreet2,
-        $phoneNum,
-        $email,
-        $desc
-    );
+	dol_syslog("expresscheckout redirect with callSetExpressCheckout $paymentAmount, $currencyCodeType, $paymentType, $returnURL, $cancelURL, $tag, $solutionType, $landingPage, $shipToName, $shipToStreet, $shipToCity, $shipToState, $shipToCountryCode, $shipToZip, $shipToStreet2, $phoneNum");
+	$resArray = callSetExpressCheckout(
+		$paymentAmount,
+		$currencyCodeType,
+		$paymentType,
+		$returnURL,
+		$cancelURL,
+		$tag,
+		$solutionType,
+		$landingPage,
+		$shipToName,
+		$shipToStreet,
+		$shipToCity,
+		$shipToState,
+		$shipToCountryCode,
+		$shipToZip,
+		$shipToStreet2,
+		$phoneNum,
+		$email,
+		$desc
+	);
 
-    $ack = strtoupper($resArray["ACK"]);
-    if ($ack == "SUCCESS" || $ack == "SUCCESSWITHWARNING")
-    {
-        $token = $resArray["TOKEN"];
+	$ack = strtoupper($resArray["ACK"]);
+	if ($ack == "SUCCESS" || $ack == "SUCCESSWITHWARNING")
+	{
+		$token = $resArray["TOKEN"];
 
-        // Redirect to paypal.com here
-        $payPalURL = $API_Url.$token;
-        header("Location: ".$payPalURL);
-        exit;
-    } else {
-        //Display a user friendly Error on the page using any of the following error information returned by PayPal
-        $ErrorCode = urldecode($resArray["L_ERRORCODE0"]);
-        $ErrorShortMsg = urldecode($resArray["L_SHORTMESSAGE0"]);
-        $ErrorLongMsg = urldecode($resArray["L_LONGMESSAGE0"]);
-        $ErrorSeverityCode = urldecode($resArray["L_SEVERITYCODE0"]);
+		// Redirect to paypal.com here
+		$payPalURL = $API_Url.$token;
+		header("Location: ".$payPalURL);
+		exit;
+	} else {
+		//Display a user friendly Error on the page using any of the following error information returned by PayPal
+		$ErrorCode = urldecode($resArray["L_ERRORCODE0"]);
+		$ErrorShortMsg = urldecode($resArray["L_SHORTMESSAGE0"]);
+		$ErrorLongMsg = urldecode($resArray["L_LONGMESSAGE0"]);
+		$ErrorSeverityCode = urldecode($resArray["L_SEVERITYCODE0"]);
 
-        if ($ErrorCode == 10729)
-        {
-        	$mesg .= "PayPal can't accept payments for this thirdparty. An address is defined but is not complete (missing State).<br>Ask system administrator to fix address or to setup Paypal module to accept payments even on not complete addresses (remove option PAYPAL_REQUIRE_VALID_SHIPPING_ADDRESS).<br>\n";
-        } else {
-        	$mesg = $langs->trans('SetExpressCheckoutAPICallFailed')."<br>\n";
-        	$mesg .= $langs->trans('DetailedErrorMessage').": ".$ErrorLongMsg."<br>\n";
-        	$mesg .= $langs->trans('ShortErrorMessage').": ".$ErrorShortMsg."<br>\n";
-        	$mesg .= $langs->trans('ErrorCode').": ".$ErrorCode."<br>\n";
-        	$mesg .= $langs->trans('ErrorSeverityCode').": ".$ErrorSeverityCode."<br>\n";
-        }
+		if ($ErrorCode == 10729)
+		{
+			$mesg .= "PayPal can't accept payments for this thirdparty. An address is defined but is not complete (missing State).<br>Ask system administrator to fix address or to setup Paypal module to accept payments even on not complete addresses (remove option PAYPAL_REQUIRE_VALID_SHIPPING_ADDRESS).<br>\n";
+		} else {
+			$mesg = $langs->trans('SetExpressCheckoutAPICallFailed')."<br>\n";
+			$mesg .= $langs->trans('DetailedErrorMessage').": ".$ErrorLongMsg."<br>\n";
+			$mesg .= $langs->trans('ShortErrorMessage').": ".$ErrorShortMsg."<br>\n";
+			$mesg .= $langs->trans('ErrorCode').": ".$ErrorCode."<br>\n";
+			$mesg .= $langs->trans('ErrorSeverityCode').": ".$ErrorSeverityCode."<br>\n";
+		}
 
-        return $mesg;
-    }
+		return $mesg;
+	}
 }
 
 /**
@@ -324,103 +324,103 @@ function print_paypal_redirect($paymentAmount, $currencyCodeType, $paymentType,
  */
 function callSetExpressCheckout($paymentAmount, $currencyCodeType, $paymentType, $returnURL, $cancelURL, $tag, $solutionType, $landingPage, $shipToName, $shipToStreet, $shipToCity, $shipToState, $shipToCountryCode, $shipToZip, $shipToStreet2, $phoneNum, $email = '', $desc = '')
 {
-    //------------------------------------------------------------------------------------------------------------------------------------
-    // Construct the parameter string that describes the SetExpressCheckout API call in the shortcut implementation
+	//------------------------------------------------------------------------------------------------------------------------------------
+	// Construct the parameter string that describes the SetExpressCheckout API call in the shortcut implementation
 
-    //declaring of global variables
-    global $conf, $langs, $mysoc;
-    global $API_Endpoint, $API_Url, $API_version, $USE_PROXY, $PROXY_HOST, $PROXY_PORT;
-    global $PAYPAL_API_USER, $PAYPAL_API_PASSWORD, $PAYPAL_API_SIGNATURE;
+	//declaring of global variables
+	global $conf, $langs, $mysoc;
+	global $API_Endpoint, $API_Url, $API_version, $USE_PROXY, $PROXY_HOST, $PROXY_PORT;
+	global $PAYPAL_API_USER, $PAYPAL_API_PASSWORD, $PAYPAL_API_SIGNATURE;
 
-    $nvpstr = '';
-    //$nvpstr = $nvpstr . "&VERSION=".$API_version;				// Already added by hash_call
-    $nvpstr = $nvpstr."&RETURNURL=".urlencode($returnURL);
-    $nvpstr = $nvpstr."&CANCELURL=".urlencode($cancelURL);
-    if (!empty($conf->global->PAYPAL_ALLOW_NOTES))
-    {
-    	$nvpstr = $nvpstr."&ALLOWNOTE=0";
-    }
-    if (empty($conf->global->PAYPAL_REQUIRE_VALID_SHIPPING_ADDRESS))
-    {
-    	$nvpstr = $nvpstr."&NOSHIPPING=1"; // An empty or not complete shipping address will be accepted
-    } else {
-    	$nvpstr = $nvpstr."&NOSHIPPING=0"; // A valid shipping address is required (full required fields mandatory)
-    }
-    $nvpstr = $nvpstr."&SOLUTIONTYPE=".urlencode($solutionType);
-    $nvpstr = $nvpstr."&LANDINGPAGE=".urlencode($landingPage);
-    if (!empty($conf->global->PAYPAL_CUSTOMER_SERVICE_NUMBER))
-    {
-    	$nvpstr = $nvpstr."&CUSTOMERSERVICENUMBER=".urlencode($conf->global->PAYPAL_CUSTOMER_SERVICE_NUMBER); // Hotline phone number
-    }
+	$nvpstr = '';
+	//$nvpstr = $nvpstr . "&VERSION=".$API_version;				// Already added by hash_call
+	$nvpstr = $nvpstr."&RETURNURL=".urlencode($returnURL);
+	$nvpstr = $nvpstr."&CANCELURL=".urlencode($cancelURL);
+	if (!empty($conf->global->PAYPAL_ALLOW_NOTES))
+	{
+		$nvpstr = $nvpstr."&ALLOWNOTE=0";
+	}
+	if (empty($conf->global->PAYPAL_REQUIRE_VALID_SHIPPING_ADDRESS))
+	{
+		$nvpstr = $nvpstr."&NOSHIPPING=1"; // An empty or not complete shipping address will be accepted
+	} else {
+		$nvpstr = $nvpstr."&NOSHIPPING=0"; // A valid shipping address is required (full required fields mandatory)
+	}
+	$nvpstr = $nvpstr."&SOLUTIONTYPE=".urlencode($solutionType);
+	$nvpstr = $nvpstr."&LANDINGPAGE=".urlencode($landingPage);
+	if (!empty($conf->global->PAYPAL_CUSTOMER_SERVICE_NUMBER))
+	{
+		$nvpstr = $nvpstr."&CUSTOMERSERVICENUMBER=".urlencode($conf->global->PAYPAL_CUSTOMER_SERVICE_NUMBER); // Hotline phone number
+	}
 
-    $paypalprefix = 'PAYMENTREQUEST_0_';
-    //$paypalprefix = '';
+	$paypalprefix = 'PAYMENTREQUEST_0_';
+	//$paypalprefix = '';
 	if (!empty($paypalprefix) && $paymentType == 'Sole') $paymentType = 'Sale';
 
 	$nvpstr = $nvpstr."&AMT=".urlencode($paymentAmount); // Total for all elements
 
-    $nvpstr = $nvpstr."&".$paypalprefix."INVNUM=".urlencode($tag);
-    $nvpstr = $nvpstr."&".$paypalprefix."AMT=".urlencode($paymentAmount); // AMT deprecated by paypal -> PAYMENTREQUEST_n_AMT
-    $nvpstr = $nvpstr."&".$paypalprefix."ITEMAMT=".urlencode($paymentAmount); // AMT deprecated by paypal -> PAYMENTREQUEST_n_AMT
-    $nvpstr = $nvpstr."&".$paypalprefix."PAYMENTACTION=".urlencode($paymentType); // PAYMENTACTION deprecated by paypal -> PAYMENTREQUEST_n_PAYMENTACTION
-    $nvpstr = $nvpstr."&".$paypalprefix."CURRENCYCODE=".urlencode($currencyCodeType); // CURRENCYCODE deprecated by paypal -> PAYMENTREQUEST_n_CURRENCYCODE
+	$nvpstr = $nvpstr."&".$paypalprefix."INVNUM=".urlencode($tag);
+	$nvpstr = $nvpstr."&".$paypalprefix."AMT=".urlencode($paymentAmount); // AMT deprecated by paypal -> PAYMENTREQUEST_n_AMT
+	$nvpstr = $nvpstr."&".$paypalprefix."ITEMAMT=".urlencode($paymentAmount); // AMT deprecated by paypal -> PAYMENTREQUEST_n_AMT
+	$nvpstr = $nvpstr."&".$paypalprefix."PAYMENTACTION=".urlencode($paymentType); // PAYMENTACTION deprecated by paypal -> PAYMENTREQUEST_n_PAYMENTACTION
+	$nvpstr = $nvpstr."&".$paypalprefix."CURRENCYCODE=".urlencode($currencyCodeType); // CURRENCYCODE deprecated by paypal -> PAYMENTREQUEST_n_CURRENCYCODE
 
-    $nvpstr = $nvpstr."&".$paypalprefix."L_PAYMENTREQUEST_0_QTY0=1";
-    $nvpstr = $nvpstr."&".$paypalprefix."L_PAYMENTREQUEST_0_AMT0=".urlencode($paymentAmount);
-    $nvpstr = $nvpstr."&".$paypalprefix."L_PAYMENTREQUEST_0_NAME0=".urlencode($desc);
-    $nvpstr = $nvpstr."&".$paypalprefix."L_PAYMENTREQUEST_0_NUMBER0=0";
+	$nvpstr = $nvpstr."&".$paypalprefix."L_PAYMENTREQUEST_0_QTY0=1";
+	$nvpstr = $nvpstr."&".$paypalprefix."L_PAYMENTREQUEST_0_AMT0=".urlencode($paymentAmount);
+	$nvpstr = $nvpstr."&".$paypalprefix."L_PAYMENTREQUEST_0_NAME0=".urlencode($desc);
+	$nvpstr = $nvpstr."&".$paypalprefix."L_PAYMENTREQUEST_0_NUMBER0=0";
 
-    $nvpstr = $nvpstr."&".$paypalprefix."SHIPTONAME=".urlencode($shipToName); // SHIPTONAME deprecated by paypal -> PAYMENTREQUEST_n_SHIPTONAME
-    $nvpstr = $nvpstr."&".$paypalprefix."SHIPTOSTREET=".urlencode($shipToStreet); //
-    $nvpstr = $nvpstr."&".$paypalprefix."SHIPTOSTREET2=".urlencode($shipToStreet2);
-    $nvpstr = $nvpstr."&".$paypalprefix."SHIPTOCITY=".urlencode($shipToCity);
-    $nvpstr = $nvpstr."&".$paypalprefix."SHIPTOSTATE=".urlencode($shipToState);
-    $nvpstr = $nvpstr."&".$paypalprefix."SHIPTOCOUNTRYCODE=".urlencode($shipToCountryCode);
-    $nvpstr = $nvpstr."&".$paypalprefix."SHIPTOZIP=".urlencode($shipToZip);
-    $nvpstr = $nvpstr."&".$paypalprefix."PHONENUM=".urlencode($phoneNum);
-    if (!empty($email)) $nvpstr = $nvpstr."&".$paypalprefix."EMAIL=".urlencode($email); // EMAIL deprecated by paypal -> PAYMENTREQUEST_n_EMAIL
-    if (!empty($desc))  $nvpstr = $nvpstr."&".$paypalprefix."DESC=".urlencode($desc); // DESC deprecated by paypal -> PAYMENTREQUEST_n_DESC
+	$nvpstr = $nvpstr."&".$paypalprefix."SHIPTONAME=".urlencode($shipToName); // SHIPTONAME deprecated by paypal -> PAYMENTREQUEST_n_SHIPTONAME
+	$nvpstr = $nvpstr."&".$paypalprefix."SHIPTOSTREET=".urlencode($shipToStreet); //
+	$nvpstr = $nvpstr."&".$paypalprefix."SHIPTOSTREET2=".urlencode($shipToStreet2);
+	$nvpstr = $nvpstr."&".$paypalprefix."SHIPTOCITY=".urlencode($shipToCity);
+	$nvpstr = $nvpstr."&".$paypalprefix."SHIPTOSTATE=".urlencode($shipToState);
+	$nvpstr = $nvpstr."&".$paypalprefix."SHIPTOCOUNTRYCODE=".urlencode($shipToCountryCode);
+	$nvpstr = $nvpstr."&".$paypalprefix."SHIPTOZIP=".urlencode($shipToZip);
+	$nvpstr = $nvpstr."&".$paypalprefix."PHONENUM=".urlencode($phoneNum);
+	if (!empty($email)) $nvpstr = $nvpstr."&".$paypalprefix."EMAIL=".urlencode($email); // EMAIL deprecated by paypal -> PAYMENTREQUEST_n_EMAIL
+	if (!empty($desc))  $nvpstr = $nvpstr."&".$paypalprefix."DESC=".urlencode($desc); // DESC deprecated by paypal -> PAYMENTREQUEST_n_DESC
 
-    if (!empty($conf->global->PAYPAL_LOGOIMG) && $mysoc->logo)
-    {
-    	global $dolibarr_main_url_root;
+	if (!empty($conf->global->PAYPAL_LOGOIMG) && $mysoc->logo)
+	{
+		global $dolibarr_main_url_root;
 
-	    // Define $urlwithroot
-	    $urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
-	    $urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file
-	    //$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
+		// Define $urlwithroot
+		$urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
+		$urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file
+		//$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
 
-	    $urllogo = $urlwithroot."/viewimage.php?modulepart=mycompany&file=".urlencode('logos/'.$mysoc->logo);
-	    $nvpstr = $nvpstr."&LOGOIMG=".urlencode($urllogo);
-    }
-    if (!empty($conf->global->PAYPAL_BRANDNAME))
-    {
-    	$nvpstr = $nvpstr."&BRANDNAME=".urlencode($conf->global->PAYPAL_BRANDNAME); // BRANDNAME
-    }
-    if (!empty($conf->global->PAYPAL_NOTETOBUYER))
-    {
-    	$nvpstr = $nvpstr."&NOTETOBUYER=".urlencode($conf->global->PAYPAL_NOTETOBUYER); // PAYPAL_NOTETOBUYER
-    }
+		$urllogo = $urlwithroot."/viewimage.php?modulepart=mycompany&file=".urlencode('logos/'.$mysoc->logo);
+		$nvpstr = $nvpstr."&LOGOIMG=".urlencode($urllogo);
+	}
+	if (!empty($conf->global->PAYPAL_BRANDNAME))
+	{
+		$nvpstr = $nvpstr."&BRANDNAME=".urlencode($conf->global->PAYPAL_BRANDNAME); // BRANDNAME
+	}
+	if (!empty($conf->global->PAYPAL_NOTETOBUYER))
+	{
+		$nvpstr = $nvpstr."&NOTETOBUYER=".urlencode($conf->global->PAYPAL_NOTETOBUYER); // PAYPAL_NOTETOBUYER
+	}
 
 	$_SESSION["FinalPaymentAmt"] = $paymentAmount;
-    $_SESSION["currencyCodeType"] = $currencyCodeType;
-    $_SESSION["PaymentType"] = $paymentType; // 'Mark', 'Sole'
-    $_SESSION['ipaddress'] = $_SERVER['REMOTE_ADDR']; // Payer ip
+	$_SESSION["currencyCodeType"] = $currencyCodeType;
+	$_SESSION["PaymentType"] = $paymentType; // 'Mark', 'Sole'
+	$_SESSION['ipaddress'] = $_SERVER['REMOTE_ADDR']; // Payer ip
 
-    //'---------------------------------------------------------------------------------------------------------------
-    //' Make the API call to PayPal
-    //' If the API call succeded, then redirect the buyer to PayPal to begin to authorize payment.
-    //' If an error occured, show the resulting errors
-    //'---------------------------------------------------------------------------------------------------------------
-    $resArray = hash_call("SetExpressCheckout", $nvpstr);
-    $ack = strtoupper($resArray["ACK"]);
-    if ($ack == "SUCCESS" || $ack == "SUCCESSWITHWARNING")
-    {
-        $token = urldecode($resArray["TOKEN"]);
-        $_SESSION['TOKEN'] = $token;
-    }
+	//'---------------------------------------------------------------------------------------------------------------
+	//' Make the API call to PayPal
+	//' If the API call succeded, then redirect the buyer to PayPal to begin to authorize payment.
+	//' If an error occured, show the resulting errors
+	//'---------------------------------------------------------------------------------------------------------------
+	$resArray = hash_call("SetExpressCheckout", $nvpstr);
+	$ack = strtoupper($resArray["ACK"]);
+	if ($ack == "SUCCESS" || $ack == "SUCCESSWITHWARNING")
+	{
+		$token = urldecode($resArray["TOKEN"]);
+		$_SESSION['TOKEN'] = $token;
+	}
 
-    return $resArray;
+	return $resArray;
 }
 
 /**
@@ -431,39 +431,39 @@ function callSetExpressCheckout($paymentAmount, $currencyCodeType, $paymentType,
  */
 function getDetails($token)
 {
-    //'--------------------------------------------------------------
-    //' At this point, the buyer has completed authorizing the payment
-    //' at PayPal.  The function will call PayPal to obtain the details
-    //' of the authorization, incuding any shipping information of the
-    //' buyer.  Remember, the authorization is not a completed transaction
-    //' at this state - the buyer still needs an additional step to finalize
-    //' the transaction
-    //'--------------------------------------------------------------
+	//'--------------------------------------------------------------
+	//' At this point, the buyer has completed authorizing the payment
+	//' at PayPal.  The function will call PayPal to obtain the details
+	//' of the authorization, incuding any shipping information of the
+	//' buyer.  Remember, the authorization is not a completed transaction
+	//' at this state - the buyer still needs an additional step to finalize
+	//' the transaction
+	//'--------------------------------------------------------------
 
-    //declaring of global variables
-    global $conf, $langs;
-    global $API_Endpoint, $API_Url, $API_version, $USE_PROXY, $PROXY_HOST, $PROXY_PORT;
-    global $PAYPAL_API_USER, $PAYPAL_API_PASSWORD, $PAYPAL_API_SIGNATURE;
+	//declaring of global variables
+	global $conf, $langs;
+	global $API_Endpoint, $API_Url, $API_version, $USE_PROXY, $PROXY_HOST, $PROXY_PORT;
+	global $PAYPAL_API_USER, $PAYPAL_API_PASSWORD, $PAYPAL_API_SIGNATURE;
 
-    //'---------------------------------------------------------------------------
-    //' Build a second API request to PayPal, using the token as the
-    //'  ID to get the details on the payment authorization
-    //'---------------------------------------------------------------------------
-    $nvpstr = "&TOKEN=".$token;
+	//'---------------------------------------------------------------------------
+	//' Build a second API request to PayPal, using the token as the
+	//'  ID to get the details on the payment authorization
+	//'---------------------------------------------------------------------------
+	$nvpstr = "&TOKEN=".$token;
 
-    //'---------------------------------------------------------------------------
-    //' Make the API call and store the results in an array.
-    //' If the call was a success, show the authorization details, and provide
-    //'     an action to complete the payment.
-    //' If failed, show the error
-    //'---------------------------------------------------------------------------
-    $resArray = hash_call("GetExpressCheckoutDetails", $nvpstr);
-    $ack = strtoupper($resArray["ACK"]);
-    if ($ack == "SUCCESS" || $ack == "SUCCESSWITHWARNING")
-    {
-        $_SESSION['payer_id'] = $resArray['PAYERID'];
-    }
-    return $resArray;
+	//'---------------------------------------------------------------------------
+	//' Make the API call and store the results in an array.
+	//' If the call was a success, show the authorization details, and provide
+	//'     an action to complete the payment.
+	//' If failed, show the error
+	//'---------------------------------------------------------------------------
+	$resArray = hash_call("GetExpressCheckoutDetails", $nvpstr);
+	$ack = strtoupper($resArray["ACK"]);
+	if ($ack == "SUCCESS" || $ack == "SUCCESSWITHWARNING")
+	{
+		$_SESSION['payer_id'] = $resArray['PAYERID'];
+	}
+	return $resArray;
 }
 
 
@@ -481,37 +481,37 @@ function getDetails($token)
  */
 function confirmPayment($token, $paymentType, $currencyCodeType, $payerID, $ipaddress, $FinalPaymentAmt, $tag)
 {
-    /* Gather the information to make the final call to
+	/* Gather the information to make the final call to
      finalize the PayPal payment.  The variable nvpstr
      holds the name value pairs
      */
 
-    //declaring of global variables
-    global $conf, $langs;
-    global $API_Endpoint, $API_Url, $API_version, $USE_PROXY, $PROXY_HOST, $PROXY_PORT;
-    global $PAYPAL_API_USER, $PAYPAL_API_PASSWORD, $PAYPAL_API_SIGNATURE;
+	//declaring of global variables
+	global $conf, $langs;
+	global $API_Endpoint, $API_Url, $API_version, $USE_PROXY, $PROXY_HOST, $PROXY_PORT;
+	global $PAYPAL_API_USER, $PAYPAL_API_PASSWORD, $PAYPAL_API_SIGNATURE;
 
-    $nvpstr = '';
-    $nvpstr .= '&TOKEN='.urlencode($token);
-    $nvpstr .= '&PAYERID='.urlencode($payerID);
-    $nvpstr .= '&PAYMENTACTION='.urlencode($paymentType);
-    $nvpstr .= '&AMT='.urlencode($FinalPaymentAmt);
-    $nvpstr .= '&CURRENCYCODE='.urlencode($currencyCodeType);
-    $nvpstr .= '&IPADDRESS='.urlencode($ipaddress);
-    $nvpstr .= '&INVNUM='.urlencode($tag);
+	$nvpstr = '';
+	$nvpstr .= '&TOKEN='.urlencode($token);
+	$nvpstr .= '&PAYERID='.urlencode($payerID);
+	$nvpstr .= '&PAYMENTACTION='.urlencode($paymentType);
+	$nvpstr .= '&AMT='.urlencode($FinalPaymentAmt);
+	$nvpstr .= '&CURRENCYCODE='.urlencode($currencyCodeType);
+	$nvpstr .= '&IPADDRESS='.urlencode($ipaddress);
+	$nvpstr .= '&INVNUM='.urlencode($tag);
 
-    /* Make the call to PayPal to finalize payment
+	/* Make the call to PayPal to finalize payment
      If an error occured, show the resulting errors
      */
-    $resArray = hash_call("DoExpressCheckoutPayment", $nvpstr);
+	$resArray = hash_call("DoExpressCheckoutPayment", $nvpstr);
 
-    /* Display the API response back to the browser.
+	/* Display the API response back to the browser.
      If the response from PayPal was a success, display the response parameters'
      If the response was an error, display the errors received using APIError.php.
      */
-    $ack = strtoupper($resArray["ACK"]);
+	$ack = strtoupper($resArray["ACK"]);
 
-    return $resArray;
+	return $resArray;
 }
 
 /**
@@ -575,20 +575,20 @@ function DirectPayment($paymentType, $paymentAmount, $creditCardType, $creditCar
  */
 function hash_call($methodName, $nvpStr)
 {
-    //declaring of global variables
-    global $conf, $langs;
-    global $API_Endpoint, $API_Url, $API_version, $USE_PROXY, $PROXY_HOST, $PROXY_PORT, $PROXY_USER, $PROXY_PASS;
-    global $PAYPAL_API_USER, $PAYPAL_API_PASSWORD, $PAYPAL_API_SIGNATURE;
+	//declaring of global variables
+	global $conf, $langs;
+	global $API_Endpoint, $API_Url, $API_version, $USE_PROXY, $PROXY_HOST, $PROXY_PORT, $PROXY_USER, $PROXY_PASS;
+	global $PAYPAL_API_USER, $PAYPAL_API_PASSWORD, $PAYPAL_API_SIGNATURE;
 
-    // TODO problem with triggers
-    $API_version = "98.0";
+	// TODO problem with triggers
+	$API_version = "98.0";
 	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
@@ -602,73 +602,73 @@ function hash_call($methodName, $nvpStr)
 	if (!empty($conf->global->PAYPAL_API_SANDBOX)) $PAYPAL_API_SANDBOX = $conf->global->PAYPAL_API_SANDBOX;
 	// TODO END problem with triggers
 
-    dol_syslog("Paypal API endpoint ".$API_Endpoint);
+	dol_syslog("Paypal API endpoint ".$API_Endpoint);
 
-    //setting the curl parameters.
-    $ch = curl_init();
+	//setting the curl parameters.
+	$ch = curl_init();
 
-    /*print $API_Endpoint."-".$API_version."-".$PAYPAL_API_USER."-".$PAYPAL_API_PASSWORD."-".$PAYPAL_API_SIGNATURE."<br>";
+	/*print $API_Endpoint."-".$API_version."-".$PAYPAL_API_USER."-".$PAYPAL_API_PASSWORD."-".$PAYPAL_API_SIGNATURE."<br>";
      print $USE_PROXY."-".$gv_ApiErrorURL."<br>";
      print $nvpStr;
      exit;*/
-    curl_setopt($ch, CURLOPT_URL, $API_Endpoint);
-    curl_setopt($ch, CURLOPT_VERBOSE, 1);
-    // TLSv1 by default or change to TLSv1.2 in module configuration
-    curl_setopt($ch, CURLOPT_SSLVERSION, (empty($conf->global->PAYPAL_SSLVERSION) ? 1 : $conf->global->PAYPAL_SSLVERSION));
+	curl_setopt($ch, CURLOPT_URL, $API_Endpoint);
+	curl_setopt($ch, CURLOPT_VERBOSE, 1);
+	// TLSv1 by default or change to TLSv1.2 in module configuration
+	curl_setopt($ch, CURLOPT_SSLVERSION, (empty($conf->global->PAYPAL_SSLVERSION) ? 1 : $conf->global->PAYPAL_SSLVERSION));
 
-    //turning off the server and peer verification(TrustManager Concept).
-    curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
-    curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
+	//turning off the server and peer verification(TrustManager Concept).
+	curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
+	curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
 
-    curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, empty($conf->global->MAIN_USE_CONNECT_TIMEOUT) ? 5 : $conf->global->MAIN_USE_CONNECT_TIMEOUT);
-    curl_setopt($ch, CURLOPT_TIMEOUT, empty($conf->global->MAIN_USE_RESPONSE_TIMEOUT) ? 30 : $conf->global->MAIN_USE_RESPONSE_TIMEOUT);
+	curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, empty($conf->global->MAIN_USE_CONNECT_TIMEOUT) ? 5 : $conf->global->MAIN_USE_CONNECT_TIMEOUT);
+	curl_setopt($ch, CURLOPT_TIMEOUT, empty($conf->global->MAIN_USE_RESPONSE_TIMEOUT) ? 30 : $conf->global->MAIN_USE_RESPONSE_TIMEOUT);
 
-    curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-    curl_setopt($ch, CURLOPT_POST, 1);
+	curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+	curl_setopt($ch, CURLOPT_POST, 1);
 
-    //if USE_PROXY constant set to true in Constants.php, then only proxy will be enabled.
-    if ($USE_PROXY)
-    {
-        dol_syslog("Paypal API hash_call set proxy to ".$PROXY_HOST.":".$PROXY_PORT." - ".$PROXY_USER.":".$PROXY_PASS);
-        //curl_setopt ($ch, CURLOPT_PROXYTYPE, CURLPROXY_HTTP); // Curl 7.10
-        curl_setopt($ch, CURLOPT_PROXY, $PROXY_HOST.":".$PROXY_PORT);
-        if ($PROXY_USER) curl_setopt($ch, CURLOPT_PROXYUSERPWD, $PROXY_USER.":".$PROXY_PASS);
-    }
+	//if USE_PROXY constant set to true in Constants.php, then only proxy will be enabled.
+	if ($USE_PROXY)
+	{
+		dol_syslog("Paypal API hash_call set proxy to ".$PROXY_HOST.":".$PROXY_PORT." - ".$PROXY_USER.":".$PROXY_PASS);
+		//curl_setopt ($ch, CURLOPT_PROXYTYPE, CURLPROXY_HTTP); // Curl 7.10
+		curl_setopt($ch, CURLOPT_PROXY, $PROXY_HOST.":".$PROXY_PORT);
+		if ($PROXY_USER) curl_setopt($ch, CURLOPT_PROXYUSERPWD, $PROXY_USER.":".$PROXY_PASS);
+	}
 
-    //NVPRequest for submitting to server
-    $nvpreq = "METHOD=".urlencode($methodName)."&VERSION=".urlencode($API_version)."&PWD=".urlencode($PAYPAL_API_PASSWORD)."&USER=".urlencode($PAYPAL_API_USER)."&SIGNATURE=".urlencode($PAYPAL_API_SIGNATURE).$nvpStr;
-    $nvpreq .= "&LOCALECODE=".strtoupper($langs->getDefaultLang(1));
-    //$nvpreq.="&BRANDNAME=".urlencode();       // Override merchant name
-    //$nvpreq.="&NOTIFYURL=".urlencode();       // For Instant Payment Notification url
+	//NVPRequest for submitting to server
+	$nvpreq = "METHOD=".urlencode($methodName)."&VERSION=".urlencode($API_version)."&PWD=".urlencode($PAYPAL_API_PASSWORD)."&USER=".urlencode($PAYPAL_API_USER)."&SIGNATURE=".urlencode($PAYPAL_API_SIGNATURE).$nvpStr;
+	$nvpreq .= "&LOCALECODE=".strtoupper($langs->getDefaultLang(1));
+	//$nvpreq.="&BRANDNAME=".urlencode();       // Override merchant name
+	//$nvpreq.="&NOTIFYURL=".urlencode();       // For Instant Payment Notification url
 
 
-    dol_syslog("Paypal API hash_call nvpreq=".$nvpreq);
+	dol_syslog("Paypal API hash_call nvpreq=".$nvpreq);
 
-    //setting the nvpreq as POST FIELD to curl
-    curl_setopt($ch, CURLOPT_POSTFIELDS, $nvpreq);
+	//setting the nvpreq as POST FIELD to curl
+	curl_setopt($ch, CURLOPT_POSTFIELDS, $nvpreq);
 
-    //getting response from server
-    $response = curl_exec($ch);
+	//getting response from server
+	$response = curl_exec($ch);
 
-    $nvpReqArray = deformatNVP($nvpreq);
-    $_SESSION['nvpReqArray'] = $nvpReqArray;
+	$nvpReqArray = deformatNVP($nvpreq);
+	$_SESSION['nvpReqArray'] = $nvpReqArray;
 
-    //convrting NVPResponse to an Associative Array
-    dol_syslog("Paypal API hash_call Response nvpresp=".$response);
-    $nvpResArray = deformatNVP($response);
+	//convrting NVPResponse to an Associative Array
+	dol_syslog("Paypal API hash_call Response nvpresp=".$response);
+	$nvpResArray = deformatNVP($response);
 
-    if (curl_errno($ch)) {
-        // moving to display page to display curl errors
-        $_SESSION['curl_error_no'] = curl_errno($ch);
-        $_SESSION['curl_error_msg'] = curl_error($ch);
+	if (curl_errno($ch)) {
+		// moving to display page to display curl errors
+		$_SESSION['curl_error_no'] = curl_errno($ch);
+		$_SESSION['curl_error_msg'] = curl_error($ch);
 
-        //Execute the Error handling module to display errors.
-    } else {
-        //closing the curl
-        curl_close($ch);
-    }
+		//Execute the Error handling module to display errors.
+	} else {
+		//closing the curl
+		curl_close($ch);
+	}
 
-    return $nvpResArray;
+	return $nvpResArray;
 }
 
 
@@ -681,24 +681,24 @@ function hash_call($methodName, $nvpStr)
  */
 function deformatNVP($nvpstr)
 {
-    $intial = 0;
-    $nvpArray = array();
+	$intial = 0;
+	$nvpArray = array();
 
-    while (strlen($nvpstr))
-    {
-        //postion of Key
-        $keypos = strpos($nvpstr, '=');
-        //position of value
-        $valuepos = strpos($nvpstr, '&') ? strpos($nvpstr, '&') : strlen($nvpstr);
+	while (strlen($nvpstr))
+	{
+		//postion of Key
+		$keypos = strpos($nvpstr, '=');
+		//position of value
+		$valuepos = strpos($nvpstr, '&') ? strpos($nvpstr, '&') : strlen($nvpstr);
 
-        /*getting the Key and Value values and storing in a Associative Array*/
-        $keyval = substr($nvpstr, $intial, $keypos);
-        $valval = substr($nvpstr, $keypos + 1, $valuepos - $keypos - 1);
-        //decoding the respose
-        $nvpArray[urldecode($keyval)] = urldecode($valval);
-        $nvpstr = substr($nvpstr, $valuepos + 1, strlen($nvpstr));
-    }
-    return $nvpArray;
+		/*getting the Key and Value values and storing in a Associative Array*/
+		$keyval = substr($nvpstr, $intial, $keypos);
+		$valval = substr($nvpstr, $keypos + 1, $valuepos - $keypos - 1);
+		//decoding the respose
+		$nvpArray[urldecode($keyval)] = urldecode($valval);
+		$nvpstr = substr($nvpstr, $valuepos + 1, strlen($nvpstr));
+	}
+	return $nvpArray;
 }
 
 /**
diff --git a/htdocs/printing/admin/printing.php b/htdocs/printing/admin/printing.php
index f35741028aa..a67ad379ca9 100644
--- a/htdocs/printing/admin/printing.php
+++ b/htdocs/printing/admin/printing.php
@@ -54,46 +54,46 @@ $OAUTH_SERVICENAME_GOOGLE = 'Google';
 
 if (($mode == 'test' || $mode == 'setup') && empty($driver))
 {
-    setEventMessages($langs->trans('PleaseSelectaDriverfromList'), null);
-    header("Location: ".$_SERVER['PHP_SELF'].'?mode=config');
-    exit;
+	setEventMessages($langs->trans('PleaseSelectaDriverfromList'), null);
+	header("Location: ".$_SERVER['PHP_SELF'].'?mode=config');
+	exit;
 }
 
 if ($action == 'setconst' && $user->admin)
 {
-    $error = 0;
-    $db->begin();
-    foreach ($_POST['setupdriver'] as $setupconst) {
-        //print '<pre>'.print_r($setupconst, true).'</pre>';
-        $result = dolibarr_set_const($db, $setupconst['varname'], $setupconst['value'], 'chaine', 0, '', $conf->entity);
-        if (!$result > 0) $error++;
-    }
+	$error = 0;
+	$db->begin();
+	foreach ($_POST['setupdriver'] as $setupconst) {
+		//print '<pre>'.print_r($setupconst, true).'</pre>';
+		$result = dolibarr_set_const($db, $setupconst['varname'], $setupconst['value'], 'chaine', 0, '', $conf->entity);
+		if (!$result > 0) $error++;
+	}
 
-    if (!$error) {
-        $db->commit();
-        setEventMessages($langs->trans("SetupSaved"), null);
-    } else {
-        $db->rollback();
-        dol_print_error($db);
-    }
-    $action = '';
+	if (!$error) {
+		$db->commit();
+		setEventMessages($langs->trans("SetupSaved"), null);
+	} else {
+		$db->rollback();
+		dol_print_error($db);
+	}
+	$action = '';
 }
 
 if ($action == 'setvalue' && $user->admin)
 {
-    $db->begin();
+	$db->begin();
 
-    $result = dolibarr_set_const($db, $varname, $value, 'chaine', 0, '', $conf->entity);
-    if (!$result > 0) $error++;
+	$result = dolibarr_set_const($db, $varname, $value, 'chaine', 0, '', $conf->entity);
+	if (!$result > 0) $error++;
 
-    if (!$error) {
-        $db->commit();
-        setEventMessages($langs->trans("SetupSaved"), null);
-    } else {
-        $db->rollback();
-        dol_print_error($db);
-    }
-    $action = '';
+	if (!$error) {
+		$db->commit();
+		setEventMessages($langs->trans("SetupSaved"), null);
+	} else {
+		$db->rollback();
+		dol_print_error($db);
+	}
+	$action = '';
 }
 
 
@@ -112,253 +112,253 @@ $head = printingAdminPrepareHead($mode);
 
 if ($mode == 'setup' && $user->admin)
 {
-    print '<form method="post" action="'.$_SERVER["PHP_SELF"].'?mode=setup&amp;driver='.$driver.'" autocomplete="off">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    print '<input type="hidden" name="action" value="setconst">';
+	print '<form method="post" action="'.$_SERVER["PHP_SELF"].'?mode=setup&amp;driver='.$driver.'" autocomplete="off">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="action" value="setconst">';
 
-    print dol_get_fiche_head($head, $mode, $langs->trans("ModuleSetup"), -1, 'technic');
+	print dol_get_fiche_head($head, $mode, $langs->trans("ModuleSetup"), -1, 'technic');
 
-    print $langs->trans("PrintingDriverDesc".$driver)."<br><br>\n";
+	print $langs->trans("PrintingDriverDesc".$driver)."<br><br>\n";
 
-    print '<table class="noborder centpercent">'."\n";
-    print '<tr class="liste_titre">';
-    print '<th>'.$langs->trans("Parameters").'</th>';
-    print '<th>'.$langs->trans("Value").'</th>';
-    print '<th>&nbsp;</th>';
-    print "</tr>\n";
-    $submit_enabled = 0;
+	print '<table class="noborder centpercent">'."\n";
+	print '<tr class="liste_titre">';
+	print '<th>'.$langs->trans("Parameters").'</th>';
+	print '<th>'.$langs->trans("Value").'</th>';
+	print '<th>&nbsp;</th>';
+	print "</tr>\n";
+	$submit_enabled = 0;
 
-    if (!empty($driver)) {
-        $dirmodels = array_merge(array('/core/modules/printing/'), (array) $conf->modules_parts['printing']);
-        foreach ($dirmodels as $dir) {
-            if (file_exists(dol_buildpath($dir, 0).$driver.'.modules.php')) {
-                $classfile = dol_buildpath($dir, 0).$driver.'.modules.php';
-                break;
-            }
-        }
-        require_once $classfile;
-        $classname = 'printing_'.$driver;
-        $printer = new $classname($db);
-        $langs->load($printer::LANGFILE);
+	if (!empty($driver)) {
+		$dirmodels = array_merge(array('/core/modules/printing/'), (array) $conf->modules_parts['printing']);
+		foreach ($dirmodels as $dir) {
+			if (file_exists(dol_buildpath($dir, 0).$driver.'.modules.php')) {
+				$classfile = dol_buildpath($dir, 0).$driver.'.modules.php';
+				break;
+			}
+		}
+		require_once $classfile;
+		$classname = 'printing_'.$driver;
+		$printer = new $classname($db);
+		$langs->load($printer::LANGFILE);
 
-        $i = 0;
-        $submit_enabled = 0;
-        foreach ($printer->conf as $key)
-        {
-            switch ($key['type']) {
-                case "text":
-                case "password":
-                    print '<tr class="oddeven">';
-                    print '<td'.($key['required'] ? ' class=required' : '').'>'.$langs->trans($key['varname']).'</td>';
-                    print '<td><input size="32" type="'.(empty($key['type']) ? 'text' : $key['type']).'" name="setupdriver['.$i.'][value]" value="'.$conf->global->{$key['varname']}.'"';
-                    print isset($key['moreattributes']) ? ' '.$key['moreattributes'] : '';
-                    print '><input type="hidden" name="setupdriver['.$i.'][varname]" value="'.$key['varname'].'"></td>';
-                    print '<td>&nbsp;'.($key['example'] != '' ? $langs->trans("Example").' : '.$key['example'] : '').'</td>';
-                    print '</tr>'."\n";
-                    break;
-                case "info":    // Google Api setup or Google OAuth Token
-                    print '<tr class="oddeven">';
-                    print '<td'.($key['required'] ? ' class=required' : '').'>';
-                    if ($key['varname'] == 'PRINTGCP_TOKEN_ACCESS')
-                    {
-                        print $langs->trans("IsTokenGenerated");
-                    } else {
-                        print $langs->trans($key['varname']);
-                    }
-                    print '</td>';
-                    print '<td>'.$langs->trans($key['info']).'</td>';
-                    print '<td>';
-                    //var_dump($key);
-                    if ($key['varname'] == 'PRINTGCP_TOKEN_ACCESS')
-                    {
-                        // Delete remote tokens
-                        if (!empty($key['delete'])) print '<a class="button" href="'.$key['delete'].'">'.$langs->trans('DeleteAccess').'</a><br><br>';
-                        // Request remote token
-                        print '<a class="button" href="'.$key['renew'].'">'.$langs->trans('RequestAccess').'</a><br><br>';
-                        // Check remote access
-                        print $langs->trans("ToCheckDeleteTokenOnProvider", $OAUTH_SERVICENAME_GOOGLE).': <a href="https://security.google.com/settings/security/permissions" target="_google">https://security.google.com/settings/security/permissions</a>';
-                    }
-                    print '</td>';
-                    print '</tr>'."\n";
-                    break;
-                case "submit":
-                    if ($key['enabled']) $submit_enabled = 1;
-                    break;
-            }
-            $i++;
+		$i = 0;
+		$submit_enabled = 0;
+		foreach ($printer->conf as $key)
+		{
+			switch ($key['type']) {
+				case "text":
+				case "password":
+					print '<tr class="oddeven">';
+					print '<td'.($key['required'] ? ' class=required' : '').'>'.$langs->trans($key['varname']).'</td>';
+					print '<td><input size="32" type="'.(empty($key['type']) ? 'text' : $key['type']).'" name="setupdriver['.$i.'][value]" value="'.$conf->global->{$key['varname']}.'"';
+					print isset($key['moreattributes']) ? ' '.$key['moreattributes'] : '';
+					print '><input type="hidden" name="setupdriver['.$i.'][varname]" value="'.$key['varname'].'"></td>';
+					print '<td>&nbsp;'.($key['example'] != '' ? $langs->trans("Example").' : '.$key['example'] : '').'</td>';
+					print '</tr>'."\n";
+					break;
+				case "info":    // Google Api setup or Google OAuth Token
+					print '<tr class="oddeven">';
+					print '<td'.($key['required'] ? ' class=required' : '').'>';
+					if ($key['varname'] == 'PRINTGCP_TOKEN_ACCESS')
+					{
+						print $langs->trans("IsTokenGenerated");
+					} else {
+						print $langs->trans($key['varname']);
+					}
+					print '</td>';
+					print '<td>'.$langs->trans($key['info']).'</td>';
+					print '<td>';
+					//var_dump($key);
+					if ($key['varname'] == 'PRINTGCP_TOKEN_ACCESS')
+					{
+						// Delete remote tokens
+						if (!empty($key['delete'])) print '<a class="button" href="'.$key['delete'].'">'.$langs->trans('DeleteAccess').'</a><br><br>';
+						// Request remote token
+						print '<a class="button" href="'.$key['renew'].'">'.$langs->trans('RequestAccess').'</a><br><br>';
+						// Check remote access
+						print $langs->trans("ToCheckDeleteTokenOnProvider", $OAUTH_SERVICENAME_GOOGLE).': <a href="https://security.google.com/settings/security/permissions" target="_google">https://security.google.com/settings/security/permissions</a>';
+					}
+					print '</td>';
+					print '</tr>'."\n";
+					break;
+				case "submit":
+					if ($key['enabled']) $submit_enabled = 1;
+					break;
+			}
+			$i++;
 
-            if ($key['varname'] == 'PRINTGCP_TOKEN_ACCESS')
-            {
-                // Token
-                print '<tr class="oddeven">';
-                print '<td>'.$langs->trans("Token").'</td>';
-                print '<td colspan="2">';
-                $tokenobj = null;
-                // Dolibarr storage
-                $storage = new DoliStorage($db, $conf);
-                try {
-                    $tokenobj = $storage->retrieveAccessToken($OAUTH_SERVICENAME_GOOGLE);
-                } catch (Exception $e)
-                {
-                    // Return an error if token not found
-                }
-                if (is_object($tokenobj))
-                {
-                    //var_dump($tokenobj);
-                    print $tokenobj->getAccessToken().'<br>';
-                    //print 'Refresh: '.$tokenobj->getRefreshToken().'<br>';
-                    //print 'EndOfLife: '.$tokenobj->getEndOfLife().'<br>';
-                    //var_dump($tokenobj->getExtraParams());
-                    /*print '<br>Extra: <br><textarea class="quatrevingtpercent">';
+			if ($key['varname'] == 'PRINTGCP_TOKEN_ACCESS')
+			{
+				// Token
+				print '<tr class="oddeven">';
+				print '<td>'.$langs->trans("Token").'</td>';
+				print '<td colspan="2">';
+				$tokenobj = null;
+				// Dolibarr storage
+				$storage = new DoliStorage($db, $conf);
+				try {
+					$tokenobj = $storage->retrieveAccessToken($OAUTH_SERVICENAME_GOOGLE);
+				} catch (Exception $e)
+				{
+					// Return an error if token not found
+				}
+				if (is_object($tokenobj))
+				{
+					//var_dump($tokenobj);
+					print $tokenobj->getAccessToken().'<br>';
+					//print 'Refresh: '.$tokenobj->getRefreshToken().'<br>';
+					//print 'EndOfLife: '.$tokenobj->getEndOfLife().'<br>';
+					//var_dump($tokenobj->getExtraParams());
+					/*print '<br>Extra: <br><textarea class="quatrevingtpercent">';
                     print ''.join(',',$tokenobj->getExtraParams());
                     print '</textarea>';*/
-                }
-                print '</td>';
-                print '</tr>'."\n";
-            }
-        }
-    } else {
-        print $langs->trans('PleaseSelectaDriverfromList');
-    }
+				}
+				print '</td>';
+				print '</tr>'."\n";
+			}
+		}
+	} else {
+		print $langs->trans('PleaseSelectaDriverfromList');
+	}
 
-    print '</table>';
+	print '</table>';
 
-    dol_fiche_end();
+	print dol_get_fiche_end();
 
-    if (!empty($driver))
-    {
-        if ($submit_enabled) {
-            print '<div class="center"><input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Modify")).'"></div>';
-        }
-    }
+	if (!empty($driver))
+	{
+		if ($submit_enabled) {
+			print '<div class="center"><input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Modify")).'"></div>';
+		}
+	}
 
-    print '</form>';
+	print '</form>';
 }
 if ($mode == 'config' && $user->admin)
 {
-    print dol_get_fiche_head($head, $mode, $langs->trans("ModuleSetup"), -1, 'technic');
+	print dol_get_fiche_head($head, $mode, $langs->trans("ModuleSetup"), -1, 'technic');
 
-    print $langs->trans("PrintingDesc")."<br><br>\n";
+	print $langs->trans("PrintingDesc")."<br><br>\n";
 
-    print '<table class="noborder centpercent">'."\n";
+	print '<table class="noborder centpercent">'."\n";
 
-    print '<tr class="liste_titre">';
-    print '<th>'.$langs->trans("Description").'</th>';
-    print '<th class="center">'.$langs->trans("Active").'</th>';
-    print '<th class="center">'.$langs->trans("Setup").'</th>';
-    print '<th class="center">'.$langs->trans("TargetedPrinter").'</th>';
-    print "</tr>\n";
+	print '<tr class="liste_titre">';
+	print '<th>'.$langs->trans("Description").'</th>';
+	print '<th class="center">'.$langs->trans("Active").'</th>';
+	print '<th class="center">'.$langs->trans("Setup").'</th>';
+	print '<th class="center">'.$langs->trans("TargetedPrinter").'</th>';
+	print "</tr>\n";
 
-    $object = new PrintingDriver($db);
-    $result = $object->listDrivers($db, 10);
-    $dirmodels = array_merge(array('/core/modules/printing/'), (array) $conf->modules_parts['printing']);
-    foreach ($result as $driver) {
-        foreach ($dirmodels as $dir) {
-            if (file_exists(dol_buildpath($dir, 0).$driver.'.modules.php')) {
-                $classfile = dol_buildpath($dir, 0).$driver.'.modules.php';
-                break;
-            }
-        }
-        require_once $classfile;
-        $classname = 'printing_'.$driver;
-        $printer = new $classname($db);
-        $langs->load($printer::LANGFILE);
-        //print '<pre>'.print_r($printer, true).'</pre>';
+	$object = new PrintingDriver($db);
+	$result = $object->listDrivers($db, 10);
+	$dirmodels = array_merge(array('/core/modules/printing/'), (array) $conf->modules_parts['printing']);
+	foreach ($result as $driver) {
+		foreach ($dirmodels as $dir) {
+			if (file_exists(dol_buildpath($dir, 0).$driver.'.modules.php')) {
+				$classfile = dol_buildpath($dir, 0).$driver.'.modules.php';
+				break;
+			}
+		}
+		require_once $classfile;
+		$classname = 'printing_'.$driver;
+		$printer = new $classname($db);
+		$langs->load($printer::LANGFILE);
+		//print '<pre>'.print_r($printer, true).'</pre>';
 
-        print '<tr class="oddeven">';
-        print '<td>'.img_picto('', $printer->picto).' '.$langs->trans($printer->desc).'</td>';
-        print '<td class="center">';
-        if (!empty($conf->use_javascript_ajax)) {
-            print ajax_constantonoff($printer->active);
-        } else {
-            if (empty($conf->global->{$printer->conf})) {
-                print '<a href="'.$_SERVER['PHP_SELF'].'?action=setvalue&amp;token='.newToken().'&amp;varname='.$printer->active.'&amp;value=1">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
-            } else {
-                print '<a href="'.$_SERVER['PHP_SELF'].'?action=setvalue&amp;token='.newToken().'&amp;varname='.$printer->active.'&amp;value=0">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
-            }
-        }
-        print '<td class="center"><a href="'.$_SERVER['PHP_SELF'].'?mode=setup&amp;driver='.$printer->name.'">'.img_picto('', 'setup').'</a></td>';
-        print '<td class="center"><a href="'.$_SERVER['PHP_SELF'].'?mode=test&amp;driver='.$printer->name.'">'.img_picto('', 'setup').'</a></td>';
-        print '</tr>'."\n";
-    }
+		print '<tr class="oddeven">';
+		print '<td>'.img_picto('', $printer->picto).' '.$langs->trans($printer->desc).'</td>';
+		print '<td class="center">';
+		if (!empty($conf->use_javascript_ajax)) {
+			print ajax_constantonoff($printer->active);
+		} else {
+			if (empty($conf->global->{$printer->conf})) {
+				print '<a href="'.$_SERVER['PHP_SELF'].'?action=setvalue&amp;token='.newToken().'&amp;varname='.$printer->active.'&amp;value=1">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+			} else {
+				print '<a href="'.$_SERVER['PHP_SELF'].'?action=setvalue&amp;token='.newToken().'&amp;varname='.$printer->active.'&amp;value=0">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
+			}
+		}
+		print '<td class="center"><a href="'.$_SERVER['PHP_SELF'].'?mode=setup&amp;driver='.$printer->name.'">'.img_picto('', 'setup').'</a></td>';
+		print '<td class="center"><a href="'.$_SERVER['PHP_SELF'].'?mode=test&amp;driver='.$printer->name.'">'.img_picto('', 'setup').'</a></td>';
+		print '</tr>'."\n";
+	}
 
-    print '</table>';
+	print '</table>';
 
-    dol_fiche_end();
+	print dol_get_fiche_end();
 }
 
 if ($mode == 'test' && $user->admin)
 {
-    print dol_get_fiche_head($head, $mode, $langs->trans("ModuleSetup"), -1, 'technic');
+	print dol_get_fiche_head($head, $mode, $langs->trans("ModuleSetup"), -1, 'technic');
 
-    print $langs->trans('PrintTestDesc'.$driver)."<br><br>\n";
+	print $langs->trans('PrintTestDesc'.$driver)."<br><br>\n";
 
-    print '<table class="noborder centpercent">';
-    if (!empty($driver)) {
-        $dirmodels = array_merge(array('/core/modules/printing/'), (array) $conf->modules_parts['printing']);
-        foreach ($dirmodels as $dir) {
-            if (file_exists(dol_buildpath($dir, 0).$driver.'.modules.php')) {
-                $classfile = dol_buildpath($dir, 0).$driver.'.modules.php';
-                break;
-            }
-        }
-        require_once $classfile;
-        $classname = 'printing_'.$driver;
-        $langs->load($driver);
-        $printer = new $classname($db);
-        $langs->load($printer::LANGFILE);
-        //print '<pre>'.print_r($printer, true).'</pre>';
-        if (count($printer->getlistAvailablePrinters())) {
-            if ($printer->listAvailablePrinters() == 0) {
-                print $printer->resprint;
-            } else {
-                setEventMessages($printer->error, $printer->errors, 'errors');
-            }
-        } else {
-            print $langs->trans('PleaseConfigureDriverfromList');
-        }
-    } else {
-        print $langs->trans('PleaseSelectaDriverfromList');
-    }
-    print '</table>';
+	print '<table class="noborder centpercent">';
+	if (!empty($driver)) {
+		$dirmodels = array_merge(array('/core/modules/printing/'), (array) $conf->modules_parts['printing']);
+		foreach ($dirmodels as $dir) {
+			if (file_exists(dol_buildpath($dir, 0).$driver.'.modules.php')) {
+				$classfile = dol_buildpath($dir, 0).$driver.'.modules.php';
+				break;
+			}
+		}
+		require_once $classfile;
+		$classname = 'printing_'.$driver;
+		$langs->load($driver);
+		$printer = new $classname($db);
+		$langs->load($printer::LANGFILE);
+		//print '<pre>'.print_r($printer, true).'</pre>';
+		if (count($printer->getlistAvailablePrinters())) {
+			if ($printer->listAvailablePrinters() == 0) {
+				print $printer->resprint;
+			} else {
+				setEventMessages($printer->error, $printer->errors, 'errors');
+			}
+		} else {
+			print $langs->trans('PleaseConfigureDriverfromList');
+		}
+	} else {
+		print $langs->trans('PleaseSelectaDriverfromList');
+	}
+	print '</table>';
 
-    dol_fiche_end();
+	print dol_get_fiche_end();
 }
 
 if ($mode == 'userconf' && $user->admin)
 {
-    print dol_get_fiche_head($head, $mode, $langs->trans("ModuleSetup"), -1, 'technic');
+	print dol_get_fiche_head($head, $mode, $langs->trans("ModuleSetup"), -1, 'technic');
 
-    print $langs->trans('PrintUserConfDesc'.$driver)."<br><br>\n";
+	print $langs->trans('PrintUserConfDesc'.$driver)."<br><br>\n";
 
-    print '<table class="noborder centpercent">';
-    print '<tr class="liste_titre">';
-    print '<th>'.$langs->trans("User").'</th>';
-    print '<th>'.$langs->trans("PrintModule").'</th>';
-    print '<th>'.$langs->trans("PrintDriver").'</th>';
-    print '<th>'.$langs->trans("Printer").'</th>';
-    print '<th>'.$langs->trans("PrinterLocation").'</th>';
-    print '<th>'.$langs->trans("PrinterId").'</th>';
-    print '<th>'.$langs->trans("NumberOfCopy").'</th>';
-    print '<th class="center">'.$langs->trans("Delete").'</th>';
-    print "</tr>\n";
-    $sql = 'SELECT p.rowid, p.printer_name, p.printer_location, p.printer_id, p.copy, p.module, p.driver, p.userid, u.login FROM '.MAIN_DB_PREFIX.'printing as p, '.MAIN_DB_PREFIX.'user as u WHERE p.userid=u.rowid';
-    $resql = $db->query($sql);
-    while ($row = $db->fetch_array($resql)) {
-        print '<tr class="oddeven">';
-        print '<td>'.$row['login'].'</td>';
-        print '<td>'.$row['module'].'</td>';
-        print '<td>'.$row['driver'].'</td>';
-        print '<td>'.$row['printer_name'].'</td>';
-        print '<td>'.$row['printer_location'].'</td>';
-        print '<td>'.$row['printer_id'].'</td>';
-        print '<td>'.$row['copy'].'</td>';
-        print '<td class="center">'.img_picto($langs->trans("Delete"), 'delete').'</td>';
-        print "</tr>\n";
-    }
-    print '</table>';
+	print '<table class="noborder centpercent">';
+	print '<tr class="liste_titre">';
+	print '<th>'.$langs->trans("User").'</th>';
+	print '<th>'.$langs->trans("PrintModule").'</th>';
+	print '<th>'.$langs->trans("PrintDriver").'</th>';
+	print '<th>'.$langs->trans("Printer").'</th>';
+	print '<th>'.$langs->trans("PrinterLocation").'</th>';
+	print '<th>'.$langs->trans("PrinterId").'</th>';
+	print '<th>'.$langs->trans("NumberOfCopy").'</th>';
+	print '<th class="center">'.$langs->trans("Delete").'</th>';
+	print "</tr>\n";
+	$sql = 'SELECT p.rowid, p.printer_name, p.printer_location, p.printer_id, p.copy, p.module, p.driver, p.userid, u.login FROM '.MAIN_DB_PREFIX.'printing as p, '.MAIN_DB_PREFIX.'user as u WHERE p.userid=u.rowid';
+	$resql = $db->query($sql);
+	while ($row = $db->fetch_array($resql)) {
+		print '<tr class="oddeven">';
+		print '<td>'.$row['login'].'</td>';
+		print '<td>'.$row['module'].'</td>';
+		print '<td>'.$row['driver'].'</td>';
+		print '<td>'.$row['printer_name'].'</td>';
+		print '<td>'.$row['printer_location'].'</td>';
+		print '<td>'.$row['printer_id'].'</td>';
+		print '<td>'.$row['copy'].'</td>';
+		print '<td class="center">'.img_picto($langs->trans("Delete"), 'delete').'</td>';
+		print "</tr>\n";
+	}
+	print '</table>';
 
-    dol_fiche_end();
+	print dol_get_fiche_end();
 }
 
 // End of page
diff --git a/htdocs/product/admin/price_rules.php b/htdocs/product/admin/price_rules.php
index 3c08416e000..84510dfabad 100644
--- a/htdocs/product/admin/price_rules.php
+++ b/htdocs/product/admin/price_rules.php
@@ -188,7 +188,7 @@ $genPriceOptions = function ($level) use ($price_options) {
 
 <?php
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '<div style="text-align: center">
 		<input type="submit" value="'.$langs->trans('Save').'" class="button">
diff --git a/htdocs/product/admin/product.php b/htdocs/product/admin/product.php
index 313a27884ff..16c3c849ce6 100644
--- a/htdocs/product/admin/product.php
+++ b/htdocs/product/admin/product.php
@@ -146,13 +146,13 @@ if ($action == 'other')
 	$res = dolibarr_set_const($db, "PRODUIT_FOURN_TEXTS", $value, 'chaine', 0, '', $conf->entity);
 
 	if ($value) {
-	    $sql_test = "SELECT count(desc_fourn) as cpt FROM ".MAIN_DB_PREFIX."product_fournisseur_price WHERE 1";
-	    $resql = $db->query($sql_test);
-	    if (!$resql && $db->lasterrno == 'DB_ERROR_NOSUCHFIELD') // if the field does not exist, we create it
-	    {
-	        $sql_new = "ALTER TABLE ".MAIN_DB_PREFIX."product_fournisseur_price ADD COLUMN desc_fourn text";
-	        $resql_new = $db->query($sql_new);
-	    }
+		$sql_test = "SELECT count(desc_fourn) as cpt FROM ".MAIN_DB_PREFIX."product_fournisseur_price WHERE 1";
+		$resql = $db->query($sql_test);
+		if (!$resql && $db->lasterrno == 'DB_ERROR_NOSUCHFIELD') // if the field does not exist, we create it
+		{
+			$sql_new = "ALTER TABLE ".MAIN_DB_PREFIX."product_fournisseur_price ADD COLUMN desc_fourn text";
+			$resql_new = $db->query($sql_new);
+		}
 	}
 
 	$value = GETPOST('activate_useProdSupplierPackaging', 'alpha');
@@ -180,7 +180,7 @@ if ($action == 'specimen') // For products
 	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 	foreach ($dirmodels as $reldir)
 	{
-	    $file = dol_buildpath($reldir."core/modules/product/doc/pdf_".$modele.".modules.php", 0);
+		$file = dol_buildpath($reldir."core/modules/product/doc/pdf_".$modele.".modules.php", 0);
 		if (file_exists($file))
 		{
 			$filefound = 1;
@@ -261,12 +261,12 @@ if ($action == 'set')
 
 if ($action)
 {
-    if (!$error)
-    {
-	    setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    } else {
-	    setEventMessages($langs->trans("SetupNotError"), null, 'errors');
-    }
+	if (!$error)
+	{
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
+		setEventMessages($langs->trans("SetupNotError"), null, 'errors');
+	}
 }
 
 /*
@@ -317,60 +317,60 @@ foreach ($dirproduct as $dirroot)
 {
 	$dir = dol_buildpath($dirroot, 0);
 
-    $handle = @opendir($dir);
-    if (is_resource($handle))
-    {
-    	// Loop on each module find in opened directory
-    	while (($file = readdir($handle)) !== false)
-    	{
-    		if (substr($file, 0, 16) == 'mod_codeproduct_' && substr($file, -3) == 'php')
-    		{
-    			$file = substr($file, 0, dol_strlen($file) - 4);
+	$handle = @opendir($dir);
+	if (is_resource($handle))
+	{
+		// Loop on each module find in opened directory
+		while (($file = readdir($handle)) !== false)
+		{
+			if (substr($file, 0, 16) == 'mod_codeproduct_' && substr($file, -3) == 'php')
+			{
+				$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);
+				}
 
-    			$modCodeProduct = new $file;
+				$modCodeProduct = new $file;
 
-    			// Show modules according to features level
-    			if ($modCodeProduct->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
-    			if ($modCodeProduct->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
+				// Show modules according to features level
+				if ($modCodeProduct->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
+				if ($modCodeProduct->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
 
-    			$var = !$var;
-    			print '<tr class="oddeven">'."\n";
-    			print '<td width="140">'.$modCodeProduct->name.'</td>'."\n";
-    			print '<td>'.$modCodeProduct->info($langs).'</td>'."\n";
-    			print '<td class="nowrap">'.$modCodeProduct->getExample($langs).'</td>'."\n";
+				$var = !$var;
+				print '<tr class="oddeven">'."\n";
+				print '<td width="140">'.$modCodeProduct->name.'</td>'."\n";
+				print '<td>'.$modCodeProduct->info($langs).'</td>'."\n";
+				print '<td class="nowrap">'.$modCodeProduct->getExample($langs).'</td>'."\n";
 
-    			if (!empty($conf->global->PRODUCT_CODEPRODUCT_ADDON) && $conf->global->PRODUCT_CODEPRODUCT_ADDON == $file)
-    			{
-    				print '<td class="center">'."\n";
-    				print img_picto($langs->trans("Activated"), 'switch_on');
-    				print "</td>\n";
-    			} else {
-    				$disabled = false;
-    				if (!empty($conf->multicompany->enabled) && (is_object($mc) && !empty($mc->sharings['referent']) && $mc->sharings['referent'] == $conf->entity) ? false : true);
-    				print '<td class="center">';
-    				if (!$disabled) print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setcodeproduct&token='.newToken().'&value='.$file.'">';
-    				print img_picto($langs->trans("Disabled"), 'switch_off');
-    				if (!$disabled) print '</a>';
-    				print '</td>';
-    			}
+				if (!empty($conf->global->PRODUCT_CODEPRODUCT_ADDON) && $conf->global->PRODUCT_CODEPRODUCT_ADDON == $file)
+				{
+					print '<td class="center">'."\n";
+					print img_picto($langs->trans("Activated"), 'switch_on');
+					print "</td>\n";
+				} else {
+					$disabled = false;
+					if (!empty($conf->multicompany->enabled) && (is_object($mc) && !empty($mc->sharings['referent']) && $mc->sharings['referent'] == $conf->entity) ? false : true);
+					print '<td class="center">';
+					if (!$disabled) print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setcodeproduct&token='.newToken().'&value='.$file.'">';
+					print img_picto($langs->trans("Disabled"), 'switch_off');
+					if (!$disabled) print '</a>';
+					print '</td>';
+				}
 
-    			print '<td class="center">';
-    			$s = $modCodeProduct->getToolTip($langs, null, -1);
-    			print $form->textwithpicto('', $s, 1);
-    			print '</td>';
+				print '<td class="center">';
+				$s = $modCodeProduct->getToolTip($langs, null, -1);
+				print $form->textwithpicto('', $s, 1);
+				print '</td>';
 
-    			print '</tr>';
-    		}
-    	}
-    	closedir($handle);
-    }
+				print '</tr>';
+			}
+		}
+		closedir($handle);
+	}
 }
 print '</table>';
 
@@ -413,104 +413,104 @@ clearstatcache();
 
 foreach ($dirmodels as $reldir)
 {
-    foreach (array('', '/doc') as $valdir)
-    {
-    	$dir = dol_buildpath($reldir."core/modules/product".$valdir);
-        if (is_dir($dir))
-        {
-            $handle = opendir($dir);
-            if (is_resource($handle))
-            {
-                while (($file = readdir($handle)) !== false)
-                {
-                    $filelist[] = $file;
-                }
-                closedir($handle);
-                arsort($filelist);
+	foreach (array('', '/doc') as $valdir)
+	{
+		$dir = dol_buildpath($reldir."core/modules/product".$valdir);
+		if (is_dir($dir))
+		{
+			$handle = opendir($dir);
+			if (is_resource($handle))
+			{
+				while (($file = readdir($handle)) !== false)
+				{
+					$filelist[] = $file;
+				}
+				closedir($handle);
+				arsort($filelist);
 
-                foreach ($filelist as $file)
-                {
-                    if (preg_match('/\.modules\.php$/i', $file) && preg_match('/^(pdf_|doc_)/', $file))
-                    {
-                    	if (file_exists($dir.'/'.$file))
-                    	{
-                    		$name = substr($file, 4, dol_strlen($file) - 16);
-	                        $classname = substr($file, 0, dol_strlen($file) - 12);
+				foreach ($filelist as $file)
+				{
+					if (preg_match('/\.modules\.php$/i', $file) && preg_match('/^(pdf_|doc_)/', $file))
+					{
+						if (file_exists($dir.'/'.$file))
+						{
+							$name = substr($file, 4, dol_strlen($file) - 16);
+							$classname = substr($file, 0, dol_strlen($file) - 12);
 
-	                        require_once $dir.'/'.$file;
-	                        $module = new $classname($db);
+							require_once $dir.'/'.$file;
+							$module = new $classname($db);
 
-	                        $modulequalified = 1;
-	                        if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) $modulequalified = 0;
-	                        if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) $modulequalified = 0;
+							$modulequalified = 1;
+							if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) $modulequalified = 0;
+							if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) $modulequalified = 0;
 
-	                        if ($modulequalified)
-	                        {
-	                            print '<tr class="oddeven"><td width="100">';
-	                            print (empty($module->name) ? $name : $module->name);
-	                            print "</td><td>\n";
-	                            if (method_exists($module, 'info')) print $module->info($langs);
-	                            else print $module->description;
-	                            print '</td>';
+							if ($modulequalified)
+							{
+								print '<tr class="oddeven"><td width="100">';
+								print (empty($module->name) ? $name : $module->name);
+								print "</td><td>\n";
+								if (method_exists($module, 'info')) print $module->info($langs);
+								else print $module->description;
+								print '</td>';
 
-	                            // Active
-	                            if (in_array($name, $def))
-	                            {
-	                            	print '<td class="center">'."\n";
-	                            	print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&value='.$name.'">';
-	                            	print img_picto($langs->trans("Enabled"), 'switch_on');
-	                            	print '</a>';
-	                            	print '</td>';
-	                            } else {
-	                                print '<td class="center">'."\n";
-	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
-	                                print "</td>";
-	                            }
+								// Active
+								if (in_array($name, $def))
+								{
+									print '<td class="center">'."\n";
+									print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&value='.$name.'">';
+									print img_picto($langs->trans("Enabled"), 'switch_on');
+									print '</a>';
+									print '</td>';
+								} else {
+									print '<td class="center">'."\n";
+									print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+									print "</td>";
+								}
 
-	                            // Defaut
-	                            print '<td class="center">';
-	                            if ($conf->global->PRODUCT_ADDON_PDF == $name)
-	                            {
-	                                print img_picto($langs->trans("Default"), 'on');
-	                            } else {
-	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
-	                            }
-	                            print '</td>';
+								// Defaut
+								print '<td class="center">';
+								if ($conf->global->PRODUCT_ADDON_PDF == $name)
+								{
+									print img_picto($langs->trans("Default"), 'on');
+								} else {
+									print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+								}
+								print '</td>';
 
 								// Info
-		    					$htmltooltip = ''.$langs->trans("Name").': '.$module->name;
-					    		$htmltooltip .= '<br>'.$langs->trans("Type").': '.($module->type ? $module->type : $langs->trans("Unknown"));
-			                    if ($module->type == 'pdf')
-			                    {
-			                        $htmltooltip .= '<br>'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur;
-			                    }
-					    		$htmltooltip .= '<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
-					    		$htmltooltip .= '<br>'.$langs->trans("Logo").': '.yn($module->option_logo, 1, 1);
-					    		$htmltooltip .= '<br>'.$langs->trans("MultiLanguage").': '.yn($module->option_multilang, 1, 1);
+								$htmltooltip = ''.$langs->trans("Name").': '.$module->name;
+								$htmltooltip .= '<br>'.$langs->trans("Type").': '.($module->type ? $module->type : $langs->trans("Unknown"));
+								if ($module->type == 'pdf')
+								{
+									$htmltooltip .= '<br>'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur;
+								}
+								$htmltooltip .= '<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
+								$htmltooltip .= '<br>'.$langs->trans("Logo").': '.yn($module->option_logo, 1, 1);
+								$htmltooltip .= '<br>'.$langs->trans("MultiLanguage").': '.yn($module->option_multilang, 1, 1);
 
 
-	                            print '<td class="center">';
-	                            print $form->textwithpicto('', $htmltooltip, 1, 0);
-	                            print '</td>';
+								print '<td class="center">';
+								print $form->textwithpicto('', $htmltooltip, 1, 0);
+								print '</td>';
 
-	                            // Preview
-	                            print '<td class="center">';
-	                            if ($module->type == 'pdf')
-	                            {
-	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'contract').'</a>';
-	                            } else {
-	                                print img_object($langs->trans("PreviewNotAvailable"), 'generic');
-	                            }
-	                            print '</td>';
+								// Preview
+								print '<td class="center">';
+								if ($module->type == 'pdf')
+								{
+									print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'contract').'</a>';
+								} else {
+									print img_object($langs->trans("PreviewNotAvailable"), 'generic');
+								}
+								print '</td>';
 
-	                            print "</tr>\n";
-	                        }
-                    	}
-                    }
-                }
-            }
-        }
-    }
+								print "</tr>\n";
+							}
+						}
+					}
+				}
+			}
+		}
+	}
 }
 
 print '</table>';
@@ -545,7 +545,7 @@ $rowspan = 4;
 if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) $rowspan++;
 if (empty($conf->global->PRODUIT_USE_SEARCH_TO_SELECT)) $rowspan++;
 if (!empty($conf->global->MAIN_MULTILANGS)) $rowspan++;
-if (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || ! empty($conf->supplier_order->enabled) || ! empty($conf->supplier_invoice->enabled)) $rowspan++;
+if (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) $rowspan++;
 
 
 print '<tr class="oddeven">';
@@ -606,8 +606,8 @@ if (empty($conf->use_javascript_ajax))
 	$arrval = array(
 		'0'=>$langs->trans("No"),
 		'1'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch", 1).')',
-	    '2'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch", 2).')',
-	    '3'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch", 3).')',
+		'2'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch", 2).')',
+		'3'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch", 3).')',
 	);
 	print $form->selectarray("activate_usesearchtoselectproduct", $arrval, $conf->global->PRODUIT_USE_SEARCH_TO_SELECT);
 	print '</td>';
@@ -663,14 +663,14 @@ if (!empty($conf->global->MAIN_MULTILANGS))
 	print '</tr>';
 }
 
-if (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || ! empty($conf->supplier_order->enabled) || ! empty($conf->supplier_invoice->enabled))
+if (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled))
 {
-    print '<tr class="oddeven">';
-    print '<td>'.$langs->trans("UseProductFournDesc").'</td>';
-    print '<td class="right">';
-    print $form->selectyesno("activate_useProdFournDesc", (!empty($conf->global->PRODUIT_FOURN_TEXTS) ? $conf->global->PRODUIT_FOURN_TEXTS : 0), 1);
-    print '</td>';
-    print '</tr>';
+	print '<tr class="oddeven">';
+	print '<td>'.$langs->trans("UseProductFournDesc").'</td>';
+	print '<td class="right">';
+	print $form->selectyesno("activate_useProdFournDesc", (!empty($conf->global->PRODUIT_FOURN_TEXTS) ? $conf->global->PRODUIT_FOURN_TEXTS : 0), 1);
+	print '</td>';
+	print '</tr>';
 
 	print '<tr class="oddeven">';
 	print '<td>'.$langs->trans("UseProductSupplierPackaging").'</td>';
@@ -696,46 +696,46 @@ if (!empty($conf->global->PRODUCT_CANVAS_ABILITY))
 		require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 
 		$handle = opendir($dir);
-        if (is_resource($handle))
-        {
-    		while (($file = readdir($handle)) !== false)
-    		{
-    			if (file_exists($dir.$file.'/product.'.$file.'.class.php'))
-    			{
-    				$classfile = $dir.$file.'/product.'.$file.'.class.php';
-    				$classname = 'Product'.ucfirst($file);
+		if (is_resource($handle))
+		{
+			while (($file = readdir($handle)) !== false)
+			{
+				if (file_exists($dir.$file.'/product.'.$file.'.class.php'))
+				{
+					$classfile = $dir.$file.'/product.'.$file.'.class.php';
+					$classname = 'Product'.ucfirst($file);
 
-    				require_once $classfile;
-    				$object = new $classname();
+					require_once $classfile;
+					$object = new $classname();
 
-    				$module = $object->module;
+					$module = $object->module;
 
-    				if ($conf->$module->enabled)
-    				{
-    					print '<tr class="oddeven"><td>';
+					if ($conf->$module->enabled)
+					{
+						print '<tr class="oddeven"><td>';
 
-    					print $object->description;
+						print $object->description;
 
-    					print '</td><td class="right">';
+						print '</td><td class="right">';
 
-    					$const = "PRODUCT_SPECIAL_".strtoupper($file);
+						$const = "PRODUCT_SPECIAL_".strtoupper($file);
 
-    					if ($conf->global->$const)
-    					{
-    						print img_picto($langs->trans("Active"), 'tick');
-    						print '</td><td class="right">';
-    						print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;token='.newToken().'&amp;spe='.urlencode($file).'&amp;value=0">'.$langs->trans("Disable").'</a>';
-    					} else {
-    						print '&nbsp;</td><td class="right">';
-    						print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;token='.newToken().'&amp;spe='.urlencode($file).'&amp;value=1">'.$langs->trans("Activate").'</a>';
-    					}
+						if ($conf->global->$const)
+						{
+							print img_picto($langs->trans("Active"), 'tick');
+							print '</td><td class="right">';
+							print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;token='.newToken().'&amp;spe='.urlencode($file).'&amp;value=0">'.$langs->trans("Disable").'</a>';
+						} else {
+							print '&nbsp;</td><td class="right">';
+							print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;token='.newToken().'&amp;spe='.urlencode($file).'&amp;value=1">'.$langs->trans("Activate").'</a>';
+						}
 
-    					print '</td></tr>';
-    				}
-    			}
-    		}
-		    closedir($handle);
-        }
+						print '</td></tr>';
+					}
+				}
+			}
+			closedir($handle);
+		}
 	} else {
 		setEventMessages($dir.' '.$langs->trans("IsNotADir"), null, 'errors');
 	}
diff --git a/htdocs/product/admin/product_extrafields.php b/htdocs/product/admin/product_extrafields.php
index 7fea54159ae..d82d175a9a7 100644
--- a/htdocs/product/admin/product_extrafields.php
+++ b/htdocs/product/admin/product_extrafields.php
@@ -86,15 +86,15 @@ print dol_get_fiche_head($head, 'attributes', $textobject, -1, 'product');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_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>";
 }
 
 
@@ -109,7 +109,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';
 }
 
 /* ************************************************************************** */
@@ -119,10 +119,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/product/admin/product_lot_extrafields.php b/htdocs/product/admin/product_lot_extrafields.php
index 9f8dd0e0304..e89e5741cce 100644
--- a/htdocs/product/admin/product_lot_extrafields.php
+++ b/htdocs/product/admin/product_lot_extrafields.php
@@ -77,15 +77,15 @@ print dol_get_fiche_head($head, 'attributes', $textobject, -1, 'stock');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_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,7 +100,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';
 }
 
 /* ************************************************************************** */
@@ -110,10 +110,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/product/admin/product_supplier_extrafields.php b/htdocs/product/admin/product_supplier_extrafields.php
index 305a58de440..54d56ad9dd5 100644
--- a/htdocs/product/admin/product_supplier_extrafields.php
+++ b/htdocs/product/admin/product_supplier_extrafields.php
@@ -87,15 +87,15 @@ print dol_get_fiche_head($head, 'supplierAttributes', $textobject, -1, 'product'
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_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>";
 }
 
 
@@ -110,7 +110,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';
 }
 
 /* ************************************************************************** */
@@ -120,10 +120,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/product/admin/product_tools.php b/htdocs/product/admin/product_tools.php
index 592dd89baaa..3bf85bdff4f 100644
--- a/htdocs/product/admin/product_tools.php
+++ b/htdocs/product/admin/product_tools.php
@@ -168,7 +168,7 @@ if ($action == 'convert')
 						if ($ret < 0 || $retm < 0) $error++;
 						else $nbrecordsmodified++;
 					}
-                    unset($objectstatic);
+					unset($objectstatic);
 
 					$i++;
 				}
diff --git a/htdocs/product/admin/stock_extrafields.php b/htdocs/product/admin/stock_extrafields.php
index 5ed2f860071..9b5a0f23f07 100644
--- a/htdocs/product/admin/stock_extrafields.php
+++ b/htdocs/product/admin/stock_extrafields.php
@@ -72,15 +72,15 @@ print dol_get_fiche_head($head, 'attributes', $langs->trans("StockSetup"), -1, '
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_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>";
 }
 
 
@@ -92,10 +92,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';
 }
 
 /* ************************************************************************** */
@@ -105,10 +105,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/product/agenda.php b/htdocs/product/agenda.php
index 421af35ca4c..8a7ddf385d9 100644
--- a/htdocs/product/agenda.php
+++ b/htdocs/product/agenda.php
@@ -38,10 +38,10 @@ $langs->load("companies");
 
 if (GETPOST('actioncode', 'array'))
 {
-    $actioncode = GETPOST('actioncode', 'array', 3);
-    if (!count($actioncode)) $actioncode = '0';
+	$actioncode = GETPOST('actioncode', 'array', 3);
+	if (!count($actioncode)) $actioncode = '0';
 } else {
-    $actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT));
+	$actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT));
 }
 $search_agenda_label = GETPOST('search_agenda_label');
 
@@ -76,19 +76,19 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 
 if (empty($reshook))
 {
-    // Cancel
-    if (GETPOST('cancel', 'alpha') && !empty($backtopage))
-    {
-        header("Location: ".$backtopage);
-        exit;
-    }
+	// Cancel
+	if (GETPOST('cancel', 'alpha') && !empty($backtopage))
+	{
+		header("Location: ".$backtopage);
+		exit;
+	}
 
-    // Purge search criteria
-    if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
-    {
-        $actioncode = '';
-        $search_agenda_label = '';
-    }
+	// Purge search criteria
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
+	{
+		$actioncode = '';
+		$search_agenda_label = '';
+	}
 }
 
 
@@ -126,42 +126,42 @@ if ($id > 0 || $ref)
 	$picto = ($object->type == Product::TYPE_SERVICE ? 'service' : 'product');
 	print dol_get_fiche_head($head, 'agenda', $titre, -1, $picto);
 
-    $linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
-    $object->next_prev_filter = " fk_product_type = ".$object->type;
+	$linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+	$object->next_prev_filter = " fk_product_type = ".$object->type;
 
-    $shownav = 1;
-    if ($user->socid && !in_array('product', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav = 0;
+	$shownav = 1;
+	if ($user->socid && !in_array('product', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav = 0;
 
-    dol_banner_tab($object, 'ref', $linkback, $shownav, 'ref');
+	dol_banner_tab($object, 'ref', $linkback, $shownav, 'ref');
 
-    print '<div class="fichecenter">';
+	print '<div class="fichecenter">';
 
-    print '<div class="underbanner clearboth"></div>';
+	print '<div class="underbanner clearboth"></div>';
 
-    $object->info($object->id);
+	$object->info($object->id);
 	dol_print_object_info($object, 1);
 
 	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 
 
 	// Actions buttons
 
-    $objproduct = $object;
-    $objcon = new stdClass();
+	$objproduct = $object;
+	$objcon = new stdClass();
 
-    $out = '';
-    $permok = $user->rights->agenda->myactions->create;
-    if ((!empty($objproduct->id) || !empty($objcon->id)) && $permok)
-    {
-        //$out.='<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create';
-        if (get_class($objproduct) == 'Product') $out .= '&amp;prodid='.$objproduct->id.'&origin=product&originid='.$id;
-        $out .= (!empty($objcon->id) ? '&amp;contactid='.$objcon->id : '').'&amp;backtopage=1&amp;percentage=-1';
-    	//$out.=$langs->trans("AddAnAction").' ';
-    	//$out.=img_picto($langs->trans("AddAnAction"),'filenew');
-    	//$out.="</a>";
+	$out = '';
+	$permok = $user->rights->agenda->myactions->create;
+	if ((!empty($objproduct->id) || !empty($objcon->id)) && $permok)
+	{
+		//$out.='<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create';
+		if (get_class($objproduct) == 'Product') $out .= '&amp;prodid='.$objproduct->id.'&origin=product&originid='.$id;
+		$out .= (!empty($objcon->id) ? '&amp;contactid='.$objcon->id : '').'&amp;backtopage=1&amp;percentage=-1';
+		//$out.=$langs->trans("AddAnAction").' ';
+		//$out.=img_picto($langs->trans("AddAnAction"),'filenew');
+		//$out.="</a>";
 	}
 
 
@@ -170,29 +170,29 @@ if ($id > 0 || $ref)
 
 
 	$morehtmlcenter = '';
-    if (!empty($conf->agenda->enabled))
-    {
-        $linktocreatetimeBtnStatus = !empty($user->rights->agenda->myactions->create) || !empty($user->rights->agenda->allactions->create);
-        $morehtmlcenter = dolGetButtonTitle($langs->trans('AddAction'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/comm/action/card.php?action=create'.$out, '', $linktocreatetimeBtnStatus);
-    }
+	if (!empty($conf->agenda->enabled))
+	{
+		$linktocreatetimeBtnStatus = !empty($user->rights->agenda->myactions->create) || !empty($user->rights->agenda->allactions->create);
+		$morehtmlcenter = dolGetButtonTitle($langs->trans('AddAction'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/comm/action/card.php?action=create'.$out, '', $linktocreatetimeBtnStatus);
+	}
 
-    if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read)))
-    {
-    	print '<br>';
+	if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read)))
+	{
+		print '<br>';
 
-        $param = '&id='.$id;
-        if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
-        if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
+		$param = '&id='.$id;
+		if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
+		if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
 
 		print_barre_liste($langs->trans("ActionsOnProduct"), 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', 0, -1, '', 0, $morehtmlcenter, '', 0, 1, 1);
 
-        // List of all actions
+		// List of all actions
 		$filters = array();
-        $filters['search_agenda_label'] = $search_agenda_label;
+		$filters['search_agenda_label'] = $search_agenda_label;
 
-        // TODO Replace this with same code than into list.php
-        show_actions_done($conf, $langs, $db, $object, null, 0, $actioncode, '', $filters, $sortfield, $sortorder);
-    }
+		// TODO Replace this with same code than into list.php
+		show_actions_done($conf, $langs, $db, $object, null, 0, $actioncode, '', $filters, $sortfield, $sortorder);
+	}
 }
 
 // End of page
diff --git a/htdocs/product/ajax/products.php b/htdocs/product/ajax/products.php
index 7441d88abc0..16ac2a6b098 100644
--- a/htdocs/product/ajax/products.php
+++ b/htdocs/product/ajax/products.php
@@ -172,7 +172,7 @@ if (!empty($action) && $action == 'fetch' && !empty($id))
 	if (empty($htmlname))
 	{
 		print json_encode(array());
-	    return;
+		return;
 	}
 
 	$match = preg_grep('/('.$htmlname.'[0-9]+)/', array_keys($_GET));
@@ -183,7 +183,7 @@ if (!empty($action) && $action == 'fetch' && !empty($id))
 	if (GETPOST($htmlname, 'alpha') == '' && (!$idprod || !GETPOST($idprod, 'alpha')))
 	{
 		print json_encode(array());
-	    return;
+		return;
 	}
 
 	// When used from jQuery, the search term is added as GET param "term".
diff --git a/htdocs/product/canvas/product/actions_card_product.class.php b/htdocs/product/canvas/product/actions_card_product.class.php
index 85cd3464c1f..e7e3c7ea4b3 100644
--- a/htdocs/product/canvas/product/actions_card_product.class.php
+++ b/htdocs/product/canvas/product/actions_card_product.class.php
@@ -28,43 +28,43 @@ include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
  */
 class ActionsCardProduct
 {
-    public $targetmodule;
-    public $canvas;
-    public $card;
+	public $targetmodule;
+	public $canvas;
+	public $card;
 
-    //! Template container
+	//! Template container
 	public $tpl = array();
 
 	// List of fiels for action=list
 	public $field_list = array();
-    public $list_datas = array();
+	public $list_datas = array();
 
 
-    /**
-     *    Constructor
-     *
-     *    @param	DoliDB	$db             Database handler
-     *    @param	string	$dirmodule		Name of directory of module
-     *    @param	string	$targetmodule	Name of directory where canvas is stored
-     *    @param	string	$canvas         Name of canvas
-     *    @param	string	$card           Name of tab (sub-canvas)
-     */
-    public function __construct($db, $dirmodule, $targetmodule, $canvas, $card)
-    {
-        $this->db               = $db;
-        $this->dirmodule = $dirmodule;
-        $this->targetmodule     = $targetmodule;
-        $this->canvas           = $canvas;
-        $this->card             = $card;
+	/**
+	 *    Constructor
+	 *
+	 *    @param	DoliDB	$db             Database handler
+	 *    @param	string	$dirmodule		Name of directory of module
+	 *    @param	string	$targetmodule	Name of directory where canvas is stored
+	 *    @param	string	$canvas         Name of canvas
+	 *    @param	string	$card           Name of tab (sub-canvas)
+	 */
+	public function __construct($db, $dirmodule, $targetmodule, $canvas, $card)
+	{
+		$this->db               = $db;
+		$this->dirmodule = $dirmodule;
+		$this->targetmodule     = $targetmodule;
+		$this->canvas           = $canvas;
+		$this->card             = $card;
 
-        $this->name = "product";
+		$this->name = "product";
 		$this->definition = "Product canvas (défaut)";
 		$this->fieldListName    = "product_default";
 		$this->next_prev_filter = "canvas='product'";
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *    Assign custom values for canvas (for example into this->tpl to be used by templates)
 	 *
@@ -73,26 +73,26 @@ class ActionsCardProduct
 	 *    @param	string	$ref		Ref of object
 	 *    @return	void
 	 */
-    public function assign_values(&$action, $id = 0, $ref = '')
+	public function assign_values(&$action, $id = 0, $ref = '')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $limit, $offset, $sortfield, $sortorder;
-        global $conf, $langs, $user, $mysoc, $canvas;
+		global $conf, $langs, $user, $mysoc, $canvas;
 		global $form, $formproduct;
 
    		$tmpobject = new Product($this->db);
    		if (!empty($id) || !empty($ref)) $tmpobject->fetch($id, $ref);
-        $this->object = $tmpobject;
+		$this->object = $tmpobject;
 
 		//parent::assign_values($action);
 
-        foreach ($this->object as $key => $value) {
-            $this->tpl[$key] = $value;
-        }
+		foreach ($this->object as $key => $value) {
+			$this->tpl[$key] = $value;
+		}
 
-        $this->tpl['error'] = get_htmloutput_errors($this->object->error, $this->object->errors);
+		$this->tpl['error'] = get_htmloutput_errors($this->object->error, $this->object->errors);
 
-        // canvas
+		// canvas
 		$this->tpl['canvas'] = $this->canvas;
 
 		// id
@@ -126,16 +126,16 @@ class ActionsCardProduct
 
 		if ($action == 'view')
 		{
-            $head = product_prepare_head($this->object);
+			$head = product_prepare_head($this->object);
 
-            $this->tpl['showrefnav'] = $form->showrefnav($this->object, 'ref', '', 1, 'ref');
+			$this->tpl['showrefnav'] = $form->showrefnav($this->object, 'ref', '', 1, 'ref');
 
-    		$titre = $langs->trans("CardProduct".$this->object->type);
-    		$picto = ($this->object->type == Product::TYPE_SERVICE ? 'service' : 'product');
-    		$this->tpl['showhead'] = dol_get_fiche_head($head, 'card', $titre, 0, $picto);
-            $this->tpl['showend'] = dol_get_fiche_end();
+			$titre = $langs->trans("CardProduct".$this->object->type);
+			$picto = ($this->object->type == Product::TYPE_SERVICE ? 'service' : 'product');
+			$this->tpl['showhead'] = dol_get_fiche_head($head, 'card', $titre, 0, $picto);
+			$this->tpl['showend'] = dol_get_fiche_end();
 
-            // Accountancy buy code
+			// Accountancy buy code
 			$this->tpl['accountancyBuyCodeKey'] = $form->editfieldkey("ProductAccountancyBuyCode", 'productaccountancycodesell', $this->accountancy_code_sell, $this, $user->rights->produit->creer);
 			$this->tpl['accountancyBuyCodeVal'] = $form->editfieldval("ProductAccountancyBuyCode", 'productaccountancycodesell', $this->accountancy_code_sell, $this, $user->rights->produit->creer);
 
@@ -165,17 +165,17 @@ class ActionsCardProduct
 
 		if ($action == 'create' || $action == 'edit')
 		{
-    		// Status
-    		$statutarray = array('1' => $langs->trans("OnSell"), '0' => $langs->trans("NotOnSell"));
-    		$this->tpl['status'] = $form->selectarray('statut', $statutarray, $this->object->status);
+			// Status
+			$statutarray = array('1' => $langs->trans("OnSell"), '0' => $langs->trans("NotOnSell"));
+			$this->tpl['status'] = $form->selectarray('statut', $statutarray, $this->object->status);
 
-    		$statutarray = array('1' => $langs->trans("ProductStatusOnBuy"), '0' => $langs->trans("ProductStatusNotOnBuy"));
-    		$this->tpl['status_buy'] = $form->selectarray('statut_buy', $statutarray, $this->object->status_buy);
+			$statutarray = array('1' => $langs->trans("ProductStatusOnBuy"), '0' => $langs->trans("ProductStatusNotOnBuy"));
+			$this->tpl['status_buy'] = $form->selectarray('statut_buy', $statutarray, $this->object->status_buy);
 
-    		$this->tpl['description'] = $this->description;
-    		$this->tpl['note'] = $this->note;
+			$this->tpl['description'] = $this->description;
+			$this->tpl['note'] = $this->note;
 
-		    // Finished
+			// Finished
 			$statutarray = array('1' => $langs->trans("Finished"), '0' => $langs->trans("RowMaterial"));
 			$this->tpl['finished'] = $form->selectarray('finished', $statutarray, $this->object->finished);
 
@@ -198,7 +198,7 @@ class ActionsCardProduct
 
 		if ($action == 'view')
 		{
-    		// Photo
+			// Photo
 			$this->tpl['nblines'] = 4;
 			if ($this->object->is_photo_available($conf->product->multidir_output[$this->object->entity]))
 			{
@@ -232,12 +232,12 @@ class ActionsCardProduct
 				$this->tpl['volume'] = $this->object->volume." ".measuringUnitString(0, "volume", $this->object->volume_units);
 			}
 
-    		$this->tpl['fiche_end'] = dol_get_fiche_end();
+			$this->tpl['fiche_end'] = dol_get_fiche_end();
 		}
 
 		if ($action == 'list')
 		{
-	        $this->LoadListDatas($limit, $offset, $sortfield, $sortorder);
+			$this->LoadListDatas($limit, $offset, $sortfield, $sortorder);
 		}
 	}
 
@@ -293,7 +293,7 @@ class ActionsCardProduct
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * 	Fetch datas list and save into ->list_datas
 	 *
@@ -303,17 +303,17 @@ class ActionsCardProduct
 	 *  @param	string	$sortorder	Sort order ('ASC' or 'DESC')
 	 *  @return	void
 	 */
-    public function LoadListDatas($limit, $offset, $sortfield, $sortorder)
+	public function LoadListDatas($limit, $offset, $sortfield, $sortorder)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $langs;
 
-        $this->getFieldList();
+		$this->getFieldList();
 
-        $this->list_datas = array();
+		$this->list_datas = array();
 
 		// Clean parameters
-        $sall = trim((GETPOST('search_all', 'alphanohtml') != '') ?GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
+		$sall = trim((GETPOST('search_all', 'alphanohtml') != '') ?GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
 
 		foreach ($this->field_list as $field)
 		{
diff --git a/htdocs/product/canvas/service/actions_card_service.class.php b/htdocs/product/canvas/service/actions_card_service.class.php
index 0518cfed475..48f924bbb46 100644
--- a/htdocs/product/canvas/service/actions_card_service.class.php
+++ b/htdocs/product/canvas/service/actions_card_service.class.php
@@ -28,32 +28,32 @@ include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
  */
 class ActionsCardService
 {
-    public $targetmodule;
-    public $canvas;
-    public $card;
+	public $targetmodule;
+	public $canvas;
+	public $card;
 
-    //! Template container
+	//! Template container
 	public $tpl = array();
 
 	// List of fiels for action=list
 	public $field_list = array();
-    public $list_datas = array();
+	public $list_datas = array();
 
 
 	/**
 	 *    Constructor
 	 *
-     *    @param   DoliDB	$db             Handler acces base de donnees
-     *    @param   string	$targetmodule   Name of directory of module where canvas is stored
-     *    @param   string	$canvas         Name of canvas
-     *    @param   string	$card           Name of tab (sub-canvas)
+	 *    @param   DoliDB	$db             Handler acces base de donnees
+	 *    @param   string	$targetmodule   Name of directory of module where canvas is stored
+	 *    @param   string	$canvas         Name of canvas
+	 *    @param   string	$card           Name of tab (sub-canvas)
 	 */
 	public function __construct($db, $targetmodule, $canvas, $card)
 	{
 		$this->db = $db;
 		$this->targetmodule = $targetmodule;
-        $this->canvas           = $canvas;
-        $this->card             = $card;
+		$this->canvas           = $canvas;
+		$this->card             = $card;
 
 		$this->module = "service";
 		$this->name = "service";
@@ -63,8 +63,8 @@ class ActionsCardService
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
 	 *    Assign custom values for canvas (for example into this->tpl to be used by templates)
 	 *
 	 *    @param	string	$action    Type of action
@@ -74,23 +74,23 @@ class ActionsCardService
 	 */
 	public function assign_values(&$action, $id = 0, $ref = '')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $limit, $offset, $sortfield, $sortorder;
-        global $conf, $langs, $user, $mysoc, $canvas;
+		global $conf, $langs, $user, $mysoc, $canvas;
 		global $form, $formproduct;
 
    		$tmpobject = new Product($this->db);
    		if (!empty($id) || !empty($ref)) $tmpobject->fetch($id, $ref);
-        $this->object = $tmpobject;
+		$this->object = $tmpobject;
 
 		//parent::assign_values($action);
 
-	    foreach ($this->object as $key => $value)
-        {
-            $this->tpl[$key] = $value;
-        }
+		foreach ($this->object as $key => $value)
+		{
+			$this->tpl[$key] = $value;
+		}
 
-        $this->tpl['error'] = get_htmloutput_errors($this->object->error, $this->object->errors);
+		$this->tpl['error'] = get_htmloutput_errors($this->object->error, $this->object->errors);
 
 		// canvas
 		$this->tpl['canvas'] = $this->canvas;
@@ -126,14 +126,14 @@ class ActionsCardService
 
 		if ($action == 'view')
 		{
-            $head = product_prepare_head($this->object);
+			$head = product_prepare_head($this->object);
 
-            $this->tpl['showrefnav'] = $form->showrefnav($this->object, 'ref', '', 1, 'ref');
+			$this->tpl['showrefnav'] = $form->showrefnav($this->object, 'ref', '', 1, 'ref');
 
-    		$titre = $langs->trans("CardProduct".$this->object->type);
-    		$picto = ($this->object->type == Product::TYPE_SERVICE ? 'service' : 'product');
-    		$this->tpl['showhead'] = dol_get_fiche_head($head, 'card', $titre, 0, $picto);
-            $this->tpl['showend'] = dol_get_fiche_end();
+			$titre = $langs->trans("CardProduct".$this->object->type);
+			$picto = ($this->object->type == Product::TYPE_SERVICE ? 'service' : 'product');
+			$this->tpl['showhead'] = dol_get_fiche_head($head, 'card', $titre, 0, $picto);
+			$this->tpl['showend'] = dol_get_fiche_end();
 
 			// Accountancy buy code
 			$this->tpl['accountancyBuyCodeKey'] = $form->editfieldkey("ProductAccountancyBuyCode", 'productaccountancycodesell', $this->accountancy_code_sell, $this, $user->rights->produit->creer);
@@ -168,17 +168,17 @@ class ActionsCardService
 
 		if ($action == 'create' || $action == 'edit')
 		{
-    		// Status
-    		$statutarray = array('1' => $langs->trans("OnSell"), '0' => $langs->trans("NotOnSell"));
-    		$this->tpl['status'] = $form->selectarray('statut', $statutarray, $this->object->status);
+			// Status
+			$statutarray = array('1' => $langs->trans("OnSell"), '0' => $langs->trans("NotOnSell"));
+			$this->tpl['status'] = $form->selectarray('statut', $statutarray, $this->object->status);
 
-    		$statutarray = array('1' => $langs->trans("ProductStatusOnBuy"), '0' => $langs->trans("ProductStatusNotOnBuy"));
-    		$this->tpl['status_buy'] = $form->selectarray('statut_buy', $statutarray, $this->object->status_buy);
+			$statutarray = array('1' => $langs->trans("ProductStatusOnBuy"), '0' => $langs->trans("ProductStatusNotOnBuy"));
+			$this->tpl['status_buy'] = $form->selectarray('statut_buy', $statutarray, $this->object->status_buy);
 
-    		$this->tpl['description'] = $this->description;
-    		$this->tpl['note'] = $this->note;
+			$this->tpl['description'] = $this->description;
+			$this->tpl['note'] = $this->note;
 
-		    // Duration unit
+			// Duration unit
 			// TODO creer fonction
 			$duration_unit = '<input name="duration_unit" type="radio" value="h"'.($this->object->duration_unit == 'h' ? ' checked' : '').'>'.$langs->trans("Hour");
 			$duration_unit .= '&nbsp; ';
@@ -194,7 +194,7 @@ class ActionsCardService
 
 		if ($action == 'view')
 		{
-		    // Photo
+			// Photo
 			$this->tpl['nblines'] = 4;
 			if ($this->object->is_photo_available($conf->service->multidir_output[$this->object->entity]))
 			{
@@ -216,7 +216,7 @@ class ActionsCardService
 
 		if ($action == 'list')
 		{
-	        $this->LoadListDatas($limit, $offset, $sortfield, $sortorder);
+			$this->LoadListDatas($limit, $offset, $sortfield, $sortorder);
 		}
 	}
 
@@ -230,7 +230,7 @@ class ActionsCardService
 	{
 		global $conf, $langs;
 
-        $this->field_list = array();
+		$this->field_list = array();
 
 		$sql = "SELECT rowid, name, alias, title, align, sort, search, visible, enabled, rang";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_field_list";
@@ -271,7 +271,7 @@ class ActionsCardService
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * 	Fetch datas list and save into ->list_datas
 	 *
@@ -283,11 +283,11 @@ class ActionsCardService
 	 */
 	public function LoadListDatas($limit, $offset, $sortfield, $sortorder)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 		global $search_categ, $sall, $sref, $search_barcode, $snom, $catid;
 
-        $this->getFieldList();
+		$this->getFieldList();
 
 		$sql = 'SELECT DISTINCT p.rowid, p.ref, p.label, p.barcode, p.price, p.price_ttc, p.price_base_type,';
 		$sql .= ' p.fk_product_type, p.tms as datem,';
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 43b4eede555..04933018410 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -321,7 +321,7 @@ if (empty($reshook))
 			$object->surface_units      	 = GETPOST('surface_units'); // This is not the fk_unit but the power of unit
 			$object->volume             	 = GETPOST('volume');
 			$object->volume_units       	 = GETPOST('volume_units'); // This is not the fk_unit but the power of unit
-			$finished               = GETPOST('finished', 'int');
+			$finished = GETPOST('finished', 'int');
 			if ($finished > 0) {
 				$object->finished = $finished;
 			} else {
@@ -447,7 +447,7 @@ if (empty($reshook))
 				$object->volume                 = GETPOST('volume');
 				$object->volume_units           = GETPOST('volume_units'); // This is not the fk_unit but the power of unit
 
-				$finished               = GETPOST('finished', 'int');
+				$finished = GETPOST('finished', 'int');
 				if ($finished >= 0) {
 					$object->finished = $finished;
 				} else {
@@ -1386,7 +1386,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		}
 		print '</table>';
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 		print '<div class="center">';
 		print '<input type="submit" class="button" value="'.$langs->trans("Create").'">';
@@ -1771,7 +1771,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 			}
 			print '</table>';
 
-			dol_fiche_end();
+			print dol_get_fiche_end();
 
 			print '<div class="center">';
 			print '<input type="submit" class="button" value="'.$langs->trans("Save").'">';
@@ -2169,7 +2169,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 			print '</div></div>';
 			print '<div style="clear:both"></div>';
 
-			dol_fiche_end();
+			print dol_get_fiche_end();
 		}
 	} elseif ($action != 'create')
 	{
@@ -2192,7 +2192,7 @@ if ($result > 0)
 $tmpcode = '';
 if (!empty($modCodeProduct->code_auto)) $tmpcode = $modCodeProduct->getNextValue($object, $object->type);
 
-$formconfirm='';
+$formconfirm = '';
 
 // Confirm delete product
 if (($action == 'delete' && (empty($conf->use_javascript_ajax) || !empty($conf->dol_use_jmobile)))	// Output when action = clone if jmobile or no js
@@ -2220,7 +2220,7 @@ if (($action == 'clone' && (empty($conf->use_javascript_ajax) || !empty($conf->d
 		$formquestionclone[] = array('type' => 'checkbox', 'name' => 'clone_composition', 'label' => $langs->trans('CloneCompositionProduct'), 'value' => 1);
 	}
 
-	$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToClone'), $langs->trans('ConfirmCloneProduct', $object->ref), 'confirm_clone', $formquestionclone, 'yes', 'action-clone', 350, 600);
+	$formconfirm .= $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToClone'), $langs->trans('ConfirmCloneProduct', $object->ref), 'confirm_clone', $formquestionclone, 'yes', 'action-clone', 350, 600);
 }
 
 // Call Hook formConfirm
@@ -2384,7 +2384,7 @@ if (!empty($conf->global->PRODUCT_ADD_FORM_ADD_TO) && $object->id && ($action ==
 		print '<input type="submit" class="button" value="'.$langs->trans("Add").'">';
 		print '</div>';
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 		print '</form>';
 	}
diff --git a/htdocs/product/class/api_products.class.php b/htdocs/product/class/api_products.class.php
index 6c75d96fe89..f7406692f8d 100644
--- a/htdocs/product/class/api_products.class.php
+++ b/htdocs/product/class/api_products.class.php
@@ -34,1820 +34,1820 @@ require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductCombination2ValuePair.cla
  */
 class Products extends DolibarrApi
 {
-    /**
-     * @var array   $FIELDS     Mandatory fields, checked when create and update object
-     */
-    static $FIELDS = array(
-        'ref',
-        'label'
-    );
-
-    /**
-     * @var Product $product {@type Product}
-     */
-    public $product;
-
-    /**
-     * @var ProductFournisseur $productsupplier {@type ProductFournisseur}
-     */
-    public $productsupplier;
-
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-        global $db, $conf;
-
-        $this->db = $db;
-        $this->product = new Product($this->db);
-        $this->productsupplier = new ProductFournisseur($this->db);
-    }
-
-    /**
-     * Get properties of a product object by id
-     *
-     * Return an array with product information.
-     *
-     * @param  int    $id                  ID of product
-     * @param  int    $includestockdata    Load also information about stock (slower)
-     * @param  bool   $includesubproducts  Load information about subproducts
-	 * @param  bool   $includeparentid     Load also ID of parent product (if product is a variant of a parent product)
-     * @return array|mixed                 Data without useless information
-     *
-     * @throws RestException 401
-     * @throws RestException 403
-     * @throws RestException 404
-     */
-    public function get($id, $includestockdata = 0, $includesubproducts = false, $includeparentid = false)
-    {
-        return $this->_fetch($id, '', '', '', $includestockdata, $includesubproducts, $includeparentid);
-    }
-
-    /**
-     * Get properties of a product object by ref
-     *
-     * Return an array with product information.
-     *
-     * @param  string $ref                Ref of element
-     * @param  int    $includestockdata   Load also information about stock (slower)
-     * @param  bool   $includesubproducts Load information about subproducts
-	 * @param  bool   $includeparentid    Load also ID of parent product (if product is a variant of a parent product)
-     *
-     * @return array|mixed                 Data without useless information
-     *
-     * @url GET ref/{ref}
-     *
-     * @throws RestException 401
-     * @throws RestException 403
-     * @throws RestException 404
-     */
-    public function getByRef($ref, $includestockdata = 0, $includesubproducts = false, $includeparentid = false)
-    {
-        return $this->_fetch('', $ref, '', '', $includestockdata, $includesubproducts, $includeparentid);
-    }
-
-    /**
-     * Get properties of a product object by ref_ext
-     *
-     * Return an array with product information.
-     *
-     * @param  string $ref_ext            Ref_ext of element
-     * @param  int    $includestockdata   Load also information about stock (slower)
-     * @param  bool   $includesubproducts Load information about subproducts
-	 * @param  bool   $includeparentid    Load also ID of parent product (if product is a variant of a parent product)
-     *
-     * @return array|mixed Data without useless information
-     *
-     * @url GET ref_ext/{ref_ext}
-     *
-     * @throws RestException 401
-     * @throws RestException 403
-     * @throws RestException 404
-     */
-    public function getByRefExt($ref_ext, $includestockdata = 0, $includesubproducts = false, $includeparentid = false)
-    {
-        return $this->_fetch('', '', $ref_ext, '', $includestockdata, $includesubproducts, $includeparentid);
-    }
-
-    /**
-     * Get properties of a product object by barcode
-     *
-     * Return an array with product information.
-     *
-     * @param  string $barcode            Barcode of element
-     * @param  int    $includestockdata   Load also information about stock (slower)
-     * @param  bool   $includesubproducts Load information about subproducts
-	 * @param  bool   $includeparentid    Load also ID of parent product (if product is a variant of a parent product)
-     *
-     * @return array|mixed Data without useless information
-     *
-     * @url GET barcode/{barcode}
-     *
-     * @throws RestException 401
-     * @throws RestException 403
-     * @throws RestException 404
-     */
-    public function getByBarcode($barcode, $includestockdata = 0, $includesubproducts = false, $includeparentid = false)
-    {
-        return $this->_fetch('', '', '', $barcode, $includestockdata, $includesubproducts, $includeparentid);
-    }
-
-    /**
-     * List products
-     *
-     * Get a list of products
-     *
-     * @param  string $sortfield  Sort field
-     * @param  string $sortorder  Sort order
-     * @param  int    $limit      Limit for list
-     * @param  int    $page       Page number
-     * @param  int    $mode       Use this param to filter list (0 for all, 1 for only product, 2 for only service)
-     * @param  int    $category   Use this param to filter list by category
-     * @param  string $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.tobuy:=:0) and (t.tosell:=:1)"
-     * @return array                Array of product objects
-     */
-    public function index($sortfield = "t.ref", $sortorder = 'ASC', $limit = 100, $page = 0, $mode = 0, $category = 0, $sqlfilters = '')
-    {
-        global $db, $conf;
-
-        $obj_ret = array();
-
-        $socid = DolibarrApiAccess::$user->socid ? DolibarrApiAccess::$user->socid : '';
-
-        $sql = "SELECT t.rowid, t.ref, t.ref_ext";
-        $sql .= " FROM ".MAIN_DB_PREFIX."product as t";
-        if ($category > 0) {
-            $sql .= ", ".MAIN_DB_PREFIX."categorie_product as c";
-        }
-        $sql .= ' WHERE t.entity IN ('.getEntity('product').')';
-        // Select products of given category
-        if ($category > 0) {
-        	$sql .= " AND c.fk_categorie = ".$this->db->escape($category);
-            $sql .= " AND c.fk_product = t.rowid ";
-        }
-        if ($mode == 1) {
-            // Show only products
-            $sql .= " AND t.fk_product_type = 0";
-        } elseif ($mode == 2) {
-            // Show only services
-            $sql .= " AND t.fk_product_type = 1";
-        }
-        // Add sql filters
-        if ($sqlfilters) {
-            if (!DolibarrApi::_checkFilters($sqlfilters)) {
-                throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
-            }
-            $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-        }
-
-        $sql .= $this->db->order($sortfield, $sortorder);
-        if ($limit) {
-            if ($page < 0) {
-                $page = 0;
-            }
-            $offset = $limit * $page;
-
-            $sql .= $this->db->plimit($limit + 1, $offset);
-        }
-
-        $result = $this->db->query($sql);
-        if ($result) {
-        	$num = $this->db->num_rows($result);
-            $min = min($num, ($limit <= 0 ? $num : $limit));
-            $i = 0;
-            while ($i < $min)
-            {
-            	$obj = $this->db->fetch_object($result);
-            	$product_static = new Product($this->db);
-                if ($product_static->fetch($obj->rowid)) {
-                    $obj_ret[] = $this->_cleanObjectDatas($product_static);
-                }
-                $i++;
-            }
-        } else {
-        	throw new RestException(503, 'Error when retrieve product list : '.$this->db->lasterror());
-        }
-        if (!count($obj_ret)) {
-            throw new RestException(404, 'No product found');
-        }
-        return $obj_ret;
-    }
-
-    /**
-     * Create product object
-     *
-     * @param  array $request_data Request data
-     * @return int     ID of product
-     */
-    public function post($request_data = null)
-    {
-        if (!DolibarrApiAccess::$user->rights->produit->creer) {
-            throw new RestException(401);
-        }
-        // Check mandatory fields
-        $result = $this->_validate($request_data);
-
-        foreach ($request_data as $field => $value) {
-            $this->product->$field = $value;
-        }
-        if ($this->product->create(DolibarrApiAccess::$user) < 0) {
-            throw new RestException(500, "Error creating product", array_merge(array($this->product->error), $this->product->errors));
-        }
-
-        return $this->product->id;
-    }
-
-    /**
-     * Update product.
-     * Price will be updated by this API only if option is set on "One price per product". See other APIs for other price modes.
-     *
-     * @param  int   $id           Id of product to update
-     * @param  array $request_data Datas
-     * @return int
-     *
-     * @throws RestException 401
-     * @throws RestException 404
-     */
-    public function put($id, $request_data = null)
-    {
-        global $conf;
-
-        if (!DolibarrApiAccess::$user->rights->produit->creer) {
-            throw new RestException(401);
-        }
-
-        $result = $this->product->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Product not found');
-        }
-
-        if (!DolibarrApi::_checkAccessToResource('product', $this->product->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
-
-        $oldproduct = dol_clone($this->product, 0);
-
-        foreach ($request_data as $field => $value) {
-            if ($field == 'id') { continue;
-            }
-            if ($field == 'stock_reel') {
-                throw new RestException(400, 'Stock reel cannot be updated here. Use the /stockmovements endpoint instead');
-            }
-            $this->product->$field = $value;
-        }
-
-        $updatetype = false;
-        if ($this->product->type != $oldproduct->type && ($this->product->isProduct() || $this->product->isService())) {
-            $updatetype = true;
-        }
-
-        $result = $this->product->update($id, DolibarrApiAccess::$user, 1, 'update', $updatetype);
-
-        // If price mode is 1 price per product
-        if ($result > 0 && !empty($conf->global->PRODUCT_PRICE_UNIQ)) {
-            // We update price only if it was changed
-            $pricemodified = false;
-            if ($this->product->price_base_type != $oldproduct->price_base_type) { $pricemodified = true;
-            } else {
-                if ($this->product->tva_tx != $oldproduct->tva_tx) { $pricemodified = true;
-                }
-                if ($this->product->tva_npr != $oldproduct->tva_npr) { $pricemodified = true;
-                }
-                if ($this->product->default_vat_code != $oldproduct->default_vat_code) { $pricemodified = true;
-                }
-
-                if ($this->product->price_base_type == 'TTC') {
-                    if ($this->product->price_ttc != $oldproduct->price_ttc) { $pricemodified = true;
-                    }
-                    if ($this->product->price_min_ttc != $oldproduct->price_min_ttc) { $pricemodified = true;
-                    }
-                } else {
-                    if ($this->product->price != $oldproduct->price) { $pricemodified = true;
-                    }
-                    if ($this->product->price_min != $oldproduct->price_min) { $pricemodified = true;
-                    }
-                }
-            }
-
-            if ($pricemodified) {
-                $newvat = $this->product->tva_tx;
-                $newnpr = $this->product->tva_npr;
-                $newvatsrccode = $this->product->default_vat_code;
-
-                $newprice = $this->product->price;
-                $newpricemin = $this->product->price_min;
-                if ($this->product->price_base_type == 'TTC') {
-                    $newprice = $this->product->price_ttc;
-                    $newpricemin = $this->product->price_min_ttc;
-                }
-
-                $result = $this->product->updatePrice($newprice, $this->product->price_base_type, DolibarrApiAccess::$user, $newvat, $newpricemin, 0, $newnpr, 0, 0, array(), $newvatsrccode);
-            }
-        }
-
-        if ($result <= 0) {
-            throw new RestException(500, "Error updating product", array_merge(array($this->product->error), $this->product->errors));
-        }
-
-        return $this->get($id);
-    }
-
-    /**
-     * Delete product
-     *
-     * @param  int 		$id 		Product ID
-     * @return array
-     */
-    public function delete($id)
-    {
-        if (!DolibarrApiAccess::$user->rights->produit->supprimer) {
-            throw new RestException(401);
-        }
-        $result = $this->product->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Product not found');
-        }
-
-        if (!DolibarrApi::_checkAccessToResource('product', $this->product->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
-
-        // The Product::delete() method uses the global variable $user.
-        global $user;
-        $user = DolibarrApiAccess::$user;
-
-        return $this->product->delete(DolibarrApiAccess::$user);
-    }
-
-    /**
-     * Get the list of subproducts of the product.
-     *
-     * @param  int $id      Id of parent product/service
-     * @return array
-     *
-     * @throws RestException
-     * @throws RestException 401
-     * @throws RestException 404
-     *
-     * @url GET {id}/subproducts
-     */
-    public function getSubproducts($id)
-    {
-        if (!DolibarrApiAccess::$user->rights->produit->lire) {
-            throw new RestException(401);
-        }
-
-        if (!DolibarrApi::_checkAccessToResource('product', $id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
-
-        $childsArbo = $this->product->getChildsArbo($id, 1);
-
-        $keys = ['rowid', 'qty', 'fk_product_type', 'label', 'incdec'];
-        $childs = [];
-        foreach ($childsArbo as $values) {
-            $childs[] = array_combine($keys, $values);
-        }
-
-        return $childs;
-    }
-
-    /**
-     * Add subproduct.
-     *
-     * Link a product/service to a parent product/service
-     *
-     * @param  int $id            Id of parent product/service
-     * @param  int $subproduct_id Id of child product/service
-     * @param  int $qty           Quantity
-     * @param  int $incdec        1=Increase/decrease stock of child when parent stock increase/decrease
-     * @return int
-     *
-     * @throws RestException
-     * @throws RestException 401
-     * @throws RestException 404
-     *
-     * @url POST {id}/subproducts/add
-     */
-    public function addSubproducts($id, $subproduct_id, $qty, $incdec = 1)
-    {
-        if (!DolibarrApiAccess::$user->rights->produit->creer) {
-            throw new RestException(401);
-        }
-
-        if (!DolibarrApi::_checkAccessToResource('product', $id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
-
-        $result = $this->product->add_sousproduit($id, $subproduct_id, $qty, $incdec);
-        if ($result <= 0) {
-            throw new RestException(500, "Error adding product child");
-        }
-        return $result;
-    }
-
-    /**
-     * Remove subproduct.
-     * Unlink a product/service from a parent product/service
-     *
-     * @param  int $id             Id of parent product/service
-     * @param  int $subproduct_id  Id of child product/service
-     * @return int
-     *
-     * @throws RestException 401
-     * @throws RestException 404
-     *
-     * @url DELETE {id}/subproducts/remove/{subproduct_id}
-     */
-    public function delSubproducts($id, $subproduct_id)
-    {
-        if (!DolibarrApiAccess::$user->rights->produit->creer) {
-            throw new RestException(401);
-        }
-
-        if (!DolibarrApi::_checkAccessToResource('product', $id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
-
-        $result = $this->product->del_sousproduit($id, $subproduct_id);
-        if ($result <= 0) {
-            throw new RestException(500, "Error while removing product child");
-        }
-        return $result;
-    }
-
-
-    /**
-     * Get categories for a product
-     *
-     * @param int    $id        ID of product
-     * @param string $sortfield Sort field
-     * @param string $sortorder Sort order
-     * @param int    $limit     Limit for list
-     * @param int    $page      Page number
-     *
-     * @return mixed
-     *
-     * @url GET {id}/categories
-     */
-    public function getCategories($id, $sortfield = "s.rowid", $sortorder = 'ASC', $limit = 0, $page = 0)
-    {
-        if (!DolibarrApiAccess::$user->rights->categorie->lire) {
-            throw new RestException(401);
-        }
-
-        $categories = new Categorie($this->db);
-
-        $result = $categories->getListForItem($id, 'product', $sortfield, $sortorder, $limit, $page);
-
-        if (empty($result)) {
-            throw new RestException(404, 'No category found');
-        }
-
-        if ($result < 0) {
-            throw new RestException(503, 'Error when retrieve category list : '.array_merge(array($categories->error), $categories->errors));
-        }
-
-        return $result;
-    }
-
-    /**
-     * Get prices per segment for a product
-     *
-     * @param int $id ID of product
-     *
-     * @return mixed
-     *
-     * @url GET {id}/selling_multiprices/per_segment
-     */
-    public function getCustomerPricesPerSegment($id)
-    {
-        global $conf;
-
-        if (!DolibarrApiAccess::$user->rights->produit->lire) {
-            throw new RestException(401);
-        }
-
-        if (empty($conf->global->PRODUIT_MULTIPRICES)) {
-            throw new RestException(400, 'API not available: this mode of pricing is not enabled by setup');
-        }
-
-        $result = $this->product->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Product not found');
-        }
-
-        if ($result < 0) {
-            throw new RestException(503, 'Error when retrieve prices list : '.array_merge(array($this->product->error), $this->product->errors));
-        }
-
-        return array(
-            'multiprices'=>$this->product->multiprices,
-            'multiprices_inc_tax'=>$this->product->multiprices_ttc,
-            'multiprices_min'=>$this->product->multiprices_min,
-            'multiprices_min_inc_tax'=>$this->product->multiprices_min_ttc,
-            'multiprices_vat'=>$this->product->multiprices_tva_tx,
-            'multiprices_base_type'=>$this->product->multiprices_base_type,
-            //'multiprices_default_vat_code'=>$this->product->multiprices_default_vat_code
-        );
-    }
-
-    /**
-     * Get prices per customer for a product
-     *
-     * @param int $id ID of product
-     * @param string   	$thirdparty_id	  Thirdparty id to filter orders of (example '1') {@pattern /^[0-9,]*$/i}
-     *
-     * @return mixed
-     *
-     * @url GET {id}/selling_multiprices/per_customer
-     */
-    public function getCustomerPricesPerCustomer($id, $thirdparty_id = '')
-    {
-        global $conf;
-
-        if (!DolibarrApiAccess::$user->rights->produit->lire) {
-            throw new RestException(401);
-        }
-
-        if (empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
-            throw new RestException(400, 'API not available: this mode of pricing is not enabled by setup');
-        }
-
-        $result = $this->product->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Product not found');
-        }
-
-        if ($result > 0) {
-            require_once DOL_DOCUMENT_ROOT.'/product/class/productcustomerprice.class.php';
-            $prodcustprice = new Productcustomerprice($this->db);
-            $filter = array();
-            $filter['t.fk_product'] .= $id;
-            if ($thirdparty_id) $filter['t.fk_soc'] .= $thirdparty_id;
-            $result = $prodcustprice->fetch_all('', '', 0, 0, $filter);
-        }
-
-        if (empty($prodcustprice->lines)) {
-            throw new RestException(404, 'Prices not found');
-        }
-
-        return $prodcustprice->lines;
-    }
-
-    /**
-     * Get prices per quantity for a product
-     *
-     * @param int $id ID of product
-     *
-     * @return mixed
-     *
-     * @url GET {id}/selling_multiprices/per_quantity
-     */
-    public function getCustomerPricesPerQuantity($id)
-    {
-        global $conf;
-
-        if (!DolibarrApiAccess::$user->rights->produit->lire) {
-            throw new RestException(401);
-        }
-
-        if (empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY)) {
-            throw new RestException(400, 'API not available: this mode of pricing is not enabled by setup');
-        }
-
-        $result = $this->product->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Product not found');
-        }
-
-        if ($result < 0) {
-            throw new RestException(503, 'Error when retrieve prices list : '.array_merge(array($this->product->error), $this->product->errors));
-        }
-
-        return array(
-            'prices_by_qty'=>$this->product->prices_by_qty[0], // 1 if price by quantity was activated for the product
-            'prices_by_qty_list'=>$this->product->prices_by_qty_list[0]
-        );
-    }
-
-    /**
-     * Add/Update purchase prices for a product.
-     *
-     * @param   int         $id                             ID of Product
-     * @param  	float		$qty				            Min quantity for which price is valid
-     * @param  	float		$buyprice			            Purchase price for the quantity min
-     * @param  	string		$price_base_type	            HT or TTC
-     * @param  	int		    $fourn_id                       Supplier ID
-     * @param  	int			$availability		            Product availability
-     * @param	string		$ref_fourn			            Supplier ref
-     * @param	float		$tva_tx				            New VAT Rate (For example 8.5. Should not be a string)
-     * @param  	string		$charges			            costs affering to product
-     * @param  	float		$remise_percent		            Discount  regarding qty (percent)
-     * @param  	float		$remise				            Discount  regarding qty (amount)
-     * @param  	int			$newnpr				            Set NPR or not
-     * @param	int			$delivery_time_days	            Delay in days for delivery (max). May be '' if not defined.
-     * @param   string      $supplier_reputation            Reputation with this product to the defined supplier (empty, FAVORITE, DONOTORDER)
-     * @param   array		$localtaxes_array	            Array with localtaxes info array('0'=>type1,'1'=>rate1,'2'=>type2,'3'=>rate2) (loaded by getLocalTaxesFromRate(vatrate, 0, ...) function).
-     * @param   string  	$newdefaultvatcode              Default vat code
-     * @param  	float		$multicurrency_buyprice 	    Purchase price for the quantity min in currency
-     * @param  	string		$multicurrency_price_base_type	HT or TTC in currency
-     * @param  	float		$multicurrency_tx	            Rate currency
-     * @param  	string		$multicurrency_code	            Currency code
-     * @param  	string		$desc_fourn     	            Custom description for product_fourn_price
-     * @param  	string		$barcode     	                Barcode
-     * @param  	int		    $fk_barcode_type     	        Barcode type
-     * @return int
-     *
-     * @throws RestException 500
-     * @throws RestException 401
-     *
-     * @url POST {id}/purchase_prices
-     */
-    public function addPurchasePrice($id, $qty, $buyprice, $price_base_type, $fourn_id, $availability, $ref_fourn, $tva_tx, $charges = 0, $remise_percent = 0, $remise = 0, $newnpr = 0, $delivery_time_days = 0, $supplier_reputation = '', $localtaxes_array = array(), $newdefaultvatcode = '', $multicurrency_buyprice = 0, $multicurrency_price_base_type = 'HT', $multicurrency_tx = 1, $multicurrency_code = '', $desc_fourn = '', $barcode = '', $fk_barcode_type = null)
-    {
-        if (!DolibarrApiAccess::$user->rights->produit->creer) {
-            throw new RestException(401);
-        }
-
-        $result = $this->productsupplier->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Product not found');
-        }
-
-        if (!DolibarrApi::_checkAccessToResource('product', $this->productsupplier->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
-
-        $result = $this->productsupplier->add_fournisseur(DolibarrApiAccess::$user, $fourn_id, $ref_fourn, $qty);
-        if ($result < 0) {
-            throw new RestException(500, "Error adding supplier to product : ".$this->db->lasterror());
-        }
-
-        $fourn = new Fournisseur($this->db);
-        $result = $fourn->fetch($fourn_id);
-        if ($result <= 0) {
-            throw new RestException(404, 'Supplier not found');
-        }
-
-        $result = $this->productsupplier->update_buyprice($qty, $buyprice, DolibarrApiAccess::$user, $price_base_type, $fourn, $availability, $ref_fourn, $tva_tx, $charges, $remise_percent, $remise, $newnpr, $delivery_time_days, $supplier_reputation, $localtaxes_array, $newdefaultvatcode, $multicurrency_buyprice, $multicurrency_price_base_type, $multicurrency_tx, $multicurrency_code, $desc_fourn, $barcode, $fk_barcode_type);
-
-        if ($result <= 0) {
-            throw new RestException(500, "Error updating buy price : ".$this->db->lasterror());
-        }
-        return (int) $this->productsupplier->product_fourn_price_id;
-    }
-
-    /**
-     * Delete purchase price for a product
-     *
-     * @param  int $id Product ID
-     * @param  int $priceid purchase price ID
-     *
-     * @url DELETE {id}/purchase_prices/{priceid}
-     *
-     * @return int
-     *
-     * @throws RestException 401
-     * @throws RestException 404
-     *
-     */
-    public function deletePurchasePrice($id, $priceid)
-    {
-        if (!DolibarrApiAccess::$user->rights->produit->supprimer) {
-            throw new RestException(401);
-        }
-        $result = $this->productsupplier->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Product not found');
-        }
-
-        if (!DolibarrApi::_checkAccessToResource('product', $this->productsupplier->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
-
-        $resultsupplier = 0;
-        if ($result > 0) {
-            $resultsupplier = $this->productsupplier->remove_product_fournisseur_price($priceid);
-        }
-
-        return $resultsupplier;
-    }
-
-    /**
-     * Get a list of all purchase prices of products
-     *
-     * @param  string $sortfield  Sort field
-     * @param  string $sortorder  Sort order
-     * @param  int    $limit      Limit for list
-     * @param  int    $page       Page number
-     * @param  int    $mode       Use this param to filter list (0 for all, 1 for only product, 2 for only service)
-     * @param  int    $category   Use this param to filter list by category of product
-     * @param  int    $supplier   Use this param to filter list by supplier
-     * @param  string $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.tobuy:=:0) and (t.tosell:=:1)"
-     * @return array              Array of product objects
-     *
-     * @url GET purchase_prices
-     */
-    public function getSupplierProducts($sortfield = "t.ref", $sortorder = 'ASC', $limit = 100, $page = 0, $mode = 0, $category = 0, $supplier = 0, $sqlfilters = '')
-    {
-        global $db, $conf;
-
-        $obj_ret = array();
-
-        $socid = DolibarrApiAccess::$user->socid ? DolibarrApiAccess::$user->socid : '';
-
-        $sql = "SELECT t.rowid, t.ref, t.ref_ext";
-        $sql .= " FROM ".MAIN_DB_PREFIX."product as t";
-        if ($category > 0) {
-            $sql .= ", ".MAIN_DB_PREFIX."categorie_product as c";
-        }
-        $sql .= ", ".MAIN_DB_PREFIX."product_fournisseur_price as s";
-
-        $sql .= ' WHERE t.entity IN ('.getEntity('product').')';
-
-        if ($supplier > 0) {
-        	$sql .= " AND s.fk_soc = ".$this->db->escape($supplier);
-        }
-        $sql .= " AND s.fk_product = t.rowid";
-        // Select products of given category
-        if ($category > 0) {
-        	$sql .= " AND c.fk_categorie = ".$this->db->escape($category);
-            $sql .= " AND c.fk_product = t.rowid";
-        }
-        if ($mode == 1) {
-            // Show only products
-            $sql .= " AND t.fk_product_type = 0";
-        } elseif ($mode == 2) {
-            // Show only services
-            $sql .= " AND t.fk_product_type = 1";
-        }
-        // Add sql filters
-        if ($sqlfilters) {
-            if (!DolibarrApi::_checkFilters($sqlfilters)) {
-                throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
-            }
-            $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-        }
-        $sql .= $this->db->order($sortfield, $sortorder);
-        if ($limit) {
-            if ($page < 0) {
-                $page = 0;
-            }
-            $offset = $limit * $page;
-            $sql .= $this->db->plimit($limit + 1, $offset);
-        }
-        $result = $this->db->query($sql);
-        if ($result) {
-        	$num = $this->db->num_rows($result);
-            $min = min($num, ($limit <= 0 ? $num : $limit));
-            $i = 0;
-            while ($i < $min)
-            {
-            	$obj = $this->db->fetch_object($result);
-
-                $product_fourn = new ProductFournisseur($this->db);
-                $product_fourn_list = $product_fourn->list_product_fournisseur_price($obj->rowid, '', '', 0, 0);
-                foreach ($product_fourn_list as $tmpobj) {
-                    $this->_cleanObjectDatas($tmpobj);
-                }
-
-                //var_dump($product_fourn_list->db);exit;
-                $obj_ret[$obj->rowid] = $product_fourn_list;
-
-                $i++;
-            }
-        } else {
-        	throw new RestException(503, 'Error when retrieve product list : '.$this->db->lasterror());
-        }
-        if (!count($obj_ret)) {
-            throw new RestException(404, 'No product found');
-        }
-        return $obj_ret;
-    }
-
-    /**
-     * Get purchase prices for a product
-     *
-     * Return an array with product information.
-     * TODO implement getting a product by ref or by $ref_ext
-     *
-     * @param  int    $id               ID of product
-     * @param  string $ref              Ref of element
-     * @param  string $ref_ext          Ref ext of element
-     * @param  string $barcode          Barcode of element
-     * @return array|mixed              Data without useless information
-     *
-     * @url GET {id}/purchase_prices
-     *
-     * @throws RestException 401
-     * @throws RestException 403
-     * @throws RestException 404
-     *
-     */
-    public function getPurchasePrices($id, $ref = '', $ref_ext = '', $barcode = '')
-    {
-        if (empty($id) && empty($ref) && empty($ref_ext) && empty($barcode)) {
-            throw new RestException(400, 'bad value for parameter id, ref, ref_ext or barcode');
-        }
-
-        $id = (empty($id) ? 0 : $id);
-
-        if (!DolibarrApiAccess::$user->rights->produit->lire) {
-            throw new RestException(403);
-        }
-
-        $result = $this->product->fetch($id, $ref, $ref_ext, $barcode);
-        if (!$result) {
-            throw new RestException(404, 'Product not found');
-        }
-
-        if (!DolibarrApi::_checkAccessToResource('product', $this->product->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
-
-        $product_fourn_list = array();
-
-        if ($result) {
-            $product_fourn = new ProductFournisseur($this->db);
-            $product_fourn_list = $product_fourn->list_product_fournisseur_price($this->product->id, '', '', 0, 0);
-        }
-
-        foreach ($product_fourn_list as $tmpobj) {
-            $this->_cleanObjectDatas($tmpobj);
-        }
-
-        return $this->_cleanObjectDatas($product_fourn_list);
-    }
-
-    /**
-     * Get attributes.
+	/**
+	 * @var array   $FIELDS     Mandatory fields, checked when create and update object
+	 */
+	static $FIELDS = array(
+		'ref',
+		'label'
+	);
+
+	/**
+	 * @var Product $product {@type Product}
+	 */
+	public $product;
+
+	/**
+	 * @var ProductFournisseur $productsupplier {@type ProductFournisseur}
+	 */
+	public $productsupplier;
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		global $db, $conf;
+
+		$this->db = $db;
+		$this->product = new Product($this->db);
+		$this->productsupplier = new ProductFournisseur($this->db);
+	}
+
+	/**
+	 * Get properties of a product object by id
 	 *
-     * @param  string $sortfield  Sort field
-     * @param  string $sortorder  Sort order
-     * @param  int    $limit      Limit for list
-     * @param  int    $page       Page number
-     * @param  string $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:color)"
-     * @return array
-     *
-     * @throws RestException
-     *
-     * @url GET attributes
-     */
-    public function getAttributes($sortfield = "t.ref", $sortorder = 'ASC', $limit = 100, $page = 0, $sqlfilters = '')
-    {
-        if (!DolibarrApiAccess::$user->rights->produit->lire) {
-            throw new RestException(401);
-        }
+	 * Return an array with product information.
+	 *
+	 * @param  int    $id                  ID of product
+	 * @param  int    $includestockdata    Load also information about stock (slower)
+	 * @param  bool   $includesubproducts  Load information about subproducts
+	 * @param  bool   $includeparentid     Load also ID of parent product (if product is a variant of a parent product)
+	 * @return array|mixed                 Data without useless information
+	 *
+	 * @throws RestException 401
+	 * @throws RestException 403
+	 * @throws RestException 404
+	 */
+	public function get($id, $includestockdata = 0, $includesubproducts = false, $includeparentid = false)
+	{
+		return $this->_fetch($id, '', '', '', $includestockdata, $includesubproducts, $includeparentid);
+	}
 
-        $sql = "SELECT t.rowid, t.ref, t.ref_ext, t.label, t.rang, t.entity";
-        $sql .= " FROM ".MAIN_DB_PREFIX."product_attribute as t";
-        $sql .= ' WHERE t.entity IN ('.getEntity('product').')';
+	/**
+	 * Get properties of a product object by ref
+	 *
+	 * Return an array with product information.
+	 *
+	 * @param  string $ref                Ref of element
+	 * @param  int    $includestockdata   Load also information about stock (slower)
+	 * @param  bool   $includesubproducts Load information about subproducts
+	 * @param  bool   $includeparentid    Load also ID of parent product (if product is a variant of a parent product)
+	 *
+	 * @return array|mixed                 Data without useless information
+	 *
+	 * @url GET ref/{ref}
+	 *
+	 * @throws RestException 401
+	 * @throws RestException 403
+	 * @throws RestException 404
+	 */
+	public function getByRef($ref, $includestockdata = 0, $includesubproducts = false, $includeparentid = false)
+	{
+		return $this->_fetch('', $ref, '', '', $includestockdata, $includesubproducts, $includeparentid);
+	}
 
-        // Add sql filters
-        if ($sqlfilters) {
-            if (!DolibarrApi::_checkFilters($sqlfilters)) {
-                throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
-            }
-            $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-        }
+	/**
+	 * Get properties of a product object by ref_ext
+	 *
+	 * Return an array with product information.
+	 *
+	 * @param  string $ref_ext            Ref_ext of element
+	 * @param  int    $includestockdata   Load also information about stock (slower)
+	 * @param  bool   $includesubproducts Load information about subproducts
+	 * @param  bool   $includeparentid    Load also ID of parent product (if product is a variant of a parent product)
+	 *
+	 * @return array|mixed Data without useless information
+	 *
+	 * @url GET ref_ext/{ref_ext}
+	 *
+	 * @throws RestException 401
+	 * @throws RestException 403
+	 * @throws RestException 404
+	 */
+	public function getByRefExt($ref_ext, $includestockdata = 0, $includesubproducts = false, $includeparentid = false)
+	{
+		return $this->_fetch('', '', $ref_ext, '', $includestockdata, $includesubproducts, $includeparentid);
+	}
 
-        $sql .= $this->db->order($sortfield, $sortorder);
-        if ($limit) {
-            if ($page < 0) {
-                $page = 0;
-            }
-            $offset = $limit * $page;
+	/**
+	 * Get properties of a product object by barcode
+	 *
+	 * Return an array with product information.
+	 *
+	 * @param  string $barcode            Barcode of element
+	 * @param  int    $includestockdata   Load also information about stock (slower)
+	 * @param  bool   $includesubproducts Load information about subproducts
+	 * @param  bool   $includeparentid    Load also ID of parent product (if product is a variant of a parent product)
+	 *
+	 * @return array|mixed Data without useless information
+	 *
+	 * @url GET barcode/{barcode}
+	 *
+	 * @throws RestException 401
+	 * @throws RestException 403
+	 * @throws RestException 404
+	 */
+	public function getByBarcode($barcode, $includestockdata = 0, $includesubproducts = false, $includeparentid = false)
+	{
+		return $this->_fetch('', '', '', $barcode, $includestockdata, $includesubproducts, $includeparentid);
+	}
 
-            $sql .= $this->db->plimit($limit, $offset);
-        }
+	/**
+	 * List products
+	 *
+	 * Get a list of products
+	 *
+	 * @param  string $sortfield  Sort field
+	 * @param  string $sortorder  Sort order
+	 * @param  int    $limit      Limit for list
+	 * @param  int    $page       Page number
+	 * @param  int    $mode       Use this param to filter list (0 for all, 1 for only product, 2 for only service)
+	 * @param  int    $category   Use this param to filter list by category
+	 * @param  string $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.tobuy:=:0) and (t.tosell:=:1)"
+	 * @return array                Array of product objects
+	 */
+	public function index($sortfield = "t.ref", $sortorder = 'ASC', $limit = 100, $page = 0, $mode = 0, $category = 0, $sqlfilters = '')
+	{
+		global $db, $conf;
 
-        $result = $this->db->query($sql);
+		$obj_ret = array();
 
-        if (!$result) {
-            throw new RestException(503, 'Error when retrieve product attribute list : '.$this->db->lasterror());
-        }
+		$socid = DolibarrApiAccess::$user->socid ? DolibarrApiAccess::$user->socid : '';
 
-        $return = [];
-        while ($result = $this->db->fetch_object($query)) {
-            $tmp = new ProductAttribute($this->db);
-            $tmp->id = $result->rowid;
-            $tmp->ref = $result->ref;
-            $tmp->ref_ext = $result->ref_ext;
-            $tmp->label = $result->label;
-            $tmp->rang = $result->rang;
-            $tmp->entity = $result->entity;
+		$sql = "SELECT t.rowid, t.ref, t.ref_ext";
+		$sql .= " FROM ".MAIN_DB_PREFIX."product as t";
+		if ($category > 0) {
+			$sql .= ", ".MAIN_DB_PREFIX."categorie_product as c";
+		}
+		$sql .= ' WHERE t.entity IN ('.getEntity('product').')';
+		// Select products of given category
+		if ($category > 0) {
+			$sql .= " AND c.fk_categorie = ".$this->db->escape($category);
+			$sql .= " AND c.fk_product = t.rowid ";
+		}
+		if ($mode == 1) {
+			// Show only products
+			$sql .= " AND t.fk_product_type = 0";
+		} elseif ($mode == 2) {
+			// Show only services
+			$sql .= " AND t.fk_product_type = 1";
+		}
+		// Add sql filters
+		if ($sqlfilters) {
+			if (!DolibarrApi::_checkFilters($sqlfilters)) {
+				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+			}
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
 
-            $return[] = $this->_cleanObjectDatas($tmp);
-        }
+		$sql .= $this->db->order($sortfield, $sortorder);
+		if ($limit) {
+			if ($page < 0) {
+				$page = 0;
+			}
+			$offset = $limit * $page;
 
-        if (!count($return)) {
-            throw new RestException(404, 'No product attribute found');
-        }
+			$sql .= $this->db->plimit($limit + 1, $offset);
+		}
 
-        return $return;
-    }
+		$result = $this->db->query($sql);
+		if ($result) {
+			$num = $this->db->num_rows($result);
+			$min = min($num, ($limit <= 0 ? $num : $limit));
+			$i = 0;
+			while ($i < $min)
+			{
+				$obj = $this->db->fetch_object($result);
+				$product_static = new Product($this->db);
+				if ($product_static->fetch($obj->rowid)) {
+					$obj_ret[] = $this->_cleanObjectDatas($product_static);
+				}
+				$i++;
+			}
+		} else {
+			throw new RestException(503, 'Error when retrieve product list : '.$this->db->lasterror());
+		}
+		if (!count($obj_ret)) {
+			throw new RestException(404, 'No product found');
+		}
+		return $obj_ret;
+	}
 
-    /**
-     * Get attribute by ID.
-     *
-     * @param  int $id ID of Attribute
-     * @return array
-     *
-     * @throws RestException
-     * @throws RestException 401
-     * @throws RestException 404
-     *
-     * @url GET attributes/{id}
-     */
-    public function getAttributeById($id)
-    {
-        if (!DolibarrApiAccess::$user->rights->produit->lire) {
-            throw new RestException(401);
-        }
+	/**
+	 * Create product object
+	 *
+	 * @param  array $request_data Request data
+	 * @return int     ID of product
+	 */
+	public function post($request_data = null)
+	{
+		if (!DolibarrApiAccess::$user->rights->produit->creer) {
+			throw new RestException(401);
+		}
+		// Check mandatory fields
+		$result = $this->_validate($request_data);
 
-        $prodattr = new ProductAttribute($this->db);
-        $result = $prodattr->fetch((int) $id);
+		foreach ($request_data as $field => $value) {
+			$this->product->$field = $value;
+		}
+		if ($this->product->create(DolibarrApiAccess::$user) < 0) {
+			throw new RestException(500, "Error creating product", array_merge(array($this->product->error), $this->product->errors));
+		}
 
-        if ($result < 0) {
-            throw new RestException(404, "Product attribute not found");
-        }
+		return $this->product->id;
+	}
 
-        $fields = ["id", "ref", "ref_ext", "label", "rang", "entity"];
+	/**
+	 * Update product.
+	 * Price will be updated by this API only if option is set on "One price per product". See other APIs for other price modes.
+	 *
+	 * @param  int   $id           Id of product to update
+	 * @param  array $request_data Datas
+	 * @return int
+	 *
+	 * @throws RestException 401
+	 * @throws RestException 404
+	 */
+	public function put($id, $request_data = null)
+	{
+		global $conf;
 
-        foreach ($prodattr as $field => $value) {
-            if (!in_array($field, $fields)) {
-                unset($prodattr->{$field});
-            }
-        }
+		if (!DolibarrApiAccess::$user->rights->produit->creer) {
+			throw new RestException(401);
+		}
 
-        $sql = "SELECT COUNT(*) as nb FROM ".MAIN_DB_PREFIX."product_attribute_combination2val as pac2v";
-        $sql .= " JOIN ".MAIN_DB_PREFIX."product_attribute_combination as pac ON pac2v.fk_prod_combination = pac.rowid";
-        $sql .= " WHERE pac2v.fk_prod_attr = ".((int) $prodattr->id)." AND pac.entity IN (".getEntity('product').")";
+		$result = $this->product->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Product not found');
+		}
+
+		if (!DolibarrApi::_checkAccessToResource('product', $this->product->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+
+		$oldproduct = dol_clone($this->product, 0);
+
+		foreach ($request_data as $field => $value) {
+			if ($field == 'id') { continue;
+			}
+			if ($field == 'stock_reel') {
+				throw new RestException(400, 'Stock reel cannot be updated here. Use the /stockmovements endpoint instead');
+			}
+			$this->product->$field = $value;
+		}
+
+		$updatetype = false;
+		if ($this->product->type != $oldproduct->type && ($this->product->isProduct() || $this->product->isService())) {
+			$updatetype = true;
+		}
+
+		$result = $this->product->update($id, DolibarrApiAccess::$user, 1, 'update', $updatetype);
+
+		// If price mode is 1 price per product
+		if ($result > 0 && !empty($conf->global->PRODUCT_PRICE_UNIQ)) {
+			// We update price only if it was changed
+			$pricemodified = false;
+			if ($this->product->price_base_type != $oldproduct->price_base_type) { $pricemodified = true;
+			} else {
+				if ($this->product->tva_tx != $oldproduct->tva_tx) { $pricemodified = true;
+				}
+				if ($this->product->tva_npr != $oldproduct->tva_npr) { $pricemodified = true;
+				}
+				if ($this->product->default_vat_code != $oldproduct->default_vat_code) { $pricemodified = true;
+				}
+
+				if ($this->product->price_base_type == 'TTC') {
+					if ($this->product->price_ttc != $oldproduct->price_ttc) { $pricemodified = true;
+					}
+					if ($this->product->price_min_ttc != $oldproduct->price_min_ttc) { $pricemodified = true;
+					}
+				} else {
+					if ($this->product->price != $oldproduct->price) { $pricemodified = true;
+					}
+					if ($this->product->price_min != $oldproduct->price_min) { $pricemodified = true;
+					}
+				}
+			}
+
+			if ($pricemodified) {
+				$newvat = $this->product->tva_tx;
+				$newnpr = $this->product->tva_npr;
+				$newvatsrccode = $this->product->default_vat_code;
+
+				$newprice = $this->product->price;
+				$newpricemin = $this->product->price_min;
+				if ($this->product->price_base_type == 'TTC') {
+					$newprice = $this->product->price_ttc;
+					$newpricemin = $this->product->price_min_ttc;
+				}
+
+				$result = $this->product->updatePrice($newprice, $this->product->price_base_type, DolibarrApiAccess::$user, $newvat, $newpricemin, 0, $newnpr, 0, 0, array(), $newvatsrccode);
+			}
+		}
+
+		if ($result <= 0) {
+			throw new RestException(500, "Error updating product", array_merge(array($this->product->error), $this->product->errors));
+		}
+
+		return $this->get($id);
+	}
+
+	/**
+	 * Delete product
+	 *
+	 * @param  int 		$id 		Product ID
+	 * @return array
+	 */
+	public function delete($id)
+	{
+		if (!DolibarrApiAccess::$user->rights->produit->supprimer) {
+			throw new RestException(401);
+		}
+		$result = $this->product->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Product not found');
+		}
+
+		if (!DolibarrApi::_checkAccessToResource('product', $this->product->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+
+		// The Product::delete() method uses the global variable $user.
+		global $user;
+		$user = DolibarrApiAccess::$user;
+
+		return $this->product->delete(DolibarrApiAccess::$user);
+	}
+
+	/**
+	 * Get the list of subproducts of the product.
+	 *
+	 * @param  int $id      Id of parent product/service
+	 * @return array
+	 *
+	 * @throws RestException
+	 * @throws RestException 401
+	 * @throws RestException 404
+	 *
+	 * @url GET {id}/subproducts
+	 */
+	public function getSubproducts($id)
+	{
+		if (!DolibarrApiAccess::$user->rights->produit->lire) {
+			throw new RestException(401);
+		}
+
+		if (!DolibarrApi::_checkAccessToResource('product', $id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+
+		$childsArbo = $this->product->getChildsArbo($id, 1);
+
+		$keys = ['rowid', 'qty', 'fk_product_type', 'label', 'incdec'];
+		$childs = [];
+		foreach ($childsArbo as $values) {
+			$childs[] = array_combine($keys, $values);
+		}
+
+		return $childs;
+	}
+
+	/**
+	 * Add subproduct.
+	 *
+	 * Link a product/service to a parent product/service
+	 *
+	 * @param  int $id            Id of parent product/service
+	 * @param  int $subproduct_id Id of child product/service
+	 * @param  int $qty           Quantity
+	 * @param  int $incdec        1=Increase/decrease stock of child when parent stock increase/decrease
+	 * @return int
+	 *
+	 * @throws RestException
+	 * @throws RestException 401
+	 * @throws RestException 404
+	 *
+	 * @url POST {id}/subproducts/add
+	 */
+	public function addSubproducts($id, $subproduct_id, $qty, $incdec = 1)
+	{
+		if (!DolibarrApiAccess::$user->rights->produit->creer) {
+			throw new RestException(401);
+		}
+
+		if (!DolibarrApi::_checkAccessToResource('product', $id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+
+		$result = $this->product->add_sousproduit($id, $subproduct_id, $qty, $incdec);
+		if ($result <= 0) {
+			throw new RestException(500, "Error adding product child");
+		}
+		return $result;
+	}
+
+	/**
+	 * Remove subproduct.
+	 * Unlink a product/service from a parent product/service
+	 *
+	 * @param  int $id             Id of parent product/service
+	 * @param  int $subproduct_id  Id of child product/service
+	 * @return int
+	 *
+	 * @throws RestException 401
+	 * @throws RestException 404
+	 *
+	 * @url DELETE {id}/subproducts/remove/{subproduct_id}
+	 */
+	public function delSubproducts($id, $subproduct_id)
+	{
+		if (!DolibarrApiAccess::$user->rights->produit->creer) {
+			throw new RestException(401);
+		}
+
+		if (!DolibarrApi::_checkAccessToResource('product', $id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+
+		$result = $this->product->del_sousproduit($id, $subproduct_id);
+		if ($result <= 0) {
+			throw new RestException(500, "Error while removing product child");
+		}
+		return $result;
+	}
+
+
+	/**
+	 * Get categories for a product
+	 *
+	 * @param int    $id        ID of product
+	 * @param string $sortfield Sort field
+	 * @param string $sortorder Sort order
+	 * @param int    $limit     Limit for list
+	 * @param int    $page      Page number
+	 *
+	 * @return mixed
+	 *
+	 * @url GET {id}/categories
+	 */
+	public function getCategories($id, $sortfield = "s.rowid", $sortorder = 'ASC', $limit = 0, $page = 0)
+	{
+		if (!DolibarrApiAccess::$user->rights->categorie->lire) {
+			throw new RestException(401);
+		}
+
+		$categories = new Categorie($this->db);
+
+		$result = $categories->getListForItem($id, 'product', $sortfield, $sortorder, $limit, $page);
+
+		if (empty($result)) {
+			throw new RestException(404, 'No category found');
+		}
+
+		if ($result < 0) {
+			throw new RestException(503, 'Error when retrieve category list : '.array_merge(array($categories->error), $categories->errors));
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Get prices per segment for a product
+	 *
+	 * @param int $id ID of product
+	 *
+	 * @return mixed
+	 *
+	 * @url GET {id}/selling_multiprices/per_segment
+	 */
+	public function getCustomerPricesPerSegment($id)
+	{
+		global $conf;
+
+		if (!DolibarrApiAccess::$user->rights->produit->lire) {
+			throw new RestException(401);
+		}
+
+		if (empty($conf->global->PRODUIT_MULTIPRICES)) {
+			throw new RestException(400, 'API not available: this mode of pricing is not enabled by setup');
+		}
+
+		$result = $this->product->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Product not found');
+		}
+
+		if ($result < 0) {
+			throw new RestException(503, 'Error when retrieve prices list : '.array_merge(array($this->product->error), $this->product->errors));
+		}
+
+		return array(
+			'multiprices'=>$this->product->multiprices,
+			'multiprices_inc_tax'=>$this->product->multiprices_ttc,
+			'multiprices_min'=>$this->product->multiprices_min,
+			'multiprices_min_inc_tax'=>$this->product->multiprices_min_ttc,
+			'multiprices_vat'=>$this->product->multiprices_tva_tx,
+			'multiprices_base_type'=>$this->product->multiprices_base_type,
+			//'multiprices_default_vat_code'=>$this->product->multiprices_default_vat_code
+		);
+	}
+
+	/**
+	 * Get prices per customer for a product
+	 *
+	 * @param int $id ID of product
+	 * @param string   	$thirdparty_id	  Thirdparty id to filter orders of (example '1') {@pattern /^[0-9,]*$/i}
+	 *
+	 * @return mixed
+	 *
+	 * @url GET {id}/selling_multiprices/per_customer
+	 */
+	public function getCustomerPricesPerCustomer($id, $thirdparty_id = '')
+	{
+		global $conf;
+
+		if (!DolibarrApiAccess::$user->rights->produit->lire) {
+			throw new RestException(401);
+		}
+
+		if (empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
+			throw new RestException(400, 'API not available: this mode of pricing is not enabled by setup');
+		}
+
+		$result = $this->product->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Product not found');
+		}
+
+		if ($result > 0) {
+			require_once DOL_DOCUMENT_ROOT.'/product/class/productcustomerprice.class.php';
+			$prodcustprice = new Productcustomerprice($this->db);
+			$filter = array();
+			$filter['t.fk_product'] .= $id;
+			if ($thirdparty_id) $filter['t.fk_soc'] .= $thirdparty_id;
+			$result = $prodcustprice->fetch_all('', '', 0, 0, $filter);
+		}
+
+		if (empty($prodcustprice->lines)) {
+			throw new RestException(404, 'Prices not found');
+		}
+
+		return $prodcustprice->lines;
+	}
+
+	/**
+	 * Get prices per quantity for a product
+	 *
+	 * @param int $id ID of product
+	 *
+	 * @return mixed
+	 *
+	 * @url GET {id}/selling_multiprices/per_quantity
+	 */
+	public function getCustomerPricesPerQuantity($id)
+	{
+		global $conf;
+
+		if (!DolibarrApiAccess::$user->rights->produit->lire) {
+			throw new RestException(401);
+		}
+
+		if (empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY)) {
+			throw new RestException(400, 'API not available: this mode of pricing is not enabled by setup');
+		}
+
+		$result = $this->product->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Product not found');
+		}
+
+		if ($result < 0) {
+			throw new RestException(503, 'Error when retrieve prices list : '.array_merge(array($this->product->error), $this->product->errors));
+		}
+
+		return array(
+			'prices_by_qty'=>$this->product->prices_by_qty[0], // 1 if price by quantity was activated for the product
+			'prices_by_qty_list'=>$this->product->prices_by_qty_list[0]
+		);
+	}
+
+	/**
+	 * Add/Update purchase prices for a product.
+	 *
+	 * @param   int         $id                             ID of Product
+	 * @param  	float		$qty				            Min quantity for which price is valid
+	 * @param  	float		$buyprice			            Purchase price for the quantity min
+	 * @param  	string		$price_base_type	            HT or TTC
+	 * @param  	int		    $fourn_id                       Supplier ID
+	 * @param  	int			$availability		            Product availability
+	 * @param	string		$ref_fourn			            Supplier ref
+	 * @param	float		$tva_tx				            New VAT Rate (For example 8.5. Should not be a string)
+	 * @param  	string		$charges			            costs affering to product
+	 * @param  	float		$remise_percent		            Discount  regarding qty (percent)
+	 * @param  	float		$remise				            Discount  regarding qty (amount)
+	 * @param  	int			$newnpr				            Set NPR or not
+	 * @param	int			$delivery_time_days	            Delay in days for delivery (max). May be '' if not defined.
+	 * @param   string      $supplier_reputation            Reputation with this product to the defined supplier (empty, FAVORITE, DONOTORDER)
+	 * @param   array		$localtaxes_array	            Array with localtaxes info array('0'=>type1,'1'=>rate1,'2'=>type2,'3'=>rate2) (loaded by getLocalTaxesFromRate(vatrate, 0, ...) function).
+	 * @param   string  	$newdefaultvatcode              Default vat code
+	 * @param  	float		$multicurrency_buyprice 	    Purchase price for the quantity min in currency
+	 * @param  	string		$multicurrency_price_base_type	HT or TTC in currency
+	 * @param  	float		$multicurrency_tx	            Rate currency
+	 * @param  	string		$multicurrency_code	            Currency code
+	 * @param  	string		$desc_fourn     	            Custom description for product_fourn_price
+	 * @param  	string		$barcode     	                Barcode
+	 * @param  	int		    $fk_barcode_type     	        Barcode type
+	 * @return int
+	 *
+	 * @throws RestException 500
+	 * @throws RestException 401
+	 *
+	 * @url POST {id}/purchase_prices
+	 */
+	public function addPurchasePrice($id, $qty, $buyprice, $price_base_type, $fourn_id, $availability, $ref_fourn, $tva_tx, $charges = 0, $remise_percent = 0, $remise = 0, $newnpr = 0, $delivery_time_days = 0, $supplier_reputation = '', $localtaxes_array = array(), $newdefaultvatcode = '', $multicurrency_buyprice = 0, $multicurrency_price_base_type = 'HT', $multicurrency_tx = 1, $multicurrency_code = '', $desc_fourn = '', $barcode = '', $fk_barcode_type = null)
+	{
+		if (!DolibarrApiAccess::$user->rights->produit->creer) {
+			throw new RestException(401);
+		}
+
+		$result = $this->productsupplier->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Product not found');
+		}
+
+		if (!DolibarrApi::_checkAccessToResource('product', $this->productsupplier->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+
+		$result = $this->productsupplier->add_fournisseur(DolibarrApiAccess::$user, $fourn_id, $ref_fourn, $qty);
+		if ($result < 0) {
+			throw new RestException(500, "Error adding supplier to product : ".$this->db->lasterror());
+		}
+
+		$fourn = new Fournisseur($this->db);
+		$result = $fourn->fetch($fourn_id);
+		if ($result <= 0) {
+			throw new RestException(404, 'Supplier not found');
+		}
+
+		$result = $this->productsupplier->update_buyprice($qty, $buyprice, DolibarrApiAccess::$user, $price_base_type, $fourn, $availability, $ref_fourn, $tva_tx, $charges, $remise_percent, $remise, $newnpr, $delivery_time_days, $supplier_reputation, $localtaxes_array, $newdefaultvatcode, $multicurrency_buyprice, $multicurrency_price_base_type, $multicurrency_tx, $multicurrency_code, $desc_fourn, $barcode, $fk_barcode_type);
+
+		if ($result <= 0) {
+			throw new RestException(500, "Error updating buy price : ".$this->db->lasterror());
+		}
+		return (int) $this->productsupplier->product_fourn_price_id;
+	}
+
+	/**
+	 * Delete purchase price for a product
+	 *
+	 * @param  int $id Product ID
+	 * @param  int $priceid purchase price ID
+	 *
+	 * @url DELETE {id}/purchase_prices/{priceid}
+	 *
+	 * @return int
+	 *
+	 * @throws RestException 401
+	 * @throws RestException 404
+	 *
+	 */
+	public function deletePurchasePrice($id, $priceid)
+	{
+		if (!DolibarrApiAccess::$user->rights->produit->supprimer) {
+			throw new RestException(401);
+		}
+		$result = $this->productsupplier->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Product not found');
+		}
+
+		if (!DolibarrApi::_checkAccessToResource('product', $this->productsupplier->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+
+		$resultsupplier = 0;
+		if ($result > 0) {
+			$resultsupplier = $this->productsupplier->remove_product_fournisseur_price($priceid);
+		}
+
+		return $resultsupplier;
+	}
+
+	/**
+	 * Get a list of all purchase prices of products
+	 *
+	 * @param  string $sortfield  Sort field
+	 * @param  string $sortorder  Sort order
+	 * @param  int    $limit      Limit for list
+	 * @param  int    $page       Page number
+	 * @param  int    $mode       Use this param to filter list (0 for all, 1 for only product, 2 for only service)
+	 * @param  int    $category   Use this param to filter list by category of product
+	 * @param  int    $supplier   Use this param to filter list by supplier
+	 * @param  string $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.tobuy:=:0) and (t.tosell:=:1)"
+	 * @return array              Array of product objects
+	 *
+	 * @url GET purchase_prices
+	 */
+	public function getSupplierProducts($sortfield = "t.ref", $sortorder = 'ASC', $limit = 100, $page = 0, $mode = 0, $category = 0, $supplier = 0, $sqlfilters = '')
+	{
+		global $db, $conf;
+
+		$obj_ret = array();
+
+		$socid = DolibarrApiAccess::$user->socid ? DolibarrApiAccess::$user->socid : '';
+
+		$sql = "SELECT t.rowid, t.ref, t.ref_ext";
+		$sql .= " FROM ".MAIN_DB_PREFIX."product as t";
+		if ($category > 0) {
+			$sql .= ", ".MAIN_DB_PREFIX."categorie_product as c";
+		}
+		$sql .= ", ".MAIN_DB_PREFIX."product_fournisseur_price as s";
+
+		$sql .= ' WHERE t.entity IN ('.getEntity('product').')';
+
+		if ($supplier > 0) {
+			$sql .= " AND s.fk_soc = ".$this->db->escape($supplier);
+		}
+		$sql .= " AND s.fk_product = t.rowid";
+		// Select products of given category
+		if ($category > 0) {
+			$sql .= " AND c.fk_categorie = ".$this->db->escape($category);
+			$sql .= " AND c.fk_product = t.rowid";
+		}
+		if ($mode == 1) {
+			// Show only products
+			$sql .= " AND t.fk_product_type = 0";
+		} elseif ($mode == 2) {
+			// Show only services
+			$sql .= " AND t.fk_product_type = 1";
+		}
+		// Add sql filters
+		if ($sqlfilters) {
+			if (!DolibarrApi::_checkFilters($sqlfilters)) {
+				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+			}
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
+		$sql .= $this->db->order($sortfield, $sortorder);
+		if ($limit) {
+			if ($page < 0) {
+				$page = 0;
+			}
+			$offset = $limit * $page;
+			$sql .= $this->db->plimit($limit + 1, $offset);
+		}
+		$result = $this->db->query($sql);
+		if ($result) {
+			$num = $this->db->num_rows($result);
+			$min = min($num, ($limit <= 0 ? $num : $limit));
+			$i = 0;
+			while ($i < $min)
+			{
+				$obj = $this->db->fetch_object($result);
+
+				$product_fourn = new ProductFournisseur($this->db);
+				$product_fourn_list = $product_fourn->list_product_fournisseur_price($obj->rowid, '', '', 0, 0);
+				foreach ($product_fourn_list as $tmpobj) {
+					$this->_cleanObjectDatas($tmpobj);
+				}
+
+				//var_dump($product_fourn_list->db);exit;
+				$obj_ret[$obj->rowid] = $product_fourn_list;
+
+				$i++;
+			}
+		} else {
+			throw new RestException(503, 'Error when retrieve product list : '.$this->db->lasterror());
+		}
+		if (!count($obj_ret)) {
+			throw new RestException(404, 'No product found');
+		}
+		return $obj_ret;
+	}
+
+	/**
+	 * Get purchase prices for a product
+	 *
+	 * Return an array with product information.
+	 * TODO implement getting a product by ref or by $ref_ext
+	 *
+	 * @param  int    $id               ID of product
+	 * @param  string $ref              Ref of element
+	 * @param  string $ref_ext          Ref ext of element
+	 * @param  string $barcode          Barcode of element
+	 * @return array|mixed              Data without useless information
+	 *
+	 * @url GET {id}/purchase_prices
+	 *
+	 * @throws RestException 401
+	 * @throws RestException 403
+	 * @throws RestException 404
+	 *
+	 */
+	public function getPurchasePrices($id, $ref = '', $ref_ext = '', $barcode = '')
+	{
+		if (empty($id) && empty($ref) && empty($ref_ext) && empty($barcode)) {
+			throw new RestException(400, 'bad value for parameter id, ref, ref_ext or barcode');
+		}
+
+		$id = (empty($id) ? 0 : $id);
+
+		if (!DolibarrApiAccess::$user->rights->produit->lire) {
+			throw new RestException(403);
+		}
+
+		$result = $this->product->fetch($id, $ref, $ref_ext, $barcode);
+		if (!$result) {
+			throw new RestException(404, 'Product not found');
+		}
+
+		if (!DolibarrApi::_checkAccessToResource('product', $this->product->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+
+		$product_fourn_list = array();
+
+		if ($result) {
+			$product_fourn = new ProductFournisseur($this->db);
+			$product_fourn_list = $product_fourn->list_product_fournisseur_price($this->product->id, '', '', 0, 0);
+		}
+
+		foreach ($product_fourn_list as $tmpobj) {
+			$this->_cleanObjectDatas($tmpobj);
+		}
+
+		return $this->_cleanObjectDatas($product_fourn_list);
+	}
+
+	/**
+	 * Get attributes.
+	 *
+	 * @param  string $sortfield  Sort field
+	 * @param  string $sortorder  Sort order
+	 * @param  int    $limit      Limit for list
+	 * @param  int    $page       Page number
+	 * @param  string $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:color)"
+	 * @return array
+	 *
+	 * @throws RestException
+	 *
+	 * @url GET attributes
+	 */
+	public function getAttributes($sortfield = "t.ref", $sortorder = 'ASC', $limit = 100, $page = 0, $sqlfilters = '')
+	{
+		if (!DolibarrApiAccess::$user->rights->produit->lire) {
+			throw new RestException(401);
+		}
+
+		$sql = "SELECT t.rowid, t.ref, t.ref_ext, t.label, t.rang, t.entity";
+		$sql .= " FROM ".MAIN_DB_PREFIX."product_attribute as t";
+		$sql .= ' WHERE t.entity IN ('.getEntity('product').')';
+
+		// Add sql filters
+		if ($sqlfilters) {
+			if (!DolibarrApi::_checkFilters($sqlfilters)) {
+				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+			}
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
+
+		$sql .= $this->db->order($sortfield, $sortorder);
+		if ($limit) {
+			if ($page < 0) {
+				$page = 0;
+			}
+			$offset = $limit * $page;
+
+			$sql .= $this->db->plimit($limit, $offset);
+		}
+
+		$result = $this->db->query($sql);
+
+		if (!$result) {
+			throw new RestException(503, 'Error when retrieve product attribute list : '.$this->db->lasterror());
+		}
+
+		$return = [];
+		while ($result = $this->db->fetch_object($query)) {
+			$tmp = new ProductAttribute($this->db);
+			$tmp->id = $result->rowid;
+			$tmp->ref = $result->ref;
+			$tmp->ref_ext = $result->ref_ext;
+			$tmp->label = $result->label;
+			$tmp->rang = $result->rang;
+			$tmp->entity = $result->entity;
+
+			$return[] = $this->_cleanObjectDatas($tmp);
+		}
+
+		if (!count($return)) {
+			throw new RestException(404, 'No product attribute found');
+		}
+
+		return $return;
+	}
+
+	/**
+	 * Get attribute by ID.
+	 *
+	 * @param  int $id ID of Attribute
+	 * @return array
+	 *
+	 * @throws RestException
+	 * @throws RestException 401
+	 * @throws RestException 404
+	 *
+	 * @url GET attributes/{id}
+	 */
+	public function getAttributeById($id)
+	{
+		if (!DolibarrApiAccess::$user->rights->produit->lire) {
+			throw new RestException(401);
+		}
+
+		$prodattr = new ProductAttribute($this->db);
+		$result = $prodattr->fetch((int) $id);
+
+		if ($result < 0) {
+			throw new RestException(404, "Product attribute not found");
+		}
+
+		$fields = ["id", "ref", "ref_ext", "label", "rang", "entity"];
+
+		foreach ($prodattr as $field => $value) {
+			if (!in_array($field, $fields)) {
+				unset($prodattr->{$field});
+			}
+		}
+
+		$sql = "SELECT COUNT(*) as nb FROM ".MAIN_DB_PREFIX."product_attribute_combination2val as pac2v";
+		$sql .= " JOIN ".MAIN_DB_PREFIX."product_attribute_combination as pac ON pac2v.fk_prod_combination = pac.rowid";
+		$sql .= " WHERE pac2v.fk_prod_attr = ".((int) $prodattr->id)." AND pac.entity IN (".getEntity('product').")";
 
 		$resql = $this->db->query($sql);
-        $obj = $this->db->fetch_object($resql);
-        $prodattr->is_used_by_products = (int) $obj->nb;
+		$obj = $this->db->fetch_object($resql);
+		$prodattr->is_used_by_products = (int) $obj->nb;
 
-        return $prodattr;
-    }
+		return $prodattr;
+	}
 
-    /**
-     * Get attributes by ref.
-     *
-     * @param  string $ref Reference of Attribute
-     * @return array
-     *
-     * @throws RestException 500
-     * @throws RestException 401
-     *
-     * @url GET attributes/ref/{ref}
-     */
-    public function getAttributesByRef($ref)
-    {
-        if (!DolibarrApiAccess::$user->rights->produit->lire) {
-            throw new RestException(401);
-        }
+	/**
+	 * Get attributes by ref.
+	 *
+	 * @param  string $ref Reference of Attribute
+	 * @return array
+	 *
+	 * @throws RestException 500
+	 * @throws RestException 401
+	 *
+	 * @url GET attributes/ref/{ref}
+	 */
+	public function getAttributesByRef($ref)
+	{
+		if (!DolibarrApiAccess::$user->rights->produit->lire) {
+			throw new RestException(401);
+		}
 
-        $sql = "SELECT rowid, ref, ref_ext, label, rang, entity FROM ".MAIN_DB_PREFIX."product_attribute WHERE ref LIKE '".trim($ref)."' AND entity IN (".getEntity('product').")";
+		$sql = "SELECT rowid, ref, ref_ext, label, rang, entity FROM ".MAIN_DB_PREFIX."product_attribute WHERE ref LIKE '".trim($ref)."' AND entity IN (".getEntity('product').")";
 
-        $query = $this->db->query($sql);
+		$query = $this->db->query($sql);
 
-        if (!$this->db->num_rows($query)) {
-            throw new RestException(404);
-        }
+		if (!$this->db->num_rows($query)) {
+			throw new RestException(404);
+		}
 
-        $result = $this->db->fetch_object($query);
+		$result = $this->db->fetch_object($query);
 
-        $attr = [];
-        $attr['id'] = $result->rowid;
-        $attr['ref'] = $result->ref;
-        $attr['ref_ext'] = $result->ref_ext;
-        $attr['label'] = $result->label;
-        $attr['rang'] = $result->rang;
+		$attr = [];
+		$attr['id'] = $result->rowid;
+		$attr['ref'] = $result->ref;
+		$attr['ref_ext'] = $result->ref_ext;
+		$attr['label'] = $result->label;
+		$attr['rang'] = $result->rang;
 		$attr['entity'] = $result->entity;
 
-        $sql = "SELECT COUNT(*) as nb FROM ".MAIN_DB_PREFIX."product_attribute_combination2val as pac2v";
-        $sql .= " JOIN ".MAIN_DB_PREFIX."product_attribute_combination as pac ON pac2v.fk_prod_combination = pac.rowid";
-        $sql .= " WHERE pac2v.fk_prod_attr = ".((int) $result->rowid)." AND pac.entity IN (".getEntity('product').")";
+		$sql = "SELECT COUNT(*) as nb FROM ".MAIN_DB_PREFIX."product_attribute_combination2val as pac2v";
+		$sql .= " JOIN ".MAIN_DB_PREFIX."product_attribute_combination as pac ON pac2v.fk_prod_combination = pac.rowid";
+		$sql .= " WHERE pac2v.fk_prod_attr = ".((int) $result->rowid)." AND pac.entity IN (".getEntity('product').")";
 
 		$resql = $this->db->query($sql);
-        $obj = $this->db->fetch_object($resql);
+		$obj = $this->db->fetch_object($resql);
 
-        $attr["is_used_by_products"] = (int) $obj->nb;
+		$attr["is_used_by_products"] = (int) $obj->nb;
 
-        return $attr;
-    }
+		return $attr;
+	}
 
-    /**
-     * Get attributes by ref_ext.
-     *
-     * @param  string $ref_ext External reference of Attribute
-     * @return array
-     *
-     * @throws RestException 500
-     * @throws RestException 401
-     *
-     * @url GET attributes/ref_ext/{ref_ext}
-     */
-    public function getAttributesByRefExt($ref_ext)
-    {
-        if (!DolibarrApiAccess::$user->rights->produit->lire) {
-            throw new RestException(401);
-        }
+	/**
+	 * Get attributes by ref_ext.
+	 *
+	 * @param  string $ref_ext External reference of Attribute
+	 * @return array
+	 *
+	 * @throws RestException 500
+	 * @throws RestException 401
+	 *
+	 * @url GET attributes/ref_ext/{ref_ext}
+	 */
+	public function getAttributesByRefExt($ref_ext)
+	{
+		if (!DolibarrApiAccess::$user->rights->produit->lire) {
+			throw new RestException(401);
+		}
 
-        $sql = "SELECT rowid, ref, ref_ext, label, rang, entity FROM ".MAIN_DB_PREFIX."product_attribute WHERE ref_ext LIKE '".trim($ref_ext)."' AND entity IN (".getEntity('product').")";
+		$sql = "SELECT rowid, ref, ref_ext, label, rang, entity FROM ".MAIN_DB_PREFIX."product_attribute WHERE ref_ext LIKE '".trim($ref_ext)."' AND entity IN (".getEntity('product').")";
 
-        $query = $this->db->query($sql);
+		$query = $this->db->query($sql);
 
-        if (!$this->db->num_rows($query)) {
-            throw new RestException(404);
-        }
+		if (!$this->db->num_rows($query)) {
+			throw new RestException(404);
+		}
 
-        $result = $this->db->fetch_object($query);
+		$result = $this->db->fetch_object($query);
 
-        $attr = [];
-        $attr['id'] = $result->rowid;
-        $attr['ref'] = $result->ref;
-        $attr['ref_ext'] = $result->ref_ext;
-        $attr['label'] = $result->label;
-        $attr['rang'] = $result->rang;
+		$attr = [];
+		$attr['id'] = $result->rowid;
+		$attr['ref'] = $result->ref;
+		$attr['ref_ext'] = $result->ref_ext;
+		$attr['label'] = $result->label;
+		$attr['rang'] = $result->rang;
 		$attr['entity'] = $result->entity;
 
-        $sql = "SELECT COUNT(*) as nb FROM ".MAIN_DB_PREFIX."product_attribute_combination2val as pac2v";
-        $sql .= " JOIN ".MAIN_DB_PREFIX."product_attribute_combination as pac ON pac2v.fk_prod_combination = pac.rowid";
-        $sql .= " WHERE pac2v.fk_prod_attr = ".((int) $result->rowid)." AND pac.entity IN (".getEntity('product').")";
+		$sql = "SELECT COUNT(*) as nb FROM ".MAIN_DB_PREFIX."product_attribute_combination2val as pac2v";
+		$sql .= " JOIN ".MAIN_DB_PREFIX."product_attribute_combination as pac ON pac2v.fk_prod_combination = pac.rowid";
+		$sql .= " WHERE pac2v.fk_prod_attr = ".((int) $result->rowid)." AND pac.entity IN (".getEntity('product').")";
 
 		$resql = $this->db->query($sql);
-        $obj = $this->db->fetch_object($resql);
-        $attr["is_used_by_products"] = (int) $obj->nb;
+		$obj = $this->db->fetch_object($resql);
+		$attr["is_used_by_products"] = (int) $obj->nb;
 
-        return $attr;
-    }
+		return $attr;
+	}
 
-    /**
-     * Add attributes.
-     *
-     * @param  string $ref   Reference of Attribute
-     * @param  string $label Label of Attribute
-     * @param  string $ref_ext   Reference of Attribute
-     * @return int
-     *
-     * @throws RestException 500
-     * @throws RestException 401
-     *
-     * @url POST attributes
-     */
-    public function addAttributes($ref, $label, $ref_ext = '')
-    {
-        if (!DolibarrApiAccess::$user->rights->produit->creer) {
-            throw new RestException(401);
-        }
+	/**
+	 * Add attributes.
+	 *
+	 * @param  string $ref   Reference of Attribute
+	 * @param  string $label Label of Attribute
+	 * @param  string $ref_ext   Reference of Attribute
+	 * @return int
+	 *
+	 * @throws RestException 500
+	 * @throws RestException 401
+	 *
+	 * @url POST attributes
+	 */
+	public function addAttributes($ref, $label, $ref_ext = '')
+	{
+		if (!DolibarrApiAccess::$user->rights->produit->creer) {
+			throw new RestException(401);
+		}
 
-        $prodattr = new ProductAttribute($this->db);
-        $prodattr->label = $label;
-        $prodattr->ref = $ref;
-        $prodattr->ref_ext = $ref_ext;
+		$prodattr = new ProductAttribute($this->db);
+		$prodattr->label = $label;
+		$prodattr->ref = $ref;
+		$prodattr->ref_ext = $ref_ext;
 
-        $resid = $prodattr->create(DolibarrApiAccess::$user);
-        if ($resid <= 0) {
-            throw new RestException(500, "Error creating new attribute");
-        }
-        return $resid;
-    }
+		$resid = $prodattr->create(DolibarrApiAccess::$user);
+		if ($resid <= 0) {
+			throw new RestException(500, "Error creating new attribute");
+		}
+		return $resid;
+	}
 
-    /**
-     * Update attributes by id.
-     *
-     * @param  int $id    ID of Attribute
-     * @param  array $request_data Datas
-     * @return array
-     *
-     * @throws RestException
-     * @throws RestException 401
-     * @throws RestException 404
-     *
-     * @url PUT attributes/{id}
-     */
-    public function putAttributes($id, $request_data = null)
-    {
-        if (!DolibarrApiAccess::$user->rights->produit->creer) {
-            throw new RestException(401);
-        }
+	/**
+	 * Update attributes by id.
+	 *
+	 * @param  int $id    ID of Attribute
+	 * @param  array $request_data Datas
+	 * @return array
+	 *
+	 * @throws RestException
+	 * @throws RestException 401
+	 * @throws RestException 404
+	 *
+	 * @url PUT attributes/{id}
+	 */
+	public function putAttributes($id, $request_data = null)
+	{
+		if (!DolibarrApiAccess::$user->rights->produit->creer) {
+			throw new RestException(401);
+		}
 
-        $prodattr = new ProductAttribute($this->db);
+		$prodattr = new ProductAttribute($this->db);
 
-        $result = $prodattr->fetch((int) $id);
-        if ($result == 0) {
-            throw new RestException(404, 'Attribute not found');
-        } elseif ($result < 0) {
-            throw new RestException(500, "Error fetching attribute");
-        }
+		$result = $prodattr->fetch((int) $id);
+		if ($result == 0) {
+			throw new RestException(404, 'Attribute not found');
+		} elseif ($result < 0) {
+			throw new RestException(500, "Error fetching attribute");
+		}
 
-        foreach ($request_data as $field => $value) {
-            if ($field == 'rowid') { continue;
-            }
-            $prodattr->$field = $value;
-        }
+		foreach ($request_data as $field => $value) {
+			if ($field == 'rowid') { continue;
+			}
+			$prodattr->$field = $value;
+		}
 
-        if ($prodattr->update(DolibarrApiAccess::$user) > 0) {
-            $result = $prodattr->fetch((int) $id);
-            if ($result == 0) {
-                throw new RestException(404, 'Attribute not found');
-            } elseif ($result < 0) {
-                throw new RestException(500, "Error fetching attribute");
-            } else {
-                return $prodattr;
-            }
-        }
-        throw new RestException(500, "Error updating attribute");
-    }
+		if ($prodattr->update(DolibarrApiAccess::$user) > 0) {
+			$result = $prodattr->fetch((int) $id);
+			if ($result == 0) {
+				throw new RestException(404, 'Attribute not found');
+			} elseif ($result < 0) {
+				throw new RestException(500, "Error fetching attribute");
+			} else {
+				return $prodattr;
+			}
+		}
+		throw new RestException(500, "Error updating attribute");
+	}
 
-    /**
-     * Delete attributes by id.
-     *
-     * @param  int $id 	ID of Attribute
-     * @return int		Result of deletion
-     *
-     * @throws RestException 500
-     * @throws RestException 401
-     *
-     * @url DELETE attributes/{id}
-     */
-    public function deleteAttributes($id)
-    {
-        if (!DolibarrApiAccess::$user->rights->produit->supprimer) {
-            throw new RestException(401);
-        }
+	/**
+	 * Delete attributes by id.
+	 *
+	 * @param  int $id 	ID of Attribute
+	 * @return int		Result of deletion
+	 *
+	 * @throws RestException 500
+	 * @throws RestException 401
+	 *
+	 * @url DELETE attributes/{id}
+	 */
+	public function deleteAttributes($id)
+	{
+		if (!DolibarrApiAccess::$user->rights->produit->supprimer) {
+			throw new RestException(401);
+		}
 
-        $prodattr = new ProductAttribute($this->db);
-        $prodattr->id = (int) $id;
-        $result = $prodattr->delete(DolibarrApiAccess::$user);
+		$prodattr = new ProductAttribute($this->db);
+		$prodattr->id = (int) $id;
+		$result = $prodattr->delete(DolibarrApiAccess::$user);
 
-        if ($result <= 0) {
-            throw new RestException(500, "Error deleting attribute");
-        }
+		if ($result <= 0) {
+			throw new RestException(500, "Error deleting attribute");
+		}
 
-        return $result;
-    }
+		return $result;
+	}
 
-    /**
-     * Get attribute value by id.
-     *
-     * @param  int $id ID of Attribute value
-     * @return array
-     *
-     * @throws RestException 500
-     * @throws RestException 401
-     *
-     * @url GET attributes/values/{id}
-     */
-    public function getAttributeValueById($id)
-    {
-        if (!DolibarrApiAccess::$user->rights->produit->lire) {
-            throw new RestException(401);
-        }
+	/**
+	 * Get attribute value by id.
+	 *
+	 * @param  int $id ID of Attribute value
+	 * @return array
+	 *
+	 * @throws RestException 500
+	 * @throws RestException 401
+	 *
+	 * @url GET attributes/values/{id}
+	 */
+	public function getAttributeValueById($id)
+	{
+		if (!DolibarrApiAccess::$user->rights->produit->lire) {
+			throw new RestException(401);
+		}
 
-        $sql = "SELECT rowid, fk_product_attribute, ref, value FROM ".MAIN_DB_PREFIX."product_attribute_value WHERE rowid = ".(int) $id." AND entity IN (".getEntity('product').")";
+		$sql = "SELECT rowid, fk_product_attribute, ref, value FROM ".MAIN_DB_PREFIX."product_attribute_value WHERE rowid = ".(int) $id." AND entity IN (".getEntity('product').")";
 
-        $query = $this->db->query($sql);
+		$query = $this->db->query($sql);
 
-        if (!$query) {
-            throw new RestException(401);
-        }
+		if (!$query) {
+			throw new RestException(401);
+		}
 
-        if (!$this->db->num_rows($query)) {
-            throw new RestException(404, 'Attribute value not found');
-        }
+		if (!$this->db->num_rows($query)) {
+			throw new RestException(404, 'Attribute value not found');
+		}
 
-        $result = $this->db->fetch_object($query);
+		$result = $this->db->fetch_object($query);
 
-        $attrval = [];
-        $attrval['id'] = $result->rowid;
-        $attrval['fk_product_attribute'] = $result->fk_product_attribute;
-        $attrval['ref'] = $result->ref;
-        $attrval['value'] = $result->value;
+		$attrval = [];
+		$attrval['id'] = $result->rowid;
+		$attrval['fk_product_attribute'] = $result->fk_product_attribute;
+		$attrval['ref'] = $result->ref;
+		$attrval['value'] = $result->value;
 
-        return $attrval;
-    }
+		return $attrval;
+	}
 
-    /**
-     * Get attribute value by ref.
-     *
-     * @param  int $id ID of Attribute value
-     * @param  string $ref Ref of Attribute value
-     * @return array
-     *
-     * @throws RestException 500
-     * @throws RestException 401
-     *
-     * @url GET attributes/{id}/values/ref/{ref}
-     */
-    public function getAttributeValueByRef($id, $ref)
-    {
-        if (!DolibarrApiAccess::$user->rights->produit->lire) {
-            throw new RestException(401);
-        }
+	/**
+	 * Get attribute value by ref.
+	 *
+	 * @param  int $id ID of Attribute value
+	 * @param  string $ref Ref of Attribute value
+	 * @return array
+	 *
+	 * @throws RestException 500
+	 * @throws RestException 401
+	 *
+	 * @url GET attributes/{id}/values/ref/{ref}
+	 */
+	public function getAttributeValueByRef($id, $ref)
+	{
+		if (!DolibarrApiAccess::$user->rights->produit->lire) {
+			throw new RestException(401);
+		}
 
-        $sql = "SELECT rowid, fk_product_attribute, ref, value FROM ".MAIN_DB_PREFIX."product_attribute_value WHERE ref LIKE '".trim($ref)."' AND fk_product_attribute = ".(int) $id." AND entity IN (".getEntity('product').")";
+		$sql = "SELECT rowid, fk_product_attribute, ref, value FROM ".MAIN_DB_PREFIX."product_attribute_value WHERE ref LIKE '".trim($ref)."' AND fk_product_attribute = ".(int) $id." AND entity IN (".getEntity('product').")";
 
-        $query = $this->db->query($sql);
+		$query = $this->db->query($sql);
 
-        if (!$query) {
-            throw new RestException(401);
-        }
+		if (!$query) {
+			throw new RestException(401);
+		}
 
-        if (!$this->db->num_rows($query)) {
-            throw new RestException(404, 'Attribute value not found');
-        }
+		if (!$this->db->num_rows($query)) {
+			throw new RestException(404, 'Attribute value not found');
+		}
 
-        $result = $this->db->fetch_object($query);
+		$result = $this->db->fetch_object($query);
 
-        $attrval = [];
-        $attrval['id'] = $result->rowid;
-        $attrval['fk_product_attribute'] = $result->fk_product_attribute;
-        $attrval['ref'] = $result->ref;
-        $attrval['value'] = $result->value;
+		$attrval = [];
+		$attrval['id'] = $result->rowid;
+		$attrval['fk_product_attribute'] = $result->fk_product_attribute;
+		$attrval['ref'] = $result->ref;
+		$attrval['value'] = $result->value;
 
-        return $attrval;
-    }
+		return $attrval;
+	}
 
-    /**
-     * Delete attribute value by ref.
-     *
-     * @param  int $id ID of Attribute
-     * @param  string $ref Ref of Attribute value
-     * @return int
-     *
-     * @throws RestException 401
-     *
-     * @url DELETE attributes/{id}/values/ref/{ref}
-     */
-    public function deleteAttributeValueByRef($id, $ref)
-    {
-        if (!DolibarrApiAccess::$user->rights->produit->supprimer) {
-            throw new RestException(401);
-        }
+	/**
+	 * Delete attribute value by ref.
+	 *
+	 * @param  int $id ID of Attribute
+	 * @param  string $ref Ref of Attribute value
+	 * @return int
+	 *
+	 * @throws RestException 401
+	 *
+	 * @url DELETE attributes/{id}/values/ref/{ref}
+	 */
+	public function deleteAttributeValueByRef($id, $ref)
+	{
+		if (!DolibarrApiAccess::$user->rights->produit->supprimer) {
+			throw new RestException(401);
+		}
 
-        $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."product_attribute_value WHERE ref LIKE '".trim($ref)."' AND fk_product_attribute = ".(int) $id." AND entity IN (".getEntity('product').")";
-        $query = $this->db->query($sql);
+		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."product_attribute_value WHERE ref LIKE '".trim($ref)."' AND fk_product_attribute = ".(int) $id." AND entity IN (".getEntity('product').")";
+		$query = $this->db->query($sql);
 
-        if (!$query) {
-            throw new RestException(401);
-        }
+		if (!$query) {
+			throw new RestException(401);
+		}
 
-        if (!$this->db->num_rows($query)) {
-            throw new RestException(404, 'Attribute value not found');
-        }
+		if (!$this->db->num_rows($query)) {
+			throw new RestException(404, 'Attribute value not found');
+		}
 
-        $result = $this->db->fetch_object($query);
+		$result = $this->db->fetch_object($query);
 
-        $attrval = new ProductAttributeValue($this->db);
-        $attrval->id = $result->rowid;
-        $result = $attrval->delete(DolibarrApiAccess::$user);
-        if ($result > 0) {
-            return 1;
-        }
+		$attrval = new ProductAttributeValue($this->db);
+		$attrval->id = $result->rowid;
+		$result = $attrval->delete(DolibarrApiAccess::$user);
+		if ($result > 0) {
+			return 1;
+		}
 
-        throw new RestException(500, "Error deleting attribute value");
-    }
+		throw new RestException(500, "Error deleting attribute value");
+	}
 
-    /**
-     * Get all values for an attribute id.
-     *
-     * @param  int $id ID of an Attribute
-     * @return array
-     *
-     * @throws RestException 401
-     * @throws RestException 500
-     *
-     * @url GET attributes/{id}/values
-     */
-    public function getAttributeValues($id)
-    {
-        if (!DolibarrApiAccess::$user->rights->produit->lire) {
-            throw new RestException(401);
-        }
+	/**
+	 * Get all values for an attribute id.
+	 *
+	 * @param  int $id ID of an Attribute
+	 * @return array
+	 *
+	 * @throws RestException 401
+	 * @throws RestException 500
+	 *
+	 * @url GET attributes/{id}/values
+	 */
+	public function getAttributeValues($id)
+	{
+		if (!DolibarrApiAccess::$user->rights->produit->lire) {
+			throw new RestException(401);
+		}
 
-        $objectval = new ProductAttributeValue($this->db);
+		$objectval = new ProductAttributeValue($this->db);
 
-        $return = $objectval->fetchAllByProductAttribute((int) $id);
+		$return = $objectval->fetchAllByProductAttribute((int) $id);
 
-        if (count($return) == 0) {
-            throw new RestException(404, 'Attribute values not found');
-        }
+		if (count($return) == 0) {
+			throw new RestException(404, 'Attribute values not found');
+		}
 
 		foreach ($return as $key => $val) {
 			$return[$key] = $this->_cleanObjectDatas($return[$key]);
-        }
+		}
 
-        return $return;
-    }
+		return $return;
+	}
 
-    /**
-     * Get all values for an attribute ref.
-     *
-     * @param  string $ref Ref of an Attribute
-     * @return array
-     *
-     * @throws RestException 401
-     *
-     * @url GET attributes/ref/{ref}/values
-     */
-    public function getAttributeValuesByRef($ref)
-    {
-        if (!DolibarrApiAccess::$user->rights->produit->lire) {
-            throw new RestException(401);
-        }
+	/**
+	 * Get all values for an attribute ref.
+	 *
+	 * @param  string $ref Ref of an Attribute
+	 * @return array
+	 *
+	 * @throws RestException 401
+	 *
+	 * @url GET attributes/ref/{ref}/values
+	 */
+	public function getAttributeValuesByRef($ref)
+	{
+		if (!DolibarrApiAccess::$user->rights->produit->lire) {
+			throw new RestException(401);
+		}
 
-        $return = array();
+		$return = array();
 
-        $sql = 'SELECT ';
-        $sql .= 'v.fk_product_attribute, v.rowid, v.ref, v.value FROM '.MAIN_DB_PREFIX.'product_attribute_value as v';
-        $sql .= " WHERE v.fk_product_attribute IN (SELECT rowid FROM ".MAIN_DB_PREFIX."product_attribute WHERE ref LIKE '".$this->db->escape(trim($ref))."')";
+		$sql = 'SELECT ';
+		$sql .= 'v.fk_product_attribute, v.rowid, v.ref, v.value FROM '.MAIN_DB_PREFIX.'product_attribute_value as v';
+		$sql .= " WHERE v.fk_product_attribute IN (SELECT rowid FROM ".MAIN_DB_PREFIX."product_attribute WHERE ref LIKE '".$this->db->escape(trim($ref))."')";
 
-        $resql = $this->db->query($sql);
+		$resql = $this->db->query($sql);
 
-        while ($result = $this->db->fetch_object($resql)) {
-            $tmp = new ProductAttributeValue($this->db);
-            $tmp->fk_product_attribute = $result->fk_product_attribute;
-            $tmp->id = $result->rowid;
-            $tmp->ref = $result->ref;
-            $tmp->value = $result->value;
+		while ($result = $this->db->fetch_object($resql)) {
+			$tmp = new ProductAttributeValue($this->db);
+			$tmp->fk_product_attribute = $result->fk_product_attribute;
+			$tmp->id = $result->rowid;
+			$tmp->ref = $result->ref;
+			$tmp->value = $result->value;
 
-            $return[] = $this->_cleanObjectDatas($tmp);
-        }
+			$return[] = $this->_cleanObjectDatas($tmp);
+		}
 
-        return $return;
-    }
+		return $return;
+	}
 
-    /**
-     * Add attribute value.
-     *
-     * @param  int    $id    ID of Attribute
-     * @param  string $ref   Reference of Attribute value
-     * @param  string $value Value of Attribute value
-     * @return int
-     *
-     * @throws RestException 500
-     * @throws RestException 401
-     *
-     * @url POST attributes/{id}/values
-     */
-    public function addAttributeValue($id, $ref, $value)
-    {
-        if (!DolibarrApiAccess::$user->rights->produit->creer) {
-            throw new RestException(401);
-        }
+	/**
+	 * Add attribute value.
+	 *
+	 * @param  int    $id    ID of Attribute
+	 * @param  string $ref   Reference of Attribute value
+	 * @param  string $value Value of Attribute value
+	 * @return int
+	 *
+	 * @throws RestException 500
+	 * @throws RestException 401
+	 *
+	 * @url POST attributes/{id}/values
+	 */
+	public function addAttributeValue($id, $ref, $value)
+	{
+		if (!DolibarrApiAccess::$user->rights->produit->creer) {
+			throw new RestException(401);
+		}
 
-        if (empty($ref) || empty($value)) {
-            throw new RestException(401);
-        }
+		if (empty($ref) || empty($value)) {
+			throw new RestException(401);
+		}
 
-        $objectval = new ProductAttributeValue($this->db);
-        $objectval->fk_product_attribute = $id;
-        $objectval->ref = $ref;
-        $objectval->value = $value;
+		$objectval = new ProductAttributeValue($this->db);
+		$objectval->fk_product_attribute = $id;
+		$objectval->ref = $ref;
+		$objectval->value = $value;
 
-        if ($objectval->create(DolibarrApiAccess::$user) > 0) {
-            return $objectval->id;
-        }
-        throw new RestException(500, "Error creating new attribute value");
-    }
+		if ($objectval->create(DolibarrApiAccess::$user) > 0) {
+			return $objectval->id;
+		}
+		throw new RestException(500, "Error creating new attribute value");
+	}
 
-    /**
-     * Update attribute value.
-     *
-     * @param  int $id ID of Attribute
-     * @param  array $request_data Datas
-     * @return array
-     *
-     * @throws RestException 401
-     * @throws RestException 500
-     *
-     * @url PUT attributes/values/{id}
-     */
-    public function putAttributeValue($id, $request_data)
-    {
-        if (!DolibarrApiAccess::$user->rights->produit->creer) {
-            throw new RestException(401);
-        }
+	/**
+	 * Update attribute value.
+	 *
+	 * @param  int $id ID of Attribute
+	 * @param  array $request_data Datas
+	 * @return array
+	 *
+	 * @throws RestException 401
+	 * @throws RestException 500
+	 *
+	 * @url PUT attributes/values/{id}
+	 */
+	public function putAttributeValue($id, $request_data)
+	{
+		if (!DolibarrApiAccess::$user->rights->produit->creer) {
+			throw new RestException(401);
+		}
 
-        $objectval = new ProductAttributeValue($this->db);
-        $result = $objectval->fetch((int) $id);
+		$objectval = new ProductAttributeValue($this->db);
+		$result = $objectval->fetch((int) $id);
 
-        if ($result == 0) {
-            throw new RestException(404, 'Attribute value not found');
-        } elseif ($result < 0) {
-            throw new RestException(500, "Error fetching attribute value");
-        }
+		if ($result == 0) {
+			throw new RestException(404, 'Attribute value not found');
+		} elseif ($result < 0) {
+			throw new RestException(500, "Error fetching attribute value");
+		}
 
-        foreach ($request_data as $field => $value) {
-            if ($field == 'rowid') { continue;
-            }
-            $objectval->$field = $value;
-        }
+		foreach ($request_data as $field => $value) {
+			if ($field == 'rowid') { continue;
+			}
+			$objectval->$field = $value;
+		}
 
-        if ($objectval->update(DolibarrApiAccess::$user) > 0) {
-            $result = $objectval->fetch((int) $id);
-            if ($result == 0) {
-                throw new RestException(404, 'Attribute not found');
-            } elseif ($result < 0) {
-                throw new RestException(500, "Error fetching attribute");
-            } else {
-                return $objectval;
-            }
-        }
-        throw new RestException(500, "Error updating attribute");
-    }
+		if ($objectval->update(DolibarrApiAccess::$user) > 0) {
+			$result = $objectval->fetch((int) $id);
+			if ($result == 0) {
+				throw new RestException(404, 'Attribute not found');
+			} elseif ($result < 0) {
+				throw new RestException(500, "Error fetching attribute");
+			} else {
+				return $objectval;
+			}
+		}
+		throw new RestException(500, "Error updating attribute");
+	}
 
-    /**
-     * Delete attribute value by id.
-     *
-     * @param  int $id ID of Attribute value
-     * @return int
-     *
-     * @throws RestException 500
-     * @throws RestException 401
-     *
-     * @url DELETE attributes/values/{id}
-     */
-    public function deleteAttributeValueById($id)
-    {
-        if (!DolibarrApiAccess::$user->rights->produit->supprimer) {
-            throw new RestException(401);
-        }
+	/**
+	 * Delete attribute value by id.
+	 *
+	 * @param  int $id ID of Attribute value
+	 * @return int
+	 *
+	 * @throws RestException 500
+	 * @throws RestException 401
+	 *
+	 * @url DELETE attributes/values/{id}
+	 */
+	public function deleteAttributeValueById($id)
+	{
+		if (!DolibarrApiAccess::$user->rights->produit->supprimer) {
+			throw new RestException(401);
+		}
 
-        $objectval = new ProductAttributeValue($this->db);
-        $objectval->id = (int) $id;
+		$objectval = new ProductAttributeValue($this->db);
+		$objectval->id = (int) $id;
 
-        if ($objectval->delete(DolibarrApiAccess::$user) > 0) {
-            return 1;
-        }
-        throw new RestException(500, "Error deleting attribute value");
-    }
+		if ($objectval->delete(DolibarrApiAccess::$user) > 0) {
+			return 1;
+		}
+		throw new RestException(500, "Error deleting attribute value");
+	}
 
-    /**
-     * Get product variants.
-     *
-     * @param  int $id ID of Product
-     * @return array
-     *
-     * @throws RestException 500
-     * @throws RestException 401
-     *
-     * @url GET {id}/variants
-     */
-    public function getVariants($id)
-    {
-        if (!DolibarrApiAccess::$user->rights->produit->lire) {
-            throw new RestException(401);
-        }
+	/**
+	 * Get product variants.
+	 *
+	 * @param  int $id ID of Product
+	 * @return array
+	 *
+	 * @throws RestException 500
+	 * @throws RestException 401
+	 *
+	 * @url GET {id}/variants
+	 */
+	public function getVariants($id)
+	{
+		if (!DolibarrApiAccess::$user->rights->produit->lire) {
+			throw new RestException(401);
+		}
 
-        $prodcomb = new ProductCombination($this->db);
-        $combinations = $prodcomb->fetchAllByFkProductParent((int) $id);
+		$prodcomb = new ProductCombination($this->db);
+		$combinations = $prodcomb->fetchAllByFkProductParent((int) $id);
 
-        foreach ($combinations as $key => $combination) {
-            $prodc2vp = new ProductCombination2ValuePair($this->db);
-            $combinations[$key]->attributes = $prodc2vp->fetchByFkCombination((int) $combination->id);
-        }
+		foreach ($combinations as $key => $combination) {
+			$prodc2vp = new ProductCombination2ValuePair($this->db);
+			$combinations[$key]->attributes = $prodc2vp->fetchByFkCombination((int) $combination->id);
+		}
 
-        return $combinations;
-    }
+		return $combinations;
+	}
 
-    /**
-     * Get product variants by Product ref.
-     *
-     * @param  string $ref Ref of Product
-     * @return array
-     *
-     * @throws RestException 500
-     * @throws RestException 401
-     *
-     * @url GET ref/{ref}/variants
-     */
-    public function getVariantsByProdRef($ref)
-    {
-        if (!DolibarrApiAccess::$user->rights->produit->lire) {
-            throw new RestException(401);
-        }
+	/**
+	 * Get product variants by Product ref.
+	 *
+	 * @param  string $ref Ref of Product
+	 * @return array
+	 *
+	 * @throws RestException 500
+	 * @throws RestException 401
+	 *
+	 * @url GET ref/{ref}/variants
+	 */
+	public function getVariantsByProdRef($ref)
+	{
+		if (!DolibarrApiAccess::$user->rights->produit->lire) {
+			throw new RestException(401);
+		}
 
-        $result = $this->product->fetch('', $ref);
-        if (!$result) {
-            throw new RestException(404, 'Product not found');
-        }
+		$result = $this->product->fetch('', $ref);
+		if (!$result) {
+			throw new RestException(404, 'Product not found');
+		}
 
-        $prodcomb = new ProductCombination($this->db);
-        $combinations = $prodcomb->fetchAllByFkProductParent((int) $this->product->id);
+		$prodcomb = new ProductCombination($this->db);
+		$combinations = $prodcomb->fetchAllByFkProductParent((int) $this->product->id);
 
-        foreach ($combinations as $key => $combination) {
-            $prodc2vp = new ProductCombination2ValuePair($this->db);
-            $combinations[$key]->attributes = $prodc2vp->fetchByFkCombination((int) $combination->id);
-        }
+		foreach ($combinations as $key => $combination) {
+			$prodc2vp = new ProductCombination2ValuePair($this->db);
+			$combinations[$key]->attributes = $prodc2vp->fetchByFkCombination((int) $combination->id);
+		}
 
-        return $combinations;
-    }
+		return $combinations;
+	}
 
-    /**
-     * Add variant.
-     *
-     * "features" is a list of attributes pairs id_attribute=>id_value. Example: array(id_color=>id_Blue, id_size=>id_small, id_option=>id_val_a, ...)
-     *
-     * @param  int $id ID of Product
-     * @param  float $weight_impact Weight impact of variant
-     * @param  float $price_impact Price impact of variant
-     * @param  bool $price_impact_is_percent Price impact in percent (true or false)
-     * @param  array $features List of attributes pairs id_attribute->id_value. Example: array(id_color=>id_Blue, id_size=>id_small, id_option=>id_val_a, ...)
-     * @param  string $reference Customized reference of variant
-     * @param  string $ref_ext External reference of variant
-     * @return int
-     *
-     * @throws RestException 500
-     * @throws RestException 401
-     * @throws RestException 404
-     *
-     * @url POST {id}/variants
-     */
-    public function addVariant($id, $weight_impact, $price_impact, $price_impact_is_percent, $features, $reference = '', $ref_ext = '')
-    {
-        if (!DolibarrApiAccess::$user->rights->produit->creer) {
-            throw new RestException(401);
-        }
+	/**
+	 * Add variant.
+	 *
+	 * "features" is a list of attributes pairs id_attribute=>id_value. Example: array(id_color=>id_Blue, id_size=>id_small, id_option=>id_val_a, ...)
+	 *
+	 * @param  int $id ID of Product
+	 * @param  float $weight_impact Weight impact of variant
+	 * @param  float $price_impact Price impact of variant
+	 * @param  bool $price_impact_is_percent Price impact in percent (true or false)
+	 * @param  array $features List of attributes pairs id_attribute->id_value. Example: array(id_color=>id_Blue, id_size=>id_small, id_option=>id_val_a, ...)
+	 * @param  string $reference Customized reference of variant
+	 * @param  string $ref_ext External reference of variant
+	 * @return int
+	 *
+	 * @throws RestException 500
+	 * @throws RestException 401
+	 * @throws RestException 404
+	 *
+	 * @url POST {id}/variants
+	 */
+	public function addVariant($id, $weight_impact, $price_impact, $price_impact_is_percent, $features, $reference = '', $ref_ext = '')
+	{
+		if (!DolibarrApiAccess::$user->rights->produit->creer) {
+			throw new RestException(401);
+		}
 
-        if (empty($id) || empty($features) || !is_array($features)) {
-            throw new RestException(401);
-        }
+		if (empty($id) || empty($features) || !is_array($features)) {
+			throw new RestException(401);
+		}
 
-        $weight_impact = price2num($weight_impact);
-        $price_impact = price2num($price_impact);
+		$weight_impact = price2num($weight_impact);
+		$price_impact = price2num($price_impact);
 
-        $prodattr = new ProductAttribute($this->db);
-        $prodattr_val = new ProductAttributeValue($this->db);
-        foreach ($features as $id_attr => $id_value) {
-            if ($prodattr->fetch((int) $id_attr) < 0) {
-                throw new RestException(401);
-            }
-            if ($prodattr_val->fetch((int) $id_value) < 0) {
-                throw new RestException(401);
-            }
-        }
+		$prodattr = new ProductAttribute($this->db);
+		$prodattr_val = new ProductAttributeValue($this->db);
+		foreach ($features as $id_attr => $id_value) {
+			if ($prodattr->fetch((int) $id_attr) < 0) {
+				throw new RestException(401);
+			}
+			if ($prodattr_val->fetch((int) $id_value) < 0) {
+				throw new RestException(401);
+			}
+		}
 
-        $result = $this->product->fetch((int) $id);
-        if (!$result) {
-            throw new RestException(404, 'Product not found');
-        }
+		$result = $this->product->fetch((int) $id);
+		if (!$result) {
+			throw new RestException(404, 'Product not found');
+		}
 
-        $prodcomb = new ProductCombination($this->db);
+		$prodcomb = new ProductCombination($this->db);
 
-        $result = $prodcomb->createProductCombination(DolibarrApiAccess::$user, $this->product, $features, array(), $price_impact_is_percent, $price_impact, $weight_impact, $reference, $ref_ext);
-        if ($result > 0)
-        {
-            return $result;
-        } else {
-            throw new RestException(500, "Error creating new product variant");
-        }
-    }
+		$result = $prodcomb->createProductCombination(DolibarrApiAccess::$user, $this->product, $features, array(), $price_impact_is_percent, $price_impact, $weight_impact, $reference, $ref_ext);
+		if ($result > 0)
+		{
+			return $result;
+		} else {
+			throw new RestException(500, "Error creating new product variant");
+		}
+	}
 
-    /**
-     * Add variant by product ref.
-     *
-     * "features" is a list of attributes pairs id_attribute=>id_value. Example: array(id_color=>id_Blue, id_size=>id_small, id_option=>id_val_a, ...)
-     *
-     * @param  string $ref                      Ref of Product
-     * @param  float  $weight_impact            Weight impact of variant
-     * @param  float  $price_impact             Price impact of variant
-     * @param  bool   $price_impact_is_percent  Price impact in percent (true or false)
-     * @param  array  $features                 List of attributes pairs id_attribute->id_value. Example: array(id_color=>id_Blue, id_size=>id_small, id_option=>id_val_a, ...)
-     * @return int
-     *
-     * @throws RestException 500
-     * @throws RestException 401
-     * @throws RestException 404
-     *
-     * @url POST ref/{ref}/variants
-     */
-    public function addVariantByProductRef($ref, $weight_impact, $price_impact, $price_impact_is_percent, $features)
-    {
-        if (!DolibarrApiAccess::$user->rights->produit->creer) {
-            throw new RestException(401);
-        }
+	/**
+	 * Add variant by product ref.
+	 *
+	 * "features" is a list of attributes pairs id_attribute=>id_value. Example: array(id_color=>id_Blue, id_size=>id_small, id_option=>id_val_a, ...)
+	 *
+	 * @param  string $ref                      Ref of Product
+	 * @param  float  $weight_impact            Weight impact of variant
+	 * @param  float  $price_impact             Price impact of variant
+	 * @param  bool   $price_impact_is_percent  Price impact in percent (true or false)
+	 * @param  array  $features                 List of attributes pairs id_attribute->id_value. Example: array(id_color=>id_Blue, id_size=>id_small, id_option=>id_val_a, ...)
+	 * @return int
+	 *
+	 * @throws RestException 500
+	 * @throws RestException 401
+	 * @throws RestException 404
+	 *
+	 * @url POST ref/{ref}/variants
+	 */
+	public function addVariantByProductRef($ref, $weight_impact, $price_impact, $price_impact_is_percent, $features)
+	{
+		if (!DolibarrApiAccess::$user->rights->produit->creer) {
+			throw new RestException(401);
+		}
 
-        if (empty($ref) || empty($features) || !is_array($features)) {
-            throw new RestException(401);
-        }
+		if (empty($ref) || empty($features) || !is_array($features)) {
+			throw new RestException(401);
+		}
 
-        $weight_impact = price2num($weight_impact);
-        $price_impact = price2num($price_impact);
+		$weight_impact = price2num($weight_impact);
+		$price_impact = price2num($price_impact);
 
-        $prodattr = new ProductAttribute($this->db);
-        $prodattr_val = new ProductAttributeValue($this->db);
-        foreach ($features as $id_attr => $id_value) {
-            if ($prodattr->fetch((int) $id_attr) < 0) {
-                throw new RestException(404);
-            }
-            if ($prodattr_val->fetch((int) $id_value) < 0) {
-                throw new RestException(404);
-            }
-        }
+		$prodattr = new ProductAttribute($this->db);
+		$prodattr_val = new ProductAttributeValue($this->db);
+		foreach ($features as $id_attr => $id_value) {
+			if ($prodattr->fetch((int) $id_attr) < 0) {
+				throw new RestException(404);
+			}
+			if ($prodattr_val->fetch((int) $id_value) < 0) {
+				throw new RestException(404);
+			}
+		}
 
-        $result = $this->product->fetch('', trim($ref));
-        if (!$result) {
-            throw new RestException(404, 'Product not found');
-        }
+		$result = $this->product->fetch('', trim($ref));
+		if (!$result) {
+			throw new RestException(404, 'Product not found');
+		}
 
-        $prodcomb = new ProductCombination($this->db);
-        if (!$prodcomb->fetchByProductCombination2ValuePairs($this->product->id, $features))
-        {
-            $result = $prodcomb->createProductCombination(DolibarrApiAccess::$user, $this->product, $features, array(), $price_impact_is_percent, $price_impact, $weight_impact);
-            if ($result > 0)
-            {
-                return $result;
-            } else {
-                throw new RestException(500, "Error creating new product variant");
-            }
-        } else {
-            return $prodcomb->id;
-        }
-    }
+		$prodcomb = new ProductCombination($this->db);
+		if (!$prodcomb->fetchByProductCombination2ValuePairs($this->product->id, $features))
+		{
+			$result = $prodcomb->createProductCombination(DolibarrApiAccess::$user, $this->product, $features, array(), $price_impact_is_percent, $price_impact, $weight_impact);
+			if ($result > 0)
+			{
+				return $result;
+			} else {
+				throw new RestException(500, "Error creating new product variant");
+			}
+		} else {
+			return $prodcomb->id;
+		}
+	}
 
-    /**
-     * Put product variants.
-     *
-     * @param  int $id ID of Variant
-     * @param  array $request_data Datas
-     * @return int
-     *
-     * @throws RestException 500
-     * @throws RestException 401
-     *
-     * @url PUT variants/{id}
-     */
-    public function putVariant($id, $request_data = null)
-    {
-        if (!DolibarrApiAccess::$user->rights->produit->creer) {
-            throw new RestException(401);
-        }
+	/**
+	 * Put product variants.
+	 *
+	 * @param  int $id ID of Variant
+	 * @param  array $request_data Datas
+	 * @return int
+	 *
+	 * @throws RestException 500
+	 * @throws RestException 401
+	 *
+	 * @url PUT variants/{id}
+	 */
+	public function putVariant($id, $request_data = null)
+	{
+		if (!DolibarrApiAccess::$user->rights->produit->creer) {
+			throw new RestException(401);
+		}
 
-        $prodcomb = new ProductCombination($this->db);
-        $prodcomb->fetch((int) $id);
+		$prodcomb = new ProductCombination($this->db);
+		$prodcomb->fetch((int) $id);
 
-        foreach ($request_data as $field => $value) {
-            if ($field == 'rowid') { continue;
-            }
-            $prodcomb->$field = $value;
-        }
+		foreach ($request_data as $field => $value) {
+			if ($field == 'rowid') { continue;
+			}
+			$prodcomb->$field = $value;
+		}
 
-        $result = $prodcomb->update(DolibarrApiAccess::$user);
-        if ($result > 0)
-        {
-            return 1;
-        }
-        throw new RestException(500, "Error editing variant");
-    }
+		$result = $prodcomb->update(DolibarrApiAccess::$user);
+		if ($result > 0)
+		{
+			return 1;
+		}
+		throw new RestException(500, "Error editing variant");
+	}
 
-    /**
-     * Delete product variants.
-     *
-     * @param  int $id 	ID of Variant
-     * @return int		Result of deletion
-     *
-     * @throws RestException 500
-     * @throws RestException 401
-     *
-     * @url DELETE variants/{id}
-     */
-    public function deleteVariant($id)
-    {
-        if (!DolibarrApiAccess::$user->rights->produit->supprimer) {
-            throw new RestException(401);
-        }
+	/**
+	 * Delete product variants.
+	 *
+	 * @param  int $id 	ID of Variant
+	 * @return int		Result of deletion
+	 *
+	 * @throws RestException 500
+	 * @throws RestException 401
+	 *
+	 * @url DELETE variants/{id}
+	 */
+	public function deleteVariant($id)
+	{
+		if (!DolibarrApiAccess::$user->rights->produit->supprimer) {
+			throw new RestException(401);
+		}
 
-        $prodcomb = new ProductCombination($this->db);
-        $prodcomb->id = (int) $id;
-        $result = $prodcomb->delete(DolibarrApiAccess::$user);
-        if ($result <= 0)
-        {
-            throw new RestException(500, "Error deleting variant");
-        }
-        return $result;
-    }
+		$prodcomb = new ProductCombination($this->db);
+		$prodcomb->id = (int) $id;
+		$result = $prodcomb->delete(DolibarrApiAccess::$user);
+		if ($result <= 0)
+		{
+			throw new RestException(500, "Error deleting variant");
+		}
+		return $result;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
-    /**
-     * Clean sensible object datas
-     *
-     * @param  object $object Object to clean
-     * @return array    Array of cleaned object properties
-     */
-    protected function _cleanObjectDatas($object)
-    {
-        // phpcs:enable
-        $object = parent::_cleanObjectDatas($object);
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	/**
+	 * Clean sensible object datas
+	 *
+	 * @param   Object  $object     Object to clean
+	 * @return  Object              Object with cleaned properties
+	 */
+	protected function _cleanObjectDatas($object)
+	{
+		// phpcs:enable
+		$object = parent::_cleanObjectDatas($object);
 
-        unset($object->regeximgext);
-        unset($object->price_by_qty);
-        unset($object->prices_by_qty_id);
-        unset($object->libelle);
-        unset($object->product_id_already_linked);
-        unset($object->reputations);
+		unset($object->regeximgext);
+		unset($object->price_by_qty);
+		unset($object->prices_by_qty_id);
+		unset($object->libelle);
+		unset($object->product_id_already_linked);
+		unset($object->reputations);
 
-        unset($object->name);
-        unset($object->firstname);
-        unset($object->lastname);
-        unset($object->civility_id);
+		unset($object->name);
+		unset($object->firstname);
+		unset($object->lastname);
+		unset($object->civility_id);
 
-        unset($object->recuperableonly);
+		unset($object->recuperableonly);
 
-        return $object;
-    }
+		return $object;
+	}
 
-    /**
-     * Validate fields before create or update object
-     *
-     * @param  array $data Datas to validate
-     * @return array
-     * @throws RestException
-     */
-    private function _validate($data)
-    {
-        $product = array();
-        foreach (Products::$FIELDS as $field) {
-            if (!isset($data[$field])) {
-                throw new RestException(400, "$field field missing");
-            }
-            $product[$field] = $data[$field];
-        }
-        return $product;
-    }
+	/**
+	 * Validate fields before create or update object
+	 *
+	 * @param  array $data Datas to validate
+	 * @return array
+	 * @throws RestException
+	 */
+	private function _validate($data)
+	{
+		$product = array();
+		foreach (Products::$FIELDS as $field) {
+			if (!isset($data[$field])) {
+				throw new RestException(400, "$field field missing");
+			}
+			$product[$field] = $data[$field];
+		}
+		return $product;
+	}
 
-    /**
-     * Get properties of a product object
-     *
-     * Return an array with product information.
-     *
-     * @param  int    $id                 ID of product
-     * @param  string $ref                Ref of element
-     * @param  string $ref_ext            Ref ext of element
-     * @param  string $barcode            Barcode of element
-     * @param  int    $includestockdata   Load also information about stock (slower)
-     * @param  bool   $includesubproducts Load information about subproducts (if product is a virtual product)
+	/**
+	 * Get properties of a product object
+	 *
+	 * Return an array with product information.
+	 *
+	 * @param  int    $id                 ID of product
+	 * @param  string $ref                Ref of element
+	 * @param  string $ref_ext            Ref ext of element
+	 * @param  string $barcode            Barcode of element
+	 * @param  int    $includestockdata   Load also information about stock (slower)
+	 * @param  bool   $includesubproducts Load information about subproducts (if product is a virtual product)
 	 * @param  bool   $includeparentid    Load also ID of parent product (if product is a variant of a parent product)
-     * @return array|mixed                Data without useless information
-     *
-     * @throws RestException 401
-     * @throws RestException 403
-     * @throws RestException 404
-     */
-    private function _fetch($id, $ref = '', $ref_ext = '', $barcode = '', $includestockdata = 0, $includesubproducts = false, $includeparentid = false)
-    {
-        if (empty($id) && empty($ref) && empty($ref_ext) && empty($barcode)) {
-            throw new RestException(400, 'bad value for parameter id, ref, ref_ext or barcode');
-        }
+	 * @return array|mixed                Data without useless information
+	 *
+	 * @throws RestException 401
+	 * @throws RestException 403
+	 * @throws RestException 404
+	 */
+	private function _fetch($id, $ref = '', $ref_ext = '', $barcode = '', $includestockdata = 0, $includesubproducts = false, $includeparentid = false)
+	{
+		if (empty($id) && empty($ref) && empty($ref_ext) && empty($barcode)) {
+			throw new RestException(400, 'bad value for parameter id, ref, ref_ext or barcode');
+		}
 
-        $id = (empty($id) ? 0 : $id);
+		$id = (empty($id) ? 0 : $id);
 
-        if (!DolibarrApiAccess::$user->rights->produit->lire) {
-            throw new RestException(403);
-        }
+		if (!DolibarrApiAccess::$user->rights->produit->lire) {
+			throw new RestException(403);
+		}
 
-        $result = $this->product->fetch($id, $ref, $ref_ext, $barcode);
-        if (!$result) {
-            throw new RestException(404, 'Product not found');
-        }
+		$result = $this->product->fetch($id, $ref, $ref_ext, $barcode);
+		if (!$result) {
+			throw new RestException(404, 'Product not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('product', $this->product->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('product', $this->product->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        if ($includestockdata) {
-            $this->product->load_stock();
+		if ($includestockdata) {
+			$this->product->load_stock();
 
-            if (is_array($this->product->stock_warehouse)) {
-                foreach ($this->product->stock_warehouse as $keytmp => $valtmp) {
-                    if (is_array($this->product->stock_warehouse[$keytmp]->detail_batch)) {
-                        foreach ($this->product->stock_warehouse[$keytmp]->detail_batch as $keytmp2 => $valtmp2) {
-                            unset($this->product->stock_warehouse[$keytmp]->detail_batch[$keytmp2]->db);
-                        }
-                    }
-                }
-            }
-        }
+			if (is_array($this->product->stock_warehouse)) {
+				foreach ($this->product->stock_warehouse as $keytmp => $valtmp) {
+					if (is_array($this->product->stock_warehouse[$keytmp]->detail_batch)) {
+						foreach ($this->product->stock_warehouse[$keytmp]->detail_batch as $keytmp2 => $valtmp2) {
+							unset($this->product->stock_warehouse[$keytmp]->detail_batch[$keytmp2]->db);
+						}
+					}
+				}
+			}
+		}
 
-        if ($includesubproducts) {
-            $childsArbo = $this->product->getChildsArbo($id, 1);
+		if ($includesubproducts) {
+			$childsArbo = $this->product->getChildsArbo($id, 1);
 
-            $keys = ['rowid', 'qty', 'fk_product_type', 'label', 'incdec'];
-            $childs = [];
-            foreach ($childsArbo as $values) {
-                $childs[] = array_combine($keys, $values);
-            }
+			$keys = ['rowid', 'qty', 'fk_product_type', 'label', 'incdec'];
+			$childs = [];
+			foreach ($childsArbo as $values) {
+				$childs[] = array_combine($keys, $values);
+			}
 
-            $this->product->sousprods = $childs;
-        }
+			$this->product->sousprods = $childs;
+		}
 
 		if ($includeparentid) {
 			$prodcomb = new ProductCombination($this->db);
@@ -1857,6 +1857,6 @@ class Products extends DolibarrApi
 			}
 		}
 
-        return $this->_cleanObjectDatas($this->product);
-    }
+		return $this->_cleanObjectDatas($this->product);
+	}
 }
diff --git a/htdocs/product/class/html.formproduct.class.php b/htdocs/product/class/html.formproduct.class.php
index 0de89bf78ff..3b74180f237 100644
--- a/htdocs/product/class/html.formproduct.class.php
+++ b/htdocs/product/class/html.formproduct.class.php
@@ -30,9 +30,9 @@ require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
 class FormProduct
 {
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
 	/**
 	 * @var string Error code (or message)
@@ -55,23 +55,23 @@ class FormProduct
 	}
 
 
-    /**
-     * Load in cache array list of warehouses
-     * If fk_product is not 0, we do not use cache
-     *
-     * @param	int		    $fk_product			Add quantity of stock in label for product with id fk_product. Nothing if 0.
-     * @param	string	    $batch				Add quantity of batch stock in label for product with batch name batch, batch name precedes batch_id. Nothing if ''.
-     * @param	string	    $status				warehouse status filter, following comma separated filter options can be used
-     *                      				    'warehouseopen' = select products from open warehouses,
-     *                      				    'warehouseclosed' = select products from closed warehouses,
-     *                      				    'warehouseinternal' = select products from warehouses for internal correct/transfer only
-     * @param	boolean	    $sumStock		    sum total stock of a warehouse, default true
-     * @param	string      $exclude            warehouses ids to exclude
-     * @param   bool|int    $stockMin           [=false] Value of minimum stock to filter or false not not filter by minimum stock
-     * @param   string      $orderBy            [='e.ref'] Order by
-     * @return  int                             Nb of loaded lines, 0 if already loaded, <0 if KO
-     * @throws  Exception
-     */
+	/**
+	 * Load in cache array list of warehouses
+	 * If fk_product is not 0, we do not use cache
+	 *
+	 * @param	int		    $fk_product			Add quantity of stock in label for product with id fk_product. Nothing if 0.
+	 * @param	string	    $batch				Add quantity of batch stock in label for product with batch name batch, batch name precedes batch_id. Nothing if ''.
+	 * @param	string	    $status				warehouse status filter, following comma separated filter options can be used
+	 *                      				    'warehouseopen' = select products from open warehouses,
+	 *                      				    'warehouseclosed' = select products from closed warehouses,
+	 *                      				    'warehouseinternal' = select products from warehouses for internal correct/transfer only
+	 * @param	boolean	    $sumStock		    sum total stock of a warehouse, default true
+	 * @param	string      $exclude            warehouses ids to exclude
+	 * @param   bool|int    $stockMin           [=false] Value of minimum stock to filter or false not not filter by minimum stock
+	 * @param   string      $orderBy            [='e.ref'] Order by
+	 * @return  int                             Nb of loaded lines, 0 if already loaded, <0 if KO
+	 * @throws  Exception
+	 */
 	public function loadWarehouses($fk_product = 0, $batch = '', $status = '', $sumStock = true, $exclude = '', $stockMin = false, $orderBy = 'e.ref')
 	{
 		global $conf, $langs;
@@ -129,25 +129,25 @@ class FormProduct
 		if (!empty($exclude)) $sql .= ' AND e.rowid NOT IN('.$this->db->escape(implode(',', $exclude)).')';
 
 		// minimum stock
-        if ($stockMin !== false) {
-            if (!empty($fk_product)) {
-                if (!empty($batch)) {
-                    $sql .= " AND pb.qty > ".$this->db->escape($stockMin);
-                } else {
-                    $sql .= " AND ps.reel > ".$this->db->escape($stockMin);
-                }
-            }
-        }
+		if ($stockMin !== false) {
+			if (!empty($fk_product)) {
+				if (!empty($batch)) {
+					$sql .= " AND pb.qty > ".$this->db->escape($stockMin);
+				} else {
+					$sql .= " AND ps.reel > ".$this->db->escape($stockMin);
+				}
+			}
+		}
 
 		if ($sumStock && empty($fk_product)) {
-		    $sql .= " GROUP BY e.rowid, e.ref, e.description, e.fk_parent";
+			$sql .= " GROUP BY e.rowid, e.ref, e.description, e.fk_parent";
 
-            // minimum stock
-            if ($stockMin !== false) {
-                $sql .= " HAVING sum(ps.reel) > ".$this->db->escape($stockMin);
-            }
+			// minimum stock
+			if ($stockMin !== false) {
+				$sql .= " HAVING sum(ps.reel) > ".$this->db->escape($stockMin);
+			}
 		}
-        $sql .= " ORDER BY ".$orderBy;
+		$sql .= " ORDER BY ".$orderBy;
 
 		dol_syslog(get_class($this).'::loadWarehouses', LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -179,7 +179,7 @@ class FormProduct
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Return full path to current warehouse in $tab (recursive function)
 	 *
@@ -209,9 +209,9 @@ class FormProduct
 	 *  @param  string|int  $selected           Id of preselected warehouse ('' for no value, 'ifone'=select value if one value otherwise no value)
 	 *  @param  string      $htmlname           Name of html select html
 	 *  @param  string      $filterstatus       warehouse status filter, following comma separated filter options can be used
-     *                                          'warehouseopen' = select products from open warehouses,
-     *                                          'warehouseclosed' = select products from closed warehouses,
-     *                                          'warehouseinternal' = select products from warehouses for internal correct/transfer only
+	 *                                          'warehouseopen' = select products from open warehouses,
+	 *                                          'warehouseclosed' = select products from closed warehouses,
+	 *                                          'warehouseinternal' = select products from warehouses for internal correct/transfer only
 	 *  @param  int		    $empty			    1=Can be empty, 0 if not
 	 * 	@param	int		    $disabled		    1=Select is disabled
 	 * 	@param	int		    $fk_product		    Add quantity of stock in label for product with id fk_product. Nothing if 0.
@@ -222,11 +222,11 @@ class FormProduct
 	 *  @param  string      $morecss                    Add more css classes to HTML select
 	 *  @param	string	    $exclude            Warehouses ids to exclude
 	 *  @param  int         $showfullpath       1=Show full path of name (parent ref into label), 0=Show only ref of current warehouse
-     *  @param  bool|int    $stockMin           [=false] Value of minimum stock to filter or false not not filter by minimum stock
-     *  @param  string      $orderBy            [='e.ref'] Order by
+	 *  @param  bool|int    $stockMin           [=false] Value of minimum stock to filter or false not not filter by minimum stock
+	 *  @param  string      $orderBy            [='e.ref'] Order by
 	 * 	@return string					        HTML select
-     *
-     *  @throws Exception
+	 *
+	 *  @throws Exception
 	 */
 	public function selectWarehouses($selected = '', $htmlname = 'idwarehouse', $filterstatus = '', $empty = 0, $disabled = 0, $fk_product = 0, $empty_label = '', $showstock = 0, $forcecombo = 0, $events = array(), $morecss = 'minwidth200', $exclude = '', $showfullpath = 1, $stockMin = false, $orderBy = 'e.ref')
 	{
@@ -236,7 +236,7 @@ class FormProduct
 
 		$out = '';
 		if (empty($conf->global->ENTREPOT_EXTRA_STATUS)) $filterstatus = '';
-        if (!empty($fk_product))  $this->cache_warehouses = array();
+		if (!empty($fk_product))  $this->cache_warehouses = array();
 
 		$this->loadWarehouses($fk_product, '', $filterstatus, true, $exclude, $stockMin, $orderBy);
 		$nbofwarehouses = count($this->cache_warehouses);
@@ -249,7 +249,7 @@ class FormProduct
 		}
 
 		if (strpos($htmlname, 'search_') !== 0) {
-			if (empty($user->fk_warehouse) || $user->fk_warehouse == -1){
+			if (empty($user->fk_warehouse) || $user->fk_warehouse == -1) {
 				if (empty($selected) && !empty($conf->global->MAIN_DEFAULT_WAREHOUSE)) $selected = $conf->global->MAIN_DEFAULT_WAREHOUSE;
 			}
 			else {
@@ -283,66 +283,66 @@ class FormProduct
 		$out .= '</select>';
 		if ($disabled) $out .= '<input type="hidden" name="'.$htmlname.'" value="'.(($selected > 0) ? $selected : '').'">';
 
-        $parameters = array(
-            'selected' => $selected,
-            'htmlname' => $htmlname,
-            'filterstatus' => $filterstatus,
-            'empty' => $empty,
-            'disabled ' => $disabled,
-            'fk_product' => $fk_product,
-            'empty_label' => $empty_label,
-            'showstock' => $showstock,
-            'forcecombo' => $forcecombo,
-            'events' => $events,
-            'morecss' => $morecss,
-            'exclude' => $exclude,
-            'showfullpath' => $showfullpath,
-            'stockMin' => $stockMin,
-            'orderBy' => $orderBy
-        );
+		$parameters = array(
+			'selected' => $selected,
+			'htmlname' => $htmlname,
+			'filterstatus' => $filterstatus,
+			'empty' => $empty,
+			'disabled ' => $disabled,
+			'fk_product' => $fk_product,
+			'empty_label' => $empty_label,
+			'showstock' => $showstock,
+			'forcecombo' => $forcecombo,
+			'events' => $events,
+			'morecss' => $morecss,
+			'exclude' => $exclude,
+			'showfullpath' => $showfullpath,
+			'stockMin' => $stockMin,
+			'orderBy' => $orderBy
+		);
 
-        $reshook = $hookmanager->executeHooks('selectWarehouses', $parameters, $this);
-        if ($reshook > 0) $out = $hookmanager->resPrint;
+		$reshook = $hookmanager->executeHooks('selectWarehouses', $parameters, $this);
+		if ($reshook > 0) $out = $hookmanager->resPrint;
 		elseif ($reshook == 0) $out .= $hookmanager->resPrint;
 
 		return $out;
 	}
 
-    /**
-     *    Display form to select warehouse
-     *
-     *    @param    string  $page        Page
-     *    @param    int     $selected    Id of warehouse
-     *    @param    string  $htmlname    Name of select html field
-     *    @param    int     $addempty    1=Add an empty value in list, 2=Add an empty value in list only if there is more than 2 entries.
-     *    @return   void
-     */
-    public function formSelectWarehouses($page, $selected = '', $htmlname = 'warehouse_id', $addempty = 0)
-    {
-        global $langs;
-        if ($htmlname != "none") {
-            print '<form method="POST" action="'.$page.'">';
-            print '<input type="hidden" name="action" value="setwarehouse">';
-            print '<input type="hidden" name="token" value="'.newToken().'">';
-            print '<table class="nobordernopadding" cellpadding="0" cellspacing="0">';
-            print '<tr><td>';
-            print $this->selectWarehouses($selected, $htmlname, '', $addempty);
-            print '</td>';
-            print '<td class="left"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
-            print '</tr></table></form>';
-        } else {
-            if ($selected) {
-                require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
-                $warehousestatic = new Entrepot($this->db);
-                $warehousestatic->fetch($selected);
-                print $warehousestatic->getNomUrl();
-            } else {
-                print "&nbsp;";
-            }
-        }
-    }
+	/**
+	 *    Display form to select warehouse
+	 *
+	 *    @param    string  $page        Page
+	 *    @param    int     $selected    Id of warehouse
+	 *    @param    string  $htmlname    Name of select html field
+	 *    @param    int     $addempty    1=Add an empty value in list, 2=Add an empty value in list only if there is more than 2 entries.
+	 *    @return   void
+	 */
+	public function formSelectWarehouses($page, $selected = '', $htmlname = 'warehouse_id', $addempty = 0)
+	{
+		global $langs;
+		if ($htmlname != "none") {
+			print '<form method="POST" action="'.$page.'">';
+			print '<input type="hidden" name="action" value="setwarehouse">';
+			print '<input type="hidden" name="token" value="'.newToken().'">';
+			print '<table class="nobordernopadding" cellpadding="0" cellspacing="0">';
+			print '<tr><td>';
+			print $this->selectWarehouses($selected, $htmlname, '', $addempty);
+			print '</td>';
+			print '<td class="left"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
+			print '</tr></table></form>';
+		} else {
+			if ($selected) {
+				require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
+				$warehousestatic = new Entrepot($this->db);
+				$warehousestatic->fetch($selected);
+				print $warehousestatic->getNomUrl();
+			} else {
+				print "&nbsp;";
+			}
+		}
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Output a combo box with list of units
 	 *  pour l'instant on ne definit pas les unites dans la base
@@ -357,8 +357,8 @@ class FormProduct
 	 */
 	public function select_measuring_units($name = 'measuring_units', $measuring_style = '', $default = '0', $adddefault = 0, $mode = 0)
 	{
-        //phpcs:enable
-	    print $this->selectMeasuringUnits($name, $measuring_style, $default, $adddefault, $mode);
+		//phpcs:enable
+		print $this->selectMeasuringUnits($name, $measuring_style, $default, $adddefault, $mode);
 	}
 
 	/**
@@ -387,13 +387,13 @@ class FormProduct
 		$filter['t.active'] = 1;
 		if ($measuring_style) $filter['t.unit_type'] = $measuring_style;
 
-        $result = $measuringUnits->fetchAll(
-            '',
-            '',
-            0,
-            0,
-        	$filter
-        );
+		$result = $measuringUnits->fetchAll(
+			'',
+			'',
+			0,
+			0,
+			$filter
+		);
 		if ($result < 0) {
 			dol_print_error($db);
 			return -1;
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 5c3c2a75586..59d34f728b1 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -71,7 +71,9 @@ class Product extends CommonObject
 	 */
 	public $ismultientitymanaged = 1;
 
-
+	/**
+	 * @var string picto
+	 */
 	public $picto = 'product';
 
 	/**
@@ -86,6 +88,7 @@ class Product extends CommonObject
     * @see label
     */
 	public $libelle;
+
 	/**
 	 * Product label
 	 *
@@ -388,7 +391,16 @@ class Product extends CommonObject
 	 */
 	public $price_autogen = 0;
 
+	/**
+	 * Array with list of supplier prices of product
+	 *
+	 * @var array
+	 */
+	public $supplierprices;
 
+	/**
+	 * @var array fields of object product
+	 */
 	public $fields = array(
 		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'index'=>1, 'position'=>1, 'comment'=>'Id'),
 		'ref'           =>array('type'=>'varchar(128)', 'label'=>'Ref', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>1, 'index'=>1, 'position'=>10, 'searchall'=>1, 'comment'=>'Reference of object'),
@@ -1578,7 +1590,7 @@ class Product extends CommonObject
 	 *
 	 * @param	Societe		$thirdparty_seller		Seller
 	 * @param	Societe		$thirdparty_buyer		Buyer
-	 * @param	int			$pqp					Id of product per price if a selection was done of such a price
+	 * @param	int			$pqp					Id of product price per quantity if a selection was done of such a price
 	 * @return	array								Array of price information array('pu_ht'=> , 'pu_ttc'=> , 'tva_tx'=>'X.Y (code)', ...), 'tva_npr'=>0, ...)
 	 * @see get_buyprice(), find_min_price_product_fournisseur()
 	 */
@@ -2078,7 +2090,7 @@ class Product extends CommonObject
 				$this->customcode                    = $obj->customcode;
 				$this->country_id                    = $obj->fk_country;
 				$this->country_code = getCountry($this->country_id, 2, $this->db);
-				$this->state_id                    = $obj->fk_state;
+				$this->state_id = $obj->fk_state;
 				$this->price                        = $obj->price;
 				$this->price_ttc                    = $obj->price_ttc;
 				$this->price_min                    = $obj->price_min;
@@ -2369,9 +2381,9 @@ class Product extends CommonObject
 		// phpcs:enable
 		global $user, $hookmanager;
 
-		$error=0;
+		$error = 0;
 
-		foreach (array('toconsume','consumed','toproduce','produced') as $role) {
+		foreach (array('toconsume', 'consumed', 'toproduce', 'produced') as $role) {
 			$this->stats_mo['customers_'.$role] = 0;
 			$this->stats_mo['nb_'.$role] = 0;
 			$this->stats_mo['qty_'.$role] = 0;
@@ -2427,7 +2439,7 @@ class Product extends CommonObject
 		// phpcs:enable
 		global $user, $hookmanager;
 
-		$error=0;
+		$error = 0;
 
 		$this->stats_bom['nb_toproduce'] = 0;
 		$this->stats_bom['nb_toconsume'] = 0;
@@ -2441,7 +2453,7 @@ class Product extends CommonObject
 		$sql .= " WHERE ";
 		$sql .= " b.entity IN (".getEntity('bom').")";
 		$sql .= " AND b.fk_product =".$this->id;
-        $sql .= " GROUP BY b.rowid";
+		$sql .= " GROUP BY b.rowid";
 
 		$result = $this->db->query($sql);
 		if ($result) {
@@ -3180,14 +3192,16 @@ class Product extends CommonObject
 	/**
 	 *  Return an array formated for showing graphs
 	 *
-	 * @param  string $sql  Request to execute
-	 * @param  string $mode 'byunit'=number of unit, 'bynumber'=nb of entities
-	 * @param  int    $year Year (0=current year)
-	 * @return array               <0 if KO, result[month]=array(valuex,valuey) where month is 0 to 11
+	 * @param  string $sql  		Request to execute
+	 * @param  string $mode 		'byunit'=number of unit, 'bynumber'=nb of entities
+	 * @param  int    $year 		Year (0=current year, -1=all years)
+	 * @return array|int           	<0 if KO, result[month]=array(valuex,valuey) where month is 0 to 11
 	 */
 	private function _get_stats($sql, $mode, $year = 0)
 	{
 		// phpcs:enable
+		$tab = array();
+
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			$num = $this->db->num_rows($resql);
@@ -3195,11 +3209,15 @@ class Product extends CommonObject
 			while ($i < $num)
 			{
 				$arr = $this->db->fetch_array($resql);
-				if ($mode == 'byunit') {
-					$tab[$arr[1]] = $arr[0]; // 1st field
+				$keyfortab = (string) $arr[1];
+				if ($year == -1) {
+					$keyfortab = substr($keyfortab, -2);
 				}
-				if ($mode == 'bynumber') {
-					$tab[$arr[1]] = $arr[2]; // 3rd field
+
+				if ($mode == 'byunit') {
+					$tab[$keyfortab] = (empty($tab[$keyfortab]) ? 0 : $tab[$keyfortab]) + $arr[0]; // 1st field
+				} elseif ($mode == 'bynumber') {
+					$tab[$keyfortab] = (empty($tab[$keyfortab]) ? 0 : $tab[$keyfortab]) + $arr[2]; // 3rd field
 				}
 				$i++;
 			}
@@ -3211,16 +3229,21 @@ class Product extends CommonObject
 		if (empty($year)) {
 			$year = strftime('%Y', time());
 			$month = strftime('%m', time());
+		} elseif ($year == -1) {
+			$year = '';
+			$month = 12; // We imagine we are at end of year, so we get last 12 month before, so all correct year.
 		} else {
 			$month = 12; // We imagine we are at end of year, so we get last 12 month before, so all correct year.
 		}
+
 		$result = array();
 
 		for ($j = 0; $j < 12; $j++)
 		{
-			//$idx = ucfirst(dol_trunc(dol_print_date(dol_mktime(12, 0, 0, $month, 1, $year), "%b"), 3, 'right', 'UTF-8', 1));
-			$idx = ucfirst(dol_trunc(dol_print_date(dol_mktime(12, 0, 0, $month, 1, $year), "%b"), 1, 'right', 'UTF-8', 1));
+			// $ids is 'D', 'N', 'O', 'S', ... (First letter of month in user language)
+			$idx = ucfirst(dol_trunc(dol_print_date(dol_mktime(12, 0, 0, $month, 1, 1970), "%b"), 1, 'right', 'UTF-8', 1));
 
+			//print $idx.'-'.$year.'-'.$month.'<br>';
 			$result[$j] = array($idx, isset($tab[$year.$month]) ? $tab[$year.$month] : 0);
 			//            $result[$j] = array($monthnum,isset($tab[$year.$month])?$tab[$year.$month]:0);
 
@@ -3245,9 +3268,9 @@ class Product extends CommonObject
 	 * @param  int    $socid               Limit count on a particular third party id
 	 * @param  string $mode                'byunit'=number of unit, 'bynumber'=nb of entities
 	 * @param  int    $filteronproducttype 0=To filter on product only, 1=To filter on services only
-	 * @param  int    $year                Year (0=last 12 month)
+	 * @param  int    $year                Year (0=last 12 month, -1=all years)
 	 * @param  string $morefilter          More sql filters
-	 * @return array                            <0 if KO, result[month]=array(valuex,valuey) where month is 0 to 11
+	 * @return array                       <0 if KO, result[month]=array(valuex,valuey) where month is 0 to 11
 	 */
 	public function get_nb_vente($socid, $mode, $filteronproducttype = -1, $year = 0, $morefilter = '')
 	{
@@ -3298,9 +3321,9 @@ class Product extends CommonObject
 	 * @param  int    $socid               Limit count on a particular third party id
 	 * @param  string $mode                'byunit'=number of unit, 'bynumber'=nb of entities
 	 * @param  int    $filteronproducttype 0=To filter on product only, 1=To filter on services only
-	 * @param  int    $year                Year (0=last 12 month)
+	 * @param  int    $year                Year (0=last 12 month, -1=all years)
 	 * @param  string $morefilter          More sql filters
-	 * @return array                            <0 if KO, result[month]=array(valuex,valuey) where month is 0 to 11
+	 * @return array                       <0 if KO, result[month]=array(valuex,valuey) where month is 0 to 11
 	 */
 	public function get_nb_achat($socid, $mode, $filteronproducttype = -1, $year = 0, $morefilter = '')
 	{
@@ -3345,20 +3368,19 @@ class Product extends CommonObject
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 *  Return nb of units in proposals in which product is included
+	 * Return nb of units in proposals in which product is included
 	 *
 	 * @param  int    $socid               Limit count on a particular third party id
 	 * @param  string $mode                'byunit'=number of unit, 'bynumber'=nb of entities
 	 * @param  int    $filteronproducttype 0=To filter on product only, 1=To filter on services only
-	 * @param  int    $year                Year (0=last 12 month)
+	 * @param  int    $year                Year (0=last 12 month, -1=all years)
 	 * @param  string $morefilter          More sql filters
-	 * @return array                            <0 if KO, result[month]=array(valuex,valuey) where month is 0 to 11
+	 * @return array                       <0 if KO, result[month]=array(valuex,valuey) where month is 0 to 11
 	 */
 	public function get_nb_propal($socid, $mode, $filteronproducttype = -1, $year = 0, $morefilter = '')
 	{
 		// phpcs:enable
-		global $conf;
-		global $user;
+		global $conf, $user;
 
 		$sql = "SELECT sum(d.qty), date_format(p.datep, '%Y%m')";
 		if ($mode == 'bynumber') {
@@ -3402,9 +3424,9 @@ class Product extends CommonObject
 	 * @param  int    $socid               Limit count on a particular third party id
 	 * @param  string $mode                'byunit'=number of unit, 'bynumber'=nb of entities
 	 * @param  int    $filteronproducttype 0=To filter on product only, 1=To filter on services only
-	 * @param  int    $year                Year (0=last 12 month)
+	 * @param  int    $year                Year (0=last 12 month, -1=all years)
 	 * @param  string $morefilter          More sql filters
-	 * @return array                            <0 if KO, result[month]=array(valuex,valuey) where month is 0 to 11
+	 * @return array                       <0 if KO, result[month]=array(valuex,valuey) where month is 0 to 11
 	 */
 	public function get_nb_propalsupplier($socid, $mode, $filteronproducttype = -1, $year = 0, $morefilter = '')
 	{
@@ -3454,9 +3476,9 @@ class Product extends CommonObject
 	 * @param  int    $socid               Limit count on a particular third party id
 	 * @param  string $mode                'byunit'=number of unit, 'bynumber'=nb of entities
 	 * @param  int    $filteronproducttype 0=To filter on product only, 1=To filter on services only
-	 * @param  int    $year                Year (0=last 12 month)
+	 * @param  int    $year                Year (0=last 12 month, -1=all years)
 	 * @param  string $morefilter          More sql filters
-	 * @return array                            <0 if KO, result[month]=array(valuex,valuey) where month is 0 to 11
+	 * @return array                       <0 if KO, result[month]=array(valuex,valuey) where month is 0 to 11
 	 */
 	public function get_nb_order($socid, $mode, $filteronproducttype = -1, $year = 0, $morefilter = '')
 	{
@@ -3505,9 +3527,9 @@ class Product extends CommonObject
 	 * @param  int    $socid               Limit count on a particular third party id
 	 * @param  string $mode                'byunit'=number of unit, 'bynumber'=nb of entities
 	 * @param  int    $filteronproducttype 0=To filter on product only, 1=To filter on services only
-	 * @param  int    $year                Year (0=last 12 month)
+	 * @param  int    $year                Year (0=last 12 month, -1=all years)
 	 * @param  string $morefilter          More sql filters
-	 * @return array                            <0 if KO, result[month]=array(valuex,valuey) where month is 0 to 11
+	 * @return array                       <0 if KO, result[month]=array(valuex,valuey) where month is 0 to 11
 	 */
 	public function get_nb_ordersupplier($socid, $mode, $filteronproducttype = -1, $year = 0, $morefilter = '')
 	{
@@ -3556,9 +3578,9 @@ class Product extends CommonObject
 	 * @param  int    $socid               Limit count on a particular third party id
 	 * @param  string $mode                'byunit'=number of unit, 'bynumber'=nb of entities
 	 * @param  int    $filteronproducttype 0=To filter on product only, 1=To filter on services only
-	 * @param  int    $year                Year (0=last 12 month)
+	 * @param  int    $year                Year (0=last 12 month, -1=all years)
 	 * @param  string $morefilter          More sql filters
-	 * @return array                            <0 if KO, result[month]=array(valuex,valuey) where month is 0 to 11
+	 * @return array                       <0 if KO, result[month]=array(valuex,valuey) where month is 0 to 11
 	 */
 	public function get_nb_contract($socid, $mode, $filteronproducttype = -1, $year = 0, $morefilter = '')
 	{
@@ -3610,9 +3632,9 @@ class Product extends CommonObject
 	 * @param  int    $socid               Limit count on a particular third party id
 	 * @param  string $mode                'byunit'=number of unit, 'bynumber'=nb of entities
 	 * @param  int    $filteronproducttype 0=To filter on product only, 1=To filter on services only
-	 * @param  int    $year                Year (0=last 12 month)
+	 * @param  int    $year                Year (0=last 12 month, -1=all years)
 	 * @param  string $morefilter          More sql filters
-	 * @return array                            <0 if KO, result[month]=array(valuex,valuey) where month is 0 to 11
+	 * @return array                       <0 if KO, result[month]=array(valuex,valuey) where month is 0 to 11
 	 */
 	public function get_nb_mos($socid, $mode, $filteronproducttype = -1, $year = 0, $morefilter = '')
 	{
@@ -4405,15 +4427,32 @@ class Product extends CommonObject
 		global $conf, $langs, $hookmanager;
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
 
-		$result = '';
+		$result = ''; $label = '';
+
 		$newref = $this->ref;
-		if ($maxlength) { $newref = dol_trunc($newref, $maxlength, 'middle');
+		if ($maxlength) {
+			$newref = dol_trunc($newref, $maxlength, 'middle');
 		}
 
-		if ($this->type == Product::TYPE_PRODUCT) { $label = img_picto('', 'product').' <u>'.$langs->trans("Product").'</u>';
+		if (!empty($this->entity)) {
+			$tmpphoto = $this->show_photos('product', $conf->product->multidir_output[$this->entity], 1, 1, 0, 0, 0, 80);
+			if ($this->nbphoto > 0) {
+				$label .= '<div class="photointooltip">';
+				$label .= $tmpphoto;
+				$label .= '</div><div style="clear: both;"></div>';
+			}
 		}
-		if ($this->type == Product::TYPE_SERVICE) { $label = img_picto('', 'service').' <u>'.$langs->trans("Service").'</u>';
+
+		if ($this->type == Product::TYPE_PRODUCT) {
+			$label .= img_picto('', 'product').' <u class="paddingrightonly">'.$langs->trans("Product").'</u>';
+		} elseif ($this->type == Product::TYPE_SERVICE) {
+			$label .= img_picto('', 'service').' <u class="paddingrightonly">'.$langs->trans("Service").'</u>';
 		}
+		if (isset($this->status) && isset($this->status_buy)) {
+			$label .= ' '.$this->getLibStatut(5, 0);
+			$label .= ' '.$this->getLibStatut(5, 1);
+		}
+
 		if (!empty($this->ref)) {
 			$label .= '<br><b>'.$langs->trans('ProductRef').':</b> '.$this->ref;
 		}
@@ -4469,16 +4508,6 @@ class Product extends CommonObject
 			$label .= '<br><b>'.$langs->trans('ProductAccountancyBuyIntraCode').':</b> '.length_accountg($this->accountancy_code_buy_intra);
 			$label .= '<br><b>'.$langs->trans('ProductAccountancyBuyExportCode').':</b> '.length_accountg($this->accountancy_code_buy_export);
 		}
-		if (isset($this->status) && isset($this->status_buy)) {
-			$label .= '<br><b>'.$langs->trans("Status").":</b> ".$this->getLibStatut(5, 0);
-			$label .= ' '.$this->getLibStatut(5, 1);
-		}
-
-		if (!empty($this->entity)) {
-			$tmpphoto = $this->show_photos('product', $conf->product->multidir_output[$this->entity], 1, 1, 0, 0, 0, 80);
-			if ($this->nbphoto > 0) { $label .= '<br>'.$tmpphoto;
-			}
-		}
 
 		$linkclose = '';
 		if (empty($notooltip)) {
@@ -4686,7 +4715,7 @@ class Product extends CommonObject
 		global $langs;
 		$langs->load('products');
 
-		if (isset($this->finished) && $this->finished>=0) {
+		if (isset($this->finished) && $this->finished >= 0) {
 			$sql = 'SELECT label, code FROM '.MAIN_DB_PREFIX.'c_product_nature where code='.((int) $this->finished).' AND active=1';
 			$resql = $this->db->query($sql);
 			if ($resql && $this->db->num_rows($resql) > 0) {
diff --git a/htdocs/product/class/productbatch.class.php b/htdocs/product/class/productbatch.class.php
index db59efcdfb7..f5a91ff2839 100644
--- a/htdocs/product/class/productbatch.class.php
+++ b/htdocs/product/class/productbatch.class.php
@@ -51,32 +51,32 @@ class Productbatch extends CommonObject
 	public $warehouseid;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_product;
 
 
 
-    /**
-     *  Constructor
-     *
-     *  @param	DoliDb		$db      Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-    }
+	/**
+	 *  Constructor
+	 *
+	 *  @param	DoliDb		$db      Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
 
 
-    /**
-     *  Create object into database
-     *
-     *  @param	User	$user        User that creates
-     *  @param  int		$notrigger   0=launch triggers after, 1=disable triggers
-     *  @return int      		   	 <0 if KO, Id of created object if OK
-     */
-    public function create($user, $notrigger = 0)
-    {
+	/**
+	 *  Create object into database
+	 *
+	 *  @param	User	$user        User that creates
+	 *  @param  int		$notrigger   0=launch triggers after, 1=disable triggers
+	 *  @return int      		   	 <0 if KO, Id of created object if OK
+	 */
+	public function create($user, $notrigger = 0)
+	{
 		global $conf, $langs;
 		$error = 0;
 
@@ -86,7 +86,7 @@ class Productbatch extends CommonObject
 		// Check parameters
 		// Put here code to add control on parameters values
 
-        // Insert request
+		// Insert request
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."product_batch (";
 		$sql .= "fk_product_stock,";
 		$sql .= "sellby,";
@@ -107,33 +107,33 @@ class Productbatch extends CommonObject
 		$this->db->begin();
 
 		dol_syslog(get_class($this)."::create", LOG_DEBUG);
-        $resql = $this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 		if (!$error)
 		{
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.self::$_table_element);
 		}
 
-        // Commit or rollback
+		// Commit or rollback
 		if ($error)
 		{
 			$this->db->rollback();
 			return -1 * $error;
 		} else {
 			$this->db->commit();
-            return $this->id;
+			return $this->id;
 		}
-    }
+	}
 
 
-    /**
-     *  Load object in memory from the database
-     *
-     *  @param	int		$id		Id object
-     *  @return int          	<0 if KO, >0 if OK
-     */
-    public function fetch($id)
-    {
+	/**
+	 *  Load object in memory from the database
+	 *
+	 *  @param	int		$id		Id object
+	 *  @return int          	<0 if KO, >0 if OK
+	 */
+	public function fetch($id)
+	{
 		global $langs;
 		$sql = "SELECT";
 		$sql .= " t.rowid,";
@@ -150,9 +150,9 @@ class Productbatch extends CommonObject
 		$sql .= " pl.eatby,";
 		$sql .= " pl.sellby";
 
-        $sql .= " FROM ".MAIN_DB_PREFIX."product_batch as t INNER JOIN ".MAIN_DB_PREFIX."product_stock w on t.fk_product_stock = w.rowid";
-        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_lot as pl on pl.fk_product = w.fk_product and pl.batch = t.batch";
-        $sql .= " WHERE t.rowid = ".$id;
+		$sql .= " FROM ".MAIN_DB_PREFIX."product_batch as t INNER JOIN ".MAIN_DB_PREFIX."product_stock w on t.fk_product_stock = w.rowid";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_lot as pl on pl.fk_product = w.fk_product and pl.batch = t.batch";
+		$sql .= " WHERE t.rowid = ".$id;
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -182,16 +182,16 @@ class Productbatch extends CommonObject
 		}
 	}
 
-    /**
-     *  Update object into database
-     *
-     *  @param	User	$user        User that modifies
-     *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
-     *  @return int     		   	 <0 if KO, >0 if OK
-     */
-    public function update($user = null, $notrigger = 0)
-    {
-    	global $conf, $langs;
+	/**
+	 *  Update object into database
+	 *
+	 *  @param	User	$user        User that modifies
+	 *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
+	 *  @return int     		   	 <0 if KO, >0 if OK
+	 */
+	public function update($user = null, $notrigger = 0)
+	{
+		global $conf, $langs;
 		$error = 0;
 
 		// Clean parameters
@@ -202,7 +202,7 @@ class Productbatch extends CommonObject
 		{
 		}
 
-        // Update request
+		// Update request
 		$sql = "UPDATE ".MAIN_DB_PREFIX.self::$_table_element." SET";
 		$sql .= " fk_product_stock=".(isset($this->fk_product_stock) ? $this->fk_product_stock : "null").",";
 		$sql .= " sellby=".(dol_strlen($this->sellby) != 0 ? "'".$this->db->idate($this->sellby)."'" : 'null').",";
@@ -210,7 +210,7 @@ class Productbatch extends CommonObject
 		$sql .= " batch=".(isset($this->batch) ? "'".$this->db->escape($this->batch)."'" : "null").",";
 		$sql .= " qty=".(isset($this->qty) ? $this->qty : "null").",";
 		$sql .= " import_key=".(isset($this->import_key) ? "'".$this->db->escape($this->import_key)."'" : "null")."";
-        $sql .= " WHERE rowid=".$this->id;
+		$sql .= " WHERE rowid=".$this->id;
 
 		$this->db->begin();
 
@@ -218,7 +218,7 @@ class Productbatch extends CommonObject
 		$resql = $this->db->query($sql);
 		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
-        // Commit or rollback
+		// Commit or rollback
 		if ($error)
 		{
 			foreach ($this->errors as $errmsg)
@@ -232,17 +232,17 @@ class Productbatch extends CommonObject
 			$this->db->commit();
 			return 1;
 		}
-    }
+	}
 
-    /**
-     *  Delete object in database
-     *
-     *  @param  User	$user        User that deletes
-     *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
-     *  @return	int					 <0 if KO, >0 if OK
-     */
-    public function delete($user, $notrigger = 0)
-    {
+	/**
+	 *  Delete object in database
+	 *
+	 *  @param  User	$user        User that deletes
+	 *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
+	 *  @return	int					 <0 if KO, >0 if OK
+	 */
+	public function delete($user, $notrigger = 0)
+	{
 		global $conf, $langs;
 		$error = 0;
 
@@ -250,21 +250,21 @@ class Productbatch extends CommonObject
 
 		if (!$error)
 		{
-    		$sql = "DELETE FROM ".MAIN_DB_PREFIX.self::$_table_element."";
-    		$sql .= " WHERE rowid=".$this->id;
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX.self::$_table_element."";
+			$sql .= " WHERE rowid=".$this->id;
 
-    		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
-    		$resql = $this->db->query($sql);
-        	if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+			dol_syslog(get_class($this)."::delete", LOG_DEBUG);
+			$resql = $this->db->query($sql);
+			if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 		}
 
-        // Commit or rollback
+		// Commit or rollback
 		if ($error)
 		{
 			foreach ($this->errors as $errmsg)
 			{
-	            dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
-	            $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
+				dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
 			return -1 * $error;
@@ -360,18 +360,18 @@ class Productbatch extends CommonObject
 		if (isset($this->import_key)) $this->import_key = trim($this->import_key);
 	}
 
-    /**
-     *  Find first detail record that match eather eat-by or sell-by or batch within given warehouse
-     *
-     *  @param	int			$fk_product_stock   id product_stock for objet
-     *  @param	integer		$eatby    			eat-by date for object - deprecated: a search must be done on batch number
-     *  @param	integer		$sellby   			sell-by date for object - deprecated: a search must be done on batch number
-     *  @param	string		$batch_number   	batch number for object
-     *  @return int          					<0 if KO, >0 if OK
-     */
-    public function find($fk_product_stock = 0, $eatby = '', $sellby = '', $batch_number = '')
-    {
-    	global $langs;
+	/**
+	 *  Find first detail record that match eather eat-by or sell-by or batch within given warehouse
+	 *
+	 *  @param	int			$fk_product_stock   id product_stock for objet
+	 *  @param	integer		$eatby    			eat-by date for object - deprecated: a search must be done on batch number
+	 *  @param	integer		$sellby   			sell-by date for object - deprecated: a search must be done on batch number
+	 *  @param	string		$batch_number   	batch number for object
+	 *  @return int          					<0 if KO, >0 if OK
+	 */
+	public function find($fk_product_stock = 0, $eatby = '', $sellby = '', $batch_number = '')
+	{
+		global $langs;
 
 		$where = array();
 		$sql = "SELECT";
@@ -393,15 +393,15 @@ class Productbatch extends CommonObject
 
 		if (!empty($where)) $sql .= " AND (".implode(" OR ", $where).")";
 
-    	dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            if ($this->db->num_rows($resql))
-            {
-                $obj = $this->db->fetch_object($resql);
+		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			if ($this->db->num_rows($resql))
+			{
+				$obj = $this->db->fetch_object($resql);
 
-                $this->id = $obj->rowid;
+				$this->id = $obj->rowid;
 
 				$this->tms = $this->db->jdate($obj->tms);
 				$this->fk_product_stock = $obj->fk_product_stock;
@@ -410,27 +410,27 @@ class Productbatch extends CommonObject
 				$this->batch = $obj->batch;
 				$this->qty = $obj->qty;
 				$this->import_key = $obj->import_key;
-            }
-            $this->db->free($resql);
+			}
+			$this->db->free($resql);
 
-            return 1;
-        } else {
-      	    $this->error = "Error ".$this->db->lasterror();
-            return -1;
-        }
-    }
-    /**
-     * Return all batch detail records for a given product and warehouse
-     *
-     *  @param	DoliDB		$db    				database object
-     *  @param	int			$fk_product_stock	id product_stock for objet
-     *  @param	int			$with_qty    		1 = doesn't return line with 0 quantity
-     *  @param  int         $fk_product         If set to a product id, get eatby and sellby from table llx_product_lot
-     *  @return array         					<0 if KO, array of batch
-     */
-    public static function findAll($db, $fk_product_stock, $with_qty = 0, $fk_product = 0)
-    {
-    	global $langs;
+			return 1;
+		} else {
+	  		$this->error = "Error ".$this->db->lasterror();
+			return -1;
+		}
+	}
+	/**
+	 * Return all batch detail records for a given product and warehouse
+	 *
+	 *  @param	DoliDB		$db    				database object
+	 *  @param	int			$fk_product_stock	id product_stock for objet
+	 *  @param	int			$with_qty    		1 = doesn't return line with 0 quantity
+	 *  @param  int         $fk_product         If set to a product id, get eatby and sellby from table llx_product_lot
+	 *  @return array         					<0 if KO, array of batch
+	 */
+	public static function findAll($db, $fk_product_stock, $with_qty = 0, $fk_product = 0)
+	{
+		global $langs;
 		$ret = array();
 
 		$sql = "SELECT";
@@ -444,26 +444,26 @@ class Productbatch extends CommonObject
 		$sql .= " t.import_key";
 		if ($fk_product > 0)
 		{
-		    $sql .= ", pl.rowid as lotid, pl.eatby as eatby, pl.sellby as sellby";
-		    // TODO May add extrafields to ?
+			$sql .= ", pl.rowid as lotid, pl.eatby as eatby, pl.sellby as sellby";
+			// TODO May add extrafields to ?
+		}
+		$sql .= " FROM ".MAIN_DB_PREFIX."product_batch as t";
+		if ($fk_product > 0)
+		{
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_lot as pl ON pl.fk_product = ".$fk_product." AND pl.batch = t.batch";
+			// TODO May add extrafields to ?
 		}
-        $sql .= " FROM ".MAIN_DB_PREFIX."product_batch as t";
-        if ($fk_product > 0)
-        {
-            $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_lot as pl ON pl.fk_product = ".$fk_product." AND pl.batch = t.batch";
-            // TODO May add extrafields to ?
-        }
 		$sql .= " WHERE fk_product_stock=".$fk_product_stock;
 		if ($with_qty) $sql .= " AND t.qty <> 0";
 
 		dol_syslog("productbatch::findAll", LOG_DEBUG);
 		$resql = $db->query($sql);
-        if ($resql) {
-            $num = $db->num_rows($resql);
-            $i = 0;
-            while ($i < $num)
-            {
-                $obj = $db->fetch_object($resql);
+		if ($resql) {
+			$num = $db->num_rows($resql);
+			$i = 0;
+			while ($i < $num)
+			{
+				$obj = $db->fetch_object($resql);
 
 				$tmp = new Productbatch($db);
 				$tmp->id    = $obj->rowid;
@@ -478,15 +478,15 @@ class Productbatch extends CommonObject
 
 				$ret[$tmp->batch] = $tmp; // $ret is for a $fk_product_stock and unique key is on $fk_product_stock+batch
 				$i++;
-            }
-            $db->free($resql);
+			}
+			$db->free($resql);
 
-            return $ret;
-        } else {
-            $error = "Error ".$db->lasterror();
-            return -1;
-        }
-    }
+			return $ret;
+		} else {
+			$error = "Error ".$db->lasterror();
+			return -1;
+		}
+	}
 
 	/**
 	 * Return all batch for a product and a warehouse
diff --git a/htdocs/product/class/productcustomerprice.class.php b/htdocs/product/class/productcustomerprice.class.php
index b30f0b7fafe..55018f1fc8f 100644
--- a/htdocs/product/class/productcustomerprice.class.php
+++ b/htdocs/product/class/productcustomerprice.class.php
@@ -47,14 +47,14 @@ class Productcustomerprice extends CommonObject
 	public $tms = '';
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_product;
 
 	/**
 	 * @var int Thirdparty ID
 	 */
-    public $fk_soc;
+	public $fk_soc;
 
 	public $price;
 	public $price_ttc;
@@ -81,10 +81,10 @@ class Productcustomerprice extends CommonObject
 	 *
 	 * @param DoliDb $db handler
 	 */
-    public function __construct($db)
-    {
-        $this->db = $db;
-    }
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
 
 	/**
 	 * Create object into database
@@ -94,8 +94,8 @@ class Productcustomerprice extends CommonObject
 	 * @param int $forceupdateaffiliate update price on each soc child
 	 * @return int <0 if KO, Id of created object if OK
 	 */
-    public function create($user, $notrigger = 0, $forceupdateaffiliate = 0)
-    {
+	public function create($user, $notrigger = 0, $forceupdateaffiliate = 0)
+	{
 
 		global $conf, $langs;
 		$error = 0;
@@ -219,10 +219,10 @@ class Productcustomerprice extends CommonObject
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."product_customer_price");
 
 			if (!$notrigger) {
-			    $result = $this->call_trigger('PRODUCT_CUSTOMER_PRICE_CREATE', $user);
-			    if ($result < 0) {
-			        $error++;
-			    }
+				$result = $this->call_trigger('PRODUCT_CUSTOMER_PRICE_CREATE', $user);
+				if ($result < 0) {
+					$error++;
+				}
 			}
 		}
 
@@ -315,7 +315,7 @@ class Productcustomerprice extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Load all customer prices in memory from database
 	 *
@@ -328,7 +328,7 @@ class Productcustomerprice extends CommonObject
 	 */
 	public function fetch_all($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, $filter = array())
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 
 		if (empty($sortfield)) $sortfield = "t.rowid";
@@ -428,7 +428,7 @@ class Productcustomerprice extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Load all objects in memory from database
 	 *
@@ -441,7 +441,7 @@ class Productcustomerprice extends CommonObject
 	 */
 	public function fetch_all_log($sortorder, $sortfield, $limit, $offset, $filter = array())
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 
 		if (!empty($sortfield)) $sortfield = "t.rowid";
@@ -543,8 +543,8 @@ class Productcustomerprice extends CommonObject
 	 * @param int $forceupdateaffiliate update price on each soc child
 	 * @return int <0 if KO, >0 if OK
 	 */
-    public function update($user = 0, $notrigger = 0, $forceupdateaffiliate = 0)
-    {
+	public function update($user = 0, $notrigger = 0, $forceupdateaffiliate = 0)
+	{
 
 		global $conf, $langs;
 		$error = 0;
@@ -729,7 +729,7 @@ class Productcustomerprice extends CommonObject
 			$this->db->commit();
 			return 1;
 		}
-    }
+	}
 
 	/**
 	 * Force update price on child companies so child company has same prices than parent.
@@ -738,8 +738,8 @@ class Productcustomerprice extends CommonObject
 	 * @param int $forceupdateaffiliate update price on each soc child
 	 * @return int <0 if KO, 0 = action disabled, >0 if OK
 	 */
-    public function setPriceOnAffiliateThirdparty($user, $forceupdateaffiliate)
-    {
+	public function setPriceOnAffiliateThirdparty($user, $forceupdateaffiliate)
+	{
 		global $conf;
 
 		if (!empty($conf->global->PRODUCT_DISABLE_PROPAGATE_CUSTOMER_PRICES_ON_CHILD_COMPANIES)) {
@@ -823,7 +823,7 @@ class Productcustomerprice extends CommonObject
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
-    }
+	}
 
 	/**
 	 * Delete object in database
@@ -832,8 +832,8 @@ class Productcustomerprice extends CommonObject
 	 * @param int $notrigger triggers after, 1=disable triggers
 	 * @return int <0 if KO, >0 if OK
 	 */
-    public function delete($user, $notrigger = 0)
-    {
+	public function delete($user, $notrigger = 0)
+	{
 
 		global $conf, $langs;
 		$error = 0;
@@ -841,10 +841,10 @@ class Productcustomerprice extends CommonObject
 		$this->db->begin();
 
 		if (!$error && !$notrigger) {
-		    $result = $this->call_trigger('PRODUCT_CUSTOMER_PRICE_DELETE', $user);
-		    if ($result < 0) {
-		        $error++;
-		    }
+			$result = $this->call_trigger('PRODUCT_CUSTOMER_PRICE_DELETE', $user);
+			if ($result < 0) {
+				$error++;
+			}
 		}
 
 		if (!$error) {
@@ -871,7 +871,7 @@ class Productcustomerprice extends CommonObject
 			$this->db->commit();
 			return 1;
 		}
-    }
+	}
 
 	/**
 	 * Load an object from its id and create a new one in database
@@ -880,8 +880,8 @@ class Productcustomerprice extends CommonObject
 	 * @param   int     $fromid     ID of object to clone
 	 * @return  int                 id of clone
 	 */
-    public function createFromClone(User $user, $fromid)
-    {
+	public function createFromClone(User $user, $fromid)
+	{
 		$error = 0;
 
 		$object = new Productcustomerprice($this->db);
@@ -920,7 +920,7 @@ class Productcustomerprice extends CommonObject
 			$this->db->rollback();
 			return -1;
 		}
-    }
+	}
 
 	/**
 	 * Initialise object with example values
@@ -928,8 +928,8 @@ class Productcustomerprice extends CommonObject
 	 *
 	 * @return void
 	 */
-    public function initAsSpecimen()
-    {
+	public function initAsSpecimen()
+	{
 
 		$this->id = 0;
 
@@ -950,7 +950,7 @@ class Productcustomerprice extends CommonObject
 		$this->localtax2_tx = '';
 		$this->fk_user = '';
 		$this->import_key = '';
-    }
+	}
 }
 
 /**
@@ -972,14 +972,14 @@ class PriceByCustomerLine
 	public $tms = '';
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_product;
 
 	/**
 	 * @var int Thirdparty ID
 	 */
-    public $fk_soc;
+	public $fk_soc;
 
 	public $price;
 	public $price_ttc;
@@ -992,12 +992,12 @@ class PriceByCustomerLine
 	public $localtax1_tx;
 	public $localtax2_tx;
 
-    /**
-     * @var int User ID
-     */
-    public $fk_user;
+	/**
+	 * @var int User ID
+	 */
+	public $fk_user;
 
-    public $import_key;
-    public $socname;
-    public $prodref;
+	public $import_key;
+	public $socname;
+	public $prodref;
 }
diff --git a/htdocs/product/class/propalmergepdfproduct.class.php b/htdocs/product/class/propalmergepdfproduct.class.php
index 30ed73d8c77..c917201b645 100644
--- a/htdocs/product/class/propalmergepdfproduct.class.php
+++ b/htdocs/product/class/propalmergepdfproduct.class.php
@@ -54,27 +54,27 @@ class Propalmergepdfproduct extends CommonObject
 
 
 
-    /**
-     *  Constructor
-     *
-     *  @param	DoliDb		$db      Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-    }
+	/**
+	 *  Constructor
+	 *
+	 *  @param	DoliDb		$db      Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
 
 
-    /**
-     *  Create object into database
-     *
-     *  @param	User	$user        User that creates
-     *  @param  int		$notrigger   0=launch triggers after, 1=disable triggers
-     *  @return int      		   	 <0 if KO, Id of created object if OK
-     */
-    public function create($user, $notrigger = 0)
-    {
-    	global $conf, $langs;
+	/**
+	 *  Create object into database
+	 *
+	 *  @param	User	$user        User that creates
+	 *  @param  int		$notrigger   0=launch triggers after, 1=disable triggers
+	 *  @return int      		   	 <0 if KO, Id of created object if OK
+	 */
+	public function create($user, $notrigger = 0)
+	{
+		global $conf, $langs;
 		$error = 0;
 
 		// Clean parameters
@@ -91,7 +91,7 @@ class Propalmergepdfproduct extends CommonObject
 		// Check parameters
 		// Put here code to add control on parameters values
 
-        // Insert request
+		// Insert request
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."propal_merge_pdf_product(";
 
 		$sql .= "fk_product,";
@@ -104,7 +104,7 @@ class Propalmergepdfproduct extends CommonObject
 		$sql .= "datec";
 
 
-        $sql .= ") VALUES (";
+		$sql .= ") VALUES (";
 
 		$sql .= " ".(!isset($this->fk_product) ? 'NULL' : "'".$this->db->escape($this->fk_product)."'").",";
 		$sql .= " ".(!isset($this->file_name) ? 'NULL' : "'".$this->db->escape($this->file_name)."'").",";
@@ -121,42 +121,42 @@ class Propalmergepdfproduct extends CommonObject
 		$this->db->begin();
 
 	   	dol_syslog(__METHOD__, LOG_DEBUG);
-        $resql = $this->db->query($sql);
-    	if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+		$resql = $this->db->query($sql);
+		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
 		if (!$error)
-        {
-            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."propal_merge_pdf_product");
-        }
+		{
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."propal_merge_pdf_product");
+		}
 
-        // Commit or rollback
-        if ($error)
+		// Commit or rollback
+		if ($error)
 		{
 			foreach ($this->errors as $errmsg)
 			{
-	            dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
-	            $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
+				dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
 			return -1 * $error;
 		} else {
 			$this->db->commit();
-            return $this->id;
+			return $this->id;
 		}
-    }
+	}
 
 
-    /**
-     *  Load object in memory from the database
-     *
-     *  @param	int		$id    Id object
-     *  @return int          	<0 if KO, >0 if OK
-     */
-    public function fetch($id)
-    {
-    	global $langs, $conf;
+	/**
+	 *  Load object in memory from the database
+	 *
+	 *  @param	int		$id    Id object
+	 *  @return int          	<0 if KO, >0 if OK
+	 */
+	public function fetch($id)
+	{
+		global $langs, $conf;
 
-        $sql = "SELECT";
+		$sql = "SELECT";
 		$sql .= " t.rowid,";
 
 		$sql .= " t.fk_product,";
@@ -169,18 +169,18 @@ class Propalmergepdfproduct extends CommonObject
 		$sql .= " t.import_key";
 
 
-        $sql .= " FROM ".MAIN_DB_PREFIX."propal_merge_pdf_product as t";
-        $sql .= " WHERE t.rowid = ".$id;
+		$sql .= " FROM ".MAIN_DB_PREFIX."propal_merge_pdf_product as t";
+		$sql .= " WHERE t.rowid = ".$id;
 
-    	dol_syslog(__METHOD__, LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            if ($this->db->num_rows($resql))
-            {
-                $obj = $this->db->fetch_object($resql);
+		dol_syslog(__METHOD__, LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			if ($this->db->num_rows($resql))
+			{
+				$obj = $this->db->fetch_object($resql);
 
-                $this->id = $obj->rowid;
+				$this->id = $obj->rowid;
 
 				$this->fk_product = $obj->fk_product;
 				$this->file_name = $obj->file_name;
@@ -192,100 +192,100 @@ class Propalmergepdfproduct extends CommonObject
 				$this->datec = $this->db->jdate($obj->datec);
 				$this->tms = $this->db->jdate($obj->tms);
 				$this->import_key = $obj->import_key;
-            }
-            $this->db->free($resql);
+			}
+			$this->db->free($resql);
 
-            return 1;
-        } else {
-      	    $this->error = "Error ".$this->db->lasterror();
-            dol_syslog(get_class($this)."::fetch ".$this->error, LOG_ERR);
-            return -1;
-        }
-    }
+			return 1;
+		} else {
+	  		$this->error = "Error ".$this->db->lasterror();
+			dol_syslog(get_class($this)."::fetch ".$this->error, LOG_ERR);
+			return -1;
+		}
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Load object in memory from the database
-     *
-     *  @param	int		$product_id    	Id object
-     *  @param	string	$lang  			Lang string code
-     *  @return int          	<0 if KO, >0 if OK
-     */
-    public function fetch_by_product($product_id, $lang = '')
-    {
-        // phpcs:enable
-    	global $langs, $conf;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Load object in memory from the database
+	 *
+	 *  @param	int		$product_id    	Id object
+	 *  @param	string	$lang  			Lang string code
+	 *  @return int          	<0 if KO, >0 if OK
+	 */
+	public function fetch_by_product($product_id, $lang = '')
+	{
+		// phpcs:enable
+		global $langs, $conf;
 
-    	$sql = "SELECT";
-    	$sql .= " t.rowid,";
+		$sql = "SELECT";
+		$sql .= " t.rowid,";
 
-    	$sql .= " t.fk_product,";
-    	$sql .= " t.file_name,";
-    	$sql .= " t.lang,";
-    	$sql .= " t.fk_user_author,";
-    	$sql .= " t.fk_user_mod,";
-    	$sql .= " t.datec,";
-    	$sql .= " t.tms,";
-    	$sql .= " t.import_key";
+		$sql .= " t.fk_product,";
+		$sql .= " t.file_name,";
+		$sql .= " t.lang,";
+		$sql .= " t.fk_user_author,";
+		$sql .= " t.fk_user_mod,";
+		$sql .= " t.datec,";
+		$sql .= " t.tms,";
+		$sql .= " t.import_key";
 
 
-    	$sql .= " FROM ".MAIN_DB_PREFIX."propal_merge_pdf_product as t";
-    	$sql .= " WHERE t.fk_product = ".$product_id;
-    	if ($conf->global->MAIN_MULTILANGS && !empty($lang)) {
-    		$sql .= " AND t.lang = '".$this->db->escape($lang)."'";
-    	}
+		$sql .= " FROM ".MAIN_DB_PREFIX."propal_merge_pdf_product as t";
+		$sql .= " WHERE t.fk_product = ".$product_id;
+		if ($conf->global->MAIN_MULTILANGS && !empty($lang)) {
+			$sql .= " AND t.lang = '".$this->db->escape($lang)."'";
+		}
 
-    	dol_syslog(__METHOD__, LOG_DEBUG);
-    	$resql = $this->db->query($sql);
-    	if ($resql)
-    	{
-    		if ($this->db->num_rows($resql))
-    		{
-    			while ($obj = $this->db->fetch_object($resql)) {
-    				$line = new PropalmergepdfproductLine();
+		dol_syslog(__METHOD__, LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			if ($this->db->num_rows($resql))
+			{
+				while ($obj = $this->db->fetch_object($resql)) {
+					$line = new PropalmergepdfproductLine();
 
-	    			$line->id = $obj->rowid;
+					$line->id = $obj->rowid;
 
-	    			$line->fk_product = $obj->fk_product;
-	    			$line->file_name = $obj->file_name;
-	    			if ($conf->global->MAIN_MULTILANGS) {
-	    				$line->lang = $obj->lang;
-	    			}
-	    			$line->fk_user_author = $obj->fk_user_author;
-	    			$line->fk_user_mod = $obj->fk_user_mod;
-	    			$line->datec = $this->db->jdate($obj->datec);
-	    			$line->tms = $this->db->jdate($obj->tms);
-	    			$line->import_key = $obj->import_key;
+					$line->fk_product = $obj->fk_product;
+					$line->file_name = $obj->file_name;
+					if ($conf->global->MAIN_MULTILANGS) {
+						$line->lang = $obj->lang;
+					}
+					$line->fk_user_author = $obj->fk_user_author;
+					$line->fk_user_mod = $obj->fk_user_mod;
+					$line->datec = $this->db->jdate($obj->datec);
+					$line->tms = $this->db->jdate($obj->tms);
+					$line->import_key = $obj->import_key;
 
 
-	    			if ($conf->global->MAIN_MULTILANGS) {
-	    				$this->lines[$obj->file_name.'_'.$obj->lang] = $line;
-	    			} else {
-	    				$this->lines[$obj->file_name] = $line;
-	    			}
-    			}
-    		}
-    		$this->db->free($resql);
+					if ($conf->global->MAIN_MULTILANGS) {
+						$this->lines[$obj->file_name.'_'.$obj->lang] = $line;
+					} else {
+						$this->lines[$obj->file_name] = $line;
+					}
+				}
+			}
+			$this->db->free($resql);
 
-    		return 1;
-    	} else {
-    		$this->error = "Error ".$this->db->lasterror();
-    		dol_syslog(get_class($this)."::fetch_by_product ".$this->error, LOG_ERR);
-    		return -1;
-    	}
-    }
+			return 1;
+		} else {
+			$this->error = "Error ".$this->db->lasterror();
+			dol_syslog(get_class($this)."::fetch_by_product ".$this->error, LOG_ERR);
+			return -1;
+		}
+	}
 
 
-    /**
-     *  Update object into database
-     *
-     *  @param	User	$user        User that modifies
-     *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
-     *  @return int     		   	 <0 if KO, >0 if OK
-     */
-    public function update($user = 0, $notrigger = 0)
-    {
-    	global $conf, $langs;
+	/**
+	 *  Update object into database
+	 *
+	 *  @param	User	$user        User that modifies
+	 *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
+	 *  @return int     		   	 <0 if KO, >0 if OK
+	 */
+	public function update($user = 0, $notrigger = 0)
+	{
+		global $conf, $langs;
 		$error = 0;
 
 		// Clean parameters
@@ -298,8 +298,8 @@ class Propalmergepdfproduct extends CommonObject
 		// Check parameters
 		// Put here code to add a control on parameters values
 
-        // Update request
-        $sql = "UPDATE ".MAIN_DB_PREFIX."propal_merge_pdf_product SET";
+		// Update request
+		$sql = "UPDATE ".MAIN_DB_PREFIX."propal_merge_pdf_product SET";
 
 		$sql .= " fk_product=".(isset($this->fk_product) ? $this->fk_product : "null").",";
 		$sql .= " file_name=".(isset($this->file_name) ? "'".$this->db->escape($this->file_name)."'" : "null").",";
@@ -309,62 +309,21 @@ class Propalmergepdfproduct extends CommonObject
 		$sql .= " fk_user_mod=".$user->id;
 
 
-        $sql .= " WHERE rowid=".$this->id;
+		$sql .= " WHERE rowid=".$this->id;
 
 		$this->db->begin();
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
-        $resql = $this->db->query($sql);
-    	if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+		$resql = $this->db->query($sql);
+		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
-        // Commit or rollback
+		// Commit or rollback
 		if ($error)
 		{
 			foreach ($this->errors as $errmsg)
 			{
-	            dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
-	            $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
-			}
-			$this->db->rollback();
-			return -1 * $error;
-		} else {
-			$this->db->commit();
-			return 1;
-		}
-    }
-
-
- 	/**
-	 *  Delete object in database
-	 *
-     *	@param  User	$user        User that deletes
-     *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
-	 *  @return	int					 <0 if KO, >0 if OK
-	 */
-	public function delete($user, $notrigger = 0)
-	{
-		global $conf, $langs;
-		$error = 0;
-
-		$this->db->begin();
-
-		if (!$error)
-		{
-    		$sql = "DELETE FROM ".MAIN_DB_PREFIX."propal_merge_pdf_product";
-    		$sql .= " WHERE rowid=".$this->id;
-
-    		dol_syslog(__METHOD__, LOG_DEBUG);
-    		$resql = $this->db->query($sql);
-        	if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
-		}
-
-        // Commit or rollback
-		if ($error)
-		{
-			foreach ($this->errors as $errmsg)
-			{
-	            dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
-	            $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
+				dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
 			return -1 * $error;
@@ -374,7 +333,48 @@ class Propalmergepdfproduct extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+
+ 	/**
+ 	 *  Delete object in database
+ 	 *
+ 	 *	@param  User	$user        User that deletes
+ 	 *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
+ 	 *  @return	int					 <0 if KO, >0 if OK
+ 	 */
+	public function delete($user, $notrigger = 0)
+	{
+		global $conf, $langs;
+		$error = 0;
+
+		$this->db->begin();
+
+		if (!$error)
+		{
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX."propal_merge_pdf_product";
+			$sql .= " WHERE rowid=".$this->id;
+
+			dol_syslog(__METHOD__, LOG_DEBUG);
+			$resql = $this->db->query($sql);
+			if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+		}
+
+		// Commit or rollback
+		if ($error)
+		{
+			foreach ($this->errors as $errmsg)
+			{
+				dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
+			}
+			$this->db->rollback();
+			return -1 * $error;
+		} else {
+			$this->db->commit();
+			return 1;
+		}
+	}
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Delete object in database
 	 *
@@ -386,7 +386,7 @@ class Propalmergepdfproduct extends CommonObject
 	 */
 	public function delete_by_product($user, $product_id, $lang_id = '', $notrigger = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $langs;
 		$error = 0;
 
@@ -422,7 +422,7 @@ class Propalmergepdfproduct extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Delete object in database
 	 *
@@ -431,7 +431,7 @@ class Propalmergepdfproduct extends CommonObject
 	 */
 	public function delete_by_file($user)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $langs;
 		$error = 0;
 
@@ -543,38 +543,38 @@ class Propalmergepdfproduct extends CommonObject
  */
 class PropalmergepdfproductLine
 {
-    /**
-     * @var int ID
-     */
-    public $id;
+	/**
+	 * @var int ID
+	 */
+	public $id;
 
-    /**
-     * @var int ID
-     */
-    public $fk_product;
+	/**
+	 * @var int ID
+	 */
+	public $fk_product;
 
 	public $file_name;
 	public $lang;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_user_author;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_user_mod;
 
 	public $datec = '';
 	public $tms = '';
 	public $import_key;
 
-    /**
-     *  Constructor
-     */
-    public function __construct()
-    {
-        return 1;
-    }
+	/**
+	 *  Constructor
+	 */
+	public function __construct()
+	{
+		return 1;
+	}
 }
diff --git a/htdocs/product/composition/card.php b/htdocs/product/composition/card.php
index 68073eba2ef..de79c294212 100644
--- a/htdocs/product/composition/card.php
+++ b/htdocs/product/composition/card.php
@@ -136,8 +136,8 @@ if ($action == 'search')
 {
 	$current_lang = $langs->getDefaultLang();
 
-    $sql = 'SELECT DISTINCT p.rowid, p.ref, p.label, p.fk_product_type as type, p.barcode, p.price, p.price_ttc, p.price_base_type, p.entity,';
-    $sql .= ' p.fk_product_type, p.tms as datem';
+	$sql = 'SELECT DISTINCT p.rowid, p.ref, p.label, p.fk_product_type as type, p.barcode, p.price, p.price_ttc, p.price_base_type, p.entity,';
+	$sql .= ' p.fk_product_type, p.tms as datem';
 	if (!empty($conf->global->MAIN_MULTILANGS)) $sql .= ', pl.label as labelm, pl.description as descriptionm';
 	$sql .= ' FROM '.MAIN_DB_PREFIX.'product as p';
 	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie_product as cp ON p.rowid = cp.fk_product';
@@ -197,58 +197,58 @@ if ($id > 0 || !empty($ref))
 	 */
 	if ($user->rights->produit->lire || $user->rights->service->lire)
 	{
-        $linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+		$linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-        $shownav = 1;
-        if ($user->socid && !in_array('product', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav = 0;
+		$shownav = 1;
+		if ($user->socid && !in_array('product', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav = 0;
 
-        dol_banner_tab($object, 'ref', $linkback, $shownav, 'ref', '', '', '', 0, '', '', 0);
+		dol_banner_tab($object, 'ref', $linkback, $shownav, 'ref', '', '', '', 0, '', '', 0);
 
-        if ($object->type != Product::TYPE_SERVICE || empty($conf->global->PRODUIT_MULTIPRICES))
-        {
-            print '<div class="fichecenter">';
-    	    print '<div class="underbanner clearboth"></div>';
+		if ($object->type != Product::TYPE_SERVICE || empty($conf->global->PRODUIT_MULTIPRICES))
+		{
+			print '<div class="fichecenter">';
+			print '<div class="underbanner clearboth"></div>';
 
-    	    print '<table class="border centpercent tableforfield">';
+			print '<table class="border centpercent tableforfield">';
 
-    		// Nature
-    		if ($object->type != Product::TYPE_SERVICE)
-    		{
-    			print '<tr><td class="titlefield">'.$langs->trans("Nature").'</td><td>';
-    			print $object->getLibFinished();
-    			print '</td></tr>';
-    		}
+			// Nature
+			if ($object->type != Product::TYPE_SERVICE)
+			{
+				print '<tr><td class="titlefield">'.$langs->trans("Nature").'</td><td>';
+				print $object->getLibFinished();
+				print '</td></tr>';
+			}
 
-    		if (empty($conf->global->PRODUIT_MULTIPRICES))
-    		{
-    		    // Price
-    			print '<tr><td class="titlefield">'.$langs->trans("SellingPrice").'</td><td>';
-    			if ($object->price_base_type == 'TTC')
-    			{
-    				print price($object->price_ttc).' '.$langs->trans($object->price_base_type);
-    			} else {
-    				print price($object->price).' '.$langs->trans($object->price_base_type ? $object->price_base_type : 'HT');
-    			}
-    			print '</td></tr>';
+			if (empty($conf->global->PRODUIT_MULTIPRICES))
+			{
+				// Price
+				print '<tr><td class="titlefield">'.$langs->trans("SellingPrice").'</td><td>';
+				if ($object->price_base_type == 'TTC')
+				{
+					print price($object->price_ttc).' '.$langs->trans($object->price_base_type);
+				} else {
+					print price($object->price).' '.$langs->trans($object->price_base_type ? $object->price_base_type : 'HT');
+				}
+				print '</td></tr>';
 
-    			// Price minimum
-    			print '<tr><td>'.$langs->trans("MinPrice").'</td><td>';
-    			if ($object->price_base_type == 'TTC')
-    			{
-    				print price($object->price_min_ttc).' '.$langs->trans($object->price_base_type);
-    			} else {
-    				print price($object->price_min).' '.$langs->trans($object->price_base_type ? $object->price_base_type : 'HT');
-    			}
-    			print '</td></tr>';
-    		}
+				// Price minimum
+				print '<tr><td>'.$langs->trans("MinPrice").'</td><td>';
+				if ($object->price_base_type == 'TTC')
+				{
+					print price($object->price_min_ttc).' '.$langs->trans($object->price_base_type);
+				} else {
+					print price($object->price_min).' '.$langs->trans($object->price_base_type ? $object->price_base_type : 'HT');
+				}
+				print '</td></tr>';
+			}
 
-            print '</table>';
-            print '</div>';
-        }
+			print '</table>';
+			print '</div>';
+		}
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
-        print '<br>';
+		print '<br>';
 
 		$prodsfather = $object->getFather(); // Parent Products
 		$object->get_sousproduits_arbo(); // Load $object->sousprods
@@ -341,8 +341,8 @@ if ($id > 0 || !empty($ref))
 					if ($product_fourn->find_min_price_product_fournisseur($productstatic->id) > 0)
 					{
 						print $langs->trans("BuyingPriceMinShort").': ';
-				    	if ($product_fourn->product_fourn_price_id > 0) print $product_fourn->display_price_product_fournisseur(0, 0);
-				    	else { print $langs->trans("NotDefined"); $notdefined++; $atleastonenotdefined++; }
+						if ($product_fourn->product_fourn_price_id > 0) print $product_fourn->display_price_product_fournisseur(0, 0);
+						else { print $langs->trans("NotDefined"); $notdefined++; $atleastonenotdefined++; }
 					}
 					print '</td>';
 
@@ -478,7 +478,7 @@ if ($id > 0 || !empty($ref))
 			$rowspan = 1;
 			if (!empty($conf->categorie->enabled)) $rowspan++;
 
-	        print load_fiche_titre($langs->trans("ProductToAddSearch"), '', '');
+			print load_fiche_titre($langs->trans("ProductToAddSearch"), '', '');
 			print '<form action="'.DOL_URL_ROOT.'/product/composition/card.php?id='.$id.'" method="POST">';
 			print '<input type="hidden" name="action" value="search">';
 			print '<input type="hidden" name="id" value="'.$id.'">';
diff --git a/htdocs/product/document.php b/htdocs/product/document.php
index 9087b457caf..60e0afe7858 100644
--- a/htdocs/product/document.php
+++ b/htdocs/product/document.php
@@ -70,15 +70,15 @@ if (!$sortfield) $sortfield = "position_name";
 $object = new Product($db);
 if ($id > 0 || !empty($ref))
 {
-    $result = $object->fetch($id, $ref);
+	$result = $object->fetch($id, $ref);
 
-    if (!empty($conf->product->enabled)) $upload_dir = $conf->product->multidir_output[$object->entity].'/'.get_exdir(0, 0, 0, 0, $object, 'product').dol_sanitizeFileName($object->ref);
-    elseif (!empty($conf->service->enabled)) $upload_dir = $conf->service->multidir_output[$object->entity].'/'.get_exdir(0, 0, 0, 0, $object, 'product').dol_sanitizeFileName($object->ref);
+	if (!empty($conf->product->enabled)) $upload_dir = $conf->product->multidir_output[$object->entity].'/'.get_exdir(0, 0, 0, 0, $object, 'product').dol_sanitizeFileName($object->ref);
+	elseif (!empty($conf->service->enabled)) $upload_dir = $conf->service->multidir_output[$object->entity].'/'.get_exdir(0, 0, 0, 0, $object, 'product').dol_sanitizeFileName($object->ref);
 
 	if (!empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))    // For backward compatiblity, we scan also old dirs
 	{
-	    if (!empty($conf->product->enabled)) $upload_dirold = $conf->product->multidir_output[$object->entity].'/'.substr(substr("000".$object->id, -2), 1, 1).'/'.substr(substr("000".$object->id, -2), 0, 1).'/'.$object->id."/photos";
-	    else $upload_dirold = $conf->service->multidir_output[$object->entity].'/'.substr(substr("000".$object->id, -2), 1, 1).'/'.substr(substr("000".$object->id, -2), 0, 1).'/'.$object->id."/photos";
+		if (!empty($conf->product->enabled)) $upload_dirold = $conf->product->multidir_output[$object->entity].'/'.substr(substr("000".$object->id, -2), 1, 1).'/'.substr(substr("000".$object->id, -2), 0, 1).'/'.$object->id."/photos";
+		else $upload_dirold = $conf->service->multidir_output[$object->entity].'/'.substr(substr("000".$object->id, -2), 1, 1).'/'.substr(substr("000".$object->id, -2), 0, 1).'/'.$object->id."/photos";
 	}
 }
 $modulepart = 'produit';
@@ -195,7 +195,7 @@ if ($object->id)
 
 	$parameters = array();
 	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-    print $hookmanager->resPrint;
+	print $hookmanager->resPrint;
 	if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
 	// Build file list
@@ -214,127 +214,127 @@ if ($object->id)
 	}
 
 
-    $linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
-    $object->next_prev_filter = " fk_product_type = ".$object->type;
+	$linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+	$object->next_prev_filter = " fk_product_type = ".$object->type;
 
-    $shownav = 1;
-    if ($user->socid && !in_array('product', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav = 0;
+	$shownav = 1;
+	if ($user->socid && !in_array('product', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav = 0;
 
-    dol_banner_tab($object, 'ref', $linkback, $shownav, 'ref');
+	dol_banner_tab($object, 'ref', $linkback, $shownav, 'ref');
 
-    print '<div class="fichecenter">';
+	print '<div class="fichecenter">';
 
-    print '<div class="underbanner clearboth"></div>';
-    print '<table class="border tableforfield centpercent">';
+	print '<div class="underbanner clearboth"></div>';
+	print '<table class="border tableforfield centpercent">';
 
-    print '<tr><td class="titlefield">'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
-    print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.dol_print_size($totalsize, 1, 1).'</td></tr>';
-    print '</table>';
+	print '<tr><td class="titlefield">'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
+	print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.dol_print_size($totalsize, 1, 1).'</td></tr>';
+	print '</table>';
 
-    print '</div>';
-    print '<div style="clear:both"></div>';
+	print '</div>';
+	print '<div style="clear:both"></div>';
 
-    dol_fiche_end();
+	print dol_get_fiche_end();
 
-    $param = '&id='.$object->id;
-    include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
+	$param = '&id='.$object->id;
+	include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
 
 
-    // Merge propal PDF document PDF files
-    if (!empty($conf->global->PRODUIT_PDF_MERGE_PROPAL))
-    {
-    	$filetomerge = new Propalmergepdfproduct($db);
+	// Merge propal PDF document PDF files
+	if (!empty($conf->global->PRODUIT_PDF_MERGE_PROPAL))
+	{
+		$filetomerge = new Propalmergepdfproduct($db);
 
-    	if ($conf->global->MAIN_MULTILANGS) {
-    		$lang_id = GETPOST('lang_id', 'aZ09');
-    		$result = $filetomerge->fetch_by_product($object->id, $lang_id);
-    	} else {
-    		$result = $filetomerge->fetch_by_product($object->id);
-    	}
+		if ($conf->global->MAIN_MULTILANGS) {
+			$lang_id = GETPOST('lang_id', 'aZ09');
+			$result = $filetomerge->fetch_by_product($object->id, $lang_id);
+		} else {
+			$result = $filetomerge->fetch_by_product($object->id);
+		}
 
-    	$form = new Form($db);
+		$form = new Form($db);
 
 
-    	$filearray = dol_dir_list($upload_dir, "files", 0, '', '\.meta$', 'name', SORT_ASC, 1);
+		$filearray = dol_dir_list($upload_dir, "files", 0, '', '\.meta$', 'name', SORT_ASC, 1);
 
-    	if (!empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))    // For backward compatiblity, we scan also old dirs
-    	{
-    		$filearray = array_merge($filearray, dol_dir_list($upload_dirold, "files", 0, '', '\.meta$', 'name', SORT_ASC, 1));
-    	}
+		if (!empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))    // For backward compatiblity, we scan also old dirs
+		{
+			$filearray = array_merge($filearray, dol_dir_list($upload_dirold, "files", 0, '', '\.meta$', 'name', SORT_ASC, 1));
+		}
 
-    	// For each file build select list with PDF extention
-    	if (count($filearray) > 0)
-    	{
-    		print '<br>';
-    		// Actual file to merge is :
-    		if (count($filetomerge->lines) > 0) {
-    			print $langs->trans('PropalMergePdfProductActualFile');
-    		}
+		// For each file build select list with PDF extention
+		if (count($filearray) > 0)
+		{
+			print '<br>';
+			// Actual file to merge is :
+			if (count($filetomerge->lines) > 0) {
+				print $langs->trans('PropalMergePdfProductActualFile');
+			}
 
-    		print '<form name="filemerge" action="'.DOL_URL_ROOT.'/product/document.php?id='.$object->id.'" method="post">';
-    		print '<input type="hidden" name="token" value="'.newToken().'">';
-    		print '<input type="hidden" name="action" value="filemerge">';
-    		if (count($filetomerge->lines) == 0) {
-    			print $langs->trans('PropalMergePdfProductChooseFile');
-    		}
+			print '<form name="filemerge" action="'.DOL_URL_ROOT.'/product/document.php?id='.$object->id.'" method="post">';
+			print '<input type="hidden" name="token" value="'.newToken().'">';
+			print '<input type="hidden" name="action" value="filemerge">';
+			if (count($filetomerge->lines) == 0) {
+				print $langs->trans('PropalMergePdfProductChooseFile');
+			}
 
-    		print  '<table class="noborder">';
+			print  '<table class="noborder">';
 
-    		// Get language
-    		if ($conf->global->MAIN_MULTILANGS) {
-    			$langs->load("languages");
+			// Get language
+			if ($conf->global->MAIN_MULTILANGS) {
+				$langs->load("languages");
 
-    			print  '<tr class="liste_titre"><td>';
+				print  '<tr class="liste_titre"><td>';
 
-    			$default_lang = empty($lang_id) ? $langs->getDefaultLang() : $lang_id;
+				$default_lang = empty($lang_id) ? $langs->getDefaultLang() : $lang_id;
 
-    			$langs_available = $langs->get_available_languages(DOL_DOCUMENT_ROOT, 12);
+				$langs_available = $langs->get_available_languages(DOL_DOCUMENT_ROOT, 12);
 
-			    print Form::selectarray('lang_id', $langs_available, $default_lang, 0, 0, 0, '', 0, 0, 0, 'ASC');
+				print Form::selectarray('lang_id', $langs_available, $default_lang, 0, 0, 0, '', 0, 0, 0, 'ASC');
 
-    			if ($conf->global->MAIN_MULTILANGS) {
-    				print  '<input type="submit" class="button" name="refresh" value="'.$langs->trans('Refresh').'">';
-    			}
+				if ($conf->global->MAIN_MULTILANGS) {
+					print  '<input type="submit" class="button" name="refresh" value="'.$langs->trans('Refresh').'">';
+				}
 
-    			print  '</td></tr>';
-    		}
+				print  '</td></tr>';
+			}
 
-    		foreach ($filearray as $filetoadd)
-    		{
-    			if ($ext = pathinfo($filetoadd['name'], PATHINFO_EXTENSION) == 'pdf')
-    			{
-    				$checked = '';
-    				$filename = $filetoadd['name'];
+			foreach ($filearray as $filetoadd)
+			{
+				if ($ext = pathinfo($filetoadd['name'], PATHINFO_EXTENSION) == 'pdf')
+				{
+					$checked = '';
+					$filename = $filetoadd['name'];
 
-    				if ($conf->global->MAIN_MULTILANGS)
-    				{
-    					if (array_key_exists($filetoadd['name'].'_'.$default_lang, $filetomerge->lines))
-    					{
-    						$filename = $filetoadd['name'].' - '.$langs->trans('Language_'.$default_lang);
-    						$checked = ' checked ';
-    					}
-    				} else {
-    					if (array_key_exists($filetoadd['name'], $filetomerge->lines))
-    					{
-    						$checked = ' checked ';
-    					}
-    				}
+					if ($conf->global->MAIN_MULTILANGS)
+					{
+						if (array_key_exists($filetoadd['name'].'_'.$default_lang, $filetomerge->lines))
+						{
+							$filename = $filetoadd['name'].' - '.$langs->trans('Language_'.$default_lang);
+							$checked = ' checked ';
+						}
+					} else {
+						if (array_key_exists($filetoadd['name'], $filetomerge->lines))
+						{
+							$checked = ' checked ';
+						}
+					}
 
-    				print  '<tr class="oddeven"><td>';
-    				print  '<input type="checkbox" '.$checked.' name="filetoadd[]" id="filetoadd" value="'.$filetoadd['name'].'">'.$filename.'</input>';
-    				print  '</td></tr>';
-    			}
-    		}
+					print  '<tr class="oddeven"><td>';
+					print  '<input type="checkbox" '.$checked.' name="filetoadd[]" id="filetoadd" value="'.$filetoadd['name'].'">'.$filename.'</input>';
+					print  '</td></tr>';
+				}
+			}
 
-    		print  '<tr><td>';
-    		print  '<input type="submit" class="button" name="save" value="'.$langs->trans('Save').'">';
-    		print  '</td></tr>';
+			print  '<tr><td>';
+			print  '<input type="submit" class="button" name="save" value="'.$langs->trans('Save').'">';
+			print  '</td></tr>';
 
-    		print  '</table>';
+			print  '</table>';
 
-    		print  '</form>';
-    	}
-    }
+			print  '</form>';
+		}
+	}
 } else {
 	print $langs->trans("ErrorUnknown");
 }
diff --git a/htdocs/product/dynamic_price/class/price_expression.class.php b/htdocs/product/dynamic_price/class/price_expression.class.php
index cf498d6f998..218780cce44 100644
--- a/htdocs/product/dynamic_price/class/price_expression.class.php
+++ b/htdocs/product/dynamic_price/class/price_expression.class.php
@@ -29,337 +29,337 @@
  */
 class PriceExpression
 {
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    /**
-     * @var string Error code (or message)
-     */
-    public $error = '';
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error = '';
 
-    /**
-     * @var string[] Error codes (or messages)
-     */
-    public $errors = array();
+	/**
+	 * @var string[] Error codes (or messages)
+	 */
+	public $errors = array();
 
-    /**
-     * @var int ID
-     */
-    public $id;
+	/**
+	 * @var int ID
+	 */
+	public $id;
 
-    public $title;
-    public $expression;
+	public $title;
+	public $expression;
 
-    /**
-     * @var string Name of table without prefix where object is stored
-     */
-    public $table_element = "c_price_expression";
+	/**
+	 * @var string Name of table without prefix where object is stored
+	 */
+	public $table_element = "c_price_expression";
 
-    /**
-     *  Constructor
-     *
-     *  @param	DoliDb		$db      Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-    }
+	/**
+	 *  Constructor
+	 *
+	 *  @param	DoliDb		$db      Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
 
 
-    /**
-     *  Create object into database
-     *
-     *  @param	User	$user        User that creates
-     *  @param  int		$notrigger   0=launch triggers after, 1=disable triggers
-     *  @return int      		   	 <0 if KO, Id of created object if OK
-     */
-    public function create($user, $notrigger = 0)
-    {
-        $error = 0;
+	/**
+	 *  Create object into database
+	 *
+	 *  @param	User	$user        User that creates
+	 *  @param  int		$notrigger   0=launch triggers after, 1=disable triggers
+	 *  @return int      		   	 <0 if KO, Id of created object if OK
+	 */
+	public function create($user, $notrigger = 0)
+	{
+		$error = 0;
 
-        // Clean parameters
-        if (isset($this->title)) $this->title = trim($this->title);
-        if (isset($this->expression)) $this->expression = trim($this->expression);
+		// Clean parameters
+		if (isset($this->title)) $this->title = trim($this->title);
+		if (isset($this->expression)) $this->expression = trim($this->expression);
 
-        // Insert request
-        $sql = "INSERT INTO ".MAIN_DB_PREFIX.$this->table_element." (";
-        $sql .= "title, expression";
-        $sql .= ") VALUES (";
-        $sql .= " ".(isset($this->title) ? "'".$this->db->escape($this->title)."'" : "''").",";
-        $sql .= " ".(isset($this->expression) ? "'".$this->db->escape($this->expression)."'" : "''");
-        $sql .= ")";
+		// Insert request
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX.$this->table_element." (";
+		$sql .= "title, expression";
+		$sql .= ") VALUES (";
+		$sql .= " ".(isset($this->title) ? "'".$this->db->escape($this->title)."'" : "''").",";
+		$sql .= " ".(isset($this->expression) ? "'".$this->db->escape($this->expression)."'" : "''");
+		$sql .= ")";
 
-        $this->db->begin();
+		$this->db->begin();
 
-        dol_syslog(__METHOD__, LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+		dol_syslog(__METHOD__, LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
-        if (!$error)
-        {
-            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);
+		if (!$error)
+		{
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);
 
-            //if (! $notrigger)
-            //{
-                // Uncomment this and change MYOBJECT to your own tag if you
-                // want this action calls a trigger.
+			//if (! $notrigger)
+			//{
+				// Uncomment this and change MYOBJECT to your own tag if you
+				// want this action calls a trigger.
 
-                //// Call triggers
-                //$result=$this->call_trigger('MYOBJECT_CREATE',$user);
-                //if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
-                //// End call triggers
-            //}
-        }
+				//// Call triggers
+				//$result=$this->call_trigger('MYOBJECT_CREATE',$user);
+				//if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
+				//// End call triggers
+			//}
+		}
 
-        // Commit or rollback
-        if ($error)
-        {
-            foreach ($this->errors as $errmsg)
-            {
-                dol_syslog(__METHOD__." ".$errmsg, LOG_ERR);
-                $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
-            }
-            $this->db->rollback();
-            return -1 * $error;
-        } else {
-            $this->db->commit();
-            return $this->id;
-        }
-    }
+		// Commit or rollback
+		if ($error)
+		{
+			foreach ($this->errors as $errmsg)
+			{
+				dol_syslog(__METHOD__." ".$errmsg, LOG_ERR);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
+			}
+			$this->db->rollback();
+			return -1 * $error;
+		} else {
+			$this->db->commit();
+			return $this->id;
+		}
+	}
 
 
-    /**
-     *  Load object in memory from the database
-     *
-     *  @param		int		$id    	Id object
-     *  @return		int			    < 0 if KO, 0 if OK but not found, > 0 if OK
-     */
-    public function fetch($id)
-    {
-        // Check parameters
-        if (empty($id))
-        {
-            $this->error = 'ErrorWrongParameters';
-            return -1;
-        }
+	/**
+	 *  Load object in memory from the database
+	 *
+	 *  @param		int		$id    	Id object
+	 *  @return		int			    < 0 if KO, 0 if OK but not found, > 0 if OK
+	 */
+	public function fetch($id)
+	{
+		// Check parameters
+		if (empty($id))
+		{
+			$this->error = 'ErrorWrongParameters';
+			return -1;
+		}
 
-        $sql = "SELECT title, expression";
-        $sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element;
-        $sql .= " WHERE rowid = ".$id;
+		$sql = "SELECT title, expression";
+		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element;
+		$sql .= " WHERE rowid = ".$id;
 
-        dol_syslog(__METHOD__);
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            $obj = $this->db->fetch_object($resql);
-            if ($obj)
-            {
-                $this->id = $id;
-                $this->title = $obj->title;
-                $this->expression = $obj->expression;
-                return 1;
-            } else {
-                return 0;
-            }
-        } else {
-              $this->error = "Error ".$this->db->lasterror();
-            return -1;
-        }
-    }
+		dol_syslog(__METHOD__);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$obj = $this->db->fetch_object($resql);
+			if ($obj)
+			{
+				$this->id = $id;
+				$this->title = $obj->title;
+				$this->expression = $obj->expression;
+				return 1;
+			} else {
+				return 0;
+			}
+		} else {
+			  $this->error = "Error ".$this->db->lasterror();
+			return -1;
+		}
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *    List all price expressions
-     *
-     *    @return	array				Array of price expressions
-     */
-    public function list_price_expression()
-    {
-        // phpcs:enable
-        $sql = "SELECT rowid, title, expression";
-        $sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element;
-        $sql .= " ORDER BY title";
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *    List all price expressions
+	 *
+	 *    @return	array				Array of price expressions
+	 */
+	public function list_price_expression()
+	{
+		// phpcs:enable
+		$sql = "SELECT rowid, title, expression";
+		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element;
+		$sql .= " ORDER BY title";
 
-        dol_syslog(__METHOD__, LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            $retarray = array();
+		dol_syslog(__METHOD__, LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$retarray = array();
 
-            while ($record = $this->db->fetch_array($resql))
-            {
-                $price_expression_obj = new PriceExpression($this->db);
-                $price_expression_obj->id = $record["rowid"];
-                $price_expression_obj->title = $record["title"];
-                $price_expression_obj->expression = $record["expression"];
-                $retarray[] = $price_expression_obj;
-            }
+			while ($record = $this->db->fetch_array($resql))
+			{
+				$price_expression_obj = new PriceExpression($this->db);
+				$price_expression_obj->id = $record["rowid"];
+				$price_expression_obj->title = $record["title"];
+				$price_expression_obj->expression = $record["expression"];
+				$retarray[] = $price_expression_obj;
+			}
 
-            $this->db->free($resql);
-            return $retarray;
-        } else {
-            $this->error = $this->db->error();
-            return -1;
-        }
-    }
+			$this->db->free($resql);
+			return $retarray;
+		} else {
+			$this->error = $this->db->error();
+			return -1;
+		}
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Returns any existing rowid with specified title
-     *
-     *  @param		String	$title  Title of expression
-     *  @return		int			    < 0 if KO, 0 if OK but not found, > 0 rowid
-     */
-    public function find_title($title)
-    {
-        // phpcs:enable
-        $sql = "SELECT rowid";
-        $sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element;
-        $sql .= " WHERE title = '".$this->db->escape($title)."'";
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Returns any existing rowid with specified title
+	 *
+	 *  @param		String	$title  Title of expression
+	 *  @return		int			    < 0 if KO, 0 if OK but not found, > 0 rowid
+	 */
+	public function find_title($title)
+	{
+		// phpcs:enable
+		$sql = "SELECT rowid";
+		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element;
+		$sql .= " WHERE title = '".$this->db->escape($title)."'";
 
-        dol_syslog(__METHOD__, LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            $obj = $this->db->fetch_object($resql);
-            if ($obj)
-            {
-                return (int) $obj->rowid;
-            } else {
-                return 0;
-            }
-        } else {
-              $this->error = "Error ".$this->db->lasterror();
-            return -1;
-        }
-    }
+		dol_syslog(__METHOD__, LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$obj = $this->db->fetch_object($resql);
+			if ($obj)
+			{
+				return (int) $obj->rowid;
+			} else {
+				return 0;
+			}
+		} else {
+			  $this->error = "Error ".$this->db->lasterror();
+			return -1;
+		}
+	}
 
 
-    /**
-     *  Update object into database
-     *
-     *  @param	User	$user        User that modifies
-     *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
-     *  @return int     		   	 <0 if KO, >0 if OK
-     */
-    public function update($user = 0, $notrigger = 0)
-    {
-        $error = 0;
+	/**
+	 *  Update object into database
+	 *
+	 *  @param	User	$user        User that modifies
+	 *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
+	 *  @return int     		   	 <0 if KO, >0 if OK
+	 */
+	public function update($user = 0, $notrigger = 0)
+	{
+		$error = 0;
 
-        // Clean parameters
-        if (isset($this->title)) $this->title = trim($this->title);
-        if (isset($this->expression)) $this->expression = trim($this->expression);
+		// Clean parameters
+		if (isset($this->title)) $this->title = trim($this->title);
+		if (isset($this->expression)) $this->expression = trim($this->expression);
 
-        // Update request
-        $sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
-        $sql .= " title = ".(isset($this->title) ? "'".$this->db->escape($this->title)."'" : "''").",";
-        $sql .= " expression = ".(isset($this->expression) ? "'".$this->db->escape($this->expression)."'" : "''")."";
-        $sql .= " WHERE rowid = ".$this->id;
+		// Update request
+		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
+		$sql .= " title = ".(isset($this->title) ? "'".$this->db->escape($this->title)."'" : "''").",";
+		$sql .= " expression = ".(isset($this->expression) ? "'".$this->db->escape($this->expression)."'" : "''")."";
+		$sql .= " WHERE rowid = ".$this->id;
 
-        $this->db->begin();
+		$this->db->begin();
 
-        dol_syslog(__METHOD__);
-        $resql = $this->db->query($sql);
-        if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+		dol_syslog(__METHOD__);
+		$resql = $this->db->query($sql);
+		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
-        // if (! $error)
-        // {
-        //     if (! $notrigger)
-        //     {
-        //         // Uncomment this and change MYOBJECT to your own tag if you
-        //         // want this action calls a trigger.
+		// if (! $error)
+		// {
+		//     if (! $notrigger)
+		//     {
+		//         // Uncomment this and change MYOBJECT to your own tag if you
+		//         // want this action calls a trigger.
 
-        //         //// Call triggers
-        //         //$result=$this->call_trigger('MYOBJECT_MODIFY',$user);
-        //         //if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
-        //         //// End call triggers
-        //     }
-        // }
+		//         //// Call triggers
+		//         //$result=$this->call_trigger('MYOBJECT_MODIFY',$user);
+		//         //if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
+		//         //// End call triggers
+		//     }
+		// }
 
-        // Commit or rollback
-        if ($error)
-        {
-            foreach ($this->errors as $errmsg)
-            {
-                dol_syslog(__METHOD__." ".$errmsg, LOG_ERR);
-                $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
-            }
-            $this->db->rollback();
-            return -1 * $error;
-        } else {
-            $this->db->commit();
-            return 1;
-        }
-    }
+		// Commit or rollback
+		if ($error)
+		{
+			foreach ($this->errors as $errmsg)
+			{
+				dol_syslog(__METHOD__." ".$errmsg, LOG_ERR);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
+			}
+			$this->db->rollback();
+			return -1 * $error;
+		} else {
+			$this->db->commit();
+			return 1;
+		}
+	}
 
 
-     /**
-     *  Delete object in database
-     *
-     *	@param  User	$user        User that deletes
-     *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
-     *  @return	int					 <0 if KO, >0 if OK
-     */
-    public function delete(User $user, $notrigger = 0)
-    {
-        $error = 0;
+	 /**
+	  *  Delete object in database
+	  *
+	  *	@param  User	$user        User that deletes
+	  *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
+	  *  @return	int					 <0 if KO, >0 if OK
+	  */
+	public function delete(User $user, $notrigger = 0)
+	{
+		$error = 0;
 
-        $rowid = $this->id;
+		$rowid = $this->id;
 
-        $this->db->begin();
+		$this->db->begin();
 
-        //if (! $error)
-        //{
-        //    if (! $notrigger)
-        //    {
-                // Uncomment this and change MYOBJECT to your own tag if you
-                // want this action calls a trigger.
+		//if (! $error)
+		//{
+		//    if (! $notrigger)
+		//    {
+				// Uncomment this and change MYOBJECT to your own tag if you
+				// want this action calls a trigger.
 
-                //// Call triggers
-                //$result=$this->call_trigger('MYOBJECT_DELETE',$user);
-                //if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
-                //// End call triggers
-        //    }
-        //}
+				//// Call triggers
+				//$result=$this->call_trigger('MYOBJECT_DELETE',$user);
+				//if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
+				//// End call triggers
+		//    }
+		//}
 
-        if (!$error)
-        {
-            $sql = "DELETE FROM ".MAIN_DB_PREFIX.$this->table_element;
-            $sql .= " WHERE rowid = ".$rowid;
+		if (!$error)
+		{
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX.$this->table_element;
+			$sql .= " WHERE rowid = ".$rowid;
 
-            dol_syslog(__METHOD__);
-            $resql = $this->db->query($sql);
-            if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
-        }
+			dol_syslog(__METHOD__);
+			$resql = $this->db->query($sql);
+			if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+		}
 
-        // Commit or rollback
-        if ($error)
-        {
-            foreach ($this->errors as $errmsg)
-            {
-                dol_syslog(__METHOD__." ".$errmsg, LOG_ERR);
-                $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
-            }
-            $this->db->rollback();
-            return -1 * $error;
-        } else {
-            $this->db->commit();
-            return 1;
-        }
-    }
+		// Commit or rollback
+		if ($error)
+		{
+			foreach ($this->errors as $errmsg)
+			{
+				dol_syslog(__METHOD__." ".$errmsg, LOG_ERR);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
+			}
+			$this->db->rollback();
+			return -1 * $error;
+		} else {
+			$this->db->commit();
+			return 1;
+		}
+	}
 
-    /**
-     *  Initialise object with example values
-     *  Id must be 0 if object instance is a specimen
-     *
-     *  @return	void
-     */
-    public function initAsSpecimen()
-    {
-        $this->id = 0;
-        $this->expression = '';
-    }
+	/**
+	 *  Initialise object with example values
+	 *  Id must be 0 if object instance is a specimen
+	 *
+	 *  @return	void
+	 */
+	public function initAsSpecimen()
+	{
+		$this->id = 0;
+		$this->expression = '';
+	}
 }
diff --git a/htdocs/product/dynamic_price/class/price_global_variable.class.php b/htdocs/product/dynamic_price/class/price_global_variable.class.php
index f2ab8006b02..fbe5956db7c 100644
--- a/htdocs/product/dynamic_price/class/price_global_variable.class.php
+++ b/htdocs/product/dynamic_price/class/price_global_variable.class.php
@@ -29,319 +29,319 @@
  */
 class PriceGlobalVariable
 {
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    /**
-     * @var string Error code (or message)
-     */
-    public $error = '';
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error = '';
 
-    /**
-     * @var string[] Error codes (or messages)
-     */
-    public $errors = array();
+	/**
+	 * @var string[] Error codes (or messages)
+	 */
+	public $errors = array();
 
-    /**
-     * @var int ID
-     */
-    public $id;
+	/**
+	 * @var int ID
+	 */
+	public $id;
 
-    public $code;
+	public $code;
 
-    /**
-     * @var string description
-     */
-    public $description;
+	/**
+	 * @var string description
+	 */
+	public $description;
 
-    public $value;
+	public $value;
 
-    /**
-     * @var string Name of table without prefix where object is stored
-     */
-    public $table_element = "c_price_global_variable";
+	/**
+	 * @var string Name of table without prefix where object is stored
+	 */
+	public $table_element = "c_price_global_variable";
 
-    /**
-     *  Constructor
-     *
-     *  @param	DoliDb		$db      Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-    }
+	/**
+	 *  Constructor
+	 *
+	 *  @param	DoliDb		$db      Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
 
 
-    /**
-     *  Create object into database
-     *
-     *  @param	User	$user        User that creates
-     *  @param  int		$notrigger   0=launch triggers after, 1=disable triggers
-     *  @return int      		   	 <0 if KO, Id of created object if OK
-     */
-    public function create($user, $notrigger = 0)
-    {
-        $error = 0;
+	/**
+	 *  Create object into database
+	 *
+	 *  @param	User	$user        User that creates
+	 *  @param  int		$notrigger   0=launch triggers after, 1=disable triggers
+	 *  @return int      		   	 <0 if KO, Id of created object if OK
+	 */
+	public function create($user, $notrigger = 0)
+	{
+		$error = 0;
 
-        $this->checkParameters();
+		$this->checkParameters();
 
-        // Insert request
-        $sql = "INSERT INTO ".MAIN_DB_PREFIX.$this->table_element." (";
-        $sql .= "code, description, value";
-        $sql .= ") VALUES (";
-        $sql .= " ".(isset($this->code) ? "'".$this->db->escape($this->code)."'" : "''").",";
-        $sql .= " ".(isset($this->description) ? "'".$this->db->escape($this->description)."'" : "''").",";
-        $sql .= " ".$this->value;
-        $sql .= ")";
+		// Insert request
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX.$this->table_element." (";
+		$sql .= "code, description, value";
+		$sql .= ") VALUES (";
+		$sql .= " ".(isset($this->code) ? "'".$this->db->escape($this->code)."'" : "''").",";
+		$sql .= " ".(isset($this->description) ? "'".$this->db->escape($this->description)."'" : "''").",";
+		$sql .= " ".$this->value;
+		$sql .= ")";
 
-        $this->db->begin();
+		$this->db->begin();
 
-        dol_syslog(__METHOD__);
-        $resql = $this->db->query($sql);
-        if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+		dol_syslog(__METHOD__);
+		$resql = $this->db->query($sql);
+		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
-        if (!$error)
-        {
-            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);
+		if (!$error)
+		{
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);
 
-            if (!$notrigger)
-            {
-                // Uncomment this and change MYOBJECT to your own tag if you
-                // want this action calls a trigger.
+			if (!$notrigger)
+			{
+				// Uncomment this and change MYOBJECT to your own tag if you
+				// want this action calls a trigger.
 
-                //// Call triggers
-                //$result=$this->call_trigger('MYOBJECT_CREATE',$user);
-                //if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
-                //// End call triggers
-            }
-        }
+				//// Call triggers
+				//$result=$this->call_trigger('MYOBJECT_CREATE',$user);
+				//if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
+				//// End call triggers
+			}
+		}
 
-        // Commit or rollback
-        if ($error)
-        {
-            foreach ($this->errors as $errmsg)
-            {
-                dol_syslog(__METHOD__." ".$errmsg, LOG_ERR);
-                $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
-            }
-            $this->db->rollback();
-            return -1 * $error;
-        } else {
-            $this->db->commit();
-            return $this->id;
-        }
-    }
+		// Commit or rollback
+		if ($error)
+		{
+			foreach ($this->errors as $errmsg)
+			{
+				dol_syslog(__METHOD__." ".$errmsg, LOG_ERR);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
+			}
+			$this->db->rollback();
+			return -1 * $error;
+		} else {
+			$this->db->commit();
+			return $this->id;
+		}
+	}
 
 
-    /**
-     *  Load object in memory from the database
-     *
-     *  @param		int		$id    	Id object
-     *  @return		int			    < 0 if KO, 0 if OK but not found, > 0 if OK
-     */
-    public function fetch($id)
-    {
-        $sql = "SELECT code, description, value";
-        $sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element;
-        $sql .= " WHERE rowid = ".$id;
+	/**
+	 *  Load object in memory from the database
+	 *
+	 *  @param		int		$id    	Id object
+	 *  @return		int			    < 0 if KO, 0 if OK but not found, > 0 if OK
+	 */
+	public function fetch($id)
+	{
+		$sql = "SELECT code, description, value";
+		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element;
+		$sql .= " WHERE rowid = ".$id;
 
-        dol_syslog(__METHOD__);
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            $obj = $this->db->fetch_object($resql);
-            if ($obj)
-            {
-                $this->id = $id;
-                $this->code			= $obj->code;
-                $this->description = $obj->description;
-                $this->value		= $obj->value;
-                $this->checkParameters();
-                return 1;
-            } else {
-                return 0;
-            }
-        } else {
-            $this->error = "Error ".$this->db->lasterror();
-            return -1;
-        }
-    }
+		dol_syslog(__METHOD__);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$obj = $this->db->fetch_object($resql);
+			if ($obj)
+			{
+				$this->id = $id;
+				$this->code			= $obj->code;
+				$this->description = $obj->description;
+				$this->value		= $obj->value;
+				$this->checkParameters();
+				return 1;
+			} else {
+				return 0;
+			}
+		} else {
+			$this->error = "Error ".$this->db->lasterror();
+			return -1;
+		}
+	}
 
-    /**
-     *  Update object into database
-     *
-     *  @param	User	$user        User that modifies
-     *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
-     *  @return int     		   	 <0 if KO, >0 if OK
-     */
-    public function update($user = 0, $notrigger = 0)
-    {
-        $error = 0;
+	/**
+	 *  Update object into database
+	 *
+	 *  @param	User	$user        User that modifies
+	 *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
+	 *  @return int     		   	 <0 if KO, >0 if OK
+	 */
+	public function update($user = 0, $notrigger = 0)
+	{
+		$error = 0;
 
-        $this->checkParameters();
+		$this->checkParameters();
 
-        // Update request
-        $sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
-        $sql .= " code = ".(isset($this->code) ? "'".$this->db->escape($this->code)."'" : "''").",";
-        $sql .= " description = ".(isset($this->description) ? "'".$this->db->escape($this->description)."'" : "''").",";
-        $sql .= " value = ".$this->value;
-        $sql .= " WHERE rowid = ".$this->id;
+		// Update request
+		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
+		$sql .= " code = ".(isset($this->code) ? "'".$this->db->escape($this->code)."'" : "''").",";
+		$sql .= " description = ".(isset($this->description) ? "'".$this->db->escape($this->description)."'" : "''").",";
+		$sql .= " value = ".$this->value;
+		$sql .= " WHERE rowid = ".$this->id;
 
-        $this->db->begin();
+		$this->db->begin();
 
-        dol_syslog(__METHOD__);
-        $resql = $this->db->query($sql);
-        if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+		dol_syslog(__METHOD__);
+		$resql = $this->db->query($sql);
+		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
-        // if (! $error)
-        // {
-        //     if (! $notrigger)
-        //     {
-        //         // Uncomment this and change MYOBJECT to your own tag if you
-        //         // want this action calls a trigger.
+		// if (! $error)
+		// {
+		//     if (! $notrigger)
+		//     {
+		//         // Uncomment this and change MYOBJECT to your own tag if you
+		//         // want this action calls a trigger.
 
-        //         //// Call triggers
-        //         //$result=$this->call_trigger('MYOBJECT_MODIFY',$user);
-        //         //if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
-        //         //// End call triggers
-        //     }
-        // }
+		//         //// Call triggers
+		//         //$result=$this->call_trigger('MYOBJECT_MODIFY',$user);
+		//         //if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
+		//         //// End call triggers
+		//     }
+		// }
 
-        // Commit or rollback
-        if ($error)
-        {
-            foreach ($this->errors as $errmsg)
-            {
-                dol_syslog(__METHOD__." ".$errmsg, LOG_ERR);
-                $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
-            }
-            $this->db->rollback();
-            return -1 * $error;
-        } else {
-            $this->db->commit();
-            return 1;
-        }
-    }
+		// Commit or rollback
+		if ($error)
+		{
+			foreach ($this->errors as $errmsg)
+			{
+				dol_syslog(__METHOD__." ".$errmsg, LOG_ERR);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
+			}
+			$this->db->rollback();
+			return -1 * $error;
+		} else {
+			$this->db->commit();
+			return 1;
+		}
+	}
 
 
-    /**
-     *  Delete object in database
-     *
-     * 	@param	int		$rowid		 Row id of global variable
-     *	@param  User	$user        User that deletes
-     *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
-     *  @return	int					 <0 if KO, >0 if OK
-     */
-    public function delete($rowid, $user, $notrigger = 0)
-    {
-        $error = 0;
+	/**
+	 *  Delete object in database
+	 *
+	 * 	@param	int		$rowid		 Row id of global variable
+	 *	@param  User	$user        User that deletes
+	 *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
+	 *  @return	int					 <0 if KO, >0 if OK
+	 */
+	public function delete($rowid, $user, $notrigger = 0)
+	{
+		$error = 0;
 
-        $this->db->begin();
+		$this->db->begin();
 
-        if (!$error)
-        {
-            if (!$notrigger)
-            {
-                // Uncomment this and change MYOBJECT to your own tag if you
-                // want this action calls a trigger.
+		if (!$error)
+		{
+			if (!$notrigger)
+			{
+				// Uncomment this and change MYOBJECT to your own tag if you
+				// want this action calls a trigger.
 
-                //// Call triggers
-                //$result=$this->call_trigger('MYOBJECT_DELETE',$user);
-                //if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
-                //// End call triggers
-            }
-        }
+				//// Call triggers
+				//$result=$this->call_trigger('MYOBJECT_DELETE',$user);
+				//if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
+				//// End call triggers
+			}
+		}
 
-        if (!$error)
-        {
-            $sql = "DELETE FROM ".MAIN_DB_PREFIX.$this->table_element;
-            $sql .= " WHERE rowid = ".$rowid;
+		if (!$error)
+		{
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX.$this->table_element;
+			$sql .= " WHERE rowid = ".$rowid;
 
-            dol_syslog(__METHOD__);
-            $resql = $this->db->query($sql);
-            if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
-        }
+			dol_syslog(__METHOD__);
+			$resql = $this->db->query($sql);
+			if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+		}
 
-        // Commit or rollback
-        if ($error)
-        {
-            foreach ($this->errors as $errmsg)
-            {
-                dol_syslog(__METHOD__." ".$errmsg, LOG_ERR);
-                $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
-            }
-            $this->db->rollback();
-            return -1 * $error;
-        } else {
-            $this->db->commit();
-            return 1;
-        }
-    }
+		// Commit or rollback
+		if ($error)
+		{
+			foreach ($this->errors as $errmsg)
+			{
+				dol_syslog(__METHOD__." ".$errmsg, LOG_ERR);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
+			}
+			$this->db->rollback();
+			return -1 * $error;
+		} else {
+			$this->db->commit();
+			return 1;
+		}
+	}
 
-    /**
-     *	Initialise object with example values
-     *	Id must be 0 if object instance is a specimen
-     *
-     *	@return	void
-     */
-    public function initAsSpecimen()
-    {
-        $this->id = 0;
-        $this->code = '';
-        $this->description = '';
-        $this->value = '';
-    }
+	/**
+	 *	Initialise object with example values
+	 *	Id must be 0 if object instance is a specimen
+	 *
+	 *	@return	void
+	 */
+	public function initAsSpecimen()
+	{
+		$this->id = 0;
+		$this->code = '';
+		$this->description = '';
+		$this->value = '';
+	}
 
-    /**
-     *	Checks if all parameters are in order
-     *
-     *	@return	void
-     */
-    public function checkParameters()
-    {
-        // Clean parameters
-        if (isset($this->code)) $this->code = trim($this->code);
-        if (isset($this->description)) $this->description = trim($this->description);
+	/**
+	 *	Checks if all parameters are in order
+	 *
+	 *	@return	void
+	 */
+	public function checkParameters()
+	{
+		// Clean parameters
+		if (isset($this->code)) $this->code = trim($this->code);
+		if (isset($this->description)) $this->description = trim($this->description);
 
-        // Check parameters
-        if (empty($this->value) || !is_numeric($this->value)) $this->value = 0;
-    }
+		// Check parameters
+		if (empty($this->value) || !is_numeric($this->value)) $this->value = 0;
+	}
 
-    /**
-     *    List all price global variables
-     *
-     *    @return	array				Array of price global variables
-     */
-    public function listGlobalVariables()
-    {
-        $sql = "SELECT rowid, code, description, value";
-        $sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element;
-        $sql .= " ORDER BY code";
+	/**
+	 *    List all price global variables
+	 *
+	 *    @return	array				Array of price global variables
+	 */
+	public function listGlobalVariables()
+	{
+		$sql = "SELECT rowid, code, description, value";
+		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element;
+		$sql .= " ORDER BY code";
 
-        dol_syslog(__METHOD__, LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            $retarray = array();
+		dol_syslog(__METHOD__, LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$retarray = array();
 
-            while ($record = $this->db->fetch_array($resql))
-            {
-                $variable_obj = new PriceGlobalVariable($this->db);
-                $variable_obj->id = $record["rowid"];
-                $variable_obj->code = $record["code"];
-                $variable_obj->description = $record["description"];
-                $variable_obj->value = $record["value"];
-                $variable_obj->checkParameters();
-                $retarray[] = $variable_obj;
-            }
+			while ($record = $this->db->fetch_array($resql))
+			{
+				$variable_obj = new PriceGlobalVariable($this->db);
+				$variable_obj->id = $record["rowid"];
+				$variable_obj->code = $record["code"];
+				$variable_obj->description = $record["description"];
+				$variable_obj->value = $record["value"];
+				$variable_obj->checkParameters();
+				$retarray[] = $variable_obj;
+			}
 
-            $this->db->free($resql);
-            return $retarray;
-        } else {
-            $this->error = $this->db->error();
-            return -1;
-        }
-    }
+			$this->db->free($resql);
+			return $retarray;
+		} else {
+			$this->error = $this->db->error();
+			return -1;
+		}
+	}
 }
diff --git a/htdocs/product/dynamic_price/class/price_global_variable_updater.class.php b/htdocs/product/dynamic_price/class/price_global_variable_updater.class.php
index 6706dded094..256e3525ead 100644
--- a/htdocs/product/dynamic_price/class/price_global_variable_updater.class.php
+++ b/htdocs/product/dynamic_price/class/price_global_variable_updater.class.php
@@ -29,608 +29,608 @@
  */
 class PriceGlobalVariableUpdater
 {
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
-
-    /**
-     * @var string Error code (or message)
-     */
-    public $error = '';
-
-    /**
-     * @var string[] Error codes (or messages)
-     */
-    public $errors = array();
-
-    public $types = array(0, 1); //!< Updater types
-    public $update_min = 5; //!< Minimal update rate
-
-    /**
-     * @var int ID
-     */
-    public $id;
-
-    public $type;
-
-    /**
-     * @var string description
-     */
-    public $description;
-
-    public $parameters;
-
-    /**
-     * @var int ID
-     */
-    public $fk_variable;
-
-    public $update_interval; //!< Interval in mins
-    public $next_update; //!< Next update timestamp
-    public $last_status;
-
-    /**
-     * @var string Name of table without prefix where object is stored
-     */
-    public $table_element = "c_price_global_variable_updater";
-
-    /**
-     *  Constructor
-     *
-     *  @param  DoliDb      $db      Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-    }
-
-
-    /**
-     *  Create object into database
-     *
-     *  @param	User	$user        User that creates
-     *  @param  int		$notrigger   0=launch triggers after, 1=disable triggers
-     *  @return int      		   	 <0 if KO, Id of created object if OK
-     */
-    public function create($user, $notrigger = 0)
-    {
-        $error = 0;
-
-        $this->checkParameters();
-
-        // Insert request
-        $sql = "INSERT INTO ".MAIN_DB_PREFIX.$this->table_element." (";
-        $sql .= "type, description, parameters, fk_variable, update_interval, next_update, last_status";
-        $sql .= ") VALUES (";
-        $sql .= " ".$this->type.",";
-        $sql .= " ".(isset($this->description) ? "'".$this->db->escape($this->description)."'" : "''").",";
-        $sql .= " ".(isset($this->parameters) ? "'".$this->db->escape($this->parameters)."'" : "''").",";
-        $sql .= " ".$this->fk_variable.",";
-        $sql .= " ".$this->update_interval.",";
-        $sql .= " ".$this->next_update.",";
-        $sql .= " ".(isset($this->last_status) ? "'".$this->db->escape($this->last_status)."'" : "''");
-        $sql .= ")";
-
-        $this->db->begin();
-
-        dol_syslog(__METHOD__, LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
-
-        if (!$error)
-        {
-            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);
-
-            if (!$notrigger)
-            {
-                // Uncomment this and change MYOBJECT to your own tag if you
-                // want this action calls a trigger.
-
-                //// Call triggers
-                //$result=$this->call_trigger('MYOBJECT_CREATE',$user);
-                //if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
-                //// End call triggers
-            }
-        }
-
-        // Commit or rollback
-        if ($error)
-        {
-            foreach ($this->errors as $errmsg)
-            {
-                dol_syslog(__METHOD__." ".$errmsg, LOG_ERR);
-                $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
-            }
-            $this->db->rollback();
-            return -1 * $error;
-        } else {
-            $this->db->commit();
-            return $this->id;
-        }
-    }
-
-
-    /**
-     *  Load object in memory from the database
-     *
-     *  @param		int		$id    	Id object
-     *  @return		int			    < 0 if KO, 0 if OK but not found, > 0 if OK
-     */
-    public function fetch($id)
-    {
-        $sql = "SELECT type, description, parameters, fk_variable, update_interval, next_update, last_status";
-        $sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element;
-        $sql .= " WHERE rowid = ".$id;
-
-        dol_syslog(__METHOD__);
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            $obj = $this->db->fetch_object($resql);
-            if ($obj)
-            {
-                $this->id = $id;
-                $this->type = $obj->type;
-                $this->description		= $obj->description;
-                $this->parameters = $obj->parameters;
-                $this->fk_variable		= $obj->fk_variable;
-                $this->update_interval = $obj->update_interval;
-                $this->next_update		= $obj->next_update;
-                $this->last_status		= $obj->last_status;
-                $this->checkParameters();
-                return 1;
-            } else {
-                return 0;
-            }
-        } else {
-            $this->error = "Error ".$this->db->lasterror();
-            return -1;
-        }
-    }
-
-    /**
-     *  Update object into database
-     *
-     *  @param	User	$user        User that modifies
-     *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
-     *  @return int     		   	 <0 if KO, >0 if OK
-     */
-    public function update($user = 0, $notrigger = 0)
-    {
-        $error = 0;
-
-        $this->checkParameters();
-
-        // Update request
-        $sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
-        $sql .= " type = ".$this->type.",";
-        $sql .= " description = ".(isset($this->description) ? "'".$this->db->escape($this->description)."'" : "''").",";
-        $sql .= " parameters = ".(isset($this->parameters) ? "'".$this->db->escape($this->parameters)."'" : "''").",";
-        $sql .= " fk_variable = ".$this->fk_variable.",";
-        $sql .= " update_interval = ".$this->update_interval.",";
-        $sql .= " next_update = ".$this->next_update.",";
-        $sql .= " last_status = ".(isset($this->last_status) ? "'".$this->db->escape($this->last_status)."'" : "''");
-        $sql .= " WHERE rowid = ".$this->id;
-
-        $this->db->begin();
-
-        dol_syslog(__METHOD__);
-        $resql = $this->db->query($sql);
-        if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
-
-        // if (! $error)
-        // {
-        //     if (! $notrigger)
-        //     {
-        //         // Uncomment this and change MYOBJECT to your own tag if you
-        //         // want this action calls a trigger.
-
-        //         //// Call triggers
-        //         //$result=$this->call_trigger('MYOBJECT_MODIFY',$user);
-        //         //if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
-        //         //// End call triggers
-        //     }
-        // }
-
-        // Commit or rollback
-        if ($error)
-        {
-            foreach ($this->errors as $errmsg)
-            {
-                dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
-                $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
-            }
-            $this->db->rollback();
-            return -1 * $error;
-        } else {
-            $this->db->commit();
-            return 1;
-        }
-    }
-
-    /**
-     *  Delete object in database
-     *
-     * 	@param	int		$rowid		 Row id of global variable
-     *	@param  User	$user        User that deletes
-     *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
-     *  @return	int					 <0 if KO, >0 if OK
-     */
-    public function delete($rowid, $user, $notrigger = 0)
-    {
-        $error = 0;
-
-        $this->db->begin();
-
-        //if (! $error)
-        //{
-        //    if (! $notrigger)
-        //    {
-                // Uncomment this and change MYOBJECT to your own tag if you
-                // want this action calls a trigger.
-
-                //// Call triggers
-                //$result=$this->call_trigger('MYOBJECT_DELETE',$user);
-                //if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
-                //// End call triggers
-        //    }
-        //}
-
-        if (!$error)
-        {
-            $sql = "DELETE FROM ".MAIN_DB_PREFIX.$this->table_element;
-            $sql .= " WHERE rowid = ".$rowid;
-
-            dol_syslog(__METHOD__);
-            $resql = $this->db->query($sql);
-            if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
-        }
-
-        // Commit or rollback
-        if ($error)
-        {
-            foreach ($this->errors as $errmsg)
-            {
-                dol_syslog(__METHOD__." ".$errmsg, LOG_ERR);
-                $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
-            }
-            $this->db->rollback();
-            return -1 * $error;
-        } else {
-            $this->db->commit();
-            return 1;
-        }
-    }
-
-    /**
-     *	Initialise object with example values
-     *	Id must be 0 if object instance is a specimen
-     *
-     *	@return	void
-     */
-    public function initAsSpecimen()
-    {
-        $this->id = 0;
-        $this->type = 0;
-        $this->description = '';
-        $this->parameters = '';
-        $this->fk_variable = 0;
-        $this->update_interval = 0;
-        $this->next_update = 0;
-        $this->last_status = '';
-    }
-
-    /**
-     *  Returns the last updated time in string html format, returns "never" if its less than 1
-     *
-     *  @return	string
-     */
-    public function getLastUpdated()
-    {
-        global $langs;
-        $last = $this->next_update - ($this->update_interval * 60);
-        if ($last < 1) {
-            return $langs->trans("Never");
-        }
-        $status = empty($this->last_status) ? $langs->trans("CorrectlyUpdated") : $this->last_status;
-        return $status.'<br>'.dol_print_date($last, '%d/%m/%Y %H:%M:%S');
-    }
-
-    /**
-     *	Checks if all parameters are in order
-     *
-     *	@return	void
-     */
-    public function checkParameters()
-    {
-        // Clean parameters
-        if (isset($this->description)) $this->description = trim($this->description);
-        if (isset($this->parameters)) $this->parameters = trim($this->parameters);
-        else $this->parameters = "";
-        if (isset($this->last_status)) $this->last_status = trim($this->last_status);
-
-        // Check parameters
-        if (empty($this->type) || !is_numeric($this->type) || !in_array($this->type, $this->types)) $this->type = 0;
-        if (empty($this->update_interval) || !is_numeric($this->update_interval) || $this->update_interval < 1) $this->update_interval = $this->update_min;
-        if (empty($this->next_update) || !is_numeric($this->next_update) || $this->next_update < 0) $this->next_update = 0;
-    }
-
-    /**
-     *  List all price global variables
-     *
-     *  @return	array				Array of price global variable updaters
-     */
-    public function listUpdaters()
-    {
-        $sql = "SELECT rowid, type, description, parameters, fk_variable, update_interval, next_update, last_status";
-        $sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element;
-
-        dol_syslog(__METHOD__, LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            $retarray = array();
-
-            while ($record = $this->db->fetch_array($resql))
-            {
-                $updater_obj = new PriceGlobalVariableUpdater($this->db);
-                $updater_obj->id = $record["rowid"];
-                $updater_obj->type = $record["type"];
-                $updater_obj->description		= $record["description"];
-                $updater_obj->parameters = $record["parameters"];
-                $updater_obj->fk_variable		= $record["fk_variable"];
-                $updater_obj->update_interval = $record["update_interval"];
-                $updater_obj->next_update		= $record["next_update"];
-                $updater_obj->last_status		= $record["last_status"];
-                $updater_obj->checkParameters();
-                $retarray[] = $updater_obj;
-            }
-
-            $this->db->free($resql);
-            return $retarray;
-        } else {
-            $this->error = $this->db->error();
-            return -1;
-        }
-    }
-
-    /**
-     *  List all updaters which need to be processed
-     *
-     *  @return	array				Array of price global variable updaters
-     */
-    public function listPendingUpdaters()
-    {
-        $sql = "SELECT rowid, type, description, parameters, fk_variable, update_interval, next_update, last_status";
-        $sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element;
-        $sql .= " WHERE next_update < ".dol_now();
-
-        dol_syslog(__METHOD__, LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            $retarray = array();
-
-            while ($record = $this->db->fetch_array($resql))
-            {
-                $updater_obj = new PriceGlobalVariableUpdater($this->db);
-                $updater_obj->id = $record["rowid"];
-                $updater_obj->type = $record["type"];
-                $updater_obj->description		= $record["description"];
-                $updater_obj->parameters = $record["parameters"];
-                $updater_obj->fk_variable		= $record["fk_variable"];
-                $updater_obj->update_interval = $record["update_interval"];
-                $updater_obj->next_update		= $record["next_update"];
-                $updater_obj->last_status		= $record["last_status"];
-                $updater_obj->checkParameters();
-                $retarray[] = $updater_obj;
-            }
-
-            $this->db->free($resql);
-            return $retarray;
-        } else {
-            $this->error = $this->db->error();
-            return -1;
-        }
-    }
-
-    /**
-     *  Handles the processing of this updater
-     *
-     *  @return	int					 <0 if KO, 0 if OK but no global variable found, >0 if OK
-     */
-    public function process()
-    {
-        global $langs, $user;
-        $langs->load("errors");
-        dol_syslog(__METHOD__, LOG_DEBUG);
-
-        $this->error = null;
-        $this->checkParameters();
-
-        //Try to load the target global variable and abort if fails
-        if ($this->fk_variable < 1) {
-            $this->error = $langs->trans("ErrorGlobalVariableUpdater5");
-            return 0;
-        }
-        $price_globals = new PriceGlobalVariable($this->db);
-        $res = $price_globals->fetch($this->fk_variable);
-        if ($res < 1) {
-            $this->error = $langs->trans("ErrorGlobalVariableUpdater5");
-            return 0;
-        }
-
-        //Process depending of type
-        if ($this->type == 0 || $this->type == 1) {
-            //Get and check if required parameters are present
-            $parameters = json_decode($this->parameters, true);
-            if (!isset($parameters)) {
-                $this->error = $langs->trans("ErrorGlobalVariableUpdater1", $this->parameters);
-                return -1;
-            }
-            $url = $parameters['URL'];
-            if (!isset($url)) {
-                $this->error = $langs->trans("ErrorGlobalVariableUpdater2", 'URL');
-                return -1;
-            }
-            $value = $parameters['VALUE'];
-            if (!isset($value)) {
-                $this->error = $langs->trans("ErrorGlobalVariableUpdater2", 'VALUE');
-                return -1;
-            }
-            $result = "";
-            if ($this->type == 0) {
-                // Call JSON request
-                include_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
-                $tmpresult = getURLContent($url);
-                $code = $tmpresult['http_code'];
-                $result = $tmpresult['content'];
-
-                if (!isset($result)) {
-                    $this->error = $langs->trans("ErrorGlobalVariableUpdater0", "empty response");
-                    return -1;
-                }
-                if ($code !== 200) {
-                    $this->error = $langs->trans("ErrorGlobalVariableUpdater0", $code.' '.$tmpresult['curl_error_msg']);
-                    return -1;
-                }
-
-                //Decode returned response
-                $result = json_decode($result, true);
-            } elseif ($this->type == 1) {
-                $ns = $parameters['NS'];
-                if (!isset($ns)) {
-                    $this->error = $langs->trans("ErrorGlobalVariableUpdater2", 'NS');
-                    return -1;
-                }
-                $method = $parameters['METHOD'];
-                if (!isset($method)) {
-                    $this->error = $langs->trans("ErrorGlobalVariableUpdater2", 'METHOD');
-                    return -1;
-                }
-                $data = $parameters['DATA'];
-                if (!isset($data)) {
-                    $this->error = $langs->trans("ErrorGlobalVariableUpdater2", 'DATA');
-                    return -1;
-                }
-
-                //SOAP client
-                require_once NUSOAP_PATH.'/nusoap.php';
-                $soap_client = new nusoap_client($url);
-                $soap_client->soap_defencoding = 'UTF-8';
-                $soap_client->decodeUTF8(false);
-                $result = $soap_client->call($method, $data, $ns, '');
-
-                //Check if result is a error
-                if ($result === false) {
-                    $this->error = $langs->trans("ErrorGlobalVariableUpdater4", $soap_client->error_str);
-                    return -1;
-                }
-            }
-
-            //Explode value and walk for each key in value array to get the relevant key
-            $value = explode(',', $value);
-            foreach ($value as $key) {
-                $result = $result[$key];
-            }
-            if (!isset($result)) {
-                $this->error = $langs->trans("ErrorGlobalVariableUpdater3");
-                return -1;
-            }
-
-            //Save data to global and update it
-            $price_globals->value = $result;
-            $price_globals->update($user);
-        }
-        return 1;
-    }
-
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Update next_update into database
-     *
-     *  @param	string	$next_update Next update to write
-     *  @param	User	$user        User that modifies
-     *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
-     *  @return int     		   	 <0 if KO, >0 if OK
-     */
-    public function update_next_update($next_update, $user = 0, $notrigger = 0)
-    {
-        // phpcs:enable
-        $error = 0;
-
-        $this->next_update = $next_update;
-        $this->checkParameters();
-
-        // Update request
-        $sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
-        $sql .= " next_update = ".$this->next_update;
-        $sql .= " WHERE rowid = ".$this->id;
-
-        $this->db->begin();
-
-        dol_syslog(__METHOD__);
-        $resql = $this->db->query($sql);
-        if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
-
-        // Commit or rollback
-        if ($error)
-        {
-            foreach ($this->errors as $errmsg)
-            {
-                dol_syslog(__METHOD__." ".$errmsg, LOG_ERR);
-                $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
-            }
-            $this->db->rollback();
-            return -1 * $error;
-        } else {
-            $this->db->commit();
-            return 1;
-        }
-    }
-
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Update last_status into database
-     *
-     *  @param	string	$last_status Status to write
-     *  @param	User	$user        User that modifies
-     *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
-     *  @return int     		   	 <0 if KO, >0 if OK
-     */
-    public function update_status($last_status, $user = 0, $notrigger = 0)
-    {
-        // phpcs:enable
-        $error = 0;
-
-        $this->last_status = $last_status;
-        $this->checkParameters();
-
-        // Update request
-        $sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
-        $sql .= " last_status = ".(isset($this->last_status) ? "'".$this->db->escape($this->last_status)."'" : "''");
-        $sql .= " WHERE rowid = ".$this->id;
-
-        $this->db->begin();
-
-        dol_syslog(__METHOD__);
-        $resql = $this->db->query($sql);
-        if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
-
-        // Commit or rollback
-        if ($error)
-        {
-            foreach ($this->errors as $errmsg)
-            {
-                dol_syslog(__METHOD__." ".$errmsg, LOG_ERR);
-                $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
-            }
-            $this->db->rollback();
-            return -1 * $error;
-        } else {
-            $this->db->commit();
-            return 1;
-        }
-    }
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
+
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error = '';
+
+	/**
+	 * @var string[] Error codes (or messages)
+	 */
+	public $errors = array();
+
+	public $types = array(0, 1); //!< Updater types
+	public $update_min = 5; //!< Minimal update rate
+
+	/**
+	 * @var int ID
+	 */
+	public $id;
+
+	public $type;
+
+	/**
+	 * @var string description
+	 */
+	public $description;
+
+	public $parameters;
+
+	/**
+	 * @var int ID
+	 */
+	public $fk_variable;
+
+	public $update_interval; //!< Interval in mins
+	public $next_update; //!< Next update timestamp
+	public $last_status;
+
+	/**
+	 * @var string Name of table without prefix where object is stored
+	 */
+	public $table_element = "c_price_global_variable_updater";
+
+	/**
+	 *  Constructor
+	 *
+	 *  @param  DoliDb      $db      Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
+
+
+	/**
+	 *  Create object into database
+	 *
+	 *  @param	User	$user        User that creates
+	 *  @param  int		$notrigger   0=launch triggers after, 1=disable triggers
+	 *  @return int      		   	 <0 if KO, Id of created object if OK
+	 */
+	public function create($user, $notrigger = 0)
+	{
+		$error = 0;
+
+		$this->checkParameters();
+
+		// Insert request
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX.$this->table_element." (";
+		$sql .= "type, description, parameters, fk_variable, update_interval, next_update, last_status";
+		$sql .= ") VALUES (";
+		$sql .= " ".$this->type.",";
+		$sql .= " ".(isset($this->description) ? "'".$this->db->escape($this->description)."'" : "''").",";
+		$sql .= " ".(isset($this->parameters) ? "'".$this->db->escape($this->parameters)."'" : "''").",";
+		$sql .= " ".$this->fk_variable.",";
+		$sql .= " ".$this->update_interval.",";
+		$sql .= " ".$this->next_update.",";
+		$sql .= " ".(isset($this->last_status) ? "'".$this->db->escape($this->last_status)."'" : "''");
+		$sql .= ")";
+
+		$this->db->begin();
+
+		dol_syslog(__METHOD__, LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+
+		if (!$error)
+		{
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);
+
+			if (!$notrigger)
+			{
+				// Uncomment this and change MYOBJECT to your own tag if you
+				// want this action calls a trigger.
+
+				//// Call triggers
+				//$result=$this->call_trigger('MYOBJECT_CREATE',$user);
+				//if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
+				//// End call triggers
+			}
+		}
+
+		// Commit or rollback
+		if ($error)
+		{
+			foreach ($this->errors as $errmsg)
+			{
+				dol_syslog(__METHOD__." ".$errmsg, LOG_ERR);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
+			}
+			$this->db->rollback();
+			return -1 * $error;
+		} else {
+			$this->db->commit();
+			return $this->id;
+		}
+	}
+
+
+	/**
+	 *  Load object in memory from the database
+	 *
+	 *  @param		int		$id    	Id object
+	 *  @return		int			    < 0 if KO, 0 if OK but not found, > 0 if OK
+	 */
+	public function fetch($id)
+	{
+		$sql = "SELECT type, description, parameters, fk_variable, update_interval, next_update, last_status";
+		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element;
+		$sql .= " WHERE rowid = ".$id;
+
+		dol_syslog(__METHOD__);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$obj = $this->db->fetch_object($resql);
+			if ($obj)
+			{
+				$this->id = $id;
+				$this->type = $obj->type;
+				$this->description		= $obj->description;
+				$this->parameters = $obj->parameters;
+				$this->fk_variable		= $obj->fk_variable;
+				$this->update_interval = $obj->update_interval;
+				$this->next_update		= $obj->next_update;
+				$this->last_status		= $obj->last_status;
+				$this->checkParameters();
+				return 1;
+			} else {
+				return 0;
+			}
+		} else {
+			$this->error = "Error ".$this->db->lasterror();
+			return -1;
+		}
+	}
+
+	/**
+	 *  Update object into database
+	 *
+	 *  @param	User	$user        User that modifies
+	 *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
+	 *  @return int     		   	 <0 if KO, >0 if OK
+	 */
+	public function update($user = 0, $notrigger = 0)
+	{
+		$error = 0;
+
+		$this->checkParameters();
+
+		// Update request
+		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
+		$sql .= " type = ".$this->type.",";
+		$sql .= " description = ".(isset($this->description) ? "'".$this->db->escape($this->description)."'" : "''").",";
+		$sql .= " parameters = ".(isset($this->parameters) ? "'".$this->db->escape($this->parameters)."'" : "''").",";
+		$sql .= " fk_variable = ".$this->fk_variable.",";
+		$sql .= " update_interval = ".$this->update_interval.",";
+		$sql .= " next_update = ".$this->next_update.",";
+		$sql .= " last_status = ".(isset($this->last_status) ? "'".$this->db->escape($this->last_status)."'" : "''");
+		$sql .= " WHERE rowid = ".$this->id;
+
+		$this->db->begin();
+
+		dol_syslog(__METHOD__);
+		$resql = $this->db->query($sql);
+		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+
+		// if (! $error)
+		// {
+		//     if (! $notrigger)
+		//     {
+		//         // Uncomment this and change MYOBJECT to your own tag if you
+		//         // want this action calls a trigger.
+
+		//         //// Call triggers
+		//         //$result=$this->call_trigger('MYOBJECT_MODIFY',$user);
+		//         //if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
+		//         //// End call triggers
+		//     }
+		// }
+
+		// Commit or rollback
+		if ($error)
+		{
+			foreach ($this->errors as $errmsg)
+			{
+				dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
+			}
+			$this->db->rollback();
+			return -1 * $error;
+		} else {
+			$this->db->commit();
+			return 1;
+		}
+	}
+
+	/**
+	 *  Delete object in database
+	 *
+	 * 	@param	int		$rowid		 Row id of global variable
+	 *	@param  User	$user        User that deletes
+	 *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
+	 *  @return	int					 <0 if KO, >0 if OK
+	 */
+	public function delete($rowid, $user, $notrigger = 0)
+	{
+		$error = 0;
+
+		$this->db->begin();
+
+		//if (! $error)
+		//{
+		//    if (! $notrigger)
+		//    {
+				// Uncomment this and change MYOBJECT to your own tag if you
+				// want this action calls a trigger.
+
+				//// Call triggers
+				//$result=$this->call_trigger('MYOBJECT_DELETE',$user);
+				//if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
+				//// End call triggers
+		//    }
+		//}
+
+		if (!$error)
+		{
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX.$this->table_element;
+			$sql .= " WHERE rowid = ".$rowid;
+
+			dol_syslog(__METHOD__);
+			$resql = $this->db->query($sql);
+			if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+		}
+
+		// Commit or rollback
+		if ($error)
+		{
+			foreach ($this->errors as $errmsg)
+			{
+				dol_syslog(__METHOD__." ".$errmsg, LOG_ERR);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
+			}
+			$this->db->rollback();
+			return -1 * $error;
+		} else {
+			$this->db->commit();
+			return 1;
+		}
+	}
+
+	/**
+	 *	Initialise object with example values
+	 *	Id must be 0 if object instance is a specimen
+	 *
+	 *	@return	void
+	 */
+	public function initAsSpecimen()
+	{
+		$this->id = 0;
+		$this->type = 0;
+		$this->description = '';
+		$this->parameters = '';
+		$this->fk_variable = 0;
+		$this->update_interval = 0;
+		$this->next_update = 0;
+		$this->last_status = '';
+	}
+
+	/**
+	 *  Returns the last updated time in string html format, returns "never" if its less than 1
+	 *
+	 *  @return	string
+	 */
+	public function getLastUpdated()
+	{
+		global $langs;
+		$last = $this->next_update - ($this->update_interval * 60);
+		if ($last < 1) {
+			return $langs->trans("Never");
+		}
+		$status = empty($this->last_status) ? $langs->trans("CorrectlyUpdated") : $this->last_status;
+		return $status.'<br>'.dol_print_date($last, '%d/%m/%Y %H:%M:%S');
+	}
+
+	/**
+	 *	Checks if all parameters are in order
+	 *
+	 *	@return	void
+	 */
+	public function checkParameters()
+	{
+		// Clean parameters
+		if (isset($this->description)) $this->description = trim($this->description);
+		if (isset($this->parameters)) $this->parameters = trim($this->parameters);
+		else $this->parameters = "";
+		if (isset($this->last_status)) $this->last_status = trim($this->last_status);
+
+		// Check parameters
+		if (empty($this->type) || !is_numeric($this->type) || !in_array($this->type, $this->types)) $this->type = 0;
+		if (empty($this->update_interval) || !is_numeric($this->update_interval) || $this->update_interval < 1) $this->update_interval = $this->update_min;
+		if (empty($this->next_update) || !is_numeric($this->next_update) || $this->next_update < 0) $this->next_update = 0;
+	}
+
+	/**
+	 *  List all price global variables
+	 *
+	 *  @return	array				Array of price global variable updaters
+	 */
+	public function listUpdaters()
+	{
+		$sql = "SELECT rowid, type, description, parameters, fk_variable, update_interval, next_update, last_status";
+		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element;
+
+		dol_syslog(__METHOD__, LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$retarray = array();
+
+			while ($record = $this->db->fetch_array($resql))
+			{
+				$updater_obj = new PriceGlobalVariableUpdater($this->db);
+				$updater_obj->id = $record["rowid"];
+				$updater_obj->type = $record["type"];
+				$updater_obj->description		= $record["description"];
+				$updater_obj->parameters = $record["parameters"];
+				$updater_obj->fk_variable		= $record["fk_variable"];
+				$updater_obj->update_interval = $record["update_interval"];
+				$updater_obj->next_update		= $record["next_update"];
+				$updater_obj->last_status		= $record["last_status"];
+				$updater_obj->checkParameters();
+				$retarray[] = $updater_obj;
+			}
+
+			$this->db->free($resql);
+			return $retarray;
+		} else {
+			$this->error = $this->db->error();
+			return -1;
+		}
+	}
+
+	/**
+	 *  List all updaters which need to be processed
+	 *
+	 *  @return	array				Array of price global variable updaters
+	 */
+	public function listPendingUpdaters()
+	{
+		$sql = "SELECT rowid, type, description, parameters, fk_variable, update_interval, next_update, last_status";
+		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element;
+		$sql .= " WHERE next_update < ".dol_now();
+
+		dol_syslog(__METHOD__, LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$retarray = array();
+
+			while ($record = $this->db->fetch_array($resql))
+			{
+				$updater_obj = new PriceGlobalVariableUpdater($this->db);
+				$updater_obj->id = $record["rowid"];
+				$updater_obj->type = $record["type"];
+				$updater_obj->description		= $record["description"];
+				$updater_obj->parameters = $record["parameters"];
+				$updater_obj->fk_variable		= $record["fk_variable"];
+				$updater_obj->update_interval = $record["update_interval"];
+				$updater_obj->next_update		= $record["next_update"];
+				$updater_obj->last_status		= $record["last_status"];
+				$updater_obj->checkParameters();
+				$retarray[] = $updater_obj;
+			}
+
+			$this->db->free($resql);
+			return $retarray;
+		} else {
+			$this->error = $this->db->error();
+			return -1;
+		}
+	}
+
+	/**
+	 *  Handles the processing of this updater
+	 *
+	 *  @return	int					 <0 if KO, 0 if OK but no global variable found, >0 if OK
+	 */
+	public function process()
+	{
+		global $langs, $user;
+		$langs->load("errors");
+		dol_syslog(__METHOD__, LOG_DEBUG);
+
+		$this->error = null;
+		$this->checkParameters();
+
+		//Try to load the target global variable and abort if fails
+		if ($this->fk_variable < 1) {
+			$this->error = $langs->trans("ErrorGlobalVariableUpdater5");
+			return 0;
+		}
+		$price_globals = new PriceGlobalVariable($this->db);
+		$res = $price_globals->fetch($this->fk_variable);
+		if ($res < 1) {
+			$this->error = $langs->trans("ErrorGlobalVariableUpdater5");
+			return 0;
+		}
+
+		//Process depending of type
+		if ($this->type == 0 || $this->type == 1) {
+			//Get and check if required parameters are present
+			$parameters = json_decode($this->parameters, true);
+			if (!isset($parameters)) {
+				$this->error = $langs->trans("ErrorGlobalVariableUpdater1", $this->parameters);
+				return -1;
+			}
+			$url = $parameters['URL'];
+			if (!isset($url)) {
+				$this->error = $langs->trans("ErrorGlobalVariableUpdater2", 'URL');
+				return -1;
+			}
+			$value = $parameters['VALUE'];
+			if (!isset($value)) {
+				$this->error = $langs->trans("ErrorGlobalVariableUpdater2", 'VALUE');
+				return -1;
+			}
+			$result = "";
+			if ($this->type == 0) {
+				// Call JSON request
+				include_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
+				$tmpresult = getURLContent($url);
+				$code = $tmpresult['http_code'];
+				$result = $tmpresult['content'];
+
+				if (!isset($result)) {
+					$this->error = $langs->trans("ErrorGlobalVariableUpdater0", "empty response");
+					return -1;
+				}
+				if ($code !== 200) {
+					$this->error = $langs->trans("ErrorGlobalVariableUpdater0", $code.' '.$tmpresult['curl_error_msg']);
+					return -1;
+				}
+
+				//Decode returned response
+				$result = json_decode($result, true);
+			} elseif ($this->type == 1) {
+				$ns = $parameters['NS'];
+				if (!isset($ns)) {
+					$this->error = $langs->trans("ErrorGlobalVariableUpdater2", 'NS');
+					return -1;
+				}
+				$method = $parameters['METHOD'];
+				if (!isset($method)) {
+					$this->error = $langs->trans("ErrorGlobalVariableUpdater2", 'METHOD');
+					return -1;
+				}
+				$data = $parameters['DATA'];
+				if (!isset($data)) {
+					$this->error = $langs->trans("ErrorGlobalVariableUpdater2", 'DATA');
+					return -1;
+				}
+
+				//SOAP client
+				require_once NUSOAP_PATH.'/nusoap.php';
+				$soap_client = new nusoap_client($url);
+				$soap_client->soap_defencoding = 'UTF-8';
+				$soap_client->decodeUTF8(false);
+				$result = $soap_client->call($method, $data, $ns, '');
+
+				//Check if result is a error
+				if ($result === false) {
+					$this->error = $langs->trans("ErrorGlobalVariableUpdater4", $soap_client->error_str);
+					return -1;
+				}
+			}
+
+			//Explode value and walk for each key in value array to get the relevant key
+			$value = explode(',', $value);
+			foreach ($value as $key) {
+				$result = $result[$key];
+			}
+			if (!isset($result)) {
+				$this->error = $langs->trans("ErrorGlobalVariableUpdater3");
+				return -1;
+			}
+
+			//Save data to global and update it
+			$price_globals->value = $result;
+			$price_globals->update($user);
+		}
+		return 1;
+	}
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Update next_update into database
+	 *
+	 *  @param	string	$next_update Next update to write
+	 *  @param	User	$user        User that modifies
+	 *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
+	 *  @return int     		   	 <0 if KO, >0 if OK
+	 */
+	public function update_next_update($next_update, $user = 0, $notrigger = 0)
+	{
+		// phpcs:enable
+		$error = 0;
+
+		$this->next_update = $next_update;
+		$this->checkParameters();
+
+		// Update request
+		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
+		$sql .= " next_update = ".$this->next_update;
+		$sql .= " WHERE rowid = ".$this->id;
+
+		$this->db->begin();
+
+		dol_syslog(__METHOD__);
+		$resql = $this->db->query($sql);
+		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+
+		// Commit or rollback
+		if ($error)
+		{
+			foreach ($this->errors as $errmsg)
+			{
+				dol_syslog(__METHOD__." ".$errmsg, LOG_ERR);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
+			}
+			$this->db->rollback();
+			return -1 * $error;
+		} else {
+			$this->db->commit();
+			return 1;
+		}
+	}
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Update last_status into database
+	 *
+	 *  @param	string	$last_status Status to write
+	 *  @param	User	$user        User that modifies
+	 *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
+	 *  @return int     		   	 <0 if KO, >0 if OK
+	 */
+	public function update_status($last_status, $user = 0, $notrigger = 0)
+	{
+		// phpcs:enable
+		$error = 0;
+
+		$this->last_status = $last_status;
+		$this->checkParameters();
+
+		// Update request
+		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
+		$sql .= " last_status = ".(isset($this->last_status) ? "'".$this->db->escape($this->last_status)."'" : "''");
+		$sql .= " WHERE rowid = ".$this->id;
+
+		$this->db->begin();
+
+		dol_syslog(__METHOD__);
+		$resql = $this->db->query($sql);
+		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+
+		// Commit or rollback
+		if ($error)
+		{
+			foreach ($this->errors as $errmsg)
+			{
+				dol_syslog(__METHOD__." ".$errmsg, LOG_ERR);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
+			}
+			$this->db->rollback();
+			return -1 * $error;
+		} else {
+			$this->db->commit();
+			return 1;
+		}
+	}
 }
diff --git a/htdocs/product/dynamic_price/class/price_parser.class.php b/htdocs/product/dynamic_price/class/price_parser.class.php
index 7a7dd5aac56..47cb58c2a7f 100644
--- a/htdocs/product/dynamic_price/class/price_parser.class.php
+++ b/htdocs/product/dynamic_price/class/price_parser.class.php
@@ -32,38 +32,38 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
  */
 class PriceParser
 {
-    protected $db;
-    // Limit of expressions per price
-    public $limit = 100;
-    // The error that occurred when parsing price
-    public $error_parser;
-    // The expression that caused the error
-    public $error_expr;
-    //The special char
-    public $special_chr = "#";
-    //The separator char
-    public $separator_chr = ";";
+	protected $db;
+	// Limit of expressions per price
+	public $limit = 100;
+	// The error that occurred when parsing price
+	public $error_parser;
+	// The expression that caused the error
+	public $error_expr;
+	//The special char
+	public $special_chr = "#";
+	//The separator char
+	public $separator_chr = ";";
 
-    /**
-     *  Constructor
-     *
-     *  @param      DoliDB		$db      Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-    }
+	/**
+	 *  Constructor
+	 *
+	 *  @param      DoliDB		$db      Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
 
-    /**
-     *	Returns translated error
-     *
-     *	@return string      Translated error
-     */
-    public function translatedError()
-    {
-        global $langs;
-        $langs->load("errors");
-        /*
+	/**
+	 *	Returns translated error
+	 *
+	 *	@return string      Translated error
+	 */
+	public function translatedError()
+	{
+		global $langs;
+		$langs->load("errors");
+		/*
         -No arg
          9, an unexpected error occured
         14, division by zero
@@ -96,72 +96,72 @@ class PriceParser
         16, internal error
         18, internal error
         */
-        if (empty($this->error_parser)) {
-            return $langs->trans("ErrorPriceExpressionUnknown", 0); //this is not supposed to happen
-        }
-        list($code, $info) = $this->error_parser;
-        if (in_array($code, array(9, 14, 19, 20))) //Errors which have 0 arg
-        {
-            return $langs->trans("ErrorPriceExpression".$code);
-        } elseif (in_array($code, array(1, 2, 3, 4, 5, 8, 10, 11, 17, 21, 22))) //Errors which have 1 arg
-        {
-            return $langs->trans("ErrorPriceExpression".$code, $info);
-        } elseif (in_array($code, array(6, 23))) //Errors which have 2 args
-        {
-            return $langs->trans("ErrorPriceExpression".$code, $info[0], $info[1]);
-        } elseif (in_array($code, array(7, 12, 13, 15, 16, 18))) //Internal errors
-        {
-            return $langs->trans("ErrorPriceExpressionInternal", $code);
-        } else //Unknown errors
-        {
-            return $langs->trans("ErrorPriceExpressionUnknown", $code);
-        }
-    }
+		if (empty($this->error_parser)) {
+			return $langs->trans("ErrorPriceExpressionUnknown", 0); //this is not supposed to happen
+		}
+		list($code, $info) = $this->error_parser;
+		if (in_array($code, array(9, 14, 19, 20))) //Errors which have 0 arg
+		{
+			return $langs->trans("ErrorPriceExpression".$code);
+		} elseif (in_array($code, array(1, 2, 3, 4, 5, 8, 10, 11, 17, 21, 22))) //Errors which have 1 arg
+		{
+			return $langs->trans("ErrorPriceExpression".$code, $info);
+		} elseif (in_array($code, array(6, 23))) //Errors which have 2 args
+		{
+			return $langs->trans("ErrorPriceExpression".$code, $info[0], $info[1]);
+		} elseif (in_array($code, array(7, 12, 13, 15, 16, 18))) //Internal errors
+		{
+			return $langs->trans("ErrorPriceExpressionInternal", $code);
+		} else //Unknown errors
+		{
+			return $langs->trans("ErrorPriceExpressionUnknown", $code);
+		}
+	}
 
-    /**
-     *	Calculates price based on expression
-     *
-     *	@param	Product	$product    	The Product object to get information
-     *	@param	String 	$expression     The expression to parse
-     *	@param	array  	$values     	Strings to replaces
-     *  @return int 					> 0 if OK, < 1 if KO
-     */
-    public function parseExpression($product, $expression, $values)
-    {
-        global $user;
-        global $hookmanager;
-        $action = 'PARSEEXPRESSION';
-        if ($result = $hookmanager->executeHooks('doDynamiPrice', array(
+	/**
+	 *	Calculates price based on expression
+	 *
+	 *	@param	Product	$product    	The Product object to get information
+	 *	@param	String 	$expression     The expression to parse
+	 *	@param	array  	$values     	Strings to replaces
+	 *  @return int 					> 0 if OK, < 1 if KO
+	 */
+	public function parseExpression($product, $expression, $values)
+	{
+		global $user;
+		global $hookmanager;
+		$action = 'PARSEEXPRESSION';
+		if ($result = $hookmanager->executeHooks('doDynamiPrice', array(
 								'expression' =>$expression,
 								'product' => $product,
 								'values' => $values
-        ), $this, $action)) {
+		), $this, $action)) {
 			return $result;
-        }
-        //Check if empty
-        $expression = trim($expression);
-        if (empty($expression))
-        {
-            $this->error_parser = array(20, null);
-            return -2;
-        }
+		}
+		//Check if empty
+		$expression = trim($expression);
+		if (empty($expression))
+		{
+			$this->error_parser = array(20, null);
+			return -2;
+		}
 
-        //Accessible product values by expressions
-        $values = array_merge($values, array(
-            "tva_tx" => $product->tva_tx,
-            "localtax1_tx" => $product->localtax1_tx,
-            "localtax2_tx" => $product->localtax2_tx,
-            "weight" => $product->weight,
-            "length" => $product->length,
-            "surface" => $product->surface,
-            "price_min" => $product->price_min,
-        ));
+		//Accessible product values by expressions
+		$values = array_merge($values, array(
+			"tva_tx" => $product->tva_tx,
+			"localtax1_tx" => $product->localtax1_tx,
+			"localtax2_tx" => $product->localtax2_tx,
+			"weight" => $product->weight,
+			"length" => $product->length,
+			"surface" => $product->surface,
+			"price_min" => $product->price_min,
+		));
 
-        //Retrieve all extrafield for product and add it to values
-        $extrafields = new ExtraFields($this->db);
-        $extrafields->fetch_name_optionals_label('product', true);
-        $product->fetch_optionals();
-        if (is_array($extrafields->attributes[$product->table_element]['label']))
+		//Retrieve all extrafield for product and add it to values
+		$extrafields = new ExtraFields($this->db);
+		$extrafields->fetch_name_optionals_label('product', true);
+		$product->fetch_optionals();
+		if (is_array($extrafields->attributes[$product->table_element]['label']))
 		{
 			foreach ($extrafields->attributes[$product->table_element]['label'] as $key=>$label)
 			{
@@ -169,102 +169,102 @@ class PriceParser
 			}
 		}
 
-        //Process any pending updaters
-        $price_updaters = new PriceGlobalVariableUpdater($this->db);
-        foreach ($price_updaters->listPendingUpdaters() as $entry) {
-            //Schedule the next update by adding current timestamp (secs) + interval (mins)
-            $entry->update_next_update(dol_now() + ($entry->update_interval * 60), $user);
-            //Do processing
-            $res = $entry->process();
-            //Store any error or clear status if OK
-            $entry->update_status($res < 1 ? $entry->error : '', $user);
-        }
+		//Process any pending updaters
+		$price_updaters = new PriceGlobalVariableUpdater($this->db);
+		foreach ($price_updaters->listPendingUpdaters() as $entry) {
+			//Schedule the next update by adding current timestamp (secs) + interval (mins)
+			$entry->update_next_update(dol_now() + ($entry->update_interval * 60), $user);
+			//Do processing
+			$res = $entry->process();
+			//Store any error or clear status if OK
+			$entry->update_status($res < 1 ? $entry->error : '', $user);
+		}
 
-        //Get all global values
-        $price_globals = new PriceGlobalVariable($this->db);
-        foreach ($price_globals->listGlobalVariables() as $entry)
-        {
-            $values["global_".$entry->code] = $entry->value;
-        }
+		//Get all global values
+		$price_globals = new PriceGlobalVariable($this->db);
+		foreach ($price_globals->listGlobalVariables() as $entry)
+		{
+			$values["global_".$entry->code] = $entry->value;
+		}
 
-        //Remove internal variables
-        unset($values["supplier_id"]);
+		//Remove internal variables
+		unset($values["supplier_id"]);
 
-        //Prepare the lib, parameters and values
-        $em = new EvalMath();
-        $em->suppress_errors = true; //Don't print errors on page
-        $this->error_expr = null;
-        $last_result = null;
+		//Prepare the lib, parameters and values
+		$em = new EvalMath();
+		$em->suppress_errors = true; //Don't print errors on page
+		$this->error_expr = null;
+		$last_result = null;
 
-        //Fill each variable in expression from values
-        $expression = str_replace("\n", $this->separator_chr, $expression);
-        foreach ($values as $key => $value)
-        {
-            if ($value === null && strpos($expression, $key) !== false) {
-                $this->error_parser = array(24, $key);
-                return -7;
-            }
-            $expression = str_replace($this->special_chr.$key.$this->special_chr, strval($value), $expression);
-        }
+		//Fill each variable in expression from values
+		$expression = str_replace("\n", $this->separator_chr, $expression);
+		foreach ($values as $key => $value)
+		{
+			if ($value === null && strpos($expression, $key) !== false) {
+				$this->error_parser = array(24, $key);
+				return -7;
+			}
+			$expression = str_replace($this->special_chr.$key.$this->special_chr, strval($value), $expression);
+		}
 
-        //Check if there is unfilled variable
-        if (strpos($expression, $this->special_chr) !== false)
-        {
-            $data = explode($this->special_chr, $expression);
-            $variable = $this->special_chr.$data[1];
-            if (isset($data[2])) $variable .= $this->special_chr;
-            $this->error_parser = array(23, array($variable, $expression));
-            return -6;
-        }
+		//Check if there is unfilled variable
+		if (strpos($expression, $this->special_chr) !== false)
+		{
+			$data = explode($this->special_chr, $expression);
+			$variable = $this->special_chr.$data[1];
+			if (isset($data[2])) $variable .= $this->special_chr;
+			$this->error_parser = array(23, array($variable, $expression));
+			return -6;
+		}
 
-        //Iterate over each expression splitted by $separator_chr
-        $expressions = explode($this->separator_chr, $expression);
-        $expressions = array_slice($expressions, 0, $this->limit);
-        foreach ($expressions as $expr) {
-            $expr = trim($expr);
-            if (!empty($expr))
-            {
-                $last_result = $em->evaluate($expr);
-                $this->error_parser = $em->last_error_code;
-                if ($this->error_parser !== null) { //$em->last_error_code is null if no error happened, so just check if error_parser is not null
-                    $this->error_expr = $expr;
-                    return -3;
-                }
-            }
-        }
-        $vars = $em->vars();
-        if (empty($vars["price"])) {
-            $vars["price"] = $last_result;
-        }
-        if (!isset($vars["price"]))
-        {
-            $this->error_parser = array(21, $expression);
-            return -4;
-        }
-        if ($vars["price"] < 0)
-        {
-            $this->error_parser = array(22, $expression);
-            return -5;
-        }
-        return $vars["price"];
-    }
+		//Iterate over each expression splitted by $separator_chr
+		$expressions = explode($this->separator_chr, $expression);
+		$expressions = array_slice($expressions, 0, $this->limit);
+		foreach ($expressions as $expr) {
+			$expr = trim($expr);
+			if (!empty($expr))
+			{
+				$last_result = $em->evaluate($expr);
+				$this->error_parser = $em->last_error_code;
+				if ($this->error_parser !== null) { //$em->last_error_code is null if no error happened, so just check if error_parser is not null
+					$this->error_expr = $expr;
+					return -3;
+				}
+			}
+		}
+		$vars = $em->vars();
+		if (empty($vars["price"])) {
+			$vars["price"] = $last_result;
+		}
+		if (!isset($vars["price"]))
+		{
+			$this->error_parser = array(21, $expression);
+			return -4;
+		}
+		if ($vars["price"] < 0)
+		{
+			$this->error_parser = array(22, $expression);
+			return -5;
+		}
+		return $vars["price"];
+	}
 
-    /**
-     *	Calculates product price based on product id and associated expression
-     *
-     *	@param	Product				$product    	The Product object to get information
-     *	@param	array 				$extra_values   Any aditional values for expression
-     *	@return int 						> 0 if OK, < 1 if KO
-     */
-    public function parseProduct($product, $extra_values = array())
-    {
-        //Get the expression from db
-        $price_expression = new PriceExpression($this->db);
-        $res = $price_expression->fetch($product->fk_price_expression);
-        if ($res < 1) {
-            $this->error_parser = array(19, null);
-            return -1;
-        }
+	/**
+	 *	Calculates product price based on product id and associated expression
+	 *
+	 *	@param	Product				$product    	The Product object to get information
+	 *	@param	array 				$extra_values   Any aditional values for expression
+	 *	@return int 						> 0 if OK, < 1 if KO
+	 */
+	public function parseProduct($product, $extra_values = array())
+	{
+		//Get the expression from db
+		$price_expression = new PriceExpression($this->db);
+		$res = $price_expression->fetch($product->fk_price_expression);
+		if ($res < 1) {
+			$this->error_parser = array(19, null);
+			return -1;
+		}
 
 		//Get the supplier min price
 		$productFournisseur = new ProductFournisseur($this->db);
@@ -278,7 +278,7 @@ class PriceParser
 			 $supplier_min_price = $productFournisseur->fourn_unitprice;
 		}
 
-        //Accessible values by expressions
+		//Accessible values by expressions
 		$extra_values = array_merge($extra_values, array(
 			"supplier_min_price" => $supplier_min_price,
 		));
@@ -293,61 +293,61 @@ class PriceParser
 		return $result;
 	}
 
-    /**
-     *	Calculates supplier product price based on product supplier price and associated expression
-     *
-     *	@param	ProductFournisseur	$product_supplier   The Product supplier object to get information
-     *	@param	array 				$extra_values       Any aditional values for expression
-     *  @return int 				> 0 if OK, < 1 if KO
-     */
-    public function parseProductSupplier($product_supplier, $extra_values = array())
-    {
-        //Get the expression from db
-        $price_expression = new PriceExpression($this->db);
-        $res = $price_expression->fetch($product_supplier->fk_supplier_price_expression);
-        if ($res < 1)
-        {
-            $this->error_parser = array(19, null);
-            return -1;
-        }
+	/**
+	 *	Calculates supplier product price based on product supplier price and associated expression
+	 *
+	 *	@param	ProductFournisseur	$product_supplier   The Product supplier object to get information
+	 *	@param	array 				$extra_values       Any aditional values for expression
+	 *  @return int 				> 0 if OK, < 1 if KO
+	 */
+	public function parseProductSupplier($product_supplier, $extra_values = array())
+	{
+		//Get the expression from db
+		$price_expression = new PriceExpression($this->db);
+		$res = $price_expression->fetch($product_supplier->fk_supplier_price_expression);
+		if ($res < 1)
+		{
+			$this->error_parser = array(19, null);
+			return -1;
+		}
 
-        //Get the product data (use ignore_expression to avoid possible recursion)
-        $product_supplier->fetch($product_supplier->id, '', '', '', 1);
+		//Get the product data (use ignore_expression to avoid possible recursion)
+		$product_supplier->fetch($product_supplier->id, '', '', '', 1);
 
-        //Accessible values by expressions
-        $extra_values = array_merge($extra_values, array(
-            "supplier_quantity" => $product_supplier->fourn_qty,
-            "supplier_tva_tx" => $product_supplier->fourn_tva_tx,
-        ));
+		//Accessible values by expressions
+		$extra_values = array_merge($extra_values, array(
+			"supplier_quantity" => $product_supplier->fourn_qty,
+			"supplier_tva_tx" => $product_supplier->fourn_tva_tx,
+		));
 
-        //Parse the expression and return the price
-        return $this->parseExpression($product_supplier, $price_expression->expression, $extra_values);
-    }
+		//Parse the expression and return the price
+		return $this->parseExpression($product_supplier, $price_expression->expression, $extra_values);
+	}
 
-    /**
-     *  Tests string expression for validity
-     *
-     *  @param  int					$product_id    	The Product id to get information
-     *  @param  string 				$expression     The expression to parse
-     *  @param  array 				$extra_values   Any aditional values for expression
-     *  @return int 				> 0 if OK, < 1 if KO
-     */
-    public function testExpression($product_id, $expression, $extra_values = array())
-    {
-        //Get the product data
-        $product = new Product($this->db);
-        $product->fetch($product_id, '', '', 1);
+	/**
+	 *  Tests string expression for validity
+	 *
+	 *  @param  int					$product_id    	The Product id to get information
+	 *  @param  string 				$expression     The expression to parse
+	 *  @param  array 				$extra_values   Any aditional values for expression
+	 *  @return int 				> 0 if OK, < 1 if KO
+	 */
+	public function testExpression($product_id, $expression, $extra_values = array())
+	{
+		//Get the product data
+		$product = new Product($this->db);
+		$product->fetch($product_id, '', '', 1);
 
-        //Values for product expressions
-        $extra_values = array_merge($extra_values, array(
-            "supplier_min_price" => 1,
-        ));
+		//Values for product expressions
+		$extra_values = array_merge($extra_values, array(
+			"supplier_min_price" => 1,
+		));
 
-        //Values for supplier product expressions
-        $extra_values = array_merge($extra_values, array(
-            "supplier_quantity" => 2,
-            "supplier_tva_tx" => 3,
-        ));
-        return $this->parseExpression($product, $expression, $extra_values);
-    }
+		//Values for supplier product expressions
+		$extra_values = array_merge($extra_values, array(
+			"supplier_quantity" => 2,
+			"supplier_tva_tx" => 3,
+		));
+		return $this->parseExpression($product, $expression, $extra_values);
+	}
 }
diff --git a/htdocs/product/dynamic_price/editor.php b/htdocs/product/dynamic_price/editor.php
index 018c8d3f605..8aa79c3d6bf 100644
--- a/htdocs/product/dynamic_price/editor.php
+++ b/htdocs/product/dynamic_price/editor.php
@@ -196,7 +196,7 @@ $doleditor->Create();
 print '</td></tr>';
 print '</table>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 //Buttons
 print '<div class="center">';
diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php
index b9a8d6c3b68..ef3da905990 100644
--- a/htdocs/product/fournisseurs.php
+++ b/htdocs/product/fournisseurs.php
@@ -91,7 +91,7 @@ $hookmanager->initHooks(array('pricesuppliercard', 'globalcard'));
 $object = new ProductFournisseur($db);
 if ($id > 0 || $ref)
 {
-    $object->fetch($id, $ref);
+	$object->fetch($id, $ref);
 }
 
 $sortfield = GETPOST("sortfield", 'alpha');
@@ -126,7 +126,7 @@ if (empty($reshook))
 			if ($result > 0)
 			{
 				setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
-		        $action = '';
+				$action = '';
 			} else {
 				$error++;
 				setEventMessages($object->error, $object->errors, 'errors');
@@ -166,9 +166,9 @@ if (empty($reshook))
 		$price_expression = GETPOST('eid', 'int') ? GETPOST('eid', 'int') : ''; // Discard expression if not in expression mode
 		$delivery_time_days = GETPOST('delivery_time_days', 'int') ? GETPOST('delivery_time_days', 'int') : '';
 		$supplier_reputation = GETPOST('supplier_reputation');
-		$supplier_description = GETPOST('supplier_description', 'alpha');
-        $barcode = GETPOST('barcode', 'alpha');
-        $fk_barcode_type = GETPOST('fk_barcode_type', 'int');
+		$supplier_description = GETPOST('supplier_description', 'restricthtml');
+		$barcode = GETPOST('barcode', 'alpha');
+		$fk_barcode_type = GETPOST('fk_barcode_type', 'int');
 		$packaging = price2num(GETPOST("packaging", 'alphanohtml'), 'MS');
 
 		if ($tva_tx == '')
@@ -212,23 +212,23 @@ if (empty($reshook))
 				$_POST["price"] = 0;
 			}
 		}
-        if ($conf->multicurrency->enabled) {
-            if (empty($_POST["multicurrency_code"])) {
-                $error++;
-                $langs->load("errors");
-                setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Currency")), null, 'errors');
-            }
-            if (price2num($_POST["multicurrency_tx"]) <= 0 || $_POST["multicurrency_tx"] == '') {
-                $error++;
-                $langs->load("errors");
-                setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("CurrencyRate")), null, 'errors');
-            }
-            if (price2num($_POST["multicurrency_price"]) < 0 || $_POST["multicurrency_price"] == '') {
-                $error++;
-                $langs->load("errors");
-                setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("PriceCurrency")), null, 'errors');
-            }
-        }
+		if ($conf->multicurrency->enabled) {
+			if (empty($_POST["multicurrency_code"])) {
+				$error++;
+				$langs->load("errors");
+				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Currency")), null, 'errors');
+			}
+			if (price2num($_POST["multicurrency_tx"]) <= 0 || $_POST["multicurrency_tx"] == '') {
+				$error++;
+				$langs->load("errors");
+				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("CurrencyRate")), null, 'errors');
+			}
+			if (price2num($_POST["multicurrency_price"]) < 0 || $_POST["multicurrency_price"] == '') {
+				$error++;
+				$langs->load("errors");
+				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("PriceCurrency")), null, 'errors');
+			}
+		}
 
 		if (!$error)
 		{
@@ -263,30 +263,30 @@ if (empty($reshook))
 				$extralabels = $extrafields->fetch_name_optionals_label("product_fournisseur_price");
 				$extrafield_values = $extrafields->getOptionalsFromPost("product_fournisseur_price");
 				if (!empty($extrafield_values)) {
-                    $resql = $db->query("SELECT fk_object FROM ".MAIN_DB_PREFIX."product_fournisseur_price_extrafields WHERE fk_object = ".$object->product_fourn_price_id);
-                    // Insert a new extrafields row, if none exists
-                    if ($db->num_rows($resql) != 1) {
-                        $sql = "INSERT INTO ".MAIN_DB_PREFIX."product_fournisseur_price_extrafields (fk_object, ";
-                        foreach ($extrafield_values as $key => $value) {
-                            $sql .= str_replace('options_', '', $key).', ';
-                        }
-                        $sql = substr($sql, 0, strlen($sql) - 2).") VALUES (".$object->product_fourn_price_id.", ";
-                        foreach ($extrafield_values as $key => $value) {
-                            $sql .= '"'.$value.'", ';
-                        }
-                        $sql = substr($sql, 0, strlen($sql) - 2).')';
-                    } else {
-                        // update the existing one
-                        $sql = "UPDATE ".MAIN_DB_PREFIX."product_fournisseur_price_extrafields SET ";
-                        foreach ($extrafield_values as $key => $value) {
-                            $sql .= str_replace('options_', '', $key).' = "'.$value.'", ';
-                        }
-                        $sql = substr($sql, 0, strlen($sql) - 2).' WHERE fk_object = '.$object->product_fourn_price_id;
-                    }
+					$resql = $db->query("SELECT fk_object FROM ".MAIN_DB_PREFIX."product_fournisseur_price_extrafields WHERE fk_object = ".$object->product_fourn_price_id);
+					// Insert a new extrafields row, if none exists
+					if ($db->num_rows($resql) != 1) {
+						$sql = "INSERT INTO ".MAIN_DB_PREFIX."product_fournisseur_price_extrafields (fk_object, ";
+						foreach ($extrafield_values as $key => $value) {
+							$sql .= str_replace('options_', '', $key).', ';
+						}
+						$sql = substr($sql, 0, strlen($sql) - 2).") VALUES (".$object->product_fourn_price_id.", ";
+						foreach ($extrafield_values as $key => $value) {
+							$sql .= '"'.$value.'", ';
+						}
+						$sql = substr($sql, 0, strlen($sql) - 2).')';
+					} else {
+						// update the existing one
+						$sql = "UPDATE ".MAIN_DB_PREFIX."product_fournisseur_price_extrafields SET ";
+						foreach ($extrafield_values as $key => $value) {
+							$sql .= str_replace('options_', '', $key).' = "'.$value.'", ';
+						}
+						$sql = substr($sql, 0, strlen($sql) - 2).' WHERE fk_object = '.$object->product_fourn_price_id;
+					}
 
-                    // Execute the sql command from above
-                    $db->query($sql);
-                }
+					// Execute the sql command from above
+					$db->query($sql);
+				}
 
 				$newprice = price2num(GETPOST("price", "alpha"));
 
@@ -294,16 +294,16 @@ if (empty($reshook))
 				if ($packaging < $quantity) $packaging = $quantity;
 				$object->packaging = $packaging;
 
-                if ($conf->multicurrency->enabled)
-                {
-                	$multicurrency_tx = price2num(GETPOST("multicurrency_tx", 'alpha'));
-                	$multicurrency_price = price2num(GETPOST("multicurrency_price", 'alpha'));
-                	$multicurrency_code = GETPOST("multicurrency_code", 'alpha');
+				if ($conf->multicurrency->enabled)
+				{
+					$multicurrency_tx = price2num(GETPOST("multicurrency_tx", 'alpha'));
+					$multicurrency_price = price2num(GETPOST("multicurrency_price", 'alpha'));
+					$multicurrency_code = GETPOST("multicurrency_code", 'alpha');
 
-                    $ret = $object->update_buyprice($quantity, $newprice, $user, $_POST["price_base_type"], $supplier, $_POST["oselDispo"], $ref_fourn, $tva_tx, $_POST["charges"], $remise_percent, 0, $npr, $delivery_time_days, $supplier_reputation, array(), '', $multicurrency_price, $_POST["multicurrency_price_base_type"], $multicurrency_tx, $multicurrency_code, $supplier_description, $barcode, $fk_barcode_type);
-                } else {
-                    $ret = $object->update_buyprice($quantity, $newprice, $user, $_POST["price_base_type"], $supplier, $_POST["oselDispo"], $ref_fourn, $tva_tx, $_POST["charges"], $remise_percent, 0, $npr, $delivery_time_days, $supplier_reputation, array(), '', 0, 'HT', 1, '', $supplier_description, $barcode, $fk_barcode_type);
-                }
+					$ret = $object->update_buyprice($quantity, $newprice, $user, $_POST["price_base_type"], $supplier, $_POST["oselDispo"], $ref_fourn, $tva_tx, $_POST["charges"], $remise_percent, 0, $npr, $delivery_time_days, $supplier_reputation, array(), '', $multicurrency_price, $_POST["multicurrency_price_base_type"], $multicurrency_tx, $multicurrency_code, $supplier_description, $barcode, $fk_barcode_type);
+				} else {
+					$ret = $object->update_buyprice($quantity, $newprice, $user, $_POST["price_base_type"], $supplier, $_POST["oselDispo"], $ref_fourn, $tva_tx, $_POST["charges"], $remise_percent, 0, $npr, $delivery_time_days, $supplier_reputation, array(), '', 0, 'HT', 1, '', $supplier_description, $barcode, $fk_barcode_type);
+				}
 				if ($ret < 0)
 				{
 					$error++;
@@ -312,9 +312,9 @@ if (empty($reshook))
 					if (!empty($conf->dynamicprices->enabled) && $price_expression !== '')
 					{
 						//Check the expression validity by parsing it
-                        $priceparser = new PriceParser($db);
-                        $object->fk_supplier_price_expression = $price_expression;
-                        $price_result = $priceparser->parseProductSupplier($object);
+						$priceparser = new PriceParser($db);
+						$object->fk_supplier_price_expression = $price_expression;
+						$price_result = $priceparser->parseProductSupplier($object);
 						if ($price_result < 0) { //Expression is not valid
 							$error++;
 							setEventMessages($priceparser->translatedError(), null, 'errors');
@@ -388,52 +388,52 @@ if ($id > 0 || $ref)
 			print dol_get_fiche_head($head, 'suppliers', $titre, -1, $picto);
 
 			$linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
-		    $object->next_prev_filter = " fk_product_type = ".$object->type;
+			$object->next_prev_filter = " fk_product_type = ".$object->type;
 
-            $shownav = 1;
-            if ($user->socid && !in_array('product', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav = 0;
+			$shownav = 1;
+			if ($user->socid && !in_array('product', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav = 0;
 
 			dol_banner_tab($object, 'ref', $linkback, $shownav, 'ref');
 
-            print '<div class="fichecenter">';
+			print '<div class="fichecenter">';
 
-            print '<div class="underbanner clearboth"></div>';
-            print '<table class="border tableforfield" width="100%">';
+			print '<div class="underbanner clearboth"></div>';
+			print '<table class="border tableforfield" width="100%">';
 
 			// Cost price. Can be used for margin module for option "calculate margin on explicit cost price
-            print '<tr><td>';
+			print '<tr><td>';
 			$textdesc = $langs->trans("CostPriceDescription");
 			$textdesc .= "<br>".$langs->trans("CostPriceUsage");
 			$text = $form->textwithpicto($langs->trans("CostPrice"), $textdesc, 1, 'help', '');
 			print $form->editfieldkey($text, 'cost_price', $object->cost_price, $object, $usercancreate, 'amount:6');
-            print '</td><td colspan="2">';
-            print $form->editfieldval($text, 'cost_price', $object->cost_price, $object, $usercancreate, 'amount:6');
-            print '</td></tr>';
+			print '</td><td colspan="2">';
+			print $form->editfieldval($text, 'cost_price', $object->cost_price, $object, $usercancreate, 'amount:6');
+			print '</td></tr>';
 
-            // PMP
-            print '<tr><td class="titlefield">'.$form->textwithpicto($langs->trans("AverageUnitPricePMPShort"), $langs->trans("AverageUnitPricePMPDesc")).'</td>';
-            print '<td>';
-            if ($object->pmp > 0) print price($object->pmp).' '.$langs->trans("HT");
-            print '</td>';
-            print '</tr>';
+			// PMP
+			print '<tr><td class="titlefield">'.$form->textwithpicto($langs->trans("AverageUnitPricePMPShort"), $langs->trans("AverageUnitPricePMPDesc")).'</td>';
+			print '<td>';
+			if ($object->pmp > 0) print price($object->pmp).' '.$langs->trans("HT");
+			print '</td>';
+			print '</tr>';
 
-            // Best buying Price
-            print '<tr><td class="titlefield">'.$langs->trans("BuyingPriceMin").'</td>';
-            print '<td colspan="2">';
-            $product_fourn = new ProductFournisseur($db);
-            if ($product_fourn->find_min_price_product_fournisseur($object->id) > 0)
-            {
-            	if ($product_fourn->product_fourn_price_id > 0) print $product_fourn->display_price_product_fournisseur();
-            	else print $langs->trans("NotDefined");
-            }
-            print '</td></tr>';
+			// Best buying Price
+			print '<tr><td class="titlefield">'.$langs->trans("BuyingPriceMin").'</td>';
+			print '<td colspan="2">';
+			$product_fourn = new ProductFournisseur($db);
+			if ($product_fourn->find_min_price_product_fournisseur($object->id) > 0)
+			{
+				if ($product_fourn->product_fourn_price_id > 0) print $product_fourn->display_price_product_fournisseur();
+				else print $langs->trans("NotDefined");
+			}
+			print '</td></tr>';
 
-            print '</table>';
+			print '</table>';
 
-            print '</div>';
-            print '<div style="clear:both"></div>';
+			print '</div>';
+			print '<div style="clear:both"></div>';
 
-			dol_fiche_end();
+			print dol_get_fiche_end();
 
 
 			// Form to add or update a price
@@ -474,7 +474,7 @@ if ($id > 0 || $ref)
 					print $form->select_company(GETPOST("id_fourn", 'alpha'), 'id_fourn', 'fournisseur=1', 'SelectThirdParty', 0, 0, $events);
 
 					$parameters = array('filtre'=>"fournisseur=1", 'html_name'=>'id_fourn', 'selected'=>GETPOST("id_fourn"), 'showempty'=>1, 'prod_id'=>$object->id);
-				    $reshook = $hookmanager->executeHooks('formCreateThirdpartyOptions', $parameters, $object, $action);
+					$reshook = $hookmanager->executeHooks('formCreateThirdpartyOptions', $parameters, $object, $action);
 					if (empty($reshook))
 					{
 						if (empty($form->result))
@@ -489,8 +489,8 @@ if ($id > 0 || $ref)
 				print '<tr><td class="fieldrequired">'.$langs->trans("SupplierRef").'</td><td>';
 				if ($rowid)
 				{
-                    print '<input type="hidden" name="ref_fourn_old" value="'.$object->ref_supplier.'">';
-                    print '<input class="flat" name="ref_fourn" size="12" value="'.$object->ref_supplier.'">';
+					print '<input type="hidden" name="ref_fourn_old" value="'.$object->ref_supplier.'">';
+					print '<input class="flat" name="ref_fourn" size="12" value="'.$object->ref_supplier.'">';
 				} else {
 					print '<input class="flat" name="ref_fourn" size="12" value="'.(GETPOST("ref_fourn") ?GETPOST("ref_fourn") : '').'">';
 				}
@@ -518,13 +518,13 @@ if ($id > 0 || $ref)
 				} else {
 					print '<input class="flat" name="qty" size="5" value="'.$quantity.'">';
 				}
-                // Units
-                if ($conf->global->PRODUCT_USE_UNITS) {
-                    $unit = $object->getLabelOfUnit();
-                    if ($unit !== '') {
-                        print '&nbsp;&nbsp;'.$langs->trans($unit);
-                    }
-                }
+				// Units
+				if ($conf->global->PRODUCT_USE_UNITS) {
+					$unit = $object->getLabelOfUnit();
+					if ($unit !== '') {
+						print '&nbsp;&nbsp;'.$langs->trans($unit);
+					}
+				}
 				print '</td></tr>';
 
 				if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING)) {
@@ -533,7 +533,7 @@ if ($id > 0 || $ref)
 
 					print '<td class="fieldrequired">'.$form->textwithpicto($langs->trans("PackagingForThisProduct"), $langs->trans("PackagingForThisProductDesc")).'</td>';
 					print '<td>';
-					$packaging = GETPOSTISSET('packaging') ? price2num(GETPOST('packaging', 'nohtml'), 'MS') : ((empty($rowid))?"1":price2num($object->packaging, 'MS'));
+					$packaging = GETPOSTISSET('packaging') ? price2num(GETPOST('packaging', 'nohtml'), 'MS') : ((empty($rowid)) ? "1" : price2num($object->packaging, 'MS'));
 					print '<input class="flat" name="packaging" size="5" value="'.$packaging.'">';
 
 					// Units
@@ -561,15 +561,15 @@ if ($id > 0 || $ref)
 				//print $form->load_tva('tva_tx',$object->tva_tx,$supplier,$mysoc);    // Do not use list here as it may be any vat rates for any country
 				if (!empty($rowid))	// If we have a supplier, it is an update, we must show the vat of current supplier price
 				{
-				    $tmpproductsupplier = new ProductFournisseur($db);
-				    $tmpproductsupplier->fetch_product_fournisseur_price($rowid, 1);
+					$tmpproductsupplier = new ProductFournisseur($db);
+					$tmpproductsupplier->fetch_product_fournisseur_price($rowid, 1);
 					$default_vat = $tmpproductsupplier->fourn_tva_tx;
 					$default_npr = $tmpproductsupplier->fourn_tva_npr;
 				} else {
-                    if (empty($default_vat))
-                    {
-                        $default_vat = $object->tva_tx;
-                    }
+					if (empty($default_vat))
+					{
+						$default_vat = $object->tva_tx;
+					}
 				}
 				$vattosuggest = (GETPOST("tva_tx") ?vatrate(GETPOST("tva_tx")) : ($default_vat != '' ?vatrate($default_vat) : ''));
 				$vattosuggest = preg_replace('/\s*\(.*\)$/', '', $vattosuggest);
@@ -610,52 +610,52 @@ if ($id > 0 || $ref)
 					</script>';
 				}
 
-                if ($conf->multicurrency->enabled) {
-                    // Currency
-                    print '<tr><td class="fieldrequired">'.$langs->trans("Currency").'</td>';
-                    print '<td>';
-                    $currencycodetouse = GETPOST('multicurrency_code') ?GETPOST('multicurrency_code') : (isset($object->fourn_multicurrency_code) ? $object->fourn_multicurrency_code : '');
-                    if (empty($currencycodetouse) && $object->fourn_multicurrency_tx == 1) $currencycodetouse = $conf->currency;
-                    print $form->selectMultiCurrency($currencycodetouse, "multicurrency_code", 1);
-                    print '</td>';
-                    print '</tr>';
+				if ($conf->multicurrency->enabled) {
+					// Currency
+					print '<tr><td class="fieldrequired">'.$langs->trans("Currency").'</td>';
+					print '<td>';
+					$currencycodetouse = GETPOST('multicurrency_code') ?GETPOST('multicurrency_code') : (isset($object->fourn_multicurrency_code) ? $object->fourn_multicurrency_code : '');
+					if (empty($currencycodetouse) && $object->fourn_multicurrency_tx == 1) $currencycodetouse = $conf->currency;
+					print $form->selectMultiCurrency($currencycodetouse, "multicurrency_code", 1);
+					print '</td>';
+					print '</tr>';
 
-                    // Currency tx
-                    print '<tr><td class="fieldrequired">'.$langs->trans("CurrencyRate").'</td>';
-                    print '<td><input class="flat" name="multicurrency_tx" size="4" value="'.vatrate(GETPOST('multicurrency_tx') ?GETPOST('multicurrency_tx') : (isset($object->fourn_multicurrency_tx) ? $object->fourn_multicurrency_tx : '')).'">';
-                    print '</td>';
-                    print '</tr>';
+					// Currency tx
+					print '<tr><td class="fieldrequired">'.$langs->trans("CurrencyRate").'</td>';
+					print '<td><input class="flat" name="multicurrency_tx" size="4" value="'.vatrate(GETPOST('multicurrency_tx') ?GETPOST('multicurrency_tx') : (isset($object->fourn_multicurrency_tx) ? $object->fourn_multicurrency_tx : '')).'">';
+					print '</td>';
+					print '</tr>';
 
-                    // Currency price qty min
-                    print '<tr><td class="fieldrequired">'.$langs->trans("PriceQtyMinCurrency").'</td>';
-                    $pricesupplierincurrencytouse = (GETPOST('multicurrency_price') ?GETPOST('multicurrency_price') : (isset($object->fourn_multicurrency_price) ? $object->fourn_multicurrency_price : ''));
-                    print '<td><input class="flat" name="multicurrency_price" size="8" value="'.price($pricesupplierincurrencytouse).'">';
-                    print '&nbsp;';
-                    print $form->selectPriceBaseType((GETPOST('multicurrency_price_base_type') ?GETPOST('multicurrency_price_base_type') : 'HT'), "multicurrency_price_base_type"); // We keep 'HT' here, multicurrency_price_base_type is not yet supported for supplier prices
-                    print '</td></tr>';
+					// Currency price qty min
+					print '<tr><td class="fieldrequired">'.$langs->trans("PriceQtyMinCurrency").'</td>';
+					$pricesupplierincurrencytouse = (GETPOST('multicurrency_price') ?GETPOST('multicurrency_price') : (isset($object->fourn_multicurrency_price) ? $object->fourn_multicurrency_price : ''));
+					print '<td><input class="flat" name="multicurrency_price" size="8" value="'.price($pricesupplierincurrencytouse).'">';
+					print '&nbsp;';
+					print $form->selectPriceBaseType((GETPOST('multicurrency_price_base_type') ?GETPOST('multicurrency_price_base_type') : 'HT'), "multicurrency_price_base_type"); // We keep 'HT' here, multicurrency_price_base_type is not yet supported for supplier prices
+					print '</td></tr>';
 
-                    // Price qty min
-                    print '<tr><td class="fieldrequired">'.$langs->trans("PriceQtyMin").'</td>';
-                    print '<td><input class="flat" name="disabled_price" size="8" value="">';
-                    print '<input type="hidden" name="price" value="">';
-                    print '<input type="hidden" name="price_base_type" value="">';
-                    print '&nbsp;';
-                    print $form->selectPriceBaseType('', "disabled_price_base_type");
-                    print '</td></tr>';
+					// Price qty min
+					print '<tr><td class="fieldrequired">'.$langs->trans("PriceQtyMin").'</td>';
+					print '<td><input class="flat" name="disabled_price" size="8" value="">';
+					print '<input type="hidden" name="price" value="">';
+					print '<input type="hidden" name="price_base_type" value="">';
+					print '&nbsp;';
+					print $form->selectPriceBaseType('', "disabled_price_base_type");
+					print '</td></tr>';
 
-                    $currencies = array();
-                    $sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.'multicurrency WHERE entity = '.$conf->entity;
-                    $resql = $db->query($sql);
-                    if ($resql) {
-                        $currency = new MultiCurrency($db);
-                        while ($obj = $db->fetch_object($resql)) {
-                            $currency->fetch($obj->rowid);
-                            $currencies[$currency->code] = $currency->rate->rate;
-                        }
-                    }
-                    $currencies = json_encode($currencies);
+					$currencies = array();
+					$sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.'multicurrency WHERE entity = '.$conf->entity;
+					$resql = $db->query($sql);
+					if ($resql) {
+						$currency = new MultiCurrency($db);
+						while ($obj = $db->fetch_object($resql)) {
+							$currency->fetch($obj->rowid);
+							$currencies[$currency->code] = $currency->rate->rate;
+						}
+					}
+					$currencies = json_encode($currencies);
 
-                    print <<<SCRIPT
+					print <<<SCRIPT
     <script type="text/javascript">
         function update_price_from_multicurrency() {
             var multicurrency_price = $('input[name="multicurrency_price"]').val();
@@ -696,14 +696,14 @@ if ($id > 0 || $ref)
         });
     </script>
 SCRIPT;
-                } else {
-                    // Price qty min
-                    print '<tr><td class="fieldrequired">'.$langs->trans("PriceQtyMin").'</td>';
-                    print '<td><input class="flat" name="price" size="8" value="'.(GETPOST('price') ? price(GETPOST('price')) : (isset($object->fourn_price) ? price($object->fourn_price) : '')).'">';
-                    print '&nbsp;';
-                    print $form->selectPriceBaseType((GETPOST('price_base_type') ? GETPOST('price_base_type') : 'HT'), "price_base_type"); // We keep 'HT' here, price_base_type is not yet supported for supplier prices
-                    print '</td></tr>';
-                }
+				} else {
+					// Price qty min
+					print '<tr><td class="fieldrequired">'.$langs->trans("PriceQtyMin").'</td>';
+					print '<td><input class="flat" name="price" size="8" value="'.(GETPOST('price') ? price(GETPOST('price')) : (isset($object->fourn_price) ? price($object->fourn_price) : '')).'">';
+					print '&nbsp;';
+					print $form->selectPriceBaseType((GETPOST('price_base_type') ? GETPOST('price_base_type') : 'HT'), "price_base_type"); // We keep 'HT' here, price_base_type is not yet supported for supplier prices
+					print '</td></tr>';
+				}
 
 
 				// Discount qty min
@@ -724,23 +724,23 @@ SCRIPT;
 				print '</td></tr>';
 
 				// Barcode
-                if (!empty($conf->barcode->enabled))
-                {
-				    // Option to define a transport cost on supplier price
-                    print '<tr>';
-                    print '<td>'.$langs->trans('BarcodeValue').'</td>';
-                    print '<td><input class="flat" name="barcode"  value="'.($rowid ? $object->fourn_barcode : '').'"></td>';
-                    print '</tr>';
-                    $formbarcode = new FormBarCode($db);
+				if (!empty($conf->barcode->enabled))
+				{
+					// Option to define a transport cost on supplier price
+					print '<tr>';
+					print '<td>'.$langs->trans('BarcodeValue').'</td>';
+					print '<td><input class="flat" name="barcode"  value="'.($rowid ? $object->fourn_barcode : '').'"></td>';
+					print '</tr>';
+					$formbarcode = new FormBarCode($db);
 
-                    // Barcode type
-                    print '<tr>';
-                    print '<td>'.$langs->trans('BarcodeType').'</td>';
-                    print '<td>';
-                    print $formbarcode->selectBarcodeType(($rowid ? $object->fourn_fk_barcode_type : $conf->global->PRODUIT_DEFAULT_BARCODE_TYPE), 'fk_barcode_type', 1);
-                    print '</td>';
-                    print '</tr>';
-                }
+					// Barcode type
+					print '<tr>';
+					print '<td>'.$langs->trans('BarcodeType').'</td>';
+					print '<td>';
+					print $formbarcode->selectBarcodeType(($rowid ? $object->fourn_fk_barcode_type : $conf->global->PRODUIT_DEFAULT_BARCODE_TYPE), 'fk_barcode_type', 1);
+					print '</td>';
+					print '</tr>';
+				}
 
 				// Option to define a transport cost on supplier price
 				if ($conf->global->PRODUCT_CHARGES)
@@ -750,7 +750,7 @@ SCRIPT;
 						print '<tr>';
 						print '<td>'.$langs->trans("Charges").'</td>';
 						print '<td><input class="flat" name="charges" size="8" value="'.(GETPOST('charges') ?price(GETPOST('charges')) : (isset($object->fourn_charges) ?price($object->fourn_charges) : '')).'">';
-		        		print '</td>';
+						print '</td>';
 						print '</tr>';
 					}
 				}
@@ -758,74 +758,74 @@ SCRIPT;
 				// Product description of the supplier
 				if (!empty($conf->global->PRODUIT_FOURN_TEXTS))
 				{
-				    //WYSIWYG Editor
-				    require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+					//WYSIWYG Editor
+					require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 
-    				print '<tr>';
-    				print '<td>'.$langs->trans('ProductSupplierDescription').'</td>';
-    				print '<td>';
+					print '<tr>';
+					print '<td>'.$langs->trans('ProductSupplierDescription').'</td>';
+					print '<td>';
 
-    				$doleditor = new DolEditor('supplier_description', $object->desc_supplier, '', 160, 'dolibarr_details', '', false, true, $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, ROWS_4, '90%');
-    				$doleditor->Create();
+					$doleditor = new DolEditor('supplier_description', $object->desc_supplier, '', 160, 'dolibarr_details', '', false, true, $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, ROWS_4, '90%');
+					$doleditor->Create();
 
-    				print '</td>';
-    				print '</tr>';
+					print '</td>';
+					print '</tr>';
 				}
 
-                // Extrafields
+				// Extrafields
 				$extrafields->fetch_name_optionals_label("product_fournisseur_price");
 				$extralabels = $extrafields->attributes["product_fournisseur_price"]['label'];
-                $extrafield_values = $extrafields->getOptionalsFromPost("product_fournisseur_price");
+				$extrafield_values = $extrafields->getOptionalsFromPost("product_fournisseur_price");
 				if (!empty($extralabels)) {
-                    if (empty($rowid)) {
-                        foreach ($extralabels as $key => $value) {
-                            if (!empty($extrafields->attributes["product_fournisseur_price"]['list'][$key]) && ($extrafields->attributes["product_fournisseur_price"]['list'][$key] == 1 || $extrafields->attributes["product_fournisseur_price"]['list'][$key] == 3 || ($action == "update_price" && $extrafields->attributes["product_fournisseur_price"]['list'][$key] == 4))) {
-                                if (!empty($extrafields->attributes["product_fournisseur_price"]['langfile'][$key])) $langs->load($extrafields->attributes["product_fournisseur_price"]['langfile'][$key]);
+					if (empty($rowid)) {
+						foreach ($extralabels as $key => $value) {
+							if (!empty($extrafields->attributes["product_fournisseur_price"]['list'][$key]) && ($extrafields->attributes["product_fournisseur_price"]['list'][$key] == 1 || $extrafields->attributes["product_fournisseur_price"]['list'][$key] == 3 || ($action == "update_price" && $extrafields->attributes["product_fournisseur_price"]['list'][$key] == 4))) {
+								if (!empty($extrafields->attributes["product_fournisseur_price"]['langfile'][$key])) $langs->load($extrafields->attributes["product_fournisseur_price"]['langfile'][$key]);
 
-                                print '<tr><td'.($extrafields->attributes["product_fournisseur_price"]['required'][$key] ? ' class="fieldrequired"' : '').'>';
-                                if (!empty($extrafields->attributes["product_fournisseur_price"]['help'][$key])) print $form->textwithpicto($langs->trans($value), $langs->trans($extrafields->attributes["product_fournisseur_price"]['help'][$key]));
-                                else print $langs->trans($value);
-                                print '</td><td>'.$extrafields->showInputField($key, GETPOSTISSET('options_'.$key) ? $extrafield_values['options_'.$key] : '', '', '', '', '', 0, 'product_fournisseur_price').'</td></tr>';
-                            }
-                        }
-                    } else {
-                        $sql  = "SELECT";
-                        $sql .= " fk_object";
-                        foreach ($extralabels as $key => $value) {
-                            $sql .= ", ".$key;
-                        }
-                        $sql .= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price_extrafields";
-                        $sql .= " WHERE fk_object = ".$rowid;
-                        $resql = $db->query($sql);
-                        if ($resql) {
-                            $obj = $db->fetch_object($resql);
-                            foreach ($extralabels as $key => $value) {
-                                if (!empty($extrafields->attributes["product_fournisseur_price"]['list'][$key]) && ($extrafields->attributes["product_fournisseur_price"]['list'][$key] == 1 || $extrafields->attributes["product_fournisseur_price"]['list'][$key] == 3 || ($action == "update_price" && $extrafields->attributes["product_fournisseur_price"]['list'][$key] == 4))) {
-                                    if (!empty($extrafields->attributes["product_fournisseur_price"]['langfile'][$key])) $langs->load($extrafields->attributes["product_fournisseur_price"]['langfile'][$key]);
+								print '<tr><td'.($extrafields->attributes["product_fournisseur_price"]['required'][$key] ? ' class="fieldrequired"' : '').'>';
+								if (!empty($extrafields->attributes["product_fournisseur_price"]['help'][$key])) print $form->textwithpicto($langs->trans($value), $langs->trans($extrafields->attributes["product_fournisseur_price"]['help'][$key]));
+								else print $langs->trans($value);
+								print '</td><td>'.$extrafields->showInputField($key, GETPOSTISSET('options_'.$key) ? $extrafield_values['options_'.$key] : '', '', '', '', '', 0, 'product_fournisseur_price').'</td></tr>';
+							}
+						}
+					} else {
+						$sql  = "SELECT";
+						$sql .= " fk_object";
+						foreach ($extralabels as $key => $value) {
+							$sql .= ", ".$key;
+						}
+						$sql .= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price_extrafields";
+						$sql .= " WHERE fk_object = ".$rowid;
+						$resql = $db->query($sql);
+						if ($resql) {
+							$obj = $db->fetch_object($resql);
+							foreach ($extralabels as $key => $value) {
+								if (!empty($extrafields->attributes["product_fournisseur_price"]['list'][$key]) && ($extrafields->attributes["product_fournisseur_price"]['list'][$key] == 1 || $extrafields->attributes["product_fournisseur_price"]['list'][$key] == 3 || ($action == "update_price" && $extrafields->attributes["product_fournisseur_price"]['list'][$key] == 4))) {
+									if (!empty($extrafields->attributes["product_fournisseur_price"]['langfile'][$key])) $langs->load($extrafields->attributes["product_fournisseur_price"]['langfile'][$key]);
 
-                                    print '<tr><td'.($extrafields->attributes["product_fournisseur_price"]['required'][$key] ? ' class="fieldrequired"' : '').'>';
-                                    if (!empty($extrafields->attributes["product_fournisseur_price"]['help'][$key])) print $form->textwithpicto($langs->trans($value), $langs->trans($extrafields->attributes["product_fournisseur_price"]['help'][$key]));
-                                    else print $langs->trans($value);
-                                    print '</td><td>'.$extrafields->showInputField($key, GETPOSTISSET('options_'.$key) ? $extrafield_values['options_'.$key] : $obj->{$key}, '', '', '', '', 0, 'product_fournisseur_price');
+									print '<tr><td'.($extrafields->attributes["product_fournisseur_price"]['required'][$key] ? ' class="fieldrequired"' : '').'>';
+									if (!empty($extrafields->attributes["product_fournisseur_price"]['help'][$key])) print $form->textwithpicto($langs->trans($value), $langs->trans($extrafields->attributes["product_fournisseur_price"]['help'][$key]));
+									else print $langs->trans($value);
+									print '</td><td>'.$extrafields->showInputField($key, GETPOSTISSET('options_'.$key) ? $extrafield_values['options_'.$key] : $obj->{$key}, '', '', '', '', 0, 'product_fournisseur_price');
 
-                                    print '</td></tr>';
-                                }
-                            }
-                            $db->free($resql);
-                        }
-                    }
+									print '</td></tr>';
+								}
+							}
+							$db->free($resql);
+						}
+					}
 				}
 
 				if (is_object($hookmanager))
 				{
 					$parameters = array('id_fourn'=>$id_fourn, 'prod_id'=>$object->id);
-				    $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action);
-                    print $hookmanager->resPrint;
+					$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action);
+					print $hookmanager->resPrint;
 				}
 
 				print '</table>';
 
-				dol_fiche_end();
+				print dol_get_fiche_end();
 
 				print '<div class="center">';
 				print '<input class="button" type="submit" value="'.$langs->trans("Save").'">';
@@ -899,7 +899,7 @@ SCRIPT;
 						// Show field if not hidden
 						if (!empty($extrafields->attributes["product_fournisseur_price"]['list'][$key]) && $extrafields->attributes["product_fournisseur_price"]['list'][$key] != 3) {
 							$extratitle = $langs->trans($value);
-							$arrayfields['ef.'.$key] = array('label'=>$extratitle, 'checked'=>0, 'position'=>(end($arrayfields)['position']+1), 'langfile'=>$extrafields->attributes["product_fournisseur_price"]['langfile'][$key], 'help'=>$extrafields->attributes["product_fournisseur_price"]['help'][$key]);
+							$arrayfields['ef.'.$key] = array('label'=>$extratitle, 'checked'=>0, 'position'=>(end($arrayfields)['position'] + 1), 'langfile'=>$extrafields->attributes["product_fournisseur_price"]['langfile'][$key], 'help'=>$extrafields->attributes["product_fournisseur_price"]['help'][$key]);
 						}
 					}
 				}
@@ -911,7 +911,7 @@ SCRIPT;
 				$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
 
 				print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post" name="formulaire">';
-				print '<input type="hidden" name="token" value="'. newToken() . '">';
+				print '<input type="hidden" name="token" value="'.newToken().'">';
 				print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 				print '<input type="hidden" name="action" value="list">';
 				print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
@@ -931,8 +931,8 @@ SCRIPT;
 				if (!empty($arrayfields['pfp.quantity']['checked']))				print_liste_field_titre("QtyMin", $_SERVER["PHP_SELF"], "pfp.quantity", "", $param, '', $sortfield, $sortorder, 'right ');
 				print_liste_field_titre("VATRate", $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'right ');
 				print_liste_field_titre("PriceQtyMinHT", $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'right ');
-                if ($conf->multicurrency->enabled)									print_liste_field_titre("PriceQtyMinHTCurrency", $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'right ');
-                if (!empty($arrayfields['pfp.unitprice']['checked']))				print_liste_field_titre("UnitPriceHT", $_SERVER["PHP_SELF"], "pfp.unitprice", "", $param, '', $sortfield, $sortorder, 'right ');
+				if ($conf->multicurrency->enabled)									print_liste_field_titre("PriceQtyMinHTCurrency", $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'right ');
+				if (!empty($arrayfields['pfp.unitprice']['checked']))				print_liste_field_titre("UnitPriceHT", $_SERVER["PHP_SELF"], "pfp.unitprice", "", $param, '', $sortfield, $sortorder, 'right ');
 				if (!empty($arrayfields['pfp.multicurrency_unitprice']['checked']))	print_liste_field_titre("UnitPriceHTCurrency", $_SERVER["PHP_SELF"], "pfp.multicurrency_unitprice", "", $param, '', $sortfield, $sortorder, 'right ');
 				if ($conf->multicurrency->enabled)									print_liste_field_titre("Currency", $_SERVER["PHP_SELF"], "", "", $param, '', $sortfield, $sortorder, 'right ');
 				print_liste_field_titre("DiscountQtyMin", $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'right ');
@@ -951,8 +951,8 @@ SCRIPT;
 					foreach ($extralabels as $key => $value) {
 						// Show field if not hidden
 						if (!empty($extrafields->attributes["product_fournisseur_price"]['list'][$key]) && $extrafields->attributes["product_fournisseur_price"]['list'][$key] != 3) {
-                            if (!empty($extrafields->attributes["product_fournisseur_price"]['langfile'][$key])) $langs->load($extrafields->attributes["product_fournisseur_price"]['langfile'][$key]);
-                            if (!empty($extrafields->attributes["product_fournisseur_price"]['help'][$key])) $extratitle = $form->textwithpicto($langs->trans($value), $langs->trans($extrafields->attributes["product_fournisseur_price"]['help'][$key]));
+							if (!empty($extrafields->attributes["product_fournisseur_price"]['langfile'][$key])) $langs->load($extrafields->attributes["product_fournisseur_price"]['langfile'][$key]);
+							if (!empty($extrafields->attributes["product_fournisseur_price"]['help'][$key])) $extratitle = $form->textwithpicto($langs->trans($value), $langs->trans($extrafields->attributes["product_fournisseur_price"]['help'][$key]));
 							else $extratitle = $langs->trans($value);
 							if (!empty($arrayfields['ef.'.$key]['checked'])) print_liste_field_titre($extratitle, $_SERVER["PHP_SELF"], 'ef.'.$key, '', $param, '', $sortfield, $sortorder, 'right ');
 						}
@@ -961,8 +961,8 @@ SCRIPT;
 
 				if (is_object($hookmanager))
 				{
-				    $parameters = array('id_fourn'=>$id_fourn, 'prod_id'=>$object->id);
-				    $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object, $action);
+					$parameters = array('id_fourn'=>$id_fourn, 'prod_id'=>$object->id);
+					$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object, $action);
 				}
 				print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
 				print "</tr>\n";
@@ -995,7 +995,7 @@ SCRIPT;
 						if (!empty($arrayfields['pfp.fk_availability']['checked']))
 						{
 							$form->load_cache_availability();
-                			$availability = $form->cache_availability[$productfourn->fk_availability]['label'];
+							$availability = $form->cache_availability[$productfourn->fk_availability]['label'];
 							print '<td class="left">'.$availability.'</td>';
 						}
 
@@ -1023,12 +1023,12 @@ SCRIPT;
 						print $productfourn->fourn_price ?price($productfourn->fourn_price) : "";
 						print '</td>';
 
-                        if ($conf->multicurrency->enabled) {
-                            // Price for the quantity in currency
-                            print '<td class="right">';
-                            print $productfourn->fourn_multicurrency_price ? price($productfourn->fourn_multicurrency_price) : "";
-                            print '</td>';
-                        }
+						if ($conf->multicurrency->enabled) {
+							// Price for the quantity in currency
+							print '<td class="right">';
+							print $productfourn->fourn_multicurrency_price ? price($productfourn->fourn_multicurrency_price) : "";
+							print '</td>';
+						}
 
 						// Unit price
 						if (!empty($arrayfields['pfp.unitprice']['checked'])) {
@@ -1040,16 +1040,16 @@ SCRIPT;
 
 						// Unit price in currency
 						if (!empty($arrayfields['pfp.multicurrency_unitprice']['checked'])) {
-                            print '<td class="right">';
-                            print price($productfourn->fourn_multicurrency_unitprice);
-                            print '</td>';}
+							print '<td class="right">';
+							print price($productfourn->fourn_multicurrency_unitprice);
+							print '</td>'; }
 
 						// Currency
-                        if ($conf->multicurrency->enabled) {
-                            print '<td class="right">';
-                            print $productfourn->fourn_multicurrency_code ? currency_name($productfourn->fourn_multicurrency_code) : '';
-                            print '</td>';
-                        }
+						if ($conf->multicurrency->enabled) {
+							print '<td class="right">';
+							print $productfourn->fourn_multicurrency_code ? currency_name($productfourn->fourn_multicurrency_code) : '';
+							print '</td>';
+						}
 
 						// Discount
 						print '<td class="right">';
@@ -1074,18 +1074,18 @@ SCRIPT;
 
 						// Barcode
 						if (!empty($arrayfields['pfp.barcode']['checked'])) {
-                            print '<td align="right">';
-                            print $productfourn->barcode;
+							print '<td align="right">';
+							print $productfourn->barcode;
 							print '</td>';
 						}
 
 						// Barcode type
 						if (!empty($arrayfields['pfp.fk_barcode_type']['checked'])) {
-                            print '<td class="center">';
-                            $productfourn->barcode_type = !empty($productfourn->fk_barcode_type) ? $productfourn->fk_barcode_type : 0;
-                            $productfourn->fetch_barcode();
-                            print $productfourn->barcode_type_label ? $productfourn->barcode_type_label : ($productfourn->barcode ? '<div class="warning">'.$langs->trans("SetDefaultBarcodeType").'<div>' : '');
-                            print '</td>';
+							print '<td class="center">';
+							$productfourn->barcode_type = !empty($productfourn->fk_barcode_type) ? $productfourn->fk_barcode_type : 0;
+							$productfourn->fetch_barcode();
+							print $productfourn->barcode_type_label ? $productfourn->barcode_type_label : ($productfourn->barcode ? '<div class="warning">'.$langs->trans("SetDefaultBarcodeType").'<div>' : '');
+							print '</td>';
 						}
 
 						// Packaging
@@ -1104,37 +1104,37 @@ SCRIPT;
 
 						// Extrafields
 						if (!empty($extralabels)) {
-                            $sql  = "SELECT";
-                            $sql .= " fk_object";
-                            foreach ($extralabels as $key => $value) {
-                                $sql .= ", ".$key;
-                            }
-                            $sql .= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price_extrafields";
-                            $sql .= " WHERE fk_object = ".$productfourn->product_fourn_price_id;
-                            $resql = $db->query($sql);
-                            if ($resql) {
-                                if ($db->num_rows($resql) != 1) {
-                                    foreach ($extralabels as $key => $value) {
-                                        if (!empty($arrayfields['ef.'.$key]['checked']) && !empty($extrafields->attributes["product_fournisseur_price"]['list'][$key]) && $extrafields->attributes["product_fournisseur_price"]['list'][$key] != 3) {
-                                            print "<td></td>";
-                                        }
-                                    }
-                                } else {
-                                    $obj = $db->fetch_object($resql);
-                                    foreach ($extralabels as $key => $value) {
-                                        if (!empty($arrayfields['ef.'.$key]['checked']) && !empty($extrafields->attributes["product_fournisseur_price"]['list'][$key]) && $extrafields->attributes["product_fournisseur_price"]['list'][$key] != 3) {
-                                            print '<td align="right">'.$extrafields->showOutputField($key, $obj->{$key})."</td>";
-                                        }
-                                    }
-                                }
-                                $db->free($resql);
-                            }
+							$sql  = "SELECT";
+							$sql .= " fk_object";
+							foreach ($extralabels as $key => $value) {
+								$sql .= ", ".$key;
+							}
+							$sql .= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price_extrafields";
+							$sql .= " WHERE fk_object = ".$productfourn->product_fourn_price_id;
+							$resql = $db->query($sql);
+							if ($resql) {
+								if ($db->num_rows($resql) != 1) {
+									foreach ($extralabels as $key => $value) {
+										if (!empty($arrayfields['ef.'.$key]['checked']) && !empty($extrafields->attributes["product_fournisseur_price"]['list'][$key]) && $extrafields->attributes["product_fournisseur_price"]['list'][$key] != 3) {
+											print "<td></td>";
+										}
+									}
+								} else {
+									$obj = $db->fetch_object($resql);
+									foreach ($extralabels as $key => $value) {
+										if (!empty($arrayfields['ef.'.$key]['checked']) && !empty($extrafields->attributes["product_fournisseur_price"]['list'][$key]) && $extrafields->attributes["product_fournisseur_price"]['list'][$key] != 3) {
+											print '<td align="right">'.$extrafields->showOutputField($key, $obj->{$key})."</td>";
+										}
+									}
+								}
+								$db->free($resql);
+							}
 						}
 
 						if (is_object($hookmanager))
 						{
 							$parameters = array('id_pfp'=>$productfourn->product_fourn_price_id, 'id_fourn'=>$id_fourn, 'prod_id'=>$object->id);
-						    $reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object, $action);
+							$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object, $action);
 						}
 
 						// Modify-Remove
@@ -1152,7 +1152,7 @@ SCRIPT;
 						print '</tr>';
 					}
 				} else {
-				    dol_print_error($db);
+					dol_print_error($db);
 				}
 
 				print '</table>';
diff --git a/htdocs/product/index.php b/htdocs/product/index.php
index 53136237eca..9c9852b22ef 100644
--- a/htdocs/product/index.php
+++ b/htdocs/product/index.php
@@ -85,33 +85,33 @@ 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 contract
-    if ((!empty($conf->product->enabled) || !empty($conf->service->enabled)) && ($user->rights->produit->lire || $user->rights->service->lire))
-    {
-    	$listofsearchfields['search_product'] = array('text'=>'ProductOrService');
-    }
+	// Search contract
+	if ((!empty($conf->product->enabled) || !empty($conf->service->enabled)) && ($user->rights->produit->lire || $user->rights->service->lire))
+	{
+		$listofsearchfields['search_product'] = array('text'=>'ProductOrService');
+	}
 
-    if (count($listofsearchfields))
-    {
-    	print '<form method="post" action="'.DOL_URL_ROOT.'/core/search.php">';
-    	print '<input type="hidden" name="token" value="'.newToken().'">';
-        print '<div class="div-table-responsive-no-min">';
-    	print '<table class="noborder nohover centpercent">';
-    	$i = 0;
-    	foreach ($listofsearchfields as $key => $value)
-    	{
-    		if ($i == 0) print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
-    		print '<tr class="oddeven">';
-    		print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label></td><td><input type="text" class="flat inputsearch" name="'.$key.'" id="'.$key.'" size="18"></td>';
-    		if ($i == 0) print '<td rowspan="'.count($listofsearchfields).'"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
-    		print '</tr>';
-    		$i++;
-    	}
-    	print '</table>';
-        print '</div>';
-    	print '</form>';
-    	print '<br>';
-    }
+	if (count($listofsearchfields))
+	{
+		print '<form method="post" action="'.DOL_URL_ROOT.'/core/search.php">';
+		print '<input type="hidden" name="token" value="'.newToken().'">';
+		print '<div class="div-table-responsive-no-min">';
+		print '<table class="noborder nohover centpercent">';
+		$i = 0;
+		foreach ($listofsearchfields as $key => $value)
+		{
+			if ($i == 0) print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
+			print '<tr class="oddeven">';
+			print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label></td><td><input type="text" class="flat inputsearch" name="'.$key.'" id="'.$key.'" size="18"></td>';
+			if ($i == 0) print '<td rowspan="'.count($listofsearchfields).'"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
+			print '</tr>';
+			$i++;
+		}
+		print '</table>';
+		print '</div>';
+		print '</form>';
+		print '<br>';
+	}
 }
 
 /*
@@ -349,27 +349,27 @@ if ((!empty($conf->product->enabled) || !empty($conf->service->enabled)) && ($us
 				// Sell price
 				if (empty($conf->global->PRODUIT_MULTIPRICES))
 				{
-	                if (!empty($conf->dynamicprices->enabled) && !empty($objp->fk_price_expression))
-	                {
-	                	$product = new Product($db);
-	                	$product->fetch($objp->rowid);
-	                    $priceparser = new PriceParser($db);
-	                    $price_result = $priceparser->parseProduct($product);
-	                    if ($price_result >= 0) {
-	                        $objp->price = $price_result;
-	                    }
-	                }
+					if (!empty($conf->dynamicprices->enabled) && !empty($objp->fk_price_expression))
+					{
+						$product = new Product($db);
+						$product->fetch($objp->rowid);
+						$priceparser = new PriceParser($db);
+						$price_result = $priceparser->parseProduct($product);
+						if ($price_result >= 0) {
+							$objp->price = $price_result;
+						}
+					}
 					print '<td class="nowrap right">';
-	    			if (isset($objp->price_base_type) && $objp->price_base_type == 'TTC') print price($objp->price_ttc).' '.$langs->trans("TTC");
-	    			else print price($objp->price).' '.$langs->trans("HT");
-	    			print '</td>';
+					if (isset($objp->price_base_type) && $objp->price_base_type == 'TTC') print price($objp->price_ttc).' '.$langs->trans("TTC");
+					else print price($objp->price).' '.$langs->trans("HT");
+					print '</td>';
 				}
 				print '<td class="right nowrap width25"><span class="statusrefsell">';
 				print $product_static->LibStatut($objp->tosell, 3, 0);
 				print "</span></td>";
-	            print '<td class="right nowrap width25"><span class="statusrefbuy">';
-	            print $product_static->LibStatut($objp->tobuy, 3, 1);
-	            print "</span></td>";
+				print '<td class="right nowrap width25"><span class="statusrefbuy">';
+				print $product_static->LibStatut($objp->tobuy, 3, 1);
+				print "</span></td>";
 				print "</tr>\n";
 				$i++;
 			}
@@ -445,7 +445,7 @@ function activitytrim($product_type)
 
 		if ($num > 0)
 		{
-            print '<div class="div-table-responsive-no-min">';
+			print '<div class="div-table-responsive-no-min">';
 			print '<table class="noborder" width="75%">';
 
 			if ($product_type == 0)
diff --git a/htdocs/product/inventory/card.php b/htdocs/product/inventory/card.php
index 532eca6235c..d13e1a79801 100644
--- a/htdocs/product/inventory/card.php
+++ b/htdocs/product/inventory/card.php
@@ -204,7 +204,7 @@ if ($action == 'create')
 
 	print '</table>'."\n";
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div class="center">';
 	print '<input type="submit" class="button" name="add" value="'.dol_escape_htmltag($langs->trans("Create")).'">';
@@ -241,7 +241,7 @@ if (($id || $ref) && $action == 'edit')
 
 	print '</table>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div class="center"><input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
 	print ' &nbsp; <input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
@@ -370,7 +370,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 	print '<div class="clearboth"></div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 
 	// Buttons for actions
diff --git a/htdocs/product/inventory/inventory.php b/htdocs/product/inventory/inventory.php
index 6e48f135e1e..67906022057 100644
--- a/htdocs/product/inventory/inventory.php
+++ b/htdocs/product/inventory/inventory.php
@@ -300,7 +300,7 @@ if ($object->id > 0)
 
 	print '<div class="clearboth"></div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 
 	// Buttons for actions
diff --git a/htdocs/product/inventory/lib/inventory.lib.php b/htdocs/product/inventory/lib/inventory.lib.php
index 47fa1e53510..bda792abec4 100644
--- a/htdocs/product/inventory/lib/inventory.lib.php
+++ b/htdocs/product/inventory/lib/inventory.lib.php
@@ -29,30 +29,30 @@
  */
 function inventoryAdminPrepareHead()
 {
-    global $langs, $conf;
+	global $langs, $conf;
 
-    $langs->load("inventory");
+	$langs->load("inventory");
 
-    $h = 0;
-    $head = array();
+	$h = 0;
+	$head = array();
 
-    $head[$h][0] = DOL_URL_ROOT."/admin/inventory.php";
-    $head[$h][1] = $langs->trans("Parameters");
-    $head[$h][2] = 'settings';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT."/admin/inventory.php";
+	$head[$h][1] = $langs->trans("Parameters");
+	$head[$h][2] = 'settings';
+	$h++;
 
 
-    // Show more tabs from modules
-    // Entries must be declared in modules descriptor with line
-    //$this->tabs = array(
-    //	'entity:+tabname:Title:@inventory:/inventory/mypage.php?id=__ID__'
-    //); // to add new tab
-    //$this->tabs = array(
-    //	'entity:-tabname:Title:@inventory:/inventory/mypage.php?id=__ID__'
-    //); // to remove a tab
-    complete_head_from_modules($conf, $langs, null, $head, $h, 'inventory');
+	// Show more tabs from modules
+	// Entries must be declared in modules descriptor with line
+	//$this->tabs = array(
+	//	'entity:+tabname:Title:@inventory:/inventory/mypage.php?id=__ID__'
+	//); // to add new tab
+	//$this->tabs = array(
+	//	'entity:-tabname:Title:@inventory:/inventory/mypage.php?id=__ID__'
+	//); // to remove a tab
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'inventory');
 
-    return $head;
+	return $head;
 }
 
 /**
diff --git a/htdocs/product/inventory/list.php b/htdocs/product/inventory/list.php
index 5a19906d088..879a6196450 100644
--- a/htdocs/product/inventory/list.php
+++ b/htdocs/product/inventory/list.php
@@ -371,7 +371,7 @@ foreach ($object->fields as $key => $val)
 	if (!empty($arrayfields['t.'.$key]['checked']))
 	{
 		print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
-		if (is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
+		if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
 		elseif (strpos($val['type'], 'integer:') === 0) {
 			print $object->showInputField($val, $key, $search[$key], '', '', 'search_', 'maxwidth150', 1);
 		} elseif (!preg_match('/^(date|timestamp)/', $val['type'])) print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index db77e7714f1..0142e38698e 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -215,7 +215,7 @@ $arrayfields = array(
 	'p.tobatch'=>array('label'=>$langs->trans("ManageLotSerial"), 'checked'=>0, 'enabled'=>(!empty($conf->productbatch->enabled)), 'position'=>60),
 	'p.fk_country'=>array('label'=>$langs->trans("Country"), 'checked'=>0, 'position'=>100),
 	'p.fk_state'=>array('label'=>$langs->trans("State"), 'checked'=>0, 'position'=>101),
-    'p.accountancy_code_sell'=>array('label'=>$langs->trans("ProductAccountancySellCode"), 'checked'=>0, 'position'=>400),
+	'p.accountancy_code_sell'=>array('label'=>$langs->trans("ProductAccountancySellCode"), 'checked'=>0, 'position'=>400),
 	'p.accountancy_code_sell_intra'=>array('label'=>$langs->trans("ProductAccountancySellIntraCode"), 'checked'=>0, 'enabled'=>$isInEEC, 'position'=>401),
 	'p.accountancy_code_sell_export'=>array('label'=>$langs->trans("ProductAccountancySellExportCode"), 'checked'=>0, 'position'=>402),
 	'p.accountancy_code_buy'=>array('label'=>$langs->trans("ProductAccountancyBuyCode"), 'checked'=>0, 'position'=>403),
@@ -413,7 +413,7 @@ if ($fourn_id > 0)  $sql .= " AND pfp.fk_soc = ".$fourn_id;
 if ($search_tobatch != '' && $search_tobatch >= 0)   $sql .= " AND p.tobatch = ".$db->escape($search_tobatch);
 if ($search_country)     $sql .= " AND p.fk_country = ".$search_country;
 if ($search_state)     $sql .= " AND p.fk_state = ".$search_state;
-if ($search_finished>=0 && $search_finished!=='') $sql .= " AND p.finished = ".$search_finished;
+if ($search_finished >= 0 && $search_finished !== '') $sql .= " AND p.finished = ".$search_finished;
 if ($search_accountancy_code_sell)        $sql .= natural_search('p.accountancy_code_sell', $search_accountancy_code_sell);
 if ($search_accountancy_code_sell_intra)  $sql .= natural_search('p.accountancy_code_sell_intra', $search_accountancy_code_sell_intra);
 if ($search_accountancy_code_sell_export) $sql .= natural_search('p.accountancy_code_sell_export', $search_accountancy_code_sell_export);
@@ -1103,7 +1103,7 @@ if ($resql)
 		// Label
 		if (!empty($arrayfields['p.label']['checked']))
 		{
-			print '<td class="tdoverflowmax200">'.dol_trunc($obj->label, 80).'</td>';
+			print '<td class="tdoverflowmax200" title="'.dol_escape_htmltag($obj->label).'">'.$obj->label.'</td>';
 			if (!$i) $totalarray['nbfield']++;
 		}
 
diff --git a/htdocs/product/note.php b/htdocs/product/note.php
index 8195d61515b..f0a6293383d 100644
--- a/htdocs/product/note.php
+++ b/htdocs/product/note.php
@@ -83,36 +83,36 @@ llxHeader('', $title, $help_url);
 
 if ($id > 0 || !empty($ref))
 {
-    /*
+	/*
      * Affichage onglets
      */
-    if (!empty($conf->notification->enabled)) $langs->load("mails");
+	if (!empty($conf->notification->enabled)) $langs->load("mails");
 
-    $head = product_prepare_head($object);
-    $titre = $langs->trans("CardProduct".$object->type);
-    $picto = ($object->type == Product::TYPE_SERVICE ? 'service' : 'product');
+	$head = product_prepare_head($object);
+	$titre = $langs->trans("CardProduct".$object->type);
+	$picto = ($object->type == Product::TYPE_SERVICE ? 'service' : 'product');
 
-    print dol_get_fiche_head($head, 'note', $titre, -1, $picto);
+	print dol_get_fiche_head($head, 'note', $titre, -1, $picto);
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
-    $object->next_prev_filter = " fk_product_type = ".$object->type;
+	$object->next_prev_filter = " fk_product_type = ".$object->type;
 
-    $shownav = 1;
-    if ($user->socid && !in_array('product', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav = 0;
+	$shownav = 1;
+	if ($user->socid && !in_array('product', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav = 0;
 
 	dol_banner_tab($object, 'ref', $linkback, $shownav, 'ref');
 
-    $cssclass = 'titlefield';
-    //if ($action == 'editnote_public') $cssclass='titlefieldcreate';
-    //if ($action == 'editnote_private') $cssclass='titlefieldcreate';
+	$cssclass = 'titlefield';
+	//if ($action == 'editnote_public') $cssclass='titlefieldcreate';
+	//if ($action == 'editnote_private') $cssclass='titlefieldcreate';
 
-    //print '<div class="fichecenter">';
+	//print '<div class="fichecenter">';
 
-    print '<div class="underbanner clearboth"></div>';
+	print '<div class="underbanner clearboth"></div>';
 
-    include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
+	include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
 
-    dol_fiche_end();
+	print dol_get_fiche_end();
 }
 
 // End of page
diff --git a/htdocs/product/popuprop.php b/htdocs/product/popuprop.php
index 037d58efed2..37019616e96 100644
--- a/htdocs/product/popuprop.php
+++ b/htdocs/product/popuprop.php
@@ -132,7 +132,7 @@ if ($type !== '') {
 }
 $sql .= " GROUP BY p.rowid, p.label, p.ref, p.fk_product_type";
 
-if (! empty($mode) && $mode != '-1') {
+if (!empty($mode) && $mode != '-1') {
 	$result = $db->query($sql);
 	if ($result)
 	{
@@ -236,7 +236,7 @@ print "</table>";
 
 print '</form>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // End of page
 llxFooter();
diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index 8d10535ae31..9c9fa653a60 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -470,7 +470,7 @@ if (empty($reshook))
 
 			$result = $db->query($sql);
 		} else {
-			setEventMessages(('delete_price_by_qty'.$langs->transnoentities(MissingIds)), null, 'errors');
+			setEventMessages(('delete_price_by_qty'.$langs->transnoentities('MissingIds')), null, 'errors');
 		}
 	}
 
@@ -1087,7 +1087,7 @@ print '</div>';
 print '<div style="clear:both"></div>';
 
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 
@@ -1159,7 +1159,7 @@ if ($action == 'edit_vat' && ($user->rights->produit->creer || $user->rights->se
 
 	print '</table>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div class="center">';
 	print '<input type="submit" class="button" value="'.$langs->trans("Save").'">';
@@ -1272,7 +1272,7 @@ if ($action == 'edit_price' && $object->getRights()->creer)
 
 		print '</table>';
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 		print '<div class="center">';
 		print '<input type="submit" class="button" value="'.$langs->trans("Save").'">';
@@ -1392,7 +1392,7 @@ if ($action == 'edit_price' && $object->getRights()->creer)
 
 		print '</table>';
 
-		//dol_fiche_end();
+		//print dol_get_fiche_end();
 
 		print '<div style="text-align: center">';
 		print '<input type="submit" class="button" value="'.$langs->trans("Save").'">';
@@ -1443,16 +1443,13 @@ if ((empty($conf->global->PRODUIT_CUSTOMER_PRICES) || $action == 'showlog_defaul
 			$num = $db->num_rows($result);
 		}
 
-		if ($num > 0)
-		{
+		if ($num > 0) {
 			// Default prices or
 			// Log of previous customer prices
-			$backbutton = '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'">'.$langs->trans("Back").'</a>';
+			$backbutton = '<a class="justalink" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'">'.$langs->trans("Back").'</a>';
 
-			if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) print_barre_liste($langs->trans("DefaultPrice"), 0, $_SERVER["PHP_SELF"], '', '', '', $backbutton, 0, $num, 'title_accountancy.png');
+			if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) print_barre_liste($langs->trans("DefaultPriceLog"), 0, $_SERVER["PHP_SELF"], '', '', '', $backbutton, 0, $num, 'title_accountancy.png');
 			else print_barre_liste($langs->trans("PriceByCustomerLog"), 0, $_SERVER["PHP_SELF"], '', '', '', '', 0, $num, 'title_accountancy.png');
-			//if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) print_barre_liste($langs->trans("DefaultPrice"),'','','','','',$backbutton, 0, 0, 'title_accountancy.png');
-			//else print_barre_liste($langs->trans("PriceByCustomerLog"),'','','','','','', 0, 0, 'title_accountancy.png');
 
 			print '<div class="div-table-responsive">';
 			print '<table class="noborder centpercent">';
@@ -1705,7 +1702,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 
 		print '</table>';
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 		print '<div class="center">';
 
@@ -1800,7 +1797,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 
 		print '</table>';
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 		print '<div class="center">';
 		print '<div class="marginbottomonly">';
@@ -2062,7 +2059,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 			print img_info($langs->trans('PriceByCustomerLog'));
 			print '</a>';
 			print ' ';
-			print '<a href="'.$_SERVER["PHP_SELF"].'?action=edit_price&amp;id='.$object->id.'">';
+			print '<a class="marginleftonly editfielda" href="'.$_SERVER["PHP_SELF"].'?action=edit_price&amp;id='.$object->id.'">';
 			print img_edit('default', 0, 'style="vertical-align: middle;"');
 			print '</a>';
 			print ' &nbsp; ';
@@ -2144,11 +2141,11 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 					print img_info($langs->trans('PriceByCustomerLog'));
 					print '</a>';
 					print ' ';
-					print '<a href="'.$_SERVER["PHP_SELF"].'?action=edit_customer_price&amp;id='.$object->id.'&amp;lineid='.$line->id.'">';
+					print '<a class="marginleftonly editfielda" href="'.$_SERVER["PHP_SELF"].'?action=edit_customer_price&amp;id='.$object->id.'&amp;lineid='.$line->id.'">';
 					print img_edit('default', 0, 'style="vertical-align: middle;"');
 					print '</a>';
 					print ' ';
-					print '<a href="'.$_SERVER["PHP_SELF"].'?action=delete_customer_price&amp;token='.newToken().'&amp;id='.$object->id.'&amp;lineid='.$line->id.'">';
+					print '<a class="marginleftonly" href="'.$_SERVER["PHP_SELF"].'?action=delete_customer_price&amp;token='.newToken().'&amp;id='.$object->id.'&amp;lineid='.$line->id.'">';
 					print img_delete('default', 'style="vertical-align: middle;"');
 					print '</a>';
 					print '</td>';
diff --git a/htdocs/product/reassort.php b/htdocs/product/reassort.php
index f881a429d1a..715ad66e977 100644
--- a/htdocs/product/reassort.php
+++ b/htdocs/product/reassort.php
@@ -85,7 +85,7 @@ if (!empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT)
 	|| !empty($conf->global->STOCK_CALCULATE_ON_RECEPTION_CLOSE)
 	|| !empty($conf->mrp->enabled))
 {
-    $virtualdiffersfromphysical = 1; // According to increase/decrease stock options, virtual and physical stock may differs.
+	$virtualdiffersfromphysical = 1; // According to increase/decrease stock options, virtual and physical stock may differs.
 }
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
@@ -99,16 +99,16 @@ $hookmanager->initHooks(array('productreassortlist'));
 
 if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
 {
-    $sref = "";
-    $snom = "";
-    $sall = "";
+	$sref = "";
+	$snom = "";
+	$sall = "";
 	$tosell = "";
 	$tobuy = "";
-    $search_sale = "";
-    $search_categ = "";
-    $type = "";
-    $catid = '';
-    $toolowstock = '';
+	$search_sale = "";
+	$search_categ = "";
+	$type = "";
+	$catid = '';
+	$toolowstock = '';
 	$fourn_id = '';
 	$sbarcode = '';
 }
@@ -131,7 +131,7 @@ $sql .= ' SUM(s.reel) as stock_physique';
 if (!empty($conf->global->PRODUCT_USE_UNITS)) $sql .= ', u.short_label as unit_short';
 // Add fields from hooks
 $parameters = array();
-$reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters);    // Note that $action and $object may have been modified by hook
+$reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters); // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
 $sql .= ' FROM '.MAIN_DB_PREFIX.'product as p';
 $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_stock as s ON p.rowid = s.fk_product';
@@ -145,12 +145,12 @@ if ($sall) $sql .= natural_search(array('p.ref', 'p.label', 'p.description', 'p.
 // if the type is not 1, we show all products (type = 0,2,3)
 if (dol_strlen($type))
 {
-    if ($type == 1)
-    {
-        $sql .= " AND p.fk_product_type = '1'";
-    } else {
-        $sql .= " AND p.fk_product_type <> '1'";
-    }
+	if ($type == 1)
+	{
+		$sql .= " AND p.fk_product_type = '1'";
+	} else {
+		$sql .= " AND p.fk_product_type <> '1'";
+	}
 }
 if ($sref)     $sql .= natural_search('p.ref', $sref);
 if ($search_barcode) $sql .= natural_search('p.barcode', $search_barcode);
@@ -166,7 +166,7 @@ $sql .= " GROUP BY p.rowid, p.ref, p.label, p.barcode, p.price, p.price_ttc, p.p
 $sql .= " p.fk_product_type, p.tms, p.duration, p.tosell, p.tobuy, p.seuil_stock_alerte, p.desiredstock";
 // Add fields from hooks
 $parameters = array();
-$reshook = $hookmanager->executeHooks('printFieldSelect', $parameters);    // Note that $action and $object may have been modified by hook
+$reshook = $hookmanager->executeHooks('printFieldSelect', $parameters); // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
 if ($toolowstock) $sql .= " HAVING SUM(".$db->ifsql('s.reel IS NULL', '0', 's.reel').") < p.seuil_stock_alerte";
 $sql .= $db->order($sortfield, $sortorder);
@@ -175,13 +175,13 @@ $sql .= $db->order($sortfield, $sortorder);
 $nbtotalofrecords = '';
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
-    $result = $db->query($sql);
-    $nbtotalofrecords = $db->num_rows($result);
-    if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
-    {
-    	$page = 0;
-    	$offset = 0;
-    }
+	$result = $db->query($sql);
+	$nbtotalofrecords = $db->num_rows($result);
+	if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+	{
+		$page = 0;
+		$offset = 0;
+	}
 }
 
 $sql .= $db->plimit($limit + 1, $offset);
@@ -229,19 +229,19 @@ if ($resql)
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-    print '<input type="hidden" name="page" value="'.$page.'">';
+	print '<input type="hidden" name="page" value="'.$page.'">';
 	print '<input type="hidden" name="type" value="'.$type.'">';
 
 	print_barre_liste($texte, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'product', 0, '', '', $limit);
 
 	if (!empty($catid))
 	{
-	    print "<div id='ways'>";
-	    $c = new Categorie($db);
-	    $c->fetch($catid);
-	    $ways = $c->print_all_ways(' &gt; ', 'product/reassort.php');
-	    print " &gt; ".$ways[0]."<br>\n";
-	    print "</div><br>";
+		print "<div id='ways'>";
+		$c = new Categorie($db);
+		$c->fetch($catid);
+		$ways = $c->print_all_ways(' &gt; ', 'product/reassort.php');
+		print " &gt; ".$ways[0]."<br>\n";
+		print "</div><br>";
 	}
 
 	// Filter on categories
@@ -258,15 +258,15 @@ if ($resql)
 	$moreforfilter .= $langs->trans("StockTooLow").' <input type="checkbox" name="toolowstock" value="1"'.($toolowstock ? ' checked' : '').'>';
 	$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>';
-    }
+	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>';
+	}
 
 	$param = '';
 	if ($tosell)	$param .= "&tosell=".urlencode($tosell);
@@ -285,7 +285,7 @@ if ($resql)
 	$colspan_warehouse = 1;
 	if (!empty($conf->global->STOCK_DETAIL_ON_WAREHOUSE)) { $colspan_warehouse = $nb_warehouse > 1 ? $nb_warehouse + 1 : 1; }
 
-    print '<div class="div-table-responsive">';
+	print '<div class="div-table-responsive">';
 	print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">';
 
 	// Fields title search
@@ -312,7 +312,7 @@ if ($resql)
 	print '<td class="liste_titre" colspan="'.$colspan_warehouse.'">&nbsp;</td>';
 	print '<td class="liste_titre"></td>';
 	$parameters = array();
-	$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters);    // Note that $action and $object may have been modified by hook
+	$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 	print '<td class="liste_titre maxwidthsearch">';
    	$searchpicto = $form->showFilterAndCheckAddButtons(0);
@@ -331,23 +331,23 @@ if ($resql)
 	// Details per warehouse
 	if (!empty($conf->global->STOCK_DETAIL_ON_WAREHOUSE))	// TODO This should be moved into the selection of fields on page product/list (page product/stock will be removed and replaced with product/list with its own context)
 	{
-	    if ($nb_warehouse > 1) {
-	        foreach ($warehouses_list as &$wh) {
-	            print_liste_field_titre($wh['label'], '', '', '', '', '', '', '', 'right ');
-	        }
-	    }
+		if ($nb_warehouse > 1) {
+			foreach ($warehouses_list as &$wh) {
+				print_liste_field_titre($wh['label'], '', '', '', '', '', '', '', 'right ');
+			}
+		}
 	}
 	if ($virtualdiffersfromphysical) print_liste_field_titre("VirtualStock", $_SERVER["PHP_SELF"], "", $param, "", '', $sortfield, $sortorder, 'right ', 'VirtualStockDesc');
-    // Units
-    if (!empty($conf->global->PRODUCT_USE_UNITS)) {
-        print_liste_field_titre("Unit", $_SERVER["PHP_SELF"], "unit_short", $param, "", 'align="right"', $sortfield, $sortorder);
-    }
+	// Units
+	if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+		print_liste_field_titre("Unit", $_SERVER["PHP_SELF"], "unit_short", $param, "", 'align="right"', $sortfield, $sortorder);
+	}
 	print_liste_field_titre('');
 	print_liste_field_titre("ProductStatusOnSell", $_SERVER["PHP_SELF"], "p.tosell", $param, "", '', $sortfield, $sortorder, 'right ');
 	print_liste_field_titre("ProductStatusOnBuy", $_SERVER["PHP_SELF"], "p.tobuy", $param, "", '', $sortfield, $sortorder, 'right ');
 	// Hook fields
-	$parameters = array('param'=>$param,'sortfield'=>$sortfield,'sortorder'=>$sortorder);
-	$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters);    // Note that $action and $object may have been modified by hook
+	$parameters = array('param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
+	$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 	print_liste_field_titre('');
 	print "</tr>\n";
@@ -381,8 +381,8 @@ if ($resql)
 		print '<td class="right">'.$objp->desiredstock.'</td>';
 		// Real stock
 		print '<td class="right">';
-        if ($objp->seuil_stock_alerte != '' && ($objp->stock_physique < $objp->seuil_stock_alerte)) print img_warning($langs->trans("StockTooLow")).' ';
-        print price2num($objp->stock_physique, 'MS');
+		if ($objp->seuil_stock_alerte != '' && ($objp->stock_physique < $objp->seuil_stock_alerte)) print img_warning($langs->trans("StockTooLow")).' ';
+		print price2num($objp->stock_physique, 'MS');
 		print '</td>';
 
 		// Details per warehouse
@@ -405,19 +405,19 @@ if ($resql)
 			print price2num($product->stock_theorique, 'MS');
 			print '</td>';
 		}
-        // Units
-        if (!empty($conf->global->PRODUCT_USE_UNITS)) {
-            print '<td class="left">'.$objp->unit_short.'</td>';
-        }
+		// Units
+		if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+			print '<td class="left">'.$objp->unit_short.'</td>';
+		}
 		print '<td class="right"><a href="'.DOL_URL_ROOT.'/product/stock/movement_list.php?idproduct='.$product->id.'">'.$langs->trans("Movements").'</a></td>';
 		print '<td class="right nowrap">'.$product->LibStatut($objp->statut, 5, 0).'</td>';
-        print '<td class="right nowrap">'.$product->LibStatut($objp->tobuy, 5, 1).'</td>';
+		print '<td class="right nowrap">'.$product->LibStatut($objp->tobuy, 5, 1).'</td>';
 		// Fields from hook
 		$parameters = array('obj'=>$objp);
-		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters);    // Note that $action and $object may have been modified by hook
+		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
 		print $hookmanager->resPrint;
 		print '<td></td>';
-        print "</tr>\n";
+		print "</tr>\n";
 		$i++;
 	}
 
diff --git a/htdocs/product/reassortlot.php b/htdocs/product/reassortlot.php
index cc37d930280..7949c5441c1 100644
--- a/htdocs/product/reassortlot.php
+++ b/htdocs/product/reassortlot.php
@@ -88,18 +88,18 @@ if (!empty($canvas))
 
 if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
 {
-    $sref = "";
-    $snom = "";
-    $sall = "";
+	$sref = "";
+	$snom = "";
+	$sall = "";
 	$tosell = "";
 	$tobuy = "";
-    $search_sale = "";
-    $search_categ = "";
-    $type = "";
-    $catid = '';
-    $toolowstock = '';
-    $search_batch = '';
-    $search_warehouse = '';
+	$search_sale = "";
+	$search_categ = "";
+	$type = "";
+	$catid = '';
+	$toolowstock = '';
+	$search_batch = '';
+	$search_warehouse = '';
 	$fourn_id = '';
 	$sbarcode = '';
 }
@@ -136,12 +136,12 @@ if ($sall) $sql .= natural_search(array('p.ref', 'p.label', 'p.description', 'p.
 // if the type is not 1, we show all products (type = 0,2,3)
 if (dol_strlen($type))
 {
-    if ($type == 1)
-    {
-        $sql .= " AND p.fk_product_type = '1'";
-    } else {
-        $sql .= " AND p.fk_product_type <> '1'";
-    }
+	if ($type == 1)
+	{
+		$sql .= " AND p.fk_product_type = '1'";
+	} else {
+		$sql .= " AND p.fk_product_type <> '1'";
+	}
 }
 if ($sref)     $sql .= natural_search("p.ref", $sref);
 if ($search_barcode) $sql .= natural_search("p.barcode", $search_barcode);
@@ -168,13 +168,13 @@ $sql .= $db->order($sortfield, $sortorder);
 $nbtotalofrecords = '';
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
-    $result = $db->query($sql);
-    $nbtotalofrecords = $db->num_rows($result);
-    if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
-    {
-    	$page = 0;
-    	$offset = 0;
-    }
+	$result = $db->query($sql);
+	$nbtotalofrecords = $db->num_rows($result);
+	if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+	{
+		$page = 0;
+		$offset = 0;
+	}
 }
 
 $sql .= $db->plimit($limit + 1, $offset);
@@ -252,18 +252,18 @@ if ($resql)
 	}
 	//$moreforfilter.=$langs->trans("StockTooLow").' <input type="checkbox" name="toolowstock" value="1"'.($toolowstock?' checked':'').'>';
 
-    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>';
-    }
+	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="div-table-responsive">';
+	print '<div class="div-table-responsive">';
 	print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">';
 
 	// Fields title search
@@ -291,11 +291,11 @@ if ($resql)
 		print '<td class="liste_titre">&nbsp;</td>';
 	}
 	print '<td class="liste_titre">&nbsp;</td>';
-    print '<td class="liste_titre">&nbsp;</td>';
-    print '<td class="liste_titre maxwidthsearch">';
-    $searchpicto = $form->showFilterAndCheckAddButtons(0);
-    print $searchpicto;
-    print '</td>';
+	print '<td class="liste_titre">&nbsp;</td>';
+	print '<td class="liste_titre maxwidthsearch">';
+	$searchpicto = $form->showFilterAndCheckAddButtons(0);
+	print $searchpicto;
+	print '</td>';
 	print '</tr>';
 
 	//Line for column titles
@@ -349,7 +349,7 @@ if ($resql)
 
 		$product_static->ref = $objp->ref;
 		$product_static->id = $objp->rowid;
-        $product_static->label = $objp->label;
+		$product_static->label = $objp->label;
 		$product_static->type = $objp->fk_product_type;
 		$product_static->entity = $objp->entity;
 		$product_static->status = $objp->tosell;
@@ -396,7 +396,7 @@ if ($resql)
 		print '<td class="nowrap">';
 		if ($objp->fk_entrepot > 0)
 		{
-    		print $warehousetmp->getNomUrl(1);
+			print $warehousetmp->getNomUrl(1);
 		}
 		print '</td>';
 
@@ -415,13 +415,13 @@ if ($resql)
 			print '<td class="center">'.dol_print_date($db->jdate($objp->sellby), 'day').'</td>';
 		}
 		print '<td class="right">';
-        //if ($objp->seuil_stock_alerte && ($objp->stock_physique < $objp->seuil_stock_alerte)) print img_warning($langs->trans("StockTooLow")).' ';
+		//if ($objp->seuil_stock_alerte && ($objp->stock_physique < $objp->seuil_stock_alerte)) print img_warning($langs->trans("StockTooLow")).' ';
 		print $objp->stock_physique;
 		print '</td>';
 		print '<td class="right"><a href="'.DOL_URL_ROOT.'/product/stock/movement_list.php?idproduct='.$product_static->id.'&search_warehouse='.$objp->fk_entrepot.'&search_batch='.($objp->batch != 'Undefined' ? $objp->batch : 'Undefined').'">'.$langs->trans("Movements").'</a></td>';
 		print '<td class="right nowrap">'.$product_static->LibStatut($objp->statut, 5, 0).'</td>';
-        print '<td class="right nowrap">'.$product_static->LibStatut($objp->tobuy, 5, 1).'</td>';
-        print '<td></td>';
+		print '<td class="right nowrap">'.$product_static->LibStatut($objp->tobuy, 5, 1).'</td>';
+		print '<td></td>';
 		print "</tr>\n";
 		$i++;
 	}
diff --git a/htdocs/product/stats/bom.php b/htdocs/product/stats/bom.php
index 6f8ebf3ef58..1582646cd8a 100644
--- a/htdocs/product/stats/bom.php
+++ b/htdocs/product/stats/bom.php
@@ -87,36 +87,36 @@ if ($id > 0 || !empty($ref))
 		print dol_get_fiche_head($head, 'referers', $titre, -1, $picto);
 
 		$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $product, $action); // Note that $action and $object may have been modified by hook
-        print $hookmanager->resPrint;
+		print $hookmanager->resPrint;
 		if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-        $linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+		$linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-        $shownav = 1;
-        if ($user->socid && !in_array('product', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav = 0;
+		$shownav = 1;
+		if ($user->socid && !in_array('product', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav = 0;
 
-        dol_banner_tab($object, 'ref', $linkback, $shownav, 'ref');
+		dol_banner_tab($object, 'ref', $linkback, $shownav, 'ref');
 
-        print '<div class="fichecenter">';
+		print '<div class="fichecenter">';
 
-        print '<div class="underbanner clearboth"></div>';
-        print '<table class="border tableforfield" width="100%">';
+		print '<div class="underbanner clearboth"></div>';
+		print '<table class="border tableforfield" width="100%">';
 
-        $nboflines = show_stats_for_company($product, $socid);
+		$nboflines = show_stats_for_company($product, $socid);
 
 		print "</table>";
 
-        print '</div>';
-        print '<div style="clear:both"></div>';
+		print '</div>';
+		print '<div style="clear:both"></div>';
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 		$now = dol_now();
 
 		//Calcul total qty and amount for global if full scan list
 		$total_qty_toconsume = 0;
 		$total_qty_toproduce = 0;
-		$bom_data_result=array();
+		$bom_data_result = array();
 
 
 		//Qauntity  to produce
@@ -155,14 +155,14 @@ if ($id > 0 || !empty($ref))
 					$bomtmp->id = $objp->rowid;
 					$bomtmp->ref = $objp->ref;
 					$bom_data_result[$objp->rowid]['link'] = $bomtmp->getNomUrl(1, 'production');
-					$bom_data_result[$objp->rowid]['qty_toproduce']+=($objp->qty_toproduce > 0 ? $objp->qty_toproduce : 0);
-					$bom_data_result[$objp->rowid]['qty_toconsume']=0;
-					$bom_data_result[$objp->rowid]['date_valid']=dol_print_date($db->jdate($objp->date_valid), 'dayhour');
-					$bom_data_result[$objp->rowid]['status']=$bomtmp->LibStatut($objp->status, 5);
+					$bom_data_result[$objp->rowid]['qty_toproduce'] += ($objp->qty_toproduce > 0 ? $objp->qty_toproduce : 0);
+					$bom_data_result[$objp->rowid]['qty_toconsume'] = 0;
+					$bom_data_result[$objp->rowid]['date_valid'] = dol_print_date($db->jdate($objp->date_valid), 'dayhour');
+					$bom_data_result[$objp->rowid]['status'] = $bomtmp->LibStatut($objp->status, 5);
 					$i++;
 				}
 			}
-		}else {
+		} else {
 			dol_print_error($db);
 		}
 		$db->free($result);
@@ -207,17 +207,17 @@ if ($id > 0 || !empty($ref))
 
 					if (!array_key_exists($objp->rowid, $bom_data_result)) {
 						$bom_data_result[$objp->rowid]['link'] = $bomtmp->getNomUrl(1, 'production');
-						$bom_data_result[$objp->rowid]['qty_toproduce']=0;
-						$bom_data_result[$objp->rowid]['qty_toconsume']+=($objp->qty_toconsume > 0 ? $objp->qty_toconsume : 0);
-						$bom_data_result[$objp->rowid]['date_valid']=dol_print_date($db->jdate($objp->date_valid), 'dayhour');
-						$bom_data_result[$objp->rowid]['status']=$bomtmp->LibStatut($objp->status, 5);
+						$bom_data_result[$objp->rowid]['qty_toproduce'] = 0;
+						$bom_data_result[$objp->rowid]['qty_toconsume'] += ($objp->qty_toconsume > 0 ? $objp->qty_toconsume : 0);
+						$bom_data_result[$objp->rowid]['date_valid'] = dol_print_date($db->jdate($objp->date_valid), 'dayhour');
+						$bom_data_result[$objp->rowid]['status'] = $bomtmp->LibStatut($objp->status, 5);
 					} else {
-						$bom_data_result[$objp->rowid]['qty_toconsume']+=($objp->qty_toconsume > 0 ? $objp->qty_toconsume : 0);
+						$bom_data_result[$objp->rowid]['qty_toconsume'] += ($objp->qty_toconsume > 0 ? $objp->qty_toconsume : 0);
 					}
 					$i++;
 				}
 			}
-		}else {
+		} else {
 			dol_print_error($db);
 		}
 		$db->free($result);
diff --git a/htdocs/product/stats/card.php b/htdocs/product/stats/card.php
index 92c252db3e3..e899cee797f 100644
--- a/htdocs/product/stats/card.php
+++ b/htdocs/product/stats/card.php
@@ -79,31 +79,31 @@ $htmlother = new FormOther($db);
 $object = new Product($db);
 
 if (!$id && empty($ref)) {
-    llxHeader("", $langs->trans("ProductStatistics"));
+	llxHeader("", $langs->trans("ProductStatistics"));
 
-    $type = GETPOST('type', 'int');
+	$type = GETPOST('type', 'int');
 
    	$helpurl = '';
-    if ($type == '0') {
-        $helpurl = 'EN:Module_Products|FR:Module_Produits|ES:M&oacute;dulo_Productos';
-        //$title=$langs->trans("StatisticsOfProducts");
-        $title = $langs->trans("Statistics");
-    } elseif ($type == '1') {
-        $helpurl = 'EN:Module_Services_En|FR:Module_Services|ES:M&oacute;dulo_Servicios';
-        //$title=$langs->trans("StatisticsOfServices");
-        $title = $langs->trans("Statistics");
-    } else {
-        $helpurl = 'EN:Module_Services_En|FR:Module_Services|ES:M&oacute;dulo_Servicios';
-        //$title=$langs->trans("StatisticsOfProductsOrServices");
-        $title = $langs->trans("Statistics");
-    }
+	if ($type == '0') {
+		$helpurl = 'EN:Module_Products|FR:Module_Produits|ES:M&oacute;dulo_Productos';
+		//$title=$langs->trans("StatisticsOfProducts");
+		$title = $langs->trans("Statistics");
+	} elseif ($type == '1') {
+		$helpurl = 'EN:Module_Services_En|FR:Module_Services|ES:M&oacute;dulo_Servicios';
+		//$title=$langs->trans("StatisticsOfServices");
+		$title = $langs->trans("Statistics");
+	} else {
+		$helpurl = 'EN:Module_Services_En|FR:Module_Services|ES:M&oacute;dulo_Servicios';
+		//$title=$langs->trans("StatisticsOfProductsOrServices");
+		$title = $langs->trans("Statistics");
+	}
 
-    $picto = 'product';
-    if ($type == 1) $picto = 'service';
+	$picto = 'product';
+	if ($type == 1) $picto = 'service';
 
-    print load_fiche_titre($title, $mesg, $picto);
+	print load_fiche_titre($title, $mesg, $picto);
 } else {
-    $result = $object->fetch($id, $ref);
+	$result = $object->fetch($id, $ref);
 
 	$title = $langs->trans('ProductServiceCard');
 	$helpurl = '';
@@ -130,45 +130,46 @@ if ($result && (!empty($id) || !empty($ref))) {
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-    dol_banner_tab($object, 'ref', $linkback, ($user->socid ? 0 : 1), 'ref', '', '', '', 0, '', '', 1);
+	dol_banner_tab($object, 'ref', $linkback, ($user->socid ? 0 : 1), 'ref', '', '', '', 0, '', '', 1);
 
-    dol_fiche_end();
+	print dol_get_fiche_end();
 }
 if (empty($id) && empty($ref)) {
-    $h = 0;
-    $head = array();
+	$h = 0;
+	$head = array();
 
-    $head[$h][0] = DOL_URL_ROOT.'/product/stats/card.php'.($type != '' ? '?type='.$type : '');
-    $head[$h][1] = $langs->trans("Chart");
-    $head[$h][2] = 'chart';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT.'/product/stats/card.php'.($type != '' ? '?type='.$type : '');
+	$head[$h][1] = $langs->trans("Chart");
+	$head[$h][2] = 'chart';
+	$h++;
 
 	$title = $langs->trans("ListProductServiceByPopularity");
-    if ((string) $type == '1') {
-    	$title = $langs->trans("ListServiceByPopularity");
-    }
-    if ((string) $type == '0') {
-    	$title = $langs->trans("ListProductByPopularity");
-    }
+	if ((string) $type == '1') {
+		$title = $langs->trans("ListServiceByPopularity");
+	}
+	if ((string) $type == '0') {
+		$title = $langs->trans("ListProductByPopularity");
+	}
 
-    $head[$h][0] = DOL_URL_ROOT.'/product/popuprop.php'.($type != '' ? '?type='.$type : '');
-    $head[$h][1] = $langs->trans("ProductsPerPopularity");
-    $head[$h][2] = 'popularity';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT.'/product/popuprop.php'.($type != '' ? '?type='.$type : '');
+	$head[$h][1] = $langs->trans("ProductsPerPopularity");
+	$head[$h][2] = 'popularity';
+	$h++;
 
-    print dol_get_fiche_head($head, 'chart', $langs->trans("Statistics"), -1);
+	print dol_get_fiche_head($head, 'chart', $langs->trans("Statistics"), -1);
 }
 
 
 if ($result || empty($id)) {
-    print '<form name="stats" method="POST" action="'.$_SERVER["PHP_SELF"].'">';
-    print '<input type="hidden" name="id" value="'.$id.'">';
+	print '<form name="stats" method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="id" value="'.$id.'">';
 
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre"><td class="liste_titre" colspan="2">'.$langs->trans("Filter").'</td></tr>';
 
 	if (empty($id)) {
-    	// Type
+		// Type
 		print '<tr><td class="titlefield">'.$langs->trans("ProductsAndServices").'</td><td>';
 		$array = array('-1'=>'&nbsp;', '0'=>$langs->trans('Product'), '1'=>$langs->trans('Service'));
 		print $form->selectarray('type', $array, $type);
@@ -176,25 +177,26 @@ if ($result || empty($id)) {
 
 		// Tag
 		if ($conf->categorie->enabled) {
-    		print '<tr><td class="titlefield">'.$langs->trans("Categories").'</td><td>';
-    		//$moreforfilter.='<div class="divsearchfield">';
-    		$moreforfilter .= $htmlother->select_categories(Categorie::TYPE_PRODUCT, $search_categ, 'search_categ', 1);
-    		//$moreforfilter.='</div>';
-    		print $moreforfilter;
-    		print '</td></tr>';
+			print '<tr><td class="titlefield">'.$langs->trans("Categories").'</td><td>';
+			//$moreforfilter.='<div class="divsearchfield">';
+			$moreforfilter .= $htmlother->select_categories(Categorie::TYPE_PRODUCT, $search_categ, 'search_categ', 1);
+			//$moreforfilter.='</div>';
+			print $moreforfilter;
+			print '</td></tr>';
 		}
 	}
 
 	// Year
 	print '<tr><td class="titlefield">'.$langs->trans("Year").'</td><td>';
 	$arrayyears = array();
-	for ($year = $currentyear - 10; $year < $currentyear + 10; $year++) {
-	    $arrayyears[$year] = $year;
+	for ($year = $currentyear - 25; $year < $currentyear; $year++)
+	{
+		$arrayyears[$year] = $year;
 	}
 	if (!in_array($year, $arrayyears)) $arrayyears[$year] = $year;
-	if (!in_array($nowyear, $arrayyears)) $arrayyears[$nowyear] = $nowyear;
+	if (!in_array($currentyear, $arrayyears)) $arrayyears[$currentyear] = $currentyear;
 	arsort($arrayyears);
-	print $form->selectarray('search_year', $arrayyears, $search_year, 0);
+	print $form->selectarray('search_year', $arrayyears, $search_year, 1);
 	print '</td></tr>';
 	print '</table>';
 	print '<div class="center"><input type="submit" name="submit" class="button" value="'.$langs->trans("Refresh").'"></div>';
@@ -240,49 +242,49 @@ if ($result || empty($id)) {
 
 	if ($conf->propal->enabled) {
 		$graphfiles['propal'] = array('modulepart'=>'productstats_proposals',
-		'file' => $object->id.'/propal12m'.((string) $type != '' ? '_type'.$type : '').'_'.$mode.($search_year ? '_year'.$search_year : '').'.png',
+		'file' => $object->id.'/propal12m'.((string) $type != '' ? '_type'.$type : '').'_'.$mode.($search_year > 0 ? '_year'.$search_year : '').'.png',
 		'label' => ($mode == 'byunit' ? $langs->transnoentitiesnoconv("NumberOfUnitsProposals") : $langs->transnoentitiesnoconv("NumberOfProposals")));
 	}
 
 	if ($conf->supplier_proposal->enabled) {
 		$graphfiles['proposalssuppliers'] = array('modulepart'=>'productstats_proposalssuppliers',
-		'file' => $object->id.'/proposalssuppliers12m'.((string) $type != '' ? '_type'.$type : '').'_'.$mode.($search_year ? '_year'.$search_year : '').'.png',
+		'file' => $object->id.'/proposalssuppliers12m'.((string) $type != '' ? '_type'.$type : '').'_'.$mode.($search_year > 0 ? '_year'.$search_year : '').'.png',
 		'label' => ($mode == 'byunit' ? $langs->transnoentitiesnoconv("NumberOfUnitsSupplierProposals") : $langs->transnoentitiesnoconv("NumberOfSupplierProposals")));
 	}
 
 	if ($conf->order->enabled) {
 		$graphfiles['orders'] = array('modulepart'=>'productstats_orders',
-		'file' => $object->id.'/orders12m'.((string) $type != '' ? '_type'.$type : '').'_'.$mode.($search_year ? '_year'.$search_year : '').'.png',
+		'file' => $object->id.'/orders12m'.((string) $type != '' ? '_type'.$type : '').'_'.$mode.($search_year > 0 ? '_year'.$search_year : '').'.png',
 		'label' => ($mode == 'byunit' ? $langs->transnoentitiesnoconv("NumberOfUnitsCustomerOrders") : $langs->transnoentitiesnoconv("NumberOfCustomerOrders")));
 	}
 
 	if ($conf->supplier_order->enabled) {
 		$graphfiles['orderssuppliers'] = array('modulepart'=>'productstats_orderssuppliers',
-		'file' => $object->id.'/orderssuppliers12m'.((string) $type != '' ? '_type'.$type : '').'_'.$mode.($search_year ? '_year'.$search_year : '').'.png',
+		'file' => $object->id.'/orderssuppliers12m'.((string) $type != '' ? '_type'.$type : '').'_'.$mode.($search_year > 0 ? '_year'.$search_year : '').'.png',
 		'label' => ($mode == 'byunit' ? $langs->transnoentitiesnoconv("NumberOfUnitsSupplierOrders") : $langs->transnoentitiesnoconv("NumberOfSupplierOrders")));
 	}
 
 	if ($conf->facture->enabled) {
 		$graphfiles['invoices'] = array('modulepart'=>'productstats_invoices',
-		'file' => $object->id.'/invoices12m'.((string) $type != '' ? '_type'.$type : '').'_'.$mode.($search_year ? '_year'.$search_year : '').'.png',
+		'file' => $object->id.'/invoices12m'.((string) $type != '' ? '_type'.$type : '').'_'.$mode.($search_year > 0 ? '_year'.$search_year : '').'.png',
 		'label' => ($mode == 'byunit' ? $langs->transnoentitiesnoconv("NumberOfUnitsCustomerInvoices") : $langs->transnoentitiesnoconv("NumberOfCustomerInvoices")));
 	}
 
 	if ($conf->supplier_invoice->enabled) {
 		$graphfiles['invoicessuppliers'] = array('modulepart'=>'productstats_invoicessuppliers',
-		'file' => $object->id.'/invoicessuppliers12m'.((string) $type != '' ? '_type'.$type : '').'_'.$mode.($search_year ? '_year'.$search_year : '').'.png',
+		'file' => $object->id.'/invoicessuppliers12m'.((string) $type != '' ? '_type'.$type : '').'_'.$mode.($search_year > 0 ? '_year'.$search_year : '').'.png',
 		'label' => ($mode == 'byunit' ? $langs->transnoentitiesnoconv("NumberOfUnitsSupplierInvoices") : $langs->transnoentitiesnoconv("NumberOfSupplierInvoices")));
 	}
 
 	if ($conf->contrat->enabled) {
 		$graphfiles['contracts'] = array('modulepart'=>'productstats_contracts',
-			'file' => $object->id.'/contracts12m'.((string) $type != '' ? '_type'.$type : '').'_'.$mode.($search_year ? '_year'.$search_year : '').'.png',
+			'file' => $object->id.'/contracts12m'.((string) $type != '' ? '_type'.$type : '').'_'.$mode.($search_year > 0 ? '_year'.$search_year : '').'.png',
 			'label' => ($mode == 'byunit' ? $langs->transnoentitiesnoconv("NumberOfUnitsContracts") : $langs->transnoentitiesnoconv("NumberOfContracts")));
 	}
 
 	if ($conf->mrp->enabled) {
 		$graphfiles['mrp'] = array('modulepart'=>'productstats_mrp',
-			'file' => $object->id.'/mos12m'.((string) $type != '' ? '_type'.$type : '').'_'.$mode.($search_year ? '_year'.$search_year : '').'.png',
+			'file' => $object->id.'/mos12m'.((string) $type != '' ? '_type'.$type : '').'_'.$mode.($search_year > 0 ? '_year'.$search_year : '').'.png',
 			'label' => ($mode == 'byunit' ? $langs->transnoentitiesnoconv("NumberOfUnitsMos") : $langs->transnoentitiesnoconv("NumberOfMos")));
 	}
 
@@ -299,16 +301,16 @@ if ($result || empty($id)) {
 				if (dol_is_file($dir.'/'.$graphfiles[$key]['file'])) {
 					// TODO Load cachefile $graphfiles[$key]['file']
 				} else {
-				    $morefilters = '';
-				    if ($search_categ > 0) {
-				        $categ = new Categorie($db);
-				        $categ->fetch($search_categ);
-				        $listofprodids = $categ->getObjectsInCateg('product', 1);
-				        $morefilters = ' AND d.fk_product IN ('.((is_array($listofprodids) && count($listofprodids)) ? join(',', $listofprodids) : '0').')';
-				    }
-				    if ($search_categ == -2) {
-				        $morefilters = ' AND d.fk_product NOT IN (SELECT cp.fk_product from '.MAIN_DB_PREFIX.'categorie_product as cp)';
-				    }
+					$morefilters = '';
+					if ($search_categ > 0) {
+						$categ = new Categorie($db);
+						$categ->fetch($search_categ);
+						$listofprodids = $categ->getObjectsInCateg('product', 1);
+						$morefilters = ' AND d.fk_product IN ('.((is_array($listofprodids) && count($listofprodids)) ? join(',', $listofprodids) : '0').')';
+					}
+					if ($search_categ == -2) {
+						$morefilters = ' AND d.fk_product NOT IN (SELECT cp.fk_product from '.MAIN_DB_PREFIX.'categorie_product as cp)';
+					}
 
 					if ($key == 'propal')             $graph_data = $object->get_nb_propal($socid, $mode, ((string) $type != '' ? $type : -1), $search_year, $morefilters);
 					if ($key == 'orders')             $graph_data = $object->get_nb_order($socid, $mode, ((string) $type != '' ? $type : -1), $search_year, $morefilters);
@@ -371,10 +373,10 @@ if ($result || empty($id)) {
 
 			// Date generation
 			if ($graphfiles[$key]['output'] && !$px->isGraphKo()) {
-			    if (file_exists($dir."/".$graphfiles[$key]['file']) && filemtime($dir."/".$graphfiles[$key]['file'])) $dategenerated = $langs->trans("GeneratedOn", dol_print_date(filemtime($dir."/".$graphfiles[$key]['file']), "dayhour"));
-			    else $dategenerated = $langs->trans("GeneratedOn", dol_print_date(dol_now(), "dayhour"));
+				if (file_exists($dir."/".$graphfiles[$key]['file']) && filemtime($dir."/".$graphfiles[$key]['file'])) $dategenerated = $langs->trans("GeneratedOn", dol_print_date(filemtime($dir."/".$graphfiles[$key]['file']), "dayhour"));
+				else $dategenerated = $langs->trans("GeneratedOn", dol_print_date(dol_now(), "dayhour"));
 			} else {
-			    $dategenerated = ($mesg ? '<font class="error">'.$mesg.'</font>' : $langs->trans("ChartNotGenerated"));
+				$dategenerated = ($mesg ? '<font class="error">'.$mesg.'</font>' : $langs->trans("ChartNotGenerated"));
 			}
 			$linktoregenerate = '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.(GETPOST('id') ?GETPOST('id') : $object->id).((string) $type != '' ? '&type='.$type : '').'&action=recalcul&mode='.$mode.'&search_year='.$search_year.'&search_categ='.$search_categ.'">'.img_picto($langs->trans("ReCalculate").' ('.$dategenerated.')', 'refresh').'</a>';
 
@@ -411,7 +413,7 @@ if ($result || empty($id)) {
 }
 
 if (!$id) {
-    dol_fiche_end();
+	print dol_get_fiche_end();
 }
 
 // End of page
diff --git a/htdocs/product/stats/commande.php b/htdocs/product/stats/commande.php
index 13002ea8d55..4bedbd3d2ba 100644
--- a/htdocs/product/stats/commande.php
+++ b/htdocs/product/stats/commande.php
@@ -59,7 +59,7 @@ $pageprev = $page - 1;
 $pagenext = $page + 1;
 if (!$sortorder) $sortorder = "DESC";
 if (!$sortfield) $sortfield = "c.date_commande";
-$search_month = GETPOST('search_month', 'alpha');
+$search_month = GETPOST('search_month', 'int');
 $search_year = GETPOST('search_year', 'int');
 
 if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter', 'alpha')) {
@@ -98,29 +98,29 @@ if ($id > 0 || !empty($ref))
 		print dol_get_fiche_head($head, 'referers', $titre, -1, $picto);
 
 		$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $product, $action); // Note that $action and $object may have been modified by hook
-        print $hookmanager->resPrint;
+		print $hookmanager->resPrint;
 		if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-        $linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+		$linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-        $shownav = 1;
-        if ($user->socid && !in_array('product', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav = 0;
+		$shownav = 1;
+		if ($user->socid && !in_array('product', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav = 0;
 
-        dol_banner_tab($object, 'ref', $linkback, $shownav, 'ref');
+		dol_banner_tab($object, 'ref', $linkback, $shownav, 'ref');
 
-        print '<div class="fichecenter">';
+		print '<div class="fichecenter">';
 
-        print '<div class="underbanner clearboth"></div>';
-        print '<table class="border tableforfield" width="100%">';
+		print '<div class="underbanner clearboth"></div>';
+		print '<table class="border tableforfield" width="100%">';
 
-        $nboflines = show_stats_for_company($product, $socid);
+		$nboflines = show_stats_for_company($product, $socid);
 
 		print "</table>";
 
-        print '</div>';
-        print '<div style="clear:both"></div>';
+		print '</div>';
+		print '<div style="clear:both"></div>';
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 
 		if ($user->rights->commande->lire)
@@ -137,27 +137,27 @@ if ($id > 0 || !empty($ref))
 			$sql .= " AND c.entity IN (".getEntity('commande').")";
 			$sql .= " AND d.fk_commande = c.rowid";
 			$sql .= " AND d.fk_product =".$product->id;
-	            if (!empty($search_month))
-	            	$sql .= ' AND MONTH(c.date_commande) IN ('.$search_month.')';
-	            if (!empty($search_year))
-	            	$sql .= ' AND YEAR(c.date_commande) IN ('.$search_year.')';
+				if (!empty($search_month))
+					$sql .= ' AND MONTH(c.date_commande) IN ('.$search_month.')';
+				if (!empty($search_year))
+					$sql .= ' AND YEAR(c.date_commande) IN ('.$search_year.')';
 			if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
 			if ($socid) $sql .= " AND c.fk_soc = ".$socid;
 			$sql .= $db->order($sortfield, $sortorder);
 
-	        //Calcul total qty and amount for global if full scan list
-	        $total_ht = 0;
-	        $total_qty = 0;
+			//Calcul total qty and amount for global if full scan list
+			$total_ht = 0;
+			$total_qty = 0;
 
-	        // Count total nb of records
-	        $totalofrecords = '';
-	        if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
-	        {
-	        	$result = $db->query($sql);
-	        	$totalofrecords = $db->num_rows($result);
-	        }
+			// Count total nb of records
+			$totalofrecords = '';
+			if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
+			{
+				$result = $db->query($sql);
+				$totalofrecords = $db->num_rows($result);
+			}
 
-	        $sql .= $db->plimit($limit + 1, $offset);
+			$sql .= $db->plimit($limit + 1, $offset);
 
 			$result = $db->query($sql);
 			if ($result)
@@ -169,30 +169,30 @@ if ($id > 0 || !empty($ref))
 				if (!empty($search_month)) $option .= '&search_month='.urlencode($search_month);
 				if (!empty($search_year)) $option .= '&search_year='.urlencode($search_year);
 
-	            print '<form method="post" action="'.$_SERVER ['PHP_SELF'].'?id='.$product->id.'" name="search_form">'."\n";
-	            if (!empty($sortfield))
-	            	print '<input type="hidden" name="sortfield" value="'.$sortfield.'"/>';
-	            if (!empty($sortorder))
-	            	print '<input type="hidden" name="sortorder" value="'.$sortorder.'"/>';
+				print '<form method="post" action="'.$_SERVER ['PHP_SELF'].'?id='.$product->id.'" name="search_form">'."\n";
+				if (!empty($sortfield))
+					print '<input type="hidden" name="sortfield" value="'.$sortfield.'"/>';
+				if (!empty($sortorder))
+					print '<input type="hidden" name="sortorder" value="'.$sortorder.'"/>';
 
-	            print_barre_liste($langs->trans("CustomersOrders"), $page, $_SERVER["PHP_SELF"], $option, $sortfield, $sortorder, '', $num, $totalofrecords, '', 0, '', '', $limit, 0, 0, 1);
+				print_barre_liste($langs->trans("CustomersOrders"), $page, $_SERVER["PHP_SELF"], $option, $sortfield, $sortorder, '', $num, $totalofrecords, '', 0, '', '', $limit, 0, 0, 1);
 
-	            if (!empty($page)) $option .= '&page='.urlencode($page);
+				if (!empty($page)) $option .= '&page='.urlencode($page);
 
-	            print '<div class="liste_titre liste_titre_bydiv centpercent">';
-                print '<div class="divsearchfield">';
-			    print $langs->trans('Period').' ('.$langs->trans("OrderDate").') - ';
+				print '<div class="liste_titre liste_titre_bydiv centpercent">';
+				print '<div class="divsearchfield">';
+				print $langs->trans('Period').' ('.$langs->trans("OrderDate").') - ';
 				print $langs->trans('Month').':<input class="flat" type="text" size="4" name="search_month" value="'.$search_month.'"> ';
 				print $langs->trans('Year').':'.$formother->selectyear($search_year ? $search_year : - 1, 'search_year', 1, 20, 5);
 				print '<div style="vertical-align: middle; display: inline-block">';
 				print '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"), 'search.png', '', '', 1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
 				print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"), 'searchclear.png', '', '', 1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
-			    print '</div>';
+				print '</div>';
 				print '</div>';
 				print '</div>';
 
 				$i = 0;
-                print '<div class="div-table-responsive">';
+				print '<div class="div-table-responsive">';
 				print '<table class="tagtable liste listwithfilterbefore" width="100%">';
 				print '<tr class="liste_titre">';
 				print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "c.rowid", "", $option, '', $sortfield, $sortorder);
@@ -220,30 +220,30 @@ if ($id > 0 || !empty($ref))
 
 						print '<tr class="oddeven">';
 	 					print '<td>';
-	                    print $orderstatic->getNomUrl(1);
-	                    print "</td>\n";
-	                    print '<td>'.$societestatic->getNomUrl(1).'</td>';
-	                    print "<td>".$objp->code_client."</td>\n";
+						print $orderstatic->getNomUrl(1);
+						print "</td>\n";
+						print '<td>'.$societestatic->getNomUrl(1).'</td>';
+						print "<td>".$objp->code_client."</td>\n";
 						print '<td class="center">';
 						print dol_print_date($db->jdate($objp->date_commande), 'dayhour')."</td>";
 						print  '<td class="center">'.$objp->qty."</td>\n";
-	                    print '<td align="right">'.price($objp->total_ht)."</td>\n";
+						print '<td align="right">'.price($objp->total_ht)."</td>\n";
 						print '<td align="right">'.$orderstatic->LibStatut($objp->statut, $objp->facture, 5).'</td>';
 						print "</tr>\n";
 						$i++;
 					}
 				}
-                print '<tr class="liste_total">';
-                if ($num < $limit) print '<td class="left">'.$langs->trans("Total").'</td>';
-                else print '<td class="left">'.$langs->trans("Totalforthispage").'</td>';
-                print '<td colspan="3"></td>';
-                print '<td class="center">'.$total_qty.'</td>';
-                print '<td align="right">'.price($total_ht).'</td>';
-                print '<td></td>';
-                print "</table>";
-                print "</div>";
-                print '</form>';
-            } else {
+				print '<tr class="liste_total">';
+				if ($num < $limit) print '<td class="left">'.$langs->trans("Total").'</td>';
+				else print '<td class="left">'.$langs->trans("Totalforthispage").'</td>';
+				print '<td colspan="3"></td>';
+				print '<td class="center">'.$total_qty.'</td>';
+				print '<td align="right">'.price($total_ht).'</td>';
+				print '<td></td>';
+				print "</table>";
+				print "</div>";
+				print '</form>';
+			} else {
 				dol_print_error($db);
 			}
 			$db->free($result);
diff --git a/htdocs/product/stats/commande_fournisseur.php b/htdocs/product/stats/commande_fournisseur.php
index c16485f1c35..611047f7f13 100644
--- a/htdocs/product/stats/commande_fournisseur.php
+++ b/htdocs/product/stats/commande_fournisseur.php
@@ -61,7 +61,7 @@ if (!$sortorder)
 	$sortorder = "DESC";
 if (!$sortfield)
 	$sortfield = "c.date_commande";
-$search_month = GETPOST('search_month', 'alpha');
+$search_month = GETPOST('search_month', 'int');
 $search_year = GETPOST('search_year', 'int');
 
 if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter', 'alpha')) {
@@ -101,29 +101,29 @@ if ($id > 0 || !empty($ref)) {
 		print dol_get_fiche_head($head, 'referers', $titre, -1, $picto);
 
 		$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $product, $action); // Note that $action and $object may have been modified by hook
-        print $hookmanager->resPrint;
+		print $hookmanager->resPrint;
 		if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
 		$linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-        $shownav = 1;
-        if ($user->socid && !in_array('product', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav = 0;
+		$shownav = 1;
+		if ($user->socid && !in_array('product', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav = 0;
 
 		dol_banner_tab($object, 'ref', $linkback, $shownav, 'ref');
 
-        print '<div class="fichecenter">';
+		print '<div class="fichecenter">';
 
-        print '<div class="underbanner clearboth"></div>';
-        print '<table class="border tableforfield" width="100%">';
+		print '<div class="underbanner clearboth"></div>';
+		print '<table class="border tableforfield" width="100%">';
 
-        $nboflines = show_stats_for_company($product, $socid);
+		$nboflines = show_stats_for_company($product, $socid);
 
 		print "</table>";
 
-        print '</div>';
-        print '<div style="clear:both"></div>';
+		print '</div>';
+		print '<div style="clear:both"></div>';
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 
 		if ($user->rights->fournisseur->commande->lire)
@@ -186,7 +186,7 @@ if ($id > 0 || !empty($ref)) {
 				if (!empty($page)) $option .= '&page='.urlencode($page);
 
 				print '<div class="liste_titre liste_titre_bydiv centpercent">';
-                print '<div class="divsearchfield">';
+				print '<div class="divsearchfield">';
 				print $langs->trans('Period').' ('.$langs->trans("OrderDate").') - ';
 				print $langs->trans('Month').':<input class="flat" type="text" size="4" name="search_month" value="'.$search_month.'"> ';
 				print $langs->trans('Year').':'.$formother->selectyear($search_year ? $search_year : - 1, 'search_year', 1, 20, 5);
@@ -198,7 +198,7 @@ if ($id > 0 || !empty($ref)) {
 				print '</div>';
 
 				$i = 0;
-                print '<div class="div-table-responsive">';
+				print '<div class="div-table-responsive">';
 				print '<table class="tagtable liste listwithfilterbefore" width="100%">';
 				print '<tr class="liste_titre">';
 				print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "c.rowid", "", $option, '', $sortfield, $sortorder);
diff --git a/htdocs/product/stats/contrat.php b/htdocs/product/stats/contrat.php
index 711e66e55bc..91ca0bd87e2 100644
--- a/htdocs/product/stats/contrat.php
+++ b/htdocs/product/stats/contrat.php
@@ -88,29 +88,29 @@ if ($id > 0 || !empty($ref))
 		print dol_get_fiche_head($head, 'referers', $titre, -1, $picto);
 
 		$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $product, $action); // Note that $action and $object may have been modified by hook
-        print $hookmanager->resPrint;
+		print $hookmanager->resPrint;
 		if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-        $linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+		$linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-        $shownav = 1;
-        if ($user->socid && !in_array('product', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav = 0;
+		$shownav = 1;
+		if ($user->socid && !in_array('product', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav = 0;
 
-        dol_banner_tab($object, 'ref', $linkback, $shownav, 'ref');
+		dol_banner_tab($object, 'ref', $linkback, $shownav, 'ref');
 
-        print '<div class="fichecenter">';
+		print '<div class="fichecenter">';
 
-        print '<div class="underbanner clearboth"></div>';
-        print '<table class="border tableforfield" width="100%">';
+		print '<div class="underbanner clearboth"></div>';
+		print '<table class="border tableforfield" width="100%">';
 
-        $nboflines = show_stats_for_company($product, $socid);
+		$nboflines = show_stats_for_company($product, $socid);
 
 		print "</table>";
 
-        print '</div>';
-        print '<div style="clear:both"></div>';
+		print '</div>';
+		print '<div style="clear:both"></div>';
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 
 		$now = dol_now();
@@ -154,24 +154,24 @@ if ($id > 0 || !empty($ref))
 		{
 			$num = $db->num_rows($result);
 
-            if ($limit > 0 && $limit != $conf->liste_limit) $option .= '&limit='.urlencode($limit);
-            if (!empty($id)) $option .= '&id='.$product->id;
-            if (!empty($search_month)) $option .= '&search_month='.urlencode($search_month);
-            if (!empty($search_year)) $option .= '&search_year='.urlencode($search_year);
+			if ($limit > 0 && $limit != $conf->liste_limit) $option .= '&limit='.urlencode($limit);
+			if (!empty($id)) $option .= '&id='.$product->id;
+			if (!empty($search_month)) $option .= '&search_month='.urlencode($search_month);
+			if (!empty($search_year)) $option .= '&search_year='.urlencode($search_year);
 
-            print '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$product->id.'" name="search_form">'."\n";
+			print '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$product->id.'" name="search_form">'."\n";
 
-            if (!empty($sortfield))
-                print '<input type="hidden" name="sortfield" value="'.$sortfield.'"/>';
-            if (!empty($sortorder))
-                print '<input type="hidden" name="sortorder" value="'.$sortorder.'"/>';
+			if (!empty($sortfield))
+				print '<input type="hidden" name="sortfield" value="'.$sortfield.'"/>';
+			if (!empty($sortorder))
+				print '<input type="hidden" name="sortorder" value="'.$sortorder.'"/>';
 
-            print_barre_liste($langs->trans("Contrats"), $page, $_SERVER["PHP_SELF"], $option, $sortfield, $sortorder, '', $num, $totalofrecords, '', 0, '', '', $limit, 0, 0, 1);
+			print_barre_liste($langs->trans("Contrats"), $page, $_SERVER["PHP_SELF"], $option, $sortfield, $sortorder, '', $num, $totalofrecords, '', 0, '', '', $limit, 0, 0, 1);
 
-            if (!empty($page)) $option .= '&page='.urlencode($page);
+			if (!empty($page)) $option .= '&page='.urlencode($page);
 
-            $i = 0;
-            print '<div class="div-table-responsive">';
+			$i = 0;
+			print '<div class="div-table-responsive">';
 			print '<table class="tagtable liste listwithfilterbefore" width="100%">';
 
 			print '<tr class="liste_titre">';
diff --git a/htdocs/product/stats/facture.php b/htdocs/product/stats/facture.php
index 83a4ae85eba..8091de9c320 100644
--- a/htdocs/product/stats/facture.php
+++ b/htdocs/product/stats/facture.php
@@ -61,7 +61,7 @@ $pagenext = $page + 1;
 if (!$sortorder) $sortorder = "DESC";
 if (!$sortfield) $sortfield = "f.datef";
 
-$search_month = GETPOST('search_month', 'alpha');
+$search_month = GETPOST('search_month', 'int');
 $search_year = GETPOST('search_year', 'int');
 
 if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter', 'alpha')) {
@@ -116,160 +116,160 @@ if ($id > 0 || !empty($ref))
 		print dol_get_fiche_head($head, 'referers', $titre, -1, $picto);
 
 		$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $product, $action); // Note that $action and $object may have been modified by hook
-        print $hookmanager->resPrint;
+		print $hookmanager->resPrint;
 		if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-        $linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+		$linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-        $shownav = 1;
-        if ($user->socid && !in_array('product', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav = 0;
+		$shownav = 1;
+		if ($user->socid && !in_array('product', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav = 0;
 
-        dol_banner_tab($object, 'ref', $linkback, $shownav, 'ref');
+		dol_banner_tab($object, 'ref', $linkback, $shownav, 'ref');
 
-        print '<div class="fichecenter">';
+		print '<div class="fichecenter">';
 
-        print '<div class="underbanner clearboth"></div>';
-        print '<table class="border tableforfield" width="100%">';
+		print '<div class="underbanner clearboth"></div>';
+		print '<table class="border tableforfield" width="100%">';
 
 		$nboflines = show_stats_for_company($product, $socid);
 
 		print "</table>";
 
-        print '</div>';
-        print '<div style="clear:both"></div>';
+		print '</div>';
+		print '<div style="clear:both"></div>';
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 		if ($showmessage && $nboflines > 1)
 		{
 			print '<span class="opacitymedium">'.$langs->trans("ClinkOnALinkOfColumn", $langs->transnoentitiesnoconv("Referers")).'</span>';
 		} elseif ($user->rights->facture->lire)
-        {
-            $sql = "SELECT DISTINCT s.nom as name, s.rowid as socid, s.code_client,";
-            $sql .= " f.ref, f.datef, f.paye, f.type, f.fk_statut as statut, f.rowid as facid,";
-            $sql .= " d.rowid, d.total_ht as total_ht, d.qty"; // We must keep the d.rowid here to not loose record because of the distinct used to ignore duplicate line when link on societe_commerciaux is used
-            if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user ";
-            $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
-            $sql .= ", ".MAIN_DB_PREFIX."facture as f";
-            $sql .= ", ".MAIN_DB_PREFIX."facturedet as d";
-            if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-            $sql .= " WHERE f.fk_soc = s.rowid";
-            $sql .= " AND f.entity IN (".getEntity('invoice').")";
-            $sql .= " AND d.fk_facture = f.rowid";
-            $sql .= " AND d.fk_product =".$product->id;
-            if (!empty($search_month))
-            	$sql .= ' AND MONTH(f.datef) IN ('.$search_month.')';
-            if (!empty($search_year))
-            	$sql .= ' AND YEAR(f.datef) IN ('.$search_year.')';
-            if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
-            if ($socid) $sql .= " AND f.fk_soc = ".$socid;
-            $sql .= $db->order($sortfield, $sortorder);
+		{
+			$sql = "SELECT DISTINCT s.nom as name, s.rowid as socid, s.code_client,";
+			$sql .= " f.ref, f.datef, f.paye, f.type, f.fk_statut as statut, f.rowid as facid,";
+			$sql .= " d.rowid, d.total_ht as total_ht, d.qty"; // We must keep the d.rowid here to not loose record because of the distinct used to ignore duplicate line when link on societe_commerciaux is used
+			if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user ";
+			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+			$sql .= ", ".MAIN_DB_PREFIX."facture as f";
+			$sql .= ", ".MAIN_DB_PREFIX."facturedet as d";
+			if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+			$sql .= " WHERE f.fk_soc = s.rowid";
+			$sql .= " AND f.entity IN (".getEntity('invoice').")";
+			$sql .= " AND d.fk_facture = f.rowid";
+			$sql .= " AND d.fk_product =".$product->id;
+			if (!empty($search_month))
+				$sql .= ' AND MONTH(f.datef) IN ('.$search_month.')';
+			if (!empty($search_year))
+				$sql .= ' AND YEAR(f.datef) IN ('.$search_year.')';
+			if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+			if ($socid) $sql .= " AND f.fk_soc = ".$socid;
+			$sql .= $db->order($sortfield, $sortorder);
 
-            // Calcul total qty and amount for global if full scan list
-            $total_ht = 0;
-            $total_qty = 0;
+			// Calcul total qty and amount for global if full scan list
+			$total_ht = 0;
+			$total_qty = 0;
 
-            // Count total nb of records
-            $totalofrecords = '';
-            if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
-            {
-            	$result = $db->query($sql);
-            	$totalofrecords = $db->num_rows($result);
-            }
-
-            $sql .= $db->plimit($limit + 1, $offset);
-
-            $result = $db->query($sql);
-            if ($result)
+			// Count total nb of records
+			$totalofrecords = '';
+			if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 			{
-                $num = $db->num_rows($result);
+				$result = $db->query($sql);
+				$totalofrecords = $db->num_rows($result);
+			}
 
-                if ($limit > 0 && $limit != $conf->liste_limit) $option .= '&limit='.urlencode($limit);
-                if (!empty($id)) $option .= '&id='.$product->id;
-                if (!empty($search_month)) $option .= '&search_month='.urlencode($search_month);
-                if (!empty($search_year)) $option .= '&search_year='.urlencode($search_year);
+			$sql .= $db->plimit($limit + 1, $offset);
 
-                print '<form method="post" action="'.$_SERVER ['PHP_SELF'].'?id='.$product->id.'" name="search_form">'."\n";
-                if (!empty($sortfield))
-                	print '<input type="hidden" name="sortfield" value="'.$sortfield.'"/>';
-                if (!empty($sortorder))
-                	print '<input type="hidden" name="sortorder" value="'.$sortorder.'"/>';
+			$result = $db->query($sql);
+			if ($result)
+			{
+				$num = $db->num_rows($result);
 
-                print_barre_liste($langs->trans("CustomersInvoices"), $page, $_SERVER["PHP_SELF"], $option, $sortfield, $sortorder, '', $num, $totalofrecords, '', 0, '', '', $limit, 0, 0, 1);
+				if ($limit > 0 && $limit != $conf->liste_limit) $option .= '&limit='.urlencode($limit);
+				if (!empty($id)) $option .= '&id='.$product->id;
+				if (!empty($search_month)) $option .= '&search_month='.urlencode($search_month);
+				if (!empty($search_year)) $option .= '&search_year='.urlencode($search_year);
 
-                if (!empty($page)) $option .= '&page='.urlencode($page);
+				print '<form method="post" action="'.$_SERVER ['PHP_SELF'].'?id='.$product->id.'" name="search_form">'."\n";
+				if (!empty($sortfield))
+					print '<input type="hidden" name="sortfield" value="'.$sortfield.'"/>';
+				if (!empty($sortorder))
+					print '<input type="hidden" name="sortorder" value="'.$sortorder.'"/>';
 
-                print '<div class="liste_titre liste_titre_bydiv centpercent">';
-                print '<div class="divsearchfield">';
-                print $langs->trans('Period').' ('.$langs->trans("DateInvoice").') - ';
+				print_barre_liste($langs->trans("CustomersInvoices"), $page, $_SERVER["PHP_SELF"], $option, $sortfield, $sortorder, '', $num, $totalofrecords, '', 0, '', '', $limit, 0, 0, 1);
+
+				if (!empty($page)) $option .= '&page='.urlencode($page);
+
+				print '<div class="liste_titre liste_titre_bydiv centpercent">';
+				print '<div class="divsearchfield">';
+				print $langs->trans('Period').' ('.$langs->trans("DateInvoice").') - ';
 				print $langs->trans('Month').':<input class="flat" type="text" size="4" name="search_month" value="'.$search_month.'"> ';
 				print $langs->trans('Year').':'.$formother->selectyear($search_year ? $search_year : - 1, 'search_year', 1, 20, 5);
 				print '<div style="vertical-align: middle; display: inline-block">';
 				print '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"), 'search.png', '', '', 1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
 				print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"), 'searchclear.png', '', '', 1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
-                print '</div>';
+				print '</div>';
 				print '</div>';
 				print '</div>';
 
-                $i = 0;
-                print '<div class="div-table-responsive">';
-                print '<table class="tagtable liste listwithfilterbefore" width="100%">';
-                print '<tr class="liste_titre">';
-                print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "s.rowid", "", $option, '', $sortfield, $sortorder);
-                print_liste_field_titre("Company", $_SERVER["PHP_SELF"], "s.nom", "", $option, '', $sortfield, $sortorder);
-                print_liste_field_titre("CustomerCode", $_SERVER["PHP_SELF"], "s.code_client", "", $option, '', $sortfield, $sortorder);
-                print_liste_field_titre("DateInvoice", $_SERVER["PHP_SELF"], "f.datef", "", $option, 'align="center"', $sortfield, $sortorder);
-                print_liste_field_titre("Qty", $_SERVER["PHP_SELF"], "d.qty", "", $option, 'align="center"', $sortfield, $sortorder);
-                print_liste_field_titre("AmountHT", $_SERVER["PHP_SELF"], "d.total_ht", "", $option, 'align="right"', $sortfield, $sortorder);
-                print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "f.paye,f.fk_statut", "", $option, 'align="right"', $sortfield, $sortorder);
-                print "</tr>\n";
+				$i = 0;
+				print '<div class="div-table-responsive">';
+				print '<table class="tagtable liste listwithfilterbefore" width="100%">';
+				print '<tr class="liste_titre">';
+				print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "s.rowid", "", $option, '', $sortfield, $sortorder);
+				print_liste_field_titre("Company", $_SERVER["PHP_SELF"], "s.nom", "", $option, '', $sortfield, $sortorder);
+				print_liste_field_titre("CustomerCode", $_SERVER["PHP_SELF"], "s.code_client", "", $option, '', $sortfield, $sortorder);
+				print_liste_field_titre("DateInvoice", $_SERVER["PHP_SELF"], "f.datef", "", $option, 'align="center"', $sortfield, $sortorder);
+				print_liste_field_titre("Qty", $_SERVER["PHP_SELF"], "d.qty", "", $option, 'align="center"', $sortfield, $sortorder);
+				print_liste_field_titre("AmountHT", $_SERVER["PHP_SELF"], "d.total_ht", "", $option, 'align="right"', $sortfield, $sortorder);
+				print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "f.paye,f.fk_statut", "", $option, 'align="right"', $sortfield, $sortorder);
+				print "</tr>\n";
 
-                if ($num > 0)
+				if ($num > 0)
 				{
-                    while ($i < min($num, $limit))
+					while ($i < min($num, $limit))
 					{
-                        $objp = $db->fetch_object($result);
+						$objp = $db->fetch_object($result);
 
 						if ($objp->type == Facture::TYPE_CREDIT_NOTE) $objp->qty = -($objp->qty);
 
 						$total_ht += $objp->total_ht;
-                        $total_qty += $objp->qty;
+						$total_qty += $objp->qty;
 
-                        $invoicestatic->id = $objp->facid;
+						$invoicestatic->id = $objp->facid;
 						$invoicestatic->ref = $objp->ref;
 						$societestatic->fetch($objp->socid);
 						$paiement = $invoicestatic->getSommePaiement();
 
-                        print '<tr class="oddeven">';
-                        print '<td>';
-                        print $invoicestatic->getNomUrl(1);
-                        print "</td>\n";
-                        print '<td>'.$societestatic->getNomUrl(1).'</td>';
-                        print "<td>".$objp->code_client."</td>\n";
-                        print '<td class="center">';
-                        print dol_print_date($db->jdate($objp->datef), 'dayhour')."</td>";
-                        print '<td class="center">'.$objp->qty."</td>\n";
-                        print '<td align="right">'.price($objp->total_ht)."</td>\n";
-                        print '<td align="right">'.$invoicestatic->LibStatut($objp->paye, $objp->statut, 5, $paiement, $objp->type).'</td>';
-                        print "</tr>\n";
-                        $i++;
-                    }
-                }
-                print '<tr class="liste_total">';
-                if ($num < $limit) print '<td class="left">'.$langs->trans("Total").'</td>';
-                else print '<td class="left">'.$langs->trans("Totalforthispage").'</td>';
-                print '<td colspan="3"></td>';
-                print '<td class="center">'.$total_qty.'</td>';
-                print '<td align="right">'.price($total_ht).'</td>';
-                print '<td></td>';
-                print "</table>";
-                print '</div>';
-                print '</form>';
-            } else {
-                dol_print_error($db);
-            }
-            $db->free($result);
-        }
+						print '<tr class="oddeven">';
+						print '<td>';
+						print $invoicestatic->getNomUrl(1);
+						print "</td>\n";
+						print '<td>'.$societestatic->getNomUrl(1).'</td>';
+						print "<td>".$objp->code_client."</td>\n";
+						print '<td class="center">';
+						print dol_print_date($db->jdate($objp->datef), 'dayhour')."</td>";
+						print '<td class="center">'.$objp->qty."</td>\n";
+						print '<td align="right">'.price($objp->total_ht)."</td>\n";
+						print '<td align="right">'.$invoicestatic->LibStatut($objp->paye, $objp->statut, 5, $paiement, $objp->type).'</td>';
+						print "</tr>\n";
+						$i++;
+					}
+				}
+				print '<tr class="liste_total">';
+				if ($num < $limit) print '<td class="left">'.$langs->trans("Total").'</td>';
+				else print '<td class="left">'.$langs->trans("Totalforthispage").'</td>';
+				print '<td colspan="3"></td>';
+				print '<td class="center">'.$total_qty.'</td>';
+				print '<td align="right">'.price($total_ht).'</td>';
+				print '<td></td>';
+				print "</table>";
+				print '</div>';
+				print '</form>';
+			} else {
+				dol_print_error($db);
+			}
+			$db->free($result);
+		}
 	}
 } else {
 	dol_print_error();
diff --git a/htdocs/product/stats/facture_fournisseur.php b/htdocs/product/stats/facture_fournisseur.php
index 55bc61d459d..7e0e463e1a5 100644
--- a/htdocs/product/stats/facture_fournisseur.php
+++ b/htdocs/product/stats/facture_fournisseur.php
@@ -60,7 +60,7 @@ $pageprev = $page - 1;
 $pagenext = $page + 1;
 if (!$sortorder) $sortorder = "DESC";
 if (!$sortfield) $sortfield = "f.datef";
-$search_month = GETPOST('search_month', 'alpha');
+$search_month = GETPOST('search_month', 'int');
 $search_year = GETPOST('search_year', 'int');
 
 if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter', 'alpha')) {
@@ -99,29 +99,29 @@ if ($id > 0 || !empty($ref))
 		print dol_get_fiche_head($head, 'referers', $titre, -1, $picto);
 
 		$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $product, $action); // Note that $action and $object may have been modified by hook
-        print $hookmanager->resPrint;
+		print $hookmanager->resPrint;
 		if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-        $linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+		$linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-        $shownav = 1;
-        if ($user->socid && !in_array('product', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav = 0;
+		$shownav = 1;
+		if ($user->socid && !in_array('product', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav = 0;
 
-        dol_banner_tab($object, 'ref', $linkback, $shownav, 'ref');
+		dol_banner_tab($object, 'ref', $linkback, $shownav, 'ref');
 
-        print '<div class="fichecenter">';
+		print '<div class="fichecenter">';
 
-        print '<div class="underbanner clearboth"></div>';
-        print '<table class="border tableforfield" width="100%">';
+		print '<div class="underbanner clearboth"></div>';
+		print '<table class="border tableforfield" width="100%">';
 
-        $nboflines = show_stats_for_company($product, $socid);
+		$nboflines = show_stats_for_company($product, $socid);
 
 		print "</table>";
 
-        print '</div>';
-        print '<div style="clear:both"></div>';
+		print '</div>';
+		print '<div style="clear:both"></div>';
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 
 		if ($user->rights->fournisseur->facture->lire)
@@ -181,7 +181,7 @@ if ($id > 0 || !empty($ref))
 				if (!empty($page)) $option .= '&page='.urlencode($page);
 
 				print '<div class="liste_titre liste_titre_bydiv centpercent">';
-                print '<div class="divsearchfield">';
+				print '<div class="divsearchfield">';
 				print $langs->trans('Period').' ('.$langs->trans("DateInvoice").') - ';
 				print $langs->trans('Month').':<input class="flat" type="text" size="4" name="search_month" value="'.$search_month.'"> ';
 				print $langs->trans('Year').':'.$formother->selectyear($search_year ? $search_year : - 1, 'search_year', 1, 20, 5);
@@ -193,7 +193,7 @@ if ($id > 0 || !empty($ref))
 				print '</div>';
 
 				$i = 0;
-                print '<div class="div-table-responsive">';
+				print '<div class="div-table-responsive">';
 				print '<table class="tagtable liste listwithfilterbefore" width="100%">';
 				print '<tr class="liste_titre">';
 				print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "s.rowid", "", $option, '', $sortfield, $sortorder);
@@ -231,7 +231,7 @@ if ($id > 0 || !empty($ref))
 						print "</td>\n";
 						print '<td>'.$societestatic->getNomUrl(1).'</td>';
 						print "<td>".$objp->code_client."</td>\n";
-                   		print '<td class="center">';
+				   		print '<td class="center">';
 						print dol_print_date($db->jdate($objp->datef), 'dayhour')."</td>";
 						print '<td class="center">'.$objp->qty."</td>\n";
 						print '<td align="right">'.price($objp->line_total_ht)."</td>\n";
diff --git a/htdocs/product/stats/mo.php b/htdocs/product/stats/mo.php
index 54af6217831..cb159646047 100644
--- a/htdocs/product/stats/mo.php
+++ b/htdocs/product/stats/mo.php
@@ -88,29 +88,29 @@ if ($id > 0 || !empty($ref))
 		print dol_get_fiche_head($head, 'referers', $titre, -1, $picto);
 
 		$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $product, $action); // Note that $action and $object may have been modified by hook
-        print $hookmanager->resPrint;
+		print $hookmanager->resPrint;
 		if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-        $linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+		$linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-        $shownav = 1;
-        if ($user->socid && !in_array('product', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav = 0;
+		$shownav = 1;
+		if ($user->socid && !in_array('product', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav = 0;
 
-        dol_banner_tab($object, 'ref', $linkback, $shownav, 'ref');
+		dol_banner_tab($object, 'ref', $linkback, $shownav, 'ref');
 
-        print '<div class="fichecenter">';
+		print '<div class="fichecenter">';
 
-        print '<div class="underbanner clearboth"></div>';
-        print '<table class="border tableforfield" width="100%">';
+		print '<div class="underbanner clearboth"></div>';
+		print '<table class="border tableforfield" width="100%">';
 
-        $nboflines = show_stats_for_company($product, $socid);
+		$nboflines = show_stats_for_company($product, $socid);
 
 		print "</table>";
 
-        print '</div>';
-        print '<div style="clear:both"></div>';
+		print '</div>';
+		print '<div style="clear:both"></div>';
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 
 		$now = dol_now();
@@ -156,18 +156,18 @@ if ($id > 0 || !empty($ref))
 			if (!empty($search_month)) $option .= '&search_month='.urlencode($search_month);
 			if (!empty($search_year)) $option .= '&search_year='.urlencode($search_year);
 
-            print '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$product->id.'" name="search_form">'."\n";
-            if (!empty($sortfield))
-                print '<input type="hidden" name="sortfield" value="'.$sortfield.'"/>';
-            if (!empty($sortorder))
-                print '<input type="hidden" name="sortorder" value="'.$sortorder.'"/>';
+			print '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$product->id.'" name="search_form">'."\n";
+			if (!empty($sortfield))
+				print '<input type="hidden" name="sortfield" value="'.$sortfield.'"/>';
+			if (!empty($sortorder))
+				print '<input type="hidden" name="sortorder" value="'.$sortorder.'"/>';
 
-            print_barre_liste($langs->trans("Mos"), $page, $_SERVER["PHP_SELF"], $option, $sortfield, $sortorder, '', $num, $totalofrecords, '', 0, '', '', $limit, 0, 0, 1);
+			print_barre_liste($langs->trans("Mos"), $page, $_SERVER["PHP_SELF"], $option, $sortfield, $sortorder, '', $num, $totalofrecords, '', 0, '', '', $limit, 0, 0, 1);
 
-            if (!empty($page)) $option .= '&page='.urlencode($page);
+			if (!empty($page)) $option .= '&page='.urlencode($page);
 
-            $i = 0;
-            print '<div class="div-table-responsive">';
+			$i = 0;
+			print '<div class="div-table-responsive">';
 			print '<table class="tagtable liste listwithfilterbefore" width="100%">';
 
 			print '<tr class="liste_titre">';
diff --git a/htdocs/product/stats/propal.php b/htdocs/product/stats/propal.php
index 18c11af1809..9e9a078d8f0 100644
--- a/htdocs/product/stats/propal.php
+++ b/htdocs/product/stats/propal.php
@@ -60,7 +60,7 @@ $pagenext = $page + 1;
 if (!$sortorder) $sortorder = "DESC";
 if (!$sortfield) $sortfield = "p.datep";
 
-$search_month = GETPOST('search_month', 'alpha');
+$search_month = GETPOST('search_month', 'int');
 $search_year = GETPOST('search_year', 'int');
 
 if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter', 'alpha')) {
@@ -83,7 +83,7 @@ if ($id > 0 || !empty($ref))
 	$product = new Product($db);
 	$result = $product->fetch($id, $ref);
 
-    $object = $product;
+	$object = $product;
 
 	$parameters = array('id' => $id);
 	$reshook = $hookmanager->executeHooks('doActions', $parameters, $product, $action); // Note that $action and $object may have been modified by some hooks
@@ -99,29 +99,29 @@ if ($id > 0 || !empty($ref))
 		print dol_get_fiche_head($head, 'referers', $titre, -1, $picto);
 
 		$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $product, $action); // Note that $action and $object may have been modified by hook
-        print $hookmanager->resPrint;
+		print $hookmanager->resPrint;
 		if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-        $linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+		$linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-        $shownav = 1;
-        if ($user->socid && !in_array('product', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav = 0;
+		$shownav = 1;
+		if ($user->socid && !in_array('product', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav = 0;
 
-        dol_banner_tab($object, 'ref', $linkback, $shownav, 'ref');
+		dol_banner_tab($object, 'ref', $linkback, $shownav, 'ref');
 
-        print '<div class="fichecenter">';
+		print '<div class="fichecenter">';
 
-        print '<div class="underbanner clearboth"></div>';
-        print '<table class="border tableforfield" width="100%">';
+		print '<div class="underbanner clearboth"></div>';
+		print '<table class="border tableforfield" width="100%">';
 
-        $nboflines = show_stats_for_company($product, $socid);
+		$nboflines = show_stats_for_company($product, $socid);
 
 		print "</table>";
 
-        print '</div>';
-        print '<div style="clear:both"></div>';
+		print '</div>';
+		print '<div style="clear:both"></div>';
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 
 		if ($user->rights->propale->lire)
@@ -185,7 +185,7 @@ if ($id > 0 || !empty($ref))
 				if (!empty($page)) $option .= '&page='.urlencode($page);
 
 				print '<div class="liste_titre liste_titre_bydiv centpercent">';
-                print '<div class="divsearchfield">';
+				print '<div class="divsearchfield">';
 				print $langs->trans('Period').' ('.$langs->trans("DatePropal").') - ';
 				print $langs->trans('Month').':<input class="flat" type="text" size="4" name="search_month" value="'.$search_month.'"> ';
 				print $langs->trans('Year').':'.$formother->selectyear($search_year ? $search_year : - 1, 'search_year', 1, 20, 5);
@@ -197,7 +197,7 @@ if ($id > 0 || !empty($ref))
 				print '</div>';
 
 				$i = 0;
-                print '<div class="div-table-responsive">';
+				print '<div class="div-table-responsive">';
 				print '<table class="tagtable liste listwithfilterbefore" width="100%">';
 				print '<tr class="liste_titre">';
 				print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "p.rowid", "", $option, '', $sortfield, $sortorder);
@@ -226,7 +226,7 @@ if ($id > 0 || !empty($ref))
 						print '<td>';
 						print $propalstatic->getNomUrl(1);
 						print "</td>\n";
-                        print '<td>'.$societestatic->getNomUrl(1).'</td>';
+						print '<td>'.$societestatic->getNomUrl(1).'</td>';
 						print '<td class="center">';
 						print dol_print_date($db->jdate($objp->datep), 'dayhour')."</td>";
 						print "<td align=\"center\">".$objp->qty."</td>\n";
@@ -237,20 +237,20 @@ if ($id > 0 || !empty($ref))
 					}
 				}
 
-        		print '<tr class="liste_total">';
-        		if ($num < $limit) print '<td class="left">'.$langs->trans("Total").'</td>';
-        		else print '<td class="left">'.$langs->trans("Totalforthispage").'</td>';
-        		print '<td colspan="2"></td>';
-        		print '<td class="center">'.$total_qty.'</td>';
-        		print '<td align="right">'.price($total_ht).'</td>';
-        		print '<td></td>';
-        		print "</table>";
-        		print '</div>';
-        		print '</form>';
-    		} else {
-    			dol_print_error($db);
-    		}
-    		$db->free($result);
+				print '<tr class="liste_total">';
+				if ($num < $limit) print '<td class="left">'.$langs->trans("Total").'</td>';
+				else print '<td class="left">'.$langs->trans("Totalforthispage").'</td>';
+				print '<td colspan="2"></td>';
+				print '<td class="center">'.$total_qty.'</td>';
+				print '<td align="right">'.price($total_ht).'</td>';
+				print '<td></td>';
+				print "</table>";
+				print '</div>';
+				print '</form>';
+			} else {
+				dol_print_error($db);
+			}
+			$db->free($result);
 		}
 	}
 } else {
diff --git a/htdocs/product/stats/supplier_proposal.php b/htdocs/product/stats/supplier_proposal.php
index b5d708d4690..b4816028d98 100644
--- a/htdocs/product/stats/supplier_proposal.php
+++ b/htdocs/product/stats/supplier_proposal.php
@@ -60,7 +60,7 @@ $pagenext = $page + 1;
 if (!$sortorder) $sortorder = "DESC";
 if (!$sortfield) $sortfield = "p.date_valid";
 
-$search_month = GETPOST('search_month', 'alpha');
+$search_month = GETPOST('search_month', 'int');
 $search_year = GETPOST('search_year', 'int');
 
 if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter', 'alpha')) {
@@ -83,7 +83,7 @@ if ($id > 0 || !empty($ref))
 	$product = new Product($db);
 	$result = $product->fetch($id, $ref);
 
-    $object = $product;
+	$object = $product;
 
 	$parameters = array('id' => $id);
 	$reshook = $hookmanager->executeHooks('doActions', $parameters, $product, $action); // Note that $action and $object may have been modified by some hooks
@@ -99,29 +99,29 @@ if ($id > 0 || !empty($ref))
 		print dol_get_fiche_head($head, 'referers', $titre, -1, $picto);
 
 		$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $product, $action); // Note that $action and $object may have been modified by hook
-        print $hookmanager->resPrint;
+		print $hookmanager->resPrint;
 		if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-        $linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+		$linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-        $shownav = 1;
-        if ($user->socid && !in_array('product', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav = 0;
+		$shownav = 1;
+		if ($user->socid && !in_array('product', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav = 0;
 
-        dol_banner_tab($object, 'ref', $linkback, $shownav, 'ref');
+		dol_banner_tab($object, 'ref', $linkback, $shownav, 'ref');
 
-        print '<div class="fichecenter">';
+		print '<div class="fichecenter">';
 
-        print '<div class="underbanner clearboth"></div>';
-        print '<table class="border tableforfield" width="100%">';
+		print '<div class="underbanner clearboth"></div>';
+		print '<table class="border tableforfield" width="100%">';
 
-        $nboflines = show_stats_for_company($product, $socid);
+		$nboflines = show_stats_for_company($product, $socid);
 
 		print "</table>";
 
-        print '</div>';
-        print '<div style="clear:both"></div>';
+		print '</div>';
+		print '<div style="clear:both"></div>';
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 
 		if ($user->rights->propale->lire)
@@ -185,7 +185,7 @@ if ($id > 0 || !empty($ref))
 				if (!empty($page)) $option .= '&page='.urlencode($page);
 
 				print '<div class="liste_titre liste_titre_bydiv centpercent">';
-                print '<div class="divsearchfield">';
+				print '<div class="divsearchfield">';
 				print $langs->trans('Period').' ('.$langs->trans("DatePropal").') - ';
 				print $langs->trans('Month').':<input class="flat" type="text" size="4" name="search_month" value="'.$search_month.'"> ';
 				print $langs->trans('Year').':'.$formother->selectyear($search_year ? $search_year : - 1, 'search_year', 1, 20, 5);
@@ -197,7 +197,7 @@ if ($id > 0 || !empty($ref))
 				print '</div>';
 
 				$i = 0;
-                print '<div class="div-table-responsive">';
+				print '<div class="div-table-responsive">';
 				print '<table class="tagtable liste listwithfilterbefore" width="100%">';
 				print '<tr class="liste_titre">';
 				print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "p.rowid", "", $option, '', $sortfield, $sortorder);
@@ -225,7 +225,7 @@ if ($id > 0 || !empty($ref))
 						print '<td>';
 						print $propalstatic->getNomUrl(1);
 						print "</td>\n";
-                        print '<td>'.$societestatic->getNomUrl(1).'</td>';
+						print '<td>'.$societestatic->getNomUrl(1).'</td>';
 						print '<td class="center">';
 						print dol_print_date($db->jdate($objp->date_valid), 'dayhour')."</td>";
 						print "<td align=\"center\">".$objp->qty."</td>\n";
@@ -236,20 +236,20 @@ if ($id > 0 || !empty($ref))
 					}
 				}
 
-        		print '<tr class="liste_total">';
-        		if ($num < $limit) print '<td class="left">'.$langs->trans("Total").'</td>';
-        		else print '<td class="left">'.$langs->trans("Totalforthispage").'</td>';
-        		print '<td colspan="2"></td>';
-        		print '<td class="center">'.$total_qty.'</td>';
-        		print '<td align="right">'.price($total_ht).'</td>';
-        		print '<td></td>';
-        		print "</table>";
-        		print '</div>';
-        		print '</form>';
-    		} else {
-    			dol_print_error($db);
-    		}
-    		$db->free($result);
+				print '<tr class="liste_total">';
+				if ($num < $limit) print '<td class="left">'.$langs->trans("Total").'</td>';
+				else print '<td class="left">'.$langs->trans("Totalforthispage").'</td>';
+				print '<td colspan="2"></td>';
+				print '<td class="center">'.$total_qty.'</td>';
+				print '<td align="right">'.price($total_ht).'</td>';
+				print '<td></td>';
+				print "</table>";
+				print '</div>';
+				print '</form>';
+			} else {
+				dol_print_error($db);
+			}
+			$db->free($result);
 		}
 	}
 } else {
diff --git a/htdocs/product/stock/card.php b/htdocs/product/stock/card.php
index ae44cf65877..5abf87c497e 100644
--- a/htdocs/product/stock/card.php
+++ b/htdocs/product/stock/card.php
@@ -324,7 +324,7 @@ if ($action == 'create')
 	}
 	print '</table>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div class="center">';
 	print '<input type="submit" class="button" value="'.$langs->trans("Create").'">';
@@ -468,7 +468,7 @@ if ($action == 'create')
 
 			print '<div class="clearboth"></div>';
 
-			dol_fiche_end();
+			print dol_get_fiche_end();
 
 
 			/* ************************************************************************** */
@@ -773,7 +773,7 @@ if ($action == 'create')
 
 			print '</table>';
 
-			dol_fiche_end();
+			print dol_get_fiche_end();
 
 			print '<div class="center">';
 			print '<input type="submit" class="button" value="'.$langs->trans("Save").'">';
diff --git a/htdocs/product/stock/class/api_stockmovements.class.php b/htdocs/product/stock/class/api_stockmovements.class.php
index 71f687a1b03..dba209e5b6f 100644
--- a/htdocs/product/stock/class/api_stockmovements.class.php
+++ b/htdocs/product/stock/class/api_stockmovements.class.php
@@ -28,41 +28,41 @@ require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
  */
 class StockMovements extends DolibarrApi
 {
-    /**
-     * @var array   $FIELDS     Mandatory fields, checked when create and update object
-     */
-    static $FIELDS = array(
-        'product_id',
-        'warehouse_id',
-        'qty'
-    );
+	/**
+	 * @var array   $FIELDS     Mandatory fields, checked when create and update object
+	 */
+	static $FIELDS = array(
+		'product_id',
+		'warehouse_id',
+		'qty'
+	);
 
-    /**
-     * @var MouvementStock $stockmovement {@type MouvementStock}
-     */
-    public $stockmovement;
+	/**
+	 * @var MouvementStock $stockmovement {@type MouvementStock}
+	 */
+	public $stockmovement;
 
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-        global $db, $conf;
-        $this->db = $db;
-        $this->stockmovement = new MouvementStock($this->db);
-    }
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		global $db, $conf;
+		$this->db = $db;
+		$this->stockmovement = new MouvementStock($this->db);
+	}
 
-    /**
-     * Get properties of a stock movement object
-     *
-     * Return an array with stock movement informations
-     *
-     * @param 	int 	$id ID of movement
-     * @return 	array|mixed data without useless information
-     *
-     * @throws 	RestException
-     */
-    /*
+	/**
+	 * Get properties of a stock movement object
+	 *
+	 * Return an array with stock movement informations
+	 *
+	 * @param 	int 	$id ID of movement
+	 * @return 	array|mixed data without useless information
+	 *
+	 * @throws 	RestException
+	 */
+	/*
     public function get($id)
     {
         if(! DolibarrApiAccess::$user->rights->stock->lire) {
@@ -81,136 +81,136 @@ class StockMovements extends DolibarrApi
         return $this->_cleanObjectDatas($this->stockmovement);
     }*/
 
-    /**
-     * Get a list of stock movement
-     *
-     * @param string	$sortfield	Sort field
-     * @param string	$sortorder	Sort order
-     * @param int		$limit		Limit for list
-     * @param int		$page		Page number
-     * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.product_id:=:1) and (t.date_creation:<:'20160101')"
-     * @return array                Array of warehouse objects
-     *
-     * @throws RestException
-     */
-    public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $sqlfilters = '')
-    {
-        global $db, $conf;
+	/**
+	 * Get a list of stock movement
+	 *
+	 * @param string	$sortfield	Sort field
+	 * @param string	$sortorder	Sort order
+	 * @param int		$limit		Limit for list
+	 * @param int		$page		Page number
+	 * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.product_id:=:1) and (t.date_creation:<:'20160101')"
+	 * @return array                Array of warehouse objects
+	 *
+	 * @throws RestException
+	 */
+	public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $sqlfilters = '')
+	{
+		global $db, $conf;
 
-        $obj_ret = array();
+		$obj_ret = array();
 
-        if (!DolibarrApiAccess::$user->rights->stock->lire) {
-            throw new RestException(401);
-        }
+		if (!DolibarrApiAccess::$user->rights->stock->lire) {
+			throw new RestException(401);
+		}
 
-        $sql = "SELECT t.rowid";
-        $sql .= " FROM ".MAIN_DB_PREFIX."stock_mouvement as t";
-        //$sql.= ' WHERE t.entity IN ('.getEntity('stock').')';
-        $sql .= ' WHERE 1 = 1';
-        // Add sql filters
-        if ($sqlfilters)
-        {
-            if (!DolibarrApi::_checkFilters($sqlfilters))
-            {
-                throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
-            }
-            $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-        }
+		$sql = "SELECT t.rowid";
+		$sql .= " FROM ".MAIN_DB_PREFIX."stock_mouvement as t";
+		//$sql.= ' WHERE t.entity IN ('.getEntity('stock').')';
+		$sql .= ' WHERE 1 = 1';
+		// Add sql filters
+		if ($sqlfilters)
+		{
+			if (!DolibarrApi::_checkFilters($sqlfilters))
+			{
+				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+			}
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
 
-        $sql .= $this->db->order($sortfield, $sortorder);
-        if ($limit) {
-            if ($page < 0)
-            {
-                $page = 0;
-            }
-            $offset = $limit * $page;
+		$sql .= $this->db->order($sortfield, $sortorder);
+		if ($limit) {
+			if ($page < 0)
+			{
+				$page = 0;
+			}
+			$offset = $limit * $page;
 
-            $sql .= $this->db->plimit($limit + 1, $offset);
-        }
+			$sql .= $this->db->plimit($limit + 1, $offset);
+		}
 
-        $result = $this->db->query($sql);
-        if ($result)
-        {
-            $i = 0;
-            $num = $this->db->num_rows($result);
-            $min = min($num, ($limit <= 0 ? $num : $limit));
-            while ($i < $min)
-            {
-            	$obj = $this->db->fetch_object($result);
-            	$stockmovement_static = new MouvementStock($this->db);
-                if ($stockmovement_static->fetch($obj->rowid)) {
-                    $obj_ret[] = $this->_cleanObjectDatas($stockmovement_static);
-                }
-                $i++;
-            }
-        } else {
-        	throw new RestException(503, 'Error when retrieve stock movement list : '.$this->db->lasterror());
-        }
-        if (!count($obj_ret)) {
-            throw new RestException(404, 'No stock movement found');
-        }
-        return $obj_ret;
-    }
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+			$i = 0;
+			$num = $this->db->num_rows($result);
+			$min = min($num, ($limit <= 0 ? $num : $limit));
+			while ($i < $min)
+			{
+				$obj = $this->db->fetch_object($result);
+				$stockmovement_static = new MouvementStock($this->db);
+				if ($stockmovement_static->fetch($obj->rowid)) {
+					$obj_ret[] = $this->_cleanObjectDatas($stockmovement_static);
+				}
+				$i++;
+			}
+		} else {
+			throw new RestException(503, 'Error when retrieve stock movement list : '.$this->db->lasterror());
+		}
+		if (!count($obj_ret)) {
+			throw new RestException(404, 'No stock movement found');
+		}
+		return $obj_ret;
+	}
 
-    /**
-     * Create stock movement object.
-     * You can use the following message to test this RES API:
-     * { "product_id": 1, "warehouse_id": 1, "qty": 1, "lot": "", "movementcode": "INV123", "movementlabel": "Inventory 123", "price": 0 }
-     * $price Can be set to update AWP (Average Weighted Price) when you make a stock increase
-     * $dlc Eat-by date. Will be used if lot does not exists yet and will be created.
-     * $dluo Sell-by date. Will be used if lot does not exists yet and will be created.
-     *
-     * @param int $product_id Id product id {@min 1} {@from body} {@required true}
-     * @param int $warehouse_id Id warehouse {@min 1} {@from body} {@required true}
-     * @param float $qty Qty to add (Use negative value for a stock decrease) {@from body} {@required true}
-     * @param string $lot Lot {@from body}
-     * @param string $movementcode Movement code {@example INV123} {@from body}
-     * @param string $movementlabel Movement label {@example Inventory number 123} {@from body}
-     * @param string $price To update AWP (Average Weighted Price) when you make a stock increase (qty must be higher then 0). {@from body}
-     * @param string $dlc Eat-by date. {@from body} {@type date}
-     * @param string $dluo Sell-by date. {@from body} {@type date}
-     *
-     * @return  int                         ID of stock movement
-     * @throws RestException
-     */
-    public function post($product_id, $warehouse_id, $qty, $lot = '', $movementcode = '', $movementlabel = '', $price = '', $dlc = '', $dluo = '')
-    {
-        if (!DolibarrApiAccess::$user->rights->stock->creer) {
-            throw new RestException(401);
-        }
+	/**
+	 * Create stock movement object.
+	 * You can use the following message to test this RES API:
+	 * { "product_id": 1, "warehouse_id": 1, "qty": 1, "lot": "", "movementcode": "INV123", "movementlabel": "Inventory 123", "price": 0 }
+	 * $price Can be set to update AWP (Average Weighted Price) when you make a stock increase
+	 * $dlc Eat-by date. Will be used if lot does not exists yet and will be created.
+	 * $dluo Sell-by date. Will be used if lot does not exists yet and will be created.
+	 *
+	 * @param int $product_id Id product id {@min 1} {@from body} {@required true}
+	 * @param int $warehouse_id Id warehouse {@min 1} {@from body} {@required true}
+	 * @param float $qty Qty to add (Use negative value for a stock decrease) {@from body} {@required true}
+	 * @param string $lot Lot {@from body}
+	 * @param string $movementcode Movement code {@example INV123} {@from body}
+	 * @param string $movementlabel Movement label {@example Inventory number 123} {@from body}
+	 * @param string $price To update AWP (Average Weighted Price) when you make a stock increase (qty must be higher then 0). {@from body}
+	 * @param string $dlc Eat-by date. {@from body} {@type date}
+	 * @param string $dluo Sell-by date. {@from body} {@type date}
+	 *
+	 * @return  int                         ID of stock movement
+	 * @throws RestException
+	 */
+	public function post($product_id, $warehouse_id, $qty, $lot = '', $movementcode = '', $movementlabel = '', $price = '', $dlc = '', $dluo = '')
+	{
+		if (!DolibarrApiAccess::$user->rights->stock->creer) {
+			throw new RestException(401);
+		}
 
-        if ($qty == 0) {
-        	throw new RestException(503, "Making a stock movement with a quentity of 0 is not possible");
-        }
+		if ($qty == 0) {
+			throw new RestException(503, "Making a stock movement with a quentity of 0 is not possible");
+		}
 
-        // Type increase or decrease
-        $type = 2;
-        if ($qty >= 0) {
-            $type = 3;
-        }
+		// Type increase or decrease
+		$type = 2;
+		if ($qty >= 0) {
+			$type = 3;
+		}
 
-        require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-        $eatBy = empty($dluo) ? '' : dol_stringtotime($dluo);
-        $sellBy = empty($dlc) ? '' : dol_stringtotime($dlc);
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+		$eatBy = empty($dluo) ? '' : dol_stringtotime($dluo);
+		$sellBy = empty($dlc) ? '' : dol_stringtotime($dlc);
 
-        if ($this->stockmovement->_create(DolibarrApiAccess::$user, $product_id, $warehouse_id, $qty, $type, $price, $movementlabel, $movementcode, '', $eatBy, $sellBy, $lot) <= 0) {
-        	$errormessage = $this->stockmovement->error;
-        	if (empty($errormessage)) $errormessage = join(',', $this->stockmovement->errors);
-        	throw new RestException(503, 'Error when create stock movement : '.$errormessage);
-        }
+		if ($this->stockmovement->_create(DolibarrApiAccess::$user, $product_id, $warehouse_id, $qty, $type, $price, $movementlabel, $movementcode, '', $eatBy, $sellBy, $lot) <= 0) {
+			$errormessage = $this->stockmovement->error;
+			if (empty($errormessage)) $errormessage = join(',', $this->stockmovement->errors);
+			throw new RestException(503, 'Error when create stock movement : '.$errormessage);
+		}
 
-        return $this->stockmovement->id;
-    }
+		return $this->stockmovement->id;
+	}
 
-    /**
-     * Update stock movement
-     *
-     * @param int   $id             Id of warehouse to update
-     * @param array $request_data   Datas
-     * @return int
-     */
-    /*
+	/**
+	 * Update stock movement
+	 *
+	 * @param int   $id             Id of warehouse to update
+	 * @param array $request_data   Datas
+	 * @return int
+	 */
+	/*
     public function put($id, $request_data = null)
     {
         if(! DolibarrApiAccess::$user->rights->stock->creer) {
@@ -237,13 +237,13 @@ class StockMovements extends DolibarrApi
         return false;
     }*/
 
-    /**
-     * Delete stock movement
-     *
-     * @param int $id   Stock movement ID
-     * @return array
-     */
-    /*
+	/**
+	 * Delete stock movement
+	 *
+	 * @param int $id   Stock movement ID
+	 * @return array
+	 */
+	/*
     public function delete($id)
     {
         if(! DolibarrApiAccess::$user->rights->stock->supprimer) {
@@ -272,79 +272,79 @@ class StockMovements extends DolibarrApi
 
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
-    /**
-     * Clean sensible object datas
-     *
-     * @param   MouvementStock  $object    Object to clean
-     * @return    array    Array of cleaned object properties
-     */
-    protected function _cleanObjectDatas($object)
-    {
-        // phpcs:enable
-        $object = parent::_cleanObjectDatas($object);
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	/**
+	 * Clean sensible object datas
+	 *
+	 * @param   MouvementStock $object     Object to clean
+	 * @return  Object                     Object with cleaned properties
+	 */
+	protected function _cleanObjectDatas($object)
+	{
+		// phpcs:enable
+		$object = parent::_cleanObjectDatas($object);
 
-        // Remove useless data
-        unset($object->civility_id);
-        unset($object->firstname);
-        unset($object->lastname);
-        unset($object->name);
-        unset($object->location_incoterms);
-        unset($object->label_incoterms);
-        unset($object->fk_incoterms);
-        unset($object->lines);
-        unset($object->total_ht);
-        unset($object->total_ttc);
-        unset($object->total_tva);
-        unset($object->total_localtax1);
-        unset($object->total_localtax2);
-        unset($object->note);
-        unset($object->note_private);
-        unset($object->note_public);
-        unset($object->shipping_method_id);
-        unset($object->fk_account);
-        unset($object->model_pdf);
-        unset($object->fk_delivery_address);
-        unset($object->cond_reglement);
-        unset($object->cond_reglement_id);
-        unset($object->mode_reglement_id);
-        unset($object->barcode_type_coder);
-        unset($object->barcode_type_label);
-        unset($object->barcode_type_code);
-        unset($object->barcode_type);
-        unset($object->country_code);
-        unset($object->country_id);
-        unset($object->country);
-        unset($object->thirdparty);
-        unset($object->contact);
-        unset($object->contact_id);
-        unset($object->user);
-        unset($object->fk_project);
-        unset($object->project);
-        unset($object->canvas);
+		// Remove useless data
+		unset($object->civility_id);
+		unset($object->firstname);
+		unset($object->lastname);
+		unset($object->name);
+		unset($object->location_incoterms);
+		unset($object->label_incoterms);
+		unset($object->fk_incoterms);
+		unset($object->lines);
+		unset($object->total_ht);
+		unset($object->total_ttc);
+		unset($object->total_tva);
+		unset($object->total_localtax1);
+		unset($object->total_localtax2);
+		unset($object->note);
+		unset($object->note_private);
+		unset($object->note_public);
+		unset($object->shipping_method_id);
+		unset($object->fk_account);
+		unset($object->model_pdf);
+		unset($object->fk_delivery_address);
+		unset($object->cond_reglement);
+		unset($object->cond_reglement_id);
+		unset($object->mode_reglement_id);
+		unset($object->barcode_type_coder);
+		unset($object->barcode_type_label);
+		unset($object->barcode_type_code);
+		unset($object->barcode_type);
+		unset($object->country_code);
+		unset($object->country_id);
+		unset($object->country);
+		unset($object->thirdparty);
+		unset($object->contact);
+		unset($object->contact_id);
+		unset($object->user);
+		unset($object->fk_project);
+		unset($object->project);
+		unset($object->canvas);
 
-        //unset($object->eatby);        Filled correctly in read mode
-        //unset($object->sellby);       Filled correctly in read mode
+		//unset($object->eatby);        Filled correctly in read mode
+		//unset($object->sellby);       Filled correctly in read mode
 
-        return $object;
-    }
+		return $object;
+	}
 
-    /**
-     * Validate fields before create or update object
-     *
-     * @param array|null    $data    Data to validate
-     * @return array
-     *
-     * @throws RestException
-     */
-    private function _validate($data)
-    {
-        $stockmovement = array();
-        foreach (self::$FIELDS as $field) {
-            if (!isset($data[$field]))
-                throw new RestException(400, "$field field missing");
-            $stockmovement[$field] = $data[$field];
-        }
-        return $stockmovement;
-    }
+	/**
+	 * Validate fields before create or update object
+	 *
+	 * @param array|null    $data    Data to validate
+	 * @return array
+	 *
+	 * @throws RestException
+	 */
+	private function _validate($data)
+	{
+		$stockmovement = array();
+		foreach (self::$FIELDS as $field) {
+			if (!isset($data[$field]))
+				throw new RestException(400, "$field field missing");
+			$stockmovement[$field] = $data[$field];
+		}
+		return $stockmovement;
+	}
 }
diff --git a/htdocs/product/stock/class/api_warehouses.class.php b/htdocs/product/stock/class/api_warehouses.class.php
index 1c31bbbc2af..d6f2333f3ef 100644
--- a/htdocs/product/stock/class/api_warehouses.class.php
+++ b/htdocs/product/stock/class/api_warehouses.class.php
@@ -28,264 +28,264 @@
  */
 class Warehouses extends DolibarrApi
 {
-    /**
-     * @var array   $FIELDS     Mandatory fields, checked when create and update object
-     */
-    static $FIELDS = array(
-        'label',
-    );
+	/**
+	 * @var array   $FIELDS     Mandatory fields, checked when create and update object
+	 */
+	static $FIELDS = array(
+		'label',
+	);
 
-    /**
-     * @var Entrepot $warehouse {@type Entrepot}
-     */
-    public $warehouse;
+	/**
+	 * @var Entrepot $warehouse {@type Entrepot}
+	 */
+	public $warehouse;
 
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-        global $db, $conf;
-        $this->db = $db;
-        $this->warehouse = new Entrepot($this->db);
-    }
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		global $db, $conf;
+		$this->db = $db;
+		$this->warehouse = new Entrepot($this->db);
+	}
 
-    /**
-     * Get properties of a warehouse object
-     *
-     * Return an array with warehouse informations
-     *
-     * @param 	int 	$id ID of warehouse
-     * @return 	array|mixed data without useless information
-     *
-     * @throws 	RestException
-     */
-    public function get($id)
-    {
-        if (!DolibarrApiAccess::$user->rights->stock->lire) {
-            throw new RestException(401);
-        }
+	/**
+	 * Get properties of a warehouse object
+	 *
+	 * Return an array with warehouse informations
+	 *
+	 * @param 	int 	$id ID of warehouse
+	 * @return 	array|mixed data without useless information
+	 *
+	 * @throws 	RestException
+	 */
+	public function get($id)
+	{
+		if (!DolibarrApiAccess::$user->rights->stock->lire) {
+			throw new RestException(401);
+		}
 
-        $result = $this->warehouse->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'warehouse not found');
-        }
+		$result = $this->warehouse->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'warehouse not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('warehouse', $this->warehouse->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('warehouse', $this->warehouse->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        return $this->_cleanObjectDatas($this->warehouse);
-    }
+		return $this->_cleanObjectDatas($this->warehouse);
+	}
 
-    /**
-     * List warehouses
-     *
-     * Get a list of warehouses
-     *
-     * @param string	$sortfield	Sort field
-     * @param string	$sortorder	Sort order
-     * @param int		$limit		Limit for list
-     * @param int		$page		Page number
+	/**
+	 * List warehouses
+	 *
+	 * Get a list of warehouses
+	 *
+	 * @param string	$sortfield	Sort field
+	 * @param string	$sortorder	Sort order
+	 * @param int		$limit		Limit for list
+	 * @param int		$page		Page number
 	 * @param  int    $category   Use this param to filter list by category
-     * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.label:like:'WH-%') and (t.date_creation:<:'20160101')"
-     * @return array                Array of warehouse objects
-     *
-     * @throws RestException
-     */
-    public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $category = 0, $sqlfilters = '')
-    {
-        global $db, $conf;
+	 * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.label:like:'WH-%') and (t.date_creation:<:'20160101')"
+	 * @return array                Array of warehouse objects
+	 *
+	 * @throws RestException
+	 */
+	public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $category = 0, $sqlfilters = '')
+	{
+		global $db, $conf;
 
-        $obj_ret = array();
+		$obj_ret = array();
 
-        if (!DolibarrApiAccess::$user->rights->stock->lire) {
-            throw new RestException(401);
-        }
+		if (!DolibarrApiAccess::$user->rights->stock->lire) {
+			throw new RestException(401);
+		}
 
-        $sql = "SELECT t.rowid";
-        $sql .= " FROM ".MAIN_DB_PREFIX."entrepot as t";
-    	if ($category > 0) {
+		$sql = "SELECT t.rowid";
+		$sql .= " FROM ".MAIN_DB_PREFIX."entrepot as t";
+		if ($category > 0) {
 			$sql .= ", ".MAIN_DB_PREFIX."categorie_societe as c";
-    	}
-        $sql .= ' WHERE t.entity IN ('.getEntity('stock').')';
-    	// Select warehouses of given category
-    	if ($category > 0) {
-    		$sql .= " AND c.fk_categorie = ".$this->db->escape($category);
+		}
+		$sql .= ' WHERE t.entity IN ('.getEntity('stock').')';
+		// Select warehouses of given category
+		if ($category > 0) {
+			$sql .= " AND c.fk_categorie = ".$this->db->escape($category);
 			$sql .= " AND c.fk_warehouse = t.rowid ";
-    	}
-        // Add sql filters
-        if ($sqlfilters)
-        {
-            if (!DolibarrApi::_checkFilters($sqlfilters))
-            {
-                throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
-            }
-            $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-        }
+		}
+		// Add sql filters
+		if ($sqlfilters)
+		{
+			if (!DolibarrApi::_checkFilters($sqlfilters))
+			{
+				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+			}
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
 
-        $sql .= $this->db->order($sortfield, $sortorder);
-        if ($limit) {
-            if ($page < 0)
-            {
-                $page = 0;
-            }
-            $offset = $limit * $page;
+		$sql .= $this->db->order($sortfield, $sortorder);
+		if ($limit) {
+			if ($page < 0)
+			{
+				$page = 0;
+			}
+			$offset = $limit * $page;
 
-            $sql .= $this->db->plimit($limit + 1, $offset);
-        }
+			$sql .= $this->db->plimit($limit + 1, $offset);
+		}
 
-        $result = $this->db->query($sql);
-        if ($result)
-        {
-            $i = 0;
-            $num = $this->db->num_rows($result);
-            $min = min($num, ($limit <= 0 ? $num : $limit));
-            while ($i < $min)
-            {
-            	$obj = $this->db->fetch_object($result);
-            	$warehouse_static = new Entrepot($this->db);
-                if ($warehouse_static->fetch($obj->rowid)) {
-                    $obj_ret[] = $this->_cleanObjectDatas($warehouse_static);
-                }
-                $i++;
-            }
-        } else {
-        	throw new RestException(503, 'Error when retrieve warehouse list : '.$this->db->lasterror());
-        }
-        if (!count($obj_ret)) {
-            throw new RestException(404, 'No warehouse found');
-        }
-        return $obj_ret;
-    }
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+			$i = 0;
+			$num = $this->db->num_rows($result);
+			$min = min($num, ($limit <= 0 ? $num : $limit));
+			while ($i < $min)
+			{
+				$obj = $this->db->fetch_object($result);
+				$warehouse_static = new Entrepot($this->db);
+				if ($warehouse_static->fetch($obj->rowid)) {
+					$obj_ret[] = $this->_cleanObjectDatas($warehouse_static);
+				}
+				$i++;
+			}
+		} else {
+			throw new RestException(503, 'Error when retrieve warehouse list : '.$this->db->lasterror());
+		}
+		if (!count($obj_ret)) {
+			throw new RestException(404, 'No warehouse found');
+		}
+		return $obj_ret;
+	}
 
 
-    /**
-     * Create warehouse object
-     *
-     * @param array $request_data   Request data
-     * @return int  ID of warehouse
-     */
-    public function post($request_data = null)
-    {
-        if (!DolibarrApiAccess::$user->rights->stock->creer) {
-            throw new RestException(401);
-        }
+	/**
+	 * Create warehouse object
+	 *
+	 * @param array $request_data   Request data
+	 * @return int  ID of warehouse
+	 */
+	public function post($request_data = null)
+	{
+		if (!DolibarrApiAccess::$user->rights->stock->creer) {
+			throw new RestException(401);
+		}
 
-        // Check mandatory fields
-        $result = $this->_validate($request_data);
+		// Check mandatory fields
+		$result = $this->_validate($request_data);
 
-        foreach ($request_data as $field => $value) {
-            $this->warehouse->$field = $value;
-        }
-        if ($this->warehouse->create(DolibarrApiAccess::$user) < 0) {
-            throw new RestException(500, "Error creating warehouse", array_merge(array($this->warehouse->error), $this->warehouse->errors));
-        }
-        return $this->warehouse->id;
-    }
+		foreach ($request_data as $field => $value) {
+			$this->warehouse->$field = $value;
+		}
+		if ($this->warehouse->create(DolibarrApiAccess::$user) < 0) {
+			throw new RestException(500, "Error creating warehouse", array_merge(array($this->warehouse->error), $this->warehouse->errors));
+		}
+		return $this->warehouse->id;
+	}
 
-    /**
-     * Update warehouse
-     *
-     * @param int   $id             Id of warehouse to update
-     * @param array $request_data   Datas
-     * @return int
-     */
-    public function put($id, $request_data = null)
-    {
-        if (!DolibarrApiAccess::$user->rights->stock->creer) {
-            throw new RestException(401);
-        }
+	/**
+	 * Update warehouse
+	 *
+	 * @param int   $id             Id of warehouse to update
+	 * @param array $request_data   Datas
+	 * @return int
+	 */
+	public function put($id, $request_data = null)
+	{
+		if (!DolibarrApiAccess::$user->rights->stock->creer) {
+			throw new RestException(401);
+		}
 
-        $result = $this->warehouse->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'warehouse not found');
-        }
+		$result = $this->warehouse->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'warehouse not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('stock', $this->warehouse->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('stock', $this->warehouse->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        foreach ($request_data as $field => $value) {
-            if ($field == 'id') continue;
-            $this->warehouse->$field = $value;
-        }
+		foreach ($request_data as $field => $value) {
+			if ($field == 'id') continue;
+			$this->warehouse->$field = $value;
+		}
 
-        if ($this->warehouse->update($id, DolibarrApiAccess::$user))
-            return $this->get($id);
+		if ($this->warehouse->update($id, DolibarrApiAccess::$user))
+			return $this->get($id);
 
-        return false;
-    }
+		return false;
+	}
 
-    /**
-     * Delete warehouse
-     *
-     * @param int $id   Warehouse ID
-     * @return array
-     */
-    public function delete($id)
-    {
-        if (!DolibarrApiAccess::$user->rights->stock->supprimer) {
-            throw new RestException(401);
-        }
-        $result = $this->warehouse->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'warehouse not found');
-        }
+	/**
+	 * Delete warehouse
+	 *
+	 * @param int $id   Warehouse ID
+	 * @return array
+	 */
+	public function delete($id)
+	{
+		if (!DolibarrApiAccess::$user->rights->stock->supprimer) {
+			throw new RestException(401);
+		}
+		$result = $this->warehouse->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'warehouse not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('stock', $this->warehouse->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('stock', $this->warehouse->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        if (!$this->warehouse->delete(DolibarrApiAccess::$user)) {
-            throw new RestException(401, 'error when delete warehouse');
-        }
+		if (!$this->warehouse->delete(DolibarrApiAccess::$user)) {
+			throw new RestException(401, 'error when delete warehouse');
+		}
 
-        return array(
-            'success' => array(
-                'code' => 200,
-                'message' => 'Warehouse deleted'
-            )
-        );
-    }
+		return array(
+			'success' => array(
+				'code' => 200,
+				'message' => 'Warehouse deleted'
+			)
+		);
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
-    /**
-     * Clean sensible object datas
-     *
-     * @param   Entrepot  $object    Object to clean
-     * @return    array    Array of cleaned object properties
-     */
-    protected function _cleanObjectDatas($object)
-    {
-        // phpcs:enable
-        $object = parent::_cleanObjectDatas($object);
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	/**
+	 * Clean sensible object datas
+	 *
+	 * @param   Entrepot  $object   Object to clean
+	 * @return  Object              Object with cleaned properties
+	 */
+	protected function _cleanObjectDatas($object)
+	{
+		// phpcs:enable
+		$object = parent::_cleanObjectDatas($object);
 
-        // Remove the subscriptions because they are handled as a subresource.
-        //unset($object->subscriptions);
+		// Remove the subscriptions because they are handled as a subresource.
+		//unset($object->subscriptions);
 
-        return $object;
-    }
+		return $object;
+	}
 
 
-    /**
-     * Validate fields before create or update object
-     *
-     * @param array|null    $data    Data to validate
-     * @return array
-     *
-     * @throws RestException
-     */
-    private function _validate($data)
-    {
-        $warehouse = array();
-        foreach (Warehouses::$FIELDS as $field) {
-            if (!isset($data[$field]))
-                throw new RestException(400, "$field field missing");
-            $warehouse[$field] = $data[$field];
-        }
-        return $warehouse;
-    }
+	/**
+	 * Validate fields before create or update object
+	 *
+	 * @param array|null    $data    Data to validate
+	 * @return array
+	 *
+	 * @throws RestException
+	 */
+	private function _validate($data)
+	{
+		$warehouse = array();
+		foreach (Warehouses::$FIELDS as $field) {
+			if (!isset($data[$field]))
+				throw new RestException(400, "$field field missing");
+			$warehouse[$field] = $data[$field];
+		}
+		return $warehouse;
+	}
 }
diff --git a/htdocs/product/stock/class/mouvementstock.class.php b/htdocs/product/stock/class/mouvementstock.class.php
index 8a4697be2a1..8e13553113a 100644
--- a/htdocs/product/stock/class/mouvementstock.class.php
+++ b/htdocs/product/stock/class/mouvementstock.class.php
@@ -41,14 +41,14 @@ class MouvementStock extends CommonObject
 	public $table_element = 'stock_mouvement';
 
 
-    /**
-     * @var int ID product
-     */
+	/**
+	 * @var int ID product
+	 */
 	public $product_id;
 
-    /**
-     * @var int ID warehouse
-     */
+	/**
+	 * @var int ID warehouse
+	 */
 	public $warehouse_id;
 	public $qty;
 
@@ -65,18 +65,18 @@ class MouvementStock extends CommonObject
 	public $price;
 
 	/**
-     * @var int ID user author
-     */
+	 * @var int ID user author
+	 */
 	public $fk_user_author;
 
 	/**
-     * @var string stock movements label
-     */
-    public $label;
+	 * @var string stock movements label
+	 */
+	public $label;
 
-    /**
-     * @var int ID
-     */
+	/**
+	 * @var int ID
+	 */
 	public $fk_origin;
 
 	public $origintype;
@@ -113,11 +113,11 @@ class MouvementStock extends CommonObject
 
 
 
-    /**
+	/**
 	 *  Constructor
 	 *
 	 *  @param      DoliDB		$db      Database handler
-     */
+	 */
 	public function __construct($db)
 	{
 		$this->db = $db;
@@ -136,7 +136,7 @@ class MouvementStock extends CommonObject
 	 *										0=input (stock increase by a stock transfer), 1=output (stock decrease by a stock transfer),
 	 *										2=output (stock decrease), 3=input (stock increase)
 	 *                                      Note that qty should be > 0 with 0 or 3, < 0 with 1 or 2.
-	 *	@param		int		$price			Unit price HT of product, used to calculate average weighted price (PMP in french). If 0, average weighted price is not changed.
+	 *	@param		int		$price			Unit price HT of product, used to calculate average weighted price (AWP or PMP in french). If 0, average weighted price is not changed.
 	 *	@param		string	$label			Label of stock movement
 	 *	@param		string	$inventorycode	Inventory code
 	 *	@param		string	$datem			Force date of movement
@@ -147,10 +147,10 @@ class MouvementStock extends CommonObject
 	 * 	@param		int		$id_product_batch	Id product_batch (when skip_batch is false and we already know which record of product_batch to use)
 	 *	@return		int						<0 if KO, 0 if fk_product is null or product id does not exists, >0 if OK
 	 */
-    public function _create($user, $fk_product, $entrepot_id, $qty, $type, $price = 0, $label = '', $inventorycode = '', $datem = '', $eatby = '', $sellby = '', $batch = '', $skip_batch = false, $id_product_batch = 0)
+	public function _create($user, $fk_product, $entrepot_id, $qty, $type, $price = 0, $label = '', $inventorycode = '', $datem = '', $eatby = '', $sellby = '', $batch = '', $skip_batch = false, $id_product_batch = 0)
 	{
-	    // phpcs:disable
-	    global $conf, $langs;
+		// phpcs:disable
+		global $conf, $langs;
 
 		require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 		require_once DOL_DOCUMENT_ROOT.'/product/stock/class/productlot.class.php';
@@ -159,6 +159,7 @@ class MouvementStock extends CommonObject
 		dol_syslog(get_class($this)."::_create start userid=$user->id, fk_product=$fk_product, warehouse_id=$entrepot_id, qty=$qty, type=$type, price=$price, label=$label, inventorycode=$inventorycode, datem=".$datem.", eatby=".$eatby.", sellby=".$sellby.", batch=".$batch.", skip_batch=".$skip_batch);
 
 		// Clean parameters
+		$price = price2num($price, 'MU');	// Clean value for the casse we receive a float zero value, to have it a real zero value.
 		if (empty($price)) $price = 0;
 		$now = (!empty($datem) ? $datem : dol_now());
 
@@ -181,7 +182,7 @@ class MouvementStock extends CommonObject
 		$this->warehouse_id = $entrepot_id;
 		$this->qty = $qty;
 		$this->type = $type;
-		$this->price = $price;
+		$this->price = price2num($price);
 		$this->label = $label;
 		$this->inventorycode = $inventorycode;
 		$this->datem = $now;
@@ -227,114 +228,114 @@ class MouvementStock extends CommonObject
 			// If not found, we add record
 			$sql = "SELECT pb.rowid, pb.batch, pb.eatby, pb.sellby FROM ".MAIN_DB_PREFIX."product_lot as pb";
 			$sql .= " WHERE pb.fk_product = ".$fk_product." AND pb.batch = '".$this->db->escape($batch)."'";
-            dol_syslog(get_class($this)."::_create scan serial for this product to check if eatby and sellby match", LOG_DEBUG);
-            $resql = $this->db->query($sql);
-            if ($resql)
-            {
-                $num = $this->db->num_rows($resql);
-            	$i = 0;
-            	if ($num > 0)
-            	{
-                	while ($i < $num)
-                	{
-                		$obj = $this->db->fetch_object($resql);
-                        if ($obj->eatby)
-                        {
-                            if ($eatby)
-                            {
-                                $tmparray = dol_getdate($eatby, true);
-                                $eatbywithouthour = dol_mktime(0, 0, 0, $tmparray['mon'], $tmparray['mday'], $tmparray['year']);
-                        		if ($this->db->jdate($obj->eatby) != $eatby && $this->db->jdate($obj->eatby) != $eatbywithouthour)    // We test date without hours and with hours for backward compatibility
-                                {
-                                    // If found and eatby/sellby defined into table and provided and differs, return error
-                                	$langs->load("stocks");
-                                	$this->errors[] = $langs->transnoentitiesnoconv("ThisSerialAlreadyExistWithDifferentDate", $batch, dol_print_date($this->db->jdate($obj->eatby), 'dayhour'), dol_print_date($eatbywithouthour, 'dayhour'));
-                                    dol_syslog("ThisSerialAlreadyExistWithDifferentDate batch=".$batch.", eatby found into product_lot = ".$obj->eatby." = ".dol_print_date($this->db->jdate($obj->eatby), 'dayhourrfc')." so eatbywithouthour = ".$eatbywithouthour." = ".dol_print_date($eatbywithouthour)." - eatby provided = ".$eatby." = ".dol_print_date($eatby, 'dayhourrfc'), LOG_ERR);
-                                    $this->db->rollback();
-                                    return -3;
-                                }
-                            } else {
-                                $eatby = $obj->eatby; // If found and eatby/sellby defined into table and not provided, we take value from table
-                            }
-                        } else {
-                            if ($eatby) // If found and eatby/sellby not defined into table and provided, we update table
-                            {
-                                $productlot = new Productlot($this->db);
-                                $result = $productlot->fetch($obj->rowid);
-                                $productlot->eatby = $eatby;
-                                $result = $productlot->update($user);
-                                if ($result <= 0)
-                                {
-                                    $this->error = $productlot->error;
-                                    $this->errors = $productlot->errors;
-                                    $this->db->rollback();
-                                    return -5;
-                                }
-                            }
-                        }
-                        if ($obj->sellby)
-                        {
-                            if ($sellby)
-                            {
-                                $tmparray = dol_getdate($sellby, true);
-                                $sellbywithouthour = dol_mktime(0, 0, 0, $tmparray['mon'], $tmparray['mday'], $tmparray['year']);
-                                if ($this->db->jdate($obj->sellby) != $sellby && $this->db->jdate($obj->sellby) != $sellbywithouthour)    // We test date without hours and with hours for backward compatibility
-                        		{
-                        		    // If found and eatby/sellby defined into table and provided and differs, return error
-                        			$this->errors[] = $langs->transnoentitiesnoconv("ThisSerialAlreadyExistWithDifferentDate", $batch, dol_print_date($this->db->jdate($obj->sellby)), dol_print_date($sellby));
-            						dol_syslog($langs->transnoentities("ThisSerialAlreadyExistWithDifferentDate", $batch, dol_print_date($this->db->jdate($obj->sellby)), dol_print_date($sellby)), LOG_ERR);
-            						$this->db->rollback();
-                        			return -3;
-                        		}
-                            } else {
-                                $sellby = $obj->sellby; // If found and eatby/sellby defined into table and not provided, we take value from table
-                            }
-                        }
-                	    else
-                        {
-                            if ($sellby) // If found and eatby/sellby not defined into table and provided, we update table
-                            {
-                                $productlot = new Productlot($this->db);
-                                $result = $productlot->fetch($obj->rowid);
-                                $productlot->sellby = $sellby;
-                                $result = $productlot->update($user);
-                                if ($result <= 0)
-                                {
-                                    $this->error = $productlot->error;
-                                    $this->errors = $productlot->errors;
-                                    $this->db->rollback();
-                                    return -5;
-                                }
-                            }
-                        }
-
-                        $i++;
-                	}
-            	}
-            	else   // If not found, we add record
-            	{
-            	    $productlot = new Productlot($this->db);
-            	    $productlot->entity = $conf->entity;
-            	    $productlot->fk_product = $fk_product;
-            	    $productlot->batch = $batch;
-            	    // If we are here = first time we manage this batch, so we used dates provided by users to create lot
-            	    $productlot->eatby = $eatby;
-            	    $productlot->sellby = $sellby;
-            	    $result = $productlot->create($user);
-            	    if ($result <= 0)
-            	    {
-            	        $this->error = $productlot->error;
-            	        $this->errors = $productlot->errors;
-            	        $this->db->rollback();
-            	        return -4;
-            	    }
-            	}
-            }
-            else
+			dol_syslog(get_class($this)."::_create scan serial for this product to check if eatby and sellby match", LOG_DEBUG);
+			$resql = $this->db->query($sql);
+			if ($resql)
 			{
-            	dol_print_error($this->db);
-            	$this->db->rollback();
-            	return -1;
+				$num = $this->db->num_rows($resql);
+				$i = 0;
+				if ($num > 0)
+				{
+					while ($i < $num)
+					{
+						$obj = $this->db->fetch_object($resql);
+						if ($obj->eatby)
+						{
+							if ($eatby)
+							{
+								$tmparray = dol_getdate($eatby, true);
+								$eatbywithouthour = dol_mktime(0, 0, 0, $tmparray['mon'], $tmparray['mday'], $tmparray['year']);
+								if ($this->db->jdate($obj->eatby) != $eatby && $this->db->jdate($obj->eatby) != $eatbywithouthour)    // We test date without hours and with hours for backward compatibility
+								{
+									// If found and eatby/sellby defined into table and provided and differs, return error
+									$langs->load("stocks");
+									$this->errors[] = $langs->transnoentitiesnoconv("ThisSerialAlreadyExistWithDifferentDate", $batch, dol_print_date($this->db->jdate($obj->eatby), 'dayhour'), dol_print_date($eatbywithouthour, 'dayhour'));
+									dol_syslog("ThisSerialAlreadyExistWithDifferentDate batch=".$batch.", eatby found into product_lot = ".$obj->eatby." = ".dol_print_date($this->db->jdate($obj->eatby), 'dayhourrfc')." so eatbywithouthour = ".$eatbywithouthour." = ".dol_print_date($eatbywithouthour)." - eatby provided = ".$eatby." = ".dol_print_date($eatby, 'dayhourrfc'), LOG_ERR);
+									$this->db->rollback();
+									return -3;
+								}
+							} else {
+								$eatby = $obj->eatby; // If found and eatby/sellby defined into table and not provided, we take value from table
+							}
+						} else {
+							if ($eatby) // If found and eatby/sellby not defined into table and provided, we update table
+							{
+								$productlot = new Productlot($this->db);
+								$result = $productlot->fetch($obj->rowid);
+								$productlot->eatby = $eatby;
+								$result = $productlot->update($user);
+								if ($result <= 0)
+								{
+									$this->error = $productlot->error;
+									$this->errors = $productlot->errors;
+									$this->db->rollback();
+									return -5;
+								}
+							}
+						}
+						if ($obj->sellby)
+						{
+							if ($sellby)
+							{
+								$tmparray = dol_getdate($sellby, true);
+								$sellbywithouthour = dol_mktime(0, 0, 0, $tmparray['mon'], $tmparray['mday'], $tmparray['year']);
+								if ($this->db->jdate($obj->sellby) != $sellby && $this->db->jdate($obj->sellby) != $sellbywithouthour)    // We test date without hours and with hours for backward compatibility
+								{
+									// If found and eatby/sellby defined into table and provided and differs, return error
+									$this->errors[] = $langs->transnoentitiesnoconv("ThisSerialAlreadyExistWithDifferentDate", $batch, dol_print_date($this->db->jdate($obj->sellby)), dol_print_date($sellby));
+									dol_syslog($langs->transnoentities("ThisSerialAlreadyExistWithDifferentDate", $batch, dol_print_date($this->db->jdate($obj->sellby)), dol_print_date($sellby)), LOG_ERR);
+									$this->db->rollback();
+									return -3;
+								}
+							} else {
+								$sellby = $obj->sellby; // If found and eatby/sellby defined into table and not provided, we take value from table
+							}
+						}
+						else
+						{
+							if ($sellby) // If found and eatby/sellby not defined into table and provided, we update table
+							{
+								$productlot = new Productlot($this->db);
+								$result = $productlot->fetch($obj->rowid);
+								$productlot->sellby = $sellby;
+								$result = $productlot->update($user);
+								if ($result <= 0)
+								{
+									$this->error = $productlot->error;
+									$this->errors = $productlot->errors;
+									$this->db->rollback();
+									return -5;
+								}
+							}
+						}
+
+						$i++;
+					}
+				}
+				else   // If not found, we add record
+				{
+					$productlot = new Productlot($this->db);
+					$productlot->entity = $conf->entity;
+					$productlot->fk_product = $fk_product;
+					$productlot->batch = $batch;
+					// If we are here = first time we manage this batch, so we used dates provided by users to create lot
+					$productlot->eatby = $eatby;
+					$productlot->sellby = $sellby;
+					$result = $productlot->create($user);
+					if ($result <= 0)
+					{
+						$this->error = $productlot->error;
+						$this->errors = $productlot->errors;
+						$this->db->rollback();
+						return -4;
+					}
+				}
+			}
+			else
+			{
+				dol_print_error($this->db);
+				$this->db->rollback();
+				return -1;
 			}
 		}
 
@@ -346,41 +347,41 @@ class MouvementStock extends CommonObject
 		// Note that qty should be > 0 with type 0 or 3, < 0 with type 1 or 2.
 		if ($movestock && $qty < 0 && empty($conf->global->STOCK_ALLOW_NEGATIVE_TRANSFER))
 		{
-    		if (!empty($conf->productbatch->enabled) && $product->hasbatch() && !$skip_batch)
-    		{
-    		    $foundforbatch = 0;
-    		    $qtyisnotenough = 0;
-    		    foreach ($product->stock_warehouse[$entrepot_id]->detail_batch as $batchcursor => $prodbatch)
-    		    {
-    		        if ($batch != $batchcursor) continue;
-    		        $foundforbatch = 1;
-    		        if ($prodbatch->qty < abs($qty)) $qtyisnotenough = $prodbatch->qty;
-        		    break;
-    		    }
-    		    if (!$foundforbatch || $qtyisnotenough)
-    		    {
-    		        $langs->load("stocks");
-    		        include_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
-    		        $tmpwarehouse = new Entrepot($this->db);
-    		        $tmpwarehouse->fetch($entrepot_id);
+			if (!empty($conf->productbatch->enabled) && $product->hasbatch() && !$skip_batch)
+			{
+				$foundforbatch = 0;
+				$qtyisnotenough = 0;
+				foreach ($product->stock_warehouse[$entrepot_id]->detail_batch as $batchcursor => $prodbatch)
+				{
+					if ($batch != $batchcursor) continue;
+					$foundforbatch = 1;
+					if ($prodbatch->qty < abs($qty)) $qtyisnotenough = $prodbatch->qty;
+					break;
+				}
+				if (!$foundforbatch || $qtyisnotenough)
+				{
+					$langs->load("stocks");
+					include_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
+					$tmpwarehouse = new Entrepot($this->db);
+					$tmpwarehouse->fetch($entrepot_id);
 
-    		        $this->error = $langs->trans('qtyToTranferLotIsNotEnough', $product->ref, $batch, $qtyisnotenough, $tmpwarehouse->ref);
-    		        $this->errors[] = $langs->trans('qtyToTranferLotIsNotEnough', $product->ref, $batch, $qtyisnotenough, $tmpwarehouse->ref);
-        		    $this->db->rollback();
-        		    return -8;
-    		    }
-    		}
-    		else
-    		{
-    		    if (empty($product->stock_warehouse[$entrepot_id]->real) || $product->stock_warehouse[$entrepot_id]->real < abs($qty))
-    		    {
-    		        $langs->load("stocks");
-    		        $this->error = $langs->trans('qtyToTranferIsNotEnough').' : '.$product->ref;
-    		        $this->errors[] = $langs->trans('qtyToTranferIsNotEnough').' : '.$product->ref;
-    		        $this->db->rollback();
-    		        return -8;
-    		    }
-    		}
+					$this->error = $langs->trans('qtyToTranferLotIsNotEnough', $product->ref, $batch, $qtyisnotenough, $tmpwarehouse->ref);
+					$this->errors[] = $langs->trans('qtyToTranferLotIsNotEnough', $product->ref, $batch, $qtyisnotenough, $tmpwarehouse->ref);
+					$this->db->rollback();
+					return -8;
+				}
+			}
+			else
+			{
+				if (empty($product->stock_warehouse[$entrepot_id]->real) || $product->stock_warehouse[$entrepot_id]->real < abs($qty))
+				{
+					$langs->load("stocks");
+					$this->error = $langs->trans('qtyToTranferIsNotEnough').' : '.$product->ref;
+					$this->errors[] = $langs->trans('qtyToTranferIsNotEnough').' : '.$product->ref;
+					$this->db->rollback();
+					return -8;
+				}
+			}
 		}
 
 		if ($movestock && $entrepot_id > 0)	// Change stock for current product, change for subproduct is done after
@@ -471,7 +472,7 @@ class MouvementStock extends CommonObject
 				}
 			}
 
-			// Calculate new PMP.
+			// Calculate new AWP (PMP)
 			$newpmp = 0;
 			if (!$error)
 			{
@@ -480,7 +481,7 @@ class MouvementStock extends CommonObject
 					// After a stock increase
 					// Note: PMP is calculated on stock input only (type of movement = 0 or 3). If type == 0 or 3, qty should be > 0.
 					// Note: Price should always be >0 or 0. PMP should be always >0 (calculated on input)
-					if ($price > 0 || (! empty($conf->global->STOCK_UPDATE_AWP_EVEN_WHEN_ENTRY_PRICE_IS_NULL) && $price ==0)) {
+					if ($price > 0 || (!empty($conf->global->STOCK_UPDATE_AWP_EVEN_WHEN_ENTRY_PRICE_IS_NULL) && $price == 0)) {
 						$oldqtytouse = ($oldqty >= 0 ? $oldqty : 0);
 						// We make a test on oldpmp>0 to avoid to use normal rule on old data with no pmp field defined
 						if ($oldpmp > 0) {
@@ -533,10 +534,10 @@ class MouvementStock extends CommonObject
 			{
 				if ($id_product_batch > 0)
 				{
-				    $result = $this->createBatch($id_product_batch, $qty);
+					$result = $this->createBatch($id_product_batch, $qty);
 				} else {
-			        $param_batch = array('fk_product_stock' =>$fk_product_stock, 'batchnumber'=>$batch);
-				    $result = $this->createBatch($param_batch, $qty);
+					$param_batch = array('fk_product_stock' =>$fk_product_stock, 'batchnumber'=>$batch);
+					$result = $this->createBatch($param_batch, $qty);
 				}
 				if ($result < 0) $error++;
 			}
@@ -548,7 +549,7 @@ class MouvementStock extends CommonObject
 
 				// $sql = "UPDATE ".MAIN_DB_PREFIX."product SET pmp = ".$newpmp.", stock = ".$this->db->ifsql("stock IS NULL", 0, "stock") . " + ".$qty;
 				// $sql.= " WHERE rowid = ".$fk_product;
-    			// Update pmp + denormalized fields because we change content of produt_stock. Warning: Do not use "SET p.stock", does not works with pgsql
+				// Update pmp + denormalized fields because we change content of produt_stock. Warning: Do not use "SET p.stock", does not works with pgsql
 				$sql = "UPDATE ".MAIN_DB_PREFIX."product as p SET pmp = ".$newpmp.",";
 				$sql .= " stock=(SELECT SUM(ps.reel) FROM ".MAIN_DB_PREFIX."product_stock as ps WHERE ps.fk_product = p.rowid)";
 				$sql .= " WHERE rowid = ".$fk_product;
@@ -562,11 +563,11 @@ class MouvementStock extends CommonObject
 				}
 			}
 
-		    // If stock is now 0, we can remove entry into llx_product_stock, but only if there is no child lines into llx_product_batch (detail of batch, because we can imagine
-		    // having a lot1/qty=X and lot2/qty=-X, so 0 but we must not loose repartition of different lot.
-		    $sql = "DELETE FROM ".MAIN_DB_PREFIX."product_stock WHERE reel = 0 AND rowid NOT IN (SELECT fk_product_stock FROM ".MAIN_DB_PREFIX."product_batch as pb)";
-		    $resql = $this->db->query($sql);
-		    // We do not test error, it can fails if there is child in batch details
+			// If stock is now 0, we can remove entry into llx_product_stock, but only if there is no child lines into llx_product_batch (detail of batch, because we can imagine
+			// having a lot1/qty=X and lot2/qty=-X, so 0 but we must not loose repartition of different lot.
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX."product_stock WHERE reel = 0 AND rowid NOT IN (SELECT fk_product_stock FROM ".MAIN_DB_PREFIX."product_batch as pb)";
+			$resql = $this->db->query($sql);
+			// We do not test error, it can fails if there is child in batch details
 		}
 
 		// Add movement for sub products (recursive call)
@@ -577,10 +578,10 @@ class MouvementStock extends CommonObject
 
 		if ($movestock && !$error)
 		{
-            // Call trigger
-            $result = $this->call_trigger('STOCK_MOVEMENT', $user);
-            if ($result < 0) $error++;
-            // End call triggers
+			// Call trigger
+			$result = $this->call_trigger('STOCK_MOVEMENT', $user);
+			if ($result < 0) $error++;
+			// End call triggers
 		}
 
 		if (!$error)
@@ -607,80 +608,80 @@ class MouvementStock extends CommonObject
 	 */
 	public function fetch($id)
 	{
-	    dol_syslog(__METHOD__, LOG_DEBUG);
+		dol_syslog(__METHOD__, LOG_DEBUG);
 
-	    $sql = 'SELECT';
-	    $sql .= ' t.rowid,';
-	    $sql .= " t.tms,";
-	    $sql .= " t.datem,";
-	    $sql .= " t.fk_product,";
-	    $sql .= " t.fk_entrepot,";
-	    $sql .= " t.value,";
-	    $sql .= " t.price,";
-	    $sql .= " t.type_mouvement,";
-	    $sql .= " t.fk_user_author,";
-	    $sql .= " t.label,";
-	    $sql .= " t.fk_origin,";
-	    $sql .= " t.origintype,";
-	    $sql .= " t.inventorycode,";
-	    $sql .= " t.batch,";
-	    $sql .= " t.eatby,";
-	    $sql .= " t.sellby,";
-	    $sql .= " t.fk_projet as fk_project";
-	    $sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
-	    $sql .= ' WHERE 1 = 1';
-	    //if (null !== $ref) {
-	        //$sql .= ' AND t.ref = ' . '\'' . $ref . '\'';
-	    //} else {
-	        $sql .= ' AND t.rowid = '.$id;
-	    //}
+		$sql = 'SELECT';
+		$sql .= ' t.rowid,';
+		$sql .= " t.tms,";
+		$sql .= " t.datem,";
+		$sql .= " t.fk_product,";
+		$sql .= " t.fk_entrepot,";
+		$sql .= " t.value,";
+		$sql .= " t.price,";
+		$sql .= " t.type_mouvement,";
+		$sql .= " t.fk_user_author,";
+		$sql .= " t.label,";
+		$sql .= " t.fk_origin,";
+		$sql .= " t.origintype,";
+		$sql .= " t.inventorycode,";
+		$sql .= " t.batch,";
+		$sql .= " t.eatby,";
+		$sql .= " t.sellby,";
+		$sql .= " t.fk_projet as fk_project";
+		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
+		$sql .= ' WHERE 1 = 1';
+		//if (null !== $ref) {
+			//$sql .= ' AND t.ref = ' . '\'' . $ref . '\'';
+		//} else {
+			$sql .= ' AND t.rowid = '.$id;
+		//}
 
-	    $resql = $this->db->query($sql);
-	    if ($resql) {
-	        $numrows = $this->db->num_rows($resql);
-	        if ($numrows) {
-	            $obj = $this->db->fetch_object($resql);
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			$numrows = $this->db->num_rows($resql);
+			if ($numrows) {
+				$obj = $this->db->fetch_object($resql);
 
-	            $this->id = $obj->rowid;
+				$this->id = $obj->rowid;
 
-	            $this->product_id = $obj->fk_product;
-	            $this->warehouse_id = $obj->fk_entrepot;
-	            $this->qty = $obj->value;
-	            $this->type = $obj->type_mouvement;
+				$this->product_id = $obj->fk_product;
+				$this->warehouse_id = $obj->fk_entrepot;
+				$this->qty = $obj->value;
+				$this->type = $obj->type_mouvement;
 
-	            $this->tms = $this->db->jdate($obj->tms);
-	            $this->datem = $this->db->jdate($obj->datem);
-	            $this->price = $obj->price;
-	            $this->fk_user_author = $obj->fk_user_author;
-	            $this->label = $obj->label;
-	            $this->fk_origin = $obj->fk_origin;
-	            $this->origintype = $obj->origintype;
-	            $this->inventorycode = $obj->inventorycode;
-	            $this->batch = $obj->batch;
-	            $this->eatby = $this->db->jdate($obj->eatby);
-	            $this->sellby = $this->db->jdate($obj->sellby);
-	            $this->fk_project = $obj->fk_project;
-	        }
+				$this->tms = $this->db->jdate($obj->tms);
+				$this->datem = $this->db->jdate($obj->datem);
+				$this->price = $obj->price;
+				$this->fk_user_author = $obj->fk_user_author;
+				$this->label = $obj->label;
+				$this->fk_origin = $obj->fk_origin;
+				$this->origintype = $obj->origintype;
+				$this->inventorycode = $obj->inventorycode;
+				$this->batch = $obj->batch;
+				$this->eatby = $this->db->jdate($obj->eatby);
+				$this->sellby = $this->db->jdate($obj->sellby);
+				$this->fk_project = $obj->fk_project;
+			}
 
-	        // Retrieve all extrafield
-	        // fetch optionals attributes and labels
-	        $this->fetch_optionals();
+			// Retrieve all extrafield
+			// fetch optionals attributes and labels
+			$this->fetch_optionals();
 
-	        // $this->fetch_lines();
+			// $this->fetch_lines();
 
-	        $this->db->free($resql);
+			$this->db->free($resql);
 
-	        if ($numrows) {
-	            return 1;
-	        } else {
-	            return 0;
-	        }
-	    } else {
-	        $this->errors[] = 'Error '.$this->db->lasterror();
-	        dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
+			if ($numrows) {
+				return 1;
+			} else {
+				return 0;
+			}
+		} else {
+			$this->errors[] = 'Error '.$this->db->lasterror();
+			dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
 
-	        return -1;
-	    }
+			return -1;
+		}
 	}
 
 
@@ -774,7 +775,7 @@ class MouvementStock extends CommonObject
 	 */
 	public function livraison($user, $fk_product, $entrepot_id, $qty, $price = 0, $label = '', $datem = '', $eatby = '', $sellby = '', $batch = '', $id_product_batch = 0, $inventorycode = '')
 	{
-	    global $conf;
+		global $conf;
 
 		$skip_batch = empty($conf->productbatch->enabled);
 
@@ -800,11 +801,11 @@ class MouvementStock extends CommonObject
 	 */
 	public function reception($user, $fk_product, $entrepot_id, $qty, $price = 0, $label = '', $eatby = '', $sellby = '', $batch = '', $datem = '', $id_product_batch = 0, $inventorycode = '')
 	{
-	    global $conf;
+		global $conf;
 
-	    $skip_batch = empty($conf->productbatch->enabled);
+		$skip_batch = empty($conf->productbatch->enabled);
 
-	    return $this->_create($user, $fk_product, $entrepot_id, $qty, 3, $price, $label, $inventorycode, $datem, $eatby, $sellby, $batch, $skip_batch, $id_product_batch);
+		return $this->_create($user, $fk_product, $entrepot_id, $qty, 3, $price, $label, $inventorycode, $datem, $eatby, $sellby, $batch, $skip_batch, $id_product_batch);
 	}
 
 
@@ -869,7 +870,7 @@ class MouvementStock extends CommonObject
 	 */
 	private function createBatch($dluo, $qty)
 	{
-	    global $user;
+		global $user;
 
 		$pdluo = new Productbatch($this->db);
 
@@ -905,7 +906,7 @@ class MouvementStock extends CommonObject
 		if ($result >= 0)
 		{
 			// No error
-			if ($pdluo->id > 0)	{	// product_batch record found
+			if ($pdluo->id > 0) {	// product_batch record found
 				//print "Avant ".$pdluo->qty." Apres ".($pdluo->qty + $qty)."<br>";
 				$pdluo->qty += $qty;
 				if ($pdluo->qty == 0) {
@@ -932,7 +933,7 @@ class MouvementStock extends CommonObject
 		return $result;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Return Url link of origin object
 	 *
@@ -942,8 +943,8 @@ class MouvementStock extends CommonObject
 	 */
 	public function get_origin($fk_origin, $origintype)
 	{
-        // phpcs:enable
-	    $origin = '';
+		// phpcs:enable
+		$origin = '';
 
 		switch ($origintype) {
 			case 'commande':
@@ -982,10 +983,10 @@ class MouvementStock extends CommonObject
 			default:
 				if ($origintype)
 				{
-                    // Separate originetype with "@" : left part is class name, right part is module name
-                    $origintype_array = explode('@', $origintype);
-                    $classname = ucfirst($origintype_array[0]);
-                    $modulename = empty($origintype_array[1]) ? $classname : $origintype_array[1];
+					// Separate originetype with "@" : left part is class name, right part is module name
+					$origintype_array = explode('@', $origintype);
+					$classname = ucfirst($origintype_array[0]);
+					$modulename = empty($origintype_array[1]) ? $classname : $origintype_array[1];
 					$result = dol_include_once('/'.$modulename.'/class/'.strtolower($classname).'.class.php');
 					if ($result)
 					{
@@ -1034,21 +1035,21 @@ class MouvementStock extends CommonObject
 
 
 	/**
-     *  Initialise an instance with random values.
-     *  Used to build previews or test instances.
-     *	id must be 0 if object instance is a specimen.
-     *
-     *  @return	void
-     */
-    public function initAsSpecimen()
-    {
-        global $user, $langs, $conf, $mysoc;
+	 *  Initialise an instance with random values.
+	 *  Used to build previews or test instances.
+	 *	id must be 0 if object instance is a specimen.
+	 *
+	 *  @return	void
+	 */
+	public function initAsSpecimen()
+	{
+		global $user, $langs, $conf, $mysoc;
 
-        // Initialize parameters
-        $this->id = 0;
+		// Initialize parameters
+		$this->id = 0;
 
-        // There is no specific properties. All data into insert are provided as method parameter.
-    }
+		// There is no specific properties. All data into insert are provided as method parameter.
+	}
 
 	/**
 	 *  Return a link (with optionaly the picto)
@@ -1099,7 +1100,7 @@ class MouvementStock extends CommonObject
 		return $this->LibStatut($mode);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Renvoi le libelle d'un status donne
 	 *
@@ -1108,7 +1109,7 @@ class MouvementStock extends CommonObject
 	 */
 	public function LibStatut($mode = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 
 		if ($mode == 0 || $mode == 1) {
diff --git a/htdocs/product/stock/class/productlot.class.php b/htdocs/product/stock/class/productlot.class.php
index dcc29de4769..3e7c23a6e92 100644
--- a/htdocs/product/stock/class/productlot.class.php
+++ b/htdocs/product/stock/class/productlot.class.php
@@ -54,33 +54,33 @@ class Productlot extends CommonObject
 	 * 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
 	 * @var int
 	 */
-    public $ismultientitymanaged = 1;
+	public $ismultientitymanaged = 1;
 
 
-    /**
-     *  'type' if the field format ('integer', 'integer:ObjectClass:PathToClass[:AddCreateButtonOrNot[:Filter]]', 'varchar(x)', 'double(24,8)', 'real', 'price', 'text', 'html', 'date', 'datetime', 'timestamp', 'duration', 'mail', 'phone', 'url', 'password')
-     *         Note: Filter can be a string like "(t.ref:like:'SO-%') or (t.date_creation:<:'20160101') or (t.nature:is:NULL)"
-     *  'label' the translation key.
-     *  'enabled' is a condition when the field must be managed (Example: 1 or '$conf->global->MY_SETUP_PARAM)
-     *  'position' is the sort order of field.
-     *  'notnull' is set to 1 if not null in database. Set to -1 if we must set data to null if empty ('' or 0).
-     *  'visible' says if field is visible in list (Examples: 0=Not visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create). 5=Visible on list and view only (not create/not update). Using a negative value means field is not shown by default on list but can be selected for viewing)
-     *  'noteditable' says if field is not editable (1 or 0)
-     *  'default' is a default value for creation (can still be overwrote by the Setup of Default Values if field is editable in creation form). Note: If default is set to '(PROV)' and field is 'ref', the default value will be set to '(PROVid)' where id is rowid when a new record is created.
-     *  'index' if we want an index in database.
-     *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
-     *  'searchall' is 1 if we want to search in this field when making a search from the quick search button.
-     *  'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
-     *  'css' is the CSS style to use on field. For example: 'maxwidth200'
-     *  'help' is a string visible as a tooltip on field
-     *  'showoncombobox' if value of the field must be visible into the label of the combobox that list record
-     *  'disabled' is 1 if we want to have the field locked by a 'disabled' attribute. In most cases, this is never set into the definition of $fields into class, but is set dynamically by some part of code.
-     *  'arraykeyval' to set list of value if type is a list of predefined values. For example: array("0"=>"Draft","1"=>"Active","-1"=>"Cancel")
-     *  'autofocusoncreate' to have field having the focus on a create form. Only 1 field should have this property set to 1.
-     *  'comment' is not used. You can store here any text of your choice. It is not used by application.
-     *
-     *  Note: To have value dynamic, you can set value to 0 in definition and edit the value on the fly into the constructor.
-     */
+	/**
+	 *  'type' if the field format ('integer', 'integer:ObjectClass:PathToClass[:AddCreateButtonOrNot[:Filter]]', 'varchar(x)', 'double(24,8)', 'real', 'price', 'text', 'html', 'date', 'datetime', 'timestamp', 'duration', 'mail', 'phone', 'url', 'password')
+	 *         Note: Filter can be a string like "(t.ref:like:'SO-%') or (t.date_creation:<:'20160101') or (t.nature:is:NULL)"
+	 *  'label' the translation key.
+	 *  'enabled' is a condition when the field must be managed (Example: 1 or '$conf->global->MY_SETUP_PARAM)
+	 *  'position' is the sort order of field.
+	 *  'notnull' is set to 1 if not null in database. Set to -1 if we must set data to null if empty ('' or 0).
+	 *  'visible' says if field is visible in list (Examples: 0=Not visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create). 5=Visible on list and view only (not create/not update). Using a negative value means field is not shown by default on list but can be selected for viewing)
+	 *  'noteditable' says if field is not editable (1 or 0)
+	 *  'default' is a default value for creation (can still be overwrote by the Setup of Default Values if field is editable in creation form). Note: If default is set to '(PROV)' and field is 'ref', the default value will be set to '(PROVid)' where id is rowid when a new record is created.
+	 *  'index' if we want an index in database.
+	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
+	 *  'searchall' is 1 if we want to search in this field when making a search from the quick search button.
+	 *  'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
+	 *  'css' is the CSS style to use on field. For example: 'maxwidth200'
+	 *  'help' is a string visible as a tooltip on field
+	 *  'showoncombobox' if value of the field must be visible into the label of the combobox that list record
+	 *  'disabled' is 1 if we want to have the field locked by a 'disabled' attribute. In most cases, this is never set into the definition of $fields into class, but is set dynamically by some part of code.
+	 *  'arraykeyval' to set list of value if type is a list of predefined values. For example: array("0"=>"Draft","1"=>"Active","-1"=>"Cancel")
+	 *  'autofocusoncreate' to have field having the focus on a create form. Only 1 field should have this property set to 1.
+	 *  'comment' is not used. You can store here any text of your choice. It is not used by application.
+	 *
+	 *  Note: To have value dynamic, you can set value to 0 in definition and edit the value on the fly into the constructor.
+	 */
 
 	/**
 	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
@@ -104,8 +104,8 @@ class Productlot extends CommonObject
 	public $entity;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_product;
 
 	public $batch;
@@ -115,13 +115,13 @@ class Productlot extends CommonObject
 	public $tms = '';
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_user_creat;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_user_modif;
 
 	public $import_key;
@@ -526,10 +526,10 @@ class Productlot extends CommonObject
 	 */
 	public function getLibStatut($mode = 0)
 	{
-	    return $this->LibStatut(0, $mode);
+		return $this->LibStatut(0, $mode);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Return label of a given status
 	 *
@@ -539,12 +539,12 @@ class Productlot extends CommonObject
 	 */
 	public function LibStatut($status, $mode = 0)
 	{
-        // phpcs:enable
-	    global $langs;
+		// phpcs:enable
+		global $langs;
 
-	    //$langs->load('stocks');
+		//$langs->load('stocks');
 
-	    return '';
+		return '';
 	}
 
 
@@ -554,64 +554,64 @@ class Productlot extends CommonObject
 	 *
 	 *	@param	int		$withpicto				Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
 	 *	@param	string	$option					On what the link point to
-     *  @param	integer	$notooltip				1=Disable tooltip
-     *  @param	int		$maxlen					Max length of visible user name
-     *  @param  string  $morecss            	Add more css on link
-     *  @param  int     $save_lastsearch_value	-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+	 *  @param	integer	$notooltip				1=Disable tooltip
+	 *  @param	int		$maxlen					Max length of visible user name
+	 *  @param  string  $morecss            	Add more css on link
+	 *  @param  int     $save_lastsearch_value	-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
 	 *	@return	string							String with URL
 	 */
 	public function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $maxlen = 24, $morecss = '', $save_lastsearch_value = -1)
 	{
 		global $langs, $conf, $db;
-        global $dolibarr_main_authentication, $dolibarr_main_demo;
-        global $menumanager;
+		global $dolibarr_main_authentication, $dolibarr_main_demo;
+		global $menumanager;
 
-        $result = '';
+		$result = '';
 
-        $label = '<u>'.$langs->trans("Batch").'</u>';
-        $label .= '<div width="100%">';
-        $label .= '<b>'.$langs->trans('Batch').':</b> '.$this->batch;
-        if ($this->eatby)
-        {
-            $label .= '<br><b>'.$langs->trans('EatByDate').':</b> '.dol_print_date($this->eatby, 'day');
-        }
-        if ($this->sellby)
-        {
-            $label .= '<br><b>'.$langs->trans('SellByDate').':</b> '.dol_print_date($this->sellby, 'day');
-        }
+		$label = '<u>'.$langs->trans("Batch").'</u>';
+		$label .= '<div width="100%">';
+		$label .= '<b>'.$langs->trans('Batch').':</b> '.$this->batch;
+		if ($this->eatby)
+		{
+			$label .= '<br><b>'.$langs->trans('EatByDate').':</b> '.dol_print_date($this->eatby, 'day');
+		}
+		if ($this->sellby)
+		{
+			$label .= '<br><b>'.$langs->trans('SellByDate').':</b> '.dol_print_date($this->sellby, 'day');
+		}
 
-        $url = DOL_URL_ROOT.'/product/stock/productlot_card.php?id='.$this->id;
+		$url = DOL_URL_ROOT.'/product/stock/productlot_card.php?id='.$this->id;
 
-        if ($option != 'nolink')
-        {
-        	// Add param to save lastsearch_values or not
-        	$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
-        	if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
-        	if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
-        }
+		if ($option != 'nolink')
+		{
+			// Add param to save lastsearch_values or not
+			$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
+			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
+			if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
+		}
 
-        $linkclose = '';
-        if (empty($notooltip))
-        {
-        	if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-        	{
-        		$label = $langs->trans("ShowMyObject");
-        		$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
-        	}
-        	$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
-        	$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
-        } else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+		$linkclose = '';
+		if (empty($notooltip))
+		{
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+			{
+				$label = $langs->trans("ShowMyObject");
+				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
+			}
+			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
+			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
+		} else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
-        $linkstart = '<a href="'.$url.'"';
-        $linkstart .= $linkclose.'>';
-        $linkend = '</a>';
+		$linkstart = '<a href="'.$url.'"';
+		$linkstart .= $linkclose.'>';
+		$linkend = '</a>';
 
-        $result .= $linkstart;
-        if ($withpicto) $result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
-        if ($withpicto != 2) $result .= $this->batch;
-        $result .= $linkend;
+		$result .= $linkstart;
+		if ($withpicto) $result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+		if ($withpicto != 2) $result .= $this->batch;
+		$result .= $linkend;
 
-        return $result;
+		return $result;
 	}
 
 
diff --git a/htdocs/product/stock/class/productstockentrepot.class.php b/htdocs/product/stock/class/productstockentrepot.class.php
index 27cd603d98a..ad36dc43c15 100644
--- a/htdocs/product/stock/class/productstockentrepot.class.php
+++ b/htdocs/product/stock/class/productstockentrepot.class.php
@@ -53,13 +53,13 @@ class ProductStockEntrepot extends CommonObject
 	public $tms = '';
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_product;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_entrepot;
 
 	public $seuil_stock_alerte;
@@ -471,38 +471,38 @@ class ProductStockEntrepot extends CommonObject
 	 *
 	 *	@param	int		$withpicto			Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
 	 *	@param	string	$option				On what the link point to
-     *  @param	integer	$notooltip			1=Disable tooltip
-     *  @param	int		$maxlen				Max length of visible user name
-     *  @param  string  $morecss            Add more css on link
+	 *  @param	integer	$notooltip			1=Disable tooltip
+	 *  @param	int		$maxlen				Max length of visible user name
+	 *  @param  string  $morecss            Add more css on link
 	 *	@return	string						String with URL
 	 */
 	public function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $maxlen = 24, $morecss = '')
 	{
 		global $langs, $conf, $db;
-        global $dolibarr_main_authentication, $dolibarr_main_demo;
-        global $menumanager;
+		global $dolibarr_main_authentication, $dolibarr_main_demo;
+		global $menumanager;
 
 
-        $result = '';
-        $companylink = '';
+		$result = '';
+		$companylink = '';
 
-        $label = '<u>'.$langs->trans("MyModule").'</u>';
-        $label .= '<div width="100%">';
-        $label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref;
+		$label = '<u>'.$langs->trans("MyModule").'</u>';
+		$label .= '<div width="100%">';
+		$label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref;
 
-        $link = '<a href="'.DOL_URL_ROOT.'/ProductEntrepot/card.php?id='.$this->id.'"';
-        $link .= ($notooltip ? '' : ' title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip'.($morecss ? ' '.$morecss : '').'"');
-        $link .= '>';
+		$link = '<a href="'.DOL_URL_ROOT.'/ProductEntrepot/card.php?id='.$this->id.'"';
+		$link .= ($notooltip ? '' : ' title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip'.($morecss ? ' '.$morecss : '').'"');
+		$link .= '>';
 		$linkend = '</a>';
 
-        if ($withpicto)
-        {
-            $result .= ($link.img_object(($notooltip ? '' : $label), 'label', ($notooltip ? '' : 'class="classfortooltip"'), 0, 0, $notooltip ? 0 : 1).$linkend);
-            if ($withpicto != 2) $result .= ' ';
-        }
-        $result .= $link.$this->ref.$linkend;
-        return $result;
-    }
+		if ($withpicto)
+		{
+			$result .= ($link.img_object(($notooltip ? '' : $label), 'label', ($notooltip ? '' : 'class="classfortooltip"'), 0, 0, $notooltip ? 0 : 1).$linkend);
+			if ($withpicto != 2) $result .= ' ';
+		}
+		$result .= $link.$this->ref.$linkend;
+		return $result;
+	}
 
 	/**
 	 *  Retourne le libelle du status d'un user (actif, inactif)
@@ -515,7 +515,7 @@ class ProductStockEntrepot extends CommonObject
 		return $this->LibStatut($this->status, $mode);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Renvoi le libelle d'un status donne
 	 *
@@ -525,7 +525,7 @@ class ProductStockEntrepot extends CommonObject
 	 */
 	public function LibStatut($status, $mode = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 
 		if ($mode == 0)
diff --git a/htdocs/product/stock/list.php b/htdocs/product/stock/list.php
index 57051393893..f8700a1884e 100644
--- a/htdocs/product/stock/list.php
+++ b/htdocs/product/stock/list.php
@@ -86,12 +86,12 @@ $search_array_options = $extrafields->getOptionalsFromPost($object->table_elemen
 
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array(
-    't.ref'=>"Ref",
-    't.lieu'=>"LocationSummary",
-    't.description'=>"Description",
-    't.address'=>"Address",
-    't.zip'=>'Zip',
-    't.town'=>'Town',
+	't.ref'=>"Ref",
+	't.lieu'=>"LocationSummary",
+	't.description'=>"Description",
+	't.address'=>"Address",
+	't.zip'=>'Zip',
+	't.town'=>'Town',
 	't.phone'=>'Phone',
 	't.fax'=>'Fax',
 );
@@ -419,7 +419,7 @@ foreach ($object->fields as $key => $val)
 	if (!empty($arrayfields['t.'.$key]['checked']))
 	{
 		print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
-		if (is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
+		if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
 		elseif (strpos($val['type'], 'integer:') === 0 || strpos($val['type'], 'sellist:') === 0) {
 			print $object->showInputField($val, $key, $search[$key], '', '', 'search_', 'maxwidth150', 1);
 		} elseif (!preg_match('/^(date|timestamp)/', $val['type'])) print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
diff --git a/htdocs/product/stock/massstockmove.php b/htdocs/product/stock/massstockmove.php
index 86458966b34..90721f8bfda 100644
--- a/htdocs/product/stock/massstockmove.php
+++ b/htdocs/product/stock/massstockmove.php
@@ -39,7 +39,7 @@ $hookmanager->initHooks(array('massstockmove'));
 
 // Security check
 if ($user->socid) {
-    $socid = $user->socid;
+	$socid = $user->socid;
 }
 $result = restrictedArea($user, 'produit|service');
 
@@ -59,11 +59,11 @@ $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("pa
 if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 
 if (!$sortfield) {
-    $sortfield = 'p.ref';
+	$sortfield = 'p.ref';
 }
 
 if (!$sortorder) {
-    $sortorder = 'ASC';
+	$sortorder = 'ASC';
 }
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $offset = $limit * $page;
@@ -102,7 +102,7 @@ if ($action == 'addline')
 	if (!$qty)
 	{
 		$error++;
-	    setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Qty")), null, 'errors');
+		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Qty")), null, 'errors');
 	}
 
 	// Check a batch number is provided if product need it
@@ -198,12 +198,12 @@ if ($action == 'createmovements')
 				{
 					// Remove stock
 					$result1 = $product->correct_stock(
-		    			$user,
-		    			$id_sw,
-		    			$qty,
-		    			1,
-		    			GETPOST("label"),
-		    			$pricesrc,
+						$user,
+						$id_sw,
+						$qty,
+						1,
+						GETPOST("label"),
+						$pricesrc,
 						GETPOST("codemove")
 					);
 					if ($result1 < 0)
@@ -214,12 +214,12 @@ if ($action == 'createmovements')
 
 					// Add stock
 					$result2 = $product->correct_stock(
-		    			$user,
-		    			$id_tw,
-		    			$qty,
-		    			0,
-		    			GETPOST("label"),
-		    			$pricedest,
+						$user,
+						$id_tw,
+						$qty,
+						0,
+						GETPOST("label"),
+						$pricedest,
 						GETPOST("codemove")
 					);
 					if ($result2 < 0)
@@ -242,12 +242,12 @@ if ($action == 'createmovements')
 
 					// Remove stock
 					$result1 = $product->correct_stock_batch(
-		    			$user,
-		    			$id_sw,
-		    			$qty,
-		    			1,
-		    			GETPOST("label"),
-		    			$pricesrc,
+						$user,
+						$id_sw,
+						$qty,
+						1,
+						GETPOST("label"),
+						$pricesrc,
 						$dlc,
 						$dluo,
 						$batch,
@@ -261,12 +261,12 @@ if ($action == 'createmovements')
 
 					// Add stock
 					$result2 = $product->correct_stock_batch(
-		    			$user,
-		    			$id_tw,
-		    			$qty,
-		    			0,
-		    			GETPOST("label"),
-		    			$pricedest,
+						$user,
+						$id_tw,
+						$qty,
+						0,
+						GETPOST("label"),
+						$pricedest,
 						$dlc,
 						$dluo,
 						$batch,
diff --git a/htdocs/product/stock/movement_card.php b/htdocs/product/stock/movement_card.php
index 6bf5ac2efa2..cf3cc67bdc2 100644
--- a/htdocs/product/stock/movement_card.php
+++ b/htdocs/product/stock/movement_card.php
@@ -94,23 +94,23 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 $search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
 
 $arrayfields = array(
-    'm.rowid'=>array('label'=>$langs->trans("Ref"), 'checked'=>1),
-    'm.datem'=>array('label'=>$langs->trans("Date"), 'checked'=>1),
-    'p.ref'=>array('label'=>$langs->trans("ProductRef"), 'checked'=>1, 'css'=>'maxwidth100'),
-    'p.label'=>array('label'=>$langs->trans("ProductLabel"), 'checked'=>1),
-    'm.batch'=>array('label'=>$langs->trans("BatchNumberShort"), 'checked'=>1, 'enabled'=>(!empty($conf->productbatch->enabled))),
+	'm.rowid'=>array('label'=>$langs->trans("Ref"), 'checked'=>1),
+	'm.datem'=>array('label'=>$langs->trans("Date"), 'checked'=>1),
+	'p.ref'=>array('label'=>$langs->trans("ProductRef"), 'checked'=>1, 'css'=>'maxwidth100'),
+	'p.label'=>array('label'=>$langs->trans("ProductLabel"), 'checked'=>1),
+	'm.batch'=>array('label'=>$langs->trans("BatchNumberShort"), 'checked'=>1, 'enabled'=>(!empty($conf->productbatch->enabled))),
 	'pl.eatby'=>array('label'=>$langs->trans("EatByDate"), 'checked'=>0, 'position'=>10, 'enabled'=>(!empty($conf->productbatch->enabled))),
-    'pl.sellby'=>array('label'=>$langs->trans("SellByDate"), 'checked'=>0, 'position'=>10, 'enabled'=>(!empty($conf->productbatch->enabled))),
-    'e.ref'=>array('label'=>$langs->trans("Warehouse"), 'checked'=>1, 'enabled'=>(!$id > 0)), // If we are on specific warehouse, we hide it
-    'm.fk_user_author'=>array('label'=>$langs->trans("Author"), 'checked'=>0),
-    'm.inventorycode'=>array('label'=>$langs->trans("InventoryCodeShort"), 'checked'=>1),
-    'm.label'=>array('label'=>$langs->trans("MovementLabel"), 'checked'=>1),
-    'm.type_mouvement'=>array('label'=>$langs->trans("TypeMovement"), 'checked'=>1),
-    'origin'=>array('label'=>$langs->trans("Origin"), 'checked'=>1),
+	'pl.sellby'=>array('label'=>$langs->trans("SellByDate"), 'checked'=>0, 'position'=>10, 'enabled'=>(!empty($conf->productbatch->enabled))),
+	'e.ref'=>array('label'=>$langs->trans("Warehouse"), 'checked'=>1, 'enabled'=>(!$id > 0)), // If we are on specific warehouse, we hide it
+	'm.fk_user_author'=>array('label'=>$langs->trans("Author"), 'checked'=>0),
+	'm.inventorycode'=>array('label'=>$langs->trans("InventoryCodeShort"), 'checked'=>1),
+	'm.label'=>array('label'=>$langs->trans("MovementLabel"), 'checked'=>1),
+	'm.type_mouvement'=>array('label'=>$langs->trans("TypeMovement"), 'checked'=>1),
+	'origin'=>array('label'=>$langs->trans("Origin"), 'checked'=>1),
 	'm.value'=>array('label'=>$langs->trans("Qty"), 'checked'=>1),
 	'm.price'=>array('label'=>$langs->trans("UnitPurchaseValue"), 'checked'=>0),
 	//'m.datec'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0, 'position'=>500),
-    //'m.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500)
+	//'m.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500)
 );
 
 $usercanread = (($user->rights->stock->mouvement->lire));
@@ -135,21 +135,21 @@ include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 // Do we click on purge search criteria ?
 if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // Both test are required to be compatible with all browsers
 {
-    $year = '';
-    $month = '';
-    $search_ref = '';
-    $search_movement = "";
-    $search_type_mouvement = "";
-    $search_inventorycode = "";
-    $search_product_ref = "";
-    $search_product = "";
-    $search_warehouse = "";
-    $search_user = "";
-    $search_batch = "";
-    $search_qty = '';
-    $sall = "";
+	$year = '';
+	$month = '';
+	$search_ref = '';
+	$search_movement = "";
+	$search_type_mouvement = "";
+	$search_inventorycode = "";
+	$search_product_ref = "";
+	$search_product = "";
+	$search_warehouse = "";
+	$search_user = "";
+	$search_batch = "";
+	$search_qty = '';
+	$sall = "";
 	$toselect = '';
-    $search_array_options = array();
+	$search_array_options = array();
 }
 
 // Correct stock
@@ -174,7 +174,7 @@ if ($action == "correct_stock")
 	}
 
 	if (!$error)
-    {
+	{
 		$origin_element = '';
 		$origin_id = null;
 
@@ -184,55 +184,55 @@ if ($action == "correct_stock")
 			$origin_id = GETPOST('projectid', 'int');
 		}
 
-        if ($product->hasbatch())
-        {
-        	$batch = GETPOST('batch_number', 'alpha');
+		if ($product->hasbatch())
+		{
+			$batch = GETPOST('batch_number', 'alpha');
 
-        	//$eatby=GETPOST('eatby');
-        	//$sellby=GETPOST('sellby');
-        	$eatby = dol_mktime(0, 0, 0, GETPOST('eatbymonth', 'int'), GETPOST('eatbyday', 'int'), GETPOST('eatbyyear', 'int'));
-        	$sellby = dol_mktime(0, 0, 0, GETPOST('sellbymonth', 'int'), GETPOST('sellbyday', 'int'), GETPOST('sellbyyear', 'int'));
+			//$eatby=GETPOST('eatby');
+			//$sellby=GETPOST('sellby');
+			$eatby = dol_mktime(0, 0, 0, GETPOST('eatbymonth', 'int'), GETPOST('eatbyday', 'int'), GETPOST('eatbyyear', 'int'));
+			$sellby = dol_mktime(0, 0, 0, GETPOST('sellbymonth', 'int'), GETPOST('sellbyday', 'int'), GETPOST('sellbyyear', 'int'));
 
-	        $result = $product->correct_stock_batch(
-	            $user,
-	            $id,
-	            GETPOST("nbpiece", 'int'),
-	            GETPOST("mouvement", 'int'),
-	            GETPOST("label", 'san_alpha'),
-	            GETPOST('unitprice', 'alpha'),
-	        	$eatby,
-	            $sellby,
-	            $batch,
-	        	GETPOST('inventorycode', 'alpha'),
-	        	$origin_element,
-	        	$origin_id
-	        ); // We do not change value of stock for a correction
-        } else {
-	        $result = $product->correct_stock(
-	            $user,
-	            $id,
-	            GETPOST("nbpiece", 'int'),
-	            GETPOST("mouvement", 'alpha'),
-	            GETPOST("label", 'san_alpha'),
-	            GETPOST('unitprice', 'alpha'),
-	        	GETPOST('inventorycode', 'alpha'),
-	        	$origin_element,
-	        	$origin_id
-	        ); // We do not change value of stock for a correction
-        }
+			$result = $product->correct_stock_batch(
+				$user,
+				$id,
+				GETPOST("nbpiece", 'int'),
+				GETPOST("mouvement", 'int'),
+				GETPOST("label", 'san_alpha'),
+				GETPOST('unitprice', 'alpha'),
+				$eatby,
+				$sellby,
+				$batch,
+				GETPOST('inventorycode', 'alpha'),
+				$origin_element,
+				$origin_id
+			); // We do not change value of stock for a correction
+		} else {
+			$result = $product->correct_stock(
+				$user,
+				$id,
+				GETPOST("nbpiece", 'int'),
+				GETPOST("mouvement", 'alpha'),
+				GETPOST("label", 'san_alpha'),
+				GETPOST('unitprice', 'alpha'),
+				GETPOST('inventorycode', 'alpha'),
+				$origin_element,
+				$origin_id
+			); // We do not change value of stock for a correction
+		}
 
-        if ($result > 0)
-        {
-            header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
-            exit;
-        } else {
-            $error++;
-            setEventMessages($product->error, $product->errors, 'errors');
-            $action = 'correction';
-        }
-    }
+		if ($result > 0)
+		{
+			header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
+			exit;
+		} else {
+			$error++;
+			setEventMessages($product->error, $product->errors, 'errors');
+			$action = 'correction';
+		}
+	}
 
-    if (!$error) $action = '';
+	if (!$error) $action = '';
 }
 
 // Transfer stock from a warehouse to another warehouse
@@ -241,155 +241,155 @@ if ($action == "transfert_stock" && !$cancel)
 	$product = new Product($db);
 	if (!empty($product_id)) $result = $product->fetch($product_id);
 
-    if (!(GETPOST("id_entrepot_destination", 'int') > 0))
-    {
-        setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Warehouse")), null, 'errors');
-        $error++;
-        $action = 'transfert';
-    }
+	if (!(GETPOST("id_entrepot_destination", 'int') > 0))
+	{
+		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Warehouse")), null, 'errors');
+		$error++;
+		$action = 'transfert';
+	}
 	if (empty($product_id))
 	{
 		$error++;
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Product")), null, 'errors');
 		$action = 'transfert';
 	}
-    if (!GETPOST("nbpiece", 'int'))
-    {
-        setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("NumberOfUnit")), null, 'errors');
-        $error++;
-        $action = 'transfert';
-    }
-    if ($id == GETPOST("id_entrepot_destination", 'int'))
-    {
-        setEventMessages($langs->trans("ErrorSrcAndTargetWarehouseMustDiffers"), null, 'errors');
-        $error++;
-        $action = 'transfert';
-    }
+	if (!GETPOST("nbpiece", 'int'))
+	{
+		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("NumberOfUnit")), null, 'errors');
+		$error++;
+		$action = 'transfert';
+	}
+	if ($id == GETPOST("id_entrepot_destination", 'int'))
+	{
+		setEventMessages($langs->trans("ErrorSrcAndTargetWarehouseMustDiffers"), null, 'errors');
+		$error++;
+		$action = 'transfert';
+	}
 
-    if (!empty($conf->productbatch->enabled))
-    {
-        $product = new Product($db);
-        $result = $product->fetch($product_id);
+	if (!empty($conf->productbatch->enabled))
+	{
+		$product = new Product($db);
+		$result = $product->fetch($product_id);
 
-        if ($product->hasbatch() && !GETPOST("batch_number", 'alpha'))
-        {
-            setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("batch_number")), null, 'errors');
-            $error++;
-            $action = 'transfert';
-        }
-    }
+		if ($product->hasbatch() && !GETPOST("batch_number", 'alpha'))
+		{
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("batch_number")), null, 'errors');
+			$error++;
+			$action = 'transfert';
+		}
+	}
 
-    if (!$error)
-    {
-        if ($id)
-        {
-            $object = new Entrepot($db);
-            $result = $object->fetch($id);
+	if (!$error)
+	{
+		if ($id)
+		{
+			$object = new Entrepot($db);
+			$result = $object->fetch($id);
 
-            $db->begin();
+			$db->begin();
 
-            $product->load_stock('novirtual'); // Load array product->stock_warehouse
+			$product->load_stock('novirtual'); // Load array product->stock_warehouse
 
-            // Define value of products moved
-            $pricesrc = 0;
-            if (isset($product->pmp)) $pricesrc = $product->pmp;
-            $pricedest = $pricesrc;
+			// Define value of products moved
+			$pricesrc = 0;
+			if (isset($product->pmp)) $pricesrc = $product->pmp;
+			$pricedest = $pricesrc;
 
-            if ($product->hasbatch())
-            {
-                $pdluo = new Productbatch($db);
+			if ($product->hasbatch())
+			{
+				$pdluo = new Productbatch($db);
 
-                if ($pdluoid > 0)
-                {
-                    $result = $pdluo->fetch($pdluoid);
-                    if ($result)
-                    {
-                        $srcwarehouseid = $pdluo->warehouseid;
-                        $batch = $pdluo->batch;
-                        $eatby = $pdluo->eatby;
-                        $sellby = $pdluo->sellby;
-                    } else {
-                        setEventMessages($pdluo->error, $pdluo->errors, 'errors');
-                        $error++;
-                    }
-                } else {
-                    $srcwarehouseid = $id;
-                    $batch = GETPOST('batch_number', 'alpha');
-                    $eatby = $d_eatby;
-                    $sellby = $d_sellby;
-                }
+				if ($pdluoid > 0)
+				{
+					$result = $pdluo->fetch($pdluoid);
+					if ($result)
+					{
+						$srcwarehouseid = $pdluo->warehouseid;
+						$batch = $pdluo->batch;
+						$eatby = $pdluo->eatby;
+						$sellby = $pdluo->sellby;
+					} else {
+						setEventMessages($pdluo->error, $pdluo->errors, 'errors');
+						$error++;
+					}
+				} else {
+					$srcwarehouseid = $id;
+					$batch = GETPOST('batch_number', 'alpha');
+					$eatby = $d_eatby;
+					$sellby = $d_sellby;
+				}
 
-                if (!$error)
-                {
-                    // Remove stock
-                    $result1 = $product->correct_stock_batch(
-                        $user,
-                        $srcwarehouseid,
-                        GETPOST("nbpiece", 'int'),
-                        1,
-                        GETPOST("label", 'san_alpha'),
-                        $pricesrc,
-                        $eatby,
-                        $sellby,
-                        $batch,
-                        GETPOST('inventorycode', 'alpha')
-                    );
-                    // Add stock
-                    $result2 = $product->correct_stock_batch(
-                        $user,
-                        GETPOST("id_entrepot_destination", 'int'),
-                        GETPOST("nbpiece", 'int'),
-                        0,
-                        GETPOST("label", 'san_alpha'),
-                        $pricedest,
-                        $eatby,
-                        $sellby,
-                        $batch,
-                        GETPOST('inventorycode', 'alpha')
-                    );
-                }
-            } else {
-                // Remove stock
-                $result1 = $product->correct_stock(
-                    $user,
-                    $id,
-                    GETPOST("nbpiece", 'int'),
-                    1,
-                    GETPOST("label", 'alpha'),
-                    $pricesrc,
-                    GETPOST('inventorycode', 'alpha')
-                );
+				if (!$error)
+				{
+					// Remove stock
+					$result1 = $product->correct_stock_batch(
+						$user,
+						$srcwarehouseid,
+						GETPOST("nbpiece", 'int'),
+						1,
+						GETPOST("label", 'san_alpha'),
+						$pricesrc,
+						$eatby,
+						$sellby,
+						$batch,
+						GETPOST('inventorycode', 'alpha')
+					);
+					// Add stock
+					$result2 = $product->correct_stock_batch(
+						$user,
+						GETPOST("id_entrepot_destination", 'int'),
+						GETPOST("nbpiece", 'int'),
+						0,
+						GETPOST("label", 'san_alpha'),
+						$pricedest,
+						$eatby,
+						$sellby,
+						$batch,
+						GETPOST('inventorycode', 'alpha')
+					);
+				}
+			} else {
+				// Remove stock
+				$result1 = $product->correct_stock(
+					$user,
+					$id,
+					GETPOST("nbpiece", 'int'),
+					1,
+					GETPOST("label", 'alpha'),
+					$pricesrc,
+					GETPOST('inventorycode', 'alpha')
+				);
 
-                // Add stock
-                $result2 = $product->correct_stock(
-                    $user,
-                    GETPOST("id_entrepot_destination"),
-                    GETPOST("nbpiece", 'int'),
-                    0,
-                    GETPOST("label", 'alpha'),
-                    $pricedest,
-                    GETPOST('inventorycode', 'alpha')
-                );
-            }
-            if (!$error && $result1 >= 0 && $result2 >= 0)
-            {
-                $db->commit();
+				// Add stock
+				$result2 = $product->correct_stock(
+					$user,
+					GETPOST("id_entrepot_destination"),
+					GETPOST("nbpiece", 'int'),
+					0,
+					GETPOST("label", 'alpha'),
+					$pricedest,
+					GETPOST('inventorycode', 'alpha')
+				);
+			}
+			if (!$error && $result1 >= 0 && $result2 >= 0)
+			{
+				$db->commit();
 
-                if ($backtopage)
-                {
-                    header("Location: ".$backtopage);
-                    exit;
-                } else {
-                    header("Location: movement_list.php?id=".$object->id);
-                    exit;
-                }
-            } else {
-                setEventMessages($product->error, $product->errors, 'errors');
-                $db->rollback();
-                $action = 'transfert';
-            }
-        }
-    }
+				if ($backtopage)
+				{
+					header("Location: ".$backtopage);
+					exit;
+				} else {
+					header("Location: movement_list.php?id=".$object->id);
+					exit;
+				}
+			} else {
+				setEventMessages($product->error, $product->errors, 'errors');
+				$db->rollback();
+				$action = 'transfert';
+			}
+		}
+	}
 }
 
 
@@ -405,11 +405,11 @@ include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
 
 if (empty($reshook) && $action != 'remove_file')
 {
-    $objectclass = 'MouvementStock';
-    $objectlabel = 'Movements';
-    $permissiontoread = $user->rights->stock->lire;
-    $permissiontodelete = $user->rights->stock->supprimer;
-    $uploaddir = $conf->stock->dir_output."/movement/";
+	$objectclass = 'MouvementStock';
+	$objectlabel = 'Movements';
+	$permissiontoread = $user->rights->stock->lire;
+	$permissiontodelete = $user->rights->stock->supprimer;
+	$uploaddir = $conf->stock->dir_output."/movement/";
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }
 
@@ -479,13 +479,13 @@ $sql .= $db->order($sortfield, $sortorder);
 $nbtotalofrecords = '';
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
-    $result = $db->query($sql);
-    $nbtotalofrecords = $db->num_rows($result);
-    if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
-    {
-    	$page = 0;
-    	$offset = 0;
-    }
+	$result = $db->query($sql);
+	$nbtotalofrecords = $db->num_rows($result);
+	if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+	{
+		$page = 0;
+		$offset = 0;
+	}
 }
 
 //print $sql;
@@ -498,125 +498,125 @@ if ($resql)
 	$object = new Entrepot($db);
 
 	if ($idproduct > 0)
-    {
-        $product->fetch($idproduct);
-    }
-    if ($id > 0 || $ref)
-    {
-        $result = $object->fetch($id, $ref);
-        if ($result < 0)
-        {
-            dol_print_error($db);
-        }
-    }
+	{
+		$product->fetch($idproduct);
+	}
+	if ($id > 0 || $ref)
+	{
+		$result = $object->fetch($id, $ref);
+		if ($result < 0)
+		{
+			dol_print_error($db);
+		}
+	}
 
-    $num = $db->num_rows($resql);
+	$num = $db->num_rows($resql);
 
-    $arrayofselected = is_array($toselect) ? $toselect : array();
+	$arrayofselected = is_array($toselect) ? $toselect : array();
 
 
-    $i = 0;
-    $help_url = 'EN:Module_Stocks_En|FR:Module_Stock|ES:M&oacute;dulo_Stocks';
-    if ($msid) $texte = $langs->trans('StockMovementForId', $msid);
+	$i = 0;
+	$help_url = 'EN:Module_Stocks_En|FR:Module_Stock|ES:M&oacute;dulo_Stocks';
+	if ($msid) $texte = $langs->trans('StockMovementForId', $msid);
 	else {
 		$texte = $langs->trans("ListOfStockMovements");
 		if ($id) $texte .= ' ('.$langs->trans("ForThisWarehouse").')';
 	}
-    llxHeader("", $texte, $help_url);
+	llxHeader("", $texte, $help_url);
 
-    /*
+	/*
      * Show tab only if we ask a particular warehouse
      */
-    if ($object->id > 0)
-    {
-        $head = stock_prepare_head($object);
+	if ($object->id > 0)
+	{
+		$head = stock_prepare_head($object);
 
-        print dol_get_fiche_head($head, 'movements', $langs->trans("Warehouse"), -1, 'stock');
+		print dol_get_fiche_head($head, 'movements', $langs->trans("Warehouse"), -1, 'stock');
 
 
-        $linkback = '<a href="'.DOL_URL_ROOT.'/product/stock/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+		$linkback = '<a href="'.DOL_URL_ROOT.'/product/stock/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-        $morehtmlref = '<div class="refidno">';
-        $morehtmlref .= $langs->trans("LocationSummary").' : '.$object->lieu;
-        $morehtmlref .= '</div>';
+		$morehtmlref = '<div class="refidno">';
+		$morehtmlref .= $langs->trans("LocationSummary").' : '.$object->lieu;
+		$morehtmlref .= '</div>';
 
-        $shownav = 1;
-        if ($user->socid && !in_array('stock', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav = 0;
+		$shownav = 1;
+		if ($user->socid && !in_array('stock', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav = 0;
 
-        dol_banner_tab($object, 'ref', $linkback, $shownav, 'ref', 'ref', $morehtmlref);
+		dol_banner_tab($object, 'ref', $linkback, $shownav, 'ref', 'ref', $morehtmlref);
 
 
-        print '<div class="fichecenter">';
-        print '<div class="fichehalfleft">';
-        print '<div class="underbanner clearboth"></div>';
+		print '<div class="fichecenter">';
+		print '<div class="fichehalfleft">';
+		print '<div class="underbanner clearboth"></div>';
 
-        print '<table class="border centpercent">';
+		print '<table class="border centpercent">';
 
-        print '<tr>';
+		print '<tr>';
 
-        // Description
-        print '<td class="titlefield tdtop">'.$langs->trans("Description").'</td><td>'.dol_htmlentitiesbr($object->description).'</td></tr>';
+		// Description
+		print '<td class="titlefield tdtop">'.$langs->trans("Description").'</td><td>'.dol_htmlentitiesbr($object->description).'</td></tr>';
 
-        $calcproductsunique = $object->nb_different_products();
-        $calcproducts = $object->nb_products();
+		$calcproductsunique = $object->nb_different_products();
+		$calcproducts = $object->nb_products();
 
-        // Total nb of different products
-        print '<tr><td>'.$langs->trans("NumberOfDifferentProducts").'</td><td>';
-        print empty($calcproductsunique['nb']) ? '0' : $calcproductsunique['nb'];
-        print "</td></tr>";
+		// Total nb of different products
+		print '<tr><td>'.$langs->trans("NumberOfDifferentProducts").'</td><td>';
+		print empty($calcproductsunique['nb']) ? '0' : $calcproductsunique['nb'];
+		print "</td></tr>";
 
-        // Nb of products
-        print '<tr><td>'.$langs->trans("NumberOfProducts").'</td><td>';
-        $valtoshow = price2num($calcproducts['nb'], 'MS');
-        print empty($valtoshow) ? '0' : $valtoshow;
-        print "</td></tr>";
+		// Nb of products
+		print '<tr><td>'.$langs->trans("NumberOfProducts").'</td><td>';
+		$valtoshow = price2num($calcproducts['nb'], 'MS');
+		print empty($valtoshow) ? '0' : $valtoshow;
+		print "</td></tr>";
 
-        print '</table>';
+		print '</table>';
 
-        print '</div>';
-        print '<div class="fichehalfright">';
-        print '<div class="ficheaddleft">';
-        print '<div class="underbanner clearboth"></div>';
+		print '</div>';
+		print '<div class="fichehalfright">';
+		print '<div class="ficheaddleft">';
+		print '<div class="underbanner clearboth"></div>';
 
-        print '<table class="border centpercent">';
+		print '<table class="border centpercent">';
 
-        // Value
-        print '<tr><td class="titlefield">'.$langs->trans("EstimatedStockValueShort").'</td><td>';
-        print price((empty($calcproducts['value']) ? '0' : price2num($calcproducts['value'], 'MT')), 0, $langs, 0, -1, -1, $conf->currency);
-        print "</td></tr>";
+		// Value
+		print '<tr><td class="titlefield">'.$langs->trans("EstimatedStockValueShort").'</td><td>';
+		print price((empty($calcproducts['value']) ? '0' : price2num($calcproducts['value'], 'MT')), 0, $langs, 0, -1, -1, $conf->currency);
+		print "</td></tr>";
 
-        // Last movement
-        $sql = "SELECT MAX(m.datem) as datem";
-        $sql .= " FROM ".MAIN_DB_PREFIX."stock_mouvement as m";
-        $sql .= " WHERE m.fk_entrepot = ".(int) $object->id;
-        $resqlbis = $db->query($sql);
-        if ($resqlbis)
-        {
-            $obj = $db->fetch_object($resqlbis);
-            $lastmovementdate = $db->jdate($obj->datem);
-        } else {
-            dol_print_error($db);
-        }
+		// Last movement
+		$sql = "SELECT MAX(m.datem) as datem";
+		$sql .= " FROM ".MAIN_DB_PREFIX."stock_mouvement as m";
+		$sql .= " WHERE m.fk_entrepot = ".(int) $object->id;
+		$resqlbis = $db->query($sql);
+		if ($resqlbis)
+		{
+			$obj = $db->fetch_object($resqlbis);
+			$lastmovementdate = $db->jdate($obj->datem);
+		} else {
+			dol_print_error($db);
+		}
 
-        print '<tr><td>'.$langs->trans("LastMovement").'</td><td>';
-        if ($lastmovementdate)
-        {
-            print dol_print_date($lastmovementdate, 'dayhour');
-        } else {
-            print $langs->trans("None");
-        }
-        print "</td></tr>";
+		print '<tr><td>'.$langs->trans("LastMovement").'</td><td>';
+		if ($lastmovementdate)
+		{
+			print dol_print_date($lastmovementdate, 'dayhour');
+		} else {
+			print $langs->trans("None");
+		}
+		print "</td></tr>";
 
-        print "</table>";
+		print "</table>";
 
-        print '</div>';
-        print '</div>';
-        print '</div>';
+		print '</div>';
+		print '</div>';
+		print '</div>';
 
-        print '<div class="clearboth"></div>';
+		print '<div class="clearboth"></div>';
 
-        dol_fiche_end();
-    }
+		print dol_get_fiche_end();
+	}
 
 
 	/*
@@ -638,44 +638,44 @@ if ($resql)
 	}
 
 
-    /* ************************************************************************** */
-    /*                                                                            */
-    /* Barre d'action                                                             */
-    /*                                                                            */
-    /* ************************************************************************** */
+	/* ************************************************************************** */
+	/*                                                                            */
+	/* Barre d'action                                                             */
+	/*                                                                            */
+	/* ************************************************************************** */
 
-    if ((empty($action) || $action == 'list') && $id > 0)
-    {
-        print "<div class=\"tabsAction\">\n";
+	if ((empty($action) || $action == 'list') && $id > 0)
+	{
+		print "<div class=\"tabsAction\">\n";
 
-        if ($user->rights->stock->mouvement->creer)
-        {
-            print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$id.'&action=correction">'.$langs->trans("CorrectStock").'</a>';
-        }
+		if ($user->rights->stock->mouvement->creer)
+		{
+			print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$id.'&action=correction">'.$langs->trans("CorrectStock").'</a>';
+		}
 
-        if ($user->rights->stock->mouvement->creer)
-        {
-            print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$id.'&action=transfert">'.$langs->trans("TransferStock").'</a>';
-        }
+		if ($user->rights->stock->mouvement->creer)
+		{
+			print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$id.'&action=transfert">'.$langs->trans("TransferStock").'</a>';
+		}
 
-        print '</div><br>';
-    }
+		print '</div><br>';
+	}
 
-    $param = '';
-    if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
-    if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
-    if ($id > 0)                 $param .= '&id='.urlencode($id);
-    if ($search_movement)        $param .= '&search_movement='.urlencode($search_movement);
-    if ($search_inventorycode)   $param .= '&search_inventorycode='.urlencode($search_inventorycode);
-    if ($search_type_mouvement)	 $param .= '&search_type_mouvement='.urlencode($search_type_mouvement);
-    if ($search_product_ref)     $param .= '&search_product_ref='.urlencode($search_product_ref);
-    if ($search_product)         $param .= '&search_product='.urlencode($search_product);
-    if ($search_batch)           $param .= '&search_batch='.urlencode($search_batch);
-    if ($search_warehouse > 0)   $param .= '&search_warehouse='.urlencode($search_warehouse);
-    if ($search_user)            $param .= '&search_user='.urlencode($search_user);
-    if ($idproduct > 0)          $param .= '&idproduct='.urlencode($idproduct);
-    // Add $param from extra fields
-    include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
+	$param = '';
+	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
+	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
+	if ($id > 0)                 $param .= '&id='.urlencode($id);
+	if ($search_movement)        $param .= '&search_movement='.urlencode($search_movement);
+	if ($search_inventorycode)   $param .= '&search_inventorycode='.urlencode($search_inventorycode);
+	if ($search_type_mouvement)	 $param .= '&search_type_mouvement='.urlencode($search_type_mouvement);
+	if ($search_product_ref)     $param .= '&search_product_ref='.urlencode($search_product_ref);
+	if ($search_product)         $param .= '&search_product='.urlencode($search_product);
+	if ($search_batch)           $param .= '&search_batch='.urlencode($search_batch);
+	if ($search_warehouse > 0)   $param .= '&search_warehouse='.urlencode($search_warehouse);
+	if ($search_user)            $param .= '&search_user='.urlencode($search_user);
+	if ($idproduct > 0)          $param .= '&idproduct='.urlencode($idproduct);
+	// Add $param from extra fields
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 
 	// List of mass actions available
 	$arrayofmassactions = array(
@@ -686,27 +686,27 @@ if ($resql)
 	if (in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
 	$massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
-    print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
-    if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
-    print '<input type="hidden" name="action" value="list">';
-    print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
-    print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-    print '<input type="hidden" name="page" value="'.$page.'">';
-    print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
-    if ($id > 0) print '<input type="hidden" name="id" value="'.$id.'">';
+	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+	if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
+	print '<input type="hidden" name="action" value="list">';
+	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+	print '<input type="hidden" name="page" value="'.$page.'">';
+	print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
+	if ($id > 0) print '<input type="hidden" name="id" value="'.$id.'">';
 
-    if ($id > 0) print_barre_liste($texte, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, '', 0, '', '', $limit);
-    else print_barre_liste($texte, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'generic', 0, '', '', $limit);
+	if ($id > 0) print_barre_liste($texte, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, '', 0, '', '', $limit);
+	else print_barre_liste($texte, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'generic', 0, '', '', $limit);
 
 	if ($sall)
-    {
-        foreach ($fieldstosearchall as $key => $val) $fieldstosearchall[$key] = $langs->trans($val);
-        print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall).join(', ', $fieldstosearchall).'</div>';
-    }
+	{
+		foreach ($fieldstosearchall as $key => $val) $fieldstosearchall[$key] = $langs->trans($val);
+		print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall).join(', ', $fieldstosearchall).'</div>';
+	}
 
-    $moreforfilter = '';
+	$moreforfilter = '';
 
 	$parameters = array();
 	$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters); // Note that $action and $object may have been modified by hook
@@ -715,100 +715,100 @@ if ($resql)
 
 	if (!empty($moreforfilter))
 	{
-        print '<div class="liste_titre liste_titre_bydiv centpercent">';
-	    print $moreforfilter;
-	    print '</div>';
+		print '<div class="liste_titre liste_titre_bydiv centpercent">';
+		print $moreforfilter;
+		print '</div>';
 	}
 
-    $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-    $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
+	$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
+	$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
 
-    print '<div class="div-table-responsive">';
-    print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
+	print '<div class="div-table-responsive">';
+	print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
-    // Fields title search
-    print '<tr class="liste_titre_filter">';
-    if (!empty($arrayfields['m.rowid']['checked']))
-    {
-	    // Ref
-	    print '<td class="liste_titre left">';
-	    print '<input class="flat maxwidth25" type="text" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
-	    print '</td>';
-    }
-    if (!empty($arrayfields['m.datem']['checked']))
-    {
-    	print '<td class="liste_titre nowraponall">';
-	    print '<input class="flat" type="text" size="2" maxlength="2" placeholder="'.dol_escape_htmltag($langs->trans("Month")).'" name="month" value="'.$month.'">';
-    	if (empty($conf->productbatch->enabled)) print '&nbsp;';
-	    //else print '<br>';
-	    $syear = $year ? $year : -1;
-	    print '<input class="flat maxwidth50" type="text" maxlength="4" placeholder="'.dol_escape_htmltag($langs->trans("Year")).'" name="year" value="'.($syear > 0 ? $syear : '').'">';
-	    //print $formother->selectyear($syear,'year',1, 20, 5);
-	    print '</td>';
-    }
-    if (!empty($arrayfields['p.ref']['checked']))
-    {
-	    // Product Ref
-	    print '<td class="liste_titre left">';
-	    print '<input class="flat maxwidth75" type="text" name="search_product_ref" value="'.dol_escape_htmltag($idproduct ? $product->ref : $search_product_ref).'">';
-	    print '</td>';
-    }
-    if (!empty($arrayfields['p.label']['checked']))
-    {
-	    // Product label
-	    print '<td class="liste_titre left">';
-	    print '<input class="flat maxwidth100" type="text" name="search_product" value="'.dol_escape_htmltag($idproduct ? $product->label : $search_product).'">';
-	    print '</td>';
-    }
-    // Batch
-    if (!empty($arrayfields['m.batch']['checked']))
-    {
-    	print '<td class="liste_titre center"><input class="flat maxwidth75" type="text" name="search_batch" value="'.dol_escape_htmltag($search_batch).'"></td>';
+	// Fields title search
+	print '<tr class="liste_titre_filter">';
+	if (!empty($arrayfields['m.rowid']['checked']))
+	{
+		// Ref
+		print '<td class="liste_titre left">';
+		print '<input class="flat maxwidth25" type="text" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
+		print '</td>';
+	}
+	if (!empty($arrayfields['m.datem']['checked']))
+	{
+		print '<td class="liste_titre nowraponall">';
+		print '<input class="flat" type="text" size="2" maxlength="2" placeholder="'.dol_escape_htmltag($langs->trans("Month")).'" name="month" value="'.$month.'">';
+		if (empty($conf->productbatch->enabled)) print '&nbsp;';
+		//else print '<br>';
+		$syear = $year ? $year : -1;
+		print '<input class="flat maxwidth50" type="text" maxlength="4" placeholder="'.dol_escape_htmltag($langs->trans("Year")).'" name="year" value="'.($syear > 0 ? $syear : '').'">';
+		//print $formother->selectyear($syear,'year',1, 20, 5);
+		print '</td>';
+	}
+	if (!empty($arrayfields['p.ref']['checked']))
+	{
+		// Product Ref
+		print '<td class="liste_titre left">';
+		print '<input class="flat maxwidth75" type="text" name="search_product_ref" value="'.dol_escape_htmltag($idproduct ? $product->ref : $search_product_ref).'">';
+		print '</td>';
+	}
+	if (!empty($arrayfields['p.label']['checked']))
+	{
+		// Product label
+		print '<td class="liste_titre left">';
+		print '<input class="flat maxwidth100" type="text" name="search_product" value="'.dol_escape_htmltag($idproduct ? $product->label : $search_product).'">';
+		print '</td>';
+	}
+	// Batch
+	if (!empty($arrayfields['m.batch']['checked']))
+	{
+		print '<td class="liste_titre center"><input class="flat maxwidth75" type="text" name="search_batch" value="'.dol_escape_htmltag($search_batch).'"></td>';
+	}
+	if (!empty($arrayfields['pl.eatby']['checked']))
+	{
+		print '<td class="liste_titre left">';
+		print '</td>';
+	}
+	if (!empty($arrayfields['pl.sellby']['checked']))
+	{
+		print '<td class="liste_titre left">';
+		print '</td>';
+	}
+	// Warehouse
+	if (!empty($arrayfields['e.ref']['checked']))
+	{
+		print '<td class="liste_titre maxwidthonsmartphone left">';
+		//print '<input class="flat" type="text" size="8" name="search_warehouse" value="'.($search_warehouse).'">';
+		print $formproduct->selectWarehouses($search_warehouse, 'search_warehouse', 'warehouseopen,warehouseinternal', 1, 0, 0, '', 0, 0, null, 'maxwidth200');
+		print '</td>';
+	}
+	if (!empty($arrayfields['m.fk_user_author']['checked']))
+	{
+		// Author
+		print '<td class="liste_titre left">';
+		print '<input class="flat" type="text" size="6" name="search_user" value="'.dol_escape_htmltag($search_user).'">';
+		print '</td>';
+	}
+	if (!empty($arrayfields['m.inventorycode']['checked']))
+	{
+		// Inventory code
+		print '<td class="liste_titre left">';
+		print '<input class="flat" type="text" size="4" name="search_inventorycode" value="'.dol_escape_htmltag($search_inventorycode).'">';
+		print '</td>';
+	}
+	if (!empty($arrayfields['m.label']['checked']))
+	{
+		// Label of movement
+		print '<td class="liste_titre left">';
+		print '<input class="flat" type="text" size="8" name="search_movement" value="'.dol_escape_htmltag($search_movement).'">';
+		print '</td>';
 	}
-    if (!empty($arrayfields['pl.eatby']['checked']))
-    {
-	    print '<td class="liste_titre left">';
-	    print '</td>';
-    }
-    if (!empty($arrayfields['pl.sellby']['checked']))
-    {
-	    print '<td class="liste_titre left">';
-	    print '</td>';
-    }
-    // Warehouse
-    if (!empty($arrayfields['e.ref']['checked']))
-    {
-        print '<td class="liste_titre maxwidthonsmartphone left">';
-        //print '<input class="flat" type="text" size="8" name="search_warehouse" value="'.($search_warehouse).'">';
-        print $formproduct->selectWarehouses($search_warehouse, 'search_warehouse', 'warehouseopen,warehouseinternal', 1, 0, 0, '', 0, 0, null, 'maxwidth200');
-        print '</td>';
-    }
-    if (!empty($arrayfields['m.fk_user_author']['checked']))
-    {
-	    // Author
-	    print '<td class="liste_titre left">';
-	    print '<input class="flat" type="text" size="6" name="search_user" value="'.dol_escape_htmltag($search_user).'">';
-	    print '</td>';
-    }
-    if (!empty($arrayfields['m.inventorycode']['checked']))
-    {
-	    // Inventory code
-	    print '<td class="liste_titre left">';
-	    print '<input class="flat" type="text" size="4" name="search_inventorycode" value="'.dol_escape_htmltag($search_inventorycode).'">';
-	    print '</td>';
-    }
-    if (!empty($arrayfields['m.label']['checked']))
-    {
-	    // Label of movement
-	    print '<td class="liste_titre left">';
-	    print '<input class="flat" type="text" size="8" name="search_movement" value="'.dol_escape_htmltag($search_movement).'">';
-	    print '</td>';
-    }
 	if (!empty($arrayfields['m.type_mouvement']['checked']))
-    {
-	    // Type of movement
-	    print '<td class="liste_titre center">';
-	    //print '<input class="flat" type="text" size="3" name="search_type_mouvement" value="'.dol_escape_htmltag($search_type_mouvement).'">';
+	{
+		// Type of movement
+		print '<td class="liste_titre center">';
+		//print '<input class="flat" type="text" size="3" name="search_type_mouvement" value="'.dol_escape_htmltag($search_type_mouvement).'">';
 		print '<select id="search_type_mouvement" name="search_type_mouvement" class="maxwidth150">';
 		print '<option value="" '.(($search_type_mouvement == "") ? 'selected="selected"' : '').'></option>';
 		print '<option value="0" '.(($search_type_mouvement == "0") ? 'selected="selected"' : '').'>'.$langs->trans('StockIncreaseAfterCorrectTransfer').'</option>';
@@ -819,33 +819,33 @@ if ($resql)
 		print ajax_combobox('search_type_mouvement');
 		// TODO: add new function $formentrepot->selectTypeOfMovement(...) like
 		// print $formproduct->selectWarehouses($search_warehouse, 'search_warehouse', 'warehouseopen,warehouseinternal', 1, 0, 0, '', 0, 0, null, 'maxwidth200');
-	    print '</td>';
-    }
-    if (!empty($arrayfields['origin']['checked']))
-    {
-	    // Origin of movement
-	    print '<td class="liste_titre left">';
-	    print '&nbsp; ';
-	    print '</td>';
-    }
-    if (!empty($arrayfields['m.value']['checked']))
-    {
-	    // Qty
-	    print '<td class="liste_titre right">';
-	    print '<input class="flat" type="text" size="4" name="search_qty" value="'.dol_escape_htmltag($search_qty).'">';
-	    print '</td>';
-    }
-    if (!empty($arrayfields['m.price']['checked']))
-    {
-    	// Price
-    	print '<td class="liste_titre left">';
-    	print '&nbsp; ';
-    	print '</td>';
-    }
+		print '</td>';
+	}
+	if (!empty($arrayfields['origin']['checked']))
+	{
+		// Origin of movement
+		print '<td class="liste_titre left">';
+		print '&nbsp; ';
+		print '</td>';
+	}
+	if (!empty($arrayfields['m.value']['checked']))
+	{
+		// Qty
+		print '<td class="liste_titre right">';
+		print '<input class="flat" type="text" size="4" name="search_qty" value="'.dol_escape_htmltag($search_qty).'">';
+		print '</td>';
+	}
+	if (!empty($arrayfields['m.price']['checked']))
+	{
+		// Price
+		print '<td class="liste_titre left">';
+		print '&nbsp; ';
+		print '</td>';
+	}
 
 
-    // Extra fields
-    include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
+	// Extra fields
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
 
 	// Fields from hook
 	$parameters = array('arrayfields'=>$arrayfields);
@@ -854,23 +854,23 @@ if ($resql)
 	// Date creation
 	if (!empty($arrayfields['m.datec']['checked']))
 	{
-	    print '<td class="liste_titre">';
-	    print '</td>';
+		print '<td class="liste_titre">';
+		print '</td>';
 	}
 	// Date modification
 	if (!empty($arrayfields['m.tms']['checked']))
 	{
-	    print '<td class="liste_titre">';
-	    print '</td>';
+		print '<td class="liste_titre">';
+		print '</td>';
 	}
-    // Actions
-    print '<td class="liste_titre maxwidthsearch">';
-    $searchpicto = $form->showFilterAndCheckAddButtons(0);
-    print $searchpicto;
-    print '</td>';
-    print "</tr>\n";
+	// Actions
+	print '<td class="liste_titre maxwidthsearch">';
+	$searchpicto = $form->showFilterAndCheckAddButtons(0);
+	print $searchpicto;
+	print '</td>';
+	print "</tr>\n";
 
-    print '<tr class="liste_titre">';
+	print '<tr class="liste_titre">';
 	if (!empty($arrayfields['m.rowid']['checked']))
 		print_liste_field_titre($arrayfields['m.rowid']['label'], $_SERVER["PHP_SELF"], 'm.rowid', '', $param, '', $sortfield, $sortorder);
 	if (!empty($arrayfields['m.datem']['checked']))
@@ -886,9 +886,9 @@ if ($resql)
 	if (!empty($arrayfields['pl.sellby']['checked']))
 		print_liste_field_titre($arrayfields['pl.sellby']['label'], $_SERVER["PHP_SELF"], 'pl.sellby', '', $param, '', $sortfield, $sortorder, 'center ');
 	if (!empty($arrayfields['e.ref']['checked'])) {
-        // We are on a specific warehouse card, no filter on other should be possible
-        print_liste_field_titre($arrayfields['e.ref']['label'], $_SERVER["PHP_SELF"], "e.ref", "", $param, "", $sortfield, $sortorder);
-    }
+		// We are on a specific warehouse card, no filter on other should be possible
+		print_liste_field_titre($arrayfields['e.ref']['label'], $_SERVER["PHP_SELF"], "e.ref", "", $param, "", $sortfield, $sortorder);
+	}
 	if (!empty($arrayfields['m.fk_user_author']['checked']))
 		print_liste_field_titre($arrayfields['m.fk_user_author']['label'], $_SERVER["PHP_SELF"], "m.fk_user_author", "", $param, "", $sortfield, $sortorder);
 	if (!empty($arrayfields['m.inventorycode']['checked']))
@@ -904,221 +904,221 @@ if ($resql)
 	if (!empty($arrayfields['m.price']['checked']))
 		print_liste_field_titre($arrayfields['m.price']['label'], $_SERVER["PHP_SELF"], "m.price", "", $param, '', $sortfield, $sortorder, 'right ');
 
-    // Extra fields
-    include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
+	// Extra fields
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 
 	// Hook fields
 	$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
-    $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
-    print $hookmanager->resPrint;
+	$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
+	print $hookmanager->resPrint;
 	if (!empty($arrayfields['m.datec']['checked'])) {
-        print_liste_field_titre($arrayfields['p.datec']['label'], $_SERVER["PHP_SELF"], "p.datec", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
-    }
+		print_liste_field_titre($arrayfields['p.datec']['label'], $_SERVER["PHP_SELF"], "p.datec", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+	}
 	if (!empty($arrayfields['m.tms']['checked'])) {
-        print_liste_field_titre($arrayfields['p.tms']['label'], $_SERVER["PHP_SELF"], "p.tms", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
-    }
+		print_liste_field_titre($arrayfields['p.tms']['label'], $_SERVER["PHP_SELF"], "p.tms", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+	}
 	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
-    print "</tr>\n";
+	print "</tr>\n";
 
 
-    $arrayofuniqueproduct = array();
-    while ($i < ($limit ? min($num, $limit) : $num)) {
-        $objp = $db->fetch_object($resql);
+	$arrayofuniqueproduct = array();
+	while ($i < ($limit ? min($num, $limit) : $num)) {
+		$objp = $db->fetch_object($resql);
 
-        $userstatic->id = $objp->fk_user_author;
-        $userstatic->login = $objp->login;
-        $userstatic->lastname = $objp->lastname;
-        $userstatic->firstname = $objp->firstname;
-        $userstatic->photo = $objp->photo;
+		$userstatic->id = $objp->fk_user_author;
+		$userstatic->login = $objp->login;
+		$userstatic->lastname = $objp->lastname;
+		$userstatic->firstname = $objp->firstname;
+		$userstatic->photo = $objp->photo;
 
-        $productstatic->id = $objp->rowid;
-        $productstatic->ref = $objp->product_ref;
-        $productstatic->label = $objp->produit;
-        $productstatic->type = $objp->type;
-        $productstatic->entity = $objp->entity;
-        $productstatic->status_batch = $objp->tobatch;
+		$productstatic->id = $objp->rowid;
+		$productstatic->ref = $objp->product_ref;
+		$productstatic->label = $objp->produit;
+		$productstatic->type = $objp->type;
+		$productstatic->entity = $objp->entity;
+		$productstatic->status_batch = $objp->tobatch;
 
-        $productlot->id = $objp->lotid;
-        $productlot->batch = $objp->batch;
-        $productlot->eatby = $objp->eatby;
-        $productlot->sellby = $objp->sellby;
+		$productlot->id = $objp->lotid;
+		$productlot->batch = $objp->batch;
+		$productlot->eatby = $objp->eatby;
+		$productlot->sellby = $objp->sellby;
 
-        $warehousestatic->id = $objp->entrepot_id;
-        $warehousestatic->label = $objp->warehouse_ref;
-        $warehousestatic->lieu = $objp->lieu;
+		$warehousestatic->id = $objp->entrepot_id;
+		$warehousestatic->label = $objp->warehouse_ref;
+		$warehousestatic->lieu = $objp->lieu;
 
-        $arrayofuniqueproduct[$objp->rowid] = $objp->produit;
+		$arrayofuniqueproduct[$objp->rowid] = $objp->produit;
 		if (!empty($objp->fk_origin)) {
 			$origin = $movement->get_origin($objp->fk_origin, $objp->origintype);
 		} else {
 			$origin = '';
 		}
 
-        print '<tr class="oddeven">';
-        // Id movement
-        if (!empty($arrayfields['m.rowid']['checked']))
-        {
-            // This is primary not movement id
-            print '<td>'.$objp->mid.'</td>';
-        }
-        if (!empty($arrayfields['m.datem']['checked']))
-        {
-	        // Date
-	        print '<td>'.dol_print_date($db->jdate($objp->datem), 'dayhour').'</td>';
-        }
-        if (!empty($arrayfields['p.ref']['checked']))
-        {
-	        // Product ref
-	        print '<td class="nowraponall">';
-	        print $productstatic->getNomUrl(1, 'stock', 16);
-	        print "</td>\n";
-        }
-        if (!empty($arrayfields['p.label']['checked']))
-        {
-	        // Product label
-	        print '<td>';
-	        /*$productstatic->id=$objp->rowid;
+		print '<tr class="oddeven">';
+		// Id movement
+		if (!empty($arrayfields['m.rowid']['checked']))
+		{
+			// This is primary not movement id
+			print '<td>'.$objp->mid.'</td>';
+		}
+		if (!empty($arrayfields['m.datem']['checked']))
+		{
+			// Date
+			print '<td>'.dol_print_date($db->jdate($objp->datem), 'dayhour').'</td>';
+		}
+		if (!empty($arrayfields['p.ref']['checked']))
+		{
+			// Product ref
+			print '<td class="nowraponall">';
+			print $productstatic->getNomUrl(1, 'stock', 16);
+			print "</td>\n";
+		}
+		if (!empty($arrayfields['p.label']['checked']))
+		{
+			// Product label
+			print '<td>';
+			/*$productstatic->id=$objp->rowid;
 	        $productstatic->ref=$objp->produit;
 	        $productstatic->type=$objp->type;
 	        print $productstatic->getNomUrl(1,'',16);*/
-	        print $productstatic->label;
-	        print "</td>\n";
-        }
-        if (!empty($arrayfields['m.batch']['checked']))
-        {
-	    	print '<td class="center nowraponall">';
-	    	if ($productlot->id > 0) print $productlot->getNomUrl(1);
-	    	else print $productlot->batch; // the id may not be defined if movement was entered when lot was not saved or if lot was removed after movement.
-	    	print '</td>';
-        }
-        if (!empty($arrayfields['pl.eatby']['checked']))
-        {
-        	print '<td class="center">'.dol_print_date($objp->eatby, 'day').'</td>';
-        }
-        if (!empty($arrayfields['pl.sellby']['checked']))
-        {
-        	print '<td class="center">'.dol_print_date($objp->sellby, 'day').'</td>';
+			print $productstatic->label;
+			print "</td>\n";
 		}
-        // Warehouse
-        if (!empty($arrayfields['e.ref']['checked']))
+		if (!empty($arrayfields['m.batch']['checked']))
 		{
-            print '<td>';
-            print $warehousestatic->getNomUrl(1);
-            print "</td>\n";
+			print '<td class="center nowraponall">';
+			if ($productlot->id > 0) print $productlot->getNomUrl(1);
+			else print $productlot->batch; // the id may not be defined if movement was entered when lot was not saved or if lot was removed after movement.
+			print '</td>';
 		}
-        // Author
-        if (!empty($arrayfields['m.fk_user_author']['checked']))
-        {
-	        print '<td class="tdoverflowmax100">';
-	        print $userstatic->getNomUrl(-1);
-	        print "</td>\n";
-        }
-        if (!empty($arrayfields['m.inventorycode']['checked']))
-        {
-	        // Inventory code
-	        print '<td><a href="'
+		if (!empty($arrayfields['pl.eatby']['checked']))
+		{
+			print '<td class="center">'.dol_print_date($objp->eatby, 'day').'</td>';
+		}
+		if (!empty($arrayfields['pl.sellby']['checked']))
+		{
+			print '<td class="center">'.dol_print_date($objp->sellby, 'day').'</td>';
+		}
+		// Warehouse
+		if (!empty($arrayfields['e.ref']['checked']))
+		{
+			print '<td>';
+			print $warehousestatic->getNomUrl(1);
+			print "</td>\n";
+		}
+		// Author
+		if (!empty($arrayfields['m.fk_user_author']['checked']))
+		{
+			print '<td class="tdoverflowmax100">';
+			print $userstatic->getNomUrl(-1);
+			print "</td>\n";
+		}
+		if (!empty($arrayfields['m.inventorycode']['checked']))
+		{
+			// Inventory code
+			print '<td><a href="'
 						.DOL_URL_ROOT.'/product/stock/movement_card.php?id='.urlencode($objp->entrepot_id)
 						.'&search_inventorycode='.urlencode($objp->inventorycode)
 						.'&search_type_mouvement='.urlencode($objp->type_mouvement)
 						.'">'
 						.$objp->inventorycode
 						.'</a></td>';
-        }
-        if (!empty($arrayfields['m.label']['checked']))
-        {
-            // Label of movement
-        	print '<td class="tdoverflowmax100aaa">'.$objp->label.'</td>';
-        }
+		}
+		if (!empty($arrayfields['m.label']['checked']))
+		{
+			// Label of movement
+			print '<td class="tdoverflowmax100aaa">'.$objp->label.'</td>';
+		}
 		if (!empty($arrayfields['m.type_mouvement']['checked']))
-        {
-            // Type of movement
-            switch ($objp->type_mouvement) {
-                case "0":
-                    print '<td class="center">'.$langs->trans('StockIncreaseAfterCorrectTransfer').'</td>';
-                    break;
-                case "1":
-                    print '<td class="center">'.$langs->trans('StockDecreaseAfterCorrectTransfer').'</td>';
-                    break;
-                case "2":
-                    print '<td class="center">'.$langs->trans('StockDecrease').'</td>';
-                    break;
-                case "3":
-                    print '<td class="center">'.$langs->trans('StockIncrease').'</td>';
-                    break;
-            }
-        }
-        if (!empty($arrayfields['origin']['checked']))
-        {
-        	// Origin of movement
-        	print '<td class="nowraponall">'.$origin.'</td>';
-        }
-        if (!empty($arrayfields['m.value']['checked']))
-        {
-	        // Qty
-	        print '<td class="right">';
-	        if ($objp->qt > 0) print '+';
-	        print $objp->qty;
-	        print '</td>';
-        }
-        if (!empty($arrayfields['m.price']['checked']))
-        {
-        	// Price
-        	print '<td class="right">';
-        	if ($objp->price != 0) print price($objp->price);
-        	print '</td>';
-        }
-        // Action column
-        print '<td class="nowrap center">';
-        if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-        {
-            $selected = 0;
-    		if (in_array($obj->rowid, $arrayofselected)) $selected = 1;
-    		print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
-        }
-        print '</td>';
-        if (!$i) $totalarray['nbfield']++;
+		{
+			// Type of movement
+			switch ($objp->type_mouvement) {
+				case "0":
+					print '<td class="center">'.$langs->trans('StockIncreaseAfterCorrectTransfer').'</td>';
+					break;
+				case "1":
+					print '<td class="center">'.$langs->trans('StockDecreaseAfterCorrectTransfer').'</td>';
+					break;
+				case "2":
+					print '<td class="center">'.$langs->trans('StockDecrease').'</td>';
+					break;
+				case "3":
+					print '<td class="center">'.$langs->trans('StockIncrease').'</td>';
+					break;
+			}
+		}
+		if (!empty($arrayfields['origin']['checked']))
+		{
+			// Origin of movement
+			print '<td class="nowraponall">'.$origin.'</td>';
+		}
+		if (!empty($arrayfields['m.value']['checked']))
+		{
+			// Qty
+			print '<td class="right">';
+			if ($objp->qt > 0) print '+';
+			print $objp->qty;
+			print '</td>';
+		}
+		if (!empty($arrayfields['m.price']['checked']))
+		{
+			// Price
+			print '<td class="right">';
+			if ($objp->price != 0) print price($objp->price);
+			print '</td>';
+		}
+		// Action column
+		print '<td class="nowrap center">';
+		if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+		{
+			$selected = 0;
+			if (in_array($obj->rowid, $arrayofselected)) $selected = 1;
+			print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
+		}
+		print '</td>';
+		if (!$i) $totalarray['nbfield']++;
 
-        print "</tr>\n";
-        $i++;
-    }
-    $db->free($resql);
+		print "</tr>\n";
+		$i++;
+	}
+	$db->free($resql);
 
-    print "</table>";
-    print '</div>';
-    print "</form>";
+	print "</table>";
+	print '</div>';
+	print "</form>";
 
-    // Add number of product when there is a filter on period
-    if (count($arrayofuniqueproduct) == 1 && is_numeric($year))
-    {
-        print "<br>";
+	// Add number of product when there is a filter on period
+	if (count($arrayofuniqueproduct) == 1 && is_numeric($year))
+	{
+		print "<br>";
 
-        $productidselected = 0;
-    	foreach ($arrayofuniqueproduct as $key => $val) {
-    		$productidselected = $key;
-    		$productlabelselected = $val;
-    	}
+		$productidselected = 0;
+		foreach ($arrayofuniqueproduct as $key => $val) {
+			$productidselected = $key;
+			$productlabelselected = $val;
+		}
 		$datebefore = dol_get_first_day($year ? $year : strftime("%Y", time()), $month ? $month : 1, true);
 		$dateafter = dol_get_last_day($year ? $year : strftime("%Y", time()), $month ? $month : 12, true);
-    	$balancebefore = $movement->calculateBalanceForProductBefore($productidselected, $datebefore);
-    	$balanceafter = $movement->calculateBalanceForProductBefore($productidselected, $dateafter);
+		$balancebefore = $movement->calculateBalanceForProductBefore($productidselected, $datebefore);
+		$balanceafter = $movement->calculateBalanceForProductBefore($productidselected, $dateafter);
 
-    	//print '<tr class="total"><td class="liste_total">';
-    	print $langs->trans("NbOfProductBeforePeriod", $productlabelselected, dol_print_date($datebefore, 'day', 'gmt'));
-    	//print '</td>';
-    	//print '<td class="liste_total right" colspan="6">';
-    	print ': '.$balancebefore;
-    	print "<br>\n";
-    	//print '</td></tr>';
-    	//print '<tr class="total"><td class="liste_total">';
-    	print $langs->trans("NbOfProductAfterPeriod", $productlabelselected, dol_print_date($dateafter, 'day', 'gmt'));
-    	//print '</td>';
-    	//print '<td class="liste_total right" colspan="6">';
-    	print ': '.$balanceafter;
-    	print "<br>\n";
-        //print '</td></tr>';
-    }
+		//print '<tr class="total"><td class="liste_total">';
+		print $langs->trans("NbOfProductBeforePeriod", $productlabelselected, dol_print_date($datebefore, 'day', 'gmt'));
+		//print '</td>';
+		//print '<td class="liste_total right" colspan="6">';
+		print ': '.$balancebefore;
+		print "<br>\n";
+		//print '</td></tr>';
+		//print '<tr class="total"><td class="liste_total">';
+		print $langs->trans("NbOfProductAfterPeriod", $productlabelselected, dol_print_date($dateafter, 'day', 'gmt'));
+		//print '</td>';
+		//print '<td class="liste_total right" colspan="6">';
+		print ': '.$balanceafter;
+		print "<br>\n";
+		//print '</td></tr>';
+	}
 } else {
-    dol_print_error($db);
+	dol_print_error($db);
 }
 
 
@@ -1132,41 +1132,41 @@ $modulepart = 'movement';
 if ($action != 'create' && $action != 'edit' && $action != 'delete' && $id > 0)
 {
 	print '<br/>';
-    print '<div class="fichecenter"><div class="fichehalfleft">';
-    print '<a name="builddoc"></a>'; // ancre
+	print '<div class="fichecenter"><div class="fichehalfleft">';
+	print '<a name="builddoc"></a>'; // ancre
 
-    // Documents
-    $objectref = dol_sanitizeFileName($object->ref);
+	// Documents
+	$objectref = dol_sanitizeFileName($object->ref);
 	// Add inventorycode & type_mouvement to filename of the pdf
 	if (!empty($search_inventorycode)) $objectref .= "_".$id."_".$search_inventorycode;
 	if ($search_type_mouvement) $objectref .= "_".$search_type_mouvement;
-    $relativepath = $comref.'/'.$objectref.'.pdf';
-    $filedir = $conf->stock->dir_output.'/movement/'.$objectref;
+	$relativepath = $comref.'/'.$objectref.'.pdf';
+	$filedir = $conf->stock->dir_output.'/movement/'.$objectref;
 
-    $urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id."&search_inventorycode=".$search_inventorycode."&search_type_mouvement=$search_type_mouvement";
-    $genallowed = $usercanread;
-    $delallowed = $usercancreate;
+	$urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id."&search_inventorycode=".$search_inventorycode."&search_type_mouvement=$search_type_mouvement";
+	$genallowed = $usercanread;
+	$delallowed = $usercancreate;
 
 	$genallowed = $user->rights->stock->lire;
-    $delallowed = $user->rights->stock->creer;
+	$delallowed = $user->rights->stock->creer;
 
-    print $formfile->showdocuments($modulepart, $objectref, $filedir, $urlsource, $genallowed, $delallowed, '', 0, 0, 0, 28, 0, '', 0, '', $object->default_lang, '', $object);
-    $somethingshown = $formfile->numoffiles;
+	print $formfile->showdocuments($modulepart, $objectref, $filedir, $urlsource, $genallowed, $delallowed, '', 0, 0, 0, 28, 0, '', 0, '', $object->default_lang, '', $object);
+	$somethingshown = $formfile->numoffiles;
 
-    print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+	print '</div><div class="fichehalfright"><div class="ficheaddleft">';
 
-    $MAXEVENT = 10;
+	$MAXEVENT = 10;
 
-    $morehtmlright = '<a href="'.DOL_URL_ROOT.'/product/agenda.php?id='.$object->id.'">';
-    $morehtmlright .= $langs->trans("SeeAll");
-    $morehtmlright .= '</a>';
+	$morehtmlright = '<a href="'.DOL_URL_ROOT.'/product/agenda.php?id='.$object->id.'">';
+	$morehtmlright .= $langs->trans("SeeAll");
+	$morehtmlright .= '</a>';
 
-    // List of actions on element
-    include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
-    $formactions = new FormActions($db);
-    $somethingshown = $formactions->showactions($object, 'mouvement', 0, 1, '', $MAXEVENT, '', $morehtmlright); // Show all action for product
+	// List of actions on element
+	include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
+	$formactions = new FormActions($db);
+	$somethingshown = $formactions->showactions($object, 'mouvement', 0, 1, '', $MAXEVENT, '', $morehtmlright); // Show all action for product
 
-    print '</div></div></div>';
+	print '</div></div></div>';
 }
 
 
diff --git a/htdocs/product/stock/movement_list.php b/htdocs/product/stock/movement_list.php
index 3d8c39e7cf2..6ab8a99ac76 100644
--- a/htdocs/product/stock/movement_list.php
+++ b/htdocs/product/stock/movement_list.php
@@ -661,7 +661,7 @@ if ($resql)
 
 		print '<div class="clearboth"></div>';
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 	}
 
 
diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php
index c75d0172be0..abe0e7f1e2b 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -733,7 +733,7 @@ if ($id > 0 || $ref)
 		print '</div>';
 		print '<div style="clear:both"></div>';
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 	}
 
 	// Correct stock
diff --git a/htdocs/product/stock/productlot_card.php b/htdocs/product/stock/productlot_card.php
index 109c3c2a09d..49dea3b008c 100644
--- a/htdocs/product/stock/productlot_card.php
+++ b/htdocs/product/stock/productlot_card.php
@@ -55,7 +55,7 @@ if (empty($action) && empty($id) && empty($ref)) $action = 'list';
 // Protection if external user
 if ($user->socid > 0)
 {
-    //accessforbidden();
+	//accessforbidden();
 }
 //$result = restrictedArea($user, 'mymodule', $id);
 
@@ -71,12 +71,12 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 //include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php';  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
 if ($id || $ref)
 {
-    if ($ref)
-    {
-        $tmp = explode('_', $ref);
-        $productid = $tmp[0];
-        $batch = $tmp[1];
-    }
+	if ($ref)
+	{
+		$tmp = explode('_', $ref);
+		$productid = $tmp[0];
+		$batch = $tmp[1];
+	}
 	$object->fetch($id, $productid, $batch);
 	$object->ref = $object->batch; // For document management ( it use $object->ref)
 }
@@ -105,40 +105,40 @@ if (empty($reshook))
 {
 	if ($action == 'seteatby' && $user->rights->stock->creer)
 	{
-	    $newvalue = dol_mktime(12, 0, 0, $_POST['eatbymonth'], $_POST['eatbyday'], $_POST['eatbyyear']);
+		$newvalue = dol_mktime(12, 0, 0, $_POST['eatbymonth'], $_POST['eatbyday'], $_POST['eatbyyear']);
 		$result = $object->setValueFrom('eatby', $newvalue, '', null, 'date', '', $user, 'PRODUCTLOT_MODIFY');
 		if ($result < 0) dol_print_error($db, $object->error);
 	}
 
 	if ($action == 'setsellby' && $user->rights->stock->creer)
 	{
-	    $newvalue = dol_mktime(12, 0, 0, $_POST['sellbymonth'], $_POST['sellbyday'], $_POST['sellbyyear']);
+		$newvalue = dol_mktime(12, 0, 0, $_POST['sellbymonth'], $_POST['sellbyday'], $_POST['sellbyyear']);
 		$result = $object->setValueFrom('sellby', $newvalue, '', null, 'date', '', $user, 'PRODUCTLOT_MODIFY');
 		if ($result < 0) dol_print_error($db, $object->error);
 	}
 
 	if ($action == 'update_extras')
-    {
-    	$object->oldcopy = dol_clone($object);
+	{
+		$object->oldcopy = dol_clone($object);
 
-    	// Fill array 'array_options' with data from update form
-        $ret = $extrafields->setOptionalsFromPost(null, $object, GETPOST('attribute', 'restricthtml'));
-        if ($ret < 0) $error++;
+		// Fill array 'array_options' with data from update form
+		$ret = $extrafields->setOptionalsFromPost(null, $object, GETPOST('attribute', 'restricthtml'));
+		if ($ret < 0) $error++;
 
-        if (!$error)
-        {
-            // Actions on extra fields
-            $result = $object->insertExtraFields('PRODUCT_LOT_MODIFY');
+		if (!$error)
+		{
+			// Actions on extra fields
+			$result = $object->insertExtraFields('PRODUCT_LOT_MODIFY');
 			if ($result < 0)
 			{
 				setEventMessages($object->error, $object->errors, 'errors');
 				$error++;
 			}
-        }
+		}
 
-        if ($error)
-            $action = 'edit_extras';
-    }
+		if ($error)
+			$action = 'edit_extras';
+	}
 
 	// Action to add record
 	if ($action == 'add')
@@ -154,12 +154,12 @@ if (empty($reshook))
 
 		/* object_prop_getpost_prop */
 
-    	$object->entity = GETPOST('entity', 'int');
-    	$object->fk_product = GETPOST('fk_product', 'int');
-    	$object->batch = GETPOST('batch', 'alpha');
-    	$object->fk_user_creat = GETPOST('fk_user_creat', 'int');
-    	$object->fk_user_modif = GETPOST('fk_user_modif', 'int');
-    	$object->import_key = GETPOST('import_key', 'int');
+		$object->entity = GETPOST('entity', 'int');
+		$object->fk_product = GETPOST('fk_product', 'int');
+		$object->batch = GETPOST('batch', 'alpha');
+		$object->fk_user_creat = GETPOST('fk_user_creat', 'int');
+		$object->fk_user_modif = GETPOST('fk_user_modif', 'int');
+		$object->import_key = GETPOST('import_key', 'int');
 
 		if (empty($object->ref))
 		{
@@ -196,12 +196,12 @@ if (empty($reshook))
 	{
 		$error = 0;
 
-    	$object->entity = GETPOST('entity', 'int');
-    	$object->fk_product = GETPOST('fk_product', 'int');
-    	$object->batch = GETPOST('batch', 'alpha');
-    	$object->fk_user_creat = GETPOST('fk_user_creat', 'int');
-    	$object->fk_user_modif = GETPOST('fk_user_modif', 'int');
-    	$object->import_key = GETPOST('import_key', 'int');
+		$object->entity = GETPOST('entity', 'int');
+		$object->fk_product = GETPOST('fk_product', 'int');
+		$object->batch = GETPOST('batch', 'alpha');
+		$object->fk_user_creat = GETPOST('fk_user_creat', 'int');
+		$object->fk_user_modif = GETPOST('fk_user_modif', 'int');
+		$object->import_key = GETPOST('import_key', 'int');
 
 		if (empty($object->ref))
 		{
@@ -243,9 +243,9 @@ if (empty($reshook))
 	}
 
 	// Actions to build doc
-    $upload_dir = $conf->productbatch->multidir_output[$conf->entity];
-    $permissiontoadd = $usercancreate;
-    include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
+	$upload_dir = $conf->productbatch->multidir_output[$conf->entity];
+	$permissiontoadd = $usercancreate;
+	include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
 }
 
 
@@ -274,15 +274,15 @@ if ($action == 'create')
 	print '<table class="border centpercent">'."\n";
 	// print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td><input class="flat" type="text" size="36" name="label" value="'.$label.'"></td></tr>';
 	//
-    print '<tr><td class="fieldrequired">'.$langs->trans("Fieldfk_product").'</td><td><input class="flat" type="text" name="fk_product" value="'.GETPOST('fk_product').'"></td></tr>';
-    print '<tr><td class="fieldrequired">'.$langs->trans("Fieldbatch").'</td><td><input class="flat" type="text" name="batch" value="'.GETPOST('batch').'"></td></tr>';
-    print '<tr><td class="fieldrequired">'.$langs->trans("Fieldfk_user_creat").'</td><td><input class="flat" type="text" name="fk_user_creat" value="'.GETPOST('fk_user_creat').'"></td></tr>';
-    print '<tr><td class="fieldrequired">'.$langs->trans("Fieldfk_user_modif").'</td><td><input class="flat" type="text" name="fk_user_modif" value="'.GETPOST('fk_user_modif').'"></td></tr>';
-    print '<tr><td class="fieldrequired">'.$langs->trans("Fieldimport_key").'</td><td><input class="flat" type="text" name="import_key" value="'.GETPOST('import_key').'"></td></tr>';
+	print '<tr><td class="fieldrequired">'.$langs->trans("Fieldfk_product").'</td><td><input class="flat" type="text" name="fk_product" value="'.GETPOST('fk_product').'"></td></tr>';
+	print '<tr><td class="fieldrequired">'.$langs->trans("Fieldbatch").'</td><td><input class="flat" type="text" name="batch" value="'.GETPOST('batch').'"></td></tr>';
+	print '<tr><td class="fieldrequired">'.$langs->trans("Fieldfk_user_creat").'</td><td><input class="flat" type="text" name="fk_user_creat" value="'.GETPOST('fk_user_creat').'"></td></tr>';
+	print '<tr><td class="fieldrequired">'.$langs->trans("Fieldfk_user_modif").'</td><td><input class="flat" type="text" name="fk_user_modif" value="'.GETPOST('fk_user_modif').'"></td></tr>';
+	print '<tr><td class="fieldrequired">'.$langs->trans("Fieldimport_key").'</td><td><input class="flat" type="text" name="import_key" value="'.GETPOST('import_key').'"></td></tr>';
 
 	print '</table>'."\n";
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div class="center"><input type="submit" class="button" name="add" value="'.$langs->trans("Create").'"> &nbsp; <input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'"></div>';
 
@@ -295,9 +295,9 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 {
 	$res = $object->fetch_optionals();
 
-    //print load_fiche_titre($langs->trans("Batch"));
+	//print load_fiche_titre($langs->trans("Batch"));
 
-    $head = productlot_prepare_head($object);
+	$head = productlot_prepare_head($object);
 	print dol_get_fiche_head($head, 'card', $langs->trans("Batch"), -1, 'barcode');
 
 
@@ -309,24 +309,24 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/product/stock/productlot_list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-    $shownav = 1;
-    if ($user->socid && !in_array('batch', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav = 0;
+	$shownav = 1;
+	if ($user->socid && !in_array('batch', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav = 0;
 
 	dol_banner_tab($object, 'id', $linkback, $shownav, 'rowid', 'batch');
 
-    print '<div class="fichecenter">';
-    print '<div class="underbanner clearboth"></div>';
+	print '<div class="fichecenter">';
+	print '<div class="underbanner clearboth"></div>';
 
-    print '<table class="border centpercent">'."\n";
+	print '<table class="border centpercent">'."\n";
 
 	// Product
-    print '<tr><td class="titlefield">'.$langs->trans("Product").'</td><td>';
-    $producttmp = new Product($db);
-    $producttmp->fetch($object->fk_product);
-    print $producttmp->getNomUrl(1, 'stock'). " - " . $producttmp->label;
-    print '</td></tr>';
+	print '<tr><td class="titlefield">'.$langs->trans("Product").'</td><td>';
+	$producttmp = new Product($db);
+	$producttmp->fetch($object->fk_product);
+	print $producttmp->getNomUrl(1, 'stock')." - ".$producttmp->label;
+	print '</td></tr>';
 
-    // Eat by
+	// Eat by
 	if (empty($conf->global->PRODUCT_DISABLE_EATBY)) {
 		print '<tr><td>';
 		print $form->editfieldkey($langs->trans('EatByDate'), 'eatby', $object->eatby, $object, $user->rights->stock->creer, 'datepicker');
@@ -336,7 +336,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		print '</tr>';
 	}
 
-    // Sell by
+	// Sell by
 	if (empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
 		print '<tr><td>';
 		print $form->editfieldkey($langs->trans('SellByDate'), 'sellby', $object->sellby, $object, $user->rights->stock->creer, 'datepicker');
@@ -345,15 +345,15 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		print '</td>';
 		print '</tr>';
 	}
-    // Other attributes
-    $cols = 2;
-    include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
+	// Other attributes
+	$cols = 2;
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
 
 	print '</table>';
 
 	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 
 	// Buttons
@@ -393,19 +393,19 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 if (empty($action))
 {
-    print '<div class="fichecenter"><div class="fichehalfleft">';
-    print '<a name="builddoc"></a>'; // ancre
+	print '<div class="fichecenter"><div class="fichehalfleft">';
+	print '<a name="builddoc"></a>'; // ancre
 
-    // Documents
+	// Documents
 	$filedir = $conf->productbatch->multidir_output[$object->entity].'/'.get_exdir(0, 0, 0, 0, $object, 'product_batch').dol_sanitizeFileName($object->ref);
-    $urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
-    $genallowed = $usercanread;
-    $delallowed = $usercancreate;
+	$urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
+	$genallowed = $usercanread;
+	$delallowed = $usercancreate;
 
-    print $formfile->showdocuments('product_batch', dol_sanitizeFileName($object->ref), $filedir, $urlsource, $genallowed, $delallowed, '', 0, 0, 0, 28, 0, '', 0, '', $object->default_lang, '', $object);
-    $somethingshown = $formfile->numoffiles;
+	print $formfile->showdocuments('product_batch', dol_sanitizeFileName($object->ref), $filedir, $urlsource, $genallowed, $delallowed, '', 0, 0, 0, 28, 0, '', 0, '', $object->default_lang, '', $object);
+	$somethingshown = $formfile->numoffiles;
 
-    print '</div>';
+	print '</div>';
 }
 
 // End of page
diff --git a/htdocs/product/stock/productlot_document.php b/htdocs/product/stock/productlot_document.php
index 1bbf45851b5..535486f8c62 100644
--- a/htdocs/product/stock/productlot_document.php
+++ b/htdocs/product/stock/productlot_document.php
@@ -70,16 +70,16 @@ $modulepart = 'product_batch';
 $object = new Productlot($db);
 if ($id || $ref)
 {
-    if ($ref)
-    {
-        $tmp = explode('_', $ref);
-        $productid = $tmp[0];
-        $batch = $tmp[1];
-    }
-    $object->fetch($id, $productid, $batch);
-    $object->ref = $object->batch; // For document management ( it use $object->ref)
+	if ($ref)
+	{
+		$tmp = explode('_', $ref);
+		$productid = $tmp[0];
+		$batch = $tmp[1];
+	}
+	$object->fetch($id, $productid, $batch);
+	$object->ref = $object->batch; // For document management ( it use $object->ref)
 
-    if (!empty($conf->productbatch->enabled)) $upload_dir = $conf->productbatch->multidir_output[$object->entity].'/'.get_exdir(0, 0, 0, 0, $object, $modulepart).dol_sanitizeFileName($object->ref);
+	if (!empty($conf->productbatch->enabled)) $upload_dir = $conf->productbatch->multidir_output[$object->entity].'/'.get_exdir(0, 0, 0, 0, $object, $modulepart).dol_sanitizeFileName($object->ref);
 }
 
 
@@ -117,7 +117,7 @@ if ($object->id)
 
 	$parameters = array();
 	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-    print $hookmanager->resPrint;
+	print $hookmanager->resPrint;
 	if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
 	// Build file list
@@ -130,30 +130,30 @@ if ($object->id)
 	}
 
 
-    $linkback = '<a href="'.DOL_URL_ROOT.'/product/stock/productlot_list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+	$linkback = '<a href="'.DOL_URL_ROOT.'/product/stock/productlot_list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-    $shownav = 1;
-    if ($user->socid && !in_array('batch', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav = 0;
+	$shownav = 1;
+	if ($user->socid && !in_array('batch', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav = 0;
 
 	dol_banner_tab($object, 'id', $linkback, $shownav, 'rowid', 'batch');
 
-    print '<div class="fichecenter">';
+	print '<div class="fichecenter">';
 
-    print '<div class="underbanner clearboth"></div>';
-    print '<table class="border tableforfield" width="100%">';
+	print '<div class="underbanner clearboth"></div>';
+	print '<table class="border tableforfield" width="100%">';
 
-    print '<tr><td class="titlefield">'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
-    print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.dol_print_size($totalsize, 1, 1).'</td></tr>';
-    print '</table>';
+	print '<tr><td class="titlefield">'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
+	print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.dol_print_size($totalsize, 1, 1).'</td></tr>';
+	print '</table>';
 
-    print '</div>';
-    print '<div style="clear:both"></div>';
+	print '</div>';
+	print '<div style="clear:both"></div>';
 
-    dol_fiche_end();
+	print dol_get_fiche_end();
 
-    $permission = ($user->rights->produit->creer);
-    $param = '&id='.$object->id;
-    include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
+	$permission = ($user->rights->produit->creer);
+	$param = '&id='.$object->id;
+	include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
 } else {
 	print $langs->trans("ErrorUnknown");
 }
diff --git a/htdocs/product/stock/productlot_list.php b/htdocs/product/stock/productlot_list.php
index 95123b7c873..e03de931a58 100644
--- a/htdocs/product/stock/productlot_list.php
+++ b/htdocs/product/stock/productlot_list.php
@@ -377,7 +377,7 @@ foreach ($object->fields as $key => $val)
 	if (!empty($arrayfields['t.'.$key]['checked']))
 	{
 		print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
-		if (is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
+		if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
 		elseif (strpos($val['type'], 'integer:') === 0) {
 			print $object->showInputField($val, $key, $search[$key], '', '', 'search_', 'maxwidth150', 1);
 		} elseif (!preg_match('/^(date|timestamp)/', $val['type'])) print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
diff --git a/htdocs/product/stock/replenish.php b/htdocs/product/stock/replenish.php
index acd77e1f911..0fd5a658a0b 100644
--- a/htdocs/product/stock/replenish.php
+++ b/htdocs/product/stock/replenish.php
@@ -39,7 +39,7 @@ $langs->loadLangs(array('products', 'stocks', 'orders'));
 
 // Security check
 if ($user->socid) {
-    $socid = $user->socid;
+	$socid = $user->socid;
 }
 $result = restrictedArea($user, 'produit|service');
 
@@ -73,11 +73,11 @@ $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $offset = $limit * $page;
 
 if (!$sortfield) {
-    $sortfield = 'p.ref';
+	$sortfield = 'p.ref';
 }
 
 if (!$sortorder) {
-    $sortorder = 'ASC';
+	$sortorder = 'ASC';
 }
 
 // Define virtualdiffersfromphysical
@@ -89,7 +89,7 @@ if (!empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT)
 	|| !empty($conf->global->STOCK_CALCULATE_ON_RECEPTION_CLOSE)
 	|| !empty($conf->mrp->enabled))
 {
-    $virtualdiffersfromphysical = 1; // According to increase/decrease stock options, virtual and physical stock may differs.
+	$virtualdiffersfromphysical = 1; // According to increase/decrease stock options, virtual and physical stock may differs.
 }
 
 $usevirtualstock = !empty($conf->global->STOCK_USE_VIRTUAL_STOCK);
@@ -107,11 +107,11 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 
 if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha') || isset($_POST['valid'])) // Both test are required to be compatible with all browsers
 {
-    $search_ref = '';
-    $search_label = '';
-    $sall = '';
-    $salert = '';
-    $includeproductswithoutdesiredqty = '';
+	$search_ref = '';
+	$search_label = '';
+	$sall = '';
+	$salert = '';
+	$includeproductswithoutdesiredqty = '';
 	$draftorder = '';
 }
 if ($draftorder == 'on') $draftchecked = "checked";
@@ -119,43 +119,43 @@ if ($draftorder == 'on') $draftchecked = "checked";
 // Create orders
 if ($action == 'order' && isset($_POST['valid']))
 {
-    $linecount = GETPOST('linecount', 'int');
-    $box = 0;
+	$linecount = GETPOST('linecount', 'int');
+	$box = 0;
 	$errorQty = 0;
-    unset($_POST['linecount']);
-    if ($linecount > 0)
-    {
-    	$db->begin();
+	unset($_POST['linecount']);
+	if ($linecount > 0)
+	{
+		$db->begin();
 
-        $suppliers = array();
+		$suppliers = array();
 		require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
 		$productsupplier = new ProductFournisseur($db);
-        for ($i = 0; $i < $linecount; $i++)
-        {
-            if (GETPOST('choose'.$i, 'alpha') === 'on' && GETPOST('fourn'.$i, 'int') > 0)
-            {
-            	//one line
-                $box = $i;
-                $supplierpriceid = GETPOST('fourn'.$i, 'int');
-                //get all the parameters needed to create a line
-                $qty = GETPOST('tobuy'.$i, 'int');
+		for ($i = 0; $i < $linecount; $i++)
+		{
+			if (GETPOST('choose'.$i, 'alpha') === 'on' && GETPOST('fourn'.$i, 'int') > 0)
+			{
+				//one line
+				$box = $i;
+				$supplierpriceid = GETPOST('fourn'.$i, 'int');
+				//get all the parameters needed to create a line
+				$qty = GETPOST('tobuy'.$i, 'int');
 				$idprod = $productsupplier->get_buyprice($supplierpriceid, $qty);
 				$res = $productsupplier->fetch($idprod);
-                if ($res && $idprod > 0)
-                {
-                	if ($qty)
-                	{
-	                    //might need some value checks
-	                    $line = new CommandeFournisseurLigne($db);
-	                    $line->qty = $qty;
-	                    $line->fk_product = $idprod;
+				if ($res && $idprod > 0)
+				{
+					if ($qty)
+					{
+						//might need some value checks
+						$line = new CommandeFournisseurLigne($db);
+						$line->qty = $qty;
+						$line->fk_product = $idprod;
 
-	                    //$product = new Product($db);
-	                    //$product->fetch($obj->fk_product);
-	                    if (!empty($conf->global->MAIN_MULTILANGS))
-	                    {
-	                        $productsupplier->getMultiLangs();
-	                    }
+						//$product = new Product($db);
+						//$product->fetch($obj->fk_product);
+						if (!empty($conf->global->MAIN_MULTILANGS))
+						{
+							$productsupplier->getMultiLangs();
+						}
 
 						// if we use supplier description of the products
 						if (!empty($productsupplier->desc_supplier) && !empty($conf->global->PRODUIT_FOURN_TEXTS)) {
@@ -163,124 +163,124 @@ if ($action == 'order' && isset($_POST['valid']))
 						} else {
 							$desc = $productsupplier->description;
 						}
-	                    $line->desc = $desc;
-                        if (!empty($conf->global->MAIN_MULTILANGS))
-                        {
-                            // TODO Get desc in language of thirdparty
-                        }
+						$line->desc = $desc;
+						if (!empty($conf->global->MAIN_MULTILANGS))
+						{
+							// TODO Get desc in language of thirdparty
+						}
 
-	                    $line->tva_tx = $productsupplier->vatrate_supplier;
-	                    $line->subprice = $productsupplier->fourn_pu;
-	                    $line->total_ht = $productsupplier->fourn_pu * $qty;
-	                    $tva = $line->tva_tx / 100;
-	                    $line->total_tva = $line->total_ht * $tva;
-	                    $line->total_ttc = $line->total_ht + $line->total_tva;
+						$line->tva_tx = $productsupplier->vatrate_supplier;
+						$line->subprice = $productsupplier->fourn_pu;
+						$line->total_ht = $productsupplier->fourn_pu * $qty;
+						$tva = $line->tva_tx / 100;
+						$line->total_tva = $line->total_ht * $tva;
+						$line->total_ttc = $line->total_ht + $line->total_tva;
 						$line->remise_percent = $productsupplier->remise_percent;
-	                    $line->ref_fourn = $productsupplier->ref_supplier;
+						$line->ref_fourn = $productsupplier->ref_supplier;
 						$line->type = $productsupplier->type;
 						$line->fk_unit = $productsupplier->fk_unit;
-	                    $suppliers[$productsupplier->fourn_socid]['lines'][] = $line;
-                	}
-                } elseif ($idprod == -1)
+						$suppliers[$productsupplier->fourn_socid]['lines'][] = $line;
+					}
+				} elseif ($idprod == -1)
 				{
 					$errorQty++;
 				} else {
-                    $error = $db->lasterror();
-                    dol_print_error($db);
-                }
+					$error = $db->lasterror();
+					dol_print_error($db);
+				}
 
-                unset($_POST['fourn'.$i]);
-            }
-            unset($_POST[$i]);
-        }
+				unset($_POST['fourn'.$i]);
+			}
+			unset($_POST[$i]);
+		}
 
-        //we now know how many orders we need and what lines they have
-        $i = 0;
-        $fail = 0;
-        $orders = array();
-        $suppliersid = array_keys($suppliers);
-        foreach ($suppliers as $supplier)
-        {
-            $order = new CommandeFournisseur($db);
-            // Check if an order for the supplier exists
-            $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."commande_fournisseur";
-            $sql .= " WHERE fk_soc = ".$suppliersid[$i];
-            $sql .= " AND source = 42 AND fk_statut = 0";
-            $sql .= " AND entity IN (".getEntity('commande_fournisseur').")";
-            $sql .= " ORDER BY date_creation DESC";
-            $resql = $db->query($sql);
-            if ($resql && $db->num_rows($resql) > 0) {
-                $obj = $db->fetch_object($resql);
-                $order->fetch($obj->rowid);
-                foreach ($supplier['lines'] as $line) {
-                    $result = $order->addline(
-                        $line->desc,
-                        $line->subprice,
-                        $line->qty,
-                        $line->tva_tx,
-                        $line->localtax1_tx,
-                        $line->localtax2_tx,
-                        $line->fk_product,
-                        0,
-                        $line->ref_fourn,
-                        $line->remise_percent,
-                        'HT',
-                        0,
-                        $line->type,
-                        0,
+		//we now know how many orders we need and what lines they have
+		$i = 0;
+		$fail = 0;
+		$orders = array();
+		$suppliersid = array_keys($suppliers);
+		foreach ($suppliers as $supplier)
+		{
+			$order = new CommandeFournisseur($db);
+			// Check if an order for the supplier exists
+			$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."commande_fournisseur";
+			$sql .= " WHERE fk_soc = ".$suppliersid[$i];
+			$sql .= " AND source = 42 AND fk_statut = 0";
+			$sql .= " AND entity IN (".getEntity('commande_fournisseur').")";
+			$sql .= " ORDER BY date_creation DESC";
+			$resql = $db->query($sql);
+			if ($resql && $db->num_rows($resql) > 0) {
+				$obj = $db->fetch_object($resql);
+				$order->fetch($obj->rowid);
+				foreach ($supplier['lines'] as $line) {
+					$result = $order->addline(
+						$line->desc,
+						$line->subprice,
+						$line->qty,
+						$line->tva_tx,
+						$line->localtax1_tx,
+						$line->localtax2_tx,
+						$line->fk_product,
+						0,
+						$line->ref_fourn,
+						$line->remise_percent,
+						'HT',
+						0,
+						$line->type,
+						0,
 						false,
 						null,
 						null,
 						0,
 						$line->fk_unit
-                    );
-                }
-                if ($result < 0) {
-                    $fail++;
-                    $msg = $langs->trans('OrderFail')."&nbsp;:&nbsp;";
-                    $msg .= $order->error;
-                    setEventMessages($msg, null, 'errors');
-                } else {
-                    $id = $result;
-                }
-            } else {
-                $order->socid = $suppliersid[$i];
-                $order->fetch_thirdparty();
-                //trick to know which orders have been generated this way
-                $order->source = 42;
-                foreach ($supplier['lines'] as $line) {
-                    $order->lines[] = $line;
-                }
-                $order->cond_reglement_id = $order->thirdparty->cond_reglement_supplier_id;
-                $order->mode_reglement_id = $order->thirdparty->mode_reglement_supplier_id;
-                $id = $order->create($user);
-                if ($id < 0) {
-                    $fail++;
-                    $msg = $langs->trans('OrderFail')."&nbsp;:&nbsp;";
-                    $msg .= $order->error;
-                    setEventMessages($msg, null, 'errors');
-                }
-                $i++;
-            }
-        }
+					);
+				}
+				if ($result < 0) {
+					$fail++;
+					$msg = $langs->trans('OrderFail')."&nbsp;:&nbsp;";
+					$msg .= $order->error;
+					setEventMessages($msg, null, 'errors');
+				} else {
+					$id = $result;
+				}
+			} else {
+				$order->socid = $suppliersid[$i];
+				$order->fetch_thirdparty();
+				//trick to know which orders have been generated this way
+				$order->source = 42;
+				foreach ($supplier['lines'] as $line) {
+					$order->lines[] = $line;
+				}
+				$order->cond_reglement_id = $order->thirdparty->cond_reglement_supplier_id;
+				$order->mode_reglement_id = $order->thirdparty->mode_reglement_supplier_id;
+				$id = $order->create($user);
+				if ($id < 0) {
+					$fail++;
+					$msg = $langs->trans('OrderFail')."&nbsp;:&nbsp;";
+					$msg .= $order->error;
+					setEventMessages($msg, null, 'errors');
+				}
+				$i++;
+			}
+		}
 
 		if ($errorQty) setEventMessages($langs->trans('ErrorOrdersNotCreatedQtyTooLow'), null, 'warnings');
 
-        if (!$fail && $id)
-        {
-        	$db->commit();
+		if (!$fail && $id)
+		{
+			$db->commit();
 
-            setEventMessages($langs->trans('OrderCreated'), null, 'mesgs');
-            header('Location: replenishorders.php');
-            exit;
-        } else {
-        	$db->rollback();
-        }
-    }
-    if ($box == 0)
-    {
-        setEventMessages($langs->trans('SelectProductWithNotNullQty'), null, 'warnings');
-    }
+			setEventMessages($langs->trans('OrderCreated'), null, 'mesgs');
+			header('Location: replenishorders.php');
+			exit;
+		} else {
+			$db->rollback();
+		}
+	}
+	if ($box == 0)
+	{
+		setEventMessages($langs->trans('SelectProductWithNotNullQty'), null, 'warnings');
+	}
 }
 
 
@@ -340,11 +340,11 @@ $sql .= ' WHERE p.entity IN ('.getEntity('product').')';
 if ($sall) $sql .= natural_search(array('p.ref', 'p.label', 'p.description', 'p.note'), $sall);
 // if the type is not 1, we show all products (type = 0,2,3)
 if (dol_strlen($type)) {
-    if ($type == 1) {
-        $sql .= ' AND p.fk_product_type = 1';
-    } else {
-        $sql .= ' AND p.fk_product_type <> 1';
-    }
+	if ($type == 1) {
+		$sql .= ' AND p.fk_product_type = 1';
+	} else {
+		$sql .= ' AND p.fk_product_type <> 1';
+	}
 }
 if ($search_ref) $sql .= natural_search('p.ref', $search_ref);
 if ($search_label) $sql .= natural_search('p.label', $search_label);
@@ -377,11 +377,11 @@ if ($usevirtualstock)
 		$sqlExpeditionsCli = "(SELECT ".$db->ifsql("SUM(ed2.qty) IS NULL", "0", "SUM(ed2.qty)")." as qty"; // We need the ifsql because if result is 0 for product p.rowid, we must return 0 and not NULL
 		$sqlExpeditionsCli .= " FROM ".MAIN_DB_PREFIX."expedition as e2,";
 		$sqlExpeditionsCli .= " ".MAIN_DB_PREFIX."expeditiondet as ed2,";
-                $sqlExpeditionsCli .= " ".MAIN_DB_PREFIX."commande as c2,";
+				$sqlExpeditionsCli .= " ".MAIN_DB_PREFIX."commande as c2,";
 		$sqlExpeditionsCli .= " ".MAIN_DB_PREFIX."commandedet as cd2";
 		$sqlExpeditionsCli .= " WHERE ed2.fk_expedition = e2.rowid AND cd2.rowid = ed2.fk_origin_line AND e2.entity IN (".getEntity(!empty($conf->global->STOCK_CALCULATE_VIRTUAL_STOCK_TRANSVERSE_MODE) ? 'stock' : 'expedition').")";
-                $sqlExpeditionsCli .= " AND cd2.fk_commande = c2.rowid";
-                $sqlExpeditionsCli .= " AND c2.fk_statut IN (1,2)";
+				$sqlExpeditionsCli .= " AND cd2.fk_commande = c2.rowid";
+				$sqlExpeditionsCli .= " AND c2.fk_statut IN (1,2)";
 		$sqlExpeditionsCli .= " AND cd2.fk_product = p.rowid";
 		$sqlExpeditionsCli .= " AND e2.fk_statut IN (1,2))";
 	} else {
@@ -443,7 +443,7 @@ if ($usevirtualstock)
 
 	if ($salert == 'on')	// Option to see when stock is lower than alert
 	{
-            $sql .= ' AND ((';
+			$sql .= ' AND ((';
 		if ($includeproductswithoutdesiredqty == 'on') {
 			$sql .= $sqlalertstock.' >= 0 OR '.$sqlalertstock.' IS NULL) AND ('.$db->ifsql("$sqlalertstock IS NULL", "0", $sqlalertstock).' > SUM('.$db->ifsql("s.reel IS NULL", "0", "s.reel").')';
 		} else {
@@ -474,7 +474,7 @@ if ($usevirtualstock)
 
 $includeproductswithoutdesiredqtychecked = '';
 if ($includeproductswithoutdesiredqty == 'on') {
-    $includeproductswithoutdesiredqtychecked = 'checked';
+	$includeproductswithoutdesiredqtychecked = 'checked';
 }
 
 // Add where from hooks
@@ -484,12 +484,12 @@ $sql .= $hookmanager->resPrint;
 
 $nbtotalofrecords = '';
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
-    $result = $db->query($sql);
-    $nbtotalofrecords = $db->num_rows($result);
-    if (($page * $limit) > $nbtotalofrecords) {
-        $page = 0;
-        $offset = 0;
-    }
+	$result = $db->query($sql);
+	$nbtotalofrecords = $db->num_rows($result);
+	if (($page * $limit) > $nbtotalofrecords) {
+		$page = 0;
+		$offset = 0;
+	}
 }
 
 $sql .= $db->order($sortfield, $sortorder);
@@ -499,8 +499,8 @@ $sql .= $db->plimit($limit + 1, $offset);
 $resql = $db->query($sql);
 if (empty($resql))
 {
-    dol_print_error($db);
-    exit;
+	dol_print_error($db);
+	exit;
 }
 
 $num = $db->num_rows($resql);
@@ -556,7 +556,7 @@ print '<input type="hidden" name="includeproductswithoutdesiredqty" value="'.$in
 print '<input type="hidden" name="draftorder" value="'.$draftorder.'">';
 print '<input type="hidden" name="mode" value="'.$mode.'">';
 if ($limit > 0 && $limit != $conf->liste_limit) {
-    print '<input type="hidden" name="limit" value="'.$limit.'">';
+	print '<input type="hidden" name="limit" value="'.$limit.'">';
 }
 if (!empty($conf->global->STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE))
 {
@@ -630,7 +630,7 @@ if ($search_ref || $search_label || $sall || $salert || $draftorder || GETPOST('
 }
 
 if ($limit > 0 && $limit != $conf->liste_limit) {
-    $filters .= '&limit='.urlencode($limit);
+	$filters .= '&limit='.urlencode($limit);
 }
 
 $param = (isset($type) ? '&type='.$type : '');
@@ -654,35 +654,35 @@ $texte = $langs->trans('Replenishment');
 print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
 
 if (!empty($conf->global->REPLENISH_ALLOW_VARIABLESIZELIST)) {
-    print_barre_liste(
-        $texte,
-        $page,
-        'replenish.php',
-        $filters,
-        $sortfield,
-        $sortorder,
-        '',
-        $num,
-        $nbtotalofrecords,
-        'object_stock.png',
-        0,
-        '',
-        '',
-        $limit
-    );
+	print_barre_liste(
+		$texte,
+		$page,
+		'replenish.php',
+		$filters,
+		$sortfield,
+		$sortorder,
+		'',
+		$num,
+		$nbtotalofrecords,
+		'object_stock.png',
+		0,
+		'',
+		'',
+		$limit
+	);
 } else {
-    print_barre_liste(
-        $texte,
-        $page,
-        'replenish.php',
-        $filters,
-        $sortfield,
-        $sortorder,
-        '',
-        $num,
-        $nbtotalofrecords,
-        'object_stock.png'
-    );
+	print_barre_liste(
+		$texte,
+		$page,
+		'replenish.php',
+		$filters,
+		$sortfield,
+		$sortorder,
+		'',
+		$num,
+		$nbtotalofrecords,
+		'object_stock.png'
+	);
 }
 
 print '<table class="liste centpercent">';
@@ -881,8 +881,8 @@ while ($i < ($limit ? min($num, $limit) : $num))
 
 			// Supplier
 			print '<td class="right">';
-	        print $form->select_product_fourn_price($prod->id, 'fourn'.$i, $fk_supplier);
-	        print '</td>';
+			print $form->select_product_fourn_price($prod->id, 'fourn'.$i, $fk_supplier);
+			print '</td>';
 
 			// Fields from hook
 			$parameters = array('objp'=>$objp);
@@ -904,7 +904,7 @@ print '</div>';
 
 $db->free($resql);
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 $value = $langs->trans("CreateOrders");
diff --git a/htdocs/product/stock/replenishorders.php b/htdocs/product/stock/replenishorders.php
index 382f7ac1d3a..c73c7b1ca39 100644
--- a/htdocs/product/stock/replenishorders.php
+++ b/htdocs/product/stock/replenishorders.php
@@ -69,16 +69,16 @@ $offset = $limit * $page;
 
 if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // Both test are required to be compatible with all browsers
 {
-    $sall = "";
-    $sref = "";
-    $snom = "";
-    $suser = "";
-    $sttc = "";
-    $search_date = '';
-    $search_datemonth = '';
-    $search_dateday = '';
-    $search_dateyear = '';
-    $search_product = 0;
+	$sall = "";
+	$sref = "";
+	$snom = "";
+	$suser = "";
+	$sttc = "";
+	$search_date = '';
+	$search_datemonth = '';
+	$search_dateday = '';
+	$search_dateyear = '';
+	$search_product = 0;
 }
 
 
@@ -116,19 +116,19 @@ $sql .= ' u.login';
 $sql .= ' FROM '.MAIN_DB_PREFIX.'societe as s, '.MAIN_DB_PREFIX.'commande_fournisseur as cf';
 $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'user as u ON cf.fk_user_author = u.rowid';
 if (!$user->rights->societe->client->voir && !$socid) {
-    $sql .= ', '.MAIN_DB_PREFIX.'societe_commerciaux as sc';
+	$sql .= ', '.MAIN_DB_PREFIX.'societe_commerciaux as sc';
 }
 $sql .= ' WHERE cf.fk_soc = s.rowid ';
 $sql .= ' AND cf.entity = '.$conf->entity;
 if ($conf->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER) {
-    $sql .= ' AND cf.fk_statut < 3';
+	$sql .= ' AND cf.fk_statut < 3';
 } elseif ($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER || !empty($conf->global->STOCK_CALCULATE_ON_RECEPTION) || !empty($conf->global->STOCK_CALCULATE_ON_RECEPTION_CLOSE)) {
-    $sql .= ' AND cf.fk_statut < 6'; // We want also status 5, we will keep them visible if dispatching is not yet finished (tested with function dolDispatchToDo).
+	$sql .= ' AND cf.fk_statut < 6'; // We want also status 5, we will keep them visible if dispatching is not yet finished (tested with function dolDispatchToDo).
 } else {
-    $sql .= ' AND cf.fk_statut < 5';
+	$sql .= ' AND cf.fk_statut < 5';
 }
 if (!$user->rights->societe->client->voir && !$socid) {
-    $sql .= ' AND s.rowid = sc.fk_soc AND sc.fk_user = '.$user->id;
+	$sql .= ' AND s.rowid = sc.fk_soc AND sc.fk_user = '.$user->id;
 }
 if ($sref) $sql .= natural_search('cf.ref', $sref);
 if ($snom) $sql .= natural_search('s.nom', $snom);
@@ -138,7 +138,7 @@ $sql .= dolSqlDateFilter('cf.date_creation', $search_dateday, $search_datemonth,
 if ($sall) $sql .= natural_search(array('cf.ref', 'cf.note'), $sall);
 if (!empty($socid)) $sql .= ' AND s.rowid = '.$socid;
 if (GETPOST('statut', 'int')) {
-    $sql .= ' AND fk_statut = '.GETPOST('statut', 'int');
+	$sql .= ' AND fk_statut = '.GETPOST('statut', 'int');
 }
 $sql .= ' GROUP BY cf.rowid, cf.ref, cf.date_creation, cf.fk_statut';
 $sql .= ', cf.total_ttc, cf.fk_user_author, u.login, s.rowid, s.nom';
@@ -150,8 +150,8 @@ if (!$search_product) {
 $resql = $db->query($sql);
 if ($resql)
 {
-    $num = $db->num_rows($resql);
-    $i = 0;
+	$num = $db->num_rows($resql);
+	$i = 0;
 
 	print '<span class="opacitymedium">'.$langs->trans("ReplenishmentOrdersDesc").'</span><br><br>';
 
@@ -159,165 +159,165 @@ if ($resql)
 
 	print_barre_liste('', $page, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', $num, 0, '');
 
-    $param = '';
-    if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
-    if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
-    if ($sref) $param .= '&search_ref='.urlencode($sref);
-    if ($snom) $param .= '&search_nom='.urlencode($snom);
-    if ($suser) $param .= '&search_user='.urlencode($suser);
-    if ($sttc) $param .= '&search_ttc='.urlencode($sttc);
-    if ($search_dateyear) $param .= '&search_dateyear='.urlencode($search_dateyear);
-    if ($search_datemonth) $param .= '&search_datemonth='.urlencode($search_datemonth);
-    if ($search_dateday) $param .= '&search_dateday='.urlencode($search_dateday);
-    if ($optioncss != '')     $param .= '&optioncss='.urlencode($optioncss);
+	$param = '';
+	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
+	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
+	if ($sref) $param .= '&search_ref='.urlencode($sref);
+	if ($snom) $param .= '&search_nom='.urlencode($snom);
+	if ($suser) $param .= '&search_user='.urlencode($suser);
+	if ($sttc) $param .= '&search_ttc='.urlencode($sttc);
+	if ($search_dateyear) $param .= '&search_dateyear='.urlencode($search_dateyear);
+	if ($search_datemonth) $param .= '&search_datemonth='.urlencode($search_datemonth);
+	if ($search_dateday) $param .= '&search_dateday='.urlencode($search_dateday);
+	if ($optioncss != '')     $param .= '&optioncss='.urlencode($optioncss);
 
-    print '<table class="noborder centpercent">';
+	print '<table class="noborder centpercent">';
 
-    print '<tr class="liste_titre_filter">';
-    print '<td class="liste_titre">';
-    print '<input type="text" class="flat" name="search_ref" value="'.dol_escape_htmltag($sref).'">';
-    print '</td>';
-    print '<td class="liste_titre">';
-    print '<input type="text" class="flat" name="search_nom" value="'.dol_escape_htmltag($snom).'">';
-    print '</td>';
-    print '<td class="liste_titre">';
-    print '<input type="text" class="flat" name="search_user" value="'.dol_escape_htmltag($suser).'">';
-    print '</td>';
-    print '<td class="liste_titre">';
-    print '<input type="text" class="flat" name="search_ttc" value="'.dol_escape_htmltag($sttc).'">';
-    print '</td>';
-    print '<td class="liste_titre">';
-    print $form->selectDate($search_date, 'search_date', 0, 0, 1, '', 1, 0, 0, '');
-    print '</td>';
-    print '<td class="liste_titre right">';
-    $searchpicto = $form->showFilterAndCheckAddButtons(0);
-    print $searchpicto;
-    print '</td>';
-    print '</tr>';
+	print '<tr class="liste_titre_filter">';
+	print '<td class="liste_titre">';
+	print '<input type="text" class="flat" name="search_ref" value="'.dol_escape_htmltag($sref).'">';
+	print '</td>';
+	print '<td class="liste_titre">';
+	print '<input type="text" class="flat" name="search_nom" value="'.dol_escape_htmltag($snom).'">';
+	print '</td>';
+	print '<td class="liste_titre">';
+	print '<input type="text" class="flat" name="search_user" value="'.dol_escape_htmltag($suser).'">';
+	print '</td>';
+	print '<td class="liste_titre">';
+	print '<input type="text" class="flat" name="search_ttc" value="'.dol_escape_htmltag($sttc).'">';
+	print '</td>';
+	print '<td class="liste_titre">';
+	print $form->selectDate($search_date, 'search_date', 0, 0, 1, '', 1, 0, 0, '');
+	print '</td>';
+	print '<td class="liste_titre right">';
+	$searchpicto = $form->showFilterAndCheckAddButtons(0);
+	print $searchpicto;
+	print '</td>';
+	print '</tr>';
 
-    print '<tr class="liste_titre">';
-    print_liste_field_titre(
-        'Ref',
-        $_SERVER['PHP_SELF'],
-        'cf.ref',
-        '',
-        $param,
-        '',
-        $sortfield,
-        $sortorder
-    );
-    print_liste_field_titre(
-        'Company',
-        $_SERVER['PHP_SELF'],
-        's.nom',
-        '',
-        $param,
-        '',
-        $sortfield,
-        $sortorder
-    );
-    print_liste_field_titre(
-        'Author',
-        $_SERVER['PHP_SELF'],
-        'u.login',
-        '',
-        '',
-        '',
-        $sortfield,
-        $sortorder
-    );
-    print_liste_field_titre(
-        'AmountTTC',
-        $_SERVER['PHP_SELF'],
-        'cf.total_ttc',
-        '',
-        $param,
-        '',
-        $sortfield,
-        $sortorder
-    );
-    print_liste_field_titre(
-        'OrderCreation',
-        $_SERVER['PHP_SELF'],
-        'cf.date_creation',
-        '',
-        $param,
-        '',
-        $sortfield,
-        $sortorder
-    );
-    print_liste_field_titre(
-        'Status',
-        $_SERVER['PHP_SELF'],
-        'cf.fk_statut',
-        '',
-        $param,
-        '',
-        $sortfield,
-        $sortorder,
-        'right '
-    );
-    print '</tr>';
+	print '<tr class="liste_titre">';
+	print_liste_field_titre(
+		'Ref',
+		$_SERVER['PHP_SELF'],
+		'cf.ref',
+		'',
+		$param,
+		'',
+		$sortfield,
+		$sortorder
+	);
+	print_liste_field_titre(
+		'Company',
+		$_SERVER['PHP_SELF'],
+		's.nom',
+		'',
+		$param,
+		'',
+		$sortfield,
+		$sortorder
+	);
+	print_liste_field_titre(
+		'Author',
+		$_SERVER['PHP_SELF'],
+		'u.login',
+		'',
+		'',
+		'',
+		$sortfield,
+		$sortorder
+	);
+	print_liste_field_titre(
+		'AmountTTC',
+		$_SERVER['PHP_SELF'],
+		'cf.total_ttc',
+		'',
+		$param,
+		'',
+		$sortfield,
+		$sortorder
+	);
+	print_liste_field_titre(
+		'OrderCreation',
+		$_SERVER['PHP_SELF'],
+		'cf.date_creation',
+		'',
+		$param,
+		'',
+		$sortfield,
+		$sortorder
+	);
+	print_liste_field_titre(
+		'Status',
+		$_SERVER['PHP_SELF'],
+		'cf.fk_statut',
+		'',
+		$param,
+		'',
+		$sortfield,
+		$sortorder,
+		'right '
+	);
+	print '</tr>';
 
-    $userstatic = new User($db);
+	$userstatic = new User($db);
 
 	while ($i < min($num, $search_product ? $num : $conf->liste_limit))
-    {
-        $obj = $db->fetch_object($resql);
+	{
+		$obj = $db->fetch_object($resql);
 
-        $showline = dolDispatchToDo($obj->rowid) && (!$search_product || in_array($search_product, getProducts($obj->rowid)));
+		$showline = dolDispatchToDo($obj->rowid) && (!$search_product || in_array($search_product, getProducts($obj->rowid)));
 
-        if ($showline)
-        {
-            $href = DOL_URL_ROOT.'/fourn/commande/card.php?id='.$obj->rowid;
+		if ($showline)
+		{
+			$href = DOL_URL_ROOT.'/fourn/commande/card.php?id='.$obj->rowid;
 
-            print '<tr>';
+			print '<tr>';
 
-            // Ref
-            print '<td>';
-            print '<a href="'.$href.'">'.img_object($langs->trans('ShowOrder'), 'order').' '.$obj->ref.'</a>';
-            print '</td>';
+			// Ref
+			print '<td>';
+			print '<a href="'.$href.'">'.img_object($langs->trans('ShowOrder'), 'order').' '.$obj->ref.'</a>';
+			print '</td>';
 
-            // Company
-            $href = DOL_URL_ROOT.'/fourn/card.php?socid='.$obj->socid;
-            print '<td><a href="'.$href.'">'.img_object($langs->trans('ShowCompany'), 'company').' '.$obj->name.'</a></td>';
+			// Company
+			$href = DOL_URL_ROOT.'/fourn/card.php?socid='.$obj->socid;
+			print '<td><a href="'.$href.'">'.img_object($langs->trans('ShowCompany'), 'company').' '.$obj->name.'</a></td>';
 
-            // Author
-            $userstatic->id = $obj->fk_user_author;
-            $userstatic->login = $obj->login;
-            if ($userstatic->id) {
-                $txt = $userstatic->getLoginUrl(1);
-            } else {
-                $txt = '&nbsp;';
-            }
-            print '<td>'.$txt.'</td>';
+			// Author
+			$userstatic->id = $obj->fk_user_author;
+			$userstatic->login = $obj->login;
+			if ($userstatic->id) {
+				$txt = $userstatic->getLoginUrl(1);
+			} else {
+				$txt = '&nbsp;';
+			}
+			print '<td>'.$txt.'</td>';
 
-            // Amount
-            print '<td>'.price($obj->total_ttc).'</td>';
+			// Amount
+			print '<td>'.price($obj->total_ttc).'</td>';
 
-            // Date
-            if ($obj->dc) {
-                $date = dol_print_date($db->jdate($obj->dc), 'dayhour');
-            } else {
-                $date = '-';
-            }
-            print '<td>'.$date.'</td>';
+			// Date
+			if ($obj->dc) {
+				$date = dol_print_date($db->jdate($obj->dc), 'dayhour');
+			} else {
+				$date = '-';
+			}
+			print '<td>'.$date.'</td>';
 
-            // Statut
-            print '<td class="right">'.$commandestatic->LibStatut($obj->fk_statut, 5).'</td>';
+			// Statut
+			print '<td class="right">'.$commandestatic->LibStatut($obj->fk_statut, 5).'</td>';
 
-            print '</tr>';
-        }
-        $i++;
-    }
-    print '</table>';
-    print '</form>';
+			print '</tr>';
+		}
+		$i++;
+	}
+	print '</table>';
+	print '</form>';
 
-    $db->free($resql);
+	$db->free($resql);
 
-    dol_fiche_end();
+	print dol_get_fiche_end();
 } else {
-    dol_print_error($db);
+	dol_print_error($db);
 }
 
 // End of page
diff --git a/htdocs/product/stock/stockatdate.php b/htdocs/product/stock/stockatdate.php
index 1dc01ae65e4..8dabfdbf673 100644
--- a/htdocs/product/stock/stockatdate.php
+++ b/htdocs/product/stock/stockatdate.php
@@ -40,7 +40,7 @@ $langs->loadLangs(array('products', 'stocks', 'orders'));
 
 // Security check
 if ($user->socid) {
-    $socid = $user->socid;
+	$socid = $user->socid;
 }
 $result = restrictedArea($user, 'produit|service');
 
@@ -71,26 +71,26 @@ if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined,
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $offset = $limit * $page;
 if (!$sortfield) {
-    $sortfield = 'p.ref';
+	$sortfield = 'p.ref';
 }
 if (!$sortorder) {
-    $sortorder = 'ASC';
+	$sortorder = 'ASC';
 }
 
 $parameters = array();
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-$dateIsValid= true;
+$dateIsValid = true;
 if ($mode == 'future') {
 	if ($date && $date < $now) {
 		setEventMessages($langs->trans("ErrorDateMustBeInFuture"), null, 'errors');
-		$dateIsValid= false;
+		$dateIsValid = false;
 	}
 } else {
 	if ($date && $date > $now) {
 		setEventMessages($langs->trans("ErrorDateMustBeBeforeToday"), null, 'errors');
-		$dateIsValid= false;
+		$dateIsValid = false;
 	}
 }
 
@@ -123,7 +123,7 @@ if ($date && $dateIsValid) {	// Avoid heavy sql if mandatory date is not defined
 	$sql .= ", ".MAIN_DB_PREFIX."entrepot as w";
 	$sql .= " WHERE w.entity IN (".getEntity('stock').")";
 	$sql .= " AND w.rowid = ps.fk_entrepot";
-	if (! empty($conf->global->ENTREPOT_EXTRA_STATUS) && count($warehouseStatus)) {
+	if (!empty($conf->global->ENTREPOT_EXTRA_STATUS) && count($warehouseStatus)) {
 		$sql .= " AND w.statut IN (".$db->sanitize($db->escape(implode(',', $warehouseStatus))).")";
 	}
 	if ($productid > 0) {
@@ -146,7 +146,7 @@ if ($date && $dateIsValid) {	// Avoid heavy sql if mandatory date is not defined
 
 			$tmp_fk_product   = $obj->fk_product;
 			$tmp_fk_warehouse = $obj->fk_warehouse;
-			$stock 			  = $obj->stock;
+			$stock = $obj->stock;
 
 			$stock_prod_warehouse[$tmp_fk_product][$tmp_fk_warehouse] = $stock;
 			$stock_prod[$tmp_fk_product] = (isset($stock_prod[$tmp_fk_product]) ? $stock_prod[$tmp_fk_product] : 0) + $stock;
@@ -174,7 +174,7 @@ if ($date && $dateIsValid) {
 	$sql .= ", ".MAIN_DB_PREFIX."entrepot as w";
 	$sql .= " WHERE w.entity IN (".getEntity('stock').")";
 	$sql .= " AND w.rowid = sm.fk_entrepot";
-	if (! empty($conf->global->ENTREPOT_EXTRA_STATUS) && count($warehouseStatus)) {
+	if (!empty($conf->global->ENTREPOT_EXTRA_STATUS) && count($warehouseStatus)) {
 		$sql .= " AND w.statut IN (".$db->sanitize($db->escape(implode(',', $warehouseStatus))).")";
 	}
 	if ($mode == 'future') {
@@ -198,9 +198,9 @@ if ($date && $dateIsValid) {
 
 		while ($i < $num) {
 			$obj = $db->fetch_object($resql);
-			$fk_product 	= $obj->fk_product;
+			$fk_product = $obj->fk_product;
 			$fk_entrepot 	= $obj->fk_entrepot;
-			$stock 			= $obj->stock;
+			$stock = $obj->stock;
 			$nbofmovement	= $obj->nbofmovement;
 
 			// Pour llx_product_stock.reel
@@ -298,8 +298,8 @@ if ($date && $dateIsValid) {	// We avoid a heavy sql if mandatory parameter date
 	$resql = $db->query($sql);
 	if (empty($resql))
 	{
-	    dol_print_error($db);
-	    exit;
+		dol_print_error($db);
+		exit;
 	}
 
 	$num = $db->num_rows($resql);
@@ -477,7 +477,7 @@ while ($i < ($limit ? min($num, $limit) : $num))
 		}
 
 		if ($mode == 'future') {
-			$prod->load_stock('warehouseopen, warehouseinternal', 0);	// This call also ->load_virtual_stock()
+			$prod->load_stock('warehouseopen, warehouseinternal', 0); // This call also ->load_virtual_stock()
 
 			//$result = $prod->load_stats_reception(0, '4');
 			//print $prod->stats_commande_fournisseur['qty'].'<br>'."\n";
@@ -554,7 +554,7 @@ print '</div>';
 
 $db->free($resql);
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '</form>';
 
diff --git a/htdocs/product/stock/tpl/stockcorrection.tpl.php b/htdocs/product/stock/tpl/stockcorrection.tpl.php
index 511cd5a8483..57777f07b12 100644
--- a/htdocs/product/stock/tpl/stockcorrection.tpl.php
+++ b/htdocs/product/stock/tpl/stockcorrection.tpl.php
@@ -143,7 +143,7 @@ print '</tr>';
 
 print '</table>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '<div class="center">';
 print '<input type="submit" class="button" name="save" value="'.dol_escape_htmltag($langs->trans('Save')).'">';
diff --git a/htdocs/product/stock/tpl/stocktransfer.tpl.php b/htdocs/product/stock/tpl/stocktransfer.tpl.php
index 9d2d19c7813..56546787413 100644
--- a/htdocs/product/stock/tpl/stocktransfer.tpl.php
+++ b/htdocs/product/stock/tpl/stocktransfer.tpl.php
@@ -132,7 +132,7 @@ print '</tr>';
 
 print '</table>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '<div class="center">';
 print '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans('Save')).'">';
diff --git a/htdocs/product/stock/valo.php b/htdocs/product/stock/valo.php
index 182d78e9cd1..35e82abdafc 100644
--- a/htdocs/product/stock/valo.php
+++ b/htdocs/product/stock/valo.php
@@ -61,11 +61,11 @@ $sql .= " WHERE e.entity IN (".getEntity('stock').")";
 if ($sref) $sql .= natural_search("e.ref", $sref);
 if ($sall)
 {
-    $sql .= " AND (e.ref LIKE '%".$db->escape($sall)."%'";
-    $sql .= " OR e.description LIKE '%".$db->escape($sall)."%'";
-    $sql .= " OR e.lieu LIKE '%".$db->escape($sall)."%'";
-    $sql .= " OR e.address LIKE '%".$db->escape($sall)."%'";
-    $sql .= " OR e.town LIKE '%".$db->escape($sall)."%')";
+	$sql .= " AND (e.ref LIKE '%".$db->escape($sall)."%'";
+	$sql .= " OR e.description LIKE '%".$db->escape($sall)."%'";
+	$sql .= " OR e.lieu LIKE '%".$db->escape($sall)."%'";
+	$sql .= " OR e.address LIKE '%".$db->escape($sall)."%'";
+	$sql .= " OR e.town LIKE '%".$db->escape($sall)."%')";
 }
 $sql .= " GROUP BY e.rowid, e.ref, e.statut, e.lieu, e.address, e.zip, e.town, e.fk_pays";
 $sql .= $db->order($sortfield, $sortorder);
@@ -74,83 +74,83 @@ $sql .= $db->plimit($limit + 1, $offset);
 $result = $db->query($sql);
 if ($result)
 {
-    $num = $db->num_rows($result);
+	$num = $db->num_rows($result);
 
-    $i = 0;
+	$i = 0;
 
-    $help_url = 'EN:Module_Stocks_En|FR:Module_Stock|ES:M&oacute;dulo_Stocks';
-    llxHeader("", $langs->trans("EnhancedValueOfWarehouses"), $help_url);
+	$help_url = 'EN:Module_Stocks_En|FR:Module_Stock|ES:M&oacute;dulo_Stocks';
+	llxHeader("", $langs->trans("EnhancedValueOfWarehouses"), $help_url);
 
-    print_barre_liste($langs->trans("EnhancedValueOfWarehouses"), $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, '', $num);
+	print_barre_liste($langs->trans("EnhancedValueOfWarehouses"), $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, '', $num);
 
-    print '<table class="noborder centpercent">';
-    print "<tr class=\"liste_titre\">";
-    print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "e.ref", "", "", "", $sortfield, $sortorder);
-    print_liste_field_titre("LocationSummary", $_SERVER["PHP_SELF"], "e.lieu", "", "", "", $sortfield, $sortorder);
-    print_liste_field_titre("EstimatedStockValue", $_SERVER["PHP_SELF"], "e.valo_pmp", '', '', '', $sortfield, $sortorder, 'right ');
-    print_liste_field_titre("EstimatedStockValueSell", $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'right ');
-    print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "e.statut", '', '', '', $sortfield, $sortorder, 'right ');
-    print "</tr>\n";
+	print '<table class="noborder centpercent">';
+	print "<tr class=\"liste_titre\">";
+	print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "e.ref", "", "", "", $sortfield, $sortorder);
+	print_liste_field_titre("LocationSummary", $_SERVER["PHP_SELF"], "e.lieu", "", "", "", $sortfield, $sortorder);
+	print_liste_field_titre("EstimatedStockValue", $_SERVER["PHP_SELF"], "e.valo_pmp", '', '', '', $sortfield, $sortorder, 'right ');
+	print_liste_field_titre("EstimatedStockValueSell", $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'right ');
+	print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "e.statut", '', '', '', $sortfield, $sortorder, 'right ');
+	print "</tr>\n";
 
-    if ($num)
-    {
-        $entrepot = new Entrepot($db);
-        $total = $totalsell = 0;
-        $var = false;
-        while ($i < min($num, $limit))
-        {
-            $objp = $db->fetch_object($result);
-            print '<tr class="oddeven">';
-            print '<td><a href="card.php?id='.$objp->rowid.'">'.img_object($langs->trans("ShowWarehouse"), 'stock').' '.$objp->ref.'</a></td>';
-            print '<td>'.$objp->lieu.'</td>';
-            // PMP value
-            print '<td class="right">';
-            if (price2num($objp->estimatedvalue, 'MT')) print price(price2num($objp->estimatedvalue, 'MT'), 1);
-            else print '';
-            print '</td>';
-            // Selling value
-            print '<td class="right">';
-            if (empty($conf->global->PRODUIT_MULTIPRICES)) print price(price2num($objp->sellvalue, 'MT'), 1);
-            else print $langs->trans("Variable");
-            print '</td>';
-            // Status
-            print '<td class="right">'.$entrepot->LibStatut($objp->statut, 5).'</td>';
-            print "</tr>\n";
-            $total += price2num($objp->estimatedvalue, 'MU');
-            $totalsell += price2num($objp->sellvalue, 'MU');
+	if ($num)
+	{
+		$entrepot = new Entrepot($db);
+		$total = $totalsell = 0;
+		$var = false;
+		while ($i < min($num, $limit))
+		{
+			$objp = $db->fetch_object($result);
+			print '<tr class="oddeven">';
+			print '<td><a href="card.php?id='.$objp->rowid.'">'.img_object($langs->trans("ShowWarehouse"), 'stock').' '.$objp->ref.'</a></td>';
+			print '<td>'.$objp->lieu.'</td>';
+			// PMP value
+			print '<td class="right">';
+			if (price2num($objp->estimatedvalue, 'MT')) print price(price2num($objp->estimatedvalue, 'MT'), 1);
+			else print '';
+			print '</td>';
+			// Selling value
+			print '<td class="right">';
+			if (empty($conf->global->PRODUIT_MULTIPRICES)) print price(price2num($objp->sellvalue, 'MT'), 1);
+			else print $langs->trans("Variable");
+			print '</td>';
+			// Status
+			print '<td class="right">'.$entrepot->LibStatut($objp->statut, 5).'</td>';
+			print "</tr>\n";
+			$total += price2num($objp->estimatedvalue, 'MU');
+			$totalsell += price2num($objp->sellvalue, 'MU');
 
-            $i++;
-        }
+			$i++;
+		}
 
-        print '<tr class="liste_total">';
-        print '<td colspan="2" class="right">'.$langs->trans("Total").'</td>';
-        print '<td class="right">'.price(price2num($total, 'MT'), 1, $langs, 0, 0, -1, $conf->currency).'</td>';
-        print '<td class="right">'.price(price2num($totalsell, 'MT'), 1, $langs, 0, 0, -1, $conf->currency).'</td>';
-        print '<td class="right">&nbsp;</td>';
-        print "</tr>\n";
-    }
+		print '<tr class="liste_total">';
+		print '<td colspan="2" class="right">'.$langs->trans("Total").'</td>';
+		print '<td class="right">'.price(price2num($total, 'MT'), 1, $langs, 0, 0, -1, $conf->currency).'</td>';
+		print '<td class="right">'.price(price2num($totalsell, 'MT'), 1, $langs, 0, 0, -1, $conf->currency).'</td>';
+		print '<td class="right">&nbsp;</td>';
+		print "</tr>\n";
+	}
 
-    $db->free($result);
+	$db->free($result);
 
-    print "</table>";
+	print "</table>";
 
-    print '<br>';
+	print '<br>';
 
-    $file = 'entrepot-'.$year.'.png';
-    if (file_exists($conf->stock->dir_temp.'/'.$file))
-    {
-        $url = DOL_URL_ROOT.'/viewimage.php?modulepart=graph_stock&amp;file='.$file;
-        print '<img src="'.$url.'">';
-    }
+	$file = 'entrepot-'.$year.'.png';
+	if (file_exists($conf->stock->dir_temp.'/'.$file))
+	{
+		$url = DOL_URL_ROOT.'/viewimage.php?modulepart=graph_stock&amp;file='.$file;
+		print '<img src="'.$url.'">';
+	}
 
-    $file = 'entrepot-'.($year - 1).'.png';
-    if (file_exists($conf->stock->dir_temp.'/'.$file))
-    {
-        $url = DOL_URL_ROOT.'/viewimage.php?modulepart=graph_stock&amp;file='.$file;
-        print '<br><img src="'.$url.'">';
-    }
+	$file = 'entrepot-'.($year - 1).'.png';
+	if (file_exists($conf->stock->dir_temp.'/'.$file))
+	{
+		$url = DOL_URL_ROOT.'/viewimage.php?modulepart=graph_stock&amp;file='.$file;
+		print '<br><img src="'.$url.'">';
+	}
 } else {
-    dol_print_error($db);
+	dol_print_error($db);
 }
 
 // End of page
diff --git a/htdocs/product/traduction.php b/htdocs/product/traduction.php
index 64b80231674..f6c316cbded 100644
--- a/htdocs/product/traduction.php
+++ b/htdocs/product/traduction.php
@@ -180,10 +180,10 @@ $picto = ($object->type == Product::TYPE_SERVICE ? 'service' : 'product');
 $cnt_trans = 0;
 if (!empty($object->multilangs))
 {
-    foreach ($object->multilangs as $key => $value)
-    {
-        $cnt_trans++;
-    }
+	foreach ($object->multilangs as $key => $value)
+	{
+		$cnt_trans++;
+	}
 }
 
 
@@ -196,7 +196,7 @@ if ($user->socid && !in_array('product', explode(',', $conf->global->MAIN_MODULE
 
 dol_banner_tab($object, 'ref', $linkback, $shownav, 'ref', '', '', '', 0, '', '', 1);
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 
@@ -210,11 +210,11 @@ print "\n<div class=\"tabsAction\">\n";
 
 if ($action == '')
 {
-    if ($user->rights->produit->creer || $user->rights->service->creer)
-    {
-        print '<a class="butAction" href="'.DOL_URL_ROOT.'/product/traduction.php?action=add&id='.$object->id.'">'.$langs->trans("Add").'</a>';
-        if ($cnt_trans > 0) print '<a class="butAction" href="'.DOL_URL_ROOT.'/product/traduction.php?action=edit&id='.$object->id.'">'.$langs->trans("Update").'</a>';
-    }
+	if ($user->rights->produit->creer || $user->rights->service->creer)
+	{
+		print '<a class="butAction" href="'.DOL_URL_ROOT.'/product/traduction.php?action=add&id='.$object->id.'">'.$langs->trans("Add").'</a>';
+		if ($cnt_trans > 0) print '<a class="butAction" href="'.DOL_URL_ROOT.'/product/traduction.php?action=edit&id='.$object->id.'">'.$langs->trans("Update").'</a>';
+	}
 }
 
 print "\n</div>\n";
@@ -247,9 +247,9 @@ if ($action == 'edit')
 			print '</td></tr>';
 			if (!empty($conf->global->PRODUCT_USE_OTHER_FIELD_IN_TRANSLATION))
 			{
-                print '<tr><td class="tdtop">'.$langs->trans('Other').' ('.$langs->trans("NotUsed").')</td><td>';
-                $doleditor = new DolEditor("other-$key", $object->multilangs[$key]["other"], '', 160, 'dolibarr_notes', '', false, true, $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, ROWS_3, '90%');
-                $doleditor->Create();
+				print '<tr><td class="tdtop">'.$langs->trans('Other').' ('.$langs->trans("NotUsed").')</td><td>';
+				$doleditor = new DolEditor("other-$key", $object->multilangs[$key]["other"], '', 160, 'dolibarr_notes', '', false, true, $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, ROWS_3, '90%');
+				$doleditor->Create();
 			}
 			print '</td></tr>';
 			print '</table>';
@@ -281,7 +281,7 @@ if ($action == 'edit')
 			print '<tr><td class="tdtop">'.$langs->trans('Description').'</td><td>'.$object->multilangs[$key]["description"].'</td></tr>';
 			if (!empty($conf->global->PRODUCT_USE_OTHER_FIELD_IN_TRANSLATION))
 			{
-                print '<tr><td>'.$langs->trans('Other').' ('.$langs->trans("NotUsed").')</td><td>'.$object->multilangs[$key]["other"].'</td></tr>';
+				print '<tr><td>'.$langs->trans('Other').' ('.$langs->trans("NotUsed").')</td><td>'.$object->multilangs[$key]["other"].'</td></tr>';
 			}
 			print '</table>';
 			print '</div>';
@@ -311,24 +311,24 @@ if ($action == 'add' && ($user->rights->produit->creer || $user->rights->service
 
 	print '<table class="border centpercent">';
 	print '<tr><td class="tdtop titlefieldcreate fieldrequired">'.$langs->trans('Language').'</td><td>';
-    print $formadmin->select_language('', 'forcelangprod', 0, $object->multilangs, 1);
+	print $formadmin->select_language('', 'forcelangprod', 0, $object->multilangs, 1);
 	print '</td></tr>';
 	print '<tr><td class="tdtop fieldrequired">'.$langs->trans('Label').'</td><td><input name="libelle" size="40"></td></tr>';
 	print '<tr><td class="tdtop">'.$langs->trans('Description').'</td><td>';
 	$doleditor = new DolEditor('desc', '', '', 160, 'dolibarr_notes', '', false, true, $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, ROWS_3, '90%');
 	$doleditor->Create();
 	print '</td></tr>';
-    // Other field (not used)
-    if (!empty($conf->global->PRODUCT_USE_OTHER_FIELD_IN_TRANSLATION))
-    {
-        print '<tr><td class="tdtop">'.$langs->trans('Other').' ('.$langs->trans("NotUsed").'</td><td>';
-    	$doleditor = new DolEditor('other', '', '', 160, 'dolibarr_notes', '', false, true, $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, ROWS_3, '90%');
-    	$doleditor->Create();
-    	print '</td></tr>';
-    }
+	// Other field (not used)
+	if (!empty($conf->global->PRODUCT_USE_OTHER_FIELD_IN_TRANSLATION))
+	{
+		print '<tr><td class="tdtop">'.$langs->trans('Other').' ('.$langs->trans("NotUsed").'</td><td>';
+		$doleditor = new DolEditor('other', '', '', 160, 'dolibarr_notes', '', false, true, $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, ROWS_3, '90%');
+		$doleditor->Create();
+		print '</td></tr>';
+	}
 	print '</table>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div class="center">';
 	print '<input type="submit" class="button" value="'.$langs->trans("Save").'">';
diff --git a/htdocs/projet/activity/index.php b/htdocs/projet/activity/index.php
index 295f96370f3..2ca149a18ca 100644
--- a/htdocs/projet/activity/index.php
+++ b/htdocs/projet/activity/index.php
@@ -98,33 +98,33 @@ 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 project
-    if (!empty($conf->projet->enabled) && $user->rights->projet->lire)
-    {
-    	$listofsearchfields['search_task'] = array('text'=>'Task');
-    }
+	// Search project
+	if (!empty($conf->projet->enabled) && $user->rights->projet->lire)
+	{
+		$listofsearchfields['search_task'] = array('text'=>'Task');
+	}
 
-    if (count($listofsearchfields))
-    {
-    	print '<form method="post" action="'.DOL_URL_ROOT.'/core/search.php">';
-    	print '<input type="hidden" name="token" value="'.newToken().'">';
-        print '<div class="div-table-responsive-no-min">';
-    	print '<table class="noborder nohover centpercent">';
-    	$i = 0;
-    	foreach ($listofsearchfields as $key => $value)
-    	{
-    		if ($i == 0) print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
-    		print '<tr '.$bc[false].'>';
-    		print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label></td><td><input type="text" class="flat inputsearch" name="'.$key.'" id="'.$key.'" size="18"></td>';
-    		if ($i == 0) print '<td rowspan="'.count($listofsearchfields).'"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
-    		print '</tr>';
-    		$i++;
-    	}
-    	print '</table>';
-        print '</div>';
-    	print '</form>';
-    	print '<br>';
-    }
+	if (count($listofsearchfields))
+	{
+		print '<form method="post" action="'.DOL_URL_ROOT.'/core/search.php">';
+		print '<input type="hidden" name="token" value="'.newToken().'">';
+		print '<div class="div-table-responsive-no-min">';
+		print '<table class="noborder nohover centpercent">';
+		$i = 0;
+		foreach ($listofsearchfields as $key => $value)
+		{
+			if ($i == 0) print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
+			print '<tr '.$bc[false].'>';
+			print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label></td><td><input type="text" class="flat inputsearch" name="'.$key.'" id="'.$key.'" size="18"></td>';
+			if ($i == 0) print '<td rowspan="'.count($listofsearchfields).'"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
+			print '</tr>';
+			$i++;
+		}
+		print '</table>';
+		print '</div>';
+		print '</form>';
+		print '<br>';
+	}
 }
 
 
@@ -299,56 +299,56 @@ if ($db->type != 'pgsql')
 /* Affichage de la liste des projets du mois */
 if (!empty($conf->global->PROJECT_TASK_TIME_MONTH))
 {
-    print '<div class="div-table-responsive-no-min">';
-    print '<table class="noborder centpercent">';
-    print '<tr class="liste_titre">';
-    print '<td>'.$langs->trans("ActivityOnProjectThisMonth").': '.dol_print_date($now, "%B %Y").'</td>';
-    print '<td class="right">'.$langs->trans("Time").'</td>';
-    print "</tr>\n";
+	print '<div class="div-table-responsive-no-min">';
+	print '<table class="noborder centpercent">';
+	print '<tr class="liste_titre">';
+	print '<td>'.$langs->trans("ActivityOnProjectThisMonth").': '.dol_print_date($now, "%B %Y").'</td>';
+	print '<td class="right">'.$langs->trans("Time").'</td>';
+	print "</tr>\n";
 
-    $sql = "SELECT p.rowid, p.ref, p.title, p.public, SUM(tt.task_duration) as nb";
-    $sql .= " FROM ".MAIN_DB_PREFIX."projet as p";
-    $sql .= ", ".MAIN_DB_PREFIX."projet_task as t";
-    $sql .= ", ".MAIN_DB_PREFIX."projet_task_time as tt";
-    $sql .= " WHERE t.fk_projet = p.rowid";
-    $sql .= " AND p.entity = ".$conf->entity;
-    $sql .= " AND tt.fk_task = t.rowid";
-    $sql .= " AND tt.fk_user = ".$user->id;
+	$sql = "SELECT p.rowid, p.ref, p.title, p.public, SUM(tt.task_duration) as nb";
+	$sql .= " FROM ".MAIN_DB_PREFIX."projet as p";
+	$sql .= ", ".MAIN_DB_PREFIX."projet_task as t";
+	$sql .= ", ".MAIN_DB_PREFIX."projet_task_time as tt";
+	$sql .= " WHERE t.fk_projet = p.rowid";
+	$sql .= " AND p.entity = ".$conf->entity;
+	$sql .= " AND tt.fk_task = t.rowid";
+	$sql .= " AND tt.fk_user = ".$user->id;
 	$sql .= " AND task_date BETWEEN '".$db->idate(dol_get_first_day($year, $month))."' AND '".$db->idate(dol_get_last_day($year, $month))."'";
-    $sql .= " AND p.rowid in (".$db->sanitize($projectsListId).")";
-    $sql .= " GROUP BY p.rowid, p.ref, p.title, p.public";
+	$sql .= " AND p.rowid in (".$db->sanitize($projectsListId).")";
+	$sql .= " GROUP BY p.rowid, p.ref, p.title, p.public";
 
-    $resql = $db->query($sql);
-    if ($resql)
-    {
-    	while ($row = $db->fetch_object($resql))
-    	{
-    		print '<tr class="oddeven">';
-    		print '<td>';
-    		$projectstatic->id = $row->rowid;
-    		$projectstatic->ref = $row->ref;
-    		$projectstatic->title = $row->title;
-    		print $projectstatic->getNomUrl(1, '', 1);
-    		print '</td>';
-    		print '<td class="right">'.convertSecondToTime($row->nb, 'allhourmin').'</td>';
-    		print "</tr>\n";
-    	}
-    	$db->free($resql);
-    } else {
-    	dol_print_error($db);
-    }
-    print '<tr class="liste_total">';
-    print '<td>'.$langs->trans('Total').'</td>';
-    print '<td class="right">'.convertSecondToTime($total, 'allhourmin').'</td>';
-    print "</tr>\n";
-    print "</table>";
-    print '</div>';
+	$resql = $db->query($sql);
+	if ($resql)
+	{
+		while ($row = $db->fetch_object($resql))
+		{
+			print '<tr class="oddeven">';
+			print '<td>';
+			$projectstatic->id = $row->rowid;
+			$projectstatic->ref = $row->ref;
+			$projectstatic->title = $row->title;
+			print $projectstatic->getNomUrl(1, '', 1);
+			print '</td>';
+			print '<td class="right">'.convertSecondToTime($row->nb, 'allhourmin').'</td>';
+			print "</tr>\n";
+		}
+		$db->free($resql);
+	} else {
+		dol_print_error($db);
+	}
+	print '<tr class="liste_total">';
+	print '<td>'.$langs->trans('Total').'</td>';
+	print '<td class="right">'.convertSecondToTime($total, 'allhourmin').'</td>';
+	print "</tr>\n";
+	print "</table>";
+	print '</div>';
 }
 
 /* Affichage de la liste des projets de l'annee */
 if (!empty($conf->global->PROJECT_TASK_TIME_YEAR))
 {
-    print '<div class="div-table-responsive-no-min">';
+	print '<div class="div-table-responsive-no-min">';
 	print '<br><table class="noborder centpercent">';
 	print '<tr class="liste_titre">';
 	print '<td>'.$langs->trans("ActivityOnProjectThisYear").': '.strftime("%Y", $now).'</td>';
@@ -392,44 +392,44 @@ if (!empty($conf->global->PROJECT_TASK_TIME_YEAR))
 	print '<td class="right">'.convertSecondToTime($total, 'allhourmin').'</td>';
 	print "</tr>\n";
 	print "</table>";
-    print '</div>';
+	print '</div>';
 }
 
 if (empty($conf->global->PROJECT_HIDE_TASKS) && !empty($conf->global->PROJECT_SHOW_TASK_LIST_ON_PROJECT_AREA))
 {
-    // Get id of types of contacts for projects (This list never contains a lot of elements)
-    $listofprojectcontacttype = array();
-    $sql = "SELECT ctc.rowid, ctc.code FROM ".MAIN_DB_PREFIX."c_type_contact as ctc";
-    $sql .= " WHERE ctc.element = '".$db->escape($projectstatic->element)."'";
-    $sql .= " AND ctc.source = 'internal'";
-    $resql = $db->query($sql);
-    if ($resql)
-    {
-        while ($obj = $db->fetch_object($resql))
-        {
-            $listofprojectcontacttype[$obj->rowid] = $obj->code;
-        }
-    } else dol_print_error($db);
-    if (count($listofprojectcontacttype) == 0) $listofprojectcontacttype[0] = '0'; // To avoid sql syntax error if not found
-    // Get id of types of contacts for tasks (This list never contains a lot of elements)
-    $listoftaskcontacttype = array();
-    $sql = "SELECT ctc.rowid, ctc.code FROM ".MAIN_DB_PREFIX."c_type_contact as ctc";
-    $sql .= " WHERE ctc.element = '".$db->escape($taskstatic->element)."'";
-    $sql .= " AND ctc.source = 'internal'";
-    $resql = $db->query($sql);
-    if ($resql)
-    {
-        while ($obj = $db->fetch_object($resql))
-        {
-            $listoftaskcontacttype[$obj->rowid] = $obj->code;
-        }
-    } else dol_print_error($db);
-    if (count($listoftaskcontacttype) == 0) $listoftaskcontacttype[0] = '0'; // To avoid sql syntax error if not found
+	// Get id of types of contacts for projects (This list never contains a lot of elements)
+	$listofprojectcontacttype = array();
+	$sql = "SELECT ctc.rowid, ctc.code FROM ".MAIN_DB_PREFIX."c_type_contact as ctc";
+	$sql .= " WHERE ctc.element = '".$db->escape($projectstatic->element)."'";
+	$sql .= " AND ctc.source = 'internal'";
+	$resql = $db->query($sql);
+	if ($resql)
+	{
+		while ($obj = $db->fetch_object($resql))
+		{
+			$listofprojectcontacttype[$obj->rowid] = $obj->code;
+		}
+	} else dol_print_error($db);
+	if (count($listofprojectcontacttype) == 0) $listofprojectcontacttype[0] = '0'; // To avoid sql syntax error if not found
+	// Get id of types of contacts for tasks (This list never contains a lot of elements)
+	$listoftaskcontacttype = array();
+	$sql = "SELECT ctc.rowid, ctc.code FROM ".MAIN_DB_PREFIX."c_type_contact as ctc";
+	$sql .= " WHERE ctc.element = '".$db->escape($taskstatic->element)."'";
+	$sql .= " AND ctc.source = 'internal'";
+	$resql = $db->query($sql);
+	if ($resql)
+	{
+		while ($obj = $db->fetch_object($resql))
+		{
+			$listoftaskcontacttype[$obj->rowid] = $obj->code;
+		}
+	} else dol_print_error($db);
+	if (count($listoftaskcontacttype) == 0) $listoftaskcontacttype[0] = '0'; // To avoid sql syntax error if not found
 
 
 	// Tasks for all resources of all opened projects and time spent for each task/resource
 	// This list can be very long, so we don't show it by default on task area. We prefer to use the list page.
-    // Add constant PROJECT_SHOW_TASK_LIST_ON_PROJECT_AREA to show this list
+	// Add constant PROJECT_SHOW_TASK_LIST_ON_PROJECT_AREA to show this list
 
 	$max = (empty($conf->global->PROJECT_LIMIT_TASK_PROJECT_AREA) ? 1000 : $conf->global->PROJECT_LIMIT_TASK_PROJECT_AREA);
 
@@ -442,13 +442,13 @@ if (empty($conf->global->PROJECT_HIDE_TASKS) && !empty($conf->global->PROJECT_SH
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as u on tasktime.fk_user = u.rowid";
 	if ($mine)
 	{
-	    $sql .= ", ".MAIN_DB_PREFIX."element_contact as ect";
+		$sql .= ", ".MAIN_DB_PREFIX."element_contact as ect";
 	}
 	$sql .= " WHERE p.entity IN (".getEntity('project').")";
 	if ($mine || empty($user->rights->projet->all->lire)) $sql .= " AND p.rowid IN (".$db->sanitize($projectsListId).")"; // project i have permission on
 	if ($mine)     // this may duplicate record if we are contact twice
 	{
-        $sql .= " AND ect.fk_c_type_contact IN (".join(',', array_keys($listoftaskcontacttype)).") AND ect.element_id = t.rowid AND ect.fk_socpeople = ".$user->id;
+		$sql .= " AND ect.fk_c_type_contact IN (".join(',', array_keys($listoftaskcontacttype)).") AND ect.element_id = t.rowid AND ect.fk_socpeople = ".$user->id;
 	}
 	if ($socid)	$sql .= " AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
 	$sql .= " AND p.fk_statut=1";
@@ -465,7 +465,7 @@ if (empty($conf->global->PROJECT_HIDE_TASKS) && !empty($conf->global->PROJECT_SH
 
 		//print load_fiche_titre($langs->trans("TasksOnOpenedProject"),'','').'<br>';
 
-        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>'.$langs->trans('TaskRessourceLinks').'</th>';
@@ -515,7 +515,7 @@ if (empty($conf->global->PROJECT_HIDE_TASKS) && !empty($conf->global->PROJECT_SH
 			{
 				print '<td>';
 				$code = dol_getIdFromCode($db, $obj->opp_status, 'c_lead_status', 'rowid', 'code');
-        		if ($code) print $langs->trans("OppStatus".$code);
+				if ($code) print $langs->trans("OppStatus".$code);
 				print '</td>';
 			}
 			print '<td>';
@@ -564,7 +564,7 @@ if (empty($conf->global->PROJECT_HIDE_TASKS) && !empty($conf->global->PROJECT_SH
 		}
 
 		print "</table>";
-        print '</div>';
+		print '</div>';
 
 
 		$db->free($resql);
diff --git a/htdocs/projet/activity/perday.php b/htdocs/projet/activity/perday.php
index 794f222e3b8..361e70c3cf7 100644
--- a/htdocs/projet/activity/perday.php
+++ b/htdocs/projet/activity/perday.php
@@ -128,10 +128,10 @@ $arrayfields['t.progress'] = array('label'=>'ProgressDeclared', 'checked'=>1, 'e
 if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0)
 {
 	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val)
-    {
-    	if (!empty($extrafields->attributes[$object->table_element]['list'][$key]))
-    		$arrayfields["efpt.".$key] = array('label'=>$extrafields->attributes[$object->table_element]['label'][$key], 'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1), 'position'=>$extrafields->attributes[$object->table_element]['pos'][$key], 'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key]));
-    }
+	{
+		if (!empty($extrafields->attributes[$object->table_element]['list'][$key]))
+			$arrayfields["efpt.".$key] = array('label'=>$extrafields->attributes[$object->table_element]['label'][$key], 'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1), 'position'=>$extrafields->attributes[$object->table_element]['pos'][$key], 'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key]));
+	}
 }
 $arrayfields = dol_sort_array($arrayfields, 'position');
 
@@ -159,8 +159,8 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
 	$search_thirdparty = '';
 	$search_declared_progress = '';
 
-    $search_array_options_project = array();
-    $search_array_options_task = array();
+	$search_array_options_project = array();
+	$search_array_options_task = array();
 
 	// We redefine $usertoprocess
 	$usertoprocess = $user;
@@ -263,7 +263,7 @@ if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('formfilterac
 		{
 			if (intval($time) > 0)
 			{
-			    $matches = array();
+				$matches = array();
 				// Hours or minutes of duration
 				if (preg_match("/([0-9]+)duration(hour|min)/", $key, $matches))
 				{
@@ -468,7 +468,7 @@ if ($mine || ($usertoprocess->id == $user->id))
 }
 print '</div>';
 
-dol_fiche_end();
+print dol_get_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.
@@ -539,7 +539,7 @@ if (!empty($arrayfields['t.planned_workload']['checked'])) $addcolspan++;
 if (!empty($arrayfields['t.progress']['checked'])) $addcolspan++;
 foreach ($arrayfields as $key => $val)
 {
-    if ($val['checked'] && substr($key, 0, 5) == 'efpt.') $addcolspan++;
+	if ($val['checked'] && substr($key, 0, 5) == 'efpt.') $addcolspan++;
 }
 
 print '<div class="div-table-responsive">';
@@ -557,11 +557,11 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
 print '<td class="liste_titre"></td>';
 if (!empty($arrayfields['t.planned_workload']['checked']))
 {
-    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 right"><input type="text" size="4" name="search_declared_progress" value="'.dol_escape_htmltag($search_declared_progress).'"></td>';
 }
 if (!empty($arrayfields['t.progress']['checked']))
 {
-    print '<td class="liste_titre"></td>';
+	print '<td class="liste_titre"></td>';
 }
 print '<td class="liste_titre"></td>';
 print '<td class="liste_titre"></td>';
@@ -584,11 +584,11 @@ $extrafieldsobjectprefix = 'efpt.';
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 if (!empty($arrayfields['t.planned_workload']['checked']))
 {
-    print '<th class="right leftborder plannedworkload maxwidth100">'.$langs->trans("PlannedWorkload").'</th>';
+	print '<th class="right leftborder plannedworkload maxwidth100">'.$langs->trans("PlannedWorkload").'</th>';
 }
 if (!empty($arrayfields['t.progress']['checked']))
 {
-    print '<th class="right maxwidth100">'.$langs->trans("ProgressDeclared").'</th>';
+	print '<th class="right maxwidth100">'.$langs->trans("ProgressDeclared").'</th>';
 }
 /*print '<td class="right maxwidth100">'.$langs->trans("TimeSpent").'</td>';
 if ($usertoprocess->id == $user->id) print '<td class="right maxwidth100">'.$langs->trans("TimeSpentByYou").'</td>';
@@ -668,8 +668,8 @@ if ($conf->use_javascript_ajax)
 	print '<td class="liste_total center'.($cssonholiday ? ' '.$cssonholiday : '').($cssweekend ? ' '.$cssweekend : '').'"><div class="totalDay0">&nbsp;</div></td>';
 
 	print '<td class="liste_total"></td>';
-    print '<td class="liste_total"></td>';
-    print '</tr>';
+	print '<td class="liste_total"></td>';
+	print '</tr>';
 }
 
 
diff --git a/htdocs/projet/activity/permonth.php b/htdocs/projet/activity/permonth.php
index cdca5d56aa9..5c8111b049f 100644
--- a/htdocs/projet/activity/permonth.php
+++ b/htdocs/projet/activity/permonth.php
@@ -393,7 +393,7 @@ if ($mine || ($usertoprocess->id == $user->id))
 }
 print '</div>';
 
-dol_fiche_end();
+print dol_get_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.
 
diff --git a/htdocs/projet/activity/perweek.php b/htdocs/projet/activity/perweek.php
index 49e7c3d8951..748f1c307d4 100644
--- a/htdocs/projet/activity/perweek.php
+++ b/htdocs/projet/activity/perweek.php
@@ -174,8 +174,8 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
 	$search_thirdparty = '';
 	$search_declared_progress = '';
 
-    $search_array_options_project = array();
-    $search_array_options_task = array();
+	$search_array_options_project = array();
+	$search_array_options_task = array();
 
 	// We redefine $usertoprocess
 	$usertoprocess = $user;
@@ -347,18 +347,18 @@ if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('formfilterac
 			$param .= ($search_task_ref ? '&search_task_ref='.urlencode($search_task_ref) : '');
 			$param .= ($search_task_label ? '&search_task_label='.urlencode($search_task_label) : '');
 
-            /*$search_array_options=$search_array_options_project;
+			/*$search_array_options=$search_array_options_project;
             $search_options_pattern='search_options_';
             include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
             */
 
-            $search_array_options = $search_array_options_task;
-            $search_options_pattern = 'search_task_options_';
-            include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
+			$search_array_options = $search_array_options_task;
+			$search_options_pattern = 'search_task_options_';
+			include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 
-	   	    // Redirect to avoid submit twice on back
-	       	header('Location: '.$_SERVER["PHP_SELF"].'?'.$param);
-	       	exit;
+	   		// Redirect to avoid submit twice on back
+		   	header('Location: '.$_SERVER["PHP_SELF"].'?'.$param);
+		   	exit;
 	   	}
 	}
 }
@@ -486,7 +486,7 @@ if ($mine || ($usertoprocess->id == $user->id))
 }
 print '</div>';
 
-dol_fiche_end();
+print dol_get_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.
 
@@ -592,7 +592,7 @@ if (!empty($arrayfields['t.planned_workload']['checked'])) $addcolspan++;
 if (!empty($arrayfields['t.progress']['checked'])) $addcolspan++;
 foreach ($arrayfields as $key => $val)
 {
-    if ($val['checked'] && substr($key, 0, 5) == 'efpt.') $addcolspan++;
+	if ($val['checked'] && substr($key, 0, 5) == 'efpt.') $addcolspan++;
 }
 
 print '<div class="div-table-responsive">';
@@ -610,11 +610,11 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
 print '<td class="liste_titre"></td>';
 if (!empty($arrayfields['t.planned_workload']['checked']))
 {
-    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 right"><input type="text" size="4" name="search_declared_progress" value="'.dol_escape_htmltag($search_declared_progress).'"></td>';
 }
 if (!empty($arrayfields['t.progress']['checked']))
 {
-    print '<td class="liste_titre"></td>';
+	print '<td class="liste_titre"></td>';
 }
 print '<td class="liste_titre"></td>';
 for ($idw = 0; $idw < 7; $idw++)
@@ -638,11 +638,11 @@ $extrafieldsobjectprefix = 'efpt.';
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 if (!empty($arrayfields['t.planned_workload']['checked']))
 {
-    print '<th class="leftborder plannedworkload maxwidth75 right">'.$langs->trans("PlannedWorkload").'</th>';
+	print '<th class="leftborder plannedworkload maxwidth75 right">'.$langs->trans("PlannedWorkload").'</th>';
 }
 if (!empty($arrayfields['t.progress']['checked']))
 {
-    print '<th class="maxwidth75 right">'.$langs->trans("ProgressDeclared").'</th>';
+	print '<th class="maxwidth75 right">'.$langs->trans("ProgressDeclared").'</th>';
 }
 /*print '<td class="maxwidth75 right">'.$langs->trans("TimeSpent").'</td>';
  if ($usertoprocess->id == $user->id) print '<td class="maxwidth75 right">'.$langs->trans("TimeSpentByYou").'</td>';
@@ -681,7 +681,7 @@ $colspan = 3 + (empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)
 if ($conf->use_javascript_ajax)
 {
 	print '<tr class="liste_total">';
-    print '<td class="liste_total" colspan="'.($colspan + $addcolspan).'">';
+	print '<td class="liste_total" colspan="'.($colspan + $addcolspan).'">';
 	print $langs->trans("Total");
 	print '<span class="opacitymediumbycolor">  - '.$langs->trans("ExpectedWorkedHours").': <strong>'.price($usertoprocess->weeklyhours, 1, $langs, 0, 0).'</strong></span>';
 	print '</td>';
@@ -769,7 +769,7 @@ if (count($tasksarray) > 0)
 	if ($isdiff)
 	{
 		print '<tr class="oddeven othertaskwithtime">';
-        print '<td colspan="'.($colspan + $addcolspan).'" class="opacitymedium">';
+		print '<td colspan="'.($colspan + $addcolspan).'" class="opacitymedium">';
 		print $langs->trans("OtherFilteredTasks");
 		print '</td>';
 		for ($idw = 0; $idw < 7; $idw++)
@@ -791,8 +791,8 @@ if (count($tasksarray) > 0)
 			}
 			print '</td>';
 		}
-        print ' <td class="liste_total"></td>';
-    	print '</tr>';
+		print ' <td class="liste_total"></td>';
+		print '</tr>';
 	}
 
 	if ($conf->use_javascript_ajax)
@@ -820,7 +820,7 @@ if (count($tasksarray) > 0)
 
 			print '<td class="liste_total hide'.$idw.($cssonholiday ? ' '.$cssonholiday : '').($cssweekend ? ' '.$cssweekend : '').'" align="center"><div class="totalDay'.$idw.'">&nbsp;</div></td>';
 		}
-                print '<td class="liste_total center"><div class="totalDayAll">&nbsp;</div></td>
+				print '<td class="liste_total center"><div class="totalDayAll">&nbsp;</div></td>
     	</tr>';
 	}
 } else {
diff --git a/htdocs/projet/admin/project_extrafields.php b/htdocs/projet/admin/project_extrafields.php
index cb0d112b85d..6c92e6d66c9 100644
--- a/htdocs/projet/admin/project_extrafields.php
+++ b/htdocs/projet/admin/project_extrafields.php
@@ -73,7 +73,7 @@ print dol_get_fiche_head($head, 'attributes', $langs->trans("Projects"), -1, 'pr
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 // Buttons
@@ -96,7 +96,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';
 }
 
 /* ************************************************************************** */
@@ -109,7 +109,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/projet/admin/project_task_extrafields.php b/htdocs/projet/admin/project_task_extrafields.php
index 4aa72bfadca..9f7efbb7096 100644
--- a/htdocs/projet/admin/project_task_extrafields.php
+++ b/htdocs/projet/admin/project_task_extrafields.php
@@ -73,7 +73,7 @@ print dol_get_fiche_head($head, 'attributes_task', $langs->trans("Projects"), -1
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 // Buttons
@@ -96,7 +96,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';
 }
 
 /* ************************************************************************** */
@@ -109,7 +109,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/projet/card.php b/htdocs/projet/card.php
index 929ac9beaa0..a923352a69e 100644
--- a/htdocs/projet/card.php
+++ b/htdocs/projet/card.php
@@ -119,12 +119,12 @@ if (empty($reshook))
 	if ($action == 'add' && $user->rights->projet->creer)
 	{
 		$error = 0;
-		if (! GETPOST('ref'))
+		if (!GETPOST('ref'))
 		{
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Ref")), null, 'errors');
 			$error++;
 		}
-		if (! GETPOST('title'))
+		if (!GETPOST('title'))
 		{
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Label")), null, 'errors');
 			$error++;
@@ -677,7 +677,7 @@ if ($action == 'create' && $user->rights->projet->creer)
 
 	print '</table>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div class="center">';
 	print '<input type="submit" class="button" value="'.$langs->trans("CreateDraft").'">';
@@ -900,18 +900,18 @@ if ($action == 'create' && $user->rights->projet->creer)
 			print '</td>';
 			print '</tr>';
 
-		    // Opportunity probability
-		    print '<tr class="classuseopportunity'.$classfortr.'"><td>'.$langs->trans("OpportunityProbability").'</td>';
-		    print '<td><input size="5" type="text" id="opp_percent" name="opp_percent" value="'.(GETPOSTISSET('opp_percent') ? GETPOST('opp_percent') : (strcmp($object->opp_percent, '') ?vatrate($object->opp_percent) : '')).'"> %';
-            print '<span id="oldopppercent"></span>';
-		    print '</td>';
-		    print '</tr>';
+			// Opportunity probability
+			print '<tr class="classuseopportunity'.$classfortr.'"><td>'.$langs->trans("OpportunityProbability").'</td>';
+			print '<td><input size="5" type="text" id="opp_percent" name="opp_percent" value="'.(GETPOSTISSET('opp_percent') ? GETPOST('opp_percent') : (strcmp($object->opp_percent, '') ?vatrate($object->opp_percent) : '')).'"> %';
+			print '<span id="oldopppercent"></span>';
+			print '</td>';
+			print '</tr>';
 
-		    // Opportunity amount
-		    print '<tr class="classuseopportunity'.$classfortr.'"><td>'.$langs->trans("OpportunityAmount").'</td>';
-		    print '<td><input size="5" type="text" name="opp_amount" value="'.(GETPOSTISSET('opp_amount') ? GETPOST('opp_amount') : (strcmp($object->opp_amount, '') ? price2num($object->opp_amount) : '')).'"></td>';
-		    print '</tr>';
-	    }
+			// Opportunity amount
+			print '<tr class="classuseopportunity'.$classfortr.'"><td>'.$langs->trans("OpportunityAmount").'</td>';
+			print '<td><input size="5" type="text" name="opp_amount" value="'.(GETPOSTISSET('opp_amount') ? GETPOST('opp_amount') : (strcmp($object->opp_amount, '') ? price2num($object->opp_amount) : '')).'"></td>';
+			print '</tr>';
+		}
 
 		// Date start
 		print '<tr><td>'.$langs->trans("DateStart").'</td><td>';
@@ -1052,10 +1052,10 @@ if ($action == 'create' && $user->rights->projet->creer)
 			if (strcmp($object->opp_amount, '')) print price($object->opp_amount, 0, $langs, 1, 0, -1, $conf->currency);
 			print '</td></tr>';
 
-            // Opportunity Weighted Amount
-            print '<tr><td>'.$langs->trans('OpportunityWeightedAmount').'</td><td>';
-            if (strcmp($object->opp_amount, '') && strcmp($object->opp_percent, '')) print price($object->opp_amount * $object->opp_percent / 100, 0, $langs, 1, 0, -1, $conf->currency);
-            print '</td></tr>';
+			// Opportunity Weighted Amount
+			print '<tr><td>'.$langs->trans('OpportunityWeightedAmount').'</td><td>';
+			if (strcmp($object->opp_amount, '') && strcmp($object->opp_percent, '')) print price($object->opp_amount * $object->opp_percent / 100, 0, $langs, 1, 0, -1, $conf->currency);
+			print '</td></tr>';
 		}
 
 		// Date start - end
@@ -1107,7 +1107,7 @@ if ($action == 'create' && $user->rights->projet->creer)
 		print '<div class="clearboth"></div>';
 	}
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	if ($action == 'edit' && $userWrite > 0)
 	{
diff --git a/htdocs/projet/class/api_projects.class.php b/htdocs/projet/class/api_projects.class.php
index 214cbe96154..c8ca952f9ed 100644
--- a/htdocs/projet/class/api_projects.class.php
+++ b/htdocs/projet/class/api_projects.class.php
@@ -30,285 +30,284 @@
 class Projects extends DolibarrApi
 {
 
-    /**
-     * @var array   $FIELDS     Mandatory fields, checked when create and update object
-     */
-    static $FIELDS = array(
-        'ref',
-        'title'
-    );
+	/**
+	 * @var array   $FIELDS     Mandatory fields, checked when create and update object
+	 */
+	static $FIELDS = array(
+		'ref',
+		'title'
+	);
 
-    /**
-     * @var Project $project {@type Project}
-     */
-    public $project;
+	/**
+	 * @var Project $project {@type Project}
+	 */
+	public $project;
 
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-        global $db, $conf;
-        $this->db = $db;
-        $this->project = new Project($this->db);
-        $this->task = new Task($this->db);
-    }
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		global $db, $conf;
+		$this->db = $db;
+		$this->project = new Project($this->db);
+		$this->task = new Task($this->db);
+	}
 
-    /**
-     * Get properties of a project object
-     *
-     * Return an array with project informations
-     *
-     * @param       int         $id         ID of project
-     * @return 	array|mixed data without useless information
-     *
-     * @throws 	RestException
-     */
-    public function get($id)
-    {
-        if (!DolibarrApiAccess::$user->rights->projet->lire) {
-            throw new RestException(401);
-        }
+	/**
+	 * Get properties of a project object
+	 *
+	 * Return an array with project informations
+	 *
+	 * @param       int         $id         ID of project
+	 * @return 	array|mixed data without useless information
+	 *
+	 * @throws 	RestException
+	 */
+	public function get($id)
+	{
+		if (!DolibarrApiAccess::$user->rights->projet->lire) {
+			throw new RestException(401);
+		}
 
-        $result = $this->project->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Project not found');
-        }
+		$result = $this->project->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Project not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('project', $this->project->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('project', $this->project->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        $this->project->fetchObjectLinked();
-        return $this->_cleanObjectDatas($this->project);
-    }
+		$this->project->fetchObjectLinked();
+		return $this->_cleanObjectDatas($this->project);
+	}
 
 
 
-    /**
-     * List projects
-     *
-     * Get a list of projects
-     *
-     * @param string	       $sortfield	        Sort field
-     * @param string	       $sortorder	        Sort order
-     * @param int		       $limit		        Limit for list
-     * @param int		       $page		        Page number
-     * @param string   	       $thirdparty_ids	    Thirdparty ids to filter projects of (example '1' or '1,2,3') {@pattern /^[0-9,]*$/i}
+	/**
+	 * List projects
+	 *
+	 * Get a list of projects
+	 *
+	 * @param string	       $sortfield	        Sort field
+	 * @param string	       $sortorder	        Sort order
+	 * @param int		       $limit		        Limit for list
+	 * @param int		       $page		        Page number
+	 * @param string   	       $thirdparty_ids	    Thirdparty ids to filter projects of (example '1' or '1,2,3') {@pattern /^[0-9,]*$/i}
 	 * @param  int    $category   Use this param to filter list by category
 	 * @param string           $sqlfilters          Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"
-     * @return  array                               Array of project objects
-     */
-    public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $thirdparty_ids = '', $category = 0, $sqlfilters = '')
-    {
-        global $db, $conf;
+	 * @return  array                               Array of project objects
+	 */
+	public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $thirdparty_ids = '', $category = 0, $sqlfilters = '')
+	{
+		global $db, $conf;
 
-        $obj_ret = array();
+		$obj_ret = array();
 
-        // case of external user, $thirdparty_ids param is ignored and replaced by user's socid
-        $socids = DolibarrApiAccess::$user->socid ? DolibarrApiAccess::$user->socid : $thirdparty_ids;
+		// case of external user, $thirdparty_ids param is ignored and replaced by user's socid
+		$socids = DolibarrApiAccess::$user->socid ? DolibarrApiAccess::$user->socid : $thirdparty_ids;
 
-        // If the internal user must only see his customers, force searching by him
-        $search_sale = 0;
-        if (!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) $search_sale = DolibarrApiAccess::$user->id;
+		// If the internal user must only see his customers, force searching by him
+		$search_sale = 0;
+		if (!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) $search_sale = DolibarrApiAccess::$user->id;
 
-        $sql = "SELECT t.rowid";
-        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
-        $sql .= " FROM ".MAIN_DB_PREFIX."projet as t";
-    	if ($category > 0) {
+		$sql = "SELECT t.rowid";
+		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
+		$sql .= " FROM ".MAIN_DB_PREFIX."projet as t";
+		if ($category > 0) {
 			$sql .= ", ".MAIN_DB_PREFIX."categorie_project as c";
-    	}
-        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
+		}
+		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
 
-        $sql .= ' WHERE t.entity IN ('.getEntity('project').')';
-        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= " AND t.fk_soc = sc.fk_soc";
-        if ($socids) $sql .= " AND t.fk_soc IN (".$socids.")";
-        if ($search_sale > 0) $sql .= " AND t.rowid = sc.fk_soc"; // Join for the needed table to filter by sale
-        // Insert sale filter
-        if ($search_sale > 0)
-        {
-            $sql .= " AND sc.fk_user = ".$search_sale;
-        }
-    	// Select projects of given category
-    	if ($category > 0) {
-    		$sql .= " AND c.fk_categorie = ".$this->db->escape($category)." AND c.fk_project = t.rowid ";
-    	}
-        // Add sql filters
-        if ($sqlfilters)
-        {
-            if (!DolibarrApi::_checkFilters($sqlfilters))
-            {
-                throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
-            }
-            $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-        }
+		$sql .= ' WHERE t.entity IN ('.getEntity('project').')';
+		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= " AND t.fk_soc = sc.fk_soc";
+		if ($socids) $sql .= " AND t.fk_soc IN (".$socids.")";
+		if ($search_sale > 0) $sql .= " AND t.rowid = sc.fk_soc"; // Join for the needed table to filter by sale
+		// Insert sale filter
+		if ($search_sale > 0)
+		{
+			$sql .= " AND sc.fk_user = ".$search_sale;
+		}
+		// Select projects of given category
+		if ($category > 0) {
+			$sql .= " AND c.fk_categorie = ".$this->db->escape($category)." AND c.fk_project = t.rowid ";
+		}
+		// Add sql filters
+		if ($sqlfilters)
+		{
+			if (!DolibarrApi::_checkFilters($sqlfilters))
+			{
+				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+			}
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
 
-        $sql .= $this->db->order($sortfield, $sortorder);
-        if ($limit) {
-            if ($page < 0)
-            {
-                $page = 0;
-            }
-            $offset = $limit * $page;
+		$sql .= $this->db->order($sortfield, $sortorder);
+		if ($limit) {
+			if ($page < 0) {
+				$page = 0;
+			}
+			$offset = $limit * $page;
 
-            $sql .= $this->db->plimit($limit + 1, $offset);
-        }
+			$sql .= $this->db->plimit($limit + 1, $offset);
+		}
 
-        dol_syslog("API Rest request");
-        $result = $this->db->query($sql);
+		dol_syslog("API Rest request");
+		$result = $this->db->query($sql);
 
-        if ($result)
-        {
-        	$num = $this->db->num_rows($result);
-            $min = min($num, ($limit <= 0 ? $num : $limit));
-            while ($i < $min)
-            {
-            	$obj = $this->db->fetch_object($result);
-            	$project_static = new Project($this->db);
-                if ($project_static->fetch($obj->rowid)) {
-                    $obj_ret[] = $this->_cleanObjectDatas($project_static);
-                }
-                $i++;
-            }
-        } else {
-        	throw new RestException(503, 'Error when retrieve project list : '.$this->db->lasterror());
-        }
-        if (!count($obj_ret)) {
-            throw new RestException(404, 'No project found');
-        }
-        return $obj_ret;
-    }
+		if ($result)
+		{
+			$num = $this->db->num_rows($result);
+			$min = min($num, ($limit <= 0 ? $num : $limit));
+			$i = 0;
+			while ($i < $min) {
+				$obj = $this->db->fetch_object($result);
+				$project_static = new Project($this->db);
+				if ($project_static->fetch($obj->rowid)) {
+					$obj_ret[] = $this->_cleanObjectDatas($project_static);
+				}
+				$i++;
+			}
+		} else {
+			throw new RestException(503, 'Error when retrieve project list : '.$this->db->lasterror());
+		}
+		if (!count($obj_ret)) {
+			throw new RestException(404, 'No project found');
+		}
+		return $obj_ret;
+	}
 
-    /**
-     * Create project object
-     *
-     * @param   array   $request_data   Request data
-     * @return  int     ID of project
-     */
-    public function post($request_data = null)
-    {
-        if (!DolibarrApiAccess::$user->rights->projet->creer) {
-            throw new RestException(401, "Insuffisant rights");
-        }
-        // Check mandatory fields
-        $result = $this->_validate($request_data);
+	/**
+	 * Create project object
+	 *
+	 * @param   array   $request_data   Request data
+	 * @return  int     ID of project
+	 */
+	public function post($request_data = null)
+	{
+		if (!DolibarrApiAccess::$user->rights->projet->creer) {
+			throw new RestException(401, "Insuffisant rights");
+		}
+		// Check mandatory fields
+		$result = $this->_validate($request_data);
 
-        foreach ($request_data as $field => $value) {
-            $this->project->$field = $value;
-        }
-        /*if (isset($request_data["lines"])) {
+		foreach ($request_data as $field => $value) {
+			$this->project->$field = $value;
+		}
+		/*if (isset($request_data["lines"])) {
           $lines = array();
           foreach ($request_data["lines"] as $line) {
             array_push($lines, (object) $line);
           }
           $this->project->lines = $lines;
         }*/
-        if ($this->project->create(DolibarrApiAccess::$user) < 0) {
-            throw new RestException(500, "Error creating project", array_merge(array($this->project->error), $this->project->errors));
-        }
+		if ($this->project->create(DolibarrApiAccess::$user) < 0) {
+			throw new RestException(500, "Error creating project", array_merge(array($this->project->error), $this->project->errors));
+		}
 
-        return $this->project->id;
-    }
+		return $this->project->id;
+	}
 
-    /**
-     * Get tasks of a project.
-     * See also API /tasks
-     *
-     * @param int   $id                     Id of project
-     * @param int   $includetimespent       0=Return only list of tasks. 1=Include a summary of time spent, 2=Include details of time spent lines (2 is no implemented yet)
-     * @return int
-     *
-     * @url	GET {id}/tasks
-     */
-    public function getLines($id, $includetimespent = 0)
-    {
-        if (!DolibarrApiAccess::$user->rights->projet->lire) {
-            throw new RestException(401);
-        }
+	/**
+	 * Get tasks of a project.
+	 * See also API /tasks
+	 *
+	 * @param int   $id                     Id of project
+	 * @param int   $includetimespent       0=Return only list of tasks. 1=Include a summary of time spent, 2=Include details of time spent lines (2 is no implemented yet)
+	 * @return int
+	 *
+	 * @url	GET {id}/tasks
+	 */
+	public function getLines($id, $includetimespent = 0)
+	{
+		if (!DolibarrApiAccess::$user->rights->projet->lire) {
+			throw new RestException(401);
+		}
 
-        $result = $this->project->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Project not found');
-        }
+		$result = $this->project->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Project not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('project', $this->project->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
-        $this->project->getLinesArray(DolibarrApiAccess::$user);
-        $result = array();
-        foreach ($this->project->lines as $line)      // $line is a task
-        {
-            if ($includetimespent == 1)
-            {
-                $timespent = $line->getSummaryOfTimeSpent(0);
-            }
-            if ($includetimespent == 1)
-            {
-                // TODO
-                // Add class for timespent records and loop and fill $line->lines with records of timespent
-            }
-            array_push($result, $this->_cleanObjectDatas($line));
-        }
-        return $result;
-    }
+		if (!DolibarrApi::_checkAccessToResource('project', $this->project->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+		$this->project->getLinesArray(DolibarrApiAccess::$user);
+		$result = array();
+		foreach ($this->project->lines as $line)      // $line is a task
+		{
+			if ($includetimespent == 1)
+			{
+				$timespent = $line->getSummaryOfTimeSpent(0);
+			}
+			if ($includetimespent == 1)
+			{
+				// TODO
+				// Add class for timespent records and loop and fill $line->lines with records of timespent
+			}
+			array_push($result, $this->_cleanObjectDatas($line));
+		}
+		return $result;
+	}
 
 
-    /**
-     * Get roles a user is assigned to a project with
-     *
-     * @param   int   $id             Id of project
-     * @param   int   $userid         Id of user (0 = connected user)
-     *
-     * @url	GET {id}/roles
-     *
-     * @return int
-     */
-    public function getRoles($id, $userid = 0)
-    {
-        global $db;
+	/**
+	 * Get roles a user is assigned to a project with
+	 *
+	 * @param   int   $id             Id of project
+	 * @param   int   $userid         Id of user (0 = connected user)
+	 *
+	 * @url	GET {id}/roles
+	 *
+	 * @return int
+	 */
+	public function getRoles($id, $userid = 0)
+	{
+		global $db;
 
-        if (!DolibarrApiAccess::$user->rights->projet->lire) {
-            throw new RestException(401);
-        }
+		if (!DolibarrApiAccess::$user->rights->projet->lire) {
+			throw new RestException(401);
+		}
 
-        $result = $this->project->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Project not found');
-        }
+		$result = $this->project->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Project not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('project', $this->project->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('project', $this->project->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
-        $taskstatic = new Task($this->db);
-        $userp = DolibarrApiAccess::$user;
-        if ($userid > 0)
-        {
-            $userp = new User($this->db);
-            $userp->fetch($userid);
-        }
-        $this->project->roles = $taskstatic->getUserRolesForProjectsOrTasks($userp, 0, $id, 0);
-        $result = array();
-        foreach ($this->project->roles as $line) {
-            array_push($result, $this->_cleanObjectDatas($line));
-        }
-        return $result;
-    }
+		require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
+		$taskstatic = new Task($this->db);
+		$userp = DolibarrApiAccess::$user;
+		if ($userid > 0)
+		{
+			$userp = new User($this->db);
+			$userp->fetch($userid);
+		}
+		$this->project->roles = $taskstatic->getUserRolesForProjectsOrTasks($userp, 0, $id, 0);
+		$result = array();
+		foreach ($this->project->roles as $line) {
+			array_push($result, $this->_cleanObjectDatas($line));
+		}
+		return $result;
+	}
 
 
-    /**
-     * Add a task to given project
-     *
-     * @param int   $id             Id of project to update
-     * @param array $request_data   Projectline data
-     *
-     * @url	POST {id}/tasks
-     *
-     * @return int
-     */
-    /*
+	/**
+	 * Add a task to given project
+	 *
+	 * @param int   $id             Id of project to update
+	 * @param array $request_data   Projectline data
+	 *
+	 * @url	POST {id}/tasks
+	 *
+	 * @return int
+	 */
+	/*
     public function postLine($id, $request_data = null)
     {
         if(! DolibarrApiAccess::$user->rights->projet->creer) {
@@ -360,18 +359,18 @@ class Projects extends DolibarrApi
     }
     */
 
-    /**
-     * Update a task to given project
-     *
-     * @param int   $id             Id of project to update
-     * @param int   $taskid         Id of task to update
-     * @param array $request_data   Projectline data
-     *
-     * @url	PUT {id}/tasks/{taskid}
-     *
-     * @return object
-     */
-    /*
+	/**
+	 * Update a task to given project
+	 *
+	 * @param int   $id             Id of project to update
+	 * @param int   $taskid         Id of task to update
+	 * @param array $request_data   Projectline data
+	 *
+	 * @url	PUT {id}/tasks/{taskid}
+	 *
+	 * @return object
+	 */
+	/*
     public function putLine($id, $lineid, $request_data = null)
     {
         if(! DolibarrApiAccess::$user->rights->projet->creer) {
@@ -421,194 +420,194 @@ class Projects extends DolibarrApi
 
 
 
-    /**
-     * Update project general fields (won't touch lines of project)
-     *
-     * @param int   $id             Id of project to update
-     * @param array $request_data   Datas
-     *
-     * @return int
-     */
-    public function put($id, $request_data = null)
-    {
-        if (!DolibarrApiAccess::$user->rights->projet->creer) {
-            throw new RestException(401);
-        }
+	/**
+	 * Update project general fields (won't touch lines of project)
+	 *
+	 * @param int   $id             Id of project to update
+	 * @param array $request_data   Datas
+	 *
+	 * @return int
+	 */
+	public function put($id, $request_data = null)
+	{
+		if (!DolibarrApiAccess::$user->rights->projet->creer) {
+			throw new RestException(401);
+		}
 
-        $result = $this->project->fetch($id);
-        if ($result <= 0) {
-            throw new RestException(404, 'Project not found');
-        }
+		$result = $this->project->fetch($id);
+		if ($result <= 0) {
+			throw new RestException(404, 'Project not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('project', $this->project->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
-        foreach ($request_data as $field => $value) {
-            if ($field == 'id') continue;
-            $this->project->$field = $value;
-        }
+		if (!DolibarrApi::_checkAccessToResource('project', $this->project->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+		foreach ($request_data as $field => $value) {
+			if ($field == 'id') continue;
+			$this->project->$field = $value;
+		}
 
-        if ($this->project->update(DolibarrApiAccess::$user) >= 0)
-        {
-            return $this->get($id);
-        } else {
-            throw new RestException(500, $this->project->error);
-        }
-    }
+		if ($this->project->update(DolibarrApiAccess::$user) >= 0)
+		{
+			return $this->get($id);
+		} else {
+			throw new RestException(500, $this->project->error);
+		}
+	}
 
-    /**
-     * Delete project
-     *
-     * @param   int     $id         Project ID
-     *
-     * @return  array
-     */
-    public function delete($id)
-    {
-        if (!DolibarrApiAccess::$user->rights->projet->supprimer) {
-            throw new RestException(401);
-        }
-        $result = $this->project->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Project not found');
-        }
+	/**
+	 * Delete project
+	 *
+	 * @param   int     $id         Project ID
+	 *
+	 * @return  array
+	 */
+	public function delete($id)
+	{
+		if (!DolibarrApiAccess::$user->rights->projet->supprimer) {
+			throw new RestException(401);
+		}
+		$result = $this->project->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Project not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('project', $this->project->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('project', $this->project->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        if (!$this->project->delete(DolibarrApiAccess::$user)) {
-            throw new RestException(500, 'Error when delete project : '.$this->project->error);
-        }
+		if (!$this->project->delete(DolibarrApiAccess::$user)) {
+			throw new RestException(500, 'Error when delete project : '.$this->project->error);
+		}
 
-        return array(
-            'success' => array(
-                'code' => 200,
-                'message' => 'Project deleted'
-            )
-        );
-    }
+		return array(
+			'success' => array(
+				'code' => 200,
+				'message' => 'Project deleted'
+			)
+		);
+	}
 
-    /**
-     * Validate a project.
-     * You can test this API with the following input message
-     * { "notrigger": 0 }
-     *
-     * @param   int $id             Project ID
-     * @param   int $notrigger      1=Does not execute triggers, 0= execute triggers
-     *
-     * @url POST    {id}/validate
-     *
-     * @return  array
-     * FIXME An error 403 is returned if the request has an empty body.
-     * Error message: "Forbidden: Content type `text/plain` is not supported."
-     * Workaround: send this in the body
-     * {
-     *   "notrigger": 0
-     * }
-     */
-    public function validate($id, $notrigger = 0)
-    {
-        if (!DolibarrApiAccess::$user->rights->projet->creer) {
-            throw new RestException(401);
-        }
-        $result = $this->project->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Project not found');
-        }
+	/**
+	 * Validate a project.
+	 * You can test this API with the following input message
+	 * { "notrigger": 0 }
+	 *
+	 * @param   int $id             Project ID
+	 * @param   int $notrigger      1=Does not execute triggers, 0= execute triggers
+	 *
+	 * @url POST    {id}/validate
+	 *
+	 * @return  array
+	 * FIXME An error 403 is returned if the request has an empty body.
+	 * Error message: "Forbidden: Content type `text/plain` is not supported."
+	 * Workaround: send this in the body
+	 * {
+	 *   "notrigger": 0
+	 * }
+	 */
+	public function validate($id, $notrigger = 0)
+	{
+		if (!DolibarrApiAccess::$user->rights->projet->creer) {
+			throw new RestException(401);
+		}
+		$result = $this->project->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Project not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('project', $this->project->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('project', $this->project->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        $result = $this->project->setValid(DolibarrApiAccess::$user, $notrigger);
-        if ($result == 0) {
-            throw new RestException(304, 'Error nothing done. May be object is already validated');
-        }
-        if ($result < 0) {
-            throw new RestException(500, 'Error when validating Project: '.$this->project->error);
-        }
+		$result = $this->project->setValid(DolibarrApiAccess::$user, $notrigger);
+		if ($result == 0) {
+			throw new RestException(304, 'Error nothing done. May be object is already validated');
+		}
+		if ($result < 0) {
+			throw new RestException(500, 'Error when validating Project: '.$this->project->error);
+		}
 
-        return array(
-            'success' => array(
-                'code' => 200,
-                'message' => 'Project validated'
-            )
-        );
-    }
+		return array(
+			'success' => array(
+				'code' => 200,
+				'message' => 'Project validated'
+			)
+		);
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
-    /**
-     * Clean sensible object datas
-     *
-     * @param   object  $object    Object to clean
-     * @return    array    Array of cleaned object properties
-     */
-    protected function _cleanObjectDatas($object)
-    {
-        // phpcs:enable
-        $object = parent::_cleanObjectDatas($object);
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	/**
+	 * Clean sensible object datas
+	 *
+	 * @param   Object  $object     Object to clean
+	 * @return  Object              Object with cleaned properties
+	 */
+	protected function _cleanObjectDatas($object)
+	{
+		// phpcs:enable
+		$object = parent::_cleanObjectDatas($object);
 
-        unset($object->datec);
-        unset($object->datem);
-        unset($object->barcode_type);
-        unset($object->barcode_type_code);
-        unset($object->barcode_type_label);
-        unset($object->barcode_type_coder);
-        unset($object->cond_reglement_id);
-        unset($object->cond_reglement);
-        unset($object->fk_delivery_address);
-        unset($object->shipping_method_id);
-        unset($object->fk_account);
-        unset($object->note);
-        unset($object->fk_incoterms);
-        unset($object->label_incoterms);
-        unset($object->location_incoterms);
-        unset($object->name);
-        unset($object->lastname);
-        unset($object->firstname);
-        unset($object->civility_id);
-        unset($object->mode_reglement_id);
-        unset($object->country);
-        unset($object->country_id);
-        unset($object->country_code);
+		unset($object->datec);
+		unset($object->datem);
+		unset($object->barcode_type);
+		unset($object->barcode_type_code);
+		unset($object->barcode_type_label);
+		unset($object->barcode_type_coder);
+		unset($object->cond_reglement_id);
+		unset($object->cond_reglement);
+		unset($object->fk_delivery_address);
+		unset($object->shipping_method_id);
+		unset($object->fk_account);
+		unset($object->note);
+		unset($object->fk_incoterms);
+		unset($object->label_incoterms);
+		unset($object->location_incoterms);
+		unset($object->name);
+		unset($object->lastname);
+		unset($object->firstname);
+		unset($object->civility_id);
+		unset($object->mode_reglement_id);
+		unset($object->country);
+		unset($object->country_id);
+		unset($object->country_code);
 
-        unset($object->weekWorkLoad);
-        unset($object->weekWorkLoad);
+		unset($object->weekWorkLoad);
+		unset($object->weekWorkLoad);
 
-        //unset($object->lines);            // for task we use timespent_lines, but for project we use lines
+		//unset($object->lines);            // for task we use timespent_lines, but for project we use lines
 
-        unset($object->total_ht);
-        unset($object->total_tva);
-        unset($object->total_localtax1);
-        unset($object->total_localtax2);
-        unset($object->total_ttc);
+		unset($object->total_ht);
+		unset($object->total_tva);
+		unset($object->total_localtax1);
+		unset($object->total_localtax2);
+		unset($object->total_ttc);
 
-        unset($object->comments);
+		unset($object->comments);
 
-        return $object;
-    }
+		return $object;
+	}
 
-    /**
-     * Validate fields before create or update object
-     *
-     * @param   array           $data   Array with data to verify
-     * @return  array
-     * @throws  RestException
-     */
-    private function _validate($data)
-    {
-        $object = array();
-        foreach (self::$FIELDS as $field) {
-            if (!isset($data[$field]))
-                throw new RestException(400, "$field field missing");
-            $object[$field] = $data[$field];
-        }
-        return $object;
-    }
+	/**
+	 * Validate fields before create or update object
+	 *
+	 * @param   array           $data   Array with data to verify
+	 * @return  array
+	 * @throws  RestException
+	 */
+	private function _validate($data)
+	{
+		$object = array();
+		foreach (self::$FIELDS as $field) {
+			if (!isset($data[$field]))
+				throw new RestException(400, "$field field missing");
+			$object[$field] = $data[$field];
+		}
+		return $object;
+	}
 
 
-    // TODO
-    // getSummaryOfTimeSpent
+	// TODO
+	// getSummaryOfTimeSpent
 }
diff --git a/htdocs/projet/class/api_tasks.class.php b/htdocs/projet/class/api_tasks.class.php
index 5181beb3707..e7bf2c67ce8 100644
--- a/htdocs/projet/class/api_tasks.class.php
+++ b/htdocs/projet/class/api_tasks.class.php
@@ -550,8 +550,8 @@ class Tasks extends DolibarrApi
 	/**
 	 * Clean sensible object datas
 	 *
-	 * @param   object  $object    Object to clean
-	 * @return    array    Array of cleaned object properties
+	 * @param   Object  $object     Object to clean
+	 * @return  Object              Object with cleaned properties
 	 */
 	protected function _cleanObjectDatas($object)
 	{
diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index b585482eef5..29a648acf46 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -1102,7 +1102,10 @@ class Project extends CommonObject
 		}
 
 		$label = '';
-		if ($option != 'nolink') $label = img_picto('', $this->picto).' <u>'.$langs->trans("Project").'</u>';
+		if ($option != 'nolink') $label = img_picto('', $this->picto).' <u class="paddingrightonly">'.$langs->trans("Project").'</u>';
+		if (isset($this->status)) {
+			$label .= ' '.$this->getLibStatut(5);
+		}
 		$label .= ($label ? '<br>' : '').'<b>'.$langs->trans('Ref').': </b>'.$this->ref; // The space must be after the : to not being explode when showing the title in img_picto
 		$label .= ($label ? '<br>' : '').'<b>'.$langs->trans('Label').': </b>'.$this->title; // The space must be after the : to not being explode when showing the title in img_picto
 		if (isset($this->public)) {
@@ -1118,9 +1121,6 @@ class Project extends CommonObject
 			$label .= ($label ? '<br>' : '').'<b>'.$langs->trans('DateEnd').': </b>'.dol_print_date($this->datee, 'day'); // The space must be after the : to not being explode when showing the title in img_picto
 		}
 		if ($moreinpopup) $label .= '<br>'.$moreinpopup;
-		if (isset($this->status)) {
-			$label .= '<br><b>'.$langs->trans("Status").":</b> ".$this->getLibStatut(5);
-		}
 
 		$url = '';
 		if ($option != 'nolink')
@@ -1233,7 +1233,7 @@ class Project extends CommonObject
 	 * 	@param  string	$mode		Type of permission we want to know: 'read', 'write'
 	 * 	@return	int					>0 if user has permission, <0 if user has no permission
 	 */
-	public function restrictedProjectArea($user, $mode = 'read')
+	public function restrictedProjectArea(User $user, $mode = 'read')
 	{
 		// To verify role of users
 		$userAccess = 0;
@@ -1243,7 +1243,7 @@ class Project extends CommonObject
 		} elseif ($this->public && (($mode == 'read' && !empty($user->rights->projet->lire)) || ($mode == 'write' && !empty($user->rights->projet->creer)) || ($mode == 'delete' && !empty($user->rights->projet->supprimer))))
 		{
 			$userAccess = 1;
-		} else {
+		} else {	// No access due to permission to read all projects, so we check if we are a contact of project
 			foreach (array('internal', 'external') as $source)
 			{
 				$userRole = $this->liste_contact(4, $source);
@@ -1252,7 +1252,13 @@ class Project extends CommonObject
 				$nblinks = 0;
 				while ($nblinks < $num)
 				{
-					if ($source == 'internal' && preg_match('/^PROJECT/', $userRole[$nblinks]['code']) && $user->id == $userRole[$nblinks]['id'])
+					if ($source == 'internal' && $user->id == $userRole[$nblinks]['id'])	// $userRole[$nblinks]['id'] is id of user (llx_user) for internal contacts
+					{
+						if ($mode == 'read' && $user->rights->projet->lire)      $userAccess++;
+						if ($mode == 'write' && $user->rights->projet->creer)     $userAccess++;
+						if ($mode == 'delete' && $user->rights->projet->supprimer) $userAccess++;
+					}
+					if ($source == 'external' && $user->socid > 0 && $user->socid == $userRole[$nblinks]['socid'])	// $userRole[$nblinks]['id'] is id of contact (llx_socpeople) or external contacts
 					{
 						if ($mode == 'read' && $user->rights->projet->lire)      $userAccess++;
 						if ($mode == 'write' && $user->rights->projet->creer)     $userAccess++;
@@ -1471,7 +1477,7 @@ class Project extends CommonObject
 				$clone_project->note_public = '';
 			} else {
 				$this->db->begin();
-				$res = $clone_project->update_note(dol_html_entity_decode($clone_project->note_public, ENT_QUOTES|ENT_HTML5), '_public');
+				$res = $clone_project->update_note(dol_html_entity_decode($clone_project->note_public, ENT_QUOTES | ENT_HTML5), '_public');
 				if ($res < 0)
 				{
 					$this->error .= $clone_project->error;
@@ -1482,7 +1488,7 @@ class Project extends CommonObject
 				}
 
 				$this->db->begin();
-				$res = $clone_project->update_note(dol_html_entity_decode($clone_project->note_private, ENT_QUOTES|ENT_HTML5), '_private');
+				$res = $clone_project->update_note(dol_html_entity_decode($clone_project->note_private, ENT_QUOTES | ENT_HTML5), '_private');
 				if ($res < 0)
 				{
 					$this->error .= $clone_project->error;
diff --git a/htdocs/projet/class/projectstats.class.php b/htdocs/projet/class/projectstats.class.php
index cb6150b6dc7..e1a19e293f0 100644
--- a/htdocs/projet/class/projectstats.class.php
+++ b/htdocs/projet/class/projectstats.class.php
@@ -24,25 +24,25 @@ include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
  */
 class ProjectStats extends Stats
 {
-    private $project;
-    public $userid;
-    public $socid;
-    public $year;
+	private $project;
+	public $userid;
+	public $socid;
+	public $year;
 
-    /**
-     * Constructor
-     *
-     * @param   DoliDB $db     Database handler
-     */
-    public function __construct($db)
-    {
-        global $conf, $user;
+	/**
+	 * Constructor
+	 *
+	 * @param   DoliDB $db     Database handler
+	 */
+	public function __construct($db)
+	{
+		global $conf, $user;
 
-        $this->db = $db;
+		$this->db = $db;
 
-        require_once 'project.class.php';
-        $this->project = new Project($this->db);
-    }
+		require_once 'project.class.php';
+		$this->project = new Project($this->db);
+	}
 
 
 	/**
diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php
index 9c19d6b45c7..be54c9f568b 100644
--- a/htdocs/projet/class/task.class.php
+++ b/htdocs/projet/class/task.class.php
@@ -1675,7 +1675,7 @@ class Task extends CommonObject
 				$clone_task->note_public = '';
 			} else {
 				$this->db->begin();
-				$res = $clone_task->update_note(dol_html_entity_decode($clone_task->note_public, ENT_QUOTES|ENT_HTML5), '_public');
+				$res = $clone_task->update_note(dol_html_entity_decode($clone_task->note_public, ENT_QUOTES | ENT_HTML5), '_public');
 				if ($res < 0)
 				{
 					$this->error .= $clone_task->error;
@@ -1686,7 +1686,7 @@ class Task extends CommonObject
 				}
 
 				$this->db->begin();
-				$res = $clone_task->update_note(dol_html_entity_decode($clone_task->note_private, ENT_QUOTES|ENT_HTML5), '_private');
+				$res = $clone_task->update_note(dol_html_entity_decode($clone_task->note_private, ENT_QUOTES | ENT_HTML5), '_private');
 				if ($res < 0)
 				{
 					$this->error .= $clone_task->error;
diff --git a/htdocs/projet/class/taskstats.class.php b/htdocs/projet/class/taskstats.class.php
index 722736fe9b8..296a36c2dcf 100644
--- a/htdocs/projet/class/taskstats.class.php
+++ b/htdocs/projet/class/taskstats.class.php
@@ -29,11 +29,11 @@ class TaskStats extends Stats
 	public $socid;
 	public $year;
 
-    /**
-     * Constructor of the class
-     *
-     * @param   DoliDb  $db     Database handler
-     */
+	/**
+	 * Constructor of the class
+	 *
+	 * @param   DoliDb  $db     Database handler
+	 */
 	public function __construct($db)
 	{
 		$this->db = $db;
@@ -161,7 +161,7 @@ class TaskStats extends Stats
 	 * Return Task number by month for a year
 	 *
 	 * @param 	int 	$year 		Year to scan
-     * @param	int		$format		0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
+	 * @param	int		$format		0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
 	 * @return 	array 				Array of values
 	 */
 	public function getNbByMonth($year, $format = 0)
diff --git a/htdocs/projet/comment.php b/htdocs/projet/comment.php
index 2ed3e75afa4..1200e0bc060 100644
--- a/htdocs/projet/comment.php
+++ b/htdocs/projet/comment.php
@@ -176,7 +176,7 @@ print '</div>';
 
 print '<div class="clearboth"></div>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '<br>';
 
diff --git a/htdocs/projet/contact.php b/htdocs/projet/contact.php
index 48b4653e323..06a1d11955c 100644
--- a/htdocs/projet/contact.php
+++ b/htdocs/projet/contact.php
@@ -63,11 +63,11 @@ if ($action == 'addcontact' && $user->rights->projet->creer)
 	$result = 0;
 	$result = $object->fetch($id);
 
-    if ($result > 0 && $id > 0)
-    {
+	if ($result > 0 && $id > 0)
+	{
   		$contactid = (GETPOST('userid') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int'));
   		$result = $object->add_contact($contactid, $_POST["type"], $_POST["source"]);
-    }
+	}
 
 	if ($result >= 0)
 	{
@@ -89,7 +89,7 @@ if ($action == 'swapstatut' && $user->rights->projet->creer)
 {
 	if ($object->fetch($id))
 	{
-	    $result = $object->swapContactStatus(GETPOST('ligne', 'int'));
+		$result = $object->swapContactStatus(GETPOST('ligne', 'int'));
 	} else {
 		dol_print_error($db);
 	}
@@ -145,63 +145,63 @@ if ($id > 0 || !empty($ref))
 	print dol_get_fiche_head($head, 'contact', $langs->trans("Project"), -1, ($object->public ? 'projectpub' : 'project'));
 
 
-    // Project card
+	// Project card
 
-    $linkback = '<a href="'.DOL_URL_ROOT.'/projet/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+	$linkback = '<a href="'.DOL_URL_ROOT.'/projet/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-    $morehtmlref = '<div class="refidno">';
-    // Title
-    $morehtmlref .= $object->title;
-    // Thirdparty
-    if ($object->thirdparty->id > 0)
-    {
-        $morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1, 'project');
-    }
-    $morehtmlref .= '</div>';
+	$morehtmlref = '<div class="refidno">';
+	// Title
+	$morehtmlref .= $object->title;
+	// Thirdparty
+	if ($object->thirdparty->id > 0)
+	{
+		$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').")";
-    }
+	// 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').")";
+	}
 
-    dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
 
 
-    print '<div class="fichecenter">';
-    print '<div class="fichehalfleft">';
-    print '<div class="underbanner clearboth"></div>';
+	print '<div class="fichecenter">';
+	print '<div class="fichehalfleft">';
+	print '<div class="underbanner clearboth"></div>';
 
-    print '<table class="border tableforfield centpercent">';
+	print '<table class="border tableforfield centpercent">';
 
-    // Usage
-    print '<tr><td class="tdtop">';
-    print $langs->trans("Usage");
-    print '</td>';
-    print '<td>';
-    if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
-    {
-    	print '<input type="checkbox" disabled name="usage_opportunity"'.(GETPOSTISSET('usage_opportunity') ? (GETPOST('usage_opportunity', 'alpha') != '' ? ' checked="checked"' : '') : ($object->usage_opportunity ? ' checked="checked"' : '')).'"> ';
-    	$htmltext = $langs->trans("ProjectFollowOpportunity");
-    	print $form->textwithpicto($langs->trans("ProjectFollowOpportunity"), $htmltext);
-    	print '<br>';
-    }
-    if (empty($conf->global->PROJECT_HIDE_TASKS))
-    {
-    	print '<input type="checkbox" disabled name="usage_task"'.(GETPOSTISSET('usage_task') ? (GETPOST('usage_task', 'alpha') != '' ? ' checked="checked"' : '') : ($object->usage_task ? ' checked="checked"' : '')).'"> ';
-    	$htmltext = $langs->trans("ProjectFollowTasks");
-    	print $form->textwithpicto($langs->trans("ProjectFollowTasks"), $htmltext);
-    	print '<br>';
-    }
-    if (!empty($conf->global->PROJECT_BILL_TIME_SPENT))
-    {
-    	print '<input type="checkbox" disabled name="usage_bill_time"'.(GETPOSTISSET('usage_bill_time') ? (GETPOST('usage_bill_time', 'alpha') != '' ? ' checked="checked"' : '') : ($object->usage_bill_time ? ' checked="checked"' : '')).'"> ';
-    	$htmltext = $langs->trans("ProjectBillTimeDescription");
-    	print $form->textwithpicto($langs->trans("BillTime"), $htmltext);
-    	print '<br>';
-    }
-    print '</td></tr>';
+	// Usage
+	print '<tr><td class="tdtop">';
+	print $langs->trans("Usage");
+	print '</td>';
+	print '<td>';
+	if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
+	{
+		print '<input type="checkbox" disabled name="usage_opportunity"'.(GETPOSTISSET('usage_opportunity') ? (GETPOST('usage_opportunity', 'alpha') != '' ? ' checked="checked"' : '') : ($object->usage_opportunity ? ' checked="checked"' : '')).'"> ';
+		$htmltext = $langs->trans("ProjectFollowOpportunity");
+		print $form->textwithpicto($langs->trans("ProjectFollowOpportunity"), $htmltext);
+		print '<br>';
+	}
+	if (empty($conf->global->PROJECT_HIDE_TASKS))
+	{
+		print '<input type="checkbox" disabled name="usage_task"'.(GETPOSTISSET('usage_task') ? (GETPOST('usage_task', 'alpha') != '' ? ' checked="checked"' : '') : ($object->usage_task ? ' checked="checked"' : '')).'"> ';
+		$htmltext = $langs->trans("ProjectFollowTasks");
+		print $form->textwithpicto($langs->trans("ProjectFollowTasks"), $htmltext);
+		print '<br>';
+	}
+	if (!empty($conf->global->PROJECT_BILL_TIME_SPENT))
+	{
+		print '<input type="checkbox" disabled name="usage_bill_time"'.(GETPOSTISSET('usage_bill_time') ? (GETPOST('usage_bill_time', 'alpha') != '' ? ' checked="checked"' : '') : ($object->usage_bill_time ? ' checked="checked"' : '')).'"> ';
+		$htmltext = $langs->trans("ProjectBillTimeDescription");
+		print $form->textwithpicto($langs->trans("BillTime"), $htmltext);
+		print '<br>';
+	}
+	print '</td></tr>';
 
 	// Visibility
 	print '<tr><td class="titlefield">'.$langs->trans("Visibility").'</td><td>';
@@ -209,36 +209,36 @@ if ($id > 0 || !empty($ref))
 	else print $langs->trans('PrivateProject');
 	print '</td></tr>';
 
-    if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES) && $object->opp_status)
-    {
-    	// Opportunity status
-    	print '<tr><td>'.$langs->trans("OpportunityStatus").'</td><td>';
-    	$code = dol_getIdFromCode($db, $object->opp_status, 'c_lead_status', 'rowid', 'code');
-    	if ($code) print $langs->trans("OppStatus".$code);
-    	print '</td></tr>';
+	if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES) && $object->opp_status)
+	{
+		// Opportunity status
+		print '<tr><td>'.$langs->trans("OpportunityStatus").'</td><td>';
+		$code = dol_getIdFromCode($db, $object->opp_status, 'c_lead_status', 'rowid', 'code');
+		if ($code) print $langs->trans("OppStatus".$code);
+		print '</td></tr>';
 
-        // Opportunity percent
-        print '<tr><td>'.$langs->trans("OpportunityProbability").'</td><td>';
-        if (strcmp($object->opp_percent, '')) print price($object->opp_percent, '', $langs, 1, 0).' %';
-        print '</td></tr>';
+		// Opportunity percent
+		print '<tr><td>'.$langs->trans("OpportunityProbability").'</td><td>';
+		if (strcmp($object->opp_percent, '')) print price($object->opp_percent, '', $langs, 1, 0).' %';
+		print '</td></tr>';
 
-    	// Opportunity Amount
-    	print '<tr><td>'.$langs->trans("OpportunityAmount").'</td><td>';
-    	if (strcmp($object->opp_amount, '')) print price($object->opp_amount, '', $langs, 0, 0, 0, $conf->currency);
-    	print '</td></tr>';
-    }
+		// Opportunity Amount
+		print '<tr><td>'.$langs->trans("OpportunityAmount").'</td><td>';
+		if (strcmp($object->opp_amount, '')) print price($object->opp_amount, '', $langs, 0, 0, 0, $conf->currency);
+		print '</td></tr>';
+	}
 
-    // Date start - end
-    print '<tr><td>'.$langs->trans("DateStart").' - '.$langs->trans("DateEnd").'</td><td>';
+	// Date start - end
+	print '<tr><td>'.$langs->trans("DateStart").' - '.$langs->trans("DateEnd").'</td><td>';
 	$start = dol_print_date($object->date_start, 'day');
 	print ($start ? $start : '?');
 	$end = dol_print_date($object->date_end, 'day');
 	print ' - ';
 	print ($end ? $end : '?');
 	if ($object->hasDelay()) print img_warning("Late");
-    print '</td></tr>';
+	print '</td></tr>';
 
-    // Budget
+	// Budget
 	print '<tr><td>'.$langs->trans("Budget").'</td><td>';
 	if (strcmp($object->budget_amount, '')) print price($object->budget_amount, '', $langs, 0, 0, 0, $conf->currency);
 	print '</td></tr>';
@@ -249,36 +249,36 @@ if ($id > 0 || !empty($ref))
 
 	print "</table>";
 
-    print '</div>';
-    print '<div class="fichehalfright">';
-    print '<div class="ficheaddleft">';
-    print '<div class="underbanner clearboth"></div>';
+	print '</div>';
+	print '<div class="fichehalfright">';
+	print '<div class="ficheaddleft">';
+	print '<div class="underbanner clearboth"></div>';
 
-    print '<table class="border tableforfield" width="100%">';
+	print '<table class="border tableforfield" width="100%">';
 
-    // Description
-    print '<td class="titlefield tdtop">'.$langs->trans("Description").'</td><td>';
-    print nl2br($object->description);
-    print '</td></tr>';
+	// Description
+	print '<td class="titlefield tdtop">'.$langs->trans("Description").'</td><td>';
+	print nl2br($object->description);
+	print '</td></tr>';
 
-    // Categories
-    if ($conf->categorie->enabled) {
-        print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td>';
-        print $form->showCategories($object->id, Categorie::TYPE_PROJECT, 1);
-        print "</td></tr>";
-    }
+	// Categories
+	if ($conf->categorie->enabled) {
+		print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td>';
+		print $form->showCategories($object->id, Categorie::TYPE_PROJECT, 1);
+		print "</td></tr>";
+	}
 
-    print '</table>';
+	print '</table>';
 
-    print '</div>';
-    print '</div>';
-    print '</div>';
+	print '</div>';
+	print '</div>';
+	print '</div>';
 
-    print '<div class="clearboth"></div>';
+	print '<div class="clearboth"></div>';
 
-    dol_fiche_end();
+	print dol_get_fiche_end();
 
-    print '<br>';
+	print '<br>';
 
 	// Contacts lines (modules that overwrite templates must declare this into descriptor)
 	$dirtpls = array_merge($conf->modules_parts['tpl'], array('/core/tpl'));
diff --git a/htdocs/projet/document.php b/htdocs/projet/document.php
index 2353af4ceb8..bed7f6a43e1 100644
--- a/htdocs/projet/document.php
+++ b/htdocs/projet/document.php
@@ -151,7 +151,7 @@ if ($object->id > 0)
 	print '</div>';
 
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	$modulepart = 'project';
 	$permission = ($userWrite > 0);
diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php
index 533484eed0e..d30f3bf846e 100644
--- a/htdocs/projet/element.php
+++ b/htdocs/projet/element.php
@@ -142,15 +142,15 @@ $morehtmlref .= $object->title;
 // 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 = " te.rowid in (".(count($objectsListId) ?join(',', array_keys($objectsListId)) : '0').")";
+	$objectsListId = $object->getProjectsAuthorizedForUser($user, 0, 0);
+	$object->next_prev_filter = " te.rowid in (".(count($objectsListId) ?join(',', array_keys($objectsListId)) : '0').")";
 }
 
 dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
@@ -198,21 +198,21 @@ print '</td></tr>';
 
 if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
 {
-    // Opportunity status
-    print '<tr><td>'.$langs->trans("OpportunityStatus").'</td><td>';
-    $code = dol_getIdFromCode($db, $object->opp_status, 'c_lead_status', 'rowid', 'code');
-    if ($code) print $langs->trans("OppStatus".$code);
-    print '</td></tr>';
+	// Opportunity status
+	print '<tr><td>'.$langs->trans("OpportunityStatus").'</td><td>';
+	$code = dol_getIdFromCode($db, $object->opp_status, 'c_lead_status', 'rowid', 'code');
+	if ($code) print $langs->trans("OppStatus".$code);
+	print '</td></tr>';
 
-    // Opportunity percent
-    print '<tr><td>'.$langs->trans("OpportunityProbability").'</td><td>';
-    if (strcmp($object->opp_percent, '')) print price($object->opp_percent, '', $langs, 1, 0).' %';
-    print '</td></tr>';
+	// Opportunity percent
+	print '<tr><td>'.$langs->trans("OpportunityProbability").'</td><td>';
+	if (strcmp($object->opp_percent, '')) print price($object->opp_percent, '', $langs, 1, 0).' %';
+	print '</td></tr>';
 
-    // Opportunity Amount
-    print '<tr><td>'.$langs->trans("OpportunityAmount").'</td><td>';
-    if (strcmp($object->opp_amount, '')) print price($object->opp_amount, '', $langs, 1, 0, 0, $conf->currency);
-    print '</td></tr>';
+	// Opportunity Amount
+	print '<tr><td>'.$langs->trans("OpportunityAmount").'</td><td>';
+	if (strcmp($object->opp_amount, '')) print price($object->opp_amount, '', $langs, 1, 0, 0, $conf->currency);
+	print '</td></tr>';
 }
 
 // Date start - end
@@ -250,9 +250,9 @@ print '</td></tr>';
 
 // Categories
 if ($conf->categorie->enabled) {
-    print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td>';
-    print $form->showCategories($object->id, Categorie::TYPE_PROJECT, 1);
-    print "</td></tr>";
+	print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td>';
+	print $form->showCategories($object->id, Categorie::TYPE_PROJECT, 1);
+	print "</td></tr>";
 }
 
 print '</table>';
@@ -263,7 +263,7 @@ print '</div>';
 
 print '<div class="clearboth"></div>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '<br>';
 
@@ -277,11 +277,11 @@ $listofreferent = array(
 	'title'=>"ListProposalsAssociatedProject",
 	'class'=>'Propal',
 	'table'=>'propal',
-    'datefieldname'=>'datep',
-    'urlnew'=>DOL_URL_ROOT.'/comm/propal/card.php?action=create&origin=project&originid='.$id.'&socid='.$socid,
-    'lang'=>'propal',
-    'buttonnew'=>'AddProp',
-    'testnew'=>$user->rights->propal->creer,
+	'datefieldname'=>'datep',
+	'urlnew'=>DOL_URL_ROOT.'/comm/propal/card.php?action=create&origin=project&originid='.$id.'&socid='.$socid,
+	'lang'=>'propal',
+	'buttonnew'=>'AddProp',
+	'testnew'=>$user->rights->propal->creer,
 	'test'=>$conf->propal->enabled && $user->rights->propale->lire),
 'order'=>array(
 	'name'=>"CustomersOrders",
@@ -289,11 +289,11 @@ $listofreferent = array(
 	'class'=>'Commande',
 	'table'=>'commande',
 	'datefieldname'=>'date_commande',
-    'urlnew'=>DOL_URL_ROOT.'/commande/card.php?action=create&projectid='.$id.'&socid='.$socid,
-    'lang'=>'orders',
-    'buttonnew'=>'CreateOrder',
-    'testnew'=>$user->rights->commande->creer,
-    'test'=>$conf->commande->enabled && $user->rights->commande->lire),
+	'urlnew'=>DOL_URL_ROOT.'/commande/card.php?action=create&projectid='.$id.'&socid='.$socid,
+	'lang'=>'orders',
+	'buttonnew'=>'CreateOrder',
+	'testnew'=>$user->rights->commande->creer,
+	'test'=>$conf->commande->enabled && $user->rights->commande->lire),
 'invoice'=>array(
 	'name'=>"CustomersInvoices",
 	'title'=>"ListInvoicesAssociatedProject",
@@ -301,22 +301,22 @@ $listofreferent = array(
 	'margin'=>'add',
 	'table'=>'facture',
 	'datefieldname'=>'datef',
-    'urlnew'=>DOL_URL_ROOT.'/compta/facture/card.php?action=create&projectid='.$id.'&socid='.$socid,
-    'lang'=>'bills',
-    'buttonnew'=>'CreateBill',
-    'testnew'=>$user->rights->facture->creer,
-    'test'=>$conf->facture->enabled && $user->rights->facture->lire),
+	'urlnew'=>DOL_URL_ROOT.'/compta/facture/card.php?action=create&projectid='.$id.'&socid='.$socid,
+	'lang'=>'bills',
+	'buttonnew'=>'CreateBill',
+	'testnew'=>$user->rights->facture->creer,
+	'test'=>$conf->facture->enabled && $user->rights->facture->lire),
 'invoice_predefined'=>array(
 	'name'=>"PredefinedInvoices",
 	'title'=>"ListPredefinedInvoicesAssociatedProject",
 	'class'=>'FactureRec',
 	'table'=>'facture_rec',
 	'datefieldname'=>'datec',
-    'urlnew'=>DOL_URL_ROOT.'/compta/facture/card.php?action=create&projectid='.$id.'&socid='.$socid,
-    'lang'=>'bills',
-    'buttonnew'=>'CreateBill',
-    'testnew'=>$user->rights->facture->creer,
-    'test'=>$conf->facture->enabled && $user->rights->facture->lire),
+	'urlnew'=>DOL_URL_ROOT.'/compta/facture/card.php?action=create&projectid='.$id.'&socid='.$socid,
+	'lang'=>'bills',
+	'buttonnew'=>'CreateBill',
+	'testnew'=>$user->rights->facture->creer,
+	'test'=>$conf->facture->enabled && $user->rights->facture->lire),
 'proposal_supplier'=>array(
 	'name'=>"SuppliersProposals",
 	'title'=>"ListSupplierProposalsAssociatedProject",
@@ -324,21 +324,21 @@ $listofreferent = array(
 	'table'=>'supplier_proposal',
 	'datefieldname'=>'date_valid',
 	'urlnew'=>DOL_URL_ROOT.'/supplier_proposal/card.php?action=create&projectid='.$id, // No socid parameter here, the socid is often the customer and we create a supplier object
-    'lang'=>'supplier_proposal',
-    'buttonnew'=>'AddSupplierProposal',
-    'testnew'=>$user->rights->supplier_proposal->creer,
-    'test'=>$conf->supplier_proposal->enabled && $user->rights->supplier_proposal->lire),
+	'lang'=>'supplier_proposal',
+	'buttonnew'=>'AddSupplierProposal',
+	'testnew'=>$user->rights->supplier_proposal->creer,
+	'test'=>$conf->supplier_proposal->enabled && $user->rights->supplier_proposal->lire),
 'order_supplier'=>array(
 	'name'=>"SuppliersOrders",
 	'title'=>"ListSupplierOrdersAssociatedProject",
 	'class'=>'CommandeFournisseur',
 	'table'=>'commande_fournisseur',
 	'datefieldname'=>'date_commande',
-    'urlnew'=>DOL_URL_ROOT.'/fourn/commande/card.php?action=create&projectid='.$id, // No socid parameter here, the socid is often the customer and we create a supplier object
-    'lang'=>'suppliers',
-    'buttonnew'=>'AddSupplierOrder',
-    'testnew'=>$user->rights->fournisseur->commande->creer,
-    'test'=>$conf->supplier_order->enabled && $user->rights->fournisseur->commande->lire),
+	'urlnew'=>DOL_URL_ROOT.'/fourn/commande/card.php?action=create&projectid='.$id, // No socid parameter here, the socid is often the customer and we create a supplier object
+	'lang'=>'suppliers',
+	'buttonnew'=>'AddSupplierOrder',
+	'testnew'=>$user->rights->fournisseur->commande->creer,
+	'test'=>$conf->supplier_order->enabled && $user->rights->fournisseur->commande->lire),
 'invoice_supplier'=>array(
 	'name'=>"BillsSuppliers",
 	'title'=>"ListSupplierInvoicesAssociatedProject",
@@ -347,21 +347,21 @@ $listofreferent = array(
 	'table'=>'facture_fourn',
 	'datefieldname'=>'datef',
 	'urlnew'=>DOL_URL_ROOT.'/fourn/facture/card.php?action=create&projectid='.$id, // No socid parameter here, the socid is often the customer and we create a supplier object
-    'lang'=>'suppliers',
-    'buttonnew'=>'AddSupplierInvoice',
-    'testnew'=>$user->rights->fournisseur->facture->creer,
-    'test'=>$conf->supplier_invoice->enabled && $user->rights->fournisseur->facture->lire),
+	'lang'=>'suppliers',
+	'buttonnew'=>'AddSupplierInvoice',
+	'testnew'=>$user->rights->fournisseur->facture->creer,
+	'test'=>$conf->supplier_invoice->enabled && $user->rights->fournisseur->facture->lire),
 'contract'=>array(
 	'name'=>"Contracts",
 	'title'=>"ListContractAssociatedProject",
 	'class'=>'Contrat',
 	'table'=>'contrat',
 	'datefieldname'=>'date_contrat',
-    'urlnew'=>DOL_URL_ROOT.'/contrat/card.php?action=create&projectid='.$id.'&socid='.$socid,
-    'lang'=>'contracts',
-    'buttonnew'=>'AddContract',
-    'testnew'=>$user->rights->contrat->creer,
-    'test'=>$conf->contrat->enabled && $user->rights->contrat->lire),
+	'urlnew'=>DOL_URL_ROOT.'/contrat/card.php?action=create&projectid='.$id.'&socid='.$socid,
+	'lang'=>'contracts',
+	'buttonnew'=>'AddContract',
+	'testnew'=>$user->rights->contrat->creer,
+	'test'=>$conf->contrat->enabled && $user->rights->contrat->lire),
 'intervention'=>array(
 	'name'=>"Interventions",
 	'title'=>"ListFichinterAssociatedProject",
@@ -370,13 +370,13 @@ $listofreferent = array(
 	'datefieldname'=>'date_valid',
 	'disableamount'=>0,
 	'margin'=>'minus',
-    'urlnew'=>DOL_URL_ROOT.'/fichinter/card.php?action=create&origin=project&originid='.$id.'&socid='.$socid,
-    'lang'=>'interventions',
-    'buttonnew'=>'AddIntervention',
-    'testnew'=>$user->rights->ficheinter->creer,
-    'test'=>$conf->ficheinter->enabled && $user->rights->ficheinter->lire),
+	'urlnew'=>DOL_URL_ROOT.'/fichinter/card.php?action=create&origin=project&originid='.$id.'&socid='.$socid,
+	'lang'=>'interventions',
+	'buttonnew'=>'AddIntervention',
+	'testnew'=>$user->rights->ficheinter->creer,
+	'test'=>$conf->ficheinter->enabled && $user->rights->ficheinter->lire),
 'shipping'=>array(
-    'name'=>"Shippings",
+	'name'=>"Shippings",
 	'title'=>"ListShippingAssociatedProject",
 	'class'=>'Expedition',
 	'table'=>'expedition',
@@ -406,11 +406,11 @@ $listofreferent = array(
 	'datefieldname'=>'dated',
 	'margin'=>'minus',
 	'disableamount'=>1,
-    'urlnew'=>DOL_URL_ROOT.'/deplacement/card.php?action=create&projectid='.$id.'&socid='.$socid,
-    'lang'=>'trips',
-    'buttonnew'=>'AddTrip',
-    'testnew'=>$user->rights->deplacement->creer,
-    'test'=>$conf->deplacement->enabled && $user->rights->deplacement->lire),
+	'urlnew'=>DOL_URL_ROOT.'/deplacement/card.php?action=create&projectid='.$id.'&socid='.$socid,
+	'lang'=>'trips',
+	'buttonnew'=>'AddTrip',
+	'testnew'=>$user->rights->deplacement->creer,
+	'test'=>$conf->deplacement->enabled && $user->rights->deplacement->lire),
 'expensereport'=>array(
 	'name'=>"ExpenseReports",
 	'title'=>"ListExpenseReportsAssociatedProject",
@@ -419,11 +419,11 @@ $listofreferent = array(
 	'datefieldname'=>'date',
 	'margin'=>'minus',
 	'disableamount'=>0,
-    'urlnew'=>DOL_URL_ROOT.'/expensereport/card.php?action=create&projectid='.$id.'&socid='.$socid,
-    'lang'=>'trips',
-    'buttonnew'=>'AddTrip',
-    'testnew'=>$user->rights->expensereport->creer,
-    'test'=>$conf->expensereport->enabled && $user->rights->expensereport->lire),
+	'urlnew'=>DOL_URL_ROOT.'/expensereport/card.php?action=create&projectid='.$id.'&socid='.$socid,
+	'lang'=>'trips',
+	'buttonnew'=>'AddTrip',
+	'testnew'=>$user->rights->expensereport->creer,
+	'test'=>$conf->expensereport->enabled && $user->rights->expensereport->lire),
 'donation'=>array(
 	'name'=>"Donation",
 	'title'=>"ListDonationsAssociatedProject",
@@ -432,11 +432,11 @@ $listofreferent = array(
 	'table'=>'don',
 	'datefieldname'=>'datedon',
 	'disableamount'=>0,
-    'urlnew'=>DOL_URL_ROOT.'/don/card.php?action=create&projectid='.$id.'&socid='.$socid,
-    'lang'=>'donations',
-    'buttonnew'=>'AddDonation',
-    'testnew'=>$user->rights->don->creer,
-    'test'=>$conf->don->enabled && $user->rights->don->lire),
+	'urlnew'=>DOL_URL_ROOT.'/don/card.php?action=create&projectid='.$id.'&socid='.$socid,
+	'lang'=>'donations',
+	'buttonnew'=>'AddDonation',
+	'testnew'=>$user->rights->don->creer,
+	'test'=>$conf->don->enabled && $user->rights->don->lire),
 'loan'=>array(
 	'name'=>"Loan",
 	'title'=>"ListLoanAssociatedProject",
@@ -445,24 +445,24 @@ $listofreferent = array(
 	'table'=>'loan',
 	'datefieldname'=>'datestart',
 	'disableamount'=>0,
-    'urlnew'=>DOL_URL_ROOT.'/loan/card.php?action=create&projectid='.$id.'&socid='.$socid,
-    'lang'=>'loan',
-    'buttonnew'=>'AddLoan',
-    'testnew'=>$user->rights->loan->write,
-    'test'=>$conf->loan->enabled && $user->rights->loan->read),
+	'urlnew'=>DOL_URL_ROOT.'/loan/card.php?action=create&projectid='.$id.'&socid='.$socid,
+	'lang'=>'loan',
+	'buttonnew'=>'AddLoan',
+	'testnew'=>$user->rights->loan->write,
+	'test'=>$conf->loan->enabled && $user->rights->loan->read),
 'chargesociales'=>array(
-    'name'=>"SocialContribution",
-    'title'=>"ListSocialContributionAssociatedProject",
-    'class'=>'ChargeSociales',
-    'margin'=>'minus',
-    'table'=>'chargesociales',
-    'datefieldname'=>'date_ech',
-    'disableamount'=>0,
-    'urlnew'=>DOL_URL_ROOT.'/compta/sociales/card.php?action=create&projectid='.$id,
-    'lang'=>'compta',
-    'buttonnew'=>'AddSocialContribution',
-    'testnew'=>$user->rights->tax->charges->lire,
-    'test'=>$conf->tax->enabled && $user->rights->tax->charges->lire),
+	'name'=>"SocialContribution",
+	'title'=>"ListSocialContributionAssociatedProject",
+	'class'=>'ChargeSociales',
+	'margin'=>'minus',
+	'table'=>'chargesociales',
+	'datefieldname'=>'date_ech',
+	'disableamount'=>0,
+	'urlnew'=>DOL_URL_ROOT.'/compta/sociales/card.php?action=create&projectid='.$id,
+	'lang'=>'compta',
+	'buttonnew'=>'AddSocialContribution',
+	'testnew'=>$user->rights->tax->charges->lire,
+	'test'=>$conf->tax->enabled && $user->rights->tax->charges->lire),
 'project_task'=>array(
 	'name'=>"TaskTimeSpent",
 	'title'=>"ListTaskTimeUserProject",
@@ -471,10 +471,10 @@ $listofreferent = array(
 	'table'=>'projet_task',
 	'datefieldname'=>'task_date',
 	'disableamount'=>0,
-    'urlnew'=>DOL_URL_ROOT.'/projet/tasks/time.php?withproject=1&action=createtime&projectid='.$id,
-    'buttonnew'=>'AddTimeSpent',
-    'testnew'=>$user->rights->projet->creer,
-    'test'=>($conf->projet->enabled && $user->rights->projet->lire && empty($conf->global->PROJECT_HIDE_TASKS))),
+	'urlnew'=>DOL_URL_ROOT.'/projet/tasks/time.php?withproject=1&action=createtime&projectid='.$id,
+	'buttonnew'=>'AddTimeSpent',
+	'testnew'=>$user->rights->projet->creer,
+	'test'=>($conf->projet->enabled && $user->rights->projet->lire && empty($conf->global->PROJECT_HIDE_TASKS))),
 'stock_mouvement'=>array(
 	'name'=>"MouvementStockAssociated",
 	'title'=>"ListMouvementStockProject",
@@ -505,11 +505,11 @@ $listofreferent = array(
 	'datefieldname'=>'datev',
 	'margin'=>'minus',
 	'disableamount'=>0,
-    'urlnew'=>DOL_URL_ROOT.'/compta/bank/various_payment/card.php?action=create&projectid='.$id,
-    'lang'=>'banks',
-    'buttonnew'=>'AddVariousPayment',
-    'testnew'=>$user->rights->banque->modifier,
-    'test'=>$conf->banque->enabled && $user->rights->banque->lire && empty($conf->global->BANK_USE_OLD_VARIOUS_PAYMENT)),
+	'urlnew'=>DOL_URL_ROOT.'/compta/bank/various_payment/card.php?action=create&projectid='.$id,
+	'lang'=>'banks',
+	'buttonnew'=>'AddVariousPayment',
+	'testnew'=>$user->rights->banque->modifier,
+	'test'=>$conf->banque->enabled && $user->rights->banque->lire && empty($conf->global->BANK_USE_OLD_VARIOUS_PAYMENT)),
 /* No need for this, available on dedicated tab "Agenda/Events"
 'agenda'=>array(
 	'name'=>"Agenda",
@@ -527,7 +527,7 @@ $listofreferent = array(
 );
 
 // Change rules for profit/benefit calculation
-if (! empty($conf->global->PROJECT_ELEMENTS_FOR_PLUS_MARGIN)) {
+if (!empty($conf->global->PROJECT_ELEMENTS_FOR_PLUS_MARGIN)) {
 	foreach ($listofreferent as $key => $element) {
 		if ($listofreferent[$key]['margin'] == 'add') {
 			unset($listofreferent[$key]['margin']);
@@ -535,10 +535,10 @@ if (! empty($conf->global->PROJECT_ELEMENTS_FOR_PLUS_MARGIN)) {
 	}
 	$newelementforplusmargin = explode(',', $conf->global->PROJECT_ELEMENTS_FOR_PLUS_MARGIN);
 	foreach ($newelementforplusmargin as $value) {
-		$listofreferent[trim($value)]['margin']='add';
+		$listofreferent[trim($value)]['margin'] = 'add';
 	}
 }
-if (! empty($conf->global->PROJECT_ELEMENTS_FOR_MINUS_MARGIN)) {
+if (!empty($conf->global->PROJECT_ELEMENTS_FOR_MINUS_MARGIN)) {
 	foreach ($listofreferent as $key => $element) {
 		if ($listofreferent[$key]['margin'] == 'minus') {
 			unset($listofreferent[$key]['margin']);
@@ -546,7 +546,7 @@ if (! empty($conf->global->PROJECT_ELEMENTS_FOR_MINUS_MARGIN)) {
 	}
 	$newelementforminusmargin = explode(',', $conf->global->PROJECT_ELEMENTS_FOR_MINUS_MARGIN);
 	foreach ($newelementforminusmargin as $value) {
-		$listofreferent[trim($value)]['margin']='minus';
+		$listofreferent[trim($value)]['margin'] = 'minus';
 	}
 }
 
@@ -571,7 +571,7 @@ if ($action == "addelement")
 } elseif ($action == "unlink")
 {
 	$tablename = GETPOST("tablename", "aZ09");
-    $projectField = GETPOSTISSET('projectfield') ? GETPOST('projectfield', 'aZ09') : 'fk_projet';
+	$projectField = GETPOSTISSET('projectfield') ? GETPOST('projectfield', 'aZ09') : 'fk_projet';
 	$elementselectid = GETPOST("elementselect", "int");
 
 	$result = $object->remove_element($tablename, $elementselectid, $projectField);
@@ -590,9 +590,9 @@ $showdatefilter = 0;
 if (!$showdatefilter)
 {
 	print '<div class="center centpercent">';
-    print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="POST">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    print '<input type="hidden" name="tablename" value="'.$tablename.'">';
+	print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="POST">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="tablename" value="'.$tablename.'">';
 	print '<input type="hidden" name="action" value="view">';
 	print '<div class="inline-block">';
 	print $form->selectDate($dates, 'dates', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("From"));
@@ -632,10 +632,10 @@ foreach ($listofreferent as $key => $value)
 	if ($qualified && isset($margin))		// If this element must be included into profit calculation ($margin is 'minus' or 'add')
 	{
 		if ($margin == 'add') {
-			$tooltiponprofitplus.=' &gt; '.$name." (+)<br>\n";
+			$tooltiponprofitplus .= ' &gt; '.$name." (+)<br>\n";
 		}
 		if ($margin == 'minus') {
-			$tooltiponprofitminus.=' &gt; '.$name." (-)<br>\n";
+			$tooltiponprofitminus .= ' &gt; '.$name." (-)<br>\n";
 		}
 	}
 }
@@ -685,8 +685,8 @@ foreach ($listofreferent as $key => $value)
 				$qualifiedfortotal = true;
 				if ($key == 'invoice')
 				{
-				    if (!empty($element->close_code) && $element->close_code == 'replaced') $qualifiedfortotal = false; // Replacement invoice, do not include into total
-				    if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS) && $element->type == Facture::TYPE_DEPOSIT) $qualifiedfortotal = false; // If hidden option to use deposits as payment (deprecated, not recommended to use this), deposits are not included
+					if (!empty($element->close_code) && $element->close_code == 'replaced') $qualifiedfortotal = false; // Replacement invoice, do not include into total
+					if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS) && $element->type == Facture::TYPE_DEPOSIT) $qualifiedfortotal = false; // If hidden option to use deposits as payment (deprecated, not recommended to use this), deposits are not included
 				}
 				if ($key == 'propal')
 				{
@@ -710,29 +710,29 @@ foreach ($listofreferent as $key => $value)
 						$total_ht_by_line = price2num($tmp['amount'], 'MT');
 					}
 				} elseif ($key == 'loan') {
-                    if ((empty($dates) && empty($datee)) || (intval($dates) <= $element->datestart && intval($datee) >= $element->dateend)) {
-                        // Get total loan
-                        $total_ht_by_line = -$element->capital;
-                    } else {
-                        // Get loan schedule according to date filter
-                        $total_ht_by_line = 0;
-                        $loanScheduleStatic = new LoanSchedule($element->db);
-                        $loanScheduleStatic->fetchAll($element->id);
-                        if (!empty($loanScheduleStatic->lines)) {
-                            foreach ($loanScheduleStatic->lines as $loanSchedule) {
-                                /**
-                                 * @var $loanSchedule LoanSchedule
-                                 */
-                                if (($loanSchedule->datep >= $dates && $loanSchedule->datep <= $datee) // dates filter is defined
-                                    || !empty($dates) && empty($datee) && $loanSchedule->datep >= $dates && $loanSchedule->datep <= dol_now()
-                                    || empty($dates) && !empty($datee) && $loanSchedule->datep <= $datee
-                                ) {
-                                    $total_ht_by_line -= $loanSchedule->amount_capital;
-                                }
-                            }
-                        }
-                    }
-                } else $total_ht_by_line = $element->total_ht;
+					if ((empty($dates) && empty($datee)) || (intval($dates) <= $element->datestart && intval($datee) >= $element->dateend)) {
+						// Get total loan
+						$total_ht_by_line = -$element->capital;
+					} else {
+						// Get loan schedule according to date filter
+						$total_ht_by_line = 0;
+						$loanScheduleStatic = new LoanSchedule($element->db);
+						$loanScheduleStatic->fetchAll($element->id);
+						if (!empty($loanScheduleStatic->lines)) {
+							foreach ($loanScheduleStatic->lines as $loanSchedule) {
+								/**
+								 * @var $loanSchedule LoanSchedule
+								 */
+								if (($loanSchedule->datep >= $dates && $loanSchedule->datep <= $datee) // dates filter is defined
+									|| !empty($dates) && empty($datee) && $loanSchedule->datep >= $dates && $loanSchedule->datep <= dol_now()
+									|| empty($dates) && !empty($datee) && $loanSchedule->datep <= $datee
+								) {
+									$total_ht_by_line -= $loanSchedule->amount_capital;
+								}
+							}
+						}
+					}
+				} else $total_ht_by_line = $element->total_ht;
 
 				// Define $total_ttc_by_line
 				if ($tablename == 'don' || $tablename == 'chargesociales' || $tablename == 'payment_various' || $tablename == 'payment_salary') $total_ttc_by_line = $element->amount;
@@ -743,24 +743,24 @@ foreach ($listofreferent as $key => $value)
 					$defaultvat = get_default_tva($mysoc, $mysoc);
 					$total_ttc_by_line = price2num($total_ht_by_line * (1 + ($defaultvat / 100)), 'MT');
 				} elseif ($key == 'loan') {
-                        $total_ttc_by_line = $total_ht_by_line; // For loan there is actually no taxe managed in Dolibarr
-                } else $total_ttc_by_line = $element->total_ttc;
+						$total_ttc_by_line = $total_ht_by_line; // For loan there is actually no taxe managed in Dolibarr
+				} else $total_ttc_by_line = $element->total_ttc;
 
 				// Change sign of $total_ht_by_line and $total_ttc_by_line for some cases
 				if ($tablename == 'payment_various')
 				{
-			        if ($element->sens == 1)
-			        {
-			            $total_ht_by_line = -$total_ht_by_line;
-			            $total_ttc_by_line = -$total_ttc_by_line;
-			        }
+					if ($element->sens == 1)
+					{
+						$total_ht_by_line = -$total_ht_by_line;
+						$total_ttc_by_line = -$total_ttc_by_line;
+					}
 				}
 
 				// Add total if we have to
 				if ($qualifiedfortotal)
 				{
-				    $total_ht = $total_ht + $total_ht_by_line;
-				    $total_ttc = $total_ttc + $total_ttc_by_line;
+					$total_ht = $total_ht + $total_ht_by_line;
+					$total_ttc = $total_ttc + $total_ttc_by_line;
 				}
 			}
 
@@ -777,7 +777,7 @@ foreach ($listofreferent as $key => $value)
 					$total_revenue_ht += $total_ht;
 				}
 
-			    if ($margin != "add")	// Revert sign
+				if ($margin != "add")	// Revert sign
 				{
 					$total_ht = -$total_ht;
 					$total_ttc = -$total_ttc;
@@ -847,7 +847,7 @@ foreach ($listofreferent as $key => $value)
 	$langtoload = $value['lang'];
 	$urlnew = $value['urlnew'];
 	$buttonnew = $value['buttonnew'];
-    $testnew = $value['testnew'];
+	$testnew = $value['testnew'];
 	$project_field = $value['project_field'];
 
 	$exclude_select_element = array('payment_various');
@@ -858,7 +858,7 @@ foreach ($listofreferent as $key => $value)
 		// If we want the project task array to have details of users
 		//if ($key == 'project_task') $key = 'project_task_time';
 
-	    if ($langtoload) $langs->load($langtoload);
+		if ($langtoload) $langs->load($langtoload);
 
 		$element = new $classname($db);
 
@@ -868,12 +868,12 @@ foreach ($listofreferent as $key => $value)
 		$array_of_element_linkable_with_different_thirdparty = array('facture_fourn', 'commande_fournisseur');
 		if (!in_array($tablename, $array_of_element_linkable_with_different_thirdparty))
 		{
-		    $idtofilterthirdparty = $object->thirdparty->id;
-		    if (!empty($conf->global->PROJECT_OTHER_THIRDPARTY_ID_TO_ADD_ELEMENTS)) $idtofilterthirdparty .= ','.$conf->global->PROJECT_OTHER_THIRDPARTY_ID_TO_ADD_ELEMENTS;
+			$idtofilterthirdparty = $object->thirdparty->id;
+			if (!empty($conf->global->PROJECT_OTHER_THIRDPARTY_ID_TO_ADD_ELEMENTS)) $idtofilterthirdparty .= ','.$conf->global->PROJECT_OTHER_THIRDPARTY_ID_TO_ADD_ELEMENTS;
 		}
 
-       	if (empty($conf->global->PROJECT_LINK_ON_OVERWIEW_DISABLED) && $idtofilterthirdparty && !in_array($tablename, $exclude_select_element))
-       	{
+	   	if (empty($conf->global->PROJECT_LINK_ON_OVERWIEW_DISABLED) && $idtofilterthirdparty && !in_array($tablename, $exclude_select_element))
+	   	{
 			$selectList = $formproject->select_element($tablename, $idtofilterthirdparty, 'minwidth300 minwidth75imp', -2, !empty($project_field) ? $project_field : 'fk_projet');
 			if ($selectList < 0)
 			{
@@ -881,10 +881,10 @@ foreach ($listofreferent as $key => $value)
 			} elseif ($selectList)
 			{
 				// Define form with the combo list of elements to link
-			    $addform .= '<div class="inline-block valignmiddle">';
-			    $addform .= '<form action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
-			    $addform .= '<input type="hidden" name="token" value="'.newToken().'">';
-			    $addform .= '<input type="hidden" name="tablename" value="'.$tablename.'">';
+				$addform .= '<div class="inline-block valignmiddle">';
+				$addform .= '<form action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
+				$addform .= '<input type="hidden" name="token" value="'.newToken().'">';
+				$addform .= '<input type="hidden" name="tablename" value="'.$tablename.'">';
 				$addform .= '<input type="hidden" name="action" value="addelement">';
 				$addform .= '<input type="hidden" name="datesrfc" value="'.dol_print_date($dates, 'dayhourrfc').'">';
 				$addform .= '<input type="hidden" name="dateerfc" value="'.dol_print_date($datee, 'dayhourrfc').'">';
@@ -903,7 +903,7 @@ foreach ($listofreferent as $key => $value)
 			elseif (empty($conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED)) {
 				$addform .= '<a class="buttonxxx buttonRefused" disabled="disabled" href="#"><span class="valignmiddle text-plus-circle hideonsmartphone">'.($buttonnew ? $langs->trans($buttonnew) : $langs->trans("Create")).'</span><span class="fa fa-plus-circle valignmiddle paddingleft"></span></a>';
 			}
-            $addform .= '<div>';
+			$addform .= '<div>';
 		}
 
 		print load_fiche_titre($langs->trans($title), $addform, '');
@@ -929,9 +929,9 @@ foreach ($listofreferent as $key => $value)
 		elseif (in_array($tablename, array('expensereport_det', 'don', 'projet_task', 'stock_mouvement', 'payment_salary'))) print $langs->trans("User");
 		else print $langs->trans("ThirdParty");
 		print '</td>';
-        // Duration of intervention
+		// Duration of intervention
 		if ($tablename == 'fichinter')
-                {
+				{
 			print '<td>';
 			print $langs->trans("TotalDuration");
 			$total_duration = 0;
@@ -940,13 +940,13 @@ foreach ($listofreferent as $key => $value)
 		// Amount HT
 		//if (empty($value['disableamount']) && ! in_array($tablename, array('projet_task'))) print '<td class="right" width="120">'.$langs->trans("AmountHT").'</td>';
 		//elseif (empty($value['disableamount']) && in_array($tablename, array('projet_task'))) print '<td class="right" width="120">'.$langs->trans("Amount").'</td>';
-        if ($key == 'loan') print '<td class="right" width="120">'.$langs->trans("LoanCapital").'</td>';
+		if ($key == 'loan') print '<td class="right" width="120">'.$langs->trans("LoanCapital").'</td>';
 		elseif (empty($value['disableamount'])) print '<td class="right" width="120">'.$langs->trans("AmountHT").'</td>';
 		else print '<td width="120"></td>';
 		// Amount TTC
 		//if (empty($value['disableamount']) && ! in_array($tablename, array('projet_task'))) print '<td class="right" width="120">'.$langs->trans("AmountTTC").'</td>';
-        if ($key == 'loan') print '<td class="right" width="120">'.$langs->trans("RemainderToPay").'</td>';
-        elseif (empty($value['disableamount'])) print '<td class="right" width="120">'.$langs->trans("AmountTTC").'</td>';
+		if ($key == 'loan') print '<td class="right" width="120">'.$langs->trans("RemainderToPay").'</td>';
+		elseif (empty($value['disableamount'])) print '<td class="right" width="120">'.$langs->trans("AmountTTC").'</td>';
 		else print '<td width="120"></td>';
 		// Status
 		if (in_array($tablename, array('projet_task'))) print '<td class="right" width="200">'.$langs->trans("ProgressDeclared").'</td>';
@@ -1037,9 +1037,9 @@ foreach ($listofreferent as $key => $value)
 						print $element->getNomUrl(1, 'withproject', 'time');
 						print ' - '.dol_trunc($element->label, 48);
 					} elseif ($key == 'loan') {
-                        print $element->getNomUrl(1);
-                        print ' - '.dol_trunc($element->label, 48);
-                    } else print $element->getNomUrl(1);
+						print $element->getNomUrl(1);
+						print ' - '.dol_trunc($element->label, 48);
+					} else print $element->getNomUrl(1);
 
 					$element_doc = $element->element;
 					$filename = dol_sanitizeFileName($element->ref);
@@ -1072,65 +1072,65 @@ foreach ($listofreferent as $key => $value)
 				elseif ($tablename == 'chargesociales') $date = $element->date_ech;
 				elseif (!empty($element->status) || !empty($element->statut) || !empty($element->fk_status))
 				{
-				    if ($tablename == 'don') $date = $element->datedon;
-				    if ($tablename == 'commande_fournisseur' || $tablename == 'supplier_order')
-    				{
-    				    $date = ($element->date_commande ? $element->date_commande : $element->date_valid);
-    				} elseif ($tablename == 'supplier_proposal') $date = $element->date_validation; // There is no other date for this
-    				elseif ($tablename == 'fichinter') $date = $element->datev; // There is no other date for this
-    				elseif ($tablename == 'projet_task') $date = ''; // We show no date. Showing date of beginning of task make user think it is date of time consumed
+					if ($tablename == 'don') $date = $element->datedon;
+					if ($tablename == 'commande_fournisseur' || $tablename == 'supplier_order')
+					{
+						$date = ($element->date_commande ? $element->date_commande : $element->date_valid);
+					} elseif ($tablename == 'supplier_proposal') $date = $element->date_validation; // There is no other date for this
+					elseif ($tablename == 'fichinter') $date = $element->datev; // There is no other date for this
+					elseif ($tablename == 'projet_task') $date = ''; // We show no date. Showing date of beginning of task make user think it is date of time consumed
 					else {
-    					$date = $element->date; // invoice, ...
-    					if (empty($date)) $date = $element->date_contrat;
-    					if (empty($date)) $date = $element->datev;
-    					if (empty($date) && !empty($datefieldname)) {
-    						$date = $element->$datefieldname;
-    					}
-    				}
+						$date = $element->date; // invoice, ...
+						if (empty($date)) $date = $element->date_contrat;
+						if (empty($date)) $date = $element->datev;
+						if (empty($date) && !empty($datefieldname)) {
+							$date = $element->$datefieldname;
+						}
+					}
 				} elseif ($key == 'loan') {
-                    $date = $element->datestart;
-                }
+					$date = $element->datestart;
+				}
 
 				print '<td class="center">';
 				if ($tablename == 'actioncomm')
 				{
-				    print dol_print_date($element->datep, 'dayhour');
-				    if ($element->datef && $element->datef > $element->datep) print " - ".dol_print_date($element->datef, 'dayhour');
+					print dol_print_date($element->datep, 'dayhour');
+					if ($element->datef && $element->datef > $element->datep) print " - ".dol_print_date($element->datef, 'dayhour');
 				} elseif (in_array($tablename, array('projet_task')))
 				{
-				    $tmpprojtime = $element->getSumOfAmount($elementuser, $dates, $datee); // $element is a task. $elementuser may be empty
-                    print '<a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?id='.$idofelement.'&withproject=1">';
-				    print convertSecondToTime($tmpprojtime['nbseconds'], 'allhourmin');
-                	print '</a>';
-				    $total_time_by_line = $tmpprojtime['nbseconds'];
+					$tmpprojtime = $element->getSumOfAmount($elementuser, $dates, $datee); // $element is a task. $elementuser may be empty
+					print '<a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?id='.$idofelement.'&withproject=1">';
+					print convertSecondToTime($tmpprojtime['nbseconds'], 'allhourmin');
+					print '</a>';
+					$total_time_by_line = $tmpprojtime['nbseconds'];
 				} else print dol_print_date($date, 'day');
 				print '</td>';
 
 				// Third party or user
-                print '<td class="left">';
-                if (is_object($element->thirdparty)) {
-                    print $element->thirdparty->getNomUrl(1, '', 48);
-                } elseif ($tablename == 'expensereport_det') {
-                	$tmpuser = new User($db);
-                	$tmpuser->fetch($expensereport->fk_user_author);
-                	print $tmpuser->getNomUrl(1, '', 48);
-                } elseif ($tablename == 'payment_salary')
+				print '<td class="left">';
+				if (is_object($element->thirdparty)) {
+					print $element->thirdparty->getNomUrl(1, '', 48);
+				} elseif ($tablename == 'expensereport_det') {
+					$tmpuser = new User($db);
+					$tmpuser->fetch($expensereport->fk_user_author);
+					print $tmpuser->getNomUrl(1, '', 48);
+				} elseif ($tablename == 'payment_salary')
 				{
 					$tmpuser = new User($db);
 					$tmpuser->fetch($element->fk_user);
 					print $tmpuser->getNomUrl(1, '', 48);
 				} elseif ($tablename == 'don' || $tablename == 'stock_mouvement')
-                {
-                	if ($element->fk_user_author > 0)
-                	{
-	                	$tmpuser2 = new User($db);
-	                	$tmpuser2->fetch($element->fk_user_author);
-	                	print $tmpuser2->getNomUrl(1, '', 48);
-                	}
-                } elseif ($tablename == 'projet_task' && $key == 'project_task_time')	// if $key == 'project_task', we don't want details per user
-                {
-                    print $elementuser->getNomUrl(1);
-                }
+				{
+					if ($element->fk_user_author > 0)
+					{
+						$tmpuser2 = new User($db);
+						$tmpuser2->fetch($element->fk_user_author);
+						print $tmpuser2->getNomUrl(1, '', 48);
+					}
+				} elseif ($tablename == 'projet_task' && $key == 'project_task_time')	// if $key == 'project_task', we don't want details per user
+				{
+					print $elementuser->getNomUrl(1);
+				}
 				print '</td>';
 
 				// Add duration and store it in counter for fichinter
@@ -1142,29 +1142,29 @@ foreach ($listofreferent as $key => $value)
 					print '</td>';
 				}
 
-                // Amount without tax
+				// Amount without tax
 				$warning = '';
 				if (empty($value['disableamount']))
 				{
-				    $total_ht_by_line = null;
-				    $othermessage = '';
+					$total_ht_by_line = null;
+					$othermessage = '';
 					if ($tablename == 'don' || $tablename == 'chargesociales' || $tablename == 'payment_various' || $tablename == 'payment_salary') $total_ht_by_line = $element->amount;
 					elseif ($tablename == 'fichinter') $total_ht_by_line = $element->getAmount();
 					elseif ($tablename == 'stock_mouvement') $total_ht_by_line = $element->price * abs($element->qty);
 					elseif (in_array($tablename, array('projet_task')))
 					{
-					    if (!empty($conf->salaries->enabled))
-					    {
-        				    // TODO Permission to read daily rate to show value
-					        $total_ht_by_line = price2num($tmpprojtime['amount'], 'MT');
-    						if ($tmpprojtime['nblinesnull'] > 0)
-    						{
-    							$langs->load("errors");
-    							$warning = $langs->trans("WarningSomeLinesWithNullHourlyRate", $conf->currency);
-    						}
-					    } else {
-					        $othermessage = $form->textwithpicto($langs->trans("NotAvailable"), $langs->trans("ModuleSalaryToDefineHourlyRateMustBeEnabled"));
-					    }
+						if (!empty($conf->salaries->enabled))
+						{
+							// TODO Permission to read daily rate to show value
+							$total_ht_by_line = price2num($tmpprojtime['amount'], 'MT');
+							if ($tmpprojtime['nblinesnull'] > 0)
+							{
+								$langs->load("errors");
+								$warning = $langs->trans("WarningSomeLinesWithNullHourlyRate", $conf->currency);
+							}
+						} else {
+							$othermessage = $form->textwithpicto($langs->trans("NotAvailable"), $langs->trans("ModuleSalaryToDefineHourlyRateMustBeEnabled"));
+						}
 					} elseif ($key == 'loan') $total_ht_by_line = $element->capital;
 					else {
 						$total_ht_by_line = $element->total_ht;
@@ -1173,10 +1173,10 @@ foreach ($listofreferent as $key => $value)
 					// Change sign of $total_ht_by_line and $total_ttc_by_line for some cases
 					if ($tablename == 'payment_various')
 					{
-					    if ($element->sens == 0)
-					    {
-					        $total_ht_by_line = -$total_ht_by_line;
-					    }
+						if ($element->sens == 0)
+						{
+							$total_ht_by_line = -$total_ht_by_line;
+						}
 					}
 
 					print '<td class="right">';
@@ -1191,23 +1191,23 @@ foreach ($listofreferent as $key => $value)
 					print '</td>';
 				} else print '<td></td>';
 
-                // Amount inc tax
+				// Amount inc tax
 				if (empty($value['disableamount']))
 				{
-				    $total_ttc_by_line = null;
+					$total_ttc_by_line = null;
 					if ($tablename == 'don' || $tablename == 'chargesociales' || $tablename == 'payment_various' || $tablename == 'payment_salary') $total_ttc_by_line = $element->amount;
 					elseif ($tablename == 'fichinter') $total_ttc_by_line = $element->getAmount();
 					elseif ($tablename == 'stock_mouvement') $total_ttc_by_line = $element->price * abs($element->qty);
 					elseif ($tablename == 'projet_task')
 					{
-					    if (!empty($conf->salaries->enabled))
-					    {
-					        // TODO Permission to read daily rate
-    						$defaultvat = get_default_tva($mysoc, $mysoc);
-    						$total_ttc_by_line = price2num($total_ht_by_line * (1 + ($defaultvat / 100)), 'MT');
-					    } else {
-					        $othermessage = $form->textwithpicto($langs->trans("NotAvailable"), $langs->trans("ModuleSalaryToDefineHourlyRateMustBeEnabled"));
-					    }
+						if (!empty($conf->salaries->enabled))
+						{
+							// TODO Permission to read daily rate
+							$defaultvat = get_default_tva($mysoc, $mysoc);
+							$total_ttc_by_line = price2num($total_ht_by_line * (1 + ($defaultvat / 100)), 'MT');
+						} else {
+							$othermessage = $form->textwithpicto($langs->trans("NotAvailable"), $langs->trans("ModuleSalaryToDefineHourlyRateMustBeEnabled"));
+						}
 					} elseif ($key == 'loan') $total_ttc_by_line = $element->capital - $element->getSumPayment();
 					else {
 						$total_ttc_by_line = $element->total_ttc;
@@ -1216,10 +1216,10 @@ foreach ($listofreferent as $key => $value)
 					// Change sign of $total_ht_by_line and $total_ttc_by_line for some cases
 					if ($tablename == 'payment_various')
 					{
-					    if ($element->sens == 0)
-					    {
-					        $total_ttc_by_line = -$total_ttc_by_line;
-					    }
+						if ($element->sens == 0)
+						{
+							$total_ttc_by_line = -$total_ttc_by_line;
+						}
 					}
 
 					print '<td class="right">';
@@ -1298,21 +1298,21 @@ foreach ($listofreferent as $key => $value)
 			print '<tr class="liste_total"><td colspan="'.$colspan.'">'.$langs->trans("Number").': '.$i.'</td>';
 			if (in_array($tablename, array('projet_task')))
 			{
-    			print '<td class="center">';
-    			print convertSecondToTime($total_time, 'allhourmin');
-    			print '</td>';
-    			print '<td>';
-    			print '</td>';
+				print '<td class="center">';
+				print convertSecondToTime($total_time, 'allhourmin');
+				print '</td>';
+				print '<td>';
+				print '</td>';
 			}
 			//if (empty($value['disableamount']) && ! in_array($tablename, array('projet_task'))) print '<td class="right" width="100">'.$langs->trans("TotalHT").' : '.price($total_ht).'</td>';
 			//elseif (empty($value['disableamount']) && in_array($tablename, array('projet_task'))) print '<td class="right" width="100">'.$langs->trans("Total").' : '.price($total_ht).'</td>';
-                        // If fichinter add the total_duration
-                        if ($tablename == 'fichinter') print '<td class="left">'.convertSecondToTime($total_duration, 'all', $conf->global->MAIN_DURATION_OF_WORKDAY).'</td>';
+						// If fichinter add the total_duration
+						if ($tablename == 'fichinter') print '<td class="left">'.convertSecondToTime($total_duration, 'all', $conf->global->MAIN_DURATION_OF_WORKDAY).'</td>';
 			print '<td class="right">';
 			if (empty($value['disableamount']))
 			{
-                if ($key == 'loan') print $langs->trans("Total").' '.$langs->trans("LoanCapital").' : '.price($total_ttc);
-                elseif ($tablename != 'projet_task' || !empty($conf->salaries->enabled)) print ''.$langs->trans("TotalHT").' : '.price($total_ht);
+				if ($key == 'loan') print $langs->trans("Total").' '.$langs->trans("LoanCapital").' : '.price($total_ttc);
+				elseif ($tablename != 'projet_task' || !empty($conf->salaries->enabled)) print ''.$langs->trans("TotalHT").' : '.price($total_ht);
 			}
 			print '</td>';
 			//if (empty($value['disableamount']) && ! in_array($tablename, array('projet_task'))) print '<td class="right" width="100">'.$langs->trans("TotalTTC").' : '.price($total_ttc).'</td>';
@@ -1320,8 +1320,8 @@ foreach ($listofreferent as $key => $value)
 			print '<td class="right">';
 			if (empty($value['disableamount']))
 			{
-                if ($key == 'loan') print $langs->trans("Total").' '.$langs->trans("RemainderToPay").' : '.price($total_ttc);
-			    elseif ($tablename != 'projet_task' || !empty($conf->salaries->enabled)) print $langs->trans("TotalTTC").' : '.price($total_ttc);
+				if ($key == 'loan') print $langs->trans("Total").' '.$langs->trans("RemainderToPay").' : '.price($total_ttc);
+				elseif ($tablename != 'projet_task' || !empty($conf->salaries->enabled)) print $langs->trans("TotalTTC").' : '.price($total_ttc);
 			}
 			print '</td>';
 			print '<td>&nbsp;</td>';
diff --git a/htdocs/projet/ganttview.php b/htdocs/projet/ganttview.php
index 628bbfc698a..eeb2fcb7659 100644
--- a/htdocs/projet/ganttview.php
+++ b/htdocs/projet/ganttview.php
@@ -96,130 +96,130 @@ if (($id > 0 && is_numeric($id)) || !empty($ref))
 	//$userDelete = $object->restrictedProjectArea($user,'delete');
 	//print "userAccess=".$userAccess." userWrite=".$userWrite." userDelete=".$userDelete;
 
-    $tab = 'tasks';
+	$tab = 'tasks';
 
-    $head = project_prepare_head($object);
-    print dol_get_fiche_head($head, $tab, $langs->trans("Project"), -1, ($object->public ? 'projectpub' : 'project'));
+	$head = project_prepare_head($object);
+	print dol_get_fiche_head($head, $tab, $langs->trans("Project"), -1, ($object->public ? 'projectpub' : 'project'));
 
-    $param = ($mode == 'mine' ? '&mode=mine' : '');
+	$param = ($mode == 'mine' ? '&mode=mine' : '');
 
 
 
-    // Project card
+	// Project card
 
-    $linkback = '<a href="'.DOL_URL_ROOT.'/projet/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+	$linkback = '<a href="'.DOL_URL_ROOT.'/projet/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-    $morehtmlref = '<div class="refidno">';
-    // Title
-    $morehtmlref .= $object->title;
-    // Thirdparty
-    if ($object->thirdparty->id > 0)
-    {
-        $morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1, 'project');
-    }
-    $morehtmlref .= '</div>';
+	$morehtmlref = '<div class="refidno">';
+	// Title
+	$morehtmlref .= $object->title;
+	// Thirdparty
+	if ($object->thirdparty->id > 0)
+	{
+		$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').")";
-    }
+	// 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').")";
+	}
 
-    dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
 
 
-    print '<div class="fichecenter">';
-    print '<div class="fichehalfleft">';
-    print '<div class="underbanner clearboth"></div>';
+	print '<div class="fichecenter">';
+	print '<div class="fichehalfleft">';
+	print '<div class="underbanner clearboth"></div>';
 
-    print '<table class="border tableforfield centpercent">';
+	print '<table class="border tableforfield centpercent">';
 
-    // Usage
-    print '<tr><td class="tdtop">';
-    print $langs->trans("Usage");
-    print '</td>';
-    print '<td>';
-    if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
-    {
-    	print '<input type="checkbox" disabled name="usage_opportunity"'.(GETPOSTISSET('usage_opportunity') ? (GETPOST('usage_opportunity', 'alpha') != '' ? ' checked="checked"' : '') : ($object->usage_opportunity ? ' checked="checked"' : '')).'"> ';
-    	$htmltext = $langs->trans("ProjectFollowOpportunity");
-    	print $form->textwithpicto($langs->trans("ProjectFollowOpportunity"), $htmltext);
-    	print '<br>';
-    }
-    if (empty($conf->global->PROJECT_HIDE_TASKS))
-    {
-    	print '<input type="checkbox" disabled name="usage_task"'.(GETPOSTISSET('usage_task') ? (GETPOST('usage_task', 'alpha') != '' ? ' checked="checked"' : '') : ($object->usage_task ? ' checked="checked"' : '')).'"> ';
-    	$htmltext = $langs->trans("ProjectFollowTasks");
-    	print $form->textwithpicto($langs->trans("ProjectFollowTasks"), $htmltext);
-    	print '<br>';
-    }
-    if (!empty($conf->global->PROJECT_BILL_TIME_SPENT))
-    {
-    	print '<input type="checkbox" disabled name="usage_bill_time"'.(GETPOSTISSET('usage_bill_time') ? (GETPOST('usage_bill_time', 'alpha') != '' ? ' checked="checked"' : '') : ($object->usage_bill_time ? ' checked="checked"' : '')).'"> ';
-    	$htmltext = $langs->trans("ProjectBillTimeDescription");
-    	print $form->textwithpicto($langs->trans("BillTime"), $htmltext);
-    	print '<br>';
-    }
-    print '</td></tr>';
+	// Usage
+	print '<tr><td class="tdtop">';
+	print $langs->trans("Usage");
+	print '</td>';
+	print '<td>';
+	if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
+	{
+		print '<input type="checkbox" disabled name="usage_opportunity"'.(GETPOSTISSET('usage_opportunity') ? (GETPOST('usage_opportunity', 'alpha') != '' ? ' checked="checked"' : '') : ($object->usage_opportunity ? ' checked="checked"' : '')).'"> ';
+		$htmltext = $langs->trans("ProjectFollowOpportunity");
+		print $form->textwithpicto($langs->trans("ProjectFollowOpportunity"), $htmltext);
+		print '<br>';
+	}
+	if (empty($conf->global->PROJECT_HIDE_TASKS))
+	{
+		print '<input type="checkbox" disabled name="usage_task"'.(GETPOSTISSET('usage_task') ? (GETPOST('usage_task', 'alpha') != '' ? ' checked="checked"' : '') : ($object->usage_task ? ' checked="checked"' : '')).'"> ';
+		$htmltext = $langs->trans("ProjectFollowTasks");
+		print $form->textwithpicto($langs->trans("ProjectFollowTasks"), $htmltext);
+		print '<br>';
+	}
+	if (!empty($conf->global->PROJECT_BILL_TIME_SPENT))
+	{
+		print '<input type="checkbox" disabled name="usage_bill_time"'.(GETPOSTISSET('usage_bill_time') ? (GETPOST('usage_bill_time', 'alpha') != '' ? ' checked="checked"' : '') : ($object->usage_bill_time ? ' checked="checked"' : '')).'"> ';
+		$htmltext = $langs->trans("ProjectBillTimeDescription");
+		print $form->textwithpicto($langs->trans("BillTime"), $htmltext);
+		print '<br>';
+	}
+	print '</td></tr>';
 
-    // Visibility
-    print '<tr><td class="titlefield">'.$langs->trans("Visibility").'</td><td>';
-    if ($object->public) print $langs->trans('SharedProject');
-    else print $langs->trans('PrivateProject');
-    print '</td></tr>';
+	// Visibility
+	print '<tr><td class="titlefield">'.$langs->trans("Visibility").'</td><td>';
+	if ($object->public) print $langs->trans('SharedProject');
+	else print $langs->trans('PrivateProject');
+	print '</td></tr>';
 
-    // Date start - end
-    print '<tr><td>'.$langs->trans("DateStart").' - '.$langs->trans("DateEnd").'</td><td>';
+	// Date start - end
+	print '<tr><td>'.$langs->trans("DateStart").' - '.$langs->trans("DateEnd").'</td><td>';
 	$start = dol_print_date($object->date_start, 'day');
 	print ($start ? $start : '?');
 	$end = dol_print_date($object->date_end, 'day');
 	print ' - ';
 	print ($end ? $end : '?');
 	if ($object->hasDelay()) print img_warning("Late");
-    print '</td></tr>';
+	print '</td></tr>';
 
-    // Budget
-    print '<tr><td>'.$langs->trans("Budget").'</td><td>';
-    if (strcmp($object->budget_amount, '')) print price($object->budget_amount, '', $langs, 1, 0, 0, $conf->currency);
-    print '</td></tr>';
+	// Budget
+	print '<tr><td>'.$langs->trans("Budget").'</td><td>';
+	if (strcmp($object->budget_amount, '')) print price($object->budget_amount, '', $langs, 1, 0, 0, $conf->currency);
+	print '</td></tr>';
 
-    // Other attributes
-    $cols = 2;
-    include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
+	// Other attributes
+	$cols = 2;
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
 
-    print '</table>';
+	print '</table>';
 
-    print '</div>';
-    print '<div class="fichehalfright">';
-    print '<div class="ficheaddleft">';
-    print '<div class="underbanner clearboth"></div>';
+	print '</div>';
+	print '<div class="fichehalfright">';
+	print '<div class="ficheaddleft">';
+	print '<div class="underbanner clearboth"></div>';
 
-    print '<table class="border tableforfield centpercent">';
+	print '<table class="border tableforfield centpercent">';
 
-    // Description
-    print '<td class="titlefield tdtop">'.$langs->trans("Description").'</td><td>';
-    print nl2br($object->description);
-    print '</td></tr>';
+	// Description
+	print '<td class="titlefield tdtop">'.$langs->trans("Description").'</td><td>';
+	print nl2br($object->description);
+	print '</td></tr>';
 
-    // Categories
-    if ($conf->categorie->enabled) {
-        print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td>';
-        print $form->showCategories($object->id, Categorie::TYPE_PROJECT, 1);
-        print "</td></tr>";
-    }
+	// Categories
+	if ($conf->categorie->enabled) {
+		print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td>';
+		print $form->showCategories($object->id, Categorie::TYPE_PROJECT, 1);
+		print "</td></tr>";
+	}
 
-    print '</table>';
+	print '</table>';
 
-    print '</div>';
-    print '</div>';
-    print '</div>';
+	print '</div>';
+	print '</div>';
+	print '</div>';
 
-    print '<div class="clearboth"></div>';
+	print '<div class="clearboth"></div>';
 
-    dol_fiche_end();
+	print dol_get_fiche_end();
 
-    print '<br>';
+	print '<br>';
 }
 
 // Link to create task
@@ -227,9 +227,9 @@ $linktocreatetaskParam = array();
 $linktocreatetaskUserRight = false;
 if ($user->rights->projet->all->creer || $user->rights->projet->creer) {
 	if ($object->public || $userWrite > 0) {
-        $linktocreatetaskUserRight = true;
+		$linktocreatetaskUserRight = true;
 	} else {
-        $linktocreatetaskParam['attr']['title'] = $langs->trans("NotOwnerOfProject");
+		$linktocreatetaskParam['attr']['title'] = $langs->trans("NotOwnerOfProject");
 	}
 }
 
@@ -274,20 +274,20 @@ if (count($tasksarray) > 0)
 		$tasks[$taskcursor]['task_parent'] = $idparent;
 
 		$tasks[$taskcursor]['task_is_group'] = 0;
-        $tasks[$taskcursor]['task_css'] = 'gtaskblue';
-        $tasks[$taskcursor]['task_position'] = $val->rang;
-        $tasks[$taskcursor]['task_planned_workload'] = $val->planned_workload;
+		$tasks[$taskcursor]['task_css'] = 'gtaskblue';
+		$tasks[$taskcursor]['task_position'] = $val->rang;
+		$tasks[$taskcursor]['task_planned_workload'] = $val->planned_workload;
 
-        if ($val->fk_parent != 0 && $task->hasChildren() > 0) {
-            $tasks[$taskcursor]['task_is_group'] = 1;
-        	$tasks[$taskcursor]['task_css'] = 'ggroupblack';
-            //$tasks[$taskcursor]['task_css'] = 'gtaskblue';
-        } elseif ($task->hasChildren() > 0) {
-            $tasks[$taskcursor]['task_is_group'] = 1;
-        	//$tasks[$taskcursor]['task_is_group'] = 0;
-            $tasks[$taskcursor]['task_css'] = 'ggroupblack';
-            //$tasks[$taskcursor]['task_css'] = 'gtaskblue';
-        }
+		if ($val->fk_parent != 0 && $task->hasChildren() > 0) {
+			$tasks[$taskcursor]['task_is_group'] = 1;
+			$tasks[$taskcursor]['task_css'] = 'ggroupblack';
+			//$tasks[$taskcursor]['task_css'] = 'gtaskblue';
+		} elseif ($task->hasChildren() > 0) {
+			$tasks[$taskcursor]['task_is_group'] = 1;
+			//$tasks[$taskcursor]['task_is_group'] = 0;
+			$tasks[$taskcursor]['task_css'] = 'ggroupblack';
+			//$tasks[$taskcursor]['task_css'] = 'gtaskblue';
+		}
 		$tasks[$taskcursor]['task_milestone'] = '0';
 		$tasks[$taskcursor]['task_percent_complete'] = $val->progress;
 		//$tasks[$taskcursor]['task_name']=$task->getNomUrl(1);
@@ -337,9 +337,9 @@ if (count($tasksarray) > 0)
 		//if ($s) $tasks[$taskcursor]['task_resources']='<a href="'.DOL_URL_ROOT.'/projet/tasks/contact.php?id='.$val->id.'&withproject=1" title="'.dol_escape_htmltag($s).'">'.$langs->trans("List").'</a>';
 		/* For JSGanttImproved */
 		//if ($s) $tasks[$taskcursor]['task_resources']=implode(',',$idofusers);
-        $tasks[$taskcursor]['task_resources'] = $s;
+		$tasks[$taskcursor]['task_resources'] = $s;
 		//print "xxx".$val->id.$tasks[$taskcursor]['task_resources'];
-        $tasks[$taskcursor]['note'] = $task->note_public;
+		$tasks[$taskcursor]['note'] = $task->note_public;
 		$taskcursor++;
 	}
 
@@ -361,30 +361,30 @@ if (count($tasksarray) > 0)
 
  	if (!empty($conf->use_javascript_ajax))
 	{
-	    //var_dump($_SESSION);
+		//var_dump($_SESSION);
 
 		// How the date for data are formated (format used bu jsgantt)
-	    $dateformatinput = 'yyyy-mm-dd';
-	    // How the date for data are formated (format used by dol_print_date)
-	    $dateformatinput2 = 'standard';
-	    //var_dump($dateformatinput);
+		$dateformatinput = 'yyyy-mm-dd';
+		// How the date for data are formated (format used by dol_print_date)
+		$dateformatinput2 = 'standard';
+		//var_dump($dateformatinput);
   		//var_dump($dateformatinput2);
 
-	    $moreforfilter = '<div class="liste_titre liste_titre_bydiv centpercent">';
+		$moreforfilter = '<div class="liste_titre liste_titre_bydiv centpercent">';
 
-	    $moreforfilter .= '<div class="divsearchfield">';
-	    //$moreforfilter .= $langs->trans("TasksAssignedTo").': ';
-	    //$moreforfilter .= $form->select_dolusers($tmpuser->id > 0 ? $tmpuser->id : '', 'search_user_id', 1);
-	    $moreforfilter .= '&nbsp;';
-	    $moreforfilter .= '</div>';
+		$moreforfilter .= '<div class="divsearchfield">';
+		//$moreforfilter .= $langs->trans("TasksAssignedTo").': ';
+		//$moreforfilter .= $form->select_dolusers($tmpuser->id > 0 ? $tmpuser->id : '', 'search_user_id', 1);
+		$moreforfilter .= '&nbsp;';
+		$moreforfilter .= '</div>';
 
-	    $moreforfilter .= '</div>';
+		$moreforfilter .= '</div>';
 
 		print $moreforfilter;
 
-	    print '<div class="div-table-responsive">';
+		print '<div class="div-table-responsive">';
 
-	    print '<div id="tabs" class="gantt" style="width: 80vw;">'."\n";
+		print '<div id="tabs" class="gantt" style="width: 80vw;">'."\n";
 		include_once DOL_DOCUMENT_ROOT.'/projet/ganttchart.inc.php';
 		print '</div>'."\n";
 
diff --git a/htdocs/projet/index.php b/htdocs/projet/index.php
index 847d7b03d47..71791d1a655 100644
--- a/htdocs/projet/index.php
+++ b/htdocs/projet/index.php
@@ -68,7 +68,7 @@ if (empty($reshook)) {
 		$search_project_user = GETPOST('search_project_user', 'int');
 		$tabparam = array("MAIN_SEARCH_PROJECT_USER_PROJECTSINDEX" => $search_project_user);
 
-		include_once DOL_DOCUMENT_ROOT . '/core/lib/functions2.lib.php';
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 		$result = dol_set_user_param($db, $conf, $user, $tabparam);
 	}
 }
@@ -170,33 +170,33 @@ 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 project
-    if (!empty($conf->projet->enabled) && $user->rights->projet->lire)
-    {
-    	$listofsearchfields['search_project'] = array('text'=>'Project');
-    }
+	// Search project
+	if (!empty($conf->projet->enabled) && $user->rights->projet->lire)
+	{
+		$listofsearchfields['search_project'] = array('text'=>'Project');
+	}
 
-    if (count($listofsearchfields))
-    {
-    	print '<form method="post" action="'.DOL_URL_ROOT.'/core/search.php">';
-    	print '<input type="hidden" name="token" value="'.newToken().'">';
-        print '<div class="div-table-responsive-no-min">';
-    	print '<table class="noborder nohover centpercent">';
-    	$i = 0;
-    	foreach ($listofsearchfields as $key => $value)
-    	{
-    		if ($i == 0) print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
-    		print '<tr>';
-    		print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label></td><td><input type="text" class="flat inputsearch" name="'.$key.'" id="'.$key.'" size="18"></td>';
-    		if ($i == 0) print '<td rowspan="'.count($listofsearchfields).'"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
-    		print '</tr>';
-    		$i++;
-    	}
-    	print '</table>';
-        print '</div>';
-    	print '</form>';
-    	print '<br>';
-    }
+	if (count($listofsearchfields))
+	{
+		print '<form method="post" action="'.DOL_URL_ROOT.'/core/search.php">';
+		print '<input type="hidden" name="token" value="'.newToken().'">';
+		print '<div class="div-table-responsive-no-min">';
+		print '<table class="noborder nohover centpercent">';
+		$i = 0;
+		foreach ($listofsearchfields as $key => $value)
+		{
+			if ($i == 0) print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
+			print '<tr>';
+			print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label></td><td><input type="text" class="flat inputsearch" name="'.$key.'" id="'.$key.'" size="18"></td>';
+			if ($i == 0) print '<td rowspan="'.count($listofsearchfields).'"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
+			print '</tr>';
+			$i++;
+		}
+		print '</table>';
+		print '</div>';
+		print '</form>';
+		print '<br>';
+	}
 }
 
 
@@ -226,7 +226,7 @@ $sql .= $db->plimit($max, 0);
 $resql = $db->query($sql);
 if ($resql)
 {
-    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="4">'.$langs->trans("LatestModifiedProjects", $max).'</th></tr>';
@@ -379,12 +379,12 @@ print '</div>';
 
 if (empty($conf->global->PROJECT_HIDE_PROJECT_LIST_ON_PROJECT_AREA))
 {
-    // This list can be very long, so we allow to hide it to prefer to use the list page.
-    // Add constant PROJECT_HIDE_PROJECT_LIST_ON_PROJECT_AREA to hide this list
+	// This list can be very long, so we allow to hide it to prefer to use the list page.
+	// Add constant PROJECT_HIDE_PROJECT_LIST_ON_PROJECT_AREA to hide this list
 
-    print '<br>';
+	print '<br>';
 
-    print_projecttasks_array($db, $form, $socid, $projectsListId, 0, 1, $listofoppstatus, array());
+	print_projecttasks_array($db, $form, $socid, $projectsListId, 0, 1, $listofoppstatus, array());
 }
 
 print '</div></div></div>';
diff --git a/htdocs/projet/info.php b/htdocs/projet/info.php
index 8747fccfd14..ba1b0629365 100644
--- a/htdocs/projet/info.php
+++ b/htdocs/projet/info.php
@@ -93,10 +93,10 @@ $object = new Project($db);
 
 if ($id > 0 || !empty($ref))
 {
-    $object->fetch($id, $ref);
-    $object->fetch_thirdparty();
+	$object->fetch($id, $ref);
+	$object->fetch_thirdparty();
 	if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_PROJECT) && method_exists($object, 'fetchComments') && empty($object->comments)) $object->fetchComments();
-    $object->info($object->id);
+	$object->info($object->id);
 }
 
 $title = $langs->trans("Project").' - '.$object->ref.' '.$object->name;
@@ -119,15 +119,15 @@ $morehtmlref .= $object->title;
 // 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);
@@ -142,7 +142,7 @@ print '</div>';
 
 print '<div class="clearboth"></div>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 // Actions buttons
@@ -151,7 +151,7 @@ $out = '';
 $permok = $user->rights->agenda->myactions->create;
 if ($permok)
 {
-    $out .= '&projectid='.$object->id;
+	$out .= '&projectid='.$object->id;
 }
 
 
@@ -159,8 +159,8 @@ if ($permok)
 $morehtmlcenter = '';
 if (!empty($conf->agenda->enabled))
 {
-    $addActionBtnRight = !empty($user->rights->agenda->myactions->create) || !empty($user->rights->agenda->allactions->create);
-    $morehtmlcenter .= dolGetButtonTitle($langs->trans('AddAction'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/comm/action/card.php?action=create'.$out.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?id='.$object->id), '', $addActionBtnRight);
+	$addActionBtnRight = !empty($user->rights->agenda->myactions->create) || !empty($user->rights->agenda->allactions->create);
+	$morehtmlcenter .= dolGetButtonTitle($langs->trans('AddAction'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/comm/action/card.php?action=create'.$out.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?id='.$object->id), '', $addActionBtnRight);
 }
 
 //print '</div>';
@@ -170,15 +170,15 @@ if (!empty($object->id))
 	print '<br>';
 
 	$param = '&id='.$object->id;
-    if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
-    if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
+	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
+	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
 
-    print_barre_liste($langs->trans("ActionsOnProject"), 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', 0, -1, '', 0, $morehtmlcenter, '', 0, 1, 1);
+	print_barre_liste($langs->trans("ActionsOnProject"), 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', 0, -1, '', 0, $morehtmlcenter, '', 0, 1, 1);
 
-    // List of all actions
-    $filters = array();
-    $filters['search_agenda_label'] = $search_agenda_label;
-    show_actions_done($conf, $langs, $db, $object, null, 0, $actioncode, '', $filters, $sortfield, $sortorder);
+	// List of all actions
+	$filters = array();
+	$filters['search_agenda_label'] = $search_agenda_label;
+	show_actions_done($conf, $langs, $db, $object, null, 0, $actioncode, '', $filters, $sortfield, $sortorder);
 }
 
 // End of page
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index af5134ee521..bf706550318 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -240,7 +240,7 @@ if (empty($reshook))
 			$result = $objecttmp->fetch($toselectid);
 			if ($result > 0)
 			{
-				$userWrite  = $object->restrictedProjectArea($user, 'write');
+				$userWrite = $object->restrictedProjectArea($user, 'write');
 				if ($userWrite > 0 && $objecttmp->statut == 1) {
 					$result = $objecttmp->setClose($user);
 					if ($result <= 0) {
diff --git a/htdocs/projet/note.php b/htdocs/projet/note.php
index 6da188f6f4a..65172311441 100644
--- a/htdocs/projet/note.php
+++ b/htdocs/projet/note.php
@@ -92,15 +92,15 @@ if ($id > 0 || !empty($ref))
 	// 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);
@@ -116,7 +116,7 @@ if ($id > 0 || !empty($ref))
 
 	print '<div class="clearboth"></div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 }
 
 // End of page
diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php
index bf5f04f6e63..e67a0f1583d 100644
--- a/htdocs/projet/tasks.php
+++ b/htdocs/projet/tasks.php
@@ -482,7 +482,7 @@ if ($id > 0 || !empty($ref))
 	print '<div class="clearboth"></div>';
 
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 }
 
 
@@ -595,7 +595,7 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third
 
 		print '</table>';
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 		print '<div class="center">';
 		print '<input type="submit" class="button" name="add" value="'.$langs->trans("Add").'">';
@@ -649,6 +649,7 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third
 	// We need all tasks (even not limited to a user because a task to user can have a parent that is not affected to him).
 	$filteronthirdpartyid = $socid;
 	$tasksarray = $taskstatic->getTasksArray(0, 0, $object->id, $filteronthirdpartyid, 0, '', -1, $morewherefilter, 0, 0, $extrafields, 1, $search_array_options);
+
 	// We load also tasks limited to a particular user
 	$tmpuser = new User($db);
 	if ($search_user_id > 0) $tmpuser->fetch($search_user_id);
diff --git a/htdocs/projet/tasks/comment.php b/htdocs/projet/tasks/comment.php
index f1ea6d3b4ac..51bf3b6dfa8 100644
--- a/htdocs/projet/tasks/comment.php
+++ b/htdocs/projet/tasks/comment.php
@@ -121,140 +121,140 @@ if ($id > 0 || !empty($ref))
 
 			// Project card
 
-            $linkback = '<a href="'.DOL_URL_ROOT.'/projet/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+			$linkback = '<a href="'.DOL_URL_ROOT.'/projet/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-            $morehtmlref = '<div class="refidno">';
-            // Title
-            $morehtmlref .= $projectstatic->title;
-            // Thirdparty
-            if ($projectstatic->thirdparty->id > 0)
-            {
-                $morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$projectstatic->thirdparty->getNomUrl(1, 'project');
-            }
-            $morehtmlref .= '</div>';
+			$morehtmlref = '<div class="refidno">';
+			// Title
+			$morehtmlref .= $projectstatic->title;
+			// Thirdparty
+			if ($projectstatic->thirdparty->id > 0)
+			{
+				$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$projectstatic->thirdparty->getNomUrl(1, 'project');
+			}
+			$morehtmlref .= '</div>';
 
-            // Define a complementary filter for search of next/prev ref.
-            if (!$user->rights->projet->all->lire)
-            {
-                $objectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 0);
-                $projectstatic->next_prev_filter = " rowid in (".(count($objectsListId) ?join(',', array_keys($objectsListId)) : '0').")";
-            }
+			// Define a complementary filter for search of next/prev ref.
+			if (!$user->rights->projet->all->lire)
+			{
+				$objectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 0);
+				$projectstatic->next_prev_filter = " rowid in (".(count($objectsListId) ?join(',', array_keys($objectsListId)) : '0').")";
+			}
 
-            dol_banner_tab($projectstatic, 'project_ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+			dol_banner_tab($projectstatic, 'project_ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
 
-            print '<div class="fichecenter">';
-            print '<div class="fichehalfleft">';
-            print '<div class="underbanner clearboth"></div>';
+			print '<div class="fichecenter">';
+			print '<div class="fichehalfleft">';
+			print '<div class="underbanner clearboth"></div>';
 
-            print '<table class="border centpercent">';
+			print '<table class="border centpercent">';
 
-            // Usage
-            print '<tr><td class="tdtop">';
-            print $langs->trans("Usage");
-            print '</td>';
-            print '<td>';
-            if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
-            {
-            	print '<input type="checkbox" disabled name="usage_opportunity"'.(GETPOSTISSET('usage_opportunity') ? (GETPOST('usage_opportunity', 'alpha') != '' ? ' checked="checked"' : '') : ($projectstatic->usage_opportunity ? ' checked="checked"' : '')).'"> ';
-            	$htmltext = $langs->trans("ProjectFollowOpportunity");
-            	print $form->textwithpicto($langs->trans("ProjectFollowOpportunity"), $htmltext);
-            	print '<br>';
-            }
-            if (empty($conf->global->PROJECT_HIDE_TASKS))
-            {
-            	print '<input type="checkbox" disabled name="usage_task"'.(GETPOSTISSET('usage_task') ? (GETPOST('usage_task', 'alpha') != '' ? ' checked="checked"' : '') : ($projectstatic->usage_task ? ' checked="checked"' : '')).'"> ';
-            	$htmltext = $langs->trans("ProjectFollowTasks");
-            	print $form->textwithpicto($langs->trans("ProjectFollowTasks"), $htmltext);
-            	print '<br>';
-            }
-            if (!empty($conf->global->PROJECT_BILL_TIME_SPENT))
-            {
-            	print '<input type="checkbox" disabled name="usage_bill_time"'.(GETPOSTISSET('usage_bill_time') ? (GETPOST('usage_bill_time', 'alpha') != '' ? ' checked="checked"' : '') : ($projectstatic->usage_bill_time ? ' checked="checked"' : '')).'"> ';
-            	$htmltext = $langs->trans("ProjectBillTimeDescription");
-            	print $form->textwithpicto($langs->trans("BillTime"), $htmltext);
-            	print '<br>';
-            }
-            print '</td></tr>';
+			// Usage
+			print '<tr><td class="tdtop">';
+			print $langs->trans("Usage");
+			print '</td>';
+			print '<td>';
+			if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
+			{
+				print '<input type="checkbox" disabled name="usage_opportunity"'.(GETPOSTISSET('usage_opportunity') ? (GETPOST('usage_opportunity', 'alpha') != '' ? ' checked="checked"' : '') : ($projectstatic->usage_opportunity ? ' checked="checked"' : '')).'"> ';
+				$htmltext = $langs->trans("ProjectFollowOpportunity");
+				print $form->textwithpicto($langs->trans("ProjectFollowOpportunity"), $htmltext);
+				print '<br>';
+			}
+			if (empty($conf->global->PROJECT_HIDE_TASKS))
+			{
+				print '<input type="checkbox" disabled name="usage_task"'.(GETPOSTISSET('usage_task') ? (GETPOST('usage_task', 'alpha') != '' ? ' checked="checked"' : '') : ($projectstatic->usage_task ? ' checked="checked"' : '')).'"> ';
+				$htmltext = $langs->trans("ProjectFollowTasks");
+				print $form->textwithpicto($langs->trans("ProjectFollowTasks"), $htmltext);
+				print '<br>';
+			}
+			if (!empty($conf->global->PROJECT_BILL_TIME_SPENT))
+			{
+				print '<input type="checkbox" disabled name="usage_bill_time"'.(GETPOSTISSET('usage_bill_time') ? (GETPOST('usage_bill_time', 'alpha') != '' ? ' checked="checked"' : '') : ($projectstatic->usage_bill_time ? ' checked="checked"' : '')).'"> ';
+				$htmltext = $langs->trans("ProjectBillTimeDescription");
+				print $form->textwithpicto($langs->trans("BillTime"), $htmltext);
+				print '<br>';
+			}
+			print '</td></tr>';
 
-            // Visibility
-            print '<tr><td class="titlefield">'.$langs->trans("Visibility").'</td><td>';
-            if ($projectstatic->public) print $langs->trans('SharedProject');
-            else print $langs->trans('PrivateProject');
-            print '</td></tr>';
+			// Visibility
+			print '<tr><td class="titlefield">'.$langs->trans("Visibility").'</td><td>';
+			if ($projectstatic->public) print $langs->trans('SharedProject');
+			else print $langs->trans('PrivateProject');
+			print '</td></tr>';
 
-            // Usage
-            if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES) && !empty($object->usage_opportunity))
-            {
-            	// Opportunity status
-            	print '<tr><td>'.$langs->trans("OpportunityStatus").'</td><td>';
-            	$code = dol_getIdFromCode($db, $projectstatic->opp_status, 'c_lead_status', 'rowid', 'code');
-            	if ($code) print $langs->trans("OppStatus".$code);
-            	print '</td></tr>';
+			// Usage
+			if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES) && !empty($object->usage_opportunity))
+			{
+				// Opportunity status
+				print '<tr><td>'.$langs->trans("OpportunityStatus").'</td><td>';
+				$code = dol_getIdFromCode($db, $projectstatic->opp_status, 'c_lead_status', 'rowid', 'code');
+				if ($code) print $langs->trans("OppStatus".$code);
+				print '</td></tr>';
 
-            	// Opportunity percent
-            	print '<tr><td>'.$langs->trans("OpportunityProbability").'</td><td>';
-            	if (strcmp($object->opp_percent, '')) print price($projectstatic->opp_percent, 0, $langs, 1, 0).' %';
-            	print '</td></tr>';
+				// Opportunity percent
+				print '<tr><td>'.$langs->trans("OpportunityProbability").'</td><td>';
+				if (strcmp($object->opp_percent, '')) print price($projectstatic->opp_percent, 0, $langs, 1, 0).' %';
+				print '</td></tr>';
 
-            	// Opportunity Amount
-            	print '<tr><td>'.$langs->trans("OpportunityAmount").'</td><td>';
-            	/*if ($object->opp_status)
+				// Opportunity Amount
+				print '<tr><td>'.$langs->trans("OpportunityAmount").'</td><td>';
+				/*if ($object->opp_status)
             	 {
             	 print price($obj->opp_amount, 1, $langs, 1, 0, -1, $conf->currency);
             	 }*/
-            	if (strcmp($projectstatic->opp_amount, '')) print price($projectstatic->opp_amount, 0, $langs, 1, 0, -1, $conf->currency);
-            	print '</td></tr>';
-            }
+				if (strcmp($projectstatic->opp_amount, '')) print price($projectstatic->opp_amount, 0, $langs, 1, 0, -1, $conf->currency);
+				print '</td></tr>';
+			}
 
-            // Date start - end
-            print '<tr><td>'.$langs->trans("DateStart").' - '.$langs->trans("DateEnd").'</td><td>';
-            $start = dol_print_date($projectstatic->date_start, 'day');
-            print ($start ? $start : '?');
-            $end = dol_print_date($projectstatic->date_end, 'day');
-            print ' - ';
-            print ($end ? $end : '?');
-            if ($projectstatic->hasDelay()) print img_warning("Late");
-            print '</td></tr>';
+			// Date start - end
+			print '<tr><td>'.$langs->trans("DateStart").' - '.$langs->trans("DateEnd").'</td><td>';
+			$start = dol_print_date($projectstatic->date_start, 'day');
+			print ($start ? $start : '?');
+			$end = dol_print_date($projectstatic->date_end, 'day');
+			print ' - ';
+			print ($end ? $end : '?');
+			if ($projectstatic->hasDelay()) print img_warning("Late");
+			print '</td></tr>';
 
-            // Budget
-            print '<tr><td>'.$langs->trans("Budget").'</td><td>';
-            if (strcmp($projectstatic->budget_amount, '')) print price($projectstatic->budget_amount, '', $langs, 1, 0, 0, $conf->currency);
-            print '</td></tr>';
+			// Budget
+			print '<tr><td>'.$langs->trans("Budget").'</td><td>';
+			if (strcmp($projectstatic->budget_amount, '')) print price($projectstatic->budget_amount, '', $langs, 1, 0, 0, $conf->currency);
+			print '</td></tr>';
 
-            // Other attributes
-            $cols = 2;
-            //include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
+			// Other attributes
+			$cols = 2;
+			//include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
 
-            print '</table>';
+			print '</table>';
 
-            print '</div>';
-            print '<div class="fichehalfright">';
-            print '<div class="ficheaddleft">';
-            print '<div class="underbanner clearboth"></div>';
+			print '</div>';
+			print '<div class="fichehalfright">';
+			print '<div class="ficheaddleft">';
+			print '<div class="underbanner clearboth"></div>';
 
-            print '<table class="border centpercent">';
+			print '<table class="border centpercent">';
 
-            // Description
-            print '<td class="titlefield tdtop">'.$langs->trans("Description").'</td><td>';
-            print nl2br($projectstatic->description);
-            print '</td></tr>';
+			// Description
+			print '<td class="titlefield tdtop">'.$langs->trans("Description").'</td><td>';
+			print nl2br($projectstatic->description);
+			print '</td></tr>';
 
-            // Categories
-            if ($conf->categorie->enabled) {
-                print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td>';
-                print $form->showCategories($projectstatic->id, 'project', 1);
-                print "</td></tr>";
-            }
+			// Categories
+			if ($conf->categorie->enabled) {
+				print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td>';
+				print $form->showCategories($projectstatic->id, 'project', 1);
+				print "</td></tr>";
+			}
 
-            print '</table>';
+			print '</table>';
 
-            print '</div>';
-            print '</div>';
-            print '</div>';
+			print '</div>';
+			print '</div>';
+			print '</div>';
 
-            print '<div class="clearboth"></div>';
+			print '<div class="clearboth"></div>';
 
-			dol_fiche_end();
+			print dol_get_fiche_end();
 
 			print '<br>';
 		}
@@ -276,8 +276,8 @@ if ($id > 0 || !empty($ref))
 
 		if (!GETPOST('withproject') || empty($projectstatic->id))
 		{
-		    $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1);
-		    $object->next_prev_filter = " fk_projet in (".$projectsListId.")";
+			$projectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1);
+			$object->next_prev_filter = " fk_projet in (".$projectsListId.")";
 		} else $object->next_prev_filter = " fk_projet = ".$projectstatic->id;
 
 		$morehtmlref = '';
@@ -285,17 +285,17 @@ if ($id > 0 || !empty($ref))
 		// Project
 		if (empty($withproject))
 		{
-		    $morehtmlref .= '<div class="refidno">';
-		    $morehtmlref .= $langs->trans("Project").': ';
-		    $morehtmlref .= $projectstatic->getNomUrl(1);
-		    $morehtmlref .= '<br>';
+			$morehtmlref .= '<div class="refidno">';
+			$morehtmlref .= $langs->trans("Project").': ';
+			$morehtmlref .= $projectstatic->getNomUrl(1);
+			$morehtmlref .= '<br>';
 
-		    // Third party
-		    $morehtmlref .= $langs->trans("ThirdParty").': ';
-		    if (!empty($projectstatic->thirdparty)) {
-                   $morehtmlref .= $projectstatic->thirdparty->getNomUrl(1);
-		    }
-		    $morehtmlref .= '</div>';
+			// Third party
+			$morehtmlref .= $langs->trans("ThirdParty").': ';
+			if (!empty($projectstatic->thirdparty)) {
+				   $morehtmlref .= $projectstatic->thirdparty->getNomUrl(1);
+			}
+			$morehtmlref .= '</div>';
 		}
 
 		dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, $param);
@@ -319,7 +319,7 @@ if ($id > 0 || !empty($ref))
 
 		print '</div>';
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 
 		// Include comment tpl view
diff --git a/htdocs/projet/tasks/contact.php b/htdocs/projet/tasks/contact.php
index 7ae7b13ed26..a04214a2f06 100644
--- a/htdocs/projet/tasks/contact.php
+++ b/htdocs/projet/tasks/contact.php
@@ -59,26 +59,26 @@ if ($action == 'addcontact' && $user->rights->projet->creer)
 {
 	$result = $object->fetch($id, $ref);
 
-    if ($result > 0 && $id > 0)
-    {
-    	$idfortaskuser = (GETPOST("contactid") != 0) ?GETPOST("contactid") : GETPOST("userid"); // GETPOST('contactid') may val -1 to mean empty or -2 to means "everybody"
-    	if ($idfortaskuser == -2)
-    	{
-    		$result = $projectstatic->fetch($object->fk_project);
-    		if ($result <= 0)
-    		{
-    			dol_print_error($db, $projectstatic->error, $projectstatic->errors);
-    		} else {
-    			$contactsofproject = $projectstatic->getListContactId('internal');
-    			foreach ($contactsofproject as $key => $val)
-    			{
-    				$result = $object->add_contact($val, GETPOST("type"), GETPOST("source"));
-    			}
-    		}
-    	} else {
+	if ($result > 0 && $id > 0)
+	{
+		$idfortaskuser = (GETPOST("contactid") != 0) ?GETPOST("contactid") : GETPOST("userid"); // GETPOST('contactid') may val -1 to mean empty or -2 to means "everybody"
+		if ($idfortaskuser == -2)
+		{
+			$result = $projectstatic->fetch($object->fk_project);
+			if ($result <= 0)
+			{
+				dol_print_error($db, $projectstatic->error, $projectstatic->errors);
+			} else {
+				$contactsofproject = $projectstatic->getListContactId('internal');
+				foreach ($contactsofproject as $key => $val)
+				{
+					$result = $object->add_contact($val, GETPOST("type"), GETPOST("source"));
+				}
+			}
+		} else {
   			$result = $object->add_contact($idfortaskuser, GETPOST("type"), GETPOST("source"));
-    	}
-    }
+		}
+	}
 
 	if ($result >= 0)
 	{
@@ -100,7 +100,7 @@ if ($action == 'swapstatut' && $user->rights->projet->creer)
 {
 	if ($object->fetch($id, $ref))
 	{
-	    $result = $object->swapContactStatus(GETPOST('ligne'));
+		$result = $object->swapContactStatus(GETPOST('ligne'));
 	} else {
 		dol_print_error($db);
 	}
@@ -160,7 +160,7 @@ if ($id > 0 || !empty($ref))
 	if ($object->fetch($id, $ref) > 0)
 	{
 		if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_TASK) && method_exists($object, 'fetchComments') && empty($object->comments)) $object->fetchComments();
-	    $id = $object->id; // So when doing a search from ref, id is also set correctly.
+		$id = $object->id; // So when doing a search from ref, id is also set correctly.
 
 		$result = $projectstatic->fetch($object->fk_project);
 		if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_PROJECT) && method_exists($projectstatic, 'fetchComments') && empty($projectstatic->comments)) $projectstatic->fetchComments();
@@ -172,127 +172,127 @@ if ($id > 0 || !empty($ref))
 
 		if ($withproject)
 		{
-    		// Tabs for project
-    		$tab = 'tasks';
-    		$head = project_prepare_head($projectstatic);
-    		print dol_get_fiche_head($head, $tab, $langs->trans("Project"), -1, ($projectstatic->public ? 'projectpub' : 'project'));
+			// Tabs for project
+			$tab = 'tasks';
+			$head = project_prepare_head($projectstatic);
+			print dol_get_fiche_head($head, $tab, $langs->trans("Project"), -1, ($projectstatic->public ? 'projectpub' : 'project'));
 
-    		$param = ($mode == 'mine' ? '&mode=mine' : '');
+			$param = ($mode == 'mine' ? '&mode=mine' : '');
 
 			// Project card
 
-            $linkback = '<a href="'.DOL_URL_ROOT.'/projet/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+			$linkback = '<a href="'.DOL_URL_ROOT.'/projet/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-            $morehtmlref = '<div class="refidno">';
-            // Title
-            $morehtmlref .= $projectstatic->title;
-            // Thirdparty
-            if ($projectstatic->thirdparty->id > 0)
-            {
-                $morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$projectstatic->thirdparty->getNomUrl(1, 'project');
-            }
-            $morehtmlref .= '</div>';
+			$morehtmlref = '<div class="refidno">';
+			// Title
+			$morehtmlref .= $projectstatic->title;
+			// Thirdparty
+			if ($projectstatic->thirdparty->id > 0)
+			{
+				$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$projectstatic->thirdparty->getNomUrl(1, 'project');
+			}
+			$morehtmlref .= '</div>';
 
-            // Define a complementary filter for search of next/prev ref.
-            if (!$user->rights->projet->all->lire)
-            {
-                $objectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 0);
-                $projectstatic->next_prev_filter = " rowid in (".(count($objectsListId) ?join(',', array_keys($objectsListId)) : '0').")";
-            }
+			// Define a complementary filter for search of next/prev ref.
+			if (!$user->rights->projet->all->lire)
+			{
+				$objectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 0);
+				$projectstatic->next_prev_filter = " rowid in (".(count($objectsListId) ?join(',', array_keys($objectsListId)) : '0').")";
+			}
 
-            dol_banner_tab($projectstatic, 'project_ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+			dol_banner_tab($projectstatic, 'project_ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
 
-            print '<div class="fichecenter">';
-            print '<div class="fichehalfleft">';
-            print '<div class="underbanner clearboth"></div>';
+			print '<div class="fichecenter">';
+			print '<div class="fichehalfleft">';
+			print '<div class="underbanner clearboth"></div>';
 
-            print '<table class="border tableforfield centpercent">';
+			print '<table class="border tableforfield centpercent">';
 
-            // Usage
-            print '<tr><td class="tdtop">';
-            print $langs->trans("Usage");
-            print '</td>';
-            print '<td>';
-            if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
-            {
-            	print '<input type="checkbox" disabled name="usage_opportunity"'.(GETPOSTISSET('usage_opportunity') ? (GETPOST('usage_opportunity', 'alpha') != '' ? ' checked="checked"' : '') : ($projectstatic->usage_opportunity ? ' checked="checked"' : '')).'"> ';
-            	$htmltext = $langs->trans("ProjectFollowOpportunity");
-            	print $form->textwithpicto($langs->trans("ProjectFollowOpportunity"), $htmltext);
-            	print '<br>';
-            }
-            if (empty($conf->global->PROJECT_HIDE_TASKS))
-            {
-            	print '<input type="checkbox" disabled name="usage_task"'.(GETPOSTISSET('usage_task') ? (GETPOST('usage_task', 'alpha') != '' ? ' checked="checked"' : '') : ($projectstatic->usage_task ? ' checked="checked"' : '')).'"> ';
-            	$htmltext = $langs->trans("ProjectFollowTasks");
-            	print $form->textwithpicto($langs->trans("ProjectFollowTasks"), $htmltext);
-            	print '<br>';
-            }
-            if (!empty($conf->global->PROJECT_BILL_TIME_SPENT))
-            {
-            	print '<input type="checkbox" disabled name="usage_bill_time"'.(GETPOSTISSET('usage_bill_time') ? (GETPOST('usage_bill_time', 'alpha') != '' ? ' checked="checked"' : '') : ($projectstatic->usage_bill_time ? ' checked="checked"' : '')).'"> ';
-            	$htmltext = $langs->trans("ProjectBillTimeDescription");
-            	print $form->textwithpicto($langs->trans("BillTime"), $htmltext);
-            	print '<br>';
-            }
-            print '</td></tr>';
+			// Usage
+			print '<tr><td class="tdtop">';
+			print $langs->trans("Usage");
+			print '</td>';
+			print '<td>';
+			if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
+			{
+				print '<input type="checkbox" disabled name="usage_opportunity"'.(GETPOSTISSET('usage_opportunity') ? (GETPOST('usage_opportunity', 'alpha') != '' ? ' checked="checked"' : '') : ($projectstatic->usage_opportunity ? ' checked="checked"' : '')).'"> ';
+				$htmltext = $langs->trans("ProjectFollowOpportunity");
+				print $form->textwithpicto($langs->trans("ProjectFollowOpportunity"), $htmltext);
+				print '<br>';
+			}
+			if (empty($conf->global->PROJECT_HIDE_TASKS))
+			{
+				print '<input type="checkbox" disabled name="usage_task"'.(GETPOSTISSET('usage_task') ? (GETPOST('usage_task', 'alpha') != '' ? ' checked="checked"' : '') : ($projectstatic->usage_task ? ' checked="checked"' : '')).'"> ';
+				$htmltext = $langs->trans("ProjectFollowTasks");
+				print $form->textwithpicto($langs->trans("ProjectFollowTasks"), $htmltext);
+				print '<br>';
+			}
+			if (!empty($conf->global->PROJECT_BILL_TIME_SPENT))
+			{
+				print '<input type="checkbox" disabled name="usage_bill_time"'.(GETPOSTISSET('usage_bill_time') ? (GETPOST('usage_bill_time', 'alpha') != '' ? ' checked="checked"' : '') : ($projectstatic->usage_bill_time ? ' checked="checked"' : '')).'"> ';
+				$htmltext = $langs->trans("ProjectBillTimeDescription");
+				print $form->textwithpicto($langs->trans("BillTime"), $htmltext);
+				print '<br>';
+			}
+			print '</td></tr>';
 
-            // Visibility
-            print '<tr><td class="titlefield">'.$langs->trans("Visibility").'</td><td>';
-            if ($projectstatic->public) print $langs->trans('SharedProject');
-            else print $langs->trans('PrivateProject');
-            print '</td></tr>';
+			// Visibility
+			print '<tr><td class="titlefield">'.$langs->trans("Visibility").'</td><td>';
+			if ($projectstatic->public) print $langs->trans('SharedProject');
+			else print $langs->trans('PrivateProject');
+			print '</td></tr>';
 
-            // Date start - end
-            print '<tr><td>'.$langs->trans("DateStart").' - '.$langs->trans("DateEnd").'</td><td>';
-            $start = dol_print_date($projectstatic->date_start, 'day');
-            print ($start ? $start : '?');
-            $end = dol_print_date($projectstatic->date_end, 'day');
-            print ' - ';
-            print ($end ? $end : '?');
-            if ($projectstatic->hasDelay()) print img_warning("Late");
-            print '</td></tr>';
+			// Date start - end
+			print '<tr><td>'.$langs->trans("DateStart").' - '.$langs->trans("DateEnd").'</td><td>';
+			$start = dol_print_date($projectstatic->date_start, 'day');
+			print ($start ? $start : '?');
+			$end = dol_print_date($projectstatic->date_end, 'day');
+			print ' - ';
+			print ($end ? $end : '?');
+			if ($projectstatic->hasDelay()) print img_warning("Late");
+			print '</td></tr>';
 
-            // Budget
-            print '<tr><td>'.$langs->trans("Budget").'</td><td>';
-            if (strcmp($projectstatic->budget_amount, '')) print price($projectstatic->budget_amount, '', $langs, 1, 0, 0, $conf->currency);
-            print '</td></tr>';
+			// Budget
+			print '<tr><td>'.$langs->trans("Budget").'</td><td>';
+			if (strcmp($projectstatic->budget_amount, '')) print price($projectstatic->budget_amount, '', $langs, 1, 0, 0, $conf->currency);
+			print '</td></tr>';
 
-            // Other attributes
-            $cols = 2;
-            //include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
+			// Other attributes
+			$cols = 2;
+			//include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
 
-            print '</table>';
+			print '</table>';
 
-            print '</div>';
-            print '<div class="fichehalfright">';
-            print '<div class="ficheaddleft">';
-            print '<div class="underbanner clearboth"></div>';
+			print '</div>';
+			print '<div class="fichehalfright">';
+			print '<div class="ficheaddleft">';
+			print '<div class="underbanner clearboth"></div>';
 
-            print '<table class="border tableforfield" width="100%">';
+			print '<table class="border tableforfield" width="100%">';
 
-            // Description
-            print '<td class="titlefield tdtop">'.$langs->trans("Description").'</td><td>';
-            print nl2br($projectstatic->description);
-            print '</td></tr>';
+			// Description
+			print '<td class="titlefield tdtop">'.$langs->trans("Description").'</td><td>';
+			print nl2br($projectstatic->description);
+			print '</td></tr>';
 
-            // Categories
-            if ($conf->categorie->enabled) {
-                print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td>';
-                print $form->showCategories($projectstatic->id, 'project', 1);
-                print "</td></tr>";
-            }
+			// Categories
+			if ($conf->categorie->enabled) {
+				print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td>';
+				print $form->showCategories($projectstatic->id, 'project', 1);
+				print "</td></tr>";
+			}
 
-            print '</table>';
+			print '</table>';
 
-            print '</div>';
-            print '</div>';
-            print '</div>';
+			print '</div>';
+			print '</div>';
+			print '</div>';
 
-            print '<div class="clearboth"></div>';
+			print '<div class="clearboth"></div>';
 
-    		dol_fiche_end();
+			print dol_get_fiche_end();
 
-    		print '<br>';
+			print '<br>';
 		}
 
 
@@ -309,8 +309,8 @@ if ($id > 0 || !empty($ref))
 
 		if (!GETPOST('withproject') || empty($projectstatic->id))
 		{
-		    $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1);
-		    $object->next_prev_filter = " fk_projet in (".$projectsListId.")";
+			$projectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1);
+			$object->next_prev_filter = " fk_projet in (".$projectsListId.")";
 		} else $object->next_prev_filter = " fk_projet = ".$projectstatic->id;
 
 		$morehtmlref = '';
@@ -318,25 +318,25 @@ if ($id > 0 || !empty($ref))
 		// Project
 		if (empty($withproject))
 		{
-		    $result = $projectstatic->fetch($object->fk_project);
-		    $morehtmlref .= '<div class="refidno">';
-		    $morehtmlref .= $langs->trans("Project").': ';
-		    $morehtmlref .= $projectstatic->getNomUrl(1);
-		    $morehtmlref .= '<br>';
+			$result = $projectstatic->fetch($object->fk_project);
+			$morehtmlref .= '<div class="refidno">';
+			$morehtmlref .= $langs->trans("Project").': ';
+			$morehtmlref .= $projectstatic->getNomUrl(1);
+			$morehtmlref .= '<br>';
 
-		    // Third party
-		    $morehtmlref .= $langs->trans("ThirdParty").': ';
-		    if ($projectstatic->socid > 0) {
-		        $projectstatic->fetch_thirdparty();
-		        $morehtmlref .= $projectstatic->thirdparty->getNomUrl(1);
-		    }
+			// Third party
+			$morehtmlref .= $langs->trans("ThirdParty").': ';
+			if ($projectstatic->socid > 0) {
+				$projectstatic->fetch_thirdparty();
+				$morehtmlref .= $projectstatic->thirdparty->getNomUrl(1);
+			}
 
-		    $morehtmlref .= '</div>';
+			$morehtmlref .= '</div>';
 		}
 
 		dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, $param, 0, '', '', 1);
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 		/*
 		 * Lines of contacts
@@ -484,28 +484,28 @@ if ($id > 0 || !empty($ref))
 
 				// Contact
 				print '<td>';
-                if ($tab[$i]['source'] == 'internal')
-                {
-                    $userstatic->id = $tab[$i]['id'];
-                    $userstatic->lastname = $tab[$i]['lastname'];
-                    $userstatic->firstname = $tab[$i]['firstname'];
-    				$userstatic->photo = $tab[$i]['photo'];
-    				$userstatic->login = $tab[$i]['login'];
-    				$userstatic->email = $tab[$i]['email'];
-    				$userstatic->statut = $tab[$i]['statucontact'];
+				if ($tab[$i]['source'] == 'internal')
+				{
+					$userstatic->id = $tab[$i]['id'];
+					$userstatic->lastname = $tab[$i]['lastname'];
+					$userstatic->firstname = $tab[$i]['firstname'];
+					$userstatic->photo = $tab[$i]['photo'];
+					$userstatic->login = $tab[$i]['login'];
+					$userstatic->email = $tab[$i]['email'];
+					$userstatic->statut = $tab[$i]['statucontact'];
 
-                    print $userstatic->getNomUrl(-1);
-                }
-                if ($tab[$i]['source'] == 'external')
-                {
-                    $contactstatic->id = $tab[$i]['id'];
-                    $contactstatic->lastname = $tab[$i]['lastname'];
-                    $contactstatic->firstname = $tab[$i]['firstname'];
-                    $contactstatic->email = $tab[$i]['email'];
-                    $contactstatic->statut = $tab[$i]['statucontact'];
+					print $userstatic->getNomUrl(-1);
+				}
+				if ($tab[$i]['source'] == 'external')
+				{
+					$contactstatic->id = $tab[$i]['id'];
+					$contactstatic->lastname = $tab[$i]['lastname'];
+					$contactstatic->firstname = $tab[$i]['firstname'];
+					$contactstatic->email = $tab[$i]['email'];
+					$contactstatic->statut = $tab[$i]['statucontact'];
 
-                    print $contactstatic->getNomUrl(1);
-                }
+					print $contactstatic->getNomUrl(1);
+				}
 				print '</td>';
 
 				// Type de contact
diff --git a/htdocs/projet/tasks/document.php b/htdocs/projet/tasks/document.php
index d19d587a30a..ca273bb36ef 100644
--- a/htdocs/projet/tasks/document.php
+++ b/htdocs/projet/tasks/document.php
@@ -135,116 +135,116 @@ if ($object->id > 0)
 
 		// Project card
 
-        $linkback = '<a href="'.DOL_URL_ROOT.'/projet/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+		$linkback = '<a href="'.DOL_URL_ROOT.'/projet/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-        $morehtmlref = '<div class="refidno">';
-        // Title
-        $morehtmlref .= $projectstatic->title;
-        // Thirdparty
-        if ($projectstatic->thirdparty->id > 0)
-        {
-            $morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$projectstatic->thirdparty->getNomUrl(1, 'project');
-        }
-        $morehtmlref .= '</div>';
+		$morehtmlref = '<div class="refidno">';
+		// Title
+		$morehtmlref .= $projectstatic->title;
+		// Thirdparty
+		if ($projectstatic->thirdparty->id > 0)
+		{
+			$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$projectstatic->thirdparty->getNomUrl(1, 'project');
+		}
+		$morehtmlref .= '</div>';
 
-        // Define a complementary filter for search of next/prev ref.
-        if (!$user->rights->projet->all->lire)
-        {
-            $objectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 0);
-            $projectstatic->next_prev_filter = " rowid in (".(count($objectsListId) ?join(',', array_keys($objectsListId)) : '0').")";
-        }
+		// Define a complementary filter for search of next/prev ref.
+		if (!$user->rights->projet->all->lire)
+		{
+			$objectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 0);
+			$projectstatic->next_prev_filter = " rowid in (".(count($objectsListId) ?join(',', array_keys($objectsListId)) : '0').")";
+		}
 
-        dol_banner_tab($projectstatic, 'project_ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+		dol_banner_tab($projectstatic, 'project_ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
 
-        print '<div class="fichecenter">';
-        print '<div class="fichehalfleft">';
-        print '<div class="underbanner clearboth"></div>';
+		print '<div class="fichecenter">';
+		print '<div class="fichehalfleft">';
+		print '<div class="underbanner clearboth"></div>';
 
-        print '<table class="border tableforfield centpercent">';
+		print '<table class="border tableforfield centpercent">';
 
-        // Usage
-        print '<tr><td class="tdtop">';
-        print $langs->trans("Usage");
-        print '</td>';
-        print '<td>';
-        if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
-        {
-        	print '<input type="checkbox" disabled name="usage_opportunity"'.(GETPOSTISSET('usage_opportunity') ? (GETPOST('usage_opportunity', 'alpha') != '' ? ' checked="checked"' : '') : ($projectstatic->usage_opportunity ? ' checked="checked"' : '')).'"> ';
-        	$htmltext = $langs->trans("ProjectFollowOpportunity");
-        	print $form->textwithpicto($langs->trans("ProjectFollowOpportunity"), $htmltext);
-        	print '<br>';
-        }
-        if (empty($conf->global->PROJECT_HIDE_TASKS))
-        {
-        	print '<input type="checkbox" disabled name="usage_task"'.(GETPOSTISSET('usage_task') ? (GETPOST('usage_task', 'alpha') != '' ? ' checked="checked"' : '') : ($projectstatic->usage_task ? ' checked="checked"' : '')).'"> ';
-        	$htmltext = $langs->trans("ProjectFollowTasks");
-        	print $form->textwithpicto($langs->trans("ProjectFollowTasks"), $htmltext);
-        	print '<br>';
-        }
-        if (!empty($conf->global->PROJECT_BILL_TIME_SPENT))
-        {
-        	print '<input type="checkbox" disabled name="usage_bill_time"'.(GETPOSTISSET('usage_bill_time') ? (GETPOST('usage_bill_time', 'alpha') != '' ? ' checked="checked"' : '') : ($projectstatic->usage_bill_time ? ' checked="checked"' : '')).'"> ';
-        	$htmltext = $langs->trans("ProjectBillTimeDescription");
-        	print $form->textwithpicto($langs->trans("BillTime"), $htmltext);
-        	print '<br>';
-        }
-        print '</td></tr>';
+		// Usage
+		print '<tr><td class="tdtop">';
+		print $langs->trans("Usage");
+		print '</td>';
+		print '<td>';
+		if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
+		{
+			print '<input type="checkbox" disabled name="usage_opportunity"'.(GETPOSTISSET('usage_opportunity') ? (GETPOST('usage_opportunity', 'alpha') != '' ? ' checked="checked"' : '') : ($projectstatic->usage_opportunity ? ' checked="checked"' : '')).'"> ';
+			$htmltext = $langs->trans("ProjectFollowOpportunity");
+			print $form->textwithpicto($langs->trans("ProjectFollowOpportunity"), $htmltext);
+			print '<br>';
+		}
+		if (empty($conf->global->PROJECT_HIDE_TASKS))
+		{
+			print '<input type="checkbox" disabled name="usage_task"'.(GETPOSTISSET('usage_task') ? (GETPOST('usage_task', 'alpha') != '' ? ' checked="checked"' : '') : ($projectstatic->usage_task ? ' checked="checked"' : '')).'"> ';
+			$htmltext = $langs->trans("ProjectFollowTasks");
+			print $form->textwithpicto($langs->trans("ProjectFollowTasks"), $htmltext);
+			print '<br>';
+		}
+		if (!empty($conf->global->PROJECT_BILL_TIME_SPENT))
+		{
+			print '<input type="checkbox" disabled name="usage_bill_time"'.(GETPOSTISSET('usage_bill_time') ? (GETPOST('usage_bill_time', 'alpha') != '' ? ' checked="checked"' : '') : ($projectstatic->usage_bill_time ? ' checked="checked"' : '')).'"> ';
+			$htmltext = $langs->trans("ProjectBillTimeDescription");
+			print $form->textwithpicto($langs->trans("BillTime"), $htmltext);
+			print '<br>';
+		}
+		print '</td></tr>';
 
-        // Visibility
-        print '<tr><td class="titlefield">'.$langs->trans("Visibility").'</td><td>';
-        if ($projectstatic->public) print $langs->trans('SharedProject');
-        else print $langs->trans('PrivateProject');
-        print '</td></tr>';
+		// Visibility
+		print '<tr><td class="titlefield">'.$langs->trans("Visibility").'</td><td>';
+		if ($projectstatic->public) print $langs->trans('SharedProject');
+		else print $langs->trans('PrivateProject');
+		print '</td></tr>';
 
-        // Date start - end
-        print '<tr><td>'.$langs->trans("DateStart").' - '.$langs->trans("DateEnd").'</td><td>';
-        $start = dol_print_date($projectstatic->date_start, 'day');
-        print ($start ? $start : '?');
-        $end = dol_print_date($projectstatic->date_end, 'day');
-        print ' - ';
-        print ($end ? $end : '?');
-        if ($projectstatic->hasDelay()) print img_warning("Late");
-        print '</td></tr>';
+		// Date start - end
+		print '<tr><td>'.$langs->trans("DateStart").' - '.$langs->trans("DateEnd").'</td><td>';
+		$start = dol_print_date($projectstatic->date_start, 'day');
+		print ($start ? $start : '?');
+		$end = dol_print_date($projectstatic->date_end, 'day');
+		print ' - ';
+		print ($end ? $end : '?');
+		if ($projectstatic->hasDelay()) print img_warning("Late");
+		print '</td></tr>';
 
-        // Budget
-        print '<tr><td>'.$langs->trans("Budget").'</td><td>';
-        if (strcmp($projectstatic->budget_amount, '')) print price($projectstatic->budget_amount, '', $langs, 1, 0, 0, $conf->currency);
-        print '</td></tr>';
+		// Budget
+		print '<tr><td>'.$langs->trans("Budget").'</td><td>';
+		if (strcmp($projectstatic->budget_amount, '')) print price($projectstatic->budget_amount, '', $langs, 1, 0, 0, $conf->currency);
+		print '</td></tr>';
 
-        // Other attributes
-        $cols = 2;
-        //include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
+		// Other attributes
+		$cols = 2;
+		//include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
 
-        print '</table>';
+		print '</table>';
 
-        print '</div>';
-        print '<div class="fichehalfright">';
-        print '<div class="ficheaddleft">';
-        print '<div class="underbanner clearboth"></div>';
+		print '</div>';
+		print '<div class="fichehalfright">';
+		print '<div class="ficheaddleft">';
+		print '<div class="underbanner clearboth"></div>';
 
-        print '<table class="border tableforfield centpercent">';
+		print '<table class="border tableforfield centpercent">';
 
-        // Description
-        print '<td class="titlefield tdtop">'.$langs->trans("Description").'</td><td>';
-        print nl2br($projectstatic->description);
-        print '</td></tr>';
+		// Description
+		print '<td class="titlefield tdtop">'.$langs->trans("Description").'</td><td>';
+		print nl2br($projectstatic->description);
+		print '</td></tr>';
 
-        // Categories
-        if ($conf->categorie->enabled) {
-            print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td>';
-            print $form->showCategories($projectstatic->id, 'project', 1);
-            print "</td></tr>";
-        }
+		// Categories
+		if ($conf->categorie->enabled) {
+			print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td>';
+			print $form->showCategories($projectstatic->id, 'project', 1);
+			print "</td></tr>";
+		}
 
-        print '</table>';
+		print '</table>';
 
-        print '</div>';
-        print '</div>';
-        print '</div>';
+		print '</div>';
+		print '</div>';
+		print '</div>';
 
-        print '<div class="clearboth"></div>';
+		print '<div class="clearboth"></div>';
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 		print '<br>';
 	}
@@ -265,8 +265,8 @@ if ($object->id > 0)
 
 	if (!GETPOST('withproject') || empty($projectstatic->id))
 	{
-	    $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1);
-	    $object->next_prev_filter = " fk_projet in (".$projectsListId.")";
+		$projectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1);
+		$object->next_prev_filter = " fk_projet in (".$projectsListId.")";
 	} else $object->next_prev_filter = " fk_projet = ".$projectstatic->id;
 
 	$morehtmlref = '';
@@ -274,17 +274,17 @@ if ($object->id > 0)
 	// Project
 	if (empty($withproject))
 	{
-	    $morehtmlref .= '<div class="refidno">';
-	    $morehtmlref .= $langs->trans("Project").': ';
-	    $morehtmlref .= $projectstatic->getNomUrl(1);
-	    $morehtmlref .= '<br>';
+		$morehtmlref .= '<div class="refidno">';
+		$morehtmlref .= $langs->trans("Project").': ';
+		$morehtmlref .= $projectstatic->getNomUrl(1);
+		$morehtmlref .= '<br>';
 
-	    // Third party
-	    $morehtmlref .= $langs->trans("ThirdParty").': ';
-	    if (is_object($projectstatic->thirdparty) && $projectstatic->thirdparty->id > 0) {
-	    	$morehtmlref .= $projectstatic->thirdparty->getNomUrl(1);
-	    }
-	    $morehtmlref .= '</div>';
+		// Third party
+		$morehtmlref .= $langs->trans("ThirdParty").': ';
+		if (is_object($projectstatic->thirdparty) && $projectstatic->thirdparty->id > 0) {
+			$morehtmlref .= $projectstatic->thirdparty->getNomUrl(1);
+		}
+		$morehtmlref .= '</div>';
 	}
 
 	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, $param);
@@ -302,7 +302,7 @@ if ($object->id > 0)
 
 	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<br>';
 
diff --git a/htdocs/projet/tasks/list.php b/htdocs/projet/tasks/list.php
index f2d455f7a04..d626c439ce8 100644
--- a/htdocs/projet/tasks/list.php
+++ b/htdocs/projet/tasks/list.php
@@ -129,9 +129,9 @@ $arrayfields = array(
 	't.progress_calculated'=>array('label'=>$langs->trans("ProgressCalculated"), 'checked'=>1, 'position'=>104),
 	't.progress'=>array('label'=>$langs->trans("ProgressDeclared"), 'checked'=>1, 'position'=>105),
 	't.progress_summary'=>array('label'=>$langs->trans("TaskProgressSummary"), 'checked'=>1, 'position'=>106),
-    't.tobill'=>array('label'=>$langs->trans("TimeToBill"), 'checked'=>0, 'position'=>110),
-    't.billed'=>array('label'=>$langs->trans("TimeBilled"), 'checked'=>0, 'position'=>111),
-    't.datec'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0, 'position'=>500),
+	't.tobill'=>array('label'=>$langs->trans("TimeToBill"), 'checked'=>0, 'position'=>110),
+	't.billed'=>array('label'=>$langs->trans("TimeBilled"), 'checked'=>0, 'position'=>111),
+	't.datec'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0, 'position'=>500),
 	't.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500),
 	//'t.fk_statut'=>array('label'=>$langs->trans("Status"), 'checked'=>1, 'position'=>1000),
 );
@@ -276,7 +276,7 @@ if ($search_categ) $sql .= ", cs.fk_categorie, cs.fk_project";
 // Add sum fields
 if (!empty($arrayfields['t.tobill']['checked']) || !empty($arrayfields['t.billed']['checked']))
 {
-    $sql .= " , SUM(tt.task_duration * ".$db->ifsql("invoice_id IS NULL", "1", "0").") as tobill, SUM(tt.task_duration * ".$db->ifsql("invoice_id IS NULL", "0", "1").") as billed";
+	$sql .= " , SUM(tt.task_duration * ".$db->ifsql("invoice_id IS NULL", "1", "0").") as tobill, SUM(tt.task_duration * ".$db->ifsql("invoice_id IS NULL", "0", "1").") as billed";
 }
 // Add fields from extrafields
 if (!empty($extrafields->attributes[$object->table_element]['label'])) {
@@ -293,7 +293,7 @@ if (!empty($search_categ)) $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_proje
 $sql .= ", ".MAIN_DB_PREFIX."projet_task as t";
 if (!empty($arrayfields['t.tobill']['checked']) || !empty($arrayfields['t.billed']['checked']))
 {
-    $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."projet_task_time as tt ON tt.fk_task = t.rowid";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."projet_task_time as tt ON tt.fk_task = t.rowid";
 }
 if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (t.rowid = ef.fk_object)";
 if ($search_project_user > 0)  $sql .= ", ".MAIN_DB_PREFIX."element_contact as ecp";
@@ -333,15 +333,15 @@ $reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // No
 $sql .= $hookmanager->resPrint;
 if (!empty($arrayfields['t.tobill']['checked']) || !empty($arrayfields['t.billed']['checked']))
 {
-    $sql .= " GROUP BY p.rowid, p.ref, p.title, p.fk_statut, p.datee, p.fk_opp_status, p.public, p.fk_user_creat,";
-    $sql .= " s.nom, s.rowid,";
-    $sql .= " t.datec, t.dateo, t.datee, t.tms,";
-    $sql .= " t.rowid, t.ref, t.label, t.planned_workload, t.duration_effective, t.progress, t.fk_statut";
-    if ($search_categ) $sql .= ", cs.fk_categorie, cs.fk_project";
-    // Add fields from extrafields
-    if (!empty($extrafields->attributes[$object->table_element]['label'])) {
-    	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) $sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef.".$key : '');
-    }
+	$sql .= " GROUP BY p.rowid, p.ref, p.title, p.fk_statut, p.datee, p.fk_opp_status, p.public, p.fk_user_creat,";
+	$sql .= " s.nom, s.rowid,";
+	$sql .= " t.datec, t.dateo, t.datee, t.tms,";
+	$sql .= " t.rowid, t.ref, t.label, t.planned_workload, t.duration_effective, t.progress, t.fk_statut";
+	if ($search_categ) $sql .= ", cs.fk_categorie, cs.fk_project";
+	// Add fields from extrafields
+	if (!empty($extrafields->attributes[$object->table_element]['label'])) {
+		foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) $sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef.".$key : '');
+	}
 }
 $sql .= $db->order($sortfield, $sortorder);
 
@@ -437,8 +437,8 @@ print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 $texthelp = '';
 if ($search_task_user == $user->id) $texthelp .= $langs->trans("MyTasksDesc");
 else {
-    if ($user->rights->projet->all->lire && !$socid) $texthelp .= $langs->trans("TasksOnProjectsDesc");
-    else $texthelp .= $langs->trans("TasksOnProjectsPublicDesc");
+	if ($user->rights->projet->all->lire && !$socid) $texthelp .= $langs->trans("TasksOnProjectsDesc");
+	else $texthelp .= $langs->trans("TasksOnProjectsPublicDesc");
 }
 
 print_barre_liste($form->textwithpicto($title, $texthelp), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'projecttask', 0, $newcardbutton, '', $limit, 0, 0, 1);
@@ -656,9 +656,9 @@ while ($i < min($num, $limit))
 	$object->progress = $obj->progress;
 	$object->datee = $db->jdate($obj->date_end); // deprecated
 	$object->date_end = $db->jdate($obj->date_end);
-    $object->planned_workload = $obj->planned_workload;
-    $object->duration_effective = $obj->duration_effective;
-    $object->fk_task_parent = $obj->fk_task_parent;
+	$object->planned_workload = $obj->planned_workload;
+	$object->duration_effective = $obj->duration_effective;
+	$object->fk_task_parent = $obj->fk_task_parent;
 
 
 	$projectstatic->id = $obj->projectid;
@@ -843,8 +843,8 @@ while ($i < min($num, $limit))
 		{
 			print '<td class="center">';
 			if ($obj->progress != '' && $obj->duration_effective) {
-                print getTaskProgressView($object, false, false);
-            }
+				print getTaskProgressView($object, false, false);
+			}
 			print '</td>';
 			if (!$i) $totalarray['nbfield']++;
 			if (!$i) $totalarray['totalprogress_summary'] = $totalarray['nbfield'];
@@ -852,36 +852,36 @@ while ($i < min($num, $limit))
 		// Time not billed
 		if (!empty($arrayfields['t.tobill']['checked']))
 		{
-		    print '<td class="center">';
-		    if ($obj->usage_bill_time)
-		    {
-		        print convertSecondToTime($obj->tobill, 'allhourmin');
-		        $totalarray['val']['t.tobill'] += $obj->tobill;
-		        $totalarray['totaltobill'] += $obj->tobill;
-		    } else {
-		        print '<span class="opacitymedium">'.$langs->trans("NA").'</span>';
-		    }
-		    print '</td>';
-		    if (!$i) $totalarray['nbfield']++;
-		    if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 't.tobill';
-		    if (!$i) $totalarray['totaltobillfield'] = $totalarray['nbfield'];
+			print '<td class="center">';
+			if ($obj->usage_bill_time)
+			{
+				print convertSecondToTime($obj->tobill, 'allhourmin');
+				$totalarray['val']['t.tobill'] += $obj->tobill;
+				$totalarray['totaltobill'] += $obj->tobill;
+			} else {
+				print '<span class="opacitymedium">'.$langs->trans("NA").'</span>';
+			}
+			print '</td>';
+			if (!$i) $totalarray['nbfield']++;
+			if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 't.tobill';
+			if (!$i) $totalarray['totaltobillfield'] = $totalarray['nbfield'];
 		}
 		// Time billed
 		if (!empty($arrayfields['t.billed']['checked']))
 		{
-		    print '<td class="center">';
-		    if ($obj->usage_bill_time)
-		    {
-		        print convertSecondToTime($obj->billed, 'allhourmin');
-		        $totalarray['val']['t.billed'] += $obj->billed;
-		        $totalarray['totalbilled'] += $obj->billed;
-		    } else {
-		        print '<span class="opacitymedium">'.$langs->trans("NA").'</span>';
-		    }
-		    print '</td>';
-		    if (!$i) $totalarray['nbfield']++;
-		    if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 't.billed';
-		    if (!$i) $totalarray['totalbilledfield'] = $totalarray['nbfield'];
+			print '<td class="center">';
+			if ($obj->usage_bill_time)
+			{
+				print convertSecondToTime($obj->billed, 'allhourmin');
+				$totalarray['val']['t.billed'] += $obj->billed;
+				$totalarray['totalbilled'] += $obj->billed;
+			} else {
+				print '<span class="opacitymedium">'.$langs->trans("NA").'</span>';
+			}
+			print '</td>';
+			if (!$i) $totalarray['nbfield']++;
+			if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 't.billed';
+			if (!$i) $totalarray['totalbilledfield'] = $totalarray['nbfield'];
 		}
 		// Extra fields
 		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
diff --git a/htdocs/projet/tasks/note.php b/htdocs/projet/tasks/note.php
index 20a38700685..af5709c7322 100644
--- a/htdocs/projet/tasks/note.php
+++ b/htdocs/projet/tasks/note.php
@@ -122,15 +122,15 @@ if ($object->id > 0)
 		// Thirdparty
 		if ($projectstatic->thirdparty->id > 0)
 		{
-		    $morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$projectstatic->thirdparty->getNomUrl(1, 'project');
+			$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$projectstatic->thirdparty->getNomUrl(1, 'project');
 		}
 		$morehtmlref .= '</div>';
 
 		// Define a complementary filter for search of next/prev ref.
 		if (!$user->rights->projet->all->lire)
 		{
-		    $objectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 0);
-		    $projectstatic->next_prev_filter = " rowid in (".(count($objectsListId) ?join(',', array_keys($objectsListId)) : '0').")";
+			$objectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 0);
+			$projectstatic->next_prev_filter = " rowid in (".(count($objectsListId) ?join(',', array_keys($objectsListId)) : '0').")";
 		}
 
 		dol_banner_tab($projectstatic, 'project_ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
@@ -210,9 +210,9 @@ if ($object->id > 0)
 
 		// Categories
 		if ($conf->categorie->enabled) {
-		    print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td>';
-		    print $form->showCategories($projectstatic->id, 'project', 1);
-		    print "</td></tr>";
+			print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td>';
+			print $form->showCategories($projectstatic->id, 'project', 1);
+			print "</td></tr>";
 		}
 
 		print '</table>';
@@ -223,7 +223,7 @@ if ($object->id > 0)
 
 		print '<div class="clearboth"></div>';
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 		print '<br>';
 	}
@@ -237,8 +237,8 @@ if ($object->id > 0)
 
 	if (!GETPOST('withproject') || empty($projectstatic->id))
 	{
-	    $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1);
-	    $object->next_prev_filter = " fk_projet in (".$projectsListId.")";
+		$projectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1);
+		$object->next_prev_filter = " fk_projet in (".$projectsListId.")";
 	} else $object->next_prev_filter = " fk_projet = ".$projectstatic->id;
 
 	$morehtmlref = '';
@@ -246,30 +246,30 @@ if ($object->id > 0)
 	// Project
 	if (empty($withproject))
 	{
-	    $morehtmlref .= '<div class="refidno">';
-	    $morehtmlref .= $langs->trans("Project").': ';
-	    $morehtmlref .= $projectstatic->getNomUrl(1);
-	    $morehtmlref .= '<br>';
+		$morehtmlref .= '<div class="refidno">';
+		$morehtmlref .= $langs->trans("Project").': ';
+		$morehtmlref .= $projectstatic->getNomUrl(1);
+		$morehtmlref .= '<br>';
 
-	    // Third party
-	    $morehtmlref .= $langs->trans("ThirdParty").': ';
-	    $morehtmlref .= $projectstatic->thirdparty->getNomUrl(1);
-	    $morehtmlref .= '</div>';
+		// Third party
+		$morehtmlref .= $langs->trans("ThirdParty").': ';
+		$morehtmlref .= $projectstatic->thirdparty->getNomUrl(1);
+		$morehtmlref .= '</div>';
 	}
 
 	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, $param);
 
 	print '<div class="fichecenter">';
 
-    print '<div class="underbanner clearboth"></div>';
+	print '<div class="underbanner clearboth"></div>';
 
 	$cssclass = 'titlefield';
-    $moreparam = $param;
+	$moreparam = $param;
 	include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
 
 	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 }
 
 // End of page
diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php
index 528c04b23d1..f965b2317bd 100644
--- a/htdocs/projet/tasks/task.php
+++ b/htdocs/projet/tasks/task.php
@@ -93,13 +93,13 @@ if ($action == 'update' && !$_POST["cancel"] && $user->rights->projet->creer)
 		if (empty($task_parent)) $task_parent = 0; // If task_parent is ''
 
 		$object->ref = $taskref ? $taskref : GETPOST("ref", 'alpha', 2);
-		$object->label = $_POST["label"];
-		$object->description = $_POST['description'];
+		$object->label = GETPOST("label", "alphanohtml");
+		$object->description = GETPOST('description', "alphanohtml");
 		$object->fk_task_parent = $task_parent;
 		$object->planned_workload = $planned_workload;
-		$object->date_start = dol_mktime($_POST['dateohour'], $_POST['dateomin'], 0, $_POST['dateomonth'], $_POST['dateoday'], $_POST['dateoyear']);
-		$object->date_end = dol_mktime($_POST['dateehour'], $_POST['dateemin'], 0, $_POST['dateemonth'], $_POST['dateeday'], $_POST['dateeyear']);
-		$object->progress = $_POST['progress'];
+		$object->date_start = dol_mktime(GETPOST('dateohour', 'int'), GETPOST('dateomin', 'int'), 0, GETPOST('dateomonth', 'int'), GETPOST('dateoday', 'int'), GETPOST('dateoyear', 'int'));
+		$object->date_end = dol_mktime(GETPOST('dateehour', 'int'), GETPOST('dateemin', 'int'), 0, GETPOST('dateemonth', 'int'), GETPOST('dateeday', 'int'), GETPOST('dateeyear', 'int'));
+		$object->progress = price2num(GETPOST('progress', 'alphanohtml'));
 
 		// Fill array 'array_options' with data from add form
 		$ret = $extrafields->setOptionalsFromPost(null, $object);
@@ -182,7 +182,7 @@ if ($action == 'remove_file' && $user->rights->projet->creer)
 	{
 		$langs->load("other");
 		$upload_dir = $conf->projet->dir_output;
-		$file = $upload_dir.'/'.GETPOST('file');
+		$file = $upload_dir.'/'.dol_sanitizeFileName(GETPOST('file'));
 
 		$ret = dol_delete_file($file);
 		if ($ret) setEventMessages($langs->trans("FileWasRemoved", GETPOST('urlfile')), null, 'mesgs');
@@ -190,11 +190,11 @@ if ($action == 'remove_file' && $user->rights->projet->creer)
 	}
 }
 
+
 /*
  * View
  */
 
-
 llxHeader('', $langs->trans("Task"));
 
 $form = new Form($db);
@@ -214,7 +214,7 @@ if ($id > 0 || !empty($ref))
 
 		$object->project = clone $projectstatic;
 
-		$userWrite = $projectstatic->restrictedProjectArea($user, 'write');
+		//$userWrite = $projectstatic->restrictedProjectArea($user, 'write');
 
 		if (!empty($withproject))
 		{
@@ -337,7 +337,7 @@ if ($id > 0 || !empty($ref))
 
 			print '<div class="clearboth"></div>';
 
-			dol_fiche_end();
+			print dol_get_fiche_end();
 
 			print '<br>';
 		}
@@ -448,7 +448,7 @@ if ($id > 0 || !empty($ref))
 
 			print '</table>';
 
-			dol_fiche_end();
+			print dol_get_fiche_end();
 
 			print '<div class="center">';
 			print '<input type="submit" class="button" name="update" value="'.$langs->trans("Modify").'"> &nbsp; ';
@@ -574,7 +574,7 @@ if ($id > 0 || !empty($ref))
 			print '</div>';
 			print '<div class="clearboth"></div>';
 
-			dol_fiche_end();
+			print dol_get_fiche_end();
 		}
 
 
diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index ad53dc30a07..28bb941c687 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -333,9 +333,7 @@ if ($action == 'confirm_generateinvoice')
 {
 	if (!empty($projectstatic->socid)) $projectstatic->fetch_thirdparty();
 
-
-	if (!($projectstatic->thirdparty->id > 0))
-	{
+	if (!($projectstatic->thirdparty->id > 0)) {
 		setEventMessages($langs->trans("ThirdPartyRequiredToGenerateInvoice"), null, 'errors');
 	} else {
 		include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
@@ -350,27 +348,28 @@ if ($action == 'confirm_generateinvoice')
 		$db->begin();
 		$idprod = GETPOST('productid', 'int');
 		$generateinvoicemode = GETPOST('generateinvoicemode', 'string');
-        $invoiceToUse = GETPOST('invoiceid', 'int');
+		$invoiceToUse = GETPOST('invoiceid', 'int');
 
-        $prodDurationHours = 1.0;
+		$prodDurationHours = 1.0;
 		if ($idprod > 0)
 		{
 			$tmpproduct->fetch($idprod);
-            if ($tmpproduct->duration_unit == 'i')
-                $prodDurationHours = 1. / 60;
-            if ($tmpproduct->duration_unit == 'h')
-                $prodDurationHours = 1.;
-            if ($tmpproduct->duration_unit == 'd')
-                $prodDurationHours = 24.;
-            if ($tmpproduct->duration_unit == 'w')
-                $prodDurationHours = 24. * 7;
-            if ($tmpproduct->duration_unit == 'm')
-                $prodDurationHours = 24. * 30;
-            if ($tmpproduct->duration_unit == 'y')
-                $prodDurationHours = 24. * 365;
-            $prodDurationHours *= $tmpproduct->duration_value;
+			if ($tmpproduct->duration_unit == 'i')
+				$prodDurationHours = 1. / 60;
+			if ($tmpproduct->duration_unit == 'h')
+				$prodDurationHours = 1.;
+			if ($tmpproduct->duration_unit == 'd')
+				$prodDurationHours = 24.;
+			if ($tmpproduct->duration_unit == 'w')
+				$prodDurationHours = 24. * 7;
+			if ($tmpproduct->duration_unit == 'm')
+				$prodDurationHours = 24. * 30;
+			if ($tmpproduct->duration_unit == 'y')
+				$prodDurationHours = 24. * 365;
+			$prodDurationHours *= $tmpproduct->duration_value;
 
 			$dataforprice = $tmpproduct->getSellPrice($mysoc, $projectstatic->thirdparty, 0);
+
 			$pu_ht = empty($dataforprice['pu_ht']) ? 0 : $dataforprice['pu_ht'];
 			$txtva = $dataforprice['tva_tx'];
 			$localtax1 = $dataforprice['localtax1'];
@@ -386,16 +385,16 @@ if ($action == 'confirm_generateinvoice')
 		$tmpinvoice->date = dol_mktime(GETPOST('rehour', 'int'), GETPOST('remin', 'int'), GETPOST('resec', 'int'), GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
 		$tmpinvoice->fk_project = $projectstatic->id;
 
-        if ($invoiceToUse) {
-            $tmpinvoice->fetch($invoiceToUse);
-        } else {
-		    $result = $tmpinvoice->create($user);
-		    if ($result <= 0)
-		    {
-		    	$error++;
-		    	setEventMessages($tmpinvoice->error, $tmpinvoice->errors, 'errors');
-		    }
-        }
+		if ($invoiceToUse) {
+			$tmpinvoice->fetch($invoiceToUse);
+		} else {
+			$result = $tmpinvoice->create($user);
+			if ($result <= 0)
+			{
+				$error++;
+				setEventMessages($tmpinvoice->error, $tmpinvoice->errors, 'errors');
+			}
+		}
 
 		if (!$error)
 		{
@@ -700,7 +699,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 
 			print '<div class="clearboth"></div>';
 
-			dol_fiche_end();
+			print dol_get_fiche_end();
 
 			print '<br>';
 		}
@@ -842,7 +841,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 		print '</div>';
 		print '<div class="clearboth"></div>';
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 	}
 
 
@@ -916,69 +915,79 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 		print '<input type="hidden" name="withproject" value="'.$withproject.'">';
 		print '<input type="hidden" name="tab" value="'.$tab.'">';
 
+		// Form to convert time spent into invoice
 		if ($massaction == 'generateinvoice')
 		{
-			//var_dump($_REQUEST);
 			print '<input type="hidden" name="massaction" value="confirm_createbills">';
 
-			print '<table class="noborder" width="100%" >';
-			print '<tr>';
-			print '<td class="titlefield">';
-			print $langs->trans('DateInvoice');
-			print '</td>';
-			print '<td>';
-			print $form->selectDate('', '', '', '', '', '', 1, 1);
-			print '</td>';
-			print '</tr>';
-			print '<tr>';
-			print '<td>';
-			print $langs->trans('Mode');
-			print '</td>';
-			print '<td>';
-			$tmparray = array(
-				'onelineperuser'=>'OneLinePerUser',
-				'onelinepertask'=>'OneLinePerTask',
-				'onelineperperiod'=>'OneLinePerPeriod',
-			);
-			print $form->selectarray('generateinvoicemode', $tmparray, 'onelineperuser', 0, 0, 0, '', 1);
-			print '</td>';
-			print '</tr>';
-			if ($conf->service->enabled)
-			{
+			if ($projectstatic->thirdparty->id > 0) {
+				print '<table class="noborder" width="100%" >';
 				print '<tr>';
-				print '<td>';
-				print $langs->trans('ServiceToUseOnLines');
+				print '<td class="titlefield">';
+				print $langs->trans('DateInvoice');
 				print '</td>';
 				print '<td>';
-				$form->select_produits('', 'productid', '1', 0, 0, 1, 2, '', 0, array(), 0, 'None', 0, 'maxwidth500');
+				print $form->selectDate('', '', '', '', '', '', 1, 1);
 				print '</td>';
 				print '</tr>';
-			}
-			print '<tr>';
-			print '<td class="titlefield">';
-			print $langs->trans('InvoiceToUse');
-			print '</td>';
-			print '<td>';
-            $form->selectInvoice('invoice', '', 'invoiceid', 24, 0, $langs->trans('NewInvoice'),
-			1, 0, 0, 'maxwidth500', '', 'all');
-			print '</td>';
-			print '</tr>';
-			/*print '<tr>';
-			print '<td>';
-			print $langs->trans('ValidateInvoices');
-			print '</td>';
-			print '<td>';
-			print $form->selectyesno('validate_invoices', 0, 1);
-			print '</td>';
-			print '</tr>';*/
-			print '</table>';
 
-			print '<br>';
-			print '<div class="center">';
-			print '<input type="submit" class="button" id="createbills" name="createbills" value="'.$langs->trans('GenerateBill').'">  ';
-			print '<input type="submit" class="button" id="cancel" name="cancel" value="'.$langs->trans('Cancel').'">';
-			print '</div>';
-			print '<br>';
+				print '<tr>';
+				print '<td>';
+				print $langs->trans('Mode');
+				print '</td>';
+				print '<td>';
+				$tmparray = array(
+					'onelineperuser'=>'OneLinePerUser',
+					'onelinepertask'=>'OneLinePerTask',
+					'onelineperperiod'=>'OneLinePerPeriod',
+				);
+				print $form->selectarray('generateinvoicemode', $tmparray, 'onelineperuser', 0, 0, 0, '', 1);
+				print '</td>';
+				print '</tr>';
+
+				if ($conf->service->enabled)
+				{
+					print '<tr>';
+					print '<td>';
+					print $langs->trans('ServiceToUseOnLines');
+					print '</td>';
+					print '<td>';
+					$form->select_produits('', 'productid', '1', 0, $projectstatic->thirdparty->price_level, 1, 2, '', 0, array(), $projectstatic->thirdparty->id, 'None', 0, 'maxwidth500');
+					print '</td>';
+					print '</tr>';
+				}
+
+				print '<tr>';
+				print '<td class="titlefield">';
+				print $langs->trans('InvoiceToUse');
+				print '</td>';
+				print '<td>';
+	            $form->selectInvoice('invoice', '', 'invoiceid', 24, 0, $langs->trans('NewInvoice'), 1, 0, 0, 'maxwidth500', '', 'all');
+				print '</td>';
+				print '</tr>';
+				/*print '<tr>';
+				print '<td>';
+				print $langs->trans('ValidateInvoices');
+				print '</td>';
+				print '<td>';
+				print $form->selectyesno('validate_invoices', 0, 1);
+				print '</td>';
+				print '</tr>';*/
+				print '</table>';
+
+				print '<br>';
+				print '<div class="center">';
+				print '<input type="submit" class="button" id="createbills" name="createbills" value="'.$langs->trans('GenerateBill').'">  ';
+				print '<input type="submit" class="button" id="cancel" name="cancel" value="'.$langs->trans('Cancel').'">';
+				print '</div>';
+				print '<br>';
+			} else {
+				print '<div class="warning">'.$langs->trans("ThirdPartyRequiredToGenerateInvoice").'</div>';
+				print '<div class="center">';
+				print '<input type="submit" class="button" id="cancel" name="cancel" value="'.$langs->trans('Cancel').'">';
+				print '</div>';
+				$massaction = '';
+			}
 		}
 
 		/*
@@ -1065,7 +1074,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 		}
 
 		/*
-		 * Form to add time spent
+		 * Form to add a new line of time spent
 		 */
 		if ($action == 'createtime' && $user->rights->projet->lire)
 		{
@@ -1286,11 +1295,11 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 			}
 
 			// Task ref
-            if (!empty($arrayfields['t.task_ref']['checked']))
-            {
-        		if ((empty($id) && empty($ref)) || !empty($projectidforalltimes))   // Not a dedicated task
-    			{
-        			print '<td class="nowrap">';
+			if (!empty($arrayfields['t.task_ref']['checked']))
+			{
+				if ((empty($id) && empty($ref)) || !empty($projectidforalltimes))   // Not a dedicated task
+				{
+					print '<td class="nowrap">';
 					if ($action == 'editline' && $_GET['lineid'] == $task_time->rowid)
 					{
 						$formproject->selectTasks(-1, GETPOST('taskid', 'int') ?GETPOST('taskid', 'int') : $task_time->fk_task, 'taskid', 0, 0, 1, 1, 0, 0, 'maxwidth300', $projectstatic->id, '');
@@ -1300,12 +1309,12 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 						$tasktmp->label = $task_time->label;
 						print $tasktmp->getNomUrl(1, 'withproject', 'time');
 					}
-        			print '</td>';
-        			if (!$i) $totalarray['nbfield']++;
-    			}
-            } else {
-            	print '<input type="hidden" name="taskid" value="'.$id.'">';
-            }
+					print '</td>';
+					if (!$i) $totalarray['nbfield']++;
+				}
+			} else {
+				print '<input type="hidden" name="taskid" value="'.$id.'">';
+			}
 
 			// Task label
 			if (!empty($arrayfields['t.task_label']['checked']))
diff --git a/htdocs/public/agenda/agendaexport.php b/htdocs/public/agenda/agendaexport.php
index 465c0190e65..395bfd8915a 100644
--- a/htdocs/public/agenda/agendaexport.php
+++ b/htdocs/public/agenda/agendaexport.php
@@ -60,7 +60,7 @@ function llxFooterVierge()
 
 // For MultiCompany module.
 // Do not use GETPOST here, function is not defined and define must be done before including main.inc.php
-$entity=(! empty($_GET['entity']) ? (int) $_GET['entity'] : (! empty($_POST['entity']) ? (int) $_POST['entity'] : 1));
+$entity = (!empty($_GET['entity']) ? (int) $_GET['entity'] : (!empty($_POST['entity']) ? (int) $_POST['entity'] : 1));
 if (is_numeric($entity)) define("DOLENTITY", $entity);
 
 require '../../main.inc.php';
diff --git a/htdocs/public/cron/cron_run_jobs.php b/htdocs/public/cron/cron_run_jobs.php
index f8da10b3901..cd5f1e3be51 100644
--- a/htdocs/public/cron/cron_run_jobs.php
+++ b/htdocs/public/cron/cron_run_jobs.php
@@ -38,8 +38,8 @@ if (is_numeric($entity)) define("DOLENTITY", $entity);
 // Error if CLI mode
 if (php_sapi_name() == "cli")
 {
-    echo "Error: This page can't be used as a CLI script. For the CLI version of script, launch cron_run_job.php available into scripts/cron/ directory.\n";
-    exit(-1);
+	echo "Error: This page can't be used as a CLI script. For the CLI version of script, launch cron_run_job.php available into scripts/cron/ directory.\n";
+	exit(-1);
 }
 
 // librarie core
@@ -140,57 +140,57 @@ $nbofjobslaunchedko = 0;
 
 if (is_array($qualifiedjobs) && (count($qualifiedjobs) > 0))
 {
-    $savconf = dol_clone($conf);
+	$savconf = dol_clone($conf);
 
-    // Loop over job
+	// Loop over job
 	foreach ($qualifiedjobs as $line)
 	{
-	    dol_syslog("cron_run_jobs.php cronjobid: ".$line->id." priority=".$line->priority." entity=".$line->entity." label=".$line->label, LOG_DEBUG);
-	    echo "cron_run_jobs.php cronjobid: ".$line->id." priority=".$line->priority." entity=".$line->entity." label=".$line->label;
+		dol_syslog("cron_run_jobs.php cronjobid: ".$line->id." priority=".$line->priority." entity=".$line->entity." label=".$line->label, LOG_DEBUG);
+		echo "cron_run_jobs.php cronjobid: ".$line->id." priority=".$line->priority." entity=".$line->entity." label=".$line->label;
 
 		// Force reload of setup for the current entity
 		if ($line->entity != $conf->entity)
 		{
-		    dol_syslog("cron_run_jobs.php we work on another entity so we reload user and conf", LOG_DEBUG);
-		    echo " -> we change entity so we reload user and conf";
+			dol_syslog("cron_run_jobs.php we work on another entity so we reload user and conf", LOG_DEBUG);
+			echo " -> we change entity so we reload user and conf";
 
-		    $conf->entity = (empty($line->entity) ? 1 : $line->entity);
-		    $conf->setValues($db); // This make also the $mc->setValues($conf); that reload $mc->sharings
+			$conf->entity = (empty($line->entity) ? 1 : $line->entity);
+			$conf->setValues($db); // This make also the $mc->setValues($conf); that reload $mc->sharings
 
-		    // Force recheck that user is ok for the entity to process and reload permission for entity
-		    if ($conf->entity != $user->entity && $user->entity != 0)
-		    {
-		        $result = $user->fetch('', $userlogin, '', 0, $conf->entity);
-		        if ($result < 0)
-		        {
-		            echo "\nUser Error: ".$user->error."\n";
-		            dol_syslog("cron_run_jobs.php:: User Error:".$user->error, LOG_ERR);
-		            exit(-1);
-		        } else {
-		            if ($result == 0)
-		            {
-		                echo "\nUser login: ".$userlogin." does not exists for entity ".$conf->entity."\n";
-		                dol_syslog("User login:".$userlogin." does not exists", LOG_ERR);
-		                exit(-1);
-		            }
-		        }
-		        $user->getrights();
-		    }
+			// Force recheck that user is ok for the entity to process and reload permission for entity
+			if ($conf->entity != $user->entity && $user->entity != 0)
+			{
+				$result = $user->fetch('', $userlogin, '', 0, $conf->entity);
+				if ($result < 0)
+				{
+					echo "\nUser Error: ".$user->error."\n";
+					dol_syslog("cron_run_jobs.php:: User Error:".$user->error, LOG_ERR);
+					exit(-1);
+				} else {
+					if ($result == 0)
+					{
+						echo "\nUser login: ".$userlogin." does not exists for entity ".$conf->entity."\n";
+						dol_syslog("User login:".$userlogin." does not exists", LOG_ERR);
+						exit(-1);
+					}
+				}
+				$user->getrights();
+			}
 		}
 
 		//If date_next_jobs is less of current date, execute the program, and store the execution time of the next execution in database
 		if (($line->datenextrun < $now) && (empty($line->datestart) || $line->datestart <= $now) && (empty($line->dateend) || $line->dateend >= $now))
 		{
-		    echo " - qualified";
+			echo " - qualified";
 
-		    dol_syslog("cron_run_jobs.php line->datenextrun:".dol_print_date($line->datenextrun, 'dayhourrfc')." line->datestart:".dol_print_date($line->datestart, 'dayhourrfc')." line->dateend:".dol_print_date($line->dateend, 'dayhourrfc')." now:".dol_print_date($now, 'dayhourrfc'));
+			dol_syslog("cron_run_jobs.php line->datenextrun:".dol_print_date($line->datenextrun, 'dayhourrfc')." line->datestart:".dol_print_date($line->datestart, 'dayhourrfc')." line->dateend:".dol_print_date($line->dateend, 'dayhourrfc')." now:".dol_print_date($now, 'dayhourrfc'));
 
 			$cronjob = new Cronjob($db);
 			$result = $cronjob->fetch($line->id);
 			if ($result < 0)
 			{
-			    echo "Error cronjobid: ".$line->id." cronjob->fetch: ".$cronjob->error."\n";
-			    echo "Failed to fetch job ".$line->id."\n";
+				echo "Error cronjobid: ".$line->id." cronjob->fetch: ".$cronjob->error."\n";
+				echo "Failed to fetch job ".$line->id."\n";
 				dol_syslog("cron_run_jobs.php::fetch Error".$cronjob->error, LOG_ERR);
 				exit;
 			}
@@ -198,10 +198,10 @@ if (is_array($qualifiedjobs) && (count($qualifiedjobs) > 0))
 			$result = $cronjob->run_jobs($userlogin);
 			if ($result < 0)
 			{
-			    echo "Error cronjobid: ".$line->id." cronjob->run_job: ".$cronjob->error."\n";
-			    echo "At least one job failed. Go on menu Home-Setup-Admin tools to see result for each job.\n";
-			    echo "You can also enable module Log if not yet enabled, run again and take a look into dolibarr.log file\n";
-			    dol_syslog("cron_run_jobs.php::run_jobs Error".$cronjob->error, LOG_ERR);
+				echo "Error cronjobid: ".$line->id." cronjob->run_job: ".$cronjob->error."\n";
+				echo "At least one job failed. Go on menu Home-Setup-Admin tools to see result for each job.\n";
+				echo "You can also enable module Log if not yet enabled, run again and take a look into dolibarr.log file\n";
+				dol_syslog("cron_run_jobs.php::run_jobs Error".$cronjob->error, LOG_ERR);
 				$nbofjobslaunchedko++;
 			} else {
 				$nbofjobslaunchedok++;
@@ -213,17 +213,17 @@ if (is_array($qualifiedjobs) && (count($qualifiedjobs) > 0))
 			$result = $cronjob->reprogram_jobs($userlogin, $now);
 			if ($result < 0)
 			{
-			    echo "Error cronjobid: ".$line->id." cronjob->reprogram_job: ".$cronjob->error."\n";
-			    echo "Enable module Log if not yet enabled, run again and take a look into dolibarr.log file\n";
-			    dol_syslog("cron_run_jobs.php::reprogram_jobs Error".$cronjob->error, LOG_ERR);
+				echo "Error cronjobid: ".$line->id." cronjob->reprogram_job: ".$cronjob->error."\n";
+				echo "Enable module Log if not yet enabled, run again and take a look into dolibarr.log file\n";
+				dol_syslog("cron_run_jobs.php::reprogram_jobs Error".$cronjob->error, LOG_ERR);
 				exit;
 			}
 
 			echo " - reprogrammed\n";
 		} else {
-		    echo " - not qualified\n";
+			echo " - not qualified\n";
 
-		    dol_syslog("cron_run_jobs.php job not qualified line->datenextrun:".dol_print_date($line->datenextrun, 'dayhourrfc')." line->datestart:".dol_print_date($line->datestart, 'dayhourrfc')." line->dateend:".dol_print_date($line->dateend, 'dayhourrfc')." now:".dol_print_date($now, 'dayhourrfc'));
+			dol_syslog("cron_run_jobs.php job not qualified line->datenextrun:".dol_print_date($line->datenextrun, 'dayhourrfc')." line->datestart:".dol_print_date($line->datestart, 'dayhourrfc')." line->dateend:".dol_print_date($line->dateend, 'dayhourrfc')." now:".dol_print_date($now, 'dayhourrfc'));
 		}
 	}
 
diff --git a/htdocs/public/donations/donateurs_code.php b/htdocs/public/donations/donateurs_code.php
index 3149aa7f2b2..511809d58ac 100644
--- a/htdocs/public/donations/donateurs_code.php
+++ b/htdocs/public/donations/donateurs_code.php
@@ -35,7 +35,7 @@ if (!defined('NOIPCHECK'))		define('NOIPCHECK', '1'); // Do not check IP defined
  */
 function llxHeaderVierge()
 {
-    print '<html><title>Export agenda cal</title><body>';
+	print '<html><title>Export agenda cal</title><body>';
 }
 /**
  * Header function
@@ -44,7 +44,7 @@ function llxHeaderVierge()
  */
 function llxFooterVierge()
 {
-    print '</body></html>';
+	print '</body></html>';
 }
 
 require '../../main.inc.php';
diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php
index 04b7e6ba3d2..923c57b4692 100644
--- a/htdocs/public/members/new.php
+++ b/htdocs/public/members/new.php
@@ -70,8 +70,8 @@ $langs->loadLangs(array("main", "members", "companies", "install", "other"));
 if (empty($conf->adherent->enabled)) accessforbidden('', 0, 0, 1);
 
 if (empty($conf->global->MEMBER_ENABLE_PUBLIC)) {
-    print $langs->trans("Auto subscription form for public visitors has not been enabled");
-    exit;
+	print $langs->trans("Auto subscription form for public visitors has not been enabled");
+	exit;
 }
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
@@ -97,39 +97,39 @@ $user->loadDefaultValues();
  */
 function llxHeaderVierge($title, $head = "", $disablejs = 0, $disablehead = 0, $arrayofjs = '', $arrayofcss = '')
 {
-    global $user, $conf, $langs, $mysoc;
+	global $user, $conf, $langs, $mysoc;
 
-    top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss); // Show html headers
+	top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss); // Show html headers
 
-    print '<body id="mainbody" class="publicnewmemberform">';
+	print '<body id="mainbody" class="publicnewmemberform">';
 
-    // Define urllogo
-    $urllogo = DOL_URL_ROOT.'/theme/common/login_logo.png';
+	// Define urllogo
+	$urllogo = DOL_URL_ROOT.'/theme/common/login_logo.png';
 
-    if (!empty($mysoc->logo_small) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small)) {
-        $urllogo = DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=mycompany&amp;file='.urlencode('logos/thumbs/'.$mysoc->logo_small);
-    } elseif (!empty($mysoc->logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$mysoc->logo)) {
-        $urllogo = DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=mycompany&amp;file='.urlencode('logos/'.$mysoc->logo);
-    } elseif (is_readable(DOL_DOCUMENT_ROOT.'/theme/dolibarr_logo.svg')) {
-        $urllogo = DOL_URL_ROOT.'/theme/dolibarr_logo.svg';
-    }
+	if (!empty($mysoc->logo_small) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small)) {
+		$urllogo = DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=mycompany&amp;file='.urlencode('logos/thumbs/'.$mysoc->logo_small);
+	} elseif (!empty($mysoc->logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$mysoc->logo)) {
+		$urllogo = DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=mycompany&amp;file='.urlencode('logos/'.$mysoc->logo);
+	} elseif (is_readable(DOL_DOCUMENT_ROOT.'/theme/dolibarr_logo.svg')) {
+		$urllogo = DOL_URL_ROOT.'/theme/dolibarr_logo.svg';
+	}
 
 	print '<div class="center">';
-    // Output html code for logo
-    if ($urllogo) {
-    	print '<div class="backgreypublicpayment">';
-    	print '<div class="logopublicpayment">';
-    	print '<img id="dolpaymentlogo" src="'.$urllogo.'"';
-    	print '>';
-    	print '</div>';
-    	if (empty($conf->global->MAIN_HIDE_POWERED_BY)) {
-    		print '<div class="poweredbypublicpayment opacitymedium right"><a href="https://www.dolibarr.org" target="dolibarr">'.$langs->trans("PoweredBy").'<br><img src="'.DOL_URL_ROOT.'/theme/dolibarr_logo.svg" width="80px"></a></div>';
-    	}
-    	print '</div>';
-    }
-    print '</div>';
+	// Output html code for logo
+	if ($urllogo) {
+		print '<div class="backgreypublicpayment">';
+		print '<div class="logopublicpayment">';
+		print '<img id="dolpaymentlogo" src="'.$urllogo.'"';
+		print '>';
+		print '</div>';
+		if (empty($conf->global->MAIN_HIDE_POWERED_BY)) {
+			print '<div class="poweredbypublicpayment opacitymedium right"><a href="https://www.dolibarr.org" target="dolibarr">'.$langs->trans("PoweredBy").'<br><img src="'.DOL_URL_ROOT.'/theme/dolibarr_logo.svg" width="80px"></a></div>';
+		}
+		print '</div>';
+	}
+	print '</div>';
 
-    print '<div class="divmainbodylarge">';
+	print '<div class="divmainbodylarge">';
 }
 
 /**
@@ -139,12 +139,12 @@ function llxHeaderVierge($title, $head = "", $disablejs = 0, $disablehead = 0, $
  */
 function llxFooterVierge()
 {
-    print '</div>';
+	print '</div>';
 
-    printCommonFooter('public');
+	printCommonFooter('public');
 
-    print "</body>\n";
-    print "</html>\n";
+	print "</body>\n";
+	print "</html>\n";
 }
 
 
@@ -156,7 +156,7 @@ $parameters = array();
 // Note that $action and $object may have been modified by some hooks
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action);
 if ($reshook < 0) {
-    setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 }
 
 // Action called when page is submitted
@@ -166,164 +166,164 @@ if (empty($reshook) && $action == 'add') {
 
 	$db->begin();
 
-    // test if login already exists
-    if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) {
-        if (!GETPOST('login')) {
-            $error++;
-            $errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Login"))."<br>\n";
-        }
-        $sql = "SELECT login FROM ".MAIN_DB_PREFIX."adherent WHERE login='".$db->escape(GETPOST('login'))."'";
-        $result = $db->query($sql);
-        if ($result) {
-            $num = $db->num_rows($result);
-        }
-        if ($num != 0) {
-            $error++;
-            $langs->load("errors");
-            $errmsg .= $langs->trans("ErrorLoginAlreadyExists")."<br>\n";
-        }
-        if (!isset($_POST["pass1"]) || !isset($_POST["pass2"]) || $_POST["pass1"] == '' || $_POST["pass2"] == '' || $_POST["pass1"] != $_POST["pass2"]) {
-            $error++;
-            $langs->load("errors");
-            $errmsg .= $langs->trans("ErrorPasswordsMustMatch")."<br>\n";
-        }
-        if (!GETPOST("email")) {
-            $error++;
-            $errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("EMail"))."<br>\n";
-        }
-    }
-    if (GETPOST('type') <= 0) {
-        $error++;
-        $errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Type"))."<br>\n";
-    }
-    if (!in_array(GETPOST('morphy'), array('mor', 'phy'))) {
-        $error++;
-        $errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv('Nature'))."<br>\n";
-    }
-    if (empty($_POST["lastname"])) {
-        $error++;
-        $errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Lastname"))."<br>\n";
-    }
-    if (empty($_POST["firstname"])) {
-        $error++;
-        $errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Firstname"))."<br>\n";
-    }
-    if (GETPOST("email") && !isValidEmail(GETPOST("email"))) {
-        $error++;
-        $langs->load("errors");
-        $errmsg .= $langs->trans("ErrorBadEMail", GETPOST("email"))."<br>\n";
-    }
-    $birthday = dol_mktime($_POST["birthhour"], $_POST["birthmin"], $_POST["birthsec"], $_POST["birthmonth"], $_POST["birthday"], $_POST["birthyear"]);
-    if ($_POST["birthmonth"] && empty($birthday)) {
-        $error++;
-        $langs->load("errors");
-        $errmsg .= $langs->trans("ErrorBadDateFormat")."<br>\n";
-    }
-    if (!empty($conf->global->MEMBER_NEWFORM_DOLIBARRTURNOVER)) {
-        if (GETPOST("morphy") == 'mor' && GETPOST('budget') <= 0) {
-            $error++;
-            $errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("TurnoverOrBudget"))."<br>\n";
-        }
-    }
+	// test if login already exists
+	if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) {
+		if (!GETPOST('login')) {
+			$error++;
+			$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Login"))."<br>\n";
+		}
+		$sql = "SELECT login FROM ".MAIN_DB_PREFIX."adherent WHERE login='".$db->escape(GETPOST('login'))."'";
+		$result = $db->query($sql);
+		if ($result) {
+			$num = $db->num_rows($result);
+		}
+		if ($num != 0) {
+			$error++;
+			$langs->load("errors");
+			$errmsg .= $langs->trans("ErrorLoginAlreadyExists")."<br>\n";
+		}
+		if (!isset($_POST["pass1"]) || !isset($_POST["pass2"]) || $_POST["pass1"] == '' || $_POST["pass2"] == '' || $_POST["pass1"] != $_POST["pass2"]) {
+			$error++;
+			$langs->load("errors");
+			$errmsg .= $langs->trans("ErrorPasswordsMustMatch")."<br>\n";
+		}
+		if (!GETPOST("email")) {
+			$error++;
+			$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("EMail"))."<br>\n";
+		}
+	}
+	if (GETPOST('type') <= 0) {
+		$error++;
+		$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Type"))."<br>\n";
+	}
+	if (!in_array(GETPOST('morphy'), array('mor', 'phy'))) {
+		$error++;
+		$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv('Nature'))."<br>\n";
+	}
+	if (empty($_POST["lastname"])) {
+		$error++;
+		$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Lastname"))."<br>\n";
+	}
+	if (empty($_POST["firstname"])) {
+		$error++;
+		$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Firstname"))."<br>\n";
+	}
+	if (GETPOST("email") && !isValidEmail(GETPOST("email"))) {
+		$error++;
+		$langs->load("errors");
+		$errmsg .= $langs->trans("ErrorBadEMail", GETPOST("email"))."<br>\n";
+	}
+	$birthday = dol_mktime($_POST["birthhour"], $_POST["birthmin"], $_POST["birthsec"], $_POST["birthmonth"], $_POST["birthday"], $_POST["birthyear"]);
+	if ($_POST["birthmonth"] && empty($birthday)) {
+		$error++;
+		$langs->load("errors");
+		$errmsg .= $langs->trans("ErrorBadDateFormat")."<br>\n";
+	}
+	if (!empty($conf->global->MEMBER_NEWFORM_DOLIBARRTURNOVER)) {
+		if (GETPOST("morphy") == 'mor' && GETPOST('budget') <= 0) {
+			$error++;
+			$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("TurnoverOrBudget"))."<br>\n";
+		}
+	}
 
-    if (isset($public)) $public = 1;
-    else $public = 0;
+	if (isset($public)) $public = 1;
+	else $public = 0;
 
-    if (!$error) {
-        // email a peu pres correct et le login n'existe pas
-        $adh = new Adherent($db);
-        $adh->statut      = -1;
-        $adh->public      = $public;
-        $adh->firstname   = $_POST["firstname"];
-        $adh->lastname    = $_POST["lastname"];
-        $adh->gender      = $_POST["gender"];
-        $adh->civility_id = $_POST["civility_id"];
-        $adh->societe     = $_POST["societe"];
-        $adh->address     = $_POST["address"];
-        $adh->zip         = $_POST["zipcode"];
-        $adh->town        = $_POST["town"];
-        $adh->email       = $_POST["email"];
-        if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) {
-            $adh->login       = $_POST["login"];
-            $adh->pass        = $_POST["pass1"];
-        }
-        $adh->photo       = $_POST["photo"];
-        $adh->country_id  = $_POST["country_id"];
-        $adh->state_id    = $_POST["state_id"];
-        $adh->typeid      = $_POST["type"];
-        $adh->note_private = $_POST["note_private"];
-        $adh->morphy      = $_POST["morphy"];
-        $adh->birth       = $birthday;
+	if (!$error) {
+		// email a peu pres correct et le login n'existe pas
+		$adh = new Adherent($db);
+		$adh->statut      = -1;
+		$adh->public      = $public;
+		$adh->firstname   = $_POST["firstname"];
+		$adh->lastname    = $_POST["lastname"];
+		$adh->gender      = $_POST["gender"];
+		$adh->civility_id = $_POST["civility_id"];
+		$adh->societe     = $_POST["societe"];
+		$adh->address     = $_POST["address"];
+		$adh->zip         = $_POST["zipcode"];
+		$adh->town        = $_POST["town"];
+		$adh->email       = $_POST["email"];
+		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) {
+			$adh->login       = $_POST["login"];
+			$adh->pass        = $_POST["pass1"];
+		}
+		$adh->photo       = $_POST["photo"];
+		$adh->country_id  = $_POST["country_id"];
+		$adh->state_id    = $_POST["state_id"];
+		$adh->typeid      = $_POST["type"];
+		$adh->note_private = $_POST["note_private"];
+		$adh->morphy      = $_POST["morphy"];
+		$adh->birth       = $birthday;
 
 
-        // Fill array 'array_options' with data from add form
-        $extrafields->fetch_name_optionals_label($adh->table_element);
-        $ret = $extrafields->setOptionalsFromPost(null, $adh);
+		// Fill array 'array_options' with data from add form
+		$extrafields->fetch_name_optionals_label($adh->table_element);
+		$ret = $extrafields->setOptionalsFromPost(null, $adh);
 		if ($ret < 0) $error++;
 
-        $result = $adh->create($user);
-        if ($result > 0) {
+		$result = $adh->create($user);
+		if ($result > 0) {
 			require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
-            $object = $adh;
+			$object = $adh;
 
-            $adht = new AdherentType($db);
-            $adht->fetch($object->typeid);
+			$adht = new AdherentType($db);
+			$adht->fetch($object->typeid);
 
-            if ($object->email) {
-            	$subject = '';
-            	$msg = '';
+			if ($object->email) {
+				$subject = '';
+				$msg = '';
 
-            	// Send subscription email
-            	include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
-            	$formmail = new FormMail($db);
-            	// Set output language
-            	$outputlangs = new Translate('', $conf);
-            	$outputlangs->setDefaultLang(empty($object->thirdparty->default_lang) ? $mysoc->default_lang : $object->thirdparty->default_lang);
-            	// Load traductions files required by page
-            	$outputlangs->loadLangs(array("main", "members"));
-            	// Get email content from template
-            	$arraydefaultmessage = null;
-            	$labeltouse = $conf->global->ADHERENT_EMAIL_TEMPLATE_AUTOREGISTER;
+				// Send subscription email
+				include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
+				$formmail = new FormMail($db);
+				// Set output language
+				$outputlangs = new Translate('', $conf);
+				$outputlangs->setDefaultLang(empty($object->thirdparty->default_lang) ? $mysoc->default_lang : $object->thirdparty->default_lang);
+				// Load traductions files required by page
+				$outputlangs->loadLangs(array("main", "members"));
+				// Get email content from template
+				$arraydefaultmessage = null;
+				$labeltouse = $conf->global->ADHERENT_EMAIL_TEMPLATE_AUTOREGISTER;
 
-            	if (!empty($labeltouse)) $arraydefaultmessage = $formmail->getEMailTemplate($db, 'member', $user, $outputlangs, 0, 1, $labeltouse);
+				if (!empty($labeltouse)) $arraydefaultmessage = $formmail->getEMailTemplate($db, 'member', $user, $outputlangs, 0, 1, $labeltouse);
 
-            	if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0) {
-            		$subject = $arraydefaultmessage->topic;
-            		$msg     = $arraydefaultmessage->content;
-            	}
+				if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0) {
+					$subject = $arraydefaultmessage->topic;
+					$msg     = $arraydefaultmessage->content;
+				}
 
-            	$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $object);
-            	complete_substitutions_array($substitutionarray, $outputlangs, $object);
-            	$subjecttosend = make_substitutions($subject, $substitutionarray, $outputlangs);
-            	$texttosend = make_substitutions(dol_concatdesc($msg, $adht->getMailOnValid()), $substitutionarray, $outputlangs);
+				$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $object);
+				complete_substitutions_array($substitutionarray, $outputlangs, $object);
+				$subjecttosend = make_substitutions($subject, $substitutionarray, $outputlangs);
+				$texttosend = make_substitutions(dol_concatdesc($msg, $adht->getMailOnValid()), $substitutionarray, $outputlangs);
 
-            	if ($subjecttosend && $texttosend) {
-            		$moreinheader = 'X-Dolibarr-Info: send_an_email by public/members/new.php'."\r\n";
+				if ($subjecttosend && $texttosend) {
+					$moreinheader = 'X-Dolibarr-Info: send_an_email by public/members/new.php'."\r\n";
 
-            		$result = $object->send_an_email($texttosend, $subjecttosend, array(), array(), array(), "", "", 0, -1, '', $moreinheader);
-            	}
-            	/*if ($result < 0) {
+					$result = $object->send_an_email($texttosend, $subjecttosend, array(), array(), array(), "", "", 0, -1, '', $moreinheader);
+				}
+				/*if ($result < 0) {
             		$error++;
             		setEventMessages($object->error, $object->errors, 'errors');
             	}*/
-            }
+			}
 
-            // Send email to the foundation to say a new member subscribed with autosubscribe form
-            if (!empty($conf->global->MAIN_INFO_SOCIETE_MAIL) && !empty($conf->global->ADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT) &&
-                  !empty($conf->global->ADHERENT_AUTOREGISTER_NOTIF_MAIL)) {
-            	// Define link to login card
-            	$appli = constant('DOL_APPLICATION_TITLE');
-            	if (!empty($conf->global->MAIN_APPLICATION_TITLE)) {
-            		$appli = $conf->global->MAIN_APPLICATION_TITLE;
-            		if (preg_match('/\d\.\d/', $appli)) {
-            			if (!preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli .= " (".DOL_VERSION.")"; // If new title contains a version that is different than core
-            		} else $appli .= " ".DOL_VERSION;
-            	} else {
+			// Send email to the foundation to say a new member subscribed with autosubscribe form
+			if (!empty($conf->global->MAIN_INFO_SOCIETE_MAIL) && !empty($conf->global->ADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT) &&
+				  !empty($conf->global->ADHERENT_AUTOREGISTER_NOTIF_MAIL)) {
+				// Define link to login card
+				$appli = constant('DOL_APPLICATION_TITLE');
+				if (!empty($conf->global->MAIN_APPLICATION_TITLE)) {
+					$appli = $conf->global->MAIN_APPLICATION_TITLE;
+					if (preg_match('/\d\.\d/', $appli)) {
+						if (!preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli .= " (".DOL_VERSION.")"; // If new title contains a version that is different than core
+					} else $appli .= " ".DOL_VERSION;
+				} else {
 					$appli .= " ".DOL_VERSION;
-                }
+				}
 
-            	$to = $adh->makeSubstitution($conf->global->MAIN_INFO_SOCIETE_MAIL);
-            	$from = $conf->global->ADHERENT_MAIL_FROM;
+				$to = $adh->makeSubstitution($conf->global->MAIN_INFO_SOCIETE_MAIL);
+				$from = $conf->global->ADHERENT_MAIL_FROM;
 				$mailfile = new CMailFile(
 					'['.$appli.'] '.$conf->global->ADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT,
 					$to,
@@ -338,103 +338,103 @@ if (empty($reshook) && $action == 'add') {
 					-1
 				);
 
-            	if (!$mailfile->sendfile()) {
-            		dol_syslog($langs->trans("ErrorFailedToSendMail", $from, $to), LOG_ERR);
-            	}
-            }
+				if (!$mailfile->sendfile()) {
+					dol_syslog($langs->trans("ErrorFailedToSendMail", $from, $to), LOG_ERR);
+				}
+			}
 
-            if (!empty($backtopage)) {
+			if (!empty($backtopage)) {
 				$urlback = $backtopage;
 			} elseif (!empty($conf->global->MEMBER_URL_REDIRECT_SUBSCRIPTION)) {
-                $urlback = $conf->global->MEMBER_URL_REDIRECT_SUBSCRIPTION;
-                // TODO Make replacement of __AMOUNT__, etc...
-            } else {
+				$urlback = $conf->global->MEMBER_URL_REDIRECT_SUBSCRIPTION;
+				// TODO Make replacement of __AMOUNT__, etc...
+			} else {
 				$urlback = $_SERVER["PHP_SELF"]."?action=added";
 			}
 
-            if (!empty($conf->global->MEMBER_NEWFORM_PAYONLINE) && $conf->global->MEMBER_NEWFORM_PAYONLINE != '-1') {
-                if ($conf->global->MEMBER_NEWFORM_PAYONLINE == 'all') {
-                    $urlback = DOL_MAIN_URL_ROOT.'/public/payment/newpayment.php?from=membernewform&source=membersubscription&ref='.urlencode($adh->ref);
-                    if (price2num(GETPOST('amount', 'alpha'))) $urlback .= '&amount='.price2num(GETPOST('amount', 'alpha'));
-                    if (GETPOST('email')) $urlback .= '&email='.urlencode(GETPOST('email'));
-                    if (!empty($conf->global->PAYMENT_SECURITY_TOKEN)) {
-                        if (!empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
-                    	    $urlback .= '&securekey='.urlencode(dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.'membersubscription'.$adh->ref, 2));
-                        } else {
-                            $urlback .= '&securekey='.urlencode($conf->global->PAYMENT_SECURITY_TOKEN);
-                        }
-                    }
-                } elseif ($conf->global->MEMBER_NEWFORM_PAYONLINE == 'paybox') {
-                    $urlback = DOL_MAIN_URL_ROOT.'/public/paybox/newpayment.php?from=membernewform&source=membersubscription&ref='.urlencode($adh->ref);
-                    if (price2num(GETPOST('amount', 'alpha'))) $urlback .= '&amount='.price2num(GETPOST('amount', 'alpha'));
-                    if (GETPOST('email')) $urlback .= '&email='.urlencode(GETPOST('email'));
-                    if (!empty($conf->global->PAYMENT_SECURITY_TOKEN)) {
-                    	if (!empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
-                    		$urlback .= '&securekey='.urlencode(dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.'membersubscription'.$adh->ref, 2));
-                    	} else {
-                    		$urlback .= '&securekey='.urlencode($conf->global->PAYMENT_SECURITY_TOKEN);
-                    	}
-                    }
-                } elseif ($conf->global->MEMBER_NEWFORM_PAYONLINE == 'paypal') {
-                    $urlback = DOL_MAIN_URL_ROOT.'/public/paypal/newpayment.php?from=membernewform&source=membersubscription&ref='.urlencode($adh->ref);
-                    if (price2num(GETPOST('amount', 'alpha'))) $urlback .= '&amount='.price2num(GETPOST('amount', 'alpha'));
-                    if (GETPOST('email')) $urlback .= '&email='.urlencode(GETPOST('email'));
-                    if (!empty($conf->global->PAYMENT_SECURITY_TOKEN)) {
-                    	if (!empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
-                        	$urlback .= '&securekey='.urlencode(dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.'membersubscription'.$adh->ref, 2));
-                        } else {
-                        	$urlback .= '&securekey='.urlencode($conf->global->PAYMENT_SECURITY_TOKEN);
-                        }
-                    }
-                } elseif ($conf->global->MEMBER_NEWFORM_PAYONLINE == 'stripe') {
-                    $urlback = DOL_MAIN_URL_ROOT.'/public/stripe/newpayment.php?from=membernewform&source=membersubscription&ref='.$adh->ref;
-                    if (price2num(GETPOST('amount', 'alpha'))) $urlback .= '&amount='.price2num(GETPOST('amount', 'alpha'));
-                    if (GETPOST('email')) $urlback .= '&email='.urlencode(GETPOST('email'));
-                    if (!empty($conf->global->PAYMENT_SECURITY_TOKEN)) {
-                    	if (!empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
-                        	$urlback .= '&securekey='.urlencode(dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.'membersubscription'.$adh->ref, 2));
-                        } else {
-                        	$urlback .= '&securekey='.urlencode($conf->global->PAYMENT_SECURITY_TOKEN);
-                        }
-                    }
-                } else {
-                    dol_print_error('', "Autosubscribe form is setup to ask an online payment for a not managed online payment");
-                    exit;
-                }
-            }
+			if (!empty($conf->global->MEMBER_NEWFORM_PAYONLINE) && $conf->global->MEMBER_NEWFORM_PAYONLINE != '-1') {
+				if ($conf->global->MEMBER_NEWFORM_PAYONLINE == 'all') {
+					$urlback = DOL_MAIN_URL_ROOT.'/public/payment/newpayment.php?from=membernewform&source=membersubscription&ref='.urlencode($adh->ref);
+					if (price2num(GETPOST('amount', 'alpha'))) $urlback .= '&amount='.price2num(GETPOST('amount', 'alpha'));
+					if (GETPOST('email')) $urlback .= '&email='.urlencode(GETPOST('email'));
+					if (!empty($conf->global->PAYMENT_SECURITY_TOKEN)) {
+						if (!empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
+							$urlback .= '&securekey='.urlencode(dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.'membersubscription'.$adh->ref, 2));
+						} else {
+							$urlback .= '&securekey='.urlencode($conf->global->PAYMENT_SECURITY_TOKEN);
+						}
+					}
+				} elseif ($conf->global->MEMBER_NEWFORM_PAYONLINE == 'paybox') {
+					$urlback = DOL_MAIN_URL_ROOT.'/public/paybox/newpayment.php?from=membernewform&source=membersubscription&ref='.urlencode($adh->ref);
+					if (price2num(GETPOST('amount', 'alpha'))) $urlback .= '&amount='.price2num(GETPOST('amount', 'alpha'));
+					if (GETPOST('email')) $urlback .= '&email='.urlencode(GETPOST('email'));
+					if (!empty($conf->global->PAYMENT_SECURITY_TOKEN)) {
+						if (!empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
+							$urlback .= '&securekey='.urlencode(dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.'membersubscription'.$adh->ref, 2));
+						} else {
+							$urlback .= '&securekey='.urlencode($conf->global->PAYMENT_SECURITY_TOKEN);
+						}
+					}
+				} elseif ($conf->global->MEMBER_NEWFORM_PAYONLINE == 'paypal') {
+					$urlback = DOL_MAIN_URL_ROOT.'/public/paypal/newpayment.php?from=membernewform&source=membersubscription&ref='.urlencode($adh->ref);
+					if (price2num(GETPOST('amount', 'alpha'))) $urlback .= '&amount='.price2num(GETPOST('amount', 'alpha'));
+					if (GETPOST('email')) $urlback .= '&email='.urlencode(GETPOST('email'));
+					if (!empty($conf->global->PAYMENT_SECURITY_TOKEN)) {
+						if (!empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
+							$urlback .= '&securekey='.urlencode(dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.'membersubscription'.$adh->ref, 2));
+						} else {
+							$urlback .= '&securekey='.urlencode($conf->global->PAYMENT_SECURITY_TOKEN);
+						}
+					}
+				} elseif ($conf->global->MEMBER_NEWFORM_PAYONLINE == 'stripe') {
+					$urlback = DOL_MAIN_URL_ROOT.'/public/stripe/newpayment.php?from=membernewform&source=membersubscription&ref='.$adh->ref;
+					if (price2num(GETPOST('amount', 'alpha'))) $urlback .= '&amount='.price2num(GETPOST('amount', 'alpha'));
+					if (GETPOST('email')) $urlback .= '&email='.urlencode(GETPOST('email'));
+					if (!empty($conf->global->PAYMENT_SECURITY_TOKEN)) {
+						if (!empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
+							$urlback .= '&securekey='.urlencode(dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.'membersubscription'.$adh->ref, 2));
+						} else {
+							$urlback .= '&securekey='.urlencode($conf->global->PAYMENT_SECURITY_TOKEN);
+						}
+					}
+				} else {
+					dol_print_error('', "Autosubscribe form is setup to ask an online payment for a not managed online payment");
+					exit;
+				}
+			}
 
-            if (!empty($entity)) $urlback .= '&entity='.$entity;
-            dol_syslog("member ".$adh->ref." was created, we redirect to ".$urlback);
-        } else {
-        	$error++;
-            $errmsg .= join('<br>', $adh->errors);
-        }
-    }
+			if (!empty($entity)) $urlback .= '&entity='.$entity;
+			dol_syslog("member ".$adh->ref." was created, we redirect to ".$urlback);
+		} else {
+			$error++;
+			$errmsg .= join('<br>', $adh->errors);
+		}
+	}
 
-    if (!$error) {
-    	$db->commit();
+	if (!$error) {
+		$db->commit();
 
-    	Header("Location: ".$urlback);
-    	exit;
-    } else {
-    	$db->rollback();
-    }
+		Header("Location: ".$urlback);
+		exit;
+	} else {
+		$db->rollback();
+	}
 }
 
 // Action called after a submitted was send and member created successfully
 // If MEMBER_URL_REDIRECT_SUBSCRIPTION is set to url we never go here because a redirect was done to this url.
 // backtopage parameter with an url was set on member submit page, we never go here because a redirect was done to this url.
 if (empty($reshook) && $action == 'added') {
-    llxHeaderVierge($langs->trans("NewMemberForm"));
+	llxHeaderVierge($langs->trans("NewMemberForm"));
 
-    // Si on a pas ete redirige
-    print '<br>';
-    print '<div class="center">';
-    print $langs->trans("NewMemberbyWeb");
-    print '</div>';
+	// Si on a pas ete redirige
+	print '<br>';
+	print '<div class="center">';
+	print $langs->trans("NewMemberbyWeb");
+	print '</div>';
 
-    llxFooterVierge();
-    exit;
+	llxFooterVierge();
+	exit;
 }
 
 
@@ -460,9 +460,9 @@ print '<div id="divsubscribe">';
 
 print '<div class="center subscriptionformhelptext justify">';
 if (!empty($conf->global->MEMBER_NEWFORM_TEXT)) {
-    print $langs->trans($conf->global->MEMBER_NEWFORM_TEXT)."<br>\n";
+	print $langs->trans($conf->global->MEMBER_NEWFORM_TEXT)."<br>\n";
 } else {
-    print $langs->trans("NewSubscriptionDesc", $conf->global->MAIN_INFO_SOCIETE_MAIL)."<br>\n";
+	print $langs->trans("NewSubscriptionDesc", $conf->global->MAIN_INFO_SOCIETE_MAIL)."<br>\n";
 }
 print '</div>';
 
@@ -510,31 +510,31 @@ print '<table class="border" summary="form to subscribe" id="tablesubscribe">'."
 
 // Type
 if (empty($conf->global->MEMBER_NEWFORM_FORCETYPE)) {
-    $listoftype = $adht->liste_array();
-    $tmp = array_keys($listoftype);
-    $defaulttype = '';
-    $isempty = 1;
-    if (count($listoftype) == 1) {
+	$listoftype = $adht->liste_array();
+	$tmp = array_keys($listoftype);
+	$defaulttype = '';
+	$isempty = 1;
+	if (count($listoftype) == 1) {
 		$defaulttype = $tmp[0];
 		$isempty = 0;
 	}
-    print '<tr><td class="titlefield">'.$langs->trans("Type").' <FONT COLOR="red">*</FONT></td><td>';
-    print $form->selectarray("type", $adht->liste_array(), GETPOST('type') ?GETPOST('type') : $defaulttype, $isempty);
-    print '</td></tr>'."\n";
+	print '<tr><td class="titlefield">'.$langs->trans("Type").' <FONT COLOR="red">*</FONT></td><td>';
+	print $form->selectarray("type", $adht->liste_array(), GETPOST('type') ?GETPOST('type') : $defaulttype, $isempty);
+	print '</td></tr>'."\n";
 } else {
-    $adht->fetch($conf->global->MEMBER_NEWFORM_FORCETYPE);
-    print '<input type="hidden" id="type" name="type" value="'.$conf->global->MEMBER_NEWFORM_FORCETYPE.'">';
+	$adht->fetch($conf->global->MEMBER_NEWFORM_FORCETYPE);
+	print '<input type="hidden" id="type" name="type" value="'.$conf->global->MEMBER_NEWFORM_FORCETYPE.'">';
 }
 // Moral/Physic attribute
 $morphys["phy"] = $langs->trans("Physical");
 $morphys["mor"] = $langs->trans("Moral");
 if (empty($conf->global->MEMBER_NEWFORM_FORCEMORPHY)) {
-    print '<tr class="morphy"><td class="titlefield">'.$langs->trans('MemberNature').' <FONT COLOR="red">*</FONT></td><td>'."\n";
-    print $form->selectarray("morphy", $morphys, GETPOST('morphy'), 1);
-    print '</td></tr>'."\n";
+	print '<tr class="morphy"><td class="titlefield">'.$langs->trans('MemberNature').' <FONT COLOR="red">*</FONT></td><td>'."\n";
+	print $form->selectarray("morphy", $morphys, GETPOST('morphy'), 1);
+	print '</td></tr>'."\n";
 } else {
-    print $morphys[$conf->global->MEMBER_NEWFORM_FORCEMORPHY];
-    print '<input type="hidden" id="morphy" name="morphy" value="'.$conf->global->MEMBER_NEWFORM_FORCEMORPHY.'">';
+	print $morphys[$conf->global->MEMBER_NEWFORM_FORCEMORPHY];
+	print '<input type="hidden" id="morphy" name="morphy" value="'.$conf->global->MEMBER_NEWFORM_FORCEMORPHY.'">';
 }
 // Civility
 print '<tr><td class="titlefield">'.$langs->trans('UserTitle').'</td><td>';
@@ -564,34 +564,34 @@ print '</td></tr>';
 print '<tr><td>'.$langs->trans('Country').'</td><td>';
 $country_id = GETPOST('country_id');
 if (!$country_id && !empty($conf->global->MEMBER_NEWFORM_FORCECOUNTRYCODE)) {
-    $country_id = getCountry($conf->global->MEMBER_NEWFORM_FORCECOUNTRYCODE, 2, $db, $langs);
+	$country_id = getCountry($conf->global->MEMBER_NEWFORM_FORCECOUNTRYCODE, 2, $db, $langs);
 }
 if (!$country_id && !empty($conf->geoipmaxmind->enabled)) {
-    $country_code = dol_user_country();
-    //print $country_code;
-    if ($country_code) {
-        $new_country_id = getCountry($country_code, 3, $db, $langs);
-        //print 'xxx'.$country_code.' - '.$new_country_id;
-        if ($new_country_id) $country_id = $new_country_id;
-    }
+	$country_code = dol_user_country();
+	//print $country_code;
+	if ($country_code) {
+		$new_country_id = getCountry($country_code, 3, $db, $langs);
+		//print 'xxx'.$country_code.' - '.$new_country_id;
+		if ($new_country_id) $country_id = $new_country_id;
+	}
 }
 $country_code = getCountry($country_id, 2, $db, $langs);
 print $form->select_country($country_id, 'country_id');
 print '</td></tr>';
 // State
 if (empty($conf->global->SOCIETE_DISABLE_STATE)) {
-    print '<tr><td>'.$langs->trans('State').'</td><td>';
-    if ($country_code) print $formcompany->select_state(GETPOST("state_id"), $country_code);
-    else print '';
-    print '</td></tr>';
+	print '<tr><td>'.$langs->trans('State').'</td><td>';
+	if ($country_code) print $formcompany->select_state(GETPOST("state_id"), $country_code);
+	else print '';
+	print '</td></tr>';
 }
 // EMail
 print '<tr><td>'.$langs->trans("Email").' <FONT COLOR="red">*</FONT></td><td><input type="text" name="email" maxlength="255" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('email')).'"></td></tr>'."\n";
 // Login
 if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) {
-    print '<tr><td>'.$langs->trans("Login").' <FONT COLOR="red">*</FONT></td><td><input type="text" name="login" maxlength="50" class="minwidth100"value="'.dol_escape_htmltag(GETPOST('login')).'"></td></tr>'."\n";
-    print '<tr><td>'.$langs->trans("Password").' <FONT COLOR="red">*</FONT></td><td><input type="password" maxlength="128" name="pass1" class="minwidth100" value="'.GETPOST("pass1").'"></td></tr>'."\n";
-    print '<tr><td>'.$langs->trans("PasswordAgain").' <FONT COLOR="red">*</FONT></td><td><input type="password" maxlength="128" name="pass2" class="minwidth100" value="'.GETPOST("pass2").'"></td></tr>'."\n";
+	print '<tr><td>'.$langs->trans("Login").' <FONT COLOR="red">*</FONT></td><td><input type="text" name="login" maxlength="50" class="minwidth100"value="'.dol_escape_htmltag(GETPOST('login')).'"></td></tr>'."\n";
+	print '<tr><td>'.$langs->trans("Password").' <FONT COLOR="red">*</FONT></td><td><input type="password" maxlength="128" name="pass1" class="minwidth100" value="'.GETPOST("pass1").'"></td></tr>'."\n";
+	print '<tr><td>'.$langs->trans("PasswordAgain").' <FONT COLOR="red">*</FONT></td><td><input type="password" maxlength="128" name="pass2" class="minwidth100" value="'.GETPOST("pass2").'"></td></tr>'."\n";
 }
 // Birthday
 print '<tr id="trbirth" class="trbirth"><td>'.$langs->trans("DateToBirth").'</td><td>';
@@ -612,12 +612,12 @@ print '</tr>'."\n";
 
 // Add specific fields used by Dolibarr foundation for example
 if (!empty($conf->global->MEMBER_NEWFORM_DOLIBARRTURNOVER)) {
-    $arraybudget = array('50'=>'<= 100 000', '100'=>'<= 200 000', '200'=>'<= 500 000', '300'=>'<= 1 500 000', '600'=>'<= 3 000 000', '1000'=>'<= 5 000 000', '2000'=>'5 000 000+');
-    print '<tr id="trbudget" class="trcompany"><td>'.$langs->trans("TurnoverOrBudget").' <FONT COLOR="red">*</FONT></td><td>';
-    print $form->selectarray('budget', $arraybudget, GETPOST('budget'), 1);
-    print ' € or $';
+	$arraybudget = array('50'=>'<= 100 000', '100'=>'<= 200 000', '200'=>'<= 500 000', '300'=>'<= 1 500 000', '600'=>'<= 3 000 000', '1000'=>'<= 5 000 000', '2000'=>'5 000 000+');
+	print '<tr id="trbudget" class="trcompany"><td>'.$langs->trans("TurnoverOrBudget").' <FONT COLOR="red">*</FONT></td><td>';
+	print $form->selectarray('budget', $arraybudget, GETPOST('budget'), 1);
+	print ' € or $';
 
-    print '<script type="text/javascript">
+	print '<script type="text/javascript">
     jQuery(document).ready(function () {
         initturnover();
         jQuery("#morphy").click(function() {
@@ -651,38 +651,38 @@ if (!empty($conf->global->MEMBER_NEWFORM_DOLIBARRTURNOVER)) {
         }
     });
     </script>';
-    print '</td></tr>'."\n";
+	print '</td></tr>'."\n";
 }
 if (!empty($conf->global->MEMBER_NEWFORM_AMOUNT) || !empty($conf->global->MEMBER_NEWFORM_PAYONLINE)) {
-    // $conf->global->MEMBER_NEWFORM_SHOWAMOUNT is an amount
-    $amount = 0;
-    if (!empty($conf->global->MEMBER_NEWFORM_AMOUNT)) {
-        $amount = $conf->global->MEMBER_NEWFORM_AMOUNT;
-    }
+	// $conf->global->MEMBER_NEWFORM_SHOWAMOUNT is an amount
+	$amount = 0;
+	if (!empty($conf->global->MEMBER_NEWFORM_AMOUNT)) {
+		$amount = $conf->global->MEMBER_NEWFORM_AMOUNT;
+	}
 
-    if (!empty($conf->global->MEMBER_NEWFORM_PAYONLINE)) {
-        $amount = GETPOST('amount') ?GETPOST('amount') : $conf->global->MEMBER_NEWFORM_AMOUNT;
-    }
-    // $conf->global->MEMBER_NEWFORM_PAYONLINE is 'paypal', 'paybox' or 'stripe'
-    print '<tr><td>'.$langs->trans("Subscription").'</td><td class="nowrap">';
-    if (!empty($conf->global->MEMBER_NEWFORM_EDITAMOUNT)) {
-        print '<input type="text" name="amount" id="amount" class="flat amount" size="6" value="'.$amount.'">';
-    } else {
-        print '<input type="text" name="amount" id="amounthidden" class="flat amount" disabled size="6" value="'.$amount.'">';
-        print '<input type="hidden" name="amount" id="amount" class="flat amount" size="6" value="'.$amount.'">';
-    }
-    print ' '.$langs->trans("Currency".$conf->currency);
-    print '</td></tr>';
+	if (!empty($conf->global->MEMBER_NEWFORM_PAYONLINE)) {
+		$amount = GETPOST('amount') ?GETPOST('amount') : $conf->global->MEMBER_NEWFORM_AMOUNT;
+	}
+	// $conf->global->MEMBER_NEWFORM_PAYONLINE is 'paypal', 'paybox' or 'stripe'
+	print '<tr><td>'.$langs->trans("Subscription").'</td><td class="nowrap">';
+	if (!empty($conf->global->MEMBER_NEWFORM_EDITAMOUNT)) {
+		print '<input type="text" name="amount" id="amount" class="flat amount" size="6" value="'.$amount.'">';
+	} else {
+		print '<input type="text" name="amount" id="amounthidden" class="flat amount" disabled size="6" value="'.$amount.'">';
+		print '<input type="hidden" name="amount" id="amount" class="flat amount" size="6" value="'.$amount.'">';
+	}
+	print ' '.$langs->trans("Currency".$conf->currency);
+	print '</td></tr>';
 }
 print "</table>\n";
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // Save
 print '<div class="center">';
 print '<input type="submit" value="'.$langs->trans("Submit").'" id="submitsave" class="button">';
 if (!empty($backtopage)) {
-    print ' &nbsp; &nbsp; <input type="submit" value="'.$langs->trans("Cancel").'" id="submitcancel" class="button">';
+	print ' &nbsp; &nbsp; <input type="submit" value="'.$langs->trans("Cancel").'" id="submitcancel" class="button">';
 }
 print '</div>';
 
diff --git a/htdocs/public/notice.php b/htdocs/public/notice.php
index f0217d32622..59b8e3a70cb 100644
--- a/htdocs/public/notice.php
+++ b/htdocs/public/notice.php
@@ -42,8 +42,8 @@ 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>';
 } else {
-    $langs->loadLangs(array("error", "other"));
+	$langs->loadLangs(array("error", "other"));
 
-    if (GETPOST('transphrase', 'alphanohtml')) print dol_escape_htmltag(GETPOST('transphrase', 'alphanohtml'));
-    elseif (GETPOST('transkey', 'alphanohtml')) print dol_escape_htmltag($langs->trans(GETPOST('transkey', 'alphanohtml')));
+	if (GETPOST('transphrase', 'alphanohtml')) print dol_escape_htmltag(GETPOST('transphrase', 'alphanohtml'));
+	elseif (GETPOST('transkey', 'alphanohtml')) print dol_escape_htmltag($langs->trans(GETPOST('transkey', 'alphanohtml')));
 }
diff --git a/htdocs/public/onlinesign/newonlinesign.php b/htdocs/public/onlinesign/newonlinesign.php
index 7c58d0ef944..1291035760f 100644
--- a/htdocs/public/onlinesign/newonlinesign.php
+++ b/htdocs/public/onlinesign/newonlinesign.php
@@ -64,11 +64,11 @@ if (empty($source)) $source = 'proposal';
 
 if (!$action)
 {
-    if ($source && !$ref)
-    {
-    	print $langs->trans('ErrorBadParameters')." - ref missing";
-    	exit;
-    }
+	if ($source && !$ref)
+	{
+		print $langs->trans('ErrorBadParameters')." - ref missing";
+		exit;
+	}
 }
 
 
@@ -83,18 +83,18 @@ $SECUREKEY = GETPOST("securekey"); // Secure key
 
 if (!empty($source))
 {
-    $urlok .= 'source='.urlencode($source).'&';
-    $urlko .= 'source='.urlencode($source).'&';
+	$urlok .= 'source='.urlencode($source).'&';
+	$urlko .= 'source='.urlencode($source).'&';
 }
 if (!empty($REF))
 {
-    $urlok .= 'ref='.urlencode($REF).'&';
-    $urlko .= 'ref='.urlencode($REF).'&';
+	$urlok .= 'ref='.urlencode($REF).'&';
+	$urlko .= 'ref='.urlencode($REF).'&';
 }
 if (!empty($SECUREKEY))
 {
-    $urlok .= 'securekey='.urlencode($SECUREKEY).'&';
-    $urlko .= 'securekey='.urlencode($SECUREKEY).'&';
+	$urlok .= 'securekey='.urlencode($SECUREKEY).'&';
+	$urlko .= 'securekey='.urlencode($SECUREKEY).'&';
 }
 if (!empty($entity))
 {
@@ -114,7 +114,7 @@ $creditor = $mysoc->name;
 
 if ($action == 'dosign')
 {
-    // TODO
+	// TODO
 }
 
 
@@ -134,12 +134,12 @@ llxHeader($head, $langs->trans("OnlineSignature"), '', '', 0, 0, '', '', '', 'on
 // Check link validity for param 'source'
 if (!empty($source) && in_array($ref, array('member_ref', 'contractline_ref', 'invoice_ref', 'order_ref', '')))
 {
-    $langs->load("errors");
-    dol_print_error_email('BADREFINONLINESIGNFORM', $langs->trans("ErrorBadLinkSourceSetButBadValueForRef", $source, $ref));
-    // End of page
-    llxFooter();
-    $db->close();
-    exit;
+	$langs->load("errors");
+	dol_print_error_email('BADREFINONLINESIGNFORM', $langs->trans("ErrorBadLinkSourceSetButBadValueForRef", $source, $ref));
+	// End of page
+	llxFooter();
+	$db->close();
+	exit;
 }
 
 print '<span id="dolpaymentspan"></span>'."\n";
@@ -194,16 +194,16 @@ if ($urllogo)
 $text = '';
 if (!empty($conf->global->ONLINE_SIGN_NEWFORM_TEXT))
 {
-    $langs->load("members");
-    $reg = array();
-    if (preg_match('/^\((.*)\)$/', $conf->global->ONLINE_SIGN_NEWFORM_TEXT, $reg)) $text .= $langs->trans($reg[1])."<br>\n";
-    else $text .= $conf->global->ONLINE_SIGN_NEWFORM_TEXT."<br>\n";
-    $text = '<tr><td align="center"><br>'.$text.'<br></td></tr>'."\n";
+	$langs->load("members");
+	$reg = array();
+	if (preg_match('/^\((.*)\)$/', $conf->global->ONLINE_SIGN_NEWFORM_TEXT, $reg)) $text .= $langs->trans($reg[1])."<br>\n";
+	else $text .= $conf->global->ONLINE_SIGN_NEWFORM_TEXT."<br>\n";
+	$text = '<tr><td align="center"><br>'.$text.'<br></td></tr>'."\n";
 }
 if (empty($text))
 {
-    $text .= '<tr><td class="textpublicpayment"><br><strong>'.$langs->trans("WelcomeOnOnlineSignaturePage", $mysoc->name).'</strong></td></tr>'."\n";
-    $text .= '<tr><td class="textpublicpayment">'.$langs->trans("ThisScreenAllowsYouToSignDocFrom", $creditor).'<br><br></td></tr>'."\n";
+	$text .= '<tr><td class="textpublicpayment"><br><strong>'.$langs->trans("WelcomeOnOnlineSignaturePage", $mysoc->name).'</strong></td></tr>'."\n";
+	$text .= '<tr><td class="textpublicpayment">'.$langs->trans("ThisScreenAllowsYouToSignDocFrom", $creditor).'<br><br></td></tr>'."\n";
 }
 print $text;
 
@@ -237,9 +237,9 @@ if ($source == 'proposal')
 	// Creditor
 
 	print '<tr class="CTableRow'.($var ? '1' : '2').'"><td class="CTableRow'.($var ? '1' : '2').'">'.$langs->trans("Creditor");
-    print '</td><td class="CTableRow'.($var ? '1' : '2').'"><b>'.$creditor.'</b>';
-    print '<input type="hidden" name="creditor" value="'.$creditor.'">';
-    print '</td></tr>'."\n";
+	print '</td><td class="CTableRow'.($var ? '1' : '2').'"><b>'.$creditor.'</b>';
+	print '<input type="hidden" name="creditor" value="'.$creditor.'">';
+	print '</td></tr>'."\n";
 
 	// Debitor
 
@@ -266,13 +266,13 @@ print '</table>'."\n";
 print "\n";
 
 if ($action != 'dosign') {
-    if ($found && !$error) {
-        // We are in a management option and no error
-    } else {
-    	dol_print_error_email('ERRORNEWONLINESIGN');
-    }
+	if ($found && !$error) {
+		// We are in a management option and no error
+	} else {
+		dol_print_error_email('ERRORNEWONLINESIGN');
+	}
 } else {
-    // Print
+	// Print
 }
 
 print '</td></tr>'."\n";
diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index a44428808a4..89992d00ff9 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -417,42 +417,42 @@ if ($action == 'charge' && !empty($conf->stripe->enabled))
 	dol_syslog("POST vatnumber = ".$vatnumber, LOG_DEBUG, 0, '_stripe');
 
 	$error = 0;
-    $errormessage = '';
+	$errormessage = '';
 
-    // When using the Charge API architecture
-    if (empty($conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION))
-    {
-    	try {
-    		$metadata = array(
-    			'dol_version' => DOL_VERSION,
-    			'dol_entity'  => $conf->entity,
-    			'dol_company' => $mysoc->name, // Usefull when using multicompany
-    			'dol_tax_num' => $vatnumber,
-    		    'ipaddress'=> getUserRemoteIP()
-    		);
+	// When using the Charge API architecture
+	if (empty($conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION))
+	{
+		try {
+			$metadata = array(
+				'dol_version' => DOL_VERSION,
+				'dol_entity'  => $conf->entity,
+				'dol_company' => $mysoc->name, // Usefull when using multicompany
+				'dol_tax_num' => $vatnumber,
+				'ipaddress'=> getUserRemoteIP()
+			);
 
-    		if (!empty($thirdparty_id)) $metadata["dol_thirdparty_id"] = $thirdparty_id;
+			if (!empty($thirdparty_id)) $metadata["dol_thirdparty_id"] = $thirdparty_id;
 
-    		if ($thirdparty_id > 0)
-    		{
-    			dol_syslog("Search existing Stripe customer profile for thirdparty_id=".$thirdparty_id, LOG_DEBUG, 0, '_stripe');
+			if ($thirdparty_id > 0)
+			{
+				dol_syslog("Search existing Stripe customer profile for thirdparty_id=".$thirdparty_id, LOG_DEBUG, 0, '_stripe');
 
-    			$service = 'StripeTest';
-    			$servicestatus = 0;
-    			if (!empty($conf->global->STRIPE_LIVE) && !GETPOST('forcesandbox', 'int'))
-    			{
-    				$service = 'StripeLive';
-    				$servicestatus = 1;
-    			}
+				$service = 'StripeTest';
+				$servicestatus = 0;
+				if (!empty($conf->global->STRIPE_LIVE) && !GETPOST('forcesandbox', 'int'))
+				{
+					$service = 'StripeLive';
+					$servicestatus = 1;
+				}
 
-    			$thirdparty = new Societe($db);
-    			$thirdparty->fetch($thirdparty_id);
+				$thirdparty = new Societe($db);
+				$thirdparty->fetch($thirdparty_id);
 
-    			// Create Stripe customer
-    			include_once DOL_DOCUMENT_ROOT.'/stripe/class/stripe.class.php';
-    			$stripe = new Stripe($db);
-                $stripeacc = $stripe->getStripeAccount($service);
-                $customer = $stripe->customerStripe($thirdparty, $stripeacc, $servicestatus, 1);
+				// Create Stripe customer
+				include_once DOL_DOCUMENT_ROOT.'/stripe/class/stripe.class.php';
+				$stripe = new Stripe($db);
+				$stripeacc = $stripe->getStripeAccount($service);
+				$customer = $stripe->customerStripe($thirdparty, $stripeacc, $servicestatus, 1);
 				if (empty($customer))
 				{
 					$error++;
@@ -461,51 +461,51 @@ if ($action == 'charge' && !empty($conf->stripe->enabled))
 					$action = '';
 				}
 
-    			// Create Stripe card from Token
-    			if (!$error)
-    			{
-	    			if ($savesource) {
-	    				$card = $customer->sources->create(array("source" => $stripeToken, "metadata" => $metadata));
-	    			} else {
-	    				$card = $stripeToken;
-	    			}
+				// Create Stripe card from Token
+				if (!$error)
+				{
+					if ($savesource) {
+						$card = $customer->sources->create(array("source" => $stripeToken, "metadata" => $metadata));
+					} else {
+						$card = $stripeToken;
+					}
 
-	    			if (empty($card))
-	    			{
-	    				$error++;
-	    				dol_syslog('Failed to create card record', LOG_WARNING, 0, '_stripe');
-	    				setEventMessages('Failed to create card record', null, 'errors');
-	    				$action = '';
-	    			} else {
-	    				if (!empty($FULLTAG))       $metadata["FULLTAG"] = $FULLTAG;
-	    				if (!empty($dol_id))        $metadata["dol_id"] = $dol_id;
-	    				if (!empty($dol_type))      $metadata["dol_type"] = $dol_type;
+					if (empty($card))
+					{
+						$error++;
+						dol_syslog('Failed to create card record', LOG_WARNING, 0, '_stripe');
+						setEventMessages('Failed to create card record', null, 'errors');
+						$action = '';
+					} else {
+						if (!empty($FULLTAG))       $metadata["FULLTAG"] = $FULLTAG;
+						if (!empty($dol_id))        $metadata["dol_id"] = $dol_id;
+						if (!empty($dol_type))      $metadata["dol_type"] = $dol_type;
 
-	    				dol_syslog("Create charge on card ".$card->id, LOG_DEBUG, 0, '_stripe');
-	    				$charge = \Stripe\Charge::create(array(
-	    					'amount'   => price2num($amountstripe, 'MU'),
-	    					'currency' => $currency,
-	    					'capture'  => true, // Charge immediatly
-	    					'description' => 'Stripe payment: '.$FULLTAG.' ref='.$ref,
-	    					'metadata' => $metadata,
-	    					'customer' => $customer->id,
-	    					'source' => $card,
-	    				  'statement_descriptor_suffix' => dol_trunc($FULLTAG, 10, 'right', 'UTF-8', 1), // 22 chars that appears on bank receipt (company + description)
-	    				), array("idempotency_key" => "$FULLTAG", "stripe_account" => "$stripeacc"));
-	    				// Return $charge = array('id'=>'ch_XXXX', 'status'=>'succeeded|pending|failed', 'failure_code'=>, 'failure_message'=>...)
-	    				if (empty($charge))
-	    				{
-	    					$error++;
-	    					dol_syslog('Failed to charge card', LOG_WARNING, 0, '_stripe');
-	    					setEventMessages('Failed to charge card', null, 'errors');
-	    					$action = '';
-	    				}
-	    			}
-    			}
-    		} else {
-    			$vatcleaned = $vatnumber ? $vatnumber : null;
+						dol_syslog("Create charge on card ".$card->id, LOG_DEBUG, 0, '_stripe');
+						$charge = \Stripe\Charge::create(array(
+							'amount'   => price2num($amountstripe, 'MU'),
+							'currency' => $currency,
+							'capture'  => true, // Charge immediatly
+							'description' => 'Stripe payment: '.$FULLTAG.' ref='.$ref,
+							'metadata' => $metadata,
+							'customer' => $customer->id,
+							'source' => $card,
+						  'statement_descriptor_suffix' => dol_trunc($FULLTAG, 10, 'right', 'UTF-8', 1), // 22 chars that appears on bank receipt (company + description)
+						), array("idempotency_key" => "$FULLTAG", "stripe_account" => "$stripeacc"));
+						// Return $charge = array('id'=>'ch_XXXX', 'status'=>'succeeded|pending|failed', 'failure_code'=>, 'failure_message'=>...)
+						if (empty($charge))
+						{
+							$error++;
+							dol_syslog('Failed to charge card', LOG_WARNING, 0, '_stripe');
+							setEventMessages('Failed to charge card', null, 'errors');
+							$action = '';
+						}
+					}
+				}
+			} else {
+				$vatcleaned = $vatnumber ? $vatnumber : null;
 
-    			/*$taxinfo = array('type'=>'vat');
+				/*$taxinfo = array('type'=>'vat');
     			if ($vatcleaned)
     			{
     				$taxinfo["tax_id"] = $vatcleaned;
@@ -514,18 +514,18 @@ if ($action == 'charge' && !empty($conf->stripe->enabled))
     			if (empty($vatcleaned)) $taxinfo=null;
     			*/
 
-    			dol_syslog("Create anonymous customer card profile", LOG_DEBUG, 0, '_stripe');
+				dol_syslog("Create anonymous customer card profile", LOG_DEBUG, 0, '_stripe');
 
-                $customer = \Stripe\Customer::create(array(
-    				'email' => $email,
-    				'description' => ($email ? 'Anonymous customer for '.$email : 'Anonymous customer'),
-    				'metadata' => $metadata,
-    				'source'  => $stripeToken           // source can be a token OR array('object'=>'card', 'exp_month'=>xx, 'exp_year'=>xxxx, 'number'=>xxxxxxx, 'cvc'=>xxx, 'name'=>'Cardholder's full name', zip ?)
-    			));
-    			// Return $customer = array('id'=>'cus_XXXX', ...)
+				$customer = \Stripe\Customer::create(array(
+					'email' => $email,
+					'description' => ($email ? 'Anonymous customer for '.$email : 'Anonymous customer'),
+					'metadata' => $metadata,
+					'source'  => $stripeToken           // source can be a token OR array('object'=>'card', 'exp_month'=>xx, 'exp_year'=>xxxx, 'number'=>xxxxxxx, 'cvc'=>xxx, 'name'=>'Cardholder's full name', zip ?)
+				));
+				// Return $customer = array('id'=>'cus_XXXX', ...)
 
-                // Create the VAT record in Stripe
-                /* We don't know country of customer, so we can't create tax
+				// Create the VAT record in Stripe
+				/* We don't know country of customer, so we can't create tax
                 if (! empty($conf->global->STRIPE_SAVE_TAX_IDS))	// We setup to save Tax info on Stripe side. Warning: This may result in error when saving customer
                 {
                 	if (! empty($vatcleaned))
@@ -539,145 +539,145 @@ if ($action == 'charge' && !empty($conf->stripe->enabled))
                 	}
                 }*/
 
-    			if (!empty($FULLTAG))       $metadata["FULLTAG"] = $FULLTAG;
-    			if (!empty($dol_id))        $metadata["dol_id"] = $dol_id;
-    			if (!empty($dol_type))      $metadata["dol_type"] = $dol_type;
+				if (!empty($FULLTAG))       $metadata["FULLTAG"] = $FULLTAG;
+				if (!empty($dol_id))        $metadata["dol_id"] = $dol_id;
+				if (!empty($dol_type))      $metadata["dol_type"] = $dol_type;
 
-    			// The customer was just created with a source, so we can make a charge
-    			// with no card defined, the source just used for customer creation will be used.
-    			dol_syslog("Create charge", LOG_DEBUG, 0, '_stripe');
-                $charge = \Stripe\Charge::create(array(
-    				'customer' => $customer->id,
-    				'amount'   => price2num($amountstripe, 'MU'),
-    				'currency' => $currency,
-    				'capture'  => true, // Charge immediatly
-    				'description' => 'Stripe payment: '.$FULLTAG.' ref='.$ref,
-    				'metadata' => $metadata,
-                    'statement_descriptor' => dol_trunc($FULLTAG, 10, 'right', 'UTF-8', 1), // 22 chars that appears on bank receipt (company + description)
-    			), array("idempotency_key" => "$FULLTAG", "stripe_account" => "$stripeacc"));
-    			// Return $charge = array('id'=>'ch_XXXX', 'status'=>'succeeded|pending|failed', 'failure_code'=>, 'failure_message'=>...)
-    			if (empty($charge))
-    			{
-    				$error++;
-    				dol_syslog('Failed to charge card', LOG_WARNING, 0, '_stripe');
-    				setEventMessages('Failed to charge card', null, 'errors');
-    				$action = '';
-    			}
-    		}
-    	} catch (\Stripe\Error\Card $e) {
-    		// Since it's a decline, \Stripe\Error\Card will be caught
-    		$body = $e->getJsonBody();
-    		$err  = $body['error'];
+				// The customer was just created with a source, so we can make a charge
+				// with no card defined, the source just used for customer creation will be used.
+				dol_syslog("Create charge", LOG_DEBUG, 0, '_stripe');
+				$charge = \Stripe\Charge::create(array(
+					'customer' => $customer->id,
+					'amount'   => price2num($amountstripe, 'MU'),
+					'currency' => $currency,
+					'capture'  => true, // Charge immediatly
+					'description' => 'Stripe payment: '.$FULLTAG.' ref='.$ref,
+					'metadata' => $metadata,
+					'statement_descriptor' => dol_trunc($FULLTAG, 10, 'right', 'UTF-8', 1), // 22 chars that appears on bank receipt (company + description)
+				), array("idempotency_key" => "$FULLTAG", "stripe_account" => "$stripeacc"));
+				// Return $charge = array('id'=>'ch_XXXX', 'status'=>'succeeded|pending|failed', 'failure_code'=>, 'failure_message'=>...)
+				if (empty($charge))
+				{
+					$error++;
+					dol_syslog('Failed to charge card', LOG_WARNING, 0, '_stripe');
+					setEventMessages('Failed to charge card', null, 'errors');
+					$action = '';
+				}
+			}
+		} catch (\Stripe\Error\Card $e) {
+			// Since it's a decline, \Stripe\Error\Card will be caught
+			$body = $e->getJsonBody();
+			$err  = $body['error'];
 
-    		print('Status is:'.$e->getHttpStatus()."\n");
-    		print('Type is:'.$err['type']."\n");
-    		print('Code is:'.$err['code']."\n");
-    		// param is '' in this case
-    		print('Param is:'.$err['param']."\n");
-    		print('Message is:'.$err['message']."\n");
+			print('Status is:'.$e->getHttpStatus()."\n");
+			print('Type is:'.$err['type']."\n");
+			print('Code is:'.$err['code']."\n");
+			// param is '' in this case
+			print('Param is:'.$err['param']."\n");
+			print('Message is:'.$err['message']."\n");
 
-    		$error++;
-    		$errormessage = "ErrorCard ".$e->getMessage()." err=".var_export($err, true);
-    		dol_syslog($errormessage, LOG_WARNING, 0, '_stripe');
-    		setEventMessages($e->getMessage(), null, 'errors');
-    		$action = '';
-    	} catch (\Stripe\Error\RateLimit $e) {
-    		// Too many requests made to the API too quickly
-    		$error++;
-    		$errormessage = "ErrorRateLimit ".$e->getMessage();
-    		dol_syslog($errormessage, LOG_WARNING, 0, '_stripe');
-    		setEventMessages($e->getMessage(), null, 'errors');
-    		$action = '';
-    	} catch (\Stripe\Error\InvalidRequest $e) {
-    		// Invalid parameters were supplied to Stripe's API
-    		$error++;
-    		$errormessage = "ErrorInvalidRequest ".$e->getMessage();
-    		dol_syslog($errormessage, LOG_WARNING, 0, '_stripe');
-    		setEventMessages($e->getMessage(), null, 'errors');
-    		$action = '';
-    	} catch (\Stripe\Error\Authentication $e) {
-    		// Authentication with Stripe's API failed
-    		// (maybe you changed API keys recently)
-    		$error++;
-    		$errormessage = "ErrorAuthentication ".$e->getMessage();
-    		dol_syslog($errormessage, LOG_WARNING, 0, '_stripe');
-    		setEventMessages($e->getMessage(), null, 'errors');
-    		$action = '';
-    	} catch (\Stripe\Error\ApiConnection $e) {
-    		// Network communication with Stripe failed
-    		$error++;
-    		$errormessage = "ErrorApiConnection ".$e->getMessage();
-    		dol_syslog($errormessage, LOG_WARNING, 0, '_stripe');
-    		setEventMessages($e->getMessage(), null, 'errors');
-    		$action = '';
-    	} catch (\Stripe\Error\Base $e) {
-    		// Display a very generic error to the user, and maybe send
-    		// yourself an email
-    		$error++;
-    		$errormessage = "ErrorBase ".$e->getMessage();
-    		dol_syslog($errormessage, LOG_WARNING, 0, '_stripe');
-    		setEventMessages($e->getMessage(), null, 'errors');
-    		$action = '';
-    	} catch (Exception $e) {
-    		// Something else happened, completely unrelated to Stripe
-    		$error++;
-    		$errormessage = "ErrorException ".$e->getMessage();
-    		dol_syslog($errormessage, LOG_WARNING, 0, '_stripe');
-    		setEventMessages($e->getMessage(), null, 'errors');
-    		$action = '';
-    	}
-    }
+			$error++;
+			$errormessage = "ErrorCard ".$e->getMessage()." err=".var_export($err, true);
+			dol_syslog($errormessage, LOG_WARNING, 0, '_stripe');
+			setEventMessages($e->getMessage(), null, 'errors');
+			$action = '';
+		} catch (\Stripe\Error\RateLimit $e) {
+			// Too many requests made to the API too quickly
+			$error++;
+			$errormessage = "ErrorRateLimit ".$e->getMessage();
+			dol_syslog($errormessage, LOG_WARNING, 0, '_stripe');
+			setEventMessages($e->getMessage(), null, 'errors');
+			$action = '';
+		} catch (\Stripe\Error\InvalidRequest $e) {
+			// Invalid parameters were supplied to Stripe's API
+			$error++;
+			$errormessage = "ErrorInvalidRequest ".$e->getMessage();
+			dol_syslog($errormessage, LOG_WARNING, 0, '_stripe');
+			setEventMessages($e->getMessage(), null, 'errors');
+			$action = '';
+		} catch (\Stripe\Error\Authentication $e) {
+			// Authentication with Stripe's API failed
+			// (maybe you changed API keys recently)
+			$error++;
+			$errormessage = "ErrorAuthentication ".$e->getMessage();
+			dol_syslog($errormessage, LOG_WARNING, 0, '_stripe');
+			setEventMessages($e->getMessage(), null, 'errors');
+			$action = '';
+		} catch (\Stripe\Error\ApiConnection $e) {
+			// Network communication with Stripe failed
+			$error++;
+			$errormessage = "ErrorApiConnection ".$e->getMessage();
+			dol_syslog($errormessage, LOG_WARNING, 0, '_stripe');
+			setEventMessages($e->getMessage(), null, 'errors');
+			$action = '';
+		} catch (\Stripe\Error\Base $e) {
+			// Display a very generic error to the user, and maybe send
+			// yourself an email
+			$error++;
+			$errormessage = "ErrorBase ".$e->getMessage();
+			dol_syslog($errormessage, LOG_WARNING, 0, '_stripe');
+			setEventMessages($e->getMessage(), null, 'errors');
+			$action = '';
+		} catch (Exception $e) {
+			// Something else happened, completely unrelated to Stripe
+			$error++;
+			$errormessage = "ErrorException ".$e->getMessage();
+			dol_syslog($errormessage, LOG_WARNING, 0, '_stripe');
+			setEventMessages($e->getMessage(), null, 'errors');
+			$action = '';
+		}
+	}
 
-    // When using the PaymentIntent API architecture
-    if (!empty($conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION))
-    {
-        $service = 'StripeTest';
-        $servicestatus = 0;
-        if (!empty($conf->global->STRIPE_LIVE) && !GETPOST('forcesandbox', 'int'))
-        {
-            $service = 'StripeLive';
-            $servicestatus = 1;
-        }
-        include_once DOL_DOCUMENT_ROOT.'/stripe/class/stripe.class.php';
-        $stripe = new Stripe($db);
-        $stripeacc = $stripe->getStripeAccount($service);
+	// When using the PaymentIntent API architecture
+	if (!empty($conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION))
+	{
+		$service = 'StripeTest';
+		$servicestatus = 0;
+		if (!empty($conf->global->STRIPE_LIVE) && !GETPOST('forcesandbox', 'int'))
+		{
+			$service = 'StripeLive';
+			$servicestatus = 1;
+		}
+		include_once DOL_DOCUMENT_ROOT.'/stripe/class/stripe.class.php';
+		$stripe = new Stripe($db);
+		$stripeacc = $stripe->getStripeAccount($service);
 
-        // We go here if $conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION is set.
-        // In such a case, payment is always ok when we call the "charge" action.
-        $paymentintent_id = GETPOST("paymentintent_id", "alpha");
+		// We go here if $conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION is set.
+		// In such a case, payment is always ok when we call the "charge" action.
+		$paymentintent_id = GETPOST("paymentintent_id", "alpha");
 
-        // Force to use the correct API key
-        global $stripearrayofkeysbyenv;
-        \Stripe\Stripe::setApiKey($stripearrayofkeysbyenv[$servicestatus]['secret_key']);
+		// Force to use the correct API key
+		global $stripearrayofkeysbyenv;
+		\Stripe\Stripe::setApiKey($stripearrayofkeysbyenv[$servicestatus]['secret_key']);
 
-        try {
-        	if (empty($stripeacc)) {				// If the Stripe connect account not set, we use common API usage
-                $paymentintent = \Stripe\PaymentIntent::retrieve($paymentintent_id);
-            } else {
-                $paymentintent = \Stripe\PaymentIntent::retrieve($paymentintent_id, array("stripe_account" => $stripeacc));
-            }
-        } catch (Exception $e)
-        {
-            $error++;
-            $errormessage = "CantRetrievePaymentIntent ".$e->getMessage();
-            dol_syslog($errormessage, LOG_WARNING, 0, '_stripe');
-            setEventMessages($e->getMessage(), null, 'errors');
-            $action = '';
-        }
+		try {
+			if (empty($stripeacc)) {				// If the Stripe connect account not set, we use common API usage
+				$paymentintent = \Stripe\PaymentIntent::retrieve($paymentintent_id);
+			} else {
+				$paymentintent = \Stripe\PaymentIntent::retrieve($paymentintent_id, array("stripe_account" => $stripeacc));
+			}
+		} catch (Exception $e)
+		{
+			$error++;
+			$errormessage = "CantRetrievePaymentIntent ".$e->getMessage();
+			dol_syslog($errormessage, LOG_WARNING, 0, '_stripe');
+			setEventMessages($e->getMessage(), null, 'errors');
+			$action = '';
+		}
 
-        if ($paymentintent->status != 'succeeded')
-        {
-            $error++;
-            $errormessage = "StatusOfRetrievedIntent is not succeeded: ".$paymentintent->status;
-            dol_syslog($errormessage, LOG_WARNING, 0, '_stripe');
-            setEventMessages($paymentintent->status, null, 'errors');
-            $action = '';
-        } else {
-        	// TODO We can alse record the payment mode into llx_societe_rib with stripe $paymentintent->payment_method
-        	// Note that with other old Stripe architecture (using Charge API), the payment mode was not recorded, so it is not mandatory to do it here.
-        	//dol_syslog("Create payment_method for ".$paymentintent->payment_method, LOG_DEBUG, 0, '_stripe');
-        }
-    }
+		if ($paymentintent->status != 'succeeded')
+		{
+			$error++;
+			$errormessage = "StatusOfRetrievedIntent is not succeeded: ".$paymentintent->status;
+			dol_syslog($errormessage, LOG_WARNING, 0, '_stripe');
+			setEventMessages($paymentintent->status, null, 'errors');
+			$action = '';
+		} else {
+			// TODO We can alse record the payment mode into llx_societe_rib with stripe $paymentintent->payment_method
+			// Note that with other old Stripe architecture (using Charge API), the payment mode was not recorded, so it is not mandatory to do it here.
+			//dol_syslog("Create payment_method for ".$paymentintent->payment_method, LOG_DEBUG, 0, '_stripe');
+		}
+	}
 
 
 	$remoteip = getUserRemoteIP();
@@ -727,8 +727,8 @@ if ($source && in_array($ref, array('member_ref', 'contractline_ref', 'invoice_r
 	$langs->load("errors");
 	dol_print_error_email('BADREFINPAYMENTFORM', $langs->trans("ErrorBadLinkSourceSetButBadValueForRef", $source, $ref));
 	// End of page
-    llxFooter();
-    $db->close();
+	llxFooter();
+	$db->close();
 	exit;
 }
 
@@ -1394,9 +1394,9 @@ if ($source == 'membersubscription')
 	print '</td></tr>'."\n";
 
 	if ($object->datefin > 0) {
-	    print '<tr class="CTableRow'.($var ? '1' : '2').'"><td class="CTableRow'.($var ? '1' : '2').'">'.$langs->trans("DateEndSubscription");
-	    print '</td><td class="CTableRow'.($var ? '1' : '2').'">'.dol_print_date($member->datefin, 'day');
-	    print '</td></tr>'."\n";
+		print '<tr class="CTableRow'.($var ? '1' : '2').'"><td class="CTableRow'.($var ? '1' : '2').'">'.$langs->trans("DateEndSubscription");
+		print '</td><td class="CTableRow'.($var ? '1' : '2').'">'.dol_print_date($member->datefin, 'day');
+		print '</td></tr>'."\n";
 	}
 
 	if ($member->last_subscription_date || $member->last_subscription_amount)
@@ -1667,21 +1667,21 @@ if ($action != 'dopayment')
 		{
 			print '<br><br><span class="amountpaymentcomplete">'.$langs->trans("DonationPaid").'</span>';
 		} else {
-		    // Membership can be paid and we still allow to make renewal
-		    if ($source == 'membersubscription' && $object->datefin > dol_now())
-		    {
-		        $langs->load("members");
-		        print '<br><span class="amountpaymentcomplete">'.$langs->trans("MembershipPaid", dol_print_date($object->datefin, 'day')).'</span><br>';
-		        print '<div class="opacitymedium margintoponly">'.$langs->trans("PaymentWillBeRecordedForNextPeriod").'</div>';
-		    }
+			// Membership can be paid and we still allow to make renewal
+			if ($source == 'membersubscription' && $object->datefin > dol_now())
+			{
+				$langs->load("members");
+				print '<br><span class="amountpaymentcomplete">'.$langs->trans("MembershipPaid", dol_print_date($object->datefin, 'day')).'</span><br>';
+				print '<div class="opacitymedium margintoponly">'.$langs->trans("PaymentWillBeRecordedForNextPeriod").'</div>';
+			}
 
 			// Buttons for all payments registration methods
 
-		    // This hook is used to add Button to newpayment.php for external payment modules (ie Payzen, ...)
-            $parameters = [
-            	'paymentmethod' => $paymentmethod
-            ];
-            $reshook = $hookmanager->executeHooks('doAddButton', $parameters, $object, $action);
+			// This hook is used to add Button to newpayment.php for external payment modules (ie Payzen, ...)
+			$parameters = [
+				'paymentmethod' => $paymentmethod
+			];
+			$reshook = $hookmanager->executeHooks('doAddButton', $parameters, $object, $action);
 			if ((empty($paymentmethod) || $paymentmethod == 'paybox') && !empty($conf->paybox->enabled))
 			{
 				print '<div class="button buttonpayment" id="div_dopayment_paybox"><span class="fa fa-credit-card"></span> <input class="" type="submit" id="dopayment_paybox" name="dopayment_paybox" value="'.$langs->trans("PayBoxDoPayment").'">';
@@ -1862,48 +1862,48 @@ if (preg_match('/^dopayment/', $action))			// If we choosed/click on the payment
 
 		//if (empty($conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION) || ! empty($paymentintent))
 		//{
-    	print '
+		print '
         <table id="dolpaymenttable" summary="Payment form" class="center">
         <tbody><tr><td class="textpublicpayment">';
 
-    	if (!empty($conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION))
-    	{
-            print '<div id="payment-request-button"><!-- A Stripe Element will be inserted here. --></div>';
-    	}
+		if (!empty($conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION))
+		{
+			print '<div id="payment-request-button"><!-- A Stripe Element will be inserted here. --></div>';
+		}
 
-        print '<div class="form-row left">';
-    	print '<label for="card-element">'.$langs->trans("CreditOrDebitCard").'</label>';
+		print '<div class="form-row left">';
+		print '<label for="card-element">'.$langs->trans("CreditOrDebitCard").'</label>';
 
-        if (!empty($conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION))
-        {
-            print '<br><input id="cardholder-name" class="marginbottomonly" name="cardholder-name" value="" type="text" placeholder="'.$langs->trans("CardOwner").'" autocomplete="off" autofocus required>';
-        }
+		if (!empty($conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION))
+		{
+			print '<br><input id="cardholder-name" class="marginbottomonly" name="cardholder-name" value="" type="text" placeholder="'.$langs->trans("CardOwner").'" autocomplete="off" autofocus required>';
+		}
 
-        print '<div id="card-element">
+		print '<div id="card-element">
         <!-- a Stripe Element will be inserted here. -->
         </div>';
 
-        print '<!-- Used to display form errors -->
+		print '<!-- Used to display form errors -->
         <div id="card-errors" role="alert"></div>
         </div>';
 
-        print '<br>';
-        print '<button class="button buttonpayment" style="text-align: center; padding-left: 0; padding-right: 0;" id="buttontopay" data-secret="'.(is_object($paymentintent) ? $paymentintent->client_secret : '').'">'.$langs->trans("ValidatePayment").'</button>';
-        print '<img id="hourglasstopay" class="hidden" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/working.gif">';
+		print '<br>';
+		print '<button class="button buttonpayment" style="text-align: center; padding-left: 0; padding-right: 0;" id="buttontopay" data-secret="'.(is_object($paymentintent) ? $paymentintent->client_secret : '').'">'.$langs->trans("ValidatePayment").'</button>';
+		print '<img id="hourglasstopay" class="hidden" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/working.gif">';
 
-        print '</td></tr></tbody>';
-        print '</table>';
+		print '</td></tr></tbody>';
+		print '</table>';
 		//}
 
 		if (!empty($conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION))
 		{
-		    if (empty($paymentintent))
-		    {
-                print '<center>'.$langs->trans("Error").'</center>';
-		    } else {
-		        print '<input type="hidden" name="paymentintent_id" value="'.$paymentintent->id.'">';
-		        //$_SESSION["paymentintent_id"] = $paymentintent->id;
-		    }
+			if (empty($paymentintent))
+			{
+				print '<center>'.$langs->trans("Error").'</center>';
+			} else {
+				print '<input type="hidden" name="paymentintent_id" value="'.$paymentintent->id.'">';
+				//$_SESSION["paymentintent_id"] = $paymentintent->id;
+			}
 		}
 
 		print '</form>'."\n";
@@ -1916,71 +1916,71 @@ if (preg_match('/^dopayment/', $action))			// If we choosed/click on the payment
 			print info_admin($langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("Stripe")), 0, 0, 'error');
 		} else {
 			print '<!-- JS Code for Stripe components -->';
-    		print '<script src="https://js.stripe.com/v3/"></script>'."\n";
-    		print '<!-- urllogofull = '.$urllogofull.' -->'."\n";
+			print '<script src="https://js.stripe.com/v3/"></script>'."\n";
+			print '<!-- urllogofull = '.$urllogofull.' -->'."\n";
 
-    	    // Code to ask the credit card. This use the default "API version". No way to force API version when using JS code.
-    		print '<script type="text/javascript" language="javascript">'."\n";
+			// Code to ask the credit card. This use the default "API version". No way to force API version when using JS code.
+			print '<script type="text/javascript" language="javascript">'."\n";
 
-    		if (!empty($conf->global->STRIPE_USE_NEW_CHECKOUT))
-    		{
-    			$amountstripe = $amount;
+			if (!empty($conf->global->STRIPE_USE_NEW_CHECKOUT))
+			{
+				$amountstripe = $amount;
 
-    			// Correct the amount according to unit of currency
-    			// See https://support.stripe.com/questions/which-zero-decimal-currencies-does-stripe-support
-    			$arrayzerounitcurrency = array('BIF', 'CLP', 'DJF', 'GNF', 'JPY', 'KMF', 'KRW', 'MGA', 'PYG', 'RWF', 'VND', 'VUV', 'XAF', 'XOF', 'XPF');
-    			if (!in_array($currency, $arrayzerounitcurrency)) $amountstripe = $amountstripe * 100;
+				// Correct the amount according to unit of currency
+				// See https://support.stripe.com/questions/which-zero-decimal-currencies-does-stripe-support
+				$arrayzerounitcurrency = array('BIF', 'CLP', 'DJF', 'GNF', 'JPY', 'KMF', 'KRW', 'MGA', 'PYG', 'RWF', 'VND', 'VUV', 'XAF', 'XOF', 'XPF');
+				if (!in_array($currency, $arrayzerounitcurrency)) $amountstripe = $amountstripe * 100;
 
-    			$ipaddress = getUserRemoteIP();
-    			$metadata = array('dol_version'=>DOL_VERSION, 'dol_entity'=>$conf->entity, 'ipaddress'=>$ipaddress);
-    			if (is_object($object))
-    			{
-    				$metadata['dol_type'] = $object->element;
-    				$metadata['dol_id'] = $object->id;
+				$ipaddress = getUserRemoteIP();
+				$metadata = array('dol_version'=>DOL_VERSION, 'dol_entity'=>$conf->entity, 'ipaddress'=>$ipaddress);
+				if (is_object($object))
+				{
+					$metadata['dol_type'] = $object->element;
+					$metadata['dol_id'] = $object->id;
 
-    				$ref = $object->ref;
-    			}
+					$ref = $object->ref;
+				}
 
-    			try {
-    				$arrayforpaymentintent = array(
-    					'description'=>'Stripe payment: '.$FULLTAG.($ref ? ' ref='.$ref : ''),
-    					"metadata" => $metadata
-    				);
-    				if ($TAG) $arrayforpaymentintent["statement_descriptor"] = dol_trunc($TAG, 10, 'right', 'UTF-8', 1); // 22 chars that appears on bank receipt (company + description)
+				try {
+					$arrayforpaymentintent = array(
+						'description'=>'Stripe payment: '.$FULLTAG.($ref ? ' ref='.$ref : ''),
+						"metadata" => $metadata
+					);
+					if ($TAG) $arrayforpaymentintent["statement_descriptor"] = dol_trunc($TAG, 10, 'right', 'UTF-8', 1); // 22 chars that appears on bank receipt (company + description)
 
-    				$arrayforcheckout = array(
-    					'payment_method_types' => array('card'),
-    					'line_items' => array(array(
-    						'name' => $langs->transnoentitiesnoconv("Payment").' '.$TAG, // Label of product line
-    						'description' => 'Stripe payment: '.$FULLTAG.($ref ? ' ref='.$ref : ''),
-    						'amount' => $amountstripe,
-    						'currency' => $currency,
-    						//'images' => array($urllogofull),
-    						'quantity' => 1,
-    					)),
-    					'client_reference_id' => $FULLTAG,
-    					'success_url' => $urlok,
-    					'cancel_url' => $urlko,
-    					'payment_intent_data' => $arrayforpaymentintent
-    				);
-    				if ($stripecu) $arrayforcheckout['customer'] = $stripecu;
-    				elseif (GETPOST('email', 'alpha') && isValidEmail(GETPOST('email', 'alpha'))) $arrayforcheckout['customer_email'] = GETPOST('email', 'alpha');
-    				$sessionstripe = \Stripe\Checkout\Session::create($arrayforcheckout);
+					$arrayforcheckout = array(
+						'payment_method_types' => array('card'),
+						'line_items' => array(array(
+							'name' => $langs->transnoentitiesnoconv("Payment").' '.$TAG, // Label of product line
+							'description' => 'Stripe payment: '.$FULLTAG.($ref ? ' ref='.$ref : ''),
+							'amount' => $amountstripe,
+							'currency' => $currency,
+							//'images' => array($urllogofull),
+							'quantity' => 1,
+						)),
+						'client_reference_id' => $FULLTAG,
+						'success_url' => $urlok,
+						'cancel_url' => $urlko,
+						'payment_intent_data' => $arrayforpaymentintent
+					);
+					if ($stripecu) $arrayforcheckout['customer'] = $stripecu;
+					elseif (GETPOST('email', 'alpha') && isValidEmail(GETPOST('email', 'alpha'))) $arrayforcheckout['customer_email'] = GETPOST('email', 'alpha');
+					$sessionstripe = \Stripe\Checkout\Session::create($arrayforcheckout);
 
-    				$remoteip = getUserRemoteIP();
+					$remoteip = getUserRemoteIP();
 
-    				// Save some data for the paymentok
-    				$_SESSION["currencyCodeType"] = $currency;
-    				$_SESSION["paymentType"] = '';
-    				$_SESSION["FinalPaymentAmt"] = $amount;
-    				$_SESSION['ipaddress'] = ($remoteip ? $remoteip : 'unknown'); // Payer ip
-    				$_SESSION['payerID'] = is_object($stripecu) ? $stripecu->id : '';
-    				$_SESSION['TRANSACTIONID'] = $sessionstripe->id;
-    			} catch (Exception $e)
-    			{
-    				print $e->getMessage();
-    			}
-    			?>
+					// Save some data for the paymentok
+					$_SESSION["currencyCodeType"] = $currency;
+					$_SESSION["paymentType"] = '';
+					$_SESSION["FinalPaymentAmt"] = $amount;
+					$_SESSION['ipaddress'] = ($remoteip ? $remoteip : 'unknown'); // Payer ip
+					$_SESSION['payerID'] = is_object($stripecu) ? $stripecu->id : '';
+					$_SESSION['TRANSACTIONID'] = $sessionstripe->id;
+				} catch (Exception $e)
+				{
+					print $e->getMessage();
+				}
+				?>
    			// Code for payment with option STRIPE_USE_NEW_CHECKOUT set
 
     	    // Create a Stripe client.
@@ -2024,9 +2024,9 @@ if (preg_match('/^dopayment/', $action))			// If we choosed/click on the payment
 
 
     			<?php
-    		} elseif (!empty($conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION))
-    		{
-            	?>
+			} elseif (!empty($conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION))
+			{
+				?>
     		// Code for payment with option STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION set
 
     	    // Create a Stripe client.
@@ -2129,9 +2129,9 @@ if (preg_match('/^dopayment/', $action))			// If we choosed/click on the payment
             });
 
     			<?php
-    		} else // Old method (not SCA ready)
-    		{
-    			?>
+			} else // Old method (not SCA ready)
+			{
+				?>
     		// Old code for payment with option STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION off and STRIPE_USE_NEW_CHECKOUT off
 
     	    // Create a Stripe client.
@@ -2181,9 +2181,9 @@ if (preg_match('/^dopayment/', $action))			// If we choosed/click on the payment
     	    form.addEventListener('submit', function(event) {
     	      event.preventDefault();
     			<?php
-    			if (empty($conf->global->STRIPE_USE_3DSECURE))	// Ask credit card directly, no 3DS test
-    			{
-    				?>
+				if (empty($conf->global->STRIPE_USE_3DSECURE))	// Ask credit card directly, no 3DS test
+				{
+					?>
     				/* Use token */
     				stripe.createToken(card).then(function(result) {
     			        if (result.error) {
@@ -2196,9 +2196,9 @@ if (preg_match('/^dopayment/', $action))			// If we choosed/click on the payment
     			        }
     				});
     				<?php
-    			} else // Ask credit card with 3DS test
-    			{
-    				?>
+				} else // Ask credit card with 3DS test
+				{
+					?>
     				/* Use 3DS source */
     				stripe.createSource(card).then(function(result) {
     				    if (result.error) {
@@ -2211,8 +2211,8 @@ if (preg_match('/^dopayment/', $action))			// If we choosed/click on the payment
     				    }
     				});
     				<?php
-    			}
-    			?>
+				}
+				?>
     	    });
 
 
@@ -2265,19 +2265,19 @@ if (preg_match('/^dopayment/', $action))			// If we choosed/click on the payment
     		}
 
     	    	<?php
-    		}
+			}
 
-    		print '</script>';
+			print '</script>';
 		}
 	}
 	// This hook is used to show the embedded form to make payments with external payment modules (ie Payzen, ...)
-    $parameters = [
-    	'paymentmethod' => $paymentmethod,
-    	'amount' => price2num(GETPOST("newamount"), 'MT'),
-    	'tag' => GETPOST("tag", 'alpha'),
-    	'dopayment' => GETPOST('dopayment', 'alpha')
-    ];
-    $reshook = $hookmanager->executeHooks('doPayment', $parameters, $object, $action);
+	$parameters = [
+		'paymentmethod' => $paymentmethod,
+		'amount' => price2num(GETPOST("newamount"), 'MT'),
+		'tag' => GETPOST("tag", 'alpha'),
+		'dopayment' => GETPOST('dopayment', 'alpha')
+	];
+	$reshook = $hookmanager->executeHooks('doPayment', $parameters, $object, $action);
 }
 
 
diff --git a/htdocs/public/recruitment/index.php b/htdocs/public/recruitment/index.php
index a5be30aab49..504ecadfc71 100644
--- a/htdocs/public/recruitment/index.php
+++ b/htdocs/public/recruitment/index.php
@@ -22,15 +22,15 @@
  */
 
 if (!defined('NOCSRFCHECK')) {
-    define('NOCSRFCHECK', '1');
+	define('NOCSRFCHECK', '1');
 }
 // Do not check anti CSRF attack test
 if (!defined('NOREQUIREMENU')) {
-    define('NOREQUIREMENU', '1');
+	define('NOREQUIREMENU', '1');
 }
 // If there is no need to load and show top and left menu
 if (!defined("NOLOGIN")) {
-    define("NOLOGIN", '1');
+	define("NOLOGIN", '1');
 }
 if (!defined('NOIPCHECK'))		define('NOIPCHECK', '1'); // Do not check IP defined into conf $dolibarr_main_restrict_ip
 if (!defined('NOBROWSERNOTIF')) define('NOBROWSERNOTIF', '1');
diff --git a/htdocs/public/stripe/confirm_payment.php b/htdocs/public/stripe/confirm_payment.php
index 30d20e495e0..5db7b49cc80 100644
--- a/htdocs/public/stripe/confirm_payment.php
+++ b/htdocs/public/stripe/confirm_payment.php
@@ -53,7 +53,7 @@ if (isset($_GET['connect']))
 	} else {
 		$endpoint_secret = $conf->global->STRIPE_LIVE_WEBHOOK_CONNECT_KEY;
 		$service = 'StripeLive';
-        $servicestatus = 1;
+		$servicestatus = 1;
 	}
 } else {
 	if (isset($_GET['test']))
@@ -102,28 +102,28 @@ $json_obj = json_decode($json_str);
 
 $intent = null;
 try {
-    if (isset($json_obj->payment_method_id)) {
-        // Create the PaymentIntent
-        $intent = \Stripe\PaymentIntent::create(array(
-            'payment_method' => $json_obj->payment_method_id,
-            'amount' => 1099,
-            'currency' => 'eur',
-            'confirmation_method' => 'manual',
-            'confirm' => true,
-        ));
-    }
-    if (isset($json_obj->payment_intent_id)) {
-        $intent = \Stripe\PaymentIntent::retrieve(
-            $json_obj->payment_intent_id
-            );
-        $intent->confirm();
-    }
-    generatePaymentResponse($intent);
+	if (isset($json_obj->payment_method_id)) {
+		// Create the PaymentIntent
+		$intent = \Stripe\PaymentIntent::create(array(
+			'payment_method' => $json_obj->payment_method_id,
+			'amount' => 1099,
+			'currency' => 'eur',
+			'confirmation_method' => 'manual',
+			'confirm' => true,
+		));
+	}
+	if (isset($json_obj->payment_intent_id)) {
+		$intent = \Stripe\PaymentIntent::retrieve(
+			$json_obj->payment_intent_id
+			);
+		$intent->confirm();
+	}
+	generatePaymentResponse($intent);
 } catch (\Stripe\Error\Base $e) {
-    // Display error on client
-    echo json_encode(array(
-        'error' => $e->getMessage()
-    ));
+	// Display error on client
+	echo json_encode(array(
+		'error' => $e->getMessage()
+	));
 }
 
 /**
@@ -134,25 +134,25 @@ try {
  */
 function generatePaymentResponse($intent)
 {
-    if ($intent->status == 'requires_source_action' &&
-        $intent->next_action->type == 'use_stripe_sdk') {
-        // Tell the client to handle the action
-        echo json_encode(array(
-            'requires_action' => true,
-            'payment_intent_client_secret' => $intent->client_secret
-        ));
-    } elseif ($intent->status == 'succeeded') {
-        // The payment didn’t need any additional actions and completed!
-        // Handle post-payment fulfillment
+	if ($intent->status == 'requires_source_action' &&
+		$intent->next_action->type == 'use_stripe_sdk') {
+		// Tell the client to handle the action
+		echo json_encode(array(
+			'requires_action' => true,
+			'payment_intent_client_secret' => $intent->client_secret
+		));
+	} elseif ($intent->status == 'succeeded') {
+		// The payment didn’t need any additional actions and completed!
+		// Handle post-payment fulfillment
 
-        // TODO
+		// TODO
 
-        echo json_encode(array(
-            "success" => true
-        ));
-    } else {
-        // Invalid status
-        http_response_code(500);
-        echo json_encode(array('error' => 'Invalid PaymentIntent status'));
-    }
+		echo json_encode(array(
+			"success" => true
+		));
+	} else {
+		// Invalid status
+		http_response_code(500);
+		echo json_encode(array('error' => 'Invalid PaymentIntent status'));
+	}
 }
diff --git a/htdocs/public/stripe/ipn.php b/htdocs/public/stripe/ipn.php
index 882efbd6adc..bfb1bc99c5a 100644
--- a/htdocs/public/stripe/ipn.php
+++ b/htdocs/public/stripe/ipn.php
@@ -53,7 +53,7 @@ if (isset($_GET['connect']))
 	} else {
 		$endpoint_secret = $conf->global->STRIPE_LIVE_WEBHOOK_CONNECT_KEY;
 		$service = 'StripeLive';
-        $servicestatus = 1;
+		$servicestatus = 1;
 	}
 } else {
 	if (isset($_GET['test']))
@@ -70,9 +70,9 @@ if (isset($_GET['connect']))
 
 if (empty($endpoint_secret))
 {
-    print 'Error: Setup of module Stripe not complete for mode '.$service.'. The WEBHOOK_KEY is not defined.';
-    http_response_code(400); // PHP 5.4 or greater
-    exit();
+	print 'Error: Setup of module Stripe not complete for mode '.$service.'. The WEBHOOK_KEY is not defined.';
+	http_response_code(400); // PHP 5.4 or greater
+	exit();
 }
 
 
@@ -148,38 +148,38 @@ if ($event->type == 'payout.created') {
 
 	if ($result > 0)
 	{
-	    $subject = $societeName.' - [NOTIFICATION] Stripe payout scheduled';
-        if (!empty($user->email)) {
-            $sendto = dolGetFirstLastname($user->firstname, $user->lastname)." <".$user->email.">";
-        } else {
-            $sendto = $conf->global->MAIN_INFO_SOCIETE_MAIL.'" <'.$conf->global->MAIN_INFO_SOCIETE_MAIL.'>';
-        }
-        $replyto = $sendto;
-        $sendtocc = '';
-        if (!empty($conf->global->ONLINE_PAYMENT_SENDEMAIL)) {
-            $sendtocc = $conf->global->ONLINE_PAYMENT_SENDEMAIL.'" <'.$conf->global->ONLINE_PAYMENT_SENDEMAIL.'>';
-        }
+		$subject = $societeName.' - [NOTIFICATION] Stripe payout scheduled';
+		if (!empty($user->email)) {
+			$sendto = dolGetFirstLastname($user->firstname, $user->lastname)." <".$user->email.">";
+		} else {
+			$sendto = $conf->global->MAIN_INFO_SOCIETE_MAIL.'" <'.$conf->global->MAIN_INFO_SOCIETE_MAIL.'>';
+		}
+		$replyto = $sendto;
+		$sendtocc = '';
+		if (!empty($conf->global->ONLINE_PAYMENT_SENDEMAIL)) {
+			$sendtocc = $conf->global->ONLINE_PAYMENT_SENDEMAIL.'" <'.$conf->global->ONLINE_PAYMENT_SENDEMAIL.'>';
+		}
 
-        $message = "A bank transfer of ".price2num($event->data->object->amount / 100)." ".$event->data->object->currency." should arrive in your account the ".dol_print_date($event->data->object->arrival_date, 'dayhour');
+		$message = "A bank transfer of ".price2num($event->data->object->amount / 100)." ".$event->data->object->currency." should arrive in your account the ".dol_print_date($event->data->object->arrival_date, 'dayhour');
 
-        $mailfile = new CMailFile(
-            $subject,
-            $sendto,
-            $replyto,
-            $message,
-            array(),
-            array(),
-            array(),
-            $sendtocc,
-            '',
-            0,
-            -1
-        );
+		$mailfile = new CMailFile(
+			$subject,
+			$sendto,
+			$replyto,
+			$message,
+			array(),
+			array(),
+			array(),
+			$sendtocc,
+			'',
+			0,
+			-1
+		);
 
-        $ret = $mailfile->sendfile();
+		$ret = $mailfile->sendfile();
 
-        http_response_code(200); // PHP 5.4 or greater
-        return 1;
+		http_response_code(200); // PHP 5.4 or greater
+		return 1;
 	} else {
 		$error++;
 		http_response_code(500); // PHP 5.4 or greater
@@ -240,7 +240,7 @@ if ($event->type == 'payout.created') {
 
 		$message = "A bank transfer of ".price2num($event->data->object->amount / 100)." ".$event->data->object->currency." has been done to your account the ".dol_print_date($event->data->object->arrival_date, 'dayhour');
 
-        $mailfile = new CMailFile(
+		$mailfile = new CMailFile(
 			$subject,
 			$sendto,
 			$replyto,
@@ -270,15 +270,15 @@ if ($event->type == 'payout.created') {
 } elseif ($event->type == 'customer.source.delete') {
 	//TODO: delete customer's source
 } elseif ($event->type == 'customer.deleted') {
-    $db->begin();
-    $sql = "DELETE FROM ".MAIN_DB_PREFIX."societe_account WHERE key_account = '".$db->escape($event->data->object->id)."' and site='stripe'";
-    $db->query($sql);
-    $db->commit();
+	$db->begin();
+	$sql = "DELETE FROM ".MAIN_DB_PREFIX."societe_account WHERE key_account = '".$db->escape($event->data->object->id)."' and site='stripe'";
+	$db->query($sql);
+	$db->commit();
 } elseif ($event->type == 'payment_intent.succeeded') {		// Called when making payment with PaymentIntent method ($conf->global->STRIPE_USE_NEW_CHECKOUT is on).
 	// TODO: create fees
 	// TODO: Redirect to paymentok.php
 } elseif ($event->type == 'payment_intent.payment_failed') {
-    // TODO: Redirect to paymentko.php
+	// TODO: Redirect to paymentko.php
 } elseif ($event->type == 'checkout.session.completed')		// Called when making payment with new Checkout method ($conf->global->STRIPE_USE_NEW_CHECKOUT is on).
 {
 	// TODO: create fees
@@ -365,10 +365,10 @@ if ($event->type == 'payout.created') {
 	$db->query($sql);
 	$db->commit();
 } elseif ($event->type == 'charge.succeeded') {
-    // TODO: create fees
-    // TODO: Redirect to paymentok.php
+	// TODO: create fees
+	// TODO: Redirect to paymentok.php
 } elseif ($event->type == 'charge.failed') {
-    // TODO: Redirect to paymentko.php
+	// TODO: Redirect to paymentko.php
 } elseif (($event->type == 'source.chargeable') && ($event->data->object->type == 'three_d_secure') && ($event->data->object->three_d_secure->authenticated == true)) {
 	// This event is deprecated.
 }
diff --git a/htdocs/public/ticket/create_ticket.php b/htdocs/public/ticket/create_ticket.php
index 91ce8993bef..bd7b5416efb 100644
--- a/htdocs/public/ticket/create_ticket.php
+++ b/htdocs/public/ticket/create_ticket.php
@@ -69,7 +69,7 @@ $parameters = array(
 // Note that $action and $object may have been modified by some hooks
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action);
 if ($reshook < 0) {
-    setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 }
 // Add file in email form
 if (empty($reshook) && GETPOST('addfile', 'alpha') && !GETPOST('add', 'alpha')) {
diff --git a/htdocs/public/website/styles.css.php b/htdocs/public/website/styles.css.php
index 568f671d09f..75257a8facc 100644
--- a/htdocs/public/website/styles.css.php
+++ b/htdocs/public/website/styles.css.php
@@ -71,20 +71,20 @@ if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $appli = $conf->global->MAIN_
 
 if (empty($pageid))
 {
-    require_once DOL_DOCUMENT_ROOT.'/website/class/website.class.php';
-    require_once DOL_DOCUMENT_ROOT.'/website/class/websitepage.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/website/class/website.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/website/class/websitepage.class.php';
 
-    $object = new Website($db);
-    if ($websiteid)
-    {
-        $object->fetch($websiteid);
-        $website = $object->ref;
-    } else {
-        $object->fetch(0, $website);
-    }
+	$object = new Website($db);
+	if ($websiteid)
+	{
+		$object->fetch($websiteid);
+		$website = $object->ref;
+	} else {
+		$object->fetch(0, $website);
+	}
 
-    $objectpage = new WebsitePage($db);
-    /* Not required for CSS file
+	$objectpage = new WebsitePage($db);
+	/* Not required for CSS file
     $array=$objectpage->fetchAll($object->id);
 
     if (is_array($array) && count($array) > 0)
@@ -115,7 +115,7 @@ $refname = basename(dirname($original_file)."/");
 // Limite acces si droits non corrects
 if (!$accessallowed)
 {
-    accessforbidden();
+	accessforbidden();
 }
 
 // Security:
@@ -123,10 +123,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();
@@ -140,10 +140,10 @@ $original_file_osencoded = dol_osencode($original_file); // New file name encode
 // This test if file exists should be useless. We keep it to find bug more easily
 if (!file_exists($original_file_osencoded))
 {
-    $langs->load("website");
-    print $langs->trans("RequestedPageHasNoContentYet", $pageid);
-    //dol_print_error(0,$langs->trans("ErrorFileDoesNotExists",$original_file));
-    exit;
+	$langs->load("website");
+	print $langs->trans("RequestedPageHasNoContentYet", $pageid);
+	//dol_print_error(0,$langs->trans("ErrorFileDoesNotExists",$original_file));
+	exit;
 }
 
 
diff --git a/htdocs/reception/card.php b/htdocs/reception/card.php
index 1f79364a618..560147f46d3 100644
--- a/htdocs/reception/card.php
+++ b/htdocs/reception/card.php
@@ -52,8 +52,8 @@ if (!empty($conf->fournisseur->enabled)) {
 }
 if (!empty($conf->productbatch->enabled)) require_once DOL_DOCUMENT_ROOT.'/product/class/productbatch.class.php';
 if (!empty($conf->projet->enabled)) {
-    require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
-    require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 }
 
 $langs->loadLangs(array("receptions", "companies", "bills", 'deliveries', 'orders', 'stocks', 'other', 'propal', 'sendings'));
@@ -122,7 +122,7 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 
 if (empty($reshook))
 {
-    if ($cancel)
+	if ($cancel)
 	{
 		$action = '';
 		$object->fetch($id); // show reception also after canceling modification
@@ -133,8 +133,8 @@ if (empty($reshook))
 	// Reopen
 	if ($action == 'reopen' && $user->rights->reception->creer)
 	{
-	    $object->fetch($id);
-	    $result = $object->reOpen();
+		$object->fetch($id);
+		$result = $object->reOpen();
 	}
 
 	// Confirm back to draft status
@@ -164,24 +164,24 @@ if (empty($reshook))
 	// Set incoterm
 	if ($action == 'set_incoterms' && !empty($conf->incoterm->enabled))
 	{
-	    $result = $object->setIncoterms(GETPOST('incoterm_id', 'int'), GETPOST('location_incoterms', 'alpha'));
+		$result = $object->setIncoterms(GETPOST('incoterm_id', 'int'), GETPOST('location_incoterms', 'alpha'));
 	}
 
 	if ($action == 'setref_supplier')
 	{
-        $result = $object->fetch($id);
-        if ($result < 0) {
-            setEventMessages($object->error, $object->errors, 'errors');
-        }
+		$result = $object->fetch($id);
+		if ($result < 0) {
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
 
-        $result = $object->setValueFrom('ref_supplier', GETPOST('ref_supplier', 'alpha'), '', null, 'text', '', $user, 'RECEPTION_MODIFY');
-        if ($result < 0) {
-            setEventMessages($object->error, $object->errors, 'errors');
-            $action = 'editref_supplier';
-        } else {
-            header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
-            exit;
-        }
+		$result = $object->setValueFrom('ref_supplier', GETPOST('ref_supplier', 'alpha'), '', null, 'text', '', $user, 'RECEPTION_MODIFY');
+		if ($result < 0) {
+			setEventMessages($object->error, $object->errors, 'errors');
+			$action = 'editref_supplier';
+		} else {
+			header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+			exit;
+		}
 	}
 
 	if ($action == 'update_extras')
@@ -338,76 +338,76 @@ if (empty($reshook))
 			}
 
 
-	        // Fill array 'array_options' with data from add form
-	        $ret = $extrafields->setOptionalsFromPost(null, $object);
-	        if ($ret < 0) $error++;
-	        if (!$error)
-	        {
-	            $ret = $object->create($user); // This create reception (like Odoo picking) and line of receptions. Stock movement will when validating reception.
+			// Fill array 'array_options' with data from add form
+			$ret = $extrafields->setOptionalsFromPost(null, $object);
+			if ($ret < 0) $error++;
+			if (!$error)
+			{
+				$ret = $object->create($user); // This create reception (like Odoo picking) and line of receptions. Stock movement will when validating reception.
 
-	            if ($ret <= 0)
-	            {
-	                setEventMessages($object->error, $object->errors, 'errors');
-	                $error++;
-	            }
-	        }
-	    } else {
-	        setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("QtyToReceive").'/'.$langs->transnoentitiesnoconv("Warehouse")), null, 'errors');
-	        $error++;
-	    }
+				if ($ret <= 0)
+				{
+					setEventMessages($object->error, $object->errors, 'errors');
+					$error++;
+				}
+			}
+		} else {
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("QtyToReceive").'/'.$langs->transnoentitiesnoconv("Warehouse")), null, 'errors');
+			$error++;
+		}
 
-	    if (!$error)
-	    {
-	        $db->commit();
-	        header("Location: card.php?id=".$object->id);
-	        exit;
-	    } else {
-	        $db->rollback();
-	        $_GET["commande_id"] = GETPOST('commande_id', 'int');
-	        $action = 'create';
-	    }
+		if (!$error)
+		{
+			$db->commit();
+			header("Location: card.php?id=".$object->id);
+			exit;
+		} else {
+			$db->rollback();
+			$_GET["commande_id"] = GETPOST('commande_id', 'int');
+			$action = 'create';
+		}
 	} elseif ($action == 'confirm_valid' && $confirm == 'yes' &&
-        ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->reception->creer))
-       	|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->reception->reception_advance->validate)))
+		((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->reception->creer))
+	   	|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->reception->reception_advance->validate)))
 	)
 	{
-	    $object->fetch_thirdparty();
+		$object->fetch_thirdparty();
 
-	    $result = $object->valid($user);
+		$result = $object->valid($user);
 
-	    if ($result < 0)
-	    {
+		if ($result < 0)
+		{
 			$langs->load("errors");
-	        setEventMessages($langs->trans($object->error), null, 'errors');
-	    } else {
-	    	// Define output language
-	    	if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
-	    	{
-	    		$outputlangs = $langs;
-	    		$newlang = '';
-	    		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) $newlang = GETPOST('lang_id', 'aZ09');
-	    		if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $object->thirdparty->default_lang;
-	    		if (!empty($newlang)) {
-	    			$outputlangs = new Translate("", $conf);
-	    			$outputlangs->setDefaultLang($newlang);
-	    		}
-	    		$model = $object->model_pdf;
-	    		$ret = $object->fetch($id); // Reload to get new records
+			setEventMessages($langs->trans($object->error), null, 'errors');
+		} else {
+			// Define output language
+			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
+			{
+				$outputlangs = $langs;
+				$newlang = '';
+				if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) $newlang = GETPOST('lang_id', 'aZ09');
+				if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $object->thirdparty->default_lang;
+				if (!empty($newlang)) {
+					$outputlangs = new Translate("", $conf);
+					$outputlangs->setDefaultLang($newlang);
+				}
+				$model = $object->model_pdf;
+				$ret = $object->fetch($id); // Reload to get new records
 
-	    		$result = $object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
-	    		if ($result < 0) dol_print_error($db, $result);
-	    	}
-	    }
+				$result = $object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
+				if ($result < 0) dol_print_error($db, $result);
+			}
+		}
 	} elseif ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->reception->supprimer)
 	{
-	    $result = $object->delete($user);
-	    if ($result > 0)
-	    {
-	        header("Location: ".DOL_URL_ROOT.'/reception/index.php');
-	        exit;
-	    } else {
+		$result = $object->delete($user);
+		if ($result > 0)
+		{
+			header("Location: ".DOL_URL_ROOT.'/reception/index.php');
+			exit;
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
-	    }
+		}
 	}
 	// TODO add alternative status
 	/*elseif ($action == 'reopen' && (! empty($user->rights->reception->creer) || ! empty($user->rights->reception->reception_advance->validate)))
@@ -421,15 +421,15 @@ if (empty($reshook))
 
 	elseif ($action == 'setdate_livraison' && $user->rights->reception->creer)
 	{
-	    //print "x ".$_POST['liv_month'].", ".$_POST['liv_day'].", ".$_POST['liv_year'];
-	    $datedelivery = dol_mktime(GETPOST('liv_hour', 'int'), GETPOST('liv_min', 'int'), 0, GETPOST('liv_month', 'int'), GETPOST('liv_day', 'int'), GETPOST('liv_year', 'int'));
+		//print "x ".$_POST['liv_month'].", ".$_POST['liv_day'].", ".$_POST['liv_year'];
+		$datedelivery = dol_mktime(GETPOST('liv_hour', 'int'), GETPOST('liv_min', 'int'), 0, GETPOST('liv_month', 'int'), GETPOST('liv_day', 'int'), GETPOST('liv_year', 'int'));
 
-	    $object->fetch($id);
-	    $result = $object->setDeliveryDate($user, $datedelivery);
-	    if ($result < 0)
-	    {
-	        setEventMessages($object->error, $object->errors, 'errors');
-	    }
+		$object->fetch($id);
+		$result = $object->setDeliveryDate($user, $datedelivery);
+		if ($result < 0)
+		{
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
 	}
 
 	// Action update
@@ -440,33 +440,33 @@ if (empty($reshook))
 	|| $action == 'settrueDepth'
 	|| $action == 'setshipping_method_id')
 	{
-	    $error = 0;
+		$error = 0;
 
-	    if ($action == 'settracking_number')		$object->tracking_number = trim(GETPOST('tracking_number', 'alpha'));
-	    if ($action == 'settracking_url')		$object->tracking_url = trim(GETPOST('tracking_url', 'int'));
-	    if ($action == 'settrueWeight') {
-	    	$object->trueWeight = trim(GETPOST('trueWeight', 'int'));
+		if ($action == 'settracking_number')		$object->tracking_number = trim(GETPOST('tracking_number', 'alpha'));
+		if ($action == 'settracking_url')		$object->tracking_url = trim(GETPOST('tracking_url', 'int'));
+		if ($action == 'settrueWeight') {
+			$object->trueWeight = trim(GETPOST('trueWeight', 'int'));
 			$object->weight_units = GETPOST('weight_units', 'int');
-	    }
-	    if ($action == 'settrueWidth')			$object->trueWidth = trim(GETPOST('trueWidth', 'int'));
-	    if ($action == 'settrueHeight') {
-	    				$object->trueHeight = trim(GETPOST('trueHeight', 'int'));
+		}
+		if ($action == 'settrueWidth')			$object->trueWidth = trim(GETPOST('trueWidth', 'int'));
+		if ($action == 'settrueHeight') {
+						$object->trueHeight = trim(GETPOST('trueHeight', 'int'));
 						$object->size_units = GETPOST('size_units', 'int');
 		}
-	    if ($action == 'settrueDepth')			$object->trueDepth = trim(GETPOST('trueDepth', 'int'));
-	    if ($action == 'setshipping_method_id')	$object->shipping_method_id = trim(GETPOST('shipping_method_id', 'int'));
+		if ($action == 'settrueDepth')			$object->trueDepth = trim(GETPOST('trueDepth', 'int'));
+		if ($action == 'setshipping_method_id')	$object->shipping_method_id = trim(GETPOST('shipping_method_id', 'int'));
 
-	    if (!$error)
-	    {
-	        if ($object->update($user) >= 0)
-	        {
-	            header("Location: card.php?id=".$object->id);
-	            exit;
-	        }
-	        setEventMessages($object->error, $object->errors, 'errors');
-	    }
+		if (!$error)
+		{
+			if ($object->update($user) >= 0)
+			{
+				header("Location: card.php?id=".$object->id);
+				exit;
+			}
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
 
-	    $action = "";
+		$action = "";
 	}
 
 	// Build document
@@ -475,22 +475,22 @@ if (empty($reshook))
 		// Save last template used to generate document
 		if (GETPOST('model')) $object->setDocModel($user, GETPOST('model', 'alpha'));
 
-	    // Define output language
-	    $outputlangs = $langs;
-	    $newlang = '';
-	    if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) $newlang = GETPOST('lang_id', 'aZ09');
-	    if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang = $reception->thirdparty->default_lang;
-	    if (!empty($newlang))
-	    {
-	        $outputlangs = new Translate("", $conf);
-	        $outputlangs->setDefaultLang($newlang);
-	    }
+		// Define output language
+		$outputlangs = $langs;
+		$newlang = '';
+		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) $newlang = GETPOST('lang_id', 'aZ09');
+		if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang = $reception->thirdparty->default_lang;
+		if (!empty($newlang))
+		{
+			$outputlangs = new Translate("", $conf);
+			$outputlangs->setDefaultLang($newlang);
+		}
 		$result = $object->generateDocument($object->model_pdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
-	    if ($result <= 0)
-	    {
+		if ($result <= 0)
+		{
 			setEventMessages($object->error, $object->errors, 'errors');
-	        $action = '';
-	    }
+			$action = '';
+		}
 	}
 
 	// Delete file in doc form
@@ -505,20 +505,20 @@ if (empty($reshook))
 		else setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), null, 'errors');
 	} elseif ($action == 'classifybilled')
 	{
-	    $object->fetch($id);
-	    $result = $object->set_billed();
-	    if ($result >= 0) {
-	    	header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
-	    	exit();
-	    }
+		$object->fetch($id);
+		$result = $object->set_billed();
+		if ($result >= 0) {
+			header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
+			exit();
+		}
 	} elseif ($action == 'classifyclosed')
 	{
-	    $object->fetch($id);
-	    $result = $object->setClosed();
-	    if ($result >= 0) {
-	    	header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
-	    	exit();
-	    }
+		$object->fetch($id);
+		$result = $object->setClosed();
+		if ($result >= 0) {
+			header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
+			exit();
+		}
 	}
 
 	/*
@@ -683,165 +683,165 @@ $warehousestatic = new Entrepot($db);
 
 if ($action == 'create2')
 {
-    print load_fiche_titre($langs->trans("CreateReception"), '', 'dollyrevert');
+	print load_fiche_titre($langs->trans("CreateReception"), '', 'dollyrevert');
 
-    print '<br>'.$langs->trans("ReceptionCreationIsDoneFromOrder");
-    $action = ''; $id = ''; $ref = '';
+	print '<br>'.$langs->trans("ReceptionCreationIsDoneFromOrder");
+	$action = ''; $id = ''; $ref = '';
 }
 
 // Mode creation.
 if ($action == 'create')
 {
-    $recept = new Reception($db);
+	$recept = new Reception($db);
 
-    print load_fiche_titre($langs->trans("CreateReception"));
-    if (!$origin)
-    {
-        setEventMessages($langs->trans("ErrorBadParameters"), null, 'errors');
-    }
+	print load_fiche_titre($langs->trans("CreateReception"));
+	if (!$origin)
+	{
+		setEventMessages($langs->trans("ErrorBadParameters"), null, 'errors');
+	}
 
-    if ($origin)
-    {
+	if ($origin)
+	{
 		if ($origin == 'supplierorder')$classname = 'CommandeFournisseur';
-        else $classname = ucfirst($origin);
+		else $classname = ucfirst($origin);
 
-        $object = new $classname($db);
-        if ($object->fetch($origin_id))	// This include the fetch_lines
-        {
-            $soc = new Societe($db);
-            $soc->fetch($object->socid);
+		$object = new $classname($db);
+		if ($object->fetch($origin_id))	// This include the fetch_lines
+		{
+			$soc = new Societe($db);
+			$soc->fetch($object->socid);
 
-            $author = new User($db);
-            $author->fetch($object->user_author_id);
+			$author = new User($db);
+			$author->fetch($object->user_author_id);
 
-            if (!empty($conf->stock->enabled)) $entrepot = new Entrepot($db);
+			if (!empty($conf->stock->enabled)) $entrepot = new Entrepot($db);
 
-            print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
-            print '<input type="hidden" name="token" value="'.newToken().'">';
-            print '<input type="hidden" name="action" value="add">';
-            print '<input type="hidden" name="origin" value="'.$origin.'">';
-            print '<input type="hidden" name="origin_id" value="'.$object->id.'">';
-            print '<input type="hidden" name="ref_int" value="'.$object->ref_int.'">';
-            if (GETPOST('entrepot_id', 'int'))
-            {
-                print '<input type="hidden" name="entrepot_id" value="'.GETPOST('entrepot_id', 'int').'">';
-            }
+			print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
+			print '<input type="hidden" name="token" value="'.newToken().'">';
+			print '<input type="hidden" name="action" value="add">';
+			print '<input type="hidden" name="origin" value="'.$origin.'">';
+			print '<input type="hidden" name="origin_id" value="'.$object->id.'">';
+			print '<input type="hidden" name="ref_int" value="'.$object->ref_int.'">';
+			if (GETPOST('entrepot_id', 'int'))
+			{
+				print '<input type="hidden" name="entrepot_id" value="'.GETPOST('entrepot_id', 'int').'">';
+			}
 
-            print dol_get_fiche_head('');
+			print dol_get_fiche_head('');
 
-            print '<table class="border centpercent">';
+			print '<table class="border centpercent">';
 
-            // Ref
-            print '<tr><td class="titlefieldcreate fieldrequired">';
-            if ($origin == 'supplierorder' && !empty($conf->fournisseur->enabled))
-            {
-                print $langs->trans("RefOrder").'</td><td colspan="3"><a href="'.DOL_URL_ROOT.'/fourn/commande/card.php?id='.$object->id.'">'.img_object($langs->trans("ShowOrder"), 'order').' '.$object->ref;
-            }
-            if ($origin == 'propal' && !empty($conf->propal->enabled))
-            {
-                print $langs->trans("RefProposal").'</td><td colspan="3"><a href="'.DOL_URL_ROOT.'/comm/card.php?id='.$object->id.'">'.img_object($langs->trans("ShowProposal"), 'propal').' '.$object->ref;
-            }
-            print '</a></td>';
-            print "</tr>\n";
+			// Ref
+			print '<tr><td class="titlefieldcreate fieldrequired">';
+			if ($origin == 'supplierorder' && !empty($conf->fournisseur->enabled))
+			{
+				print $langs->trans("RefOrder").'</td><td colspan="3"><a href="'.DOL_URL_ROOT.'/fourn/commande/card.php?id='.$object->id.'">'.img_object($langs->trans("ShowOrder"), 'order').' '.$object->ref;
+			}
+			if ($origin == 'propal' && !empty($conf->propal->enabled))
+			{
+				print $langs->trans("RefProposal").'</td><td colspan="3"><a href="'.DOL_URL_ROOT.'/comm/card.php?id='.$object->id.'">'.img_object($langs->trans("ShowProposal"), 'propal').' '.$object->ref;
+			}
+			print '</a></td>';
+			print "</tr>\n";
 
-            // Ref client
-            print '<tr><td>';
-            if ($origin == 'supplier_order') print $langs->trans('SupplierOrder');
-            else print $langs->trans('RefSupplier');
-            print '</td><td colspan="3">';
-            print '<input type="text" name="ref_supplier" value="'.$object->ref_supplier.'" />';
-            print '</td>';
-            print '</tr>';
+			// Ref client
+			print '<tr><td>';
+			if ($origin == 'supplier_order') print $langs->trans('SupplierOrder');
+			else print $langs->trans('RefSupplier');
+			print '</td><td colspan="3">';
+			print '<input type="text" name="ref_supplier" value="'.$object->ref_supplier.'" />';
+			print '</td>';
+			print '</tr>';
 
-            // Tiers
-            print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans('Company').'</td>';
-            print '<td colspan="3">'.$soc->getNomUrl(1).'</td>';
-            print '</tr>';
+			// Tiers
+			print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans('Company').'</td>';
+			print '<td colspan="3">'.$soc->getNomUrl(1).'</td>';
+			print '</tr>';
 
-            // Project
-            if (!empty($conf->projet->enabled))
-            {
-                $projectid = GETPOST('projectid', 'int') ?GETPOST('projectid', 'int') : 0;
-                if (empty($projectid) && !empty($object->fk_project)) $projectid = $object->fk_project;
-                if ($origin == 'project') $projectid = ($originid ? $originid : 0);
+			// Project
+			if (!empty($conf->projet->enabled))
+			{
+				$projectid = GETPOST('projectid', 'int') ?GETPOST('projectid', 'int') : 0;
+				if (empty($projectid) && !empty($object->fk_project)) $projectid = $object->fk_project;
+				if ($origin == 'project') $projectid = ($originid ? $originid : 0);
 
-                $langs->load("projects");
-                print '<tr>';
-                print '<td>'.$langs->trans("Project").'</td><td colspan="2">';
-                $numprojet = $formproject->select_projects($soc->id, $projectid, 'projectid', 0);
-                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>';
-                print '</td>';
-                print '</tr>';
-            }
+				$langs->load("projects");
+				print '<tr>';
+				print '<td>'.$langs->trans("Project").'</td><td colspan="2">';
+				$numprojet = $formproject->select_projects($soc->id, $projectid, 'projectid', 0);
+				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>';
+				print '</td>';
+				print '</tr>';
+			}
 
-            // Date delivery planned
-            print '<tr><td>'.$langs->trans("DateDeliveryPlanned").'</td>';
-            print '<td colspan="3">';
-            //print dol_print_date($object->date_livraison,"day");	// date_livraison come from order and will be stored into date_delivery planed.
-            $date_delivery = ($date_delivery ? $date_delivery : $object->date_livraison); // $date_delivery comes from GETPOST
-            print $form->selectDate($date_delivery ? $date_delivery : -1, 'date_delivery', 1, 1, 1);
-            print "</td>\n";
-            print '</tr>';
+			// Date delivery planned
+			print '<tr><td>'.$langs->trans("DateDeliveryPlanned").'</td>';
+			print '<td colspan="3">';
+			//print dol_print_date($object->date_livraison,"day");	// date_livraison come from order and will be stored into date_delivery planed.
+			$date_delivery = ($date_delivery ? $date_delivery : $object->date_livraison); // $date_delivery comes from GETPOST
+			print $form->selectDate($date_delivery ? $date_delivery : -1, 'date_delivery', 1, 1, 1);
+			print "</td>\n";
+			print '</tr>';
 
-            // Note Public
-            print '<tr><td>'.$langs->trans("NotePublic").'</td>';
-            print '<td colspan="3">';
-            $doleditor = new DolEditor('note_public', $object->note_public, '', 60, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
-            print $doleditor->Create(1);
-            print "</td></tr>";
+			// Note Public
+			print '<tr><td>'.$langs->trans("NotePublic").'</td>';
+			print '<td colspan="3">';
+			$doleditor = new DolEditor('note_public', $object->note_public, '', 60, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
+			print $doleditor->Create(1);
+			print "</td></tr>";
 
-            // Note Private
-            if ($object->note_private && !$user->socid)
-            {
-                print '<tr><td>'.$langs->trans("NotePrivate").'</td>';
-                print '<td colspan="3">';
-                $doleditor = new DolEditor('note_private', $object->note_private, '', 60, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
-        		print $doleditor->Create(1);
-                print "</td></tr>";
-            }
+			// Note Private
+			if ($object->note_private && !$user->socid)
+			{
+				print '<tr><td>'.$langs->trans("NotePrivate").'</td>';
+				print '<td colspan="3">';
+				$doleditor = new DolEditor('note_private', $object->note_private, '', 60, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
+				print $doleditor->Create(1);
+				print "</td></tr>";
+			}
 
-            // Weight
-            print '<tr><td>';
-            print $langs->trans("Weight");
-            print '</td><td colspan="3"><input name="weight" size="4" value="'.GETPOST('weight', 'int').'"> ';
-            $text = $formproduct->selectMeasuringUnits("weight_units", "weight", GETPOST('weight_units', 'int'), 0, 2);
-            $htmltext = $langs->trans("KeepEmptyForAutoCalculation");
-            print $form->textwithpicto($text, $htmltext);
-            print '</td></tr>';
-            // Dim
-            print '<tr><td>';
-            print $langs->trans("Width").' x '.$langs->trans("Height").' x '.$langs->trans("Depth");
-            print ' </td><td colspan="3"><input name="sizeW" size="4" value="'.GETPOST('sizeW', 'int').'">';
-            print ' x <input name="sizeH" size="4" value="'.GETPOST('sizeH', 'int').'">';
-            print ' x <input name="sizeS" size="4" value="'.GETPOST('sizeS', 'int').'">';
-            print ' ';
-            $text = $formproduct->selectMeasuringUnits("size_units", "size", GETPOST('size_units', 'int'), 0, 2);
-            $htmltext = $langs->trans("KeepEmptyForAutoCalculation");
-            print $form->textwithpicto($text, $htmltext);
-            print '</td></tr>';
+			// Weight
+			print '<tr><td>';
+			print $langs->trans("Weight");
+			print '</td><td colspan="3"><input name="weight" size="4" value="'.GETPOST('weight', 'int').'"> ';
+			$text = $formproduct->selectMeasuringUnits("weight_units", "weight", GETPOST('weight_units', 'int'), 0, 2);
+			$htmltext = $langs->trans("KeepEmptyForAutoCalculation");
+			print $form->textwithpicto($text, $htmltext);
+			print '</td></tr>';
+			// Dim
+			print '<tr><td>';
+			print $langs->trans("Width").' x '.$langs->trans("Height").' x '.$langs->trans("Depth");
+			print ' </td><td colspan="3"><input name="sizeW" size="4" value="'.GETPOST('sizeW', 'int').'">';
+			print ' x <input name="sizeH" size="4" value="'.GETPOST('sizeH', 'int').'">';
+			print ' x <input name="sizeS" size="4" value="'.GETPOST('sizeS', 'int').'">';
+			print ' ';
+			$text = $formproduct->selectMeasuringUnits("size_units", "size", GETPOST('size_units', 'int'), 0, 2);
+			$htmltext = $langs->trans("KeepEmptyForAutoCalculation");
+			print $form->textwithpicto($text, $htmltext);
+			print '</td></tr>';
 
-            // Delivery method
-            print "<tr><td>".$langs->trans("ReceptionMethod")."</td>";
-            print '<td colspan="3">';
-            $recept->fetch_delivery_methods();
-            print $form->selectarray("shipping_method_id", $recept->meths, GETPOST('shipping_method_id', 'int'), 1, 0, 0, "", 1);
-            if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
-            print "</td></tr>\n";
+			// Delivery method
+			print "<tr><td>".$langs->trans("ReceptionMethod")."</td>";
+			print '<td colspan="3">';
+			$recept->fetch_delivery_methods();
+			print $form->selectarray("shipping_method_id", $recept->meths, GETPOST('shipping_method_id', 'int'), 1, 0, 0, "", 1);
+			if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+			print "</td></tr>\n";
 
-            // Tracking number
-            print "<tr><td>".$langs->trans("TrackingNumber")."</td>";
-            print '<td colspan="3">';
-            print '<input name="tracking_number" size="20" value="'.GETPOST('tracking_number', 'alpha').'">';
-            print "</td></tr>\n";
+			// Tracking number
+			print "<tr><td>".$langs->trans("TrackingNumber")."</td>";
+			print '<td colspan="3">';
+			print '<input name="tracking_number" size="20" value="'.GETPOST('tracking_number', 'alpha').'">';
+			print "</td></tr>\n";
 
-            // Other attributes
-            $parameters = array('objectsrc' => $objectsrc, 'colspan' => ' colspan="3"', 'cols' => '3', 'socid'=>$socid);
-            $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $recept, $action); // Note that $action and $object may have been modified by hook
-            print $hookmanager->resPrint;
+			// Other attributes
+			$parameters = array('objectsrc' => $objectsrc, 'colspan' => ' colspan="3"', 'cols' => '3', 'socid'=>$socid);
+			$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $recept, $action); // Note that $action and $object may have been modified by hook
+			print $hookmanager->resPrint;
 
-            // Here $object can be of an object Order
-            $extrafields->fetch_name_optionals_label($object->table_element);
-            if (empty($reshook) && !empty($extrafields->attributes[$object->table_element]['label'])) {
+			// Here $object can be of an object Order
+			$extrafields->fetch_name_optionals_label($object->table_element);
+			if (empty($reshook) && !empty($extrafields->attributes[$object->table_element]['label'])) {
 				// copy from order
 				if ($object->fetch_optionals() > 0) {
 					$recept->array_options = array_merge($recept->array_options, $object->array_options);
@@ -849,34 +849,34 @@ if ($action == 'create')
 				print $object->showOptionals($extrafields, 'edit', $parameters);
 			}
 
-            // Incoterms
+			// Incoterms
 			if (!empty($conf->incoterm->enabled))
 			{
 				print '<tr>';
 				print '<td><label for="incoterm_id">'.$form->textwithpicto($langs->trans("IncotermLabel"), $object->label_incoterms, 1).'</label></td>';
-		        print '<td colspan="3" class="maxwidthonsmartphone">';
-		        print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms) ? $object->location_incoterms : ''));
+				print '<td colspan="3" class="maxwidthonsmartphone">';
+				print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms) ? $object->location_incoterms : ''));
 				print '</td></tr>';
 			}
 
-            // Document model
+			// Document model
 			include_once DOL_DOCUMENT_ROOT.'/core/modules/reception/modules_reception.php';
 			$liste = ModelePdfReception::liste_modeles($db);
 
 			if (count($liste) > 1)
 			{
-    			print "<tr><td>".$langs->trans("DefaultModel")."</td>";
-                print '<td colspan="3">';
-    			print $form->selectarray('model', $liste, $conf->global->RECEPTION_ADDON_PDF);
-                print "</td></tr>\n";
+				print "<tr><td>".$langs->trans("DefaultModel")."</td>";
+				print '<td colspan="3">';
+				print $form->selectarray('model', $liste, $conf->global->RECEPTION_ADDON_PDF);
+				print "</td></tr>\n";
 			}
 
-            print "</table>";
+			print "</table>";
 
-            dol_fiche_end();
+			print dol_get_fiche_end();
 
 
-            // Reception lines
+			// Reception lines
 			$numAsked = 0;
 			$dispatchLines = array();
 			foreach ($_POST as $key => $value)
@@ -917,51 +917,51 @@ if ($action == 'create')
 			}
 
 
-            print '<script type="text/javascript" language="javascript">
+			print '<script type="text/javascript" language="javascript">
             jQuery(document).ready(function() {
 	            jQuery("#autofill").click(function() {';
-    	    $i = 1;
-    	    while ($i <= $numAsked)
-    	    {
-    	    	print 'jQuery("#qtyl'.$i.'").val(jQuery("#qtyasked'.$i.'").val() - jQuery("#qtydelivered'.$i.'").val());'."\n";
-    	    	$i++;
-    	    }
-        	print '});
+			$i = 1;
+			while ($i <= $numAsked)
+			{
+				print 'jQuery("#qtyl'.$i.'").val(jQuery("#qtyasked'.$i.'").val() - jQuery("#qtydelivered'.$i.'").val());'."\n";
+				$i++;
+			}
+			print '});
 	            jQuery("#autoreset").click(function() {';
-    	    $i = 1;
-    	    while ($i <= $numAsked)
-    	    {
-    	    	print 'jQuery("#qtyl'.$i.'").val(0);'."\n";
-    	    	$i++;
-    	    }
-        	print '});
+			$i = 1;
+			while ($i <= $numAsked)
+			{
+				print 'jQuery("#qtyl'.$i.'").val(0);'."\n";
+				$i++;
+			}
+			print '});
         	});
             </script>';
 
-            print '<br>';
+			print '<br>';
 
-            print '<table class="noborder centpercent">';
+			print '<table class="noborder centpercent">';
 
-            // Load receptions already done for same order
-            $object->loadReceptions();
+			// Load receptions already done for same order
+			$object->loadReceptions();
 
-            if ($numAsked)
-            {
-                print '<tr class="liste_titre">';
-                print '<td>'.$langs->trans("Description").'</td>';
-                print '<td class="center">'.$langs->trans("QtyOrdered").'</td>';
-                print '<td class="center">'.$langs->trans("QtyReceived").'</td>';
-                print '<td class="center">'.$langs->trans("QtyToReceive");
+			if ($numAsked)
+			{
+				print '<tr class="liste_titre">';
+				print '<td>'.$langs->trans("Description").'</td>';
+				print '<td class="center">'.$langs->trans("QtyOrdered").'</td>';
+				print '<td class="center">'.$langs->trans("QtyReceived").'</td>';
+				print '<td class="center">'.$langs->trans("QtyToReceive");
 				if (empty($conf->productbatch->enabled))
 				{
-	                print ' <br>(<a href="#" id="autofill">'.$langs->trans("Fill").'</a>';
-	                print ' / <a href="#" id="autoreset">'.$langs->trans("Reset").'</a>)';
+					print ' <br>(<a href="#" id="autofill">'.$langs->trans("Fill").'</a>';
+					print ' / <a href="#" id="autoreset">'.$langs->trans("Reset").'</a>)';
 				}
-                print '</td>';
-                if (!empty($conf->stock->enabled))
-                {
+				print '</td>';
+				if (!empty($conf->stock->enabled))
+				{
 					print '<td class="left">'.$langs->trans("Warehouse").' ('.$langs->trans("Stock").')</td>';
-                }
+				}
 				if (!empty($conf->productbatch->enabled))
 				{
 					print '<td class="left">'.$langs->trans("batch_number").'</td>';
@@ -972,13 +972,13 @@ if ($action == 'create')
 						print '<td class="left">'.$langs->trans("SellByDate").'</td>';
 					}
 				}
-                print "</tr>\n";
-            }
+				print "</tr>\n";
+			}
 
-            $indiceAsked = 1;
-            while ($indiceAsked <= $numAsked)
-            {
-                $product = new Product($db);
+			$indiceAsked = 1;
+			while ($indiceAsked <= $numAsked)
+			{
+				$product = new Product($db);
 				foreach ($object->lines as $supplierLine) {
 					if ($dispatchLines[$indiceAsked]['fk_commandefourndet'] == $supplierLine->id) {
 						$line = $supplierLine;
@@ -987,81 +987,81 @@ if ($action == 'create')
 				}
 
 
-                // Show product and description
-                $type = $line->product_type ? $line->product_type : $line->fk_product_type;
-                // Try to enhance type detection using date_start and date_end for free lines where type
-                // was not saved.
-                if (!empty($line->date_start)) $type = 1;
-                if (!empty($line->date_end)) $type = 1;
+				// Show product and description
+				$type = $line->product_type ? $line->product_type : $line->fk_product_type;
+				// Try to enhance type detection using date_start and date_end for free lines where type
+				// was not saved.
+				if (!empty($line->date_start)) $type = 1;
+				if (!empty($line->date_end)) $type = 1;
 
-                print '<!-- line '.$line->rowid.' for product -->'."\n";
-                print '<tr class="oddeven">'."\n";
+				print '<!-- line '.$line->rowid.' for product -->'."\n";
+				print '<tr class="oddeven">'."\n";
 
 
-                // Product label
-                if ($line->fk_product > 0)  // If predefined product
-                {
-                    $product->fetch($line->fk_product);
-                    $product->load_stock('warehouseopen'); // Load all $product->stock_warehouse[idwarehouse]->detail_batch
-                    //var_dump($product->stock_warehouse[1]);
+				// Product label
+				if ($line->fk_product > 0)  // If predefined product
+				{
+					$product->fetch($line->fk_product);
+					$product->load_stock('warehouseopen'); // Load all $product->stock_warehouse[idwarehouse]->detail_batch
+					//var_dump($product->stock_warehouse[1]);
 
-                    print '<td>';
-                    print '<a name="'.$line->id.'"></a>'; // ancre pour retourner sur la ligne
+					print '<td>';
+					print '<a name="'.$line->id.'"></a>'; // ancre pour retourner sur la ligne
 
-                    // Show product and description
-                    $product_static->type = $line->fk_product_type;
-                    $product_static->id = $line->fk_product;
-                    $product_static->ref = $line->ref;
-                    $product_static->status_batch = $line->product_tobatch;
+					// Show product and description
+					$product_static->type = $line->fk_product_type;
+					$product_static->id = $line->fk_product;
+					$product_static->ref = $line->ref;
+					$product_static->status_batch = $line->product_tobatch;
 
-                    $text = $product_static->getNomUrl(1);
-                    $text .= ' - '.(!empty($line->label) ? $line->label : $line->product_label);
-                    $description = ($conf->global->PRODUIT_DESC_IN_FORM ? '' : dol_htmlentitiesbr($line->desc));
-                    print $form->textwithtooltip($text, $description, 3, '', '', $i);
+					$text = $product_static->getNomUrl(1);
+					$text .= ' - '.(!empty($line->label) ? $line->label : $line->product_label);
+					$description = ($conf->global->PRODUIT_DESC_IN_FORM ? '' : dol_htmlentitiesbr($line->desc));
+					print $form->textwithtooltip($text, $description, 3, '', '', $i);
 
-                    // Show range
-                    print_date_range($db->jdate($line->date_start), $db->jdate($line->date_end));
+					// Show range
+					print_date_range($db->jdate($line->date_start), $db->jdate($line->date_end));
 
-                    // Add description in form
-                    if (!empty($conf->global->PRODUIT_DESC_IN_FORM))
-                    {
-                        print ($line->desc && $line->desc != $line->product_label) ? '<br>'.dol_htmlentitiesbr($line->desc) : '';
-                    }
+					// Add description in form
+					if (!empty($conf->global->PRODUIT_DESC_IN_FORM))
+					{
+						print ($line->desc && $line->desc != $line->product_label) ? '<br>'.dol_htmlentitiesbr($line->desc) : '';
+					}
 
-                    print '</td>';
-                } else {
-				    print "<td>";
-                    if ($type == 1) $text = img_object($langs->trans('Service'), 'service');
-                    else $text = img_object($langs->trans('Product'), 'product');
+					print '</td>';
+				} else {
+					print "<td>";
+					if ($type == 1) $text = img_object($langs->trans('Service'), 'service');
+					else $text = img_object($langs->trans('Product'), 'product');
 
-                    if (!empty($line->label)) {
-                    	$text .= ' <strong>'.$line->label.'</strong>';
-                    	print $form->textwithtooltip($text, $line->desc, 3, '', '', $i);
-                    } else {
-                    	print $text.' '.nl2br($line->desc);
-                    }
+					if (!empty($line->label)) {
+						$text .= ' <strong>'.$line->label.'</strong>';
+						print $form->textwithtooltip($text, $line->desc, 3, '', '', $i);
+					} else {
+						print $text.' '.nl2br($line->desc);
+					}
 
-                    // Show range
-                    print_date_range($db->jdate($line->date_start), $db->jdate($line->date_end));
-                    print "</td>\n";
-                }
+					// Show range
+					print_date_range($db->jdate($line->date_start), $db->jdate($line->date_end));
+					print "</td>\n";
+				}
 
-                // Qty
-                print '<td class="center">'.$line->qty;
+				// Qty
+				print '<td class="center">'.$line->qty;
 				print '<input type="hidden" name="fk_commandefournisseurdet'.$indiceAsked.'" value=\''.$line->id.'\' />';
 				print '<textarea style="display:none;"  name="comment'.$indiceAsked.'" >'.$line->desc.'</textarea>';
-                print '<input name="qtyasked'.$indiceAsked.'" id="qtyasked'.$indiceAsked.'" type="hidden" value="'.$line->qty.'">';
-                print '</td>';
-                $qtyProdCom = $line->qty;
+				print '<input name="qtyasked'.$indiceAsked.'" id="qtyasked'.$indiceAsked.'" type="hidden" value="'.$line->qty.'">';
+				print '</td>';
+				$qtyProdCom = $line->qty;
 
-                // Qty already received
-                print '<td class="center">';
+				// Qty already received
+				print '<td class="center">';
 
 
-                $quantityDelivered = $object->receptions[$line->id];
-                print $quantityDelivered;
-                print '<input name="qtydelivered'.$indiceAsked.'" id="qtydelivered'.$indiceAsked.'" type="hidden" value="'.$quantityDelivered.'">';
-                print '</td>';
+				$quantityDelivered = $object->receptions[$line->id];
+				print $quantityDelivered;
+				print '<input name="qtydelivered'.$indiceAsked.'" id="qtydelivered'.$indiceAsked.'" type="hidden" value="'.$quantityDelivered.'">';
+				print '</td>';
 
 
 				if ($line->product_type == 1 && empty($conf->global->STOCK_SUPPORTS_SERVICES))
@@ -1070,13 +1070,13 @@ if ($action == 'create')
 				} else {
 					$quantityToBeDelivered = $dispatchLines[$indiceAsked]['qty'];
 				}
-                $warehouse_id = $dispatchLines[$indiceAsked]['ent'];
+				$warehouse_id = $dispatchLines[$indiceAsked]['ent'];
 
 
 				$warehouseObject = null;
 				if (!empty($conf->stock->enabled))     // If warehouse was already selected or if product is not a predefined, we go into this part with no multiwarehouse selection
 				{
-				    print '<!-- Case warehouse already known or product not a predefined product -->';
+					print '<!-- Case warehouse already known or product not a predefined product -->';
 
 					$stock = + $product->stock_warehouse[$dispatchLines[$indiceAsked]['ent']]->real; // Convert to number
 					$deliverableQty = $dispatchLines[$indiceAsked]['qty'];
@@ -1085,8 +1085,8 @@ if ($action == 'create')
 					print '<td class="center">';
 					if ($line->product_type == Product::TYPE_PRODUCT || !empty($conf->global->STOCK_SUPPORTS_SERVICES))
 					{
-                        if (GETPOST('qtyl'.$indiceAsked, 'int')) $defaultqty = GETPOST('qtyl'.$indiceAsked, 'int');
-                        print '<input name="idl'.$indiceAsked.'" type="hidden" value="'.$line->id.'">';
+						if (GETPOST('qtyl'.$indiceAsked, 'int')) $defaultqty = GETPOST('qtyl'.$indiceAsked, 'int');
+						print '<input name="idl'.$indiceAsked.'" type="hidden" value="'.$line->id.'">';
 						print '<input name="qtyl'.$indiceAsked.'" id="qtyl'.$indiceAsked.'" type="text" size="4" value="'.$deliverableQty.'">';
 					} else print $langs->trans("NA");
 					print '</td>';
@@ -1155,26 +1155,26 @@ if ($action == 'create')
 					print $line->showOptionals($extrafields, 'edit', array('style'=>'class="oddeven"', 'colspan'=>$colspan), $indiceAsked);
 				}
 
-                $indiceAsked++;
-            }
+				$indiceAsked++;
+			}
 
-            print "</table>";
+			print "</table>";
 
-            print '<br>';
+			print '<br>';
 
-            print '<div class="center">';
-            print '<input type="submit" class="button" name="add" value="'.dol_escape_htmltag($langs->trans("Create")).'">';
-            print '&nbsp; ';
-            print '<input type="'.($backtopage ? "submit" : "button").'" class="button" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'"'.($backtopage ? '' : ' onclick="javascript:history.go(-1)"').'>'; // Cancel for create does not post form if we don't know the backtopage
-            print '</div>';
+			print '<div class="center">';
+			print '<input type="submit" class="button" name="add" value="'.dol_escape_htmltag($langs->trans("Create")).'">';
+			print '&nbsp; ';
+			print '<input type="'.($backtopage ? "submit" : "button").'" class="button" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'"'.($backtopage ? '' : ' onclick="javascript:history.go(-1)"').'>'; // Cancel for create does not post form if we don't know the backtopage
+			print '</div>';
 
-            print '</form>';
+			print '</form>';
 
-            print '<br>';
-        } else {
-            dol_print_error($db);
-        }
-    }
+			print '<br>';
+		} else {
+			dol_print_error($db);
+		}
+	}
 } elseif ($id || $ref)
 /* *************************************************************************** */
 /*                                                                             */
@@ -1245,9 +1245,9 @@ if ($action == 'create')
 
 		if (!$formconfirm) {
 			$parameters = array('formConfirm' => $formconfirm);
-		    $reshook = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-		    if (empty($reshook)) $formconfirm .= $hookmanager->resPrint;
-		    elseif ($reshook > 0) $formconfirm = $hookmanager->resPrint;
+			$reshook = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+			if (empty($reshook)) $formconfirm .= $hookmanager->resPrint;
+			elseif ($reshook > 0) $formconfirm = $hookmanager->resPrint;
 		}
 
 		// Print form confirm
@@ -1263,18 +1263,18 @@ if ($action == 'create')
 
 		if ($typeobject == 'commande' && $object->$typeobject->id && !empty($conf->commande->enabled))
 		{
-		    $objectsrc = new Commande($db);
-		    $objectsrc->fetch($object->$typeobject->id);
+			$objectsrc = new Commande($db);
+			$objectsrc->fetch($object->$typeobject->id);
 		}
 		if ($typeobject == 'propal' && $object->$typeobject->id && !empty($conf->propal->enabled))
 		{
-		    $objectsrc = new Propal($db);
-		    $objectsrc->fetch($object->$typeobject->id);
+			$objectsrc = new Propal($db);
+			$objectsrc->fetch($object->$typeobject->id);
 		}
 		if ($typeobject == 'CommandeFournisseur' && $object->$typeobject->id && !empty($conf->fournisseur->enabled))
 		{
-		    $objectsrc = new CommandeFournisseur($db);
-		    $objectsrc->fetch($object->$typeobject->id);
+			$objectsrc = new CommandeFournisseur($db);
+			$objectsrc->fetch($object->$typeobject->id);
 		}
 		// Reception card
 		$linkback = '<a href="'.DOL_URL_ROOT.'/reception/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
@@ -1285,53 +1285,53 @@ if ($action == 'create')
 		$morehtmlref .= $form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $user->rights->reception->creer, 'string', '', null, null, '', 1);
 
 		// Thirdparty
-        $morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
-        // Project
-        if (!empty($conf->projet->enabled))
-        {
-            $langs->load("projects");
-            $morehtmlref .= '<br>'.$langs->trans('Project').' ';
-            if (0) {    // Do not change on reception
-                if ($action != 'classify') {
-                    $morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
-                }
-                if ($action == 'classify') {
-                    // $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-                    $morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-                    $morehtmlref .= '<input type="hidden" name="action" value="classin">';
-                    $morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
-                    $morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-                    $morehtmlref .= '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
-                    $morehtmlref .= '</form>';
-                } else {
-                    $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-                }
-            } else {
-                // We don't have project on reception, so we will use the project or source object instead
-                // TODO Add project on reception
-                $morehtmlref .= ' : ';
-                if (!empty($objectsrc->fk_project)) {
-                    $proj = new Project($db);
-                    $proj->fetch($objectsrc->fk_project);
-                    $morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$objectsrc->fk_project.'" title="'.$langs->trans('ShowProject').'">';
-                    $morehtmlref .= $proj->ref;
-                    $morehtmlref .= '</a>';
-                } else {
-                    $morehtmlref .= '';
-                }
-            }
-        }
+		$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
+		// Project
+		if (!empty($conf->projet->enabled))
+		{
+			$langs->load("projects");
+			$morehtmlref .= '<br>'.$langs->trans('Project').' ';
+			if (0) {    // Do not change on reception
+				if ($action != 'classify') {
+					$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
+				}
+				if ($action == 'classify') {
+					// $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+					$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+					$morehtmlref .= '<input type="hidden" name="action" value="classin">';
+					$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
+					$morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+					$morehtmlref .= '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+					$morehtmlref .= '</form>';
+				} else {
+					$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+				}
+			} else {
+				// We don't have project on reception, so we will use the project or source object instead
+				// TODO Add project on reception
+				$morehtmlref .= ' : ';
+				if (!empty($objectsrc->fk_project)) {
+					$proj = new Project($db);
+					$proj->fetch($objectsrc->fk_project);
+					$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$objectsrc->fk_project.'" title="'.$langs->trans('ShowProject').'">';
+					$morehtmlref .= $proj->ref;
+					$morehtmlref .= '</a>';
+				} else {
+					$morehtmlref .= '';
+				}
+			}
+		}
 		$morehtmlref .= '</div>';
 
 		$object->picto = 'sending';
-    	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+		dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
 
 
-    	print '<div class="fichecenter">';
-    	print '<div class="fichehalfleft">';
-    	print '<div class="underbanner clearboth"></div>';
+		print '<div class="fichecenter">';
+		print '<div class="fichehalfleft">';
+		print '<div class="underbanner clearboth"></div>';
 
-        print '<table class="border centpercent">';
+		print '<table class="border centpercent">';
 
 		// Linked documents
 		if ($typeobject == 'commande' && $object->$typeobject->id && !empty($conf->commande->enabled))
@@ -1411,7 +1411,7 @@ if ($action == 'create')
 			print ($object->trueWeight && $object->weight_units != '') ? ' '.measuringUnitString(0, "weight", $object->weight_units) : '';
 		}
 
-        // Calculated
+		// Calculated
 		if ($totalWeight > 0)
 		{
 			if (!empty($object->trueWeight)) print ' ('.$langs->trans("SumOfProductWeights").': ';
@@ -1461,15 +1461,15 @@ if ($action == 'create')
 		$volumeUnit = 0;
 		if ($object->trueWidth && $object->trueHeight && $object->trueDepth)
 		{
-		    $calculatedVolume = ($object->trueWidth * $object->trueHeight * $object->trueDepth);
-		    $volumeUnit = $object->size_units * 3;
+			$calculatedVolume = ($object->trueWidth * $object->trueHeight * $object->trueDepth);
+			$volumeUnit = $object->size_units * 3;
 		}
 		// If reception volume not defined we use sum of products
 		if ($calculatedVolume > 0)
 		{
 			if ($volumeUnit < 50)
 			{
-			    print showDimensionInBestUnit($calculatedVolume, $volumeUnit, "volume", $langs, isset($conf->global->MAIN_VOLUME_DEFAULT_ROUND) ? $conf->global->MAIN_VOLUME_DEFAULT_ROUND : -1, isset($conf->global->MAIN_VOLUME_DEFAULT_UNIT) ? $conf->global->MAIN_VOLUME_DEFAULT_UNIT : 'no');
+				print showDimensionInBestUnit($calculatedVolume, $volumeUnit, "volume", $langs, isset($conf->global->MAIN_VOLUME_DEFAULT_ROUND) ? $conf->global->MAIN_VOLUME_DEFAULT_ROUND : -1, isset($conf->global->MAIN_VOLUME_DEFAULT_UNIT) ? $conf->global->MAIN_VOLUME_DEFAULT_UNIT : 'no');
 			} else print $calculatedVolume.' '.measuringUnitString(0, "volume", $volumeUnit);
 		}
 		if ($totalVolume > 0)
@@ -1536,21 +1536,21 @@ if ($action == 'create')
 		if (!empty($conf->incoterm->enabled))
 		{
 			print '<tr><td>';
-	        print '<table width="100%" class="nobordernopadding"><tr><td>';
-	        print $langs->trans('IncotermLabel');
-	        print '<td><td class="right">';
-	        if ($user->rights->reception->creer) print '<a class="editfielda" href="'.DOL_URL_ROOT.'/reception/card.php?id='.$object->id.'&action=editincoterm">'.img_edit().'</a>';
-	        else print '&nbsp;';
-	        print '</td></tr></table>';
-	        print '</td>';
-	        print '<td colspan="3">';
+			print '<table width="100%" class="nobordernopadding"><tr><td>';
+			print $langs->trans('IncotermLabel');
+			print '<td><td class="right">';
+			if ($user->rights->reception->creer) print '<a class="editfielda" href="'.DOL_URL_ROOT.'/reception/card.php?id='.$object->id.'&action=editincoterm">'.img_edit().'</a>';
+			else print '&nbsp;';
+			print '</td></tr></table>';
+			print '</td>';
+			print '<td colspan="3">';
 			if ($action != 'editincoterm')
 			{
 				print $form->textwithpicto($object->display_incoterms(), $object->label_incoterms, 1);
 			} else {
 				print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms) ? $object->location_incoterms : ''), $_SERVER['PHP_SELF'].'?id='.$object->id);
 			}
-	        print '</td></tr>';
+			print '</td></tr>';
 		}
 
 		print "</table>";
@@ -1662,50 +1662,50 @@ if ($action == 'create')
 
 		if ($origin && $origin_id > 0)
 		{
-    		$sql = "SELECT obj.rowid, obj.fk_product, obj.label, obj.description, obj.product_type as fk_product_type, obj.qty as qty_asked, obj.date_start, obj.date_end";
-    		$sql .= ", ed.rowid as receptionline_id, ed.qty, ed.fk_reception as reception_id,  ed.fk_entrepot";
-    		$sql .= ", e.rowid as reception_id, e.ref as reception_ref, e.date_creation, e.date_valid, e.date_delivery, e.date_reception";
-    		//if ($conf->delivery_note->enabled) $sql .= ", l.rowid as livraison_id, l.ref as livraison_ref, l.date_delivery, ld.qty as qty_received";
-    		$sql .= ', p.label as product_label, p.ref, p.fk_product_type, p.rowid as prodid, p.tobatch as product_tobatch';
-    		$sql .= ', p.description as product_desc';
-    		$sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseur_dispatch as ed";
-    		$sql .= ", ".MAIN_DB_PREFIX."reception as e";
-    		$sql .= ", ".MAIN_DB_PREFIX.$origin."det as obj";
-    		//if ($conf->delivery_note->enabled) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."delivery as l ON l.fk_reception = e.rowid LEFT JOIN ".MAIN_DB_PREFIX."deliverydet as ld ON ld.fk_delivery = l.rowid  AND obj.rowid = ld.fk_origin_line";
-    		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON obj.fk_product = p.rowid";
-    		$sql .= " WHERE e.entity IN (".getEntity('reception').")";
-    		$sql .= " AND obj.fk_commande = ".$origin_id;
-    		$sql .= " AND obj.rowid = ed.fk_commandefourndet";
-    		$sql .= " AND ed.fk_reception = e.rowid";
-    		$sql .= " AND ed.fk_reception !=".$object->id;
-    		//if ($filter) $sql.= $filter;
-    		$sql .= " ORDER BY obj.fk_product";
+			$sql = "SELECT obj.rowid, obj.fk_product, obj.label, obj.description, obj.product_type as fk_product_type, obj.qty as qty_asked, obj.date_start, obj.date_end";
+			$sql .= ", ed.rowid as receptionline_id, ed.qty, ed.fk_reception as reception_id,  ed.fk_entrepot";
+			$sql .= ", e.rowid as reception_id, e.ref as reception_ref, e.date_creation, e.date_valid, e.date_delivery, e.date_reception";
+			//if ($conf->delivery_note->enabled) $sql .= ", l.rowid as livraison_id, l.ref as livraison_ref, l.date_delivery, ld.qty as qty_received";
+			$sql .= ', p.label as product_label, p.ref, p.fk_product_type, p.rowid as prodid, p.tobatch as product_tobatch';
+			$sql .= ', p.description as product_desc';
+			$sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseur_dispatch as ed";
+			$sql .= ", ".MAIN_DB_PREFIX."reception as e";
+			$sql .= ", ".MAIN_DB_PREFIX.$origin."det as obj";
+			//if ($conf->delivery_note->enabled) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."delivery as l ON l.fk_reception = e.rowid LEFT JOIN ".MAIN_DB_PREFIX."deliverydet as ld ON ld.fk_delivery = l.rowid  AND obj.rowid = ld.fk_origin_line";
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON obj.fk_product = p.rowid";
+			$sql .= " WHERE e.entity IN (".getEntity('reception').")";
+			$sql .= " AND obj.fk_commande = ".$origin_id;
+			$sql .= " AND obj.rowid = ed.fk_commandefourndet";
+			$sql .= " AND ed.fk_reception = e.rowid";
+			$sql .= " AND ed.fk_reception !=".$object->id;
+			//if ($filter) $sql.= $filter;
+			$sql .= " ORDER BY obj.fk_product";
 
-    		dol_syslog("get list of reception lines", LOG_DEBUG);
-    		$resql = $db->query($sql);
-    		if ($resql)
-    		{
-    		    $num = $db->num_rows($resql);
-    		    $i = 0;
+			dol_syslog("get list of reception lines", LOG_DEBUG);
+			$resql = $db->query($sql);
+			if ($resql)
+			{
+				$num = $db->num_rows($resql);
+				$i = 0;
 
-    		    while ($i < $num)
-    		    {
-        		    $obj = $db->fetch_object($resql);
-        		    if ($obj)
-        		    {
-        		        // $obj->rowid is rowid in $origin."det" table
-        		        $alreadysent[$obj->rowid][$obj->receptionline_id] = array('reception_ref'=>$obj->reception_ref, 'reception_id'=>$obj->reception_id, 'warehouse'=>$obj->fk_entrepot, 'qty'=>$obj->qty, 'date_valid'=>$obj->date_valid, 'date_delivery'=>$obj->date_delivery);
-        		    }
-        		    $i++;
-    		    }
-    		}
-    		//var_dump($alreadysent);
+				while ($i < $num)
+				{
+					$obj = $db->fetch_object($resql);
+					if ($obj)
+					{
+						// $obj->rowid is rowid in $origin."det" table
+						$alreadysent[$obj->rowid][$obj->receptionline_id] = array('reception_ref'=>$obj->reception_ref, 'reception_id'=>$obj->reception_id, 'warehouse'=>$obj->fk_entrepot, 'qty'=>$obj->qty, 'date_valid'=>$obj->date_valid, 'date_delivery'=>$obj->date_delivery);
+					}
+					$i++;
+				}
+			}
+			//var_dump($alreadysent);
 		}
 
 		// Loop on each product to send/sent
 		for ($i = 0; $i < $num_prod; $i++)
 		{
-		    print '<!-- origin line id = '.$lines[$i]->origin_line_id.' -->'; // id of order line
+			print '<!-- origin line id = '.$lines[$i]->origin_line_id.' -->'; // id of order line
 			print '<tr class="oddeven">';
 
 			// #
@@ -1765,35 +1765,35 @@ if ($action == 'create')
 			print '<td class="center">'.$lines[$i]->qty_asked.'</td>';
 
 			// Qty in other receptions (with reception and warehouse used)
-    		if ($origin && $origin_id > 0)
-    		{
-    			print '<td class="center nowrap">';
-    			foreach ($alreadysent as $key => $val)
-    			{
-    			    if ($lines[$i]->fk_commandefourndet == $key)
-    			    {
-    			        $j = 0;
-    			        foreach ($val as $receptionline_id=> $receptionline_var)
-    			        {
-    			            if ($receptionline_var['reception_id'] == $lines[$i]->fk_reception) continue; // We want to show only "other receptions"
+			if ($origin && $origin_id > 0)
+			{
+				print '<td class="center nowrap">';
+				foreach ($alreadysent as $key => $val)
+				{
+					if ($lines[$i]->fk_commandefourndet == $key)
+					{
+						$j = 0;
+						foreach ($val as $receptionline_id=> $receptionline_var)
+						{
+							if ($receptionline_var['reception_id'] == $lines[$i]->fk_reception) continue; // We want to show only "other receptions"
 
-    			            $j++;
-    			            if ($j > 1) print '<br>';
-    			            $reception_static->fetch($receptionline_var['reception_id']);
-    			            print $reception_static->getNomUrl(1);
-    			            print ' - '.$receptionline_var['qty'];
+							$j++;
+							if ($j > 1) print '<br>';
+							$reception_static->fetch($receptionline_var['reception_id']);
+							print $reception_static->getNomUrl(1);
+							print ' - '.$receptionline_var['qty'];
 
-    			            $htmltext = $langs->trans("DateValidation").' : '.(empty($receptionline_var['date_valid']) ? $langs->trans("Draft") : dol_print_date($receptionline_var['date_valid'], 'dayhour'));
-    			            if (!empty($conf->stock->enabled) && $receptionline_var['warehouse'] > 0)
-    			            {
-    			                $warehousestatic->fetch($receptionline_var['warehouse']);
-    			                $htmltext .= '<br>'.$langs->trans("From").' : '.$warehousestatic->getNomUrl(1);
-    			            }
-    			            print ' '.$form->textwithpicto('', $htmltext, 1);
-    			        }
-    			    }
-    			}
-    		}
+							$htmltext = $langs->trans("DateValidation").' : '.(empty($receptionline_var['date_valid']) ? $langs->trans("Draft") : dol_print_date($receptionline_var['date_valid'], 'dayhour'));
+							if (!empty($conf->stock->enabled) && $receptionline_var['warehouse'] > 0)
+							{
+								$warehousestatic->fetch($receptionline_var['warehouse']);
+								$htmltext .= '<br>'.$langs->trans("From").' : '.$warehousestatic->getNomUrl(1);
+							}
+							print ' '.$form->textwithpicto('', $htmltext, 1);
+						}
+					}
+				}
+			}
 			print '</td>';
 
 			if ($action == 'editline' && $lines[$i]->id == $line_id)
@@ -1949,7 +1949,7 @@ if ($action == 'create')
 	}
 
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 
 	$object->fetchObjectLinked($object->id, $object->element);
@@ -1970,7 +1970,7 @@ if ($action == 'create')
 			if ($object->statut == Reception::STATUS_DRAFT && $num_prod > 0)
 			{
 				if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->reception->creer))
-	  		     || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->reception->reception_advance->validate)))
+	  			 || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->reception->reception_advance->validate)))
 				{
 					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=valid">'.$langs->trans("Validate").'</a>';
 				} else {
@@ -1990,7 +1990,7 @@ if ($action == 'create')
 				{
 					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=reopen">'.$langs->trans("ClassifyUnbilled").'</a>';
 				} else {
-			    	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=reopen">'.$langs->trans("ReOpen").'</a>';
+					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=reopen">'.$langs->trans("ReOpen").'</a>';
 				}
 			}
 
@@ -2026,8 +2026,8 @@ if ($action == 'create')
 					// Label here should be "Close" or "ClassifyBilled" if we decided to make bill on receptions instead of orders
 					if (!empty($conf->fournisseur->enabled) && !empty($conf->global->WORKFLOW_BILL_ON_RECEPTION))  // Quand l'option est on, il faut avoir le bouton en plus et non en remplacement du Close ?
 					{
-					    $label = "ClassifyBilled";
-					    $paramaction = 'classifybilled';
+						$label = "ClassifyBilled";
+						$paramaction = 'classifybilled';
 					}
 					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action='.$paramaction.'">'.$langs->trans($label).'</a>';
 				}
@@ -2049,9 +2049,9 @@ if ($action == 'create')
 
 	if ($action != 'presend' && $action != 'editline')
 	{
-        print '<div class="fichecenter"><div class="fichehalfleft">';
+		print '<div class="fichecenter"><div class="fichehalfleft">';
 
-        $objectref = dol_sanitizeFileName($object->ref);
+		$objectref = dol_sanitizeFileName($object->ref);
 		$filedir = $conf->reception->dir_output."/".$objectref;
 
 		$urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
@@ -2108,10 +2108,10 @@ if ($action == 'create')
 		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
 		$formmail = new FormMail($db);
 		$formmail->param['langsmodels'] = (empty($newlang) ? $langs->defaultlang : $newlang);
-        $formmail->fromtype = (GETPOST('fromtype') ?GETPOST('fromtype') : (!empty($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE) ? $conf->global->MAIN_MAIL_DEFAULT_FROMTYPE : 'user'));
-        if ($formmail->fromtype === 'user') {
-            $formmail->fromid = $user->id;
-        }
+		$formmail->fromtype = (GETPOST('fromtype') ?GETPOST('fromtype') : (!empty($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE) ? $conf->global->MAIN_MAIL_DEFAULT_FROMTYPE : 'user'));
+		if ($formmail->fromtype === 'user') {
+			$formmail->fromid = $user->id;
+		}
 		$formmail->trackid = 'shi'.$object->id;
 		if (!empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 2))	// If bit 2 is set
 		{
@@ -2147,7 +2147,7 @@ if ($action == 'create')
 		$contactarr = array();
 		if (is_object($objectsrc))    // For the case the reception was created without orders
 		{
-    		$contactarr = $objectsrc->liste_contact(-1, 'external');
+			$contactarr = $objectsrc->liste_contact(-1, 'external');
 		}
 		if (is_array($contactarr) && count($contactarr) > 0) {
 			foreach ($contactarr as $contact) {
@@ -2176,7 +2176,7 @@ if ($action == 'create')
 		}
 		// Show form
 		print $formmail->get_form();
-		dol_fiche_end();
+		print dol_get_fiche_end();
 	}
 }
 
diff --git a/htdocs/reception/class/reception.class.php b/htdocs/reception/class/reception.class.php
index 25690279f71..766db0e3479 100644
--- a/htdocs/reception/class/reception.class.php
+++ b/htdocs/reception/class/reception.class.php
@@ -57,35 +57,35 @@ class Reception extends CommonObject
 	 */
 	public $picto = 'dollyrevert';
 
-    public $socid;
-    public $ref_supplier;
+	public $socid;
+	public $ref_supplier;
 
-    /**
-     * @var int		Ref int
-     * @deprecated
-     */
-    public $ref_int;
+	/**
+	 * @var int		Ref int
+	 * @deprecated
+	 */
+	public $ref_int;
 
-    public $brouillon;
-    public $entrepot_id;
-    public $lines = array();
-    public $tracking_number;
-    public $tracking_url;
-    public $billed;
-    public $model_pdf;
+	public $brouillon;
+	public $entrepot_id;
+	public $lines = array();
+	public $tracking_number;
+	public $tracking_url;
+	public $billed;
+	public $model_pdf;
 
-    public $trueWeight;
-    public $weight_units;
-    public $trueWidth;
-    public $width_units;
-    public $trueHeight;
-    public $height_units;
-    public $trueDepth;
-    public $depth_units;
+	public $trueWeight;
+	public $weight_units;
+	public $trueWidth;
+	public $width_units;
+	public $trueHeight;
+	public $height_units;
+	public $trueDepth;
+	public $depth_units;
 	// A denormalized value
-    public $trueSize;
+	public $trueSize;
 
-    public $date_delivery; // Date delivery planed
+	public $date_delivery; // Date delivery planed
 
 
 	/**
@@ -103,8 +103,8 @@ class Reception extends CommonObject
 	 */
 	public $date_valid;
 
-    public $meths;
-    public $listmeths; // List of carriers
+	public $meths;
+	public $listmeths; // List of carriers
 
 
 	const STATUS_DRAFT = 0;
@@ -118,7 +118,7 @@ class Reception extends CommonObject
 	 *
 	 *  @param		DoliDB		$db      Database handler
 	 */
-    public function __construct($db)
+	public function __construct($db)
 	{
 		$this->db = $db;
 		$this->lines = array();
@@ -145,33 +145,33 @@ class Reception extends CommonObject
 	 *	@param	Societe		$soc	Thirdparty object
 	 *	@return string				Free reference for contract
 	 */
-    public function getNextNumRef($soc)
+	public function getNextNumRef($soc)
 	{
 		global $langs, $conf;
 		$langs->load("receptions");
 
-	    if (!empty($conf->global->RECEPTION_ADDON_NUMBER))
-        {
+		if (!empty($conf->global->RECEPTION_ADDON_NUMBER))
+		{
 			$mybool = false;
 
 			$file = $conf->global->RECEPTION_ADDON_NUMBER.".php";
 			$classname = $conf->global->RECEPTION_ADDON_NUMBER;
 
-	        // Include file with class
-	        $dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
+			// Include file with class
+			$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 
-	        foreach ($dirmodels as $reldir) {
-		        $dir = dol_buildpath($reldir."core/modules/reception/");
+			foreach ($dirmodels as $reldir) {
+				$dir = dol_buildpath($reldir."core/modules/reception/");
 
-		        // Load file with numbering class (if found)
-		        $mybool |= @include_once $dir.$file;
-	        }
+				// Load file with numbering class (if found)
+				$mybool |= @include_once $dir.$file;
+			}
 
-	        if (!$mybool)
-	        {
-		        dol_print_error('', "Failed to include file ".$file);
-		        return '';
-	        }
+			if (!$mybool)
+			{
+				dol_print_error('', "Failed to include file ".$file);
+				return '';
+			}
 
 			$obj = new $classname();
 
@@ -185,10 +185,10 @@ class Reception extends CommonObject
 				dol_print_error($this->db, get_class($this)."::getNextNumRef ".$obj->error);
 				return "";
 			}
-        } else {
-		    print $langs->trans("Error")." ".$langs->trans("Error_RECEPTION_ADDON_NUMBER_NotDefined");
-		    return "";
-	    }
+		} else {
+			print $langs->trans("Error")." ".$langs->trans("Error_RECEPTION_ADDON_NUMBER_NotDefined");
+			return "";
+		}
 	}
 
 	/**
@@ -198,7 +198,7 @@ class Reception extends CommonObject
 	 *  @param	int		$notrigger	1=Does not execute triggers, 0= execute triggers
 	 *  @return int 				<0 si erreur, id reception creee si ok
 	 */
-    public function create($user, $notrigger = 0)
+	public function create($user, $notrigger = 0)
 	{
 		global $conf, $hookmanager;
 
@@ -264,8 +264,8 @@ class Reception extends CommonObject
 		$sql .= ", ".(!empty($this->note_private) ? "'".$this->db->escape($this->note_private)."'" : "null");
 		$sql .= ", ".(!empty($this->note_public) ? "'".$this->db->escape($this->note_public)."'" : "null");
 		$sql .= ", ".(!empty($this->model_pdf) ? "'".$this->db->escape($this->model_pdf)."'" : "null");
-        $sql .= ", ".(int) $this->fk_incoterms;
-        $sql .= ", '".$this->db->escape($this->location_incoterms)."'";
+		$sql .= ", ".(int) $this->fk_incoterms;
+		$sql .= ", '".$this->db->escape($this->location_incoterms)."'";
 		$sql .= ")";
 
 		dol_syslog(get_class($this)."::create", LOG_DEBUG);
@@ -313,10 +313,10 @@ class Reception extends CommonObject
 
 				if (!$error && !$notrigger)
 				{
-                    // Call trigger
-                    $result = $this->call_trigger('RECEPTION_CREATE', $user);
-                    if ($result < 0) { $error++; }
-                    // End call triggers
+					// Call trigger
+					$result = $this->call_trigger('RECEPTION_CREATE', $user);
+					if ($result < 0) { $error++; }
+					// End call triggers
 				}
 
 				if (!$error)
@@ -354,10 +354,10 @@ class Reception extends CommonObject
 	 *	@param	int		$id       	Id of object to load
 	 * 	@param	string	$ref		Ref of object
 	 * 	@param	string	$ref_ext	External reference of object
-     * 	@param	string	$notused	Internal reference of other object
+	 * 	@param	string	$notused	Internal reference of other object
 	 *	@return int			        >0 if OK, 0 if not found, <0 if KO
 	 */
-    public function fetch($id, $ref = '', $ref_ext = '', $notused = '')
+	public function fetch($id, $ref = '', $ref_ext = '', $notused = '')
 	{
 		global $conf;
 
@@ -370,16 +370,16 @@ class Reception extends CommonObject
 		$sql .= ", e.fk_shipping_method, e.tracking_number";
 		$sql .= ", el.fk_source as origin_id, el.sourcetype as origin";
 		$sql .= ", e.note_private, e.note_public";
-        $sql .= ', e.fk_incoterms, e.location_incoterms';
-        $sql .= ', i.libelle as label_incoterms';
+		$sql .= ', e.fk_incoterms, e.location_incoterms';
+		$sql .= ', i.libelle as label_incoterms';
 		$sql .= " FROM ".MAIN_DB_PREFIX."reception as e";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as el ON el.fk_target = e.rowid AND el.targettype = '".$this->db->escape($this->element)."'";
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as i ON e.fk_incoterms = i.rowid';
 		$sql .= " WHERE e.entity IN (".getEntity('reception').")";
 		if ($id)   	  $sql .= " AND e.rowid=".$id;
-        if ($ref)     $sql .= " AND e.ref='".$this->db->escape($ref)."'";
-        if ($ref_ext) $sql .= " AND e.ref_ext='".$this->db->escape($ref_ext)."'";
-        if ($notused) $sql .= " AND e.ref_int='".$this->db->escape($notused)."'";
+		if ($ref)     $sql .= " AND e.ref='".$this->db->escape($ref)."'";
+		if ($ref_ext) $sql .= " AND e.ref_ext='".$this->db->escape($ref_ext)."'";
+		if ($notused) $sql .= " AND e.ref_int='".$this->db->escape($notused)."'";
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$result = $this->db->query($sql);
@@ -404,7 +404,7 @@ class Reception extends CommonObject
 				$this->date_delivery        = $this->db->jdate($obj->date_delivery); // Date planed
 				$this->fk_delivery_address  = $obj->fk_address;
 				$this->model_pdf            = $obj->model_pdf;
-				$this->modelpdf             = $obj->model_pdf;	// deprecated
+				$this->modelpdf             = $obj->model_pdf; // deprecated
 				$this->shipping_method_id = $obj->fk_shipping_method;
 				$this->tracking_number      = $obj->tracking_number;
 				$this->origin               = ($obj->origin ? $obj->origin : 'commande'); // For compatibility
@@ -481,14 +481,14 @@ class Reception extends CommonObject
 	 *  Validate object and update stock if option enabled
 	 *
 	 *  @param      User		$user       Object user that validate
-     *  @param		int			$notrigger	1=Does not execute triggers, 0= execute triggers
+	 *  @param		int			$notrigger	1=Does not execute triggers, 0= execute triggers
 	 *  @return     int						<0 if OK, >0 if KO
 	 */
-    public function valid($user, $notrigger = 0)
+	public function valid($user, $notrigger = 0)
 	{
 		global $conf, $langs;
 
-        require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 		dol_syslog(get_class($this)."::valid");
 
@@ -499,8 +499,8 @@ class Reception extends CommonObject
 			return 0;
 		}
 
-        if (!((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->reception->creer))
-       	|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->reception->reception_advance->validate))))
+		if (!((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->reception->creer))
+	   	|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->reception->reception_advance->validate))))
 		{
 			$this->error = 'Permission denied';
 			dol_syslog(get_class($this)."::valid ".$this->error, LOG_ERR);
@@ -524,7 +524,7 @@ class Reception extends CommonObject
 			$numref = $this->ref;
 		}
 
-        $this->newref = dol_sanitizeFileName($numref);
+		$this->newref = dol_sanitizeFileName($numref);
 
 		$now = dol_now();
 
@@ -594,7 +594,7 @@ class Reception extends CommonObject
 						// line with batch detail
 
 						// We decrement stock of product (and sub-products) -> update table llx_product_stock (key of this table is fk_product+fk_entrepot) and add a movement record.
-					    // Note: ->fk_origin_stock = id into table llx_product_batch (may be rename into llx_product_stock_batch in another version)
+						// Note: ->fk_origin_stock = id into table llx_product_batch (may be rename into llx_product_stock_batch in another version)
 						$result = $mouvS->reception($user, $obj->fk_product, $obj->fk_entrepot, $qty, $obj->subprice, $langs->trans("ReceptionValidatedInDolibarr", $numref), $this->db->jdate($obj->eatby), $this->db->jdate($obj->sellby), $obj->batch);
 						if ($result < 0) {
 							$error++;
@@ -614,22 +614,22 @@ class Reception extends CommonObject
 		// Change status of order to "reception in process"
 		$ret = $this->setStatut(4, $this->origin_id, 'commande_fournisseur');
 
-        if (!$ret)
+		if (!$ret)
 		{
-		    $error++;
+			$error++;
 		}
 
 		if (!$error && !$notrigger)
 		{
-            // Call trigger
-            $result = $this->call_trigger('RECEPTION_VALIDATE', $user);
-            if ($result < 0) { $error++; }
-            // End call triggers
+			// Call trigger
+			$result = $this->call_trigger('RECEPTION_VALIDATE', $user);
+			if ($result < 0) { $error++; }
+			// End call triggers
 		}
 
 		if (!$error)
 		{
-            $this->oldref = $this->ref;
+			$this->oldref = $this->ref;
 
 			// Rename directory if dir was a temporary ref
 			if (preg_match('/^[\(]?PROV/i', $this->ref))
@@ -651,17 +651,17 @@ class Reception extends CommonObject
 
 					if (@rename($dirsource, $dirdest))
 					{
-					    dol_syslog("Rename ok");
-                        // Rename docs starting with $oldref with $newref
-                        $listoffiles = dol_dir_list($conf->reception->dir_output.'/'.$newref, 'files', 1, '^'.preg_quote($oldref, '/'));
-                        foreach ($listoffiles as $fileentry)
-                        {
-                        	$dirsource = $fileentry['name'];
-                        	$dirdest = preg_replace('/^'.preg_quote($oldref, '/').'/', $newref, $dirsource);
-                        	$dirsource = $fileentry['path'].'/'.$dirsource;
-                        	$dirdest = $fileentry['path'].'/'.$dirdest;
-                        	@rename($dirsource, $dirdest);
-                        }
+						dol_syslog("Rename ok");
+						// Rename docs starting with $oldref with $newref
+						$listoffiles = dol_dir_list($conf->reception->dir_output.'/'.$newref, 'files', 1, '^'.preg_quote($oldref, '/'));
+						foreach ($listoffiles as $fileentry)
+						{
+							$dirsource = $fileentry['name'];
+							$dirdest = preg_replace('/^'.preg_quote($oldref, '/').'/', $newref, $dirsource);
+							$dirsource = $fileentry['path'].'/'.$dirsource;
+							$dirdest = $fileentry['path'].'/'.$dirdest;
+							@rename($dirsource, $dirdest);
+						}
 					}
 				}
 			}
@@ -681,8 +681,8 @@ class Reception extends CommonObject
 		} else {
 			foreach ($this->errors as $errmsg)
 			{
-	            dol_syslog(get_class($this)."::valid ".$errmsg, LOG_ERR);
-	            $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
+				dol_syslog(get_class($this)."::valid ".$errmsg, LOG_ERR);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
 			return -1 * $error;
@@ -704,9 +704,9 @@ class Reception extends CommonObject
 	 * @param	integer		$eatby					eat-by date
 	 * @param	integer		$sellby					sell-by date
 	 * @param	string		$batch					Lot number
-	 * @return	int							<0 if KO, >0 if OK
+	 * @return	int							<0 if KO, index of line if OK
 	 */
-    public function addline($entrepot_id, $id, $qty, $array_options = 0, $comment = '', $eatby = '', $sellby = '', $batch = '')
+	public function addline($entrepot_id, $id, $qty, $array_options = 0, $comment = '', $eatby = '', $sellby = '', $batch = '')
 	{
 		global $conf, $langs, $user;
 
@@ -726,7 +726,7 @@ class Reception extends CommonObject
 
 			if (!($entrepot_id > 0) && empty($conf->global->STOCK_WAREHOUSE_NOT_REQUIRED_FOR_RECEPTIONS))
 			{
-			    $langs->load("errors");
+				$langs->load("errors");
 				$this->error = $langs->trans("ErrorWarehouseRequiredIntoReceptionLine");
 				return -1;
 			}
@@ -752,19 +752,21 @@ class Reception extends CommonObject
 		$line->fk_reception = $this->id;
 
 		$this->lines[$num] = $line;
+
+		return $num;
 	}
 
 
-    /**
-     *  Update database
-     *
-     *  @param	User	$user        	User that modify
-     *  @param  int		$notrigger	    0=launch triggers after, 1=disable triggers
-     *  @return int 			       	<0 if KO, >0 if OK
-     */
-    public function update($user = null, $notrigger = 0)
-    {
-    	global $conf;
+	/**
+	 *  Update database
+	 *
+	 *  @param	User	$user        	User that modify
+	 *  @param  int		$notrigger	    0=launch triggers after, 1=disable triggers
+	 *  @return int 			       	<0 if KO, >0 if OK
+	 */
+	public function update($user = null, $notrigger = 0)
+	{
+		global $conf;
 		$error = 0;
 
 		// Clean parameters
@@ -793,8 +795,8 @@ class Reception extends CommonObject
 		// Check parameters
 		// Put here code to add control on parameters values
 
-        // Update request
-        $sql = "UPDATE ".MAIN_DB_PREFIX."reception SET";
+		// Update request
+		$sql = "UPDATE ".MAIN_DB_PREFIX."reception SET";
 
 		$sql .= " tms=".(dol_strlen($this->tms) != 0 ? "'".$this->db->idate($this->tms)."'" : 'null').",";
 		$sql .= " ref=".(isset($this->ref) ? "'".$this->db->escape($this->ref)."'" : "null").",";
@@ -820,32 +822,32 @@ class Reception extends CommonObject
 		$sql .= " model_pdf=".(isset($this->modelpdf) ? "'".$this->db->escape($this->modelpdf)."'" : "null").",";
 		$sql .= " entity=".$conf->entity;
 
-        $sql .= " WHERE rowid=".$this->id;
+		$sql .= " WHERE rowid=".$this->id;
 
 		$this->db->begin();
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-    	if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+		$resql = $this->db->query($sql);
+		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
 		if (!$error)
 		{
 			if (!$notrigger)
 			{
-                // Call trigger
-                $result = $this->call_trigger('RECEPTION_MODIFY', $user);
-                if ($result < 0) { $error++; }
-                // End call triggers
-	    	}
+				// Call trigger
+				$result = $this->call_trigger('RECEPTION_MODIFY', $user);
+				if ($result < 0) { $error++; }
+				// End call triggers
+			}
 		}
 
-        // Commit or rollback
+		// Commit or rollback
 		if ($error)
 		{
 			foreach ($this->errors as $errmsg)
 			{
-	            dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
-	            $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
+				dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
 			return -1 * $error;
@@ -861,7 +863,7 @@ class Reception extends CommonObject
 	 *	@param	User	$user	Object user
 	 * 	@return	int				>0 if OK, 0 if deletion done but failed to delete files, <0 if KO
 	 */
-    public function delete(User $user)
+	public function delete(User $user)
 	{
 		global $conf, $langs, $user;
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
@@ -909,9 +911,9 @@ class Reception extends CommonObject
 
 		if (!$error)
 		{
-                    $main = MAIN_DB_PREFIX.'commande_fournisseur_dispatch';
-                    $ef = $main."_extrafields";
-                    $sqlef = "DELETE FROM $ef WHERE fk_object IN (SELECT rowid FROM $main WHERE fk_reception = ".$this->id.")";
+					$main = MAIN_DB_PREFIX.'commande_fournisseur_dispatch';
+					$ef = $main."_extrafields";
+					$sqlef = "DELETE FROM $ef WHERE fk_object IN (SELECT rowid FROM $main WHERE fk_reception = ".$this->id.")";
 
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."commande_fournisseur_dispatch";
 			$sql .= " WHERE fk_reception = ".$this->id;
@@ -936,18 +938,18 @@ class Reception extends CommonObject
 
 						if (!empty($this->origin) && $this->origin_id > 0)
 						{
-						    $this->fetch_origin();
-						    $origin = $this->origin;
-						    if ($this->$origin->statut == 4)     // If order source of reception is "partially received"
-						    {
-                                // Check if there is no more reception. If not, we can move back status of order to "validated" instead of "reception in progress"
-						        $this->$origin->loadReceptions();
-						        //var_dump($this->$origin->receptions);exit;
-						        if (count($this->$origin->receptions) <= 0)
-						        {
-                                    $this->$origin->setStatut(3); // ordered
-						        }
-						    }
+							$this->fetch_origin();
+							$origin = $this->origin;
+							if ($this->$origin->statut == 4)     // If order source of reception is "partially received"
+							{
+								// Check if there is no more reception. If not, we can move back status of order to "validated" instead of "reception in progress"
+								$this->$origin->loadReceptions();
+								//var_dump($this->$origin->receptions);exit;
+								if (count($this->$origin->receptions) <= 0)
+								{
+									$this->$origin->setStatut(3); // ordered
+								}
+							}
 						}
 
 						if (!$error)
@@ -1003,13 +1005,13 @@ class Reception extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Load lines
 	 *
 	 *	@return	int		>0 if OK, Otherwise if KO
 	 */
-    public function fetch_lines()
+	public function fetch_lines()
 	{
 		// phpcs:enable
 		dol_include_once('/fourn/class/fournisseur.commande.dispatch.class.php');
@@ -1060,22 +1062,22 @@ class Reception extends CommonObject
 	}
 
 	/**
-     *	Return clicable link of object (with eventually picto)
-     *
-     *	@param      int			$withpicto      Add picto into link
-     *	@param      int			$option         Where point the link
-     *	@param      int			$max          	Max length to show
-     *	@param      int			$short			Use short labels
-     *  @param      int         $notooltip      1=No tooltip
-     *	@return     string          			String with URL
-     */
-    public function getNomUrl($withpicto = 0, $option = 0, $max = 0, $short = 0, $notooltip = 0)
+	 *	Return clicable link of object (with eventually picto)
+	 *
+	 *	@param      int			$withpicto      Add picto into link
+	 *	@param      int			$option         Where point the link
+	 *	@param      int			$max          	Max length to show
+	 *	@param      int			$short			Use short labels
+	 *  @param      int         $notooltip      1=No tooltip
+	 *	@return     string          			String with URL
+	 */
+	public function getNomUrl($withpicto = 0, $option = 0, $max = 0, $short = 0, $notooltip = 0)
 	{
 		global $conf, $langs;
 		$result = '';
 		$label = img_picto('', $this->picto).' <u>'.$langs->trans("Reception").'</u>';
-        $label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
-        $label .= '<br><b>'.$langs->trans('RefSupplier').':</b> '.($this->ref_supplier ? $this->ref_supplier : $this->ref_client);
+		$label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
+		$label .= '<br><b>'.$langs->trans('RefSupplier').':</b> '.($this->ref_supplier ? $this->ref_supplier : $this->ref_client);
 
 		$url = DOL_URL_ROOT.'/reception/card.php?id='.$this->id;
 
@@ -1084,17 +1086,17 @@ class Reception extends CommonObject
 		$linkclose = '';
 		if (empty($notooltip))
 		{
-		    if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-		    {
-		        $label = $langs->trans("Reception");
-		        $linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
-		    }
-		    $linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
-		    $linkclose .= ' class="classfortooltip"';
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+			{
+				$label = $langs->trans("Reception");
+				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
+			}
+			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
+			$linkclose .= ' class="classfortooltip"';
 		}
 
-        $linkstart = '<a href="'.$url.'"';
-        $linkstart .= $linkclose.'>';
+		$linkstart = '<a href="'.$url.'"';
+		$linkstart .= $linkclose.'>';
 		$linkend = '</a>';
 
 		if ($withpicto) $result .= ($linkstart.img_object(($notooltip ? '' : $label), $this->picto, ($notooltip ? '' : 'class="classfortooltip"'), 0, 0, $notooltip ? 0 : 1).$linkend);
@@ -1104,15 +1106,15 @@ class Reception extends CommonObject
 	}
 
 	/**
-     *	Return status label
-     *
-     *	@param      int		$mode      	0=Long label, 1=Short label, 2=Picto + Short label, 3=Picto, 4=Picto + Long label, 5=Short label + Picto
-     *	@return     string      		Libelle
-     */
-    public function getLibStatut($mode = 0)
-    {
-        return $this->LibStatut($this->statut, $mode);
-    }
+	 *	Return status label
+	 *
+	 *	@param      int		$mode      	0=Long label, 1=Short label, 2=Picto + Short label, 3=Picto, 4=Picto + Long label, 5=Short label + Picto
+	 *	@return     string      		Libelle
+	 */
+	public function getLibStatut($mode = 0)
+	{
+		return $this->LibStatut($this->statut, $mode);
+	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
@@ -1122,30 +1124,30 @@ class Reception extends CommonObject
 	 * @param      int		$mode       0=Long label, 1=Short label, 2=Picto + Short label, 3=Picto, 4=Picto + Long label, 5=Short label + Picto
 	 * @return     string				Label of status
 	 */
-    public function LibStatut($status, $mode)
-    {
-    	// phpcs:enable
-    	global $langs;
+	public function LibStatut($status, $mode)
+	{
+		// phpcs:enable
+		global $langs;
 
-    	$labelStatus = $langs->trans($this->statuts[$status]);
-    	$labelStatusShort = $langs->trans($this->statutshorts[$status]);
+		$labelStatus = $langs->trans($this->statuts[$status]);
+		$labelStatusShort = $langs->trans($this->statutshorts[$status]);
 
-    	$statusType = 'status'.$status;
-    	if ($status == self::STATUS_VALIDATED) $statusType = 'status4';
-    	if ($status == self::STATUS_CLOSED) $statusType = 'status6';
+		$statusType = 'status'.$status;
+		if ($status == self::STATUS_VALIDATED) $statusType = 'status4';
+		if ($status == self::STATUS_CLOSED) $statusType = 'status6';
 
-    	return dolGetStatus($labelStatus, $labelStatusShort, '', $statusType, $mode);
+		return dolGetStatus($labelStatus, $labelStatusShort, '', $statusType, $mode);
 	}
 
 	/**
-     *  Initialise an instance with random values.
-     *  Used to build previews or test instances.
-     *	id must be 0 if object instance is a specimen.
-     *
-     *  @return	void
-     */
-    public function initAsSpecimen()
-    {
+	 *  Initialise an instance with random values.
+	 *  Used to build previews or test instances.
+	 *	id must be 0 if object instance is a specimen.
+	 *
+	 *  @return	void
+	 */
+	public function initAsSpecimen()
+	{
 		global $langs;
 
 		include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
@@ -1154,7 +1156,7 @@ class Reception extends CommonObject
 
 		dol_syslog(get_class($this)."::initAsSpecimen");
 
-        // Load array of products prodids
+		// Load array of products prodids
 		$num_prods = 0;
 		$prodids = array();
 		$sql = "SELECT rowid";
@@ -1197,11 +1199,11 @@ class Reception extends CommonObject
 		$this->commande_id          = 0;
 		$this->commande             = $order;
 
-        $this->origin_id            = 1;
-        $this->origin               = 'commande';
+		$this->origin_id            = 1;
+		$this->origin               = 'commande';
 
-        $this->note_private = 'Private note';
-        $this->note_public = 'Public note';
+		$this->note_private = 'Private note';
+		$this->note_public = 'Public note';
 
 		$nbp = 5;
 		$xnbp = 0;
@@ -1219,14 +1221,14 @@ class Reception extends CommonObject
 		}
 	}
 
-    /**
+	/**
 	 *	Set the planned delivery date
 	 *
 	 *	@param      User			$user        		Objet utilisateur qui modifie
 	 *	@param      integer 		$delivery_date     Delivery date
 	 *	@return     int         						<0 if KO, >0 if OK
 	 */
-    public function setDeliveryDate($user, $delivery_date)
+	public function setDeliveryDate($user, $delivery_date)
 	{
 		// phpcs:enable
 		if ($user->rights->reception->creer)
@@ -1250,13 +1252,13 @@ class Reception extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Fetch deliveries method and return an array. Load array this->meths(rowid=>label).
 	 *
 	 * 	@return	void
 	 */
-    public function fetch_delivery_methods()
+	public function fetch_delivery_methods()
 	{
 		// phpcs:enable
 		global $langs;
@@ -1278,101 +1280,101 @@ class Reception extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Fetch all deliveries method and return an array. Load array this->listmeths.
-     *
-     *  @param  int      $id     only this carrier, all if none
-     *  @return void
-     */
-    public function list_delivery_methods($id = '')
-    {
-        // phpcs:enable
-        global $langs;
-
-        $this->listmeths = array();
-        $i = 0;
-
-        $sql = "SELECT em.rowid, em.code, em.libelle, em.description, em.tracking, em.active";
-        $sql .= " FROM ".MAIN_DB_PREFIX."c_shipment_mode as em";
-        if ($id != '') $sql .= " WHERE em.rowid=".$id;
-
-        $resql = $this->db->query($sql);
-        if ($resql) {
-            while ($obj = $this->db->fetch_object($resql)) {
-                $this->listmeths[$i]['rowid'] = $obj->rowid;
-                $this->listmeths[$i]['code'] = $obj->code;
-                $label = $langs->trans('ReceptionMethod'.$obj->code);
-                $this->listmeths[$i]['libelle'] = ($label != 'ReceptionMethod'.$obj->code ? $label : $obj->libelle);
-                $this->listmeths[$i]['description'] = $obj->description;
-                $this->listmeths[$i]['tracking'] = $obj->tracking;
-                $this->listmeths[$i]['active'] = $obj->active;
-                $i++;
-            }
-        }
-    }
-
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Update/create delivery method.
-     *
-     *  @param	string      $id     id method to activate
-     *
-     *  @return void
-     */
-    public function update_delivery_method($id = '')
-    {
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Fetch all deliveries method and return an array. Load array this->listmeths.
+	 *
+	 *  @param  int      $id     only this carrier, all if none
+	 *  @return void
+	 */
+	public function list_delivery_methods($id = '')
+	{
 		// phpcs:enable
-        if ($id == '')
-        {
-            $sql = "INSERT INTO ".MAIN_DB_PREFIX."c_shipment_mode (code, libelle, description, tracking)";
-            $sql .= " VALUES ('".$this->db->escape($this->update['code'])."','".$this->db->escape($this->update['libelle'])."','".$this->db->escape($this->update['description'])."','".$this->db->escape($this->update['tracking'])."')";
-            $resql = $this->db->query($sql);
-        } else {
-            $sql = "UPDATE ".MAIN_DB_PREFIX."c_shipment_mode SET";
-            $sql .= " code='".$this->db->escape($this->update['code'])."'";
-            $sql .= ",libelle='".$this->db->escape($this->update['libelle'])."'";
-            $sql .= ",description='".$this->db->escape($this->update['description'])."'";
-            $sql .= ",tracking='".$this->db->escape($this->update['tracking'])."'";
-            $sql .= " WHERE rowid=".$id;
-            $resql = $this->db->query($sql);
-        }
-        if ($resql < 0) dol_print_error($this->db, '');
-    }
+		global $langs;
+
+		$this->listmeths = array();
+		$i = 0;
+
+		$sql = "SELECT em.rowid, em.code, em.libelle, em.description, em.tracking, em.active";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_shipment_mode as em";
+		if ($id != '') $sql .= " WHERE em.rowid=".$id;
+
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			while ($obj = $this->db->fetch_object($resql)) {
+				$this->listmeths[$i]['rowid'] = $obj->rowid;
+				$this->listmeths[$i]['code'] = $obj->code;
+				$label = $langs->trans('ReceptionMethod'.$obj->code);
+				$this->listmeths[$i]['libelle'] = ($label != 'ReceptionMethod'.$obj->code ? $label : $obj->libelle);
+				$this->listmeths[$i]['description'] = $obj->description;
+				$this->listmeths[$i]['tracking'] = $obj->tracking;
+				$this->listmeths[$i]['active'] = $obj->active;
+				$i++;
+			}
+		}
+	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Activate delivery method.
-     *
-     *  @param      int      $id     id method to activate
-     *
-     *  @return void
-     */
-    public function activ_delivery_method($id)
-    {
+	/**
+	 *  Update/create delivery method.
+	 *
+	 *  @param	string      $id     id method to activate
+	 *
+	 *  @return void
+	 */
+	public function update_delivery_method($id = '')
+	{
 		// phpcs:enable
-        $sql = 'UPDATE '.MAIN_DB_PREFIX.'c_shipment_mode SET active=1';
-        $sql .= ' WHERE rowid='.$id;
+		if ($id == '')
+		{
+			$sql = "INSERT INTO ".MAIN_DB_PREFIX."c_shipment_mode (code, libelle, description, tracking)";
+			$sql .= " VALUES ('".$this->db->escape($this->update['code'])."','".$this->db->escape($this->update['libelle'])."','".$this->db->escape($this->update['description'])."','".$this->db->escape($this->update['tracking'])."')";
+			$resql = $this->db->query($sql);
+		} else {
+			$sql = "UPDATE ".MAIN_DB_PREFIX."c_shipment_mode SET";
+			$sql .= " code='".$this->db->escape($this->update['code'])."'";
+			$sql .= ",libelle='".$this->db->escape($this->update['libelle'])."'";
+			$sql .= ",description='".$this->db->escape($this->update['description'])."'";
+			$sql .= ",tracking='".$this->db->escape($this->update['tracking'])."'";
+			$sql .= " WHERE rowid=".$id;
+			$resql = $this->db->query($sql);
+		}
+		if ($resql < 0) dol_print_error($this->db, '');
+	}
 
-        $resql = $this->db->query($sql);
-    }
-
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  DesActivate delivery method.
-     *
-     *  @param      int      $id     id method to desactivate
-     *
-     *  @return void
-     */
-    public function disable_delivery_method($id)
-    {
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Activate delivery method.
+	 *
+	 *  @param      int      $id     id method to activate
+	 *
+	 *  @return void
+	 */
+	public function activ_delivery_method($id)
+	{
 		// phpcs:enable
-        $sql = 'UPDATE '.MAIN_DB_PREFIX.'c_shipment_mode SET active=0';
-        $sql .= ' WHERE rowid='.$id;
+		$sql = 'UPDATE '.MAIN_DB_PREFIX.'c_shipment_mode SET active=1';
+		$sql .= ' WHERE rowid='.$id;
 
-        $resql = $this->db->query($sql);
-    }
+		$resql = $this->db->query($sql);
+	}
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  DesActivate delivery method.
+	 *
+	 *  @param      int      $id     id method to desactivate
+	 *
+	 *  @return void
+	 */
+	public function disable_delivery_method($id)
+	{
+		// phpcs:enable
+		$sql = 'UPDATE '.MAIN_DB_PREFIX.'c_shipment_mode SET active=0';
+		$sql .= ' WHERE rowid='.$id;
+
+		$resql = $this->db->query($sql);
+	}
 
 
 	/**
@@ -1381,7 +1383,7 @@ class Reception extends CommonObject
 	 * @param	string	$value		Value
 	 * @return	void
 	 */
-    public function getUrlTrackingStatus($value = '')
+	public function getUrlTrackingStatus($value = '')
 	{
 		if (!empty($this->shipping_method_id))
 		{
@@ -1413,7 +1415,7 @@ class Reception extends CommonObject
 	 *
 	 *	@return     int     <0 if KO, >0 if OK
 	 */
-    public function setClosed()
+	public function setClosed()
 	{
 		global $conf, $langs, $user;
 
@@ -1500,8 +1502,8 @@ class Reception extends CommonObject
 							// We decrement stock of product (and sub-products) -> update table llx_product_stock (key of this table is fk_product+fk_entrepot) and add a movement record
 							$result = $mouvS->reception($user, $obj->fk_product, $obj->fk_entrepot, $qty, $obj->subprice, $langs->trans("ReceptionClassifyClosedInDolibarr", $numref));
 							if ($result < 0) {
-							    $this->error = $mouvS->error;
-							    $this->errors = $mouvS->errors;
+								$this->error = $mouvS->error;
+								$this->errors = $mouvS->errors;
 								$error++; break;
 							}
 						} else {
@@ -1511,9 +1513,9 @@ class Reception extends CommonObject
 							$result = $mouvS->reception($user, $obj->fk_product, $obj->fk_entrepot, $qty, $obj->subprice, $langs->trans("ReceptionClassifyClosedInDolibarr", $numref), $this->db->jdate($obj->eatby), $this->db->jdate($obj->sellby), $obj->batch);
 
 							if ($result < 0) {
-							    $this->error = $mouvS->error;
-							    $this->errors = $mouvS->errors;
-							    $error++; break;
+								$this->error = $mouvS->error;
+								$this->errors = $mouvS->errors;
+								$error++; break;
 							}
 						}
 					}
@@ -1526,36 +1528,36 @@ class Reception extends CommonObject
 			// Call trigger
 			if (!$error)
 			{
-    			$result = $this->call_trigger('RECEPTION_CLOSED', $user);
-    			if ($result < 0) {
-    			    $error++;
-    			}
+				$result = $this->call_trigger('RECEPTION_CLOSED', $user);
+				if ($result < 0) {
+					$error++;
+				}
 			}
 		} else {
 			dol_print_error($this->db);
-            $error++;
+			$error++;
 		}
 
 		if (!$error)
 		{
-		    $this->db->commit();
-		    return 1;
+			$this->db->commit();
+			return 1;
 		} else {
-		    $this->db->rollback();
-		    return -1;
+			$this->db->rollback();
+			return -1;
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Classify the reception as invoiced (used when WORKFLOW_BILL_ON_RECEPTION is on)
 	 *
 	 *	@return     int     <0 if ko, >0 if ok
 	 */
-    public function set_billed()
+	public function set_billed()
 	{
 		// phpcs:enable
-	    global $user;
+		global $user;
 		$error = 0;
 
 		$this->db->begin();
@@ -1595,7 +1597,7 @@ class Reception extends CommonObject
 	 *
 	 *	@return     int     <0 if ko, >0 if ok
 	 */
-    public function reOpen()
+	public function reOpen()
 	{
 		global $conf, $langs, $user;
 
@@ -1655,8 +1657,8 @@ class Reception extends CommonObject
 							// We decrement stock of product (and sub-products) -> update table llx_product_stock (key of this table is fk_product+fk_entrepot) and add a movement record
 							$result = $mouvS->reception($user, $obj->fk_product, $obj->fk_entrepot, -$qty, $obj->subprice, $langs->trans("ReceptionUnClassifyCloseddInDolibarr", $numref));
 							if ($result < 0) {
-							    $this->error = $mouvS->error;
-							    $this->errors = $mouvS->errors;
+								$this->error = $mouvS->error;
+								$this->errors = $mouvS->errors;
 								$error++; break;
 							}
 						} else {
@@ -1665,9 +1667,9 @@ class Reception extends CommonObject
 							// We decrement stock of product (and sub-products) -> update table llx_product_stock (key of this table is fk_product+fk_entrepot) and add a movement record
 							$result = $mouvS->reception($user, $obj->fk_product, $obj->fk_entrepot, -$qty, $obj->subprice, $langs->trans("ReceptionUnClassifyCloseddInDolibarr", $numref), $this->db->jdate($obj->eatby), $this->db->jdate($obj->sellby), $obj->batch, $obj->fk_origin_stock);
 							if ($result < 0) {
-							    $this->error = $mouvS->error;
-							    $this->errors = $mouvS->errors;
-							    $error++; break;
+								$this->error = $mouvS->error;
+								$this->errors = $mouvS->errors;
+								$error++; break;
 							}
 						}
 					}
@@ -1679,11 +1681,11 @@ class Reception extends CommonObject
 
 			if (!$error)
 			{
-    			// Call trigger
-    			$result = $this->call_trigger('RECEPTION_REOPEN', $user);
-    			if ($result < 0) {
-    				$error++;
-    			}
+				// Call trigger
+				$result = $this->call_trigger('RECEPTION_REOPEN', $user);
+				if ($result < 0) {
+					$error++;
+				}
    			}
 
 			if ($this->origin == 'order_supplier') {
@@ -1707,41 +1709,41 @@ class Reception extends CommonObject
 	}
 
 	 /**
-     *	Set draft status
-     *
-     *	@param	User	$user			Object user that modify
-     *	@return	int						<0 if KO, >0 if OK
-     */
-    public function setDraft($user)
-    {
+	  *	Set draft status
+	  *
+	  *	@param	User	$user			Object user that modify
+	  *	@return	int						<0 if KO, >0 if OK
+	  */
+	public function setDraft($user)
+	{
 		// phpcs:enable
-        global $conf, $langs;
+		global $conf, $langs;
 
-        $error = 0;
+		$error = 0;
 
-        // Protection
-        if ($this->statut <= self::STATUS_DRAFT)
-        {
-            return 0;
-        }
+		// Protection
+		if ($this->statut <= self::STATUS_DRAFT)
+		{
+			return 0;
+		}
 
-        if (!((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->reception->creer))
-       	|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->reception->reception_advance->validate))))
-        {
-            $this->error = 'Permission denied';
-            return -1;
-        }
+		if (!((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->reception->creer))
+	   	|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->reception->reception_advance->validate))))
+		{
+			$this->error = 'Permission denied';
+			return -1;
+		}
 
-        $this->db->begin();
+		$this->db->begin();
 
-        $sql = "UPDATE ".MAIN_DB_PREFIX."reception";
-        $sql .= " SET fk_statut = ".self::STATUS_DRAFT;
-        $sql .= " WHERE rowid = ".$this->id;
+		$sql = "UPDATE ".MAIN_DB_PREFIX."reception";
+		$sql .= " SET fk_statut = ".self::STATUS_DRAFT;
+		$sql .= " WHERE rowid = ".$this->id;
 
-        dol_syslog(__METHOD__, LOG_DEBUG);
-        if ($this->db->query($sql))
-        {
-            // If stock increment is done on closing
+		dol_syslog(__METHOD__, LOG_DEBUG);
+		if ($this->db->query($sql))
+		{
+			// If stock increment is done on closing
 			if (!$error && !empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_RECEPTION))
 			{
 				require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
@@ -1784,8 +1786,8 @@ class Reception extends CommonObject
 							// We decrement stock of product (and sub-products) -> update table llx_product_stock (key of this table is fk_product+fk_entrepot) and add a movement record
 							$result = $mouvS->reception($user, $obj->fk_product, $obj->fk_entrepot, -$qty, $obj->subprice, $langs->trans("ReceptionBackToDraftInDolibarr", $this->ref));
 							if ($result < 0) {
-							    $this->error = $mouvS->error;
-							    $this->errors = $mouvS->errors;
+								$this->error = $mouvS->error;
+								$this->errors = $mouvS->errors;
 								$error++;
 								break;
 							}
@@ -1795,9 +1797,9 @@ class Reception extends CommonObject
 							// We decrement stock of product (and sub-products) -> update table llx_product_stock (key of this table is fk_product+fk_entrepot) and add a movement record
 							$result = $mouvS->reception($user, $obj->fk_product, $obj->fk_entrepot, -$qty, $obj->subprice, $langs->trans("ReceptionBackToDraftInDolibarr", $this->ref), $this->db->jdate($obj->eatby), $this->db->jdate($obj->sellby), $obj->batch);
 							if ($result < 0) {
-							    $this->error = $mouvS->error;
-							    $this->errors = $mouvS->errors;
-							    $error++; break;
+								$this->error = $mouvS->error;
+								$this->errors = $mouvS->errors;
+								$error++; break;
 							}
 						}
 					}
@@ -1807,11 +1809,11 @@ class Reception extends CommonObject
 				}
 			}
 
-            if (!$error) {
-            	// Call trigger
-            	$result = $this->call_trigger('RECEPTION_UNVALIDATE', $user);
-            	if ($result < 0) $error++;
-            }
+			if (!$error) {
+				// Call trigger
+				$result = $this->call_trigger('RECEPTION_UNVALIDATE', $user);
+				if ($result < 0) $error++;
+			}
 			if ($this->origin == 'order_supplier')
 			{
 				if (!empty($this->origin) && $this->origin_id > 0)
@@ -1843,20 +1845,20 @@ class Reception extends CommonObject
 				}
 			}
 
-            if (!$error) {
-                $this->statut = self::STATUS_DRAFT;
-                $this->db->commit();
-                return 1;
-            } else {
-                $this->db->rollback();
-                return -1;
-            }
-        } else {
-            $this->error = $this->db->error();
-            $this->db->rollback();
-            return -1;
-        }
-    }
+			if (!$error) {
+				$this->statut = self::STATUS_DRAFT;
+				$this->db->commit();
+				return 1;
+			} else {
+				$this->db->rollback();
+				return -1;
+			}
+		} else {
+			$this->error = $this->db->error();
+			$this->db->rollback();
+			return -1;
+		}
+	}
 
 	/**
 	 *  Create a document onto disk according to template module.
diff --git a/htdocs/reception/class/receptionstats.class.php b/htdocs/reception/class/receptionstats.class.php
index d55bfeee8eb..297f99e53b0 100644
--- a/htdocs/reception/class/receptionstats.class.php
+++ b/htdocs/reception/class/receptionstats.class.php
@@ -34,35 +34,35 @@ include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
  */
 class ReceptionStats extends Stats
 {
-    public $table_element;
+	public $table_element;
 
-    public $socid;
-    public $userid;
+	public $socid;
+	public $userid;
 
-    public $from;
-    public $field;
-    public $where;
+	public $from;
+	public $field;
+	public $where;
 
 
-    /**
-     * Constructor
-     *
-     * @param	DoliDB	$db      	Database handler
+	/**
+	 * Constructor
+	 *
+	 * @param	DoliDB	$db      	Database handler
 	 * @param 	int		$socid	   	Id third party for filter
 	 * @param 	string	$mode	   	Option (not used)
 	 * @param   int		$userid    	Id user for filter (creation user)
-     */
-    public function __construct($db, $socid, $mode, $userid = 0)
-    {
+	 */
+	public function __construct($db, $socid, $mode, $userid = 0)
+	{
 		global $user, $conf;
 
 		$this->db = $db;
 
 		$this->socid = ($socid > 0 ? $socid : 0);
-        $this->userid = $userid;
+		$this->userid = $userid;
 		$this->cachefilesuffix = $mode;
 
-        $object = new Reception($this->db);
+		$object = new Reception($this->db);
 		$this->from = MAIN_DB_PREFIX.$object->table_element." as c";
 		//$this->from.= ", ".MAIN_DB_PREFIX."societe as s";
 		$this->field = 'weight'; // Warning, unit of weight is NOT USED AND MUST BE
@@ -75,32 +75,32 @@ class ReceptionStats extends Stats
 		{
 			$this->where .= " AND c.fk_soc = ".$this->socid;
 		}
-        if ($this->userid > 0) $this->where .= ' AND c.fk_user_author = '.$this->userid;
-    }
+		if ($this->userid > 0) $this->where .= ' AND c.fk_user_author = '.$this->userid;
+	}
 
-    /**
-     * Return reception number by month for a year
-     *
+	/**
+	 * Return reception number by month for a year
+	 *
 	 * @param	int		$year		Year to scan
 	 * @return	array				Array with number by month
-     */
-    public function getNbByMonth($year)
-    {
-        global $user;
+	 */
+	public function getNbByMonth($year)
+	{
+		global $user;
 
-        $sql = "SELECT date_format(c.date_valid,'%m') as dm, COUNT(*) as nb";
+		$sql = "SELECT date_format(c.date_valid,'%m') as dm, COUNT(*) as nb";
 		$sql .= " FROM ".$this->from;
 		if (!$user->rights->societe->client->voir && !$this->socid) {
-            $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-        }
+			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		}
 		$sql .= " WHERE c.date_valid BETWEEN '".$this->db->idate(dol_get_first_day($year))."' AND '".$this->db->idate(dol_get_last_day($year))."'";
 		$sql .= " AND ".$this->where;
 		$sql .= " GROUP BY dm";
-        $sql .= $this->db->order('dm', 'DESC');
+		$sql .= $this->db->order('dm', 'DESC');
 
 		$res = $this->_getNbByMonth($year, $sql);
 		return $res;
-    }
+	}
 
 	/**
 	 * Return receptions number per year
@@ -108,7 +108,7 @@ class ReceptionStats extends Stats
 	 * @return	array	Array with number by year
 	 *
 	 */
-    public function getNbByYear()
+	public function getNbByYear()
 	{
 		global $user;
 
@@ -117,7 +117,7 @@ class ReceptionStats extends Stats
 		if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		$sql .= " WHERE ".$this->where;
 		$sql .= " GROUP BY dm";
-        $sql .= $this->db->order('dm', 'DESC');
+		$sql .= $this->db->order('dm', 'DESC');
 
 		return $this->_getNbByYear($sql);
 	}
@@ -127,7 +127,7 @@ class ReceptionStats extends Stats
 	 *
 	 *  @return	array	Array of values
 	 */
-    public function getAllByYear()
+	public function getAllByYear()
 	{
 		global $user;
 
diff --git a/htdocs/reception/contact.php b/htdocs/reception/contact.php
index 1b5d26c80ee..908f7a441be 100644
--- a/htdocs/reception/contact.php
+++ b/htdocs/reception/contact.php
@@ -31,8 +31,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/reception.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 if (!empty($conf->projet->enabled)) {
-    require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
-    require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 }
 
 $langs->load("orders");
@@ -50,28 +50,28 @@ $result = restrictedArea($user, 'reception', $id, '');
 $object = new Reception($db);
 if ($id > 0 || !empty($ref))
 {
-    $object->fetch($id, $ref);
-    $object->fetch_thirdparty();
+	$object->fetch($id, $ref);
+	$object->fetch_thirdparty();
 
-    if (!empty($object->origin))
-    {
-        $origin = $object->origin;
+	if (!empty($object->origin))
+	{
+		$origin = $object->origin;
 
-        $object->fetch_origin();
+		$object->fetch_origin();
 		$typeobject = $object->origin;
-    }
+	}
 
-    // Linked documents
-    if ($origin == 'order_supplier' && $object->$typeobject->id && !empty($conf->fournisseur->enabled))
-    {
-        $objectsrc = new CommandeFournisseur($db);
-        $objectsrc->fetch($object->$typeobject->id);
-    }
-    if ($typeobject == 'propal' && $object->$typeobject->id && !empty($conf->propal->enabled))
-    {
-        $objectsrc = new Propal($db);
-        $objectsrc->fetch($object->$typeobject->id);
-    }
+	// Linked documents
+	if ($origin == 'order_supplier' && $object->$typeobject->id && !empty($conf->fournisseur->enabled))
+	{
+		$objectsrc = new CommandeFournisseur($db);
+		$objectsrc->fetch($object->$typeobject->id);
+	}
+	if ($typeobject == 'propal' && $object->$typeobject->id && !empty($conf->propal->enabled))
+	{
+		$objectsrc = new Propal($db);
+		$objectsrc->fetch($object->$typeobject->id);
+	}
 }
 
 
@@ -81,10 +81,10 @@ if ($id > 0 || !empty($ref))
 
 if ($action == 'addcontact' && $user->rights->reception->creer)
 {
-    if ($result > 0 && $id > 0)
-    {
+	if ($result > 0 && $id > 0)
+	{
   		$result = $objectsrc->add_contact(GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid'), $_POST["type"], $_POST["source"]);
-    }
+	}
 
 	if ($result >= 0)
 	{
@@ -106,7 +106,7 @@ if ($action == 'addcontact' && $user->rights->reception->creer)
 // bascule du statut d'un contact
 elseif ($action == 'swapstatut' && $user->rights->reception->creer)
 {
-    $result = $objectsrc->swapContactStatus(GETPOST('ligne'));
+	$result = $objectsrc->swapContactStatus(GETPOST('ligne'));
 }
 
 // Efface un contact
@@ -166,41 +166,41 @@ if ($id > 0 || !empty($ref))
 	$morehtmlref .= $form->editfieldkey("RefSupplier", '', $object->ref_supplier, $object, $user->rights->reception->creer, 'string', '', 0, 1);
 	$morehtmlref .= $form->editfieldval("RefSupplier", '', $object->ref_supplier, $object, $user->rights->reception->creer, 'string', '', null, null, '', 1);
 	// Thirdparty
-    $morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
-    // Project
-    if (!empty($conf->projet->enabled)) {
-        $langs->load("projects");
-        $morehtmlref .= '<br>'.$langs->trans('Project').' ';
-        if (0) {    // Do not change on reception
-            if ($action != 'classify') {
-                $morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
-            }
-            if ($action == 'classify') {
-                // $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-                $morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-                $morehtmlref .= '<input type="hidden" name="action" value="classin">';
-                $morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
-                $morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-                $morehtmlref .= '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
-                $morehtmlref .= '</form>';
-            } else {
-                $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-            }
-        } else {
-            // We don't have project on reception, so we will use the project or source object instead
-            // TODO Add project on reception
-            $morehtmlref .= ' : ';
-            if (!empty($objectsrc->fk_project)) {
-                $proj = new Project($db);
-                $proj->fetch($objectsrc->fk_project);
-                $morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$objectsrc->fk_project.'" title="'.$langs->trans('ShowProject').'">';
-                $morehtmlref .= $proj->ref;
-                $morehtmlref .= '</a>';
-            } else {
-                $morehtmlref .= '';
-            }
-        }
-    }
+	$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
+	// Project
+	if (!empty($conf->projet->enabled)) {
+		$langs->load("projects");
+		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
+		if (0) {    // Do not change on reception
+			if ($action != 'classify') {
+				$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
+			}
+			if ($action == 'classify') {
+				// $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+				$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+				$morehtmlref .= '<input type="hidden" name="action" value="classin">';
+				$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
+				$morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+				$morehtmlref .= '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+				$morehtmlref .= '</form>';
+			} else {
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+			}
+		} else {
+			// We don't have project on reception, so we will use the project or source object instead
+			// TODO Add project on reception
+			$morehtmlref .= ' : ';
+			if (!empty($objectsrc->fk_project)) {
+				$proj = new Project($db);
+				$proj->fetch($objectsrc->fk_project);
+				$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$objectsrc->fk_project.'" title="'.$langs->trans('ShowProject').'">';
+				$morehtmlref .= $proj->ref;
+				$morehtmlref .= '</a>';
+			} else {
+				$morehtmlref .= '';
+			}
+		}
+	}
 	$morehtmlref .= '</div>';
 
 	$object->picto = 'sending';
@@ -208,32 +208,32 @@ if ($id > 0 || !empty($ref))
 
 
 	print '<div class="fichecenter">';
-    //print '<div class="fichehalfleft">';
+	//print '<div class="fichehalfleft">';
 	print '<div class="underbanner clearboth"></div>';
 
-    print '<table class="border centpercent">';
-    // Linked documents
+	print '<table class="border centpercent">';
+	// Linked documents
 	if ($origin == 'order_supplier' && $object->$typeobject->id && !empty($conf->fournisseur->enabled))
 	{
-	    print '<tr><td class="titlefield">';
-	    $objectsrc = new CommandeFournisseur($db);
-	    $objectsrc->fetch($object->$typeobject->id);
-	    print $langs->trans("RefOrder").'</td>';
-	    print '<td colspan="3">';
-	    print $objectsrc->getNomUrl(1, 'commande');
-	    print "</td>\n";
-	    print '</tr>';
+		print '<tr><td class="titlefield">';
+		$objectsrc = new CommandeFournisseur($db);
+		$objectsrc->fetch($object->$typeobject->id);
+		print $langs->trans("RefOrder").'</td>';
+		print '<td colspan="3">';
+		print $objectsrc->getNomUrl(1, 'commande');
+		print "</td>\n";
+		print '</tr>';
 	}
 	if ($typeobject == 'propal' && $object->$typeobject->id && !empty($conf->propal->enabled))
 	{
-	    print '<tr><td class="titlefield">';
-	    $objectsrc = new Propal($db);
-	    $objectsrc->fetch($object->$typeobject->id);
-	    print $langs->trans("RefProposal").'</td>';
-	    print '<td colspan="3">';
-	    print $objectsrc->getNomUrl(1, 'reception');
-	    print "</td>\n";
-	    print '</tr>';
+		print '<tr><td class="titlefield">';
+		$objectsrc = new Propal($db);
+		$objectsrc->fetch($object->$typeobject->id);
+		print $langs->trans("RefProposal").'</td>';
+		print '<td colspan="3">';
+		print $objectsrc->getNomUrl(1, 'reception');
+		print "</td>\n";
+		print '</tr>';
 	}
 
 	print "</table>";
@@ -252,7 +252,7 @@ if ($id > 0 || !empty($ref))
 	print '<div class="clearboth"></div>';
 
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	// Lines of contacts
 	echo '<br>';
diff --git a/htdocs/reception/index.php b/htdocs/reception/index.php
index e3951458e40..f707196b766 100644
--- a/htdocs/reception/index.php
+++ b/htdocs/reception/index.php
@@ -55,14 +55,14 @@ 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
 {
-    print '<form method="post" action="list.php">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    print '<div class="div-table-responsive-no-min">';
-    print '<table class="noborder nohover centpercent">';
-    print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
-    print '<tr class="oddeven"><td>';
-    print $langs->trans("Reception").':</td><td><input type="text" class="flat" name="sall" size="18"></td><td><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
-    print "</table></div></form><br>\n";
+	print '<form method="post" action="list.php">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<div class="div-table-responsive-no-min">';
+	print '<table class="noborder nohover centpercent">';
+	print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
+	print '<tr class="oddeven"><td>';
+	print $langs->trans("Reception").':</td><td><input type="text" class="flat" name="sall" size="18"></td><td><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
+	print "</table></div></form><br>\n";
 }
 
 
@@ -215,7 +215,7 @@ if ($resql)
 		$langs->load("orders");
 
 		$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("SuppliersOrdersToProcess").' <span class="badge">'.$num.'</span></th></tr>';
diff --git a/htdocs/reception/list.php b/htdocs/reception/list.php
index db8d652cc95..b99ba707251 100644
--- a/htdocs/reception/list.php
+++ b/htdocs/reception/list.php
@@ -88,27 +88,27 @@ $search_array_options = (array) $extrafields->getOptionalsFromPost($object->tabl
 
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array(
-    'e.ref'=>"Ref",
-    's.nom'=>"ThirdParty",
-    'e.note_public'=>'NotePublic',
+	'e.ref'=>"Ref",
+	's.nom'=>"ThirdParty",
+	'e.note_public'=>'NotePublic',
 );
 if (empty($user->socid)) $fieldstosearchall["e.note_private"] = "NotePrivate";
 
 $checkedtypetiers = 0;
 $arrayfields = array(
-    'e.ref'=>array('label'=>$langs->trans("Ref"), 'checked'=>1),
-    'e.ref_supplier'=>array('label'=>$langs->trans("RefSupplier"), 'checked'=>1),
-    's.nom'=>array('label'=>$langs->trans("ThirdParty"), 'checked'=>1),
-    's.town'=>array('label'=>$langs->trans("Town"), 'checked'=>1),
-    's.zip'=>array('label'=>$langs->trans("Zip"), 'checked'=>1),
-    'state.nom'=>array('label'=>$langs->trans("StateShort"), 'checked'=>0),
-    'country.code_iso'=>array('label'=>$langs->trans("Country"), 'checked'=>0),
-    'typent.code'=>array('label'=>$langs->trans("ThirdPartyType"), 'checked'=>$checkedtypetiers),
-    'e.date_delivery'=>array('label'=>$langs->trans("DateDeliveryPlanned"), 'checked'=>1),
-    'e.datec'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0, 'position'=>500),
-    'e.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500),
-    'e.fk_statut'=>array('label'=>$langs->trans("Status"), 'checked'=>1, 'position'=>1000),
-    'e.billed'=>array('label'=>$langs->trans("Billed"), 'checked'=>1, 'position'=>1000, 'enabled'=>(!empty($conf->global->WORKFLOW_BILL_ON_RECEPTION)))
+	'e.ref'=>array('label'=>$langs->trans("Ref"), 'checked'=>1),
+	'e.ref_supplier'=>array('label'=>$langs->trans("RefSupplier"), 'checked'=>1),
+	's.nom'=>array('label'=>$langs->trans("ThirdParty"), 'checked'=>1),
+	's.town'=>array('label'=>$langs->trans("Town"), 'checked'=>1),
+	's.zip'=>array('label'=>$langs->trans("Zip"), 'checked'=>1),
+	'state.nom'=>array('label'=>$langs->trans("StateShort"), 'checked'=>0),
+	'country.code_iso'=>array('label'=>$langs->trans("Country"), 'checked'=>0),
+	'typent.code'=>array('label'=>$langs->trans("ThirdPartyType"), 'checked'=>$checkedtypetiers),
+	'e.date_delivery'=>array('label'=>$langs->trans("DateDeliveryPlanned"), 'checked'=>1),
+	'e.datec'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0, 'position'=>500),
+	'e.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500),
+	'e.fk_statut'=>array('label'=>$langs->trans("Status"), 'checked'=>1, 'position'=>1000),
+	'e.billed'=>array('label'=>$langs->trans("Billed"), 'checked'=>1, 'position'=>1000, 'enabled'=>(!empty($conf->global->WORKFLOW_BILL_ON_RECEPTION)))
 );
 // Extra fields
 if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0)
@@ -140,45 +140,45 @@ include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
 {
 	$search_ref_supplier = '';
-    $search_ref_rcp = '';
-    $search_ref_liv = '';
-    $search_company = '';
-    $search_town = '';
+	$search_ref_rcp = '';
+	$search_ref_liv = '';
+	$search_company = '';
+	$search_town = '';
 	$search_zip = "";
-    $search_state = "";
+	$search_state = "";
 	$search_country = '';
 	$search_type_thirdparty = '';
 	$search_billed = '';
-    $search_status = '';
-    $search_array_options = array();
+	$search_status = '';
+	$search_array_options = array();
 }
 
 if (empty($reshook))
 {
 	if ($massaction == 'confirm_createbills') {
-    	$receptions = GETPOST('toselect', 'array');
-    	$createbills_onebythird = GETPOST('createbills_onebythird', 'int');
-    	$validate_invoices = GETPOST('validate_invoices', 'int');
+		$receptions = GETPOST('toselect', 'array');
+		$createbills_onebythird = GETPOST('createbills_onebythird', 'int');
+		$validate_invoices = GETPOST('validate_invoices', 'int');
 
-    	$TFact = array();
-    	$TFactThird = array();
+		$TFact = array();
+		$TFactThird = array();
 
-    	$nb_bills_created = 0;
+		$nb_bills_created = 0;
 
-    	$db->begin();
+		$db->begin();
 		$errors = array();
-    	foreach ($receptions as $id_reception)
-    	{
-    		$rcp = new Reception($db);
+		foreach ($receptions as $id_reception)
+		{
+			$rcp = new Reception($db);
 			 // On ne facture que les réceptions validées
-    		if ($rcp->fetch($id_reception) <= 0 || $rcp->statut != 1) {
+			if ($rcp->fetch($id_reception) <= 0 || $rcp->statut != 1) {
 				$errors[] = $langs->trans('StatusOfRefMustBe', $rcp->ref, $langs->transnoentities("StatusSupplierOrderValidatedShort"));
 				$error++;
 				continue;
 			}
 
-    		$object = new FactureFournisseur($db);
-    		if (!empty($createbills_onebythird) && !empty($TFactThird[$rcp->socid])) {
+			$object = new FactureFournisseur($db);
+			if (!empty($createbills_onebythird) && !empty($TFactThird[$rcp->socid])) {
 				$object = $TFactThird[$rcp->socid]; // If option "one bill per third" is set, we use already created reception.
 				if (empty($object->rowid) && $object->id != null)$object->rowid = $object->id;
 				if (!empty($object->rowid))$object->fetchObjectLinked();
@@ -193,26 +193,26 @@ if (empty($reshook))
 					}
 				}
 			} else {
-    			$object->socid = $rcp->socid;
-    			$object->type = FactureFournisseur::TYPE_STANDARD;
-    			$object->cond_reglement_id	= $rcp->thirdparty->cond_reglement_supplier_id;
-    			$object->mode_reglement_id	= $rcp->thirdparty->mode_reglement_supplier_id;
+				$object->socid = $rcp->socid;
+				$object->type = FactureFournisseur::TYPE_STANDARD;
+				$object->cond_reglement_id	= $rcp->thirdparty->cond_reglement_supplier_id;
+				$object->mode_reglement_id	= $rcp->thirdparty->mode_reglement_supplier_id;
 				$object->fk_account = !empty($rcp->thirdparty->fk_account) ? $rcp->thirdparty->fk_account : 0;
 				$object->remise_percent 	= !empty($rcp->thirdparty->remise_percent) ? $rcp->thirdparty->remise_percent : 0;
 				$object->remise_absolue 	= !empty($rcp->thirdparty->remise_absolue) ? $rcp->thirdparty->remise_absolue : 0;
 
-    			$object->fk_project			= $rcp->fk_project;
-    			$object->ref_supplier = $rcp->ref_supplier;
+				$object->fk_project			= $rcp->fk_project;
+				$object->ref_supplier = $rcp->ref_supplier;
 
-    			$datefacture = dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
-    			if (empty($datefacture))
-    			{
-    				$datefacture = dol_mktime(date("h"), date("M"), 0, date("m"), date("d"), date("Y"));
-    			}
+				$datefacture = dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
+				if (empty($datefacture))
+				{
+					$datefacture = dol_mktime(date("h"), date("M"), 0, date("m"), date("d"), date("Y"));
+				}
 
-    			$object->date = $datefacture;
-    			$object->origin    = 'reception';
-    			$object->origin_id = $id_reception;
+				$object->date = $datefacture;
+				$object->origin    = 'reception';
+				$object->origin_id = $id_reception;
 
 				$rcp->fetchObjectLinked();
 				if (count($rcp->linkedObjectsIds['reception']) > 0)
@@ -223,19 +223,19 @@ if (empty($reshook))
 					}
 				}
 
-    			$res = $object->create($user);
+				$res = $object->create($user);
 				//var_dump($object->error);exit;
-    			if ($res > 0) {
+				if ($res > 0) {
 					$nb_bills_created++;
 					$object->id = $res;
 				} else {
 					$errors[] = $rcp->ref.' : '.$langs->trans($object->error);
 					$error++;
 				}
-    		}
+			}
 
-    		if ($object->id > 0)
-    		{
+			if ($object->id > 0)
+			{
 				if (!empty($createbills_onebythird) && !empty($TFactThird[$rcp->socid])) { //cause function create already add object linked for facturefournisseur
 					$res = $object->add_object_linked($object->origin, $id_reception);
 
@@ -246,152 +246,152 @@ if (empty($reshook))
 					}
 				}
 
-    			if (!$error)
-    			{
-	    			$lines = $rcp->lines;
-	    			if (empty($lines) && method_exists($rcp, 'fetch_lines'))
-	    			{
-	    				$rcp->fetch_lines();
-	    				$lines = $rcp->lines;
-	    			}
+				if (!$error)
+				{
+					$lines = $rcp->lines;
+					if (empty($lines) && method_exists($rcp, 'fetch_lines'))
+					{
+						$rcp->fetch_lines();
+						$lines = $rcp->lines;
+					}
 
-	    			$fk_parent_line = 0;
-	    			$num = count($lines);
+					$fk_parent_line = 0;
+					$num = count($lines);
 
-	    			for ($i = 0; $i < $num; $i++)
-	    			{
-	    				$desc = ($lines[$i]->desc ? $lines[$i]->desc : $lines[$i]->libelle);
-	    				if ($lines[$i]->subprice < 0)
-	    				{
-	    					// Negative line, we create a discount line
-	    					$discount = new DiscountAbsolute($db);
-	    					$discount->fk_soc = $object->socid;
-	    					$discount->amount_ht = abs($lines[$i]->total_ht);
-	    					$discount->amount_tva = abs($lines[$i]->total_tva);
-	    					$discount->amount_ttc = abs($lines[$i]->total_ttc);
-	    					$discount->tva_tx = $lines[$i]->tva_tx;
-	    					$discount->fk_user = $user->id;
-	    					$discount->description = $desc;
-	    					$discountid = $discount->create($user);
-	    					if ($discountid > 0)
-	    					{
-	    						$result = $object->insert_discount($discountid);
-	    						//$result=$discount->link_to_invoice($lineid,$id);
-	    					} else {
-	    						setEventMessages($discount->error, $discount->errors, 'errors');
-	    						$error++;
-	    						break;
-	    					}
-	    				} else {
-	    					// Positive line
-	    					$product_type = ($lines[$i]->product_type ? $lines[$i]->product_type : 0);
-	    					// Date start
-	    					$date_start = false;
-	    					if ($lines[$i]->date_debut_prevue) $date_start = $lines[$i]->date_debut_prevue;
-	    					if ($lines[$i]->date_debut_reel) $date_start = $lines[$i]->date_debut_reel;
-	    					if ($lines[$i]->date_start) $date_start = $lines[$i]->date_start;
-	    					//Date end
-	    					$date_end = false;
-	    					if ($lines[$i]->date_fin_prevue) $date_end = $lines[$i]->date_fin_prevue;
-	    					if ($lines[$i]->date_fin_reel) $date_end = $lines[$i]->date_fin_reel;
-	    					if ($lines[$i]->date_end) $date_end = $lines[$i]->date_end;
-	    					// Reset fk_parent_line for no child products and special product
-	    					if (($lines[$i]->product_type != 9 && empty($lines[$i]->fk_parent_line)) || $lines[$i]->product_type == 9)
-	    					{
-	    						$fk_parent_line = 0;
-	    					}
-                            $result = $object->addline(
-	    						$desc,
-	    						$lines[$i]->subprice,
-	    						$lines[$i]->tva_tx,
-	    						$lines[$i]->localtax1_tx,
-	    						$lines[$i]->localtax2_tx,
+					for ($i = 0; $i < $num; $i++)
+					{
+						$desc = ($lines[$i]->desc ? $lines[$i]->desc : $lines[$i]->libelle);
+						if ($lines[$i]->subprice < 0)
+						{
+							// Negative line, we create a discount line
+							$discount = new DiscountAbsolute($db);
+							$discount->fk_soc = $object->socid;
+							$discount->amount_ht = abs($lines[$i]->total_ht);
+							$discount->amount_tva = abs($lines[$i]->total_tva);
+							$discount->amount_ttc = abs($lines[$i]->total_ttc);
+							$discount->tva_tx = $lines[$i]->tva_tx;
+							$discount->fk_user = $user->id;
+							$discount->description = $desc;
+							$discountid = $discount->create($user);
+							if ($discountid > 0)
+							{
+								$result = $object->insert_discount($discountid);
+								//$result=$discount->link_to_invoice($lineid,$id);
+							} else {
+								setEventMessages($discount->error, $discount->errors, 'errors');
+								$error++;
+								break;
+							}
+						} else {
+							// Positive line
+							$product_type = ($lines[$i]->product_type ? $lines[$i]->product_type : 0);
+							// Date start
+							$date_start = false;
+							if ($lines[$i]->date_debut_prevue) $date_start = $lines[$i]->date_debut_prevue;
+							if ($lines[$i]->date_debut_reel) $date_start = $lines[$i]->date_debut_reel;
+							if ($lines[$i]->date_start) $date_start = $lines[$i]->date_start;
+							//Date end
+							$date_end = false;
+							if ($lines[$i]->date_fin_prevue) $date_end = $lines[$i]->date_fin_prevue;
+							if ($lines[$i]->date_fin_reel) $date_end = $lines[$i]->date_fin_reel;
+							if ($lines[$i]->date_end) $date_end = $lines[$i]->date_end;
+							// Reset fk_parent_line for no child products and special product
+							if (($lines[$i]->product_type != 9 && empty($lines[$i]->fk_parent_line)) || $lines[$i]->product_type == 9)
+							{
+								$fk_parent_line = 0;
+							}
+							$result = $object->addline(
+								$desc,
+								$lines[$i]->subprice,
+								$lines[$i]->tva_tx,
+								$lines[$i]->localtax1_tx,
+								$lines[$i]->localtax2_tx,
 								$lines[$i]->qty,
-	    						$lines[$i]->fk_product,
-	    						$lines[$i]->remise_percent,
-	    						$date_start,
-	    						$date_end,
-	    						0,
-	    						$lines[$i]->info_bits,
-	    						'HT',
-	    						$product_type,
-	    						$i,
-	    						false,
+								$lines[$i]->fk_product,
+								$lines[$i]->remise_percent,
+								$date_start,
+								$date_end,
+								0,
+								$lines[$i]->info_bits,
+								'HT',
+								$product_type,
+								$i,
+								false,
 								0,
 								null,
-	    						$lines[$i]->rowid,
+								$lines[$i]->rowid,
 								0,
 								$lines[$i]->ref_supplier
-	    					);
+							);
 
 							$rcp->add_object_linked('facture_fourn_det', $result);
 
-	    					if ($result > 0)
-	    					{
-	    						$lineid = $result;
-	    					} else {
-	    						$lineid = 0;
-	    						$error++;
-	    						break;
-	    					}
-	    					// Defined the new fk_parent_line
-	    					if ($result > 0 && $lines[$i]->product_type == 9)
-	    					{
-	    						$fk_parent_line = $result;
-	    					}
-	    				}
-	    			}
-    			}
-    		}
+							if ($result > 0)
+							{
+								$lineid = $result;
+							} else {
+								$lineid = 0;
+								$error++;
+								break;
+							}
+							// Defined the new fk_parent_line
+							if ($result > 0 && $lines[$i]->product_type == 9)
+							{
+								$fk_parent_line = $result;
+							}
+						}
+					}
+				}
+			}
 
-    		//$rcp->classifyBilled($user);        // Disabled. This behavior must be set or not using the workflow module.
+			//$rcp->classifyBilled($user);        // Disabled. This behavior must be set or not using the workflow module.
 
-    		if (!empty($createbills_onebythird) && empty($TFactThird[$rcp->socid])) $TFactThird[$rcp->socid] = $object;
-    		else $TFact[$object->id] = $object;
-    	}
+			if (!empty($createbills_onebythird) && empty($TFactThird[$rcp->socid])) $TFactThird[$rcp->socid] = $object;
+			else $TFact[$object->id] = $object;
+		}
 
-    	// Build doc with all invoices
-    	$TAllFact = empty($createbills_onebythird) ? $TFact : $TFactThird;
-    	$toselect = array();
+		// Build doc with all invoices
+		$TAllFact = empty($createbills_onebythird) ? $TFact : $TFactThird;
+		$toselect = array();
 
-    	if (!$error && $validate_invoices)
-    	{
-    		$massaction = $action = 'builddoc';
-    		foreach ($TAllFact as &$object)
-    		{
-    			$result = $object->validate($user);
-    			if ($result <= 0)
-    			{
-    				$error++;
-    				setEventMessages($object->error, $object->errors, 'errors');
-    				break;
-    			}
+		if (!$error && $validate_invoices)
+		{
+			$massaction = $action = 'builddoc';
+			foreach ($TAllFact as &$object)
+			{
+				$result = $object->validate($user);
+				if ($result <= 0)
+				{
+					$error++;
+					setEventMessages($object->error, $object->errors, 'errors');
+					break;
+				}
 
-    			$id = $object->id; // For builddoc action
+				$id = $object->id; // For builddoc action
 
-    			// Fac builddoc
-    			$donotredirect = 1;
-    			$upload_dir = $conf->fournisseur->facture->dir_output;
-    		    $permissiontoadd = $user->rights->fournisseur->facture->creer;
-    		    include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
-    		}
+				// Fac builddoc
+				$donotredirect = 1;
+				$upload_dir = $conf->fournisseur->facture->dir_output;
+				$permissiontoadd = $user->rights->fournisseur->facture->creer;
+				include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
+			}
 
-    		$massaction = $action = 'confirm_createbills';
-    	}
+			$massaction = $action = 'confirm_createbills';
+		}
 
-    	if (!$error)
-    	{
-    		$db->commit();
-    		setEventMessage($langs->trans('BillCreated', $nb_bills_created));
-    	} else {
-    		$db->rollback();
-    		$action = 'create';
-    		$_GET["origin"] = $_POST["origin"];
-    		$_GET["originid"] = $_POST["originid"];
-    		setEventMessages($object->error, $errors, 'errors');
-    		$error++;
-    	}
-    }
+		if (!$error)
+		{
+			$db->commit();
+			setEventMessage($langs->trans('BillCreated', $nb_bills_created));
+		} else {
+			$db->rollback();
+			$action = 'create';
+			$_GET["origin"] = $_POST["origin"];
+			$_GET["originid"] = $_POST["originid"];
+			setEventMessages($object->error, $errors, 'errors');
+			$error++;
+		}
+	}
 }
 
 
@@ -462,16 +462,16 @@ if ($sall) $sql .= natural_search(array_keys($fieldstosearchall), $sall);
 // Add where from extra fields
 foreach ($search_array_options as $key => $val)
 {
-    $crit = $val;
-    $tmpkey = preg_replace('/search_options_/', '', $key);
-    $typ = $extrafields->attributes[$object->table_element]['type'][$tmpkey];
-    $mode = 0;
-    if (in_array($typ, array('int', 'double', 'real'))) $mode = 1; // Search on a numeric
-    if (in_array($typ, array('sellist')) && $crit != '0' && $crit != '-1') $mode = 2; // Search on a foreign key int
-    if ($crit != '' && (!in_array($typ, array('select', 'sellist')) || $crit != '0'))
-    {
-        $sql .= natural_search('ef.'.$tmpkey, $crit, $mode);
-    }
+	$crit = $val;
+	$tmpkey = preg_replace('/search_options_/', '', $key);
+	$typ = $extrafields->attributes[$object->table_element]['type'][$tmpkey];
+	$mode = 0;
+	if (in_array($typ, array('int', 'double', 'real'))) $mode = 1; // Search on a numeric
+	if (in_array($typ, array('sellist')) && $crit != '0' && $crit != '-1') $mode = 2; // Search on a foreign key int
+	if ($crit != '' && (!in_array($typ, array('select', 'sellist')) || $crit != '0'))
+	{
+		$sql .= natural_search('ef.'.$tmpkey, $crit, $mode);
+	}
 }
 // Add where from hooks
 $parameters = array();
@@ -481,8 +481,8 @@ $sql .= $hookmanager->resPrint;
 $nbtotalofrecords = '';
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
-    $result = $db->query($sql);
-    $nbtotalofrecords = $db->num_rows($result);
+	$result = $db->query($sql);
+	$nbtotalofrecords = $db->num_rows($result);
 }
 
 $sql .= $db->order($sortfield, $sortorder);
@@ -499,7 +499,7 @@ if ($resql)
 	$arrayofselected = is_array($toselect) ? $toselect : array();
 
 	$param = '';
-    if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
+	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
 	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
 	if ($sall) $param .= "&amp;sall=".$sall;
 	if ($search_ref_rcp) $param .= "&amp;search_ref_rcp=".$search_ref_rcp;
@@ -517,15 +517,15 @@ if ($resql)
 	// Add $param from extra fields
 	foreach ($search_array_options as $key => $val)
 	{
-	    $crit = $val;
-	    $tmpkey = preg_replace('/search_options_/', '', $key);
-	    if ($val != '') $param .= '&search_options_'.$tmpkey.'='.urlencode($val);
+		$crit = $val;
+		$tmpkey = preg_replace('/search_options_/', '', $key);
+		if ($val != '') $param .= '&search_options_'.$tmpkey.'='.urlencode($val);
 	}
 
 
-    $arrayofmassactions = array(
-    // 'presend'=>$langs->trans("SendByMail"),
-    );
+	$arrayofmassactions = array(
+	// 'presend'=>$langs->trans("SendByMail"),
+	);
 
 	if ($user->rights->fournisseur->facture->creer)$arrayofmassactions['createbills'] = $langs->trans("CreateInvoiceForThisSupplier");
 	if ($massaction == 'createbills') $arrayofmassactions = array();
@@ -533,13 +533,13 @@ if ($resql)
 	//$massactionbutton=$form->selectMassAction('', $massaction == 'presend' ? array() : array('presend'=>$langs->trans("SendByMail"), 'builddoc'=>$langs->trans("PDFMerge")));
 
 	$i = 0;
-    print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">'."\n";
-    if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
-    print '<input type="hidden" name="action" value="list">';
-    print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
-    print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">'."\n";
+	if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
+	print '<input type="hidden" name="action" value="list">';
+	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 
 	print_barre_liste($langs->trans('ListOfReceptions'), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'dollyrevert', 0, '', '', $limit, 0, 0, 1);
 
@@ -573,10 +573,10 @@ if ($resql)
 		print '<td>';
 		if (!empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_BILL))
 		{
-		    print $form->selectyesno('validate_invoices', 0, 1, 1);
-		    print ' ('.$langs->trans("AutoValidationNotPossibleWhenStockIsDecreasedOnInvoiceValidation").')';
+			print $form->selectyesno('validate_invoices', 0, 1, 1);
+			print ' ('.$langs->trans("AutoValidationNotPossibleWhenStockIsDecreasedOnInvoiceValidation").')';
 		} else {
-            print $form->selectyesno('validate_invoices', 0, 1);
+			print $form->selectyesno('validate_invoices', 0, 1);
 		}
 		print '</td>';
 		print '</tr>';
@@ -590,95 +590,95 @@ if ($resql)
 		print '<br>';
 	}
 
-    if ($sall)
-    {
-        foreach ($fieldstosearchall as $key => $val) $fieldstosearchall[$key] = $langs->trans($val);
-        print $langs->trans("FilterOnInto", $sall).join(', ', $fieldstosearchall);
-    }
+	if ($sall)
+	{
+		foreach ($fieldstosearchall as $key => $val) $fieldstosearchall[$key] = $langs->trans($val);
+		print $langs->trans("FilterOnInto", $sall).join(', ', $fieldstosearchall);
+	}
 
-    $moreforfilter = '';
-    if (!empty($moreforfilter))
-    {
-        print '<div class="liste_titre liste_titre_bydiv centpercent">';
-        print $moreforfilter;
-        $parameters = array('type'=>$type);
-        $reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters); // Note that $action and $object may have been modified by hook
-        print $hookmanager->resPrint;
-        print '</div>';
-    }
+	$moreforfilter = '';
+	if (!empty($moreforfilter))
+	{
+		print '<div class="liste_titre liste_titre_bydiv centpercent">';
+		print $moreforfilter;
+		$parameters = array('type'=>$type);
+		$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters); // Note that $action and $object may have been modified by hook
+		print $hookmanager->resPrint;
+		print '</div>';
+	}
 
-    $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-    $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
+	$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
+	$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
 	$selectedfields .= $form->showCheckAddButtons('checkforselect', 1);
 
 
-    print '<div class="div-table-responsive">';
-    print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
+	print '<div class="div-table-responsive">';
+	print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
-    // Fields title search
-    // --------------------------------------------------------------------
-    print '<tr class="liste_titre_filter">';
+	// Fields title search
+	// --------------------------------------------------------------------
+	print '<tr class="liste_titre_filter">';
 	// Ref
 	if (!empty($arrayfields['e.ref']['checked']))
 	{
-	    print '<td class="liste_titre">';
-    	print '<input class="flat" size="6" type="text" name="search_ref_rcp" value="'.$search_ref_rcp.'">';
-        print '</td>';
+		print '<td class="liste_titre">';
+		print '<input class="flat" size="6" type="text" name="search_ref_rcp" value="'.$search_ref_rcp.'">';
+		print '</td>';
 	}
 	// Ref customer
 	if (!empty($arrayfields['e.ref_supplier']['checked']))
 	{
-	    print '<td class="liste_titre">';
-    	print '<input class="flat" size="6" type="text" name="search_ref_supplier" value="'.$search_ref_supplier.'">';
-        print '</td>';
+		print '<td class="liste_titre">';
+		print '<input class="flat" size="6" type="text" name="search_ref_supplier" value="'.$search_ref_supplier.'">';
+		print '</td>';
 	}
 	// Thirdparty
 	if (!empty($arrayfields['s.nom']['checked']))
 	{
-    	print '<td class="liste_titre left">';
-    	print '<input class="flat" type="text" size="8" name="search_company" value="'.dol_escape_htmltag($search_company).'">';
-    	print '</td>';
+		print '<td class="liste_titre left">';
+		print '<input class="flat" type="text" size="8" name="search_company" value="'.dol_escape_htmltag($search_company).'">';
+		print '</td>';
 	}
 	// Town
 	if (!empty($arrayfields['s.town']['checked'])) print '<td class="liste_titre"><input class="flat" type="text" size="6" name="search_town" value="'.$search_town.'"></td>';
 	// Zip
 	if (!empty($arrayfields['s.zip']['checked'])) print '<td class="liste_titre"><input class="flat" type="text" size="6" name="search_zip" value="'.$search_zip.'"></td>';
 	// State
-    if (!empty($arrayfields['state.nom']['checked']))
-    {
-        print '<td class="liste_titre">';
-    	print '<input class="flat" size="4" type="text" name="search_state" value="'.dol_escape_htmltag($search_state).'">';
-    	print '</td>';
-    }
-    // Country
-    if (!empty($arrayfields['country.code_iso']['checked']))
-    {
-        print '<td class="liste_titre center">';
-    	print $form->select_country($search_country, 'search_country', '', 0, 'minwidth100imp maxwidth100');
-    	print '</td>';
-    }
+	if (!empty($arrayfields['state.nom']['checked']))
+	{
+		print '<td class="liste_titre">';
+		print '<input class="flat" size="4" type="text" name="search_state" value="'.dol_escape_htmltag($search_state).'">';
+		print '</td>';
+	}
+	// Country
+	if (!empty($arrayfields['country.code_iso']['checked']))
+	{
+		print '<td class="liste_titre center">';
+		print $form->select_country($search_country, 'search_country', '', 0, 'minwidth100imp maxwidth100');
+		print '</td>';
+	}
 	// Company type
-    if (!empty($arrayfields['typent.code']['checked']))
-    {
-        print '<td class="liste_titre maxwidthonsmartphone center">';
-    	print $form->selectarray("search_type_thirdparty", $formcompany->typent_array(0), $search_type_thirdparty, 0, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT));
-    	print '</td>';
-    }
+	if (!empty($arrayfields['typent.code']['checked']))
+	{
+		print '<td class="liste_titre maxwidthonsmartphone center">';
+		print $form->selectarray("search_type_thirdparty", $formcompany->typent_array(0), $search_type_thirdparty, 0, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT));
+		print '</td>';
+	}
 	// Date delivery planned
 	if (!empty($arrayfields['e.date_delivery']['checked']))
 	{
-    	print '<td class="liste_titre">&nbsp;</td>';
+		print '<td class="liste_titre">&nbsp;</td>';
 	}
 	if (!empty($arrayfields['l.ref']['checked']))
 	{
-    	// Delivery ref
+		// Delivery ref
 		print '<td class="liste_titre">';
 		print '<input class="flat" size="10" type="text" name="search_ref_liv" value="'.$search_ref_liv.'"';
 		print '</td>';
 	}
 	if (!empty($arrayfields['l.date_delivery']['checked']))
 	{
-	    // Date received
+		// Date received
 		print '<td class="liste_titre">&nbsp;</td>';
 	}
 	// Extra fields
@@ -691,34 +691,34 @@ if ($resql)
 	// Date creation
 	if (!empty($arrayfields['e.datec']['checked']))
 	{
-	    print '<td class="liste_titre">';
-	    print '</td>';
+		print '<td class="liste_titre">';
+		print '</td>';
 	}
 	// Date modification
 	if (!empty($arrayfields['e.tms']['checked']))
 	{
-	    print '<td class="liste_titre">';
-	    print '</td>';
+		print '<td class="liste_titre">';
+		print '</td>';
 	}
 	// Status
 	if (!empty($arrayfields['e.fk_statut']['checked']))
 	{
-	    print '<td class="liste_titre maxwidthonsmartphone right">';
-	    print $form->selectarray('search_status', array('0'=>$langs->trans('StatusReceptionDraftShort'), '1'=>$langs->trans('StatusReceptionValidatedShort'), '2'=>$langs->trans('StatusReceptionProcessedShort')), $search_status, 1);
-	    print '</td>';
+		print '<td class="liste_titre maxwidthonsmartphone right">';
+		print $form->selectarray('search_status', array('0'=>$langs->trans('StatusReceptionDraftShort'), '1'=>$langs->trans('StatusReceptionValidatedShort'), '2'=>$langs->trans('StatusReceptionProcessedShort')), $search_status, 1);
+		print '</td>';
 	}
 	// Status billed
 	if (!empty($arrayfields['e.billed']['checked']))
 	{
-	    print '<td class="liste_titre maxwidthonsmartphone center">';
-	    print $form->selectyesno('search_billed', $search_billed, 1, 0, 1);
-	    print '</td>';
+		print '<td class="liste_titre maxwidthonsmartphone center">';
+		print $form->selectyesno('search_billed', $search_billed, 1, 0, 1);
+		print '</td>';
 	}
 	// Action column
 	print '<td class="liste_titre middle">';
 	$searchpicto = $form->showFilterAndCheckAddButtons(0);
 	print $searchpicto;
-    print '</td>';
+	print '</td>';
 	print "</tr>\n";
 
 	print '<tr class="liste_titre">';
@@ -752,121 +752,121 @@ if ($resql)
 	{
 		$obj = $db->fetch_object($resql);
 
-    	$reception->id = $obj->rowid;
-    	$reception->ref = $obj->ref;
+		$reception->id = $obj->rowid;
+		$reception->ref = $obj->ref;
 
-    	$companystatic->id = $obj->socid;
-    	$companystatic->ref = $obj->name;
-    	$companystatic->name = $obj->name;
+		$companystatic->id = $obj->socid;
+		$companystatic->ref = $obj->name;
+		$companystatic->name = $obj->name;
 
 
-    	print '<tr class="oddeven">';
+		print '<tr class="oddeven">';
 
 		// Ref
 		if (!empty($arrayfields['e.ref']['checked']))
 		{
-    		print "<td>";
-    		print $reception->getNomUrl(1);
-    		$filename = dol_sanitizeFileName($reception->ref);
-    		$filedir = $conf->reception->dir_output.'/'.dol_sanitizeFileName($reception->ref);
-    		$urlsource = $_SERVER['PHP_SELF'].'?id='.$reception->id;
-    		print $formfile->getDocumentsLink($reception->element, $filename, $filedir);
-    		print "</td>\n";
+			print "<td>";
+			print $reception->getNomUrl(1);
+			$filename = dol_sanitizeFileName($reception->ref);
+			$filedir = $conf->reception->dir_output.'/'.dol_sanitizeFileName($reception->ref);
+			$urlsource = $_SERVER['PHP_SELF'].'?id='.$reception->id;
+			print $formfile->getDocumentsLink($reception->element, $filename, $filedir);
+			print "</td>\n";
 
-    		if (!$i) $totalarray['nbfield']++;
+			if (!$i) $totalarray['nbfield']++;
 		}
 
 		// Ref customer
 		if (!empty($arrayfields['e.ref_supplier']['checked']))
 		{
-		    print "<td>";
-		    print $obj->ref_supplier;
-		    print "</td>\n";
-		    if (!$i) $totalarray['nbfield']++;
+			print "<td>";
+			print $obj->ref_supplier;
+			print "</td>\n";
+			if (!$i) $totalarray['nbfield']++;
 		}
 
 		// Third party
 		if (!empty($arrayfields['s.nom']['checked']))
 		{
-    		print '<td>';
-    		print $companystatic->getNomUrl(1);
-    		print '</td>';
-    		if (!$i) $totalarray['nbfield']++;
+			print '<td>';
+			print $companystatic->getNomUrl(1);
+			print '</td>';
+			if (!$i) $totalarray['nbfield']++;
 		}
 		// Town
 		if (!empty($arrayfields['s.town']['checked']))
 		{
-		    print '<td class="nocellnopadd">';
-		    print $obj->town;
-		    print '</td>';
-		    if (!$i) $totalarray['nbfield']++;
+			print '<td class="nocellnopadd">';
+			print $obj->town;
+			print '</td>';
+			if (!$i) $totalarray['nbfield']++;
 		}
 		// Zip
 		if (!empty($arrayfields['s.zip']['checked']))
 		{
-		    print '<td class="nocellnopadd">';
-		    print $obj->zip;
-		    print '</td>';
-		    if (!$i) $totalarray['nbfield']++;
+			print '<td class="nocellnopadd">';
+			print $obj->zip;
+			print '</td>';
+			if (!$i) $totalarray['nbfield']++;
 		}
 		// State
 		if (!empty($arrayfields['state.nom']['checked']))
 		{
-		    print "<td>".$obj->state_name."</td>\n";
-		    if (!$i) $totalarray['nbfield']++;
+			print "<td>".$obj->state_name."</td>\n";
+			if (!$i) $totalarray['nbfield']++;
 		}
 		// Country
 		if (!empty($arrayfields['country.code_iso']['checked']))
 		{
-		    print '<td class="center">';
-		    $tmparray = getCountry($obj->fk_pays, 'all');
-		    print $tmparray['label'];
-		    print '</td>';
-		    if (!$i) $totalarray['nbfield']++;
+			print '<td class="center">';
+			$tmparray = getCountry($obj->fk_pays, 'all');
+			print $tmparray['label'];
+			print '</td>';
+			if (!$i) $totalarray['nbfield']++;
 		}
 		// Type ent
 		if (!empty($arrayfields['typent.code']['checked']))
 		{
-		    print '<td class="center">';
-		    if (count($typenArray) == 0) $typenArray = $formcompany->typent_array(1);
-		    print $typenArray[$obj->typent_code];
-		    print '</td>';
-		    if (!$i) $totalarray['nbfield']++;
+			print '<td class="center">';
+			if (count($typenArray) == 0) $typenArray = $formcompany->typent_array(1);
+			print $typenArray[$obj->typent_code];
+			print '</td>';
+			if (!$i) $totalarray['nbfield']++;
 		}
 
 		// Date delivery planed
 		if (!empty($arrayfields['e.date_delivery']['checked']))
 		{
-    		print '<td class="center">';
-    		print dol_print_date($db->jdate($obj->date_livraison), "day");
-    		/*$now = time();
+			print '<td class="center">';
+			print dol_print_date($db->jdate($obj->date_livraison), "day");
+			/*$now = time();
     		if ( ($now - $db->jdate($obj->date_reception)) > $conf->warnings->lim && $obj->statutid == 1 )
     		{
     		}*/
-    		print "</td>\n";
+			print "</td>\n";
 		}
 
 		if (!empty($arrayfields['l.ref']['checked']) || !empty($arrayfields['l.date_delivery']['checked']))
-        {
-		    $reception->fetchObjectLinked($reception->id, $reception->element);
-            $receiving = '';
-            if (count($reception->linkedObjects['delivery']) > 0) $receiving = reset($reception->linkedObjects['delivery']);
+		{
+			$reception->fetchObjectLinked($reception->id, $reception->element);
+			$receiving = '';
+			if (count($reception->linkedObjects['delivery']) > 0) $receiving = reset($reception->linkedObjects['delivery']);
 
-    		if (!empty($arrayfields['l.ref']['checked']))
-            {
-                // Ref
-                print '<td>';
-                print !empty($receiving) ? $receiving->getNomUrl($db) : '';
-                print '</td>';
-            }
+			if (!empty($arrayfields['l.ref']['checked']))
+			{
+				// Ref
+				print '<td>';
+				print !empty($receiving) ? $receiving->getNomUrl($db) : '';
+				print '</td>';
+			}
 
-    		if (!empty($arrayfields['l.date_delivery']['checked']))
-            {
-                // Date received
-            	print '<td class="center">';
-    			print dol_print_date($db->jdate($obj->date_reception), "day");
-    			print '</td>'."\n";
-            }
+			if (!empty($arrayfields['l.date_delivery']['checked']))
+			{
+				// Date received
+				print '<td class="center">';
+				print dol_print_date($db->jdate($obj->date_reception), "day");
+				print '</td>'."\n";
+			}
 		}
 
 		// Extra fields
@@ -879,24 +879,24 @@ if ($resql)
 		// Date creation
 		if (!empty($arrayfields['e.datec']['checked']))
 		{
-		    print '<td class="center nowrap">';
-		    print dol_print_date($db->jdate($obj->date_creation), 'dayhour');
-		    print '</td>';
-		    if (!$i) $totalarray['nbfield']++;
+			print '<td class="center nowrap">';
+			print dol_print_date($db->jdate($obj->date_creation), 'dayhour');
+			print '</td>';
+			if (!$i) $totalarray['nbfield']++;
 		}
 		// Date modification
 		if (!empty($arrayfields['e.tms']['checked']))
 		{
-		    print '<td class="center nowrap">';
-		    print dol_print_date($db->jdate($obj->date_update), 'dayhour');
-		    print '</td>';
-		    if (!$i) $totalarray['nbfield']++;
+			print '<td class="center nowrap">';
+			print dol_print_date($db->jdate($obj->date_update), 'dayhour');
+			print '</td>';
+			if (!$i) $totalarray['nbfield']++;
 		}
 		// Status
 		if (!empty($arrayfields['e.fk_statut']['checked']))
 		{
-		    print '<td class="right nowrap">'.$reception->LibStatut($obj->fk_statut, 5).'</td>';
-		    if (!$i) $totalarray['nbfield']++;
+			print '<td class="right nowrap">'.$reception->LibStatut($obj->fk_statut, 5).'</td>';
+			if (!$i) $totalarray['nbfield']++;
 		}
 		// Billed
 		if (!empty($arrayfields['e.billed']['checked']))
@@ -908,11 +908,11 @@ if ($resql)
 		// Action column
 		print '<td class="center">';
 		if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-        {
-            $selected = 0;
-    		if (in_array($obj->rowid, $arrayofselected)) $selected = 1;
-    		print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
-        }
+		{
+			$selected = 0;
+			if (in_array($obj->rowid, $arrayofselected)) $selected = 1;
+			print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
+		}
 		print '</td>';
 		if (!$i) $totalarray['nbfield']++;
 
diff --git a/htdocs/reception/note.php b/htdocs/reception/note.php
index 1faea564844..b57f3ea2efb 100644
--- a/htdocs/reception/note.php
+++ b/htdocs/reception/note.php
@@ -29,8 +29,8 @@ require_once DOL_DOCUMENT_ROOT.'/reception/class/reception.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/reception.lib.php';
 dol_include_once('/fourn/class/fournisseur.commande.class.php');
 if (!empty($conf->projet->enabled)) {
-    require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
-    require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 }
 
 $langs->load("receptions");
@@ -54,27 +54,27 @@ $result = restrictedArea($user, $origin, $origin_id);
 $object = new Reception($db);
 if ($id > 0 || !empty($ref))
 {
-    $object->fetch($id, $ref);
-    $object->fetch_thirdparty();
+	$object->fetch($id, $ref);
+	$object->fetch_thirdparty();
 
-    if (!empty($object->origin))
-    {
-        $typeobject = $object->origin;
-        $origin = $object->origin;
-        $object->fetch_origin();
-    }
+	if (!empty($object->origin))
+	{
+		$typeobject = $object->origin;
+		$origin = $object->origin;
+		$object->fetch_origin();
+	}
 
-    // Linked documents
-    if ($typeobject == 'commande' && $object->$typeobject->id && !empty($conf->commande->enabled))
-    {
-        $objectsrc = new Commande($db);
-        $objectsrc->fetch($object->$typeobject->id);
-    }
-    if ($typeobject == 'propal' && $object->$typeobject->id && !empty($conf->propal->enabled))
-    {
-        $objectsrc = new Propal($db);
-        $objectsrc->fetch($object->$typeobject->id);
-    }
+	// Linked documents
+	if ($typeobject == 'commande' && $object->$typeobject->id && !empty($conf->commande->enabled))
+	{
+		$objectsrc = new Commande($db);
+		$objectsrc->fetch($object->$typeobject->id);
+	}
+	if ($typeobject == 'propal' && $object->$typeobject->id && !empty($conf->propal->enabled))
+	{
+		$objectsrc = new Propal($db);
+		$objectsrc->fetch($object->$typeobject->id);
+	}
 }
 
 $permissionnote = $user->rights->reception->creer; // Used by the include of actions_setnotes.inc.php
@@ -110,52 +110,52 @@ if ($id > 0 || !empty($ref))
 	$morehtmlref .= $form->editfieldval("RefSupplier", '', $object->ref_supplier, $object, $user->rights->reception->creer, 'string', '', null, null, '', 1);
 	// Thirdparty
 	$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
-    // Project
-    if (!empty($conf->projet->enabled)) {
-        $langs->load("projects");
-        $morehtmlref .= '<br>'.$langs->trans('Project').' ';
-        if (0) {    // Do not change on reception
-            if ($action != 'classify') {
-                $morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
-            }
-            if ($action == 'classify') {
-                // $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-                $morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-                $morehtmlref .= '<input type="hidden" name="action" value="classin">';
-                $morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
-                $morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-                $morehtmlref .= '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
-                $morehtmlref .= '</form>';
-            } else {
-                $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-            }
-        } else {
-            // We don't have project on reception, so we will use the project or source object instead
-            // TODO Add project on reception
-            $morehtmlref .= ' : ';
-            if (!empty($objectsrc->fk_project)) {
-                $proj = new Project($db);
-                $proj->fetch($objectsrc->fk_project);
-                $morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$objectsrc->fk_project.'" title="'.$langs->trans('ShowProject').'">';
-                $morehtmlref .= $proj->ref;
-                $morehtmlref .= '</a>';
-            } else {
-                $morehtmlref .= '';
-            }
-        }
-    }
-    $morehtmlref .= '</div>';
+	// Project
+	if (!empty($conf->projet->enabled)) {
+		$langs->load("projects");
+		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
+		if (0) {    // Do not change on reception
+			if ($action != 'classify') {
+				$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
+			}
+			if ($action == 'classify') {
+				// $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+				$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+				$morehtmlref .= '<input type="hidden" name="action" value="classin">';
+				$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
+				$morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+				$morehtmlref .= '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+				$morehtmlref .= '</form>';
+			} else {
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+			}
+		} else {
+			// We don't have project on reception, so we will use the project or source object instead
+			// TODO Add project on reception
+			$morehtmlref .= ' : ';
+			if (!empty($objectsrc->fk_project)) {
+				$proj = new Project($db);
+				$proj->fetch($objectsrc->fk_project);
+				$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$objectsrc->fk_project.'" title="'.$langs->trans('ShowProject').'">';
+				$morehtmlref .= $proj->ref;
+				$morehtmlref .= '</a>';
+			} else {
+				$morehtmlref .= '';
+			}
+		}
+	}
+	$morehtmlref .= '</div>';
 
-    $object->picto = 'sending';
-    dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+	$object->picto = 'sending';
+	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
 
 
-    print '<div class="underbanner clearboth"></div>';
+	print '<div class="underbanner clearboth"></div>';
 
 	$cssclass = 'titlefield';
 	include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 }
 
 
diff --git a/htdocs/reception/stats/index.php b/htdocs/reception/stats/index.php
index 62df437b26e..bf839b16154 100644
--- a/htdocs/reception/stats/index.php
+++ b/htdocs/reception/stats/index.php
@@ -37,8 +37,8 @@ $socid = GETPOST('socid', 'int');
 // Security check
 if ($user->socid > 0)
 {
-    $action = '';
-    $socid = $user->socid;
+	$action = '';
+	$socid = $user->socid;
 }
 
 $nowyear = strftime("%Y", dol_now());
@@ -76,34 +76,34 @@ $data = $stats->getNbByMonthWithPrevYear($endyear, $startyear);
 
 if (!$user->rights->societe->client->voir || $user->socid)
 {
-    $filenamenb = $dir.'/receptionsnbinyear-'.$user->id.'-'.$year.'.png';
+	$filenamenb = $dir.'/receptionsnbinyear-'.$user->id.'-'.$year.'.png';
 } else {
-    $filenamenb = $dir.'/receptionsnbinyear-'.$year.'.png';
+	$filenamenb = $dir.'/receptionsnbinyear-'.$year.'.png';
 }
 
 $px1 = new DolGraph();
 $mesg = $px1->isGraphKo();
 if (!$mesg)
 {
-    $px1->SetData($data);
-    $i = $startyear; $legend = array();
-    while ($i <= $endyear)
-    {
-        $legend[] = $i;
-        $i++;
-    }
-    $px1->SetLegend($legend);
-    $px1->SetMaxValue($px1->GetCeilMaxValue());
-    $px1->SetMinValue(min(0, $px1->GetFloorMinValue()));
-    $px1->SetWidth($WIDTH);
-    $px1->SetHeight($HEIGHT);
-    $px1->SetYLabel($langs->trans("NbOfReceptions"));
-    $px1->SetShading(3);
-    $px1->SetHorizTickIncrement(1);
-    $px1->mode = 'depth';
-    $px1->SetTitle($langs->trans("NumberOfReceptionsByMonth"));
+	$px1->SetData($data);
+	$i = $startyear; $legend = array();
+	while ($i <= $endyear)
+	{
+		$legend[] = $i;
+		$i++;
+	}
+	$px1->SetLegend($legend);
+	$px1->SetMaxValue($px1->GetCeilMaxValue());
+	$px1->SetMinValue(min(0, $px1->GetFloorMinValue()));
+	$px1->SetWidth($WIDTH);
+	$px1->SetHeight($HEIGHT);
+	$px1->SetYLabel($langs->trans("NbOfReceptions"));
+	$px1->SetShading(3);
+	$px1->SetHorizTickIncrement(1);
+	$px1->mode = 'depth';
+	$px1->SetTitle($langs->trans("NumberOfReceptionsByMonth"));
 
-    $px1->draw($filenamenb, $fileurlnb);
+	$px1->draw($filenamenb, $fileurlnb);
 }
 
 // Build graphic amount of object
@@ -289,9 +289,9 @@ print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 // Show graphs
 print '<table class="border centpercent"><tr valign="top"><td class="center">';
 if ($mesg) { print $mesg; } else {
-    print $px1->show();
-    print "<br>\n";
-    /*print $px2->show();
+	print $px1->show();
+	print "<br>\n";
+	/*print $px2->show();
     print "<br>\n";
     print $px3->show();*/
 }
@@ -301,7 +301,7 @@ print '</td></tr></table>';
 print '</div></div></div>';
 print '<div style="clear:both"></div>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 
diff --git a/htdocs/reception/stats/month.php b/htdocs/reception/stats/month.php
index dab1a806406..f974b4edcff 100644
--- a/htdocs/reception/stats/month.php
+++ b/htdocs/reception/stats/month.php
@@ -55,14 +55,14 @@ $px = new DolGraph();
 $mesg = $px->isGraphKo();
 if (!$mesg)
 {
-    $px->SetData($data);
-    $px->SetMaxValue($px->GetCeilMaxValue());
-    $px->SetWidth($WIDTH);
-    $px->SetHeight($HEIGHT);
-    $px->SetYLabel($langs->trans("NbOfOrders"));
-    $px->SetShading(3);
+	$px->SetData($data);
+	$px->SetMaxValue($px->GetCeilMaxValue());
+	$px->SetWidth($WIDTH);
+	$px->SetHeight($HEIGHT);
+	$px->SetYLabel($langs->trans("NbOfOrders"));
+	$px->SetShading(3);
 	$px->SetHorizTickIncrement(1);
-    $px->draw($filename, $fileurl);
+	$px->draw($filename, $fileurl);
 }
 
 print '<table class="border centpercent">';
diff --git a/htdocs/reception/tpl/linkedobjectblock.tpl.php b/htdocs/reception/tpl/linkedobjectblock.tpl.php
index 7d902888cd0..014dbff00a0 100644
--- a/htdocs/reception/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/reception/tpl/linkedobjectblock.tpl.php
@@ -44,11 +44,11 @@ $linkedObjectBlock = dol_sort_array($linkedObjectBlock, 'date', 'desc', 0, 0, 1)
 $total = 0; $ilink = 0;
 foreach ($linkedObjectBlock as $key => $objectlink)
 {
-    $ilink++;
+	$ilink++;
 
-    $trclass = 'oddeven';
-    if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass .= ' liste_sub_total';
-    ?>
+	$trclass = 'oddeven';
+	if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass .= ' liste_sub_total';
+	?>
     <tr class="<?php echo $trclass; ?>">
         <td class="linkedcol-element"><?php echo $langs->trans("Reception"); ?>
         <?php if (!empty($showImportButton) && $conf->global->MAIN_ENABLE_IMPORT_LINKED_OBJECT_LINES) print '<a class="objectlinked_importbtn" href="'.$objectlink->getNomUrl(0, '', 0, 1).'&amp;action=selectlines"  data-element="'.$objectlink->element.'"  data-id="'.$objectlink->id.'"  > <i class="fa fa-indent"></i> </a'; ?>
@@ -57,27 +57,27 @@ foreach ($linkedObjectBlock as $key => $objectlink)
         <td class="linkedcol-ref center"></td>
     	<td class="linkedcol-date center"><?php echo dol_print_date($objectlink->date_delivery, 'day'); ?></td>
     	<td class="linkedcol-amount right"><?php
-    	if ($user->rights->reception->lire) {
-    		$total = $total + $objectlink->total_ht;
-    		echo price($objectlink->total_ht);
-    	} ?></td>
+		if ($user->rights->reception->lire) {
+			$total = $total + $objectlink->total_ht;
+			echo price($objectlink->total_ht);
+		} ?></td>
     	<td class="linkedcol-statut right"><?php echo $objectlink->getLibStatut(3); ?></td>
     	<td class="linkedcol-action right">
     	<?php
-    	// For now, receptions must stay linked to order, so link is not deletable
-    	if ($object->element != 'order_supplier') {
-    		?>
+		// For now, receptions must stay linked to order, so link is not deletable
+		if ($object->element != 'order_supplier') {
+			?>
     		<a class="reposition" href="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key; ?>"><?php echo img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink'); ?></a>
     		<?php
-    	}
-    	?>
+		}
+		?>
    		</td>
     </tr>
     <?php
 }
 if (count($linkedObjectBlock) > 1)
 {
-    ?>
+	?>
     <tr class="liste_total <?php echo (empty($noMoreLinkedObjectBlockAfter) ? 'liste_sub_total' : ''); ?>">
         <td><?php echo $langs->trans("Total"); ?></td>
         <td></td>
diff --git a/htdocs/recruitment/admin/candidature_extrafields.php b/htdocs/recruitment/admin/candidature_extrafields.php
index 573e40f2850..1d9e567da9d 100644
--- a/htdocs/recruitment/admin/candidature_extrafields.php
+++ b/htdocs/recruitment/admin/candidature_extrafields.php
@@ -69,7 +69,7 @@ print dol_get_fiche_head($head, 'candidature_extrafields', '', -1, '');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 // Buttons
diff --git a/htdocs/recruitment/admin/jobposition_extrafields.php b/htdocs/recruitment/admin/jobposition_extrafields.php
index 9a4b12ed8b7..af7a7c316a7 100644
--- a/htdocs/recruitment/admin/jobposition_extrafields.php
+++ b/htdocs/recruitment/admin/jobposition_extrafields.php
@@ -69,7 +69,7 @@ print dol_get_fiche_head($head, 'jobposition_extrafields', '', -1, '');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 // Buttons
diff --git a/htdocs/recruitment/admin/public_interface.php b/htdocs/recruitment/admin/public_interface.php
index 88862782825..a457c2a4427 100644
--- a/htdocs/recruitment/admin/public_interface.php
+++ b/htdocs/recruitment/admin/public_interface.php
@@ -50,15 +50,15 @@ if ($action == 'setRECRUITMENT_ENABLE_PUBLIC_INTERFACE') {
 if ($action == 'update') {
 	$public = GETPOST('RECRUITMENT_ENABLE_PUBLIC_INTERFACE');
 
-    $res = dolibarr_set_const($db, "RECRUITMENT_ENABLE_PUBLIC_INTERFACE", $public, 'chaine', 0, '', $conf->entity);
+	$res = dolibarr_set_const($db, "RECRUITMENT_ENABLE_PUBLIC_INTERFACE", $public, 'chaine', 0, '', $conf->entity);
 
-    if (!$res > 0) $error++;
+	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');
+	}
 }
 
 
@@ -165,7 +165,7 @@ if (!empty($conf->global->RECRUITMENT_ENABLE_PUBLIC_INTERFACE)) {
 }
 */
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '</form>';
 
diff --git a/htdocs/recruitment/admin/setup.php b/htdocs/recruitment/admin/setup.php
index c6194478a20..e0443398c77 100644
--- a/htdocs/recruitment/admin/setup.php
+++ b/htdocs/recruitment/admin/setup.php
@@ -251,7 +251,7 @@ if ($action == 'edit')
 
 $moduledir = 'recruitment';
 $myTmpObjects = array();
-$myTmpObjects['RecruitmentJobPosition']=array('includerefgeneration'=>1, 'includedocgeneration'=>1);
+$myTmpObjects['RecruitmentJobPosition'] = array('includerefgeneration'=>1, 'includedocgeneration'=>1);
 
 
 foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
@@ -517,7 +517,7 @@ if (empty($setupnotempty)) {
 }
 
 // Page end
-dol_fiche_end();
+print dol_get_fiche_end();
 
 llxFooter();
 $db->close();
diff --git a/htdocs/recruitment/admin/setup_candidatures.php b/htdocs/recruitment/admin/setup_candidatures.php
index 47c3ec9def8..78b6130bd5e 100644
--- a/htdocs/recruitment/admin/setup_candidatures.php
+++ b/htdocs/recruitment/admin/setup_candidatures.php
@@ -517,7 +517,7 @@ if (empty($setupnotempty)) {
 }
 
 // Page end
-dol_fiche_end();
+print dol_get_fiche_end();
 
 llxFooter();
 $db->close();
diff --git a/htdocs/recruitment/class/recruitmentcandidature.class.php b/htdocs/recruitment/class/recruitmentcandidature.class.php
index df96744526b..4d01bc4b0db 100644
--- a/htdocs/recruitment/class/recruitmentcandidature.class.php
+++ b/htdocs/recruitment/class/recruitmentcandidature.class.php
@@ -68,6 +68,7 @@ class RecruitmentCandidature extends CommonObject
 	//const STATUS_INTERVIEW_SCHEDULED = 2;
 	const STATUS_CONTRACT_PROPOSED = 3;
 	const STATUS_CONTRACT_SIGNED = 5;
+	const STATUS_CONTRACT_REFUSED = 6;
 	const STATUS_REFUSED = 8;
 	const STATUS_CANCELED = 9;
 
@@ -86,7 +87,7 @@ class RecruitmentCandidature extends CommonObject
 	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
 	 *  'searchall' is 1 if we want to search in this field when making a search from the quick search button.
 	 *  'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
-	 *  'css' is the CSS style to use on field. For example: 'maxwidth200'
+	 *  'css' and 'cssview' and 'csslist' is the CSS style to use on field. 'css' is used in creation and update. 'cssview' is used in view mode. 'csslist' is used for columns in lists. For example: 'maxwidth200', 'wordbreak', 'tdoverflowmax200'
 	 *  'help' is a string visible as a tooltip on field
 	 *  'showoncombobox' if value of the field must be visible into the label of the combobox that list record
 	 *  'disabled' is 1 if we want to have the field locked by a 'disabled' attribute. In most cases, this is never set into the definition of $fields into class, but is set dynamically by some part of code.
@@ -222,7 +223,7 @@ class RecruitmentCandidature extends CommonObject
 		{
 			foreach ($this->fields as $key => $val)
 			{
-				if (is_array($val['arrayofkeyval']))
+				if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval']))
 				{
 					foreach ($val['arrayofkeyval'] as $key2 => $val2)
 					{
@@ -679,7 +680,7 @@ class RecruitmentCandidature extends CommonObject
 	public function reopen($user, $notrigger = 0)
 	{
 		// Protection
-		if ($this->status != self::STATUS_CANCELED)
+		if ($this->status != self::STATUS_REFUSED && $this->status != self::STATUS_CANCELED && $this->status != self::STATUS_CONTRACT_REFUSED)
 		{
 			return 0;
 		}
@@ -821,13 +822,15 @@ class RecruitmentCandidature extends CommonObject
 			$this->labelStatus[self::STATUS_VALIDATED] = $langs->trans('Received').' ('.$langs->trans("InterviewToDo").')';
 			$this->labelStatus[self::STATUS_CONTRACT_PROPOSED] = $langs->trans('ContractProposed');
 			$this->labelStatus[self::STATUS_CONTRACT_SIGNED] = $langs->trans('ContractSigned');
-			$this->labelStatus[self::STATUS_REFUSED] = $langs->trans('Refused');
+			$this->labelStatus[self::STATUS_CONTRACT_REFUSED] = $langs->trans('ContractRefused');
 			$this->labelStatus[self::STATUS_REFUSED] = $langs->trans('Refused');
 			$this->labelStatus[self::STATUS_CANCELED] = $langs->trans('Canceled');
 			$this->labelStatusShort[self::STATUS_DRAFT] = $langs->trans('Draft');
 			$this->labelStatusShort[self::STATUS_VALIDATED] = $langs->trans('Received');
 			$this->labelStatusShort[self::STATUS_CONTRACT_PROPOSED] = $langs->trans('ContractProposed');
 			$this->labelStatusShort[self::STATUS_CONTRACT_SIGNED] = $langs->trans('ContractSigned');
+			$this->labelStatusShort[self::STATUS_CONTRACT_REFUSED] = $langs->trans('ContractRefused');
+			$this->labelStatusShort[self::STATUS_REFUSED] = $langs->trans('Refused');
 			$this->labelStatusShort[self::STATUS_CANCELED] = $langs->trans('Canceled');
 		}
 
diff --git a/htdocs/recruitment/class/recruitmentjobposition.class.php b/htdocs/recruitment/class/recruitmentjobposition.class.php
index 6e27164ba23..fdc5ab30eaa 100644
--- a/htdocs/recruitment/class/recruitmentjobposition.class.php
+++ b/htdocs/recruitment/class/recruitmentjobposition.class.php
@@ -57,7 +57,7 @@ class RecruitmentJobPosition extends CommonObject
 	 */
 	public $isextrafieldmanaged = 1;
 
-    /**
+	/**
 	 * @var string String with name of icon for recruitmentjobposition. Must be the part after the 'object_' into object_recruitmentjobposition.png
 	 */
 	public $picto = 'recruitmentjobposition';
@@ -83,7 +83,7 @@ class RecruitmentJobPosition extends CommonObject
 	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
 	 *  'searchall' is 1 if we want to search in this field when making a search from the quick search button.
 	 *  'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
-	 *  'css' is the CSS style to use on field. For example: 'maxwidth200'
+	 *  'css' and 'cssview' and 'csslist' is the CSS style to use on field. 'css' is used in creation and update. 'cssview' is used in view mode. 'csslist' is used for columns in lists. For example: 'maxwidth200', 'wordbreak', 'tdoverflowmax200'
 	 *  'help' is a string visible as a tooltip on field
 	 *  'showoncombobox' if value of the field must be visible into the label of the combobox that list record
 	 *  'disabled' is 1 if we want to have the field locked by a 'disabled' attribute. In most cases, this is never set into the definition of $fields into class, but is set dynamically by some part of code.
@@ -102,10 +102,10 @@ class RecruitmentJobPosition extends CommonObject
 		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>'1', 'position'=>1, 'notnull'=>1, 'visible'=>0, 'noteditable'=>'1', 'index'=>1, 'comment'=>"Id"),
 		'entity' => array('type'=>'integer', 'label'=>'Entity', 'enabled'=>1, 'visible'=>0, 'position'=>5, 'notnull'=>1, 'default'=>'1', 'index'=>1),
 		'ref' => array('type'=>'varchar(128)', 'label'=>'Ref', 'enabled'=>'1', 'position'=>10, 'notnull'=>1, 'visible'=>4, 'noteditable'=>'1', 'default'=>'(PROV)', 'index'=>1, 'searchall'=>1, 'showoncombobox'=>'1', 'comment'=>"Reference of object"),
-		'label' => array('type'=>'varchar(255)', 'label'=>'JobLabel', 'enabled'=>'1', 'position'=>30, 'notnull'=>1, 'visible'=>1, 'searchall'=>1, 'css'=>'minwidth500', 'showoncombobox'=>'1', 'autofocusoncreate'=>1),
+		'label' => array('type'=>'varchar(255)', 'label'=>'JobLabel', 'enabled'=>'1', 'position'=>30, 'notnull'=>1, 'visible'=>1, 'searchall'=>1, 'css'=>'minwidth500', 'csslist'=>'tdoverflowmax300', 'showoncombobox'=>'1', 'autofocusoncreate'=>1),
 		'qty' => array('type'=>'integer', 'label'=>'NbOfEmployeesExpected', 'enabled'=>'1', 'position'=>45, 'notnull'=>1, 'visible'=>1, 'default'=>'1', 'isameasure'=>'1', 'css'=>'maxwidth75imp',),
 		'fk_project' => array('type'=>'integer:Project:projet/class/project.class.php:1', 'label'=>'Project', 'enabled'=>'1', 'position'=>52, 'notnull'=>-1, 'visible'=>-1, 'index'=>1,),
-		'fk_user_recruiter' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'ResponsibleOfRecruitement', 'enabled'=>'1', 'position'=>54, 'notnull'=>1, 'visible'=>1, 'foreignkey'=>'user.rowid',),
+		'fk_user_recruiter' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'ResponsibleOfRecruitement', 'enabled'=>'1', 'position'=>54, 'notnull'=>1, 'visible'=>1, 'foreignkey'=>'user.rowid', 'csslist'=>'tdoverflowmax150'),
 		'email_recruiter' => array('type'=>'varchar(255)', 'label'=>'EmailRecruiter', 'enabled'=>'1', 'position'=>54, 'notnull'=>0, 'visible'=>-1, 'help'=>'ToUseAGenericEmail'),
 		'fk_user_supervisor' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'FutureManager', 'enabled'=>'1', 'position'=>55, 'notnull'=>0, 'visible'=>-1, 'foreignkey'=>'user.rowid',),
 		'fk_establishment' => array('type'=>'integer:Establishment:hrm/class/establishment.class.php', 'label'=>'Establishment', 'enabled'=>'$conf->hrm->enabled', 'position'=>56, 'notnull'=>0, 'visible'=>-1, 'foreignkey'=>'establishment.rowid',),
@@ -126,30 +126,30 @@ class RecruitmentJobPosition extends CommonObject
 	);
 	public $rowid;
 
-    /**
-     * @var string ref
-     */
+	/**
+	 * @var string ref
+	 */
 	public $ref;
 	public $entity;
 
-    /**
-     * @var string label
-     */
+	/**
+	 * @var string label
+	 */
 	public $label;
 	public $qty;
 	public $fk_soc;
 	public $fk_project;
 	public $fk_user_recruiter;
 
-    /**
-     * @var string recruiter email
-     */
-    public $email_recruiter;
+	/**
+	 * @var string recruiter email
+	 */
+	public $email_recruiter;
 
-    /**
-     * @var string suggested remuneration
-     */
-    public $remuneration_suggested;
+	/**
+	 * @var string suggested remuneration
+	 */
+	public $remuneration_suggested;
 
 	public $fk_user_supervisor;
 	public $fk_establishment;
@@ -236,7 +236,7 @@ class RecruitmentJobPosition extends CommonObject
 		{
 			foreach ($this->fields as $key => $val)
 			{
-				if (is_array($val['arrayofkeyval']))
+				if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval']))
 				{
 					foreach ($val['arrayofkeyval'] as $key2 => $val2)
 					{
diff --git a/htdocs/recruitment/core/modules/recruitment/doc/doc_generic_recruitmentjobposition_odt.modules.php b/htdocs/recruitment/core/modules/recruitment/doc/doc_generic_recruitmentjobposition_odt.modules.php
index eedc3fbc7c8..6e9788c2e9f 100644
--- a/htdocs/recruitment/core/modules/recruitment/doc/doc_generic_recruitmentjobposition_odt.modules.php
+++ b/htdocs/recruitment/core/modules/recruitment/doc/doc_generic_recruitmentjobposition_odt.modules.php
@@ -316,7 +316,7 @@ class doc_generic_recruitmentjobposition_odt extends ModelePDFRecruitmentJobPosi
 					'__FROM_EMAIL__' => $this->emetteur->email,
 					'__TOTAL_TTC__' => $object->total_ttc,
 					'__TOTAL_HT__' => $object->total_ht,
-					'__TOTAL_VAT__' => $object->total_vat
+					'__TOTAL_VAT__' => $object->total_tva
 				);
 				complete_substitutions_array($substitutionarray, $langs, $object);
 				// Call the ODTSubstitution hook
diff --git a/htdocs/recruitment/lib/recruitment_recruitmentjobposition.lib.php b/htdocs/recruitment/lib/recruitment_recruitmentjobposition.lib.php
index a5739a53153..dbf4ef5040c 100644
--- a/htdocs/recruitment/lib/recruitment_recruitmentjobposition.lib.php
+++ b/htdocs/recruitment/lib/recruitment_recruitmentjobposition.lib.php
@@ -41,10 +41,12 @@ function recruitmentjobpositionPrepareHead($object)
 	$head[$h][2] = 'card';
 	$h++;
 
-	$head[$h][0] = dol_buildpath("/recruitment/recruitmentjobposition_candidature.php", 1).'?id='.$object->id;
-	$head[$h][1] = $langs->trans("Candidatures");
-	$head[$h][2] = 'candidatures';
-	$h++;
+	if ($conf->global->MAIN_FEATURES_LEVEL >= 1) {
+		$head[$h][0] = dol_buildpath("/recruitment/recruitmentjobposition_applications.php", 1).'?id='.$object->id;
+		$head[$h][1] = $langs->trans("Candidatures");
+		$head[$h][2] = 'candidatures';
+		$h++;
+	}
 
 	if (isset($object->fields['note_public']) || isset($object->fields['note_private']))
 	{
diff --git a/htdocs/recruitment/recruitmentcandidature_agenda.php b/htdocs/recruitment/recruitmentcandidature_agenda.php
index 79357cd0eb5..c125a14c647 100644
--- a/htdocs/recruitment/recruitmentcandidature_agenda.php
+++ b/htdocs/recruitment/recruitmentcandidature_agenda.php
@@ -195,7 +195,7 @@ if ($object->id > 0)
 
 	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 
 
diff --git a/htdocs/recruitment/recruitmentcandidature_card.php b/htdocs/recruitment/recruitmentcandidature_card.php
index 7d06ce4e342..d688ca31c8d 100644
--- a/htdocs/recruitment/recruitmentcandidature_card.php
+++ b/htdocs/recruitment/recruitmentcandidature_card.php
@@ -59,11 +59,12 @@ if (!$res) die("Include of main fails");
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 dol_include_once('/recruitment/class/recruitmentcandidature.class.php');
 dol_include_once('/recruitment/lib/recruitment_recruitmentcandidature.lib.php');
 
 // Load translation files required by the page
-$langs->loadLangs(array("recruitment", "other"));
+$langs->loadLangs(array("recruitment", "other", "users"));
 
 // Get parameters
 $id = GETPOST('id', 'int');
@@ -165,6 +166,100 @@ if (empty($reshook))
 		}
 	}
 
+	if ($action == 'confirm_makeofferordecline' && $permissiontoadd && !GETPOST('cancel', 'alpha')) {
+		if (!(GETPOST('status', 'int') > 0)) {
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CloseAs")), null, 'errors');
+			$action = 'makeofferordecline';
+		} else {
+			// prevent browser refresh from closing proposal several times
+			if ($object->status == $object::STATUS_VALIDATED)
+			{
+				$db->begin();
+
+				if (GETPOST('status', 'int') == $object::STATUS_REFUSED) {
+					$result = $object->setStatut($object::STATUS_REFUSED, null, '', $triggermodname);
+					if ($result < 0) {
+						setEventMessages($object->error, $object->errors, 'errors');
+					}
+				} else {
+					$result = $object->setStatut($object::STATUS_CONTRACT_PROPOSED, null, '', $triggermodname);
+					if ($result < 0) {
+						setEventMessages($object->error, $object->errors, 'errors');
+					}
+				}
+
+				if (!$error)
+				{
+					$db->commit();
+				} else {
+					$db->rollback();
+				}
+			}
+		}
+	}
+
+	if ($action == 'confirm_closeas' && $permissiontoadd && !GETPOST('cancel', 'alpha')) {
+		if (!(GETPOST('status', 'int') > 0)) {
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CloseAs")), null, 'errors');
+			$action = 'makeofferordecline';
+		} else {
+			// prevent browser refresh from closing proposal several times
+			if ($object->status == $object::STATUS_CONTRACT_PROPOSED)
+			{
+				$db->begin();
+
+				if (GETPOST('status', 'int') == $object::STATUS_CONTRACT_REFUSED) {
+					$result = $object->setStatut($object::STATUS_CONTRACT_REFUSED, null, '', $triggermodname);
+					if ($result < 0) {
+						setEventMessages($object->error, $object->errors, 'errors');
+					}
+				} else {
+					$result = $object->setStatut($object::STATUS_CONTRACT_SIGNED, null, '', $triggermodname);
+					if ($result < 0) {
+						setEventMessages($object->error, $object->errors, 'errors');
+					}
+				}
+
+				if (!$error)
+				{
+					$db->commit();
+				} else {
+					$db->rollback();
+				}
+			}
+		}
+	}
+
+	// Create user from a member
+	if ($action == 'confirm_create_user' && $confirm == 'yes' && $user->rights->user->user->creer) {
+		if ($result > 0) {
+			// Creation user
+			$nuser = new User($db);
+			$nuser->login = GETPOST('login', 'alphanohtml');
+			$nuser->fk_soc = 0;
+			$nuser->employee = 1;
+			$nuser->firstname = $object->firstname;
+			$nuser->lastname = $object->lastname;
+			$nuser->personal_mobile = $object->phone;
+			$nuser->birth = $object->date_birth;
+			$nuser->salary = $object->remuneration_proposed;
+
+			$result = $nuser->create($user);
+
+			if ($result < 0) {
+				$langs->load("errors");
+				setEventMessages($langs->trans($nuser->error), null, 'errors');
+				$action = 'create_user';
+			} else {
+				setEventMessages($langs->trans("NewUserCreated", $nuser->login), null, 'mesgs');
+				$action = '';
+			}
+		} else {
+			setEventMessages($object->error, $object->errors, 'errors');
+			$action = 'create_user';
+		}
+	}
+
 	// Actions to send emails
 	$triggersendname = 'RECRUITMENTCANDIDATURE_SENTBYMAIL';
 	$autocopy = 'MAIN_MAIL_AUTOCOPY_RECRUITMENTCANDIDATURE_TO';
@@ -231,7 +326,7 @@ if ($action == 'create')
 
 	print '</table>'."\n";
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div class="center">';
 	print '<input type="submit" class="button" name="add" value="'.dol_escape_htmltag($langs->trans("Create")).'">';
@@ -268,7 +363,7 @@ if (($id || $ref) && $action == 'edit')
 
 	print '</table>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div class="center"><input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
 	print ' &nbsp; <input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
@@ -302,21 +397,61 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToClone'), $langs->trans('ConfirmCloneAsk', $object->ref), 'confirm_clone', $formquestion, 'yes', 1);
 	}
 
-	// Confirmation of action xxxx
-	if ($action == 'xxx')
+	if ($action == 'makeofferordecline')
 	{
-		$formquestion = array();
-		/*
-		$forcecombo=0;
-		if ($conf->browser->name == 'ie') $forcecombo = 1;	// There is a bug in IE10 that make combo inside popup crazy
+		$langs->load("propal");
+
+		//Form to close proposal (signed or not)
 		$formquestion = array(
-			// 'text' => $langs->trans("ConfirmClone"),
-			// array('type' => 'checkbox', 'name' => 'clone_content', 'label' => $langs->trans("CloneMainAttributes"), 'value' => 1),
-			// array('type' => 'checkbox', 'name' => 'update_prices', 'label' => $langs->trans("PuttingPricesUpToDate"), 'value' => 1),
-			// array('type' => 'other',    'name' => 'idwarehouse',   'label' => $langs->trans("SelectWarehouseForStockDecrease"), 'value' => $formproduct->selectWarehouses(GETPOST('idwarehouse')?GETPOST('idwarehouse'):'ifone', 'idwarehouse', '', 1, 0, 0, '', 0, $forcecombo))
+			array('type' => 'select', 'name' => 'status', 'label' => '<span class="fieldrequired">'.$langs->trans("CloseAs").'</span>', 'values' => array($object::STATUS_CONTRACT_PROPOSED => $object->LibStatut($object::STATUS_CONTRACT_PROPOSED), $object::STATUS_REFUSED => $object->LibStatut($object::STATUS_REFUSED))),
+			array('type' => 'text', 'name' => 'note_private', 'label' => $langs->trans("Note"), 'value' => '')				// Field to complete private note (not replace)
 		);
-		*/
-		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('XXX'), $text, 'confirm_xxx', $formquestion, 0, 1, 220);
+
+		$text = '';
+
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('SetAcceptedRefused'), $text, 'confirm_makeofferordecline', $formquestion, '', 1, 250);
+	}
+
+	if ($action == 'closeas')
+	{
+		$langs->load("propal");
+
+		//Form to close proposal (signed or not)
+		$formquestion = array(
+			array('type' => 'select', 'name' => 'status', 'label' => '<span class="fieldrequired">'.$langs->trans("CloseAs").'</span>', 'values' => array($object::STATUS_CONTRACT_SIGNED => $object->LibStatut($object::STATUS_CONTRACT_PROPOSED), $object::STATUS_CONTRACT_REFUSED => $object->LibStatut($object::STATUS_CONTRACT_REFUSED))),
+			array('type' => 'text', 'name' => 'note_private', 'label' => $langs->trans("Note"), 'value' => '')				// Field to complete private note (not replace)
+		);
+
+		$text = '';
+
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('SetAcceptedRefused'), $text, 'confirm_closeas', $formquestion, '', 1, 250);
+	}
+
+	// Confirm create user
+	if ($action == 'create_user') {
+		$login = (GETPOSTISSET('login') ? GETPOST('login', 'alphanohtml') : $object->login);
+		if (empty($login)) {
+			// Full firstname and name separated with a dot : firstname.name
+			include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+			$login = dol_buildlogin($object->lastname, $object->firstname);
+		}
+		if (empty($login)) $login = strtolower(substr($object->firstname, 0, 4)).strtolower(substr($object->lastname, 0, 4));
+
+		// Create a form array
+		$formquestion = array(
+			array('label' => $langs->trans("LoginToCreate"), 'type' => 'text', 'name' => 'login', 'value' => $login)
+		);
+		/*
+		if (!empty($conf->societe->enabled) && $object->socid > 0) {
+			$object->fetch_thirdparty();
+			$formquestion[] = array('label' => $langs->trans("UserWillBe"), 'type' => 'radio', 'name' => 'internalorexternal', 'default'=>'external', 'values' => array('external'=>$langs->trans("External").' - '.$langs->trans("LinkedToDolibarrThirdParty").' '.$object->thirdparty->getNomUrl(1, '', 0, 1), 'internal'=>$langs->trans("Internal")));
+		}
+		$text = '';
+		if (!empty($conf->societe->enabled) && $object->socid <= 0) {
+			$text .= $langs->trans("UserWillBeInternalUser").'<br>';
+		} */
+		$text .= $langs->trans("ConfirmCreateLogin");
+		print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id, $langs->trans("CreateDolibarrLogin"), $text, "confirm_create_user", $formquestion, 'yes');
 	}
 
 	// Call Hook formConfirm
@@ -396,7 +531,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 	print '<div class="clearboth"></div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 
 	/*
@@ -500,12 +635,21 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 				}
 			}
 
-			// Refuse - Decline
-			if ($object->status >= $object::STATUS_VALIDATED && $object->status < $object::STATUS_REFUSED)
+			// Make offer - Refuse - Decline
+			if ($object->status >= $object::STATUS_VALIDATED && $object->status < $object::STATUS_CONTRACT_PROPOSED)
 			{
 				if ($permissiontoadd)
 				{
-					print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=confirm_decline&confirm=yes">'.$langs->trans("Decline").'</a>';
+					print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=makeofferordecline">'.$langs->trans("MakeOffer").' / '.$langs->trans("Decline").'</a>';
+				}
+			}
+
+			// Contract refused / accepted
+			if ($object->status == $object::STATUS_CONTRACT_PROPOSED)
+			{
+				if ($permissiontoadd)
+				{
+					print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=closeas">'.$langs->trans("Accept").' / '.$langs->trans("Decline").'</a>';
 				}
 			}
 
@@ -515,30 +659,34 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 				print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&socid='.$object->socid.'&action=clone&object=recruitmentcandidature">'.$langs->trans("ToClone").'</a>'."\n";
 			}
 
-			/*
-			if ($permissiontoadd)
+			// Button to convert into a user
+			if ($object->status == $object::STATUS_CONTRACT_SIGNED)
 			{
-				if ($object->status == $object::STATUS_ENABLED)
-				{
-					print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=disable">'.$langs->trans("Disable").'</a>'."\n";
-				}
-				else
-				{
-					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=enable">'.$langs->trans("Enable").'</a>'."\n";
+				if ($user->rights->user->user->creer) {
+					// TODO Check if a user already exists
+					$useralreadyexists = 0;
+					if (empty($useralreadyexists)) {
+						print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=create_user">'.$langs->trans("CreateDolibarrLogin").'</a></div>';
+					} else {
+						print '<div class="inline-block divButAction"><a class="butActionRefused" href="#">'.$langs->trans("CreateDolibarrLogin").'</a></div>';
+					}
+				} else {
+					print '<div class="inline-block divButAction"><font class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("CreateDolibarrLogin")."</font></div>";
 				}
 			}
+
+			// Cancel
 			if ($permissiontoadd)
 			{
 				if ($object->status == $object::STATUS_VALIDATED)
 				{
 					print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=close">'.$langs->trans("Cancel").'</a>'."\n";
 				}
-				else
+				elseif ($object->status == $object::STATUS_REFUSED || $object->status == $object::STATUS_CANCELED || $object->status == $object::STATUS_CONTRACT_REFUSED)
 				{
-					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=reopen">'.$langs->trans("Re-Open").'</a>'."\n";
+					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=confirm_reopen&confirm=yes&token='.newToken().'">'.$langs->trans("Re-Open").'</a>'."\n";
 				}
 			}
-			*/
 
 			// Delete (need delete permission, or if draft, just need create/modify permission)
 			if ($permissiontodelete || ($object->status == $object::STATUS_DRAFT && $permissiontoadd))
diff --git a/htdocs/recruitment/recruitmentcandidature_document.php b/htdocs/recruitment/recruitmentcandidature_document.php
index c051ee1f223..cd8e24118fc 100644
--- a/htdocs/recruitment/recruitmentcandidature_document.php
+++ b/htdocs/recruitment/recruitmentcandidature_document.php
@@ -186,7 +186,7 @@ if ($object->id)
 
 	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	$modulepart = 'recruitment';
 	$permission = $user->rights->recruitment->recruitmentjobposition->write;
diff --git a/htdocs/recruitment/recruitmentcandidature_list.php b/htdocs/recruitment/recruitmentcandidature_list.php
index 1354dd9611f..70d3bc3be4d 100644
--- a/htdocs/recruitment/recruitmentcandidature_list.php
+++ b/htdocs/recruitment/recruitmentcandidature_list.php
@@ -267,7 +267,7 @@ $sql .= $hookmanager->resPrint;
 
 /* If a group by is required
 $sql.= " GROUP BY ";
-foreach($object->fields as $key => $val)
+foreach ($object->fields as $key => $val)
 {
 	$sql.='t.'.$key.', ';
 }
@@ -277,9 +277,9 @@ if (! empty($extrafields->attributes[$object->table_element]['label'])) {
 }
 // Add where from hooks
 $parameters=array();
-$reshook=$hookmanager->executeHooks('printFieldListGroupBy',$parameters);    // Note that $action and $object may have been modified by hook
+$reshook=$hookmanager->executeHooks('printFieldListGroupBy', $parameters);    // Note that $action and $object may have been modified by hook
 $sql.=$hookmanager->resPrint;
-$sql=preg_replace('/,\s*$/','', $sql);
+$sql=preg_replace('/,\s*$/', '', $sql);
 */
 
 $sql .= $db->order($sortfield, $sortorder);
@@ -433,7 +433,7 @@ foreach ($object->fields as $key => $val)
 	if (!empty($arrayfields['t.'.$key]['checked']))
 	{
 		print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
-		if (is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
+		if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
 		elseif (strpos($val['type'], 'integer:') === 0) {
 			print $object->showInputField($val, $key, $search[$key], '', '', 'search_', 'maxwidth150', 1);
 		} elseif (!preg_match('/^(date|timestamp)/', $val['type'])) print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
diff --git a/htdocs/recruitment/recruitmentcandidature_note.php b/htdocs/recruitment/recruitmentcandidature_note.php
index 16931c34d92..c0673b35c52 100644
--- a/htdocs/recruitment/recruitmentcandidature_note.php
+++ b/htdocs/recruitment/recruitmentcandidature_note.php
@@ -155,7 +155,7 @@ if ($id > 0 || !empty($ref))
 
 	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 }
 
 // End of page
diff --git a/htdocs/recruitment/recruitmentindex.php b/htdocs/recruitment/recruitmentindex.php
index b866112bce6..a8649abbd21 100644
--- a/htdocs/recruitment/recruitmentindex.php
+++ b/htdocs/recruitment/recruitmentindex.php
@@ -114,7 +114,7 @@ if ($conf->use_javascript_ajax)
 		$listofstatus = array(0, 1, 3, 9);
 		foreach ($listofstatus as $status)
 		{
-			$dataseries[] = array(dol_html_entity_decode($staticrecruitmentjobposition->LibStatut($status, 1), ENT_QUOTES|ENT_HTML5), (isset($vals[$status]) ? (int) $vals[$status] : 0));
+			$dataseries[] = array(dol_html_entity_decode($staticrecruitmentjobposition->LibStatut($status, 1), ENT_QUOTES | ENT_HTML5), (isset($vals[$status]) ? (int) $vals[$status] : 0));
 			if ($status == RecruitmentJobPosition::STATUS_DRAFT) $colorseries[$status] = '-'.$badgeStatus0;
 			if ($status == RecruitmentJobPosition::STATUS_VALIDATED) $colorseries[$status] = $badgeStatus4;
 			if ($status == RecruitmentJobPosition::STATUS_RECRUITED) $colorseries[$status] = $badgeStatus6;
@@ -190,7 +190,7 @@ if ($conf->use_javascript_ajax)
 		$listofstatus = array(0, 1, 3, 5, 8, 9);
 		foreach ($listofstatus as $status)
 		{
-			$dataseries[] = array(dol_html_entity_decode($staticrecruitmentcandidature->LibStatut($status, 1), ENT_QUOTES|ENT_HTML5), (isset($vals[$status]) ? (int) $vals[$status] : 0));
+			$dataseries[] = array(dol_html_entity_decode($staticrecruitmentcandidature->LibStatut($status, 1), ENT_QUOTES | ENT_HTML5), (isset($vals[$status]) ? (int) $vals[$status] : 0));
 			if ($status == RecruitmentCandidature::STATUS_DRAFT) $colorseries[$status] = '-'.$badgeStatus0;
 			if ($status == RecruitmentCandidature::STATUS_VALIDATED) $colorseries[$status] = $badgeStatus1;
 			if ($status == RecruitmentCandidature::STATUS_CONTRACT_PROPOSED) $colorseries[$status] = $badgeStatus4;
@@ -323,12 +323,14 @@ $max = $conf->global->MAIN_SIZE_SHORTLIST_LIMIT;
 // Last modified job position
 if (!empty($conf->recruitment->enabled) && $user->rights->recruitment->recruitmentjobposition->read)
 {
-	$sql = "SELECT s.rowid, s.ref, s.label, s.date_creation, s.tms, s.status";
+	$sql = "SELECT s.rowid, s.ref, s.label, s.date_creation, s.tms, s.status, COUNT(rc.rowid) as nbapplications";
 	$sql .= " FROM ".MAIN_DB_PREFIX."recruitment_recruitmentjobposition as s";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."recruitment_recruitmentcandidature as rc ON rc.fk_recruitmentjobposition = s.rowid";
 	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	$sql .= " WHERE s.entity IN (".getEntity($staticrecruitmentjobposition->element).")";
 	if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
 	if ($socid)	$sql .= " AND s.fk_soc = $socid";
+	$sql .= " GROUP BY s.rowid, s.ref, s.label, s.date_creation, s.tms, s.status";
 	$sql .= " ORDER BY s.tms DESC";
 	$sql .= $db->plimit($max, 0);
 
@@ -344,6 +346,9 @@ if (!empty($conf->recruitment->enabled) && $user->rights->recruitment->recruitme
 		print '<th colspan="2">';
 		print $langs->trans("BoxTitleLatestModifiedJobPositions", $max);
 		print '</th>';
+		print '<th class="right">';
+		print $langs->trans("Applications");
+		print '</th>';
 		print '<th class="right" colspan="2"><a href="'.DOL_URL_ROOT.'/recruitment/recruitmentjobposition_list.php?sortfield=t.tms&sortorder=DESC">'.$langs->trans("FullList").'</th>';
 		print '</tr>';
 		if ($num)
@@ -361,6 +366,9 @@ if (!empty($conf->recruitment->enabled) && $user->rights->recruitment->recruitme
 				print '<td class="nowrap">'.$staticrecruitmentjobposition->getNomUrl(1, '').'</td>';
 				print '<td class="right nowrap">';
 				print "</td>";
+				print '<td class="right">';
+				print $objp->nbapplications;
+				print '</td>';
 				print '<td class="right nowrap">'.dol_print_date($db->jdate($objp->tms), 'day')."</td>";
 				print '<td class="right nowrap" width="16">';
 				print $staticrecruitmentjobposition->getLibStatut(3);
diff --git a/htdocs/recruitment/recruitmentjobposition_agenda.php b/htdocs/recruitment/recruitmentjobposition_agenda.php
index 43f9a2990c3..97ea279e8ae 100644
--- a/htdocs/recruitment/recruitmentjobposition_agenda.php
+++ b/htdocs/recruitment/recruitmentjobposition_agenda.php
@@ -152,15 +152,15 @@ if ($object->id > 0)
 	$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
 	*/
 	// Project
-	if (! empty($conf->projet->enabled))
+	if (!empty($conf->projet->enabled))
 	{
 		$langs->load("projects");
-		$morehtmlref .= $langs->trans('Project') . ' ';
+		$morehtmlref .= $langs->trans('Project').' ';
 		if ($permissiontoadd)
 		{
 			if ($action != 'classify')
 				//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
-			$morehtmlref .=' : ';
+			$morehtmlref .= ' : ';
 			if ($action == 'classify') {
 				//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
 				$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
@@ -170,10 +170,10 @@ if ($object->id > 0)
 				$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
 				$morehtmlref .= '</form>';
 			} else {
-				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
 			}
 		} else {
-			if (! empty($object->fk_project)) {
+			if (!empty($object->fk_project)) {
 				$proj = new Project($db);
 				$proj->fetch($object->fk_project);
 				$morehtmlref .= ': '.$proj->getNomUrl();
@@ -195,7 +195,7 @@ if ($object->id > 0)
 
 	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 
 
diff --git a/htdocs/recruitment/recruitmentjobposition_candidature.php b/htdocs/recruitment/recruitmentjobposition_applications.php
similarity index 82%
rename from htdocs/recruitment/recruitmentjobposition_candidature.php
rename to htdocs/recruitment/recruitmentjobposition_applications.php
index e5870f8b76c..381a3181485 100644
--- a/htdocs/recruitment/recruitmentjobposition_candidature.php
+++ b/htdocs/recruitment/recruitmentjobposition_applications.php
@@ -16,9 +16,9 @@
  */
 
 /**
- *   	\file       recruitmentjobposition_candidature.php
+ *   	\file       recruitmentjobposition_applications.php
  *		\ingroup    recruitment
- *		\brief      Page to see/add candidatures
+ *		\brief      Page to see/add applications of a job position
  */
 
 //if (! defined('NOREQUIREDB'))              define('NOREQUIREDB','1');					// Do not create database handler $db
@@ -214,7 +214,7 @@ if ($action == 'create')
 
 	print '</table>'."\n";
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div class="center">';
 	print '<input type="submit" class="button" name="add" value="'.dol_escape_htmltag($langs->trans("Create")).'">';
@@ -251,7 +251,7 @@ if (($id || $ref) && $action == 'edit')
 
 	print '</table>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div class="center"><input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
 	print ' &nbsp; <input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
@@ -382,7 +382,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 	print '<div class="clearboth"></div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 
 	/*
@@ -438,124 +438,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		print "</form>\n";
 	}
 
-
-	// Buttons for actions
-
-	if ($action != 'presend' && $action != 'editline') {
-		print '<div class="tabsAction">'."\n";
-		$parameters = array();
-		$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-		if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-
-		if (empty($reshook))
-		{
-			// Send
-			if (empty($user->socid)) {
-				print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a>'."\n";
-			}
-
-			// Back to draft
-			if ($object->status == $object::STATUS_VALIDATED)
-			{
-				if ($permissiontoadd)
-				{
-					print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=confirm_setdraft&confirm=yes">'.$langs->trans("SetToDraft").'</a>';
-				}
-			}
-
-			// Modify
-			if ($permissiontoadd)
-			{
-				print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit">'.$langs->trans("Modify").'</a>'."\n";
-			} else {
-				print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('Modify').'</a>'."\n";
-			}
-
-			// Validate
-			if ($object->status == $object::STATUS_DRAFT)
-			{
-				if ($permissiontoadd)
-				{
-					if (empty($object->table_element_line) || (is_array($object->lines) && count($object->lines) > 0))
-					{
-						print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=confirm_validate&confirm=yes">'.$langs->trans("Validate").'</a>';
-					} else {
-						$langs->load("errors");
-						print '<a class="butActionRefused" href="" title="'.$langs->trans("ErrorAddAtLeastOneLineFirst").'">'.$langs->trans("Validate").'</a>';
-					}
-				}
-			}
-
-			// Clone
-			if ($permissiontoadd)
-			{
-				print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&socid='.$object->socid.'&action=clone&object=recruitmentjobposition">'.$langs->trans("ToClone").'</a>'."\n";
-			}
-
-			/*
-			if ($permissiontoadd)
-			{
-				if ($object->status == $object::STATUS_ENABLED)
-				{
-					print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=disable">'.$langs->trans("Disable").'</a>'."\n";
-				}
-				else
-				{
-					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=enable">'.$langs->trans("Enable").'</a>'."\n";
-				}
-			}
-			if ($permissiontoadd)
-			{
-				if ($object->status == $object::STATUS_VALIDATED)
-				{
-					print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=close">'.$langs->trans("Cancel").'</a>'."\n";
-				}
-				else
-				{
-					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=reopen">'.$langs->trans("Re-Open").'</a>'."\n";
-				}
-			}
-			*/
-
-			// Delete (need delete permission, or if draft, just need create/modify permission)
-			if ($permissiontodelete || ($object->status == $object::STATUS_DRAFT && $permissiontoadd))
-			{
-				print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete&amp;token='.newToken().'">'.$langs->trans('Delete').'</a>'."\n";
-			} else {
-				print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('Delete').'</a>'."\n";
-			}
-		}
-		print '</div>'."\n";
-	}
-
-
-	// Select mail models is same action as presend
-	if (GETPOST('modelselected')) {
-		$action = 'presend';
-	}
-
-	if ($action != 'presend')
-	{
-		print '<div class="fichecenter"><div class="fichehalfleft">';
-		print '<a name="builddoc"></a>'; // ancre
-
-
-		print '</div><div class="fichehalfright"><div class="ficheaddleft">';
-
-
-		print '</div></div></div>';
-	}
-
-	//Select mail models is same action as presend
-	if (GETPOST('modelselected')) $action = 'presend';
-
-	// Presend form
-	$modelmail = 'recruitmentjobposition';
-	$defaulttopic = 'InformationMessage';
-	$diroutput = $conf->recruitment->dir_output;
-	$trackid = 'recruitmentjobposition'.$object->id;
-
-	include DOL_DOCUMENT_ROOT.'/core/tpl/card_presend.tpl.php';
+	print '<br>'.$langs->trans("FeatureNotYetAvailable");
 }
 
 // End of page
diff --git a/htdocs/recruitment/recruitmentjobposition_card.php b/htdocs/recruitment/recruitmentjobposition_card.php
index bb9d5235a35..7de9883ebca 100644
--- a/htdocs/recruitment/recruitmentjobposition_card.php
+++ b/htdocs/recruitment/recruitmentjobposition_card.php
@@ -228,7 +228,7 @@ if ($action == 'create')
 	if ($backtopageforcancel) print '<input type="hidden" name="backtopageforcancel" value="'.$backtopageforcancel.'">';
 
 	// Set some default values
-	if (! GETPOSTISSET('fk_user_recruiter')) $_POST['fk_user_recruiter'] = $user->id;
+	if (!GETPOSTISSET('fk_user_recruiter')) $_POST['fk_user_recruiter'] = $user->id;
 
 	print dol_get_fiche_head(array(), '');
 
@@ -242,7 +242,7 @@ if ($action == 'create')
 
 	print '</table>'."\n";
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div class="center">';
 	print '<input type="submit" class="button" name="add" value="'.dol_escape_htmltag($langs->trans("Create")).'">';
@@ -279,7 +279,7 @@ if (($id || $ref) && $action == 'edit')
 
 	print '</table>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div class="center"><input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
 	print ' &nbsp; <input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
@@ -357,27 +357,27 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
 	*/
 	// Project
-	if (! empty($conf->projet->enabled))
+	if (!empty($conf->projet->enabled))
 	{
 		$langs->load("projects");
-		$morehtmlref.=$langs->trans('Project') . ' ';
+		$morehtmlref .= $langs->trans('Project').' ';
 		if ($permissiontoadd)
 		{
-			if ($action != 'classify') $morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a>';
-			$morehtmlref.=' : ';
+			if ($action != 'classify') $morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a>';
+			$morehtmlref .= ' : ';
 			if ($action == 'classify') {
 				//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-				$morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-				$morehtmlref.='<input type="hidden" name="action" value="classin">';
-				$morehtmlref.='<input type="hidden" name="token" value="'.newToken().'">';
-				$morehtmlref.=$formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-				$morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-				$morehtmlref.='</form>';
+				$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+				$morehtmlref .= '<input type="hidden" name="action" value="classin">';
+				$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
+				$morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+				$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+				$morehtmlref .= '</form>';
 			} else {
-				$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
 			}
 		} else {
-			if (! empty($object->fk_project)) {
+			if (!empty($object->fk_project)) {
 				$proj = new Project($db);
 				$proj->fetch($object->fk_project);
 				$morehtmlref .= ': '.$proj->getNomUrl();
@@ -398,8 +398,8 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	print '<table class="border centpercent tableforfield">'."\n";
 
 	// Common attributes
-	$keyforbreak='description';	// We change column just after this field
-	unset($object->fields['fk_project']);				// Hide field already shown in banner
+	$keyforbreak = 'description'; // We change column just after this field
+	unset($object->fields['fk_project']); // Hide field already shown in banner
 	//unset($object->fields['fk_soc']);					// Hide field already shown in banner
 	include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_view.tpl.php';
 
@@ -412,7 +412,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 	print '<div class="clearboth"></div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 
 	/*
@@ -568,11 +568,11 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		// Documents
 		if ($includedocgeneration) {
 			$objref = dol_sanitizeFileName($object->ref);
-			$relativepath = $objref . '/' . $objref . '.pdf';
+			$relativepath = $objref.'/'.$objref.'.pdf';
 			$filedir = $conf->recruitment->dir_output.'/'.$object->element.'/'.$objref;
-			$urlsource = $_SERVER["PHP_SELF"] . "?id=" . $object->id;
-			$genallowed = $user->rights->recruitment->recruitmentjobposition->read;	// If you can read, you can build the PDF to read content
-			$delallowed = $user->rights->recruitment->recruitmentjobposition->write;	// If you can create/edit, you can remove a file on card
+			$urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
+			$genallowed = $user->rights->recruitment->recruitmentjobposition->read; // If you can read, you can build the PDF to read content
+			$delallowed = $user->rights->recruitment->recruitmentjobposition->write; // If you can create/edit, you can remove a file on card
 			print $formfile->showdocuments('recruitment:RecruitmentJobPosition', $object->element.'/'.$objref, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 1, 0, 0, 28, 0, '', '', '', $langs->defaultlang);
 		}
 
diff --git a/htdocs/recruitment/recruitmentjobposition_document.php b/htdocs/recruitment/recruitmentjobposition_document.php
index 7cdaf187a18..a9c06f57b95 100644
--- a/htdocs/recruitment/recruitmentjobposition_document.php
+++ b/htdocs/recruitment/recruitmentjobposition_document.php
@@ -137,15 +137,15 @@ if ($object->id)
 	 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
 	*/
 	// Project
-	if (! empty($conf->projet->enabled))
+	if (!empty($conf->projet->enabled))
 	{
 		$langs->load("projects");
-		$morehtmlref .= $langs->trans('Project') . ' ';
+		$morehtmlref .= $langs->trans('Project').' ';
 		if ($permissiontoadd)
 		{
 			if ($action != 'classify')
 				//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
-			$morehtmlref .=' : ';
+			$morehtmlref .= ' : ';
 			if ($action == 'classify') {
 				//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
 				$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
@@ -155,10 +155,10 @@ if ($object->id)
 				$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
 				$morehtmlref .= '</form>';
 			} else {
-				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
 			}
 		} else {
-			if (! empty($object->fk_project)) {
+			if (!empty($object->fk_project)) {
 				$proj = new Project($db);
 				$proj->fetch($object->fk_project);
 				$morehtmlref .= ': '.$proj->getNomUrl();
@@ -186,7 +186,7 @@ if ($object->id)
 
 	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	$modulepart = 'recruitment';
 	$permission = $user->rights->recruitment->recruitmentjobposition->write;
diff --git a/htdocs/recruitment/recruitmentjobposition_list.php b/htdocs/recruitment/recruitmentjobposition_list.php
index 03f558b3d4a..72349c94914 100644
--- a/htdocs/recruitment/recruitmentjobposition_list.php
+++ b/htdocs/recruitment/recruitmentjobposition_list.php
@@ -153,6 +153,7 @@ if (is_array($extrafields->attributes[$object->table_element]['label']) && count
 	}
 }
 $object->fields = dol_sort_array($object->fields, 'position');
+$arrayfields['nbapplications'] = array('label'=>'Applications', 'checked'=>1, 'enabled'=>1, 'position'=>90);
 $arrayfields = dol_sort_array($arrayfields, 'position');
 
 $permissiontoread = $user->rights->recruitment->recruitmentjobposition->read;
@@ -242,7 +243,9 @@ $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters, $object); // Note that $action and $object may have been modified by hook
 $sql .= preg_replace('/^,/', '', $hookmanager->resPrint);
 $sql = preg_replace('/,\s*$/', '', $sql);
+$sql .= ", COUNT(rc.rowid) as nbapplications";
 $sql .= " FROM ".MAIN_DB_PREFIX.$object->table_element." as t";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."recruitment_recruitmentcandidature as rc ON rc.fk_recruitmentjobposition = t.rowid";
 if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (t.rowid = ef.fk_object)";
 if ($object->ismultientitymanaged == 1) $sql .= " WHERE t.entity IN (".getEntity($object->element).")";
 else $sql .= " WHERE 1 = 1";
@@ -265,9 +268,9 @@ $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters, $object); // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
 
-/* If a group by is required
+/* If a group by is required */
 $sql.= " GROUP BY ";
-foreach($object->fields as $key => $val)
+foreach ($object->fields as $key => $val)
 {
 	$sql.='t.'.$key.', ';
 }
@@ -277,10 +280,9 @@ if (! empty($extrafields->attributes[$object->table_element]['label'])) {
 }
 // Add where from hooks
 $parameters=array();
-$reshook=$hookmanager->executeHooks('printFieldListGroupBy',$parameters);    // Note that $action and $object may have been modified by hook
+$reshook=$hookmanager->executeHooks('printFieldListGroupBy', $parameters);    // Note that $action and $object may have been modified by hook
 $sql.=$hookmanager->resPrint;
-$sql=preg_replace('/,\s*$/','', $sql);
-*/
+$sql=preg_replace('/,\s*$/', '', $sql);
 
 $sql .= $db->order($sortfield, $sortorder);
 
@@ -433,7 +435,7 @@ foreach ($object->fields as $key => $val)
 	if (!empty($arrayfields['t.'.$key]['checked']))
 	{
 		print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
-		if (is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
+		if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
 		elseif (strpos($val['type'], 'integer:') === 0) {
 			print $object->showInputField($val, $key, $search[$key], '', '', 'search_', 'maxwidth150', 1);
 		} elseif (!preg_match('/^(date|timestamp)/', $val['type'])) print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
@@ -442,11 +444,14 @@ foreach ($object->fields as $key => $val)
 }
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
-
 // Fields from hook
 $parameters = array('arrayfields'=>$arrayfields);
 $reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
+if (!empty($arrayfields['nbapplications']['checked']))
+{
+	print '<td class="liste_titre"></td>';
+}
 // Action column
 print '<td class="liste_titre maxwidthsearch">';
 $searchpicto = $form->showFilterButtons();
@@ -476,6 +481,10 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 $parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
 $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
+if (!empty($arrayfields['nbapplications']['checked']))
+{
+	print '<td class="liste_titre">'.$langs->trans("Applications").'</td>';
+}
 // Action column
 print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
 print '</tr>'."\n";
@@ -508,7 +517,7 @@ while ($i < ($limit ? min($num, $limit) : $num))
 	print '<tr class="oddeven">';
 	foreach ($object->fields as $key => $val)
 	{
-		$cssforfield = (empty($val['css']) ? '' : $val['css']);
+		$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
 		if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) $cssforfield .= ($cssforfield ? ' ' : '').'center';
 		elseif ($key == 'status') $cssforfield .= ($cssforfield ? ' ' : '').'center';
 
@@ -538,6 +547,10 @@ while ($i < ($limit ? min($num, $limit) : $num))
 	$parameters = array('arrayfields'=>$arrayfields, 'object'=>$object, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
 	$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
+	if (!empty($arrayfields['nbapplications']['checked']))
+	{
+		print '<td class="right">'.$obj->nbapplications.'</td>';
+	}
 	// Action column
 	print '<td class="nowrap center">';
 	if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
diff --git a/htdocs/recruitment/recruitmentjobposition_note.php b/htdocs/recruitment/recruitmentjobposition_note.php
index 8b9e0c4a7a9..2fe2f5a3257 100644
--- a/htdocs/recruitment/recruitmentjobposition_note.php
+++ b/htdocs/recruitment/recruitmentjobposition_note.php
@@ -110,15 +110,15 @@ if ($id > 0 || !empty($ref))
 	 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
 	*/
 	// Project
-	if (! empty($conf->projet->enabled))
+	if (!empty($conf->projet->enabled))
 	{
 		$langs->load("projects");
-		$morehtmlref .= $langs->trans('Project') . ' ';
+		$morehtmlref .= $langs->trans('Project').' ';
 		if ($permissiontoadd)
 		{
 			if ($action != 'classify')
 				//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
-			$morehtmlref .=' : ';
+			$morehtmlref .= ' : ';
 			if ($action == 'classify') {
 				//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
 				$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
@@ -128,10 +128,10 @@ if ($id > 0 || !empty($ref))
 				$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
 				$morehtmlref .= '</form>';
 			} else {
-				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
 			}
 		} else {
-			if (! empty($object->fk_project)) {
+			if (!empty($object->fk_project)) {
 				$proj = new Project($db);
 				$proj->fetch($object->fk_project);
 				$morehtmlref .= ': '.$proj->getNomUrl();
@@ -155,7 +155,7 @@ if ($id > 0 || !empty($ref))
 
 	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 }
 
 // End of page
diff --git a/htdocs/resource/agenda.php b/htdocs/resource/agenda.php
index ffc8fd50137..903a9653056 100644
--- a/htdocs/resource/agenda.php
+++ b/htdocs/resource/agenda.php
@@ -46,10 +46,10 @@ $backtopage = GETPOST('backtopage', 'alpha');
 
 if (GETPOST('actioncode', 'array'))
 {
-    $actioncode = GETPOST('actioncode', 'array', 3);
-    if (!count($actioncode)) $actioncode = '0';
+	$actioncode = GETPOST('actioncode', 'array', 3);
+	if (!count($actioncode)) $actioncode = '0';
 } else {
-    $actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT));
+	$actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT));
 }
 $search_agenda_label = GETPOST('search_agenda_label');
 
@@ -89,19 +89,19 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 
 if (empty($reshook))
 {
-    // Cancel
-    if (GETPOST('cancel', 'alpha') && !empty($backtopage))
-    {
-        header("Location: ".$backtopage);
-        exit;
-    }
+	// Cancel
+	if (GETPOST('cancel', 'alpha') && !empty($backtopage))
+	{
+		header("Location: ".$backtopage);
+		exit;
+	}
 
-    // Purge search criteria
-    if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
-    {
-        $actioncode = '';
-        $search_agenda_label = '';
-    }
+	// Purge search criteria
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
+	{
+		$actioncode = '';
+		$search_agenda_label = '';
+	}
 }
 
 
@@ -133,38 +133,38 @@ if ($object->id > 0)
 	$titre = $langs->trans("ResourceSingular");
 	print dol_get_fiche_head($head, 'agenda', $titre, -1, $picto);
 
-    $linkback = '<a href="'.DOL_URL_ROOT.'/resource/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+	$linkback = '<a href="'.DOL_URL_ROOT.'/resource/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-    $morehtmlref = '<div class="refidno">';
-    $morehtmlref .= '</div>';
+	$morehtmlref = '<div class="refidno">';
+	$morehtmlref .= '</div>';
 
-    $shownav = 1;
-    if ($user->socid && !in_array('resource', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav = 0;
+	$shownav = 1;
+	if ($user->socid && !in_array('resource', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav = 0;
 
-    dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
 
-    print '<div class="fichecenter">';
-    print '<div class="underbanner clearboth"></div>';
+	print '<div class="fichecenter">';
+	print '<div class="underbanner clearboth"></div>';
 
 	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
-    if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read)))
-    {
-    	$param = '&id='.$object->id.'&socid='.$socid;
-    	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
-    	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
+	if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read)))
+	{
+		$param = '&id='.$object->id.'&socid='.$socid;
+		if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
+		if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
 
 		print_barre_liste($langs->trans("ActionsOnResource"), 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', 0, -1, '', 0, $morehtmlcenter, '', 0, 1, 1);
 
-        // List of all actions
+		// List of all actions
 		$filters = array();
-        $filters['search_agenda_label'] = $search_agenda_label;
+		$filters['search_agenda_label'] = $search_agenda_label;
 
-        // TODO Replace this with same code than into list.php
-        show_actions_done($conf, $langs, $db, $object, null, 0, $actioncode, '', $filters, $sortfield, $sortorder);
-    }
+		// TODO Replace this with same code than into list.php
+		show_actions_done($conf, $langs, $db, $object, null, 0, $actioncode, '', $filters, $sortfield, $sortorder);
+	}
 }
 
 // End of page
diff --git a/htdocs/resource/card.php b/htdocs/resource/card.php
index c9c060c1cff..4a1e135f9e2 100644
--- a/htdocs/resource/card.php
+++ b/htdocs/resource/card.php
@@ -40,7 +40,7 @@ $cancel					= GETPOST('cancel', 'alpha');
 $ref					= GETPOST('ref', 'alpha');
 $description			= GETPOST('description', 'restricthtml');
 $confirm				= GETPOST('confirm', 'aZ09');
-$fk_code_type_resource  = GETPOST('fk_code_type_resource', 'alpha');
+$fk_code_type_resource = GETPOST('fk_code_type_resource', 'alpha');
 $country_id				= GETPOST('country_id', 'int');
 
 // Protection if external user
@@ -265,7 +265,7 @@ if ($action == 'create' || $object->fetch($id, $ref) > 0)
 
 		print '</table>';
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 		print '<div class="center">';
 		print '<input type="submit" class="button" name="save" value="'.$langs->trans($action == "create" ? "Create" : "Modify").'">';
@@ -340,7 +340,7 @@ if ($action == 'create' || $object->fetch($id, $ref) > 0)
 
 		print '<div class="clearboth"></div><br>';
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 	}
 
 
diff --git a/htdocs/resource/class/dolresource.class.php b/htdocs/resource/class/dolresource.class.php
index d392375fdd0..ef4252f41df 100644
--- a/htdocs/resource/class/dolresource.class.php
+++ b/htdocs/resource/class/dolresource.class.php
@@ -52,8 +52,8 @@ class Dolresource extends CommonObject
 	public $mandatory;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_user_create;
 
 	public $type_label;
@@ -63,75 +63,75 @@ class Dolresource extends CommonObject
 
 	public $oldcopy;
 
-    /**
-     *  Constructor
-     *
-     *  @param	DoliDb		$db      Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-    }
+	/**
+	 *  Constructor
+	 *
+	 *  @param	DoliDb		$db      Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
 
-    /**
-     *  Create object into database
-     *
-     *  @param	User    $user        User that creates
-     *  @param  int		$notrigger   0=launch triggers after, 1=disable triggers
-     *  @return int      		   	 <0 if KO, Id of created object if OK
-     */
-    public function create($user, $notrigger = 0)
-    {
-        global $conf, $langs, $hookmanager;
-        $error = 0;
+	/**
+	 *  Create object into database
+	 *
+	 *  @param	User    $user        User that creates
+	 *  @param  int		$notrigger   0=launch triggers after, 1=disable triggers
+	 *  @return int      		   	 <0 if KO, Id of created object if OK
+	 */
+	public function create($user, $notrigger = 0)
+	{
+		global $conf, $langs, $hookmanager;
+		$error = 0;
 
-    	// Clean parameters
+		// Clean parameters
 
-    	if (isset($this->ref)) $this->ref = trim($this->ref);
-    	if (isset($this->description)) $this->description = trim($this->description);
-        if (!is_numeric($this->country_id)) $this->country_id = 0;
-    	if (isset($this->fk_code_type_resource)) $this->fk_code_type_resource = trim($this->fk_code_type_resource);
-    	if (isset($this->note_public)) $this->note_public = trim($this->note_public);
-    	if (isset($this->note_private)) $this->note_private = trim($this->note_private);
+		if (isset($this->ref)) $this->ref = trim($this->ref);
+		if (isset($this->description)) $this->description = trim($this->description);
+		if (!is_numeric($this->country_id)) $this->country_id = 0;
+		if (isset($this->fk_code_type_resource)) $this->fk_code_type_resource = trim($this->fk_code_type_resource);
+		if (isset($this->note_public)) $this->note_public = trim($this->note_public);
+		if (isset($this->note_private)) $this->note_private = trim($this->note_private);
 
 
-    	// Insert request
-    	$sql = "INSERT INTO ".MAIN_DB_PREFIX.$this->table_element."(";
-    	$sql .= "entity,";
-    	$sql .= "ref,";
-    	$sql .= "description,";
-    	$sql .= "fk_country,";
-    	$sql .= "fk_code_type_resource,";
-    	$sql .= "note_public,";
-    	$sql .= "note_private";
-    	$sql .= ") VALUES (";
-    	$sql .= $conf->entity.", ";
-    	$sql .= " ".(!isset($this->ref) ? 'NULL' : "'".$this->db->escape($this->ref)."'").",";
-    	$sql .= " ".(!isset($this->description) ? 'NULL' : "'".$this->db->escape($this->description)."'").",";
-        $sql .= " ".($this->country_id > 0 ? $this->country_id : 'null').",";
-    	$sql .= " ".(!isset($this->fk_code_type_resource) ? 'NULL' : "'".$this->db->escape($this->fk_code_type_resource)."'").",";
-    	$sql .= " ".(!isset($this->note_public) ? 'NULL' : "'".$this->db->escape($this->note_public)."'").",";
-    	$sql .= " ".(!isset($this->note_private) ? 'NULL' : "'".$this->db->escape($this->note_private)."'");
-    	$sql .= ")";
+		// Insert request
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX.$this->table_element."(";
+		$sql .= "entity,";
+		$sql .= "ref,";
+		$sql .= "description,";
+		$sql .= "fk_country,";
+		$sql .= "fk_code_type_resource,";
+		$sql .= "note_public,";
+		$sql .= "note_private";
+		$sql .= ") VALUES (";
+		$sql .= $conf->entity.", ";
+		$sql .= " ".(!isset($this->ref) ? 'NULL' : "'".$this->db->escape($this->ref)."'").",";
+		$sql .= " ".(!isset($this->description) ? 'NULL' : "'".$this->db->escape($this->description)."'").",";
+		$sql .= " ".($this->country_id > 0 ? $this->country_id : 'null').",";
+		$sql .= " ".(!isset($this->fk_code_type_resource) ? 'NULL' : "'".$this->db->escape($this->fk_code_type_resource)."'").",";
+		$sql .= " ".(!isset($this->note_public) ? 'NULL' : "'".$this->db->escape($this->note_public)."'").",";
+		$sql .= " ".(!isset($this->note_private) ? 'NULL' : "'".$this->db->escape($this->note_private)."'");
+		$sql .= ")";
 
-    	$this->db->begin();
+		$this->db->begin();
 
-    	dol_syslog(get_class($this)."::create", LOG_DEBUG);
-    	$resql = $this->db->query($sql);
-    	if (!$resql) {
-    		$error++; $this->errors[] = "Error ".$this->db->lasterror();
-    	}
+		dol_syslog(get_class($this)."::create", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if (!$resql) {
+			$error++; $this->errors[] = "Error ".$this->db->lasterror();
+		}
 
-    	if (!$error)
-    	{
-    		$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);
-    	}
+		if (!$error)
+		{
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);
+		}
 
-    	if (!$error)
-    	{
-    		$action = 'create';
+		if (!$error)
+		{
+			$action = 'create';
 
-    		// Actions on extra fields
+			// Actions on extra fields
    			if (!$error)
    			{
    				$result = $this->insertExtraFields();
@@ -139,100 +139,100 @@ class Dolresource extends CommonObject
    				{
    					$error++;
    				}
-    		}
-    	}
+			}
+		}
 
-    	if (!$error && !$notrigger)
-    	{
-    		// Call trigger
-    		$result = $this->call_trigger('RESOURCE_CREATE', $user);
-    		if ($result < 0) $error++;
-    		// End call triggers
-    	}
+		if (!$error && !$notrigger)
+		{
+			// Call trigger
+			$result = $this->call_trigger('RESOURCE_CREATE', $user);
+			if ($result < 0) $error++;
+			// End call triggers
+		}
 
-    	// Commit or rollback
-    	if ($error)
-    	{
-    		foreach ($this->errors as $errmsg)
-    		{
-    			dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
-    			$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
-    		}
-    		$this->db->rollback();
-    		return -1 * $error;
-    	} else {
-    		$this->db->commit();
-    		return $this->id;
-    	}
-    }
+		// Commit or rollback
+		if ($error)
+		{
+			foreach ($this->errors as $errmsg)
+			{
+				dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
+			}
+			$this->db->rollback();
+			return -1 * $error;
+		} else {
+			$this->db->commit();
+			return $this->id;
+		}
+	}
 
-    /**
-     *    Load object in memory from database
-     *
-     *    @param    int		$id     Id of object
-     *    @param	string	$ref	Ref of object
-     *    @return   int         	<0 if KO, >0 if OK
-     */
-    public function fetch($id, $ref = '')
-    {
-    	global $langs;
-    	$sql = "SELECT";
-    	$sql .= " t.rowid,";
-    	$sql .= " t.entity,";
-    	$sql .= " t.ref,";
-    	$sql .= " t.description,";
+	/**
+	 *    Load object in memory from database
+	 *
+	 *    @param    int		$id     Id of object
+	 *    @param	string	$ref	Ref of object
+	 *    @return   int         	<0 if KO, >0 if OK
+	 */
+	public function fetch($id, $ref = '')
+	{
+		global $langs;
+		$sql = "SELECT";
+		$sql .= " t.rowid,";
+		$sql .= " t.entity,";
+		$sql .= " t.ref,";
+		$sql .= " t.description,";
 		$sql .= " t.fk_country,";
-    	$sql .= " t.fk_code_type_resource,";
-    	$sql .= " t.note_public,";
-    	$sql .= " t.note_private,";
-    	$sql .= " t.tms,";
-    	$sql .= " ty.label as type_label";
-    	$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element." as t";
-    	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_type_resource as ty ON ty.code=t.fk_code_type_resource";
-    	if ($id) $sql .= " WHERE t.rowid = ".$this->db->escape($id);
-    	else $sql .= " WHERE t.ref = '".$this->db->escape($ref)."'";
+		$sql .= " t.fk_code_type_resource,";
+		$sql .= " t.note_public,";
+		$sql .= " t.note_private,";
+		$sql .= " t.tms,";
+		$sql .= " ty.label as type_label";
+		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element." as t";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_type_resource as ty ON ty.code=t.fk_code_type_resource";
+		if ($id) $sql .= " WHERE t.rowid = ".$this->db->escape($id);
+		else $sql .= " WHERE t.ref = '".$this->db->escape($ref)."'";
 
-    	dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
-    	$resql = $this->db->query($sql);
-    	if ($resql)
-    	{
-    		if ($this->db->num_rows($resql))
-    		{
-    			$obj = $this->db->fetch_object($resql);
+		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			if ($this->db->num_rows($resql))
+			{
+				$obj = $this->db->fetch_object($resql);
 
-    			$this->id = $obj->rowid;
-    			$this->entity = $obj->entity;
-    			$this->ref = $obj->ref;
-    			$this->description				= $obj->description;
-                $this->country_id = $obj->fk_country;
-    			$this->fk_code_type_resource = $obj->fk_code_type_resource;
-    			$this->note_public				= $obj->note_public;
-    			$this->note_private = $obj->note_private;
-    			$this->type_label = $obj->type_label;
+				$this->id = $obj->rowid;
+				$this->entity = $obj->entity;
+				$this->ref = $obj->ref;
+				$this->description				= $obj->description;
+				$this->country_id = $obj->fk_country;
+				$this->fk_code_type_resource = $obj->fk_code_type_resource;
+				$this->note_public				= $obj->note_public;
+				$this->note_private = $obj->note_private;
+				$this->type_label = $obj->type_label;
 
-    			// Retrieve all extrafield
-    			// fetch optionals attributes and labels
-    			$this->fetch_optionals();
-    		}
-    		$this->db->free($resql);
+				// Retrieve all extrafield
+				// fetch optionals attributes and labels
+				$this->fetch_optionals();
+			}
+			$this->db->free($resql);
 
-    		return $this->id;
-    	} else {
-    		$this->error = "Error ".$this->db->lasterror();
-    		dol_syslog(get_class($this)."::fetch ".$this->error, LOG_ERR);
-    		return -1;
-    	}
-    }
+			return $this->id;
+		} else {
+			$this->error = "Error ".$this->db->lasterror();
+			dol_syslog(get_class($this)."::fetch ".$this->error, LOG_ERR);
+			return -1;
+		}
+	}
 
 
-    /**
-     *  Update object into database
-     *
-     *  @param	User	$user        User that modifies
-     *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
-     *  @return int     		   	 <0 if KO, >0 if OK
-     */
-    public function update($user = null, $notrigger = 0)
+	/**
+	 *  Update object into database
+	 *
+	 *  @param	User	$user        User that modifies
+	 *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
+	 *  @return int     		   	 <0 if KO, >0 if OK
+	 */
+	public function update($user = null, $notrigger = 0)
 	{
 		global $conf, $langs, $hookmanager;
 		$error = 0;
@@ -241,7 +241,7 @@ class Dolresource extends CommonObject
 		if (isset($this->ref)) $this->ref = trim($this->ref);
 		if (isset($this->fk_code_type_resource)) $this->fk_code_type_resource = trim($this->fk_code_type_resource);
 		if (isset($this->description)) $this->description = trim($this->description);
-        if (!is_numeric($this->country_id)) $this->country_id = 0;
+		if (!is_numeric($this->country_id)) $this->country_id = 0;
 
 		if (empty($this->oldcopy))
 		{
@@ -327,19 +327,19 @@ class Dolresource extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *    Load object in memory from database
-     *
-     *    @param      int	$id          id object
-     *    @return     int         <0 if KO, >0 if OK
-     */
-    public function fetch_element_resource($id)
-    {
-        // phpcs:enable
-    	global $langs;
-    	$sql = "SELECT";
-    	$sql .= " t.rowid,";
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *    Load object in memory from database
+	 *
+	 *    @param      int	$id          id object
+	 *    @return     int         <0 if KO, >0 if OK
+	 */
+	public function fetch_element_resource($id)
+	{
+		// phpcs:enable
+		global $langs;
+		$sql = "SELECT";
+		$sql .= " t.rowid,";
    		$sql .= " t.resource_id,";
 		$sql .= " t.resource_type,";
 		$sql .= " t.element_id,";
@@ -349,24 +349,24 @@ class Dolresource extends CommonObject
 		$sql .= " t.fk_user_create,";
 		$sql .= " t.tms";
 		$sql .= " FROM ".MAIN_DB_PREFIX."element_resources as t";
-    	$sql .= " WHERE t.rowid = ".$this->db->escape($id);
+		$sql .= " WHERE t.rowid = ".$this->db->escape($id);
 
-    	dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
-    	$resql = $this->db->query($sql);
-    	if ($resql)
-    	{
-    		if ($this->db->num_rows($resql))
-    		{
-    			$obj = $this->db->fetch_object($resql);
+		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			if ($this->db->num_rows($resql))
+			{
+				$obj = $this->db->fetch_object($resql);
 
-    			$this->id = $obj->rowid;
-    			$this->resource_id = $obj->resource_id;
-    			$this->resource_type	= $obj->resource_type;
-    			$this->element_id = $obj->element_id;
-    			$this->element_type		= $obj->element_type;
-    			$this->busy = $obj->busy;
-    			$this->mandatory = $obj->mandatory;
-    			$this->fk_user_create = $obj->fk_user_create;
+				$this->id = $obj->rowid;
+				$this->resource_id = $obj->resource_id;
+				$this->resource_type	= $obj->resource_type;
+				$this->element_id = $obj->element_id;
+				$this->element_type		= $obj->element_type;
+				$this->busy = $obj->busy;
+				$this->mandatory = $obj->mandatory;
+				$this->fk_user_create = $obj->fk_user_create;
 
 				if ($obj->resource_id && $obj->resource_type) {
 					$this->objresource = fetchObjectByElement($obj->resource_id, $obj->resource_type);
@@ -374,27 +374,27 @@ class Dolresource extends CommonObject
 				if ($obj->element_id && $obj->element_type) {
 					$this->objelement = fetchObjectByElement($obj->element_id, $obj->element_type);
 				}
-    		}
-    		$this->db->free($resql);
+			}
+			$this->db->free($resql);
 
-    		return $this->id;
-    	} else {
-    		$this->error = "Error ".$this->db->lasterror();
-    		return -1;
-    	}
-    }
+			return $this->id;
+		} else {
+			$this->error = "Error ".$this->db->lasterror();
+			return -1;
+		}
+	}
 
-    /**
-     *    Delete a resource object
-     *
-     *    @param	int		$rowid			Id of resource line to delete
-     *    @param	int		$notrigger		Disable all triggers
-     *    @return   int						>0 if OK, <0 if KO
-     */
-    public function delete($rowid, $notrigger = 0)
+	/**
+	 *    Delete a resource object
+	 *
+	 *    @param	int		$rowid			Id of resource line to delete
+	 *    @param	int		$notrigger		Disable all triggers
+	 *    @return   int						>0 if OK, <0 if KO
+	 */
+	public function delete($rowid, $notrigger = 0)
 	{
 		global $user, $langs, $conf;
-        require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 		$error = 0;
 
@@ -467,108 +467,108 @@ class Dolresource extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *	Load resource objects into $this->lines
-     *
-     *  @param	string		$sortorder    sort order
-     *  @param	string		$sortfield    sort field
-     *  @param	int			$limit		  limit page
-     *  @param	int			$offset    	  page
-     *  @param	array		$filter    	  filter output
-     *  @return int          	<0 if KO, >0 if OK
-     */
-    public function fetch_all($sortorder, $sortfield, $limit, $offset, $filter = '')
-    {
-        // phpcs:enable
-    	global $conf;
-
-    	require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-    	$extrafields = new ExtraFields($this->db);
-
-    	$sql = "SELECT ";
-    	$sql .= " t.rowid,";
-    	$sql .= " t.entity,";
-    	$sql .= " t.ref,";
-    	$sql .= " t.description,";
-    	$sql .= " t.fk_code_type_resource,";
-    	$sql .= " t.tms,";
-    	// Add fields from extrafields
-    	if (!empty($extrafields->attributes[$this->table_element]['label']))
-    		foreach ($extrafields->attributes[$this->table_element]['label'] as $key => $val) $sql .= ($extrafields->attributes[$this->table_element]['type'][$key] != 'separate' ? "ef.".$key.' as options_'.$key.', ' : '');
-    	$sql .= " ty.label as type_label";
-    	$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element." as t";
-    	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_type_resource as ty ON ty.code=t.fk_code_type_resource";
-    	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$this->table_element."_extrafields as ef ON ef.fk_object=t.rowid";
-    	$sql .= " WHERE t.entity IN (".getEntity('resource').")";
-    	// Manage filter
-    	if (!empty($filter)) {
-    		foreach ($filter as $key => $value) {
-    			if (strpos($key, 'date')) {
-    				$sql .= ' AND '.$key.' = \''.$this->db->idate($value).'\'';
-    			} elseif (strpos($key, 'ef.') !== false) {
-    				$sql .= $value;
-    			} else {
-    				$sql .= ' AND '.$key.' LIKE \'%'.$this->db->escape($value).'%\'';
-    			}
-    		}
-    	}
-    	$sql .= $this->db->order($sortfield, $sortorder);
-        $this->num_all = 0;
-        if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
-        {
-            $result = $this->db->query($sql);
-            $this->num_all = $this->db->num_rows($result);
-        }
-    	if ($limit) $sql .= $this->db->plimit($limit, $offset);
-    	dol_syslog(get_class($this)."::fetch_all", LOG_DEBUG);
-
-        $this->lines = array();
-    	$resql = $this->db->query($sql);
-    	if ($resql)
-    	{
-    		$num = $this->db->num_rows($resql);
-    		if ($num)
-    		{
-    			while ($obj = $this->db->fetch_object($resql))
-    			{
-    				$line = new Dolresource($this->db);
-    				$line->id = $obj->rowid;
-    				$line->ref = $obj->ref;
-    				$line->description = $obj->description;
-                    $line->country_id = $obj->fk_country;
-    				$line->fk_code_type_resource = $obj->fk_code_type_resource;
-    				$line->type_label = $obj->type_label;
-
-    				// fetch optionals attributes and labels
-
-    				$line->fetch_optionals();
-
-    				$this->lines[] = $line;
-    			}
-    			$this->db->free($resql);
-    		}
-    		return $num;
-    	} else {
-    		$this->error = $this->db->lasterror();
-    		return -1;
-    	}
-    }
-
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-     /**
-     *	Load all objects into $this->lines
-     *
-     *  @param	string		$sortorder    sort order
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *	Load resource objects into $this->lines
+	 *
+	 *  @param	string		$sortorder    sort order
 	 *  @param	string		$sortfield    sort field
 	 *  @param	int			$limit		  limit page
 	 *  @param	int			$offset    	  page
 	 *  @param	array		$filter    	  filter output
 	 *  @return int          	<0 if KO, >0 if OK
-     */
-    public function fetch_all_resources($sortorder, $sortfield, $limit, $offset, $filter = '')
-    {
-        // phpcs:enable
+	 */
+	public function fetch_all($sortorder, $sortfield, $limit, $offset, $filter = '')
+	{
+		// phpcs:enable
+		global $conf;
+
+		require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+		$extrafields = new ExtraFields($this->db);
+
+		$sql = "SELECT ";
+		$sql .= " t.rowid,";
+		$sql .= " t.entity,";
+		$sql .= " t.ref,";
+		$sql .= " t.description,";
+		$sql .= " t.fk_code_type_resource,";
+		$sql .= " t.tms,";
+		// Add fields from extrafields
+		if (!empty($extrafields->attributes[$this->table_element]['label']))
+			foreach ($extrafields->attributes[$this->table_element]['label'] as $key => $val) $sql .= ($extrafields->attributes[$this->table_element]['type'][$key] != 'separate' ? "ef.".$key.' as options_'.$key.', ' : '');
+		$sql .= " ty.label as type_label";
+		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element." as t";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_type_resource as ty ON ty.code=t.fk_code_type_resource";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$this->table_element."_extrafields as ef ON ef.fk_object=t.rowid";
+		$sql .= " WHERE t.entity IN (".getEntity('resource').")";
+		// Manage filter
+		if (!empty($filter)) {
+			foreach ($filter as $key => $value) {
+				if (strpos($key, 'date')) {
+					$sql .= ' AND '.$key.' = \''.$this->db->idate($value).'\'';
+				} elseif (strpos($key, 'ef.') !== false) {
+					$sql .= $value;
+				} else {
+					$sql .= ' AND '.$key.' LIKE \'%'.$this->db->escape($value).'%\'';
+				}
+			}
+		}
+		$sql .= $this->db->order($sortfield, $sortorder);
+		$this->num_all = 0;
+		if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
+		{
+			$result = $this->db->query($sql);
+			$this->num_all = $this->db->num_rows($result);
+		}
+		if ($limit) $sql .= $this->db->plimit($limit, $offset);
+		dol_syslog(get_class($this)."::fetch_all", LOG_DEBUG);
+
+		$this->lines = array();
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$num = $this->db->num_rows($resql);
+			if ($num)
+			{
+				while ($obj = $this->db->fetch_object($resql))
+				{
+					$line = new Dolresource($this->db);
+					$line->id = $obj->rowid;
+					$line->ref = $obj->ref;
+					$line->description = $obj->description;
+					$line->country_id = $obj->fk_country;
+					$line->fk_code_type_resource = $obj->fk_code_type_resource;
+					$line->type_label = $obj->type_label;
+
+					// fetch optionals attributes and labels
+
+					$line->fetch_optionals();
+
+					$this->lines[] = $line;
+				}
+				$this->db->free($resql);
+			}
+			return $num;
+		} else {
+			$this->error = $this->db->lasterror();
+			return -1;
+		}
+	}
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	 /**
+	  *	Load all objects into $this->lines
+	  *
+	  *  @param	string		$sortorder    sort order
+	  *  @param	string		$sortfield    sort field
+	  *  @param	int			$limit		  limit page
+	  *  @param	int			$offset    	  page
+	  *  @param	array		$filter    	  filter output
+	  *  @return int          	<0 if KO, >0 if OK
+	  */
+	public function fetch_all_resources($sortorder, $sortfield, $limit, $offset, $filter = '')
+	{
+		// phpcs:enable
    		global $conf;
    		$sql = "SELECT ";
    		$sql .= " t.rowid,";
@@ -593,7 +593,7 @@ class Dolresource extends CommonObject
    				}
    			}
    		}
-    	$sql .= $this->db->order($sortfield, $sortorder);
+		$sql .= $this->db->order($sortfield, $sortorder);
    		if ($limit) $sql .= $this->db->plimit($limit + 1, $offset);
    		dol_syslog(get_class($this)."::fetch_all", LOG_DEBUG);
 
@@ -619,7 +619,7 @@ class Dolresource extends CommonObject
 						$line->objresource = fetchObjectByElement($obj->resource_id, $obj->resource_type);
 					if ($obj->element_id && $obj->element_type)
 						$line->objelement = fetchObjectByElement($obj->element_id, $obj->element_type);
-        			$this->lines[] = $line;
+					$this->lines[] = $line;
    				}
    				$this->db->free($resql);
    			}
@@ -628,119 +628,119 @@ class Dolresource extends CommonObject
    			$this->error = $this->db->lasterror();
    			return -1;
    		}
-    }
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *	Load all objects into $this->lines
-     *
-     *  @param	string		$sortorder    sort order
-     *  @param	string		$sortfield    sort field
-     *  @param	int			$limit		  limit page
-     *  @param	int			$offset    	  page
-     *  @param	array		$filter    	  filter output
-     *  @return int          	<0 if KO, >0 if OK
-     */
-    public function fetch_all_used($sortorder, $sortfield, $limit, $offset = 1, $filter = '')
-    {
-        // phpcs:enable
-    	global $conf;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *	Load all objects into $this->lines
+	 *
+	 *  @param	string		$sortorder    sort order
+	 *  @param	string		$sortfield    sort field
+	 *  @param	int			$limit		  limit page
+	 *  @param	int			$offset    	  page
+	 *  @param	array		$filter    	  filter output
+	 *  @return int          	<0 if KO, >0 if OK
+	 */
+	public function fetch_all_used($sortorder, $sortfield, $limit, $offset = 1, $filter = '')
+	{
+		// phpcs:enable
+		global $conf;
 
-    	if (!$sortorder) $sortorder = "ASC";
-    	if (!$sortfield) $sortfield = "t.rowid";
+		if (!$sortorder) $sortorder = "ASC";
+		if (!$sortfield) $sortfield = "t.rowid";
 
-    	$sql = "SELECT ";
-    	$sql .= " t.rowid,";
-    	$sql .= " t.resource_id,";
-    	$sql .= " t.resource_type,";
-    	$sql .= " t.element_id,";
-    	$sql .= " t.element_type,";
-    	$sql .= " t.busy,";
-    	$sql .= " t.mandatory,";
-    	$sql .= " t.fk_user_create,";
-    	$sql .= " t.tms";
-    	$sql .= ' FROM '.MAIN_DB_PREFIX.'element_resources as t ';
-    	$sql .= " WHERE t.entity IN (".getEntity('resource').")";
+		$sql = "SELECT ";
+		$sql .= " t.rowid,";
+		$sql .= " t.resource_id,";
+		$sql .= " t.resource_type,";
+		$sql .= " t.element_id,";
+		$sql .= " t.element_type,";
+		$sql .= " t.busy,";
+		$sql .= " t.mandatory,";
+		$sql .= " t.fk_user_create,";
+		$sql .= " t.tms";
+		$sql .= ' FROM '.MAIN_DB_PREFIX.'element_resources as t ';
+		$sql .= " WHERE t.entity IN (".getEntity('resource').")";
 
-    	//Manage filter
-    	if (!empty($filter)) {
-    		foreach ($filter as $key => $value) {
-    			if (strpos($key, 'date')) {
-    				$sql .= ' AND '.$key.' = \''.$this->db->idate($value).'\'';
-    			} else {
-    				$sql .= ' AND '.$key.' LIKE \'%'.$this->db->escape($value).'%\'';
-    			}
-    		}
-    	}
-    	$sql .= $this->db->order($sortfield, $sortorder);
-    	if ($limit) $sql .= $this->db->plimit($limit + 1, $offset);
-    	dol_syslog(get_class($this)."::fetch_all", LOG_DEBUG);
+		//Manage filter
+		if (!empty($filter)) {
+			foreach ($filter as $key => $value) {
+				if (strpos($key, 'date')) {
+					$sql .= ' AND '.$key.' = \''.$this->db->idate($value).'\'';
+				} else {
+					$sql .= ' AND '.$key.' LIKE \'%'.$this->db->escape($value).'%\'';
+				}
+			}
+		}
+		$sql .= $this->db->order($sortfield, $sortorder);
+		if ($limit) $sql .= $this->db->plimit($limit + 1, $offset);
+		dol_syslog(get_class($this)."::fetch_all", LOG_DEBUG);
 
-    	$resql = $this->db->query($sql);
-    	if ($resql)
-    	{
-    		$num = $this->db->num_rows($resql);
-    		if ($num)
-    		{
-    			$this->lines = array();
-    			while ($obj = $this->db->fetch_object($resql))
-    			{
-    				$line = new Dolresource($this->db);
-    				$line->id = $obj->rowid;
-    				$line->resource_id = $obj->resource_id;
-    				$line->resource_type	= $obj->resource_type;
-    				$line->element_id = $obj->element_id;
-    				$line->element_type		= $obj->element_type;
-    				$line->busy = $obj->busy;
-    				$line->mandatory = $obj->mandatory;
-    				$line->fk_user_create = $obj->fk_user_create;
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$num = $this->db->num_rows($resql);
+			if ($num)
+			{
+				$this->lines = array();
+				while ($obj = $this->db->fetch_object($resql))
+				{
+					$line = new Dolresource($this->db);
+					$line->id = $obj->rowid;
+					$line->resource_id = $obj->resource_id;
+					$line->resource_type	= $obj->resource_type;
+					$line->element_id = $obj->element_id;
+					$line->element_type		= $obj->element_type;
+					$line->busy = $obj->busy;
+					$line->mandatory = $obj->mandatory;
+					$line->fk_user_create = $obj->fk_user_create;
 
-    				$this->lines[] = fetchObjectByElement($obj->resource_id, $obj->resource_type);
-    			}
-    			$this->db->free($resql);
-    		}
-    		return $num;
-    	} else {
-    		$this->error = $this->db->lasterror();
-    		return -1;
-    	}
-    }
+					$this->lines[] = fetchObjectByElement($obj->resource_id, $obj->resource_type);
+				}
+				$this->db->free($resql);
+			}
+			return $num;
+		} else {
+			$this->error = $this->db->lasterror();
+			return -1;
+		}
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * Fetch all resources available, declared by modules
-     * Load available resource in array $this->available_resources
-     *
-     * @return int 	number of available resources declared by modules
-     * @deprecated, remplaced by hook getElementResources
-     * @see getElementResources()
-     */
-    public function fetch_all_available()
-    {
-        // phpcs:enable
-    	global $conf;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Fetch all resources available, declared by modules
+	 * Load available resource in array $this->available_resources
+	 *
+	 * @return int 	number of available resources declared by modules
+	 * @deprecated, remplaced by hook getElementResources
+	 * @see getElementResources()
+	 */
+	public function fetch_all_available()
+	{
+		// phpcs:enable
+		global $conf;
 
-    	if (!empty($conf->modules_parts['resources']))
-    	{
-    		$this->available_resources = (array) $conf->modules_parts['resources'];
+		if (!empty($conf->modules_parts['resources']))
+		{
+			$this->available_resources = (array) $conf->modules_parts['resources'];
 
-    		return count($this->available_resources);
-    	}
-    	return 0;
-    }
+			return count($this->available_resources);
+		}
+		return 0;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Update element resource into database
-     *
-     *  @param	User	$user        User that modifies
-     *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
-     *  @return int     		   	 <0 if KO, >0 if OK
-     */
-    public function update_element_resource($user = null, $notrigger = 0)
-    {
-        // phpcs:enable
-    	global $conf, $langs;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Update element resource into database
+	 *
+	 *  @param	User	$user        User that modifies
+	 *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
+	 *  @return int     		   	 <0 if KO, >0 if OK
+	 */
+	public function update_element_resource($user = null, $notrigger = 0)
+	{
+		// phpcs:enable
+		global $conf, $langs;
 		$error = 0;
 
 		// Clean parameters
@@ -751,8 +751,8 @@ class Dolresource extends CommonObject
 		if (isset($this->busy)) $this->busy = trim($this->busy);
 		if (isset($this->mandatory)) $this->mandatory = trim($this->mandatory);
 
-        // Update request
-        $sql = "UPDATE ".MAIN_DB_PREFIX."element_resources SET";
+		// Update request
+		$sql = "UPDATE ".MAIN_DB_PREFIX."element_resources SET";
 		$sql .= " resource_id=".(isset($this->resource_id) ? "'".$this->db->escape($this->resource_id)."'" : "null").",";
 		$sql .= " resource_type=".(isset($this->resource_type) ? "'".$this->db->escape($this->resource_type)."'" : "null").",";
 		$sql .= " element_id=".(isset($this->element_id) ? $this->element_id : "null").",";
@@ -761,32 +761,32 @@ class Dolresource extends CommonObject
 		$sql .= " mandatory=".(isset($this->mandatory) ? $this->mandatory : "null").",";
 		$sql .= " tms=".(dol_strlen($this->tms) != 0 ? "'".$this->db->idate($this->tms)."'" : 'null')."";
 
-        $sql .= " WHERE rowid=".$this->id;
+		$sql .= " WHERE rowid=".$this->id;
 
 		$this->db->begin();
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-    	if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+		$resql = $this->db->query($sql);
+		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
 		if (!$error)
 		{
 			if (!$notrigger)
 			{
-                // Call trigger
-                $result = $this->call_trigger('RESOURCE_MODIFY', $user);
-                if ($result < 0) $error++;
-                // End call triggers
-	    	}
+				// Call trigger
+				$result = $this->call_trigger('RESOURCE_MODIFY', $user);
+				if ($result < 0) $error++;
+				// End call triggers
+			}
 		}
 
-        // Commit or rollback
+		// Commit or rollback
 		if ($error)
 		{
 			foreach ($this->errors as $errmsg)
 			{
-	            dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
-	            $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
+				dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
 			return -1 * $error;
@@ -794,201 +794,201 @@ class Dolresource extends CommonObject
 			$this->db->commit();
 			return 1;
 		}
-    }
+	}
 
 
-    /**
-     * Return an array with resources linked to the element
-     *
-     * @param string    $element        Element
-     * @param int       $element_id     Id
-     * @param string    $resource_type  Type
-     * @return array                    Aray of resources
-     */
-    public function getElementResources($element, $element_id, $resource_type = '')
-    {
-	    $resources = array();
+	/**
+	 * Return an array with resources linked to the element
+	 *
+	 * @param string    $element        Element
+	 * @param int       $element_id     Id
+	 * @param string    $resource_type  Type
+	 * @return array                    Aray of resources
+	 */
+	public function getElementResources($element, $element_id, $resource_type = '')
+	{
+		$resources = array();
 
-	    // Links beetween objects are stored in this table
-	    $sql = 'SELECT rowid, resource_id, resource_type, busy, mandatory';
-	    $sql .= ' FROM '.MAIN_DB_PREFIX.'element_resources';
-	    $sql .= " WHERE element_id=".$element_id." AND element_type='".$this->db->escape($element)."'";
-	    if ($resource_type)
-	    	$sql .= " AND resource_type LIKE '%".$this->db->escape($resource_type)."%'";
-	    $sql .= ' ORDER BY resource_type';
+		// Links beetween objects are stored in this table
+		$sql = 'SELECT rowid, resource_id, resource_type, busy, mandatory';
+		$sql .= ' FROM '.MAIN_DB_PREFIX.'element_resources';
+		$sql .= " WHERE element_id=".$element_id." AND element_type='".$this->db->escape($element)."'";
+		if ($resource_type)
+			$sql .= " AND resource_type LIKE '%".$this->db->escape($resource_type)."%'";
+		$sql .= ' ORDER BY resource_type';
 
-	    dol_syslog(get_class($this)."::getElementResources", LOG_DEBUG);
+		dol_syslog(get_class($this)."::getElementResources", LOG_DEBUG);
 
-        $resources = array();
-	    $resql = $this->db->query($sql);
-	    if ($resql)
-	    {
-	    	$num = $this->db->num_rows($resql);
-	    	$i = 0;
-	    	while ($i < $num)
-	    	{
-	    		$obj = $this->db->fetch_object($resql);
+		$resources = array();
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$num = $this->db->num_rows($resql);
+			$i = 0;
+			while ($i < $num)
+			{
+				$obj = $this->db->fetch_object($resql);
 
-	    		$resources[$i] = array(
-	    			'rowid' => $obj->rowid,
-	    			'resource_id' => $obj->resource_id,
-	    			'resource_type'=>$obj->resource_type,
-	    			'busy'=>$obj->busy,
-	    			'mandatory'=>$obj->mandatory
-	    		);
-	    		$i++;
-	    	}
-	    }
+				$resources[$i] = array(
+					'rowid' => $obj->rowid,
+					'resource_id' => $obj->resource_id,
+					'resource_type'=>$obj->resource_type,
+					'busy'=>$obj->busy,
+					'mandatory'=>$obj->mandatory
+				);
+				$i++;
+			}
+		}
 
-	    return $resources;
-    }
+		return $resources;
+	}
 
-    /**
-     *  Return an int number of resources linked to the element
-     *
-     *  @param		string	$element		Element type
-     *  @param		int		$element_id		Element id
-     *  @return     int						Nb of resources loaded
-     */
-    public function fetchElementResources($element, $element_id)
-    {
-        $resources = $this->getElementResources($element, $element_id);
-        $i = 0;
-        foreach ($resources as $nb => $resource) {
-            $this->lines[$i] = fetchObjectByElement($resource['resource_id'], $resource['resource_type']);
-            $i++;
-        }
-        return $i;
-    }
+	/**
+	 *  Return an int number of resources linked to the element
+	 *
+	 *  @param		string	$element		Element type
+	 *  @param		int		$element_id		Element id
+	 *  @return     int						Nb of resources loaded
+	 */
+	public function fetchElementResources($element, $element_id)
+	{
+		$resources = $this->getElementResources($element, $element_id);
+		$i = 0;
+		foreach ($resources as $nb => $resource) {
+			$this->lines[$i] = fetchObjectByElement($resource['resource_id'], $resource['resource_type']);
+			$i++;
+		}
+		return $i;
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *      Load in cache resource type code (setup in dictionary)
-     *
-     *      @return     int             Number of lines loaded, 0 if already loaded, <0 if KO
-     */
-    public function load_cache_code_type_resource()
-    {
-        // phpcs:enable
-    	global $langs;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *      Load in cache resource type code (setup in dictionary)
+	 *
+	 *      @return     int             Number of lines loaded, 0 if already loaded, <0 if KO
+	 */
+	public function load_cache_code_type_resource()
+	{
+		// phpcs:enable
+		global $langs;
 
-    	if (is_array($this->cache_code_type_resource) && count($this->cache_code_type_resource)) return 0; // Cache deja charge
+		if (is_array($this->cache_code_type_resource) && count($this->cache_code_type_resource)) return 0; // Cache deja charge
 
-    	$sql = "SELECT rowid, code, label, active";
-    	$sql .= " FROM ".MAIN_DB_PREFIX."c_type_resource";
-    	$sql .= " WHERE active > 0";
-    	$sql .= " ORDER BY rowid";
-    	dol_syslog(get_class($this)."::load_cache_code_type_resource", LOG_DEBUG);
-    	$resql = $this->db->query($sql);
-    	if ($resql)
-    	{
-    		$num = $this->db->num_rows($resql);
-    		$i = 0;
-    		while ($i < $num)
-    		{
-    			$obj = $this->db->fetch_object($resql);
-    			// Si traduction existe, on l'utilise, sinon on prend le libelle par defaut
-    			$label = ($langs->trans("ResourceTypeShort".$obj->code) != ("ResourceTypeShort".$obj->code) ? $langs->trans("ResourceTypeShort".$obj->code) : ($obj->label != '-' ? $obj->label : ''));
-    			$this->cache_code_type_resource[$obj->rowid]['code'] = $obj->code;
-    			$this->cache_code_type_resource[$obj->rowid]['label'] = $label;
-    			$this->cache_code_type_resource[$obj->rowid]['active'] = $obj->active;
-    			$i++;
-    		}
-    		return $num;
-    	} else {
-    		dol_print_error($this->db);
-    		return -1;
-    	}
-    }
+		$sql = "SELECT rowid, code, label, active";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_type_resource";
+		$sql .= " WHERE active > 0";
+		$sql .= " ORDER BY rowid";
+		dol_syslog(get_class($this)."::load_cache_code_type_resource", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$num = $this->db->num_rows($resql);
+			$i = 0;
+			while ($i < $num)
+			{
+				$obj = $this->db->fetch_object($resql);
+				// Si traduction existe, on l'utilise, sinon on prend le libelle par defaut
+				$label = ($langs->trans("ResourceTypeShort".$obj->code) != ("ResourceTypeShort".$obj->code) ? $langs->trans("ResourceTypeShort".$obj->code) : ($obj->label != '-' ? $obj->label : ''));
+				$this->cache_code_type_resource[$obj->rowid]['code'] = $obj->code;
+				$this->cache_code_type_resource[$obj->rowid]['label'] = $label;
+				$this->cache_code_type_resource[$obj->rowid]['active'] = $obj->active;
+				$i++;
+			}
+			return $num;
+		} else {
+			dol_print_error($this->db);
+			return -1;
+		}
+	}
 
-    /**
-     *	Return clicable link of object (with eventually picto)
-     *
-     *	@param      int		$withpicto					Add picto into link
-     *	@param      string	$option						Where point the link ('compta', 'expedition', 'document', ...)
-     *	@param      string	$get_params    				Parametres added to url
-     *	@param		int  	$notooltip					1=Disable tooltip
-     *  @param  	string  $morecss                    Add more css on link
-     *  @param  	int     $save_lastsearch_value      -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
-     *	@return     string          					String with URL
-     */
-    public function getNomUrl($withpicto = 0, $option = '', $get_params = '', $notooltip = 0, $morecss = '', $save_lastsearch_value = -1)
-    {
-        global $conf, $langs;
+	/**
+	 *	Return clicable link of object (with eventually picto)
+	 *
+	 *	@param      int		$withpicto					Add picto into link
+	 *	@param      string	$option						Where point the link ('compta', 'expedition', 'document', ...)
+	 *	@param      string	$get_params    				Parametres added to url
+	 *	@param		int  	$notooltip					1=Disable tooltip
+	 *  @param  	string  $morecss                    Add more css on link
+	 *  @param  	int     $save_lastsearch_value      -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+	 *	@return     string          					String with URL
+	 */
+	public function getNomUrl($withpicto = 0, $option = '', $get_params = '', $notooltip = 0, $morecss = '', $save_lastsearch_value = -1)
+	{
+		global $conf, $langs;
 
-        $result = '';
-        $label = img_picto('', $this->picto).' <u>'.$langs->trans("Resource").'</u>';
-        $label .= '<br>';
-        $label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref;
-        /*if (isset($this->status)) {
+		$result = '';
+		$label = img_picto('', $this->picto).' <u>'.$langs->trans("Resource").'</u>';
+		$label .= '<br>';
+		$label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref;
+		/*if (isset($this->status)) {
         	$label.= '<br><b>' . $langs->trans("Status").":</b> ".$this->getLibStatut(5);
         }*/
-        if (isset($this->type_label)) {
-        	$label .= '<br><b>'.$langs->trans("ResourceType").":</b> ".$this->type_label;
-        }
+		if (isset($this->type_label)) {
+			$label .= '<br><b>'.$langs->trans("ResourceType").":</b> ".$this->type_label;
+		}
 
-        $url = DOL_URL_ROOT.'/resource/card.php?id='.$this->id;
+		$url = DOL_URL_ROOT.'/resource/card.php?id='.$this->id;
 
-        if ($option != 'nolink')
-        {
-        	// Add param to save lastsearch_values or not
-        	$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
-        	if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
-        	if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
-        }
+		if ($option != 'nolink')
+		{
+			// Add param to save lastsearch_values or not
+			$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
+			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
+			if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
+		}
 
-        $linkclose = '';
-        if (empty($notooltip))
-        {
-        	if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-        	{
-        		$label = $langs->trans("ShowMyObject");
-        		$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
-        	}
-        	$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
-        	$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
-        } else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+		$linkclose = '';
+		if (empty($notooltip))
+		{
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+			{
+				$label = $langs->trans("ShowMyObject");
+				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
+			}
+			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
+			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
+		} else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
-        $linkstart = '<a href="'.$url.$get_params.'"';
-        $linkstart .= $linkclose.'>';
-        $linkend = '</a>';
-        /*$linkstart = '<a href="'.dol_buildpath('/resource/card.php', 1).'?id='.$this->id.$get_params.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
+		$linkstart = '<a href="'.$url.$get_params.'"';
+		$linkstart .= $linkclose.'>';
+		$linkend = '</a>';
+		/*$linkstart = '<a href="'.dol_buildpath('/resource/card.php', 1).'?id='.$this->id.$get_params.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
         $linkend = '</a>';*/
 
-        $result .= $linkstart;
-        if ($withpicto) $result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
-        if ($withpicto != 2) $result .= $this->ref;
-        $result .= $linkend;
+		$result .= $linkstart;
+		if ($withpicto) $result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+		if ($withpicto != 2) $result .= $this->ref;
+		$result .= $linkend;
 
-        return $result;
-    }
+		return $result;
+	}
 
 
-    /**
-     *  Retourne le libelle du status d'un user (actif, inactif)
-     *
-     *  @param	int		$mode          0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
-     *  @return	string 			       Label of status
-     */
-    public function getLibStatut($mode = 0)
-    {
-        return $this->LibStatut($this->status, $mode);
-    }
+	/**
+	 *  Retourne le libelle du status d'un user (actif, inactif)
+	 *
+	 *  @param	int		$mode          0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
+	 *  @return	string 			       Label of status
+	 */
+	public function getLibStatut($mode = 0)
+	{
+		return $this->LibStatut($this->status, $mode);
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Return the status
-     *
-     *  @param	int		$status        	Id status
-     *  @param  int		$mode          	0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 5=Long label + Picto
-     *  @return string 			       	Label of status
-     */
-    public static function LibStatut($status, $mode = 0)
-    {
-        // phpcs:enable
-        global $langs;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Return the status
+	 *
+	 *  @param	int		$status        	Id status
+	 *  @param  int		$mode          	0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 5=Long label + Picto
+	 *  @return string 			       	Label of status
+	 */
+	public static function LibStatut($status, $mode = 0)
+	{
+		// phpcs:enable
+		global $langs;
 
-        return '';
-    }
+		return '';
+	}
 }
diff --git a/htdocs/resource/class/html.formresource.class.php b/htdocs/resource/class/html.formresource.class.php
index 451ca9922b1..0b6239b01e4 100644
--- a/htdocs/resource/class/html.formresource.class.php
+++ b/htdocs/resource/class/html.formresource.class.php
@@ -34,177 +34,177 @@ require_once DOL_DOCUMENT_ROOT."/resource/class/dolresource.class.php";
  */
 class FormResource
 {
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $substit = array();
+	public $substit = array();
 
-    public $param = array();
+	public $param = array();
 
-    /**
+	/**
 	 * @var string Error code (or message)
 	 */
 	public $error = '';
 
 
 	/**
-	* Constructor
-	*
-	* @param DoliDB $db Database handler
-	*/
-    public function __construct($db)
-    {
-        $this->db = $db;
-    }
+	 * Constructor
+	 *
+	 * @param DoliDB $db Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Output html form to select a resource
-     *
-     *	@param	int   	$selected       Preselected resource id
-     *	@param  string	$htmlname       Name of field in form
-     *  @param  string	$filter         Optionnal filters criteras (example: 's.rowid <> x')
-     *	@param	int		$showempty		Add an empty field
-     * 	@param	int		$showtype		Show third party type in combolist (customer, prospect or supplier)
-     * 	@param	int		$forcecombo		Force to use combo box
-     *  @param	array	$event			Event options. Example: array(array('method'=>'getContacts', 'url'=>dol_buildpath('/core/ajax/contacts.php',1), 'htmlname'=>'contactid', 'params'=>array('add-customer-contact'=>'disabled')))
-     *  @param	string	$filterkey		Filter on key value
-     *  @param	int		$outputmode		0=HTML select string, 1=Array, 2=without form tag
-     *  @param	int		$limit			Limit number of answers
-     *  @param	string	$morecss		More css
-     * 	@return	string					HTML string with
-     */
-    public function select_resource_list($selected = '', $htmlname = 'fk_resource', $filter = '', $showempty = 0, $showtype = 0, $forcecombo = 0, $event = array(), $filterkey = '', $outputmode = 0, $limit = 20, $morecss = '')
-    {
-        // phpcs:enable
-    	global $conf, $user, $langs;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Output html form to select a resource
+	 *
+	 *	@param	int   	$selected       Preselected resource id
+	 *	@param  string	$htmlname       Name of field in form
+	 *  @param  string	$filter         Optionnal filters criteras (example: 's.rowid <> x')
+	 *	@param	int		$showempty		Add an empty field
+	 * 	@param	int		$showtype		Show third party type in combolist (customer, prospect or supplier)
+	 * 	@param	int		$forcecombo		Force to use combo box
+	 *  @param	array	$event			Event options. Example: array(array('method'=>'getContacts', 'url'=>dol_buildpath('/core/ajax/contacts.php',1), 'htmlname'=>'contactid', 'params'=>array('add-customer-contact'=>'disabled')))
+	 *  @param	string	$filterkey		Filter on key value
+	 *  @param	int		$outputmode		0=HTML select string, 1=Array, 2=without form tag
+	 *  @param	int		$limit			Limit number of answers
+	 *  @param	string	$morecss		More css
+	 * 	@return	string					HTML string with
+	 */
+	public function select_resource_list($selected = '', $htmlname = 'fk_resource', $filter = '', $showempty = 0, $showtype = 0, $forcecombo = 0, $event = array(), $filterkey = '', $outputmode = 0, $limit = 20, $morecss = '')
+	{
+		// phpcs:enable
+		global $conf, $user, $langs;
 
-    	$out = '';
-    	$outarray = array();
+		$out = '';
+		$outarray = array();
 
-    	$resourcestat = new Dolresource($this->db);
+		$resourcestat = new Dolresource($this->db);
 
-    	$resources_used = $resourcestat->fetch_all('ASC', 't.rowid', $limit, 0, $filter);
+		$resources_used = $resourcestat->fetch_all('ASC', 't.rowid', $limit, 0, $filter);
 
-    	if ($outputmode != 2)
-    	{
-    	    $out = '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-    	    $out .= '<input type="hidden" name="token" value="'.newToken().'">';
-    	}
+		if ($outputmode != 2)
+		{
+			$out = '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+			$out .= '<input type="hidden" name="token" value="'.newToken().'">';
+		}
 
-    	if ($resourcestat)
-    	{
-    		if (!empty($conf->use_javascript_ajax) && !empty($conf->global->RESOURCE_USE_SEARCH_TO_SELECT) && !$forcecombo)
-    		{
-    			//$minLength = (is_numeric($conf->global->RESOURCE_USE_SEARCH_TO_SELECT)?$conf->global->RESOURCE_USE_SEARCH_TO_SELECT:2);
-    			$out .= ajax_combobox($htmlname, $event, $conf->global->RESOURCE_USE_SEARCH_TO_SELECT);
-    		} else {
-    			$out .= ajax_combobox($htmlname);
-    		}
+		if ($resourcestat)
+		{
+			if (!empty($conf->use_javascript_ajax) && !empty($conf->global->RESOURCE_USE_SEARCH_TO_SELECT) && !$forcecombo)
+			{
+				//$minLength = (is_numeric($conf->global->RESOURCE_USE_SEARCH_TO_SELECT)?$conf->global->RESOURCE_USE_SEARCH_TO_SELECT:2);
+				$out .= ajax_combobox($htmlname, $event, $conf->global->RESOURCE_USE_SEARCH_TO_SELECT);
+			} else {
+				$out .= ajax_combobox($htmlname);
+			}
 
-    		// Construct $out and $outarray
-    		$out .= '<select id="'.$htmlname.'" class="flat minwidth100'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'">'."\n";
-    		if ($showempty) $out .= '<option value="-1">&nbsp;</option>'."\n";
+			// Construct $out and $outarray
+			$out .= '<select id="'.$htmlname.'" class="flat minwidth100'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'">'."\n";
+			if ($showempty) $out .= '<option value="-1">&nbsp;</option>'."\n";
 
-    		$num = 0;
-    		if (is_array($resourcestat->lines)) $num = count($resourcestat->lines);
+			$num = 0;
+			if (is_array($resourcestat->lines)) $num = count($resourcestat->lines);
 
-    		//var_dump($resourcestat->lines);
-    		$i = 0;
-    		if ($num)
-    		{
-    			while ($i < $num)
-    			{
-    			    $resourceclass = ucfirst($resourcestat->lines[$i]->element);
+			//var_dump($resourcestat->lines);
+			$i = 0;
+			if ($num)
+			{
+				while ($i < $num)
+				{
+					$resourceclass = ucfirst($resourcestat->lines[$i]->element);
 
-    				$label = $resourcestat->lines[$i]->ref ? $resourcestat->lines[$i]->ref : ''.$resourcestat->lines[$i]->label;
-    				if ($resourceclass != 'Dolresource') $label .= ' ('.$langs->trans($resourceclass).')';
+					$label = $resourcestat->lines[$i]->ref ? $resourcestat->lines[$i]->ref : ''.$resourcestat->lines[$i]->label;
+					if ($resourceclass != 'Dolresource') $label .= ' ('.$langs->trans($resourceclass).')';
 
-    				if ($selected > 0 && $selected == $resourcestat->lines[$i]->id)
-    				{
-    					$out .= '<option value="'.$resourcestat->lines[$i]->id.'" selected>'.$label.'</option>';
-    				} else {
-    					$out .= '<option value="'.$resourcestat->lines[$i]->id.'">'.$label.'</option>';
-    				}
+					if ($selected > 0 && $selected == $resourcestat->lines[$i]->id)
+					{
+						$out .= '<option value="'.$resourcestat->lines[$i]->id.'" selected>'.$label.'</option>';
+					} else {
+						$out .= '<option value="'.$resourcestat->lines[$i]->id.'">'.$label.'</option>';
+					}
 
-    				array_push($outarray, array('key'=>$resourcestat->lines[$i]->id, 'value'=>$resourcestat->lines[$i]->label, 'label'=>$resourcestat->lines[$i]->label));
+					array_push($outarray, array('key'=>$resourcestat->lines[$i]->id, 'value'=>$resourcestat->lines[$i]->label, 'label'=>$resourcestat->lines[$i]->label));
 
-    				$i++;
-    				if (($i % 10) == 0) $out .= "\n";
-    			}
-    		}
-    		$out .= '</select>'."\n";
+					$i++;
+					if (($i % 10) == 0) $out .= "\n";
+				}
+			}
+			$out .= '</select>'."\n";
 
-    		if ($outputmode != 2)
-    		{
-        		$out .= '<input type="submit" class="button" value="'.$langs->trans("Search").'"> &nbsp; &nbsp; ';
+			if ($outputmode != 2)
+			{
+				$out .= '<input type="submit" class="button" value="'.$langs->trans("Search").'"> &nbsp; &nbsp; ';
 
-        		$out .= '</form>';
-    		}
-    	} else {
-    		dol_print_error($this->db);
-    	}
+				$out .= '</form>';
+			}
+		} else {
+			dol_print_error($this->db);
+		}
 
-    	if ($outputmode && $outputmode != 2) return $outarray;
-    	return $out;
-    }
+		if ($outputmode && $outputmode != 2) return $outarray;
+		return $out;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Return html list of tickets type
-     *
-     *  @param	string	$selected       Id du type pre-selectionne
-     *  @param  string	$htmlname       Nom de la zone select
-     *  @param  string	$filtertype     To filter on field type in llx_c_ticket_type (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		$noadmininfo	0=Add admin info, 1=Disable admin info
-     *  @param  int		$maxlength      Max length of label
-     * 	@return	void
-     */
-    public function select_types_resource($selected = '', $htmlname = 'type_resource', $filtertype = '', $format = 0, $empty = 0, $noadmininfo = 0, $maxlength = 0)
-    {
-        // phpcs:enable
-    	global $langs, $user;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Return html list of tickets type
+	 *
+	 *  @param	string	$selected       Id du type pre-selectionne
+	 *  @param  string	$htmlname       Nom de la zone select
+	 *  @param  string	$filtertype     To filter on field type in llx_c_ticket_type (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		$noadmininfo	0=Add admin info, 1=Disable admin info
+	 *  @param  int		$maxlength      Max length of label
+	 * 	@return	void
+	 */
+	public function select_types_resource($selected = '', $htmlname = 'type_resource', $filtertype = '', $format = 0, $empty = 0, $noadmininfo = 0, $maxlength = 0)
+	{
+		// phpcs:enable
+		global $langs, $user;
 
-    	$resourcestat = new Dolresource($this->db);
+		$resourcestat = new Dolresource($this->db);
 
-    	dol_syslog(get_class($this)."::select_types_resource ".$selected.", ".$htmlname.", ".$filtertype.", ".$format, LOG_DEBUG);
+		dol_syslog(get_class($this)."::select_types_resource ".$selected.", ".$htmlname.", ".$filtertype.", ".$format, LOG_DEBUG);
 
-    	$filterarray = array();
+		$filterarray = array();
 
-    	if ($filtertype != '' && $filtertype != '-1') $filterarray = explode(',', $filtertype);
+		if ($filtertype != '' && $filtertype != '-1') $filterarray = explode(',', $filtertype);
 
-    	$resourcestat->load_cache_code_type_resource();
-    	print '<select id="select'.$htmlname.'" class="flat maxwidthonsmartphone select_'.$htmlname.'" name="'.$htmlname.'">';
-    	if ($empty) print '<option value="">&nbsp;</option>';
-    	if (is_array($resourcestat->cache_code_type_resource) && count($resourcestat->cache_code_type_resource))
-    	{
-    		foreach ($resourcestat->cache_code_type_resource as $id => $arraytypes)
-    		{
-    			// We discard empty line if showempty is on because an empty line has already been output.
-    			if ($empty && empty($arraytypes['code'])) continue;
+		$resourcestat->load_cache_code_type_resource();
+		print '<select id="select'.$htmlname.'" class="flat maxwidthonsmartphone select_'.$htmlname.'" name="'.$htmlname.'">';
+		if ($empty) print '<option value="">&nbsp;</option>';
+		if (is_array($resourcestat->cache_code_type_resource) && count($resourcestat->cache_code_type_resource))
+		{
+			foreach ($resourcestat->cache_code_type_resource as $id => $arraytypes)
+			{
+				// We discard empty line if showempty is on because an empty line has already been output.
+				if ($empty && empty($arraytypes['code'])) continue;
 
-    			if ($format == 0) print '<option value="'.$id.'"';
-    			elseif ($format == 1) print '<option value="'.$arraytypes['code'].'"';
-    			elseif ($format == 2) print '<option value="'.$arraytypes['code'].'"';
-    			elseif ($format == 3) print '<option value="'.$id.'"';
-    			// 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 '>';
-    			if ($format == 0) $value = ($maxlength ?dol_trunc($arraytypes['label'], $maxlength) : $arraytypes['label']);
-    			elseif ($format == 1) $value = $arraytypes['code'];
-    			elseif ($format == 2) $value = ($maxlength ?dol_trunc($arraytypes['label'], $maxlength) : $arraytypes['label']);
-    			elseif ($format == 3) $value = $arraytypes['code'];
-    			print $value ? $value : '&nbsp;';
-    			print '</option>';
-    		}
-    	}
-    	print '</select>';
-    	if ($user->admin && !$noadmininfo) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
-    }
+				if ($format == 0) print '<option value="'.$id.'"';
+				elseif ($format == 1) print '<option value="'.$arraytypes['code'].'"';
+				elseif ($format == 2) print '<option value="'.$arraytypes['code'].'"';
+				elseif ($format == 3) print '<option value="'.$id.'"';
+				// 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 '>';
+				if ($format == 0) $value = ($maxlength ?dol_trunc($arraytypes['label'], $maxlength) : $arraytypes['label']);
+				elseif ($format == 1) $value = $arraytypes['code'];
+				elseif ($format == 2) $value = ($maxlength ?dol_trunc($arraytypes['label'], $maxlength) : $arraytypes['label']);
+				elseif ($format == 3) $value = $arraytypes['code'];
+				print $value ? $value : '&nbsp;';
+				print '</option>';
+			}
+		}
+		print '</select>';
+		if ($user->admin && !$noadmininfo) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+	}
 }
diff --git a/htdocs/resource/contact.php b/htdocs/resource/contact.php
index 5bc7b528c2a..afce3dd9947 100644
--- a/htdocs/resource/contact.php
+++ b/htdocs/resource/contact.php
@@ -147,7 +147,7 @@ if ($id > 0 || !empty($ref))
 	print '</table>';
 	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<br>';
 
diff --git a/htdocs/resource/document.php b/htdocs/resource/document.php
index aade0a035a7..0019d6b99ed 100644
--- a/htdocs/resource/document.php
+++ b/htdocs/resource/document.php
@@ -114,7 +114,7 @@ if ($object->id > 0)
 	print '<div class="fichecenter">';
 	print '<div class="underbanner clearboth"></div>';
 
-    print '<table class="border tableforfield centpercent">';
+	print '<table class="border tableforfield centpercent">';
 
 	// Resource type
 	print '<tr>';
@@ -124,18 +124,18 @@ if ($object->id > 0)
 	print '</td>';
 	print '</tr>';
 
-    print '<tr><td>'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
-    print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.dol_print_size($totalsize, 1, 1).'</td></tr>';
-    print '</table>';
+	print '<tr><td>'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
+	print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.dol_print_size($totalsize, 1, 1).'</td></tr>';
+	print '</table>';
 
-    print '</div>';
+	print '</div>';
 
-    dol_fiche_end();
+	print dol_get_fiche_end();
 
-    $modulepart = 'dolresource';
-    $permission = $user->rights->resource->write;
+	$modulepart = 'dolresource';
+	$permission = $user->rights->resource->write;
 
-    include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
+	include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
 } else {
 	print $langs->trans("ErrorUnknown");
 }
diff --git a/htdocs/resource/element_resource.php b/htdocs/resource/element_resource.php
index 40836072684..7da223dd02b 100644
--- a/htdocs/resource/element_resource.php
+++ b/htdocs/resource/element_resource.php
@@ -29,11 +29,11 @@ require_once DOL_DOCUMENT_ROOT.'/resource/class/dolresource.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
 if (!empty($conf->projet->enabled)) {
-    require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
-    require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 }
 if (!empty($conf->product->enabled) || !empty($conf->service->enabled)) {
-    require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 }
 
 // Load translation files required by the page
@@ -46,7 +46,7 @@ $page                           = GETPOST('page','int');
 */
 
 if (!$user->rights->resource->read)
-        accessforbidden();
+		accessforbidden();
 
 $object = new Dolresource($db);
 
@@ -71,8 +71,8 @@ $socid                  = GETPOST('socid', 'int');
 
 if ($socid > 0) // Special for thirdparty
 {
-    $element_id = $socid;
-    $element = 'societe';
+	$element_id = $socid;
+	$element = 'societe';
 }
 
 
@@ -87,7 +87,7 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 
 if (empty($reshook))
 {
-    $error = 0;
+	$error = 0;
 
 	if ($action == 'add_element_resource' && !$cancel)
 	{
@@ -101,65 +101,65 @@ if (empty($reshook))
 			$objstat = fetchObjectByElement($element_id, $element, $element_ref);
 			$objstat->element = $element; // For externals module, we need to keep @xx
 
-            // TODO : add this check at update_linked_resource and when modifying event start or end date
-            // check if an event resource is already in use
-            if (!empty($conf->global->RESOURCE_USED_IN_EVENT_CHECK) && $objstat->element == 'action' && $resource_type == 'dolresource' && intval($busy) == 1) {
-                $eventDateStart = $objstat->datep;
-                $eventDateEnd   = $objstat->datef;
-                $isFullDayEvent = intval($objstat->fulldayevent);
-                if (empty($eventDateEnd)) {
-                    if ($isFullDayEvent) {
-                        $eventDateStartArr = dol_getdate($eventDateStart);
-                        $eventDateStart = dol_mktime(0, 0, 0, $eventDateStartArr['mon'], $eventDateStartArr['mday'], $eventDateStartArr['year']);
-                        $eventDateEnd   = dol_mktime(23, 59, 59, $eventDateStartArr['mon'], $eventDateStartArr['mday'], $eventDateStartArr['year']);
-                    }
-                }
+			// TODO : add this check at update_linked_resource and when modifying event start or end date
+			// check if an event resource is already in use
+			if (!empty($conf->global->RESOURCE_USED_IN_EVENT_CHECK) && $objstat->element == 'action' && $resource_type == 'dolresource' && intval($busy) == 1) {
+				$eventDateStart = $objstat->datep;
+				$eventDateEnd   = $objstat->datef;
+				$isFullDayEvent = intval($objstat->fulldayevent);
+				if (empty($eventDateEnd)) {
+					if ($isFullDayEvent) {
+						$eventDateStartArr = dol_getdate($eventDateStart);
+						$eventDateStart = dol_mktime(0, 0, 0, $eventDateStartArr['mon'], $eventDateStartArr['mday'], $eventDateStartArr['year']);
+						$eventDateEnd   = dol_mktime(23, 59, 59, $eventDateStartArr['mon'], $eventDateStartArr['mday'], $eventDateStartArr['year']);
+					}
+				}
 
-                $sql  = "SELECT er.rowid, r.ref as r_ref, ac.id as ac_id, ac.label as ac_label";
-                $sql .= " FROM ".MAIN_DB_PREFIX."element_resources as er";
-                $sql .= " INNER JOIN ".MAIN_DB_PREFIX."resource as r ON r.rowid = er.resource_id AND er.resource_type = '".$db->escape($resource_type)."'";
-                $sql .= " INNER JOIN ".MAIN_DB_PREFIX."actioncomm as ac ON ac.id = er.element_id AND er.element_type = '".$db->escape($objstat->element)."'";
-                $sql .= " WHERE er.resource_id = ".$resource_id;
-                $sql .= " AND er.busy = 1";
-                $sql .= " AND (";
+				$sql  = "SELECT er.rowid, r.ref as r_ref, ac.id as ac_id, ac.label as ac_label";
+				$sql .= " FROM ".MAIN_DB_PREFIX."element_resources as er";
+				$sql .= " INNER JOIN ".MAIN_DB_PREFIX."resource as r ON r.rowid = er.resource_id AND er.resource_type = '".$db->escape($resource_type)."'";
+				$sql .= " INNER JOIN ".MAIN_DB_PREFIX."actioncomm as ac ON ac.id = er.element_id AND er.element_type = '".$db->escape($objstat->element)."'";
+				$sql .= " WHERE er.resource_id = ".$resource_id;
+				$sql .= " AND er.busy = 1";
+				$sql .= " AND (";
 
-                // event date start between ac.datep and ac.datep2 (if datep2 is null we consider there is no end)
-                $sql .= " (ac.datep <= '".$db->idate($eventDateStart)."' AND (ac.datep2 IS NULL OR ac.datep2 >= '".$db->idate($eventDateStart)."'))";
-                // event date end between ac.datep and ac.datep2
-                if (!empty($eventDateEnd)) {
-                    $sql .= " OR (ac.datep <= '".$db->idate($eventDateEnd)."' AND (ac.datep2 >= '".$db->idate($eventDateEnd)."'))";
-                }
-                // event date start before ac.datep and event date end after ac.datep2
-                $sql .= " OR (";
-                $sql .= "ac.datep >= '".$db->idate($eventDateStart)."'";
-                if (!empty($eventDateEnd)) {
-                    $sql .= " AND (ac.datep2 IS NOT NULL AND ac.datep2 <= '".$db->idate($eventDateEnd)."')";
-                }
-                $sql .= ")";
+				// event date start between ac.datep and ac.datep2 (if datep2 is null we consider there is no end)
+				$sql .= " (ac.datep <= '".$db->idate($eventDateStart)."' AND (ac.datep2 IS NULL OR ac.datep2 >= '".$db->idate($eventDateStart)."'))";
+				// event date end between ac.datep and ac.datep2
+				if (!empty($eventDateEnd)) {
+					$sql .= " OR (ac.datep <= '".$db->idate($eventDateEnd)."' AND (ac.datep2 >= '".$db->idate($eventDateEnd)."'))";
+				}
+				// event date start before ac.datep and event date end after ac.datep2
+				$sql .= " OR (";
+				$sql .= "ac.datep >= '".$db->idate($eventDateStart)."'";
+				if (!empty($eventDateEnd)) {
+					$sql .= " AND (ac.datep2 IS NOT NULL AND ac.datep2 <= '".$db->idate($eventDateEnd)."')";
+				}
+				$sql .= ")";
 
-                $sql .= ")";
-                $resql = $db->query($sql);
-                if (!$resql) {
-                    $error++;
-                    $objstat->error    = $db->lasterror();
-                    $objstat->errors[] = $objstat->error;
-                } else {
-                    if ($db->num_rows($resql) > 0) {
-                        // already in use
-                        $error++;
-                        $objstat->error = $langs->trans('ErrorResourcesAlreadyInUse').' : ';
-                        while ($obj = $db->fetch_object($resql)) {
-                            $objstat->error .= '<br> - '.$langs->trans('ErrorResourceUseInEvent', $obj->r_ref, $obj->ac_label.' ['.$obj->ac_id.']');
-                        }
-                        $objstat->errors[] = $objstat->error;
-                    }
-                    $db->free($resql);
-                }
-            }
+				$sql .= ")";
+				$resql = $db->query($sql);
+				if (!$resql) {
+					$error++;
+					$objstat->error    = $db->lasterror();
+					$objstat->errors[] = $objstat->error;
+				} else {
+					if ($db->num_rows($resql) > 0) {
+						// already in use
+						$error++;
+						$objstat->error = $langs->trans('ErrorResourcesAlreadyInUse').' : ';
+						while ($obj = $db->fetch_object($resql)) {
+							$objstat->error .= '<br> - '.$langs->trans('ErrorResourceUseInEvent', $obj->r_ref, $obj->ac_label.' ['.$obj->ac_id.']');
+						}
+						$objstat->errors[] = $objstat->error;
+					}
+					$db->free($resql);
+				}
+			}
 
-            if (!$error) {
-                $res = $objstat->add_element_resource($resource_id, $resource_type, $busy, $mandatory);
-            }
+			if (!$error) {
+				$res = $objstat->add_element_resource($resource_id, $resource_type, $busy, $mandatory);
+			}
 		}
 
 		if (!$error && $res > 0)
@@ -182,68 +182,68 @@ if (empty($reshook))
 			$object->busy = $busy;
 			$object->mandatory = $mandatory;
 
-            if (!empty($conf->global->RESOURCE_USED_IN_EVENT_CHECK) && $object->element_type == 'action' && $object->resource_type == 'dolresource' && intval($object->busy) == 1) {
-                $eventDateStart = $object->objelement->datep;
-                $eventDateEnd   = $object->objelement->datef;
-                $isFullDayEvent = intval($objstat->fulldayevent);
-                if (empty($eventDateEnd)) {
-                    if ($isFullDayEvent) {
-                        $eventDateStartArr = dol_getdate($eventDateStart);
-                        $eventDateStart = dol_mktime(0, 0, 0, $eventDateStartArr['mon'], $eventDateStartArr['mday'], $eventDateStartArr['year']);
-                        $eventDateEnd   = dol_mktime(23, 59, 59, $eventDateStartArr['mon'], $eventDateStartArr['mday'], $eventDateStartArr['year']);
-                    }
-                }
+			if (!empty($conf->global->RESOURCE_USED_IN_EVENT_CHECK) && $object->element_type == 'action' && $object->resource_type == 'dolresource' && intval($object->busy) == 1) {
+				$eventDateStart = $object->objelement->datep;
+				$eventDateEnd   = $object->objelement->datef;
+				$isFullDayEvent = intval($objstat->fulldayevent);
+				if (empty($eventDateEnd)) {
+					if ($isFullDayEvent) {
+						$eventDateStartArr = dol_getdate($eventDateStart);
+						$eventDateStart = dol_mktime(0, 0, 0, $eventDateStartArr['mon'], $eventDateStartArr['mday'], $eventDateStartArr['year']);
+						$eventDateEnd   = dol_mktime(23, 59, 59, $eventDateStartArr['mon'], $eventDateStartArr['mday'], $eventDateStartArr['year']);
+					}
+				}
 
-                $sql  = "SELECT er.rowid, r.ref as r_ref, ac.id as ac_id, ac.label as ac_label";
-                $sql .= " FROM ".MAIN_DB_PREFIX."element_resources as er";
-                $sql .= " INNER JOIN ".MAIN_DB_PREFIX."resource as r ON r.rowid = er.resource_id AND er.resource_type = '".$db->escape($object->resource_type)."'";
-                $sql .= " INNER JOIN ".MAIN_DB_PREFIX."actioncomm as ac ON ac.id = er.element_id AND er.element_type = '".$db->escape($object->element_type)."'";
-                $sql .= " WHERE er.resource_id = ".$object->resource_id;
-                $sql .= " AND ac.id != ".$object->element_id;
-                $sql .= " AND er.busy = 1";
-                $sql .= " AND (";
+				$sql  = "SELECT er.rowid, r.ref as r_ref, ac.id as ac_id, ac.label as ac_label";
+				$sql .= " FROM ".MAIN_DB_PREFIX."element_resources as er";
+				$sql .= " INNER JOIN ".MAIN_DB_PREFIX."resource as r ON r.rowid = er.resource_id AND er.resource_type = '".$db->escape($object->resource_type)."'";
+				$sql .= " INNER JOIN ".MAIN_DB_PREFIX."actioncomm as ac ON ac.id = er.element_id AND er.element_type = '".$db->escape($object->element_type)."'";
+				$sql .= " WHERE er.resource_id = ".$object->resource_id;
+				$sql .= " AND ac.id != ".$object->element_id;
+				$sql .= " AND er.busy = 1";
+				$sql .= " AND (";
 
-                // event date start between ac.datep and ac.datep2 (if datep2 is null we consider there is no end)
-                $sql .= " (ac.datep <= '".$db->idate($eventDateStart)."' AND (ac.datep2 IS NULL OR ac.datep2 >= '".$db->idate($eventDateStart)."'))";
-                // event date end between ac.datep and ac.datep2
-                if (!empty($eventDateEnd)) {
-                    $sql .= " OR (ac.datep <= '".$db->idate($eventDateEnd)."' AND (ac.datep2 IS NULL OR ac.datep2 >= '".$db->idate($eventDateEnd)."'))";
-                }
-                // event date start before ac.datep and event date end after ac.datep2
-                $sql .= " OR (";
-                $sql .= "ac.datep >= '".$db->idate($eventDateStart)."'";
-                if (!empty($eventDateEnd)) {
-                    $sql .= " AND (ac.datep2 IS NOT NULL AND ac.datep2 <= '".$db->idate($eventDateEnd)."')";
-                }
-                $sql .= ")";
+				// event date start between ac.datep and ac.datep2 (if datep2 is null we consider there is no end)
+				$sql .= " (ac.datep <= '".$db->idate($eventDateStart)."' AND (ac.datep2 IS NULL OR ac.datep2 >= '".$db->idate($eventDateStart)."'))";
+				// event date end between ac.datep and ac.datep2
+				if (!empty($eventDateEnd)) {
+					$sql .= " OR (ac.datep <= '".$db->idate($eventDateEnd)."' AND (ac.datep2 IS NULL OR ac.datep2 >= '".$db->idate($eventDateEnd)."'))";
+				}
+				// event date start before ac.datep and event date end after ac.datep2
+				$sql .= " OR (";
+				$sql .= "ac.datep >= '".$db->idate($eventDateStart)."'";
+				if (!empty($eventDateEnd)) {
+					$sql .= " AND (ac.datep2 IS NOT NULL AND ac.datep2 <= '".$db->idate($eventDateEnd)."')";
+				}
+				$sql .= ")";
 
-                $sql .= ")";
-                $resql = $db->query($sql);
-                if (!$resql) {
-                    $error++;
-                    $object->error    = $db->lasterror();
-                    $object->errors[] = $object->error;
-                } else {
-                    if ($db->num_rows($resql) > 0) {
-                        // already in use
-                        $error++;
-                        $object->error = $langs->trans('ErrorResourcesAlreadyInUse').' : ';
-                        while ($obj = $db->fetch_object($resql)) {
-                            $object->error .= '<br> - '.$langs->trans('ErrorResourceUseInEvent', $obj->r_ref, $obj->ac_label.' ['.$obj->ac_id.']');
-                        }
-                        $object->errors[] = $objstat->error;
-                    }
-                    $db->free($resql);
-                }
-            }
+				$sql .= ")";
+				$resql = $db->query($sql);
+				if (!$resql) {
+					$error++;
+					$object->error    = $db->lasterror();
+					$object->errors[] = $object->error;
+				} else {
+					if ($db->num_rows($resql) > 0) {
+						// already in use
+						$error++;
+						$object->error = $langs->trans('ErrorResourcesAlreadyInUse').' : ';
+						while ($obj = $db->fetch_object($resql)) {
+							$object->error .= '<br> - '.$langs->trans('ErrorResourceUseInEvent', $obj->r_ref, $obj->ac_label.' ['.$obj->ac_id.']');
+						}
+						$object->errors[] = $objstat->error;
+					}
+					$db->free($resql);
+				}
+			}
 
-            if (!$error) {
-			    $result = $object->update_element_resource($user);
-                if ($result < 0)    $error++;
-            }
+			if (!$error) {
+				$result = $object->update_element_resource($user);
+				if ($result < 0)    $error++;
+			}
 
 			if ($error) {
-                setEventMessages($object->error, $object->errors, 'errors');
+				setEventMessages($object->error, $object->errors, 'errors');
 			} else {
 				setEventMessages($langs->trans('RessourceLineSuccessfullyUpdated'), null, 'mesgs');
 				header("Location: ".$_SERVER['PHP_SELF']."?element=".$element."&element_id=".$element_id);
@@ -287,11 +287,11 @@ llxHeader('', $pagetitle, '');
 // Load available resource, declared by modules
 $ret = count($object->available_resources);
 if ($ret == -1) {
-    dol_print_error($db, $object->error);
-    exit;
+	dol_print_error($db, $object->error);
+	exit;
 }
 if (!$ret) {
-    print '<div class="warning">'.$langs->trans('NoResourceInDatabase').'</div>';
+	print '<div class="warning">'.$langs->trans('NoResourceInDatabase').'</div>';
 } else {
 	// Confirmation suppression resource line
 	if ($action == 'delete_resource')
@@ -334,19 +334,19 @@ if (!$ret) {
 			// Project
 			if (!empty($conf->projet->enabled))
 			{
-			    $langs->load("projects");
-			    //$morehtmlref.='<br>'.$langs->trans('Project') . ' ';
-			    $morehtmlref .= $langs->trans('Project').': ';
-		        if (!empty($act->fk_project)) {
-		            $proj = new Project($db);
-		            $proj->fetch($act->fk_project);
-		            $morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$act->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($act->fk_project)) {
+					$proj = new Project($db);
+					$proj->fetch($act->fk_project);
+					$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$act->fk_project.'" title="'.$langs->trans('ShowProject').'">';
+					$morehtmlref .= $proj->ref;
+					$morehtmlref .= '</a>';
+					if ($proj->title) $morehtmlref .= ' - '.$proj->title;
+				} else {
+					$morehtmlref .= '';
+				}
 			}
 			$morehtmlref .= '</div>';
 
@@ -427,11 +427,11 @@ if (!$ret) {
 
 			print '</div>';
 
-			dol_fiche_end();
+			print dol_get_fiche_end();
 		}
 	}
 
-    // Specific to thirdparty module
+	// Specific to thirdparty module
 	if (($element_id || $element_ref) && $element == 'societe')
 	{
 		$socstatic = fetchObjectByElement($element_id, $element, $element_ref);
@@ -460,7 +460,7 @@ if (!$ret) {
 
 			print '</div>';
 
-			dol_fiche_end();
+			print dol_get_fiche_end();
 
 			$object = $savobject;
 		}
@@ -471,9 +471,9 @@ if (!$ret) {
 	{
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/fichinter.lib.php';
 
-        $fichinter = new Fichinter($db);
-        $fichinter->fetch($element_id, $element_ref);
-        $fichinter->fetch_thirdparty();
+		$fichinter = new Fichinter($db);
+		$fichinter->fetch($element_id, $element_ref);
+		$fichinter->fetch_thirdparty();
 
 		if (is_object($fichinter))
 		{
@@ -527,17 +527,17 @@ if (!$ret) {
 
 			dol_banner_tab($fichinter, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '&element='.$element, 0, '', '', 1);
 
-			dol_fiche_end();
+			print dol_get_fiche_end();
 		}
 	}
 
 	// Specific to product/service module
 	if (($element_id || $element_ref) && ($element == 'product' || $element == 'service'))
 	{
-        require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
 
-        $product = new Product($db);
-        $product->fetch($element_id, $element_ref);
+		$product = new Product($db);
+		$product->fetch($element_id, $element_ref);
 
 		if (is_object($product))
 		{
@@ -547,12 +547,12 @@ if (!$ret) {
 
 			print dol_get_fiche_head($head, 'resources', $titre, -1, $picto);
 
-            $shownav = 1;
-            if ($user->socid && !in_array('product', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav = 0;
+			$shownav = 1;
+			if ($user->socid && !in_array('product', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav = 0;
 			dol_banner_tab($product, 'ref', '', $shownav, 'ref', 'ref', '', '&element='.$element);
 
-			dol_fiche_end();
-        }
+			print dol_get_fiche_end();
+		}
 	}
 
 
diff --git a/htdocs/resource/note.php b/htdocs/resource/note.php
index 520589d0f5f..385fb9f190a 100644
--- a/htdocs/resource/note.php
+++ b/htdocs/resource/note.php
@@ -97,7 +97,7 @@ if ($id > 0 || !empty($ref))
 	$cssclass = 'titlefield';
 	include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 }
 
 // End of page
diff --git a/htdocs/salaries/admin/salaries.php b/htdocs/salaries/admin/salaries.php
index fa68f9ca720..2b429dc79ec 100644
--- a/htdocs/salaries/admin/salaries.php
+++ b/htdocs/salaries/admin/salaries.php
@@ -34,7 +34,7 @@ $langs->loadLangs(array('admin', 'salaries'));
 
 // Security check
 if (!$user->admin)
-    accessforbidden();
+	accessforbidden();
 
 $action = GETPOST('action', 'aZ09');
 
@@ -49,22 +49,22 @@ $list = array(
 
 if ($action == 'update')
 {
-    $error = 0;
+	$error = 0;
 
-    foreach ($list as $constname) {
-        $constvalue = GETPOST($constname, 'alpha');
+	foreach ($list as $constname) {
+		$constvalue = GETPOST($constname, 'alpha');
 
-        if (!dolibarr_set_const($db, $constname, $constvalue, 'chaine', 0, '', $conf->entity)) {
-            $error++;
-        }
-    }
+		if (!dolibarr_set_const($db, $constname, $constvalue, 'chaine', 0, '', $conf->entity)) {
+			$error++;
+		}
+	}
 
-    if (!$error)
-    {
-        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    } else {
-        setEventMessages($langs->trans("Error"), null, 'errors');
-    }
+	if (!$error)
+	{
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
+		setEventMessages($langs->trans("Error"), null, 'errors');
+	}
 }
 
 /*
@@ -122,7 +122,7 @@ print '</tr>';
 
 print "</table>\n";
 
-//dol_fiche_end();
+//print dol_get_fiche_end();
 
 print '<div class="center"><input type="submit" class="button" value="'.$langs->trans('Modify').'" name="button"></div>';
 
diff --git a/htdocs/salaries/admin/salaries_extrafields.php b/htdocs/salaries/admin/salaries_extrafields.php
index 19cd1435ccb..3e527c7fba5 100644
--- a/htdocs/salaries/admin/salaries_extrafields.php
+++ b/htdocs/salaries/admin/salaries_extrafields.php
@@ -73,7 +73,7 @@ print dol_get_fiche_head($head, 'attributes', $langs->trans("Salaries"), -1, 'us
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 // Buttons
@@ -96,7 +96,7 @@ if ($action == 'create')
 	print '<div name="topofform"></div><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';
 }
 
 /* ************************************************************************** */
@@ -109,7 +109,7 @@ if ($action == 'edit' && !empty($attrname))
 	print '<div name="topofform"></div><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/salaries/card.php b/htdocs/salaries/card.php
index 63cda8c241d..6fbb576bb26 100644
--- a/htdocs/salaries/card.php
+++ b/htdocs/salaries/card.php
@@ -111,9 +111,9 @@ if ($action == 'add' && empty($cancel))
 	$fuser->fetch(GETPOST("fk_user", "int"));
 	$object->salary = $fuser->salary;
 
-    // Fill array 'array_options' with data from add form
-    $ret = $extrafields->setOptionalsFromPost(null, $object);
-    if ($ret < 0) $error++;
+	// Fill array 'array_options' with data from add form
+	$ret = $extrafields->setOptionalsFromPost(null, $object);
+	if ($ret < 0) $error++;
 
 	if (empty($datep) || empty($datev) || empty($datesp) || empty($dateep))
 	{
@@ -340,18 +340,18 @@ if ($action == 'create')
 		print '<td><input name="num_payment" id="num_payment" type="text" value="'.GETPOST("num_payment").'"></td></tr>'."\n";
 	}
 
-    // Other attributes
-    $parameters = array();
-    $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-    print $hookmanager->resPrint;
-    if (empty($reshook))
-    {
-        print $object->showOptionals($extrafields, 'edit');
-    }
+	// Other attributes
+	$parameters = array();
+	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+	print $hookmanager->resPrint;
+	if (empty($reshook))
+	{
+		print $object->showOptionals($extrafields, 'edit');
+	}
 
 	print '</table>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div class="center">';
 	print '<input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
@@ -466,14 +466,14 @@ if ($id)
 		}
 	}
 
-    // Other attributes
-    include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
+	// Other attributes
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
 
 	print '</table>';
 
 	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 
 	/*
diff --git a/htdocs/salaries/class/paymentsalary.class.php b/htdocs/salaries/class/paymentsalary.class.php
index 1d46981d8d3..6aee986396b 100644
--- a/htdocs/salaries/class/paymentsalary.class.php
+++ b/htdocs/salaries/class/paymentsalary.class.php
@@ -31,668 +31,678 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
  */
 class PaymentSalary extends CommonObject
 {
-    /**
-     * @var string ID to identify managed object
-     */
-    public $element = 'payment_salary';
-
-    /**
-     * @var string Name of table without prefix where object is stored
-     */
-    public $table_element = 'payment_salary';
-
-    /**
-     * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
-     */
-    public $picto = 'payment';
-
-    public $tms;
-
-    /**
-     * @var int User ID
-     */
-    public $fk_user;
-
-    public $datep;
-    public $datev;
-    public $amount;
-
-    /**
-     * @var int ID
-     */
-    public $fk_project;
-
-    public $type_payment;
-    public $num_payment;
-
-    /**
-     * @var string salary payments label
-     */
-    public $label;
-
-    public $datesp;
-    public $dateep;
-
-    /**
-     * @var int ID
-     */
-    public $fk_bank;
-
-    /**
-     * @var int ID
-     */
-    public $fk_user_author;
-
-    /**
-     * @var int ID
-     */
-    public $fk_user_modif;
-
-
-    /**
-     *	Constructor
-     *
-     *  @param		DoliDB		$db      Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-        $this->element = 'payment_salary';
-        $this->table_element = 'payment_salary';
-    }
-
-    /**
-     * Update database
-     *
-     * @param   User	$user        	User that modify
-     * @param	int		$notrigger	    0=no, 1=yes (no update trigger)
-     * @return  int         			<0 if KO, >0 if OK
-     */
-    public function update($user = null, $notrigger = 0)
-    {
-        global $conf, $langs;
-
-        $error = 0;
-
-        // Clean parameters
-        $this->amount = trim($this->amount);
-        $this->label = trim($this->label);
-        $this->note = trim($this->note);
-
-        // Check parameters
-        if (empty($this->fk_user) || $this->fk_user < 0)
-        {
-            $this->error = 'ErrorBadParameter';
-            return -1;
-        }
-
-        $this->db->begin();
-
-        // Update request
-        $sql = "UPDATE ".MAIN_DB_PREFIX."payment_salary SET";
-
-        $sql .= " tms='".$this->db->idate($this->tms)."',";
-        $sql .= " fk_user=".$this->fk_user.",";
-        $sql .= " datep='".$this->db->idate($this->datep)."',";
-        $sql .= " datev='".$this->db->idate($this->datev)."',";
-        $sql .= " amount=".price2num($this->amount).",";
-        $sql .= " fk_projet=".((int) $this->fk_project).",";
-        $sql .= " fk_typepayment=".$this->fk_typepayment."',";
-        $sql .= " num_payment='".$this->db->escape($this->num_payment)."',";
-        $sql .= " label='".$this->db->escape($this->label)."',";
-        $sql .= " datesp='".$this->db->idate($this->datesp)."',";
-        $sql .= " dateep='".$this->db->idate($this->dateep)."',";
-        $sql .= " note='".$this->db->escape($this->note)."',";
-        $sql .= " fk_bank=".($this->fk_bank > 0 ? (int) $this->fk_bank : "null").",";
-        $sql .= " fk_user_author=".((int) $this->fk_user_author).",";
-        $sql .= " fk_user_modif=".($this->fk_user_modif > 0 ? (int) $this->fk_user_modif : 'null');
-
-        $sql .= " WHERE rowid=".$this->id;
-
-        dol_syslog(get_class($this)."::update", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if (!$resql)
-        {
-            $this->error = "Error ".$this->db->lasterror();
-            return -1;
-        }
-
-        // Update extrafield
-        if (!$error)
-        {
-            if (!$error)
-            {
-                $result = $this->insertExtraFields();
-                if ($result < 0)
-                {
-                    $error++;
-                }
-            }
-        }
-
-        if (!$notrigger)
-        {
-            // Call trigger
-            $result = $this->call_trigger('PAYMENT_SALARY_MODIFY', $user);
-            if ($result < 0) $error++;
-            // End call triggers
-        }
-
-        if (!$error)
-        {
-            $this->db->commit();
-            return 1;
-        } else {
-            $this->db->rollback();
-            return -1;
-        }
-    }
-
-
-    /**
-     *  Load object in memory from database
-     *
-     *  @param	int		$id         id object
-     *  @param  User	$user       User that load
-     *  @return int         		<0 if KO, >0 if OK
-     */
-    public function fetch($id, $user = null)
-    {
-        global $langs;
-        $sql = "SELECT";
-        $sql .= " s.rowid,";
-
-        $sql .= " s.tms,";
-        $sql .= " s.fk_user,";
-        $sql .= " s.datep,";
-        $sql .= " s.datev,";
-        $sql .= " s.amount,";
-        $sql .= " s.fk_projet as fk_project,";
-        $sql .= " s.fk_typepayment,";
-        $sql .= " s.num_payment,";
-        $sql .= " s.label,";
-        $sql .= " s.datesp,";
-        $sql .= " s.dateep,";
-        $sql .= " s.note,";
-        $sql .= " s.fk_bank,";
-        $sql .= " s.fk_user_author,";
-        $sql .= " s.fk_user_modif,";
-        $sql .= " b.fk_account,";
-        $sql .= " b.fk_type,";
-        $sql .= " b.rappro";
-
-        $sql .= " FROM ".MAIN_DB_PREFIX."payment_salary as s";
-        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank as b ON s.fk_bank = b.rowid";
-        $sql .= " WHERE s.rowid = ".$id;
-
-        dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            if ($this->db->num_rows($resql))
-            {
-                $obj = $this->db->fetch_object($resql);
-
-                $this->id = $obj->rowid;
-                $this->ref				= $obj->rowid;
-                $this->tms				= $this->db->jdate($obj->tms);
-                $this->fk_user = $obj->fk_user;
-                $this->datep			= $this->db->jdate($obj->datep);
-                $this->datev			= $this->db->jdate($obj->datev);
-                $this->amount = $obj->amount;
-                $this->fk_project = $obj->fk_project;
-                $this->type_payement = $obj->fk_typepayment;
-                $this->num_payment = $obj->num_payment;
-                $this->label			= $obj->label;
-                $this->datesp			= $this->db->jdate($obj->datesp);
-                $this->dateep			= $this->db->jdate($obj->dateep);
-                $this->note				= $obj->note;
-                $this->fk_bank = $obj->fk_bank;
-                $this->fk_user_author = $obj->fk_user_author;
-                $this->fk_user_modif = $obj->fk_user_modif;
-                $this->fk_account = $obj->fk_account;
-                $this->fk_type = $obj->fk_type;
-                $this->rappro = $obj->rappro;
-
-                // Retrieve all extrafield
-                // fetch optionals attributes and labels
-                $this->fetch_optionals();
-            }
-            $this->db->free($resql);
-
-            return 1;
-        } else {
-            $this->error = "Error ".$this->db->lasterror();
-            return -1;
-        }
-    }
-
-
-    /**
-     *  Delete object in database
-     *
-     *	@param	User	$user       User that delete
-     *	@return	int					<0 if KO, >0 if OK
-     */
-    public function delete($user)
-    {
-        global $conf, $langs;
-
-        $error = 0;
-
-        // Call trigger
-        $result = $this->call_trigger('PAYMENT_SALARY_DELETE', $user);
-        if ($result < 0) return -1;
-        // End call triggers
-
-        // Delete donation
-        if (!$error)
-        {
-            $sql = "DELETE FROM ".MAIN_DB_PREFIX."payment_salary_extrafields";
-            $sql .= " WHERE fk_object=".$this->id;
-
-            $resql = $this->db->query($sql);
-            if (!$resql)
-            {
-                $this->errors[] = $this->db->lasterror();
-                $error++;
-            }
-        }
-
-        $sql = "DELETE FROM ".MAIN_DB_PREFIX."payment_salary";
-        $sql .= " WHERE rowid=".$this->id;
-
-        dol_syslog(get_class($this)."::delete", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if (!$resql)
-        {
-            $this->error = "Error ".$this->db->lasterror();
-            return -1;
-        }
-
-        return 1;
-    }
-
-
-    /**
-     *  Initialise an instance with random values.
-     *  Used to build previews or test instances.
-     *	id must be 0 if object instance is a specimen.
-     *
-     *  @return	void
-     */
-    public function initAsSpecimen()
-    {
-        $this->id = 0;
-
-        $this->tms = '';
-        $this->fk_user = '';
-        $this->datep = '';
-        $this->datev = '';
-        $this->amount = '';
-        $this->label = '';
-        $this->datesp = '';
-        $this->dateep = '';
-        $this->note = '';
-        $this->fk_bank = '';
-        $this->fk_user_author = '';
-        $this->fk_user_modif = '';
-    }
-
-    /**
-     *  Create in database
-     *
-     *  @param      User	$user       User that create
-     *  @return     int      			<0 if KO, >0 if OK
-     */
-    public function create($user)
-    {
-        global $conf, $langs;
-
-        $error = 0;
-        $now = dol_now();
-
-        // Clean parameters
-        $this->amount = price2num(trim($this->amount));
-        $this->label = trim($this->label);
-        $this->note = trim($this->note);
-        $this->fk_bank = trim($this->fk_bank);
-        $this->fk_user_author = trim($this->fk_user_author);
-        $this->fk_user_modif = trim($this->fk_user_modif);
-
-        // Check parameters
-        if (!$this->label)
-        {
-            $this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Label"));
-            return -3;
-        }
-        if ($this->fk_user < 0 || $this->fk_user == '')
-        {
-            $this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Employee"));
-            return -4;
-        }
-        if ($this->amount < 0 || $this->amount == '')
-        {
-            $this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Amount"));
-            return -5;
-        }
-        if (!empty($conf->banque->enabled) && (empty($this->accountid) || $this->accountid <= 0))
-        {
-            $this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Account"));
-            return -6;
-        }
-        if (!empty($conf->banque->enabled) && (empty($this->type_payment) || $this->type_payment <= 0))
-        {
-            $this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("PaymentMode"));
-            return -7;
-        }
-
-        $this->db->begin();
-
-        // Insert into llx_payment_salary
-        $sql = "INSERT INTO ".MAIN_DB_PREFIX."payment_salary (fk_user";
-        $sql .= ", datep";
-        $sql .= ", datev";
-        $sql .= ", amount";
-        $sql .= ", fk_projet";
-        $sql .= ", salary";
-        $sql .= ", fk_typepayment";
-        $sql .= ", num_payment";
-        if ($this->note) $sql .= ", note";
-        $sql .= ", label";
-        $sql .= ", datesp";
-        $sql .= ", dateep";
-        $sql .= ", fk_user_author";
-        $sql .= ", datec";
-        $sql .= ", fk_bank";
-        $sql .= ", entity";
-        $sql .= ") ";
-        $sql .= " VALUES (";
-        $sql .= "'".$this->db->escape($this->fk_user)."'";
-        $sql .= ", '".$this->db->idate($this->datep)."'";
-        $sql .= ", '".$this->db->idate($this->datev)."'";
-        $sql .= ", ".$this->amount;
-        $sql .= ", ".($this->fk_project > 0 ? $this->fk_project : 0);
-        $sql .= ", ".($this->salary > 0 ? $this->salary : "null");
-        $sql .= ", ".$this->db->escape($this->type_payment);
-        $sql .= ", '".$this->db->escape($this->num_payment)."'";
-        if ($this->note) $sql .= ", '".$this->db->escape($this->note)."'";
-        $sql .= ", '".$this->db->escape($this->label)."'";
-        $sql .= ", '".$this->db->idate($this->datesp)."'";
-        $sql .= ", '".$this->db->idate($this->dateep)."'";
-        $sql .= ", '".$this->db->escape($user->id)."'";
-        $sql .= ", '".$this->db->idate($now)."'";
-        $sql .= ", NULL";
-        $sql .= ", ".$conf->entity;
-        $sql .= ")";
-
-        dol_syslog(get_class($this)."::create", LOG_DEBUG);
-        $result = $this->db->query($sql);
-        if ($result)
-        {
-            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."payment_salary");
-
-            if ($this->id > 0)
-            {
-                if (!empty($conf->banque->enabled) && !empty($this->amount))
-                {
-                    // Insert into llx_bank
-                    require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
-
-                    $acc = new Account($this->db);
-                    $result = $acc->fetch($this->accountid);
-                    if ($result <= 0) dol_print_error($this->db);
-
-                    // Update extrafield
-                    if (!$error) {
-                        if (!$error)
-                        {
-                            $result = $this->insertExtraFields();
-                            if ($result < 0)
-                            {
-                                $error++;
-                            }
-                        }
-                    }
-
-                    // Insert payment into llx_bank
-                    // Add link 'payment_salary' in bank_url between payment and bank transaction
-                    $bank_line_id = $acc->addline(
-                        $this->datep,
-                        $this->type_payment,
-                        $this->label,
-                        -abs($this->amount),
-                        $this->num_payment,
-                        '',
-                        $user,
-                        '',
-                        '',
-                        '',
-                        $this->datev
-                    );
-
-                    // Update fk_bank into llx_paiement.
-                    // So we know the payment which has generate the banking ecriture
-                    if ($bank_line_id > 0)
-                    {
-                        $this->update_fk_bank($bank_line_id);
-                    } else {
-                        $this->error = $acc->error;
-                        $error++;
-                    }
-
-                    if (!$error)
-                    {
-                        // Add link 'payment_salary' in bank_url between payment and bank transaction
-                        $url = DOL_URL_ROOT.'/salaries/card.php?id=';
-
-                        $result = $acc->add_url_line($bank_line_id, $this->id, $url, "(SalaryPayment)", "payment_salary");
-                        if ($result <= 0)
-                        {
-                            $this->error = $acc->error;
-                            $error++;
-                        }
-                    }
-
-                    $fuser = new User($this->db);
-                    $fuser->fetch($this->fk_user);
-
-                    // Add link 'user' in bank_url between operation and bank transaction
-                    $result = $acc->add_url_line(
-                        $bank_line_id,
-                        $this->fk_user,
-                        DOL_URL_ROOT.'/user/card.php?id=',
-                        $fuser->getFullName($langs),
-                        // $langs->trans("SalaryPayment").' '.$fuser->getFullName($langs).' '.dol_print_date($this->datesp,'dayrfc').' '.dol_print_date($this->dateep,'dayrfc'),
-                        'user'
-                    );
-
-                    if ($result <= 0)
-                    {
-                        $this->error = $acc->error;
-                        $error++;
-                    }
-                }
-
-                // Call trigger
-                $result = $this->call_trigger('PAYMENT_SALARY_CREATE', $user);
-                if ($result < 0) $error++;
-                // End call triggers
-            } else $error++;
-
-            if (!$error)
-            {
-                $this->db->commit();
-                return $this->id;
-            } else {
-                $this->db->rollback();
-                return -2;
-            }
-        } else {
-            $this->error = $this->db->error();
-            $this->db->rollback();
-            return -1;
-        }
-    }
-
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Update link between payment salary and line generate into llx_bank
-     *
-     *  @param	int		$id_bank    Id bank account
-     *	@return	int					<0 if KO, >0 if OK
-     */
-    public function update_fk_bank($id_bank)
-    {
-        // phpcs:enable
-        $sql = 'UPDATE '.MAIN_DB_PREFIX.'payment_salary SET fk_bank = '.$id_bank;
-        $sql .= ' WHERE rowid = '.$this->id;
-        $result = $this->db->query($sql);
-        if ($result)
-        {
-            return 1;
-        } else {
-            dol_print_error($this->db);
-            return -1;
-        }
-    }
-
-
-    /**
-     *	Send name clicable (with possibly the picto)
-     *
-     *	@param	int		$withpicto					0=No picto, 1=Include picto into link, 2=Only picto
-     *	@param	string	$option						link option
-     *  @param	int  	$notooltip					1=Disable tooltip
-     *  @param  string  $morecss            		Add more css on link
-     *  @param  int     $save_lastsearch_value    	-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
-     *	@return	string								Chaine with URL
-     */
-    public function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $morecss = '', $save_lastsearch_value = -1)
-    {
-        global $db, $conf, $langs, $hookmanager;
-        global $dolibarr_main_authentication, $dolibarr_main_demo;
-        global $menumanager;
-
-        if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
-
-        $result = '';
-
-        $label = '<u>'.$langs->trans("ShowSalaryPayment").'</u>';
-        $label .= '<br>';
-        $label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref;
-
-        $url = DOL_URL_ROOT.'/salaries/card.php?id='.$this->id;
-
-        if ($option != 'nolink')
-        {
-            // Add param to save lastsearch_values or not
-            $add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
-            if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
-            if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
-        }
-
-        $linkclose = '';
-        if (empty($notooltip))
-        {
-            if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-            {
-                $label = $langs->trans("ShowMyObject");
-                $linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
-            }
-            $linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
-            $linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
-
-            /*
+	/**
+	 * @var string ID to identify managed object
+	 */
+	public $element = 'payment_salary';
+
+	/**
+	 * @var string Name of table without prefix where object is stored
+	 */
+	public $table_element = 'payment_salary';
+
+	/**
+	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+	 */
+	public $picto = 'payment';
+
+	public $tms;
+
+	/**
+	 * @var int User ID
+	 */
+	public $fk_user;
+
+	public $datep;
+	public $datev;
+	public $amount;
+
+	/**
+	 * @var int ID
+	 */
+	public $fk_project;
+
+	public $type_payment;
+	public $num_payment;
+
+	/**
+	 * @var string salary payments label
+	 */
+	public $label;
+
+	public $datesp;
+	public $dateep;
+
+	/**
+	 * @var int ID
+	 */
+	public $fk_bank;
+
+	/**
+	 * @var int ID
+	 */
+	public $fk_user_author;
+
+	/**
+	 * @var int ID
+	 */
+	public $fk_user_modif;
+
+
+	/**
+	 *	Constructor
+	 *
+	 *  @param		DoliDB		$db      Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+		$this->element = 'payment_salary';
+		$this->table_element = 'payment_salary';
+	}
+
+	/**
+	 * Update database
+	 *
+	 * @param   User	$user        	User that modify
+	 * @param	int		$notrigger	    0=no, 1=yes (no update trigger)
+	 * @return  int         			<0 if KO, >0 if OK
+	 */
+	public function update($user = null, $notrigger = 0)
+	{
+		global $conf, $langs;
+
+		$error = 0;
+
+		// Clean parameters
+		$this->amount = trim($this->amount);
+		$this->label = trim($this->label);
+		$this->note = trim($this->note);
+
+		// Check parameters
+		if (empty($this->fk_user) || $this->fk_user < 0)
+		{
+			$this->error = 'ErrorBadParameter';
+			return -1;
+		}
+
+		$this->db->begin();
+
+		// Update request
+		$sql = "UPDATE ".MAIN_DB_PREFIX."payment_salary SET";
+
+		$sql .= " tms='".$this->db->idate($this->tms)."',";
+		$sql .= " fk_user=".$this->fk_user.",";
+		$sql .= " datep='".$this->db->idate($this->datep)."',";
+		$sql .= " datev='".$this->db->idate($this->datev)."',";
+		$sql .= " amount=".price2num($this->amount).",";
+		$sql .= " fk_projet=".((int) $this->fk_project).",";
+		$sql .= " fk_typepayment=".$this->fk_typepayment."',";
+		$sql .= " num_payment='".$this->db->escape($this->num_payment)."',";
+		$sql .= " label='".$this->db->escape($this->label)."',";
+		$sql .= " datesp='".$this->db->idate($this->datesp)."',";
+		$sql .= " dateep='".$this->db->idate($this->dateep)."',";
+		$sql .= " note='".$this->db->escape($this->note)."',";
+		$sql .= " fk_bank=".($this->fk_bank > 0 ? (int) $this->fk_bank : "null").",";
+		$sql .= " fk_user_author=".((int) $this->fk_user_author).",";
+		$sql .= " fk_user_modif=".($this->fk_user_modif > 0 ? (int) $this->fk_user_modif : 'null');
+
+		$sql .= " WHERE rowid=".$this->id;
+
+		dol_syslog(get_class($this)."::update", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if (!$resql)
+		{
+			$this->error = "Error ".$this->db->lasterror();
+			return -1;
+		}
+
+		// Update extrafield
+		if (!$error)
+		{
+			if (!$error)
+			{
+				$result = $this->insertExtraFields();
+				if ($result < 0)
+				{
+					$error++;
+				}
+			}
+		}
+
+		if (!$notrigger)
+		{
+			// Call trigger
+			$result = $this->call_trigger('PAYMENT_SALARY_MODIFY', $user);
+			if ($result < 0) $error++;
+			// End call triggers
+		}
+
+		if (!$error)
+		{
+			$this->db->commit();
+			return 1;
+		} else {
+			$this->db->rollback();
+			return -1;
+		}
+	}
+
+
+	/**
+	 *  Load object in memory from database
+	 *
+	 *  @param	int		$id         id object
+	 *  @param  User	$user       User that load
+	 *  @return int         		<0 if KO, >0 if OK
+	 */
+	public function fetch($id, $user = null)
+	{
+		global $langs;
+		$sql = "SELECT";
+		$sql .= " s.rowid,";
+
+		$sql .= " s.tms,";
+		$sql .= " s.fk_user,";
+		$sql .= " s.datep,";
+		$sql .= " s.datev,";
+		$sql .= " s.amount,";
+		$sql .= " s.fk_projet as fk_project,";
+		$sql .= " s.fk_typepayment,";
+		$sql .= " s.num_payment,";
+		$sql .= " s.label,";
+		$sql .= " s.datesp,";
+		$sql .= " s.dateep,";
+		$sql .= " s.note,";
+		$sql .= " s.fk_bank,";
+		$sql .= " s.fk_user_author,";
+		$sql .= " s.fk_user_modif,";
+		$sql .= " b.fk_account,";
+		$sql .= " b.fk_type,";
+		$sql .= " b.rappro";
+
+		$sql .= " FROM ".MAIN_DB_PREFIX."payment_salary as s";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank as b ON s.fk_bank = b.rowid";
+		$sql .= " WHERE s.rowid = ".$id;
+
+		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			if ($this->db->num_rows($resql))
+			{
+				$obj = $this->db->fetch_object($resql);
+
+				$this->id = $obj->rowid;
+				$this->ref				= $obj->rowid;
+				$this->tms				= $this->db->jdate($obj->tms);
+				$this->fk_user = $obj->fk_user;
+				$this->datep			= $this->db->jdate($obj->datep);
+				$this->datev			= $this->db->jdate($obj->datev);
+				$this->amount = $obj->amount;
+				$this->fk_project = $obj->fk_project;
+				$this->type_payement = $obj->fk_typepayment;
+				$this->num_payment = $obj->num_payment;
+				$this->label			= $obj->label;
+				$this->datesp			= $this->db->jdate($obj->datesp);
+				$this->dateep			= $this->db->jdate($obj->dateep);
+				$this->note				= $obj->note;
+				$this->fk_bank = $obj->fk_bank;
+				$this->fk_user_author = $obj->fk_user_author;
+				$this->fk_user_modif = $obj->fk_user_modif;
+				$this->fk_account = $obj->fk_account;
+				$this->fk_type = $obj->fk_type;
+				$this->rappro = $obj->rappro;
+
+				// Retrieve all extrafield
+				// fetch optionals attributes and labels
+				$this->fetch_optionals();
+			}
+			$this->db->free($resql);
+
+			return 1;
+		} else {
+			$this->error = "Error ".$this->db->lasterror();
+			return -1;
+		}
+	}
+
+
+	/**
+	 *  Delete object in database
+	 *
+	 *	@param	User	$user       User that delete
+	 *	@return	int					<0 if KO, >0 if OK
+	 */
+	public function delete($user)
+	{
+		global $conf, $langs;
+
+		$error = 0;
+
+		// Call trigger
+		$result = $this->call_trigger('PAYMENT_SALARY_DELETE', $user);
+		if ($result < 0) return -1;
+		// End call triggers
+
+		// Delete donation
+		if (!$error)
+		{
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX."payment_salary_extrafields";
+			$sql .= " WHERE fk_object=".$this->id;
+
+			$resql = $this->db->query($sql);
+			if (!$resql)
+			{
+				$this->errors[] = $this->db->lasterror();
+				$error++;
+			}
+		}
+
+		$sql = "DELETE FROM ".MAIN_DB_PREFIX."payment_salary";
+		$sql .= " WHERE rowid=".$this->id;
+
+		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if (!$resql)
+		{
+			$this->error = "Error ".$this->db->lasterror();
+			return -1;
+		}
+
+		return 1;
+	}
+
+
+	/**
+	 *  Initialise an instance with random values.
+	 *  Used to build previews or test instances.
+	 *	id must be 0 if object instance is a specimen.
+	 *
+	 *  @return	void
+	 */
+	public function initAsSpecimen()
+	{
+		$this->id = 0;
+
+		$this->tms = '';
+		$this->fk_user = '';
+		$this->datep = '';
+		$this->datev = '';
+		$this->amount = '';
+		$this->label = '';
+		$this->datesp = '';
+		$this->dateep = '';
+		$this->note = '';
+		$this->fk_bank = '';
+		$this->fk_user_author = '';
+		$this->fk_user_modif = '';
+	}
+
+	/**
+	 *  Create in database
+	 *
+	 *  @param      User	$user       User that create
+	 *  @return     int      			<0 if KO, >0 if OK
+	 */
+	public function create($user)
+	{
+		global $conf, $langs;
+
+		$error = 0;
+		$now = dol_now();
+
+		// Clean parameters
+		$this->amount = price2num(trim($this->amount));
+		$this->label = trim($this->label);
+		$this->note = trim($this->note);
+		$this->fk_bank = trim($this->fk_bank);
+		$this->fk_user_author = trim($this->fk_user_author);
+		$this->fk_user_modif = trim($this->fk_user_modif);
+
+		// Check parameters
+		if (!$this->label)
+		{
+			$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Label"));
+			return -3;
+		}
+		if ($this->fk_user < 0 || $this->fk_user == '')
+		{
+			$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Employee"));
+			return -4;
+		}
+		if ($this->amount < 0 || $this->amount == '')
+		{
+			$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Amount"));
+			return -5;
+		}
+		if (!empty($conf->banque->enabled) && (empty($this->accountid) || $this->accountid <= 0))
+		{
+			$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Account"));
+			return -6;
+		}
+		if (!empty($conf->banque->enabled) && (empty($this->type_payment) || $this->type_payment <= 0))
+		{
+			$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("PaymentMode"));
+			return -7;
+		}
+
+		$this->db->begin();
+
+		// Insert into llx_payment_salary
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."payment_salary (fk_user";
+		$sql .= ", datep";
+		$sql .= ", datev";
+		$sql .= ", amount";
+		$sql .= ", fk_projet";
+		$sql .= ", salary";
+		$sql .= ", fk_typepayment";
+		$sql .= ", num_payment";
+		if ($this->note) $sql .= ", note";
+		$sql .= ", label";
+		$sql .= ", datesp";
+		$sql .= ", dateep";
+		$sql .= ", fk_user_author";
+		$sql .= ", datec";
+		$sql .= ", fk_bank";
+		$sql .= ", entity";
+		$sql .= ") ";
+		$sql .= " VALUES (";
+		$sql .= "'".$this->db->escape($this->fk_user)."'";
+		$sql .= ", '".$this->db->idate($this->datep)."'";
+		$sql .= ", '".$this->db->idate($this->datev)."'";
+		$sql .= ", ".$this->amount;
+		$sql .= ", ".($this->fk_project > 0 ? $this->fk_project : 0);
+		$sql .= ", ".($this->salary > 0 ? $this->salary : "null");
+		$sql .= ", ".$this->db->escape($this->type_payment);
+		$sql .= ", '".$this->db->escape($this->num_payment)."'";
+		if ($this->note) $sql .= ", '".$this->db->escape($this->note)."'";
+		$sql .= ", '".$this->db->escape($this->label)."'";
+		$sql .= ", '".$this->db->idate($this->datesp)."'";
+		$sql .= ", '".$this->db->idate($this->dateep)."'";
+		$sql .= ", '".$this->db->escape($user->id)."'";
+		$sql .= ", '".$this->db->idate($now)."'";
+		$sql .= ", NULL";
+		$sql .= ", ".$conf->entity;
+		$sql .= ")";
+
+		dol_syslog(get_class($this)."::create", LOG_DEBUG);
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."payment_salary");
+
+			if ($this->id > 0)
+			{
+				if (!empty($conf->banque->enabled) && !empty($this->amount))
+				{
+					// Insert into llx_bank
+					require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+
+					$acc = new Account($this->db);
+					$result = $acc->fetch($this->accountid);
+					if ($result <= 0) dol_print_error($this->db);
+
+					// Update extrafield
+					if (!$error) {
+						if (!$error)
+						{
+							$result = $this->insertExtraFields();
+							if ($result < 0)
+							{
+								$error++;
+							}
+						}
+					}
+
+					// Insert payment into llx_bank
+					// Add link 'payment_salary' in bank_url between payment and bank transaction
+					$bank_line_id = $acc->addline(
+						$this->datep,
+						$this->type_payment,
+						$this->label,
+						-abs($this->amount),
+						$this->num_payment,
+						'',
+						$user,
+						'',
+						'',
+						'',
+						$this->datev
+					);
+
+					// Update fk_bank into llx_paiement.
+					// So we know the payment which has generate the banking ecriture
+					if ($bank_line_id > 0)
+					{
+						$this->update_fk_bank($bank_line_id);
+					} else {
+						$this->error = $acc->error;
+						$error++;
+					}
+
+					if (!$error)
+					{
+						// Add link 'payment_salary' in bank_url between payment and bank transaction
+						$url = DOL_URL_ROOT.'/salaries/card.php?id=';
+
+						$result = $acc->add_url_line($bank_line_id, $this->id, $url, "(SalaryPayment)", "payment_salary");
+						if ($result <= 0)
+						{
+							$this->error = $acc->error;
+							$error++;
+						}
+					}
+
+					$fuser = new User($this->db);
+					$fuser->fetch($this->fk_user);
+
+					// Add link 'user' in bank_url between operation and bank transaction
+					$result = $acc->add_url_line(
+						$bank_line_id,
+						$this->fk_user,
+						DOL_URL_ROOT.'/user/card.php?id=',
+						$fuser->getFullName($langs),
+						// $langs->trans("SalaryPayment").' '.$fuser->getFullName($langs).' '.dol_print_date($this->datesp,'dayrfc').' '.dol_print_date($this->dateep,'dayrfc'),
+						'user'
+					);
+
+					if ($result <= 0)
+					{
+						$this->error = $acc->error;
+						$error++;
+					}
+				}
+
+				// Call trigger
+				$result = $this->call_trigger('PAYMENT_SALARY_CREATE', $user);
+				if ($result < 0) $error++;
+				// End call triggers
+			} else $error++;
+
+			if (!$error)
+			{
+				$this->db->commit();
+				return $this->id;
+			} else {
+				$this->db->rollback();
+				return -2;
+			}
+		} else {
+			$this->error = $this->db->error();
+			$this->db->rollback();
+			return -1;
+		}
+	}
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Update link between payment salary and line generate into llx_bank
+	 *
+	 *  @param	int		$id_bank    Id bank account
+	 *	@return	int					<0 if KO, >0 if OK
+	 */
+	public function update_fk_bank($id_bank)
+	{
+		// phpcs:enable
+		$sql = 'UPDATE '.MAIN_DB_PREFIX.'payment_salary SET fk_bank = '.$id_bank;
+		$sql .= ' WHERE rowid = '.$this->id;
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+			return 1;
+		} else {
+			dol_print_error($this->db);
+			return -1;
+		}
+	}
+
+
+	/**
+	 *	Send name clicable (with possibly the picto)
+	 *
+	 *	@param	int		$withpicto					0=No picto, 1=Include picto into link, 2=Only picto
+	 *	@param	string	$option						link option
+	 *  @param	int  	$notooltip					1=Disable tooltip
+	 *  @param  string  $morecss            		Add more css on link
+	 *  @param  int     $save_lastsearch_value    	-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+	 *	@return	string								Chaine with URL
+	 */
+	public function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $morecss = '', $save_lastsearch_value = -1)
+	{
+		global $db, $conf, $langs, $hookmanager;
+		global $dolibarr_main_authentication, $dolibarr_main_demo;
+		global $menumanager;
+
+		if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
+
+		$result = '';
+
+		$label = img_picto('', $this->picto).' <u>'.$langs->trans("SalaryPayment").'</u>';
+		$label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
+		if (!empty($this->label)) {
+			$labeltoshow = $this->label;
+			$reg = array();
+			if (preg_match('/^\((.*)\)$/i', $this->label, $reg))
+			{
+				// Label generique car entre parentheses. On l'affiche en le traduisant
+				if ($reg[1] == 'paiement') $reg[1] = 'Payment';
+				$labeltoshow = $langs->trans($reg[1]);
+			}
+			$label .= '<br><b>'.$langs->trans('Label').':</b> '.$labeltoshow;
+		}
+
+		$url = DOL_URL_ROOT.'/salaries/card.php?id='.$this->id;
+
+		if ($option != 'nolink')
+		{
+			// Add param to save lastsearch_values or not
+			$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
+			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
+			if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
+		}
+
+		$linkclose = '';
+		if (empty($notooltip))
+		{
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+			{
+				$label = $langs->trans("ShowMyObject");
+				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
+			}
+			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
+			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
+
+			/*
              $hookmanager->initHooks(array('myobjectdao'));
              $parameters=array('id'=>$this->id);
              $reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
              if ($reshook > 0) $linkclose = $hookmanager->resPrint;
              */
-        } else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+		} else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
-        $linkstart = '<a href="'.$url.'"';
-        $linkstart .= $linkclose.'>';
-        $linkend = '</a>';
+		$linkstart = '<a href="'.$url.'"';
+		$linkstart .= $linkclose.'>';
+		$linkend = '</a>';
 
-        $result .= $linkstart;
-        if ($withpicto) $result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
-        if ($withpicto != 2) $result .= $this->ref;
-        $result .= $linkend;
-        //if ($withpicto != 2) $result.=(($addlabel && $this->label) ? $sep . dol_trunc($this->label, ($addlabel > 1 ? $addlabel : 0)) : '');
+		$result .= $linkstart;
+		if ($withpicto) $result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+		if ($withpicto != 2) $result .= $this->ref;
+		$result .= $linkend;
+		//if ($withpicto != 2) $result.=(($addlabel && $this->label) ? $sep . dol_trunc($this->label, ($addlabel > 1 ? $addlabel : 0)) : '');
 
-        global $action, $hookmanager;
-        $hookmanager->initHooks(array('salarypayment'));
-        $parameters = array('id'=>$this->id, 'getnomurl'=>$result);
-        $reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-        if ($reshook > 0) $result = $hookmanager->resPrint;
-        else $result .= $hookmanager->resPrint;
+		global $action, $hookmanager;
+		$hookmanager->initHooks(array('salarypayment'));
+		$parameters = array('id'=>$this->id, 'getnomurl'=>$result);
+		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
+		if ($reshook > 0) $result = $hookmanager->resPrint;
+		else $result .= $hookmanager->resPrint;
 
-        return $result;
-    }
+		return $result;
+	}
 
-    /**
-     * Information on record
-     *
-     * @param	int		$id      Id of record
-     * @return	void
-     */
-    public function info($id)
-    {
-        $sql = 'SELECT ps.rowid, ps.datec, ps.fk_user_author';
-        $sql .= ' FROM '.MAIN_DB_PREFIX.'payment_salary as ps';
-        $sql .= ' WHERE ps.rowid = '.$id;
+	/**
+	 * Information on record
+	 *
+	 * @param	int		$id      Id of record
+	 * @return	void
+	 */
+	public function info($id)
+	{
+		$sql = 'SELECT ps.rowid, ps.datec, ps.fk_user_author';
+		$sql .= ' FROM '.MAIN_DB_PREFIX.'payment_salary as ps';
+		$sql .= ' WHERE ps.rowid = '.$id;
 
-        dol_syslog(get_class($this).'::info', LOG_DEBUG);
-        $result = $this->db->query($sql);
+		dol_syslog(get_class($this).'::info', LOG_DEBUG);
+		$result = $this->db->query($sql);
 
-        if ($result)
-        {
-            if ($this->db->num_rows($result))
-            {
-                $obj = $this->db->fetch_object($result);
-                $this->id = $obj->rowid;
-                if ($obj->fk_user_author)
-                {
-                    $cuser = new User($this->db);
-                    $cuser->fetch($obj->fk_user_author);
-                    $this->user_creation = $cuser;
-                }
-                $this->date_creation     = $this->db->jdate($obj->datec);
-            }
-            $this->db->free($result);
-        } else {
-            dol_print_error($this->db);
-        }
-    }
+		if ($result)
+		{
+			if ($this->db->num_rows($result))
+			{
+				$obj = $this->db->fetch_object($result);
+				$this->id = $obj->rowid;
+				if ($obj->fk_user_author)
+				{
+					$cuser = new User($this->db);
+					$cuser->fetch($obj->fk_user_author);
+					$this->user_creation = $cuser;
+				}
+				$this->date_creation = $this->db->jdate($obj->datec);
+			}
+			$this->db->free($result);
+		} else {
+			dol_print_error($this->db);
+		}
+	}
 
 
-    /**
-     * Retourne le libelle du statut d'une facture (brouillon, validee, abandonnee, payee)
-     *
-     * @param	int		$mode       0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
-     * @return  string				Libelle
-     */
-    public function getLibStatut($mode = 0)
-    {
-        return $this->LibStatut($this->statut, $mode);
-    }
+	/**
+	 * Retourne le libelle du statut d'une facture (brouillon, validee, abandonnee, payee)
+	 *
+	 * @param	int		$mode       0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
+	 * @return  string				Libelle
+	 */
+	public function getLibStatut($mode = 0)
+	{
+		return $this->LibStatut($this->statut, $mode);
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * Renvoi le libelle d'un statut donne
-     *
-     * @param   int		$status     Statut
-     * @param   int		$mode       0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
-     * @return	string  		    Libelle du statut
-     */
-    public function LibStatut($status, $mode = 0)
-    {
-        // phpcs:enable
-        global $langs; // TODO Renvoyer le libelle anglais et faire traduction a affichage
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Renvoi le libelle d'un statut donne
+	 *
+	 * @param   int		$status     Statut
+	 * @param   int		$mode       0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
+	 * @return	string  		    Libelle du statut
+	 */
+	public function LibStatut($status, $mode = 0)
+	{
+		// phpcs:enable
+		global $langs; // TODO Renvoyer le libelle anglais et faire traduction a affichage
 
-        $langs->load('compta');
-        /*if ($mode == 0)
+		$langs->load('compta');
+		/*if ($mode == 0)
         {
             if ($status == 0) return $langs->trans('ToValidate');
             if ($status == 1) return $langs->trans('Validated');
@@ -727,6 +737,6 @@ class PaymentSalary extends CommonObject
             if ($status == 0) return $langs->trans('ToValidate').' '.img_picto($langs->trans('ToValidate'),'statut1');
             if ($status == 1) return $langs->trans('Validated').' '.img_picto($langs->trans('Validated'),'statut4');
         }*/
-        return '';
-    }
+		return '';
+	}
 }
diff --git a/htdocs/salaries/class/salariesstats.class.php b/htdocs/salaries/class/salariesstats.class.php
index f20bde818a1..0fcef8682a8 100644
--- a/htdocs/salaries/class/salariesstats.class.php
+++ b/htdocs/salaries/class/salariesstats.class.php
@@ -29,138 +29,138 @@ include_once DOL_DOCUMENT_ROOT.'/salaries/class/paymentsalary.class.php';
  */
 class SalariesStats extends Stats
 {
-    /**
-     * @var string Name of table without prefix where object is stored
-     */
-    public $table_element;
+	/**
+	 * @var string Name of table without prefix where object is stored
+	 */
+	public $table_element;
 
-    public $socid;
-    public $userid;
+	public $socid;
+	public $userid;
 
-    public $from;
-    public $field;
-    public $where;
+	public $from;
+	public $field;
+	public $where;
 
-    /**
-     * Constructor
-     *
-     * @param   DoliDB      $db        Database handler
-     * @param   int         $socid     Id third party
-     * @param   mixed       $userid    Id user for filter or array of user ids
-     * @return  void
-     */
-    public function __construct($db, $socid = 0, $userid = 0)
-    {
-        global $conf;
+	/**
+	 * Constructor
+	 *
+	 * @param   DoliDB      $db        Database handler
+	 * @param   int         $socid     Id third party
+	 * @param   mixed       $userid    Id user for filter or array of user ids
+	 * @return  void
+	 */
+	public function __construct($db, $socid = 0, $userid = 0)
+	{
+		global $conf;
 
-        $this->db = $db;
-        $this->socid = $socid;
-        $this->userid = $userid;
+		$this->db = $db;
+		$this->socid = $socid;
+		$this->userid = $userid;
 
-        $object = new PaymentSalary($this->db);
-        $this->from = MAIN_DB_PREFIX.$object->table_element;
-        $this->field = 'amount';
+		$object = new PaymentSalary($this->db);
+		$this->from = MAIN_DB_PREFIX.$object->table_element;
+		$this->field = 'amount';
 
-        $this->where .= " entity = ".$conf->entity;
-        if ($this->socid) {
-            $this->where .= " AND fk_soc = ".$this->socid;
-        }
-        if (is_array($this->userid) && count($this->userid) > 0) $this->where .= ' AND fk_user IN ('.join(',', $this->userid).')';
-        elseif ($this->userid > 0) $this->where .= ' AND fk_user = '.$this->userid;
-    }
+		$this->where .= " entity = ".$conf->entity;
+		if ($this->socid) {
+			$this->where .= " AND fk_soc = ".$this->socid;
+		}
+		if (is_array($this->userid) && count($this->userid) > 0) $this->where .= ' AND fk_user IN ('.join(',', $this->userid).')';
+		elseif ($this->userid > 0) $this->where .= ' AND fk_user = '.$this->userid;
+	}
 
 
-    /**
-     *  Return the number of salary by year
-     *
-     *	@return		array	Array of values
-     */
-    public function getNbByYear()
-    {
-        $sql = "SELECT YEAR(datep) as dm, count(*)";
-        $sql .= " FROM ".$this->from;
-        $sql .= " GROUP BY dm DESC";
-        $sql .= " WHERE ".$this->where;
+	/**
+	 *  Return the number of salary by year
+	 *
+	 *	@return		array	Array of values
+	 */
+	public function getNbByYear()
+	{
+		$sql = "SELECT YEAR(datep) as dm, count(*)";
+		$sql .= " FROM ".$this->from;
+		$sql .= " GROUP BY dm DESC";
+		$sql .= " WHERE ".$this->where;
 
-        return $this->_getNbByYear($sql);
-    }
+		return $this->_getNbByYear($sql);
+	}
 
 
-    /**
-     *  Return the number of salary by month, for a given year
-     *
-     *	@param	string	$year		Year to scan
-     *	@param	int		$format		0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
-     *	@return	array				Array of values
-     */
-    public function getNbByMonth($year, $format = 0)
-    {
-        $sql = "SELECT MONTH(datep) as dm, count(*)";
-        $sql .= " FROM ".$this->from;
-        $sql .= " WHERE YEAR(datep) = ".$year;
-        $sql .= " AND ".$this->where;
-        $sql .= " GROUP BY dm";
-        $sql .= $this->db->order('dm', 'DESC');
+	/**
+	 *  Return the number of salary by month, for a given year
+	 *
+	 *	@param	string	$year		Year to scan
+	 *	@param	int		$format		0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
+	 *	@return	array				Array of values
+	 */
+	public function getNbByMonth($year, $format = 0)
+	{
+		$sql = "SELECT MONTH(datep) as dm, count(*)";
+		$sql .= " FROM ".$this->from;
+		$sql .= " WHERE YEAR(datep) = ".$year;
+		$sql .= " AND ".$this->where;
+		$sql .= " GROUP BY dm";
+		$sql .= $this->db->order('dm', 'DESC');
 
-        $res = $this->_getNbByMonth($year, $sql, $format);
-        //var_dump($res);print '<br>';
-        return $res;
-    }
+		$res = $this->_getNbByMonth($year, $sql, $format);
+		//var_dump($res);print '<br>';
+		return $res;
+	}
 
 
-    /**
-     * 	Return amount of salaries by month for a given year
-     *
-     *	@param	int		$year		Year to scan
-    *	@param	int		$format		0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
-     *	@return	array				Array of values
-     */
-    public function getAmountByMonth($year, $format = 0)
-    {
-        $sql = "SELECT date_format(datep,'%m') as dm, sum(".$this->field.")";
-        $sql .= " FROM ".$this->from;
-        $sql .= " WHERE date_format(datep,'%Y') = '".$this->db->escape($year)."'";
-        $sql .= " AND ".$this->where;
-        $sql .= " GROUP BY dm";
-        $sql .= $this->db->order('dm', 'DESC');
+	/**
+	 * 	Return amount of salaries by month for a given year
+	 *
+	 *	@param	int		$year		Year to scan
+	 *	@param	int		$format		0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
+	 *	@return	array				Array of values
+	 */
+	public function getAmountByMonth($year, $format = 0)
+	{
+		$sql = "SELECT date_format(datep,'%m') as dm, sum(".$this->field.")";
+		$sql .= " FROM ".$this->from;
+		$sql .= " WHERE date_format(datep,'%Y') = '".$this->db->escape($year)."'";
+		$sql .= " AND ".$this->where;
+		$sql .= " GROUP BY dm";
+		$sql .= $this->db->order('dm', 'DESC');
 
-        $res = $this->_getAmountByMonth($year, $sql, $format);
-        //var_dump($res);print '<br>';
+		$res = $this->_getAmountByMonth($year, $sql, $format);
+		//var_dump($res);print '<br>';
 
-        return $res;
-    }
+		return $res;
+	}
 
-    /**
-     *	Return average amount
-     *
-     *	@param	int		$year		Year to scan
-     *	@return	array				Array of values
-     */
-    public function getAverageByMonth($year)
-    {
-        $sql = "SELECT date_format(datep,'%m') as dm, avg(".$this->field.")";
-        $sql .= " FROM ".$this->from;
-        $sql .= " WHERE date_format(datep,'%Y') = '".$this->db->escape($year)."'";
-        $sql .= " AND ".$this->where;
-        $sql .= " GROUP BY dm";
-        $sql .= $this->db->order('dm', 'DESC');
+	/**
+	 *	Return average amount
+	 *
+	 *	@param	int		$year		Year to scan
+	 *	@return	array				Array of values
+	 */
+	public function getAverageByMonth($year)
+	{
+		$sql = "SELECT date_format(datep,'%m') as dm, avg(".$this->field.")";
+		$sql .= " FROM ".$this->from;
+		$sql .= " WHERE date_format(datep,'%Y') = '".$this->db->escape($year)."'";
+		$sql .= " AND ".$this->where;
+		$sql .= " GROUP BY dm";
+		$sql .= $this->db->order('dm', 'DESC');
 
-        return $this->_getAverageByMonth($year, $sql);
-    }
+		return $this->_getAverageByMonth($year, $sql);
+	}
 
-    /**
-     *	Return nb, total and average
-     *
-     *	@return	array				Array of values
-     */
-    public function getAllByYear()
-    {
-        $sql = "SELECT date_format(datep,'%Y') as year, count(*) as nb, sum(".$this->field.") as total, avg(".$this->field.") as avg";
-        $sql .= " FROM ".$this->from;
-        $sql .= " WHERE ".$this->where;
-        $sql .= " GROUP BY year";
-        $sql .= $this->db->order('year', 'DESC');
+	/**
+	 *	Return nb, total and average
+	 *
+	 *	@return	array				Array of values
+	 */
+	public function getAllByYear()
+	{
+		$sql = "SELECT date_format(datep,'%Y') as year, count(*) as nb, sum(".$this->field.") as total, avg(".$this->field.") as avg";
+		$sql .= " FROM ".$this->from;
+		$sql .= " WHERE ".$this->where;
+		$sql .= " GROUP BY year";
+		$sql .= $this->db->order('year', 'DESC');
 
-        return $this->_getAllByYear($sql);
-    }
+		return $this->_getAllByYear($sql);
+	}
 }
diff --git a/htdocs/salaries/document.php b/htdocs/salaries/document.php
index 9c5f065fcf5..6cc482f1304 100644
--- a/htdocs/salaries/document.php
+++ b/htdocs/salaries/document.php
@@ -122,7 +122,7 @@ if ($object->id)
 
 	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	$modulepart = 'salaries';
 	$permission = $user->rights->salaries->write;
diff --git a/htdocs/salaries/info.php b/htdocs/salaries/info.php
index 6a98f42d2f0..9461bae867e 100644
--- a/htdocs/salaries/info.php
+++ b/htdocs/salaries/info.php
@@ -77,7 +77,7 @@ print '</td></tr></table>';
 
 print '</div>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // End of page
 llxFooter();
diff --git a/htdocs/salaries/list.php b/htdocs/salaries/list.php
index 9341599ba70..8f6f636c4b2 100644
--- a/htdocs/salaries/list.php
+++ b/htdocs/salaries/list.php
@@ -86,7 +86,7 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
 	$search_date_end = '';
 	$search_amount = "";
 	$search_account = '';
-    $typeid = "";
+	$typeid = "";
 }
 
 
@@ -122,11 +122,11 @@ if ($search_date_end)		$sql .= " AND s.datep <= '".$db->idate($search_date_end).
 if ($search_amount)			$sql .= natural_search("s.amount", $search_amount, 1);
 if ($search_account > 0)	$sql .= " AND b.fk_account=".$search_account;
 if ($filtre) {
-    $filtre = str_replace(":", "=", $filtre);
-    $sql .= " AND ".$filtre;
+	$filtre = str_replace(":", "=", $filtre);
+	$sql .= " AND ".$filtre;
 }
 if ($typeid) {
-    $sql .= " AND s.fk_typepayment=".$typeid;
+	$sql .= " AND s.fk_typepayment=".$typeid;
 }
 $sql .= $db->order($sortfield, $sortorder);
 
@@ -135,7 +135,7 @@ $totalnboflines = 0;
 $result = $db->query($sql);
 if ($result)
 {
-    $totalnboflines = $db->num_rows($result);
+	$totalnboflines = $db->num_rows($result);
 }
 $sql .= $db->plimit($limit + 1, $offset);
 
@@ -143,12 +143,12 @@ $sql .= $db->plimit($limit + 1, $offset);
 $result = $db->query($sql);
 if ($result)
 {
-    $num = $db->num_rows($result);
-    $i = 0;
-    $total = 0;
+	$num = $db->num_rows($result);
+	$i = 0;
+	$total = 0;
 
 	$param = '';
-    if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
+	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
 	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
 	if ($typeid) $param .= '&amp;typeid='.$typeid;
 	if ($optioncss != '') $param .= '&amp;optioncss='.$optioncss;
@@ -158,17 +158,17 @@ if ($result)
 	$newcardbutton = dolGetButtonTitle($langs->trans('NewSalaryPayment'), '', 'fa fa-plus-circle', $url, '', $user->rights->salaries->write);
 
 	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
-    if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
+	if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
-    print '<input type="hidden" name="action" value="list">';
-    print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
-    print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+	print '<input type="hidden" name="action" value="list">';
+	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 
-    print_barre_liste($langs->trans("SalariesPayments"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $totalnboflines, 'object_payment', 0, $newcardbutton, '', $limit, 0, 0, 1);
+	print_barre_liste($langs->trans("SalariesPayments"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $totalnboflines, 'object_payment', 0, $newcardbutton, '', $limit, 0, 0, 1);
 
-    print '<div class="div-table-responsive">';
-    print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
+	print '<div class="div-table-responsive">';
+	print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 	print '<tr class="liste_titre_filter">';
 	// Ref
@@ -196,51 +196,51 @@ if ($result)
 	print '</td>';
 	// Account
 	if (!empty($conf->banque->enabled))
-    {
-	    print '<td class="liste_titre">';
-	    $form->select_comptes($search_account, 'search_account', 0, '', 1);
-	    print '</td>';
-    }
+	{
+		print '<td class="liste_titre">';
+		$form->select_comptes($search_account, 'search_account', 0, '', 1);
+		print '</td>';
+	}
 	// Amount
 	print '<td class="liste_titre right"><input name="search_amount" class="flat" type="text" size="8" value="'.$db->escape($search_amount).'"></td>';
 
-    print '<td class="liste_titre maxwidthsearch">';
-    $searchpicto = $form->showFilterAndCheckAddButtons(0);
-    print $searchpicto;
-    print '</td>';
+	print '<td class="liste_titre maxwidthsearch">';
+	$searchpicto = $form->showFilterAndCheckAddButtons(0);
+	print $searchpicto;
+	print '</td>';
 
-    print '<tr class="liste_titre">';
-    print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "s.rowid", "", $param, "", $sortfield, $sortorder);
-    print_liste_field_titre("Employee", $_SERVER["PHP_SELF"], "u.rowid", "", $param, "", $sortfield, $sortorder);
-    print_liste_field_titre("Label", $_SERVER["PHP_SELF"], "s.label", "", $param, 'class="left"', $sortfield, $sortorder);
-    print_liste_field_titre("DatePayment", $_SERVER["PHP_SELF"], "s.datep,s.rowid", "", $param, 'align="center"', $sortfield, $sortorder);
-    print_liste_field_titre("PaymentMode", $_SERVER["PHP_SELF"], "type", "", $param, 'class="left"', $sortfield, $sortorder);
-    if (!empty($conf->banque->enabled)) print_liste_field_titre("BankAccount", $_SERVER["PHP_SELF"], "ba.label", "", $param, "", $sortfield, $sortorder);
-    print_liste_field_titre("PayedByThisPayment", $_SERVER["PHP_SELF"], "s.amount", "", $param, 'class="right"', $sortfield, $sortorder);
-    print_liste_field_titre('', $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'maxwidthsearch ');
-    print "</tr>\n";
+	print '<tr class="liste_titre">';
+	print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "s.rowid", "", $param, "", $sortfield, $sortorder);
+	print_liste_field_titre("Employee", $_SERVER["PHP_SELF"], "u.rowid", "", $param, "", $sortfield, $sortorder);
+	print_liste_field_titre("Label", $_SERVER["PHP_SELF"], "s.label", "", $param, 'class="left"', $sortfield, $sortorder);
+	print_liste_field_titre("DatePayment", $_SERVER["PHP_SELF"], "s.datep,s.rowid", "", $param, 'align="center"', $sortfield, $sortorder);
+	print_liste_field_titre("PaymentMode", $_SERVER["PHP_SELF"], "type", "", $param, 'class="left"', $sortfield, $sortorder);
+	if (!empty($conf->banque->enabled)) print_liste_field_titre("BankAccount", $_SERVER["PHP_SELF"], "ba.label", "", $param, "", $sortfield, $sortorder);
+	print_liste_field_titre("PayedByThisPayment", $_SERVER["PHP_SELF"], "s.amount", "", $param, 'class="right"', $sortfield, $sortorder);
+	print_liste_field_titre('', $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'maxwidthsearch ');
+	print "</tr>\n";
 
 	print "</tr>\n";
 
-    while ($i < min($num, $limit))
-    {
-        $obj = $db->fetch_object($result);
+	while ($i < min($num, $limit))
+	{
+		$obj = $db->fetch_object($result);
 
-        print '<tr class="oddeven">';
+		print '<tr class="oddeven">';
 
-        $userstatic->id = $obj->uid;
-        $userstatic->lastname = $obj->lastname;
-        $userstatic->firstname = $obj->firstname;
-        $userstatic->admin = $obj->admin;
-        $userstatic->login = $obj->login;
-        $userstatic->email = $obj->email;
-        $userstatic->socid = $obj->fk_soc;
-        $userstatic->statut = $obj->status;
+		$userstatic->id = $obj->uid;
+		$userstatic->lastname = $obj->lastname;
+		$userstatic->firstname = $obj->firstname;
+		$userstatic->admin = $obj->admin;
+		$userstatic->login = $obj->login;
+		$userstatic->email = $obj->email;
+		$userstatic->socid = $obj->fk_soc;
+		$userstatic->statut = $obj->status;
 
-        $salstatic->id = $obj->rowid;
+		$salstatic->id = $obj->rowid;
 		$salstatic->ref = $obj->rowid;
 
-        // Ref
+		// Ref
 		print "<td>".$salstatic->getNomUrl(1)."</td>\n";
 		if (!$i) $totalarray['nbfield']++;
 
@@ -249,27 +249,27 @@ if ($result)
 		if (!$i) $totalarray['nbfield']++;
 
 		// Label payment
-        print "<td>".dol_trunc($obj->label, 40)."</td>\n";
+		print "<td>".dol_trunc($obj->label, 40)."</td>\n";
 		if (!$i) $totalarray['nbfield']++;
 
 		// Date payment
-        print '<td class="center">'.dol_print_date($db->jdate($obj->datep), 'day')."</td>\n";
+		print '<td class="center">'.dol_print_date($db->jdate($obj->datep), 'day')."</td>\n";
 		if (!$i) $totalarray['nbfield']++;
 
-        // Type
-        print '<td>'.$langs->trans("PaymentTypeShort".$obj->payment_code).' '.$obj->num_payment.'</td>';
+		// Type
+		print '<td>'.$langs->trans("PaymentTypeShort".$obj->payment_code).' '.$obj->num_payment.'</td>';
 		if (!$i) $totalarray['nbfield']++;
 
 		// Account
-    	if (!empty($conf->banque->enabled))
-	    {
-	        print '<td>';
-	        if ($obj->fk_bank > 0)
-	        {
-	        	//$accountstatic->fetch($obj->fk_bank);
-	            $accountstatic->id = $obj->bid;
-	            $accountstatic->ref = $obj->bref;
-	            $accountstatic->number = $obj->bnumber;
+		if (!empty($conf->banque->enabled))
+		{
+			print '<td>';
+			if ($obj->fk_bank > 0)
+			{
+				//$accountstatic->fetch($obj->fk_bank);
+				$accountstatic->id = $obj->bid;
+				$accountstatic->ref = $obj->bref;
+				$accountstatic->number = $obj->bnumber;
 
 				if (!empty($conf->accounting->enabled))
 				{
@@ -280,38 +280,38 @@ if ($result)
 
 					$accountstatic->accountancy_journal = $accountingjournal->getNomUrl(0, 1, 1, '', 1);
 				}
-	            $accountstatic->label = $obj->blabel;
-	        	print $accountstatic->getNomUrl(1);
-	        } else print '&nbsp;';
-	        print '</td>';
+				$accountstatic->label = $obj->blabel;
+				print $accountstatic->getNomUrl(1);
+			} else print '&nbsp;';
+			print '</td>';
 			if (!$i) $totalarray['nbfield']++;
-	    }
+		}
 
-        // Amount
-        print '<td class="nowrap right">'.price($obj->amount).'</td>';
+		// Amount
+		print '<td class="nowrap right">'.price($obj->amount).'</td>';
 		if (!$i) $totalarray['nbfield']++;
 		if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'totalttcfield';
 		$totalarray['val']['totalttcfield'] += $obj->amount;
 
-        print '<td></td>';
+		print '<td></td>';
 
 		if (!$i) $totalarray['nbfield']++;
 
-        print "</tr>\n";
+		print "</tr>\n";
 
-        $i++;
-    }
+		$i++;
+	}
 
 	// Show total line
 	include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
 
-    print "</table>";
-    print '</div>';
+	print "</table>";
+	print '</div>';
 	print '</form>';
 
-    $db->free($result);
+	$db->free($result);
 } else {
-    dol_print_error($db);
+	dol_print_error($db);
 }
 
 // End of page
diff --git a/htdocs/salaries/stats/index.php b/htdocs/salaries/stats/index.php
index 6cd554b54df..1f0598f4245 100644
--- a/htdocs/salaries/stats/index.php
+++ b/htdocs/salaries/stats/index.php
@@ -270,7 +270,7 @@ print '</div></div></div>';
 print '<div style="clear:both"></div>';
 
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // End of page
 llxFooter();
diff --git a/htdocs/societe/admin/contact_extrafields.php b/htdocs/societe/admin/contact_extrafields.php
index a02327067d4..a52bf52332b 100644
--- a/htdocs/societe/admin/contact_extrafields.php
+++ b/htdocs/societe/admin/contact_extrafields.php
@@ -73,7 +73,7 @@ print dol_get_fiche_head($head, 'attributes_contacts', $langs->trans("ThirdParti
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 // Buttons
diff --git a/htdocs/societe/admin/societe.php b/htdocs/societe/admin/societe.php
index 45224226070..4a9c40acd11 100644
--- a/htdocs/societe/admin/societe.php
+++ b/htdocs/societe/admin/societe.php
@@ -77,10 +77,10 @@ if ($action == 'updateoptions')
 		$res = dolibarr_set_const($db, "COMPANY_USE_SEARCH_TO_SELECT", $companysearch, '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');
 		}
 	}
 
@@ -154,7 +154,7 @@ if ($action == 'setdoc')
 	$sql_del .= " WHERE nom = '".$db->escape(GETPOST('value', 'alpha'))."'";
 	$sql_del .= " AND type = '".$db->escape($type)."'";
 	$sql_del .= " AND entity = ".$conf->entity;
-    dol_syslog("societe.php ".$sql);
+	dol_syslog("societe.php ".$sql);
 	$result1 = $db->query($sql_del);
 
 	$sql = "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity, libelle, description)";
@@ -162,13 +162,13 @@ if ($action == 'setdoc')
 	$sql .= ($label ? "'".$db->escape($label)."'" : 'null').", ";
 	$sql .= (!empty($scandir) ? "'".$db->escape($scandir)."'" : "null");
 	$sql .= ")";
-    dol_syslog("societe.php", LOG_DEBUG);
+	dol_syslog("societe.php", LOG_DEBUG);
 	$result2 = $db->query($sql);
 	if ($result1 && $result2)
 	{
 		$db->commit();
 	} else {
-	    $db->rollback();
+		$db->rollback();
 	}
 }
 
@@ -213,15 +213,15 @@ if ($action == "setaskforshippingmet") {
 
 //Activate "Disable prospect/customer type"
 if ($action == "setdisableprospectcustomer") {
-    $setdisableprospectcustomer = GETPOST('value', 'int');
-    $res = dolibarr_set_const($db, "SOCIETE_DISABLE_PROSPECTSCUSTOMERS", $setdisableprospectcustomer, 'yesno', 0, '', $conf->entity);
-    if (!$res > 0) $error++;
-    if (!$error)
-    {
-        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    } else {
-        setEventMessages($langs->trans("Error"), null, 'errors');
-    }
+	$setdisableprospectcustomer = GETPOST('value', 'int');
+	$res = dolibarr_set_const($db, "SOCIETE_DISABLE_PROSPECTSCUSTOMERS", $setdisableprospectcustomer, 'yesno', 0, '', $conf->entity);
+	if (!$res > 0) $error++;
+	if (!$error)
+	{
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
+		setEventMessages($langs->trans("Error"), null, 'errors');
+	}
 }
 
 //Activate ProfId unique
@@ -283,15 +283,15 @@ if ($action == 'sethideinactivethirdparty')
 	}
 }
 if ($action == 'setonsearchandlistgooncustomerorsuppliercard') {
-    $setonsearchandlistgooncustomerorsuppliercard = GETPOST('value', 'int');
-    $res = dolibarr_set_const($db, "SOCIETE_ON_SEARCH_AND_LIST_GO_ON_CUSTOMER_OR_SUPPLIER_CARD", $setonsearchandlistgooncustomerorsuppliercard, 'yesno', 0, '', $conf->entity);
-    if (!$res > 0) $error++;
-    if (!$error)
-    {
-        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    } else {
-        setEventMessages($langs->trans("Error"), null, 'errors');
-    }
+	$setonsearchandlistgooncustomerorsuppliercard = GETPOST('value', 'int');
+	$res = dolibarr_set_const($db, "SOCIETE_ON_SEARCH_AND_LIST_GO_ON_CUSTOMER_OR_SUPPLIER_CARD", $setonsearchandlistgooncustomerorsuppliercard, 'yesno', 0, '', $conf->entity);
+	if (!$res > 0) $error++;
+	if (!$error)
+	{
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
+		setEventMessages($langs->trans("Error"), null, 'errors');
+	}
 }
 
 /*
@@ -336,34 +336,34 @@ foreach ($dirsociete as $dirroot)
 {
 	$dir = dol_buildpath($dirroot, 0);
 
-    $handle = @opendir($dir);
-    if (is_resource($handle))
-    {
-    	// Loop on each module find in opened directory
-    	while (($file = readdir($handle)) !== false)
-    	{
-    		if (substr($file, 0, 15) == 'mod_codeclient_' && substr($file, -3) == 'php')
-    		{
-    			$file = substr($file, 0, dol_strlen($file) - 4);
+	$handle = @opendir($dir);
+	if (is_resource($handle))
+	{
+		// Loop on each module find in opened directory
+		while (($file = readdir($handle)) !== false)
+		{
+			if (substr($file, 0, 15) == 'mod_codeclient_' && substr($file, -3) == 'php')
+			{
+				$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);
+				}
 
-    			$modCodeTiers = new $file;
+				$modCodeTiers = new $file;
 
-    			// Show modules according to features level
-    			if ($modCodeTiers->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
-    			if ($modCodeTiers->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
+				// Show modules according to features level
+				if ($modCodeTiers->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
+				if ($modCodeTiers->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
 
-    			$arrayofmodules[$file] = $modCodeTiers;
-    		}
-    	}
-    	closedir($handle);
-    }
+				$arrayofmodules[$file] = $modCodeTiers;
+			}
+		}
+		closedir($handle);
+	}
 }
 
 $arrayofmodules = dol_sort_array($arrayofmodules, 'position');
@@ -423,28 +423,28 @@ foreach ($dirsociete as $dirroot)
 	$dir = dol_buildpath($dirroot, 0);
 
 	$handle = @opendir($dir);
-    if (is_resource($handle))
-    {
-    	while (($file = readdir($handle)) !== false)
-    	{
-    		if (substr($file, 0, 15) == 'mod_codecompta_' && substr($file, -3) == 'php')
-    		{
-    			$file = substr($file, 0, dol_strlen($file) - 4);
+	if (is_resource($handle))
+	{
+		while (($file = readdir($handle)) !== false)
+		{
+			if (substr($file, 0, 15) == 'mod_codecompta_' && substr($file, -3) == 'php')
+			{
+				$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);
+				}
 
-    			$modCodeCompta = new $file;
+				$modCodeCompta = new $file;
 
-    			$arrayofmodules[$file] = $modCodeCompta;
-    		}
-    	}
-        closedir($handle);
-    }
+				$arrayofmodules[$file] = $modCodeCompta;
+			}
+		}
+		closedir($handle);
+	}
 }
 
 $arrayofmodules = dol_sort_array($arrayofmodules, 'position');
@@ -452,27 +452,27 @@ $arrayofmodules = dol_sort_array($arrayofmodules, 'position');
 
 foreach ($arrayofmodules as $file => $modCodeCompta)
 {
-    print '<tr class="oddeven">';
-    print '<td>'.$modCodeCompta->name."</td><td>\n";
-    print $modCodeCompta->info($langs);
-    print '</td>';
-    print '<td class="nowrap">'.$modCodeCompta->getExample($langs)."</td>\n";
+	print '<tr class="oddeven">';
+	print '<td>'.$modCodeCompta->name."</td><td>\n";
+	print $modCodeCompta->info($langs);
+	print '</td>';
+	print '<td class="nowrap">'.$modCodeCompta->getExample($langs)."</td>\n";
 
-    if ($conf->global->SOCIETE_CODECOMPTA_ADDON == "$file")
-    {
-    	print '<td class="center">';
-    	print img_picto($langs->trans("Activated"), 'switch_on');
-    	print '</td>';
-    } else {
-    	print '<td class="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setcodecompta&amp;token='.newToken().'&amp;value='.urlencode($file).'">';
-    	print img_picto($langs->trans("Disabled"), 'switch_off');
-    	print '</a></td>';
-    }
-    print '<td class="center">';
-    $s = $modCodeCompta->getToolTip($langs, null, -1);
-    print $form->textwithpicto('', $s, 1);
-    print '</td>';
-    print "</tr>\n";
+	if ($conf->global->SOCIETE_CODECOMPTA_ADDON == "$file")
+	{
+		print '<td class="center">';
+		print img_picto($langs->trans("Activated"), 'switch_on');
+		print '</td>';
+	} else {
+		print '<td class="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setcodecompta&amp;token='.newToken().'&amp;value='.urlencode($file).'">';
+		print img_picto($langs->trans("Disabled"), 'switch_off');
+		print '</a></td>';
+	}
+	print '<td class="center">';
+	$s = $modCodeCompta->getToolTip($langs, null, -1);
+	print $form->textwithpicto('', $s, 1);
+	print '</td>';
+	print "</tr>\n";
 }
 print "</table>\n";
 print '</div>';
@@ -529,14 +529,14 @@ foreach ($dirsociete as $dirroot)
 				$name = substr($file, 4, dol_strlen($file) - 16);
 				$classname = substr($file, 0, dol_strlen($file) - 12);
 
-			    try {
-        			dol_include_once($dirroot.'doc/'.$file);
-    			} catch (Exception $e)
-    			{
-    			    dol_syslog($e->getMessage(), LOG_ERR);
-    			}
+				try {
+					dol_include_once($dirroot.'doc/'.$file);
+				} catch (Exception $e)
+				{
+					dol_syslog($e->getMessage(), LOG_ERR);
+				}
 
-    			$module = new $classname($db);
+				$module = new $classname($db);
 
 				$modulequalified = 1;
 				if (!empty($module->version)) {
@@ -736,8 +736,8 @@ if (!$conf->use_javascript_ajax)
 	print '<td width="60" class="right">';
 	$arrval = array('0'=>$langs->trans("No"),
 	'1'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch", 1).')',
-    '2'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch", 2).')',
-    '3'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch", 3).')',
+	'2'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch", 2).')',
+	'3'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch", 3).')',
 	);
 	print $form->selectarray("activate_COMPANY_USE_SEARCH_TO_SELECT", $arrval, $conf->global->COMPANY_USE_SEARCH_TO_SELECT, 0, 0, 0, '', 0, 0, 0, '', 'minwidth75imp');
 	print '</td><td class="right">';
@@ -801,7 +801,7 @@ print '</a></td>';
 print '</tr>';
 
 if (!empty($conf->expedition->enabled)) {
-	if (! empty($conf->global->MAIN_FEATURES_LEVEL)) {	// Visible on experimental only because seems to not be implemented everywhere (only on proposal)
+	if (!empty($conf->global->MAIN_FEATURES_LEVEL)) {	// Visible on experimental only because seems to not be implemented everywhere (only on proposal)
 		print '<tr class="oddeven">';
 		print '<td width="80%">'.$langs->trans("AskForPreferredShippingMethod").'</td>';
 		print '<td>&nbsp</td>';
@@ -826,11 +826,11 @@ print '<td>&nbsp</td>';
 print '<td class="center">';
 if (!empty($conf->global->SOCIETE_DISABLE_PROSPECTSCUSTOMERS))
 {
-    print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setdisableprospectcustomer&token='.newToken().'&value=0">';
-    print img_picto($langs->trans("Activated"), 'switch_on');
+	print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setdisableprospectcustomer&token='.newToken().'&value=0">';
+	print img_picto($langs->trans("Activated"), 'switch_on');
 } else {
-    print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setdisableprospectcustomer&token='.newToken().'&value=1">';
-    print img_picto($langs->trans("Disabled"), 'switch_off');
+	print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setdisableprospectcustomer&token='.newToken().'&value=1">';
+	print img_picto($langs->trans("Disabled"), 'switch_off');
 }
 print '</a></td>';
 print '</tr>';
@@ -852,7 +852,7 @@ print '</div>';
 print '</form>';
 
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // End of page
 llxFooter();
diff --git a/htdocs/societe/admin/societe_extrafields.php b/htdocs/societe/admin/societe_extrafields.php
index 3511f5afb2b..16d88142588 100644
--- a/htdocs/societe/admin/societe_extrafields.php
+++ b/htdocs/societe/admin/societe_extrafields.php
@@ -73,7 +73,7 @@ print dol_get_fiche_head($head, 'attributes', $langs->trans("ThirdParties"), -1,
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 // Buttons
diff --git a/htdocs/societe/agenda.php b/htdocs/societe/agenda.php
index 41fa2100535..f98f7ac7ccf 100644
--- a/htdocs/societe/agenda.php
+++ b/htdocs/societe/agenda.php
@@ -36,10 +36,10 @@ $langs->loadLangs(array("companies", "bills", "propal", "orders"));
 
 if (GETPOST('actioncode', 'array'))
 {
-    $actioncode = GETPOST('actioncode', 'array', 3);
-    if (!count($actioncode)) $actioncode = '0';
+	$actioncode = GETPOST('actioncode', 'array', 3);
+	if (!count($actioncode)) $actioncode = '0';
 } else {
-    $actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT));
+	$actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT));
 }
 $search_agenda_label = GETPOST('search_agenda_label');
 
@@ -73,19 +73,19 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 
 if (empty($reshook))
 {
-    // Cancel
-    if (GETPOST('cancel', 'alpha') && !empty($backtopage))
-    {
-        header("Location: ".$backtopage);
-        exit;
-    }
+	// Cancel
+	if (GETPOST('cancel', 'alpha') && !empty($backtopage))
+	{
+		header("Location: ".$backtopage);
+		exit;
+	}
 
-    // Purge search criteria
-    if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
-    {
-        $actioncode = '';
-        $search_agenda_label = '';
-    }
+	// Purge search criteria
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
+	{
+		$actioncode = '';
+		$search_agenda_label = '';
+	}
 }
 
 
@@ -113,64 +113,64 @@ if ($socid > 0)
 
 	print dol_get_fiche_head($head, 'agenda', $langs->trans("ThirdParty"), -1, 'company');
 
-    $linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+	$linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-    dol_banner_tab($object, 'socid', $linkback, ($user->socid ? 0 : 1), 'rowid', 'nom');
+	dol_banner_tab($object, 'socid', $linkback, ($user->socid ? 0 : 1), 'rowid', 'nom');
 
-    print '<div class="fichecenter">';
+	print '<div class="fichecenter">';
 
-    print '<div class="underbanner clearboth"></div>';
+	print '<div class="underbanner clearboth"></div>';
 
-    $object->info($socid);
+	$object->info($socid);
 	dol_print_object_info($object, 1);
 
 	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 
 
 	// Actions buttons
 
-    $objthirdparty = $object;
-    $objcon = new stdClass();
+	$objthirdparty = $object;
+	$objcon = new stdClass();
 
-    $out = '';
-    $permok = $user->rights->agenda->myactions->create;
-    if ((!empty($objthirdparty->id) || !empty($objcon->id)) && $permok)
-    {
+	$out = '';
+	$permok = $user->rights->agenda->myactions->create;
+	if ((!empty($objthirdparty->id) || !empty($objcon->id)) && $permok)
+	{
 		if (is_object($objthirdparty) && get_class($objthirdparty) == 'Societe') $out .= '&amp;originid='.$objthirdparty->id.($objthirdparty->id > 0 ? '&amp;socid='.$objthirdparty->id : '').'&amp;backtopage='.urlencode($_SERVER['PHP_SELF'].($objthirdparty->id > 0 ? '?socid='.$objthirdparty->id : ''));
 		$out .= (!empty($objcon->id) ? '&amp;contactid='.$objcon->id : '').'&amp;percentage=-1';
 		$out .= '&amp;datep='.dol_print_date(dol_now(), 'dayhourlog');
 	}
 
 	$newcardbutton = '';
-    if (!empty($conf->agenda->enabled))
-    {
-    	if (!empty($user->rights->agenda->myactions->create) || !empty($user->rights->agenda->allactions->create))
-    	{
-            $newcardbutton .= dolGetButtonTitle($langs->trans('AddAction'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/comm/action/card.php?action=create'.$out);
-    	}
-    }
+	if (!empty($conf->agenda->enabled))
+	{
+		if (!empty($user->rights->agenda->myactions->create) || !empty($user->rights->agenda->allactions->create))
+		{
+			$newcardbutton .= dolGetButtonTitle($langs->trans('AddAction'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/comm/action/card.php?action=create'.$out);
+		}
+	}
 
-    if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read)))
-    {
-    	print '<br>';
+	if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read)))
+	{
+		print '<br>';
 
-        $param = '&socid='.$socid;
-        if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
-        if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
+		$param = '&socid='.$socid;
+		if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
+		if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
 
 		print load_fiche_titre($langs->trans("ActionsOnCompany"), $newcardbutton, '');
-        //print_barre_liste($langs->trans("ActionsOnCompany"), 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', 0, -1, '', 0, $newcardbutton, '', 0, 1, 1);
+		//print_barre_liste($langs->trans("ActionsOnCompany"), 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', 0, -1, '', 0, $newcardbutton, '', 0, 1, 1);
 
-        // List of all actions
+		// List of all actions
 		$filters = array();
-        $filters['search_agenda_label'] = $search_agenda_label;
+		$filters['search_agenda_label'] = $search_agenda_label;
 
-        // TODO Replace this with same code than into list.php
-        show_actions_done($conf, $langs, $db, $object, null, 0, $actioncode, '', $filters, $sortfield, $sortorder);
-    }
+		// TODO Replace this with same code than into list.php
+		show_actions_done($conf, $langs, $db, $object, null, 0, $actioncode, '', $filters, $sortfield, $sortorder);
+	}
 }
 
 // End of page
diff --git a/htdocs/societe/ajaxcompanies.php b/htdocs/societe/ajaxcompanies.php
index b98a5f75d5b..da7591a419b 100644
--- a/htdocs/societe/ajaxcompanies.php
+++ b/htdocs/societe/ajaxcompanies.php
@@ -64,18 +64,18 @@ if (GETPOST('newcompany') || GETPOST('socid', 'int') || GETPOST('id_fourn'))
 	$sql .= " WHERE s.entity IN (".getEntity('societe').")";
 	if ($socid)
 	{
-        $sql .= " AND (";
-        // Add criteria on name/code
-        if (!empty($conf->global->COMPANY_DONOTSEARCH_ANYWHERE))   // Can use index
-        {
-            $sql .= "nom LIKE '".$db->escape($socid)."%'";
-            $sql .= " OR code_client LIKE '".$db->escape($socid)."%'";
-            $sql .= " OR code_fournisseur LIKE '".$db->escape($socid)."%'";
-        } else {
-    		$sql .= "nom LIKE '%".$db->escape($socid)."%'";
-    		$sql .= " OR code_client LIKE '%".$db->escape($socid)."%'";
-    		$sql .= " OR code_fournisseur LIKE '%".$db->escape($socid)."%'";
-        }
+		$sql .= " AND (";
+		// Add criteria on name/code
+		if (!empty($conf->global->COMPANY_DONOTSEARCH_ANYWHERE))   // Can use index
+		{
+			$sql .= "nom LIKE '".$db->escape($socid)."%'";
+			$sql .= " OR code_client LIKE '".$db->escape($socid)."%'";
+			$sql .= " OR code_fournisseur LIKE '".$db->escape($socid)."%'";
+		} else {
+			$sql .= "nom LIKE '%".$db->escape($socid)."%'";
+			$sql .= " OR code_client LIKE '%".$db->escape($socid)."%'";
+			$sql .= " OR code_fournisseur LIKE '%".$db->escape($socid)."%'";
+		}
 		if (!empty($conf->global->SOCIETE_ALLOW_SEARCH_ON_ROWID)) $sql .= " OR rowid = '".$db->escape($socid)."'";
 		$sql .= ")";
 	}
@@ -88,19 +88,19 @@ if (GETPOST('newcompany') || GETPOST('socid', 'int') || GETPOST('id_fourn'))
 	{
 		while ($row = $db->fetch_array($resql))
 		{
-		    $label = $row['nom'];
-		    if ($socid) $label = preg_replace('/('.preg_quote($socid, '/').')/i', '<strong>$1</strong>', $label, 1);
+			$label = $row['nom'];
+			if ($socid) $label = preg_replace('/('.preg_quote($socid, '/').')/i', '<strong>$1</strong>', $label, 1);
 			$row_array['label'] = $label;
 			$row_array['value'] = $row['nom'];
-	        $row_array['key'] = $row['rowid'];
+			$row_array['key'] = $row['rowid'];
 
-	        array_push($return_arr, $row_array);
-	    }
+			array_push($return_arr, $row_array);
+		}
 
-	    echo json_encode($return_arr);
+		echo json_encode($return_arr);
 	} else {
-	    echo json_encode(array('nom'=>'Error', 'label'=>'Error', 'key'=>'Error', 'value'=>'Error'));
+		echo json_encode(array('nom'=>'Error', 'label'=>'Error', 'key'=>'Error', 'value'=>'Error'));
 	}
 } else {
-    echo json_encode(array('nom'=>'ErrorBadParameter', 'label'=>'ErrorBadParameter', 'key'=>'ErrorBadParameter', 'value'=>'ErrorBadParameter'));
+	echo json_encode(array('nom'=>'ErrorBadParameter', 'label'=>'ErrorBadParameter', 'key'=>'ErrorBadParameter', 'value'=>'ErrorBadParameter'));
 }
diff --git a/htdocs/societe/canvas/actions_card_common.class.php b/htdocs/societe/canvas/actions_card_common.class.php
index fa650a4e1fd..83309e0faf1 100644
--- a/htdocs/societe/canvas/actions_card_common.class.php
+++ b/htdocs/societe/canvas/actions_card_common.class.php
@@ -27,15 +27,15 @@
  */
 abstract class ActionsCardCommon
 {
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $dirmodule;
-    public $targetmodule;
-    public $canvas;
-    public $card;
+	public $dirmodule;
+	public $targetmodule;
+	public $canvas;
+	public $card;
 
 	//! Template container
 	public $tpl = array();
@@ -55,22 +55,22 @@ abstract class ActionsCardCommon
 
 
 	/**
-     *  Get object from id or ref and save it into this->object
+	 *  Get object from id or ref and save it into this->object
 	 *
-     *  @param		int		$id			Object id
-     *  @param		string	$ref		Object ref
-     *  @return		object				Object loaded
-     */
-    protected function getObject($id, $ref = '')
-    {
-    	//$ret = $this->getInstanceDao();
+	 *  @param		int		$id			Object id
+	 *  @param		string	$ref		Object ref
+	 *  @return		object				Object loaded
+	 */
+	protected function getObject($id, $ref = '')
+	{
+		//$ret = $this->getInstanceDao();
 
-    	$object = new Societe($this->db);
-    	if (!empty($id) || !empty($ref)) $object->fetch($id, $ref);
-    	$this->object = $object;
-    }
+		$object = new Societe($this->db);
+		if (!empty($id) || !empty($ref)) $object->fetch($id, $ref);
+		$this->object = $object;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *    Assign custom values for canvas (for example into this->tpl to be used by templates)
 	 *
@@ -78,32 +78,32 @@ abstract class ActionsCardCommon
 	 *    @param	integer	$id			Id of object
 	 *    @param	string	$ref		Ref of object
 	 *    @return	void
-     */
-    public function assign_values(&$action, $id = 0, $ref = '')
-    {
-        // phpcs:enable
-        global $conf, $langs, $db, $user, $mysoc, $canvas;
-        global $form, $formadmin, $formcompany;
+	 */
+	public function assign_values(&$action, $id = 0, $ref = '')
+	{
+		// phpcs:enable
+		global $conf, $langs, $db, $user, $mysoc, $canvas;
+		global $form, $formadmin, $formcompany;
 
-        if ($action == 'add' || $action == 'update') $this->assign_post($action);
+		if ($action == 'add' || $action == 'update') $this->assign_post($action);
 
-        if ($_GET["type"] == 'f') { $this->object->fournisseur = 1; }
-        if ($_GET["type"] == 'c') { $this->object->client = 1; }
-        if ($_GET["type"] == 'p') { $this->object->client = 2; }
-        if ($_GET["type"] == 'cp') { $this->object->client = 3; }
-        if ($_REQUEST["private"] == 1) { $this->object->particulier = 1; }
+		if ($_GET["type"] == 'f') { $this->object->fournisseur = 1; }
+		if ($_GET["type"] == 'c') { $this->object->client = 1; }
+		if ($_GET["type"] == 'p') { $this->object->client = 2; }
+		if ($_GET["type"] == 'cp') { $this->object->client = 3; }
+		if ($_REQUEST["private"] == 1) { $this->object->particulier = 1; }
 
-        foreach ($this->object as $key => $value)
-        {
-            $this->tpl[$key] = $value;
-        }
+		foreach ($this->object as $key => $value)
+		{
+			$this->tpl[$key] = $value;
+		}
 
-        $this->tpl['error'] = get_htmloutput_errors($this->object->error, $this->object->errors);
-        if (is_array($GLOBALS['errors'])) $this->tpl['error'] = get_htmloutput_mesg('', $GLOBALS['errors'], 'error');
+		$this->tpl['error'] = get_htmloutput_errors($this->object->error, $this->object->errors);
+		if (is_array($GLOBALS['errors'])) $this->tpl['error'] = get_htmloutput_mesg('', $GLOBALS['errors'], 'error');
 
-        if ($action == 'create')
-        {
-        	if ($conf->use_javascript_ajax)
+		if ($action == 'create')
+		{
+			if ($conf->use_javascript_ajax)
 			{
 				$this->tpl['ajax_selecttype'] = "\n".'<script type="text/javascript" language="javascript">
 				$(document).ready(function () {
@@ -122,11 +122,11 @@ abstract class ActionsCardCommon
 		          });
                 </script>'."\n";
 			}
-        }
+		}
 
-        if ($action == 'create' || $action == 'edit')
-        {
-        	if ($conf->use_javascript_ajax)
+		if ($action == 'create' || $action == 'edit')
+		{
+			if ($conf->use_javascript_ajax)
 			{
 				$this->tpl['ajax_selectcountry'] = "\n".'<script type="text/javascript" language="javascript">
 				$(document).ready(function () {
@@ -139,278 +139,278 @@ abstract class ActionsCardCommon
 				</script>'."\n";
 			}
 
-            // Load object modCodeClient
-            $module = (!empty($conf->global->SOCIETE_CODECLIENT_ADDON) ? $conf->global->SOCIETE_CODECLIENT_ADDON : 'mod_codeclient_leopard');
-            if (substr($module, 0, 15) == 'mod_codeclient_' && substr($module, -3) == 'php')
-            {
-                $module = substr($module, 0, dol_strlen($module) - 4);
-            }
-            $dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
-            foreach ($dirsociete as $dirroot)
-            {
-                $res = dol_include_once($dirroot.$module.'.php');
-                if ($res) break;
-            }
-            $modCodeClient = new $module($db);
-            $this->tpl['auto_customercode'] = $modCodeClient->code_auto;
-            // We verified if the tag prefix is used
-            if ($modCodeClient->code_auto) $this->tpl['prefix_customercode'] = $modCodeClient->verif_prefixIsUsed();
+			// Load object modCodeClient
+			$module = (!empty($conf->global->SOCIETE_CODECLIENT_ADDON) ? $conf->global->SOCIETE_CODECLIENT_ADDON : 'mod_codeclient_leopard');
+			if (substr($module, 0, 15) == 'mod_codeclient_' && substr($module, -3) == 'php')
+			{
+				$module = substr($module, 0, dol_strlen($module) - 4);
+			}
+			$dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
+			foreach ($dirsociete as $dirroot)
+			{
+				$res = dol_include_once($dirroot.$module.'.php');
+				if ($res) break;
+			}
+			$modCodeClient = new $module($db);
+			$this->tpl['auto_customercode'] = $modCodeClient->code_auto;
+			// We verified if the tag prefix is used
+			if ($modCodeClient->code_auto) $this->tpl['prefix_customercode'] = $modCodeClient->verif_prefixIsUsed();
 
-            // TODO create a function
-            $this->tpl['select_customertype'] = Form::selectarray('client', array(
-                0 => $langs->trans('NorProspectNorCustomer'),
-                1 => $langs->trans('Customer'),
-                2 => $langs->trans('Prospect'),
-                3 => $langs->trans('ProspectCustomer')
-            ), $this->object->client);
+			// TODO create a function
+			$this->tpl['select_customertype'] = Form::selectarray('client', array(
+				0 => $langs->trans('NorProspectNorCustomer'),
+				1 => $langs->trans('Customer'),
+				2 => $langs->trans('Prospect'),
+				3 => $langs->trans('ProspectCustomer')
+			), $this->object->client);
 
-            // Customer
-            $this->tpl['customercode'] = $this->object->code_client;
-            if ((!$this->object->code_client || $this->object->code_client == -1) && $modCodeClient->code_auto) $this->tpl['customercode'] = $modCodeClient->getNextValue($this->object, 0);
-            $this->tpl['ismodifiable_customercode'] = $this->object->codeclient_modifiable();
-            $s = $modCodeClient->getToolTip($langs, $this->object, 0);
-            $this->tpl['help_customercode'] = $form->textwithpicto('', $s, 1);
+			// Customer
+			$this->tpl['customercode'] = $this->object->code_client;
+			if ((!$this->object->code_client || $this->object->code_client == -1) && $modCodeClient->code_auto) $this->tpl['customercode'] = $modCodeClient->getNextValue($this->object, 0);
+			$this->tpl['ismodifiable_customercode'] = $this->object->codeclient_modifiable();
+			$s = $modCodeClient->getToolTip($langs, $this->object, 0);
+			$this->tpl['help_customercode'] = $form->textwithpicto('', $s, 1);
 
-            if (!empty($conf->fournisseur->enabled))
-            {
-            	$this->tpl['supplier_enabled'] = 1;
+			if (!empty($conf->fournisseur->enabled))
+			{
+				$this->tpl['supplier_enabled'] = 1;
 
-            	// Load object modCodeFournisseur
-            	$module = $conf->global->SOCIETE_CODECLIENT_ADDON;
-            	if (substr($module, 0, 15) == 'mod_codeclient_' && substr($module, -3) == 'php')
-            	{
-            		$module = substr($module, 0, dol_strlen($module) - 4);
-            	}
-                $dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
-                foreach ($dirsociete as $dirroot)
-                {
-                    $res = dol_include_once($dirroot.$module.'.php');
-                    if ($res) break;
-                }
-            	$modCodeFournisseur = new $module;
-            	$this->tpl['auto_suppliercode'] = $modCodeFournisseur->code_auto;
-            	// We verified if the tag prefix is used
-            	if ($modCodeFournisseur->code_auto) $this->tpl['prefix_suppliercode'] = $modCodeFournisseur->verif_prefixIsUsed();
+				// Load object modCodeFournisseur
+				$module = $conf->global->SOCIETE_CODECLIENT_ADDON;
+				if (substr($module, 0, 15) == 'mod_codeclient_' && substr($module, -3) == 'php')
+				{
+					$module = substr($module, 0, dol_strlen($module) - 4);
+				}
+				$dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
+				foreach ($dirsociete as $dirroot)
+				{
+					$res = dol_include_once($dirroot.$module.'.php');
+					if ($res) break;
+				}
+				$modCodeFournisseur = new $module;
+				$this->tpl['auto_suppliercode'] = $modCodeFournisseur->code_auto;
+				// We verified if the tag prefix is used
+				if ($modCodeFournisseur->code_auto) $this->tpl['prefix_suppliercode'] = $modCodeFournisseur->verif_prefixIsUsed();
 
-            	// Supplier
-            	$this->tpl['yn_supplier'] = $form->selectyesno("fournisseur", $this->object->fournisseur, 1);
-            	$this->tpl['suppliercode'] = $this->object->code_fournisseur;
-            	if ((!$this->object->code_fournisseur || $this->object->code_fournisseur == -1) && $modCodeFournisseur->code_auto) $this->tpl['suppliercode'] = $modCodeFournisseur->getNextValue($this->object, 1);
-            	$this->tpl['ismodifiable_suppliercode'] = $this->object->codefournisseur_modifiable();
-            	$s = $modCodeFournisseur->getToolTip($langs, $this->object, 1);
-            	$this->tpl['help_suppliercode'] = $form->textwithpicto('', $s, 1);
+				// Supplier
+				$this->tpl['yn_supplier'] = $form->selectyesno("fournisseur", $this->object->fournisseur, 1);
+				$this->tpl['suppliercode'] = $this->object->code_fournisseur;
+				if ((!$this->object->code_fournisseur || $this->object->code_fournisseur == -1) && $modCodeFournisseur->code_auto) $this->tpl['suppliercode'] = $modCodeFournisseur->getNextValue($this->object, 1);
+				$this->tpl['ismodifiable_suppliercode'] = $this->object->codefournisseur_modifiable();
+				$s = $modCodeFournisseur->getToolTip($langs, $this->object, 1);
+				$this->tpl['help_suppliercode'] = $form->textwithpicto('', $s, 1);
 
-            	$this->object->LoadSupplierCateg();
-            	$this->tpl['suppliercategory'] = $this->object->SupplierCategories;
-            }
+				$this->object->LoadSupplierCateg();
+				$this->tpl['suppliercategory'] = $this->object->SupplierCategories;
+			}
 
-            // Zip
-            $this->tpl['select_zip'] = $formcompany->select_ziptown($this->object->zip, 'zipcode', array('town', 'selectcountry_id', 'state_id'), 6);
+			// Zip
+			$this->tpl['select_zip'] = $formcompany->select_ziptown($this->object->zip, 'zipcode', array('town', 'selectcountry_id', 'state_id'), 6);
 
-            // Town
-            $this->tpl['select_town'] = $formcompany->select_ziptown($this->object->town, 'town', array('zipcode', 'selectcountry_id', 'state_id'));
+			// Town
+			$this->tpl['select_town'] = $formcompany->select_ziptown($this->object->town, 'town', array('zipcode', 'selectcountry_id', 'state_id'));
 
-            // Country
-            $this->object->country_id = ($this->object->country_id ? $this->object->country_id : $mysoc->country_id);
-            $this->object->country_code = ($this->object->country_code ? $this->object->country_code : $mysoc->country_code);
-            $this->tpl['select_country'] = $form->select_country($this->object->country_id, 'country_id');
-            $countrynotdefined = $langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("SeeAbove").')';
+			// Country
+			$this->object->country_id = ($this->object->country_id ? $this->object->country_id : $mysoc->country_id);
+			$this->object->country_code = ($this->object->country_code ? $this->object->country_code : $mysoc->country_code);
+			$this->tpl['select_country'] = $form->select_country($this->object->country_id, 'country_id');
+			$countrynotdefined = $langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("SeeAbove").')';
 
-            if ($user->admin) $this->tpl['info_admin'] = info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+			if ($user->admin) $this->tpl['info_admin'] = info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 
-            // State
-            if ($this->object->country_id) $this->tpl['select_state'] = $formcompany->select_state($this->object->state_id, $this->object->country_code);
-            else $this->tpl['select_state'] = $countrynotdefined;
+			// State
+			if ($this->object->country_id) $this->tpl['select_state'] = $formcompany->select_state($this->object->state_id, $this->object->country_code);
+			else $this->tpl['select_state'] = $countrynotdefined;
 
-            // Language
-            if (!empty($conf->global->MAIN_MULTILANGS)) $this->tpl['select_lang'] = $formadmin->select_language(($this->object->default_lang ? $this->object->default_lang : $conf->global->MAIN_LANG_DEFAULT), 'default_lang', 0, 0, 1);
+			// Language
+			if (!empty($conf->global->MAIN_MULTILANGS)) $this->tpl['select_lang'] = $formadmin->select_language(($this->object->default_lang ? $this->object->default_lang : $conf->global->MAIN_LANG_DEFAULT), 'default_lang', 0, 0, 1);
 
-            // VAT
-            $this->tpl['yn_assujtva'] = $form->selectyesno('assujtva_value', $this->tpl['tva_assuj'], 1); // Assujeti par defaut en creation
+			// VAT
+			$this->tpl['yn_assujtva'] = $form->selectyesno('assujtva_value', $this->tpl['tva_assuj'], 1); // Assujeti par defaut en creation
 
-            // Select users
-            $this->tpl['select_users'] = $form->select_dolusers($this->object->commercial_id, 'commercial_id', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
+			// Select users
+			$this->tpl['select_users'] = $form->select_dolusers($this->object->commercial_id, 'commercial_id', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
 
-            // Local Tax
-            // TODO mettre dans une classe propre au pays
-            if ($mysoc->country_code == 'ES')
-            {
-                $this->tpl['localtax'] = '';
+			// Local Tax
+			// TODO mettre dans une classe propre au pays
+			if ($mysoc->country_code == 'ES')
+			{
+				$this->tpl['localtax'] = '';
 
-                if ($mysoc->localtax1_assuj == "1" && $mysoc->localtax2_assuj == "1")
-                {
-                    $this->tpl['localtax'] .= '<tr><td>'.$langs->trans("LocalTax1IsUsedES").'</td><td>';
-                    $this->tpl['localtax'] .= $form->selectyesno('localtax1assuj_value', $this->object->localtax1_assuj, 1);
-                    $this->tpl['localtax'] .= '</td><td>'.$langs->trans("LocalTax2IsUsedES").'</td><td>';
-                    $this->tpl['localtax'] .= $form->selectyesno('localtax2assuj_value', $this->object->localtax1_assuj, 1);
-                    $this->tpl['localtax'] .= '</td></tr>';
-                } elseif ($mysoc->localtax1_assuj == "1")
-                {
-                    $this->tpl['localtax'] .= '<tr><td>'.$langs->trans("LocalTax1IsUsedES").'</td><td colspan="3">';
-                    $this->tpl['localtax'] .= $form->selectyesno('localtax1assuj_value', $this->object->localtax1_assuj, 1);
-                    $this->tpl['localtax'] .= '</td><tr>';
-                } elseif ($mysoc->localtax2_assuj == "1")
-                {
-                    $this->tpl['localtax'] .= '<tr><td>'.$langs->trans("LocalTax2IsUsedES").'</td><td colspan="3">';
-                    $this->tpl['localtax'] .= $form->selectyesno('localtax2assuj_value', $this->object->localtax1_assuj, 1);
-                    $this->tpl['localtax'] .= '</td><tr>';
-                }
-            }
-        } else {
-            $head = societe_prepare_head($this->object);
+				if ($mysoc->localtax1_assuj == "1" && $mysoc->localtax2_assuj == "1")
+				{
+					$this->tpl['localtax'] .= '<tr><td>'.$langs->trans("LocalTax1IsUsedES").'</td><td>';
+					$this->tpl['localtax'] .= $form->selectyesno('localtax1assuj_value', $this->object->localtax1_assuj, 1);
+					$this->tpl['localtax'] .= '</td><td>'.$langs->trans("LocalTax2IsUsedES").'</td><td>';
+					$this->tpl['localtax'] .= $form->selectyesno('localtax2assuj_value', $this->object->localtax1_assuj, 1);
+					$this->tpl['localtax'] .= '</td></tr>';
+				} elseif ($mysoc->localtax1_assuj == "1")
+				{
+					$this->tpl['localtax'] .= '<tr><td>'.$langs->trans("LocalTax1IsUsedES").'</td><td colspan="3">';
+					$this->tpl['localtax'] .= $form->selectyesno('localtax1assuj_value', $this->object->localtax1_assuj, 1);
+					$this->tpl['localtax'] .= '</td><tr>';
+				} elseif ($mysoc->localtax2_assuj == "1")
+				{
+					$this->tpl['localtax'] .= '<tr><td>'.$langs->trans("LocalTax2IsUsedES").'</td><td colspan="3">';
+					$this->tpl['localtax'] .= $form->selectyesno('localtax2assuj_value', $this->object->localtax1_assuj, 1);
+					$this->tpl['localtax'] .= '</td><tr>';
+				}
+			}
+		} else {
+			$head = societe_prepare_head($this->object);
 
-            $this->tpl['showhead'] = dol_get_fiche_head($head, 'card', '', 0, 'company');
-            $this->tpl['showend'] = dol_get_fiche_end();
+			$this->tpl['showhead'] = dol_get_fiche_head($head, 'card', '', 0, 'company');
+			$this->tpl['showend'] = dol_get_fiche_end();
 
-            $this->tpl['showrefnav'] = $form->showrefnav($this->object, 'socid', '', ($user->socid ? 0 : 1), 'rowid', 'nom');
+			$this->tpl['showrefnav'] = $form->showrefnav($this->object, 'socid', '', ($user->socid ? 0 : 1), 'rowid', 'nom');
 
-            $this->tpl['checkcustomercode'] = $this->object->check_codeclient();
-            $this->tpl['checksuppliercode'] = $this->object->check_codefournisseur();
-            $this->tpl['address'] = dol_nl2br($this->object->address);
+			$this->tpl['checkcustomercode'] = $this->object->check_codeclient();
+			$this->tpl['checksuppliercode'] = $this->object->check_codefournisseur();
+			$this->tpl['address'] = dol_nl2br($this->object->address);
 
-            $img = picto_from_langcode($this->object->country_code);
-            if ($this->object->isInEEC()) $this->tpl['country'] = $form->textwithpicto(($img ? $img.' ' : '').$this->object->country, $langs->trans("CountryIsInEEC"), 1, 0);
-            $this->tpl['country'] = ($img ? $img.' ' : '').$this->object->country;
+			$img = picto_from_langcode($this->object->country_code);
+			if ($this->object->isInEEC()) $this->tpl['country'] = $form->textwithpicto(($img ? $img.' ' : '').$this->object->country, $langs->trans("CountryIsInEEC"), 1, 0);
+			$this->tpl['country'] = ($img ? $img.' ' : '').$this->object->country;
 
-            $this->tpl['phone'] 	= dol_print_phone($this->object->phone, $this->object->country_code, 0, $this->object->id, 'AC_TEL');
-            $this->tpl['fax'] 		= dol_print_phone($this->object->fax, $this->object->country_code, 0, $this->object->id, 'AC_FAX');
-            $this->tpl['email'] 	= dol_print_email($this->object->email, 0, $this->object->id, 'AC_EMAIL');
-            $this->tpl['url'] 		= dol_print_url($this->object->url);
+			$this->tpl['phone'] 	= dol_print_phone($this->object->phone, $this->object->country_code, 0, $this->object->id, 'AC_TEL');
+			$this->tpl['fax'] 		= dol_print_phone($this->object->fax, $this->object->country_code, 0, $this->object->id, 'AC_FAX');
+			$this->tpl['email'] 	= dol_print_email($this->object->email, 0, $this->object->id, 'AC_EMAIL');
+			$this->tpl['url'] 		= dol_print_url($this->object->url);
 
-            $this->tpl['tva_assuj'] = yn($this->object->tva_assuj);
+			$this->tpl['tva_assuj'] = yn($this->object->tva_assuj);
 
-            // Third party type
-            $arr = $formcompany->typent_array(1);
-            $this->tpl['typent'] = $arr[$this->object->typent_code];
+			// Third party type
+			$arr = $formcompany->typent_array(1);
+			$this->tpl['typent'] = $arr[$this->object->typent_code];
 
-            if (!empty($conf->global->MAIN_MULTILANGS))
-            {
-                require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-                //$s=picto_from_langcode($this->default_lang);
-                //print ($s?$s.' ':'');
-                $langs->load("languages");
-                $this->tpl['default_lang'] = ($this->default_lang ? $langs->trans('Language_'.$this->object->default_lang) : '');
-            }
+			if (!empty($conf->global->MAIN_MULTILANGS))
+			{
+				require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+				//$s=picto_from_langcode($this->default_lang);
+				//print ($s?$s.' ':'');
+				$langs->load("languages");
+				$this->tpl['default_lang'] = ($this->default_lang ? $langs->trans('Language_'.$this->object->default_lang) : '');
+			}
 
-            $this->tpl['image_edit'] = img_edit();
+			$this->tpl['image_edit'] = img_edit();
 
-            $this->tpl['display_rib'] = $this->object->display_rib();
+			$this->tpl['display_rib'] = $this->object->display_rib();
 
-            // Sales representatives
-            $this->tpl['sales_representatives'] = '';
-            $listsalesrepresentatives = $this->object->getSalesRepresentatives($user);
-            $nbofsalesrepresentative = count($listsalesrepresentatives);
-            if ($nbofsalesrepresentative > 3)   // We print only number
-            {
-            	$this->tpl['sales_representatives'] .= $nbofsalesrepresentative;
-            } elseif ($nbofsalesrepresentative > 0)
-            {
-            	$userstatic = new User($this->db);
-            	$i = 0;
-            	foreach ($listsalesrepresentatives as $val)
-            	{
-            		$userstatic->id = $val['id'];
-            		$userstatic->lastname = $val['name'];
-            		$userstatic->firstname = $val['firstname'];
-            		$this->tpl['sales_representatives'] .= $userstatic->getNomUrl(1);
-            		$i++;
-            		if ($i < $nbofsalesrepresentative) $this->tpl['sales_representatives'] .= ', ';
-            	}
-            } else $this->tpl['sales_representatives'] .= $langs->trans("NoSalesRepresentativeAffected");
+			// Sales representatives
+			$this->tpl['sales_representatives'] = '';
+			$listsalesrepresentatives = $this->object->getSalesRepresentatives($user);
+			$nbofsalesrepresentative = count($listsalesrepresentatives);
+			if ($nbofsalesrepresentative > 3)   // We print only number
+			{
+				$this->tpl['sales_representatives'] .= $nbofsalesrepresentative;
+			} elseif ($nbofsalesrepresentative > 0)
+			{
+				$userstatic = new User($this->db);
+				$i = 0;
+				foreach ($listsalesrepresentatives as $val)
+				{
+					$userstatic->id = $val['id'];
+					$userstatic->lastname = $val['name'];
+					$userstatic->firstname = $val['firstname'];
+					$this->tpl['sales_representatives'] .= $userstatic->getNomUrl(1);
+					$i++;
+					if ($i < $nbofsalesrepresentative) $this->tpl['sales_representatives'] .= ', ';
+				}
+			} else $this->tpl['sales_representatives'] .= $langs->trans("NoSalesRepresentativeAffected");
 
-            // Linked member
-            if (!empty($conf->adherent->enabled))
-            {
-                $langs->load("members");
-                $adh = new Adherent($this->db);
-                $result = $adh->fetch('', '', $this->object->id);
-                if ($result > 0)
-                {
-                    $adh->ref = $adh->getFullName($langs);
-                    $this->tpl['linked_member'] = $adh->getNomUrl(1);
-                } else {
-                    $this->tpl['linked_member'] = $langs->trans("ThirdpartyNotLinkedToMember");
-                }
-            }
+			// Linked member
+			if (!empty($conf->adherent->enabled))
+			{
+				$langs->load("members");
+				$adh = new Adherent($this->db);
+				$result = $adh->fetch('', '', $this->object->id);
+				if ($result > 0)
+				{
+					$adh->ref = $adh->getFullName($langs);
+					$this->tpl['linked_member'] = $adh->getNomUrl(1);
+				} else {
+					$this->tpl['linked_member'] = $langs->trans("ThirdpartyNotLinkedToMember");
+				}
+			}
 
-            // Local Tax
-            // TODO mettre dans une classe propre au pays
-            if ($mysoc->country_code == 'ES')
-            {
-                $this->tpl['localtax'] = '';
+			// Local Tax
+			// TODO mettre dans une classe propre au pays
+			if ($mysoc->country_code == 'ES')
+			{
+				$this->tpl['localtax'] = '';
 
-                if ($mysoc->localtax1_assuj == "1" && $mysoc->localtax2_assuj == "1")
-                {
-                    $this->tpl['localtax'] .= '<tr><td>'.$langs->trans("LocalTax1IsUsedES").'</td>';
-                    $this->tpl['localtax'] .= '<td>'.yn($this->object->localtax1_assuj).'</td>';
-                    $this->tpl['localtax'] .= '<td>'.$langs->trans("LocalTax2IsUsedES").'</td>';
-                    $this->tpl['localtax'] .= '<td>'.yn($this->object->localtax2_assuj).'</td></tr>';
-                } elseif ($mysoc->localtax1_assuj == "1")
-                {
-                    $this->tpl['localtax'] .= '<tr><td>'.$langs->trans("LocalTax1IsUsedES").'</td>';
-                    $this->tpl['localtax'] .= '<td colspan="3">'.yn($this->object->localtax1_assuj).'</td></tr>';
-                } elseif ($mysoc->localtax2_assuj == "1")
-                {
-                    $this->tpl['localtax'] .= '<tr><td>'.$langs->trans("LocalTax2IsUsedES").'</td>';
-                    $this->tpl['localtax'] .= '<td colspan="3">'.yn($this->object->localtax2_assuj).'</td></tr>';
-                }
-            }
-        }
-    }
+				if ($mysoc->localtax1_assuj == "1" && $mysoc->localtax2_assuj == "1")
+				{
+					$this->tpl['localtax'] .= '<tr><td>'.$langs->trans("LocalTax1IsUsedES").'</td>';
+					$this->tpl['localtax'] .= '<td>'.yn($this->object->localtax1_assuj).'</td>';
+					$this->tpl['localtax'] .= '<td>'.$langs->trans("LocalTax2IsUsedES").'</td>';
+					$this->tpl['localtax'] .= '<td>'.yn($this->object->localtax2_assuj).'</td></tr>';
+				} elseif ($mysoc->localtax1_assuj == "1")
+				{
+					$this->tpl['localtax'] .= '<tr><td>'.$langs->trans("LocalTax1IsUsedES").'</td>';
+					$this->tpl['localtax'] .= '<td colspan="3">'.yn($this->object->localtax1_assuj).'</td></tr>';
+				} elseif ($mysoc->localtax2_assuj == "1")
+				{
+					$this->tpl['localtax'] .= '<tr><td>'.$langs->trans("LocalTax2IsUsedES").'</td>';
+					$this->tpl['localtax'] .= '<td colspan="3">'.yn($this->object->localtax2_assuj).'</td></tr>';
+				}
+			}
+		}
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Assign POST values into object
-     *
-     *	@param		string		$action		Action string
-     *  @return		string					HTML output
-     */
-    private function assign_post($action)
-    {
-        // phpcs:enable
-        global $langs, $mysoc;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Assign POST values into object
+	 *
+	 *	@param		string		$action		Action string
+	 *  @return		string					HTML output
+	 */
+	private function assign_post($action)
+	{
+		// phpcs:enable
+		global $langs, $mysoc;
 
-        $this->object->id = $_POST["socid"];
-        $this->object->name = $_POST["nom"];
-        $this->object->prefix_comm			= $_POST["prefix_comm"];
-        $this->object->client = $_POST["client"];
-        $this->object->code_client			= $_POST["code_client"];
-        $this->object->fournisseur			= $_POST["fournisseur"];
-        $this->object->code_fournisseur = $_POST["code_fournisseur"];
-        $this->object->address = $_POST["adresse"];
-        $this->object->zip = $_POST["zipcode"];
-        $this->object->town					= $_POST["town"];
-        $this->object->country_id = $_POST["country_id"] ? $_POST["country_id"] : $mysoc->country_id;
-        $this->object->state_id = $_POST["state_id"];
-        $this->object->phone				= $_POST["tel"];
-        $this->object->fax					= $_POST["fax"];
-        $this->object->email				= $_POST["email"];
-        $this->object->url					= $_POST["url"];
-        $this->object->capital				= $_POST["capital"];
-        $this->object->idprof1				= $_POST["idprof1"];
-        $this->object->idprof2				= $_POST["idprof2"];
-        $this->object->idprof3				= $_POST["idprof3"];
-        $this->object->idprof4				= $_POST["idprof4"];
-        $this->object->typent_id = $_POST["typent_id"];
-        $this->object->effectif_id = $_POST["effectif_id"];
-        $this->object->barcode				= $_POST["barcode"];
-        $this->object->forme_juridique_code = $_POST["forme_juridique_code"];
-        $this->object->default_lang			= $_POST["default_lang"];
-        $this->object->commercial_id		= $_POST["commercial_id"];
+		$this->object->id = $_POST["socid"];
+		$this->object->name = $_POST["nom"];
+		$this->object->prefix_comm			= $_POST["prefix_comm"];
+		$this->object->client = $_POST["client"];
+		$this->object->code_client			= $_POST["code_client"];
+		$this->object->fournisseur			= $_POST["fournisseur"];
+		$this->object->code_fournisseur = $_POST["code_fournisseur"];
+		$this->object->address = $_POST["adresse"];
+		$this->object->zip = $_POST["zipcode"];
+		$this->object->town					= $_POST["town"];
+		$this->object->country_id = $_POST["country_id"] ? $_POST["country_id"] : $mysoc->country_id;
+		$this->object->state_id = $_POST["state_id"];
+		$this->object->phone				= $_POST["tel"];
+		$this->object->fax					= $_POST["fax"];
+		$this->object->email				= $_POST["email"];
+		$this->object->url					= $_POST["url"];
+		$this->object->capital				= $_POST["capital"];
+		$this->object->idprof1				= $_POST["idprof1"];
+		$this->object->idprof2				= $_POST["idprof2"];
+		$this->object->idprof3				= $_POST["idprof3"];
+		$this->object->idprof4				= $_POST["idprof4"];
+		$this->object->typent_id = $_POST["typent_id"];
+		$this->object->effectif_id = $_POST["effectif_id"];
+		$this->object->barcode				= $_POST["barcode"];
+		$this->object->forme_juridique_code = $_POST["forme_juridique_code"];
+		$this->object->default_lang			= $_POST["default_lang"];
+		$this->object->commercial_id		= $_POST["commercial_id"];
 
-        $this->object->tva_assuj = $_POST["assujtva_value"] ? $_POST["assujtva_value"] : 1;
-        $this->object->tva_intra = $_POST["tva_intra"];
+		$this->object->tva_assuj = $_POST["assujtva_value"] ? $_POST["assujtva_value"] : 1;
+		$this->object->tva_intra = $_POST["tva_intra"];
 
-        //Local Taxes
-        $this->object->localtax1_assuj		= $_POST["localtax1assuj_value"];
-        $this->object->localtax2_assuj		= $_POST["localtax2assuj_value"];
+		//Local Taxes
+		$this->object->localtax1_assuj		= $_POST["localtax1assuj_value"];
+		$this->object->localtax2_assuj		= $_POST["localtax2assuj_value"];
 
-        // We set country_id, and country_code label of the chosen country
-        if ($this->object->country_id)
-        {
-            $tmparray = getCountry($this->object->country_id, 'all', $this->db, $langs, 0);
-            $this->object->country_code = $tmparray['code'];
-            $this->object->country_label = $tmparray['label'];
-        }
-    }
+		// We set country_id, and country_code label of the chosen country
+		if ($this->object->country_id)
+		{
+			$tmparray = getCountry($this->object->country_id, 'all', $this->db, $langs, 0);
+			$this->object->country_code = $tmparray['code'];
+			$this->object->country_label = $tmparray['label'];
+		}
+	}
 }
diff --git a/htdocs/societe/canvas/company/actions_card_company.class.php b/htdocs/societe/canvas/company/actions_card_company.class.php
index 73453aff62e..901a2c55a56 100644
--- a/htdocs/societe/canvas/company/actions_card_company.class.php
+++ b/htdocs/societe/canvas/company/actions_card_company.class.php
@@ -34,42 +34,42 @@ class ActionsCardCompany extends ActionsCardCommon
 	/**
 	 *    Constructor
 	 *
-     *    @param	DoliDB	$db				Handler acces base de donnees
-     *    @param	string	$dirmodule		Name of directory of module
-     *    @param	string	$targetmodule	Name of directory of module where canvas is stored
-     *    @param	string	$canvas			Name of canvas
-     *    @param	string	$card			Name of tab (sub-canvas)
+	 *    @param	DoliDB	$db				Handler acces base de donnees
+	 *    @param	string	$dirmodule		Name of directory of module
+	 *    @param	string	$targetmodule	Name of directory of module where canvas is stored
+	 *    @param	string	$canvas			Name of canvas
+	 *    @param	string	$card			Name of tab (sub-canvas)
 	 */
-    public function __construct($db, $dirmodule, $targetmodule, $canvas, $card)
+	public function __construct($db, $dirmodule, $targetmodule, $canvas, $card)
 	{
-        $this->db = $db;
-        $this->dirmodule = $dirmodule;
-        $this->targetmodule = $targetmodule;
-        $this->canvas = $canvas;
-        $this->card = $card;
+		$this->db = $db;
+		$this->dirmodule = $dirmodule;
+		$this->targetmodule = $targetmodule;
+		$this->canvas = $canvas;
+		$this->card = $card;
 	}
 
-    /**
-     *  Return the title of card
-     *
-     *  @param	string	$action		Action code
-     *  @return	string				Title
-     */
-    private function getTitle($action)
-    {
-        global $langs;
+	/**
+	 *  Return the title of card
+	 *
+	 *  @param	string	$action		Action code
+	 *  @return	string				Title
+	 */
+	private function getTitle($action)
+	{
+		global $langs;
 
-        $out = '';
+		$out = '';
 
-        if ($action == 'view')      $out .= $langs->trans("ThirdParty");
-        if ($action == 'edit')      $out .= $langs->trans("EditCompany");
-        if ($action == 'create')    $out .= $langs->trans("NewCompany");
+		if ($action == 'view')      $out .= $langs->trans("ThirdParty");
+		if ($action == 'edit')      $out .= $langs->trans("EditCompany");
+		if ($action == 'create')    $out .= $langs->trans("NewCompany");
 
-        return $out;
-    }
+		return $out;
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *    Assign custom values for canvas (for example into this->tpl to be used by templates)
 	 *
@@ -78,9 +78,9 @@ class ActionsCardCompany extends ActionsCardCommon
 	 *    @param	string	$ref		Ref of object
 	 *    @return	void
 	 */
-    public function assign_values(&$action, $id = 0, $ref = '')
+	public function assign_values(&$action, $id = 0, $ref = '')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $langs, $user, $mysoc;
 		global $form, $formadmin, $formcompany;
 
@@ -88,9 +88,9 @@ class ActionsCardCompany extends ActionsCardCommon
 
 		parent::assign_values($action);
 
-        $this->tpl['title'] = load_fiche_titre($this->getTitle($action));
+		$this->tpl['title'] = load_fiche_titre($this->getTitle($action));
 
-        $this->tpl['profid1'] = $this->object->idprof1;
+		$this->tpl['profid1'] = $this->object->idprof1;
 		$this->tpl['profid2'] 	= $this->object->idprof2;
 		$this->tpl['profid3'] 	= $this->object->idprof3;
 		$this->tpl['profid4'] 	= $this->object->idprof4;
@@ -98,12 +98,12 @@ class ActionsCardCompany extends ActionsCardCommon
 		if ($conf->use_javascript_ajax && empty($conf->global->MAIN_DISABLEVATCHECK))
 		{
 			$js = "\n";
-	        $js .= '<script language="JavaScript" type="text/javascript">';
-	        $js .= "function CheckVAT(a) {\n";
-	        $js .= "newpopup('".DOL_URL_ROOT."/societe/checkvat/checkVatPopup.php?vatNumber='+a,'".dol_escape_js($langs->trans("VATIntraCheckableOnEUSite"))."',500,230);\n";
-	        $js .= "}\n";
-	        $js .= '</script>';
-	        $js .= "\n";
+			$js .= '<script language="JavaScript" type="text/javascript">';
+			$js .= "function CheckVAT(a) {\n";
+			$js .= "newpopup('".DOL_URL_ROOT."/societe/checkvat/checkVatPopup.php?vatNumber='+a,'".dol_escape_js($langs->trans("VATIntraCheckableOnEUSite"))."',500,230);\n";
+			$js .= "}\n";
+			$js .= '</script>';
+			$js .= "\n";
 			$this->tpl['js_checkVatPopup'] = $js;
 		}
 
@@ -188,7 +188,7 @@ class ActionsCardCompany extends ActionsCardCommon
 				$this->tpl['parent_company'] = $langs->trans("NoParentCompany");
 			}
 		}
-    }
+	}
 
 	/**
 	 * 	Check permissions of a user to show a page and an object. Check read permission
@@ -203,8 +203,8 @@ class ActionsCardCompany extends ActionsCardCommon
 	 *  @param      string	$dbt_select		Field name for select if not rowid. (optional)
 	 *  @return		int						1
 	 */
-    public function restrictedArea($user, $features = 'societe', $objectid = 0, $dbtablename = '', $feature2 = '', $dbt_keyfield = 'fk_soc', $dbt_select = 'rowid')
-    {
-        return restrictedArea($user, $features, $objectid, $dbtablename, $feature2, $dbt_keyfield, $dbt_select);
-    }
+	public function restrictedArea($user, $features = 'societe', $objectid = 0, $dbtablename = '', $feature2 = '', $dbt_keyfield = 'fk_soc', $dbt_select = 'rowid')
+	{
+		return restrictedArea($user, $features, $objectid, $dbtablename, $feature2, $dbt_keyfield, $dbt_select);
+	}
 }
diff --git a/htdocs/societe/canvas/company/tpl/card_edit.tpl.php b/htdocs/societe/canvas/company/tpl/card_edit.tpl.php
index 1e231a261c8..0b3c951d51f 100644
--- a/htdocs/societe/canvas/company/tpl/card_edit.tpl.php
+++ b/htdocs/societe/canvas/company/tpl/card_edit.tpl.php
@@ -116,7 +116,7 @@ if ($this->control->tpl['fournisseur']) {
 	<td colspan="3"><?php echo $this->control->tpl['select_suppliercategory']; ?></td>
 </tr>
 		<?php
-    }
+	}
 }
 
 if (!empty($conf->barcode->enabled)) { ?>
diff --git a/htdocs/societe/canvas/company/tpl/card_view.tpl.php b/htdocs/societe/canvas/company/tpl/card_view.tpl.php
index d1d5f4918fe..c56e7f9223c 100644
--- a/htdocs/societe/canvas/company/tpl/card_view.tpl.php
+++ b/htdocs/societe/canvas/company/tpl/card_view.tpl.php
@@ -235,7 +235,7 @@ for ($i = 1; $i <= 4; $i++) {
 
 </table>
 
-<?php dol_fiche_end(); ?>
+<?php print dol_get_fiche_end(); ?>
 
 <div class="tabsAction">
 <?php if ($user->rights->societe->creer) { ?>
diff --git a/htdocs/societe/canvas/individual/actions_card_individual.class.php b/htdocs/societe/canvas/individual/actions_card_individual.class.php
index 3abb9e9b6f7..cab8a965ee0 100644
--- a/htdocs/societe/canvas/individual/actions_card_individual.class.php
+++ b/htdocs/societe/canvas/individual/actions_card_individual.class.php
@@ -30,63 +30,63 @@ include_once DOL_DOCUMENT_ROOT.'/societe/canvas/actions_card_common.class.php';
  */
 class ActionsCardIndividual extends ActionsCardCommon
 {
-    /**
+	/**
 	 *    Constructor
 	 *
-     *    @param	DoliDB	$db				Handler acces base de donnees
-     *    @param	string	$dirmodule		Name of directory of module
-     *    @param	string	$targetmodule	Name of directory of module where canvas is stored
-     *    @param	string	$canvas			Name of canvas
-     *    @param	string	$card			Name of tab (sub-canvas)
-     */
-    public function __construct($db, $dirmodule, $targetmodule, $canvas, $card)
-    {
-        $this->db = $db;
-        $this->dirmodule = $dirmodule;
-        $this->targetmodule = $targetmodule;
-        $this->canvas = $canvas;
-        $this->card = $card;
-    }
+	 *    @param	DoliDB	$db				Handler acces base de donnees
+	 *    @param	string	$dirmodule		Name of directory of module
+	 *    @param	string	$targetmodule	Name of directory of module where canvas is stored
+	 *    @param	string	$canvas			Name of canvas
+	 *    @param	string	$card			Name of tab (sub-canvas)
+	 */
+	public function __construct($db, $dirmodule, $targetmodule, $canvas, $card)
+	{
+		$this->db = $db;
+		$this->dirmodule = $dirmodule;
+		$this->targetmodule = $targetmodule;
+		$this->canvas = $canvas;
+		$this->card = $card;
+	}
 
 
-    /**
-     *  Return the title of card
-     *
-     *  @param	string	$action		Action code
-     *  @return	string				Title
-     */
-    private function getTitle($action)
-    {
-        global $langs;
+	/**
+	 *  Return the title of card
+	 *
+	 *  @param	string	$action		Action code
+	 *  @return	string				Title
+	 */
+	private function getTitle($action)
+	{
+		global $langs;
 
-        $out = '';
+		$out = '';
 
-        if ($action == 'view')      $out .= $langs->trans("Individual");
-        if ($action == 'edit')      $out .= $langs->trans("EditCompany");
-        if ($action == 'create')    $out .= $langs->trans("NewCompany");
+		if ($action == 'view')      $out .= $langs->trans("Individual");
+		if ($action == 'edit')      $out .= $langs->trans("EditCompany");
+		if ($action == 'create')    $out .= $langs->trans("NewCompany");
 
-        return $out;
-    }
+		return $out;
+	}
 
 
 	/**
 	 * Execute actions
-     * @deprecated Use the doActions of hooks instead of this.
+	 * @deprecated Use the doActions of hooks instead of this.
 	 *
 	 * @param	string	$action	Action
 	 * @param	int		$id			Id of object (may be empty for creation)
 	 * @return	int					<0 if KO, >0 if OK
 	 */
-    public function doActions(&$action, $id)
-    {
+	public function doActions(&$action, $id)
+	{
 		$ret = $this->getObject($id);
 
 		$return = parent::doActions($action);
 
 		return $return;
-    }
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *    Assign custom values for canvas (for example into this->tpl to be used by templates)
 	 *
@@ -95,9 +95,9 @@ class ActionsCardIndividual extends ActionsCardCommon
 	 *    @param	string	$ref		Ref of object
 	 *    @return	void
 	 */
-    public function assign_values(&$action, $id = 0, $ref = '')
-    {
-        // phpcs:enable
+	public function assign_values(&$action, $id = 0, $ref = '')
+	{
+		// phpcs:enable
 		global $conf, $langs;
 		global $form, $formcompany;
 
@@ -105,7 +105,7 @@ class ActionsCardIndividual extends ActionsCardCommon
 
 		parent::assign_values($action);
 
-        $this->tpl['title'] = load_fiche_titre($this->getTitle($action));
+		$this->tpl['title'] = load_fiche_titre($this->getTitle($action));
 
 		if ($action == 'create' || $action == 'edit')
 		{
@@ -117,7 +117,7 @@ class ActionsCardIndividual extends ActionsCardCommon
 				$this->tpl['action_delete'] = $form->formconfirm($_SERVER["PHP_SELF"]."?socid=".$this->object->id, $langs->trans("DeleteAnIndividual"), $langs->trans("ConfirmDeleteIndividual"), "confirm_delete", '', 0, "1,action-delete");
 			}
 		}
-    }
+	}
 
 	/**
 	 * 	Check permissions of a user to show a page and an object. Check read permission
@@ -132,8 +132,8 @@ class ActionsCardIndividual extends ActionsCardCommon
 	 *  @param      string	$dbt_select		Field name for select if not rowid. (optional)
 	 *  @return		int						1
 	 */
-    public function restrictedArea($user, $features = 'societe', $objectid = 0, $dbtablename = '', $feature2 = '', $dbt_keyfield = 'fk_soc', $dbt_select = 'rowid')
-    {
-        return restrictedArea($user, $features, $objectid, $dbtablename, $feature2, $dbt_keyfield, $dbt_select);
-    }
+	public function restrictedArea($user, $features = 'societe', $objectid = 0, $dbtablename = '', $feature2 = '', $dbt_keyfield = 'fk_soc', $dbt_select = 'rowid')
+	{
+		return restrictedArea($user, $features, $objectid, $dbtablename, $feature2, $dbt_keyfield, $dbt_select);
+	}
 }
diff --git a/htdocs/societe/canvas/individual/tpl/card_edit.tpl.php b/htdocs/societe/canvas/individual/tpl/card_edit.tpl.php
index 1571709868e..ab5b9a4f4ef 100644
--- a/htdocs/societe/canvas/individual/tpl/card_edit.tpl.php
+++ b/htdocs/societe/canvas/individual/tpl/card_edit.tpl.php
@@ -114,7 +114,7 @@ if ($this->control->tpl['fournisseur']) {
 	<td colspan="3"><?php echo $this->control->tpl['select_suppliercategory']; ?></td>
 </tr>
 		<?php
-    }
+	}
 }
 ?>
 
diff --git a/htdocs/societe/canvas/individual/tpl/card_view.tpl.php b/htdocs/societe/canvas/individual/tpl/card_view.tpl.php
index 31e733c94ff..0ee2f271312 100644
--- a/htdocs/societe/canvas/individual/tpl/card_view.tpl.php
+++ b/htdocs/societe/canvas/individual/tpl/card_view.tpl.php
@@ -178,7 +178,7 @@ if ($this->control->tpl['action_delete']) echo $this->control->tpl['action_delet
 
 </table>
 
-<?php dol_fiche_end(); ?>
+<?php print dol_get_fiche_end(); ?>
 
 <div class="tabsAction">
 <?php if ($user->rights->societe->creer) { ?>
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index 7c3ea2d5d84..ea560ae650b 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -854,7 +854,7 @@ if (empty($reshook))
 
 	// Selection of new fields
 	if (!empty($conf->global->MAIN_DUPLICATE_CONTACTS_TAB_ON_MAIN_CARD) && (empty($conf->global->SOCIETE_DISABLE_CONTACTS) || !empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT))) {
-		include DOL_DOCUMENT_ROOT . '/core/actions_changeselectedfields.inc.php';
+		include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 	}
 
 	// Actions to send emails
@@ -959,7 +959,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		if (!empty($conf->fournisseur->enabled) && (GETPOST("type") == 'f' || (GETPOST("type") == '' && !empty($conf->global->THIRDPARTY_SUPPLIER_BY_DEFAULT)))) { $object->fournisseur = 1; }
 
 		$object->name = GETPOST('name', 'alphanohtml');
-		$object->name_alias	= GETPOST('name_alias', 'alphanohtml');
+		$object->name_alias = GETPOST('name_alias', 'alphanohtml');
 		$object->firstname = GETPOST('firstname', 'alphanohtml');
 		$object->particulier		= $private;
 		$object->prefix_comm		= GETPOST('prefix_comm', 'alphanohtml');
@@ -1159,325 +1159,325 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 			}
 		}
 
-        dol_htmloutput_mesg(is_numeric($error) ? '' : $error, $errors, 'error');
+		dol_htmloutput_mesg(is_numeric($error) ? '' : $error, $errors, 'error');
 
-        print '<form enctype="multipart/form-data" action="'.$_SERVER["PHP_SELF"].'" method="post" name="formsoc" autocomplete="off">'; // Chrome ignor autocomplete
+		print '<form enctype="multipart/form-data" action="'.$_SERVER["PHP_SELF"].'" method="post" name="formsoc" autocomplete="off">'; // Chrome ignor autocomplete
 
-        print '<input type="hidden" name="action" value="add">';
-        print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
-        print '<input type="hidden" name="token" value="'.newToken().'">';
-        print '<input type="hidden" name="private" value='.$object->particulier.'>';
-        print '<input type="hidden" name="type" value='.GETPOST("type", 'alpha').'>';
-        print '<input type="hidden" name="LastName" value="'.$langs->trans('ThirdPartyName').' / '.$langs->trans('LastName').'">';
-        print '<input type="hidden" name="ThirdPartyName" value="'.$langs->trans('ThirdPartyName').'">';
-        if ($modCodeClient->code_auto || $modCodeFournisseur->code_auto) print '<input type="hidden" name="code_auto" value="1">';
+		print '<input type="hidden" name="action" value="add">';
+		print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
+		print '<input type="hidden" name="token" value="'.newToken().'">';
+		print '<input type="hidden" name="private" value='.$object->particulier.'>';
+		print '<input type="hidden" name="type" value='.GETPOST("type", 'alpha').'>';
+		print '<input type="hidden" name="LastName" value="'.$langs->trans('ThirdPartyName').' / '.$langs->trans('LastName').'">';
+		print '<input type="hidden" name="ThirdPartyName" value="'.$langs->trans('ThirdPartyName').'">';
+		if ($modCodeClient->code_auto || $modCodeFournisseur->code_auto) print '<input type="hidden" name="code_auto" value="1">';
 
-        print dol_get_fiche_head(null, 'card', '', 0, '');
+		print dol_get_fiche_head(null, 'card', '', 0, '');
 
-        print '<table class="border centpercent">';
+		print '<table class="border centpercent">';
 
-        // Name, firstname
-	    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>';
-        } else {
+		// Name, firstname
+		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>';
+		} 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="'.dol_escape_htmltag($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="'.dol_escape_htmltag($object->prefix_comm).'"></td>';
-	    }
-	    print '</tr>';
+		}
+		print '</td><td'.(empty($conf->global->SOCIETE_USEPREFIX) ? ' colspan="3"' : '').'>';
+		print '<input type="text" class="minwidth300" maxlength="128" name="name" id="name" value="'.dol_escape_htmltag($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="'.dol_escape_htmltag($object->prefix_comm).'"></td>';
+		}
+		print '</tr>';
 
-        // If javascript on, we show option individual
-        if ($conf->use_javascript_ajax)
-        {
-        	if (!empty($conf->global->THIRDPARTY_SUGGEST_ALSO_ADDRESS_CREATION))
-        	{
-        		// Firstname
-	            print '<tr class="individualline"><td>'.$form->editfieldkey('FirstName', 'firstname', '', $object, 0).'</td>';
-		        print '<td colspan="3"><input type="text" class="minwidth300" maxlength="128" name="firstname" id="firstname" value="'.dol_escape_htmltag($object->firstname).'"></td>';
-	            print '</tr>';
+		// If javascript on, we show option individual
+		if ($conf->use_javascript_ajax)
+		{
+			if (!empty($conf->global->THIRDPARTY_SUGGEST_ALSO_ADDRESS_CREATION))
+			{
+				// Firstname
+				print '<tr class="individualline"><td>'.$form->editfieldkey('FirstName', 'firstname', '', $object, 0).'</td>';
+				print '<td colspan="3"><input type="text" class="minwidth300" maxlength="128" name="firstname" id="firstname" value="'.dol_escape_htmltag($object->firstname).'"></td>';
+				print '</tr>';
 
-	            // Title
-	            print '<tr class="individualline"><td>'.$form->editfieldkey('UserTitle', 'civility_id', '', $object, 0).'</td><td colspan="3" class="maxwidthonsmartphone">';
-	            print $formcompany->select_civility($object->civility_id, 'civility_id', 'maxwidth100').'</td>';
-	            print '</tr>';
-        	}
-        }
+				// Title
+				print '<tr class="individualline"><td>'.$form->editfieldkey('UserTitle', 'civility_id', '', $object, 0).'</td><td colspan="3" class="maxwidthonsmartphone">';
+				print $formcompany->select_civility($object->civility_id, 'civility_id', 'maxwidth100').'</td>';
+				print '</tr>';
+			}
+		}
 
-        // Alias names (commercial, trademark or alias names)
-        print '<tr id="name_alias"><td><label for="name_alias_input">'.$langs->trans('AliasNames').'</label></td>';
-        print '<td colspan="3"><input type="text" class="minwidth300" name="name_alias" id="name_alias_input" value="'.dol_escape_htmltag($object->name_alias).'"></td></tr>';
+		// Alias names (commercial, trademark or alias names)
+		print '<tr id="name_alias"><td><label for="name_alias_input">'.$langs->trans('AliasNames').'</label></td>';
+		print '<td colspan="3"><input type="text" class="minwidth300" name="name_alias" id="name_alias_input" value="'.dol_escape_htmltag($object->name_alias).'"></td></tr>';
 
-        // Prospect/Customer
-        print '<tr><td class="titlefieldcreate">'.$form->editfieldkey('ProspectCustomer', 'customerprospect', '', $object, 0, 'string', '', 1).'</td>';
-	    print '<td class="maxwidthonsmartphone">';
-	    $selected = (GETPOSTISSET('client') ?GETPOST('client', 'int') : $object->client);
-	    print $formcompany->selectProspectCustomerType($selected);
-	    print '</td>';
+		// Prospect/Customer
+		print '<tr><td class="titlefieldcreate">'.$form->editfieldkey('ProspectCustomer', 'customerprospect', '', $object, 0, 'string', '', 1).'</td>';
+		print '<td class="maxwidthonsmartphone">';
+		$selected = (GETPOSTISSET('client') ?GETPOST('client', 'int') : $object->client);
+		print $formcompany->selectProspectCustomerType($selected);
+		print '</td>';
 
-	    if ($conf->browser->layout == 'phone') print '</tr><tr>';
+		if ($conf->browser->layout == 'phone') print '</tr><tr>';
 
-        print '<td>'.$form->editfieldkey('CustomerCode', 'customer_code', '', $object, 0).'</td><td>';
-        print '<table class="nobordernopadding"><tr><td>';
+		print '<td>'.$form->editfieldkey('CustomerCode', 'customer_code', '', $object, 0).'</td><td>';
+		print '<table class="nobordernopadding"><tr><td>';
 		$tmpcode = $object->code_client;
-        if (empty($tmpcode) && !empty($modCodeClient->code_auto)) $tmpcode = $modCodeClient->getNextValue($object, 0);
-        print '<input type="text" name="customer_code" id="customer_code" class="maxwidthonsmartphone" value="'.dol_escape_htmltag($tmpcode).'" maxlength="15">';
-        print '</td><td>';
-        $s = $modCodeClient->getToolTip($langs, $object, 0);
-        print $form->textwithpicto('', $s, 1);
-        print '</td></tr></table>';
-        print '</td></tr>';
+		if (empty($tmpcode) && !empty($modCodeClient->code_auto)) $tmpcode = $modCodeClient->getNextValue($object, 0);
+		print '<input type="text" name="customer_code" id="customer_code" class="maxwidthonsmartphone" value="'.dol_escape_htmltag($tmpcode).'" maxlength="15">';
+		print '</td><td>';
+		$s = $modCodeClient->getToolTip($langs, $object, 0);
+		print $form->textwithpicto('', $s, 1);
+		print '</td></tr></table>';
+		print '</td></tr>';
 
-        if ((!empty($conf->fournisseur->enabled) && !empty($user->rights->fournisseur->lire))
-        	|| (!empty($conf->supplier_proposal->enabled) && !empty($user->rights->supplier_proposal->lire)))
-        {
-            // Supplier
-            print '<tr>';
-            print '<td>'.$form->editfieldkey('Vendor', 'fournisseur', '', $object, 0, 'string', '', 1).'</td><td>';
-            $default = -1;
-            if (!empty($conf->global->THIRDPARTY_SUPPLIER_BY_DEFAULT)) $default = 1;
-            print $form->selectyesno("fournisseur", (GETPOST('fournisseur', 'int') != '' ? GETPOST('fournisseur', 'int') : (GETPOST("type", 'alpha') == '' ? $default : $object->fournisseur)), 1, 0, (GETPOST("type", 'alpha') == '' ? 1 : 0));
-            print '</td>';
+		if ((!empty($conf->fournisseur->enabled) && !empty($user->rights->fournisseur->lire))
+			|| (!empty($conf->supplier_proposal->enabled) && !empty($user->rights->supplier_proposal->lire)))
+		{
+			// Supplier
+			print '<tr>';
+			print '<td>'.$form->editfieldkey('Vendor', 'fournisseur', '', $object, 0, 'string', '', 1).'</td><td>';
+			$default = -1;
+			if (!empty($conf->global->THIRDPARTY_SUPPLIER_BY_DEFAULT)) $default = 1;
+			print $form->selectyesno("fournisseur", (GETPOST('fournisseur', 'int') != '' ? GETPOST('fournisseur', 'int') : (GETPOST("type", 'alpha') == '' ? $default : $object->fournisseur)), 1, 0, (GETPOST("type", 'alpha') == '' ? 1 : 0));
+			print '</td>';
 
 
-            if ($conf->browser->layout == 'phone') print '</tr><tr>';
+			if ($conf->browser->layout == 'phone') print '</tr><tr>';
 
-            print '<td>';
-            if (!empty($conf->fournisseur->enabled) && !empty($user->rights->fournisseur->lire))
-            {
-            	print $form->editfieldkey('SupplierCode', 'supplier_code', '', $object, 0);
-            }
-            print '</td><td>';
-            if (!empty($conf->fournisseur->enabled) && !empty($user->rights->fournisseur->lire))
-            {
-	            print '<table class="nobordernopadding"><tr><td>';
-	            $tmpcode = $object->code_fournisseur;
-	            if (empty($tmpcode) && !empty($modCodeFournisseur->code_auto)) $tmpcode = $modCodeFournisseur->getNextValue($object, 1);
-	            print '<input type="text" name="supplier_code" id="supplier_code" class="maxwidthonsmartphone" value="'.dol_escape_htmltag($tmpcode).'" maxlength="15">';
-	            print '</td><td>';
-	            $s = $modCodeFournisseur->getToolTip($langs, $object, 1);
-	            print $form->textwithpicto('', $s, 1);
-	            print '</td></tr></table>';
-            }
-            print '</td></tr>';
-        }
+			print '<td>';
+			if (!empty($conf->fournisseur->enabled) && !empty($user->rights->fournisseur->lire))
+			{
+				print $form->editfieldkey('SupplierCode', 'supplier_code', '', $object, 0);
+			}
+			print '</td><td>';
+			if (!empty($conf->fournisseur->enabled) && !empty($user->rights->fournisseur->lire))
+			{
+				print '<table class="nobordernopadding"><tr><td>';
+				$tmpcode = $object->code_fournisseur;
+				if (empty($tmpcode) && !empty($modCodeFournisseur->code_auto)) $tmpcode = $modCodeFournisseur->getNextValue($object, 1);
+				print '<input type="text" name="supplier_code" id="supplier_code" class="maxwidthonsmartphone" value="'.dol_escape_htmltag($tmpcode).'" maxlength="15">';
+				print '</td><td>';
+				$s = $modCodeFournisseur->getToolTip($langs, $object, 1);
+				print $form->textwithpicto('', $s, 1);
+				print '</td></tr></table>';
+			}
+			print '</td></tr>';
+		}
 
-        // Status
-        print '<tr><td>'.$form->editfieldkey('Status', 'status', '', $object, 0).'</td><td colspan="3">';
-        print $form->selectarray('status', array('0'=>$langs->trans('ActivityCeased'), '1'=>$langs->trans('InActivity')), 1);
-        print '</td></tr>';
+		// Status
+		print '<tr><td>'.$form->editfieldkey('Status', 'status', '', $object, 0).'</td><td colspan="3">';
+		print $form->selectarray('status', array('0'=>$langs->trans('ActivityCeased'), '1'=>$langs->trans('InActivity')), 1);
+		print '</td></tr>';
 
-        // Barcode
-        if (!empty($conf->barcode->enabled))
-        {
-        	print '<tr><td>'.$form->editfieldkey('Gencod', 'barcode', '', $object, 0).'</td>';
-	        print '<td colspan="3"><input type="text" name="barcode" id="barcode" value="'.dol_escape_htmltag($object->barcode).'">';
-            print '</td></tr>';
-        }
+		// Barcode
+		if (!empty($conf->barcode->enabled))
+		{
+			print '<tr><td>'.$form->editfieldkey('Gencod', 'barcode', '', $object, 0).'</td>';
+			print '<td colspan="3"><input type="text" name="barcode" id="barcode" value="'.dol_escape_htmltag($object->barcode).'">';
+			print '</td></tr>';
+		}
 
-        // Address
-        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 dol_escape_htmltag($object->address);
-        print '</textarea>';
-        print $form->widgetForTranslation("address", $object, $permissiontoadd, 'textarea', 'alphanohtml', 'quatrevingtpercent');
-        print '</td></tr>';
+		// Address
+		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 dol_escape_htmltag($object->address, 0, 1);
+		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 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>';
+		// 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 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
-        print '<tr><td>'.$form->editfieldkey('Country', 'selectcountry_id', '', $object, 0).'</td><td colspan="3" class="maxwidthonsmartphone">';
-        print img_picto('', 'globe-americas', 'class="paddingrightonly"');
-        print $form->select_country((GETPOSTISSET('country_id') ? GETPOST('country_id') : $object->country_id), 'country_id', '', 0, 'minwidth300 widthcentpercentminusx');
-        if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
-        print '</td></tr>';
+		// Country
+		print '<tr><td>'.$form->editfieldkey('Country', 'selectcountry_id', '', $object, 0).'</td><td colspan="3" class="maxwidthonsmartphone">';
+		print img_picto('', 'globe-americas', 'class="paddingrightonly"');
+		print $form->select_country((GETPOSTISSET('country_id') ? GETPOST('country_id') : $object->country_id), 'country_id', '', 0, 'minwidth300 widthcentpercentminusx');
+		if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+		print '</td></tr>';
 
-        // State
-        if (empty($conf->global->SOCIETE_DISABLE_STATE))
-        {
-            if (!empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT) && ($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 1 || $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 2))
-            {
-                print '<tr><td>'.$form->editfieldkey('Region-State', 'state_id', '', $object, 0).'</td><td colspan="3" class="maxwidthonsmartphone">';
-            } else {
-                print '<tr><td>'.$form->editfieldkey('State', 'state_id', '', $object, 0).'</td><td colspan="3" class="maxwidthonsmartphone">';
-            }
+		// State
+		if (empty($conf->global->SOCIETE_DISABLE_STATE))
+		{
+			if (!empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT) && ($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 1 || $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 2))
+			{
+				print '<tr><td>'.$form->editfieldkey('Region-State', 'state_id', '', $object, 0).'</td><td colspan="3" class="maxwidthonsmartphone">';
+			} else {
+				print '<tr><td>'.$form->editfieldkey('State', 'state_id', '', $object, 0).'</td><td colspan="3" class="maxwidthonsmartphone">';
+			}
 
-            if ($object->country_id) print $formcompany->select_state($object->state_id, $object->country_code);
-            else print $countrynotdefined;
-            print '</td></tr>';
-        }
+			if ($object->country_id) print $formcompany->select_state($object->state_id, $object->country_code);
+			else print $countrynotdefined;
+			print '</td></tr>';
+		}
 
-        // Phone / Fax
-        print '<tr><td>'.$form->editfieldkey('Phone', 'phone', '', $object, 0).'</td>';
-        print '<td'.($conf->browser->layout == 'phone' ? ' colspan="3"': '').'>'.img_picto('', 'object_phoning').' <input type="text" name="phone" id="phone" class="maxwidth200 widthcentpercentminusx" value="'.(GETPOSTISSET('phone') ?GETPOST('phone', 'alpha') : $object->phone).'"></td>';
-        if ($conf->browser->layout == 'phone') print '</tr><tr>';
-        print '<td>'.$form->editfieldkey('Fax', 'fax', '', $object, 0).'</td>';
-        print '<td'.($conf->browser->layout == 'phone' ? ' colspan="3"': '').'>'.img_picto('', 'object_phoning_fax').' <input type="text" name="fax" id="fax" class="maxwidth200 widthcentpercentminusx" value="'.(GETPOSTISSET('fax') ?GETPOST('fax', 'alpha') : $object->fax).'"></td></tr>';
+		// Phone / Fax
+		print '<tr><td>'.$form->editfieldkey('Phone', 'phone', '', $object, 0).'</td>';
+		print '<td'.($conf->browser->layout == 'phone' ? ' colspan="3"' : '').'>'.img_picto('', 'object_phoning').' <input type="text" name="phone" id="phone" class="maxwidth200 widthcentpercentminusx" value="'.(GETPOSTISSET('phone') ?GETPOST('phone', 'alpha') : $object->phone).'"></td>';
+		if ($conf->browser->layout == 'phone') print '</tr><tr>';
+		print '<td>'.$form->editfieldkey('Fax', 'fax', '', $object, 0).'</td>';
+		print '<td'.($conf->browser->layout == 'phone' ? ' colspan="3"' : '').'>'.img_picto('', 'object_phoning_fax').' <input type="text" name="fax" id="fax" class="maxwidth200 widthcentpercentminusx" value="'.(GETPOSTISSET('fax') ?GETPOST('fax', 'alpha') : $object->fax).'"></td></tr>';
 
-        // Email / Web
-        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" class="widthcentpercentminusx" 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" class="widthcentpercentminusx" name="url" id="url" value="'.$object->url.'"></td></tr>';
+		// Email / Web
+		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" class="widthcentpercentminusx" 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" class="widthcentpercentminusx" name="url" id="url" value="'.$object->url.'"></td></tr>';
 
-        if (!empty($conf->socialnetworks->enabled)) {
-            foreach ($socialnetworks as $key => $value) {
-                if ($value['active']) {
-                    print '<tr>';
-                    print '<td><label for="'.$value['label'].'">'.$form->editfieldkey($value['label'], $key, '', $object, 0).'</label></td>';
-                    print '<td colspan="3">';
-                    print '<input type="text" name="'.$key.'" id="'.$key.'" class="minwidth100" maxlength="80" value="'.dol_escape_htmltag(GETPOSTISSET($key) ?GETPOST($key, 'alphanohtml') : $object->socialnetworks[$key]).'">';
-                    print '</td>';
-                    print '</tr>';
-                } elseif (!empty($object->socialnetworks[$key])) {
-                    print '<input type="hidden" name="'.$key.'" value="'.$object->socialnetworks[$key].'">';
-                }
-            }
-        }
+		if (!empty($conf->socialnetworks->enabled)) {
+			foreach ($socialnetworks as $key => $value) {
+				if ($value['active']) {
+					print '<tr>';
+					print '<td><label for="'.$value['label'].'">'.$form->editfieldkey($value['label'], $key, '', $object, 0).'</label></td>';
+					print '<td colspan="3">';
+					print '<input type="text" name="'.$key.'" id="'.$key.'" class="minwidth100" maxlength="80" value="'.dol_escape_htmltag(GETPOSTISSET($key) ?GETPOST($key, 'alphanohtml') : $object->socialnetworks[$key]).'">';
+					print '</td>';
+					print '</tr>';
+				} elseif (!empty($object->socialnetworks[$key])) {
+					print '<input type="hidden" name="'.$key.'" value="'.$object->socialnetworks[$key].'">';
+				}
+			}
+		}
 
-        // Prof ids
-        $i = 1; $j = 0; $NBCOLS = ($conf->browser->layout == 'phone' ? 1 : 2);
-        while ($i <= 6)
-        {
-            $idprof = $langs->transcountry('ProfId'.$i, $object->country_code);
-            if ($idprof != '-')
-            {
-	            $key = 'idprof'.$i;
+		// Prof ids
+		$i = 1; $j = 0; $NBCOLS = ($conf->browser->layout == 'phone' ? 1 : 2);
+		while ($i <= 6)
+		{
+			$idprof = $langs->transcountry('ProfId'.$i, $object->country_code);
+			if ($idprof != '-')
+			{
+				$key = 'idprof'.$i;
 
-                if (($j % $NBCOLS) == 0) print '<tr>';
+				if (($j % $NBCOLS) == 0) print '<tr>';
 
-                $idprof_mandatory = 'SOCIETE_IDPROF'.($i).'_MANDATORY';
-                print '<td>'.$form->editfieldkey($idprof, $key, '', $object, 0, 'string', '', (empty($conf->global->$idprof_mandatory) ? 0 : 1)).'</td><td>';
+				$idprof_mandatory = 'SOCIETE_IDPROF'.($i).'_MANDATORY';
+				print '<td>'.$form->editfieldkey($idprof, $key, '', $object, 0, 'string', '', (empty($conf->global->$idprof_mandatory) ? 0 : 1)).'</td><td>';
 
-                print $formcompany->get_input_id_prof($i, $key, $object->$key, $object->country_code);
-                print '</td>';
-                if (($j % $NBCOLS) == ($NBCOLS - 1)) print '</tr>';
-                $j++;
-            }
-            $i++;
-        }
-        if ($NBCOLS > 1 && ($j % 2 == 1)) print '<td colspan="2"></td></tr>';
+				print $formcompany->get_input_id_prof($i, $key, $object->$key, $object->country_code);
+				print '</td>';
+				if (($j % $NBCOLS) == ($NBCOLS - 1)) print '</tr>';
+				$j++;
+			}
+			$i++;
+		}
+		if ($NBCOLS > 1 && ($j % 2 == 1)) print '<td colspan="2"></td></tr>';
 
-        // Vat is used
-        print '<tr><td>'.$form->editfieldkey('VATIsUsed', 'assujtva_value', '', $object, 0).'</td>';
-        print '<td>';
-        print $form->selectyesno('assujtva_value', GETPOSTISSET('assujtva_value') ?GETPOST('assujtva_value', 'int') : 1, 1); // Assujeti par defaut en creation
-        print '</td>';
-        if ($conf->browser->layout == 'phone') print '</tr><tr>';
-        print '<td class="nowrap">'.$form->editfieldkey('VATIntra', 'intra_vat', '', $object, 0).'</td>';
-        print '<td class="nowrap">';
-        $s = '<input type="text" class="flat maxwidthonsmartphone" name="tva_intra" id="intra_vat" maxlength="20" value="'.$object->tva_intra.'">';
+		// Vat is used
+		print '<tr><td>'.$form->editfieldkey('VATIsUsed', 'assujtva_value', '', $object, 0).'</td>';
+		print '<td>';
+		print $form->selectyesno('assujtva_value', GETPOSTISSET('assujtva_value') ?GETPOST('assujtva_value', 'int') : 1, 1); // Assujeti par defaut en creation
+		print '</td>';
+		if ($conf->browser->layout == 'phone') print '</tr><tr>';
+		print '<td class="nowrap">'.$form->editfieldkey('VATIntra', 'intra_vat', '', $object, 0).'</td>';
+		print '<td class="nowrap">';
+		$s = '<input type="text" class="flat maxwidthonsmartphone" name="tva_intra" id="intra_vat" maxlength="20" value="'.$object->tva_intra.'">';
 
-        if (empty($conf->global->MAIN_DISABLEVATCHECK) && isInEEC($object))
-        {
-            $s .= ' ';
+		if (empty($conf->global->MAIN_DISABLEVATCHECK) && isInEEC($object))
+		{
+			$s .= ' ';
 
-            if (!empty($conf->use_javascript_ajax))
-            {
-            	$widthpopup = 600;
-            	if (!empty($conf->dol_use_jmobile)) $widthpopup = 350;
-            	$heightpopup = 400;
-                print "\n";
-                print '<script language="JavaScript" type="text/javascript">';
-                print "function CheckVAT(a) {\n";
-                print "newpopup('".DOL_URL_ROOT."/societe/checkvat/checkVatPopup.php?vatNumber='+a, '".dol_escape_js($langs->trans("VATIntraCheckableOnEUSite"))."', ".$widthpopup.", ".$heightpopup.");\n";
-                print "}\n";
-                print '</script>';
-                print "\n";
-                $s .= '<a href="#" class="hideonsmartphone" onclick="javascript: CheckVAT(document.formsoc.tva_intra.value);">'.$langs->trans("VATIntraCheck").'</a>';
-                $s = $form->textwithpicto($s, $langs->trans("VATIntraCheckDesc", $langs->transnoentitiesnoconv("VATIntraCheck")), 1);
-            } else {
-                $s .= '<a href="'.$langs->transcountry("VATIntraCheckURL", $object->country_id).'" target="_blank">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"), 'help').'</a>';
-            }
-        }
-        print $s;
-        print '</td>';
-        print '</tr>';
+			if (!empty($conf->use_javascript_ajax))
+			{
+				$widthpopup = 600;
+				if (!empty($conf->dol_use_jmobile)) $widthpopup = 350;
+				$heightpopup = 400;
+				print "\n";
+				print '<script language="JavaScript" type="text/javascript">';
+				print "function CheckVAT(a) {\n";
+				print "newpopup('".DOL_URL_ROOT."/societe/checkvat/checkVatPopup.php?vatNumber='+a, '".dol_escape_js($langs->trans("VATIntraCheckableOnEUSite"))."', ".$widthpopup.", ".$heightpopup.");\n";
+				print "}\n";
+				print '</script>';
+				print "\n";
+				$s .= '<a href="#" class="hideonsmartphone" onclick="javascript: CheckVAT(document.formsoc.tva_intra.value);">'.$langs->trans("VATIntraCheck").'</a>';
+				$s = $form->textwithpicto($s, $langs->trans("VATIntraCheckDesc", $langs->transnoentitiesnoconv("VATIntraCheck")), 1);
+			} else {
+				$s .= '<a href="'.$langs->transcountry("VATIntraCheckURL", $object->country_id).'" target="_blank">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"), 'help').'</a>';
+			}
+		}
+		print $s;
+		print '</td>';
+		print '</tr>';
 
-        // Local Taxes
-        //TODO: Place into a function to control showing by country or study better option
-        if ($mysoc->localtax1_assuj == "1" && $mysoc->localtax2_assuj == "1")
-        {
-            print '<tr><td>'.$langs->transcountry("LocalTax1IsUsed", $mysoc->country_code).'</td><td>';
-            print $form->selectyesno('localtax1assuj_value', (isset($conf->global->THIRDPARTY_DEFAULT_USELOCALTAX1) ? $conf->global->THIRDPARTY_DEFAULT_USELOCALTAX1 : 0), 1);
-            print '</td>';
-            if ($conf->browser->layout == 'phone') print '</tr><tr>';
-            print '<td>'.$langs->transcountry("LocalTax2IsUsed", $mysoc->country_code).'</td><td>';
-            print $form->selectyesno('localtax2assuj_value', (isset($conf->global->THIRDPARTY_DEFAULT_USELOCALTAX2) ? $conf->global->THIRDPARTY_DEFAULT_USELOCALTAX2 : 0), 1);
-            print '</td></tr>';
-        } elseif ($mysoc->localtax1_assuj == "1")
-        {
-            print '<tr><td>'.$langs->transcountry("LocalTax1IsUsed", $mysoc->country_code).'</td><td colspan="3">';
-            print $form->selectyesno('localtax1assuj_value', (isset($conf->global->THIRDPARTY_DEFAULT_USELOCALTAX1) ? $conf->global->THIRDPARTY_DEFAULT_USELOCALTAX1 : 0), 1);
-            print '</td></tr>';
-        } elseif ($mysoc->localtax2_assuj == "1")
-        {
-            print '<tr><td>'.$langs->transcountry("LocalTax2IsUsed", $mysoc->country_code).'</td><td colspan="3">';
-            print $form->selectyesno('localtax2assuj_value', (isset($conf->global->THIRDPARTY_DEFAULT_USELOCALTAX2) ? $conf->global->THIRDPARTY_DEFAULT_USELOCALTAX2 : 0), 1);
-            print '</td></tr>';
-        }
+		// Local Taxes
+		//TODO: Place into a function to control showing by country or study better option
+		if ($mysoc->localtax1_assuj == "1" && $mysoc->localtax2_assuj == "1")
+		{
+			print '<tr><td>'.$langs->transcountry("LocalTax1IsUsed", $mysoc->country_code).'</td><td>';
+			print $form->selectyesno('localtax1assuj_value', (isset($conf->global->THIRDPARTY_DEFAULT_USELOCALTAX1) ? $conf->global->THIRDPARTY_DEFAULT_USELOCALTAX1 : 0), 1);
+			print '</td>';
+			if ($conf->browser->layout == 'phone') print '</tr><tr>';
+			print '<td>'.$langs->transcountry("LocalTax2IsUsed", $mysoc->country_code).'</td><td>';
+			print $form->selectyesno('localtax2assuj_value', (isset($conf->global->THIRDPARTY_DEFAULT_USELOCALTAX2) ? $conf->global->THIRDPARTY_DEFAULT_USELOCALTAX2 : 0), 1);
+			print '</td></tr>';
+		} elseif ($mysoc->localtax1_assuj == "1")
+		{
+			print '<tr><td>'.$langs->transcountry("LocalTax1IsUsed", $mysoc->country_code).'</td><td colspan="3">';
+			print $form->selectyesno('localtax1assuj_value', (isset($conf->global->THIRDPARTY_DEFAULT_USELOCALTAX1) ? $conf->global->THIRDPARTY_DEFAULT_USELOCALTAX1 : 0), 1);
+			print '</td></tr>';
+		} elseif ($mysoc->localtax2_assuj == "1")
+		{
+			print '<tr><td>'.$langs->transcountry("LocalTax2IsUsed", $mysoc->country_code).'</td><td colspan="3">';
+			print $form->selectyesno('localtax2assuj_value', (isset($conf->global->THIRDPARTY_DEFAULT_USELOCALTAX2) ? $conf->global->THIRDPARTY_DEFAULT_USELOCALTAX2 : 0), 1);
+			print '</td></tr>';
+		}
 
-        // Type - Workforce/Staff
-        print '<tr><td>'.$form->editfieldkey('ThirdPartyType', 'typent_id', '', $object, 0).'</td><td class="maxwidthonsmartphone"'.($conf->browser->layout == 'phone' ? ' colspan="3"': '').'>'."\n";
-        $sortparam = (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT); // NONE means we keep sort of original array, so we sort on position. ASC, means next function will sort on label.
-        print $form->selectarray("typent_id", $formcompany->typent_array(0), $object->typent_id, 0, 0, 0, '', 0, 0, 0, $sortparam);
-        if ($user->admin) print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
-        print '</td>';
-        if ($conf->browser->layout == 'phone') print '</tr><tr>';
-        print '<td>'.$form->editfieldkey('Workforce', 'effectif_id', '', $object, 0).'</td><td class="maxwidthonsmartphone"'.($conf->browser->layout == 'phone' ? ' colspan="3"': '').'>';
-        print $form->selectarray("effectif_id", $formcompany->effectif_array(0), $object->effectif_id);
-        if ($user->admin) print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
-        print '</td></tr>';
+		// Type - Workforce/Staff
+		print '<tr><td>'.$form->editfieldkey('ThirdPartyType', 'typent_id', '', $object, 0).'</td><td class="maxwidthonsmartphone"'.($conf->browser->layout == 'phone' ? ' colspan="3"' : '').'>'."\n";
+		$sortparam = (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT); // NONE means we keep sort of original array, so we sort on position. ASC, means next function will sort on label.
+		print $form->selectarray("typent_id", $formcompany->typent_array(0), $object->typent_id, 0, 0, 0, '', 0, 0, 0, $sortparam);
+		if ($user->admin) print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+		print '</td>';
+		if ($conf->browser->layout == 'phone') print '</tr><tr>';
+		print '<td>'.$form->editfieldkey('Workforce', 'effectif_id', '', $object, 0).'</td><td class="maxwidthonsmartphone"'.($conf->browser->layout == 'phone' ? ' colspan="3"' : '').'>';
+		print $form->selectarray("effectif_id", $formcompany->effectif_array(0), $object->effectif_id);
+		if ($user->admin) print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+		print '</td></tr>';
 
-        // Legal Form
-        print '<tr><td>'.$form->editfieldkey('JuridicalStatus', 'forme_juridique_code', '', $object, 0).'</td>';
-        print '<td colspan="3" class="maxwidthonsmartphone">';
-        if ($object->country_id)
-        {
-            print $formcompany->select_juridicalstatus($object->forme_juridique_code, $object->country_code, '', 'forme_juridique_code');
-        } else {
-            print $countrynotdefined;
-        }
-        print '</td></tr>';
+		// Legal Form
+		print '<tr><td>'.$form->editfieldkey('JuridicalStatus', 'forme_juridique_code', '', $object, 0).'</td>';
+		print '<td colspan="3" class="maxwidthonsmartphone">';
+		if ($object->country_id)
+		{
+			print $formcompany->select_juridicalstatus($object->forme_juridique_code, $object->country_code, '', 'forme_juridique_code');
+		} else {
+			print $countrynotdefined;
+		}
+		print '</td></tr>';
 
-        // Capital
-        print '<tr><td>'.$form->editfieldkey('Capital', 'capital', '', $object, 0).'</td>';
-	    print '<td colspan="3"><input type="text" name="capital" id="capital" class="maxwidth100" value="'.$object->capital.'"> ';
-        print '<span class="hideonsmartphone">'.$langs->trans("Currency".$conf->currency).'</span></td></tr>';
+		// Capital
+		print '<tr><td>'.$form->editfieldkey('Capital', 'capital', '', $object, 0).'</td>';
+		print '<td colspan="3"><input type="text" name="capital" id="capital" class="maxwidth100" value="'.$object->capital.'"> ';
+		print '<span class="hideonsmartphone">'.$langs->trans("Currency".$conf->currency).'</span></td></tr>';
 
-        if (!empty($conf->global->MAIN_MULTILANGS))
-        {
-            print '<tr><td>'.$form->editfieldkey('DefaultLang', 'default_lang', '', $object, 0).'</td><td colspan="3" class="maxwidthonsmartphone">'."\n";
-            print $formadmin->select_language(GETPOST('default_lang', 'alpha') ? GETPOST('default_lang', 'alpha') : ($object->default_lang ? $object->default_lang : ''), 'default_lang', 0, 0, 1, 0, 0, 'maxwidth200onsmartphone');
-            print '</td>';
-            print '</tr>';
-        }
+		if (!empty($conf->global->MAIN_MULTILANGS))
+		{
+			print '<tr><td>'.$form->editfieldkey('DefaultLang', 'default_lang', '', $object, 0).'</td><td colspan="3" class="maxwidthonsmartphone">'."\n";
+			print $formadmin->select_language(GETPOST('default_lang', 'alpha') ? GETPOST('default_lang', 'alpha') : ($object->default_lang ? $object->default_lang : ''), 'default_lang', 0, 0, 1, 0, 0, 'maxwidth200onsmartphone');
+			print '</td>';
+			print '</tr>';
+		}
 
 		// Incoterms
 		if (!empty($conf->incoterm->enabled))
 		{
 			print '<tr>';
 			print '<td>'.$form->editfieldkey('IncotermLabel', 'incoterm_id', '', $object, 0).'</td>';
-	        print '<td colspan="3" class="maxwidthonsmartphone">';
-	        print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms) ? $object->location_incoterms : ''));
+			print '<td colspan="3" class="maxwidthonsmartphone">';
+			print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms) ? $object->location_incoterms : ''));
 			print '</td></tr>';
 		}
 
@@ -1508,8 +1508,8 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		{
 			print '<tr>';
 			print '<td>'.$form->editfieldkey('Currency', 'multicurrency_code', '', $object, 0).'</td>';
-	        print '<td colspan="3" class="maxwidthonsmartphone">';
-	        print $form->selectMultiCurrency(($object->multicurrency_code ? $object->multicurrency_code : $conf->currency), 'multicurrency_code', 1);
+			print '<td colspan="3" class="maxwidthonsmartphone">';
+			print $form->selectMultiCurrency(($object->multicurrency_code ? $object->multicurrency_code : $conf->currency), 'multicurrency_code', 1);
 			print '</td></tr>';
 		}
 
@@ -1527,130 +1527,130 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		print $form->multiselectarray('commercial', $userlist, $selected, null, null, null, null, "90%");
 		print '</td></tr>';
 
-        // Ajout du logo
-        print '<tr class="hideonsmartphone">';
-        print '<td>'.$form->editfieldkey('Logo', 'photoinput', '', $object, 0).'</td>';
-        print '<td colspan="3">';
-        print '<input class="flat" type="file" name="photo" id="photoinput" />';
-        print '</td>';
-        print '</tr>';
+		// Ajout du logo
+		print '<tr class="hideonsmartphone">';
+		print '<td>'.$form->editfieldkey('Logo', 'photoinput', '', $object, 0).'</td>';
+		print '<td colspan="3">';
+		print '<input class="flat" type="file" name="photo" id="photoinput" />';
+		print '</td>';
+		print '</tr>';
 
-        print '</table>'."\n";
+		print '</table>'."\n";
 
-        dol_fiche_end();
+		print dol_get_fiche_end();
 
-        print '<div class="center">';
-        print '<input type="submit" class="button" name="create" value="'.$langs->trans('AddThirdParty').'">';
-        if (!empty($backtopage))
-        {
-            print ' &nbsp; &nbsp; ';
-            print '<input type="submit" class="button" name="cancel" value="'.$langs->trans('Cancel').'">';
-        } else {
-            print ' &nbsp; &nbsp; ';
-            print '<input type="button" class="button" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)">';
-        }
-        print '</div>'."\n";
+		print '<div class="center">';
+		print '<input type="submit" class="button" name="create" value="'.$langs->trans('AddThirdParty').'">';
+		if (!empty($backtopage))
+		{
+			print ' &nbsp; &nbsp; ';
+			print '<input type="submit" class="button" name="cancel" value="'.$langs->trans('Cancel').'">';
+		} else {
+			print ' &nbsp; &nbsp; ';
+			print '<input type="button" class="button" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)">';
+		}
+		print '</div>'."\n";
 
-        print '</form>'."\n";
-    } elseif ($action == 'edit')
-    {
-        //print load_fiche_titre($langs->trans("EditCompany"));
+		print '</form>'."\n";
+	} elseif ($action == 'edit')
+	{
+		//print load_fiche_titre($langs->trans("EditCompany"));
 
-        if ($socid)
-        {
-        	$res = $object->fetch_optionals();
-            //if ($res < 0) { dol_print_error($db); exit; }
+		if ($socid)
+		{
+			$res = $object->fetch_optionals();
+			//if ($res < 0) { dol_print_error($db); exit; }
 
-	        $head = societe_prepare_head($object);
+			$head = societe_prepare_head($object);
 
-            // Load object modCodeTiers
-            $module = (!empty($conf->global->SOCIETE_CODECLIENT_ADDON) ? $conf->global->SOCIETE_CODECLIENT_ADDON : 'mod_codeclient_leopard');
-            if (substr($module, 0, 15) == 'mod_codeclient_' && substr($module, -3) == 'php')
-            {
-                $module = substr($module, 0, dol_strlen($module) - 4);
-            }
-            $dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
-            foreach ($dirsociete as $dirroot)
-            {
-                $res = dol_include_once($dirroot.$module.'.php');
-                if ($res) break;
-            }
-            $modCodeClient = new $module($db);
-            // We verified if the tag prefix is used
-            if ($modCodeClient->code_auto)
-            {
-                $prefixCustomerIsUsed = $modCodeClient->verif_prefixIsUsed();
-            }
-            $module = $conf->global->SOCIETE_CODECLIENT_ADDON;
-            if (substr($module, 0, 15) == 'mod_codeclient_' && substr($module, -3) == 'php')
-            {
-                $module = substr($module, 0, dol_strlen($module) - 4);
-            }
-            $dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
-            foreach ($dirsociete as $dirroot)
-            {
-                $res = dol_include_once($dirroot.$module.'.php');
-                if ($res) break;
-            }
-            $modCodeFournisseur = new $module($db);
-            // On verifie si la balise prefix est utilisee
-            if ($modCodeFournisseur->code_auto)
-            {
-                $prefixSupplierIsUsed = $modCodeFournisseur->verif_prefixIsUsed();
-            }
+			// Load object modCodeTiers
+			$module = (!empty($conf->global->SOCIETE_CODECLIENT_ADDON) ? $conf->global->SOCIETE_CODECLIENT_ADDON : 'mod_codeclient_leopard');
+			if (substr($module, 0, 15) == 'mod_codeclient_' && substr($module, -3) == 'php')
+			{
+				$module = substr($module, 0, dol_strlen($module) - 4);
+			}
+			$dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
+			foreach ($dirsociete as $dirroot)
+			{
+				$res = dol_include_once($dirroot.$module.'.php');
+				if ($res) break;
+			}
+			$modCodeClient = new $module($db);
+			// We verified if the tag prefix is used
+			if ($modCodeClient->code_auto)
+			{
+				$prefixCustomerIsUsed = $modCodeClient->verif_prefixIsUsed();
+			}
+			$module = $conf->global->SOCIETE_CODECLIENT_ADDON;
+			if (substr($module, 0, 15) == 'mod_codeclient_' && substr($module, -3) == 'php')
+			{
+				$module = substr($module, 0, dol_strlen($module) - 4);
+			}
+			$dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
+			foreach ($dirsociete as $dirroot)
+			{
+				$res = dol_include_once($dirroot.$module.'.php');
+				if ($res) break;
+			}
+			$modCodeFournisseur = new $module($db);
+			// On verifie si la balise prefix est utilisee
+			if ($modCodeFournisseur->code_auto)
+			{
+				$prefixSupplierIsUsed = $modCodeFournisseur->verif_prefixIsUsed();
+			}
 
 			$object->oldcopy = clone $object;
 
-            if (GETPOSTISSET('name'))
-            {
-                // We overwrite with values if posted
-                $object->name = GETPOST('name', 'alphanohtml');
-                $object->prefix_comm			= GETPOST('prefix_comm', 'alphanohtml');
-                $object->client = GETPOST('client', 'int');
-                $object->code_client			= GETPOST('customer_code', 'alpha');
-                $object->fournisseur			= GETPOST('fournisseur', 'int');
-                $object->code_fournisseur = GETPOST('supplier_code', 'alpha');
-                $object->address = GETPOST('address', 'alphanohtml');
-                $object->zip = GETPOST('zipcode', 'alphanohtml');
-                $object->town = GETPOST('town', 'alphanohtml');
-                $object->country_id = GETPOST('country_id') ?GETPOST('country_id', 'int') : $mysoc->country_id;
-                $object->state_id = GETPOST('state_id', 'int');
-                //$object->skype				= GETPOST('skype', 'alpha');
-                //$object->twitter				= GETPOST('twitter', 'alpha');
-                //$object->facebook				= GETPOST('facebook', 'alpha');
-                //$object->linkedin				= GETPOST('linkedin', 'alpha');
-                $object->socialnetworks = array();
-                if (!empty($conf->socialnetworks->enabled)) {
-                    foreach ($socialnetworks as $key => $value) {
-                        if (GETPOSTISSET($key) && GETPOST($key, 'alphanohtml') != '') {
-                            $object->socialnetworks[$key] = GETPOST($key, 'alphanohtml');
-                        }
-                    }
-                }
-                $object->phone					= GETPOST('phone', 'alpha');
-                $object->fax					= GETPOST('fax', 'alpha');
-                $object->email					= GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL);
-                $object->url					= GETPOST('url', 'custom', 0, FILTER_SANITIZE_URL);
-                $object->capital				= GETPOST('capital', 'alphanohtml');
-                $object->idprof1				= GETPOST('idprof1', 'alphanohtml');
-                $object->idprof2				= GETPOST('idprof2', 'alphanohtml');
-                $object->idprof3				= GETPOST('idprof3', 'alphanohtml');
-                $object->idprof4				= GETPOST('idprof4', 'alphanohtml');
-                $object->idprof5				= GETPOST('idprof5', 'alphanohtml');
-                $object->idprof6				= GETPOST('idprof6', 'alphanohtml');
-                $object->typent_id = GETPOST('typent_id', 'int');
-                $object->effectif_id = GETPOST('effectif_id', 'int');
-                $object->barcode				= GETPOST('barcode', 'alphanohtml');
-                $object->forme_juridique_code = GETPOST('forme_juridique_code', 'int');
-                $object->default_lang = GETPOST('default_lang', 'alpha');
+			if (GETPOSTISSET('name'))
+			{
+				// We overwrite with values if posted
+				$object->name = GETPOST('name', 'alphanohtml');
+				$object->prefix_comm			= GETPOST('prefix_comm', 'alphanohtml');
+				$object->client = GETPOST('client', 'int');
+				$object->code_client			= GETPOST('customer_code', 'alpha');
+				$object->fournisseur			= GETPOST('fournisseur', 'int');
+				$object->code_fournisseur = GETPOST('supplier_code', 'alpha');
+				$object->address = GETPOST('address', 'alphanohtml');
+				$object->zip = GETPOST('zipcode', 'alphanohtml');
+				$object->town = GETPOST('town', 'alphanohtml');
+				$object->country_id = GETPOST('country_id') ?GETPOST('country_id', 'int') : $mysoc->country_id;
+				$object->state_id = GETPOST('state_id', 'int');
+				//$object->skype				= GETPOST('skype', 'alpha');
+				//$object->twitter				= GETPOST('twitter', 'alpha');
+				//$object->facebook				= GETPOST('facebook', 'alpha');
+				//$object->linkedin				= GETPOST('linkedin', 'alpha');
+				$object->socialnetworks = array();
+				if (!empty($conf->socialnetworks->enabled)) {
+					foreach ($socialnetworks as $key => $value) {
+						if (GETPOSTISSET($key) && GETPOST($key, 'alphanohtml') != '') {
+							$object->socialnetworks[$key] = GETPOST($key, 'alphanohtml');
+						}
+					}
+				}
+				$object->phone					= GETPOST('phone', 'alpha');
+				$object->fax					= GETPOST('fax', 'alpha');
+				$object->email					= GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL);
+				$object->url					= GETPOST('url', 'custom', 0, FILTER_SANITIZE_URL);
+				$object->capital				= GETPOST('capital', 'alphanohtml');
+				$object->idprof1				= GETPOST('idprof1', 'alphanohtml');
+				$object->idprof2				= GETPOST('idprof2', 'alphanohtml');
+				$object->idprof3				= GETPOST('idprof3', 'alphanohtml');
+				$object->idprof4				= GETPOST('idprof4', 'alphanohtml');
+				$object->idprof5				= GETPOST('idprof5', 'alphanohtml');
+				$object->idprof6				= GETPOST('idprof6', 'alphanohtml');
+				$object->typent_id = GETPOST('typent_id', 'int');
+				$object->effectif_id = GETPOST('effectif_id', 'int');
+				$object->barcode				= GETPOST('barcode', 'alphanohtml');
+				$object->forme_juridique_code = GETPOST('forme_juridique_code', 'int');
+				$object->default_lang = GETPOST('default_lang', 'alpha');
 
-                $object->tva_assuj				= GETPOST('assujtva_value', 'int');
-                $object->tva_intra				= GETPOST('tva_intra', 'alphanohtml');
-                $object->status = GETPOST('status', 'int');
+				$object->tva_assuj				= GETPOST('assujtva_value', 'int');
+				$object->tva_intra				= GETPOST('tva_intra', 'alphanohtml');
+				$object->status = GETPOST('status', 'int');
 
-                // Webservices url/key
-                $object->webservices_url        = GETPOST('webservices_url', 'custom', 0, FILTER_SANITIZE_URL);
-                $object->webservices_key        = GETPOST('webservices_key', 'san_alpha');
+				// Webservices url/key
+				$object->webservices_url        = GETPOST('webservices_url', 'custom', 0, FILTER_SANITIZE_URL);
+				$object->webservices_key        = GETPOST('webservices_key', 'san_alpha');
 
 				//Incoterms
 				if (!empty($conf->incoterm->enabled))
@@ -1757,347 +1757,347 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
         			});
 
                 })';
-                print '</script>'."\n";
-            }
-
-            print '<form enctype="multipart/form-data" action="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'" method="post" name="formsoc">';
-            print '<input type="hidden" name="action" value="update">';
-            print '<input type="hidden" name="token" value="'.newToken().'">';
-            print '<input type="hidden" name="socid" value="'.$object->id.'">';
-            print '<input type="hidden" name="entity" value="'.$object->entity.'">';
-            if ($modCodeClient->code_auto || $modCodeFournisseur->code_auto) print '<input type="hidden" name="code_auto" value="1">';
-
-
-            print dol_get_fiche_head($head, 'card', $langs->trans("ThirdParty"), 0, 'company');
-
-            print '<div class="fichecenter2">';
-            print '<table class="border centpercent">';
-
-            // Ref/ID
-			if (!empty($conf->global->MAIN_SHOW_TECHNICAL_ID))
-			{
-		        print '<tr><td class="titlefieldcreate">'.$langs->trans("ID").'</td><td colspan="3">';
-            	print $object->ref;
-            	print '</td></tr>';
+				print '</script>'."\n";
 			}
 
-            // Name
-            print '<tr><td class="titlefieldcreate">'.$form->editfieldkey('ThirdPartyName', 'name', '', $object, 0, 'string', '', 1).'</td>';
-	        print '<td colspan="3"><input type="text" class="minwidth300" maxlength="128" name="name" id="name" value="'.dol_escape_htmltag($object->name).'" autofocus="autofocus">';
-	        print $form->widgetForTranslation("name", $object, $permissiontoadd, 'string', 'alpahnohtml', 'minwidth300');
-	        print '</td></tr>';
+			print '<form enctype="multipart/form-data" action="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'" method="post" name="formsoc">';
+			print '<input type="hidden" name="action" value="update">';
+			print '<input type="hidden" name="token" value="'.newToken().'">';
+			print '<input type="hidden" name="socid" value="'.$object->id.'">';
+			print '<input type="hidden" name="entity" value="'.$object->entity.'">';
+			if ($modCodeClient->code_auto || $modCodeFournisseur->code_auto) print '<input type="hidden" name="code_auto" value="1">';
 
-	        // Alias names (commercial, trademark or alias names)
-	        print '<tr id="name_alias"><td><label for="name_alias_input">'.$langs->trans('AliasNames').'</label></td>';
-	        print '<td colspan="3"><input type="text" class="minwidth300" name="name_alias" id="name_alias_input" value="'.dol_escape_htmltag($object->name_alias).'"></td></tr>';
 
-            // Prefix
-            if (!empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
-            {
-                print '<tr><td>'.$form->editfieldkey('Prefix', 'prefix', '', $object, 0).'</td><td colspan="3">';
-                // It does not change the prefix mode using the auto numbering prefix
-                if (($prefixCustomerIsUsed || $prefixSupplierIsUsed) && $object->prefix_comm)
-                {
-                    print '<input type="hidden" name="prefix_comm" value="'.dol_escape_htmltag($object->prefix_comm).'">';
-                    print $object->prefix_comm;
-                } else {
-                    print '<input type="text" size="5" maxlength="5" name="prefix_comm" id="prefix" value="'.dol_escape_htmltag($object->prefix_comm).'">';
-                }
-                print '</td>';
-            }
+			print dol_get_fiche_head($head, 'card', $langs->trans("ThirdParty"), 0, 'company');
 
-            // Prospect/Customer
-            print '<tr><td>'.$form->editfieldkey('ProspectCustomer', 'customerprospect', '', $object, 0, 'string', '', 1).'</td>';
-	        print '<td class="maxwidthonsmartphone">';
-	        print $formcompany->selectProspectCustomerType($object->client);
-            print '</td>';
-            if ($conf->browser->layout == 'phone') print '</tr><tr>';
-            print '<td>'.$form->editfieldkey('CustomerCode', 'customer_code', '', $object, 0).'</td><td>';
+			print '<div class="fichecenter2">';
+			print '<table class="border centpercent">';
 
-            print '<table class="nobordernopadding"><tr><td>';
-            if ((!$object->code_client || $object->code_client == -1) && $modCodeClient->code_auto)
-            {
-                $tmpcode = $object->code_client;
-                if (empty($tmpcode) && !empty($object->oldcopy->code_client)) $tmpcode = $object->oldcopy->code_client; // When there is an error to update a thirdparty, the number for supplier and customer code is kept to old value.
-                if (empty($tmpcode) && !empty($modCodeClient->code_auto)) $tmpcode = $modCodeClient->getNextValue($object, 0);
-                print '<input type="text" name="customer_code" id="customer_code" size="16" value="'.dol_escape_htmltag($tmpcode).'" maxlength="15">';
-            } elseif ($object->codeclient_modifiable())
-            {
-            	print '<input type="text" name="customer_code" id="customer_code" size="16" value="'.dol_escape_htmltag($object->code_client).'" maxlength="15">';
-            } else {
-                print $object->code_client;
-                print '<input type="hidden" name="customer_code" value="'.dol_escape_htmltag($object->code_client).'">';
-            }
-            print '</td><td>';
-            $s = $modCodeClient->getToolTip($langs, $object, 0);
-            print $form->textwithpicto('', $s, 1);
-            print '</td></tr></table>';
+			// Ref/ID
+			if (!empty($conf->global->MAIN_SHOW_TECHNICAL_ID))
+			{
+				print '<tr><td class="titlefieldcreate">'.$langs->trans("ID").'</td><td colspan="3">';
+				print $object->ref;
+				print '</td></tr>';
+			}
 
-            print '</td></tr>';
+			// Name
+			print '<tr><td class="titlefieldcreate">'.$form->editfieldkey('ThirdPartyName', 'name', '', $object, 0, 'string', '', 1).'</td>';
+			print '<td colspan="3"><input type="text" class="minwidth300" maxlength="128" name="name" id="name" value="'.dol_escape_htmltag($object->name).'" autofocus="autofocus">';
+			print $form->widgetForTranslation("name", $object, $permissiontoadd, 'string', 'alpahnohtml', 'minwidth300');
+			print '</td></tr>';
 
-            // Supplier
-            if ((!empty($conf->fournisseur->enabled) && !empty($user->rights->fournisseur->lire))
-            	|| (!empty($conf->supplier_proposal->enabled) && !empty($user->rights->supplier_proposal->lire)))
-            {
-                print '<tr>';
-                print '<td>'.$form->editfieldkey('Supplier', 'fournisseur', '', $object, 0, 'string', '', 1).'</td>';
-                print '<td class="maxwidthonsmartphone">';
-                print $form->selectyesno("fournisseur", $object->fournisseur, 1);
-                print '</td>';
-                if ($conf->browser->layout == 'phone') print '</tr><tr>';
-                print '<td>';
-                if (!empty($conf->fournisseur->enabled) && !empty($user->rights->fournisseur->lire))
-                {
-                	print $form->editfieldkey('SupplierCode', 'supplier_code', '', $object, 0);
-                }
-                print '</td>';
-                print '<td>';
-                print '<table class="nobordernopadding"><tr><td>';
-                if ((!$object->code_fournisseur || $object->code_fournisseur == -1) && $modCodeFournisseur->code_auto)
-                {
-                    $tmpcode = $object->code_fournisseur;
-                    if (empty($tmpcode) && !empty($object->oldcopy->code_fournisseur)) $tmpcode = $object->oldcopy->code_fournisseur; // When there is an error to update a thirdparty, the number for supplier and customer code is kept to old value.
-                    if (empty($tmpcode) && !empty($modCodeFournisseur->code_auto)) $tmpcode = $modCodeFournisseur->getNextValue($object, 1);
-                    print '<input type="text" name="supplier_code" id="supplier_code" size="16" value="'.dol_escape_htmltag($tmpcode).'" maxlength="15">';
-                } elseif ($object->codefournisseur_modifiable())
-                {
-                	print '<input type="text" name="supplier_code" id="supplier_code" size="16" value="'.dol_escape_htmltag($object->code_fournisseur).'" maxlength="15">';
-                } else {
-                    print $object->code_fournisseur;
-                    print '<input type="hidden" name="supplier_code" value="'.$object->code_fournisseur.'">';
-                }
-                print '</td><td>';
-                $s = $modCodeFournisseur->getToolTip($langs, $object, 1);
-                print $form->textwithpicto('', $s, 1);
-                print '</td></tr></table>';
-                print '</td></tr>';
-            }
+			// Alias names (commercial, trademark or alias names)
+			print '<tr id="name_alias"><td><label for="name_alias_input">'.$langs->trans('AliasNames').'</label></td>';
+			print '<td colspan="3"><input type="text" class="minwidth300" name="name_alias" id="name_alias_input" value="'.dol_escape_htmltag($object->name_alias).'"></td></tr>';
 
-            // Barcode
-            if (!empty($conf->barcode->enabled))
-            {
-                print '<tr><td class="tdtop">'.$form->editfieldkey('Gencod', 'barcode', '', $object, 0).'</td>';
-	            print '<td colspan="3"><input type="text" name="barcode" id="barcode" value="'.dol_escape_htmltag($object->barcode).'">';
-                print '</td></tr>';
-            }
+			// Prefix
+			if (!empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
+			{
+				print '<tr><td>'.$form->editfieldkey('Prefix', 'prefix', '', $object, 0).'</td><td colspan="3">';
+				// It does not change the prefix mode using the auto numbering prefix
+				if (($prefixCustomerIsUsed || $prefixSupplierIsUsed) && $object->prefix_comm)
+				{
+					print '<input type="hidden" name="prefix_comm" value="'.dol_escape_htmltag($object->prefix_comm).'">';
+					print $object->prefix_comm;
+				} else {
+					print '<input type="text" size="5" maxlength="5" name="prefix_comm" id="prefix" value="'.dol_escape_htmltag($object->prefix_comm).'">';
+				}
+				print '</td>';
+			}
 
-            // Status
-            print '<tr><td>'.$form->editfieldkey('Status', 'status', '', $object, 0).'</td><td colspan="3">';
-            print $form->selectarray('status', array('0'=>$langs->trans('ActivityCeased'), '1'=>$langs->trans('InActivity')), $object->status);
-            print '</td></tr>';
+			// Prospect/Customer
+			print '<tr><td>'.$form->editfieldkey('ProspectCustomer', 'customerprospect', '', $object, 0, 'string', '', 1).'</td>';
+			print '<td class="maxwidthonsmartphone">';
+			print $formcompany->selectProspectCustomerType($object->client);
+			print '</td>';
+			if ($conf->browser->layout == 'phone') print '</tr><tr>';
+			print '<td>'.$form->editfieldkey('CustomerCode', 'customer_code', '', $object, 0).'</td><td>';
 
-            // 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="3" wrap="soft">';
-	        print dol_escape_htmltag($object->address);
-            print '</textarea>';
-            print $form->widgetForTranslation("address", $object, $permissiontoadd, 'textarea', 'alphanohtml', 'quatrevingtpercent');
-            print '</td></tr>';
+			print '<table class="nobordernopadding"><tr><td>';
+			if ((!$object->code_client || $object->code_client == -1) && $modCodeClient->code_auto)
+			{
+				$tmpcode = $object->code_client;
+				if (empty($tmpcode) && !empty($object->oldcopy->code_client)) $tmpcode = $object->oldcopy->code_client; // When there is an error to update a thirdparty, the number for supplier and customer code is kept to old value.
+				if (empty($tmpcode) && !empty($modCodeClient->code_auto)) $tmpcode = $modCodeClient->getNextValue($object, 0);
+				print '<input type="text" name="customer_code" id="customer_code" size="16" value="'.dol_escape_htmltag($tmpcode).'" maxlength="15">';
+			} elseif ($object->codeclient_modifiable())
+			{
+				print '<input type="text" name="customer_code" id="customer_code" size="16" value="'.dol_escape_htmltag($object->code_client).'" maxlength="15">';
+			} else {
+				print $object->code_client;
+				print '<input type="hidden" name="customer_code" value="'.dol_escape_htmltag($object->code_client).'">';
+			}
+			print '</td><td>';
+			$s = $modCodeClient->getToolTip($langs, $object, 0);
+			print $form->textwithpicto('', $s, 1);
+			print '</td></tr></table>';
 
-            // 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, '', 'maxwidth50onsmartphone');
-            print '</td>';
-            if ($conf->browser->layout == 'phone') print '</tr><tr>';
-            print '<td>'.$form->editfieldkey('Town', 'town', '', $object, 0).'</td><td>';
-            print $formcompany->select_ziptown($object->town, 'town', array('zipcode', 'selectcountry_id', 'state_id'));
-            print $form->widgetForTranslation("town", $object, $permissiontoadd, 'string', 'alphanohtml', 'maxwidth100 quatrevingtpercent');
-            print '</td></tr>';
+			print '</td></tr>';
 
-            // Country
-            print '<tr><td>'.$form->editfieldkey('Country', 'selectcounty_id', '', $object, 0).'</td><td colspan="3">';
-            print img_picto('', 'globe-americas', 'class="paddingrightonly"');
-            print $form->select_country((GETPOSTISSET('country_id') ? GETPOST('country_id') : $object->country_id), 'country_id', '', 0, 'minwidth300 widthcentpercentminusx');
-            if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
-            print '</td></tr>';
+			// Supplier
+			if ((!empty($conf->fournisseur->enabled) && !empty($user->rights->fournisseur->lire))
+				|| (!empty($conf->supplier_proposal->enabled) && !empty($user->rights->supplier_proposal->lire)))
+			{
+				print '<tr>';
+				print '<td>'.$form->editfieldkey('Supplier', 'fournisseur', '', $object, 0, 'string', '', 1).'</td>';
+				print '<td class="maxwidthonsmartphone">';
+				print $form->selectyesno("fournisseur", $object->fournisseur, 1);
+				print '</td>';
+				if ($conf->browser->layout == 'phone') print '</tr><tr>';
+				print '<td>';
+				if (!empty($conf->fournisseur->enabled) && !empty($user->rights->fournisseur->lire))
+				{
+					print $form->editfieldkey('SupplierCode', 'supplier_code', '', $object, 0);
+				}
+				print '</td>';
+				print '<td>';
+				print '<table class="nobordernopadding"><tr><td>';
+				if ((!$object->code_fournisseur || $object->code_fournisseur == -1) && $modCodeFournisseur->code_auto)
+				{
+					$tmpcode = $object->code_fournisseur;
+					if (empty($tmpcode) && !empty($object->oldcopy->code_fournisseur)) $tmpcode = $object->oldcopy->code_fournisseur; // When there is an error to update a thirdparty, the number for supplier and customer code is kept to old value.
+					if (empty($tmpcode) && !empty($modCodeFournisseur->code_auto)) $tmpcode = $modCodeFournisseur->getNextValue($object, 1);
+					print '<input type="text" name="supplier_code" id="supplier_code" size="16" value="'.dol_escape_htmltag($tmpcode).'" maxlength="15">';
+				} elseif ($object->codefournisseur_modifiable())
+				{
+					print '<input type="text" name="supplier_code" id="supplier_code" size="16" value="'.dol_escape_htmltag($object->code_fournisseur).'" maxlength="15">';
+				} else {
+					print $object->code_fournisseur;
+					print '<input type="hidden" name="supplier_code" value="'.$object->code_fournisseur.'">';
+				}
+				print '</td><td>';
+				$s = $modCodeFournisseur->getToolTip($langs, $object, 1);
+				print $form->textwithpicto('', $s, 1);
+				print '</td></tr></table>';
+				print '</td></tr>';
+			}
 
-            // State
-            if (empty($conf->global->SOCIETE_DISABLE_STATE))
-            {
-                if (!empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT) && ($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 1 || $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 2))
-                {
-                    print '<tr><td>'.$form->editfieldkey('Region-State', 'state_id', '', $object, 0).'</td><td colspan="3">';
-                } else {
-                    print '<tr><td>'.$form->editfieldkey('State', 'state_id', '', $object, 0).'</td><td colspan="3">';
-                }
+			// Barcode
+			if (!empty($conf->barcode->enabled))
+			{
+				print '<tr><td class="tdtop">'.$form->editfieldkey('Gencod', 'barcode', '', $object, 0).'</td>';
+				print '<td colspan="3"><input type="text" name="barcode" id="barcode" value="'.dol_escape_htmltag($object->barcode).'">';
+				print '</td></tr>';
+			}
 
-                print $formcompany->select_state($object->state_id, $object->country_code);
-                print '</td></tr>';
-            }
+			// Status
+			print '<tr><td>'.$form->editfieldkey('Status', 'status', '', $object, 0).'</td><td colspan="3">';
+			print $form->selectarray('status', array('0'=>$langs->trans('ActivityCeased'), '1'=>$langs->trans('InActivity')), $object->status);
+			print '</td></tr>';
 
-            // Phone / Fax
-            print '<tr><td>'.$form->editfieldkey('Phone', 'phone', GETPOST('phone', 'alpha'), $object, 0).'</td>';
-            print '<td>'.img_picto('', 'object_phoning').' <input type="text" name="phone" id="phone" class="maxwidth200 widthcentpercentminusx" value="'.(GETPOSTISSET('phone') ?GETPOST('phone', 'alpha') : $object->phone).'"></td>';
-            if ($conf->browser->layout == 'phone') print '</tr><tr>';
-            print '<td>'.$form->editfieldkey('Fax', 'fax', GETPOST('fax', 'alpha'), $object, 0).'</td>';
-            print '<td>'.img_picto('', 'object_phoning_fax').' <input type="text" name="fax" id="fax" class="maxwidth200 widthcentpercentminusx" value="'.(GETPOSTISSET('fax') ?GETPOST('fax', 'alpha') : $object->fax).'"></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="3" wrap="soft">';
+			print dol_escape_htmltag($object->address, 0, 1);
+			print '</textarea>';
+			print $form->widgetForTranslation("address", $object, $permissiontoadd, 'textarea', 'alphanohtml', 'quatrevingtpercent');
+			print '</td></tr>';
 
-            // EMail / Web
-            print '<tr><td>'.$form->editfieldkey('EMail', 'email', GETPOST('email', 'alpha'), $object, 0, 'string', '', (!empty($conf->global->SOCIETE_EMAIL_MANDATORY))).'</td>';
-            print '<td colspan="3">'.img_picto('', 'object_email').' <input type="text" name="email" id="email" class="maxwidth200onsmartphone widthcentpercentminusx" value="'.(GETPOSTISSET('email') ?GETPOST('email', 'alpha') : $object->email).'"></td></tr>';
-	        print '<tr><td>'.$form->editfieldkey('Web', 'url', GETPOST('url', 'alpha'), $object, 0).'</td>';
-	        print '<td colspan="3">'.img_picto('', 'globe').' <input type="text" name="url" id="url" class="maxwidth200onsmartphone widthcentpercentminusx " value="'.(GETPOSTISSET('url') ?GETPOST('url', 'alpha') : $object->url).'"></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, '', 'maxwidth50onsmartphone');
+			print '</td>';
+			if ($conf->browser->layout == 'phone') print '</tr><tr>';
+			print '<td>'.$form->editfieldkey('Town', 'town', '', $object, 0).'</td><td>';
+			print $formcompany->select_ziptown($object->town, 'town', array('zipcode', 'selectcountry_id', 'state_id'));
+			print $form->widgetForTranslation("town", $object, $permissiontoadd, 'string', 'alphanohtml', 'maxwidth100 quatrevingtpercent');
+			print '</td></tr>';
 
-            if (!empty($conf->socialnetworks->enabled)) {
-                foreach ($socialnetworks as $key => $value) {
-                    if ($value['active']) {
-                        print '<tr>';
-                        print '<td><label for="'.$value['label'].'">'.$form->editfieldkey($value['label'], $key, '', $object, 0).'</label></td>';
-                        print '<td colspan="3">';
-                        print '<input type="text" name="'.$key.'" id="'.$key.'" class="minwidth100" maxlength="80" value="'.$object->socialnetworks[$key].'">';
-                        print '</td>';
-                        print '</tr>';
-                    } elseif (!empty($object->socialnetworks[$key])) {
-                        print '<input type="hidden" name="'.$key.'" value="'.$object->socialnetworks[$key].'">';
-                    }
-                }
-            }
+			// Country
+			print '<tr><td>'.$form->editfieldkey('Country', 'selectcounty_id', '', $object, 0).'</td><td colspan="3">';
+			print img_picto('', 'globe-americas', 'class="paddingrightonly"');
+			print $form->select_country((GETPOSTISSET('country_id') ? GETPOST('country_id') : $object->country_id), 'country_id', '', 0, 'minwidth300 widthcentpercentminusx');
+			if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+			print '</td></tr>';
 
-            // Prof ids
-            $i = 1; $j = 0; $NBCOLS = ($conf->browser->layout == 'phone' ? 1 : 2);
-            while ($i <= 6)
-            {
-                $idprof = $langs->transcountry('ProfId'.$i, $object->country_code);
-                if ($idprof != '-')
-                {
-	                $key = 'idprof'.$i;
+			// State
+			if (empty($conf->global->SOCIETE_DISABLE_STATE))
+			{
+				if (!empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT) && ($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 1 || $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 2))
+				{
+					print '<tr><td>'.$form->editfieldkey('Region-State', 'state_id', '', $object, 0).'</td><td colspan="3">';
+				} else {
+					print '<tr><td>'.$form->editfieldkey('State', 'state_id', '', $object, 0).'</td><td colspan="3">';
+				}
 
-	                if (($j % $NBCOLS) == 0) print '<tr>';
+				print $formcompany->select_state($object->state_id, $object->country_code);
+				print '</td></tr>';
+			}
 
-	                $idprof_mandatory = 'SOCIETE_IDPROF'.($i).'_MANDATORY';
-	                print '<td>'.$form->editfieldkey($idprof, $key, '', $object, 0, 'string', '', !(empty($conf->global->$idprof_mandatory) || !$object->isACompany())).'</td><td>';
-	                print $formcompany->get_input_id_prof($i, $key, $object->$key, $object->country_code);
-                    print '</td>';
-                    if (($j % $NBCOLS) == ($NBCOLS - 1)) print '</tr>';
-                    $j++;
-                }
-                $i++;
-            }
-            if ($NBCOLS > 0 && $j % 2 == 1) print '<td colspan="2"></td></tr>';
+			// Phone / Fax
+			print '<tr><td>'.$form->editfieldkey('Phone', 'phone', GETPOST('phone', 'alpha'), $object, 0).'</td>';
+			print '<td>'.img_picto('', 'object_phoning').' <input type="text" name="phone" id="phone" class="maxwidth200 widthcentpercentminusx" value="'.(GETPOSTISSET('phone') ?GETPOST('phone', 'alpha') : $object->phone).'"></td>';
+			if ($conf->browser->layout == 'phone') print '</tr><tr>';
+			print '<td>'.$form->editfieldkey('Fax', 'fax', GETPOST('fax', 'alpha'), $object, 0).'</td>';
+			print '<td>'.img_picto('', 'object_phoning_fax').' <input type="text" name="fax" id="fax" class="maxwidth200 widthcentpercentminusx" value="'.(GETPOSTISSET('fax') ?GETPOST('fax', 'alpha') : $object->fax).'"></td></tr>';
 
-            // VAT is used
-            print '<tr><td>'.$form->editfieldkey('VATIsUsed', 'assujtva_value', '', $object, 0).'</td><td colspan="3">';
-            print $form->selectyesno('assujtva_value', $object->tva_assuj, 1);
-            print '</td></tr>';
+			// EMail / Web
+			print '<tr><td>'.$form->editfieldkey('EMail', 'email', GETPOST('email', 'alpha'), $object, 0, 'string', '', (!empty($conf->global->SOCIETE_EMAIL_MANDATORY))).'</td>';
+			print '<td colspan="3">'.img_picto('', 'object_email').' <input type="text" name="email" id="email" class="maxwidth200onsmartphone widthcentpercentminusx" value="'.(GETPOSTISSET('email') ?GETPOST('email', 'alpha') : $object->email).'"></td></tr>';
+			print '<tr><td>'.$form->editfieldkey('Web', 'url', GETPOST('url', 'alpha'), $object, 0).'</td>';
+			print '<td colspan="3">'.img_picto('', 'globe').' <input type="text" name="url" id="url" class="maxwidth200onsmartphone widthcentpercentminusx " value="'.(GETPOSTISSET('url') ?GETPOST('url', 'alpha') : $object->url).'"></td></tr>';
 
-            // Local Taxes
-            //TODO: Place into a function to control showing by country or study better option
-            if ($mysoc->localtax1_assuj == "1" && $mysoc->localtax2_assuj == "1")
-            {
-                print '<tr><td>'.$form->editfieldkey($langs->transcountry("LocalTax1IsUsed", $mysoc->country_code), 'localtax1assuj_value', '', $object, 0).'</td><td>';
-                print $form->selectyesno('localtax1assuj_value', $object->localtax1_assuj, 1);
-                if (!isOnlyOneLocalTax(1))
-                {
-                    print '<span class="cblt1">     '.$langs->transcountry("Type", $mysoc->country_code).': ';
-                    $formcompany->select_localtax(1, $object->localtax1_value, "lt1");
-                    print '</span>';
-                }
-                print '</td>';
-                print '</tr><tr>';
-                print '<td>'.$form->editfieldkey($langs->transcountry("LocalTax2IsUsed", $mysoc->country_code), 'localtax2assuj_value', '', $object, 0).'</td><td>';
-                print $form->selectyesno('localtax2assuj_value', $object->localtax2_assuj, 1);
-                if (!isOnlyOneLocalTax(2))
-                {
-                    print '<span class="cblt2">     '.$langs->transcountry("Type", $mysoc->country_code).': ';
-                    $formcompany->select_localtax(2, $object->localtax2_value, "lt2");
-                    print '</span>';
-                }
-                print '</td></tr>';
-            } elseif ($mysoc->localtax1_assuj == "1" && $mysoc->localtax2_assuj != "1")
-            {
-                print '<tr><td>'.$form->editfieldkey($langs->transcountry("LocalTax1IsUsed", $mysoc->country_code), 'localtax1assuj_value', '', $object, 0).'</td><td colspan="3">';
-                print $form->selectyesno('localtax1assuj_value', $object->localtax1_assuj, 1);
-                if (!isOnlyOneLocalTax(1))
-                {
-                    print '<span class="cblt1">     '.$langs->transcountry("Type", $mysoc->country_code).': ';
-                    $formcompany->select_localtax(1, $object->localtax1_value, "lt1");
-                    print '</span>';
-                }
-                print '</td></tr>';
-            } elseif ($mysoc->localtax2_assuj == "1" && $mysoc->localtax1_assuj != "1")
-            {
-                print '<tr><td>'.$form->editfieldkey($langs->transcountry("LocalTax2IsUsed", $mysoc->country_code), 'localtax2assuj_value', '', $object, 0).'</td><td colspan="3">';
-                print $form->selectyesno('localtax2assuj_value', $object->localtax2_assuj, 1);
-                if (!isOnlyOneLocalTax(2))
-                {
-                    print '<span class="cblt2">     '.$langs->transcountry("Type", $mysoc->country_code).': ';
-                    $formcompany->select_localtax(2, $object->localtax2_value, "lt2");
-                    print '</span>';
-                }
-                print '</td></tr>';
-            }
+			if (!empty($conf->socialnetworks->enabled)) {
+				foreach ($socialnetworks as $key => $value) {
+					if ($value['active']) {
+						print '<tr>';
+						print '<td><label for="'.$value['label'].'">'.$form->editfieldkey($value['label'], $key, '', $object, 0).'</label></td>';
+						print '<td colspan="3">';
+						print '<input type="text" name="'.$key.'" id="'.$key.'" class="minwidth100" maxlength="80" value="'.$object->socialnetworks[$key].'">';
+						print '</td>';
+						print '</tr>';
+					} elseif (!empty($object->socialnetworks[$key])) {
+						print '<input type="hidden" name="'.$key.'" value="'.$object->socialnetworks[$key].'">';
+					}
+				}
+			}
 
-            // VAT Code
-            print '<tr><td>'.$form->editfieldkey('VATIntra', 'intra_vat', '', $object, 0).'</td>';
-            print '<td colspan="3">';
-            $s = '<input type="text" class="flat maxwidthonsmartphone" name="tva_intra" id="intra_vat" maxlength="20" value="'.$object->tva_intra.'">';
+			// Prof ids
+			$i = 1; $j = 0; $NBCOLS = ($conf->browser->layout == 'phone' ? 1 : 2);
+			while ($i <= 6)
+			{
+				$idprof = $langs->transcountry('ProfId'.$i, $object->country_code);
+				if ($idprof != '-')
+				{
+					$key = 'idprof'.$i;
 
-            if (empty($conf->global->MAIN_DISABLEVATCHECK) && isInEEC($object))
-            {
-                $s .= ' &nbsp; ';
+					if (($j % $NBCOLS) == 0) print '<tr>';
 
-                if ($conf->use_javascript_ajax)
-                {
-                	$widthpopup = 600;
-                	if (!empty($conf->dol_use_jmobile)) $widthpopup = 350;
-                	$heightpopup = 400;
-                	print "\n";
-                    print '<script language="JavaScript" type="text/javascript">';
-                    print "function CheckVAT(a) {\n";
-                    print "newpopup('".DOL_URL_ROOT."/societe/checkvat/checkVatPopup.php?vatNumber='+a,'".dol_escape_js($langs->trans("VATIntraCheckableOnEUSite"))."', ".$widthpopup.", ".$heightpopup.");\n";
-                    print "}\n";
-                    print '</script>';
-                    print "\n";
-                    $s .= '<a href="#" class="hideonsmartphone" onclick="javascript: CheckVAT(document.formsoc.tva_intra.value);">'.$langs->trans("VATIntraCheck").'</a>';
-                    $s = $form->textwithpicto($s, $langs->trans("VATIntraCheckDesc", $langs->transnoentitiesnoconv("VATIntraCheck")), 1);
-                } else {
-                    $s .= '<a href="'.$langs->transcountry("VATIntraCheckURL", $object->country_id).'" class="hideonsmartphone" target="_blank">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"), 'help').'</a>';
-                }
-            }
-            print $s;
-            print '</td>';
-            print '</tr>';
+					$idprof_mandatory = 'SOCIETE_IDPROF'.($i).'_MANDATORY';
+					print '<td>'.$form->editfieldkey($idprof, $key, '', $object, 0, 'string', '', !(empty($conf->global->$idprof_mandatory) || !$object->isACompany())).'</td><td>';
+					print $formcompany->get_input_id_prof($i, $key, $object->$key, $object->country_code);
+					print '</td>';
+					if (($j % $NBCOLS) == ($NBCOLS - 1)) print '</tr>';
+					$j++;
+				}
+				$i++;
+			}
+			if ($NBCOLS > 0 && $j % 2 == 1) print '<td colspan="2"></td></tr>';
 
-            // Type - Workforce/Staff
-            print '<tr><td>'.$form->editfieldkey('ThirdPartyType', 'typent_id', '', $object, 0).'</td><td class="maxwidthonsmartphone">';
-            print $form->selectarray("typent_id", $formcompany->typent_array(0), $object->typent_id, 0, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT));
-            if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
-            print '</td>';
-            if ($conf->browser->layout == 'phone') print '</tr><tr>';
-            print '<td>'.$form->editfieldkey('Workforce', 'effectif_id', '', $object, 0).'</td><td class="maxwidthonsmartphone">';
-            print $form->selectarray("effectif_id", $formcompany->effectif_array(0), $object->effectif_id);
-            if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
-            print '</td></tr>';
+			// VAT is used
+			print '<tr><td>'.$form->editfieldkey('VATIsUsed', 'assujtva_value', '', $object, 0).'</td><td colspan="3">';
+			print $form->selectyesno('assujtva_value', $object->tva_assuj, 1);
+			print '</td></tr>';
 
-            // Juridical type
-            print '<tr><td>'.$form->editfieldkey('JuridicalStatus', 'forme_juridique_code', '', $object, 0).'</td><td class="maxwidthonsmartphone" colspan="3">';
-            print $formcompany->select_juridicalstatus($object->forme_juridique_code, $object->country_code, '', 'forme_juridique_code');
-            print '</td></tr>';
+			// Local Taxes
+			//TODO: Place into a function to control showing by country or study better option
+			if ($mysoc->localtax1_assuj == "1" && $mysoc->localtax2_assuj == "1")
+			{
+				print '<tr><td>'.$form->editfieldkey($langs->transcountry("LocalTax1IsUsed", $mysoc->country_code), 'localtax1assuj_value', '', $object, 0).'</td><td>';
+				print $form->selectyesno('localtax1assuj_value', $object->localtax1_assuj, 1);
+				if (!isOnlyOneLocalTax(1))
+				{
+					print '<span class="cblt1">     '.$langs->transcountry("Type", $mysoc->country_code).': ';
+					$formcompany->select_localtax(1, $object->localtax1_value, "lt1");
+					print '</span>';
+				}
+				print '</td>';
+				print '</tr><tr>';
+				print '<td>'.$form->editfieldkey($langs->transcountry("LocalTax2IsUsed", $mysoc->country_code), 'localtax2assuj_value', '', $object, 0).'</td><td>';
+				print $form->selectyesno('localtax2assuj_value', $object->localtax2_assuj, 1);
+				if (!isOnlyOneLocalTax(2))
+				{
+					print '<span class="cblt2">     '.$langs->transcountry("Type", $mysoc->country_code).': ';
+					$formcompany->select_localtax(2, $object->localtax2_value, "lt2");
+					print '</span>';
+				}
+				print '</td></tr>';
+			} elseif ($mysoc->localtax1_assuj == "1" && $mysoc->localtax2_assuj != "1")
+			{
+				print '<tr><td>'.$form->editfieldkey($langs->transcountry("LocalTax1IsUsed", $mysoc->country_code), 'localtax1assuj_value', '', $object, 0).'</td><td colspan="3">';
+				print $form->selectyesno('localtax1assuj_value', $object->localtax1_assuj, 1);
+				if (!isOnlyOneLocalTax(1))
+				{
+					print '<span class="cblt1">     '.$langs->transcountry("Type", $mysoc->country_code).': ';
+					$formcompany->select_localtax(1, $object->localtax1_value, "lt1");
+					print '</span>';
+				}
+				print '</td></tr>';
+			} elseif ($mysoc->localtax2_assuj == "1" && $mysoc->localtax1_assuj != "1")
+			{
+				print '<tr><td>'.$form->editfieldkey($langs->transcountry("LocalTax2IsUsed", $mysoc->country_code), 'localtax2assuj_value', '', $object, 0).'</td><td colspan="3">';
+				print $form->selectyesno('localtax2assuj_value', $object->localtax2_assuj, 1);
+				if (!isOnlyOneLocalTax(2))
+				{
+					print '<span class="cblt2">     '.$langs->transcountry("Type", $mysoc->country_code).': ';
+					$formcompany->select_localtax(2, $object->localtax2_value, "lt2");
+					print '</span>';
+				}
+				print '</td></tr>';
+			}
 
-            // Capital
-            print '<tr><td>'.$form->editfieldkey('Capital', 'capital', '', $object, 0).'</td>';
-	        print '<td colspan="3"><input type="text" name="capital" id="capital" size="10" value="';
-	        print $object->capital != '' ? dol_escape_htmltag(price($object->capital)) : '';
-	        print '"> <font class="hideonsmartphone">'.$langs->trans("Currency".$conf->currency).'</font></td></tr>';
+			// VAT Code
+			print '<tr><td>'.$form->editfieldkey('VATIntra', 'intra_vat', '', $object, 0).'</td>';
+			print '<td colspan="3">';
+			$s = '<input type="text" class="flat maxwidthonsmartphone" name="tva_intra" id="intra_vat" maxlength="20" value="'.$object->tva_intra.'">';
 
-            // Default language
-            if (!empty($conf->global->MAIN_MULTILANGS))
-            {
-                print '<tr><td>'.$form->editfieldkey('DefaultLang', 'default_lang', '', $object, 0).'</td><td colspan="3">'."\n";
-                print $formadmin->select_language($object->default_lang, 'default_lang', 0, 0, 1);
-                print '</td>';
-                print '</tr>';
-            }
+			if (empty($conf->global->MAIN_DISABLEVATCHECK) && isInEEC($object))
+			{
+				$s .= ' &nbsp; ';
 
-            // Incoterms
-            if (!empty($conf->incoterm->enabled))
-            {
-            	print '<tr>';
-      				print '<td>'.$form->editfieldkey('IncotermLabel', 'incoterm_id', '', $object, 0).'</td>';
-            	print '<td colspan="3" class="maxwidthonsmartphone">';
-            	print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms) ? $object->location_incoterms : ''));
-            	print '</td></tr>';
-            }
+				if ($conf->use_javascript_ajax)
+				{
+					$widthpopup = 600;
+					if (!empty($conf->dol_use_jmobile)) $widthpopup = 350;
+					$heightpopup = 400;
+					print "\n";
+					print '<script language="JavaScript" type="text/javascript">';
+					print "function CheckVAT(a) {\n";
+					print "newpopup('".DOL_URL_ROOT."/societe/checkvat/checkVatPopup.php?vatNumber='+a,'".dol_escape_js($langs->trans("VATIntraCheckableOnEUSite"))."', ".$widthpopup.", ".$heightpopup.");\n";
+					print "}\n";
+					print '</script>';
+					print "\n";
+					$s .= '<a href="#" class="hideonsmartphone" onclick="javascript: CheckVAT(document.formsoc.tva_intra.value);">'.$langs->trans("VATIntraCheck").'</a>';
+					$s = $form->textwithpicto($s, $langs->trans("VATIntraCheckDesc", $langs->transnoentitiesnoconv("VATIntraCheck")), 1);
+				} else {
+					$s .= '<a href="'.$langs->transcountry("VATIntraCheckURL", $object->country_id).'" class="hideonsmartphone" target="_blank">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"), 'help').'</a>';
+				}
+			}
+			print $s;
+			print '</td>';
+			print '</tr>';
+
+			// Type - Workforce/Staff
+			print '<tr><td>'.$form->editfieldkey('ThirdPartyType', 'typent_id', '', $object, 0).'</td><td class="maxwidthonsmartphone">';
+			print $form->selectarray("typent_id", $formcompany->typent_array(0), $object->typent_id, 0, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT));
+			if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+			print '</td>';
+			if ($conf->browser->layout == 'phone') print '</tr><tr>';
+			print '<td>'.$form->editfieldkey('Workforce', 'effectif_id', '', $object, 0).'</td><td class="maxwidthonsmartphone">';
+			print $form->selectarray("effectif_id", $formcompany->effectif_array(0), $object->effectif_id);
+			if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+			print '</td></tr>';
+
+			// Juridical type
+			print '<tr><td>'.$form->editfieldkey('JuridicalStatus', 'forme_juridique_code', '', $object, 0).'</td><td class="maxwidthonsmartphone" colspan="3">';
+			print $formcompany->select_juridicalstatus($object->forme_juridique_code, $object->country_code, '', 'forme_juridique_code');
+			print '</td></tr>';
+
+			// Capital
+			print '<tr><td>'.$form->editfieldkey('Capital', 'capital', '', $object, 0).'</td>';
+			print '<td colspan="3"><input type="text" name="capital" id="capital" size="10" value="';
+			print $object->capital != '' ? dol_escape_htmltag(price($object->capital)) : '';
+			print '"> <font class="hideonsmartphone">'.$langs->trans("Currency".$conf->currency).'</font></td></tr>';
+
+			// Default language
+			if (!empty($conf->global->MAIN_MULTILANGS))
+			{
+				print '<tr><td>'.$form->editfieldkey('DefaultLang', 'default_lang', '', $object, 0).'</td><td colspan="3">'."\n";
+				print $formadmin->select_language($object->default_lang, 'default_lang', 0, 0, 1);
+				print '</td>';
+				print '</tr>';
+			}
+
+			// Incoterms
+			if (!empty($conf->incoterm->enabled))
+			{
+				print '<tr>';
+	  				print '<td>'.$form->editfieldkey('IncotermLabel', 'incoterm_id', '', $object, 0).'</td>';
+				print '<td colspan="3" class="maxwidthonsmartphone">';
+				print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms) ? $object->location_incoterms : ''));
+				print '</td></tr>';
+			}
 
 			// Categories
 			if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire))
@@ -2143,332 +2143,332 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 			$parameters = array('socid'=>$socid, 'colspan' => ' colspan="3"', 'colspanvalue' => '3');
 			include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_edit.tpl.php';
 
-            // Webservices url/key
-            if (!empty($conf->syncsupplierwebservices->enabled)) {
-                print '<tr><td>'.$form->editfieldkey('WebServiceURL', 'webservices_url', '', $object, 0).'</td>';
-                print '<td><input type="text" name="webservices_url" id="webservices_url" size="32" value="'.$object->webservices_url.'"></td>';
-                print '<td>'.$form->editfieldkey('WebServiceKey', 'webservices_key', '', $object, 0).'</td>';
-                print '<td><input type="text" name="webservices_key" id="webservices_key" size="32" value="'.$object->webservices_key.'"></td></tr>';
-            }
+			// Webservices url/key
+			if (!empty($conf->syncsupplierwebservices->enabled)) {
+				print '<tr><td>'.$form->editfieldkey('WebServiceURL', 'webservices_url', '', $object, 0).'</td>';
+				print '<td><input type="text" name="webservices_url" id="webservices_url" size="32" value="'.$object->webservices_url.'"></td>';
+				print '<td>'.$form->editfieldkey('WebServiceKey', 'webservices_key', '', $object, 0).'</td>';
+				print '<td><input type="text" name="webservices_key" id="webservices_key" size="32" value="'.$object->webservices_key.'"></td></tr>';
+			}
 
-            // Logo
-            print '<tr class="hideonsmartphone">';
-            print '<td>'.$form->editfieldkey('Logo', 'photoinput', '', $object, 0).'</td>';
-            print '<td colspan="3">';
-            if ($object->logo) print $form->showphoto('societe', $object);
-            $caneditfield = 1;
-            if ($caneditfield)
-            {
-                if ($object->logo) print "<br>\n";
-                print '<table class="nobordernopadding">';
-                if ($object->logo) print '<tr><td><input type="checkbox" class="flat photodelete" name="deletephoto" id="photodelete"> '.$langs->trans("Delete").'<br><br></td></tr>';
-                //print '<tr><td>'.$langs->trans("PhotoFile").'</td></tr>';
-                print '<tr><td><input type="file" class="flat" name="photo" id="photoinput"></td></tr>';
-                print '</table>';
-            }
-            print '</td>';
-            print '</tr>';
+			// Logo
+			print '<tr class="hideonsmartphone">';
+			print '<td>'.$form->editfieldkey('Logo', 'photoinput', '', $object, 0).'</td>';
+			print '<td colspan="3">';
+			if ($object->logo) print $form->showphoto('societe', $object);
+			$caneditfield = 1;
+			if ($caneditfield)
+			{
+				if ($object->logo) print "<br>\n";
+				print '<table class="nobordernopadding">';
+				if ($object->logo) print '<tr><td><input type="checkbox" class="flat photodelete" name="deletephoto" id="photodelete"> '.$langs->trans("Delete").'<br><br></td></tr>';
+				//print '<tr><td>'.$langs->trans("PhotoFile").'</td></tr>';
+				print '<tr><td><input type="file" class="flat" name="photo" id="photoinput"></td></tr>';
+				print '</table>';
+			}
+			print '</td>';
+			print '</tr>';
 
-            // Assign sale representative
-            print '<tr>';
-            print '<td>'.$form->editfieldkey('AllocateCommercial', 'commercial_id', '', $object, 0).'</td>';
-            print '<td colspan="3" class="maxwidthonsmartphone">';
-            $userlist = $form->select_dolusers('', '', 0, null, 0, '', '', 0, 0, 0, '', 0, '', '', 0, 1);
-            $arrayselected = GETPOST('commercial', 'array');
-            if (empty($arrayselected)) $arrayselected = $object->getSalesRepresentatives($user, 1);
-            print $form->multiselectarray('commercial', $userlist, $arrayselected, null, null, null, null, "90%");
-            print '</td></tr>';
+			// Assign sale representative
+			print '<tr>';
+			print '<td>'.$form->editfieldkey('AllocateCommercial', 'commercial_id', '', $object, 0).'</td>';
+			print '<td colspan="3" class="maxwidthonsmartphone">';
+			$userlist = $form->select_dolusers('', '', 0, null, 0, '', '', 0, 0, 0, '', 0, '', '', 0, 1);
+			$arrayselected = GETPOST('commercial', 'array');
+			if (empty($arrayselected)) $arrayselected = $object->getSalesRepresentatives($user, 1);
+			print $form->multiselectarray('commercial', $userlist, $arrayselected, null, null, null, null, "90%");
+			print '</td></tr>';
 
-            print '</table>';
-            print '</div>';
+			print '</table>';
+			print '</div>';
 
-	          dol_fiche_end();
+			  print dol_get_fiche_end();
 
-            print '<div class="center">';
-            print '<input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
-            print ' &nbsp; &nbsp; ';
-            print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
-            print '</div>';
+			print '<div class="center">';
+			print '<input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
+			print ' &nbsp; &nbsp; ';
+			print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+			print '</div>';
 
-            print '</form>';
-        }
-    } else {
-    	/*
+			print '</form>';
+		}
+	} else {
+		/*
          * View
          */
 
-        if (!empty($object->id)) $res = $object->fetch_optionals();
-        //if ($res < 0) { dol_print_error($db); exit; }
+		if (!empty($object->id)) $res = $object->fetch_optionals();
+		//if ($res < 0) { dol_print_error($db); exit; }
 
 
-        $head = societe_prepare_head($object);
+		$head = societe_prepare_head($object);
 
-        print dol_get_fiche_head($head, 'card', $langs->trans("ThirdParty"), -1, 'company');
+		print dol_get_fiche_head($head, 'card', $langs->trans("ThirdParty"), -1, 'company');
 
-        // Confirm delete third party
-        if ($action == 'delete' || ($conf->use_javascript_ajax && empty($conf->dol_use_jmobile)))
-        {
-            print $form->formconfirm($_SERVER["PHP_SELF"]."?socid=".$object->id, $langs->trans("DeleteACompany"), $langs->trans("ConfirmDeleteCompany"), "confirm_delete", '', 0, "action-delete");
-        }
+		// Confirm delete third party
+		if ($action == 'delete' || ($conf->use_javascript_ajax && empty($conf->dol_use_jmobile)))
+		{
+			print $form->formconfirm($_SERVER["PHP_SELF"]."?socid=".$object->id, $langs->trans("DeleteACompany"), $langs->trans("ConfirmDeleteCompany"), "confirm_delete", '', 0, "action-delete");
+		}
 
-	    if ($action == 'merge')
-	    {
-		    $formquestion = array(
-			    array(
-				    'name' => 'soc_origin',
-			    	'label' => $langs->trans('MergeOriginThirdparty'),
-				    'type' => 'other',
-				    'value' => $form->select_company('', 'soc_origin', 's.rowid <> '.$object->id, 'SelectThirdParty', 0, 0, array(), 0, 'minwidth200')
-			    )
-		    );
+		if ($action == 'merge')
+		{
+			$formquestion = array(
+				array(
+					'name' => 'soc_origin',
+					'label' => $langs->trans('MergeOriginThirdparty'),
+					'type' => 'other',
+					'value' => $form->select_company('', 'soc_origin', 's.rowid <> '.$object->id, 'SelectThirdParty', 0, 0, array(), 0, 'minwidth200')
+				)
+			);
 
-		    print $form->formconfirm($_SERVER["PHP_SELF"]."?socid=".$object->id, $langs->trans("MergeThirdparties"), $langs->trans("ConfirmMergeThirdparties"), "confirm_merge", $formquestion, 'no', 1, 250);
-	    }
+			print $form->formconfirm($_SERVER["PHP_SELF"]."?socid=".$object->id, $langs->trans("MergeThirdparties"), $langs->trans("ConfirmMergeThirdparties"), "confirm_merge", $formquestion, 'no', 1, 250);
+		}
 
-        dol_htmloutput_mesg(is_numeric($error) ? '' : $error, $errors, 'error');
+		dol_htmloutput_mesg(is_numeric($error) ? '' : $error, $errors, 'error');
 
-        $linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+		$linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-        dol_banner_tab($object, 'socid', $linkback, ($user->socid ? 0 : 1), 'rowid', 'nom');
+		dol_banner_tab($object, 'socid', $linkback, ($user->socid ? 0 : 1), 'rowid', 'nom');
 
 
-        print '<div class="fichecenter">';
-        print '<div class="fichehalfleft">';
+		print '<div class="fichecenter">';
+		print '<div class="fichehalfleft">';
 
-        print '<div class="underbanner clearboth"></div>';
-        print '<table class="border tableforfield" width="100%">';
+		print '<div class="underbanner clearboth"></div>';
+		print '<table class="border tableforfield" width="100%">';
 
-    	// Prospect/Customer
-    	print '<tr><td class="titlefield">'.$langs->trans('ProspectCustomer').'</td><td>';
-    	print $object->getLibCustProspStatut();
-    	print '</td></tr>';
+		// Prospect/Customer
+		print '<tr><td class="titlefield">'.$langs->trans('ProspectCustomer').'</td><td>';
+		print $object->getLibCustProspStatut();
+		print '</td></tr>';
 
-    	// Supplier
+		// Supplier
    		if (!empty($conf->fournisseur->enabled) || !empty($conf->supplier_proposal->enabled))
-    	{
-    		print '<tr><td>'.$langs->trans('Supplier').'</td><td>';
-    		print yn($object->fournisseur);
-    		print '</td></tr>';
-    	}
+		{
+			print '<tr><td>'.$langs->trans('Supplier').'</td><td>';
+			print yn($object->fournisseur);
+			print '</td></tr>';
+		}
 
-    	// Prefix
-        if (!empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
-        {
-            print '<tr><td>'.$langs->trans('Prefix').'</td><td>'.$object->prefix_comm.'</td>';
-            print '</tr>';
-        }
-
-        // Customer code
-        if ($object->client)
-        {
-            print '<tr><td>';
-            print $langs->trans('CustomerCode').'</td><td>';
-            print $object->code_client;
-            if ($object->check_codeclient() <> 0) print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
-            print '</td>';
-            print '</tr>';
-        }
-
-        // Supplier code
-        if (!empty($conf->fournisseur->enabled) && $object->fournisseur && !empty($user->rights->fournisseur->lire))
-        {
-            print '<tr><td>';
-            print $langs->trans('SupplierCode').'</td><td>';
-            print $object->code_fournisseur;
-            if ($object->check_codefournisseur() <> 0) print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
-            print '</td>';
-            print '</tr>';
-        }
-
-        // Barcode
-        if (!empty($conf->barcode->enabled))
-        {
-            print '<tr><td>';
-            print $langs->trans('Gencod').'</td><td>'.dol_escape_htmltag($object->barcode);
-            print '</td>';
-            print '</tr>';
-        }
-
-        // Prof ids
-        $i = 1; $j = 0;
-        while ($i <= 6)
-        {
-            $idprof = $langs->transcountry('ProfId'.$i, $object->country_code);
-            if ($idprof != '-')
-            {
-                //if (($j % 2) == 0) print '<tr>';
-                print '<tr>';
-            	print '<td>'.$idprof.'</td><td>';
-                $key = 'idprof'.$i;
-                print $object->$key;
-                if ($object->$key)
-                {
-                    if ($object->id_prof_check($i, $object) > 0) print ' &nbsp; '.$object->id_prof_url($i, $object);
-                    else print ' <font class="error">('.$langs->trans("ErrorWrongValue").')</font>';
-                }
-                print '</td>';
-                //if (($j % 2) == 1) print '</tr>';
-                print '</tr>';
-                $j++;
-            }
-            $i++;
-        }
-        //if ($j % 2 == 1)  print '<td colspan="2"></td></tr>';
-
-
-        // This fields are used to know VAT to include in an invoice when the thirdparty is making a sale, so when it is a supplier.
-        // We don't need them into customer profile.
-        // Except for spain and localtax where localtax depends on buyer and not seller
-
-        if ($object->fournisseur)
-        {
-	        // VAT is used
-	        print '<tr><td>';
-	        print $form->textwithpicto($langs->trans('VATIsUsed'), $langs->trans('VATIsUsedWhenSelling'));
-	        print '</td><td>';
-	        print yn($object->tva_assuj);
-	        print '</td>';
+		// Prefix
+		if (!empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
+		{
+			print '<tr><td>'.$langs->trans('Prefix').'</td><td>'.$object->prefix_comm.'</td>';
 			print '</tr>';
-        }
+		}
+
+		// Customer code
+		if ($object->client)
+		{
+			print '<tr><td>';
+			print $langs->trans('CustomerCode').'</td><td>';
+			print $object->code_client;
+			if ($object->check_codeclient() <> 0) print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
+			print '</td>';
+			print '</tr>';
+		}
+
+		// Supplier code
+		if (!empty($conf->fournisseur->enabled) && $object->fournisseur && !empty($user->rights->fournisseur->lire))
+		{
+			print '<tr><td>';
+			print $langs->trans('SupplierCode').'</td><td>';
+			print $object->code_fournisseur;
+			if ($object->check_codefournisseur() <> 0) print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
+			print '</td>';
+			print '</tr>';
+		}
+
+		// Barcode
+		if (!empty($conf->barcode->enabled))
+		{
+			print '<tr><td>';
+			print $langs->trans('Gencod').'</td><td>'.dol_escape_htmltag($object->barcode);
+			print '</td>';
+			print '</tr>';
+		}
+
+		// Prof ids
+		$i = 1; $j = 0;
+		while ($i <= 6)
+		{
+			$idprof = $langs->transcountry('ProfId'.$i, $object->country_code);
+			if ($idprof != '-')
+			{
+				//if (($j % 2) == 0) print '<tr>';
+				print '<tr>';
+				print '<td>'.$idprof.'</td><td>';
+				$key = 'idprof'.$i;
+				print $object->$key;
+				if ($object->$key)
+				{
+					if ($object->id_prof_check($i, $object) > 0) print ' &nbsp; '.$object->id_prof_url($i, $object);
+					else print ' <font class="error">('.$langs->trans("ErrorWrongValue").')</font>';
+				}
+				print '</td>';
+				//if (($j % 2) == 1) print '</tr>';
+				print '</tr>';
+				$j++;
+			}
+			$i++;
+		}
+		//if ($j % 2 == 1)  print '<td colspan="2"></td></tr>';
+
+
+		// This fields are used to know VAT to include in an invoice when the thirdparty is making a sale, so when it is a supplier.
+		// We don't need them into customer profile.
+		// Except for spain and localtax where localtax depends on buyer and not seller
+
+		if ($object->fournisseur)
+		{
+			// VAT is used
+			print '<tr><td>';
+			print $form->textwithpicto($langs->trans('VATIsUsed'), $langs->trans('VATIsUsedWhenSelling'));
+			print '</td><td>';
+			print yn($object->tva_assuj);
+			print '</td>';
+			print '</tr>';
+		}
 
 		// Local Taxes
-        if ($object->fournisseur || $mysoc->country_code == 'ES')
-        {
-        	if ($mysoc->localtax1_assuj == "1" && $mysoc->localtax2_assuj == "1")
+		if ($object->fournisseur || $mysoc->country_code == 'ES')
+		{
+			if ($mysoc->localtax1_assuj == "1" && $mysoc->localtax2_assuj == "1")
 			{
-			    print '<tr><td>'.$langs->transcountry("LocalTax1IsUsed", $mysoc->country_code).'</td><td>';
-			    print yn($object->localtax1_assuj);
-			    print '</td></tr><tr><td>'.$langs->transcountry("LocalTax2IsUsed", $mysoc->country_code).'</td><td>';
-			    print yn($object->localtax2_assuj);
-			    print '</td></tr>';
+				print '<tr><td>'.$langs->transcountry("LocalTax1IsUsed", $mysoc->country_code).'</td><td>';
+				print yn($object->localtax1_assuj);
+				print '</td></tr><tr><td>'.$langs->transcountry("LocalTax2IsUsed", $mysoc->country_code).'</td><td>';
+				print yn($object->localtax2_assuj);
+				print '</td></tr>';
 
-			    if ($object->localtax1_assuj == "1" && (!isOnlyOneLocalTax(1)))
-			    {
-			        print '<form method="post" action="'.$_SERVER['PHP_SELF'].'?socid='.$object->id.'">';
-			        print '<input type="hidden" name="action" value="set_localtax1">';
-			        print '<input type="hidden" name="token" value="'.newToken().'">';
-			        print '<tr><td>'.$langs->transcountry("Localtax1", $mysoc->country_code).' <a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editRE&amp;socid='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('Edit'), 1).'</td>';
-			        if ($action == 'editRE')
-			        {
-			            print '<td class="left">';
-			            $formcompany->select_localtax(1, $object->localtax1_value, "lt1");
-			            print '<input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
-			        } else {
-			            print '<td>'.$object->localtax1_value.'</td>';
-			        }
-			        print '</tr></form>';
-			    }
-			    if ($object->localtax2_assuj == "1" && (!isOnlyOneLocalTax(2)))
-			    {
-			        print '<form method="post" action="'.$_SERVER['PHP_SELF'].'?socid='.$object->id.'">';
-			        print '<input type="hidden" name="action" value="set_localtax2">';
-			        print '<input type="hidden" name="token" value="'.newToken().'">';
-			        print '<tr><td>'.$langs->transcountry("Localtax2", $mysoc->country_code).'<a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editIRPF&amp;socid='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('Edit'), 1).'</td>';
-			        if ($action == 'editIRPF') {
-			            print '<td class="left">';
-			            $formcompany->select_localtax(2, $object->localtax2_value, "lt2");
-			            print '<input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
-			        } else {
-			            print '<td>'.$object->localtax2_value.'</td>';
-			        }
-			        print '</tr></form>';
-			    }
+				if ($object->localtax1_assuj == "1" && (!isOnlyOneLocalTax(1)))
+				{
+					print '<form method="post" action="'.$_SERVER['PHP_SELF'].'?socid='.$object->id.'">';
+					print '<input type="hidden" name="action" value="set_localtax1">';
+					print '<input type="hidden" name="token" value="'.newToken().'">';
+					print '<tr><td>'.$langs->transcountry("Localtax1", $mysoc->country_code).' <a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editRE&amp;socid='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('Edit'), 1).'</td>';
+					if ($action == 'editRE')
+					{
+						print '<td class="left">';
+						$formcompany->select_localtax(1, $object->localtax1_value, "lt1");
+						print '<input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
+					} else {
+						print '<td>'.$object->localtax1_value.'</td>';
+					}
+					print '</tr></form>';
+				}
+				if ($object->localtax2_assuj == "1" && (!isOnlyOneLocalTax(2)))
+				{
+					print '<form method="post" action="'.$_SERVER['PHP_SELF'].'?socid='.$object->id.'">';
+					print '<input type="hidden" name="action" value="set_localtax2">';
+					print '<input type="hidden" name="token" value="'.newToken().'">';
+					print '<tr><td>'.$langs->transcountry("Localtax2", $mysoc->country_code).'<a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editIRPF&amp;socid='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('Edit'), 1).'</td>';
+					if ($action == 'editIRPF') {
+						print '<td class="left">';
+						$formcompany->select_localtax(2, $object->localtax2_value, "lt2");
+						print '<input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
+					} else {
+						print '<td>'.$object->localtax2_value.'</td>';
+					}
+					print '</tr></form>';
+				}
 			} elseif ($mysoc->localtax1_assuj == "1" && $mysoc->localtax2_assuj != "1")
 			{
-			    print '<tr><td>'.$langs->transcountry("LocalTax1IsUsed", $mysoc->country_code).'</td><td>';
-			    print yn($object->localtax1_assuj);
-			    print '</td></tr>';
-			    if ($object->localtax1_assuj == "1" && (!isOnlyOneLocalTax(1)))
-			    {
-			        print '<form method="post" action="'.$_SERVER['PHP_SELF'].'?socid='.$object->id.'">';
-			        print '<input type="hidden" name="action" value="set_localtax1">';
-			        print '<input type="hidden" name="token" value="'.newToken().'">';
-			        print '<tr><td> '.$langs->transcountry("Localtax1", $mysoc->country_code).'<a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editRE&amp;socid='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('Edit'), 1).'</td>';
-			        if ($action == 'editRE') {
-			            print '<td class="left">';
-			            $formcompany->select_localtax(1, $object->localtax1_value, "lt1");
-			            print '<input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
-			        } else {
-			            print '<td>'.$object->localtax1_value.'</td>';
-			        }
-			        print '</tr></form>';
-			    }
+				print '<tr><td>'.$langs->transcountry("LocalTax1IsUsed", $mysoc->country_code).'</td><td>';
+				print yn($object->localtax1_assuj);
+				print '</td></tr>';
+				if ($object->localtax1_assuj == "1" && (!isOnlyOneLocalTax(1)))
+				{
+					print '<form method="post" action="'.$_SERVER['PHP_SELF'].'?socid='.$object->id.'">';
+					print '<input type="hidden" name="action" value="set_localtax1">';
+					print '<input type="hidden" name="token" value="'.newToken().'">';
+					print '<tr><td> '.$langs->transcountry("Localtax1", $mysoc->country_code).'<a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editRE&amp;socid='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('Edit'), 1).'</td>';
+					if ($action == 'editRE') {
+						print '<td class="left">';
+						$formcompany->select_localtax(1, $object->localtax1_value, "lt1");
+						print '<input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
+					} else {
+						print '<td>'.$object->localtax1_value.'</td>';
+					}
+					print '</tr></form>';
+				}
 			} elseif ($mysoc->localtax2_assuj == "1" && $mysoc->localtax1_assuj != "1")
 			{
-			    print '<tr><td>'.$langs->transcountry("LocalTax2IsUsed", $mysoc->country_code).'</td><td>';
-			    print yn($object->localtax2_assuj);
-			    print '</td></tr>';
-			    if ($object->localtax2_assuj == "1" && (!isOnlyOneLocalTax(2)))
-			    {
-			        print '<form method="post" action="'.$_SERVER['PHP_SELF'].'?socid='.$object->id.'">';
-			        print '<input type="hidden" name="action" value="set_localtax2">';
-			        print '<input type="hidden" name="token" value="'.newToken().'">';
-			        print '<tr><td> '.$langs->transcountry("Localtax2", $mysoc->country_code).' <a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editIRPF&amp;socid='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('Edit'), 1).'</td>';
-			        if ($action == 'editIRPF') {
-			            print '<td class="left">';
-			            $formcompany->select_localtax(2, $object->localtax2_value, "lt2");
-			            print '<input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
-			        } else {
-			            print '<td>'.$object->localtax2_value.'</td>';
-			        }
-			        print '</tr></form>';
-			    }
+				print '<tr><td>'.$langs->transcountry("LocalTax2IsUsed", $mysoc->country_code).'</td><td>';
+				print yn($object->localtax2_assuj);
+				print '</td></tr>';
+				if ($object->localtax2_assuj == "1" && (!isOnlyOneLocalTax(2)))
+				{
+					print '<form method="post" action="'.$_SERVER['PHP_SELF'].'?socid='.$object->id.'">';
+					print '<input type="hidden" name="action" value="set_localtax2">';
+					print '<input type="hidden" name="token" value="'.newToken().'">';
+					print '<tr><td> '.$langs->transcountry("Localtax2", $mysoc->country_code).' <a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editIRPF&amp;socid='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('Edit'), 1).'</td>';
+					if ($action == 'editIRPF') {
+						print '<td class="left">';
+						$formcompany->select_localtax(2, $object->localtax2_value, "lt2");
+						print '<input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
+					} else {
+						print '<td>'.$object->localtax2_value.'</td>';
+					}
+					print '</tr></form>';
+				}
 			}
-        }
+		}
 
-        // Sale tax code (VAT code)
-        print '<tr>';
+		// Sale tax code (VAT code)
+		print '<tr>';
 		print '<td class="nowrap">'.$langs->trans('VATIntra').'</td><td>';
-        if ($object->tva_intra)
-        {
-            $s = '';
-            $s .= dol_escape_htmltag($object->tva_intra);
-            $s .= '<input type="hidden" id="tva_intra" name="tva_intra" maxlength="20" value="'.$object->tva_intra.'">';
+		if ($object->tva_intra)
+		{
+			$s = '';
+			$s .= dol_escape_htmltag($object->tva_intra);
+			$s .= '<input type="hidden" id="tva_intra" name="tva_intra" maxlength="20" value="'.$object->tva_intra.'">';
 
-            if (empty($conf->global->MAIN_DISABLEVATCHECK) && isInEEC($object))
-            {
-                $s .= ' &nbsp; ';
+			if (empty($conf->global->MAIN_DISABLEVATCHECK) && isInEEC($object))
+			{
+				$s .= ' &nbsp; ';
 
-                if ($conf->use_javascript_ajax)
-                {
-                	$widthpopup = 600;
-                	if (!empty($conf->dol_use_jmobile)) $widthpopup = 350;
-                	$heightpopup = 400;
-                    print "\n";
-                    print '<script language="JavaScript" type="text/javascript">';
-                    print "function CheckVAT(a) {\n";
-                    print "newpopup('".DOL_URL_ROOT."/societe/checkvat/checkVatPopup.php?vatNumber='+a, '".dol_escape_js($langs->trans("VATIntraCheckableOnEUSite"))."', ".$widthpopup.", ".$heightpopup.");\n";
-                    print "}\n";
-                    print '</script>';
-                    print "\n";
-                    $s .= '<a href="#" class="hideonsmartphone" onclick="javascript: CheckVAT( $(\'#tva_intra\').val() );">'.$langs->trans("VATIntraCheck").'</a>';
-                    $s = $form->textwithpicto($s, $langs->trans("VATIntraCheckDesc", $langs->transnoentitiesnoconv("VATIntraCheck")), 1);
-                } else {
-                    $s .= '<a href="'.$langs->transcountry("VATIntraCheckURL", $object->country_id).'" class="hideonsmartphone" target="_blank">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"), 'help').'</a>';
-                }
-            }
-            print $s;
-        } else {
-            print '&nbsp;';
-        }
-        print '</td>';
-        print '</tr>';
+				if ($conf->use_javascript_ajax)
+				{
+					$widthpopup = 600;
+					if (!empty($conf->dol_use_jmobile)) $widthpopup = 350;
+					$heightpopup = 400;
+					print "\n";
+					print '<script language="JavaScript" type="text/javascript">';
+					print "function CheckVAT(a) {\n";
+					print "newpopup('".DOL_URL_ROOT."/societe/checkvat/checkVatPopup.php?vatNumber='+a, '".dol_escape_js($langs->trans("VATIntraCheckableOnEUSite"))."', ".$widthpopup.", ".$heightpopup.");\n";
+					print "}\n";
+					print '</script>';
+					print "\n";
+					$s .= '<a href="#" class="hideonsmartphone" onclick="javascript: CheckVAT( $(\'#tva_intra\').val() );">'.$langs->trans("VATIntraCheck").'</a>';
+					$s = $form->textwithpicto($s, $langs->trans("VATIntraCheckDesc", $langs->transnoentitiesnoconv("VATIntraCheck")), 1);
+				} else {
+					$s .= '<a href="'.$langs->transcountry("VATIntraCheckURL", $object->country_id).'" class="hideonsmartphone" target="_blank">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"), 'help').'</a>';
+				}
+			}
+			print $s;
+		} else {
+			print '&nbsp;';
+		}
+		print '</td>';
+		print '</tr>';
 
-        // Type + Workforce/Staff
-        $arr = $formcompany->typent_array(1);
-        $object->typent = $arr[$object->typent_code];
-        print '<tr><td>'.$langs->trans("ThirdPartyType").'</td><td>'.$object->typent.'</td>';
-        print '<tr><td>'.$langs->trans("Workforce").'</td><td>'.$object->effectif.'</td></tr>';
+		// Type + Workforce/Staff
+		$arr = $formcompany->typent_array(1);
+		$object->typent = $arr[$object->typent_code];
+		print '<tr><td>'.$langs->trans("ThirdPartyType").'</td><td>'.$object->typent.'</td>';
+		print '<tr><td>'.$langs->trans("Workforce").'</td><td>'.$object->effectif.'</td></tr>';
 
-        print '</table>';
+		print '</table>';
 
-        print '</div>';
-        print '<div class="fichehalfright"><div class="ficheaddleft">';
+		print '</div>';
+		print '<div class="fichehalfright"><div class="ficheaddleft">';
 
-        print '<div class="underbanner clearboth"></div>';
-        print '<table class="border tableforfield" width="100%">';
+		print '<div class="underbanner clearboth"></div>';
+		print '<table class="border tableforfield" width="100%">';
 
-    	// Tags / categories
+		// Tags / categories
 		if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire))
 		{
 			// Customer
@@ -2599,7 +2599,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		print '</div></div>';
 		print '<div style="clear:both"></div>';
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 
 		/*
diff --git a/htdocs/societe/checkvat/checkVatPopup.php b/htdocs/societe/checkvat/checkVatPopup.php
index 725cab96065..4b3cb68e3bb 100644
--- a/htdocs/societe/checkvat/checkVatPopup.php
+++ b/htdocs/societe/checkvat/checkVatPopup.php
@@ -65,10 +65,10 @@ if (!$vatNumber)
 
 	// Set the WebService URL
 	dol_syslog("Create nusoap_client for URL=".$WS_DOL_URL." WSDL=".$WS_DOL_URL_WSDL);
-    require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-    $params = getSoapParams();
-    //ini_set('default_socket_timeout', $params['response_timeout']);
-    //$soapclient = new SoapClient($WS_DOL_URL_WSDL,$params);
+	require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+	$params = getSoapParams();
+	//ini_set('default_socket_timeout', $params['response_timeout']);
+	//$soapclient = new SoapClient($WS_DOL_URL_WSDL,$params);
 	$soapclient = new nusoap_client($WS_DOL_URL_WSDL, true, $params['proxy_host'], $params['proxy_port'], $params['proxy_login'], $params['proxy_password'], $params['connection_timeout'], $params['response_timeout']);
 	$soapclient->soap_defencoding = 'utf-8';
 	$soapclient->xml_encoding = 'utf-8';
diff --git a/htdocs/societe/class/api_contacts.class.php b/htdocs/societe/class/api_contacts.class.php
index d5280ee80dd..bc456dd7185 100644
--- a/htdocs/societe/class/api_contacts.class.php
+++ b/htdocs/societe/class/api_contacts.class.php
@@ -46,7 +46,7 @@ class Contacts extends DolibarrApi
 	/**
 	 * Constructor
 	 */
-    public function __construct()
+	public function __construct()
 	{
 		global $db, $conf;
 		$this->db = $db;
@@ -68,7 +68,7 @@ class Contacts extends DolibarrApi
 	 *
 	 * @throws 	RestException
 	 */
-    public function get($id, $includecount = 0)
+	public function get($id, $includecount = 0)
 	{
 		if (!DolibarrApiAccess::$user->rights->societe->contact->lire)
 		{
@@ -92,7 +92,7 @@ class Contacts extends DolibarrApi
 
 		if ($includecount)
 		{
-		    $this->contact->load_ref_elements();
+			$this->contact->load_ref_elements();
 		}
 
 		return $this->_cleanObjectDatas($this->contact);
@@ -110,7 +110,7 @@ class Contacts extends DolibarrApi
 	 * @throws RestException 401     Insufficient rights
 	 * @throws RestException 404     User or group not found
 	 */
-    public function getByEmail($email, $includecount = 0)
+	public function getByEmail($email, $includecount = 0)
 	{
 		if (!DolibarrApiAccess::$user->rights->societe->contact->lire)
 		{
@@ -134,7 +134,7 @@ class Contacts extends DolibarrApi
 
 		if ($includecount)
 		{
-		    $this->contact->load_ref_elements();
+			$this->contact->load_ref_elements();
 		}
 
 		return $this->_cleanObjectDatas($this->contact);
@@ -154,21 +154,21 @@ class Contacts extends DolibarrApi
 	 * @param string    $sqlfilters         Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"
 	 * @param int       $includecount       Count and return also number of elements the contact is used as a link for
 	 * @return array                        Array of contact objects
-     *
+	 *
 	 * @throws RestException
-     */
-    public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $thirdparty_ids = '', $category = 0, $sqlfilters = '', $includecount = 0)
-    {
+	 */
+	public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $thirdparty_ids = '', $category = 0, $sqlfilters = '', $includecount = 0)
+	{
 		global $db, $conf;
 
 		$obj_ret = array();
 
 		if (!DolibarrApiAccess::$user->rights->societe->contact->lire)
 		{
-		    throw new RestException(401, 'No permission to read contacts');
+			throw new RestException(401, 'No permission to read contacts');
 		}
 
-        // case of external user, $thirdparty_ids param is ignored and replaced by user's socid
+		// case of external user, $thirdparty_ids param is ignored and replaced by user's socid
 		$socids = DolibarrApiAccess::$user->socid ? DolibarrApiAccess::$user->socid : $thirdparty_ids;
 
 		// If the internal user must only see his customers, force searching by him
@@ -178,9 +178,9 @@ class Contacts extends DolibarrApi
 
 		$sql = "SELECT t.rowid";
 		$sql .= " FROM ".MAIN_DB_PREFIX."socpeople as t";
-    	if ($category > 0) {
+		if ($category > 0) {
 			$sql .= ", ".MAIN_DB_PREFIX."categorie_contact as c";
-    	}
+		}
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople_extrafields as te ON te.fk_object = t.rowid";
 		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) {
 			// We need this table joined to the select in order to filter by sale
@@ -200,24 +200,24 @@ class Contacts extends DolibarrApi
 			$sql .= " AND sc.fk_user = ".$search_sale;
 		}
 
-    	// Select contacts of given category
-    	if ($category > 0) {
+		// Select contacts of given category
+		if ($category > 0) {
 			$sql .= " AND c.fk_categorie = ".$this->db->escape($category);
 			$sql .= " AND c.fk_socpeople = t.rowid ";
-    	}
+		}
 
-	    // Add sql filters
-        if ($sqlfilters)
-        {
-            if (!DolibarrApi::_checkFilters($sqlfilters))
-            {
-                throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
-            }
-	        $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-        }
+		// Add sql filters
+		if ($sqlfilters)
+		{
+			if (!DolibarrApi::_checkFilters($sqlfilters))
+			{
+				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+			}
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
 
-        $sql .= $this->db->order($sortfield, $sortorder);
+		$sql .= $this->db->order($sortfield, $sortorder);
 
 		if ($limit)
 		{
@@ -234,17 +234,17 @@ class Contacts extends DolibarrApi
 		{
 			$num = $this->db->num_rows($result);
 			$min = min($num, ($limit <= 0 ? $num : $limit));
-            $i = 0;
+			$i = 0;
 			while ($i < $min)
 			{
 				$obj = $this->db->fetch_object($result);
 				$contact_static = new Contact($this->db);
 				if ($contact_static->fetch($obj->rowid))
 				{
-		            if ($includecount)
-		            {
-		                $contact_static->load_ref_elements();
-		            }
+					if ($includecount)
+					{
+						$contact_static->load_ref_elements();
+					}
 					$obj_ret[] = $this->_cleanObjectDatas($contact_static);
 				}
 
@@ -266,8 +266,8 @@ class Contacts extends DolibarrApi
 	 * @param   array   $request_data   Request datas
 	 * @return  int     ID of contact
 	 */
-    public function post($request_data = null)
-    {
+	public function post($request_data = null)
+	{
 		if (!DolibarrApiAccess::$user->rights->societe->contact->creer)
 		{
 			throw new RestException(401, 'No permission to create/update contacts');
@@ -280,7 +280,7 @@ class Contacts extends DolibarrApi
 			$this->contact->$field = $value;
 		}
 		if ($this->contact->create(DolibarrApiAccess::$user) < 0) {
-		    throw new RestException(500, "Error creating contact", array_merge(array($this->contact->error), $this->contact->errors));
+			throw new RestException(500, "Error creating contact", array_merge(array($this->contact->error), $this->contact->errors));
 		}
 		return $this->contact->id;
 	}
@@ -292,8 +292,8 @@ class Contacts extends DolibarrApi
 	 * @param array $request_data   Datas
 	 * @return int
 	 */
-    public function put($id, $request_data = null)
-    {
+	public function put($id, $request_data = null)
+	{
 		if (!DolibarrApiAccess::$user->rights->societe->contact->creer)
 		{
 			throw new RestException(401, 'No permission to create/update contacts');
@@ -312,8 +312,8 @@ class Contacts extends DolibarrApi
 
 		foreach ($request_data as $field => $value)
 		{
-            if ($field == 'id') continue;
-		    $this->contact->$field = $value;
+			if ($field == 'id') continue;
+			$this->contact->$field = $value;
 		}
 
 		if ($this->contact->update($id, DolibarrApiAccess::$user, 1, '', '', 'update'))
@@ -328,8 +328,8 @@ class Contacts extends DolibarrApi
 	 * @param   int     $id Contact ID
 	 * @return  integer
 	 */
-    public function delete($id)
-    {
+	public function delete($id)
+	{
 		if (!DolibarrApiAccess::$user->rights->societe->contact->supprimer)
 		{
 			throw new RestException(401, 'No permission to delete contacts');
@@ -344,7 +344,7 @@ class Contacts extends DolibarrApi
 		{
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
-        $this->contact->oldcopy = clone $this->contact;
+		$this->contact->oldcopy = clone $this->contact;
 		return $this->contact->delete();
 	}
 
@@ -357,62 +357,62 @@ class Contacts extends DolibarrApi
 	 *
 	 * @url	POST {id}/createUser
 	 */
-    public function createUser($id, $request_data = null)
-    {
-	    //if (!DolibarrApiAccess::$user->rights->user->user->creer) {
-	    //throw new RestException(401);
-	    //}
+	public function createUser($id, $request_data = null)
+	{
+		//if (!DolibarrApiAccess::$user->rights->user->user->creer) {
+		//throw new RestException(401);
+		//}
 
-	    if (!isset($request_data["login"]))
-    		throw new RestException(400, "login field missing");
-	    if (!isset($request_data["password"]))
-	    	throw new RestException(400, "password field missing");
+		if (!isset($request_data["login"]))
+			throw new RestException(400, "login field missing");
+		if (!isset($request_data["password"]))
+			throw new RestException(400, "password field missing");
 
-	    if (!DolibarrApiAccess::$user->rights->societe->contact->lire) {
-	        throw new RestException(401, 'No permission to read contacts');
-	    }
-	    if (!DolibarrApiAccess::$user->rights->user->user->creer) {
-	        throw new RestException(401, 'No permission to create user');
-	    }
+		if (!DolibarrApiAccess::$user->rights->societe->contact->lire) {
+			throw new RestException(401, 'No permission to read contacts');
+		}
+		if (!DolibarrApiAccess::$user->rights->user->user->creer) {
+			throw new RestException(401, 'No permission to create user');
+		}
 
-	    $contact = new Contact($this->db);
-	    $contact->fetch($id);
-	    if ($contact->id <= 0) {
-	        throw new RestException(404, 'Contact not found');
-	    }
+		$contact = new Contact($this->db);
+		$contact->fetch($id);
+		if ($contact->id <= 0) {
+			throw new RestException(404, 'Contact not found');
+		}
 
-	    if (!DolibarrApi::_checkAccessToResource('contact', $contact->id, 'socpeople&societe')) {
-	        throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-	    }
+		if (!DolibarrApi::_checkAccessToResource('contact', $contact->id, 'socpeople&societe')) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-	    // Check mandatory fields
-	    $login = $request_data["login"];
-	    $password = $request_data["password"];
-	    $useraccount = new User($this->db);
-	    $result = $useraccount->create_from_contact($contact, $login, $password);
-	    if ($result <= 0) {
-	        throw new RestException(500, "User not created");
-	    }
-	    // password parameter not used in create_from_contact
-	    $useraccount->setPassword($useraccount, $password);
+		// Check mandatory fields
+		$login = $request_data["login"];
+		$password = $request_data["password"];
+		$useraccount = new User($this->db);
+		$result = $useraccount->create_from_contact($contact, $login, $password);
+		if ($result <= 0) {
+			throw new RestException(500, "User not created");
+		}
+		// password parameter not used in create_from_contact
+		$useraccount->setPassword($useraccount, $password);
 
-	    return $result;
+		return $result;
 	}
 
-    /**
-     * Get categories for a contact
-     *
-     * @param int		$id         ID of contact
-     * @param string	$sortfield	Sort field
-     * @param string	$sortorder	Sort order
-     * @param int		$limit		Limit for list
-     * @param int		$page		Page number
-     *
-     * @return mixed
-     *
-     * @url GET {id}/categories
-     */
-    public function getCategories($id, $sortfield = "s.rowid", $sortorder = 'ASC', $limit = 0, $page = 0)
+	/**
+	 * Get categories for a contact
+	 *
+	 * @param int		$id         ID of contact
+	 * @param string	$sortfield	Sort field
+	 * @param string	$sortorder	Sort order
+	 * @param int		$limit		Limit for list
+	 * @param int		$page		Page number
+	 *
+	 * @return mixed
+	 *
+	 * @url GET {id}/categories
+	 */
+	public function getCategories($id, $sortfield = "s.rowid", $sortorder = 'ASC', $limit = 0, $page = 0)
 	{
 		if (!DolibarrApiAccess::$user->rights->categorie->lire) {
 			throw new RestException(401);
@@ -431,131 +431,131 @@ class Contacts extends DolibarrApi
 		}
 
 		return $result;
-    }
+	}
 
-    /**
-     * Add a category to a contact
-     *
-     * @url POST {id}/categories/{category_id}
-     *
-     * @param   int		$id             Id of contact
-     * @param   int     $category_id    Id of category
-     *
-     * @return  mixed
-     *
-     * @throws RestException 401 Insufficient rights
-     * @throws RestException 404 Category or contact not found
-     */
-    public function addCategory($id, $category_id)
-    {
-        if (!DolibarrApiAccess::$user->rights->societe->contact->creer) {
-            throw new RestException(401, 'Insufficient rights');
-        }
+	/**
+	 * Add a category to a contact
+	 *
+	 * @url POST {id}/categories/{category_id}
+	 *
+	 * @param   int		$id             Id of contact
+	 * @param   int     $category_id    Id of category
+	 *
+	 * @return  mixed
+	 *
+	 * @throws RestException 401 Insufficient rights
+	 * @throws RestException 404 Category or contact not found
+	 */
+	public function addCategory($id, $category_id)
+	{
+		if (!DolibarrApiAccess::$user->rights->societe->contact->creer) {
+			throw new RestException(401, 'Insufficient rights');
+		}
 
-        $result = $this->contact->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Contact not found');
-        }
-        $category = new Categorie($this->db);
-        $result = $category->fetch($category_id);
-        if (!$result) {
-            throw new RestException(404, 'category not found');
-        }
+		$result = $this->contact->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Contact not found');
+		}
+		$category = new Categorie($this->db);
+		$result = $category->fetch($category_id);
+		if (!$result) {
+			throw new RestException(404, 'category not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('contact', $this->contact->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
-        if (!DolibarrApi::_checkAccessToResource('category', $category->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('contact', $this->contact->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+		if (!DolibarrApi::_checkAccessToResource('category', $category->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        $category->add_type($this->contact, 'contact');
+		$category->add_type($this->contact, 'contact');
 
-        return $this->_cleanObjectDatas($this->contact);
-    }
+		return $this->_cleanObjectDatas($this->contact);
+	}
 
-    /**
-     * Remove the link between a category and a contact
-     *
-     * @url DELETE {id}/categories/{category_id}
-     *
-     * @param   int		$id				Id of contact
-     * @param   int		$category_id	Id of category
-     * @return  mixed
-     *
-     * @throws  RestException 401     Insufficient rights
-     * @throws  RestException 404     Category or contact not found
-     */
-    public function deleteCategory($id, $category_id)
-    {
-        if (!DolibarrApiAccess::$user->rights->societe->contact->creer) {
-            throw new RestException(401, 'Insufficient rights');
-        }
+	/**
+	 * Remove the link between a category and a contact
+	 *
+	 * @url DELETE {id}/categories/{category_id}
+	 *
+	 * @param   int		$id				Id of contact
+	 * @param   int		$category_id	Id of category
+	 * @return  mixed
+	 *
+	 * @throws  RestException 401     Insufficient rights
+	 * @throws  RestException 404     Category or contact not found
+	 */
+	public function deleteCategory($id, $category_id)
+	{
+		if (!DolibarrApiAccess::$user->rights->societe->contact->creer) {
+			throw new RestException(401, 'Insufficient rights');
+		}
 
-        $result = $this->contact->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Contact not found');
-        }
-        $category = new Categorie($this->db);
-        $result = $category->fetch($category_id);
-        if (!$result) {
-            throw new RestException(404, 'category not found');
-        }
+		$result = $this->contact->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Contact not found');
+		}
+		$category = new Categorie($this->db);
+		$result = $category->fetch($category_id);
+		if (!$result) {
+			throw new RestException(404, 'category not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('contact', $this->contact->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
-        if (!DolibarrApi::_checkAccessToResource('category', $category->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('contact', $this->contact->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+		if (!DolibarrApi::_checkAccessToResource('category', $category->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        $category->del_type($this->contact, 'contact');
+		$category->del_type($this->contact, 'contact');
 
-        return $this->_cleanObjectDatas($this->contact);
-    }
+		return $this->_cleanObjectDatas($this->contact);
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
-    /**
-     * Clean sensible object datas
-     *
-     * @param   Object  $object     Object to clean
-     * @return  array               Array of cleaned object properties
-     */
-    protected function _cleanObjectDatas($object)
-    {
-        // phpcs:enable
-        $object = parent::_cleanObjectDatas($object);
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	/**
+	 * Clean sensible object datas
+	 *
+	 * @param   Object  $object     Object to clean
+	 * @return  Object              Object with cleaned properties
+	 */
+	protected function _cleanObjectDatas($object)
+	{
+		// phpcs:enable
+		$object = parent::_cleanObjectDatas($object);
 
-        unset($object->total_ht);
-        unset($object->total_tva);
-        unset($object->total_localtax1);
-        unset($object->total_localtax2);
-        unset($object->total_ttc);
+		unset($object->total_ht);
+		unset($object->total_tva);
+		unset($object->total_localtax1);
+		unset($object->total_localtax2);
+		unset($object->total_ttc);
 
-        unset($object->note);
-        unset($object->lines);
-        unset($object->thirdparty);
+		unset($object->note);
+		unset($object->lines);
+		unset($object->thirdparty);
 
-        return $object;
-    }
+		return $object;
+	}
 
-    /**
-     * Validate fields before create or update object
-     *
-     * @param   array|null     $data   Data to validate
-     * @return  array
-     * @throws  RestException
-     */
-    private function _validate($data)
-    {
-        $contact = array();
-        foreach (Contacts::$FIELDS as $field) {
-            if (!isset($data[$field])) {
-                throw new RestException(400, "$field field missing");
-            }
-            $contact[$field] = $data[$field];
-        }
+	/**
+	 * Validate fields before create or update object
+	 *
+	 * @param   array|null     $data   Data to validate
+	 * @return  array
+	 * @throws  RestException
+	 */
+	private function _validate($data)
+	{
+		$contact = array();
+		foreach (Contacts::$FIELDS as $field) {
+			if (!isset($data[$field])) {
+				throw new RestException(400, "$field field missing");
+			}
+			$contact[$field] = $data[$field];
+		}
 
-        return $contact;
-    }
+		return $contact;
+	}
 }
diff --git a/htdocs/societe/class/api_thirdparties.class.php b/htdocs/societe/class/api_thirdparties.class.php
index 9a572a7e06f..509c1419a00 100644
--- a/htdocs/societe/class/api_thirdparties.class.php
+++ b/htdocs/societe/class/api_thirdparties.class.php
@@ -45,7 +45,7 @@ class Thirdparties extends DolibarrApi
 	/**
 	 * Constructor
 	 */
-    public function __construct()
+	public function __construct()
 	{
 		global $db, $conf;
 		$this->db = $db;
@@ -72,10 +72,10 @@ class Thirdparties extends DolibarrApi
 	 *
 	 * @throws 	RestException
 	 */
-    public function get($id)
+	public function get($id)
 	{
-        return $this->_fetch($id);
-    }
+		return $this->_fetch($id);
+	}
 
 	/**
 	 * Get properties of a thirdparty object by email.
@@ -91,7 +91,7 @@ class Thirdparties extends DolibarrApi
 	 */
 	public function getByEmail($email)
 	{
-	    return $this->_fetch('', '', '', '', '', '', '', '', '', '', $email);
+		return $this->_fetch('', '', '', '', '', '', '', '', '', '', $email);
 	}
 
 	/**
@@ -108,7 +108,7 @@ class Thirdparties extends DolibarrApi
 	 */
 	public function getByBarcode($barcode)
 	{
-	    return $this->_fetch('', '', '', $barcode);
+		return $this->_fetch('', '', '', $barcode);
 	}
 
 	/**
@@ -128,8 +128,8 @@ class Thirdparties extends DolibarrApi
 	 * @param   string  $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.nom:like:'TheCompany%') and (t.date_creation:<:'20160101')"
 	 * @return  array               Array of thirdparty objects
 	 */
-    public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $mode = 0, $category = 0, $sqlfilters = '')
-    {
+	public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $mode = 0, $category = 0, $sqlfilters = '')
+	{
 		global $db;
 
 		$obj_ret = array();
@@ -144,10 +144,10 @@ class Thirdparties extends DolibarrApi
 		$sql = "SELECT t.rowid";
 		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe as t";
-    	if ($category > 0) {
+		if ($category > 0) {
 			if ($mode != 4) $sql .= ", ".MAIN_DB_PREFIX."categorie_societe as c";
 			if (!in_array($mode, array(1, 2, 3))) $sql .= ", ".MAIN_DB_PREFIX."categorie_fournisseur as cc";
-    	}
+		}
 		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
 		$sql .= ", ".MAIN_DB_PREFIX."c_stcomm as st";
 		$sql .= " WHERE t.entity IN (".getEntity('societe').")";
@@ -158,12 +158,12 @@ class Thirdparties extends DolibarrApi
 		if ($mode == 3) $sql .= " AND t.client IN (0)";
 		if ($mode == 4) $sql .= " AND t.fournisseur IN (1)";
 
-    	// Select thirdparties of given category
-    	if ($category > 0) {
-    		if (!empty($mode) && $mode != 4) { $sql .= " AND c.fk_categorie = ".$this->db->escape($category)." AND c.fk_soc = t.rowid"; }
-    		elseif (!empty($mode) && $mode == 4) { $sql .= " AND cc.fk_categorie = ".$this->db->escape($category)." AND cc.fk_soc = t.rowid"; }
-    		else { $sql .= " AND ((c.fk_categorie = ".$this->db->escape($category)." AND c.fk_soc = t.rowid) OR (cc.fk_categorie = ".$this->db->escape($category)." AND cc.fk_soc = t.rowid))"; }
-    	}
+		// Select thirdparties of given category
+		if ($category > 0) {
+			if (!empty($mode) && $mode != 4) { $sql .= " AND c.fk_categorie = ".$this->db->escape($category)." AND c.fk_soc = t.rowid"; }
+			elseif (!empty($mode) && $mode == 4) { $sql .= " AND cc.fk_categorie = ".$this->db->escape($category)." AND cc.fk_soc = t.rowid"; }
+			else { $sql .= " AND ((c.fk_categorie = ".$this->db->escape($category)." AND c.fk_soc = t.rowid) OR (cc.fk_categorie = ".$this->db->escape($category)." AND cc.fk_soc = t.rowid))"; }
+		}
 
 		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= " AND t.rowid = sc.fk_soc";
 		//if ($email != NULL) $sql.= " AND s.email = \"".$email."\"";
@@ -202,7 +202,7 @@ class Thirdparties extends DolibarrApi
 		{
 			$num = $this->db->num_rows($result);
 			$min = min($num, ($limit <= 0 ? $num : $limit));
-            $i = 0;
+			$i = 0;
 			while ($i < $min)
 			{
 				$obj = $this->db->fetch_object($result);
@@ -227,7 +227,7 @@ class Thirdparties extends DolibarrApi
 	 * @param array $request_data   Request datas
 	 * @return int  ID of thirdparty
 	 */
-    public function post($request_data = null)
+	public function post($request_data = null)
 	{
 		if (!DolibarrApiAccess::$user->rights->societe->creer) {
 			throw new RestException(401);
@@ -251,7 +251,7 @@ class Thirdparties extends DolibarrApi
 	 * @param array $request_data   Datas
 	 * @return int
 	 */
-    public function put($id, $request_data = null)
+	public function put($id, $request_data = null)
 	{
 		if (!DolibarrApiAccess::$user->rights->societe->creer) {
 			throw new RestException(401);
@@ -291,7 +291,7 @@ class Thirdparties extends DolibarrApi
 	 *
 	 * @url PUT {id}/merge/{idtodelete}
 	 */
-    public function merge($id, $idtodelete)
+	public function merge($id, $idtodelete)
 	{
 		global $db, $hookmanager;
 
@@ -443,7 +443,7 @@ class Thirdparties extends DolibarrApi
 		// External modules should update their ones too
 		if (!$errors)
 		{
-            $reshook = $hookmanager->executeHooks('replaceThirdparty', array(
+			$reshook = $hookmanager->executeHooks('replaceThirdparty', array(
 				'soc_origin' => $soc_origin->id,
 				'soc_dest' => $object->id
 			), $soc_dest, $action);
@@ -499,7 +499,7 @@ class Thirdparties extends DolibarrApi
 	 * @param int $id   Thirparty ID
 	 * @return integer
 	 */
-    public function delete($id)
+	public function delete($id)
 	{
 		if (!DolibarrApiAccess::$user->rights->societe->supprimer) {
 			throw new RestException(401);
@@ -511,9 +511,9 @@ class Thirdparties extends DolibarrApi
 		if (!DolibarrApi::_checkAccessToResource('societe', $this->company->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
-        $this->company->oldcopy = clone $this->company;
+		$this->company->oldcopy = clone $this->company;
 		return $this->company->delete($id);
-    }
+	}
 
 	/**
 	 * Set new price level for the given thirdparty
@@ -547,29 +547,29 @@ class Thirdparties extends DolibarrApi
 		}
 
 		if ($priceLevel < 1 || $priceLevel > $conf->global->PRODUIT_MULTIPRICES_LIMIT) {
-			throw new RestException(400, 'Price level must be between 1 and ' . $conf->global->PRODUIT_MULTIPRICES_LIMIT);
+			throw new RestException(400, 'Price level must be between 1 and '.$conf->global->PRODUIT_MULTIPRICES_LIMIT);
 		}
 
 		if (empty(DolibarrApiAccess::$user->rights->societe->creer)) {
-			throw new RestException(401, 'Access to thirdparty ' . $id . ' not allowed for login '. DolibarrApiAccess::$user->login);
+			throw new RestException(401, 'Access to thirdparty '.$id.' not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
 		$result = $this->company->fetch($id);
 		if ($result < 0) {
-			throw new RestException(404, 'Thirdparty ' . $id . ' not found');
+			throw new RestException(404, 'Thirdparty '.$id.' not found');
 		}
 
 		if (empty($result)) {
-			throw new RestException(500, 'Error fetching thirdparty ' . $id, array_merge(array($this->company->error), $this->company->errors));
+			throw new RestException(500, 'Error fetching thirdparty '.$id, array_merge(array($this->company->error), $this->company->errors));
 		}
 
 		if (empty(DolibarrApi::_checkAccessToResource('societe', $this->company->id))) {
-			throw new RestException(401, 'Access to thirdparty ' . $id . ' not allowed for login ' . DolibarrApiAccess::$user->login);
+			throw new RestException(401, 'Access to thirdparty '.$id.' not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
 		$result = $this->company->set_price_level($priceLevel, DolibarrApiAccess::$user);
 		if ($result <= 0) {
-			throw new RestException(500, 'Error setting new price level for thirdparty ' . $id, array($this->company->db->lasterror()));
+			throw new RestException(500, 'Error setting new price level for thirdparty '.$id, array($this->company->db->lasterror()));
 		}
 
 		return $this->_cleanObjectDatas($this->company);
@@ -588,7 +588,7 @@ class Thirdparties extends DolibarrApi
 	 *
 	 * @url GET {id}/categories
 	 */
-    public function getCategories($id, $sortfield = "s.rowid", $sortorder = 'ASC', $limit = 0, $page = 0)
+	public function getCategories($id, $sortfield = "s.rowid", $sortorder = 'ASC', $limit = 0, $page = 0)
 	{
 		if (!DolibarrApiAccess::$user->rights->categorie->lire) {
 			throw new RestException(401);
@@ -627,7 +627,7 @@ class Thirdparties extends DolibarrApi
 	 *
 	 * @url POST {id}/categories/{category_id}
 	 */
-    public function addCategory($id, $category_id)
+	public function addCategory($id, $category_id)
 	{
 		if (!DolibarrApiAccess::$user->rights->societe->creer) {
 			throw new RestException(401);
@@ -665,7 +665,7 @@ class Thirdparties extends DolibarrApi
 	 *
 	 * @url DELETE {id}/categories/{category_id}
 	 */
-    public function deleteCategory($id, $category_id)
+	public function deleteCategory($id, $category_id)
 	{
 		if (!DolibarrApiAccess::$user->rights->societe->creer) {
 			throw new RestException(401);
@@ -706,7 +706,7 @@ class Thirdparties extends DolibarrApi
 	 *
 	 * @url GET {id}/supplier_categories
 	 */
-    public function getSupplierCategories($id, $sortfield = "s.rowid", $sortorder = 'ASC', $limit = 0, $page = 0)
+	public function getSupplierCategories($id, $sortfield = "s.rowid", $sortorder = 'ASC', $limit = 0, $page = 0)
 	{
 		if (!DolibarrApiAccess::$user->rights->categorie->lire) {
 			throw new RestException(401);
@@ -745,7 +745,7 @@ class Thirdparties extends DolibarrApi
 	 *
 	 * @url POST {id}/supplier_categories/{category_id}
 	 */
-    public function addSupplierCategory($id, $category_id)
+	public function addSupplierCategory($id, $category_id)
 	{
 		if (!DolibarrApiAccess::$user->rights->societe->creer) {
 			throw new RestException(401);
@@ -783,7 +783,7 @@ class Thirdparties extends DolibarrApi
 	 *
 	 * @url DELETE {id}/supplier_categories/{category_id}
 	 */
-    public function deleteSupplierCategory($id, $category_id)
+	public function deleteSupplierCategory($id, $category_id)
 	{
 		if (!DolibarrApiAccess::$user->rights->societe->creer) {
 			throw new RestException(401);
@@ -826,7 +826,7 @@ class Thirdparties extends DolibarrApi
 	 * @throws RestException 401
 	 * @throws RestException 404
 	 */
-    public function getOutStandingProposals($id, $mode = 'customer')
+	public function getOutStandingProposals($id, $mode = 'customer')
 	{
 		$obj_ret = array();
 
@@ -870,7 +870,7 @@ class Thirdparties extends DolibarrApi
 	 * @throws RestException 401
 	 * @throws RestException 404
 	 */
-    public function getOutStandingOrder($id, $mode = 'customer')
+	public function getOutStandingOrder($id, $mode = 'customer')
 	{
 		$obj_ret = array();
 
@@ -913,7 +913,7 @@ class Thirdparties extends DolibarrApi
 	 * @throws RestException 401
 	 * @throws RestException 404
 	 */
-    public function getOutStandingInvoices($id, $mode = 'customer')
+	public function getOutStandingInvoices($id, $mode = 'customer')
 	{
 		$obj_ret = array();
 
@@ -956,7 +956,7 @@ class Thirdparties extends DolibarrApi
 	 * @throws RestException 401
 	 * @throws RestException 404
 	 */
-    public function getSalesRepresentatives($id, $mode = 0)
+	public function getSalesRepresentatives($id, $mode = 0)
 	{
 		$obj_ret = array();
 
@@ -999,7 +999,7 @@ class Thirdparties extends DolibarrApi
 	 * @throws RestException 404
 	 * @throws RestException 503
 	 */
-    public function getFixedAmountDiscounts($id, $filter = "none", $sortfield = "f.type", $sortorder = 'ASC')
+	public function getFixedAmountDiscounts($id, $filter = "none", $sortfield = "f.type", $sortorder = 'ASC')
 	{
 		$obj_ret = array();
 
@@ -1057,8 +1057,8 @@ class Thirdparties extends DolibarrApi
 	 * @throws RestException 404
 	 * @throws RestException 405
 	 */
-    public function getInvoicesQualifiedForReplacement($id)
-    {
+	public function getInvoicesQualifiedForReplacement($id)
+	{
 		if (!DolibarrApiAccess::$user->rights->facture->lire) {
 			throw new RestException(401);
 		}
@@ -1100,8 +1100,8 @@ class Thirdparties extends DolibarrApi
 	 * @throws RestException 404
 	 * @throws RestException 405
 	 */
-    public function getInvoicesQualifiedForCreditNote($id)
-    {
+	public function getInvoicesQualifiedForCreditNote($id)
+	{
 		if (!DolibarrApiAccess::$user->rights->facture->lire) {
 			throw new RestException(401);
 		}
@@ -1136,8 +1136,8 @@ class Thirdparties extends DolibarrApi
 	 *
 	 * @url GET {id}/bankaccounts
 	 */
-    public function getCompanyBankAccount($id)
-    {
+	public function getCompanyBankAccount($id)
+	{
 		global $db, $conf;
 
 		if (!DolibarrApiAccess::$user->rights->facture->lire) {
@@ -1214,7 +1214,7 @@ class Thirdparties extends DolibarrApi
 	 *
 	 * @url POST {id}/bankaccounts
 	 */
-    public function createCompanyBankAccount($id, $request_data = null)
+	public function createCompanyBankAccount($id, $request_data = null)
 	{
 		if (!DolibarrApiAccess::$user->rights->societe->creer) {
 			throw new RestException(401);
@@ -1257,7 +1257,7 @@ class Thirdparties extends DolibarrApi
 	 *
 	 * @url PUT {id}/bankaccounts/{bankaccount_id}
 	 */
-    public function updateCompanyBankAccount($id, $bankaccount_id, $request_data = null)
+	public function updateCompanyBankAccount($id, $bankaccount_id, $request_data = null)
 	{
 		if (!DolibarrApiAccess::$user->rights->societe->creer) {
 			throw new RestException(401);
@@ -1301,8 +1301,8 @@ class Thirdparties extends DolibarrApi
 	 *
 	 * @url DELETE {id}/bankaccounts/{bankaccount_id}
 	 */
-    public function deleteCompanyBankAccount($id, $bankaccount_id)
-    {
+	public function deleteCompanyBankAccount($id, $bankaccount_id)
+	{
 		if (!DolibarrApiAccess::$user->rights->societe->creer) {
 			throw new RestException(401);
 		}
@@ -1374,7 +1374,7 @@ class Thirdparties extends DolibarrApi
 		$result = $this->db->query($sql);
 		if ($result)
 		{
-			if ($result->num_rows == 0) {
+			if ($result && $this->db->num_rows($result) == 0) {
 				throw new RestException(404, 'Bank account not found');
 			}
 
@@ -1408,9 +1408,9 @@ class Thirdparties extends DolibarrApi
 		} else {
 			throw new RestException(500);
 		}
-    }
+	}
 
-    /**
+	/**
 	 * Get a specific gateway attached to a thirdparty (by specifying the site key)
 	 *
 	 * @param int $id ID of thirdparty
@@ -1422,8 +1422,8 @@ class Thirdparties extends DolibarrApi
 	 *
 	 * @url GET {id}/gateways/
 	 */
-    public function getSocieteAccounts($id, $site = null)
-    {
+	public function getSocieteAccounts($id, $site = null)
+	{
 		global $db, $conf;
 
 		if (!DolibarrApiAccess::$user->rights->societe->lire) {
@@ -1443,7 +1443,7 @@ class Thirdparties extends DolibarrApi
 
 		$result = $this->db->query($sql);
 
-		if ($result->num_rows == 0) {
+		if ($result && $this->db->num_rows($result) == 0) {
 			throw new RestException(404, 'This thirdparty does not have any gateway attached or does not exist.');
 		}
 
@@ -1499,7 +1499,7 @@ class Thirdparties extends DolibarrApi
 	 *
 	 * @url POST {id}/gateways
 	 */
-    public function createSocieteAccount($id, $request_data = null)
+	public function createSocieteAccount($id, $request_data = null)
 	{
 		global $db;
 
@@ -1514,7 +1514,7 @@ class Thirdparties extends DolibarrApi
 		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe_account WHERE fk_soc  = ".$id." AND site = '".$this->db->escape($request_data['site'])."'";
 		$result = $this->db->query($sql);
 
-		if ($result->num_rows == 0) {
+		if ($result && $this->db->num_rows($result) == 0) {
 			$account = new SocieteAccount($this->db);
 			if (!isset($request_data['login'])) {
 				$account->login = "";
@@ -1558,7 +1558,7 @@ class Thirdparties extends DolibarrApi
 	 *
 	 * @url PUT {id}/gateways/{site}
 	 */
-    public function putSocieteAccount($id, $site, $request_data = null)
+	public function putSocieteAccount($id, $site, $request_data = null)
 	{
 		global $db;
 
@@ -1570,7 +1570,7 @@ class Thirdparties extends DolibarrApi
 		$result = $this->db->query($sql);
 
 		// We do not found an existing SocieteAccount entity for this fk_soc and site ; we then create a new one.
-		if ($result->num_rows == 0) {
+		if ($result && $this->db->num_rows == 0) {
 			if (!isset($request_data['key_account'])) {
 				throw new RestException(422, 'Unprocessable Entity: You must pass the key_account attribute in your request data !');
 			}
@@ -1595,7 +1595,7 @@ class Thirdparties extends DolibarrApi
 				$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe_account WHERE fk_soc  = ".$id." AND site = '".$this->db->escape($request_data['site'])."' ";
 				$result = $this->db->query($sql);
 
-				if ($result->num_rows !== 0) {
+				if ($result && $this->db->num_rows($result) !== 0) {
 					throw new RestException(409, "You are trying to update this thirdparty SocieteAccount (gateway record) from $site to ".$request_data['site']." but another SocieteAccount entity already exists with this site key.");
 				}
 			}
@@ -1641,7 +1641,7 @@ class Thirdparties extends DolibarrApi
 	 *
 	 * @url PATCH {id}/gateways/{site}
 	 */
-    public function patchSocieteAccount($id, $site, $request_data = null)
+	public function patchSocieteAccount($id, $site, $request_data = null)
 	{
 		global $db;
 
@@ -1652,7 +1652,7 @@ class Thirdparties extends DolibarrApi
 		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe_account WHERE fk_soc  = $id AND site = '$site' ";
 		$result = $this->db->query($sql);
 
-		if ($result->num_rows == 0) {
+		if ($result && $this->db->num_rows($result) == 0) {
 			throw new RestException(404, "This thirdparty does not have $site gateway attached or does not exist.");
 		} else {
 			// If the user tries to edit the site member, we check first if
@@ -1660,7 +1660,7 @@ class Thirdparties extends DolibarrApi
 				$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe_account WHERE fk_soc  = ".$id." AND site = '".$this->db->escape($request_data['site'])."' ";
 				$result = $this->db->query($sql);
 
-				if ($result->num_rows !== 0)
+				if ($result && $this->db->num_rows($result) !== 0)
 					throw new RestException(409, "You are trying to update this thirdparty SocieteAccount (gateway record) site member from $site to ".$request_data['site']." but another SocieteAccount entity already exists for this thirdparty with this site key.");
 			}
 
@@ -1694,8 +1694,8 @@ class Thirdparties extends DolibarrApi
 	 *
 	 * @url DELETE {id}/gateways/{site}
 	 */
-    public function deleteSocieteAccount($id, $site)
-    {
+	public function deleteSocieteAccount($id, $site)
+	{
 		global $db;
 
 		if (!DolibarrApiAccess::$user->rights->societe->creer) {
@@ -1705,7 +1705,7 @@ class Thirdparties extends DolibarrApi
 		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe_account WHERE fk_soc  = $id AND site = '".$this->db->escape($site)."'";
 		$result = $this->db->query($sql);
 
-		if ($result->num_rows == 0) {
+		if ($result && $this->db->num_rows($result) == 0) {
 			throw new RestException(404);
 		} else {
 			$obj = $this->db->fetch_object($result);
@@ -1724,14 +1724,14 @@ class Thirdparties extends DolibarrApi
 	 * @param int $id ID of thirdparty
 	 *
 	 * @return void
-	 * @throws RestException(401) Unauthorized: User does not have permission to delete thirdparties gateways
-	 * @throws RestException(404) Not Found: Specified thirdparty ID does not belongs to an existing thirdparty
-	 * @throws RestException(500) Internal Server Error: Error deleting SocieteAccount entity
+	 * @throws RestException 401 Unauthorized: User does not have permission to delete thirdparties gateways
+	 * @throws RestException 404 Not Found: Specified thirdparty ID does not belongs to an existing thirdparty
+	 * @throws RestException 500 Internal Server Error: Error deleting SocieteAccount entity
 	 *
 	 * @url DELETE {id}/gateways
 	 */
-    public function deleteSocieteAccounts($id)
-    {
+	public function deleteSocieteAccounts($id)
+	{
 		global $db;
 
 		if (!DolibarrApiAccess::$user->rights->societe->creer) {
@@ -1747,7 +1747,7 @@ class Thirdparties extends DolibarrApi
 
 		$result = $this->db->query($sql);
 
-		if ($result->num_rows == 0) {
+		if ($result && $this->db->num_rows($result) == 0) {
 			throw new RestException(404, 'This third party does not have any gateway attached or does not exist.');
 		} else {
 			$i = 0;
@@ -1767,16 +1767,16 @@ class Thirdparties extends DolibarrApi
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 * Clean sensible object datas
 	 *
-	 * @param   object  $object    Object to clean
-	 * @return    array    Array of cleaned object properties
+	 * @param   Object  $object     Object to clean
+	 * @return  Object              Object with cleaned properties
 	 */
 	protected function _cleanObjectDatas($object)
-    {
-        // phpcs:enable
+	{
+		// phpcs:enable
 		$object = parent::_cleanObjectDatas($object);
 
 		unset($object->nom); // ->name already defined and nom deprecated
@@ -1812,23 +1812,23 @@ class Thirdparties extends DolibarrApi
 	 *
 	 * @throws RestException
 	 */
-    private function _validate($data)
-    {
-        $thirdparty = array();
-        foreach (Thirdparties::$FIELDS as $field) {
-            if (!isset($data[$field]))
-                throw new RestException(400, "$field field missing");
-            $thirdparty[$field] = $data[$field];
-        }
-        return $thirdparty;
-    }
+	private function _validate($data)
+	{
+		$thirdparty = array();
+		foreach (Thirdparties::$FIELDS as $field) {
+			if (!isset($data[$field]))
+				throw new RestException(400, "$field field missing");
+			$thirdparty[$field] = $data[$field];
+		}
+		return $thirdparty;
+	}
 
-    /**
-     * Fetch properties of a thirdparty object.
-     *
-     * Return an array with thirdparty informations
-     *
-     * @param    int	$rowid      Id of third party to load
+	/**
+	 * Fetch properties of a thirdparty object.
+	 *
+	 * Return an array with thirdparty informations
+	 *
+	 * @param    int	$rowid      Id of third party to load
 	 * @param    string	$ref        Reference of third party, name (Warning, this can return several records)
 	 * @param    string	$ref_ext    External reference of third party (Warning, this information is a free field not provided by Dolibarr)
 	 * @param    string	$barcode    Barcode of third party to load
@@ -1840,39 +1840,39 @@ class Thirdparties extends DolibarrApi
 	 * @param    string	$idprof6		Prof id 6 of third party (Warning, this can return several records)
 	 * @param    string	$email   		Email of third party (Warning, this can return several records)
 	 * @param    string	$ref_alias  Name_alias of third party (Warning, this can return several records)
-     * @return array|mixed data without useless information
-     *
-     * @throws RestException
-    */
-    private function _fetch($rowid, $ref = '', $ref_ext = '', $barcode = '', $idprof1 = '', $idprof2 = '', $idprof3 = '', $idprof4 = '', $idprof5 = '', $idprof6 = '', $email = '', $ref_alias = '')
-    {
-        global $conf;
-        if (!DolibarrApiAccess::$user->rights->societe->lire) {
-            throw new RestException(401);
-        }
+	 * @return array|mixed data without useless information
+	 *
+	 * @throws RestException
+	 */
+	private function _fetch($rowid, $ref = '', $ref_ext = '', $barcode = '', $idprof1 = '', $idprof2 = '', $idprof3 = '', $idprof4 = '', $idprof5 = '', $idprof6 = '', $email = '', $ref_alias = '')
+	{
+		global $conf;
+		if (!DolibarrApiAccess::$user->rights->societe->lire) {
+			throw new RestException(401);
+		}
 
-        $result = $this->company->fetch($rowid, $ref, $ref_ext, $barcode, $idprof1, $idprof2, $idprof3, $idprof4, $idprof5, $idprof6, $email, $ref_alias);
-        if (!$result) {
-            throw new RestException(404, 'Thirdparty not found');
-        }
+		$result = $this->company->fetch($rowid, $ref, $ref_ext, $barcode, $idprof1, $idprof2, $idprof3, $idprof4, $idprof5, $idprof6, $email, $ref_alias);
+		if (!$result) {
+			throw new RestException(404, 'Thirdparty not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('societe', $this->company->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('societe', $this->company->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
-            $filterabsolutediscount = "fk_facture_source IS NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
-            $filtercreditnote = "fk_facture_source IS NOT NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
-        } else {
-            $filterabsolutediscount = "fk_facture_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS RECEIVED)%')";
-            $filtercreditnote = "fk_facture_source IS NOT NULL AND (description NOT LIKE '(DEPOSIT)%' OR description LIKE '(EXCESS RECEIVED)%')";
-        }
+		if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
+			$filterabsolutediscount = "fk_facture_source IS NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
+			$filtercreditnote = "fk_facture_source IS NOT NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
+		} else {
+			$filterabsolutediscount = "fk_facture_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS RECEIVED)%')";
+			$filtercreditnote = "fk_facture_source IS NOT NULL AND (description NOT LIKE '(DEPOSIT)%' OR description LIKE '(EXCESS RECEIVED)%')";
+		}
 
-        $absolute_discount = $this->company->getAvailableDiscounts('', $filterabsolutediscount);
-        $absolute_creditnote = $this->company->getAvailableDiscounts('', $filtercreditnote);
-        $this->company->absolute_discount = price2num($absolute_discount, 'MT');
-        $this->company->absolute_creditnote = price2num($absolute_creditnote, 'MT');
+		$absolute_discount = $this->company->getAvailableDiscounts('', $filterabsolutediscount);
+		$absolute_creditnote = $this->company->getAvailableDiscounts('', $filtercreditnote);
+		$this->company->absolute_discount = price2num($absolute_discount, 'MT');
+		$this->company->absolute_creditnote = price2num($absolute_creditnote, 'MT');
 
-        return $this->_cleanObjectDatas($this->company);
-    }
+		return $this->_cleanObjectDatas($this->company);
+	}
 }
diff --git a/htdocs/societe/class/client.class.php b/htdocs/societe/class/client.class.php
index f3cdd3c805b..f88027b1491 100644
--- a/htdocs/societe/class/client.class.php
+++ b/htdocs/societe/class/client.class.php
@@ -30,66 +30,66 @@ include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
  */
 class Client extends Societe
 {
-    public $next_prev_filter = "te.client in (1,2,3)"; // Used to add a filter in Form::showrefnav method
+	public $next_prev_filter = "te.client in (1,2,3)"; // Used to add a filter in Form::showrefnav method
 
-    public $cacheprospectstatus = array();
+	public $cacheprospectstatus = array();
 
 
 	/**
-     *  Constructor
-     *
-     *  @param	DoliDB	$db		Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
+	 *  Constructor
+	 *
+	 *  @param	DoliDB	$db		Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
 
-        $this->client = 3;
-        $this->fournisseur = 0;
-    }
+		$this->client = 3;
+		$this->fournisseur = 0;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Load indicators into this->nb for board
-     *
-     *  @return     int         <0 if KO, >0 if OK
-     */
-    public function load_state_board()
-    {
-        // phpcs:enable
-        global $user;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Load indicators into this->nb for board
+	 *
+	 *  @return     int         <0 if KO, >0 if OK
+	 */
+	public function load_state_board()
+	{
+		// phpcs:enable
+		global $user;
 
-        $this->nb = array("prospects" => 0, "customers" => 0);
-        $clause = "WHERE";
+		$this->nb = array("prospects" => 0, "customers" => 0);
+		$clause = "WHERE";
 
-        $sql = "SELECT count(s.rowid) as nb, s.client";
-        $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
-        if (!$user->rights->societe->client->voir && !$user->socid)
-        {
-        	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
-        	$sql .= " WHERE sc.fk_user = ".$user->id;
-        	$clause = "AND";
-        }
-        $sql .= " ".$clause." s.client IN (1,2,3)";
-        $sql .= ' AND s.entity IN ('.getEntity($this->element).')';
-        $sql .= " GROUP BY s.client";
+		$sql = "SELECT count(s.rowid) as nb, s.client";
+		$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+		if (!$user->rights->societe->client->voir && !$user->socid)
+		{
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
+			$sql .= " WHERE sc.fk_user = ".$user->id;
+			$clause = "AND";
+		}
+		$sql .= " ".$clause." s.client IN (1,2,3)";
+		$sql .= ' AND s.entity IN ('.getEntity($this->element).')';
+		$sql .= " GROUP BY s.client";
 
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            while ($obj = $this->db->fetch_object($resql))
-            {
-                if ($obj->client == 1 || $obj->client == 3) $this->nb["customers"] += $obj->nb;
-                if ($obj->client == 2 || $obj->client == 3) $this->nb["prospects"] += $obj->nb;
-            }
-            $this->db->free($resql);
-            return 1;
-        } else {
-            dol_print_error($this->db);
-            $this->error = $this->db->lasterror();
-            return -1;
-        }
-    }
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			while ($obj = $this->db->fetch_object($resql))
+			{
+				if ($obj->client == 1 || $obj->client == 3) $this->nb["customers"] += $obj->nb;
+				if ($obj->client == 2 || $obj->client == 3) $this->nb["prospects"] += $obj->nb;
+			}
+			$this->db->free($resql);
+			return 1;
+		} else {
+			dol_print_error($this->db);
+			$this->error = $this->db->lasterror();
+			return -1;
+		}
+	}
 
 	/**
 	 *  Load array of prospect status
@@ -97,20 +97,20 @@ class Client extends Societe
 	 *  @param	int		$active     1=Active only, 0=Not active only, -1=All
 	 *  @return int					<0 if KO, >0 if OK
 	 */
-    public function loadCacheOfProspStatus($active = 1)
-    {
-    	global $langs;
+	public function loadCacheOfProspStatus($active = 1)
+	{
+		global $langs;
 
-   		$sql="SELECT id, code, libelle as label, picto FROM ".MAIN_DB_PREFIX."c_stcomm";
+   		$sql = "SELECT id, code, libelle as label, picto FROM ".MAIN_DB_PREFIX."c_stcomm";
    		if ($active >= 0) $sql .= " WHERE active = ".$active;
 		$resql = $this->db->query($sql);
 		$num = $this->db->num_rows($resql);
 		$i = 0;
 		while ($i < $num) {
 			$obj = $this->db->fetch_object($resql);
-			$this->cacheprospectstatus[$obj->id] = array('id'=>$obj->id, 'code'=>$obj->code, 'label'=>($langs->trans("ST_".strtoupper($obj->code))=="ST_".strtoupper($obj->code))?$obj->label:$langs->trans("ST_".strtoupper($obj->code)), 'picto'=>$obj->picto);
+			$this->cacheprospectstatus[$obj->id] = array('id'=>$obj->id, 'code'=>$obj->code, 'label'=>($langs->trans("ST_".strtoupper($obj->code)) == "ST_".strtoupper($obj->code)) ? $obj->label : $langs->trans("ST_".strtoupper($obj->code)), 'picto'=>$obj->picto);
 			$i++;
 		}
 		return 1;
-    }
+	}
 }
diff --git a/htdocs/societe/class/companybankaccount.class.php b/htdocs/societe/class/companybankaccount.class.php
index 283c32573e0..a123fa749c9 100644
--- a/htdocs/societe/class/companybankaccount.class.php
+++ b/htdocs/societe/class/companybankaccount.class.php
@@ -41,18 +41,18 @@ class CompanyBankAccount extends Account
 	public $date_rum;
 
 	/**
-     * Date creation record (datec)
-     *
-     * @var integer
-     */
-    public $datec;
+	 * Date creation record (datec)
+	 *
+	 * @var integer
+	 */
+	public $datec;
 
 	/**
-     * Date modification record (tms)
-     *
-     * @var integer
-     */
-    public $datem;
+	 * Date modification record (tms)
+	 *
+	 * @var integer
+	 */
+	public $datem;
 
 
 	/**
@@ -78,7 +78,7 @@ class CompanyBankAccount extends Account
 	 * @param   int    $notrigger   1=Disable triggers
 	 * @return	int					<0 if KO, >= 0 if OK
 	 */
-    public function create(User $user = null, $notrigger = 0)
+	public function create(User $user = null, $notrigger = 0)
 	{
 		$now	= dol_now();
 		$error = 0;
@@ -131,7 +131,7 @@ class CompanyBankAccount extends Account
 	 *  @param  int     $notrigger   1=Disable triggers
 	 *	@return	int				     <=0 if KO, >0 if OK
 	 */
-    public function update(User $user = null, $notrigger = 0)
+	public function update(User $user = null, $notrigger = 0)
 	{
 		global $conf;
 		$error = 0;
@@ -197,7 +197,7 @@ class CompanyBankAccount extends Account
 	 *  @param	int		$type		If id of company filled, we say if we want record of this type only
 	 * 	@return	int					<0 if KO, >0 if OK
 	 */
-    public function fetch($id, $socid = 0, $default = 1, $type = 'ban')
+	public function fetch($id, $socid = 0, $default = 1, $type = 'ban')
 	{
 		if (empty($id) && empty($socid)) return -1;
 
@@ -258,7 +258,7 @@ class CompanyBankAccount extends Account
 	 *	@param  	int		$notrigger	1=Disable triggers
 	 *  @return		int		            <0 if KO, >0 if OK
 	 */
-    public function delete(User $user = null, $notrigger = 0)
+	public function delete(User $user = null, $notrigger = 0)
 	{
 		global $conf;
 
@@ -325,7 +325,7 @@ class CompanyBankAccount extends Account
 	 * @param   int     $rib    RIB id
 	 * @return  int             0 if KO, 1 if OK
 	 */
-    public function setAsDefault($rib = 0)
+	public function setAsDefault($rib = 0)
 	{
 		$sql1 = "SELECT rowid as id, fk_soc  FROM ".MAIN_DB_PREFIX."societe_rib";
 		$sql1 .= " WHERE rowid = ".($rib ? $rib : $this->id);
@@ -375,7 +375,7 @@ class CompanyBankAccount extends Account
 	 *
 	 *  @return	void
 	 */
-    public function initAsSpecimen()
+	public function initAsSpecimen()
 	{
 		$this->specimen        = 1;
 		$this->ref             = 'CBA';
diff --git a/htdocs/societe/class/companypaymentmode.class.php b/htdocs/societe/class/companypaymentmode.class.php
index 93f0d13b498..ec6a3e77363 100644
--- a/htdocs/societe/class/companypaymentmode.class.php
+++ b/htdocs/societe/class/companypaymentmode.class.php
@@ -133,12 +133,12 @@ class CompanyPaymentMode extends CommonObject
 	/**
 	 * @var int Thirdparty ID
 	 */
-    public $fk_soc;
+	public $fk_soc;
 
 	/**
-     * @var string company payment mode label
-     */
-    public $label;
+	 * @var string company payment mode label
+	 */
+	public $label;
 
 	public $bank;
 	public $code_banque;
@@ -178,18 +178,18 @@ class CompanyPaymentMode extends CommonObject
 	public $ending_date;
 
 	/**
-     * Date creation record (datec)
-     *
-     * @var integer
-     */
-    public $datec;
+	 * Date creation record (datec)
+	 *
+	 * @var integer
+	 */
+	public $datec;
 
 	/**
-     * Date modification record (tms)
-     *
-     * @var integer
-     */
-    public $tms;
+	 * Date modification record (tms)
+	 *
+	 * @var integer
+	 */
+	public $tms;
 
 	public $import_key;
 	// END MODULEBUILDER PROPERTIES
@@ -211,7 +211,7 @@ class CompanyPaymentMode extends CommonObject
 	 */
 	//public $class_element_line = 'CompanyPaymentModeline';
 	/**
-     * @var array	List of child tables. To test if we can delete object.
+	 * @var array	List of child tables. To test if we can delete object.
 	 */
 	//protected $childtables=array();
 	/**
@@ -260,45 +260,45 @@ class CompanyPaymentMode extends CommonObject
 	public function createFromClone(User $user, $fromid)
 	{
 		global $hookmanager, $langs;
-	    $error = 0;
+		$error = 0;
 
-	    dol_syslog(__METHOD__, LOG_DEBUG);
+		dol_syslog(__METHOD__, LOG_DEBUG);
 
-	    $object = new self($this->db);
+		$object = new self($this->db);
 
-	    $this->db->begin();
+		$this->db->begin();
 
-	    // Load source object
-	    $object->fetchCommon($fromid);
-	    // Reset some properties
-	    unset($object->id);
-	    unset($object->fk_user_creat);
-	    unset($object->import_key);
+		// Load source object
+		$object->fetchCommon($fromid);
+		// Reset some properties
+		unset($object->id);
+		unset($object->fk_user_creat);
+		unset($object->import_key);
 
-	    // Clear fields
-	    $object->ref = "copy_of_".$object->ref;
-	    $object->title = $langs->trans("CopyOf")." ".$object->title;
-	    // ...
+		// Clear fields
+		$object->ref = "copy_of_".$object->ref;
+		$object->title = $langs->trans("CopyOf")." ".$object->title;
+		// ...
 
-	    // Create clone
+		// Create clone
 		$object->context['createfromclone'] = 'createfromclone';
-	    $result = $object->createCommon($user);
-	    if ($result < 0) {
-	        $error++;
-	        $this->error = $object->error;
-	        $this->errors = $object->errors;
-	    }
+		$result = $object->createCommon($user);
+		if ($result < 0) {
+			$error++;
+			$this->error = $object->error;
+			$this->errors = $object->errors;
+		}
 
-	    unset($object->context['createfromclone']);
+		unset($object->context['createfromclone']);
 
-	    // End
-	    if (!$error) {
-	        $this->db->commit();
-	        return $object;
-	    } else {
-	        $this->db->rollback();
-	        return -1;
-	    }
+		// End
+		if (!$error) {
+			$this->db->commit();
+			return $object;
+		} else {
+			$this->db->rollback();
+			return -1;
+		}
 	}
 
 	/**
@@ -364,47 +364,47 @@ class CompanyPaymentMode extends CommonObject
 	 *
 	 *	@param	int		$withpicto					Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
 	 *	@param	string	$option						On what the link point to ('nolink', ...)
-     *  @param	int  	$notooltip					1=Disable tooltip
-     *  @param  string  $morecss            		Add more css on link
-     *  @param  int     $save_lastsearch_value    	-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+	 *  @param	int  	$notooltip					1=Disable tooltip
+	 *  @param  string  $morecss            		Add more css on link
+	 *  @param  int     $save_lastsearch_value    	-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
 	 *	@return	string								String with URL
 	 */
-    public function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $morecss = '', $save_lastsearch_value = -1)
+	public function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $morecss = '', $save_lastsearch_value = -1)
 	{
 		global $db, $conf, $langs;
-        global $dolibarr_main_authentication, $dolibarr_main_demo;
-        global $menumanager;
+		global $dolibarr_main_authentication, $dolibarr_main_demo;
+		global $menumanager;
 
-        if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
+		if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
 
-        $result = '';
-        $companylink = '';
+		$result = '';
+		$companylink = '';
 
-        $label = '<u>'.$langs->trans("CompanyPaymentMode").'</u>';
-        $label .= '<br>';
-        $label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref;
+		$label = '<u>'.$langs->trans("CompanyPaymentMode").'</u>';
+		$label .= '<br>';
+		$label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref;
 
-        $url = dol_buildpath('/monmodule/companypaymentmode_card.php', 1).'?id='.$this->id;
+		$url = dol_buildpath('/monmodule/companypaymentmode_card.php', 1).'?id='.$this->id;
 
-        if ($option != 'nolink')
-        {
-	        // Add param to save lastsearch_values or not
-	        $add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
-	        if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
-	        if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
-        }
+		if ($option != 'nolink')
+		{
+			// Add param to save lastsearch_values or not
+			$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
+			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
+			if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
+		}
 
-        $linkclose = '';
-        if (empty($notooltip))
-        {
-            if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-            {
-                $label = $langs->trans("ShowCompanyPaymentMode");
-                $linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
-            }
-            $linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
-            $linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
-        } else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+		$linkclose = '';
+		if (empty($notooltip))
+		{
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+			{
+				$label = $langs->trans("ShowCompanyPaymentMode");
+				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
+			}
+			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
+			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
+		} else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
 		$linkstart = '<a href="'.$url.'"';
 		$linkstart .= $linkclose.'>';
@@ -426,7 +426,7 @@ class CompanyPaymentMode extends CommonObject
 	 * @param	string	$alltypes	1=The default is for all payment types instead of per type
 	 * @return  int             	0 if KO, 1 if OK
 	 */
-    public function setAsDefault($id = 0, $alltypes = 0)
+	public function setAsDefault($id = 0, $alltypes = 0)
 	{
 		$sql1 = "SELECT rowid as id, fk_soc, type FROM ".MAIN_DB_PREFIX."societe_rib";
 		$sql1 .= " WHERE rowid = ".($id ? $id : $this->id);
@@ -480,12 +480,12 @@ class CompanyPaymentMode extends CommonObject
 	 *  @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
 	 *  @return	string 			       Label of status
 	 */
-    public function getLibStatut($mode = 0)
+	public function getLibStatut($mode = 0)
 	{
 		return $this->LibStatut($this->status, $mode);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return the status
 	 *
@@ -518,7 +518,7 @@ class CompanyPaymentMode extends CommonObject
 	 *	@param  int		$id       Id of object
 	 *	@return	void
 	 */
-    public function info($id)
+	public function info($id)
 	{
 		$sql = 'SELECT rowid, date_creation as datec, tms as datem,';
 		$sql .= ' fk_user_creat, fk_user_modif';
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 9078b2146d4..5bca91b0700 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -63,9 +63,9 @@ class Societe extends CommonObject
 	 */
 	public $fk_element = 'fk_soc';
 
-    /**
-     * @var string Fields for combobox
-     */
+	/**
+	 * @var string Fields for combobox
+	 */
 	public $fieldsforcombobox = 'nom,name_alias';
 
 	/**
@@ -245,9 +245,9 @@ class Societe extends CommonObject
 	 */
 	public $name_alias;
 
-    /**
-     * @var int Physical thirdparty not a company
-     */
+	/**
+	 * @var int Physical thirdparty not a company
+	 */
 	public $particulier;
 
 	/**
@@ -255,14 +255,14 @@ class Societe extends CommonObject
 	 */
 	public $address;
 
-    /**
-     * @var string Zip code of thirdparty
-     */
+	/**
+	 * @var string Zip code of thirdparty
+	 */
 	public $zip;
 
-    /**
-     * @var string Town of thirdparty
-     */
+	/**
+	 * @var string Town of thirdparty
+	 */
 	public $town;
 
 	/**
@@ -277,14 +277,14 @@ class Societe extends CommonObject
 	 */
 	public $state_id;
 
-    /**
-     * @var string State code
-     */
+	/**
+	 * @var string State code
+	 */
 	public $state_code;
 
-    /**
-     * @var string State name
-     */
+	/**
+	 * @var string State name
+	 */
 	public $state;
 
 	/**
@@ -293,9 +293,9 @@ class Societe extends CommonObject
 	 */
 	public $region_code;
 
-    /**
-     * @var string Region name
-     */
+	/**
+	 * @var string Region name
+	 */
 	public $region;
 
 	/**
@@ -335,10 +335,10 @@ class Societe extends CommonObject
 	 */
 	public $email;
 
-    /**
-     * @var array array of socialnetworks
-     */
-    public $socialnetworks;
+	/**
+	 * @var array array of socialnetworks
+	 */
+	public $socialnetworks;
 
 	/**
 	 * Skype username
@@ -361,11 +361,11 @@ class Societe extends CommonObject
 	 */
 	public $facebook;
 
-    /**
-     * LinkedIn username
-     * @var string
+	/**
+	 * LinkedIn username
+	 * @var string
 	 * @deprecated
-     */
+	 */
 	public $linkedin;
 
 	/**
@@ -418,9 +418,9 @@ class Societe extends CommonObject
 	 */
 	public $idprof6;
 
-    /**
-     * @var string Prefix comm
-     */
+	/**
+	 * @var string Prefix comm
+	 */
 	public $prefix_comm;
 
 	/**
@@ -440,14 +440,14 @@ class Societe extends CommonObject
 	public $localtax2_assuj;
 	public $localtax2_value;
 
-    /**
-     * @var string Manager
-     */
+	/**
+	 * @var string Manager
+	 */
 	public $managers;
 
-    /**
-     * @var float Capital
-     */
+	/**
+	 * @var float Capital
+	 */
 	public $capital;
 
 	/**
@@ -464,11 +464,11 @@ class Societe extends CommonObject
 	public $remise_supplier_percent;
 	public $mode_reglement_supplier_id;
 	public $cond_reglement_supplier_id;
-    public $transport_mode_supplier_id;
+	public $transport_mode_supplier_id;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_prospectlevel;
 
 	/**
@@ -501,9 +501,6 @@ class Societe extends CommonObject
 	 */
 	public $user_creation;
 
-
-	public $specimen;
-
 	/**
 	 * 0=no customer, 1=customer, 2=prospect, 3=customer and prospect
 	 * @var int
@@ -540,11 +537,11 @@ class Societe extends CommonObject
 	 */
 	public $code_compta;
 
-    /**
-     * Accounting code for client
-     * @var string
-     */
-    public $code_compta_client;
+	/**
+	 * Accounting code for client
+	 * @var string
+	 */
+	public $code_compta_client;
 
 	/**
 	 * Accounting code for suppliers
@@ -605,9 +602,9 @@ class Societe extends CommonObject
 	 */
 	public $order_min_amount;
 
-    /**
-     * @var string Supplier min order amount
-     */
+	/**
+	 * @var string Supplier min order amount
+	 */
 	public $supplier_order_min_amount;
 
 	/**
@@ -666,46 +663,46 @@ class Societe extends CommonObject
 	 */
 	public $webservices_key;
 
-    /**
-     * @var string Logo
-     */
+	/**
+	 * @var string Logo
+	 */
 	public $logo;
 
-    /**
-     * @var string logo small
-     */
+	/**
+	 * @var string logo small
+	 */
 	public $logo_small;
 
-    /**
-     * @var string Logo mini
-     */
+	/**
+	 * @var string Logo mini
+	 */
 	public $logo_mini;
 
-    /**
-     * @var string Logo squarred
-     */
+	/**
+	 * @var string Logo squarred
+	 */
 	public $logo_squarred;
 
-    /**
-     * @var string Logo squarred small
-     */
+	/**
+	 * @var string Logo squarred small
+	 */
 	public $logo_squarred_small;
 
-    /**
-     * @var string Logo squarred mini
-     */
+	/**
+	 * @var string Logo squarred mini
+	 */
 	public $logo_squarred_mini;
 
 
 	// Multicurrency
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_multicurrency;
 
-    /**
-     * @var string Multicurrency code
-     */
+	/**
+	 * @var string Multicurrency code
+	 */
 	public $multicurrency_code;
 
 
@@ -764,7 +761,7 @@ class Societe extends CommonObject
 		$this->tva_assuj = 1;
 		$this->status = 1;
 
-		if (! empty($conf->global->COMPANY_SHOW_ADDRESS_SELECTLIST)) {
+		if (!empty($conf->global->COMPANY_SHOW_ADDRESS_SELECTLIST)) {
 			$this->fields['address']['showoncombobox'] = $conf->global->COMPANY_SHOW_ADDRESS_SELECTLIST;
 			$this->fields['zip']['showoncombobox'] = $conf->global->COMPANY_SHOW_ADDRESS_SELECTLIST;
 			$this->fields['town']['showoncombobox'] = $conf->global->COMPANY_SHOW_ADDRESS_SELECTLIST;
@@ -780,7 +777,7 @@ class Societe extends CommonObject
 	 *    @param	User	$user       Object of user that ask creation
 	 *    @return   int         		>=0 if OK, <0 if KO
 	 */
-    public function create(User $user)
+	public function create(User $user)
 	{
 		global $langs, $conf, $mysoc;
 
@@ -789,8 +786,7 @@ class Societe extends CommonObject
 		// Clean parameters
 		if (empty($this->status)) $this->status = 0;
 		$this->name = $this->name ?trim($this->name) : trim($this->nom);
-		if (!empty($conf->global->MAIN_FIRST_TO_UPPER)) $this->name = ucwords($this->name);
-		if (!empty($conf->global->MAIN_ALL_TO_UPPER)) $this->name = strtoupper($this->name);
+		$this->setUpperOrLowerCase();
 		$this->nom = $this->name; // For backward compatibility
 		if (empty($this->client))      $this->client = 0;
 		if (empty($this->fournisseur)) $this->fournisseur = 0;
@@ -891,16 +887,16 @@ class Societe extends CommonObject
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Create a contact/address from thirdparty
 	 *
 	 * @param 	User	$user		Object user
 	 * @return 	int					<0 if KO, >0 if OK
 	 */
-    public function create_individual(User $user)
+	public function create_individual(User $user)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 		$contact = new Contact($this->db);
 
@@ -936,7 +932,7 @@ class Societe extends CommonObject
 	 *
 	 *    @return     int		0 if OK, <0 if KO
 	 */
-    public function verify()
+	public function verify()
 	{
 		global $conf, $langs, $mysoc;
 
@@ -1080,7 +1076,7 @@ class Societe extends CommonObject
 	 *		@param	int		$nosyncmember				Do not synchronize info of linked member
 	 *      @return int  			           			<0 if KO, >=0 if OK
 	 */
-    public function update($id, $user = '', $call_trigger = 1, $allowmodcodeclient = 0, $allowmodcodefournisseur = 0, $action = 'update', $nosyncmember = 1)
+	public function update($id, $user = '', $call_trigger = 1, $allowmodcodeclient = 0, $allowmodcodefournisseur = 0, $action = 'update', $nosyncmember = 1)
 	{
 		global $langs, $conf, $hookmanager;
 
@@ -1094,8 +1090,6 @@ class Societe extends CommonObject
 
 		$now = dol_now();
 
-		if (!empty($conf->global->MAIN_FIRST_TO_UPPER)) $this->name = ucwords($this->name);
-		if (!empty($conf->global->MAIN_ALL_TO_UPPER)) $this->name = strtoupper($this->name);
 		// Clean parameters
 		$this->id = $id;
 		$this->entity = ((isset($this->entity) && is_numeric($this->entity)) ? $this->entity : $conf->entity);
@@ -1105,7 +1099,8 @@ class Societe extends CommonObject
 		$this->ref_ext		= trim($this->ref_ext);
 		$this->address		= $this->address ?trim($this->address) : trim($this->address);
 		$this->zip = $this->zip ?trim($this->zip) : trim($this->zip);
-		$this->town			= $this->town ?trim($this->town) : trim($this->town);
+		$this->town = $this->town ?trim($this->town) : trim($this->town);
+		$this->setUpperOrLowerCase();
 		$this->state_id = trim($this->state_id);
 		$this->country_id = ($this->country_id > 0) ? $this->country_id : 0;
 		$this->phone		= trim($this->phone);
@@ -1254,8 +1249,8 @@ class Societe extends CommonObject
 
 			$sql .= ",phone = ".(!empty($this->phone) ? "'".$this->db->escape($this->phone)."'" : "null");
 			$sql .= ",fax = ".(!empty($this->fax) ? "'".$this->db->escape($this->fax)."'" : "null");
-            $sql .= ",email = ".(!empty($this->email) ? "'".$this->db->escape($this->email)."'" : "null");
-            $sql .= ", socialnetworks = '".$this->db->escape(json_encode($this->socialnetworks))."'";
+			$sql .= ",email = ".(!empty($this->email) ? "'".$this->db->escape($this->email)."'" : "null");
+			$sql .= ", socialnetworks = '".$this->db->escape(json_encode($this->socialnetworks))."'";
 			$sql .= ",url = ".(!empty($this->url) ? "'".$this->db->escape($this->url)."'" : "null");
 
 			$sql .= ",parent = ".($this->parent > 0 ? $this->parent : "null");
@@ -1308,10 +1303,10 @@ class Societe extends CommonObject
 
 			$sql .= ",mode_reglement = ".(!empty($this->mode_reglement_id) ? "'".$this->db->escape($this->mode_reglement_id)."'" : "null");
 			$sql .= ",cond_reglement = ".(!empty($this->cond_reglement_id) ? "'".$this->db->escape($this->cond_reglement_id)."'" : "null");
-			$sql .= ",transport_mode = ".(! empty($this->transport_mode_id) ? "'".$this->db->escape($this->transport_mode_id)."'" : "null");
-            $sql .= ",mode_reglement_supplier = ".(!empty($this->mode_reglement_supplier_id) ? "'".$this->db->escape($this->mode_reglement_supplier_id)."'" : "null");
+			$sql .= ",transport_mode = ".(!empty($this->transport_mode_id) ? "'".$this->db->escape($this->transport_mode_id)."'" : "null");
+			$sql .= ",mode_reglement_supplier = ".(!empty($this->mode_reglement_supplier_id) ? "'".$this->db->escape($this->mode_reglement_supplier_id)."'" : "null");
 			$sql .= ",cond_reglement_supplier = ".(!empty($this->cond_reglement_supplier_id) ? "'".$this->db->escape($this->cond_reglement_supplier_id)."'" : "null");
-			$sql .= ",transport_mode_supplier = ".(! empty($this->transport_mode_supplier_id)? "'".$this->db->escape($this->transport_mode_supplier_id)."'" : "null");
+			$sql .= ",transport_mode_supplier = ".(!empty($this->transport_mode_supplier_id) ? "'".$this->db->escape($this->transport_mode_supplier_id)."'" : "null");
 			$sql .= ",fk_shipping_method = ".(!empty($this->shipping_method_id) ? "'".$this->db->escape($this->shipping_method_id)."'" : "null");
 
 			$sql .= ",client = ".(!empty($this->client) ? $this->client : 0);
@@ -1511,8 +1506,10 @@ class Societe extends CommonObject
 		$sql .= ', s.fk_forme_juridique as forme_juridique_code';
 		$sql .= ', s.webservices_url, s.webservices_key';
 		$sql .= ', s.code_client, s.code_fournisseur, s.code_compta, s.code_compta_fournisseur, s.parent, s.barcode';
-		$sql .= ', s.fk_departement as state_id, s.fk_pays as country_id, s.fk_stcomm, s.remise_supplier, s.mode_reglement, s.cond_reglement, s.fk_account, s.tva_assuj';
-		$sql .= ', s.mode_reglement_supplier, s.cond_reglement_supplier, s.localtax1_assuj, s.localtax1_value, s.localtax2_assuj, s.localtax2_value, s.fk_prospectlevel, s.default_lang, s.logo, s.logo_squarred';
+		$sql .= ', s.fk_departement as state_id, s.fk_pays as country_id, s.fk_stcomm, s.remise_supplier, s.mode_reglement, s.cond_reglement, s.transport_mode';
+		$sql .= ', s.fk_account, s.tva_assuj';
+		$sql .= ', s.mode_reglement_supplier, s.cond_reglement_supplier, s.transport_mode_supplier';
+		$sql .= ', s.localtax1_assuj, s.localtax1_value, s.localtax2_assuj, s.localtax2_value, s.fk_prospectlevel, s.default_lang, s.logo, s.logo_squarred';
 		$sql .= ', s.fk_shipping_method';
 		$sql .= ', s.outstanding_limit, s.import_key, s.canvas, s.fk_incoterms, s.location_incoterms';
 		$sql .= ', s.order_min_amount, s.supplier_order_min_amount';
@@ -1593,9 +1590,9 @@ class Societe extends CommonObject
 				$label = ($transcode != 'StatusProspect'.$obj->fk_stcomm ? $transcode : $obj->stcomm);
 				$this->stcomm_id = $obj->fk_stcomm; // id status prospect
 				$this->status_prospect_label = $label; // label status prospect
-				$this->stcomm_picto = $obj->stcomm_picto;     // picto statut commercial
+				$this->stcomm_picto = $obj->stcomm_picto; // picto statut commercial
 
-                $this->email = $obj->email;
+				$this->email = $obj->email;
 				$this->socialnetworks = (array) json_decode($obj->socialnetworks, true);
 
 				$this->url = $obj->url;
@@ -1652,12 +1649,12 @@ class Societe extends CommonObject
 				$this->transport_mode_id 	= $obj->transport_mode;
 				$this->mode_reglement_supplier_id 	= $obj->mode_reglement_supplier;
 				$this->cond_reglement_supplier_id 	= $obj->cond_reglement_supplier;
-				$this->transport_mode_supplier_id	= $obj->transport_mode_supplier;
-				$this->shipping_method_id			= ($obj->fk_shipping_method > 0) ? $obj->fk_shipping_method : null;
-				$this->fk_account	= $obj->fk_account;
+				$this->transport_mode_supplier_id = $obj->transport_mode_supplier;
+				$this->shipping_method_id = ($obj->fk_shipping_method > 0) ? $obj->fk_shipping_method : null;
+				$this->fk_account = $obj->fk_account;
 
-				$this->client		= $obj->client;
-				$this->fournisseur	= $obj->fournisseur;
+				$this->client = $obj->client;
+				$this->fournisseur = $obj->fournisseur;
 
 				$this->note = $obj->note_private; // TODO Deprecated for backward comtability
 				$this->note_private = $obj->note_private;
@@ -1718,7 +1715,7 @@ class Societe extends CommonObject
 	 *    @param    int		$call_trigger   0=No, 1=yes
 	 *    @return	int						<0 if KO, 0 if nothing done, >0 if OK
 	 */
-    public function delete($id, User $fuser = null, $call_trigger = 1)
+	public function delete($id, User $fuser = null, $call_trigger = 1)
 	{
 		global $langs, $conf, $user;
 
@@ -1776,11 +1773,11 @@ class Societe extends CommonObject
 			{
 				foreach ($this->childtablesoncascade as $tabletodelete)
 				{
-					$deleteFromObject=explode(':', $tabletodelete);
-					if (count($deleteFromObject)>=2) {
-						$className=str_replace('@', '', $deleteFromObject[0]);
-						$filepath=$deleteFromObject[1];
-						$columnName=$deleteFromObject[2];
+					$deleteFromObject = explode(':', $tabletodelete);
+					if (count($deleteFromObject) >= 2) {
+						$className = str_replace('@', '', $deleteFromObject[0]);
+						$filepath = $deleteFromObject[1];
+						$columnName = $deleteFromObject[2];
 						if (dol_include_once($filepath)) {
 							$child_object = new $className($this->db);
 							$result = $child_object->deleteByParentField($id, $columnName);
@@ -1791,12 +1788,12 @@ class Societe extends CommonObject
 							}
 						} else {
 							$error++;
-							$this->errors[] = 'Cannot include child class file ' .$filepath;
+							$this->errors[] = 'Cannot include child class file '.$filepath;
 							break;
 						}
 					} else {
-						$sql = "DELETE FROM " . MAIN_DB_PREFIX . $tabletodelete;
-						$sql .= " WHERE fk_soc = " . $id;
+						$sql = "DELETE FROM ".MAIN_DB_PREFIX.$tabletodelete;
+						$sql .= " WHERE fk_soc = ".$id;
 						if (!$this->db->query($sql)) {
 							$error++;
 							$this->errors[] = $this->db->lasterror();
@@ -1866,15 +1863,15 @@ class Societe extends CommonObject
 		return 0;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Define third party as a customer
 	 *
 	 *	@return		int		<0 if KO, >0 if OK
 	 */
-    public function set_as_client()
+	public function set_as_client()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		if ($this->id)
 		{
 			$newclient = 1;
@@ -1902,9 +1899,9 @@ class Societe extends CommonObject
 	 *  @param  User	$user		User who sets the discount
 	 *	@return	int					<0 if KO, >0 if OK
 	 */
-    public function set_remise_client($remise, $note, User $user)
+	public function set_remise_client($remise, $note, User $user)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $langs;
 
 		// Parameter cleaning
@@ -1965,9 +1962,9 @@ class Societe extends CommonObject
 	 *  @param  User	$user		User who sets the discount
 	 *	@return	int					<0 if KO, >0 if OK
 	 */
-    public function set_remise_supplier($remise, $note, User $user)
+	public function set_remise_supplier($remise, $note, User $user)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $langs;
 
 		// Parameter cleaning
@@ -2019,7 +2016,7 @@ class Societe extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *    	Add a discount for third party
 	 *
@@ -2030,9 +2027,9 @@ class Societe extends CommonObject
 	 *      @param	int		$discount_type	0 => customer discount, 1 => supplier discount
 	 *		@return	int						<0 if KO, id of discount record if OK
 	 */
-    public function set_remise_except($remise, User $user, $desc, $vatrate = '', $discount_type = 0)
+	public function set_remise_except($remise, User $user, $desc, $vatrate = '', $discount_type = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 
 		// Clean parameters
@@ -2098,7 +2095,7 @@ class Societe extends CommonObject
 	 * 	@param	int		$discount_type	0 => customer discount, 1 => supplier discount
 	 *	@return	int					<0 if KO, Credit note amount otherwise
 	 */
-    public function getAvailableDiscounts($user = '', $filter = '', $maxvalue = 0, $discount_type = 0)
+	public function getAvailableDiscounts($user = '', $filter = '', $maxvalue = 0, $discount_type = 0)
 	{
 		require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
 
@@ -2122,7 +2119,7 @@ class Societe extends CommonObject
 	 *  @param	string		$sortorder		Sort order, separated by comma. Example: 'ASC,DESC';
 	 *  @return array       				Array of sales representatives of third party
 	 */
-    public function getSalesRepresentatives(User $user, $mode = 0, $sortfield = null, $sortorder = null)
+	public function getSalesRepresentatives(User $user, $mode = 0, $sortfield = null, $sortorder = null)
 	{
 		global $conf;
 
@@ -2179,7 +2176,7 @@ class Societe extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Set the price level
 	 *
@@ -2187,9 +2184,9 @@ class Societe extends CommonObject
 	 * @param 	User	$user			Use making change
 	 * @return	int						<0 if KO, >0 if OK
 	 */
-    public function set_price_level($price_level, User $user)
+	public function set_price_level($price_level, User $user)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		if ($this->id)
 		{
 			$now = dol_now();
@@ -2218,7 +2215,7 @@ class Societe extends CommonObject
 		return -1;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Add link to sales representative
 	 *
@@ -2226,67 +2223,67 @@ class Societe extends CommonObject
 	 *	@param	int		$commid		Id of user
 	 *	@return	int					<=0 if KO, >0 if OK
 	 */
-    public function add_commercial(User $user, $commid)
+	public function add_commercial(User $user, $commid)
 	{
 		// phpcs:enable
 		$error = 0;
 
 		if ($this->id > 0 && $commid > 0)
 		{
-		    $this->db->begin();
+			$this->db->begin();
 
-		    if (!$error)
-		    {
-    			$sql = "DELETE FROM  ".MAIN_DB_PREFIX."societe_commerciaux";
-    			$sql .= " WHERE fk_soc = ".$this->id." AND fk_user =".$commid;
+			if (!$error)
+			{
+				$sql = "DELETE FROM  ".MAIN_DB_PREFIX."societe_commerciaux";
+				$sql .= " WHERE fk_soc = ".$this->id." AND fk_user =".$commid;
 
-    			$resql = $this->db->query($sql);
-    			if (!$resql)
-    			{
-    			    dol_syslog(get_class($this)."::add_commercial Error ".$this->db->lasterror());
-    			    $error++;
-    			}
-		    }
+				$resql = $this->db->query($sql);
+				if (!$resql)
+				{
+					dol_syslog(get_class($this)."::add_commercial Error ".$this->db->lasterror());
+					$error++;
+				}
+			}
 
-		    if (!$error)
-    		{
-    			$sql = "INSERT INTO ".MAIN_DB_PREFIX."societe_commerciaux";
-    			$sql .= " (fk_soc, fk_user)";
-    			$sql .= " VALUES (".$this->id.", ".$commid.")";
+			if (!$error)
+			{
+				$sql = "INSERT INTO ".MAIN_DB_PREFIX."societe_commerciaux";
+				$sql .= " (fk_soc, fk_user)";
+				$sql .= " VALUES (".$this->id.", ".$commid.")";
 
-    			$resql = $this->db->query($sql);
-    			if (!$resql)
-    			{
-    				dol_syslog(get_class($this)."::add_commercial Error ".$this->db->lasterror());
-                    $error++;
-    			}
-    		}
+				$resql = $this->db->query($sql);
+				if (!$resql)
+				{
+					dol_syslog(get_class($this)."::add_commercial Error ".$this->db->lasterror());
+					$error++;
+				}
+			}
 
 			if (!$error)
 			{
 				$this->context = array('commercial_modified'=>$commid);
 
 				$result = $this->call_trigger('COMPANY_LINK_SALE_REPRESENTATIVE', $user);
-                if ($result < 0)
-                {
-                    $error++;
-                }
+				if ($result < 0)
+				{
+					$error++;
+				}
 			}
 
 			if (!$error)
 			{
-                $this->db->commit();
-                return 1;
+				$this->db->commit();
+				return 1;
 			} else {
-			    $this->db->rollback();
-			    return -1;
+				$this->db->rollback();
+				return -1;
 			}
 		}
 
 		return 0;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Add link to sales representative
 	 *
@@ -2294,14 +2291,14 @@ class Societe extends CommonObject
 	 *	@param	int		$commid		Id of user
 	 *	@return	void
 	 */
-    public function del_commercial(User $user, $commid)
+	public function del_commercial(User $user, $commid)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$error = 0;
 		$this->context = array('commercial_modified'=>$commid);
 
 		$result = $this->call_trigger('COMPANY_UNLINK_SALE_REPRESENTATIVE', $user);
-        if ($result < 0) $error++;
+		if ($result < 0) $error++;
 
 		if ($this->id > 0 && $commid > 0)
 		{
@@ -2326,7 +2323,7 @@ class Societe extends CommonObject
 	 *      @param  int     $save_lastsearch_value    -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
 	 *		@return	string					          String with URL
 	 */
-    public function getNomUrl($withpicto = 0, $option = '', $maxlen = 0, $notooltip = 0, $save_lastsearch_value = -1)
+	public function getNomUrl($withpicto = 0, $option = '', $maxlen = 0, $notooltip = 0, $save_lastsearch_value = -1)
 	{
 		global $conf, $langs, $hookmanager;
 
@@ -2334,27 +2331,19 @@ class Societe extends CommonObject
 
 		$name = $this->name ? $this->name : $this->nom;
 
-        if (!empty($conf->global->SOCIETE_ON_SEARCH_AND_LIST_GO_ON_CUSTOMER_OR_SUPPLIER_CARD)) {
-            if (empty($option) && $this->client > 0) $option = 'customer';
-            if (empty($option) && $this->fournisseur > 0) $option = 'supplier';
-        }
+		if (!empty($conf->global->SOCIETE_ON_SEARCH_AND_LIST_GO_ON_CUSTOMER_OR_SUPPLIER_CARD)) {
+			if (empty($option) && $this->client > 0) $option = 'customer';
+			if (empty($option) && $this->fournisseur > 0) $option = 'supplier';
+		}
 
 		if (!empty($conf->global->SOCIETE_ADD_REF_IN_LIST) && (!empty($withpicto)))
 		{
 			$code = '';
-			if (($this->client) && (!empty($this->code_client))
-				&& ($conf->global->SOCIETE_ADD_REF_IN_LIST == 1 || $conf->global->SOCIETE_ADD_REF_IN_LIST == 2
-				)
-			)
-			{
+			if (($this->client) && (!empty($this->code_client)) && ($conf->global->SOCIETE_ADD_REF_IN_LIST == 1 || $conf->global->SOCIETE_ADD_REF_IN_LIST == 2)) {
 				$code = $this->code_client.' - ';
 			}
 
-			if (($this->fournisseur) && (!empty($this->code_fournisseur))
-				&& ($conf->global->SOCIETE_ADD_REF_IN_LIST == 1 || $conf->global->SOCIETE_ADD_REF_IN_LIST == 3
-				)
-			)
-			{
+			if (($this->fournisseur) && (!empty($this->code_fournisseur)) && ($conf->global->SOCIETE_ADD_REF_IN_LIST == 1 || $conf->global->SOCIETE_ADD_REF_IN_LIST == 3)) {
 				$code .= $this->code_fournisseur.' - ';
 			}
 
@@ -2388,44 +2377,47 @@ class Societe extends CommonObject
 
 		if ($option == 'customer' || $option == 'compta' || $option == 'category')
 		{
-			$label .= img_picto('', $this->picto).' <u>'.$langs->trans("Customer").'</u>';
-		    $linkstart = '<a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$this->id;
+			$label .= img_picto('', $this->picto).' <u class="paddingrightonly">'.$langs->trans("Customer").'</u>';
+			$linkstart = '<a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$this->id;
 		} elseif ($option == 'prospect' && empty($conf->global->SOCIETE_DISABLE_PROSPECTS))
 		{
-			$label .= img_picto('', $this->picto).' <u>'.$langs->trans("Prospect").'</u>';
+			$label .= img_picto('', $this->picto).' <u class="paddingrightonly">'.$langs->trans("Prospect").'</u>';
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$this->id;
 		} elseif ($option == 'supplier' || $option == 'category_supplier')
 		{
-			$label .= img_picto('', $this->picto).' <u>'.$langs->trans("Supplier").'</u>';
+			$label .= img_picto('', $this->picto).' <u class="paddingrightonly">'.$langs->trans("Supplier").'</u>';
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/fourn/card.php?socid='.$this->id;
 		} elseif ($option == 'agenda')
 		{
-			$label .= img_picto('', $this->picto).' <u>'.$langs->trans("ThirdParty").'</u>';
+			$label .= img_picto('', $this->picto).' <u class="paddingrightonly">'.$langs->trans("ThirdParty").'</u>';
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/societe/agenda.php?socid='.$this->id;
 		} elseif ($option == 'project')
 		{
-			$label .= img_picto('', $this->picto).' <u>'.$langs->trans("ThirdParty").'</u>';
+			$label .= img_picto('', $this->picto).' <u class="paddingrightonly">'.$langs->trans("ThirdParty").'</u>';
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/societe/project.php?socid='.$this->id;
 		} elseif ($option == 'margin')
 		{
-			$label .= img_picto('', $this->picto).' <u>'.$langs->trans("ThirdParty").'</u>';
+			$label .= img_picto('', $this->picto).' <u class="paddingrightonly">'.$langs->trans("ThirdParty").'</u>';
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/margin/tabs/thirdpartyMargins.php?socid='.$this->id.'&type=1';
 		} elseif ($option == 'contact')
 		{
-			$label .= img_picto('', $this->picto).' <u>'.$langs->trans("ThirdParty").'</u>';
+			$label .= img_picto('', $this->picto).' <u class="paddingrightonly">'.$langs->trans("ThirdParty").'</u>';
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/societe/contact.php?socid='.$this->id;
 		} elseif ($option == 'ban')
 		{
-			$label .= img_picto('', $this->picto).' <u>'.$langs->trans("ThirdParty").'</u>';
+			$label .= img_picto('', $this->picto).' <u class="paddingrightonly">'.$langs->trans("ThirdParty").'</u>';
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/societe/paymentmodes.php?socid='.$this->id;
 		}
 
 		// By default
 		if (empty($linkstart))
 		{
-			$label .= img_picto('', $this->picto).' <u>'.$langs->trans("ThirdParty").'</u>';
+			$label .= img_picto('', $this->picto).' <u class="paddingrightonly">'.$langs->trans("ThirdParty").'</u>';
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/societe/card.php?socid='.$this->id;
 		}
+		if (isset($this->status)) {
+			$label .= ' '.$this->getLibStatut(5);
+		}
 
 		if (!empty($this->name))
 		{
@@ -2454,9 +2446,6 @@ class Societe extends CommonObject
 			$label .= '<br><b>'.$langs->trans('CustomerAccountancyCode').':</b> '.($this->code_compta ? $this->code_compta : $this->code_compta_client);
 		if (!empty($conf->accounting->enabled) && $this->fournisseur)
 			$label .= '<br><b>'.$langs->trans('SupplierAccountancyCode').':</b> '.$this->code_compta_fournisseur;
-		if (isset($this->status)) {
-			$label .= '<br><b>'.$langs->trans("Status").":</b> ".$this->getLibStatut(5);
-		}
 		$label .= '</div>';
 
 		// Add type of canvas
@@ -2524,7 +2513,7 @@ class Societe extends CommonObject
 	 *    @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
 	 *    @return   string     	   		Label of status
 	 */
-    public function getLibStatut($mode = 0)
+	public function getLibStatut($mode = 0)
 	{
 		return $this->LibStatut($this->status, $mode);
 	}
@@ -2537,9 +2526,9 @@ class Societe extends CommonObject
 	 *  @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
 	 *  @return	string          		Status label
 	 */
-    public function LibStatut($status, $mode = 0)
+	public function LibStatut($status, $mode = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 		$langs->load('companies');
 
@@ -2555,18 +2544,18 @@ class Societe extends CommonObject
 		}
 
 		return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode);
-    }
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *    Return list of contacts emails existing for third party
 	 *
 	 *	  @param	  int		$addthirdparty		1=Add also a record for thirdparty email
 	 *    @return     array       					Array of contacts emails
 	 */
-    public function thirdparty_and_contact_email_array($addthirdparty = 0)
+	public function thirdparty_and_contact_email_array($addthirdparty = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 
 		$contact_emails = $this->contact_property_array('email', 1);
@@ -2579,15 +2568,15 @@ class Societe extends CommonObject
 		return $contact_emails;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *    Return list of contacts mobile phone existing for third party
 	 *
 	 *    @return     array       Array of contacts emails
 	 */
-    public function thirdparty_and_contact_phone_array()
+	public function thirdparty_and_contact_phone_array()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 
 		$contact_phone = $this->contact_property_array('mobile');
@@ -2601,7 +2590,7 @@ class Societe extends CommonObject
 		return $contact_phone;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return list of contacts emails or mobile existing for third party
 	 *
@@ -2609,9 +2598,9 @@ class Societe extends CommonObject
 	 * 	@param	int		$hidedisabled		1=Hide contact if disabled
 	 *  @return array       				Array of contacts emails or mobile. Example: array(id=>'Name <email>')
 	 */
-    public function contact_property_array($mode = 'email', $hidedisabled = 0)
+	public function contact_property_array($mode = 'email', $hidedisabled = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 
 		$contact_property = array();
@@ -2674,9 +2663,9 @@ class Societe extends CommonObject
 	 *
 	 *    @return     array      array of contacts
 	 */
-    public function contact_array()
+	public function contact_array()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$contacts = array();
 
 		$sql = "SELECT rowid, lastname, firstname FROM ".MAIN_DB_PREFIX."socpeople WHERE fk_soc = ".$this->id;
@@ -2706,9 +2695,9 @@ class Societe extends CommonObject
 	 *
 	 *    @return    array    $contacts    array of contacts
 	 */
-    public function contact_array_objects()
+	public function contact_array_objects()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 		$contacts = array();
 
@@ -2735,7 +2724,7 @@ class Societe extends CommonObject
 		return $contacts;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return property of contact from its id
 	 *
@@ -2743,9 +2732,9 @@ class Societe extends CommonObject
 	 *  @param  string	$mode       'email' or 'mobile'
 	 *  @return string  			Email of contact with format: "Full name <email>"
 	 */
-    public function contact_get_property($rowid, $mode)
+	public function contact_get_property($rowid, $mode)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$contact_property = '';
 
 		if (empty($rowid)) return '';
@@ -2773,16 +2762,16 @@ class Societe extends CommonObject
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return bank number property of thirdparty (label or rum)
 	 *
 	 *	@param	string	$mode	'label' or 'rum' or 'format'
 	 *  @return	string			Bank label or RUM or '' if no bank account found
 	 */
-    public function display_rib($mode = 'label')
+	public function display_rib($mode = 'label')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		require_once DOL_DOCUMENT_ROOT.'/societe/class/companybankaccount.class.php';
 
 		$bac = new CompanyBankAccount($this->db);
@@ -2809,15 +2798,15 @@ class Societe extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Return Array of RIB
 	 *
 	 * @return     array|int        0 if KO, Array of CompanyBanckAccount if OK
 	 */
-    public function get_all_rib()
+	public function get_all_rib()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		require_once DOL_DOCUMENT_ROOT.'/societe/class/companybankaccount.class.php';
 		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe_rib WHERE type='ban' AND fk_soc = ".$this->id;
 		$result = $this->db->query($sql);
@@ -2848,9 +2837,9 @@ class Societe extends CommonObject
 	 *	@param	int			$type		Should be 0 to say customer
 	 *  @return void
 	 */
-    public function get_codeclient($objsoc = 0, $type = 0)
+	public function get_codeclient($objsoc = 0, $type = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 		if (!empty($conf->global->SOCIETE_CODECLIENT_ADDON))
 		{
@@ -2880,9 +2869,9 @@ class Societe extends CommonObject
 	 *	@param	int			$type		Should be 1 to say supplier
 	 *  @return void
 	 */
-    public function get_codefournisseur($objsoc = 0, $type = 1)
+	public function get_codefournisseur($objsoc = 0, $type = 1)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 		if (!empty($conf->global->SOCIETE_CODECLIENT_ADDON))
 		{
@@ -2909,9 +2898,9 @@ class Societe extends CommonObject
 	 *
 	 *    @return     int		0=No, 1=Yes
 	 */
-    public function codeclient_modifiable()
+	public function codeclient_modifiable()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 		if (!empty($conf->global->SOCIETE_CODECLIENT_ADDON))
 		{
@@ -2943,9 +2932,9 @@ class Societe extends CommonObject
 	 *
 	 *    @return     int		0=No, 1=Yes
 	 */
-    public function codefournisseur_modifiable()
+	public function codefournisseur_modifiable()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 		if (!empty($conf->global->SOCIETE_CODECLIENT_ADDON))
 		{
@@ -2971,7 +2960,7 @@ class Societe extends CommonObject
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Check customer code
 	 *
@@ -2981,9 +2970,9 @@ class Societe extends CommonObject
 	 * 								-3 ErrorCustomerCodeAlreadyUsed
 	 * 								-4 ErrorPrefixRequired
 	 */
-    public function check_codeclient()
+	public function check_codeclient()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 		if (!empty($conf->global->SOCIETE_CODECLIENT_ADDON))
 		{
@@ -3010,7 +2999,7 @@ class Societe extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *    Check supplier code
 	 *
@@ -3020,9 +3009,9 @@ class Societe extends CommonObject
 	 * 							-3 ErrorCustomerCodeAlreadyUsed
 	 * 							-4 ErrorPrefixRequired
 	 */
-    public function check_codefournisseur()
+	public function check_codefournisseur()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 		if (!empty($conf->global->SOCIETE_CODECLIENT_ADDON))
 		{
@@ -3058,9 +3047,9 @@ class Societe extends CommonObject
 	 *    	@param	string	$type		Type of thirdparty ('customer' or 'supplier')
 	 *		@return	int					0 if OK, <0 if $type is not valid
 	 */
-    public function get_codecompta($type)
+	public function get_codecompta($type)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 		if (!empty($conf->global->SOCIETE_CODECOMPTA_ADDON))
@@ -3097,16 +3086,16 @@ class Societe extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *    Define parent commany of current company
 	 *
 	 *    @param	int		$id     Id of thirdparty to set or '' to remove
 	 *    @return	int     		<0 if KO, >0 if OK
 	 */
-    public function set_parent($id)
+	public function set_parent($id)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		if ($this->id)
 		{
 			$sql = "UPDATE ".MAIN_DB_PREFIX."societe";
@@ -3124,16 +3113,16 @@ class Societe extends CommonObject
 		} else return -1;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Returns if a profid sould be verified
 	 *
 	 *  @param	int		$idprof		1,2,3,4,5,6 (Exemple: 1=siren,2=siret,3=naf,4=rcs/rm,5=idprof5,6=idprof6)
 	 *  @return boolean         	true , false
 	 */
-    public function id_prof_verifiable($idprof)
+	public function id_prof_verifiable($idprof)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 	 	switch ($idprof)
@@ -3163,7 +3152,7 @@ class Societe extends CommonObject
 		return $ret;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *    Verify if a profid exists into database for others thirds
 	 *
@@ -3172,9 +3161,9 @@ class Societe extends CommonObject
 	 *    @param	int		$socid		Id of thirdparty to exclude (if update)
 	 *    @return   boolean				True if exists, False if not
 	 */
-    public function id_prof_exists($idprof, $value, $socid = 0)
+	public function id_prof_exists($idprof, $value, $socid = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$field = $idprof;
 
 	 	switch ($idprof)	// For backward compatibility
@@ -3230,9 +3219,9 @@ class Societe extends CommonObject
 	 *  @return int             			<=0 if KO, >0 if OK
 	 *  TODO better to have this in a lib than into a business class
 	 */
-    public function id_prof_check($idprof, $soc)
+	public function id_prof_check($idprof, $soc)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 		$ok = 1;
@@ -3369,7 +3358,7 @@ class Societe extends CommonObject
 		return $ok;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *   Return an url to check online a professional id or empty string
 	 *
@@ -3378,9 +3367,9 @@ class Societe extends CommonObject
 	 *   @return	string          		Url or empty string if no URL known
 	 *   TODO better in a lib than into business class
 	 */
-    public function id_prof_url($idprof, $thirdparty)
+	public function id_prof_url($idprof, $thirdparty)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $langs, $hookmanager;
 
 		$url = '';
@@ -3395,7 +3384,7 @@ class Societe extends CommonObject
 			}
 
 			// TODO Move links to validate professional ID into a dictionary table "country" + "link"
-            $strippedIdProf1 = str_replace(' ', '', $thirdparty->idprof1);
+			$strippedIdProf1 = str_replace(' ', '', $thirdparty->idprof1);
 			if ($idprof == 1 && $thirdparty->country_code == 'FR') {
 				$url = 'http://www.societe.com/cgi-bin/search?champs='.$strippedIdProf1; // See also http://avis-situation-sirene.insee.fr/
 			}
@@ -3428,9 +3417,9 @@ class Societe extends CommonObject
 	 *
 	 *   @return     bool	   true if the company has projects, false otherwise
 	 */
-    public function has_projects()
+	public function has_projects()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$sql = 'SELECT COUNT(*) as numproj FROM '.MAIN_DB_PREFIX.'projet WHERE fk_soc = '.$this->id;
 		$resql = $this->db->query($sql);
 		if ($resql)
@@ -3452,7 +3441,7 @@ class Societe extends CommonObject
 	 *  @param  int		$id     Id of thirdparty to load
 	 *  @return	void
 	 */
-    public function info($id)
+	public function info($id)
 	{
 		$sql = "SELECT s.rowid, s.nom as name, s.datec as date_creation, tms as date_modification,";
 		$sql .= " fk_user_creat, fk_user_modif";
@@ -3496,7 +3485,7 @@ class Societe extends CommonObject
 	 *
 	 *  @return    boolean     true=is a company, false=a and user
 	 */
-    public function isACompany()
+	public function isACompany()
 	{
 		global $conf;
 
@@ -3521,7 +3510,7 @@ class Societe extends CommonObject
 	 *
 	 *  @return     boolean		true = country inside EEC, false = country outside EEC
 	 */
-    public function isInEEC()
+	public function isInEEC()
 	{
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 		return isInEEC($this);
@@ -3533,9 +3522,9 @@ class Societe extends CommonObject
 	 *
 	 *  @return    int      0 if success, <> 0 if error
 	 */
-    public function LoadSupplierCateg()
+	public function LoadSupplierCateg()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$this->SupplierCategories = array();
 		$sql = "SELECT rowid, label";
 		$sql .= " FROM ".MAIN_DB_PREFIX."categorie";
@@ -3554,16 +3543,16 @@ class Societe extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Insert link supplier - category
 	 *
 	 *	@param	int		$categorie_id		Id of category
 	 *  @return int      					0 if success, <> 0 if error
 	 */
-    public function AddFournisseurInCategory($categorie_id)
+	public function AddFournisseurInCategory($categorie_id)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		if ($categorie_id > 0 && $this->id > 0)
 		{
 			$sql = "INSERT INTO ".MAIN_DB_PREFIX."categorie_fournisseur (fk_categorie, fk_soc) ";
@@ -3577,7 +3566,7 @@ class Societe extends CommonObject
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Create a third party into database from a member object
 	 *
@@ -3587,9 +3576,9 @@ class Societe extends CommonObject
 	 *  @param	string		$customercode	Customer code
 	 *  @return int							<0 if KO, id of created account if OK
 	 */
-    public function create_from_member(Adherent $member, $socname = '', $socalias = '', $customercode = '')
+	public function create_from_member(Adherent $member, $socname = '', $socalias = '', $customercode = '')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $user, $langs;
 
 		dol_syslog(get_class($this)."::create_from_member", LOG_DEBUG);
@@ -3610,7 +3599,7 @@ class Societe extends CommonObject
 		$this->country_id = $member->country_id;
 		$this->phone = $member->phone; // Prof phone
 		$this->email = $member->email;
-        $this->socialnetworks = $member->socialnetworks;
+		$this->socialnetworks = $member->socialnetworks;
 		$this->entity = $member->entity;
 
 		$this->client = 1; // A member is a customer by default
@@ -3653,7 +3642,7 @@ class Societe extends CommonObject
 	 * 	@param	Conf	$conf		Conf object (possibility to use another entity)
 	 * 	@return	void
 	 */
-    public function setMysoc(Conf $conf)
+	public function setMysoc(Conf $conf)
 	{
 		global $langs;
 
@@ -3728,12 +3717,12 @@ class Societe extends CommonObject
 		$this->youtube_url = empty($conf->global->MAIN_INFO_SOCIETE_YOUTUBE_URL) ? '' : $conf->global->MAIN_INFO_SOCIETE_YOUTUBE_URL;
 		$this->github_url = empty($conf->global->MAIN_INFO_SOCIETE_GITHUB_URL) ? '' : $conf->global->MAIN_INFO_SOCIETE_GITHUB_URL;
 		$this->socialnetworks = array();
-		if (! empty($this->facebook_url)) $this->socialnetworks['facebook'] = $this->facebook_url;
-		if (! empty($this->twitter_url)) $this->socialnetworks['twitter'] = $this->twitter_url;
-		if (! empty($this->linkedin_url)) $this->socialnetworks['linkedin'] = $this->linkedin_url;
-		if (! empty($this->instagram_url)) $this->socialnetworks['instagram'] = $this->instagram_url;
-		if (! empty($this->youtube_url)) $this->socialnetworks['youtube'] = $this->youtube_url;
-		if (! empty($this->github_url)) $this->socialnetworks['github'] = $this->github_url;
+		if (!empty($this->facebook_url)) $this->socialnetworks['facebook'] = $this->facebook_url;
+		if (!empty($this->twitter_url)) $this->socialnetworks['twitter'] = $this->twitter_url;
+		if (!empty($this->linkedin_url)) $this->socialnetworks['linkedin'] = $this->linkedin_url;
+		if (!empty($this->instagram_url)) $this->socialnetworks['instagram'] = $this->instagram_url;
+		if (!empty($this->youtube_url)) $this->socialnetworks['youtube'] = $this->youtube_url;
+		if (!empty($this->github_url)) $this->socialnetworks['github'] = $this->github_url;
 
 		// Id prof generiques
 		$this->idprof1 = empty($conf->global->MAIN_INFO_SIREN) ? '' : $conf->global->MAIN_INFO_SIREN;
@@ -3770,7 +3759,7 @@ class Societe extends CommonObject
 	 *
 	 *  @return	int >0 if ok
 	 */
-    public function initAsSpecimen()
+	public function initAsSpecimen()
 	{
 		$now = dol_now();
 
@@ -3826,7 +3815,7 @@ class Societe extends CommonObject
 	 *	@param		int		$localTaxNum	To get info for only localtax1 or localtax2
 	 *  @return		boolean					true or false
 	 */
-    public function useLocalTax($localTaxNum = 0)
+	public function useLocalTax($localTaxNum = 0)
 	{
 		$sql  = "SELECT t.localtax1, t.localtax2";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
@@ -3848,7 +3837,7 @@ class Societe extends CommonObject
 	 *
 	 *  @return		boolean					true or false
 	 */
-    public function useNPR()
+	public function useNPR()
 	{
 		$sql  = "SELECT t.rowid";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
@@ -3869,7 +3858,7 @@ class Societe extends CommonObject
 	 *
 	 *  @return		boolean			true or false
 	 */
-    public function useRevenueStamp()
+	public function useRevenueStamp()
 	{
 		$sql  = "SELECT COUNT(*) as nb";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_revenuestamp as r, ".MAIN_DB_PREFIX."c_country as c";
@@ -3893,21 +3882,21 @@ class Societe extends CommonObject
 	 *
 	 *  @return     string        Libelle
 	 */
-    public function getLibProspLevel()
+	public function getLibProspLevel()
 	{
 		return $this->LibProspLevel($this->fk_prospectlevel);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return label of prospect level
 	 *
 	 *  @param	int		$fk_prospectlevel   	Prospect level
 	 *  @return string        					label of level
 	 */
-    public function LibProspLevel($fk_prospectlevel)
+	public function LibProspLevel($fk_prospectlevel)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 
 		$lib = $langs->trans("ProspectLevel".$fk_prospectlevel);
@@ -3928,9 +3917,9 @@ class Societe extends CommonObject
 	 *	@return	int					<0 if KO, >0 if OK
 	 * @deprecated Use update function instead
 	 */
-    public function set_prospect_level(User $user)
+	public function set_prospect_level(User $user)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		return $this->update($this->id, $user);
 	}
 
@@ -3941,12 +3930,12 @@ class Societe extends CommonObject
 	 *  @param	string	$label		Label to use for status for added status
 	 *  @return string        		Libelle
 	 */
-    public function getLibProspCommStatut($mode = 0, $label = '')
+	public function getLibProspCommStatut($mode = 0, $label = '')
 	{
 		return $this->LibProspCommStatut($this->stcomm_id, $mode, $label, $this->stcomm_picto);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return label of a given status
 	 *
@@ -3960,9 +3949,9 @@ class Societe extends CommonObject
 	 *                                      Example: /mydir/mysubdir/picto.png  if picto.png is stored into htdocs/mydir/mysubdir (pictoisfullpath must be set to 1)
 	 *  @return string       	 			Label of prospection status
 	 */
-    public function LibProspCommStatut($status, $mode = 0, $label = '', $picto = '')
+	public function LibProspCommStatut($status, $mode = 0, $label = '', $picto = '')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 		$langs->load('customers');
 
@@ -3998,7 +3987,7 @@ class Societe extends CommonObject
 		return "Error, mode/status not found";
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Set outstanding value
 	 *
@@ -4006,9 +3995,9 @@ class Societe extends CommonObject
 	 *	@return	int					<0 if KO, >0 if OK
 	 * @deprecated Use update function instead
 	 */
-    public function set_OutstandingBill(User $user)
+	public function set_OutstandingBill(User $user)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		return $this->update($this->id, $user);
 	}
 
@@ -4018,7 +4007,7 @@ class Societe extends CommonObject
 	 *  @param     string      $mode    'customer' or 'supplier'
 	 *  @return    array				array('opened'=>Amount, 'total'=>Total amount)
 	 */
-    public function getOutstandingProposals($mode = 'customer')
+	public function getOutstandingProposals($mode = 'customer')
 	{
 		$table = 'propal';
 		if ($mode == 'supplier') $table = 'supplier_proposal';
@@ -4056,7 +4045,7 @@ class Societe extends CommonObject
 	 *  @param     string      $mode    'customer' or 'supplier'
 	 *  @return		array				array('opened'=>Amount, 'total'=>Total amount)
 	 */
-    public function getOutstandingOrders($mode = 'customer')
+	public function getOutstandingOrders($mode = 'customer')
 	{
 		$table = 'commande';
 		if ($mode == 'supplier') $table = 'commande_fournisseur';
@@ -4095,7 +4084,7 @@ class Societe extends CommonObject
 	 *  @param     int      $late    	0 => all invoice, 1=> only late
 	 *  @return		array				array('opened'=>Amount, 'total'=>Total amount)
 	 */
-    public function getOutstandingBills($mode = 'customer', $late = 0)
+	public function getOutstandingBills($mode = 'customer', $late = 0)
 	{
 		$table = 'facture';
 		if ($mode == 'supplier') $table = 'facture_fourn';
@@ -4135,10 +4124,10 @@ class Societe extends CommonObject
 				$tmpobject = new Facture($this->db);
 			}
 			while ($obj = $this->db->fetch_object($resql)) {
-                $tmpobject->id = $obj->rowid;
+				$tmpobject->id = $obj->rowid;
 
-                if ($obj->status != $tmpobject::STATUS_DRAFT                                           // Not a draft
-                	&& !($obj->status == $tmpobject::STATUS_ABANDONED && $obj->close_code == 'replaced')  // Not a replaced invoice
+				if ($obj->status != $tmpobject::STATUS_DRAFT                                           // Not a draft
+					&& !($obj->status == $tmpobject::STATUS_ABANDONED && $obj->close_code == 'replaced')  // Not a replaced invoice
 					)
 				{
 					$outstandingTotal += $obj->total_ht;
@@ -4157,12 +4146,12 @@ class Societe extends CommonObject
 					$outstandingOpened += $obj->total_ttc - $paiement - $creditnotes - $deposits;
 				}
 
-                //if credit note is converted but not used
-                // TODO Do this also for customer ?
-                if ($mode == 'supplier' && $obj->type == FactureFournisseur::TYPE_CREDIT_NOTE && $tmpobject->isCreditNoteUsed())
-                {
-                	$outstandingOpened -= $tmpobject->getSumFromThisCreditNotesNotUsed();
-                }
+				//if credit note is converted but not used
+				// TODO Do this also for customer ?
+				if ($mode == 'supplier' && $obj->type == FactureFournisseur::TYPE_CREDIT_NOTE && $tmpobject->isCreditNoteUsed())
+				{
+					$outstandingOpened -= $tmpobject->getSumFromThisCreditNotesNotUsed();
+				}
 			}
 			return array('opened'=>$outstandingOpened, 'total_ht'=>$outstandingTotal, 'total_ttc'=>$outstandingTotalIncTax); // 'opened' is 'incl taxes'
 		} else {
@@ -4175,21 +4164,21 @@ class Societe extends CommonObject
 	 *
 	 * @return   string        	Label
 	 */
-    public function getLibCustProspStatut()
+	public function getLibCustProspStatut()
 	{
 		return $this->LibCustProspStatut($this->client);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return the label of the customer/prospect status
 	 *
 	 *  @param	int		$status         Id of prospection status
 	 *  @return	string          		Label of prospection status
 	 */
-    public function LibCustProspStatut($status)
+	public function LibCustProspStatut($status)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 		$langs->load('companies');
 
@@ -4237,7 +4226,7 @@ class Societe extends CommonObject
 				}
 			}
 
-			if (! isset($this->bank_account)) {
+			if (!isset($this->bank_account)) {
 				require_once DOL_DOCUMENT_ROOT.'/societe/class/companybankaccount.class.php';
 				$bac = new CompanyBankAccount($this->db);
 				$result = $bac->fetch(0, $this->id);
diff --git a/htdocs/societe/class/societeaccount.class.php b/htdocs/societe/class/societeaccount.class.php
index ba32086cc4d..fe67c87674e 100644
--- a/htdocs/societe/class/societeaccount.class.php
+++ b/htdocs/societe/class/societeaccount.class.php
@@ -119,7 +119,7 @@ class SocieteAccount extends CommonObject
 	/**
 	 * @var int Thirdparty ID
 	 */
-    public $fk_soc;
+	public $fk_soc;
 
 	public $site;
 	public $site_account;
@@ -142,13 +142,13 @@ class SocieteAccount extends CommonObject
 	public $tms;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_user_creat;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_user_modif;
 
 	public $import_key;
@@ -178,7 +178,7 @@ class SocieteAccount extends CommonObject
 	 */
 	//public $class_element_line = 'societeAccountline';
 	/**
-     * @var array	List of child tables. To test if we can delete object.
+	 * @var array	List of child tables. To test if we can delete object.
 	 */
 	//protected $childtables=array();
 	/**
@@ -224,45 +224,45 @@ class SocieteAccount extends CommonObject
 	public function createFromClone(User $user, $fromid)
 	{
 		global $hookmanager, $langs;
-	    $error = 0;
+		$error = 0;
 
-	    dol_syslog(__METHOD__, LOG_DEBUG);
+		dol_syslog(__METHOD__, LOG_DEBUG);
 
-	    $object = new self($this->db);
+		$object = new self($this->db);
 
-	    $this->db->begin();
+		$this->db->begin();
 
-	    // Load source object
-	    $object->fetchCommon($fromid);
-	    // Reset some properties
-	    unset($object->id);
-	    unset($object->fk_user_creat);
-	    unset($object->import_key);
+		// Load source object
+		$object->fetchCommon($fromid);
+		// Reset some properties
+		unset($object->id);
+		unset($object->fk_user_creat);
+		unset($object->import_key);
 
-	    // Clear fields
-	    $object->ref = "copy_of_".$object->ref;
-	    $object->title = $langs->trans("CopyOf")." ".$object->title;
-	    // ...
+		// Clear fields
+		$object->ref = "copy_of_".$object->ref;
+		$object->title = $langs->trans("CopyOf")." ".$object->title;
+		// ...
 
-	    // Create clone
+		// Create clone
 		$object->context['createfromclone'] = 'createfromclone';
-	    $result = $object->createCommon($user);
-	    if ($result < 0) {
-	        $error++;
-	        $this->error = $object->error;
-	        $this->errors = $object->errors;
-	    }
+		$result = $object->createCommon($user);
+		if ($result < 0) {
+			$error++;
+			$this->error = $object->error;
+			$this->errors = $object->errors;
+		}
 
-	    unset($object->context['createfromclone']);
+		unset($object->context['createfromclone']);
 
-	    // End
-	    if (!$error) {
-	        $this->db->commit();
-	        return $object;
-	    } else {
-	        $this->db->rollback();
-	        return -1;
-	    }
+		// End
+		if (!$error) {
+			$this->db->commit();
+			return $object;
+		} else {
+			$this->db->rollback();
+			return -1;
+		}
 	}
 
 	/**
@@ -331,14 +331,14 @@ class SocieteAccount extends CommonObject
 	}
 
 	/**
-	* Try to find the thirdparty id from an another site/system external id.
-	*
-	* @param	string	$id			Id of customer in external system (example: 'cu_xxxxxxxxxxxxx', ...)
-	* @param	string	$site		Site (example: 'stripe', '...')
-	* @param	int		$status		Status (0=test, 1=live)
-	* @return	int					Id of third party
-	* @see getCustomerAccount()
-	*/
+	 * Try to find the thirdparty id from an another site/system external id.
+	 *
+	 * @param	string	$id			Id of customer in external system (example: 'cu_xxxxxxxxxxxxx', ...)
+	 * @param	string	$site		Site (example: 'stripe', '...')
+	 * @param	int		$status		Status (0=test, 1=live)
+	 * @return	int					Id of third party
+	 * @see getCustomerAccount()
+	 */
 	public function getThirdPartyID($id, $site, $status = 0)
 	{
 		$socid = 0;
@@ -390,50 +390,50 @@ class SocieteAccount extends CommonObject
 	 *  Return a link to the object card (with optionaly the picto)
 	 *
 	 *	@param	int		$withpicto					Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
-     *	@param	string	$option						On what the link point to ('nolink', ...)
-     *  @param	int  	$notooltip					1=Disable tooltip
-     *  @param  string  $morecss            		Add more css on link
-     *  @param  int     $save_lastsearch_value    	-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
-     *	@return	string								String with URL
-     */
-    public function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $morecss = '', $save_lastsearch_value = -1)
-    {
+	 *	@param	string	$option						On what the link point to ('nolink', ...)
+	 *  @param	int  	$notooltip					1=Disable tooltip
+	 *  @param  string  $morecss            		Add more css on link
+	 *  @param  int     $save_lastsearch_value    	-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+	 *	@return	string								String with URL
+	 */
+	public function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $morecss = '', $save_lastsearch_value = -1)
+	{
 		global $db, $conf, $langs;
-        global $dolibarr_main_authentication, $dolibarr_main_demo;
-        global $menumanager;
+		global $dolibarr_main_authentication, $dolibarr_main_demo;
+		global $menumanager;
 
-        if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
+		if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
 
-        $result = '';
+		$result = '';
 
-        $this->ref = $this->login;
+		$this->ref = $this->login;
 
-        $label = '<u>'.$langs->trans("WebsiteAccount").'</u>';
-        $label .= '<br>';
-        $label .= '<b>'.$langs->trans('Login').':</b> '.$this->ref;
-        //$label.= '<b>' . $langs->trans('WebSite') . ':</b> ' . $this->ref;
+		$label = '<u>'.$langs->trans("WebsiteAccount").'</u>';
+		$label .= '<br>';
+		$label .= '<b>'.$langs->trans('Login').':</b> '.$this->ref;
+		//$label.= '<b>' . $langs->trans('WebSite') . ':</b> ' . $this->ref;
 
-        $url = dol_buildpath('/website/websiteaccount_card.php', 1).'?id='.$this->id;
+		$url = dol_buildpath('/website/websiteaccount_card.php', 1).'?id='.$this->id;
 
-        if ($option != 'nolink')
-        {
-	        // Add param to save lastsearch_values or not
-	        $add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
-	        if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
-	        if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
-        }
+		if ($option != 'nolink')
+		{
+			// Add param to save lastsearch_values or not
+			$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
+			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
+			if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
+		}
 
-        $linkclose = '';
-        if (empty($notooltip))
-        {
-            if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-            {
-                $label = $langs->trans("WebsiteAccount");
-                $linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
-            }
-            $linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
-            $linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
-        } else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+		$linkclose = '';
+		if (empty($notooltip))
+		{
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+			{
+				$label = $langs->trans("WebsiteAccount");
+				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
+			}
+			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
+			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
+		} else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
 		$linkstart = '<a href="'.$url.'"';
 		$linkstart .= $linkclose.'>';
@@ -445,7 +445,7 @@ class SocieteAccount extends CommonObject
 		$result .= $linkend;
 
 		return $result;
-    }
+	}
 
 	/**
 	 *  Retourne le libelle du status d'un user (actif, inactif)
@@ -458,7 +458,7 @@ class SocieteAccount extends CommonObject
 		return $this->LibStatut($this->status, $mode);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return the status
 	 *
@@ -468,7 +468,7 @@ class SocieteAccount extends CommonObject
 	 */
 	public static function LibStatut($status, $mode = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 
 		if ($mode == 0)
diff --git a/htdocs/societe/consumption.php b/htdocs/societe/consumption.php
index 90b6dae53c4..7c66a8a148f 100644
--- a/htdocs/societe/consumption.php
+++ b/htdocs/societe/consumption.php
@@ -61,10 +61,10 @@ $year = GETPOST('year', 'int');
 // Clean up on purge search criteria ?
 if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // Both test are required to be compatible with all browsers
 {
-    $sref = '';
-    $sprod_fulldescr = '';
-    $year = '';
-    $month = '';
+	$sref = '';
+	$sprod_fulldescr = '';
+	$year = '';
+	$month = '';
 }
 // Customer or supplier selected in drop box
 $thirdTypeSelect = GETPOST("third_select_id");
@@ -170,7 +170,7 @@ print '</table>';
 
 print '</div>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 print '<br>';
 
 
@@ -253,16 +253,16 @@ if ($type_element == 'supplier_invoice')
 }
 if ($type_element == 'supplier_proposal')
 {
-    require_once DOL_DOCUMENT_ROOT.'/supplier_proposal/class/supplier_proposal.class.php';
-    $documentstatic = new SupplierProposal($db);
-    $sql_select = 'SELECT c.rowid as doc_id, c.ref as doc_number, \'1\' as doc_type, c.date_valid as dateprint, c.fk_statut as status, ';
-    $tables_from = MAIN_DB_PREFIX."supplier_proposal as c,".MAIN_DB_PREFIX."supplier_proposaldet as d";
-    $where = " WHERE c.fk_soc = s.rowid AND s.rowid = ".$socid;
-    $where .= " AND d.fk_supplier_proposal = c.rowid";
-    $where .= " AND c.entity = ".$conf->entity;
-    $dateprint = 'c.date_valid';
-    $doc_number = 'c.ref';
-    $thirdTypeSelect = 'supplier';
+	require_once DOL_DOCUMENT_ROOT.'/supplier_proposal/class/supplier_proposal.class.php';
+	$documentstatic = new SupplierProposal($db);
+	$sql_select = 'SELECT c.rowid as doc_id, c.ref as doc_number, \'1\' as doc_type, c.date_valid as dateprint, c.fk_statut as status, ';
+	$tables_from = MAIN_DB_PREFIX."supplier_proposal as c,".MAIN_DB_PREFIX."supplier_proposaldet as d";
+	$where = " WHERE c.fk_soc = s.rowid AND s.rowid = ".$socid;
+	$where .= " AND d.fk_supplier_proposal = c.rowid";
+	$where .= " AND c.entity = ".$conf->entity;
+	$dateprint = 'c.date_valid';
+	$doc_number = 'c.ref';
+	$thirdTypeSelect = 'supplier';
 }
 if ($type_element == 'supplier_order')
 { 	// Supplier : Show products from orders.
@@ -312,10 +312,10 @@ if (!empty($sql_select))
 	if ($sref) $sql .= " AND ".$doc_number." LIKE '%".$db->escape($sref)."%'";
 	if ($sprod_fulldescr)
 	{
-	    $sql .= " AND (d.description LIKE '%".$db->escape($sprod_fulldescr)."%'";
-	    if (GETPOST('type_element') != 'fichinter') $sql .= " OR p.ref LIKE '%".$db->escape($sprod_fulldescr)."%'";
-	    if (GETPOST('type_element') != 'fichinter') $sql .= " OR p.label LIKE '%".$db->escape($sprod_fulldescr)."%'";
-	    $sql .= ")";
+		$sql .= " AND (d.description LIKE '%".$db->escape($sprod_fulldescr)."%'";
+		if (GETPOST('type_element') != 'fichinter') $sql .= " OR p.ref LIKE '%".$db->escape($sprod_fulldescr)."%'";
+		if (GETPOST('type_element') != 'fichinter') $sql .= " OR p.label LIKE '%".$db->escape($sprod_fulldescr)."%'";
+		$sql .= ")";
 	}
 	$sql .= $db->order($sortfield, $sortorder);
 
@@ -330,8 +330,8 @@ $disabled = 0;
 $showempty = 2;
 if (empty($elementTypeArray) && !$object->client && !$object->fournisseur)
 {
-    $showempty = $langs->trans("ThirdpartyNotCustomerNotSupplierSoNoRef");
-    $disabled = 1;
+	$showempty = $langs->trans("ThirdpartyNotCustomerNotSupplierSoNoRef");
+	$disabled = 1;
 }
 
 // Define type of elements
@@ -356,7 +356,7 @@ if ($sql_select)
 	$num = $db->num_rows($resql);
 
 	$param = "&socid=".urlencode($socid)."&type_element=".urlencode($type_element);
-    if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
+	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
 	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
 	if ($sprod_fulldescr) $param .= "&sprod_fulldescr=".urlencode($sprod_fulldescr);
 	if ($sref) $param .= "&sref=".urlencode($sref);
@@ -364,45 +364,45 @@ if ($sql_select)
 	if ($year) $param .= "&year=".urlencode($year);
 	if ($optioncss != '') $param .= '&optioncss='.urlencode($optioncss);
 
-    print_barre_liste($langs->trans('ProductsIntoElements').' '.$typeElementString.' '.$button, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $totalnboflines, '', 0, '', '', $limit);
+	print_barre_liste($langs->trans('ProductsIntoElements').' '.$typeElementString.' '.$button, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $totalnboflines, '', 0, '', '', $limit);
 
-    print '<div class="div-table-responsive-no-min">';
-    print '<table class="liste centpercent">'."\n";
+	print '<div class="div-table-responsive-no-min">';
+	print '<table class="liste centpercent">'."\n";
 
-    // Filters
-    print '<tr class="liste_titre">';
-    print '<td class="liste_titre left">';
-    print '<input class="flat" type="text" name="sref" size="8" value="'.$sref.'">';
-    print '</td>';
-    print '<td class="liste_titre nowrap center">'; // date
-    print $formother->select_month($month ? $month : -1, 'month', 1, 0, 'valignmiddle');
-    $formother->select_year($year ? $year : -1, 'year', 1, 20, 1);
-    print '</td>';
-    print '<td class="liste_titre center">';
-    print '</td>';
-    print '<td class="liste_titre left">';
-    print '<input class="flat" type="text" name="sprod_fulldescr" size="15" value="'.dol_escape_htmltag($sprod_fulldescr).'">';
-    print '</td>';
-    print '<td class="liste_titre center">';
-    print '</td>';
-    print '<td class="liste_titre center">';
-    print '</td>';
-    print '<td class="liste_titre maxwidthsearch">';
-    $searchpicto = $form->showFilterAndCheckAddButtons(0);
-    print $searchpicto;
-    print '</td>';
-    print '</tr>';
+	// Filters
+	print '<tr class="liste_titre">';
+	print '<td class="liste_titre left">';
+	print '<input class="flat" type="text" name="sref" size="8" value="'.$sref.'">';
+	print '</td>';
+	print '<td class="liste_titre nowrap center">'; // date
+	print $formother->select_month($month ? $month : -1, 'month', 1, 0, 'valignmiddle');
+	$formother->select_year($year ? $year : -1, 'year', 1, 20, 1);
+	print '</td>';
+	print '<td class="liste_titre center">';
+	print '</td>';
+	print '<td class="liste_titre left">';
+	print '<input class="flat" type="text" name="sprod_fulldescr" size="15" value="'.dol_escape_htmltag($sprod_fulldescr).'">';
+	print '</td>';
+	print '<td class="liste_titre center">';
+	print '</td>';
+	print '<td class="liste_titre center">';
+	print '</td>';
+	print '<td class="liste_titre maxwidthsearch">';
+	$searchpicto = $form->showFilterAndCheckAddButtons(0);
+	print $searchpicto;
+	print '</td>';
+	print '</tr>';
 
-    // Titles with sort buttons
-    print '<tr class="liste_titre">';
-    print_liste_field_titre('Ref', $_SERVER['PHP_SELF'], 'doc_number', '', $param, '', $sortfield, $sortorder, 'left ');
-    print_liste_field_titre('Date', $_SERVER['PHP_SELF'], 'dateprint', '', $param, 'width="150"', $sortfield, $sortorder, 'center ');
-    print_liste_field_titre('Status', $_SERVER['PHP_SELF'], 'fk_statut', '', $param, '', $sortfield, $sortorder, 'center ');
-    print_liste_field_titre('Product', $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder, 'left ');
-    print_liste_field_titre('Quantity', $_SERVER['PHP_SELF'], 'prod_qty', '', $param, '', $sortfield, $sortorder, 'right ');
-    print_liste_field_titre('TotalHT', $_SERVER['PHP_SELF'], 'total_ht', '', $param, '', $sortfield, $sortorder, 'right ');
-    print_liste_field_titre('UnitPrice', $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder, 'right ');
-    print "</tr>\n";
+	// Titles with sort buttons
+	print '<tr class="liste_titre">';
+	print_liste_field_titre('Ref', $_SERVER['PHP_SELF'], 'doc_number', '', $param, '', $sortfield, $sortorder, 'left ');
+	print_liste_field_titre('Date', $_SERVER['PHP_SELF'], 'dateprint', '', $param, 'width="150"', $sortfield, $sortorder, 'center ');
+	print_liste_field_titre('Status', $_SERVER['PHP_SELF'], 'fk_statut', '', $param, '', $sortfield, $sortorder, 'center ');
+	print_liste_field_titre('Product', $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder, 'left ');
+	print_liste_field_titre('Quantity', $_SERVER['PHP_SELF'], 'prod_qty', '', $param, '', $sortfield, $sortorder, 'right ');
+	print_liste_field_titre('TotalHT', $_SERVER['PHP_SELF'], 'total_ht', '', $param, '', $sortfield, $sortorder, 'right ');
+	print_liste_field_titre('UnitPrice', $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder, 'right ');
+	print "</tr>\n";
 
 
 	$i = 0;
@@ -602,25 +602,25 @@ if ($sql_select)
 	$db->free($resql);
 } elseif (empty($type_element) || $type_element == -1)
 {
-    print_barre_liste($langs->trans('ProductsIntoElements').' '.$typeElementString.' '.$button, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, '', '');
+	print_barre_liste($langs->trans('ProductsIntoElements').' '.$typeElementString.' '.$button, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, '', '');
 
-    print '<table class="liste centpercent">'."\n";
-    // Titles with sort buttons
-    print '<tr class="liste_titre">';
-    print_liste_field_titre('Ref', $_SERVER['PHP_SELF'], 'doc_number', '', $param, '', $sortfield, $sortorder, 'left ');
-    print_liste_field_titre('Date', $_SERVER['PHP_SELF'], 'dateprint', '', $param, 'width="150"', $sortfield, $sortorder, 'center ');
-    print_liste_field_titre('Status', $_SERVER['PHP_SELF'], 'fk_status', '', $param, '', $sortfield, $sortorder, 'center ');
-    print_liste_field_titre('Product', $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder, 'left ');
-    print_liste_field_titre('Quantity', $_SERVER['PHP_SELF'], 'prod_qty', '', $param, '', $sortfield, $sortorder, 'right ');
-    print "</tr>\n";
+	print '<table class="liste centpercent">'."\n";
+	// Titles with sort buttons
+	print '<tr class="liste_titre">';
+	print_liste_field_titre('Ref', $_SERVER['PHP_SELF'], 'doc_number', '', $param, '', $sortfield, $sortorder, 'left ');
+	print_liste_field_titre('Date', $_SERVER['PHP_SELF'], 'dateprint', '', $param, 'width="150"', $sortfield, $sortorder, 'center ');
+	print_liste_field_titre('Status', $_SERVER['PHP_SELF'], 'fk_status', '', $param, '', $sortfield, $sortorder, 'center ');
+	print_liste_field_titre('Product', $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder, 'left ');
+	print_liste_field_titre('Quantity', $_SERVER['PHP_SELF'], 'prod_qty', '', $param, '', $sortfield, $sortorder, 'right ');
+	print "</tr>\n";
 
 	print '<tr class="oddeven"><td class="opacitymedium" colspan="5">'.$langs->trans("SelectElementAndClick", $langs->transnoentitiesnoconv("Search")).'</td></tr>';
 
 	print "</table>";
 } else {
-    print_barre_liste($langs->trans('ProductsIntoElements').' '.$typeElementString.' '.$button, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, '', '');
+	print_barre_liste($langs->trans('ProductsIntoElements').' '.$typeElementString.' '.$button, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, '', '');
 
-    print '<table class="liste centpercent">'."\n";
+	print '<table class="liste centpercent">'."\n";
 
 	print '<tr class="oddeven"><td class="opacitymedium" colspan="5">'.$langs->trans("FeatureNotYetAvailable").'</td></tr>';
 
diff --git a/htdocs/societe/contact.php b/htdocs/societe/contact.php
index 850a69d0ab2..e57c059a633 100644
--- a/htdocs/societe/contact.php
+++ b/htdocs/societe/contact.php
@@ -80,9 +80,9 @@ $canvas = $object->canvas ? $object->canvas : GETPOST("canvas");
 $objcanvas = null;
 if (!empty($canvas))
 {
-    require_once DOL_DOCUMENT_ROOT.'/core/class/canvas.class.php';
-    $objcanvas = new Canvas($db, $action);
-    $objcanvas->getCanvas('thirdparty', 'card', $canvas);
+	require_once DOL_DOCUMENT_ROOT.'/core/class/canvas.class.php';
+	$objcanvas = new Canvas($db, $action);
+	$objcanvas->getCanvas('thirdparty', 'card', $canvas);
 }
 
 // Security check
@@ -101,17 +101,17 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 if (empty($reshook))
 {
 	if ($cancel)
-    {
-        $action = '';
-        if (!empty($backtopage))
-        {
-            header("Location: ".$backtopage);
-            exit;
-        }
-    }
+	{
+		$action = '';
+		if (!empty($backtopage))
+		{
+			header("Location: ".$backtopage);
+			exit;
+		}
+	}
 
-    // Selection of new fields
-    include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
+	// Selection of new fields
+	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 }
 
 
@@ -126,7 +126,7 @@ $formcompany = new FormCompany($db);
 
 if ($socid > 0 && empty($object->id))
 {
-    $result = $object->fetch($socid);
+	$result = $object->fetch($socid);
 	if ($result <= 0) dol_print_error('', $object->error);
 }
 
@@ -150,7 +150,7 @@ $linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_value
 
 dol_banner_tab($object, 'socid', $linkback, ($user->socid ? 0 : 1), 'rowid', 'nom', '', '', 0, '', '', 'arearefnobottom');
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '<br>';
 
diff --git a/htdocs/societe/document.php b/htdocs/societe/document.php
index 96d4d2ab9d3..66ace3650a9 100644
--- a/htdocs/societe/document.php
+++ b/htdocs/societe/document.php
@@ -116,13 +116,13 @@ if ($object->id)
 		$totalsize += $file['size'];
 	}
 
-    $linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+	$linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-    dol_banner_tab($object, 'socid', $linkback, ($user->socid ? 0 : 1), 'rowid', 'nom');
+	dol_banner_tab($object, 'socid', $linkback, ($user->socid ? 0 : 1), 'rowid', 'nom');
 
-    print '<div class="fichecenter">';
+	print '<div class="fichecenter">';
 
-    print '<div class="underbanner clearboth"></div>';
+	print '<div class="underbanner clearboth"></div>';
 	print '<table class="border tableforfield centpercent">';
 
 	// Prefix
@@ -159,7 +159,7 @@ if ($object->id)
 
 	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	$modulepart = 'societe';
 	$permission = $user->rights->societe->creer;
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index 50c740e7be3..cd0f66ef525 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -52,7 +52,7 @@ $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'thi
 
 if ($contextpage == 'poslist')
 {
-    $_GET['optioncss'] = 'print';
+	$_GET['optioncss'] = 'print';
 }
 
 // Security check
@@ -232,9 +232,9 @@ $arrayfields = dol_sort_array($arrayfields, 'position');
 
 if ($action == "change")	// Change customer for TakePOS
 {
-    $idcustomer = GETPOST('idcustomer', 'int');
+	$idcustomer = GETPOST('idcustomer', 'int');
 
-    // Check if draft invoice already exists, if not create it
+	// 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').")";
 	$result = $db->query($sql);
 	$num_lines = $db->num_rows($result);
@@ -252,9 +252,9 @@ if ($action == "change")	// Change customer for TakePOS
 		$db->query($sql);
 	}
 
-    $sql = "UPDATE ".MAIN_DB_PREFIX."facture set fk_soc=".$idcustomer." where ref='(PROV-POS".$_SESSION["takeposterminal"]."-".$place.")'";
-    $resql = $db->query($sql);
-    ?>
+	$sql = "UPDATE ".MAIN_DB_PREFIX."facture set fk_soc=".$idcustomer." where ref='(PROV-POS".$_SESSION["takeposterminal"]."-".$place.")'";
+	$resql = $db->query($sql);
+	?>
 	    <script>
 	    console.log("Reload page invoice.php with place=<?php print $place; ?>");
 	    parent.$("#poslines").load("invoice.php?place=<?php print $place; ?>", function() {
@@ -266,7 +266,7 @@ if ($action == "change")	// Change customer for TakePOS
 	    });
 	    </script>
     <?php
-    exit;
+	exit;
 }
 
 if (GETPOST('cancel', 'alpha')) { $action = 'list'; $massaction = ''; }
@@ -521,21 +521,21 @@ $num = $db->num_rows($resql);
 $arrayofselected = is_array($toselect) ? $toselect : array();
 
 if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && ($search_all != '' || $search_cti != '') && $action != 'list') {
-    $obj = $db->fetch_object($resql);
-    $id = $obj->rowid;
-    if (!empty($conf->global->SOCIETE_ON_SEARCH_AND_LIST_GO_ON_CUSTOMER_OR_SUPPLIER_CARD)) {
-        if ($obj->client > 0) {
-            header("Location: ".DOL_URL_ROOT.'/comm/card.php?socid='.$id);
-            exit;
-        }
-        if ($obj->fournisseur > 0) {
-            header("Location: ".DOL_URL_ROOT.'/fourn/card.php?socid='.$id);
-            exit;
-        }
-    }
+	$obj = $db->fetch_object($resql);
+	$id = $obj->rowid;
+	if (!empty($conf->global->SOCIETE_ON_SEARCH_AND_LIST_GO_ON_CUSTOMER_OR_SUPPLIER_CARD)) {
+		if ($obj->client > 0) {
+			header("Location: ".DOL_URL_ROOT.'/comm/card.php?socid='.$id);
+			exit;
+		}
+		if ($obj->fournisseur > 0) {
+			header("Location: ".DOL_URL_ROOT.'/fourn/card.php?socid='.$id);
+			exit;
+		}
+	}
 
-    header("Location: ".DOL_URL_ROOT.'/societe/card.php?socid='.$id);
-    exit;
+	header("Location: ".DOL_URL_ROOT.'/societe/card.php?socid='.$id);
+	exit;
 }
 
 $help_url = 'EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
@@ -610,8 +610,8 @@ if (!empty($type))
 	if ($type == 'f') $label = 'NewSupplier';
 }
 
-if ($contextpage = 'poslist' && $type == 't' && ( !empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES))) {
-	print get_htmloutput_mesg(img_warning('default') . ' ' . $langs->trans("BecarefullChangeThirdpartyBeforeAddProductToInvoice"), '', 'warning', 1);
+if ($contextpage == 'poslist' && $type == 't' && (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES))) {
+	print get_htmloutput_mesg(img_warning('default').' '.$langs->trans("BecarefullChangeThirdpartyBeforeAddProductToInvoice"), '', 'warning', 1);
 }
 
 // Show the new button only when this page is not opend from the Extended POS (pop-up window)
@@ -928,9 +928,9 @@ if (!empty($arrayfields['s.fk_stcomm']['checked']))
 }
 if (!empty($arrayfields['s2.nom']['checked']))
 {
-    print '<td class="liste_titre center">';
-    print '<input class="flat searchstring maxwidth75imp" type="text" name="search_parent_name" value="'.dol_escape_htmltag($search_parent_name).'">';
-    print '</td>';
+	print '<td class="liste_titre center">';
+	print '<input class="flat searchstring maxwidth75imp" type="text" name="search_parent_name" value="'.dol_escape_htmltag($search_parent_name).'">';
+	print '</td>';
 }
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
@@ -1047,7 +1047,7 @@ while ($i < min($num, $limit))
 	print '<tr class="oddeven"';
 	if ($contextpage == 'poslist')
 	{
-	    print ' onclick="location.href=\'list.php?action=change&contextpage=poslist&idcustomer='.$obj->rowid.'&place='.urlencode($place).'\'"';
+		print ' onclick="location.href=\'list.php?action=change&contextpage=poslist&idcustomer='.$obj->rowid.'&place='.urlencode($place).'\'"';
 	}
 	print '>';
 	if (!empty($arrayfields['s.rowid']['checked']))
@@ -1064,13 +1064,13 @@ while ($i < min($num, $limit))
 		print '<td'.(empty($conf->global->MAIN_SOCIETE_SHOW_COMPLETE_NAME) ? ' class="tdoverflowmax200"' : '').'>';
 		if ($contextpage == 'poslist')
 		{
-		    print $obj->name;
+			print $obj->name;
 		} else {
-		    print $companystatic->getNomUrl(1, '', 100, 0, 1);
+			print $companystatic->getNomUrl(1, '', 100, 0, 1);
 		}
 		print "</td>\n";
 		$companystatic->name_alias = $savalias;
-        if (!$i) $totalarray['nbfield']++;
+		if (!$i) $totalarray['nbfield']++;
 	}
 	if (!empty($arrayfields['s.name_alias']['checked']))
 	{
@@ -1257,13 +1257,13 @@ while ($i < min($num, $limit))
 	{
 		// Prospect status
 		print '<td class="center nowrap"><div class="nowrap">';
-		print '<div class="inline-block">' . $companystatic->LibProspCommStatut($obj->stcomm_id, 2, $prospectstatic->cacheprospectstatus[$obj->stcomm_id]['label'], $obj->stcomm_picto);
+		print '<div class="inline-block">'.$companystatic->LibProspCommStatut($obj->stcomm_id, 2, $prospectstatic->cacheprospectstatus[$obj->stcomm_id]['label'], $obj->stcomm_picto);
 		print '</div> - <div class="inline-block">';
 		foreach ($prospectstatic->cacheprospectstatus as $key => $val)
 		{
 			$titlealt = 'default';
 			if (!empty($val['code']) && !in_array($val['code'], array('ST_NO', 'ST_NEVER', 'ST_TODO', 'ST_PEND', 'ST_DONE'))) $titlealt = $val['label'];
-			if ($obj->stcomm_id != $val['id']) print '<a class="pictosubstatus" href="' . $_SERVER["PHP_SELF"] . '?stcommsocid=' . $obj->rowid . '&stcomm=' . $val['code'] . '&action=setstcomm&token='.newToken() . $param . ($page ? '&page=' . urlencode($page) : '') . '">' . img_action($titlealt, $val['code'], $val['picto']) . '</a>';
+			if ($obj->stcomm_id != $val['id']) print '<a class="pictosubstatus" href="'.$_SERVER["PHP_SELF"].'?stcommsocid='.$obj->rowid.'&stcomm='.$val['code'].'&action=setstcomm&token='.newToken().$param.($page ? '&page='.urlencode($page) : '').'">'.img_action($titlealt, $val['code'], $val['picto']).'</a>';
 		}
 		print '</div></div></td>';
 		if (!$i) $totalarray['nbfield']++;
@@ -1271,14 +1271,14 @@ while ($i < min($num, $limit))
 	// Parent company
 	if (!empty($arrayfields['s2.nom']['checked']))
 	{
-	    print '<td class="center">';
-	    if ($companystatic->fk_parent > 0)
-	    {
-	        $companyparent->fetch($companystatic->fk_parent);
-	        print $companyparent->getNomUrl(1);
-	    }
-	    print "</td>";
-	    if (!$i) $totalarray['nbfield']++;
+		print '<td class="center">';
+		if ($companystatic->fk_parent > 0)
+		{
+			$companyparent->fetch($companystatic->fk_parent);
+			print $companyparent->getNomUrl(1);
+		}
+		print "</td>";
+		if (!$i) $totalarray['nbfield']++;
 	}
 	// Extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
diff --git a/htdocs/societe/note.php b/htdocs/societe/note.php
index d18040e9626..0632fde21c2 100644
--- a/htdocs/societe/note.php
+++ b/htdocs/societe/note.php
@@ -67,61 +67,61 @@ llxHeader('', $title, $help_url);
 
 if ($object->id > 0)
 {
-    /*
+	/*
      * Affichage onglets
      */
-    if (!empty($conf->notification->enabled)) $langs->load("mails");
+	if (!empty($conf->notification->enabled)) $langs->load("mails");
 
-    $head = societe_prepare_head($object);
+	$head = societe_prepare_head($object);
 
-    print dol_get_fiche_head($head, 'note', $langs->trans("ThirdParty"), -1, 'company');
+	print dol_get_fiche_head($head, 'note', $langs->trans("ThirdParty"), -1, 'company');
 
-    $linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+	$linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-    dol_banner_tab($object, 'socid', $linkback, ($user->socid ? 0 : 1), 'rowid', 'nom');
+	dol_banner_tab($object, 'socid', $linkback, ($user->socid ? 0 : 1), 'rowid', 'nom');
 
-    $cssclass = 'titlefield';
-    //if ($action == 'editnote_public') $cssclass='titlefieldcreate';
-    //if ($action == 'editnote_private') $cssclass='titlefieldcreate';
+	$cssclass = 'titlefield';
+	//if ($action == 'editnote_public') $cssclass='titlefieldcreate';
+	//if ($action == 'editnote_private') $cssclass='titlefieldcreate';
 
-    print '<div class="fichecenter">';
+	print '<div class="fichecenter">';
 
-    print '<div class="underbanner clearboth"></div>';
-    print '<table class="border centpercent tableforfield">';
+	print '<div class="underbanner clearboth"></div>';
+	print '<table class="border centpercent tableforfield">';
 
-    if (!empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
-    {
-        print '<tr><td class="'.$cssclass.'">'.$langs->trans('Prefix').'</td><td colspan="3">'.$object->prefix_comm.'</td></tr>';
-    }
+	if (!empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
+	{
+		print '<tr><td class="'.$cssclass.'">'.$langs->trans('Prefix').'</td><td colspan="3">'.$object->prefix_comm.'</td></tr>';
+	}
 
-    if ($object->client)
-    {
-        print '<tr><td class="'.$cssclass.'">';
-        print $langs->trans('CustomerCode').'</td><td colspan="3">';
-        print $object->code_client;
-        if ($object->check_codeclient() <> 0) print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
-        print '</td></tr>';
-    }
+	if ($object->client)
+	{
+		print '<tr><td class="'.$cssclass.'">';
+		print $langs->trans('CustomerCode').'</td><td colspan="3">';
+		print $object->code_client;
+		if ($object->check_codeclient() <> 0) print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
+		print '</td></tr>';
+	}
 
-    if ($object->fournisseur)
-    {
-        print '<tr><td class="'.$cssclass.'">';
-        print $langs->trans('SupplierCode').'</td><td colspan="3">';
-        print $object->code_fournisseur;
-        if ($object->check_codefournisseur() <> 0) print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
-        print '</td></tr>';
-    }
+	if ($object->fournisseur)
+	{
+		print '<tr><td class="'.$cssclass.'">';
+		print $langs->trans('SupplierCode').'</td><td colspan="3">';
+		print $object->code_fournisseur;
+		if ($object->check_codefournisseur() <> 0) print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
+		print '</td></tr>';
+	}
 
-    print "</table>";
+	print "</table>";
 
-    print '</div>';
+	print '</div>';
 
-    //print '<br>';
+	//print '<br>';
 
-    //print '<div class="underbanner clearboth"></div>';
-    include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
+	//print '<div class="underbanner clearboth"></div>';
+	include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
 
-    dol_fiche_end();
+	print dol_get_fiche_end();
 } else {
 	$langs->load("errors");
 	print $langs->trans("ErrorRecordNotFound");
diff --git a/htdocs/societe/notify/card.php b/htdocs/societe/notify/card.php
index 5f38743215f..9a16c1aa1be 100644
--- a/htdocs/societe/notify/card.php
+++ b/htdocs/societe/notify/card.php
@@ -199,7 +199,7 @@ if ($result > 0)
 
 	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print "\n";
 
diff --git a/htdocs/societe/paymentmodes.php b/htdocs/societe/paymentmodes.php
index 1473d6397af..761365e1280 100644
--- a/htdocs/societe/paymentmodes.php
+++ b/htdocs/societe/paymentmodes.php
@@ -912,7 +912,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 	print '</table>';
 	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<br>';
 
@@ -1686,7 +1686,7 @@ if ($socid && $action == 'edit' && $user->rights->societe->creer)
 	}
 
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div class="center">';
 	print '<input class="button" value="'.$langs->trans("Modify").'" type="submit">';
@@ -1733,7 +1733,7 @@ if ($socid && $action == 'editcard' && $user->rights->societe->creer)
 	print '</table>';
 	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div class="center">';
 	print '<input class="button" value="'.$langs->trans("Modify").'" type="submit">';
@@ -1847,7 +1847,7 @@ if ($socid && $action == 'create' && $user->rights->societe->creer)
 
 	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	dol_set_focus('#label');
 
@@ -1897,7 +1897,7 @@ if ($socid && $action == 'createcard' && $user->rights->societe->creer)
 
 	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	dol_set_focus('#label');
 
diff --git a/htdocs/societe/price.php b/htdocs/societe/price.php
index 8a65b56b2bf..cbca9c52ebc 100644
--- a/htdocs/societe/price.php
+++ b/htdocs/societe/price.php
@@ -77,13 +77,13 @@ if (empty($reshook))
 	}
 
 	if ($action == 'add_customer_price_confirm' && !$cancel && ($user->rights->produit->creer || $user->rights->service->creer)) {
-		if (! (GETPOST('prodid', 'int') > 0)) {
+		if (!(GETPOST('prodid', 'int') > 0)) {
 			$error++;
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->trans("Product")), null, 'errors');
 			$action = 'add_customer_price';
 		}
 
-		if (! $error) {
+		if (!$error) {
 			$update_child_soc = GETPOST('updatechildprice');
 
 			// add price by customer
@@ -233,7 +233,7 @@ print '</table>';
 
 print '</div>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 
@@ -532,7 +532,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 			setEventMessages($prodcustprice->error, $prodcustprice->errors, 'errors');
 		}
 
-		$option = '&search_prod=' . $search_prod . '&id=' . $object->id . '&label=' . $search_label .'&price=' . $search_price . '&price_ttc=' . $search_price_ttc;
+		$option = '&search_prod='.$search_prod.'&id='.$object->id.'&label='.$search_label.'&price='.$search_price.'&price_ttc='.$search_price_ttc;
 
 		print '<!-- view specific price for each product -->'."\n";
 
@@ -545,8 +545,8 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 		print '<table class="noborder centpercent">';
 
 		print '<tr class="liste_titre">';
-		print '<td>' . $langs->trans("Ref") . '</td>';
-		print '<td>' . $langs->trans("Product") . '</td>';
+		print '<td>'.$langs->trans("Ref").'</td>';
+		print '<td>'.$langs->trans("Product").'</td>';
 		print '<td>'.$langs->trans("AppliedPricesFrom").'</td>';
 		print '<td class="center">'.$langs->trans("PriceBase").'</td>';
 		print '<td class="right">'.$langs->trans("VAT").'</td>';
@@ -562,10 +562,10 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 		{
 			print '<tr class="liste_titre">';
 			print '<td class="liste_titre"><input type="text" class="flat" name="search_prod" value="'.$search_prod.'" size="20"></td>';
-			print '<td class="liste_titre" ><input type="text" class="flat" name="search_label" value="' . $search_label . '" size="20"></td>';
+			print '<td class="liste_titre" ><input type="text" class="flat" name="search_label" value="'.$search_label.'" size="20"></td>';
 			print '<td class="liste_titre" colspan="3">&nbsp;</td>';
-			print '<td class="liste_titre" align="right"><input type="text" class="flat" name="search_price" value="' . $search_price . '" size="10"></td>';
-			print '<td class="liste_titre" align="right"><input type="text" class="flat" name="search_price_ttc" value="' . $search_price_ttc . '" size="10"></td>';
+			print '<td class="liste_titre" align="right"><input type="text" class="flat" name="search_price" value="'.$search_price.'" size="10"></td>';
+			print '<td class="liste_titre" align="right"><input type="text" class="flat" name="search_price_ttc" value="'.$search_price_ttc.'" size="10"></td>';
 			print '<td class="liste_titre" colspan="3">&nbsp;</td>';
 			// Print the search button
 			print '<td class="liste_titre maxwidthsearch">';
@@ -585,7 +585,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 				$staticprod->fetch($line->fk_product);
 
 				print "<td>".$staticprod->getNomUrl(1)."</td>";
-				print "<td>" . $staticprod->label ."</td>";
+				print "<td>".$staticprod->label."</td>";
 				print "<td>".dol_print_date($line->datec, "dayhour")."</td>";
 
 				print '<td class="center">'.$langs->trans($line->price_base_type)."</td>";
diff --git a/htdocs/societe/project.php b/htdocs/societe/project.php
index 258b9043044..aae44983401 100644
--- a/htdocs/societe/project.php
+++ b/htdocs/societe/project.php
@@ -80,19 +80,19 @@ if ($socid)
 
 	print dol_get_fiche_head($head, 'project', $langs->trans("ThirdParty"), -1, 'company');
 
-    $linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+	$linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-    dol_banner_tab($object, 'socid', $linkback, ($user->socid ? 0 : 1), 'rowid', 'nom');
+	dol_banner_tab($object, 'socid', $linkback, ($user->socid ? 0 : 1), 'rowid', 'nom');
 
-    print '<div class="fichecenter">';
+	print '<div class="fichecenter">';
 
-    print '<div class="underbanner clearboth"></div>';
+	print '<div class="underbanner clearboth"></div>';
 	print '<table class="border centpercent tableforfield">';
 
-    if (!empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
-    {
-        print '<tr><td>'.$langs->trans('Prefix').'</td><td colspan="3">'.$object->prefix_comm.'</td></tr>';
-    }
+	if (!empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
+	{
+		print '<tr><td>'.$langs->trans('Prefix').'</td><td colspan="3">'.$object->prefix_comm.'</td></tr>';
+	}
 
 	if ($object->client)
 	{
@@ -116,17 +116,17 @@ if ($socid)
 
 	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	$params = '';
 
 	$newcardbutton .= dolGetButtonTitle($langs->trans("NewProject"), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/projet/card.php?action=create&socid='.$object->id.'&amp;backtopage='.urlencode($backtopage), '', 1, $params);
 
-    print '<br>';
+	print '<br>';
 
 
 	// Projects list
-    $result = show_projects($conf, $langs, $db, $object, $_SERVER["PHP_SELF"].'?socid='.$object->id, 1, $newcardbutton);
+	$result = show_projects($conf, $langs, $db, $object, $_SERVER["PHP_SELF"].'?socid='.$object->id, 1, $newcardbutton);
 }
 
 // End of page
diff --git a/htdocs/societe/societecontact.php b/htdocs/societe/societecontact.php
index b7fd740fe81..c40de9060ef 100644
--- a/htdocs/societe/societecontact.php
+++ b/htdocs/societe/societecontact.php
@@ -68,11 +68,11 @@ if ($action == 'addcontact' && $user->rights->societe->creer)
 {
 	$result = $object->fetch($id);
 
-    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, $_POST["type"], $_POST["source"]);
-    }
+	}
 
 	if ($result >= 0)
 	{
@@ -94,7 +94,7 @@ elseif ($action == 'swapstatut' && $user->rights->societe->creer)
 {
 	if ($object->fetch($id))
 	{
-	    $result = $object->swapContactStatus(GETPOST('ligne'));
+		$result = $object->swapContactStatus(GETPOST('ligne'));
 	} else {
 		dol_print_error($db);
 	}
@@ -157,17 +157,17 @@ if ($id > 0 || !empty($ref))
 		print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 
-        $linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+		$linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-        dol_banner_tab($object, 'socid', $linkback, ($user->socid ? 0 : 1), 'rowid', 'nom');
+		dol_banner_tab($object, 'socid', $linkback, ($user->socid ? 0 : 1), 'rowid', 'nom');
 
-    	print '<div class="fichecenter">';
+		print '<div class="fichecenter">';
 
-        print '<div class="underbanner clearboth"></div>';
+		print '<div class="underbanner clearboth"></div>';
 		print '<table class="border centpercent">';
 
-    	// Prospect/Customer
-    	/*print '<tr><td class="titlefield">'.$langs->trans('ProspectCustomer').'</td><td>';
+		// Prospect/Customer
+		/*print '<tr><td class="titlefield">'.$langs->trans('ProspectCustomer').'</td><td>';
     	print $object->getLibCustProspStatut();
     	print '</td></tr>';
 
@@ -178,25 +178,25 @@ if ($id > 0 || !empty($ref))
 
 		if (!empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
 		{
-		    print '<tr><td>'.$langs->trans('Prefix').'</td><td colspan="3">'.$object->prefix_comm.'</td></tr>';
+			print '<tr><td>'.$langs->trans('Prefix').'</td><td colspan="3">'.$object->prefix_comm.'</td></tr>';
 		}
 
 		if ($object->client)
 		{
-		    print '<tr><td class="titlefield">';
-		    print $langs->trans('CustomerCode').'</td><td colspan="3">';
-		    print $object->code_client;
-		    if ($object->check_codeclient() <> 0) print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
-		    print '</td></tr>';
+			print '<tr><td class="titlefield">';
+			print $langs->trans('CustomerCode').'</td><td colspan="3">';
+			print $object->code_client;
+			if ($object->check_codeclient() <> 0) print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
+			print '</td></tr>';
 		}
 
 		if ($object->fournisseur)
 		{
-		    print '<tr><td class="titlefield">';
-		    print $langs->trans('SupplierCode').'</td><td colspan="3">';
-		    print $object->code_fournisseur;
-		    if ($object->check_codefournisseur() <> 0) print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
-		    print '</td></tr>';
+			print '<tr><td class="titlefield">';
+			print $langs->trans('SupplierCode').'</td><td colspan="3">';
+			print $object->code_fournisseur;
+			if ($object->check_codefournisseur() <> 0) print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
+			print '</td></tr>';
 		}
 		print '</table>';
 
diff --git a/htdocs/societe/tpl/linesalesrepresentative.tpl.php b/htdocs/societe/tpl/linesalesrepresentative.tpl.php
index 039379be8c7..4f09bebfe71 100644
--- a/htdocs/societe/tpl/linesalesrepresentative.tpl.php
+++ b/htdocs/societe/tpl/linesalesrepresentative.tpl.php
@@ -29,22 +29,22 @@ print $langs->trans('SalesRepresentatives');
 print '</td>';
 if ($action != 'editsalesrepresentatives' && $user->rights->societe->creer) {
 	print '<td class="right">';
-	print '<a class="editfielda reposition" href="' . $_SERVER["PHP_SELF"] . '?action=editsalesrepresentatives&amp;socid=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('Edit'), 1) . '</a>';
+	print '<a class="editfielda reposition" href="'.$_SERVER["PHP_SELF"].'?action=editsalesrepresentatives&amp;socid='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('Edit'), 1).'</a>';
 	print '</td>';
 }
 print '</tr></table>';
 print '</td><td colspan="3">';
 
 if ($action == 'editsalesrepresentatives') {
-	print '<form method="post" action="' . $_SERVER['PHP_SELF'] . '">';
+	print '<form method="post" action="'.$_SERVER['PHP_SELF'].'">';
 	print '<input type="hidden" name="action" value="set_salesrepresentatives" />';
-	print '<input type="hidden" name="token" value="' . newToken() . '" />';
-	print '<input type="hidden" name="socid" value="' . $object->id . '" />';
+	print '<input type="hidden" name="token" value="'.newToken().'" />';
+	print '<input type="hidden" name="socid" value="'.$object->id.'" />';
 	$userlist = $form->select_dolusers('', '', 0, null, 0, '', '', 0, 0, 0, '', 0, '', '', 0, 1);
 	$arrayselected = GETPOST('commercial', 'array');
 	if (empty($arrayselected)) $arrayselected = $object->getSalesRepresentatives($user, 1);
 	print $form->multiselectarray('commercial', $userlist, $arrayselected, null, null, null, null, "90%");
-	print '<input type="submit" class="button valignmiddle" value="' . $langs->trans("Modify") . '" />';
+	print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'" />';
 	print '</form>';
 } else {
 	$listsalesrepresentatives = $object->getSalesRepresentatives($user);
@@ -65,6 +65,6 @@ if ($action == 'editsalesrepresentatives') {
 			print $userstatic->getNomUrl(-1);
 			print ' ';
 		}
-	} else print '<span class="opacitymedium">' . $langs->trans("NoSalesRepresentativeAffected") . '</span>';
+	} else print '<span class="opacitymedium">'.$langs->trans("NoSalesRepresentativeAffected").'</span>';
 	print '</td></tr>';
 }
diff --git a/htdocs/societe/website.php b/htdocs/societe/website.php
index e5041b3ce20..24c4ede34b3 100644
--- a/htdocs/societe/website.php
+++ b/htdocs/societe/website.php
@@ -127,39 +127,39 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 
 if (empty($reshook))
 {
-    // Cancel
-    if (GETPOST('cancel', 'alpha') && !empty($backtopage))
-    {
-        header("Location: ".$backtopage);
-        exit;
-    }
+	// Cancel
+	if (GETPOST('cancel', 'alpha') && !empty($backtopage))
+	{
+		header("Location: ".$backtopage);
+		exit;
+	}
 
-    // Selection of new fields
-    include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
+	// Selection of new fields
+	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
-    // Purge search criteria
-    if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
-    {
-    	foreach ($objectwebsiteaccount->fields as $key => $val)
-    	{
-    		$search[$key] = '';
-    	}
-    	$toselect = '';
-    	$search_array_options = array();
-    }
-    if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')
-    	|| GETPOST('button_search_x', 'alpha') || GETPOST('button_search.x', 'alpha') || GETPOST('button_search', 'alpha'))
-    {
-    	$massaction = ''; // Protection to avoid mass action if we force a new search during a mass action confirmation
-    }
+	// Purge search criteria
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
+	{
+		foreach ($objectwebsiteaccount->fields as $key => $val)
+		{
+			$search[$key] = '';
+		}
+		$toselect = '';
+		$search_array_options = array();
+	}
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')
+		|| GETPOST('button_search_x', 'alpha') || GETPOST('button_search.x', 'alpha') || GETPOST('button_search', 'alpha'))
+	{
+		$massaction = ''; // Protection to avoid mass action if we force a new search during a mass action confirmation
+	}
 
-    // Mass actions
-    $objectclass = 'WebsiteAccount';
-    $objectlabel = 'WebsiteAccount';
-    $permissiontoread = $user->rights->societe->lire;
-    $permissiontodelete = $user->rights->societe->supprimer;
-    $uploaddir = $conf->societe->dir_output;
-    include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
+	// Mass actions
+	$objectclass = 'WebsiteAccount';
+	$objectlabel = 'WebsiteAccount';
+	$permissiontoread = $user->rights->societe->lire;
+	$permissiontodelete = $user->rights->societe->supprimer;
+	$uploaddir = $conf->societe->dir_output;
+	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }
 
 
@@ -231,14 +231,14 @@ print '</table>';
 
 print '</div>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 $newcardbutton = '';
 if (!empty($conf->website->enabled)) {
 	if (!empty($user->rights->societe->lire)) {
 		$newcardbutton .= dolGetButtonTitle($langs->trans("AddWebsiteAccount"), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/website/websiteaccount_card.php?action=create&fk_soc='.$object->id.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?id='.$object->id));
-    } else {
-    	$newcardbutton .= dolGetButtonTitle($langs->trans("AddAction"), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/website/websiteaccount_card.php?action=create&fk_soc='.$object->id.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?id='.$object->id), '', 0);
+	} else {
+		$newcardbutton .= dolGetButtonTitle($langs->trans("AddAction"), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/website/websiteaccount_card.php?action=create&fk_soc='.$object->id.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?id='.$object->id), '', 0);
 	}
 }
 
diff --git a/htdocs/stripe/admin/stripe.php b/htdocs/stripe/admin/stripe.php
index 2cc80871679..6bf8bcb0fa1 100644
--- a/htdocs/stripe/admin/stripe.php
+++ b/htdocs/stripe/admin/stripe.php
@@ -82,11 +82,11 @@ if ($action == 'setvalue' && $user->admin)
 	$result = dolibarr_set_const($db, "STRIPE_BANK_ACCOUNT_FOR_PAYMENTS", GETPOST('STRIPE_BANK_ACCOUNT_FOR_PAYMENTS', 'int'), 'chaine', 0, '', $conf->entity);
 	if (!$result > 0)
 		$error++;
-    $result = dolibarr_set_const($db, "STRIPE_USER_ACCOUNT_FOR_ACTIONS", GETPOST('STRIPE_USER_ACCOUNT_FOR_ACTIONS', 'int'), 'chaine', 0, '', $conf->entity);
-    if (!$result > 0) {
-        $error++;
-    }
-    $result = dolibarr_set_const($db, "STRIPE_BANK_ACCOUNT_FOR_BANKTRANSFERS", GETPOST('STRIPE_BANK_ACCOUNT_FOR_BANKTRANSFERS', 'int'), 'chaine', 0, '', $conf->entity);
+	$result = dolibarr_set_const($db, "STRIPE_USER_ACCOUNT_FOR_ACTIONS", GETPOST('STRIPE_USER_ACCOUNT_FOR_ACTIONS', 'int'), 'chaine', 0, '', $conf->entity);
+	if (!$result > 0) {
+		$error++;
+	}
+	$result = dolibarr_set_const($db, "STRIPE_BANK_ACCOUNT_FOR_BANKTRANSFERS", GETPOST('STRIPE_BANK_ACCOUNT_FOR_BANKTRANSFERS', '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);
@@ -180,10 +180,10 @@ print '<tr class="oddeven">';
 print '<td class="titlefield">';
 print $langs->trans("StripeLiveEnabled").'</td><td>';
 if ($conf->use_javascript_ajax) {
-    print ajax_constantonoff('STRIPE_LIVE');
+	print ajax_constantonoff('STRIPE_LIVE');
 } else {
-    $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
-    print $form->selectarray("STRIPE_LIVE", $arrval, $conf->global->STRIPE_LIVE);
+	$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+	print $form->selectarray("STRIPE_LIVE", $arrval, $conf->global->STRIPE_LIVE);
 }
 print '</td><td></td></tr>';
 
@@ -204,47 +204,47 @@ if (empty($conf->stripeconnect->enabled))
 	print '<tr class="oddeven"><td>';
 	print '<span class="titlefield">'.$langs->trans("STRIPE_TEST_WEBHOOK_KEY").'</span></td><td>';
 	if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {
-	    print '<input class="minwidth300" type="text" name="STRIPE_TEST_WEBHOOK_ID" value="'.$conf->global->STRIPE_TEST_WEBHOOK_ID.'">';
-        print ' &nbsp; <span class="opacitymedium">'.$langs->trans("Example").': we_xxxxxxxxxxxxxxxxxxxxxxxx</span><br>';
+		print '<input class="minwidth300" type="text" name="STRIPE_TEST_WEBHOOK_ID" value="'.$conf->global->STRIPE_TEST_WEBHOOK_ID.'">';
+		print ' &nbsp; <span class="opacitymedium">'.$langs->trans("Example").': we_xxxxxxxxxxxxxxxxxxxxxxxx</span><br>';
 	}
 	print '<input class="minwidth300" type="text" name="STRIPE_TEST_WEBHOOK_KEY" value="'.$conf->global->STRIPE_TEST_WEBHOOK_KEY.'">';
 	print ' &nbsp; <span class="opacitymedium">'.$langs->trans("Example").': whsec_xxxxxxxxxxxxxxxxxxxxxxxx</span>';
 	  $out = img_picto('', 'globe').' '.$langs->trans("ToOfferALinkForTestWebhook").' ';
-    $url = dol_buildpath('/public/stripe/ipn.php?test', 3);
+	$url = dol_buildpath('/public/stripe/ipn.php?test', 3);
 	$out .= '<input type="text" id="onlinetestwebhookurl" class="minwidth500" value="'.$url.'">';
 	$out .= ajax_autoselect("onlinetestwebhookurl", 0);
 	print '<br>'.$out;
 	print '</td><td>';
 	if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
 	{
-	    if (!empty($conf->global->STRIPE_TEST_WEBHOOK_KEY) && !empty($conf->global->STRIPE_TEST_SECRET_KEY) && !empty($conf->global->STRIPE_TEST_WEBHOOK_ID))
-    	{
-            \Stripe\Stripe::setApiKey($conf->global->STRIPE_TEST_SECRET_KEY);
-            $endpoint = \Stripe\WebhookEndpoint::retrieve($conf->global->STRIPE_TEST_WEBHOOK_ID);
-            $endpoint->enabled_events = $stripearrayofwebhookevents;
-            if (GETPOST('webhook', 'alpha') == $conf->global->STRIPE_TEST_WEBHOOK_ID) {
-                if (!GETPOST('status', 'alpha')) {
-                    $endpoint->disabled = true;
-                } else {
-                    $endpoint->disabled = false;
-                }
-            }
-            $endpoint->url = dol_buildpath('/public/stripe/ipn.php?test', 3);
-            $endpoint->save();
-            if ($endpoint->status == 'enabled')
-            {
-            	print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=ipn&webhook='.$endpoint->id.'&status=0">';
-            	print img_picto($langs->trans("Activated"), 'switch_on');
-            } else {
-            	print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=ipn&webhook='.$endpoint->id.'&status=1">';
-            	print img_picto($langs->trans("Disabled"), 'switch_off');
-            }
-            //print $endpoint;
-        } else {
-            print img_picto($langs->trans("inactive"), 'statut5');
-        }
+		if (!empty($conf->global->STRIPE_TEST_WEBHOOK_KEY) && !empty($conf->global->STRIPE_TEST_SECRET_KEY) && !empty($conf->global->STRIPE_TEST_WEBHOOK_ID))
+		{
+			\Stripe\Stripe::setApiKey($conf->global->STRIPE_TEST_SECRET_KEY);
+			$endpoint = \Stripe\WebhookEndpoint::retrieve($conf->global->STRIPE_TEST_WEBHOOK_ID);
+			$endpoint->enabled_events = $stripearrayofwebhookevents;
+			if (GETPOST('webhook', 'alpha') == $conf->global->STRIPE_TEST_WEBHOOK_ID) {
+				if (!GETPOST('status', 'alpha')) {
+					$endpoint->disabled = true;
+				} else {
+					$endpoint->disabled = false;
+				}
+			}
+			$endpoint->url = dol_buildpath('/public/stripe/ipn.php?test', 3);
+			$endpoint->save();
+			if ($endpoint->status == 'enabled')
+			{
+				print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=ipn&webhook='.$endpoint->id.'&status=0">';
+				print img_picto($langs->trans("Activated"), 'switch_on');
+			} else {
+				print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=ipn&webhook='.$endpoint->id.'&status=1">';
+				print img_picto($langs->trans("Disabled"), 'switch_off');
+			}
+			//print $endpoint;
+		} else {
+			print img_picto($langs->trans("inactive"), 'statut5');
+		}
 	}
-    print'</td></tr>';
+	print'</td></tr>';
 } else {
 	print '<tr class="oddeven"><td>'.$langs->trans("StripeConnect").'</td>';
 	print '<td><b>'.$langs->trans("StripeConnect_Mode").'</b><br/>';
@@ -273,47 +273,47 @@ if (empty($conf->stripeconnect->enabled))
 	print '<tr class="oddeven"><td>';
 	print '<span class="titlefield">'.$langs->trans("STRIPE_LIVE_WEBHOOK_KEY").'</span></td><td>';
 	if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {
-        print '<input class="minwidth300" type="text" name="STRIPE_LIVE_WEBHOOK_ID" value="'.$conf->global->STRIPE_LIVE_WEBHOOK_ID.'">';
-        print ' &nbsp; <span class="opacitymedium">'.$langs->trans("Example").': we_xxxxxxxxxxxxxxxxxxxxxxxx</span><br>';
+		print '<input class="minwidth300" type="text" name="STRIPE_LIVE_WEBHOOK_ID" value="'.$conf->global->STRIPE_LIVE_WEBHOOK_ID.'">';
+		print ' &nbsp; <span class="opacitymedium">'.$langs->trans("Example").': we_xxxxxxxxxxxxxxxxxxxxxxxx</span><br>';
 	}
 	print '<input class="minwidth300" type="text" name="STRIPE_LIVE_WEBHOOK_KEY" value="'.$conf->global->STRIPE_LIVE_WEBHOOK_KEY.'">';
 	print ' &nbsp; <span class="opacitymedium">'.$langs->trans("Example").': whsec_xxxxxxxxxxxxxxxxxxxxxxxx</span>';
-    $out = img_picto('', 'globe').' '.$langs->trans("ToOfferALinkForLiveWebhook").' ';
-    $url = dol_buildpath('/public/stripe/ipn.php', 3);
+	$out = img_picto('', 'globe').' '.$langs->trans("ToOfferALinkForLiveWebhook").' ';
+	$url = dol_buildpath('/public/stripe/ipn.php', 3);
 	$out .= '<input type="text" id="onlinelivewebhookurl" class="minwidth500" value="'.$url.'">';
 	$out .= ajax_autoselect("onlinelivewebhookurl", 0);
 	print '<br>'.$out;
 	print '</td><td>';
 	if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
 	{
-	    if (!empty($conf->global->STRIPE_LIVE_WEBHOOK_KEY) && !empty($conf->global->STRIPE_LIVE_SECRET_KEY) && !empty($conf->global->STRIPE_LIVE_WEBHOOK_ID))
-	    {
-            \Stripe\Stripe::setApiKey($conf->global->STRIPE_LIVE_SECRET_KEY);
-            $endpoint = \Stripe\WebhookEndpoint::retrieve($conf->global->STRIPE_LIVE_WEBHOOK_ID);
-            $endpoint->enabled_events = $stripearrayofwebhookevents;
-            if (GETPOST('webhook', 'alpha') == $conf->global->STRIPE_LIVE_WEBHOOK_ID) {
-                if (empty(GETPOST('status', 'alpha'))) {
-                    $endpoint->disabled = true;
-                } else {
-                    $endpoint->disabled = false;
-                }
-            }
-            $endpoint->url = dol_buildpath('/public/stripe/ipn.php', 3);
-            $endpoint->save();
-            if ($endpoint->status == 'enabled')
-            {
-                print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=ipn&webhook='.$endpoint->id.'&status=0">';
-                print img_picto($langs->trans("Activated"), 'switch_on');
-            } else {
-                print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=ipn&webhook='.$endpoint->id.'&status=1">';
-                print img_picto($langs->trans("Disabled"), 'switch_off');
-            }
-            //print $endpoint;
-        } else {
-            print img_picto($langs->trans("inactive"), 'statut5');
-        }
+		if (!empty($conf->global->STRIPE_LIVE_WEBHOOK_KEY) && !empty($conf->global->STRIPE_LIVE_SECRET_KEY) && !empty($conf->global->STRIPE_LIVE_WEBHOOK_ID))
+		{
+			\Stripe\Stripe::setApiKey($conf->global->STRIPE_LIVE_SECRET_KEY);
+			$endpoint = \Stripe\WebhookEndpoint::retrieve($conf->global->STRIPE_LIVE_WEBHOOK_ID);
+			$endpoint->enabled_events = $stripearrayofwebhookevents;
+			if (GETPOST('webhook', 'alpha') == $conf->global->STRIPE_LIVE_WEBHOOK_ID) {
+				if (empty(GETPOST('status', 'alpha'))) {
+					$endpoint->disabled = true;
+				} else {
+					$endpoint->disabled = false;
+				}
+			}
+			$endpoint->url = dol_buildpath('/public/stripe/ipn.php', 3);
+			$endpoint->save();
+			if ($endpoint->status == 'enabled')
+			{
+				print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=ipn&webhook='.$endpoint->id.'&status=0">';
+				print img_picto($langs->trans("Activated"), 'switch_on');
+			} else {
+				print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=ipn&webhook='.$endpoint->id.'&status=1">';
+				print img_picto($langs->trans("Disabled"), 'switch_off');
+			}
+			//print $endpoint;
+		} else {
+			print img_picto($langs->trans("inactive"), 'statut5');
+		}
 	}
-    print '</td></tr>';
+	print '</td></tr>';
 } else {
 	print '<tr class="oddeven"><td>'.$langs->trans("StripeConnect").'</td>';
 	print '<td>'.$langs->trans("StripeConnect_Mode").'</td><td></td></tr>';
@@ -358,14 +358,14 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2)	// What is this for ?
 // Activate Payment Request API
 if ($conf->global->MAIN_FEATURES_LEVEL >= 2)	// TODO Not used by current code
 {
-    print '<tr class="oddeven"><td>';
+	print '<tr class="oddeven"><td>';
 	print $langs->trans("STRIPE_PAYMENT_REQUEST_API").'</td><td>';
-    if ($conf->use_javascript_ajax) {
-        print ajax_constantonoff('STRIPE_PAYMENT_REQUEST_API');
-    } else {
-        $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
-        print $form->selectarray("STRIPE_PAYMENT_REQUEST_API", $arrval, $conf->global->STRIPE_PAYMENT_REQUEST_API);
-    }
+	if ($conf->use_javascript_ajax) {
+		print ajax_constantonoff('STRIPE_PAYMENT_REQUEST_API');
+	} else {
+		$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+		print $form->selectarray("STRIPE_PAYMENT_REQUEST_API", $arrval, $conf->global->STRIPE_PAYMENT_REQUEST_API);
+	}
 	print '</td></tr>';
 }
 
@@ -374,12 +374,12 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2)	// TODO Not used by current code
 {
 	print '<tr class="oddeven"><td>';
 	print $langs->trans("STRIPE_SEPA_DIRECT_DEBIT").'</td><td>';
-    if ($conf->use_javascript_ajax) {
-        print ajax_constantonoff('STRIPE_SEPA_DIRECT_DEBIT');
-    } else {
-        $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
-        print $form->selectarray("STRIPE_SEPA_DIRECT_DEBIT", $arrval, $conf->global->STRIPE_SEPA_DIRECT_DEBIT);
-    }
+	if ($conf->use_javascript_ajax) {
+		print ajax_constantonoff('STRIPE_SEPA_DIRECT_DEBIT');
+	} else {
+		$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+		print $form->selectarray("STRIPE_SEPA_DIRECT_DEBIT", $arrval, $conf->global->STRIPE_SEPA_DIRECT_DEBIT);
+	}
 	print '</td></tr>';
 }
 
@@ -444,7 +444,7 @@ print '<input class="minwidth300"  type="text" id="PAYMENT_SECURITY_TOKEN" name=
 if (!empty($conf->use_javascript_ajax)) {
 	print '&nbsp;'.img_picto($langs->trans('Generate'), 'refresh', 'id="generate_token" class="linkobject"');
 }
-if (! empty($conf->global->PAYMENT_SECURITY_ACCEPT_ANY_TOKEN)) {
+if (!empty($conf->global->PAYMENT_SECURITY_ACCEPT_ANY_TOKEN)) {
 	$langs->load("errors");
 	print img_warning($langs->trans("WarningTheHiddenOptionIsOn", 'PAYMENT_SECURITY_ACCEPT_ANY_TOKEN'), '', 'pictowarning marginleftonly');
 }
@@ -453,16 +453,16 @@ print '</td></tr>';
 print '<tr class="oddeven"><td>';
 print $langs->trans("SecurityTokenIsUnique").'</td><td>';
 if ($conf->use_javascript_ajax) {
-    print ajax_constantonoff('PAYMENT_SECURITY_TOKEN_UNIQUE');
+	print ajax_constantonoff('PAYMENT_SECURITY_TOKEN_UNIQUE');
 } else {
-    $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
-    print $form->selectarray("PAYMENT_SECURITY_TOKEN_UNIQUE", $arrval, $conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE);
+	$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+	print $form->selectarray("PAYMENT_SECURITY_TOKEN_UNIQUE", $arrval, $conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE);
 }
 print '</td></tr>';
 
 print '</table>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Save").'"></div>';
 
diff --git a/htdocs/stripe/class/actions_stripe.class.php b/htdocs/stripe/class/actions_stripe.class.php
index a7a868f7e4a..159444bb029 100644
--- a/htdocs/stripe/class/actions_stripe.class.php
+++ b/htdocs/stripe/class/actions_stripe.class.php
@@ -37,9 +37,9 @@ $langs->load("stripe@stripe");
 class ActionsStripeconnect
 {
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
 	private $config = array();
 
@@ -53,10 +53,10 @@ class ActionsStripeconnect
 	 *
 	 *	@param	DoliDB	$db		Database handler
 	 */
-    public function __construct($db)
-    {
-        $this->db = $db;
-    }
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
 
 
 	/**
@@ -65,10 +65,10 @@ class ActionsStripeconnect
 	 * @param	array	$parameters		Parameters
 	 * @param	Object	$object			Object
 	 * @param	string	$action			Action
-     * @return bool
+	 * @return bool
 	 */
-    public function formObjectOptions($parameters, &$object, &$action)
-    {
+	public function formObjectOptions($parameters, &$object, &$action)
+	{
 		global $db, $conf, $user, $langs, $form;
 
 		if (!empty($conf->stripe->enabled) && (empty($conf->global->STRIPE_LIVE) || GETPOST('forcesandbox', 'alpha')))
@@ -160,7 +160,7 @@ class ActionsStripeconnect
 			$this->resprints .= '</td></tr>';
 		}
 		return 0;
-    }
+	}
 
 	/**
 	 * addMoreActionsButtons
@@ -170,8 +170,8 @@ class ActionsStripeconnect
 	 * @param string	$action		action
 	 * @return int					0
 	 */
-    public function addMoreActionsButtons($parameters, &$object, &$action)
-    {
+	public function addMoreActionsButtons($parameters, &$object, &$action)
+	{
 		global $db, $conf, $user, $langs, $form;
 		if (is_object($object) && $object->element == 'facture') {
 			// On verifie si la facture a des paiements
@@ -220,5 +220,5 @@ class ActionsStripeconnect
 			print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("StripeAutoSubscription")).'">'.$langs->trans("StripeAutoSubscription").'</a>';
 		}
 		return 0;
-    }
+	}
 }
diff --git a/htdocs/stripe/class/stripe.class.php b/htdocs/stripe/class/stripe.class.php
index b1268b2648f..742072cdcc1 100644
--- a/htdocs/stripe/class/stripe.class.php
+++ b/htdocs/stripe/class/stripe.class.php
@@ -186,9 +186,11 @@ class Stripe extends CommonObject
 
 				try {
 					if (empty($key)) {				// If the Stripe connect account not set, we use common API usage
-						$customer = \Stripe\Customer::retrieve("$tiers");
+						//$customer = \Stripe\Customer::retrieve("$tiers");
+						$customer = \Stripe\Customer::retrieve(array('id'=>"$tiers", 'expand[]'=>'sources'));
 					} else {
-						$customer = \Stripe\Customer::retrieve("$tiers", array("stripe_account" => $key));
+						//$customer = \Stripe\Customer::retrieve("$tiers", array("stripe_account" => $key));
+						$customer = \Stripe\Customer::retrieve(array('id'=>"$tiers", 'expand[]'=>'sources'), array("stripe_account" => $key));
 					}
 				} catch (Exception $e)
 				{
@@ -680,7 +682,7 @@ class Stripe extends CommonObject
 	/**
 	 * Get the Stripe card of a company payment mode (option to create it on Stripe if not linked yet is no more available on new Stripe API)
 	 *
-	 * @param	\Stripe\StripeCustomer	$cu								Object stripe customer
+	 * @param	\Stripe\StripeCustomer	$cu								Object stripe customer.
 	 * @param	CompanyPaymentMode		$object							Object companypaymentmode to check, or create on stripe (create on stripe also update the societe_rib table for current entity)
 	 * @param	string					$stripeacc						''=Use common API. If not '', it is the Stripe connect account 'acc_....' to use Stripe connect
 	 * @param	int						$status							Status (0=test, 1=live)
@@ -711,14 +713,14 @@ class Stripe extends CommonObject
 				{
 					try {
 						if (empty($stripeacc)) {				// If the Stripe connect account not set, we use common API usage
-							if (!preg_match('/^pm_/', $cardref))
+							if (!preg_match('/^pm_/', $cardref) && !empty($cu->sources))
 							{
 								$card = $cu->sources->retrieve($cardref);
 							} else {
 								$card = \Stripe\PaymentMethod::retrieve($cardref);
 							}
 						} else {
-							if (!preg_match('/^pm_/', $cardref))
+							if (!preg_match('/^pm_/', $cardref) && !empty($cu->sources))
 							{
 								//$card = $cu->sources->retrieve($cardref, array("stripe_account" => $stripeacc));		// this API fails when array stripe_account is provided
 								$card = $cu->sources->retrieve($cardref);
@@ -740,9 +742,11 @@ class Stripe extends CommonObject
 					$cvc = $obj->cvn; // cvn in database, cvc for stripe
 					$cardholdername = $obj->proprio;
 
+					$ipaddress = getUserRemoteIP();
+
 					$dataforcard = array(
 						"source" => array('object'=>'card', 'exp_month'=>$exp_date_month, 'exp_year'=>$exp_date_year, 'number'=>$number, 'cvc'=>$cvc, 'name'=>$cardholdername),
-						"metadata" => array('dol_id'=>$object->id, 'dol_version'=>DOL_VERSION, 'dol_entity'=>$conf->entity, 'ipaddress'=>(empty($_SERVER['REMOTE_ADDR']) ? '' : $_SERVER['REMOTE_ADDR']))
+						"metadata" => array('dol_id'=>$object->id, 'dol_version'=>DOL_VERSION, 'dol_entity'=>$conf->entity, 'ipaddress'=>$ipaddress)
 					);
 
 					//$a = \Stripe\Stripe::getApiKey();
@@ -887,6 +891,8 @@ class Stripe extends CommonObject
 			$description = "INV=".$ref.".CUS=".$societe->id.".PM=stripe";
 		}
 
+		$ipaddress = getUserRemoteIP();
+
 		$metadata = array(
 			"dol_id" => "".$item."",
 			"dol_type" => "".$origin."",
@@ -894,7 +900,7 @@ class Stripe extends CommonObject
 			'dol_thirdparty_name' => $societe->name,
 			'dol_version'=>DOL_VERSION,
 			'dol_entity'=>$conf->entity,
-			'ipaddress'=>(empty($_SERVER['REMOTE_ADDR']) ? '' : $_SERVER['REMOTE_ADDR'])
+			'ipaddress'=>$ipaddress
 		);
 		$return = new Stripe($this->db);
 		try {
diff --git a/htdocs/stripe/config.php b/htdocs/stripe/config.php
index 4cae940d955..c7fa11df498 100644
--- a/htdocs/stripe/config.php
+++ b/htdocs/stripe/config.php
@@ -34,12 +34,12 @@ global $stripearrayofkeysbyenv;
 
 $stripearrayofkeysbyenv = array(
 	0=>array(
-		"secret_key"      => $conf->global->STRIPE_TEST_SECRET_KEY,
-		"publishable_key" => $conf->global->STRIPE_TEST_PUBLISHABLE_KEY
+		"secret_key"      => empty($conf->global->STRIPE_TEST_SECRET_KEY) ? '' : $conf->global->STRIPE_TEST_SECRET_KEY,
+		"publishable_key" => empty($conf->global->STRIPE_TEST_PUBLISHABLE_KEY) ? '' : $conf->global->STRIPE_TEST_PUBLISHABLE_KEY
 	),
 	1=>array(
-		"secret_key"      => $conf->global->STRIPE_LIVE_SECRET_KEY,
-		"publishable_key" => $conf->global->STRIPE_LIVE_PUBLISHABLE_KEY
+		"secret_key"      => empty($conf->global->STRIPE_LIVE_SECRET_KEY) ? '' : $conf->global->STRIPE_LIVE_SECRET_KEY,
+		"publishable_key" => empty($conf->global->STRIPE_LIVE_PUBLISHABLE_KEY) ? '' : $conf->global->STRIPE_LIVE_PUBLISHABLE_KEY
 	)
 );
 
diff --git a/htdocs/stripe/lib/stripe.lib.php b/htdocs/stripe/lib/stripe.lib.php
index 23771b28c63..bdd05fb47d9 100644
--- a/htdocs/stripe/lib/stripe.lib.php
+++ b/htdocs/stripe/lib/stripe.lib.php
@@ -40,15 +40,15 @@ function stripeadmin_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, 'stripeadmin');
 
 	complete_head_from_modules($conf, $langs, $object, $head, $h, 'stripeadmin', 'remove');
 
-    return $head;
+	return $head;
 }
 
 
@@ -65,16 +65,16 @@ function showStripePaymentUrl($type, $ref)
 	global $conf, $langs;
 
 	$langs->load("paypal");
-    $langs->load("paybox");
+	$langs->load("paybox");
 	$langs->load("stripe");
 
-    $servicename = 'Stripe';
-    $out = '<br><br>';
-    $out .= img_picto('', 'globe').' '.$langs->trans("ToOfferALinkForOnlinePayment", $servicename).'<br>';
-    $url = getStripePaymentUrl(0, $type, $ref);
-    $out .= '<input type="text" id="stripeurl" class="quatrevingtpercent" value="'.$url.'"><br>';
-    $out .= ajax_autoselect("stripeurl", 0);
-    return $out;
+	$servicename = 'Stripe';
+	$out = '<br><br>';
+	$out .= img_picto('', 'globe').' '.$langs->trans("ToOfferALinkForOnlinePayment", $servicename).'<br>';
+	$url = getStripePaymentUrl(0, $type, $ref);
+	$out .= '<input type="text" id="stripeurl" class="quatrevingtpercent" value="'.$url.'"><br>';
+	$out .= ajax_autoselect("stripeurl", 0);
+	return $out;
 }
 
 /**
@@ -93,43 +93,43 @@ function getStripePaymentUrl($mode, $type, $ref = '', $amount = '9.99', $freetag
 
 	$ref = str_replace(' ', '', $ref);
 
-    if ($type == 'free')
-    {
-	    $out = DOL_MAIN_URL_ROOT.'/public/stripe/newpayment.php?amount='.($mode ? '<font color="#666666">' : '').$amount.($mode ? '</font>' : '').'&tag='.($mode ? '<font color="#666666">' : '').$freetag.($mode ? '</font>' : '');
-    }
-    if ($type == 'order')
-    {
-        $out = DOL_MAIN_URL_ROOT.'/public/stripe/newpayment.php?source=order&ref='.($mode ? '<font color="#666666">' : '');
-        if ($mode == 1) $out .= 'order_ref';
-        if ($mode == 0) $out .= urlencode($ref);
-	    $out .= ($mode ? '</font>' : '');
-    }
-    if ($type == 'invoice')
-    {
-        $out = DOL_MAIN_URL_ROOT.'/public/stripe/newpayment.php?source=invoice&ref='.($mode ? '<font color="#666666">' : '');
-        if ($mode == 1) $out .= 'invoice_ref';
-        if ($mode == 0) $out .= urlencode($ref);
-	    $out .= ($mode ? '</font>' : '');
-    }
-    if ($type == 'contractline')
-    {
-        $out = DOL_MAIN_URL_ROOT.'/public/stripe/newpayment.php?source=contractline&ref='.($mode ? '<font color="#666666">' : '');
-        if ($mode == 1) $out .= 'contractline_ref';
-        if ($mode == 0) $out .= urlencode($ref);
-	    $out .= ($mode ? '</font>' : '');
-    }
-    if ($type == 'membersubscription')
-    {
-        $out = DOL_MAIN_URL_ROOT.'/public/stripe/newpayment.php?source=membersubscription&ref='.($mode ? '<font color="#666666">' : '');
-        if ($mode == 1) $out .= 'member_ref';
-        if ($mode == 0) $out .= urlencode($ref);
-	    $out .= ($mode ? '</font>' : '');
-    }
+	if ($type == 'free')
+	{
+		$out = DOL_MAIN_URL_ROOT.'/public/stripe/newpayment.php?amount='.($mode ? '<font color="#666666">' : '').$amount.($mode ? '</font>' : '').'&tag='.($mode ? '<font color="#666666">' : '').$freetag.($mode ? '</font>' : '');
+	}
+	if ($type == 'order')
+	{
+		$out = DOL_MAIN_URL_ROOT.'/public/stripe/newpayment.php?source=order&ref='.($mode ? '<font color="#666666">' : '');
+		if ($mode == 1) $out .= 'order_ref';
+		if ($mode == 0) $out .= urlencode($ref);
+		$out .= ($mode ? '</font>' : '');
+	}
+	if ($type == 'invoice')
+	{
+		$out = DOL_MAIN_URL_ROOT.'/public/stripe/newpayment.php?source=invoice&ref='.($mode ? '<font color="#666666">' : '');
+		if ($mode == 1) $out .= 'invoice_ref';
+		if ($mode == 0) $out .= urlencode($ref);
+		$out .= ($mode ? '</font>' : '');
+	}
+	if ($type == 'contractline')
+	{
+		$out = DOL_MAIN_URL_ROOT.'/public/stripe/newpayment.php?source=contractline&ref='.($mode ? '<font color="#666666">' : '');
+		if ($mode == 1) $out .= 'contractline_ref';
+		if ($mode == 0) $out .= urlencode($ref);
+		$out .= ($mode ? '</font>' : '');
+	}
+	if ($type == 'membersubscription')
+	{
+		$out = DOL_MAIN_URL_ROOT.'/public/stripe/newpayment.php?source=membersubscription&ref='.($mode ? '<font color="#666666">' : '');
+		if ($mode == 1) $out .= 'member_ref';
+		if ($mode == 0) $out .= urlencode($ref);
+		$out .= ($mode ? '</font>' : '');
+	}
 
-    // For multicompany
-    $out .= "&entity=".$conf->entity; // Check the entity because He may be the same reference in several entities
+	// For multicompany
+	$out .= "&entity=".$conf->entity; // Check the entity because He may be the same reference in several entities
 
-    return $out;
+	return $out;
 }
 
 
diff --git a/htdocs/stripe/payout.php b/htdocs/stripe/payout.php
index 6cc093417ad..baa4497f4f2 100644
--- a/htdocs/stripe/payout.php
+++ b/htdocs/stripe/payout.php
@@ -78,8 +78,8 @@ $stripeacc = $stripe->getStripeAccount($service);
 if (!$rowid) {
 	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
 	if ($optioncss != '') {
-        print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
-    }
+		print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+	}
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 	print '<input type="hidden" name="action" value="list">';
@@ -101,7 +101,7 @@ if (!$rowid) {
 	//print_liste_field_titre("CustomerId", $_SERVER["PHP_SELF"], "", "", "", "", $sortfield, $sortorder);
 	//print_liste_field_titre("Origin", $_SERVER["PHP_SELF"], "", "", "", "", $sortfield, $sortorder);
 	print_liste_field_titre("DatePayment", $_SERVER["PHP_SELF"], "", "", "", '', $sortfield, $sortorder, 'center ');
-    print_liste_field_titre("DateOperation", $_SERVER["PHP_SELF"], "", "", "", '', $sortfield, $sortorder, 'center ');
+	print_liste_field_titre("DateOperation", $_SERVER["PHP_SELF"], "", "", "", '', $sortfield, $sortorder, 'center ');
 	print_liste_field_titre("Description", $_SERVER["PHP_SELF"], "", "", "", '', $sortfield, $sortorder, 'left ');
 	print_liste_field_titre("Paid", $_SERVER["PHP_SELF"], "", "", "", '', $sortfield, $sortorder, 'right ');
 	print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "", "", "", '', '', '', 'right ');
@@ -157,14 +157,14 @@ if (!$rowid) {
 			print '<tr class="oddeven">';
 
 			// Ref
-	        if (!empty($stripeacc)) $connect = $stripeacc.'/';
+			if (!empty($stripeacc)) $connect = $stripeacc.'/';
 
 			$url = 'https://dashboard.stripe.com/'.$connect.'test/payouts/'.$payout->id;
 			if ($servicestatus) {
 				$url = 'https://dashboard.stripe.com/'.$connect.'payouts/'.$payout->id;
 			}
 
-	        print "<td><a href='".$url."' target='_stripe'>".img_picto($langs->trans('ShowInStripe'), 'globe')." ".$payout->id."</a></td>\n";
+			print "<td><a href='".$url."' target='_stripe'>".img_picto($langs->trans('ShowInStripe'), 'globe')." ".$payout->id."</a></td>\n";
 
 
 			// Stripe customer
@@ -194,7 +194,7 @@ if (!$rowid) {
 			//print "</td>\n";
 			// Date payment
 			print '<td class="center">'.dol_print_date($payout->created, '%d/%m/%Y %H:%M')."</td>\n";
-	        // Date payment
+			// Date payment
 			print '<td class="center">'.dol_print_date($payout->arrival_date, '%d/%m/%Y %H:%M')."</td>\n";
 			// Type
 			print '<td>'.$payout->description.'</td>';
@@ -203,16 +203,16 @@ if (!$rowid) {
 			// Status
 			print "<td class='right'>";
 			if ($payout->status == 'paid') {
-	            print img_picto($langs->trans("".$payout->status.""), 'statut4');
-	        } elseif ($payout->status == 'pending') {
-	            print img_picto($langs->trans("".$payout->status.""), 'statut7');
-	        } elseif ($payout->status == 'in_transit') {
-	            print img_picto($langs->trans("".$payout->status.""), 'statut7');
-	        } elseif ($payout->status == 'failed') {
-	            print img_picto($langs->trans("".$payout->status.""), 'statut7');
-	        } elseif ($payout->status == 'canceled') {
-	            print img_picto($langs->trans("".$payout->status.""), 'statut8');
-	        }
+				print img_picto($langs->trans("".$payout->status.""), 'statut4');
+			} elseif ($payout->status == 'pending') {
+				print img_picto($langs->trans("".$payout->status.""), 'statut7');
+			} elseif ($payout->status == 'in_transit') {
+				print img_picto($langs->trans("".$payout->status.""), 'statut7');
+			} elseif ($payout->status == 'failed') {
+				print img_picto($langs->trans("".$payout->status.""), 'statut7');
+			} elseif ($payout->status == 'canceled') {
+				print img_picto($langs->trans("".$payout->status.""), 'statut8');
+			}
 			print '</td>';
 			print "</tr>\n";
 		}
diff --git a/htdocs/stripe/transaction.php b/htdocs/stripe/transaction.php
index 8ed8ed906a8..60e09c5d743 100644
--- a/htdocs/stripe/transaction.php
+++ b/htdocs/stripe/transaction.php
@@ -153,26 +153,26 @@ if (!$rowid) {
 			print '<tr class="oddeven">';
 
 			// Ref
-	        if (!empty($stripeacc)) $connect = $stripeacc.'/';
+			if (!empty($stripeacc)) $connect = $stripeacc.'/';
 
 			// Ref
-	        if (preg_match('/po_/i', $txn->source)) {
-	            $origin = "payouts";
-	        } elseif (preg_match('/fee_/i', $txn->source)) {
-	            $origin = "connect/application_fees";
-	        } else {
-	            $origin = "payments";
-	        }
+			if (preg_match('/po_/i', $txn->source)) {
+				$origin = "payouts";
+			} elseif (preg_match('/fee_/i', $txn->source)) {
+				$origin = "connect/application_fees";
+			} else {
+				$origin = "payments";
+			}
 
 			$url = 'https://dashboard.stripe.com/'.$connect.'test/'.$origin.'/'.$txn->source;
 			if ($servicestatus) {
 				$url = 'https://dashboard.stripe.com/'.$connect.$origin.'/'.$txn->source;
 			}
-	        if ($txn->type == 'stripe_fee' || $txn->type == 'reserve_transaction') {
-	            print "<td>".$txn->type."</td>";
-	        } else {
-	            print "<td><a href='".$url."' target='_stripe'>".img_picto($langs->trans('ShowInStripe'), 'globe')." ".$txn->source."</a></td>\n";
-	        }
+			if ($txn->type == 'stripe_fee' || $txn->type == 'reserve_transaction') {
+				print "<td>".$txn->type."</td>";
+			} else {
+				print "<td><a href='".$url."' target='_stripe'>".img_picto($langs->trans('ShowInStripe'), 'globe')." ".$txn->source."</a></td>\n";
+			}
 
 			// Stripe customer
 			//print "<td>".$charge->customer."</td>\n";
@@ -208,13 +208,13 @@ if (!$rowid) {
 			print '<td class="right">'.price(($txn->fee) / 100, 0, '', 1, - 1, - 1, strtoupper($txn->currency))."</td>";
 			// Status
 			print "<td class='right'>";
-	        if ($txn->status == 'available') {
-	            print img_picto($langs->trans("".$txn->status.""), 'statut4');
-	        } elseif ($txn->status == 'pending') {
-	            print img_picto($langs->trans("".$txn->status.""), 'statut7');
-	        } elseif ($txn->status == 'failed') {
-	            print img_picto($langs->trans("".$txn->status.""), 'statut8');
-	        }
+			if ($txn->status == 'available') {
+				print img_picto($langs->trans("".$txn->status.""), 'statut4');
+			} elseif ($txn->status == 'pending') {
+				print img_picto($langs->trans("".$txn->status.""), 'statut7');
+			} elseif ($txn->status == 'failed') {
+				print img_picto($langs->trans("".$txn->status.""), 'statut8');
+			}
 			print '</td>';
 			print "</tr>\n";
 		}
diff --git a/htdocs/supplier_proposal/admin/supplier_proposal_extrafields.php b/htdocs/supplier_proposal/admin/supplier_proposal_extrafields.php
index 67312eb382e..1663ded21ad 100644
--- a/htdocs/supplier_proposal/admin/supplier_proposal_extrafields.php
+++ b/htdocs/supplier_proposal/admin/supplier_proposal_extrafields.php
@@ -68,15 +68,15 @@ print dol_get_fiche_head($head, 'attributes', $langs->trans("CommRequests"), -1,
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_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>";
 }
 
 
@@ -88,10 +88,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';
 }
 
 /* ************************************************************************** */
@@ -101,10 +101,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/supplier_proposal/admin/supplier_proposaldet_extrafields.php b/htdocs/supplier_proposal/admin/supplier_proposaldet_extrafields.php
index 4af017711c7..8e906f2aa57 100644
--- a/htdocs/supplier_proposal/admin/supplier_proposaldet_extrafields.php
+++ b/htdocs/supplier_proposal/admin/supplier_proposaldet_extrafields.php
@@ -73,15 +73,15 @@ print dol_get_fiche_head($head, 'attributeslines', $langs->trans("CommRequests")
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_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/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index 7d70a9d49ba..a703816ce71 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -97,22 +97,22 @@ if ($id > 0 || !empty($ref)) {
 }
 
 // Common permissions
-$usercanread		= $user->rights->supplier_proposal->lire;
+$usercanread = $user->rights->supplier_proposal->lire;
 $usercancreate		= $user->rights->supplier_proposal->creer;
 $usercandelete		= $user->rights->supplier_proposal->supprimer;
 
 // Advanced permissions
-$usercanvalidate	= ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($usercancreate)) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->supplier_proposal->validate_advance)));
-$usercansend		= (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->supplier_proposal->send_advance);
+$usercanvalidate = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($usercancreate)) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->supplier_proposal->validate_advance)));
+$usercansend = (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->supplier_proposal->send_advance);
 
 // Additional area permissions
-$usercanclose		= $user->rights->supplier_proposal->cloturer;
-$usercancreateorder	= $user->rights->fournisseur->commande->creer;
+$usercanclose = $user->rights->supplier_proposal->cloturer;
+$usercancreateorder = $user->rights->fournisseur->commande->creer;
 
 // Permissions for includes
-$permissionnote		= $usercancreate; // Used by the include of actions_setnotes.inc.php
-$permissiondellink	= $usercancreate; // Used by the include of actions_dellink.inc.php
-$permissiontoedit	= $usercancreate; // Used by the include of actions_lineupdown.inc.php
+$permissionnote = $usercancreate; // Used by the include of actions_setnotes.inc.php
+$permissiondellink = $usercancreate; // Used by the include of actions_dellink.inc.php
+$permissiontoedit = $usercancreate; // Used by the include of actions_lineupdown.inc.php
 
 
 /*
@@ -636,7 +636,7 @@ if (empty($reshook))
 
 					// if we use supplier description of the products
 					if (!empty($productsupplier->desc_supplier) && !empty($conf->global->PRODUIT_FOURN_TEXTS)) {
-					    $desc = $productsupplier->desc_supplier;
+						$desc = $productsupplier->desc_supplier;
 					} else $desc = $productsupplier->description;
 
 					if (trim($product_desc) != trim($desc)) $desc = dol_concatdesc($desc, $product_desc, '', !empty($conf->global->MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION));
@@ -686,7 +686,7 @@ if (empty($reshook))
 						$productsupplier->fourn_multicurrency_unitprice,
 						$date_start,
 						$date_end
-                    );
+					);
 
 					//var_dump($tva_tx);var_dump($productsupplier->fourn_pu);var_dump($price_base_type);exit;
 					if ($result < 0)
@@ -1350,7 +1350,7 @@ if ($action == 'create')
 
 	if (!empty($conf->global->SUPPLIER_PROPOSAL_CLONE_ON_CREATE_PAGE)) print '</table>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div class="center">';
 	print '<input type="submit" class="button" value="'.$langs->trans("CreateDraft").'">';
@@ -1804,7 +1804,7 @@ if ($action == 'create')
 	print '</div>';
 	print "</form>\n";
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	if ($action == 'statut')
 	{
diff --git a/htdocs/supplier_proposal/class/api_supplier_proposals.class.php b/htdocs/supplier_proposal/class/api_supplier_proposals.class.php
index ba2fa37e1b9..bf91be32d8d 100644
--- a/htdocs/supplier_proposal/class/api_supplier_proposals.class.php
+++ b/htdocs/supplier_proposal/class/api_supplier_proposals.class.php
@@ -30,185 +30,185 @@ require_once DOL_DOCUMENT_ROOT.'/supplier_proposal/class/supplier_proposal.class
 class Supplierproposals extends DolibarrApi
 {
 
-    /**
-     * @var array   $FIELDS     Mandatory fields, checked when create and update object
-     */
-    static $FIELDS = array(
-        'socid'
-    );
+	/**
+	 * @var array   $FIELDS     Mandatory fields, checked when create and update object
+	 */
+	static $FIELDS = array(
+		'socid'
+	);
 
-    /**
-     * @var SupplierProposal $supplier_proposal {@type SupplierProposal}
-     */
-    public $supplier_proposal;
+	/**
+	 * @var SupplierProposal $supplier_proposal {@type SupplierProposal}
+	 */
+	public $supplier_proposal;
 
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-        global $db, $conf;
-        $this->db = $db;
-        $this->supplier_proposal = new SupplierProposal($this->db);
-    }
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		global $db, $conf;
+		$this->db = $db;
+		$this->supplier_proposal = new SupplierProposal($this->db);
+	}
 
-    /**
-     * Get properties of a supplier proposal (price request) object
-     *
-     * Return an array with supplier proposal informations
-     *
-     * @param       int         $id         ID of supplier proposal
-     * @return 	array|mixed data without useless information
-     *
-     * @throws 	RestException
-     */
-    public function get($id)
-    {
-        if (!DolibarrApiAccess::$user->rights->supplier_proposal->lire) {
-            throw new RestException(401);
-        }
+	/**
+	 * Get properties of a supplier proposal (price request) object
+	 *
+	 * Return an array with supplier proposal informations
+	 *
+	 * @param       int         $id         ID of supplier proposal
+	 * @return 	array|mixed data without useless information
+	 *
+	 * @throws 	RestException
+	 */
+	public function get($id)
+	{
+		if (!DolibarrApiAccess::$user->rights->supplier_proposal->lire) {
+			throw new RestException(401);
+		}
 
-        $result = $this->supplier_proposal->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Supplier Proposal not found');
-        }
+		$result = $this->supplier_proposal->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Supplier Proposal not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('supplier_proposal', $this->propal->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('supplier_proposal', $this->propal->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        $this->supplier_proposal->fetchObjectLinked();
-        return $this->_cleanObjectDatas($this->supplier_proposal);
-    }
+		$this->supplier_proposal->fetchObjectLinked();
+		return $this->_cleanObjectDatas($this->supplier_proposal);
+	}
 
-    /**
-     * List supplier proposals
-     *
-     * Get a list of supplier proposals
-     *
-     * @param string	$sortfield	        Sort field
-     * @param string	$sortorder	        Sort order
-     * @param int		$limit		        Limit for list
-     * @param int		$page		        Page number
-     * @param string   	$thirdparty_ids	    Thirdparty ids to filter supplier proposals (example '1' or '1,2,3') {@pattern /^[0-9,]*$/i}
-     * @param string    $sqlfilters         Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.datec:<:'20160101')"
-     * @return  array                       Array of order objects
-     */
-    public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $thirdparty_ids = '', $sqlfilters = '')
-    {
-        global $db, $conf;
+	/**
+	 * List supplier proposals
+	 *
+	 * Get a list of supplier proposals
+	 *
+	 * @param string	$sortfield	        Sort field
+	 * @param string	$sortorder	        Sort order
+	 * @param int		$limit		        Limit for list
+	 * @param int		$page		        Page number
+	 * @param string   	$thirdparty_ids	    Thirdparty ids to filter supplier proposals (example '1' or '1,2,3') {@pattern /^[0-9,]*$/i}
+	 * @param string    $sqlfilters         Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.datec:<:'20160101')"
+	 * @return  array                       Array of order objects
+	 */
+	public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $thirdparty_ids = '', $sqlfilters = '')
+	{
+		global $db, $conf;
 
-        $obj_ret = array();
+		$obj_ret = array();
 
-        // case of external user, $thirdparty_ids param is ignored and replaced by user's socid
-        $socids = DolibarrApiAccess::$user->socid ? DolibarrApiAccess::$user->socid : $thirdparty_ids;
+		// case of external user, $thirdparty_ids param is ignored and replaced by user's socid
+		$socids = DolibarrApiAccess::$user->socid ? DolibarrApiAccess::$user->socid : $thirdparty_ids;
 
-        // If the internal user must only see his customers, force searching by him
-        $search_sale = 0;
-        if (!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) $search_sale = DolibarrApiAccess::$user->id;
+		// If the internal user must only see his customers, force searching by him
+		$search_sale = 0;
+		if (!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) $search_sale = DolibarrApiAccess::$user->id;
 
-        $sql = "SELECT t.rowid";
-        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
-        $sql .= " FROM ".MAIN_DB_PREFIX."supplier_proposal as t";
+		$sql = "SELECT t.rowid";
+		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
+		$sql .= " FROM ".MAIN_DB_PREFIX."supplier_proposal as t";
 
-        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
+		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
 
-        $sql .= ' WHERE t.entity IN ('.getEntity('propal').')';
-        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= " AND t.fk_soc = sc.fk_soc";
-        if ($socids) $sql .= " AND t.fk_soc IN (".$socids.")";
-        if ($search_sale > 0) $sql .= " AND t.rowid = sc.fk_soc"; // Join for the needed table to filter by sale
-        // Insert sale filter
-        if ($search_sale > 0)
-        {
-            $sql .= " AND sc.fk_user = ".$search_sale;
-        }
-        // Add sql filters
-        if ($sqlfilters)
-        {
-            if (!DolibarrApi::_checkFilters($sqlfilters))
-            {
-                throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
-            }
-            $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-        }
+		$sql .= ' WHERE t.entity IN ('.getEntity('propal').')';
+		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= " AND t.fk_soc = sc.fk_soc";
+		if ($socids) $sql .= " AND t.fk_soc IN (".$socids.")";
+		if ($search_sale > 0) $sql .= " AND t.rowid = sc.fk_soc"; // Join for the needed table to filter by sale
+		// Insert sale filter
+		if ($search_sale > 0)
+		{
+			$sql .= " AND sc.fk_user = ".$search_sale;
+		}
+		// Add sql filters
+		if ($sqlfilters)
+		{
+			if (!DolibarrApi::_checkFilters($sqlfilters))
+			{
+				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+			}
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
 
-        $sql .= $this->db->order($sortfield, $sortorder);
-        if ($limit) {
-            if ($page < 0)
-            {
-                $page = 0;
-            }
-            $offset = $limit * $page;
+		$sql .= $this->db->order($sortfield, $sortorder);
+		if ($limit) {
+			if ($page < 0)
+			{
+				$page = 0;
+			}
+			$offset = $limit * $page;
 
-            $sql .= $this->db->plimit($limit + 1, $offset);
-        }
+			$sql .= $this->db->plimit($limit + 1, $offset);
+		}
 
-        $result = $this->db->query($sql);
+		$result = $this->db->query($sql);
 
-        if ($result)
-        {
-        	$num = $this->db->num_rows($result);
-            $min = min($num, ($limit <= 0 ? $num : $limit));
-            $i = 0;
-            while ($i < $min)
-            {
-            	$obj = $this->db->fetch_object($result);
-            	$propal_static = new SupplierProposal($this->db);
-                if ($propal_static->fetch($obj->rowid)) {
-                    $obj_ret[] = $this->_cleanObjectDatas($propal_static);
-                }
-                $i++;
-            }
-        } else {
-        	throw new RestException(503, 'Error when retrieving supplier proposal list : '.$this->db->lasterror());
-        }
-        if (!count($obj_ret)) {
-            throw new RestException(404, 'No supplier proposal found');
-        }
-        return $obj_ret;
-    }
+		if ($result)
+		{
+			$num = $this->db->num_rows($result);
+			$min = min($num, ($limit <= 0 ? $num : $limit));
+			$i = 0;
+			while ($i < $min)
+			{
+				$obj = $this->db->fetch_object($result);
+				$propal_static = new SupplierProposal($this->db);
+				if ($propal_static->fetch($obj->rowid)) {
+					$obj_ret[] = $this->_cleanObjectDatas($propal_static);
+				}
+				$i++;
+			}
+		} else {
+			throw new RestException(503, 'Error when retrieving supplier proposal list : '.$this->db->lasterror());
+		}
+		if (!count($obj_ret)) {
+			throw new RestException(404, 'No supplier proposal found');
+		}
+		return $obj_ret;
+	}
 
 
-    /**
-     * Validate fields before create or update object
-     *
-     * @param   array           $data   Array with data to verify
-     * @return  array
-     * @throws  RestException
-     */
-    private function _validate($data)
-    {
-        $propal = array();
-        foreach (SupplierProposals::$FIELDS as $field) {
-            if (!isset($data[$field]))
-                throw new RestException(400, "$field field missing");
-            $propal[$field] = $data[$field];
-        }
-        return $propal;
-    }
+	/**
+	 * Validate fields before create or update object
+	 *
+	 * @param   array           $data   Array with data to verify
+	 * @return  array
+	 * @throws  RestException
+	 */
+	private function _validate($data)
+	{
+		$propal = array();
+		foreach (SupplierProposals::$FIELDS as $field) {
+			if (!isset($data[$field]))
+				throw new RestException(400, "$field field missing");
+			$propal[$field] = $data[$field];
+		}
+		return $propal;
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
-    /**
-     * Clean sensible object datas
-     *
-     * @param   object  $object    Object to clean
-     * @return    array    Array of cleaned object properties
-     */
-    protected function _cleanObjectDatas($object)
-    {
-        // phpcs:enable
-        $object = parent::_cleanObjectDatas($object);
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	/**
+	 * Clean sensible object datas
+	 *
+	 * @param   Object  $object     Object to clean
+	 * @return  Object              Object with cleaned properties
+	 */
+	protected function _cleanObjectDatas($object)
+	{
+		// phpcs:enable
+		$object = parent::_cleanObjectDatas($object);
 
-        unset($object->name);
-        unset($object->lastname);
-        unset($object->firstname);
-        unset($object->civility_id);
-        unset($object->address);
-        unset($object->datec);
-        unset($object->datev);
+		unset($object->name);
+		unset($object->lastname);
+		unset($object->firstname);
+		unset($object->civility_id);
+		unset($object->address);
+		unset($object->datec);
+		unset($object->datev);
 
-        return $object;
-    }
+		return $object;
+	}
 }
diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php
index bb8387c55e3..863ec318798 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-2020 Frédéric France          <frederic.france@netlogic.fr>
  * Copyright (C) 2020		Tobias Sekan			<tobias.sekan@startmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -177,8 +177,6 @@ class SupplierProposal extends CommonObject
 	public $nbtodo;
 	public $nbtodolate;
 
-	public $specimen;
-
 	// Multicurrency
 	/**
 	 * @var int ID
@@ -1248,7 +1246,7 @@ class SupplierProposal extends CommonObject
 				$this->socid                = $obj->fk_soc;
 				$this->fk_project           = $obj->fk_project;
 				$this->model_pdf            = $obj->model_pdf;
-				$this->modelpdf             = $obj->model_pdf;	// deprecated
+				$this->modelpdf             = $obj->model_pdf; // deprecated
 				$this->note                 = $obj->note_private; // TODO deprecated
 				$this->note_private         = $obj->note_private;
 				$this->note_public          = $obj->note_public;
@@ -2487,15 +2485,15 @@ class SupplierProposal extends CommonObject
 		$url = '';
 		$result = '';
 
-		$label = img_picto('', $this->picto).' <u>'.$langs->trans("SupplierProposal").'</u>';
+		$label = img_picto('', $this->picto).' <u class="paddingrightonly">'.$langs->trans("SupplierProposal").'</u>';
+		if (isset($this->status)) {
+			$label .= ' '.$this->getLibStatut(5);
+		}
 		if (!empty($this->ref)) $label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
 		if (!empty($this->ref_fourn)) $label .= '<br><b>'.$langs->trans('RefSupplier').':</b> '.$this->ref_fourn;
 		if (!empty($this->total_ht)) $label .= '<br><b>'.$langs->trans('AmountHT').':</b> '.price($this->total_ht, 0, $langs, 0, -1, -1, $conf->currency);
 		if (!empty($this->total_tva)) $label .= '<br><b>'.$langs->trans('VAT').':</b> '.price($this->total_tva, 0, $langs, 0, -1, -1, $conf->currency);
 		if (!empty($this->total_ttc)) $label .= '<br><b>'.$langs->trans('AmountTTC').':</b> '.price($this->total_ttc, 0, $langs, 0, -1, -1, $conf->currency);
-		if (isset($this->status)) {
-		   	$label .= '<br><b>'.$langs->trans("Status").":</b> ".$this->getLibStatut(5);
-		}
 
 		if ($option == '') {
 			$url = DOL_URL_ROOT.'/supplier_proposal/card.php?id='.$this->id.$get_params;
diff --git a/htdocs/supplier_proposal/contact.php b/htdocs/supplier_proposal/contact.php
index b79e054368b..ce76b9d8bf7 100644
--- a/htdocs/supplier_proposal/contact.php
+++ b/htdocs/supplier_proposal/contact.php
@@ -55,11 +55,11 @@ if ($action == 'addcontact' && $permissiontoedit)
 {
 	$result = $object->fetch($id);
 
-    if ($result > 0 && $id > 0)
-    {
-    	$contactid = (GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid'));
+	if ($result > 0 && $id > 0)
+	{
+		$contactid = (GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid'));
   		$result = $object->add_contact($contactid, $_POST["type"], $_POST["source"]);
-    }
+	}
 
 	if ($result >= 0)
 	{
@@ -81,7 +81,7 @@ elseif ($action == 'swapstatut' && $permissiontoedit)
 {
 	if ($object->fetch($id))
 	{
-	    $result = $object->swapContactStatus(GETPOST('ligne'));
+		$result = $object->swapContactStatus(GETPOST('ligne'));
 	} else {
 		dol_print_error($db);
 	}
@@ -147,43 +147,43 @@ if ($id > 0 || !empty($ref))
 		// Project
 		if (!empty($conf->projet->enabled))
 		{
-		    $langs->load("projects");
-		    $morehtmlref .= '<br>'.$langs->trans('Project').' ';
-		    if ($permissiontoedit)
-		    {
-		        if ($action != 'classify') {
-		        	//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+			$langs->load("projects");
+			$morehtmlref .= '<br>'.$langs->trans('Project').' ';
+			if ($permissiontoedit)
+			{
+				if ($action != 'classify') {
+					//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
 					$morehtmlref .= ' : ';
 				}
-	        	if ($action == 'classify') {
-	                //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-	                $morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-	                $morehtmlref .= '<input type="hidden" name="action" value="classin">';
-	                $morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
-	                $morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-	                $morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-	                $morehtmlref .= '</form>';
-	            } else {
-	                $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-	            }
-		    } else {
-		        if (!empty($object->fk_project)) {
-		            $proj = new Project($db);
-		            $proj->fetch($object->fk_project);
-		            $morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
-		            $morehtmlref .= $proj->ref;
-		            $morehtmlref .= '</a>';
-		        } else {
-		            $morehtmlref .= '';
-		        }
-		    }
+				if ($action == 'classify') {
+					//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+					$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+					$morehtmlref .= '<input type="hidden" name="action" value="classin">';
+					$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
+					$morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+					$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+					$morehtmlref .= '</form>';
+				} else {
+					$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+				}
+			} else {
+				if (!empty($object->fk_project)) {
+					$proj = new Project($db);
+					$proj->fetch($object->fk_project);
+					$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
+					$morehtmlref .= $proj->ref;
+					$morehtmlref .= '</a>';
+				} else {
+					$morehtmlref .= '';
+				}
+			}
 		}
 		$morehtmlref .= '</div>';
 
 
 		dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '', 0, '', '', 1);
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 		// Contacts lines
 		include DOL_DOCUMENT_ROOT.'/core/tpl/contacts.tpl.php';
diff --git a/htdocs/supplier_proposal/document.php b/htdocs/supplier_proposal/document.php
index ddf7249d121..127b45466e8 100644
--- a/htdocs/supplier_proposal/document.php
+++ b/htdocs/supplier_proposal/document.php
@@ -110,36 +110,36 @@ if ($object->id > 0)
 	// Project
 	if (!empty($conf->projet->enabled))
 	{
-	    $langs->load("projects");
-	    $morehtmlref .= '<br>'.$langs->trans('Project').' ';
-	    if ($user->rights->supplier_proposal->creer)
-	    {
-	        if ($action != 'classify') {
-	        	//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+		$langs->load("projects");
+		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
+		if ($user->rights->supplier_proposal->creer)
+		{
+			if ($action != 'classify') {
+				//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
 				$morehtmlref .= ' : ';
-            }
-            if ($action == 'classify') {
-                //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-                $morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-                $morehtmlref .= '<input type="hidden" name="action" value="classin">';
-                $morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
-                $morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-                $morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-                $morehtmlref .= '</form>';
-            } else {
-                $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-            }
-	    } else {
-	        if (!empty($object->fk_project)) {
-	            $proj = new Project($db);
-	            $proj->fetch($object->fk_project);
-	            $morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
-	            $morehtmlref .= $proj->ref;
-	            $morehtmlref .= '</a>';
-	        } else {
-	            $morehtmlref .= '';
-	        }
-	    }
+			}
+			if ($action == 'classify') {
+				//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+				$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+				$morehtmlref .= '<input type="hidden" name="action" value="classin">';
+				$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
+				$morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+				$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+				$morehtmlref .= '</form>';
+			} else {
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+			}
+		} else {
+			if (!empty($object->fk_project)) {
+				$proj = new Project($db);
+				$proj->fetch($object->fk_project);
+				$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
+				$morehtmlref .= $proj->ref;
+				$morehtmlref .= '</a>';
+			} else {
+				$morehtmlref .= '';
+			}
+		}
 	}
 	$morehtmlref .= '</div>';
 
@@ -159,7 +159,7 @@ if ($object->id > 0)
 
 	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	$modulepart = 'supplier_proposal';
 	$permission = $user->rights->supplier_proposal->creer;
diff --git a/htdocs/supplier_proposal/index.php b/htdocs/supplier_proposal/index.php
index 6ba425f323a..476c2a14db2 100644
--- a/htdocs/supplier_proposal/index.php
+++ b/htdocs/supplier_proposal/index.php
@@ -67,15 +67,15 @@ 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
 {
-    print '<form method="post" action="'.DOL_URL_ROOT.'/supplier_proposal/list.php">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    print '<div class="div-table-responsive-no-min">';
-    print '<table class="noborder nohover centpercent">';
-    print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
-    print '<tr class="oddeven"><td>';
-    print $langs->trans("SupplierProposal").':</td><td><input type="text" class="flat" name="sall" size="18"></td><td><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
-    print '</tr>';
-    print "</table></div></form><br>\n";
+	print '<form method="post" action="'.DOL_URL_ROOT.'/supplier_proposal/list.php">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<div class="div-table-responsive-no-min">';
+	print '<table class="noborder nohover centpercent">';
+	print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
+	print '<tr class="oddeven"><td>';
+	print $langs->trans("SupplierProposal").':</td><td><input type="text" class="flat" name="sall" size="18"></td><td><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
+	print '</tr>';
+	print "</table></div></form><br>\n";
 }
 
 
@@ -94,76 +94,76 @@ $sql .= " GROUP BY p.fk_statut";
 $resql = $db->query($sql);
 if ($resql)
 {
-    $num = $db->num_rows($resql);
-    $i = 0;
+	$num = $db->num_rows($resql);
+	$i = 0;
 
-    $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)
-    {
-        $row = $db->fetch_row($resql);
-        if ($row)
-        {
-            //if ($row[1]!=-1 && ($row[1]!=3 || $row[2]!=1))
-            {
-                $vals[$row[1]] = $row[0];
-                $totalinprocess += $row[0];
-            }
-            $total += $row[0];
-        }
-        $i++;
-    }
-    $db->free($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)
+	{
+		$row = $db->fetch_row($resql);
+		if ($row)
+		{
+			//if ($row[1]!=-1 && ($row[1]!=3 || $row[2]!=1))
+			{
+				$vals[$row[1]] = $row[0];
+				$totalinprocess += $row[0];
+			}
+			$total += $row[0];
+		}
+		$i++;
+	}
+	$db->free($resql);
 
-    include_once DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/theme_vars.inc.php';
+	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 ($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;
+	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 ($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)
-    {
-        print '<tr><td class="center" colspan="2">';
+		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)
+	{
+		print '<tr><td class="center" colspan="2">';
 
-        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);
+		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);
 
-        print '</td></tr>';
-    }
+		print '</td></tr>';
+	}
 
-    print '<tr class="liste_total"><td>'.$langs->trans("Total").'</td><td class="right">'.$total.'</td></tr>';
-    print "</table></div><br>";
+	print '<tr class="liste_total"><td>'.$langs->trans("Total").'</td><td class="right">'.$total.'</td></tr>';
+	print "</table></div><br>";
 } else {
-    dol_print_error($db);
+	dol_print_error($db);
 }
 
 
@@ -185,7 +185,7 @@ if (!empty($conf->supplier_proposal->enabled))
 	$resql = $db->query($sql);
 	if ($resql)
 	{
-        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="2">'.$langs->trans("DraftRequests").'</th></tr>';
@@ -242,7 +242,7 @@ $sql .= $db->plimit($max, 0);
 $resql = $db->query($sql);
 if ($resql)
 {
-    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="4">'.$langs->trans("LastModifiedRequests", $max).'</th></tr>';
@@ -323,7 +323,7 @@ if (!empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposa
 		$i = 0;
 		if ($num > 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"><th colspan="5">'.$langs->trans("RequestsOpened").' <a href="'.DOL_URL_ROOT.'/supplier_proposal/list.php?search_status=1"><span class="badge">'.$num.'</span></a></th></tr>';
 
diff --git a/htdocs/supplier_proposal/info.php b/htdocs/supplier_proposal/info.php
index b0c189aff92..dbff367b7c8 100644
--- a/htdocs/supplier_proposal/info.php
+++ b/htdocs/supplier_proposal/info.php
@@ -74,36 +74,36 @@ $morehtmlref .= $langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl
 // Project
 if (!empty($conf->projet->enabled))
 {
-    $langs->load("projects");
-    $morehtmlref .= '<br>'.$langs->trans('Project').' ';
-    if ($user->rights->supplier_proposal->creer)
-    {
-        if ($action != 'classify') {
-        	//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+	$langs->load("projects");
+	$morehtmlref .= '<br>'.$langs->trans('Project').' ';
+	if ($user->rights->supplier_proposal->creer)
+	{
+		if ($action != 'classify') {
+			//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
 			$morehtmlref .= ' : ';
-        }
-        if ($action == 'classify') {
-            //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-            $morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-            $morehtmlref .= '<input type="hidden" name="action" value="classin">';
-            $morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
-            $morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-            $morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-            $morehtmlref .= '</form>';
-        } else {
-            $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-        }
-    } else {
-        if (!empty($object->fk_project)) {
-            $proj = new Project($db);
-            $proj->fetch($object->fk_project);
-            $morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
-            $morehtmlref .= $proj->ref;
-            $morehtmlref .= '</a>';
-        } else {
-            $morehtmlref .= '';
-        }
-    }
+		}
+		if ($action == 'classify') {
+			//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+			$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+			$morehtmlref .= '<input type="hidden" name="action" value="classin">';
+			$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
+			$morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+			$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+			$morehtmlref .= '</form>';
+		} else {
+			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+		}
+	} else {
+		if (!empty($object->fk_project)) {
+			$proj = new Project($db);
+			$proj->fetch($object->fk_project);
+			$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
+			$morehtmlref .= $proj->ref;
+			$morehtmlref .= '</a>';
+		} else {
+			$morehtmlref .= '';
+		}
+	}
 }
 $morehtmlref .= '</div>';
 
@@ -122,7 +122,7 @@ print '</td></tr></table>';
 
 print '</div>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // End of page
 llxFooter();
diff --git a/htdocs/supplier_proposal/list.php b/htdocs/supplier_proposal/list.php
index 7f2576ca0f6..5fc27d63a8c 100644
--- a/htdocs/supplier_proposal/list.php
+++ b/htdocs/supplier_proposal/list.php
@@ -408,7 +408,7 @@ if ($resql)
 	$arrayofmassactions = array(
 		'generate_doc'=>$langs->trans("ReGeneratePDF"),
 		'builddoc'=>$langs->trans("PDFMerge"),
-	    //'presend'=>$langs->trans("SendByMail"),
+		//'presend'=>$langs->trans("SendByMail"),
 	);
 	if ($user->rights->supplier_proposal->supprimer) $arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
 	if (in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
diff --git a/htdocs/supplier_proposal/note.php b/htdocs/supplier_proposal/note.php
index 0496b1b5c9d..464f31aaaae 100644
--- a/htdocs/supplier_proposal/note.php
+++ b/htdocs/supplier_proposal/note.php
@@ -72,7 +72,7 @@ if ($id > 0 || !empty($ref))
 
 	if ($object->fetch($id, $ref))
 	{
-	    $object->fetch_thirdparty();
+		$object->fetch_thirdparty();
 
 		$societe = new Societe($db);
 		if ($societe->fetch($object->socid))
@@ -94,36 +94,36 @@ if ($id > 0 || !empty($ref))
 			// Project
 			if (!empty($conf->projet->enabled))
 			{
-			    $langs->load("projects");
-			    $morehtmlref .= '<br>'.$langs->trans('Project').' ';
-			    if ($user->rights->supplier_proposal->creer)
-			    {
-			        if ($action != 'classify') {
-			        	//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+				$langs->load("projects");
+				$morehtmlref .= '<br>'.$langs->trans('Project').' ';
+				if ($user->rights->supplier_proposal->creer)
+				{
+					if ($action != 'classify') {
+						//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
 						$morehtmlref .= ' : ';
-                    }
-		            if ($action == 'classify') {
-		                //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-		                $morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-		                $morehtmlref .= '<input type="hidden" name="action" value="classin">';
-		                $morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
-		                $morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-		                $morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-		                $morehtmlref .= '</form>';
-		            } else {
-		                $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-		            }
-			    } else {
-			        if (!empty($object->fk_project)) {
-			            $proj = new Project($db);
-			            $proj->fetch($object->fk_project);
-			            $morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
-			            $morehtmlref .= $proj->ref;
-			            $morehtmlref .= '</a>';
-			        } else {
-			            $morehtmlref .= '';
-			        }
-			    }
+					}
+					if ($action == 'classify') {
+						//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+						$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+						$morehtmlref .= '<input type="hidden" name="action" value="classin">';
+						$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
+						$morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+						$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+						$morehtmlref .= '</form>';
+					} else {
+						$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+					}
+				} else {
+					if (!empty($object->fk_project)) {
+						$proj = new Project($db);
+						$proj->fetch($object->fk_project);
+						$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
+						$morehtmlref .= $proj->ref;
+						$morehtmlref .= '</a>';
+					} else {
+						$morehtmlref .= '';
+					}
+				}
 			}
 			$morehtmlref .= '</div>';
 
@@ -139,7 +139,7 @@ if ($id > 0 || !empty($ref))
 
 			print '</div>';
 
-			dol_fiche_end();
+			print dol_get_fiche_end();
 		}
 	}
 }
diff --git a/htdocs/supplier_proposal/tpl/linkedobjectblock.tpl.php b/htdocs/supplier_proposal/tpl/linkedobjectblock.tpl.php
index c4891f52f81..ea6f45e18be 100644
--- a/htdocs/supplier_proposal/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/supplier_proposal/tpl/linkedobjectblock.tpl.php
@@ -37,21 +37,21 @@ $total = 0;
 $ilink = 0;
 foreach ($linkedObjectBlock as $key => $objectlink)
 {
-    $ilink++;
+	$ilink++;
 
-    $trclass = 'oddeven';
-    if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass .= ' liste_sub_total';
-    ?>
+	$trclass = 'oddeven';
+	if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass .= ' liste_sub_total';
+	?>
     <tr class="<?php echo $trclass; ?>">
     	<td><?php echo $langs->trans("SupplierProposal"); ?></td>
     	<td><a href="<?php echo DOL_URL_ROOT.'/supplier_proposal/card.php?id='.$objectlink->id ?>"><?php echo img_object($langs->trans("ShowSupplierProposal"), "supplier_proposal").' '.$objectlink->ref; ?></a></td>
     	<td></td>
     	<td class="center"><?php echo dol_print_date($objectlink->datec, 'day'); ?></td>
     	<td class="right"><?php
-    	if ($user->rights->supplier_proposal->lire) {
-    		$total = $total + $objectlink->total_ht;
-    		echo price($objectlink->total_ht);
-    	} ?></td>
+		if ($user->rights->supplier_proposal->lire) {
+			$total = $total + $objectlink->total_ht;
+			echo price($objectlink->total_ht);
+		} ?></td>
     	<td class="right"><?php echo $objectlink->getLibStatut(3); ?></td>
     	<td class="right"><a class="reposition" href="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key; ?>"><?php echo img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink'); ?></a></td>
     </tr>
@@ -59,7 +59,7 @@ foreach ($linkedObjectBlock as $key => $objectlink)
 }
 if (count($linkedObjectBlock) > 1)
 {
-    ?>
+	?>
     <tr class="liste_total <?php echo (empty($noMoreLinkedObjectBlockAfter) ? 'liste_sub_total' : ''); ?>">
         <td><?php echo $langs->trans("Total"); ?></td>
         <td></td>
diff --git a/htdocs/takepos/admin/appearance.php b/htdocs/takepos/admin/appearance.php
index 6107470dec7..25eb8486d1e 100644
--- a/htdocs/takepos/admin/appearance.php
+++ b/htdocs/takepos/admin/appearance.php
@@ -50,16 +50,16 @@ if (GETPOST('action', 'alpha') == 'set')
 	if (!$res > 0) $error++;
 
  	if (!$error)
-    {
-        $db->commit();
-	    setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    } else {
-        $db->rollback();
-	    setEventMessages($langs->trans("Error"), null, 'errors');
-    }
+	{
+		$db->commit();
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
+		$db->rollback();
+		setEventMessages($langs->trans("Error"), null, 'errors');
+	}
 } elseif (GETPOST('action', 'alpha') == 'setmethod')
 {
-    dolibarr_set_const($db, "TAKEPOS_PRINT_METHOD", GETPOST('value', 'alpha'), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "TAKEPOS_PRINT_METHOD", GETPOST('value', 'alpha'), 'chaine', 0, '', $conf->entity);
 }
 
 
diff --git a/htdocs/takepos/admin/receipt.php b/htdocs/takepos/admin/receipt.php
index c41358206dd..0427e239792 100644
--- a/htdocs/takepos/admin/receipt.php
+++ b/htdocs/takepos/admin/receipt.php
@@ -47,7 +47,7 @@ if (GETPOST('action', 'alpha') == 'set')
 	$res = dolibarr_set_const($db, "TAKEPOS_RECEIPT_NAME", GETPOST('TAKEPOS_RECEIPT_NAME', 'alpha'), 'chaine', 0, '', $conf->entity);
 	$res = dolibarr_set_const($db, "TAKEPOS_SHOW_CUSTOMER", GETPOST('TAKEPOS_SHOW_CUSTOMER', 'alpha'), 'chaine', 0, '', $conf->entity);
 	$res = dolibarr_set_const($db, "TAKEPOS_AUTO_PRINT_TICKETS", GETPOST('TAKEPOS_AUTO_PRINT_TICKETS', 'int'), 'int', 0, '', $conf->entity);
-    $res = dolibarr_set_const($db, "TAKEPOS_PRINT_SERVER", GETPOST('TAKEPOS_PRINT_SERVER', 'alpha'), 'chaine', 0, '', $conf->entity);
+	$res = dolibarr_set_const($db, "TAKEPOS_PRINT_SERVER", GETPOST('TAKEPOS_PRINT_SERVER', 'alpha'), 'chaine', 0, '', $conf->entity);
 	$res = dolibarr_set_const($db, "TAKEPOS_PRINT_PAYMENT_METHOD", GETPOST('TAKEPOS_PRINT_PAYMENT_METHOD', 'alpha'), 'chaine', 0, '', $conf->entity);
 
 	dol_syslog("admin/cashdesk: level ".GETPOST('level', 'alpha'));
@@ -55,16 +55,16 @@ if (GETPOST('action', 'alpha') == 'set')
 	if (!$res > 0) $error++;
 
  	if (!$error)
-    {
-        $db->commit();
-	    setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    } else {
-        $db->rollback();
-	    setEventMessages($langs->trans("Error"), null, 'errors');
-    }
+	{
+		$db->commit();
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
+		$db->rollback();
+		setEventMessages($langs->trans("Error"), null, 'errors');
+	}
 } elseif (GETPOST('action', 'alpha') == 'setmethod')
 {
-    dolibarr_set_const($db, "TAKEPOS_PRINT_METHOD", GETPOST('value', 'alpha'), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "TAKEPOS_PRINT_METHOD", GETPOST('value', 'alpha'), 'chaine', 0, '', $conf->entity);
 }
 
 
@@ -102,9 +102,9 @@ print $langs->trans('BrowserMethodDescription');
 print '</td><td class="right">';
 if ($conf->global->TAKEPOS_PRINT_METHOD == "browser")
 {
-    print img_picto($langs->trans("Activated"), 'switch_on');
+	print img_picto($langs->trans("Activated"), 'switch_on');
 } else {
-    print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmethod&token='.newToken().'&value=browser">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+	print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmethod&token='.newToken().'&value=browser">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 }
 print "</td></tr>\n";
 
@@ -139,9 +139,9 @@ print $langs->trans('TakeposConnectorMethodDescription');
 print '</td><td class="right">';
 if ($conf->global->TAKEPOS_PRINT_METHOD == "takeposconnector")
 {
-    print img_picto($langs->trans("Activated"), 'switch_on');
+	print img_picto($langs->trans("Activated"), 'switch_on');
 } else {
-    print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmethod&token='.newToken().'&value=takeposconnector">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+	print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmethod&token='.newToken().'&value=takeposconnector">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 }
 print "</td></tr>\n";
 print '</table>';
diff --git a/htdocs/takepos/admin/setup.php b/htdocs/takepos/admin/setup.php
index 6dfa7127695..804a189de00 100644
--- a/htdocs/takepos/admin/setup.php
+++ b/htdocs/takepos/admin/setup.php
@@ -77,7 +77,7 @@ if ($action == 'set')
 	$res = dolibarr_set_const($db, "TAKEPOS_SORTPRODUCTFIELD", GETPOST('TAKEPOS_SORTPRODUCTFIELD', '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_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);
+	$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)) {
 		$res = dolibarr_set_const($db, "TAKEPOS_SUMUP_AFFILIATE", GETPOST('TAKEPOS_SUMUP_AFFILIATE', 'alpha'), 'chaine', 0, '', $conf->entity);
 		$res = dolibarr_set_const($db, "TAKEPOS_SUMUP_APPID", GETPOST('TAKEPOS_SUMUP_APPID', 'alpha'), 'chaine', 0, '', $conf->entity);
@@ -93,11 +93,11 @@ if ($action == 'set')
 	if (!$res > 0) $error++;
 
  	if (!$error)
-    {
-        $db->commit();
-    } else {
-        $db->rollback();
-    }
+	{
+		$db->commit();
+	} else {
+		$db->rollback();
+	}
 } elseif ($action == 'updateMask') {
 	$maskconst = GETPOST('maskconst', 'alpha');
 	$maskvalue = GETPOST('maskvalue', 'alpha');
@@ -336,14 +336,14 @@ $nboftemplates = $formmail->fetchAllEMailTemplate('facture_send', $user, null, -
 //$arraydefaultmessage = $formmail->getEMailTemplate($db, $tmp[1], $user, null, 0, 1, '');
 $arrayofmessagename = array();
 if (is_array($formmail->lines_model)) {
-    foreach ($formmail->lines_model as $modelmail) {
-        //var_dump($modelmail);
-        $moreonlabel = '';
-        if (!empty($arrayofmessagename[$modelmail->label])) {
-            $moreonlabel = ' <span class="opacitymedium">('.$langs->trans("SeveralLangugeVariatFound").')</span>';
-        }
-        $arrayofmessagename[$modelmail->id] = $langs->trans(preg_replace('/\(|\)/', '', $modelmail->topic)).$moreonlabel;
-    }
+	foreach ($formmail->lines_model as $modelmail) {
+		//var_dump($modelmail);
+		$moreonlabel = '';
+		if (!empty($arrayofmessagename[$modelmail->label])) {
+			$moreonlabel = ' <span class="opacitymedium">('.$langs->trans("SeveralLangugeVariatFound").')</span>';
+		}
+		$arrayofmessagename[$modelmail->id] = $langs->trans(preg_replace('/\(|\)/', '', $modelmail->topic)).$moreonlabel;
+	}
 }
 //var_dump($arraydefaultmessage);
 //var_dump($arrayofmessagename);
diff --git a/htdocs/takepos/admin/terminal.php b/htdocs/takepos/admin/terminal.php
index f12ac1b682f..8ae37c2b8f7 100644
--- a/htdocs/takepos/admin/terminal.php
+++ b/htdocs/takepos/admin/terminal.php
@@ -78,18 +78,18 @@ if (GETPOST('action', 'alpha') == 'set')
 		$res = dolibarr_set_const($db, "CASHDESK_ID_BANKACCOUNT_SUMUP".$terminaltouse, (GETPOST('CASHDESK_ID_BANKACCOUNT_SUMUP'.$terminaltouse, 'alpha') > 0 ? GETPOST('CASHDESK_ID_BANKACCOUNT_SUMUP'.$terminaltouse, 'alpha') : ''), 'chaine', 0, '', $conf->entity);
 	}
 	foreach ($paiements as $modep) {
-        if (in_array($modep->code, array('LIQ', 'CB', 'CHQ'))) continue;
-        $name = "CASHDESK_ID_BANKACCOUNT_".$modep->code.$terminaltouse;
+		if (in_array($modep->code, array('LIQ', 'CB', 'CHQ'))) continue;
+		$name = "CASHDESK_ID_BANKACCOUNT_".$modep->code.$terminaltouse;
 		$res = dolibarr_set_const($db, $name, (GETPOST($name, 'alpha') > 0 ? GETPOST($name, 'alpha') : ''), 'chaine', 0, '', $conf->entity);
-    }
-    $res = dolibarr_set_const($db, "CASHDESK_ID_WAREHOUSE".$terminaltouse, (GETPOST('CASHDESK_ID_WAREHOUSE'.$terminaltouse, 'alpha') > 0 ? GETPOST('CASHDESK_ID_WAREHOUSE'.$terminaltouse, 'alpha') : ''), 'chaine', 0, '', $conf->entity);
-    $res = dolibarr_set_const($db, "CASHDESK_NO_DECREASE_STOCK".$terminaltouse, GETPOST('CASHDESK_NO_DECREASE_STOCK'.$terminaltouse, 'alpha'), 'chaine', 0, '', $conf->entity);
-    $res = dolibarr_set_const($db, "TAKEPOS_PRINTER_TO_USE".$terminaltouse, GETPOST('TAKEPOS_PRINTER_TO_USE'.$terminaltouse, 'alpha'), 'chaine', 0, '', $conf->entity);
-    $res = dolibarr_set_const($db, "TAKEPOS_ORDER_PRINTER1_TO_USE".$terminaltouse, GETPOST('TAKEPOS_ORDER_PRINTER1_TO_USE'.$terminaltouse, 'alpha'), 'chaine', 0, '', $conf->entity);
-    $res = dolibarr_set_const($db, "TAKEPOS_ORDER_PRINTER2_TO_USE".$terminaltouse, GETPOST('TAKEPOS_ORDER_PRINTER2_TO_USE'.$terminaltouse, 'alpha'), 'chaine', 0, '', $conf->entity);
+	}
+	$res = dolibarr_set_const($db, "CASHDESK_ID_WAREHOUSE".$terminaltouse, (GETPOST('CASHDESK_ID_WAREHOUSE'.$terminaltouse, 'alpha') > 0 ? GETPOST('CASHDESK_ID_WAREHOUSE'.$terminaltouse, 'alpha') : ''), 'chaine', 0, '', $conf->entity);
+	$res = dolibarr_set_const($db, "CASHDESK_NO_DECREASE_STOCK".$terminaltouse, GETPOST('CASHDESK_NO_DECREASE_STOCK'.$terminaltouse, 'alpha'), 'chaine', 0, '', $conf->entity);
+	$res = dolibarr_set_const($db, "TAKEPOS_PRINTER_TO_USE".$terminaltouse, GETPOST('TAKEPOS_PRINTER_TO_USE'.$terminaltouse, 'alpha'), 'chaine', 0, '', $conf->entity);
+	$res = dolibarr_set_const($db, "TAKEPOS_ORDER_PRINTER1_TO_USE".$terminaltouse, GETPOST('TAKEPOS_ORDER_PRINTER1_TO_USE'.$terminaltouse, 'alpha'), 'chaine', 0, '', $conf->entity);
+	$res = dolibarr_set_const($db, "TAKEPOS_ORDER_PRINTER2_TO_USE".$terminaltouse, GETPOST('TAKEPOS_ORDER_PRINTER2_TO_USE'.$terminaltouse, 'alpha'), 'chaine', 0, '', $conf->entity);
 	$res = dolibarr_set_const($db, "TAKEPOS_ORDER_PRINTER3_TO_USE".$terminaltouse, GETPOST('TAKEPOS_ORDER_PRINTER3_TO_USE'.$terminaltouse, 'alpha'), 'chaine', 0, '', $conf->entity);
-    $res = dolibarr_set_const($db, "TAKEPOS_TEMPLATE_TO_USE_FOR_INVOICES".$terminaltouse, GETPOST('TAKEPOS_TEMPLATE_TO_USE_FOR_INVOICES'.$terminaltouse, 'alpha'), 'chaine', 0, '', $conf->entity);
-    $res = dolibarr_set_const($db, "TAKEPOS_TEMPLATE_TO_USE_FOR_ORDERS".$terminaltouse, GETPOST('TAKEPOS_TEMPLATE_TO_USE_FOR_ORDERS'.$terminaltouse, 'alpha'), 'chaine', 0, '', $conf->entity);
+	$res = dolibarr_set_const($db, "TAKEPOS_TEMPLATE_TO_USE_FOR_INVOICES".$terminaltouse, GETPOST('TAKEPOS_TEMPLATE_TO_USE_FOR_INVOICES'.$terminaltouse, 'alpha'), 'chaine', 0, '', $conf->entity);
+	$res = dolibarr_set_const($db, "TAKEPOS_TEMPLATE_TO_USE_FOR_ORDERS".$terminaltouse, GETPOST('TAKEPOS_TEMPLATE_TO_USE_FOR_ORDERS'.$terminaltouse, 'alpha'), 'chaine', 0, '', $conf->entity);
 
 	$res = dolibarr_set_const($db, 'CASHDESK_READER_KEYCODE_FOR_ENTER'.$terminaltouse, (GETPOST('CASHDESK_READER_KEYCODE_FOR_ENTER'.$terminaltouse, 'int') > 0 ? GETPOST('CASHDESK_READER_KEYCODE_FOR_ENTER'.$terminaltouse, 'int') : ''), 'chaine', 0, '', $conf->entity);
 
@@ -104,13 +104,13 @@ if (GETPOST('action', 'alpha') == 'set')
 	if (!$res > 0) $error++;
 
  	if (!$error)
-    {
-        $db->commit();
-	    setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    } else {
-        $db->rollback();
-	    setEventMessages($langs->trans("Error"), null, 'errors');
-    }
+	{
+		$db->commit();
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
+		$db->rollback();
+		setEventMessages($langs->trans("Error"), null, 'errors');
+	}
 }
 
 
@@ -149,7 +149,7 @@ print '</td></tr>';
 $atleastonefound = 0;
 if (!empty($conf->banque->enabled))
 {
-    print '<tr class="oddeven"><td>'.$langs->trans("CashDeskBankAccountForSell").'</td>';
+	print '<tr class="oddeven"><td>'.$langs->trans("CashDeskBankAccountForSell").'</td>';
 	print '<td>';
 	$form->select_comptes($conf->global->{'CASHDESK_ID_BANKACCOUNT_CASH'.$terminaltouse}, 'CASHDESK_ID_BANKACCOUNT_CASH'.$terminaltouse, 0, "courant=2", 1);
 	if (!empty($conf->global->{'CASHDESK_ID_BANKACCOUNT_CASH'.$terminaltouse})) $atleastonefound++;
@@ -173,8 +173,8 @@ if (!empty($conf->banque->enabled))
 	}
 
 	foreach ($paiements as $modep) {
-        if (in_array($modep->code, array('LIQ', 'CB', 'CHQ'))) continue; // Already managed before
-        $name = "CASHDESK_ID_BANKACCOUNT_".$modep->code.$terminaltouse;
+		if (in_array($modep->code, array('LIQ', 'CB', 'CHQ'))) continue; // Already managed before
+		$name = "CASHDESK_ID_BANKACCOUNT_".$modep->code.$terminaltouse;
 		print '<tr class="oddeven"><td>'.$langs->trans("CashDeskBankAccountFor").' '.$langs->trans($modep->label).'</td>';
 		print '<td>';
 		if (!empty($conf->global->$name)) $atleastonefound++;
@@ -189,13 +189,13 @@ if (!empty($conf->stock->enabled))
 	print '<tr class="oddeven"><td>'.$langs->trans("CashDeskDoNotDecreaseStock").'</td>'; // Force warehouse (this is not a default value)
 	print '<td>';
 	if (empty($conf->productbatch->enabled) || !empty($conf->global->CASHDESK_FORCE_DECREASE_STOCK)) {
-	    print $form->selectyesno('CASHDESK_NO_DECREASE_STOCK'.$terminal, $conf->global->{'CASHDESK_NO_DECREASE_STOCK'.$terminal}, 1);
+		print $form->selectyesno('CASHDESK_NO_DECREASE_STOCK'.$terminal, $conf->global->{'CASHDESK_NO_DECREASE_STOCK'.$terminal}, 1);
 	} else {
-	    if (!$conf->global->{'CASHDESK_NO_DECREASE_STOCK'.$terminal}) {
-	        $res = dolibarr_set_const($db, "CASHDESK_NO_DECREASE_STOCK".$terminal, 1, 'chaine', 0, '', $conf->entity);
-	    }
-	    print $langs->trans("Yes").'<br>';
-	    print '<span class="opacitymedium">'.$langs->trans('StockDecreaseForPointOfSaleDisabledbyBatch').'</span>';
+		if (!$conf->global->{'CASHDESK_NO_DECREASE_STOCK'.$terminal}) {
+			$res = dolibarr_set_const($db, "CASHDESK_NO_DECREASE_STOCK".$terminal, 1, 'chaine', 0, '', $conf->entity);
+		}
+		print $langs->trans("Yes").'<br>';
+		print '<span class="opacitymedium">'.$langs->trans('StockDecreaseForPointOfSaleDisabledbyBatch').'</span>';
 	}
 	print '</td></tr>';
 
@@ -309,7 +309,7 @@ if ($conf->global->TAKEPOS_ADDON == "terminal") {
 							// Charging the numbering class
 							require_once $dir.$filebis;
 
-                        	$module = new $classname($db);
+							$module = new $classname($db);
 
 							// Show modules according to features level
 							if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
@@ -338,8 +338,8 @@ print '</div>';
 // add free text on each terminal of cash desk
 $substitutionarray = pdf_getSubstitutionArray($langs, null, null, 2);
 $substitutionarray['__(AnyTranslationKey)__'] = $langs->trans('Translation');
-$htmltext = '<i>' . $langs->trans('AvailableVariables') . ':<br>';
-foreach ($substitutionarray as $key => $val)	$htmltext .= $key . '<br>';
+$htmltext = '<i>'.$langs->trans('AvailableVariables').':<br>';
+foreach ($substitutionarray as $key => $val)	$htmltext .= $key.'<br>';
 $htmltext .= '</i>';
 
 print '<br>';
@@ -348,7 +348,7 @@ print load_fiche_titre($langs->trans('FreeLegalTextOnInvoices'), '', '');
 print '<div class="div-table-responsive">';
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
-print '<td>' . $langs->trans("Parameters") . '</td><td>' . $langs->trans('Value') . '</td>';
+print '<td>'.$langs->trans("Parameters").'</td><td>'.$langs->trans('Value').'</td>';
 print '</tr>';
 
 // free text on header
@@ -357,11 +357,11 @@ print '<td>';
 print $form->textwithpicto($langs->trans('Header'), $htmltext, 1, 'help', '', 0, 2, 'freetexttooltip').'<br>';
 print '</td>';
 print '<td>';
-$variablename = 'TAKEPOS_HEADER' . $terminaltouse;
+$variablename = 'TAKEPOS_HEADER'.$terminaltouse;
 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';
+	include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 	$doleditor = new DolEditor($variablename, $conf->global->{$variablename}, '', 80, 'dolibarr_notes');
 	print $doleditor->Create();
 }
@@ -373,11 +373,11 @@ print '<td>';
 print $form->textwithpicto($langs->trans('Footer'), $htmltext, 1, 'help', '', 0, 2, 'freetexttooltip').'<br>';
 print '</td>';
 print '<td>';
-$variablename = 'TAKEPOS_FOOTER' . $terminaltouse;
+$variablename = 'TAKEPOS_FOOTER'.$terminaltouse;
 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';
+	include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 	$doleditor = new DolEditor($variablename, $conf->global->{$variablename}, '', 80, 'dolibarr_notes');
 	print $doleditor->Create();
 }
diff --git a/htdocs/takepos/ajax/ajax.php b/htdocs/takepos/ajax/ajax.php
index 925477092f1..6da8c74361c 100644
--- a/htdocs/takepos/ajax/ajax.php
+++ b/htdocs/takepos/ajax/ajax.php
@@ -50,25 +50,25 @@ if (empty($user->rights->takepos->run)) {
  */
 
 if ($action == 'getProducts') {
-    $object = new Categorie($db);
+	$object = new Categorie($db);
 	if ($category == "supplements") $category = $conf->global->TAKEPOS_SUPPLEMENTS_CATEGORY;
-    $result = $object->fetch($category);
-    if ($result > 0)
-    {
-	    $prods = $object->getObjectsInCateg("product", 0, 0, 0, $conf->global->TAKEPOS_SORTPRODUCTFIELD, 'ASC');
-	    // Removed properties we don't need
-	    if (is_array($prods) && count($prods) > 0)
-	    {
-	    	foreach ($prods as $prod)
-	    	{
-	    		unset($prod->fields);
-	    		unset($prod->db);
-	    	}
-	    }
-    	echo json_encode($prods);
-    } else {
-    	echo 'Failed to load category with id='.$category;
-    }
+	$result = $object->fetch($category);
+	if ($result > 0)
+	{
+		$prods = $object->getObjectsInCateg("product", 0, 0, 0, $conf->global->TAKEPOS_SORTPRODUCTFIELD, 'ASC');
+		// Removed properties we don't need
+		if (is_array($prods) && count($prods) > 0)
+		{
+			foreach ($prods as $prod)
+			{
+				unset($prod->fields);
+				unset($prod->db);
+			}
+		}
+		echo json_encode($prods);
+	} else {
+		echo 'Failed to load category with id='.$category;
+	}
 } elseif ($action == 'search' && $term != '') {
 	// Change thirdparty with barcode
 	require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
@@ -76,14 +76,14 @@ if ($action == 'getProducts') {
 	$thirdparty = new Societe($db);
 	$result = $thirdparty->fetch('', '', '', $term);
 
-	if ( $result && $thirdparty->id > 0) {
-	    $rows = array();
-	    	$rows[] = array(
-	    		'rowid' => $thirdparty->id,
-	    		'name' => $thirdparty->name,
-	    		'barcode' => $thirdparty->barcode,
-          'object' => 'thirdparty'
-	    	);
+	if ($result && $thirdparty->id > 0) {
+		$rows = array();
+			$rows[] = array(
+				'rowid' => $thirdparty->id,
+				'name' => $thirdparty->name,
+				'barcode' => $thirdparty->barcode,
+		  'object' => 'thirdparty'
+			);
 			echo json_encode($rows);
 			exit;
 	}
@@ -102,54 +102,54 @@ if ($action == 'getProducts') {
 		}
 	}
 
-    $sql = 'SELECT rowid, ref, label, tosell, tobuy, barcode, price FROM '.MAIN_DB_PREFIX.'product as p';
-    $sql .= ' WHERE entity IN ('.getEntity('product').')';
-    if ($filteroncategids) {
-    	$sql .= ' AND EXISTS (SELECT cp.fk_product FROM '.MAIN_DB_PREFIX.'categorie_product as cp WHERE cp.fk_product = p.rowid AND cp.fk_categorie IN ('.$filteroncategids.'))';
-    }
-    $sql .= ' AND tosell = 1';
-    $sql .= natural_search(array('ref', 'label', 'barcode'), $term);
-    $resql = $db->query($sql);
+	$sql = 'SELECT rowid, ref, label, tosell, tobuy, barcode, price FROM '.MAIN_DB_PREFIX.'product as p';
+	$sql .= ' WHERE entity IN ('.getEntity('product').')';
+	if ($filteroncategids) {
+		$sql .= ' AND EXISTS (SELECT cp.fk_product FROM '.MAIN_DB_PREFIX.'categorie_product as cp WHERE cp.fk_product = p.rowid AND cp.fk_categorie IN ('.$filteroncategids.'))';
+	}
+	$sql .= ' AND tosell = 1';
+	$sql .= natural_search(array('ref', 'label', 'barcode'), $term);
+	$resql = $db->query($sql);
 	if ($resql)
 	{
-	    $rows = array();
-	    while ($obj = $db->fetch_object($resql)) {
-	    	$rows[] = array(
-	    		'rowid' => $obj->rowid,
-	    		'ref' => $obj->ref,
-	    		'label' => $obj->label,
-	    		'tosell' => $obj->tosell,
-	    		'tobuy' => $obj->tobuy,
-	    		'barcode' => $obj->barcode,
-	    		'price' => $obj->price,
+		$rows = array();
+		while ($obj = $db->fetch_object($resql)) {
+			$rows[] = array(
+				'rowid' => $obj->rowid,
+				'ref' => $obj->ref,
+				'label' => $obj->label,
+				'tosell' => $obj->tosell,
+				'tobuy' => $obj->tobuy,
+				'barcode' => $obj->barcode,
+				'price' => $obj->price,
 			'object' => 'product'
-	    		//'price_formated' => price(price2num($obj->price, 'MU'), 1, $langs, 1, -1, -1, $conf->currency)
-	    	);
-	    }
-	    echo json_encode($rows);
+				//'price_formated' => price(price2num($obj->price, 'MU'), 1, $langs, 1, -1, -1, $conf->currency)
+			);
+		}
+		echo json_encode($rows);
 	} else {
 		echo 'Failed to search product : '.$db->lasterror();
 	}
 } elseif ($action == "opendrawer" && $term != '') {
-    require_once DOL_DOCUMENT_ROOT.'/core/class/dolreceiptprinter.class.php';
-    $printer = new dolReceiptPrinter($db);
-    // check printer for terminal
-    if ($conf->global->{'TAKEPOS_PRINTER_TO_USE'.$term} > 0) {
-        $printer->initPrinter($conf->global->{'TAKEPOS_PRINTER_TO_USE'.$term});
-        // open cashdrawer
-        $printer->pulse();
-        $printer->close();
-    }
+	require_once DOL_DOCUMENT_ROOT.'/core/class/dolreceiptprinter.class.php';
+	$printer = new dolReceiptPrinter($db);
+	// check printer for terminal
+	if ($conf->global->{'TAKEPOS_PRINTER_TO_USE'.$term} > 0) {
+		$printer->initPrinter($conf->global->{'TAKEPOS_PRINTER_TO_USE'.$term});
+		// open cashdrawer
+		$printer->pulse();
+		$printer->close();
+	}
 } elseif ($action == "printinvoiceticket" && $term != '' && $id > 0 && !empty($user->rights->facture->lire)) {
-    require_once DOL_DOCUMENT_ROOT.'/core/class/dolreceiptprinter.class.php';
-    require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-    $printer = new dolReceiptPrinter($db);
-    // check printer for terminal
-    if (($conf->global->{'TAKEPOS_PRINTER_TO_USE'.$term} > 0 || $conf->global->TAKEPOS_PRINT_METHOD == "takeposconnector") && $conf->global->{'TAKEPOS_TEMPLATE_TO_USE_FOR_INVOICES'.$term} > 0) {
-        $object = new Facture($db);
-        $object->fetch($id);
-        $ret = $printer->sendToPrinter($object, $conf->global->{'TAKEPOS_TEMPLATE_TO_USE_FOR_INVOICES'.$term}, $conf->global->{'TAKEPOS_PRINTER_TO_USE'.$term});
-    }
+	require_once DOL_DOCUMENT_ROOT.'/core/class/dolreceiptprinter.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+	$printer = new dolReceiptPrinter($db);
+	// check printer for terminal
+	if (($conf->global->{'TAKEPOS_PRINTER_TO_USE'.$term} > 0 || $conf->global->TAKEPOS_PRINT_METHOD == "takeposconnector") && $conf->global->{'TAKEPOS_TEMPLATE_TO_USE_FOR_INVOICES'.$term} > 0) {
+		$object = new Facture($db);
+		$object->fetch($id);
+		$ret = $printer->sendToPrinter($object, $conf->global->{'TAKEPOS_TEMPLATE_TO_USE_FOR_INVOICES'.$term}, $conf->global->{'TAKEPOS_PRINTER_TO_USE'.$term});
+	}
 } elseif ($action == 'getInvoice') {
 	require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 
@@ -163,6 +163,6 @@ if ($action == 'getProducts') {
 	$place = GETPOST('place', 'alpha');
 	require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/dolreceiptprinter.class.php';
-    $printer = new dolReceiptPrinter($db);
-    $printer->sendToPrinter($object, $conf->global->{'TAKEPOS_TEMPLATE_TO_USE_FOR_INVOICES'.$term}, $conf->global->{'TAKEPOS_PRINTER_TO_USE'.$term});
+	$printer = new dolReceiptPrinter($db);
+	$printer->sendToPrinter($object, $conf->global->{'TAKEPOS_TEMPLATE_TO_USE_FOR_INVOICES'.$term}, $conf->global->{'TAKEPOS_PRINTER_TO_USE'.$term});
 }
diff --git a/htdocs/takepos/css/pos.css.php b/htdocs/takepos/css/pos.css.php
index b9db20ab516..416980633ca 100644
--- a/htdocs/takepos/css/pos.css.php
+++ b/htdocs/takepos/css/pos.css.php
@@ -454,7 +454,7 @@ p.description_content{
 div.description_content {
 	display: -webkit-box;
     -webkit-box-orient: vertical;
-    -webkit-line-clamp: <?php echo $conf->global->TAKEPOS_LINES_TO_SHOW;?>;
+    -webkit-line-clamp: <?php echo $conf->global->TAKEPOS_LINES_TO_SHOW; ?>;
     overflow: hidden;
     padding-left: 2px;
     padding-right: 2px;
diff --git a/htdocs/takepos/floors.php b/htdocs/takepos/floors.php
index af82d584bc5..2179e9141bc 100644
--- a/htdocs/takepos/floors.php
+++ b/htdocs/takepos/floors.php
@@ -58,36 +58,36 @@ if (empty($user->rights->takepos->run)) {
 
 if ($action == "getTables")
 {
-    $sql = "SELECT rowid, entity, label, leftpos, toppos, floor FROM ".MAIN_DB_PREFIX."takepos_floor_tables where floor=".$floor;
-    $resql = $db->query($sql);
-    $rows = array();
-    while ($row = $db->fetch_array($resql)) {
-        $rows[] = $row;
-    }
-    echo json_encode($rows);
-    exit;
+	$sql = "SELECT rowid, entity, label, leftpos, toppos, floor FROM ".MAIN_DB_PREFIX."takepos_floor_tables where floor=".$floor;
+	$resql = $db->query($sql);
+	$rows = array();
+	while ($row = $db->fetch_array($resql)) {
+		$rows[] = $row;
+	}
+	echo json_encode($rows);
+	exit;
 }
 
 if ($action == "update")
 {
-    if ($left > 95) $left = 95;
-    if ($top > 95) $top = 95;
-    if ($left > 3 or $top > 4) $db->query("UPDATE ".MAIN_DB_PREFIX."takepos_floor_tables set leftpos=".$left.", toppos=".$top." WHERE rowid='".$place."'");
-    else $db->query("DELETE from ".MAIN_DB_PREFIX."takepos_floor_tables where rowid='".$place."'");
+	if ($left > 95) $left = 95;
+	if ($top > 95) $top = 95;
+	if ($left > 3 or $top > 4) $db->query("UPDATE ".MAIN_DB_PREFIX."takepos_floor_tables set leftpos=".$left.", toppos=".$top." WHERE rowid='".$place."'");
+	else $db->query("DELETE from ".MAIN_DB_PREFIX."takepos_floor_tables where rowid='".$place."'");
 }
 
 if ($action == "updatename")
 {
-    $newname = preg_replace("/[^a-zA-Z0-9\s]/", "", $newname); // Only English chars
-    if (strlen($newname) > 3) $newname = substr($newname, 0, 3); // Only 3 chars
-    $db->query("UPDATE ".MAIN_DB_PREFIX."takepos_floor_tables set label='".$db->escape($newname)."' WHERE rowid='".$place."'");
+	$newname = preg_replace("/[^a-zA-Z0-9\s]/", "", $newname); // Only English chars
+	if (strlen($newname) > 3) $newname = substr($newname, 0, 3); // Only 3 chars
+	$db->query("UPDATE ".MAIN_DB_PREFIX."takepos_floor_tables set label='".$db->escape($newname)."' WHERE rowid='".$place."'");
 }
 
 if ($action == "add")
 {
-    $sql = "INSERT INTO ".MAIN_DB_PREFIX."takepos_floor_tables(entity, label, leftpos, toppos, floor) VALUES (".$conf->entity.", '', '45', '45', ".$floor.")";
-    $asdf = $db->query($sql);
-    $db->query("update ".MAIN_DB_PREFIX."takepos_floor_tables set label=rowid where label=''"); // No empty table names
+	$sql = "INSERT INTO ".MAIN_DB_PREFIX."takepos_floor_tables(entity, label, leftpos, toppos, floor) VALUES (".$conf->entity.", '', '45', '45', ".$floor.")";
+	$asdf = $db->query($sql);
+	$db->query("update ".MAIN_DB_PREFIX."takepos_floor_tables set label=rowid where label=''"); // No empty table names
 }
 
 
diff --git a/htdocs/takepos/genimg/index.php b/htdocs/takepos/genimg/index.php
index 9ec730bfad8..bdd237d1a15 100644
--- a/htdocs/takepos/genimg/index.php
+++ b/htdocs/takepos/genimg/index.php
@@ -83,7 +83,7 @@ if ($query == "cat")
 		}
 	}
 } else {
-    // TODO We don't need this. Size of image must be defined on HTML page, image must NOT be resize when downloaded.
+	// TODO We don't need this. Size of image must be defined on HTML page, image must NOT be resize when downloaded.
 
 	// The file
 	$filename = $query.".jpg";
diff --git a/htdocs/takepos/index.php b/htdocs/takepos/index.php
index a30ccc2935f..f76f46fa579 100644
--- a/htdocs/takepos/index.php
+++ b/htdocs/takepos/index.php
@@ -73,8 +73,8 @@ $maxcategbydefaultforthisdevice = 12;
 $maxproductbydefaultforthisdevice = 24;
 if ($conf->browser->layout == 'phone')
 {
-    $maxcategbydefaultforthisdevice = 8;
-    $maxproductbydefaultforthisdevice = 16;
+	$maxcategbydefaultforthisdevice = 8;
+	$maxproductbydefaultforthisdevice = 16;
 	//REDIRECT TO BASIC LAYOUT IF TERMINAL SELECTED AND BASIC MOBILE LAYOUT ENABLED
 	if ($_SESSION["takeposterminal"] != "" && $conf->global->TAKEPOS_PHONE_BASIC_LAYOUT == 1)
 	{
@@ -130,14 +130,14 @@ $categories = $categorie->get_full_arbo('product', (($conf->global->TAKEPOS_ROOT
 $levelofrootcategory = 0;
 if ($conf->global->TAKEPOS_ROOT_CATEGORY_ID > 0)
 {
-    foreach ($categories as $key => $categorycursor)
-    {
-        if ($categorycursor['id'] == $conf->global->TAKEPOS_ROOT_CATEGORY_ID)
-        {
-            $levelofrootcategory = $categorycursor['level'];
-            break;
-        }
-    }
+	foreach ($categories as $key => $categorycursor)
+	{
+		if ($categorycursor['id'] == $conf->global->TAKEPOS_ROOT_CATEGORY_ID)
+		{
+			$levelofrootcategory = $categorycursor['level'];
+			break;
+		}
+	}
 }
 $levelofmaincategories = $levelofrootcategory + 1;
 
@@ -145,12 +145,12 @@ $maincategories = array();
 $subcategories = array();
 foreach ($categories as $key => $categorycursor)
 {
-    if ($categorycursor['level'] == $levelofmaincategories)
-    {
-        $maincategories[$key] = $categorycursor;
-    } else {
-        $subcategories[$key] = $categorycursor;
-    }
+	if ($categorycursor['level'] == $levelofmaincategories)
+	{
+		$maincategories[$key] = $categorycursor;
+	} else {
+		$subcategories[$key] = $categorycursor;
+	}
 }
 
 $maincategories = dol_sort_array($maincategories, 'label');
@@ -938,9 +938,9 @@ $resql = $db->query($sql);
 $paiementsModes = array();
 if ($resql) {
 	while ($obj = $db->fetch_object($resql)) {
-        $paycode = $obj->code;
-        if ($paycode == 'LIQ') $paycode = 'CASH';
-        if ($paycode == 'CHQ') $paycode = 'CHEQUE';
+		$paycode = $obj->code;
+		if ($paycode == 'LIQ') $paycode = 'CASH';
+		if ($paycode == 'CHQ') $paycode = 'CHEQUE';
 
 		$constantforkey = "CASHDESK_ID_BANKACCOUNT_".$paycode.$_SESSION["takeposterminal"];
 		//var_dump($constantforkey.' '.$conf->global->$constantforkey);
@@ -962,10 +962,10 @@ $r = 0;
 
 if (empty($conf->global->TAKEPOS_BAR_RESTAURANT))
 {
-    $menus[$r++] = array('title'=>'<span class="fa fa-layer-group paddingrightonly"></span><div class="trunc">'.$langs->trans("New").'</div>', 'action'=>'New();');
+	$menus[$r++] = array('title'=>'<span class="fa fa-layer-group paddingrightonly"></span><div class="trunc">'.$langs->trans("New").'</div>', 'action'=>'New();');
 } else {
-    // BAR RESTAURANT specific menu
-    $menus[$r++] = array('title'=>'<span class="fa fa-layer-group paddingrightonly"></span><div class="trunc">'.$langs->trans("Place").'</div>', 'action'=>'Floors();');
+	// BAR RESTAURANT specific menu
+	$menus[$r++] = array('title'=>'<span class="fa fa-layer-group paddingrightonly"></span><div class="trunc">'.$langs->trans("Place").'</div>', 'action'=>'Floors();');
 }
 
 if (!empty($conf->global->TAKEPOS_HIDE_HEAD_BAR)) {
@@ -990,7 +990,7 @@ if ($conf->global->TAKEPOS_BAR_RESTAURANT)
 	//Button to print receipt before payment
 	if ($conf->global->TAKEPOS_BAR_RESTAURANT)
 	{
-	    if ($conf->global->TAKEPOS_PRINT_METHOD == "takeposconnector") {
+		if ($conf->global->TAKEPOS_PRINT_METHOD == "takeposconnector") {
 			if (filter_var($conf->global->TAKEPOS_PRINT_SERVER, FILTER_VALIDATE_URL) == true) $menus[$r++] = array('title'=>'<span class="fa fa-receipt paddingrightonly"></span><div class="trunc">'.$langs->trans("Receipt").'</div>', 'action'=>'TakeposConnector(placeid);');
 			else $menus[$r++] = array('title'=>'<span class="fa fa-receipt paddingrightonly"></span><div class="trunc">'.$langs->trans("Receipt").'</div>', 'action'=>'TakeposPrinting(placeid);');
 		} elseif ($conf->global->TAKEPOS_PRINT_METHOD == "receiptprinter") {
@@ -1001,19 +1001,19 @@ if ($conf->global->TAKEPOS_BAR_RESTAURANT)
 	}
 	if ($conf->global->TAKEPOS_PRINT_METHOD == "takeposconnector" && $conf->global->TAKEPOS_ORDER_NOTES == 1)
 	{
-	    $menus[$r++] = array('title'=>'<span class="fa fa-receipt paddingrightonly"></span><div class="trunc">'.$langs->trans("OrderNotes").'</div>', 'action'=>'TakeposOrderNotes();');
+		$menus[$r++] = array('title'=>'<span class="fa fa-receipt paddingrightonly"></span><div class="trunc">'.$langs->trans("OrderNotes").'</div>', 'action'=>'TakeposOrderNotes();');
 	}
 	if ($conf->global->TAKEPOS_SUPPLEMENTS)
 	{
-	    $menus[$r++] = array('title'=>'<span class="fa fa-receipt paddingrightonly"></span><div class="trunc">'.$langs->trans("ProductSupplements").'</div>', 'action'=>'LoadProducts(\'supplements\');');
+		$menus[$r++] = array('title'=>'<span class="fa fa-receipt paddingrightonly"></span><div class="trunc">'.$langs->trans("ProductSupplements").'</div>', 'action'=>'LoadProducts(\'supplements\');');
 	}
 }
 
 if ($conf->global->TAKEPOS_PRINT_METHOD == "takeposconnector") {
-    $menus[$r++] = array('title'=>'<span class="fa fa-receipt paddingrightonly"></span><div class="trunc">'.$langs->trans("DOL_OPEN_DRAWER").'</div>', 'action'=>'OpenDrawer();');
+	$menus[$r++] = array('title'=>'<span class="fa fa-receipt paddingrightonly"></span><div class="trunc">'.$langs->trans("DOL_OPEN_DRAWER").'</div>', 'action'=>'OpenDrawer();');
 }
 if ($conf->global->TAKEPOS_PRINT_METHOD == "receiptprinter") {
-    $menus[$r++] = array(
+	$menus[$r++] = array(
 		'title' => '<span class="fa fa-receipt paddingrightonly"></span><div class="trunc">'.$langs->trans("DOL_OPEN_DRAWER").'</div>',
 		'action' => 'DolibarrOpenDrawer();',
 	);
@@ -1060,17 +1060,17 @@ if ($conf->global->TAKEPOS_WEIGHING_SCALE)
 		<!-- Show buttons -->
 		<div class="div3">
 		<?php
-        $i = 0;
-        foreach ($menus as $menu)
-        {
-        	$i++;
-        	if (count($menus) > 12 and $i == 12)
-        	{
-        		echo '<button style="'.$menu['style'].'" type="button" id="actionnext" class="actionbutton" onclick="MoreActions('.count($menus).');">'.$langs->trans("Next").'</button>';
-        		echo '<button style="display: none;" type="button" id="action'.$i.'" class="actionbutton" onclick="'.$menu['action'].'">'.$menu['title'].'</button>';
-        	} elseif ($i > 12) echo '<button style="display: none;" type="button" id="action'.$i.'" class="actionbutton" onclick="'.$menu['action'].'">'.$menu['title'].'</button>';
-            else echo '<button style="'.$menu['style'].'" type="button" id="action'.$i.'" class="actionbutton" onclick="'.$menu['action'].'">'.$menu['title'].'</button>';
-        }
+		$i = 0;
+		foreach ($menus as $menu)
+		{
+			$i++;
+			if (count($menus) > 12 and $i == 12)
+			{
+				echo '<button style="'.$menu['style'].'" type="button" id="actionnext" class="actionbutton" onclick="MoreActions('.count($menus).');">'.$langs->trans("Next").'</button>';
+				echo '<button style="display: none;" type="button" id="action'.$i.'" class="actionbutton" onclick="'.$menu['action'].'">'.$menu['title'].'</button>';
+			} elseif ($i > 12) echo '<button style="display: none;" type="button" id="action'.$i.'" class="actionbutton" onclick="'.$menu['action'].'">'.$menu['title'].'</button>';
+			else echo '<button style="'.$menu['style'].'" type="button" id="action'.$i.'" class="actionbutton" onclick="'.$menu['action'].'">'.$menu['title'].'</button>';
+		}
 
 		if (!empty($conf->global->TAKEPOS_HIDE_HEAD_BAR)) {
 			print '<!-- Show the search input text -->'."\n";
@@ -1079,7 +1079,7 @@ if ($conf->global->TAKEPOS_WEIGHING_SCALE)
 			print '<a class="marginleftonly hideonsmartphone" onclick="ClearSearch();">'.img_picto('', 'searchclear').'</a>';
 			print '</div>';
 		}
-        ?>
+		?>
 		</div>
 	</div>
 
@@ -1091,17 +1091,17 @@ if ($conf->global->TAKEPOS_WEIGHING_SCALE)
 	$count = 0;
 	while ($count < $MAXCATEG)
 	{
-	    ?>
+		?>
 			<div class="wrapper" <?php if ($count == ($MAXCATEG - 2)) echo 'onclick="MoreCategories(\'less\');"'; elseif ($count == ($MAXCATEG - 1)) echo 'onclick="MoreCategories(\'more\');"'; else echo 'onclick="LoadProducts('.$count.');"'; ?> id="catdiv<?php echo $count; ?>">
 				<?php
 				if ($count == ($MAXCATEG - 2)) {
-				    //echo '<img class="imgwrapper" src="img/arrow-prev-top.png" height="100%" id="catimg'.$count.'" />';
-				    echo '<span class="fa fa-chevron-left centerinmiddle" style="font-size: 5em;"></span>';
+					//echo '<img class="imgwrapper" src="img/arrow-prev-top.png" height="100%" id="catimg'.$count.'" />';
+					echo '<span class="fa fa-chevron-left centerinmiddle" style="font-size: 5em;"></span>';
 				} elseif ($count == ($MAXCATEG - 1)) {
-				    //echo '<img class="imgwrapper" src="img/arrow-next-top.png" height="100%" id="catimg'.$count.'" />';
-				    echo '<span class="fa fa-chevron-right centerinmiddle" style="font-size: 5em;"></span>';
+					//echo '<img class="imgwrapper" src="img/arrow-next-top.png" height="100%" id="catimg'.$count.'" />';
+					echo '<span class="fa fa-chevron-right centerinmiddle" style="font-size: 5em;"></span>';
 				} else {
-				    if (!$conf->global->TAKEPOS_HIDE_CATEGORY_IMAGES) echo '<img class="imgwrapper" height="100%" id="catimg'.$count.'" />';
+					if (!$conf->global->TAKEPOS_HIDE_CATEGORY_IMAGES) echo '<img class="imgwrapper" height="100%" id="catimg'.$count.'" />';
 				}
 				?>
 				<?php if ($count != ($MAXCATEG - 2) && $count != ($MAXCATEG - 1)) { ?>
@@ -1112,7 +1112,7 @@ if ($conf->global->TAKEPOS_WEIGHING_SCALE)
 				<div class="catwatermark" id='catwatermark<?php echo $count; ?>'>...</div>
 			</div>
 	    <?php
-        $count++;
+		$count++;
 	}
 	?>
 		</div>
@@ -1120,26 +1120,26 @@ if ($conf->global->TAKEPOS_WEIGHING_SCALE)
 	    <!--  Show product -->
 		<div class="div5">
     <?php
-    $count = 0;
-    while ($count < $MAXPRODUCT)
-    {
-        ?>
+	$count = 0;
+	while ($count < $MAXPRODUCT)
+	{
+		?>
     			<div class="wrapper2" id='prodiv<?php echo $count; ?>' <?php if ($count == ($MAXPRODUCT - 2)) {?> onclick="MoreProducts('less');" <?php } if ($count == ($MAXPRODUCT - 1)) {?> onclick="MoreProducts('more');" <?php } else echo 'onclick="ClickProduct('.$count.');"'; ?>>
     				<?php
-    				if ($count == ($MAXPRODUCT - 2)) {
-    				    //echo '<img class="imgwrapper" src="img/arrow-prev-top.png" height="100%" id="proimg'.$count.'" />';
-    					print '<span class="fa fa-chevron-left centerinmiddle" style="font-size: 5em;"></span>';
-    				} elseif ($count == ($MAXPRODUCT - 1)) {
-    				    //echo '<img class="imgwrapper" src="img/arrow-next-top.png" height="100%" id="proimg'.$count.'" />';
-    					print '<span class="fa fa-chevron-right centerinmiddle" style="font-size: 5em;"></span>';
-    				} else {
+					if ($count == ($MAXPRODUCT - 2)) {
+						//echo '<img class="imgwrapper" src="img/arrow-prev-top.png" height="100%" id="proimg'.$count.'" />';
+						print '<span class="fa fa-chevron-left centerinmiddle" style="font-size: 5em;"></span>';
+					} elseif ($count == ($MAXPRODUCT - 1)) {
+						//echo '<img class="imgwrapper" src="img/arrow-next-top.png" height="100%" id="proimg'.$count.'" />';
+						print '<span class="fa fa-chevron-right centerinmiddle" style="font-size: 5em;"></span>';
+					} else {
 						if ($conf->global->TAKEPOS_HIDE_PRODUCT_IMAGES) echo '<button type="button" id="probutton'.$count.'" class="productbutton" style="display: none;"></button>';
-    					else {
+						else {
 							print '<div class="" id="proprice'.$count.'"></div>';
 							print '<img class="imgwrapper" height="100%" title="" id="proimg'.$count.'">';
 						}
-    				}
-    				?>
+					}
+					?>
 					<?php if ($count != ($MAXPRODUCT - 2) && $count != ($MAXPRODUCT - 1) && !$conf->global->TAKEPOS_HIDE_PRODUCT_IMAGES) { ?>
     				<div class="description" id="prodivdesc<?php echo $count; ?>">
     					<div class="description_content" id="prodesc<?php echo $count; ?>"></div>
@@ -1148,9 +1148,9 @@ if ($conf->global->TAKEPOS_WEIGHING_SCALE)
     				<div class="catwatermark" id='prowatermark<?php echo $count; ?>'>...</div>
     			</div>
         <?php
-        $count++;
-    }
-    ?>
+		$count++;
+	}
+	?>
 		</div>
 	</div>
 </div>
diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php
index 8975c7426c3..58fcb5f25b9 100644
--- a/htdocs/takepos/invoice.php
+++ b/htdocs/takepos/invoice.php
@@ -436,7 +436,7 @@ if (($action == "addline" || $action == "freezone") && $placeid == 0)
 	$invoice->date = dol_now();
 	$invoice->module_source = 'takepos';
 	$invoice->pos_source = $_SESSION["takeposterminal"];
-	$invoice->entity = !empty($_SESSION["takeposinvoiceentity"])?$_SESSION["takeposinvoiceentity"]:$conf->entity;
+	$invoice->entity = !empty($_SESSION["takeposinvoiceentity"]) ? $_SESSION["takeposinvoiceentity"] : $conf->entity;
 
 	if ($invoice->socid <= 0)
 	{
@@ -1315,7 +1315,7 @@ if ($placeid > 0)
 
 print '</table>';
 
-if ($action == "valid" || $action == "history"){
+if ($action == "valid" || $action == "history") {
 	print '<button id="buttonprint" type="button" onclick="ModalBox(\'ModalCreditNote\')">'.$langs->trans('CreateCreditNote').'</button>';
 }
 
diff --git a/htdocs/takepos/phone.php b/htdocs/takepos/phone.php
index 14ca718740b..9084fc448f1 100644
--- a/htdocs/takepos/phone.php
+++ b/htdocs/takepos/phone.php
@@ -64,7 +64,7 @@ if (empty($user->rights->takepos->run) && !defined('INCLUDE_PHONEPAGE_FROM_PUBLI
 
 if ($action == "productinfo") {
 	$prod = new Product($db);
-    $prod->fetch($idproduct);
+	$prod->fetch($idproduct);
 	print '<button type="button" class="publicphonebutton2 phoneblue total" onclick="AddProductConfirm(place, '.$idproduct.');">'.$langs->trans('Add').'</button>';
 	print "<br><b>".$prod->label."</b><br>";
 	print '<img class="imgwrapper" width="60%" src="'.DOL_URL_ROOT.'/takepos/public/auto_order.php?genimg=pro&query=pro&id='.$idproduct.'">';
@@ -104,7 +104,7 @@ elseif ($action == "checkplease") {
 		$printer->printer->feed();
 		$printer->printer->feed();
 		$printer->close();
-	}	else {
+	} else {
 		print '<button type="button" class="publicphonebutton2 phoneblue total" onclick="CheckPlease(\'Cash\');">'.$langs->trans('Cash').'</button>';
 		print '<button type="button" class="publicphonebutton2 phoneblue total" onclick="CheckPlease(\'CreditCard\');">'.$langs->trans('CreditCard').'</button>';
 		print '<br>';
@@ -115,8 +115,8 @@ elseif ($action == "checkplease") {
 	$invoice = new Facture($db);
 	$invoice->fetch($placeid);
 	foreach ($invoice->lines as $line)
-    {
-        if ($line->id == $selectedline)
+	{
+		if ($line->id == $selectedline)
 		{
 			$prod = new Product($db);
 			$prod->fetch($line->fk_product);
@@ -128,8 +128,8 @@ elseif ($action == "checkplease") {
 			print '<button type="button" class="publicphonebutton2 phonered width24" onclick="SetQty(place, '.$selectedline.', '.($line->qty - 1).');">-</button>';
 			print '<button type="button" class="publicphonebutton2 phonegreen width24" onclick="SetQty(place, '.$selectedline.', '.($line->qty + 1).');">+</button>';
 			print '<button type="button" class="publicphonebutton2 phoneblue width24" onclick="SetNote(place, '.$selectedline.');">'.$langs->trans('Note').'</button>';
-        }
-    }
+		}
+	}
 } else {
 	// Title
 	$title = 'TakePOS - Dolibarr '.DOL_VERSION;
@@ -151,14 +151,14 @@ elseif ($action == "checkplease") {
 	$levelofrootcategory = 0;
 	if ($conf->global->TAKEPOS_ROOT_CATEGORY_ID > 0)
 	{
-    	foreach ($categories as $key => $categorycursor)
-    	{
-        	if ($categorycursor['id'] == $conf->global->TAKEPOS_ROOT_CATEGORY_ID)
-        	{
-            	$levelofrootcategory = $categorycursor['level'];
-            	break;
-        	}
-    	}
+		foreach ($categories as $key => $categorycursor)
+		{
+			if ($categorycursor['id'] == $conf->global->TAKEPOS_ROOT_CATEGORY_ID)
+			{
+				$levelofrootcategory = $categorycursor['level'];
+				break;
+			}
+		}
 	}
 	$levelofmaincategories = $levelofrootcategory + 1;
 
@@ -166,12 +166,12 @@ elseif ($action == "checkplease") {
 	$subcategories = array();
 	foreach ($categories as $key => $categorycursor)
 	{
-    	if ($categorycursor['level'] == $levelofmaincategories)
-    	{
-        	$maincategories[$key] = $categorycursor;
-    	} else {
-        	$subcategories[$key] = $categorycursor;
-    	}
+		if ($categorycursor['level'] == $levelofmaincategories)
+		{
+			$maincategories[$key] = $categorycursor;
+		} else {
+			$subcategories[$key] = $categorycursor;
+		}
 	}
 
 	sort($maincategories);
@@ -341,7 +341,7 @@ function CheckPlease(payment){
 	}
 	else{
 		console.log("Request the check to the waiter");
-		$("#phonediv1").load("auto_order.php?action=checkplease&place=<?php echo $place;?>&payment="+payment, function() {
+		$("#phonediv1").load("auto_order.php?action=checkplease&place=<?php echo $place; ?>&payment="+payment, function() {
 		});
 	}
 }
diff --git a/htdocs/takepos/public/menu.php b/htdocs/takepos/public/menu.php
index 867217082bb..5814888f2cf 100644
--- a/htdocs/takepos/public/menu.php
+++ b/htdocs/takepos/public/menu.php
@@ -54,14 +54,14 @@ $categories = $categorie->get_full_arbo('product', (($conf->global->TAKEPOS_ROOT
 $levelofrootcategory = 0;
 if ($conf->global->TAKEPOS_ROOT_CATEGORY_ID > 0)
 {
-    foreach ($categories as $key => $categorycursor)
-    {
-        if ($categorycursor['id'] == $conf->global->TAKEPOS_ROOT_CATEGORY_ID)
-        {
-            $levelofrootcategory = $categorycursor['level'];
-            break;
-        }
-    }
+	foreach ($categories as $key => $categorycursor)
+	{
+		if ($categorycursor['id'] == $conf->global->TAKEPOS_ROOT_CATEGORY_ID)
+		{
+			$levelofrootcategory = $categorycursor['level'];
+			break;
+		}
+	}
 }
 $levelofmaincategories = $levelofrootcategory + 1;
 
@@ -69,17 +69,17 @@ $maincategories = array();
 $subcategories = array();
 foreach ($categories as $key => $categorycursor)
 {
-    if ($categorycursor['level'] == $levelofmaincategories)
-    {
-        $maincategories[$key] = $categorycursor;
-    } else {
-        $subcategories[$key] = $categorycursor;
-    }
+	if ($categorycursor['level'] == $levelofmaincategories)
+	{
+		$maincategories[$key] = $categorycursor;
+	} else {
+		$subcategories[$key] = $categorycursor;
+	}
 }
 
 $maincategories = dol_sort_array($maincategories, 'label');
 
-foreach ($maincategories as $cat){
+foreach ($maincategories as $cat) {
 	print '<div class="text-center">
             <a id="'.$cat['id'].'"></a><h3>'.$cat['label'].'</h3>
           </div>
@@ -88,7 +88,7 @@ foreach ($maincategories as $cat){
 	$object = new Categorie($db);
 	$result = $object->fetch($cat['id']);
 	$prods = $object->getObjectsInCateg("product", 0, 0, 0, $conf->global->TAKEPOS_SORTPRODUCTFIELD, 'ASC');
-	foreach ($prods as $pro){
+	foreach ($prods as $pro) {
 		print '
 		<div class="cell small-6 medium-4">
 			<div class="item">
diff --git a/htdocs/takepos/receipt.php b/htdocs/takepos/receipt.php
index dd24718a476..31d86881fe0 100644
--- a/htdocs/takepos/receipt.php
+++ b/htdocs/takepos/receipt.php
@@ -60,13 +60,13 @@ top_httphead('text/html');
 
 if ($place > 0)
 {
-    $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."facture where ref='(PROV-POS".$_SESSION["takeposterminal"]."-".$place.")'";
-    $resql = $db->query($sql);
-    $obj = $db->fetch_object($resql);
-    if ($obj)
-    {
-        $facid = $obj->rowid;
-    }
+	$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."facture where ref='(PROV-POS".$_SESSION["takeposterminal"]."-".$place.")'";
+	$resql = $db->query($sql);
+	$obj = $db->fetch_object($resql);
+	if ($obj)
+	{
+		$facid = $obj->rowid;
+	}
 }
 $object = new Facture($db);
 $object->fetch($facid);
@@ -75,7 +75,7 @@ $object->fetch($facid);
 $hookmanager->initHooks(array('takeposfrontend'), $facid);
 $reshook = $hookmanager->executeHooks('TakeposReceipt', $parameters, $object);
 if (!empty($hookmanager->resPrint)) {
-    print $hookmanager->resPrint;
+	print $hookmanager->resPrint;
 	exit;
 }
 
@@ -144,21 +144,21 @@ if ($conf->global->TAKEPOS_SHOW_CUSTOMER)
     </thead>
     <tbody>
     <?php
-    foreach ($object->lines as $line)
-    {
-        ?>
+	foreach ($object->lines as $line)
+	{
+		?>
     <tr>
         <td>
 		<?php if (!empty($line->product_label)) echo $line->product_label;
-        else echo $line->description; ?>
+		else echo $line->description; ?>
         </td>
         <td class="right"><?php echo $line->qty; ?></td>
         <td class="right"><?php if ($gift != 1) echo price(price2num($line->total_ttc / $line->qty, 'MT'), 1); ?></td>
         <td class="right"><?php if ($gift != 1) echo price($line->total_ttc, 1); ?></td>
     </tr>
         <?php
-    }
-    ?>
+	}
+	?>
     </tbody>
 </table>
 <br>
@@ -177,7 +177,7 @@ if ($conf->global->TAKEPOS_SHOW_CUSTOMER)
 		$vat_groups[$line->tva_tx] += $line->total_tva;
 	}
 	foreach ($vat_groups as $key => $val) {
-	    ?>
+		?>
 	<tr>
 		<th align="right"><?php if ($gift != 1) echo $langs->trans("VAT").' '.vatrate($key, 1); ?></th>
 		<td align="right"><?php if ($gift != 1) echo price($val, 1, '', 1, - 1, - 1, $conf->currency)."\n"; ?></td>
diff --git a/htdocs/takepos/reduction.php b/htdocs/takepos/reduction.php
index e882957ad14..fa458d96318 100644
--- a/htdocs/takepos/reduction.php
+++ b/htdocs/takepos/reduction.php
@@ -50,21 +50,21 @@ if (empty($user->rights->takepos->run)) {
 $invoice = new Facture($db);
 if ($invoiceid > 0)
 {
-    $invoice->fetch($invoiceid);
+	$invoice->fetch($invoiceid);
 } else {
-    $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."facture where ref='(PROV-POS".$_SESSION["takeposterminal"]."-".$place.")'";
-    $resql = $db->query($sql);
-    $obj = $db->fetch_object($resql);
-    if ($obj)
-    {
-        $invoiceid = $obj->rowid;
-    }
-    if (!$invoiceid)
-    {
-        $invoiceid = 0; // Invoice does not exist yet
-    } else {
-        $invoice->fetch($invoiceid);
-    }
+	$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."facture where ref='(PROV-POS".$_SESSION["takeposterminal"]."-".$place.")'";
+	$resql = $db->query($sql);
+	$obj = $db->fetch_object($resql);
+	if ($obj)
+	{
+		$invoiceid = $obj->rowid;
+	}
+	if (!$invoiceid)
+	{
+		$invoiceid = 0; // Invoice does not exist yet
+	} else {
+		$invoice->fetch($invoiceid);
+	}
 }
 
 $arrayofcss = array('/takepos/css/pos.css.php');
@@ -198,7 +198,7 @@ if (!empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON)) {
 <div style="position:absolute; top:2%; left:5%; width:91%;">
 <center>
 <?php
-    print '<input type="text" class="takepospay" id="reduction_total" name="reduction_total" style="width: 50%;" placeholder="'.$langs->trans('Reduction').'">';
+	print '<input type="text" class="takepospay" id="reduction_total" name="reduction_total" style="width: 50%;" placeholder="'.$langs->trans('Reduction').'">';
 ?>
 </center>
 </div>
diff --git a/htdocs/takepos/send.php b/htdocs/takepos/send.php
index b545b990d68..f33457992a7 100644
--- a/htdocs/takepos/send.php
+++ b/htdocs/takepos/send.php
@@ -66,9 +66,9 @@ if ($action == "send")
 	$receipt = ob_get_contents(); // get the contents of the output buffer
 	ob_end_clean();
 
-	$msg="<html>".$arraydefaultmessage->content."<br>".$receipt."</html>";
-	$sendto=$email;
-	$from=$mysoc->email;
+	$msg = "<html>".$arraydefaultmessage->content."<br>".$receipt."</html>";
+	$sendto = $email;
+	$from = $mysoc->email;
 	$mail = new CMailFile($subject, $sendto, $from, $msg, array(), array(), array(), '', '', 0, 1);
 	if ($mail->error || $mail->errors) {
 		setEventMessages($mail->error, $mail->errors, 'errors');
diff --git a/htdocs/takepos/smpcb.php b/htdocs/takepos/smpcb.php
index f138438a707..1e02e9bc591 100644
--- a/htdocs/takepos/smpcb.php
+++ b/htdocs/takepos/smpcb.php
@@ -40,7 +40,7 @@ if (GETPOSTISSET('status')) {
 if (GETPOST('smp-status')) {
 	print '<html lang="en">';
 	print '<head>';
-    print '<meta charset="utf-8">
+	print '<meta charset="utf-8">
 
     <title>The HTML5 Herald</title>
     <meta name="description" content="The HTML5 Herald">
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 4285749aeab..55e00f68c70 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -1492,7 +1492,7 @@ td.showDragHandle {
 #id-left {
 	padding-top: 20px;
 	padding-bottom: 5px;
-	<?php if (!empty($conf->global->MAIN_USE_TOP_MENU_SEARCH_DROPDOWN) && ! empty($conf->global->MAIN_USE_TOP_MENU_QUICKADD_DROPDOWN)) { ?>
+	<?php if (!empty($conf->global->MAIN_USE_TOP_MENU_SEARCH_DROPDOWN) && !empty($conf->global->MAIN_USE_TOP_MENU_QUICKADD_DROPDOWN)) { ?>
 	padding-top: 8px;
 	<?php } ?>
 }
@@ -2178,70 +2178,70 @@ a.tmenuimage:hover{
     <?php include dol_buildpath($path.'/theme/'.$theme.'/main_menu_fa_icons.inc.php', 0); ?>
 
     <?php
-    // Add here more div for other menu entries. moduletomainmenu=array('module name'=>'name of class for div')
+	// Add here more div for other menu entries. moduletomainmenu=array('module name'=>'name of class for div')
 
-    $moduletomainmenu = array(
-        'user'=>'', 'syslog'=>'', 'societe'=>'companies', 'projet'=>'project', 'propale'=>'commercial', 'commande'=>'commercial',
-        'produit'=>'products', 'service'=>'products', 'stock'=>'products',
-        'don'=>'accountancy', 'tax'=>'accountancy', 'banque'=>'accountancy', 'facture'=>'accountancy', 'compta'=>'accountancy', 'accounting'=>'accountancy', 'adherent'=>'members', 'import'=>'tools', 'export'=>'tools', 'mailing'=>'tools',
-        'contrat'=>'commercial', 'ficheinter'=>'commercial', 'ticket'=>'ticket', 'deplacement'=>'commercial',
-        'fournisseur'=>'companies',
-        'barcode'=>'', 'fckeditor'=>'', 'categorie'=>'',
-    );
-    $mainmenuused = 'home';
-    foreach ($conf->modules as $val)
-    {
-        $mainmenuused .= ','.(isset($moduletomainmenu[$val]) ? $moduletomainmenu[$val] : $val);
-    }
-    $mainmenuusedarray = array_unique(explode(',', $mainmenuused));
+	$moduletomainmenu = array(
+		'user'=>'', 'syslog'=>'', 'societe'=>'companies', 'projet'=>'project', 'propale'=>'commercial', 'commande'=>'commercial',
+		'produit'=>'products', 'service'=>'products', 'stock'=>'products',
+		'don'=>'accountancy', 'tax'=>'accountancy', 'banque'=>'accountancy', 'facture'=>'accountancy', 'compta'=>'accountancy', 'accounting'=>'accountancy', 'adherent'=>'members', 'import'=>'tools', 'export'=>'tools', 'mailing'=>'tools',
+		'contrat'=>'commercial', 'ficheinter'=>'commercial', 'ticket'=>'ticket', 'deplacement'=>'commercial',
+		'fournisseur'=>'companies',
+		'barcode'=>'', 'fckeditor'=>'', 'categorie'=>'',
+	);
+	$mainmenuused = 'home';
+	foreach ($conf->modules as $val)
+	{
+		$mainmenuused .= ','.(isset($moduletomainmenu[$val]) ? $moduletomainmenu[$val] : $val);
+	}
+	$mainmenuusedarray = array_unique(explode(',', $mainmenuused));
 
-    $generic = 1;
-    // Put here list of menu entries when the div.mainmenu.menuentry was previously defined
-    $divalreadydefined = array('home', 'companies', 'products', 'mrp', 'commercial', 'externalsite', 'accountancy', 'project', 'tools', 'members', 'agenda', 'ftp', 'holiday', 'hrm', 'bookmark', 'cashdesk', 'takepos', 'ecm', 'geoipmaxmind', 'gravatar', 'clicktodial', 'paypal', 'stripe', 'webservices', 'website');
-    // Put here list of menu entries we are sure we don't want
-    $divnotrequired = array('multicurrency', 'salaries', 'ticket', 'margin', 'opensurvey', 'paybox', 'expensereport', 'incoterm', 'prelevement', 'propal', 'workflow', 'notification', 'supplier_proposal', 'cron', 'product', 'productbatch', 'expedition');
-    foreach ($mainmenuusedarray as $val)
-    {
-        if (empty($val) || in_array($val, $divalreadydefined)) continue;
-        if (in_array($val, $divnotrequired)) continue;
-        //print "XXX".$val;
+	$generic = 1;
+	// Put here list of menu entries when the div.mainmenu.menuentry was previously defined
+	$divalreadydefined = array('home', 'companies', 'products', 'mrp', 'commercial', 'externalsite', 'accountancy', 'project', 'tools', 'members', 'agenda', 'ftp', 'holiday', 'hrm', 'bookmark', 'cashdesk', 'takepos', 'ecm', 'geoipmaxmind', 'gravatar', 'clicktodial', 'paypal', 'stripe', 'webservices', 'website');
+	// Put here list of menu entries we are sure we don't want
+	$divnotrequired = array('multicurrency', 'salaries', 'ticket', 'margin', 'opensurvey', 'paybox', 'expensereport', 'incoterm', 'prelevement', 'propal', 'workflow', 'notification', 'supplier_proposal', 'cron', 'product', 'productbatch', 'expedition');
+	foreach ($mainmenuusedarray as $val)
+	{
+		if (empty($val) || in_array($val, $divalreadydefined)) continue;
+		if (in_array($val, $divnotrequired)) continue;
+		//print "XXX".$val;
 
-        // Search img file in module dir
-        $found = 0; $url = '';
-        foreach ($conf->file->dol_document_root as $dirroot)
-        {
-    		if (file_exists($dirroot."/".$val."/img/".$val.".png"))
-    		{
-    			$url = dol_buildpath('/'.$val.'/img/'.$val.'.png', 1);
-    			$found = 1;
-    			break;
-    		}
-        }
-        // Img file not found
-        if (!$found)
-        {
-            if (!defined('DISABLE_FONT_AWSOME')) {
-                print "/* A mainmenu entry was found but img file ".$val.".png not found (check /".$val."/img/".$val.".png), so we use a generic one. */\n";
+		// Search img file in module dir
+		$found = 0; $url = '';
+		foreach ($conf->file->dol_document_root as $dirroot)
+		{
+			if (file_exists($dirroot."/".$val."/img/".$val.".png"))
+			{
+				$url = dol_buildpath('/'.$val.'/img/'.$val.'.png', 1);
+				$found = 1;
+				break;
+			}
+		}
+		// Img file not found
+		if (!$found)
+		{
+			if (!defined('DISABLE_FONT_AWSOME')) {
+				print "/* A mainmenu entry was found but img file ".$val.".png not found (check /".$val."/img/".$val.".png), so we use a generic one. */\n";
  				print "/* Overwrite this definition in your own css with a different content to use your own font awesome icon. */\n";
-                print 'div.mainmenu.'.$val.'::before {
+				print 'div.mainmenu.'.$val.'::before {
                     content: "\f249";
                 }'."\n";
-            } else {
-                print "/* A mainmenu entry was found but img file ".$val.".png not found (check /".$val."/img/".$val.".png), so we use a generic one */\n";
-                $url = dol_buildpath($path.'/theme/'.$theme.'/img/menus/generic'.(min($generic, 4))."_over.png", 1);
-                print "div.mainmenu.".$val." {\n";
-                print "	background-image: url(".$url.");\n";
-                print "}\n";
-            }
-            $generic++;
-        } else {
-            print "div.mainmenu.".$val." {\n";
-            print "	background-image: url(".$url.");\n";
-            print "}\n";
-        }
-    }
-    // End of part to add more div class css
-    ?>
+			} else {
+				print "/* A mainmenu entry was found but img file ".$val.".png not found (check /".$val."/img/".$val.".png), so we use a generic one */\n";
+				$url = dol_buildpath($path.'/theme/'.$theme.'/img/menus/generic'.(min($generic, 4))."_over.png", 1);
+				print "div.mainmenu.".$val." {\n";
+				print "	background-image: url(".$url.");\n";
+				print "}\n";
+			}
+			$generic++;
+		} else {
+			print "div.mainmenu.".$val." {\n";
+			print "	background-image: url(".$url.");\n";
+			print "}\n";
+		}
+	}
+	// End of part to add more div class css
+	?>
 <?php } // End test if $dol_hide_topmenu ?>
 
 .tmenuimage {
diff --git a/htdocs/theme/eldy/info-box.inc.php b/htdocs/theme/eldy/info-box.inc.php
index b037cfdc851..1bb6ae7c67e 100644
--- a/htdocs/theme/eldy/info-box.inc.php
+++ b/htdocs/theme/eldy/info-box.inc.php
@@ -214,6 +214,8 @@ a.info-box-text-a i.fa.fa-exclamation-triangle {
 	text-transform: uppercase;
 	font-weight: bold;
 	margin-bottom: 3px;	/* not too much space so we can add another lines */
+	opacity: 0.6;
+	/* color: var(--colortexttitlenotab); */
 }
 .info-box-text{
 	font-size: 0.92em;
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 59aaf0ecc2c..7a86c52ff1e 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -31,7 +31,7 @@ if (!defined('NOREQUIRESOC'))    define('NOREQUIRESOC', '1');
 //if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1');	// Not disabled because need to do translations
 if (!defined('NOCSRFCHECK'))     define('NOCSRFCHECK', 1);
 if (!defined('NOTOKENRENEWAL'))  define('NOTOKENRENEWAL', 1);
-if (!defined('NOLOGIN'))         define('NOLOGIN', 1); 			// File must be accessed by logon page so without login.
+if (!defined('NOLOGIN'))         define('NOLOGIN', 1); // File must be accessed by logon page so without login.
 //if (!defined('NOREQUIREMENU'))   define('NOREQUIREMENU',1);  	// We load menu manager class (note that object loaded may have wrong content because NOLOGIN is set and some values depends on login)
 if (!defined('NOREQUIREHTML'))   define('NOREQUIREHTML', 1);
 if (!defined('NOREQUIREAJAX'))   define('NOREQUIREAJAX', '1');
@@ -53,12 +53,12 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 // and permission, so we can later calculate number of top menu ($nbtopmenuentries) according to user profile.
 if (empty($user->id) && !empty($_SESSION['dol_login']))
 {
-    $user->fetch('', $_SESSION['dol_login'], '', 1);
-    $user->getrights();
+	$user->fetch('', $_SESSION['dol_login'], '', 1);
+	$user->getrights();
 
-    // Reload menu now we have the good user (and we need the good menu to have ->showmenu('topnb') correct.
-    $menumanager = new MenuManager($db, empty($user->socid) ? 0 : 1);
-    $menumanager->loadMenu();
+	// Reload menu now we have the good user (and we need the good menu to have ->showmenu('topnb') correct.
+	$menumanager = new MenuManager($db, empty($user->socid) ? 0 : 1);
+	$menumanager->loadMenu();
 }
 
 
@@ -111,11 +111,11 @@ if (!isset($conf->global->THEME_ELDY_TEXTLINK)) $conf->global->THEME_ELDY_TEXTLI
 // Case of option editable only if option THEME_ELDY_ENABLE_PERSONALIZED is on
 if (empty($conf->global->THEME_ELDY_ENABLE_PERSONALIZED))
 {
-    $conf->global->THEME_ELDY_BACKTABCARD1 = '255,255,255'; // card
-    $conf->global->THEME_ELDY_BACKTABACTIVE = '234,234,234';
-    $conf->global->THEME_ELDY_TEXT = '0,0,0';
-    $conf->global->THEME_ELDY_FONT_SIZE1 = $fontsize;
-    $conf->global->THEME_ELDY_FONT_SIZE2 = '0.75em';
+	$conf->global->THEME_ELDY_BACKTABCARD1 = '255,255,255'; // card
+	$conf->global->THEME_ELDY_BACKTABACTIVE = '234,234,234';
+	$conf->global->THEME_ELDY_TEXT = '0,0,0';
+	$conf->global->THEME_ELDY_FONT_SIZE1 = $fontsize;
+	$conf->global->THEME_ELDY_FONT_SIZE2 = '0.75em';
 }
 
 // Case of option availables only if THEME_ELDY_ENABLE_PERSONALIZED is on
@@ -144,8 +144,8 @@ $colorbacklinepairhover = ((!isset($conf->global->THEME_ELDY_USE_HOVER) || (stri
 $colorbacklinepairchecked = ((!isset($conf->global->THEME_ELDY_USE_CHECKED) || (string) $conf->global->THEME_ELDY_USE_CHECKED === '255,255,255') ? '' : ($conf->global->THEME_ELDY_USE_CHECKED === '1' ? 'e6edf0' : $conf->global->THEME_ELDY_USE_CHECKED));
 if (!empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED))
 {
-    $colorbacklinepairhover = ((!isset($user->conf->THEME_ELDY_USE_HOVER) || $user->conf->THEME_ELDY_USE_HOVER === '0') ? '' : ($user->conf->THEME_ELDY_USE_HOVER === '1' ? 'e6edf0' : $user->conf->THEME_ELDY_USE_HOVER));
-    $colorbacklinepairchecked = ((!isset($user->conf->THEME_ELDY_USE_CHECKED) || $user->conf->THEME_ELDY_USE_CHECKED === '0') ? '' : ($user->conf->THEME_ELDY_USE_CHECKED === '1' ? 'e6edf0' : $user->conf->THEME_ELDY_USE_CHECKED));
+	$colorbacklinepairhover = ((!isset($user->conf->THEME_ELDY_USE_HOVER) || $user->conf->THEME_ELDY_USE_HOVER === '0') ? '' : ($user->conf->THEME_ELDY_USE_HOVER === '1' ? 'e6edf0' : $user->conf->THEME_ELDY_USE_HOVER));
+	$colorbacklinepairchecked = ((!isset($user->conf->THEME_ELDY_USE_CHECKED) || $user->conf->THEME_ELDY_USE_CHECKED === '0') ? '' : ($user->conf->THEME_ELDY_USE_CHECKED === '1' ? 'e6edf0' : $user->conf->THEME_ELDY_USE_CHECKED));
 }
 
 
@@ -165,8 +165,8 @@ $colorbacktitle1 = join(',', colorStringToArray($colorbacktitle1)); // Normalize
 $tmppart = explode(',', $colorbacktitle1);
 if ($colortexttitle == '')
 {
-    $tmpval = (!empty($tmppart[0]) ? $tmppart[0] : 0) + (!empty($tmppart[1]) ? $tmppart[1] : 0) + (!empty($tmppart[2]) ? $tmppart[2] : 0);
-    if ($tmpval <= 460) { $colortexttitle = 'FFFFFF'; $colorshadowtitle = '888888'; } else { $colortexttitle = '000000'; $colorshadowtitle = 'FFFFFF'; }
+	$tmpval = (!empty($tmppart[0]) ? $tmppart[0] : 0) + (!empty($tmppart[1]) ? $tmppart[1] : 0) + (!empty($tmppart[2]) ? $tmppart[2] : 0);
+	if ($tmpval <= 460) { $colortexttitle = 'FFFFFF'; $colorshadowtitle = '888888'; } else { $colortexttitle = '000000'; $colorshadowtitle = 'FFFFFF'; }
 } else $colorshadowtitle = '888888';
 
 $colorbacktabcard1 = join(',', colorStringToArray($colorbacktabcard1)); // Normalize value to 'x,y,z'
@@ -239,7 +239,7 @@ print 'fontsizesmaller='.$fontsizesmaller."\n";
 print 'topMenuFontSize='.$topMenuFontSize."\n";
 print 'toolTipBgColor='.$toolTipBgColor."\n";
 print 'toolTipFontColor='.$toolTipFontColor."\n";
-print 'conf->global->THEME_SATURATE_RATIO='.$conf->global->THEME_SATURATE_RATIO." (must be between 0 and 1)\n";
+print 'conf->global->THEME_SATURATE_RATIO='.(empty($conf->global->THEME_SATURATE_RATIO) ? '' : $conf->global->THEME_SATURATE_RATIO)." (must be between 0 and 1)\n";
 print '*/'."\n";
 
 
diff --git a/htdocs/theme/eldy/timeline.inc.php b/htdocs/theme/eldy/timeline.inc.php
index eb13821c221..d5fba863b3d 100644
--- a/htdocs/theme/eldy/timeline.inc.php
+++ b/htdocs/theme/eldy/timeline.inc.php
@@ -112,7 +112,7 @@ a.timeline-btn:hover
 {
     background-color: #e7e7e7;
     color: #333;
-    border-color: #adadad;;
+    border-color: #adadad;
 }
 
 
diff --git a/htdocs/theme/md/manifest.json.php b/htdocs/theme/md/manifest.json.php
index 33a5fcddb52..03c5894fdde 100644
--- a/htdocs/theme/md/manifest.json.php
+++ b/htdocs/theme/md/manifest.json.php
@@ -25,21 +25,21 @@
  *		\brief      File for The Web App
  */
 
-if (! defined('NOREQUIREUSER'))   define('NOREQUIREUSER', '1');
-if (! defined('NOREQUIREDB'))     define('NOREQUIREDB', '1');
-if (! defined('NOREQUIRESOC'))    define('NOREQUIRESOC', '1');
-if (! defined('NOREQUIRETRAN'))   define('NOREQUIRETRAN', '1');
-if (! defined('NOCSRFCHECK'))     define('NOCSRFCHECK', '1');
-if (! defined('NOTOKENRENEWAL'))  define('NOTOKENRENEWAL', '1');
-if (! defined('NOLOGIN'))         define('NOLOGIN', '1');
-if (! defined('NOREQUIREMENU'))   define('NOREQUIREMENU', '1');
-if (! defined('NOREQUIREHTML'))   define('NOREQUIREHTML', '1');
-if (! defined('NOREQUIREAJAX'))   define('NOREQUIREAJAX', '1');
+if (!defined('NOREQUIREUSER'))   define('NOREQUIREUSER', '1');
+if (!defined('NOREQUIREDB'))     define('NOREQUIREDB', '1');
+if (!defined('NOREQUIRESOC'))    define('NOREQUIRESOC', '1');
+if (!defined('NOREQUIRETRAN'))   define('NOREQUIRETRAN', '1');
+if (!defined('NOCSRFCHECK'))     define('NOCSRFCHECK', '1');
+if (!defined('NOTOKENRENEWAL'))  define('NOTOKENRENEWAL', '1');
+if (!defined('NOLOGIN'))         define('NOLOGIN', '1');
+if (!defined('NOREQUIREMENU'))   define('NOREQUIREMENU', '1');
+if (!defined('NOREQUIREHTML'))   define('NOREQUIREHTML', '1');
+if (!defined('NOREQUIREAJAX'))   define('NOREQUIREAJAX', '1');
 
 require_once __DIR__.'/../../main.inc.php';
 
-$appli=constant('DOL_APPLICATION_TITLE');
-if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $appli=$conf->global->MAIN_APPLICATION_TITLE;
+$appli = constant('DOL_APPLICATION_TITLE');
+if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $appli = $conf->global->MAIN_APPLICATION_TITLE;
 
 top_httphead('text/json');
 
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 295eccc4e17..63886879f8e 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -2228,30 +2228,30 @@ div.mainmenu.website {
 		$found = 0; $url = '';
 		foreach ($conf->file->dol_document_root as $dirroot)
 		{
-		    if (file_exists($dirroot."/".$val."/img/".$val.".png"))
+			if (file_exists($dirroot."/".$val."/img/".$val.".png"))
 			{
-			    $url = dol_buildpath('/'.$val.'/img/'.$val.'.png', 1);
-			    $found = 1;
-			    break;
+				$url = dol_buildpath('/'.$val.'/img/'.$val.'.png', 1);
+				$found = 1;
+				break;
 			}
 		}
 		// Img file not found
 		if (!$found)
 		{
-		    if (!defined('DISABLE_FONT_AWSOME')) {
-		        print "/* A mainmenu entry was found but img file ".$val.".png not found (check /".$val."/img/".$val.".png), so we use a generic one */\n";
-		        print 'div.mainmenu.'.$val.'::before {
+			if (!defined('DISABLE_FONT_AWSOME')) {
+				print "/* A mainmenu entry was found but img file ".$val.".png not found (check /".$val."/img/".$val.".png), so we use a generic one */\n";
+				print 'div.mainmenu.'.$val.'::before {
 	                    content: "\f249";
 	                }';
-		    } else {
-		    	print "/* A mainmenu entry was found but img file ".$val.".png not found (check /".$val."/img/".$val.".png), so we use a generic one. */\n";
-		    	print "/* Overwrite this definition in your own css with a different content to use your own font awesome icon. */\n";
-		        $url = dol_buildpath($path.'/theme/'.$theme.'/img/menus/generic'.(min($generic, 4))."_over.png", 1);
-		        print "div.mainmenu.".$val." {\n";
-		        print "	background-image: url(".$url.");\n";
-		        print "}\n";
-	    	}
-	    	$generic++;
+			} else {
+				print "/* A mainmenu entry was found but img file ".$val.".png not found (check /".$val."/img/".$val.".png), so we use a generic one. */\n";
+				print "/* Overwrite this definition in your own css with a different content to use your own font awesome icon. */\n";
+				$url = dol_buildpath($path.'/theme/'.$theme.'/img/menus/generic'.(min($generic, 4))."_over.png", 1);
+				print "div.mainmenu.".$val." {\n";
+				print "	background-image: url(".$url.");\n";
+				print "}\n";
+			}
+			$generic++;
 		} else {
 			print "div.mainmenu.".$val." {\n";
 			print "	background-image: url(".$url.");\n";
diff --git a/htdocs/ticket/agenda.php b/htdocs/ticket/agenda.php
index e94fc85d004..b14e5b718ba 100644
--- a/htdocs/ticket/agenda.php
+++ b/htdocs/ticket/agenda.php
@@ -131,20 +131,20 @@ $help_url = 'FR:DocumentationModuleTicket';
 llxHeader('', $title, $help_url);
 
 if ($socid > 0) {
-    $object->fetch_thirdparty();
-    $head = societe_prepare_head($object->thirdparty);
+	$object->fetch_thirdparty();
+	$head = societe_prepare_head($object->thirdparty);
 
-    print dol_get_fiche_head($head, 'ticket', $langs->trans("ThirdParty"), 0, 'company');
+	print dol_get_fiche_head($head, 'ticket', $langs->trans("ThirdParty"), 0, 'company');
 
-    dol_banner_tab($object->thirdparty, 'socid', '', ($user->socid ? 0 : 1), 'rowid', 'nom');
+	dol_banner_tab($object->thirdparty, 'socid', '', ($user->socid ? 0 : 1), 'rowid', 'nom');
 
-    dol_fiche_end();
+	print dol_get_fiche_end();
 }
 
 if (!$user->socid && $conf->global->TICKET_LIMIT_VIEW_ASSIGNED_ONLY) {
-    $object->next_prev_filter = "te.fk_user_assign = '".$user->id."'";
+	$object->next_prev_filter = "te.fk_user_assign = '".$user->id."'";
 } elseif ($user->socid > 0) {
-    $object->next_prev_filter = "te.fk_soc = '".$user->socid."'";
+	$object->next_prev_filter = "te.fk_soc = '".$user->socid."'";
 }
 $head = ticket_prepare_head($object);
 
@@ -220,7 +220,7 @@ $linkback = '<a href="'.dol_buildpath('/ticket/list.php', 1).'"><strong>'.$langs
 
 dol_banner_tab($object, 'ref', $linkback, ($user->socid ? 0 : 1), 'ref', 'ref', $morehtmlref, '', 0, '', '', 1);
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '<br>';
 
@@ -231,17 +231,17 @@ if (!empty($object->id))
 	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
 	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
 
-    $morehtmlright = '';
+	$morehtmlright = '';
 
 	$messagingUrl = DOL_URL_ROOT.'/ticket/messaging.php?track_id='.$object->track_id;
-    $morehtmlright .= dolGetButtonTitle($langs->trans('ShowAsConversation'), '', 'fa fa-comments imgforviewmode', $messagingUrl, '', 1);
-    $messagingUrl = DOL_URL_ROOT.'/ticket/agenda.php?track_id='.$object->track_id;
-    $morehtmlright .= dolGetButtonTitle($langs->trans('MessageListViewType'), '', 'fa fa-list-alt imgforviewmode', $messagingUrl, '', 1, array('morecss'=>'btnTitleSelected'));
+	$morehtmlright .= dolGetButtonTitle($langs->trans('ShowAsConversation'), '', 'fa fa-comments imgforviewmode', $messagingUrl, '', 1);
+	$messagingUrl = DOL_URL_ROOT.'/ticket/agenda.php?track_id='.$object->track_id;
+	$morehtmlright .= dolGetButtonTitle($langs->trans('MessageListViewType'), '', 'fa fa-list-alt imgforviewmode', $messagingUrl, '', 1, array('morecss'=>'btnTitleSelected'));
 
-    // Show link to add a message (if read and not closed)
-    $btnstatus = $object->fk_statut < Ticket::STATUS_CLOSED && $action != "presend" && $action != "presend_addmessage";
-    $url = 'card.php?track_id='.$object->track_id.'&action=presend_addmessage&mode=init';
-    $morehtmlright .= dolGetButtonTitle($langs->trans('TicketAddMessage'), '', 'fa fa-comment-dots', $url, 'add-new-ticket-title-button', $btnstatus);
+	// Show link to add a message (if read and not closed)
+	$btnstatus = $object->fk_statut < Ticket::STATUS_CLOSED && $action != "presend" && $action != "presend_addmessage";
+	$url = 'card.php?track_id='.$object->track_id.'&action=presend_addmessage&mode=init';
+	$morehtmlright .= dolGetButtonTitle($langs->trans('TicketAddMessage'), '', 'fa fa-comment-dots', $url, 'add-new-ticket-title-button', $btnstatus);
 
 	// Show link to add event (if read and not closed)
 	$btnstatus = $object->fk_statut < Ticket::STATUS_CLOSED && $action != "presend" && $action != "presend_addmessage";
diff --git a/htdocs/ticket/card.php b/htdocs/ticket/card.php
index fa82b304fef..f836370a398 100644
--- a/htdocs/ticket/card.php
+++ b/htdocs/ticket/card.php
@@ -59,10 +59,10 @@ $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 
 if (GETPOST('actioncode', 'array')) {
-    $actioncode = GETPOST('actioncode', 'array', 3);
-    if (!count($actioncode)) $actioncode = '0';
+	$actioncode = GETPOST('actioncode', 'array', 3);
+	if (!count($actioncode)) $actioncode = '0';
 } else {
-    $actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT));
+	$actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT));
 }
 $search_agenda_label = GETPOST('search_agenda_label');
 
@@ -717,7 +717,7 @@ if ($action == 'create' || $action == 'presend')
 	print '</table>';
 	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div class="center">';
 	print '<input type="submit" class="button" name="save" value="'.$langs->trans('Save').'">';
@@ -832,7 +832,7 @@ elseif (empty($action) || $action == 'view' || $action == 'addlink' || $action =
 
 			dol_banner_tab($object->thirdparty, 'socid', '', ($user->socid ? 0 : 1), 'rowid', 'nom');
 
-			dol_fiche_end();
+			print dol_get_fiche_end();
 		}
 
 		if (!$user->socid && $conf->global->TICKET_LIMIT_VIEW_ASSIGNED_ONLY) {
@@ -1242,7 +1242,7 @@ elseif (empty($action) || $action == 'view' || $action == 'addlink' || $action =
 		print '</div></div></div>';
 		print '<div style="clear:both"></div>';
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 
 		// Buttons for actions
diff --git a/htdocs/ticket/class/api_tickets.class.php b/htdocs/ticket/class/api_tickets.class.php
index 4a3c9b66203..bce4d03fd92 100644
--- a/htdocs/ticket/class/api_tickets.class.php
+++ b/htdocs/ticket/class/api_tickets.class.php
@@ -29,542 +29,542 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/ticket.lib.php';
  */
 class Tickets extends DolibarrApi
 {
-    /**
-     * @var array   $FIELDS     Mandatory fields, checked when create and update object
-     */
-    public static $FIELDS = array(
-        'subject',
-        'message'
-    );
+	/**
+	 * @var array   $FIELDS     Mandatory fields, checked when create and update object
+	 */
+	public static $FIELDS = array(
+		'subject',
+		'message'
+	);
 
-    /**
-     * @var array   $FIELDS_MESSAGES     Mandatory fields, checked when create and update object
-     */
-    public static $FIELDS_MESSAGES = array(
-        'track_id',
-        'message'
-    );
+	/**
+	 * @var array   $FIELDS_MESSAGES     Mandatory fields, checked when create and update object
+	 */
+	public static $FIELDS_MESSAGES = array(
+		'track_id',
+		'message'
+	);
 
-    /**
-     * @var Ticket $ticket {@type Ticket}
-     */
-    public $ticket;
+	/**
+	 * @var Ticket $ticket {@type Ticket}
+	 */
+	public $ticket;
 
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-        global $db;
-        $this->db = $db;
-        $this->ticket = new Ticket($this->db);
-    }
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		global $db;
+		$this->db = $db;
+		$this->ticket = new Ticket($this->db);
+	}
 
-    /**
-     * Get properties of a Ticket object.
-     *
-     * Return an array with ticket informations
-     *
-     * @param	int 			$id 		ID of ticket
-     * @return 	array|mixed 				Data without useless information
-     *
-     * @throws RestException 401
-     * @throws RestException 403
-     * @throws RestException 404
-     */
-    public function get($id)
-    {
-        return $this->getCommon($id, '', '');
-    }
+	/**
+	 * Get properties of a Ticket object.
+	 *
+	 * Return an array with ticket informations
+	 *
+	 * @param	int 			$id 		ID of ticket
+	 * @return 	array|mixed 				Data without useless information
+	 *
+	 * @throws RestException 401
+	 * @throws RestException 403
+	 * @throws RestException 404
+	 */
+	public function get($id)
+	{
+		return $this->getCommon($id, '', '');
+	}
 
-    /**
-     * Get properties of a Ticket object from track id
-     *
-     * Return an array with ticket informations
-     *
-     * @param	string  		$track_id 	Tracking ID of ticket
-     * @return 	array|mixed 				Data without useless information
-     *
-     * @url GET track_id/{track_id}
-     *
-     * @throws RestException 	401
-     * @throws RestException 	403
-     * @throws RestException 	404
-     */
-    public function getByTrackId($track_id)
-    {
-        return $this->getCommon(0, $track_id, '');
-    }
+	/**
+	 * Get properties of a Ticket object from track id
+	 *
+	 * Return an array with ticket informations
+	 *
+	 * @param	string  		$track_id 	Tracking ID of ticket
+	 * @return 	array|mixed 				Data without useless information
+	 *
+	 * @url GET track_id/{track_id}
+	 *
+	 * @throws RestException 	401
+	 * @throws RestException 	403
+	 * @throws RestException 	404
+	 */
+	public function getByTrackId($track_id)
+	{
+		return $this->getCommon(0, $track_id, '');
+	}
 
-    /**
-     * Get properties of a Ticket object from ref
-     *
-     * Return an array with ticket informations
-     *
-     * @param	string  		$ref    	Reference for ticket
-     * @return 	array|mixed 				Data without useless information
-     *
-     * @url GET ref/{ref}
-     *
-     * @throws RestException 401
-     * @throws RestException 403
-     * @throws RestException 404
-     */
-    public function getByRef($ref)
-    {
-        try {
-            return $this->getCommon(0, '', $ref);
-        } catch (Exception $e)
-        {
-               throw $e;
-        }
-    }
+	/**
+	 * Get properties of a Ticket object from ref
+	 *
+	 * Return an array with ticket informations
+	 *
+	 * @param	string  		$ref    	Reference for ticket
+	 * @return 	array|mixed 				Data without useless information
+	 *
+	 * @url GET ref/{ref}
+	 *
+	 * @throws RestException 401
+	 * @throws RestException 403
+	 * @throws RestException 404
+	 */
+	public function getByRef($ref)
+	{
+		try {
+			return $this->getCommon(0, '', $ref);
+		} catch (Exception $e)
+		{
+			   throw $e;
+		}
+	}
 
-    /**
-     * Get properties of a Ticket object
-     * Return an array with ticket informations
-     *
-     * @param	int 			$id 		ID of ticket
-     * @param	string  		$track_id 	Tracking ID of ticket
-     * @param	string  		$ref    	Reference for ticket
-     * @return 	array|mixed 				Data without useless information
-     */
-    private function getCommon($id = 0, $track_id = '', $ref = '')
-    {
-        if (!DolibarrApiAccess::$user->rights->ticket->read) {
-            throw new RestException(403);
-        }
+	/**
+	 * Get properties of a Ticket object
+	 * Return an array with ticket informations
+	 *
+	 * @param	int 			$id 		ID of ticket
+	 * @param	string  		$track_id 	Tracking ID of ticket
+	 * @param	string  		$ref    	Reference for ticket
+	 * @return 	array|mixed 				Data without useless information
+	 */
+	private function getCommon($id = 0, $track_id = '', $ref = '')
+	{
+		if (!DolibarrApiAccess::$user->rights->ticket->read) {
+			throw new RestException(403);
+		}
 
-        // Check parameters
-        if (!$id && !$track_id && !$ref) {
-            throw new RestException(401, 'Wrong parameters');
-        }
+		// Check parameters
+		if (!$id && !$track_id && !$ref) {
+			throw new RestException(401, 'Wrong parameters');
+		}
 
-        $result = $this->ticket->fetch($id, $ref, $track_id);
-        if (!$result) {
-            throw new RestException(404, 'Ticket not found');
-        }
+		$result = $this->ticket->fetch($id, $ref, $track_id);
+		if (!$result) {
+			throw new RestException(404, 'Ticket not found');
+		}
 
-        // String for user assigned
-        if ($this->ticket->fk_user_assign > 0) {
-            $userStatic = new User($this->db);
-            $userStatic->fetch($this->ticket->fk_user_assign);
-            $this->ticket->fk_user_assign_string = $userStatic->firstname.' '.$userStatic->lastname;
-        }
+		// String for user assigned
+		if ($this->ticket->fk_user_assign > 0) {
+			$userStatic = new User($this->db);
+			$userStatic->fetch($this->ticket->fk_user_assign);
+			$this->ticket->fk_user_assign_string = $userStatic->firstname.' '.$userStatic->lastname;
+		}
 
-        // Messages of ticket
-        $messages = array();
-        $this->ticket->loadCacheMsgsTicket();
-        if (is_array($this->ticket->cache_msgs_ticket) && count($this->ticket->cache_msgs_ticket) > 0) {
-            $num = count($this->ticket->cache_msgs_ticket);
-            $i = 0;
-            while ($i < $num) {
-                if ($this->ticket->cache_msgs_ticket[$i]['fk_user_author'] > 0) {
-                    $user_action = new User($this->db);
-                    $user_action->fetch($this->ticket->cache_msgs_ticket[$i]['fk_user_author']);
-                }
+		// Messages of ticket
+		$messages = array();
+		$this->ticket->loadCacheMsgsTicket();
+		if (is_array($this->ticket->cache_msgs_ticket) && count($this->ticket->cache_msgs_ticket) > 0) {
+			$num = count($this->ticket->cache_msgs_ticket);
+			$i = 0;
+			while ($i < $num) {
+				if ($this->ticket->cache_msgs_ticket[$i]['fk_user_author'] > 0) {
+					$user_action = new User($this->db);
+					$user_action->fetch($this->ticket->cache_msgs_ticket[$i]['fk_user_author']);
+				}
 
-                // Now define messages
-                $messages[] = array(
-                'id' => $this->ticket->cache_msgs_ticket[$i]['id'],
-                'fk_user_action' => $this->ticket->cache_msgs_ticket[$i]['fk_user_author'],
-                'fk_user_action_socid' =>  $user_action->socid,
-                'fk_user_action_string' => dolGetFirstLastname($user_action->firstname, $user_action->lastname),
-                'message' => $this->ticket->cache_msgs_ticket[$i]['message'],
-                'datec' => $this->ticket->cache_msgs_ticket[$i]['datec'],
-                'private' => $this->ticket->cache_msgs_ticket[$i]['private']
-                );
-                $i++;
-            }
-            $this->ticket->messages = $messages;
-        }
+				// Now define messages
+				$messages[] = array(
+				'id' => $this->ticket->cache_msgs_ticket[$i]['id'],
+				'fk_user_action' => $this->ticket->cache_msgs_ticket[$i]['fk_user_author'],
+				'fk_user_action_socid' =>  $user_action->socid,
+				'fk_user_action_string' => dolGetFirstLastname($user_action->firstname, $user_action->lastname),
+				'message' => $this->ticket->cache_msgs_ticket[$i]['message'],
+				'datec' => $this->ticket->cache_msgs_ticket[$i]['datec'],
+				'private' => $this->ticket->cache_msgs_ticket[$i]['private']
+				);
+				$i++;
+			}
+			$this->ticket->messages = $messages;
+		}
 
-        // History
-        $history = array();
-        $this->ticket->loadCacheLogsTicket();
-        if (is_array($this->ticket->cache_logs_ticket) && count($this->ticket->cache_logs_ticket) > 0) {
-            $num = count($this->ticket->cache_logs_ticket);
-            $i = 0;
-            while ($i < $num) {
-                if ($this->ticket->cache_logs_ticket[$i]['fk_user_create'] > 0) {
-                    $user_action = new User($this->db);
-                    $user_action->fetch($this->ticket->cache_logs_ticket[$i]['fk_user_create']);
-                }
+		// History
+		$history = array();
+		$this->ticket->loadCacheLogsTicket();
+		if (is_array($this->ticket->cache_logs_ticket) && count($this->ticket->cache_logs_ticket) > 0) {
+			$num = count($this->ticket->cache_logs_ticket);
+			$i = 0;
+			while ($i < $num) {
+				if ($this->ticket->cache_logs_ticket[$i]['fk_user_create'] > 0) {
+					$user_action = new User($this->db);
+					$user_action->fetch($this->ticket->cache_logs_ticket[$i]['fk_user_create']);
+				}
 
-                // Now define messages
-                $history[] = array(
-                'id' => $this->ticket->cache_logs_ticket[$i]['id'],
-                'fk_user_author' => $this->ticket->cache_msgs_ticket[$i]['fk_user_author'],
-                'fk_user_action' => $this->ticket->cache_logs_ticket[$i]['fk_user_create'],
-                'fk_user_action_string' => dolGetFirstLastname($user_action->firstname, $user_action->lastname),
-                'message' => $this->ticket->cache_logs_ticket[$i]['message'],
-                'datec' => $this->ticket->cache_logs_ticket[$i]['datec'],
-                );
-                $i++;
-            }
-            $this->ticket->history = $history;
-        }
+				// Now define messages
+				$history[] = array(
+				'id' => $this->ticket->cache_logs_ticket[$i]['id'],
+				'fk_user_author' => $this->ticket->cache_msgs_ticket[$i]['fk_user_author'],
+				'fk_user_action' => $this->ticket->cache_logs_ticket[$i]['fk_user_create'],
+				'fk_user_action_string' => dolGetFirstLastname($user_action->firstname, $user_action->lastname),
+				'message' => $this->ticket->cache_logs_ticket[$i]['message'],
+				'datec' => $this->ticket->cache_logs_ticket[$i]['datec'],
+				);
+				$i++;
+			}
+			$this->ticket->history = $history;
+		}
 
 
-        if (!DolibarrApi::_checkAccessToResource('ticket', $this->ticket->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
-        return $this->_cleanObjectDatas($this->ticket);
-    }
+		if (!DolibarrApi::_checkAccessToResource('ticket', $this->ticket->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+		return $this->_cleanObjectDatas($this->ticket);
+	}
 
-    /**
-     * List tickets
-     *
-     * Get a list of tickets
-     *
-     * @param int       $socid      Filter list with thirdparty ID
-     * @param string	$sortfield	Sort field
-     * @param string	$sortorder	Sort order
-     * @param int		$limit		Limit for list
-     * @param int		$page		Page number
-     * @param string	$sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101') and (t.fk_statut:=:1)"
-     *
-     * @return array Array of ticket objects
-     *
-     */
-    public function index($socid = 0, $sortfield = "t.rowid", $sortorder = "ASC", $limit = 100, $page = 0, $sqlfilters = '')
-    {
-        global $db, $conf;
+	/**
+	 * List tickets
+	 *
+	 * Get a list of tickets
+	 *
+	 * @param int       $socid      Filter list with thirdparty ID
+	 * @param string	$sortfield	Sort field
+	 * @param string	$sortorder	Sort order
+	 * @param int		$limit		Limit for list
+	 * @param int		$page		Page number
+	 * @param string	$sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101') and (t.fk_statut:=:1)"
+	 *
+	 * @return array Array of ticket objects
+	 *
+	 */
+	public function index($socid = 0, $sortfield = "t.rowid", $sortorder = "ASC", $limit = 100, $page = 0, $sqlfilters = '')
+	{
+		global $db, $conf;
 
-        $obj_ret = array();
+		$obj_ret = array();
 
-        if (!$socid && DolibarrApiAccess::$user->socid) {
-            $socid = DolibarrApiAccess::$user->socid;
-        }
+		if (!$socid && DolibarrApiAccess::$user->socid) {
+			$socid = DolibarrApiAccess::$user->socid;
+		}
 
-        // If the internal user must only see his customers, force searching by him
-        if (!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) {
-            $search_sale = DolibarrApiAccess::$user->id;
-        }
+		// If the internal user must only see his customers, force searching by him
+		if (!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) {
+			$search_sale = DolibarrApiAccess::$user->id;
+		}
 
-        $sql = "SELECT t.rowid";
-        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) {
-            $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
-        }
-        $sql .= " FROM ".MAIN_DB_PREFIX."ticket as t";
+		$sql = "SELECT t.rowid";
+		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) {
+			$sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
+		}
+		$sql .= " FROM ".MAIN_DB_PREFIX."ticket as t";
 
-        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) {
-            $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
-        }
+		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) {
+			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
+		}
 
-        $sql .= ' WHERE t.entity IN ('.getEntity('ticket', 1).')';
-        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) {
-            $sql .= " AND t.fk_soc = sc.fk_soc";
-        }
-        if ($socid > 0) {
-            $sql .= " AND t.fk_soc = ".$socid;
-        }
-        if ($search_sale > 0) {
-            $sql .= " AND t.rowid = sc.fk_soc"; // Join for the needed table to filter by sale
-        }
+		$sql .= ' WHERE t.entity IN ('.getEntity('ticket', 1).')';
+		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) {
+			$sql .= " AND t.fk_soc = sc.fk_soc";
+		}
+		if ($socid > 0) {
+			$sql .= " AND t.fk_soc = ".$socid;
+		}
+		if ($search_sale > 0) {
+			$sql .= " AND t.rowid = sc.fk_soc"; // Join for the needed table to filter by sale
+		}
 
-        // Insert sale filter
-        if ($search_sale > 0) {
-            $sql .= " AND sc.fk_user = ".$search_sale;
-        }
-        // Add sql filters
-        if ($sqlfilters) {
-            if (!DolibarrApi::_checkFilters($sqlfilters)) {
-                throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
-            }
-            $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-        }
+		// Insert sale filter
+		if ($search_sale > 0) {
+			$sql .= " AND sc.fk_user = ".$search_sale;
+		}
+		// Add sql filters
+		if ($sqlfilters) {
+			if (!DolibarrApi::_checkFilters($sqlfilters)) {
+				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+			}
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
 
-        $sql .= $this->db->order($sortfield, $sortorder);
+		$sql .= $this->db->order($sortfield, $sortorder);
 
-        if ($limit) {
-            if ($page < 0) {
-                $page = 0;
-            }
-            $offset = $limit * $page;
+		if ($limit) {
+			if ($page < 0) {
+				$page = 0;
+			}
+			$offset = $limit * $page;
 
-            $sql .= $this->db->plimit($limit, $offset);
-        }
+			$sql .= $this->db->plimit($limit, $offset);
+		}
 
-        $result = $this->db->query($sql);
-        if ($result) {
-        	$num = $this->db->num_rows($result);
-            $i = 0;
-            while ($i < $num) {
-            	$obj = $this->db->fetch_object($result);
-            	$ticket_static = new Ticket($this->db);
-                if ($ticket_static->fetch($obj->rowid)) {
-                    if ($ticket_static->fk_user_assign > 0) {
-                        $userStatic = new User($this->db);
-                        $userStatic->fetch($ticket_static->fk_user_assign);
-                        $ticket_static->fk_user_assign_string = $userStatic->firstname.' '.$userStatic->lastname;
-                    }
-                    $obj_ret[] = $this->_cleanObjectDatas($ticket_static);
-                }
-                $i++;
-            }
-        } else {
-            throw new RestException(503, 'Error when retrieve ticket list');
-        }
-        if (!count($obj_ret)) {
-            throw new RestException(404, 'No ticket found');
-        }
-            return $obj_ret;
-    }
+		$result = $this->db->query($sql);
+		if ($result) {
+			$num = $this->db->num_rows($result);
+			$i = 0;
+			while ($i < $num) {
+				$obj = $this->db->fetch_object($result);
+				$ticket_static = new Ticket($this->db);
+				if ($ticket_static->fetch($obj->rowid)) {
+					if ($ticket_static->fk_user_assign > 0) {
+						$userStatic = new User($this->db);
+						$userStatic->fetch($ticket_static->fk_user_assign);
+						$ticket_static->fk_user_assign_string = $userStatic->firstname.' '.$userStatic->lastname;
+					}
+					$obj_ret[] = $this->_cleanObjectDatas($ticket_static);
+				}
+				$i++;
+			}
+		} else {
+			throw new RestException(503, 'Error when retrieve ticket list');
+		}
+		if (!count($obj_ret)) {
+			throw new RestException(404, 'No ticket found');
+		}
+			return $obj_ret;
+	}
 
-    /**
-     * Create ticket object
-     *
-     * @param array $request_data   Request datas
-     * @return int  ID of ticket
-     */
-    public function post($request_data = null)
-    {
-        $ticketstatic = new Ticket($this->db);
-        if (!DolibarrApiAccess::$user->rights->ticket->write) {
-            throw new RestException(401);
-        }
-        // Check mandatory fields
-        $result = $this->_validate($request_data);
+	/**
+	 * Create ticket object
+	 *
+	 * @param array $request_data   Request datas
+	 * @return int  ID of ticket
+	 */
+	public function post($request_data = null)
+	{
+		$ticketstatic = new Ticket($this->db);
+		if (!DolibarrApiAccess::$user->rights->ticket->write) {
+			throw new RestException(401);
+		}
+		// Check mandatory fields
+		$result = $this->_validate($request_data);
 
-        foreach ($request_data as $field => $value) {
-            $this->ticket->$field = $value;
-        }
-        if (empty($this->ticket->ref)) {
-            $this->ticket->ref = $ticketstatic->getDefaultRef();
-        }
-        if (empty($this->ticket->track_id)) {
-            $this->ticket->track_id = generate_random_id(16);
-        }
+		foreach ($request_data as $field => $value) {
+			$this->ticket->$field = $value;
+		}
+		if (empty($this->ticket->ref)) {
+			$this->ticket->ref = $ticketstatic->getDefaultRef();
+		}
+		if (empty($this->ticket->track_id)) {
+			$this->ticket->track_id = generate_random_id(16);
+		}
 
-        if ($this->ticket->create(DolibarrApiAccess::$user) < 0) {
-        	throw new RestException(500, "Error creating ticket", array_merge(array($this->ticket->error), $this->ticket->errors));
-        }
+		if ($this->ticket->create(DolibarrApiAccess::$user) < 0) {
+			throw new RestException(500, "Error creating ticket", array_merge(array($this->ticket->error), $this->ticket->errors));
+		}
 
-        return $this->ticket->id;
-    }
+		return $this->ticket->id;
+	}
 
-    /**
-     * Create ticket object
-     *
-     * @param array $request_data   Request datas
-     * @return int  ID of ticket
-     *
-     */
-    public function postNewMessage($request_data = null)
-    {
-        $ticketstatic = new Ticket($this->db);
-        if (!DolibarrApiAccess::$user->rights->ticket->write) {
-            throw new RestException(401);
-        }
-        // Check mandatory fields
-        $result = $this->_validateMessage($request_data);
+	/**
+	 * Create ticket object
+	 *
+	 * @param array $request_data   Request datas
+	 * @return int  ID of ticket
+	 *
+	 */
+	public function postNewMessage($request_data = null)
+	{
+		$ticketstatic = new Ticket($this->db);
+		if (!DolibarrApiAccess::$user->rights->ticket->write) {
+			throw new RestException(401);
+		}
+		// Check mandatory fields
+		$result = $this->_validateMessage($request_data);
 
-        foreach ($request_data as $field => $value) {
-            $this->ticket->$field = $value;
-        }
-        $ticketMessageText = $this->ticket->message;
-        $result = $this->ticket->fetch('', '', $this->ticket->track_id);
-        if (!$result) {
-            throw new RestException(404, 'Ticket not found');
-        }
-        $this->ticket->message = $ticketMessageText;
-        if (!$this->ticket->createTicketMessage(DolibarrApiAccess::$user)) {
-            throw new RestException(500);
-        }
-        return $this->ticket->id;
-    }
+		foreach ($request_data as $field => $value) {
+			$this->ticket->$field = $value;
+		}
+		$ticketMessageText = $this->ticket->message;
+		$result = $this->ticket->fetch('', '', $this->ticket->track_id);
+		if (!$result) {
+			throw new RestException(404, 'Ticket not found');
+		}
+		$this->ticket->message = $ticketMessageText;
+		if (!$this->ticket->createTicketMessage(DolibarrApiAccess::$user)) {
+			throw new RestException(500);
+		}
+		return $this->ticket->id;
+	}
 
-    /**
-     * Update ticket
-     *
-     * @param int   $id             Id of ticket to update
-     * @param array $request_data   Datas
-     * @return int
-     *
-     */
-    public function put($id, $request_data = null)
-    {
-        if (!DolibarrApiAccess::$user->rights->ticket->write) {
-            throw new RestException(401);
-        }
+	/**
+	 * Update ticket
+	 *
+	 * @param int   $id             Id of ticket to update
+	 * @param array $request_data   Datas
+	 * @return int
+	 *
+	 */
+	public function put($id, $request_data = null)
+	{
+		if (!DolibarrApiAccess::$user->rights->ticket->write) {
+			throw new RestException(401);
+		}
 
-        $result = $this->ticket->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Ticket not found');
-        }
+		$result = $this->ticket->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Ticket not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('ticket', $this->ticket->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('ticket', $this->ticket->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        foreach ($request_data as $field => $value) {
-            $this->ticket->$field = $value;
-        }
+		foreach ($request_data as $field => $value) {
+			$this->ticket->$field = $value;
+		}
 
-        if ($this->ticket->update($id, DolibarrApiAccess::$user)) {
-            return $this->get($id);
-        }
+		if ($this->ticket->update($id, DolibarrApiAccess::$user)) {
+			return $this->get($id);
+		}
 
-        return false;
-    }
+		return false;
+	}
 
-    /**
-     * Delete ticket
-     *
-     * @param   int     $id   Ticket ID
-     * @return  array
-     *
-     */
-    public function delete($id)
-    {
-        if (!DolibarrApiAccess::$user->rights->ticket->delete) {
-            throw new RestException(401);
-        }
-        $result = $this->ticket->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Ticket not found');
-        }
+	/**
+	 * Delete ticket
+	 *
+	 * @param   int     $id   Ticket ID
+	 * @return  array
+	 *
+	 */
+	public function delete($id)
+	{
+		if (!DolibarrApiAccess::$user->rights->ticket->delete) {
+			throw new RestException(401);
+		}
+		$result = $this->ticket->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Ticket not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('ticket', $this->ticket->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('ticket', $this->ticket->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        if (!$this->ticket->delete($id)) {
-            throw new RestException(500);
-        }
+		if (!$this->ticket->delete($id)) {
+			throw new RestException(500);
+		}
 
-        return array(
-            'success' => array(
-                'code' => 200,
-                'message' => 'Ticket deleted'
-            )
-        );
-    }
+		return array(
+			'success' => array(
+				'code' => 200,
+				'message' => 'Ticket deleted'
+			)
+		);
+	}
 
-    /**
-     * Validate fields before create or update object
-     *
-     * @param array $data   Data to validate
-     * @return array
-     *
-     * @throws RestException
-     */
-    private function _validate($data)
-    {
-        $ticket = array();
-        foreach (Tickets::$FIELDS as $field) {
-            if (!isset($data[$field])) {
-                throw new RestException(400, "$field field missing");
-            }
-            $ticket[$field] = $data[$field];
-        }
-        return $ticket;
-    }
+	/**
+	 * Validate fields before create or update object
+	 *
+	 * @param array $data   Data to validate
+	 * @return array
+	 *
+	 * @throws RestException
+	 */
+	private function _validate($data)
+	{
+		$ticket = array();
+		foreach (Tickets::$FIELDS as $field) {
+			if (!isset($data[$field])) {
+				throw new RestException(400, "$field field missing");
+			}
+			$ticket[$field] = $data[$field];
+		}
+		return $ticket;
+	}
 
-    /**
-     * Validate fields before create or update object message
-     *
-     * @param array $data   Data to validate
-     * @return array
-     *
-     * @throws RestException
-     */
-    private function _validateMessage($data)
-    {
-        $ticket = array();
-        foreach (Tickets::$FIELDS_MESSAGES as $field) {
-            if (!isset($data[$field])) {
-                throw new RestException(400, "$field field missing");
-            }
-            $ticket[$field] = $data[$field];
-        }
-        return $ticket;
-    }
+	/**
+	 * Validate fields before create or update object message
+	 *
+	 * @param array $data   Data to validate
+	 * @return array
+	 *
+	 * @throws RestException
+	 */
+	private function _validateMessage($data)
+	{
+		$ticket = array();
+		foreach (Tickets::$FIELDS_MESSAGES as $field) {
+			if (!isset($data[$field])) {
+				throw new RestException(400, "$field field missing");
+			}
+			$ticket[$field] = $data[$field];
+		}
+		return $ticket;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
-    /**
-     * Clean sensible object datas
-     *
-     * @param   object  $object	Object to clean
-     * @return	array	Array of cleaned object properties
-     *
-     * @todo use an array for properties to clean
-     *
-     */
-    protected function _cleanObjectDatas($object)
-    {
-        // phpcs:enable
-        $object = parent::_cleanObjectDatas($object);
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	/**
+	 * Clean sensible object datas
+	 *
+	 * @param   Object  $object     Object to clean
+	 * @return  Object              Object with cleaned properties
+	 *
+	 * @todo use an array for properties to clean
+	 *
+	 */
+	protected function _cleanObjectDatas($object)
+	{
+		// phpcs:enable
+		$object = parent::_cleanObjectDatas($object);
 
-        // Other attributes to clean
-        $attr2clean = array(
-            "contact",
-            "contact_id",
-            "ref_previous",
-            "ref_next",
-            "ref_ext",
-            "table_element_line",
-            "statut",
-            "country",
-            "country_id",
-            "country_code",
-            "barcode_type",
-            "barcode_type_code",
-            "barcode_type_label",
-            "barcode_type_coder",
-            "mode_reglement_id",
-            "cond_reglement_id",
-            "cond_reglement",
-            "fk_delivery_address",
-            "shipping_method_id",
-            "modelpdf",
-            "fk_account",
-            "note_public",
-            "note_private",
-            "note",
-            "total_ht",
-            "total_tva",
-            "total_localtax1",
-            "total_localtax2",
-            "total_ttc",
-            "fk_incoterms",
-            "label_incoterms",
-            "location_incoterms",
-            "name",
-            "lastname",
-            "firstname",
-            "civility_id",
-        	"canvas",
-            "cache_msgs_ticket",
-            "cache_logs_ticket",
-        	"cache_types_tickets",
-        	"cache_category_tickets",
-        	"regeximgext",
-            "statuts_short",
-            "statuts"
-        );
-        foreach ($attr2clean as $toclean) {
-            unset($object->$toclean);
-        }
+		// Other attributes to clean
+		$attr2clean = array(
+			"contact",
+			"contact_id",
+			"ref_previous",
+			"ref_next",
+			"ref_ext",
+			"table_element_line",
+			"statut",
+			"country",
+			"country_id",
+			"country_code",
+			"barcode_type",
+			"barcode_type_code",
+			"barcode_type_label",
+			"barcode_type_coder",
+			"mode_reglement_id",
+			"cond_reglement_id",
+			"cond_reglement",
+			"fk_delivery_address",
+			"shipping_method_id",
+			"modelpdf",
+			"fk_account",
+			"note_public",
+			"note_private",
+			"note",
+			"total_ht",
+			"total_tva",
+			"total_localtax1",
+			"total_localtax2",
+			"total_ttc",
+			"fk_incoterms",
+			"label_incoterms",
+			"location_incoterms",
+			"name",
+			"lastname",
+			"firstname",
+			"civility_id",
+			"canvas",
+			"cache_msgs_ticket",
+			"cache_logs_ticket",
+			"cache_types_tickets",
+			"cache_category_tickets",
+			"regeximgext",
+			"statuts_short",
+			"statuts"
+		);
+		foreach ($attr2clean as $toclean) {
+			unset($object->$toclean);
+		}
 
-        // If object has lines, remove $db property
-        if (isset($object->lines) && count($object->lines) > 0) {
-            $nboflines = count($object->lines);
-            for ($i = 0; $i < $nboflines; $i++) {
-                $this->_cleanObjectDatas($object->lines[$i]);
-            }
-        }
+		// If object has lines, remove $db property
+		if (isset($object->lines) && count($object->lines) > 0) {
+			$nboflines = count($object->lines);
+			for ($i = 0; $i < $nboflines; $i++) {
+				$this->_cleanObjectDatas($object->lines[$i]);
+			}
+		}
 
-        // If object has linked objects, remove $db property
-        if (isset($object->linkedObjects) && count($object->linkedObjects) > 0) {
-            foreach ($object->linkedObjects as $type_object => $linked_object) {
-                foreach ($linked_object as $object2clean) {
-                    $this->_cleanObjectDatas($object2clean);
-                }
-            }
-        }
-        return $object;
-    }
+		// If object has linked objects, remove $db property
+		if (isset($object->linkedObjects) && count($object->linkedObjects) > 0) {
+			foreach ($object->linkedObjects as $type_object => $linked_object) {
+				foreach ($linked_object as $object2clean) {
+					$this->_cleanObjectDatas($object2clean);
+				}
+			}
+		}
+		return $object;
+	}
 }
diff --git a/htdocs/ticket/class/ticket.class.php b/htdocs/ticket/class/ticket.class.php
index 5ef0bb4148a..0b7ce39a83c 100644
--- a/htdocs/ticket/class/ticket.class.php
+++ b/htdocs/ticket/class/ticket.class.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2013-2018 Jean-François Ferry <hello@librethic.io>
  * Copyright (C) 2016      Christophe Battarel <christophe@altairis.fr>
- * Copyright (C) 2019      Frédéric France     <frederic.france@netlogic.fr>
+ * Copyright (C) 2019-2020 Frédéric France     <frederic.france@netlogic.fr>
  * Copyright (C) 2020      Laurent Destailleur <eldy@users.sourceforge.net>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -108,8 +108,13 @@ class Ticket extends CommonObject
 
 	/**
 	 * @var int  Ticket statut
+ 	 * @deprecated
+	 */
+	public $fk_statut;
+
+	/**
+	 * @var int  Ticket status
 	 */
-	public $fk_statut; // deprecated
 	public $status;
 
 	/**
@@ -142,28 +147,28 @@ class Ticket extends CommonObject
 	 */
 	public $severity_code;
 
-    /**
-     * Type label
-     */
-    public $type_label;
-
-    /**
-     * Category label
-     */
-    public $category_label;
-
-    /**
-     * Severity label
-     */
-    public $severity_label;
-
-        /**
-     * Email from user
-     */
-    public $email_from;
+	/**
+	 * Type label
+	 */
+	public $type_label;
 
 	/**
-	 * @var int Création date
+	 * Category label
+	 */
+	public $category_label;
+
+	/**
+	 * Severity label
+	 */
+	public $severity_label;
+
+	/**
+	 * Email from user
+	 */
+	public $email_from;
+
+	/**
+	 * @var int Creation date
 	 */
 	public $datec = '';
 
@@ -188,7 +193,7 @@ class Ticket extends CommonObject
 	public $cache_category_tickets;
 
 	/**
-	 * @var int Notify tiers at create
+	 * @var int Notify thirdparty at create
 	 */
 	public $notify_tiers_at_create;
 
@@ -279,8 +284,26 @@ class Ticket extends CommonObject
 	{
 		$this->db = $db;
 
-		$this->statuts_short = array(self::STATUS_NOT_READ => 'Unread', self::STATUS_READ => 'Read', self::STATUS_ASSIGNED => 'Assigned', self::STATUS_IN_PROGRESS => 'InProgress', self::STATUS_NEED_MORE_INFO => 'NeedMoreInformation', self::STATUS_WAITING => 'Suspended', self::STATUS_CLOSED => 'Closed', self::STATUS_CANCELED => 'Canceled');
-		$this->statuts       = array(self::STATUS_NOT_READ => 'Unread', self::STATUS_READ => 'Read', self::STATUS_ASSIGNED => 'Assigned', self::STATUS_IN_PROGRESS => 'InProgress', self::STATUS_NEED_MORE_INFO => 'NeedMoreInformation', self::STATUS_WAITING => 'Suspended', self::STATUS_CLOSED => 'Closed', self::STATUS_CANCELED => 'Canceled');
+		$this->statuts_short = array(
+			self::STATUS_NOT_READ => 'Unread',
+			self::STATUS_READ => 'Read',
+			self::STATUS_ASSIGNED => 'Assigned',
+			self::STATUS_IN_PROGRESS => 'InProgress',
+			self::STATUS_NEED_MORE_INFO => 'NeedMoreInformation',
+			self::STATUS_WAITING => 'Suspended',
+			self::STATUS_CLOSED => 'Closed',
+			self::STATUS_CANCELED => 'Canceled'
+		);
+		$this->statuts = array(
+			self::STATUS_NOT_READ => 'Unread',
+			self::STATUS_READ => 'Read',
+			self::STATUS_ASSIGNED => 'Assigned',
+			self::STATUS_IN_PROGRESS => 'InProgress',
+			self::STATUS_NEED_MORE_INFO => 'NeedMoreInformation',
+			self::STATUS_WAITING => 'Suspended',
+			self::STATUS_CLOSED => 'Closed',
+			self::STATUS_CANCELED => 'Canceled'
+		);
 	}
 
 	/**
@@ -1058,7 +1081,7 @@ class Ticket extends CommonObject
 	public function initAsSpecimen()
 	{
 		$this->id = 0;
-
+		$this->entity = 1;
 		$this->ref = 'TI0501-001';
 		$this->track_id = 'XXXXaaaa';
 		$this->origin_email = 'email@email.com';
@@ -1067,7 +1090,7 @@ class Ticket extends CommonObject
 		$this->fk_user_assign = 1;
 		$this->subject = 'Subject of ticket';
 		$this->message = 'Message of ticket';
-		$this->fk_statut = 0;
+		$this->status = 0;
 		$this->resolution = '1';
 		$this->progress = '10';
 		$this->timing = '30';
@@ -1289,7 +1312,8 @@ class Ticket extends CommonObject
 
 		$result = '';
 
-		$label = img_picto('', $this->picto).' <u>'.$langs->trans("Ticket").'</u>';
+		$label = img_picto('', $this->picto).' <u class="paddingrightonly">'.$langs->trans("Ticket").'</u>';
+		$label .= ' '.$this->getLibStatut(4);
 		$label .= '<br>';
 		$label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref.'<br>';
 		$label .= '<b>'.$langs->trans('TicketTrackId').':</b> '.$this->track_id.'<br>';
@@ -1487,7 +1511,7 @@ class Ticket extends CommonObject
 				$message .= $langs->transnoentities('TicketNotificationRecipient').' : '.$recipient."\n";
 				$message .= "\n";
 				$message .= '* '.$langs->transnoentities('TicketNotificationLogMessage').' *'."\n";
-				$message .= dol_html_entity_decode($log_message, ENT_QUOTES|ENT_HTML5)."\n";
+				$message .= dol_html_entity_decode($log_message, ENT_QUOTES | ENT_HTML5)."\n";
 
 				if ($info_sendto['source'] == 'internal') {
 					$url_internal_ticket = dol_buildpath('/ticket/card.php', 2).'?track_id='.$this->track_id;
@@ -1515,8 +1539,8 @@ class Ticket extends CommonObject
 					$conf->global->MAIN_MAIL_AUTOCOPY_TO = '';
 				}
 				include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
-                $sendtocc = '';
-                $deliveryreceipt = 0;
+				$sendtocc = '';
+				$deliveryreceipt = 0;
 				$mailfile = new CMailFile($subject, $info_sendto['email'], $from, $message, $filepath, $mimetype, $filename, $sendtocc, '', $deliveryreceipt, 0);
 				if ($mailfile->error || $mailfile->errors) {
 					setEventMessages($mailfile->error, $mailfile->errors, 'errors');
diff --git a/htdocs/ticket/class/ticketstats.class.php b/htdocs/ticket/class/ticketstats.class.php
index f2fd2155247..588037a6d2f 100644
--- a/htdocs/ticket/class/ticketstats.class.php
+++ b/htdocs/ticket/class/ticketstats.class.php
@@ -29,136 +29,136 @@ require_once 'ticket.class.php';
  */
 class TicketStats extends Stats
 {
-    /**
-     * @var string Name of table without prefix where object is stored
-     */
-    public $table_element;
+	/**
+	 * @var string Name of table without prefix where object is stored
+	 */
+	public $table_element;
 
-    public $socid;
-    public $userid;
+	public $socid;
+	public $userid;
 
-    public $from;
-    public $field;
-    public $where;
+	public $from;
+	public $field;
+	public $where;
 
-    /**
-     * Constructor
-     *
-     * @param  DoliDB $db     Database handler
-     * @param  int    $socid  Id third party
-     * @param  mixed  $userid Id user for filter or array of user ids
-     * @return void
-     */
-    public function __construct($db, $socid = 0, $userid = 0)
-    {
-        global $conf;
+	/**
+	 * Constructor
+	 *
+	 * @param  DoliDB $db     Database handler
+	 * @param  int    $socid  Id third party
+	 * @param  mixed  $userid Id user for filter or array of user ids
+	 * @return void
+	 */
+	public function __construct($db, $socid = 0, $userid = 0)
+	{
+		global $conf;
 
-        $this->db = $db;
-        $this->socid = $socid;
-        $this->userid = $userid;
+		$this->db = $db;
+		$this->socid = $socid;
+		$this->userid = $userid;
 
-        $object = new Ticket($this->db);
-        $this->from = MAIN_DB_PREFIX.$object->table_element;
-        $this->field = 'timing';
+		$object = new Ticket($this->db);
+		$this->from = MAIN_DB_PREFIX.$object->table_element;
+		$this->field = 'timing';
 
-        $this->where = " fk_statut > 0";
-        $this->where .= " AND entity = ".$conf->entity;
-        if ($this->socid > 0) {
-            $this->where .= " AND fk_soc = ".$this->socid;
-        }
-        if (is_array($this->userid) && count($this->userid) > 0) {
-            $this->where .= ' AND fk_user_create IN ('.join(',', $this->userid).')';
-        } elseif ($this->userid > 0) {
-            $this->where .= ' AND fk_user_create = '.$this->userid;
-        }
-    }
+		$this->where = " fk_statut > 0";
+		$this->where .= " AND entity = ".$conf->entity;
+		if ($this->socid > 0) {
+			$this->where .= " AND fk_soc = ".$this->socid;
+		}
+		if (is_array($this->userid) && count($this->userid) > 0) {
+			$this->where .= ' AND fk_user_create IN ('.join(',', $this->userid).')';
+		} elseif ($this->userid > 0) {
+			$this->where .= ' AND fk_user_create = '.$this->userid;
+		}
+	}
 
-    /**
-     *     Renvoie le nombre de tickets par annee
-     *
-     *    @return array    Array of values
-     */
-    public function getNbByYear()
-    {
-        $sql = "SELECT YEAR(datec) as dm, count(*)";
-        $sql .= " FROM ".$this->from;
-        $sql .= " GROUP BY dm DESC";
-        $sql .= " WHERE ".$this->where;
+	/**
+	 *     Renvoie le nombre de tickets par annee
+	 *
+	 *    @return array    Array of values
+	 */
+	public function getNbByYear()
+	{
+		$sql = "SELECT YEAR(datec) as dm, count(*)";
+		$sql .= " FROM ".$this->from;
+		$sql .= " GROUP BY dm DESC";
+		$sql .= " WHERE ".$this->where;
 
-        return $this->_getNbByYear($sql);
-    }
+		return $this->_getNbByYear($sql);
+	}
 
-    /**
-     *     Renvoie le nombre de facture par mois pour une annee donnee
-     *
-     *    @param  string $year Year to scan
-     *    @return array            Array of values
-     */
-    public function getNbByMonth($year)
-    {
-        $sql = "SELECT MONTH(datec) as dm, count(*)";
-        $sql .= " FROM ".$this->from;
-        $sql .= " WHERE YEAR(datec) = ".$year;
-        $sql .= " AND ".$this->where;
-        $sql .= " GROUP BY dm";
-        $sql .= $this->db->order('dm', 'DESC');
+	/**
+	 *     Renvoie le nombre de facture par mois pour une annee donnee
+	 *
+	 *    @param  string $year Year to scan
+	 *    @return array            Array of values
+	 */
+	public function getNbByMonth($year)
+	{
+		$sql = "SELECT MONTH(datec) as dm, count(*)";
+		$sql .= " FROM ".$this->from;
+		$sql .= " WHERE YEAR(datec) = ".$year;
+		$sql .= " AND ".$this->where;
+		$sql .= " GROUP BY dm";
+		$sql .= $this->db->order('dm', 'DESC');
 
-        $res = $this->_getNbByMonth($year, $sql);
-        //var_dump($res);print '<br>';
-        return $res;
-    }
+		$res = $this->_getNbByMonth($year, $sql);
+		//var_dump($res);print '<br>';
+		return $res;
+	}
 
-    /**
-     *     Renvoie le montant de facture par mois pour une annee donnee
-     *
-     *    @param  int $year Year to scan
-     *    @return array                Array of values
-     */
-    public function getAmountByMonth($year)
-    {
-        $sql = "SELECT date_format(datec,'%m') as dm, sum(".$this->field.")";
-        $sql .= " FROM ".$this->from;
-        $sql .= " WHERE date_format(datec,'%Y') = '".$this->db->escape($year)."'";
-        $sql .= " AND ".$this->where;
-        $sql .= " GROUP BY dm";
-        $sql .= $this->db->order('dm', 'DESC');
+	/**
+	 *     Renvoie le montant de facture par mois pour une annee donnee
+	 *
+	 *    @param  int $year Year to scan
+	 *    @return array                Array of values
+	 */
+	public function getAmountByMonth($year)
+	{
+		$sql = "SELECT date_format(datec,'%m') as dm, sum(".$this->field.")";
+		$sql .= " FROM ".$this->from;
+		$sql .= " WHERE date_format(datec,'%Y') = '".$this->db->escape($year)."'";
+		$sql .= " AND ".$this->where;
+		$sql .= " GROUP BY dm";
+		$sql .= $this->db->order('dm', 'DESC');
 
-        $res = $this->_getAmountByMonth($year, $sql);
-        //var_dump($res);print '<br>';
-        return $res;
-    }
+		$res = $this->_getAmountByMonth($year, $sql);
+		//var_dump($res);print '<br>';
+		return $res;
+	}
 
-    /**
-     *    Return average amount
-     *
-     *    @param  int $year Year to scan
-     *    @return array                Array of values
-     */
-    public function getAverageByMonth($year)
-    {
-        $sql = "SELECT date_format(datec,'%m') as dm, avg(".$this->field.")";
-        $sql .= " FROM ".$this->from;
-        $sql .= " WHERE date_format(datec,'%Y') = '".$this->db->escape($year)."'";
-        $sql .= " AND ".$this->where;
-        $sql .= " GROUP BY dm";
-        $sql .= $this->db->order('dm', 'DESC');
+	/**
+	 *    Return average amount
+	 *
+	 *    @param  int $year Year to scan
+	 *    @return array                Array of values
+	 */
+	public function getAverageByMonth($year)
+	{
+		$sql = "SELECT date_format(datec,'%m') as dm, avg(".$this->field.")";
+		$sql .= " FROM ".$this->from;
+		$sql .= " WHERE date_format(datec,'%Y') = '".$this->db->escape($year)."'";
+		$sql .= " AND ".$this->where;
+		$sql .= " GROUP BY dm";
+		$sql .= $this->db->order('dm', 'DESC');
 
-        return $this->_getAverageByMonth($year, $sql);
-    }
+		return $this->_getAverageByMonth($year, $sql);
+	}
 
-    /**
-     *    Return nb, total and average
-     *
-     *    @return array                Array of values
-     */
-    public function getAllByYear()
-    {
-        $sql = "SELECT date_format(datec,'%Y') as year, count(*) as nb, sum(".$this->field.") as total, avg(".$this->field.") as avg";
-        $sql .= " FROM ".$this->from;
-        $sql .= " WHERE ".$this->where;
-        $sql .= " GROUP BY year";
-        $sql .= $this->db->order('year', 'DESC');
+	/**
+	 *    Return nb, total and average
+	 *
+	 *    @return array                Array of values
+	 */
+	public function getAllByYear()
+	{
+		$sql = "SELECT date_format(datec,'%Y') as year, count(*) as nb, sum(".$this->field.") as total, avg(".$this->field.") as avg";
+		$sql .= " FROM ".$this->from;
+		$sql .= " WHERE ".$this->where;
+		$sql .= " GROUP BY year";
+		$sql .= $this->db->order('year', 'DESC');
 
-        return $this->_getAllByYear($sql);
-    }
+		return $this->_getAllByYear($sql);
+	}
 }
diff --git a/htdocs/ticket/class/utils_diff.class.php b/htdocs/ticket/class/utils_diff.class.php
index 84075d395ab..6edccdfa0ff 100644
--- a/htdocs/ticket/class/utils_diff.class.php
+++ b/htdocs/ticket/class/utils_diff.class.php
@@ -22,17 +22,17 @@ class Diff
 
 	/**
 	 * 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
-     * is only in the first string), and DIFF::INSERTED (the line or character is
-     * only in the second string). The parameters are:
-     *
-     * @param	string	$string1            First string
-     * @param	string	$string2            Second string
-     * @param	string	$compareCharacters  true to compare characters, and false to compare lines; this optional parameter defaults to false
-     * @return	array						Array of diff
-     */
+	 * 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
+	 * is only in the first string), and DIFF::INSERTED (the line or character is
+	 * only in the second string). The parameters are:
+	 *
+	 * @param	string	$string1            First string
+	 * @param	string	$string2            Second string
+	 * @param	string	$compareCharacters  true to compare characters, and false to compare lines; this optional parameter defaults to false
+	 * @return	array						Array of diff
+	 */
 	public static function compare($string1, $string2, $compareCharacters = false)
 	{
 		// initialise the sequences and comparison start and end positions
@@ -89,12 +89,12 @@ class Diff
 
 	/**
 	 * Returns the diff for two files. The parameters are:
-     *
-     * @param	string	$file1              Path to the first file
-     * @param	string	$file2              Path to the second file
-     * @param	boolean	$compareCharacters  true to compare characters, and false to compare lines; this optional parameter defaults to false
-     * @return	array						Array of diff
-     */
+	 *
+	 * @param	string	$file1              Path to the first file
+	 * @param	string	$file2              Path to the second file
+	 * @param	boolean	$compareCharacters  true to compare characters, and false to compare lines; this optional parameter defaults to false
+	 * @return	array						Array of diff
+	 */
 	public static function compareFiles(
 		$file1,
 		$file2,
@@ -111,14 +111,14 @@ class Diff
 
 	/**
 	 * Returns the table of longest common subsequence lengths for the specified sequences. The parameters are:
-     *
-     * @param	string	$sequence1 	the first sequence
-     * @param	string	$sequence2 	the second sequence
-     * @param	string	$start     	the starting index
-     * @param	string	$end1      	the ending index for the first sequence
-     * @param	string	$end2      	the ending index for the second sequence
-     * @return	array				array of diff
-     */
+	 *
+	 * @param	string	$sequence1 	the first sequence
+	 * @param	string	$sequence2 	the second sequence
+	 * @param	string	$start     	the starting index
+	 * @param	string	$end1      	the ending index for the first sequence
+	 * @param	string	$end2      	the ending index for the second sequence
+	 * @return	array				array of diff
+	 */
 	private static function computeTable($sequence1, $sequence2, $start, $end1, $end2)
 	{
 		// determine the lengths to be compared
@@ -152,14 +152,14 @@ class Diff
 	/**
 	 * Returns the partial diff for the specificed sequences, in reverse order.
 	 * The parameters are:
-     *
-     * @param	string	$table     	the table returned by the computeTable function
-     * @param	string	$sequence1 	the first sequence
-     * @param	string	$sequence2 	the second sequence
-     * @param	string	$start     	the starting index
-     * @return	array				array of diff
-     */
-	private static function generatePartialDiff($table,	$sequence1,	$sequence2, $start)
+	 *
+	 * @param	string	$table     	the table returned by the computeTable function
+	 * @param	string	$sequence1 	the first sequence
+	 * @param	string	$sequence2 	the second sequence
+	 * @param	string	$start     	the starting index
+	 * @return	array				array of diff
+	 */
+	private static function generatePartialDiff($table, $sequence1, $sequence2, $start)
 	{
 		//  initialise the diff
 		$diff = array();
@@ -197,13 +197,13 @@ class Diff
 
 	/**
 	 * Returns a diff as a string, where unmodified lines are prefixed by '  ',
-     * deletions are prefixed by '- ', and insertions are prefixed by '+ '. The
-     * parameters are:
-     *
-     * @param	array	$diff      	the diff array
-     * @param	string	$separator 	the separator between lines; this optional parameter defaults to "\n"
-     * @return	string				String
-     */
+	 * deletions are prefixed by '- ', and insertions are prefixed by '+ '. The
+	 * parameters are:
+	 *
+	 * @param	array	$diff      	the diff array
+	 * @param	string	$separator 	the separator between lines; this optional parameter defaults to "\n"
+	 * @return	string				String
+	 */
 	public static function toString($diff, $separator = "\n")
 	{
 		// initialise the string
@@ -234,13 +234,13 @@ class Diff
 
 	/**
 	 * 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:
-     *
-     * @param	string	$diff      	the diff array
-     * @param	string	$separator 	the separator between lines; this optional parameter defaults to '<br>'
-     * @return	string				HTML string
-     */
+	 * within 'span' elements, deletions are contained within 'del' elements, and
+	 * insertions are contained within 'ins' elements. The parameters are:
+	 *
+	 * @param	string	$diff      	the diff array
+	 * @param	string	$separator 	the separator between lines; this optional parameter defaults to '<br>'
+	 * @return	string				HTML string
+	 */
 	public static function toHTML($diff, $separator = '<br>')
 	{
 		// initialise the HTML
@@ -275,12 +275,12 @@ class Diff
 
 	/**
 	 * Returns a diff as an HTML table. The parameters are:
-     *
-     * @param	string	$diff        	the diff array
-     * @param	string	$indentation 	indentation to add to every line of the generated HTML; this optional parameter defaults to ''
-     * @param	string	$separator   	the separator between lines; this optional parameter defaults to '<br>'
-     * @return	string					HTML string
-     */
+	 *
+	 * @param	string	$diff        	the diff array
+	 * @param	string	$indentation 	indentation to add to every line of the generated HTML; this optional parameter defaults to ''
+	 * @param	string	$separator   	the separator between lines; this optional parameter defaults to '<br>'
+	 * @return	string					HTML string
+	 */
 	public static function toTable($diff, $indentation = '', $separator = '<br>')
 	{
 		// initialise the HTML
@@ -364,15 +364,15 @@ class Diff
 
 	/**
 	 * Returns the content of the cell, for use in the toTable function. The
-     * parameters are:
-     *
-     * @param	string	$diff        	the diff array
-     * @param	string	$indentation 	indentation to add to every line of the generated HTML
-     * @param	string	$separator   	the separator between lines
-     * @param	string	$index       	the current index, passes by reference
-     * @param	string	$type        	the type of line
-     * @return	string					HTML string
-     */
+	 * parameters are:
+	 *
+	 * @param	string	$diff        	the diff array
+	 * @param	string	$indentation 	indentation to add to every line of the generated HTML
+	 * @param	string	$separator   	the separator between lines
+	 * @param	string	$index       	the current index, passes by reference
+	 * @param	string	$type        	the type of line
+	 * @return	string					HTML string
+	 */
 	private static function getCellContent($diff, $indentation, $separator, &$index, $type)
 	{
 		// initialise the HTML
diff --git a/htdocs/ticket/contact.php b/htdocs/ticket/contact.php
index 070c673d158..dacac9f5225 100644
--- a/htdocs/ticket/contact.php
+++ b/htdocs/ticket/contact.php
@@ -52,8 +52,8 @@ $lineid = GETPOST('lineid', 'int');
 
 // Protection if external user
 if ($user->socid > 0) {
-    $socid = $user->socid;
-    accessforbidden();
+	$socid = $user->socid;
+	accessforbidden();
 }
 
 // Store current page url
@@ -67,45 +67,45 @@ $object = new Ticket($db);
  */
 
 if ($action == 'addcontact' && $user->rights->ticket->write) {
-    $result = $object->fetch($id, '', $track_id);
+	$result = $object->fetch($id, '', $track_id);
 
-    if ($result > 0 && ($id > 0 || (!empty($track_id)))) {
-        $contactid = (GETPOST('userid', 'int') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int'));
-        $result = $object->add_contact($contactid, $type, $source);
-    }
+	if ($result > 0 && ($id > 0 || (!empty($track_id)))) {
+		$contactid = (GETPOST('userid', 'int') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int'));
+		$result = $object->add_contact($contactid, $type, $source);
+	}
 
-    if ($result >= 0) {
-        Header("Location: ".$url_page_current."?id=".$object->id);
-        exit;
-    } else {
-        if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
-            $langs->load("errors");
-            setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors');
-        } else {
-            setEventMessages($object->error, $object->errors, 'errors');
-        }
-    }
+	if ($result >= 0) {
+		Header("Location: ".$url_page_current."?id=".$object->id);
+		exit;
+	} else {
+		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
+			$langs->load("errors");
+			setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors');
+		} else {
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
+	}
 }
 
 // bascule du statut d'un contact
 if ($action == 'swapstatut' && $user->rights->ticket->write) {
-    if ($object->fetch($id, '', $track_id)) {
-        $result = $object->swapContactStatus($ligne);
-    } else {
-        dol_print_error($db, $object->error);
-    }
+	if ($object->fetch($id, '', $track_id)) {
+		$result = $object->swapContactStatus($ligne);
+	} else {
+		dol_print_error($db, $object->error);
+	}
 }
 
 // Efface un contact
 if ($action == 'deletecontact' && $user->rights->ticket->write) {
-    if ($object->fetch($id, '', $track_id)) {
-        $result = $object->delete_contact($lineid);
+	if ($object->fetch($id, '', $track_id)) {
+		$result = $object->delete_contact($lineid);
 
-        if ($result >= 0) {
-            Header("Location: ".$url_page_current."?id=".$object->id);
-            exit;
-        }
-    }
+		if ($result >= 0) {
+			Header("Location: ".$url_page_current."?id=".$object->id);
+			exit;
+		}
+	}
 }
 
 
@@ -124,112 +124,112 @@ $userstatic = new User($db);
 
 if ($id > 0 || !empty($track_id) || !empty($ref)) {
 	if ($object->fetch($id, $ref, $track_id) > 0)
-    {
-        if ($socid > 0) {
-            $object->fetch_thirdparty();
-            $head = societe_prepare_head($object->thirdparty);
-            print dol_get_fiche_head($head, 'ticket', $langs->trans("ThirdParty"), 0, 'company');
-            dol_banner_tab($object->thirdparty, 'socid', '', ($user->socid ? 0 : 1), 'rowid', 'nom');
-            dol_fiche_end();
-        }
+	{
+		if ($socid > 0) {
+			$object->fetch_thirdparty();
+			$head = societe_prepare_head($object->thirdparty);
+			print dol_get_fiche_head($head, 'ticket', $langs->trans("ThirdParty"), 0, 'company');
+			dol_banner_tab($object->thirdparty, 'socid', '', ($user->socid ? 0 : 1), 'rowid', 'nom');
+			print dol_get_fiche_end();
+		}
 
-        if (!$user->socid && $conf->global->TICKET_LIMIT_VIEW_ASSIGNED_ONLY) {
-            $object->next_prev_filter = "te.fk_user_assign = '".$user->id."'";
-        } elseif ($user->socid > 0) {
-            $object->next_prev_filter = "te.fk_soc = '".$user->socid."'";
-        }
+		if (!$user->socid && $conf->global->TICKET_LIMIT_VIEW_ASSIGNED_ONLY) {
+			$object->next_prev_filter = "te.fk_user_assign = '".$user->id."'";
+		} elseif ($user->socid > 0) {
+			$object->next_prev_filter = "te.fk_soc = '".$user->socid."'";
+		}
 
-        $head = ticket_prepare_head($object);
+		$head = ticket_prepare_head($object);
 
-        print dol_get_fiche_head($head, 'contact', $langs->trans("Ticket"), -1, 'ticket');
+		print dol_get_fiche_head($head, 'contact', $langs->trans("Ticket"), -1, 'ticket');
 
-        $morehtmlref = '<div class="refidno">';
-        $morehtmlref .= $object->subject;
-        // Author
-        if ($object->fk_user_create > 0) {
-        	$morehtmlref .= '<br>'.$langs->trans("CreatedBy").' : ';
+		$morehtmlref = '<div class="refidno">';
+		$morehtmlref .= $object->subject;
+		// Author
+		if ($object->fk_user_create > 0) {
+			$morehtmlref .= '<br>'.$langs->trans("CreatedBy").' : ';
 
-        	$langs->load("users");
-        	$fuser = new User($db);
-        	$fuser->fetch($object->fk_user_create);
-        	$morehtmlref .= $fuser->getNomUrl(0);
-        }
-        if (!empty($object->origin_email)) {
-        	$morehtmlref .= '<br>'.$langs->trans("CreatedBy").' : ';
-        	$morehtmlref .= $object->origin_email.' <small>('.$langs->trans("TicketEmailOriginIssuer").')</small>';
-        }
+			$langs->load("users");
+			$fuser = new User($db);
+			$fuser->fetch($object->fk_user_create);
+			$morehtmlref .= $fuser->getNomUrl(0);
+		}
+		if (!empty($object->origin_email)) {
+			$morehtmlref .= '<br>'.$langs->trans("CreatedBy").' : ';
+			$morehtmlref .= $object->origin_email.' <small>('.$langs->trans("TicketEmailOriginIssuer").')</small>';
+		}
 
-        // Thirdparty
-        if (!empty($conf->societe->enabled))
-        {
-        	$morehtmlref .= '<br>'.$langs->trans('ThirdParty');
-        	/*if ($action != 'editcustomer' && $object->fk_statut < 8 && !$user->socid && $user->rights->ticket->write) {
+		// Thirdparty
+		if (!empty($conf->societe->enabled))
+		{
+			$morehtmlref .= '<br>'.$langs->trans('ThirdParty');
+			/*if ($action != 'editcustomer' && $object->fk_statut < 8 && !$user->socid && $user->rights->ticket->write) {
         		$morehtmlref.='<a class="editfielda" href="' . $url_page_current . '?action=editcustomer&amp;track_id=' . $object->track_id . '">' . img_edit($langs->transnoentitiesnoconv('Edit'), 1) . '</a>';
         	}*/
-        	$morehtmlref .= ' : ';
-        	if ($action == 'editcustomer') {
-        		$morehtmlref .= $form->form_thirdparty($url_page_current.'?track_id='.$object->track_id, $object->socid, 'editcustomer', '', 1, 0, 0, array(), 1);
-        	} else {
-        		$morehtmlref .= $form->form_thirdparty($url_page_current.'?track_id='.$object->track_id, $object->socid, 'none', '', 1, 0, 0, array(), 1);
-        	}
-        }
+			$morehtmlref .= ' : ';
+			if ($action == 'editcustomer') {
+				$morehtmlref .= $form->form_thirdparty($url_page_current.'?track_id='.$object->track_id, $object->socid, 'editcustomer', '', 1, 0, 0, array(), 1);
+			} else {
+				$morehtmlref .= $form->form_thirdparty($url_page_current.'?track_id='.$object->track_id, $object->socid, 'none', '', 1, 0, 0, array(), 1);
+			}
+		}
 
-        // Project
-        if (!empty($conf->projet->enabled))
-        {
-        	$langs->load("projects");
-        	$morehtmlref .= '<br>'.$langs->trans('Project').' ';
-        	if ($user->rights->ticket->write)
-        	{
-        		if ($action != 'classify') {
-        			//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a>';
+		// Project
+		if (!empty($conf->projet->enabled))
+		{
+			$langs->load("projects");
+			$morehtmlref .= '<br>'.$langs->trans('Project').' ';
+			if ($user->rights->ticket->write)
+			{
+				if ($action != 'classify') {
+					//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a>';
 					$morehtmlref .= ' : ';
 				}
-        		if ($action == 'classify') {
-        			//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-        			$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-        			$morehtmlref .= '<input type="hidden" name="action" value="classin">';
-        			$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
-        			$morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', 0, 0, 1, 0, 1, 0, 0, '', 1);
-        			$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-        			$morehtmlref .= '</form>';
-        		} else {
-        			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-        		}
-        	} else {
-        		if (!empty($object->fk_project)) {
-        			$proj = new Project($db);
-        			$proj->fetch($object->fk_project);
-        			$morehtmlref .= $proj->getNomUrl(1);
-        		} else {
-        			$morehtmlref .= '';
-        		}
-        	}
-        }
+				if ($action == 'classify') {
+					//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+					$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+					$morehtmlref .= '<input type="hidden" name="action" value="classin">';
+					$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
+					$morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', 0, 0, 1, 0, 1, 0, 0, '', 1);
+					$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+					$morehtmlref .= '</form>';
+				} else {
+					$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+				}
+			} else {
+				if (!empty($object->fk_project)) {
+					$proj = new Project($db);
+					$proj->fetch($object->fk_project);
+					$morehtmlref .= $proj->getNomUrl(1);
+				} else {
+					$morehtmlref .= '';
+				}
+			}
+		}
 
-        $morehtmlref .= '</div>';
+		$morehtmlref .= '</div>';
 
-        $linkback = '<a href="'.dol_buildpath('/ticket/list.php', 1).'"><strong>'.$langs->trans("BackToList").'</strong></a> ';
+		$linkback = '<a href="'.dol_buildpath('/ticket/list.php', 1).'"><strong>'.$langs->trans("BackToList").'</strong></a> ';
 
-        dol_banner_tab($object, 'ref', $linkback, ($user->socid ? 0 : 1), 'ref', 'ref', $morehtmlref, $param, 0, '', '', 1, '');
+		dol_banner_tab($object, 'ref', $linkback, ($user->socid ? 0 : 1), 'ref', 'ref', $morehtmlref, $param, 0, '', '', 1, '');
 
-        dol_fiche_end();
+		print dol_get_fiche_end();
 
-        //print '<br>';
+		//print '<br>';
 
-        $permission = $user->rights->ticket->write;
+		$permission = $user->rights->ticket->write;
 
-        // Contacts lines (modules that overwrite templates must declare this into descriptor)
-        $dirtpls = array_merge($conf->modules_parts['tpl'], array('/core/tpl'));
-        foreach ($dirtpls as $reldir) {
-            $res = @include dol_buildpath($reldir.'/contacts.tpl.php');
-            if ($res) {
-            	break;
-            }
-        }
-    } else {
-        print "ErrorRecordNotFound";
-    }
+		// Contacts lines (modules that overwrite templates must declare this into descriptor)
+		$dirtpls = array_merge($conf->modules_parts['tpl'], array('/core/tpl'));
+		foreach ($dirtpls as $reldir) {
+			$res = @include dol_buildpath($reldir.'/contacts.tpl.php');
+			if ($res) {
+				break;
+			}
+		}
+	} else {
+		print "ErrorRecordNotFound";
+	}
 }
 
 // End of page
diff --git a/htdocs/ticket/document.php b/htdocs/ticket/document.php
index c007229fab9..45ee7aba268 100644
--- a/htdocs/ticket/document.php
+++ b/htdocs/ticket/document.php
@@ -44,7 +44,7 @@ $confirm  = GETPOST('confirm', 'alpha');
 
 // Security check
 if (!$user->rights->ticket->read) {
-    accessforbidden();
+	accessforbidden();
 }
 
 // Get parameters
@@ -65,7 +65,7 @@ $result = $object->fetch($id, $ref, $track_id);
 if ($result < 0) {
 	setEventMessages($object->error, $object->errors, 'errors');
 } else {
-    $upload_dir = $conf->ticket->dir_output."/".dol_sanitizeFileName($object->ref);
+	$upload_dir = $conf->ticket->dir_output."/".dol_sanitizeFileName($object->ref);
 }
 
 
@@ -91,112 +91,112 @@ if ($object->id)
 	/*
 	 * Show tabs
 	 */
-    if ($socid > 0) {
-        $object->fetch_thirdparty();
-        $head = societe_prepare_head($object->thirdparty);
-        print dol_get_fiche_head($head, 'ticket', $langs->trans("ThirdParty"), 0, 'company');
-        dol_banner_tab($object->thirdparty, 'socid', '', ($user->socid ? 0 : 1), 'rowid', 'nom');
-        dol_fiche_end();
-    }
+	if ($socid > 0) {
+		$object->fetch_thirdparty();
+		$head = societe_prepare_head($object->thirdparty);
+		print dol_get_fiche_head($head, 'ticket', $langs->trans("ThirdParty"), 0, 'company');
+		dol_banner_tab($object->thirdparty, 'socid', '', ($user->socid ? 0 : 1), 'rowid', 'nom');
+		print dol_get_fiche_end();
+	}
 
-    if (!$user->socid && $conf->global->TICKET_LIMIT_VIEW_ASSIGNED_ONLY) {
-        $object->next_prev_filter = "te.fk_user_assign = '".$user->id."'";
-    } elseif ($user->socid > 0) {
-        $object->next_prev_filter = "te.fk_soc = '".$user->socid."'";
-    }
+	if (!$user->socid && $conf->global->TICKET_LIMIT_VIEW_ASSIGNED_ONLY) {
+		$object->next_prev_filter = "te.fk_user_assign = '".$user->id."'";
+	} elseif ($user->socid > 0) {
+		$object->next_prev_filter = "te.fk_soc = '".$user->socid."'";
+	}
 
-    $head = ticket_prepare_head($object);
+	$head = ticket_prepare_head($object);
 
-    print dol_get_fiche_head($head, 'tabTicketDocument', $langs->trans("Ticket"), 0, 'ticket');
+	print dol_get_fiche_head($head, 'tabTicketDocument', $langs->trans("Ticket"), 0, 'ticket');
 
-    $morehtmlref = '<div class="refidno">';
-    $morehtmlref .= $object->subject;
-    // Author
-    if ($object->fk_user_create > 0) {
-    	$morehtmlref .= '<br>'.$langs->trans("CreatedBy").'  : ';
+	$morehtmlref = '<div class="refidno">';
+	$morehtmlref .= $object->subject;
+	// Author
+	if ($object->fk_user_create > 0) {
+		$morehtmlref .= '<br>'.$langs->trans("CreatedBy").'  : ';
 
-    	$langs->load("users");
-    	$fuser = new User($db);
-    	$fuser->fetch($object->fk_user_create);
-    	$morehtmlref .= $fuser->getNomUrl(0);
-    }
-    if (!empty($object->origin_email)) {
-    	$morehtmlref .= '<br>'.$langs->trans("CreatedBy").' : ';
-    	$morehtmlref .= $object->origin_email.' <small>('.$langs->trans("TicketEmailOriginIssuer").')</small>';
-    }
+		$langs->load("users");
+		$fuser = new User($db);
+		$fuser->fetch($object->fk_user_create);
+		$morehtmlref .= $fuser->getNomUrl(0);
+	}
+	if (!empty($object->origin_email)) {
+		$morehtmlref .= '<br>'.$langs->trans("CreatedBy").' : ';
+		$morehtmlref .= $object->origin_email.' <small>('.$langs->trans("TicketEmailOriginIssuer").')</small>';
+	}
 
-    // Thirdparty
-    if (!empty($conf->societe->enabled))
-    {
-    	$morehtmlref .= '<br>'.$langs->trans('ThirdParty');
-    	/*if ($action != 'editcustomer' && $object->fk_statut < 8 && !$user->socid && $user->rights->ticket->write) {
+	// Thirdparty
+	if (!empty($conf->societe->enabled))
+	{
+		$morehtmlref .= '<br>'.$langs->trans('ThirdParty');
+		/*if ($action != 'editcustomer' && $object->fk_statut < 8 && !$user->socid && $user->rights->ticket->write) {
     		$morehtmlref.='<a class="editfielda" href="' . $url_page_current . '?action=editcustomer&amp;track_id=' . $object->track_id . '">' . img_edit($langs->transnoentitiesnoconv('Edit'), 1) . '</a>';
     	}*/
-    	$morehtmlref .= ' : ';
-    	if ($action == 'editcustomer') {
-    		$morehtmlref .= $form->form_thirdparty($url_page_current.'?track_id='.$object->track_id, $object->socid, 'editcustomer', '', 1, 0, 0, array(), 1);
-    	} else {
-    		$morehtmlref .= $form->form_thirdparty($url_page_current.'?track_id='.$object->track_id, $object->socid, 'none', '', 1, 0, 0, array(), 1);
-    	}
-    }
+		$morehtmlref .= ' : ';
+		if ($action == 'editcustomer') {
+			$morehtmlref .= $form->form_thirdparty($url_page_current.'?track_id='.$object->track_id, $object->socid, 'editcustomer', '', 1, 0, 0, array(), 1);
+		} else {
+			$morehtmlref .= $form->form_thirdparty($url_page_current.'?track_id='.$object->track_id, $object->socid, 'none', '', 1, 0, 0, array(), 1);
+		}
+	}
 
-    // Project
-    if (!empty($conf->projet->enabled))
-    {
-    	$langs->load("projects");
-    	$morehtmlref .= '<br>'.$langs->trans('Project').' ';
-    	if ($user->rights->ticket->write)
-    	{
-    		if ($action != 'classify') {
-    			//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a>';
+	// Project
+	if (!empty($conf->projet->enabled))
+	{
+		$langs->load("projects");
+		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
+		if ($user->rights->ticket->write)
+		{
+			if ($action != 'classify') {
+				//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a>';
 				$morehtmlref .= ' : ';
 			}
-    		if ($action == 'classify') {
-    			//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-    			$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-    			$morehtmlref .= '<input type="hidden" name="action" value="classin">';
-    			$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
-    			$morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', 0, 0, 1, 0, 1, 0, 0, '', 1);
-    			$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-    			$morehtmlref .= '</form>';
-    		} else {
-    			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-    		}
-    	} else {
-    		if (!empty($object->fk_project)) {
-    			$proj = new Project($db);
-    			$proj->fetch($object->fk_project);
-    			$morehtmlref .= $proj->getNomUrl(1);
-    		} else {
-    			$morehtmlref .= '';
-    		}
-    	}
-    }
+			if ($action == 'classify') {
+				//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+				$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+				$morehtmlref .= '<input type="hidden" name="action" value="classin">';
+				$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
+				$morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', 0, 0, 1, 0, 1, 0, 0, '', 1);
+				$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+				$morehtmlref .= '</form>';
+			} else {
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+			}
+		} else {
+			if (!empty($object->fk_project)) {
+				$proj = new Project($db);
+				$proj->fetch($object->fk_project);
+				$morehtmlref .= $proj->getNomUrl(1);
+			} else {
+				$morehtmlref .= '';
+			}
+		}
+	}
 
-    $morehtmlref .= '</div>';
+	$morehtmlref .= '</div>';
 
-    $linkback = '<a href="'.dol_buildpath('/ticket/list.php', 1).'"><strong>'.$langs->trans("BackToList").'</strong></a> ';
+	$linkback = '<a href="'.dol_buildpath('/ticket/list.php', 1).'"><strong>'.$langs->trans("BackToList").'</strong></a> ';
 
-    dol_banner_tab($object, 'ref', $linkback, ($user->socid ? 0 : 1), 'ref', 'ref', $morehtmlref, '', 0, '', '', 1);
+	dol_banner_tab($object, 'ref', $linkback, ($user->socid ? 0 : 1), 'ref', 'ref', $morehtmlref, '', 0, '', '', 1);
 
-    dol_fiche_end();
+	print dol_get_fiche_end();
 
-    // Build file list
-    $filearray = dol_dir_list($upload_dir, "files", 0, '', '\.meta$', $sortfield, (strtolower($sortorder) == 'desc' ? SORT_DESC : SORT_ASC), 1);
-    $totalsize = 0;
-    foreach ($filearray as $key => $file) {
-        $totalsize += $file['size'];
-    }
+	// Build file list
+	$filearray = dol_dir_list($upload_dir, "files", 0, '', '\.meta$', $sortfield, (strtolower($sortorder) == 'desc' ? SORT_DESC : SORT_ASC), 1);
+	$totalsize = 0;
+	foreach ($filearray as $key => $file) {
+		$totalsize += $file['size'];
+	}
 
-    //$object->ref = $object->track_id;	// For compatibility we use track ID for directory
-    $modulepart = 'ticket';
+	//$object->ref = $object->track_id;	// For compatibility we use track ID for directory
+	$modulepart = 'ticket';
   	$permission = $user->rights->ticket->write;
   	$permtoedit = $user->rights->ticket->write;
   	$param = '&id='.$object->id;
 
   	include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
 } else {
-    accessforbidden('', 0, 1);
+	accessforbidden('', 0, 1);
 }
 
 // End of page
diff --git a/htdocs/ticket/index.php b/htdocs/ticket/index.php
index 5e2d8587dd0..ed304c43976 100644
--- a/htdocs/ticket/index.php
+++ b/htdocs/ticket/index.php
@@ -45,7 +45,7 @@ $msg_id = GETPOST('msg_id', 'int');
 $action = GETPOST('action', 'aZ09');
 
 if ($user->socid) {
-    $socid = $user->socid;
+	$socid = $user->socid;
 }
 
 // Security check
@@ -90,22 +90,22 @@ $param_shownb = 'DOLUSERCOOKIE_ticket_by_status_shownb';
 $param_showtot = 'DOLUSERCOOKIE_ticket_by_status_showtot';
 $autosetarray = preg_split("/[,;:]+/", GETPOST('DOL_AUTOSET_COOKIE'));
 if (in_array('DOLUSERCOOKIE_ticket_by_status', $autosetarray)) {
-    $endyear = GETPOST($param_year, 'int');
-    $shownb = GETPOST($param_shownb, 'alpha');
-    $showtot = GETPOST($param_showtot, 'alpha');
+	$endyear = GETPOST($param_year, 'int');
+	$shownb = GETPOST($param_shownb, 'alpha');
+	$showtot = GETPOST($param_showtot, 'alpha');
 } else {
-    $tmparray = json_decode($_COOKIE['DOLUSERCOOKIE_ticket_by_status'], true);
-    $endyear = $tmparray['year'];
-    $shownb = $tmparray['shownb'];
-    $showtot = $tmparray['showtot'];
+	$tmparray = json_decode($_COOKIE['DOLUSERCOOKIE_ticket_by_status'], true);
+	$endyear = $tmparray['year'];
+	$shownb = $tmparray['shownb'];
+	$showtot = $tmparray['showtot'];
 }
 if (empty($shownb) && empty($showtot)) {
-    $showtot = 1;
+	$showtot = 1;
 }
 
 $nowarray = dol_getdate(dol_now(), true);
 if (empty($endyear)) {
-    $endyear = $nowarray['year'];
+	$endyear = $nowarray['year'];
 }
 
 $startyear = $endyear - 1;
@@ -118,92 +118,92 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
  * Statistics area
  */
 $tick = array(
-    'unread' => 0,
-    'read' => 0,
-    'answered' => 0,
-    'assigned' => 0,
-    'inprogress' => 0,
-    'waiting' => 0,
-    'closed' => 0,
-    'deleted' => 0,
+	'unread' => 0,
+	'read' => 0,
+	'answered' => 0,
+	'assigned' => 0,
+	'inprogress' => 0,
+	'waiting' => 0,
+	'closed' => 0,
+	'deleted' => 0,
 );
 
 $sql = "SELECT t.fk_statut, COUNT(t.fk_statut) as nb";
 $sql .= " FROM ".MAIN_DB_PREFIX."ticket as t";
 if (!$user->rights->societe->client->voir && !$socid) {
-    $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 }
 $sql .= ' WHERE t.entity IN ('.getEntity('ticket').')';
 $sql .= dolSqlDateFilter('datec', 0, 0, $endyear);
 
 if (!$user->rights->societe->client->voir && !$socid) {
-    $sql .= " AND t.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
+	$sql .= " AND t.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
 }
 
 // External users restriction
 if ($user->socid > 0) {
-    $sql .= " AND t.fk_soc= ".((int) $user->socid);
+	$sql .= " AND t.fk_soc= ".((int) $user->socid);
 } else {
-    // For internals users,
-    if (!empty($conf->global->TICKET_LIMIT_VIEW_ASSIGNED_ONLY) && !$user->rights->ticket->manage) {
-        $sql .= " AND t.fk_user_assign = ".$user->id;
-    }
+	// For internals users,
+	if (!empty($conf->global->TICKET_LIMIT_VIEW_ASSIGNED_ONLY) && !$user->rights->ticket->manage) {
+		$sql .= " AND t.fk_user_assign = ".$user->id;
+	}
 }
 $sql .= " GROUP BY t.fk_statut";
 
 $result = $db->query($sql);
 if ($result) {
-    while ($objp = $db->fetch_object($result)) {
-        $found = 0;
-        if ($objp->fk_statut == Ticket::STATUS_NOT_READ) {
-            $tick['unread'] = $objp->nb;
-        }
-        if ($objp->fk_statut == Ticket::STATUS_READ) {
-            $tick['read'] = $objp->nb;
-        }
-        if ($objp->fk_statut == Ticket::STATUS_NEED_MORE_INFO) {
-        	$tick['needmoreinfo'] = $objp->nb;
-        }
-        if ($objp->fk_statut == Ticket::STATUS_ASSIGNED) {
-            $tick['assigned'] = $objp->nb;
-        }
-        if ($objp->fk_statut == Ticket::STATUS_IN_PROGRESS) {
-            $tick['inprogress'] = $objp->nb;
-        }
-        if ($objp->fk_statut == Ticket::STATUS_WAITING) {
-            $tick['waiting'] = $objp->nb;
-        }
-        if ($objp->fk_statut == Ticket::STATUS_CLOSED) {
-            $tick['closed'] = $objp->nb;
-        }
-        if ($objp->fk_statut == Ticket::STATUS_CANCELED) {
-            $tick['canceled'] = $objp->nb;
-        }
-    }
+	while ($objp = $db->fetch_object($result)) {
+		$found = 0;
+		if ($objp->fk_statut == Ticket::STATUS_NOT_READ) {
+			$tick['unread'] = $objp->nb;
+		}
+		if ($objp->fk_statut == Ticket::STATUS_READ) {
+			$tick['read'] = $objp->nb;
+		}
+		if ($objp->fk_statut == Ticket::STATUS_NEED_MORE_INFO) {
+			$tick['needmoreinfo'] = $objp->nb;
+		}
+		if ($objp->fk_statut == Ticket::STATUS_ASSIGNED) {
+			$tick['assigned'] = $objp->nb;
+		}
+		if ($objp->fk_statut == Ticket::STATUS_IN_PROGRESS) {
+			$tick['inprogress'] = $objp->nb;
+		}
+		if ($objp->fk_statut == Ticket::STATUS_WAITING) {
+			$tick['waiting'] = $objp->nb;
+		}
+		if ($objp->fk_statut == Ticket::STATUS_CLOSED) {
+			$tick['closed'] = $objp->nb;
+		}
+		if ($objp->fk_statut == Ticket::STATUS_CANCELED) {
+			$tick['canceled'] = $objp->nb;
+		}
+	}
 
-    include_once DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/theme_vars.inc.php';
+	include_once DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/theme_vars.inc.php';
 
-    $dataseries = array();
-    $colorseries = array();
+	$dataseries = array();
+	$colorseries = array();
 
-    $dataseries[] = array('label' => $langs->trans("Unread"), 'data' => round($tick['unread']));
-    $colorseries[Ticket::STATUS_NOT_READ] = '-'.$badgeStatus0;
-    $dataseries[] = array('label' => $langs->trans("Read"), 'data' => round($tick['read']));
-    $colorseries[Ticket::STATUS_READ] = $badgeStatus1;
-    $dataseries[] = array('label' => $langs->trans("Assigned"), 'data' => round($tick['assigned']));
-    $colorseries[Ticket::STATUS_ASSIGNED] = $badgeStatus3;
-    $dataseries[] = array('label' => $langs->trans("InProgress"), 'data' => round($tick['inprogress']));
-    $colorseries[Ticket::STATUS_IN_PROGRESS] = $badgeStatus4;
-    $dataseries[] = array('label' => $langs->trans("Suspended"), 'data' => round($tick['waiting']));
-    $colorseries[Ticket::STATUS_WAITING] = '-'.$badgeStatus3;
-    $dataseries[] = array('label' => $langs->trans("NeedMoreInformation"), 'data' => round($tick['needmoreinfo']));
-    $colorseries[Ticket::STATUS_NEED_MORE_INFO] = $badgeStatus9;
-    $dataseries[] = array('label' => $langs->trans("Canceled"), 'data' => round($tick['canceled']));
-    $colorseries[Ticket::STATUS_CANCELED] = $badgeStatus9;
-    $dataseries[] = array('label' => $langs->trans("Closed"), 'data' => round($tick['closed']));
-    $colorseries[Ticket::STATUS_CLOSED] = $badgeStatus6;
+	$dataseries[] = array('label' => $langs->trans("Unread"), 'data' => round($tick['unread']));
+	$colorseries[Ticket::STATUS_NOT_READ] = '-'.$badgeStatus0;
+	$dataseries[] = array('label' => $langs->trans("Read"), 'data' => round($tick['read']));
+	$colorseries[Ticket::STATUS_READ] = $badgeStatus1;
+	$dataseries[] = array('label' => $langs->trans("Assigned"), 'data' => round($tick['assigned']));
+	$colorseries[Ticket::STATUS_ASSIGNED] = $badgeStatus3;
+	$dataseries[] = array('label' => $langs->trans("InProgress"), 'data' => round($tick['inprogress']));
+	$colorseries[Ticket::STATUS_IN_PROGRESS] = $badgeStatus4;
+	$dataseries[] = array('label' => $langs->trans("Suspended"), 'data' => round($tick['waiting']));
+	$colorseries[Ticket::STATUS_WAITING] = '-'.$badgeStatus3;
+	$dataseries[] = array('label' => $langs->trans("NeedMoreInformation"), 'data' => round($tick['needmoreinfo']));
+	$colorseries[Ticket::STATUS_NEED_MORE_INFO] = $badgeStatus9;
+	$dataseries[] = array('label' => $langs->trans("Canceled"), 'data' => round($tick['canceled']));
+	$colorseries[Ticket::STATUS_CANCELED] = $badgeStatus9;
+	$dataseries[] = array('label' => $langs->trans("Closed"), 'data' => round($tick['closed']));
+	$colorseries[Ticket::STATUS_CLOSED] = $badgeStatus6;
 } else {
-    dol_print_error($db);
+	dol_print_error($db);
 }
 
 $stringtoshow = '<script type="text/javascript" language="javascript">
@@ -238,38 +238,38 @@ if (!empty($dataseries) && count($dataseries) > 1) {
 	}
 
 	$data = array();
-    foreach ($dataseries as $key => $value) {
-        $data[] = array($value['label'], $value['data']);
-    }
-    $px1 = new DolGraph();
-    $mesg = $px1->isGraphKo();
-    if (!$mesg) {
-        $px1->SetData($data);
-        $px1->SetDataColor(array_values($colorseries));
+	foreach ($dataseries as $key => $value) {
+		$data[] = array($value['label'], $value['data']);
+	}
+	$px1 = new DolGraph();
+	$mesg = $px1->isGraphKo();
+	if (!$mesg) {
+		$px1->SetData($data);
+		$px1->SetDataColor(array_values($colorseries));
 
-        unset($data1);
-        $i = $startyear;
-        $legend = array();
-        while ($i <= $endyear) {
-            $legend[] = $i;
-            $i++;
-        }
-        $px1->setShowLegend(2);
-        $px1->SetType(array('pie'));
-        $px1->SetLegend($legend);
-        $px1->SetMaxValue($px1->GetCeilMaxValue());
-        //$px1->SetWidth($WIDTH);
-        $px1->SetHeight($HEIGHT);
-        $px1->SetYLabel($langs->trans("TicketStatByStatus"));
-        $px1->SetShading(3);
-        $px1->SetHorizTickIncrement(1);
-        $px1->SetCssPrefix("cssboxes");
-        $px1->mode = 'depth';
-        //$px1->SetTitle($langs->trans("TicketStatByStatus"));
+		unset($data1);
+		$i = $startyear;
+		$legend = array();
+		while ($i <= $endyear) {
+			$legend[] = $i;
+			$i++;
+		}
+		$px1->setShowLegend(2);
+		$px1->SetType(array('pie'));
+		$px1->SetLegend($legend);
+		$px1->SetMaxValue($px1->GetCeilMaxValue());
+		//$px1->SetWidth($WIDTH);
+		$px1->SetHeight($HEIGHT);
+		$px1->SetYLabel($langs->trans("TicketStatByStatus"));
+		$px1->SetShading(3);
+		$px1->SetHorizTickIncrement(1);
+		$px1->SetCssPrefix("cssboxes");
+		$px1->mode = 'depth';
+		//$px1->SetTitle($langs->trans("TicketStatByStatus"));
 
-        $px1->draw($filenamenb, $fileurlnb);
-        print $px1->show($totalnb ? 0 : 1);
-    }
+		$px1->draw($filenamenb, $fileurlnb);
+		print $px1->show($totalnb ? 0 : 1);
+	}
 }
 print '</td></tr>';
 
@@ -297,22 +297,22 @@ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_ticket_type as type ON type.code=t.type_
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_ticket_category as category ON category.code=t.category_code";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_ticket_severity as severity ON severity.code=t.severity_code";
 if (!$user->rights->societe->client->voir && !$socid) {
-    $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 }
 
 $sql .= ' WHERE t.entity IN ('.getEntity('ticket').')';
 $sql .= " AND t.fk_statut=0";
 if (!$user->rights->societe->client->voir && !$socid) {
-    $sql .= " AND t.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
+	$sql .= " AND t.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
 }
 
 if ($user->socid > 0) {
-    $sql .= " AND t.fk_soc= ".((int) $user->socid);
+	$sql .= " AND t.fk_soc= ".((int) $user->socid);
 } else {
-    // Restricted to assigned user only
-    if ($conf->global->TICKET_LIMIT_VIEW_ASSIGNED_ONLY && !$user->rights->ticket->manage) {
-        $sql .= " AND t.fk_user_assign=".$user->id;
-    }
+	// Restricted to assigned user only
+	if ($conf->global->TICKET_LIMIT_VIEW_ASSIGNED_ONLY && !$user->rights->ticket->manage) {
+		$sql .= " AND t.fk_user_assign=".$user->id;
+	}
 }
 $sql .= $db->order("t.datec", "DESC");
 $sql .= $db->plimit($max, 0);
@@ -320,82 +320,82 @@ $sql .= $db->plimit($max, 0);
 //print $sql;
 $result = $db->query($sql);
 if ($result) {
-    $num = $db->num_rows($result);
+	$num = $db->num_rows($result);
 
-    $i = 0;
+	$i = 0;
 
-    $transRecordedType = $langs->trans("LatestNewTickets", $max);
+	$transRecordedType = $langs->trans("LatestNewTickets", $max);
 
-    print '<div class="div-table-responsive-no-min">';
-    print '<table class="noborder centpercent">';
-    print '<tr class="liste_titre"><th colspan="5">'.$transRecordedType.'</th>';
-    print '<th class="right" colspan="2"><a href="'.DOL_URL_ROOT.'/ticket/list.php?search_fk_statut[]='.Ticket::STATUS_NOT_READ.'">'.$langs->trans("FullList").'</th>';
-    print '</tr>';
-    if ($num > 0) {
-        while ($i < $num) {
-            $objp = $db->fetch_object($result);
+	print '<div class="div-table-responsive-no-min">';
+	print '<table class="noborder centpercent">';
+	print '<tr class="liste_titre"><th colspan="5">'.$transRecordedType.'</th>';
+	print '<th class="right" colspan="2"><a href="'.DOL_URL_ROOT.'/ticket/list.php?search_fk_statut[]='.Ticket::STATUS_NOT_READ.'">'.$langs->trans("FullList").'</th>';
+	print '</tr>';
+	if ($num > 0) {
+		while ($i < $num) {
+			$objp = $db->fetch_object($result);
 
-            $tickesupstatic->id = $objp->rowid;
-            $tickesupstatic->ref = $objp->ref;
-            $tickesupstatic->track_id = $objp->track_id;
-            $tickesupstatic->fk_statut = $objp->fk_statut;
-            $tickesupstatic->progress = $objp->progress;
-            $tickesupstatic->subject = $objp->subject;
+			$tickesupstatic->id = $objp->rowid;
+			$tickesupstatic->ref = $objp->ref;
+			$tickesupstatic->track_id = $objp->track_id;
+			$tickesupstatic->fk_statut = $objp->fk_statut;
+			$tickesupstatic->progress = $objp->progress;
+			$tickesupstatic->subject = $objp->subject;
 
-            print '<tr class="oddeven">';
+			print '<tr class="oddeven">';
 
-            // Ref
-            print '<td class="nowraponall">';
-            print $tickesupstatic->getNomUrl(1);
-            print "</td>\n";
+			// Ref
+			print '<td class="nowraponall">';
+			print $tickesupstatic->getNomUrl(1);
+			print "</td>\n";
 
-            // Creation date
-            print '<td class="left">';
-            print dol_print_date($db->jdate($objp->datec), 'dayhour');
-            print "</td>";
+			// Creation date
+			print '<td class="left">';
+			print dol_print_date($db->jdate($objp->datec), 'dayhour');
+			print "</td>";
 
-            // Subject
-            print '<td class="nowrap">';
-            print '<a href="card.php?track_id='.$objp->track_id.'">'.dol_trunc($objp->subject, 30).'</a>';
-            print "</td>\n";
+			// Subject
+			print '<td class="nowrap">';
+			print '<a href="card.php?track_id='.$objp->track_id.'">'.dol_trunc($objp->subject, 30).'</a>';
+			print "</td>\n";
 
-            // Type
-            print '<td class="nowrap tdoverflowmax100">';
-            $s = $langs->getLabelFromKey($db, 'TicketTypeShort'.$objp->type_code, 'c_ticket_type', 'code', 'label', $objp->type_code);
-            print '<span title="'.dol_escape_htmltag($s).'">'.$s.'</span>';
-            print '</td>';
+			// Type
+			print '<td class="nowrap tdoverflowmax100">';
+			$s = $langs->getLabelFromKey($db, 'TicketTypeShort'.$objp->type_code, 'c_ticket_type', 'code', 'label', $objp->type_code);
+			print '<span title="'.dol_escape_htmltag($s).'">'.$s.'</span>';
+			print '</td>';
 
-            // Category
-            print '<td class="nowrap">';
-            $s = $langs->getLabelFromKey($db, 'TicketCategoryShort'.$objp->category_code, 'c_ticket_category', 'code', 'label', $objp->category_code);
-            print '<span title="'.dol_escape_htmltag($s).'">'.$s.'</span>';
-            //print $objp->category_label;
-            print "</td>";
+			// Category
+			print '<td class="nowrap">';
+			$s = $langs->getLabelFromKey($db, 'TicketCategoryShort'.$objp->category_code, 'c_ticket_category', 'code', 'label', $objp->category_code);
+			print '<span title="'.dol_escape_htmltag($s).'">'.$s.'</span>';
+			//print $objp->category_label;
+			print "</td>";
 
-            // Severity
-            print '<td class="nowrap">';
-            $s = $langs->getLabelFromKey($db, 'TicketSeverityShort'.$objp->severity_code, 'c_ticket_severity', 'code', 'label', $objp->severity_code);
-            print '<span title="'.dol_escape_htmltag($s).'">'.$s.'</span>';
-            //print $objp->severity_label;
-            print "</td>";
+			// Severity
+			print '<td class="nowrap">';
+			$s = $langs->getLabelFromKey($db, 'TicketSeverityShort'.$objp->severity_code, 'c_ticket_severity', 'code', 'label', $objp->severity_code);
+			print '<span title="'.dol_escape_htmltag($s).'">'.$s.'</span>';
+			//print $objp->severity_label;
+			print "</td>";
 
-            print '<td class="nowraponall right">';
-            print $tickesupstatic->getLibStatut(5);
-            print "</td>";
+			print '<td class="nowraponall right">';
+			print $tickesupstatic->getLibStatut(5);
+			print "</td>";
 
-            print "</tr>\n";
-            $i++;
-        }
+			print "</tr>\n";
+			$i++;
+		}
 
-        $db->free();
-    } else {
-        print '<tr><td colspan="6" class="opacitymedium">'.$langs->trans('NoUnreadTicketsFound').'</td></tr>';
-    }
+		$db->free();
+	} else {
+		print '<tr><td colspan="6" class="opacitymedium">'.$langs->trans('NoUnreadTicketsFound').'</td></tr>';
+	}
 
-    print "</table>";
-    print '</div>';
+	print "</table>";
+	print '</div>';
 } else {
-    dol_print_error($db);
+	dol_print_error($db);
 }
 
 print '</div></div></div>';
diff --git a/htdocs/ticket/list.php b/htdocs/ticket/list.php
index d441bd147b9..3d82c9b6cf2 100644
--- a/htdocs/ticket/list.php
+++ b/htdocs/ticket/list.php
@@ -128,7 +128,7 @@ $arrayfields = dol_sort_array($arrayfields, 'position');
 
 // Security check
 if (!$user->rights->ticket->read) {
-    accessforbidden();
+	accessforbidden();
 }
 
 // Store current page url
@@ -322,42 +322,42 @@ if ($socid > 0)
 
 foreach ($search as $key => $val)
 {
-    if ($key == 'fk_statut')
+	if ($key == 'fk_statut')
 	{
 		$newarrayofstatus = array();
 		foreach ($search['fk_statut'] as $key2 => $val2) {
 			if (in_array($val2, array('openall', 'closeall'))) continue;
 			$newarrayofstatus[] = $val2;
 		}
-	    if ($search['fk_statut'] == 'openall' || in_array('openall', $search['fk_statut'])) {
-	    	$newarrayofstatus[] = Ticket::STATUS_NOT_READ;
-	    	$newarrayofstatus[] = Ticket::STATUS_ASSIGNED;
-	    	$newarrayofstatus[] = Ticket::STATUS_IN_PROGRESS;
-	    	$newarrayofstatus[] = Ticket::STATUS_NEED_MORE_INFO;
-	    	$newarrayofstatus[] = Ticket::STATUS_WAITING;
-	    }
-	    if ($search['fk_statut'] == 'closeall' || in_array('closeall', $search['fk_statut'])) {
-	    	$newarrayofstatus[] = Ticket::STATUS_CLOSED;
-	    	$newarrayofstatus[] = Ticket::STATUS_CANCELED;
-	    }
-	    if (count($newarrayofstatus)) $sql .= natural_search($key, join(',', $newarrayofstatus), 2);
-	    continue;
+		if ($search['fk_statut'] == 'openall' || in_array('openall', $search['fk_statut'])) {
+			$newarrayofstatus[] = Ticket::STATUS_NOT_READ;
+			$newarrayofstatus[] = Ticket::STATUS_ASSIGNED;
+			$newarrayofstatus[] = Ticket::STATUS_IN_PROGRESS;
+			$newarrayofstatus[] = Ticket::STATUS_NEED_MORE_INFO;
+			$newarrayofstatus[] = Ticket::STATUS_WAITING;
+		}
+		if ($search['fk_statut'] == 'closeall' || in_array('closeall', $search['fk_statut'])) {
+			$newarrayofstatus[] = Ticket::STATUS_CLOSED;
+			$newarrayofstatus[] = Ticket::STATUS_CANCELED;
+		}
+		if (count($newarrayofstatus)) $sql .= natural_search($key, join(',', $newarrayofstatus), 2);
+		continue;
 	}
 	if ($key == 'fk_user_assign')
 	{
-	    if ($search[$key] > 0) $sql .= natural_search($key, $search[$key], 2);
-	    continue;
+		if ($search[$key] > 0) $sql .= natural_search($key, $search[$key], 2);
+		continue;
 	}
 	$mode_search = (($object->isInt($object->fields[$key]) || $object->isFloat($object->fields[$key])) ? 1 : 0);
-    if ($search[$key] != '') $sql .= natural_search($key, $search[$key], $mode_search);
+	if ($search[$key] != '') $sql .= natural_search($key, $search[$key], $mode_search);
 }
 if ($search_all) $sql .= natural_search(array_keys($fieldstosearchall), $search_all);
 if ($search_societe)     $sql .= natural_search('s.nom', $search_societe);
 if ($search_fk_project) $sql .= natural_search('fk_project', $search_fk_project, 2);
 if (!$user->socid && ($mode == "mine" || (!$user->admin && $conf->global->TICKET_LIMIT_VIEW_ASSIGNED_ONLY))) {
-    $sql .= " AND (t.fk_user_assign = ".$user->id;
-    if (empty($conf->global->TICKET_LIMIT_VIEW_ASSIGNED_ONLY)) $sql .= " OR t.fk_user_create = ".$user->id;
-    $sql .= ")";
+	$sql .= " AND (t.fk_user_assign = ".$user->id;
+	if (empty($conf->global->TICKET_LIMIT_VIEW_ASSIGNED_ONLY)) $sql .= " OR t.fk_user_create = ".$user->id;
+	$sql .= ")";
 }
 
 // Add where from extra fields
@@ -415,118 +415,118 @@ llxHeader('', $title, $help_url);
 
 
 if ($socid && !$projectid && !$project_ref && $user->rights->societe->lire) {
-    $socstat = new Societe($db);
-    $res = $socstat->fetch($socid);
-    if ($res > 0) {
-    	$tmpobject = $object;
-    	$object = $socstat; // $object must be of type Societe when calling societe_prepare_head
-        $head = societe_prepare_head($socstat);
+	$socstat = new Societe($db);
+	$res = $socstat->fetch($socid);
+	if ($res > 0) {
+		$tmpobject = $object;
+		$object = $socstat; // $object must be of type Societe when calling societe_prepare_head
+		$head = societe_prepare_head($socstat);
 		$object = $tmpobject;
 
-        print dol_get_fiche_head($head, 'ticket', $langs->trans("ThirdParty"), -1, 'company');
+		print dol_get_fiche_head($head, 'ticket', $langs->trans("ThirdParty"), -1, 'company');
 
-        dol_banner_tab($socstat, 'socid', '', ($user->socid ? 0 : 1), 'rowid', 'nom');
+		dol_banner_tab($socstat, 'socid', '', ($user->socid ? 0 : 1), 'rowid', 'nom');
 
-        print '<div class="fichecenter">';
+		print '<div class="fichecenter">';
 
-        print '<div class="underbanner clearboth"></div>';
-        print '<table class="border centpercent tableforfield">';
+		print '<div class="underbanner clearboth"></div>';
+		print '<table class="border centpercent tableforfield">';
 
-        // Customer code
-        if ($socstat->client && !empty($socstat->code_client)) {
-            print '<tr><td class="titlefield">';
-            print $langs->trans('CustomerCode').'</td><td>';
-            print $socstat->code_client;
-            if ($socstat->check_codeclient() != 0) {
-                print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
-            }
+		// Customer code
+		if ($socstat->client && !empty($socstat->code_client)) {
+			print '<tr><td class="titlefield">';
+			print $langs->trans('CustomerCode').'</td><td>';
+			print $socstat->code_client;
+			if ($socstat->check_codeclient() != 0) {
+				print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
+			}
 
-            print '</td>';
-            print '</tr>';
-        }
-        // Supplier code
-        if ($socstat->fournisseur && !empty($socstat->code_fournisseur)) {
-        	print '<tr><td class="titlefield">';
-        	print $langs->trans('SupplierCode').'</td><td>';
-        	print $socstat->code_fournisseur;
-        	if ($socstat->check_codefournisseur() != 0) {
-        		print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
-        	}
+			print '</td>';
+			print '</tr>';
+		}
+		// Supplier code
+		if ($socstat->fournisseur && !empty($socstat->code_fournisseur)) {
+			print '<tr><td class="titlefield">';
+			print $langs->trans('SupplierCode').'</td><td>';
+			print $socstat->code_fournisseur;
+			if ($socstat->check_codefournisseur() != 0) {
+				print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
+			}
 
-        	print '</td>';
-        	print '</tr>';
-        }
+			print '</td>';
+			print '</tr>';
+		}
 
-        print '</table>';
-        print '</div>';
-        dol_fiche_end();
-    }
+		print '</table>';
+		print '</div>';
+		print dol_get_fiche_end();
+	}
 }
 
 if ($projectid > 0 || $project_ref) {
-    $projectstat = new Project($db);
-    if ($projectstat->fetch($projectid, $project_ref) > 0) {
-    	$projectid = $projectstat->id;
-        $projectstat->fetch_thirdparty();
+	$projectstat = new Project($db);
+	if ($projectstat->fetch($projectid, $project_ref) > 0) {
+		$projectid = $projectstat->id;
+		$projectstat->fetch_thirdparty();
 
-        $savobject = $object;
-        $object = $projectstat;
+		$savobject = $object;
+		$object = $projectstat;
 
-        // To verify role of users
-        //$userAccess = $object->restrictedProjectArea($user,'read');
-        $userWrite = $projectstat->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 = $projectstat->restrictedProjectArea($user, 'write');
+		//$userDelete = $object->restrictedProjectArea($user,'delete');
+		//print "userAccess=".$userAccess." userWrite=".$userWrite." userDelete=".$userDelete;
 
-        $head = project_prepare_head($projectstat);
-        print dol_get_fiche_head($head, 'ticket', $langs->trans("Project"), -1, ($projectstat->public ? 'projectpub' : 'project'));
+		$head = project_prepare_head($projectstat);
+		print dol_get_fiche_head($head, 'ticket', $langs->trans("Project"), -1, ($projectstat->public ? 'projectpub' : 'project'));
 
-        // Project card
+		// Project card
 
-        $linkback = '<a href="'.DOL_URL_ROOT.'/projet/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+		$linkback = '<a href="'.DOL_URL_ROOT.'/projet/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-        $morehtmlref = '<div class="refidno">';
-        // Title
-        $morehtmlref .= $object->title;
-        // Thirdparty
-        if ($object->thirdparty->id > 0)
-        {
-        	$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1, 'project');
-        }
-        $morehtmlref .= '</div>';
+		$morehtmlref = '<div class="refidno">';
+		// Title
+		$morehtmlref .= $object->title;
+		// Thirdparty
+		if ($object->thirdparty->id > 0)
+		{
+			$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').")";
-        }
+		// 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').")";
+		}
 
-        dol_banner_tab($object, 'project_ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+		dol_banner_tab($object, 'project_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>';
 
-        print '<table class="border tableforfield" width="100%">';
+		print '<table class="border tableforfield" width="100%">';
 
-        // Visibility
-        print '<tr><td class="titlefield">'.$langs->trans("Visibility").'</td><td>';
-        if ($projectstat->public) {
-            print $langs->trans('SharedProject');
-        } else {
-            print $langs->trans('PrivateProject');
-        }
-        print '</td></tr>';
+		// Visibility
+		print '<tr><td class="titlefield">'.$langs->trans("Visibility").'</td><td>';
+		if ($projectstat->public) {
+			print $langs->trans('SharedProject');
+		} else {
+			print $langs->trans('PrivateProject');
+		}
+		print '</td></tr>';
 
-        print "</table>";
+		print "</table>";
 
-        print '</div>';
-        dol_fiche_end();
+		print '</div>';
+		print dol_get_fiche_end();
 
-        $object = $savobject;
-    } else {
-        print "ErrorRecordNotFound";
-    }
+		$object = $savobject;
+	} else {
+		print "ErrorRecordNotFound";
+	}
 }
 
 $arrayofselected = is_array($toselect) ? $toselect : array();
@@ -536,8 +536,8 @@ if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&co
 if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
 foreach ($search as $key => $val)
 {
-    if (is_array($search[$key]) && count($search[$key])) foreach ($search[$key] as $skey) $param .= '&search_'.$key.'[]='.urlencode($skey);
-    else $param .= '&search_'.$key.'='.urlencode($search[$key]);
+	if (is_array($search[$key]) && count($search[$key])) foreach ($search[$key] as $skey) $param .= '&search_'.$key.'[]='.urlencode($skey);
+	else $param .= '&search_'.$key.'='.urlencode($search[$key]);
 }
 if ($optioncss != '')     $param .= '&optioncss='.urlencode($optioncss);
 // Add $param from extra fields
@@ -578,7 +578,7 @@ if ($socid > 0) $picto = '';
 print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, $picto, 0, $newcardbutton, '', $limit, 0, 0, 1);
 
 if ($mode == 'mine') {
-    print '<div class="opacitymedium">'.$langs->trans('TicketAssignedToMeInfos').'</div><br>';
+	print '<div class="opacitymedium">'.$langs->trans('TicketAssignedToMeInfos').'</div><br>';
 }
 // Add code for pre mass action (confirmation or email presend form)
 $topicmail = "SendTicketRef";
@@ -642,28 +642,28 @@ foreach ($object->fields as $key => $val)
 			$formTicket->selectSeveritiesTickets(dol_escape_htmltag($search[$key]), 'search_'.$key.'', '', 2, 1, 1, 0, ($val['css'] ? $val['css'] : 'maxwidth150'));
 			print '</td>';
 		} elseif ($key == 'fk_user_assign') {
-		    print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
-		    print $form->select_dolusers($search[$key], 'search_'.$key, 1, null, 0, '', '', '0', 0, 0, '', 0, '', ($val['css'] ? $val['css'] : 'maxwidth150'));
-		    print '</td>';
+			print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
+			print $form->select_dolusers($search[$key], 'search_'.$key, 1, null, 0, '', '', '0', 0, 0, '', 0, '', ($val['css'] ? $val['css'] : 'maxwidth150'));
+			print '</td>';
 		} elseif ($key == 'fk_statut') {
-		    $arrayofstatus = array();
-		    $arrayofstatus['openall'] = '-- '.$langs->trans('OpenAll').' --';
-		    foreach ($object->statuts_short as $key2 => $val2)
-		    {
-		    	if ($key2 == Ticket::STATUS_CLOSED) $arrayofstatus['closeall'] = '-- '.$langs->trans('ClosedAll').' --';
-		    	$arrayofstatus[$key2] = $val2;
-		    }
-		    print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
-		    //var_dump($arrayofstatus);var_dump($search['fk_statut']);var_dump(array_values($search[$key]));
-		    $selectedarray = null;
-		    if ($search[$key]) $selectedarray = array_values($search[$key]);
+			$arrayofstatus = array();
+			$arrayofstatus['openall'] = '-- '.$langs->trans('OpenAll').' --';
+			foreach ($object->statuts_short as $key2 => $val2)
+			{
+				if ($key2 == Ticket::STATUS_CLOSED) $arrayofstatus['closeall'] = '-- '.$langs->trans('ClosedAll').' --';
+				$arrayofstatus[$key2] = $val2;
+			}
+			print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
+			//var_dump($arrayofstatus);var_dump($search['fk_statut']);var_dump(array_values($search[$key]));
+			$selectedarray = null;
+			if ($search[$key]) $selectedarray = array_values($search[$key]);
 			print Form::multiselectarray('search_fk_statut', $arrayofstatus, $selectedarray, 0, 0, 'minwidth150', 1, 0, '', '', '');
 			print '</td>';
 		} elseif ($key == "fk_soc") {
 			print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'"><input type="text" class="flat maxwidth75" name="search_societe" value="'.dol_escape_htmltag($search_societe).'"></td>';
 		} else {
 			print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
-			if (is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
+			if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
 			elseif (strpos($val['type'], 'integer:') === 0) {
 				print $object->showInputField($val, $key, $search[$key], '', '', 'search_', 'maxwidth150', 1);
 			} elseif (!preg_match('/^(date|timestamp)/', $val['type'])) print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
@@ -698,7 +698,7 @@ foreach ($object->fields as $key => $val)
 	elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID') $cssforfield .= ($cssforfield ? ' ' : '').'right';
 	if (!empty($arrayfields['t.'.$key]['checked']))
 	{
-        print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, '', $sortfield, $sortorder, ($cssforfield ? $cssforfield.' ' : ''))."\n";
+		print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, '', $sortfield, $sortorder, ($cssforfield ? $cssforfield.' ' : ''))."\n";
 	}
 }
 // Extra fields
diff --git a/htdocs/ticket/messaging.php b/htdocs/ticket/messaging.php
index a013e2bc27e..af6f78fe98c 100644
--- a/htdocs/ticket/messaging.php
+++ b/htdocs/ticket/messaging.php
@@ -130,20 +130,20 @@ $help_url = 'FR:DocumentationModuleTicket';
 llxHeader('', $title, $help_url);
 
 if ($socid > 0) {
-    $object->fetch_thirdparty();
-    $head = societe_prepare_head($object->thirdparty);
+	$object->fetch_thirdparty();
+	$head = societe_prepare_head($object->thirdparty);
 
-    print dol_get_fiche_head($head, 'ticket', $langs->trans("ThirdParty"), 0, 'company');
+	print dol_get_fiche_head($head, 'ticket', $langs->trans("ThirdParty"), 0, 'company');
 
-    dol_banner_tab($object->thirdparty, 'socid', '', ($user->socid ? 0 : 1), 'rowid', 'nom');
+	dol_banner_tab($object->thirdparty, 'socid', '', ($user->socid ? 0 : 1), 'rowid', 'nom');
 
-    dol_fiche_end();
+	print dol_get_fiche_end();
 }
 
 if (!$user->socid && $conf->global->TICKET_LIMIT_VIEW_ASSIGNED_ONLY) {
-    $object->next_prev_filter = "te.fk_user_assign = '".$user->id."'";
+	$object->next_prev_filter = "te.fk_user_assign = '".$user->id."'";
 } elseif ($user->socid > 0) {
-    $object->next_prev_filter = "te.fk_soc = '".$user->socid."'";
+	$object->next_prev_filter = "te.fk_soc = '".$user->socid."'";
 }
 $head = ticket_prepare_head($object);
 
@@ -219,7 +219,7 @@ $linkback = '<a href="'.dol_buildpath('/ticket/list.php', 1).'"><strong>'.$langs
 
 dol_banner_tab($object, 'ref', $linkback, ($user->socid ? 0 : 1), 'ref', 'ref', $morehtmlref, '', 0, '', '', 1);
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '<br>';
 
@@ -230,10 +230,10 @@ if (!empty($object->id))
 	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
 	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
 
-    $morehtmlright = '';
+	$morehtmlright = '';
 
-    $messagingUrl = DOL_URL_ROOT.'/ticket/messaging.php?track_id='.$object->track_id;
-    $morehtmlright .= dolGetButtonTitle($langs->trans('ShowAsConversation'), '', 'fa fa-comments imgforviewmode', $messagingUrl, '', 1, array('morecss'=>'btnTitleSelected'));
+	$messagingUrl = DOL_URL_ROOT.'/ticket/messaging.php?track_id='.$object->track_id;
+	$morehtmlright .= dolGetButtonTitle($langs->trans('ShowAsConversation'), '', 'fa fa-comments imgforviewmode', $messagingUrl, '', 1, array('morecss'=>'btnTitleSelected'));
 	$messagingUrl = DOL_URL_ROOT.'/ticket/agenda.php?track_id='.$object->track_id;
 	$morehtmlright .= dolGetButtonTitle($langs->trans('MessageListViewType'), '', 'fa fa-list-alt imgforviewmode', $messagingUrl, '', 1);
 
@@ -254,7 +254,7 @@ if (!empty($object->id))
 	// List of all actions
 	$filters = array();
 	$filters['search_agenda_label'] = $search_agenda_label;
-    show_ticket_messaging($conf, $langs, $db, $object, null, 0, $actioncode, '', $filters, $sortfield, $sortorder);
+	show_ticket_messaging($conf, $langs, $db, $object, null, 0, $actioncode, '', $filters, $sortfield, $sortorder);
 }
 
 // End of page
diff --git a/htdocs/ticket/stats/index.php b/htdocs/ticket/stats/index.php
index 18a18bcd6a0..4273979d45e 100644
--- a/htdocs/ticket/stats/index.php
+++ b/htdocs/ticket/stats/index.php
@@ -39,8 +39,8 @@ $socid = GETPOST('socid', 'int');
 // Security check
 if ($user->socid > 0)
 {
-    $action = '';
-    $socid = $user->socid;
+	$action = '';
+	$socid = $user->socid;
 }
 
 $nowyear = strftime("%Y", dol_now());
@@ -82,36 +82,36 @@ $data = $stats->getNbByMonthWithPrevYear($endyear, $startyear);
 
 if (!$user->rights->societe->client->voir || $user->socid)
 {
-    $filenamenb = $dir.'/ticketsnbinyear-'.$user->id.'-'.$year.'.png';
-    $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=ticketstats&file=ticketsnbinyear-'.$user->id.'-'.$year.'.png';
+	$filenamenb = $dir.'/ticketsnbinyear-'.$user->id.'-'.$year.'.png';
+	$fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=ticketstats&file=ticketsnbinyear-'.$user->id.'-'.$year.'.png';
 } else {
-    $filenamenb = $dir.'/ticketsnbinyear-'.$year.'.png';
-    $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=ticketstats&file=ticketsnbinyear-'.$year.'.png';
+	$filenamenb = $dir.'/ticketsnbinyear-'.$year.'.png';
+	$fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=ticketstats&file=ticketsnbinyear-'.$year.'.png';
 }
 
 $px1 = new DolGraph();
 $mesg = $px1->isGraphKo();
 if (!$mesg)
 {
-    $px1->SetData($data);
-    $i = $startyear; $legend = array();
-    while ($i <= $endyear)
-    {
-        $legend[] = $i;
-        $i++;
-    }
-    $px1->SetLegend($legend);
-    $px1->SetMaxValue($px1->GetCeilMaxValue());
-    $px1->SetMinValue(min(0, $px1->GetFloorMinValue()));
-    $px1->SetWidth($WIDTH);
-    $px1->SetHeight($HEIGHT);
-    $px1->SetYLabel($langs->trans("NbOfTicket"));
-    $px1->SetShading(3);
-    $px1->SetHorizTickIncrement(1);
-    $px1->mode = 'depth';
-    $px1->SetTitle($langs->trans("NumberOfTicketsByMonth"));
+	$px1->SetData($data);
+	$i = $startyear; $legend = array();
+	while ($i <= $endyear)
+	{
+		$legend[] = $i;
+		$i++;
+	}
+	$px1->SetLegend($legend);
+	$px1->SetMaxValue($px1->GetCeilMaxValue());
+	$px1->SetMinValue(min(0, $px1->GetFloorMinValue()));
+	$px1->SetWidth($WIDTH);
+	$px1->SetHeight($HEIGHT);
+	$px1->SetYLabel($langs->trans("NbOfTicket"));
+	$px1->SetShading(3);
+	$px1->SetHorizTickIncrement(1);
+	$px1->mode = 'depth';
+	$px1->SetTitle($langs->trans("NumberOfTicketsByMonth"));
 
-    $px1->draw($filenamenb, $fileurlnb);
+	$px1->draw($filenamenb, $fileurlnb);
 }
 
 // Build graphic amount of object
@@ -121,36 +121,36 @@ $data = $stats->getAmountByMonthWithPrevYear($endyear, $startyear);
 
 if (!$user->rights->societe->client->voir || $user->socid)
 {
-    $filenameamount = $dir.'/ticketsamountinyear-'.$user->id.'-'.$year.'.png';
-    $fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=ticketstats&file=ticketsamountinyear-'.$user->id.'-'.$year.'.png';
+	$filenameamount = $dir.'/ticketsamountinyear-'.$user->id.'-'.$year.'.png';
+	$fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=ticketstats&file=ticketsamountinyear-'.$user->id.'-'.$year.'.png';
 } else {
-    $filenameamount = $dir.'/ticketsamountinyear-'.$year.'.png';
-    $fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=ticketstats&file=ticketsamountinyear-'.$year.'.png';
+	$filenameamount = $dir.'/ticketsamountinyear-'.$year.'.png';
+	$fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=ticketstats&file=ticketsamountinyear-'.$year.'.png';
 }
 
 $px2 = new DolGraph();
 $mesg = $px2->isGraphKo();
 if (!$mesg)
 {
-    $px2->SetData($data);
-    $i = $startyear; $legend = array();
-    while ($i <= $endyear)
-    {
-        $legend[] = $i;
-        $i++;
-    }
-    $px2->SetLegend($legend);
-    $px2->SetMaxValue($px2->GetCeilMaxValue());
-    $px2->SetMinValue(min(0, $px2->GetFloorMinValue()));
-    $px2->SetWidth($WIDTH);
-    $px2->SetHeight($HEIGHT);
-    $px2->SetYLabel($langs->trans("AmountOfTickets"));
-    $px2->SetShading(3);
-    $px2->SetHorizTickIncrement(1);
-    $px2->mode = 'depth';
-    $px2->SetTitle($langs->trans("AmountOfTicketsByMonthHT"));
+	$px2->SetData($data);
+	$i = $startyear; $legend = array();
+	while ($i <= $endyear)
+	{
+		$legend[] = $i;
+		$i++;
+	}
+	$px2->SetLegend($legend);
+	$px2->SetMaxValue($px2->GetCeilMaxValue());
+	$px2->SetMinValue(min(0, $px2->GetFloorMinValue()));
+	$px2->SetWidth($WIDTH);
+	$px2->SetHeight($HEIGHT);
+	$px2->SetYLabel($langs->trans("AmountOfTickets"));
+	$px2->SetShading(3);
+	$px2->SetHorizTickIncrement(1);
+	$px2->mode = 'depth';
+	$px2->SetTitle($langs->trans("AmountOfTicketsByMonthHT"));
 
-    $px2->draw($filenameamount, $fileurlamount);
+	$px2->draw($filenameamount, $fileurlamount);
 }
 
 
@@ -158,36 +158,36 @@ $data = $stats->getAverageByMonthWithPrevYear($endyear, $startyear);
 
 if (!$user->rights->societe->client->voir || $user->socid)
 {
-    $filename_avg = $dir.'/ticketsaverage-'.$user->id.'-'.$year.'.png';
-    $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=ticketstats&file=ticketsaverage-'.$user->id.'-'.$year.'.png';
+	$filename_avg = $dir.'/ticketsaverage-'.$user->id.'-'.$year.'.png';
+	$fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=ticketstats&file=ticketsaverage-'.$user->id.'-'.$year.'.png';
 } else {
-    $filename_avg = $dir.'/ticketsaverage-'.$year.'.png';
-    $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=ticketstats&file=ticketsaverage-'.$year.'.png';
+	$filename_avg = $dir.'/ticketsaverage-'.$year.'.png';
+	$fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=ticketstats&file=ticketsaverage-'.$year.'.png';
 }
 
 $px3 = new DolGraph();
 $mesg = $px3->isGraphKo();
 if (!$mesg)
 {
-    $px3->SetData($data);
-    $i = $startyear; $legend = array();
-    while ($i <= $endyear)
-    {
-        $legend[] = $i;
-        $i++;
-    }
-    $px3->SetLegend($legend);
-    $px3->SetYLabel($langs->trans("AmountAverage"));
-    $px3->SetMaxValue($px3->GetCeilMaxValue());
-    $px3->SetMinValue($px3->GetFloorMinValue());
-    $px3->SetWidth($WIDTH);
-    $px3->SetHeight($HEIGHT);
-    $px3->SetShading(3);
-    $px3->SetHorizTickIncrement(1);
-    $px3->mode = 'depth';
-    $px3->SetTitle($langs->trans("AmountAverage"));
+	$px3->SetData($data);
+	$i = $startyear; $legend = array();
+	while ($i <= $endyear)
+	{
+		$legend[] = $i;
+		$i++;
+	}
+	$px3->SetLegend($legend);
+	$px3->SetYLabel($langs->trans("AmountAverage"));
+	$px3->SetMaxValue($px3->GetCeilMaxValue());
+	$px3->SetMinValue($px3->GetFloorMinValue());
+	$px3->SetWidth($WIDTH);
+	$px3->SetHeight($HEIGHT);
+	$px3->SetShading(3);
+	$px3->SetHorizTickIncrement(1);
+	$px3->mode = 'depth';
+	$px3->SetTitle($langs->trans("AmountAverage"));
 
-    $px3->draw($filename_avg, $fileurl_avg);
+	$px3->draw($filename_avg, $fileurl_avg);
 }
 
 
@@ -304,11 +304,11 @@ print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 // Show graphs
 print '<table class="border centpercent"><tr class="pair nohover"><td class="center">';
 if ($mesg) { print $mesg; } else {
-    print $px1->show();
-    print "<br>\n";
-    //print $px2->show();
-    //print "<br>\n";
-    //print $px3->show();
+	print $px1->show();
+	print "<br>\n";
+	//print $px2->show();
+	//print "<br>\n";
+	//print $px3->show();
 }
 print '</td></tr></table>';
 
@@ -316,7 +316,7 @@ print '</td></tr></table>';
 print '</div></div></div>';
 print '<div style="clear:both"></div>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // End of page
 llxFooter();
diff --git a/htdocs/ticket/tpl/linkedobjectblock.tpl.php b/htdocs/ticket/tpl/linkedobjectblock.tpl.php
index 4f425db4f96..572ffc0672f 100644
--- a/htdocs/ticket/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/ticket/tpl/linkedobjectblock.tpl.php
@@ -53,20 +53,20 @@ foreach ($linkedObjectBlock as $key => $objectlink)
     	<td class="linkedcol-ref center"><?php echo $objectlink->ref_client; ?></td>
     	<td class="linkedcol-date center"><?php echo dol_print_date($objectlink->datec, 'day'); ?></td>
 	    <?php
-	    //$objectlink->socid = $objectlink->fk_soc;
-	    //$objectlink->fetch_thirdparty();
-	    ?>
+		//$objectlink->socid = $objectlink->fk_soc;
+		//$objectlink->fetch_thirdparty();
+		?>
     	<td class="linkedcol-amount right"><?php //echo $objectlink->thirdparty->getNomUrl(1); ?></td>
     	<td class="linkedcol-statut right"><?php echo $objectlink->getLibStatut(3); ?></td>
     	<td class="linkedcol-action right">
     		<?php
-    		// For now, shipments must stay linked to order, so link is not deletable
-    		if ($object->element != 'shipping') {
-    			?>
+			// For now, shipments must stay linked to order, so link is not deletable
+			if ($object->element != 'shipping') {
+				?>
     			<a class="reposition" href="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key; ?>"><?php echo img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink'); ?></a>
     			<?php
-    		}
-    		?>
+			}
+			?>
     	</td>
 </tr>
 	<?php
diff --git a/htdocs/user/admin/group_extrafields.php b/htdocs/user/admin/group_extrafields.php
index 9107be76acd..fd71d43d4f0 100644
--- a/htdocs/user/admin/group_extrafields.php
+++ b/htdocs/user/admin/group_extrafields.php
@@ -75,7 +75,7 @@ print dol_get_fiche_head($head, 'attributes_group', $langs->trans("MenuUsersAndG
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 // Buttons
diff --git a/htdocs/user/admin/user_extrafields.php b/htdocs/user/admin/user_extrafields.php
index b30b340a727..45d645ce3dd 100644
--- a/htdocs/user/admin/user_extrafields.php
+++ b/htdocs/user/admin/user_extrafields.php
@@ -74,7 +74,7 @@ print dol_get_fiche_head($head, 'attributes', $langs->trans("MenuUsersAndGroups"
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 // Buttons
@@ -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';
 }
 
 /* ************************************************************************** */
@@ -110,7 +110,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/agenda_extsites.php b/htdocs/user/agenda_extsites.php
index cc2c331049b..b6aad8fb6db 100644
--- a/htdocs/user/agenda_extsites.php
+++ b/htdocs/user/agenda_extsites.php
@@ -218,7 +218,7 @@ print '<div class="center">';
 print "<input type=\"submit\" id=\"save\" name=\"save\" class=\"button hideifnotset\" value=\"".$langs->trans("Save")."\">";
 print "</div>";
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print "</form>\n";
 
diff --git a/htdocs/user/bank.php b/htdocs/user/bank.php
index 5618177a35b..2f2c1ee0a86 100644
--- a/htdocs/user/bank.php
+++ b/htdocs/user/bank.php
@@ -105,16 +105,16 @@ if ($action == 'add' && !$cancel)
 		setEventMessages($account->error, $account->errors, 'errors');
 		$action = 'edit'; // Force chargement page edition
 	} else {
-        setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
-        $action = '';
+		setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
+		$action = '';
 	}
 }
 
 if ($action == 'update' && !$cancel)
 {
-    $account->userid = $object->id;
+	$account->userid = $object->id;
 
-    /*
+	/*
     if ($action == 'update' && !$cancel)
     {
     	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
@@ -172,14 +172,14 @@ if ($action == 'update' && !$cancel)
 
 	$result = $account->update($user);
 
-    if (!$result)
+	if (!$result)
 	{
 		setEventMessages($account->error, $account->errors, 'errors');
 		$action = 'edit'; // Force chargement page edition
 	} else {
-        setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
-        $action = '';
-    }
+		setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
+		$action = '';
+	}
 }
 
 // update personal email
@@ -228,18 +228,18 @@ $head = user_prepare_head($object);
 
 if ($id && $bankid && $action == 'edit' && $user->rights->user->user->creer)
 {
-    print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'" method="post">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    print '<input type="hidden" name="action" value="update">';
-    print '<input type="hidden" name="id" value="'.GETPOST("id", 'int').'">';
-    print '<input type="hidden" name="bankid" value="'.$bankid.'">';
+	print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'" method="post">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="action" value="update">';
+	print '<input type="hidden" name="id" value="'.GETPOST("id", 'int').'">';
+	print '<input type="hidden" name="bankid" value="'.$bankid.'">';
 }
 if ($id && $action == 'create' && $user->rights->user->user->creer)
 {
-    print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'" method="post">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    print '<input type="hidden" name="action" value="add">';
-    print '<input type="hidden" name="bankid" value="'.$bankid.'">';
+	print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'" method="post">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="action" value="add">';
+	print '<input type="hidden" name="bankid" value="'.$bankid.'">';
 }
 
 
@@ -255,17 +255,17 @@ if ($action != 'edit' && $action != 'create')		// If not bank account yet, $acco
 		$linkback = '<a href="'.DOL_URL_ROOT.'/user/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 	}
 
-    dol_banner_tab($object, 'id', $linkback, $user->rights->user->user->lire || $user->admin);
+	dol_banner_tab($object, 'id', $linkback, $user->rights->user->user->lire || $user->admin);
 
-    print '<div class="fichecenter"><div class="fichehalfleft">';
+	print '<div class="fichecenter"><div class="fichehalfleft">';
 
-    print '<div class="underbanner clearboth"></div>';
+	print '<div class="underbanner clearboth"></div>';
 
-    print '<table class="border centpercent tableforfield">';
+	print '<table class="border centpercent tableforfield">';
 
-    print '<tr><td class="titlefield">'.$langs->trans("Login").'</td>';
-    print '<td>'.$object->login.'</td>';
-    print '</tr>';
+	print '<tr><td class="titlefield">'.$langs->trans("Login").'</td>';
+	print '<td>'.$object->login.'</td>';
+	print '</tr>';
 
 	print '<tr class="nowrap">';
 	print '<td>';
@@ -328,7 +328,7 @@ if ($action != 'edit' && $action != 'create')		// If not bank account yet, $acco
 		print '</tr>';
 	}
 
-    print '</table>';
+	print '</table>';
 
 	print '</div><div class="fichehalfright"><div class="ficheaddleft">';
 
@@ -355,9 +355,9 @@ if ($action != 'edit' && $action != 'create')		// If not bank account yet, $acco
 		{
 			$num = $db->num_rows($resql);
 
-	        print '<table class="noborder centpercent">';
+			print '<table class="noborder centpercent">';
 
-            print '<tr class="liste_titre">';
+			print '<tr class="liste_titre">';
    			print '<td colspan="4"><table width="100%" class="nobordernopadding"><tr><td>'.$langs->trans("LastSalaries", ($num <= $MAXLIST ? "" : $MAXLIST)).'</td><td class="right"><a class="notasortlink" href="'.DOL_URL_ROOT.'/salaries/list.php?search_user='.$object->login.'">'.$langs->trans("AllSalaries").'<span class="badge marginleftonlyshort">'.$num.'</span></a></td>';
    			print '</tr></table></td>';
    			print '</tr>';
@@ -368,11 +368,11 @@ if ($action != 'edit' && $action != 'create')		// If not bank account yet, $acco
 				$objp = $db->fetch_object($resql);
 
 				print '<tr class="oddeven">';
-                print '<td class="nowrap">';
-                $salary->id = $objp->rowid;
+				print '<td class="nowrap">';
+				$salary->id = $objp->rowid;
 				$salary->ref = $objp->rowid;
 
-                print $salary->getNomUrl(1);
+				print $salary->getNomUrl(1);
 				print '</td><td class="right" width="80px">'.dol_print_date($db->jdate($objp->datesp), 'day')."</td>\n";
 				print '<td class="right" width="80px">'.dol_print_date($db->jdate($objp->dateep), 'day')."</td>\n";
 				print '<td class="right" style="min-width: 60px">'.price($objp->amount).'</td></tr>';
@@ -396,7 +396,7 @@ if ($action != 'edit' && $action != 'create')		// If not bank account yet, $acco
 	{
 		$holiday = new Holiday($db);
 
-		$sql = "SELECT h.rowid, h.statut, h.fk_type, h.date_debut, h.date_fin, h.halfday";
+		$sql = "SELECT h.rowid, h.statut as status, h.fk_type, h.date_debut, h.date_fin, h.halfday";
 		$sql .= " FROM ".MAIN_DB_PREFIX."holiday as h";
 		$sql .= " WHERE h.fk_user = ".$object->id;
 		$sql .= " AND h.entity = ".$conf->entity;
@@ -407,9 +407,9 @@ if ($action != 'edit' && $action != 'create')		// If not bank account yet, $acco
 		{
 			$num = $db->num_rows($resql);
 
-	        print '<table class="noborder centpercent">';
+			print '<table class="noborder centpercent">';
 
-            print '<tr class="liste_titre">';
+			print '<tr class="liste_titre">';
   			print '<td colspan="4"><table class="nobordernopadding centpercent"><tr><td>'.$langs->trans("LastHolidays", ($num <= $MAXLIST ? "" : $MAXLIST)).'</td><td class="right"><a class="notasortlink" href="'.DOL_URL_ROOT.'/holiday/list.php?id='.$object->id.'">'.$langs->trans("AllHolidays").'<span class="badge marginleftonlyshort">'.$num.'</span></a></td>';
    			print '</tr></table></td>';
    			print '</tr>';
@@ -419,17 +419,18 @@ if ($action != 'edit' && $action != 'create')		// If not bank account yet, $acco
 			{
 				$objp = $db->fetch_object($resql);
 
-				print '<tr class="oddeven">';
-                print '<td class="nowrap">';
-                $holiday->id = $objp->rowid;
+				$holiday->id = $objp->rowid;
 				$holiday->ref = $objp->rowid;
-                $holiday->fk_type = $objp->fk_type;
+				$holiday->fk_type = $objp->fk_type;
+				$holiday->statut = $objp->status;
 				$nbopenedday = num_open_day($db->jdate($objp->date_debut), $db->jdate($objp->date_fin), 0, 1, $objp->halfday);
 
-                print $holiday->getNomUrl(1);
+				print '<tr class="oddeven">';
+				print '<td class="nowrap">';
+				print $holiday->getNomUrl(1);
 				print '</td><td class="right" width="80px">'.dol_print_date($db->jdate($objp->date_debut), 'day')."</td>\n";
 				print '<td class="right" style="min-width: 60px">'.$nbopenedday.' '.$langs->trans('DurationDays').'</td>';
-				print '<td class="right" style="min-width: 60px" class="nowrap">'.$holiday->LibStatut($objp->statut, 5).'</td></tr>';
+				print '<td class="right" style="min-width: 60px" class="nowrap">'.$holiday->LibStatut($objp->status, 5).'</td></tr>';
 				$i++;
 			}
 			$db->free($resql);
@@ -450,7 +451,7 @@ if ($action != 'edit' && $action != 'create')		// If not bank account yet, $acco
 	{
 		$exp = new ExpenseReport($db);
 
-		$sql = "SELECT e.rowid, e.ref, e.fk_statut, e.date_debut, e.total_ttc";
+		$sql = "SELECT e.rowid, e.ref, e.fk_statut as status, e.date_debut, e.total_ttc";
 		$sql .= " FROM ".MAIN_DB_PREFIX."expensereport as e";
 		$sql .= " WHERE e.fk_user_author = ".$object->id;
 		$sql .= " AND e.entity = ".$conf->entity;
@@ -461,9 +462,9 @@ if ($action != 'edit' && $action != 'create')		// If not bank account yet, $acco
 		{
 			$num = $db->num_rows($resql);
 
-	        print '<table class="noborder centpercent">';
+			print '<table class="noborder centpercent">';
 
-            print '<tr class="liste_titre">';
+			print '<tr class="liste_titre">';
    			print '<td colspan="4"><table class="nobordernopadding centpercent"><tr><td>'.$langs->trans("LastExpenseReports", ($num <= $MAXLIST ? "" : $MAXLIST)).'</td><td class="right"><a class="notasortlink" href="'.DOL_URL_ROOT.'/expensereport/list.php?id='.$object->id.'">'.$langs->trans("AllExpenseReports").'<span class="badge marginleftonlyshort">'.$num.'</span></a></td>';
    			print '</tr></table></td>';
    			print '</tr>';
@@ -473,16 +474,17 @@ if ($action != 'edit' && $action != 'create')		// If not bank account yet, $acco
 			{
 				$objp = $db->fetch_object($resql);
 
-				print '<tr class="oddeven">';
-                print '<td class="nowrap">';
-                $exp->id = $objp->rowid;
+				$exp->id = $objp->rowid;
 				$exp->ref = $objp->ref;
-                $exp->fk_type = $objp->fk_type;
+				$exp->fk_type = $objp->fk_type;
+				$exp->status = $objp->status;
 
-                print $exp->getNomUrl(1);
+				print '<tr class="oddeven">';
+				print '<td class="nowrap">';
+				print $exp->getNomUrl(1);
 				print '</td><td class="right" width="80px">'.dol_print_date($db->jdate($objp->date_debut), 'day')."</td>\n";
 				print '<td class="right" style="min-width: 60px">'.price($objp->total_ttc).'</td>';
-				print '<td class="right nowrap" style="min-width: 60px">'.$exp->LibStatut($objp->fk_statut, 5).'</td></tr>';
+				print '<td class="right nowrap" style="min-width: 60px">'.$exp->LibStatut($objp->status, 5).'</td></tr>';
 				$i++;
 			}
 			$db->free($resql);
@@ -494,10 +496,10 @@ if ($action != 'edit' && $action != 'create')		// If not bank account yet, $acco
 		}
 	}
 
-    print '</div></div></div>';
+	print '</div></div></div>';
 	print '<div style="clear:both"></div>';
 
-    dol_fiche_end();
+	print dol_get_fiche_end();
 
 	// List of bank accounts (Currently only one bank account possible for each employee)
 
@@ -598,18 +600,18 @@ if ($id && ($action == 'edit' || $action == 'create') && $user->rights->user->us
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/user/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-    dol_banner_tab($object, 'id', $linkback, $user->rights->user->user->lire || $user->admin);
+	dol_banner_tab($object, 'id', $linkback, $user->rights->user->user->lire || $user->admin);
 
-    //print '<div class="fichecenter">';
+	//print '<div class="fichecenter">';
 
-    print '<div class="underbanner clearboth"></div>';
+	print '<div class="underbanner clearboth"></div>';
 	print '<table class="border centpercent">';
 
-    print '<tr><td class="titlefield fieldrequired">'.$langs->trans("LabelRIB").'</td>';
-    print '<td colspan="4"><input size="30" type="text" name="label" value="'.$account->label.'"></td></tr>';
+	print '<tr><td class="titlefield fieldrequired">'.$langs->trans("LabelRIB").'</td>';
+	print '<td colspan="4"><input size="30" type="text" name="label" value="'.$account->label.'"></td></tr>';
 
-    print '<tr><td class="fieldrequired">'.$langs->trans("BankName").'</td>';
-    print '<td><input size="30" type="text" name="bank" value="'.$account->bank.'"></td></tr>';
+	print '<tr><td class="fieldrequired">'.$langs->trans("BankName").'</td>';
+	print '<td><input size="30" type="text" name="bank" value="'.$account->bank.'"></td></tr>';
 
 	// Show fields of bank account
 	foreach ($account->getFieldsToShow() as $val) {
@@ -636,38 +638,38 @@ if ($id && ($action == 'edit' || $action == 'create') && $user->rights->user->us
 		print '</tr>';
 	}
 
-    // IBAN
-    print '<tr><td class="fieldrequired">'.$langs->trans("IBAN").'</td>';
-    print '<td colspan="4"><input size="30" type="text" name="iban" value="'.$account->iban.'"></td></tr>';
+	// IBAN
+	print '<tr><td class="fieldrequired">'.$langs->trans("IBAN").'</td>';
+	print '<td colspan="4"><input size="30" type="text" name="iban" value="'.$account->iban.'"></td></tr>';
 
-    print '<tr><td class="fieldrequired">'.$langs->trans("BIC").'</td>';
-    print '<td colspan="4"><input size="12" type="text" name="bic" value="'.$account->bic.'"></td></tr>';
+	print '<tr><td class="fieldrequired">'.$langs->trans("BIC").'</td>';
+	print '<td colspan="4"><input size="12" type="text" name="bic" value="'.$account->bic.'"></td></tr>';
 
-    print '<tr><td class="tdtop">'.$langs->trans("BankAccountDomiciliation").'</td><td colspan="4">';
-    print '<textarea name="domiciliation" rows="4" class="quatrevingtpercent">';
-    print $account->domiciliation;
-    print "</textarea></td></tr>";
+	print '<tr><td class="tdtop">'.$langs->trans("BankAccountDomiciliation").'</td><td colspan="4">';
+	print '<textarea name="domiciliation" rows="4" class="quatrevingtpercent">';
+	print $account->domiciliation;
+	print "</textarea></td></tr>";
 
-    print '<tr><td>'.$langs->trans("BankAccountOwner").'</td>';
-    print '<td colspan="4"><input size="30" type="text" name="proprio" value="'.$account->proprio.'"></td></tr>';
-    print "</td></tr>\n";
+	print '<tr><td>'.$langs->trans("BankAccountOwner").'</td>';
+	print '<td colspan="4"><input size="30" type="text" name="proprio" value="'.$account->proprio.'"></td></tr>';
+	print "</td></tr>\n";
 
-    print '<tr><td class="tdtop">'.$langs->trans("BankAccountOwnerAddress").'</td><td colspan="4">';
-    print '<textarea name="owner_address" rows="4" class="quatrevingtpercent">';
-    print $account->owner_address;
-    print "</textarea></td></tr>";
+	print '<tr><td class="tdtop">'.$langs->trans("BankAccountOwnerAddress").'</td><td colspan="4">';
+	print '<textarea name="owner_address" rows="4" class="quatrevingtpercent">';
+	print $account->owner_address;
+	print "</textarea></td></tr>";
 
-    print '</table>';
+	print '</table>';
 
-    //print '</div>';
+	//print '</div>';
 
-    dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div class="center">';
 	print '<input class="button" value="'.$langs->trans("Modify").'" type="submit">';
-    print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
+	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
 	print '<input class="button" name="cancel" value="'.$langs->trans("Cancel").'" type="submit">';
-    print '</div>';
+	print '</div>';
 }
 
 if ($id && $action == 'edit' && $user->rights->user->user->creer) print '</form>';
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index d1ae9ec46f7..b7b3fdc689e 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -1262,7 +1262,7 @@ if ($action == 'create' || $action == 'adduserldap')
 
 	print "</table>\n";
 
- 	dol_fiche_end();
+ 	print dol_get_fiche_end();
 
 	print '<div class="center">';
 	print '<input class="button" value="'.$langs->trans("CreateUser").'" name="create" type="submit">';
@@ -1762,7 +1762,7 @@ if ($action == 'create' || $action == 'adduserldap')
 				{
 					$societe = new Societe($db);
 					$societe->fetch($object->socid);
-					if ($societe->id > 0){
+					if ($societe->id > 0) {
 						$s .= $societe->getNomUrl(1, '');
 					}
 				} else {
@@ -1823,7 +1823,7 @@ if ($action == 'create' || $action == 'adduserldap')
 			print '<div style="clear:both"></div>';
 
 
-			dol_fiche_end();
+			print dol_get_fiche_end();
 
 
 			/*
@@ -2221,16 +2221,16 @@ if ($action == 'create' || $action == 'adduserldap')
 				$type = 0;
 				if ($object->contact_id) $type = $object->contact_id;
 
-				if ($object->socid > 0 && ! ($object->contact_id > 0)) {	// external user but no link to a contact
+				if ($object->socid > 0 && !($object->contact_id > 0)) {	// external user but no link to a contact
 					print img_picto('', 'company').$form->select_company($object->socid, 'socid', '', '&nbsp;');
 					print img_picto('', 'contact').$form->selectcontacts(0, 0, 'contactid', 1, '', '', 1, '', false, 1);
 					if ($object->ldap_sid) print ' ('.$langs->trans("DomainUser").')';
 				} elseif ($object->socid > 0 && $object->contact_id > 0) {	// external user with a link to a contact
-					print img_picto('', 'company').$form->select_company(0, 'socid', '', '&nbsp;');	// We keep thirdparty empty, contact is already set
+					print img_picto('', 'company').$form->select_company(0, 'socid', '', '&nbsp;'); // We keep thirdparty empty, contact is already set
 					print img_picto('', 'contact').$form->selectcontacts(0, $object->contact_id, 'contactid', 1, '', '', 1, '', false, 1);
 			   		if ($object->ldap_sid) print ' ('.$langs->trans("DomainUser").')';
 				} else {	// $object->socid is not > 0 here
-					print img_picto('', 'company').$form->select_company(0, 'socid', '', '&nbsp;');	// We keep thirdparty empty, contact is already set
+					print img_picto('', 'company').$form->select_company(0, 'socid', '', '&nbsp;'); // We keep thirdparty empty, contact is already set
 					print img_picto('', 'contact').$form->selectcontacts(0, 0, 'contactid', 1, '', '', 1, '', false, 1);
 				}
 			}
@@ -2753,7 +2753,7 @@ if ($action == 'create' || $action == 'adduserldap')
 
 			print '</table>';
 
-			dol_fiche_end();
+			print dol_get_fiche_end();
 
 			print '<div class="center">';
 			print '<input value="'.$langs->trans("Save").'" class="button" type="submit" name="save">';
diff --git a/htdocs/user/class/api_users.class.php b/htdocs/user/class/api_users.class.php
index 5245ff0b961..d04c735eeed 100644
--- a/htdocs/user/class/api_users.class.php
+++ b/htdocs/user/class/api_users.class.php
@@ -45,8 +45,8 @@ class Users extends DolibarrApi
 	/**
 	 * Constructor
 	 */
-    public function __construct()
-    {
+	public function __construct()
+	{
 		global $db, $conf;
 		$this->db = $db;
 		$this->useraccount = new User($this->db);
@@ -63,82 +63,79 @@ class Users extends DolibarrApi
 	 * @param int		$limit		Limit for list
 	 * @param int		$page		Page number
 	 * @param string   	$user_ids   User ids filter field. Example: '1' or '1,2,3'          {@pattern /^[0-9,]*$/i}
-     * @param  int    $category   Use this param to filter list by category
-     * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"
+	 * @param  int    $category   Use this param to filter list by category
+	 * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"
 	 * @return  array               Array of User objects
 	 */
-    public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $user_ids = 0, $category = 0, $sqlfilters = '')
-    {
-	    global $db, $conf;
+	public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $user_ids = 0, $category = 0, $sqlfilters = '')
+	{
+		global $db, $conf;
 
-	    $obj_ret = array();
+		$obj_ret = array();
 
 		if (!DolibarrApiAccess::$user->rights->user->user->lire) {
-	        throw new RestException(401, "You are not allowed to read list of users");
-	    }
+			throw new RestException(401, "You are not allowed to read list of users");
+		}
 
-	    // case of external user, $societe param is ignored and replaced by user's socid
-	    //$socid = DolibarrApiAccess::$user->socid ? DolibarrApiAccess::$user->socid : $societe;
+		// case of external user, $societe param is ignored and replaced by user's socid
+		//$socid = DolibarrApiAccess::$user->socid ? DolibarrApiAccess::$user->socid : $societe;
 
-	    $sql = "SELECT t.rowid";
-	    $sql .= " FROM ".MAIN_DB_PREFIX."user as t";
-        if ($category > 0) {
-            $sql .= ", ".MAIN_DB_PREFIX."categorie_user as c";
-        }
-	    $sql .= ' WHERE t.entity IN ('.getEntity('user').')';
-	    if ($user_ids) $sql .= " AND t.rowid IN (".$user_ids.")";
+		$sql = "SELECT t.rowid";
+		$sql .= " FROM ".MAIN_DB_PREFIX."user as t";
+		if ($category > 0) {
+			$sql .= ", ".MAIN_DB_PREFIX."categorie_user as c";
+		}
+		$sql .= ' WHERE t.entity IN ('.getEntity('user').')';
+		if ($user_ids) {
+			$sql .= " AND t.rowid IN (".$user_ids.")";
+		}
 
-    	// Select products of given category
-    	if ($category > 0) {
-    		$sql .= " AND c.fk_categorie = ".$this->db->escape($category);
+		// Select products of given category
+		if ($category > 0) {
+			$sql .= " AND c.fk_categorie = ".$this->db->escape($category);
 			$sql .= " AND c.fk_user = t.rowid ";
-    	}
+		}
 
-	    // Add sql filters
-        if ($sqlfilters)
-        {
-            if (!DolibarrApi::_checkFilters($sqlfilters))
-            {
-                throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
-            }
-	        $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-        }
+		// Add sql filters
+		if ($sqlfilters) {
+			if (!DolibarrApi::_checkFilters($sqlfilters)) {
+				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+			}
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
 
-        $sql .= $this->db->order($sortfield, $sortorder);
-	    if ($limit) {
-	        if ($page < 0)
-	        {
-	            $page = 0;
-	        }
-	        $offset = $limit * $page;
+		$sql .= $this->db->order($sortfield, $sortorder);
+		if ($limit) {
+			if ($page < 0) {
+				$page = 0;
+			}
+			$offset = $limit * $page;
 
-	        $sql .= $this->db->plimit($limit + 1, $offset);
-	    }
+			$sql .= $this->db->plimit($limit + 1, $offset);
+		}
 
-	    $result = $this->db->query($sql);
+		$result = $this->db->query($sql);
 
-	    if ($result)
-	    {
-	        $i = 0;
-	        $num = $this->db->num_rows($result);
-	        $min = min($num, ($limit <= 0 ? $num : $limit));
-	        while ($i < $min)
-	        {
-	        	$obj = $this->db->fetch_object($result);
-	        	$user_static = new User($this->db);
-	            if ($user_static->fetch($obj->rowid)) {
-	                $obj_ret[] = $this->_cleanObjectDatas($user_static);
-	            }
-	            $i++;
-	        }
-	    } else {
-	    	throw new RestException(503, 'Error when retrieve User list : '.$this->db->lasterror());
-	    }
-	    if (!count($obj_ret)) {
-	        throw new RestException(404, 'No User found');
-	    }
-	    return $obj_ret;
+		if ($result) {
+			$i = 0;
+			$num = $this->db->num_rows($result);
+			$min = min($num, ($limit <= 0 ? $num : $limit));
+			while ($i < $min) {
+				$obj = $this->db->fetch_object($result);
+				$user_static = new User($this->db);
+				if ($user_static->fetch($obj->rowid)) {
+					$obj_ret[] = $this->_cleanObjectDatas($user_static);
+				}
+				$i++;
+			}
+		} else {
+			throw new RestException(503, 'Error when retrieve User list : '.$this->db->lasterror());
+		}
+		if (!count($obj_ret)) {
+			throw new RestException(404, 'No User found');
+		}
+		return $obj_ret;
 	}
 
 	/**
@@ -151,20 +148,18 @@ class Users extends DolibarrApi
 	 * @throws RestException 401     Insufficient rights
 	 * @throws RestException 404     User or group not found
 	 */
-    public function get($id, $includepermissions = 0)
-    {
+	public function get($id, $includepermissions = 0)
+	{
 		//if (!DolibarrApiAccess::$user->rights->user->user->lire) {
 			//throw new RestException(401);
 		//}
 
 		$result = $this->useraccount->fetch($id);
-		if (!$result)
-		{
+		if (!$result) {
 			throw new RestException(404, 'User not found');
 		}
 
-		if (!DolibarrApi::_checkAccessToResource('user', $this->useraccount->id, 'user'))
-		{
+		if (!DolibarrApi::_checkAccessToResource('user', $this->useraccount->id, 'user')) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
@@ -187,20 +182,18 @@ class Users extends DolibarrApi
 	 * @throws RestException 401     Insufficient rights
 	 * @throws RestException 404     User or group not found
 	 */
-    public function getByLogin($login, $includepermissions = 0)
-    {
+	public function getByLogin($login, $includepermissions = 0)
+	{
 		//if (!DolibarrApiAccess::$user->rights->user->user->lire) {
 			//throw new RestException(401);
 		//}
 
 		$result = $this->useraccount->fetch('', $login);
-		if (!$result)
-		{
+		if (!$result) {
 			throw new RestException(404, 'User not found');
 		}
 
-		if (!DolibarrApi::_checkAccessToResource('user', $this->useraccount->id, 'user'))
-		{
+		if (!DolibarrApi::_checkAccessToResource('user', $this->useraccount->id, 'user')) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
@@ -223,20 +216,18 @@ class Users extends DolibarrApi
 	 * @throws RestException 401     Insufficient rights
 	 * @throws RestException 404     User or group not found
 	 */
-    public function getByEmail($email, $includepermissions = 0)
-    {
+	public function getByEmail($email, $includepermissions = 0)
+	{
 		//if (!DolibarrApiAccess::$user->rights->user->user->lire) {
 			//throw new RestException(401);
 		//}
 
 		$result = $this->useraccount->fetch('', '', '', 0, -1, $email);
-		if (!$result)
-		{
+		if (!$result) {
 			throw new RestException(404, 'User not found');
 		}
 
-		if (!DolibarrApi::_checkAccessToResource('user', $this->useraccount->id, 'user'))
-		{
+		if (!DolibarrApi::_checkAccessToResource('user', $this->useraccount->id, 'user')) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
@@ -247,39 +238,39 @@ class Users extends DolibarrApi
 		return $this->_cleanObjectDatas($this->useraccount);
 	}
 
-    /**
-     * Get properties of user connected
-     *
-     * @url	GET /info
-     *
-     * @return  array|mixed Data without useless information
-     *
-     * @throws RestException 401     Insufficient rights
-     * @throws RestException 404     User or group not found
-     */
-    public function getInfo()
-    {
-        $apiUser = DolibarrApiAccess::$user;
+	/**
+	 * Get properties of user connected
+	 *
+	 * @url	GET /info
+	 *
+	 * @return  array|mixed Data without useless information
+	 *
+	 * @throws RestException 401     Insufficient rights
+	 * @throws RestException 404     User or group not found
+	 */
+	public function getInfo()
+	{
+		$apiUser = DolibarrApiAccess::$user;
 
-        $result = $this->useraccount->fetch($apiUser->id);
-        if (!$result) {
-            throw new RestException(404, 'User not found');
-        }
+		$result = $this->useraccount->fetch($apiUser->id);
+		if (!$result) {
+			throw new RestException(404, 'User not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('user', $this->useraccount->id, 'user')) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('user', $this->useraccount->id, 'user')) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        $usergroup = new UserGroup($this->db);
-        $userGroupList = $usergroup->listGroupsForUser($apiUser->id, false);
-        if (!is_array($userGroupList)) {
-            throw new RestException(404, 'User group not found');
-        }
+		$usergroup = new UserGroup($this->db);
+		$userGroupList = $usergroup->listGroupsForUser($apiUser->id, false);
+		if (!is_array($userGroupList)) {
+			throw new RestException(404, 'User group not found');
+		}
 
-        $this->useraccount->user_group_list = $this->_cleanUserGroupListDatas($userGroupList);
+		$this->useraccount->user_group_list = $this->_cleanUserGroupListDatas($userGroupList);
 
-        return $this->_cleanObjectDatas($this->useraccount);
-    }
+		return $this->_cleanObjectDatas($this->useraccount);
+	}
 
 	/**
 	 * Create user account
@@ -287,30 +278,29 @@ class Users extends DolibarrApi
 	 * @param array $request_data New user data
 	 * @return int
 	 */
-    public function post($request_data = null)
-    {
-	    // check user authorization
-	    //if(! DolibarrApiAccess::$user->rights->user->creer) {
-	    //   throw new RestException(401, "User creation not allowed");
-	    //}
-	    // check mandatory fields
-	    /*if (!isset($request_data["login"]))
+	public function post($request_data = null)
+	{
+		// check user authorization
+		//if(! DolibarrApiAccess::$user->rights->user->creer) {
+		//   throw new RestException(401, "User creation not allowed");
+		//}
+		// check mandatory fields
+		/*if (!isset($request_data["login"]))
 	        throw new RestException(400, "login field missing");
 	    if (!isset($request_data["password"]))
 	        throw new RestException(400, "password field missing");
 	    if (!isset($request_data["lastname"]))
 	         throw new RestException(400, "lastname field missing");*/
-	    //assign field values
-        foreach ($request_data as $field => $value)
-	    {
-	          $this->useraccount->$field = $value;
-	    }
+		//assign field values
+		foreach ($request_data as $field => $value) {
+			  $this->useraccount->$field = $value;
+		}
 
-	    if ($this->useraccount->create(DolibarrApiAccess::$user) < 0) {
-             throw new RestException(500, 'Error creating', array_merge(array($this->useraccount->error), $this->useraccount->errors));
-	    }
-	    return $this->useraccount->id;
-    }
+		if ($this->useraccount->create(DolibarrApiAccess::$user) < 0) {
+			throw new RestException(500, 'Error creating', array_merge(array($this->useraccount->error), $this->useraccount->errors));
+		}
+		return $this->useraccount->id;
+	}
 
 
 	/**
@@ -319,23 +309,21 @@ class Users extends DolibarrApi
 	 * @param int   $id             Id of account to update
 	 * @param array $request_data   Datas
 	 * @return array
-     *
-     * @throws 	RestException
+	 *
+	 * @throws 	RestException
 	 */
-    public function put($id, $request_data = null)
-    {
+	public function put($id, $request_data = null)
+	{
 		//if (!DolibarrApiAccess::$user->rights->user->user->creer) {
 			//throw new RestException(401);
 		//}
 
 		$result = $this->useraccount->fetch($id);
-		if (!$result)
-		{
+		if (!$result) {
 			throw new RestException(404, 'Account not found');
 		}
 
-		if (!DolibarrApi::_checkAccessToResource('user', $this->useraccount->id, 'user'))
-		{
+		if (!DolibarrApi::_checkAccessToResource('user', $this->useraccount->id, 'user')) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
@@ -347,22 +335,21 @@ class Users extends DolibarrApi
 			if ($field == 'statut') {
 				$result = $this->useraccount->setstatus($value);
 				if ($result < 0) {
-				    throw new RestException(500, 'Error when updating status of user: '.$this->useraccount->error);
+					throw new RestException(500, 'Error when updating status of user: '.$this->useraccount->error);
 				}
 			} else {
-			    $this->useraccount->$field = $value;
+				$this->useraccount->$field = $value;
 			}
 		}
 
 		// If there is no error, update() returns the number of affected
 		// rows so if the update is a no op, the return value is zezo.
-		if ($this->useraccount->update(DolibarrApiAccess::$user) >= 0)
-		{
+		if ($this->useraccount->update(DolibarrApiAccess::$user) >= 0) {
 			return $this->get($id);
 		} else {
 			throw new RestException(500, $this->useraccount->error);
 		}
-    }
+	}
 
 
 	/**
@@ -372,7 +359,7 @@ class Users extends DolibarrApi
 	 * @return array      Array of group objects
 	 *
 	 * @throws RestException 403 Not allowed
-     * @throws RestException 404 Not found
+	 * @throws RestException 404 Not found
 	 *
 	 * @url GET {id}/groups
 	 */
@@ -400,18 +387,18 @@ class Users extends DolibarrApi
 	}
 
 
-    /**
+	/**
 	 * Add a user into a group
 	 *
 	 * @param   int     $id        User ID
 	 * @param   int     $group     Group ID
 	 * @param   int     $entity    Entity ID (valid only for superadmin in multicompany transverse mode)
 	 * @return  int                1 if success
-     *
+	 *
 	 * @url	GET {id}/setGroup/{group}
 	 */
-    public function setGroup($id, $group, $entity = 1)
-    {
+	public function setGroup($id, $group, $entity = 1)
+	{
 
 		global $conf;
 
@@ -419,18 +406,15 @@ class Users extends DolibarrApi
 			//throw new RestException(401);
 		//}
 		$result = $this->useraccount->fetch($id);
-		if (!$result)
-		{
+		if (!$result) {
 			throw new RestException(404, 'User not found');
 		}
 
-		if (!DolibarrApi::_checkAccessToResource('user', $this->useraccount->id, 'user'))
-		{
+		if (!DolibarrApi::_checkAccessToResource('user', $this->useraccount->id, 'user')) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
-		if (!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && !empty(DolibarrApiAccess::$user->admin) && empty(DolibarrApiAccess::$user->entity))
-		{
+		if (!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && !empty(DolibarrApiAccess::$user->admin) && empty(DolibarrApiAccess::$user->entity)) {
 			$entity = (!empty($entity) ? $entity : $conf->entity);
 		} else {
 			// When using API, action is done on entity of logged user because a user of entity X with permission to create user should not be able to
@@ -439,8 +423,7 @@ class Users extends DolibarrApi
 		}
 
 		$result = $this->useraccount->SetInGroup($group, $entity);
-		if (!($result > 0))
-		{
+		if (!($result > 0)) {
 			throw new RestException(500, $this->useraccount->error);
 		}
 
@@ -462,68 +445,65 @@ class Users extends DolibarrApi
 	 * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"
 	 * @return  array               Array of User objects
 	 */
-    public function listGroups($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $group_ids = 0, $sqlfilters = '')
-    {
-	    global $db, $conf;
+	public function listGroups($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $group_ids = 0, $sqlfilters = '')
+	{
+		global $db, $conf;
 
-	    $obj_ret = array();
+		$obj_ret = array();
 
 		if (!DolibarrApiAccess::$user->rights->user->group_advance->read) {
-	        throw new RestException(401, "You are not allowed to read list of groups");
-	    }
+			throw new RestException(401, "You are not allowed to read list of groups");
+		}
 
-	    // case of external user, $societe param is ignored and replaced by user's socid
-	    //$socid = DolibarrApiAccess::$user->socid ? DolibarrApiAccess::$user->socid : $societe;
+		// case of external user, $societe param is ignored and replaced by user's socid
+		//$socid = DolibarrApiAccess::$user->socid ? DolibarrApiAccess::$user->socid : $societe;
 
-	    $sql = "SELECT t.rowid";
-	    $sql .= " FROM ".MAIN_DB_PREFIX."usergroup as t";
-	    $sql .= ' WHERE t.entity IN ('.getEntity('user').')';
-	    if ($group_ids) $sql .= " AND t.rowid IN (".$group_ids.")";
-	    // Add sql filters
-        if ($sqlfilters)
-        {
-            if (!DolibarrApi::_checkFilters($sqlfilters))
-            {
-                throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
-            }
-	        $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-        }
+		$sql = "SELECT t.rowid";
+		$sql .= " FROM ".MAIN_DB_PREFIX."usergroup as t";
+		$sql .= ' WHERE t.entity IN ('.getEntity('user').')';
+		if ($group_ids) $sql .= " AND t.rowid IN (".$group_ids.")";
+		// Add sql filters
+		if ($sqlfilters) {
+			if (!DolibarrApi::_checkFilters($sqlfilters)) {
+				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+			}
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
 
-        $sql .= $this->db->order($sortfield, $sortorder);
-	    if ($limit) {
-	        if ($page < 0)
-	        {
-	            $page = 0;
-	        }
-	        $offset = $limit * $page;
+		$sql .= $this->db->order($sortfield, $sortorder);
+		if ($limit) {
+			if ($page < 0) {
+				$page = 0;
+			}
+			$offset = $limit * $page;
 
-	        $sql .= $this->db->plimit($limit + 1, $offset);
-	    }
+			$sql .= $this->db->plimit($limit + 1, $offset);
+		}
 
-	    $result = $this->db->query($sql);
+		$result = $this->db->query($sql);
 
-	    if ($result)
-	    {
-	        $i = 0;
-	        $num = $this->db->num_rows($result);
-	        $min = min($num, ($limit <= 0 ? $num : $limit));
-	        while ($i < $min)
-	        {
-	        	$obj = $this->db->fetch_object($result);
-	            $group_static = new UserGroup($this->db);
-	            if ($group_static->fetch($obj->rowid)) {
-	                $obj_ret[] = $this->_cleanObjectDatas($group_static);
-	            }
-	            $i++;
-	        }
-	    } else {
-	    	throw new RestException(503, 'Error when retrieve Group list : '.$this->db->lasterror());
-	    }
-	    if (!count($obj_ret)) {
-	        throw new RestException(404, 'No Group found');
-	    }
-	    return $obj_ret;
+		if ($result)
+		{
+			$i = 0;
+			$num = $this->db->num_rows($result);
+			$min = min($num, ($limit <= 0 ? $num : $limit));
+			while ($i < $min)
+			{
+				$obj = $this->db->fetch_object($result);
+				$group_static = new UserGroup($this->db);
+				if ($group_static->fetch($obj->rowid)) {
+					$obj_ret[] = $this->_cleanObjectDatas($group_static);
+				}
+				$i++;
+			}
+		} else {
+			throw new RestException(503, 'Error when retrieve Group list : '.$this->db->lasterror());
+		}
+		if (!count($obj_ret)) {
+			throw new RestException(404, 'No Group found');
+		}
+		return $obj_ret;
 	}
 
 	/**
@@ -537,23 +517,22 @@ class Users extends DolibarrApi
 	 * @param int       $load_members     Load members list or not {@min 0} {@max 1}
 	 * @return  array               Array of User objects
 	 */
-    public function infoGroups($group, $load_members = 0)
-    {
-	    global $db, $conf;
+	public function infoGroups($group, $load_members = 0)
+	{
+		global $db, $conf;
 
 		if (!DolibarrApiAccess::$user->rights->user->group_advance->read) {
-	        throw new RestException(401, "You are not allowed to read groups");
-	    }
+			throw new RestException(401, "You are not allowed to read groups");
+		}
 
-	            $group_static = new UserGroup($this->db);
-	            $result = $group_static->fetch($group, '', $load_members);
+		$group_static = new UserGroup($this->db);
+		$result = $group_static->fetch($group, '', $load_members);
 
-		if (!$result)
-		{
+		if (!$result) {
 			throw new RestException(404, 'Group not found');
 		}
 
-	    return $this->_cleanObjectDatas($group_static);
+		return $this->_cleanObjectDatas($group_static);
 	}
 
 	/**
@@ -562,153 +541,150 @@ class Users extends DolibarrApi
 	 * @param   int     $id Account ID
 	 * @return  array
 	 */
-    public function delete($id)
-    {
+	public function delete($id)
+	{
 		//if (!DolibarrApiAccess::$user->rights->user->user->supprimer) {
 			//throw new RestException(401);
 		//}
 		$result = $this->useraccount->fetch($id);
-		if (!$result)
-		{
+		if (!$result) {
 			throw new RestException(404, 'User not found');
 		}
 
-		if (!DolibarrApi::_checkAccessToResource('user', $this->useraccount->id, 'user'))
-		{
+		if (!DolibarrApi::_checkAccessToResource('user', $this->useraccount->id, 'user')) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
-        $this->useraccount->oldcopy = clone $this->useraccount;
+		$this->useraccount->oldcopy = clone $this->useraccount;
 		return $this->useraccount->delete(DolibarrApiAccess::$user);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 * Clean sensible object datas
 	 *
-	 * @param   object  $object    Object to clean
-	 * @return  array    			Array of cleaned object properties
+	 * @param   Object  $object    Object to clean
+	 * @return    Object    Object with cleaned properties
 	 */
 	protected function _cleanObjectDatas($object)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
-	    $object = parent::_cleanObjectDatas($object);
+		$object = parent::_cleanObjectDatas($object);
 
-	    unset($object->default_values);
-	    unset($object->lastsearch_values);
-	    unset($object->lastsearch_values_tmp);
+		unset($object->default_values);
+		unset($object->lastsearch_values);
+		unset($object->lastsearch_values_tmp);
 
-	    unset($object->total_ht);
-	    unset($object->total_tva);
-	    unset($object->total_localtax1);
-	    unset($object->total_localtax2);
-	    unset($object->total_ttc);
+		unset($object->total_ht);
+		unset($object->total_tva);
+		unset($object->total_localtax1);
+		unset($object->total_localtax2);
+		unset($object->total_ttc);
 
-	    unset($object->label_incoterms);
-	    unset($object->location_incoterms);
+		unset($object->label_incoterms);
+		unset($object->location_incoterms);
 
-	    unset($object->fk_delivery_address);
-	    unset($object->fk_incoterms);
-	    unset($object->all_permissions_are_loaded);
-	    unset($object->shipping_method_id);
-	    unset($object->nb_rights);
-	    unset($object->search_sid);
-	    unset($object->ldap_sid);
-	    unset($object->clicktodial_loaded);
+		unset($object->fk_delivery_address);
+		unset($object->fk_incoterms);
+		unset($object->all_permissions_are_loaded);
+		unset($object->shipping_method_id);
+		unset($object->nb_rights);
+		unset($object->search_sid);
+		unset($object->ldap_sid);
+		unset($object->clicktodial_loaded);
 
-	    // List of properties never returned by API, whatever are permissions
-	    unset($object->pass);
-	    unset($object->pass_indatabase);
-	    unset($object->pass_indatabase_crypted);
-	    unset($object->pass_temp);
-	    unset($object->api_key);
-	    unset($object->clicktodial_password);
-	    unset($object->openid);
+		// List of properties never returned by API, whatever are permissions
+		unset($object->pass);
+		unset($object->pass_indatabase);
+		unset($object->pass_indatabase_crypted);
+		unset($object->pass_temp);
+		unset($object->api_key);
+		unset($object->clicktodial_password);
+		unset($object->openid);
 
-	    unset($object->lines);
-	    unset($object->model_pdf);
-	    unset($object->skype);
-	    unset($object->twitter);
-	    unset($object->facebook);
-	    unset($object->linkedin);
+		unset($object->lines);
+		unset($object->model_pdf);
+		unset($object->skype);
+		unset($object->twitter);
+		unset($object->facebook);
+		unset($object->linkedin);
 
-	    $canreadsalary = ((!empty($conf->salaries->enabled) && !empty(DolibarrApiAccess::$user->rights->salaries->read))
-	    	|| (!empty($conf->hrm->enabled) && !empty(DolibarrApiAccess::$user->rights->hrm->employee->read)));
+		$canreadsalary = ((!empty($conf->salaries->enabled) && !empty(DolibarrApiAccess::$user->rights->salaries->read))
+			|| (!empty($conf->hrm->enabled) && !empty(DolibarrApiAccess::$user->rights->hrm->employee->read)));
 
-		if (!$canreadsalary)
-		{
+		if (!$canreadsalary) {
 			unset($object->salary);
 			unset($object->salaryextra);
 			unset($object->thm);
 			unset($object->tjm);
 		}
 
-	    return $object;
+		return $object;
 	}
 
-    /**
-     * Clean sensible user group list datas
-     *
-     * @param   array  $objectList   Array of object to clean
-     * @return  array                Array of cleaned object properties
-     */
-    private function _cleanUserGroupListDatas($objectList)
-    {
-        $cleanObjectList = array();
+	/**
+	 * Clean sensible user group list datas
+	 *
+	 * @param   array  $objectList   Array of object to clean
+	 * @return  array                Array of cleaned object properties
+	 */
+	private function _cleanUserGroupListDatas($objectList)
+	{
+		$cleanObjectList = array();
 
-        foreach ($objectList as $object) {
-            $cleanObject = parent::_cleanObjectDatas($object);
+		foreach ($objectList as $object) {
+			$cleanObject = parent::_cleanObjectDatas($object);
 
-            unset($cleanObject->default_values);
-            unset($cleanObject->lastsearch_values);
-            unset($cleanObject->lastsearch_values_tmp);
+			unset($cleanObject->default_values);
+			unset($cleanObject->lastsearch_values);
+			unset($cleanObject->lastsearch_values_tmp);
 
-            unset($cleanObject->total_ht);
-            unset($cleanObject->total_tva);
-            unset($cleanObject->total_localtax1);
-            unset($cleanObject->total_localtax2);
-            unset($cleanObject->total_ttc);
+			unset($cleanObject->total_ht);
+			unset($cleanObject->total_tva);
+			unset($cleanObject->total_localtax1);
+			unset($cleanObject->total_localtax2);
+			unset($cleanObject->total_ttc);
 
-            unset($cleanObject->libelle_incoterms);
-            unset($cleanObject->location_incoterms);
+			unset($cleanObject->libelle_incoterms);
+			unset($cleanObject->location_incoterms);
 
-            unset($cleanObject->fk_delivery_address);
-            unset($cleanObject->fk_incoterms);
-            unset($cleanObject->all_permissions_are_loaded);
-            unset($cleanObject->shipping_method_id);
-            unset($cleanObject->nb_rights);
-            unset($cleanObject->search_sid);
-            unset($cleanObject->ldap_sid);
-            unset($cleanObject->clicktodial_loaded);
+			unset($cleanObject->fk_delivery_address);
+			unset($cleanObject->fk_incoterms);
+			unset($cleanObject->all_permissions_are_loaded);
+			unset($cleanObject->shipping_method_id);
+			unset($cleanObject->nb_rights);
+			unset($cleanObject->search_sid);
+			unset($cleanObject->ldap_sid);
+			unset($cleanObject->clicktodial_loaded);
 
-            unset($cleanObject->datec);
-            unset($cleanObject->datem);
-            unset($cleanObject->members);
-            unset($cleanObject->note);
-            unset($cleanObject->note_private);
+			unset($cleanObject->datec);
+			unset($cleanObject->datem);
+			unset($cleanObject->members);
+			unset($cleanObject->note);
+			unset($cleanObject->note_private);
 
-            $cleanObjectList[] = $cleanObject;
-        }
+			$cleanObjectList[] = $cleanObject;
+		}
 
-        return $cleanObjectList;
-    }
+		return $cleanObjectList;
+	}
 
 	/**
 	 * Validate fields before create or update object
-     *
+	 *
 	 * @param   array|null     $data   Data to validate
 	 * @return  array
 	 * @throws RestException
-     */
-    private function _validate($data)
-    {
-        $account = array();
-        foreach (Users::$FIELDS as $field) {
-            if (!isset($data[$field]))
-                throw new RestException(400, "$field field missing");
-            $account[$field] = $data[$field];
-        }
-        return $account;
-    }
+	 */
+	private function _validate($data)
+	{
+		$account = array();
+		foreach (Users::$FIELDS as $field) {
+			if (!isset($data[$field]))
+				throw new RestException(400, "$field field missing");
+			$account[$field] = $data[$field];
+		}
+		return $account;
+	}
 }
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index b6db00d2d16..197194245e4 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -12,7 +12,7 @@
  * Copyright (C) 2015       Marcos García           <marcosgdf@gmail.com>
  * Copyright (C) 2018       charlene Benke          <charlie@patas-monkey.com>
  * Copyright (C) 2018       Nicolas ZABOURI         <info@inovea-conseil.com>
- * Copyright (C) 2019       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2019-2020  Frédéric France         <frederic.france@netlogic.fr>
  * Copyright (C) 2019       Abbes Bahfir            <dolipar@dolipar.org>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -64,6 +64,9 @@ class User extends CommonObject
 	 */
 	public $ismultientitymanaged = 1;
 
+	/**
+	 * @var string picto
+	 */
 	public $picto = 'user';
 
 	public $id = 0;
@@ -73,7 +76,15 @@ class User extends CommonObject
 	public $employee;
 	public $gender;
 	public $birth;
+
+	/**
+	 * @var string email
+	 */
 	public $email;
+
+	/**
+	 * @var string personal email
+	 */
 	public $personal_email;
 
 
@@ -90,7 +101,14 @@ class User extends CommonObject
 	 */
 	public $address;
 
+	/**
+	 * @var string zip code
+	 */
 	public $zip;
+
+	/**
+	 * @var string town
+	 */
 	public $town;
 	public $state_id; // The state/department
 	public $state_code;
@@ -108,11 +126,19 @@ class User extends CommonObject
 	 */
 	public $entity;
 
-	//! Clear password in memory
+	/**
+	 * @var string Clear password in memory
+	 */
 	public $pass;
-	//! Clear password in database (defined if DATABASE_PWD_ENCRYPTED=0)
+
+	/**
+	 * @var string Clear password in database (defined if DATABASE_PWD_ENCRYPTED=0)
+	 */
 	public $pass_indatabase;
-	//! Encrypted password in database (always defined)
+
+	/**
+	 * @var string Encrypted password in database (always defined)
+	 */
 	public $pass_indatabase_crypted;
 
 	/**
@@ -140,9 +166,10 @@ class User extends CommonObject
 	public $fk_member;
 
 	/**
-	 * @var int User ID
+	 * @var int User ID of supervisor
 	 */
 	public $fk_user;
+
 	public $fk_user_expense_validator;
 	public $fk_user_holiday_validator;
 
@@ -284,29 +311,25 @@ class User extends CommonObject
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON u.fk_country = c.rowid";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as d ON u.fk_state = d.rowid";
 
-		if ($entity < 0)
-		{
-			if ((empty($conf->multicompany->enabled) || empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) && (!empty($user->entity)))
-			{
+		if ($entity < 0) {
+			if ((empty($conf->multicompany->enabled) || empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) && (!empty($user->entity))) {
 				$sql .= " WHERE u.entity IN (0,".$conf->entity.")";
 			} else {
 				$sql .= " WHERE u.entity IS NOT NULL"; // multicompany is on in transverse mode or user making fetch is on entity 0, so user is allowed to fetch anywhere into database
 			}
-		} else // The fetch was forced on an entity
-		{
-			if (!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
+		} else {// The fetch was forced on an entity
+			if (!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
 				$sql .= " WHERE u.entity IS NOT NULL"; // multicompany is on in transverse mode or user making fetch is on entity 0, so user is allowed to fetch anywhere into database
-			else $sql .= " WHERE u.entity IN (0, ".(($entity != '' && $entity >= 0) ? $entity : $conf->entity).")"; // search in entity provided in parameter
+			} else {
+				$sql .= " WHERE u.entity IN (0, ".(($entity != '' && $entity >= 0) ? $entity : $conf->entity).")"; // search in entity provided in parameter
+			}
 		}
 
-		if ($sid)    // permet une recherche du user par son SID ActiveDirectory ou Samba
-		{
+		if ($sid) {    // permet une recherche du user par son SID ActiveDirectory ou Samba
 			$sql .= " AND (u.ldap_sid = '".$this->db->escape($sid)."' OR u.login = '".$this->db->escape($login)."') LIMIT 1";
-		} elseif ($login)
-		{
+		} elseif ($login) {
 			$sql .= " AND u.login = '".$this->db->escape($login)."'";
-		} elseif ($email)
-		{
+		} elseif ($email) {
 			$sql .= " AND u.email = '".$this->db->escape($email)."'";
 		} else {
 			$sql .= " AND u.rowid = ".$id;
@@ -678,14 +701,14 @@ class User extends CommonObject
 		} else {
 			// On a demande suppression d'un droit sur la base d'un nom de module ou perms
 			// Where pour la liste des droits a supprimer
-			if (!empty($allmodule))
-			{
-				if ($allmodule == 'allmodules')
-				{
+			if (!empty($allmodule)) {
+				if ($allmodule == 'allmodules') {
 					$wherefordel = 'allmodules';
 				} else {
 					$wherefordel = "module='".$this->db->escape($allmodule)."'";
-					if (!empty($allperms))  $whereforadd .= " AND perms='".$this->db->escape($allperms)."'";
+					if (!empty($allperms)) {
+						$wherefordel .= " AND perms='".$this->db->escape($allperms)."'";
+					}
 				}
 			}
 		}
@@ -897,7 +920,7 @@ class User extends CommonObject
 					} else {
 						if (empty($this->rights->$module->$perms)) $this->nb_rights++;
 						// if we have already define a subperm like this $this->rights->$module->level1->level2 with llx_user_rights, we don't want override level1 because the level2 can be not define on user group
-						if (!is_object($this->rights->$module->$perms)) $this->rights->$module->$perms = 1;
+						if (!isset($this->rights->$module->$perms) || !is_object($this->rights->$module->$perms)) $this->rights->$module->$perms = 1;
 					}
 				}
 				$i++;
@@ -1122,25 +1145,19 @@ class User extends CommonObject
 		global $mysoc;
 
 		// Clean parameters
-
-		if (!empty($conf->global->MAIN_FIRST_TO_UPPER)) $this->lastname = ucwords($this->lastname);
-		if (!empty($conf->global->MAIN_ALL_TO_UPPER)) $this->lastname = strtoupper($this->lastname);
-		if (!empty($conf->global->MAIN_FIRST_TO_UPPER)) $this->firstname = ucwords($this->firstname);
-
+		$this->setUpperOrLowerCase();
 		$this->login = trim($this->login);
 		if (!isset($this->entity)) $this->entity = $conf->entity; // If not defined, we use default value
 
 		dol_syslog(get_class($this)."::create login=".$this->login.", user=".(is_object($user) ? $user->id : ''), LOG_DEBUG);
 
 		// Check parameters
-		if (!empty($conf->global->USER_MAIL_REQUIRED) && !isValidEMail($this->email))
-		{
+		if (!empty($conf->global->USER_MAIL_REQUIRED) && !isValidEMail($this->email)) {
 			$langs->load("errors");
 			$this->error = $langs->trans("ErrorBadEMail", $this->email);
 			return -1;
 		}
-		if (empty($this->login))
-		{
+		if (empty($this->login)) {
 			$langs->load("errors");
 			$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Login"));
 			return -1;
@@ -1274,7 +1291,10 @@ class User extends CommonObject
 		$this->country_id = $contact->country_id;
 		$this->employee = 0;
 
-		if (empty($login)) $login = strtolower(substr($contact->firstname, 0, 4)).strtolower(substr($contact->lastname, 0, 4));
+		if (empty($login)) {
+			include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+			$login = dol_buildlogin($contact->lastname, $contact->firstname);
+		}
 		$this->login = $login;
 
 		$this->db->begin();
@@ -1321,9 +1341,9 @@ class User extends CommonObject
 	 *  Create a user into database from a member object.
 	 *  If $member->fk_soc is set, it will be an external user.
 	 *
-	 *  @param	Adherent	$member		Object member source
-	 * 	@param	string		$login		Login to force
-	 *  @return int						<0 if KO, if OK, return id of created account
+	 *  @param	Adherent		$member		Object member source
+	 * 	@param	string			$login		Login to force
+	 *  @return int							<0 if KO, if OK, return id of created account
 	 */
 	public function create_from_member($member, $login = '')
 	{
@@ -1347,7 +1367,10 @@ class User extends CommonObject
 		$this->pass         = $member->pass;
 		$this->pass_crypted = $member->pass_indatabase_crypted;
 
-		if (empty($login)) $login = strtolower(substr($member->firstname, 0, 4)).strtolower(substr($member->lastname, 0, 4));
+		if (empty($login)) {
+			include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+			$login = dol_buildlogin($member->lastname, $member->firstname);
+		}
 		$this->login = $login;
 
 		$this->db->begin();
@@ -1414,18 +1437,17 @@ class User extends CommonObject
 		// phpcs:enable
 		global $conf;
 
+		$rd = array();
+		$num = 0;
 		$sql = "SELECT id FROM ".MAIN_DB_PREFIX."rights_def";
 		$sql .= " WHERE bydefault = 1";
 		$sql .= " AND entity = ".$conf->entity;
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $this->db->num_rows($resql);
 			$i = 0;
-			$rd = array();
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$row = $this->db->fetch_row($resql);
 				$rd[$i] = $row[0];
 				$i++;
@@ -1433,8 +1455,7 @@ class User extends CommonObject
 			$this->db->free($resql);
 		}
 		$i = 0;
-		while ($i < $num)
-		{
+		while ($i < $num) {
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."user_rights WHERE fk_user = $this->id AND fk_id=$rd[$i]";
 			$result = $this->db->query($sql);
 
@@ -1467,11 +1488,6 @@ class User extends CommonObject
 		dol_syslog(get_class($this)."::update notrigger=".$notrigger.", nosyncmember=".$nosyncmember.", nosyncmemberpass=".$nosyncmemberpass);
 
 		// Clean parameters
-
-		if (!empty($conf->global->MAIN_FIRST_TO_UPPER)) $this->lastname = ucwords($this->lastname);
-		if (!empty($conf->global->MAIN_ALL_TO_UPPER)) $this->lastname = strtoupper($this->lastname);
-		if (!empty($conf->global->MAIN_FIRST_TO_UPPER)) $this->firstname = ucwords($this->firstname);
-
 		$this->lastname     = trim($this->lastname);
 		$this->firstname    = trim($this->firstname);
 		$this->employee    	= $this->employee ? $this->employee : 0;
@@ -1479,9 +1495,10 @@ class User extends CommonObject
 		$this->gender       = trim($this->gender);
 		$this->pass         = trim($this->pass);
 		$this->api_key      = trim($this->api_key);
-		$this->address = $this->address ?trim($this->address) : trim($this->address);
-		$this->zip = $this->zip ?trim($this->zip) : trim($this->zip);
-		$this->town = $this->town ?trim($this->town) : trim($this->town);
+		$this->address = $this->address ? trim($this->address) : trim($this->address);
+		$this->zip = $this->zip ? trim($this->zip) : trim($this->zip);
+		$this->town = $this->town ? trim($this->town) : trim($this->town);
+		$this->setUpperOrLowerCase();
 		$this->state_id = trim($this->state_id);
 		$this->country_id = ($this->country_id > 0) ? $this->country_id : 0;
 		$this->office_phone = trim($this->office_phone);
@@ -2265,8 +2282,9 @@ class User extends CommonObject
 
 		// Info Login
 		$label .= '<div class="centpercent">';
-		$label .= img_picto('', $this->picto).' <u>'.$langs->trans("User").'</u><br>';
-		$label .= '<b>'.$langs->trans('Name').':</b> '.$this->getFullName($langs, '');
+		$label .= img_picto('', $this->picto).' <u class="paddingrightonly">'.$langs->trans("User").'</u>';
+		$label .= ' '.$this->getLibStatut(4);
+		$label .= '<br><b>'.$langs->trans('Name').':</b> '.$this->getFullName($langs, '');
 		if (!empty($this->login)) $label .= '<br><b>'.$langs->trans('Login').':</b> '.$this->login;
 		if (!empty($this->job)) $label .= '<br><b>'.$langs->trans("Job").':</b> '.$this->job;
 		$label .= '<br><b>'.$langs->trans("Email").':</b> '.$this->email;
@@ -2282,7 +2300,6 @@ class User extends CommonObject
 		}
 		$type = ($this->socid ? $langs->trans("External").$company : $langs->trans("Internal"));
 		$label .= '<br><b>'.$langs->trans("Type").':</b> '.$type;
-		$label .= '<br><b>'.$langs->trans("Status").'</b>: '.$this->getLibStatut(4);
 		$label .= '</div>';
 		if ($infologin > 0)
 		{
diff --git a/htdocs/user/class/userbankaccount.class.php b/htdocs/user/class/userbankaccount.class.php
index 25c751b4cb9..2fc43e929ec 100644
--- a/htdocs/user/class/userbankaccount.class.php
+++ b/htdocs/user/class/userbankaccount.class.php
@@ -45,183 +45,183 @@ class UserBankAccount extends Account
 	public $table_element = 'user_rib';
 
 
-    /**
-     * Date creation record (datec)
-     *
-     * @var integer
-     */
-    public $datec;
+	/**
+	 * Date creation record (datec)
+	 *
+	 * @var integer
+	 */
+	public $datec;
 
-    /**
-     * Date modification record (tms)
-     *
-     * @var integer
-     */
-    public $datem;
+	/**
+	 * Date modification record (tms)
+	 *
+	 * @var integer
+	 */
+	public $datem;
 
-    /**
-     * User id of bank account
-     *
-     * @var integer
-     */
-    public $userid;
+	/**
+	 * User id of bank account
+	 *
+	 * @var integer
+	 */
+	public $userid;
 
 
-    /**
-     *  Constructor
-     *
-     *  @param      DoliDB		$db      Database handler
-     */
-    public function __construct(DoliDB $db)
-    {
-        $this->db = $db;
+	/**
+	 *  Constructor
+	 *
+	 *  @param      DoliDB		$db      Database handler
+	 */
+	public function __construct(DoliDB $db)
+	{
+		$this->db = $db;
 
-        $this->userid = 0;
-        $this->solde = 0;
-        $this->error_number = 0;
-    }
+		$this->userid = 0;
+		$this->solde = 0;
+		$this->error_number = 0;
+	}
 
 
-    /**
-     * Create bank information record
-     *
-     * @param	User	$user		User
-     * @param	int		$notrigger	1=Disable triggers
-     * @return	int					<0 if KO, >= 0 if OK
-     */
-    public function create(User $user = null, $notrigger = 0)
-    {
-        $now = dol_now();
+	/**
+	 * Create bank information record
+	 *
+	 * @param	User	$user		User
+	 * @param	int		$notrigger	1=Disable triggers
+	 * @return	int					<0 if KO, >= 0 if OK
+	 */
+	public function create(User $user = null, $notrigger = 0)
+	{
+		$now = dol_now();
 
-        $sql = "INSERT INTO ".MAIN_DB_PREFIX."user_rib (fk_user, datec)";
-        $sql .= " VALUES (".$this->userid.", '".$this->db->idate($now)."')";
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            if ($this->db->affected_rows($resql))
-            {
-                $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."user_rib");
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."user_rib (fk_user, datec)";
+		$sql .= " VALUES (".$this->userid.", '".$this->db->idate($now)."')";
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			if ($this->db->affected_rows($resql))
+			{
+				$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."user_rib");
 
-                return $this->update($user);
-            }
-        } else {
-            print $this->db->error();
-            return 0;
-        }
-    }
+				return $this->update($user);
+			}
+		} else {
+			print $this->db->error();
+			return 0;
+		}
+	}
 
-    /**
-     *	Update bank account
-     *
-     *	@param	User	$user		Object user
-     *	@param	int		$notrigger	1=Disable triggers
-     *	@return	int					<=0 if KO, >0 if OK
-     */
-    public function update(User $user = null, $notrigger = 0)
-    {
-        global $conf;
+	/**
+	 *	Update bank account
+	 *
+	 *	@param	User	$user		Object user
+	 *	@param	int		$notrigger	1=Disable triggers
+	 *	@return	int					<=0 if KO, >0 if OK
+	 */
+	public function update(User $user = null, $notrigger = 0)
+	{
+		global $conf;
 
-        if (!$this->id)
-        {
-            $this->create();
-        }
+		if (!$this->id)
+		{
+			$this->create();
+		}
 
-        $sql = "UPDATE ".MAIN_DB_PREFIX."user_rib SET";
-        $sql .= " bank = '".$this->db->escape($this->bank)."'";
-        $sql .= ",code_banque='".$this->db->escape($this->code_banque)."'";
-        $sql .= ",code_guichet='".$this->db->escape($this->code_guichet)."'";
-        $sql .= ",number='".$this->db->escape($this->number)."'";
-        $sql .= ",cle_rib='".$this->db->escape($this->cle_rib)."'";
-        $sql .= ",bic='".$this->db->escape($this->bic)."'";
-        $sql .= ",iban_prefix = '".$this->db->escape($this->iban)."'";
-        $sql .= ",domiciliation='".$this->db->escape($this->domiciliation)."'";
-        $sql .= ",proprio = '".$this->db->escape($this->proprio)."'";
-        $sql .= ",owner_address = '".$this->db->escape($this->owner_address)."'";
+		$sql = "UPDATE ".MAIN_DB_PREFIX."user_rib SET";
+		$sql .= " bank = '".$this->db->escape($this->bank)."'";
+		$sql .= ",code_banque='".$this->db->escape($this->code_banque)."'";
+		$sql .= ",code_guichet='".$this->db->escape($this->code_guichet)."'";
+		$sql .= ",number='".$this->db->escape($this->number)."'";
+		$sql .= ",cle_rib='".$this->db->escape($this->cle_rib)."'";
+		$sql .= ",bic='".$this->db->escape($this->bic)."'";
+		$sql .= ",iban_prefix = '".$this->db->escape($this->iban)."'";
+		$sql .= ",domiciliation='".$this->db->escape($this->domiciliation)."'";
+		$sql .= ",proprio = '".$this->db->escape($this->proprio)."'";
+		$sql .= ",owner_address = '".$this->db->escape($this->owner_address)."'";
 
-        if (trim($this->label) != '')
-            $sql .= ",label = '".$this->db->escape($this->label)."'";
-        else $sql .= ",label = NULL";
-        $sql .= " WHERE rowid = ".$this->id;
+		if (trim($this->label) != '')
+			$sql .= ",label = '".$this->db->escape($this->label)."'";
+		else $sql .= ",label = NULL";
+		$sql .= " WHERE rowid = ".$this->id;
 
-        $result = $this->db->query($sql);
-        if ($result)
-        {
-            return 1;
-        } else {
-            dol_print_error($this->db);
-            return 0;
-        }
-    }
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+			return 1;
+		} else {
+			dol_print_error($this->db);
+			return 0;
+		}
+	}
 
-    /**
-     * 	Load record from database
-     *
-     *	@param	int		$id			Id of record
-     *	@param	string	$ref		Ref of record
-     *  @param  int     $userid     User id
-     * 	@return	int					<0 if KO, >0 if OK
-     */
-    public function fetch($id, $ref = '', $userid = 0)
-    {
-        if (empty($id) && empty($ref) && empty($userid)) return -1;
+	/**
+	 * 	Load record from database
+	 *
+	 *	@param	int		$id			Id of record
+	 *	@param	string	$ref		Ref of record
+	 *  @param  int     $userid     User id
+	 * 	@return	int					<0 if KO, >0 if OK
+	 */
+	public function fetch($id, $ref = '', $userid = 0)
+	{
+		if (empty($id) && empty($ref) && empty($userid)) return -1;
 
-        $sql = "SELECT rowid, fk_user, entity, bank, number, code_banque, code_guichet, cle_rib, bic, iban_prefix as iban, domiciliation, proprio,";
-        $sql .= " owner_address, label, datec, tms as datem";
-        $sql .= " FROM ".MAIN_DB_PREFIX."user_rib";
-        if ($id) $sql .= " WHERE rowid = ".$id;
-        if ($ref) $sql .= " WHERE label = '".$this->db->escape($ref)."'";
-        if ($userid) $sql .= " WHERE fk_user = ".((int) $userid);
+		$sql = "SELECT rowid, fk_user, entity, bank, number, code_banque, code_guichet, cle_rib, bic, iban_prefix as iban, domiciliation, proprio,";
+		$sql .= " owner_address, label, datec, tms as datem";
+		$sql .= " FROM ".MAIN_DB_PREFIX."user_rib";
+		if ($id) $sql .= " WHERE rowid = ".$id;
+		if ($ref) $sql .= " WHERE label = '".$this->db->escape($ref)."'";
+		if ($userid) $sql .= " WHERE fk_user = ".((int) $userid);
 
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            if ($this->db->num_rows($resql))
-            {
-                $obj = $this->db->fetch_object($resql);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			if ($this->db->num_rows($resql))
+			{
+				$obj = $this->db->fetch_object($resql);
 
-                $this->id = $obj->rowid;
-                $this->userid = $obj->fk_soc;
-                $this->bank = $obj->bank;
-                $this->code_banque = $obj->code_banque;
-                $this->code_guichet = $obj->code_guichet;
-                $this->number = $obj->number;
-                $this->cle_rib = $obj->cle_rib;
-                $this->bic = $obj->bic;
-                $this->iban = $obj->iban;
-                $this->domiciliation = $obj->domiciliation;
-                $this->proprio = $obj->proprio;
-                $this->owner_address = $obj->owner_address;
-                $this->label = $obj->label;
-                $this->datec = $this->db->jdate($obj->datec);
-                $this->datem = $this->db->jdate($obj->datem);
-            }
-            $this->db->free($resql);
+				$this->id = $obj->rowid;
+				$this->userid = $obj->fk_soc;
+				$this->bank = $obj->bank;
+				$this->code_banque = $obj->code_banque;
+				$this->code_guichet = $obj->code_guichet;
+				$this->number = $obj->number;
+				$this->cle_rib = $obj->cle_rib;
+				$this->bic = $obj->bic;
+				$this->iban = $obj->iban;
+				$this->domiciliation = $obj->domiciliation;
+				$this->proprio = $obj->proprio;
+				$this->owner_address = $obj->owner_address;
+				$this->label = $obj->label;
+				$this->datec = $this->db->jdate($obj->datec);
+				$this->datem = $this->db->jdate($obj->datem);
+			}
+			$this->db->free($resql);
 
-            return 1;
-        } else {
-            dol_print_error($this->db);
-            return -1;
-        }
-    }
+			return 1;
+		} else {
+			dol_print_error($this->db);
+			return -1;
+		}
+	}
 
-    /**
-     * Return RIB
-     *
-     * @param   boolean     $displayriblabel     Prepend or Hide Label
-     * @return  string      RIB
-     */
-    public function getRibLabel($displayriblabel = true)
-    {
-        $rib = '';
+	/**
+	 * Return RIB
+	 *
+	 * @param   boolean     $displayriblabel     Prepend or Hide Label
+	 * @return  string      RIB
+	 */
+	public function getRibLabel($displayriblabel = true)
+	{
+		$rib = '';
 
-        if ($this->code_banque || $this->code_guichet || $this->number || $this->cle_rib) {
-            if ($this->label && $displayriblabel) {
-                $rib = $this->label." : ";
-            }
+		if ($this->code_banque || $this->code_guichet || $this->number || $this->cle_rib) {
+			if ($this->label && $displayriblabel) {
+				$rib = $this->label." : ";
+			}
 
-            $rib .= (string) $this;
-        }
+			$rib .= (string) $this;
+		}
 
-        return $rib;
-    }
+		return $rib;
+	}
 }
diff --git a/htdocs/user/class/usergroup.class.php b/htdocs/user/class/usergroup.class.php
index 5b58bd06a41..2998658d7fc 100644
--- a/htdocs/user/class/usergroup.class.php
+++ b/htdocs/user/class/usergroup.class.php
@@ -77,18 +77,18 @@ class UserGroup extends CommonObject
 	public $globalgroup; // Global group
 
 	/**
-     * Date creation record (datec)
-     *
-     * @var integer
-     */
-    public $datec;
+	 * Date creation record (datec)
+	 *
+	 * @var integer
+	 */
+	public $datec;
 
 	/**
-     * Date modification record (tms)
-     *
-     * @var integer
-     */
-    public $datem;
+	 * Date modification record (tms)
+	 *
+	 * @var integer
+	 */
+	public $datem;
 
 	public $note; // Description
 
@@ -127,15 +127,15 @@ class UserGroup extends CommonObject
 
 
 	/**
-     *    Constructor de la classe
-     *
-     *    @param   DoliDb  $db     Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-        $this->nb_rights = 0;
-    }
+	 *    Constructor de la classe
+	 *
+	 *    @param   DoliDb  $db     Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+		$this->nb_rights = 0;
+	}
 
 
 	/**
@@ -158,7 +158,7 @@ class UserGroup extends CommonObject
 			$result = $this->fetchCommon($id);
 		}
 
-		$this->name = $this->nom;	// For compatibility with field name
+		$this->name = $this->nom; // For compatibility with field name
 
 		if ($result)
 		{
@@ -386,10 +386,10 @@ class UserGroup extends CommonObject
 				$langs->load("other");
 				$this->context = array('audit'=>$langs->trans("PermissionsAdd").($rid ? ' (id='.$rid.')' : ''));
 
-			    // Call trigger
-			    $result = $this->call_trigger('USERGROUP_MODIFY', $user);
-			    if ($result < 0) { $error++; }
-			    // End call triggers
+				// Call trigger
+				$result = $this->call_trigger('USERGROUP_MODIFY', $user);
+				if ($result < 0) { $error++; }
+				// End call triggers
 			}
 		}
 
@@ -504,10 +504,10 @@ class UserGroup extends CommonObject
 				$langs->load("other");
 				$this->context = array('audit'=>$langs->trans("PermissionsDelete").($rid ? ' (id='.$rid.')' : ''));
 
-			    // Call trigger
-			    $result = $this->call_trigger('USERGROUP_MODIFY', $user);
-			    if ($result < 0) { $error++; }
-			    // End call triggers
+				// Call trigger
+				$result = $this->call_trigger('USERGROUP_MODIFY', $user);
+				if ($result < 0) { $error++; }
+				// End call triggers
 			}
 		}
 
@@ -596,10 +596,10 @@ class UserGroup extends CommonObject
 			$this->all_permissions_are_loaded = 1;
 		} else {
 			// If module defined, we flag it as loaded into cache
-		    $this->_tab_loaded[$moduletag] = 1;
+			$this->_tab_loaded[$moduletag] = 1;
 		}
 
-        return 1;
+		return 1;
 	}
 
 	/**
@@ -659,10 +659,10 @@ class UserGroup extends CommonObject
 	 */
 	public function getLibStatut($mode = 0)
 	{
-	    return $this->LibStatut(0, $mode);
+		return $this->LibStatut(0, $mode);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Renvoi le libelle d'un statut donne
 	 *
@@ -672,10 +672,10 @@ class UserGroup extends CommonObject
 	 */
 	public function LibStatut($status, $mode = 0)
 	{
-        // phpcs:enable
-	    global $langs;
-	    $langs->load('users');
-	    return '';
+		// phpcs:enable
+		global $langs;
+		$langs->load('users');
+		return '';
 	}
 
 	/**
@@ -765,9 +765,9 @@ class UserGroup extends CommonObject
 	 *									2=Return key only (uid=qqq)
 	 *	@return		string				DN
 	 */
-    public function _load_ldap_dn($info, $mode = 0)
+	public function _load_ldap_dn($info, $mode = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 		$dn = '';
 		if ($mode == 0) $dn = $conf->global->LDAP_KEY_GROUPS."=".$info[$conf->global->LDAP_KEY_GROUPS].",".$conf->global->LDAP_GROUP_DN;
@@ -784,9 +784,9 @@ class UserGroup extends CommonObject
 	 *
 	 *	@return		array		Tableau info des attributs
 	 */
-    public function _load_ldap_info()
+	public function _load_ldap_info()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 		$info = array();
@@ -809,22 +809,22 @@ class UserGroup extends CommonObject
 				$valueofldapfield[] = $muser->_load_ldap_dn($info2);
 			}
 			$info[$conf->global->LDAP_GROUP_FIELD_GROUPMEMBERS] = (!empty($valueofldapfield) ? $valueofldapfield : '');
-        }
-        if (!empty($info[$conf->global->LDAP_GROUP_FIELD_GROUPID])) {
-            $info[$conf->global->LDAP_GROUP_FIELD_GROUPID] = $this->id;
-        }
+		}
+		if (!empty($info[$conf->global->LDAP_GROUP_FIELD_GROUPID])) {
+			$info[$conf->global->LDAP_GROUP_FIELD_GROUPID] = $this->id;
+		}
 		return $info;
 	}
 
 
 	/**
-     *  Initialise an instance with random values.
-     *  Used to build previews or test instances.
-     *	id must be 0 if object instance is a specimen.
-     *
-     *  @return	void
-     */
-    public function initAsSpecimen()
+	 *  Initialise an instance with random values.
+	 *  Used to build previews or test instances.
+	 *	id must be 0 if object instance is a specimen.
+	 *
+	 *  @return	void
+	 */
+	public function initAsSpecimen()
 	{
 		global $conf, $user, $langs;
 
@@ -838,11 +838,11 @@ class UserGroup extends CommonObject
 		$this->datec = time();
 		$this->datem = time();
 
-        // Members of this group is just me
-        $this->members = array(
-            $user->id => $user
-        );
-    }
+		// Members of this group is just me
+		$this->members = array(
+			$user->id => $user
+		);
+	}
 
 	/**
 	 *  Create a document onto disk according to template module.
@@ -852,7 +852,7 @@ class UserGroup extends CommonObject
 	 *  @param      int			$hidedetails    Hide details of lines
 	 *  @param      int			$hidedesc       Hide description
 	 *  @param      int			$hideref        Hide ref
-     *  @param      null|array  $moreparams     Array to provide more information
+	 *  @param      null|array  $moreparams     Array to provide more information
 	 * 	@return     int         				0 if KO, 1 if OK
 	 */
 	public function generateDocument($modele, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0, $moreparams = null)
diff --git a/htdocs/user/clicktodial.php b/htdocs/user/clicktodial.php
index 8e4dcfeed17..339cb794c12 100644
--- a/htdocs/user/clicktodial.php
+++ b/htdocs/user/clicktodial.php
@@ -50,21 +50,21 @@ $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
 if (empty($reshook)) {
-    if ($action == 'update' && !GETPOST('cancel', 'alpha')) {
-        $edituser = new User($db);
-        $edituser->fetch($id);
+	if ($action == 'update' && !GETPOST('cancel', 'alpha')) {
+		$edituser = new User($db);
+		$edituser->fetch($id);
 
-        $edituser->clicktodial_url = GETPOST("url");
-        $edituser->clicktodial_login = GETPOST("login");
-        $edituser->clicktodial_password = GETPOST("password");
-        $edituser->clicktodial_poste = GETPOST("poste");
+		$edituser->clicktodial_url = GETPOST("url");
+		$edituser->clicktodial_login = GETPOST("login");
+		$edituser->clicktodial_password = GETPOST("password");
+		$edituser->clicktodial_poste = GETPOST("poste");
 
-        $result = $edituser->update_clicktodial();
-        if ($result < 0)
-        {
-            setEventMessages($edituser->error, $edituser->errors, 'errors');
-        }
-    }
+		$result = $edituser->update_clicktodial();
+		if ($result < 0)
+		{
+			setEventMessages($edituser->error, $edituser->errors, 'errors');
+		}
+	}
 }
 
 
@@ -79,10 +79,10 @@ llxHeader("", "ClickToDial");
 
 if ($id > 0)
 {
-    $object = new User($db);
-    $object->fetch($id, '', '', 1);
-    $object->getrights();
-    $object->fetch_clicktodial();
+	$object = new User($db);
+	$object->fetch($id, '', '', 1);
+	$object->getrights();
+	$object->fetch_clicktodial();
 
 
 	$head = user_prepare_head($object);
@@ -102,109 +102,109 @@ if ($id > 0)
 		$linkback = '<a href="'.DOL_URL_ROOT.'/user/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 	}
 
-    dol_banner_tab($object, 'id', $linkback, $user->rights->user->user->lire || $user->admin);
+	dol_banner_tab($object, 'id', $linkback, $user->rights->user->user->lire || $user->admin);
 
-    print '<div class="fichecenter">';
-    print '<div class="underbanner clearboth"></div>';
+	print '<div class="fichecenter">';
+	print '<div class="underbanner clearboth"></div>';
 
-    // Edit mode
-    if ($action == 'edit')
-    {
-        print '<table class="border centpercent">';
+	// Edit mode
+	if ($action == 'edit')
+	{
+		print '<table class="border centpercent">';
 
-        if ($user->admin)
-        {
-            print '<tr><td class="titlefield fieldrequired">ClickToDial URL</td>';
-            print '<td class="valeur">';
-            print '<input name="url" value="'.(!empty($object->clicktodial_url) ? $object->clicktodial_url : '').'" size="92">';
-            if (empty($conf->global->CLICKTODIAL_URL) && empty($object->clicktodial_url))
-            {
-                $langs->load("errors");
-                print '<font class="error">'.$langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("ClickToDial")).'</font>';
-            } else {
-                print ' &nbsp; &nbsp; '.$form->textwithpicto($langs->trans("KeepEmptyToUseDefault").': '.$conf->global->CLICKTODIAL_URL, $langs->trans("ClickToDialUrlDesc"));
-            }
-            print '</td>';
-            print '</tr>';
-        }
+		if ($user->admin)
+		{
+			print '<tr><td class="titlefield fieldrequired">ClickToDial URL</td>';
+			print '<td class="valeur">';
+			print '<input name="url" value="'.(!empty($object->clicktodial_url) ? $object->clicktodial_url : '').'" size="92">';
+			if (empty($conf->global->CLICKTODIAL_URL) && empty($object->clicktodial_url))
+			{
+				$langs->load("errors");
+				print '<font class="error">'.$langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("ClickToDial")).'</font>';
+			} else {
+				print ' &nbsp; &nbsp; '.$form->textwithpicto($langs->trans("KeepEmptyToUseDefault").': '.$conf->global->CLICKTODIAL_URL, $langs->trans("ClickToDialUrlDesc"));
+			}
+			print '</td>';
+			print '</tr>';
+		}
 
-        print '<tr><td class="titlefield fieldrequired">ClickToDial '.$langs->trans("IdPhoneCaller").'</td>';
-        print '<td class="valeur">';
-        print '<input name="poste" value="'.(!empty($object->clicktodial_poste) ? $object->clicktodial_poste : '').'"></td>';
-        print "</tr>\n";
+		print '<tr><td class="titlefield fieldrequired">ClickToDial '.$langs->trans("IdPhoneCaller").'</td>';
+		print '<td class="valeur">';
+		print '<input name="poste" value="'.(!empty($object->clicktodial_poste) ? $object->clicktodial_poste : '').'"></td>';
+		print "</tr>\n";
 
-        print '<tr><td>ClickToDial '.$langs->trans("Login").'</td>';
-        print '<td class="valeur">';
-        print '<input name="login" value="'.(!empty($object->clicktodial_login) ? $object->clicktodial_login : '').'"></td>';
-        print '</tr>';
+		print '<tr><td>ClickToDial '.$langs->trans("Login").'</td>';
+		print '<td class="valeur">';
+		print '<input name="login" value="'.(!empty($object->clicktodial_login) ? $object->clicktodial_login : '').'"></td>';
+		print '</tr>';
 
-        print '<tr><td>ClickToDial '.$langs->trans("Password").'</td>';
-        print '<td class="valeur">';
-        print '<input type="password" name="password" value="'.(!empty($object->clicktodial_password) ? $object->clicktodial_password : '').'"></td>';
-        print "</tr>\n";
+		print '<tr><td>ClickToDial '.$langs->trans("Password").'</td>';
+		print '<td class="valeur">';
+		print '<input type="password" name="password" value="'.(!empty($object->clicktodial_password) ? $object->clicktodial_password : '').'"></td>';
+		print "</tr>\n";
 
-        print '</table>';
-    } else // View mode
-    {
-        print '<table class="border centpercent tableforfield">';
+		print '</table>';
+	} else // View mode
+	{
+		print '<table class="border centpercent tableforfield">';
 
-        if (!empty($user->admin))
-        {
-        	print '<tr><td class="titlefield">ClickToDial URL</td>';
-        	print '<td class="valeur">';
-        	$url = $conf->global->CLICKTODIAL_URL;
-        	if (!empty($object->clicktodial_url)) $url = $object->clicktodial_url;
-        	if (empty($url))
-        	{
-        	    $langs->load("errors");
-        	    print '<font class="error">'.$langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("ClickToDial")).'</font>';
-        	} else {
-        		print $form->textwithpicto((empty($object->clicktodial_url) ? '<span class="opacitymedium">'.$langs->trans("DefaultLink").':</span> ' : '').$url, $langs->trans("ClickToDialUrlDesc"));
-        	}
-        	print '</td>';
-        	print '</tr>';
-        }
+		if (!empty($user->admin))
+		{
+			print '<tr><td class="titlefield">ClickToDial URL</td>';
+			print '<td class="valeur">';
+			$url = $conf->global->CLICKTODIAL_URL;
+			if (!empty($object->clicktodial_url)) $url = $object->clicktodial_url;
+			if (empty($url))
+			{
+				$langs->load("errors");
+				print '<font class="error">'.$langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("ClickToDial")).'</font>';
+			} else {
+				print $form->textwithpicto((empty($object->clicktodial_url) ? '<span class="opacitymedium">'.$langs->trans("DefaultLink").':</span> ' : '').$url, $langs->trans("ClickToDialUrlDesc"));
+			}
+			print '</td>';
+			print '</tr>';
+		}
 
-        print '<tr><td class="titlefield">ClickToDial '.$langs->trans("IdPhoneCaller").'</td>';
-        print '<td class="valeur">'.(!empty($object->clicktodial_poste) ? $object->clicktodial_poste : '').'</td>';
-        print "</tr>";
+		print '<tr><td class="titlefield">ClickToDial '.$langs->trans("IdPhoneCaller").'</td>';
+		print '<td class="valeur">'.(!empty($object->clicktodial_poste) ? $object->clicktodial_poste : '').'</td>';
+		print "</tr>";
 
-        print '<tr><td>ClickToDial '.$langs->trans("Login").'</td>';
-        print '<td class="valeur">'.(!empty($object->clicktodial_login) ? $object->clicktodial_login : '').'</td>';
-        print '</tr>';
+		print '<tr><td>ClickToDial '.$langs->trans("Login").'</td>';
+		print '<td class="valeur">'.(!empty($object->clicktodial_login) ? $object->clicktodial_login : '').'</td>';
+		print '</tr>';
 
-        print '<tr><td>ClickToDial '.$langs->trans("Password").'</td>';
-        print '<td class="valeur">'.preg_replace('/./', '*', (!empty($object->clicktodial_password) ? $object->clicktodial_password : '')).'</a></td>';
-        print "</tr>\n";
+		print '<tr><td>ClickToDial '.$langs->trans("Password").'</td>';
+		print '<td class="valeur">'.preg_replace('/./', '*', (!empty($object->clicktodial_password) ? $object->clicktodial_password : '')).'</a></td>';
+		print "</tr>\n";
 
-        print "</table>\n";
-    }
+		print "</table>\n";
+	}
 
-    dol_fiche_end();
+	print dol_get_fiche_end();
 
-    if ($action == 'edit')
-    {
-    	print '<br>';
-        print '<div class="center"><input class="button" type="submit" value="'.$langs->trans("Save").'">';
-        print '&nbsp;&nbsp;&nbsp;&nbsp&nbsp;';
-        print '<input class="button" type="submit" name="cancel" value="'.$langs->trans("Cancel").'">';
-        print '</div>';
-    }
+	if ($action == 'edit')
+	{
+		print '<br>';
+		print '<div class="center"><input class="button" type="submit" value="'.$langs->trans("Save").'">';
+		print '&nbsp;&nbsp;&nbsp;&nbsp&nbsp;';
+		print '<input class="button" type="submit" name="cancel" value="'.$langs->trans("Cancel").'">';
+		print '</div>';
+	}
 
-    print '</div>';
-    print '</form>';
+	print '</div>';
+	print '</form>';
 
-    /*
+	/*
      * Barre d'actions
      */
-    print '<div class="tabsAction">';
+	print '<div class="tabsAction">';
 
-    if (!empty($user->admin) && $action <> 'edit')
-    {
-        print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a>';
-    }
+	if (!empty($user->admin) && $action <> 'edit')
+	{
+		print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a>';
+	}
 
-    print "</div>\n";
+	print "</div>\n";
 }
 
 // End of page
diff --git a/htdocs/user/document.php b/htdocs/user/document.php
index 7cedd43320a..950742305fb 100644
--- a/htdocs/user/document.php
+++ b/htdocs/user/document.php
@@ -49,17 +49,17 @@ $canreadgroup = $canreaduser;
 $caneditgroup = $canedituser;
 if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS))
 {
-    $canreadgroup = (!empty($user->admin) || $user->rights->user->group_advance->read);
-    $caneditgroup = (!empty($user->admin) || $user->rights->user->group_advance->write);
+	$canreadgroup = (!empty($user->admin) || $user->rights->user->group_advance->read);
+	$caneditgroup = (!empty($user->admin) || $user->rights->user->group_advance->write);
 }
 // Define value to know what current user can do on properties of edited user
 if ($id)
 {
-    // $user est le user qui edite, $id est l'id de l'utilisateur edite
-    $caneditfield = ((($user->id == $id) && $user->rights->user->self->creer)
-    || (($user->id != $id) && $user->rights->user->user->creer));
-    $caneditpassword = ((($user->id == $id) && $user->rights->user->self->password)
-    || (($user->id != $id) && $user->rights->user->user->password));
+	// $user est le user qui edite, $id est l'id de l'utilisateur edite
+	$caneditfield = ((($user->id == $id) && $user->rights->user->self->creer)
+	|| (($user->id != $id) && $user->rights->user->user->creer));
+	$caneditpassword = ((($user->id == $id) && $user->rights->user->self->password)
+	|| (($user->id != $id) && $user->rights->user->user->password));
 }
 
 // Security check
@@ -135,10 +135,10 @@ if ($object->id)
 		$linkback = '<a href="'.DOL_URL_ROOT.'/user/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 	}
 
-    dol_banner_tab($object, 'id', $linkback, $user->rights->user->user->lire || $user->admin);
+	dol_banner_tab($object, 'id', $linkback, $user->rights->user->user->lire || $user->admin);
 
-    print '<div class="fichecenter">';
-    print '<div class="underbanner clearboth"></div>';
+	print '<div class="fichecenter">';
+	print '<div class="underbanner clearboth"></div>';
 
 	// Build file list
 	$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
@@ -151,8 +151,8 @@ if ($object->id)
 
 	print '<table class="border tableforfield centpercent">';
 
-    // Login
-    print '<tr><td class="titlefield">'.$langs->trans("Login").'</td><td class="valeur">'.$object->login.'&nbsp;</td></tr>';
+	// Login
+	print '<tr><td class="titlefield">'.$langs->trans("Login").'</td><td class="valeur">'.$object->login.'&nbsp;</td></tr>';
 
 	// Nbre files
 	print '<tr><td>'.$langs->trans("NbOfAttachedFiles").'</td><td>'.count($filearray).'</td></tr>';
@@ -161,9 +161,9 @@ if ($object->id)
 	print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td>'.dol_print_size($totalsize, 1, 1).'</td></tr>';
 
 	print '</table>';
-    print '</div>';
+	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 
 	$modulepart = 'user';
diff --git a/htdocs/user/group/card.php b/htdocs/user/group/card.php
index 3a7abd5364b..068d218c797 100644
--- a/htdocs/user/group/card.php
+++ b/htdocs/user/group/card.php
@@ -40,10 +40,10 @@ $feature2 = 'user';
 // Advanced permissions
 if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS))
 {
-    $canreadperms = ($user->admin || $user->rights->user->group_advance->read);
-    $caneditperms = ($user->admin || $user->rights->user->group_advance->write);
-    $candisableperms = ($user->admin || $user->rights->user->group_advance->delete);
-    $feature2 = 'group_advance';
+	$canreadperms = ($user->admin || $user->rights->user->group_advance->read);
+	$caneditperms = ($user->admin || $user->rights->user->group_advance->write);
+	$candisableperms = ($user->admin || $user->rights->user->group_advance->delete);
+	$feature2 = 'group_advance';
 }
 
 // Load translation files required by page
@@ -64,7 +64,7 @@ $result = restrictedArea($user, 'user', $id, 'usergroup&usergroup', $feature2);
 // Users/Groups management only in master entity if transverse mode
 if (!empty($conf->multicompany->enabled) && $conf->entity > 1 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE)
 {
-    accessforbidden();
+	accessforbidden();
 }
 
 $object = new Usergroup($db);
@@ -125,7 +125,7 @@ if (empty($reshook)) {
 	{
 		if ($caneditperms)
 		{
-			if (! GETPOST("nom", "nohtml")) {
+			if (!GETPOST("nom", "nohtml")) {
 				setEventMessages($langs->trans("NameNotDefined"), null, 'errors');
 				$action = "create"; // Go back to create page
 			} else {
@@ -249,18 +249,18 @@ $formfile = new FormFile($db);
 
 if ($action == 'create')
 {
-    print load_fiche_titre($langs->trans("NewGroup"), '', 'object_group');
+	print load_fiche_titre($langs->trans("NewGroup"), '', 'object_group');
 
-    print dol_set_focus('#nom');
+	print dol_set_focus('#nom');
 
-    print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    print '<input type="hidden" name="action" value="add">';
+	print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="action" value="add">';
 	print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
 
-    print dol_get_fiche_head('', '', '', 0, '');
+	print dol_get_fiche_head('', '', '', 0, '');
 
-    print '<table class="border centpercent tableforfieldcreate">';
+	print '<table class="border centpercent tableforfieldcreate">';
 
 	// Multicompany
 	if (!empty($conf->multicompany->enabled) && is_object($mc))
@@ -283,15 +283,15 @@ if ($action == 'create')
 
 	print "</table>\n";
 
-    dol_fiche_end();
+	print dol_get_fiche_end();
 
-    print '<div class="center">';
-    print '<input class="button" name="add" value="'.$langs->trans("CreateGroup").'" type="submit">';
-    print ' &nbsp; ';
-    print '<input class="button" value="'.$langs->trans("Cancel").'" name="cancel" type="submit">';
-    print '</div>';
+	print '<div class="center">';
+	print '<input class="button" name="add" value="'.$langs->trans("CreateGroup").'" type="submit">';
+	print ' &nbsp; ';
+	print '<input class="button" value="'.$langs->trans("Cancel").'" name="cancel" type="submit">';
+	print '</div>';
 
-    print "</form>";
+	print "</form>";
 }
 
 
@@ -301,12 +301,12 @@ if ($action == 'create')
 /*                                                                            */
 /* ************************************************************************** */
 else {
-    if ($id)
-    {
+	if ($id)
+	{
 		$res = $object->fetch_optionals();
 
-        $head = group_prepare_head($object);
-        $title = $langs->trans("Group");
+		$head = group_prepare_head($object);
+		$title = $langs->trans("Group");
 
 		/*
 		 * Confirmation suppression
@@ -334,17 +334,17 @@ else {
 
 			print '<table class="border centpercent tableforfield">';
 
-            // Name (already in dol_banner, we keep it to have the GlobalGroup picto, but we should move it in dol_banner)
-            if (!empty($conf->mutlicompany->enabled))
-            {
-    			print '<tr><td class="titlefield">'.$langs->trans("Name").'</td>';
-    			print '<td class="valeur">'.dol_escape_htmltag($object->name);
-    			if (empty($object->entity))
-    			{
-    				print img_picto($langs->trans("GlobalGroup"), 'redstar');
-    			}
-    			print "</td></tr>\n";
-            }
+			// Name (already in dol_banner, we keep it to have the GlobalGroup picto, but we should move it in dol_banner)
+			if (!empty($conf->mutlicompany->enabled))
+			{
+				print '<tr><td class="titlefield">'.$langs->trans("Name").'</td>';
+				print '<td class="valeur">'.dol_escape_htmltag($object->name);
+				if (empty($object->entity))
+				{
+					print img_picto($langs->trans("GlobalGroup"), 'redstar');
+				}
+				print "</td></tr>\n";
+			}
 
 			// Multicompany
 			if (!empty($conf->multicompany->enabled) && is_object($mc) && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && $conf->entity == 1 && $user->admin && !$user->entity)
@@ -370,7 +370,7 @@ else {
 
 			print '<div class="clearboth"></div>';
 
-			dol_fiche_end();
+			print dol_get_fiche_end();
 
 
 			/*
@@ -395,12 +395,12 @@ else {
 
 			print "</div>\n";
 
-            // List users in group
+			// List users in group
 
-            print load_fiche_titre($langs->trans("ListOfUsersInGroup"), '', 'user');
+			print load_fiche_titre($langs->trans("ListOfUsersInGroup"), '', 'user');
 
-            // On selectionne les users qui ne sont pas deja dans le groupe
-            $exclude = array();
+			// On selectionne les users qui ne sont pas deja dans le groupe
+			$exclude = array();
 
 			if (!empty($object->members))
 			{
@@ -455,10 +455,10 @@ else {
 						print '<td>';
 						print $useringroup->getNomUrl(-1, '', 0, 0, 24, 0, 'login');
 						if ($useringroup->admin && !$useringroup->entity) {
-                            print img_picto($langs->trans("SuperAdministrator"), 'redstar');
-                        } elseif ($useringroup->admin) {
-                            print img_picto($langs->trans("Administrator"), 'star');
-                        }
+							print img_picto($langs->trans("SuperAdministrator"), 'redstar');
+						} elseif ($useringroup->admin) {
+							print img_picto($langs->trans("Administrator"), 'star');
+						}
 						print '</td>';
 						print '<td>'.$useringroup->lastname.'</td>';
 						print '<td>'.$useringroup->firstname.'</td>';
@@ -487,41 +487,41 @@ else {
 	         * Documents generes
 	         */
 
-	        $filename = dol_sanitizeFileName($object->ref);
-	        $filedir = $conf->usergroup->dir_output."/".dol_sanitizeFileName($object->ref);
-	        $urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
-	        $genallowed = $user->rights->user->user->creer;
-	        $delallowed = $user->rights->user->user->supprimer;
+			$filename = dol_sanitizeFileName($object->ref);
+			$filedir = $conf->usergroup->dir_output."/".dol_sanitizeFileName($object->ref);
+			$urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
+			$genallowed = $user->rights->user->user->creer;
+			$delallowed = $user->rights->user->user->supprimer;
 
-	        $somethingshown = $formfile->showdocuments('usergroup', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 1, 0, 0, 28, 0, '', 0, '', $soc->default_lang);
+			$somethingshown = $formfile->showdocuments('usergroup', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 1, 0, 0, 28, 0, '', 0, '', $soc->default_lang);
 
-	        // Show links to link elements
-	        $linktoelem = $form->showLinkToObjectBlock($object, null, null);
-	        $somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
+			// Show links to link elements
+			$linktoelem = $form->showLinkToObjectBlock($object, null, null);
+			$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
 
-	        print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+			print '</div><div class="fichehalfright"><div class="ficheaddleft">';
 
 			// List of actions on element
 			/*include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';
 			$formactions = new FormActions($db);
 			$somethingshown = $formactions->showactions($object, 'usergroup', $socid, 1);*/
 
-	        print '</div></div></div>';
-        }
+			print '</div></div></div>';
+		}
 
-        /*
+		/*
          * Fiche en mode edition
          */
 
-        if ($action == 'edit' && $caneditperms)
-        {
-            print '<form action="'.$_SERVER['PHP_SELF'].'" method="post" name="updategroup" enctype="multipart/form-data">';
-            print '<input type="hidden" name="token" value="'.newToken().'">';
-            print '<input type="hidden" name="action" value="update">';
+		if ($action == 'edit' && $caneditperms)
+		{
+			print '<form action="'.$_SERVER['PHP_SELF'].'" method="post" name="updategroup" enctype="multipart/form-data">';
+			print '<input type="hidden" name="token" value="'.newToken().'">';
+			print '<input type="hidden" name="action" value="update">';
 			print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
 			print '<input type="hidden" name="id" value="'.$object->id.'">';
 
-            print dol_get_fiche_head($head, 'group', $title, 0, 'group');
+			print dol_get_fiche_head($head, 'group', $title, 0, 'group');
 
 			print '<table class="border centpercent tableforfieldedit">'."\n";
 
@@ -546,15 +546,15 @@ else {
 
 			print '</table>';
 
-            dol_fiche_end();
+			print dol_get_fiche_end();
 
 			print '<div class="center"><input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
 			print ' &nbsp; <input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
 			print '</div>';
 
-            print '</form>';
-        }
-    }
+			print '</form>';
+		}
+	}
 }
 
 // End of page
diff --git a/htdocs/user/group/ldap.php b/htdocs/user/group/ldap.php
index accfde675eb..c17512b6169 100644
--- a/htdocs/user/group/ldap.php
+++ b/htdocs/user/group/ldap.php
@@ -113,13 +113,13 @@ print '<table class="border centpercent">';
 // Name (already in dol_banner, we keep it to have the GlobalGroup picto, but we should move it in dol_banner)
 if (!empty($conf->mutlicompany->enabled))
 {
-    print '<tr><td class="titlefield">'.$langs->trans("Name").'</td>';
-    print '<td class="valeur">'.$object->name;
-    if (!$object->entity)
-    {
-    	print img_picto($langs->trans("GlobalGroup"), 'redstar');
-    }
-    print "</td></tr>\n";
+	print '<tr><td class="titlefield">'.$langs->trans("Name").'</td>';
+	print '<td class="valeur">'.$object->name;
+	if (!$object->entity)
+	{
+		print img_picto($langs->trans("GlobalGroup"), 'redstar');
+	}
+	print "</td></tr>\n";
 }
 
 // Note
@@ -144,7 +144,7 @@ print "</table>\n";
 
 print '</div>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 /*
@@ -188,7 +188,7 @@ if ($result > 0)
 	//var_dump($records);
 
 	// Show tree
-    if (((!is_numeric($records)) || $records != 0) && (!isset($records['count']) || $records['count'] > 0))
+	if (((!is_numeric($records)) || $records != 0) && (!isset($records['count']) || $records['count'] > 0))
 	{
 		if (!is_array($records))
 		{
diff --git a/htdocs/user/group/list.php b/htdocs/user/group/list.php
index 0b6cdf23d47..3fce8718287 100644
--- a/htdocs/user/group/list.php
+++ b/htdocs/user/group/list.php
@@ -70,8 +70,8 @@ if (!$sortorder) $sortorder = "ASC";
 
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array(
-    'g.nom'=>"Group",
-    'g.note'=>"Note"
+	'g.nom'=>"Group",
+	'g.note'=>"Note"
 );
 
 
@@ -88,17 +88,17 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 
 if (empty($reshook))
 {
-    // Selection of new fields
-    include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
+	// Selection of new fields
+	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
-    // Purge search criteria
-    if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All test are required to be compatible with all browsers
-    {
-        $search_label = "";
-        $search_date_creation = "";
-        $search_date_update = "";
-        $search_array_options = array();
-    }
+	// Purge search criteria
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All test are required to be compatible with all browsers
+	{
+		$search_label = "";
+		$search_date_creation = "";
+		$search_date_update = "";
+		$search_array_options = array();
+	}
 }
 
 
@@ -127,100 +127,100 @@ $sql .= $db->order($sortfield, $sortorder);
 $resql = $db->query($sql);
 if ($resql)
 {
-    $num = $db->num_rows($resql);
+	$num = $db->num_rows($resql);
 
-    $nbtotalofrecords = $num;
+	$nbtotalofrecords = $num;
 
-    $i = 0;
+	$i = 0;
 
-    $param = "&amp;search_group=".urlencode($search_group)."&amp;sall=".urlencode($sall);
-    if ($optioncss != '') $param .= '&amp;optioncss='.$optioncss;
+	$param = "&amp;search_group=".urlencode($search_group)."&amp;sall=".urlencode($sall);
+	if ($optioncss != '') $param .= '&amp;optioncss='.$optioncss;
 
-    $text = $langs->trans("ListOfGroups");
+	$text = $langs->trans("ListOfGroups");
 
-    $newcardbutton = '';
-    if ($caneditperms)
-    {
-        $newcardbutton .= dolGetButtonTitle($langs->trans('NewGroup'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/user/group/card.php?action=create&leftmenu=');
-    }
+	$newcardbutton = '';
+	if ($caneditperms)
+	{
+		$newcardbutton .= dolGetButtonTitle($langs->trans('NewGroup'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/user/group/card.php?action=create&leftmenu=');
+	}
 
-    print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">'."\n";
-    if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
-    print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
-    print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-    print '<input type="hidden" name="mode" value="'.$mode.'">';
-    print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
+	print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">'."\n";
+	if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
+	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+	print '<input type="hidden" name="mode" value="'.$mode.'">';
+	print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
-    print_barre_liste($text, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, "", $num, $nbtotalofrecords, 'object_group', 0, $newcardbutton, '', $limit, 0, 0, 1);
+	print_barre_liste($text, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, "", $num, $nbtotalofrecords, 'object_group', 0, $newcardbutton, '', $limit, 0, 0, 1);
 
-    if ($sall)
-    {
-        foreach ($fieldstosearchall as $key => $val) $fieldstosearchall[$key] = $langs->trans($val);
-        print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall).join(', ', $fieldstosearchall).'</div>';
-    }
+	if ($sall)
+	{
+		foreach ($fieldstosearchall as $key => $val) $fieldstosearchall[$key] = $langs->trans($val);
+		print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall).join(', ', $fieldstosearchall).'</div>';
+	}
 
-    $moreforfilter = '';
+	$moreforfilter = '';
 
 	//$varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
 	//$selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);	// This also change content of $arrayfields
 
-    print '<div class="div-table-responsive">';
-    print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
+	print '<div class="div-table-responsive">';
+	print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
-    print '<tr class="liste_titre">';
-    print_liste_field_titre("Group", $_SERVER["PHP_SELF"], "g.nom", $param, "", "", $sortfield, $sortorder);
-    //multicompany
-    if (!empty($conf->multicompany->enabled) && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && $conf->entity == 1)
-    {
-    	print_liste_field_titre("Entity", $_SERVER["PHP_SELF"], "g.entity", $param, "", '', $sortfield, $sortorder, 'center ');
-    }
-    print_liste_field_titre("NbOfUsers", $_SERVER["PHP_SELF"], "nb", $param, "", '', $sortfield, $sortorder, 'center ');
-    print_liste_field_titre("NbOfPermissions", $_SERVER["PHP_SELF"], "nbpermissions", $param, "", '', $sortfield, $sortorder, 'center ');
-    print_liste_field_titre("DateCreationShort", $_SERVER["PHP_SELF"], "g.datec", $param, "", '', $sortfield, $sortorder, 'center ');
-    print_liste_field_titre("", $_SERVER["PHP_SELF"]);
-    print "</tr>\n";
+	print '<tr class="liste_titre">';
+	print_liste_field_titre("Group", $_SERVER["PHP_SELF"], "g.nom", $param, "", "", $sortfield, $sortorder);
+	//multicompany
+	if (!empty($conf->multicompany->enabled) && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && $conf->entity == 1)
+	{
+		print_liste_field_titre("Entity", $_SERVER["PHP_SELF"], "g.entity", $param, "", '', $sortfield, $sortorder, 'center ');
+	}
+	print_liste_field_titre("NbOfUsers", $_SERVER["PHP_SELF"], "nb", $param, "", '', $sortfield, $sortorder, 'center ');
+	print_liste_field_titre("NbOfPermissions", $_SERVER["PHP_SELF"], "nbpermissions", $param, "", '', $sortfield, $sortorder, 'center ');
+	print_liste_field_titre("DateCreationShort", $_SERVER["PHP_SELF"], "g.datec", $param, "", '', $sortfield, $sortorder, 'center ');
+	print_liste_field_titre("", $_SERVER["PHP_SELF"]);
+	print "</tr>\n";
 
-    $grouptemp = new UserGroup($db);
+	$grouptemp = new UserGroup($db);
 
-    while ($i < $num)
-    {
-        $obj = $db->fetch_object($resql);
+	while ($i < $num)
+	{
+		$obj = $db->fetch_object($resql);
 
-        $grouptemp->id = $obj->rowid;
-        $grouptemp->name = $obj->name;
-        $grouptemp->note = $obj->note;
+		$grouptemp->id = $obj->rowid;
+		$grouptemp->name = $obj->name;
+		$grouptemp->note = $obj->note;
 
-        print '<tr class="oddeven">';
-        print '<td>';
-        print $grouptemp->getNomUrl(1);
-        if (!$obj->entity)
-        {
-        	print img_picto($langs->trans("GlobalGroup"), 'redstar');
-        }
-        print "</td>";
-        //multicompany
-        if (!empty($conf->multicompany->enabled) && is_object($mc) && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && $conf->entity == 1)
-        {
-            $mc->getInfo($obj->entity);
-            print '<td class="center">'.$mc->label.'</td>';
-        }
-        print '<td class="center">'.$obj->nb.'</td>';
-        print '<td class="center">'.$obj->nbpermissions.'</td>';
-        print '<td class="center nowrap">'.dol_print_date($db->jdate($obj->datec), "dayhour").'</td>';
-        print '<td></td>';
-        print "</tr>\n";
-        $i++;
-    }
-    print "</table>";
+		print '<tr class="oddeven">';
+		print '<td>';
+		print $grouptemp->getNomUrl(1);
+		if (!$obj->entity)
+		{
+			print img_picto($langs->trans("GlobalGroup"), 'redstar');
+		}
+		print "</td>";
+		//multicompany
+		if (!empty($conf->multicompany->enabled) && is_object($mc) && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && $conf->entity == 1)
+		{
+			$mc->getInfo($obj->entity);
+			print '<td class="center">'.$mc->label.'</td>';
+		}
+		print '<td class="center">'.$obj->nb.'</td>';
+		print '<td class="center">'.$obj->nbpermissions.'</td>';
+		print '<td class="center nowrap">'.dol_print_date($db->jdate($obj->datec), "dayhour").'</td>';
+		print '<td></td>';
+		print "</tr>\n";
+		$i++;
+	}
+	print "</table>";
 
-    print '</div>';
-    print "</form>\n";
+	print '</div>';
+	print "</form>\n";
 
-    $db->free($resql);
+	$db->free($resql);
 } else {
-    dol_print_error($db);
+	dol_print_error($db);
 }
 
 // End of page
diff --git a/htdocs/user/group/perms.php b/htdocs/user/group/perms.php
index 10de5b9309e..badf3840582 100644
--- a/htdocs/user/group/perms.php
+++ b/htdocs/user/group/perms.php
@@ -374,7 +374,7 @@ if ($object->id > 0)
 	$reshook = $hookmanager->executeHooks('insertExtraFooter', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 	if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 }
 
 // End of page
diff --git a/htdocs/user/hierarchy.php b/htdocs/user/hierarchy.php
index 6918d1638e4..a27946e7474 100644
--- a/htdocs/user/hierarchy.php
+++ b/htdocs/user/hierarchy.php
@@ -65,8 +65,8 @@ $canadduser = (!empty($user->admin) || $user->rights->user->user->creer);
 $form = new Form($db);
 
 $arrayofjs = array(
-    '/includes/jquery/plugins/jquerytreeview/jquery.treeview.js',
-    '/includes/jquery/plugins/jquerytreeview/lib/jquery.cookie.js',
+	'/includes/jquery/plugins/jquerytreeview/jquery.treeview.js',
+	'/includes/jquery/plugins/jquerytreeview/lib/jquery.cookie.js',
 );
 $arrayofcss = array('/includes/jquery/plugins/jquerytreeview/jquery.treeview.css');
 
@@ -78,139 +78,139 @@ $user_arbo = $userstatic->get_full_tree(0, ($search_statut != '' && $search_stat
 
 if (!is_array($user_arbo) && $user_arbo < 0)
 {
-    setEventMessages($userstatic->error, $userstatic->errors, 'warnings');
+	setEventMessages($userstatic->error, $userstatic->errors, 'warnings');
 } else {
-    // Define fulltree array
-    $fulltree = $user_arbo;
-    //var_dump($fulltree);
-    // Define data (format for treeview)
-    $data = array();
-    $data[] = array('rowid'=>0, 'fk_menu'=>-1, 'title'=>"racine", 'mainmenu'=>'', 'leftmenu'=>'', 'fk_mainmenu'=>'', 'fk_leftmenu'=>'');
-    foreach ($fulltree as $key => $val)
-    {
-    	$userstatic->id = $val['id'];
-    	$userstatic->ref = $val['label'];
-    	$userstatic->login = $val['login'];
-    	$userstatic->firstname = $val['firstname'];
-    	$userstatic->lastname = $val['lastname'];
-    	$userstatic->statut = $val['statut'];
-        $userstatic->email = $val['email'];
-        $userstatic->gender = $val['gender'];
-    	$userstatic->socid = $val['fk_soc'];
-    	$userstatic->admin = $val['admin'];
-    	$userstatic->entity = $val['entity'];
-    	$userstatic->photo = $val['photo'];
+	// Define fulltree array
+	$fulltree = $user_arbo;
+	//var_dump($fulltree);
+	// Define data (format for treeview)
+	$data = array();
+	$data[] = array('rowid'=>0, 'fk_menu'=>-1, 'title'=>"racine", 'mainmenu'=>'', 'leftmenu'=>'', 'fk_mainmenu'=>'', 'fk_leftmenu'=>'');
+	foreach ($fulltree as $key => $val)
+	{
+		$userstatic->id = $val['id'];
+		$userstatic->ref = $val['label'];
+		$userstatic->login = $val['login'];
+		$userstatic->firstname = $val['firstname'];
+		$userstatic->lastname = $val['lastname'];
+		$userstatic->statut = $val['statut'];
+		$userstatic->email = $val['email'];
+		$userstatic->gender = $val['gender'];
+		$userstatic->socid = $val['fk_soc'];
+		$userstatic->admin = $val['admin'];
+		$userstatic->entity = $val['entity'];
+		$userstatic->photo = $val['photo'];
 
-    	$entity = $val['entity'];
-    	$entitystring = '';
+		$entity = $val['entity'];
+		$entitystring = '';
 
-    	// TODO Set of entitystring should be done with a hook
-    	if (!empty($conf->multicompany->enabled) && is_object($mc))
-    	{
-    		if (empty($entity))
-    		{
-    			$entitystring = $langs->trans("AllEntities");
-    		} else {
-    			$mc->getInfo($entity);
-    			$entitystring = $mc->label;
-    		}
-    	}
+		// TODO Set of entitystring should be done with a hook
+		if (!empty($conf->multicompany->enabled) && is_object($mc))
+		{
+			if (empty($entity))
+			{
+				$entitystring = $langs->trans("AllEntities");
+			} else {
+				$mc->getInfo($entity);
+				$entitystring = $mc->label;
+			}
+		}
 
-    	$li = $userstatic->getNomUrl(-1, '', 0, 1);
-    	if (!empty($conf->multicompany->enabled) && $userstatic->admin && !$userstatic->entity)
-    	{
-    		$li .= img_picto($langs->trans("SuperAdministrator"), 'redstar');
-    	} elseif ($userstatic->admin)
-    	{
-    		$li .= img_picto($langs->trans("Administrator"), 'star');
-    	}
-    	$li .= ' ('.$val['login'].($entitystring ? ' - '.$entitystring : '').')';
+		$li = $userstatic->getNomUrl(-1, '', 0, 1);
+		if (!empty($conf->multicompany->enabled) && $userstatic->admin && !$userstatic->entity)
+		{
+			$li .= img_picto($langs->trans("SuperAdministrator"), 'redstar');
+		} elseif ($userstatic->admin)
+		{
+			$li .= img_picto($langs->trans("Administrator"), 'star');
+		}
+		$li .= ' ('.$val['login'].($entitystring ? ' - '.$entitystring : '').')';
 
-    	$entry = '<table class="nobordernopadding centpercent"><tr><td class="'.($val['statut'] ? 'usertdenabled' : 'usertddisabled').'">'.$li.'</td><td align="right" class="'.($val['statut'] ? 'usertdenabled' : 'usertddisabled').'">'.$userstatic->getLibStatut(2).'</td></tr></table>';
+		$entry = '<table class="nobordernopadding centpercent"><tr><td class="'.($val['statut'] ? 'usertdenabled' : 'usertddisabled').'">'.$li.'</td><td align="right" class="'.($val['statut'] ? 'usertdenabled' : 'usertddisabled').'">'.$userstatic->getLibStatut(2).'</td></tr></table>';
 
-    	$data[] = array(
-    		'rowid'=>$val['rowid'],
-    		'fk_menu'=>$val['fk_user'],
-    		'statut'=>$val['statut'],
-    		'entry'=>$entry
-    	);
-    }
+		$data[] = array(
+			'rowid'=>$val['rowid'],
+			'fk_menu'=>$val['fk_user'],
+			'statut'=>$val['statut'],
+			'entry'=>$entry
+		);
+	}
 
-    //var_dump($data);
+	//var_dump($data);
 
-    $title = $langs->trans("ListOfUsers").' - '.$langs->trans("HierarchicView");
+	$title = $langs->trans("ListOfUsers").' - '.$langs->trans("HierarchicView");
 
-    $param = "search_statut=".urlencode($search_statut);
+	$param = "search_statut=".urlencode($search_statut);
 
-    $newcardbutton = '';
-    if ($canadduser)
-    {
-        $newcardbutton .= dolGetButtonTitle($langs->trans('NewUser'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/user/card.php?action=create'.($mode == 'employee' ? '&employee=1' : '').'&leftmenu=');
-    }
+	$newcardbutton = '';
+	if ($canadduser)
+	{
+		$newcardbutton .= dolGetButtonTitle($langs->trans('NewUser'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/user/card.php?action=create'.($mode == 'employee' ? '&employee=1' : '').'&leftmenu=');
+	}
 
-    $morehtmlright .= dolGetButtonTitle($langs->trans("List"), '', 'fa fa-list paddingleft imgforviewmode', DOL_URL_ROOT.'/user/list.php'.(($search_statut != '' && $search_statut >= 0) ? '?search_statut='.$search_statut : ''));
-    $param = array('morecss'=>'marginleftonly btnTitleSelected');
-    $morehtmlright .= dolGetButtonTitle($langs->trans("HierarchicView"), '', 'fa fa-stream paddingleft imgforviewmode', DOL_URL_ROOT.'/user/hierarchy.php'.(($search_statut != '' && $search_statut >= 0) ? '?search_statut='.$search_statut : ''), '', 1, $param);
+	$morehtmlright .= dolGetButtonTitle($langs->trans("List"), '', 'fa fa-list paddingleft imgforviewmode', DOL_URL_ROOT.'/user/list.php'.(($search_statut != '' && $search_statut >= 0) ? '?search_statut='.$search_statut : ''));
+	$param = array('morecss'=>'marginleftonly btnTitleSelected');
+	$morehtmlright .= dolGetButtonTitle($langs->trans("HierarchicView"), '', 'fa fa-stream paddingleft imgforviewmode', DOL_URL_ROOT.'/user/hierarchy.php'.(($search_statut != '' && $search_statut >= 0) ? '?search_statut='.$search_statut : ''), '', 1, $param);
 
-    print load_fiche_titre($title, $morehtmlright.' '.$newcardbutton, 'user');
+	print load_fiche_titre($title, $morehtmlright.' '.$newcardbutton, 'user');
 
-    print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">'."\n";
-    if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
-    print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-    print '<input type="hidden" name="page" value="'.$page.'">';
-    print '<input type="hidden" name="mode" value="'.$mode.'">';
-    print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
+	print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">'."\n";
+	if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+	print '<input type="hidden" name="page" value="'.$page.'">';
+	print '<input type="hidden" name="mode" value="'.$mode.'">';
+	print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
-    print '<table class="liste nohover centpercent">';
+	print '<table class="liste nohover centpercent">';
 
-    print '<tr class="liste_titre_filter">';
-    print '<td class="liste_titre">&nbsp;</td>';
-    print '<td class="liste_titre">&nbsp;</td>';
-    // Status
-    print '<td class="liste_titre right">';
-    print $form->selectarray('search_statut', array('-1'=>'', '1'=>$langs->trans('Enabled')), $search_statut);
-    print '</td>';
-    print '<td class="liste_titre maxwidthsearch">';
-    $searchpicto = $form->showFilterAndCheckAddButtons(0);
-    print $searchpicto;
-    print '</td>';
-    print '</tr>';
+	print '<tr class="liste_titre_filter">';
+	print '<td class="liste_titre">&nbsp;</td>';
+	print '<td class="liste_titre">&nbsp;</td>';
+	// Status
+	print '<td class="liste_titre right">';
+	print $form->selectarray('search_statut', array('-1'=>'', '1'=>$langs->trans('Enabled')), $search_statut);
+	print '</td>';
+	print '<td class="liste_titre maxwidthsearch">';
+	$searchpicto = $form->showFilterAndCheckAddButtons(0);
+	print $searchpicto;
+	print '</td>';
+	print '</tr>';
 
-    print '<tr class="liste_titre">';
-    print_liste_field_titre("HierarchicView");
-    print_liste_field_titre('<div id="iddivjstreecontrol"><a href="#">'.img_picto('', 'folder', 'class="paddingright"').$langs->trans("UndoExpandAll").'</a> | <a href="#">'.img_picto('', 'folder-open', 'class="paddingright"').$langs->trans("ExpandAll").'</a></div>', $_SERVER['PHP_SELF'], "", '', "", 'align="center"');
-    print_liste_field_titre("Status", $_SERVER['PHP_SELF'], "", '', "", 'align="right"');
-    print_liste_field_titre('', $_SERVER["PHP_SELF"], "", '', '', '', '', '', 'maxwidthsearch ');
-    print '</tr>';
+	print '<tr class="liste_titre">';
+	print_liste_field_titre("HierarchicView");
+	print_liste_field_titre('<div id="iddivjstreecontrol"><a href="#">'.img_picto('', 'folder', 'class="paddingright"').$langs->trans("UndoExpandAll").'</a> | <a href="#">'.img_picto('', 'folder-open', 'class="paddingright"').$langs->trans("ExpandAll").'</a></div>', $_SERVER['PHP_SELF'], "", '', "", 'align="center"');
+	print_liste_field_titre("Status", $_SERVER['PHP_SELF'], "", '', "", 'align="right"');
+	print_liste_field_titre('', $_SERVER["PHP_SELF"], "", '', '', '', '', '', 'maxwidthsearch ');
+	print '</tr>';
 
 
-    $nbofentries = (count($data) - 1);
+	$nbofentries = (count($data) - 1);
 
-    if ($nbofentries > 0)
-    {
-    	print '<tr><td colspan="3">';
-    	tree_recur($data, $data[0], 0);
-    	print '</td>';
-    	print '<td></td>';
-    	print '</tr>';
-    } else {
-    	print '<tr class="oddeven">';
-    	print '<td colspan="3">';
-    	print '<table class="nobordernopadding"><tr class="nobordernopadding"><td>'.img_picto_common('', 'treemenu/branchbottom.gif').'</td>';
-    	print '<td valign="middle">';
-    	print $langs->trans("NoCategoryYet");
-    	print '</td>';
-    	print '<td>&nbsp;</td>';
-    	print '</table>';
-    	print '</td>';
-    	print '<td></td>';
-    	print '</tr>';
-    }
+	if ($nbofentries > 0)
+	{
+		print '<tr><td colspan="3">';
+		tree_recur($data, $data[0], 0);
+		print '</td>';
+		print '<td></td>';
+		print '</tr>';
+	} else {
+		print '<tr class="oddeven">';
+		print '<td colspan="3">';
+		print '<table class="nobordernopadding"><tr class="nobordernopadding"><td>'.img_picto_common('', 'treemenu/branchbottom.gif').'</td>';
+		print '<td valign="middle">';
+		print $langs->trans("NoCategoryYet");
+		print '</td>';
+		print '<td>&nbsp;</td>';
+		print '</table>';
+		print '</td>';
+		print '<td></td>';
+		print '</tr>';
+	}
 
-    print "</table>";
-    print "</form>\n";
+	print "</table>";
+	print "</form>\n";
 }
 
 //
diff --git a/htdocs/user/home.php b/htdocs/user/home.php
index 3e08fc7098a..4d215685f53 100644
--- a/htdocs/user/home.php
+++ b/htdocs/user/home.php
@@ -152,7 +152,7 @@ if ($resql)
 
 		print '<tr class="oddeven">';
 		print '<td class="nowraponall">';
-        print $fuserstatic->getNomUrl(-1);
+		print $fuserstatic->getNomUrl(-1);
 		if (!empty($conf->multicompany->enabled) && $obj->admin && !$obj->entity)
 		{
 			print img_picto($langs->trans("SuperAdministrator"), 'redstar');
@@ -165,7 +165,7 @@ if ($resql)
 		print "<td>";
 		if ($obj->fk_soc)
 		{
-            print $companystatic->getNomUrl(1);
+			print $companystatic->getNomUrl(1);
 		} else {
 			print $langs->trans("InternalUser");
 		}
@@ -176,7 +176,7 @@ if ($resql)
 
 		$entity = $obj->entity;
 		$entitystring = '';
-        // TODO Set of entitystring should be done with a hook
+		// TODO Set of entitystring should be done with a hook
 		if (!empty($conf->multicompany->enabled) && is_object($mc))
 		{
 			if (empty($entity))
@@ -187,13 +187,13 @@ if ($resql)
 				$entitystring = $mc->label;
 			}
 		}
-        print ($entitystring ? ' ('.$entitystring.')' : '');
+		print ($entitystring ? ' ('.$entitystring.')' : '');
 
 		print '</td>';
 		print '<td class="center nowrap">'.dol_print_date($db->jdate($obj->datec), 'dayhour').'</td>';
-        print '<td class="right">';
-        print $fuserstatic->getLibStatut(3);
-        print '</td>';
+		print '<td class="right">';
+		print $fuserstatic->getLibStatut(3);
+		print '</td>';
 
 		print '</tr>';
 		$i++;
@@ -259,10 +259,10 @@ if ($canreadperms)
 			print "</td>";
 			if (!empty($conf->multicompany->enabled) && is_object($mc))
 			{
-	        	$mc->getInfo($obj->entity);
-	        	print '<td>';
-	        	print $mc->label;
-	        	print '</td>';
+				$mc->getInfo($obj->entity);
+				print '<td>';
+				print $mc->label;
+				print '</td>';
 			}
 			print '<td class="nowrap right">'.dol_print_date($db->jdate($obj->datec), 'dayhour').'</td>';
 			print "</tr>";
diff --git a/htdocs/user/info.php b/htdocs/user/info.php
index 487398630ce..f38d9ef2162 100644
--- a/htdocs/user/info.php
+++ b/htdocs/user/info.php
@@ -88,7 +88,7 @@ dol_print_object_info($object);
 print '</div>';
 
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // End of page
 llxFooter();
diff --git a/htdocs/user/ldap.php b/htdocs/user/ldap.php
index 5b8c09968b8..44c7f553d11 100644
--- a/htdocs/user/ldap.php
+++ b/htdocs/user/ldap.php
@@ -147,7 +147,7 @@ print '</table>';
 
 print '</div>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 /*
  * Barre d'actions
diff --git a/htdocs/user/note.php b/htdocs/user/note.php
index 0651485d72a..60b9a3b6be2 100644
--- a/htdocs/user/note.php
+++ b/htdocs/user/note.php
@@ -64,7 +64,7 @@ if (empty($reshook)) {
 	if ($action == 'update' && $user->rights->user->user->creer && !$_POST["cancel"]) {
 		$db->begin();
 
-		$res = $object->update_note(dol_html_entity_decode(GETPOST('note_private', 'restricthtml'), ENT_QUOTES|ENT_HTML5));
+		$res = $object->update_note(dol_html_entity_decode(GETPOST('note_private', 'restricthtml'), ENT_QUOTES | ENT_HTML5));
 		if ($res < 0) {
 			$mesg = '<div class="error">'.$adh->error.'</div>';
 			$db->rollback();
@@ -96,27 +96,27 @@ if ($id)
 		$linkback = '<a href="'.DOL_URL_ROOT.'/user/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 	}
 
-    dol_banner_tab($object, 'id', $linkback, $user->rights->user->user->lire || $user->admin);
+	dol_banner_tab($object, 'id', $linkback, $user->rights->user->user->lire || $user->admin);
 
-    print '<div class="underbanner clearboth"></div>';
+	print '<div class="underbanner clearboth"></div>';
 
-    print "<form method=\"post\" action=\"".$_SERVER['PHP_SELF']."\">";
+	print "<form method=\"post\" action=\"".$_SERVER['PHP_SELF']."\">";
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 
 	print '<div class="fichecenter">';
-    print '<table class="border centpercent tableforfield">';
+	print '<table class="border centpercent tableforfield">';
 
-    // Login
-    print '<tr><td class="titlefield">'.$langs->trans("Login").'</td><td class="valeur">'.$object->login.'&nbsp;</td></tr>';
+	// Login
+	print '<tr><td class="titlefield">'.$langs->trans("Login").'</td><td class="valeur">'.$object->login.'&nbsp;</td></tr>';
 
 	// Note
-    print '<tr><td class="tdtop">'.$langs->trans("Note").'</td>';
+	print '<tr><td class="tdtop">'.$langs->trans("Note").'</td>';
 	print '<td class="sensiblehtmlcontent">';
 	if ($action == 'edit' && $user->rights->user->user->creer)
 	{
 		print "<input type=\"hidden\" name=\"action\" value=\"update\">";
 		print "<input type=\"hidden\" name=\"id\" value=\"".$object->id."\">";
-	    // Editeur wysiwyg
+		// Editeur wysiwyg
 		require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 		$doleditor = new DolEditor('note_private', $object->note_private, '', 280, 'dolibarr_notes', 'In', true, false, $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_8, '90%');
 		$doleditor->Create();
@@ -125,10 +125,10 @@ if ($id)
 	}
 	print "</td></tr>";
 
-    print "</table>";
-    print '</div>';
+	print "</table>";
+	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	if ($action == 'edit')
 	{
@@ -144,14 +144,14 @@ if ($id)
      * Actions
      */
 
-    print '<div class="tabsAction">';
+	print '<div class="tabsAction">';
 
-    if ($user->rights->user->user->creer && $action != 'edit')
-    {
-        print "<a class=\"butAction\" href=\"note.php?id=".$object->id."&amp;action=edit\">".$langs->trans('Modify')."</a>";
-    }
+	if ($user->rights->user->user->creer && $action != 'edit')
+	{
+		print "<a class=\"butAction\" href=\"note.php?id=".$object->id."&amp;action=edit\">".$langs->trans('Modify')."</a>";
+	}
 
-    print "</div>";
+	print "</div>";
 
 	print "</form>\n";
 }
diff --git a/htdocs/user/notify/card.php b/htdocs/user/notify/card.php
index 07411dbc39e..3c7395fe1e8 100644
--- a/htdocs/user/notify/card.php
+++ b/htdocs/user/notify/card.php
@@ -168,7 +168,7 @@ if ($result > 0)
 
 	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print "\n";
 
diff --git a/htdocs/user/param_ihm.php b/htdocs/user/param_ihm.php
index b05ed814342..67c1755f2da 100644
--- a/htdocs/user/param_ihm.php
+++ b/htdocs/user/param_ihm.php
@@ -316,7 +316,7 @@ if ($action == 'edit')
 	// Theme
 	showSkins($object, (($user->admin || empty($dolibarr_main_demo)) ? 1 : 0), true);
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 
 	print '<div class="center">';
@@ -386,7 +386,7 @@ if ($action == 'edit')
 	// Skin
 	showSkins($object, 0, true);
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 
 	print '<div class="tabsAction">';
diff --git a/htdocs/user/passwordforgotten.php b/htdocs/user/passwordforgotten.php
index 96497492a15..789d67544a3 100644
--- a/htdocs/user/passwordforgotten.php
+++ b/htdocs/user/passwordforgotten.php
@@ -37,8 +37,8 @@ $langs->loadLangs(array('errors', 'users', 'companies', 'ldap', 'other'));
 // Security check
 if (!empty($conf->global->MAIN_SECURITY_DISABLEFORGETPASSLINK))
 {
-    header("Location: ".DOL_URL_ROOT.'/');
-    exit;
+	header("Location: ".DOL_URL_ROOT.'/');
+	exit;
 }
 
 $action = GETPOST('action', 'aZ09');
@@ -67,88 +67,88 @@ if (GETPOST('dol_use_jmobile', 'alpha') || !empty($_SESSION['dol_use_jmobile']))
 // Validate new password
 if ($action == 'validatenewpassword' && $username && $passwordhash)
 {
-    $edituser = new User($db);
-    $result = $edituser->fetch('', $_GET["username"]);
-    if ($result < 0)
-    {
-        $message = '<div class="error">'.$langs->trans("ErrorLoginDoesNotExists", $username).'</div>';
-    } else {
-        if (dol_verifyHash($edituser->pass_temp, $passwordhash))
-        {
-        	// Clear session
-        	unset($_SESSION['dol_login']);
-        	$_SESSION['dol_loginmesg'] = $langs->trans('NewPasswordValidated');	// Save message for the session page
+	$edituser = new User($db);
+	$result = $edituser->fetch('', $_GET["username"]);
+	if ($result < 0)
+	{
+		$message = '<div class="error">'.$langs->trans("ErrorLoginDoesNotExists", $username).'</div>';
+	} else {
+		if (dol_verifyHash($edituser->pass_temp, $passwordhash))
+		{
+			// Clear session
+			unset($_SESSION['dol_login']);
+			$_SESSION['dol_loginmesg'] = $langs->trans('NewPasswordValidated'); // Save message for the session page
 
-        	$newpassword = $edituser->setPassword($user, $edituser->pass_temp, 0);
-            dol_syslog("passwordforgotten.php new password for user->id=".$edituser->id." validated in database");
-            header("Location: ".DOL_URL_ROOT.'/');
-            exit;
-        } else {
-        	$langs->load("errors");
-            $message = '<div class="error">'.$langs->trans("ErrorFailedToValidatePasswordReset").'</div>';
-        }
-    }
+			$newpassword = $edituser->setPassword($user, $edituser->pass_temp, 0);
+			dol_syslog("passwordforgotten.php new password for user->id=".$edituser->id." validated in database");
+			header("Location: ".DOL_URL_ROOT.'/');
+			exit;
+		} else {
+			$langs->load("errors");
+			$message = '<div class="error">'.$langs->trans("ErrorFailedToValidatePasswordReset").'</div>';
+		}
+	}
 }
 // Action modif mot de passe
 if ($action == 'buildnewpassword' && $username)
 {
-    $sessionkey = 'dol_antispam_value';
-    $ok = (array_key_exists($sessionkey, $_SESSION) === true && (strtolower($_SESSION[$sessionkey]) == strtolower($_POST['code'])));
+	$sessionkey = 'dol_antispam_value';
+	$ok = (array_key_exists($sessionkey, $_SESSION) === true && (strtolower($_SESSION[$sessionkey]) == strtolower($_POST['code'])));
 
-    // Verify code
-    if (!$ok)
-    {
-        $message = '<div class="error">'.$langs->trans("ErrorBadValueForCode").'</div>';
-    } else {
-    	$isanemail = preg_match('/@/', $username);
+	// Verify code
+	if (!$ok)
+	{
+		$message = '<div class="error">'.$langs->trans("ErrorBadValueForCode").'</div>';
+	} else {
+		$isanemail = preg_match('/@/', $username);
 
-        $edituser = new User($db);
-        $result = $edituser->fetch('', $username, '', 1);
-        if ($result == 0 && $isanemail)
-        {
-        	$result = $edituser->fetch('', '', '', 1, -1, $username);
-        }
+		$edituser = new User($db);
+		$result = $edituser->fetch('', $username, '', 1);
+		if ($result == 0 && $isanemail)
+		{
+			$result = $edituser->fetch('', '', '', 1, -1, $username);
+		}
 
-        if ($result <= 0 && $edituser->error == 'USERNOTFOUND')
-        {
-        	$message = '<div class="warning paddingtopbottom'.(empty($conf->global->MAIN_LOGIN_BACKGROUND) ? '' : ' backgroundsemitransparent').'">';
-        	if (! $isanemail) {
-        		$message .= $langs->trans("IfLoginExistPasswordRequestSent");
-        	} else {
-            	$message .= $langs->trans("IfEmailExistPasswordRequestSent");
-        	}
-        	$message .= '</div>';
-            $username = '';
-        } else {
-            if (!$edituser->email)
-            {
-                $message = '<div class="error">'.$langs->trans("ErrorLoginHasNoEmail").'</div>';
-            } else {
-                $newpassword = $edituser->setPassword($user, '', 1);
-                if ($newpassword < 0)
-                {
-                    // Failed
-                    $message = '<div class="error">'.$langs->trans("ErrorFailedToChangePassword").'</div>';
-                } else {
-                    // Success
-                    if ($edituser->send_password($user, $newpassword, 1) > 0)
-                    {
-                    	$message = '<div class="warning paddingtopbottom'.(empty($conf->global->MAIN_LOGIN_BACKGROUND) ? '' : ' backgroundsemitransparent').'">';
-                    	if (! $isanemail) {
-                    		$message .= $langs->trans("IfLoginExistPasswordRequestSent");
-                    	} else {
-                    		$message .= $langs->trans("IfEmailExistPasswordRequestSent");
-                    	}
-                    	//$message .= $langs->trans("PasswordChangeRequestSent", $edituser->login, dolObfuscateEmail($edituser->email));
-                    	$message .= '</div>';
-                        $username = '';
-                    } else {
-                        $message .= '<div class="error">'.$edituser->error.'</div>';
-                    }
-                }
-            }
-        }
-    }
+		if ($result <= 0 && $edituser->error == 'USERNOTFOUND')
+		{
+			$message = '<div class="warning paddingtopbottom'.(empty($conf->global->MAIN_LOGIN_BACKGROUND) ? '' : ' backgroundsemitransparent').'">';
+			if (!$isanemail) {
+				$message .= $langs->trans("IfLoginExistPasswordRequestSent");
+			} else {
+				$message .= $langs->trans("IfEmailExistPasswordRequestSent");
+			}
+			$message .= '</div>';
+			$username = '';
+		} else {
+			if (!$edituser->email)
+			{
+				$message = '<div class="error">'.$langs->trans("ErrorLoginHasNoEmail").'</div>';
+			} else {
+				$newpassword = $edituser->setPassword($user, '', 1);
+				if ($newpassword < 0)
+				{
+					// Failed
+					$message = '<div class="error">'.$langs->trans("ErrorFailedToChangePassword").'</div>';
+				} else {
+					// Success
+					if ($edituser->send_password($user, $newpassword, 1) > 0)
+					{
+						$message = '<div class="warning paddingtopbottom'.(empty($conf->global->MAIN_LOGIN_BACKGROUND) ? '' : ' backgroundsemitransparent').'">';
+						if (!$isanemail) {
+							$message .= $langs->trans("IfLoginExistPasswordRequestSent");
+						} else {
+							$message .= $langs->trans("IfEmailExistPasswordRequestSent");
+						}
+						//$message .= $langs->trans("PasswordChangeRequestSent", $edituser->login, dolObfuscateEmail($edituser->email));
+						$message .= '</div>';
+						$username = '';
+					} else {
+						$message .= '<div class="error">'.$edituser->error.'</div>';
+					}
+				}
+			}
+		}
+	}
 }
 
 
@@ -165,9 +165,9 @@ if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $title = $conf->global->MAIN_
 // Select templates
 if (file_exists(DOL_DOCUMENT_ROOT."/theme/".$conf->theme."/tpl/passwordforgotten.tpl.php"))
 {
-    $template_dir = DOL_DOCUMENT_ROOT."/theme/".$conf->theme."/tpl/";
+	$template_dir = DOL_DOCUMENT_ROOT."/theme/".$conf->theme."/tpl/";
 } else {
-    $template_dir = DOL_DOCUMENT_ROOT."/core/tpl/";
+	$template_dir = DOL_DOCUMENT_ROOT."/core/tpl/";
 }
 
 if (!$username) $focus_element = 'username';
diff --git a/htdocs/user/perms.php b/htdocs/user/perms.php
index b5ec6c8fc9b..b058bae9743 100644
--- a/htdocs/user/perms.php
+++ b/htdocs/user/perms.php
@@ -26,7 +26,7 @@
  *		\brief		Page to set permission of a user record
  */
 
-if (! defined('CSRFCHECK_WITH_TOKEN')) define('CSRFCHECK_WITH_TOKEN', '1');		// Force use of CSRF protection with tokens even for GET
+if (!defined('CSRFCHECK_WITH_TOKEN')) define('CSRFCHECK_WITH_TOKEN', '1'); // Force use of CSRF protection with tokens even for GET
 
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php';
@@ -458,7 +458,7 @@ $reshook = $hookmanager->executeHooks('insertExtraFooter', $parameters, $object,
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // End of page
 llxFooter();
diff --git a/htdocs/user/vcard.php b/htdocs/user/vcard.php
index 9d8fd6478b4..ada3a992f44 100644
--- a/htdocs/user/vcard.php
+++ b/htdocs/user/vcard.php
@@ -69,7 +69,7 @@ $v->setPhoneNumber($user2->phone_pro, "TYPE=WORK;VOICE");
 $v->setPhoneNumber($user2->phone_mobile, "TYPE=CELL;VOICE");
 $v->setPhoneNumber($user2->fax, "TYPE=WORK;FAX");
 
-$country = $user2->country_code ? $user2->country : '' ;
+$country = $user2->country_code ? $user2->country : '';
 
 $v->setAddress("", "", $user2->address, $user2->town, $user2->state, $user2->zip, $country, "TYPE=WORK;POSTAL");
 $v->setLabel("", "", $user2->address, $user2->town, $user2->state, $user2->zip, $country, "TYPE=WORK");
@@ -82,9 +82,9 @@ $v->setTitle($user2->poste);
 if ($company->id)
 {
 	$v->setURL($company->url, "TYPE=WORK");
-	if (! $user2->phone_pro) $v->setPhoneNumber($company->phone, "TYPE=WORK;VOICE");
-	if (! $user2->fax)       $v->setPhoneNumber($company->fax, "TYPE=WORK;FAX");
-	if (! $user2->zip)       $v->setAddress("", "", $company->address, $company->town, $company->state, $company->zip, $company->country, "TYPE=WORK;POSTAL");
+	if (!$user2->phone_pro) $v->setPhoneNumber($company->phone, "TYPE=WORK;VOICE");
+	if (!$user2->fax)       $v->setPhoneNumber($company->fax, "TYPE=WORK;FAX");
+	if (!$user2->zip)       $v->setAddress("", "", $company->address, $company->town, $company->state, $company->zip, $company->country, "TYPE=WORK;POSTAL");
 
 	// when company e-mail is empty, use only user e-mail
 	if (empty(trim($company->email)))
@@ -126,7 +126,7 @@ $db->close();
 
 $output = $v->getVCard();
 
-$filename = trim(urldecode($v->getFileName()));      // "Nom prenom.vcf"
+$filename = trim(urldecode($v->getFileName())); // "Nom prenom.vcf"
 $filenameurlencoded = dol_sanitizeFileName(urlencode($filename));
 //$filename = dol_sanitizeFileName($filename);
 
diff --git a/htdocs/variants/admin/admin.php b/htdocs/variants/admin/admin.php
index 1b8f74d6dc4..8b75391a296 100644
--- a/htdocs/variants/admin/admin.php
+++ b/htdocs/variants/admin/admin.php
@@ -35,11 +35,11 @@ if ($_POST) {
 		setEventMessages($langs->trans('CoreErrorMessage'), null, 'errors');
 	}
 
-    if (dolibarr_set_const($db, 'PRODUIT_ATTRIBUTES_SEPARATOR', GETPOST('PRODUIT_ATTRIBUTES_SEPARATOR'), 'chaine', 0, '', $conf->entity)) {
-        setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
-    } else {
-        setEventMessages($langs->trans('CoreErrorMessage'), null, 'errors');
-    }
+	if (dolibarr_set_const($db, 'PRODUIT_ATTRIBUTES_SEPARATOR', GETPOST('PRODUIT_ATTRIBUTES_SEPARATOR'), 'chaine', 0, '', $conf->entity)) {
+		setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
+	} else {
+		setEventMessages($langs->trans('CoreErrorMessage'), null, 'errors');
+	}
 }
 
 $title = $langs->trans('ModuleSetup').' '.$langs->trans('ProductAttributes');
@@ -62,9 +62,9 @@ print '<tr class="oddeven"><td>'.$langs->trans('HideProductCombinations').'</td>
 print $form->selectyesno("PRODUIT_ATTRIBUTES_HIDECHILD", $conf->global->PRODUIT_ATTRIBUTES_HIDECHILD, 1).'</td></tr>';
 print '<tr class="oddeven"><td>'.$langs->trans('CombinationsSeparator').'</td>';
 if (isset($conf->global->PRODUIT_ATTRIBUTES_SEPARATOR)) {
-    $separator = $conf->global->PRODUIT_ATTRIBUTES_SEPARATOR;
+	$separator = $conf->global->PRODUIT_ATTRIBUTES_SEPARATOR;
 } else {
-    $separator = "_";
+	$separator = "_";
 }
 print '<td class="right"><input size="3" type="text" class="flat" name="PRODUIT_ATTRIBUTES_SEPARATOR" value="'.$separator.'"></td></tr>';
 print '</table>';
diff --git a/htdocs/variants/ajax/getCombinations.php b/htdocs/variants/ajax/getCombinations.php
index c0bf58baa62..67c1dd4284c 100644
--- a/htdocs/variants/ajax/getCombinations.php
+++ b/htdocs/variants/ajax/getCombinations.php
@@ -31,18 +31,18 @@ header('Content-Type: application/json');
 $id = GETPOST('id', 'int');
 
 if (!$id) {
-    print json_encode(array(
-        'error' => 'ID not set'
-    ));
-    exit();
+	print json_encode(array(
+		'error' => 'ID not set'
+	));
+	exit();
 }
 
 $product = new Product($db);
 
 if ($product->fetch($id) < 0) {
-    print json_encode(array(
-        'error' => 'Product not found'
-    ));
+	print json_encode(array(
+		'error' => 'Product not found'
+	));
 }
 
 $prodcomb = new ProductCombination($db);
diff --git a/htdocs/variants/ajax/get_attribute_values.php b/htdocs/variants/ajax/get_attribute_values.php
index defc85c1e91..e80cb9aae2b 100644
--- a/htdocs/variants/ajax/get_attribute_values.php
+++ b/htdocs/variants/ajax/get_attribute_values.php
@@ -31,19 +31,19 @@ header('Content-Type: application/json');
 $id = GETPOST('id', 'int');
 
 if (!$id) {
-    print json_encode(array(
-        'error' => 'ID not set'
-    ));
-    exit();
+	print json_encode(array(
+		'error' => 'ID not set'
+	));
+	exit();
 }
 
 $prodattr = new ProductAttribute($db);
 
 if ($prodattr->fetch($id) < 0) {
-    print json_encode(array(
-        'error' => 'Attribute not found'
-    ));
-    exit();
+	print json_encode(array(
+		'error' => 'Attribute not found'
+	));
+	exit();
 }
 
 $prodattrval = new ProductAttributeValue($db);
@@ -51,10 +51,10 @@ $prodattrval = new ProductAttributeValue($db);
 $res = $prodattrval->fetchAllByProductAttribute($id);
 
 if ($res == -1) {
-    print json_encode(array(
-        'error' => 'Internal error'
-    ));
-    exit();
+	print json_encode(array(
+		'error' => 'Internal error'
+	));
+	exit();
 }
 
 print json_encode($res);
diff --git a/htdocs/variants/card.php b/htdocs/variants/card.php
index 7f78eabf5f7..04bcdb96183 100644
--- a/htdocs/variants/card.php
+++ b/htdocs/variants/card.php
@@ -139,13 +139,13 @@ $h++;
 print dol_get_fiche_head($head, 'variant', $langs->trans('ProductAttributeName'), -1, 'generic');
 
 if ($action == 'edit') {
-    print '<form method="POST">';
+	print '<form method="POST">';
 }
 
 
 if ($action != 'edit') {
-    print '<div class="fichecenter">';
-    print '<div class="underbanner clearboth"></div>';
+	print '<div class="fichecenter">';
+	print '<div class="underbanner clearboth"></div>';
 }
 print '<table class="border centpercent tableforfield">';
 print '<tr>';
@@ -173,10 +173,10 @@ print '</table>';
 
 
 if ($action != 'edit') {
-    print '</div>';
+	print '</div>';
 }
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 if ($action == 'edit') {
 	print '<div style="text-align: center;">';
diff --git a/htdocs/variants/class/ProductCombination.class.php b/htdocs/variants/class/ProductCombination.class.php
index 721d31ef3ca..9152336bbe4 100644
--- a/htdocs/variants/class/ProductCombination.class.php
+++ b/htdocs/variants/class/ProductCombination.class.php
@@ -78,10 +78,10 @@ class ProductCombination
 	public $combination_price_levels;
 
 	/**
-     * External ref
-     * @var string
-     */
-    public $variation_ref_ext = '';
+	 * External ref
+	 * @var string
+	 */
+	public $variation_ref_ext = '';
 
 	/**
 	 * Constructor
@@ -126,7 +126,7 @@ class ProductCombination
 		$this->variation_price = $obj->variation_price;
 		$this->variation_price_percentage = $obj->variation_price_percentage;
 		$this->variation_weight = $obj->variation_weight;
-        $this->variation_ref_ext = $obj->variation_ref_ext;
+		$this->variation_ref_ext = $obj->variation_ref_ext;
 
 		if (!empty($conf->global->PRODUIT_MULTIPRICES)) {
 			$this->fetchCombinationPriceLevels();
@@ -301,7 +301,7 @@ class ProductCombination
 			$tmp->variation_price = $result->variation_price;
 			$tmp->variation_price_percentage = $result->variation_price_percentage;
 			$tmp->variation_weight = $result->variation_weight;
-            $tmp->variation_ref_ext = $result->variation_ref_ext;
+			$tmp->variation_ref_ext = $result->variation_ref_ext;
 
 			if (!empty($conf->global->PRODUIT_MULTIPRICES)) {
 				$tmp->fetchCombinationPriceLevels();
@@ -383,7 +383,7 @@ class ProductCombination
 		$sql .= " SET fk_product_parent = ".(int) $this->fk_product_parent.", fk_product_child = ".(int) $this->fk_product_child.",";
 		$sql .= " variation_price = ".(float) $this->variation_price.", variation_price_percentage = ".(int) $this->variation_price_percentage.",";
 		$sql .= " variation_ref_ext = '".$this->db->escape($this->variation_ref_ext)."',";
-        $sql .= " variation_weight = ".(float) $this->variation_weight." WHERE rowid = ".((int) $this->id);
+		$sql .= " variation_weight = ".(float) $this->variation_weight." WHERE rowid = ".((int) $this->id);
 
 		$resql = $this->db->query($sql);
 		if (!$resql) {
@@ -671,7 +671,7 @@ class ProductCombination
 	 * @param bool|float 	$forced_pricevar 	If the price variation is forced
 	 * @param bool|float 	$forced_weightvar 	If the weight variation is forced
 	 * @param bool|string 	$forced_refvar 		If the reference is forced
-     * @param string 	    $ref_ext            External reference
+	 * @param string 	    $ref_ext            External reference
 	 * @return int 								<0 KO, >0 OK
 	 */
 	public function createProductCombination(User $user, Product $product, array $combinations, array $variations, $price_var_percent = false, $forced_pricevar = false, $forced_weightvar = false, $forced_refvar = false, $ref_ext = '')
@@ -790,7 +790,7 @@ class ProductCombination
 		$newcomb->variation_price_percentage = $price_var_percent;
 		$newcomb->variation_price = $price_impact[1];
 		$newcomb->variation_weight = $weight_impact;
-        $newcomb->variation_ref_ext = $this->db->escape($ref_ext);
+		$newcomb->variation_ref_ext = $this->db->escape($ref_ext);
 
 		// Init price level
 		if ($conf->global->PRODUIT_MULTIPRICES) {
diff --git a/htdocs/variants/class/ProductCombination2ValuePair.class.php b/htdocs/variants/class/ProductCombination2ValuePair.class.php
index e8ebbf57afd..0d23910b703 100644
--- a/htdocs/variants/class/ProductCombination2ValuePair.class.php
+++ b/htdocs/variants/class/ProductCombination2ValuePair.class.php
@@ -52,15 +52,15 @@ class ProductCombination2ValuePair
 	 */
 	public $fk_prod_attr_val;
 
-    /**
-     * Constructor
-     *
-     * @param   DoliDB $db     Database handler
-     */
-    public function __construct(DoliDB $db)
-    {
-        $this->db = $db;
-    }
+	/**
+	 * Constructor
+	 *
+	 * @param   DoliDB $db     Database handler
+	 */
+	public function __construct(DoliDB $db)
+	{
+		$this->db = $db;
+	}
 
 	/**
 	 * Translates this class to a human-readable string
diff --git a/htdocs/variants/combinations.php b/htdocs/variants/combinations.php
index 096072b9fc7..5c4afff1536 100644
--- a/htdocs/variants/combinations.php
+++ b/htdocs/variants/combinations.php
@@ -122,7 +122,7 @@ if ($_POST) {
 				$level_price_impact = array_map('price2num', $level_price_impact);
 			}
 			else {
-				$level_price_impact = array(1 => $weight_impact);
+				$level_price_impact = array(1 => $price_impact);
 				$level_price_impact_percent = array(1 => $price_impact_percent);
 			}
 
@@ -245,7 +245,7 @@ if ($_POST) {
 			$prodcomb->variation_price_percentage = (bool) $level_price_impact_percent[1];
 		}
 		else {
-			$level_price_impact = array(1 => $weight_impact);
+			$level_price_impact = array(1 => $price_impact);
 			$level_price_impact_percent = array(1 => $price_impact_percent);
 
 			$prodcomb->variation_price = $price_impact;
@@ -406,7 +406,7 @@ if (!empty($id) || !empty($ref))
 	print '</div>';
 	print '<div style="clear:both"></div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	$listofvariantselected = '';
 
@@ -434,7 +434,7 @@ if (!empty($id) || !empty($ref))
 				}
 			}
 			$listofvariantselected .= '</div>';
-			//dol_fiche_end();
+			//print dol_get_fiche_end();
 		} else {
 			$title = $langs->trans('EditProductCombination');
 		}
@@ -699,7 +699,7 @@ if (!empty($id) || !empty($ref))
 			<?php
 		}
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 		?>
 
 		<div style="text-align: center">
diff --git a/htdocs/variants/create.php b/htdocs/variants/create.php
index e822327266f..ce00ac51a1a 100644
--- a/htdocs/variants/create.php
+++ b/htdocs/variants/create.php
@@ -89,7 +89,7 @@ print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
 	</table>
 
 <?php
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Create").'"></div>';
 
diff --git a/htdocs/variants/create_val.php b/htdocs/variants/create_val.php
index 7b14bcbdde9..60c7a9032b7 100644
--- a/htdocs/variants/create_val.php
+++ b/htdocs/variants/create_val.php
@@ -106,7 +106,7 @@ print '<div class="underbanner clearboth"></div>';
 <?php
 print '</div>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '<br>';
 
@@ -134,7 +134,7 @@ print dol_get_fiche_head();
 	</table>
 <?php
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '<div class="center">';
 print '<input type="submit" class="button" name="create" value="'.$langs->trans("Create").'">';
diff --git a/htdocs/variants/generator.php b/htdocs/variants/generator.php
index 60b9cec6f8b..9c41335c867 100644
--- a/htdocs/variants/generator.php
+++ b/htdocs/variants/generator.php
@@ -112,9 +112,9 @@ if ($_POST)
 			{
 				$res = $combination->createProductCombination($user, $product, $currcomb, $sanitized_values, $price_var_percent);
 				if ($res < 0) {
-				    $error++;
-				    setEventMessages($combination->error, $combination->errors, 'errors');
-				    break;
+					$error++;
+					setEventMessages($combination->error, $combination->errors, 'errors');
+					break;
 				}
 			}
 
@@ -161,7 +161,7 @@ if (!empty($id) || !empty($ref)) {
 
 		dol_banner_tab($object, 'ref', $linkback, ($user->socid ? 0 : 1), 'ref', '', '', '', 0, '', '', 1);
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 	}
 
 	print load_fiche_titre($langs->trans('ProductCombinationGenerator'));
@@ -378,8 +378,8 @@ if (!empty($id) || !empty($ref)) {
 
 	<?php
 
-    // End of page
-    llxFooter();
+	// End of page
+	llxFooter();
 }
 
 $db->close();
diff --git a/htdocs/variants/list.php b/htdocs/variants/list.php
index 7973553f6d0..683b28719a9 100644
--- a/htdocs/variants/list.php
+++ b/htdocs/variants/list.php
@@ -58,7 +58,7 @@ llxHeader('', $title);
 $newcardbutton = '';
 if ($user->rights->produit->creer)
 {
-    $newcardbutton .= dolGetButtonTitle($langs->trans('Create'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/variants/create.php');
+	$newcardbutton .= dolGetButtonTitle($langs->trans('Create'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/variants/create.php');
 }
 
 print load_fiche_titre($title, $newcardbutton, 'product');
diff --git a/htdocs/viewimage.php b/htdocs/viewimage.php
index f13b786082a..983c7996898 100644
--- a/htdocs/viewimage.php
+++ b/htdocs/viewimage.php
@@ -121,14 +121,14 @@ if ($modulepart == 'fckeditor') $modulepart = 'medias'; // For backward compatib
 
 if (GETPOST("cache", 'alpha'))
 {
-    // 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');
-        header('Pragma: cache'); // This is to avoid having Pragma: no-cache
-    } else header('Cache-Control: no-cache');
-    //print $dolibarr_nocache; exit;
+	// 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');
+		header('Pragma: cache'); // This is to avoid having Pragma: no-cache
+	} else header('Cache-Control: no-cache');
+	//print $dolibarr_nocache; exit;
 }
 
 // If we have a hash public (hashp), we guess the original_file.
@@ -195,7 +195,7 @@ if (!empty($hashp)) {
 	$accessallowed = 1; // When using hashp, link is public so we force $accessallowed
 	$sqlprotectagainstexternals = '';
 } elseif (isset($_GET["publictakepos"])) {
-	if (! empty($conf->global->TAKEPOS_AUTO_ORDER)) {
+	if (!empty($conf->global->TAKEPOS_AUTO_ORDER)) {
 		$accessallowed = 1; // Only if TakePOS Public Auto Order is enabled and received publictakepos variable
 	}
 } else {
@@ -244,71 +244,71 @@ if (preg_match('/\.\./', $fullpath_original_file) || preg_match('/[<>|]/', $full
 
 if ($modulepart == 'barcode')
 {
-    $generator = GETPOST("generator", "alpha");
-    $code = GETPOST("code", 'none'); // This can be rich content (qrcode, datamatrix, ...)
-    $encoding = GETPOST("encoding", "alpha");
-    $readable = GETPOST("readable", 'alpha') ?GETPOST("readable", "alpha") : "Y";
+	$generator = GETPOST("generator", "alpha");
+	$code = GETPOST("code", 'none'); // This can be rich content (qrcode, datamatrix, ...)
+	$encoding = GETPOST("encoding", "alpha");
+	$readable = GETPOST("readable", 'alpha') ?GETPOST("readable", "alpha") : "Y";
 
-    if (empty($generator) || empty($encoding))
-    {
-        print 'Error: Parameter "generator" or "encoding" not defined';
-        exit;
-    }
+	if (empty($generator) || empty($encoding))
+	{
+		print 'Error: Parameter "generator" or "encoding" not defined';
+		exit;
+	}
 
-    $dirbarcode = array_merge(array("/core/modules/barcode/doc/"), $conf->modules_parts['barcode']);
+	$dirbarcode = array_merge(array("/core/modules/barcode/doc/"), $conf->modules_parts['barcode']);
 
-    $result = 0;
+	$result = 0;
 
-    foreach ($dirbarcode as $reldir)
-    {
-        $dir = dol_buildpath($reldir, 0);
-        $newdir = dol_osencode($dir);
+	foreach ($dirbarcode as $reldir)
+	{
+		$dir = dol_buildpath($reldir, 0);
+		$newdir = dol_osencode($dir);
 
-        // Check if directory exists (we do not use dol_is_dir to avoid loading files.lib.php)
-        if (!is_dir($newdir)) continue;
+		// Check if directory exists (we do not use dol_is_dir to avoid loading files.lib.php)
+		if (!is_dir($newdir)) continue;
 
-        $result = @include_once $newdir.$generator.'.modules.php';
-        if ($result) break;
-    }
+		$result = @include_once $newdir.$generator.'.modules.php';
+		if ($result) break;
+	}
 
-    // Load barcode class
-    $classname = "mod".ucfirst($generator);
-    $module = new $classname($db);
-    if ($module->encodingIsSupported($encoding))
-    {
-        $result = $module->buildBarCode($code, $encoding, $readable);
-    }
+	// Load barcode class
+	$classname = "mod".ucfirst($generator);
+	$module = new $classname($db);
+	if ($module->encodingIsSupported($encoding))
+	{
+		$result = $module->buildBarCode($code, $encoding, $readable);
+	}
 } else {
-    // Open and return file
-    clearstatcache();
+	// Open and return file
+	clearstatcache();
 
-    $filename = basename($fullpath_original_file);
+	$filename = basename($fullpath_original_file);
 
-    // Output files on browser
-    dol_syslog("viewimage.php return file $fullpath_original_file filename=$filename content-type=$type");
+	// Output files on browser
+	dol_syslog("viewimage.php return file $fullpath_original_file filename=$filename content-type=$type");
 
-    // This test is to avoid error images when image is not available (for example thumbs).
-    if (!dol_is_file($fullpath_original_file) && empty($_GET["noalt"]))
-    {
-        $fullpath_original_file = DOL_DOCUMENT_ROOT.'/public/theme/common/nophoto.png';
-        /*$error='Error: File '.$_GET["file"].' does not exists or filesystems permissions are not allowed';
+	// This test is to avoid error images when image is not available (for example thumbs).
+	if (!dol_is_file($fullpath_original_file) && empty($_GET["noalt"]))
+	{
+		$fullpath_original_file = DOL_DOCUMENT_ROOT.'/public/theme/common/nophoto.png';
+		/*$error='Error: File '.$_GET["file"].' does not exists or filesystems permissions are not allowed';
         print $error;
         exit;*/
-    }
+	}
 
-    // Permissions are ok and file found, so we return it
-    if ($type)
-    {
-        top_httphead($type);
-        header('Content-Disposition: inline; filename="'.basename($fullpath_original_file).'"');
-    } else {
-        top_httphead('image/png');
-        header('Content-Disposition: inline; filename="'.basename($fullpath_original_file).'"');
-    }
+	// Permissions are ok and file found, so we return it
+	if ($type)
+	{
+		top_httphead($type);
+		header('Content-Disposition: inline; filename="'.basename($fullpath_original_file).'"');
+	} else {
+		top_httphead('image/png');
+		header('Content-Disposition: inline; filename="'.basename($fullpath_original_file).'"');
+	}
 
-    $fullpath_original_file_osencoded = dol_osencode($fullpath_original_file);
+	$fullpath_original_file_osencoded = dol_osencode($fullpath_original_file);
 
-    readfile($fullpath_original_file_osencoded);
+	readfile($fullpath_original_file_osencoded);
 }
 
 
diff --git a/htdocs/webservices/admin/index.php b/htdocs/webservices/admin/index.php
index 9017aa40815..e0960e2baad 100644
--- a/htdocs/webservices/admin/index.php
+++ b/htdocs/webservices/admin/index.php
@@ -37,21 +37,21 @@ $actionsave = GETPOST("save");
 // Sauvegardes parametres
 if ($actionsave)
 {
-    $i = 0;
+	$i = 0;
 
-    $db->begin();
+	$db->begin();
 
-    $i += dolibarr_set_const($db, 'WEBSERVICES_KEY', GETPOST("WEBSERVICES_KEY"), 'chaine', 0, '', $conf->entity);
+	$i += dolibarr_set_const($db, 'WEBSERVICES_KEY', GETPOST("WEBSERVICES_KEY"), 'chaine', 0, '', $conf->entity);
 
-    if ($i >= 1)
-    {
-        $db->commit();
-        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else {
-        $db->rollback();
-        setEventMessages($langs->trans("Error"), null, 'errors');
-    }
+	if ($i >= 1)
+	{
+		$db->commit();
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	}
+	else {
+		$db->rollback();
+		setEventMessages($langs->trans("Error"), null, 'errors');
+	}
 }
 
 
@@ -109,7 +109,7 @@ $webservices = array(
 		'actioncomm'		=> '!empty($conf->agenda->enabled)',
 		'category'			=> '!empty($conf->categorie->enabled)',
 		'project'			=> '!empty($conf->projet->enabled)',
-        'other'				=> ''
+		'other'				=> ''
 );
 
 
diff --git a/htdocs/webservices/server_actioncomm.php b/htdocs/webservices/server_actioncomm.php
index d3a59962d88..7864c93243f 100644
--- a/htdocs/webservices/server_actioncomm.php
+++ b/htdocs/webservices/server_actioncomm.php
@@ -39,11 +39,11 @@ dol_syslog("Call ActionComm webservices interfaces");
 // Enable and test if module web services is enabled
 if (empty($conf->global->MAIN_MODULE_WEBSERVICES))
 {
-    $langs->load("admin");
-    dol_syslog("Call Dolibarr webservices interfaces with module webservices disabled");
-    print $langs->trans("WarningModuleNotActive", 'WebServices').'.<br><br>';
-    print $langs->trans("ToActivateModule");
-    exit;
+	$langs->load("admin");
+	dol_syslog("Call Dolibarr webservices interfaces with module webservices disabled");
+	print $langs->trans("WarningModuleNotActive", 'WebServices').'.<br><br>';
+	print $langs->trans("ToActivateModule");
+	exit;
 }
 
 // Create the soap Object
@@ -57,36 +57,36 @@ $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'),
+	)
 );
 
 
 $actioncomm_fields = array(
-    'id' => array('name'=>'id', 'type'=>'xsd:string'),
+	'id' => array('name'=>'id', 'type'=>'xsd:string'),
 	'ref' => array('name'=>'ref', 'type'=>'xsd:string'),
 	'ref_ext' => array('name'=>'ref_ext', 'type'=>'xsd:string'),
 	'type_id' => array('name'=>'type_id', 'type'=>'xsd:string'),
@@ -137,11 +137,11 @@ if (is_array($extrafield_array)) $actioncomm_fields = array_merge($actioncomm_fi
 
 // Define other specific objects
 $server->wsdl->addComplexType(
-    'actioncomm',
-    'complexType',
-    'struct',
-    'all',
-    '',
+	'actioncomm',
+	'complexType',
+	'struct',
+	'all',
+	'',
 	$actioncomm_fields
 );
 
@@ -165,12 +165,12 @@ $server->wsdl->addComplexType(
 	'sequence',
 	'',
 	array(
-        'actioncommtype' => array(
-            'name' => 'actioncommtype',
-            'type' => 'tns:actioncommtype',
-            'minOccurs' => '0',
-            'maxOccurs' => 'unbounded'
-        )
+		'actioncommtype' => array(
+			'name' => 'actioncommtype',
+			'type' => 'tns:actioncommtype',
+			'minOccurs' => '0',
+			'maxOccurs' => 'unbounded'
+		)
 	)
 );
 
@@ -199,16 +199,16 @@ $server->register(
 
 // Register WSDL
 $server->register(
-    'getActionComm',
-    // Entry values
-    array('authentication'=>'tns:authentication', 'id'=>'xsd:string'),
-    // Exit values
-    array('result'=>'tns:result', 'actioncomm'=>'tns:actioncomm'),
-    $ns,
-    $ns.'#getActionComm',
-    $styledoc,
-    $styleuse,
-    'WS to get actioncomm'
+	'getActionComm',
+	// Entry values
+	array('authentication'=>'tns:authentication', 'id'=>'xsd:string'),
+	// Exit values
+	array('result'=>'tns:result', 'actioncomm'=>'tns:actioncomm'),
+	$ns,
+	$ns.'#getActionComm',
+	$styledoc,
+	$styleuse,
+	'WS to get actioncomm'
 );
 
 // Register WSDL
@@ -251,100 +251,100 @@ $server->register(
  */
 function getActionComm($authentication, $id)
 {
-    global $db, $conf, $langs;
+	global $db, $conf, $langs;
 
-    dol_syslog("Function: getActionComm login=".$authentication['login']." id=".$id);
+	dol_syslog("Function: getActionComm login=".$authentication['login']." id=".$id);
 
-    if ($authentication['entity']) $conf->entity = $authentication['entity'];
+	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
-    if ($error || (!$id))
-    {
-        $error++;
-        $errorcode = 'BAD_PARAMETERS'; $errorlabel = "Parameter id, ref and ref_ext can't be both provided. You must choose one or other but not both.";
-    }
+	// Init and check authentication
+	$objectresp = array();
+	$errorcode = ''; $errorlabel = '';
+	$error = 0;
+	$fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
+	// Check parameters
+	if ($error || (!$id))
+	{
+		$error++;
+		$errorcode = 'BAD_PARAMETERS'; $errorlabel = "Parameter id, ref and ref_ext can't be both provided. You must choose one or other but not both.";
+	}
 
-    if (!$error)
-    {
-        $fuser->getrights();
+	if (!$error)
+	{
+		$fuser->getrights();
 
-        if ($fuser->rights->agenda->allactions->read)
-        {
-            $actioncomm = new ActionComm($db);
-            $result = $actioncomm->fetch($id);
-            if ($result > 0)
-            {
-            	$actioncomm_result_fields = array(
+		if ($fuser->rights->agenda->allactions->read)
+		{
+			$actioncomm = new ActionComm($db);
+			$result = $actioncomm->fetch($id);
+			if ($result > 0)
+			{
+				$actioncomm_result_fields = array(
 						'id' => $actioncomm->id,
 						'ref'=> $actioncomm->ref,
-			        	'ref_ext'=> $actioncomm->ref_ext,
-			        	'type_id'=> $actioncomm->type_id,
-			        	'type_code'=> $actioncomm->type_code,
-			        	'type'=> $actioncomm->type,
-			        	'label'=> $actioncomm->label,
-			        	'datep'=> dol_print_date($actioncomm->datep, 'dayhourrfc'),
-			        	'datef'=> dol_print_date($actioncomm->datef, 'dayhourrfc'),
-			        	'datec'=> dol_print_date($actioncomm->datec, 'dayhourrfc'),
-			        	'datem'=> dol_print_date($actioncomm->datem, 'dayhourrfc'),
-			        	'note'=> $actioncomm->note_private,
-			        	'percentage'=> $actioncomm->percentage,
-			        	'author'=> $actioncomm->authorid,
-			        	'usermod'=> $actioncomm->usermodid,
-			        	'userownerid'=> $actioncomm->userownerid,
-			        	'priority'=> $actioncomm->priority,
-			        	'fulldayevent'=> $actioncomm->fulldayevent,
-			        	'location'=> $actioncomm->location,
-			        	'socid'=> $actioncomm->socid,
-			        	'contactid'=> $actioncomm->contact_id,
-			        	'projectid'=> $actioncomm->fk_project,
-			        	'fk_element'=> $actioncomm->fk_element,
-			        	'elementtype'=> $actioncomm->elementtype
-            	);
+						'ref_ext'=> $actioncomm->ref_ext,
+						'type_id'=> $actioncomm->type_id,
+						'type_code'=> $actioncomm->type_code,
+						'type'=> $actioncomm->type,
+						'label'=> $actioncomm->label,
+						'datep'=> dol_print_date($actioncomm->datep, 'dayhourrfc'),
+						'datef'=> dol_print_date($actioncomm->datef, 'dayhourrfc'),
+						'datec'=> dol_print_date($actioncomm->datec, 'dayhourrfc'),
+						'datem'=> dol_print_date($actioncomm->datem, 'dayhourrfc'),
+						'note'=> $actioncomm->note_private,
+						'percentage'=> $actioncomm->percentage,
+						'author'=> $actioncomm->authorid,
+						'usermod'=> $actioncomm->usermodid,
+						'userownerid'=> $actioncomm->userownerid,
+						'priority'=> $actioncomm->priority,
+						'fulldayevent'=> $actioncomm->fulldayevent,
+						'location'=> $actioncomm->location,
+						'socid'=> $actioncomm->socid,
+						'contactid'=> $actioncomm->contact_id,
+						'projectid'=> $actioncomm->fk_project,
+						'fk_element'=> $actioncomm->fk_element,
+						'elementtype'=> $actioncomm->elementtype
+				);
 
-            	$elementtype = 'actioncomm';
+				$elementtype = 'actioncomm';
 
-	        	// Retrieve all extrafield for actioncomm
-	        	// fetch optionals attributes and labels
-	        	$extrafields = new ExtraFields($db);
-	        	$extrafields->fetch_name_optionals_label($elementtype, true);
-	        	//Get extrafield values
-	        	$actioncomm->fetch_optionals();
+				// Retrieve all extrafield for actioncomm
+				// fetch optionals attributes and labels
+				$extrafields = new ExtraFields($db);
+				$extrafields->fetch_name_optionals_label($elementtype, true);
+				//Get extrafield values
+				$actioncomm->fetch_optionals();
 
-	        	if (is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label']))
-	        	{
-	        		foreach ($extrafields->attributes[$elementtype]['label'] as $key=>$label)
-		        	{
-		        		$actioncomm_result_fields = array_merge($actioncomm_result_fields, array('options_'.$key => $actioncomm->array_options['options_'.$key]));
-		        	}
-	        	}
+				if (is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label']))
+				{
+					foreach ($extrafields->attributes[$elementtype]['label'] as $key=>$label)
+					{
+						$actioncomm_result_fields = array_merge($actioncomm_result_fields, array('options_'.$key => $actioncomm->array_options['options_'.$key]));
+					}
+				}
 
-                // Create
-                $objectresp = array(
-			    	'result'=>array('result_code'=>'OK', 'result_label'=>''),
-			        'actioncomm'=>$actioncomm_result_fields);
-            }
-            else {
-                $error++;
-                $errorcode = 'NOT_FOUND'; $errorlabel = 'Object not found for id='.$id.' nor ref='.$ref.' nor ref_ext='.$ref_ext;
-            }
-        }
-        else {
-            $error++;
-            $errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
-        }
-    }
+				// Create
+				$objectresp = array(
+					'result'=>array('result_code'=>'OK', 'result_label'=>''),
+					'actioncomm'=>$actioncomm_result_fields);
+			}
+			else {
+				$error++;
+				$errorcode = 'NOT_FOUND'; $errorlabel = 'Object not found for id='.$id.' nor ref='.$ref.' nor ref_ext='.$ref_ext;
+			}
+		}
+		else {
+			$error++;
+			$errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
+		}
+	}
 
-    if ($error)
-    {
-        $objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
-    }
+	if ($error)
+	{
+		$objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
+	}
 
-    return $objectresp;
+	return $objectresp;
 }
 
 
@@ -384,8 +384,8 @@ function getListActionCommType($authentication)
 				}
 
 				 $objectresp = array(
-			    	'result'=>array('result_code'=>'OK', 'result_label'=>''),
-			        'actioncommtypes'=>$resultarray);
+					'result'=>array('result_code'=>'OK', 'result_label'=>''),
+					'actioncommtypes'=>$resultarray);
 			} else {
 				$error++;
 				$errorcode = 'NOT_FOUND'; $errorlabel = 'Object not found for id='.$id.' nor ref='.$ref.' nor ref_ext='.$ref_ext;
diff --git a/htdocs/webservices/server_category.php b/htdocs/webservices/server_category.php
index d7382447749..949c95dc530 100644
--- a/htdocs/webservices/server_category.php
+++ b/htdocs/webservices/server_category.php
@@ -93,16 +93,16 @@ $server->wsdl->addComplexType(
  * Les catégories filles, sous tableau dez la catégorie
  */
 $server->wsdl->addComplexType(
-    'FillesArray',
-    'complexType',
-    'array',
-    '',
-    'SOAP-ENC:Array',
-    array(),
-    array(
-        array('ref'=>'SOAP-ENC:arrayType', 'wsdl:arrayType'=>'tns:categorie[]')
-    ),
-    'tns:categorie'
+	'FillesArray',
+	'complexType',
+	'array',
+	'',
+	'SOAP-ENC:Array',
+	array(),
+	array(
+		array('ref'=>'SOAP-ENC:arrayType', 'wsdl:arrayType'=>'tns:categorie[]')
+	),
+	'tns:categorie'
 );
 
  /*
@@ -172,10 +172,10 @@ $server->register(
 	// Exit values
 	array('result'=>'tns:result', 'categorie'=>'tns:categorie'),
 	$ns,
-    $ns.'#getCategory',
-    $styledoc,
-    $styleuse,
-    'WS to get category'
+	$ns.'#getCategory',
+	$styledoc,
+	$styleuse,
+	'WS to get category'
 );
 
 
@@ -232,7 +232,7 @@ function getCategory($authentication, $id)
 					'type' => $categorie->type,
 					'dir' => $pdir,
 					'photos' => $categorie->liste_photos($dir, $nbmax)
-		    	);
+				);
 
 				$cats = $categorie->get_filles();
 				if (count($cats) > 0)
@@ -256,11 +256,11 @@ function getCategory($authentication, $id)
 					}
 				}
 
-			    // Create
-			    $objectresp = array(
+				// Create
+				$objectresp = array(
 					'result'=>array('result_code'=>'OK', 'result_label'=>''),
 					'categorie'=> $cat
-			    );
+				);
 			}
 			else {
 				$error++;
diff --git a/htdocs/webservices/server_contact.php b/htdocs/webservices/server_contact.php
index c4818d050f6..9abc7b6088f 100644
--- a/htdocs/webservices/server_contact.php
+++ b/htdocs/webservices/server_contact.php
@@ -35,11 +35,11 @@ dol_syslog("Call Contact webservices interfaces");
 // Enable and test if module web services is enabled
 if (empty($conf->global->MAIN_MODULE_WEBSERVICES))
 {
-    $langs->load("admin");
-    dol_syslog("Call Dolibarr webservices interfaces with module webservices disabled");
-    print $langs->trans("WarningModuleNotActive", 'WebServices').'.<br><br>';
-    print $langs->trans("ToActivateModule");
-    exit;
+	$langs->load("admin");
+	dol_syslog("Call Dolibarr webservices interfaces with module webservices disabled");
+	print $langs->trans("WarningModuleNotActive", 'WebServices').'.<br><br>';
+	print $langs->trans("ToActivateModule");
+	exit;
 }
 
 // Create the soap Object
@@ -53,31 +53,31 @@ $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'),
+	)
 );
 
 $contact_fields = array(
@@ -142,11 +142,11 @@ if (is_array($extrafield_array)) $contact_fields = array_merge($contact_fields,
 
 // Define other specific objects
 $server->wsdl->addComplexType(
-    'contact',
-    'complexType',
-    'struct',
-    'all',
-    '',
+	'contact',
+	'complexType',
+	'struct',
+	'all',
+	'',
 	$contact_fields
 );
 
@@ -179,16 +179,16 @@ $styleuse = 'encoded'; // encoded/literal/literal wrapped
 
 // Register WSDL
 $server->register(
-    'getContact',
-    // Entry values
-    array('authentication'=>'tns:authentication', 'id'=>'xsd:string', 'ref_ext'=>'xsd:string'),
-    // Exit values
-    array('result'=>'tns:result', 'contact'=>'tns:contact'),
-    $ns,
-    $ns.'#getContact',
-    $styledoc,
-    $styleuse,
-    'WS to get a contact'
+	'getContact',
+	// Entry values
+	array('authentication'=>'tns:authentication', 'id'=>'xsd:string', 'ref_ext'=>'xsd:string'),
+	// Exit values
+	array('result'=>'tns:result', 'contact'=>'tns:contact'),
+	$ns,
+	$ns.'#getContact',
+	$styledoc,
+	$styleuse,
+	'WS to get a contact'
 );
 
 // Register WSDL
@@ -243,113 +243,113 @@ $server->register(
  */
 function getContact($authentication, $id, $ref_ext)
 {
-    global $db, $conf, $langs;
+	global $db, $conf, $langs;
 
-    dol_syslog("Function: getContact login=".$authentication['login']." id=".$id." ref_ext=".$ref_ext);
+	dol_syslog("Function: getContact login=".$authentication['login']." id=".$id." ref_ext=".$ref_ext);
 
-    if ($authentication['entity']) $conf->entity = $authentication['entity'];
+	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
-    if (!$error && ($id && $ref_ext))
-    {
-        $error++;
-        $errorcode = 'BAD_PARAMETERS'; $errorlabel = "Parameter id and ref_ext can't be both provided. You must choose one or other but not both.";
-    }
+	// Init and check authentication
+	$objectresp = array();
+	$errorcode = ''; $errorlabel = '';
+	$error = 0;
+	$fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
+	// Check parameters
+	if (!$error && ($id && $ref_ext))
+	{
+		$error++;
+		$errorcode = 'BAD_PARAMETERS'; $errorlabel = "Parameter id and ref_ext can't be both provided. You must choose one or other but not both.";
+	}
 
-    if (!$error)
-    {
-        $fuser->getrights();
+	if (!$error)
+	{
+		$fuser->getrights();
 
-        $contact = new Contact($db);
-        $result = $contact->fetch($id, 0, $ref_ext);
-        if ($result > 0)
-        {
-        	// Only internal user who have contact read permission
-        	// Or for external user who have contact read permission, with restrict on societe_id
-	        if (
-	        	$fuser->rights->societe->contact->lire && !$fuser->societe_id
-	        	|| ($fuser->rights->societe->contact->lire && ($fuser->societe_id == $contact->socid))
-	        ) {
-            	$contact_result_fields = array(
-	            	'id' => $contact->id,
-	            	'ref_ext' => $contact->ref_ext,
-	            	'lastname' => $contact->lastname,
-	            	'firstname' => $contact->firstname,
-	            	'address' => $contact->address,
-	            	'zip' => $contact->zip,
-	            	'town' => $contact->town,
-	            	'state_id' => $contact->state_id,
-	            	'state_code' => $contact->state_code,
-	            	'state' => $contact->state,
-	            	'country_id' => $contact->country_id,
-	            	'country_code' => $contact->country_code,
-	            	'country' => $contact->country,
-	            	'socid' => $contact->socid,
-	            	'status' => $contact->statut,
-	            	'phone_pro' => $contact->phone_pro,
-	            	'fax' => $contact->fax,
-	            	'phone_perso' => $contact->phone_perso,
-	            	'phone_mobile' => $contact->phone_mobile,
-	            	'code' => $contact->code,
-	            	'email' => $contact->email,
-	            	'birthday' => $contact->birthday,
-	            	'default_lang' => $contact->default_lang,
-	            	'note' => $contact->note,
-	            	'ref_facturation' => $contact->ref_facturation,
-	            	'ref_contrat' => $contact->ref_contrat,
-	            	'ref_commande' => $contact->ref_commande,
-	            	'ref_propal' => $contact->ref_propal,
-	            	'user_id' => $contact->user_id,
-	            	'user_login' => $contact->user_login,
-	            	'civility_id' => $contact->civility_id,
-            		'poste' => $contact->poste
-            	);
+		$contact = new Contact($db);
+		$result = $contact->fetch($id, 0, $ref_ext);
+		if ($result > 0)
+		{
+			// Only internal user who have contact read permission
+			// Or for external user who have contact read permission, with restrict on societe_id
+			if (
+				$fuser->rights->societe->contact->lire && !$fuser->societe_id
+				|| ($fuser->rights->societe->contact->lire && ($fuser->societe_id == $contact->socid))
+			) {
+				$contact_result_fields = array(
+					'id' => $contact->id,
+					'ref_ext' => $contact->ref_ext,
+					'lastname' => $contact->lastname,
+					'firstname' => $contact->firstname,
+					'address' => $contact->address,
+					'zip' => $contact->zip,
+					'town' => $contact->town,
+					'state_id' => $contact->state_id,
+					'state_code' => $contact->state_code,
+					'state' => $contact->state,
+					'country_id' => $contact->country_id,
+					'country_code' => $contact->country_code,
+					'country' => $contact->country,
+					'socid' => $contact->socid,
+					'status' => $contact->statut,
+					'phone_pro' => $contact->phone_pro,
+					'fax' => $contact->fax,
+					'phone_perso' => $contact->phone_perso,
+					'phone_mobile' => $contact->phone_mobile,
+					'code' => $contact->code,
+					'email' => $contact->email,
+					'birthday' => $contact->birthday,
+					'default_lang' => $contact->default_lang,
+					'note' => $contact->note,
+					'ref_facturation' => $contact->ref_facturation,
+					'ref_contrat' => $contact->ref_contrat,
+					'ref_commande' => $contact->ref_commande,
+					'ref_propal' => $contact->ref_propal,
+					'user_id' => $contact->user_id,
+					'user_login' => $contact->user_login,
+					'civility_id' => $contact->civility_id,
+					'poste' => $contact->poste
+				);
 
-            	$elementtype = 'socpeople';
+				$elementtype = 'socpeople';
 
-            	//Retrieve all extrafield for thirdsparty
-            	// fetch optionals attributes and labels
-            	$extrafields = new ExtraFields($db);
-            	$extrafields->fetch_name_optionals_label($elementtype, true);
-            	//Get extrafield values
-            	$contact->fetch_optionals();
+				//Retrieve all extrafield for thirdsparty
+				// fetch optionals attributes and labels
+				$extrafields = new ExtraFields($db);
+				$extrafields->fetch_name_optionals_label($elementtype, true);
+				//Get extrafield values
+				$contact->fetch_optionals();
 
-            	if (is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label']))
-            	{
-            		foreach ($extrafields->attributes[$elementtype]['label'] as $key=>$label)
-	            	{
-	            		$contact_result_fields = array_merge($contact_result_fields, array('options_'.$key => $contact->array_options['options_'.$key]));
-	            	}
-            	}
+				if (is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label']))
+				{
+					foreach ($extrafields->attributes[$elementtype]['label'] as $key=>$label)
+					{
+						$contact_result_fields = array_merge($contact_result_fields, array('options_'.$key => $contact->array_options['options_'.$key]));
+					}
+				}
 
-                // Create
-                $objectresp = array(
-			    	'result'=>array('result_code'=>'OK', 'result_label'=>''),
-			        'contact'=>$contact_result_fields
-                );
-	        }
-	        else {
-	            $error++;
-	            $errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
-	        }
-        }
-        else {
-            $error++;
-            $errorcode = 'NOT_FOUND'; $errorlabel = 'Object not found for id='.$id.' nor ref_ext='.$ref_ext;
-        }
-    }
+				// Create
+				$objectresp = array(
+					'result'=>array('result_code'=>'OK', 'result_label'=>''),
+					'contact'=>$contact_result_fields
+				);
+			}
+			else {
+				$error++;
+				$errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
+			}
+		}
+		else {
+			$error++;
+			$errorcode = 'NOT_FOUND'; $errorlabel = 'Object not found for id='.$id.' nor ref_ext='.$ref_ext;
+		}
+	}
 
-    if ($error)
-    {
-        $objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
-    }
+	if ($error)
+	{
+		$objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
+	}
 
-    return $objectresp;
+	return $objectresp;
 }
 
 
@@ -623,11 +623,11 @@ function updateContact($authentication, $contact)
 		$error++; $errorcode = 'KO'; $errorlabel = "Contact id or ref_ext is mandatory.";
 	}
 	// Check parameters
-    if (!$error && ($id && $ref_ext))
-    {
-        $error++;
-        $errorcode = 'BAD_PARAMETERS'; $errorlabel = "Parameter id and ref_ext can't be all provided. You must choose one of them.";
-    }
+	if (!$error && ($id && $ref_ext))
+	{
+		$error++;
+		$errorcode = 'BAD_PARAMETERS'; $errorlabel = "Parameter id and ref_ext can't be all provided. You must choose one of them.";
+	}
 
 	if (!$error)
 	{
diff --git a/htdocs/webservices/server_invoice.php b/htdocs/webservices/server_invoice.php
index 194a2331b2c..5a8e6fb241c 100644
--- a/htdocs/webservices/server_invoice.php
+++ b/htdocs/webservices/server_invoice.php
@@ -58,57 +58,57 @@ $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 other specific objects
 $server->wsdl->addComplexType(
-    'line',
-    'complexType',
-    'struct',
-    'all',
-    '',
-    array(
-        'id' => array('name'=>'id', 'type'=>'xsd:string'),
-        'type' => array('name'=>'type', 'type'=>'xsd:int'),
-        'desc' => array('name'=>'desc', 'type'=>'xsd:string'),
-        'vat_rate' => array('name'=>'vat_rate', 'type'=>'xsd:double'),
-        'qty' => array('name'=>'qty', 'type'=>'xsd:double'),
-        'unitprice' => array('name'=>'unitprice', 'type'=>'xsd:double'),
-        'total_net' => array('name'=>'total_net', 'type'=>'xsd:double'),
-    	'total_vat' => array('name'=>'total_vat', 'type'=>'xsd:double'),
-    	'total' => array('name'=>'total', 'type'=>'xsd:double'),
-        'date_start' => array('name'=>'date_start', 'type'=>'xsd:date'),
-        'date_end' => array('name'=>'date_end', 'type'=>'xsd:date'),
-        // From product
-        'product_id' => array('name'=>'product_id', 'type'=>'xsd:int'),
-        'product_ref' => array('name'=>'product_ref', 'type'=>'xsd:string'),
-        'product_label' => array('name'=>'product_label', 'type'=>'xsd:string'),
-        'product_desc' => array('name'=>'product_desc', 'type'=>'xsd:string')
-    )
+	'line',
+	'complexType',
+	'struct',
+	'all',
+	'',
+	array(
+		'id' => array('name'=>'id', 'type'=>'xsd:string'),
+		'type' => array('name'=>'type', 'type'=>'xsd:int'),
+		'desc' => array('name'=>'desc', 'type'=>'xsd:string'),
+		'vat_rate' => array('name'=>'vat_rate', 'type'=>'xsd:double'),
+		'qty' => array('name'=>'qty', 'type'=>'xsd:double'),
+		'unitprice' => array('name'=>'unitprice', 'type'=>'xsd:double'),
+		'total_net' => array('name'=>'total_net', 'type'=>'xsd:double'),
+		'total_vat' => array('name'=>'total_vat', 'type'=>'xsd:double'),
+		'total' => array('name'=>'total', 'type'=>'xsd:double'),
+		'date_start' => array('name'=>'date_start', 'type'=>'xsd:date'),
+		'date_end' => array('name'=>'date_end', 'type'=>'xsd:date'),
+		// From product
+		'product_id' => array('name'=>'product_id', 'type'=>'xsd:int'),
+		'product_ref' => array('name'=>'product_ref', 'type'=>'xsd:string'),
+		'product_label' => array('name'=>'product_label', 'type'=>'xsd:string'),
+		'product_desc' => array('name'=>'product_desc', 'type'=>'xsd:string')
+	)
 );
 
 /*$server->wsdl->addComplexType(
@@ -124,55 +124,55 @@ $server->wsdl->addComplexType(
     'tns:line'
 );*/
 $server->wsdl->addComplexType(
-    'LinesArray2',
-    'complexType',
-    'array',
-    'sequence',
-    '',
-    array(
-        'line' => array(
-            'name' => 'line',
-            'type' => 'tns:line',
-            'minOccurs' => '0',
-            'maxOccurs' => 'unbounded'
-        )
-    ),
-    null,
-    'tns:line'
+	'LinesArray2',
+	'complexType',
+	'array',
+	'sequence',
+	'',
+	array(
+		'line' => array(
+			'name' => 'line',
+			'type' => 'tns:line',
+			'minOccurs' => '0',
+			'maxOccurs' => 'unbounded'
+		)
+	),
+	null,
+	'tns:line'
 );
 
 
 $server->wsdl->addComplexType(
-    'invoice',
-    'complexType',
-    'struct',
-    'all',
-    '',
-    array(
-    	'id' => array('name'=>'id', 'type'=>'xsd:string'),
-        'ref' => array('name'=>'ref', 'type'=>'xsd:string'),
-        'ref_ext' => array('name'=>'ref_ext', 'type'=>'xsd:string'),
-        'thirdparty_id' => array('name'=>'thirdparty_id', 'type'=>'xsd:int'),
-        'fk_user_author' => array('name'=>'fk_user_author', 'type'=>'xsd:string'),
-        'fk_user_valid' => array('name'=>'fk_user_valid', 'type'=>'xsd:string'),
-        'date' => array('name'=>'date', 'type'=>'xsd:date'),
-        'date_due' => array('name'=>'date_due', 'type'=>'xsd:date'),
-        'date_creation' => array('name'=>'date_creation', 'type'=>'xsd:dateTime'),
-        'date_validation' => array('name'=>'date_validation', 'type'=>'xsd:dateTime'),
-        'date_modification' => array('name'=>'date_modification', 'type'=>'xsd:dateTime'),
-    	'payment_mode_id' => array('name'=>'payment_mode_id', 'type'=>'xsd:string'),
-        'type' => array('name'=>'type', 'type'=>'xsd:int'),
-        'total_net' => array('name'=>'type', 'type'=>'xsd:double'),
-        'total_vat' => array('name'=>'type', 'type'=>'xsd:double'),
-        'total' => array('name'=>'type', 'type'=>'xsd:double'),
-        'note_private' => array('name'=>'note_private', 'type'=>'xsd:string'),
-        'note_public' => array('name'=>'note_public', 'type'=>'xsd:string'),
-        'status' => array('name'=>'status', 'type'=>'xsd:int'),
-        'close_code' => array('name'=>'close_code', 'type'=>'xsd:string'),
-        'close_note' => array('name'=>'close_note', 'type'=>'xsd:string'),
-        'project_id' => array('name'=>'project_id', 'type'=>'xsd:string'),
-        'lines' => array('name'=>'lines', 'type'=>'tns:LinesArray2')
-    )
+	'invoice',
+	'complexType',
+	'struct',
+	'all',
+	'',
+	array(
+		'id' => array('name'=>'id', 'type'=>'xsd:string'),
+		'ref' => array('name'=>'ref', 'type'=>'xsd:string'),
+		'ref_ext' => array('name'=>'ref_ext', 'type'=>'xsd:string'),
+		'thirdparty_id' => array('name'=>'thirdparty_id', 'type'=>'xsd:int'),
+		'fk_user_author' => array('name'=>'fk_user_author', 'type'=>'xsd:string'),
+		'fk_user_valid' => array('name'=>'fk_user_valid', 'type'=>'xsd:string'),
+		'date' => array('name'=>'date', 'type'=>'xsd:date'),
+		'date_due' => array('name'=>'date_due', 'type'=>'xsd:date'),
+		'date_creation' => array('name'=>'date_creation', 'type'=>'xsd:dateTime'),
+		'date_validation' => array('name'=>'date_validation', 'type'=>'xsd:dateTime'),
+		'date_modification' => array('name'=>'date_modification', 'type'=>'xsd:dateTime'),
+		'payment_mode_id' => array('name'=>'payment_mode_id', 'type'=>'xsd:string'),
+		'type' => array('name'=>'type', 'type'=>'xsd:int'),
+		'total_net' => array('name'=>'type', 'type'=>'xsd:double'),
+		'total_vat' => array('name'=>'type', 'type'=>'xsd:double'),
+		'total' => array('name'=>'type', 'type'=>'xsd:double'),
+		'note_private' => array('name'=>'note_private', 'type'=>'xsd:string'),
+		'note_public' => array('name'=>'note_public', 'type'=>'xsd:string'),
+		'status' => array('name'=>'status', 'type'=>'xsd:int'),
+		'close_code' => array('name'=>'close_code', 'type'=>'xsd:string'),
+		'close_note' => array('name'=>'close_note', 'type'=>'xsd:string'),
+		'project_id' => array('name'=>'project_id', 'type'=>'xsd:string'),
+		'lines' => array('name'=>'lines', 'type'=>'tns:LinesArray2')
+	)
 );
 /*
 $server->wsdl->addComplexType(
@@ -188,21 +188,21 @@ $server->wsdl->addComplexType(
     'tns:invoice'
 );*/
 $server->wsdl->addComplexType(
-    'InvoicesArray2',
-    'complexType',
-    'array',
-    'sequence',
-    '',
-    array(
-        'invoice' => array(
-            'name' => 'invoice',
-            'type' => 'tns:invoice',
-            'minOccurs' => '0',
-            'maxOccurs' => 'unbounded'
-        )
-    ),
-    null,
-    'tns:invoice'
+	'InvoicesArray2',
+	'complexType',
+	'array',
+	'sequence',
+	'',
+	array(
+		'invoice' => array(
+			'name' => 'invoice',
+			'type' => 'tns:invoice',
+			'minOccurs' => '0',
+			'maxOccurs' => 'unbounded'
+		)
+	),
+	null,
+	'tns:invoice'
 );
 
 
@@ -216,40 +216,40 @@ $styleuse = 'encoded'; // encoded/literal/literal wrapped
 
 // Register WSDL
 $server->register(
-    'getInvoice',
-    // Entry values
-    array('authentication'=>'tns:authentication', 'id'=>'xsd:string', 'ref'=>'xsd:string', 'ref_ext'=>'xsd:string'),
-    // Exit values
-    array('result'=>'tns:result', 'invoice'=>'tns:invoice'),
-    $ns,
-    $ns.'#getInvoice',
-    $styledoc,
-    $styleuse,
-    'WS to get a particular invoice'
+	'getInvoice',
+	// Entry values
+	array('authentication'=>'tns:authentication', 'id'=>'xsd:string', 'ref'=>'xsd:string', 'ref_ext'=>'xsd:string'),
+	// Exit values
+	array('result'=>'tns:result', 'invoice'=>'tns:invoice'),
+	$ns,
+	$ns.'#getInvoice',
+	$styledoc,
+	$styleuse,
+	'WS to get a particular invoice'
 );
 $server->register(
-    'getInvoicesForThirdParty',
-    // Entry values
-    array('authentication'=>'tns:authentication', 'idthirdparty'=>'xsd:string'),
-    // Exit values
-    array('result'=>'tns:result', 'invoices'=>'tns:InvoicesArray2'),
-    $ns,
-    $ns.'#getInvoicesForThirdParty',
-    $styledoc,
-    $styleuse,
-    'WS to get all invoices of a third party'
+	'getInvoicesForThirdParty',
+	// Entry values
+	array('authentication'=>'tns:authentication', 'idthirdparty'=>'xsd:string'),
+	// Exit values
+	array('result'=>'tns:result', 'invoices'=>'tns:InvoicesArray2'),
+	$ns,
+	$ns.'#getInvoicesForThirdParty',
+	$styledoc,
+	$styleuse,
+	'WS to get all invoices of a third party'
 );
 $server->register(
-    'createInvoice',
-    // Entry values
-    array('authentication'=>'tns:authentication', 'invoice'=>'tns:invoice'),
-    // Exit values
-    array('result'=>'tns:result', 'id'=>'xsd:string', 'ref'=>'xsd:string', 'ref_ext'=>'xsd:string'),
-    $ns,
-    $ns.'#createInvoice',
-    $styledoc,
-    $styleuse,
-    'WS to create an invoice'
+	'createInvoice',
+	// Entry values
+	array('authentication'=>'tns:authentication', 'invoice'=>'tns:invoice'),
+	// Exit values
+	array('result'=>'tns:result', 'id'=>'xsd:string', 'ref'=>'xsd:string', 'ref_ext'=>'xsd:string'),
+	$ns,
+	$ns.'#createInvoice',
+	$styledoc,
+	$styleuse,
+	'WS to create an invoice'
 );
 $server->register(
 		'createInvoiceFromOrder',
@@ -264,16 +264,16 @@ $server->register(
 		'WS to create an invoice from an order'
 );
 $server->register(
-    'updateInvoice',
-    // Entry values
-    array('authentication'=>'tns:authentication', 'invoice'=>'tns:invoice'),
-    // Exit values
-    array('result'=>'tns:result', 'id'=>'xsd:string', 'ref'=>'xsd:string', 'ref_ext'=>'xsd:string'),
-    $ns,
-    $ns.'#updateInvoice',
-    $styledoc,
-    $styleuse,
-    'WS to update an invoice'
+	'updateInvoice',
+	// Entry values
+	array('authentication'=>'tns:authentication', 'invoice'=>'tns:invoice'),
+	// Exit values
+	array('result'=>'tns:result', 'id'=>'xsd:string', 'ref'=>'xsd:string', 'ref_ext'=>'xsd:string'),
+	$ns,
+	$ns.'#updateInvoice',
+	$styledoc,
+	$styleuse,
+	'WS to update an invoice'
 );
 
 
@@ -294,12 +294,12 @@ function getInvoice($authentication, $id = '', $ref = '', $ref_ext = '')
 
 	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 && (($id && $ref) || ($id && $ref_ext) || ($ref && $ref_ext)))
 	{
 		$error++;
@@ -324,51 +324,51 @@ function getInvoice($authentication, $id = '', $ref = '', $ref_ext = '')
 					$linesresp[] = array(
 						'id'=>$line->id,
 						'type'=>$line->product_type,
-                                                'desc'=>dol_htmlcleanlastbr($line->desc),
-                                                'total_net'=>$line->total_ht,
-                                                'total_vat'=>$line->total_tva,
-                                                'total'=>$line->total_ttc,
-                                                'vat_rate'=>$line->tva_tx,
-                                                'qty'=>$line->qty,
-                                                'unitprice'=> $line->subprice,
-                                                'date_start'=> $line->date_start ?dol_print_date($line->date_start, 'dayrfc') : '',
-                                                'date_end'=> $line->date_end ?dol_print_date($line->date_end, 'dayrfc') : '',
-                                                'product_id'=>$line->fk_product,
-                                                'product_ref'=>$line->product_ref,
-                                                'product_label'=>$line->product_label,
-                                                'product_desc'=>$line->product_desc,
+												'desc'=>dol_htmlcleanlastbr($line->desc),
+												'total_net'=>$line->total_ht,
+												'total_vat'=>$line->total_tva,
+												'total'=>$line->total_ttc,
+												'vat_rate'=>$line->tva_tx,
+												'qty'=>$line->qty,
+												'unitprice'=> $line->subprice,
+												'date_start'=> $line->date_start ?dol_print_date($line->date_start, 'dayrfc') : '',
+												'date_end'=> $line->date_end ?dol_print_date($line->date_end, 'dayrfc') : '',
+												'product_id'=>$line->fk_product,
+												'product_ref'=>$line->product_ref,
+												'product_label'=>$line->product_label,
+												'product_desc'=>$line->product_desc,
 					);
 					$i++;
 				}
 
-			    // Create invoice
-			    $objectresp = array(
-			    	'result'=>array('result_code'=>'OK', 'result_label'=>''),
-			        'invoice'=>array(
-				    	'id' => $invoice->id,
+				// Create invoice
+				$objectresp = array(
+					'result'=>array('result_code'=>'OK', 'result_label'=>''),
+					'invoice'=>array(
+						'id' => $invoice->id,
 			   			'ref' => $invoice->ref,
-			        	'ref_ext' => $invoice->ref_ext ? $invoice->ref_ext : '', // If not defined, field is not added into soap
-			        	'thirdparty_id' => $invoice->socid,
-			        	'fk_user_author' => $invoice->user_author ? $invoice->user_author : '',
-			        	'fk_user_valid' => $invoice->user_valid ? $invoice->user_valid : '',
-			        	'date' => $invoice->date ?dol_print_date($invoice->date, 'dayrfc') : '',
-			        	'date_due' => $invoice->date_lim_reglement ?dol_print_date($invoice->date_lim_reglement, 'dayrfc') : '',
-			        	'date_creation' => $invoice->date_creation ?dol_print_date($invoice->date_creation, 'dayhourrfc') : '',
-			        	'date_validation' => $invoice->date_validation ?dol_print_date($invoice->date_creation, 'dayhourrfc') : '',
-			        	'date_modification' => $invoice->datem ?dol_print_date($invoice->datem, 'dayhourrfc') : '',
-			        	'type' => $invoice->type,
-			        	'total_net' => $invoice->total_ht,
-			        	'total_vat' => $invoice->total_tva,
-			        	'total' => $invoice->total_ttc,
-			        	'note_private' => $invoice->note_private ? $invoice->note_private : '',
-			        	'note_public' => $invoice->note_public ? $invoice->note_public : '',
-			        	'status' => $invoice->statut,
+						'ref_ext' => $invoice->ref_ext ? $invoice->ref_ext : '', // If not defined, field is not added into soap
+						'thirdparty_id' => $invoice->socid,
+						'fk_user_author' => $invoice->user_author ? $invoice->user_author : '',
+						'fk_user_valid' => $invoice->user_valid ? $invoice->user_valid : '',
+						'date' => $invoice->date ?dol_print_date($invoice->date, 'dayrfc') : '',
+						'date_due' => $invoice->date_lim_reglement ?dol_print_date($invoice->date_lim_reglement, 'dayrfc') : '',
+						'date_creation' => $invoice->date_creation ?dol_print_date($invoice->date_creation, 'dayhourrfc') : '',
+						'date_validation' => $invoice->date_validation ?dol_print_date($invoice->date_creation, 'dayhourrfc') : '',
+						'date_modification' => $invoice->datem ?dol_print_date($invoice->datem, 'dayhourrfc') : '',
+						'type' => $invoice->type,
+						'total_net' => $invoice->total_ht,
+						'total_vat' => $invoice->total_tva,
+						'total' => $invoice->total_ttc,
+						'note_private' => $invoice->note_private ? $invoice->note_private : '',
+						'note_public' => $invoice->note_public ? $invoice->note_public : '',
+						'status' => $invoice->statut,
 					'project_id' => $invoic->fk_project,
-			        	'close_code' => $invoice->close_code ? $invoice->close_code : '',
-			        	'close_note' => $invoice->close_note ? $invoice->close_note : '',
-			        	'payment_mode_id' => $invoice->mode_reglement_id ? $invoice->mode_reglement_id : '',
-			        	'lines' => $linesresp
-			        ));
+						'close_code' => $invoice->close_code ? $invoice->close_code : '',
+						'close_note' => $invoice->close_note ? $invoice->close_note : '',
+						'payment_mode_id' => $invoice->mode_reglement_id ? $invoice->mode_reglement_id : '',
+						'lines' => $linesresp
+					));
 			}
 			else {
 				$error++;
@@ -405,11 +405,11 @@ function getInvoicesForThirdParty($authentication, $idthirdparty)
 
 	if ($authentication['entity']) $conf->entity = $authentication['entity'];
 
-    // Init and check authentication
-    $objectresp = array();
-    $errorcode = ''; $errorlabel = '';
-    $error = 0;
-    $fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
+	// Init and check authentication
+	$objectresp = array();
+	$errorcode = ''; $errorlabel = '';
+	$error = 0;
+	$fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
 
 	if ($fuser->socid) $socid = $fuser->socid;
 
@@ -436,76 +436,76 @@ function getInvoicesForThirdParty($authentication, $idthirdparty)
 			$i = 0;
 			while ($i < $num)
 			{
-                // En attendant remplissage par boucle
-			    $obj = $db->fetch_object($resql);
+				// En attendant remplissage par boucle
+				$obj = $db->fetch_object($resql);
 
-			    $invoice = new Facture($db);
-			    $invoice->fetch($obj->facid);
+				$invoice = new Facture($db);
+				$invoice->fetch($obj->facid);
 
-			    // Sécurité pour utilisateur externe
-			    if ($socid && ($socid != $invoice->socid))
-			    {
-			    	$error++;
-			    	$errorcode = 'PERMISSION_DENIED'; $errorlabel = $invoice->socid.' User does not have permission for this request';
-			    }
+				// Sécurité pour utilisateur externe
+				if ($socid && ($socid != $invoice->socid))
+				{
+					$error++;
+					$errorcode = 'PERMISSION_DENIED'; $errorlabel = $invoice->socid.' User does not have permission for this request';
+				}
 
-			    if (!$error)
-			    {
-			    	// Define lines of invoice
-			    	$linesresp = array();
-			    	foreach ($invoice->lines as $line)
-			    	{
-			    		$linesresp[] = array(
-			    			'id'=>$line->id,
-			    			'type'=>$line->product_type,
-			    			'total_net'=>$line->total_ht,
-			    			'total_vat'=>$line->total_tva,
-			    			'total'=>$line->total_ttc,
-			    			'vat_rate'=>$line->tva_tx,
-			    			'qty'=>$line->qty,
-			    			'unitprice'=> $line->subprice,
-			    			'date_start'=> $line->date_start ?dol_print_date($line->date_start, 'dayrfc') : '',
-			    			'date_end'=> $line->date_end ?dol_print_date($line->date_end, 'dayrfc') : '',
-			    			'product_id'=>$line->fk_product,
-			    			'product_ref'=>$line->product_ref,
-			    			'product_label'=>$line->product_label,
-			    			'product_desc'=>$line->product_desc,
-			    		);
-			    	}
+				if (!$error)
+				{
+					// Define lines of invoice
+					$linesresp = array();
+					foreach ($invoice->lines as $line)
+					{
+						$linesresp[] = array(
+							'id'=>$line->id,
+							'type'=>$line->product_type,
+							'total_net'=>$line->total_ht,
+							'total_vat'=>$line->total_tva,
+							'total'=>$line->total_ttc,
+							'vat_rate'=>$line->tva_tx,
+							'qty'=>$line->qty,
+							'unitprice'=> $line->subprice,
+							'date_start'=> $line->date_start ?dol_print_date($line->date_start, 'dayrfc') : '',
+							'date_end'=> $line->date_end ?dol_print_date($line->date_end, 'dayrfc') : '',
+							'product_id'=>$line->fk_product,
+							'product_ref'=>$line->product_ref,
+							'product_label'=>$line->product_label,
+							'product_desc'=>$line->product_desc,
+						);
+					}
 
-			    	// Now define invoice
-			    	$linesinvoice[] = array(
-			    		'id' => $invoice->id,
-			    		'ref' => $invoice->ref,
-			    		'ref_ext' => $invoice->ref_ext ? $invoice->ref_ext : '', // If not defined, field is not added into soap
-			    		'fk_user_author' => $invoice->user_author ? $invoice->user_author : '',
-			    		'fk_user_valid' => $invoice->user_valid ? $invoice->user_valid : '',
-			    		'date' => $invoice->date ?dol_print_date($invoice->date, 'dayrfc') : '',
-			    		'date_due' => $invoice->date_lim_reglement ?dol_print_date($invoice->date_lim_reglement, 'dayrfc') : '',
-                                        'date_creation' => $invoice->date_creation ?dol_print_date($invoice->date_creation, 'dayhourrfc') : '',
-			    		'date_validation' => $invoice->date_validation ?dol_print_date($invoice->date_creation, 'dayhourrfc') : '',
-			    		'date_modification' => $invoice->datem ?dol_print_date($invoice->datem, 'dayhourrfc') : '',
-			    		'type' => $invoice->type,
-			    		'total_net' => $invoice->total_ht,
-			    		'total_vat' => $invoice->total_tva,
-			    		'total' => $invoice->total_ttc,
-			    		'note_private' => $invoice->note_private ? $invoice->note_private : '',
-			    		'note_public' => $invoice->note_public ? $invoice->note_public : '',
-			    		'status'=> $invoice->statut,
-                                        'project_id' => $invoic->fk_project,
-			    		'close_code' => $invoice->close_code ? $invoice->close_code : '',
-			    		'close_note' => $invoice->close_note ? $invoice->close_note : '',
-			    		'payment_mode_id' => $invoice->mode_reglement_id ? $invoice->mode_reglement_id : '',
-			    		'lines' => $linesresp
-			    	);
-			    }
+					// Now define invoice
+					$linesinvoice[] = array(
+						'id' => $invoice->id,
+						'ref' => $invoice->ref,
+						'ref_ext' => $invoice->ref_ext ? $invoice->ref_ext : '', // If not defined, field is not added into soap
+						'fk_user_author' => $invoice->user_author ? $invoice->user_author : '',
+						'fk_user_valid' => $invoice->user_valid ? $invoice->user_valid : '',
+						'date' => $invoice->date ?dol_print_date($invoice->date, 'dayrfc') : '',
+						'date_due' => $invoice->date_lim_reglement ?dol_print_date($invoice->date_lim_reglement, 'dayrfc') : '',
+										'date_creation' => $invoice->date_creation ?dol_print_date($invoice->date_creation, 'dayhourrfc') : '',
+						'date_validation' => $invoice->date_validation ?dol_print_date($invoice->date_creation, 'dayhourrfc') : '',
+						'date_modification' => $invoice->datem ?dol_print_date($invoice->datem, 'dayhourrfc') : '',
+						'type' => $invoice->type,
+						'total_net' => $invoice->total_ht,
+						'total_vat' => $invoice->total_tva,
+						'total' => $invoice->total_ttc,
+						'note_private' => $invoice->note_private ? $invoice->note_private : '',
+						'note_public' => $invoice->note_public ? $invoice->note_public : '',
+						'status'=> $invoice->statut,
+										'project_id' => $invoic->fk_project,
+						'close_code' => $invoice->close_code ? $invoice->close_code : '',
+						'close_note' => $invoice->close_note ? $invoice->close_note : '',
+						'payment_mode_id' => $invoice->mode_reglement_id ? $invoice->mode_reglement_id : '',
+						'lines' => $linesresp
+					);
+				}
 
-			    $i++;
+				$i++;
 			}
 
 			$objectresp = array(
-		    	'result'=>array('result_code'=>'OK', 'result_label'=>''),
-		        'invoices'=>$linesinvoice
+				'result'=>array('result_code'=>'OK', 'result_label'=>''),
+				'invoices'=>$linesinvoice
 
 			);
 		}
@@ -533,112 +533,112 @@ function getInvoicesForThirdParty($authentication, $idthirdparty)
  */
 function createInvoice($authentication, $invoice)
 {
-    global $db, $conf, $langs;
+	global $db, $conf, $langs;
 
-    $now = dol_now();
+	$now = dol_now();
 
-    dol_syslog("Function: createInvoice login=".$authentication['login']." id=".$invoice->id.
-    		", ref=".$invoice->ref.", ref_ext=".$invoice->ref_ext);
+	dol_syslog("Function: createInvoice login=".$authentication['login']." id=".$invoice->id.
+			", ref=".$invoice->ref.", ref_ext=".$invoice->ref_ext);
 
-    if ($authentication['entity']) $conf->entity = $authentication['entity'];
+	if ($authentication['entity']) $conf->entity = $authentication['entity'];
 
-    // Init and check authentication
-    $objectresp = array();
-    $errorcode = ''; $errorlabel = '';
-    $error = 0;
-    $fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
+	// Init and check authentication
+	$objectresp = array();
+	$errorcode = ''; $errorlabel = '';
+	$error = 0;
+	$fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
 
-    // Check parameters
-    if (empty($invoice['id']) && empty($invoice['ref']) && empty($invoice['ref_ext'])) {
-    	$error++; $errorcode = 'KO'; $errorlabel = "Invoice id or ref or ref_ext is mandatory.";
-    }
+	// Check parameters
+	if (empty($invoice['id']) && empty($invoice['ref']) && empty($invoice['ref_ext'])) {
+		$error++; $errorcode = 'KO'; $errorlabel = "Invoice id or ref or ref_ext is mandatory.";
+	}
 
-    if (!$error)
-    {
-        $new_invoice = new Facture($db);
-        $new_invoice->socid = $invoice['thirdparty_id'];
-        $new_invoice->type = $invoice['type'];
-        $new_invoice->ref_ext = $invoice['ref_ext'];
-        $new_invoice->date = dol_stringtotime($invoice['date'], 'dayrfc');
-        $new_invoice->note_private = $invoice['note_private'];
-        $new_invoice->note_public = $invoice['note_public'];
-        $new_invoice->statut = Facture::STATUS_DRAFT; // We start with status draft
-        $new_invoice->fk_project = $invoice['project_id'];
-        $new_invoice->date_creation = $now;
+	if (!$error)
+	{
+		$new_invoice = new Facture($db);
+		$new_invoice->socid = $invoice['thirdparty_id'];
+		$new_invoice->type = $invoice['type'];
+		$new_invoice->ref_ext = $invoice['ref_ext'];
+		$new_invoice->date = dol_stringtotime($invoice['date'], 'dayrfc');
+		$new_invoice->note_private = $invoice['note_private'];
+		$new_invoice->note_public = $invoice['note_public'];
+		$new_invoice->statut = Facture::STATUS_DRAFT; // We start with status draft
+		$new_invoice->fk_project = $invoice['project_id'];
+		$new_invoice->date_creation = $now;
 
-	    //take mode_reglement and cond_reglement from thirdparty
-        $soc = new Societe($db);
-        $res = $soc->fetch($new_invoice->socid);
-        if ($res > 0) {
-    	    $new_invoice->mode_reglement_id = !empty($invoice['payment_mode_id']) ? $invoice['payment_mode_id'] : $soc->mode_reglement_id;
-            $new_invoice->cond_reglement_id  = $soc->cond_reglement_id;
-        }
-        else $new_invoice->mode_reglement_id = $invoice['payment_mode_id'];
+		//take mode_reglement and cond_reglement from thirdparty
+		$soc = new Societe($db);
+		$res = $soc->fetch($new_invoice->socid);
+		if ($res > 0) {
+			$new_invoice->mode_reglement_id = !empty($invoice['payment_mode_id']) ? $invoice['payment_mode_id'] : $soc->mode_reglement_id;
+			$new_invoice->cond_reglement_id = $soc->cond_reglement_id;
+		}
+		else $new_invoice->mode_reglement_id = $invoice['payment_mode_id'];
 
-        // Trick because nusoap does not store data with same structure if there is one or several lines
-        $arrayoflines = array();
-        if (isset($invoice['lines']['line'][0])) $arrayoflines = $invoice['lines']['line'];
-        else $arrayoflines = $invoice['lines'];
+		// Trick because nusoap does not store data with same structure if there is one or several lines
+		$arrayoflines = array();
+		if (isset($invoice['lines']['line'][0])) $arrayoflines = $invoice['lines']['line'];
+		else $arrayoflines = $invoice['lines'];
 
-        foreach ($arrayoflines as $key => $line)
-        {
-            // $key can be 'line' or '0','1',...
-            $newline = new FactureLigne($db);
-            $newline->product_type = $line['type'];
-            $newline->desc = $line['desc'];
-            $newline->fk_product = $line['fk_product'];
-            $newline->tva_tx = $line['vat_rate'];
-            $newline->qty = $line['qty'];
-            $newline->subprice = $line['unitprice'];
-            $newline->total_ht = $line['total_net'];
-            $newline->total_tva = $line['total_vat'];
-            $newline->total_ttc = $line['total'];
-            $newline->date_start = dol_stringtotime($line['date_start']);
-            $newline->date_end = dol_stringtotime($line['date_end']);
-            $newline->fk_product = $line['product_id'];
-            $new_invoice->lines[] = $newline;
-        }
-        //var_dump($newobject->date_lim_reglement); exit;
-        //var_dump($invoice['lines'][0]['type']);
+		foreach ($arrayoflines as $key => $line)
+		{
+			// $key can be 'line' or '0','1',...
+			$newline = new FactureLigne($db);
+			$newline->product_type = $line['type'];
+			$newline->desc = $line['desc'];
+			$newline->fk_product = $line['fk_product'];
+			$newline->tva_tx = $line['vat_rate'];
+			$newline->qty = $line['qty'];
+			$newline->subprice = $line['unitprice'];
+			$newline->total_ht = $line['total_net'];
+			$newline->total_tva = $line['total_vat'];
+			$newline->total_ttc = $line['total'];
+			$newline->date_start = dol_stringtotime($line['date_start']);
+			$newline->date_end = dol_stringtotime($line['date_end']);
+			$newline->fk_product = $line['product_id'];
+			$new_invoice->lines[] = $newline;
+		}
+		//var_dump($newobject->date_lim_reglement); exit;
+		//var_dump($invoice['lines'][0]['type']);
 
-        $db->begin();
+		$db->begin();
 
-        $result = $new_invoice->create($fuser, 0, dol_stringtotime($invoice['date_due'], 'dayrfc'));
-        if ($result < 0)
-        {
-            $error++;
-        }
+		$result = $new_invoice->create($fuser, 0, dol_stringtotime($invoice['date_due'], 'dayrfc'));
+		if ($result < 0)
+		{
+			$error++;
+		}
 
-        if (!$error && $invoice['status'] == Facture::STATUS_VALIDATED)   // We want invoice to have status validated
-        {
-            $result = $new_invoice->validate($fuser);
-            if ($result < 0)
-            {
-                $error++;
-            }
-        }
+		if (!$error && $invoice['status'] == Facture::STATUS_VALIDATED)   // We want invoice to have status validated
+		{
+			$result = $new_invoice->validate($fuser);
+			if ($result < 0)
+			{
+				$error++;
+			}
+		}
 
-        if (!$error)
-        {
-            $db->commit();
-            $objectresp = array('result'=>array('result_code'=>'OK', 'result_label'=>''), 'id'=>$new_invoice->id,
-            		'ref'=>$new_invoice->ref, 'ref_ext'=>$new_invoice->ref_ext);
-        }
-        else {
-            $db->rollback();
-            $error++;
-            $errorcode = 'KO';
-            $errorlabel = $new_invoice->error;
-            dol_syslog("Function: createInvoice error while creating".$errorlabel);
-        }
-    }
+		if (!$error)
+		{
+			$db->commit();
+			$objectresp = array('result'=>array('result_code'=>'OK', 'result_label'=>''), 'id'=>$new_invoice->id,
+					'ref'=>$new_invoice->ref, 'ref_ext'=>$new_invoice->ref_ext);
+		}
+		else {
+			$db->rollback();
+			$error++;
+			$errorcode = 'KO';
+			$errorlabel = $new_invoice->error;
+			dol_syslog("Function: createInvoice error while creating".$errorlabel);
+		}
+	}
 
-    if ($error)
-    {
-        $objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
-    }
+	if ($error)
+	{
+		$objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
+	}
 
-    return $objectresp;
+	return $objectresp;
 }
 
 /**
@@ -656,7 +656,7 @@ function createInvoiceFromOrder($authentication, $id_order = '', $ref_order = ''
 
 	$now = dol_now();
 
-    dol_syslog("Function: createInvoiceFromOrder login=".$authentication['login']." id=".$id_order.
+	dol_syslog("Function: createInvoiceFromOrder login=".$authentication['login']." id=".$id_order.
 			", ref=".$ref_order.", ref_ext=".$ref_ext_order);
 
 	if ($authentication['entity']) $conf->entity = $authentication['entity'];
@@ -666,7 +666,7 @@ function createInvoiceFromOrder($authentication, $id_order = '', $ref_order = ''
 	$errorcode = ''; $errorlabel = '';
 	$error = 0;
 	$fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
-    if ($fuser->socid) $socid = $fuser->socid;
+	if ($fuser->socid) $socid = $fuser->socid;
 
 	// Check parameters
 	if (empty($id_order) && empty($ref_order) && empty($ref_ext_order)) {
@@ -736,8 +736,8 @@ function updateInvoice($authentication, $invoice)
 {
 	global $db, $conf, $langs;
 
-    dol_syslog("Function: updateInvoice login=".$authentication['login']." id=".$invoice['id'].
-    		", ref=".$invoice['ref'].", ref_ext=".$invoice['ref_ext']);
+	dol_syslog("Function: updateInvoice login=".$authentication['login']." id=".$invoice['id'].
+			", ref=".$invoice['ref'].", ref_ext=".$invoice['ref_ext']);
 
 	if ($authentication['entity']) $conf->entity = $authentication['entity'];
 
diff --git a/htdocs/webservices/server_order.php b/htdocs/webservices/server_order.php
index 82482f8f61a..03833b9f6d9 100644
--- a/htdocs/webservices/server_order.php
+++ b/htdocs/webservices/server_order.php
@@ -476,13 +476,13 @@ function getOrder($authentication, $id = '', $ref = '', $ref_ext = '')
 			else {
 				$error++;
 				$errorcode = 'NOT_FOUND';
-                $errorlabel = 'Object not found for id='.$id.' nor ref='.$ref.' nor ref_ext='.$ref_ext;
+				$errorlabel = 'Object not found for id='.$id.' nor ref='.$ref.' nor ref_ext='.$ref_ext;
 			}
 		}
 		else {
 			$error++;
 			$errorcode = 'PERMISSION_DENIED';
-            $errorlabel = 'User does not have permission for this request';
+			$errorlabel = 'User does not have permission for this request';
 		}
 	}
 
@@ -553,7 +553,7 @@ function getOrdersForThirdParty($authentication, $idthirdparty)
 				{
 					$error++;
 					$errorcode = 'PERMISSION_DENIED';
-                    $errorlabel = $order->socid.' User does not have permission for this request';
+					$errorlabel = $order->socid.' User does not have permission for this request';
 				}
 
 				if (!$error)
@@ -675,7 +675,7 @@ function createOrder($authentication, $order)
 	// Init and check authentication
 	$objectresp = array();
 	$errorcode = '';
-    $errorlabel = '';
+	$errorlabel = '';
 	$error = 0;
 	$fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
 
@@ -818,7 +818,7 @@ function validOrder($authentication, $id = '', $id_warehouse = 0)
 	// Init and check authentication
 	$objectresp = array();
 	$errorcode = '';
-    $errorlabel = '';
+	$errorlabel = '';
 	$error = 0;
 	if ($authentication['entity']) $conf->entity = $authentication['entity'];
 	$fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
diff --git a/htdocs/webservices/server_payment.php b/htdocs/webservices/server_payment.php
index 5145c4a3b7b..8a9b19d76d6 100644
--- a/htdocs/webservices/server_payment.php
+++ b/htdocs/webservices/server_payment.php
@@ -44,11 +44,11 @@ $langs->load("main");
 // Enable and test if module web services is enabled
 if (empty($conf->global->MAIN_MODULE_WEBSERVICES))
 {
-       $langs->load("admin");
-       dol_syslog("Call Dolibarr webservices interfaces with module webservices disabled");
-       print $langs->trans("WarningModuleNotActive", 'WebServices').'.<br><br>';
-       print $langs->trans("ToActivateModule");
-       exit;
+	   $langs->load("admin");
+	   dol_syslog("Call Dolibarr webservices interfaces with module webservices disabled");
+	   print $langs->trans("WarningModuleNotActive", 'WebServices').'.<br><br>';
+	   print $langs->trans("ToActivateModule");
+	   exit;
 }
 
 // Create the soap Object
@@ -62,50 +62,50 @@ $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 for Payment object
 $server->wsdl->addComplexType(
-    'payment',
-    'complexType',
-    'struct',
-    'all',
-    '',
-    array(
-        'amount'          => array('name'=>'amount', 'type'=>'xsd:double'),
-        'num_payment'     => array('name'=>'num_payment', 'type'=>'xsd:string'),
-        'thirdparty_id'   => array('name'=>'thirdparty_id', 'type'=>'xsd:int'),
-               'bank_account'    => array('name'=>'bank_account', 'type'=>'xsd:int'),
-               'payment_mode_id' => array('name'=>'payment_mode_id', 'type'=>'xsd:int'),
-               'invoice_id'      => array('name'=>'invoice_id', 'type'=>'xsd:int'),
-               'int_label'       => array('name'=>'int_label', 'type'=>'xsd:string'),
-               'emitter'         => array('name'=>'emitter', 'type'=>'xsd:string'),
-               'bank_source'     => array('name'=>'bank_source', 'type'=>'xsd:string'),
-    )
+	'payment',
+	'complexType',
+	'struct',
+	'all',
+	'',
+	array(
+		'amount'          => array('name'=>'amount', 'type'=>'xsd:double'),
+		'num_payment'     => array('name'=>'num_payment', 'type'=>'xsd:string'),
+		'thirdparty_id'   => array('name'=>'thirdparty_id', 'type'=>'xsd:int'),
+			   'bank_account'    => array('name'=>'bank_account', 'type'=>'xsd:int'),
+			   'payment_mode_id' => array('name'=>'payment_mode_id', 'type'=>'xsd:int'),
+			   'invoice_id'      => array('name'=>'invoice_id', 'type'=>'xsd:int'),
+			   'int_label'       => array('name'=>'int_label', 'type'=>'xsd:string'),
+			   'emitter'         => array('name'=>'emitter', 'type'=>'xsd:string'),
+			   'bank_source'     => array('name'=>'bank_source', 'type'=>'xsd:string'),
+	)
 );
 
 // 5 styles: RPC/encoded, RPC/literal, Document/encoded (not WS-I compliant), Document/literal, Document/literal wrapped
@@ -117,16 +117,16 @@ $styleuse = 'encoded'; // encoded/literal/literal wrapped
 
 // Register WSDL
 $server->register(
-    'createPayment',
-    // Entry values
-    array('authentication'=>'tns:authentication', 'payment'=>'tns:payment'),
-    // Exit values
-    array('result'=>'tns:result', 'id'=>'xsd:string', 'ref'=>'xsd:string', 'ref_ext'=>'xsd:string'),
-    $ns,
-    $ns.'#createPayment',
-    $styledoc,
-    $styleuse,
-    'WS to create a new payment'
+	'createPayment',
+	// Entry values
+	array('authentication'=>'tns:authentication', 'payment'=>'tns:payment'),
+	// Exit values
+	array('result'=>'tns:result', 'id'=>'xsd:string', 'ref'=>'xsd:string', 'ref_ext'=>'xsd:string'),
+	$ns,
+	$ns.'#createPayment',
+	$styledoc,
+	$styleuse,
+	'WS to create a new payment'
 );
 
 
@@ -139,79 +139,79 @@ $server->register(
  */
 function createPayment($authentication, $payment)
 {
-    global $db, $conf, $langs;
+	global $db, $conf, $langs;
 
-    $now = dol_now();
+	$now = dol_now();
 
-    dol_syslog("Function: createPayment login=".$authentication['login']." id=".$payment->id.
-               ", ref=".$payment->ref.", ref_ext=".$payment->ref_ext);
+	dol_syslog("Function: createPayment login=".$authentication['login']." id=".$payment->id.
+			   ", ref=".$payment->ref.", ref_ext=".$payment->ref_ext);
 
-    if ($authentication['entity']) $conf->entity = $authentication['entity'];
+	if ($authentication['entity']) $conf->entity = $authentication['entity'];
 
-    // Init and check authentication
-    $objectresp = array();
-    $errorcode  = '';
-    $errorlabel = '';
-    $error      = 0;
-    $fuser      = check_authentication($authentication, $error, $errorcode, $errorlabel);
+	// Init and check authentication
+	$objectresp = array();
+	$errorcode  = '';
+	$errorlabel = '';
+	$error      = 0;
+	$fuser      = check_authentication($authentication, $error, $errorcode, $errorlabel);
 
-    // Check parameters
-    if (empty($payment['amount']) && empty($payment['thirdparty_id'])) {
-        $error++;
-        $errorcode  = 'KO';
-        $errorlabel = "You must specify the amount and the third party's ID.";
-    }
+	// Check parameters
+	if (empty($payment['amount']) && empty($payment['thirdparty_id'])) {
+		$error++;
+		$errorcode  = 'KO';
+		$errorlabel = "You must specify the amount and the third party's ID.";
+	}
 
-    if (!$error)
-    {
-        $soc = new Societe($db);
-        $res = $soc->fetch($payment['thirdparty_id']);
+	if (!$error)
+	{
+		$soc = new Societe($db);
+		$res = $soc->fetch($payment['thirdparty_id']);
 
-        $new_payment              = new Paiement($db);
-        $new_payment->amount      = doubleval($payment['amount']);
-        $new_payment->num_payment = $payment['num_payment'];
-        $new_payment->fk_account  = intval($payment['bank_account']);
-        $new_payment->paiementid  = !empty($payment['payment_mode_id']) ? intval($payment['payment_mode_id']) : $soc->mode_reglement_id;
-        $new_payment->datepaye    = $now;
-        $new_payment->author      = $payment['thirdparty_id'];
-        $new_payment->amounts     = array();
+		$new_payment              = new Paiement($db);
+		$new_payment->amount      = doubleval($payment['amount']);
+		$new_payment->num_payment = $payment['num_payment'];
+		$new_payment->fk_account  = intval($payment['bank_account']);
+		$new_payment->paiementid  = !empty($payment['payment_mode_id']) ? intval($payment['payment_mode_id']) : $soc->mode_reglement_id;
+		$new_payment->datepaye    = $now;
+		$new_payment->author      = $payment['thirdparty_id'];
+		$new_payment->amounts     = array();
 
-        if (intval($payment['invoice_id']) > 0) {
-            $new_payment->amounts[$payment['invoice_id']] = $new_payment->amount;
-        }
+		if (intval($payment['invoice_id']) > 0) {
+			$new_payment->amounts[$payment['invoice_id']] = $new_payment->amount;
+		}
 
-        $db->begin();
-        $result = $new_payment->create($fuser, true);
+		$db->begin();
+		$result = $new_payment->create($fuser, true);
 
-        if ($payment['bank_account']) {
-            $new_payment->addPaymentToBank($fuser, 'payment', $payment['int_label'], $payment['bank_account'], $payment['emitter'], $payment['bank_source']);
-        }
+		if ($payment['bank_account']) {
+			$new_payment->addPaymentToBank($fuser, 'payment', $payment['int_label'], $payment['bank_account'], $payment['emitter'], $payment['bank_source']);
+		}
 
-        if ($result < 0)
-        {
-            $error++;
-        }
+		if ($result < 0)
+		{
+			$error++;
+		}
 
-        if (!$error)
-        {
-            $db->commit();
-            $objectresp = array('result'=>array('result_code'=>'OK', 'result_label'=>''), 'id'=>$new_payment->id);
-        }
-        else {
-            $db->rollback();
-            $error++;
-            $errorcode = 'KO';
-            $errorlabel = $new_payment->error;
-            dol_syslog("Function: createInvoice error while creating".$errorlabel);
-        }
-    }
+		if (!$error)
+		{
+			$db->commit();
+			$objectresp = array('result'=>array('result_code'=>'OK', 'result_label'=>''), 'id'=>$new_payment->id);
+		}
+		else {
+			$db->rollback();
+			$error++;
+			$errorcode = 'KO';
+			$errorlabel = $new_payment->error;
+			dol_syslog("Function: createInvoice error while creating".$errorlabel);
+		}
+	}
 
-    if ($error)
-    {
-        $objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
-    }
+	if ($error)
+	{
+		$objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
+	}
 
-    return $objectresp;
+	return $objectresp;
 }
 
 // Return the results.
diff --git a/htdocs/webservices/server_productorservice.php b/htdocs/webservices/server_productorservice.php
index d7fbe8283ed..f723dcfd054 100644
--- a/htdocs/webservices/server_productorservice.php
+++ b/htdocs/webservices/server_productorservice.php
@@ -44,11 +44,11 @@ $langs->load("main");
 // Enable and test if module web services is enabled
 if (empty($conf->global->MAIN_MODULE_WEBSERVICES))
 {
-    $langs->load("admin");
-    dol_syslog("Call Dolibarr webservices interfaces with module webservices disabled");
-    print $langs->trans("WarningModuleNotActive", 'WebServices').'.<br><br>';
-    print $langs->trans("ToActivateModule");
-    exit;
+	$langs->load("admin");
+	dol_syslog("Call Dolibarr webservices interfaces with module webservices disabled");
+	print $langs->trans("WarningModuleNotActive", 'WebServices').'.<br><br>';
+	print $langs->trans("ToActivateModule");
+	exit;
 }
 
 // Create the soap Object
@@ -62,72 +62,72 @@ $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')
+	)
 );
 
 $productorservice_fields = array(
-    'id' => array('name'=>'id', 'type'=>'xsd:string'),
-    'ref' => array('name'=>'ref', 'type'=>'xsd:string'),
-    'ref_ext' => array('name'=>'ref_ext', 'type'=>'xsd:string'),
-    'type' => array('name'=>'type', 'type'=>'xsd:string'),
-    'label' => array('name'=>'label', 'type'=>'xsd:string'),
-    'description' => array('name'=>'description', 'type'=>'xsd:string'),
-    'date_creation' => array('name'=>'date_creation', 'type'=>'xsd:dateTime'),
-    'date_modification' => array('name'=>'date_modification', 'type'=>'xsd:dateTime'),
-    'note' => array('name'=>'note', 'type'=>'xsd:string'),
-    'status_tobuy' => array('name'=>'status_tobuy', 'type'=>'xsd:string'),
-    'status_tosell' => array('name'=>'status_tosell', 'type'=>'xsd:string'),
-    'barcode' => array('name'=>'barcode', 'type'=>'xsd:string'),
-    'barcode_type' => array('name'=>'barcode_type', 'type'=>'xsd:string'),
-    'country_id' => array('name'=>'country_id', 'type'=>'xsd:string'),
-    'country_code' => array('name'=>'country_code', 'type'=>'xsd:string'),
-    'customcode' => array('name'=>'customcode', 'type'=>'xsd:string'),
+	'id' => array('name'=>'id', 'type'=>'xsd:string'),
+	'ref' => array('name'=>'ref', 'type'=>'xsd:string'),
+	'ref_ext' => array('name'=>'ref_ext', 'type'=>'xsd:string'),
+	'type' => array('name'=>'type', 'type'=>'xsd:string'),
+	'label' => array('name'=>'label', 'type'=>'xsd:string'),
+	'description' => array('name'=>'description', 'type'=>'xsd:string'),
+	'date_creation' => array('name'=>'date_creation', 'type'=>'xsd:dateTime'),
+	'date_modification' => array('name'=>'date_modification', 'type'=>'xsd:dateTime'),
+	'note' => array('name'=>'note', 'type'=>'xsd:string'),
+	'status_tobuy' => array('name'=>'status_tobuy', 'type'=>'xsd:string'),
+	'status_tosell' => array('name'=>'status_tosell', 'type'=>'xsd:string'),
+	'barcode' => array('name'=>'barcode', 'type'=>'xsd:string'),
+	'barcode_type' => array('name'=>'barcode_type', 'type'=>'xsd:string'),
+	'country_id' => array('name'=>'country_id', 'type'=>'xsd:string'),
+	'country_code' => array('name'=>'country_code', 'type'=>'xsd:string'),
+	'customcode' => array('name'=>'customcode', 'type'=>'xsd:string'),
 
-    'price_net' => array('name'=>'price_net', 'type'=>'xsd:string'),
-    'price' => array('name'=>'price', 'type'=>'xsd:string'),
-    'price_min_net' => array('name'=>'price_min_net', 'type'=>'xsd:string'),
-    'price_min' => array('name'=>'price_min', 'type'=>'xsd:string'),
+	'price_net' => array('name'=>'price_net', 'type'=>'xsd:string'),
+	'price' => array('name'=>'price', 'type'=>'xsd:string'),
+	'price_min_net' => array('name'=>'price_min_net', 'type'=>'xsd:string'),
+	'price_min' => array('name'=>'price_min', 'type'=>'xsd:string'),
 
-    'price_base_type' => array('name'=>'price_base_type', 'type'=>'xsd:string'),
+	'price_base_type' => array('name'=>'price_base_type', 'type'=>'xsd:string'),
 
-    'vat_rate' => array('name'=>'vat_rate', 'type'=>'xsd:string'),
-    'vat_npr' => array('name'=>'vat_npr', 'type'=>'xsd:string'),
-    'localtax1_tx' => array('name'=>'localtax1_tx', 'type'=>'xsd:string'),
-    'localtax2_tx' => array('name'=>'localtax2_tx', 'type'=>'xsd:string'),
+	'vat_rate' => array('name'=>'vat_rate', 'type'=>'xsd:string'),
+	'vat_npr' => array('name'=>'vat_npr', 'type'=>'xsd:string'),
+	'localtax1_tx' => array('name'=>'localtax1_tx', 'type'=>'xsd:string'),
+	'localtax2_tx' => array('name'=>'localtax2_tx', 'type'=>'xsd:string'),
 
-    'stock_alert' => array('name'=>'stock_alert', 'type'=>'xsd:string'),
-    'stock_real' => array('name'=>'stock_real', 'type'=>'xsd:string'),
-    'stock_pmp' => array('name'=>'stock_pmp', 'type'=>'xsd:string'),
-    'warehouse_ref' => array('name'=>'warehouse_ref', 'type'=>'xsd:string'), // Used only for create or update to set which warehouse to use for stock correction if stock_real differs from database
+	'stock_alert' => array('name'=>'stock_alert', 'type'=>'xsd:string'),
+	'stock_real' => array('name'=>'stock_real', 'type'=>'xsd:string'),
+	'stock_pmp' => array('name'=>'stock_pmp', 'type'=>'xsd:string'),
+	'warehouse_ref' => array('name'=>'warehouse_ref', 'type'=>'xsd:string'), // Used only for create or update to set which warehouse to use for stock correction if stock_real differs from database
 
-    'canvas' => array('name'=>'canvas', 'type'=>'xsd:string'),
-    'import_key' => array('name'=>'import_key', 'type'=>'xsd:string'),
+	'canvas' => array('name'=>'canvas', 'type'=>'xsd:string'),
+	'import_key' => array('name'=>'import_key', 'type'=>'xsd:string'),
 
-    'dir' => array('name'=>'dir', 'type'=>'xsd:string'),
-    'images' => array('name'=>'images', 'type'=>'tns:ImagesArray')
+	'dir' => array('name'=>'dir', 'type'=>'xsd:string'),
+	'images' => array('name'=>'images', 'type'=>'tns:ImagesArray')
 );
 
 
@@ -158,12 +158,12 @@ if (is_array($extrafield_array)) $productorservice_fields = array_merge($product
 
 // Define other specific objects
 $server->wsdl->addComplexType(
-    'product',
-    'complexType',
-    'struct',
-    'all',
-    '',
-    $productorservice_fields
+	'product',
+	'complexType',
+	'struct',
+	'all',
+	'',
+	$productorservice_fields
 );
 
 
@@ -206,33 +206,33 @@ $server->wsdl->addComplexType(
 
 // Define other specific objects
 $server->wsdl->addComplexType(
-    'filterproduct',
-    'complexType',
-    'struct',
-    'all',
-    '',
-    array(
-        //'limit' => array('name'=>'limit','type'=>'xsd:string'),
+	'filterproduct',
+	'complexType',
+	'struct',
+	'all',
+	'',
+	array(
+		//'limit' => array('name'=>'limit','type'=>'xsd:string'),
 		'type' => array('name'=>'type', 'type'=>'xsd:string'),
-	    'status_tobuy' => array('name'=>'status_tobuy', 'type'=>'xsd:string'),
-	    'status_tosell' => array('name'=>'status_tosell', 'type'=>'xsd:string'),
-    )
+		'status_tobuy' => array('name'=>'status_tobuy', 'type'=>'xsd:string'),
+		'status_tosell' => array('name'=>'status_tosell', 'type'=>'xsd:string'),
+	)
 );
 
 $server->wsdl->addComplexType(
-    'ProductsArray2',
-    'complexType',
-    'array',
-    'sequence',
-    '',
-    array(
-        'product' => array(
-            'name' => 'product',
-            'type' => 'tns:product',
-            'minOccurs' => '0',
-            'maxOccurs' => 'unbounded'
-        )
-    )
+	'ProductsArray2',
+	'complexType',
+	'array',
+	'sequence',
+	'',
+	array(
+		'product' => array(
+			'name' => 'product',
+			'type' => 'tns:product',
+			'minOccurs' => '0',
+			'maxOccurs' => 'unbounded'
+		)
+	)
 );
 
 
@@ -247,72 +247,72 @@ $styleuse = 'encoded'; // encoded/literal/literal wrapped
 
 // Register WSDL
 $server->register(
-    'getProductOrService',
-    // Entry values
-    array('authentication'=>'tns:authentication', 'id'=>'xsd:string', 'ref'=>'xsd:string', 'ref_ext'=>'xsd:string', 'lang'=>'xsd:string'),
-    // Exit values
-    array('result'=>'tns:result', 'product'=>'tns:product'),
-    $ns,
-    $ns.'#getProductOrService',
-    $styledoc,
-    $styleuse,
-    'WS to get product or service'
+	'getProductOrService',
+	// Entry values
+	array('authentication'=>'tns:authentication', 'id'=>'xsd:string', 'ref'=>'xsd:string', 'ref_ext'=>'xsd:string', 'lang'=>'xsd:string'),
+	// Exit values
+	array('result'=>'tns:result', 'product'=>'tns:product'),
+	$ns,
+	$ns.'#getProductOrService',
+	$styledoc,
+	$styleuse,
+	'WS to get product or service'
 );
 
 // Register WSDL
 $server->register(
-    'createProductOrService',
-    // Entry values
-    array('authentication'=>'tns:authentication', 'product'=>'tns:product'),
-    // Exit values
-    array('result'=>'tns:result', 'id'=>'xsd:string'),
-    $ns,
-    $ns.'#createProductOrService',
-    $styledoc,
-    $styleuse,
-    'WS to create a product or service'
+	'createProductOrService',
+	// Entry values
+	array('authentication'=>'tns:authentication', 'product'=>'tns:product'),
+	// Exit values
+	array('result'=>'tns:result', 'id'=>'xsd:string'),
+	$ns,
+	$ns.'#createProductOrService',
+	$styledoc,
+	$styleuse,
+	'WS to create a product or service'
 );
 
 // Register WSDL
 $server->register(
-    'updateProductOrService',
-    // Entry values
-    array('authentication'=>'tns:authentication', 'product'=>'tns:product'),
-    // Exit values
-    array('result'=>'tns:result', 'id'=>'xsd:string'),
-    $ns,
-    $ns.'#updateProductOrService',
-    $styledoc,
-    $styleuse,
-    'WS to update a product or service'
+	'updateProductOrService',
+	// Entry values
+	array('authentication'=>'tns:authentication', 'product'=>'tns:product'),
+	// Exit values
+	array('result'=>'tns:result', 'id'=>'xsd:string'),
+	$ns,
+	$ns.'#updateProductOrService',
+	$styledoc,
+	$styleuse,
+	'WS to update a product or service'
 );
 
 // Register WSDL
 $server->register(
-    'deleteProductOrService',
-    // Entry values
-    array('authentication'=>'tns:authentication', 'listofid'=>'xsd:string'),
-    // Exit values
-    array('result'=>'tns:result', 'nbdeleted'=>'xsd:int'),
-    $ns,
-    $ns.'#deleteProductOrService',
-    $styledoc,
-    $styleuse,
-    'WS to delete a product or service'
+	'deleteProductOrService',
+	// Entry values
+	array('authentication'=>'tns:authentication', 'listofid'=>'xsd:string'),
+	// Exit values
+	array('result'=>'tns:result', 'nbdeleted'=>'xsd:int'),
+	$ns,
+	$ns.'#deleteProductOrService',
+	$styledoc,
+	$styleuse,
+	'WS to delete a product or service'
 );
 
 // Register WSDL
 $server->register(
-    'getListOfProductsOrServices',
-    // Entry values
-    array('authentication'=>'tns:authentication', 'filterproduct'=>'tns:filterproduct'),
-    // Exit values
-    array('result'=>'tns:result', 'products'=>'tns:ProductsArray2'),
-    $ns,
-    $ns.'#getListOfProductsOrServices',
-    $styledoc,
-    $styleuse,
-    'WS to get list of all products or services id and ref'
+	'getListOfProductsOrServices',
+	// Entry values
+	array('authentication'=>'tns:authentication', 'filterproduct'=>'tns:filterproduct'),
+	// Exit values
+	array('result'=>'tns:result', 'products'=>'tns:ProductsArray2'),
+	$ns,
+	$ns.'#getListOfProductsOrServices',
+	$styledoc,
+	$styleuse,
+	'WS to get list of all products or services id and ref'
 );
 
 // Register WSDL
@@ -342,131 +342,131 @@ $server->register(
  */
 function getProductOrService($authentication, $id = '', $ref = '', $ref_ext = '', $lang = '')
 {
-    global $db, $conf, $langs;
+	global $db, $conf, $langs;
 
-    dol_syslog("Function: getProductOrService login=".$authentication['login']." id=".$id." ref=".$ref." ref_ext=".$ref_ext);
+	dol_syslog("Function: getProductOrService login=".$authentication['login']." id=".$id." ref=".$ref." ref_ext=".$ref_ext);
 
-    $langcode = ($lang ? $lang : (empty($conf->global->MAIN_LANG_DEFAULT) ? 'auto' : $conf->global->MAIN_LANG_DEFAULT));
-    $langs->setDefaultLang($langcode);
+	$langcode = ($lang ? $lang : (empty($conf->global->MAIN_LANG_DEFAULT) ? 'auto' : $conf->global->MAIN_LANG_DEFAULT));
+	$langs->setDefaultLang($langcode);
 
-    if ($authentication['entity']) $conf->entity = $authentication['entity'];
+	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
-    if (!$error && (($id && $ref) || ($id && $ref_ext) || ($ref && $ref_ext)))
-    {
-        $error++;
-        $errorcode = 'BAD_PARAMETERS'; $errorlabel = "Parameter id, ref and ref_ext can't be both provided. You must choose one or other but not both.";
-    }
+	// Init and check authentication
+	$objectresp = array();
+	$errorcode = ''; $errorlabel = '';
+	$error = 0;
+	$fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
+	// Check parameters
+	if (!$error && (($id && $ref) || ($id && $ref_ext) || ($ref && $ref_ext)))
+	{
+		$error++;
+		$errorcode = 'BAD_PARAMETERS'; $errorlabel = "Parameter id, ref and ref_ext can't be both provided. You must choose one or other but not both.";
+	}
 
-    if (!$error)
-    {
-    	$langcode = ($lang ? $lang : (empty($conf->global->MAIN_LANG_DEFAULT) ? 'auto' : $conf->global->MAIN_LANG_DEFAULT));
-    	$langs->setDefaultLang($langcode);
+	if (!$error)
+	{
+		$langcode = ($lang ? $lang : (empty($conf->global->MAIN_LANG_DEFAULT) ? 'auto' : $conf->global->MAIN_LANG_DEFAULT));
+		$langs->setDefaultLang($langcode);
 
-        $fuser->getrights();
+		$fuser->getrights();
 
-        $nbmax = 10;
-        if ($fuser->rights->produit->lire || $fuser->rights->service->lire)
-        {
-            $product = new Product($db);
-            $result = $product->fetch($id, $ref, $ref_ext);
+		$nbmax = 10;
+		if ($fuser->rights->produit->lire || $fuser->rights->service->lire)
+		{
+			$product = new Product($db);
+			$result = $product->fetch($id, $ref, $ref_ext);
 
-            if ($result > 0)
-            {
-            	$product->load_stock();
+			if ($result > 0)
+			{
+				$product->load_stock();
 
-            	$dir = (!empty($conf->product->dir_output) ? $conf->product->dir_output : $conf->service->dir_output);
-            	$pdir = get_exdir($product->id, 2, 0, 0, $product, 'product').$product->ref."/";
-            	$dir = $dir.'/'.$pdir;
+				$dir = (!empty($conf->product->dir_output) ? $conf->product->dir_output : $conf->service->dir_output);
+				$pdir = get_exdir($product->id, 2, 0, 0, $product, 'product').$product->ref."/";
+				$dir = $dir.'/'.$pdir;
 
-            	if (!empty($product->multilangs[$langs->defaultlang]["label"]))     		$product->label = $product->multilangs[$langs->defaultlang]["label"];
-            	if (!empty($product->multilangs[$langs->defaultlang]["description"]))     	$product->description = $product->multilangs[$langs->defaultlang]["description"];
-            	if (!empty($product->multilangs[$langs->defaultlang]["note"]))     		$product->note = $product->multilangs[$langs->defaultlang]["note"];
+				if (!empty($product->multilangs[$langs->defaultlang]["label"]))     		$product->label = $product->multilangs[$langs->defaultlang]["label"];
+				if (!empty($product->multilangs[$langs->defaultlang]["description"]))     	$product->description = $product->multilangs[$langs->defaultlang]["description"];
+				if (!empty($product->multilangs[$langs->defaultlang]["note"]))     		$product->note = $product->multilangs[$langs->defaultlang]["note"];
 
-            	$productorservice_result_fields = array(
-	            	'id' => $product->id,
-	            	'ref' => $product->ref,
-	            	'ref_ext' => $product->ref_ext,
-	            	'label' => $product->label,
-	            	'description' => $product->description,
-	            	'date_creation' => dol_print_date($product->date_creation, 'dayhourrfc'),
-	            	'date_modification' => dol_print_date($product->date_modification, 'dayhourrfc'),
-	            	'note' => $product->note,
-	            	'status_tosell' => $product->status,
-	            	'status_tobuy' => $product->status_buy,
-	            	'type' => $product->type,
-	            	'barcode' => $product->barcode,
-	            	'barcode_type' => $product->barcode_type,
-	            	'country_id' => $product->country_id > 0 ? $product->country_id : '',
-	            	'country_code' => $product->country_code,
-	            	'custom_code' => $product->customcode,
+				$productorservice_result_fields = array(
+					'id' => $product->id,
+					'ref' => $product->ref,
+					'ref_ext' => $product->ref_ext,
+					'label' => $product->label,
+					'description' => $product->description,
+					'date_creation' => dol_print_date($product->date_creation, 'dayhourrfc'),
+					'date_modification' => dol_print_date($product->date_modification, 'dayhourrfc'),
+					'note' => $product->note,
+					'status_tosell' => $product->status,
+					'status_tobuy' => $product->status_buy,
+					'type' => $product->type,
+					'barcode' => $product->barcode,
+					'barcode_type' => $product->barcode_type,
+					'country_id' => $product->country_id > 0 ? $product->country_id : '',
+					'country_code' => $product->country_code,
+					'custom_code' => $product->customcode,
 
-	            	'price_net' => $product->price,
-	            	'price' => $product->price_ttc,
-	            	'price_min_net' => $product->price_min,
-	            	'price_min' => $product->price_min_ttc,
-	            	'price_base_type' => $product->price_base_type,
-	            	'vat_rate' => $product->tva_tx,
-	            	//! French VAT NPR
-	            	'vat_npr' => $product->tva_npr,
-	            	//! Spanish local taxes
-	            	'localtax1_tx' => $product->localtax1_tx,
-	            	'localtax2_tx' => $product->localtax2_tx,
+					'price_net' => $product->price,
+					'price' => $product->price_ttc,
+					'price_min_net' => $product->price_min,
+					'price_min' => $product->price_min_ttc,
+					'price_base_type' => $product->price_base_type,
+					'vat_rate' => $product->tva_tx,
+					//! French VAT NPR
+					'vat_npr' => $product->tva_npr,
+					//! Spanish local taxes
+					'localtax1_tx' => $product->localtax1_tx,
+					'localtax2_tx' => $product->localtax2_tx,
 
-            	    'stock_real' => $product->stock_reel,
-            	    'stock_virtual' => $product->stock_theorique,
-	            	'stock_alert' => $product->seuil_stock_alerte,
-	            	'pmp' => $product->pmp,
-	            	'import_key' => $product->import_key,
-	            	'dir' => $pdir,
-            		'images' => $product->liste_photos($dir, $nbmax)
-            	);
+					'stock_real' => $product->stock_reel,
+					'stock_virtual' => $product->stock_theorique,
+					'stock_alert' => $product->seuil_stock_alerte,
+					'pmp' => $product->pmp,
+					'import_key' => $product->import_key,
+					'dir' => $pdir,
+					'images' => $product->liste_photos($dir, $nbmax)
+				);
 
-            	$elementtype = 'product';
+				$elementtype = 'product';
 
-                //Retrieve all extrafield for thirdsparty
-            	// fetch optionals attributes and labels
-            	$extrafields = new ExtraFields($db);
-            	$extrafields->fetch_name_optionals_label($elementtype, true);
-            	//Get extrafield values
-            	$product->fetch_optionals();
+				//Retrieve all extrafield for thirdsparty
+				// fetch optionals attributes and labels
+				$extrafields = new ExtraFields($db);
+				$extrafields->fetch_name_optionals_label($elementtype, true);
+				//Get extrafield values
+				$product->fetch_optionals();
 
-            	if (is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label']))
-            	{
-            		foreach ($extrafields->attributes[$elementtype]['label'] as $key=>$label)
-	            	{
-	            		$productorservice_result_fields = array_merge($productorservice_result_fields, array('options_'.$key => $product->array_options['options_'.$key]));
-	            	}
-            	}
+				if (is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label']))
+				{
+					foreach ($extrafields->attributes[$elementtype]['label'] as $key=>$label)
+					{
+						$productorservice_result_fields = array_merge($productorservice_result_fields, array('options_'.$key => $product->array_options['options_'.$key]));
+					}
+				}
 
-                // Create
-                $objectresp = array(
-			    	'result'=>array('result_code'=>'OK', 'result_label'=>''),
-			        'product'=>$productorservice_result_fields
-                );
-            }
-            else {
-                $error++;
-                $errorcode = 'NOT_FOUND'; $errorlabel = 'Object not found for id='.$id.' nor ref='.$ref.' nor ref_ext='.$ref_ext;
-            }
-        }
-        else {
-            $error++;
-            $errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
-        }
-    }
+				// Create
+				$objectresp = array(
+					'result'=>array('result_code'=>'OK', 'result_label'=>''),
+					'product'=>$productorservice_result_fields
+				);
+			}
+			else {
+				$error++;
+				$errorcode = 'NOT_FOUND'; $errorlabel = 'Object not found for id='.$id.' nor ref='.$ref.' nor ref_ext='.$ref_ext;
+			}
+		}
+		else {
+			$error++;
+			$errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
+		}
+	}
 
-    if ($error)
-    {
-        $objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
-    }
+	if ($error)
+	{
+		$objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
+	}
 	//var_dump($objectresp);exit;
-    return $objectresp;
+	return $objectresp;
 }
 
 
@@ -479,54 +479,54 @@ function getProductOrService($authentication, $id = '', $ref = '', $ref_ext = ''
  */
 function createProductOrService($authentication, $product)
 {
-    global $db, $conf, $langs;
+	global $db, $conf, $langs;
 
-    $now = dol_now();
+	$now = dol_now();
 
-    dol_syslog("Function: createProductOrService login=".$authentication['login']);
+	dol_syslog("Function: createProductOrService login=".$authentication['login']);
 
-    if ($authentication['entity']) $conf->entity = $authentication['entity'];
+	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
-    if ($product['price_net'] > 0) $product['price_base_type'] = 'HT';
-    if ($product['price'] > 0)     $product['price_base_type'] = 'TTC';
+	// Init and check authentication
+	$objectresp = array();
+	$errorcode = ''; $errorlabel = '';
+	$error = 0;
+	$fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
+	// Check parameters
+	if ($product['price_net'] > 0) $product['price_base_type'] = 'HT';
+	if ($product['price'] > 0)     $product['price_base_type'] = 'TTC';
 
-    if ($product['price_net'] > 0 && $product['price'] > 0)
-    {
-        $error++; $errorcode = 'KO'; $errorlabel = "You must choose between price or price_net to provide price.";
-    }
+	if ($product['price_net'] > 0 && $product['price'] > 0)
+	{
+		$error++; $errorcode = 'KO'; $errorlabel = "You must choose between price or price_net to provide price.";
+	}
 
-    if ($product['barcode'] && !$product['barcode_type'])
-    {
-        $error++; $errorcode = 'KO'; $errorlabel = "You must set a barcode type when setting a barcode.";
-    }
+	if ($product['barcode'] && !$product['barcode_type'])
+	{
+		$error++; $errorcode = 'KO'; $errorlabel = "You must set a barcode type when setting a barcode.";
+	}
 
 
 
-    if (!$error)
-    {
-        include_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+	if (!$error)
+	{
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 
-        $newobject = new Product($db);
-        $newobject->ref = $product['ref'];
-        $newobject->ref_ext = $product['ref_ext'];
-        $newobject->type = $product['type'];
-        $newobject->label = $product['label'];
-        $newobject->description = $product['description'];
-        $newobject->note_public = $product['note_public'];
-        $newobject->note_private = $product['note_private'];
-        $newobject->status = $product['status_tosell'];
-        $newobject->status_buy = $product['status_tobuy'];
-        $newobject->price = $product['price_net'];
-        $newobject->price_ttc = $product['price'];
-        $newobject->tva_tx = $product['vat_rate'];
-        $newobject->price_base_type = $product['price_base_type'];
-        $newobject->date_creation = $now;
+		$newobject = new Product($db);
+		$newobject->ref = $product['ref'];
+		$newobject->ref_ext = $product['ref_ext'];
+		$newobject->type = $product['type'];
+		$newobject->label = $product['label'];
+		$newobject->description = $product['description'];
+		$newobject->note_public = $product['note_public'];
+		$newobject->note_private = $product['note_private'];
+		$newobject->status = $product['status_tosell'];
+		$newobject->status_buy = $product['status_tobuy'];
+		$newobject->price = $product['price_net'];
+		$newobject->price_ttc = $product['price'];
+		$newobject->tva_tx = $product['vat_rate'];
+		$newobject->price_base_type = $product['price_base_type'];
+		$newobject->date_creation = $now;
 
 		if ($product['barcode'])
 		{
@@ -534,16 +534,16 @@ function createProductOrService($authentication, $product)
 			$newobject->barcode_type = $product['barcode_type'];
 		}
 
-        $newobject->stock_reel = $product['stock_real'];
-        $newobject->pmp = $product['pmp'];
-        $newobject->seuil_stock_alert = $product['stock_alert'];
+		$newobject->stock_reel = $product['stock_real'];
+		$newobject->pmp = $product['pmp'];
+		$newobject->seuil_stock_alert = $product['stock_alert'];
 
-        $newobject->country_id = $product['country_id'];
-        if ($product['country_code']) $newobject->country_id = getCountry($product['country_code'], 3);
-        $newobject->customcode = $product['customcode'];
+		$newobject->country_id = $product['country_id'];
+		if ($product['country_code']) $newobject->country_id = getCountry($product['country_code'], 3);
+		$newobject->customcode = $product['customcode'];
 
-        $newobject->canvas = $product['canvas'];
-        /*foreach($product['lines'] as $line)
+		$newobject->canvas = $product['canvas'];
+		/*foreach($product['lines'] as $line)
         {
             $newline=new FactureLigne($db);
             $newline->type=$line['type'];
@@ -556,13 +556,13 @@ function createProductOrService($authentication, $product)
             $newline->qty=$line['qty'];
             $newline->fk_product=$line['product_id'];
         }*/
-        //var_dump($product['ref_ext']);
-        //var_dump($product['lines'][0]['type']);
+		//var_dump($product['ref_ext']);
+		//var_dump($product['lines'][0]['type']);
 
-        $elementtype = 'product';
+		$elementtype = 'product';
 
-        $extrafields = new ExtraFields($db);
-        $extrafields->fetch_name_optionals_label($elementtype, true);
+		$extrafields = new ExtraFields($db);
+		$extrafields->fetch_name_optionals_label($elementtype, true);
 		if (is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label']))
 		{
 			foreach ($extrafields->attributes[$elementtype]['label'] as $key=>$label)
@@ -572,17 +572,17 @@ function createProductOrService($authentication, $product)
 			}
 		}
 
-        $db->begin();
+		$db->begin();
 
-        $result = $newobject->create($fuser, 0);
-        if ($result <= 0)
-        {
-            $error++;
-        }
+		$result = $newobject->create($fuser, 0);
+		if ($result <= 0)
+		{
+			$error++;
+		}
 
-        if (!$error)
-        {
-        	// Update stock if stock count is provided and differs from database after creation or update
+		if (!$error)
+		{
+			// Update stock if stock count is provided and differs from database after creation or update
 			if (isset($product['stock_real']) && $product['stock_real'] != '' && !empty($conf->global->stock->enabled))
 			{
 				include_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
@@ -619,25 +619,25 @@ function createProductOrService($authentication, $product)
 			}
 		}
 
-        if (!$error)
-        {
-            $db->commit();
-            $objectresp = array('result'=>array('result_code'=>'OK', 'result_label'=>''), 'id'=>$newobject->id, 'ref'=>$newobject->ref);
-        }
-        else {
-            $db->rollback();
-            $error++;
-            $errorcode = 'KO';
-            $errorlabel = $newobject->error;
-        }
-    }
+		if (!$error)
+		{
+			$db->commit();
+			$objectresp = array('result'=>array('result_code'=>'OK', 'result_label'=>''), 'id'=>$newobject->id, 'ref'=>$newobject->ref);
+		}
+		else {
+			$db->rollback();
+			$error++;
+			$errorcode = 'KO';
+			$errorlabel = $newobject->error;
+		}
+	}
 
-    if ($error)
-    {
-        $objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
-    }
+	if ($error)
+	{
+		$objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
+	}
 
-    return $objectresp;
+	return $objectresp;
 }
 
 
@@ -650,87 +650,72 @@ function createProductOrService($authentication, $product)
  */
 function updateProductOrService($authentication, $product)
 {
-    global $db, $conf, $langs;
+	global $db, $conf, $langs;
 
-    $now = dol_now();
+	$now = dol_now();
 
-    dol_syslog("Function: updateProductOrService login=".$authentication['login']);
+	dol_syslog("Function: updateProductOrService login=".$authentication['login']);
 
-    if ($authentication['entity']) $conf->entity = $authentication['entity'];
+	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
-    if ($product['price_net'] > 0) $product['price_base_type'] = 'HT';
-    if ($product['price'] > 0)     $product['price_base_type'] = 'TTC';
+	// Init and check authentication
+	$objectresp = array();
+	$errorcode = ''; $errorlabel = '';
+	$error = 0;
+	$fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
+	// Check parameters
+	if ($product['price_net'] > 0) $product['price_base_type'] = 'HT';
+	if ($product['price'] > 0)     $product['price_base_type'] = 'TTC';
 
-    if ($product['price_net'] > 0 && $product['price'] > 0)
-    {
-        $error++; $errorcode = 'KO'; $errorlabel = "You must choose between price or price_net to provide price.";
-    }
+	if ($product['price_net'] > 0 && $product['price'] > 0)
+	{
+		$error++; $errorcode = 'KO'; $errorlabel = "You must choose between price or price_net to provide price.";
+	}
 
 
-    if ($product['barcode'] && !$product['barcode_type'])
-    {
-        $error++; $errorcode = 'KO'; $errorlabel = "You must set a barcode type when setting a barcode.";
-    }
+	if ($product['barcode'] && !$product['barcode_type'])
+	{
+		$error++; $errorcode = 'KO'; $errorlabel = "You must set a barcode type when setting a barcode.";
+	}
 
-    if (!$error)
-    {
-        include_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+	if (!$error)
+	{
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 
-        $newobject = new Product($db);
-        $newobject->fetch($product['id']);
+		$newobject = new Product($db);
+		$newobject->fetch($product['id']);
 
-        if (isset($product['ref']))     $newobject->ref = $product['ref'];
-        if (isset($product['ref_ext'])) $newobject->ref_ext = $product['ref_ext'];
-        $newobject->type = $product['type'];
-        $newobject->label = $product['label'];
-        $newobject->description = $product['description'];
-        $newobject->note = $product['note'];
-        $newobject->status = $product['status_tosell'];
-        $newobject->status_buy = $product['status_tobuy'];
-        $newobject->price = $product['price_net'];
-        $newobject->price_ttc = $product['price'];
-        $newobject->tva_tx = $product['vat_rate'];
-        $newobject->price_base_type = $product['price_base_type'];
-        $newobject->date_creation = $now;
+		if (isset($product['ref']))     $newobject->ref = $product['ref'];
+		if (isset($product['ref_ext'])) $newobject->ref_ext = $product['ref_ext'];
+		$newobject->type = $product['type'];
+		$newobject->label = $product['label'];
+		$newobject->description = $product['description'];
+		$newobject->note = $product['note'];
+		$newobject->status = $product['status_tosell'];
+		$newobject->status_buy = $product['status_tobuy'];
+		$newobject->price = $product['price_net'];
+		$newobject->price_ttc = $product['price'];
+		$newobject->tva_tx = $product['vat_rate'];
+		$newobject->price_base_type = $product['price_base_type'];
+		$newobject->date_creation = $now;
 
-        if ($product['barcode'])
-        {
-                $newobject->barcode = $product['barcode'];
-                $newobject->barcode_type = $product['barcode_type'];
-        }
+		if ($product['barcode'])
+		{
+				$newobject->barcode = $product['barcode'];
+				$newobject->barcode_type = $product['barcode_type'];
+		}
 
-        $newobject->stock_reel = $product['stock_real'];
-        $newobject->pmp = $product['pmp'];
-        $newobject->seuil_stock_alert = $product['stock_alert'];
+		$newobject->stock_reel = $product['stock_real'];
+		$newobject->pmp = $product['pmp'];
+		$newobject->seuil_stock_alert = $product['stock_alert'];
 
-        $newobject->country_id = $product['country_id'];
-        if ($product['country_code']) $newobject->country_id = getCountry($product['country_code'], 3);
-        $newobject->customcode = $product['customcode'];
+		$newobject->country_id = $product['country_id'];
+		if ($product['country_code']) $newobject->country_id = getCountry($product['country_code'], 3);
+		$newobject->customcode = $product['customcode'];
 
-        $newobject->canvas = $product['canvas'];
-        /*foreach($product['lines'] as $line)
-        {
-            $newline=new FactureLigne($db);
-            $newline->type=$line['type'];
-            $newline->desc=$line['desc'];
-            $newline->fk_product=$line['fk_product'];
-            $newline->total_ht=$line['total_net'];
-            $newline->total_vat=$line['total_vat'];
-            $newline->total_ttc=$line['total'];
-            $newline->vat=$line['vat_rate'];
-            $newline->qty=$line['qty'];
-            $newline->fk_product=$line['product_id'];
-        }*/
-        //var_dump($product['ref_ext']);
-        //var_dump($product['lines'][0]['type']);
+		$newobject->canvas = $product['canvas'];
 
-        $elementtype = 'product';
+		$elementtype = 'product';
 
 		$extrafields = new ExtraFields($db);
 		$extrafields->fetch_name_optionals_label($elementtype, true);
@@ -743,15 +728,15 @@ function updateProductOrService($authentication, $product)
 			}
 		}
 
-        $db->begin();
+		$db->begin();
 
-        $result = $newobject->update($newobject->id, $fuser);
-        if ($result <= 0)
-        {
-            $error++;
-        }
-        else {
-        	// Update stock if stock count is provided and differs from database after creation or update
+		$result = $newobject->update($newobject->id, $fuser);
+		if ($result <= 0)
+		{
+			$error++;
+		}
+		else {
+			// Update stock if stock count is provided and differs from database after creation or update
 			if (isset($product['stock_real']) && $product['stock_real'] != '' && !empty($conf->global->stock->enabled))
 			{
 				include_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
@@ -786,47 +771,47 @@ function updateProductOrService($authentication, $product)
 					}
 				}
 			}
-        }
+		}
 
-        if (!$error)
-        {
-            if ($newobject->price_base_type == 'HT')
-            {
-                $result = $newobject->updatePrice($newobject->price, $newobject->price_base_type, $fuser);
-                if ($result <= 0)
-                {
-                    $error++;
-                }
-            }
-            elseif ($newobject->price_base_type == 'TTC')
-            {
-                $result = $newobject->updatePrice($newobject->price_ttc, $newobject->price_base_type);
-                if ($result <= 0)
-                {
-                    $error++;
-                }
-            }
-        }
+		if (!$error)
+		{
+			if ($newobject->price_base_type == 'HT')
+			{
+				$result = $newobject->updatePrice($newobject->price, $newobject->price_base_type, $fuser);
+				if ($result <= 0)
+				{
+					$error++;
+				}
+			}
+			elseif ($newobject->price_base_type == 'TTC')
+			{
+				$result = $newobject->updatePrice($newobject->price_ttc, $newobject->price_base_type);
+				if ($result <= 0)
+				{
+					$error++;
+				}
+			}
+		}
 
-        if (!$error)
-        {
-            $db->commit();
-            $objectresp = array('result'=>array('result_code'=>'OK', 'result_label'=>''), 'id'=>$newobject->id, 'ref'=>$newobject->ref);
-        }
-        else {
-            $db->rollback();
-            $error++;
-            $errorcode = 'KO';
-            $errorlabel = $newobject->error;
-        }
-    }
+		if (!$error)
+		{
+			$db->commit();
+			$objectresp = array('result'=>array('result_code'=>'OK', 'result_label'=>''), 'id'=>$newobject->id, 'ref'=>$newobject->ref);
+		}
+		else {
+			$db->rollback();
+			$error++;
+			$errorcode = 'KO';
+			$errorlabel = $newobject->error;
+		}
+	}
 
-    if ($error)
-    {
-        $objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
-    }
+	if ($error)
+	{
+		$objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
+	}
 
-    return $objectresp;
+	return $objectresp;
 }
 
 
@@ -839,87 +824,87 @@ function updateProductOrService($authentication, $product)
  */
 function deleteProductOrService($authentication, $listofidstring)
 {
-    global $db, $conf, $langs;
+	global $db, $conf, $langs;
 
-    dol_syslog("Function: deleteProductOrService login=".$authentication['login']);
+	dol_syslog("Function: deleteProductOrService login=".$authentication['login']);
 
-    if ($authentication['entity']) $conf->entity = $authentication['entity'];
+	if ($authentication['entity']) $conf->entity = $authentication['entity'];
 
-    // Init and check authentication
-    $objectresp = array();
-    $errorcode = ''; $errorlabel = '';
-    $error = 0;
-    $fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
+	// Init and check authentication
+	$objectresp = array();
+	$errorcode = ''; $errorlabel = '';
+	$error = 0;
+	$fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
 
 	// User must be defined to user authenticated
-    global $user;
-    $user = $fuser;
+	global $user;
+	$user = $fuser;
 
-    $listofid = explode(',', trim($listofidstring));
-    $listofiddeleted = array();
+	$listofid = explode(',', trim($listofidstring));
+	$listofiddeleted = array();
 
-    // Check parameters
-    if (count($listofid) == 0 || empty($listofid[0]))
-    {
-        $error++; $errorcode = 'KO'; $errorlabel = "List of Id of products or services to delete are required.";
-    }
+	// Check parameters
+	if (count($listofid) == 0 || empty($listofid[0]))
+	{
+		$error++; $errorcode = 'KO'; $errorlabel = "List of Id of products or services to delete are required.";
+	}
 
-    if (!$error)
-    {
-    	$firsterror = '';
+	if (!$error)
+	{
+		$firsterror = '';
 
 		$db->begin();
 
-    	foreach ($listofid as $key => $id)
+		foreach ($listofid as $key => $id)
 		{
-	        $newobject = new Product($db);
-	        $result = $newobject->fetch($id);
+			$newobject = new Product($db);
+			$result = $newobject->fetch($id);
 
-	        if ($result == 0)
-	        {
-	        	$error++;
-		        $firsterror = 'Product or service with id '.$id.' not found';
-		        break;
-	        }
-	        else {
-		        $result = $newobject->delete($user);
-		        if ($result <= 0)
-		        {
-		            $error++;
-		            $firsterror = $newobject->error;
-		            break;
-		        }
+			if ($result == 0)
+			{
+				$error++;
+				$firsterror = 'Product or service with id '.$id.' not found';
+				break;
+			}
+			else {
+				$result = $newobject->delete($user);
+				if ($result <= 0)
+				{
+					$error++;
+					$firsterror = $newobject->error;
+					break;
+				}
 
-		        $listofiddeleted[] = $id;
+				$listofiddeleted[] = $id;
 			}
 		}
 
-	    if (!$error)
-	    {
-	        $db->commit();
-            //$objectresp=array('result'=>array('result_code'=>'OK', 'result_label'=>''), 'listofid'=>$listofiddeleted);
-            $objectresp = array('result'=>array('result_code'=>'OK', 'result_label'=>''), 'nbdeleted'=>count($listofiddeleted));
-	    }
-	    else {
-	    	$db->rollback();
-	        $error++;
-	        $errorcode = 'KO';
-	        $errorlabel = $firsterror;
+		if (!$error)
+		{
+			$db->commit();
+			//$objectresp=array('result'=>array('result_code'=>'OK', 'result_label'=>''), 'listofid'=>$listofiddeleted);
+			$objectresp = array('result'=>array('result_code'=>'OK', 'result_label'=>''), 'nbdeleted'=>count($listofiddeleted));
 		}
-    }
+		else {
+			$db->rollback();
+			$error++;
+			$errorcode = 'KO';
+			$errorlabel = $firsterror;
+		}
+	}
 
-    if ($error)
-    {
-        //$objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel), 'listofid'=>$listofiddeleted);
-        $objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel), 'nbdeleted'=>0);
-    }
-    elseif (count($listofiddeleted) == 0)
-    {
+	if ($error)
+	{
+		//$objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel), 'listofid'=>$listofiddeleted);
+		$objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel), 'nbdeleted'=>0);
+	}
+	elseif (count($listofiddeleted) == 0)
+	{
    		//$objectresp=array('result'=>array('result_code'=>'NOT_FOUND', 'result_label'=>'No product or service with id '.join(',',$listofid).' found'), 'listofid'=>$listofiddeleted);
    		$objectresp = array('result'=>array('result_code'=>'NOT_FOUND', 'result_label'=>'No product or service with id '.join(',', $listofid).' found'), 'nbdeleted'=>0);
-    }
+	}
 
-    return $objectresp;
+	return $objectresp;
 }
 
 
@@ -932,65 +917,65 @@ function deleteProductOrService($authentication, $listofidstring)
  */
 function getListOfProductsOrServices($authentication, $filterproduct)
 {
-    global $db, $conf, $langs;
+	global $db, $conf, $langs;
 
-    dol_syslog("Function: getListOfProductsOrServices login=".$authentication['login']);
+	dol_syslog("Function: getListOfProductsOrServices login=".$authentication['login']);
 
-    if ($authentication['entity']) $conf->entity = $authentication['entity'];
+	if ($authentication['entity']) $conf->entity = $authentication['entity'];
 
-    // Init and check authentication
-    $objectresp = array();
-    $arrayproducts = array();
-    $errorcode = ''; $errorlabel = '';
-    $error = 0;
-    $fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
-    // Check parameters
+	// Init and check authentication
+	$objectresp = array();
+	$arrayproducts = array();
+	$errorcode = ''; $errorlabel = '';
+	$error = 0;
+	$fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
+	// Check parameters
 
-    if (!$error)
-    {
-        $sql = "SELECT rowid, ref, ref_ext";
-        $sql .= " FROM ".MAIN_DB_PREFIX."product";
-        $sql .= " WHERE entity=".$conf->entity;
-        foreach ($filterproduct as $key => $val)
-        {
-		    if ($key == 'type' && $val >= 0) $sql .= " AND fk_product_type = ".$db->escape($val);
-		    if ($key == 'status_tosell') $sql .= " AND tosell = ".$db->escape($val);
-		    if ($key == 'status_tobuy') $sql .= " AND tobuy = ".$db->escape($val);
-        }
+	if (!$error)
+	{
+		$sql = "SELECT rowid, ref, ref_ext";
+		$sql .= " FROM ".MAIN_DB_PREFIX."product";
+		$sql .= " WHERE entity=".$conf->entity;
+		foreach ($filterproduct as $key => $val)
+		{
+			if ($key == 'type' && $val >= 0) $sql .= " AND fk_product_type = ".$db->escape($val);
+			if ($key == 'status_tosell') $sql .= " AND tosell = ".$db->escape($val);
+			if ($key == 'status_tobuy') $sql .= " AND tobuy = ".$db->escape($val);
+		}
 		$resql = $db->query($sql);
-        if ($resql)
-        {
-         	$num = $db->num_rows($resql);
+		if ($resql)
+		{
+		 	$num = $db->num_rows($resql);
 
-         	$i = 0;
-         	while ($i < $num)
-         	{
-         		$obj = $db->fetch_object($resql);
-         		$arrayproducts[] = array('id'=>$obj->rowid, 'ref'=>$obj->ref, 'ref_ext'=>$obj->ref_ext);
-         		$i++;
-         	}
-        }
-        else {
-            $error++;
-            $errorcode = $db->lasterrno();
-            $errorlabel = $db->lasterror();
-        }
-    }
+		 	$i = 0;
+		 	while ($i < $num)
+		 	{
+		 		$obj = $db->fetch_object($resql);
+		 		$arrayproducts[] = array('id'=>$obj->rowid, 'ref'=>$obj->ref, 'ref_ext'=>$obj->ref_ext);
+		 		$i++;
+		 	}
+		}
+		else {
+			$error++;
+			$errorcode = $db->lasterrno();
+			$errorlabel = $db->lasterror();
+		}
+	}
 
-    if ($error)
-    {
-        $objectresp = array(
+	if ($error)
+	{
+		$objectresp = array(
 			'result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel),
-        	'products'=>$arrayproducts
-        );
-    } else {
-        $objectresp = array(
+			'products'=>$arrayproducts
+		);
+	} else {
+		$objectresp = array(
 			'result'=>array('result_code' => 'OK', 'result_label' => ''),
-        	'products'=>$arrayproducts
-        );
-    }
+			'products'=>$arrayproducts
+		);
+	}
 
-    return $objectresp;
+	return $objectresp;
 }
 
 
@@ -1065,34 +1050,34 @@ function getProductsForCategory($authentication, $id, $lang = '')
 							$dir = $dir.'/'.$pdir;
 
 							$products[] = array(
-						    	'id' => $tmpproduct->id,
+								'id' => $tmpproduct->id,
 					   			'ref' => $tmpproduct->ref,
 					   			'ref_ext' => $tmpproduct->ref_ext,
-					    		'label' => !empty($tmpproduct->multilangs[$langs->defaultlang]["label"]) ? $tmpproduct->multilangs[$langs->defaultlang]["label"] : $tmpproduct->label,
-					    		'description' => !empty($tmpproduct->multilangs[$langs->defaultlang]["description"]) ? $tmpproduct->multilangs[$langs->defaultlang]["description"] : $tmpproduct->description,
-					    		'date_creation' => dol_print_date($tmpproduct->date_creation, 'dayhourrfc'),
-					    		'date_modification' => dol_print_date($tmpproduct->date_modification, 'dayhourrfc'),
-					            'note' => !empty($tmpproduct->multilangs[$langs->defaultlang]["note"]) ? $tmpproduct->multilangs[$langs->defaultlang]["note"] : $tmpproduct->note,
-					            'status_tosell' => $tmpproduct->status,
-					            'status_tobuy' => $tmpproduct->status_buy,
-		                		'type' => $tmpproduct->type,
-						        'barcode' => $tmpproduct->barcode,
-						        'barcode_type' => $tmpproduct->barcode_type,
-		                		'country_id' => $tmpproduct->country_id > 0 ? $tmpproduct->country_id : '',
-						        'country_code' => $tmpproduct->country_code,
-						        'custom_code' => $tmpproduct->customcode,
+								'label' => !empty($tmpproduct->multilangs[$langs->defaultlang]["label"]) ? $tmpproduct->multilangs[$langs->defaultlang]["label"] : $tmpproduct->label,
+								'description' => !empty($tmpproduct->multilangs[$langs->defaultlang]["description"]) ? $tmpproduct->multilangs[$langs->defaultlang]["description"] : $tmpproduct->description,
+								'date_creation' => dol_print_date($tmpproduct->date_creation, 'dayhourrfc'),
+								'date_modification' => dol_print_date($tmpproduct->date_modification, 'dayhourrfc'),
+								'note' => !empty($tmpproduct->multilangs[$langs->defaultlang]["note"]) ? $tmpproduct->multilangs[$langs->defaultlang]["note"] : $tmpproduct->note,
+								'status_tosell' => $tmpproduct->status,
+								'status_tobuy' => $tmpproduct->status_buy,
+								'type' => $tmpproduct->type,
+								'barcode' => $tmpproduct->barcode,
+								'barcode_type' => $tmpproduct->barcode_type,
+								'country_id' => $tmpproduct->country_id > 0 ? $tmpproduct->country_id : '',
+								'country_code' => $tmpproduct->country_code,
+								'custom_code' => $tmpproduct->customcode,
 
-						        'price_net' => $tmpproduct->price,
-						        'price' => $tmpproduct->price_ttc,
-						        'vat_rate' => $tmpproduct->tva_tx,
+								'price_net' => $tmpproduct->price,
+								'price' => $tmpproduct->price_ttc,
+								'vat_rate' => $tmpproduct->tva_tx,
 
 								'price_base_type' => $tmpproduct->price_base_type,
 
-						        'stock_real' => $tmpproduct->stock_reel,
-		                		'stock_alert' => $tmpproduct->seuil_stock_alerte,
-						        'pmp' => $tmpproduct->pmp,
-		                		'import_key' => $tmpproduct->import_key,
-		                		'dir' => $pdir,
+								'stock_real' => $tmpproduct->stock_reel,
+								'stock_alert' => $tmpproduct->seuil_stock_alerte,
+								'pmp' => $tmpproduct->pmp,
+								'import_key' => $tmpproduct->import_key,
+								'dir' => $pdir,
 								'images' => $tmpproduct->liste_photos($dir, $nbmax)
 							);
 
diff --git a/htdocs/webservices/server_project.php b/htdocs/webservices/server_project.php
index a6b7a7c29ce..9d4c93c9ce9 100644
--- a/htdocs/webservices/server_project.php
+++ b/htdocs/webservices/server_project.php
@@ -39,29 +39,29 @@ $langs->load("main");
 // Enable and test if module web services is enabled
 if (empty($conf->global->MAIN_MODULE_WEBSERVICES))
 {
-    $langs->load("admin");
-    dol_syslog("Call Dolibarr webservices interfaces with module webservices disabled");
-    print $langs->trans("WarningModuleNotActive", 'WebServices').'.<br><br>';
-    print $langs->trans("ToActivateModule");
-    exit;
+	$langs->load("admin");
+	dol_syslog("Call Dolibarr webservices interfaces with module webservices disabled");
+	print $langs->trans("WarningModuleNotActive", 'WebServices').'.<br><br>';
+	print $langs->trans("ToActivateModule");
+	exit;
 }
 
 // Create associated types array, with each table
 $listofreferent = array(
-    'propal' => 'propal',
-    'order' => 'commande',
-    'invoice' => 'facture',
-    'invoice_predefined' => 'facture_rec',
-    'proposal_supplier' => 'commande_fournisseur',
-    'order_supplier' => 'commande_fournisseur',
-    'invoice_supplier' => 'facture_fourn',
-    'contract' => 'contrat',
-    'intervention' => 'fichinter',
-    'trip' => 'deplacement',
-    'expensereport' => 'expensereport_det',
-    'donation' => 'don',
-    'agenda' => 'actioncomm',
-    'project_task' => 'projet_task',
+	'propal' => 'propal',
+	'order' => 'commande',
+	'invoice' => 'facture',
+	'invoice_predefined' => 'facture_rec',
+	'proposal_supplier' => 'commande_fournisseur',
+	'order_supplier' => 'commande_fournisseur',
+	'invoice_supplier' => 'facture_fourn',
+	'contract' => 'contrat',
+	'intervention' => 'fichinter',
+	'trip' => 'deplacement',
+	'expensereport' => 'expensereport_det',
+	'donation' => 'don',
+	'agenda' => 'actioncomm',
+	'project_task' => 'projet_task',
 );
 
 // Create the soap Object
@@ -74,89 +74,89 @@ $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 other specific objects
 $server->wsdl->addComplexType(
-    'element',
-    'complexType',
-    'struct',
-    'all',
-    '',
-    array(
-        'id' => array('name'=>'id', 'type'=>'xsd:int'),
-        'user' => array('name'=>'user', 'type'=>'xsd:int'),
-    )
+	'element',
+	'complexType',
+	'struct',
+	'all',
+	'',
+	array(
+		'id' => array('name'=>'id', 'type'=>'xsd:int'),
+		'user' => array('name'=>'user', 'type'=>'xsd:int'),
+	)
 );
 
 $server->wsdl->addComplexType(
-    'elementsArray',
-    'complexType',
-    'array',
-    'sequence',
-    '',
-    array(
-        'elements' => array(
-            'name' => 'elementsArray',
-            'type' => 'tns:element',
-            'minOccurs' => '0',
-            'maxOccurs' => 'unbounded'
-        )
-    )
+	'elementsArray',
+	'complexType',
+	'array',
+	'sequence',
+	'',
+	array(
+		'elements' => array(
+			'name' => 'elementsArray',
+			'type' => 'tns:element',
+			'minOccurs' => '0',
+			'maxOccurs' => 'unbounded'
+		)
+	)
 );
 
 $project_elements = array();
 foreach ($listofreferent as $key => $_)
 {
-    $project_elements[$key] = array('name'=>$key, 'type'=>'tns:elementsArray');
+	$project_elements[$key] = array('name'=>$key, 'type'=>'tns:elementsArray');
 }
 $server->wsdl->addComplexType(
-    'elements',
-    'complexType',
-    'struct',
-    'all',
-    '',
-    $project_elements
+	'elements',
+	'complexType',
+	'struct',
+	'all',
+	'',
+	$project_elements
 );
 
 // Define project
 $project_fields = array(
-    'id' => array('name'=>'id', 'type'=>'xsd:string'),
-    'ref' => array('name'=>'ref', 'type'=>'xsd:string'),
-    'label' => array('name'=>'label', 'type'=>'xsd:string'),
-    'thirdparty_id' => array('name'=>'thirdparty_id', 'type'=>'xsd:int'),
-    'public' => array('name'=>'public', 'type'=>'xsd:int'),
-    'status' => array('name'=>'status', 'type'=>'xsd:int'),
-    'date_start' => array('name'=>'date_start', 'type'=>'xsd:date'),
-    'date_end' => array('name'=>'date_end', 'type'=>'xsd:date'),
-    'budget' => array('name'=>'budget', 'type'=>'xsd:int'),
-    'description' => array('name'=>'description', 'type'=>'xsd:string'),
-    'elements' => array('name'=>'elements', 'type'=>'tns:elements')
+	'id' => array('name'=>'id', 'type'=>'xsd:string'),
+	'ref' => array('name'=>'ref', 'type'=>'xsd:string'),
+	'label' => array('name'=>'label', 'type'=>'xsd:string'),
+	'thirdparty_id' => array('name'=>'thirdparty_id', 'type'=>'xsd:int'),
+	'public' => array('name'=>'public', 'type'=>'xsd:int'),
+	'status' => array('name'=>'status', 'type'=>'xsd:int'),
+	'date_start' => array('name'=>'date_start', 'type'=>'xsd:date'),
+	'date_end' => array('name'=>'date_end', 'type'=>'xsd:date'),
+	'budget' => array('name'=>'budget', 'type'=>'xsd:int'),
+	'description' => array('name'=>'description', 'type'=>'xsd:string'),
+	'elements' => array('name'=>'elements', 'type'=>'tns:elements')
 );
 
 $elementtype = 'project';
@@ -167,28 +167,28 @@ $extrafields = new ExtraFields($db);
 $extrafields->fetch_name_optionals_label($elementtype, true);
 $extrafield_array = null;
 if (is_array($extrafields) && count($extrafields) > 0) {
-    $extrafield_array = array();
+	$extrafield_array = array();
 }
 if (is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label']))
 {
 	foreach ($extrafields->attributes[$elementtype]['label'] as $key=>$label)
 	{
-	    //$value=$object->array_options["options_".$key];
-	    $type = $extrafields->attributes[$elementtype]['type'][$key];
-	    if ($type == 'date' || $type == 'datetime') {$type = 'xsd:dateTime'; }
-	    else {$type = 'xsd:string'; }
-	    $extrafield_array['options_'.$key] = array('name'=>'options_'.$key, 'type'=>$type);
+		//$value=$object->array_options["options_".$key];
+		$type = $extrafields->attributes[$elementtype]['type'][$key];
+		if ($type == 'date' || $type == 'datetime') {$type = 'xsd:dateTime'; }
+		else {$type = 'xsd:string'; }
+		$extrafield_array['options_'.$key] = array('name'=>'options_'.$key, 'type'=>$type);
 	}
 }
 if (is_array($extrafield_array)) $project_fields = array_merge($project_fields, $extrafield_array);
 
 $server->wsdl->addComplexType(
-    'project',
-    'complexType',
-    'struct',
-    'all',
-    '',
-    $project_fields
+	'project',
+	'complexType',
+	'struct',
+	'all',
+	'',
+	$project_fields
 );
 
 // 5 styles: RPC/encoded, RPC/literal, Document/encoded (not WS-I compliant), Document/literal, Document/literal wrapped
@@ -200,30 +200,30 @@ $styleuse = 'encoded'; // encoded/literal/literal wrapped
 
 // Register WSDL
 $server->register(
-    'createProject',
-    // Entry values
-    array('authentication'=>'tns:authentication', 'project'=>'tns:project'),
-    // Exit values
-    array('result'=>'tns:result', 'id'=>'xsd:string', 'ref'=>'xsd:string'),
-    $ns,
-    $ns.'#createProject',
-    $styledoc,
-    $styleuse,
-    'WS to create project'
+	'createProject',
+	// Entry values
+	array('authentication'=>'tns:authentication', 'project'=>'tns:project'),
+	// Exit values
+	array('result'=>'tns:result', 'id'=>'xsd:string', 'ref'=>'xsd:string'),
+	$ns,
+	$ns.'#createProject',
+	$styledoc,
+	$styleuse,
+	'WS to create project'
 );
 
 // Register WSDL
 $server->register(
-    'getProject',
-    // Entry values
-    array('authentication'=>'tns:authentication', 'id'=>'xsd:string', 'ref'=>'xsd:string'),
-    // Exit values
-    array('result'=>'tns:result', 'project'=>'tns:project'),
-    $ns,
-    $ns.'#getProject',
-    $styledoc,
-    $styleuse,
-    'WS to get project'
+	'getProject',
+	// Entry values
+	array('authentication'=>'tns:authentication', 'id'=>'xsd:string', 'ref'=>'xsd:string'),
+	// Exit values
+	array('result'=>'tns:result', 'project'=>'tns:project'),
+	$ns,
+	$ns.'#getProject',
+	$styledoc,
+	$styleuse,
+	'WS to get project'
 );
 
 // Full methods code
@@ -236,96 +236,96 @@ $server->register(
  */
 function createProject($authentication, $project)
 {
-    global $db, $conf;
+	global $db, $conf;
 
-    dol_syslog("Function: createProject login=".$authentication['login']);
+	dol_syslog("Function: createProject login=".$authentication['login']);
 
-    if ($authentication['entity']) $conf->entity = $authentication['entity'];
+	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
-    if (empty($project['ref']))
-    {
-        $error++; $errorcode = 'KO'; $errorlabel = "Name is mandatory.";
-    }
+	// Init and check authentication
+	$objectresp = array();
+	$errorcode = ''; $errorlabel = '';
+	$error = 0;
+	$fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
+	// Check parameters
+	if (empty($project['ref']))
+	{
+		$error++; $errorcode = 'KO'; $errorlabel = "Name is mandatory.";
+	}
 
 
-    if (!$error)
-    {
-        $fuser->getrights();
+	if (!$error)
+	{
+		$fuser->getrights();
 
-        if ($fuser->rights->projet->creer)
-        {
-            $newobject = new Project($db);
-            $newobject->ref = $project['ref'];
-            $newobject->title = $project['label'];
-            $newobject->socid = $project['thirdparty_id'];
-            $newobject->public = $project['public'];
-            $newobject->statut = $project['status'];
-            $newobject->date_start = dol_stringtotime($project['date_start'], 'dayrfc');
-            $newobject->date_end = dol_stringtotime($project['date_end'], 'dayrfc');
-            $newobject->budget_amount = $project['budget'];
-            $newobject->description = $project['description'];
+		if ($fuser->rights->projet->creer)
+		{
+			$newobject = new Project($db);
+			$newobject->ref = $project['ref'];
+			$newobject->title = $project['label'];
+			$newobject->socid = $project['thirdparty_id'];
+			$newobject->public = $project['public'];
+			$newobject->statut = $project['status'];
+			$newobject->date_start = dol_stringtotime($project['date_start'], 'dayrfc');
+			$newobject->date_end = dol_stringtotime($project['date_end'], 'dayrfc');
+			$newobject->budget_amount = $project['budget'];
+			$newobject->description = $project['description'];
 
-            $elementtype = 'project';
+			$elementtype = 'project';
 
-            // Retrieve all extrafields for project
-            // fetch optionals attributes and labels
-            $extrafields = new ExtraFields($db);
-            $extrafields->fetch_name_optionals_label($elementtype, true);
-            if (is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label']))
-            {
-            	foreach ($extrafields->attributes[$elementtype]['label'] as $key=>$label)
-	            {
-	                $key = 'options_'.$key;
-	                $newobject->array_options[$key] = $project[$key];
-	            }
-            }
+			// Retrieve all extrafields for project
+			// fetch optionals attributes and labels
+			$extrafields = new ExtraFields($db);
+			$extrafields->fetch_name_optionals_label($elementtype, true);
+			if (is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label']))
+			{
+				foreach ($extrafields->attributes[$elementtype]['label'] as $key=>$label)
+				{
+					$key = 'options_'.$key;
+					$newobject->array_options[$key] = $project[$key];
+				}
+			}
 
-            $db->begin();
+			$db->begin();
 
-            $result = $newobject->create($fuser);
-            if (!$error && $result > 0)
-            {
-                // Add myself as project leader
-                $result = $newobject->add_contact($fuser->id, 'PROJECTLEADER', 'internal');
-                if ($result < 0)
-                {
-                    $error++;
-                }
-            }
-            else {
-                $error++;
-            }
+			$result = $newobject->create($fuser);
+			if (!$error && $result > 0)
+			{
+				// Add myself as project leader
+				$result = $newobject->add_contact($fuser->id, 'PROJECTLEADER', 'internal');
+				if ($result < 0)
+				{
+					$error++;
+				}
+			}
+			else {
+				$error++;
+			}
 
-            if (!$error)
-            {
-                $db->commit();
-                $objectresp = array('result'=>array('result_code'=>'OK', 'result_label'=>''), 'id'=>$newobject->id, 'ref'=>$newobject->ref);
-            }
-            else {
-                $db->rollback();
-                $error++;
-                $errorcode = 'KO';
-                $errorlabel = $newobject->error;
-            }
-        }
-        else {
-            $error++;
-            $errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
-        }
-    }
+			if (!$error)
+			{
+				$db->commit();
+				$objectresp = array('result'=>array('result_code'=>'OK', 'result_label'=>''), 'id'=>$newobject->id, 'ref'=>$newobject->ref);
+			}
+			else {
+				$db->rollback();
+				$error++;
+				$errorcode = 'KO';
+				$errorlabel = $newobject->error;
+			}
+		}
+		else {
+			$error++;
+			$errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
+		}
+	}
 
-    if ($error)
-    {
-        $objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
-    }
+	if ($error)
+	{
+		$objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
+	}
 
-    return $objectresp;
+	return $objectresp;
 }
 
 /**
@@ -338,106 +338,106 @@ function createProject($authentication, $project)
  */
 function getProject($authentication, $id = '', $ref = '')
 {
-    global $db, $conf, $langs;
+	global $db, $conf, $langs;
 
-    dol_syslog("Function: getProject login=".$authentication['login']." id=".$id." ref=".$ref);
+	dol_syslog("Function: getProject login=".$authentication['login']." id=".$id." ref=".$ref);
 
-    if ($authentication['entity']) $conf->entity = $authentication['entity'];
+	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
-    if (!$error && (($id && $ref)))
-    {
-        $error++;
-        $errorcode = 'BAD_PARAMETERS'; $errorlabel = "Parameter id and ref can't be both provided. You must choose one or other but not both.";
-    }
+	// Init and check authentication
+	$objectresp = array();
+	$errorcode = ''; $errorlabel = '';
+	$error = 0;
+	$fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
+	// Check parameters
+	if (!$error && (($id && $ref)))
+	{
+		$error++;
+		$errorcode = 'BAD_PARAMETERS'; $errorlabel = "Parameter id and ref can't be both provided. You must choose one or other but not both.";
+	}
 
-    if (!$error)
-    {
-        $fuser->getrights();
+	if (!$error)
+	{
+		$fuser->getrights();
 
-        if ($fuser->rights->projet->lire)
-        {
-            $project = new Project($db);
-            $result = $project->fetch($id, $ref);
-            if ($result > 0)
-            {
-                $project_result_fields = array(
-                    'id' => $project->id,
-                    'ref' => $project->ref,
-                    'label' => $project->title,
-                    'thirdparty_id' => $project->socid,
-                    'public' => $project->public,
-                    'status' => $project->statut,
-                    'date_start' => $project->date_start ? dol_print_date($project->date_start, 'dayrfc') : '',
-                    'date_end' => $project->date_end ? dol_print_date($project->date_end, 'dayrfc') : '',
-                    'budget' => $project->budget_amount,
-                    'description' => $project->description,
-                );
+		if ($fuser->rights->projet->lire)
+		{
+			$project = new Project($db);
+			$result = $project->fetch($id, $ref);
+			if ($result > 0)
+			{
+				$project_result_fields = array(
+					'id' => $project->id,
+					'ref' => $project->ref,
+					'label' => $project->title,
+					'thirdparty_id' => $project->socid,
+					'public' => $project->public,
+					'status' => $project->statut,
+					'date_start' => $project->date_start ? dol_print_date($project->date_start, 'dayrfc') : '',
+					'date_end' => $project->date_end ? dol_print_date($project->date_end, 'dayrfc') : '',
+					'budget' => $project->budget_amount,
+					'description' => $project->description,
+				);
 
-                $elementtype = 'project';
+				$elementtype = 'project';
 
-                //Retrieve all extrafields for project
-                $extrafields = new ExtraFields($db);
-                $extrafields->fetch_name_optionals_label($elementtype, true);
+				//Retrieve all extrafields for project
+				$extrafields = new ExtraFields($db);
+				$extrafields->fetch_name_optionals_label($elementtype, true);
 
-                //Get extrafield values
-                if (is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label']))
-                {
-                	$project->fetch_optionals();
-	                foreach ($extrafields->attributes[$elementtype]['label'] as $key=>$label)
-	                {
-	                    $project_result_fields = array_merge($project_result_fields, array('options_'.$key => $project->array_options['options_'.$key]));
-	                }
-                }
+				//Get extrafield values
+				if (is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label']))
+				{
+					$project->fetch_optionals();
+					foreach ($extrafields->attributes[$elementtype]['label'] as $key=>$label)
+					{
+						$project_result_fields = array_merge($project_result_fields, array('options_'.$key => $project->array_options['options_'.$key]));
+					}
+				}
 
-                //Get linked elements
-                global $listofreferent;
-                $elements = array();
-                foreach ($listofreferent as $key => $tablename)
-                {
-                    $elements[$key] = array();
-                    $element_array = $project->get_element_list($key, $tablename);
-                    if (count($element_array) > 0 && is_array($element_array))
-                    {
-                        foreach ($element_array as $element)
-                        {
-                            $tmp = explode('_', $element);
-                            $idofelement = count($tmp) > 0 ? $tmp[0] : "";
-                            $idofelementuser = count($tmp) > 1 ? $tmp[1] : "";
-                            $elements[$key][] = array('id' => $idofelement, 'user' => $idofelementuser);
-                        }
-                    }
-                }
-                $project_result_fields['elements'] = $elements;
+				//Get linked elements
+				global $listofreferent;
+				$elements = array();
+				foreach ($listofreferent as $key => $tablename)
+				{
+					$elements[$key] = array();
+					$element_array = $project->get_element_list($key, $tablename);
+					if (count($element_array) > 0 && is_array($element_array))
+					{
+						foreach ($element_array as $element)
+						{
+							$tmp = explode('_', $element);
+							$idofelement = count($tmp) > 0 ? $tmp[0] : "";
+							$idofelementuser = count($tmp) > 1 ? $tmp[1] : "";
+							$elements[$key][] = array('id' => $idofelement, 'user' => $idofelementuser);
+						}
+					}
+				}
+				$project_result_fields['elements'] = $elements;
 
-                //Result
-                $objectresp = array(
-                    'result'=>array('result_code'=>'OK', 'result_label'=>''),
-                    'project'=>$project_result_fields
-                );
-            }
-            else {
-                $error++;
-                $errorcode = 'NOT_FOUND'; $errorlabel = 'Object not found for id='.$id.' nor ref='.$ref;
-            }
-        }
-        else {
-            $error++;
-            $errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
-        }
-    }
+				//Result
+				$objectresp = array(
+					'result'=>array('result_code'=>'OK', 'result_label'=>''),
+					'project'=>$project_result_fields
+				);
+			}
+			else {
+				$error++;
+				$errorcode = 'NOT_FOUND'; $errorlabel = 'Object not found for id='.$id.' nor ref='.$ref;
+			}
+		}
+		else {
+			$error++;
+			$errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
+		}
+	}
 
-    if ($error)
-    {
-        $objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
-    }
+	if ($error)
+	{
+		$objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
+	}
 
-    return $objectresp;
+	return $objectresp;
 }
 
 // Return the results.
diff --git a/htdocs/webservices/server_supplier_invoice.php b/htdocs/webservices/server_supplier_invoice.php
index ecf2c51fd1f..be90b60c36f 100644
--- a/htdocs/webservices/server_supplier_invoice.php
+++ b/htdocs/webservices/server_supplier_invoice.php
@@ -54,128 +54,128 @@ $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 other specific objects
 $server->wsdl->addComplexType(
-    'line',
-    'element',
-    'struct',
-    'all',
-    '',
-    array(
-        'id' => array('name'=>'id', 'type'=>'xsd:string'),
-        'type' => array('name'=>'type', 'type'=>'xsd:int'),
-        'desc' => array('name'=>'desc', 'type'=>'xsd:string'),
-    	'fk_product' => array('name'=>'fk_product', 'type'=>'xsd:int'),
-        'total_net' => array('name'=>'total_net', 'type'=>'xsd:double'),
-    	'total_vat' => array('name'=>'total_vat', 'type'=>'xsd:double'),
-    	'total' => array('name'=>'total', 'type'=>'xsd:double'),
-        'vat_rate' => array('name'=>'vat_rate', 'type'=>'xsd:double'),
-        'qty' => array('name'=>'qty', 'type'=>'xsd:double'),
-        'date_start' => array('name'=>'date_start', 'type'=>'xsd:date'),
-        'date_end' => array('name'=>'date_end', 'type'=>'xsd:date'),
-        // From product
-        'product_ref' => array('name'=>'product_ref', 'type'=>'xsd:string'),
-        'product_label' => array('name'=>'product_label', 'type'=>'xsd:string'),
-        'product_desc' => array('name'=>'product_desc', 'type'=>'xsd:string')
-    )
+	'line',
+	'element',
+	'struct',
+	'all',
+	'',
+	array(
+		'id' => array('name'=>'id', 'type'=>'xsd:string'),
+		'type' => array('name'=>'type', 'type'=>'xsd:int'),
+		'desc' => array('name'=>'desc', 'type'=>'xsd:string'),
+		'fk_product' => array('name'=>'fk_product', 'type'=>'xsd:int'),
+		'total_net' => array('name'=>'total_net', 'type'=>'xsd:double'),
+		'total_vat' => array('name'=>'total_vat', 'type'=>'xsd:double'),
+		'total' => array('name'=>'total', 'type'=>'xsd:double'),
+		'vat_rate' => array('name'=>'vat_rate', 'type'=>'xsd:double'),
+		'qty' => array('name'=>'qty', 'type'=>'xsd:double'),
+		'date_start' => array('name'=>'date_start', 'type'=>'xsd:date'),
+		'date_end' => array('name'=>'date_end', 'type'=>'xsd:date'),
+		// From product
+		'product_ref' => array('name'=>'product_ref', 'type'=>'xsd:string'),
+		'product_label' => array('name'=>'product_label', 'type'=>'xsd:string'),
+		'product_desc' => array('name'=>'product_desc', 'type'=>'xsd:string')
+	)
 );
 
 $server->wsdl->addComplexType(
-    'LinesArray',
-    'complexType',
-    'array',
-    '',
-    'SOAP-ENC:Array',
-    array(),
-    array(
-        array('ref'=>'SOAP-ENC:arrayType', 'wsdl:arrayType'=>'tns:line[]')
-    ),
-    'tns:line'
+	'LinesArray',
+	'complexType',
+	'array',
+	'',
+	'SOAP-ENC:Array',
+	array(),
+	array(
+		array('ref'=>'SOAP-ENC:arrayType', 'wsdl:arrayType'=>'tns:line[]')
+	),
+	'tns:line'
 );
 
 $server->wsdl->addComplexType(
-    'invoice',
-    'element', // If we put element here instead of complexType to have tag called invoice in getInvoicesForThirdParty we brek getInvoice
-    'struct',
-    'all',
-    '',
-    array(
-    	'id' => array('name'=>'id', 'type'=>'xsd:string'),
-        'ref' => array('name'=>'ref', 'type'=>'xsd:string'),
-        'ref_ext' => array('name'=>'ref_ext', 'type'=>'xsd:string'),
-        'ref_supplier' => array('name'=>'ref_supplier', 'type'=>'xsd:string'),
-        'fk_user_author' => array('name'=>'fk_user_author', 'type'=>'xsd:int'),
-        'fk_user_valid' => array('name'=>'fk_user_valid', 'type'=>'xsd:int'),
-        'fk_thirdparty' => array('name'=>'fk_thirdparty', 'type'=>'xsd:int'),
-        'date_creation' => array('name'=>'date_creation', 'type'=>'xsd:dateTime'),
-        'date_validation' => array('name'=>'date_validation', 'type'=>'xsd:dateTime'),
-        'date_modification' => array('name'=>'date_modification', 'type'=>'xsd:dateTime'),
-        'date_invoice' => array('name'=>'date_invoice', 'type'=>'xsd:date'),
-        'date_term' => array('name'=>'date_modification', 'type'=>'xsd:date'),
-    	'label' => array('name'=>'label', 'type'=>'xsd:date'),
-    	'type' => array('name'=>'type', 'type'=>'xsd:int'),
-        'total_net' => array('name'=>'type', 'type'=>'xsd:double'),
-        'total_vat' => array('name'=>'type', 'type'=>'xsd:double'),
-        'total' => array('name'=>'type', 'type'=>'xsd:double'),
-        'note_private' => array('name'=>'note_private', 'type'=>'xsd:string'),
-        'note_public' => array('name'=>'note_public', 'type'=>'xsd:string'),
-        'status' => array('name'=>'status', 'type'=>'xsd:int'),
-        'close_code' => array('name'=>'close_code', 'type'=>'xsd:string'),
-        'close_note' => array('name'=>'close_note', 'type'=>'xsd:string'),
-    	'lines' => array('name'=>'lines', 'type'=>'tns:LinesArray')
-    )
+	'invoice',
+	'element', // If we put element here instead of complexType to have tag called invoice in getInvoicesForThirdParty we brek getInvoice
+	'struct',
+	'all',
+	'',
+	array(
+		'id' => array('name'=>'id', 'type'=>'xsd:string'),
+		'ref' => array('name'=>'ref', 'type'=>'xsd:string'),
+		'ref_ext' => array('name'=>'ref_ext', 'type'=>'xsd:string'),
+		'ref_supplier' => array('name'=>'ref_supplier', 'type'=>'xsd:string'),
+		'fk_user_author' => array('name'=>'fk_user_author', 'type'=>'xsd:int'),
+		'fk_user_valid' => array('name'=>'fk_user_valid', 'type'=>'xsd:int'),
+		'fk_thirdparty' => array('name'=>'fk_thirdparty', 'type'=>'xsd:int'),
+		'date_creation' => array('name'=>'date_creation', 'type'=>'xsd:dateTime'),
+		'date_validation' => array('name'=>'date_validation', 'type'=>'xsd:dateTime'),
+		'date_modification' => array('name'=>'date_modification', 'type'=>'xsd:dateTime'),
+		'date_invoice' => array('name'=>'date_invoice', 'type'=>'xsd:date'),
+		'date_term' => array('name'=>'date_modification', 'type'=>'xsd:date'),
+		'label' => array('name'=>'label', 'type'=>'xsd:date'),
+		'type' => array('name'=>'type', 'type'=>'xsd:int'),
+		'total_net' => array('name'=>'type', 'type'=>'xsd:double'),
+		'total_vat' => array('name'=>'type', 'type'=>'xsd:double'),
+		'total' => array('name'=>'type', 'type'=>'xsd:double'),
+		'note_private' => array('name'=>'note_private', 'type'=>'xsd:string'),
+		'note_public' => array('name'=>'note_public', 'type'=>'xsd:string'),
+		'status' => array('name'=>'status', 'type'=>'xsd:int'),
+		'close_code' => array('name'=>'close_code', 'type'=>'xsd:string'),
+		'close_note' => array('name'=>'close_note', 'type'=>'xsd:string'),
+		'lines' => array('name'=>'lines', 'type'=>'tns:LinesArray')
+	)
 );
 
 $server->wsdl->addComplexType(
-    'InvoicesArray',
-    'complexType',
-    'array',
-    '',
-    'SOAP-ENC:Array',
-    array(),
-    array(
-        array('ref'=>'SOAP-ENC:arrayType', 'wsdl:arrayType'=>'tns:invoice[]')
-    ),
-    'tns:invoice'
+	'InvoicesArray',
+	'complexType',
+	'array',
+	'',
+	'SOAP-ENC:Array',
+	array(),
+	array(
+		array('ref'=>'SOAP-ENC:arrayType', 'wsdl:arrayType'=>'tns:invoice[]')
+	),
+	'tns:invoice'
 );
 
 $server->wsdl->addComplexType(
-    'invoices',
-    'complexType',
-    'array',
-    '',
-    'SOAP-ENC:Array',
-    array(),
-    array(
-        array('ref'=>'SOAP-ENC:arrayType', 'wsdl:arrayType'=>'tns:invoice[]')
-    ),
-    'tns:invoice'
+	'invoices',
+	'complexType',
+	'array',
+	'',
+	'SOAP-ENC:Array',
+	array(),
+	array(
+		array('ref'=>'SOAP-ENC:arrayType', 'wsdl:arrayType'=>'tns:invoice[]')
+	),
+	'tns:invoice'
 );
 
 
@@ -189,28 +189,28 @@ $styleuse = 'encoded'; // encoded/literal/literal wrapped
 
 // Register WSDL
 $server->register(
-    'getSupplierInvoice',
-    // Entry values
-    array('authentication'=>'tns:authentication', 'id'=>'xsd:string', 'ref'=>'xsd:string', 'ref_ext'=>'xsd:string'),
-    // Exit values
-    array('result'=>'tns:result', 'invoice'=>'tns:invoice'),
-    $ns,
-    $ns.'#getSupplierInvoice',
-    $styledoc,
-    $styleuse,
-    'WS to get SupplierInvoice'
+	'getSupplierInvoice',
+	// Entry values
+	array('authentication'=>'tns:authentication', 'id'=>'xsd:string', 'ref'=>'xsd:string', 'ref_ext'=>'xsd:string'),
+	// Exit values
+	array('result'=>'tns:result', 'invoice'=>'tns:invoice'),
+	$ns,
+	$ns.'#getSupplierInvoice',
+	$styledoc,
+	$styleuse,
+	'WS to get SupplierInvoice'
 );
 $server->register(
-    'getSupplierInvoicesForThirdParty',
-    // Entry values
-    array('authentication'=>'tns:authentication', 'idthirdparty'=>'xsd:string'),
-    // Exit values
-    array('result'=>'tns:result', 'invoices'=>'tns:invoices'),
-    $ns,
-    $ns.'#getSupplierInvoicesForThirdParty',
-    $styledoc,
-    $styleuse,
-    'WS to get SupplierInvoicesForThirdParty'
+	'getSupplierInvoicesForThirdParty',
+	// Entry values
+	array('authentication'=>'tns:authentication', 'idthirdparty'=>'xsd:string'),
+	// Exit values
+	array('result'=>'tns:result', 'invoices'=>'tns:invoices'),
+	$ns,
+	$ns.'#getSupplierInvoicesForThirdParty',
+	$styledoc,
+	$styleuse,
+	'WS to get SupplierInvoicesForThirdParty'
 );
 
 
@@ -231,12 +231,12 @@ function getSupplierInvoice($authentication, $id = '', $ref = '', $ref_ext = '')
 
 	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 && (($id && $ref) || ($id && $ref_ext) || ($ref && $ref_ext)))
 	{
 		$error++;
@@ -264,44 +264,44 @@ function getSupplierInvoice($authentication, $id = '', $ref = '', $ref_ext = '')
 						'total_net'=>$line->total_ht,
 						'total_vat'=>$line->total_tva,
 						'total'=>$line->total_ttc,
-                        'vat_rate'=>$line->tva_tx,
-                        'qty'=>$line->qty
+						'vat_rate'=>$line->tva_tx,
+						'qty'=>$line->qty
 					);
 					$i++;
 				}
 
-			    // Create invoice
-			    $objectresp = array(
-			    	'result'=>array('result_code'=>'OK', 'result_label'=>''),
-			        'invoice'=>array(
-				    'id' => $invoice->id,
+				// Create invoice
+				$objectresp = array(
+					'result'=>array('result_code'=>'OK', 'result_label'=>''),
+					'invoice'=>array(
+					'id' => $invoice->id,
 		   			'ref' => $invoice->ref,
-                    'ref_supplier'=>$invoice->ref_supplier,
-		            'ref_ext' => $invoice->ref_ext,
-		            'fk_user_author' => $invoice->fk_user_author,
-		            'fk_user_valid' => $invoice->fk_user_valid,
-                    'fk_thirdparty' => $invoice->fk_soc,
-                    'type'=>$invoice->type,
-                    'status'=>$invoice->statut,
-                    'total_net'=>$invoice->total_ht,
-                    'total_vat'=>$invoice->total_tva,
-                    'total'=>$invoice->total_ttc,
-                    'date_creation'=>dol_print_date($invoice->datec, 'dayhourrfc'),
-                    'date_modification'=>dol_print_date($invoice->tms, 'dayhourrfc'),
-                    'date_invoice'=>dol_print_date($invoice->date, 'dayhourrfc'),
-                    'date_term'=>dol_print_date($invoice->date_echeance, 'dayhourrfc'),
-                    'label'=>$invoice->label,
-                    'paid'=>$invoice->paid,
-                    'note_private'=>$invoice->note_private,
-                    'note_public'=>$invoice->note_public,
-                    'close_code'=>$invoice->close_code,
-                    'close_note'=>$invoice->close_note,
+					'ref_supplier'=>$invoice->ref_supplier,
+					'ref_ext' => $invoice->ref_ext,
+					'fk_user_author' => $invoice->fk_user_author,
+					'fk_user_valid' => $invoice->fk_user_valid,
+					'fk_thirdparty' => $invoice->fk_soc,
+					'type'=>$invoice->type,
+					'status'=>$invoice->statut,
+					'total_net'=>$invoice->total_ht,
+					'total_vat'=>$invoice->total_tva,
+					'total'=>$invoice->total_ttc,
+					'date_creation'=>dol_print_date($invoice->datec, 'dayhourrfc'),
+					'date_modification'=>dol_print_date($invoice->tms, 'dayhourrfc'),
+					'date_invoice'=>dol_print_date($invoice->date, 'dayhourrfc'),
+					'date_term'=>dol_print_date($invoice->date_echeance, 'dayhourrfc'),
+					'label'=>$invoice->label,
+					'paid'=>$invoice->paid,
+					'note_private'=>$invoice->note_private,
+					'note_public'=>$invoice->note_public,
+					'close_code'=>$invoice->close_code,
+					'close_note'=>$invoice->close_note,
 
-                    'lines' => $linesresp,
-                    // 'lines' => array('0'=>array('id'=>222,'type'=>1),
-                    // '1'=>array('id'=>333,'type'=>1)),
+					'lines' => $linesresp,
+					// 'lines' => array('0'=>array('id'=>222,'type'=>1),
+					// '1'=>array('id'=>333,'type'=>1)),
 
-			    ));
+				));
 			}
 			else {
 				$error++;
@@ -339,12 +339,12 @@ function getSupplierInvoicesForThirdParty($authentication, $idthirdparty)
 
 	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 && empty($idthirdparty))
 	{
 		$error++;
@@ -361,7 +361,7 @@ function getSupplierInvoicesForThirdParty($authentication, $idthirdparty)
 		//$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON pt.fk_product = p.rowid';
 		//$sql.=" WHERE f.fk_soc = s.rowid AND nom = '".$db->escape($idthirdparty)."'";
 		//$sql.=" WHERE f.fk_soc = s.rowid AND nom = '".$db->escape($idthirdparty)."'";
-        $sql .= " WHERE f.entity = ".$conf->entity;
+		$sql .= " WHERE f.entity = ".$conf->entity;
 		if ($idthirdparty != 'all') $sql .= " AND f.fk_soc = ".$db->escape($idthirdparty);
 
 		$resql = $db->query($sql);
@@ -371,11 +371,11 @@ function getSupplierInvoicesForThirdParty($authentication, $idthirdparty)
 			$i = 0;
 			while ($i < $num)
 			{
-                // En attendant remplissage par boucle
-			    $obj = $db->fetch_object($resql);
+				// En attendant remplissage par boucle
+				$obj = $db->fetch_object($resql);
 
-			    $invoice = new FactureFournisseur($db);
-			    $result = $invoice->fetch($obj->facid);
+				$invoice = new FactureFournisseur($db);
+				$result = $invoice->fetch($obj->facid);
 				if ($result < 0)
 				{
 					$error++;
@@ -387,55 +387,55 @@ function getSupplierInvoicesForThirdParty($authentication, $idthirdparty)
 				$linesresp = array();
 				foreach ($invoice->lines as $line)
 				{
-   				    $linesresp[] = array(
-    					'id'=>$line->rowid,
-    					'type'=>$line->product_type,
-                        'desc'=>dol_htmlcleanlastbr($line->description),
-    					'total_net'=>$line->total_ht,
-    					'total_vat'=>$line->total_tva,
-    					'total'=>$line->total_ttc,
-                        'vat_rate'=>$line->tva_tx,
-                        'qty'=>$line->qty,
-   				        'product_ref'=>$line->product_ref,
-                        'product_label'=>$line->product_label,
-                        'product_desc'=>$line->product_desc,
-   				    );
+   					$linesresp[] = array(
+						'id'=>$line->rowid,
+						'type'=>$line->product_type,
+						'desc'=>dol_htmlcleanlastbr($line->description),
+						'total_net'=>$line->total_ht,
+						'total_vat'=>$line->total_tva,
+						'total'=>$line->total_ttc,
+						'vat_rate'=>$line->tva_tx,
+						'qty'=>$line->qty,
+   						'product_ref'=>$line->product_ref,
+						'product_label'=>$line->product_label,
+						'product_desc'=>$line->product_desc,
+   					);
 				}
 
 				// Now define invoice
 				$linesinvoice[] = array(
 					'id'=>$invoice->id,
-				    'ref'=>$invoice->ref,
-				    'ref_supplier'=>$invoice->ref_supplier,
-				    'ref_ext'=>$invoice->ref_ext,
-                    'fk_user_author' => $invoice->fk_user_author,
-                    'fk_user_valid' => $invoice->fk_user_valid,
-                    'fk_thirdparty' => $invoice->fk_soc,
-				    'type'=>$invoice->type,
-                    'status'=>$invoice->statut,
-				    'total_net'=>$invoice->total_ht,
+					'ref'=>$invoice->ref,
+					'ref_supplier'=>$invoice->ref_supplier,
+					'ref_ext'=>$invoice->ref_ext,
+					'fk_user_author' => $invoice->fk_user_author,
+					'fk_user_valid' => $invoice->fk_user_valid,
+					'fk_thirdparty' => $invoice->fk_soc,
+					'type'=>$invoice->type,
+					'status'=>$invoice->statut,
+					'total_net'=>$invoice->total_ht,
 					'total_vat'=>$invoice->total_tva,
 					'total'=>$invoice->total_ttc,
-                    'date_creation'=>dol_print_date($invoice->datec, 'dayhourrfc'),
-                    'date_modification'=>dol_print_date($invoice->tms, 'dayhourrfc'),
-                    'date_invoice'=>dol_print_date($invoice->date, 'dayhourrfc'),
-                    'date_term'=>dol_print_date($invoice->date_echeance, 'dayhourrfc'),
-                    'label'=>$invoice->label,
-                    'paid'=>$invoice->paid,
-                    'note_private'=>$invoice->note_private,
-                    'note_public'=>$invoice->note_public,
-                    'close_code'=>$invoice->close_code,
-                    'close_note'=>$invoice->close_note,
+					'date_creation'=>dol_print_date($invoice->datec, 'dayhourrfc'),
+					'date_modification'=>dol_print_date($invoice->tms, 'dayhourrfc'),
+					'date_invoice'=>dol_print_date($invoice->date, 'dayhourrfc'),
+					'date_term'=>dol_print_date($invoice->date_echeance, 'dayhourrfc'),
+					'label'=>$invoice->label,
+					'paid'=>$invoice->paid,
+					'note_private'=>$invoice->note_private,
+					'note_public'=>$invoice->note_public,
+					'close_code'=>$invoice->close_code,
+					'close_note'=>$invoice->close_note,
 
-				    'lines' => $linesresp
+					'lines' => $linesresp
 				);
 
 				$i++;
 			}
 
 			$objectresp = array(
-		    	'result'=>array('result_code'=>'OK', 'result_label'=>''),
-		        'invoices'=>$linesinvoice
+				'result'=>array('result_code'=>'OK', 'result_label'=>''),
+				'invoices'=>$linesinvoice
 
 			);
 		}
diff --git a/htdocs/webservices/server_thirdparty.php b/htdocs/webservices/server_thirdparty.php
index 1e9f8355d52..3a1e911f510 100644
--- a/htdocs/webservices/server_thirdparty.php
+++ b/htdocs/webservices/server_thirdparty.php
@@ -56,69 +56,69 @@ $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'),
+	)
 );
 
 
 $thirdparty_fields = array(
-    	'id' => array('name'=>'id', 'type'=>'xsd:string'),
-        'ref' => array('name'=>'name', 'type'=>'xsd:string'),
-        'ref_ext' => array('name'=>'ref_ext', 'type'=>'xsd:string'),
-        'fk_user_author' => array('name'=>'fk_user_author', 'type'=>'xsd:string'),
+		'id' => array('name'=>'id', 'type'=>'xsd:string'),
+		'ref' => array('name'=>'name', 'type'=>'xsd:string'),
+		'ref_ext' => array('name'=>'ref_ext', 'type'=>'xsd:string'),
+		'fk_user_author' => array('name'=>'fk_user_author', 'type'=>'xsd:string'),
 		'status' => array('name'=>'status', 'type'=>'xsd:string'),
-        'client' => array('name'=>'client', 'type'=>'xsd:string'),
-        'supplier' => array('name'=>'supplier', 'type'=>'xsd:string'),
-        'customer_code' => array('name'=>'customer_code', 'type'=>'xsd:string'),
-        'supplier_code' => array('name'=>'supplier_code', 'type'=>'xsd:string'),
-        'customer_code_accountancy' => array('name'=>'customer_code_accountancy', 'type'=>'xsd:string'),
-        'supplier_code_accountancy' => array('name'=>'supplier_code_accountancy', 'type'=>'xsd:string'),
-        'date_creation' => array('name'=>'date_creation', 'type'=>'xsd:dateTime'),
-        'date_modification' => array('name'=>'date_modification', 'type'=>'xsd:dateTime'),
-        'note_private' => array('name'=>'note_private', 'type'=>'xsd:string'),
+		'client' => array('name'=>'client', 'type'=>'xsd:string'),
+		'supplier' => array('name'=>'supplier', 'type'=>'xsd:string'),
+		'customer_code' => array('name'=>'customer_code', 'type'=>'xsd:string'),
+		'supplier_code' => array('name'=>'supplier_code', 'type'=>'xsd:string'),
+		'customer_code_accountancy' => array('name'=>'customer_code_accountancy', 'type'=>'xsd:string'),
+		'supplier_code_accountancy' => array('name'=>'supplier_code_accountancy', 'type'=>'xsd:string'),
+		'date_creation' => array('name'=>'date_creation', 'type'=>'xsd:dateTime'),
+		'date_modification' => array('name'=>'date_modification', 'type'=>'xsd:dateTime'),
+		'note_private' => array('name'=>'note_private', 'type'=>'xsd:string'),
 		'note_public' => array('name'=>'note_public', 'type'=>'xsd:string'),
-    	'address' => array('name'=>'address', 'type'=>'xsd:string'),
-    	'zip' => array('name'=>'zip', 'type'=>'xsd:string'),
-    	'town' => array('name'=>'town', 'type'=>'xsd:string'),
-    	'province_id' => array('name'=>'province_id', 'type'=>'xsd:string'),
-    	'country_id' => array('name'=>'country_id', 'type'=>'xsd:string'),
-    	'country_code' => array('name'=>'country_code', 'type'=>'xsd:string'),
-    	'country' => array('name'=>'country', 'type'=>'xsd:string'),
-        'phone' => array('name'=>'phone', 'type'=>'xsd:string'),
-    	'fax' => array('name'=>'fax', 'type'=>'xsd:string'),
-    	'email' => array('name'=>'email', 'type'=>'xsd:string'),
-    	'url' => array('name'=>'url', 'type'=>'xsd:string'),
-    	'profid1' => array('name'=>'profid1', 'type'=>'xsd:string'),
-    	'profid2' => array('name'=>'profid2', 'type'=>'xsd:string'),
-    	'profid3' => array('name'=>'profid3', 'type'=>'xsd:string'),
-    	'profid4' => array('name'=>'profid4', 'type'=>'xsd:string'),
-    	'profid5' => array('name'=>'profid5', 'type'=>'xsd:string'),
-    	'profid6' => array('name'=>'profid6', 'type'=>'xsd:string'),
-        'capital' => array('name'=>'capital', 'type'=>'xsd:string'),
-    	'vat_used' => array('name'=>'vat_used', 'type'=>'xsd:string'),
-    	'vat_number' => array('name'=>'vat_number', 'type'=>'xsd:string'));
+		'address' => array('name'=>'address', 'type'=>'xsd:string'),
+		'zip' => array('name'=>'zip', 'type'=>'xsd:string'),
+		'town' => array('name'=>'town', 'type'=>'xsd:string'),
+		'province_id' => array('name'=>'province_id', 'type'=>'xsd:string'),
+		'country_id' => array('name'=>'country_id', 'type'=>'xsd:string'),
+		'country_code' => array('name'=>'country_code', 'type'=>'xsd:string'),
+		'country' => array('name'=>'country', 'type'=>'xsd:string'),
+		'phone' => array('name'=>'phone', 'type'=>'xsd:string'),
+		'fax' => array('name'=>'fax', 'type'=>'xsd:string'),
+		'email' => array('name'=>'email', 'type'=>'xsd:string'),
+		'url' => array('name'=>'url', 'type'=>'xsd:string'),
+		'profid1' => array('name'=>'profid1', 'type'=>'xsd:string'),
+		'profid2' => array('name'=>'profid2', 'type'=>'xsd:string'),
+		'profid3' => array('name'=>'profid3', 'type'=>'xsd:string'),
+		'profid4' => array('name'=>'profid4', 'type'=>'xsd:string'),
+		'profid5' => array('name'=>'profid5', 'type'=>'xsd:string'),
+		'profid6' => array('name'=>'profid6', 'type'=>'xsd:string'),
+		'capital' => array('name'=>'capital', 'type'=>'xsd:string'),
+		'vat_used' => array('name'=>'vat_used', 'type'=>'xsd:string'),
+		'vat_number' => array('name'=>'vat_number', 'type'=>'xsd:string'));
 
 $elementtype = 'societe';
 
@@ -147,55 +147,55 @@ if (is_array($extrafield_array)) $thirdparty_fields = array_merge($thirdparty_fi
 
 // Define other specific objects
 $server->wsdl->addComplexType(
-    'thirdparty',
-    'complexType',
-    'struct',
-    'all',
-    '',
+	'thirdparty',
+	'complexType',
+	'struct',
+	'all',
+	'',
 	$thirdparty_fields
 );
 
 // Define other specific objects
 $server->wsdl->addComplexType(
-    'filterthirdparty',
-    'complexType',
-    'struct',
-    'all',
-    '',
-    array(
-        //'limit' => array('name'=>'limit','type'=>'xsd:string'),
-        'client' => array('name'=>'client', 'type'=>'xsd:string'),
-        'supplier' => array('name'=>'supplier', 'type'=>'xsd:string'),
-    	'category' => array('name'=>'category', 'type'=>'xsd:string')
-    )
+	'filterthirdparty',
+	'complexType',
+	'struct',
+	'all',
+	'',
+	array(
+		//'limit' => array('name'=>'limit','type'=>'xsd:string'),
+		'client' => array('name'=>'client', 'type'=>'xsd:string'),
+		'supplier' => array('name'=>'supplier', 'type'=>'xsd:string'),
+		'category' => array('name'=>'category', 'type'=>'xsd:string')
+	)
 );
 
 $server->wsdl->addComplexType(
-    'ThirdPartiesArray',
-    'complexType',
-    'array',
-    '',
-    'SOAP-ENC:Array',
-    array(),
-    array(
-        array('ref'=>'SOAP-ENC:arrayType', 'wsdl:arrayType'=>'tns:thirdparty[]')
-    ),
-    'tns:thirdparty'
+	'ThirdPartiesArray',
+	'complexType',
+	'array',
+	'',
+	'SOAP-ENC:Array',
+	array(),
+	array(
+		array('ref'=>'SOAP-ENC:arrayType', 'wsdl:arrayType'=>'tns:thirdparty[]')
+	),
+	'tns:thirdparty'
 );
 $server->wsdl->addComplexType(
-    'ThirdPartiesArray2',
-    'complexType',
-    'array',
-    'sequence',
-    '',
-    array(
-        'thirdparty' => array(
-            'name' => 'thirdparty',
-            'type' => 'tns:thirdparty',
-            'minOccurs' => '0',
-            'maxOccurs' => 'unbounded'
-        )
-    )
+	'ThirdPartiesArray2',
+	'complexType',
+	'array',
+	'sequence',
+	'',
+	array(
+		'thirdparty' => array(
+			'name' => 'thirdparty',
+			'type' => 'tns:thirdparty',
+			'minOccurs' => '0',
+			'maxOccurs' => 'unbounded'
+		)
+	)
 );
 
 
@@ -208,30 +208,30 @@ $styleuse = 'encoded'; // encoded/literal/literal wrapped
 
 // Register WSDL
 $server->register(
-    'getThirdParty',
-    // Entry values
-    array('authentication'=>'tns:authentication', 'id'=>'xsd:string', 'ref'=>'xsd:string', 'ref_ext'=>'xsd:string'),
-    // Exit values
-    array('result'=>'tns:result', 'thirdparty'=>'tns:thirdparty'),
-    $ns,
-    $ns.'#getThirdParty',
-    $styledoc,
-    $styleuse,
-    'WS to get a thirdparty from its id, ref or ref_ext'
+	'getThirdParty',
+	// Entry values
+	array('authentication'=>'tns:authentication', 'id'=>'xsd:string', 'ref'=>'xsd:string', 'ref_ext'=>'xsd:string'),
+	// Exit values
+	array('result'=>'tns:result', 'thirdparty'=>'tns:thirdparty'),
+	$ns,
+	$ns.'#getThirdParty',
+	$styledoc,
+	$styleuse,
+	'WS to get a thirdparty from its id, ref or ref_ext'
 );
 
 // Register WSDL
 $server->register(
-    'createThirdParty',
-    // Entry values
-    array('authentication'=>'tns:authentication', 'thirdparty'=>'tns:thirdparty'),
-    // Exit values
-    array('result'=>'tns:result', 'id'=>'xsd:string', 'ref'=>'xsd:string'),
-    $ns,
-    $ns.'#createThirdParty',
-    $styledoc,
-    $styleuse,
-    'WS to create a thirdparty'
+	'createThirdParty',
+	// Entry values
+	array('authentication'=>'tns:authentication', 'thirdparty'=>'tns:thirdparty'),
+	// Exit values
+	array('result'=>'tns:result', 'id'=>'xsd:string', 'ref'=>'xsd:string'),
+	$ns,
+	$ns.'#createThirdParty',
+	$styledoc,
+	$styleuse,
+	'WS to create a thirdparty'
 );
 
 // Register WSDL
@@ -251,16 +251,16 @@ $server->register(
 
 // Register WSDL
 $server->register(
-    'getListOfThirdParties',
-    // Entry values
-    array('authentication'=>'tns:authentication', 'filterthirdparty'=>'tns:filterthirdparty'),
-    // Exit values
-    array('result'=>'tns:result', 'thirdparties'=>'tns:ThirdPartiesArray2'),
-    $ns,
-    $ns.'#getListOfThirdParties',
-    $styledoc,
-    $styleuse,
-    'WS to get list of thirdparties id and ref'
+	'getListOfThirdParties',
+	// Entry values
+	array('authentication'=>'tns:authentication', 'filterthirdparty'=>'tns:filterthirdparty'),
+	// Exit values
+	array('result'=>'tns:result', 'thirdparties'=>'tns:ThirdPartiesArray2'),
+	$ns,
+	$ns.'#getListOfThirdParties',
+	$styledoc,
+	$styleuse,
+	'WS to get list of thirdparties id and ref'
 );
 
 // Register WSDL
@@ -296,12 +296,12 @@ function getThirdParty($authentication, $id = '', $ref = '', $ref_ext = '')
 
 	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 && (($id && $ref) || ($id && $ref_ext) || ($ref && $ref_ext)))
 	{
 		$error++;
@@ -319,40 +319,40 @@ function getThirdParty($authentication, $id = '', $ref = '', $ref_ext = '')
 			if ($result > 0)
 			{
 				$thirdparty_result_fields = array(
-				    	'id' => $thirdparty->id,
+						'id' => $thirdparty->id,
 			   			'ref' => $thirdparty->name,
 			   			'ref_ext' => $thirdparty->ref_ext,
 			   			'status' => $thirdparty->status,
-			            'client' => $thirdparty->client,
-			            'supplier' => $thirdparty->fournisseur,
-				        'customer_code' => $thirdparty->code_client,
-			            'supplier_code' => $thirdparty->code_fournisseur,
-				        'customer_code_accountancy' => $thirdparty->code_compta,
-			            'supplier_code_accountancy' => $thirdparty->code_compta_fournisseur,
-			            'fk_user_author' => $thirdparty->fk_user_author,
-			    		'date_creation' => dol_print_date($thirdparty->date_creation, 'dayhourrfc'),
-			    		'date_modification' => dol_print_date($thirdparty->date_modification, 'dayhourrfc'),
-			            'address' => $thirdparty->address,
-				        'zip' => $thirdparty->zip,
-				        'town' => $thirdparty->town,
-				        'province_id' => $thirdparty->state_id,
-				        'country_id' => $thirdparty->country_id,
-				        'country_code' => $thirdparty->country_code,
-				        'country' => $thirdparty->country,
-			            'phone' => $thirdparty->phone,
-				        'fax' => $thirdparty->fax,
-				        'email' => $thirdparty->email,
-				        'url' => $thirdparty->url,
-				        'profid1' => $thirdparty->idprof1,
-				        'profid2' => $thirdparty->idprof2,
-				        'profid3' => $thirdparty->idprof3,
-				        'profid4' => $thirdparty->idprof4,
-				        'profid5' => $thirdparty->idprof5,
-				        'profid6' => $thirdparty->idprof6,
-			            'capital' => $thirdparty->capital,
+						'client' => $thirdparty->client,
+						'supplier' => $thirdparty->fournisseur,
+						'customer_code' => $thirdparty->code_client,
+						'supplier_code' => $thirdparty->code_fournisseur,
+						'customer_code_accountancy' => $thirdparty->code_compta,
+						'supplier_code_accountancy' => $thirdparty->code_compta_fournisseur,
+						'fk_user_author' => $thirdparty->fk_user_author,
+						'date_creation' => dol_print_date($thirdparty->date_creation, 'dayhourrfc'),
+						'date_modification' => dol_print_date($thirdparty->date_modification, 'dayhourrfc'),
+						'address' => $thirdparty->address,
+						'zip' => $thirdparty->zip,
+						'town' => $thirdparty->town,
+						'province_id' => $thirdparty->state_id,
+						'country_id' => $thirdparty->country_id,
+						'country_code' => $thirdparty->country_code,
+						'country' => $thirdparty->country,
+						'phone' => $thirdparty->phone,
+						'fax' => $thirdparty->fax,
+						'email' => $thirdparty->email,
+						'url' => $thirdparty->url,
+						'profid1' => $thirdparty->idprof1,
+						'profid2' => $thirdparty->idprof2,
+						'profid3' => $thirdparty->idprof3,
+						'profid4' => $thirdparty->idprof4,
+						'profid5' => $thirdparty->idprof5,
+						'profid6' => $thirdparty->idprof6,
+						'capital' => $thirdparty->capital,
 			   			'barcode' => $thirdparty->barcode,
-			            'vat_used' => $thirdparty->tva_assuj,
-				        'vat_number' => $thirdparty->tva_intra,
+						'vat_used' => $thirdparty->tva_assuj,
+						'vat_number' => $thirdparty->tva_intra,
 						'note_private' => $thirdparty->note_private,
 						'note_public' => $thirdparty->note_public);
 
@@ -373,10 +373,10 @@ function getThirdParty($authentication, $id = '', $ref = '', $ref_ext = '')
 					}
 				}
 
-			    // Create
-			    $objectresp = array(
-			    	'result'=>array('result_code'=>'OK', 'result_label'=>''),
-			        'thirdparty'=>$thirdparty_result_fields);
+				// Create
+				$objectresp = array(
+					'result'=>array('result_code'=>'OK', 'result_label'=>''),
+					'thirdparty'=>$thirdparty_result_fields);
 			}
 			else {
 				$error++;
@@ -408,125 +408,125 @@ function getThirdParty($authentication, $id = '', $ref = '', $ref_ext = '')
  */
 function createThirdParty($authentication, $thirdparty)
 {
-    global $db, $conf, $langs;
+	global $db, $conf, $langs;
 
-    $now = dol_now();
+	$now = dol_now();
 
-    dol_syslog("Function: createThirdParty login=".$authentication['login']);
+	dol_syslog("Function: createThirdParty login=".$authentication['login']);
 
-    if ($authentication['entity']) $conf->entity = $authentication['entity'];
+	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
-    if (empty($thirdparty['ref']))
-    {
-        $error++; $errorcode = 'KO'; $errorlabel = "Name is mandatory.";
-    }
+	// Init and check authentication
+	$objectresp = array();
+	$errorcode = ''; $errorlabel = '';
+	$error = 0;
+	$fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
+	// Check parameters
+	if (empty($thirdparty['ref']))
+	{
+		$error++; $errorcode = 'KO'; $errorlabel = "Name is mandatory.";
+	}
 
 
-    if (!$error)
-    {
-        include_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+	if (!$error)
+	{
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 
-        $newobject = new Societe($db);
-        $newobject->ref = $thirdparty['ref'];
-        $newobject->name = $thirdparty['ref'];
-        $newobject->ref_ext = $thirdparty['ref_ext'];
-        $newobject->status = $thirdparty['status'];
-        $newobject->client = $thirdparty['client'];
-        $newobject->fournisseur = $thirdparty['supplier'];
-        $newobject->code_client = $thirdparty['customer_code'];
-        $newobject->code_fournisseur = $thirdparty['supplier_code'];
-        $newobject->code_compta = $thirdparty['customer_code_accountancy'];
-        $newobject->code_compta_fournisseur = $thirdparty['supplier_code_accountancy'];
-        $newobject->date_creation = $now;
-        $newobject->note_private = $thirdparty['note_private'];
-        $newobject->note_public = $thirdparty['note_public'];
-        $newobject->address = $thirdparty['address'];
-        $newobject->zip = $thirdparty['zip'];
-        $newobject->town = $thirdparty['town'];
+		$newobject = new Societe($db);
+		$newobject->ref = $thirdparty['ref'];
+		$newobject->name = $thirdparty['ref'];
+		$newobject->ref_ext = $thirdparty['ref_ext'];
+		$newobject->status = $thirdparty['status'];
+		$newobject->client = $thirdparty['client'];
+		$newobject->fournisseur = $thirdparty['supplier'];
+		$newobject->code_client = $thirdparty['customer_code'];
+		$newobject->code_fournisseur = $thirdparty['supplier_code'];
+		$newobject->code_compta = $thirdparty['customer_code_accountancy'];
+		$newobject->code_compta_fournisseur = $thirdparty['supplier_code_accountancy'];
+		$newobject->date_creation = $now;
+		$newobject->note_private = $thirdparty['note_private'];
+		$newobject->note_public = $thirdparty['note_public'];
+		$newobject->address = $thirdparty['address'];
+		$newobject->zip = $thirdparty['zip'];
+		$newobject->town = $thirdparty['town'];
 
-        $newobject->country_id = $thirdparty['country_id'];
-        if ($thirdparty['country_code']) $newobject->country_id = getCountry($thirdparty['country_code'], 3);
-        $newobject->province_id = $thirdparty['province_id'];
-        //if ($thirdparty['province_code']) $newobject->province_code=getCountry($thirdparty['province_code'],3);
+		$newobject->country_id = $thirdparty['country_id'];
+		if ($thirdparty['country_code']) $newobject->country_id = getCountry($thirdparty['country_code'], 3);
+		$newobject->province_id = $thirdparty['province_id'];
+		//if ($thirdparty['province_code']) $newobject->province_code=getCountry($thirdparty['province_code'],3);
 
-        $newobject->phone = $thirdparty['phone'];
-        $newobject->fax = $thirdparty['fax'];
-        $newobject->email = $thirdparty['email'];
-        $newobject->url = $thirdparty['url'];
-        $newobject->idprof1 = $thirdparty['profid1'];
-        $newobject->idprof2 = $thirdparty['profid2'];
-        $newobject->idprof3 = $thirdparty['profid3'];
-        $newobject->idprof4 = $thirdparty['profid4'];
-        $newobject->idprof5 = $thirdparty['profid5'];
-        $newobject->idprof6 = $thirdparty['profid6'];
+		$newobject->phone = $thirdparty['phone'];
+		$newobject->fax = $thirdparty['fax'];
+		$newobject->email = $thirdparty['email'];
+		$newobject->url = $thirdparty['url'];
+		$newobject->idprof1 = $thirdparty['profid1'];
+		$newobject->idprof2 = $thirdparty['profid2'];
+		$newobject->idprof3 = $thirdparty['profid3'];
+		$newobject->idprof4 = $thirdparty['profid4'];
+		$newobject->idprof5 = $thirdparty['profid5'];
+		$newobject->idprof6 = $thirdparty['profid6'];
 
-        $newobject->capital = $thirdparty['capital'];
+		$newobject->capital = $thirdparty['capital'];
 
-        $newobject->barcode = $thirdparty['barcode'];
-        $newobject->tva_assuj = $thirdparty['vat_used'];
-        $newobject->tva_intra = $thirdparty['vat_number'];
+		$newobject->barcode = $thirdparty['barcode'];
+		$newobject->tva_assuj = $thirdparty['vat_used'];
+		$newobject->tva_intra = $thirdparty['vat_number'];
 
-        $newobject->canvas = $thirdparty['canvas'];
-        $newobject->particulier = $thirdparty['individual'];
+		$newobject->canvas = $thirdparty['canvas'];
+		$newobject->particulier = $thirdparty['individual'];
 
-        $elementtype = 'societe';
+		$elementtype = 'societe';
 
-        // Retrieve all extrafields for thirdsparty
-        // fetch optionals attributes and labels
-        $extrafields = new ExtraFields($db);
-        $extrafields->fetch_name_optionals_label($elementtype, true);
-        if (is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label']))
-        {
-        	foreach ($extrafields->attributes[$elementtype]['label'] as $key=>$label)
-	        {
-	        	$key = 'options_'.$key;
-	        	$newobject->array_options[$key] = $thirdparty[$key];
-	        }
-        }
+		// Retrieve all extrafields for thirdsparty
+		// fetch optionals attributes and labels
+		$extrafields = new ExtraFields($db);
+		$extrafields->fetch_name_optionals_label($elementtype, true);
+		if (is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label']))
+		{
+			foreach ($extrafields->attributes[$elementtype]['label'] as $key=>$label)
+			{
+				$key = 'options_'.$key;
+				$newobject->array_options[$key] = $thirdparty[$key];
+			}
+		}
 
-        $db->begin();
+		$db->begin();
 
-        $result = $newobject->create($fuser);
-        if ($newobject->particulier && $result > 0) {
-            $newobject->firstname = $thirdparty['firstname'];
-            $newobject->name_bis = $thirdparty['lastname'];
-            $result = $newobject->create_individual($fuser);
-        }
-        if ($result <= 0)
-        {
-            $error++;
-        }
+		$result = $newobject->create($fuser);
+		if ($newobject->particulier && $result > 0) {
+			$newobject->firstname = $thirdparty['firstname'];
+			$newobject->name_bis = $thirdparty['lastname'];
+			$result = $newobject->create_individual($fuser);
+		}
+		if ($result <= 0)
+		{
+			$error++;
+		}
 
-        if (!$error)
-        {
-            $db->commit();
+		if (!$error)
+		{
+			$db->commit();
 
-            // Patch to add capability to associate (one) sale representative
-            if ($thirdparty['commid'] && $thirdparty['commid'] > 0)
-                $newobject->add_commercial($fuser, $thirdparty["commid"]);
+			// Patch to add capability to associate (one) sale representative
+			if ($thirdparty['commid'] && $thirdparty['commid'] > 0)
+				$newobject->add_commercial($fuser, $thirdparty["commid"]);
 
-            $objectresp = array('result'=>array('result_code'=>'OK', 'result_label'=>''), 'id'=>$newobject->id, 'ref'=>$newobject->ref);
-        }
-        else {
-            $db->rollback();
-            $error++;
-            $errorcode = 'KO';
-            $errorlabel = $newobject->error;
-        }
-    }
+			$objectresp = array('result'=>array('result_code'=>'OK', 'result_label'=>''), 'id'=>$newobject->id, 'ref'=>$newobject->ref);
+		}
+		else {
+			$db->rollback();
+			$error++;
+			$errorcode = 'KO';
+			$errorlabel = $newobject->error;
+		}
+	}
 
-    if ($error)
-    {
-        $objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
-    }
+	if ($error)
+	{
+		$objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
+	}
 
-    return $objectresp;
+	return $objectresp;
 }
 
 /**
@@ -672,103 +672,103 @@ function updateThirdParty($authentication, $thirdparty)
  */
 function getListOfThirdParties($authentication, $filterthirdparty)
 {
-    global $db, $conf, $langs;
+	global $db, $conf, $langs;
 
-    $now = dol_now();
+	$now = dol_now();
 
-    dol_syslog("Function: getListOfThirdParties login=".$authentication['login']);
+	dol_syslog("Function: getListOfThirdParties login=".$authentication['login']);
 
-    if ($authentication['entity']) $conf->entity = $authentication['entity'];
+	if ($authentication['entity']) $conf->entity = $authentication['entity'];
 
-    // Init and check authentication
-    $objectresp = array();
-    $arraythirdparties = array();
+	// Init and check authentication
+	$objectresp = array();
+	$arraythirdparties = array();
 
-    $errorcode = ''; $errorlabel = '';
-    $error = 0;
-    $fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
-    // Check parameters
+	$errorcode = ''; $errorlabel = '';
+	$error = 0;
+	$fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
+	// Check parameters
 
-    if (!$error)
-    {
-        $sql  = "SELECT s.rowid as socRowid, s.nom as ref, s.ref_ext, s.address, s.zip, s.town, c.label as country, s.phone, s.fax, s.url, extra.*";
-        $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
-        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON s.fk_pays = c.rowid";
-        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_extrafields as extra ON s.rowid=fk_object";
+	if (!$error)
+	{
+		$sql  = "SELECT s.rowid as socRowid, s.nom as ref, s.ref_ext, s.address, s.zip, s.town, c.label as country, s.phone, s.fax, s.url, extra.*";
+		$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON s.fk_pays = c.rowid";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_extrafields as extra ON s.rowid=fk_object";
 
-        $sql .= " WHERE entity=".$conf->entity;
-        foreach ($filterthirdparty as $key => $val)
-        {
-            if ($key == 'name' && $val != '')  $sql .= " AND s.name LIKE '%".$db->escape($val)."%'";
-        	if ($key == 'client' && (int) $val > 0)  $sql .= " AND s.client = ".$db->escape($val);
-            if ($key == 'supplier' && (int) $val > 0)  $sql .= " AND s.fournisseur = ".$db->escape($val);
-            if ($key == 'category' && (int) $val > 0)  $sql .= " AND s.rowid IN (SELECT fk_soc FROM ".MAIN_DB_PREFIX."categorie_societe WHERE fk_categorie=".$db->escape($val).") ";
-        }
-        dol_syslog("Function: getListOfThirdParties", LOG_DEBUG);
+		$sql .= " WHERE entity=".$conf->entity;
+		foreach ($filterthirdparty as $key => $val)
+		{
+			if ($key == 'name' && $val != '')  $sql .= " AND s.name LIKE '%".$db->escape($val)."%'";
+			if ($key == 'client' && (int) $val > 0)  $sql .= " AND s.client = ".$db->escape($val);
+			if ($key == 'supplier' && (int) $val > 0)  $sql .= " AND s.fournisseur = ".$db->escape($val);
+			if ($key == 'category' && (int) $val > 0)  $sql .= " AND s.rowid IN (SELECT fk_soc FROM ".MAIN_DB_PREFIX."categorie_societe WHERE fk_categorie=".$db->escape($val).") ";
+		}
+		dol_syslog("Function: getListOfThirdParties", LOG_DEBUG);
 
-        $elementtype = 'societe';
+		$elementtype = 'societe';
 
-        $extrafields = new ExtraFields($db);
-        $extrafields->fetch_name_optionals_label($elementtype, true);
+		$extrafields = new ExtraFields($db);
+		$extrafields->fetch_name_optionals_label($elementtype, true);
 
 
-        $resql = $db->query($sql);
-        if ($resql)
-        {
-            $num = $db->num_rows($resql);
+		$resql = $db->query($sql);
+		if ($resql)
+		{
+			$num = $db->num_rows($resql);
 
-            $i = 0;
-            while ($i < $num)
-            {
-                $extrafieldsOptions = array();
-                $obj = $db->fetch_object($resql);
+			$i = 0;
+			while ($i < $num)
+			{
+				$extrafieldsOptions = array();
+				$obj = $db->fetch_object($resql);
 
-                if (is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label']))
-                {
-                	foreach ($extrafields->attributes[$elementtype]['label'] as $key=>$label)
-	                {
-	                    $extrafieldsOptions['options_'.$key] = $obj->{$key};
-	                }
-                }
+				if (is_array($extrafields->attributes[$elementtype]['label']) && count($extrafields->attributes[$elementtype]['label']))
+				{
+					foreach ($extrafields->attributes[$elementtype]['label'] as $key=>$label)
+					{
+						$extrafieldsOptions['options_'.$key] = $obj->{$key};
+					}
+				}
 
-                $arraythirdparties[] = array('id'=>$obj->socRowid,
-                    'ref'=>$obj->ref,
-                    'ref_ext'=>$obj->ref_ext,
-                    'adress'=>$obj->adress,
-                    'zip'=>$obj->zip,
-                    'town'=>$obj->town,
-                    'country'=>$obj->country,
-                    'phone'=>$obj->phone,
-                    'fax'=>$obj->fax,
-                    'url'=>$obj->url
-                );
-                $arraythirdparties[$i] = array_merge($arraythirdparties[$i], $extrafieldsOptions);
+				$arraythirdparties[] = array('id'=>$obj->socRowid,
+					'ref'=>$obj->ref,
+					'ref_ext'=>$obj->ref_ext,
+					'adress'=>$obj->adress,
+					'zip'=>$obj->zip,
+					'town'=>$obj->town,
+					'country'=>$obj->country,
+					'phone'=>$obj->phone,
+					'fax'=>$obj->fax,
+					'url'=>$obj->url
+				);
+				$arraythirdparties[$i] = array_merge($arraythirdparties[$i], $extrafieldsOptions);
 
-                $i++;
-            }
-        }
-        else {
-            $error++;
-            $errorcode = $db->lasterrno();
-            $errorlabel = $db->lasterror();
-        }
-    }
+				$i++;
+			}
+		}
+		else {
+			$error++;
+			$errorcode = $db->lasterrno();
+			$errorlabel = $db->lasterror();
+		}
+	}
 
-    if ($error)
-    {
-        $objectresp = array(
-            'result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel),
-            'thirdparties'=>$arraythirdparties
-        );
-    }
-    else {
-        $objectresp = array(
-            'result'=>array('result_code' => 'OK', 'result_label' => ''),
-            'thirdparties'=>$arraythirdparties
-        );
-    }
+	if ($error)
+	{
+		$objectresp = array(
+			'result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel),
+			'thirdparties'=>$arraythirdparties
+		);
+	}
+	else {
+		$objectresp = array(
+			'result'=>array('result_code' => 'OK', 'result_label' => ''),
+			'thirdparties'=>$arraythirdparties
+		);
+	}
 
-    return $objectresp;
+	return $objectresp;
 }
 
 /**
diff --git a/htdocs/webservices/server_user.php b/htdocs/webservices/server_user.php
index 99325347a23..6f7ed5c10aa 100644
--- a/htdocs/webservices/server_user.php
+++ b/htdocs/webservices/server_user.php
@@ -38,11 +38,11 @@ $langs->load("main");
 // Enable and test if module web services is enabled
 if (empty($conf->global->MAIN_MODULE_WEBSERVICES))
 {
-    $langs->load("admin");
-    dol_syslog("Call Dolibarr webservices interfaces with module webservices disabled");
-    print $langs->trans("WarningModuleNotActive", 'WebServices').'.<br><br>';
-    print $langs->trans("ToActivateModule");
-    exit;
+	$langs->load("admin");
+	dol_syslog("Call Dolibarr webservices interfaces with module webservices disabled");
+	print $langs->trans("WarningModuleNotActive", 'WebServices').'.<br><br>';
+	print $langs->trans("ToActivateModule");
+	exit;
 }
 
 // Create the soap Object
@@ -56,70 +56,70 @@ $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 other specific objects
 $server->wsdl->addComplexType(
-    'user',
-    'complexType',
-    'struct',
-    'all',
-    '',
-    array(
-        'element' => array('name'=>'element', 'type'=>'xsd:string'),
-        'id' => array('name'=>'id', 'type'=>'xsd:string'),
-        'lastname' => array('name'=>'lastname', 'type'=>'xsd:string'),
-        'firstname' => array('name'=>'firstname', 'type'=>'xsd:string'),
-        'note' => array('name'=>'note', 'type'=>'xsd:string'),
-        'email' => array('name'=>'email', 'type'=>'xsd:string'),
-        'signature' => array('name'=>'signature', 'type'=>'xsd:string'),
-        'office_phone' => array('name'=>'office_phone', 'type'=>'xsd:string'),
-        'office_fax' => array('name'=>'office_fax', 'type'=>'xsd:string'),
-        'user_mobile' => array('name'=>'user_mobile', 'type'=>'xsd:string'),
-        'admin' => array('name'=>'admin', 'type'=>'xsd:string'),
-        'login' => array('name'=>'login', 'type'=>'xsd:string'),
-        'entity' => array('name'=>'entity', 'type'=>'xsd:string'),
-        'pass_indatabase' => array('name'=>'pass_indatabase', 'type'=>'xsd:string'),
-        'pass_indatabase_crypted' => array('name'=>'pass_indatabase_crypted', 'type'=>'xsd:string'),
-        'datec' => array('name'=>'datec', 'type'=>'xsd:dateTime'),
-        'datem' => array('name'=>'datem', 'type'=>'xsd:dateTime'),
-        'fk_thirdparty' => array('name'=>'fk_thirdparty', 'type'=>'xsd:string'),
-        'fk_contact' => array('name'=>'fk_contact', 'type'=>'xsd:string'),
-        'fk_member' => array('name'=>'fk_member', 'type'=>'xsd:string'),
-        'datelastlogin' => array('name'=>'datelastlogin', 'type'=>'xsd:dateTime'),
-        'datepreviouslogin' => array('name'=>'datepreviouslogin', 'type'=>'xsd:dateTime'),
-        'statut' => array('name'=>'statut', 'type'=>'xsd:string'),
-        'photo' => array('name'=>'photo', 'type'=>'xsd:string'),
-        'lang' => array('name'=>'lang', 'type'=>'xsd:string'),
-        'entrepots' => array('name'=>'entrepots', 'type'=>'xsd:string'),
-        //'rights' => array('name'=>'rights','type'=>'xsd:string'),
-        'canvas' => array('name'=>'canvas', 'type'=>'xsd:string')
-    )
+	'user',
+	'complexType',
+	'struct',
+	'all',
+	'',
+	array(
+		'element' => array('name'=>'element', 'type'=>'xsd:string'),
+		'id' => array('name'=>'id', 'type'=>'xsd:string'),
+		'lastname' => array('name'=>'lastname', 'type'=>'xsd:string'),
+		'firstname' => array('name'=>'firstname', 'type'=>'xsd:string'),
+		'note' => array('name'=>'note', 'type'=>'xsd:string'),
+		'email' => array('name'=>'email', 'type'=>'xsd:string'),
+		'signature' => array('name'=>'signature', 'type'=>'xsd:string'),
+		'office_phone' => array('name'=>'office_phone', 'type'=>'xsd:string'),
+		'office_fax' => array('name'=>'office_fax', 'type'=>'xsd:string'),
+		'user_mobile' => array('name'=>'user_mobile', 'type'=>'xsd:string'),
+		'admin' => array('name'=>'admin', 'type'=>'xsd:string'),
+		'login' => array('name'=>'login', 'type'=>'xsd:string'),
+		'entity' => array('name'=>'entity', 'type'=>'xsd:string'),
+		'pass_indatabase' => array('name'=>'pass_indatabase', 'type'=>'xsd:string'),
+		'pass_indatabase_crypted' => array('name'=>'pass_indatabase_crypted', 'type'=>'xsd:string'),
+		'datec' => array('name'=>'datec', 'type'=>'xsd:dateTime'),
+		'datem' => array('name'=>'datem', 'type'=>'xsd:dateTime'),
+		'fk_thirdparty' => array('name'=>'fk_thirdparty', 'type'=>'xsd:string'),
+		'fk_contact' => array('name'=>'fk_contact', 'type'=>'xsd:string'),
+		'fk_member' => array('name'=>'fk_member', 'type'=>'xsd:string'),
+		'datelastlogin' => array('name'=>'datelastlogin', 'type'=>'xsd:dateTime'),
+		'datepreviouslogin' => array('name'=>'datepreviouslogin', 'type'=>'xsd:dateTime'),
+		'statut' => array('name'=>'statut', 'type'=>'xsd:string'),
+		'photo' => array('name'=>'photo', 'type'=>'xsd:string'),
+		'lang' => array('name'=>'lang', 'type'=>'xsd:string'),
+		'entrepots' => array('name'=>'entrepots', 'type'=>'xsd:string'),
+		//'rights' => array('name'=>'rights','type'=>'xsd:string'),
+		'canvas' => array('name'=>'canvas', 'type'=>'xsd:string')
+	)
 );
 
 // Define other specific objects
@@ -243,16 +243,16 @@ $styleuse = 'encoded'; // encoded/literal/literal wrapped
 
 // Register WSDL
 $server->register(
-    'getUser',
-    // Entry values
-    array('authentication'=>'tns:authentication', 'id'=>'xsd:string', 'ref'=>'xsd:string', 'ref_ext'=>'xsd:string'),
-    // Exit values
-    array('result'=>'tns:result', 'user'=>'tns:user'),
-    $ns,
-    $ns.'#getUser',
-    $styledoc,
-    $styleuse,
-    'WS to get user'
+	'getUser',
+	// Entry values
+	array('authentication'=>'tns:authentication', 'id'=>'xsd:string', 'ref'=>'xsd:string', 'ref_ext'=>'xsd:string'),
+	// Exit values
+	array('result'=>'tns:result', 'user'=>'tns:user'),
+	$ns,
+	$ns.'#getUser',
+	$styledoc,
+	$styleuse,
+	'WS to get user'
 );
 
 $server->register(
@@ -308,41 +308,41 @@ $server->register(
  */
 function getUser($authentication, $id, $ref = '', $ref_ext = '')
 {
-    global $db, $conf, $langs;
+	global $db, $conf, $langs;
 
-    dol_syslog("Function: getUser login=".$authentication['login']." id=".$id." ref=".$ref." ref_ext=".$ref_ext);
+	dol_syslog("Function: getUser login=".$authentication['login']." id=".$id." ref=".$ref." ref_ext=".$ref_ext);
 
-    if ($authentication['entity']) $conf->entity = $authentication['entity'];
+	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
-    if (!$error && (($id && $ref) || ($id && $ref_ext) || ($ref && $ref_ext)))
-    {
-        $error++;
-        $errorcode = 'BAD_PARAMETERS'; $errorlabel = "Parameter id, ref and ref_ext can't be both provided. You must choose one or other but not both.";
-    }
+	// Init and check authentication
+	$objectresp = array();
+	$errorcode = ''; $errorlabel = '';
+	$error = 0;
+	$fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
+	// Check parameters
+	if (!$error && (($id && $ref) || ($id && $ref_ext) || ($ref && $ref_ext)))
+	{
+		$error++;
+		$errorcode = 'BAD_PARAMETERS'; $errorlabel = "Parameter id, ref and ref_ext can't be both provided. You must choose one or other but not both.";
+	}
 
-    if (!$error)
-    {
-        $fuser->getrights();
+	if (!$error)
+	{
+		$fuser->getrights();
 
-        if ($fuser->rights->user->user->lire
-        	|| ($fuser->rights->user->self->creer && $id && $id == $fuser->id)
-        	|| ($fuser->rights->user->self->creer && $ref && $ref == $fuser->login)
-        	|| ($fuser->rights->user->self->creer && $ref_ext && $ref_ext == $fuser->ref_ext))
-        {
-            $user = new User($db);
-            $result = $user->fetch($id, $ref, $ref_ext);
-            if ($result > 0)
-            {
-                // Create
-                $objectresp = array(
-			    	'result'=>array('result_code'=>'OK', 'result_label'=>''),
-			        'user'=>array(
+		if ($fuser->rights->user->user->lire
+			|| ($fuser->rights->user->self->creer && $id && $id == $fuser->id)
+			|| ($fuser->rights->user->self->creer && $ref && $ref == $fuser->login)
+			|| ($fuser->rights->user->self->creer && $ref_ext && $ref_ext == $fuser->ref_ext))
+		{
+			$user = new User($db);
+			$result = $user->fetch($id, $ref, $ref_ext);
+			if ($result > 0)
+			{
+				// Create
+				$objectresp = array(
+					'result'=>array('result_code'=>'OK', 'result_label'=>''),
+					'user'=>array(
 						'id' => $user->id,
 						'lastname' => $user->lastname,
 						'firstname' => $user->firstname,
@@ -369,26 +369,26 @@ function getUser($authentication, $id, $ref = '', $ref_ext = '')
 						'lang' => $user->lang,
 						//'rights' => $user->rights,
 						'canvas' => $user->canvas
-                    )
-                );
-            }
-            else {
-                $error++;
-                $errorcode = 'NOT_FOUND'; $errorlabel = 'Object not found for id='.$id.' nor ref='.$ref.' nor ref_ext='.$ref_ext;
-            }
-        }
-        else {
-            $error++;
-            $errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
-        }
-    }
+					)
+				);
+			}
+			else {
+				$error++;
+				$errorcode = 'NOT_FOUND'; $errorlabel = 'Object not found for id='.$id.' nor ref='.$ref.' nor ref_ext='.$ref_ext;
+			}
+		}
+		else {
+			$error++;
+			$errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
+		}
+	}
 
-    if ($error)
-    {
-        $objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
-    }
+	if ($error)
+	{
+		$objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
+	}
 
-    return $objectresp;
+	return $objectresp;
 }
 
 /**
diff --git a/htdocs/website/class/website.class.php b/htdocs/website/class/website.class.php
index 768ddbdb19c..bd25ad54898 100644
--- a/htdocs/website/class/website.class.php
+++ b/htdocs/website/class/website.class.php
@@ -169,15 +169,15 @@ class Website extends CommonObject
 		if (isset($this->status)) {
 			 $this->status = (int) $this->status;
 		}
-        if (empty($this->date_creation)) {
-            $this->date_creation = $now;
-        }
-        if (empty($this->date_modification)) {
-            $this->date_modification = $now;
-        }
-        // Remove spaces and be sure we have main language only
-        $this->lang = preg_replace('/[_-].*$/', '', trim($this->lang)); // en_US or en-US -> en
-        $tmparray = explode(',', $this->otherlang);
+		if (empty($this->date_creation)) {
+			$this->date_creation = $now;
+		}
+		if (empty($this->date_modification)) {
+			$this->date_modification = $now;
+		}
+		// Remove spaces and be sure we have main language only
+		$this->lang = preg_replace('/[_-].*$/', '', trim($this->lang)); // en_US or en-US -> en
+		$tmparray = explode(',', $this->otherlang);
 		if (is_array($tmparray)) {
 			foreach ($tmparray as $key => $val) {
 				$tmparray[$key] = preg_replace('/[_-].*$/', '', trim($val)); // en_US or en-US -> en
@@ -185,14 +185,14 @@ class Website extends CommonObject
 			$this->otherlang = join(',', $tmparray);
 		}
 
-        // Check parameters
-        if (empty($this->entity)) {
-            $this->entity = $conf->entity;
-        }
-        if (empty($this->lang)) {
-        	$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("MainLanguage"));
-        	return -1;
-        }
+		// Check parameters
+		if (empty($this->entity)) {
+			$this->entity = $conf->entity;
+		}
+		if (empty($this->lang)) {
+			$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("MainLanguage"));
+			return -1;
+		}
 
 		// Insert request
 		$sql = 'INSERT INTO '.MAIN_DB_PREFIX.$this->table_element.'(';
@@ -245,23 +245,23 @@ class Website extends CommonObject
 				}
 			}
 
-            // Uncomment this and change MYOBJECT to your own tag if you
-            // want this action to call a trigger.
-            // if (!$notrigger) {
+			// Uncomment this and change MYOBJECT to your own tag if you
+			// want this action to call a trigger.
+			// if (!$notrigger) {
 
-            //     // Call triggers
-            //     $result = $this->call_trigger('MYOBJECT_CREATE',$user);
-            //     if ($result < 0) $error++;
-            //     // End call triggers
-            // }
-        }
+			//     // Call triggers
+			//     $result = $this->call_trigger('MYOBJECT_CREATE',$user);
+			//     if ($result < 0) $error++;
+			//     // End call triggers
+			// }
+		}
 
-	    if (! $error) {
-	    	$stringtodolibarrfile = "# Some properties for Dolibarr web site CMS\n";
-	    	$stringtodolibarrfile .= "param=value\n";
-	    	//print $conf->website->dir_output.'/'.$this->ref.'/.dolibarr';exit;
-	    	file_put_contents($conf->website->dir_output.'/'.$this->ref.'/.dolibarr', $stringtodolibarrfile);
-        }
+		if (!$error) {
+			$stringtodolibarrfile = "# Some properties for Dolibarr web site CMS\n";
+			$stringtodolibarrfile .= "param=value\n";
+			//print $conf->website->dir_output.'/'.$this->ref.'/.dolibarr';exit;
+			file_put_contents($conf->website->dir_output.'/'.$this->ref.'/.dolibarr', $stringtodolibarrfile);
+		}
 
 		// Commit or rollback
 		if ($error) {
@@ -415,7 +415,7 @@ class Website extends CommonObject
 			$sql .= $this->db->order($sortfield, $sortorder);
 		}
 		if (!empty($limit)) {
-		    $sql .= ' '.$this->db->plimit($limit, $offset);
+			$sql .= ' '.$this->db->plimit($limit, $offset);
 		}
 		$this->records = array();
 
@@ -630,17 +630,17 @@ class Website extends CommonObject
 	 */
 	public function createFromClone($user, $fromid, $newref, $newlang = '')
 	{
-        global $conf, $langs;
+		global $conf, $langs;
 		global $dolibarr_main_data_root;
 
 		$now = dol_now();
 		$error = 0;
 
-        dol_syslog(__METHOD__, LOG_DEBUG);
+		dol_syslog(__METHOD__, LOG_DEBUG);
 
 		$object = new self($this->db);
 
-        // Check no site with ref exists
+		// Check no site with ref exists
 		if ($object->fetch(0, $newref) > 0)
 		{
 			$this->error = 'ErrorNewRefIsAlreadyUsed';
@@ -726,7 +726,7 @@ class Website extends CommonObject
 				//print $pageid.' = '.$objectpageold->pageurl.' -> '.$objectpagenew->id.' = '.$objectpagenew->pageurl.'<br>';
 				if (is_object($objectpagenew) && $objectpagenew->pageurl)
 				{
-		            $filealias = $pathofwebsitenew.'/'.$objectpagenew->pageurl.'.php';
+					$filealias = $pathofwebsitenew.'/'.$objectpagenew->pageurl.'.php';
 					$filetplnew = $pathofwebsitenew.'/page'.$objectpagenew->id.'.tpl.php';
 
 					// Save page alias
@@ -752,22 +752,22 @@ class Website extends CommonObject
 		{
 			// Restore id of home page
 			$object->fk_default_home = $newidforhome;
-		    $res = $object->update($user);
-		    if (!$res > 0)
-		    {
-		        $error++;
-		        setEventMessages($object->error, $object->errors, 'errors');
-		    }
+			$res = $object->update($user);
+			if (!$res > 0)
+			{
+				$error++;
+				setEventMessages($object->error, $object->errors, 'errors');
+			}
 
-		    if (!$error)
-		    {
-		    	$filetpl = $pathofwebsitenew.'/page'.$newidforhome.'.tpl.php';
-		    	$filewrapper = $pathofwebsitenew.'/wrapper.php';
+			if (!$error)
+			{
+				$filetpl = $pathofwebsitenew.'/page'.$newidforhome.'.tpl.php';
+				$filewrapper = $pathofwebsitenew.'/wrapper.php';
 
-		    	// Generate the index.php page to be the home page
-		    	//-------------------------------------------------
-		    	$result = dolSaveIndexPage($pathofwebsitenew, $fileindex, $filetpl, $filewrapper);
-		    }
+				// Generate the index.php page to be the home page
+				//-------------------------------------------------
+				$result = dolSaveIndexPage($pathofwebsitenew, $fileindex, $filetpl, $filewrapper);
+			}
 		}
 
 		unset($object->context['createfromclone']);
@@ -790,37 +790,37 @@ class Website extends CommonObject
 	 *
 	 *	@param	int		$withpicto			Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
 	 *	@param	string	$option				On what the link point to
-     *  @param	integer	$notooltip			1=Disable tooltip
-     *  @param	int		$maxlen				Max length of visible user name
-     *  @param  string  $morecss            Add more css on link
+	 *  @param	integer	$notooltip			1=Disable tooltip
+	 *  @param	int		$maxlen				Max length of visible user name
+	 *  @param  string  $morecss            Add more css on link
 	 *	@return	string						String with URL
 	 */
 	public function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $maxlen = 24, $morecss = '')
 	{
 		global $langs, $conf, $db;
-        global $dolibarr_main_authentication, $dolibarr_main_demo;
-        global $menumanager;
+		global $dolibarr_main_authentication, $dolibarr_main_demo;
+		global $menumanager;
 
 
-        $result = '';
-        $companylink = '';
+		$result = '';
+		$companylink = '';
 
-        $label = '<u>'.$langs->trans("WebSite").'</u>';
-        $label .= '<br>';
-        $label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref.'<br>';
-        $label .= '<b>'.$langs->trans('MainLanguage').':</b> '.$this->lang;
+		$label = '<u>'.$langs->trans("WebSite").'</u>';
+		$label .= '<br>';
+		$label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref.'<br>';
+		$label .= '<b>'.$langs->trans('MainLanguage').':</b> '.$this->lang;
 
-        $linkstart = '<a href="'.DOL_URL_ROOT.'/website/card.php?id='.$this->id.'"';
-        $linkstart .= ($notooltip ? '' : ' title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip'.($morecss ? ' '.$morecss : '').'"');
-        $linkstart .= '>';
+		$linkstart = '<a href="'.DOL_URL_ROOT.'/website/card.php?id='.$this->id.'"';
+		$linkstart .= ($notooltip ? '' : ' title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip'.($morecss ? ' '.$morecss : '').'"');
+		$linkstart .= '>';
 		$linkend = '</a>';
 
 		$linkstart = $linkend = '';
 
-        if ($withpicto)
-        {
-            $result .= ($linkstart.img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? '' : 'class="classfortooltip"')).$linkend);
-            if ($withpicto != 2) $result .= ' ';
+		if ($withpicto)
+		{
+			$result .= ($linkstart.img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? '' : 'class="classfortooltip"')).$linkend);
+			if ($withpicto != 2) $result .= ' ';
 		}
 		$result .= $linkstart.$this->ref.$linkend;
 		return $result;
@@ -837,7 +837,7 @@ class Website extends CommonObject
 		return $this->LibStatut($this->status, $mode);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Renvoi le libelle d'un status donne
 	 *
@@ -847,7 +847,7 @@ class Website extends CommonObject
 	 */
 	public function LibStatut($status, $mode = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 
 		if (empty($this->labelStatus) || empty($this->labelStatusShort))
@@ -875,7 +875,7 @@ class Website extends CommonObject
 	 */
 	public function initAsSpecimen()
 	{
-	    global $user;
+		global $user;
 
 		$this->id = 0;
 
@@ -937,13 +937,13 @@ class Website extends CommonObject
 		$arrayreplacementincss['medias/image/'.$website->ref.'/'] = "medias/image/__WEBSITE_KEY__/";
 		$arrayreplacementincss['medias/js/'.$website->ref.'/'] = "medias/js/__WEBSITE_KEY__/";
 		if ($mysoc->logo_small) {
-		    $arrayreplacementincss['file=logos%2Fthumbs%2F'.$mysoc->logo_small] = "file=logos%2Fthumbs%2F__LOGO_SMALL_KEY__";
+			$arrayreplacementincss['file=logos%2Fthumbs%2F'.$mysoc->logo_small] = "file=logos%2Fthumbs%2F__LOGO_SMALL_KEY__";
 		}
 		if ($mysoc->logo_mini) {
-		    $arrayreplacementincss['file=logos%2Fthumbs%2F'.$mysoc->logo_mini] = "file=logos%2Fthumbs%2F__LOGO_MINI_KEY__";
+			$arrayreplacementincss['file=logos%2Fthumbs%2F'.$mysoc->logo_mini] = "file=logos%2Fthumbs%2F__LOGO_MINI_KEY__";
 		}
 		if ($mysoc->logo) {
-		    $arrayreplacementincss['file=logos%2Fthumbs%2F'.$mysoc->logo] = "file=logos%2Fthumbs%2F__LOGO_KEY__";
+			$arrayreplacementincss['file=logos%2Fthumbs%2F'.$mysoc->logo] = "file=logos%2Fthumbs%2F__LOGO_KEY__";
 		}
 
 		// Create output directories
@@ -1079,8 +1079,8 @@ class Website extends CommonObject
 			//var_dump($this->fk_default_home.' - '.$objectpageold->id.' - '.$objectpageold->newid);exit;
 			if ($this->fk_default_home > 0 && ($objectpageold->id == $this->fk_default_home) && ($objectpageold->newid > 0))	// This is the record with home page
 			{
-			    // Warning: We must keep llx_ here. It is a generic SQL.
-			    $line = "UPDATE llx_website SET fk_default_home = ".($objectpageold->newid > 0 ? $this->db->escape($objectpageold->newid)."__+MAX_llx_website_page__" : "null")." WHERE rowid = __WEBSITE_ID__;";
+				// Warning: We must keep llx_ here. It is a generic SQL.
+				$line = "UPDATE llx_website SET fk_default_home = ".($objectpageold->newid > 0 ? $this->db->escape($objectpageold->newid)."__+MAX_llx_website_page__" : "null")." WHERE rowid = __WEBSITE_ID__;";
 				$line .= "\n";
 				fputs($fp, $line);
 			}
@@ -1305,14 +1305,14 @@ class Website extends CommonObject
 		$sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.'website_page WHERE fk_website = '.$this->id;
 
 		$resql = $this->db->query($sql);
-		if (! $resql) {
+		if (!$resql) {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
 
 		$num = $this->db->num_rows($resql);
 
-		$i=0;
+		$i = 0;
 		while ($i < $num) {
 			$obj = $this->db->fetch_object($resql);
 
@@ -1415,9 +1415,9 @@ class Website extends CommonObject
 		$pageid = 0;
 		if (!empty($websitepagefile))
 		{
-		    $websitepagefileshort = basename($websitepagefile);
-		    if ($websitepagefileshort == 'index.php') $pageid = $website->fk_default_home;
-		    else $pageid = str_replace(array('.tpl.php', 'page'), array('', ''), $websitepagefileshort);
+			$websitepagefileshort = basename($websitepagefile);
+			if ($websitepagefileshort == 'index.php') $pageid = $website->fk_default_home;
+			else $pageid = str_replace(array('.tpl.php', 'page'), array('', ''), $websitepagefileshort);
 			if ($pageid > 0)
 			{
 				$tmppage->fetch($pageid);
@@ -1468,7 +1468,7 @@ class Website extends CommonObject
 		$url = preg_replace('/(\?|&)l=([a-zA-Z_]*)/', '', $url); // We remove param l from url
 		//$url = preg_replace('/(\?|&)lang=([a-zA-Z_]*)/', '', $url);	// We remove param lang from url
 		$url .= (preg_match('/\?/', $url) ? '&' : '?').'l=';
-		if (! preg_match('/^\//', $url)) $url = '/'.$url;
+		if (!preg_match('/^\//', $url)) $url = '/'.$url;
 
 		$HEIGHTOPTION = 40;
 		$MAXHEIGHT = 4 * $HEIGHTOPTION;
@@ -1513,28 +1513,28 @@ class Website extends CommonObject
 			$out .= '</li></a>';
 		}
 		$i = 0;
-        if (is_array($languagecodes))
-        {
-            foreach ($languagecodes as $languagecode)
-            {
-            	// Convert $languagecode into a long language code
-                if (strlen($languagecode) == 2) {
-                	$languagecode = (empty($arrayofspecialmainlanguages[$languagecode]) ? $languagecode.'_'.strtoupper($languagecode) : $arrayofspecialmainlanguages[$languagecode]);
-                }
+		if (is_array($languagecodes))
+		{
+			foreach ($languagecodes as $languagecode)
+			{
+				// Convert $languagecode into a long language code
+				if (strlen($languagecode) == 2) {
+					$languagecode = (empty($arrayofspecialmainlanguages[$languagecode]) ? $languagecode.'_'.strtoupper($languagecode) : $arrayofspecialmainlanguages[$languagecode]);
+				}
 
-                if ($languagecode == $languagecodeselected) continue; // Already output
+				if ($languagecode == $languagecodeselected) continue; // Already output
 
-                $countrycode = strtolower(substr($languagecode, -2));
-                $label = $weblangs->trans("Language_".$languagecode);
-                if ($countrycode == 'us') $label = preg_replace('/\s*\(.*\)/', '', $label);
-                $out .= '<a href="'.$url.substr($languagecode, 0, 2).'"><li><img height="12px" src="/medias/image/common/flags/'.$countrycode.'.png" style="margin-right: 5px;"/><span class="websitecomponentlilang">'.$label.'</span>';
-                if (empty($i) && empty($languagecodeselected)) $out .= '<span class="fa fa-caret-down" style="padding-left: 5px;" />';
-                $out .= '</li></a>';
-                $i++;
-            }
-        }
-        $out .= '</ul>';
+				$countrycode = strtolower(substr($languagecode, -2));
+				$label = $weblangs->trans("Language_".$languagecode);
+				if ($countrycode == 'us') $label = preg_replace('/\s*\(.*\)/', '', $label);
+				$out .= '<a href="'.$url.substr($languagecode, 0, 2).'"><li><img height="12px" src="/medias/image/common/flags/'.$countrycode.'.png" style="margin-right: 5px;"/><span class="websitecomponentlilang">'.$label.'</span>';
+				if (empty($i) && empty($languagecodeselected)) $out .= '<span class="fa fa-caret-down" style="padding-left: 5px;" />';
+				$out .= '</li></a>';
+				$i++;
+			}
+		}
+		$out .= '</ul>';
 
-        return $out;
-    }
+		return $out;
+	}
 }
diff --git a/htdocs/website/class/websitepage.class.php b/htdocs/website/class/websitepage.class.php
index 3b2f257fa91..5108fe4c25b 100644
--- a/htdocs/website/class/websitepage.class.php
+++ b/htdocs/website/class/websitepage.class.php
@@ -171,8 +171,8 @@ class WebsitePage extends CommonObject
 		'fk_user_modif'  =>array('type'=>'integer', 'label'=>'UserModif', 'enabled'=>1, 'visible'=>-1, 'position'=>512),
 		//'fk_user_valid' =>array('type'=>'integer',      'label'=>'UserValidation',        'enabled'=>1, 'visible'=>-1, 'position'=>512),
 		'import_key'     =>array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>-1, 'index'=>1, 'position'=>1000, 'notnull'=>-1),
-		'object_type' => array('type' => 'varchar(255)','label' => 'ObjectType', 'enabled'=>1, 'visible'=>0, 'position'=>46, 'searchall'=>0, 'help'=>''),
-		'fk_object' => array('type' => 'varchar(255)','label' => 'ObjectId', 'enabled'=>1, 'visible'=>0, 'position'=>47, 'searchall'=>0, 'help'=>'')
+		'object_type' => array('type' => 'varchar(255)', 'label' => 'ObjectType', 'enabled'=>1, 'visible'=>0, 'position'=>46, 'searchall'=>0, 'help'=>''),
+		'fk_object' => array('type' => 'varchar(255)', 'label' => 'ObjectId', 'enabled'=>1, 'visible'=>0, 'position'=>47, 'searchall'=>0, 'help'=>'')
 	);
 	// END MODULEBUILDER PROPERTIES
 
diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index 91ccccf0de6..9478c5f6206 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -273,7 +273,7 @@ if (GETPOST('optionsitefiles')) $algo .= 'sitefiles';
 
 if (empty($sortfield)) {
 	if ($action == 'file_manager') {
-		$sortfield='name'; $sortorder = 'ASC';
+		$sortfield = 'name'; $sortorder = 'ASC';
 	} else {
 		$sortfield = 'pageurl'; $sortorder = 'ASC';
 	}
@@ -1206,7 +1206,7 @@ if (GETPOSTISSET('pageid') && $action == 'delete' && $permissiontodelete) {
 	}
 }
 // Delete page (from menu search)
-if (! GETPOSTISSET('pageid')) {
+if (!GETPOSTISSET('pageid')) {
 	$objectclass = 'WebsitePage';
 
 	// Add part of code from actions_massactions.inc.php
@@ -2322,7 +2322,7 @@ if (!GETPOST('hide_websitemenu'))
 		$out = '';
 		$out .= '<select name="website" class="minwidth100 width200 maxwidth150onsmartphone" id="website">';
 		if (empty($object->records)) $out .= '<option value="-1">&nbsp;</option>';
-		if (! empty($conf->use_javascript_ajax)) {
+		if (!empty($conf->use_javascript_ajax)) {
 			$valueoption = '<span class="classlink">'.img_picto('', 'add', 'class="paddingrightonly"').$langs->trans("AddWebsite").'</span>';
 			$out .= '<option value="-2" data-html="'.dol_escape_htmltag($valueoption).'">'.$valueoption.'</option>';
 		}
@@ -2337,7 +2337,7 @@ if (!GETPOST('hide_websitemenu'))
 			$out .= '<option value="'.$valwebsite->ref.'"';
 			if ($websitekey == $valwebsite->ref) $out .= ' selected'; // To preselect a value
 			//$outoption = $valwebsite->getLibStatut(3).' '.$valwebsite->ref.' ';
-			$outoption = (($valwebsite->status == $valwebsite::STATUS_DRAFT)?'<span class="opacitymedium">':'').$valwebsite->ref.(($valwebsite->status == $valwebsite::STATUS_DRAFT)?'</span>':'');
+			$outoption = (($valwebsite->status == $valwebsite::STATUS_DRAFT) ? '<span class="opacitymedium">' : '').$valwebsite->ref.(($valwebsite->status == $valwebsite::STATUS_DRAFT) ? '</span>' : '');
 			$out .= ' data-html="'.dol_escape_htmltag($outoption).'"';
 			$out .= '>';
 			$out .= $valwebsite->ref;
@@ -2375,7 +2375,7 @@ if (!GETPOST('hide_websitemenu'))
 
 			$importlabel = $langs->trans("ImportSite");
 			$exportlabel = $langs->trans("ExportSite");
-			if (! empty($conf->dol_optimize_smallscreen)) {
+			if (!empty($conf->dol_optimize_smallscreen)) {
 				$importlabel = $langs->trans("Import");
 				$exportlabel = $langs->trans("Export");
 			}
@@ -2406,9 +2406,10 @@ if (!GETPOST('hide_websitemenu'))
 		if ($websitekey && $websitekey != '-1' && ($action == 'preview' || $action == 'createfromclone' || $action == 'createpagefromclone' || $action == 'deletesite'))
 		{
 			print '<span class="websiteselection">';
-			print '<a href="'.$_SERVER["PHP_SEFL"].'?action=file_manager&website='.$website->ref.'" class="button bordertransp"'.$disabled.' title="'.dol_escape_htmltag($langs->trans("MediaFiles")).'"><span class="fa fa-image"><span></a>';
+			//print '<a href="'.$_SERVER["PHP_SELF"].'?action=file_manager&website='.$website->ref.'" class="button bordertransp"'.$disabled.' title="'.dol_escape_htmltag($langs->trans("MediaFiles")).'"><span class="fa fa-image"><span></a>';
+			print dolButtonToOpenUrlInDialogPopup('file_manager', $langs->transnoentitiesnoconv("MediaFiles"), '<span class="fa fa-image"><span>', '/website/index.php?action=file_manager&website='.$website->ref, $disabled);
 
-			if (! empty($conf->categorie->enabled)) {
+			if (!empty($conf->categorie->enabled)) {
 				//print '<a href="'.DOL_URL_ROOT.'/categories/index.php?leftmenu=website&dol_hide_leftmenu=1&nosearch=1&type=website_page&website='.$website->ref.'" class="button bordertransp"'.$disabled.' title="'.dol_escape_htmltag($langs->trans("Categories")).'"><span class="fa fa-tags"><span></a>';
 				print dolButtonToOpenUrlInDialogPopup('categories', $langs->transnoentitiesnoconv("Categories"), '<span class="fa fa-tags"><span>', '/categories/index.php?leftmenu=website&nosearch=1&type=website_page&website='.$website->ref, $disabled);
 			}
@@ -2624,10 +2625,10 @@ if (!GETPOST('hide_websitemenu'))
 				// Confirmation to clone
 				if ($action == 'createpagefromclone') {
 					// Create an array for form
-					$preselectedlanguage = GETPOST('newlang', 'aZ09') ? GETPOST('newlang', 'aZ09') : '';	// Dy default, we do not force any language on pages
+					$preselectedlanguage = GETPOST('newlang', 'aZ09') ? GETPOST('newlang', 'aZ09') : ''; // Dy default, we do not force any language on pages
 					$onlylang = array();
 					if ($website->otherlang) {
-						if (! empty($website->lang)) {
+						if (!empty($website->lang)) {
 							$onlylang[$website->lang] = $website->lang;
 						}
 						foreach (explode(',', $website->otherlang) as $langkey) {
@@ -3150,7 +3151,7 @@ if ($action == 'editcss')
 
 	print '</table>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '</div>';
 
@@ -3240,7 +3241,7 @@ if ($action == 'createsite')
 
 	//print '</div>';
 
-	//dol_fiche_end();
+	//print dol_get_fiche_end();
 
 	print '</div>';
 
@@ -3271,7 +3272,7 @@ if ($action == 'importsite')
 
 	showWebsiteTemplates($website);
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '</div>';
 
@@ -3546,7 +3547,7 @@ if ($action == 'editmeta' || $action == 'createcontainer')
 	{
 		$langs->load('categories');
 
-		if (! GETPOSTISSET('categories')) {
+		if (!GETPOSTISSET('categories')) {
 			$cate_arbo = $form->select_all_categories(Categorie::TYPE_WEBSITE_PAGE, '', null, null, null, 1);
 			$c = new Categorie($db);
 			$cats = $c->containing($objectpage->id, Categorie::TYPE_WEBSITE_PAGE);
@@ -3684,7 +3685,7 @@ if ($action == 'editmeta' || $action == 'createcontainer')
 	}
 	//print '</div>';
 
-	//dol_fiche_end();
+	//print dol_get_fiche_end();
 
 	print '</div>';
 
diff --git a/htdocs/website/websiteaccount_card.php b/htdocs/website/websiteaccount_card.php
index f450c190907..332ef81e9af 100644
--- a/htdocs/website/websiteaccount_card.php
+++ b/htdocs/website/websiteaccount_card.php
@@ -151,7 +151,7 @@ if ($action == 'create')
 
 	print '</table>'."\n";
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div class="center">';
 	print '<input type="submit" class="button" name="add" value="'.dol_escape_htmltag($langs->trans("Create")).'">';
@@ -184,7 +184,7 @@ if (($id || $ref) && $action == 'edit')
 
 	print '</table>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div class="center"><input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
 	print ' &nbsp; <input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
@@ -293,7 +293,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 	print '<div class="clearboth"></div><br>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 
 	// Buttons for actions
diff --git a/htdocs/zapier/admin/about.php b/htdocs/zapier/admin/about.php
index 12bc0071158..e67ba8861a2 100644
--- a/htdocs/zapier/admin/about.php
+++ b/htdocs/zapier/admin/about.php
@@ -71,6 +71,6 @@ $tmpmodule = new modZapier($db);
 print $tmpmodule->getDescLong();
 
 // Page end
-dol_fiche_end();
+print dol_get_fiche_end();
 llxFooter();
 $db->close();
diff --git a/htdocs/zapier/admin/setup.php b/htdocs/zapier/admin/setup.php
index 2d6a779f44b..c63dbcc49f1 100644
--- a/htdocs/zapier/admin/setup.php
+++ b/htdocs/zapier/admin/setup.php
@@ -40,8 +40,8 @@ $action = GETPOST('action', 'aZ09');
 $backtopage = GETPOST('backtopage', 'alpha');
 
 $arrayofparameters = array(
-    'ZAPIERFORDOLIBARR_MYPARAM1'=>array('css'=>'minwidth200', 'enabled'=>1),
-    'ZAPIERFORDOLIBARR_MYPARAM2'=>array('css'=>'minwidth500', 'enabled'=>1)
+	'ZAPIERFORDOLIBARR_MYPARAM1'=>array('css'=>'minwidth200', 'enabled'=>1),
+	'ZAPIERFORDOLIBARR_MYPARAM2'=>array('css'=>'minwidth500', 'enabled'=>1)
 );
 
 
@@ -49,7 +49,7 @@ $arrayofparameters = array(
  * Actions
  */
 if ((float) DOL_VERSION >= 6) {
-    include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
+	include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
 }
 
 
@@ -74,50 +74,50 @@ echo $langs->trans("ZapierSetupPage").'<br><br>';
 
 
 if ($action == 'edit') {
-    print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    print '<input type="hidden" name="action" value="update">';
+	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="action" value="update">';
 
-    print '<table class="noborder centpercent">';
-    print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
+	print '<table class="noborder centpercent">';
+	print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
 
-    foreach ($arrayofparameters as $key => $val) {
-        print '<tr class="oddeven"><td>';
-        print $form->textwithpicto($langs->trans($key), $langs->trans($key.'Tooltip'));
-        print '</td><td><input name="'.$key.'"  class="flat '.(empty($val['css']) ? 'minwidth200' : $val['css']).'" value="'.$conf->global->$key.'"></td></tr>';
-    }
-    print '</table>';
+	foreach ($arrayofparameters as $key => $val) {
+		print '<tr class="oddeven"><td>';
+		print $form->textwithpicto($langs->trans($key), $langs->trans($key.'Tooltip'));
+		print '</td><td><input name="'.$key.'"  class="flat '.(empty($val['css']) ? 'minwidth200' : $val['css']).'" value="'.$conf->global->$key.'"></td></tr>';
+	}
+	print '</table>';
 
-    print '<br><div class="center">';
-    print '<input class="button" type="submit" value="'.$langs->trans("Save").'">';
-    print '</div>';
+	print '<br><div class="center">';
+	print '<input class="button" type="submit" value="'.$langs->trans("Save").'">';
+	print '</div>';
 
-    print '</form>';
-    print '<br>';
+	print '</form>';
+	print '<br>';
 } else {
-    if (!empty($arrayofparameters)) {
-        print '<table class="noborder centpercent">';
-        print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
+	if (!empty($arrayofparameters)) {
+		print '<table class="noborder centpercent">';
+		print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
 
-        foreach ($arrayofparameters as $key => $val) {
-            print '<tr class="oddeven"><td>';
-            print $form->textwithpicto($langs->trans($key), $langs->trans($key.'Tooltip'));
-            print '</td><td>'.$conf->global->$key.'</td></tr>';
-        }
+		foreach ($arrayofparameters as $key => $val) {
+			print '<tr class="oddeven"><td>';
+			print $form->textwithpicto($langs->trans($key), $langs->trans($key.'Tooltip'));
+			print '</td><td>'.$conf->global->$key.'</td></tr>';
+		}
 
-        print '</table>';
+		print '</table>';
 
-        print '<div class="tabsAction">';
-        print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit">'.$langs->trans("Modify").'</a>';
-        print '</div>';
-    } else {
-        print '<br>'.$langs->trans("NothingToSetup");
-    }
+		print '<div class="tabsAction">';
+		print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit">'.$langs->trans("Modify").'</a>';
+		print '</div>';
+	} else {
+		print '<br>'.$langs->trans("NothingToSetup");
+	}
 }
 
 
 // Page end
-dol_fiche_end();
+print dol_get_fiche_end();
 
 llxFooter();
 $db->close();
diff --git a/htdocs/zapier/class/api_zapier.class.php b/htdocs/zapier/class/api_zapier.class.php
index 76c610fa2cd..6118aa71241 100644
--- a/htdocs/zapier/class/api_zapier.class.php
+++ b/htdocs/zapier/class/api_zapier.class.php
@@ -34,241 +34,241 @@ require_once DOL_DOCUMENT_ROOT.'/zapier/class/hook.class.php';
  */
 class ZapierApi extends DolibarrApi
 {
-    /**
-     * @var array   $FIELDS     Mandatory fields, checked when create and update object
-     */
-    static $FIELDS = array(
-        'url',
-    );
+	/**
+	 * @var array   $FIELDS     Mandatory fields, checked when create and update object
+	 */
+	static $FIELDS = array(
+		'url',
+	);
 
 
-    /**
-     * @var Hook $hook {@type Hook}
-     */
-    public $hook;
+	/**
+	 * @var Hook $hook {@type Hook}
+	 */
+	public $hook;
 
-    /**
-     * Constructor
-     *
-     * @url     GET /
-     *
-     */
-    public function __construct()
-    {
-        global $db, $conf;
-        $this->db = $db;
-        $this->hook = new Hook($this->db);
-    }
+	/**
+	 * Constructor
+	 *
+	 * @url     GET /
+	 *
+	 */
+	public function __construct()
+	{
+		global $db, $conf;
+		$this->db = $db;
+		$this->hook = new Hook($this->db);
+	}
 
-    /**
-     * Get properties of a hook object
-     *
-     * Return an array with hook informations
-     *
-     * @param   int             $id ID of hook
-     * @return  array|mixed     data without useless information
-     *
-     * @url GET /hooks/{id}
-     * @throws  RestException
-     */
-    public function get($id)
-    {
-        if (!DolibarrApiAccess::$user->rights->zapier->read) {
-            throw new RestException(401);
-        }
+	/**
+	 * Get properties of a hook object
+	 *
+	 * Return an array with hook informations
+	 *
+	 * @param   int             $id ID of hook
+	 * @return  array|mixed     data without useless information
+	 *
+	 * @url GET /hooks/{id}
+	 * @throws  RestException
+	 */
+	public function get($id)
+	{
+		if (!DolibarrApiAccess::$user->rights->zapier->read) {
+			throw new RestException(401);
+		}
 
-        $result = $this->hook->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Hook not found');
-        }
+		$result = $this->hook->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Hook not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('hook', $this->hook->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('hook', $this->hook->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        return $this->_cleanObjectDatas($this->hook);
-    }
+		return $this->_cleanObjectDatas($this->hook);
+	}
 
-    /**
-     * Get list of possibles choices for module
-     *
-     * Return an array with hook informations
-     * @param integer $id ID
-     *
-     * @return  array|mixed     data
-     *
-     * @url GET /getmoduleschoices/
-     * @throws  RestException
-     */
-    public function getModulesChoices($id)
-    {
-        if (!DolibarrApiAccess::$user->rights->zapier->read) {
-            throw new RestException(401);
-        }
-        $arraychoices = array(
-            'invoices' => 'Invoices',
-            'orders' => 'Orders',
-            'thirdparties' => 'Thirparties',
-            'contacts' => 'Contacts',
-        );
-        // $result = $this->hook->fetch($id);
-        // if (! $result ) {
-        //     throw new RestException(404, 'Hook not found');
-        // }
+	/**
+	 * Get list of possibles choices for module
+	 *
+	 * Return an array with hook informations
+	 * @param integer $id ID
+	 *
+	 * @return  array|mixed     data
+	 *
+	 * @url GET /getmoduleschoices/
+	 * @throws  RestException
+	 */
+	public function getModulesChoices($id)
+	{
+		if (!DolibarrApiAccess::$user->rights->zapier->read) {
+			throw new RestException(401);
+		}
+		$arraychoices = array(
+			'invoices' => 'Invoices',
+			'orders' => 'Orders',
+			'thirdparties' => 'Thirparties',
+			'contacts' => 'Contacts',
+		);
+		// $result = $this->hook->fetch($id);
+		// if (! $result ) {
+		//     throw new RestException(404, 'Hook not found');
+		// }
 
-        // if (! DolibarrApi::_checkAccessToResource('hook', $this->hook->id)) {
-        //     throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        // }
+		// if (! DolibarrApi::_checkAccessToResource('hook', $this->hook->id)) {
+		//     throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		// }
 
-        return $arraychoices;
-    }
+		return $arraychoices;
+	}
 
-    /**
-     * List hooks
-     *
-     * Get a list of hooks
-     *
-     * @param string           $sortfield           Sort field
-     * @param string           $sortorder           Sort order
-     * @param int              $limit               Limit for list
-     * @param int              $page                Page number
-     * @param string           $sqlfilters          Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"
-     * @return  array                               Array of order objects
-     *
-     * @throws RestException
-     *
-     * @url GET /hooks/
-     */
-    public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $sqlfilters = '')
-    {
-        global $db, $conf;
+	/**
+	 * List hooks
+	 *
+	 * Get a list of hooks
+	 *
+	 * @param string           $sortfield           Sort field
+	 * @param string           $sortorder           Sort order
+	 * @param int              $limit               Limit for list
+	 * @param int              $page                Page number
+	 * @param string           $sqlfilters          Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"
+	 * @return  array                               Array of order objects
+	 *
+	 * @throws RestException
+	 *
+	 * @url GET /hooks/
+	 */
+	public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $sqlfilters = '')
+	{
+		global $db, $conf;
 
-        $obj_ret = array();
+		$obj_ret = array();
 
-        $socid = DolibarrApiAccess::$user->socid ? DolibarrApiAccess::$user->socid : '';
+		$socid = DolibarrApiAccess::$user->socid ? DolibarrApiAccess::$user->socid : '';
 
-        // Set to 1 if there is a field socid in table of object
-        $restrictonsocid = 0;
+		// Set to 1 if there is a field socid in table of object
+		$restrictonsocid = 0;
 
-        // If the internal user must only see his customers, force searching by him
-        $search_sale = 0;
-        if ($restrictonsocid && !DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) {
-            $search_sale = DolibarrApiAccess::$user->id;
-        }
+		// If the internal user must only see his customers, force searching by him
+		$search_sale = 0;
+		if ($restrictonsocid && !DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) {
+			$search_sale = DolibarrApiAccess::$user->id;
+		}
 
-        $sql = "SELECT t.rowid";
-        if ($restrictonsocid && (!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) {
-            // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
-            $sql .= ", sc.fk_soc, sc.fk_user";
-        }
-        $sql .= " FROM ".MAIN_DB_PREFIX."hook_mytable as t";
+		$sql = "SELECT t.rowid";
+		if ($restrictonsocid && (!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) {
+			// We need these fields in order to filter by sale (including the case where the user can only see his prospects)
+			$sql .= ", sc.fk_soc, sc.fk_user";
+		}
+		$sql .= " FROM ".MAIN_DB_PREFIX."hook_mytable as t";
 
-        if ($restrictonsocid && (!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
-        $sql .= " WHERE 1 = 1";
+		if ($restrictonsocid && (!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
+		$sql .= " WHERE 1 = 1";
 
-        // Example of use $mode
-        //if ($mode == 1) $sql.= " AND s.client IN (1, 3)";
-        //if ($mode == 2) $sql.= " AND s.client IN (2, 3)";
+		// Example of use $mode
+		//if ($mode == 1) $sql.= " AND s.client IN (1, 3)";
+		//if ($mode == 2) $sql.= " AND s.client IN (2, 3)";
 
-        $tmpobject = new Hook($this->db);
-        if ($tmpobject->ismultientitymanaged) {
-            $sql .= ' AND t.entity IN ('.getEntity('hook').')';
-        }
-        if ($restrictonsocid && (!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) {
-            $sql .= " AND t.fk_soc = sc.fk_soc";
-        }
-        if ($restrictonsocid && $socid) {
-            $sql .= " AND t.fk_soc = ".$socid;
-        }
-        if ($restrictonsocid && $search_sale > 0) {
-            // Join for the needed table to filter by sale
-            $sql .= " AND t.rowid = sc.fk_soc";
-        }
-        // Insert sale filter
-        if ($restrictonsocid && $search_sale > 0) {
-            $sql .= " AND sc.fk_user = ".$search_sale;
-        }
-        if ($sqlfilters) {
-            if (!DolibarrApi::_checkFilters($sqlfilters)) {
-                throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
-            }
-            $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-        }
+		$tmpobject = new Hook($this->db);
+		if ($tmpobject->ismultientitymanaged) {
+			$sql .= ' AND t.entity IN ('.getEntity('hook').')';
+		}
+		if ($restrictonsocid && (!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) {
+			$sql .= " AND t.fk_soc = sc.fk_soc";
+		}
+		if ($restrictonsocid && $socid) {
+			$sql .= " AND t.fk_soc = ".$socid;
+		}
+		if ($restrictonsocid && $search_sale > 0) {
+			// Join for the needed table to filter by sale
+			$sql .= " AND t.rowid = sc.fk_soc";
+		}
+		// Insert sale filter
+		if ($restrictonsocid && $search_sale > 0) {
+			$sql .= " AND sc.fk_user = ".$search_sale;
+		}
+		if ($sqlfilters) {
+			if (!DolibarrApi::_checkFilters($sqlfilters)) {
+				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+			}
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
 
-        $sql .= $this->db->order($sortfield, $sortorder);
-        if ($limit) {
-            if ($page < 0) {
-                $page = 0;
-            }
-            $offset = $limit * $page;
+		$sql .= $this->db->order($sortfield, $sortorder);
+		if ($limit) {
+			if ($page < 0) {
+				$page = 0;
+			}
+			$offset = $limit * $page;
 
-            $sql .= $this->db->plimit($limit + 1, $offset);
-        }
+			$sql .= $this->db->plimit($limit + 1, $offset);
+		}
 
-        $result = $this->db->query($sql);
-        $i = 0;
-        if ($result) {
-            $num = $this->db->num_rows($result);
-            while ($i < $num) {
-                $obj = $this->db->fetch_object($result);
-                $hook_static = new Hook($this->db);
-                if ($hook_static->fetch($obj->rowid)) {
-                    $obj_ret[] = $this->_cleanObjectDatas($hook_static);
-                }
-                $i++;
-            }
-        } else {
-            throw new RestException(503, 'Error when retrieve hook list');
-        }
-        if (!count($obj_ret)) {
-            throw new RestException(404, 'No hook found');
-        }
-        return $obj_ret;
-    }
+		$result = $this->db->query($sql);
+		$i = 0;
+		if ($result) {
+			$num = $this->db->num_rows($result);
+			while ($i < $num) {
+				$obj = $this->db->fetch_object($result);
+				$hook_static = new Hook($this->db);
+				if ($hook_static->fetch($obj->rowid)) {
+					$obj_ret[] = $this->_cleanObjectDatas($hook_static);
+				}
+				$i++;
+			}
+		} else {
+			throw new RestException(503, 'Error when retrieve hook list');
+		}
+		if (!count($obj_ret)) {
+			throw new RestException(404, 'No hook found');
+		}
+		return $obj_ret;
+	}
 
-    /**
-     * Create hook object
-     *
-     * @param array $request_data   Request datas
-     * @return int  ID of hook
-     *
-     * @url	POST /hook/
-     */
-    public function post($request_data = null)
-    {
-        if (!DolibarrApiAccess::$user->rights->zapier->write) {
-            throw new RestException(401);
-        }
-        // Check mandatory fields
-        $fields = array(
-            'url',
-        );
-        $result = $this->validate($request_data, $fields);
+	/**
+	 * Create hook object
+	 *
+	 * @param array $request_data   Request datas
+	 * @return int  ID of hook
+	 *
+	 * @url	POST /hook/
+	 */
+	public function post($request_data = null)
+	{
+		if (!DolibarrApiAccess::$user->rights->zapier->write) {
+			throw new RestException(401);
+		}
+		// Check mandatory fields
+		$fields = array(
+			'url',
+		);
+		$result = $this->validate($request_data, $fields);
 
-        foreach ($request_data as $field => $value) {
-            $this->hook->$field = $value;
-        }
-        $this->hook->fk_user = DolibarrApiAccess::$user->id;
-        // on crée le hook dans la base
-        if (!$this->hook->create(DolibarrApiAccess::$user)) {
-            throw new RestException(500, "Error creating Hook", array_merge(array($this->hook->error), $this->hook->errors));
-        }
-        return array(
-            'id' => $this->hook->id,
-        );
-    }
+		foreach ($request_data as $field => $value) {
+			$this->hook->$field = $value;
+		}
+		$this->hook->fk_user = DolibarrApiAccess::$user->id;
+		// on crée le hook dans la base
+		if (!$this->hook->create(DolibarrApiAccess::$user)) {
+			throw new RestException(500, "Error creating Hook", array_merge(array($this->hook->error), $this->hook->errors));
+		}
+		return array(
+			'id' => $this->hook->id,
+		);
+	}
 
-    // /**
-    //  * Update hook
-    //  *
-    //  * @param int   $id             Id of hook to update
-    //  * @param array $request_data   Datas
-    //  * @return int
-    //  *
-    //  * @url	PUT /hooks/{id}
-    //  */
-    /*public function put($id, $request_data = null)
+	// /**
+	//  * Update hook
+	//  *
+	//  * @param int   $id             Id of hook to update
+	//  * @param array $request_data   Datas
+	//  * @return int
+	//  *
+	//  * @url	PUT /hooks/{id}
+	//  */
+	/*public function put($id, $request_data = null)
     {
         if (! DolibarrApiAccess::$user->rights->zapier->write) {
             throw new RestException(401);
@@ -297,80 +297,80 @@ class ZapierApi extends DolibarrApi
         }
     }*/
 
-    /**
-     * Delete hook
-     *
-     * @param   int     $id   Hook ID
-     * @return  array
-     *
-     * @url DELETE /hook/{id}
-     */
-    public function delete($id)
-    {
-        if (!DolibarrApiAccess::$user->rights->zapier->delete) {
-            throw new RestException(401);
-        }
-        $result = $this->hook->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Hook not found');
-        }
+	/**
+	 * Delete hook
+	 *
+	 * @param   int     $id   Hook ID
+	 * @return  array
+	 *
+	 * @url DELETE /hook/{id}
+	 */
+	public function delete($id)
+	{
+		if (!DolibarrApiAccess::$user->rights->zapier->delete) {
+			throw new RestException(401);
+		}
+		$result = $this->hook->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Hook not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('hook', $this->hook->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('hook', $this->hook->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        if (!$this->hook->delete(DolibarrApiAccess::$user)) {
-            throw new RestException(500, 'Error when deleting Hook : '.$this->hook->error);
-        }
+		if (!$this->hook->delete(DolibarrApiAccess::$user)) {
+			throw new RestException(500, 'Error when deleting Hook : '.$this->hook->error);
+		}
 
-        return array(
-            'success' => array(
-                'code' => 200,
-                'message' => 'Hook deleted'
-            )
-        );
-    }
+		return array(
+			'success' => array(
+				'code' => 200,
+				'message' => 'Hook deleted'
+			)
+		);
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
-    /**
-     * Clean sensible object datas
-     *
-     * @param   object  $object    Object to clean
-     * @return  array    Array of cleaned object properties
-     */
-    public function _cleanObjectDatas($object)
-    {
-        // phpcs:disable
-        $object = parent::_cleanObjectDatas($object);
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	/**
+	 * Clean sensible object datas
+	 *
+	 * @param   Object  $object     Object to clean
+	 * @return  Object              Object with cleaned properties
+	 */
+	public function _cleanObjectDatas($object)
+	{
+		// phpcs:disable
+		$object = parent::_cleanObjectDatas($object);
 
-        /*unset($object->note);
+		/*unset($object->note);
         unset($object->address);
         unset($object->barcode_type);
         unset($object->barcode_type_code);
         unset($object->barcode_type_label);
         unset($object->barcode_type_coder);*/
 
-        return $object;
-    }
+		return $object;
+	}
 
-    /**
-     * Validate fields before create or update object
-     *
-     * @param   array       $data       Array of data to validate
-     * @param   array       $fields     Array of fields needed
-     * @return  array
-     *
-     * @throws  RestException
-     */
-    private function validate($data, $fields)
-    {
-        $hook = array();
-        foreach ($fields as $field) {
-            if (!isset($data[$field])) {
-                throw new RestException(400, $field." field missing");
-            }
-            $hook[$field] = $data[$field];
-        }
-        return $hook;
-    }
+	/**
+	 * Validate fields before create or update object
+	 *
+	 * @param   array       $data       Array of data to validate
+	 * @param   array       $fields     Array of fields needed
+	 * @return  array
+	 *
+	 * @throws  RestException
+	 */
+	private function validate($data, $fields)
+	{
+		$hook = array();
+		foreach ($fields as $field) {
+			if (!isset($data[$field])) {
+				throw new RestException(400, $field." field missing");
+			}
+			$hook[$field] = $data[$field];
+		}
+		return $hook;
+	}
 }
diff --git a/htdocs/zapier/hook_agenda.php b/htdocs/zapier/hook_agenda.php
index 87382c82aa9..6ae9d7d57aa 100644
--- a/htdocs/zapier/hook_agenda.php
+++ b/htdocs/zapier/hook_agenda.php
@@ -42,10 +42,10 @@ $cancel     = GETPOST('cancel', 'aZ09');
 $backtopage = GETPOST('backtopage', 'alpha');
 
 if (GETPOST('actioncode', 'array')) {
-    $actioncode = GETPOST('actioncode', 'array', 3);
-    if (!count($actioncode)) $actioncode = '0';
+	$actioncode = GETPOST('actioncode', 'array', 3);
+	if (!count($actioncode)) $actioncode = '0';
 } else {
-    $actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT));
+	$actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT));
 }
 $search_agenda_label = GETPOST('search_agenda_label');
 
@@ -89,17 +89,17 @@ $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
 if (empty($reshook)) {
-    // Cancel
-    if (GETPOST('cancel', 'alpha') && !empty($backtopage)) {
-        header("Location: ".$backtopage);
-        exit;
-    }
+	// Cancel
+	if (GETPOST('cancel', 'alpha') && !empty($backtopage)) {
+		header("Location: ".$backtopage);
+		exit;
+	}
 
-    // Purge search criteria
-    if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All tests are required to be compatible with all browsers
+	// Purge search criteria
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All tests are required to be compatible with all browsers
 		$actioncode = '';
-        $search_agenda_label = '';
-    }
+		$search_agenda_label = '';
+	}
 }
 
 
@@ -173,62 +173,62 @@ if ($object->id > 0) {
 
 	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>';
 
-    $object->info($object->id);
+	$object->info($object->id);
 	dol_print_object_info($object, 1);
 
 	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 
 
 	// Actions buttons
 
-    $objthirdparty = $object;
-    $objcon = new stdClass();
+	$objthirdparty = $object;
+	$objcon = new stdClass();
 
-    $out = '';
-    $permok = $user->rights->agenda->myactions->create;
-    if ((!empty($objthirdparty->id) || !empty($objcon->id)) && $permok) {
-        //$out.='<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create';
-        if (get_class($objthirdparty) == 'Societe') $out .= '&amp;socid='.$objthirdparty->id;
-        $out .= (!empty($objcon->id) ? '&amp;contactid='.$objcon->id : '').'&amp;backtopage=1&amp;percentage=-1';
-    	//$out.=$langs->trans("AddAnAction").' ';
-    	//$out.=img_picto($langs->trans("AddAnAction"),'filenew');
-    	//$out.="</a>";
+	$out = '';
+	$permok = $user->rights->agenda->myactions->create;
+	if ((!empty($objthirdparty->id) || !empty($objcon->id)) && $permok) {
+		//$out.='<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create';
+		if (get_class($objthirdparty) == 'Societe') $out .= '&amp;socid='.$objthirdparty->id;
+		$out .= (!empty($objcon->id) ? '&amp;contactid='.$objcon->id : '').'&amp;backtopage=1&amp;percentage=-1';
+		//$out.=$langs->trans("AddAnAction").' ';
+		//$out.=img_picto($langs->trans("AddAnAction"),'filenew');
+		//$out.="</a>";
 	}
 
 
 	print '<div class="tabsAction">';
 
-    if (!empty($conf->agenda->enabled)) {
-    	if (!empty($user->rights->agenda->myactions->create) || !empty($user->rights->agenda->allactions->create)) {
-        	print '<a class="butAction" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create'.$out.'">'.$langs->trans("AddAction").'</a>';
-    	} else {
-        	print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans("AddAction").'</a>';
-    	}
-    }
+	if (!empty($conf->agenda->enabled)) {
+		if (!empty($user->rights->agenda->myactions->create) || !empty($user->rights->agenda->allactions->create)) {
+			print '<a class="butAction" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create'.$out.'">'.$langs->trans("AddAction").'</a>';
+		} else {
+			print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans("AddAction").'</a>';
+		}
+	}
 
-    print '</div>';
+	print '</div>';
 
-    if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) {
-        $param = '&socid='.$socid;
-        if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
-        if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
+	if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) {
+		$param = '&socid='.$socid;
+		if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
+		if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
 
 
 		print load_fiche_titre($langs->trans("ActionsOnMyObject"), '', '');
 
-        // List of all actions
+		// List of all actions
 		$filters = array();
-        $filters['search_agenda_label'] = $search_agenda_label;
+		$filters['search_agenda_label'] = $search_agenda_label;
 
-        // TODO Replace this with same code than into list.php
-        //show_actions_done($conf,$langs,$db,$object,null,0,$actioncode, '', $filters, $sortfield, $sortorder);
-    }
+		// TODO Replace this with same code than into list.php
+		//show_actions_done($conf,$langs,$db,$object,null,0,$actioncode, '', $filters, $sortfield, $sortorder);
+	}
 }
 
 // End of page
diff --git a/htdocs/zapier/hook_card.php b/htdocs/zapier/hook_card.php
index e7c1cc087e6..ab081f1cf58 100644
--- a/htdocs/zapier/hook_card.php
+++ b/htdocs/zapier/hook_card.php
@@ -160,7 +160,7 @@ if ($action == 'create') {
 
 	print '</table>'."\n";
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div class="center">';
 	print '<input type="submit" class="button" name="add" value="'.dol_escape_htmltag($langs->trans("Create")).'">';
@@ -193,7 +193,7 @@ if (($id || $ref) && $action == 'edit') {
 
 	print '</table>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div class="center"><input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
 	print ' &nbsp; <input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
@@ -315,7 +315,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 	print '<div class="clearboth"></div><br>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 
 	// Buttons for actions
diff --git a/htdocs/zapier/hook_document.php b/htdocs/zapier/hook_document.php
index 5bfb18491ca..15ec591bea6 100644
--- a/htdocs/zapier/hook_document.php
+++ b/htdocs/zapier/hook_document.php
@@ -114,9 +114,9 @@ if ($object->id) {
 
 	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
 
-    print '<div class="fichecenter">';
+	print '<div class="fichecenter">';
 
-    print '<div class="underbanner clearboth"></div>';
+	print '<div class="underbanner clearboth"></div>';
 	print '<table class="border centpercent">';
 
 	// Number of files
@@ -129,7 +129,7 @@ if ($object->id) {
 
 	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 } else {
 	accessforbidden('', 0, 0);
 }
diff --git a/htdocs/zapier/hook_list.php b/htdocs/zapier/hook_list.php
index 9e987d88322..8450ec3e0d8 100644
--- a/htdocs/zapier/hook_list.php
+++ b/htdocs/zapier/hook_list.php
@@ -53,8 +53,8 @@ $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : (int) GETPOST("page", 'int');
 if (empty($page) || $page == -1 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha') || (empty($toselect) && $massaction === '0')) {
-    // If $page is not defined, or '' or -1 or if we click on clear filters or if we select empty mass action
-    $page = 0;
+	// If $page is not defined, or '' or -1 or if we click on clear filters or if we select empty mass action
+	$page = 0;
 }
 $offset = $limit * $page;
 $pageprev = $page - 1;
@@ -76,19 +76,19 @@ $search_array_options = $extrafields->getOptionalsFromPost($object->table_elemen
 
 // Default sort order (if not yet defined by previous GETPOST)
 if (!$sortfield) {
-    // Set here default search field. By default 1st field in definition.
-    $sortfield = "t.".key($object->fields);
+	// Set here default search field. By default 1st field in definition.
+	$sortfield = "t.".key($object->fields);
 }
 if (!$sortorder) {
-    $sortorder = "ASC";
+	$sortorder = "ASC";
 }
 
 // Security check
 $socid = 0;
 if ($user->socid > 0) {
-    // Protection if external user
-    //$socid = $user->socid;
-    accessforbidden();
+	// Protection if external user
+	//$socid = $user->socid;
+	accessforbidden();
 }
 //$result = restrictedArea($user, 'zapier', $id, '');
 
@@ -96,27 +96,27 @@ if ($user->socid > 0) {
 $search_all = GETPOST("search_all", 'alpha');
 $search = array();
 foreach ($object->fields as $key => $val) {
-    if (GETPOST('search_'.$key, 'alpha')) $search[$key] = GETPOST('search_'.$key, 'alpha');
+	if (GETPOST('search_'.$key, 'alpha')) $search[$key] = GETPOST('search_'.$key, 'alpha');
 }
 
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array();
 foreach ($object->fields as $key => $val) {
-    if ($val['searchall']) $fieldstosearchall['t.'.$key] = $val['label'];
+	if ($val['searchall']) $fieldstosearchall['t.'.$key] = $val['label'];
 }
 
 // Definition of fields for list
 $arrayfields = array();
 foreach ($object->fields as $key => $val) {
-    // If $val['visible']==0, then we never show the field
-    if (!empty($val['visible'])) $arrayfields['t.'.$key] = array('label'=>$val['label'], 'checked'=>(($val['visible'] < 0) ? 0 : 1), 'enabled'=>$val['enabled'], 'position'=>$val['position']);
+	// If $val['visible']==0, then we never show the field
+	if (!empty($val['visible'])) $arrayfields['t.'.$key] = array('label'=>$val['label'], 'checked'=>(($val['visible'] < 0) ? 0 : 1), 'enabled'=>$val['enabled'], 'position'=>$val['position']);
 }
 // Extra fields
 if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0) {
-    foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
-        if (!empty($extrafields->attributes[$object->table_element]['list'][$key]))
-            $arrayfields["ef.".$key] = array('label'=>$extrafields->attributes[$object->table_element]['label'][$key], 'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1), 'position'=>$extrafields->attributes[$object->table_element]['pos'][$key], 'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key]));
-    }
+	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
+		if (!empty($extrafields->attributes[$object->table_element]['list'][$key]))
+			$arrayfields["ef.".$key] = array('label'=>$extrafields->attributes[$object->table_element]['label'][$key], 'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1), 'position'=>$extrafields->attributes[$object->table_element]['pos'][$key], 'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key]));
+	}
 }
 $object->fields = dol_sort_array($object->fields, 'position');
 $arrayfields = dol_sort_array($arrayfields, 'position');
@@ -128,11 +128,11 @@ $arrayfields = dol_sort_array($arrayfields, 'position');
  */
 
 if (GETPOST('cancel', 'alpha')) {
-    $action = 'list';
-    $massaction = '';
+	$action = 'list';
+	$massaction = '';
 }
 if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') {
-    $massaction = '';
+	$massaction = '';
 }
 
 $parameters = array();
@@ -140,30 +140,30 @@ $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
 if (empty($reshook)) {
-    // Selection of new fields
-    include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
+	// Selection of new fields
+	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
-    // Purge search criteria
-    if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) {
-        // All tests are required to be compatible with all browsers
-        foreach ($object->fields as $key => $val) {
-            $search[$key] = '';
-        }
-        $toselect = '';
-        $search_array_options = array();
-    }
-    if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')
-        || GETPOST('button_search_x', 'alpha') || GETPOST('button_search.x', 'alpha') || GETPOST('button_search', 'alpha')) {
-        $massaction = ''; // Protection to avoid mass action if we force a new search during a mass action confirmation
-    }
+	// Purge search criteria
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) {
+		// All tests are required to be compatible with all browsers
+		foreach ($object->fields as $key => $val) {
+			$search[$key] = '';
+		}
+		$toselect = '';
+		$search_array_options = array();
+	}
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')
+		|| GETPOST('button_search_x', 'alpha') || GETPOST('button_search.x', 'alpha') || GETPOST('button_search', 'alpha')) {
+		$massaction = ''; // Protection to avoid mass action if we force a new search during a mass action confirmation
+	}
 
-    // Mass actions
-    $objectclass = 'Hook';
-    $objectlabel = 'Hook';
-    $permissiontoread = $user->rights->zapier->read;
-    $permissiontodelete = $user->rights->zapier->delete;
-    $uploaddir = $conf->zapier->dir_output;
-    include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
+	// Mass actions
+	$objectclass = 'Hook';
+	$objectlabel = 'Hook';
+	$permissiontoread = $user->rights->zapier->read;
+	$permissiontodelete = $user->rights->zapier->delete;
+	$uploaddir = $conf->zapier->dir_output;
+	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }
 
 
@@ -185,13 +185,13 @@ $title = $langs->trans('ListOf', $langs->transnoentitiesnoconv("Hooks"));
 // --------------------------------------------------------------------
 $sql = 'SELECT ';
 foreach ($object->fields as $key => $val) {
-    $sql .= 't.'.$key.', ';
+	$sql .= 't.'.$key.', ';
 }
 // Add fields from extrafields
 if (!empty($extrafields->attributes[$object->table_element]['label'])) {
-    foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
-        $sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? "ef.".$key.' as options_'.$key.', ' : '');
-    }
+	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
+		$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? "ef.".$key.' as options_'.$key.', ' : '');
+	}
 }
 // Add fields from hooks
 $parameters = array();
@@ -201,21 +201,21 @@ $sql = preg_replace('/, $/', '', $sql);
 $sql .= " FROM ".MAIN_DB_PREFIX.$object->table_element." as t";
 if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (t.rowid = ef.fk_object)";
 if ($object->ismultientitymanaged == 1) {
-    $sql .= " WHERE t.entity IN (".getEntity($object->element).")";
+	$sql .= " WHERE t.entity IN (".getEntity($object->element).")";
 } else {
-    $sql .= " WHERE 1 = 1";
+	$sql .= " WHERE 1 = 1";
 }
 foreach ($search as $key => $val) {
-    if ($key == 'status' && $search[$key] == -1) {
-        continue;
-    }
-    $mode_search = (($object->isInt($object->fields[$key]) || $object->isFloat($object->fields[$key])) ? 1 : 0);
-    if ($search[$key] != '') {
-        $sql .= natural_search($key, $search[$key], (($key == 'status') ? 2 : $mode_search));
-    }
+	if ($key == 'status' && $search[$key] == -1) {
+		continue;
+	}
+	$mode_search = (($object->isInt($object->fields[$key]) || $object->isFloat($object->fields[$key])) ? 1 : 0);
+	if ($search[$key] != '') {
+		$sql .= natural_search($key, $search[$key], (($key == 'status') ? 2 : $mode_search));
+	}
 }
 if ($search_all) {
-    $sql .= natural_search(array_keys($fieldstosearchall), $search_all);
+	$sql .= natural_search(array_keys($fieldstosearchall), $search_all);
 }
 // Add where from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
@@ -245,35 +245,35 @@ $sql .= $db->order($sortfield, $sortorder);
 // Count total nb of records
 $nbtotalofrecords = '';
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
-    $resql = $db->query($sql);
-    $nbtotalofrecords = $db->num_rows($resql);
-    if (($page * $limit) > $nbtotalofrecords) {
-        // if total of record found is smaller than page * limit, goto and load page 0
-        $page = 0;
-        $offset = 0;
-    }
+	$resql = $db->query($sql);
+	$nbtotalofrecords = $db->num_rows($resql);
+	if (($page * $limit) > $nbtotalofrecords) {
+		// if total of record found is smaller than page * limit, goto and load page 0
+		$page = 0;
+		$offset = 0;
+	}
 }
 // if total of record found is smaller than limit, no need to do paging and to restart another select with limits set.
 if (is_numeric($nbtotalofrecords) && $limit > $nbtotalofrecords) {
-    $num = $nbtotalofrecords;
+	$num = $nbtotalofrecords;
 } else {
-    $sql .= $db->plimit($limit + 1, $offset);
+	$sql .= $db->plimit($limit + 1, $offset);
 
-    $resql = $db->query($sql);
-    if (!$resql) {
-        dol_print_error($db);
-        exit;
-    }
+	$resql = $db->query($sql);
+	if (!$resql) {
+		dol_print_error($db);
+		exit;
+	}
 
-    $num = $db->num_rows($resql);
+	$num = $db->num_rows($resql);
 }
 
 // Direct jump if only one record found
 if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $search_all) {
-    $obj = $db->fetch_object($resql);
-    $id = $obj->rowid;
-    header("Location: ".dol_buildpath('/zapierfordolibarr/hook_card.php', 1).'?id='.$id);
-    exit;
+	$obj = $db->fetch_object($resql);
+	$id = $obj->rowid;
+	header("Location: ".dol_buildpath('/zapierfordolibarr/hook_card.php', 1).'?id='.$id);
+	exit;
 }
 
 
@@ -303,13 +303,13 @@ $param = '';
 if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
 if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
 foreach ($search as $key => $val) {
-    if (is_array($search[$key]) && count($search[$key])) {
-        foreach ($search[$key] as $skey) {
-            $param .= '&search_'.$key.'[]='.urlencode($skey);
-        }
-    } else {
-        $param .= '&search_'.$key.'='.urlencode($search[$key]);
-    }
+	if (is_array($search[$key]) && count($search[$key])) {
+		foreach ($search[$key] as $skey) {
+			$param .= '&search_'.$key.'[]='.urlencode($skey);
+		}
+	} else {
+		$param .= '&search_'.$key.'='.urlencode($search[$key]);
+	}
 }
 if ($optioncss != '')     $param .= '&optioncss='.urlencode($optioncss);
 // Add $param from extra fields
@@ -317,8 +317,8 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 
 // List of mass actions available
 $arrayofmassactions = array(
-    //'presend'=>$langs->trans("SendByMail"),
-    //'builddoc'=>$langs->trans("PDFMerge"),
+	//'presend'=>$langs->trans("SendByMail"),
+	//'builddoc'=>$langs->trans("PDFMerge"),
 );
 if ($user->rights->zapier->delete) $arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
 if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
@@ -337,9 +337,9 @@ print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 $newcardbutton = '';
 //if ($user->rights->zapier->creer)
 //{
-    $newcardbutton = '<a class="butActionNew" href="hook_card.php?action=create&backtopage='.urlencode($_SERVER['PHP_SELF']).'"><span class="valignmiddle text-plus-circle">'.$langs->trans('New').'</span>';
-    $newcardbutton .= '<span class="fa fa-plus-circle valignmiddle"></span>';
-    $newcardbutton .= '</a>';
+	$newcardbutton = '<a class="butActionNew" href="hook_card.php?action=create&backtopage='.urlencode($_SERVER['PHP_SELF']).'"><span class="valignmiddle text-plus-circle">'.$langs->trans('New').'</span>';
+	$newcardbutton .= '<span class="fa fa-plus-circle valignmiddle"></span>';
+	$newcardbutton .= '</a>';
 //}
 //else
 //{
@@ -358,8 +358,8 @@ $trackid = 'xxxx'.$object->id;
 include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
 if ($sall) {
-    foreach ($fieldstosearchall as $key => $val) $fieldstosearchall[$key] = $langs->trans($val);
-    print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall).join(', ', $fieldstosearchall).'</div>';
+	foreach ($fieldstosearchall as $key => $val) $fieldstosearchall[$key] = $langs->trans($val);
+	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall).join(', ', $fieldstosearchall).'</div>';
 }
 
 $moreforfilter = '';
@@ -373,9 +373,9 @@ if (empty($reshook)) $moreforfilter .= $hookmanager->resPrint;
 else $moreforfilter = $hookmanager->resPrint;
 
 if (!empty($moreforfilter)) {
-    print '<div class="liste_titre liste_titre_bydiv centpercent">';
-    print $moreforfilter;
-    print '</div>';
+	print '<div class="liste_titre liste_titre_bydiv centpercent">';
+	print $moreforfilter;
+	print '</div>';
 }
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
@@ -390,22 +390,22 @@ print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" :
 // --------------------------------------------------------------------
 print '<tr class="liste_titre">';
 foreach ($object->fields as $key => $val) {
-    $cssforfield = '';
-    if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
-        $cssforfield .= ($cssforfield ? ' ' : '').'center';
-    }
-    if (in_array($val['type'], array('timestamp'))) {
-        $cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
-    }
-    if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real'))) {
-        $cssforfield .= ($cssforfield ? ' ' : '').'right';
-    }
-    if ($key == 'status') {
-        $cssforfield .= ($cssforfield ? ' ' : '').'center';
-    }
-    if (!empty($arrayfields['t.'.$key]['checked'])) {
-        print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'"><input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'"></td>';
-    }
+	$cssforfield = '';
+	if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
+		$cssforfield .= ($cssforfield ? ' ' : '').'center';
+	}
+	if (in_array($val['type'], array('timestamp'))) {
+		$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+	}
+	if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real'))) {
+		$cssforfield .= ($cssforfield ? ' ' : '').'right';
+	}
+	if ($key == 'status') {
+		$cssforfield .= ($cssforfield ? ' ' : '').'center';
+	}
+	if (!empty($arrayfields['t.'.$key]['checked'])) {
+		print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'"><input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'"></td>';
+	}
 }
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
@@ -426,25 +426,25 @@ print '</tr>'."\n";
 // --------------------------------------------------------------------
 print '<tr class="liste_titre">';
 foreach ($object->fields as $key => $val) {
-    $cssforfield = '';
-    if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) $cssforfield .= ($cssforfield ? ' ' : '').'center';
-    if (in_array($val['type'], array('timestamp'))) $cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
-    if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real'))) $cssforfield .= ($cssforfield ? ' ' : '').'right';
-    if ($key == 'status') {
-        $cssforfield .= ($cssforfield ? ' ' : '').'center';
-    }
-    if (!empty($arrayfields['t.'.$key]['checked'])) {
-        print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($cssforfield ? 'class="'.$cssforfield.'"' : ''), $sortfield, $sortorder, ($cssforfield ? $cssforfield.' ' : ''))."\n";
-    }
+	$cssforfield = '';
+	if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) $cssforfield .= ($cssforfield ? ' ' : '').'center';
+	if (in_array($val['type'], array('timestamp'))) $cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+	if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real'))) $cssforfield .= ($cssforfield ? ' ' : '').'right';
+	if ($key == 'status') {
+		$cssforfield .= ($cssforfield ? ' ' : '').'center';
+	}
+	if (!empty($arrayfields['t.'.$key]['checked'])) {
+		print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($cssforfield ? 'class="'.$cssforfield.'"' : ''), $sortfield, $sortorder, ($cssforfield ? $cssforfield.' ' : ''))."\n";
+	}
 }
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 // Hook fields
 $parameters = array(
-    'arrayfields' => $arrayfields,
-    'param' => $param,
-    'sortfield' => $sortfield,
-    'sortorder' => $sortorder,
+	'arrayfields' => $arrayfields,
+	'param' => $param,
+	'sortfield' => $sortfield,
+	'sortorder' => $sortorder,
 );
 $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
@@ -456,12 +456,12 @@ print '</tr>'."\n";
 // Detect if we need a fetch on each output line
 $needToFetchEachLine = 0;
 if (is_array($extrafields->attributes[$object->table_element]['computed']) && count($extrafields->attributes[$object->table_element]['computed']) > 0) {
-    foreach ($extrafields->attributes[$object->table_element]['computed'] as $key => $val) {
-        if (preg_match('/\$object/', $val)) {
-            // There is at least one compute field that use $object
-            $needToFetchEachLine++;
-        }
-    }
+	foreach ($extrafields->attributes[$object->table_element]['computed'] as $key => $val) {
+		if (preg_match('/\$object/', $val)) {
+			// There is at least one compute field that use $object
+			$needToFetchEachLine++;
+		}
+	}
 }
 
 
@@ -470,71 +470,71 @@ if (is_array($extrafields->attributes[$object->table_element]['computed']) && co
 $i = 0;
 $totalarray = array();
 while ($i < min($num, $limit)) {
-    $obj = $db->fetch_object($resql);
-    if (empty($obj)) {
-        break; // Should not happen
-    }
+	$obj = $db->fetch_object($resql);
+	if (empty($obj)) {
+		break; // Should not happen
+	}
 
-    // Store properties in $object
-    $object->id = $obj->rowid;
-    foreach ($object->fields as $key => $val) {
-        if (isset($obj->$key)) $object->$key = $obj->$key;
-    }
+	// Store properties in $object
+	$object->id = $obj->rowid;
+	foreach ($object->fields as $key => $val) {
+		if (isset($obj->$key)) $object->$key = $obj->$key;
+	}
 
-    // Show here line of result
-    print '<tr class="oddeven">';
-    foreach ($object->fields as $key => $val) {
-        $cssforfield = '';
-        if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
-            $cssforfield .= ($cssforfield ? ' ' : '').'center';
-        } elseif ($key == 'status') {
-            $cssforfield .= ($cssforfield ? ' ' : '').'center';
-        }
+	// Show here line of result
+	print '<tr class="oddeven">';
+	foreach ($object->fields as $key => $val) {
+		$cssforfield = '';
+		if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
+			$cssforfield .= ($cssforfield ? ' ' : '').'center';
+		} elseif ($key == 'status') {
+			$cssforfield .= ($cssforfield ? ' ' : '').'center';
+		}
 
-        if (in_array($val['type'], array('timestamp'))) $cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
-        elseif ($key == 'ref') $cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+		if (in_array($val['type'], array('timestamp'))) $cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+		elseif ($key == 'ref') $cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
 
-        if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real'))) $cssforfield .= ($cssforfield ? ' ' : '').'right';
+		if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real'))) $cssforfield .= ($cssforfield ? ' ' : '').'right';
 
-        if (!empty($arrayfields['t.'.$key]['checked'])) {
-            print '<td';
-            if ($cssforfield || $val['css']) print ' class="';
-            print $cssforfield;
-            if ($cssforfield && $val['css']) print ' ';
-            print $val['css'];
-            if ($cssforfield || $val['css']) print '"';
-            print '>';
-            if ($key == 'status') print $object->getLibStatut(5);
-            elseif (in_array($val['type'], array('date', 'datetime', 'timestamp'))) print $object->showOutputField($val, $key, $db->jdate($obj->$key), '');
-            else print $object->showOutputField($val, $key, $obj->$key, '');
-            print '</td>';
-            if (!$i) $totalarray['nbfield']++;
-            if (!empty($val['isameasure'])) {
-                if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 't.'.$key;
-                $totalarray['val']['t.'.$key] += $obj->$key;
-            }
-        }
-    }
-    // Extra fields
-    include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
-    // Fields from hook
-    $parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
-    $reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object); // Note that $action and $object may have been modified by hook
-    print $hookmanager->resPrint;
-    // Action column
-    print '<td class="nowrap center">';
-    if ($massactionbutton || $massaction) {
-        // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-        $selected = 0;
-        if (in_array($obj->rowid, $arrayofselected)) $selected = 1;
-        print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
-    }
-    print '</td>';
-    if (!$i) $totalarray['nbfield']++;
+		if (!empty($arrayfields['t.'.$key]['checked'])) {
+			print '<td';
+			if ($cssforfield || $val['css']) print ' class="';
+			print $cssforfield;
+			if ($cssforfield && $val['css']) print ' ';
+			print $val['css'];
+			if ($cssforfield || $val['css']) print '"';
+			print '>';
+			if ($key == 'status') print $object->getLibStatut(5);
+			elseif (in_array($val['type'], array('date', 'datetime', 'timestamp'))) print $object->showOutputField($val, $key, $db->jdate($obj->$key), '');
+			else print $object->showOutputField($val, $key, $obj->$key, '');
+			print '</td>';
+			if (!$i) $totalarray['nbfield']++;
+			if (!empty($val['isameasure'])) {
+				if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 't.'.$key;
+				$totalarray['val']['t.'.$key] += $obj->$key;
+			}
+		}
+	}
+	// Extra fields
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
+	// Fields from hook
+	$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
+	$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object); // Note that $action and $object may have been modified by hook
+	print $hookmanager->resPrint;
+	// Action column
+	print '<td class="nowrap center">';
+	if ($massactionbutton || $massaction) {
+		// If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+		$selected = 0;
+		if (in_array($obj->rowid, $arrayofselected)) $selected = 1;
+		print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
+	}
+	print '</td>';
+	if (!$i) $totalarray['nbfield']++;
 
-    print '</tr>';
+	print '</tr>';
 
-    $i++;
+	$i++;
 }
 
 // Show total line
@@ -543,21 +543,21 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
 
 // If no record found
 if ($num == 0) {
-    $colspan = 1;
-    foreach ($arrayfields as $key => $val) {
-        if (!empty($val['checked'])) {
-            $colspan++;
-        }
-    }
-    print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoRecordFound").'</td></tr>';
+	$colspan = 1;
+	foreach ($arrayfields as $key => $val) {
+		if (!empty($val['checked'])) {
+			$colspan++;
+		}
+	}
+	print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoRecordFound").'</td></tr>';
 }
 
 
 $db->free($resql);
 
 $parameters = array(
-    'arrayfields' => $arrayfields,
-    'sql' => $sql,
+	'arrayfields' => $arrayfields,
+	'sql' => $sql,
 );
 $reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
@@ -568,23 +568,23 @@ print '</div>'."\n";
 print '</form>'."\n";
 
 if (in_array('builddoc', $arrayofmassactions) && ($nbtotalofrecords === '' || $nbtotalofrecords)) {
-    $hidegeneratedfilelistifempty = 1;
-    if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) {
-        $hidegeneratedfilelistifempty = 0;
-    }
+	$hidegeneratedfilelistifempty = 1;
+	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) {
+		$hidegeneratedfilelistifempty = 0;
+	}
 
-    require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
-    $formfile = new FormFile($db);
+	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
+	$formfile = new FormFile($db);
 
-    // Show list of available documents
-    $urlsource = $_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
-    $urlsource .= str_replace('&amp;', '&', $param);
+	// Show list of available documents
+	$urlsource = $_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
+	$urlsource .= str_replace('&amp;', '&', $param);
 
-    $filedir = $diroutputmassaction;
-    $genallowed = $user->rights->zapier->read;
-    $delallowed = $user->rights->zapier->create;
+	$filedir = $diroutputmassaction;
+	$genallowed = $user->rights->zapier->read;
+	$delallowed = $user->rights->zapier->create;
 
-    print $formfile->showdocuments('massfilesarea_zapier', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
+	print $formfile->showdocuments('massfilesarea_zapier', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
 }
 
 // End of page
diff --git a/htdocs/zapier/hook_note.php b/htdocs/zapier/hook_note.php
index 273b609741e..da0484160a3 100644
--- a/htdocs/zapier/hook_note.php
+++ b/htdocs/zapier/hook_note.php
@@ -143,7 +143,7 @@ if ($id > 0 || !empty($ref)) {
 
 	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 }
 
 // End of page
diff --git a/htdocs/zapier/lib/zapier.lib.php b/htdocs/zapier/lib/zapier.lib.php
index 8fc4810599d..1e2d4f5ec64 100644
--- a/htdocs/zapier/lib/zapier.lib.php
+++ b/htdocs/zapier/lib/zapier.lib.php
@@ -28,31 +28,31 @@
  */
 function zapierAdminPrepareHead()
 {
-    global $langs, $conf;
+	global $langs, $conf;
 
-    $langs->load("zapier@zapier");
+	$langs->load("zapier@zapier");
 
-    $h = 0;
-    $head = array();
+	$h = 0;
+	$head = array();
 
-    $head[$h][0] = dol_buildpath("/zapier/admin/setup.php", 1);
-    $head[$h][1] = $langs->trans("Settings");
-    $head[$h][2] = 'settings';
-    $h++;
-    $head[$h][0] = dol_buildpath("/zapier/admin/about.php", 1);
-    $head[$h][1] = $langs->trans("About");
-    $head[$h][2] = 'about';
-    $h++;
+	$head[$h][0] = dol_buildpath("/zapier/admin/setup.php", 1);
+	$head[$h][1] = $langs->trans("Settings");
+	$head[$h][2] = 'settings';
+	$h++;
+	$head[$h][0] = dol_buildpath("/zapier/admin/about.php", 1);
+	$head[$h][1] = $langs->trans("About");
+	$head[$h][2] = 'about';
+	$h++;
 
-    // Show more tabs from modules
-    // Entries must be declared in modules descriptor with line
-    //$this->tabs = array(
-    //	'entity:+tabname:Title:@zapier:/zapier/mypage.php?id=__ID__'
-    //); // to add new tab
-    //$this->tabs = array(
-    //	'entity:-tabname:Title:@zapier:/zapier/mypage.php?id=__ID__'
-    //); // to remove a tab
-    complete_head_from_modules($conf, $langs, $object, $head, $h, 'zapier');
+	// Show more tabs from modules
+	// Entries must be declared in modules descriptor with line
+	//$this->tabs = array(
+	//	'entity:+tabname:Title:@zapier:/zapier/mypage.php?id=__ID__'
+	//); // to add new tab
+	//$this->tabs = array(
+	//	'entity:-tabname:Title:@zapier:/zapier/mypage.php?id=__ID__'
+	//); // to remove a tab
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'zapier');
 
-    return $head;
+	return $head;
 }
diff --git a/scripts/bank/export-bank-receipts.php b/scripts/bank/export-bank-receipts.php
index 609791232ad..d8c4b91550d 100755
--- a/scripts/bank/export-bank-receipts.php
+++ b/scripts/bank/export-bank-receipts.php
@@ -172,7 +172,7 @@ if (!isset($num))
 	$sql .= " OR b.num_releve is null";
 $sql .= " AND b.fk_account = ba.rowid";
 $sql .= $db->order("b.num_releve, b.datev, b.datec", "ASC"); // We add date of creation to have correct order when everything is done the same day
-                                                             // print $sql;
+															 // print $sql;
 
 $resql = $db->query($sql);
 if ($resql) {
@@ -259,7 +259,7 @@ if ($resql) {
 						$invoicestatic->fetch($tmpval);
 						if ($accountelem) {
 							$accountelem .= ', ';
-                        }
+						}
 						$accountelem .= $invoicestatic->ref;
 					}
 				}
@@ -271,7 +271,7 @@ if ($resql) {
 						$invoicesupplierstatic->fetch($tmpval);
 						if ($accountelem) {
 							$accountelem .= ', ';
-                        }
+						}
 						$accountelem .= $invoicesupplierstatic->ref;
 					}
 				}
@@ -279,20 +279,20 @@ if ($resql) {
 				$paymentsocialcontributionstatic->fetch($links[$key]['url_id']);
 				if ($accountelem) {
 					$accountelem .= ', ';
-                }
+				}
 				$accountelem .= $langs->transnoentitiesnoconv("SocialContribution").' '.$paymentsocialcontributionstatic->ref;
 			} elseif ($links[$key]['type'] == 'payment_vat') {
 				$paymentvatstatic->fetch($links[$key]['url_id']);
 				if ($accountelem) {
 					$accountelem .= ', ';
-                }
+				}
 				$accountelem .= $langs->transnoentitiesnoconv("VATPayments").' '.$paymentvatstatic->ref;
 			} elseif ($links[$key]['type'] == 'banktransfert') {
 				$comment = $outputlangs->transnoentitiesnoconv("Transfer");
 				if ($objp->amount > 0) {
 					if ($comment) {
 						$comment .= ' ';
-                    }
+					}
 					$banklinestatic->fetch($links[$key]['url_id']);
 					$bankstatic->id = $banklinestatic->fk_account;
 					$bankstatic->label = $banklinestatic->bank_account_label;
@@ -306,7 +306,7 @@ if ($resql) {
 				} else {
 					if ($comment) {
 						$comment .= ' ';
-                    }
+					}
 					$bankstatic->id = $objp->bankid;
 					$bankstatic->label = $objp->bankref;
 					$comment .= ' ('.$langs->transnoentitiesnoconv("from").' ';
@@ -321,13 +321,13 @@ if ($resql) {
 			} elseif ($links[$key]['type'] == 'company') {
 				if ($thirdparty) {
 					$thirdparty .= ', ';
-                }
+				}
 				$thirdparty .= dol_trunc($links[$key]['label'], 24);
 				$newline = 0;
 			} elseif ($links[$key]['type'] == 'member') {
 				if ($thirdparty) {
 					$accountelem .= ', ';
-                }
+				}
 				$thirdparty .= $links[$key]['label'];
 				$newline = 0;
 			}
diff --git a/scripts/cron/cron_run_jobs.php b/scripts/cron/cron_run_jobs.php
index e7b830c5ae6..ecec277995d 100755
--- a/scripts/cron/cron_run_jobs.php
+++ b/scripts/cron/cron_run_jobs.php
@@ -165,7 +165,7 @@ $nbofjobslaunchedok = 0;
 $nbofjobslaunchedko = 0;
 
 if (is_array($qualifiedjobs) && (count($qualifiedjobs) > 0)) {
-    $savconf = dol_clone($conf);
+	$savconf = dol_clone($conf);
 
 	// Loop over job
 	foreach ($qualifiedjobs as $line) {
@@ -178,34 +178,34 @@ if (is_array($qualifiedjobs) && (count($qualifiedjobs) > 0)) {
 			dol_syslog("cron_run_jobs.php we work on another entity conf than ".$conf->entity." so we reload mysoc, langs, user and conf", LOG_DEBUG);
 			echo " -> we change entity so we reload mysoc, langs, user and conf";
 
-		    $conf->entity = (empty($line->entity) ? 1 : $line->entity);
-		    $conf->setValues($db); // This make also the $mc->setValues($conf); that reload $mc->sharings
-		    $mysoc->setMysoc($conf);
+			$conf->entity = (empty($line->entity) ? 1 : $line->entity);
+			$conf->setValues($db); // This make also the $mc->setValues($conf); that reload $mc->sharings
+			$mysoc->setMysoc($conf);
 
-		    // Force recheck that user is ok for the entity to process and reload permission for entity
-		    if ($conf->entity != $user->entity && $user->entity != 0)
-		    {
-    		    $result = $user->fetch('', $userlogin, '', 0, $conf->entity);
-    		    if ($result < 0)
-    		    {
-    		        echo "\nUser Error: ".$user->error."\n";
-    		        dol_syslog("cron_run_jobs.php:: User Error:".$user->error, LOG_ERR);
-    		        exit(-1);
-    		    } else {
-    		        if ($result == 0)
-    		        {
-    		            echo "\nUser login: ".$userlogin." does not exists for entity ".$conf->entity."\n";
-    		            dol_syslog("User login:".$userlogin." does not exists", LOG_ERR);
-    		            exit(-1);
-    		        }
-    		    }
-    		    $user->getrights();
-		    }
+			// Force recheck that user is ok for the entity to process and reload permission for entity
+			if ($conf->entity != $user->entity && $user->entity != 0)
+			{
+				$result = $user->fetch('', $userlogin, '', 0, $conf->entity);
+				if ($result < 0)
+				{
+					echo "\nUser Error: ".$user->error."\n";
+					dol_syslog("cron_run_jobs.php:: User Error:".$user->error, LOG_ERR);
+					exit(-1);
+				} else {
+					if ($result == 0)
+					{
+						echo "\nUser login: ".$userlogin." does not exists for entity ".$conf->entity."\n";
+						dol_syslog("User login:".$userlogin." does not exists", LOG_ERR);
+						exit(-1);
+					}
+				}
+				$user->getrights();
+			}
 
-		    // Reload langs
-		    $langcode = (empty($conf->global->MAIN_LANG_DEFAULT)?'auto':$conf->global->MAIN_LANG_DEFAULT);
-		    if (! empty($user->conf->MAIN_LANG_DEFAULT)) $langcode = $user->conf->MAIN_LANG_DEFAULT;
-		    if ($langs->getDefaultLang() != $langcode) $langs->setDefaultLang($langcode);
+			// Reload langs
+			$langcode = (empty($conf->global->MAIN_LANG_DEFAULT) ? 'auto' : $conf->global->MAIN_LANG_DEFAULT);
+			if (!empty($user->conf->MAIN_LANG_DEFAULT)) $langcode = $user->conf->MAIN_LANG_DEFAULT;
+			if ($langs->getDefaultLang() != $langcode) $langs->setDefaultLang($langcode);
 		}
 
 		//If date_next_jobs is less of current date, execute the program, and store the execution time of the next execution in database
diff --git a/scripts/user/sync_groups_ldap2dolibarr.php b/scripts/user/sync_groups_ldap2dolibarr.php
index 5432ded78ee..26e12c2c5e4 100755
--- a/scripts/user/sync_groups_ldap2dolibarr.php
+++ b/scripts/user/sync_groups_ldap2dolibarr.php
@@ -170,7 +170,7 @@ if ($result >= 0) {
 				if ($key === 'count')
 					continue;
 				if (empty($userList[$userdn])) { // Récupération de l'utilisateur
-				                                 // Schéma rfc2307: les membres sont listés dans l'attribut memberUid sous form de login uniquement
+												 // Schéma rfc2307: les membres sont listés dans l'attribut memberUid sous form de login uniquement
 					if ($conf->global->LDAP_GROUP_FIELD_GROUPMEMBERS === 'memberUid') {
 						$userKey = array($userdn);
 					} else { // Pour les autres schémas, les membres sont listés sous forme de DN complets
diff --git a/test/test_serialize.php b/test/other/test_serialize.php
similarity index 100%
rename from test/test_serialize.php
rename to test/other/test_serialize.php
diff --git a/test/phpunit/AdminLibTest.php b/test/phpunit/AdminLibTest.php
index e3c38c1df86..c7b5aee9e37 100644
--- a/test/phpunit/AdminLibTest.php
+++ b/test/phpunit/AdminLibTest.php
@@ -165,13 +165,17 @@ class AdminLibTest extends PHPUnit\Framework\TestCase
 		require_once dirname(__FILE__).'/../../htdocs/core/modules/modExpenseReport.class.php';
 		print "Enable module modExpenseReport";
 		$moduledescriptor=new modExpenseReport($db);
-		$moduledescriptor->init();
+		$result = $moduledescriptor->init();
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals(1, $result);
 		$conf->setValues($db);
 
 		require_once dirname(__FILE__).'/../../htdocs/core/modules/modApi.class.php';
 		print "Enable module modAPI";
 		$moduledescriptor=new modApi($db);
-		$moduledescriptor->init();
+		$result = $moduledescriptor->init();
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals(1, $result);
 		$conf->setValues($db);
     }
 }
diff --git a/test/phpunit/CodingSqlTest.php b/test/phpunit/CodingSqlTest.php
index 245a7869811..3e065bb141c 100644
--- a/test/phpunit/CodingSqlTest.php
+++ b/test/phpunit/CodingSqlTest.php
@@ -170,7 +170,7 @@ class CodingSqlTest extends PHPUnit\Framework\TestCase
                 $filecontent = str_replace('`rank`', '_rank_', $filecontent);
 
                 $result=strpos($filecontent, '`');
-                print __METHOD__." Result for checking we don't have back quote = ".$result."\n";
+                //print __METHOD__." Result for checking we don't have back quote = ".$result."\n";
                 $this->assertTrue($result===false, 'Found back quote into '.$file.'. Bad.');
 
                 $result=strpos($filecontent, '"');
@@ -178,27 +178,27 @@ class CodingSqlTest extends PHPUnit\Framework\TestCase
                 {
                 	$result=(! strpos($filecontent, '["') && ! strpos($filecontent, '{"'));
                 }
-                print __METHOD__." Result for checking we don't have double quote = ".$result."\n";
+                //print __METHOD__." Result for checking we don't have double quote = ".$result."\n";
                 $this->assertTrue($result===false, 'Found double quote that is not [" neither {" (used for json content) into '.$file.'. Bad.');
 
                 $result=strpos($filecontent, 'int(');
-                print __METHOD__." Result for checking we don't have 'int(' instead of 'integer' = ".$result."\n";
+                //print __METHOD__." Result for checking we don't have 'int(' instead of 'integer' = ".$result."\n";
                 $this->assertTrue($result===false, 'Found int(x) or tinyint(x) instead of integer or tinyint into '.$file.'. Bad.');
 
                 $result=strpos($filecontent, 'ON DELETE CASCADE');
-                print __METHOD__." Result for checking we don't have 'ON DELETE CASCADE' = ".$result."\n";
+                //print __METHOD__." Result for checking we don't have 'ON DELETE CASCADE' = ".$result."\n";
                 $this->assertTrue($result===false, 'Found ON DELETE CASCADE into '.$file.'. Bad.');
 
                 $result=strpos($filecontent, 'NUMERIC(');
-                print __METHOD__." Result for checking we don't have 'NUMERIC(' = ".$result."\n";
+                //print __METHOD__." Result for checking we don't have 'NUMERIC(' = ".$result."\n";
                 $this->assertTrue($result===false, 'Found NUMERIC( into '.$file.'. Bad.');
 
                 $result=strpos($filecontent, 'NUMERIC(');
-                print __METHOD__." Result for checking we don't have 'curdate(' = ".$result."\n";
+                //print __METHOD__." Result for checking we don't have 'curdate(' = ".$result."\n";
                 $this->assertTrue($result===false, 'Found curdate( into '.$file.'. Bad. Current date must be generated with PHP.');
 
                 $result=strpos($filecontent, 'integer(');
-                print __METHOD__." Result for checking we don't have 'integer(' = ".$result."\n";
+                //print __METHOD__." Result for checking we don't have 'integer(' = ".$result."\n";
                 $this->assertTrue($result===false, 'Found value in parenthesis after the integer. It must be integer not integer(x) into '.$file.'. Bad.');
 
                 if ($dir == DOL_DOCUMENT_ROOT.'/install/mysql/migration')
@@ -214,11 +214,11 @@ class CodingSqlTest extends PHPUnit\Framework\TestCase
                     } else {
                         // Test for non key files only
                         $result=(strpos($filecontent, 'KEY ') && strpos($filecontent, 'PRIMARY KEY') == 0);
-                        print __METHOD__." Result for checking we don't have ' KEY ' instead of a sql file to create index = ".$result."\n";
+                        //print __METHOD__." Result for checking we don't have ' KEY ' instead of a sql file to create index = ".$result."\n";
                         $this->assertTrue($result===false, 'Found KEY into '.$file.'. Bad.');
 
                         $result=stripos($filecontent, 'ENGINE=innodb');
-                        print __METHOD__." Result for checking we have the ENGINE=innodb string = ".$result."\n";
+                        //print __METHOD__." Result for checking we have the ENGINE=innodb string = ".$result."\n";
                         $this->assertGreaterThan(0, $result, 'The ENGINE=innodb was not found into '.$file.'. Add it or just fix syntax to match case.');
                     }
                 }
diff --git a/test/phpunit/FactureTest.php b/test/phpunit/FactureTest.php
index dc34b061806..17cc4176a87 100644
--- a/test/phpunit/FactureTest.php
+++ b/test/phpunit/FactureTest.php
@@ -241,7 +241,7 @@ class FactureTest extends PHPUnit\Framework\TestCase
 				'ref','statut','paye','specimen','ref','actiontypecode','actionmsg2','actionmsg','mode_reglement','cond_reglement',
 				'cond_reglement_doc','situation_cycle_ref','situation_counter','situation_final','multicurrency_total_ht','multicurrency_total_tva',
 				'multicurrency_total_ttc','fk_multicurrency','multicurrency_code','multicurrency_tx',
-                'retained_warranty' ,'retained_warranty_date_limit', 'retained_warranty_fk_cond_reglement'
+                'retained_warranty' ,'retained_warranty_date_limit', 'retained_warranty_fk_cond_reglement', 'specimen'
 			)
 		);
         $this->assertEquals($arraywithdiff, array());    // Actual, Expected
diff --git a/test/phpunit/HolidayTest.php b/test/phpunit/HolidayTest.php
index e7e3e8749cd..e7ad436b586 100644
--- a/test/phpunit/HolidayTest.php
+++ b/test/phpunit/HolidayTest.php
@@ -366,7 +366,7 @@ class HolidayTest extends PHPUnit\Framework\TestCase
     	$localobjecta=new Holiday($this->savdb);
 
     	$localobjecta->updateConfCP('lastUpdate', '20100101120000');
-
-    	$localobjecta->updateBalance();
+    	$result = $localobjecta->updateBalance();
+    	$this->assertEquals($result, 1);
     }
 }
diff --git a/test/phpunit/PaypalTest.php b/test/phpunit/PaypalTest.php
index 47d8341f501..19774a11c09 100644
--- a/test/phpunit/PaypalTest.php
+++ b/test/phpunit/PaypalTest.php
@@ -146,7 +146,7 @@ class PaypalTest extends PHPUnit\Framework\TestCase
 		$urltotest=getPaypalPaymentUrl(0, 'free');
 		print "urltotest=".$urltotest."\n";
 
-		$result=getURLContent($urltotest, 'GET');
+		$result=getURLContent($urltotest, 'GET', '', 1, array(), array('http', 'https'), 2);
 
         print __METHOD__." result=".$result."\n";
     	$this->assertLessThanOrEqual($result, 0);
diff --git a/test/phpunit/RestAPIDocumentTest.php b/test/phpunit/RestAPIDocumentTest.php
index 65b8c206c9d..8dbaafab018 100644
--- a/test/phpunit/RestAPIDocumentTest.php
+++ b/test/phpunit/RestAPIDocumentTest.php
@@ -120,7 +120,7 @@ class RestAPIDocumentTest extends PHPUnit\Framework\TestCase
         $password = 'admin';
         $url = $this->api_url.'/login?login='.$login.'&password='.$password;
         // Call the API login method to save api_key for this test class
-        $result = getURLContent($url, 'GET', '', 1, array());
+        $result = getURLContent($url, 'GET', '', 1, array(), array('http', 'https'), 2);
         echo __METHOD__.' result = '.var_export($result, true)."\n";
         echo __METHOD__.' curl_error_no: '.$result['curl_error_no']."\n";
         $this->assertEquals($result['curl_error_no'], '');
@@ -171,7 +171,7 @@ class RestAPIDocumentTest extends PHPUnit\Framework\TestCase
             'fileencoding'=>""
         );
 
-        $result = getURLContent($url, 'POST', $data, 1);
+        $result = getURLContent($url, 'POST', $data, 1, array(), array('http', 'https'), 2);
         echo __METHOD__.' Result for sending document: '.var_export($result, true)."\n";
         echo __METHOD__.' curl_error_no: '.$result['curl_error_no']."\n";
         $object = json_decode($result['content'], true);
@@ -192,7 +192,7 @@ class RestAPIDocumentTest extends PHPUnit\Framework\TestCase
             'fileencoding'=>""
         );
 
-        $result2 = getURLContent($url, 'POST', $data, 1);
+        $result2 = getURLContent($url, 'POST', $data, 1, array(), array('http', 'https'), 2);
         echo __METHOD__.' Result for sending document: '.var_export($result2, true)."\n";
         echo __METHOD__.' curl_error_no: '.$result2['curl_error_no']."\n";
         $object2 = json_decode($result2['content'], true);
diff --git a/test/phpunit/RestAPIUserTest.php b/test/phpunit/RestAPIUserTest.php
index 9d49d10af73..a937bdbd9f8 100644
--- a/test/phpunit/RestAPIUserTest.php
+++ b/test/phpunit/RestAPIUserTest.php
@@ -125,7 +125,7 @@ class RestAPIUserTest extends PHPUnit\Framework\TestCase
         $password='admin';
         $url=$this->api_url.'/login?login='.$login.'&password='.$password;
         // Call the API login method to save api_key for this test class
-        $result=getURLContent($url, 'GET', '', 1, array());
+        $result=getURLContent($url, 'GET', '', 1, array(), array('http', 'https'), 2);
         print __METHOD__." result = ".var_export($result, true)."\n";
         print __METHOD__." curl_error_no: ".$result['curl_error_no']."\n";
         $this->assertEquals($result['curl_error_no'], '');
@@ -163,7 +163,7 @@ class RestAPIUserTest extends PHPUnit\Framework\TestCase
         //$addheaders=array('Content-Type: application/json');
 
         print __METHOD__." Request GET url=".$url."\n";
-        $result=getURLContent($url, 'GET', '', 1, array());
+        $result=getURLContent($url, 'GET', '', 1, array(), array('http', 'https'), 2);
         //print __METHOD__." Result for unexisting user: ".var_export($result, true)."\n";
         print __METHOD__." curl_error_no: ".$result['curl_error_no']."\n";
         $this->assertEquals($result['curl_error_no'], '');
@@ -174,7 +174,7 @@ class RestAPIUserTest extends PHPUnit\Framework\TestCase
         $url = $this->api_url.'/users/1?api_key='.$this->api_key;
 
         print __METHOD__." Request GET url=".$url."\n";
-        $result=getURLContent($url, 'GET', '', 1, array());
+        $result=getURLContent($url, 'GET', '', 1, array(), array('http', 'https'), 2);
         //print __METHOD__." Result for existing user user: ".var_export($result, true)."\n";
         print __METHOD__." curl_error_no: ".$result['curl_error_no']."\n";
         $this->assertEquals($result['curl_error_no'], '');
@@ -203,7 +203,7 @@ class RestAPIUserTest extends PHPUnit\Framework\TestCase
         $body = json_encode($bodyobj);
 
         print __METHOD__." Request POST url=".$url."\n";
-        $result=getURLContent($url, 'POST', $body, 1, $addheaders);
+        $result=getURLContent($url, 'POST', $body, 1, $addheaders, array('http', 'https'), 2);
         //print __METHOD__." Result for creating incomplete user".var_export($result, true)."\n";
         print __METHOD__." curl_error_no: ".$result['curl_error_no']."\n";
         $this->assertEquals($result['curl_error_no'], '');
@@ -221,7 +221,7 @@ class RestAPIUserTest extends PHPUnit\Framework\TestCase
         );
         $body = json_encode($bodyobj);
         print __METHOD__." Request POST url=".$url."\n";
-        $result=getURLContent($url, 'POST', $body, 1, $addheaders);
+        $result=getURLContent($url, 'POST', $body, 1, $addheaders, array('http', 'https'), 2);
         print __METHOD__." Result code for creating user ".var_export($result, true)."\n";
         print __METHOD__." curl_error_no: ".$result['curl_error_no']."\n";
         $this->assertEquals($result['curl_error_no'], '');
@@ -231,7 +231,7 @@ class RestAPIUserTest extends PHPUnit\Framework\TestCase
 
         // attempt to create duplicated user
         print __METHOD__." Request POST url=".$url."\n";
-        $result=getURLContent($url, 'POST', $body, 1, $addheaders);
+        $result=getURLContent($url, 'POST', $body, 1, $addheaders, array('http', 'https'), 2);
         //print __METHOD__." Result for creating duplicate user".var_export($result, true)."\n";
         print __METHOD__." curl_error_no: ".$result['curl_error_no']."\n";
         $this->assertEquals($result['curl_error_no'], '');
diff --git a/test/phpunit/SecurityTest.php b/test/phpunit/SecurityTest.php
index b4bdf1d89ab..bc3595a8cfa 100644
--- a/test/phpunit/SecurityTest.php
+++ b/test/phpunit/SecurityTest.php
@@ -395,7 +395,7 @@ class SecurityTest extends PHPUnit\Framework\TestCase
     	global $conf;
     	include_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
 
-    	$url = 'ftp://aaaa';
+    	$url = 'ftp://mydomain.com';
     	$tmp = getURLContent($url);
     	print __METHOD__." url=".$url."\n";
     	$this->assertGreaterThan(0, strpos($tmp['curl_error_msg'], 'not supported'));	// Test error if return does not contains 'not supported'
@@ -408,9 +408,34 @@ class SecurityTest extends PHPUnit\Framework\TestCase
     	$url = 'https://www.dolibarr.fr';	// This is a redirect 301 page
     	$tmp = getURLContent($url);		// We DO follow
     	print __METHOD__." url=".$url."\n";
-    	//var_dump($tmp);
     	$this->assertEquals(200, $tmp['http_code'], 'GET url 301 with following -> 200');	// Test error if return does not contains 'not supported'
 
+    	$url = 'http://localhost';
+    	$tmp = getURLContent($url, 'GET', '', 0, array(), array('http', 'https'), 0);		// Only external URL
+    	print __METHOD__." url=".$url."\n";
+    	$this->assertEquals(400, $tmp['http_code'], 'GET url to '.$url.' that resolves to a local URL');	// Test we receive an error because localtest.me is not an external URL
+
+    	$url = 'http://127.0.0.1';
+    	$tmp = getURLContent($url, 'GET', '', 0, array(), array('http', 'https'), 0);		// Only external URL
+    	print __METHOD__." url=".$url."\n";
+    	$this->assertEquals(400, $tmp['http_code'], 'GET url to '.$url.' that is a local URL');	// Test we receive an error because localtest.me is not an external URL
+
+    	$url = 'https://169.254.0.1';
+    	$tmp = getURLContent($url, 'GET', '', 0, array(), array('http', 'https'), 0);		// Only external URL
+    	print __METHOD__." url=".$url."\n";
+    	$this->assertEquals(400, $tmp['http_code'], 'GET url to '.$url.' that is a local URL');	// Test we receive an error because localtest.me is not an external URL
+
+    	$url = 'http://[::1]';
+    	$tmp = getURLContent($url, 'GET', '', 0, array(), array('http', 'https'), 0);		// Only external URL
+    	print __METHOD__." url=".$url."\n";
+    	$this->assertEquals(400, $tmp['http_code'], 'GET url to '.$url.' that is a local URL');	// Test we receive an error because localtest.me is not an external URL
+
+    	/*$url = 'localtest.me';
+    	$tmp = getURLContent($url, 'GET', '', 0, array(), array('http', 'https'), 0);		// Only external URL
+    	print __METHOD__." url=".$url."\n";
+    	$this->assertEquals(400, $tmp['http_code'], 'GET url to '.$url.' that resolves to a local URL');	// Test we receive an error because localtest.me is not an external URL
+		*/
+
     	return 0;
     }
 }
diff --git a/test/phpunit/UserTest.php b/test/phpunit/UserTest.php
index 08338de949b..d5c1be0b4d2 100644
--- a/test/phpunit/UserTest.php
+++ b/test/phpunit/UserTest.php
@@ -200,7 +200,7 @@ class UserTest extends PHPUnit\Framework\TestCase
         $newlocalobject=new User($this->savdb);
         $newlocalobject->initAsSpecimen();
         $this->changeProperties($newlocalobject);
-        $this->assertEquals($this->objCompare($localobject, $newlocalobject, true, array('id','socid','societe_id','note','ref','pass','pass_indatabase','pass_indatabase_crypted','datec','datem','datelastlogin','datepreviouslogin')), array());    // Actual, Expected
+        $this->assertEquals($this->objCompare($localobject, $newlocalobject, true, array('id','socid','societe_id','specimen','note','ref','pass','pass_indatabase','pass_indatabase_crypted','datec','datem','datelastlogin','datepreviouslogin')), array());    // Actual, Expected
 
         return $localobject;
     }